From b0df33e926196ca39b315960a24fe3c6ba2b7939 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Sat, 11 Jan 2025 09:32:17 +0300
Subject: [PATCH 01/44] improved ROUTINE insertion

---
 .../trunk/Sage/lib/include/unparseDVM.def     |   2 +-
 dvm/tools/pppa/trunk/src/dvmh_stat.h          |   6 +
 .../_src/DvmhRegions/DvmhRegionInserter.cpp   | 233 ++++++++++++++++--
 .../_src/DvmhRegions/DvmhRegionInserter.h     |  11 +-
 .../experts/Sapfor_2017/_src/Utils/version.h  |   2 +-
 5 files changed, 222 insertions(+), 32 deletions(-)

diff --git a/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def b/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
index 3e5ca45..a460aec 100644
--- a/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
+++ b/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
@@ -270,7 +270,7 @@ DEFNODECODE(ACC_CHECKSECTION_DIR,    "%CMNT!DVM$%PUTTABCOMTHOSTSECTION%NL",
 's',0,BIFNODE)
 DEFNODECODE(ACC_END_CHECKSECTION_DIR,"%CMNT!DVM$%PUTTABCOMTEND HOSTSECTION%NL",
 's',0,BIFNODE)
-DEFNODECODE(ACC_ROUTINE_DIR,	     "%CMNT!DVM$%PUTTABCOMTROUTINE%IF(%LL1!=%NULL), %LL1%NL",
+DEFNODECODE(ACC_ROUTINE_DIR,	     "%CMNT!DVM$%PUTTABCOMTROUTINE%IF(%LL1!=%NULL), %LL1%ENDIF%NL",
 's',1,BIFNODE)
 DEFNODECODE(ACC_DECLARE_DIR,         "%CMNT!DVM$%PUTTABCOMTDECLARE %LL1%NL",
 's',1,BIFNODE)
diff --git a/dvm/tools/pppa/trunk/src/dvmh_stat.h b/dvm/tools/pppa/trunk/src/dvmh_stat.h
index 77fc50a..60cbce4 100644
--- a/dvm/tools/pppa/trunk/src/dvmh_stat.h
+++ b/dvm/tools/pppa/trunk/src/dvmh_stat.h
@@ -50,6 +50,9 @@ typedef enum {
     DVMH_STAT_METRIC_CPY_HTOD,
     DVMH_STAT_METRIC_CPY_DTOD,
     /* DVMH memcpy */
+    DVMH_STAT_METRIC_CPY_ACROSS_DTOH,
+    DVMH_STAT_METRIC_CPY_ACROSS_HTOD,
+    DVMH_STAT_METRIC_CPY_ACROSS_DTOD,
     DVMH_STAT_METRIC_CPY_SHADOW_DTOH,
     DVMH_STAT_METRIC_CPY_SHADOW_HTOD,
     DVMH_STAT_METRIC_CPY_SHADOW_DTOD,
@@ -86,6 +89,9 @@ static const char *dvmhStatMetricsTitles[DVMH_STAT_METRIC_FORCE_INT] = {
         "Copy GPU to CPU",
         "Copy CPU to GPU",
         "Copy GPU to GPU",
+        "[Across] Copy GPU to CPU",
+        "[Across] Copy CPU to GPU",
+        "[Across] Copy GPU to GPU",
         "[Shadow] Copy GPU to CPU",
         "[Shadow] Copy CPU to GPU",
         "[Shadow] Copy GPU to GPU",
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
index 71921f4..ea21174 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
@@ -104,7 +104,7 @@ void DvmhRegionInserter::parFuncsInNode(LoopGraph *loop, bool isParallel)
                     printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
             }
             else
-                parallel_functions.insert(it->second);
+                parallel_functions[it->second].insert(loop);
         }
     }
     else    
@@ -133,23 +133,36 @@ void DvmhRegionInserter::updateParallelFunctions(const map<string, vector<LoopGr
     while (changes_done)
     {
         changes_done = false;
-        set<FuncInfo*> newList;
+        map<FuncInfo*, set<LoopGraph*>> newList;
         for (auto& funcPair : allFunctions)
         {
             FuncInfo* func = funcPair.second;
             for (auto& callsTo : func->callsTo)
             {
-                if (parallel_functions.find(callsTo) != parallel_functions.end() && 
-                    parallel_functions.find(func) == parallel_functions.end())
+                auto itF = parallel_functions.find(func);
+
+                set<LoopGraph*> added;
+                if (itF != parallel_functions.end())
+                    added = itF->second;
+
+                auto itTo = parallel_functions.find(callsTo);
+                if (itTo != parallel_functions.end())
                 {
-                    newList.insert(func);
-                    changes_done = true;
+                    for (auto& loop : itTo->second)
+                    {
+                        if (added.find(loop) == added.end())
+                        {
+                            changes_done = true;
+                            newList[func].insert(loop);
+                        }
+                    }                   
                 }
             }
         }
 
         for (auto& newElem : newList)
-            parallel_functions.insert(newElem);
+            for (auto& loop : newElem.second)
+                parallel_functions[newElem.first].insert(loop);
     }
 }
 
@@ -1040,7 +1053,156 @@ static void insertInterface(SgStatement* func, const string& iface, const string
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 }
 
-static void insertRoutine(SgStatement* func)
+static LoopGraph* getParallelLoop(LoopGraph* loop)
+{
+    auto prev_st = loop->loop->lexPrev();
+
+    while (prev_st && isDVM_stat(prev_st))
+    {
+        if (prev_st->variant() == DVM_PARALLEL_ON_DIR)
+            return loop;
+        prev_st = prev_st->lexPrev();
+        loop = loop->parent;
+    }
+
+    return NULL;
+}
+
+static set<LoopGraph*> getParallelLoops(const std::set<LoopGraph*>& loops)
+{
+    set<LoopGraph*> retVal;
+    for (auto& elem : loops)
+    {
+        string oldFile = current_file->filename();
+        if (!elem->loop->switchToFile())
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+        auto parLoop = getParallelLoop(elem);
+        checkNull(parLoop, convertFileName(__FILE__).c_str(), __LINE__);
+        retVal.insert(parLoop);
+
+        if (SgFile::switchToFile(oldFile) == -1)
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    }
+    return retVal;
+}
+
+static set<DIST::Array*> getPrivateArrays(const set<LoopGraph*>& parLoops,
+                                          const map<DIST::Array*, set<DIST::Array*>>& arrayLinksByFuncCalls)
+{
+    set<DIST::Array*> retVal;
+
+    for (auto& loop : parLoops)
+    {
+        string oldFile = current_file->filename();
+        if (!loop->loop->switchToFile())
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+        for (auto& priv : loop->directive->privates)
+        {
+            bool isArray = false;
+            if (isArrayType(priv->type()))
+            {
+                auto type = isSgArrayType(priv->type());
+                if (type && type->dimension())
+                    isArray = true;
+            }
+
+            if (!isArray)
+                continue;
+
+            DIST::Array* arr = getArrayFromDeclarated(declaratedInStmt(priv), priv->identifier());
+            checkNull(arr, convertFileName(__FILE__).c_str(), __LINE__);
+
+            set<DIST::Array*> realArrayRefs;
+            getRealArrayRefs(arr, arr, realArrayRefs, arrayLinksByFuncCalls);
+
+            for (auto& elem : realArrayRefs)
+                retVal.insert(elem);
+        }
+
+        if (SgFile::switchToFile(oldFile) == -1)
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    }
+
+    return retVal;
+}
+
+static SgExpression* getPrivateArraysInPar(const FuncInfo* funcInfo, const std::set<LoopGraph*>& inLoops,
+                                           const map<DIST::Array*, set<DIST::Array*>>& arrayLinksByFuncCalls,
+                                           SgExpression* addedPrivList)
+{
+    if (!funcInfo)
+        return NULL;
+
+    map<string, SgExpression*> addedPriv;
+    SgExpression* ex = addedPrivList;
+    while (ex)
+    {
+        if (ex->lhs() && ex->lhs()->variant() == ACC_PRIVATE_OP)
+        {
+            ex = ex->lhs()->lhs();
+            while (ex)
+            {
+                if (ex->lhs() && ex->lhs()->variant() == VAR_REF)
+                    addedPriv[ex->lhs()->symbol()->identifier()] = ex->lhs();
+                ex = ex->rhs();
+            }
+            break;
+        }
+        ex = ex->rhs();
+    }
+
+    SgStatement* func = funcInfo->funcPointer->GetOriginal();
+    auto prog = isSgProgHedrStmt(func);
+    checkNull(prog, convertFileName(__FILE__).c_str(), __LINE__);
+    
+    set<LoopGraph*> inParLoops = getParallelLoops(inLoops);
+    set<DIST::Array*> privArrays = getPrivateArrays(inLoops, arrayLinksByFuncCalls);
+
+    for (int z = 0; z < prog->numberOfParameters(); ++z)
+    {
+        SgSymbol* par = prog->parameter(z);
+        bool isArray = false;
+        if (isArrayType(par->type()))
+        {
+            auto type = isSgArrayType(par->type());
+            if (type && type->dimension())
+                isArray = true;
+        }
+
+        if (isArray && addedPriv.count(par->identifier()) == 0)
+        {
+            DIST::Array* arr = getArrayFromDeclarated(declaratedInStmt(par), par->identifier());
+            checkNull(arr, convertFileName(__FILE__).c_str(), __LINE__);
+
+            set<DIST::Array*> realArrayRefs;
+            getRealArrayRefs(arr, arr, realArrayRefs, arrayLinksByFuncCalls);
+
+            bool found = false;
+            for (auto& elem : realArrayRefs)
+                if (privArrays.find(elem) != privArrays.end())
+                    found = true;
+
+            if (found)
+                addedPriv[par->identifier()] = new SgVarRefExp(par);
+        }
+    }
+
+    if (addedPriv.size())
+    {
+        vector<SgExpression*> list;
+        for (auto& elem : addedPriv)
+            list.push_back(elem.second);
+
+        return makeExprList(list, false);
+    }
+    else
+        return NULL;
+}
+
+static void insertRoutine(SgStatement* func, const FuncInfo* funcInfo, const std::set<LoopGraph*>& inLoops,
+                          const map<DIST::Array*, set<DIST::Array*>>& arrayLinksByFuncCalls)
 {
     string oldFile = current_file->filename();
     if (!func->switchToFile())
@@ -1048,26 +1210,34 @@ static void insertRoutine(SgStatement* func)
     
     SgStatement* st = func->lexNext();
     SgStatement* last = func->lastNodeOfStmt();
-    bool has = false;
+
+    SgStatement* routine = NULL;
     while (st != last)
     {
         if (st->variant() == ACC_ROUTINE_DIR)
         {
-            has = true;
+            routine = st;
             break;                
         }
         st = st->lexNext();
     }
-
-    if (has == false)
+    
+    if (!routine)
     {
         st = func->lexNext();
-        st->insertStmtBefore(*new SgStatement(ACC_ROUTINE_DIR), *st->controlParent());
+        routine = new SgStatement(ACC_ROUTINE_DIR);
+        st->insertStmtBefore(*routine, *st->controlParent());
+    }
+
+    SgExpression* list = getPrivateArraysInPar(funcInfo, inLoops, arrayLinksByFuncCalls, routine->expr(0));
+    if (list)
+    {
+        list = new SgExpression(EXPR_LIST, new SgExpression(ACC_PRIVATE_OP, list));
+        routine->setExpression(0, list);
     }
 
     if (SgFile::switchToFile(oldFile) == -1)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
 }
 
 static bool isPure(SgStatement* func)
@@ -1089,15 +1259,23 @@ void DvmhRegionInserter::createInterfaceBlockForOutCall(FuncInfo* func, FuncInfo
     insertInterface(func->funcPointer, getInterfaceBlock(callFrom->funcPointer->GetOriginal(), callFrom->funcParams), callFrom->funcName);
 }
 
-void DvmhRegionInserter::createInterfaceBlockForParallelFunctions()
+void DvmhRegionInserter::createInterfaceBlockForParallelFunctions(bool onlyRoutine)
 {
-    for (auto& parF : parallel_functions)
-    {        
+    for (auto& func_pair : parallel_functions)
+    {
+        const auto& parF = func_pair.first;
+        const auto& inLoops = func_pair.second;
+
         for (auto& callTo : parF->callsTo)
         {
             if (callTo->fileName != parF->fileName && isPure(parF->funcPointer->GetOriginal()))
             {
-                insertRoutine(parF->funcPointer->GetOriginal());
+                if (onlyRoutine)
+                {
+                    insertRoutine(parF->funcPointer->GetOriginal(), parF, inLoops, arrayLinksByFuncCalls);
+                    continue;
+                }
+                
                 auto it = callTo->interfaceBlocks.find(parF->funcName);
                 if (it == callTo->interfaceBlocks.end())
                 {
@@ -1124,7 +1302,7 @@ void DvmhRegionInserter::createInterfaceBlockForParallelFunctions()
                                 st->symbol()->identifier() == parF->funcName)
                             {
                                 iface = st;
-                                insertRoutine(iface);
+                                insertRoutine(iface, parF, inLoops, arrayLinksByFuncCalls);
                                 break;
                             }
                         }
@@ -1362,15 +1540,16 @@ void insertDvmhRegions(SgProject& project, int files, const vector<ParallelRegio
     for (int i = files - 1, k = 0; i >= 0; --i, ++k)
     {
         SgFile* file = &(project.file(i));
-
-        DvmhRegionInserter* regionInserter = inserters[k];
-
-        for (auto& func : regionInserter->getParallelFunctions())
-            createInterfacesForOutCalls(func);
-
-        // create interface for 'parallel' functions and 
         // insert ROUTINE directive if needed
-        regionInserter->createInterfaceBlockForParallelFunctions();
+        inserters[k]->createInterfaceBlockForParallelFunctions();
+    }
+
+    for (int i = files - 1, k = 0; i >= 0; --i, ++k)
+    {
+        SgFile* file = &(project.file(i));
+
+        // create interface for 'parallel' functions
+        inserters[k]->createInterfaceBlockForParallelFunctions(false);
     }
 
     for (auto& regionInserter : inserters)
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h
index ecf8391..2e48afb 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h
@@ -30,7 +30,7 @@ class DvmhRegionInserter
     bool isMpiProgram;
 
     ReadWriteAnalyzer& rw_analyzer;
-    std::set<FuncInfo*> parallel_functions;
+    std::map<FuncInfo*, std::set<LoopGraph*>> parallel_functions;
     std::set<DIST::Array*> writesToArraysInParallelLoops;
     std::set<DIST::Array*> usedArraysInParallelLoops;
     const std::map<DIST::Array*, std::set<DIST::Array*>>& arrayLinksByFuncCalls;
@@ -76,7 +76,7 @@ public:
     void insertActualDirectives(const std::vector<ParallelRegion*>* regs);
 
     void updateParallelFunctions(const std::map<std::string, std::vector<LoopGraph*>>& loopGraphs);
-    void createInterfaceBlockForParallelFunctions();
+    void createInterfaceBlockForParallelFunctions(bool onlyRoutine = true);
     void removePrivatesFromParallelLoops();
     void addPrivatesToParallelLoops();
     void addUsedArrays(std::set<DIST::Array*>& arrays);
@@ -95,7 +95,12 @@ public:
         usedArraysInParallelLoops = newSet;
     }
 
-    const std::set<FuncInfo*>& getParallelFunctions() const { return parallel_functions; }
+    const std::set<FuncInfo*> getParallelFunctions() const { 
+        std::set<FuncInfo*> retVal;
+        for (auto& elem : parallel_functions)
+            retVal.insert(elem.first);
+        return retVal; 
+    }
 
     static void createInterfaceBlockForOutCall(FuncInfo* func, FuncInfo* callFrom);
     static void createInterfaceBlockForOutCalls(FuncInfo* func);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 2584b43..bcf1ed3 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2375"
+#define VERSION_SPF "2379"

From 631a73ddc08dd743538359ab8330dd76632304c6 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Sun, 12 Jan 2025 15:58:18 +0300
Subject: [PATCH 02/44] fixed routine convertation

---
 dvm/fdvm/trunk/fdvm/acc_f2c.cpp | 15 ++++++++++++++-
 dvm/fdvm/trunk/fdvm/calls.cpp   |  8 ++++----
 dvm/fdvm/trunk/include/dvm.h    |  1 +
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dvm/fdvm/trunk/fdvm/acc_f2c.cpp b/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
index 84f2971..4ed299e 100644
--- a/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
+++ b/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
@@ -1476,7 +1476,7 @@ void convertExpr(SgExpression *expr, SgExpression* &retExp)
                     retExp->setLhs(expr->lhs());
                     retExp->setRhs(expr->rhs());
 
-                    if (isUserFunction(tmpF->funName()) == 0)
+                    if (isUserFunction(tmpF->funName()) == 0 && !inter)
                     {
                         printf("  [EXPR ERROR: %s, line %d, user line %d] unsupported variant of func call with name \"%s\"\n", __FILE__, __LINE__, first_do_par->lineNumber(), name);
                         if (unSupportedVars.size() != 0)
@@ -3302,6 +3302,19 @@ SgStatement* Translate_Fortran_To_C(SgStatement *Stmt, bool isSapforConv)
     return converted.first;
 }
 
+void Translate_Fortran_To_C(SgStatement *firstStmt, SgStatement *lastStmt, int countOfCopy, SgStatement *st_header)
+{ // entry for translating copy of the procedure called from Cuda-kernel    
+    first_do_par = st_header;
+    SgStatement *save_st = cur_func;
+    cur_func = st_header;
+    std::vector < std::stack < SgStatement*> > zero = std::vector < std::stack < SgStatement*> >(0);
+
+    Translate_Fortran_To_C(firstStmt, lastStmt, zero, countOfCopy);
+
+    first_do_par = NULL;
+    cur_func = save_st;
+    return;
+}
 
 void Translate_Fortran_To_C(SgStatement *firstStmt, SgStatement *lastStmt, vector<stack<SgStatement*> > &copyBlock, int countOfCopy)
 {
diff --git a/dvm/fdvm/trunk/fdvm/calls.cpp b/dvm/fdvm/trunk/fdvm/calls.cpp
index 5f2c311..996d03b 100644
--- a/dvm/fdvm/trunk/fdvm/calls.cpp
+++ b/dvm/fdvm/trunk/fdvm/calls.cpp
@@ -379,10 +379,10 @@ SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is
         }
 
         swapDimentionsInprivateList();
-        std::vector < std::stack < SgStatement*> > zero = std::vector < std::stack < SgStatement*> >(0);
-        cur_func = after;
-        Translate_Fortran_To_C(new_header, end_st, zero, 0);   //TranslateProcedure_Fortran_To_C(after->lexNext());
-         
+        //std::vector < std::stack < SgStatement*> > zero = std::vector < std::stack < SgStatement*> >(0);
+        //cur_func = after;
+        Translate_Fortran_To_C(new_header, end_st, 0, st_header);   //TranslateProcedure_Fortran_To_C(after->lexNext());
+        cur_func = after; 
         if (sproc->variant() == FUNCTION_NAME)
         {   
             new_header->insertStmtAfter(*Declaration_Statement(new_sproc), *new_header);
diff --git a/dvm/fdvm/trunk/include/dvm.h b/dvm/fdvm/trunk/include/dvm.h
index d3cca27..f743488 100644
--- a/dvm/fdvm/trunk/include/dvm.h
+++ b/dvm/fdvm/trunk/include/dvm.h
@@ -2113,6 +2113,7 @@ char *Check_Correct_Name(const char *name);
 
 /* acc_f2c.cpp */
 void Translate_Fortran_To_C(SgStatement *stat, SgStatement *last, std::vector <std::stack <SgStatement*> > &, int);
+void Translate_Fortran_To_C(SgStatement *stat, SgStatement *last, int countOfCopy, SgStatement *st_header);
 SgStatement* Translate_Fortran_To_C(SgStatement* Stmt, bool isSapforConv = false);
 SgSymbol* createNewFunctionSymbol(const char *name);
 void swapDimentionsInprivateList(void);

From fe7345aab02f6649b333d69895f5d2660e1f0814 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Sun, 12 Jan 2025 17:46:37 +0300
Subject: [PATCH 03/44] added dvm declare

---
 .../_src/DvmhRegions/DvmhRegionInserter.cpp   | 63 +++++++++++++++++++
 .../experts/Sapfor_2017/_src/Utils/version.h  |  2 +-
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
index ea21174..8180f55 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
@@ -1487,6 +1487,67 @@ void DvmhRegionInserter::addUsedWriteArrays(set<DIST::Array*>& arrays)
     }
 }
 
+static void insertDeclare(const set<DIST::Array*>& usedArraysInRegions,
+                          const set<DIST::Array*>& usedWriteArraysInRegions,
+                          const map<DIST::Array*, set<DIST::Array*>> arrayLinksByFuncCalls)
+{
+    vector<DIST::Array*> usedAll;
+    std::set_union(usedArraysInRegions.begin(), usedArraysInRegions.end(),
+                   usedWriteArraysInRegions.begin(), usedWriteArraysInRegions.end(),
+                   std::back_inserter(usedAll));
+
+    set<DIST::Array*> added;
+    map<SgStatement*, set<Symbol*>> toDeclareByFunc;
+
+    for (auto& array : usedAll)
+    {
+        set<DIST::Array*> realRef;
+        getRealArrayRefs(array, array, realRef, arrayLinksByFuncCalls);
+
+        for (auto& realArray : realRef)
+        {
+            if (std::count(usedAll.begin(), usedAll.end(), realArray) == 0 && added.count(realArray) == 0)
+            {
+                added.insert(realArray);
+                //TODO: for modules
+                if (realArray->GetLocation().first != DIST::l_MODULE)
+                {
+                    auto declInfo = *realArray->GetDeclInfo().begin();
+                    SgStatement* declStat = SgStatement::getStatementByFileAndLine(declInfo.first, declInfo.second);
+                    checkNull(declStat, convertFileName(__FILE__).c_str(), __LINE__);
+
+                    declStat = getFuncStat(declStat);
+                    checkNull(declStat, convertFileName(__FILE__).c_str(), __LINE__);
+
+                    toDeclareByFunc[declStat].insert(realArray->GetDeclSymbol());
+                }
+            }
+        }
+    }
+
+    for (auto& declPair : toDeclareByFunc)
+    {
+        SgStatement* func = declPair.first;
+        const set<Symbol*>& symbols = declPair.second;
+
+        if (!func->switchToFile())
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+        set<string> added;
+        vector<SgExpression*> list;
+        for (auto& s : symbols)
+        {
+            if (added.count(s->identifier()) == 0)
+            {
+                added.insert(s->identifier());
+                list.push_back(new SgVarRefExp(s));
+            }
+        }
+
+        func->insertStmtAfter(*new SgStatement(ACC_DECLARE_DIR, NULL, NULL, makeExprList(list)), *func);
+    }
+}
+
 void insertDvmhRegions(SgProject& project, int files, const vector<ParallelRegion*>& parallelRegions,
                        map<string, vector<FuncInfo*>>& allFuncInfo,
                        map<string, vector<LoopGraph*>> loopGraph,
@@ -1552,6 +1613,8 @@ void insertDvmhRegions(SgProject& project, int files, const vector<ParallelRegio
         inserters[k]->createInterfaceBlockForParallelFunctions(false);
     }
 
+    insertDeclare(usedArraysInRegions, usedWriteArraysInRegions, arrayLinksByFuncCalls);
+
     for (auto& regionInserter : inserters)
     {
         regionInserter->updateUsedArrays(usedArraysInRegions, usedWriteArraysInRegions);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index bcf1ed3..2a5461c 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2379"
+#define VERSION_SPF "2380"

From 95cfb4446b2bc12d7e48203ce66747acdd9eec45 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Sun, 12 Jan 2025 17:48:08 +0300
Subject: [PATCH 04/44] fixed

---
 .../Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
index 8180f55..bf38814 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
@@ -1509,8 +1509,8 @@ static void insertDeclare(const set<DIST::Array*>& usedArraysInRegions,
             if (std::count(usedAll.begin(), usedAll.end(), realArray) == 0 && added.count(realArray) == 0)
             {
                 added.insert(realArray);
-                //TODO: for modules
-                if (realArray->GetLocation().first != DIST::l_MODULE)
+                //TODO: for common
+                if (realArray->GetLocation().first != DIST::l_COMMON)
                 {
                     auto declInfo = *realArray->GetDeclInfo().begin();
                     SgStatement* declStat = SgStatement::getStatementByFileAndLine(declInfo.first, declInfo.second);

From 15535fad2a6ec0bbbf5c6ad9135557010767a07f Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Mon, 13 Jan 2025 18:16:11 +0300
Subject: [PATCH 05/44] fixed DECLARE

---
 .../Sapfor_2017/_src/CFGraph/CFGraph.cpp      |   4 +-
 .../CFGraph/private_variables_analysis.cpp    |   4 +-
 .../_src/DvmhRegions/DvmhRegionInserter.cpp   | 122 ++++++++++++++----
 .../_src/DvmhRegions/DvmhRegionInserter.h     |  11 +-
 sapfor/experts/Sapfor_2017/_src/Sapfor.cpp    |  42 ++----
 sapfor/experts/Sapfor_2017/_src/Sapfor.h      |   2 +-
 .../_src/Transformations/loop_transform.cpp   |   6 +-
 .../Sapfor_2017/_src/Utils/SgUtils.cpp        |  56 ++++++++
 .../experts/Sapfor_2017/_src/Utils/SgUtils.h  |   1 +
 .../experts/Sapfor_2017/_src/Utils/errors.h   |   5 +-
 .../_src/Utils/russian_errors_text.txt        |   2 +
 .../experts/Sapfor_2017/_src/Utils/version.h  |   2 +-
 .../_src/VisualizerCalls/get_information.cpp  |  18 ++-
 13 files changed, 193 insertions(+), 82 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.cpp b/sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.cpp
index b00a2b1..4c414d4 100644
--- a/sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.cpp
@@ -724,12 +724,12 @@ static void buildReachingDefs(const map<FuncInfo*, vector<BBlock*>>& CFG, const
     vector<set<FuncInfo*>> callLvlsForRD = groupByCallDependencies(callDeps, scc);
 
     //TODO: take into account ssc structure
-    __spf_print(DEB_PRINT, "count of functions %d, count of lvls %d\n", (int)CFG.size(), (int)callLvlsForRD.size());
+    __spf_print(DEB_PRINT, "  count of functions %d, count of lvls %d\n", (int)CFG.size(), (int)callLvlsForRD.size());
     for (auto& byLvl : callLvlsForRD)
     {
         for (auto& byFunc : byLvl)
         {
-            __spf_print(DEB_PRINT, "   RD time for '%s' function", byFunc->funcName.c_str());
+            __spf_print(DEB_PRINT, "     RD time for '%s' function", byFunc->funcName.c_str());
             auto t = high_resolution_clock::now();
 
             auto itCFG = CFG.find(byFunc);
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.cpp b/sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.cpp
index e10ad27..72f5fc9 100644
--- a/sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.cpp
@@ -46,7 +46,7 @@ void printLoopInfo(const LoopGraph* loop)
     if(!loop_stmt)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-    __spf_print(PRINT_PRIVATES, "loop at file '%s' at line %d\n", loop->fileName.c_str(), loop->lineNum);
+    __spf_print(PRINT_PRIVATES, "  loop in file '%s' at line %d\n", loop->fileName.c_str(), loop->lineNum);
     __spf_print(PRINT_PRIVATES, "    privates:");
     for(const auto& ident : priv)
         __spf_print(PRINT_PRIVATES, " %s", ident.c_str());
@@ -67,7 +67,7 @@ void printLoopInfo(const LoopGraph* loop)
 
         if (extra_old.size() != 0)
         {
-            __spf_print(PRINT_WARNINGS, "[WARNING] extra private variables:");
+            __spf_print(PRINT_WARNINGS, "  [WARNING] extra private variables:");
             for (const auto& ident : extra_old)
                 __spf_print(PRINT_WARNINGS, " %s", ident.c_str());
             __spf_print(PRINT_WARNINGS, "\n");
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
index bf38814..5adc9a5 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
@@ -626,7 +626,7 @@ void DvmhRegionInserter::insertActualDirectives(const vector<ParallelRegion*>* r
     if (SgFile::switchToFile(file->filename()) == -1)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-    __spf_print(1, "Insert actuals for file %s\n", file->filename());
+    __spf_print(1, "  Insert actuals for file %s\n", file->filename());
         
     for (auto& func : funcsForFile)
     {
@@ -663,7 +663,7 @@ void DvmhRegionInserter::insertActualDirectives(const vector<ParallelRegion*>* r
 
     if (regs)
     {
-        __spf_print(1, "Insert actuals for arrays copying before and after parallelization areas\n");
+        __spf_print(1, "  Insert actuals for arrays copying before and after parallelization areas\n");
         for (auto& area : *regs)
         {
             auto lines = area->GetLines(file->filename());
@@ -719,10 +719,10 @@ vector<SgExpression*> DvmhRegionInserter::getArrayList(Statement* start, Stateme
 
 void DvmhRegionInserter::insertDirectives(const vector<ParallelRegion*> *regs)
 {
-    __spf_print(1, "Find edges for regions\n");
+    __spf_print(1, "  Find edges for regions\n");
     findEdgesForRegions(loopGraph);
 
-    __spf_print(1, "Merging regions\n");
+    __spf_print(1, "  Merging regions\n");
     auto merger = RegionsMerger(regions, rw_analyzer);
     regions = merger.mergeRegions();
 
@@ -735,7 +735,7 @@ void DvmhRegionInserter::insertDirectives(const vector<ParallelRegion*> *regs)
         }
     }
 
-    __spf_print(1, "Insert regions\n");
+    __spf_print(1, "  Insert regions\n");
     insertRegionDirectives();
 }
 
@@ -1201,6 +1201,33 @@ static SgExpression* getPrivateArraysInPar(const FuncInfo* funcInfo, const std::
         return NULL;
 }
 
+static SgStatement* getInsertionPlace(SgStatement* func)
+{
+    SgStatement* place = func->lexNext();
+    SgStatement* insertAfter = NULL;
+    for (auto st = place; st != func->lastNodeOfStmt(); st = st->lexNext())
+    {
+        if (isSPF_stat(st) || isDVM_stat(st))
+            continue;
+
+        if (st->variant() == CONTAINS_STMT)
+            break;
+
+        if (isSgExecutableStatement(st))
+            break;
+
+        if (st->variant() == IMPL_DECL)
+            insertAfter = st;
+        else if (st->variant() == USE_STMT)
+            insertAfter = st;
+    }
+
+    if (insertAfter)
+        return insertAfter->lexNext();
+    else
+        return place;
+}
+
 static void insertRoutine(SgStatement* func, const FuncInfo* funcInfo, const std::set<LoopGraph*>& inLoops,
                           const map<DIST::Array*, set<DIST::Array*>>& arrayLinksByFuncCalls)
 {
@@ -1224,9 +1251,9 @@ static void insertRoutine(SgStatement* func, const FuncInfo* funcInfo, const std
     
     if (!routine)
     {
-        st = func->lexNext();
+        st = getInsertionPlace(func);
         routine = new SgStatement(ACC_ROUTINE_DIR);
-        st->insertStmtBefore(*routine, *st->controlParent());
+        st->insertStmtBefore(*routine, *func);
     }
 
     SgExpression* list = getPrivateArraysInPar(funcInfo, inLoops, arrayLinksByFuncCalls, routine->expr(0));
@@ -1487,10 +1514,14 @@ void DvmhRegionInserter::addUsedWriteArrays(set<DIST::Array*>& arrays)
     }
 }
 
-static void insertDeclare(const set<DIST::Array*>& usedArraysInRegions,
-                          const set<DIST::Array*>& usedWriteArraysInRegions,
-                          const map<DIST::Array*, set<DIST::Array*>> arrayLinksByFuncCalls)
+static set<DIST::Array*> 
+    insertDeclare(const set<DIST::Array*>& usedArraysInRegions,
+                  const set<DIST::Array*>& usedWriteArraysInRegions,
+                  const map<DIST::Array*, set<DIST::Array*>> arrayLinksByFuncCalls,
+                  SgStatement* main)
 {
+    set<DIST::Array*> commonArrays;
+
     vector<DIST::Array*> usedAll;
     std::set_union(usedArraysInRegions.begin(), usedArraysInRegions.end(),
                    usedWriteArraysInRegions.begin(), usedWriteArraysInRegions.end(),
@@ -1506,22 +1537,45 @@ static void insertDeclare(const set<DIST::Array*>& usedArraysInRegions,
 
         for (auto& realArray : realRef)
         {
-            if (std::count(usedAll.begin(), usedAll.end(), realArray) == 0 && added.count(realArray) == 0)
+            if (added.count(realArray) != 0 || !realArray->IsNotDistribute())
+                continue;
+
+            SgStatement* declStat = NULL;
+
+            if (realArray->GetLocation().first != DIST::l_COMMON)
             {
-                added.insert(realArray);
-                //TODO: for common
-                if (realArray->GetLocation().first != DIST::l_COMMON)
+                if (std::count(usedAll.begin(), usedAll.end(), realArray) == 0)
                 {
                     auto declInfo = *realArray->GetDeclInfo().begin();
-                    SgStatement* declStat = SgStatement::getStatementByFileAndLine(declInfo.first, declInfo.second);
+                    declStat = SgStatement::getStatementByFileAndLine(declInfo.first, declInfo.second);
                     checkNull(declStat, convertFileName(__FILE__).c_str(), __LINE__);
-
-                    declStat = getFuncStat(declStat);
-                    checkNull(declStat, convertFileName(__FILE__).c_str(), __LINE__);
-
-                    toDeclareByFunc[declStat].insert(realArray->GetDeclSymbol());
                 }
             }
+            else
+            {
+                commonArrays.insert(realArray);
+                auto decls = realArray->GetDeclInfo();
+                for (auto& decl : decls)
+                {
+                    declStat = SgStatement::getStatementByFileAndLine(decl.first, decl.second);
+                    checkNull(declStat, convertFileName(__FILE__).c_str(), __LINE__);
+
+                    if (declStat != main)
+                    {
+                        declStat = NULL;
+                        continue;
+                    }
+                }
+            }
+
+            if (declStat)
+            {
+                added.insert(realArray);
+                declStat = getFuncStat(declStat);
+                checkNull(declStat, convertFileName(__FILE__).c_str(), __LINE__);
+
+                toDeclareByFunc[declStat].insert(realArray->GetDeclSymbol());
+            }
         }
     }
 
@@ -1544,16 +1598,22 @@ static void insertDeclare(const set<DIST::Array*>& usedArraysInRegions,
             }
         }
 
-        func->insertStmtAfter(*new SgStatement(ACC_DECLARE_DIR, NULL, NULL, makeExprList(list)), *func);
+        auto place = getInsertionPlace(func);
+        place->insertStmtBefore(*new SgStatement(ACC_DECLARE_DIR, NULL, NULL, makeExprList(list)), *func);
     }
+
+    return commonArrays;
 }
 
-void insertDvmhRegions(SgProject& project, int files, const vector<ParallelRegion*>& parallelRegions,
-                       map<string, vector<FuncInfo*>>& allFuncInfo,
-                       map<string, vector<LoopGraph*>> loopGraph,
-                       ReadWriteAnalyzer& rw_analyzer,
-                       const map<DIST::Array*, set<DIST::Array*>> arrayLinksByFuncCalls)
+int insertDvmhRegions(SgProject& project, int files, const vector<ParallelRegion*>& parallelRegions,
+                      map<string, vector<FuncInfo*>>& allFuncInfo,
+                      map<string, vector<LoopGraph*>> loopGraph,
+                      ReadWriteAnalyzer& rw_analyzer,
+                      map<string, vector<Messages>>& SPF_messages,
+                      const map<DIST::Array*, set<DIST::Array*>> arrayLinksByFuncCalls)
 {
+    int internalExit = 0;
+
     vector<DvmhRegionInserter*> inserters;
     const bool regionCondition = ((parallelRegions.size() == 0 && parallelRegions[0]->GetName() == "DEFAULT") || sharedMemoryParallelization == 1);
 
@@ -1563,7 +1623,7 @@ void insertDvmhRegions(SgProject& project, int files, const vector<ParallelRegio
     for (int i = files - 1; i >= 0; --i)
     {
         SgFile* file = &(project.file(i));
-        __spf_print(1, "Start region inserter for file %s\n", file->filename());
+        __spf_print(1, "  ==> Start region inserter for file %s\n", file->filename());
 
         map<string, FuncInfo*> mapOfFuncs;
         createMapOfFunc(allFuncInfo, mapOfFuncs);
@@ -1613,7 +1673,11 @@ void insertDvmhRegions(SgProject& project, int files, const vector<ParallelRegio
         inserters[k]->createInterfaceBlockForParallelFunctions(false);
     }
 
-    insertDeclare(usedArraysInRegions, usedWriteArraysInRegions, arrayLinksByFuncCalls);
+    SgStatement* main = findMainUnit(&project, SPF_messages);
+    checkNull(main, convertFileName(__FILE__).c_str(), __LINE__);
+
+    set<DIST::Array*> commonArrays = insertDeclare(usedArraysInRegions, usedWriteArraysInRegions, arrayLinksByFuncCalls, main);
+    internalExit = checkCommonInMainUnit(project, SPF_messages, commonArrays, false);
 
     for (auto& regionInserter : inserters)
     {
@@ -1625,4 +1689,6 @@ void insertDvmhRegions(SgProject& project, int files, const vector<ParallelRegio
             regionInserter->insertActualDirectives(&parallelRegions);
         delete regionInserter;
     }
+
+    return internalExit;
 }
\ No newline at end of file
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h
index 2e48afb..eba428d 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h
@@ -112,8 +112,9 @@ public:
     }
 };
 
-void insertDvmhRegions(SgProject& project, int files, const std::vector<ParallelRegion*>& parallelRegions,
-                       std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo,
-                       std::map<std::string, std::vector<LoopGraph*>> loopGraph,
-                       ReadWriteAnalyzer& rw_analyzer,
-                       const std::map<DIST::Array*, std::set<DIST::Array*>> arrayLinksByFuncCalls);
+int insertDvmhRegions(SgProject& project, int files, const std::vector<ParallelRegion*>& parallelRegions,
+                      std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo,
+                      std::map<std::string, std::vector<LoopGraph*>> loopGraph,
+                      ReadWriteAnalyzer& rw_analyzer,
+                      std::map<std::string, std::vector<Messages>>& SPF_messages,
+                      const std::map<DIST::Array*, std::set<DIST::Array*>> arrayLinksByFuncCalls);
diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
index 9781d75..f67870d 100644
--- a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
@@ -1439,40 +1439,11 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                     ALGORITHMS_DONE[CREATE_ALIGNS][z] = 1;
                 }
 
-                SgStatement* mainUnit = findMainUnit(&project, SPF_messages);
-                checkNull(mainUnit, convertFileName(__FILE__).c_str(), __LINE__);
-
-                map<string, vector<SgExpression*>> commonBlocks;
-                getCommonBlocksRef(commonBlocks, mainUnit, mainUnit->lastNodeOfStmt());
-
-                // check array declaration
+                set<DIST::Array*> toCheck;
                 for (auto& arrayP : dataDirectives.GenAlignsRules(NULL))
-                {
-                    auto array = arrayP.alignArray;
-                    if (array->IsLoopArray() || array->IsTemplate())
-                        continue;
-                    if (array->GetLocation().first == DIST::l_COMMON)
-                    {
-                        auto nameOfCommon = array->GetLocation().second;
-                        if (commonBlocks.find(nameOfCommon) == commonBlocks.end())
-                        {
-                            auto declPlaces = array->GetDeclInfo();
-                            for (auto& place : declPlaces)
-                            {
-                                vector<Messages>& currMessages = getObjectForFileFromMap(place.first.c_str(), SPF_messages);
-                                __spf_print(1, "  ERROR: distributed array '%s' in common block '%s' must have declaration in main unit\n", array->GetShortName().c_str(), nameOfCommon.c_str());
+                    toCheck.insert(arrayP.alignArray);
 
-                                wstring messageE, messageR;
-                                __spf_printToLongBuf(messageE, L"distributed array '%s' in common block '%s' must have declaration in main unit",
-                                    to_wstring(array->GetShortName()).c_str(), to_wstring(nameOfCommon).c_str());
-                                __spf_printToLongBuf(messageR, R75,
-                                    to_wstring(array->GetShortName()).c_str(), to_wstring(nameOfCommon).c_str());
-                                currMessages.push_back(Messages(ERROR, place.second, messageR, messageE, 1042));
-                            }
-                            internalExit = 1;
-                        }
-                    }
-                }
+                internalExit = checkCommonInMainUnit(project, SPF_messages, toCheck, true);
 
                 __spf_print(1, "*** FOR PARALLEL REGION '%s':\n", parallelRegions[z]->GetName().c_str());
                 result = dataDirectives.GenAlignsRules();
@@ -1493,7 +1464,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         int allLineSum = 0;
         for (auto &elem : lineInfo)
             allLineSum += elem.second;
-        __spf_print(1, "All lines in project %d\n", allLineSum);
+        __spf_print(1, "  All lines in project %d\n", allLineSum);
     }
     else if (curr_regime == FILL_PAR_REGIONS_LINES)
     {
@@ -1870,7 +1841,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
     else if (curr_regime == INLINE_PROCEDURES)
         callInliner(allFuncInfo, inDataProc, inDataChains, inDataChainsStart, SPF_messages, commonBlocks);
     else if (curr_regime == INSERT_REGIONS)
-        insertDvmhRegions(project, n, parallelRegions, allFuncInfo, loopGraph, rw_analyzer, arrayLinksByFuncCalls);
+        internalExit = insertDvmhRegions(project, n, parallelRegions, allFuncInfo, loopGraph, rw_analyzer, SPF_messages, arrayLinksByFuncCalls);
     else if (curr_regime == RENAME_SYMBOLS)
         runRenameSymbols(&project, commonBlocks);
     else if (curr_regime == FIND_PARAMETERS)
@@ -2618,6 +2589,9 @@ int main(int argc, char **argv)
             }
         }
 
+        if (curr_regime == INSERT_PARALLEL_DIRS_NODIST)
+            ignoreArrayDistributeState = true;
+
         if (runAsClient)
         {
             printf("[SAPFOR]: Started as client with server port %d\n", serverPort);
diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.h b/sapfor/experts/Sapfor_2017/_src/Sapfor.h
index d37b0fb..e198210 100644
--- a/sapfor/experts/Sapfor_2017/_src/Sapfor.h
+++ b/sapfor/experts/Sapfor_2017/_src/Sapfor.h
@@ -206,7 +206,7 @@ enum options {
     KEEP_GCOV,
     ANALYSIS_OPTIONS,
     DEBUG_PRINT_ON,
-    MPI_PROGRAM,
+    SHARED_MEMORY,
     IGNORE_IO_SAPFOR,
     KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS,
     PARSE_FOR_INLINE,
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.cpp b/sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.cpp
index d8adf97..b720652 100644
--- a/sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.cpp
@@ -604,7 +604,7 @@ bool createNestedLoops(LoopGraph *current, const map<LoopGraph*, void*> &depInfo
                 if (outerTightened)
                     firstChild->perfectLoop = countPerfectLoopNest(firstChild->loop);
 
-                __spf_print(1, "createNestedLoops for loop at %d. Tighten success: %d\n", current->lineNum, outerTightened);
+                __spf_print(1, "  createNestedLoops for loop at %d. Tighten success: %d\n", current->lineNum, outerTightened);
 
                 wchar_t buf[256];
                 std::wstring messageE, messageR;
@@ -619,14 +619,14 @@ bool createNestedLoops(LoopGraph *current, const map<LoopGraph*, void*> &depInfo
     wasTightened = outerTightened;
     for (int i = 0; i < current->children.size(); ++i) 
     {
-        __spf_print(1, "createNestedLoops for loop at %d. Transform child %d\n", current->lineNum, i);
+        __spf_print(1, "  createNestedLoops for loop at %d. Transform child %d\n", current->lineNum, i);
         bool result = createNestedLoops(current->children[i], depInfoForLoopGraphV, mapFuncInfo, messages);
         wasTightened = wasTightened || result;
     }    
     
     //update perfect loop
     current->recalculatePerfect();
-    __spf_print(1, "createNestedLoops for loop at %d. End\n", current->lineNum);
+    __spf_print(1, "  createNestedLoops for loop at %d. End\n", current->lineNum);
     
     return wasTightened;
 }
\ No newline at end of file
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
index 5f1c00b..39f5c7d 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
@@ -1219,6 +1219,62 @@ void getCommonBlocksRef(map<string, vector<SgExpression*>> &commonBlocks, SgStat
     }
 }
 
+int checkCommonInMainUnit(SgProject& project, map<string, vector<Messages>>& SPF_messages,
+                          const set<DIST::Array*>& arrays, bool forDistrbuted)
+{
+    int internalExit = 0;
+
+    SgStatement* mainUnit = findMainUnit(&project, SPF_messages);
+    checkNull(mainUnit, convertFileName(__FILE__).c_str(), __LINE__);
+
+    map<string, vector<SgExpression*>> commonBlocks;
+    getCommonBlocksRef(commonBlocks, mainUnit, mainUnit->lastNodeOfStmt());
+
+    // check array declaration
+    for (auto& array : arrays)
+    {
+        if (array->IsLoopArray() || array->IsTemplate())
+            continue;
+        if (array->GetLocation().first == DIST::l_COMMON)
+        {
+            auto nameOfCommon = array->GetLocation().second;
+            if (commonBlocks.find(nameOfCommon) == commonBlocks.end())
+            {
+                auto declPlaces = array->GetDeclInfo();
+                for (auto& place : declPlaces)
+                {
+                    vector<Messages>& currMessages = getObjectForFileFromMap(place.first.c_str(), SPF_messages);
+                    if (forDistrbuted)
+                    {
+                        __spf_print(1, "  ERROR: distributed array '%s' in common block '%s' must have declaration in main unit\n", array->GetShortName().c_str(), nameOfCommon.c_str());
+
+                        wstring messageE, messageR;
+                        __spf_printToLongBuf(messageE, L"distributed array '%s' in common block '%s' must have declaration in main unit",
+                            to_wstring(array->GetShortName()).c_str(), to_wstring(nameOfCommon).c_str());
+                        __spf_printToLongBuf(messageR, R75,
+                            to_wstring(array->GetShortName()).c_str(), to_wstring(nameOfCommon).c_str());
+                        currMessages.push_back(Messages(ERROR, place.second, messageR, messageE, 1042));
+                    }
+                    else
+                    {
+                        __spf_print(1, "  ERROR: array '%s' in common block '%s' must have declaration in main unit for DECLARE insertion\n", array->GetShortName().c_str(), nameOfCommon.c_str());
+
+                        wstring messageE, messageR;
+                        __spf_printToLongBuf(messageE, L"array '%s' in common block '%s' must have declaration in main unit for DECLARE insertion",
+                            to_wstring(array->GetShortName()).c_str(), to_wstring(nameOfCommon).c_str());
+                        __spf_printToLongBuf(messageR, R205,
+                            to_wstring(array->GetShortName()).c_str(), to_wstring(nameOfCommon).c_str());
+                        currMessages.push_back(Messages(ERROR, place.second, messageR, messageE, 1062));
+                    }
+                }
+                internalExit = 1;
+            }
+        }
+    }
+
+    return internalExit;
+}
+
 static SgExpression* isInCommon(const vector<SgExpression*> &commonBlocks, const char *arrayName, int &commonPos)
 {
     commonPos = 0;
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h
index 6ad3937..ff889c0 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h
@@ -31,6 +31,7 @@ bool isDVM_stat(SgStatement *st);
 bool isSPF_stat(SgStatement *st);
 bool isEqExpressions(SgExpression *left, SgExpression *right, std::map<SgExpression*, std::string> &collection);
 void getCommonBlocksRef(std::map<std::string, std::vector<SgExpression*>> &commonBlocks, SgStatement *start, SgStatement *end, const std::string *nameToSkip = NULL);
+int checkCommonInMainUnit(SgProject& project, std::map<std::string, std::vector<Messages>>& SPF_messages, const std::set<DIST::Array*>& arrays, bool forDistrbuted);
 
 std::tuple<int, std::string, std::string> getFromUniqTable(SgSymbol *symb);
 std::tuple<int, std::string, std::string> getUniqName(const std::map<std::string, std::vector<SgExpression*>> &commonBlocks, SgStatement *decl, SgSymbol *symb);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/errors.h b/sapfor/experts/Sapfor_2017/_src/Utils/errors.h
index 565d4b6..82e198b 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/errors.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/errors.h
@@ -75,6 +75,7 @@ enum typeMessage { WARR, ERROR, NOTE };
 //   59 "Reduction by element of array '%s' is not implemented yet"
 //   60 "Format misplaced"
 //   61 "Array has declaration area conflict"
+//   62 "need to move common declaration to main for DECLATE"
 // 
 // 20xx TRANSFORM GROUP
 //   01 "can not convert array assign to loop"
@@ -276,7 +277,7 @@ static void printStackTrace() { };
     } \
 } while (0)
 
-// Свободный - R205
+// Свободный - R206
 // Гайд по русификации сообщений: При добавлении нового сообщения, меняется последний сводобный идентификатор.
 // В этом файле остаются только спецификаторы, для которых будет заполнен текст. Полный текст пишется в файле
 // russian_errors_text.txt. Спецификаторы там тоже сохраняются, по ним в визуализаторе будет восстановлен 
@@ -473,6 +474,8 @@ static const wchar_t *R182 = L"R176:%s";
 static const wchar_t *R183 = L"R183:";
 //1061
 static const wchar_t *R184 = L"R184:%s";
+//1062
+static const wchar_t* R205 = L"R205:%s#%s";
 
 //2001
 static const wchar_t *R94 = L"R94:";
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt b/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt
index 0d254e3..cf2c8f3 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt
@@ -184,6 +184,8 @@ R182 = "Редукционная операция по элементу масс
 R183 = "Расположение операторов FORMAT не поддерживается, попробуйте применить проход Коррекция стиля кода".
 //1061
 R184 = "Область объявления массива '%s' конфликтует с предыдущей областью. Возможно, это вызвано использованием include-файлов. Попробуйте применить проход 'Подстановка заголовочных файлов'".
+//1042
+R205 = "Массив '%s' состоящий в common блоке '%s' должен иметь описание в главной программной единице для объявления в директиве DECLARE"
 
 //2001
 R94 = "Невозможно автоматически преобразовать данное присваивание к циклу"
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 2a5461c..a501899 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2380"
+#define VERSION_SPF "2381"
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.cpp b/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.cpp
index 7caba1e..8019846 100644
--- a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.cpp
@@ -96,6 +96,7 @@ static char* ConvertShortToChar(const short* source, int& strL)
     return dist;
 }
 
+extern bool ignoreArrayDistributeState;
 static void setOptions(const short* options, bool isBuildParallel = false, const set<int>* turnOffOptions = NULL)
 {
     if (!optionNames[STATIC_SHADOW_ANALYSIS])
@@ -113,7 +114,7 @@ static void setOptions(const short* options, bool isBuildParallel = false, const
         optionNames[KEEP_GCOV] = "KEEP_GCOV";
         optionNames[ANALYSIS_OPTIONS] = "ANALYSIS_OPTIONS";
         optionNames[DEBUG_PRINT_ON] = "DEBUG_PRINT_ON";
-        optionNames[MPI_PROGRAM] = "MPI_PROGRAM";
+        optionNames[SHARED_MEMORY] = "SHARED_MEMORY";
         optionNames[IGNORE_IO_SAPFOR] = "IGNORE_IO_SAPFOR";
         optionNames[KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS] = "KEEP_SPF_DIRECTIVES_AMONG_TRANSFORMATIONS";
         optionNames[PARSE_FOR_INLINE] = "PARSE_FOR_INLINE";
@@ -137,12 +138,12 @@ static void setOptions(const short* options, bool isBuildParallel = false, const
         if (splited.size() == z)
             break;
 
-        __spf_print(1, "read value '%s' to '%s' option\n", splited[z].c_str(), optionNames[z]);
+        __spf_print(1, "  read value '%s' to '%s' option\n", splited[z].c_str(), optionNames[z]);
         if (z != ANALYSIS_OPTIONS)
         {
             if (sscanf(splited[z].c_str(), "%d", &intOptions[z]) != 1)
             {
-                __spf_print(1, "!wrong value!\n");
+                __spf_print(1, "  !wrong value!\n");
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
             }
         }
@@ -166,7 +167,7 @@ static void setOptions(const short* options, bool isBuildParallel = false, const
     removeNestedIntervals = (intOptions[KEEP_LOOPS_CLOSE_NESTING] == 1);
     showDebug = (intOptions[DEBUG_PRINT_ON] == 1);
 
-    sharedMemoryParallelization =         (sharedMemoryParallelization != 1) ? intOptions[MPI_PROGRAM] : sharedMemoryParallelization;
+    sharedMemoryParallelization =         (sharedMemoryParallelization != 1) ? intOptions[SHARED_MEMORY] : sharedMemoryParallelization;
     parallizeFreeLoops = (sharedMemoryParallelization == 1) ? 0 : intOptions[PARALLIZE_FREE_LOOPS];
     ignoreIO =           (sharedMemoryParallelization == 1) ? 1 : intOptions[IGNORE_IO_SAPFOR];
     keepDvmDirectives =  (sharedMemoryParallelization == 1) ? 0 : intOptions[KEEP_DVM_DIRECTIVES];
@@ -175,6 +176,11 @@ static void setOptions(const short* options, bool isBuildParallel = false, const
 
     string optAnalisys = splited.size() > ANALYSIS_OPTIONS ? splited[ANALYSIS_OPTIONS] : "";
 
+    if (sharedMemoryParallelization == 1)
+        ignoreArrayDistributeState = true;
+    else
+        ignoreArrayDistributeState = false;
+
     if (!turnOffOptions)
         return;
 
@@ -820,7 +826,10 @@ int SPF_GetArrayDistribution(void*& context, int winHandler, short *options, sho
         else if (regime == 1)
         {
             if (sharedMemoryParallelization)
+            {
+                ignoreArrayDistributeState = true;
                 runPassesForVisualizer(projName, { LOOP_ANALYZER_NODIST });
+            }
             else
                 runPassesForVisualizer(projName, { LOOP_ANALYZER_DATA_DIST_S1 });
         }
@@ -1875,7 +1884,6 @@ int SPF_ExpressionSubstitution(void*& context, int winHandler, short* options, s
     return simpleTransformPass(SUBST_EXPR_RD_AND_UNPARSE, options, projName, folderName, output, outputSize, outputMessage, outputMessageSize);
 }
 
-extern bool ignoreArrayDistributeState;
 int SPF_InsertDvmhRegions(void*& context, int winHandler, short* options, short* projName, short* folderName, short*& output,
                           int*& outputSize, short*& outputMessage, int*& outputMessageSize)
 {

From 3c924aee732e355e25ca85306fe404fc708b88aa Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Wed, 15 Jan 2025 15:23:49 +0300
Subject: [PATCH 06/44] fixed DECLARE

---
 sapfor/experts/Sapfor_2017/_src/Sapfor.cpp    | 20 +++++++++++++++++++
 .../experts/Sapfor_2017/_src/Utils/version.h  |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
index f67870d..0ba30d9 100644
--- a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
@@ -1604,6 +1604,26 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                 }
             }
         }
+
+        if (curr_regime == EXTRACT_PARALLEL_DIRS)
+        {
+            for (int i = n - 1; i >= 0; --i)
+            {
+                SgFile* file = &(project.file(i));
+
+                SgStatement* st = file->firstStatement();
+                vector<SgStatement*> declares;
+                while (st)
+                {
+                    if (st->variant() == ACC_DECLARE_DIR)
+                        declares.push_back(st);
+                    st = st->lexNext();
+                }
+
+                for (auto& elem : declares)
+                    elem->deleteStmt();
+            }
+        }
     }
     else if (curr_regime == DEF_USE_STAGE1)
     {
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index a501899..8e88559 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2381"
+#define VERSION_SPF "2382"

From 8879eb2fbf33d01c7093355783a36410257d17e6 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Fri, 24 Jan 2025 17:33:55 +0300
Subject: [PATCH 07/44] updated dvm

---
 dvm/fdvm/trunk/fdvm/acc.cpp        | 14 ++++++--------
 dvm/fdvm/trunk/fdvm/acc_across.cpp |  9 ++++-----
 dvm/fdvm/trunk/fdvm/calls.cpp      | 19 ++++++++++++++-----
 dvm/fdvm/trunk/fdvm/funcall.cpp    | 10 ++++++++++
 dvm/fdvm/trunk/include/dvm.h       |  3 ++-
 5 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/dvm/fdvm/trunk/fdvm/acc.cpp b/dvm/fdvm/trunk/fdvm/acc.cpp
index 26a145e..8f6ff5f 100644
--- a/dvm/fdvm/trunk/fdvm/acc.cpp
+++ b/dvm/fdvm/trunk/fdvm/acc.cpp
@@ -37,7 +37,6 @@ static SgSymbol *s_end[MAX_LOOP_LEVEL], *s_blocksS_k[MAX_LOOP_LEVEL], *s_loopSte
 static SgType *type_DvmType, *type_CudaIndexType, *type_with_len_DvmType, *type_FortranDvmType, *CudaIndexType_k;
 static int loopIndexCount;
 
-
 //------ C ----------
 static const char *red_kernel_func_names[] = {
     NULL,
@@ -55,7 +54,6 @@ static const char *fermiPreprocDir = "CUDA_FERMI_ARCH";
 static SgSymbol *s_CudaIndexType, *s_CudaOffsetTypeRef, *s_DvmType;
 static SgStatement *end_block, *end_info_block;
 
-int warpSize = 32;
 reduction_operation_list *red_struct_list;
 symb_list *shared_list, *acc_call_list, *by_value_list;
 
@@ -10369,7 +10367,7 @@ SgStatement *Assign_To_IndVar2(SgStatement *dost, int i, int nloop)
     {
         eth = ThreadIdxRefExpr("x");
         if (currentLoop && currentLoop->irregularAnalysisIsOn())
-            es = &((*new SgVarRefExp(s_cur_blocks) * *new SgRecordRefExp(*s_blockdim, "x") + *eth) / *new SgValueExp(warpSize));
+            es = &((*new SgVarRefExp(s_cur_blocks) * *new SgRecordRefExp(*s_blockdim, "x") + *eth) / *new SgVarRefExp(s_warpsize));
         else
             es = &(*new SgVarRefExp(s_cur_blocks) * *new SgRecordRefExp(*s_blockdim, "x") + *eth);
         es = step_e == NULL ? es : &(*es * *step_e);
@@ -14174,7 +14172,7 @@ SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
         stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_overallBlocks), *new SgArrayRefExp(*s_blocksS, *new SgValueExp(0))));
         st_end->insertStmtBefore(*stmt, *st_hedr);
         if (currentLoop && currentLoop->irregularAnalysisIsOn())
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_restBlocks), *new SgVarRefExp(*s_overallBlocks) * *new SgValueExp(warpSize)));
+            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_restBlocks), *new SgVarRefExp(*s_overallBlocks) * *new SgVarRefExp(s_warpsize)));
         else
             stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_restBlocks), *new SgVarRefExp(*s_overallBlocks)));
         st_end->insertStmtBefore(*stmt, *st_hedr);
@@ -14194,7 +14192,7 @@ SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
         /* ------ block for prepare reductions ----*/
         if (red_list)
         {
-            InsertAssignForReduction(st_end, s_num_of_red_blocks, s_fill_flag, s_overallBlocks, s_threads);
+            InsertAssignForReduction(st_end, s_num_of_red_blocks, s_fill_flag, s_overallBlocks, s_threads, s_loop_ref);
             if(!options.isOn(C_CUDA))
                 InsertDoWhileForRedCount_C(st_end, s_threads, s_red_count);
             InsertPrepareReductionCalls(st_end, s_loop_ref, s_num_of_red_blocks, s_fill_flag, s_red_num);
@@ -14237,7 +14235,7 @@ SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
           }
         if (currentLoop && currentLoop->irregularAnalysisIsOn())
         {
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_max_blocks), *new SgVarRefExp(*s_max_blocks) / *new SgValueExp(warpSize) * *new SgValueExp(warpSize)));
+            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_max_blocks), *new SgVarRefExp(*s_max_blocks) / *GetWarpSize(s_loop_ref) * *GetWarpSize(s_loop_ref)));
             st_end->insertStmtBefore(*stmt, *st_hedr);
         }
 
@@ -14751,7 +14749,7 @@ void InsertDoWhileForRedCount_C(SgStatement *cp, SgSymbol *s_threads, SgSymbol *
   */
 }
 
-void InsertAssignForReduction(SgStatement *st_where, SgSymbol *s_num_of_red_blocks, SgSymbol *s_fill_flag, SgSymbol *s_overallBlocks, SgSymbol *s_threads)
+void InsertAssignForReduction(SgStatement *st_where, SgSymbol *s_num_of_red_blocks, SgSymbol *s_fill_flag, SgSymbol *s_overallBlocks, SgSymbol *s_threads, SgSymbol* s_loop_ref)
 {
     // inserting before statement 'st_where' the block of assignments:
     SgStatement *ass;
@@ -14762,7 +14760,7 @@ void InsertAssignForReduction(SgStatement *st_where, SgSymbol *s_num_of_red_bloc
 
     SgExpression *re = new SgVarRefExp(*s_overallBlocks); 
     if(options.isOn(C_CUDA))
-        re = &(*re * (*new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *new SgValueExp(warpSize)));
+        re = &(*re * (*new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *GetWarpSize(s_loop_ref)));
     ass = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_num_of_red_blocks), *re));
     st_where->insertStmtBefore(*ass, *st_where->controlParent());
     ass->addComment("// Prepare reduction");
diff --git a/dvm/fdvm/trunk/fdvm/acc_across.cpp b/dvm/fdvm/trunk/fdvm/acc_across.cpp
index 6ab4e28..d4bc926 100644
--- a/dvm/fdvm/trunk/fdvm/acc_across.cpp
+++ b/dvm/fdvm/trunk/fdvm/acc_across.cpp
@@ -26,7 +26,6 @@ extern SgExpression *CudaReplicate(SgSymbol *, SgSymbol *, SgSymbol *, SgSymbol
 extern SgStatement *IncludeLine(char*);
 extern void optimizeLoopBodyForOne(vector<newInfo> &allNewInfo);
 extern void searchIdxs(vector<acrossInfo> &allInfo, SgExpression *st);
-extern int warpSize;
 
 // local functions
 vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol*, SgSymbol*, const int, const int, const int, const vector<SageSymbols>&, const vector<SageSymbols>&);
@@ -2904,7 +2903,7 @@ vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol *sadapt
                 e = &SgAssignOp(*new SgVarRefExp(*red_blocks),
                     (*new SgRecordRefExp(*s_blocks, "x") * *new SgRecordRefExp(*s_blocks, "y") * *new SgRecordRefExp(*s_blocks, "z") *
                     *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z"))
-                    / *new SgValueExp(warpSize));
+                    / *GetWarpSize(s_loop_ref));
                 stmt = new SgCExpStmt(*e);
                 st_end->insertStmtBefore(*stmt, *st_hedr);
             }
@@ -3217,7 +3216,7 @@ vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol *sadapt
                 e = &SgAssignOp(*new SgVarRefExp(*red_blocks), (*new SgVarRefExp(q) / *new SgVarRefExp(nums[0]) +
                                 SgNeqOp(*new SgVarRefExp(q) % *new SgVarRefExp(nums[0]), *new SgValueExp(0))) *
                                 *new SgRecordRefExp(*s_blocks, "y") *
-                                *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *new SgValueExp(warpSize));
+                                *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *GetWarpSize(s_loop_ref));
                 stmt = new SgCExpStmt(*e);
                 st_end->insertStmtBefore(*stmt, *st_hedr);
             }
@@ -3226,7 +3225,7 @@ vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol *sadapt
                 e = &SgAssignOp(*new SgVarRefExp(*red_blocks), (*new SgVarRefExp(q) / *new SgVarRefExp(nums[0]) +
                                 SgNeqOp(*new SgVarRefExp(q) % *new SgVarRefExp(nums[0]), *new SgValueExp(0))) *
                                 *new SgRecordRefExp(*s_blocks, "y") * *new SgRecordRefExp(*s_blocks, "z") *
-                                *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *new SgValueExp(warpSize));
+                                *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *GetWarpSize(s_loop_ref));
                 stmt = new SgCExpStmt(*e);
                 st_end->insertStmtBefore(*stmt, *st_hedr);
             }
@@ -3672,7 +3671,7 @@ vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol *sadapt
                                 SgNeqOp(*new SgVarRefExp(Emin) % *new SgVarRefExp(nums[0]), *new SgValueExp(0))) *
                                 (*f_m2 / *new SgVarRefExp(nums[1]) + SgNeqOp(*f_m2 % *new SgVarRefExp(nums[1]), *new SgValueExp(0)))
                                 * *new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[2]) *
-                                *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *new SgValueExp(warpSize));
+                                *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *GetWarpSize(s_loop_ref));
                 stmt = new SgCExpStmt(*e);
                 st_end->insertStmtBefore(*stmt, *st_hedr);
             }
diff --git a/dvm/fdvm/trunk/fdvm/calls.cpp b/dvm/fdvm/trunk/fdvm/calls.cpp
index 996d03b..7a08ba3 100644
--- a/dvm/fdvm/trunk/fdvm/calls.cpp
+++ b/dvm/fdvm/trunk/fdvm/calls.cpp
@@ -27,6 +27,7 @@ int do_stmtfn = 0;
 int gcount = 0;
 int has_generic_interface = 0;
 int in_region = 0;
+int in_routine = 0;
 //-----------------------------------------------------------------------------------------
 graph_node *GraphNode(SgSymbol *s, SgStatement *header_st, int flag_new);
 graph_node *NodeForSymbInGraph(SgSymbol *s, SgStatement *stheader);
@@ -1136,6 +1137,7 @@ SgStatement *Subprogram(SgStatement *func)
     DECL(func->symbol()) = 1;
     HEDR(func->symbol()) = func->thebif;
     cur_func = func;
+    in_routine = 0;
     //if( func->variant() == PROG_HEDR)
     //   PROGRAM_HEADER(func->symbol()) = func->thebif;
 
@@ -1175,7 +1177,9 @@ SgStatement *Subprogram(SgStatement *func)
         case PAUSE_NODE:
         case GOTO_NODE:             // GO TO             
             break;
-
+        case ACC_ROUTINE_DIR:
+            in_routine = 1;
+            break; 
         case VAR_DECL:
         case SWITCH_NODE:           // SELECT CASE ...
         case ARITHIF_NODE:          // Arithmetical IF
@@ -1240,9 +1244,8 @@ END_:
     // for debugging
     if (deb_reg > 1)
         PrintGraphNode(cur_node);
-
+    in_routine = 0;
     return(last);
-
 }
 
 void FunctionCallSearch(SgExpression *e)
@@ -1605,6 +1608,7 @@ void Call_Site(SgSymbol *s, int inlined, SgStatement *stat, SgExpression *e)
 {
     graph_node * gnode, *node_by_attr = NULL;
     SgSymbol *s_new = s;
+    SgStatement *interface_st = NULL;
     //printf("\n%s  id= %d \n", s->identifier(), s->id());
     if (!do_dummy  && isDummyArgument(s)) return;
     if (!do_stmtfn && isStatementFunction(s)) return;
@@ -1614,7 +1618,7 @@ void Call_Site(SgSymbol *s, int inlined, SgStatement *stat, SgExpression *e)
     if(s->variant() == INTERFACE_NAME && in_region)
     {
         //printf("INTERFACE_NAME %s\n",s->identifier());
-        SgStatement *interface_st = getGenericInterface(s, stat ? stat->expr(0) : e->lhs());
+        interface_st = getGenericInterface(s, stat ? stat->expr(0) : e->lhs());
         SgSymbol *s_gen  = s;
         if(!interface_st)
         {
@@ -1648,7 +1652,12 @@ void Call_Site(SgSymbol *s, int inlined, SgStatement *stat, SgExpression *e)
         s_new->addAttribute(GRAPH_NODE, (void*)pnode, sizeof(graph_node *));
     }
     if (gnode->st_header)
-        MarkAsUserProcedure(s_new);  
+        MarkAsUserProcedure(s_new);
+    else if (in_routine && (interface_st || (interface_st = getInterface(s_new)))) 
+    {    
+        SaveInterface(s_new, interface_st); 
+        MarkAsUserProcedure(s_new); 
+    }  
     //printf(" call site on line %d: %d %s: %d %d\n", stat ? stat->lineNumber() : 0, ATTR_NODE(s_new) ? GRAPHNODE(s_new)->id : -1, s_new->identifier(), s_new->id(), s->id());  
 }
 
diff --git a/dvm/fdvm/trunk/fdvm/funcall.cpp b/dvm/fdvm/trunk/fdvm/funcall.cpp
index 2a96aa2..fcef8cb 100644
--- a/dvm/fdvm/trunk/fdvm/funcall.cpp
+++ b/dvm/fdvm/trunk/fdvm/funcall.cpp
@@ -4987,3 +4987,13 @@ SgExpression *DisposePrivateArray(SgSymbol *s_loop_ref, SgSymbol *s_array)
     fe->addArg(*new SgVarRefExp(s_array));
     return(fe);
 }
+
+SgExpression* GetWarpSize(SgSymbol* s_loop_ref)
+{// generating function call: 
+ //                         int dvmh_get_warp_size(DvmType *InDvmhLoop)
+
+    SgFunctionCallExp* fe = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "dvmh_get_warp_size", SgTypeInt(), s_loop_ref->scope()));
+
+    fe->addArg(*new SgVarRefExp(s_loop_ref));
+    return(fe);
+}
diff --git a/dvm/fdvm/trunk/include/dvm.h b/dvm/fdvm/trunk/include/dvm.h
index f743488..3d3be5c 100644
--- a/dvm/fdvm/trunk/include/dvm.h
+++ b/dvm/fdvm/trunk/include/dvm.h
@@ -1366,7 +1366,7 @@ SgStatement *Assign_To_cur_blocks(int i, int nloop);
 SgStatement *Assign_To_rest_blocks(int i);
 SgStatement *Assign_To_IndVar2(SgStatement *dost, int i, int nloop);
 SgExpression *KernelCondition2(SgStatement *dost, int level);
-void InsertAssignForReduction(SgStatement *st_where,SgSymbol *s_num_of_red_blocks,SgSymbol *s_fill_flag,SgSymbol *s_overallBlocks, SgSymbol *s_threads);
+void InsertAssignForReduction(SgStatement *st_where,SgSymbol *s_num_of_red_blocks,SgSymbol *s_fill_flag,SgSymbol *s_overallBlocks, SgSymbol *s_threads, SgSymbol *s_loop_ref);
 void  InsertPrepareReductionCalls(SgStatement *st_where,SgSymbol *s_loop_ref,SgSymbol *s_num_of_red_blocks,SgSymbol *s_fill_flag,SgSymbol *s_red_num);
 void InsertFinishReductionCalls(SgStatement *st_where,SgSymbol *s_loop_ref,SgSymbol *s_red_num);
 SgStatement *IfForHeader(SgSymbol *s_restBlocks, SgSymbol *s_blocks, SgSymbol *s_max_blocks);
@@ -1925,6 +1925,7 @@ SgExpression *GetDeviceProp(SgSymbol *s_loop_ref, SgExpression *ep);
 SgExpression *GetMaxBlocks(SgSymbol *s_loop_ref, SgSymbol *s_max_blocks, SgSymbol *s_needed_bytes);
 SgExpression *GetPrivateArray(SgSymbol *s_loop_ref, SgExpression *e_bytes);
 SgExpression *DisposePrivateArray(SgSymbol *s_loop_ref, SgSymbol *s_array);
+SgExpression* GetWarpSize(SgSymbol* s_loop_ref);
 
 /*  io.cpp      */
 void IO_ThroughBuffer(SgSymbol *ar, SgStatement *stmt, SgExpression *eiostat);

From a14bc20cf4e04d354bfd12552827080ddf2e7701 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Tue, 28 Jan 2025 10:09:10 +0300
Subject: [PATCH 08/44] removed logging from SAPFOR and SERVER, updated NPB and
 fdvm

---
 dvm/fdvm/trunk/fdvm/acc.cpp                         |  7 ++++---
 dvm/fdvm/trunk/fdvm/funcall.cpp                     |  2 +-
 dvm/fdvm/trunk/include/libdvm.h                     |  3 ++-
 dvm/fdvm/trunk/include/libnum.h                     |  1 +
 dvm/fdvm/trunk/parser/sym.c                         |  3 ++-
 .../Performance/NPB/FDVMH.fdv/BT/Makefile           | 12 ++++++------
 .../Performance/NPB/FDVMH.fdv/CG/Makefile           |  8 +++++---
 .../Performance/NPB/FDVMH.fdv/EP/Makefile           |  4 ++--
 .../Performance/NPB/FDVMH.fdv/FT/Makefile           |  4 ++--
 .../test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv  |  4 ++--
 .../Performance/NPB/FDVMH.fdv/LU/Makefile           |  4 ++--
 .../Performance/NPB/FDVMH.fdv/MG/Makefile           |  4 ++--
 .../Performance/NPB/FDVMH.fdv/SP/Makefile           |  6 +++---
 .../Performance/NPB/FDVMH.fdv/config/make.def       |  4 ++--
 sapfor/experts/Sapfor_2017/_src/Server/server.cpp   | 10 +++++++---
 sapfor/experts/Sapfor_2017/_src/Utils/version.h     |  2 +-
 .../_src/VisualizerCalls/SendMessage.cpp            | 13 +++++++------
 17 files changed, 51 insertions(+), 40 deletions(-)

diff --git a/dvm/fdvm/trunk/fdvm/acc.cpp b/dvm/fdvm/trunk/fdvm/acc.cpp
index 8f6ff5f..303e8d8 100644
--- a/dvm/fdvm/trunk/fdvm/acc.cpp
+++ b/dvm/fdvm/trunk/fdvm/acc.cpp
@@ -14172,7 +14172,7 @@ SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
         stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_overallBlocks), *new SgArrayRefExp(*s_blocksS, *new SgValueExp(0))));
         st_end->insertStmtBefore(*stmt, *st_hedr);
         if (currentLoop && currentLoop->irregularAnalysisIsOn())
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_restBlocks), *new SgVarRefExp(*s_overallBlocks) * *new SgVarRefExp(s_warpsize)));
+            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_restBlocks), *new SgVarRefExp(*s_overallBlocks) * *GetWarpSize(s_loop_ref)));
         else
             stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_restBlocks), *new SgVarRefExp(*s_overallBlocks)));
         st_end->insertStmtBefore(*stmt, *st_hedr);
@@ -14617,9 +14617,10 @@ SgExpression *sizeOfPrivateArraysInBytes()
     { 
         int i_size = e_size->valueInteger();
         e_size = new SgValueExp(i_size); 
-        if (i_size > 512) 
+        //TODO: need to add option
+        /*if (i_size > 2048)
             return e_size;
-        else
+        else */
             return NULL;
     }
   
diff --git a/dvm/fdvm/trunk/fdvm/funcall.cpp b/dvm/fdvm/trunk/fdvm/funcall.cpp
index fcef8cb..68d9ee8 100644
--- a/dvm/fdvm/trunk/fdvm/funcall.cpp
+++ b/dvm/fdvm/trunk/fdvm/funcall.cpp
@@ -4992,7 +4992,7 @@ SgExpression* GetWarpSize(SgSymbol* s_loop_ref)
 {// generating function call: 
  //                         int dvmh_get_warp_size(DvmType *InDvmhLoop)
 
-    SgFunctionCallExp* fe = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "dvmh_get_warp_size", SgTypeInt(), s_loop_ref->scope()));
+    SgFunctionCallExp* fe = new SgFunctionCallExp(*fdvm[GET_WARP_SIZE]);
 
     fe->addArg(*new SgVarRefExp(s_loop_ref));
     return(fe);
diff --git a/dvm/fdvm/trunk/include/libdvm.h b/dvm/fdvm/trunk/include/libdvm.h
index 719ee2f..c1c389a 100644
--- a/dvm/fdvm/trunk/include/libdvm.h
+++ b/dvm/fdvm/trunk/include/libdvm.h
@@ -337,4 +337,5 @@ name_dvm[GET_REMOTE_BUF_C] = "dvmh_loop_get_remote_buf_C";
 name_dvm[GET_DEVICE_PROP]  = "loop_cuda_get_device_prop";
 name_dvm[GET_MAX_BLOCKS]   = "loop_cuda_get_max_blocks";
 name_dvm[GET_PRIVATE_ARR]  = "loop_cuda_get_private_array";
-name_dvm[DISPOSE_PRIVATE_AR]="loop_cuda_dispose_private_array";
\ No newline at end of file
+name_dvm[DISPOSE_PRIVATE_AR]="loop_cuda_dispose_private_array";
+name_dvm[GET_WARP_SIZE]    = "dvmh_get_warp_size";
\ No newline at end of file
diff --git a/dvm/fdvm/trunk/include/libnum.h b/dvm/fdvm/trunk/include/libnum.h
index d73fd21..41f842b 100644
--- a/dvm/fdvm/trunk/include/libnum.h
+++ b/dvm/fdvm/trunk/include/libnum.h
@@ -336,5 +336,6 @@ enum {
       GET_MAX_BLOCKS,
       GET_PRIVATE_ARR,
       DISPOSE_PRIVATE_AR,
+      GET_WARP_SIZE,
       MAX_LIBFUN_NUM
 };  
diff --git a/dvm/fdvm/trunk/parser/sym.c b/dvm/fdvm/trunk/parser/sym.c
index 08c4984..ef5885d 100644
--- a/dvm/fdvm/trunk/parser/sym.c
+++ b/dvm/fdvm/trunk/parser/sym.c
@@ -784,7 +784,8 @@ int kind;
                     else return (var_sym_entry);
 	       }
 	  case FUNCTION_NAME:
-	       var_sym_entry->variant = FUNCTION_NAME;
+	       if (type != TYNULL)
+		   var_sym_entry->type = type;
 	       return (var_sym_entry);
 	  case ROUTINE_NAME:
 	       var_sym_entry->variant = FUNCTION_NAME;
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile
index f9de9b1..856ab65 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile
@@ -43,22 +43,22 @@ ${PROGRAM}: config
 	fi
 	
 MPI_VER: $(OBJS) $(OBJS_MPI)
-	${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
 
 SINGLE_VER: $(OBJS) $(OBJS_SINGLE)
-	${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
 
 BLOCK_VER: $(OBJS) $(OBJS_BLOCK)
-	${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK)
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK)
 
 BLOCK_VER1: $(OBJS) $(OBJS_BLOCK1)
-	${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK1)
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK1)
 
 BLOCK_VER2: $(OBJS) $(OBJS_BLOCK2)
-	${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK2)	
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK2)	
 
 %.o: %.fdv npbparams.h header3d.h
-	${F77} ${FFLAGS} -c -o $@ $<
+	${F77} f ${FFLAGS} -c -o $@ $<
 
 clean:
 	rm -f npbparams.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile
index c594e0b..d76580f 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile
@@ -10,10 +10,12 @@ SOURCES = cg.fdv
 OBJS = ${SOURCES:.fdv=.o}
 
 ${PROGRAM}: config $(OBJS)
-	${FLINK} -o ${PROGRAM} ${OBJS}
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
 
-%.o: %.fdv npbparams.h globals.h
-	${F77} ${FFLAGS} -dvmIrregAnalysis -c -o $@ $<
+cg.o: cg.fdv npbparams.h globals.h
+	${F77} fdv ${FFLAGS} -dvmIrregAnalysis cg.fdv
+	cp cg.DVMH_cuda.cu_opt cg.DVMH_cuda.cu
+	${F77} fc cg.fdv -c -o cg.o
 	
 clean:
 	rm -f npbparams.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile
index 501480e..a52a4a4 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile
@@ -10,10 +10,10 @@ SOURCES = ep.fdv
 OBJS = ${SOURCES:.fdv=.o}
 
 ${PROGRAM}: config  $(OBJS)
-	${FLINK} -o ${PROGRAM} ${OBJS}
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
 
 %.o: %.fdv npbparams.h
-	${F77} ${FFLAGS} -c -o $@ $<
+	${F77} f ${FFLAGS} -c -o $@ $<
 	
 clean:
 	rm -f npbparams.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile
index 70f9808..1afbae6 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile
@@ -10,10 +10,10 @@ SOURCES = ft.fdv
 OBJS = ${SOURCES:.fdv=.o}
 
 ${PROGRAM}: config $(OBJS)
-	${FLINK} -o ${PROGRAM} ${OBJS}
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
 
 %.o: %.fdv npbparams.h global.h
-	${F77} ${FFLAGS} -f90 -c -o $@ $<
+	${F77} f ${FFLAGS} -f90 -c -o $@ $<
 
 clean:
 	rm -f npbparams.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv
index bbe6e95..49fd41a 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv
@@ -1796,7 +1796,7 @@ subroutine print_results(name, class, n1, n2, n3, niter, t, mops, optype, verifi
     parameter(d2m46=0.5d0**46)
 
     save i246m1
-    data i246m1/X'00003FFFFFFFFFFF'/
+    data i246m1/Z'00003FFFFFFFFFFF'/
 
     Lx = X
     La = A
@@ -1819,7 +1819,7 @@ subroutine vranlc (N, X, A, Y)
 
     parameter(d2m46=0.5d0**46)
     save i246m1
-    data i246m1/X'00003FFFFFFFFFFF'/
+    data i246m1/Z'00003FFFFFFFFFFF'/
 
       Lx = X
       La = A
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile
index 1d20d7d..2ebe13d 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile
@@ -16,10 +16,10 @@ ${PROGRAM}: config
 	${MAKE} exec
 
 exec: $(OBJS)
-	${FLINK} ${FLINKFLAGS} -o ${PROGRAM} ${OBJS} ${F_LIB}
+	${FLINK} flink -shared-dvm  ${FLINKFLAGS} -o ${PROGRAM} ${OBJS} ${F_LIB}
 
 .f.o :
-	${F77} ${FFLAGS} -c -o $@ $<
+	${F77} f ${FFLAGS} -c -o $@ $<
 
 lu.o:	lu.f applu.incl npbparams.h
 erhs.o:	erhs.f applu.incl npbparams.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile
index e7dec93..9e72961 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile
@@ -20,10 +20,10 @@ SOURCES = mg.fdv \
 OBJS = ${SOURCES:.fdv=.o}
 
 ${PROGRAM}: config $(OBJS)
-	${FLINK} -o ${PROGRAM} ${OBJS}
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
 	
 %.o: %.fdv npbparams.h globals.h dvmvars.h
-	${F77} ${FFLAGS} -c -o $@ $<
+	${F77} f ${FFLAGS} -c -o $@ $<
 
 clean:
 	rm -f npbparams.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile
index 8dad459..8497efb 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile
@@ -30,13 +30,13 @@ ${PROGRAM}: config
 	fi
 
 MPI_VER: $(OBJS) $(OBJS_MPI)
-	${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
 
 SINGLE_VER: $(OBJS) $(OBJS_SINGLE)
-	${FLINK} -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
+	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
 
 %.o: %.for npbparams.h header.h
-	${F77} ${FFLAGS} -c -o $@ $<
+	${F77} f ${FFLAGS} -c -o $@ $<
 	
 clean:
 	rm -f npbparams.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def
index 905457b..9fddcc1 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def
@@ -1,5 +1,5 @@
-F77 = dvm f -shared-dvm
-FLINK = dvm flink -shared-dvm
+F77 = dvm
+FLINK = dvm
 
 FFLAGS = ${FOPT}
 
diff --git a/sapfor/experts/Sapfor_2017/_src/Server/server.cpp b/sapfor/experts/Sapfor_2017/_src/Server/server.cpp
index 7a84326..999eace 100644
--- a/sapfor/experts/Sapfor_2017/_src/Server/server.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Server/server.cpp
@@ -84,6 +84,10 @@ void Sleep(int millisec) { usleep(millisec * 2000); }
 
 #endif
 
+#define __print(prefix, format, ...) do { } while (0)
+
+#define __print_log(file, format, ...) do { } while (0)
+/*
 #define __print(prefix, format, ...) do {\
    printf((string("%s: ") + format + string("\n")).c_str(), prefix, ##__VA_ARGS__); \
    fflush(NULL); \
@@ -98,10 +102,10 @@ void Sleep(int millisec) { usleep(millisec * 2000); }
        fflush(file); \
    } \
 } while (0)
-
+*/
 #define SERV "[SERVER]"
 
-static const char* VERSION = "9";
+static const char* VERSION = "10";
 static FILE* logFile = NULL;
 
 extern void __bst_create(const char* name);
@@ -865,7 +869,7 @@ int main(int argc, char** argv)
         }
         __print(SERV, "Invalid SAPFOR socket, try to restart");
         __print_log(logFile, "invalid SAPFOR socket, try to restart");
-        Sleep(500);
+        Sleep(100);
     }
 
     __bst_unlock();
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 8e88559..2268af7 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2382"
+#define VERSION_SPF "2383"
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.cpp b/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.cpp
index 53b5f24..81cabb1 100644
--- a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.cpp
@@ -54,7 +54,10 @@ static FILE* logFile = NULL;
 #define FILE_LOG "Components/Sapfor_log.txt"
 #endif
 
-#define __print(prefix, format, ...) do {\
+#define __print(prefix, format, ...) do { } while (0)
+#define __print_log(file, format, ...) do { } while (0)
+
+/*#define __print(prefix, format, ...) do {\
    printf((string("%s: ") + format + string("\n")).c_str(), prefix, ##__VA_ARGS__); \
    fflush(NULL); \
 } while (0)
@@ -68,7 +71,7 @@ static FILE* logFile = NULL;
        fflush(file); \
    } \
 } while (0)
-
+*/
 #define CLIENT "[SAPFOR]"
 
 static int doRecv(SOCKET& soc, string& command)
@@ -302,7 +305,7 @@ static int send(SOCKET& client, const wstring& messageIn)
     char buf;
     recv(client, &buf, 1, 0);
 
-    printf("%s: send start\n", CLIENT);
+    __print(CLIENT, "send start\n", CLIENT);
     auto timeForPass = high_resolution_clock::now();
 #ifdef _WIN32
     err = send(client, result.c_str(), result.size(), 0);
@@ -311,9 +314,7 @@ static int send(SOCKET& client, const wstring& messageIn)
 #endif
 
     const float elapsed = duration_cast<milliseconds>(high_resolution_clock::now() - timeForPass).count() / 1000.;
-    printf("%s: send end with time %f sec\n", CLIENT, elapsed);
-    fflush(NULL);
-
+    __print(CLIENT, "send end with time %f sec\n", elapsed);
     __print(CLIENT, "Send message with size %d", (int)result.size());
 
     if (err != result.size())

From ab7b617e76fb201b03074c05a1a2bb8f4d29bcd8 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Tue, 28 Jan 2025 10:09:35 +0300
Subject: [PATCH 09/44] added optimized version of CG on GPU

---
 .../NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt      | 2285 +++++++++++++++++
 1 file changed, 2285 insertions(+)
 create mode 100644 dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt

diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
new file mode 100644
index 0000000..90ed1a4
--- /dev/null
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
@@ -0,0 +1,2285 @@
+
+#include <dvmhlib_cuda.h>
+#define dcmplx2 Complex<double>
+#define cmplx2 Complex<float>
+typedef int __indexTypeInt; 
+typedef long long __indexTypeLLong;
+
+
+
+
+
+//--------------------- Kernel for loop on line 229 ---------------------
+
+      __global__ void   loop_cg_229_cuda_kernel_int(double _x[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _i;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_i <= end_1) 
+         {
+
+// Loop body
+            _x[_i] = 1.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 229 ---------------------
+
+      __global__ void   loop_cg_229_cuda_kernel_llong(double _x[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _i;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_i <= end_1) 
+         {
+
+// Loop body
+            _x[_i] = 1.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 233 ---------------------
+
+      __global__ void   loop_cg_233_cuda_kernel_int(double _p[], double _r[], double _z[], double _q[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _q[_j] = 0.0e0;
+            _z[_j] = 0.0e0;
+            _r[_j] = 0.0e0;
+            _p[_j] = 0.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 233 ---------------------
+
+      __global__ void   loop_cg_233_cuda_kernel_llong(double _p[], double _r[], double _z[], double _q[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _q[_j] = 0.0e0;
+            _z[_j] = 0.0e0;
+            _r[_j] = 0.0e0;
+            _p[_j] = 0.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 272 ---------------------
+
+      __global__ void   loop_cg_272_cuda_kernel_int(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
+            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
+         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
+         if (_j % warpSize == 0) 
+         {
+            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
+            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 272 ---------------------
+
+      __global__ void   loop_cg_272_cuda_kernel_llong(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
+            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
+         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
+         if (_j % warpSize == 0) 
+         {
+            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
+            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 285 ---------------------
+
+      __global__ void   loop_cg_285_cuda_kernel_int(double _x[], double _z[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _norm_temp2)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _x[_j] = _z[_j] * _norm_temp2;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 285 ---------------------
+
+      __global__ void   loop_cg_285_cuda_kernel_llong(double _x[], double _z[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _norm_temp2)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _x[_j] = _z[_j] * _norm_temp2;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 301 ---------------------
+
+      __global__ void   loop_cg_301_cuda_kernel_int(double _x[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _i;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_i <= end_1) 
+         {
+
+// Loop body
+            _x[_i] = 1.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 301 ---------------------
+
+      __global__ void   loop_cg_301_cuda_kernel_llong(double _x[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _i;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_i <= end_1) 
+         {
+
+// Loop body
+            _x[_i] = 1.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 347 ---------------------
+
+      __global__ void   loop_cg_347_cuda_kernel_int(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
+            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
+         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
+         if (_j % warpSize == 0) 
+         {
+            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
+            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 347 ---------------------
+
+      __global__ void   loop_cg_347_cuda_kernel_llong(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
+            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
+         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
+         if (_j % warpSize == 0) 
+         {
+            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
+            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 367 ---------------------
+
+      __global__ void   loop_cg_367_cuda_kernel_int(double _x[], double _z[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _norm_temp2)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _x[_j] = _z[_j] * _norm_temp2;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 367 ---------------------
+
+      __global__ void   loop_cg_367_cuda_kernel_llong(double _x[], double _z[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _norm_temp2)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _x[_j] = _z[_j] * _norm_temp2;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 522 ---------------------
+
+      __global__ void   loop_cg_522_cuda_kernel_int(double _p[], double _r[], double _x[], double _z[], double _q[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _q[_j] = 0.0e0;
+            _z[_j] = 0.0e0;
+            _d = _x[_j];
+            _r[_j] = _d;
+            _p[_j] = _d;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 522 ---------------------
+
+      __global__ void   loop_cg_522_cuda_kernel_llong(double _p[], double _r[], double _x[], double _z[], double _q[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _q[_j] = 0.0e0;
+            _z[_j] = 0.0e0;
+            _d = _x[_j];
+            _r[_j] = _d;
+            _p[_j] = _d;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 537 ---------------------
+
+      __global__ void   loop_cg_537_cuda_kernel_int(double _r[], double _rho, double rho_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _rho = _r[_j] * _r[_j] + _rho;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _rho = __dvmh_blockReduceSum(_rho);
+         if (_j % warpSize == 0) 
+         {
+            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 537 ---------------------
+
+      __global__ void   loop_cg_537_cuda_kernel_llong(double _r[], double _rho, double rho_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _rho = _r[_j] * _r[_j] + _rho;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _rho = __dvmh_blockReduceSum(_rho);
+         if (_j % warpSize == 0) 
+         {
+            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 558 ---------------------
+
+      __global__ void   loop_cg_558_cuda_kernel_int(double _p_rma[], double _q[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Private variables
+         int _k;
+         double _sum;
+         int cond_0;
+         int __k;
+         int gid = blockIdx.x * blockDim.x + threadIdx.x;
+         int tid = gid / warpSize;
+         int lid = gid % warpSize;
+         
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _sum = 0.e0;
+            for (_k = _rowstr[_j] + lid, 
+                    (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
+                        cond_0 = (-1) : 
+                        cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1),
+                    __k = 0 + lid ; 
+                 __k < cond_0 ; 
+                 _k = _k + warpSize, __k = __k + warpSize)
+            {
+               _sum = _p_rma[_colidx[_k]] * _a[_k] + _sum;
+            }
+            _sum = __dvmh_warpReduceSum(_sum);
+            if (lid == 0) {
+                _q[_j] = _sum;
+            }
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 558 ---------------------
+
+      __global__ void   loop_cg_558_cuda_kernel_llong(double _p_rma[], double _q[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Private variables
+         int _k;
+         double _sum;
+         int cond_0;
+         int __k;
+         int gid = blockIdx.x * blockDim.x + threadIdx.x;
+         int tid = gid / warpSize;
+         int lid = gid % warpSize;
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _sum = 0.e0;
+            for (_k = _rowstr[_j] + lid, 
+                    (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
+                        cond_0 = (-1) : 
+                        cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1),
+                    __k = 0 + lid ; 
+                 __k < cond_0 ; 
+                 _k = _k + warpSize, __k = __k + warpSize)
+            {
+               _sum = _p_rma[_colidx[_k]] * _a[_k] + _sum;
+            }
+            _sum = __dvmh_warpReduceSum(_sum);
+            if (lid == 0) {
+                _q[_j] = _sum;
+            }
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 567 ---------------------
+
+      __global__ void   loop_cg_567_cuda_kernel_int(double _q[], double _p[], double _d, double d_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = _q[_j] * _p[_j] + _d;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _d = __dvmh_blockReduceSum(_d);
+         if (_j % warpSize == 0) 
+         {
+            d_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _d;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 567 ---------------------
+
+      __global__ void   loop_cg_567_cuda_kernel_llong(double _q[], double _p[], double _d, double d_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = _q[_j] * _p[_j] + _d;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _d = __dvmh_blockReduceSum(_d);
+         if (_j % warpSize == 0) 
+         {
+            d_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _d;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 577 ---------------------
+
+      __global__ void   loop_cg_577_cuda_kernel_int(double _q[], double _r[], double _p[], double _z[], double _rho, double rho_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _alpha)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _z[_j] = _p[_j] * _alpha + _z[_j];
+            _d = (-(_alpha * _q[_j])) + _r[_j];
+            _r[_j] = _d;
+            _rho = _d * _d + _rho;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _rho = __dvmh_blockReduceSum(_rho);
+         if (_j % warpSize == 0) 
+         {
+            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 577 ---------------------
+
+      __global__ void   loop_cg_577_cuda_kernel_llong(double _q[], double _r[], double _p[], double _z[], double _rho, double rho_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _alpha)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _z[_j] = _p[_j] * _alpha + _z[_j];
+            _d = (-(_alpha * _q[_j])) + _r[_j];
+            _r[_j] = _d;
+            _rho = _d * _d + _rho;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _rho = __dvmh_blockReduceSum(_rho);
+         if (_j % warpSize == 0) 
+         {
+            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 588 ---------------------
+
+      __global__ void   loop_cg_588_cuda_kernel_int(double _p[], double _r[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _beta)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _p[_j] = _p[_j] * _beta + _r[_j];
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 588 ---------------------
+
+      __global__ void   loop_cg_588_cuda_kernel_llong(double _p[], double _r[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _beta)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _p[_j] = _p[_j] * _beta + _r[_j];
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 605 ---------------------
+
+      __global__ void   loop_cg_605_cuda_kernel_int(double _z_rma[], double _r[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Private variables
+         int _k;
+         double _d;
+         int cond_0;
+         int __k;
+         int gid = blockIdx.x * blockDim.x + threadIdx.x;
+         int tid = gid / warpSize;
+         int lid = gid % warpSize;
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = 0.e0;
+            for (_k = _rowstr[_j] + lid, 
+                 (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
+                    cond_0 = (-1) :
+                    cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1), 
+                    __k = 0  + lid;
+                  __k < cond_0 ; 
+                  _k = _k + warpSize, __k = __k + warpSize)
+            {
+               _d = _z_rma[_colidx[_k]] * _a[_k] + _d;
+            }
+            _d = __dvmh_warpReduceSum(_d);
+            if (lid == 0) {
+                _r[_j] = _d;
+            }
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 605 ---------------------
+
+      __global__ void   loop_cg_605_cuda_kernel_llong(double _z_rma[], double _r[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Private variables
+         int _k;
+         double _d;
+         int cond_0;
+         int __k;
+         int gid = blockIdx.x * blockDim.x + threadIdx.x;
+         int tid = gid / warpSize;
+         int lid = gid % warpSize;
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = 0.e0;
+            for (_k = _rowstr[_j] + lid, 
+                 (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
+                    cond_0 = (-1) :
+                    cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1), 
+                    __k = 0  + lid;
+                  __k < cond_0 ; 
+                  _k = _k + warpSize, __k = __k + warpSize)
+            {
+               _d = _z_rma[_colidx[_k]] * _a[_k] + _d;
+            }
+            _d = __dvmh_warpReduceSum(_d);
+            if (lid == 0) {
+                _r[_j] = _d;
+            }
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 618 ---------------------
+
+      __global__ void   loop_cg_618_cuda_kernel_int(double _r[], double _x[], double _sum, double sum_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = (-_r[_j]) + _x[_j];
+            _sum = _d * _d + _sum;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _sum = __dvmh_blockReduceSum(_sum);
+         if (_j % warpSize == 0) 
+         {
+            sum_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _sum;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 618 ---------------------
+
+      __global__ void   loop_cg_618_cuda_kernel_llong(double _r[], double _x[], double _sum, double sum_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = (-_r[_j]) + _x[_j];
+            _sum = _d * _d + _sum;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _sum = __dvmh_blockReduceSum(_sum);
+         if (_j % warpSize == 0) 
+         {
+            sum_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _sum;
+         }
+      }
+
+
+
+#ifdef _MS_F_
+#define loop_cg_229_cuda_ loop_cg_229_cuda
+#define loop_cg_233_cuda_ loop_cg_233_cuda
+#define loop_cg_272_cuda_ loop_cg_272_cuda
+#define loop_cg_285_cuda_ loop_cg_285_cuda
+#define loop_cg_301_cuda_ loop_cg_301_cuda
+#define loop_cg_347_cuda_ loop_cg_347_cuda
+#define loop_cg_367_cuda_ loop_cg_367_cuda
+#define loop_cg_522_cuda_ loop_cg_522_cuda
+#define loop_cg_537_cuda_ loop_cg_537_cuda
+#define loop_cg_558_cuda_ loop_cg_558_cuda
+#define loop_cg_567_cuda_ loop_cg_567_cuda
+#define loop_cg_577_cuda_ loop_cg_577_cuda
+#define loop_cg_588_cuda_ loop_cg_588_cuda
+#define loop_cg_605_cuda_ loop_cg_605_cuda
+#define loop_cg_618_cuda_ loop_cg_618_cuda
+#endif
+
+extern "C" {
+      extern  DvmType loop_cg_618_cuda_kernel_llong_regs, loop_cg_618_cuda_kernel_int_regs, loop_cg_605_cuda_kernel_llong_regs, loop_cg_605_cuda_kernel_int_regs, loop_cg_588_cuda_kernel_llong_regs, loop_cg_588_cuda_kernel_int_regs, loop_cg_577_cuda_kernel_llong_regs, loop_cg_577_cuda_kernel_int_regs, loop_cg_567_cuda_kernel_llong_regs, loop_cg_567_cuda_kernel_int_regs, loop_cg_558_cuda_kernel_llong_regs, loop_cg_558_cuda_kernel_int_regs, loop_cg_537_cuda_kernel_llong_regs, loop_cg_537_cuda_kernel_int_regs, loop_cg_522_cuda_kernel_llong_regs, loop_cg_522_cuda_kernel_int_regs, loop_cg_367_cuda_kernel_llong_regs, loop_cg_367_cuda_kernel_int_regs, loop_cg_347_cuda_kernel_llong_regs, loop_cg_347_cuda_kernel_int_regs, loop_cg_301_cuda_kernel_llong_regs, loop_cg_301_cuda_kernel_int_regs, loop_cg_285_cuda_kernel_llong_regs, loop_cg_285_cuda_kernel_int_regs, loop_cg_272_cuda_kernel_llong_regs, loop_cg_272_cuda_kernel_int_regs, loop_cg_233_cuda_kernel_llong_regs, loop_cg_233_cuda_kernel_int_regs, loop_cg_229_cuda_kernel_llong_regs, loop_cg_229_cuda_kernel_int_regs;
+
+
+//    CUDA handler for loop on line 229 
+
+      void   loop_cg_229_cuda_(DvmType *loop_ref, DvmType _x[])
+      {
+         void   *x_base;
+         DvmType d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_229_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_229_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_229_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_229_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 233 
+
+      void   loop_cg_233_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], DvmType _z[], DvmType _q[])
+      {
+         void   *p_base, *r_base, *z_base, *q_base;
+         DvmType d_p[4], d_r[4], d_z[4], d_q[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         p_base = dvmh_get_natural_base(&device_num, _p);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+         q_base = dvmh_get_natural_base(&device_num, _q);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_233_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_233_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_233_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_233_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 272 
+
+      void   loop_cg_272_cuda_(DvmType *loop_ref, DvmType _z[], DvmType _x[])
+      {
+         void   *z_base, *x_base;
+         DvmType d_z[4], d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *norm_temp2_grid;
+         double _norm_temp2;
+         void   *norm_temp1_grid;
+         double _norm_temp1;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &norm_temp1_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_norm_temp1, 0);
+         red_num = 2;
+         loop_cuda_register_red(loop_ref, red_num, &norm_temp2_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_norm_temp2, 0);
+
+// Get 'natural' bases
+         z_base = dvmh_get_natural_base(&device_num, _z);
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_272_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_272_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         red_num = 2;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_272_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_272_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+         red_num = 2;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 285 
+
+      void   loop_cg_285_cuda_(DvmType *loop_ref, DvmType _x[], DvmType _z[], double *_norm_temp2)
+      {
+         void   *x_base, *z_base;
+         DvmType d_x[4], d_z[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         x_base = dvmh_get_natural_base(&device_num, _x);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_285_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_285_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_285_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
+            }
+            else 
+            {
+               loop_cg_285_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 301 
+
+      void   loop_cg_301_cuda_(DvmType *loop_ref, DvmType _x[])
+      {
+         void   *x_base;
+         DvmType d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_301_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_301_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_301_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_301_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 347 
+
+      void   loop_cg_347_cuda_(DvmType *loop_ref, DvmType _z[], DvmType _x[])
+      {
+         void   *z_base, *x_base;
+         DvmType d_z[4], d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *norm_temp2_grid;
+         double _norm_temp2;
+         void   *norm_temp1_grid;
+         double _norm_temp1;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &norm_temp1_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_norm_temp1, 0);
+         red_num = 2;
+         loop_cuda_register_red(loop_ref, red_num, &norm_temp2_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_norm_temp2, 0);
+
+// Get 'natural' bases
+         z_base = dvmh_get_natural_base(&device_num, _z);
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_347_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_347_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         red_num = 2;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_347_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_347_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+         red_num = 2;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 367 
+
+      void   loop_cg_367_cuda_(DvmType *loop_ref, DvmType _x[], DvmType _z[], double *_norm_temp2)
+      {
+         void   *x_base, *z_base;
+         DvmType d_x[4], d_z[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         x_base = dvmh_get_natural_base(&device_num, _x);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_367_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_367_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_367_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
+            }
+            else 
+            {
+               loop_cg_367_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 522 
+
+      void   loop_cg_522_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], DvmType _x[], DvmType _z[], DvmType _q[])
+      {
+         void   *p_base, *r_base, *x_base, *z_base, *q_base;
+         DvmType d_p[4], d_r[4], d_x[4], d_z[4], d_q[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         p_base = dvmh_get_natural_base(&device_num, _p);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         x_base = dvmh_get_natural_base(&device_num, _x);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+         q_base = dvmh_get_natural_base(&device_num, _q);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_522_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_522_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_522_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)x_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_522_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)x_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 537 
+
+      void   loop_cg_537_cuda_(DvmType *loop_ref, DvmType _r[])
+      {
+         void   *r_base;
+         DvmType d_r[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *rho_grid;
+         double _rho;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &rho_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_rho, 0);
+
+// Get 'natural' bases
+         r_base = dvmh_get_natural_base(&device_num, _r);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_537_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_537_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_537_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)r_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_537_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)r_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 558 
+
+      void   loop_cg_558_cuda_(DvmType *loop_ref, DvmType _p_rma[], DvmType _q[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
+      {
+         void   *p_rma_base, *q_base, *colidx_base, *a_base, *rowstr_base;
+         DvmType d_p_rma[4], d_q[4], d_colidx[4], d_a[4], d_rowstr[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         p_rma_base = dvmh_get_natural_base(&device_num, _p_rma);
+         q_base = dvmh_get_natural_base(&device_num, _q);
+         colidx_base = dvmh_get_natural_base(&device_num, _colidx);
+         a_base = dvmh_get_natural_base(&device_num, _a);
+         rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, p_rma_base, _p_rma, d_p_rma);
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+         dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
+         dvmh_fill_header_(&device_num, a_base, _a, d_a);
+         dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_558_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_558_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks * dvmh_get_warp_size(loop_ref);
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+         maxBlocks = maxBlocks / dvmh_get_warp_size(loop_ref) * dvmh_get_warp_size(loop_ref);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_558_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_rma_base, (double *)q_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_558_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_rma_base, (double *)q_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 567 
+
+      void   loop_cg_567_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _p[])
+      {
+         void   *q_base, *p_base;
+         DvmType d_q[4], d_p[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *d_grid;
+         double _d;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &d_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_d, 0);
+
+// Get 'natural' bases
+         q_base = dvmh_get_natural_base(&device_num, _q);
+         p_base = dvmh_get_natural_base(&device_num, _p);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_567_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_567_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_567_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)p_base, _d, (double *)d_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_567_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)p_base, _d, (double *)d_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 577 
+
+      void   loop_cg_577_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _r[], DvmType _p[], DvmType _z[], double *_alpha)
+      {
+         void   *q_base, *r_base, *p_base, *z_base;
+         DvmType d_q[4], d_r[4], d_p[4], d_z[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *rho_grid;
+         double _rho;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &rho_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_rho, 0);
+
+// Get 'natural' bases
+         q_base = dvmh_get_natural_base(&device_num, _q);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         p_base = dvmh_get_natural_base(&device_num, _p);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_577_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_577_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_577_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)r_base, (double *)p_base, (double *)z_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks, *_alpha);
+            }
+            else 
+            {
+               loop_cg_577_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)r_base, (double *)p_base, (double *)z_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks, *_alpha);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 588 
+
+      void   loop_cg_588_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], double *_beta)
+      {
+         void   *p_base, *r_base;
+         DvmType d_p[4], d_r[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         p_base = dvmh_get_natural_base(&device_num, _p);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_588_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_588_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_588_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, idxL[0], idxH[0], addBlocks, *_beta);
+            }
+            else 
+            {
+               loop_cg_588_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, idxL[0], idxH[0], addBlocks, *_beta);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 605 
+
+      void   loop_cg_605_cuda_(DvmType *loop_ref, DvmType _z_rma[], DvmType _r[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
+      {
+         void   *z_rma_base, *r_base, *colidx_base, *a_base, *rowstr_base;
+         DvmType d_z_rma[4], d_r[4], d_colidx[4], d_a[4], d_rowstr[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         z_rma_base = dvmh_get_natural_base(&device_num, _z_rma);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         colidx_base = dvmh_get_natural_base(&device_num, _colidx);
+         a_base = dvmh_get_natural_base(&device_num, _a);
+         rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, z_rma_base, _z_rma, d_z_rma);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
+         dvmh_fill_header_(&device_num, a_base, _a, d_a);
+         dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_605_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_605_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks * dvmh_get_warp_size(loop_ref);
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+         maxBlocks = maxBlocks / dvmh_get_warp_size(loop_ref) * dvmh_get_warp_size(loop_ref);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_605_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)z_rma_base, (double *)r_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_605_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)z_rma_base, (double *)r_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 618 
+
+      void   loop_cg_618_cuda_(DvmType *loop_ref, DvmType _r[], DvmType _x[])
+      {
+         void   *r_base, *x_base;
+         DvmType d_r[4], d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *sum_grid;
+         double _sum;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &sum_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_sum, 0);
+
+// Get 'natural' bases
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_618_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_618_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_618_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)r_base, (double *)x_base, _sum, (double *)sum_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_618_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)r_base, (double *)x_base, _sum, (double *)sum_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+}

From c5d063b0da487ba17298ad0f7ffba6597cea8585 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Wed, 29 Jan 2025 10:08:13 +0300
Subject: [PATCH 10/44] fixed distribution, fixed routine, fixed null program
 unparsing

---
 .../_src/Distribution/DvmhDirective.cpp       | 51 ++++++++++++++-----
 .../_src/DvmhRegions/DvmhRegionInserter.cpp   | 17 ++++---
 .../Sapfor_2017/_src/Utils/SgUtils.cpp        | 22 ++++++--
 .../experts/Sapfor_2017/_src/Utils/version.h  |  2 +-
 4 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp b/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
index 8d75eab..98be8c9 100644
--- a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
@@ -29,6 +29,8 @@ using std::make_pair;
 using std::min;
 using std::max;
 
+extern map<tuple<int, string, string>, pair<DIST::Array*, DIST::ArrayAccessInfo*>> declaredArrays;
+
 static bool findArrayRefAndCheck(SgExpression *ex, const DIST::Array* currArray, const vector<map<pair<int, int>, int>> &shiftsByAccess)
 {
     bool res = false;
@@ -748,13 +750,31 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
         {
             const int i1 = ordered[k];
             vector<map<pair<int, int>, int>> shiftsByAccess;
-            DIST::Array* currArray = NULL;
+            DIST::Array* acrossArray = NULL;
 
             if (!sharedMemoryParallelization)
             {
-                currArray = allArrays.GetArrayByName(across[i1].first.second);
-                if (currArray == NULL)
-                    printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+                acrossArray = allArrays.GetArrayByName(across[i1].first.second);
+                if (acrossArray == NULL)
+                {
+                    //TODO: need to fix SageDep analysis or use IR 
+                    bool notPrivate = true;
+                    for (auto& arrayPair : declaredArrays)
+                    {
+                        auto array = arrayPair.second.first;
+                        if (array->GetName() == across[i1].first.second)
+                        {
+                            if (array->IsNotDistribute())
+                                notPrivate = false;
+                            break;
+                        }
+                    }
+
+                    if (notPrivate)
+                        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+                    else
+                        continue;
+                }
             }
             else
             {
@@ -763,11 +783,12 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
                 if (currArray_it == arrayByName.end())
                     printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-                currArray = currArray_it->second;
+                acrossArray = currArray_it->second;
             }
 
-            bool isOut = acrossOutAttribute.find(currArray) != acrossOutAttribute.end();
-            string bounds = genBounds(across[i1], acrossShifts[i1], reducedG, allArrays, currArray, remoteReads, readOps, true, regionId, distribution, arraysInAcross, shiftsByAccess, arrayLinksByFuncCalls);
+            bool isOut = acrossOutAttribute.find(acrossArray) != acrossOutAttribute.end();
+            string bounds = genBounds(across[i1], acrossShifts[i1], reducedG, allArrays, acrossArray, remoteReads, readOps, true, regionId, distribution, arraysInAcross, shiftsByAccess, arrayLinksByFuncCalls);
+
             if (bounds != "")
             {
                 if (inserted != 0)
@@ -808,8 +829,8 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
 
                 acrossAdd += across[i1].first.first + "(" + bounds + ")";
 
-                SgArrayRefExp* newArrayRef = new SgArrayRefExp(*getFromModule(byUseInFunc, currArray->GetDeclSymbol(filename, lineRange, allFiles)->GetOriginal()));
-                newArrayRef->addAttribute(ARRAY_REF, currArray, sizeof(DIST::Array));
+                SgArrayRefExp* newArrayRef = new SgArrayRefExp(*getFromModule(byUseInFunc, acrossArray->GetDeclSymbol(filename, lineRange, allFiles)->GetOriginal()));
+                newArrayRef->addAttribute(ARRAY_REF, acrossArray, sizeof(DIST::Array));
 
                 for (auto& elem : genSubscripts(across[i1].second, acrossShifts[i1]))
                     newArrayRef->addSubscript(*elem);
@@ -857,10 +878,14 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
             const int i1 = ordered[k];
             vector<map<pair<int, int>, int>> shiftsByAccess;
             DIST::Array* shadowArray = allArrays.GetArrayByName(shadowRenew[i1].first.second);
+            if (shadowArray == NULL)
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
             const string bounds = genBounds(shadowRenew[i1], shadowRenewShifts[i1], reducedG, allArrays, shadowArray, remoteReads, readOps, false, regionId, distribution, arraysInAcross, shiftsByAccess, arrayLinksByFuncCalls);
+
             if (bounds != "")
             {
-                DIST::Array* currArray = allArrays.GetArrayByName(shadowRenew[i1].first.second);
+                DIST::Array* shadowArray = allArrays.GetArrayByName(shadowRenew[i1].first.second);
 
                 if (inserted != 0)
                 {
@@ -880,13 +905,13 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
                 }
 
                 shadowAdd += shadowRenew[i1].first.first + "(" + bounds + ")";
-                SgArrayRefExp* newArrayRef = new SgArrayRefExp(*getFromModule(byUseInFunc, currArray->GetDeclSymbol(filename, lineRange, allFiles)));
-                newArrayRef->addAttribute(ARRAY_REF, currArray, sizeof(DIST::Array));
+                SgArrayRefExp* newArrayRef = new SgArrayRefExp(*getFromModule(byUseInFunc, shadowArray->GetDeclSymbol(filename, lineRange, allFiles)));
+                newArrayRef->addAttribute(ARRAY_REF, shadowArray, sizeof(DIST::Array));
 
                 for (auto& elem : genSubscripts(shadowRenew[i1].second, shadowRenewShifts[i1]))
                     newArrayRef->addSubscript(*elem);
 
-                if (shadowRenew[i1].second.size() > 1 && needCorner(currArray, shiftsByAccess, loop))
+                if (shadowRenew[i1].second.size() > 1 && needCorner(shadowArray, shiftsByAccess, loop))
                 {
                     SgExpression* tmp = new SgExpression(ARRAY_OP, newArrayRef, NULL, NULL);
                     p->setLhs(*tmp);
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
index 5adc9a5..6096dbf 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
@@ -1295,14 +1295,17 @@ void DvmhRegionInserter::createInterfaceBlockForParallelFunctions(bool onlyRouti
 
         for (auto& callTo : parF->callsTo)
         {
-            if (callTo->fileName != parF->fileName && isPure(parF->funcPointer->GetOriginal()))
+            if (!isPure(parF->funcPointer->GetOriginal()))
+                continue;
+
+            if (callTo->fileName != parF->fileName && onlyRoutine)
+            {
+                insertRoutine(parF->funcPointer->GetOriginal(), parF, inLoops, arrayLinksByFuncCalls);
+                continue;
+            }
+
+            if (callTo->fileName != parF->fileName || isPure(callTo->funcPointer->GetOriginal()))
             {
-                if (onlyRoutine)
-                {
-                    insertRoutine(parF->funcPointer->GetOriginal(), parF, inLoops, arrayLinksByFuncCalls);
-                    continue;
-                }
-                
                 auto it = callTo->interfaceBlocks.find(parF->funcName);
                 if (it == callTo->interfaceBlocks.end())
                 {
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
index 39f5c7d..eb9b0e2 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
@@ -656,13 +656,27 @@ string removeIncludeStatsAndUnparse(SgFile *file, const char *fileName, const ch
         }
     }
 
+    //check for empty
+    string comm = "";
+    if (file->firstStatement()->comments())
+    {
+        comm = file->firstStatement()->comments();
+        file->firstStatement()->delComments();
+    }
+    const string tmp = file->firstStatement()->unparse();
+    bool isEmpty = (tmp.size() == 0);
+    if (comm.size())
+        file->firstStatement()->addComment(comm.c_str());
+
     string strUnparse = "";
     if (toString)
-        strUnparse = string(file->firstStatement()->unparse());
-    else
     {
-        const string tmp = file->firstStatement()->unparse();
-        if (tmp.size() > 0)
+        if (!isEmpty)
+            strUnparse = string(file->firstStatement()->unparse());
+    }
+    else
+    {        
+        if (!isEmpty)
         {
 #ifdef _WIN32
             FILE* fOut;
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 2268af7..9bc5377 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2383"
+#define VERSION_SPF "2384"

From d8aa5606eff88d52cfaff6173fbbfb6071a54268 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Sun, 9 Feb 2025 20:48:06 +0300
Subject: [PATCH 11/44] fixed dead flag for functions

---
 dvm/fdvm/trunk/fdvm/acc.cpp                   | 254 ++++++++--
 dvm/fdvm/trunk/fdvm/acc_across.cpp            |  13 +-
 dvm/fdvm/trunk/fdvm/acc_f2c.cpp               | 141 ++++--
 dvm/fdvm/trunk/fdvm/calls.cpp                 | 452 ++++++++++++++++--
 dvm/fdvm/trunk/fdvm/dvm.cpp                   |  56 ++-
 dvm/fdvm/trunk/fdvm/stmt.cpp                  |   3 +-
 dvm/fdvm/trunk/include/calls.h                |   6 +-
 dvm/fdvm/trunk/include/dvm.h                  |  35 +-
 dvm/fdvm/trunk/parser/cftn.c                  |   2 +
 .../NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt      |  69 +--
 .../Performance/NPB/FDVMH.fdv/CG/cg.fdv       |  12 +-
 .../_src/DvmhRegions/DvmhRegionInserter.cpp   |  21 +-
 .../_src/GraphCall/graph_calls.cpp            |   6 +-
 .../_src/GraphCall/graph_calls_base.cpp       |  36 +-
 .../_src/GraphLoop/graph_loops_base.cpp       |  14 +-
 .../ParallelizationRegions/ParRegions.cpp     |  12 +-
 sapfor/experts/Sapfor_2017/_src/Sapfor.cpp    |   2 +-
 .../experts/Sapfor_2017/_src/Utils/utils.cpp  |   2 +-
 .../experts/Sapfor_2017/_src/Utils/version.h  |   2 +-
 19 files changed, 897 insertions(+), 241 deletions(-)

diff --git a/dvm/fdvm/trunk/fdvm/acc.cpp b/dvm/fdvm/trunk/fdvm/acc.cpp
index 303e8d8..5762e0a 100644
--- a/dvm/fdvm/trunk/fdvm/acc.cpp
+++ b/dvm/fdvm/trunk/fdvm/acc.cpp
@@ -16,7 +16,7 @@ local_part_list *lpart_list;
 
 static int dvmh_targets, has_io_stmt;
 static int targets[Ndev];
-static int has_region, in_arg_list, analyzing, has_max_minloc, for_shadow_compute;
+static int has_region, in_arg_list, analyzing, has_max_minloc, for_shadow_compute, private_array_arg;
 //static char *fname_gpu;
 
 static SgStatement *cur_in_block, *cur_in_source, *mod_gpu_end;
@@ -37,6 +37,7 @@ static SgSymbol *s_end[MAX_LOOP_LEVEL], *s_blocksS_k[MAX_LOOP_LEVEL], *s_loopSte
 static SgType *type_DvmType, *type_CudaIndexType, *type_with_len_DvmType, *type_FortranDvmType, *CudaIndexType_k;
 static int loopIndexCount;
 
+
 //------ C ----------
 static const char *red_kernel_func_names[] = {
     NULL,
@@ -83,6 +84,7 @@ void InitializeACC()
     declaration_cmnt = NULL;
     indexType_int = indexType_long = indexType_llong = NULL;
     dvmh_targets = options.isOn(NO_CUDA) ? HOST_DEVICE : HOST_DEVICE | CUDA_DEVICE;
+    private_array_class = new SgSymbol(TYPE_NAME, "PrivateArray", *(current_file->firstStatement()));
 
     SpecialSymbols.insert(std::pair<char, const char*>('\n', "\\n\"\n\""));
     SpecialSymbols.insert(std::pair<char, const char*>('"', "\\\""));
@@ -287,6 +289,7 @@ void InitializeInFuncACC()
     acc_registered_list = NULL;  /*ACC*/
     registered_uses_list = NULL; /*ACC*/
     acc_declared_list = NULL;    /*ACC*/
+
 }
 
 int GeneratedForCuda()
@@ -1015,7 +1018,7 @@ void EnterDataRegion(SgExpression *ale,SgStatement *stmt)
 void ExitDataRegion(SgExpression *ale,SgStatement *stmt)
 { SgExpression *e,*size;
   SgSymbol *ar,*ar2;
-  
+
   e = &(ale->copy()); 
   if(isSgRecordRefExp(e))
   {  
@@ -1218,7 +1221,6 @@ void ExitDataRegionForLocalVariables(SgStatement *st, int is)
     }
 }
 
-
 void  testScopeOfDeclaredVariables(SgStatement *stmt)
 {
     SgExpression *el;
@@ -1235,7 +1237,7 @@ void testDeclareDirectives(SgStatement *first_dvm_exec)
 {
     SgStatement *stmt;
     for (stmt = cur_func->lexNext(); stmt && (stmt != first_dvm_exec); stmt = stmt->lastNodeOfStmt()->lexNext()) 
-    {
+    {   
         if (stmt->variant()==ACC_DECLARE_DIR)
         {
             if (IN_MODULE)
@@ -1484,7 +1486,7 @@ SgStatement *ACC_Directive(SgStatement *stmt)
 
 void ACC_DECLARE_Directive(SgStatement *stmt)
 {
-    if (ACC_program)                                 
+    if (ACC_program)                                
         acc_declared_list = ExpressionListsUnion(acc_declared_list, &(stmt->expr(0)->copy()));
 }
 
@@ -1504,15 +1506,43 @@ void ACC_ROUTINE_Directive(SgStatement *stmt)
         return;
     }      
     if (!mod_gpu_symb)
-        CreateGPUModule();
-    int targets = stmt->expr(0) ? TargetsList(stmt->expr(0)->lhs()) : dvmh_targets;
+        CreateGPUModule();  
+   
+    SgExpression *targets_spec= NULL, *private_spec = NULL, *el;
+    
+    for (el=stmt->expr(0); el; el=el->rhs())
+    {
+         switch (el->lhs()->variant()) 
+         {
+           case ACC_TARGETS_OP:
+	     if (!targets_spec)
+             {
+                targets_spec = el->lhs();
+             }  else
+                err("Double TARGETS clause",669,stmt);
+             break;
+           case ACC_PRIVATE_OP:
+	     if (!private_spec)
+             {
+                private_spec = el->lhs();
+             }  else
+                err("Double PRIVATE clause",607,stmt);
+             break;
+          }
+    } 
+    int targets = targets_spec ? TargetsList(targets_spec->lhs()) : dvmh_targets; //stmt->expr(0) ? TargetsList(stmt->expr(0)->lhs()) : dvmh_targets;
     targets = targets & dvmh_targets;
     SgSymbol *s = stmt->controlParent()->symbol();
     if(!s)
         return; 
-    if(targets & CUDA_DEVICE)
+    if (targets & CUDA_DEVICE)
+    { 
         MarkAsCalled(s);
+        if (private_spec)
+            MarkPrivateArgumentsOfRoutine(s, private_spec->lhs());
+    }
     MarkAsRoutine(s);
+    
     return;
 }
 
@@ -2846,6 +2876,7 @@ void ACC_CreateParallelLoop(int ipl, SgStatement *first_do, int nloop, SgStateme
 
     // creating private_list
     private_list = clause[PRIVATE_] ? clause[PRIVATE_]->lhs() : NULL;
+    private_array_arg = 0;
 
     dost = InnerMostLoop(first_do, nloop);
         
@@ -4616,6 +4647,17 @@ void Argument(SgExpression *e, int i, SgSymbol *s)
     }
     else if (isSgArrayRefExp(e))
     {
+        if (analyzing && e->lhs() && isSgArrayType(e->type())) // case of array section
+        {
+            Warning("Array section of %s in a region", e->symbol()->identifier(), 667, cur_st);
+            doNotForCuda();
+        }
+        if (!analyzing && isPrivate(e->symbol()) && isArrayParameter(ProcedureSymbol(s),i))
+        {  // scheme with PrivateArray Class
+            private_array_arg++; // += isArrayParameter(ProcedureSymbol(s),i);
+            if (!FromOtherFile(s))
+                addArgumentNumber(i, s);
+        }
         RefInExpr(e, _READ_WRITE_);
         return;
     }
@@ -4632,7 +4674,6 @@ void Argument(SgExpression *e, int i, SgSymbol *s)
     }
 }
 
-
 void Call(SgSymbol *s, SgExpression *e)
 {
     SgExpression *el;
@@ -4650,7 +4691,7 @@ void Call(SgSymbol *s, SgExpression *e)
     }
     if (IsInternalProcedure(s) && analyzing)
         Error(" Call of the procedure %s in a region, which is internal/module procedure", s->identifier(), 580, cur_st);
-   
+
     if (!isUserFunction(s) && (s->attributes() & INTRINSIC_BIT || isIntrinsicFunctionName(s->identifier()))) //IsNoBodyProcedure(s)
     {
         RefInExpr(e, _READ_);
@@ -7174,6 +7215,24 @@ int ExplicitShape(SgExpression *eShape)
     return 1;
 }
 
+int AssumedShape(SgExpression *eShape)
+{
+   SgExpression *el;
+   SgSubscriptExp *sbe;
+   for(el=eShape; el; el=el->rhs())
+   { 
+      //SgExpression *uBound =  (sbe=isSgSubscriptExp(el->lhs())) ? sbe->ubound() : el->lhs();
+      sbe=isSgSubscriptExp(el->lhs());
+      if(sbe && !sbe->ubound())
+      //if(!uBound) 
+            continue;
+      else
+            return 0;
+    }              
+    return 1;
+}
+
+
 int TestArrayShape(SgSymbol *ar)
 {        
    int i;
@@ -7356,6 +7415,34 @@ SgExpression *FirstArrayElementSubscriptsForHandler(SgSymbol *ar)
  return(el);
 }
 
+SgExpression *FirstArrayElementSubscriptsOfPrivateArray(SgSymbol *s)
+{//generating reference AR(L1,...,Ln), where Li - lower bound of i-th dimension  for kernel in C_Cuda
+ // Li - is constant or dummy argument reference
+    SgExpression *elist = NULL, *var; 
+/*  
+  if (!TestArrayShape(s))
+  {  
+    var = ElementOfPrivateList(s);
+    SgExpression **eatr = (SgExpression **) var->lhs()->attributeValue(0, L_BOUNDS);  
+    SgExpression *ela;
+    for (ela = *eatr; ela->rhs(); ela = ela->rhs())
+    {
+      SgExpression *ed = new SgVarRefExp(ela->lhs()->lhs()->symbol());
+      elist = AddListToList(new SgExprListExp(*ed), elist);                        
+    }
+  }
+  else
+  { 
+    for (int i=0; i<Rank(s); i++)
+      elist = AddListToList(elist, new SgExprListExp(*Calculate(LowerBound(s,i-1))));
+  } 
+*/  
+    for (int i=0; i<Rank(s); i++)
+      elist = AddListToList(elist, new SgExprListExp(*new SgValueExp(0)));
+
+    elist->addAttribute(NULL_SUBSCRIPTS, (void*)1, 0);
+    return elist;    
+}
 
 SgSymbol *DummyDvmHeaderSymbol(SgSymbol *ar, SgStatement *st_hedr)
 {
@@ -8503,7 +8590,7 @@ SgStatement *CreateLoopKernel(SgSymbol *skernel, SgType *indexTypeInKernel)
 
         last = cur_st;
 
-        TranslateBlock(cur_in_kernel);
+        TranslateBlock(cur_in_kernel);  
 
         if (options.isOn(C_CUDA))
         {
@@ -9534,7 +9621,7 @@ SgExpression *CreatePrivateDummyList()
     SgSymbol *s_dummy, *s;
     SgExpression *el, *ae;
     SgExpression *arg_list = NULL;
-    if (!options.isOn(C_CUDA) || !sizeOfPrivateArraysInBytes())
+    if (!options.isOn(C_CUDA) || !PrivateArrayClassUse(sizeOfPrivateArraysInBytes())) // !sizeOfPrivateArraysInBytes())
         return NULL;
     for (el = private_list; el; el = el->rhs())
     {
@@ -9984,6 +10071,67 @@ void DeclareInternalPrivateVars()
     }
 }
 
+SgStatement *makeClassObjectDeclaration(SgSymbol *s, SgSymbol *sp, SgStatement *header_st, SgType *idxType, SgExpression *dim_list, int flag_true)
+{            
+    SgStatement *st = new SgStatement(VAR_DECL);
+    SgSymbol *s_new = & s->copy();
+    SYMB_SCOPE(s_new->thesymb) = header_st->thebif;
+    SgExpression *e = new SgExprListExp(*new SgTypeRefExp(*C_Type(s_new->type())));
+    SgDerivedTemplateType *tp = new SgDerivedTemplateType(e, private_array_class); 
+    tp->addArg(new SgValueExp(Rank(s)));
+    s_new->setType(tp);
+    SgFunctionCallExp *efc = new SgFunctionCallExp(*s_new);
+    efc->setType(tp); 
+    st->setExpression(0, *new SgExprListExp(*efc)); 
+    header_st->insertStmtAfter(*st);
+
+    SgSymbol *s_dims=NULL;
+    SgStatement *st_dims = NULL;
+    if (Rank(s)>1)
+    {
+        char *name = new char[strlen(s->identifier())+7];
+        sprintf(name, "_%s_dims", s->identifier());
+        s_dims = ArraySymbol(name, idxType, new SgValueExp(Rank(s)-1), header_st);
+        SgExpression *einit = new SgExpression(INIT_LIST);
+/*        SgExpression *elist = NULL;
+
+        if (for_kernel && !TestArrayShape(s))
+        {   
+            SgExpression **eatr = (SgExpression **) var->lhs()->attributeValue(0, DIM_SIZES);  
+            SgExpression *ela;
+            for (ela = *eatr; ela->rhs(); ela = ela->rhs())
+            { 
+                SgExpression *ed = new SgVarRefExp(ela->lhs()->lhs()->symbol());
+                elist = AddListToList(new SgExprListExp(*ed), elist);                        
+            }
+         }
+         else
+         {
+            for (int i=Rank(s)-1; i; i--)
+                elist = AddListToList(elist, new SgExprListExp(*Calculate(ArrayDimSize(s,i))));
+         } 
+  
+         einit->setLhs(elist); 
+*/
+         einit->setLhs(dim_list); 
+         SgStatement *st_dims = makeSymbolDeclarationWithInit(s_dims, einit);
+         header_st->insertStmtAfter(*st_dims); 
+         //st_first = st_dims;
+    }
+    if (s_dims)
+        efc->addArg(*new SgVarRefExp(s_dims));
+           
+            //SgSymbol **satr =  (SgSymbol **) var->lhs()->attributeValue(0, PRIVATE_POINTER); 
+    if (sp)
+           // {   
+            //    SgSymbol *sp = *satr;
+        efc->addArg(*new SgVarRefExp(sp)); 
+           // }                       
+    if (flag_true)
+        efc->addArg(*new SgKeywordValExp("true"));   
+    return (st_dims ? st_dims : st);
+}
+
 void DeclarePrivateVars()
 {
     DeclarePrivateVars(C_UnsignedLongLongType());
@@ -9994,14 +10142,19 @@ void DeclarePrivateVars(SgType *idxTypeInKernel)
     SgStatement *st = NULL, *st_first=NULL;
     SgExpression *var = NULL, *e;
     SgSymbol *s;
+
+    if(!private_list) return;
+
     SgExpression *e_all_private_size = sizeOfPrivateArraysInBytes();
+    //SgSymbol *class_name = new SgSymbol(TYPE_NAME, "PrivateArray");
+
     // declare private variables    
     for (var = private_list; var; var = var->rhs())
     {
         s = var->lhs()->symbol();
         if (isParDoIndexVar(s))  continue; // declared as index variable of parallel loop
                            //if (HEADER(var->lhs()->symbol()))  continue; // dvm-array declared as dummy argument
-        if (!options.isOn(C_CUDA) || !IS_ARRAY(s) || !e_all_private_size )
+        if (!options.isOn(C_CUDA) || !IS_ARRAY(s) || !PrivateArrayClassUse(e_all_private_size)) 
         {
             st = Declaration_Statement(SymbolInKernel(s));
             kernel_st->insertStmtAfter(*st);
@@ -10009,17 +10162,19 @@ void DeclarePrivateVars(SgType *idxTypeInKernel)
         }
         else
         {
-            SgSymbol *s_dims=NULL;
-            st = new SgStatement(PRIVATE_AR_DECL); 
-            kernel_st->insertStmtAfter(*st); 
+            SgStatement *st = new SgStatement(VAR_DECL);
+            SgSymbol *s_new = & s->copy();
+            SYMB_SCOPE(s_new->thesymb) = kernel_st->thebif;
+            e = new SgExprListExp(*new SgTypeRefExp(*C_Type(s_new->type())));
+            SgDerivedTemplateType *tp = new SgDerivedTemplateType(e, private_array_class); 
+            tp->addArg(new SgValueExp(Rank(s)));
+            s_new->setType(tp);
+            SgFunctionCallExp *efc = new SgFunctionCallExp(*s_new);
+            efc->setType(tp); 
+            st->setExpression(0, *new SgExprListExp(*efc)); 
+            kernel_st->insertStmtAfter(*st);
             st_first = st;
-
-            e  = new SgExpression(TYPE_OP);
-            e->setType(C_Type(s->type()->baseType()));
-            st->setExpression(0, e); 
-
-            e = new SgValueExp(Rank(s));
-            st->setExpression(1, e);
+            SgSymbol *s_dims=NULL;
             if (Rank(s)>1)
             {
                 char *name = new char[strlen(s->identifier())+7];
@@ -10039,17 +10194,14 @@ void DeclarePrivateVars(SgType *idxTypeInKernel)
                 }
                 else
                 {
-                     for (int i=Rank(s)-1; i; i--)
-                         elist = AddListToList(elist, new SgExprListExp(*Calculate(ArrayDimSize(s,i))));
+                    for (int i=Rank(s)-1; i; i--)
+                        elist = AddListToList(elist, new SgExprListExp(*Calculate(ArrayDimSize(s,i))));
                 }   
                 einit->setLhs(elist); 
                 SgStatement *st_dims = makeSymbolDeclarationWithInit(s_dims, einit);//Declaration_Statement(s_dims);
                 kernel_st->insertStmtAfter(*st_dims); 
                 st_first = st_dims;
             }
-            SgSymbol *s_new = & s->copy();
-            SYMB_SCOPE(s_new->thesymb) = kernel_st->thebif; 
-            SgFunctionCallExp *efc = new SgFunctionCallExp(*s_new);
             if (s_dims)
             {
                 efc->addArg(*new SgVarRefExp(s_dims));
@@ -10058,11 +10210,11 @@ void DeclarePrivateVars(SgType *idxTypeInKernel)
             if (satr)
             {   
                 SgSymbol *sp = *satr;
-                efc->addArg(*new SgVarRefExp(sp)); //e->setLhs(new SgExprListExp(*new SgVarRefExp(sp)));
-            }            
-            st->setExpression(2, efc);            
+                efc->addArg(*new SgVarRefExp(sp)); 
+            }                       
         }
     }
+  
     if (!st_first)
         return;
     
@@ -14000,7 +14152,7 @@ SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
     for (sg = hgpu_first, sb = base_first, sl = acc_array_list, ln = 0; ln<num; sg = sg->next(), sb = sb->next(), sl = sl->next, ln++)
     {
         e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(sl->symb->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sb));
-        fcall->addArg(*e);
+        fcall->addArg(*e);   
         for (i = NumberOfCoeffs(sg); i>0; i--)
             fcall->addArg(*new SgArrayRefExp(*sg, *new SgValueExp(i)));
     }
@@ -14105,7 +14257,7 @@ SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
     }
 
     e_all_private_size = sizeOfPrivateArraysInBytes();
-    if (options.isOn(C_CUDA) && e_all_private_size)
+    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
     {
         for (el=private_list, lnp=0; el; el=el->rhs())
         {
@@ -14206,7 +14358,7 @@ SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
 	st_end->insertStmtBefore(*stmt, *st_hedr);
 
         // insert code for big private arrays
-        if (options.isOn(C_CUDA) && e_all_private_size) //(e_size = sizeOfPrivateArraysInBytes()))
+        if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size)) //(e_size = sizeOfPrivateArraysInBytes()))
         {
             SgSymbol *s_private_size = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("privateSizeForBlock"), *C_DvmType(), *st_hedr);
             stmt = makeSymbolDeclaration(s_private_size);
@@ -14215,7 +14367,7 @@ SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
             addDeclExpList(s_total_threads, stmt->expr(0));
                         
             SgExpression *e_threads = &(*new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z"));
-            SgExpression *e_private_size_for_block = &(*e_threads * *e_all_private_size);
+            SgExpression *e_private_size_for_block = &(*e_threads * *(e_all_private_size ? e_all_private_size : CalculateSizeOfPrivateArraysInBytes()));
             stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_private_size), *e_private_size_for_block));
 	    st_end->insertStmtBefore(*stmt, *st_hedr);
             
@@ -14254,7 +14406,7 @@ SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
             InsertFinishReductionCalls(st_end, s_loop_ref, s_red_num);
 
         // to dispose private arrays
-        if (options.isOn(C_CUDA) && e_all_private_size)
+        if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
             for (s = private_first, ln = 0;  ln < lnp; s = s->next(), ln++)  // private arrays
             {
                 stmt = new SgCExpStmt(*DisposePrivateArray(s_loop_ref, s));
@@ -14583,6 +14735,19 @@ SgExpression *sizeOfElementInBytes(SgSymbol *symb)
 }
 
 SgExpression *sizeOfPrivateArraysInBytes()
+{
+    SgExpression *e_size = CalculateSizeOfPrivateArraysInBytes();
+    if (e_size && e_size->isInteger()) // calculating length if it is possible
+    { 
+        if (options.isOn(BIG_PRIVATES))  
+            return e_size;
+        else
+            return NULL;
+    }
+    return e_size;
+}
+
+SgExpression *CalculateSizeOfPrivateArraysInBytes()
 {
     SgExpression *el, *e_size = NULL; 
     int isize = 0;
@@ -14614,19 +14779,18 @@ SgExpression *sizeOfPrivateArraysInBytes()
         }                 
     }
     if (e_size && e_size->isInteger()) // calculating length if it is possible
-    { 
-        int i_size = e_size->valueInteger();
-        e_size = new SgValueExp(i_size); 
-        //TODO: need to add option
-        /*if (i_size > 2048)
-            return e_size;
-        else */
-            return NULL;
-    }
+        e_size = new SgValueExp(e_size->valueInteger()); 
   
     return e_size;
 }
 
+int PrivateArrayClassUse(SgExpression *e_all_private_size)
+{
+    if (private_array_arg || e_all_private_size)
+        return 1;
+    return 0; 
+}
+
 SgExpression *ProductOfDimSizeArgs(SgExpression *esizes)
 {
     SgExpression *el, *eprod = NULL;
diff --git a/dvm/fdvm/trunk/fdvm/acc_across.cpp b/dvm/fdvm/trunk/fdvm/acc_across.cpp
index d4bc926..43142dd 100644
--- a/dvm/fdvm/trunk/fdvm/acc_across.cpp
+++ b/dvm/fdvm/trunk/fdvm/acc_across.cpp
@@ -1638,7 +1638,7 @@ vector<ArgsForKernel> Create_C_Adapter_Function_Across_OneThread(SgSymbol *sadap
         }
 
     e_all_private_size = sizeOfPrivateArraysInBytes();
-    if (options.isOn(C_CUDA) && e_all_private_size)
+    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
     {
         for (el=private_list, lnp=0; el; el=el->rhs())
         {
@@ -1710,7 +1710,7 @@ vector<ArgsForKernel> Create_C_Adapter_Function_Across_OneThread(SgSymbol *sadap
         }
     }
     // insert code for big private arrays
-    if (options.isOn(C_CUDA) && e_all_private_size) 
+    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size)) 
     {
         GetMemoryForPrivateArrays(private_first, s_loop_ref, lnp, st_where, st_hedr, new SgValueExp(1));        
 
@@ -1796,7 +1796,8 @@ static inline void insertReductionArgs(SgSymbol **reduction_ptr, SgSymbol **redu
 static void createPrivatePointers(SgSymbol* &private_first, int &lnp, SgStatement* st_hedr, SgExpression* &e_all_private_size)
 {
     private_first = NULL;
-    if (options.isOn(C_CUDA) && (e_all_private_size=sizeOfPrivateArraysInBytes()))
+    e_all_private_size = sizeOfPrivateArraysInBytes();
+    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
     {
         SgExpression *el, *ae;
         SgSymbol *sarg;
@@ -3020,7 +3021,7 @@ vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol *sadapt
             }
             
             e_all_private_size = sizeOfPrivateArraysInBytes();
-            if (options.isOn(C_CUDA) && e_all_private_size)
+            if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
             {
                 for (el=private_list, lnp=0; el; el=el->rhs())
                 {
@@ -3085,7 +3086,7 @@ vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol *sadapt
             stmt = simple;
         }
         stmt->addComment("// GPU execution");
-        if (options.isOn(C_CUDA) && e_all_private_size)
+        if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
         {
             e_totalThreads = &(*new SgRecordRefExp(*s_blocks, "x") * *new SgRecordRefExp(*s_blocks, "y") * *new SgRecordRefExp(*s_blocks, "z") * *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z"));
             GetMemoryForPrivateArrays(private_first, s_loop_ref, lnp, stmt, st_hedr, e_totalThreads);
@@ -4067,7 +4068,7 @@ vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol *sadapt
         }
     }
     // to dispose private arrays
-    if (options.isOn(C_CUDA) && e_all_private_size)
+    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
         for (s = private_first, ln = 0;  ln < lnp; s = s->next(), ln++)  // private arrays
         {
             stmt = new SgCExpStmt(*DisposePrivateArray(s_loop_ref, s));
diff --git a/dvm/fdvm/trunk/fdvm/acc_f2c.cpp b/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
index 4ed299e..e64fd5f 100644
--- a/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
+++ b/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
@@ -103,7 +103,7 @@ static int lvl_convert_st = 0;
 // functions
 void convertExpr(SgExpression*, SgExpression*&);
 void createNewFCall(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs);
-
+static bool isPrivate(const string& array);
 
 #if TRACE
 void printfSpaces(int num)
@@ -191,6 +191,14 @@ static bool inNewVars(const char *name)
     return ret;
 }
 
+static bool isNullSubscripts(SgExpression *subs)
+{
+    if (subs && subs->attributeValue(0, NULL_SUBSCRIPTS))
+        return true;
+    else
+        return false;
+}
+
 static void addInListIfNeed(SgSymbol *tmp, int type, reduction_operation_list *tmpR)
 {
     stack<SgExpression*> allArraySub;
@@ -285,6 +293,14 @@ static void addRandStateIfNeeded(const string& name)
     private_list = e;
 }
 
+void swapDimentionsInprivateList(SgExpression *pList)
+{
+    private_list = pList;
+    red_struct_list = NULL;
+    swapDimentionsInprivateList();
+    private_list = NULL;
+}
+
 void swapDimentionsInprivateList()
 {
     SgExpression *tmp = private_list;
@@ -639,46 +655,53 @@ SgExpression* switchArgumentsByKeyword(const string& name, SgExpression* funcCal
                 if (argDims != dims)
                 {
                     char buf[256];
-                    sprintf(buf, "Dimention of the %d formal and actual parameters of '%s' call is not equal", i, name.c_str());
+                    sprintf(buf, "Rank of the %d dummy and actual arguments of '%s' call is not equal", i, name.c_str());
                     Error(buf, "", 651, first_do_par);
                 }
 
                 SgExpression* argList = NULL;
-                for (int j = 6; j >= 0; --j)
+                for (int j = MAX_DIMS; j >= 0; --j)
                 {
                     if (argInfo->elem(j) == NULL)
                         continue;
-
                     //TODO: not checked!!                    
-                    SgExpression* val = Calculate(&(*UpperBound(resultExprCall[i]->symbol(), j) - *LowerBound(resultExprCall[i]->symbol(), j) + *LowerBound(s->parameter(i), j)));
-                    if (val != NULL)
-                        tmp = new SgExprListExp(*val);
-                    else
-                        tmp = new SgExprListExp(*new SgValueExp(int(0)));
+                    if (j<dims)
+                    {
+                        SgExpression* val = Calculate(&(*UpperBound(resultExprCall[i]->symbol(), j) - *LowerBound(resultExprCall[i]->symbol(), j) + *LowerBound(s->parameter(i), j)));
+                        if (val != NULL)
+                            tmp = new SgExprListExp(*val);
+                        else
+                            tmp = new SgExprListExp(*new SgValueExp(int(0)));
 
-                    tmp->setRhs(argList);
-                    argList = tmp;
-                    val = LowerBound(s->parameter(i), j);
-                    if (val != NULL)
-                        tmp = new SgExprListExp(*val);
-                    else
-                        tmp = new SgExprListExp(*new SgValueExp(int(0)));
-                    tmp->setRhs(argList);
-                    argList = tmp;
+                        tmp->setRhs(argList);
+                        argList = tmp;
+                        val = LowerBound(s->parameter(i), j);
+                        if (val != NULL)
+                            tmp = new SgExprListExp(*val);
+                        else
+                            tmp = new SgExprListExp(*new SgValueExp(int(0)));
+                        tmp->setRhs(argList);
+                        argList = tmp;
+                    }
                 }
+                if (isPrivate(resultExprCall[i]->symbol()->identifier())) //isPrivateArrayDummy==1
+                {  
+                    resultExprCall[i] = new SgArrayRefExp(*resultExprCall[i]->symbol());
+                }
+                else
+                {
+                    SgArrayRefExp* arrRef = new SgArrayRefExp(*resultExprCall[i]->symbol());
+                    for (int j = 0; j < dims; ++j)
+                        arrRef->addSubscript(*new SgValueExp(0));
 
-                SgArrayRefExp* arrRef = new SgArrayRefExp(*resultExprCall[i]->symbol());
-                for (int j = 0; j < dims; ++j)
-                    arrRef->addSubscript(*new SgValueExp(0));
-
-                tmp = new SgExprListExp(SgAddrOp(*arrRef));
-                tmp->setRhs(argList);
-                argList = tmp;
-                SgSymbol* aa = s->parameter(i);
-
-                SgTypeRefExp* typeExpr = new SgTypeRefExp(*C_Type(s->parameter(i)->type()));
-                resultExprCall[i] = new SgFunctionCallExp(*((new SgDerivedTemplateType(typeExpr, new SgSymbol(TYPE_NAME, "s_array")))->typeName()), *argList);
-                resultExprCall[i]->setRhs(typeExpr);
+                    tmp = new SgExprListExp(SgAddrOp(*arrRef));
+                    tmp->setRhs(argList);
+                    argList = tmp;
+                    SgSymbol* aa = s->parameter(i);
+                    SgTypeRefExp* typeExpr = new SgTypeRefExp(*C_Type(s->parameter(i)->type()));
+                    resultExprCall[i] = new SgFunctionCallExp(*((new SgDerivedTemplateType(typeExpr, new SgSymbol(TYPE_NAME, "s_array")))->typeName()), *argList);
+                    resultExprCall[i]->setRhs(typeExpr);
+                }
             }
         }
     }
@@ -925,7 +948,7 @@ static bool isPrivate(const string& array)
 static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isFunction)
 {
     bool ret = true;
-
+    bool casePrivateArray = false;
     const string name(funcSymb->identifier());
 
     vector<SgType*> *prototype = NULL;
@@ -1072,15 +1095,29 @@ static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isF
                         }
                         else if (inCall->dimension() != inProt->dimension())
                         {
-                            typeInCall = NULL;
+                            if (isPrivate(argInCall->lhs()->symbol()->identifier()) && isPrivateArrayDummy(argInCall->lhs()->symbol()) != 1)
+                                typeInCall = typeInProt;
+                            else
+                                typeInCall = NULL;
+                          
 #ifdef DEB
                             printf("typeInCall NULL 2\n");
 #endif
                         }
                         else
+                        {
                             typeInCall = typeInProt;
+                            if (for_kernel && isPrivate(argInCall->lhs()->symbol()->identifier()) || isPrivateArrayDummy(argInCall->lhs()->symbol())==1) 
+                            {   
+                                typeInCall = NULL;
+                                casePrivateArray = true;
+#ifdef DEB
+                                printf("typeInCall NULL 2_p\n");
+#endif
+                            }
+                        } 
                     }
-                    else
+                    else  // countOfSubscrInCall != 0 
                     {
                         //TODO: not supported yet
                         if (inCall && inProt)
@@ -1092,12 +1129,12 @@ static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isF
                             }
                             else
                             {
-                                if (options.isOn(O_PL2) && dvm_parallel_dir->expr(0) == NULL)
+                                if (options.isOn(O_PL2) && dvm_parallel_dir && dvm_parallel_dir->expr(0) == NULL)
                                     dimSizeInProt = inCall->dimension();
 
                                 const int arrayDim = isPrivate(argInCall->lhs()->symbol()->identifier()) ? inCall->dimension() : 1;
 
-                                if (isSgArrayType(typeInProt) && (!options.isOn(O_PL2) || dvm_parallel_dir->expr(0) != NULL)) // inconsistency
+                                if (isSgArrayType(typeInProt) && (!options.isOn(O_PL2) || !for_kernel || dvm_parallel_dir && dvm_parallel_dir->expr(0) != NULL)) // inconsistency
                                 {
                                     if (inCall->dimension() == inProt->dimension())
                                     {
@@ -1208,7 +1245,7 @@ static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isF
                                     }
                                 }
                                 else
-                                    ; //TODO
+                                 printf("typeInCall NULL 11\n");    //TODO
                             }
                         }
 
@@ -1228,14 +1265,15 @@ static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isF
                         if (CompareKind(typeInProt, typeInCall))
                             typeInCall = typeInProt;
                     }
-                }
-
+                } // end of type analysis
+                //----------------------------------------------------------------------------------------------------
                 if (typeInProt != typeInCall)
                 {
                     char buf[256];
                     sprintf(buf, "Can not match the %d argument of '%s' procedure", i + 1, name.c_str());
-                    Error(buf, "", 656, first_do_par);
-                    ret = false;
+                    if (!casePrivateArray) 
+                        Error(buf, "", 656, first_do_par);
+                    //ret = false;
                 }
                 else if (argInCall->lhs()->variant() == ARRAY_REF)
                 {
@@ -1253,7 +1291,7 @@ static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isF
                     {
                         if (dimSizeInProt == 0)
                         {
-                            if (isFunction)
+                            //if (isFunction)  //04.02.25 podd
                             {
                                 SgExpression* arrayRef = argInCall->lhs();
                                 convertExpr(arrayRef, arrayRef);
@@ -1307,7 +1345,9 @@ static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isF
                             }
                             else
                             {
-                                SgExpression* arr = argInCall->lhs();
+                                SgExpression* arr = argInCall->lhs(); 
+                                if (!isNullSubscripts(arr->lhs())) 
+                                    convertExpr(arr, arr);
 
                                 if (options.isOn(O_PL2))
                                 {
@@ -1316,14 +1356,23 @@ static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isF
                                         cast = C_PointerType(C_Type(typeInProtSave->baseType()));
                                     else
                                         cast = C_PointerType(C_Type(typeInProtSave));
+                                    if (for_kernel && isPrivate(arr->symbol()->identifier()) || isPrivateArrayDummy(arr->symbol())==2)
+                                    {
+                                        cast = C_PointerType(C_VoidType());
+                                    }
                                     argInCall->setLhs(*new SgCastExp(*cast, SgAddrOp(*arr)));
                                 }
                                 else
-                                    argInCall->setLhs(SgAddrOp(*arr));
+                                {
+                                    if (for_kernel && isPrivate(arr->symbol()->identifier()) || isPrivateArrayDummy(arr->symbol())==2) 
+                                        argInCall->setLhs(*new SgCastExp(*C_PointerType(C_VoidType()), SgAddrOp(*arr)));
+                                    else
+                                        argInCall->setLhs(SgAddrOp(*arr)); 
+                                }
                             }
                         }
                     }
-                }
+                } //end of ARRAY_REF
                 else
                 {
                     SgExpression* arg = argInCall->lhs();
@@ -1337,7 +1386,7 @@ static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isF
                         arg->setType(typeCopy);
                     }
 
-                    if (isFunction)
+                    //if (isFunction)   // 04.02.25 podd
                         convertExpr(arg, arg);
 
                     if (selector)
@@ -2752,7 +2801,7 @@ static bool convertStmt(SgStatement* &st, pair<SgStatement*, SgStatement*> &retS
         lvl_convert_st += 2;
 #endif
         SgExpression *lhs = st->expr(0);
-        convertExpr(lhs, lhs);
+        //convertExpr(lhs, lhs);  // !!!! 04.02.25 podd
 
         if (lhs == NULL || SAPFOR_CONV)
         {
diff --git a/dvm/fdvm/trunk/fdvm/calls.cpp b/dvm/fdvm/trunk/fdvm/calls.cpp
index 7a08ba3..bd37e4c 100644
--- a/dvm/fdvm/trunk/fdvm/calls.cpp
+++ b/dvm/fdvm/trunk/fdvm/calls.cpp
@@ -41,7 +41,9 @@ int isStatementFunction(SgSymbol *s);
 int isHeaderNode(graph_node *gnode);
 int isDeadNode(graph_node *gnode);
 int isNoBodyNode(graph_node *gnode);
-void PrototypeOfFunctionFromOtherFile(graph_node *node, SgStatement *after);
+void InsertPrototypesOfFunctionFromOtherFile(graph_node *node, SgStatement *after);
+void PrototypeOfFunctionFromOtherFile(graph_node *node, SgStatement *after, argument_numbers *arg_numbs);
+void InsertCopiesOfProcedure(graph_node *ndl, SgStatement *after);
 graph_node_list  *addToNodeList(graph_node_list *pnode, graph_node *gnode);
 graph_node_list  *delFromNodeList(graph_node_list *pnode, graph_node *gnode);
 graph_node_list  *isInNodeList(graph_node_list *pnode, graph_node *gnode);
@@ -58,6 +60,7 @@ void ScanSymbolTable(SgFile *f);
 void ScanTypeTable(SgFile *f);
 void printSymb(SgSymbol *s);
 void printType(SgType *t);
+void replaceVectorRef(SgExpression *e);
 //-------------------------------------------------------------------------------------
 extern SgExpression *private_list;
 extern map <string, vector<vector<SgType*> > > interfaceProcedures;
@@ -103,7 +106,7 @@ int IsInternalProcedure(SgSymbol *s)
 
 SgStatement *hasInterface(SgSymbol *s)
 {
-      return (ATTR_NODE(s) ? GRAPHNODE(s)->st_interface : NULL);
+    return (ATTR_NODE(s) ? GRAPHNODE(s)->st_interface : NULL);
 }
 
 void SaveInterface(SgSymbol *s, SgStatement *interface)
@@ -140,6 +143,25 @@ int isInParameter(SgSymbol *s, int i)
 {
     return (s && ((SgFunctionSymb *) s)->parameter(i) && (((SgFunctionSymb *) s)->parameter(i)->attributes() & IN_BIT) ? 1 : 0);
 }
+
+int isArrayParameter(SgSymbol *s, int i)
+{
+    return (s && ((SgFunctionSymb *) s)->parameter(i) && (((SgFunctionSymb *) s)->parameter(i)->attributes() & DIMENSION_BIT) ? 1 : 0);
+}
+
+int isArrayParameterWithAssumedShape(SgSymbol *s, int i)
+{
+    return (isArrayParameter(s,i) && AssumedShape(isSgArrayType(((SgFunctionSymb *) s)->parameter(i)->type())->getDimList()));
+}
+
+int isPrivateArrayDummy(SgSymbol *s)
+{
+   int *private_attr = (int *) s->attributeValue(0, DUMMY_PRIVATE_AR);
+   if (!private_attr) 
+       return 0;
+   else
+       return *private_attr;   
+}
  
 SgSymbol *ProcedureSymbol(SgSymbol *s)
 {
@@ -204,6 +226,7 @@ void MarkAsCalled(SgSymbol *s)
 {
     graph_node *gnode;
     edge *gedge;
+
     if (!ATTR_NODE(s))
         return;
     gnode = GRAPHNODE(s);
@@ -215,6 +238,21 @@ void MarkAsCalled(SgSymbol *s)
 
 }
 
+void MarkPrivateArgumentsOfRoutine(SgSymbol *s, SgExpression *private_args)
+{
+     SgExpression *el; 
+     for (el=private_args; el; el=el->rhs())
+     {
+          SgSymbol *arg = el->lhs()->symbol();
+          if (IS_ARRAY(arg) && !IS_DVM_ARRAY(arg))
+          {
+              int i = findParameterNumber(s,arg->identifier());
+              if (i>=0)
+                  addArgumentNumber(findParameterNumber(s,arg->identifier()), s); 
+          }    
+     } 
+}
+
 void MakeFunctionCopy(SgSymbol *s)
 {
     SgSymbol *s_header;
@@ -262,11 +300,13 @@ void InsertCalledProcedureCopies()
         {
             if (ndl->st_header && current_file_id == ndl->file_id)  //procedure from current_file
             {
-                ndl->st_copy = InsertProcedureCopy(ndl->st_header, ndl->st_header->symbol(), ndl->is_routine, after); //C_Cuda ? mod_gpu : mod_gpu->lexNext());
+                InsertCopiesOfProcedure(ndl, after);
                 n++;
             }
             else     //procedure from other file
-                PrototypeOfFunctionFromOtherFile(ndl,after);
+             {
+                InsertPrototypesOfFunctionFromOtherFile(ndl,after);
+             }
 
             ndl->count = 0;
             ndl->st_interface = NULL;
@@ -345,11 +385,181 @@ int HasDerivedTypeVariables(SgStatement *header)
     return 0;
 }
 
-SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is_routine, SgStatement *after)
+argument_numbers *GetFirstLenPlus(argument_numbers *source, int source_len, int list_len)
 {
+ // copy first (list_len+1) elements of source
+    if (list_len == source_len)
+        return NULL;
+    argument_numbers *cur_list, *source_list, *new_list, *new_elem;
+    new_list = new argument_numbers; 
+    new_list->number = source->number;
+    new_list->next = NULL;
+    int i;
+    for (i=2, cur_list=new_list, source_list = source->next; i<=list_len+1; i++, source_list = source_list->next)
+    {   
+            new_elem  = new argument_numbers; 
+            new_elem->number = source_list->number; 
+            new_elem->next=NULL;
+            cur_list->next = new_elem;
+            cur_list = new_elem;
+    }
+    return new_list;
+}
+
+argument_numbers *elementByValue(int numb, argument_numbers *nlist)
+{
+    for (; nlist; nlist=nlist->next)
+        if (nlist->number == numb)
+            return nlist;
+    return NULL;
+}
+
+argument_numbers *element(int n, argument_numbers *nlist)
+{
+    for (int i=1; nlist; nlist=nlist->next, i++)
+        if (i == n)
+            return nlist;
+    return NULL;
+}
+
+int numberOfElements(argument_numbers *nlist)
+{
+    int i;
+    for (i=0; nlist; nlist=nlist->next, i++)
+         ;
+    return i;
+}
+
+void printValueList(argument_numbers *nlist)
+{
+    printf(" (");
+    for (; nlist; nlist=nlist->next)
+         printf("%d ",nlist->number);
+    printf(")  ");
+}  
+
+argument_numbers *GetNextWithChange(argument_numbers *source, int source_len, argument_numbers *nlist, int list_len)
+{
+    int i;
+    argument_numbers *elem, *source_elem;
+    for (i=1, elem=nlist; elem; i++, elem=elem->next)
+        if ( elem->number == (source_elem=element(source_len+i-list_len, source))->number )
+            break;
+
+    if (i == 1) return NULL;
+    elem = element(i-1, nlist); //element with serial number i-1
+    int numb = elem->number;
+    source_elem = elementByValue(numb, source)->next;
+    for (int j=i-1; j<=list_len; j++, elem=elem->next, source_elem=source_elem->next)
+        elem->number = source_elem->number; 
+
+    return nlist;
+}
+
+argument_numbers *GetNextNumberList(argument_numbers *source, argument_numbers *nlist)
+{
+    if (!source) return NULL;
+    if (!nlist)
+    {
+        nlist = new argument_numbers;
+        nlist->next = NULL;
+        nlist->number = source->number; 
+        return nlist;
+    }
+    int source_len = numberOfElements(source);
+    int list_len = numberOfElements(nlist);
+    argument_numbers * last_elem = element(list_len, nlist); 
+    argument_numbers *last_in_source = element(source_len, source);  
+
+    if (list_len == source_len) return NULL;
+
+    argument_numbers *elem_in_source = elementByValue(last_elem->number, source);
+    if (elem_in_source != last_in_source)
+    {   //get next in row
+        last_elem->number = elem_in_source->next->number;
+        return nlist; 
+    }
+    else if ((nlist = GetNextWithChange(source, source_len, nlist, list_len)))
+        return nlist;
+    else
+        return GetFirstLenPlus(source, source_len, list_len);
+}
+
+argument_numbers *correctArgList(argument_numbers *arg_numbs, SgStatement *st_header)
+{
+     SgSymbol *s = st_header->symbol();
+     int i;
+    
+     argument_numbers *numb_list=NULL, *elem;
+     for (i=0; arg_numbs; arg_numbs=arg_numbs->next, i++)
+     {      
+         if ( !isArrayParameterWithAssumedShape(s, arg_numbs->number) )
+         {       
+                 elem = new argument_numbers;
+                 elem->number = arg_numbs->number;
+
+             if (numb_list)
+             {  
+                 elem->next = numb_list;
+                 numb_list =elem;
+             }
+             else 
+                 elem->next = NULL;
+                 numb_list = elem;
+         } 
+     }        
+     return numb_list;
+}
+
+void InsertCopiesOfProcedure(graph_node *ndl, SgStatement *after)
+{
+    //insert copies of procedure after statement 'after'
+    argument_numbers *numb_list = NULL;
+    ndl->st_copy = InsertProcedureCopy(ndl->st_header, ndl->st_header->symbol(), ndl->is_routine, numb_list, after);
+    ndl->st_copy_first = ndl->st_copy;
+
+    if (ndl->arg_numbs)
+    {
+        argument_numbers *arg_numbs = correctArgList(ndl->arg_numbs, ndl->st_header);
+        while ((numb_list = GetNextNumberList(arg_numbs, numb_list)))
+            ndl->st_copy = InsertProcedureCopy(ndl->st_header, ndl->st_header->symbol(), ndl->is_routine, numb_list, after);       
+    }    
+}
+
+SgExpression *PrivateArrayDummyList(SgStatement *new_header, argument_numbers *arg_numbs)
+{
+    SgSymbol *s = new_header->symbol();
+    SgExpression *pList = NULL;
+    SgExpression *ae;
+    int *id;
+    int n = ((SgFunctionSymb *)s)->numberOfParameters();
+    for (int i = 0; i < n; i++)
+    {
+        SgSymbol *sarg = ((SgFunctionSymb *)s)->parameter(i);
+        if (isArrayParameterWithAssumedShape(s, i))
+        {
+            id = new int;
+            *id = 1;
+        } 
+        else if (arg_numbs && elementByValue(i, arg_numbs)) 
+        { 
+            id = new int;
+            *id = 2;
+        }
+        else
+            continue;
+        sarg->addAttribute(DUMMY_PRIVATE_AR, (void *)id, sizeof(int));
+        ae =  new SgArrayRefExp(*sarg);
+        ae ->setType(sarg->type());
+        pList = AddListToList(pList, new SgExprListExp(*ae));       
+    }
+    return pList;
+}
+
+SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is_routine, argument_numbers *arg_numbs, SgStatement *after)
+{    //InsertProcedureCopy(ndl->st_header, ndl->st_header->symbol(), ndl->is_routine, after)
     //insert copy of procedure after statement 'after'
     SgStatement *new_header, *end_st;
-    
     SgSymbol *new_sproc = &sproc->copySubprogram(*after);
     new_header = after->lexNext(); // new procedure header  //new_sproc->body()
     SYMB_SCOPE(new_sproc->thesymb) = mod_gpu->thebif;
@@ -362,13 +572,15 @@ SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is
         int flagHasDerivedTypeVariables = HasDerivedTypeVariables(new_header); 
        
         end_st = new_header->lastNodeOfStmt();
-        ConvertArrayReferences(new_header->lexNext(), end_st);  //!!!! 
+     
+        private_list =  PrivateArrayDummyList(new_header,arg_numbs);
+        ConvertArrayReferences(new_header->lexNext(), end_st);
+       
+        TranslateProcedureHeader_To_C(new_header,arg_numbs);
 
-        TranslateProcedureHeader_To_C(new_header);
+        // extract specification statements and add local arrays to private_list
+        ExtractDeclarationStatements(new_header); 
 
-        private_list = NULL;
-
-        ExtractDeclarationStatements(new_header);
         SgSymbol *s_last = LastSymbolOfFunction(new_header);
         if (sproc->variant() == FUNCTION_NAME)
         {  
@@ -378,20 +590,19 @@ SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is
            
             InsertReturnBeforeEnd(new_header, end_st);
         }
-
         swapDimentionsInprivateList();
-        //std::vector < std::stack < SgStatement*> > zero = std::vector < std::stack < SgStatement*> >(0);
-        //cur_func = after;
-        Translate_Fortran_To_C(new_header, end_st, 0, st_header);   //TranslateProcedure_Fortran_To_C(after->lexNext());
-        cur_func = after; 
+
+        Translate_Fortran_To_C(new_header, end_st, 0, st_header);
+        cur_func = after;
         if (sproc->variant() == FUNCTION_NAME)
         {   
             new_header->insertStmtAfter(*Declaration_Statement(new_sproc), *new_header);
             ChangeReturnStmts(new_header, end_st, returnSymbol);
         }
+       
         if(!flagHasDerivedTypeVariables) //!!! derived data type is not supported          
             MakeFunctionDeclarations(new_header, s_last);
-        
+       
         newVars.clear();
         private_list = NULL;
         // generate prototype of function and insert it before 'after'
@@ -405,7 +616,7 @@ SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is
         new_header->addComment("\n");  // add comment (empty line) to new procedure header
         ReplaceInterfaceBlocks(new_header);
     }
-    
+
     return(new_header);
 }
 
@@ -434,13 +645,15 @@ void doPrototype(SgStatement *func_hedr, SgStatement *block_header, int static_f
     block_header->insertStmtAfter(*st, *block_header);        //before->insertStmtAfter(*st,*before->controlParent());
 }
 
-SgStatement  *TranslateProcedureHeader_To_C(SgStatement *new_header)
+SgStatement  *TranslateProcedureHeader_To_C(SgStatement *new_header, argument_numbers *arg_numbs)
 {
     SgSymbol *new_sproc =  new_header->symbol();
     SgFunctionRefExp *fe = new SgFunctionRefExp(*new_sproc);
     fe->setSymbol(*new_sproc);
     new_header->setExpression(0, *fe);
+
     SgSymbol *returnSymbol = getReturnSymbol(new_header, new_sproc);
+
     if (new_sproc->variant() == PROCEDURE_NAME)
         new_sproc->setType(C_VoidType());
     else                     // FUNCTION_NAME
@@ -449,14 +662,30 @@ SgStatement  *TranslateProcedureHeader_To_C(SgStatement *new_header)
         new_sproc->setType(C_Type(returnSymbol->type()));
     }
     fe->setType(new_sproc->type());
-    fe->setLhs(FunctionDummyList(new_sproc));
+    fe->setLhs(FunctionDummyList(new_sproc, new_header, arg_numbs));
     BIF_LL3(new_header->thebif) = NULL; 
     new_header->addDeclSpec(BIT_CUDA_DEVICE);
     new_header->setVariant(FUNC_HEDR); 
+
     return new_header;
 }
 
-void PrototypeOfFunctionFromOtherFile(graph_node *node, SgStatement *after)
+void InsertPrototypesOfFunctionFromOtherFile(graph_node *node, SgStatement *after)
+{
+    if (options.isOn(RTC)) return;
+    //insert prototypes of procedure after statement 'after'
+    argument_numbers *numb_list = NULL;
+    PrototypeOfFunctionFromOtherFile(node, after, numb_list);
+
+    if (node->arg_numbs)
+    {
+        argument_numbers *arg_numbs = correctArgList(node->arg_numbs, node->st_header);
+        while ((numb_list = GetNextNumberList(arg_numbs, numb_list)))
+            PrototypeOfFunctionFromOtherFile(node, after, numb_list);
+    }    
+}
+
+void PrototypeOfFunctionFromOtherFile(graph_node *node, SgStatement *after, argument_numbers *arg_numbs)
 {
     if (options.isOn(RTC)) return;
     if(!node->st_interface) return;
@@ -469,9 +698,9 @@ void PrototypeOfFunctionFromOtherFile(graph_node *node, SgStatement *after)
     SYMB_SCOPE(sh->thesymb) = current_file->firstStatement()->thebif;
     SgStatement *new_hedr = &(interface->copy()); 
     new_hedr->setSymbol(*sh);
-    TranslateProcedureHeader_To_C(new_hedr);
+    TranslateProcedureHeader_To_C(new_hedr, arg_numbs);
     doPrototype(new_hedr, mod_gpu, !STATIC);
-    
+
     //current_file->firstStatement()->insertStmtAfter(*new_hedr, *current_file->firstStatement()); 
     //SYMB_FUNC_HEDR(sh->thesymb) = new_hedr->thebif; 
 
@@ -483,12 +712,11 @@ void PrototypeOfFunctionFromOtherFile(graph_node *node, SgStatement *after)
     return;
 }
 
-SgExpression *FunctionDummyList(SgSymbol *s)
+SgExpression *FunctionDummyList(SgSymbol *s, SgStatement *st_header, argument_numbers *arg_numbs)
 {
     SgExpression *arg_list = NULL, *ae = NULL;
 
     int n = ((SgFunctionSymb *)s)->numberOfParameters();
-    
     //insert at 0-th position inf-argument
     //check for optional arguments, if some argunemt exist with optional then add argument-mask
     
@@ -548,21 +776,73 @@ SgExpression *FunctionDummyList(SgSymbol *s)
                 }
                 dimList = dimList->rhs();
             }
+            int rank =  Rank(sarg);
+            SgType *ar_type = sarg->type();
+            SgType *tbase = C_Type(sarg->type()->baseType());
+            SgType *t = C_PointerType(tbase);
+            SgSymbol *new_arg = &sarg->copy();//new SgVariableSymb(sarg->identifier(), *t, *st_header);
+            //new_arg->thesymb->entry.var_decl.local = IO; // is new dummy argument
+            new_arg->setType(t);
+            ae = new SgVarRefExp(new_arg);
+            //ae->setType(t);
 
-            SgType *t = C_PointerType(C_Type(sarg->type()->baseType()));
-            sarg->setType(t);
-            ae = new SgVarRefExp(sarg);
-            ae->setType(t);
             if (needChanged)
-            {
-                sarg->setType(new SgDerivedTemplateType(new SgTypeRefExp(*t), new SgSymbol(TYPE_NAME, "s_array")));
-                ae = new SgVarRefExp(sarg);
+            {                                        
+                    SgExpression *ce = new SgExprListExp(*new SgTypeRefExp(*tbase));
+                    SgDerivedTemplateType *tpc = new SgDerivedTemplateType(ce, private_array_class); 
+                    tpc->addArg(new SgValueExp(rank));
+                    new_arg->setType(tpc);
+                    //int *id = new int;
+                    //*id = 1;
+                    //sarg->addAttribute(DUMMY_PRIVATE_AR, (void *)id, sizeof(int));
+                    ae = &SgAddrOp(*new SgVarRefExp(new_arg));                              
+                //}
+                //else
+                //{                   else
+
+                //    sarg->setType(new SgDerivedTemplateType(new SgTypeRefExp(*t), new SgSymbol(TYPE_NAME, "s_array")));
+                //    ae = new SgVarRefExp(sarg);
+                //}
                 ae = new SgExprListExp(*ae);
                 arg_list = AddListToList(arg_list, ae);
                 continue;
             }
 
-            //ae->setType(C_ReferenceType(sarg->type())); 
+            if (arg_numbs && elementByValue(i, arg_numbs)) 
+            {        
+                     //SgType *tp = C_Type(sarg->type()->baseType()); 
+                     t = C_PointerType(C_VoidType());
+                     SgSymbol *sp = new SgSymbol(VARIABLE_NAME, PointerNameForPrivateArray(sarg), *t, *st_header);
+                     //sp->thesymb->entry.var_decl.local = IO;
+                     SgSymbol **symb = new (SgSymbol *);
+                     *symb= sarg;
+                     sp->addAttribute(FUNCTION_AR_DUMMY, (void*) symb, sizeof(SgSymbol *));
+                     ae->setSymbol(*sp);
+                     //ae->setType(t);
+                     //sarg->setType(ar_type);  // restoration of argument type
+                     //int *id = new int;
+                     //*id = 2;
+                     //sarg->addAttribute(DUMMY_PRIVATE_AR, (void *)id, sizeof(int));
+
+                                          //ae->setType(C_ReferenceType(t));
+                     //ae = new SgPointerDerefExp(*ae);
+                     //ae = new SgCastExp(*C_PointerType(C_VoidType()), *ae);
+                     //arg_list = AddListToList(                    int *id = new int;
+                     //continue;
+
+                     //ae = new SgCastExp(*C_PointerType( t), *new SgVarRefExp(sp));
+                    // ae = new SgVarRefExp(sp);
+                     //ae = new SgExprListExp(*ae); 
+                     //arg_list = AddListToList(arg_list, ae);
+                     //continue;
+
+            }
+                            
+            //sarg->setType(t);
+            //ae = new SgVarRefExp(sarg);
+            //ae->setType(t);
+
+            ae->setType(C_ReferenceType(t));//(sarg->type())); //t
             ae = new SgExprListExp(*new SgPointerDerefExp(*ae));
             arg_list = AddListToList(arg_list, ae);
             //SgSymbol *arr_info = new SgSymbol(VAR_REF, ("inf_" + std::string(sarg->identifier())).c_str());
@@ -679,11 +959,11 @@ void ExtractDeclarationStatements(SgStatement *header)
     if(stmt->variant()==CONTROL_END)
         return;
 
-    while (stmt && !isSgExecutableStatement(stmt)) //is Fortran specification statement
-    {   
+    while (stmt && (!isSgExecutableStatement(stmt) || stmt->variant()==ACC_ROUTINE_DIR)) //is Fortran specification statement or ROUTINE directive
+    {
         cur_st = stmt;     
         stmt = stmt->lexNext();
-        if(cur_st->variant() == INTERFACE_STMT || cur_st->variant() == INTERFACE_ASSIGNMENT || cur_st->variant() == INTERFACE_OPERATOR)
+        if (cur_st->variant() == INTERFACE_STMT || cur_st->variant() == INTERFACE_ASSIGNMENT || cur_st->variant() == INTERFACE_OPERATOR)
         {
             SgStatement *last = cur_st->lastNodeOfStmt();
             SgStatement *start = cur_st;
@@ -722,7 +1002,7 @@ void ExtractDeclarationStatements(SgStatement *header)
         }
         //if(cur_st->variant()==IMPL_DECL || cur_st->variant()==DATA_DECL || cur_st->variant()==USE_STMT || cur_st->variant()==FORMAT_STAT || cur_st->variant()==ENTRY_STAT || cur_st->variant()==COMM_STAT || cur_st->variant()==STMTFN_STAT )
         if(!isSgVarDeclStmt(cur_st) && !isSgVarListDeclStmt(cur_st))
-        {  
+        {
             cur_st->extractStmt(); 
             continue;     
         }
@@ -858,6 +1138,27 @@ void CorrectSubscript(SgExpression *e)
     e->setLhs((new SgExprListExp(*line)));
 }
 
+void replaceArgument(SgSymbol *fsym, SgExpression *arg, int i)
+{
+     if (isSgArrayRefExp(arg) && !arg->lhs()) //argument is  whole array (array name)
+     {
+         if (fsym && isPrivateArrayDummy(arg->symbol()) && !isArrayParameterWithAssumedShape(ProcedureSymbol(fsym),i))
+             arg->setLhs(FirstArrayElementSubscriptsOfPrivateArray(arg->symbol()));            
+         return;
+     }
+     replaceVectorRef(arg);
+     return;
+}
+
+void replaceArgumentList(SgSymbol *fsym, SgExpression *arg_list)
+{
+     if (!arg_list) return;
+     int i;
+     SgExpression *el;
+     for (el=arg_list, i=0; el; el=el->rhs(),i++)
+         replaceArgument(fsym, el->lhs(), i);
+}
+
 void replaceVectorRef(SgExpression *e)
 {
     SgType *type;
@@ -868,11 +1169,16 @@ void replaceVectorRef(SgExpression *e)
         type = isSgArrayType(e->symbol()->type());
         if (IS_DUMMY(e->symbol()) && type)
         {
-            CorrectSubscript(e);
+            if (!isPrivateArrayDummy(e->symbol()))  //isPrivate(e->symbol()->identifier())
+                CorrectSubscript(e);
         }
         return;
     }
-
+    if (isSgFunctionCallExp(e))
+    {
+        replaceArgumentList(e->symbol(),e->lhs());
+        return;
+    }
     replaceVectorRef(e->lhs());
     replaceVectorRef(e->rhs());
 }
@@ -882,6 +1188,16 @@ void ConvertArrayReferences(SgStatement *first, SgStatement *last)
     SgStatement *st;
     for (st = first; st != last; st = st->lexNext())
     {
+        if (isInterfaceStatement(st))
+        {
+            st = st->lastNodeOfStmt();
+            continue;
+        }
+        if (st->variant() == PROC_STAT) // call statement
+        {
+            replaceArgumentList(st->symbol(), st->expr(0));
+            continue; 
+        }
         if (st->expr(0))
             replaceVectorRef(st->expr(0));
         if (st->expr(1))
@@ -939,7 +1255,7 @@ void MakeFunctionDeclarations(SgStatement *header, SgSymbol *s_last)
         int flags = s->attributes();
 
         if (IS_DUMMY(s))
-        {
+        {             
             if (flags & (IN_BIT | OUT_BIT | INOUT_BIT))
                 ;
             else if(!options.isOn(NO_PURE_FUNC))
@@ -957,13 +1273,23 @@ void MakeFunctionDeclarations(SgStatement *header, SgSymbol *s_last)
             //printf("%s: %d \n",s->identifier(),s->scope()->variant());  //printf("%s: %d %s \n",s->identifier(),s->scope()->variant(),s->scope()->symbol()->identifier());
             continue;
         }
+       
+        SgSymbol **sarg = (SgSymbol **) s->attributeValue(0, FUNCTION_AR_DUMMY);
+        if (sarg)  // pointer for PrivateArray class object
+        {
+            SgExpression *elist = NULL;
+            int rank = Rank(*sarg);
+            if (rank > 1)
+                for (int i=rank-1; i; i--)
+                    elist = AddListToList(elist, new SgExprListExp(*Calculate(ArrayDimSize(*sarg,i))));
+            makeClassObjectDeclaration(*sarg, s, header, C_UnsignedLongLongType(), elist, 1); //makeSymbolDeclaration(s);  //MakePrivateArrayDeclaration(*sarg, s);
+            continue;
+        }
         if (!isSgArrayType(s->type()))  //scalar variable
             s->setType(C_Type(s->type()));
         else
-        {
             continue;
-        }
-
+         
         if (isSgConstantSymb(s))
         {   
             SgExpression *ce = ((SgConstantSymb *)s)->constantValue();            
@@ -978,9 +1304,10 @@ void MakeFunctionDeclarations(SgStatement *header, SgSymbol *s_last)
         cur_stat->insertStmtAfter(*st);
         cur_stat = st;
     }
-                //printf("\n"); if(private_list) private_list->unparsestdout(); printf("\n");  
+
     for (el = private_list; el; el = el->rhs())
     {
+        if (IS_DUMMY(el->lhs()->symbol())) return;  
         convertArrayDecl(el->lhs()->symbol());
         st = makeSymbolDeclaration(el->lhs()->symbol());
         cur_stat->insertStmtAfter(*st);
@@ -1005,6 +1332,7 @@ void ProjectStructure(SgProject &project)
     int n = project.numberOfFiles();
     SgFile *file;
     int i;
+     
     // building program structure 
     // looking through the file list of project (first time)
     for (i = n - 1; i >= 0; i--)
@@ -1246,6 +1574,7 @@ END_:
         PrintGraphNode(cur_node);
     in_routine = 0;
     return(last);
+
 }
 
 void FunctionCallSearch(SgExpression *e)
@@ -1609,13 +1938,13 @@ void Call_Site(SgSymbol *s, int inlined, SgStatement *stat, SgExpression *e)
     graph_node * gnode, *node_by_attr = NULL;
     SgSymbol *s_new = s;
     SgStatement *interface_st = NULL;
-    //printf("\n%s  id= %d \n", s->identifier(), s->id());
+    //printf("\n%s  id= %d type= %d\n", s->identifier(), s->id(), s->type() ? s->type()->variant() : 0);
     if (!do_dummy  && isDummyArgument(s)) return;
     if (!do_stmtfn && isStatementFunction(s)) return;
     // if(isIntrinsicFunction(s)) return; 
     //printf("\nLINE %d", cur_st->lineNumber());
-   
-    if(s->variant() == INTERFACE_NAME && in_region)
+    
+    if(s->variant() == INTERFACE_NAME && (in_region || in_routine))
     {
         //printf("INTERFACE_NAME %s\n",s->identifier());
         interface_st = getGenericInterface(s, stat ? stat->expr(0) : e->lhs());
@@ -1816,7 +2145,8 @@ graph_node *NewGraphNode(SgSymbol *s, SgStatement *header_st)
     gnode->clone = 0;
     gnode->count = 0;
     gnode->is_routine = 0;
-    gnode->st_interface = NULL;    
+    gnode->st_interface = NULL;  
+    gnode->arg_numbs = NULL;  
     //printf("%s --- %d %d\n",gnode->name,gnode->id,gnode->type);
     return(gnode);
 }
@@ -1981,6 +2311,24 @@ graph_node_list  *isInNodeList(graph_node_list *pnode, graph_node *gnode)
     return (NULL);
 }
 
+void addArgumentNumber(int i, SgSymbol *s)
+{
+    if (!ATTR_NODE(s))
+        return;
+    graph_node *gnode = GRAPHNODE(s); 
+    argument_numbers *nl;   
+    for (nl=gnode->arg_numbs; nl; nl=nl->next)
+        if(i == nl->number) return;
+    nl = new argument_numbers;
+    nl->number = i;
+    if (gnode->arg_numbs)
+    {
+        nl->next = gnode->arg_numbs;
+        gnode->arg_numbs = nl;
+    } 
+    else
+        gnode->arg_numbs = nl;
+}
 
 void PrintGraphNode(graph_node *gnode)
 {
@@ -2167,6 +2515,14 @@ void printSymb(SgSymbol *s)
     head = isHeaderStmtSymbol(s) ? "HEADER  " : "        ";
     printf("SYMB[%3d]  scope=STMT[%3d] : %s    %s", s->id(), (s->scope()) ? (s->scope())->id() : -1, s->identifier(), head);
     printType(s->type());
+    if(s->variant() == CONST_NAME)
+    {
+       printf(" CONST_NAME ");
+       if(IS_BY_USE(s))
+          printf(" BY_USE");
+       printf("\n");
+       return;
+    }
     if(IS_BY_USE(s))
        printf(" BY_USE %s", ORIGINAL_SYMBOL(s)->scope()->symbol()->identifier());
     if(ATTR_NODE(s))
diff --git a/dvm/fdvm/trunk/fdvm/dvm.cpp b/dvm/fdvm/trunk/fdvm/dvm.cpp
index 7447afc..61c47f0 100644
--- a/dvm/fdvm/trunk/fdvm/dvm.cpp
+++ b/dvm/fdvm/trunk/fdvm/dvm.cpp
@@ -303,6 +303,8 @@ int main(int argc, char *argv[])
             if ((*argv)[12] != '\0' && (isz = is_integer_value(*argv + 12)))
                 UnparserBufSize = isz * 1024 * 1024;
         }
+        else if (!strcmp(argv[0], "-bigPrivates")) /*ACC*/
+            options.setOn(BIG_PRIVATES);
         else if (!strcmp(argv[0], "-ioRTS"))
             options.setOn(IO_RTS);
         else if (!strcmp(argv[0], "-read_all"))
@@ -1971,11 +1973,11 @@ void TranslateFileDVM(SgFile *f)
    }
   
    if(ACC_program)
-   { InsertCalledProcedureCopies(); 
+   { InsertCalledProcedureCopies();
      AddExternStmtToBlock_C();
      GenerateEndIfDir();
      GenerateDeclarationDir(); 
-     GenerateStmtsForInfoFile();    
+     GenerateStmtsForInfoFile();  
    }
 }
 
@@ -2093,8 +2095,8 @@ void TransFunc(SgStatement *func,SgStatement* &end_of_unit) {
 //                         all directives of F-DVM 
       {
 	 //!!!debug
-         //  printVariantName(stmt->variant()); //for debug
-         //  printf("\n");
+           //printVariantName(stmt->variant()); //for debug
+           //printf("\n");
 
         //discovering distributed arrays in COMMON-blocks
         if(stmt->variant()==COMM_STAT) {
@@ -2681,7 +2683,7 @@ void TransFunc(SgStatement *func,SgStatement* &end_of_unit) {
 // current statement is executable (F77/DVM)
 
     break;
-  }  
+  }
   // checking semantics of DECLARE directives
   testDeclareDirectives(stmt);
 
@@ -2884,6 +2886,7 @@ void TransFunc(SgStatement *func,SgStatement* &end_of_unit) {
 // testing procedure
 //  if(dvm_debug && dbg_if_regim>1 && ((func->variant() == PROC_HEDR) || (func->variant() == FUNC_HEDR)) && !pstmt)// && !hasParallelDir(first_exec,func))
 //    copy_proc=1;
+ 
   for(;pstmt; pstmt= pstmt->next)
      Extract_Stmt(pstmt->st);// extracting  DVM Specification Directives
 
@@ -3237,8 +3240,9 @@ EXEC_PART_:
             } else {
                // looking through the arguments list
                SgExpression * el;
-               for(el=stmt->expr(0); el; el=el->rhs())            
-                  ChangeArg_DistArrayRef(el);   // argument
+               int i;
+               for(el=stmt->expr(0),i=0; el; el=el->rhs(),i++)            
+                  ChangeArg_DistArrayRef(el,stmt->symbol(),i);   // argument
             }            
             break;
        case ALLOCATE_STMT: 
@@ -4243,8 +4247,8 @@ END_: // end of program unit
   cur_st =  first_dvm_exec;
   if(last_dvm_entry)
     lentry = last_dvm_entry->lexNext(); // lentry - statement following first_dvm_exec or last generated dvm-initialization statement(before first_exec)
-                                        // before first_exec may be new statements generated for first_exec  
-  if(!IN_MODULE) {
+                                        // before first_exec may be new statements generated for first_exec 
+    if(!IN_MODULE) {
     if(has_contains)
       MarkCoeffsAsUsed();
     InitBaseCoeffs();
@@ -7821,9 +7825,10 @@ void ChangeDistArrayRef(SgExpression *e)
      return;
   }
   if(isSgFunctionCallExp(e)) {
+     int i;
      ReplaceFuncCall(e);
-     for(el=e->lhs(); el; el=el->rhs())
-        ChangeArg_DistArrayRef(el);
+     for(el=e->lhs(), i=0; el; el=el->rhs(),i++)
+        ChangeArg_DistArrayRef(el,e->symbol(),i);
      return;
   } 
 
@@ -7887,7 +7892,7 @@ void ChangeDistArrayRef_Left(SgExpression *e)
   return;
 }
 
-void ChangeArg_DistArrayRef(SgExpression *ele)
+void ChangeArg_DistArrayRef(SgExpression *ele, SgSymbol *fsym, int i)
 {//ele is SgExprListExp
   SgExpression  *el, *e;
   e = ele->lhs();
@@ -7904,15 +7909,23 @@ void ChangeArg_DistArrayRef(SgExpression *ele)
       if(IS_POINTER(e->symbol()))
         Error("Illegal POINTER reference: '%s'",e->symbol()->identifier(),138,cur_st);
       if((inparloop && parloop_by_handler || IN_COMPUTE_REGION) ) 
+      {
         if(DUMMY_FOR_ARRAY(e->symbol()) && isIn_acc_array_list(*DUMMY_FOR_ARRAY(e ->symbol())) )   
         {  e->setLhs(FirstArrayElementSubscriptsForHandler(e->symbol()));
                                         //changed by first array element reference
            if(!for_host)
-             DistArrayRef(e,0,cur_st); 
+             DistArrayRef(e,0,cur_st);  
         }
-        if(HEADER(e->symbol()) && for_host)
-           e->setSymbol(*HeaderSymbolForHandler(e->symbol())); 
-      return;
+        else if(options.isOn(C_CUDA) && for_kernel && isPrivate(e->symbol())) // && PrivateArrayClassUse(sizeOfPrivateArraysInBytes())))
+        {   
+           if(fsym && !isArrayParameterWithAssumedShape(ProcedureSymbol(fsym),i))
+             e->setLhs(FirstArrayElementSubscriptsOfPrivateArray(e->symbol()));            
+        }  
+      }
+      if(HEADER(e->symbol()) && for_host)
+        e->setSymbol(*HeaderSymbolForHandler(e->symbol())); 
+       
+      return;                                                                 
     }
     el=e->lhs()->lhs();  //first subscript of argument
     //testing: is first subscript of ArrayRef a POINTER 
@@ -10604,8 +10617,8 @@ void InsertDebugStat(SgStatement *func, SgStatement* &end_of_unit)
            //including the DVM specification directive to list
            pstmt = addToStmtList(pstmt, stmt); 
            continue;
-       case(ACC_ROUTINE_DIR): 
-       case(ACC_DECLARE_DIR):   
+       case(ACC_ROUTINE_DIR):
+       case(ACC_DECLARE_DIR):    
        case(HPF_PROCESSORS_STAT):
        case(HPF_TEMPLATE_STAT):
        case(DVM_DYNAMIC_DIR):
@@ -14253,10 +14266,11 @@ void TranslateFromTo(SgStatement *first, SgStatement *last, int error_msg)
             break;
 
        case PROC_STAT:             // CALL
-           {SgExpression *el; 
+           {SgExpression *el;
+            int i; 
             // looking through the arguments list
-            for(el=stmt->expr(0); el; el=el->rhs())            
-              ChangeArg_DistArrayRef(el);   // argument
+            for(el=stmt->expr(0), i=0; el; el=el->rhs(), i++)            
+              ChangeArg_DistArrayRef(el, stmt->symbol(), i);   // argument
             }            
             break;
 
diff --git a/dvm/fdvm/trunk/fdvm/stmt.cpp b/dvm/fdvm/trunk/fdvm/stmt.cpp
index 4b4e46c..59cb720 100644
--- a/dvm/fdvm/trunk/fdvm/stmt.cpp
+++ b/dvm/fdvm/trunk/fdvm/stmt.cpp
@@ -1034,7 +1034,7 @@ RE: st = st->lastNodeOfStmt();
 SgStatement * lastStmtOf(SgStatement *st)
 { SgStatement *last;
      
-      if(st->variant() == LOGIF_NODE)
+      if(st->variant() == LOGIF_NODE || st->variant() == FORALL_STAT)
          last = st->lexNext();
       else if((st->variant() == FOR_NODE) || (st->variant() == WHILE_NODE))
          last = lastStmtOfDo(st);
@@ -1543,6 +1543,7 @@ int isDvmSpecification (SgStatement * st) {
 		case DVM_CONSISTENT_GROUP_DIR:
                 case DVM_CONSISTENT_DIR:
                 case ACC_ROUTINE_DIR:
+                case ACC_DECLARE_DIR:
 
 		     return 1; break;
 	}
diff --git a/dvm/fdvm/trunk/include/calls.h b/dvm/fdvm/trunk/include/calls.h
index 3449327..1a23a13 100644
--- a/dvm/fdvm/trunk/include/calls.h
+++ b/dvm/fdvm/trunk/include/calls.h
@@ -17,6 +17,7 @@ struct graph_node {
     SgStatement *st_header;
     SgStatement *st_last;
     SgStatement *st_copy;
+    SgStatement *st_copy_first;
     SgStatement *st_interface;
     SgSymbol *symb;              //??? st_header->symbol()
     char *name;
@@ -30,6 +31,7 @@ struct graph_node {
     int count;     //counter of inline expansions or calls
     int is_routine;// has ROUTINE attribute - 1, else - 0
     int samenamed; // flag - there is samenamed symbol 
+    struct argument_numbers *arg_numbs;
     
 #if __SPF
     graph_node() { addToCollection(__LINE__, __FILE__, this, 1); }
@@ -67,4 +69,6 @@ struct edge_list {
     edge_list() { addToCollection(__LINE__, __FILE__, this, 1); }
     ~edge_list() { removeFromCollection(this); }
 #endif
-};
\ No newline at end of file
+};
+
+
diff --git a/dvm/fdvm/trunk/include/dvm.h b/dvm/fdvm/trunk/include/dvm.h
index 3d3be5c..45ed055 100644
--- a/dvm/fdvm/trunk/include/dvm.h
+++ b/dvm/fdvm/trunk/include/dvm.h
@@ -205,6 +205,11 @@ struct local_part_list {
        local_part_list *next;
 }; /*ACC*/
 
+struct argument_numbers {    // numbers of dummy arguments that correspond to a private array when calling a procedure 
+       argument_numbers *next;
+       int number;
+};  /*ACC*/
+
 const int ROOT = 1;
 const int NODE = 2;
 const int ALIGN_TREE      = 1000;
@@ -265,6 +270,9 @@ const int L_BOUNDS          = 1054; /*ACC*/
 const int DIM_SIZES         = 1055; /*ACC*/
 const int PRIVATE_ARRAY     = 1056; /*ACC*/
 const int PRIVATE_POINTER   = 1057; /*ACC*/
+const int FUNCTION_AR_DUMMY = 1058; /*ACC*/
+const int DUMMY_PRIVATE_AR  = 1059; /*ACC*/
+const int NULL_SUBSCRIPTS   = 1060; /*ACC*/
 
 const int MAX_LOOP_LEVEL = 20; // 7 - maximal number of loops in parallel loop nest 
 const int MAX_LOOP_NEST = 25;  // maximal number of nested loops
@@ -599,6 +607,7 @@ EXTERN int in_checksection,undefined_Tcuda, cuda_functions;        /*ACC*/
 EXTERN symb_list *RGname_list;                                     /*ACC*/
 EXTERN int parloop_by_handler; //set to 1 by option -Opl and       /*ACC*/
                                //    to 2 by option -Opl2
+EXTERN SgSymbol *private_array_class;
 //---------------------------------------------------------------------
 /*  dvm.cpp   */
 void TranslateFileDVM(SgFile *f);
@@ -635,7 +644,8 @@ int Rank(SgSymbol *s);
 SgExpression *dvm_array_ref();
 SgExpression *dvm_ref(int n);
 int DeleteDArFromList(SgStatement *stmt);
-void ChangeArg_DistArrayRef(SgExpression *e);
+//void ChangeArg_DistArrayRef(SgExpression *e);
+void ChangeArg_DistArrayRef(SgExpression *ele, SgSymbol *fsym, int i);
 void ChangeDistArrayRef(SgExpression *e);
 void ChangeDistArrayRef_Left(SgExpression *e);
 SgExpression *SearchDistArrayField(SgExpression *e);
@@ -1436,6 +1446,7 @@ void ExtractCopy(SgExpression *elist);
 void CleanAllocatedList();
 SgStatement *CreateIndirectDistributionProcedure(SgSymbol *sProc,symb_list *paramList,symb_list *dummy_index_list,SgExpression *derived_elem_list,int flag);
 SgExpression *FirstArrayElementSubscriptsForHandler(SgSymbol *ar);
+SgExpression *FirstArrayElementSubscriptsOfPrivateArray(SgSymbol *s);
 SgSymbol *HeaderSymbolForHandler(SgSymbol *ar);
 void TestRoutineAttribute(SgSymbol *s, SgStatement *routine_interface);
 int LookForRoutineDir(SgStatement *interfaceFunc);
@@ -1453,8 +1464,12 @@ SgExpression *CreatePrivateDummyList();
 char *PointerNameForPrivateArray(SgSymbol *symb);
 void GetMemoryForPrivateArrays(SgSymbol *private_first, SgSymbol *s_loop_ref, int nump, SgStatement *st_end, SgStatement *st_hedr, SgExpression *e_totalThreads);
 SgSymbol *LocRedVariableSymbolInKernel(reduction_operation_list *rsl);
+int PrivateArrayClassUse(SgExpression *e_all_private_size);
+SgExpression *CalculateSizeOfPrivateArraysInBytes();
+SgExpression *ElementOfPrivateList(SgSymbol *ar);
 void testDeclareDirectives(SgStatement *first_dvm_exec);
 void ACC_DECLARE_Directive(SgStatement *stmt);
+SgStatement *makeClassObjectDeclaration(SgSymbol *s, SgSymbol *sp, SgStatement *header_st, SgType *idxType, SgExpression *dim_list, int flag_true);
 
 /*   acc_analyzer.cpp   */
 //void Private_Vars_Analyzer(SgStatement *firstSt, SgStatement *lastSt);
@@ -1563,6 +1578,7 @@ SgStatement *else_dir();
 SgExpression *CalculateArrayBound(SgExpression *edim,SgSymbol *ar, int flag_private);
 void ReplaceArrayBoundsInDeclaration(SgExpression *e);
 int ExplicitShape(SgExpression *eShape);
+int AssumedShape(SgExpression *eShape);
 SgSymbol *ArraySymbolInHostHandler(SgSymbol *ar,SgStatement *scope);
 SgSymbol *DeclareSymbolInHostHandler(SgSymbol *var, SgStatement *st_hedr, SgSymbol *loc_var);
 char *RegisterConstName();
@@ -2118,6 +2134,7 @@ void Translate_Fortran_To_C(SgStatement *stat, SgStatement *last, int countOfCop
 SgStatement* Translate_Fortran_To_C(SgStatement* Stmt, bool isSapforConv = false);
 SgSymbol* createNewFunctionSymbol(const char *name);
 void swapDimentionsInprivateList(void);
+void swapDimentionsInprivateList(SgExpression *pList);
 void createNewFCall(SgExpression*, SgExpression*&, const char*, int);
 SgFunctionCallExp* createNewFCall(const char *name);
 void convertExpr(SgExpression*, SgExpression*&);
@@ -2181,12 +2198,13 @@ void Call_Site (SgSymbol *s, int inlined, SgStatement *stat, SgExpression *e);
 SgSymbol * GetProcedureHeaderSymbol(SgSymbol *s);
 void MarkAsRoutine(SgSymbol *s);
 void MarkAsCalled(SgSymbol *s);
+void MarkPrivateArgumentsOfRoutine(SgSymbol *s, SgExpression *private_args);
 void MarkAsUserProcedure(SgSymbol *s);
 void MarkAsExternalProcedure(SgSymbol *s);
 void MakeFunctionCopy(SgSymbol *s);
 SgStatement *HeaderStatement(SgSymbol *s);
 void InsertCalledProcedureCopies();
-SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is_routine, SgStatement *after);
+SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is_routine, argument_numbers *arg_numbs, SgStatement *after);
 int FromOtherFile(SgSymbol *s);
 int findParameterNumber(SgSymbol *s, char *name); 
 int isInParameter(SgSymbol *s, int i);
@@ -2197,7 +2215,9 @@ int IsRecursiveProcedure(SgSymbol *s);
 int IsNoBodyProcedure(SgSymbol *s);
 int isUserFunction(SgSymbol *s);
 int IsInternalProcedure(SgSymbol *s);
-SgExpression *FunctionDummyList(SgSymbol *s);
+int isArrayParameter(SgSymbol *s, int i);
+int isArrayParameterWithAssumedShape(SgSymbol *s, int i);
+SgExpression *FunctionDummyList(SgSymbol *s, SgStatement *st_header, argument_numbers *arg_numbs);
 char *FunctionResultIdentifier(SgSymbol *sfun);
 SgSymbol *isSameNameInProcedure(char *name, SgSymbol *sfun);
 char *NameCheck(char *name, SgSymbol *sfun);
@@ -2212,14 +2232,15 @@ SgStatement *FunctionPrototype(SgSymbol *sf);
 bool CreateIntefacePrototype(SgStatement *header);
 SgStatement *hasInterface(SgSymbol *s);
 void SaveInterface(SgSymbol *s, SgStatement *interface);
-SgStatement  *TranslateProcedureHeader_To_C(SgStatement *new_header);
+SgStatement  *TranslateProcedureHeader_To_C(SgStatement *new_header, argument_numbers *arg_numbs);
 SgStatement *getInterface(SgSymbol *s);
 SgStatement *getGenericInterface(SgSymbol *s, SgExpression *arg_list);
 int CompareKind(SgType* type_arg, SgType* type_dummy);
 SgExpression* TypeKindExpr(SgType* t);
 SgFunctionSymb *SymbolForIntrinsicFunction(const char *name, int i, SgType *tp, SgStatement *func);
-
-
+void addArgumentNumber(int i, SgSymbol *s);
+argument_numbers *GetNextNumberList(argument_numbers *source, argument_numbers *list);
+int isPrivateArrayDummy(SgSymbol *s);
 //-----------------------------------------------------------------------
 extern "C" char* funparse_bfnd(...);
 extern "C" char* Tool_Unparse2_LLnode(...);
@@ -2267,7 +2288,7 @@ void ConvertLoopWithLabelToEnddoLoop (SgStatement *stat); /*OMP*/
 enum OPTIONS {
     AUTO_TFM = 0, ONE_THREAD, SPEED_TEST_L0, SPEED_TEST_L1, GPU_O0, GPU_O1, RTC, C_CUDA, OPT_EXP_COMP,
     O_HOST, NO_CUDA, NO_BL_INFO, LOOP_ANALYSIS, PRIVATE_ANALYSIS, IO_RTS, READ_ALL, NO_REMOTE, NO_PURE_FUNC, 
-    GPU_IRR_ACC, O_PL, O_PL2, BIG_P, NUM_OPT};
+    GPU_IRR_ACC, O_PL, O_PL2, BIG_PRIVATES, NUM_OPT};
 // ONE_THREAD - compile one thread CUDA-kernels only for across (TODO for all CUDA-kernels)
 // SPEED_TEST_L0, SPEED_TEST_L1 - debug options for speed testof CUDA-kernels for across
 // RTC - enable CUDA run-time compilation of all CUDA-kernels
diff --git a/dvm/fdvm/trunk/parser/cftn.c b/dvm/fdvm/trunk/parser/cftn.c
index 871c9d4..3dae8f8 100644
--- a/dvm/fdvm/trunk/parser/cftn.c
+++ b/dvm/fdvm/trunk/parser/cftn.c
@@ -465,6 +465,8 @@ int main(int argc, char *argv[])
             if ((*argv)[12] == '\0' || (!is_integer_value(*argv + 12)))
                 goto ERR;
         }
+        else if (!strcmp(argv[0], "-bigPrivates"))
+            ;
         else if (!strcmp(argv[0], "-ioRTS"))
             ;
         else if (!strcmp(argv[0], "-read_all"))
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
index 90ed1a4..1e80d19 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
@@ -487,7 +487,7 @@ typedef long long __indexTypeLLong;
 
 //--------------------- Kernel for loop on line 558 ---------------------
 
-      __global__ void   loop_cg_558_cuda_kernel_int(double _p_rma[], double _q[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      __global__ void   loop_cg_558_cuda_kernel_int(double _q[], double _p[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
       {
 
 // Private variables
@@ -496,8 +496,8 @@ typedef long long __indexTypeLLong;
          int cond_0;
          int __k;
          int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / warpSize;
-         int lid = gid % warpSize;
+         int tid = gid / 32;
+         int lid = gid % 32;
          
 // Local needs
          __indexTypeInt _j;
@@ -520,7 +520,7 @@ typedef long long __indexTypeLLong;
                  __k < cond_0 ; 
                  _k = _k + warpSize, __k = __k + warpSize)
             {
-               _sum = _p_rma[_colidx[_k]] * _a[_k] + _sum;
+               _sum = _p[_colidx[_k]] * _a[_k] + _sum;
             }
             _sum = __dvmh_warpReduceSum(_sum);
             if (lid == 0) {
@@ -532,7 +532,7 @@ typedef long long __indexTypeLLong;
 
 //--------------------- Kernel for loop on line 558 ---------------------
 
-      __global__ void   loop_cg_558_cuda_kernel_llong(double _p_rma[], double _q[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      __global__ void   loop_cg_558_cuda_kernel_llong(double _q[], double _p[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
       {
 
 // Private variables
@@ -541,8 +541,8 @@ typedef long long __indexTypeLLong;
          int cond_0;
          int __k;
          int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / warpSize;
-         int lid = gid % warpSize;
+         int tid = gid / 32;
+         int lid = gid % 32;
 // Local needs
          __indexTypeLLong _j;
          __indexTypeLLong rest_blocks, cur_blocks;
@@ -564,7 +564,7 @@ typedef long long __indexTypeLLong;
                  __k < cond_0 ; 
                  _k = _k + warpSize, __k = __k + warpSize)
             {
-               _sum = _p_rma[_colidx[_k]] * _a[_k] + _sum;
+               _sum = _p[_colidx[_k]] * _a[_k] + _sum;
             }
             _sum = __dvmh_warpReduceSum(_sum);
             if (lid == 0) {
@@ -752,7 +752,7 @@ typedef long long __indexTypeLLong;
 
 //--------------------- Kernel for loop on line 605 ---------------------
 
-      __global__ void   loop_cg_605_cuda_kernel_int(double _z_rma[], double _r[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      __global__ void   loop_cg_605_cuda_kernel_int(double _r[], double _z[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
       {
 
 // Private variables
@@ -761,8 +761,8 @@ typedef long long __indexTypeLLong;
          int cond_0;
          int __k;
          int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / warpSize;
-         int lid = gid % warpSize;
+         int tid = gid / 32;
+         int lid = gid % 32;
 // Local needs
          __indexTypeInt _j;
          __indexTypeInt rest_blocks, cur_blocks;
@@ -784,7 +784,7 @@ typedef long long __indexTypeLLong;
                   __k < cond_0 ; 
                   _k = _k + warpSize, __k = __k + warpSize)
             {
-               _d = _z_rma[_colidx[_k]] * _a[_k] + _d;
+               _d = _z[_colidx[_k]] * _a[_k] + _d;
             }
             _d = __dvmh_warpReduceSum(_d);
             if (lid == 0) {
@@ -796,7 +796,7 @@ typedef long long __indexTypeLLong;
 
 //--------------------- Kernel for loop on line 605 ---------------------
 
-      __global__ void   loop_cg_605_cuda_kernel_llong(double _z_rma[], double _r[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      __global__ void   loop_cg_605_cuda_kernel_llong(double _r[], double _z[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
       {
 
 // Private variables
@@ -805,8 +805,8 @@ typedef long long __indexTypeLLong;
          int cond_0;
          int __k;
          int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / warpSize;
-         int lid = gid % warpSize;
+         int tid = gid / 32;
+         int lid = gid % 32;
 // Local needs
          __indexTypeLLong _j;
          __indexTypeLLong rest_blocks, cur_blocks;
@@ -828,7 +828,7 @@ typedef long long __indexTypeLLong;
                   __k < cond_0 ; 
                   _k = _k + warpSize, __k = __k + warpSize)
             {
-               _d = _z_rma[_colidx[_k]] * _a[_k] + _d;
+               _d = _z[_colidx[_k]] * _a[_k] + _d;
             }
             _d = __dvmh_warpReduceSum(_d);
             if (lid == 0) {
@@ -1727,10 +1727,11 @@ extern "C" {
 
 //    CUDA handler for loop on line 558 
 
-      void   loop_cg_558_cuda_(DvmType *loop_ref, DvmType _p_rma[], DvmType _q[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
+      void   loop_cg_558_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _p[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
       {
-         void   *p_rma_base, *q_base, *colidx_base, *a_base, *rowstr_base;
-         DvmType d_p_rma[4], d_q[4], d_colidx[4], d_a[4], d_rowstr[4];
+        
+        void   *q_base, *p_base, *colidx_base, *a_base, *rowstr_base;
+         DvmType d_q[4], d_p[4], d_colidx[4], d_a[4], d_rowstr[4];
          DvmType idxTypeInKernel;
          dim3 blocks, threads;
          cudaStream_t stream;
@@ -1742,15 +1743,15 @@ extern "C" {
          device_num = loop_get_device_num_(loop_ref);
 
 // Get 'natural' bases
-         p_rma_base = dvmh_get_natural_base(&device_num, _p_rma);
          q_base = dvmh_get_natural_base(&device_num, _q);
+         p_base = dvmh_get_natural_base(&device_num, _p);
          colidx_base = dvmh_get_natural_base(&device_num, _colidx);
          a_base = dvmh_get_natural_base(&device_num, _a);
          rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
 
 // Fill 'device' headers
-         dvmh_fill_header_(&device_num, p_rma_base, _p_rma, d_p_rma);
          dvmh_fill_header_(&device_num, q_base, _q, d_q);
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
          dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
          dvmh_fill_header_(&device_num, a_base, _a, d_a);
          dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
@@ -1778,8 +1779,8 @@ extern "C" {
          }
          loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
          blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks * dvmh_get_warp_size(loop_ref);
+         overallBlocks = blocksS[0]* dvmh_get_warp_size(loop_ref);;
+         restBlocks = overallBlocks;
          addBlocks = 0;
          blocks = dim3(1, 1, 1);
          maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
@@ -1798,11 +1799,11 @@ extern "C" {
             }
             if (idxTypeInKernel == rt_INT) 
             {
-               loop_cg_558_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_rma_base, (double *)q_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+               loop_cg_558_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)q_base, (double *)p_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
             }
             else 
             {
-               loop_cg_558_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_rma_base, (double *)q_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+               loop_cg_558_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)q_base, (double *)p_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
             }
             addBlocks += blocks.x;
             restBlocks -= blocks.x;
@@ -2098,10 +2099,10 @@ extern "C" {
 
 //    CUDA handler for loop on line 605 
 
-      void   loop_cg_605_cuda_(DvmType *loop_ref, DvmType _z_rma[], DvmType _r[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
+      void   loop_cg_605_cuda_(DvmType *loop_ref, DvmType _r[], DvmType _z[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
       {
-         void   *z_rma_base, *r_base, *colidx_base, *a_base, *rowstr_base;
-         DvmType d_z_rma[4], d_r[4], d_colidx[4], d_a[4], d_rowstr[4];
+         void   *r_base, *z_base, *colidx_base, *a_base, *rowstr_base;
+         DvmType d_r[4], d_z[4], d_colidx[4], d_a[4], d_rowstr[4];
          DvmType idxTypeInKernel;
          dim3 blocks, threads;
          cudaStream_t stream;
@@ -2113,15 +2114,15 @@ extern "C" {
          device_num = loop_get_device_num_(loop_ref);
 
 // Get 'natural' bases
-         z_rma_base = dvmh_get_natural_base(&device_num, _z_rma);
          r_base = dvmh_get_natural_base(&device_num, _r);
+         z_base = dvmh_get_natural_base(&device_num, _z);
          colidx_base = dvmh_get_natural_base(&device_num, _colidx);
          a_base = dvmh_get_natural_base(&device_num, _a);
          rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
 
 // Fill 'device' headers
-         dvmh_fill_header_(&device_num, z_rma_base, _z_rma, d_z_rma);
          dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
          dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
          dvmh_fill_header_(&device_num, a_base, _a, d_a);
          dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
@@ -2155,7 +2156,7 @@ extern "C" {
          blocks = dim3(1, 1, 1);
          maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
          maxBlocks = maxBlocks / dvmh_get_warp_size(loop_ref) * dvmh_get_warp_size(loop_ref);
-
+         
 // GPU execution
          while (restBlocks > 0)
          {
@@ -2169,15 +2170,15 @@ extern "C" {
             }
             if (idxTypeInKernel == rt_INT) 
             {
-               loop_cg_605_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)z_rma_base, (double *)r_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+               loop_cg_605_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)r_base, (double *)z_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
             }
             else 
             {
-               loop_cg_605_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)z_rma_base, (double *)r_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+               loop_cg_605_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)r_base, (double *)z_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
             }
             addBlocks += blocks.x;
             restBlocks -= blocks.x;
-         }
+         }         
       }
 
 
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv
index f077345..1f6e535 100644
--- a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv
@@ -550,11 +550,11 @@ c  The conj grad iteration loop
 c---->
 c---------------------------------------------------------------------
       do cgit = 1, cgitmax
-
          d = 0.0d0
+! DVM$ interval 11
 CDVM$ region
-	 
-CDVM$ parallel (j) on p(j), private(sum,k), remote_access(p(:))
+!WANR for many process, remote_access(p(:)) is needed
+CDVM$ parallel (j) on p(j), private(sum,k)
          do j=1,lastrow-firstrow+1
             sum = 0.d0
             do k=rowstr(j),rowstr(j+1)-1              
@@ -570,7 +570,7 @@ CDVM$ parallel (j) on q(j), reduction(SUM(d))
 CDVM$ end region
          alpha = rho / d
          rho0 = rho
-
+! DVM$ end interval 
          rho = 0.0d0
 CDVM$ region		 
 CDVM$ parallel (j) on r(j), private(d), reduction(SUM(rho))
@@ -598,10 +598,10 @@ c  Compute residual norm explicitly:  ||r|| = ||x - A.z||
 c  First, form A.z
 c  The partition submatrix-vector multiply
 c---------------------------------------------------------------------
-
+!WANR for many process, remote_access(z(:)) is needed
       sum = 0.0d0
 CDVM$ region
-CDVM$ parallel (j) on r(j), private(d,k),remote_access(z(:))	  
+CDVM$ parallel (j) on r(j), private(d,k)	  
       do j=1,lastrow-firstrow+1
          d = 0.d0
          do k=rowstr(j),rowstr(j+1)-1
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
index 6096dbf..70549c4 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
@@ -1561,12 +1561,25 @@ static set<DIST::Array*>
                 for (auto& decl : decls)
                 {
                     declStat = SgStatement::getStatementByFileAndLine(decl.first, decl.second);
-                    checkNull(declStat, convertFileName(__FILE__).c_str(), __LINE__);
+                    if (declStat == NULL) // check in inlcudes 
+                    {                        
+                        for (auto st = main; st != main->lastNodeOfStmt() && !declStat; st = st->lexNext())
+                        {
+                            if (st->fileName() == decl.first && st->lineNumber() == decl.second)
+                                declStat = st;
+                        }
 
-                    if (declStat != main)
+                        if (declStat)
+                            break;
+                    }
+                    else
                     {
-                        declStat = NULL;
-                        continue;
+                        declStat = getFuncStat(declStat);
+                        if (declStat != main)
+                        {
+                            declStat = NULL;
+                            continue;
+                        }
                     }
                 }
             }
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
index a44543c..945ae77 100644
--- a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
@@ -2235,10 +2235,10 @@ static bool hasRecursionChain(vector<FuncInfo*> currentChainCalls, const FuncInf
 
                 currentChainCalls.push_back(itF->second);
                 const string &chain = printChainRec(currentChainCalls);
-                __spf_print(1, "For function on line %d found recursive chain calls: %s\n", currentChainCalls[0]->linesNum.first, chain.c_str());
+                __spf_print(1, "  For function on line %d found recursive chain calls: %s\n", currentChainCalls[0]->linesNum.first, chain.c_str());
 
                 wstring bufE, bufR;
-                __spf_printToLongBuf(bufE, L"Found recursive chain calls: %s, this function will be ignored", to_wstring(chain).c_str());
+                __spf_printToLongBuf(bufE, L"  Found recursive chain calls: %s, this function will be ignored", to_wstring(chain).c_str());
                 __spf_printToLongBuf(bufR, R46, to_wstring(chain).c_str());
 
                 messagesForFile.push_back(Messages(NOTE, currentChainCalls[0]->linesNum.first, bufR, bufE, 1014));
@@ -2273,7 +2273,7 @@ void checkForRecursion(SgFile *file, map<string, vector<FuncInfo*>> &allFuncInfo
 
     for (int i = 0; i < itCurrFuncs->second.size(); ++i)
     {
-        __spf_print(1, "run for func %s\n", itCurrFuncs->second[i]->funcName.c_str());
+        __spf_print(1, "  run for func %s\n", itCurrFuncs->second[i]->funcName.c_str());
         if (hasRecursionChain( { itCurrFuncs->second[i] }, itCurrFuncs->second[i], mapFuncInfo, messagesForFile))
             itCurrFuncs->second[i]->doNotAnalyze = true;
     }
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp
index 824e8f5..47f8fef 100644
--- a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp
@@ -404,6 +404,7 @@ void findDeadFunctionsAndFillCalls(map<string, vector<FuncInfo*>> &allFuncInfo,
 
     set<string> allExternalCalls;
     set<string> allChildCalls;
+
     for (auto &it : mapFuncInfo)
     {
         FuncInfo *currInfo = it.second;
@@ -448,9 +449,37 @@ void findDeadFunctionsAndFillCalls(map<string, vector<FuncInfo*>> &allFuncInfo,
             }
         }
     }
+    
+    FuncInfo* main = NULL;
+    for (auto& it : mapFuncInfo)
+        if (it.second->isMain)
+            main = it.second;
+
+    checkNull(main, convertFileName(__FILE__).c_str(), __LINE__);
+
+    set<FuncInfo*> liveFunctions;
+    liveFunctions.insert(main);
+    for (auto& callFrom : main->callsFromV)
+        liveFunctions.insert(callFrom);
+
+    //find live functions
+    bool changes = true;
+    while (changes)
+    {
+        changes = false;
+        for (auto& currInfo : liveFunctions)
+        {
+            for (auto& callFrom : currInfo->callsFromV) {
+                if (liveFunctions.find(callFrom) == liveFunctions.end()) {
+                    changes = true;
+                    liveFunctions.insert(callFrom);
+                }
+            }
+        }
+    }
 
     // propagate 'deadFunction' status for all 'CallsFrom' from dead functions
-    bool changes = true;
+    changes = true;
     while (changes)
     {
         changes = false;
@@ -466,10 +495,11 @@ void findDeadFunctionsAndFillCalls(map<string, vector<FuncInfo*>> &allFuncInfo,
                 auto itFrom = mapFuncInfo.find(callFrom);
                 if (itFrom != mapFuncInfo.end())
                 {
-                    if (!itFrom->second->deadFunction)
+                    auto func = itFrom->second;
+                    if (!func->deadFunction && liveFunctions.find(func) == liveFunctions.end())
                     {
                         changes = true;
-                        itFrom->second->deadFunction = itFrom->second->doNotAnalyze = true;
+                        func->deadFunction = func->doNotAnalyze = true;
                     }
                 }
             }
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_base.cpp b/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_base.cpp
index b1f9e35..98e13ca 100644
--- a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_base.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_base.cpp
@@ -778,7 +778,7 @@ static void isAllOk(const vector<LoopGraph*> &loops, vector<Messages> &currMessa
             if (loops[i]->countOfIters == 0 && loops[i]->region && loops[i]->isFor)
             {
                 wstring bufE, bufR;
-                __spf_printToLongBuf(bufE, L"Can not calculate count of iterations for this loop, information about iterations in all loops in parallel regions '%s' will be ignored", 
+                __spf_printToLongBuf(bufE, L"  Can not calculate count of iterations for this loop, information about iterations in all loops in parallel regions '%s' will be ignored", 
                                      to_wstring(loops[i]->region->GetName()).c_str());
 
                 auto itM = uniqMessages.find(bufE);
@@ -789,7 +789,7 @@ static void isAllOk(const vector<LoopGraph*> &loops, vector<Messages> &currMessa
                     __spf_printToLongBuf(bufR, R48, to_wstring(loops[i]->region->GetName()).c_str());
 
                     currMessages.push_back(Messages(NOTE, loops[i]->lineNum, bufR, bufE, 1016));
-                    __spf_print(1, "Can not calculate count of iterations for loop on line %d, information about iterations in all loops in parallel regions '%s' will be ignored\n", loops[i]->lineNum, loops[i]->region->GetName().c_str());
+                    __spf_print(1, "  Can not calculate count of iterations for loop on line %d, information about iterations in all loops in parallel regions '%s' will be ignored\n", loops[i]->lineNum, loops[i]->region->GetName().c_str());
                 }
                 isNotOkey.insert(loops[i]->region);
             }
@@ -1085,7 +1085,7 @@ static void checkArraysMapping(vector<LoopGraph*> &loopList, map<DIST::Array*, v
                     if (!elem.first->IsDimDepracated(z))
                     {
                         std::wstring bufw, bufR;
-                        __spf_printToLongBuf(bufw, L"Array '%s' can not be distributed due to different writes to %d dimension, this dimension will deprecated",
+                        __spf_printToLongBuf(bufw, L"  Array '%s' can not be distributed due to different writes to %d dimension, this dimension will deprecated",
                                              to_wstring(elem.first->GetShortName()).c_str(), z + 1);
 
                         __spf_printToLongBuf(bufR, R85, z + 1,to_wstring(elem.first->GetShortName()).c_str());
@@ -1122,7 +1122,7 @@ void checkArraysMapping(const map<string, vector<LoopGraph*>> &loopGraph, map<st
         if (elem->IsAllDeprecated())
         {
             wstring bufw, bufR;
-            __spf_printToLongBuf(bufw, L"Array '%s' can not be distributed due to all dimensions will deprecated", to_wstring(elem->GetShortName()).c_str());
+            __spf_printToLongBuf(bufw, L"  Array '%s' can not be distributed due to all dimensions will deprecated", to_wstring(elem->GetShortName()).c_str());
             __spf_printToLongBuf(bufR, R86, to_wstring(elem->GetShortName()).c_str());
 
             for (auto &decl : elem->GetDeclInfo())
@@ -1210,7 +1210,7 @@ static void filterArrayInCSRGraph(vector<LoopGraph*> &loops, const map<string, F
                                 if (itA == trees.end() || itA->second < 0)
                                 {
                                     wstring bufw, bufR;
-                                    __spf_printToLongBuf(bufw, L"Array '%s' can not be distributed", to_wstring(array->GetShortName()).c_str());
+                                    __spf_printToLongBuf(bufw, L"  Array '%s' can not be distributed", to_wstring(array->GetShortName()).c_str());
                                     __spf_printToLongBuf(bufR, R87, to_wstring(array->GetShortName()).c_str());
 
                                     getObjectForFileFromMap(loop->fileName.c_str(), messages).push_back(Messages(NOTE, loop->lineNum, bufR, bufw, 1047));
@@ -1251,7 +1251,7 @@ static void filterArrayInCSRGraph(vector<LoopGraph*> &loops, const map<string, F
                                 if (itA == trees.end() || itA->second != treeNum)
                                 {
                                     wstring bufw, bufR;
-                                    __spf_printToLongBuf(bufw, L"Array '%s' can not be distributed", to_wstring(array->GetShortName()).c_str());
+                                    __spf_printToLongBuf(bufw, L"  Array '%s' can not be distributed", to_wstring(array->GetShortName()).c_str());
                                     __spf_printToLongBuf(bufR, R88, to_wstring(array->GetShortName()).c_str());
 
                                     getObjectForFileFromMap(loop->fileName.c_str(), messages).push_back(Messages(NOTE, loop->lineNum, bufR, bufw, 1047));
@@ -1283,7 +1283,7 @@ static void filterArrayInCSRGraph(vector<LoopGraph*> &loops, const map<string, F
                                     if (needToDeprecated)
                                     {
                                         wstring bufw, bufR;
-                                        __spf_printToLongBuf(bufw, L"Array '%s' can not be distributed", to_wstring(inCall->GetShortName()).c_str());
+                                        __spf_printToLongBuf(bufw, L"  Array '%s' can not be distributed", to_wstring(inCall->GetShortName()).c_str());
                                         __spf_printToLongBuf(bufR, R89, to_wstring(inCall->GetShortName()).c_str());
 
                                         getObjectForFileFromMap(loop->fileName.c_str(), messages).push_back(Messages(NOTE, loop->lineNum, bufR, bufw, 1047));
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.cpp b/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.cpp
index d22d115..85d1953 100644
--- a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.cpp
@@ -836,13 +836,13 @@ bool buildGraphFromUserDirectives(const vector<Statement*> &userDvmAlignDirs, DI
             string tmp;            
             for (auto& elem : realAlignArrayRefsSet)
                 tmp += elem->GetName() + " ";
-            __spf_print(1, "align array%s '%s' from user dir in line %d\n", (realAlignArrayRefsSet.size() == 1 ? "" : "s"), tmp.c_str(), dir->lineNumber());
-            __spf_print(1, "template align:\n");
+            __spf_print(1, "  align array%s '%s' from user dir in line %d\n", (realAlignArrayRefsSet.size() == 1 ? "" : "s"), tmp.c_str(), dir->lineNumber());
+            __spf_print(1, "  template align:\n");
             for (int i = 0; i < alignTemplate.size(); ++i)
-                __spf_print(1, "-- %d: %s -- [%d, %d]\n", i, alignTemplate[i].first.c_str(), alignTemplate[i].second.first, alignTemplate[i].second.second);
-            __spf_print(1, "template align with:\n");
+                __spf_print(1, "    -- %d: %s -- [%d, %d]\n", i, alignTemplate[i].first.c_str(), alignTemplate[i].second.first, alignTemplate[i].second.second);
+            __spf_print(1, "  template align with:\n");
             for (int i = 0; i < alignWithTemplate.size(); ++i)
-                __spf_print(1, "-- %d: %s -- [%d, %d]\n", i, alignWithTemplate[i].first.c_str(), alignWithTemplate[i].second.first, alignWithTemplate[i].second.second);
+                __spf_print(1, "    -- %d: %s -- [%d, %d]\n", i, alignWithTemplate[i].first.c_str(), alignWithTemplate[i].second.first, alignWithTemplate[i].second.second);
 
             for (int i = 0; i < alignTemplate.size(); ++i)
             {
@@ -891,6 +891,6 @@ void calculateLinesOfCode(vector<ParallelRegion*> &allRegions)
             for (auto &lineV : line.second)
                 lineCounter += (lineV.lines.second - lineV.lines.first);
 
-        __spf_print(1, "Count of lines in region '%s' = %d\n", elem->GetName().c_str(), lineCounter);
+        __spf_print(1, "  Count of lines in region '%s' = %d\n", elem->GetName().c_str(), lineCounter);
     }
 }
\ No newline at end of file
diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
index 0ba30d9..71c2929 100644
--- a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
@@ -1278,7 +1278,7 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
                 if (loop.second->hasLimitsToParallel())
                 {
                     loop.second->addConflictMessages(&SPF_messages[loop.second->fileName]);
-                    __spf_print(1, "added conflict messages to loop on line %d\n", loop.second->lineNum);
+                    __spf_print(1, "  added conflict messages to loop on line %d\n", loop.second->lineNum);
                 }
             }
         }
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/utils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/utils.cpp
index 13d4081..a5f9cdc 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/utils.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/utils.cpp
@@ -434,7 +434,7 @@ static map<string, vector<Messages>> removeCopies(map<string, vector<Messages>>
             __spf_print(1, "%s\n", tmp.c_str());*/
             uniq[key] = &message;
         }
-        __spf_print(1, "messages filtering for file '%s': count before %d, count after %d\n", byFile.first.c_str(), byFile.second.size(), uniq.size());
+        __spf_print(1, "  messages filtering for file '%s': count before %d, count after %d\n", byFile.first.c_str(), byFile.second.size(), uniq.size());
         vector<Messages> uniqV;
         for (auto& elem : uniq)
         {
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 9bc5377..8182a93 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2384"
+#define VERSION_SPF "2386"

From 1504504d96d570214dee1e71ec1941075123dfc3 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Mon, 10 Feb 2025 12:16:52 +0300
Subject: [PATCH 12/44] fixed function analysis

---
 .../_src/GraphCall/graph_calls.cpp            | 49 ++++++++++-----
 .../_src/GraphCall/graph_calls_base.cpp       | 59 +++++++++++--------
 .../experts/Sapfor_2017/_src/Utils/version.h  |  2 +-
 3 files changed, 68 insertions(+), 42 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
index 945ae77..35c3dfb 100644
--- a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
@@ -560,7 +560,7 @@ static void findParamInParam(SgExpression *exp, FuncInfo &currInfo)
     // Searching through expression, which parameter presented with
     if (exp)
     {
-        if (exp->variant() == VAR_REF)
+        if (exp->variant() == VAR_REF || isArrayRef(exp))
         {
             // check for matching with one of param of func which called this
             //cout << "Checking " << exp->symbol()->identifier() << " for match.." << endl;
@@ -631,7 +631,7 @@ static void findParamUsedInFuncCalls(SgExpression *exp, FuncInfo &currInfo,
             if (!hasRecCall(&currInfo, nameOfCallFunc))
             {
                 // Add func call which we've just found            
-                currInfo.funcsCalledFromThis.push_back(NestedFuncCall(exp->symbol()->identifier()));
+                currInfo.funcsCalledFromThis.push_back(NestedFuncCall(nameOfCallFunc[1]));
 
                 // For every found func call iterate through pars
                 //cout << "Through params of the call of " << exp->symbol()->identifier() << endl;
@@ -716,11 +716,11 @@ void findContainsFunctions(SgStatement *st, vector<SgStatement*> &found, const b
     }
 }
 
-static void fillIn(FuncInfo *currF, SgExpression *ex, const map<string, int> &parNames)
+static void fillIn(FuncInfo *currF, SgExpression *ex, const map<string, int> &parNames, bool isInFuncPar)
 {
     if (ex)
     {
-        if (ex->variant() == VAR_REF || isArrayRef(ex))
+        if (!isInFuncPar && (ex->variant() == VAR_REF || isArrayRef(ex)))
         {
             const char *name = ex->symbol()->identifier();
             if (name && name != string(""))
@@ -731,8 +731,15 @@ static void fillIn(FuncInfo *currF, SgExpression *ex, const map<string, int> &pa
             }
         }
 
-        fillIn(currF, ex->lhs(), parNames);
-        fillIn(currF, ex->rhs(), parNames);
+        if (ex->variant() == FUNC_CALL) {
+            SgFunctionCallExp* call = (SgFunctionCallExp*)ex;
+            for (int z = 0; z < call->numberOfArgs(); ++z)
+                fillIn(currF, call->arg(z), parNames, true);
+        }
+        else {
+            fillIn(currF, ex->lhs(), parNames, false);
+            fillIn(currF, ex->rhs(), parNames, false);
+        }
     }
 }
 
@@ -799,9 +806,9 @@ static void fillInOut(FuncInfo *currF, SgStatement *start, SgStatement *last, co
         {
             SgExpression *left = st->expr(0);
 
-            fillIn(currF, left->lhs(), parNames);
-            fillIn(currF, left->rhs(), parNames);
-            fillIn(currF, st->expr(1), parNames);
+            fillIn(currF, left->lhs(), parNames, false);
+            fillIn(currF, left->rhs(), parNames, false);
+            fillIn(currF, st->expr(1), parNames, false);
 
             string symb = "";
             if (left->symbol())
@@ -886,18 +893,29 @@ static void fillInOut(FuncInfo *currF, SgStatement *start, SgStatement *last, co
                             if (types[z] == OUT_BIT || types[z] == INOUT_BIT)
                                 fillType(currF, arg->symbol()->identifier(), parNames, OUT_BIT);
                             if (types[z] == IN_BIT || types[z] == INOUT_BIT)
-                                fillIn(currF, arg, parNames);
+                                fillIn(currF, arg, parNames, false);
                         }
                         else
-                            fillIn(currF, arg, parNames);
+                            fillIn(currF, arg, parNames, false);
                     }
                     processed = true;
                 }
             }
 
-            if (!processed)
-                for (int i = 0; i < 3; ++i)
-                    fillIn(currF, st->expr(i), parNames);
+            if (!processed) 
+            {
+                if (st->variant() == PROC_STAT) 
+                {
+                    SgCallStmt* call = (SgCallStmt*)st;
+                    for (int z = 0; z < call->numberOfArgs(); ++z)
+                        fillIn(currF, call->arg(z), parNames, true);
+                }
+                else
+                {
+                    for (int i = 0; i < 3; ++i)
+                        fillIn(currF, st->expr(i), parNames, false);
+                }
+            }
         }
     }
 }
@@ -997,8 +1015,7 @@ static FuncInfo* createNewFuction(const string& funcName, SgStatement *st, SgSta
         __spf_print(1, "set NOINLINE attribute for function '%s'\n", funcName.c_str());
         currInfo->doNotInline = true;
     }
-
-    currInfo->funcParams.completeParams();
+    
     return currInfo;
 }
 
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp
index 47f8fef..8d55bdc 100644
--- a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp
@@ -94,9 +94,9 @@ void updateFuncInfo(const map<string, vector<FuncInfo*>> &allFuncInfo) // const
 
                     // check for using parameter as index
                     // Iterate through all pars of the call
-                    int parNo = 0;
-                    for (auto &parOfCalled : funcCall.NoOfParamUsedForCall)
+                    for (int parNo = 0; parNo < funcCall.NoOfParamUsedForCall.size(); ++parNo)
                     {
+                        auto& parOfCalled = funcCall.NoOfParamUsedForCall[parNo];
                         // If this par of called func is used as index change
                         if (calledFunc->isParamUsedAsIndex[parNo])
                         {
@@ -111,36 +111,38 @@ void updateFuncInfo(const map<string, vector<FuncInfo*>> &allFuncInfo) // const
                                 }
                             }
                         }
-                        parNo++;
                     }
 
                     // propagate inout types
-                    parNo = 0;
-                    for (auto& parOfCalled : funcCall.NoOfParamUsedForCall)
+                    for (int parNo = 0; parNo < funcCall.NoOfParamUsedForCall.size(); ++parNo)
                     {
-                        if (parOfCalled.size())
+                        auto& parOfCalled = funcCall.NoOfParamUsedForCall[parNo];
+                        if (parOfCalled.size() == 0)
+                            continue;
+                        
+                        if (calledFunc->funcParams.isArgOut(parNo))
                         {
-                            if (calledFunc->funcParams.isArgOut(parNo))
-                                for (auto& parOfCalling : parOfCalled)
+                            for (auto& num : parOfCalled)
+                            {
+                                if (!currInfo->funcParams.isArgOut(num))
                                 {
-                                    if (!currInfo->funcParams.isArgOut(parOfCalling))
-                                    {
-                                        currInfo->funcParams.inout_types[parOfCalling] |= OUT_BIT;
-                                        changesDone = true;
-                                    }
-                                }
-
-                            if (calledFunc->funcParams.isArgIn(parNo))
-                                for (auto& parOfCalling : parOfCalled)
-                                {
-                                    if (!currInfo->funcParams.isArgIn(parOfCalling))
-                                    {
-                                        currInfo->funcParams.inout_types[parOfCalling] |= IN_BIT;
-                                        changesDone = true;
-                                    }
+                                    currInfo->funcParams.inout_types[num] |= OUT_BIT;
+                                    changesDone = true;
                                 }
+                            }
+                        }
+
+                        if (calledFunc->funcParams.isArgIn(parNo))
+                        {
+                            for (auto& num : parOfCalled)
+                            {
+                                if (!currInfo->funcParams.isArgIn(num))
+                                {
+                                    currInfo->funcParams.inout_types[num] |= IN_BIT;
+                                    changesDone = true;
+                                }
+                            }
                         }
-                        parNo++;
                     }
                 }
             }
@@ -169,12 +171,19 @@ void updateFuncInfo(const map<string, vector<FuncInfo*>> &allFuncInfo) // const
                         {
                             currInfo->linesOfIO.insert(lineOfCall);
                             changesDone = true;
-                        }                        
+                        }
                     }
                 }
             }
         }
     } while (changesDone);
+
+    //fill all pars IN, if they have NONE status
+    for (auto& it : mapFuncInfo)
+    {
+        FuncInfo* currInfo = it.second;
+        currInfo->funcParams.completeParams();
+    }
 }
 
 int CreateCallGraphViz(const char *fileName, const map<string, vector<FuncInfo*>> &funcByFile, map<string, CallV> &V, vector<string> &E)
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 8182a93..d9a229a 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2386"
+#define VERSION_SPF "2387"

From f135cd6d061e99c029cbe41fabf85294d3281f87 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Mon, 10 Feb 2025 13:13:01 +0300
Subject: [PATCH 13/44] fixed module symbol analysis

---
 .../_src/DvmhRegions/DvmhRegionInserter.cpp   | 51 ++++++++++++++++---
 .../experts/Sapfor_2017/_src/Utils/version.h  |  2 +-
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
index 70549c4..5dad847 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
@@ -167,11 +167,11 @@ void DvmhRegionInserter::updateParallelFunctions(const map<string, vector<LoopGr
 }
 
 static void findByUse(map<string, vector<pair<SgSymbol*, SgSymbol*>>> &modByUse, const string& varName, 
-                      const string& locName, vector<string> &altNames)
+                      const set<string>& locNames, vector<string> &altNames)
 {
     for (auto& elem : modByUse)
     {
-        if (elem.first == locName)
+        if (locNames.count(elem.first))
         {
             for (auto& byUse : elem.second)
             {
@@ -217,6 +217,8 @@ static string getNameByUse(SgStatement *place, const string &varName, const stri
         return varName;
     else
     {
+        map<string, set<string>> graphUse;
+
         set<string> useMod;
         map<string, vector<pair<SgSymbol*, SgSymbol*>>> modByUse;
         map<string, vector<pair<SgSymbol*, SgSymbol*>>> modByUseOnly;
@@ -241,12 +243,22 @@ static string getNameByUse(SgStatement *place, const string &varName, const stri
                 if (useModDone.find(useM) == useModDone.end())
                 {
                     auto modSt = findModWithName(modules, useM);
-                    if (modSt == NULL && useM == "dvmh_template_mod")
+                    if (modSt == NULL || useM == "dvmh_template_mod")
                         continue;
 
                     checkNull(modSt, convertFileName(__FILE__).c_str(), __LINE__);
-                    fillInfo(modSt, newUseMod, modByUse, modByUseOnly);
+
+                    set<string> tmpUse;
+                    fillInfo(modSt, tmpUse, modByUse, modByUseOnly);
                     useModDone.insert(useM);
+
+                    for (auto& use : tmpUse)
+                    {
+                        newUseMod.insert(use);
+
+                        if (use != "dvmh_template_mod")
+                            graphUse[use].insert(useM);
+                    }
                 }
             }
 
@@ -261,9 +273,36 @@ static string getNameByUse(SgStatement *place, const string &varName, const stri
         }
 
         vector<string> altNames;        
-        findByUse(modByUse, varName, locName, altNames);
-        findByUse(modByUseOnly, varName, locName, altNames);
+        findByUse(modByUse, varName, { locName }, altNames);
+        findByUse(modByUseOnly, varName, { locName }, altNames);
         
+        if (altNames.size() == 0) 
+        {
+            set<string> locations = { locName };
+            bool changed = true;
+            while (changed)
+            {
+                changed = false;
+                for (auto& loc : locations)
+                {
+                    if (graphUse.find(loc) != graphUse.end())
+                    {
+                        for (auto& use : graphUse[loc])
+                        {
+                            if (locations.find(use) == locations.end())
+                            {
+                                locations.insert(use);
+                                changed = true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            findByUse(modByUse, varName, locations, altNames);
+            findByUse(modByUseOnly, varName, locations, altNames);
+        }
+
         if (altNames.size() == 0)
             return varName;
         else if (altNames.size() >= 1)
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index d9a229a..bbc2467 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2387"
+#define VERSION_SPF "2388"

From 7e17c62bbb4b46f65afcdf8352b97f65e609ad23 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Mon, 10 Feb 2025 17:16:15 +0300
Subject: [PATCH 14/44] refactoring module analysis

---
 .../FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt  | 2285 +++++++++++++++++
 .../NPB/FDVMH.fdv/CG/cluster/cg.fdv           | 1008 ++++++++
 sapfor/experts/Sapfor_2017/CMakeLists.txt     |    4 +-
 .../DirectiveProcessing/insert_directive.cpp  |   55 +-
 .../_src/DvmhRegions/DvmhRegionInserter.cpp   |  149 --
 .../_src/GraphCall/graph_calls.cpp            |  117 -
 .../_src/GraphCall/graph_calls_func.h         |    1 -
 .../Sapfor_2017/_src/Utils/SgUtils.cpp        |  253 --
 .../experts/Sapfor_2017/_src/Utils/SgUtils.h  |   17 +-
 .../Sapfor_2017/_src/Utils/module_utils.cpp   |  676 +++++
 .../experts/Sapfor_2017/_src/Utils/version.h  |    2 +-
 .../_src/VerificationCode/CorrectVarDecl.cpp  |  122 -
 .../_src/VerificationCode/verifications.h     |    2 -
 13 files changed, 4003 insertions(+), 688 deletions(-)
 create mode 100644 dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt
 create mode 100644 dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv
 create mode 100644 sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp

diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt
new file mode 100644
index 0000000..90ed1a4
--- /dev/null
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt
@@ -0,0 +1,2285 @@
+
+#include <dvmhlib_cuda.h>
+#define dcmplx2 Complex<double>
+#define cmplx2 Complex<float>
+typedef int __indexTypeInt; 
+typedef long long __indexTypeLLong;
+
+
+
+
+
+//--------------------- Kernel for loop on line 229 ---------------------
+
+      __global__ void   loop_cg_229_cuda_kernel_int(double _x[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _i;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_i <= end_1) 
+         {
+
+// Loop body
+            _x[_i] = 1.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 229 ---------------------
+
+      __global__ void   loop_cg_229_cuda_kernel_llong(double _x[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _i;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_i <= end_1) 
+         {
+
+// Loop body
+            _x[_i] = 1.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 233 ---------------------
+
+      __global__ void   loop_cg_233_cuda_kernel_int(double _p[], double _r[], double _z[], double _q[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _q[_j] = 0.0e0;
+            _z[_j] = 0.0e0;
+            _r[_j] = 0.0e0;
+            _p[_j] = 0.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 233 ---------------------
+
+      __global__ void   loop_cg_233_cuda_kernel_llong(double _p[], double _r[], double _z[], double _q[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _q[_j] = 0.0e0;
+            _z[_j] = 0.0e0;
+            _r[_j] = 0.0e0;
+            _p[_j] = 0.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 272 ---------------------
+
+      __global__ void   loop_cg_272_cuda_kernel_int(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
+            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
+         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
+         if (_j % warpSize == 0) 
+         {
+            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
+            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 272 ---------------------
+
+      __global__ void   loop_cg_272_cuda_kernel_llong(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
+            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
+         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
+         if (_j % warpSize == 0) 
+         {
+            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
+            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 285 ---------------------
+
+      __global__ void   loop_cg_285_cuda_kernel_int(double _x[], double _z[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _norm_temp2)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _x[_j] = _z[_j] * _norm_temp2;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 285 ---------------------
+
+      __global__ void   loop_cg_285_cuda_kernel_llong(double _x[], double _z[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _norm_temp2)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _x[_j] = _z[_j] * _norm_temp2;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 301 ---------------------
+
+      __global__ void   loop_cg_301_cuda_kernel_int(double _x[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _i;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_i <= end_1) 
+         {
+
+// Loop body
+            _x[_i] = 1.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 301 ---------------------
+
+      __global__ void   loop_cg_301_cuda_kernel_llong(double _x[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _i;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_i <= end_1) 
+         {
+
+// Loop body
+            _x[_i] = 1.0e0;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 347 ---------------------
+
+      __global__ void   loop_cg_347_cuda_kernel_int(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
+            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
+         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
+         if (_j % warpSize == 0) 
+         {
+            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
+            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 347 ---------------------
+
+      __global__ void   loop_cg_347_cuda_kernel_llong(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
+            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
+         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
+         if (_j % warpSize == 0) 
+         {
+            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
+            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 367 ---------------------
+
+      __global__ void   loop_cg_367_cuda_kernel_int(double _x[], double _z[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _norm_temp2)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _x[_j] = _z[_j] * _norm_temp2;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 367 ---------------------
+
+      __global__ void   loop_cg_367_cuda_kernel_llong(double _x[], double _z[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _norm_temp2)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _x[_j] = _z[_j] * _norm_temp2;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 522 ---------------------
+
+      __global__ void   loop_cg_522_cuda_kernel_int(double _p[], double _r[], double _x[], double _z[], double _q[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _q[_j] = 0.0e0;
+            _z[_j] = 0.0e0;
+            _d = _x[_j];
+            _r[_j] = _d;
+            _p[_j] = _d;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 522 ---------------------
+
+      __global__ void   loop_cg_522_cuda_kernel_llong(double _p[], double _r[], double _x[], double _z[], double _q[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _q[_j] = 0.0e0;
+            _z[_j] = 0.0e0;
+            _d = _x[_j];
+            _r[_j] = _d;
+            _p[_j] = _d;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 537 ---------------------
+
+      __global__ void   loop_cg_537_cuda_kernel_int(double _r[], double _rho, double rho_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _rho = _r[_j] * _r[_j] + _rho;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _rho = __dvmh_blockReduceSum(_rho);
+         if (_j % warpSize == 0) 
+         {
+            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 537 ---------------------
+
+      __global__ void   loop_cg_537_cuda_kernel_llong(double _r[], double _rho, double rho_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _rho = _r[_j] * _r[_j] + _rho;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _rho = __dvmh_blockReduceSum(_rho);
+         if (_j % warpSize == 0) 
+         {
+            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 558 ---------------------
+
+      __global__ void   loop_cg_558_cuda_kernel_int(double _p_rma[], double _q[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Private variables
+         int _k;
+         double _sum;
+         int cond_0;
+         int __k;
+         int gid = blockIdx.x * blockDim.x + threadIdx.x;
+         int tid = gid / warpSize;
+         int lid = gid % warpSize;
+         
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _sum = 0.e0;
+            for (_k = _rowstr[_j] + lid, 
+                    (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
+                        cond_0 = (-1) : 
+                        cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1),
+                    __k = 0 + lid ; 
+                 __k < cond_0 ; 
+                 _k = _k + warpSize, __k = __k + warpSize)
+            {
+               _sum = _p_rma[_colidx[_k]] * _a[_k] + _sum;
+            }
+            _sum = __dvmh_warpReduceSum(_sum);
+            if (lid == 0) {
+                _q[_j] = _sum;
+            }
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 558 ---------------------
+
+      __global__ void   loop_cg_558_cuda_kernel_llong(double _p_rma[], double _q[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Private variables
+         int _k;
+         double _sum;
+         int cond_0;
+         int __k;
+         int gid = blockIdx.x * blockDim.x + threadIdx.x;
+         int tid = gid / warpSize;
+         int lid = gid % warpSize;
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _sum = 0.e0;
+            for (_k = _rowstr[_j] + lid, 
+                    (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
+                        cond_0 = (-1) : 
+                        cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1),
+                    __k = 0 + lid ; 
+                 __k < cond_0 ; 
+                 _k = _k + warpSize, __k = __k + warpSize)
+            {
+               _sum = _p_rma[_colidx[_k]] * _a[_k] + _sum;
+            }
+            _sum = __dvmh_warpReduceSum(_sum);
+            if (lid == 0) {
+                _q[_j] = _sum;
+            }
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 567 ---------------------
+
+      __global__ void   loop_cg_567_cuda_kernel_int(double _q[], double _p[], double _d, double d_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = _q[_j] * _p[_j] + _d;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _d = __dvmh_blockReduceSum(_d);
+         if (_j % warpSize == 0) 
+         {
+            d_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _d;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 567 ---------------------
+
+      __global__ void   loop_cg_567_cuda_kernel_llong(double _q[], double _p[], double _d, double d_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = _q[_j] * _p[_j] + _d;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _d = __dvmh_blockReduceSum(_d);
+         if (_j % warpSize == 0) 
+         {
+            d_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _d;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 577 ---------------------
+
+      __global__ void   loop_cg_577_cuda_kernel_int(double _q[], double _r[], double _p[], double _z[], double _rho, double rho_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _alpha)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _z[_j] = _p[_j] * _alpha + _z[_j];
+            _d = (-(_alpha * _q[_j])) + _r[_j];
+            _r[_j] = _d;
+            _rho = _d * _d + _rho;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _rho = __dvmh_blockReduceSum(_rho);
+         if (_j % warpSize == 0) 
+         {
+            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 577 ---------------------
+
+      __global__ void   loop_cg_577_cuda_kernel_llong(double _q[], double _r[], double _p[], double _z[], double _rho, double rho_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _alpha)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _z[_j] = _p[_j] * _alpha + _z[_j];
+            _d = (-(_alpha * _q[_j])) + _r[_j];
+            _r[_j] = _d;
+            _rho = _d * _d + _rho;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _rho = __dvmh_blockReduceSum(_rho);
+         if (_j % warpSize == 0) 
+         {
+            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 588 ---------------------
+
+      __global__ void   loop_cg_588_cuda_kernel_int(double _p[], double _r[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _beta)
+      {
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _p[_j] = _p[_j] * _beta + _r[_j];
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 588 ---------------------
+
+      __global__ void   loop_cg_588_cuda_kernel_llong(double _p[], double _r[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _beta)
+      {
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _p[_j] = _p[_j] * _beta + _r[_j];
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 605 ---------------------
+
+      __global__ void   loop_cg_605_cuda_kernel_int(double _z_rma[], double _r[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Private variables
+         int _k;
+         double _d;
+         int cond_0;
+         int __k;
+         int gid = blockIdx.x * blockDim.x + threadIdx.x;
+         int tid = gid / warpSize;
+         int lid = gid % warpSize;
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = 0.e0;
+            for (_k = _rowstr[_j] + lid, 
+                 (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
+                    cond_0 = (-1) :
+                    cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1), 
+                    __k = 0  + lid;
+                  __k < cond_0 ; 
+                  _k = _k + warpSize, __k = __k + warpSize)
+            {
+               _d = _z_rma[_colidx[_k]] * _a[_k] + _d;
+            }
+            _d = __dvmh_warpReduceSum(_d);
+            if (lid == 0) {
+                _r[_j] = _d;
+            }
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 605 ---------------------
+
+      __global__ void   loop_cg_605_cuda_kernel_llong(double _z_rma[], double _r[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Private variables
+         int _k;
+         double _d;
+         int cond_0;
+         int __k;
+         int gid = blockIdx.x * blockDim.x + threadIdx.x;
+         int tid = gid / warpSize;
+         int lid = gid % warpSize;
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = 0.e0;
+            for (_k = _rowstr[_j] + lid, 
+                 (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
+                    cond_0 = (-1) :
+                    cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1), 
+                    __k = 0  + lid;
+                  __k < cond_0 ; 
+                  _k = _k + warpSize, __k = __k + warpSize)
+            {
+               _d = _z_rma[_colidx[_k]] * _a[_k] + _d;
+            }
+            _d = __dvmh_warpReduceSum(_d);
+            if (lid == 0) {
+                _r[_j] = _d;
+            }
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 618 ---------------------
+
+      __global__ void   loop_cg_618_cuda_kernel_int(double _r[], double _x[], double _sum, double sum_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeInt _j;
+         __indexTypeInt rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = (-_r[_j]) + _x[_j];
+            _sum = _d * _d + _sum;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _sum = __dvmh_blockReduceSum(_sum);
+         if (_j % warpSize == 0) 
+         {
+            sum_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _sum;
+         }
+      }
+
+
+//--------------------- Kernel for loop on line 618 ---------------------
+
+      __global__ void   loop_cg_618_cuda_kernel_llong(double _r[], double _x[], double _sum, double sum_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
+      {
+
+// Private variables
+         double _d;
+
+// Local needs
+         __indexTypeLLong _j;
+         __indexTypeLLong rest_blocks, cur_blocks;
+
+// Calculate each thread's loop variables' values
+         rest_blocks = add_blocks + blockIdx.x;
+         cur_blocks = rest_blocks;
+         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
+         if (_j <= end_1) 
+         {
+
+// Loop body
+            _d = (-_r[_j]) + _x[_j];
+            _sum = _d * _d + _sum;
+         }
+
+// Reduction
+         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
+         _sum = __dvmh_blockReduceSum(_sum);
+         if (_j % warpSize == 0) 
+         {
+            sum_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _sum;
+         }
+      }
+
+
+
+#ifdef _MS_F_
+#define loop_cg_229_cuda_ loop_cg_229_cuda
+#define loop_cg_233_cuda_ loop_cg_233_cuda
+#define loop_cg_272_cuda_ loop_cg_272_cuda
+#define loop_cg_285_cuda_ loop_cg_285_cuda
+#define loop_cg_301_cuda_ loop_cg_301_cuda
+#define loop_cg_347_cuda_ loop_cg_347_cuda
+#define loop_cg_367_cuda_ loop_cg_367_cuda
+#define loop_cg_522_cuda_ loop_cg_522_cuda
+#define loop_cg_537_cuda_ loop_cg_537_cuda
+#define loop_cg_558_cuda_ loop_cg_558_cuda
+#define loop_cg_567_cuda_ loop_cg_567_cuda
+#define loop_cg_577_cuda_ loop_cg_577_cuda
+#define loop_cg_588_cuda_ loop_cg_588_cuda
+#define loop_cg_605_cuda_ loop_cg_605_cuda
+#define loop_cg_618_cuda_ loop_cg_618_cuda
+#endif
+
+extern "C" {
+      extern  DvmType loop_cg_618_cuda_kernel_llong_regs, loop_cg_618_cuda_kernel_int_regs, loop_cg_605_cuda_kernel_llong_regs, loop_cg_605_cuda_kernel_int_regs, loop_cg_588_cuda_kernel_llong_regs, loop_cg_588_cuda_kernel_int_regs, loop_cg_577_cuda_kernel_llong_regs, loop_cg_577_cuda_kernel_int_regs, loop_cg_567_cuda_kernel_llong_regs, loop_cg_567_cuda_kernel_int_regs, loop_cg_558_cuda_kernel_llong_regs, loop_cg_558_cuda_kernel_int_regs, loop_cg_537_cuda_kernel_llong_regs, loop_cg_537_cuda_kernel_int_regs, loop_cg_522_cuda_kernel_llong_regs, loop_cg_522_cuda_kernel_int_regs, loop_cg_367_cuda_kernel_llong_regs, loop_cg_367_cuda_kernel_int_regs, loop_cg_347_cuda_kernel_llong_regs, loop_cg_347_cuda_kernel_int_regs, loop_cg_301_cuda_kernel_llong_regs, loop_cg_301_cuda_kernel_int_regs, loop_cg_285_cuda_kernel_llong_regs, loop_cg_285_cuda_kernel_int_regs, loop_cg_272_cuda_kernel_llong_regs, loop_cg_272_cuda_kernel_int_regs, loop_cg_233_cuda_kernel_llong_regs, loop_cg_233_cuda_kernel_int_regs, loop_cg_229_cuda_kernel_llong_regs, loop_cg_229_cuda_kernel_int_regs;
+
+
+//    CUDA handler for loop on line 229 
+
+      void   loop_cg_229_cuda_(DvmType *loop_ref, DvmType _x[])
+      {
+         void   *x_base;
+         DvmType d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_229_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_229_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_229_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_229_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 233 
+
+      void   loop_cg_233_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], DvmType _z[], DvmType _q[])
+      {
+         void   *p_base, *r_base, *z_base, *q_base;
+         DvmType d_p[4], d_r[4], d_z[4], d_q[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         p_base = dvmh_get_natural_base(&device_num, _p);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+         q_base = dvmh_get_natural_base(&device_num, _q);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_233_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_233_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_233_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_233_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 272 
+
+      void   loop_cg_272_cuda_(DvmType *loop_ref, DvmType _z[], DvmType _x[])
+      {
+         void   *z_base, *x_base;
+         DvmType d_z[4], d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *norm_temp2_grid;
+         double _norm_temp2;
+         void   *norm_temp1_grid;
+         double _norm_temp1;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &norm_temp1_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_norm_temp1, 0);
+         red_num = 2;
+         loop_cuda_register_red(loop_ref, red_num, &norm_temp2_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_norm_temp2, 0);
+
+// Get 'natural' bases
+         z_base = dvmh_get_natural_base(&device_num, _z);
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_272_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_272_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         red_num = 2;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_272_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_272_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+         red_num = 2;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 285 
+
+      void   loop_cg_285_cuda_(DvmType *loop_ref, DvmType _x[], DvmType _z[], double *_norm_temp2)
+      {
+         void   *x_base, *z_base;
+         DvmType d_x[4], d_z[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         x_base = dvmh_get_natural_base(&device_num, _x);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_285_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_285_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_285_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
+            }
+            else 
+            {
+               loop_cg_285_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 301 
+
+      void   loop_cg_301_cuda_(DvmType *loop_ref, DvmType _x[])
+      {
+         void   *x_base;
+         DvmType d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_301_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_301_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_301_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_301_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 347 
+
+      void   loop_cg_347_cuda_(DvmType *loop_ref, DvmType _z[], DvmType _x[])
+      {
+         void   *z_base, *x_base;
+         DvmType d_z[4], d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *norm_temp2_grid;
+         double _norm_temp2;
+         void   *norm_temp1_grid;
+         double _norm_temp1;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &norm_temp1_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_norm_temp1, 0);
+         red_num = 2;
+         loop_cuda_register_red(loop_ref, red_num, &norm_temp2_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_norm_temp2, 0);
+
+// Get 'natural' bases
+         z_base = dvmh_get_natural_base(&device_num, _z);
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_347_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_347_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         red_num = 2;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_347_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_347_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+         red_num = 2;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 367 
+
+      void   loop_cg_367_cuda_(DvmType *loop_ref, DvmType _x[], DvmType _z[], double *_norm_temp2)
+      {
+         void   *x_base, *z_base;
+         DvmType d_x[4], d_z[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         x_base = dvmh_get_natural_base(&device_num, _x);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_367_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_367_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_367_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
+            }
+            else 
+            {
+               loop_cg_367_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 522 
+
+      void   loop_cg_522_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], DvmType _x[], DvmType _z[], DvmType _q[])
+      {
+         void   *p_base, *r_base, *x_base, *z_base, *q_base;
+         DvmType d_p[4], d_r[4], d_x[4], d_z[4], d_q[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         p_base = dvmh_get_natural_base(&device_num, _p);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         x_base = dvmh_get_natural_base(&device_num, _x);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+         q_base = dvmh_get_natural_base(&device_num, _q);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_522_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_522_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_522_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)x_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_522_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)x_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 537 
+
+      void   loop_cg_537_cuda_(DvmType *loop_ref, DvmType _r[])
+      {
+         void   *r_base;
+         DvmType d_r[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *rho_grid;
+         double _rho;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &rho_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_rho, 0);
+
+// Get 'natural' bases
+         r_base = dvmh_get_natural_base(&device_num, _r);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_537_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_537_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_537_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)r_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_537_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)r_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 558 
+
+      void   loop_cg_558_cuda_(DvmType *loop_ref, DvmType _p_rma[], DvmType _q[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
+      {
+         void   *p_rma_base, *q_base, *colidx_base, *a_base, *rowstr_base;
+         DvmType d_p_rma[4], d_q[4], d_colidx[4], d_a[4], d_rowstr[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         p_rma_base = dvmh_get_natural_base(&device_num, _p_rma);
+         q_base = dvmh_get_natural_base(&device_num, _q);
+         colidx_base = dvmh_get_natural_base(&device_num, _colidx);
+         a_base = dvmh_get_natural_base(&device_num, _a);
+         rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, p_rma_base, _p_rma, d_p_rma);
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+         dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
+         dvmh_fill_header_(&device_num, a_base, _a, d_a);
+         dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_558_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_558_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks * dvmh_get_warp_size(loop_ref);
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+         maxBlocks = maxBlocks / dvmh_get_warp_size(loop_ref) * dvmh_get_warp_size(loop_ref);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_558_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_rma_base, (double *)q_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_558_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_rma_base, (double *)q_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 567 
+
+      void   loop_cg_567_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _p[])
+      {
+         void   *q_base, *p_base;
+         DvmType d_q[4], d_p[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *d_grid;
+         double _d;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &d_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_d, 0);
+
+// Get 'natural' bases
+         q_base = dvmh_get_natural_base(&device_num, _q);
+         p_base = dvmh_get_natural_base(&device_num, _p);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_567_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_567_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_567_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)p_base, _d, (double *)d_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_567_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)p_base, _d, (double *)d_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 577 
+
+      void   loop_cg_577_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _r[], DvmType _p[], DvmType _z[], double *_alpha)
+      {
+         void   *q_base, *r_base, *p_base, *z_base;
+         DvmType d_q[4], d_r[4], d_p[4], d_z[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *rho_grid;
+         double _rho;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &rho_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_rho, 0);
+
+// Get 'natural' bases
+         q_base = dvmh_get_natural_base(&device_num, _q);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         p_base = dvmh_get_natural_base(&device_num, _p);
+         z_base = dvmh_get_natural_base(&device_num, _z);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, q_base, _q, d_q);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+         dvmh_fill_header_(&device_num, z_base, _z, d_z);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_577_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_577_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_577_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)r_base, (double *)p_base, (double *)z_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks, *_alpha);
+            }
+            else 
+            {
+               loop_cg_577_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)r_base, (double *)p_base, (double *)z_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks, *_alpha);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+
+//    CUDA handler for loop on line 588 
+
+      void   loop_cg_588_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], double *_beta)
+      {
+         void   *p_base, *r_base;
+         DvmType d_p[4], d_r[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         p_base = dvmh_get_natural_base(&device_num, _p);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, p_base, _p, d_p);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_588_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_588_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_588_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, idxL[0], idxH[0], addBlocks, *_beta);
+            }
+            else 
+            {
+               loop_cg_588_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, idxL[0], idxH[0], addBlocks, *_beta);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 605 
+
+      void   loop_cg_605_cuda_(DvmType *loop_ref, DvmType _z_rma[], DvmType _r[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
+      {
+         void   *z_rma_base, *r_base, *colidx_base, *a_base, *rowstr_base;
+         DvmType d_z_rma[4], d_r[4], d_colidx[4], d_a[4], d_rowstr[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Get 'natural' bases
+         z_rma_base = dvmh_get_natural_base(&device_num, _z_rma);
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         colidx_base = dvmh_get_natural_base(&device_num, _colidx);
+         a_base = dvmh_get_natural_base(&device_num, _a);
+         rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, z_rma_base, _z_rma, d_z_rma);
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
+         dvmh_fill_header_(&device_num, a_base, _a, d_a);
+         dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_605_cuda_kernel_int_regs, &threads, &stream, 0);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, 0, loop_cg_605_cuda_kernel_llong_regs, &threads, &stream, 0);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks * dvmh_get_warp_size(loop_ref);
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+         maxBlocks = maxBlocks / dvmh_get_warp_size(loop_ref) * dvmh_get_warp_size(loop_ref);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_605_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)z_rma_base, (double *)r_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_605_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)z_rma_base, (double *)r_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+      }
+
+
+//    CUDA handler for loop on line 618 
+
+      void   loop_cg_618_cuda_(DvmType *loop_ref, DvmType _r[], DvmType _x[])
+      {
+         void   *r_base, *x_base;
+         DvmType d_r[4], d_x[4];
+         DvmType idxTypeInKernel;
+         dim3 blocks, threads;
+         cudaStream_t stream;
+         DvmType idxL[1], idxH[1], loopSteps[1];
+         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
+         void   *sum_grid;
+         double _sum;
+         DvmType red_num, num_of_red_blocks, fill_flag;
+         DvmType shared_mem;
+         DvmType device_num;
+
+// Get device number
+         device_num = loop_get_device_num_(loop_ref);
+
+// Register reduction for CUDA-execution
+         red_num = 1;
+         loop_cuda_register_red(loop_ref, red_num, &sum_grid, 0);
+         loop_red_init_(loop_ref, &red_num, &_sum, 0);
+
+// Get 'natural' bases
+         r_base = dvmh_get_natural_base(&device_num, _r);
+         x_base = dvmh_get_natural_base(&device_num, _x);
+
+// Fill 'device' headers
+         dvmh_fill_header_(&device_num, r_base, _r, d_r);
+         dvmh_fill_header_(&device_num, x_base, _x, d_x);
+
+// Guess index type in CUDA kernel
+         idxTypeInKernel = loop_guess_index_type_(loop_ref);
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
+         {
+            idxTypeInKernel = rt_INT;
+         }
+         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
+         {
+            idxTypeInKernel = rt_LLONG;
+         }
+
+// Get CUDA configuration parameters
+         threads = dim3(0, 0, 0);
+#ifdef CUDA_FERMI_ARCH
+         shared_mem = 8;
+#else
+         shared_mem = 0;
+#endif
+         if (idxTypeInKernel == rt_INT) 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_618_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
+         }
+         else 
+         {
+            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_618_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
+         }
+         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
+         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
+         overallBlocks = blocksS[0];
+         restBlocks = overallBlocks;
+         addBlocks = 0;
+         blocks = dim3(1, 1, 1);
+
+// Prepare reduction
+         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
+         fill_flag = 0;
+         red_num = 1;
+         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
+         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
+
+// GPU execution
+         while (restBlocks > 0)
+         {
+            if (restBlocks <= maxBlocks) 
+            {
+               blocks = restBlocks;
+            }
+            else 
+            {
+               blocks = maxBlocks;
+            }
+            if (idxTypeInKernel == rt_INT) 
+            {
+               loop_cg_618_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)r_base, (double *)x_base, _sum, (double *)sum_grid, idxL[0], idxH[0], addBlocks);
+            }
+            else 
+            {
+               loop_cg_618_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)r_base, (double *)x_base, _sum, (double *)sum_grid, idxL[0], idxH[0], addBlocks);
+            }
+            addBlocks += blocks.x;
+            restBlocks -= blocks.x;
+         }
+
+// Finish reduction
+         red_num = 1;
+         loop_red_finish(loop_ref, red_num);
+      }
+
+}
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv
new file mode 100644
index 0000000..f077345
--- /dev/null
+++ b/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv
@@ -0,0 +1,1008 @@
+!-------------------------------------------------------------------------!
+!                                                                         !
+!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         !
+!                                                                         !
+!                      S E R I A L     V E R S I O N                      !
+!                                                                         !
+!                                   C G                                   !
+!                                                                         !
+!-------------------------------------------------------------------------!
+!                                                                         !
+!    This benchmark is a serial version of the NPB CG code.               !
+!    Refer to NAS Technical Reports 95-020 for details.                   !
+!                                                                         !
+!    Permission to use, copy, distribute and modify this software         !
+!    for any purpose with or without fee is hereby granted.  We           !
+!    request, however, that all derived work reference the NAS            !
+!    Parallel Benchmarks 3.3. This software is provided "as is"           !
+!    without express or implied warranty.                                 !
+!                                                                         !
+!    Information on NPB 3.3, including the technical report, the          !
+!    original specifications, source code, results and information        !
+!    on how to submit new results, is available at:                       !
+!                                                                         !
+!           http://www.nas.nasa.gov/Software/NPB/                         !
+!                                                                         !
+!    Send comments or suggestions to  npb@nas.nasa.gov                    !
+!                                                                         !
+!          NAS Parallel Benchmarks Group                                  !
+!          NASA Ames Research Center                                      !
+!          Mail Stop: T27A-1                                              !
+!          Moffett Field, CA   94035-1000                                 !
+!                                                                         !
+!          E-mail:  npb@nas.nasa.gov                                      !
+!          Fax:     (650) 604-3957                                        !
+!                                                                         !
+!-------------------------------------------------------------------------!
+
+
+c---------------------------------------------------------------------
+c      NPB CG serial version      
+c---------------------------------------------------------------------
+
+c---------------------------------------------------------------------
+c
+c Authors: M. Yarrow
+c          C. Kuszmaul
+c          A.S. Kolganov
+c
+c---------------------------------------------------------------------
+
+
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+      program cg
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+
+
+      implicit none
+
+      include 'globals.h'
+
+
+      common / main_int_mem /  colidx,     rowstr,
+     >                         iv,         arow,     acol
+      integer                  colidx(nz), rowstr(na+1),
+     >                         iv(na),  arow(na), acol(naz),
+     >                         bl_low, bl_high, blGen,gBL(2)
+
+
+      common / main_flt_mem /  aelt,     a,
+     >                         x,
+     >                         z,
+     >                         p,
+     >                         q,
+     >                         r
+      double precision         aelt(naz), a(nz),
+     >                         x(na+1),
+     >                         z(na+1),
+     >                         p(na+1),
+     >                         q(na+1),
+     >                         r(na+1)
+
+
+
+ 
+CDVM$ TEMPLATE ttt(na+2)        
+CDVM$ DISTRIBUTE ttt(BLOCK)   
+CDVM$ ALIGN  z(I) WITH ttt(I) 
+
+CDVM$ ALIGN  x(I) WITH z(I)
+CDVM$ ALIGN  r(I) WITH z(I)
+CDVM$ ALIGN  p(I) WITH z(I)
+CDVM$ ALIGN  q(I) WITH z(I)
+
+
+      integer            i, j, k, it, sumL
+
+      double precision   zeta, randlc
+      external           randlc
+      double precision   rnorm
+      double precision   norm_temp1,norm_temp2
+
+      double precision   t, mflops, tmax
+      character          class
+      logical            verified
+      double precision   zeta_verify_value, epsilon, err
+
+      integer   fstatus
+      character t_names(t_last)*8
+
+      do i = 1, T_last
+         call timer_clear( i )
+      end do
+
+      open(unit=2, file='timer.flag', status='old', iostat=fstatus)
+      if (fstatus .eq. 0) then
+         timeron = .true.
+         t_names(t_init) = 'init'
+         t_names(t_bench) = 'benchmk'
+         t_names(t_conj_grad) = 'conjgd'
+         close(2)
+      else
+         timeron = .false.
+      endif
+
+      call timer_start( T_init )
+
+      firstrow = 1
+      lastrow  = na
+      firstcol = 1
+      lastcol  = na
+
+
+      if( na .eq. 1400 .and. 
+     &    nonzer .eq. 7 .and. 
+     &    niter .eq. 15 .and.
+     &    shift .eq. 10.d0 ) then
+         class = 'S'
+         zeta_verify_value = 8.5971775078648d0
+      else if( na .eq. 7000 .and. 
+     &         nonzer .eq. 8 .and. 
+     &         niter .eq. 15 .and.
+     &         shift .eq. 12.d0 ) then
+         class = 'W'
+         zeta_verify_value = 10.362595087124d0
+      else if( na .eq. 14000 .and. 
+     &         nonzer .eq. 11 .and. 
+     &         niter .eq. 15 .and.
+     &         shift .eq. 20.d0 ) then
+         class = 'A'
+         zeta_verify_value = 17.130235054029d0
+      else if( na .eq. 75000 .and. 
+     &         nonzer .eq. 13 .and. 
+     &         niter .eq. 75 .and.
+     &         shift .eq. 60.d0 ) then
+         class = 'B'
+         zeta_verify_value = 22.712745482631d0
+      else if( na .eq. 150000 .and. 
+     &         nonzer .eq. 15 .and. 
+     &         niter .eq. 75 .and.
+     &         shift .eq. 110.d0 ) then
+         class = 'C'
+         zeta_verify_value = 28.973605592845d0
+      else if( na .eq. 1500000 .and. 
+     &         nonzer .eq. 21 .and. 
+     &         niter .eq. 100 .and.
+     &         shift .eq. 500.d0 ) then
+         class = 'D'
+         zeta_verify_value = 52.514532105794d0
+      else if( na .eq. 9000000 .and. 
+     &         nonzer .eq. 26 .and. 
+     &         niter .eq. 100 .and.
+     &         shift .eq. 1.5d3 ) then
+         class = 'E'
+         zeta_verify_value = 77.522164599383d0
+      else
+         class = 'U'
+      endif
+
+      write( *,1000 ) 
+      write( *,1001 ) na
+      write( *,1002 ) niter
+      write( *,* )
+ 1000 format(//,' NAS Parallel Benchmarks (NPB3.3-DVMH)',
+     >          ' - CG Benchmark', /)
+ 1001 format(' Size: ', i11 )
+ 1002 format(' Iterations: ', i5 )
+
+      naa = na
+      nzz = nz
+
+
+c---------------------------------------------------------------------
+c  Inialize random number generator
+c---------------------------------------------------------------------
+      tran    = 314159265.0D0
+      amult   = 1220703125.0D0
+      zeta    = randlc( tran, amult )
+
+c---------------------------------------------------------------------
+c  
+c---------------------------------------------------------------------
+      call makea(naa, nzz, a, colidx, rowstr, 
+     >           firstrow, lastrow, firstcol, lastcol, 
+     >           arow, acol, aelt, iv)
+
+
+          
+c---------------------------------------------------------------------
+c  Note: as a result of the above call to makea:
+c        values of j used in indexing rowstr go from 1 --> lastrow-firstrow+1
+c        values of colidx which are col indexes go from firstcol --> lastcol
+c        So:
+c        Shift the col index vals from actual (firstcol --> lastcol ) 
+c        to local, i.e., (1 --> lastcol-firstcol+1)
+c---------------------------------------------------------------------
+      do j=1,lastrow-firstrow+1
+         do k=rowstr(j),rowstr(j+1)-1
+            colidx(k) = colidx(k) - firstcol + 1
+         enddo
+      enddo
+
+c---------------------------------------------------------------------
+c  set starting vector to (1, 1, .... 1)
+c---------------------------------------------------------------------
+CDVM$ region
+CDVM$ parallel (i) on x(i)
+      do i = 1, na+1
+         x(i) = 1.0D0
+      enddo
+CDVM$ parallel (j) on x(j)
+      do j=1, lastcol-firstcol+1
+         q(j) = 0.0d0
+         z(j) = 0.0d0
+         r(j) = 0.0d0
+         p(j) = 0.0d0
+      enddo
+CDVM$ end region
+      zeta  = 0.0d0
+      
+c---------------------------------------------------------------------
+c---->
+c  Do one iteration untimed to init all code and data page tables
+c---->                    (then reinit, start timing, to niter its)
+c---------------------------------------------------------------------
+      do it = 1, 1
+
+c---------------------------------------------------------------------
+c  The call to the conjugate gradient routine:
+c---------------------------------------------------------------------
+         call conj_grad ( colidx,
+     >                    rowstr,
+     >                    x,
+     >                    z,
+     >                    a,
+     >                    p,
+     >                    q,
+     >                    r,
+     >                    rnorm )
+
+c---------------------------------------------------------------------
+c  zeta = shift + 1/(x.z)
+c  So, first: (x.z)
+c  Also, find norm of z
+c  So, first: (z.z)
+c---------------------------------------------------------------------
+         norm_temp1 = 0.0d0
+         norm_temp2 = 0.0d0
+CDVM$ region
+CDVM$ parallel (j) on x(j),reduction(SUM(norm_temp1),SUM(norm_temp2))
+         do j=1, lastcol-firstcol+1
+            norm_temp1 = norm_temp1 + x(j)*z(j)
+            norm_temp2 = norm_temp2 + z(j)*z(j)
+         enddo
+CDVM$ end region
+         norm_temp2 = 1.0d0 / sqrt( norm_temp2 )
+
+
+c---------------------------------------------------------------------
+c  Normalize z to obtain x
+c---------------------------------------------------------------------
+CDVM$ region
+CDVM$ parallel (j) on x(j)
+         do j=1, lastcol-firstcol+1      
+            x(j) = norm_temp2*z(j)    
+         enddo                           
+CDVM$ end region
+
+      enddo                              ! end of do one iteration untimed
+
+
+c---------------------------------------------------------------------
+c  set starting vector to (1, 1, .... 1)
+c---------------------------------------------------------------------
+c
+c  
+c
+CDVM$ region
+CDVM$ parallel (i) on x(i)
+      do i = 1, na+1
+         x(i) = 1.0D0
+      enddo
+CDVM$ end region
+      zeta  = 0.0d0
+
+      call timer_stop( T_init )
+
+      write (*, 2000) timer_read(T_init)
+ 2000 format(' Initialization time = ',f15.3,' seconds')
+
+      call timer_start( T_bench )
+
+c---------------------------------------------------------------------
+c---->
+c  Main Iteration for inverse power method
+c---->
+c---------------------------------------------------------------------
+      do it = 1, niter
+
+c---------------------------------------------------------------------
+c  The call to the conjugate gradient routine:
+c---------------------------------------------------------------------
+         if ( timeron ) call timer_start( T_conj_grad )
+         call conj_grad ( colidx,
+     >                    rowstr,
+     >                    x,
+     >                    z,
+     >                    a,
+     >                    p,
+     >                    q,
+     >                    r,
+     >                    rnorm )
+         if ( timeron ) call timer_stop( T_conj_grad )
+
+
+c---------------------------------------------------------------------
+c  zeta = shift + 1/(x.z)
+c  So, first: (x.z)
+c  Also, find norm of z
+c  So, first: (z.z)
+c---------------------------------------------------------------------
+         norm_temp1 = 0.0d0
+         norm_temp2 = 0.0d0
+CDVM$ region
+CDVM$ parallel (j) on x(j),reduction(SUM(norm_temp1),SUM(norm_temp2))
+         do j=1, lastcol-firstcol+1
+            norm_temp1 = norm_temp1 + x(j)*z(j)
+            norm_temp2 = norm_temp2 + z(j)*z(j)
+         enddo
+CDVM$ end region
+         norm_temp2 = 1.0d0 / sqrt( norm_temp2 )
+
+
+         zeta = shift + 1.0d0 / norm_temp1
+         if( it .eq. 1 ) write( *,9000 )
+         write( *,9001 ) it, rnorm, zeta
+
+ 9000    format( /,'   iteration           ||r||                 zeta' )
+ 9001    format( 4x, i5, 7x, e20.14, f20.13 )
+
+c---------------------------------------------------------------------
+c  Normalize z to obtain x
+c---------------------------------------------------------------------
+CDVM$ region
+CDVM$ parallel (j) on x(j)
+         do j=1, lastcol-firstcol+1      
+            x(j) = norm_temp2*z(j)    
+         enddo                           
+CDVM$ end region
+
+      enddo                              ! end of main iter inv pow meth
+
+      call timer_stop( T_bench )
+
+c---------------------------------------------------------------------
+c  End of timed section
+c---------------------------------------------------------------------
+
+      t = timer_read( T_bench )
+
+
+      write(*,100)
+ 100  format(' Benchmark completed ')
+
+      epsilon = 1.d-10
+      if (class .ne. 'U') then
+
+c         err = abs( zeta - zeta_verify_value)
+         err = abs( zeta - zeta_verify_value )/zeta_verify_value
+         if( err .le. epsilon .and. ( .not. isnan(err))) then
+            verified = .TRUE.
+            write(*, 200)
+            write(*, 201) zeta
+            write(*, 202) err
+ 200        format(' VERIFICATION SUCCESSFUL ')
+ 201        format(' Zeta is    ', E20.13)
+ 202        format(' Error is   ', E20.13)
+         else
+            verified = .FALSE.
+            write(*, 300) 
+            write(*, 301) zeta
+            write(*, 302) zeta_verify_value
+ 300        format(' VERIFICATION FAILED')
+ 301        format(' Zeta                ', E20.13)
+ 302        format(' The correct zeta is ', E20.13)
+         endif
+      else
+         verified = .FALSE.
+         write (*, 400)
+         write (*, 401)
+         write (*, 201) zeta
+ 400     format(' Problem size unknown')
+ 401     format(' NO VERIFICATION PERFORMED')
+      endif
+
+
+      if( t .ne. 0. ) then
+         mflops = float( 2*niter*na )
+     &               * ( 3.+float( nonzer*(nonzer+1) )
+     &                 + 25.*(5.+float( nonzer*(nonzer+1) ))
+     &                 + 3. ) / t / 1000000.0
+      else
+         mflops = 0.0
+      endif
+
+
+         call print_results('CG', class, na, 0, 0,
+     >                      niter, t,
+     >                      mflops, '          floating point', 
+     >                      verified, npbversion, compiletime,
+     >                      cs1, cs2, cs3, cs4, cs5, cs6, cs7)
+
+
+
+ 600  format( i4, 2e19.12)
+
+
+c---------------------------------------------------------------------
+c      More timers
+c---------------------------------------------------------------------
+      if (.not.timeron) goto 999
+
+      tmax = timer_read(T_bench)
+      if (tmax .eq. 0.0) tmax = 1.0
+
+      write(*,800)
+ 800  format('  SECTION   Time (secs)')
+      do i=1, t_last
+         t = timer_read(i)
+         if (i.eq.t_init) then
+            write(*,810) t_names(i), t
+         else
+            write(*,810) t_names(i), t, t*100./tmax
+            if (i.eq.t_conj_grad) then
+               t = tmax - t
+               write(*,820) 'rest', t, t*100./tmax
+            endif
+         endif
+ 810     format(2x,a8,':',f9.3:'  (',f6.2,'%)')
+ 820     format('    --> ',a8,':',f9.3,'  (',f6.2,'%)')
+      end do
+
+ 999  continue
+
+
+      end                              ! end main
+
+
+
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+      subroutine conj_grad ( colidx,
+     >                       rowstr,
+     >                       x,
+     >                       z,
+     >                       a,
+     >                       p,
+     >                       q,
+     >                       r,
+     >                       rnorm )
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+
+c---------------------------------------------------------------------
+c  Floaging point arrays here are named as in NPB1 spec discussion of 
+c  CG algorithm
+c---------------------------------------------------------------------
+ 
+      implicit none
+
+
+      include 'globals.h'
+
+
+      double precision   x(*),
+     >                   z(*),
+     >                   a(nzz)
+      integer            colidx(nzz), rowstr(naa+1)
+
+      double precision   p(*),
+     >                   q(*),
+     >                   r(*)
+
+
+      integer   j, k
+      integer   cgit, cgitmax, mlen,idx, idxl
+
+      double precision   d, sum, rho, rho0, alpha, beta, rnorm
+
+      data      cgitmax / 25 /
+CDVM$ INHERIT x, z, r, p, q
+
+      rho = 0.0d0
+
+c---------------------------------------------------------------------
+c  Initialize the CG algorithm:
+c---------------------------------------------------------------------
+
+CDVM$ region
+CDVM$ parallel (j) on q(j), private(d)
+      do j=1,naa+1
+         q(j) = 0.0d0
+         z(j) = 0.0d0
+         d = x(j)
+         r(j) = d
+         p(j) = d
+      enddo
+
+
+c---------------------------------------------------------------------
+c  rho = r.r
+c  Now, obtain the norm of r: First, sum squares of r elements locally...
+c---------------------------------------------------------------------
+
+CDVM$ parallel(j) on r(j), reduction(SUM(rho))
+      do j=1, lastcol-firstcol+1
+         rho = rho + r(j)*r(j)
+      enddo
+!        mlen = 128	  
+! DVM$ parallel(j) on r(j), reduction(MAX(mlen))	 
+!      do j=1,lastrow-firstrow+1
+!          mlen = max(mlen, rowstr(j+1) - rowstr(j))
+!      enddo
+CDVM$ end region
+!      write(*,*) 'maxlen = ', mlen
+c---------------------------------------------------------------------
+c---->
+c  The conj grad iteration loop
+c---->
+c---------------------------------------------------------------------
+      do cgit = 1, cgitmax
+
+         d = 0.0d0
+CDVM$ region
+	 
+CDVM$ parallel (j) on p(j), private(sum,k), remote_access(p(:))
+         do j=1,lastrow-firstrow+1
+            sum = 0.d0
+            do k=rowstr(j),rowstr(j+1)-1              
+              sum = sum + a(k)*p(colidx(k))              
+            enddo
+            q(j) = sum
+         enddo
+
+CDVM$ parallel (j) on q(j), reduction(SUM(d)) 
+         do j=1, lastcol-firstcol+1
+            d = d + p(j)*q(j)
+         enddo
+CDVM$ end region
+         alpha = rho / d
+         rho0 = rho
+
+         rho = 0.0d0
+CDVM$ region		 
+CDVM$ parallel (j) on r(j), private(d), reduction(SUM(rho))
+         do j=1, lastcol-firstcol+1
+            z(j) = z(j) + alpha*p(j)
+            d = r(j) - alpha*q(j)		
+            r(j) = d
+            rho = rho + d*d
+         enddo
+CDVM$ end region
+         beta = rho / rho0
+
+CDVM$ region
+CDVM$ parallel (j) on r(j)
+         do j=1, lastcol-firstcol+1
+            p(j) = r(j) + beta*p(j)
+         enddo
+CDVM$ end region
+
+      enddo                             ! end of do cgit=1,cgitmax
+
+
+c---------------------------------------------------------------------
+c  Compute residual norm explicitly:  ||r|| = ||x - A.z||
+c  First, form A.z
+c  The partition submatrix-vector multiply
+c---------------------------------------------------------------------
+
+      sum = 0.0d0
+CDVM$ region
+CDVM$ parallel (j) on r(j), private(d,k),remote_access(z(:))	  
+      do j=1,lastrow-firstrow+1
+         d = 0.d0
+         do k=rowstr(j),rowstr(j+1)-1
+            d = d + a(k)*z(colidx(k))
+         enddo
+         r(j) = d
+      enddo
+
+
+c---------------------------------------------------------------------
+c  At this point, r contains A.z
+c---------------------------------------------------------------------
+CDVM$ parallel (j) on r(j), private(d), reduction(SUM(sum))
+      do j=1, lastcol-firstcol+1
+         d   = x(j) - r(j)         
+         sum = sum + d*d
+      enddo
+CDVM$ end region
+      rnorm = sqrt( sum )
+
+
+
+      return
+      end                               ! end of routine conj_grad
+
+
+
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+      subroutine makea( n, nz, a, colidx, rowstr, 
+     >                  firstrow, lastrow, firstcol, lastcol,
+     >                  arow, acol, aelt, iv )
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+
+      implicit            none
+      include             'npbparams.h'
+      integer             n, nz
+      integer             firstrow, lastrow, firstcol, lastcol
+      integer             colidx(nz), rowstr(n+1)
+      integer             iv(n), arow(n), acol(nonzer+1,n)
+      double precision    aelt(nonzer+1,n)
+      double precision    a(nz)
+
+c---------------------------------------------------------------------
+c       generate the test problem for benchmark 6
+c       makea generates a sparse matrix with a
+c       prescribed sparsity distribution
+c
+c       parameter    type        usage
+c
+c       input
+c
+c       n            i           number of cols/rows of matrix
+c       nz           i           nonzeros as declared array size
+c       rcond        r*8         condition number
+c       shift        r*8         main diagonal shift
+c
+c       output
+c
+c       a            r*8         array for nonzeros
+c       colidx       i           col indices
+c       rowstr       i           row pointers
+c
+c       workspace
+c
+c       iv, arow, acol i
+c       aelt           r*8
+c---------------------------------------------------------------------
+
+      integer          i, iouter, ivelt, nzv, nn1
+      integer          ivc(nonzer+1)
+      double precision vc(nonzer+1)
+
+c---------------------------------------------------------------------
+c      nonzer is approximately  (int(sqrt(nnza /n)));
+c---------------------------------------------------------------------
+
+      external          sparse, sprnvc, vecset
+
+c---------------------------------------------------------------------
+c    nn1 is the smallest power of two not less than n
+c---------------------------------------------------------------------
+
+      nn1 = 1
+ 50   continue
+        nn1 = 2 * nn1
+        if (nn1 .lt. n) goto 50
+
+c---------------------------------------------------------------------
+c  Generate nonzero positions and save for the use in sparse.
+c---------------------------------------------------------------------
+
+      do iouter = 1, n
+         nzv = nonzer
+         call sprnvc( n, nzv, nn1, vc, ivc )
+         call vecset( n, vc, ivc, nzv, iouter, .5D0 )
+         arow(iouter) = nzv
+         do ivelt = 1, nzv
+            acol(ivelt, iouter) = ivc(ivelt)
+            aelt(ivelt, iouter) = vc(ivelt)
+         enddo
+      enddo
+
+c---------------------------------------------------------------------
+c       ... make the sparse matrix from list of elements with duplicates
+c           (iv is used as  workspace)
+c---------------------------------------------------------------------
+      call sparse( a, colidx, rowstr, n, nz, nonzer, arow, acol, 
+     >             aelt, firstrow, lastrow,
+     >             iv, rcond, shift )
+      return
+
+      end
+c-------end   of makea------------------------------
+
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+      subroutine sparse( a, colidx, rowstr, n, nz, nonzer, arow, acol, 
+     >                   aelt, firstrow, lastrow,
+     >                   nzloc, rcond, shift )
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+
+      implicit           none
+      integer            colidx(*), rowstr(*)
+      integer            firstrow, lastrow
+      integer            n, nz, nonzer, arow(*), acol(nonzer+1,*)
+      double precision   a(*), aelt(nonzer+1,*), rcond, shift
+
+c---------------------------------------------------------------------
+c       rows range from firstrow to lastrow
+c       the rowstr pointers are defined for nrows = lastrow-firstrow+1 values
+c---------------------------------------------------------------------
+      integer            nzloc(n), nrows
+
+c---------------------------------------------------
+c       generate a sparse matrix from a list of
+c       [col, row, element] tri
+c---------------------------------------------------
+
+      integer            i, j, j1, j2, nza, k, kk, nzrow, jcol
+      double precision   xi, size, scale, ratio, va
+
+c---------------------------------------------------------------------
+c    how many rows of result
+c---------------------------------------------------------------------
+      nrows = lastrow - firstrow + 1
+
+c---------------------------------------------------------------------
+c     ...count the number of triples in each row
+c---------------------------------------------------------------------
+      do j = 1, nrows+1
+         rowstr(j) = 0
+      enddo
+
+      do i = 1, n
+         do nza = 1, arow(i)
+            j = acol(nza, i) + 1
+            rowstr(j) = rowstr(j) + arow(i)
+         end do
+      end do
+
+      rowstr(1) = 1
+      do j = 2, nrows+1
+         rowstr(j) = rowstr(j) + rowstr(j-1)
+      enddo
+      nza = rowstr(nrows+1) - 1
+
+c---------------------------------------------------------------------
+c     ... rowstr(j) now is the location of the first nonzero
+c           of row j of a
+c---------------------------------------------------------------------
+
+      if (nza .gt. nz) then
+         write(*,*) 'Space for matrix elements exceeded in sparse'
+         write(*,*) 'nza, nzmax = ',nza, nz
+         stop
+      endif
+
+
+c---------------------------------------------------------------------
+c     ... preload data pages
+c---------------------------------------------------------------------
+      do j = 1, nrows
+         do k = rowstr(j), rowstr(j+1)-1
+             a(k) = 0.d0
+             colidx(k) = 0
+         enddo
+         nzloc(j) = 0
+      enddo
+
+c---------------------------------------------------------------------
+c     ... generate actual values by summing duplicates
+c---------------------------------------------------------------------
+
+      size = 1.0D0
+      ratio = rcond ** (1.0D0 / dfloat(n))
+
+      do i = 1, n
+         do nza = 1, arow(i)
+            j = acol(nza, i)
+
+            scale = size * aelt(nza, i)
+            do nzrow = 1, arow(i)
+               jcol = acol(nzrow, i)
+               va = aelt(nzrow, i) * scale
+
+c---------------------------------------------------------------------
+c       ... add the identity * rcond to the generated matrix to bound
+c           the smallest eigenvalue from below by rcond
+c---------------------------------------------------------------------
+               if (jcol .eq. j .and. j .eq. i) then
+                  va = va + rcond - shift
+               endif
+
+               do k = rowstr(j), rowstr(j+1)-1
+                  if (colidx(k) .gt. jcol) then
+c---------------------------------------------------------------------
+c       ... insert colidx here orderly
+c---------------------------------------------------------------------
+                     do kk = rowstr(j+1)-2, k, -1
+                        if (colidx(kk) .gt. 0) then
+                           a(kk+1)  = a(kk)
+                           colidx(kk+1) = colidx(kk)
+                        endif
+                     enddo
+                     colidx(k) = jcol
+                     a(k)  = 0.d0
+                     goto 40
+                  else if (colidx(k) .eq. 0) then
+                     colidx(k) = jcol
+                     goto 40
+                  else if (colidx(k) .eq. jcol) then
+c---------------------------------------------------------------------
+c       ... mark the duplicated entry
+c---------------------------------------------------------------------
+                     nzloc(j) = nzloc(j) + 1
+                     goto 40
+                  endif
+               enddo
+               print *,'internal error in sparse: i=',i
+               stop
+   40          continue
+               a(k) = a(k) + va
+            enddo
+   60       continue
+         enddo
+         size = size * ratio
+      enddo
+
+
+c---------------------------------------------------------------------
+c       ... remove empty entries and generate final results
+c---------------------------------------------------------------------
+      do j = 2, nrows
+         nzloc(j) = nzloc(j) + nzloc(j-1)
+      enddo
+
+      do j = 1, nrows
+         if (j .gt. 1) then
+            j1 = rowstr(j) - nzloc(j-1)
+         else
+            j1 = 1
+         endif
+         j2 = rowstr(j+1) - nzloc(j) - 1
+         nza = rowstr(j)
+         do k = j1, j2
+            a(k) = a(nza)
+            colidx(k) = colidx(nza)
+            nza = nza + 1
+         enddo
+      enddo
+      do j = 2, nrows+1
+         rowstr(j) = rowstr(j) - nzloc(j-1)
+      enddo
+      nza = rowstr(nrows+1) - 1
+
+
+CC       write (*, 11000) nza
+      return
+11000   format ( //,'final nonzero count in sparse ',
+     1            /,'number of nonzeros       = ', i16 )
+      end
+c-------end   of sparse-----------------------------
+
+
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+      subroutine sprnvc( n, nz, nn1, v, iv )
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+
+      implicit           none
+      double precision   v(*)
+      integer            n, nz, nn1, iv(*)
+      common /urando/    amult, tran
+      double precision   amult, tran
+
+
+c---------------------------------------------------------------------
+c       generate a sparse n-vector (v, iv)
+c       having nzv nonzeros
+c
+c       mark(i) is set to 1 if position i is nonzero.
+c       mark is all zero on entry and is reset to all zero before exit
+c       this corrects a performance bug found by John G. Lewis, caused by
+c       reinitialization of mark on every one of the n calls to sprnvc
+c---------------------------------------------------------------------
+
+        integer            nzv, ii, i, icnvrt
+
+        external           randlc, icnvrt
+        double precision   randlc, vecelt, vecloc
+
+
+        nzv = 0
+
+100     continue
+        if (nzv .ge. nz) goto 110
+
+         vecelt = randlc( tran, amult )
+
+c---------------------------------------------------------------------
+c   generate an integer between 1 and n in a portable manner
+c---------------------------------------------------------------------
+         vecloc = randlc(tran, amult)
+         i = icnvrt(vecloc, nn1) + 1
+         if (i .gt. n) goto 100
+
+c---------------------------------------------------------------------
+c  was this integer generated already?
+c---------------------------------------------------------------------
+         do ii = 1, nzv
+            if (iv(ii) .eq. i) goto 100
+         enddo
+         nzv = nzv + 1
+         v(nzv) = vecelt
+         iv(nzv) = i
+         goto 100
+110     continue
+
+      return
+      end
+c-------end   of sprnvc-----------------------------
+
+
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+      function icnvrt(x, ipwr2)
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+
+      implicit           none
+      double precision   x
+      integer            ipwr2, icnvrt
+
+c---------------------------------------------------------------------
+c    scale a double precision number x in (0,1) by a power of 2 and chop it
+c---------------------------------------------------------------------
+      icnvrt = int(ipwr2 * x)
+
+      return
+      end
+c-------end   of icnvrt-----------------------------
+
+
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+      subroutine vecset(n, v, iv, nzv, i, val)
+c---------------------------------------------------------------------
+c---------------------------------------------------------------------
+
+      implicit           none
+      integer            n, iv(*), nzv, i, k
+      double precision   v(*), val
+
+c---------------------------------------------------------------------
+c       set ith element of sparse vector (v, iv) with
+c       nzv nonzeros to val
+c---------------------------------------------------------------------
+
+      logical set
+
+      set = .false.
+      do k = 1, nzv
+         if (iv(k) .eq. i) then
+            v(k) = val
+            set  = .true.
+         endif
+      enddo
+      if (.not. set) then
+         nzv     = nzv + 1
+         v(nzv)  = val
+         iv(nzv) = i
+      endif
+      return
+      end
+c-------end   of vecset-----------------------------
+
+      include 'print_results.f'
+      include 'timers.f'
+      include 'randdp.f'
+
diff --git a/sapfor/experts/Sapfor_2017/CMakeLists.txt b/sapfor/experts/Sapfor_2017/CMakeLists.txt
index 2a26a8a..9379792 100644
--- a/sapfor/experts/Sapfor_2017/CMakeLists.txt
+++ b/sapfor/experts/Sapfor_2017/CMakeLists.txt
@@ -94,7 +94,9 @@ set(UTILS _src/Utils/AstWrapper.h
         _src/Utils/types.h
         _src/Utils/utils.cpp
         _src/Utils/utils.h
-        _src/Utils/version.h)
+        _src/Utils/version.h
+        _src/Utils/module_utils.h
+        _src/Utils/module_utils.cpp)
         
 set(OMEGA _src/SageAnalysisTool/OmegaForSage/add-assert.cpp
         _src/SageAnalysisTool/OmegaForSage/affine.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp
index 0b58816..642a5b7 100644
--- a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp
@@ -832,15 +832,22 @@ static pair<templateDir, string>
     return make_pair(retDir, lastReturn);
 }
 
-static pair<string, string> getModuleRename(const map<string, set<SgSymbol*>>& byUse, const DIST::Array* array,
-                                            const string& filename, const pair<int, int>& lineRange)
+static pair<string, string> getModuleRename(const set<SgStatement*>& allocatableStmts, const DIST::Array* array)
 {
-    auto declS = array->GetDeclSymbol(filename, lineRange, getAllFilesInProject())->GetOriginal();
-    for (auto& elem : byUse)
-        for (auto& localS : setToMapWithSortByStr(elem.second))
-            if (OriginalSymbol(localS.second) == declS)
-                return make_pair(elem.first, localS.second->identifier());
-    return make_pair("", "");
+    if (array->GetLocation().first == DIST::l_MODULE)
+    {
+        set<string> arrayNames;
+        for (auto& alloc : allocatableStmts)
+            if (alloc->variant() == ALLOCATE_STMT)
+                arrayNames.insert(getNameByUse(alloc, array->GetShortName(), array->GetLocation().second));
+
+        if (arrayNames.size() > 1 || arrayNames.size() == 0)
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+        return make_pair(array->GetShortName(), *arrayNames.begin());
+    }
+    else
+        return make_pair("", "");
 }
 
 static pair<DIST::Array*, string>
@@ -848,10 +855,7 @@ getNewDirective(const string &fullArrayName,
                 const vector<string> &distrRules,
                 const vector<string> &alignRules,
                 const DataDirective &dataDir,
-                const map<string, set<SgSymbol*>> &byUse,
-                const string& filename,
-                const pair<int, int>& lineRange,
-                bool alignToRealign)
+                const set<SgStatement*>& allocatableStmts)
 {
     string out = "";
     DIST::Array* outA = NULL;
@@ -873,7 +877,7 @@ getNewDirective(const string &fullArrayName,
         if (dataDir.alignRules[i].alignArray->GetName() == fullArrayName)
         {
             string rule = alignRules[i];
-            if (alignToRealign)
+            if (allocatableStmts.size())
             {
                 auto it = rule.find("ALIGN");
                 while (it != string::npos)
@@ -881,8 +885,8 @@ getNewDirective(const string &fullArrayName,
                     rule = rule.replace(it, 5, "REALIGN");
                     it = rule.find("ALIGN", it + 7);
                 }
-
-                auto renamePair = getModuleRename(byUse, dataDir.alignRules[i].alignArray, filename, lineRange);
+                
+                auto renamePair = getModuleRename(allocatableStmts, dataDir.alignRules[i].alignArray);
                 if (renamePair.first != "")
                 {
                     it = rule.find(renamePair.first);
@@ -1722,29 +1726,12 @@ void insertDistributionToFile(SgFile *file, const char *fin_name, const DataDire
 
                         if (distrArrays.find(fullArrayName) != distrArrays.end())
                         {
-                            map<string, set<SgSymbol*>> byUseInFunc;
-
                             const vector<SgStatement*> &allocatableStmtsCopy = getAttributes<SgStatement*, SgStatement*>(st, set<int>{ ALLOCATE_STMT });
                             set<SgStatement*> allocatableStmts;
                             if (allocatableStmtsCopy.size())
-                            {
                                 allocatableStmts = filterAllocateStats(file, allocatableStmtsCopy, currSymb->identifier());
-
-                                
-                                for (auto &alloc : allocatableStmts)
-                                {
-                                    if (alloc->fileName() != currFilename)
-                                        if (!alloc->switchToFile())
-                                            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
-                                    auto byUse = moduleRefsByUseInFunction(alloc);
-                                    for (auto &byUseElem : byUse)
-                                        byUseInFunc[byUseElem.first].insert(byUseElem.second.begin(), byUseElem.second.end());
-
-                                    SgFile::switchToFile(currFilename);
-                                }
-                            }
-                            pair<DIST::Array*, string> dirWithArray = getNewDirective(fullArrayName, distrRules, alignRules, dataDir, byUseInFunc, filename, lineRange, allocatableStmts.size() != 0);
+   
+                            pair<DIST::Array*, string> dirWithArray = getNewDirective(fullArrayName, distrRules, alignRules, dataDir, allocatableStmts);
 
                             string toInsert = dirWithArray.second;
                             if (toInsert != "")
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
index 5dad847..9b760c7 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
@@ -166,155 +166,6 @@ void DvmhRegionInserter::updateParallelFunctions(const map<string, vector<LoopGr
     }
 }
 
-static void findByUse(map<string, vector<pair<SgSymbol*, SgSymbol*>>> &modByUse, const string& varName, 
-                      const set<string>& locNames, vector<string> &altNames)
-{
-    for (auto& elem : modByUse)
-    {
-        if (locNames.count(elem.first))
-        {
-            for (auto& byUse : elem.second)
-            {
-                SgSymbol* toCmp = byUse.second ? byUse.second : byUse.first;
-                checkNull(toCmp, convertFileName(__FILE__).c_str(), __LINE__);
-                if (toCmp->identifier() == varName)
-                    altNames.push_back(byUse.first->identifier());
-            }
-        }
-    }
-}
-
-static void fillInfo(SgStatement *start,
-                     set<string> &useMod,
-                     map<string, vector<pair<SgSymbol*, SgSymbol*>>> &modByUse,
-                     map<string, vector<pair<SgSymbol*, SgSymbol*>>> &modByUseOnly)
-{
-    for (SgStatement* st = start; st != start->lastNodeOfStmt(); st = st->lexNext())
-    {
-        if (isSgExecutableStatement(st))
-            break;
-        if (st->variant() == CONTAINS_STMT)
-            break;
-        if (st != start && (st->variant() == PROC_HEDR || st->variant() == FUNC_HEDR))
-            break;
-        fillUseStatement(st, useMod, modByUse, modByUseOnly);
-    }
-}
-
-static SgStatement* findModWithName(const vector<SgStatement*> &modules, const string &name)
-{
-    for (auto& elem : modules)
-        if (elem->variant() == MODULE_STMT)
-            if (elem->symbol()->identifier() == name)
-                return elem;
-    return NULL;
-}
-
-static string getNameByUse(SgStatement *place, const string &varName, const string &locName)
-{
-    SgStatement* func = getFuncStat(place);
-    if (func == NULL)
-        return varName;
-    else
-    {
-        map<string, set<string>> graphUse;
-
-        set<string> useMod;
-        map<string, vector<pair<SgSymbol*, SgSymbol*>>> modByUse;
-        map<string, vector<pair<SgSymbol*, SgSymbol*>>> modByUseOnly;
-
-        fillInfo(func, useMod, modByUse, modByUseOnly);
-        SgStatement* cp = func->controlParent();
-        if (isSgProgHedrStmt(cp) || cp->variant() == MODULE_STMT) // if function in contains region
-            fillInfo(cp, useMod, modByUse, modByUseOnly);
-
-        set<string> useModDone;
-        bool needRepeat = true;
-
-        vector<SgStatement*> modules;
-        findModulesInFile(func->getFile(), modules);
-
-        while (needRepeat)
-        {
-            needRepeat = false;
-            set<string> newUseMod;
-            for (auto& useM : useMod)
-            {
-                if (useModDone.find(useM) == useModDone.end())
-                {
-                    auto modSt = findModWithName(modules, useM);
-                    if (modSt == NULL || useM == "dvmh_template_mod")
-                        continue;
-
-                    checkNull(modSt, convertFileName(__FILE__).c_str(), __LINE__);
-
-                    set<string> tmpUse;
-                    fillInfo(modSt, tmpUse, modByUse, modByUseOnly);
-                    useModDone.insert(useM);
-
-                    for (auto& use : tmpUse)
-                    {
-                        newUseMod.insert(use);
-
-                        if (use != "dvmh_template_mod")
-                            graphUse[use].insert(useM);
-                    }
-                }
-            }
-
-            for (auto& newU : newUseMod)
-            {
-                if (useModDone.find(newU) == useModDone.end())
-                {
-                    useModDone.insert(newU);
-                    needRepeat = true;
-                }
-            }
-        }
-
-        vector<string> altNames;        
-        findByUse(modByUse, varName, { locName }, altNames);
-        findByUse(modByUseOnly, varName, { locName }, altNames);
-        
-        if (altNames.size() == 0) 
-        {
-            set<string> locations = { locName };
-            bool changed = true;
-            while (changed)
-            {
-                changed = false;
-                for (auto& loc : locations)
-                {
-                    if (graphUse.find(loc) != graphUse.end())
-                    {
-                        for (auto& use : graphUse[loc])
-                        {
-                            if (locations.find(use) == locations.end())
-                            {
-                                locations.insert(use);
-                                changed = true;
-                            }
-                        }
-                    }
-                }
-            }
-
-            findByUse(modByUse, varName, locations, altNames);
-            findByUse(modByUseOnly, varName, locations, altNames);
-        }
-
-        if (altNames.size() == 0)
-            return varName;
-        else if (altNames.size() >= 1)
-        {
-            set<string> setAlt(altNames.begin(), altNames.end());
-            return *setAlt.begin();
-        }
-        else
-            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-    }
-}
-
 static SgStatement* skipDvmhRegionInterval(SgStatement *start)
 {
     if (start->variant() != ACC_REGION_DIR)
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
index 35c3dfb..f583a20 100644
--- a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
@@ -2296,123 +2296,6 @@ void checkForRecursion(SgFile *file, map<string, vector<FuncInfo*>> &allFuncInfo
     }
 }
 
-static void fillUseStmt(SgStatement *stat, map<string, set<SgSymbol*>> &byUse)
-{
-    if (stat->variant() != USE_STMT)
-        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
-    SgExpression* ex = stat->expr(0);
-    if (ex && ex->variant() == ONLY_NODE)
-    {
-        for (auto exI = ex->lhs(); exI; exI = exI->rhs())
-        {
-            if (exI->lhs()->variant() == RENAME_NODE)
-            {
-                SgExpression* ren = exI->lhs();
-                if (ren->lhs()->symbol() && ren->rhs() && ren->rhs()->symbol())
-                    byUse[ren->rhs()->symbol()->identifier()].insert(ren->lhs()->symbol());
-            }
-        }
-    }
-    else if (ex && ex->lhs())
-    {
-        for (auto exI = ex; exI; exI = exI->rhs())
-        {
-            if (exI->lhs()->variant() == RENAME_NODE)
-            {
-                SgExpression* ren = exI->lhs();
-                if (ren->lhs()->symbol() && ren->rhs() && ren->rhs()->symbol())
-                    byUse[ren->rhs()->symbol()->identifier()].insert(ren->lhs()->symbol());
-            }
-        }
-    }
-}
-
-map<string, set<SgSymbol*>> moduleRefsByUseInFunction(SgStatement *stIn)
-{
-    checkNull(stIn, convertFileName(__FILE__).c_str(), __LINE__);
-
-    map<string, set<SgSymbol*>> byUse;
-    int var = stIn->variant();
-    while (var != PROG_HEDR && var != PROC_HEDR && var != FUNC_HEDR)
-    {
-        stIn = stIn->controlParent();
-        if (stIn == NULL)
-            return byUse;
-        var = stIn->variant();
-    }
-    
-    auto mapOfUses = createMapOfModuleUses(stIn->getFile());
-    set<string> useMods;
-
-    for (SgStatement *stat = stIn->lexNext(); !isSgExecutableStatement(stat); stat = stat->lexNext())
-    {
-        if (stat->variant() == USE_STMT)
-        {
-            fillUseStmt(stat, byUse);
-            useMods.insert(stat->symbol()->identifier());
-        }
-    }
-
-    const int cpOfSt = stIn->controlParent()->variant();
-    //contains of func
-    if (cpOfSt == PROG_HEDR || cpOfSt == PROC_HEDR || cpOfSt == FUNC_HEDR)
-    {
-        for (SgStatement *stat = stIn->controlParent()->lexNext(); !isSgExecutableStatement(stat); stat = stat->lexNext())
-        {
-            if (stat->variant() == USE_STMT)
-            {
-                fillUseStmt(stat, byUse);
-                useMods.insert(stat->symbol()->identifier());
-            }
-        }
-    }
-
-    bool chages = true;
-    while (chages)
-    {
-        chages = false;
-        set<string> newUseMods(useMods);
-        for (auto &elem : useMods)
-        {
-            auto it = mapOfUses.find(elem);
-            if (it != mapOfUses.end())
-            {
-                for (auto &elem2 : it->second)
-                {
-                    if (newUseMods.find(elem2) == newUseMods.end())
-                    {
-                        newUseMods.insert(elem2);
-                        chages = true;
-                    }
-                }
-            }
-        }
-        useMods = newUseMods;
-    }
-
-    vector<SgStatement*> modules;
-    findModulesInFile(stIn->getFile(), modules);
-    for (auto &mod : modules)
-    {
-        if (useMods.find(mod->symbol()->identifier()) != useMods.end())
-        {
-            for (SgStatement *stat = mod->lexNext(); stat != mod->lastNodeOfStmt(); stat = stat->lexNext())
-            {
-                const int var = stat->variant();
-                if (var == USE_STMT)
-                {
-                    fillUseStmt(stat, byUse);
-                    useMods.insert(stat->symbol()->identifier());
-                }
-                else if (var == PROC_HEDR || var == FUNC_HEDR)
-                    break;
-            }
-        }
-    }
-    return byUse;
-}
-
 void propagateWritesToArrays(map<string, vector<FuncInfo*>> &allFuncInfo)
 {
     map<string, FuncInfo*> funcByName;
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_func.h b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_func.h
index a4d3715..0660d67 100644
--- a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_func.h
+++ b/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_func.h
@@ -45,7 +45,6 @@ int CheckFunctionsToInline(SgProject *proj, const std::map<std::string, int> &fi
 void checkForRecursion(SgFile *file, std::map<std::string, std::vector<FuncInfo*>> &allFuncInfo, std::vector<Messages> &messagesForFile);
 bool isPassFullArray(SgExpression *ex);
 void doMacroExpand(SgFile *file, std::vector<Messages> &messages);
-std::map<std::string, std::set<SgSymbol*>> moduleRefsByUseInFunction(SgStatement *stIn);
 void propagateWritesToArrays(std::map<std::string, std::vector<FuncInfo*>> &allFuncInfo);
 void detectCopies(std::map<std::string, std::vector<FuncInfo*>> &allFuncInfo);
 void fillInterfaceBlock(std::map<std::string, std::vector<FuncInfo*>>& allFuncInfo);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
index eb9b0e2..677e0a9 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
@@ -879,46 +879,6 @@ void initTags()
 #include "tag.h"
 }
 
-
-void findModulesInFile(SgFile *file, vector<SgStatement*> &modules)
-{
-    SgStatement *first = file->firstStatement();
-    set<SgStatement*> functions;
-
-    int funcNum = file->numberOfFunctions();
-    for (int i = 0; i < funcNum; ++i)
-        functions.insert(file->functions(i));
-
-    while (first)
-    {
-        if (first->variant() == MODULE_STMT)
-        {
-            modules.push_back(first);
-            first = first->lastNodeOfStmt();
-        }
-        else
-        {
-            if (functions.size())
-            {
-                auto it = functions.find(first);
-                if (it != functions.end())
-                    first = (*it)->lastNodeOfStmt();
-            }
-        }
-
-        first = first->lexNext();
-    }
-}
-
-void getModulesAndFunctions(SgFile *file, vector<SgStatement*> &modulesAndFunctions)
-{
-    findModulesInFile(file, modulesAndFunctions);
-
-    int funcNum = file->numberOfFunctions();
-    for (int i = 0; i < funcNum; ++i)
-        modulesAndFunctions.push_back(file->functions(i));
-}
-
 void tryToFindPrivateInAttributes(SgStatement *st, set<string> &privates, bool onlyReduction, bool onlyUsers)
 {
     set<Symbol*> privatesVars;
@@ -2365,76 +2325,6 @@ objT& getObjectForFileFromMap(const char *fileName, map<string, objT> &mapObject
 template vector<SpfInterval*>& getObjectForFileFromMap(const char *fileName, map<string, vector<SpfInterval*>>&);
 template PredictorStats& getObjectForFileFromMap(const char *fileName, map<string, PredictorStats>&);
 
-SgSymbol* getFromModule(const map<string, set<SgSymbol*>> &byUse, SgSymbol *orig, bool processAsModule)
-{
-    if (!processAsModule)
-    {
-        checkNull(orig->scope(), convertFileName(__FILE__).c_str(), __LINE__);
-        if (orig->scope()->variant() != MODULE_STMT)
-            return orig;
-    }
-
-    if (byUse.size())
-    {
-        for (auto& elem : byUse) 
-        {
-            for (auto& localS : setToMapWithSortByStr(elem.second))
-                if (OriginalSymbol(localS.second)->thesymb == orig->thesymb)
-                    return localS.second;
-        }
-    }
-    return orig;
-}
-
-map<string, set<string>> createMapOfModuleUses(SgFile *file)
-{
-	map<string, set<string>> retValMap;
-
-	vector<SgStatement*> modules;
-	findModulesInFile(file, modules);
-
-	for (int z = 0; z < modules.size(); ++z)
-	{
-		SgStatement *curr = modules[z];
-        string modName = curr->symbol()->identifier();
-        for (SgStatement *st = curr->lexNext(); st != curr->lastNodeOfStmt(); st = st->lexNext())
-        {
-            if (st->variant() == USE_STMT)
-                retValMap[modName].insert(st->symbol()->identifier());
-            else if (st->variant() == PROC_HEDR || st->variant() == FUNC_HEDR)
-                break;
-        }
-	}
-
-    bool repeat = true;
-    while (repeat)
-    {
-        repeat = false;
-        for (auto &elem : retValMap)
-        {
-            set<string> toAdd(elem.second);
-            for (auto &inUse : elem.second)
-            {
-                auto it = retValMap.find(inUse);
-                if (it != retValMap.end())
-                {
-                    for (auto &inUseToAdd : it->second)
-                    {
-                        if (toAdd.find(inUseToAdd) == toAdd.end())
-                        {
-                            toAdd.insert(inUseToAdd);
-                            repeat = true;
-                        }
-                    }
-                }
-            }
-            elem.second = toAdd;
-        }
-    }
-
-    return retValMap;
-}
-
 void printSymbolTable(SgFile *file, string filter, const set<int>& vars)
 {
     for (auto s = file->firstSymbol(); s; s = s->next())
@@ -2574,96 +2464,6 @@ SgStatement* duplicateProcedure(SgStatement *toDup, const string *newName, bool
     return toMove;
 }
 
-void fillModuleUse(SgFile *file, map<string, set<string>> &moduleUses, map<string, string> &moduleDecls)
-{
-    const string currFN = file->filename();
-    for (SgStatement* st = file->firstStatement(); st; st = st->lexNext())
-    {
-        if (st->fileName() == currFN)
-        {
-            if (st->variant() == USE_STMT)
-                moduleUses[currFN].insert(st->symbol()->identifier());
-
-            if (st->variant() == MODULE_STMT)
-            {
-                string moduleN = st->symbol()->identifier();
-                auto it = moduleDecls.find(moduleN);
-                if (it != moduleDecls.end())
-                    printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-                moduleDecls[moduleN] = currFN;
-            }
-        }
-    }
-}
-
-void filterModuleUse(map<string, set<string>>& moduleUsesByFile, map<string, string>& moduleDecls)
-{
-    for (auto& elem : moduleUsesByFile)
-    {
-        set<string> newSet;
-        for (auto& setElem : elem.second)
-        {
-            auto it = moduleDecls.find(setElem);
-            if (it == moduleDecls.end())
-                newSet.insert(setElem);
-            else if (elem.first != it->second)
-                newSet.insert(setElem);
-        }
-        elem.second = newSet;
-    }
-
-    /*map<string, set<string>> modIncludeMod;
-
-    for (auto& mod : moduleDecls)
-    {
-        string name = mod.first;
-        string file = mod.second;
-
-        auto it = moduleUsesByFile.find(file);
-        if (it != moduleUsesByFile.end())
-            modIncludeMod[name] = it->second;
-    }
-
-    bool change = true;
-    while (change)
-    {
-        change = false;
-        for (auto& mod : modIncludeMod)
-        {
-            set<string> newSet = mod.second;
-            for (auto& included : mod.second)
-            {
-                auto it = modIncludeMod.find(included);
-                if (it == modIncludeMod.end())
-                    continue;
-
-                for (auto& elem : it->second)
-                {
-                    if (newSet.find(elem) == newSet.end())
-                    {
-                        newSet.insert(elem);
-                        change = true;
-                    }
-                }
-            }
-            mod.second = newSet;
-        }
-    }
-
-    for (auto& elem : moduleUsesByFile)
-    {
-        set<string> newSet = elem.second;
-        for (auto& setElem : elem.second)
-        {
-            auto it = modIncludeMod.find(setElem);
-            if (it != modIncludeMod.end())
-                for (auto& toRem : it->second)
-                    newSet.erase(toRem);
-        }
-        elem.second = newSet;
-    }*/
-}
-
 SgExpression* makeExprList(const vector<SgExpression*>& items, bool withSort)
 {
     SgExpression* list = NULL;
@@ -2847,59 +2647,6 @@ int getNextFreeLabel()
     return -1;
 }
 
-static void addUseStatements(SgStatement* currF, SgStatement* obj, vector<SgStatement*>& useStats,
-                             const vector<SgStatement*>& funcContains)
-{
-    for (auto& funcSt : funcContains)
-    {
-        if (currF == funcSt)
-        {
-            SgStatement* last = obj->lastNodeOfStmt();
-            for (SgStatement* st = obj->lexNext(); st != last; st = st->lexNext())
-            {
-                if (st->variant() == USE_STMT)
-                    useStats.push_back(st);
-                else if (st->variant() == CONTAINS_STMT)
-                    break;
-            }
-            break;
-        }
-    }
-}
-
-void fillUsedModulesInFunction(SgStatement *st, vector<SgStatement*> &useStats)
-{
-    checkNull(st, convertFileName(__FILE__).c_str(), __LINE__);
-
-    int var = st->variant();
-    while (var != PROG_HEDR && var != PROC_HEDR && var != FUNC_HEDR)
-    {
-        st = st->controlParent();
-        checkNull(st, convertFileName(__FILE__).c_str(), __LINE__);
-        var = st->variant();
-    }
-
-    for (SgStatement *stat = st->lexNext(); !isSgExecutableStatement(stat); stat = stat->lexNext())
-        if (stat->variant() == USE_STMT)
-            useStats.push_back(stat);
-
-    for (int i = 0; i < current_file->numberOfFunctions(); ++i)
-    {
-        vector<SgStatement*> funcContains;
-        findContainsFunctions(current_file->functions(i), funcContains);
-        addUseStatements(st, current_file->functions(i), useStats, funcContains);        
-    }
-
-    vector<SgStatement*> modules;
-    findModulesInFile(st->getFile(), modules);
-    for (auto &module : modules)
-    {
-        vector<SgStatement*> funcContains;
-        findContainsFunctions(module, funcContains, true);
-        addUseStatements(st, module, useStats, funcContains);
-    }
-}
-
 static void recFillUsedVars(SgExpression *exp, map<string, SgSymbol*> &vars)
 {
     if (exp)
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h
index ff889c0..5ce6d38 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h
@@ -5,6 +5,7 @@
 #include "../Distribution/Distribution.h"
 #include "../GraphCall/graph_calls.h"
 #include "../DynamicAnalysis/gcov_info.h"
+#include "module_utils.h"
 
 SgStatement* declaratedInStmt(SgSymbol *toFind, std::vector<SgStatement*> *allDecls = NULL, bool printInternal = true, SgStatement* scope = NULL);
 
@@ -15,8 +16,7 @@ std::string removeIncludeStatsAndUnparse(SgFile *file, const char *fileName, con
 SgSymbol* findSymbolOrCreate(SgFile *file, const std::string toFind, SgType *type = NULL, SgStatement *scope = NULL);
 void recExpressionPrint(SgExpression *exp);
 void removeSubstrFromStr(std::string &str, const std::string &del);
-void getModulesAndFunctions(SgFile *file, std::vector<SgStatement*> &modulesAndFunctions);
-void findModulesInFile(SgFile *file, std::vector<SgStatement*> &modules);
+
 void tryToFindPrivateInAttributes(SgStatement* st, std::set<std::string>& privatesVars, bool onlyReduction = false, bool onlyUsers = false);
 
 void fillNonDistrArraysAsPrivate(SgStatement *st,
@@ -60,15 +60,11 @@ const CommonBlock* isArrayInCommon(const std::map<std::string, CommonBlock*> &co
 
 std::vector<DIST::Array*> fillArraysFromDir(Statement *st);
 
-SgSymbol* getFromModule(const std::map<std::string, std::set<SgSymbol*>> &byUse, SgSymbol *orig, bool processAsModule = false);
-std::map<std::string, std::set<std::string>> createMapOfModuleUses(SgFile* file);
 void printSymbolTable(SgFile* file, std::string filter = "", const std::set<int>& vars = {});
 SgStatement* getFuncStat(SgStatement *st, const std::set<int> additional = std::set<int>());
 std::map<SgStatement*, std::vector<DefUseList>> createDefUseMapByPlace();
 SgStatement* duplicateProcedure(SgStatement* toDup, const std::string* newName, bool withAttributes = false, bool withComment = false, bool withSameLines = true, bool dontInsert = false);
 
-void fillModuleUse(SgFile* file, std::map<std::string, std::set<std::string>>& moduleUses, std::map<std::string, std::string>& moduleDecls);
-void filterModuleUse(std::map<std::string, std::set<std::string>>& moduleUses, std::map<std::string, std::string>& moduleDecls);
 SgExpression* makeExprList(const std::vector<SgExpression*>& items, bool withSort = true);
 std::string unparseProjectToString(SgFile* file, const int curr_regime);
 
@@ -77,7 +73,6 @@ std::vector<SgStatement*> makeDeclaration(const std::vector<SgSymbol*>& symbolsT
 
 int getNextFreeLabel();
 
-void fillUsedModulesInFunction(SgStatement *st, std::vector<SgStatement*> &useStats);
 void fillVisibleInUseVariables(SgStatement *useSt, std::map<std::string, SgSymbol*> &vars);
 
 std::string preprocDataString(std::string data, bool full = true);
@@ -91,7 +86,13 @@ void getVariables(SgExpression* ex, std::set<SgSymbol*>& variables, const std::s
 template<typename T>
 std::set<T> getAllVariables(SgStatement* stFrom, SgStatement* stTo, const std::set<int>& variants);
 
-SgProject* createProject(const char* proj_name, std::vector<ParallelRegion*>& parallelRegions, std::vector<ParallelRegion*>& subs_parallelRegions, std::map<std::string, std::vector<SgStatement*>>& hiddenData, std::map<std::string, int>& filesNameWithoutExt, std::map<std::string, std::set<std::string>>& moduleUsesByFile, std::map<std::string, std::string>& moduleDecls, std::map<std::string, std::map<SgStatement*, std::vector<SgStatement*>>>& exctactedModuleStats, bool printSymbTable);
+SgProject* createProject(const char* proj_name, std::vector<ParallelRegion*>& parallelRegions, 
+                         std::vector<ParallelRegion*>& subs_parallelRegions,
+                         std::map<std::string, std::vector<SgStatement*>>& hiddenData, 
+                         std::map<std::string, int>& filesNameWithoutExt, 
+                         std::map<std::string, std::set<std::string>>& moduleUsesByFile,
+                         std::map<std::string, std::string>& moduleDecls, 
+                         std::map<std::string, std::map<SgStatement*, std::vector<SgStatement*>>>& exctactedModuleStats, bool printSymbTable);
 
 bool isArrayType(SgType* type);
 bool isArrayRef(SgExpression* ex);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
new file mode 100644
index 0000000..99df6ba
--- /dev/null
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
@@ -0,0 +1,676 @@
+
+#include <vector>
+#include <set>
+#include <map>
+#include <string>
+
+#include "dvm.h"
+#include "errors.h"
+#include "utils.h"
+#include "../GraphCall/graph_calls_func.h"
+
+#include "module_utils.h"
+
+using std::vector;
+using std::set;
+using std::string;
+using std::map;
+using std::pair;
+using std::make_pair;
+
+void findModulesInFile(SgFile* file, vector<SgStatement*>& modules)
+{
+    SgStatement* first = file->firstStatement();
+    set<SgStatement*> functions;
+
+    int funcNum = file->numberOfFunctions();
+    for (int i = 0; i < funcNum; ++i)
+        functions.insert(file->functions(i));
+
+    while (first)
+    {
+        if (first->variant() == MODULE_STMT)
+        {
+            modules.push_back(first);
+            first = first->lastNodeOfStmt();
+        }
+        else
+        {
+            if (functions.size())
+            {
+                auto it = functions.find(first);
+                if (it != functions.end())
+                    first = (*it)->lastNodeOfStmt();
+            }
+        }
+
+        first = first->lexNext();
+    }
+}
+
+void getModulesAndFunctions(SgFile* file, vector<SgStatement*>& modulesAndFunctions)
+{
+    findModulesInFile(file, modulesAndFunctions);
+
+    int funcNum = file->numberOfFunctions();
+    for (int i = 0; i < funcNum; ++i)
+        modulesAndFunctions.push_back(file->functions(i));
+}
+
+SgSymbol* getFromModule(const map<string, set<SgSymbol*>>& byUse, SgSymbol* orig, bool processAsModule)
+{
+    if (!processAsModule)
+    {
+        checkNull(orig->scope(), convertFileName(__FILE__).c_str(), __LINE__);
+        if (orig->scope()->variant() != MODULE_STMT)
+            return orig;
+    }
+
+    if (byUse.size())
+    {
+        for (auto& elem : byUse)
+        {
+            for (auto& localS : setToMapWithSortByStr(elem.second))
+                if (OriginalSymbol(localS.second)->thesymb == orig->thesymb)
+                    return localS.second;
+        }
+    }
+    return orig;
+}
+
+map<string, set<string>> createMapOfModuleUses(SgFile* file)
+{
+    map<string, set<string>> retValMap;
+
+    vector<SgStatement*> modules;
+    findModulesInFile(file, modules);
+
+    for (int z = 0; z < modules.size(); ++z)
+    {
+        SgStatement* curr = modules[z];
+        string modName = curr->symbol()->identifier();
+        for (SgStatement* st = curr->lexNext(); st != curr->lastNodeOfStmt(); st = st->lexNext())
+        {
+            if (st->variant() == USE_STMT)
+                retValMap[modName].insert(st->symbol()->identifier());
+            else if (st->variant() == PROC_HEDR || st->variant() == FUNC_HEDR)
+                break;
+        }
+    }
+
+    bool repeat = true;
+    while (repeat)
+    {
+        repeat = false;
+        for (auto& elem : retValMap)
+        {
+            set<string> toAdd(elem.second);
+            for (auto& inUse : elem.second)
+            {
+                auto it = retValMap.find(inUse);
+                if (it != retValMap.end())
+                {
+                    for (auto& inUseToAdd : it->second)
+                    {
+                        if (toAdd.find(inUseToAdd) == toAdd.end())
+                        {
+                            toAdd.insert(inUseToAdd);
+                            repeat = true;
+                        }
+                    }
+                }
+            }
+            elem.second = toAdd;
+        }
+    }
+
+    return retValMap;
+}
+
+void fillModuleUse(SgFile* file, map<string, set<string>>& moduleUses, map<string, string>& moduleDecls)
+{
+    const string currFN = file->filename();
+    for (SgStatement* st = file->firstStatement(); st; st = st->lexNext())
+    {
+        if (st->fileName() == currFN)
+        {
+            if (st->variant() == USE_STMT)
+                moduleUses[currFN].insert(st->symbol()->identifier());
+
+            if (st->variant() == MODULE_STMT)
+            {
+                string moduleN = st->symbol()->identifier();
+                auto it = moduleDecls.find(moduleN);
+                if (it != moduleDecls.end())
+                    printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+                moduleDecls[moduleN] = currFN;
+            }
+        }
+    }
+}
+
+void filterModuleUse(map<string, set<string>>& moduleUsesByFile, map<string, string>& moduleDecls)
+{
+    for (auto& elem : moduleUsesByFile)
+    {
+        set<string> newSet;
+        for (auto& setElem : elem.second)
+        {
+            auto it = moduleDecls.find(setElem);
+            if (it == moduleDecls.end())
+                newSet.insert(setElem);
+            else if (elem.first != it->second)
+                newSet.insert(setElem);
+        }
+        elem.second = newSet;
+    }
+
+    /*map<string, set<string>> modIncludeMod;
+
+    for (auto& mod : moduleDecls)
+    {
+        string name = mod.first;
+        string file = mod.second;
+
+        auto it = moduleUsesByFile.find(file);
+        if (it != moduleUsesByFile.end())
+            modIncludeMod[name] = it->second;
+    }
+
+    bool change = true;
+    while (change)
+    {
+        change = false;
+        for (auto& mod : modIncludeMod)
+        {
+            set<string> newSet = mod.second;
+            for (auto& included : mod.second)
+            {
+                auto it = modIncludeMod.find(included);
+                if (it == modIncludeMod.end())
+                    continue;
+
+                for (auto& elem : it->second)
+                {
+                    if (newSet.find(elem) == newSet.end())
+                    {
+                        newSet.insert(elem);
+                        change = true;
+                    }
+                }
+            }
+            mod.second = newSet;
+        }
+    }
+
+    for (auto& elem : moduleUsesByFile)
+    {
+        set<string> newSet = elem.second;
+        for (auto& setElem : elem.second)
+        {
+            auto it = modIncludeMod.find(setElem);
+            if (it != modIncludeMod.end())
+                for (auto& toRem : it->second)
+                    newSet.erase(toRem);
+        }
+        elem.second = newSet;
+    }*/
+}
+
+static void addUseStatements(SgStatement* currF, SgStatement* obj, vector<SgStatement*>& useStats,
+    const vector<SgStatement*>& funcContains)
+{
+    for (auto& funcSt : funcContains)
+    {
+        if (currF == funcSt)
+        {
+            SgStatement* last = obj->lastNodeOfStmt();
+            for (SgStatement* st = obj->lexNext(); st != last; st = st->lexNext())
+            {
+                if (st->variant() == USE_STMT)
+                    useStats.push_back(st);
+                else if (st->variant() == CONTAINS_STMT)
+                    break;
+            }
+            break;
+        }
+    }
+}
+
+void fillUsedModulesInFunction(SgStatement* st, vector<SgStatement*>& useStats)
+{
+    checkNull(st, convertFileName(__FILE__).c_str(), __LINE__);
+
+    int var = st->variant();
+    while (var != PROG_HEDR && var != PROC_HEDR && var != FUNC_HEDR)
+    {
+        st = st->controlParent();
+        checkNull(st, convertFileName(__FILE__).c_str(), __LINE__);
+        var = st->variant();
+    }
+
+    for (SgStatement* stat = st->lexNext(); !isSgExecutableStatement(stat); stat = stat->lexNext())
+        if (stat->variant() == USE_STMT)
+            useStats.push_back(stat);
+
+    for (int i = 0; i < current_file->numberOfFunctions(); ++i)
+    {
+        vector<SgStatement*> funcContains;
+        findContainsFunctions(current_file->functions(i), funcContains);
+        addUseStatements(st, current_file->functions(i), useStats, funcContains);
+    }
+
+    vector<SgStatement*> modules;
+    findModulesInFile(st->getFile(), modules);
+    for (auto& module : modules)
+    {
+        vector<SgStatement*> funcContains;
+        findContainsFunctions(module, funcContains, true);
+        addUseStatements(st, module, useStats, funcContains);
+    }
+}
+
+static void findByUse(map<string, vector<pair<SgSymbol*, SgSymbol*>>>& modByUse, const string& varName,
+    const set<string>& locNames, vector<string>& altNames)
+{
+    for (auto& elem : modByUse)
+    {
+        if (locNames.count(elem.first))
+        {
+            for (auto& byUse : elem.second)
+            {
+                SgSymbol* toCmp = byUse.second ? byUse.second : byUse.first;
+                checkNull(toCmp, convertFileName(__FILE__).c_str(), __LINE__);
+                if (toCmp->identifier() == varName)
+                    altNames.push_back(byUse.first->identifier());
+            }
+        }
+    }
+}
+
+static void fillInfo(SgStatement* start,
+    set<string>& useMod,
+    map<string, vector<pair<SgSymbol*, SgSymbol*>>>& modByUse,
+    map<string, vector<pair<SgSymbol*, SgSymbol*>>>& modByUseOnly)
+{
+    for (SgStatement* st = start; st != start->lastNodeOfStmt(); st = st->lexNext())
+    {
+        if (isSgExecutableStatement(st))
+            break;
+        if (st->variant() == CONTAINS_STMT)
+            break;
+        if (st != start && (st->variant() == PROC_HEDR || st->variant() == FUNC_HEDR))
+            break;
+        fillUseStatement(st, useMod, modByUse, modByUseOnly);
+    }
+}
+
+static SgStatement* findModWithName(const vector<SgStatement*>& modules, const string& name)
+{
+    for (auto& elem : modules)
+        if (elem->variant() == MODULE_STMT)
+            if (elem->symbol()->identifier() == name)
+                return elem;
+    return NULL;
+}
+
+string getNameByUse(SgStatement* place, const string& varName, const string& locName)
+{
+    int old_id = -1;
+    string oldFileName = "";
+    if (place->getFileId() != current_file_id)
+    {
+        old_id = current_file_id;
+        oldFileName = current_file->filename();
+        if (!place->switchToFile())
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    }
+
+    SgStatement* func = getFuncStat(place, { MODULE_STMT });
+    string returnVal = varName;
+    if (func != NULL)
+    {
+        map<string, set<string>> graphUse;
+
+        set<string> useMod;
+        map<string, vector<pair<SgSymbol*, SgSymbol*>>> modByUse;
+        map<string, vector<pair<SgSymbol*, SgSymbol*>>> modByUseOnly;
+
+        fillInfo(func, useMod, modByUse, modByUseOnly);
+        SgStatement* cp = func->controlParent();
+        if (isSgProgHedrStmt(cp) || cp->variant() == MODULE_STMT) // if function in contains region
+            fillInfo(cp, useMod, modByUse, modByUseOnly);
+
+        set<string> useModDone;
+        bool needRepeat = true;
+
+        vector<SgStatement*> modules;
+        findModulesInFile(func->getFile(), modules);
+
+        while (needRepeat)
+        {
+            needRepeat = false;
+            set<string> newUseMod;
+            for (auto& useM : useMod)
+            {
+                if (useModDone.find(useM) == useModDone.end())
+                {
+                    auto modSt = findModWithName(modules, useM);
+                    if (modSt == NULL || useM == "dvmh_template_mod")
+                        continue;
+
+                    checkNull(modSt, convertFileName(__FILE__).c_str(), __LINE__);
+
+                    set<string> tmpUse;
+                    fillInfo(modSt, tmpUse, modByUse, modByUseOnly);
+                    useModDone.insert(useM);
+
+                    for (auto& use : tmpUse)
+                    {
+                        newUseMod.insert(use);
+
+                        if (use != "dvmh_template_mod")
+                            graphUse[use].insert(useM);
+                    }
+                }
+            }
+
+            for (auto& newU : newUseMod)
+            {
+                if (useModDone.find(newU) == useModDone.end())
+                {
+                    useModDone.insert(newU);
+                    needRepeat = true;
+                }
+            }
+        }
+
+        vector<string> altNames;
+        findByUse(modByUse, varName, { locName }, altNames);
+        findByUse(modByUseOnly, varName, { locName }, altNames);
+
+        if (altNames.size() == 0)
+        {
+            set<string> locations = { locName };
+            bool changed = true;
+            while (changed)
+            {
+                changed = false;
+                for (auto& loc : locations)
+                {
+                    if (graphUse.find(loc) != graphUse.end())
+                    {
+                        for (auto& use : graphUse[loc])
+                        {
+                            if (locations.find(use) == locations.end())
+                            {
+                                locations.insert(use);
+                                changed = true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            findByUse(modByUse, varName, locations, altNames);
+            findByUse(modByUseOnly, varName, locations, altNames);
+        }
+
+        if (altNames.size() == 0)
+            returnVal = varName;
+        else if (altNames.size() >= 1)
+        {
+            set<string> setAlt(altNames.begin(), altNames.end());
+            returnVal = *setAlt.begin();
+        }
+        else
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    }
+
+    if (old_id != -1)
+    {
+        if (SgFile::switchToFile(oldFileName) == -1)
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    }
+
+    return returnVal;
+}
+
+void fixUseOnlyStmt(SgFile *file, const vector<ParallelRegion*> &regs)
+{
+    for (int z = 0; z < file->numberOfFunctions(); ++z)
+    {
+        vector<SgStatement*> modules;
+        findModulesInFile(file, modules);
+        map<string, SgStatement*> mod;
+        for (auto &elem : modules)
+            mod[elem->symbol()->identifier()] = elem;
+
+        if (modules.size())
+        {
+            SgStatement *func = file->functions(z);
+            bool hasTemplateUse = false;
+            set<DIST::Array*> needToAdd;
+
+            for (auto st = func; st != func->lastNodeOfStmt(); st = st->lexNext())
+            {
+                if (isSgExecutableStatement(st))
+                    break;
+
+                if (st->variant() == USE_STMT)
+                {
+                    SgExpression *ex = st->expr(0);
+                    string modName = st->symbol()->identifier();
+
+                    auto it = mod.find(modName);
+                    if (modName == "dvmh_Template_Mod")
+                    {
+                        hasTemplateUse = true;
+                        break;
+                    }
+                        
+                    if (ex && ex->variant() == ONLY_NODE && it != mod.end())
+                    {
+                        set<string> allS;
+                        for (auto exI = ex->lhs(); exI; exI = exI->rhs())
+                        {
+                            if (exI->lhs()->variant() == RENAME_NODE)
+                            {
+                                if (exI->lhs()->lhs()->symbol())
+                                    allS.insert(exI->lhs()->lhs()->symbol()->identifier());
+                                if (exI->lhs()->rhs() && exI->lhs()->rhs()->symbol())
+                                    allS.insert(exI->lhs()->rhs()->symbol()->identifier());
+                            }
+                        }
+
+                        for (auto &parReg : regs)
+                        {
+                            const DataDirective &dataDir = parReg->GetDataDir();
+                            for (auto &rule : dataDir.distrRules)
+                            {
+                                DIST::Array *curr = rule.first;
+                                auto location = curr->GetLocation();
+                                if (location.first == 2 && location.second == modName)
+                                    needToAdd.insert(curr);
+                            }
+
+                            for (auto& rule : dataDir.alignRules)
+                            {
+                                DIST::Array* curr = rule.alignArray;
+                                auto location = curr->GetLocation();
+                                if (location.first == 2 && location.second == modName)
+                                    needToAdd.insert(curr);
+                            }
+                        }
+                    }
+                }
+            }
+
+            if (!hasTemplateUse && needToAdd.size())
+            {
+                SgStatement* useSt = new SgStatement(USE_STMT);
+                useSt->setSymbol(*findSymbolOrCreate(file, "dvmh_Template_Mod"));
+                useSt->setlineNumber(getNextNegativeLineNumber());
+
+                func->insertStmtAfter(*useSt, *func);
+            }
+        }
+    }
+}
+
+void fillUseStatement(SgStatement *st, set<string> &useMod,
+                      map<string, vector<pair<SgSymbol*, SgSymbol*>>> &modByUse,
+                      map<string, vector<pair<SgSymbol*, SgSymbol*>>> &modByUseOnly)
+{
+    if (st->variant() == USE_STMT)
+    {
+        SgExpression *ex = st->expr(0);
+        string modName = st->symbol()->identifier();
+        convertToLower(modName);
+        useMod.insert(modName);
+
+        if (ex)
+        {
+            SgExpression *start = ex;
+            bool only = false;
+            if (ex->variant() == ONLY_NODE)
+            {
+                start = ex->lhs();
+                only = true;
+            }
+
+            for (auto exI = start; exI; exI = exI->rhs())
+            {
+                if (exI->lhs()->variant() == RENAME_NODE)
+                {
+                    SgSymbol *left = NULL, *right = NULL;
+                    if (exI->lhs()->lhs()->symbol())
+                        left = exI->lhs()->lhs()->symbol();
+                    if (exI->lhs()->rhs() && exI->lhs()->rhs()->symbol())
+                        right = exI->lhs()->rhs()->symbol();
+                    if (only)
+                        modByUseOnly[modName].push_back(std::make_pair(left, right));
+                    else
+                        modByUse[modName].push_back(std::make_pair(left, right));
+                }
+            }
+        }
+    }
+}
+
+static void fillUseStmt(SgStatement* stat, map<string, set<SgSymbol*>>& byUse)
+{
+    if (stat->variant() != USE_STMT)
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    SgExpression* ex = stat->expr(0);
+    if (ex && ex->variant() == ONLY_NODE)
+    {
+        for (auto exI = ex->lhs(); exI; exI = exI->rhs())
+        {
+            if (exI->lhs()->variant() == RENAME_NODE)
+            {
+                SgExpression* ren = exI->lhs();
+                if (ren->lhs()->symbol() && ren->rhs() && ren->rhs()->symbol())
+                    byUse[ren->rhs()->symbol()->identifier()].insert(ren->lhs()->symbol());
+            }
+        }
+    }
+    else if (ex && ex->lhs())
+    {
+        for (auto exI = ex; exI; exI = exI->rhs())
+        {
+            if (exI->lhs()->variant() == RENAME_NODE)
+            {
+                SgExpression* ren = exI->lhs();
+                if (ren->lhs()->symbol() && ren->rhs() && ren->rhs()->symbol())
+                    byUse[ren->rhs()->symbol()->identifier()].insert(ren->lhs()->symbol());
+            }
+        }
+    }
+}
+
+map<string, set<SgSymbol*>> moduleRefsByUseInFunction(SgStatement* stIn)
+{
+    checkNull(stIn, convertFileName(__FILE__).c_str(), __LINE__);
+
+    map<string, set<SgSymbol*>> byUse;
+    int var = stIn->variant();
+    while (var != PROG_HEDR && var != PROC_HEDR && var != FUNC_HEDR)
+    {
+        stIn = stIn->controlParent();
+        if (stIn == NULL)
+            return byUse;
+        var = stIn->variant();
+    }
+
+    auto mapOfUses = createMapOfModuleUses(stIn->getFile());
+    set<string> useMods;
+
+    for (SgStatement* stat = stIn->lexNext(); !isSgExecutableStatement(stat); stat = stat->lexNext())
+    {
+        if (stat->variant() == USE_STMT)
+        {
+            fillUseStmt(stat, byUse);
+            useMods.insert(stat->symbol()->identifier());
+        }
+    }
+
+    const int cpOfSt = stIn->controlParent()->variant();
+    //contains of func
+    if (cpOfSt == PROG_HEDR || cpOfSt == PROC_HEDR || cpOfSt == FUNC_HEDR)
+    {
+        for (SgStatement* stat = stIn->controlParent()->lexNext(); !isSgExecutableStatement(stat); stat = stat->lexNext())
+        {
+            if (stat->variant() == USE_STMT)
+            {
+                fillUseStmt(stat, byUse);
+                useMods.insert(stat->symbol()->identifier());
+            }
+        }
+    }
+
+    bool chages = true;
+    while (chages)
+    {
+        chages = false;
+        set<string> newUseMods(useMods);
+        for (auto& elem : useMods)
+        {
+            auto it = mapOfUses.find(elem);
+            if (it != mapOfUses.end())
+            {
+                for (auto& elem2 : it->second)
+                {
+                    if (newUseMods.find(elem2) == newUseMods.end())
+                    {
+                        newUseMods.insert(elem2);
+                        chages = true;
+                    }
+                }
+            }
+        }
+        useMods = newUseMods;
+    }
+
+    vector<SgStatement*> modules;
+    findModulesInFile(stIn->getFile(), modules);
+    for (auto& mod : modules)
+    {
+        if (useMods.find(mod->symbol()->identifier()) != useMods.end())
+        {
+            for (SgStatement* stat = mod->lexNext(); stat != mod->lastNodeOfStmt(); stat = stat->lexNext())
+            {
+                const int var = stat->variant();
+                if (var == USE_STMT)
+                {
+                    fillUseStmt(stat, byUse);
+                    useMods.insert(stat->symbol()->identifier());
+                }
+                else if (var == PROC_HEDR || var == FUNC_HEDR)
+                    break;
+            }
+        }
+    }
+    return byUse;
+}
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index bbc2467..94a1911 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2388"
+#define VERSION_SPF "2389"
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/CorrectVarDecl.cpp b/sapfor/experts/Sapfor_2017/_src/VerificationCode/CorrectVarDecl.cpp
index 69d2607..96625f0 100644
--- a/sapfor/experts/Sapfor_2017/_src/VerificationCode/CorrectVarDecl.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/VerificationCode/CorrectVarDecl.cpp
@@ -60,128 +60,6 @@ void VarDeclCorrecter(SgFile *file)
     }
 }
 
-void fixUseOnlyStmt(SgFile *file, const vector<ParallelRegion*> &regs)
-{
-    for (int z = 0; z < file->numberOfFunctions(); ++z)
-    {
-        vector<SgStatement*> modules;
-        findModulesInFile(file, modules);
-        map<string, SgStatement*> mod;
-        for (auto &elem : modules)
-            mod[elem->symbol()->identifier()] = elem;
-
-        if (modules.size())
-        {
-            SgStatement *func = file->functions(z);
-            bool hasTemplateUse = false;
-            set<DIST::Array*> needToAdd;
-
-            for (auto st = func; st != func->lastNodeOfStmt(); st = st->lexNext())
-            {
-                if (isSgExecutableStatement(st))
-                    break;
-
-                if (st->variant() == USE_STMT)
-                {
-                    SgExpression *ex = st->expr(0);
-                    string modName = st->symbol()->identifier();
-
-                    auto it = mod.find(modName);
-                    if (modName == "dvmh_Template_Mod")
-                    {
-                        hasTemplateUse = true;
-                        break;
-                    }
-                        
-                    if (ex && ex->variant() == ONLY_NODE && it != mod.end())
-                    {
-                        set<string> allS;
-                        for (auto exI = ex->lhs(); exI; exI = exI->rhs())
-                        {
-                            if (exI->lhs()->variant() == RENAME_NODE)
-                            {
-                                if (exI->lhs()->lhs()->symbol())
-                                    allS.insert(exI->lhs()->lhs()->symbol()->identifier());
-                                if (exI->lhs()->rhs() && exI->lhs()->rhs()->symbol())
-                                    allS.insert(exI->lhs()->rhs()->symbol()->identifier());
-                            }
-                        }
-
-                        for (auto &parReg : regs)
-                        {
-                            const DataDirective &dataDir = parReg->GetDataDir();
-                            for (auto &rule : dataDir.distrRules)
-                            {
-                                DIST::Array *curr = rule.first;
-                                auto location = curr->GetLocation();
-                                if (location.first == 2 && location.second == modName)
-                                    needToAdd.insert(curr);
-                            }
-
-                            for (auto& rule : dataDir.alignRules)
-                            {
-                                DIST::Array* curr = rule.alignArray;
-                                auto location = curr->GetLocation();
-                                if (location.first == 2 && location.second == modName)
-                                    needToAdd.insert(curr);
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (!hasTemplateUse && needToAdd.size())
-            {
-                SgStatement* useSt = new SgStatement(USE_STMT);
-                useSt->setSymbol(*findSymbolOrCreate(file, "dvmh_Template_Mod"));
-                useSt->setlineNumber(getNextNegativeLineNumber());
-
-                func->insertStmtAfter(*useSt, *func);
-            }
-        }
-    }
-}
-
-void fillUseStatement(SgStatement *st, set<string> &useMod,
-                      map<string, vector<pair<SgSymbol*, SgSymbol*>>> &modByUse,
-                      map<string, vector<pair<SgSymbol*, SgSymbol*>>> &modByUseOnly)
-{
-    if (st->variant() == USE_STMT)
-    {
-        SgExpression *ex = st->expr(0);
-        string modName = st->symbol()->identifier();
-        convertToLower(modName);
-        useMod.insert(modName);
-
-        if (ex)
-        {
-            SgExpression *start = ex;
-            bool only = false;
-            if (ex->variant() == ONLY_NODE)
-            {
-                start = ex->lhs();
-                only = true;
-            }
-
-            for (auto exI = start; exI; exI = exI->rhs())
-            {
-                if (exI->lhs()->variant() == RENAME_NODE)
-                {
-                    SgSymbol *left = NULL, *right = NULL;
-                    if (exI->lhs()->lhs()->symbol())
-                        left = exI->lhs()->lhs()->symbol();
-                    if (exI->lhs()->rhs() && exI->lhs()->rhs()->symbol())
-                        right = exI->lhs()->rhs()->symbol();
-                    if (only)
-                        modByUseOnly[modName].push_back(std::make_pair(left, right));
-                    else
-                        modByUse[modName].push_back(std::make_pair(left, right));
-                }
-            }
-        }
-    }
-}
-
 struct ModuleInfo
 {
     set<string> useMod;
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/verifications.h b/sapfor/experts/Sapfor_2017/_src/VerificationCode/verifications.h
index 65a6fc5..ae62d4f 100644
--- a/sapfor/experts/Sapfor_2017/_src/VerificationCode/verifications.h
+++ b/sapfor/experts/Sapfor_2017/_src/VerificationCode/verifications.h
@@ -38,7 +38,6 @@ void resolveFunctionCalls(SgFile* file, const std::set<std::string>& toResolve,
 bool checkAndMoveFormatOperators(SgFile* file, std::vector<Messages> &currMessage, bool withError = true);
 
 int VerifyFile(SgFile *file);
-void fixUseOnlyStmt(SgFile *file, const std::vector<ParallelRegion*> &regs);
 void correctModuleProcNames(SgFile *file, const std::set<std::string>& globalF);
 void correctModuleSymbols(SgFile *file);
 void replaceStructuresToSimpleTypes(SgFile* file);
@@ -48,7 +47,6 @@ bool checkArgumentsDeclaration(SgProject *project, const std::map<std::string, s
 void replaceDerivedAssigns(SgFile *file, SgStatement *stToCopy, SgStatement *insertB, const std::map<std::string, SgStatement*> &derivedTypesDecl);
 bool isDerivedAssign(SgStatement *st);
 std::map<std::string, SgStatement*> createDerivedTypeDeclMap(SgStatement *forS);
-void fillUseStatement(SgStatement* st, std::set<std::string>& useMod, std::map<std::string, std::vector<std::pair<SgSymbol*, SgSymbol*>>>& modByUse, std::map<std::string, std::vector<std::pair<SgSymbol*, SgSymbol*>>>& modByUseOnly);
 void removeExecutableFromModuleDeclaration(SgFile* current, const std::set<std::string>& filesInProj, std::vector<SgStatement*>& hiddenData);
 bool needToReplaceInterfaceName(SgStatement* interf);
 

From 83a303cc306bc8a8149dd2a520c8cba34505db98 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Thu, 13 Feb 2025 16:37:24 +0300
Subject: [PATCH 15/44] fixed implicit

---
 .../_src/Transformations/set_implicit_none.cpp      |  5 ++++-
 .../experts/Sapfor_2017/_src/Utils/module_utils.h   | 13 +++++++++++++
 sapfor/experts/Sapfor_2017/_src/Utils/version.h     |  2 +-
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h

diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.cpp b/sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.cpp
index 32d1c19..8407685 100644
--- a/sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.cpp
@@ -51,12 +51,15 @@ static void FindAllVars(SgExpression* expr, set<SgSymbol*>& allVars, set<SgSymbo
     {
         auto s = expr->symbol(); 
         const string ident(s->identifier());
+        const int s_var = s->variant();
+
         if (var == FUNC_CALL /*(s->attributes() & EXTERNAL_BIT)*/)
         {
             if (!IS_BY_USE(s) && ident.find("::") == string::npos /* && s->scope() == scope*/)
                 allVars.insert(s);
         }
-        else
+        else if (s_var != CONSTRUCT_NAME ||
+                 s_var == VARIABLE_NAME)
         {
             if (!IS_BY_USE(s) && ident.find("::") == string::npos && s->scope() == scope)
                 allVars.insert(s);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
new file mode 100644
index 0000000..e0e14a5
--- /dev/null
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
@@ -0,0 +1,13 @@
+#pragma once
+
+void getModulesAndFunctions(SgFile* file, std::vector<SgStatement*>& modulesAndFunctions);
+void findModulesInFile(SgFile* file, std::vector<SgStatement*>& modules);
+SgSymbol* getFromModule(const std::map<std::string, std::set<SgSymbol*>>& byUse, SgSymbol* orig, bool processAsModule = false);
+std::map<std::string, std::set<std::string>> createMapOfModuleUses(SgFile* file);
+void fillModuleUse(SgFile* file, std::map<std::string, std::set<std::string>>& moduleUses, std::map<std::string, std::string>& moduleDecls);
+void filterModuleUse(std::map<std::string, std::set<std::string>>& moduleUses, std::map<std::string, std::string>& moduleDecls);
+void fillUsedModulesInFunction(SgStatement* st, std::vector<SgStatement*>& useStats);
+std::string getNameByUse(SgStatement* place, const std::string& varName, const std::string& locName);
+void fillUseStatement(SgStatement* st, std::set<std::string>& useMod, std::map<std::string, std::vector<std::pair<SgSymbol*, SgSymbol*>>>& modByUse, std::map<std::string, std::vector<std::pair<SgSymbol*, SgSymbol*>>>& modByUseOnly);
+void fixUseOnlyStmt(SgFile* file, const std::vector<ParallelRegion*>& regs);
+std::map<std::string, std::set<SgSymbol*>> moduleRefsByUseInFunction(SgStatement* stIn);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 94a1911..a6610ad 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2389"
+#define VERSION_SPF "2390"

From 6b0eaab96d1f8c3c80a19b4c4bec521c59149b80 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Tue, 18 Feb 2025 13:45:20 +0300
Subject: [PATCH 16/44] improved module analysis

---
 .../DirectiveProcessing/directive_creator.cpp |   5 +-
 .../DirectiveProcessing/insert_directive.cpp  |  27 ++-
 .../DirectiveProcessing/remote_access.cpp     |  20 +--
 .../_src/DirectiveProcessing/shadow.cpp       |   7 +-
 .../Sapfor_2017/_src/Distribution/Array.h     |   3 +
 .../_src/Distribution/DvmhDirective.cpp       |  27 ++-
 .../_src/DvmhRegions/DvmhRegionInserter.cpp   |   4 +-
 .../Sapfor_2017/_src/Utils/module_utils.cpp   | 170 ++++++++----------
 .../Sapfor_2017/_src/Utils/module_utils.h     |   1 -
 .../experts/Sapfor_2017/_src/Utils/version.h  |   2 +-
 10 files changed, 113 insertions(+), 153 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.cpp b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.cpp
index e9e804d..2bd6d86 100644
--- a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.cpp
@@ -90,8 +90,7 @@ pair<vector<Directive*>, vector<Directive*>>
                        const pair<int, int> linesBeforeAfter)
 {
     vector<vector<pair<string, vector<Expression*>>>> optimizedRules(2);
-    auto byUse = moduleRefsByUseInFunction(st->GetOriginal());
-
+    
     for (int num = 0; num < 2; ++num)
     {
         for (auto &elemPair : sortArraysByName(usedArrays))
@@ -108,7 +107,7 @@ pair<vector<Directive*>, vector<Directive*>>
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
             
             vector<Expression*> realign = { NULL, NULL, NULL, NULL, NULL };
-            SgVarRefExp *ref = new SgVarRefExp(getFromModule(byUse, findSymbolOrCreate(file, elem->GetShortName())));
+            SgVarRefExp *ref = new SgVarRefExp((SgSymbol*)elem->GetNameInLocationS(st));
 
             realign[0] = new Expression(ref);
             SgExprListExp *list = new SgExprListExp();
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp
index 642a5b7..68c20ac 100644
--- a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp
@@ -839,7 +839,7 @@ static pair<string, string> getModuleRename(const set<SgStatement*>& allocatable
         set<string> arrayNames;
         for (auto& alloc : allocatableStmts)
             if (alloc->variant() == ALLOCATE_STMT)
-                arrayNames.insert(getNameByUse(alloc, array->GetShortName(), array->GetLocation().second));
+                arrayNames.insert(array->GetNameInLocation(alloc));
 
         if (arrayNames.size() > 1 || arrayNames.size() == 0)
             printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
@@ -1397,15 +1397,24 @@ static set<SgStatement*> filterAllocateStats(SgFile* file, const vector<SgStatem
             if (!stat->switchToFile())
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-        auto byUse = moduleRefsByUseInFunction(stat);
-        for (auto &elem : byUse)
-            if (elem.first == array)
-                for (auto &newElem : elem.second)
-                    arraySyns.insert(newElem->identifier());
+        SgExpression* list = stat->expr(0);
+        bool find = false;
+        while (list)
+        {
+            if (list->lhs() && list->lhs()->symbol())
+            {
+                if (OriginalSymbol(list->lhs()->symbol())->identifier() == array)
+                {
+                    find = true;
+                    break;
+                }
+            }
 
-        for (auto &syns : arraySyns)
-            if (recSymbolFind(stat->expr(0), syns, ARRAY_REF))
-                filtered.insert(stat);
+            list = list->rhs();
+        }
+
+        if (find)
+            filtered.insert(stat);
 
         SgFile::switchToFile(fileName);
     }
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp
index 67e35a1..5e3ae08 100644
--- a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp
@@ -780,6 +780,8 @@ void addRemoteLink(const LoopGraph* loop, const map<string, FuncInfo*>& funcMap,
         while (withDir && withDir->loop->GetOriginal()->lexPrev()->variant() != DVM_PARALLEL_ON_DIR)
             withDir = withDir->parent;
 
+        checkNull(withDir, convertFileName(__FILE__).c_str(), __LINE__);
+
         set<string> loopVars;
         for (auto& elem : withDir->directive->parallel)
             if (elem != "*")
@@ -871,8 +873,6 @@ ArrayRefExp* createRemoteLink(const LoopGraph* currLoop, const DIST::Array* forA
     const set<string> allFiles = getAllFilesInProject();
     SgStatement* realStat = (SgStatement*)currLoop->getRealStat(file->filename());
     const map<string, set<SgSymbol*>> byUseInFunc = moduleRefsByUseInFunction(realStat);
-    SgStatement* parentFunc = getFuncStat(realStat);
-    const pair<int, int> lineRange = make_pair(parentFunc->lineNumber(), parentFunc->lastNodeOfStmt()->lineNumber());
 
     SgExpression* ex = new SgExpression(EXPR_LIST);
     SgExpression* p = ex;
@@ -885,21 +885,7 @@ ArrayRefExp* createRemoteLink(const LoopGraph* currLoop, const DIST::Array* forA
             p = p->rhs();
         }
     }
-    SgArrayRefExp* newRem = NULL;
-
-    auto decls = forArray->GetDeclInfoWithSymb();
-    const string fName = current_file->filename();
-    /*for (auto& decl : decls)
-    {
-        if (decl.first.first == fName)
-        {
-            newRem = new SgArrayRefExp(*decl.second->GetOriginal(), *ex);
-            break;
-        }
-    }*/
-
-    if (!newRem)
-        newRem = new SgArrayRefExp(*getFromModule(byUseInFunc, forArray->GetDeclSymbol(fName, lineRange, allFiles)->GetOriginal()), *ex);
+    SgArrayRefExp* newRem = new SgArrayRefExp(*((SgSymbol*)forArray->GetNameInLocationS(realStat)), *ex);
     return new ArrayRefExp(newRem);
 }
 
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp
index aa895da..95f3a0e 100644
--- a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp
@@ -782,12 +782,7 @@ static void replacingShadowNodes(FuncInfo* currF)
                     
 
                     const ShadowElement& currElement = currSh.second[0];
-                     SgSymbol* s = currArray->GetDeclSymbol()->GetOriginal();
-                    if (currArray->IsModuleSymbol())
-                    {
-                        const map<string, set<SgSymbol*>> byUseInFunc = moduleRefsByUseInFunction(currF->funcPointer->GetOriginal());
-                        s = getFromModule(byUseInFunc, s);
-                    }
+                    SgSymbol* s = (SgSymbol*)currArray->GetNameInLocationS(currF->funcPointer);
 
                     //TODO: if moved from other file
                     /*auto itTmp = currElement.origNameByProc.find(currF);
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Array.h b/sapfor/experts/Sapfor_2017/_src/Distribution/Array.h
index 8380a6b..4d56db1 100644
--- a/sapfor/experts/Sapfor_2017/_src/Distribution/Array.h
+++ b/sapfor/experts/Sapfor_2017/_src/Distribution/Array.h
@@ -265,6 +265,9 @@ namespace Distribution
         int GetDimSize() const { return dimSize; }
         const STRING GetName() const { return name; }
         const STRING GetShortName() const { return shortName; }
+        const STRING GetNameInLocation(void* location) const; 
+        void* GetNameInLocationS(void* location) const;
+
         unsigned GetId() const { return id; }
         void SetSizes(VECTOR<PAIR<int, int>> &_sizes, bool notCopyToExpr = false) 
         { 
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp b/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
index 98be8c9..f2c6973 100644
--- a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
@@ -227,7 +227,7 @@ static vector<SgExpression*>
     compliteTieList(const LoopGraph* currLoop, const vector<LoopGraph*>& loops, 
                     const map<DIST::Array*, set<DIST::Array*>>& arrayLinksByFuncCalls, 
                     const map<string, set<SgSymbol*>>& byUseInFunc, 
-                    File* file, const pair<int, int>& lineRange,
+                    File* file, SgStatement *location,
                     const set<DIST::Array*>& onlyFor,
                     const set<string>& privates)
 {
@@ -257,9 +257,8 @@ static vector<SgExpression*>
     {
         if (privates.find(pairs.second->GetShortName()) != privates.end())
             continue;
-
-        auto type = pairs.second->GetDeclSymbol(currLoop->fileName, lineRange, getAllFilesInProject())->GetOriginal()->type();
-        SgSymbol* arrayS = getFromModule(byUseInFunc, findSymbolOrCreate(file, pairs.second->GetShortName(), type));
+        
+        SgSymbol* arrayS = (SgSymbol*)pairs.second->GetNameInLocationS(location);
         SgArrayRefExp* array = new SgArrayRefExp(*arrayS);
         bool needToAdd = false;
 
@@ -509,8 +508,6 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
     SgStatement* parentFunc = getFuncStat(realStat);
     const map<string, set<SgSymbol*>> byUseInFunc = moduleRefsByUseInFunction(realStat);
     const int nested = countPerfectLoopNest(loopG);
-    const pair<int, int> lineRange = make_pair(parentFunc->lineNumber(), parentFunc->lastNodeOfStmt()->lineNumber());
-    const string& filename = currLoop->fileName;
 
     vector<SgSymbol*> loopSymbs;
     vector<LoopGraph*> loops;
@@ -595,12 +592,14 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
         if (arrayRef->IsTemplate())
         {
             if (mapTo->IsLoopArray())
-                symbForPar = getFromModule(byUseInFunc, findSymbolOrCreate(file, mapTo->GetShortName(), new SgArrayType(*SgTypeInt()), file->GetOriginal()->firstStatement()));
+                symbForPar = findSymbolOrCreate(file, mapTo->GetShortName(), new SgArrayType(*SgTypeInt()), file->GetOriginal()->firstStatement());
             else
-                symbForPar = getFromModule(byUseInFunc, mapTo->GetDeclSymbol(filename, lineRange, allFiles)->GetOriginal());
+            {
+                symbForPar = (SgSymbol*)mapTo->GetNameInLocationS(parentFunc);
+            }
         }
         else
-            symbForPar = getFromModule(byUseInFunc, arrayRef->GetDeclSymbol(filename, lineRange, allFiles)->GetOriginal());
+            symbForPar = (SgSymbol*)arrayRef->GetNameInLocationS(parentFunc);
 
         arrayExpr = new SgArrayRefExp(*symbForPar);
         arrayExprS = "";
@@ -695,9 +694,9 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
         }
         vector<SgExpression*> tieList;
         if (sharedMemoryParallelization)
-            tieList = compliteTieList(currLoop, loopsTie, arrayLinksByFuncCalls, byUseInFunc, file, lineRange, onlyFor, uniqNamesOfPrivates);
+            tieList = compliteTieList(currLoop, loopsTie, arrayLinksByFuncCalls, byUseInFunc, file, parentFunc, onlyFor, uniqNamesOfPrivates);
         else if (onlyFor.size()) // not MPI regime
-            tieList = compliteTieList(currLoop, loopsTie, arrayLinksByFuncCalls, byUseInFunc, file, lineRange, onlyFor, uniqNamesOfPrivates);
+            tieList = compliteTieList(currLoop, loopsTie, arrayLinksByFuncCalls, byUseInFunc, file, parentFunc, onlyFor, uniqNamesOfPrivates);
 
         if (tieList.size())
         {
@@ -829,7 +828,7 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
 
                 acrossAdd += across[i1].first.first + "(" + bounds + ")";
 
-                SgArrayRefExp* newArrayRef = new SgArrayRefExp(*getFromModule(byUseInFunc, acrossArray->GetDeclSymbol(filename, lineRange, allFiles)->GetOriginal()));
+                SgArrayRefExp* newArrayRef = new SgArrayRefExp(*((SgSymbol*)acrossArray->GetNameInLocationS(parentFunc)));
                 newArrayRef->addAttribute(ARRAY_REF, acrossArray, sizeof(DIST::Array));
 
                 for (auto& elem : genSubscripts(across[i1].second, acrossShifts[i1]))
@@ -905,7 +904,7 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
                 }
 
                 shadowAdd += shadowRenew[i1].first.first + "(" + bounds + ")";
-                SgArrayRefExp* newArrayRef = new SgArrayRefExp(*getFromModule(byUseInFunc, shadowArray->GetDeclSymbol(filename, lineRange, allFiles)));
+                SgArrayRefExp* newArrayRef = new SgArrayRefExp(*((SgSymbol*)shadowArray->GetNameInLocationS(parentFunc)));
                 newArrayRef->addAttribute(ARRAY_REF, shadowArray, sizeof(DIST::Array));
 
                 for (auto& elem : genSubscripts(shadowRenew[i1].second, shadowRenewShifts[i1]))
@@ -1053,7 +1052,7 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
             directive += it->first.second + ")";
 
             DIST::Array* currArray = allArrays.GetArrayByName(it->first.first.second);
-            SgArrayRefExp* tmp = new SgArrayRefExp(*getFromModule(byUseInFunc, currArray->GetDeclSymbol(filename, lineRange, allFiles)->GetOriginal()), *it->second);
+            SgArrayRefExp* tmp = new SgArrayRefExp(*((SgSymbol*)currArray->GetNameInLocationS(parentFunc)), *it->second);
 
             tmp->addAttribute(ARRAY_REF, currArray, sizeof(DIST::Array));
             p->setLhs(tmp);
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
index 9b760c7..53c668c 100644
--- a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
@@ -654,9 +654,7 @@ void DvmhRegionInserter::insertActualDirective(SgStatement *st, const ArraySet &
     vector<SgExpression*> list;
     for (auto &arr : arraySet) 
     {
-        string arrayName = arr->GetShortName();
-        if (arr->GetLocation().first == DIST::l_MODULE)
-            arrayName = getNameByUse(st, arrayName, arr->GetLocation().second);
+        string arrayName = arr->GetNameInLocation(st);
 
         if (exceptSymbs)
             if (exceptSymbs->find(arrayName) != exceptSymbs->end())
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
index 99df6ba..76bc0fb 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
@@ -314,126 +314,98 @@ static SgStatement* findModWithName(const vector<SgStatement*>& modules, const s
     return NULL;
 }
 
-string getNameByUse(SgStatement* place, const string& varName, const string& locName)
+static map<SgStatement*, set<SgSymbol*>> symbolsForFunc;
+static set<string> allFiles;
+
+static const set<SgSymbol*>& getModeulSymbols(SgStatement *func)
 {
-    int old_id = -1;
-    string oldFileName = "";
-    if (place->getFileId() != current_file_id)
+    if (symbolsForFunc.find(func) != symbolsForFunc.end())
+        return symbolsForFunc[func];
+
+    set<SgSymbol*> symbs;
+    SgSymbol* s = func->symbol()->next();
+    while (s)
     {
-        old_id = current_file_id;
-        oldFileName = current_file->filename();
-        if (!place->switchToFile())
-            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+        if (s->scope() == func && IS_BY_USE(s))
+            symbs.insert(s);
+        s = s->next();
     }
 
-    SgStatement* func = getFuncStat(place, { MODULE_STMT });
-    string returnVal = varName;
-    if (func != NULL)
+    symbolsForFunc[func] = symbs;
+    return symbolsForFunc[func];
+}
+
+
+namespace Distribution
+{
+    const string Array::GetNameInLocation(void* location_p) const
     {
-        map<string, set<string>> graphUse;
+        return ((SgSymbol*)GetNameInLocationS(location_p))->identifier();
+    }
 
-        set<string> useMod;
-        map<string, vector<pair<SgSymbol*, SgSymbol*>>> modByUse;
-        map<string, vector<pair<SgSymbol*, SgSymbol*>>> modByUseOnly;
+    void* Array::GetNameInLocationS(void* location_p) const
+    {
+        SgStatement* location = (SgStatement*)location_p;
 
-        fillInfo(func, useMod, modByUse, modByUseOnly);
-        SgStatement* cp = func->controlParent();
-        if (isSgProgHedrStmt(cp) || cp->variant() == MODULE_STMT) // if function in contains region
-            fillInfo(cp, useMod, modByUse, modByUseOnly);
-
-        set<string> useModDone;
-        bool needRepeat = true;
-
-        vector<SgStatement*> modules;
-        findModulesInFile(func->getFile(), modules);
-
-        while (needRepeat)
+        int old_id = -1;
+        string oldFileName = "";
+        if (location->getFileId() != current_file_id)
         {
-            needRepeat = false;
-            set<string> newUseMod;
-            for (auto& useM : useMod)
-            {
-                if (useModDone.find(useM) == useModDone.end())
-                {
-                    auto modSt = findModWithName(modules, useM);
-                    if (modSt == NULL || useM == "dvmh_template_mod")
-                        continue;
-
-                    checkNull(modSt, convertFileName(__FILE__).c_str(), __LINE__);
-
-                    set<string> tmpUse;
-                    fillInfo(modSt, tmpUse, modByUse, modByUseOnly);
-                    useModDone.insert(useM);
-
-                    for (auto& use : tmpUse)
-                    {
-                        newUseMod.insert(use);
-
-                        if (use != "dvmh_template_mod")
-                            graphUse[use].insert(useM);
-                    }
-                }
-            }
-
-            for (auto& newU : newUseMod)
-            {
-                if (useModDone.find(newU) == useModDone.end())
-                {
-                    useModDone.insert(newU);
-                    needRepeat = true;
-                }
-            }
+            old_id = current_file_id;
+            oldFileName = current_file->filename();
+            if (!location->switchToFile())
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
         }
 
-        vector<string> altNames;
-        findByUse(modByUse, varName, { locName }, altNames);
-        findByUse(modByUseOnly, varName, { locName }, altNames);
+        SgStatement* func = getFuncStat(location, { MODULE_STMT });
+        if (func == NULL)
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
-        if (altNames.size() == 0)
+        if (allFiles.size() == 0)
+            allFiles = getAllFilesInProject();
+
+        const pair<int, int> lineRange = make_pair(func->lineNumber(), func->lastNodeOfStmt()->lineNumber());
+        const string& filename = func->fileName();
+
+        SgSymbol* returnVal = NULL;
+
+        if (locationPos.first == l_MODULE)
         {
-            set<string> locations = { locName };
-            bool changed = true;
-            while (changed)
+            const string& varName = shortName;
+            const string& locName = locationPos.second;
+
+            
+            map<string, SgSymbol*> altNames;
+            for (const auto& s : getModeulSymbols(func))
             {
-                changed = false;
-                for (auto& loc : locations)
+                SgSymbol* orig = OriginalSymbol(s);
+                if (orig->identifier() == varName && orig->scope()->symbol()->identifier() == locName)
                 {
-                    if (graphUse.find(loc) != graphUse.end())
-                    {
-                        for (auto& use : graphUse[loc])
-                        {
-                            if (locations.find(use) == locations.end())
-                            {
-                                locations.insert(use);
-                                changed = true;
-                            }
-                        }
-                    }
+                    if (altNames.count(s->identifier()))
+                        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+                    altNames[s->identifier()] = s;
                 }
             }
 
-            findByUse(modByUse, varName, locations, altNames);
-            findByUse(modByUseOnly, varName, locations, altNames);
-        }
-
-        if (altNames.size() == 0)
-            returnVal = varName;
-        else if (altNames.size() >= 1)
-        {
-            set<string> setAlt(altNames.begin(), altNames.end());
-            returnVal = *setAlt.begin();
+            if (altNames.size() > 0)
+                returnVal = altNames.begin()->second;
+            else
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
         }
         else
-            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-    }
+            returnVal = GetDeclSymbol(filename, lineRange, allFiles);
 
-    if (old_id != -1)
-    {
-        if (SgFile::switchToFile(oldFileName) == -1)
-            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-    }
+        checkNull(returnVal, convertFileName(__FILE__).c_str(), __LINE__);
 
-    return returnVal;
+        if (old_id != -1)
+        {
+            if (SgFile::switchToFile(oldFileName) == -1)
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+        }
+
+        return returnVal;
+    }
 }
 
 void fixUseOnlyStmt(SgFile *file, const vector<ParallelRegion*> &regs)
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
index e0e14a5..82216b2 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
@@ -7,7 +7,6 @@ std::map<std::string, std::set<std::string>> createMapOfModuleUses(SgFile* file)
 void fillModuleUse(SgFile* file, std::map<std::string, std::set<std::string>>& moduleUses, std::map<std::string, std::string>& moduleDecls);
 void filterModuleUse(std::map<std::string, std::set<std::string>>& moduleUses, std::map<std::string, std::string>& moduleDecls);
 void fillUsedModulesInFunction(SgStatement* st, std::vector<SgStatement*>& useStats);
-std::string getNameByUse(SgStatement* place, const std::string& varName, const std::string& locName);
 void fillUseStatement(SgStatement* st, std::set<std::string>& useMod, std::map<std::string, std::vector<std::pair<SgSymbol*, SgSymbol*>>>& modByUse, std::map<std::string, std::vector<std::pair<SgSymbol*, SgSymbol*>>>& modByUseOnly);
 void fixUseOnlyStmt(SgFile* file, const std::vector<ParallelRegion*>& regs);
 std::map<std::string, std::set<SgSymbol*>> moduleRefsByUseInFunction(SgStatement* stIn);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index a6610ad..c5b1c0d 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2390"
+#define VERSION_SPF "2391"

From 7b12fb1bb08fbe27504231377a22fefe031e3c96 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Tue, 18 Feb 2025 18:57:05 +0300
Subject: [PATCH 17/44] improved module analysis

---
 .../DirectiveProcessing/remote_access.cpp     |   1 -
 .../_src/Distribution/DvmhDirective.cpp       |  35 +++---
 .../Sapfor_2017/_src/Utils/module_utils.cpp   | 100 ++++++++++--------
 .../Sapfor_2017/_src/Utils/module_utils.h     |   3 +-
 .../experts/Sapfor_2017/_src/Utils/version.h  |   2 +-
 5 files changed, 80 insertions(+), 61 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp
index 5e3ae08..a35c844 100644
--- a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp
@@ -872,7 +872,6 @@ ArrayRefExp* createRemoteLink(const LoopGraph* currLoop, const DIST::Array* forA
 
     const set<string> allFiles = getAllFilesInProject();
     SgStatement* realStat = (SgStatement*)currLoop->getRealStat(file->filename());
-    const map<string, set<SgSymbol*>> byUseInFunc = moduleRefsByUseInFunction(realStat);
 
     SgExpression* ex = new SgExpression(EXPR_LIST);
     SgExpression* p = ex;
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp b/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
index f2c6973..798eef2 100644
--- a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
@@ -226,7 +226,6 @@ static SgStatement* getModuleScope(const string& origFull, vector<SgStatement*>&
 static vector<SgExpression*> 
     compliteTieList(const LoopGraph* currLoop, const vector<LoopGraph*>& loops, 
                     const map<DIST::Array*, set<DIST::Array*>>& arrayLinksByFuncCalls, 
-                    const map<string, set<SgSymbol*>>& byUseInFunc, 
                     File* file, SgStatement *location,
                     const set<DIST::Array*>& onlyFor,
                     const set<string>& privates)
@@ -506,7 +505,6 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
 
     SgStatement* realStat = (SgStatement*)currLoop->getRealStat(file->filename());
     SgStatement* parentFunc = getFuncStat(realStat);
-    const map<string, set<SgSymbol*>> byUseInFunc = moduleRefsByUseInFunction(realStat);
     const int nested = countPerfectLoopNest(loopG);
 
     vector<SgSymbol*> loopSymbs;
@@ -666,7 +664,7 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
                 continue;
 
             directive += (k != 0) ? "," + privVar.first : privVar.first;
-            list.push_back(new SgVarRefExp(getFromModule(byUseInFunc, privVar.second)));
+            list.push_back(new SgVarRefExp(getNameInLocation(privVar.second, parentFunc)));
             ++k;
         }
         directive += ")";
@@ -694,9 +692,9 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
         }
         vector<SgExpression*> tieList;
         if (sharedMemoryParallelization)
-            tieList = compliteTieList(currLoop, loopsTie, arrayLinksByFuncCalls, byUseInFunc, file, parentFunc, onlyFor, uniqNamesOfPrivates);
+            tieList = compliteTieList(currLoop, loopsTie, arrayLinksByFuncCalls, file, parentFunc, onlyFor, uniqNamesOfPrivates);
         else if (onlyFor.size()) // not MPI regime
-            tieList = compliteTieList(currLoop, loopsTie, arrayLinksByFuncCalls, byUseInFunc, file, parentFunc, onlyFor, uniqNamesOfPrivates);
+            tieList = compliteTieList(currLoop, loopsTie, arrayLinksByFuncCalls, file, parentFunc, onlyFor, uniqNamesOfPrivates);
 
         if (tieList.size())
         {
@@ -950,16 +948,21 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
         for (auto it = reduction.begin(); it != reduction.end(); ++it)
         {
             const string& nameGroup = it->first;
-            for (auto& list : it->second)
+            for (auto& red : it->second)
             {
                 if (k != 0)
                 {
                     directive += ",";
                     p = createAndSetNext(RIGHT, EXPR_LIST, p);
                 }
+                
+                SgSymbol* redS;
+                string clearName = correctSymbolModuleName(red);
+                if (clearName != red)
+                    redS = getNameInLocation(parentFunc, clearName, getModuleScope(red, moduleList, parentFunc)->symbol()->identifier());
+                else
+                    redS = findSymbolOrCreate(file, clearName, NULL, parentFunc);
 
-                SgSymbol* base = findSymbolOrCreate(file, correctSymbolModuleName(list), NULL, getModuleScope(list, moduleList, parentFunc));
-                SgSymbol* redS = getFromModule(byUseInFunc, base, list.find("::") != string::npos);
                 directive += nameGroup + "(" + redS->identifier() + ")";
 
                 SgVarRefExp* tmp2 = new SgVarRefExp(redS);
@@ -1009,11 +1012,19 @@ ParallelDirective::genDirective(File* file, const vector<pair<DIST::Array*, cons
                     p = createAndSetNext(RIGHT, EXPR_LIST, p);
                 }
 
-                SgSymbol* base1 = findSymbolOrCreate(file, correctSymbolModuleName(get<0>(list)), NULL, getModuleScope(get<0>(list), moduleList, parentFunc));
-                SgSymbol* base2 = findSymbolOrCreate(file, correctSymbolModuleName(get<1>(list)), NULL, getModuleScope(get<1>(list), moduleList, parentFunc));
+                SgSymbol *redS1, *redS2;
+                string clearName1 = correctSymbolModuleName(get<0>(list));
+                string clearName2 = correctSymbolModuleName(get<1>(list));
 
-                SgSymbol* redS1 = getFromModule(byUseInFunc, base1, get<0>(list).find("::") != string::npos);
-                SgSymbol* redS2 = getFromModule(byUseInFunc, base2, get<1>(list).find("::") != string::npos);
+                if (clearName1 != get<0>(list))
+                    redS1 = getNameInLocation(parentFunc, clearName1, getModuleScope(get<0>(list), moduleList, parentFunc)->symbol()->identifier());
+                else
+                    redS1 = findSymbolOrCreate(file, clearName1, NULL, parentFunc);
+
+                if (clearName2 != get<1>(list))
+                    redS2 = getNameInLocation(parentFunc, clearName2, getModuleScope(get<1>(list), moduleList, parentFunc)->symbol()->identifier());
+                else
+                    redS2 = findSymbolOrCreate(file, clearName2, NULL, parentFunc);
 
                 directive += nameGroup + "(" + redS1->identifier() + ", " + redS2->identifier() + ", " + std::to_string(get<2>(list)) + ")";
 
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
index 76bc0fb..a4a83ec 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
@@ -57,27 +57,6 @@ void getModulesAndFunctions(SgFile* file, vector<SgStatement*>& modulesAndFuncti
         modulesAndFunctions.push_back(file->functions(i));
 }
 
-SgSymbol* getFromModule(const map<string, set<SgSymbol*>>& byUse, SgSymbol* orig, bool processAsModule)
-{
-    if (!processAsModule)
-    {
-        checkNull(orig->scope(), convertFileName(__FILE__).c_str(), __LINE__);
-        if (orig->scope()->variant() != MODULE_STMT)
-            return orig;
-    }
-
-    if (byUse.size())
-    {
-        for (auto& elem : byUse)
-        {
-            for (auto& localS : setToMapWithSortByStr(elem.second))
-                if (OriginalSymbol(localS.second)->thesymb == orig->thesymb)
-                    return localS.second;
-        }
-    }
-    return orig;
-}
-
 map<string, set<string>> createMapOfModuleUses(SgFile* file)
 {
     map<string, set<string>> retValMap;
@@ -335,6 +314,57 @@ static const set<SgSymbol*>& getModeulSymbols(SgStatement *func)
     return symbolsForFunc[func];
 }
 
+SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const string& locName)
+{
+    map<string, SgSymbol*> altNames;
+    for (const auto& s : getModeulSymbols(func))
+    {
+        SgSymbol* orig = OriginalSymbol(s);
+        if (orig->identifier() == varName && orig->scope()->symbol()->identifier() == locName)
+        {
+            if (altNames.count(s->identifier()))
+                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+            altNames[s->identifier()] = s;
+        }
+    }
+
+    if (altNames.size() > 0)
+        return altNames.begin()->second;
+    else
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    return NULL;
+}
+
+SgSymbol* getNameInLocation(SgSymbol* curr, SgStatement* location)
+{
+    string oldFileName = "";
+    if (location->getFileId() != current_file_id)
+    {
+        oldFileName = current_file->filename();
+        if (!location->switchToFile())
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    }
+
+    SgStatement* func = getFuncStat(location, { MODULE_STMT });
+    if (func == NULL)
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    SgSymbol* returnVal = curr;
+    if (IS_BY_USE(curr))
+    {
+        const string location = OriginalSymbol(curr)->scope()->symbol()->identifier();
+        returnVal = getNameInLocation(func, OriginalSymbol(curr)->identifier(), location);
+    }
+
+    checkNull(returnVal, convertFileName(__FILE__).c_str(), __LINE__);
+
+    if (oldFileName != "" && SgFile::switchToFile(oldFileName) == -1)
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
+    return returnVal;
+}
 
 namespace Distribution
 {
@@ -347,11 +377,9 @@ namespace Distribution
     {
         SgStatement* location = (SgStatement*)location_p;
 
-        int old_id = -1;
         string oldFileName = "";
         if (location->getFileId() != current_file_id)
         {
-            old_id = current_file_id;
             oldFileName = current_file->filename();
             if (!location->switchToFile())
                 printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
@@ -374,35 +402,15 @@ namespace Distribution
             const string& varName = shortName;
             const string& locName = locationPos.second;
 
-            
-            map<string, SgSymbol*> altNames;
-            for (const auto& s : getModeulSymbols(func))
-            {
-                SgSymbol* orig = OriginalSymbol(s);
-                if (orig->identifier() == varName && orig->scope()->symbol()->identifier() == locName)
-                {
-                    if (altNames.count(s->identifier()))
-                        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
-                    altNames[s->identifier()] = s;
-                }
-            }
-
-            if (altNames.size() > 0)
-                returnVal = altNames.begin()->second;
-            else
-                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+            returnVal = getNameInLocation(func, varName, locName);
         }
         else
             returnVal = GetDeclSymbol(filename, lineRange, allFiles);
 
         checkNull(returnVal, convertFileName(__FILE__).c_str(), __LINE__);
 
-        if (old_id != -1)
-        {
-            if (SgFile::switchToFile(oldFileName) == -1)
-                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-        }
+        if (oldFileName != "" && SgFile::switchToFile(oldFileName) == -1)
+            printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
         return returnVal;
     }
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
index 82216b2..fb14657 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
@@ -2,10 +2,11 @@
 
 void getModulesAndFunctions(SgFile* file, std::vector<SgStatement*>& modulesAndFunctions);
 void findModulesInFile(SgFile* file, std::vector<SgStatement*>& modules);
-SgSymbol* getFromModule(const std::map<std::string, std::set<SgSymbol*>>& byUse, SgSymbol* orig, bool processAsModule = false);
 std::map<std::string, std::set<std::string>> createMapOfModuleUses(SgFile* file);
 void fillModuleUse(SgFile* file, std::map<std::string, std::set<std::string>>& moduleUses, std::map<std::string, std::string>& moduleDecls);
 void filterModuleUse(std::map<std::string, std::set<std::string>>& moduleUses, std::map<std::string, std::string>& moduleDecls);
+SgSymbol* getNameInLocation(SgStatement* func, const std::string& varName, const std::string& locName);
+SgSymbol* getNameInLocation(SgSymbol* curr, SgStatement* location);
 void fillUsedModulesInFunction(SgStatement* st, std::vector<SgStatement*>& useStats);
 void fillUseStatement(SgStatement* st, std::set<std::string>& useMod, std::map<std::string, std::vector<std::pair<SgSymbol*, SgSymbol*>>>& modByUse, std::map<std::string, std::vector<std::pair<SgSymbol*, SgSymbol*>>>& modByUseOnly);
 void fixUseOnlyStmt(SgFile* file, const std::vector<ParallelRegion*>& regs);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index c5b1c0d..7a1ee3e 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2391"
+#define VERSION_SPF "2392"

From c58755df2b2aa7ff87832e51860232a929c04781 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Thu, 20 Feb 2025 19:52:32 +0300
Subject: [PATCH 18/44] first step of shadow fixing

---
 dvm/fdvm/trunk/fdvm/dvm.cpp                   |  2 +-
 .../Correctness/Fortran/TASK/taskst11.fdv     | 71 +++++++++++----
 .../Correctness/Fortran/TASK/taskst12.fdv     | 68 +++++++-------
 .../Correctness/Fortran/TASK/taskst21.f90     | 56 ++++++------
 .../Correctness/Fortran/TASK/taskst22.f90     | 71 +++++++--------
 .../Correctness/Fortran/TASK/taskst31.f90     | 70 +++++++-------
 .../Correctness/Fortran/TASK/taskst32.f90     | 91 ++++++++-----------
 .../_src/DirectiveProcessing/shadow.cpp       | 18 +++-
 .../Sapfor_2017/_src/Server/server.cpp        |  4 +-
 .../Sapfor_2017/_src/Utils/module_utils.cpp   |  4 +-
 .../experts/Sapfor_2017/_src/Utils/version.h  |  2 +-
 11 files changed, 240 insertions(+), 217 deletions(-)

diff --git a/dvm/fdvm/trunk/fdvm/dvm.cpp b/dvm/fdvm/trunk/fdvm/dvm.cpp
index 61c47f0..edab431 100644
--- a/dvm/fdvm/trunk/fdvm/dvm.cpp
+++ b/dvm/fdvm/trunk/fdvm/dvm.cpp
@@ -9992,7 +9992,7 @@ void RemoteVariableList(SgSymbol *group, SgExpression *rml, SgStatement *stmt)
             }
             InsertNewStatementAfter(D_RmBuf( HeaderRef(el->lhs()->symbol()),GetAddresDVM( header_rf(ar,ibuf,1)),n,ideb),cur_st,cur_st->controlParent());
           }
-	  SET_DVM(iaxis);	  
+	  //SET_DVM(iaxis); //11.02.25	  
   }
 
   if(group) {
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv
index 77a1f67..b082d22 100644
--- a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv
+++ b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv
@@ -2,10 +2,11 @@
 !	rectangular grid is distributed on two blocks
 !
 !	
-	PARAMETER    (K=8,  N1 = 4,  ITMAX=20, N2 = K - N1 )
+	PARAMETER   (K=8, N1 = 4, ITMAX=20, N2 = K-N1, ER = 10000)
 	REAL,ALLOCATABLE :: A(:,:),A1(:,:),A2(:,:)
-        REAL,ALLOCATABLE :: B(:,:),B1(:,:),B2(:,:) 
-        INTEGER LP(2),HP(2)
+        REAL,ALLOCATABLE :: B(:,:),B1(:,:),B2(:,:),B_1(:,:),B_2(:,:) 
+        INTEGER LP(2),HP(2), ERRT1, ERRT2
+        CHARACTER*8:: TNAME='taskst11'
 !DVM$	PROCESSORS    P(NUMBER_OF_PROCESSORS( ))
 !DVM$	TASK  MB( 2 )
 !DVM$	DISTRIBUTE   A(*,BLOCK) ONTO P
@@ -14,7 +15,7 @@
 !DVM$	ALIGN   B2( I, J )  WITH  A2( I, J ) 
 !DVM$	DISTRIBUTE  ::  A1, A2 
 
-        PRINT *,  '===== START OF taskst11 ========='
+        PRINT *,  '===START OF taskst11 ====================='
         CALL DPT(LP,HP,2)
 !DVM$	MAP  MB( 1 )  ONTO  P( LP(1) : HP(1) )
         ALLOCATE(A1(N1+1,K))
@@ -24,7 +25,7 @@
         ALLOCATE(A2(N2+1,K))
 !DVM$	REDISTRIBUTE  A2( *, BLOCK )  ONTO  MB( 2 )
         ALLOCATE(B2(N2+1,K))
-        ALLOCATE(A(K,K),B(K,K))
+        ALLOCATE(A(K,K),B(K,K),B_1(K,K),B_2(K,K))
 !		Initialization
 !DVM$   TASK_REGION MB
 !DVM$   ON MB(1)
@@ -153,32 +154,54 @@
                   ENDDO
 !DVM$ END REGION
         ENDDO
-!DVM$   GET_ACTUAL (B,B1,B2)
+!DVM$ GET_ACTUAL (B,B1,B2)
+      ERRT1 = ER
+      ERRT2 = ER
 !   compare 2-task JACOBI with 1-task JACOBI
 !DVM$ PARALLEL (I,J)  ON B1(I,J),REMOTE_ACCESS (B(I,J))
       DO I = 2,N1
          DO J = 2, K-1
-            IF(B1(I,J).NE.B(I,J)) THEN
-               PRINT *, ' taskst11 - ***error B1(',I,',',J,')'
-               print *, '=== END OF taskst11 =============='
-               STOP
-            ENDIF 
+            B_1(I,J) = B(I,J)
          ENDDO
       ENDDO 
 !DVM$ PARALLEL (I,J)  ON B2(I,J),REMOTE_ACCESS (B(I+(N1-1),J))
       DO I = 2,N2
          DO J = 2, K-1
-            IF(B2(I,J).NE.B(I+(N1-1),J)) THEN
-               PRINT *, ' taskst11 - ***error B2(',I,',',J,')',
-     *               'B(',I+N1-1,',',J,')'
-               print *, '=== END OF taskst11 =============='
-               STOP
+            B_2(I,J) = B(I+(N1-1),J)
+         ENDDO
+      ENDDO 
+
+!DVM$ TASK_REGION MB
+!DVM$ ON MB(1) 
+!DVM$ PARALLEL (I,J)  ON B1(I,J), REDUCTION(MIN(ERRT1))
+      DO I = 2,N1
+         DO J = 2, K-1            
+            IF(B1(I,J).NE.B_1(I,J)) THEN
+              ERRT1 = MIN(ERRT1, I)  
             ENDIF 
          ENDDO
       ENDDO 
-      PRINT *, ' taskst11 - complete'
-      print *, '=== END OF taskst11 ====================='
-      DEALLOCATE (B,B1,B2,A,A1,A2)
+!DVM$ END ON
+!DVM$ ON MB(2)
+!DVM$ PARALLEL (I,J)  ON B2(I,J), REDUCTION(MIN(ERRT2))
+      DO I = 2,N2
+         DO J = 2, K-1
+            IF(B2(I,J).NE.B_2(I,J)) THEN   
+              ERRT2 = MIN(ERRT2, I)  
+            ENDIF 
+         ENDDO
+      ENDDO 
+!DVM$ END ON
+!DVM$ END TASK_REGION
+!DVM$ GET_ACTUAL(ERRT1,ERRT2)
+      IF (ERRT1 .EQ. ER .AND. ERRT2 .EQ. ER) THEN    
+          CALL ANSYES(TNAME)
+      ELSE
+          CALL ANSNO (TNAME)
+      ENDIF
+      DEALLOCATE (B,B_1,B_2,B1,B2,A,A1,A2)
+   
+      PRINT *,  '=== END OF taskst11 ======================'
       END
 
       SUBROUTINE DPT(LP,HP,NT)
@@ -201,3 +224,13 @@
       END IF
 !DVM$ ENDDEBUG 1
       END
+C -------------------------------------------------
+
+      SUBROUTINE ANSYES(NAME)
+      CHARACTER*8 NAME
+      PRINT *, NAME, '  -  complete'
+      END
+      SUBROUTINE ANSNO (NAME)
+      CHARACTER*8 NAME
+      PRINT *, NAME, '  -  ***error'
+      END
\ No newline at end of file
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv
index 78c2578..adf117b 100644
--- a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv
+++ b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv
@@ -2,18 +2,20 @@
 !	rectangular grid is distributed on two blocks
 !
 !	
-	INTEGER,PARAMETER :: K=8,  N1 = 4,  ITMAX=20, N2 = K - N1
+	INTEGER,PARAMETER :: K=8, N1=4, ITMAX=20, N2=K-N1, ER=10000
 	REAL,ALLOCATABLE :: A(:,:),A1(:,:),A2(:,:)
         REAL,ALLOCATABLE :: B(:,:),B1(:,:),B2(:,:) 
         INTEGER,DIMENSION(2) :: LP,HP
+        INTEGER :: ERRT
+        CHARACTER*8:: TNAME='taskst12'
 CDVM$	PROCESSORS    P(NUMBER_OF_PROCESSORS( ))
 CDVM$	TASK  MB( 2 )
 CDVM$	DISTRIBUTE   A(*,BLOCK)
 CDVM$	ALIGN   B( I, J )  WITH  A( I, J )
 CDVM$	DISTRIBUTE  ::  A1, A2
-CDVM$	ALIGN ::  B1,B2   
-
-        PRINT *,  '======== START OF taskst12 =========='
+CDVM$	ALIGN ::  B1,B2
+   
+        PRINT *,  '===START OF taskst12 ====================='
         CALL DPT(LP,HP,2)
 CDVM$	MAP  MB( 1 )  ONTO  P( LP(1) : HP(1) )
         ALLOCATE(A1(N1+1,K))
@@ -69,16 +71,8 @@ CDVM$	REALIGN   B2( I, J )  WITH  A2( I, J )
 
 !		exchange bounds
 !DVM$   GET_ACTUAL (B2(2,:),B1(N1, :))
-!DVM$	PARALLEL    ( J )   ON   A1(N1+1, J),
-!DVM$*  REMOTE_ACCESS  (B2( 2, J ) )
-	DO  J  =  1, K
-            A1(N1+1, J) = B2(2, J)
-        ENDDO
-!DVM$	PARALLEL    ( J )   ON   A2( 1, J),
-!DVM$*  REMOTE_ACCESS  (B1( N1, J ) )
-	DO  J  =  1, K
-            A2(1, J) = B1(N1, J)
-        ENDDO
+        A1(N1+1,:) = B2(2, :)
+        A2(1, :)   = B1(N1, :)
 !DVM$   ACTUAL (A2(1, :),A1(N1+1,:))
 !DVM$	TASK_REGION MB
 !DVM$	ON   MB( 1 )
@@ -157,32 +151,28 @@ CDVM$	REALIGN   B2( I, J )  WITH  A2( I, J )
                   ENDDO
 !DVM$ END REGION
         ENDDO
-!DVM$   GET_ACTUAL (B,B1,B2)
+!DVM$ GET_ACTUAL (B,B1,B2)
 !   compare 2-task JACOBI with 1-task JACOBI
-!DVM$ PARALLEL (I,J)  ON B1(I,J),REMOTE_ACCESS (B(I,J))
-      DO I = 2,N1
+      A(2:N1,:) = B1(2:N1,:)
+      A(N1+1:N1+N2-1,:) = B2(2:N2,:)
+      ERRT = ER
+!DVM$ PARALLEL (I,J)  ON B(I,J), REDUCTION(MIN(ERRT))
+      DO I = 2, K-1
          DO J = 2, K-1
-            IF(B1(I,J).NE.B(I,J)) THEN
-               PRINT *, ' taskst12- ***error B1(',I,',',J,')'
-               print *, '=== END OF taskst12 =============='
-               STOP
+            IF(A(I,J) .NE. B(I,J)) THEN
+               ERRT = MIN(ERRT,I)
             ENDIF 
          ENDDO
       ENDDO 
-!DVM$ PARALLEL (I,J)  ON B2(I,J),REMOTE_ACCESS (B(I+(N1-1),J))
-      DO I = 2,N2
-         DO J = 2, K-1
-            IF(B2(I,J).NE.B(I+(N1-1),J)) THEN
-               PRINT *, ' taskst12 - ***error B2(',I,',',J,')',
-     *               'B(',I+N1-1,',',J,')'
-               print *, '=== END OF taskst12 =============='
-               STOP
-            ENDIF 
-         ENDDO
-      ENDDO 
-      PRINT *, ' taskst12 - complete'
-      print *, '=== END OF taskst12 ====================='
+      IF (ERRT .EQ. ER) THEN     
+          CALL ANSYES(TNAME)
+      ELSE
+          CALL ANSNO(TNAME)
+      ENDIF 
+
       DEALLOCATE (B,B1,B2,A,A1,A2)
+      PRINT *,  '=== END OF taskst12 ====================='
+
       END
 
       SUBROUTINE DPT(LP,HP,NT)
@@ -205,3 +195,13 @@ CDVM$	REALIGN   B2( I, J )  WITH  A2( I, J )
       END IF
 !DVM$ ENDDEBUG 1
       END
+C -------------------------------------------------
+
+      SUBROUTINE ANSYES(NAME)
+      CHARACTER*8 NAME
+      PRINT *, NAME, '  -  complete'
+      END
+      SUBROUTINE ANSNO (NAME)
+      CHARACTER*8 NAME
+      PRINT *, NAME, '  -  ***error'
+      END
\ No newline at end of file
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90 b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90
index a7659b1..5e1dc26 100644
--- a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90
+++ b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90
@@ -1,8 +1,9 @@
 program taskst21
-    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1
+    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1, er = 10000
     real, allocatable :: a( :, :, : ), a1( :, :, : ), a2( :, :, : )
     real, allocatable :: b( :, :, : ), b1( :, :, : ), b2( :, :, : )
-    integer lp( 2 ), hp( 2 )
+    integer lp( 2 ), hp( 2 ), errt
+    character*8 :: tname = 'taskst21'
     !dvm$ processors p( processors_size( 1 ), processors_size( 2 ) )
     !dvm$ task mb( 2 )
 
@@ -12,8 +13,7 @@ program taskst21
     !dvm$ distribute :: a1, a2
     !dvm$ align b1( i, j, ii ) with a1( i, j, ii )
     !dvm$ align b2( i, j, ii ) with a2( i, j, ii )
-
-    print *, '====== START OF taskst21 ========'
+    print *,  '===START OF taskst21 ====================='
     call dpt( lp, hp, 2 )
     !dvm$ map mb( 1 ) onto p( lp( 1 ) : hp( 1 ), : )
     allocate( a1( n1 + 1, k, k ) )
@@ -65,7 +65,7 @@ program taskst21
         enddo
     !dvm$ end region
     !dvm$ end on
-        !dvm$ end task_region
+    !dvm$ end task_region
 
     do it = 1, itmax
         !exchange bounds
@@ -176,34 +176,25 @@ program taskst21
 
     ! compare 2 - task jacobi with 1 - task jacobi
     !dvm$ get_actual(b,b1,b2)
-    !dvm$ parallel ( i, j, ii ) on b1( i, j, ii ), remote_access ( b( i, j, ii ) )
-    do i = 2, n1
+    a(2:n1,:,:) = b1(2:n1,:,:)
+    a(n1+1:n1+n2-1,:,:) = b2(2:n2,:,:)
+    errt = er
+    !dvm$ parallel ( ii, j, i ) on b( i, j, ii ), reduction(min(errt))
+    do ii = 2, k - 1
         do j = 2, k - 1
-            do ii = 2, k - 1
-                if( b1( i, j, ii ) .ne. b( i, j, ii ) ) then
-                    print *, 'taskst21 - ***error b1( ', i, ', ', j, ', ', ii, ' )'
-                    print *, '=== END OF taskst21 =============='
-                    stop
-                endif
+            do i = 2, k - 1
+                if(a( i, j, ii ) .ne. b( i, j, ii ))  errt = min(errt, i)
             enddo
         enddo
     enddo
-
-    !dvm$ parallel ( i, j, ii ) on b2( i, j, ii ), remote_access ( b( i + ( n1 - 1 ), j, ii ) )
-    do i = 2, n2
-        do j = 2, k - 1
-            do ii = 2, k - 1
-                if( b2( i, j, ii ) .ne. b( i + ( n1 - 1 ), j, ii ) ) then
-                    print *, 'taskst21 - ***error b2( ', i, ', ', j, ', ', ii, ' )', '( ', i + n1 - 1, ', ', j, ', ', ii, ' )'
-                    print *, '=== END OF taskst21 =============='
-                    stop
-                endif
-            enddo
-        enddo
-    enddo
-    print *, 'taskst21 - complete'
-    print *, '=== END OF taskst21 ====================='
+    if (errt .eq. er)  then
+        call ansyes(tname)
+    else
+        call ansno (tname)
+    endif
     deallocate(b,b1,b2,a,a1,a2)
+    print *,  '=== END OF taskst21 ====================='
+
 end
 
 subroutine dpt( lp, hp, nt )
@@ -227,3 +218,12 @@ subroutine dpt( lp, hp, nt )
     !dvm$ enddebug 1
 end
 
+subroutine ansyes(name)
+    character*8 name
+    print *, name, '  -  complete'
+end
+
+subroutine ansno(name)
+    character*8 name
+    print *, name, '  -  ***error'
+end
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90 b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90
index 824b9fd..168b788 100644
--- a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90
+++ b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90
@@ -1,8 +1,10 @@
 program taskst22
-    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1
+    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1, er = 10000
     real, allocatable :: a( :, :, : ), a1( :, :, : ), a2( :, :, : )
     real, allocatable :: b( :, :, : ), b1( :, :, : ), b2( :, :, : )
     integer, dimension( 2 ) :: lp, hp
+    integer :: errt
+    character*8 :: tname = 'taskst22'
     !dvm$ processors p( processors_size( 1 ), processors_size( 2 ) )
     !dvm$ task mb( 2 )
 
@@ -11,8 +13,7 @@ program taskst22
 
     !dvm$ distribute :: a1, a2
     !dvm$ align :: b1, b2
-
-    print *, '====== START OF taskst22 =========='
+    print *,  '===START OF taskst22 ====================='
     call dpt( lp, hp, 2 )
     !dvm$ map mb( 1 ) onto p( lp( 1 ) : hp( 1 ), : )
     allocate( a1( n1 + 1, k, k ) )
@@ -71,19 +72,8 @@ program taskst22
     do it = 1, itmax
         !exchange bounds
 	!dvm$ get_actual(b2( 2, :, : ),b1( n1, :, : ))
-        !dvm$ parallel ( ii, j ) on a1( n1 + 1, j, ii ), remote_access ( b2( 2, j, ii ) )
-        do ii = 1, k
-            do j = 1, k
-                a1( n1 + 1, j, ii ) = b2( 2, j, ii )
-            enddo
-        enddo
-	
-        !dvm$ parallel ( ii, j ) on a2( 1, j, ii ), remote_access ( b1( n1, j, ii ) )
-        do ii = 1, k
-            do j = 1, k
-                a2( 1, j, ii ) = b1( n1, j, ii )
-            enddo
-        enddo
+        a1( n1 + 1, :, : ) = b2( 2, :, : )
+        a2( 1, :, : ) = b1( n1, :, : )
 	!dvm$ actual(a1( n1 + 1, :, : ),a2( 1, :, : ))
         !dvm$ task_region mb
             !dvm$ on mb( 1 )
@@ -177,36 +167,28 @@ program taskst22
 
     ! compare 2 - task jacobi with 1 - task jacobi
     !dvm$ get_actual(b,b1,b2)
-    !dvm$ parallel ( i, j, ii ) on b1( i, j, ii ), remote_access ( b( i, j, ii ) )
-    do i = 2, n1
+    a(2:n1,:,:) = b1(2:n1,:,:)
+    a(n1+1:n1+n2-1,:,:) = b2(2:n2,:,:)
+    errt = er
+    !dvm$ parallel ( ii, j, i ) on b( i, j, ii ), reduction(min(errt))
+    do ii = 2, k - 1
         do j = 2, k - 1
-            do ii = 2, k - 1
-                if( b1( i, j, ii ) .ne. b( i, j, ii ) ) then
-                    print *, 'taskst22 - ***error b1( ', i, ', ', j, ', ', ii, ' )'
-                    print *, '=== END OF taskst22 =============='
-                    stop
-                endif
+            do i = 2, k - 1
+                if(a( i, j, ii ) .ne. b( i, j, ii ))  errt = min(errt, i)
             enddo
         enddo
     enddo
-
-    !dvm$ parallel ( i, j, ii ) on b2( i, j, ii ), remote_access ( b( i + ( n1 - 1 ), j, ii ) )
-    do i = 2, n2
-        do j = 2, k - 1
-            do ii = 2, k - 1
-                if( b2( i, j, ii ) .ne. b( i + ( n1 - 1 ), j, ii ) ) then
-                    print *, 'taskst22 - ***error b2( ', i, ', ', j, ', ', ii, ' )', '( ', i + n1 - 1, ', ', j, ', ', ii, ' )'
-                    print *, '=== END OF taskst22 =============='
-                    stop
-                endif
-            enddo
-        enddo
-    enddo
-    print *, 'taskst22 - complete'
-    print *, '=== END OF taskst22 ====================='
-    deallocate(b,b1,b2,a,a1,a2)    
+    if (errt .eq. er)  then
+        call ansyes(tname)
+    else
+        call ansno (tname)
+    endif
+    deallocate(b,b1,b2,a,a1,a2)
+    print *,  '=== END OF taskst22 ====================='
 end
 
+
+
 subroutine dpt( lp, hp, nt )
     !distributing processors for nt tasks ( nt = 2 )
     integer lp( 2 ), hp( 2 )
@@ -228,3 +210,12 @@ subroutine dpt( lp, hp, nt )
     !dvm$ enddebug 1
 end
 
+subroutine ansyes(name)
+    character*8 name
+    print *, name, '  -  complete'
+end
+
+subroutine ansno(name)
+    character*8 name
+    print *, name, '  -  ***error'
+end
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90 b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90
index 92e0c07..d9169ed 100644
--- a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90
+++ b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90
@@ -1,8 +1,9 @@
 program taskst31
-    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1
+    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1, er = 10000
     real, allocatable :: a( :, :, :, : ), a1( :, :, :, : ), a2( :, :, :, : )
     real, allocatable :: b( :, :, :, : ), b1( :, :, :, : ), b2( :, :, :, : )
-    integer lp( 2 ), hp( 2 )
+    integer lp( 2 ), hp( 2 ), errt
+    character*8 :: tname = 'taskst31'
     !dvm$ processors p( processors_size( 1 ), processors_size( 2 ), processors_size( 3 ) )
     !dvm$ task mb( 2 )
 
@@ -13,8 +14,8 @@ program taskst31
     !dvm$ align b1( i, j, ii, jj ) with a1( i, j, ii, jj )
     !dvm$ align b2( i, j, ii, jj ) with a2( i, j, ii, jj )
     
+    print *,  '===START OF taskst31 ====================='
 
-    print *, '======= START OF taskst31 ========='
     call dpt( lp, hp, 2 )
     !dvm$ map mb( 1 ) onto p( lp( 1 ) : hp( 1 ), :, : )
     allocate( a1( n1 + 1, k, k, k ) )
@@ -81,8 +82,8 @@ program taskst31
 
     do it = 1, itmax
      
-    !DVM$ get_actual(b2(2,:,:,:))
         !exchange bounds
+        !dvm$ get_actual(b2(2,:,:,:))
         !dvm$ parallel ( jj, ii, j ) on a1( n1 + 1, j, ii, jj ), remote_access ( b2( 2, j, ii, jj ) )
         do jj = 1, k
             do ii = 1, k
@@ -91,8 +92,8 @@ program taskst31
                 enddo
             enddo
         enddo
-    !dvm$ actual(a1(n1+1,:,:,:))
-    !dvm$ get_actual (b1(n1,:,:,:))
+        !dvm$ actual(a1(n1+1,:,:,:))
+        !dvm$ get_actual (b1(n1,:,:,:))
         !dvm$ parallel ( jj, ii, j ) on a2( 1, j, ii, jj ), remote_access (  b1( n1, j, ii, jj ) )
         do jj = 1, k
             do ii = 1, k
@@ -212,40 +213,29 @@ program taskst31
             enddo
         !dvm$ end region
     enddo
-    !dvm$ get_actual(b,b1,b2)
-    ! compare 2 - task jacobi with 1 - task jacobi
-    !dvm$ parallel ( i, j, ii, jj ) on b1( i, j, ii, jj ), remote_access ( b( i, j, ii, jj ) )
-    do i = 2, n1
-        do j = 2, k - 1
-            do ii = 2, k - 1
-                do jj = 2, k - 1
-                    if( b1( i, j, ii, jj ) .ne. b( i, j, ii, jj ) ) then
-                        print *, 'taskst31 - ***error b1( ', i, ', ', j, ', ', ii, ', ', jj, ' )'
-                        print *, '=== END OF taskst31 =============='
-                        stop
-                    endif
-                enddo
-            enddo
-        enddo
-    enddo
 
-    !dvm$ parallel ( i, j, ii, jj ) on b2( i, j, ii, jj ), remote_access ( b( i + ( n1 - 1 ), j, ii, jj ) )
-    do i = 2, n2
-        do j = 2, k - 1
-            do ii = 2, k - 1
-                do jj = 2, k - 1
-                    if( b2( i, j, ii, jj ) .ne. b( i + ( n1 - 1 ), j, ii, jj ) ) then
-                        print *, 'taskst31 - ***error b2( ', i, ', ', j, ', ', ii, ', ', jj, ' )', '( ', i + n1 - 1, ', ', j, ', ', ii, ', ', jj, ' )'
-                        print *, '=== END OF taskst31 =============='
-                        stop
-                    endif
-                enddo
+    ! compare 2 - task jacobi with 1 - task jacobi
+    !dvm$ get_actual(b,b1,b2)
+    a(2:n1,:,:,:) = b1(2:n1,:,:,:)
+    a(n1+1:n1+n2-1,:,:,:) = b2(2:n2,:,:,:)
+    errt = er
+    !dvm$ parallel ( jj, ii, j, i ) on b( i, j, ii, jj ), reduction(min(errt))
+    do jj = 2, k - 1
+        do ii = 2, k - 1
+            do j = 2, k - 1
+                do i = 2, k - 1
+                    if(a( i, j, ii, jj) .ne. b( i, j, ii, jj))  errt = min(errt, i)
+                enddo        
             enddo
         enddo
     enddo
-    print *, 'taskst31 - complete'
-    print *, '=== END OF taskst31 ====================='
+    if (errt .eq. er)  then
+        call ansyes(tname)
+    else
+        call ansno (tname)
+    endif
     deallocate(b,b1,b2,a,a1,a2)
+    print *,  '=== END OF taskst31 ====================='
 end
 
 subroutine dpt( lp, hp, nt )
@@ -269,3 +259,13 @@ subroutine dpt( lp, hp, nt )
     !dvm$ enddebug 1
 end
 
+subroutine ansyes(name)
+    character*8 name
+    print *, name, '  -  complete'
+end
+
+subroutine ansno(name)
+    character*8 name
+    print *, name, '  -  ***error'
+end
+
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90 b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90
index e254eb7..dcd3ded 100644
--- a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90
+++ b/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90
@@ -1,8 +1,10 @@
 program taskst32
-    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1
+    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1, er = 10000
     real, allocatable :: a( :, :, :, : ), a1( :, :, :, : ), a2( :, :, :, : )
     real, allocatable :: b( :, :, :, : ), b1( :, :, :, : ), b2( :, :, :, : )
     integer lp( 2 ), hp( 2 )
+    integer errt
+    character*8 :: tname = 'taskst32'
     !dvm$ processors p( processors_size( 1 ), processors_size( 2 ), processors_size( 3 ) )
     !dvm$ task mb( 2 )
 
@@ -11,8 +13,7 @@ program taskst32
 
     !dvm$ distribute :: a1, a2
     !dvm$ align :: b1, b2
-
-    print *, '======= START OF taskst32 ========='
+    print *,  '===START OF taskst32 ====================='
     call dpt( lp, hp, 2 )
     !dvm$ map mb( 1 ) onto p( lp( 1 ) : hp( 1 ), :, : )
     allocate( a1( n1 + 1, k, k, k ) )
@@ -79,28 +80,13 @@ program taskst32
     !dvm$ end on
     !dvm$ end task_region
 
-    do it = 1, itmax
-        
-    !DVM$ get_actual(b2(2,:,:,:))
-        !exchange bounds
-        !dvm$ parallel ( jj, ii, j ) on a1( n1 + 1, j, ii, jj ), remote_access ( b2( 2, j, ii, jj ) )
-        do jj = 1, k
-            do ii = 1, k
-                do j = 1, k
-                    a1( n1 + 1, j, ii, jj ) = b2( 2, j, ii, jj )
-                enddo
-            enddo
-        enddo
-    !dvm$ actual(a1(n1+1,:,:,:))
-    !dvm$ get_actual (b1(n1,:,:,:))
-        !dvm$ parallel ( jj, ii, j ) on a2( 1, j, ii, jj ), remote_access (  b1( n1, j, ii, jj ) )
-        do jj = 1, k
-            do ii = 1, k
-                do j = 1, k
-                    a2( 1, j, ii, jj ) = b1( n1, j, ii, jj )
-                enddo
-            enddo
-        enddo
+    do it = 1, itmax            
+    !exchange bounds
+        !dvm$ get_actual(b2(2,:,:,:)) 
+        a1( n1 + 1, :, :, : ) = b2( 2, :, :, : )
+        !dvm$ actual(a1(n1+1,:,:,:))
+        !dvm$ get_actual (b1(n1,:,:,:))
+        a2( 1, :, :, : ) = b1( n1, :, :, : )
         !dvm$ actual(a2(1,:,:,:))
        
         !dvm$ task_region mb
@@ -212,40 +198,28 @@ program taskst32
             enddo
         !dvm$ end region
     enddo
+    ! compare 2-task jacobi with 1-task jacobi
     !dvm$ get_actual(b,b1,b2)
-    ! compare 2 - task jacobi with 1 - task jacobi
-    !dvm$ parallel ( i, j, ii, jj ) on b1( i, j, ii, jj ), remote_access ( b( i, j, ii, jj ) )
-    do i = 2, n1
-        do j = 2, k - 1
-            do ii = 2, k - 1
-                do jj = 2, k - 1
-                    if( b1( i, j, ii, jj ) .ne. b( i, j, ii, jj ) ) then
-                        print *, 'taskst32 - ***error b1( ', i, ', ', j, ', ', ii, ', ', jj, ' )'
-                        print *, '=== END OF taskst32 =============='
-                        stop
-                    endif
-                enddo
+    a(2:n1,:,:,:) = b1(2:n1,:,:,:)
+    a(n1+1:n1+n2-1,:,:,:) = b2(2:n2,:,:,:)
+    errt = er
+    !dvm$ parallel ( jj, ii, j, i ) on b( i, j, ii, jj ), reduction(min(errt))
+    do jj = 2, k - 1
+        do ii = 2, k - 1
+            do j = 2, k - 1
+                do i = 2, k - 1
+                    if(a( i, j, ii, jj) .ne. b( i, j, ii, jj))  errt = min(errt, i)
+                enddo    
             enddo
         enddo
     enddo
-
-    !dvm$ parallel ( i, j, ii, jj ) on b2( i, j, ii, jj ), remote_access ( b( i + ( n1 - 1 ), j, ii, jj ) )
-    do i = 2, n2
-        do j = 2, k - 1
-            do ii = 2, k - 1
-                do jj = 2, k - 1
-                    if( b2( i, j, ii, jj ) .ne. b( i + ( n1 - 1 ), j, ii, jj ) ) then
-                        print *, 'taskst32 - ***error b2( ', i, ', ', j, ', ', ii, ', ', jj, ' )', '( ', i + n1 - 1, ', ', j, ', ', ii, ', ', jj, ' )'
-                        print *, '=== END OF taskst32 =============='
-                        stop
-                    endif
-                enddo
-            enddo
-        enddo
-    enddo
-    print *, 'taskst32 - complete'
-    print *, '=== END OF taskst32 ====================='
+    if (errt .eq. er)  then
+        call ansyes(tname)
+    else
+        call ansno (tname)
+    endif
     deallocate(b,b1,b2,a,a1,a2)
+    print *,  '=== END OF taskst32 ====================='
 end
 
 subroutine dpt( lp, hp, nt )
@@ -269,3 +243,12 @@ subroutine dpt( lp, hp, nt )
     !dvm$ enddebug 1
 end
 
+subroutine ansyes(name)
+    character*8 name
+    print *, name, '  -  complete'
+end
+
+subroutine ansno(name)
+    character*8 name
+    print *, name, '  -  ***error'
+end
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp
index 95f3a0e..e8eb705 100644
--- a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp
@@ -509,6 +509,22 @@ static vector<PrevNode> getPrev(ShadowNode* curr, const map<string, vector<FuncI
 
 static bool isMoveValid(ShadowNode* moveTo, DIST::Array* array, const set<ShadowNode*>& allShadowNodes)
 {
+    if (array->GetLocation().first == DIST::l_MODULE)
+    {
+        auto func = moveTo->location.first->funcPointer;
+
+        bool checkOk = true;
+        try {
+            array->GetNameInLocationS(moveTo->location.first->funcPointer);
+        }
+        catch (...) {
+            checkOk = false;
+        }
+
+        if (!checkOk)
+            return false;
+    }
+
     //check added
     for (auto& elem : moveTo->newShadows)
         if (elem.first == array)
@@ -779,8 +795,6 @@ static void replacingShadowNodes(FuncInfo* currF)
                     if (currSh.second.size() == 0)
                         continue;
 
-                    
-
                     const ShadowElement& currElement = currSh.second[0];
                     SgSymbol* s = (SgSymbol*)currArray->GetNameInLocationS(currF->funcPointer);
 
diff --git a/sapfor/experts/Sapfor_2017/_src/Server/server.cpp b/sapfor/experts/Sapfor_2017/_src/Server/server.cpp
index 999eace..5d67392 100644
--- a/sapfor/experts/Sapfor_2017/_src/Server/server.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Server/server.cpp
@@ -105,7 +105,7 @@ void Sleep(int millisec) { usleep(millisec * 2000); }
 */
 #define SERV "[SERVER]"
 
-static const char* VERSION = "10";
+static const char* VERSION = "11";
 static FILE* logFile = NULL;
 
 extern void __bst_create(const char* name);
@@ -586,7 +586,7 @@ int main(int argc, char** argv)
     javaPort = getPort(serverJAVA);
     __print_log(logFile, "done with port %d", javaPort);
 
-    __print(SERV, "SOCKET PORT for SAPFOR %d, SOCKET PORT for Visualizer %d", sapforPort, javaPort);
+    printf("SOCKET PORT for SAPFOR %d, SOCKET PORT for Visualizer %d\n", sapforPort, javaPort);
 
     const int maxSize = 4096;
     char* buf = new char[maxSize + 1];
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
index a4a83ec..5be4521 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
@@ -331,8 +331,10 @@ SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const stri
 
     if (altNames.size() > 0)
         return altNames.begin()->second;
-    else
+    else {
+        __spf_print(1, "%s %s %s\n", func->symbol()->identifier(), varName.c_str(), locName.c_str());
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+    }
 
     return NULL;
 }
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 7a1ee3e..3c9fac7 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2392"
+#define VERSION_SPF "2393"

From 0b594f7c2a1e08618fa60ec771b1e4e978665a32 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Wed, 5 Mar 2025 12:31:01 +0300
Subject: [PATCH 19/44] fixed module analysis

---
 .../_src/Distribution/Distribution.cpp        | 12 ++++----
 .../Sapfor_2017/_src/Utils/module_utils.cpp   | 28 +++++++++++--------
 .../experts/Sapfor_2017/_src/Utils/version.h  |  2 +-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.cpp b/sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.cpp
index a88ec49..6f99a0c 100644
--- a/sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.cpp
@@ -373,14 +373,14 @@ namespace Distribution
         vector<vector<vType>> vertByTrees;
         set<vType> unqieTrees = G.FindTrees(trees, vertByTrees);
 
-        __spf_print(needPrint, "GRAPH size: |V| = %d, |E| = %d\n", G.GetNumberOfV(), G.GetNumberOfE() / 2);
-        __spf_print(needPrint, "TREES count %d\n", (int)unqieTrees.size());
+        __spf_print(needPrint, "    GRAPH size: |V| = %d, |E| = %d\n", G.GetNumberOfV(), G.GetNumberOfE() / 2);
+        __spf_print(needPrint, "    TREES count %d\n", (int)unqieTrees.size());
         vector<unsigned char> tmp;
         for (int z = 0; z < vertByTrees.size(); ++z)
             if (vertByTrees[z].size())
-                __spf_print(needPrint, "TREES %d: V = %d, E = %d\n", z, (int)vertByTrees[z].size(), G.MakeConnected(vertByTrees[z][0], tmp).second);
+                __spf_print(needPrint, "    TREES %d: V = %d, E = %d\n", z, (int)vertByTrees[z].size(), G.MakeConnected(vertByTrees[z][0], tmp).second);
             else
-                __spf_print(needPrint, "TREES %d: V = %d, E = %d\n", z, 0, 0);
+                __spf_print(needPrint, "    TREES %d: V = %d, E = %d\n", z, 0, 0);
 
         toDelArcs = G.CreateMaximumSpanningTree();
         return make_pair(allOnlySecondType, globalSum);
@@ -401,7 +401,7 @@ namespace Distribution
                     maxElem = std::max(maxElem, cycleShortInfo);
 
             if (maxElem != 0 && needPrint)
-                printf("SAPFOR: max elem for cache %lld, in MB: %f\n", maxElem, maxElem / 1024. / 1024. * sizeof(unsigned));
+                printf("  SAPFOR: max elem for cache %lld, in MB: %f\n", maxElem, maxElem / 1024. / 1024. * sizeof(unsigned));
 
             unsigned *fastCache = new unsigned[maxElem];
             memset(fastCache, 0, sizeof(unsigned) * maxElem);
@@ -409,7 +409,7 @@ namespace Distribution
             char buf[256];
             if (needPrint)
             {
-                sprintf(buf, "PROF: [%d TREE]:\n", k);
+                sprintf(buf, "  PROF: [%d TREE]:\n", k);
                 addToGlobalBufferAndPrint(buf);
             }
 
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
index 5be4521..84659fc 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
@@ -296,12 +296,8 @@ static SgStatement* findModWithName(const vector<SgStatement*>& modules, const s
 static map<SgStatement*, set<SgSymbol*>> symbolsForFunc;
 static set<string> allFiles;
 
-static const set<SgSymbol*>& getModeulSymbols(SgStatement *func)
+static void getModuleSymbols(SgStatement* func, set<SgSymbol*>& symbs)
 {
-    if (symbolsForFunc.find(func) != symbolsForFunc.end())
-        return symbolsForFunc[func];
-
-    set<SgSymbol*> symbs;
     SgSymbol* s = func->symbol()->next();
     while (s)
     {
@@ -309,6 +305,20 @@ static const set<SgSymbol*>& getModeulSymbols(SgStatement *func)
             symbs.insert(s);
         s = s->next();
     }
+}
+
+static const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
+{
+    if (symbolsForFunc.find(func) != symbolsForFunc.end())
+        return symbolsForFunc[func];
+
+    set<SgSymbol*> symbs;
+    getModuleSymbols(func, symbs);
+
+    //if function in contains
+    func = func->controlParent();
+    if (isSgProgHedrStmt(func))
+        getModuleSymbols(func, symbs);
 
     symbolsForFunc[func] = symbs;
     return symbolsForFunc[func];
@@ -317,16 +327,12 @@ static const set<SgSymbol*>& getModeulSymbols(SgStatement *func)
 SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const string& locName)
 {
     map<string, SgSymbol*> altNames;
-    for (const auto& s : getModeulSymbols(func))
+    for (const auto& s : getModuleSymbols(func))
     {
         SgSymbol* orig = OriginalSymbol(s);
+        //any suitable symbol can be used
         if (orig->identifier() == varName && orig->scope()->symbol()->identifier() == locName)
-        {
-            if (altNames.count(s->identifier()))
-                printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
-
             altNames[s->identifier()] = s;
-        }
     }
 
     if (altNames.size() > 0)
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 3c9fac7..88a95aa 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2393"
+#define VERSION_SPF "2394"

From ab294fbeb268e10801f95dc1ca695d414eb97aa4 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Thu, 6 Mar 2025 20:07:20 +0300
Subject: [PATCH 20/44] fdvm updated

---
 dvm/fdvm/trunk/Sage/h/tag                     |    1 +
 dvm/fdvm/trunk/Sage/h/tag.h                   |    3 +-
 dvm/fdvm/trunk/Sage/lib/include/bif_node.def  |    1 +
 .../trunk/Sage/lib/include/unparseDVM.def     |   10 +-
 dvm/fdvm/trunk/fdvm/acc_rtc.cpp               |   22 +-
 dvm/fdvm/trunk/include/dvm_tag.h              |    1 +
 dvm/fdvm/trunk/include/fdvm_version.h         |    2 +-
 dvm/fdvm/trunk/parser/fspf.gram               |   10 +-
 dvm/fdvm/trunk/parser/gram1.tab.c             | 8764 ++++++++---------
 dvm/fdvm/trunk/parser/gram1.tab.h             |    9 +-
 dvm/fdvm/trunk/parser/gram1.y                 |   11 +-
 dvm/fdvm/trunk/parser/lexfdvm.c               |    1 +
 dvm/fdvm/trunk/parser/tag                     |    1 +
 dvm/fdvm/trunk/parser/tag.h                   |    3 +-
 dvm/fdvm/trunk/parser/tokdefs.h               |    1 +
 dvm/fdvm/trunk/parser/tokens                  |    1 +
 16 files changed, 4417 insertions(+), 4424 deletions(-)

diff --git a/dvm/fdvm/trunk/Sage/h/tag b/dvm/fdvm/trunk/Sage/h/tag
index adffa06..343d1f5 100644
--- a/dvm/fdvm/trunk/Sage/h/tag
+++ b/dvm/fdvm/trunk/Sage/h/tag
@@ -624,4 +624,5 @@
 #define SPF_COVER_OP                     972     /* SAPFOR */
 #define SPF_MERGE_OP                     973     /* SAPFOR */
 #define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
+#define SPF_WEIGHT_OP			 975     /* SAPFOR */
 
diff --git a/dvm/fdvm/trunk/Sage/h/tag.h b/dvm/fdvm/trunk/Sage/h/tag.h
index d8131c1..02ff849 100644
--- a/dvm/fdvm/trunk/Sage/h/tag.h
+++ b/dvm/fdvm/trunk/Sage/h/tag.h
@@ -239,7 +239,7 @@ script using "tag".  Run make tag.h to regenerate this file */
   tag [ DVM_TEMPLATE_CREATE_DIR ] = "DVM_TEMPLATE_CREATE_DIR";
   tag [ DVM_TEMPLATE_DELETE_DIR ] = "DVM_TEMPLATE_DELETE_DIR";
   tag [ PRIVATE_AR_DECL ] = "PRIVATE_AR_DECL";
-  
+    
 /***************** variant tags for low level nodes ********************/
 
   tag [ INT_VAL ] = "INT_VAL";
@@ -626,4 +626,5 @@ script using "tag".  Run make tag.h to regenerate this file */
   tag [ SPF_COVER_OP ] = "SPF_COVER_OP";
   tag [ SPF_MERGE_OP ] = "SPF_MERGE_OP";
   tag [ SPF_PROCESS_PRIVATE_OP ] = "SPF_PROCESS_PRIVATE_OP";
+  tag [ SPF_WEIGHT_OP ] = "SPF_WEIGHT_OP";
 
diff --git a/dvm/fdvm/trunk/Sage/lib/include/bif_node.def b/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
index 3e0f8e5..bf4065f 100644
--- a/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
+++ b/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
@@ -464,6 +464,7 @@ DEFNODECODE(SPF_UNROLL_OP, "nodetext",'e',1,LLNODE,    		'_','_','_','_','_')
 DEFNODECODE(SPF_COVER_OP, "nodetext",'e',1,LLNODE,    		'_','_','_','_','_')
 DEFNODECODE(SPF_MERGE_OP, "nodetext",'e',0,LLNODE,    		'_','_','_','_','_')
 DEFNODECODE(SPF_PROCESS_PRIVATE_OP, "nodetext",'e',1,LLNODE,	'_','_','_','_','_')
+DEFNODECODE(SPF_WEIGHT_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
 
 DEFNODECODE(SPF_ANALYSIS_DIR,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
 DEFNODECODE(SPF_PARALLEL_DIR,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
diff --git a/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def b/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
index a460aec..8aa7f6c 100644
--- a/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
+++ b/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
@@ -434,11 +434,15 @@ DEFNODECODE(SPF_PARAMETER_OP,         "PARAMETER (%LL1)",
 'e',1,LLNODE)
 DEFNODECODE(SPF_UNROLL_OP,            "UNROLL %IF(%LL1 != %NULL)(%LL1)%ENDIF",
 'e',1,LLNODE)
-DEFNODECODE(SPF_MERGE_OP,            "MERGE",
+DEFNODECODE(SPF_MERGE_OP,             "MERGE",
 'e',0,LLNODE)
-DEFNODECODE(SPF_COVER_OP,            "COVER (%LL1)",
+DEFNODECODE(SPF_COVER_OP,             "COVER (%LL1)",
 'e',1,LLNODE)
-DEFNODECODE(SPF_PROCESS_PRIVATE_OP,  "PROCESS_PRIVATE (%LL1)",
+DEFNODECODE(SPF_PROCESS_PRIVATE_OP,   "PROCESS_PRIVATE (%LL1)",
 'e',1,LLNODE)
+DEFNODECODE(SPF_WEIGHT_OP,	      "WEIGHT (%LL1)",
+'e',1,LLNODE)
+DEFNODECODE(SPF_CODE_COVERAGE_OP,     "CODE_COVERAGE",
+'e',0,LLNODE)
 
 
diff --git a/dvm/fdvm/trunk/fdvm/acc_rtc.cpp b/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
index 331878a..aea3e12 100644
--- a/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
+++ b/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
@@ -340,15 +340,21 @@ void _RTC_UnparsedFunctionsToKernelConst(SgStatement *stmt)
     char *buffer = _RTC_PrototypesForKernel(call_list);
 
     for (; call_list; call_list = call_list->next)
-    {
+    {   SgStatement *stmt, *end_st;
         gnode = GRAPHNODE(call_list->symb);
-        char *unp_buf = UnparseBif_Char(gnode->st_copy->thebif, C_LANG);
-        char *buf = new char[strlen(unp_buf) + strlen(buffer) + 1];
-        //buf[0] = '\0';
-        strcpy(buf, buffer);
-        strcat(buf, unp_buf);
-        delete[] buffer;
-        buffer = buf;
+        end_st = gnode->st_copy_first->lastNodeOfStmt()->lexNext();
+        stmt = gnode->st_copy;
+        while (stmt != end_st) //st_copy,...,st_copy_first
+        {
+            char *unp_buf = UnparseBif_Char(stmt->thebif, C_LANG);
+            char *buf = new char[strlen(unp_buf) + strlen(buffer) + 1];
+            //buf[0] = '\0';
+            strcpy(buf, buffer);
+            strcat(buf, unp_buf);
+            delete[] buffer;
+            buffer = buf;
+            stmt = stmt->lastNodeOfStmt()->lexNext();
+        }
     }
     buffer = _RTC_convertUnparse(buffer);
   
diff --git a/dvm/fdvm/trunk/include/dvm_tag.h b/dvm/fdvm/trunk/include/dvm_tag.h
index c04f2a7..50a7dde 100644
--- a/dvm/fdvm/trunk/include/dvm_tag.h
+++ b/dvm/fdvm/trunk/include/dvm_tag.h
@@ -157,3 +157,4 @@
 #define SPF_COVER_OP                     972     /* SAPFOR */
 #define SPF_MERGE_OP                     973     /* SAPFOR */
 #define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
+#define SPF_WEIGHT_OP                    975     /* SAPFOR */
\ No newline at end of file
diff --git a/dvm/fdvm/trunk/include/fdvm_version.h b/dvm/fdvm/trunk/include/fdvm_version.h
index ac65216..4986c60 100644
--- a/dvm/fdvm/trunk/include/fdvm_version.h
+++ b/dvm/fdvm/trunk/include/fdvm_version.h
@@ -1 +1 @@
-#define COMPILER_VERSION  "6.0 (11.05.2018)" 
+#define COMPILER_VERSION "4.1 (06.03.2025)" 
diff --git a/dvm/fdvm/trunk/parser/fspf.gram b/dvm/fdvm/trunk/parser/fspf.gram
index a4da9b5..6f288af 100644
--- a/dvm/fdvm/trunk/parser/fspf.gram
+++ b/dvm/fdvm/trunk/parser/fspf.gram
@@ -33,7 +33,15 @@ characteristic_list:  characteristic
              ;
 
 characteristic: needkeyword SPF_CODE_COVERAGE
-               { $$ = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
+                {  $$ = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
+              | needkeyword SPF_WEIGHT LEFTPAR DP_CONSTANT RIGHTPAR
+                { 
+                   PTR_LLND w;
+                   w = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
+	           w->entry.string_val = copys(yytext);
+	           w->type = global_double;
+                   $$ = make_llnd(fi,SPF_WEIGHT_OP,w,LLNULL,SMNULL);
+                }
               ;
 
 opt_clause_apply_fragment: 
diff --git a/dvm/fdvm/trunk/parser/gram1.tab.c b/dvm/fdvm/trunk/parser/gram1.tab.c
index 88fe3d4..91f0ffa 100644
--- a/dvm/fdvm/trunk/parser/gram1.tab.c
+++ b/dvm/fdvm/trunk/parser/gram1.tab.c
@@ -62,7 +62,7 @@
 
 
 /* Copy the first part of user declarations.  */
-#line 358 "gram1.y" /* yacc.c:339  */
+#line 359 "gram1.y" /* yacc.c:339  */
 
 #include <string.h>
 #include "inc.h"
@@ -534,8 +534,9 @@ extern int yydebug;
     SPF_MERGE = 354,
     SPF_COVER = 355,
     SPF_PROCESS_PRIVATE = 356,
-    BINARY_OP = 359,
-    UNARY_OP = 360
+    SPF_WEIGHT = 357,
+    BINARY_OP = 360,
+    UNARY_OP = 361
   };
 #endif
 
@@ -544,7 +545,7 @@ extern int yydebug;
 
 union YYSTYPE
 {
-#line 439 "gram1.y" /* yacc.c:355  */
+#line 440 "gram1.y" /* yacc.c:355  */
 
     int token;
     char charv;
@@ -556,7 +557,7 @@ union YYSTYPE
     PTR_HASH hash_entry;
     PTR_LABEL label;
 
-#line 560 "gram1.tab.c" /* yacc.c:355  */
+#line 561 "gram1.tab.c" /* yacc.c:355  */
 };
 
 typedef union YYSTYPE YYSTYPE;
@@ -572,7 +573,7 @@ int yyparse (void);
 #endif /* !YY_YY_GRAM1_TAB_H_INCLUDED  */
 
 /* Copy the second part of user declarations.  */
-#line 649 "gram1.y" /* yacc.c:358  */
+#line 650 "gram1.y" /* yacc.c:358  */
 
 void add_scope_level();
 void delete_beyond_scope_level();
@@ -718,7 +719,7 @@ PTR_BFND make_endparallelworkshare();/*OMP*/
 PTR_BFND make_parallelworkshare();/*OMP*/
 
 
-#line 722 "gram1.tab.c" /* yacc.c:358  */
+#line 723 "gram1.tab.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -960,21 +961,21 @@ union yyalloc
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  2
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   5948
+#define YYLAST   5655
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  361
+#define YYNTOKENS  362
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  547
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  1312
+#define YYNRULES  1313
 /* YYNSTATES -- Number of states.  */
-#define YYNSTATES  2613
+#define YYNSTATES  2617
 
 /* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
    by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   360
+#define YYMAXUTOK   361
 
 #define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
@@ -1018,146 +1019,146 @@ static const yytype_uint16 yytranslate[] =
      322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
      332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
      342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
-     352,   353,   354,   355,   356,   357,   358,     1,     2,   359,
-     360
+     352,   353,   354,   355,   356,   357,   358,   359,     1,     2,
+     360,   361
 };
 
 #if YYDEBUG
   /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   796,   796,   797,   801,   803,   817,   848,   857,   863,
-     883,   892,   908,   920,   930,   937,   943,   948,   953,   977,
-    1004,  1018,  1020,  1022,  1026,  1043,  1057,  1081,  1097,  1111,
-    1129,  1131,  1138,  1142,  1143,  1150,  1151,  1159,  1160,  1162,
-    1166,  1167,  1171,  1175,  1181,  1191,  1195,  1200,  1207,  1208,
-    1209,  1210,  1211,  1212,  1213,  1214,  1215,  1216,  1217,  1218,
-    1219,  1220,  1221,  1226,  1231,  1238,  1240,  1241,  1242,  1243,
-    1244,  1245,  1246,  1247,  1248,  1249,  1250,  1251,  1254,  1258,
-    1266,  1274,  1283,  1291,  1295,  1297,  1301,  1303,  1305,  1307,
-    1309,  1311,  1313,  1315,  1317,  1319,  1321,  1323,  1325,  1327,
-    1329,  1331,  1333,  1335,  1340,  1349,  1359,  1367,  1377,  1398,
-    1418,  1419,  1421,  1425,  1427,  1431,  1435,  1437,  1441,  1447,
-    1451,  1453,  1457,  1461,  1465,  1469,  1473,  1479,  1483,  1487,
-    1493,  1498,  1505,  1516,  1529,  1540,  1553,  1563,  1576,  1581,
-    1588,  1591,  1596,  1601,  1608,  1611,  1621,  1635,  1638,  1657,
-    1684,  1686,  1698,  1706,  1707,  1708,  1709,  1710,  1711,  1712,
-    1717,  1718,  1722,  1724,  1731,  1736,  1737,  1739,  1741,  1754,
-    1760,  1766,  1775,  1784,  1797,  1798,  1801,  1805,  1820,  1835,
-    1853,  1874,  1894,  1916,  1933,  1951,  1958,  1965,  1972,  1985,
-    1992,  1999,  2010,  2014,  2016,  2021,  2039,  2050,  2062,  2074,
-    2088,  2094,  2101,  2107,  2113,  2121,  2128,  2144,  2147,  2156,
-    2158,  2162,  2166,  2186,  2190,  2192,  2196,  2197,  2200,  2202,
-    2204,  2206,  2208,  2211,  2214,  2218,  2224,  2228,  2232,  2234,
-    2239,  2240,  2244,  2248,  2250,  2254,  2256,  2258,  2263,  2267,
-    2269,  2271,  2274,  2276,  2277,  2278,  2279,  2280,  2281,  2282,
-    2283,  2286,  2287,  2293,  2296,  2297,  2299,  2303,  2304,  2307,
-    2308,  2310,  2314,  2315,  2316,  2317,  2319,  2322,  2323,  2332,
-    2334,  2341,  2348,  2355,  2364,  2366,  2368,  2372,  2374,  2378,
-    2387,  2394,  2401,  2403,  2407,  2411,  2417,  2419,  2424,  2428,
-    2432,  2439,  2446,  2456,  2458,  2462,  2474,  2477,  2486,  2499,
-    2505,  2511,  2517,  2525,  2535,  2537,  2541,  2543,  2576,  2578,
-    2582,  2621,  2622,  2626,  2626,  2631,  2635,  2643,  2652,  2661,
-    2671,  2677,  2680,  2682,  2686,  2694,  2709,  2716,  2718,  2722,
-    2738,  2738,  2742,  2744,  2756,  2758,  2762,  2768,  2780,  2792,
-    2809,  2838,  2839,  2847,  2848,  2852,  2854,  2856,  2867,  2871,
-    2877,  2879,  2883,  2885,  2887,  2891,  2893,  2897,  2899,  2901,
-    2903,  2905,  2907,  2909,  2911,  2913,  2915,  2917,  2919,  2921,
-    2923,  2925,  2927,  2929,  2931,  2933,  2935,  2937,  2939,  2941,
-    2945,  2946,  2957,  3031,  3043,  3045,  3049,  3180,  3230,  3274,
-    3316,  3374,  3376,  3378,  3417,  3460,  3471,  3472,  3476,  3481,
-    3482,  3486,  3488,  3494,  3496,  3502,  3515,  3521,  3528,  3534,
-    3542,  3550,  3566,  3576,  3589,  3596,  3598,  3621,  3623,  3625,
-    3627,  3629,  3631,  3633,  3635,  3639,  3639,  3639,  3653,  3655,
-    3678,  3680,  3682,  3698,  3700,  3702,  3716,  3719,  3721,  3729,
-    3731,  3733,  3735,  3789,  3809,  3824,  3833,  3836,  3886,  3892,
-    3897,  3915,  3917,  3919,  3921,  3923,  3926,  3932,  3934,  3936,
-    3939,  3941,  3943,  3970,  3979,  3988,  3989,  3991,  3996,  4003,
-    4011,  4013,  4017,  4020,  4022,  4026,  4032,  4034,  4036,  4038,
-    4042,  4044,  4053,  4054,  4061,  4062,  4066,  4070,  4091,  4094,
-    4098,  4100,  4107,  4112,  4113,  4124,  4136,  4159,  4184,  4185,
-    4192,  4194,  4196,  4198,  4200,  4204,  4281,  4293,  4300,  4302,
-    4303,  4305,  4314,  4321,  4328,  4336,  4341,  4346,  4349,  4352,
-    4355,  4358,  4361,  4365,  4383,  4388,  4407,  4426,  4430,  4431,
-    4434,  4438,  4443,  4450,  4452,  4454,  4458,  4459,  4470,  4485,
-    4489,  4496,  4499,  4509,  4522,  4535,  4538,  4540,  4543,  4546,
-    4550,  4559,  4562,  4566,  4568,  4574,  4578,  4580,  4582,  4589,
-    4593,  4595,  4599,  4601,  4605,  4624,  4640,  4649,  4658,  4660,
-    4664,  4690,  4705,  4720,  4737,  4745,  4754,  4762,  4767,  4772,
-    4794,  4810,  4812,  4816,  4818,  4825,  4827,  4829,  4833,  4835,
-    4837,  4839,  4841,  4843,  4847,  4850,  4853,  4859,  4865,  4874,
-    4878,  4885,  4887,  4891,  4893,  4895,  4900,  4905,  4910,  4915,
-    4924,  4929,  4935,  4936,  4951,  4952,  4953,  4954,  4955,  4956,
-    4957,  4958,  4959,  4960,  4961,  4962,  4963,  4964,  4965,  4966,
-    4967,  4968,  4969,  4972,  4973,  4974,  4975,  4976,  4977,  4978,
-    4979,  4980,  4981,  4982,  4983,  4984,  4985,  4986,  4987,  4988,
-    4989,  4990,  4991,  4992,  4993,  4994,  4995,  4996,  4997,  4998,
-    4999,  5000,  5001,  5002,  5003,  5004,  5005,  5006,  5007,  5008,
-    5009,  5010,  5011,  5012,  5013,  5014,  5015,  5019,  5021,  5032,
-    5053,  5057,  5059,  5063,  5076,  5080,  5082,  5086,  5097,  5108,
-    5112,  5114,  5118,  5120,  5122,  5137,  5149,  5169,  5189,  5211,
-    5217,  5226,  5234,  5240,  5248,  5255,  5261,  5270,  5274,  5280,
-    5288,  5302,  5316,  5321,  5337,  5352,  5380,  5382,  5386,  5388,
-    5392,  5421,  5444,  5465,  5466,  5470,  5491,  5493,  5497,  5505,
-    5509,  5514,  5516,  5518,  5520,  5526,  5528,  5532,  5542,  5546,
-    5548,  5553,  5555,  5559,  5563,  5569,  5579,  5581,  5585,  5587,
-    5589,  5596,  5614,  5615,  5619,  5621,  5625,  5632,  5642,  5671,
-    5686,  5693,  5711,  5713,  5717,  5731,  5757,  5770,  5786,  5788,
-    5791,  5793,  5799,  5803,  5831,  5833,  5837,  5845,  5851,  5854,
-    5912,  5976,  5978,  5981,  5985,  5989,  5993,  6010,  6022,  6026,
-    6030,  6040,  6045,  6050,  6057,  6066,  6066,  6077,  6088,  6090,
-    6094,  6105,  6109,  6111,  6115,  6126,  6130,  6132,  6136,  6148,
-    6150,  6157,  6159,  6163,  6179,  6187,  6198,  6200,  6204,  6207,
-    6212,  6222,  6224,  6228,  6230,  6239,  6240,  6244,  6246,  6251,
-    6252,  6253,  6254,  6255,  6256,  6257,  6258,  6259,  6260,  6261,
-    6264,  6269,  6273,  6277,  6281,  6294,  6298,  6302,  6306,  6309,
-    6311,  6313,  6317,  6319,  6323,  6327,  6329,  6333,  6338,  6342,
-    6346,  6348,  6352,  6361,  6364,  6370,  6377,  6380,  6382,  6386,
-    6388,  6392,  6404,  6406,  6410,  6414,  6416,  6420,  6422,  6424,
-    6426,  6428,  6430,  6432,  6436,  6440,  6444,  6448,  6452,  6459,
-    6465,  6470,  6473,  6476,  6489,  6491,  6495,  6497,  6502,  6508,
-    6514,  6520,  6526,  6532,  6538,  6544,  6550,  6559,  6565,  6582,
-    6584,  6592,  6600,  6602,  6606,  6610,  6612,  6616,  6618,  6626,
-    6630,  6642,  6645,  6663,  6665,  6669,  6671,  6675,  6677,  6681,
-    6685,  6689,  6698,  6702,  6706,  6711,  6715,  6727,  6729,  6733,
-    6738,  6742,  6744,  6748,  6750,  6754,  6759,  6766,  6789,  6791,
-    6793,  6795,  6797,  6801,  6812,  6816,  6831,  6838,  6845,  6846,
-    6850,  6854,  6862,  6866,  6870,  6878,  6883,  6897,  6899,  6903,
-    6905,  6914,  6916,  6918,  6920,  6956,  6960,  6964,  6968,  6972,
-    6984,  6986,  6990,  6993,  6995,  6999,  7004,  7011,  7014,  7022,
-    7026,  7031,  7033,  7040,  7045,  7049,  7053,  7057,  7061,  7065,
-    7068,  7070,  7074,  7076,  7078,  7082,  7086,  7098,  7100,  7104,
-    7106,  7110,  7113,  7116,  7120,  7126,  7138,  7140,  7144,  7146,
-    7150,  7158,  7170,  7171,  7173,  7177,  7181,  7183,  7191,  7195,
-    7198,  7200,  7204,  7208,  7210,  7211,  7212,  7213,  7214,  7215,
-    7216,  7217,  7218,  7219,  7220,  7221,  7222,  7223,  7224,  7225,
-    7226,  7227,  7228,  7229,  7230,  7231,  7232,  7233,  7234,  7235,
-    7238,  7244,  7250,  7256,  7262,  7266,  7272,  7273,  7274,  7275,
-    7276,  7277,  7278,  7279,  7280,  7283,  7288,  7293,  7299,  7305,
-    7311,  7316,  7322,  7328,  7334,  7341,  7347,  7353,  7360,  7364,
-    7366,  7372,  7379,  7385,  7391,  7397,  7403,  7409,  7415,  7421,
-    7427,  7433,  7439,  7445,  7455,  7460,  7466,  7470,  7476,  7477,
-    7478,  7479,  7482,  7490,  7496,  7502,  7507,  7513,  7520,  7526,
-    7530,  7536,  7537,  7538,  7539,  7540,  7541,  7544,  7553,  7557,
-    7563,  7570,  7577,  7584,  7593,  7599,  7605,  7609,  7615,  7616,
-    7619,  7625,  7631,  7635,  7642,  7643,  7646,  7652,  7658,  7663,
-    7671,  7677,  7682,  7689,  7693,  7699,  7700,  7701,  7702,  7703,
-    7704,  7705,  7706,  7707,  7708,  7709,  7713,  7718,  7723,  7730,
-    7735,  7741,  7747,  7752,  7757,  7762,  7766,  7771,  7776,  7780,
-    7785,  7789,  7795,  7800,  7806,  7811,  7817,  7827,  7831,  7835,
-    7839,  7845,  7848,  7852,  7853,  7855,  7856,  7857,  7858,  7859,
-    7860,  7863,  7867,  7871,  7873,  7875,  7879,  7881,  7883,  7887,
-    7889,  7893,  7895,  7899,  7902,  7905,  7910,  7912,  7914,  7916,
-    7918,  7922,  7926,  7931,  7935,  7937,  7941,  7943,  7947,  7951,
-    7955,  7960,  7962,  7966,  7976,  7981,  7982,  7986,  7988,  7992,
-    7994,  7997,  7998,  7999,  8000,  8001,  8002,  8005,  8009,  8013,
-    8017,  8019,  8021,  8025,  8027,  8031,  8036,  8037,  8042,  8043,
-    8047,  8051,  8053,  8057,  8058,  8059,  8060,  8061,  8064,  8068,
-    8072,  8076,  8080,  8083,  8085,  8089,  8093,  8095,  8099,  8100,
-    8101,  8104,  8108,  8112,  8116,  8118,  8122,  8124,  8126,  8128,
-    8131,  8133,  8135,  8137,  8141,  8148,  8152,  8154,  8158,  8162,
-    8164,  8168,  8170,  8172,  8174,  8176,  8180,  8182,  8186,  8188,
-    8192,  8194,  8199
+       0,   797,   797,   798,   802,   804,   818,   849,   858,   864,
+     884,   893,   909,   921,   931,   938,   944,   949,   954,   978,
+    1005,  1019,  1021,  1023,  1027,  1044,  1058,  1082,  1098,  1112,
+    1130,  1132,  1139,  1143,  1144,  1151,  1152,  1160,  1161,  1163,
+    1167,  1168,  1172,  1176,  1182,  1192,  1196,  1201,  1208,  1209,
+    1210,  1211,  1212,  1213,  1214,  1215,  1216,  1217,  1218,  1219,
+    1220,  1221,  1222,  1227,  1232,  1239,  1241,  1242,  1243,  1244,
+    1245,  1246,  1247,  1248,  1249,  1250,  1251,  1252,  1255,  1259,
+    1267,  1275,  1284,  1292,  1296,  1298,  1302,  1304,  1306,  1308,
+    1310,  1312,  1314,  1316,  1318,  1320,  1322,  1324,  1326,  1328,
+    1330,  1332,  1334,  1336,  1341,  1350,  1360,  1368,  1378,  1399,
+    1419,  1420,  1422,  1426,  1428,  1432,  1436,  1438,  1442,  1448,
+    1452,  1454,  1458,  1462,  1466,  1470,  1474,  1480,  1484,  1488,
+    1494,  1499,  1506,  1517,  1530,  1541,  1554,  1564,  1577,  1582,
+    1589,  1592,  1597,  1602,  1609,  1612,  1622,  1636,  1639,  1658,
+    1685,  1687,  1699,  1707,  1708,  1709,  1710,  1711,  1712,  1713,
+    1718,  1719,  1723,  1725,  1732,  1737,  1738,  1740,  1742,  1755,
+    1761,  1767,  1776,  1785,  1798,  1799,  1802,  1806,  1821,  1836,
+    1854,  1875,  1895,  1917,  1934,  1952,  1959,  1966,  1973,  1986,
+    1993,  2000,  2011,  2015,  2017,  2022,  2040,  2051,  2063,  2075,
+    2089,  2095,  2102,  2108,  2114,  2122,  2129,  2145,  2148,  2157,
+    2159,  2163,  2167,  2187,  2191,  2193,  2197,  2198,  2201,  2203,
+    2205,  2207,  2209,  2212,  2215,  2219,  2225,  2229,  2233,  2235,
+    2240,  2241,  2245,  2249,  2251,  2255,  2257,  2259,  2264,  2268,
+    2270,  2272,  2275,  2277,  2278,  2279,  2280,  2281,  2282,  2283,
+    2284,  2287,  2288,  2294,  2297,  2298,  2300,  2304,  2305,  2308,
+    2309,  2311,  2315,  2316,  2317,  2318,  2320,  2323,  2324,  2333,
+    2335,  2342,  2349,  2356,  2365,  2367,  2369,  2373,  2375,  2379,
+    2388,  2395,  2402,  2404,  2408,  2412,  2418,  2420,  2425,  2429,
+    2433,  2440,  2447,  2457,  2459,  2463,  2475,  2478,  2487,  2500,
+    2506,  2512,  2518,  2526,  2536,  2538,  2542,  2544,  2577,  2579,
+    2583,  2622,  2623,  2627,  2627,  2632,  2636,  2644,  2653,  2662,
+    2672,  2678,  2681,  2683,  2687,  2695,  2710,  2717,  2719,  2723,
+    2739,  2739,  2743,  2745,  2757,  2759,  2763,  2769,  2781,  2793,
+    2810,  2839,  2840,  2848,  2849,  2853,  2855,  2857,  2868,  2872,
+    2878,  2880,  2884,  2886,  2888,  2892,  2894,  2898,  2900,  2902,
+    2904,  2906,  2908,  2910,  2912,  2914,  2916,  2918,  2920,  2922,
+    2924,  2926,  2928,  2930,  2932,  2934,  2936,  2938,  2940,  2942,
+    2946,  2947,  2958,  3032,  3044,  3046,  3050,  3181,  3231,  3275,
+    3317,  3375,  3377,  3379,  3418,  3461,  3472,  3473,  3477,  3482,
+    3483,  3487,  3489,  3495,  3497,  3503,  3516,  3522,  3529,  3535,
+    3543,  3551,  3567,  3577,  3590,  3597,  3599,  3622,  3624,  3626,
+    3628,  3630,  3632,  3634,  3636,  3640,  3640,  3640,  3654,  3656,
+    3679,  3681,  3683,  3699,  3701,  3703,  3717,  3720,  3722,  3730,
+    3732,  3734,  3736,  3790,  3810,  3825,  3834,  3837,  3887,  3893,
+    3898,  3916,  3918,  3920,  3922,  3924,  3927,  3933,  3935,  3937,
+    3940,  3942,  3944,  3971,  3980,  3989,  3990,  3992,  3997,  4004,
+    4012,  4014,  4018,  4021,  4023,  4027,  4033,  4035,  4037,  4039,
+    4043,  4045,  4054,  4055,  4062,  4063,  4067,  4071,  4092,  4095,
+    4099,  4101,  4108,  4113,  4114,  4125,  4137,  4160,  4185,  4186,
+    4193,  4195,  4197,  4199,  4201,  4205,  4282,  4294,  4301,  4303,
+    4304,  4306,  4315,  4322,  4329,  4337,  4342,  4347,  4350,  4353,
+    4356,  4359,  4362,  4366,  4384,  4389,  4408,  4427,  4431,  4432,
+    4435,  4439,  4444,  4451,  4453,  4455,  4459,  4460,  4471,  4486,
+    4490,  4497,  4500,  4510,  4523,  4536,  4539,  4541,  4544,  4547,
+    4551,  4560,  4563,  4567,  4569,  4575,  4579,  4581,  4583,  4590,
+    4594,  4596,  4600,  4602,  4606,  4625,  4641,  4650,  4659,  4661,
+    4665,  4691,  4706,  4721,  4738,  4746,  4755,  4763,  4768,  4773,
+    4795,  4811,  4813,  4817,  4819,  4826,  4828,  4830,  4834,  4836,
+    4838,  4840,  4842,  4844,  4848,  4851,  4854,  4860,  4866,  4875,
+    4879,  4886,  4888,  4892,  4894,  4896,  4901,  4906,  4911,  4916,
+    4925,  4930,  4936,  4937,  4952,  4953,  4954,  4955,  4956,  4957,
+    4958,  4959,  4960,  4961,  4962,  4963,  4964,  4965,  4966,  4967,
+    4968,  4969,  4970,  4973,  4974,  4975,  4976,  4977,  4978,  4979,
+    4980,  4981,  4982,  4983,  4984,  4985,  4986,  4987,  4988,  4989,
+    4990,  4991,  4992,  4993,  4994,  4995,  4996,  4997,  4998,  4999,
+    5000,  5001,  5002,  5003,  5004,  5005,  5006,  5007,  5008,  5009,
+    5010,  5011,  5012,  5013,  5014,  5015,  5016,  5020,  5022,  5033,
+    5054,  5058,  5060,  5064,  5077,  5081,  5083,  5087,  5098,  5109,
+    5113,  5115,  5119,  5121,  5123,  5138,  5150,  5170,  5190,  5212,
+    5218,  5227,  5235,  5241,  5249,  5256,  5262,  5271,  5275,  5281,
+    5289,  5303,  5317,  5322,  5338,  5353,  5381,  5383,  5387,  5389,
+    5393,  5422,  5445,  5466,  5467,  5471,  5492,  5494,  5498,  5506,
+    5510,  5515,  5517,  5519,  5521,  5527,  5529,  5533,  5543,  5547,
+    5549,  5554,  5556,  5560,  5564,  5570,  5580,  5582,  5586,  5588,
+    5590,  5597,  5615,  5616,  5620,  5622,  5626,  5633,  5643,  5672,
+    5687,  5694,  5712,  5714,  5718,  5732,  5758,  5771,  5787,  5789,
+    5792,  5794,  5800,  5804,  5832,  5834,  5838,  5846,  5852,  5855,
+    5913,  5977,  5979,  5982,  5986,  5990,  5994,  6011,  6023,  6027,
+    6031,  6041,  6046,  6051,  6058,  6067,  6067,  6078,  6089,  6091,
+    6095,  6106,  6110,  6112,  6116,  6127,  6131,  6133,  6137,  6149,
+    6151,  6158,  6160,  6164,  6180,  6188,  6199,  6201,  6205,  6208,
+    6213,  6223,  6225,  6229,  6231,  6240,  6241,  6245,  6247,  6252,
+    6253,  6254,  6255,  6256,  6257,  6258,  6259,  6260,  6261,  6262,
+    6265,  6270,  6274,  6278,  6282,  6295,  6299,  6303,  6307,  6310,
+    6312,  6314,  6318,  6320,  6324,  6328,  6330,  6334,  6339,  6343,
+    6347,  6349,  6353,  6362,  6365,  6371,  6378,  6381,  6383,  6387,
+    6389,  6393,  6405,  6407,  6411,  6415,  6417,  6421,  6423,  6425,
+    6427,  6429,  6431,  6433,  6437,  6441,  6445,  6449,  6453,  6460,
+    6466,  6471,  6474,  6477,  6490,  6492,  6496,  6498,  6503,  6509,
+    6515,  6521,  6527,  6533,  6539,  6545,  6551,  6560,  6566,  6583,
+    6585,  6593,  6601,  6603,  6607,  6611,  6613,  6617,  6619,  6627,
+    6631,  6643,  6646,  6664,  6666,  6670,  6672,  6676,  6678,  6682,
+    6686,  6690,  6699,  6703,  6707,  6712,  6716,  6728,  6730,  6734,
+    6739,  6743,  6745,  6749,  6751,  6755,  6760,  6767,  6790,  6792,
+    6794,  6796,  6798,  6802,  6813,  6817,  6832,  6839,  6846,  6847,
+    6851,  6855,  6863,  6867,  6871,  6879,  6884,  6898,  6900,  6904,
+    6906,  6915,  6917,  6919,  6921,  6957,  6961,  6965,  6969,  6973,
+    6985,  6987,  6991,  6994,  6996,  7000,  7005,  7012,  7015,  7023,
+    7027,  7032,  7034,  7041,  7046,  7050,  7054,  7058,  7062,  7066,
+    7069,  7071,  7075,  7077,  7079,  7083,  7087,  7099,  7101,  7105,
+    7107,  7111,  7114,  7117,  7121,  7127,  7139,  7141,  7145,  7147,
+    7151,  7159,  7171,  7172,  7174,  7178,  7182,  7184,  7192,  7196,
+    7199,  7201,  7205,  7209,  7211,  7212,  7213,  7214,  7215,  7216,
+    7217,  7218,  7219,  7220,  7221,  7222,  7223,  7224,  7225,  7226,
+    7227,  7228,  7229,  7230,  7231,  7232,  7233,  7234,  7235,  7236,
+    7239,  7245,  7251,  7257,  7263,  7267,  7273,  7274,  7275,  7276,
+    7277,  7278,  7279,  7280,  7281,  7284,  7289,  7294,  7300,  7306,
+    7312,  7317,  7323,  7329,  7335,  7342,  7348,  7354,  7361,  7365,
+    7367,  7373,  7380,  7386,  7392,  7398,  7404,  7410,  7416,  7422,
+    7428,  7434,  7440,  7446,  7456,  7461,  7467,  7471,  7477,  7478,
+    7479,  7480,  7483,  7491,  7497,  7503,  7508,  7514,  7521,  7527,
+    7531,  7537,  7538,  7539,  7540,  7541,  7542,  7545,  7554,  7558,
+    7564,  7571,  7578,  7585,  7594,  7600,  7606,  7610,  7616,  7617,
+    7620,  7626,  7632,  7636,  7643,  7644,  7647,  7653,  7659,  7664,
+    7672,  7678,  7683,  7690,  7694,  7700,  7701,  7702,  7703,  7704,
+    7705,  7706,  7707,  7708,  7709,  7710,  7714,  7719,  7724,  7731,
+    7736,  7742,  7748,  7753,  7758,  7763,  7767,  7772,  7777,  7781,
+    7786,  7790,  7796,  7801,  7807,  7812,  7818,  7828,  7832,  7836,
+    7840,  7846,  7849,  7853,  7854,  7856,  7857,  7858,  7859,  7860,
+    7861,  7864,  7868,  7872,  7874,  7876,  7880,  7882,  7884,  7888,
+    7890,  7894,  7896,  7900,  7903,  7906,  7911,  7913,  7915,  7917,
+    7919,  7923,  7927,  7932,  7936,  7938,  7942,  7944,  7948,  7952,
+    7956,  7961,  7963,  7967,  7977,  7982,  7983,  7987,  7989,  7993,
+    7995,  7998,  7999,  8000,  8001,  8002,  8003,  8006,  8010,  8014,
+    8018,  8020,  8022,  8026,  8028,  8032,  8034,  8045,  8046,  8051,
+    8052,  8056,  8060,  8062,  8066,  8067,  8068,  8069,  8070,  8073,
+    8077,  8081,  8085,  8089,  8092,  8094,  8098,  8102,  8104,  8108,
+    8109,  8110,  8113,  8117,  8121,  8125,  8127,  8131,  8133,  8135,
+    8137,  8140,  8142,  8144,  8146,  8150,  8157,  8161,  8163,  8167,
+    8171,  8173,  8177,  8179,  8181,  8183,  8185,  8189,  8191,  8195,
+    8197,  8201,  8203,  8208
 };
 #endif
 
@@ -1236,34 +1237,35 @@ static const char *const yytname[] =
   "SPF_CHECKPOINT", "SPF_EXCEPT", "SPF_FILES_COUNT", "SPF_INTERVAL",
   "SPF_TIME", "SPF_ITER", "SPF_FLEXIBLE", "SPF_APPLY_REGION",
   "SPF_APPLY_FRAGMENT", "SPF_CODE_COVERAGE", "SPF_UNROLL", "SPF_MERGE",
-  "SPF_COVER", "SPF_PROCESS_PRIVATE", "BINARY_OP", "UNARY_OP", "$accept",
-  "program", "stat", "thislabel", "entry", "new_prog", "proc_attr",
-  "procname", "funcname", "typedfunc", "opt_result_clause", "name",
-  "progname", "blokname", "arglist", "args", "arg", "filename",
-  "needkeyword", "keywordoff", "keyword_if_colon_follow", "spec",
-  "interface", "defined_op", "operator", "intrinsic_op", "type_dcl",
-  "end_type", "dcl", "options", "attr_spec_list", "attr_spec",
-  "intent_spec", "access_spec", "intent", "optional", "static", "private",
-  "private_attr", "sequence", "public", "public_attr", "type",
-  "opt_key_hedr", "attrib", "att_type", "typespec", "typename", "lengspec",
-  "proper_lengspec", "selector", "clause", "end_ioctl", "initial_value",
-  "dimension", "allocatable", "pointer", "target", "common", "namelist",
-  "namelist_group", "comblock", "var", "external", "intrinsic",
-  "equivalence", "equivset", "equivlist", "equi_object", "data", "data1",
-  "data_in", "in_data", "datapair", "datalvals", "datarvals", "datalval",
-  "data_null", "d_name", "dataname", "datasubs", "datarange",
-  "iconexprlist", "opticonexpr", "dataimplieddo", "dlist", "dataelt",
-  "datarval", "datavalue", "BOZ_const", "int_const", "unsignedint",
-  "real_const", "unsignedreal", "complex_const_data", "complex_part",
-  "iconexpr", "iconterm", "iconfactor", "iconprimary", "savelist",
-  "saveitem", "use_name_list", "use_key_word", "no_use_key_word",
-  "use_name", "paramlist", "paramitem", "module_proc_stmt",
-  "proc_name_list", "use_stat", "module_name", "only_list", "only_name",
-  "rename_list", "rename_name", "dims", "dimlist", "$@1", "dim", "ubound",
-  "labellist", "label", "implicit", "implist", "impitem", "imptype", "$@2",
-  "type_implicit", "letgroups", "letgroup", "letter", "inside", "in_dcl",
-  "opt_double_colon", "funarglist", "funarg", "funargs", "subscript_list",
-  "expr", "uexpr", "addop", "ident", "lhs", "array_ele_substring_func_ref",
+  "SPF_COVER", "SPF_PROCESS_PRIVATE", "SPF_WEIGHT", "BINARY_OP",
+  "UNARY_OP", "$accept", "program", "stat", "thislabel", "entry",
+  "new_prog", "proc_attr", "procname", "funcname", "typedfunc",
+  "opt_result_clause", "name", "progname", "blokname", "arglist", "args",
+  "arg", "filename", "needkeyword", "keywordoff",
+  "keyword_if_colon_follow", "spec", "interface", "defined_op", "operator",
+  "intrinsic_op", "type_dcl", "end_type", "dcl", "options",
+  "attr_spec_list", "attr_spec", "intent_spec", "access_spec", "intent",
+  "optional", "static", "private", "private_attr", "sequence", "public",
+  "public_attr", "type", "opt_key_hedr", "attrib", "att_type", "typespec",
+  "typename", "lengspec", "proper_lengspec", "selector", "clause",
+  "end_ioctl", "initial_value", "dimension", "allocatable", "pointer",
+  "target", "common", "namelist", "namelist_group", "comblock", "var",
+  "external", "intrinsic", "equivalence", "equivset", "equivlist",
+  "equi_object", "data", "data1", "data_in", "in_data", "datapair",
+  "datalvals", "datarvals", "datalval", "data_null", "d_name", "dataname",
+  "datasubs", "datarange", "iconexprlist", "opticonexpr", "dataimplieddo",
+  "dlist", "dataelt", "datarval", "datavalue", "BOZ_const", "int_const",
+  "unsignedint", "real_const", "unsignedreal", "complex_const_data",
+  "complex_part", "iconexpr", "iconterm", "iconfactor", "iconprimary",
+  "savelist", "saveitem", "use_name_list", "use_key_word",
+  "no_use_key_word", "use_name", "paramlist", "paramitem",
+  "module_proc_stmt", "proc_name_list", "use_stat", "module_name",
+  "only_list", "only_name", "rename_list", "rename_name", "dims",
+  "dimlist", "$@1", "dim", "ubound", "labellist", "label", "implicit",
+  "implist", "impitem", "imptype", "$@2", "type_implicit", "letgroups",
+  "letgroup", "letter", "inside", "in_dcl", "opt_double_colon",
+  "funarglist", "funarg", "funargs", "subscript_list", "expr", "uexpr",
+  "addop", "ident", "lhs", "array_ele_substring_func_ref",
   "structure_component", "array_element", "asubstring", "opt_substring",
   "substring", "opt_expr", "simple_const", "numeric_bool_const",
   "integer_constant", "string_constant", "complex_const", "kind",
@@ -1386,7 +1388,7 @@ static const char *const yytname[] =
    (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
-       0,   357,   358,     1,     2,     3,     4,     5,     6,     7,
+       0,   358,   359,     1,     2,     3,     4,     5,     6,     7,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
       28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
@@ -1421,15 +1423,15 @@ static const yytype_uint16 yytoknum[] =
      318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
      328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
      338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,   354,   355,   356,   359,
-     360
+     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
+     360,   361
 };
 # endif
 
-#define YYPACT_NINF -2221
+#define YYPACT_NINF -2103
 
 #define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-2221)))
+  (!!((Yystate) == (-2103)))
 
 #define YYTABLE_NINF -1192
 
@@ -1440,268 +1442,268 @@ static const yytype_uint16 yytoknum[] =
      STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
-   -2221,   112, -2221, -2221, -2221, -2221,    31,  5201, -2221, -2221,
-   -2221,   162, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,   251, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221,    64, -2221, -2221,   635,   200, -2221, -2221, -2221,    64,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221,   204,   204, -2221, -2221, -2221, -2221, -2221,   204,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-     168, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,   204, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221,   263, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-     372,   424, -2221, -2221, -2221, -2221, -2221,    64, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221,    64, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,   236,
-    1028,   505,   236, -2221, -2221, -2221,   543,   553,   564,   637,
-   -2221, -2221, -2221,   605,   669,   204, -2221, -2221,   683,   686,
-     726,   782,   603,   198,   805,   816,   827, -2221,   153, -2221,
-   -2221, -2221,   236, -2221, -2221, -2221,   591,    45,  2068,  2354,
-   -2221, -2221,  3071, -2221,   828, -2221, -2221,  1774, -2221,   863,
-   -2221, -2221,   858,   863,   880, -2221, -2221,   884, -2221, -2221,
-   -2221,   902,   910,   917,   920,   927, -2221, -2221, -2221, -2221,
-     934,   708, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221,   956, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221,   159,   204,   981,  1091,
-    1105,   923,   204,   204,   164,   204, -2221,   204,   204,  1113,
-   -2221,   567,  1130,   204,   204,   204,   204, -2221, -2221,   204,
-   -2221,  1134,   204,   982,   204,   993, -2221, -2221, -2221,   204,
-   -2221,  1136,   204, -2221,   204,  1154,   304, -2221,   982, -2221,
-     204,   204,   204,   204, -2221, -2221, -2221, -2221, -2221,   204,
-   -2221,   204,   204,   505,   204,  1158,   981,   204,  1169, -2221,
-     204,   204, -2221, -2221, -2221,  1146,  1194,   204,   204, -2221,
-    1206,  1210,   204,   981,  1212,  3071, -2221,  1215,  1217,   204,
-   -2221,  1228,   204,  1140, -2221,  1227,   204,   981,  1239,  1241,
-   -2221,   923,   981,   204,   204,  1782,    63,   204,    83, -2221,
-   -2221,   309, -2221,   466,   204,   204,   204,  1244,   204,   204,
-    3071,   110, -2221, -2221,  1248,   204,   204,   204,   204,   204,
-    2589,   204, -2221,   981,   204,   981,   204,   204, -2221, -2221,
-     204, -2221,   981,   204,  1250,  1253, -2221,   204, -2221, -2221,
-    1255, -2221, -2221,  1324, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221,  1328, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221,   204, -2221, -2221,  1331,
-    1361,  1272,   981,  1366,  3071,  3071,  3071,  3071,  3071,  1382,
-    1388,  1431,  1448,  1462,   204, -2221,  1466, -2221, -2221, -2221,
-   -2221,  1177,   165, -2221, -2221,   204,   204,   204,   204,  1325,
-   -2221, -2221,  1355,   204,   204, -2221,   636,   204,   204,   204,
-     204,   204,   290,   204,  1140,   204,   204,  1158, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221,  1095, -2221, -2221, -2221,
-   -2221, -2221, -2221,  3071,  3071,  3071, -2221,  3071, -2221, -2221,
-   -2221, -2221, -2221, -2221,  3071,  3280, -2221,   103,  1452, -2221,
-    1467, -2221,  1237,  1240,  1473, -2221, -2221,  1474,  3071, -2221,
-   -2221,  1511, -2221, -2221,  1475,  1550,  1452, -2221, -2221,   903,
-      -8, -2221,  1511, -2221, -2221, -2221,  1491,   473,    93,  3087,
-    3087,   204,   204,   204,   204,   204,   204,   204,  1493, -2221,
-     204, -2221, -2221, -2221,   527, -2221, -2221,  1489,   204, -2221,
-    3071, -2221,  1268,   801, -2221,  1490, -2221, -2221,  1492,  1501,
-   -2221, -2221, -2221, -2221, -2221,  2679,   204,  1495, -2221,   204,
-    1492,   204, -2221,   923, -2221, -2221, -2221, -2221, -2221, -2221,
-    1504, -2221, -2221, -2221, -2221, -2221,  1492, -2221, -2221,  1498,
-   -2221, -2221,   700,  1224,   204,   737,   166, -2221,  1499,  1340,
-    3071,  1368, -2221,  1515, -2221, -2221,  3071,  3071, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,   204,
-   -2221,   204,  1510,   658,   204,   505, -2221, -2221,  1521, -2221,
-    1522, -2221,  1516,   751, -2221,  1525, -2221,   204, -2221, -2221,
-   -2221,  1527, -2221,   863,  1517,  3442, -2221,   204, -2221,  5910,
-   -2221,   204,  3071, -2221,  1526, -2221,   204, -2221,   204,   204,
-     204,  1452,   958,   204,   204,   204,  1368, -2221,   204,   215,
-   -2221, -2221, -2221,  1550,   903, -2221, -2221, -2221, -2221, -2221,
-   -2221,   159, -2221,  1489,  1529,  1499, -2221, -2221, -2221, -2221,
-   -2221, -2221,   204, -2221, -2221, -2221,  5910, -2221,   567,  1480,
-     204, -2221,  1530, -2221, -2221, -2221, -2221,  1531,  3521,   744,
-   -2221, -2221,   263,   204,   505, -2221,   204,  1492, -2221,  1536,
-    1528, -2221,   204, -2221,  1543,  3071,  3071, -2221,  1492,   204,
-     123,   204,  1266,  1266,   149,  1266, -2221,  1539,   179,   180,
-     184,   190,   205,   212, -2221,  1492,   515, -2221,  1553, -2221,
-     183,   210, -2221, -2221,  1272, -2221,   204, -2221,  3654,  5910,
-    3754,  3794,  1554,  5910,   204,   204, -2221, -2221, -2221, -2221,
-    1560, -2221,   204,   204, -2221, -2221, -2221, -2221,   790, -2221,
-   -2221,  1345,  1492, -2221, -2221, -2221, -2221,  1150,   204, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221,  1492, -2221, -2221, -2221,
-   -2221,  1561, -2221,  1561, -2221, -2221, -2221, -2221,   651, -2221,
-     480, -2221,  1555, -2221, -2221,  3828,  1564,  1567,  1567,  2164,
-   -2221,  3071,  3071,  3071,  3071,  3071,  3071,  3071,  3071,  3071,
-    3071,  3071,  3071,  3071,  3071,  3071,  3071,  3071,  3071,  3071,
-   -2221,  1509,  1408,  1563,   454,   525,  3071, -2221, -2221, -2221,
-     802,  1442, -2221, -2221, -2221, -2221,   831, -2221,  1373,   922,
-    3071,  1572,  1550,  1550,  1550,  1550,  1550, -2221,  1116, -2221,
-     473,   473,  1452,  1574, -2221,  3087,  5910,    91,   120, -2221,
-    1577,  1579, -2221, -2221,  1492, -2221, -2221, -2221, -2221,  1492,
-   -2221,   416, -2221,   159, -2221, -2221, -2221,   204,  3869,   204,
-    1573,  3071,  1523, -2221, -2221,   204, -2221,  3071,  3908, -2221,
-     868, -2221, -2221,  1552, -2221, -2221,   876, -2221,   204, -2221,
-     204, -2221, -2221,  1224, -2221, -2221, -2221, -2221, -2221,  3942,
-    1492, -2221, -2221, -2221,  1580,  1581,  1583,  1584,  1585,  1586,
-   -2221,  1340, -2221,   204, -2221,  4031, -2221, -2221,   204,  4065,
-    4099, -2221,  1587,   882,  1596,  1473, -2221, -2221,   204, -2221,
-    1602, -2221,  1566, -2221,   204, -2221,  1483,    90, -2221, -2221,
-     -13, -2221, -2221,  1606, -2221,  1594,  1612,   885, -2221,   204,
-    3087,  1599, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221,  1600, -2221, -2221,   430,  1603,  1604,  4136,  2695,   -16,
-   -2221,  1588, -2221, -2221,   890, -2221, -2221, -2221, -2221, -2221,
-     909,  1597,   925, -2221, -2221, -2221,  3071, -2221,  1162, -2221,
-   -2221, -2221,   939, -2221,  1620, -2221,  1340,  1617,  1626,   954,
-   -2221, -2221, -2221,  1630, -2221,  1619,  1629,  1632,   204,  3071,
-    3071,  2589, -2221, -2221, -2221, -2221, -2221, -2221, -2221,  1637,
-    1638, -2221,   308, -2221, -2221,  4190,  4221, -2221,  1645, -2221,
-     214,  1646, -2221, -2221, -2221, -2221,   220, -2221, -2221, -2221,
-     221, -2221,   389,   453,   481, -2221,   483, -2221,   506, -2221,
-    1644,  1653,  1654,  1655, -2221,  1657,  1658, -2221, -2221, -2221,
-   -2221, -2221, -2221,  1452,  1670,  1659, -2221,  1661,   -40, -2221,
-   -2221,  1676, -2221,    -4,   957, -2221, -2221, -2221, -2221,  3071,
-     436,   590, -2221,   959,   960,   -56,   963, -2221, -2221, -2221,
-   -2221, -2221, -2221,    95,   964, -2221, -2221, -2221, -2221,   514,
-     988, -2221, -2221,   435,   995, -2221, -2221,   505,   204,   186,
-   -2221,  1671, -2221,  1680, -2221,  1492, -2221, -2221, -2221,  1672,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,  1032, -2221,
-   -2221, -2221,   204,  1492,   150,  1601, -2221, -2221,   204,   204,
-   -2221,  1267,   480, -2221,  1673, -2221,  1627,  3071,  3087, -2221,
-    3071,  1567,  1567,   611,   611,  2164,   985,  2300,  2643,  5910,
-    2643,  2643,  2643,  2643,  2643,  2300,  2134,  1567,  2134,  2900,
-    1563, -2221, -2221,  1669,  1684,  2548, -2221, -2221, -2221, -2221,
-   -2221,  1687, -2221, -2221,   923,  5910, -2221,  3071, -2221, -2221,
-   -2221, -2221,  5910,    87,  5910,  1572,  1572,  1125,  1572,   612,
-   -2221,  1574,  1688,   473,  4269,  1689,  1690,  1692,  3087,  3087,
-    3087, -2221, -2221,   204,  1686, -2221, -2221,  1698,  1499, -2221,
-     263, -2221, -2221, -2221, -2221,  1447, -2221,   997,   923, -2221,
-     923,  1015,  1696,  1017, -2221,  5910,  3071,  2679, -2221,  1020,
-   -2221,   923,  1561, -2221,   738,   846, -2221,  1027,  1538,  1041,
-   -2221,  1790, -2221,   166, -2221,  1699,   204,   204,  3071,   204,
-   -2221, -2221,  1492, -2221, -2221, -2221,  1456,   204,  3071,   204,
-   -2221,   204, -2221,  1452,  3071,  1695,  2695, -2221, -2221, -2221,
-   -2221,  1052, -2221,  1702, -2221,  1704,  1705,  1706,  1497,  3071,
-     204,   204, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-     981,   204, -2221,  2746,  3406,  1703,   204,   204, -2221,   204,
-   -2221,  1532,   204, -2221,  3071,   204, -2221,  1561,  5910, -2221,
-    1717,   398,  1717, -2221,   204,  1340,  1719,  2778,   204,   204,
-   -2221,   567,  3071,   812,  3071,  1056, -2221,  1712,  1067,  5910,
-   -2221,    53, -2221, -2221, -2221, -2221, -2221,   981,    55, -2221,
-     204, -2221,   546, -2221, -2221,    51, -2221,   137,   597, -2221,
-     659, -2221,   598, -2221,   -18, -2221,   204,   204,   204, -2221,
-     204,   204,   515, -2221,   204, -2221, -2221,  1713, -2221,   204,
-   -2221, -2221, -2221, -2221, -2221,  1398,  1417,  1401,  5910, -2221,
-    1563,   204, -2221, -2221,  1723,  1727,  1730,  1731,  1733, -2221,
-   -2221,  1737,  1738,  1740, -2221, -2221, -2221,  1741,  1747,  1748,
-    1749, -2221, -2221, -2221,   839,  1750,  1751,  1754,  1757,  1759,
-   -2221, -2221, -2221, -2221, -2221,   204,   761, -2221, -2221,  1760,
-   -2221,  1770, -2221, -2221,  1680, -2221, -2221, -2221, -2221,  5910,
-    2061, -2221, -2221, -2221,   508,   380,   380,  1488,  1535, -2221,
-   -2221,  1540,  1546,  1548,   664,   204, -2221, -2221, -2221, -2221,
-    1777, -2221, -2221, -2221,  1673, -2221,  1795, -2221,   696,  1796,
-   -2221,  1799,  4304, -2221,  1764,  1794,  1473, -2221, -2221,  4365,
-   -2221,  3071,  3071,  1442, -2221,  5910,  1511,   473, -2221,   122,
-    3087,  3087,  3087,   125, -2221,   129, -2221,   155, -2221,  1492,
-     204, -2221, -2221,  1811,  1081, -2221,  1814, -2221,  5910, -2221,
-   -2221, -2221,  3071, -2221, -2221,  3071, -2221, -2221, -2221, -2221,
-    5910, -2221,  1538,  3071,  1801, -2221,  1804,  1807,  4622,  1826,
-   -2221,   130,   204, -2221,  1090, -2221, -2221,  1809,  5910, -2221,
-   -2221,  4365, -2221,  1483, -2221,  1483,   204,   204,   204,  1101,
-    1115, -2221,   204,  1822,  1818,  3071,  4668,  3055, -2221, -2221,
-   -2221,  1492,  1452, -2221,  1825, -2221,  1668,  1834,  5910, -2221,
-     204, -2221,  1828,  1829, -2221, -2221,  1592,  1841, -2221, -2221,
-    1843, -2221,  5910,  1119, -2221,  1127, -2221, -2221,  4699, -2221,
-   -2221,  1139, -2221, -2221,  5910,  1830,   204, -2221, -2221, -2221,
-    1837,  1838,  1648,  1784,   204,   204,  1839,  1850, -2221,   699,
-   -2221,  1844, -2221, -2221, -2221,  1845, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221,   546, -2221, -2221, -2221, -2221,    51,   204,
-   -2221, -2221,  1142,  1846, -2221,  1847, -2221,  1848, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,   597, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221,   659, -2221, -2221, -2221, -2221, -2221,   598, -2221, -2221,
-   -2221,   -18,  1849,  1851,  1855,   886,  1149, -2221,  1856,  1857,
-    1452,   204, -2221, -2221,  1852, -2221,  1853,  1563,  1863, -2221,
-     204,   204, -2221,  1715,   204, -2221,   204,   204,   204, -2221,
-     204,   204,   204,  3071, -2221,  1866,  1870, -2221,   204,   204,
-    3071, -2221, -2221,  1871,  3071,  3071, -2221, -2221,  1873, -2221,
-    1726,   761,  2427, -2221,  1166, -2221,  5910, -2221, -2221, -2221,
-    1887, -2221, -2221, -2221, -2221,   454,   454,   454,   454,   454,
-    1267, -2221,  1881,  1893,  1884,  1267,  1796, -2221,   480,   696,
-     459,   459, -2221, -2221, -2221,  1167,  1858,   608,   235, -2221,
-    1892,   696, -2221,  3071, -2221,  1882, -2221,  1473, -2221,  2548,
-    5910,  1885, -2221, -2221,   903,  1879,  1886,  1168,  1889,  1891,
-    1894, -2221, -2221, -2221,  1899,    82,   923, -2221,   204,   981,
-    5910,    82,  5910,  1538,  3071,  1895,  4734,  1172, -2221, -2221,
-   -2221, -2221, -2221,  3071, -2221,  1903, -2221, -2221, -2221, -2221,
-   -2221,  1187,  1193,  1199, -2221, -2221, -2221,   992, -2221,  5910,
-    3071,  3071,  4769, -2221,   204,   204, -2221, -2221,  1834, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221,  1902,   398,  1904,  3442, -2221,   204,   204,   204,  2778,
-   -2221, -2221, -2221,   812, -2221, -2221, -2221,  1943,   204, -2221,
-   -2221,  1839,  1900, -2221, -2221,   204,   204,  3071, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,   137,
-   -2221, -2221, -2221,  3071, -2221,  3071, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221,  1202,   204,   204,  1908,   851,  1906,  1203,
-   -2221,  1205,   634,  1225,  1912,  1254,  1258,  1265,  1277,  1279,
-    1284, -2221,  1288,  4800,  1913, -2221, -2221,  -114,  1289, -2221,
-    1298,  1299,  4836,   895,  1917, -2221,  5910,  5910,  1300,  1928,
-   -2221, -2221, -2221,  1915,  4877, -2221, -2221, -2221,   508, -2221,
-   -2221, -2221, -2221, -2221, -2221,  1267, -2221,   204, -2221, -2221,
-    1922,  1914, -2221,   843,   235,   235,   696, -2221,   696,   459,
-     459,   459,   459,   459,  1273,  4908, -2221, -2221, -2221, -2221,
-    3071, -2221, -2221, -2221, -2221,  1647, -2221,   204,  1930,  1501,
-     204, -2221,   204, -2221,  4969, -2221,  3071,  3071, -2221,  5004,
-    1693,  3071, -2221, -2221, -2221, -2221,  1303, -2221, -2221,  5910,
-    5910,  3071,  1309,  1926, -2221,   935, -2221,  3071, -2221,  1923,
-    1931, -2221, -2221,  1936,  1935, -2221, -2221, -2221, -2221, -2221,
-    1823,  1933,  1314,  1954,  1956,  1315,  1057,   204, -2221, -2221,
-    5910,   899,  1944,    21, -2221, -2221,  1927, -2221, -2221,   330,
-    5040,  5071, -2221, -2221, -2221, -2221, -2221, -2221,  1317,  1945,
-    1079,  3071,   204, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221,  1952,  1953, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,   204, -2221,
-    3071, -2221,  1615,  1319, -2221,  1321, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221,  3071,  1964,  1965, -2221, -2221,
-   -2221,  1601,  1955, -2221,  1563, -2221,   696, -2221,  1273,  1957,
-     235,   235, -2221, -2221, -2221, -2221,  5140, -2221,  4365, -2221,
-    1363, -2221, -2221,   923,  1670, -2221,  1538,  5910, -2221,  1718,
-   -2221,  1967,  5196,   992, -2221,  5910, -2221,  2462,  1969,  1971,
-    1973,  1974,  1978,   204,   204,  1979,  1980,  1981,  5535, -2221,
-   -2221, -2221,  3071,   204,   204, -2221, -2221,  1983,   204, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221,  1992, -2221, -2221,
-   -2221, -2221, -2221,  1364, -2221, -2221, -2221, -2221,  1982, -2221,
-   -2221,  1994, -2221,  5910, -2221,   204,   204,   634, -2221,  5566,
-   -2221, -2221,  1998,  2000, -2221,  5597, -2221,  1993, -2221, -2221,
-    1988,  1383,  1273, -2221,  3071,  1647, -2221, -2221,  3071,   204,
-    3071, -2221, -2221, -2221,  5910,  1391, -2221, -2221,  1969,   204,
-     204,   204,   204, -2221, -2221,  3071,  3071,   204,  3071,  1393,
-   -2221, -2221,  2002, -2221,  1394,  2004,  1397,   204,  3071, -2221,
-   -2221, -2221, -2221,   239,  2006, -2221,  3071, -2221, -2221, -2221,
-   -2221, -2221, -2221,   204,  1991, -2221, -2221,  5628, -2221,  5910,
-   -2221, -2221,  2001,  5659,  2462, -2221,   394, -2221,  2008,  1403,
-    2010,  1409,  2003,  1411,  5690,  5721,  1999, -2221,  1412,  5752,
-   -2221,   204,  1947, -2221, -2221, -2221, -2221,  1670, -2221,  5783,
-    1697, -2221,  3071,  5910,  1675,  1674, -2221,  2014, -2221, -2221,
-    3071,  1744, -2221, -2221,  2016,  2022,   204,   204, -2221,   204,
-   -2221,  2589, -2221, -2221,  3071, -2221,   204, -2221,  3071, -2221,
-    2011,  1413,  1414, -2221,  2018,  5814,  1121,  2023,  2024,   204,
-    5910,   204,  5910,  1415, -2221, -2221, -2221, -2221,  1418, -2221,
-    2026,  1419,  1420,  1421,  5845, -2221,  5910, -2221, -2221, -2221,
-    3071, -2221, -2221, -2221, -2221, -2221,  2020,  1744, -2221,   204,
-   -2221,  3071, -2221, -2221,  2042,  3071,  1423,  1440,  1445,  3071,
-    2047, -2221, -2221, -2221,  5879,  1459, -2221, -2221,  5910,  2035,
-   -2221, -2221, -2221,  3071,  3071,  3071,  2050, -2221, -2221, -2221,
-    5910, -2221, -2221,   -38,   486,  1463, -2221,  2060,  2063, -2221,
-   -2221, -2221,  2053,  2053,  2053, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221,   550,  2066, -2221,  1951, -2221,  1464,
-   -2221, -2221, -2221
+   -2103,   120, -2103, -2103, -2103, -2103,    -7,  5156, -2103, -2103,
+   -2103,   134, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   889, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103,   118, -2103, -2103,   753,   162, -2103, -2103, -2103,   118,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103,   124,   124, -2103, -2103, -2103, -2103, -2103,   124,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+     238, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   124, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103,   211, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+     344,   417, -2103, -2103, -2103, -2103, -2103,   118, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103,   118, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   234,
+    1817,   445,   234, -2103, -2103, -2103,   504,   530,   594,   615,
+   -2103, -2103, -2103,   786,   621,   124, -2103, -2103,   725,   755,
+     774,   791,   630,   518,   837,   856,   862, -2103,   153, -2103,
+   -2103, -2103,   234, -2103, -2103, -2103,   570,   917,  2307,  2403,
+   -2103, -2103,  2952, -2103,   701, -2103, -2103,  1131, -2103,   870,
+   -2103, -2103,  1762,   870,   896, -2103, -2103,   925, -2103, -2103,
+   -2103,   941,   967,   979,   997,  1001, -2103, -2103, -2103, -2103,
+    1004,   972, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103,  1006, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103,   152,   124,  1009,  1015,
+    1033,   903,   124,   124,   190,   124, -2103,   124,   124,  1056,
+   -2103,   525,  1068,   124,   124,   124,   124, -2103, -2103,   124,
+   -2103,  1090,   124,   964,   124,  1031, -2103, -2103, -2103,   124,
+   -2103,  1096,   124, -2103,   124,  1107,   175, -2103,   964, -2103,
+     124,   124,   124,   124, -2103, -2103, -2103, -2103, -2103,   124,
+   -2103,   124,   124,   445,   124,  1110,  1009,   124,  1114, -2103,
+     124,   124, -2103, -2103, -2103,  1124,  1119,   124,   124, -2103,
+    1122,  1128,   124,  1009,  1134,  2952, -2103,  1140,  1144,   124,
+   -2103,  1157,   124,  1102, -2103,  1175,   124,  1009,  1194,  1205,
+   -2103,   903,  1009,   124,   124,  2162,    79,   124,    84, -2103,
+   -2103,   202, -2103,   203,   124,   124,   124,  1231,   124,   124,
+    2952,    93, -2103, -2103,  1235,   124,   124,   124,   124,   124,
+    2647,   124, -2103,  1009,   124,  1009,   124,   124, -2103, -2103,
+     124, -2103,  1009,   124,  1241,  1243, -2103,   124, -2103, -2103,
+    1246, -2103, -2103,  1250, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103,  1253, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103,   124, -2103, -2103,  1269,
+    1289,  1223,  1009,  1313,  2952,  2952,  2952,  2952,  2952,  1315,
+    1321,  1348,  1370,  1382,   124, -2103,  1392, -2103, -2103, -2103,
+   -2103,  1195,   113, -2103, -2103,   124,   124,   124,   124,  1362,
+   -2103, -2103,  1290,   124,   124, -2103,   700,   124,   124,   124,
+     124,   124,   312,   124,  1102,   124,   124,  1110, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103,  1154, -2103, -2103, -2103,
+   -2103, -2103, -2103,  2952,  2952,  2952, -2103,  2952, -2103, -2103,
+   -2103, -2103, -2103, -2103,  2952,  2407, -2103,    80,  1414, -2103,
+    1408, -2103,  1182,  1189,  1426, -2103, -2103,  1428,  2952, -2103,
+   -2103,  2055, -2103, -2103,  1421,  1527,  1414, -2103, -2103,  1075,
+       3, -2103,  2055, -2103, -2103, -2103,  1468,   210,    72,  2960,
+    2960,   124,   124,   124,   124,   124,   124,   124,  1474, -2103,
+     124, -2103, -2103, -2103,   667, -2103, -2103,  1463,   124, -2103,
+    2952, -2103,  1242,   878, -2103,  1482, -2103, -2103,  1485,  1478,
+   -2103, -2103, -2103, -2103, -2103,  2662,   124,  1490, -2103,   124,
+    1485,   124, -2103,   903, -2103, -2103, -2103, -2103, -2103, -2103,
+    1498, -2103, -2103, -2103, -2103, -2103,  1485, -2103, -2103,  1500,
+   -2103, -2103,   771,  1177,   124,   792,    97, -2103,  1507,  1366,
+    2952,  1374, -2103,  1537, -2103, -2103,  2952,  2952, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   124,
+   -2103,   124,  1531,   243,   124,   445, -2103, -2103,  1543, -2103,
+    1548, -2103,  1550,  1139, -2103,  1562, -2103,   124, -2103, -2103,
+   -2103,  1563, -2103,   870,  1549,  3062, -2103,   124, -2103,  5617,
+   -2103,   124,  2952, -2103,  1564, -2103,   124, -2103,   124,   124,
+     124,  1414,   731,   124,   124,   124,  1374, -2103,   124,   648,
+   -2103, -2103, -2103,  1527,  1075, -2103, -2103, -2103, -2103, -2103,
+   -2103,   152, -2103,  1463,  1570,  1507, -2103, -2103, -2103, -2103,
+   -2103, -2103,   124, -2103, -2103, -2103,  5617, -2103,   525,  1520,
+     124, -2103,  1585, -2103, -2103, -2103, -2103,  1588,  3140,   798,
+   -2103, -2103,   211,   124,   445, -2103,   124,  1485, -2103,  1598,
+    1589, -2103,   124, -2103,  1606,  2952,  2952, -2103,  1485,   124,
+     272,   124,  1330,  1330,   364,  1330, -2103,  1603,   419,   487,
+     495,   524,   526,   532, -2103,  1485,   838, -2103,  1624, -2103,
+     198,   485, -2103, -2103,  1223, -2103,   124, -2103,  3203,  5617,
+    3237,  3329,  1626,  5617,   124,   124, -2103, -2103, -2103, -2103,
+    1627, -2103,   124,   124, -2103, -2103, -2103, -2103,   821, -2103,
+   -2103,  1423,  1485, -2103, -2103, -2103, -2103,  1297,   124, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103,  1485, -2103, -2103, -2103,
+   -2103,  1638, -2103,  1638, -2103, -2103, -2103, -2103,   578, -2103,
+     214, -2103,  1636, -2103, -2103,  3403,  1650,  1656,  1656,  1673,
+   -2103,  2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,
+    2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,
+   -2103,  1602,  1544,  1664,   390,   440,  2952, -2103, -2103, -2103,
+     832,  1228, -2103, -2103, -2103, -2103,   846, -2103,  1410,  1273,
+    2952,  1668,  1527,  1527,  1527,  1527,  1527, -2103,  1663, -2103,
+     210,   210,  1414,  1679, -2103,  2960,  5617,   125,   150, -2103,
+    1684,  1689, -2103, -2103,  1485, -2103, -2103, -2103, -2103,  1485,
+   -2103,   708, -2103,   152, -2103, -2103, -2103,   124,  3450,   124,
+    1697,  2952,  1651, -2103, -2103,   124, -2103,  2952,  3513, -2103,
+     855, -2103, -2103,  1662, -2103, -2103,   882, -2103,   124, -2103,
+     124, -2103, -2103,  1177, -2103, -2103, -2103, -2103, -2103,  3585,
+    1485, -2103, -2103, -2103,  1704,  1705,  1706,  1715,  1716,  1718,
+   -2103,  1366, -2103,   124, -2103,  3665, -2103, -2103,   124,  3750,
+    3781, -2103,  1725,   900,  1737,  1426, -2103, -2103,   124, -2103,
+    1739, -2103,  1724, -2103,   124, -2103,  1622,   748, -2103, -2103,
+     -26, -2103, -2103,  1745, -2103,  1738,  1749,   905, -2103,   124,
+    2960,  1744, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103,  1751, -2103, -2103,    57,  1752,  1740,  3830,  2685,   -70,
+   -2103,  1722, -2103, -2103,   920, -2103, -2103, -2103, -2103, -2103,
+     943,  1748,   944, -2103, -2103, -2103,  2952, -2103,  1792, -2103,
+   -2103, -2103,   961, -2103,  1759, -2103,  1366,  1755,  1768,   962,
+   -2103, -2103, -2103,  1772, -2103,  1766,  1770,  1761,   124,  2952,
+    2952,  2647, -2103, -2103, -2103, -2103, -2103, -2103, -2103,  1782,
+    1783, -2103,   623, -2103, -2103,  3866,  3982, -2103,  1771, -2103,
+     565,  1774, -2103, -2103, -2103, -2103,   568, -2103, -2103, -2103,
+     571, -2103,   573,   574,   576, -2103,   592, -2103,   593, -2103,
+    1785,  1787,  1795,  1796, -2103,  1799,  1802, -2103, -2103, -2103,
+   -2103, -2103, -2103,  1414,  1810,  1798, -2103,  1800,   -49, -2103,
+   -2103,  1814, -2103,   -15,   981, -2103, -2103, -2103, -2103,  2952,
+     372,   691, -2103,   989,  1013,   286,  1028, -2103, -2103, -2103,
+   -2103, -2103, -2103,    89,  1032, -2103, -2103, -2103, -2103,   726,
+    1054, -2103, -2103,   401,  1065, -2103, -2103,   445,   124,   191,
+   -2103,  1809, -2103,  1823, -2103,  1485, -2103, -2103, -2103,  1815,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   983, -2103,
+   -2103, -2103,   124,  1485,   138,  1494, -2103, -2103,   124,   124,
+   -2103,  1820,   214, -2103,  1819, -2103,  1776,  2952,  2960, -2103,
+    2952,  1656,  1656,   569,   569,  1673,   857,  1567,  2757,  5617,
+    2757,  2757,  2757,  2757,  2757,  1567,  1732,  1656,  1732,  3280,
+    1664, -2103, -2103,  1818,  1832,  2253, -2103, -2103, -2103, -2103,
+   -2103,  1834, -2103, -2103,   903,  5617, -2103,  2952, -2103, -2103,
+   -2103, -2103,  5617,    83,  5617,  1668,  1668,  1355,  1668,   654,
+   -2103,  1679,  1835,   210,  4229,  1836,  1837,  1838,  2960,  2960,
+    2960, -2103, -2103,   124,  1827, -2103, -2103,  1840,  1507, -2103,
+     211, -2103, -2103, -2103, -2103,  1595, -2103,  1069,   903, -2103,
+     903,  1085,  1845,  1086, -2103,  5617,  2952,  2662, -2103,  1100,
+   -2103,   903,  1638, -2103,   707,   710, -2103,  1112,  1692,  1123,
+   -2103,  1789, -2103,    97, -2103,  1844,   124,   124,  2952,   124,
+   -2103, -2103,  1485, -2103, -2103, -2103,  1621,   124,  2952,   124,
+   -2103,   124, -2103,  1414,  2952,  1841,  2685, -2103, -2103, -2103,
+   -2103,  1133, -2103,  1847, -2103,  1846,  1850,  1851,  1659,  2952,
+     124,   124, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+    1009,   124, -2103,  2700,  2998,  1848,   124,   124, -2103,   124,
+   -2103,  1677,   124, -2103,  2952,   124, -2103,  1638,  5617, -2103,
+    1862,   544,  1862, -2103,   124,  1366,  1864,  2736,   124,   124,
+   -2103,   525,  2952,   863,  2952,  1152, -2103,  1858,  1153,  5617,
+   -2103,    37, -2103, -2103, -2103, -2103, -2103,  1009,    15, -2103,
+     124, -2103,   918, -2103, -2103,  -116, -2103,    91,   635, -2103,
+     633, -2103,   323, -2103,    33, -2103,   124,   124,   124, -2103,
+     124,   124,   838, -2103,   124, -2103, -2103,  1859, -2103,   124,
+   -2103, -2103, -2103, -2103, -2103,  1546,  1561,  1565,  5617, -2103,
+    1664,   124, -2103, -2103,  1860,  1863,  1867,  1879,  1880, -2103,
+   -2103,  1881,  1883,  1887, -2103, -2103, -2103,  1888,  1889,  1894,
+    1895, -2103, -2103, -2103,   693,  1898,  1899,  1900,  1901,  1902,
+   -2103, -2103, -2103, -2103, -2103,   124,   826, -2103, -2103,  1904,
+   -2103,  1913, -2103, -2103,  1823, -2103, -2103, -2103, -2103,  5617,
+    1916, -2103, -2103, -2103,   115,   371,   371,  1682,  1683, -2103,
+   -2103,  1688,  1690,  1693,   580,   124, -2103, -2103, -2103, -2103,
+    1930, -2103, -2103, -2103,  1819, -2103,  1932, -2103,   164,  1927,
+   -2103,  1933,  4290, -2103,  1924,  1926,  1426, -2103, -2103,  3908,
+   -2103,  2952,  2952,  1228, -2103,  5617,  2055,   210, -2103,   183,
+    2960,  2960,  2960,   193, -2103,   228, -2103,   493, -2103,  1485,
+     124, -2103, -2103,  1949,  1168, -2103,  1951, -2103,  5617, -2103,
+   -2103, -2103,  2952, -2103, -2103,  2952, -2103, -2103, -2103, -2103,
+    5617, -2103,  1692,  2952,  1938, -2103,  1941,  1943,  4337,  1952,
+   -2103,    67,   124, -2103,  1191, -2103, -2103,  1942,  5617, -2103,
+   -2103,  3908, -2103,  1622, -2103,  1622,   124,   124,   124,  1197,
+    1207, -2103,   124,  1950,  1946,  2952,  4372,  2914, -2103, -2103,
+   -2103,  1485,  1414, -2103,  1955, -2103,  1801,  1964,  5617, -2103,
+     124, -2103,  1962,  1963, -2103, -2103,  1727,  1971, -2103, -2103,
+    1976, -2103,  5617,  1211, -2103,  1216, -2103, -2103,  4403, -2103,
+   -2103,  1219, -2103, -2103,  5617,  1965,   124, -2103, -2103, -2103,
+    1969,  1973,  1781,  1920,   124,   124,  1975,  1986, -2103,   448,
+   -2103,  1980, -2103, -2103, -2103,  1981, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103,   918, -2103, -2103, -2103, -2103,  -116,   124,
+   -2103, -2103,  1249,  1983, -2103,  1984, -2103,  1985, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   635, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103,   633, -2103, -2103, -2103, -2103, -2103,   323, -2103, -2103,
+   -2103,    33,  1990,  1991,  1993,   738,  1258, -2103,  1994,  1997,
+    1414,   124, -2103, -2103,  1987, -2103,  1992,  1664,  2002, -2103,
+     124,   124, -2103,  1857,   124, -2103,   124,   124,   124, -2103,
+     124,   124,   124,  2952, -2103,  2014,  2015, -2103,   124,   124,
+    2952, -2103, -2103,  2012,  2952,  2952, -2103, -2103,  2013, -2103,
+    1023,   826,  1939, -2103,  1277, -2103,  5617, -2103, -2103, -2103,
+    2032, -2103, -2103, -2103, -2103,   390,   390,   390,   390,   390,
+    1820, -2103,  2026,  2037,  2028,  1820,  1927, -2103,   214,   164,
+     145,   145, -2103, -2103, -2103,  1278,  2039,   872,   171, -2103,
+    2035,   164, -2103,  2952, -2103,  2027, -2103,  1426, -2103,  2253,
+    5617,  2030, -2103, -2103,  1075,  2029,  2031,  1279,  2033,  2036,
+    2038, -2103, -2103, -2103,  2047,    40,   903, -2103,   124,  1009,
+    5617,    40,  5617,  1692,  2952,  2042,  4437,  1287, -2103, -2103,
+   -2103, -2103, -2103,  2952, -2103,  2051, -2103, -2103, -2103, -2103,
+   -2103,  1301,  1304,  1308, -2103, -2103, -2103,   754, -2103,  5617,
+    2952,  2952,  4471, -2103,   124,   124, -2103, -2103,  1964, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103,  2041,   544,  2043,  3062, -2103,   124,   124,   124,  2736,
+   -2103, -2103, -2103,   863, -2103, -2103, -2103,  2616,   124, -2103,
+   -2103,  1975,  2040, -2103, -2103,   124,   124,  2952, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,    91,
+   -2103, -2103, -2103,  2952, -2103,  2952, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103,  1316,   124,   124,  2052,   750,  2048,  1319,
+   -2103,  1326,   938,  1337,  2054,  1338,  1353,  1354,  1360,  1368,
+    1378, -2103,  1379,  3360,  2057, -2103, -2103,  -113,  1380, -2103,
+    1383,  1397,  4502,   876,  2045, -2103,  5617,  5617,  1401,  2069,
+   -2103, -2103, -2103,  2058,  4539, -2103, -2103, -2103,   115, -2103,
+   -2103, -2103, -2103, -2103, -2103,  1820, -2103,   124, -2103, -2103,
+    2065,  2059, -2103,   662,   171,   171,   164, -2103,   164,   145,
+     145,   145,   145,   145,  1071,  4573, -2103, -2103, -2103, -2103,
+    2952, -2103, -2103, -2103, -2103,  1647, -2103,   124,  2073,  1478,
+     124, -2103,   124, -2103,  4614, -2103,  2952,  2952, -2103,  4645,
+    1829,  2952, -2103, -2103, -2103, -2103,  1430, -2103, -2103,  5617,
+    5617,  2952,  1431,  2072, -2103,   954, -2103,  2952, -2103,  2063,
+    2068, -2103, -2103,  2075,  2084, -2103, -2103, -2103, -2103, -2103,
+    1961,  2074,  1442,  2087,  2090,  1445,   785,   124, -2103, -2103,
+    5617,   721,  2077,    28, -2103, -2103,  2062, -2103, -2103,   217,
+    4676,  4713, -2103, -2103, -2103, -2103, -2103, -2103,  1451,  2079,
+     795,  2952,   124, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103,  2086,  2088, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   124, -2103,
+    2952, -2103,   553,  1469, -2103,  1471, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103,  2952,  2095,  2097, -2103, -2103,
+   -2103,  1494,  2085, -2103,  1664, -2103,   164, -2103,  1071,  2092,
+     171,   171, -2103, -2103, -2103, -2103,  4744, -2103,  3908, -2103,
+    1475, -2103, -2103,   903,  1810, -2103,  1692,  5617, -2103,  1861,
+   -2103,  2100,  4787,   754, -2103,  5617, -2103,  2022,  2124,  2126,
+    2127,  2128,  2129,   124,   124,  2131,  2133,  2134,  4832, -2103,
+   -2103, -2103,  2952,   124,   124, -2103, -2103,  2139,   124, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103,  2148, -2103, -2103,
+   -2103, -2103, -2103,  1477, -2103, -2103, -2103, -2103,  2135, -2103,
+   -2103,  2150, -2103,  5617, -2103,   124,   124,   938, -2103,  4863,
+   -2103,  2145, -2103,  2153,  2154, -2103,  4927, -2103,  2156, -2103,
+   -2103,  2143,  1493,  1071, -2103,  2952,  1647, -2103, -2103,  2952,
+     124,  2952, -2103, -2103, -2103,  5617,  1499, -2103, -2103,  2124,
+     124,   124,   124,   124, -2103, -2103,  2952,  2952,   124,  2952,
+    1504, -2103, -2103,  2157, -2103,  1508,  2159,  1526,   124,  2952,
+   -2103, -2103, -2103, -2103,   189,  2160, -2103,  2952,  2078, -2103,
+   -2103, -2103, -2103, -2103, -2103,   124,  2151, -2103, -2103,  4958,
+   -2103,  5617, -2103, -2103,  2158,  4992,  2022, -2103,   348, -2103,
+    2173,  1541,  2174,  1545,  2167,  1552,  5023,  5093,  2164, -2103,
+    1559,  5151, -2103,   124,  2105, -2103, -2103, -2103, -2103,  1810,
+   -2103,  5490,  1856, -2103,  2952,  5617,  2169,  1839,  1842, -2103,
+    2180, -2103, -2103,  2952,  1521, -2103, -2103,  2184,  2186,   124,
+     124, -2103,   124, -2103,  2647, -2103, -2103,  2952, -2103,   124,
+   -2103,  2952, -2103,  2175,  1560,  1566, -2103,  2182,  5521,   908,
+   -2103,  2187,  2188,   124,  5617,   124,  5617,  1580, -2103, -2103,
+   -2103, -2103,  1600, -2103,  2192,  1601,  1604,  1607,  5552, -2103,
+    5617, -2103, -2103, -2103,  2952, -2103, -2103, -2103, -2103, -2103,
+    2178,  1521, -2103,   124, -2103,  2952, -2103, -2103,  2190,  2952,
+    1612,  1632,  1634,  2952,  2191, -2103, -2103, -2103,  5586,  1667,
+   -2103, -2103,  5617,  2204, -2103, -2103, -2103,  2952,  2952,  2952,
+    2198, -2103, -2103, -2103,  5617, -2103, -2103,   -47,   380,  1685,
+   -2103,  2208,  2209, -2103, -2103, -2103,  2202,  2202,  2202, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   541,  2212,
+   -2103,  2096, -2103,  1686, -2103, -2103, -2103
 };
 
   /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -1729,7 +1731,7 @@ static const yytype_uint16 yydefact[] =
      538,   538,   538,   538,   538,   538,   538,   538,   538,   538,
      538,   538,   538,   538,   340,   538,   785,   538,  1228,   538,
     1229,   538,   538,   340,   340,   538,   538,   538,   538,   538,
-     538,   538,   538,  1312,  1312,  1312,  1312,  1312,  1312,   612,
+     538,   538,   538,  1313,  1313,  1313,  1313,  1313,  1313,   612,
        0,    37,   612,    74,    48,    49,    50,    66,    67,    77,
       69,    70,    68,   110,    59,     0,   147,   152,    52,    71,
       72,    73,    51,    60,    55,    56,    57,    61,   208,    76,
@@ -1765,7 +1767,7 @@ static const yytype_uint16 yydefact[] =
     1172,   728,   728,   728,  1181,  1174,  1176,   728,   728,   728,
      728,  1114,   728,   728,  1191,  1148,     0,    45,  1202,  1205,
     1208,  1235,   341,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1260,     0,   613,     4,    20,
+       0,     0,     0,     0,     0,  1261,     0,   613,     4,    20,
       20,     0,     0,    45,     5,     0,     0,     0,     0,     0,
       45,    20,     0,     0,     0,   148,   165,     0,     0,     0,
        0,   529,     0,   529,     0,     0,     0,     0,   529,   223,
@@ -1798,7 +1800,7 @@ static const yytype_uint16 yydefact[] =
      528,     0,  1118,  1113,   528,  1150,  1180,     0,   528,   528,
      528,   528,   528,   528,  1173,   311,    46,  1201,  1210,  1211,
        0,     0,    45,  1234,  1236,  1237,     0,    45,     0,  1025,
-    1026,     0,   993,   350,     0,     0,    45,    45,    45,  1295,
+    1026,     0,   993,   350,     0,     0,    45,    45,    45,  1296,
     1250,    45,     0,     0,    20,    43,    38,    42,     0,    40,
       17,    46,   311,   133,   135,   137,   111,     0,     0,    20,
      340,   149,   539,   599,   166,   147,   311,   180,   182,   184,
@@ -1834,9 +1836,9 @@ static const yytype_uint16 yydefact[] =
        0,     0,     0,     0,  1222,     0,     0,  1209,  1213,  1215,
     1214,    45,  1204,   852,  1223,     0,  1207,     0,     0,  1238,
     1233,  1230,  1231,     0,     0,  1000,    45,    45,    45,     0,
-     391,   392,  1030,     0,     0,     0,     0,  1261,  1263,  1264,
-    1265,  1267,  1266,     0,     0,  1276,  1278,  1279,  1280,     0,
-       0,  1284,    45,     0,     0,  1299,    28,    37,     0,     0,
+     391,   392,  1030,     0,     0,     0,     0,  1262,  1264,  1265,
+    1266,  1268,  1267,     0,     0,  1277,  1279,  1280,  1281,     0,
+       0,  1285,    45,     0,     0,  1300,    28,    37,     0,     0,
       39,     0,    30,   160,   117,   311,   340,   119,   121,     0,
      122,   115,   123,   131,   130,   124,   125,   126,     0,   113,
      116,    26,     0,   311,     0,     0,   145,   178,     0,     0,
@@ -1866,9 +1868,9 @@ static const yytype_uint16 yydefact[] =
        0,     0,     0,  1212,     0,  1203,  1206,     0,  1240,     0,
     1004,  1002,  1003,    45,   999,     0,     0,     0,   351,   599,
      599,     0,  1029,  1032,     0,     0,     0,     0,     0,    45,
-    1247,     0,     0,     0,    45,  1248,  1286,  1288,     0,     0,
-    1291,  1293,    45,  1249,     0,     0,     0,     0,     0,     0,
-      45,  1298,    15,    29,    41,     0,   174,   161,   118,     0,
+    1247,     0,     0,     0,    45,  1248,  1287,  1289,     0,     0,
+    1292,  1294,    45,  1249,     0,     0,     0,     0,     0,     0,
+      45,  1299,    15,    29,    41,     0,   174,   161,   118,     0,
       45,     0,    45,    27,   160,   540,   540,   170,   173,   169,
        0,   187,   190,   215,     0,     0,     0,   248,   246,   253,
      250,   264,   257,   262,     0,     0,   216,   239,   251,   243,
@@ -1895,9 +1897,9 @@ static const yytype_uint16 yydefact[] =
      728,     0,  1108,  1110,  1111,  1109,   728,     0,  1138,  1139,
      728,     0,     0,     0,     0,     0,     0,  1224,     0,     0,
      853,     0,  1232,  1001,     0,  1027,     0,   599,     0,  1031,
-       0,     0,    45,     0,     0,  1262,     0,     0,     0,  1277,
-       0,     0,     0,     0,  1285,     0,     0,    45,     0,     0,
-       0,    45,  1300,     0,     0,     0,   109,   795,     0,   112,
+       0,     0,    45,     0,     0,  1263,     0,     0,     0,  1278,
+       0,     0,     0,     0,  1286,     0,     0,    45,     0,     0,
+       0,    45,  1301,     0,     0,     0,   109,   795,     0,   112,
        0,   174,     0,   147,     0,   172,   171,   268,   254,   267,
        0,   256,   261,   255,   260,     0,     0,     0,     0,     0,
      223,   213,   224,   242,     0,   223,   235,   236,     0,     0,
@@ -1917,8 +1919,8 @@ static const yytype_uint16 yydefact[] =
     1075,    45,  1079,     0,  1080,     0,  1064,   728,  1153,   728,
     1106,   728,  1136,   728,  1216,  1217,  1218,  1226,  1227,    45,
     1221,  1219,  1220,     0,     0,     0,     0,   394,     0,     0,
-    1273,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1296,     0,     0,     0,    45,    45,     0,     0,  1306,
+    1274,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,  1297,     0,     0,     0,    45,    45,     0,     0,  1307,
        0,     0,     0,     0,     0,    31,   176,   175,     0,     0,
      120,   114,   108,     0,     0,   162,   599,   167,     0,   249,
      247,   265,   258,   263,   217,   223,   599,     0,   241,   237,
@@ -1932,11 +1934,11 @@ static const yytype_uint16 yydefact[] =
     1012,     0,     0,   382,     0,     0,     0,     0,   310,   309,
      522,     0,     0,     0,  1120,  1143,     0,  1190,  1189,     0,
        0,     0,  1065,  1154,  1107,  1137,  1225,  1239,     0,     0,
-     393,     0,     0,  1272,  1269,   903,   904,   905,   902,   907,
+     393,     0,     0,  1273,  1270,   903,   904,   905,   902,   907,
      901,   908,   900,   899,   898,   906,   894,     0,     0,    45,
-    1268,  1271,  1270,  1282,  1283,  1281,  1289,  1287,     0,  1290,
-       0,  1292,     0,     0,  1253,     0,  1308,  1309,    45,  1301,
-    1302,  1303,  1304,  1310,  1311,     0,     0,     0,   796,   163,
+    1269,  1272,  1271,  1283,  1284,  1282,  1290,  1288,     0,  1291,
+       0,  1293,     0,     0,  1253,     0,  1309,  1310,    45,  1302,
+    1303,  1304,  1305,  1311,  1312,     0,     0,     0,   796,   163,
      164,     0,     0,   240,   599,   242,     0,   281,   229,     0,
      273,   272,   275,   276,   278,   474,     0,   771,   770,   772,
        0,   768,   432,     0,   998,   435,     0,   742,   740,     0,
@@ -1946,91 +1948,91 @@ static const yytype_uint16 yydefact[] =
      892,   892,   305,  1092,  1091,  1090,  1097,  1098,  1099,  1096,
     1093,  1095,  1094,  1103,  1100,  1101,  1102,     0,  1087,  1131,
     1130,  1132,  1133,     0,  1192,  1082,  1084,  1083,     0,  1086,
-    1085,     0,  1028,  1275,  1274,     0,     0,     0,  1297,     0,
-    1255,    45,  1256,  1258,  1307,     0,   797,     0,   173,   266,
-       0,     0,   228,   227,     0,     0,   767,   511,     0,     0,
-       0,   467,  1017,   824,   823,     0,   821,   863,   860,     0,
-       0,     0,     0,   910,   911,     0,     0,     0,     0,     0,
-     717,   923,  1011,    45,     0,     0,     0,     0,     0,  1129,
-    1186,  1081,    45,     0,     0,   895,     0,  1254,    45,  1251,
-      45,  1252,  1305,     0,     0,   252,   232,   496,   769,   758,
-     745,   738,   743,     0,     0,   820,   866,   861,     0,     0,
-       0,     0,     0,     0,     0,   849,     0,   855,     0,   468,
-     721,     0,     0,   842,    45,    45,   889,  1089,  1088,     0,
-       0,   896,     0,  1294,     0,     0,   800,   794,   798,   168,
-       0,     0,   466,   822,     0,     0,     0,     0,   858,     0,
-     841,     0,   909,   859,     0,   848,     0,   854,     0,   924,
-       0,     0,     0,  1128,     0,     0,   355,     0,     0,     0,
-     497,     0,   748,     0,   746,   749,   864,   865,     0,   867,
-     869,     0,     0,     0,   850,   856,   469,   920,   890,   888,
-       0,   897,    45,    45,   799,   751,   752,     0,   744,     0,
-     862,     0,   857,   840,     0,     0,     0,     0,     0,     0,
-     750,   753,   747,   868,     0,     0,   872,   913,   851,  1022,
-    1257,  1259,   754,     0,     0,     0,   870,    45,  1021,   755,
-     874,   873,    45,     0,     0,     0,   875,   880,   882,   883,
-    1023,  1024,     0,     0,     0,    45,   871,    45,    45,   599,
-     886,   885,   884,   876,     0,   878,   879,     0,   881,     0,
-      45,   887,   877
+    1085,     0,  1028,  1276,  1275,     0,     0,     0,  1298,     0,
+    1255,     0,    45,  1257,  1259,  1308,     0,   797,     0,   173,
+     266,     0,     0,   228,   227,     0,     0,   767,   511,     0,
+       0,     0,   467,  1017,   824,   823,     0,   821,   863,   860,
+       0,     0,     0,     0,   910,   911,     0,     0,     0,     0,
+       0,   717,   923,  1011,    45,     0,     0,     0,     0,     0,
+    1129,  1186,  1081,    45,     0,     0,   895,     0,     0,  1254,
+      45,  1251,    45,  1252,  1306,     0,     0,   252,   232,   496,
+     769,   758,   745,   738,   743,     0,     0,   820,   866,   861,
+       0,     0,     0,     0,     0,     0,     0,   849,     0,   855,
+       0,   468,   721,     0,     0,   842,    45,    45,   889,  1089,
+    1088,     0,     0,   896,     0,  1295,     0,     0,     0,   800,
+     794,   798,   168,     0,     0,   466,   822,     0,     0,     0,
+       0,   858,     0,   841,     0,   909,   859,     0,   848,     0,
+     854,     0,   924,     0,     0,     0,  1128,     0,     0,   355,
+    1256,     0,     0,     0,   497,     0,   748,     0,   746,   749,
+     864,   865,     0,   867,   869,     0,     0,     0,   850,   856,
+     469,   920,   890,   888,     0,   897,    45,    45,   799,   751,
+     752,     0,   744,     0,   862,     0,   857,   840,     0,     0,
+       0,     0,     0,     0,   750,   753,   747,   868,     0,     0,
+     872,   913,   851,  1022,  1258,  1260,   754,     0,     0,     0,
+     870,    45,  1021,   755,   874,   873,    45,     0,     0,     0,
+     875,   880,   882,   883,  1023,  1024,     0,     0,     0,    45,
+     871,    45,    45,   599,   886,   885,   884,   876,     0,   878,
+     879,     0,   881,     0,    45,   887,   877
 };
 
   /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-   -2221, -2221, -2221, -2221, -2221,    10,  1808,  1179, -2221, -2221,
-    -667,   -31, -2221, -2221,  -400, -2221,   806, -2221,   -50,  1173,
-   -2221, -2221, -2221,  2675,    66, -2221, -2221, -2221, -2221, -2221,
-   -2221,   196,   487,   897, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221,  -169,  -907, -2221, -2221, -2221,   994,   490,  1513,
-   -2221,  -191, -1580,   209, -2221, -2221, -2221, -2221, -2221, -2221,
-    1507,  -270,  -335, -2221, -2221, -2221,  1505, -2221,  -408, -2221,
-   -2221, -2221, -2221,  1389, -2221, -2221,   794, -1287, -1543,  1175,
-     472, -1546,  -167,   -15,  1180, -2221,   208,   217, -1818, -2221,
-   -1552, -1257, -1550,  -261, -2221,     4, -1587, -1798, -1393, -2221,
-   -2221,   630,   967,   391,   -55,   124, -2221,   650, -2221, -2221,
-   -2221, -2221, -2221,   -69, -2221, -1469,  -220,  1107, -2221,  1088,
-     721,   748,  -377, -2221, -2221,  1059, -2221, -2221, -2221, -2221,
-     439,   440,  2083,  2922,  -362, -1314,   222,  -439, -1019,  1093,
-    -576,  -596,  1860,    19,  1701,  -881,  -879, -2221, -2221,  -625,
-    -615,  -218, -2221,  -792, -2221,  -594,  -953, -1128, -2221, -2221,
-   -2221,   207, -2221, -2221,  1455, -2221, -2221,  1937, -2221,  1938,
-   -2221, -2221,   767, -2221,  -387,    15, -2221, -2221,  1939,  1941,
-   -2221,   733, -2221,  -711,  -187,  1386, -2221,  1112, -2221, -2221,
-    -113, -2221,  1155,   538, -2221,  4421,  -391, -1099, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221,  -186, -2221,   522,  -931, -2221,
-   -2221, -2221,   369, -1281,  -620,  1195,  -930,  -369,  -384,  -456,
-     645,     5, -2221, -2221, -2221,  1537, -2221, -2221,  1124, -2221,
-   -2221,  1094, -2221,  1362, -1975,  1024, -2221, -2221, -2221,  1545,
-   -2221,  1542, -2221,  1544, -2221,  1547, -1011, -2221, -2221, -2221,
-    -122,  -233, -2221, -2221, -2221,  -402, -2221,   825,   789,  -373,
-     791, -2221,    47, -2221, -2221, -2221,  -332, -2221, -2221, -2221,
-   -1907, -2221, -2221, -2221, -2221, -2221, -1446,  -515,   201, -2221,
-    -176, -2221,  1410,  1200, -2221, -2221,  1201, -2221, -2221, -2221,
-   -2221,  -295, -2221, -2221,  1131, -2221, -2221,  1178, -2221,   269,
-    1197, -2221, -2221,  -826, -2221, -2220, -2221,  -226, -2221, -2221,
-     231, -2221,  -760,  -392,  1785,  1441, -2221, -2221, -1659, -2221,
-   -2221, -2221, -2221, -2221,  -174, -2221, -2221, -2221,  -314, -2221,
-    -339, -2221,  -358, -2221,  -357, -1871, -1200,  -764, -2221,  -102,
-    -484, -1024, -2067, -2221, -2221, -2221,  -491, -1805,   475, -2221,
-    -756, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-    -488, -1473,   743, -2221,   224, -2221,  1575, -2221,  1739, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -1440,   786,
-   -2221,  1485, -2221, -2221, -2221, -2221,  1868, -2221, -2221, -2221,
-     285,  1842, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221,   704, -2221, -2221, -2221,   238, -2221, -2221,
-   -2221, -2221,   -49, -1941, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221,   627,   445,  -530,
-   -1309, -1245, -1318, -1443, -1435, -1432, -2221, -1427, -1426, -1255,
-   -2221, -2221, -2221, -2221, -2221,   429, -2221, -2221, -2221, -2221,
-   -2221,   474, -1424, -1423, -2221, -2221, -2221,   427, -2221, -2221,
-     471, -2221,   303, -2221, -2221, -2221, -2221,   444, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221, -2221,
-   -2221, -2221, -2221,   227, -2221,   223,   -94, -2221, -2221, -2221,
-   -2221, -2221, -2221, -2221, -2221,  1047, -2221,  1042, -2221,  -851,
-   -2221,   216, -2221, -2221, -2221,   428,   732, -2221, -2221, -2221,
-    1400, -2221, -2221, -2221, -2221, -2221, -2025,   -95, -2221, -2221,
-   -2221, -2221,   718, -2221, -2221, -2221, -2221, -2221, -2221,    56,
-   -2221,   715, -2221, -2221, -2221, -2221,   709, -2221, -2221, -2221,
-   -2221, -2221,   705, -2221,    22, -2221,  1286
+   -2103, -2103, -2103, -2103, -2103,   -20,  2004,  1317, -2103, -2103,
+    -688,   -31, -2103, -2103,  -408, -2103,   946, -2103,   -50,  1318,
+   -2103, -2103, -2103,  2626,   216, -2103, -2103, -2103, -2103, -2103,
+   -2103,   338,   631,  1040, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103,  -180,  -899, -2103, -2103, -2103,  1136,   632,  1648,
+   -2103,   -46, -1581,   346, -2103, -2103, -2103, -2103, -2103, -2103,
+    1644,  -274,  -194, -2103, -2103, -2103,  1642, -2103,  -636, -2103,
+   -2103, -2103, -2103,  1529, -2103, -2103,   930, -1269, -1542,  1306,
+     607, -1550,   -42,   109,  1309, -2103,   330,   341, -1818, -2103,
+   -1548, -1246, -1543,  -445, -2103,   135, -1609, -1615,  -776, -2103,
+   -2103,   751,  1097,   516,    71,   250, -2103,   779, -2103, -2103,
+   -2103, -2103, -2103,    58, -2103, -1465,  -358,  1233, -2103,  1218,
+     851,   873,  -378, -2103, -2103,  1179, -2103, -2103, -2103, -2103,
+     562,   563,  2201,   144,  -366, -1321,   343,  -326, -1027,  1169,
+    -544,  -508,  1420,  -223,  1822,  -876,  -879, -2103, -2103,  -614,
+    -602,  -208, -2103,  -848, -2103,  -638,  -952, -1124, -2103, -2103,
+   -2103,   322, -2103, -2103,  1569, -2103, -2103,  2049, -2103,  2050,
+   -2103, -2103,   879, -2103,  -371,    18, -2103, -2103,  2056,  2061,
+   -2103,   841, -2103,  -737,  -204,  1502, -2103,   986, -2103, -2103,
+     255, -2103,  1248,   642, -2103,  4031,  -413, -1107, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103,  -186, -2103,   643,  -926, -2103,
+   -2103, -2103,   301, -1309,  -632,  1299,  -931,  -380,  -192,  -368,
+     673,   -58, -2103, -2103, -2103,  1645, -2103, -2103,  1227, -2103,
+   -2103,  1200, -2103,  1470, -1986,  1129, -2103, -2103, -2103,  1653,
+   -2103,  1649, -2103,  1654, -2103,  1652,  -993, -2103, -2103, -2103,
+     -13,  -243, -2103, -2103, -2103,  -395, -2103,   811,   898,  -487,
+     897, -2103,   156, -2103, -2103, -2103,  -227, -2103, -2103, -2103,
+   -1903, -2103, -2103, -2103, -2103, -2103, -1454,  -530,   310, -2103,
+     -69, -2103,  1517,  1307, -2103, -2103,  1310, -2103, -2103, -2103,
+   -2103,  -191, -2103, -2103,  1239, -2103, -2103,  1281, -2103,   377,
+    1303, -2103, -2103,  -871, -2103, -1896, -2103,  -120, -2103, -2103,
+     345, -2103,  -767,  -384,  1896,  1547, -2103, -2103, -1553, -2103,
+   -2103, -2103, -2103, -2103,   -62, -2103, -2103, -2103,  -202, -2103,
+    -225, -2103,  -242, -2103,  -240, -1890, -1195,  -787, -2103,    17,
+    -477, -1065, -2102, -2103, -2103, -2103,  -491, -1820,   596, -2103,
+    -765, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+    -488, -1461,   860, -2103,   347, -2103,  1694, -2103,  1865, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -1444,   904,
+   -2103,  1605, -2103, -2103, -2103, -2103,  1982, -2103, -2103, -2103,
+     408,  1957, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103,   824, -2103, -2103, -2103,   355, -2103, -2103,
+   -2103, -2103,    68, -1952, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103,   561,   567,  -531,
+    -936,  -912, -1438, -1445, -1427, -1419, -2103, -1417, -1416, -1392,
+   -2103, -2103, -2103, -2103, -2103,   550, -2103, -2103, -2103, -2103,
+   -2103,   598, -1407, -1401, -2103, -2103, -2103,   548, -2103, -2103,
+     595, -2103,    96, -2103, -2103, -2103, -2103,   566, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
+   -2103, -2103, -2103,   349, -2103,   351,    32, -2103, -2103, -2103,
+   -2103, -2103, -2103, -2103, -2103,  1170, -2103,  1162, -2103,  -837,
+   -2103,   334, -2103, -2103, -2103,   554,   858, -2103, -2103, -2103,
+    1522, -2103, -2103, -2103, -2103, -2103, -2036,    22, -2103, -2103,
+   -2103, -2103,   839, -2103, -2103, -2103, -2103, -2103, -2103,   177,
+   -2103,   836, -2103, -2103, -2103, -2103,   831, -2103, -2103, -2103,
+   -2103, -2103,   825, -2103,   157, -2103,  1509
 };
 
   /* YYDEFGOTO[NTERM-NUM].  */
@@ -2062,32 +2064,32 @@ static const yytype_int16 yydefgoto[] =
      771,   772,   270,   502,   839,   840,   842,   271,   272,   769,
      273,   824,   274,   818,   275,   705,  1074,   276,   277,  2194,
     2195,  2196,  2197,  1731,  1071,   410,   725,   726,  1070,  1696,
-    1760,  1967,  1968,  2451,  2452,  2523,  2524,  2546,  2560,  2561,
+    1760,  1967,  1968,  2453,  2454,  2527,  2528,  2550,  2564,  2565,
     1765,  1965,   278,   279,  1747,   677,   813,   814,  1953,  2300,
     2301,  1954,   674,   675,   280,   281,   282,   283,  2108,  2109,
-    2487,  2488,   284,   758,   759,   285,   710,   711,   286,   689,
-     690,   287,   288,  1150,  1737,  2184,  2405,  2406,  1997,  1998,
-    1999,  2000,  2001,   707,  2002,  2003,  2004,  2466,  1234,  2005,
-    2468,  2006,  2007,  2008,  2408,  2456,  2496,  2528,  2529,  2565,
-    2566,  2585,  2586,  2587,  2588,  2589,  2600,  2009,  2206,  2425,
+    2490,  2491,   284,   758,   759,   285,   710,   711,   286,   689,
+     690,   287,   288,  1150,  1737,  2184,  2406,  2407,  1997,  1998,
+    1999,  2000,  2001,   707,  2002,  2003,  2004,  2468,  1234,  2005,
+    2470,  2006,  2007,  2008,  2409,  2458,  2499,  2532,  2533,  2569,
+    2570,  2589,  2590,  2591,  2592,  2593,  2604,  2009,  2206,  2426,
      820,  2083,  2246,  2247,  2248,  2010,   832,  1505,  1506,  2027,
-    1167,  2422,   289,   290,   291,   292,   293,   294,   295,   296,
+    1167,  2423,   289,   290,   291,   292,   293,   294,   295,   296,
      801,  1169,  1170,  1753,  1754,   297,   848,   298,   784,   299,
      785,   300,  1147,   301,   302,   303,   304,   305,  1107,  1108,
      306,   766,   307,   308,   309,   685,   686,   310,   311,  1419,
     1686,   719,   312,   313,   780,   314,   315,   316,   317,   318,
      319,   320,  1244,  1245,   321,  1177,  1761,  1762,  2335,   322,
-    1724,  2176,  2177,  1763,   323,  2578,   324,   325,   326,   327,
+    1724,  2176,  2177,  1763,   323,  2582,   324,   325,   326,   327,
     1253,   328,   329,   330,   331,   332,   333,  1210,  1808,   866,
     1786,  1787,  1788,  1812,  1813,  1814,  2368,  1815,  1816,  1789,
-    2212,  2478,  2357,   334,  1216,  1836,   335,   336,   337,   338,
+    2212,  2480,  2357,   334,  1216,  1836,   335,   336,   337,   338,
     1200,  1790,  1791,  1792,  2363,   339,  1218,  1840,   340,  1206,
     1795,  1796,  1797,   341,   342,   343,  1212,  1830,   344,   345,
      346,   347,   348,   349,   350,   351,   352,   353,   354,   355,
      356,   357,   358,  1801,  1802,   867,  1527,   359,   360,   361,
      362,   363,   364,   877,   878,   879,  1228,  1229,  1230,  1235,
     1846,  1847,   365,   366,   367,  1241,  1242,   368,   883,   884,
-     885,   369,   370,   371,   372,   373,  2263,  2264,  2439,  2441,
+     885,   369,   370,   371,   372,   373,  2263,  2264,  2441,  2443,
      374,  1256,  1257,  1258,  1259,  1260,  1261,  1262,  2079,  2080,
     1264,  1265,  1266,  1267,  1268,  1270,  1271,  2094,   900,  2092,
      375,  1274,  1275,  2098,  2099,  2104,   561
@@ -2098,1207 +2100,1149 @@ static const yytype_int16 yydefgoto[] =
      number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-     413,   825,   821,   708,   682,   833,   834,   835,   836,   978,
-    1475,  1105,  1401,  1251,   874,  1252,   678,   720,  1306,   804,
-    1720,   697,  1350,   982,  1625,  1755,  1645,   735,  1894,   738,
-    1237,   425,   425,   747,   741,   742,   743,   946,   433,   647,
-    1012,   571,   744,  1092,   647,   746,  2178,   748,  1748,  1778,
-    1357,  1927,  2202,   996,  1630,  1487,   702,  1981,  1982,  1983,
-    1430,  2086,  1897,  2088,  1899,  1008,  1008,   460,   479,  1254,
-     405,  2265,   482,   653,   751,  1377,   657,   659,   427,   796,
-    1081,   816,  1913,  1007,  1007,  1190,   440,  1822,  1917,  1189,
-     405,   777,  1658,  1932,   797,  1823,   810,  2128,  1824,  1378,
-    1959,  -564,  -566,  1825,  1826,   793,  1828,  1829,  -542,   462,
-     798,  -585,     2,     3,   806,  2359,   809,   405,   970,   592,
-     594,   701,  2134,  2135,  1770,   599,   477,  1564,  -594,   828,
-    -595,   598,   857,  -588,    46,  1565,  1571,  -592,  1974,  2341,
-    -594,   843,  -595,   846,  2590,  -588,  1251,     8,  1396,  -592,
-     852,  1547,  1566,    25,   504,  1496,  1455,   598,    29,  1476,
-    1508,   598,  1025,  -590,   671,  1605,   672,    74,  -528,  1415,
-     905,  1063,   687,  1780,  1799,  -590,   728,   376,  1550,  -138,
-      47,    48,  1347,  1347,   424,   989,   906,   598,   598,   991,
-     886,   905,   598,  -340,   585,  1456,   998,  2467,   598,  -142,
-      96,  2266,  2081,  -566,  1232,  2085,   593,  -585,   996,  -564,
-    1811,   424,  1821,   598,  1834,   408,  -566,   574,   972,  1809,
-     598,  1819,   598,  1832,  1064,  1838,   -62,  1775,   598,   598,
-     109,  1236,   443,  1156,    90,  -528,  -594,  2267,  -595, -1116,
-    2141,  -588,   972,   915,    95,  -592,  1858,   600,   985,  -542,
-     815,  2360,  1065,   927,   928,   929,   930,   647,  -793,  -793,
-    2481,  1771,     4,   602,  1782, -1141,   424,   997,   981,  1457,
-     999,  -590,  2142,  1817,  1223,  1827,   646,  1835,   500,  1106,
-    2591,   646,  -528,  1810,  1516,  1820,  2535,  1833,   424,  1839,
-     121,  -340,  1066,   424,   424, -1063, -1152,   603,  1163,   621,
-   -1168,  1567,  1568,  1067,  1572,  2361, -1171,  2283,  1477,  1041,
-    2435,  1551,   424,   698,  1552,   424,  2362,  1794,  1712,   737,
-    -138, -1105,   931,  1573,   811,  1036,  1072,   699, -1135,  -340,
-   -1115,  1068,  2133,   424,  1168,  2182, -1140, -1062,  1202,   424,
-    -142,  2290,  2291,  1026,  -566,   673,   676,  1158,  -585,   971,
-    -564,   683,   684,   688,   684,  1093,   692,   694,  1901,  1903,
-     700,  1351,   704,   706,   706,   709,  1045,   -62,   712,     5,
-    2129,   716,  2178,   712,  1610,  2131,  1658,  -594,   727,  -595,
-   -1116,   732,  -588,   712,  1975,   712,  -592,   510,  1822,   425,
-     712,   712,   712,   996,  2087,   996,  1823,   598,   712,  1824,
-     745,   712,   996,   712,  1825,  1826, -1141,  1828,  1829,   756,
-     757,  1008,  -590,  1165,  1651,  2228,   768,   770,  1157,  1704,
-    1159,   776,  1507,   647,  1069,  1513,  1447,   647,   783,  1375,
-    1515,   787,   511,   424,   647,   740, -1063, -1152,   424,  -383,
-    1719, -1168,   829,   800,  1185,  1742,   807, -1171,  1664,  1666,
-    1668,  1559,   727,   817,   819,   819,   753,   823,   800,  1384,
-    1442,   598, -1105,  1155,   831,   831,   831,   831,   831, -1135,
-     841, -1115,  1621,   845,  1919,   847,   783, -1140, -1062,   850,
-    1044,   408,   853,  1385,  1749,   791,   858,  1685,  1001,   598,
-    1464,   598,   799,   567,   646,  1312,  1051,   876,  1386,  1293,
-    1811,  2304,  1294,  1387,  1388, -1151,  1892,  1893,  1184,  1809,
-    1389,  1186,  1606,  1821,   598,   875,  1008,  2557,  2558,  1834,
-     572,  2365,  1819,   911,  1615,  1616,  2533,   424,  1832,  1622,
-     917,  1304,  1838,   899,  1007,  1023,  1365,  1366,  1367,  1368,
-    1369,   907,  2494,  2076,   912,   913,   914,   700,  1024,  2288,
-    2525,   575,   920,   921,  1305,  2205,   926,   700,   700,   700,
-     700,   576,   996,  1817,   934,   935,  1897,  2209,  1899, -1167,
-    1030,  2192,   577,  1810,  2495,  1743,  1827,  1467,  1468,   902,
-     903,  1623,  1835,   424,  2285,   647,  1820,  1110,   424,  1349,
-     698,   918,  1833,  -384,  1098,   424,  1839, -1170,   601, -1104,
-    1621,  1340,   424,   621,   699,  1560,  2525,  2463,  1922,   424,
-    1469,   591,   579,   580,  2592,  -231,   951,   992,  2366,  1021,
-     952,   993, -1134,  1625,  2139,  2140,  -528,  1187,  2127,  2367,
-     716,  1014,   768,   823,   817,   704,  1019,  1032,  1197,   847,
-    -528,   922,   405,  2593,  1390,   578, -1151,   700,   967,   995,
-     406,   923,  2572,  1630,   424,  1219,  2235,  1622,  2236,  1310,
-     646,   972,  1220,  1221,   646,   712,  2579,  2237,  1043,  2238,
-     700,   646,  1910,   981,   621,  1391,  1002,   584,  2592,  1585,
-    1251,  1803,  1859,  1418,  1088,  1842,  1843,  1844,  1311,  1848,
-    1849,   587,  1283,  1060,   588,  1222,   424,   911,  1643,  2392,
-      50,  1911,   972,  2594,  1105,  1105,  1307,  2593,  1053,  1623,
-   -1167,  1919,  1920,  1921,  1100,   668,   669,  2434,  1082,  1392,
-    1087,  1054,  1357,  1089,  1008,  2037,  2606,  2608,  1134,   581,
-    1664,  1666,  1668,  1092,   589,  1139,  1103,  1780, -1170,  2612,
-   -1104,  -383,  1007,  1803,  1644,  1061,  1133,  1199,  2292,  2293,
-    2294,  1205,  1181,   970,  1781,  1140,  1211,  1141,  1062,  1215,
-    1217,  1964,  1148, -1134,  1151,  1182,  1586,   700,  2477,   996,
-     996,   996,   996,   996,   647,   647,   647,   647,   647,  1884,
-     673,  1587,  1588,  1589,  1008,  1008,  1008,  1885,  1780,  1780,
-     590,  1103,  2239,  2240,  1381,  2241,  2242,   700,  1279,  1382,
-     118,  1192,  1663,  1665,  1667,  1781,  1781,   122,  2444,   598,
-    1352,  1280,   700,   595,    25,   700,  -528,  1759,  1308,    29,
-    1309,  1193,   646,  1353,   596,   424,  2243,  1693,  1782,  1223,
-    1224,  1783,  1238,  1225,  1226,   597,  1784,  1243,  2127,  1358,
-    1422,    47,    48,   637,  1785,  1922,  1255,  1263,  1269,  -384,
-    1780,  1273,  1359,  1576,  -388,  1240,  1577,  1578,  1579,  2139,
-    2140,   973,  1804,   655,  2287,  2424,   976,  1781,  2244,  1580,
-    1581,  1276,   845,   641,   642,   643,  1407,  1592,   652,  1782,
-    1782,  2245,  1783,  1783,  1411,   616,  1805,  1301,   660,  1408,
-    1439,  1316,   661,  1461,   618,    90,  1806,  1412,  1479,  1233,
-    1233,  1807,   650,  1440,  2343,    95,  1462,   658,   992,  1313,
-     662,  1480,   993,   791,  1278,  2344,  2345,  1482,   663,   642,
-     643,  2346,   619,  2347,  1804,   664,   994,   992,   665,  1302,
-    1483,   993,  2348,  1485,  2349,   666,  2350,  2461,   642,   643,
-     995,  1782,   667,  1363,  1783,   994,  1486,  1023,  1805,  1784,
-     620,   121,  2119,  2120,  2121,  2122,  2123,  1785,  1806,   995,
-    1493,  -385,  1499,  1807,   670,  1553,  1145,  1561,  1482,  2459,
-    2390,  1569,  1574,  1611,  1395,  1500,  2318,  1654,  1554,  1251,
-    1562,  1563,  1097,  1653,  1570,  1575,  2115,   644,   405,  1656,
-     951,  1251,   673,  2091,   952,   150,  1582,  1759,  1399,  2175,
-     721,   953,   954,  1590,   688,  1671,  1770,   621,  1651,  1583,
-    1507,   646,   646,   646,   646,   646,  1591,   709,  1672,  1002,
-    1002,  1673,   967,  1249,  2157,  1053,  2532,  2299,  1352,  2011,
-    2162,  1705,  1685,  1706,  1681,  1683,  1675,  1941,  1677,  1601,
-    1602,  1680,  1432,   911,  2089,  2090,   791,   732,  1684,  1687,
-    1703,  1458,  2100,  2101,  1697,  1692,  1699,  2531,  2351,   622,
-    1713,  2352,  1688,   757,  1766,  1598,  1008,  1008,  1008,   791,
-    2319,  2084,   681,  1714,  1251,  1249,  2156,  1767,   770,  2235,
-    1415,  2236,  -386,  1604,  1947,  1665,  1667,  1523,  1769,  1411,
-    2237,    25,  2238,  1526,   976,  1481,    29,  1529,  1249,  1531,
-    1529,  1529,  1957,  1533,  1455,  1535,   679,  1443,  1722,  1249,
-    1507,  1978,  1507,  1347,  1347,  1347,  1347,  1347,    47,    48,
-     680,   992,  1984,  1461,   972,   993,  1734,  2019,   695,  -853,
-     992,   718,   642,   643,   993,  1499,  1985,  1370,  1511,   994,
-    2020,   642,   643,  1771,  2320,   703,  2353,  2023,  2021,   715,
-    2049,   730,   569,   995,   764,  1774,  2321,  2069,  2322,  2323,
-    2024,  2324,   995,  2050,  2325,  1203,  1204,   992,  1207,   736,
-    2070,   993,    90,   749,  2116,  2136,  -588,   788,   642,   643,
-    2167,  1542,    95,  1489,   754,   994,   424,  2117,  2137,  1936,
-    1857,  1875,  1876,  2168,  1284,  1544,  1555,  1556,  1557,   995,
-    1944,  1544,  2067,  2068,  2354,  2355,  2356,  1544,  2172,   767,
-    1549,  2232,  1700,  1544,  2173,  2239,  2240,  1457,  2241,  2242,
-    2174,   774,  1584,  2227,  2233,   775,  2234,   778,   121,  1055,
-     781,  1056,   782,  2249,   611,   729,   786,  1285,   612,   613,
-     614,   615,   790,  1286,  2273,  2274,  2250,  1593,   907,  2243,
-    2038,   616,  2040,  2041,   794,  2326,   795,  2327,   617,   822,
-     618,   570,  1544,   830,  2045,   855,  1766,  2299,   856,  1287,
-     859,  1603,   150,  1499,  2052,  2252,  2054,   700,  1939,  2253,
-     882,  1313,  1614,  1615,  1616,  1766,  2254,  1482,   619,  2139,
-    2140,  2244,  1482,  1288,  1617,  1289,  2258,  2268,  2255,  1682,
-    2256,   904,  1955,  1618,  2245,  2257,  1482,  1482,  2276,  2259,
-    2269,  2313,  2147,  2419,  1961,  1977,   620,  1544,  1963,  2270,
-    2271,  2277,  1181,  1499,  2314,  1544,  1619,  2381,  1290,  2381,
-    2316,  1620,   916,  1291,   943,  2337,  2339,  1292,  2371,   861,
-    2382,  1293,  2383, -1191,  1294,   625,   880,   860,   996,   862,
-    1610,  1251,  1669,   424,  1902,  1904,   863,   864,   865,  1621,
-     609,   610,   868,   869,   870,   871,  1295,   872,   873,  1371,
-    1372,  2395,  2428,   621,  1740,  2398,   881,  1251,  1360,  2378,
-    1296,   887,  1361,   611,  2396,  2429,  1297,   612,   613,   614,
-     615,  2136,  1002,  2601,  2602,  1695,  1695,   894,  1695,  2454,
-     616,  1249,  1499,   895,  2446,  2475,   712,   617,  1082,   618,
-    1082,  1461,  2455,  1707,  2470,  2473,  1622,  1499,  2476,  1766,
-    2506,  2249,  2249,  2547,  2498,   622,  2549,  1461,  1499,  1181,
-    2500,  1249,  2502,  2507,  2538,  2539,  2548,   619,   647,  2550,
-    2552,  2553,  2554,  1746,  2569,  1730,   896,  1354,  2381,  1951,
-    2511,  2512,   611,  2381,  1151,   972,   612,   613,   614,   615,
-    1744,  2570,  1772,   897,  1773,   620,  2571,  2575,  1623,   616,
-     700,  2595,  1647,  1948,  1949,  1950,   617,   898,   618,   919,
-    2576,   901,   973,   974,  2596,  2611,   975,  1776,   976,  1845,
-     562,   563,   564,   565,   566,   979,  1732,  1213,  1214,  1000,
-    1020,   990,   424,  1243,   811,  1031,   619,  1033,  1029,  1035,
-    1042,  1993,  1048,  1052,   408,  1073,   983,  1076,  1240,  1255,
-     984,  2556,   621,  1078,  1263,   970,   803,   642,   643,  1094,
-    1095,  1096,  1269,  1101,   620,  1109,  1164,  1342,   616,  1779,
-    1273,  1138,  1175,  1111,  1188,  1178,  1179,   618,   779,  1191,
-    1134,  1194,  1890,  1202,  1208,  1233,  1233,  1233,  1281,  1233,
-    1233,  1231,  1249,  1850,  1883,   803,   642,   643,  1272,   598,
-    1317,   424,  1320,  1341,   622,   619,   952,   616,  2421,  2158,
-     791,   993,  1373,   826,  -343,  1379,   618,  1380,  1400,  1410,
-    1402,   621,  1446,   838,  1912,  1424,  1425,  2160,  1426,  1427,
-    1428,  1429,  1438,   620,  1441,  2147,  1607,  1923,   985,  1459,
-    1444,   611,  1450,  -936,   619,   612,   613,   614,   615,  1460,
-    1465,  1466,  1471,  1484,  1470,  1478,  1707,  1494,   616,  1707,
-    1707,  1707,  1497,  1498,  1502,   617,  2204,   618,  1501,  1952,
-     644,  1166,   620,   622,  1503,  1512,  1514,   888,   889,   890,
-     891,   893,  2297,  1105,  1473,  2462,  1507,   611,  1504,  1536,
-     621,   612,   613,   614,   615,   619,  1521,  1524,  1537,  1538,
-    1539,   712,  1540,  1541,   616,   646,  1002,   985,  1544,   644,
-    1545,   617,  1546,   618,  1549,   922,  1595,  1600,  1638,  1641,
-    1646,  1986,  1647,   620,  1652,  1702,  1657,  1660,  1661,   621,
-    1662,   376,  1670,  1676,   985,  1456,   945,   947,   948,  1089,
-     949,   619,   622,   406,  1693,  2509,  1710,   950,  1715,  1716,
-    1717,  1718,  2340,  1734,  1729,  1741,  1750,  1768,  1851,  1854,
-     424,   826,  1855,  1856,  1905,  1233,  1233,  1233,  1860,   620,
-    2530,  1105,  1861,  2030,  2031,  1862,  1863,  2281,  1864,  1759,
-     621,   622,  1866,  1867,   611,  1868,  1870,  2284,   612,   613,
-     614,   615,  1871,  1872,  1873,  1877,  1878,   985,  2048,  1879,
-    1284,   616,  1880,  1028,  1881,  1887,   424,  1889,   617,   639,
-     618,  1906,  1915,   640,  2521,  1936,  1907,   802,  1038,   641,
-     642,   643,  1908,  2530,  1909,  1055,   621,   803,   642,   643,
-     611,   616,   622,  1918,   612,   613,   614,   615,   619,   616,
-     618,  1931,  2082,  1285,  1933,  1937,  1059,   616,   618,  1956,
-    1240,  1958,  1969,  1075,   617,  1970,   618,  2097,  1971,  1079,
-    1080,  2103,  2413,  2414,  1973,  -495,   620,  1987,   619,  1988,
-    1994,  1995,  1996,  2013,  2014,  1287,   619,  2016,   622,  2017,
-    2018,  2025,  2028,  2029,   619,  1770,  1771,  2035,  2036,  2039,
-    2042,  2051,  2053,  2055,   621,  2138,   620,  2074,  2075,  1288,
-    2064,  1289,  2065,   424,   620,  1137,  2066,  2071,  2072,   791,
-    1233,  2095,   620,  1233,  2077,  2096,  1423,  2130,  1923,  1923,
-    1923,   791,  2105,   621,  2110,  2118,  -382,  1431,  2125,  2126,
-    1923,  2143,  2146,   644,  1290,  2150,  2149,  2151,  2207,  1291,
-    2152,   644,  2153,  1292,  2155,  2154,  2165,  1293,  2171,   424,
-    1294,  2458,  2460,   621,  2170,  2275,  2397,   688,  2187,  2230,
-    2189,   621,  2231,  2251,  2261,  2278,  2279,  -225,  2303,   621,
-    2286,  2317,  1295,  2333,  2330,   622,  2185,  2311,  1195,  1196,
-     837,  2332,  2331,   611,  2336,  2334,  1296,   612,   613,   614,
-     615,  -844,  1297,  2338,  2364,  2358,  2372,  2375,  2376,  2380,
-     616,  2386,  2387,  2399,   791,   622,  2389,   617,  2393,   618,
-     791,  1744,  2400,   622,  2407,  1952,  2409,  2193,  2410,  2411,
-    1495,   622,  2213,  2412,  2415,  2416,  2417,  2203,  2423,  2427,
-    2443,  2219,  2432,  2431,  2208,  1776,  2438,   619,  2440,  2445,
-    2471,  2474,  2489,  1233,  2482,  2497,  2491,  2499,  2501,  1845,
-    2505,  2201,  2519,  2526,  1522,  2510,  2518,  2514,  2517,  2527,
-    1525,   582,  2537,  2540,  1528,   620,  1530,  2559,  2542,  2543,
-    1532,  2551,  1534,  2577,  1321,  1322,  1323,  1324,  1325,  1326,
-    1327,  1328,  1329,  1330,  1331,  1332,  1333,  1334,  1335,  1336,
-    1337,  1338,  1339,  2567,  2573,  2582,  1895,  2597,  2599,   826,
-    2598,   611,   424,  2610,  1355,   612,   613,   614,   615,  2592,
-    2190,  1362,  1277,  1364,  1282,  1594,  2111,  1888,   616,  1517,
-    2388,  1454,   621,  1233,  1891,   617,  1912,   618,  1374,   924,
-    2112,   933,   936,  1049,  1613,  1923,  1916,  1923,  1923,  1923,
-    1923,  1923,  1923,    13,    14,  1314,    15,    16,  2309,  2391,
-    1315,    20,  2282,  2289,   893,   619,  2132,  2124,  1492,    23,
-    1405,  1757,  2012,  2329,    27,  1739,  2188,    30,  2342,   951,
-    1403,  1420,  1689,   952,   622,    37,  1059,    38,  1674,    40,
-     953,   954,  1979,   620,  1449,  1980,   955,   956,   439,   958,
-    2609,  2148,   960,   961,   962,   963,   964,   792,  2161,   951,
-    1050,   967,    59,   952,  1679,   819,  2031,  1709,  1943,  1233,
-     953,   954,  1154,    70,   604,   605,   606,   956,   607,   958,
-     424,  1942,   960,   961,   962,   963,   964,  1409,  1013,  2377,
-    1376,   967,  1435,  1463,  1183,  1510,  1016,    85,  1015,  1017,
-     621,  2420,  1691,  1018,  2308,  2562,  1694,  2191,  2097,  2448,
-      93,  1162,  1393,  1394,  2544,  1448,  1413,  2159,  2493,  2186,
-     765,  1474,  1404,  1146,  2457,  2563,  2581,  2603,   102,  2426,
-    2605,  2026,  1756,  2198,   104,  1022,   849,  1721,  2163,  1488,
-    1102,   791,   108,   691,   110,  1923,   112,  1853,   114,  1701,
-     739,  2199,   622,  2057,  2402,   119,  2061,  2044,  2063,  2047,
-    2430,  2216,   893,  1509,   838,  2059,  2218,   791,  1543,  2073,
-    1548,  1852,   130,   131,  1239,  2226,  2437,  1865,  2374,  1869,
-    2384,  1874,   831,   831,     0,  1882,     0,   752,     0,     0,
-     143,     0,  2193,     0,     0,   951,     0,   608,  1736,   952,
-       0,     0,     0,     0,     0,     0,   953,   954,     0,     0,
-       0,   155,   955,   956,   156,   958,   752,     0,   960,   961,
-     962,   963,   964,   752,     0,   966,     0,   967,   968,     0,
-       0,   812,  1558,     0,     0,     0,     0,     0,  1793,     0,
-       0,  1798,     0,     0,  1818,     0,  1831,     0,  1837,     0,
-    1841,     0,     0,     0,     0,     0,     0,     0,  2450,     0,
-       0,     0,     0,  2472,     0,     0,     0,     0,  1103,  1103,
-       0,     0,  2480,     0,     0,     0,     0,     0,  2484,     0,
-    2485,     0,     0,     0,  2433,  1233,     0,     0,  1609,    13,
-      14,     0,    15,    16,     0,     0,     0,    20,     0,     0,
-    1642,     0,  2486,     0,     0,    23,     0,     0,     0,     0,
-      27,     0,     0,    30,  2082,  2082,     0,     0,     0,     0,
-       0,    37,  2113,    38,     0,    40,     0,   611,  1649,     0,
-       0,   612,   613,   614,   615,     0,  1233,     0,     0,     0,
-    1655,     0,     0,   932,   616,     0,     0,     0,    59,     0,
-       0,   617,     0,   618,     0,     0,     0,  2403,     0,    70,
-       0,     0,   611,     0,     0,     0,   612,   613,   614,   615,
-       0,     0,     0,     0,     0,     0,     0,     0,  2486,   616,
-    2545,   619,     0,    85,     0,     0,   617,     0,   618,  1678,
-    1038,  2516,     0,     0,     0,     0,    93,     0,     0,     0,
-       0,     0,     0,     0,  1690,     0,     0,   752,     0,   620,
-       0,  1698,     0,     0,   102,     0,   619,  2583,     0,     0,
-     104,   893,  2584,     0,     0,     0,     0,  1708,   108,  1711,
-     110,     0,   112,     0,   114,  2584,     0,  2604,  2607,     0,
-       0,   119,   893,     0,   620,  1473,   424,     0,   611,     0,
-    2607,     0,   612,   613,   614,   615,  1726,     0,   130,   131,
-       0,     0,     0,     0,     0,   616,   621,  1738,     0,     0,
-       0,     0,   617,     0,   618,     0,   143,     0,     0,     0,
-    1752,   424,     0,     0,     0,  1758,   837,  1764,     0,   611,
-       0,     0,     0,   612,   613,   614,   615,   155,     0,  1085,
-     156,   621,   619,     0,     0,  2043,   616,     0,     0,     0,
-    2046,     0,     0,   617,     0,   618,     0,  1104,   622,     0,
-       0,     0,     0,  2056,     0,     0,     0,     0,     0,     0,
-     620,  1136,     0,     0,     0,     0,     0,     0,   951,  1142,
-    1143,     0,   952,   619,  1149,  2058,     0,     0,     0,   953,
-     954,  2060,     0,   622,     0,  2062,   956,     0, -1192,     0,
-       0, -1192, -1192, -1192, -1192, -1192,     0,   424,     0,     0,
-     967,   620,  1104,     0,     0,     0,  1037,     0,     0,   611,
-    1176,     0,     0,   612,   613,   614,   615,   621,     0,     0,
-       0,     0,  1473,  1896,     0,   611,   616,     0,     0,   612,
-     613,   614,   615,   617,   985,   618,     0,     0,   424,  1198,
-       0,  1201,   616,     0,     0,     0,     0,     0,     0,   617,
-       0,   618,     0,     0,     0,     0,     0,     0,   621,     0,
-     752,   752,     0,   619,  1940,   826,  1355,     0,     0,   622,
-       0,     0,     0,  1725,  1250,  1149,   611,     0,     0,   619,
-     612,   613,   614,   615,     0,     0,     0,     0,     0,     0,
-       0,   620,     0,   616,     0,  1960,     0,     0,  1962,     0,
-     617,     0,   618,     0,     0,  1751,  1966,   620,   611,     0,
-     622,     0,   612,   613,   614,   615,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   616,     0,     0,   424,     0,
-     619,     0,   617,     0,   618,     0,     0,     0,  1989,     0,
-    1992,     0,     0,     0,   424,     0,     0,     0,   621,     0,
-       0,     0,     0,     0,  1346,  1346,     0,     0,   620,     0,
-       0,     0,   619,     0,   621,     0,     0,     0,     0,     0,
-    2200,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     752,   752,     0,     0,  2211,     0,     0,     0,     0,  2214,
-     620,     0,  2215,     0,     0,   424,     0,     0,     0,     0,
-     622,     0,  2222,     0,  2223,     0,  2224,  1250,  2225,     0,
-       0,     0,     0,     0,     0,   621,   622,     0,     0,     0,
-       0,     0,     0,     0,     0,   951,     0,   424,     0,   952,
-    1414,     0,     0,     0,     0,     0,   953,   954,     0,     0,
-       0,     0,   955,   956,   957,   958,     0,   621,   960,   961,
-     962,   963,   964,   965,   378,   966,     0,   967,   968,     0,
-     384,     0,     0,     0,     0,     0,     0,   622,   752,     0,
-     391,     0,     0,   393,     0,     0,   396,     0,     0,     0,
-       0,     0,     0,   402,     0,     0,  2093,   409,     0,     0,
-       0,   412,     0,  2102,     0,     0,     0,  2106,  2107,   622,
-       0,     0,     0,     0,     0,  2114,     0,     0,     0,   431,
-       0,     0,     0,   435,   436,     0,     0,     0,     0,   441,
-     442,     0,     0,     0,     0,   447,   448,     0,   450,   451,
-     452,   453,     0,   454,     0,     0,     0,     0,     0,     0,
-       0,     0,   463,     0,     0,     0,  2145,   467,     0,   469,
-       0,     0,  1649,   472,     0,     0,     0,   476,  1104,   478,
-       0,     0,     0,     0,     0,     0,   484,     0,     0,     0,
-     488,     0,     0,     0,   491,     0,   493,  2164,     0,     0,
-       0,     0,  1991,   501,   503,   611,  2169,   505,   506,   612,
-     613,   614,   615,   512,     0,   513,     0,     0,     0,   517,
-       0,   611,   616,  2179,  2180,   612,   613,   614,   615,   617,
-       0,   618,     0,     0,     0,     0,     0,   611,   616,     0,
-       0,   612,  1005,   614,   615,   617,   544,   618,   546,     0,
-       0,     0,  1752,     0,   616,   551,   552,     0,     0,   619,
-     838,   617,     0,   618,     0,     0,     0,     0,     0,     0,
-    2210,     0,     0,     0,     0,   619,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2220,   620,  2221,     0,
-       0,   619,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   620,     0,     0,     0,     0,     0,  1612,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   620,
-       0,     0,     0,     0,   424,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     424,     0,     0,     0,   621,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   424,     0,     0,     0,
-     621,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   752,     0,     0,   621,     0,     0,     0,
-       0,     0,     0,  2296,     0,     0,     0,     0,  2298,     0,
-       0,     0,     0,     0,     0,     0,   622,     0,     0,  2307,
-    1966,     0,     0,     0,  2312,     0,     0,     0,     0,     0,
-       0,     0,   622,     0,  2315,     0,     0,     0,     0,     0,
-    2328,     0,     0,     0,     0,   951,     0,     0,   622,   952,
-     611,     0,     0,     0,     0,     0,   953,   954,     0,  1085,
-     969,  1085,   955,   956,   957,   958,   959,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,     0,   967,   968,     0,
-    1104,  1104,     0,     0,  2373,     0,     0,     0,     0,   724,
-       0,  1723,     0,     0,     0,     0,     0,   752,     0,  1733,
-       0,     0,  1735,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2379,   812,     0,     0,     0,  1104,  1104,
-       0,     0,     0,     0,     0,     0,     0,     0,  2385,     0,
-       0,     0,     0,     0,  1609,     0,     0,     0,     0,     0,
-     752,     0,     0,     0,     0,     0,     0,  1800,     0,     0,
-       0,     0,     0,     0,     0,     0,   752,   752,   752,     0,
-     752,   752,     0,     0,   752,     0,     0,     0,     0,     0,
-    2404,   951,     0,  1727,     0,   952,   611,     0,     0,     0,
-       0,  1250,   953,   954,     0,   893,     0,  1728,   955,   956,
-     957,   958,     0,   851,   960,   961,   962,   963,   964,   965,
-       0,   966,     0,   967,   968,     0,     0,  1112,     0,     0,
-    1130,  1113,   611,     0,   969,     0,     0,     0,  1114,  1115,
-       0,     0,     0,     0,  1116,  1117,  1118,  1119,     0,     0,
-    1120,  1121,  1122,  1123,  1124,  1125,  1126,  1127,     0,  1128,
-    1129,     0,     0,     0,     0,  1914,     0,  2447,  2298,     0,
-       0,  2449,     0,  2453,     0,     0,     0,     0,     0,     0,
-       0,   969,     0,     0,     0,     0,     0,     0,  2464,  2465,
-       0,  2469,     0,   969,     0,     0,     0,   752,     0,     0,
-       0,  2479,     0,     0,     0,     0,   951,     0,  1180,  2483,
-     952,   611,     0,     0,     0,     0,     0,   953,   954,     0,
-       0,     0,     0,   955,   956,   957,   958,  2404,     0,   960,
-     961,   962,   963,   964,   965,     0,   966,     0,   967,   968,
-       0,     0,     0,   969,   969,   969,   969,     0,   969,     0,
-       0,     0,     0,     0,     0,  2515,   752,   752,   752,     0,
-       0,     0,     0,  2520,  2522,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   838,     0,     0,  2534,     0,     0,
-       0,  2536,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     969,     0,   969,   969,   969,   969,  1104,     0,     0,     0,
-       0,     0,     0,   893,     0,     0,     0,     0,     0,     0,
-    2522,     0,     0,     0,  2564,     0,     0,     0,  2568,     0,
-       0,     0,  1764,     0,     0,     0,     0,     0,     0,   951,
-       0,     0,  1246,   952,   611,     0,  1764,  2580,  2564,     0,
-     953,   954,     0,     0,     0,     0,   955,   956,   957,   958,
-       0,   969,   960,   961,   962,   963,   964,   965,     0,   966,
-       0,   967,   968,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   969,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   969,     0,     0,     0,     0,     0,     0,
-    1250,   752,     0,     0,   752,     0,  1104,  1104,  1104,     0,
-    1149,  1149,  1250,     0,   969,     0,     0,     0,  1149,  1149,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     969,     0,     0,     0,   969,   969,     0,     0,     0,   951,
-       0,     0,  1247,   952,   611,  1346,  1346,  1346,  1346,  1346,
-     953,   954,     0,     0,     0,     0,   955,   956,   957,   958,
-       0,     0,   960,   961,   962,   963,   964,   965,     0,   966,
-       0,   967,   968,     0,     0,     0,     0,     0,     0,   951,
-       0,     0,  1248,   952,   611,     0,     0,     0,     0,     0,
-     953,   954,   969,     0,     0,  1250,   955,   956,   957,   958,
-       0,  1414,   960,   961,   962,   963,   964,   965,     0,   966,
-       0,   967,   968,   951,     0,     0,     0,   952,   611,     0,
-       0,     0,  1303,     0,   953,   954,     0,     0,     0,  1319,
-     955,   956,   957,   958,   752,  2183,   960,   961,   962,   963,
+     413,   825,  1105,   682,  1401,   833,   834,   835,   836,   821,
+     697,   708,   678,   874,  1475,  1252,  1720,  1092,  1251,  1645,
+     978,  1008,  1008,  1350,  1254,   747,  1306,  1894,  1012,  1927,
+     571,   425,   425,   720,   646,  2178,   982,  1755,   433,   646,
+    1748,  2202,  1625,   735,  1237,   738,  2086,  1487,  2088,   647,
+     741,   742,   743,  1778,   647,  1357,   440,   796,   744,  1081,
+    2265,   746,  1190,   748,  1658,  1630,  1897,   460,   479,   946,
+     751,  1899,   482,   653,  1377,  1974,   657,   659,  1430,   462,
+    -564,   427,  1189,  1913,  1917,  1822,   405,   777,   816,  1932,
+    1811,   405,  1821,   797,  1834,   970,   477,  2128,  -566,  1959,
+     405,   793,  1063,  1823,  2341,  1476,   798,   804,  1770,     8,
+     806,  1824,   809,  1825,  1826,  1007,  1007,   701,   905,  -542,
+       2,     3,  2359,  1828,   504,   828,  1347,  1347,  1799,  1829,
+    1571,  1615,  1616,  1378,   906,  2594,  1817,   843,  1827,   846,
+    1835,   996,  1547,  1455,   424,  -585,   852,  1025,  1396,   376,
+    1794,  1251,  1508,  1605,   574,  1064,   378,   671,  -594,   672,
+    1919,   598,   384,  1981,  1982,  1983,   728,  1550,  -528,   424,
+    -594,  1202,   391,  1496,  1415,   393,  2141,   408,   396,  1919,
+    1920,  1921,  1456,  1065,   600,   402,   886,  1775,  -564,   409,
+     737,  -595,   972,   412,   585,  -138,   905,   702,   687,  -566,
+    -142,  -588,  2266,  -595,  1467,  1468,   985,  1621,  2142,   -62,
+    2483,   431,  -566,  -588,   753,   435,   436,   811,   408,  1232,
+     424,   441,   442,  1066,  1780,  1001,   500,   447,   448,  1312,
+     450,   451,   452,   453,  1067,   454,  -592,  1469,  2267,  1858,
+     815,  -585,   424,   791,   463,  1771,   972,  -340,  -592,   467,
+     799,   469,   646,   424,  1477,   472,  1457,   981,  2360,   476,
+    -542,   478,  1068,  -340,  1622,  1223,  -594,   647,   484,  1088,
+       4,  2595,   488,   989,   424,  2436,   491,   991,   493,  1106,
+     598,   424,  -528,  1163,   998,   501,   503,   621,   810,   505,
+     506,  -340,  1516,   424,  1922,   512,   996,   513,  1572,  -595,
+    1551,   517,   443,  1552,   424,  2134,  2135,  2283,  2081,  -588,
+    2133,  2085,  2361,  1922,  1036,  1782,  1623,  1573,   931,   424,
+     424,  1975,  1712,  2362,   857,  1041,   971,   424,   544,  -564,
+     546,   424,   424,  1072,  1168,   698,  -138,   551,   552,   424,
+    -566,  -142,  1044,   424,  -592,   673,   676,  1093,  1658,   699,
+     -62,   683,   684,   688,   684,  1069,   692,   694,  1051,   510,
+     700,  2178,   704,   706,   706,   709,  2129,  1008,   712,  1901,
+    1903,   716,   598,   712,  1351,  -383,  2131,     5,   727,  1610,
+    1811,   732,  -585,   712,   915,   712,  1822,  1559, -1116,   425,
+     712,   712,   712,  1821,   927,   928,   929,   930,   712,  1834,
+     745,   712,  1513,   712,  1823,  1447,  2087,  -594,  2365,   756,
+     757,  1704,  1824,  1507,  1825,  1826,   768,   770,   646,  1651,
+    1165,   776,   646,  1515,  1828,   511,  1817,   598,   783,   646,
+    1829,   787,  1719,   647,  1002,  1158,  1185,   647,   740,  1827,
+    -595,  2182,   829,   800,   647,  1835,   807,  1664,  1666,  1668,
+    -588,   972,   727,   817,   819,   819,  1606,   823,   800,   997,
+     572,  1375,   999,  1621,   831,   831,   831,   831,   831,  1564,
+     841,  1442,  1008,   845,  2037,   847,   783,  1565,  1464,   850,
+   -1141,   996,   853,   996,  1026,  -592,   858,   592,   594,  1187,
+     996,   567,  1685,   599,  1566,   598,  2497,   876,  1892,  1893,
+    1197,  -590,  1749,   598,  1349,  2366,  1236,  1045,  2596,  1304,
+    2561,  2562,   575,  -590,  1780,   875,  2367,  1219,  2537,   424,
+    1622,  2228,  2469,   911,  2290,  2291,   593,  2288,  2498, -1116,
+     917,  1781,   598,   899,   598, -1063,  2076,  2597,   576,   621,
+     598,   907,  2529,  1305,   912,   913,   914,   700,   698,   902,
+     903,   724,   920,   921,  1283,  -528,   926,   700,   700,   700,
+     700,   918,   699,  2192,   934,   935,  1007,  2205,  1307,   424,
+    1897,  2209,  1623,   598,   951,  1899,   598,   601,   952,   598,
+     646,   598,   598,  1098,   598,  2285,  1310,  1110,  1910,   621,
+    1340,  1742,  1809,  2465,  1819,   647,  1832,  2598,  1838,  2529,
+     598,   598,   577, -1152,  1155,  1782,   967,  2304,  1783,  -590,
+    1157, -1168,  1159,  2539,   424,  1311,  1810,  1911,  1820,  1021,
+    1833, -1141,  1839,   578,  1365,  1366,  1367,  1368,  1369,   584,
+     716,  1014,   768,   823,   817,   704,  1019,  1032,   591,   847,
+   -1171,  1625, -1105,  1567,  1568,  1585,  2127,   700, -1135,  1184,
+     996,   972,  1186,  -528,   424,   851,  1381,  1233,  1233,   992,
+    2576,  1382,   981,   993,  1630,   712,  1156,  -528,  1043,  2596,
+     700,   791,  1418,   424,  2583,  1023, -1063,  2393,  2139,  2140,
+    1008, -1115,  1859,  2287, -1140,  1251,  1643, -1062,  1024, -1151,
+   -1167,   995, -1170,  1060,  -384,  1105,  1105,   911,  2597,  1842,
+    1843,  1844,  1422,  1848,  1849,   922,  1560,  1092, -1104, -1134,
+    -383,  2610,  2612,  -384,  1100,   923,   637,  1803,  1082,  1803,
+    1087,  1743,   970,  1089,  2616,   973,  2343,  1357,  1134,  1664,
+    1666,  1668,  1586,   587,  -385,  1139,  1103,  2344,  2345,  1145,
+    1008,  1008,  1008,  2346, -1152,  2347,  1133,  1587,  1588,  1589,
+    -590,  1384, -1168,  -388,  2348,  1140,  2349,  1141,  2350,  1759,
+     405,  2175,  1148,   588,  1151,   976,  1964,   700,   406,   646,
+     646,   646,   646,   646,  1007,  1385,  1644,  1002,  1002,  1053,
+     673, -1171,   589, -1105,   647,   647,   647,   647,   647, -1135,
+    1386,  1103,  1054,   579,   580,  1387,  1388,   700,  -386,   590,
+    1061,  1192,  1389,  1705,   791,  1706,  1181,  2235,  2446,  2236,
+     976,    25,   700,  1062,  1293,   700,    29,  1294,  2237,  1182,
+    2238,  1193, -1115,  2435,  1780, -1140,  1780,   791, -1062,  1279,
+   -1151, -1167,  1238, -1170,  1663,  1665,  1667,  1243,    47,    48,
+    1352,  1781,  1280,  1781,  1884,   595,  1255,  1263,  1269, -1104,
+   -1134,  1273,  1885,  1353,  1358,  1240,  2127,   996,   996,   996,
+     996,   996,   951,  1407,   596,  1443,   952,  1359,  1759,  1592,
+     597,  1276,   845,   953,   954,  2479,  1408,  2425,  1693,  -231,
+    2351,    50,  1809,  2352,  1278,   652,   598,  1301,  2139,  2140,
+    1411,  1316,    90,  -528,   967,  1819,  -793,  -793,  1804,  1302,
+    1804,  1832,    95,  1412,   660,  1838,  1810,  2380,  1439,  1313,
+     581,   972,  2381,  1461,   424,  1782,  -853,  1782,  1783,  1820,
+    1783,  1440,  1805,  1784,  1805,  1833,  1462,  1598,  1479,  1839,
+     650,  1785,  1806,   661,  1806,   658,  1390,  1807,  1030,  1807,
+    1697,  1480,  1699,  2239,  2240,  1604,  2241,  2242,   121,   662,
+    2463,  1482,  1485,  2119,  2120,  2121,  2122,  2123,  1203,  1204,
+    2235,  1207,  2236,  2391,  1483,  1486,  2461,  1391,  2353,  1023,
+    1499,  2237,  1653,  2238,  1395,   663,  1654,  2243,  1656,   668,
+     669,   118,  1493,  1500,  1251,  1220,  1221,   664,   122,  1553,
+    1601,  1602,   673,  2091,  2115,  2318,  1251,  1561,  1399,  2089,
+    2090,  1507,  1554,  2011,   688,   665,    46,  2100,  2101,   666,
+    1562,  1392,   667,  1651,   670,  2084,   405,   709,  1222,  2244,
+    1673,  1482,  1008,  1008,  1008,  1770,  2354,  2355,  2356,  2157,
+     679,  2299,  2245,  1681,  1563,  2162,  1569,  1685,   721,    74,
+    1574,  2536,  1432,   911,  1692,  1875,  1876,   732,   680,  1570,
+    1941,  1458,   681,  1575,  2067,  2068,  2535,  1347,  1347,  1347,
+    1347,  1347,  1582,   757,  1303,  1576,  1703,  1284,  1577,  1578,
+    1579,   695,    96,  1590,  1700,  1583,  2156,  1671,   770,  1251,
+     992,  1580,  1581,   703,   993,  1415,  1591,  2139,  2140,  2319,
+    1672,   642,   643,  1249,  1053,  1481,  2239,  2240,   994,  2241,
+    2242,  1507,   109,  1507,  1722,   715,  1675,  1677,  1352,  1780,
+    1285,   730,   995,   718,  1611,  1199,  1947,  1665,  1667,  1205,
+    1683,  1680,   736,  1455,  1211,   749,  1781,  1215,  1217,   754,
+    2243,  1687,   764,  1684,   767,   602,   639,   774,  1511,   788,
+     640,  1713,  1287,   775,  1688,  1734,   641,   642,   643,   778,
+    1002,  1774,  1223,  1224,  1714,   781,  1225,  1226,   616,   782,
+    1766,  1249,  1771,  2320,  1383,   786,  1288,   618,  1289,   603,
+    1902,  1904,  2244,  1767,  1769,  2321,  1411,  2322,  2323,  1857,
+    2324,  1542,  1055,  2325,  1056,  2245,  1308,   611,  1309,  1957,
+     790,   612,   613,   614,   615,   619,  1555,  1556,  1557,  1249,
+    1782,  1290,    25,  1783,   616,  1249,  1291,    29,  1784,   794,
+    1292,   617,  1978,   618,  1293,  1461,  1785,  1294,  1984,  2019,
+     795,   729,  1584,   620,  1499,  2273,  2274,  2023,  1985,    47,
+      48,   882,  2020,  1354,   609,   610,  1457,  2021,   611,  1295,
+    2024,   619,   612,   613,   614,   615,   822,  1593,   907,  2038,
+     830,  2040,  2041,  1296,  1732,   616,   855,  2049,   856,  1297,
+     644,   859,   617,  2045,   618,   861,  2069,  1939, -1191,   620,
+    2050,  1603,  2299,  2052,  2326,  2054,  2327,   700,   992,  2070,
+     621,  1313,   993,    90,   880,  2116,  2136,  -588,  1944,   642,
+     643,  1955,   619,    95,  1363,  2167,   994,  1779,  2117,  2137,
+    1936,  1371,  1372,  1961,   881,  2420,   424,  1963,  2168,  1544,
+     995,  1951,  1544,  1233,  1233,  1233,  1544,  1233,  1233,   904,
+     620,  1850,  2172,  2147,  1549,  2173,   621,  2232,   887,  2174,
+     894,  1977,   622,   860,  1544,   862,   895,  2227,   791,   121,
+    2233,  1284,   863,   864,   865,  2249,  1544,  2234,   868,   869,
+     870,   871,  1669,   872,   873,  1610,  1251,   424,  2250,  2252,
+     992,  1766,  1499,   896,   993,  2292,  2293,  2294,  1766,   916,
+    1097,   642,   643,  1993,  2253,  2254,  1482,   621,   622,  2378,
+    2399,  2255,  1251,   150,  1285,   897,  1482,  2258,  2268,  2256,
+    1286,  1482,   995,   943,   985,  1695,  1695,   898,  1695,  2257,
+    2259,  2269,  2605,  2606,  2270,  1482,   712,   901,  1082,  2276,
+    1082,  2514,  2515,  1707,   919,  1360,  1287,   972,  2271,  1361,
+     611,   625,  2277,   973,   612,   613,   614,   615,   974,   622,
+    1599,  1213,  1214,   646,  1002,   975,   996,   616,  2313,  1544,
+    1288,   976,  1289,  1746,   617,  1730,   618,   990,   647,   979,
+    1181,  2314,  2316,  1499,  1151,  1523,  1948,  1949,  1950,  1544,
+    1744,  1526,  1772,  2337,  1773,  1529,  2339,  1531,  1529,  1529,
+     700,  1533,  2371,  1535,   619,  1290,  1000,  2382,   811,  2382,
+    1291,  1020,  1029,  2396,  1292,  2429,  1035,  1776,  1293,  1845,
+    2383,  1294,  2384,  1233,  1233,  1233,  2397,  1031,  2430,  1607,
+    1033,  2136,   620,  1243,   611,  1042,  1048,  2456,   612,   613,
+     614,   615,  1249,  1295,  2448,  1052,  1499,  2560,  1240,  1255,
+    2457,   616,   408,  1076,  1263,  2472,  1759,  1296,   617,  2475,
+     618,   611,  1269,  1297,  2477,   612,   613,   614,   615,   424,
+    1273,  1073,   803,   642,   643,  1078,   970,  2478,   616,  1461,
+    1134,  1094,  1890,  1499,   616,   617,  1095,   618,   619,   621,
+    1766,  2525,  2501,   618,  1883,  1096,  2503,  2509,  2249,  2422,
+    1101,  1109,   951,  2505,  2249,  1111,   952,  1164,  2158,  1138,
+    2510,  2542,  1175,   953,   954,   619,   620,  2543,  2551,   955,
+     956,   619,   958,  2160,  1912,   960,   961,   962,   963,   964,
+    1178,  2552,   966,  1179,   967,   968,  1188,  1923,  2553,  1461,
+    1191,   622,  1499,   620,  1194,  1181,  2147,  1202,  1208,   620,
+    1249,  2554,  2556,   424,   779,  2557,  1707,  1166,  2558,  1707,
+    1707,  1707,  1231,  2573,  1249,  1272,  1281,   791,  1233,  1952,
+    2382,  1233,  2382,   621,  2204,  1105,   598,  2464,  1507,   791,
+     424,  1317,  2297,  2574,  1473,  2575,   644,   611,  1320,   826,
+     985,   612,   613,   614,   615,   952,  1341,  1682,   992,   838,
+     621,   712,   993,  1342,   616,  2579,   621,   993,   951,   642,
+     643,   617,   952,   618,  1370,  -343,   994,  1373,  2580,   953,
+     954,  1986,  1379,  2599,  1647,   622,   956,  1380,   958,  1410,
+     995,   960,   961,   962,   963,   964,  2600,  2615,  2512,  1089,
+     967,   619,  1400,   562,   563,   564,   565,   566,  1402,  1424,
+    1425,  1426,   622,   888,   889,   890,   891,   893,   622,  2340,
+    1427,  1428,   791,  1429,  2534,  1105,  2281,   951,   791,   620,
+    1438,   952,  1740,  2030,  2031,  1441,  2284,  1444,   953,   954,
+    1446,  1450,  -936,  1459,   955,   956,  1460,   958,  1471,  1478,
+     960,   961,   962,   963,   964,  1465,  1494,   655,  2048,   967,
+    1497,  1233,  1466,  1470,  1484,  1498,   424,   641,   642,   643,
+    1501,  1502,   945,   947,   948,  1503,   949,  1504,  2534,   616,
+    1512,  1514,  1521,   950,  1055,  1524,   621,   992,   618,   611,
+    1536,   993,  1537,   612,   613,   614,   615,   826,   642,   643,
+    1538,  1539,  2082,  1489,  1540,   994,   616,  1541,  1544,  1545,
+    1240,  1546,  1549,   617,  1595,   618,   619,  2097,   922,   995,
+    1600,  2103,  2414,  2415,  1638,  1614,  1615,  1616,  1641,  1646,
+    1647,  1652,   376,  1657,  1660,  1661,  1662,  1617,   622,  1028,
+    1670,  1233,  1676,   619,   620,   406,  1618,   752,   985,  1693,
+    1702,  1716,  1710,  1715,  1038,  1717,  1718,  1456,  1734,  1729,
+    1741,  1750,  1423,  1768,  1851,  1860,  1855,  1854,  1861,  1619,
+      25,   620,  1862,  1431,  1620,    29,   752,  2130,  1923,  1923,
+    1923,   644,  1059,   752,  1863,  1864,  1866,  1856,  1867,  1075,
+    1923,   812,  1868,  1870,  1871,  1079,  1080,    47,    48,  1872,
+    1873,   621,  1621,  1877,  1878,  1879,  1880,  1881,   424,  1887,
+    1889,  1895,  2460,  2462,  2170,  2398,   611,   688,  1905,  1906,
+     612,   613,   614,   615,  1907,  1915,  1908,  1233,   621,  1909,
+    1918,   569,  1931,   616,  2113,  1936,  2185,  1937,  1933,   611,
+     617,  1137,   618,   612,   613,   614,   615,  1956,  1958,  1969,
+    1973,    90,  1970,   622,  1971,  1987,   616,  1988,  -495,  1622,
+    1994,    95,  1996,   617,  1995,   618,  1495,  2013,  2014,  2017,
+     619,  1744,  2016,  2018,  2028,  1952,  2025,  2193,  2029,  1771,
+     622,  1770,  2213,  2035,  2036,  2039,  2042,  2203,  2051,  2053,
+    2055,  2219,  2074,   619,  2208,  1776,   621,  2075,   620,   791,
+    1522,  2064,  2065,   932,  2066,  2071,  1525,   121,  2072,  1845,
+    1528,  1623,  1530,  2077,  1195,  1196,  1532,  2404,  1534,  2095,
+    2096,   620,   611,  2105,  2110,   791,   612,   613,   614,   615,
+    2118,  -382,  2125,  2126,  2143,   424,  2138,  2146,  2207,   616,
+     570,  2149,  2151,  2275,  2152,  2150,   617,  2153,   618,  2154,
+     983,   150,  2155,  2165,   984,   621,  2171,  2187,   424,  2189,
+     803,   642,   643,  2230,  2231,  2251,  2278,   752,  2261,  2279,
+    -225,  2303,   616,  2311,  2330,  2286,   619,  2317,   621,  2331,
+    2332,   618,  2333,  2334,  -844,  2336,  1912,  2338,  2358,  2364,
+    2372,  2375,  2387,  2376,  2388,  1923,  2390,  1923,  1923,  1923,
+    1923,  1923,  1923,  2394,   620,  2401,  2400,   622,  2309,   619,
+    1321,  1322,  1323,  1324,  1325,  1326,  1327,  1328,  1329,  1330,
+    1331,  1332,  1333,  1334,  1335,  1336,  1337,  1338,  1339,  2408,
+     622,  2410,  2411,  2412,  2413,   826,  2416,   620,  2417,  2418,
+    1355,   424,  2434,  1233,  2424,  2428,  2432,  1362,  2433,  1364,
+    2438,  2440,  2442,  2445,  2447,  2473,  2476,   802,  2484,  1085,
+    2486,   621,  2492,  2494,  1374,   819,  2031,   803,   642,   643,
+    2500,  2502,  2504,  2513,   644,  2508,  2517,  1104,  2523,   616,
+    2520,  2530,  2521,  2531,  2522,  2563,  2541,  2544,   618,  2377,
+     893,  1136,  2546,  2547,   621,  1233,  1405,  2555,  2577,  1142,
+    1143,  2571,  2581,  2586,  1149,  2601,  2602,  2603,  2097,  2614,
+    1277,   985,  1059,   622,  2596,  1594,   619,   582,  2111,  1282,
+    2190,  1888,  1517,  1454,   924,  2389,  1891,  2112,   933,   936,
+    1613,  1916,  1104,  1049,  2392,  1701,  1314,  2289,  2132,  1315,
+    1176,  2124,  1757,  2282,   620,  1923,   622,  2012,  1492,  2329,
+    1473,  2519,  2188,   611,  1739,  2342,  1403,   612,   613,   614,
+     615,  1420,  1689,  1674,  1449,  1979,   439,  2613,  1980,  1198,
+     616,  1201,  2148,  2161,  1050,  1709,  1679,   617,   792,   618,
+    1409,   644,   831,   831,  1736,  1942,   604,   605,  1154,  1943,
+     752,   752,  2193,   606,  1376,  1435,  1013,  1474,   607,  1463,
+    1510,   621,  1183,  1016,  1250,  1149,  1015,   619,  1018,  1017,
+    2421,  1691,  1694,  2308,  2566,  1488,  2191,  2450,  1162,  1413,
+    1394,  1393,  2548,  1448,  1793,  2159,  2496,  1798,  1404,  1146,
+    1818,   765,  1831,  2186,  1837,   620,  1841,  2459,   893,  1509,
+     838,  2567,    13,    14,  2585,    15,    16,  2607,  2427,  1756,
+      20,  2609,  2026,   622,  1022,  1721,  2198,   691,    23,  2452,
+    1102,  2163,   849,    27,  2474,   739,    30,  1853,  2199,  1103,
+    1103,  2403,   424,  2482,    37,  2057,    38,  2061,    40,  2063,
+    2487,  2044,  2488,  2047,  1346,  1346,  2431,  2059,  2218,  2216,
+    1548,  1543,   621,  2226,  2439,  2073,  1239,  1852,  1865,  2374,
+    1869,    59,   951,  1874,  2489,  1882,   952,   611,  1558,   985,
+     752,   752,    70,   953,   954,  2385,  2082,  2082,     0,   955,
+     956,   957,   958,   959,     0,   960,   961,   962,   963,   964,
+     965,     0,   966,     0,   967,   968,    85,  1250,    13,    14,
+       0,    15,    16,     0,   622,     0,    20,     0,     0,    93,
+       0,     0,     0,     0,    23,     0,     0,     0,     0,    27,
+    1414,     0,    30,     0,  1609,     0,     0,   102,     0,     0,
+      37,     0,    38,   104,    40,     0,  1642,     0,     0,     0,
+       0,   108,  2489,   110,  2549,   112,     0,   114,     0,     0,
+       0,     0,     0,     0,   119,     0,     0,    59,   752,     0,
+       0,     0,     0,     0,  1649,     0,     0,     0,    70,     0,
+       0,   130,   131,     0,     0,     0,  1655,     0,     0,     0,
+       0,  2587,     0,     0,     0,     0,  2588,     0,     0,   143,
+       0,     0,    85,     0,     0,     0,   608,     0,     0,  2588,
+       0,  2608,  2611,     0,     0,    93,     0,     0,     0,     0,
+     155,     0,     0,   156,  2611,     0,     0,     0,     0,     0,
+       0,     0,     0,   102,     0,  1678,  1038,     0,     0,   104,
+       0,     0,     0,     0,     0,     0,     0,   108,     0,   110,
+    1690,   112,     0,   114,     0,     0,     0,  1698,  1104,     0,
+     119,  2043,     0,     0,     0,     0,  2046,   893,     0,     0,
+       0,     0,     0,  1708,     0,  1711,     0,   130,   131,  2056,
+       0,     0,     0,   837,     0,     0,   611,     0,   893,     0,
+     612,   613,   614,   615,     0,   143,     0,     0,     0,     0,
+       0,  2058,  1726,   616,     0,     0,     0,  2060,     0,     0,
+     617,  2062,   618,  1738,   837,     0,   155,   611,     0,   156,
+       0,   612,   613,   614,   615,     0,  1752,     0,     0,  1037,
+       0,  1758,   611,  1764,   616,     0,   612,   613,   614,   615,
+     619,   617,     0,   618,     0,     0,     0,     0,     0,   616,
+       0,     0,  1473,     0,  2201,   611,   617,     0,   618,   612,
+     613,   614,   615,     0,     0,     0,     0,  1725,   620,     0,
+     611,   619,   616,     0,   612,   613,   614,   615,     0,   617,
+       0,   618,     0,     0,     0,     0,   619,   616,     0,  1612,
+       0,     0,     0,     0,   617,     0,   618,     0,     0,   620,
+       0,     0,     0,  1751,     0,   424,   611,     0,     0,   619,
+     612,   613,   614,   615,   620,     0,     0,     0,     0,     0,
+       0,     0,   951,   616,   619,   621,   952,     0,     0,     0,
+     617,     0,   618,   953,   954,     0,   424,   620,     0,  1896,
+     956,     0, -1192,     0,     0, -1192, -1192, -1192, -1192, -1192,
+       0,   424,   620,   752,   967,     0,   621,     0,     0,     0,
+     619,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   621,     0,     0,   424,     0,     0,   622,     0,     0,
+    1940,   826,  1355,     0,     0,     0,     0,     0,   620,   424,
+       0,     0,     0,     0,   621,     0,  2200,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,   622,   621,
+    2211,  1960,     0,     0,  1962,  2214,     0,     0,  2215,  1085,
+       0,  1085,  1966,   622,     0,   424,     0,     0,  2222,     0,
+    2223,     0,  2224,     0,  2225,     0,     0,     0,     0,     0,
+    1104,  1104,     0,     0,     0,   621,   622,     0,     0,     0,
+       0,  1723,     0,     0,  1989,     0,  1992,   752,     0,  1733,
+       0,   622,  1735,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   812,     0,     0,     0,  1104,  1104,
+       0,  1991,     0,     0,   611,     0,     0,     0,   612,   613,
+     614,   615,     0,     0,     0,     0,     0,   622,     0,     0,
+     752,   616,     0,     0,     0,     0,     0,  1800,   617,     0,
+     618,     0,     0,     0,     0,     0,   752,   752,   752,     0,
+     752,   752,   611,     0,   752,     0,   612,   613,   614,   615,
+     611,     0,     0,     0,   612,  1005,   614,   615,   619,   616,
+       0,  1250,     0,     0,     0,     0,   617,   616,   618,     0,
+       0,     0,     0,     0,   617,     0,   618,     0,     0,     0,
+       0,     0,     0,   951,     0,  1727,   620,   952,   611,     0,
+       0,     0,     0,     0,   953,   954,   619,     0,     0,  1728,
+     955,   956,   957,   958,   619,     0,   960,   961,   962,   963,
      964,   965,     0,   966,     0,   967,   968,     0,     0,     0,
-     969,   969,     0,     0,   951,     0,     0,   812,   952,   611,
-       0,     0,     0,     0,     0,   953,   954,     0,  1104,     0,
-    1398,   955,   956,   957,   958,     0,     0,   960,   961,   962,
-     963,   964,   965,     0,   966,     0,   967,   968,     0,  2217,
-       0,     0,     0,   951,     0,  1406,     0,   952,   611,     0,
-       0,     0,     0,     0,   953,   954,     0,     0,     0,     0,
-     955,   956,   957,   958,   752,  2229,   960,   961,   962,   963,
-     964,   965,  1383,   966,     0,   967,   968,   951,     0,  1421,
-       0,   952,   611,     0,     0,     0,     0,     0,   953,   954,
-       0,     0,     0,     0,   955,   956,   957,   958,     0,     0,
-     960,   961,   962,   963,   964,   965,     0,   966,     0,   967,
-     968,     0,     0,     0,     0,     0,     0,  1914,     0,     0,
-       0,     0,     0,     0,     0,     0,   969,   969,   969,   969,
-     969,   969,   969,   969,   969,   969,   969,   969,   969,   969,
-     969,   969,   969,   969,   969,     0,     0,  2302,     0,     0,
-     752,     0,  2305,     0,     0,     0,     0,     0,     0,     0,
-     969,     0,     0,     0,     0,     0,   951,   969,     0,   969,
-     952,   611,     0,     0,     0,     0,     0,   953,   954,   969,
-       0,     0,  1433,   955,   956,   957,   958,     0,     0,   960,
-     961,   962,   963,   964,   965,     0,   966,     0,   967,   968,
-     951,     0,     0,     0,   952,   611,     0,     0,     0,     0,
-     969,   953,   954,     0,     0,     0,  1436,   955,   956,   957,
-     958,     0,  1250,   960,   961,   962,   963,   964,   965,     0,
-     966,     0,   967,   968,   951,     0,     0,     0,   952,   611,
-       0,     0,     0,     0,     0,   953,   954,     0,  1250,     0,
-    1437,   955,   956,   957,   958,     0,     0,   960,   961,   962,
-     963,   964,   965,     0,   966,     0,   967,   968,     0,     0,
-       0,   951,     0,     0,     0,   952,   611,     0,     0,   969,
-       0,     0,   953,   954,     0,     0,     0,  1472,   955,   956,
-     957,   958,     0,   969,   960,   961,   962,   963,   964,   965,
-       0,   966,     0,   967,   968,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   969,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  1104,   951,     0,     0,  1104,   952,
-     611,     0,     0,     0,     0,     0,   953,   954,  1599,     0,
-       0,  1519,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,   951,   967,   968,     0,
-     952,   611,     0,   969,     0,   752,   752,   953,   954,     0,
-       0,     0,  1520,   955,   956,   957,   958,     0,     0,   960,
-     961,   962,   963,   964,   965,     0,   966,     0,   967,   968,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,  1104,
-    1104,  1104,  1104,     0,   951,     0,     0,  2183,   952,   611,
-       0,     0,     0,     0,   969,   953,   954,   752,     0,     0,
-    1659,   955,   956,   957,   958,     0,     0,   960,   961,   962,
-     963,   964,   965,     0,   966,     0,   967,   968,     0,   951,
-       0,     0,     0,   952,   611,     0,     0,   969,     0,     0,
-     953,   954,     0,     0,   969,  1934,   955,   956,   957,   958,
-     969,  1104,   960,   961,   962,   963,   964,   965,     0,   966,
-       0,   967,   968,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,   969,     0,     0,  1104,  1104,     0,  1104,
-       0,     0,     0,     0,     0,   969,  2183,     0,     0,     0,
-     951,     0,  1727,   969,   952,   611,     0,     0,     0,     0,
-       0,   953,   954,   969,     0,     0,   969,   955,   956,   957,
+       0,     0,  2093,   424,   620,  1914,     0,     0,     0,  2102,
+       0,     0,   620,  2106,  2107,     0,     0,     0,     0,     0,
+       0,  2114,     0,   621,     0,     0,     0,  1112,     0,     0,
+       0,  1113,   611,     0,     0,     0,     0,   752,  1114,  1115,
+       0,   424,     0,     0,  1116,  1117,  1118,  1119,     0,   424,
+    1120,  1121,  1122,  1123,  1124,  1125,  1126,  1127,     0,  1128,
+    1129,   621,  2145,     0,     0,     0,     0,     0,  1649,   621,
+       0,     0,     0,     0,     0,   622,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,  2164,     0,     0,   752,   752,   752,     0,
+       0,     0,  2169,     0,     0,   951,     0,  1180,     0,   952,
+     611,     0,     0,   622,     0,     0,   953,   954,     0,  2179,
+    2180,   622,   955,   956,   957,   958,     0,     0,   960,   961,
+     962,   963,   964,   965,     0,   966,     0,   967,   968,     0,
+       0,     0,     0,     0,     0,     0,  1104,     0,  1752,     0,
+       0,     0,     0,     0,     0,     0,   838,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  2210,     0,   951,     0,
+       0,  1246,   952,   611,     0,     0,     0,     0,     0,   953,
+     954,     0,  2220,     0,  2221,   955,   956,   957,   958,     0,
+       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
+     967,   968,   951,     0,     0,  1247,   952,   611,     0,     0,
+       0,   969,     0,   953,   954,     0,     0,     0,     0,   955,
+     956,   957,   958,     0,     0,   960,   961,   962,   963,   964,
+     965,     0,   966,     0,   967,   968,     0,     0,     0,     0,
+    1250,   752,     0,     0,   752,   951,  1104,  1104,  1104,   952,
+    1149,  1149,  1250,     0,     0,     0,   953,   954,  1149,  1149,
+       0,     0,   955,   956,   957,   958,     0,     0,   960,   961,
+     962,   963,   964,   965,     0,   966,     0,   967,   968,  2296,
+       0,     0,     0,     0,  2298,  1346,  1346,  1346,  1346,  1346,
+       0,     0,     0,     0,   951,  2307,  1966,  1248,   952,   611,
+    2312,     0,     0,     0,     0,   953,   954,     0,     0,     0,
+    2315,   955,   956,   957,   958,     0,  2328,   960,   961,   962,
+     963,   964,   965,     0,   966,   951,   967,   968,  2260,   952,
+     611,     0,     0,     0,     0,  1250,   953,   954,     0,     0,
+       0,  1414,   955,   956,   957,   958,     0,     0,   960,   961,
+     962,   963,   964,   965,     0,   966,     0,   967,   968,     0,
+    2373,  1130,     0,     0,     0,   969,     0,     0,   951,     0,
+       0,     0,   952,   611,   752,  2183,     0,     0,     0,   953,
+     954,     0,     0,     0,  1319,   955,   956,   957,   958,  2379,
+       0,   960,   961,   962,   963,   964,   965,   812,   966,     0,
+     967,   968,     0,     0,  2386,     0,     0,     0,  1104,     0,
+    1609,     0,   969,     0,     0,   951,     0,     0,     0,   952,
+     611,     0,     0,     0,   969,     0,   953,   954,     0,  2217,
+       0,  1398,   955,   956,   957,   958,     0,     0,   960,   961,
+     962,   963,   964,   965,     0,   966,  2405,   967,   968,     0,
+       0,     0,     0,     0,   752,  2229,     0,     0,     0,     0,
+       0,   893,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   969,   969,   969,   969,   951,   969,
+    1406,     0,   952,   611,     0,     0,     0,     0,     0,   953,
+     954,     0,     0,     0,     0,   955,   956,   957,   958,     0,
+       0,   960,   961,   962,   963,   964,   965,  1914,   966,     0,
+     967,   968,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,  2449,  2298,     0,     0,  2451,     0,
+    2455,   969,     0,   969,   969,   969,   969,  2302,     0,     0,
+     752,     0,  2305,     0,     0,  2466,  2467,     0,  2471,     0,
+     951,     0,  1421,     0,   952,   611,     0,     0,  2481,     0,
+       0,   953,   954,     0,     0,     0,  2485,   955,   956,   957,
      958,     0,     0,   960,   961,   962,   963,   964,   965,     0,
-     966,   969,   967,   968,     0,     0,     0,     0,     0,  1104,
-       0,     0,     0,   969,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,   969,     0,     0,
-       0,     0,     0,   969,     0,   380,   381,   382,   383,   969,
+     966,     0,   967,   968,     0,  2405,     0,     0,     0,     0,
+       0,     0,   969,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,  1250,  2518,   969,     0,     0,     0,     0,     0,
+       0,     0,  2524,  2526,   969,     0,     0,     0,     0,     0,
+     951,     0,     0,   838,   952,   611,  2538,     0,  1250,     0,
+    2540,   953,   954,     0,     0,   969,  1433,   955,   956,   957,
+     958,     0,     0,   960,   961,   962,   963,   964,   965,     0,
+     966,   969,   967,   968,     0,   969,   969,     0,     0,     0,
+       0,     0,     0,   893,     0,     0,     0,     0,     0,     0,
+    2526,     0,     0,     0,  2568,     0,     0,     0,  2572,     0,
+       0,     0,  1764,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,  1764,  2584,  2568,     0,
+       0,     0,     0,     0,  1104,   951,     0,     0,  1104,   952,
+     611,     0,     0,   969,     0,     0,   953,   954,     0,     0,
+       0,  1436,   955,   956,   957,   958,     0,     0,   960,   961,
+     962,   963,   964,   965,     0,   966,   951,   967,   968,     0,
+     952,   611,     0,     0,     0,   752,   752,   953,   954,     0,
+       0,     0,  1437,   955,   956,   957,   958,     0,     0,   960,
+     961,   962,   963,   964,   965,     0,   966,     0,   967,   968,
+       0,   969,   969,     0,     0,     0,     0,     0,     0,     0,
+    1104,  1104,  1104,  1104,     0,   951,     0,     0,  2183,   952,
+     611,     0,     0,     0,     0,     0,   953,   954,   752,     0,
+       0,  1472,   955,   956,   957,   958,     0,     0,   960,   961,
+     962,   963,   964,   965,     0,   966,     0,   967,   968,     0,
+       0,   951,     0,     0,     0,   952,   611,     0,     0,     0,
+       0,     0,   953,   954,     0,     0,     0,  1519,   955,   956,
+     957,   958,     0,  1104,   960,   961,   962,   963,   964,   965,
+       0,   966,     0,   967,   968,     0,     0,     0,     0,     0,
+       0,     0,     0,   951,     0,  1727,     0,   952,   611,  1104,
+    1104,     0,  1104,     0,   953,   954,     0,     0,     0,  2183,
+     955,   956,   957,   958,     0,     0,   960,   961,   962,   963,
+     964,   965,     0,   966,     0,   967,   968,   969,   969,   969,
+     969,   969,   969,   969,   969,   969,   969,   969,   969,   969,
+     969,   969,   969,   969,   969,   969,     0,     0,     0,     0,
+       0,     0,     0,  1104,     0,     0,     0,     0,     0,     0,
+       0,   969,     0,     0,     0,     0,     0,   951,   969,     0,
+     969,   952,   611,     0,     0,     0,     0,     0,   953,   954,
+     969,     0,     0,  1520,   955,   956,   957,   958,     0,     0,
+     960,   961,   962,   963,   964,   965,     0,   966,     0,   967,
+     968,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,   969,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   380,   381,   382,   383,     0,
      385,     0,   386,     0,   388,   389,     0,   390,     0,     0,
        0,   392,     0,   394,   395,     0,     0,   397,   398,   399,
        0,   401,     0,   403,   404,     0,     0,   411,     0,     0,
        0,     0,   414,   415,   416,   417,   418,   419,   420,   421,
        0,   422,   423,     0,     0,   428,   429,   430,     0,   432,
-       0,   434,     0,     0,   437,   438,     0,     0,     0,     0,
-       0,     0,   445,   446,     0,     0,   449,     0,     0,     0,
+     969,   434,     0,     0,   437,   438,     0,     0,     0,     0,
+       0,     0,   445,   446,   969,     0,   449,     0,     0,     0,
        0,     0,     0,   455,     0,   457,     0,   458,   459,     0,
-       0,     0,   464,   465,   466,     0,     0,   468,     0,     0,
+       0,     0,   464,   465,   466,   969,     0,   468,     0,     0,
      470,   471,     0,   473,   474,   475,     0,     0,     0,     0,
      480,   481,     0,     0,   483,     0,   485,   486,   487,     0,
      489,   490,     0,     0,   492,     0,   494,   495,   496,   497,
      498,   499,     0,     0,     0,     0,     0,     0,   507,   508,
-     509,   969,     0,     0,     0,   514,   515,   516,     0,   518,
+     509,     0,     0,     0,   969,   514,   515,   516,     0,   518,
      519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
      529,   530,   531,   532,   533,   534,   535,   536,   537,   538,
      539,   540,   541,   542,   543,     0,   545,     0,   547,     0,
-     548,     0,   549,   550,     0,   969,   553,   554,   555,   556,
-     557,   558,   559,   560,     0,     0,     0,   951,     0,     0,
-       0,   952,   611,     0,     0,   969,     0,   969,   953,   954,
-       0,   969,     0,  1972,   955,   956,   957,   958,     0,     0,
-     960,   961,   962,   963,   964,   965,     0,   966,     0,   967,
-     968,     0,     0,     0,   969,     0,     0,   969,     0,     0,
-       0,     0,     0,   951,     0,  1990,   638,   952,   611,   651,
-       0,   654,     0,     0,   953,   954,     0,     0,     0,  1130,
-     955,   956,   957,   958,     0,     0,   960,   961,   962,   963,
-     964,   965,     0,   966,   951,   967,   968,     0,   952,   611,
+     548,     0,   549,   550,     0,     0,   553,   554,   555,   556,
+     557,   558,   559,   560,   951,   969,     0,     0,   952,   611,
        0,     0,     0,     0,     0,   953,   954,     0,     0,     0,
-    2022,   955,   956,   957,   958,     0,     0,   960,   961,   962,
-     963,   964,   965,     0,   966,     0,   967,   968,     0,   951,
-       0,  2166,     0,   952,   611,     0,     0,     0,     0,     0,
-     953,   954,     0,     0,     0,     0,   955,   956,   957,   958,
-       0,     0,   960,   961,   962,   963,   964,   965,   969,   966,
-       0,   967,   968,     0,   951,     0,  2181,   969,   952,   611,
-       0,   969,   969,     0,     0,   953,   954,     0,     0,   969,
-       0,   955,   956,   957,   958,     0,     0,   960,   961,   962,
-     963,   964,   965,     0,   966,   951,   967,   968,  2260,   952,
-     611,     0,     0,     0,     0,     0,   953,   954,     0,     0,
-     969,     0,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,     0,   967,   968,   969,
-       0,   951,     0,     0,   969,   952,   611,     0,     0,     0,
-       0,     0,   953,   954,   969,   969,     0,  2272,   955,   956,
-     957,   958,     0,     0,   960,   961,   962,   963,   964,   965,
-       0,   966,     0,   967,   968,     0,     0,     0,     0,     0,
-       0,     0,   951,     0,     0,   969,   952,   611,     0,     0,
-       0,     0,     0,   953,   954,   969,   969,     0,  2280,   955,
-     956,   957,   958,     0,     0,   960,   961,   962,   963,   964,
-     965,     0,   966,   951,   967,   968,     0,   952,   611,     0,
-       0,     0,     0,     0,   953,   954,     0,     0,     0,  2295,
-     955,   956,   957,   958,     0,     0,   960,   961,   962,   963,
-     964,   965,     0,   966,     0,   967,   968,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   969,     0,   969,   951,     0,     0,  2306,   952,   611,
-       0,     0,   969,     0,     0,   953,   954,   969,     0,     0,
-     969,   955,   956,   957,   958,     0,     0,   960,   961,   962,
-     963,   964,   965,   969,   966,     0,   967,   968,     0,   951,
-       0,     0,     0,   952,   611,     0,     0,     0,     0,     0,
-     953,   954,     0,   941,   942,  2310,   955,   956,   957,   958,
-       0,     0,   960,   961,   962,   963,   964,   965,     0,   966,
-       0,   967,   968,     0,     0,   951,     0,     0,   969,   952,
+    1659,   955,   956,   957,   958,     0,     0,   960,   961,   962,
+     963,   964,   965,     0,   966,     0,   967,   968,   969,     0,
+       0,     0,     0,     0,     0,   969,     0,     0,     0,     0,
+       0,   969,     0,     0,     0,     0,   638,     0,     0,   651,
+       0,   654,     0,     0,     0,   951,     0,     0,     0,   952,
      611,     0,     0,     0,   969,     0,   953,   954,     0,     0,
-     969,  2369,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,   951,   967,   968,   969,
-     952,   611,     0,     0,     0,     0,     0,   953,   954,     0,
-       0,     0,  2370,   955,   956,   957,   958,     0,     0,   960,
-     961,   962,   963,   964,   965,     0,   966,     0,   967,   968,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   969,     0,   969,     0,     0,     0,   969,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   969,
-     969,     0,     0,     0,   969,   951,     0,     0,  2394,   952,
-     611,     0,     0,     0,   969,     0,   953,   954,   969,     0,
-       0,     0,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,     0,   967,   968,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     969,     0,     0,     0,     0,   969,     0,   969,     0,     0,
-       0,   951,     0,     0,     0,   952,   611,     9,     0,   969,
-       0,   969,   953,   954,    10,     0,     0,  2401,   955,   956,
-     957,   958,     0,     0,   960,   961,   962,   963,   964,   965,
-       0,   966,     0,   967,   968,     0,     0,     0,     0,   969,
-       0,     0,     0,   969,    11,    12,    13,    14,     0,    15,
-      16,    17,    18,    19,    20,   969,     0,    21,    22,     0,
-       0,     0,    23,    24,    25,     0,    26,    27,    28,    29,
-      30,    31,     0,    32,    33,    34,    35,    36,    37,     0,
-      38,    39,    40,    41,    42,    43,     0,     0,    44,    45,
-      46,    47,    48,     0,     0,    49,    50,    51,    52,    53,
-      54,    55,    56,    57,    58,    59,    60,    61,    62,    63,
-      64,    65,    66,    67,    68,    69,    70,     0,    71,     0,
-      72,    73,     0,    74,    75,    76,     0,     0,    77,     0,
-       0,    78,    79,     0,    80,    81,    82,    83,     0,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,     0,     0,
-       0,     0,     0,    93,    94,    95,    96,     0,     0,     0,
-       0,    97,     0,     0,    98,    99,     0,     0,   100,   101,
-       0,   102,     0,     0,     0,   103,     0,   104,     0,   105,
-       0,     0,     0,   106,   107,   108,   109,   110,   111,   112,
-     113,   114,   115,     0,   116,   117,   118,     0,   119,     0,
-     120,   121,     0,   122,     0,   123,   124,   125,   126,     0,
-       0,   127,   128,   129,     0,   130,   131,   132,     0,   133,
-     134,   135,     0,   136,     0,   137,   138,   139,   140,   141,
-       0,   142,     0,   143,   144,     0,     0,   145,   146,   147,
-       0,     0,   148,   149,     0,   150,   151,     0,   152,   153,
-       0,     0,     0,   154,   155,     0,     0,   156,     0,     0,
-     157,     0,     0,     0,   158,   159,     0,     0,   160,   161,
-     162,     0,   163,   164,   165,   166,   167,   168,   169,   170,
-     171,   172,   173,     0,   174,     0,     0,   175,     0,     0,
-       0,   176,   177,   178,   179,   180,     0,   181,   182,     0,
-       0,   183,   184,   185,   186,     0,     0,     0,     0,   187,
-     188,   189,   190,   191,   192,     0,     0,     0,     0,     0,
-       0,     0,   193,     0,   194,     0,   195,   196,   197,   198,
-     199,     0,     0,     0,   200,   201,   202,   203,   204,   205,
-     951,   206,   207,  2418,   952,   611,   208,     0,     0,     0,
-       0,   953,   954,     0,     0,     0,     0,   955,   956,   957,
-     958,     0,     0,   960,   961,   962,   963,   964,   965,     0,
-     966,   951,   967,   968,  2436,   952,   611,     0,     0,     0,
-       0,     0,   953,   954,     0,     0,     0,     0,   955,   956,
-     957,   958,     0,     0,   960,   961,   962,   963,   964,   965,
-       0,   966,   951,   967,   968,     0,   952,   611,     0,     0,
-       0,     0,     0,   953,   954,     0,     0,     0,  2442,   955,
+       0,  1934,   955,   956,   957,   958,   969,     0,   960,   961,
+     962,   963,   964,   965,   969,   966,     0,   967,   968,     0,
+       0,     0,     0,     0,   969,     0,     0,   969,     0,     0,
+       0,     0,   951,     0,     0,     0,   952,   611,     0,     0,
+       0,     0,   969,   953,   954,     0,     0,     0,  1972,   955,
+     956,   957,   958,     0,   969,   960,   961,   962,   963,   964,
+     965,     0,   966,     0,   967,   968,     0,   951,   969,  1990,
+       0,   952,   611,     0,   969,     0,     0,     0,   953,   954,
+     969,     0,     0,     0,   955,   956,   957,   958,     0,     0,
+     960,   961,   962,   963,   964,   965,     0,   966,   951,   967,
+     968,     0,   952,   611,     0,     0,     0,     0,     0,   953,
+     954,     0,     0,     0,  2022,   955,   956,   957,   958,     0,
+       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
+     967,   968,   951,     0,  2166,     0,   952,   611,     0,     0,
+       0,     0,     0,   953,   954,     0,     0,     0,     0,   955,
      956,   957,   958,     0,     0,   960,   961,   962,   963,   964,
-     965,     0,   966,   951,   967,   968,  2490,   952,   611,     0,
-       0,     0,     0,     0,   953,   954,     0,     0,     0,     0,
-     955,   956,   957,   958,     0,     0,   960,   961,   962,   963,
-     964,   965,     0,   966,   951,   967,   968,     0,   952,   611,
-       0,     0,     0,     0,     0,   953,   954,     0,     0,     0,
-    2492,   955,   956,   957,   958,     0,     0,   960,   961,   962,
-     963,   964,   965,     0,   966,   951,   967,   968,     0,   952,
-     611,     0,     0,     0,     0,     0,   953,   954,     0,     0,
-       0,  2503,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,   951,   967,   968,  2504,
+     965,     0,   966,     0,   967,   968,   951,     0,  2181,     0,
      952,   611,     0,     0,     0,     0,     0,   953,   954,     0,
        0,     0,     0,   955,   956,   957,   958,     0,     0,   960,
      961,   962,   963,   964,   965,     0,   966,   951,   967,   968,
-    2508,   952,   611,     0,     0,     0,     0,     0,   953,   954,
+       0,   952,   611,     0,     0,     0,     0,     0,   953,   954,
+       0,     0,   969,  2272,   955,   956,   957,   958,     0,     0,
+     960,   961,   962,   963,   964,   965,     0,   966,     0,   967,
+     968,     0,     0,     0,   951,     0,     0,     0,   952,   611,
+       0,     0,     0,     0,     0,   953,   954,     0,     0,     0,
+    2280,   955,   956,   957,   958,     0,   969,   960,   961,   962,
+     963,   964,   965,     0,   966,     0,   967,   968,   951,     0,
+       0,     0,   952,   611,     0,     0,   969,     0,   969,   953,
+     954,     0,   969,     0,  2295,   955,   956,   957,   958,     0,
+       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
+     967,   968,     0,     0,     0,   969,     0,     0,   969,   951,
+       0,     0,  2306,   952,   611,     0,     0,     0,     0,     0,
+     953,   954,     0,   941,   942,     0,   955,   956,   957,   958,
+    1130,     0,   960,   961,   962,   963,   964,   965,     0,   966,
+     951,   967,   968,     0,   952,   611,     0,     0,     0,     0,
+       0,   953,   954,     0,     0,     0,  2310,   955,   956,   957,
+     958,     0,     0,   960,   961,   962,   963,   964,   965,     0,
+     966,   951,   967,   968,     0,   952,   611,     0,     0,     0,
+       0,     0,   953,   954,     0,     0,     0,  2369,   955,   956,
+     957,   958,     0,     0,   960,   961,   962,   963,   964,   965,
+       0,   966,     0,   967,   968,     0,     0,     0,   951,   969,
+       0,     0,   952,   611,     0,     0,     0,     0,   969,   953,
+     954,     0,   969,   969,  2370,   955,   956,   957,   958,     0,
+     969,   960,   961,   962,   963,   964,   965,     0,   966,   951,
+     967,   968,  2395,   952,   611,     0,     0,     0,     0,     0,
+     953,   954,     0,     0,     0,     0,   955,   956,   957,   958,
+       0,   969,   960,   961,   962,   963,   964,   965,     0,   966,
+       0,   967,   968,     0,     0,     0,     0,     0,     0,     0,
+     969,     0,   951,     0,     0,   969,   952,   611,     0,     0,
+       0,     0,     0,   953,   954,   969,   969,     0,  2402,   955,
+     956,   957,   958,     0,     0,   960,   961,   962,   963,   964,
+     965,     0,   966,     0,   967,   968,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,   969,   951,     0,     0,
+    2419,   952,   611,     0,     0,     0,   969,   969,   953,   954,
        0,     0,     0,     0,   955,   956,   957,   958,     0,     0,
      960,   961,   962,   963,   964,   965,     0,   966,   951,   967,
-     968,     0,   952,   611,     0,     0,     0,     0,     0,   953,
-     954,     0,     0,     0,  2513,   955,   956,   957,   958,     0,
-       0,   960,   961,   962,   963,   964,   965,     0,   966,   951,
-     967,   968,     0,   952,   611,     0,     0,     0,     0,     0,
-     953,   954,     0,     0,     0,  2541,   955,   956,   957,   958,
-       0,     0,   960,   961,   962,   963,   964,   965,     0,   966,
-     951,   967,   968,  2555,   952,   611,     0,     0,     0,     0,
-       0,   953,   954,     0,     0,     0,     0,   955,   956,   957,
-     958,     0,     0,   960,   961,   962,   963,   964,   965,     0,
-     966,     0,   967,   968,   951,     0,  2574,     0,   952,   611,
-       0,     0,     0,     0,     0,   953,   954,     0,     0,     0,
-       0,   955,   956,   957,   958,     0,     0,   960,   961,   962,
-     963,   964,   965,     0,   966,   951,   967,   968,     0,   952,
-     611,     0,     0,     0,     0,     0,   953,   954,     0,     0,
-       0,     0,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,     0,   967,   968
+     968,  2437,   952,   611,     0,     0,     0,     0,     0,   953,
+     954,     0,     0,     0,     0,   955,   956,   957,   958,     0,
+       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
+     967,   968,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   969,     0,   969,     0,     0,     0,     0,     0,
+       0,     0,   951,   969,     0,     0,   952,   611,   969,     0,
+       0,   969,     0,   953,   954,     0,     0,     0,  2444,   955,
+     956,   957,   958,     0,   969,   960,   961,   962,   963,   964,
+     965,     0,   966,   951,   967,   968,  2493,   952,   611,     0,
+       0,     0,     0,     0,   953,   954,     0,     0,     0,     0,
+     955,   956,   957,   958,     0,     0,   960,   961,   962,   963,
+     964,   965,     0,   966,     0,   967,   968,   951,     0,   969,
+       0,   952,   611,     0,     0,   969,     0,     0,   953,   954,
+       0,     0,   969,  2495,   955,   956,   957,   958,     0,     0,
+     960,   961,   962,   963,   964,   965,     0,   966,   951,   967,
+     968,   969,   952,   611,     0,     0,     0,     0,     0,   953,
+     954,     0,     0,     0,  2506,   955,   956,   957,   958,     0,
+       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
+     967,   968,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,   969,     0,   969,     0,     0,
+       0,   969,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,   969,   969,     0,     0,     0,   969,   951,     0,
+       0,  2507,   952,   611,     0,     0,     0,   969,     0,   953,
+     954,   969,     0,     0,     0,   955,   956,   957,   958,     0,
+       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
+     967,   968,     0,     0,     0,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,   969,     0,     0,     0,     0,     0,
+     969,     0,   969,     0,     0,     0,   951,     0,     0,  2511,
+     952,   611,     9,     0,   969,     0,   969,   953,   954,    10,
+       0,     0,     0,   955,   956,   957,   958,     0,     0,   960,
+     961,   962,   963,   964,   965,     0,   966,     0,   967,   968,
+       0,     0,     0,     0,   969,     0,     0,     0,   969,    11,
+      12,    13,    14,     0,    15,    16,    17,    18,    19,    20,
+     969,     0,    21,    22,     0,     0,     0,    23,    24,    25,
+       0,    26,    27,    28,    29,    30,    31,     0,    32,    33,
+      34,    35,    36,    37,     0,    38,    39,    40,    41,    42,
+      43,     0,     0,    44,    45,    46,    47,    48,     0,     0,
+      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
+      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
+      69,    70,     0,    71,     0,    72,    73,     0,    74,    75,
+      76,     0,     0,    77,     0,     0,    78,    79,     0,    80,
+      81,    82,    83,     0,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,     0,     0,     0,     0,     0,    93,    94,
+      95,    96,     0,     0,     0,     0,    97,     0,     0,    98,
+      99,     0,     0,   100,   101,     0,   102,     0,     0,     0,
+     103,     0,   104,     0,   105,     0,     0,     0,   106,   107,
+     108,   109,   110,   111,   112,   113,   114,   115,     0,   116,
+     117,   118,     0,   119,     0,   120,   121,     0,   122,     0,
+     123,   124,   125,   126,     0,     0,   127,   128,   129,     0,
+     130,   131,   132,     0,   133,   134,   135,     0,   136,     0,
+     137,   138,   139,   140,   141,     0,   142,     0,   143,   144,
+       0,     0,   145,   146,   147,     0,     0,   148,   149,     0,
+     150,   151,     0,   152,   153,     0,     0,     0,   154,   155,
+       0,     0,   156,     0,     0,   157,     0,     0,     0,   158,
+     159,     0,     0,   160,   161,   162,     0,   163,   164,   165,
+     166,   167,   168,   169,   170,   171,   172,   173,     0,   174,
+       0,     0,   175,     0,     0,     0,   176,   177,   178,   179,
+     180,     0,   181,   182,     0,     0,   183,   184,   185,   186,
+       0,     0,     0,     0,   187,   188,   189,   190,   191,   192,
+       0,     0,     0,     0,     0,     0,     0,   193,     0,   194,
+       0,   195,   196,   197,   198,   199,     0,     0,     0,   200,
+     201,   202,   203,   204,   205,   951,   206,   207,     0,   952,
+     611,   208,     0,     0,     0,     0,   953,   954,     0,     0,
+       0,  2516,   955,   956,   957,   958,     0,     0,   960,   961,
+     962,   963,   964,   965,     0,   966,   951,   967,   968,     0,
+     952,   611,     0,     0,     0,     0,     0,   953,   954,     0,
+       0,     0,  2545,   955,   956,   957,   958,     0,     0,   960,
+     961,   962,   963,   964,   965,     0,   966,   951,   967,   968,
+    2559,   952,   611,     0,     0,     0,     0,     0,   953,   954,
+       0,     0,     0,     0,   955,   956,   957,   958,     0,     0,
+     960,   961,   962,   963,   964,   965,     0,   966,     0,   967,
+     968,   951,     0,  2578,     0,   952,   611,     0,     0,     0,
+       0,     0,   953,   954,     0,     0,     0,     0,   955,   956,
+     957,   958,     0,     0,   960,   961,   962,   963,   964,   965,
+       0,   966,   951,   967,   968,     0,   952,   611,     0,     0,
+       0,     0,     0,   953,   954,     0,     0,     0,     0,   955,
+     956,   957,   958,     0,     0,   960,   961,   962,   963,   964,
+     965,     0,   966,     0,   967,   968
 };
 
 static const yytype_int16 yycheck[] =
 {
-      50,   489,   486,   395,   381,   496,   497,   498,   499,   634,
-    1138,   767,  1031,   894,   544,   894,   378,   404,   925,   475,
-    1460,   390,   975,   638,  1311,  1498,  1340,   414,  1608,   416,
-     881,    62,    63,   433,   421,   422,   423,   613,    69,   257,
-     660,   210,   429,   754,   262,   432,  1987,   434,  1494,  1518,
-     981,  1638,  2027,   649,  1311,  1154,   391,  1716,  1717,  1718,
-    1071,  1866,  1614,  1868,  1614,   659,   660,    98,   118,   895,
-       7,  2096,   122,   259,   436,  1005,   262,   263,    63,   470,
-     747,   483,  1625,   659,   660,   849,    76,  1530,  1634,   849,
-       7,   453,  1373,  1639,   471,  1530,   480,  1915,  1530,     8,
-    1680,     8,    15,  1530,  1530,   467,  1530,  1530,   116,    99,
-     472,    20,     0,     1,   476,    94,   478,     7,    15,   232,
-     233,   391,  1920,  1921,    71,   238,   116,   183,     8,   491,
-       8,     8,   516,     8,    89,   191,    41,     8,     8,  2206,
-      20,   503,    20,   505,   182,    20,  1027,   116,  1027,    20,
-     512,   191,   208,    63,   144,  1166,   169,     8,    68,   175,
-    1179,     8,   677,     8,     5,    15,     7,   122,    15,  1050,
-       5,     5,     8,   191,    37,    20,   409,    15,   182,   116,
-      90,    91,   974,   975,   129,   641,    21,     8,     8,   645,
-     552,     5,     8,   129,   225,   208,   652,  2417,     8,   116,
-     155,   315,  1861,   116,    21,  1864,     8,   116,   804,   116,
-    1528,   129,  1530,     8,  1532,    15,   129,   212,     3,  1528,
-       8,  1530,     8,  1532,    58,  1534,   116,   172,     8,     8,
-     185,    21,    64,    18,   144,    37,   116,   351,   116,   116,
-       5,   116,     3,   578,   154,   116,  1560,   242,   166,   257,
-     483,   230,    86,   588,   589,   590,   591,   475,     7,     8,
-      21,   208,   150,   218,   282,   116,   129,   651,   637,   282,
-     654,   116,    37,  1528,   314,  1530,   257,  1532,    15,   767,
-     318,   262,   129,  1528,  1191,  1530,  2506,  1532,   129,  1534,
-     200,   129,   126,   129,   129,   116,   116,   252,   813,   149,
-     116,   357,   358,   137,   209,   284,   116,  2125,   324,   696,
-    2377,   315,   129,    23,   318,   129,   295,   266,  1446,    15,
-     257,   116,   592,   228,    15,   694,   728,    37,   116,   129,
-     116,   165,  1919,   129,   822,  1994,   116,   116,   287,   129,
-     257,  2139,  2140,   678,   257,   376,   377,   803,   257,   246,
-     257,   382,   383,   384,   385,   755,   387,   388,  1615,  1616,
-     391,   976,   393,   394,   395,   396,   701,   257,   399,   257,
-    1916,   402,  2313,   404,  1305,  1918,  1657,   257,   409,   257,
-     257,   412,   257,   414,   254,   416,   257,    15,  1831,   420,
-     421,   422,   423,   989,  1867,   991,  1831,     8,   429,  1831,
-     431,   432,   998,   434,  1831,  1831,   257,  1831,  1831,   440,
-     441,  1005,   257,   815,  1345,  2074,   447,   448,   802,  1438,
-     804,   452,  1178,   641,   258,  1189,  1093,   645,   459,  1005,
-    1190,   462,     8,   129,   652,   420,   257,   257,   129,     3,
-    1459,   257,   492,   474,   844,    47,   477,   257,  1378,  1379,
-    1380,    15,   483,   484,   485,   486,   437,   488,   489,    43,
-    1085,     8,   257,   798,   495,   496,   497,   498,   499,   257,
-     501,   257,    92,   504,    15,   506,   507,   257,   257,   510,
-     700,    15,   513,    67,  1495,   466,   517,  1418,    15,     8,
-    1110,     8,   473,   257,   475,    15,   716,   547,    82,   191,
-    1818,  2160,   194,    87,    88,   116,  1605,  1606,   843,  1818,
-      94,   846,  1304,  1831,     8,   546,  1110,  2542,  2543,  1837,
-      15,   191,  1831,   573,    16,    17,  2501,   129,  1837,   149,
-     580,   922,  1841,   564,  1110,     8,   992,   993,   994,   995,
-     996,   572,   148,  1857,   575,   576,   577,   578,    21,  2136,
-    2491,     8,   583,   584,   923,  2028,   587,   588,   589,   590,
-     591,     8,  1158,  1818,   595,   596,  2118,  2036,  2118,   116,
-     683,  2017,     8,  1818,   180,   177,  1831,   147,   148,   569,
-     570,   201,  1837,   129,  2127,   803,  1831,   773,   129,    64,
-      23,   581,  1837,     3,   763,   129,  1841,   116,     7,   116,
-      92,   970,   129,   149,    37,    15,  2547,  2412,   149,   129,
-     180,     8,     7,     8,   128,     7,     5,     5,   288,   669,
-       9,     9,   116,  1910,    16,    17,    23,   847,  1915,   299,
-     661,   662,   663,   664,   665,   666,   667,   687,   858,   670,
-      37,     5,     7,   157,   228,     8,   257,   678,    37,    37,
-      15,    15,  2559,  1910,   129,   875,    22,   149,    24,     8,
-     641,     3,   147,   148,   645,   696,  2573,    33,   699,    35,
-     701,   652,     8,  1042,   149,   259,   657,     8,   128,   244,
-    1561,    84,  1561,  1052,    26,  1536,  1537,  1538,    37,  1540,
-    1541,     8,   912,   724,     8,   180,   129,   747,  1318,  2286,
-      95,    37,     3,   217,  1460,  1461,   926,   157,     8,   201,
-     257,    15,    16,    17,   764,     7,     8,  2376,   749,   303,
-     751,    21,  1653,   754,  1318,    26,  2597,  2598,   778,   124,
-    1660,  1661,  1662,  1444,     8,   785,   767,   191,   257,  2610,
-     257,     3,  1318,    84,  1320,     8,   777,   860,  2141,  2142,
-    2143,   864,     8,    15,   208,   786,   869,   788,    21,   872,
-     873,  1692,   793,   257,   795,    21,   331,   798,  2427,  1365,
-    1366,  1367,  1368,  1369,   992,   993,   994,   995,   996,    18,
-     811,   346,   347,   348,  1378,  1379,  1380,    26,   191,   191,
-       8,   822,   158,   159,  1014,   161,   162,   828,     8,  1019,
-     195,   851,  1378,  1379,  1380,   208,   208,   202,  2388,     8,
-       8,    21,   843,     8,    63,   846,    15,     5,   931,    68,
-     933,   852,   803,    21,     8,   129,   192,    15,   282,   314,
-     315,   285,   882,   318,   319,     8,   290,   887,  2125,     8,
-    1060,    90,    91,    15,   298,   149,   896,   897,   898,     3,
-     191,   901,    21,   339,     3,   886,   342,   343,   344,    16,
-      17,    15,   265,     5,    21,  2338,    15,   208,   234,   355,
-     356,   902,   903,    15,    16,    17,     8,  1277,    15,   282,
-     282,   247,   285,   285,     8,    27,   289,   918,     8,    21,
-       8,   941,     8,     8,    36,   144,   299,    21,     8,   880,
-     881,   304,   257,    21,     5,   154,    21,   262,     5,   940,
-       8,    21,     9,   894,   904,    16,    17,     8,     8,    16,
-      17,    22,    64,    24,   265,     8,    23,     5,     8,   919,
-      21,     9,    33,     8,    35,     8,    37,  2410,    16,    17,
-      37,   282,     8,    21,   285,    23,    21,     8,   289,   290,
-      92,   200,  1905,  1906,  1907,  1908,  1909,   298,   299,    37,
-      21,     3,     8,   304,     8,     8,     8,     8,     8,  2409,
-    2284,     8,     8,  1308,  1024,    21,    41,  1354,    21,  1860,
-      21,    21,   231,  1352,    21,    21,  1893,   129,     7,  1358,
-       5,  1872,  1023,  1872,     9,   244,     8,     5,  1029,     7,
-       7,    16,    17,     8,  1035,     8,    71,   149,  1939,    21,
-    1766,   992,   993,   994,   995,   996,    21,  1048,    21,  1000,
-    1001,  1398,    37,     8,  1955,     8,  2499,  2155,     8,  1740,
-    1961,  1439,  1963,  1441,  1411,     8,    21,  1652,    21,     7,
-       8,    21,  1073,  1093,  1870,  1871,  1027,  1078,    21,     8,
-    1437,  1101,  1878,  1879,  1427,  1424,  1429,  2497,   159,   201,
-       8,   162,    21,  1094,     8,  1285,  1660,  1661,  1662,  1050,
-     135,  1863,   149,    21,  1955,     8,  1955,    21,  1109,    22,
-    1961,    24,     3,  1303,  1660,  1661,  1662,  1200,    21,     8,
-      33,    63,    35,  1206,    15,  1145,    68,  1210,     8,  1212,
-    1213,  1214,    21,  1216,   169,  1218,    15,  1088,  1470,     8,
-    1866,    21,  1868,  1905,  1906,  1907,  1908,  1909,    90,    91,
-      15,     5,    21,     8,     3,     9,   191,     8,    15,     8,
-       5,   149,    16,    17,     9,     8,    21,    21,  1188,    23,
-      21,    16,    17,   208,   209,    15,   247,     8,    21,    15,
-       8,    15,   124,    37,     8,  1517,   221,     8,   223,   224,
-      21,   226,    37,    21,   229,   862,   863,     5,   865,    15,
-      21,     9,   144,    15,     8,     8,     8,    37,    16,    17,
-       8,  1231,   154,    21,    15,    23,   129,    21,    21,    21,
-    1559,   352,   353,    21,    44,     8,  1246,  1247,  1248,    37,
-    1656,     8,   316,   317,   305,   306,   307,     8,    21,    15,
-       8,     8,  1432,     8,    21,   158,   159,   282,   161,   162,
-      21,    15,  1272,    21,    21,    15,    21,    15,   200,     5,
-      15,     7,    15,     8,    10,   410,     8,    87,    14,    15,
-      16,    17,    15,    93,   349,   350,    21,  1278,  1279,   192,
-    1780,    27,  1782,  1783,    15,   320,    15,   322,    34,    15,
-      36,   233,     8,    15,  1794,    15,     8,  2395,    15,   119,
-      15,  1302,   244,     8,  1804,    21,  1806,  1308,  1647,    21,
-       8,  1312,    15,    16,    17,     8,    21,     8,    64,    16,
-      17,   234,     8,   143,    27,   145,     8,     8,    21,  1412,
-      21,   124,  1671,    36,   247,    21,     8,     8,     8,    21,
-      21,     8,  1937,  2332,  1683,  1702,    92,     8,  1687,    21,
-      21,    21,     8,     8,    21,     8,    59,     8,   178,     8,
-      21,    64,     7,   183,   239,    21,    21,   187,    21,    15,
-      21,   191,    21,    15,   194,   252,    15,   522,  1944,   524,
-    2281,  2232,  1383,   129,  1615,  1616,   531,   532,   533,    92,
-     248,   249,   537,   538,   539,   540,   216,   542,   543,  1000,
-    1001,     8,     8,   149,  1487,  2306,    15,  2258,     5,  2258,
-     230,    15,     9,    10,    21,    21,   236,    14,    15,    16,
-      17,     8,  1373,  2593,  2594,  1426,  1427,    15,  1429,     8,
-      27,     8,     8,    15,    21,     8,  1437,    34,  1439,    36,
-    1441,     8,    21,  1444,    21,    21,   149,     8,    21,     8,
-       8,     8,     8,     8,    21,   201,     8,     8,     8,     8,
-      21,     8,    21,    21,    21,    21,    21,    64,  1656,    21,
-      21,    21,    21,  1493,    21,  1476,    15,     5,     8,  1669,
-    2474,  2475,    10,     8,  1485,     3,    14,    15,    16,    17,
-    1491,    21,  1512,    15,  1514,    92,    21,     8,   201,    27,
-    1501,     8,     8,  1660,  1661,  1662,    34,    15,    36,   124,
-      21,    15,    15,   246,    21,    21,   246,  1518,    15,  1539,
-     204,   205,   206,   207,   208,    21,  1477,   870,   871,     8,
-       7,    26,   129,  1553,    15,    15,    64,    15,   240,     8,
-      15,  1731,     8,    15,    15,   175,     5,   149,  1549,  1569,
-       9,  2540,   149,     8,  1574,    15,    15,    16,    17,     8,
-       8,    15,  1582,     8,    92,     8,     7,   129,    27,  1520,
-    1590,    15,    62,    26,     8,    15,    15,    36,   455,    21,
-    1600,     8,  1602,   287,    15,  1536,  1537,  1538,   213,  1540,
-    1541,     8,     8,  1544,  1595,    15,    16,    17,     8,     8,
-      15,   129,     8,    64,   201,    64,     9,    27,  2334,  1956,
-    1561,     9,     8,   490,    21,     8,    36,     8,    15,    37,
-      67,   149,    26,   500,  1625,    15,    15,  1959,    15,    15,
-      15,    15,    15,    92,     8,  2230,     5,  1638,   166,    15,
-       8,    10,   129,     7,    64,    14,    15,    16,    17,     7,
-      21,    21,    18,    26,    21,    37,  1657,     7,    27,  1660,
-    1661,  1662,    15,     7,    15,    34,  2028,    36,     8,  1670,
-     129,   816,    92,   201,    15,     8,     8,   554,   555,   556,
-     557,   558,     5,  2409,     7,  2411,  2412,    10,    26,    15,
-     149,    14,    15,    16,    17,    64,    21,    21,    15,    15,
-      15,  1702,    15,    15,    27,  1656,  1657,   166,     8,   129,
-      21,    34,    21,    36,     8,     5,    15,    15,    15,    62,
-      21,  1722,     8,    92,     7,   239,     8,     8,     8,   149,
-       8,    15,   255,     7,   166,   208,   613,   614,   615,  1740,
-     617,    64,   201,    15,    15,  2471,    21,   624,    16,    15,
-      15,    15,  2206,   191,    21,     8,     7,    15,    15,   331,
-     129,   638,   315,   332,   246,  1716,  1717,  1718,    15,    92,
-    2496,  2497,    15,  1774,  1775,    15,    15,  2116,    15,     5,
-     149,   201,    15,    15,    10,    15,    15,  2126,    14,    15,
-      16,    17,    15,    15,    15,    15,    15,   166,  1799,    15,
-      44,    27,    15,   680,    15,    15,   129,     7,    34,     5,
-      36,   246,     5,     9,    40,    21,   246,     5,   695,    15,
-      16,    17,   246,  2549,   246,     5,   149,    15,    16,    17,
-      10,    27,   201,     8,    14,    15,    16,    17,    64,    27,
-      36,    15,  1862,    87,    15,    21,   723,    27,    36,     8,
-    1851,     7,    21,   730,    34,    21,    36,  1877,    21,   736,
-     737,  1881,  2323,  2324,     8,    26,    92,    15,    64,    21,
-      15,   173,     8,    15,    15,   119,    64,   255,   201,     8,
-       7,    21,    15,    15,    64,    71,   208,    18,     8,    15,
-      15,    15,    15,    15,   149,     7,    92,    15,    15,   143,
-      21,   145,    21,   129,    92,   782,    21,    21,    21,  1860,
-    1861,    15,    92,  1864,    21,    15,  1061,  1918,  1919,  1920,
-    1921,  1872,    21,   149,    21,     8,    15,  1072,     5,    15,
-    1931,     9,    20,   129,   178,    26,    21,    21,     8,   183,
-      21,   129,    21,   187,    15,    21,    21,   191,    15,   129,
-     194,  2409,  2410,   149,  1974,     8,  2303,  1958,    26,    21,
-      26,   149,    26,    21,    21,     7,    21,    15,     8,   149,
-      26,    15,   216,     8,    21,   201,  1996,   254,   855,   856,
-       7,    15,    21,    10,    21,   132,   230,    14,    15,    16,
-      17,     7,   236,     7,    37,    21,    21,    15,    15,   354,
-      27,     7,     7,   255,  1955,   201,    21,    34,    21,    36,
-    1961,  2012,    15,   201,    15,  2016,    15,  2018,    15,    15,
-    1165,   201,  2042,    15,    15,    15,    15,  2028,    15,     7,
-       7,  2051,     8,    21,  2035,  2036,     8,    64,     8,    21,
-       8,     7,    21,  1994,     8,     7,    15,     7,    15,  2069,
-      21,    78,     8,     7,  1199,    78,   352,   330,   353,     7,
-    1205,   223,    21,    15,  1209,    92,  1211,    17,    15,    15,
-    1215,    15,  1217,     8,   951,   952,   953,   954,   955,   956,
-     957,   958,   959,   960,   961,   962,   963,   964,   965,   966,
-     967,   968,   969,    21,    17,    15,     5,     7,    15,   976,
-       7,    10,   129,     7,   981,    14,    15,    16,    17,   128,
-    2014,   988,   903,   990,   911,  1279,  1890,  1600,    27,  1192,
-    2281,  1097,   149,  2074,  1604,    34,  2127,    36,  1005,   586,
-    1891,   594,   597,   714,  1310,  2136,  1634,  2138,  2139,  2140,
-    2141,  2142,  2143,    45,    46,   940,    48,    49,  2168,  2286,
-     940,    53,  2118,  2138,  1031,    64,  1918,  1910,  1161,    61,
-    1037,  1501,  1741,  2188,    66,  1485,  2012,    69,  2207,     5,
-    1033,  1053,  1421,     9,   201,    77,  1053,    79,  1400,    81,
-      16,    17,  1713,    92,  1095,  1715,    22,    23,    75,    25,
-    2599,  1939,    28,    29,    30,    31,    32,   466,  1961,     5,
-     715,    37,   104,     9,  1407,  2206,  2207,  1444,  1656,  2160,
-      16,    17,   796,   115,   247,   247,   247,    23,   247,    25,
-     129,  1653,    28,    29,    30,    31,    32,  1042,   661,  2249,
-    1005,    37,  1078,  1109,   842,  1181,   664,   139,   663,   665,
-     149,  2333,  1423,   666,  2167,  2547,  1425,  2016,  2268,  2395,
-     152,   811,  1021,  1023,  2519,  1094,  1048,  1958,  2454,  1998,
-     445,  1138,  1035,   792,  2408,  2549,  2575,  2595,   170,  2341,
-    2597,  1766,  1499,  2019,   176,   670,   507,  1461,  1963,  1156,
-     765,  2232,   184,   385,   186,  2286,   188,  1553,   190,  1434,
-     418,  2023,   201,  1818,  2313,   197,  1837,  1793,  1841,  1798,
-    2364,  2048,  1179,  1180,  1181,  1831,  2049,  2258,  1231,  1851,
-    1238,  1549,   214,   215,   884,  2069,  2381,  1569,  2232,  1574,
-    2268,  1582,  2323,  2324,    -1,  1590,    -1,   437,    -1,    -1,
-     232,    -1,  2333,    -1,    -1,     5,    -1,   239,  1483,     9,
-      -1,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,
-      -1,   253,    22,    23,   256,    25,   466,    -1,    28,    29,
-      30,    31,    32,   473,    -1,    35,    -1,    37,    38,    -1,
-      -1,   481,  1249,    -1,    -1,    -1,    -1,    -1,  1523,    -1,
-      -1,  1526,    -1,    -1,  1529,    -1,  1531,    -1,  1533,    -1,
-    1535,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2399,    -1,
-      -1,    -1,    -1,  2423,    -1,    -1,    -1,    -1,  2409,  2410,
-      -1,    -1,  2432,    -1,    -1,    -1,    -1,    -1,  2438,    -1,
-    2440,    -1,    -1,    -1,  2375,  2376,    -1,    -1,  1305,    45,
-      46,    -1,    48,    49,    -1,    -1,    -1,    53,    -1,    -1,
-    1317,    -1,  2443,    -1,    -1,    61,    -1,    -1,    -1,    -1,
-      66,    -1,    -1,    69,  2474,  2475,    -1,    -1,    -1,    -1,
-      -1,    77,     5,    79,    -1,    81,    -1,    10,  1345,    -1,
-      -1,    14,    15,    16,    17,    -1,  2427,    -1,    -1,    -1,
-    1357,    -1,    -1,   593,    27,    -1,    -1,    -1,   104,    -1,
-      -1,    34,    -1,    36,    -1,    -1,    -1,     5,    -1,   115,
-      -1,    -1,    10,    -1,    -1,    -1,    14,    15,    16,    17,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2519,    27,
-    2521,    64,    -1,   139,    -1,    -1,    34,    -1,    36,  1406,
-    1407,  2482,    -1,    -1,    -1,    -1,   152,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1421,    -1,    -1,   657,    -1,    92,
-      -1,  1428,    -1,    -1,   170,    -1,    64,  2577,    -1,    -1,
-     176,  1438,  2582,    -1,    -1,    -1,    -1,  1444,   184,  1446,
-     186,    -1,   188,    -1,   190,  2595,    -1,  2597,  2598,    -1,
-      -1,   197,  1459,    -1,    92,     7,   129,    -1,    10,    -1,
-    2610,    -1,    14,    15,    16,    17,  1473,    -1,   214,   215,
-      -1,    -1,    -1,    -1,    -1,    27,   149,  1484,    -1,    -1,
-      -1,    -1,    34,    -1,    36,    -1,   232,    -1,    -1,    -1,
-    1497,   129,    -1,    -1,    -1,  1502,     7,  1504,    -1,    10,
-      -1,    -1,    -1,    14,    15,    16,    17,   253,    -1,   749,
-     256,   149,    64,    -1,    -1,  1790,    27,    -1,    -1,    -1,
-    1795,    -1,    -1,    34,    -1,    36,    -1,   767,   201,    -1,
-      -1,    -1,    -1,  1808,    -1,    -1,    -1,    -1,    -1,    -1,
-      92,   781,    -1,    -1,    -1,    -1,    -1,    -1,     5,   789,
-     790,    -1,     9,    64,   794,  1830,    -1,    -1,    -1,    16,
-      17,  1836,    -1,   201,    -1,  1840,    23,    -1,    25,    -1,
-      -1,    28,    29,    30,    31,    32,    -1,   129,    -1,    -1,
-      37,    92,   822,    -1,    -1,    -1,     7,    -1,    -1,    10,
-     830,    -1,    -1,    14,    15,    16,    17,   149,    -1,    -1,
-      -1,    -1,     7,  1610,    -1,    10,    27,    -1,    -1,    14,
-      15,    16,    17,    34,   166,    36,    -1,    -1,   129,   859,
-      -1,   861,    27,    -1,    -1,    -1,    -1,    -1,    -1,    34,
-      -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,   149,    -1,
-     880,   881,    -1,    64,  1651,  1652,  1653,    -1,    -1,   201,
-      -1,    -1,    -1,     7,   894,   895,    10,    -1,    -1,    64,
-      14,    15,    16,    17,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    92,    -1,    27,    -1,  1682,    -1,    -1,  1685,    -1,
-      34,    -1,    36,    -1,    -1,     7,  1693,    92,    10,    -1,
-     201,    -1,    14,    15,    16,    17,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    27,    -1,    -1,   129,    -1,
-      64,    -1,    34,    -1,    36,    -1,    -1,    -1,  1725,    -1,
-    1727,    -1,    -1,    -1,   129,    -1,    -1,    -1,   149,    -1,
-      -1,    -1,    -1,    -1,   974,   975,    -1,    -1,    92,    -1,
-      -1,    -1,    64,    -1,   149,    -1,    -1,    -1,    -1,    -1,
-    2025,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1000,  1001,    -1,    -1,  2039,    -1,    -1,    -1,    -1,  2044,
-      92,    -1,  2047,    -1,    -1,   129,    -1,    -1,    -1,    -1,
-     201,    -1,  2057,    -1,  2059,    -1,  2061,  1027,  2063,    -1,
-      -1,    -1,    -1,    -1,    -1,   149,   201,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,     5,    -1,   129,    -1,     9,
-    1050,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,
-      -1,    -1,    22,    23,    24,    25,    -1,   149,    28,    29,
-      30,    31,    32,    33,    12,    35,    -1,    37,    38,    -1,
-      18,    -1,    -1,    -1,    -1,    -1,    -1,   201,  1088,    -1,
-      28,    -1,    -1,    31,    -1,    -1,    34,    -1,    -1,    -1,
-      -1,    -1,    -1,    41,    -1,    -1,  1873,    45,    -1,    -1,
-      -1,    49,    -1,  1880,    -1,    -1,    -1,  1884,  1885,   201,
-      -1,    -1,    -1,    -1,    -1,  1892,    -1,    -1,    -1,    67,
-      -1,    -1,    -1,    71,    72,    -1,    -1,    -1,    -1,    77,
-      78,    -1,    -1,    -1,    -1,    83,    84,    -1,    86,    87,
-      88,    89,    -1,    91,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   100,    -1,    -1,    -1,  1933,   105,    -1,   107,
-      -1,    -1,  1939,   111,    -1,    -1,    -1,   115,  1178,   117,
-      -1,    -1,    -1,    -1,    -1,    -1,   124,    -1,    -1,    -1,
-     128,    -1,    -1,    -1,   132,    -1,   134,  1964,    -1,    -1,
-      -1,    -1,     7,   141,   142,    10,  1973,   145,   146,    14,
-      15,    16,    17,   151,    -1,   153,    -1,    -1,    -1,   157,
-      -1,    10,    27,  1990,  1991,    14,    15,    16,    17,    34,
-      -1,    36,    -1,    -1,    -1,    -1,    -1,    10,    27,    -1,
-      -1,    14,    15,    16,    17,    34,   184,    36,   186,    -1,
-      -1,    -1,  2019,    -1,    27,   193,   194,    -1,    -1,    64,
-    2027,    34,    -1,    36,    -1,    -1,    -1,    -1,    -1,    -1,
-    2037,    -1,    -1,    -1,    -1,    64,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2053,    92,  2055,    -1,
-      -1,    64,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    92,    -1,    -1,    -1,    -1,    -1,  1309,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    92,
-      -1,    -1,    -1,    -1,   129,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     129,    -1,    -1,    -1,   149,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   129,    -1,    -1,    -1,
-     149,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1373,    -1,    -1,   149,    -1,    -1,    -1,
-      -1,    -1,    -1,  2150,    -1,    -1,    -1,    -1,  2155,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,   201,    -1,    -1,  2166,
-    2167,    -1,    -1,    -1,  2171,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   201,    -1,  2181,    -1,    -1,    -1,    -1,    -1,
-    2187,    -1,    -1,    -1,    -1,     5,    -1,    -1,   201,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,  1439,
-     625,  1441,    22,    23,    24,    25,    26,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,    -1,    37,    38,    -1,
-    1460,  1461,    -1,    -1,  2231,    -1,    -1,    -1,    -1,   407,
-      -1,  1471,    -1,    -1,    -1,    -1,    -1,  1477,    -1,  1479,
-      -1,    -1,  1482,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2260,  1494,    -1,    -1,    -1,  1498,  1499,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2275,    -1,
-      -1,    -1,    -1,    -1,  2281,    -1,    -1,    -1,    -1,    -1,
-    1520,    -1,    -1,    -1,    -1,    -1,    -1,  1527,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1536,  1537,  1538,    -1,
-    1540,  1541,    -1,    -1,  1544,    -1,    -1,    -1,    -1,    -1,
-    2317,     5,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
-      -1,  1561,    16,    17,    -1,  2332,    -1,    21,    22,    23,
-      24,    25,    -1,   511,    28,    29,    30,    31,    32,    33,
-      -1,    35,    -1,    37,    38,    -1,    -1,     5,    -1,    -1,
-     775,     9,    10,    -1,   779,    -1,    -1,    -1,    16,    17,
-      -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
-      28,    29,    30,    31,    32,    33,    34,    35,    -1,    37,
-      38,    -1,    -1,    -1,    -1,  1625,    -1,  2394,  2395,    -1,
-      -1,  2398,    -1,  2400,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   826,    -1,    -1,    -1,    -1,    -1,    -1,  2415,  2416,
-      -1,  2418,    -1,   838,    -1,    -1,    -1,  1657,    -1,    -1,
-      -1,  2428,    -1,    -1,    -1,    -1,     5,    -1,     7,  2436,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,
-      -1,    -1,    -1,    22,    23,    24,    25,  2454,    -1,    28,
-      29,    30,    31,    32,    33,    -1,    35,    -1,    37,    38,
-      -1,    -1,    -1,   888,   889,   890,   891,    -1,   893,    -1,
-      -1,    -1,    -1,    -1,    -1,  2482,  1716,  1717,  1718,    -1,
-      -1,    -1,    -1,  2490,  2491,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2501,    -1,    -1,  2504,    -1,    -1,
-      -1,  2508,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     945,    -1,   947,   948,   949,   950,  1766,    -1,    -1,    -1,
-      -1,    -1,    -1,  2540,    -1,    -1,    -1,    -1,    -1,    -1,
-    2547,    -1,    -1,    -1,  2551,    -1,    -1,    -1,  2555,    -1,
-      -1,    -1,  2559,    -1,    -1,    -1,    -1,    -1,    -1,     5,
-      -1,    -1,     8,     9,    10,    -1,  2573,  2574,  2575,    -1,
-      16,    17,    -1,    -1,    -1,    -1,    22,    23,    24,    25,
-      -1,  1006,    28,    29,    30,    31,    32,    33,    -1,    35,
-      -1,    37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1028,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1038,    -1,    -1,    -1,    -1,    -1,    -1,
-    1860,  1861,    -1,    -1,  1864,    -1,  1866,  1867,  1868,    -1,
-    1870,  1871,  1872,    -1,  1059,    -1,    -1,    -1,  1878,  1879,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1075,    -1,    -1,    -1,  1079,  1080,    -1,    -1,    -1,     5,
-      -1,    -1,     8,     9,    10,  1905,  1906,  1907,  1908,  1909,
-      16,    17,    -1,    -1,    -1,    -1,    22,    23,    24,    25,
-      -1,    -1,    28,    29,    30,    31,    32,    33,    -1,    35,
-      -1,    37,    38,    -1,    -1,    -1,    -1,    -1,    -1,     5,
-      -1,    -1,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
-      16,    17,  1137,    -1,    -1,  1955,    22,    23,    24,    25,
-      -1,  1961,    28,    29,    30,    31,    32,    33,    -1,    35,
-      -1,    37,    38,     5,    -1,    -1,    -1,     9,    10,    -1,
-      -1,    -1,   920,    -1,    16,    17,    -1,    -1,    -1,    21,
-      22,    23,    24,    25,  1994,  1995,    28,    29,    30,    31,
+      50,   489,   767,   381,  1031,   496,   497,   498,   499,   486,
+     390,   395,   378,   544,  1138,   894,  1460,   754,   894,  1340,
+     634,   659,   660,   975,   895,   433,   925,  1608,   660,  1638,
+     210,    62,    63,   404,   257,  1987,   638,  1498,    69,   262,
+    1494,  2027,  1311,   414,   881,   416,  1866,  1154,  1868,   257,
+     421,   422,   423,  1518,   262,   981,    76,   470,   429,   747,
+    2096,   432,   849,   434,  1373,  1311,  1614,    98,   118,   613,
+     436,  1614,   122,   259,  1005,     8,   262,   263,  1071,    99,
+       8,    63,   849,  1625,  1634,  1530,     7,   453,   483,  1639,
+    1528,     7,  1530,   471,  1532,    15,   116,  1915,    15,  1680,
+       7,   467,     5,  1530,  2206,   175,   472,   475,    71,   116,
+     476,  1530,   478,  1530,  1530,   659,   660,   391,     5,   116,
+       0,     1,    94,  1530,   144,   491,   974,   975,    37,  1530,
+      41,    16,    17,     8,    21,   182,  1528,   503,  1530,   505,
+    1532,   649,   191,   169,   129,    20,   512,   677,  1027,    15,
+     266,  1027,  1179,    15,   212,    58,    12,     5,     8,     7,
+      15,     8,    18,  1716,  1717,  1718,   409,   182,    15,   129,
+      20,   287,    28,  1166,  1050,    31,     5,    15,    34,    15,
+      16,    17,   208,    86,   242,    41,   552,   172,   116,    45,
+      15,     8,     3,    49,   225,   116,     5,   391,     8,   116,
+     116,     8,   315,    20,   147,   148,   166,    92,    37,   116,
+      21,    67,   129,    20,   437,    71,    72,    15,    15,    21,
+     129,    77,    78,   126,   191,    15,    15,    83,    84,    15,
+      86,    87,    88,    89,   137,    91,     8,   180,   351,  1560,
+     483,   116,   129,   466,   100,   208,     3,   129,    20,   105,
+     473,   107,   475,   129,   324,   111,   282,   637,   230,   115,
+     257,   117,   165,   129,   149,   314,   116,   475,   124,    26,
+     150,   318,   128,   641,   129,  2377,   132,   645,   134,   767,
+       8,   129,   129,   813,   652,   141,   142,   149,   480,   145,
+     146,   129,  1191,   129,   149,   151,   804,   153,   209,   116,
+     315,   157,    64,   318,   129,  1920,  1921,  2125,  1861,   116,
+    1919,  1864,   284,   149,   694,   282,   201,   228,   592,   129,
+     129,   254,  1446,   295,   516,   696,   246,   129,   184,   257,
+     186,   129,   129,   728,   822,    23,   257,   193,   194,   129,
+     257,   257,   700,   129,   116,   376,   377,   755,  1657,    37,
+     257,   382,   383,   384,   385,   258,   387,   388,   716,    15,
+     391,  2313,   393,   394,   395,   396,  1916,  1005,   399,  1615,
+    1616,   402,     8,   404,   976,     3,  1918,   257,   409,  1305,
+    1818,   412,   257,   414,   578,   416,  1831,    15,   116,   420,
+     421,   422,   423,  1831,   588,   589,   590,   591,   429,  1837,
+     431,   432,  1189,   434,  1831,  1093,  1867,   257,   191,   440,
+     441,  1438,  1831,  1178,  1831,  1831,   447,   448,   641,  1345,
+     815,   452,   645,  1190,  1831,     8,  1818,     8,   459,   652,
+    1831,   462,  1459,   641,   657,   803,   844,   645,   420,  1831,
+     257,  1994,   492,   474,   652,  1837,   477,  1378,  1379,  1380,
+     257,     3,   483,   484,   485,   486,  1304,   488,   489,   651,
+      15,  1005,   654,    92,   495,   496,   497,   498,   499,   183,
+     501,  1085,  1110,   504,    26,   506,   507,   191,  1110,   510,
+     116,   989,   513,   991,   678,   257,   517,   232,   233,   847,
+     998,   257,  1418,   238,   208,     8,   148,   547,  1605,  1606,
+     858,     8,  1495,     8,    64,   288,    21,   701,   128,   922,
+    2546,  2547,     8,    20,   191,   546,   299,   875,  2504,   129,
+     149,  2074,  2418,   573,  2139,  2140,     8,  2136,   180,   257,
+     580,   208,     8,   564,     8,   116,  1857,   157,     8,   149,
+       8,   572,  2494,   923,   575,   576,   577,   578,    23,   569,
+     570,   407,   583,   584,   912,    37,   587,   588,   589,   590,
+     591,   581,    37,  2017,   595,   596,  1110,  2028,   926,   129,
+    2118,  2036,   201,     8,     5,  2118,     8,     7,     9,     8,
+     803,     8,     8,   763,     8,  2127,     8,   773,     8,   149,
+     970,    47,  1528,  2413,  1530,   803,  1532,   217,  1534,  2551,
+       8,     8,     8,   116,   798,   282,    37,  2160,   285,   116,
+     802,   116,   804,  2509,   129,    37,  1528,    37,  1530,   669,
+    1532,   257,  1534,     8,   992,   993,   994,   995,   996,     8,
+     661,   662,   663,   664,   665,   666,   667,   687,     8,   670,
+     116,  1910,   116,   357,   358,   244,  1915,   678,   116,   843,
+    1158,     3,   846,    23,   129,   511,  1014,   880,   881,     5,
+    2563,  1019,  1042,     9,  1910,   696,    18,    37,   699,   128,
+     701,   894,  1052,   129,  2577,     8,   257,  2286,    16,    17,
+    1318,   116,  1561,    21,   116,  1561,  1318,   116,    21,   116,
+     116,    37,   116,   724,     3,  1460,  1461,   747,   157,  1536,
+    1537,  1538,  1060,  1540,  1541,     5,    15,  1444,   116,   116,
+       3,  2601,  2602,     3,   764,    15,    15,    84,   749,    84,
+     751,   177,    15,   754,  2614,    15,     5,  1653,   778,  1660,
+    1661,  1662,   331,     8,     3,   785,   767,    16,    17,     8,
+    1378,  1379,  1380,    22,   257,    24,   777,   346,   347,   348,
+     257,    43,   257,     3,    33,   786,    35,   788,    37,     5,
+       7,     7,   793,     8,   795,    15,  1692,   798,    15,   992,
+     993,   994,   995,   996,  1318,    67,  1320,  1000,  1001,     8,
+     811,   257,     8,   257,   992,   993,   994,   995,   996,   257,
+      82,   822,    21,     7,     8,    87,    88,   828,     3,     8,
+       8,   851,    94,  1439,  1027,  1441,     8,    22,  2389,    24,
+      15,    63,   843,    21,   191,   846,    68,   194,    33,    21,
+      35,   852,   257,  2376,   191,   257,   191,  1050,   257,     8,
+     257,   257,   882,   257,  1378,  1379,  1380,   887,    90,    91,
+       8,   208,    21,   208,    18,     8,   896,   897,   898,   257,
+     257,   901,    26,    21,     8,   886,  2125,  1365,  1366,  1367,
+    1368,  1369,     5,     8,     8,  1088,     9,    21,     5,  1277,
+       8,   902,   903,    16,    17,  2428,    21,  2338,    15,     7,
+     159,    95,  1818,   162,   904,    15,     8,   918,    16,    17,
+       8,   941,   144,    15,    37,  1831,     7,     8,   265,   919,
+     265,  1837,   154,    21,     8,  1841,  1818,   354,     8,   940,
+     124,     3,   359,     8,   129,   282,     8,   282,   285,  1831,
+     285,    21,   289,   290,   289,  1837,    21,  1285,     8,  1841,
+     257,   298,   299,     8,   299,   262,   228,   304,   683,   304,
+    1427,    21,  1429,   158,   159,  1303,   161,   162,   200,     8,
+    2411,     8,     8,  1905,  1906,  1907,  1908,  1909,   862,   863,
+      22,   865,    24,  2284,    21,    21,  2410,   259,   247,     8,
+       8,    33,  1352,    35,  1024,     8,  1354,   192,  1358,     7,
+       8,   195,    21,    21,  1860,   147,   148,     8,   202,     8,
+       7,     8,  1023,  1872,  1893,    41,  1872,     8,  1029,  1870,
+    1871,  1766,    21,  1740,  1035,     8,    89,  1878,  1879,     8,
+      21,   303,     8,  1939,     8,  1863,     7,  1048,   180,   234,
+    1398,     8,  1660,  1661,  1662,    71,   305,   306,   307,  1955,
+      15,  2155,   247,  1411,    21,  1961,     8,  1963,     7,   122,
+       8,  2502,  1073,  1093,  1424,   352,   353,  1078,    15,    21,
+    1652,  1101,   149,    21,   316,   317,  2500,  1905,  1906,  1907,
+    1908,  1909,     8,  1094,   920,   339,  1437,    44,   342,   343,
+     344,    15,   155,     8,  1432,    21,  1955,     8,  1109,  1955,
+       5,   355,   356,    15,     9,  1961,    21,    16,    17,   135,
+      21,    16,    17,     8,     8,  1145,   158,   159,    23,   161,
+     162,  1866,   185,  1868,  1470,    15,    21,    21,     8,   191,
+      87,    15,    37,   149,  1308,   860,  1660,  1661,  1662,   864,
+       8,    21,    15,   169,   869,    15,   208,   872,   873,    15,
+     192,     8,     8,    21,    15,   218,     5,    15,  1188,    37,
+       9,     8,   119,    15,    21,   191,    15,    16,    17,    15,
+    1373,  1517,   314,   315,    21,    15,   318,   319,    27,    15,
+       8,     8,   208,   209,  1020,     8,   143,    36,   145,   252,
+    1615,  1616,   234,    21,    21,   221,     8,   223,   224,  1559,
+     226,  1231,     5,   229,     7,   247,   931,    10,   933,    21,
+      15,    14,    15,    16,    17,    64,  1246,  1247,  1248,     8,
+     282,   178,    63,   285,    27,     8,   183,    68,   290,    15,
+     187,    34,    21,    36,   191,     8,   298,   194,    21,     8,
+      15,   410,  1272,    92,     8,   349,   350,     8,    21,    90,
+      91,     8,    21,     5,   248,   249,   282,    21,    10,   216,
+      21,    64,    14,    15,    16,    17,    15,  1278,  1279,  1780,
+      15,  1782,  1783,   230,  1477,    27,    15,     8,    15,   236,
+     129,    15,    34,  1794,    36,    15,     8,  1647,    15,    92,
+      21,  1302,  2396,  1804,   320,  1806,   322,  1308,     5,    21,
+     149,  1312,     9,   144,    15,     8,     8,     8,  1656,    16,
+      17,  1671,    64,   154,    21,     8,    23,  1520,    21,    21,
+      21,  1000,  1001,  1683,    15,  2332,   129,  1687,    21,     8,
+      37,  1669,     8,  1536,  1537,  1538,     8,  1540,  1541,   124,
+      92,  1544,    21,  1937,     8,    21,   149,     8,    15,    21,
+      15,  1702,   201,   522,     8,   524,    15,    21,  1561,   200,
+      21,    44,   531,   532,   533,     8,     8,    21,   537,   538,
+     539,   540,  1383,   542,   543,  2281,  2232,   129,    21,    21,
+       5,     8,     8,    15,     9,  2141,  2142,  2143,     8,     7,
+     231,    16,    17,  1731,    21,    21,     8,   149,   201,  2258,
+    2306,    21,  2258,   244,    87,    15,     8,     8,     8,    21,
+      93,     8,    37,   239,   166,  1426,  1427,    15,  1429,    21,
+      21,    21,  2597,  2598,    21,     8,  1437,    15,  1439,     8,
+    1441,  2476,  2477,  1444,   124,     5,   119,     3,    21,     9,
+      10,   252,    21,    15,    14,    15,    16,    17,   246,   201,
+    1286,   870,   871,  1656,  1657,   246,  1944,    27,     8,     8,
+     143,    15,   145,  1493,    34,  1476,    36,    26,  1656,    21,
+       8,    21,    21,     8,  1485,  1200,  1660,  1661,  1662,     8,
+    1491,  1206,  1512,    21,  1514,  1210,    21,  1212,  1213,  1214,
+    1501,  1216,    21,  1218,    64,   178,     8,     8,    15,     8,
+     183,     7,   240,     8,   187,     8,     8,  1518,   191,  1539,
+      21,   194,    21,  1716,  1717,  1718,    21,    15,    21,     5,
+      15,     8,    92,  1553,    10,    15,     8,     8,    14,    15,
+      16,    17,     8,   216,    21,    15,     8,  2544,  1549,  1569,
+      21,    27,    15,   149,  1574,    21,     5,   230,    34,    21,
+      36,    10,  1582,   236,     8,    14,    15,    16,    17,   129,
+    1590,   175,    15,    16,    17,     8,    15,    21,    27,     8,
+    1600,     8,  1602,     8,    27,    34,     8,    36,    64,   149,
+       8,    40,    21,    36,  1595,    15,    21,     8,     8,  2334,
+       8,     8,     5,    21,     8,    26,     9,     7,  1956,    15,
+      21,    21,    62,    16,    17,    64,    92,    21,     8,    22,
+      23,    64,    25,  1959,  1625,    28,    29,    30,    31,    32,
+      15,    21,    35,    15,    37,    38,     8,  1638,     8,     8,
+      21,   201,     8,    92,     8,     8,  2230,   287,    15,    92,
+       8,    21,    21,   129,   455,    21,  1657,   816,    21,  1660,
+    1661,  1662,     8,    21,     8,     8,   213,  1860,  1861,  1670,
+       8,  1864,     8,   149,  2028,  2410,     8,  2412,  2413,  1872,
+     129,    15,     5,    21,     7,    21,   129,    10,     8,   490,
+     166,    14,    15,    16,    17,     9,    64,  1412,     5,   500,
+     149,  1702,     9,   129,    27,     8,   149,     9,     5,    16,
+      17,    34,     9,    36,    21,    21,    23,     8,    21,    16,
+      17,  1722,     8,     8,     8,   201,    23,     8,    25,    37,
+      37,    28,    29,    30,    31,    32,    21,    21,  2473,  1740,
+      37,    64,    15,   204,   205,   206,   207,   208,    67,    15,
+      15,    15,   201,   554,   555,   556,   557,   558,   201,  2206,
+      15,    15,  1955,    15,  2499,  2500,  2116,     5,  1961,    92,
+      15,     9,  1487,  1774,  1775,     8,  2126,     8,    16,    17,
+      26,   129,     7,    15,    22,    23,     7,    25,    18,    37,
+      28,    29,    30,    31,    32,    21,     7,     5,  1799,    37,
+      15,  1994,    21,    21,    26,     7,   129,    15,    16,    17,
+       8,    15,   613,   614,   615,    15,   617,    26,  2553,    27,
+       8,     8,    21,   624,     5,    21,   149,     5,    36,    10,
+      15,     9,    15,    14,    15,    16,    17,   638,    16,    17,
+      15,    15,  1862,    21,    15,    23,    27,    15,     8,    21,
+    1851,    21,     8,    34,    15,    36,    64,  1877,     5,    37,
+      15,  1881,  2323,  2324,    15,    15,    16,    17,    62,    21,
+       8,     7,    15,     8,     8,     8,     8,    27,   201,   680,
+     255,  2074,     7,    64,    92,    15,    36,   437,   166,    15,
+     239,    15,    21,    16,   695,    15,    15,   208,   191,    21,
+       8,     7,  1061,    15,    15,    15,   315,   331,    15,    59,
+      63,    92,    15,  1072,    64,    68,   466,  1918,  1919,  1920,
+    1921,   129,   723,   473,    15,    15,    15,   332,    15,   730,
+    1931,   481,    15,    15,    15,   736,   737,    90,    91,    15,
+      15,   149,    92,    15,    15,    15,    15,    15,   129,    15,
+       7,     5,  2410,  2411,  1974,  2303,    10,  1958,   246,   246,
+      14,    15,    16,    17,   246,     5,   246,  2160,   149,   246,
+       8,   124,    15,    27,     5,    21,  1996,    21,    15,    10,
+      34,   782,    36,    14,    15,    16,    17,     8,     7,    21,
+       8,   144,    21,   201,    21,    15,    27,    21,    26,   149,
+      15,   154,     8,    34,   173,    36,  1165,    15,    15,     8,
+      64,  2012,   255,     7,    15,  2016,    21,  2018,    15,   208,
+     201,    71,  2042,    18,     8,    15,    15,  2028,    15,    15,
+      15,  2051,    15,    64,  2035,  2036,   149,    15,    92,  2232,
+    1199,    21,    21,   593,    21,    21,  1205,   200,    21,  2069,
+    1209,   201,  1211,    21,   855,   856,  1215,     5,  1217,    15,
+      15,    92,    10,    21,    21,  2258,    14,    15,    16,    17,
+       8,    15,     5,    15,     9,   129,     7,    20,     8,    27,
+     233,    21,    21,     8,    21,    26,    34,    21,    36,    21,
+       5,   244,    15,    21,     9,   149,    15,    26,   129,    26,
+      15,    16,    17,    21,    26,    21,     7,   657,    21,    21,
+      15,     8,    27,   254,    21,    26,    64,    15,   149,    21,
+      15,    36,     8,   132,     7,    21,  2127,     7,    21,    37,
+      21,    15,     7,    15,     7,  2136,    21,  2138,  2139,  2140,
+    2141,  2142,  2143,    21,    92,    15,   255,   201,  2168,    64,
+     951,   952,   953,   954,   955,   956,   957,   958,   959,   960,
+     961,   962,   963,   964,   965,   966,   967,   968,   969,    15,
+     201,    15,    15,    15,    15,   976,    15,    92,    15,    15,
+     981,   129,  2375,  2376,    15,     7,    21,   988,     8,   990,
+      15,     8,     8,     7,    21,     8,     7,     5,     8,   749,
+      92,   149,    21,    15,  1005,  2206,  2207,    15,    16,    17,
+       7,     7,    15,    78,   129,    21,   330,   767,     8,    27,
+      21,     7,   353,     7,   352,    17,    21,    15,    36,  2249,
+    1031,   781,    15,    15,   149,  2428,  1037,    15,    17,   789,
+     790,    21,     8,    15,   794,     7,     7,    15,  2268,     7,
+     903,   166,  1053,   201,   128,  1279,    64,   223,  1890,   911,
+    2014,  1600,  1192,  1097,   586,  2281,  1604,  1891,   594,   597,
+    1310,  1634,   822,   714,  2286,  1434,   940,  2138,  1918,   940,
+     830,  1910,  1501,  2118,    92,  2286,   201,  1741,  1161,  2188,
+       7,  2484,  2012,    10,  1485,  2207,  1033,    14,    15,    16,
+      17,  1053,  1421,  1400,  1095,  1713,    75,  2603,  1715,   859,
+      27,   861,  1939,  1961,   715,  1444,  1407,    34,   466,    36,
+    1042,   129,  2323,  2324,  1483,  1653,   247,   247,   796,  1656,
+     880,   881,  2333,   247,  1005,  1078,   661,  1138,   247,  1109,
+    1181,   149,   842,   664,   894,   895,   663,    64,   666,   665,
+    2333,  1423,  1425,  2167,  2551,  1156,  2016,  2396,   811,  1048,
+    1023,  1021,  2523,  1094,  1523,  1958,  2456,  1526,  1035,   792,
+    1529,   445,  1531,  1998,  1533,    92,  1535,  2409,  1179,  1180,
+    1181,  2553,    45,    46,  2579,    48,    49,  2599,  2341,  1499,
+      53,  2601,  1766,   201,   670,  1461,  2019,   385,    61,  2400,
+     765,  1963,   507,    66,  2424,   418,    69,  1553,  2023,  2410,
+    2411,  2313,   129,  2433,    77,  1818,    79,  1837,    81,  1841,
+    2440,  1793,  2442,  1798,   974,   975,  2364,  1831,  2049,  2048,
+    1238,  1231,   149,  2069,  2382,  1851,   884,  1549,  1569,  2232,
+    1574,   104,     5,  1582,  2445,  1590,     9,    10,  1249,   166,
+    1000,  1001,   115,    16,    17,  2268,  2476,  2477,    -1,    22,
+      23,    24,    25,    26,    -1,    28,    29,    30,    31,    32,
+      33,    -1,    35,    -1,    37,    38,   139,  1027,    45,    46,
+      -1,    48,    49,    -1,   201,    -1,    53,    -1,    -1,   152,
+      -1,    -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    66,
+    1050,    -1,    69,    -1,  1305,    -1,    -1,   170,    -1,    -1,
+      77,    -1,    79,   176,    81,    -1,  1317,    -1,    -1,    -1,
+      -1,   184,  2523,   186,  2525,   188,    -1,   190,    -1,    -1,
+      -1,    -1,    -1,    -1,   197,    -1,    -1,   104,  1088,    -1,
+      -1,    -1,    -1,    -1,  1345,    -1,    -1,    -1,   115,    -1,
+      -1,   214,   215,    -1,    -1,    -1,  1357,    -1,    -1,    -1,
+      -1,  2581,    -1,    -1,    -1,    -1,  2586,    -1,    -1,   232,
+      -1,    -1,   139,    -1,    -1,    -1,   239,    -1,    -1,  2599,
+      -1,  2601,  2602,    -1,    -1,   152,    -1,    -1,    -1,    -1,
+     253,    -1,    -1,   256,  2614,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,   170,    -1,  1406,  1407,    -1,    -1,   176,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   184,    -1,   186,
+    1421,   188,    -1,   190,    -1,    -1,    -1,  1428,  1178,    -1,
+     197,  1790,    -1,    -1,    -1,    -1,  1795,  1438,    -1,    -1,
+      -1,    -1,    -1,  1444,    -1,  1446,    -1,   214,   215,  1808,
+      -1,    -1,    -1,     7,    -1,    -1,    10,    -1,  1459,    -1,
+      14,    15,    16,    17,    -1,   232,    -1,    -1,    -1,    -1,
+      -1,  1830,  1473,    27,    -1,    -1,    -1,  1836,    -1,    -1,
+      34,  1840,    36,  1484,     7,    -1,   253,    10,    -1,   256,
+      -1,    14,    15,    16,    17,    -1,  1497,    -1,    -1,     7,
+      -1,  1502,    10,  1504,    27,    -1,    14,    15,    16,    17,
+      64,    34,    -1,    36,    -1,    -1,    -1,    -1,    -1,    27,
+      -1,    -1,     7,    -1,    78,    10,    34,    -1,    36,    14,
+      15,    16,    17,    -1,    -1,    -1,    -1,     7,    92,    -1,
+      10,    64,    27,    -1,    14,    15,    16,    17,    -1,    34,
+      -1,    36,    -1,    -1,    -1,    -1,    64,    27,    -1,  1309,
+      -1,    -1,    -1,    -1,    34,    -1,    36,    -1,    -1,    92,
+      -1,    -1,    -1,     7,    -1,   129,    10,    -1,    -1,    64,
+      14,    15,    16,    17,    92,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     5,    27,    64,   149,     9,    -1,    -1,    -1,
+      34,    -1,    36,    16,    17,    -1,   129,    92,    -1,  1610,
+      23,    -1,    25,    -1,    -1,    28,    29,    30,    31,    32,
+      -1,   129,    92,  1373,    37,    -1,   149,    -1,    -1,    -1,
+      64,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,   149,    -1,    -1,   129,    -1,    -1,   201,    -1,    -1,
+    1651,  1652,  1653,    -1,    -1,    -1,    -1,    -1,    92,   129,
+      -1,    -1,    -1,    -1,   149,    -1,  2025,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   201,   149,
+    2039,  1682,    -1,    -1,  1685,  2044,    -1,    -1,  2047,  1439,
+      -1,  1441,  1693,   201,    -1,   129,    -1,    -1,  2057,    -1,
+    2059,    -1,  2061,    -1,  2063,    -1,    -1,    -1,    -1,    -1,
+    1460,  1461,    -1,    -1,    -1,   149,   201,    -1,    -1,    -1,
+      -1,  1471,    -1,    -1,  1725,    -1,  1727,  1477,    -1,  1479,
+      -1,   201,  1482,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  1494,    -1,    -1,    -1,  1498,  1499,
+      -1,     7,    -1,    -1,    10,    -1,    -1,    -1,    14,    15,
+      16,    17,    -1,    -1,    -1,    -1,    -1,   201,    -1,    -1,
+    1520,    27,    -1,    -1,    -1,    -1,    -1,  1527,    34,    -1,
+      36,    -1,    -1,    -1,    -1,    -1,  1536,  1537,  1538,    -1,
+    1540,  1541,    10,    -1,  1544,    -1,    14,    15,    16,    17,
+      10,    -1,    -1,    -1,    14,    15,    16,    17,    64,    27,
+      -1,  1561,    -1,    -1,    -1,    -1,    34,    27,    36,    -1,
+      -1,    -1,    -1,    -1,    34,    -1,    36,    -1,    -1,    -1,
+      -1,    -1,    -1,     5,    -1,     7,    92,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    16,    17,    64,    -1,    -1,    21,
+      22,    23,    24,    25,    64,    -1,    28,    29,    30,    31,
       32,    33,    -1,    35,    -1,    37,    38,    -1,    -1,    -1,
-    1195,  1196,    -1,    -1,     5,    -1,    -1,  2017,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    16,    17,    -1,  2028,    -1,
-      21,    22,    23,    24,    25,    -1,    -1,    28,    29,    30,
-      31,    32,    33,    -1,    35,    -1,    37,    38,    -1,  2049,
-      -1,    -1,    -1,     5,    -1,     7,    -1,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    -1,
-      22,    23,    24,    25,  2074,  2075,    28,    29,    30,    31,
-      32,    33,  1020,    35,    -1,    37,    38,     5,    -1,     7,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,
-      -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
-      28,    29,    30,    31,    32,    33,    -1,    35,    -1,    37,
-      38,    -1,    -1,    -1,    -1,    -1,    -1,  2127,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1321,  1322,  1323,  1324,
-    1325,  1326,  1327,  1328,  1329,  1330,  1331,  1332,  1333,  1334,
-    1335,  1336,  1337,  1338,  1339,    -1,    -1,  2157,    -1,    -1,
-    2160,    -1,  2162,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    1355,    -1,    -1,    -1,    -1,    -1,     5,  1362,    -1,  1364,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,  1374,
-      -1,    -1,    21,    22,    23,    24,    25,    -1,    -1,    28,
-      29,    30,    31,    32,    33,    -1,    35,    -1,    37,    38,
-       5,    -1,    -1,    -1,     9,    10,    -1,    -1,    -1,    -1,
-    1405,    16,    17,    -1,    -1,    -1,    21,    22,    23,    24,
-      25,    -1,  2232,    28,    29,    30,    31,    32,    33,    -1,
-      35,    -1,    37,    38,     5,    -1,    -1,    -1,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    16,    17,    -1,  2258,    -1,
-      21,    22,    23,    24,    25,    -1,    -1,    28,    29,    30,
-      31,    32,    33,    -1,    35,    -1,    37,    38,    -1,    -1,
-      -1,     5,    -1,    -1,    -1,     9,    10,    -1,    -1,  1474,
-      -1,    -1,    16,    17,    -1,    -1,    -1,    21,    22,    23,
-      24,    25,    -1,  1488,    28,    29,    30,    31,    32,    33,
-      -1,    35,    -1,    37,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1509,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  1873,   129,    92,  1625,    -1,    -1,    -1,  1880,
+      -1,    -1,    92,  1884,  1885,    -1,    -1,    -1,    -1,    -1,
+      -1,  1892,    -1,   149,    -1,    -1,    -1,     5,    -1,    -1,
+      -1,     9,    10,    -1,    -1,    -1,    -1,  1657,    16,    17,
+      -1,   129,    -1,    -1,    22,    23,    24,    25,    -1,   129,
+      28,    29,    30,    31,    32,    33,    34,    35,    -1,    37,
+      38,   149,  1933,    -1,    -1,    -1,    -1,    -1,  1939,   149,
+      -1,    -1,    -1,    -1,    -1,   201,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  1964,    -1,    -1,  1716,  1717,  1718,    -1,
+      -1,    -1,  1973,    -1,    -1,     5,    -1,     7,    -1,     9,
+      10,    -1,    -1,   201,    -1,    -1,    16,    17,    -1,  1990,
+    1991,   201,    22,    23,    24,    25,    -1,    -1,    28,    29,
+      30,    31,    32,    33,    -1,    35,    -1,    37,    38,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  1766,    -1,  2019,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2027,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2037,    -1,     5,    -1,
+      -1,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
+      17,    -1,  2053,    -1,  2055,    22,    23,    24,    25,    -1,
+      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
+      37,    38,     5,    -1,    -1,     8,     9,    10,    -1,    -1,
+      -1,   625,    -1,    16,    17,    -1,    -1,    -1,    -1,    22,
+      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
+      33,    -1,    35,    -1,    37,    38,    -1,    -1,    -1,    -1,
+    1860,  1861,    -1,    -1,  1864,     5,  1866,  1867,  1868,     9,
+    1870,  1871,  1872,    -1,    -1,    -1,    16,    17,  1878,  1879,
+      -1,    -1,    22,    23,    24,    25,    -1,    -1,    28,    29,
+      30,    31,    32,    33,    -1,    35,    -1,    37,    38,  2150,
+      -1,    -1,    -1,    -1,  2155,  1905,  1906,  1907,  1908,  1909,
+      -1,    -1,    -1,    -1,     5,  2166,  2167,     8,     9,    10,
+    2171,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,
+    2181,    22,    23,    24,    25,    -1,  2187,    28,    29,    30,
+      31,    32,    33,    -1,    35,     5,    37,    38,     8,     9,
+      10,    -1,    -1,    -1,    -1,  1955,    16,    17,    -1,    -1,
+      -1,  1961,    22,    23,    24,    25,    -1,    -1,    28,    29,
+      30,    31,    32,    33,    -1,    35,    -1,    37,    38,    -1,
+    2231,   775,    -1,    -1,    -1,   779,    -1,    -1,     5,    -1,
+      -1,    -1,     9,    10,  1994,  1995,    -1,    -1,    -1,    16,
+      17,    -1,    -1,    -1,    21,    22,    23,    24,    25,  2260,
+      -1,    28,    29,    30,    31,    32,    33,  2017,    35,    -1,
+      37,    38,    -1,    -1,  2275,    -1,    -1,    -1,  2028,    -1,
+    2281,    -1,   826,    -1,    -1,     5,    -1,    -1,    -1,     9,
+      10,    -1,    -1,    -1,   838,    -1,    16,    17,    -1,  2049,
+      -1,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
+      30,    31,    32,    33,    -1,    35,  2317,    37,    38,    -1,
+      -1,    -1,    -1,    -1,  2074,  2075,    -1,    -1,    -1,    -1,
+      -1,  2332,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,   888,   889,   890,   891,     5,   893,
+       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
+      17,    -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,
+      -1,    28,    29,    30,    31,    32,    33,  2127,    35,    -1,
+      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2395,  2396,    -1,    -1,  2399,    -1,
+    2401,   945,    -1,   947,   948,   949,   950,  2157,    -1,    -1,
+    2160,    -1,  2162,    -1,    -1,  2416,  2417,    -1,  2419,    -1,
+       5,    -1,     7,    -1,     9,    10,    -1,    -1,  2429,    -1,
+      -1,    16,    17,    -1,    -1,    -1,  2437,    22,    23,    24,
+      25,    -1,    -1,    28,    29,    30,    31,    32,    33,    -1,
+      35,    -1,    37,    38,    -1,  2456,    -1,    -1,    -1,    -1,
+      -1,    -1,  1006,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2232,  2484,  1028,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2493,  2494,  1038,    -1,    -1,    -1,    -1,    -1,
+       5,    -1,    -1,  2504,     9,    10,  2507,    -1,  2258,    -1,
+    2511,    16,    17,    -1,    -1,  1059,    21,    22,    23,    24,
+      25,    -1,    -1,    28,    29,    30,    31,    32,    33,    -1,
+      35,  1075,    37,    38,    -1,  1079,  1080,    -1,    -1,    -1,
+      -1,    -1,    -1,  2544,    -1,    -1,    -1,    -1,    -1,    -1,
+    2551,    -1,    -1,    -1,  2555,    -1,    -1,    -1,  2559,    -1,
+      -1,    -1,  2563,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2577,  2578,  2579,    -1,
       -1,    -1,    -1,    -1,  2334,     5,    -1,    -1,  2338,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    16,    17,  1286,    -1,
+      10,    -1,    -1,  1137,    -1,    -1,    16,    17,    -1,    -1,
       -1,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
       30,    31,    32,    33,    -1,    35,     5,    37,    38,    -1,
-       9,    10,    -1,  1558,    -1,  2375,  2376,    16,    17,    -1,
+       9,    10,    -1,    -1,    -1,  2375,  2376,    16,    17,    -1,
       -1,    -1,    21,    22,    23,    24,    25,    -1,    -1,    28,
       29,    30,    31,    32,    33,    -1,    35,    -1,    37,    38,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2409,
-    2410,  2411,  2412,    -1,     5,    -1,    -1,  2417,     9,    10,
-      -1,    -1,    -1,    -1,  1609,    16,    17,  2427,    -1,    -1,
-      21,    22,    23,    24,    25,    -1,    -1,    28,    29,    30,
-      31,    32,    33,    -1,    35,    -1,    37,    38,    -1,     5,
-      -1,    -1,    -1,     9,    10,    -1,    -1,  1642,    -1,    -1,
-      16,    17,    -1,    -1,  1649,    21,    22,    23,    24,    25,
-    1655,  2471,    28,    29,    30,    31,    32,    33,    -1,    35,
-      -1,    37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1678,    -1,    -1,  2496,  2497,    -1,  2499,
-      -1,    -1,    -1,    -1,    -1,  1690,  2506,    -1,    -1,    -1,
-       5,    -1,     7,  1698,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    16,    17,  1708,    -1,    -1,  1711,    22,    23,    24,
-      25,    -1,    -1,    28,    29,    30,    31,    32,    33,    -1,
-      35,  1726,    37,    38,    -1,    -1,    -1,    -1,    -1,  2549,
-      -1,    -1,    -1,  1738,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,  1752,    -1,    -1,
-      -1,    -1,    -1,  1758,    -1,    14,    15,    16,    17,  1764,
+      -1,  1195,  1196,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2410,  2411,  2412,  2413,    -1,     5,    -1,    -1,  2418,     9,
+      10,    -1,    -1,    -1,    -1,    -1,    16,    17,  2428,    -1,
+      -1,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
+      30,    31,    32,    33,    -1,    35,    -1,    37,    38,    -1,
+      -1,     5,    -1,    -1,    -1,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    16,    17,    -1,    -1,    -1,    21,    22,    23,
+      24,    25,    -1,  2473,    28,    29,    30,    31,    32,    33,
+      -1,    35,    -1,    37,    38,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,     5,    -1,     7,    -1,     9,    10,  2499,
+    2500,    -1,  2502,    -1,    16,    17,    -1,    -1,    -1,  2509,
+      22,    23,    24,    25,    -1,    -1,    28,    29,    30,    31,
+      32,    33,    -1,    35,    -1,    37,    38,  1321,  1322,  1323,
+    1324,  1325,  1326,  1327,  1328,  1329,  1330,  1331,  1332,  1333,
+    1334,  1335,  1336,  1337,  1338,  1339,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,  2553,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1355,    -1,    -1,    -1,    -1,    -1,     5,  1362,    -1,
+    1364,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,
+    1374,    -1,    -1,    21,    22,    23,    24,    25,    -1,    -1,
+      28,    29,    30,    31,    32,    33,    -1,    35,    -1,    37,
+      38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,  1405,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    14,    15,    16,    17,    -1,
       19,    -1,    21,    -1,    23,    24,    -1,    26,    -1,    -1,
       -1,    30,    -1,    32,    33,    -1,    -1,    36,    37,    38,
       -1,    40,    -1,    42,    43,    -1,    -1,    46,    -1,    -1,
       -1,    -1,    51,    52,    53,    54,    55,    56,    57,    58,
       -1,    60,    61,    -1,    -1,    64,    65,    66,    -1,    68,
-      -1,    70,    -1,    -1,    73,    74,    -1,    -1,    -1,    -1,
-      -1,    -1,    81,    82,    -1,    -1,    85,    -1,    -1,    -1,
+    1474,    70,    -1,    -1,    73,    74,    -1,    -1,    -1,    -1,
+      -1,    -1,    81,    82,  1488,    -1,    85,    -1,    -1,    -1,
       -1,    -1,    -1,    92,    -1,    94,    -1,    96,    97,    -1,
-      -1,    -1,   101,   102,   103,    -1,    -1,   106,    -1,    -1,
+      -1,    -1,   101,   102,   103,  1509,    -1,   106,    -1,    -1,
      109,   110,    -1,   112,   113,   114,    -1,    -1,    -1,    -1,
      119,   120,    -1,    -1,   123,    -1,   125,   126,   127,    -1,
      129,   130,    -1,    -1,   133,    -1,   135,   136,   137,   138,
      139,   140,    -1,    -1,    -1,    -1,    -1,    -1,   147,   148,
-     149,  1896,    -1,    -1,    -1,   154,   155,   156,    -1,   158,
+     149,    -1,    -1,    -1,  1558,   154,   155,   156,    -1,   158,
      159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
      169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
      179,   180,   181,   182,   183,    -1,   185,    -1,   187,    -1,
-     189,    -1,   191,   192,    -1,  1940,   195,   196,   197,   198,
-     199,   200,   201,   202,    -1,    -1,    -1,     5,    -1,    -1,
-      -1,     9,    10,    -1,    -1,  1960,    -1,  1962,    16,    17,
-      -1,  1966,    -1,    21,    22,    23,    24,    25,    -1,    -1,
-      28,    29,    30,    31,    32,    33,    -1,    35,    -1,    37,
-      38,    -1,    -1,    -1,  1989,    -1,    -1,  1992,    -1,    -1,
-      -1,    -1,    -1,     5,    -1,     7,   255,     9,    10,   258,
-      -1,   260,    -1,    -1,    16,    17,    -1,    -1,    -1,  2014,
-      22,    23,    24,    25,    -1,    -1,    28,    29,    30,    31,
-      32,    33,    -1,    35,     5,    37,    38,    -1,     9,    10,
+     189,    -1,   191,   192,    -1,    -1,   195,   196,   197,   198,
+     199,   200,   201,   202,     5,  1609,    -1,    -1,     9,    10,
       -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,
       21,    22,    23,    24,    25,    -1,    -1,    28,    29,    30,
-      31,    32,    33,    -1,    35,    -1,    37,    38,    -1,     5,
-      -1,     7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
-      16,    17,    -1,    -1,    -1,    -1,    22,    23,    24,    25,
-      -1,    -1,    28,    29,    30,    31,    32,    33,  2093,    35,
-      -1,    37,    38,    -1,     5,    -1,     7,  2102,     9,    10,
-      -1,  2106,  2107,    -1,    -1,    16,    17,    -1,    -1,  2114,
-      -1,    22,    23,    24,    25,    -1,    -1,    28,    29,    30,
-      31,    32,    33,    -1,    35,     5,    37,    38,     8,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,
-    2145,    -1,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,    -1,    37,    38,  2164,
-      -1,     5,    -1,    -1,  2169,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    16,    17,  2179,  2180,    -1,    21,    22,    23,
-      24,    25,    -1,    -1,    28,    29,    30,    31,    32,    33,
-      -1,    35,    -1,    37,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     5,    -1,    -1,  2210,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    16,    17,  2220,  2221,    -1,    21,    22,
-      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
-      33,    -1,    35,     5,    37,    38,    -1,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    21,
-      22,    23,    24,    25,    -1,    -1,    28,    29,    30,    31,
-      32,    33,    -1,    35,    -1,    37,    38,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  2296,    -1,  2298,     5,    -1,    -1,     8,     9,    10,
-      -1,    -1,  2307,    -1,    -1,    16,    17,  2312,    -1,    -1,
-    2315,    22,    23,    24,    25,    -1,    -1,    28,    29,    30,
-      31,    32,    33,  2328,    35,    -1,    37,    38,    -1,     5,
-      -1,    -1,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
-      16,    17,    -1,   602,   603,    21,    22,    23,    24,    25,
-      -1,    -1,    28,    29,    30,    31,    32,    33,    -1,    35,
-      -1,    37,    38,    -1,    -1,     5,    -1,    -1,  2373,     9,
-      10,    -1,    -1,    -1,  2379,    -1,    16,    17,    -1,    -1,
-    2385,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,     5,    37,    38,  2404,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,
-      -1,    -1,    21,    22,    23,    24,    25,    -1,    -1,    28,
-      29,    30,    31,    32,    33,    -1,    35,    -1,    37,    38,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2447,    -1,  2449,    -1,    -1,    -1,  2453,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,  2464,
-    2465,    -1,    -1,    -1,  2469,     5,    -1,    -1,     8,     9,
-      10,    -1,    -1,    -1,  2479,    -1,    16,    17,  2483,    -1,
-      -1,    -1,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,    -1,    37,    38,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2515,    -1,    -1,    -1,    -1,  2520,    -1,  2522,    -1,    -1,
-      -1,     5,    -1,    -1,    -1,     9,    10,     6,    -1,  2534,
-      -1,  2536,    16,    17,    13,    -1,    -1,    21,    22,    23,
-      24,    25,    -1,    -1,    28,    29,    30,    31,    32,    33,
-      -1,    35,    -1,    37,    38,    -1,    -1,    -1,    -1,  2564,
-      -1,    -1,    -1,  2568,    43,    44,    45,    46,    -1,    48,
-      49,    50,    51,    52,    53,  2580,    -1,    56,    57,    -1,
-      -1,    -1,    61,    62,    63,    -1,    65,    66,    67,    68,
-      69,    70,    -1,    72,    73,    74,    75,    76,    77,    -1,
-      79,    80,    81,    82,    83,    84,    -1,    -1,    87,    88,
-      89,    90,    91,    -1,    -1,    94,    95,    96,    97,    98,
-      99,   100,   101,   102,   103,   104,   105,   106,   107,   108,
-     109,   110,   111,   112,   113,   114,   115,    -1,   117,    -1,
-     119,   120,    -1,   122,   123,   124,    -1,    -1,   127,    -1,
-      -1,   130,   131,    -1,   133,   134,   135,   136,    -1,   138,
-     139,   140,   141,   142,   143,   144,   145,   146,    -1,    -1,
-      -1,    -1,    -1,   152,   153,   154,   155,    -1,    -1,    -1,
-      -1,   160,    -1,    -1,   163,   164,    -1,    -1,   167,   168,
-      -1,   170,    -1,    -1,    -1,   174,    -1,   176,    -1,   178,
-      -1,    -1,    -1,   182,   183,   184,   185,   186,   187,   188,
-     189,   190,   191,    -1,   193,   194,   195,    -1,   197,    -1,
-     199,   200,    -1,   202,    -1,   204,   205,   206,   207,    -1,
-      -1,   210,   211,   212,    -1,   214,   215,   216,    -1,   218,
-     219,   220,    -1,   222,    -1,   224,   225,   226,   227,   228,
-      -1,   230,    -1,   232,   233,    -1,    -1,   236,   237,   238,
-      -1,    -1,   241,   242,    -1,   244,   245,    -1,   247,   248,
-      -1,    -1,    -1,   252,   253,    -1,    -1,   256,    -1,    -1,
-     259,    -1,    -1,    -1,   263,   264,    -1,    -1,   267,   268,
-     269,    -1,   271,   272,   273,   274,   275,   276,   277,   278,
-     279,   280,   281,    -1,   283,    -1,    -1,   286,    -1,    -1,
-      -1,   290,   291,   292,   293,   294,    -1,   296,   297,    -1,
-      -1,   300,   301,   302,   303,    -1,    -1,    -1,    -1,   308,
-     309,   310,   311,   312,   313,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   321,    -1,   323,    -1,   325,   326,   327,   328,
-     329,    -1,    -1,    -1,   333,   334,   335,   336,   337,   338,
-       5,   340,   341,     8,     9,    10,   345,    -1,    -1,    -1,
-      -1,    16,    17,    -1,    -1,    -1,    -1,    22,    23,    24,
-      25,    -1,    -1,    28,    29,    30,    31,    32,    33,    -1,
-      35,     5,    37,    38,     8,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    16,    17,    -1,    -1,    -1,    -1,    22,    23,
-      24,    25,    -1,    -1,    28,    29,    30,    31,    32,    33,
-      -1,    35,     5,    37,    38,    -1,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    21,    22,
-      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
-      33,    -1,    35,     5,    37,    38,     8,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    -1,
-      22,    23,    24,    25,    -1,    -1,    28,    29,    30,    31,
-      32,    33,    -1,    35,     5,    37,    38,    -1,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,
-      21,    22,    23,    24,    25,    -1,    -1,    28,    29,    30,
-      31,    32,    33,    -1,    35,     5,    37,    38,    -1,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,
-      -1,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,     5,    37,    38,     8,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,
-      -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,    28,
-      29,    30,    31,    32,    33,    -1,    35,     5,    37,    38,
-       8,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,
-      -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
+      31,    32,    33,    -1,    35,    -1,    37,    38,  1642,    -1,
+      -1,    -1,    -1,    -1,    -1,  1649,    -1,    -1,    -1,    -1,
+      -1,  1655,    -1,    -1,    -1,    -1,   255,    -1,    -1,   258,
+      -1,   260,    -1,    -1,    -1,     5,    -1,    -1,    -1,     9,
+      10,    -1,    -1,    -1,  1678,    -1,    16,    17,    -1,    -1,
+      -1,    21,    22,    23,    24,    25,  1690,    -1,    28,    29,
+      30,    31,    32,    33,  1698,    35,    -1,    37,    38,    -1,
+      -1,    -1,    -1,    -1,  1708,    -1,    -1,  1711,    -1,    -1,
+      -1,    -1,     5,    -1,    -1,    -1,     9,    10,    -1,    -1,
+      -1,    -1,  1726,    16,    17,    -1,    -1,    -1,    21,    22,
+      23,    24,    25,    -1,  1738,    28,    29,    30,    31,    32,
+      33,    -1,    35,    -1,    37,    38,    -1,     5,  1752,     7,
+      -1,     9,    10,    -1,  1758,    -1,    -1,    -1,    16,    17,
+    1764,    -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
       28,    29,    30,    31,    32,    33,    -1,    35,     5,    37,
       38,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
       17,    -1,    -1,    -1,    21,    22,    23,    24,    25,    -1,
-      -1,    28,    29,    30,    31,    32,    33,    -1,    35,     5,
-      37,    38,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,
-      16,    17,    -1,    -1,    -1,    21,    22,    23,    24,    25,
-      -1,    -1,    28,    29,    30,    31,    32,    33,    -1,    35,
-       5,    37,    38,     8,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    16,    17,    -1,    -1,    -1,    -1,    22,    23,    24,
-      25,    -1,    -1,    28,    29,    30,    31,    32,    33,    -1,
-      35,    -1,    37,    38,     5,    -1,     7,    -1,     9,    10,
+      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
+      37,    38,     5,    -1,     7,    -1,     9,    10,    -1,    -1,
+      -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    -1,    22,
+      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
+      33,    -1,    35,    -1,    37,    38,     5,    -1,     7,    -1,
+       9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,
+      -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,    28,
+      29,    30,    31,    32,    33,    -1,    35,     5,    37,    38,
+      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,
+      -1,    -1,  1896,    21,    22,    23,    24,    25,    -1,    -1,
+      28,    29,    30,    31,    32,    33,    -1,    35,    -1,    37,
+      38,    -1,    -1,    -1,     5,    -1,    -1,    -1,     9,    10,
       -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,
-      -1,    22,    23,    24,    25,    -1,    -1,    28,    29,    30,
-      31,    32,    33,    -1,    35,     5,    37,    38,    -1,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,
-      -1,    -1,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,    -1,    37,    38
+      21,    22,    23,    24,    25,    -1,  1940,    28,    29,    30,
+      31,    32,    33,    -1,    35,    -1,    37,    38,     5,    -1,
+      -1,    -1,     9,    10,    -1,    -1,  1960,    -1,  1962,    16,
+      17,    -1,  1966,    -1,    21,    22,    23,    24,    25,    -1,
+      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
+      37,    38,    -1,    -1,    -1,  1989,    -1,    -1,  1992,     5,
+      -1,    -1,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      16,    17,    -1,   602,   603,    -1,    22,    23,    24,    25,
+    2014,    -1,    28,    29,    30,    31,    32,    33,    -1,    35,
+       5,    37,    38,    -1,     9,    10,    -1,    -1,    -1,    -1,
+      -1,    16,    17,    -1,    -1,    -1,    21,    22,    23,    24,
+      25,    -1,    -1,    28,    29,    30,    31,    32,    33,    -1,
+      35,     5,    37,    38,    -1,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    16,    17,    -1,    -1,    -1,    21,    22,    23,
+      24,    25,    -1,    -1,    28,    29,    30,    31,    32,    33,
+      -1,    35,    -1,    37,    38,    -1,    -1,    -1,     5,  2093,
+      -1,    -1,     9,    10,    -1,    -1,    -1,    -1,  2102,    16,
+      17,    -1,  2106,  2107,    21,    22,    23,    24,    25,    -1,
+    2114,    28,    29,    30,    31,    32,    33,    -1,    35,     5,
+      37,    38,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
+      16,    17,    -1,    -1,    -1,    -1,    22,    23,    24,    25,
+      -1,  2145,    28,    29,    30,    31,    32,    33,    -1,    35,
+      -1,    37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+    2164,    -1,     5,    -1,    -1,  2169,     9,    10,    -1,    -1,
+      -1,    -1,    -1,    16,    17,  2179,  2180,    -1,    21,    22,
+      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
+      33,    -1,    35,    -1,    37,    38,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,  2210,     5,    -1,    -1,
+       8,     9,    10,    -1,    -1,    -1,  2220,  2221,    16,    17,
+      -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
+      28,    29,    30,    31,    32,    33,    -1,    35,     5,    37,
+      38,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
+      17,    -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,
+      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
+      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2296,    -1,  2298,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,     5,  2307,    -1,    -1,     9,    10,  2312,    -1,
+      -1,  2315,    -1,    16,    17,    -1,    -1,    -1,    21,    22,
+      23,    24,    25,    -1,  2328,    28,    29,    30,    31,    32,
+      33,    -1,    35,     5,    37,    38,     8,     9,    10,    -1,
+      -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    -1,
+      22,    23,    24,    25,    -1,    -1,    28,    29,    30,    31,
+      32,    33,    -1,    35,    -1,    37,    38,     5,    -1,  2373,
+      -1,     9,    10,    -1,    -1,  2379,    -1,    -1,    16,    17,
+      -1,    -1,  2386,    21,    22,    23,    24,    25,    -1,    -1,
+      28,    29,    30,    31,    32,    33,    -1,    35,     5,    37,
+      38,  2405,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
+      17,    -1,    -1,    -1,    21,    22,    23,    24,    25,    -1,
+      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
+      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,  2449,    -1,  2451,    -1,    -1,
+      -1,  2455,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,  2466,  2467,    -1,    -1,    -1,  2471,     5,    -1,
+      -1,     8,     9,    10,    -1,    -1,    -1,  2481,    -1,    16,
+      17,  2485,    -1,    -1,    -1,    22,    23,    24,    25,    -1,
+      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
+      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,  2518,    -1,    -1,    -1,    -1,    -1,
+    2524,    -1,  2526,    -1,    -1,    -1,     5,    -1,    -1,     8,
+       9,    10,     6,    -1,  2538,    -1,  2540,    16,    17,    13,
+      -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,    28,
+      29,    30,    31,    32,    33,    -1,    35,    -1,    37,    38,
+      -1,    -1,    -1,    -1,  2568,    -1,    -1,    -1,  2572,    43,
+      44,    45,    46,    -1,    48,    49,    50,    51,    52,    53,
+    2584,    -1,    56,    57,    -1,    -1,    -1,    61,    62,    63,
+      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
+      74,    75,    76,    77,    -1,    79,    80,    81,    82,    83,
+      84,    -1,    -1,    87,    88,    89,    90,    91,    -1,    -1,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
+     114,   115,    -1,   117,    -1,   119,   120,    -1,   122,   123,
+     124,    -1,    -1,   127,    -1,    -1,   130,   131,    -1,   133,
+     134,   135,   136,    -1,   138,   139,   140,   141,   142,   143,
+     144,   145,   146,    -1,    -1,    -1,    -1,    -1,   152,   153,
+     154,   155,    -1,    -1,    -1,    -1,   160,    -1,    -1,   163,
+     164,    -1,    -1,   167,   168,    -1,   170,    -1,    -1,    -1,
+     174,    -1,   176,    -1,   178,    -1,    -1,    -1,   182,   183,
+     184,   185,   186,   187,   188,   189,   190,   191,    -1,   193,
+     194,   195,    -1,   197,    -1,   199,   200,    -1,   202,    -1,
+     204,   205,   206,   207,    -1,    -1,   210,   211,   212,    -1,
+     214,   215,   216,    -1,   218,   219,   220,    -1,   222,    -1,
+     224,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
+      -1,    -1,   236,   237,   238,    -1,    -1,   241,   242,    -1,
+     244,   245,    -1,   247,   248,    -1,    -1,    -1,   252,   253,
+      -1,    -1,   256,    -1,    -1,   259,    -1,    -1,    -1,   263,
+     264,    -1,    -1,   267,   268,   269,    -1,   271,   272,   273,
+     274,   275,   276,   277,   278,   279,   280,   281,    -1,   283,
+      -1,    -1,   286,    -1,    -1,    -1,   290,   291,   292,   293,
+     294,    -1,   296,   297,    -1,    -1,   300,   301,   302,   303,
+      -1,    -1,    -1,    -1,   308,   309,   310,   311,   312,   313,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   321,    -1,   323,
+      -1,   325,   326,   327,   328,   329,    -1,    -1,    -1,   333,
+     334,   335,   336,   337,   338,     5,   340,   341,    -1,     9,
+      10,   345,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,
+      -1,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
+      30,    31,    32,    33,    -1,    35,     5,    37,    38,    -1,
+       9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,
+      -1,    -1,    21,    22,    23,    24,    25,    -1,    -1,    28,
+      29,    30,    31,    32,    33,    -1,    35,     5,    37,    38,
+       8,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,
+      -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
+      28,    29,    30,    31,    32,    33,    -1,    35,    -1,    37,
+      38,     5,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
+      -1,    -1,    16,    17,    -1,    -1,    -1,    -1,    22,    23,
+      24,    25,    -1,    -1,    28,    29,    30,    31,    32,    33,
+      -1,    35,     5,    37,    38,    -1,     9,    10,    -1,    -1,
+      -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    -1,    22,
+      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
+      33,    -1,    35,    -1,    37,    38
 };
 
   /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
      symbol of state STATE-NUM.  */
 static const yytype_uint16 yystos[] =
 {
-       0,   362,     0,     1,   150,   257,   363,   364,   116,     6,
+       0,   363,     0,     1,   150,   257,   364,   365,   116,     6,
       13,    43,    44,    45,    46,    48,    49,    50,    51,    52,
       53,    56,    57,    61,    62,    63,    65,    66,    67,    68,
       69,    70,    72,    73,    74,    75,    76,    77,    79,    80,
@@ -3318,385 +3262,385 @@ static const yytype_uint16 yystos[] =
      278,   279,   280,   281,   283,   286,   290,   291,   292,   293,
      294,   296,   297,   300,   301,   302,   303,   308,   309,   310,
      311,   312,   313,   321,   323,   325,   326,   327,   328,   329,
-     333,   334,   335,   336,   337,   338,   340,   341,   345,   365,
-     367,   370,   382,   383,   387,   388,   389,   395,   396,   397,
-     398,   400,   401,   403,   405,   406,   407,   408,   415,   416,
-     417,   418,   419,   420,   424,   425,   426,   430,   431,   469,
-     471,   484,   527,   528,   530,   531,   537,   538,   539,   540,
-     547,   548,   549,   550,   552,   555,   559,   560,   561,   562,
-     563,   564,   570,   571,   572,   583,   584,   585,   587,   590,
-     593,   598,   599,   601,   603,   605,   608,   609,   633,   634,
-     645,   646,   647,   648,   653,   656,   659,   662,   663,   713,
-     714,   715,   716,   717,   718,   719,   720,   726,   728,   730,
-     732,   734,   735,   736,   737,   738,   741,   743,   744,   745,
-     748,   749,   753,   754,   756,   757,   758,   759,   760,   761,
-     762,   765,   770,   775,   777,   778,   779,   780,   782,   783,
-     784,   785,   786,   787,   804,   807,   808,   809,   810,   816,
-     819,   824,   825,   826,   829,   830,   831,   832,   833,   834,
-     835,   836,   837,   838,   839,   840,   841,   842,   843,   848,
-     849,   850,   851,   852,   853,   863,   864,   865,   868,   872,
-     873,   874,   875,   876,   881,   901,    15,   494,   494,   556,
-     556,   556,   556,   556,   494,   556,   556,   366,   556,   556,
-     556,   494,   556,   494,   556,   556,   494,   556,   556,   556,
-     493,   556,   494,   556,   556,     7,    15,   495,    15,   494,
-     616,   556,   494,   379,   556,   556,   556,   556,   556,   556,
-     556,   556,   556,   556,   129,   372,   536,   536,   556,   556,
-     556,   494,   556,   372,   556,   494,   494,   556,   556,   493,
-     366,   494,   494,    64,   378,   556,   556,   494,   494,   556,
-     494,   494,   494,   494,   494,   556,   433,   556,   556,   556,
-     372,   470,   366,   494,   556,   556,   556,   494,   556,   494,
-     556,   556,   494,   556,   556,   556,   494,   366,   494,   379,
-     556,   556,   379,   556,   494,   556,   556,   556,   494,   556,
-     556,   494,   556,   494,   556,   556,   556,   556,   556,   556,
-      15,   494,   594,   494,   366,   494,   494,   556,   556,   556,
-      15,     8,   494,   494,   556,   556,   556,   494,   556,   556,
-     556,   556,   556,   556,   556,   556,   556,   556,   556,   556,
-     556,   556,   556,   556,   556,   556,   556,   556,   556,   556,
-     556,   556,   556,   556,   494,   556,   494,   556,   556,   556,
-     556,   494,   494,   556,   556,   556,   556,   556,   556,   556,
-     556,   907,   907,   907,   907,   907,   907,   257,   582,   124,
-     233,   403,    15,   375,   582,     8,     8,     8,     8,     7,
-       8,   124,   367,   390,     8,   372,   404,     8,     8,     8,
-       8,     8,   551,     8,   551,     8,     8,     8,     8,   551,
-     582,     7,   218,   252,   528,   530,   539,   540,   239,   548,
-     548,    10,    14,    15,    16,    17,    27,    34,    36,    64,
-      92,   149,   201,   372,   384,   500,   501,   503,   504,   505,
-     506,   512,   513,   514,   515,   516,   519,    15,   556,     5,
-       9,    15,    16,    17,   129,   502,   504,   512,   566,   580,
-     581,   556,    15,   566,   556,     5,   565,   566,   581,   566,
+     333,   334,   335,   336,   337,   338,   340,   341,   345,   366,
+     368,   371,   383,   384,   388,   389,   390,   396,   397,   398,
+     399,   401,   402,   404,   406,   407,   408,   409,   416,   417,
+     418,   419,   420,   421,   425,   426,   427,   431,   432,   470,
+     472,   485,   528,   529,   531,   532,   538,   539,   540,   541,
+     548,   549,   550,   551,   553,   556,   560,   561,   562,   563,
+     564,   565,   571,   572,   573,   584,   585,   586,   588,   591,
+     594,   599,   600,   602,   604,   606,   609,   610,   634,   635,
+     646,   647,   648,   649,   654,   657,   660,   663,   664,   714,
+     715,   716,   717,   718,   719,   720,   721,   727,   729,   731,
+     733,   735,   736,   737,   738,   739,   742,   744,   745,   746,
+     749,   750,   754,   755,   757,   758,   759,   760,   761,   762,
+     763,   766,   771,   776,   778,   779,   780,   781,   783,   784,
+     785,   786,   787,   788,   805,   808,   809,   810,   811,   817,
+     820,   825,   826,   827,   830,   831,   832,   833,   834,   835,
+     836,   837,   838,   839,   840,   841,   842,   843,   844,   849,
+     850,   851,   852,   853,   854,   864,   865,   866,   869,   873,
+     874,   875,   876,   877,   882,   902,    15,   495,   495,   557,
+     557,   557,   557,   557,   495,   557,   557,   367,   557,   557,
+     557,   495,   557,   495,   557,   557,   495,   557,   557,   557,
+     494,   557,   495,   557,   557,     7,    15,   496,    15,   495,
+     617,   557,   495,   380,   557,   557,   557,   557,   557,   557,
+     557,   557,   557,   557,   129,   373,   537,   537,   557,   557,
+     557,   495,   557,   373,   557,   495,   495,   557,   557,   494,
+     367,   495,   495,    64,   379,   557,   557,   495,   495,   557,
+     495,   495,   495,   495,   495,   557,   434,   557,   557,   557,
+     373,   471,   367,   495,   557,   557,   557,   495,   557,   495,
+     557,   557,   495,   557,   557,   557,   495,   367,   495,   380,
+     557,   557,   380,   557,   495,   557,   557,   557,   495,   557,
+     557,   495,   557,   495,   557,   557,   557,   557,   557,   557,
+      15,   495,   595,   495,   367,   495,   495,   557,   557,   557,
+      15,     8,   495,   495,   557,   557,   557,   495,   557,   557,
+     557,   557,   557,   557,   557,   557,   557,   557,   557,   557,
+     557,   557,   557,   557,   557,   557,   557,   557,   557,   557,
+     557,   557,   557,   557,   495,   557,   495,   557,   557,   557,
+     557,   495,   495,   557,   557,   557,   557,   557,   557,   557,
+     557,   908,   908,   908,   908,   908,   908,   257,   583,   124,
+     233,   404,    15,   376,   583,     8,     8,     8,     8,     7,
+       8,   124,   368,   391,     8,   373,   405,     8,     8,     8,
+       8,     8,   552,     8,   552,     8,     8,     8,     8,   552,
+     583,     7,   218,   252,   529,   531,   540,   541,   239,   549,
+     549,    10,    14,    15,    16,    17,    27,    34,    36,    64,
+      92,   149,   201,   373,   385,   501,   502,   504,   505,   506,
+     507,   513,   514,   515,   516,   517,   520,    15,   557,     5,
+       9,    15,    16,    17,   129,   503,   505,   513,   567,   581,
+     582,   557,    15,   567,   557,     5,   566,   567,   582,   567,
        8,     8,     8,     8,     8,     8,     8,     8,     7,     8,
-       8,     5,     7,   372,   643,   644,   372,   636,   495,    15,
-      15,   149,   483,   372,   372,   746,   747,     8,   372,   660,
-     661,   747,   372,   374,   372,    15,   532,   578,    23,    37,
-     372,   422,   423,    15,   372,   606,   372,   674,   674,   372,
-     657,   658,   372,   535,   432,    15,   372,   586,   149,   752,
-     535,     7,   478,   479,   494,   617,   618,   372,   612,   618,
-      15,   557,   372,   588,   589,   535,    15,    15,   535,   752,
-     536,   535,   535,   535,   535,   372,   535,   375,   535,    15,
-     427,   495,   503,   504,    15,   369,   372,   372,   654,   655,
-     485,   486,   487,   488,     8,   675,   742,    15,   372,   600,
-     372,   591,   592,   579,    15,    15,   372,   495,    15,   500,
-     755,    15,    15,   372,   729,   731,     8,   372,    37,   421,
-      15,   504,   505,   495,    15,    15,   557,   483,   495,   504,
-     372,   721,     5,    15,   580,   581,   495,   372,   373,   495,
-     579,    15,   503,   637,   638,   612,   616,   372,   604,   372,
-     701,   701,    15,   372,   602,   721,   500,   511,   495,   379,
-      15,   372,   707,   707,   707,   707,   707,     7,   500,   595,
-     596,   372,   597,   495,   368,   372,   495,   372,   727,   729,
-     372,   494,   495,   372,   472,    15,    15,   579,   372,    15,
-     618,    15,   618,   618,   618,   618,   790,   846,   618,   618,
-     618,   618,   618,   618,   790,   372,   379,   854,   855,   856,
-      15,    15,     8,   869,   870,   871,   495,    15,   500,   500,
-     500,   500,   499,   500,    15,    15,    15,    15,    15,   372,
-     899,    15,   366,   366,   124,     5,    21,   372,   376,   377,
-     371,   379,   372,   372,   372,   423,     7,   379,   366,   124,
-     372,   372,     5,    15,   410,   411,   372,   423,   423,   423,
-     423,   422,   503,   421,   372,   372,   427,   434,   435,   437,
-     438,   556,   556,   239,   413,   500,   501,   500,   500,   500,
-     500,     5,     9,    16,    17,    22,    23,    24,    25,    26,
-      28,    29,    30,    31,    32,    33,    35,    37,    38,   384,
-      15,   246,     3,    15,   246,   246,    15,   509,   510,    21,
-     553,   578,   511,     5,     9,   166,   567,   568,   569,   580,
-      26,   580,     5,     9,    23,    37,   502,   579,   580,   579,
-       8,    15,   504,   573,   574,    15,   500,   501,   516,   575,
-     576,   577,   575,   586,   372,   600,   602,   604,   606,   372,
-       7,   379,   727,     8,    21,   638,   423,   525,   500,   240,
-     551,    15,   379,    15,   477,     8,   578,     7,   500,   533,
-     534,   535,    15,   372,   477,   423,   482,   483,     8,   434,
-     525,   477,    15,     8,    21,     5,     7,   480,   481,   500,
-     372,     8,    21,     5,    58,    86,   126,   137,   165,   258,
-     619,   615,   616,   175,   607,   500,   149,   546,     8,   500,
-     500,   371,   372,   428,   429,   503,   508,   372,    26,   372,
-     541,   542,   544,   375,     8,     8,    15,   231,   403,   489,
-     379,     8,   742,   372,   503,   711,   721,   739,   740,     8,
-     566,    26,     5,     9,    16,    17,    22,    23,    24,    25,
+       8,     5,     7,   373,   644,   645,   373,   637,   496,    15,
+      15,   149,   484,   373,   373,   747,   748,     8,   373,   661,
+     662,   748,   373,   375,   373,    15,   533,   579,    23,    37,
+     373,   423,   424,    15,   373,   607,   373,   675,   675,   373,
+     658,   659,   373,   536,   433,    15,   373,   587,   149,   753,
+     536,     7,   479,   480,   495,   618,   619,   373,   613,   619,
+      15,   558,   373,   589,   590,   536,    15,    15,   536,   753,
+     537,   536,   536,   536,   536,   373,   536,   376,   536,    15,
+     428,   496,   504,   505,    15,   370,   373,   373,   655,   656,
+     486,   487,   488,   489,     8,   676,   743,    15,   373,   601,
+     373,   592,   593,   580,    15,    15,   373,   496,    15,   501,
+     756,    15,    15,   373,   730,   732,     8,   373,    37,   422,
+      15,   505,   506,   496,    15,    15,   558,   484,   496,   505,
+     373,   722,     5,    15,   581,   582,   496,   373,   374,   496,
+     580,    15,   504,   638,   639,   613,   617,   373,   605,   373,
+     702,   702,    15,   373,   603,   722,   501,   512,   496,   380,
+      15,   373,   708,   708,   708,   708,   708,     7,   501,   596,
+     597,   373,   598,   496,   369,   373,   496,   373,   728,   730,
+     373,   495,   496,   373,   473,    15,    15,   580,   373,    15,
+     619,    15,   619,   619,   619,   619,   791,   847,   619,   619,
+     619,   619,   619,   619,   791,   373,   380,   855,   856,   857,
+      15,    15,     8,   870,   871,   872,   496,    15,   501,   501,
+     501,   501,   500,   501,    15,    15,    15,    15,    15,   373,
+     900,    15,   367,   367,   124,     5,    21,   373,   377,   378,
+     372,   380,   373,   373,   373,   424,     7,   380,   367,   124,
+     373,   373,     5,    15,   411,   412,   373,   424,   424,   424,
+     424,   423,   504,   422,   373,   373,   428,   435,   436,   438,
+     439,   557,   557,   239,   414,   501,   502,   501,   501,   501,
+     501,     5,     9,    16,    17,    22,    23,    24,    25,    26,
+      28,    29,    30,    31,    32,    33,    35,    37,    38,   385,
+      15,   246,     3,    15,   246,   246,    15,   510,   511,    21,
+     554,   579,   512,     5,     9,   166,   568,   569,   570,   581,
+      26,   581,     5,     9,    23,    37,   503,   580,   581,   580,
+       8,    15,   505,   574,   575,    15,   501,   502,   517,   576,
+     577,   578,   576,   587,   373,   601,   603,   605,   607,   373,
+       7,   380,   728,     8,    21,   639,   424,   526,   501,   240,
+     552,    15,   380,    15,   478,     8,   579,     7,   501,   534,
+     535,   536,    15,   373,   478,   424,   483,   484,     8,   435,
+     526,   478,    15,     8,    21,     5,     7,   481,   482,   501,
+     373,     8,    21,     5,    58,    86,   126,   137,   165,   258,
+     620,   616,   617,   175,   608,   501,   149,   547,     8,   501,
+     501,   372,   373,   429,   430,   504,   509,   373,    26,   373,
+     542,   543,   545,   376,     8,     8,    15,   231,   404,   490,
+     380,     8,   743,   373,   504,   712,   722,   740,   741,     8,
+     567,    26,     5,     9,    16,    17,    22,    23,    24,    25,
       28,    29,    30,    31,    32,    33,    34,    35,    37,    38,
-     384,   385,   386,   372,   379,   393,   503,   500,    15,   379,
-     372,   372,   503,   503,   526,     8,   676,   733,   372,   503,
-     664,   372,   467,   468,   546,   423,    18,   579,   580,   579,
-     399,   402,   643,   638,     7,   616,   618,   711,   721,   722,
-     723,   422,   423,   461,   462,    62,   503,   766,    15,    15,
-       7,     8,    21,   594,   423,   375,   423,   477,     8,   673,
-     698,    21,   379,   372,     8,   500,   500,   477,   503,   551,
-     811,   503,   287,   823,   823,   551,   820,   823,    15,   551,
-     788,   551,   827,   788,   788,   551,   805,   551,   817,   477,
-     147,   148,   180,   314,   315,   318,   319,   380,   857,   858,
-     859,     8,    21,   504,   679,   860,    21,   860,   379,   871,
-     372,   866,   867,   379,   763,   764,     8,     8,     8,     8,
-     503,   506,   507,   781,   664,   379,   882,   883,   884,   885,
-     886,   887,   888,   379,   891,   892,   893,   894,   895,   379,
-     896,   897,     8,   379,   902,   903,   372,   368,   366,     8,
-      21,   213,   380,   477,    44,    87,    93,   119,   143,   145,
-     178,   183,   187,   191,   194,   216,   230,   236,   391,   392,
-     394,   372,   366,   494,   557,   578,   404,   477,   551,   551,
-       8,    37,    15,   372,   440,   445,   379,    15,   520,    21,
-       8,   500,   500,   500,   500,   500,   500,   500,   500,   500,
-     500,   500,   500,   500,   500,   500,   500,   500,   500,   500,
-     578,    64,   129,   496,   498,   578,   503,   514,   517,    64,
-     517,   511,     8,    21,     5,   500,   554,   569,     8,    21,
-       5,     9,   500,    21,   500,   580,   580,   580,   580,   580,
-      21,   573,   573,     8,   500,   501,   576,   577,     8,     8,
-       8,   477,   477,   494,    43,    67,    82,    87,    88,    94,
-     228,   259,   303,   647,   644,   379,   507,   523,    21,   372,
-      15,   499,    67,   478,   661,   500,     7,     8,    21,   553,
-      37,     8,    21,   658,   503,   506,   522,   524,   578,   750,
-     480,     7,   477,   618,    15,    15,    15,    15,    15,    15,
-     607,   618,   372,    21,   558,   589,    21,    21,    15,     8,
-      21,     8,   510,   504,     8,   543,    26,   371,   655,   486,
-     129,   490,   491,   492,   408,   169,   208,   282,   379,    15,
-       7,     8,    21,   592,   575,    21,    21,   147,   148,   180,
-      21,    18,    21,     7,   500,   518,   175,   324,    37,     8,
-      21,   379,     8,    21,    26,     8,    21,   558,   500,    21,
-     463,   464,   463,    21,     7,   618,   607,    15,     7,     8,
-      21,     8,    15,    15,    26,   708,   709,   711,   499,   500,
-     596,   379,     8,   698,     8,   673,   404,   394,   381,    21,
-      21,    21,   618,   551,    21,   618,   551,   847,   618,   551,
-     618,   551,   618,   551,   618,   551,    15,    15,    15,    15,
-      15,    15,   379,   856,     8,    21,    21,   191,   858,     8,
-     182,   315,   318,     8,    21,   379,   379,   379,   500,    15,
+     385,   386,   387,   373,   380,   394,   504,   501,    15,   380,
+     373,   373,   504,   504,   527,     8,   677,   734,   373,   504,
+     665,   373,   468,   469,   547,   424,    18,   580,   581,   580,
+     400,   403,   644,   639,     7,   617,   619,   712,   722,   723,
+     724,   423,   424,   462,   463,    62,   504,   767,    15,    15,
+       7,     8,    21,   595,   424,   376,   424,   478,     8,   674,
+     699,    21,   380,   373,     8,   501,   501,   478,   504,   552,
+     812,   504,   287,   824,   824,   552,   821,   824,    15,   552,
+     789,   552,   828,   789,   789,   552,   806,   552,   818,   478,
+     147,   148,   180,   314,   315,   318,   319,   381,   858,   859,
+     860,     8,    21,   505,   680,   861,    21,   861,   380,   872,
+     373,   867,   868,   380,   764,   765,     8,     8,     8,     8,
+     504,   507,   508,   782,   665,   380,   883,   884,   885,   886,
+     887,   888,   889,   380,   892,   893,   894,   895,   896,   380,
+     897,   898,     8,   380,   903,   904,   373,   369,   367,     8,
+      21,   213,   381,   478,    44,    87,    93,   119,   143,   145,
+     178,   183,   187,   191,   194,   216,   230,   236,   392,   393,
+     395,   373,   367,   495,   558,   579,   405,   478,   552,   552,
+       8,    37,    15,   373,   441,   446,   380,    15,   521,    21,
+       8,   501,   501,   501,   501,   501,   501,   501,   501,   501,
+     501,   501,   501,   501,   501,   501,   501,   501,   501,   501,
+     579,    64,   129,   497,   499,   579,   504,   515,   518,    64,
+     518,   512,     8,    21,     5,   501,   555,   570,     8,    21,
+       5,     9,   501,    21,   501,   581,   581,   581,   581,   581,
+      21,   574,   574,     8,   501,   502,   577,   578,     8,     8,
+       8,   478,   478,   495,    43,    67,    82,    87,    88,    94,
+     228,   259,   303,   648,   645,   380,   508,   524,    21,   373,
+      15,   500,    67,   479,   662,   501,     7,     8,    21,   554,
+      37,     8,    21,   659,   504,   507,   523,   525,   579,   751,
+     481,     7,   478,   619,    15,    15,    15,    15,    15,    15,
+     608,   619,   373,    21,   559,   590,    21,    21,    15,     8,
+      21,     8,   511,   505,     8,   544,    26,   372,   656,   487,
+     129,   491,   492,   493,   409,   169,   208,   282,   380,    15,
+       7,     8,    21,   593,   576,    21,    21,   147,   148,   180,
+      21,    18,    21,     7,   501,   519,   175,   324,    37,     8,
+      21,   380,     8,    21,    26,     8,    21,   559,   501,    21,
+     464,   465,   464,    21,     7,   619,   608,    15,     7,     8,
+      21,     8,    15,    15,    26,   709,   710,   712,   500,   501,
+     597,   380,     8,   699,     8,   674,   405,   395,   382,    21,
+      21,    21,   619,   552,    21,   619,   552,   848,   619,   552,
+     619,   552,   619,   552,   619,   552,    15,    15,    15,    15,
+      15,    15,   380,   857,     8,    21,    21,   191,   859,     8,
+     182,   315,   318,     8,    21,   380,   380,   380,   501,    15,
       15,     8,    21,    21,   183,   191,   208,   357,   358,     8,
       21,    41,   209,   228,     8,    21,   339,   342,   343,   344,
-     355,   356,     8,    21,   379,   244,   331,   346,   347,   348,
-       8,    21,   375,   372,   377,    15,   409,   410,   477,   494,
-      15,     7,     8,   372,   477,    15,   514,     5,   412,   500,
-     569,   423,   503,   437,    15,    16,    17,    27,    36,    59,
-      64,    92,   149,   201,   436,   438,   448,   449,   450,   451,
-     452,   453,   454,   455,   440,   445,   446,   447,    15,   441,
-     442,    62,   500,   575,   501,   496,    21,     8,   497,   500,
-     518,   569,     7,   578,   483,   500,   578,     8,   574,    21,
-       8,     8,     8,   501,   577,   501,   577,   501,   577,   372,
-     255,     8,    21,   483,   482,    21,     7,    21,   500,   533,
-      21,   483,   551,     8,    21,   569,   751,     8,    21,   481,
-     500,   619,   578,    15,   621,   372,   620,   620,   500,   620,
-     477,   618,   239,   535,   499,   429,   429,   372,   500,   542,
-      21,   500,   518,     8,    21,    16,    15,    15,    15,   499,
-     739,   740,   495,   503,   771,     7,   500,     7,    21,    21,
-     372,   614,   504,   503,   191,   503,   618,   665,   500,   468,
-     551,     8,    47,   177,   372,   466,   379,   635,   637,   607,
-       7,     7,   500,   724,   725,   722,   723,   462,   500,     5,
-     621,   767,   768,   774,   500,   631,     8,    21,    15,    21,
-      71,   208,   379,   379,   495,   172,   372,   475,   476,   504,
-     191,   208,   282,   285,   290,   298,   791,   792,   793,   800,
-     812,   813,   814,   618,   266,   821,   822,   823,   618,    37,
-     503,   844,   845,    84,   265,   289,   299,   304,   789,   791,
-     792,   793,   794,   795,   796,   798,   799,   800,   618,   791,
-     792,   793,   794,   795,   796,   798,   799,   800,   813,   814,
-     828,   618,   791,   792,   793,   800,   806,   618,   791,   792,
-     818,   618,   860,   860,   860,   379,   861,   862,   860,   860,
-     504,    15,   867,   764,   331,   315,   332,   578,   496,   507,
-      15,    15,    15,    15,    15,   883,    15,    15,    15,   892,
-      15,    15,    15,    15,   897,   352,   353,    15,    15,    15,
-      15,    15,   903,   372,    18,    26,   414,    15,   393,     7,
-     379,   409,   558,   558,   413,     5,   500,   451,   452,   453,
-     456,   452,   454,   452,   454,   246,   246,   246,   246,   246,
-       8,    37,   372,   439,   503,     5,   441,   442,     8,    15,
-      16,    17,   149,   372,   439,   443,   444,   457,   458,   459,
-     460,    15,   442,    15,    21,   521,    21,    21,   510,   578,
-     500,   511,   554,   568,   580,   544,   545,   501,   545,   545,
-     545,   477,   372,   639,   642,   578,     8,    21,     7,   413,
-     500,   578,   500,   578,   569,   632,   500,   622,   623,    21,
-      21,    21,    21,     8,     8,   254,   529,   535,    21,   491,
-     492,   679,   679,   679,    21,    21,   372,    15,    21,   500,
-       7,     7,   500,   477,    15,   173,     8,   669,   670,   671,
-     672,   673,   675,   676,   677,   680,   682,   683,   684,   698,
-     706,   544,   464,    15,    15,   465,   255,     8,     7,     8,
-      21,    21,    21,     8,    21,    21,   709,   710,    15,    15,
-     372,   372,   473,   474,   476,    18,     8,    26,   790,    15,
-     790,   790,    15,   618,   812,   790,   618,   821,   372,     8,
-      21,    15,   790,    15,   790,    15,   618,   789,   618,   828,
-     618,   806,   618,   818,    21,    21,    21,   316,   317,     8,
-      21,    21,    21,   866,    15,    15,   496,    21,   507,   889,
-     890,   679,   379,   702,   514,   679,   708,   722,   708,   664,
-     664,   507,   900,   500,   898,    15,    15,   379,   904,   905,
-     664,   664,   500,   379,   906,    21,   500,   500,   649,   650,
-      21,   392,   414,     5,   500,   404,     8,    21,     8,   517,
-     517,   517,   517,   517,   448,     5,    15,   438,   449,   442,
-     372,   439,   447,   457,   458,   458,     8,    21,     7,    16,
-      17,     5,    37,     9,   457,   500,    20,   510,   497,    21,
-      26,    21,    21,    21,    21,    15,   507,   569,   483,   660,
-     495,   522,   569,   751,   500,    21,     7,     8,    21,   500,
-     379,    15,    21,    21,    21,     7,   772,   773,   774,   500,
-     500,     7,   679,   503,   666,   379,   671,    26,   466,    26,
-     385,   639,   637,   372,   610,   611,   612,   613,   725,   768,
-     618,    78,   595,   372,   674,   722,   699,     8,   372,   476,
-     500,   618,   801,   379,   618,   618,   846,   503,   844,   379,
-     500,   500,   618,   618,   618,   618,   862,    21,   679,   503,
+     355,   356,     8,    21,   380,   244,   331,   346,   347,   348,
+       8,    21,   376,   373,   378,    15,   410,   411,   478,   495,
+      15,     7,     8,   373,   478,    15,   515,     5,   413,   501,
+     570,   424,   504,   438,    15,    16,    17,    27,    36,    59,
+      64,    92,   149,   201,   437,   439,   449,   450,   451,   452,
+     453,   454,   455,   456,   441,   446,   447,   448,    15,   442,
+     443,    62,   501,   576,   502,   497,    21,     8,   498,   501,
+     519,   570,     7,   579,   484,   501,   579,     8,   575,    21,
+       8,     8,     8,   502,   578,   502,   578,   502,   578,   373,
+     255,     8,    21,   484,   483,    21,     7,    21,   501,   534,
+      21,   484,   552,     8,    21,   570,   752,     8,    21,   482,
+     501,   620,   579,    15,   622,   373,   621,   621,   501,   621,
+     478,   619,   239,   536,   500,   430,   430,   373,   501,   543,
+      21,   501,   519,     8,    21,    16,    15,    15,    15,   500,
+     740,   741,   496,   504,   772,     7,   501,     7,    21,    21,
+     373,   615,   505,   504,   191,   504,   619,   666,   501,   469,
+     552,     8,    47,   177,   373,   467,   380,   636,   638,   608,
+       7,     7,   501,   725,   726,   723,   724,   463,   501,     5,
+     622,   768,   769,   775,   501,   632,     8,    21,    15,    21,
+      71,   208,   380,   380,   496,   172,   373,   476,   477,   505,
+     191,   208,   282,   285,   290,   298,   792,   793,   794,   801,
+     813,   814,   815,   619,   266,   822,   823,   824,   619,    37,
+     504,   845,   846,    84,   265,   289,   299,   304,   790,   792,
+     793,   794,   795,   796,   797,   799,   800,   801,   619,   792,
+     793,   794,   795,   796,   797,   799,   800,   801,   814,   815,
+     829,   619,   792,   793,   794,   801,   807,   619,   792,   793,
+     819,   619,   861,   861,   861,   380,   862,   863,   861,   861,
+     505,    15,   868,   765,   331,   315,   332,   579,   497,   508,
+      15,    15,    15,    15,    15,   884,    15,    15,    15,   893,
+      15,    15,    15,    15,   898,   352,   353,    15,    15,    15,
+      15,    15,   904,   373,    18,    26,   415,    15,   394,     7,
+     380,   410,   559,   559,   414,     5,   501,   452,   453,   454,
+     457,   453,   455,   453,   455,   246,   246,   246,   246,   246,
+       8,    37,   373,   440,   504,     5,   442,   443,     8,    15,
+      16,    17,   149,   373,   440,   444,   445,   458,   459,   460,
+     461,    15,   443,    15,    21,   522,    21,    21,   511,   579,
+     501,   512,   555,   569,   581,   545,   546,   502,   546,   546,
+     546,   478,   373,   640,   643,   579,     8,    21,     7,   414,
+     501,   579,   501,   579,   570,   633,   501,   623,   624,    21,
+      21,    21,    21,     8,     8,   254,   530,   536,    21,   492,
+     493,   680,   680,   680,    21,    21,   373,    15,    21,   501,
+       7,     7,   501,   478,    15,   173,     8,   670,   671,   672,
+     673,   674,   676,   677,   678,   681,   683,   684,   685,   699,
+     707,   545,   465,    15,    15,   466,   255,     8,     7,     8,
+      21,    21,    21,     8,    21,    21,   710,   711,    15,    15,
+     373,   373,   474,   475,   477,    18,     8,    26,   791,    15,
+     791,   791,    15,   619,   813,   791,   619,   822,   373,     8,
+      21,    15,   791,    15,   791,    15,   619,   790,   619,   829,
+     619,   807,   619,   819,    21,    21,    21,   316,   317,     8,
+      21,    21,    21,   867,    15,    15,   497,    21,   508,   890,
+     891,   680,   380,   703,   515,   680,   709,   723,   709,   665,
+     665,   508,   901,   501,   899,    15,    15,   380,   905,   906,
+     665,   665,   501,   380,   907,    21,   501,   501,   650,   651,
+      21,   393,   415,     5,   501,   405,     8,    21,     8,   518,
+     518,   518,   518,   518,   449,     5,    15,   439,   450,   443,
+     373,   440,   448,   458,   459,   459,     8,    21,     7,    16,
+      17,     5,    37,     9,   458,   501,    20,   511,   498,    21,
+      26,    21,    21,    21,    21,    15,   508,   570,   484,   661,
+     496,   523,   570,   752,   501,    21,     7,     8,    21,   501,
+     380,    15,    21,    21,    21,     7,   773,   774,   775,   501,
+     501,     7,   680,   504,   667,   380,   672,    26,   467,    26,
+     386,   640,   638,   373,   611,   612,   613,   614,   726,   769,
+     619,    78,   596,   373,   675,   723,   700,     8,   373,   477,
+     501,   619,   802,   380,   619,   619,   847,   504,   845,   380,
+     501,   501,   619,   619,   619,   619,   863,    21,   680,   504,
       21,    26,     8,    21,    21,    22,    24,    33,    35,   158,
-     159,   161,   162,   192,   234,   247,   703,   704,   705,     8,
+     159,   161,   162,   192,   234,   247,   704,   705,   706,     8,
       21,    21,    21,    21,    21,    21,    21,    21,     8,    21,
-       8,    21,   379,   877,   878,   877,   315,   351,     8,    21,
+       8,    21,   380,   878,   879,   878,   315,   351,     8,    21,
       21,    21,    21,   349,   350,     8,     8,    21,     7,    21,
-      21,   578,   456,   449,   578,   439,    26,    21,   457,   444,
-     458,   458,   459,   459,   459,    21,   500,     5,   500,   518,
-     640,   641,   503,     8,   679,   503,     8,   500,   623,   379,
-      21,   254,   500,     8,    21,   500,    21,    15,    41,   135,
-     209,   221,   223,   224,   226,   229,   320,   322,   500,   465,
-      21,    21,    15,     8,   132,   769,    21,    21,     7,    21,
-     701,   703,   474,     5,    16,    17,    22,    24,    33,    35,
-      37,   159,   162,   247,   305,   306,   307,   803,    21,    94,
-     230,   284,   295,   815,    37,   191,   288,   299,   797,    21,
-      21,    21,    21,   500,   890,    15,    15,   379,   507,   500,
-     354,     8,    21,    21,   905,   500,     7,     7,   412,    21,
-     496,   443,   457,    21,     8,     8,    21,   483,   569,   255,
-      15,    21,   773,     5,   500,   667,   668,    15,   685,    15,
-      15,    15,    15,   707,   707,    15,    15,    15,     8,   499,
-     611,   711,   712,    15,   722,   700,   700,     7,     8,    21,
-     847,    21,     8,   504,   679,   703,     8,   878,     8,   879,
-       8,   880,    21,     7,   413,    21,    21,   500,   641,   500,
-     372,   624,   625,   500,     8,    21,   686,   685,   721,   739,
-     721,   722,   711,   708,   500,   500,   678,   666,   681,   500,
-      21,     8,   379,    21,     7,     8,    21,   679,   802,   500,
-     379,    21,     8,   500,   379,   379,   372,   651,   652,    21,
-       8,    15,    21,   668,   148,   180,   687,     7,    21,     7,
-      21,    15,    21,    21,     8,    21,     8,    21,     8,   711,
-      78,   702,   702,    21,   330,   500,   504,   353,   352,     8,
-     500,    40,   500,   626,   627,   774,     7,     7,   688,   689,
-     711,   739,   722,   595,   500,   666,   500,    21,    21,    21,
-      15,    21,    15,    15,   652,   372,   628,     8,    21,     8,
-      21,    15,    21,    21,    21,     8,   499,   877,   877,    17,
-     629,   630,   627,   689,   500,   690,   691,    21,   500,    21,
-      21,    21,   631,    17,     7,     8,    21,     8,   776,   631,
-     500,   691,    15,   379,   379,   692,   693,   694,   695,   696,
-     182,   318,   128,   157,   217,     8,    21,     7,     7,    15,
-     697,   697,   697,   693,   379,   695,   696,   379,   696,   498,
-       7,    21,   696
+      21,   579,   457,   450,   579,   440,    26,    21,   458,   445,
+     459,   459,   460,   460,   460,    21,   501,     5,   501,   519,
+     641,   642,   504,     8,   680,   504,     8,   501,   624,   380,
+      21,   254,   501,     8,    21,   501,    21,    15,    41,   135,
+     209,   221,   223,   224,   226,   229,   320,   322,   501,   466,
+      21,    21,    15,     8,   132,   770,    21,    21,     7,    21,
+     702,   704,   475,     5,    16,    17,    22,    24,    33,    35,
+      37,   159,   162,   247,   305,   306,   307,   804,    21,    94,
+     230,   284,   295,   816,    37,   191,   288,   299,   798,    21,
+      21,    21,    21,   501,   891,    15,    15,   380,   508,   501,
+     354,   359,     8,    21,    21,   906,   501,     7,     7,   413,
+      21,   497,   444,   458,    21,     8,     8,    21,   484,   570,
+     255,    15,    21,   774,     5,   501,   668,   669,    15,   686,
+      15,    15,    15,    15,   708,   708,    15,    15,    15,     8,
+     500,   612,   712,   713,    15,   723,   701,   701,     7,     8,
+      21,   848,    21,     8,   505,   680,   704,     8,    15,   879,
+       8,   880,     8,   881,    21,     7,   414,    21,    21,   501,
+     642,   501,   373,   625,   626,   501,     8,    21,   687,   686,
+     722,   740,   722,   723,   712,   709,   501,   501,   679,   667,
+     682,   501,    21,     8,   380,    21,     7,     8,    21,   680,
+     803,   501,   380,    21,     8,   501,    92,   380,   380,   373,
+     652,   653,    21,     8,    15,    21,   669,   148,   180,   688,
+       7,    21,     7,    21,    15,    21,    21,     8,    21,     8,
+      21,     8,   712,    78,   703,   703,    21,   330,   501,   505,
+      21,   353,   352,     8,   501,    40,   501,   627,   628,   775,
+       7,     7,   689,   690,   712,   740,   723,   596,   501,   667,
+     501,    21,    21,    21,    15,    21,    15,    15,   653,   373,
+     629,     8,    21,     8,    21,    15,    21,    21,    21,     8,
+     500,   878,   878,    17,   630,   631,   628,   690,   501,   691,
+     692,    21,   501,    21,    21,    21,   632,    17,     7,     8,
+      21,     8,   777,   632,   501,   692,    15,   380,   380,   693,
+     694,   695,   696,   697,   182,   318,   128,   157,   217,     8,
+      21,     7,     7,    15,   698,   698,   698,   694,   380,   696,
+     697,   380,   697,   499,     7,    21,   697
 };
 
   /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint16 yyr1[] =
 {
-       0,   361,   362,   362,   363,   363,   363,   363,   363,   363,
-     363,   364,   365,   365,   365,   365,   365,   365,   365,   365,
-     366,   367,   367,   367,   368,   369,   370,   370,   370,   370,
-     371,   371,   372,   373,   373,   374,   374,   375,   375,   375,
-     376,   376,   377,   377,   378,   379,   380,   381,   382,   382,
-     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
-     382,   382,   382,   382,   382,   382,   382,   382,   382,   382,
-     382,   382,   382,   382,   382,   382,   382,   382,   383,   383,
-     383,   383,   383,   384,   385,   385,   386,   386,   386,   386,
-     386,   386,   386,   386,   386,   386,   386,   386,   386,   386,
-     386,   386,   386,   386,   387,   387,   388,   388,   389,   389,
-     390,   390,   390,   391,   391,   392,   392,   392,   392,   392,
-     392,   392,   392,   392,   392,   392,   392,   393,   393,   393,
-     394,   394,   395,   395,   396,   396,   397,   397,   398,   398,
-     399,   400,   401,   401,   402,   403,   403,   404,   405,   405,
-     406,   406,   407,   408,   408,   408,   408,   408,   408,   408,
-     409,   409,   410,   410,   410,   411,   411,   411,   411,   412,
-     412,   412,   412,   413,   414,   414,   414,   415,   415,   416,
-     416,   417,   417,   418,   418,   419,   419,   419,   419,   420,
-     420,   420,   421,   422,   422,   423,   424,   424,   425,   425,
-     426,   426,   427,   428,   428,   429,   429,   429,   430,   431,
-     431,   432,   433,   434,   435,   435,   436,   436,   437,   437,
-     437,   437,   437,   438,   439,   440,   441,   442,   443,   443,
-     444,   444,   445,   446,   446,   447,   447,   447,   447,   448,
-     448,   448,   449,   449,   449,   449,   449,   449,   449,   449,
-     449,   449,   449,   450,   451,   451,   451,   452,   452,   453,
-     453,   453,   454,   454,   454,   454,   455,   456,   456,   457,
-     457,   457,   457,   457,   458,   458,   458,   459,   459,   460,
-     460,   460,   461,   461,   462,   462,   463,   463,   464,   465,
-     466,   466,   466,   467,   467,   468,   469,   470,   470,   471,
-     471,   471,   471,   472,   473,   473,   474,   474,   475,   475,
-     476,   477,   477,   479,   478,   478,   480,   480,   480,   480,
-     481,   481,   482,   482,   483,   484,   484,   485,   485,   486,
-     488,   487,   489,   489,   490,   490,   491,   491,   492,   493,
-     494,   495,   495,   496,   496,   497,   497,   497,   498,   498,
-     499,   499,   500,   500,   500,   501,   501,   501,   501,   501,
-     501,   501,   501,   501,   501,   501,   501,   501,   501,   501,
-     501,   501,   501,   501,   501,   501,   501,   501,   501,   501,
-     502,   502,   503,   504,   504,   504,   505,   505,   505,   505,
-     506,   507,   507,   507,   507,   508,   509,   509,   510,   511,
-     511,   512,   512,   512,   512,   512,   513,   513,   513,   513,
-     514,   515,   515,   515,   516,   517,   517,   518,   518,   518,
-     518,   518,   518,   518,   518,   520,   521,   519,   522,   522,
-     523,   523,   523,   524,   524,   524,   525,   526,   526,   527,
-     527,   527,   527,   527,   527,   527,   527,   527,   527,   527,
-     527,   527,   527,   527,   527,   527,   527,   527,   527,   527,
-     527,   527,   527,   528,   528,   529,   529,   529,   530,   530,
-     531,   531,   531,   531,   531,   532,   533,   533,   533,   533,
-     534,   534,   535,   535,   536,   536,   537,   538,   539,   540,
-     541,   541,   542,   543,   543,   544,   545,   545,   546,   546,
-     547,   547,   547,   547,   547,   548,   548,   548,   548,   548,
-     548,   548,   548,   548,   548,   548,   548,   548,   548,   548,
-     548,   548,   548,   549,   550,   550,   550,   550,   551,   551,
-     552,   553,   553,   554,   554,   554,   555,   555,   556,   557,
-     558,   559,   559,   559,   559,   559,   559,   559,   559,   559,
-     559,   559,   559,   559,   559,   560,   561,   561,   561,   562,
-     563,   563,   564,   564,   565,   565,   566,   566,   567,   567,
-     568,   568,   568,   568,   568,   568,   569,   570,   571,   572,
-     572,   573,   573,   574,   574,   575,   575,   575,   576,   576,
-     576,   576,   576,   576,   577,   577,   577,   577,   577,   578,
-     579,   580,   580,   581,   581,   581,   581,   581,   581,   581,
-     581,   581,   582,   582,   583,   583,   583,   583,   583,   583,
-     583,   583,   583,   583,   583,   583,   583,   583,   583,   583,
-     583,   583,   583,   584,   584,   584,   584,   584,   584,   584,
+       0,   362,   363,   363,   364,   364,   364,   364,   364,   364,
+     364,   365,   366,   366,   366,   366,   366,   366,   366,   366,
+     367,   368,   368,   368,   369,   370,   371,   371,   371,   371,
+     372,   372,   373,   374,   374,   375,   375,   376,   376,   376,
+     377,   377,   378,   378,   379,   380,   381,   382,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
+     383,   383,   383,   383,   383,   383,   383,   383,   384,   384,
+     384,   384,   384,   385,   386,   386,   387,   387,   387,   387,
+     387,   387,   387,   387,   387,   387,   387,   387,   387,   387,
+     387,   387,   387,   387,   388,   388,   389,   389,   390,   390,
+     391,   391,   391,   392,   392,   393,   393,   393,   393,   393,
+     393,   393,   393,   393,   393,   393,   393,   394,   394,   394,
+     395,   395,   396,   396,   397,   397,   398,   398,   399,   399,
+     400,   401,   402,   402,   403,   404,   404,   405,   406,   406,
+     407,   407,   408,   409,   409,   409,   409,   409,   409,   409,
+     410,   410,   411,   411,   411,   412,   412,   412,   412,   413,
+     413,   413,   413,   414,   415,   415,   415,   416,   416,   417,
+     417,   418,   418,   419,   419,   420,   420,   420,   420,   421,
+     421,   421,   422,   423,   423,   424,   425,   425,   426,   426,
+     427,   427,   428,   429,   429,   430,   430,   430,   431,   432,
+     432,   433,   434,   435,   436,   436,   437,   437,   438,   438,
+     438,   438,   438,   439,   440,   441,   442,   443,   444,   444,
+     445,   445,   446,   447,   447,   448,   448,   448,   448,   449,
+     449,   449,   450,   450,   450,   450,   450,   450,   450,   450,
+     450,   450,   450,   451,   452,   452,   452,   453,   453,   454,
+     454,   454,   455,   455,   455,   455,   456,   457,   457,   458,
+     458,   458,   458,   458,   459,   459,   459,   460,   460,   461,
+     461,   461,   462,   462,   463,   463,   464,   464,   465,   466,
+     467,   467,   467,   468,   468,   469,   470,   471,   471,   472,
+     472,   472,   472,   473,   474,   474,   475,   475,   476,   476,
+     477,   478,   478,   480,   479,   479,   481,   481,   481,   481,
+     482,   482,   483,   483,   484,   485,   485,   486,   486,   487,
+     489,   488,   490,   490,   491,   491,   492,   492,   493,   494,
+     495,   496,   496,   497,   497,   498,   498,   498,   499,   499,
+     500,   500,   501,   501,   501,   502,   502,   502,   502,   502,
+     502,   502,   502,   502,   502,   502,   502,   502,   502,   502,
+     502,   502,   502,   502,   502,   502,   502,   502,   502,   502,
+     503,   503,   504,   505,   505,   505,   506,   506,   506,   506,
+     507,   508,   508,   508,   508,   509,   510,   510,   511,   512,
+     512,   513,   513,   513,   513,   513,   514,   514,   514,   514,
+     515,   516,   516,   516,   517,   518,   518,   519,   519,   519,
+     519,   519,   519,   519,   519,   521,   522,   520,   523,   523,
+     524,   524,   524,   525,   525,   525,   526,   527,   527,   528,
+     528,   528,   528,   528,   528,   528,   528,   528,   528,   528,
+     528,   528,   528,   528,   528,   528,   528,   528,   528,   528,
+     528,   528,   528,   529,   529,   530,   530,   530,   531,   531,
+     532,   532,   532,   532,   532,   533,   534,   534,   534,   534,
+     535,   535,   536,   536,   537,   537,   538,   539,   540,   541,
+     542,   542,   543,   544,   544,   545,   546,   546,   547,   547,
+     548,   548,   548,   548,   548,   549,   549,   549,   549,   549,
+     549,   549,   549,   549,   549,   549,   549,   549,   549,   549,
+     549,   549,   549,   550,   551,   551,   551,   551,   552,   552,
+     553,   554,   554,   555,   555,   555,   556,   556,   557,   558,
+     559,   560,   560,   560,   560,   560,   560,   560,   560,   560,
+     560,   560,   560,   560,   560,   561,   562,   562,   562,   563,
+     564,   564,   565,   565,   566,   566,   567,   567,   568,   568,
+     569,   569,   569,   569,   569,   569,   570,   571,   572,   573,
+     573,   574,   574,   575,   575,   576,   576,   576,   577,   577,
+     577,   577,   577,   577,   578,   578,   578,   578,   578,   579,
+     580,   581,   581,   582,   582,   582,   582,   582,   582,   582,
+     582,   582,   583,   583,   584,   584,   584,   584,   584,   584,
      584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
-     584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
-     584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
-     584,   584,   584,   584,   584,   584,   584,   585,   585,   586,
-     587,   588,   588,   589,   590,   591,   591,   592,   593,   594,
-     595,   595,   596,   596,   596,   597,   598,   598,   598,   599,
-     599,   600,   601,   601,   602,   603,   603,   604,   605,   605,
-     606,   607,   607,   608,   609,   609,   610,   610,   611,   611,
-     612,   613,   614,   615,   615,   616,   617,   617,   618,   619,
-     619,   619,   619,   619,   619,   619,   619,   620,   621,   622,
-     622,   623,   623,   624,   624,   625,   626,   626,   627,   627,
-     627,   628,   629,   629,   630,   630,   631,   632,   632,   633,
-     634,   634,   635,   635,   636,   637,   638,   639,   640,   640,
-     641,   641,   641,   642,   643,   643,   644,   644,   644,   645,
-     645,   646,   646,   647,   647,   647,   647,   647,   647,   647,
-     647,   647,   647,   647,   648,   650,   649,   649,   651,   651,
-     652,   653,   654,   654,   655,   656,   657,   657,   658,   659,
-     659,   660,   660,   661,   662,   663,   664,   664,   665,   665,
-     666,   667,   667,   668,   668,   669,   669,   670,   670,   671,
-     671,   671,   671,   671,   671,   671,   671,   671,   671,   671,
-     672,   672,   673,   673,   674,   675,   675,   676,   677,   678,
-     678,   678,   679,   679,   680,   681,   681,   682,   682,   683,
-     684,   684,   685,   686,   687,   687,   687,   688,   688,   689,
-     689,   689,   690,   690,   691,   692,   692,   693,   693,   693,
-     693,   693,   693,   693,   694,   695,   696,   697,   698,   698,
-     698,   699,   700,   701,   702,   702,   703,   703,   704,   704,
-     704,   704,   704,   704,   704,   704,   704,   705,   705,   706,
-     706,   706,   706,   706,   707,   708,   708,   709,   709,   709,
-     709,   710,   711,   712,   712,   713,   713,   714,   714,   715,
-     716,   717,   718,   719,   720,   720,   721,   722,   722,   723,
-     723,   724,   724,   725,   725,   726,   726,   727,   728,   728,
-     728,   728,   728,   729,   730,   731,   731,   732,   733,   733,
-     734,   735,   735,   736,   737,   738,   738,   739,   739,   740,
-     740,   741,   741,   741,   741,   742,   743,   744,   745,   746,
-     747,   747,   748,   749,   749,   750,   750,   751,   752,   753,
-     754,   755,   755,   756,   757,   758,   759,   760,   761,   762,
-     763,   763,   764,   764,   764,   765,   766,   767,   767,   768,
-     768,   769,   769,   770,   771,   771,   772,   772,   773,   773,
-     774,   775,   776,   776,   776,   777,   778,   778,   779,   780,
-     781,   781,   782,   783,   784,   784,   784,   784,   784,   784,
-     784,   784,   784,   784,   784,   784,   784,   784,   784,   784,
-     784,   784,   784,   784,   784,   784,   784,   784,   784,   784,
-     785,   786,   787,   787,   788,   788,   789,   789,   789,   789,
-     789,   789,   789,   789,   789,   790,   791,   792,   793,   794,
-     795,   796,   797,   797,   797,   798,   799,   800,   801,   802,
-     803,   803,   803,   803,   803,   803,   803,   803,   803,   803,
-     803,   803,   803,   803,   804,   804,   805,   805,   806,   806,
-     806,   806,   807,   807,   808,   809,   809,   810,   810,   811,
-     811,   812,   812,   812,   812,   812,   812,   813,   814,   814,
-     815,   815,   815,   815,   816,   816,   817,   817,   818,   818,
-     819,   819,   820,   820,   821,   821,   822,   823,   824,   825,
-     825,   826,   826,   827,   827,   828,   828,   828,   828,   828,
-     828,   828,   828,   828,   828,   828,   829,   830,   830,   831,
-     832,   832,   833,   834,   835,   836,   837,   838,   839,   840,
-     841,   841,   842,   842,   843,   843,   844,   845,   845,   845,
-     845,   846,   847,   848,   848,   849,   849,   849,   849,   849,
-     849,   850,   851,   852,   852,   852,   853,   853,   853,   854,
-     854,   855,   855,   856,   856,   856,   857,   857,   857,   857,
-     857,   858,   859,   860,   861,   861,   862,   862,   863,   864,
-     865,   866,   866,   867,   868,   869,   869,   870,   870,   871,
-     871,   872,   872,   872,   872,   872,   872,   873,   874,   875,
-     876,   876,   876,   877,   877,   878,   879,   879,   880,   880,
-     881,   882,   882,   883,   883,   883,   883,   883,   884,   885,
-     886,   887,   888,   889,   889,   890,   891,   891,   892,   892,
-     892,   893,   894,   895,   896,   896,   897,   897,   897,   897,
-     897,   897,   897,   897,   898,   899,   900,   900,   901,   902,
-     902,   903,   903,   903,   903,   903,   904,   904,   905,   905,
-     906,   906,   907
+     584,   584,   584,   585,   585,   585,   585,   585,   585,   585,
+     585,   585,   585,   585,   585,   585,   585,   585,   585,   585,
+     585,   585,   585,   585,   585,   585,   585,   585,   585,   585,
+     585,   585,   585,   585,   585,   585,   585,   585,   585,   585,
+     585,   585,   585,   585,   585,   585,   585,   586,   586,   587,
+     588,   589,   589,   590,   591,   592,   592,   593,   594,   595,
+     596,   596,   597,   597,   597,   598,   599,   599,   599,   600,
+     600,   601,   602,   602,   603,   604,   604,   605,   606,   606,
+     607,   608,   608,   609,   610,   610,   611,   611,   612,   612,
+     613,   614,   615,   616,   616,   617,   618,   618,   619,   620,
+     620,   620,   620,   620,   620,   620,   620,   621,   622,   623,
+     623,   624,   624,   625,   625,   626,   627,   627,   628,   628,
+     628,   629,   630,   630,   631,   631,   632,   633,   633,   634,
+     635,   635,   636,   636,   637,   638,   639,   640,   641,   641,
+     642,   642,   642,   643,   644,   644,   645,   645,   645,   646,
+     646,   647,   647,   648,   648,   648,   648,   648,   648,   648,
+     648,   648,   648,   648,   649,   651,   650,   650,   652,   652,
+     653,   654,   655,   655,   656,   657,   658,   658,   659,   660,
+     660,   661,   661,   662,   663,   664,   665,   665,   666,   666,
+     667,   668,   668,   669,   669,   670,   670,   671,   671,   672,
+     672,   672,   672,   672,   672,   672,   672,   672,   672,   672,
+     673,   673,   674,   674,   675,   676,   676,   677,   678,   679,
+     679,   679,   680,   680,   681,   682,   682,   683,   683,   684,
+     685,   685,   686,   687,   688,   688,   688,   689,   689,   690,
+     690,   690,   691,   691,   692,   693,   693,   694,   694,   694,
+     694,   694,   694,   694,   695,   696,   697,   698,   699,   699,
+     699,   700,   701,   702,   703,   703,   704,   704,   705,   705,
+     705,   705,   705,   705,   705,   705,   705,   706,   706,   707,
+     707,   707,   707,   707,   708,   709,   709,   710,   710,   710,
+     710,   711,   712,   713,   713,   714,   714,   715,   715,   716,
+     717,   718,   719,   720,   721,   721,   722,   723,   723,   724,
+     724,   725,   725,   726,   726,   727,   727,   728,   729,   729,
+     729,   729,   729,   730,   731,   732,   732,   733,   734,   734,
+     735,   736,   736,   737,   738,   739,   739,   740,   740,   741,
+     741,   742,   742,   742,   742,   743,   744,   745,   746,   747,
+     748,   748,   749,   750,   750,   751,   751,   752,   753,   754,
+     755,   756,   756,   757,   758,   759,   760,   761,   762,   763,
+     764,   764,   765,   765,   765,   766,   767,   768,   768,   769,
+     769,   770,   770,   771,   772,   772,   773,   773,   774,   774,
+     775,   776,   777,   777,   777,   778,   779,   779,   780,   781,
+     782,   782,   783,   784,   785,   785,   785,   785,   785,   785,
+     785,   785,   785,   785,   785,   785,   785,   785,   785,   785,
+     785,   785,   785,   785,   785,   785,   785,   785,   785,   785,
+     786,   787,   788,   788,   789,   789,   790,   790,   790,   790,
+     790,   790,   790,   790,   790,   791,   792,   793,   794,   795,
+     796,   797,   798,   798,   798,   799,   800,   801,   802,   803,
+     804,   804,   804,   804,   804,   804,   804,   804,   804,   804,
+     804,   804,   804,   804,   805,   805,   806,   806,   807,   807,
+     807,   807,   808,   808,   809,   810,   810,   811,   811,   812,
+     812,   813,   813,   813,   813,   813,   813,   814,   815,   815,
+     816,   816,   816,   816,   817,   817,   818,   818,   819,   819,
+     820,   820,   821,   821,   822,   822,   823,   824,   825,   826,
+     826,   827,   827,   828,   828,   829,   829,   829,   829,   829,
+     829,   829,   829,   829,   829,   829,   830,   831,   831,   832,
+     833,   833,   834,   835,   836,   837,   838,   839,   840,   841,
+     842,   842,   843,   843,   844,   844,   845,   846,   846,   846,
+     846,   847,   848,   849,   849,   850,   850,   850,   850,   850,
+     850,   851,   852,   853,   853,   853,   854,   854,   854,   855,
+     855,   856,   856,   857,   857,   857,   858,   858,   858,   858,
+     858,   859,   860,   861,   862,   862,   863,   863,   864,   865,
+     866,   867,   867,   868,   869,   870,   870,   871,   871,   872,
+     872,   873,   873,   873,   873,   873,   873,   874,   875,   876,
+     877,   877,   877,   878,   878,   879,   879,   880,   880,   881,
+     881,   882,   883,   883,   884,   884,   884,   884,   884,   885,
+     886,   887,   888,   889,   890,   890,   891,   892,   892,   893,
+     893,   893,   894,   895,   896,   897,   897,   898,   898,   898,
+     898,   898,   898,   898,   898,   899,   900,   901,   901,   902,
+     903,   903,   904,   904,   904,   904,   904,   905,   905,   906,
+     906,   907,   907,   908
 };
 
   /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
@@ -3827,13 +3771,13 @@ static const yytype_uint8 yyr2[] =
        4,     4,     1,     1,     1,     3,     2,     2,     1,     1,
        4,     1,     3,     1,     3,     0,     1,     1,     2,     6,
        3,     1,     1,     1,     1,     1,     1,     5,     5,     5,
-       3,    10,    10,     1,     3,     2,     0,     6,     0,     6,
-       2,     1,     3,     1,     1,     1,     1,     1,     5,     5,
-       5,     5,     5,     1,     3,     3,     1,     3,     1,     1,
-       1,     5,     5,     5,     1,     3,     2,     5,     2,     5,
-       5,     2,     5,     2,     5,     1,     1,     3,     5,     1,
-       3,     5,     5,     5,     5,     7,     1,     3,     2,     2,
-       2,     2,     0
+       3,    10,    10,     1,     3,     2,     5,     0,     6,     0,
+       6,     2,     1,     3,     1,     1,     1,     1,     1,     5,
+       5,     5,     5,     5,     1,     3,     3,     1,     3,     1,
+       1,     1,     5,     5,     5,     1,     3,     2,     5,     2,
+       5,     5,     2,     5,     2,     5,     1,     1,     3,     5,
+       1,     3,     5,     5,     5,     5,     7,     1,     3,     2,
+       2,     2,     2,     0
 };
 
 
@@ -4510,25 +4454,25 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-#line 796 "gram1.y" /* yacc.c:1646  */
+#line 797 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = BFNULL; }
-#line 4516 "gram1.tab.c" /* yacc.c:1646  */
+#line 4460 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 3:
-#line 798 "gram1.y" /* yacc.c:1646  */
+#line 799 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = set_stat_list((yyvsp[-2].bf_node),(yyvsp[-1].bf_node)); }
-#line 4522 "gram1.tab.c" /* yacc.c:1646  */
+#line 4466 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 4:
-#line 802 "gram1.y" /* yacc.c:1646  */
+#line 803 "gram1.y" /* yacc.c:1646  */
     { lastwasbranch = NO;  (yyval.bf_node) = BFNULL; }
-#line 4528 "gram1.tab.c" /* yacc.c:1646  */
+#line 4472 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 5:
-#line 804 "gram1.y" /* yacc.c:1646  */
+#line 805 "gram1.y" /* yacc.c:1646  */
     {
 	       if ((yyvsp[-1].bf_node) != BFNULL) 
                {	    
@@ -4542,11 +4486,11 @@ yyreduce:
 		  }                                       /*OMP*/
                }
 	    }
-#line 4546 "gram1.tab.c" /* yacc.c:1646  */
+#line 4490 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 6:
-#line 818 "gram1.y" /* yacc.c:1646  */
+#line 819 "gram1.y" /* yacc.c:1646  */
     { PTR_BFND p;
 
 	     if(lastwasbranch && ! thislabel)
@@ -4577,11 +4521,11 @@ yyreduce:
                 ++end_group;
 	     (yyval.bf_node) = (yyvsp[-1].bf_node);
      }
-#line 4581 "gram1.tab.c" /* yacc.c:1646  */
+#line 4525 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 7:
-#line 849 "gram1.y" /* yacc.c:1646  */
+#line 850 "gram1.y" /* yacc.c:1646  */
     { /* PTR_LLND p; */
 			doinclude( (yyvsp[0].charp) );
 /*			p = make_llnd(fi, STRING_VAL, LLNULL, LLNULL, SMNULL);
@@ -4590,21 +4534,21 @@ yyreduce:
 			$$ = get_bfnd(fi, INCLUDE_STAT, SMNULL, p, LLNULL); */
 			(yyval.bf_node) = BFNULL;
 		}
-#line 4594 "gram1.tab.c" /* yacc.c:1646  */
+#line 4538 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 8:
-#line 858 "gram1.y" /* yacc.c:1646  */
+#line 859 "gram1.y" /* yacc.c:1646  */
     {
 	      err("Unclassifiable statement", 10);
 	      flline();
 	      (yyval.bf_node) = BFNULL;
 	    }
-#line 4604 "gram1.tab.c" /* yacc.c:1646  */
+#line 4548 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 9:
-#line 864 "gram1.y" /* yacc.c:1646  */
+#line 865 "gram1.y" /* yacc.c:1646  */
     { PTR_CMNT p;
               PTR_BFND bif; 
 	    
@@ -4623,22 +4567,22 @@ yyreduce:
               }
  	      (yyval.bf_node) = BFNULL;         
             }
-#line 4627 "gram1.tab.c" /* yacc.c:1646  */
+#line 4571 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 10:
-#line 884 "gram1.y" /* yacc.c:1646  */
+#line 885 "gram1.y" /* yacc.c:1646  */
     { 
 	      flline();	 needkwd = NO;	inioctl = NO;
 /*!!!*/
               opt_kwd_ = NO; intonly = NO; opt_kwd_hedr = NO; opt_kwd_r = NO; as_op_kwd_= NO; optcorner = NO;
 	      yyerrok; yyclearin;  (yyval.bf_node) = BFNULL;
 	    }
-#line 4638 "gram1.tab.c" /* yacc.c:1646  */
+#line 4582 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 11:
-#line 893 "gram1.y" /* yacc.c:1646  */
+#line 894 "gram1.y" /* yacc.c:1646  */
     {
 	    if(yystno)
 	      {
@@ -4652,11 +4596,11 @@ yyreduce:
 	    else
 	      (yyval.label) = thislabel = LBNULL;
 	    }
-#line 4656 "gram1.tab.c" /* yacc.c:1646  */
+#line 4600 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 12:
-#line 909 "gram1.y" /* yacc.c:1646  */
+#line 910 "gram1.y" /* yacc.c:1646  */
     { PTR_BFND p;
 
 	        if (pred_bfnd != global_bfnd)
@@ -4667,11 +4611,11 @@ yyreduce:
 	        add_scope_level(p, NO);
 	        position = IN_PROC;
 	    }
-#line 4671 "gram1.tab.c" /* yacc.c:1646  */
+#line 4615 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 13:
-#line 921 "gram1.y" /* yacc.c:1646  */
+#line 922 "gram1.y" /* yacc.c:1646  */
     {  PTR_BFND q = BFNULL;
 
 	      (yyvsp[0].symbol)->variant = PROCEDURE_NAME;
@@ -4680,49 +4624,49 @@ yyreduce:
 	      set_blobs(q, global_bfnd, NEW_GROUP1);
               add_scope_level(q, NO);
 	    }
-#line 4684 "gram1.tab.c" /* yacc.c:1646  */
+#line 4628 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 14:
-#line 931 "gram1.y" /* yacc.c:1646  */
+#line 932 "gram1.y" /* yacc.c:1646  */
     { 
               install_param_list((yyvsp[-1].symbol), (yyvsp[0].symbol), LLNULL, PROCEDURE_NAME); 
 	      /* if there is only a control end the control parent is not set */
               
 	     }
-#line 4694 "gram1.tab.c" /* yacc.c:1646  */
+#line 4638 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 15:
-#line 938 "gram1.y" /* yacc.c:1646  */
+#line 939 "gram1.y" /* yacc.c:1646  */
     { install_param_list((yyvsp[-1].symbol), (yyvsp[0].symbol), LLNULL, PROCEDURE_NAME); 
               if((yyvsp[-4].ll_node)->variant == RECURSIVE_OP) 
                    (yyvsp[-1].symbol)->attr = (yyvsp[-1].symbol)->attr | RECURSIVE_BIT;
               pred_bfnd->entry.Template.ll_ptr3 = (yyvsp[-4].ll_node);
             }
-#line 4704 "gram1.tab.c" /* yacc.c:1646  */
+#line 4648 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 16:
-#line 944 "gram1.y" /* yacc.c:1646  */
+#line 945 "gram1.y" /* yacc.c:1646  */
     {
               install_param_list((yyvsp[-2].symbol), (yyvsp[-1].symbol), (yyvsp[0].ll_node), FUNCTION_NAME);  
   	      pred_bfnd->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
             }
-#line 4713 "gram1.tab.c" /* yacc.c:1646  */
+#line 4657 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 17:
-#line 949 "gram1.y" /* yacc.c:1646  */
+#line 950 "gram1.y" /* yacc.c:1646  */
     {
               install_param_list((yyvsp[-2].symbol), (yyvsp[-1].symbol), (yyvsp[0].ll_node), FUNCTION_NAME); 
 	      pred_bfnd->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
 	    }
-#line 4722 "gram1.tab.c" /* yacc.c:1646  */
+#line 4666 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 18:
-#line 954 "gram1.y" /* yacc.c:1646  */
+#line 955 "gram1.y" /* yacc.c:1646  */
     {PTR_BFND p, bif;
 	     PTR_SYMB q = SMNULL;
              PTR_LLND l = LLNULL;
@@ -4746,11 +4690,11 @@ yyreduce:
              q->decl = YES;   /*4.02.03*/
              q->entry.proc_decl.proc_hedr = p; /*5.02.03*/
 	    }
-#line 4750 "gram1.tab.c" /* yacc.c:1646  */
+#line 4694 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 19:
-#line 978 "gram1.y" /* yacc.c:1646  */
+#line 979 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	      PTR_BFND p;
 /*
@@ -4775,11 +4719,11 @@ yyreduce:
 	      position =  IN_MODULE;    /*IN_PROC*/
               privateall = 0;
             }
-#line 4779 "gram1.tab.c" /* yacc.c:1646  */
+#line 4723 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 20:
-#line 1004 "gram1.y" /* yacc.c:1646  */
+#line 1005 "gram1.y" /* yacc.c:1646  */
     { newprog(); 
 	      if (position == IN_OUTSIDE)
 	           position = IN_PROC;
@@ -4792,29 +4736,29 @@ yyreduce:
                   err("Internal procedures can not contain procedures",304);
               }
 	    }
-#line 4796 "gram1.tab.c" /* yacc.c:1646  */
+#line 4740 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 21:
-#line 1019 "gram1.y" /* yacc.c:1646  */
+#line 1020 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, RECURSIVE_OP, LLNULL, LLNULL, SMNULL); }
-#line 4802 "gram1.tab.c" /* yacc.c:1646  */
+#line 4746 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 22:
-#line 1021 "gram1.y" /* yacc.c:1646  */
+#line 1022 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, PURE_OP, LLNULL, LLNULL, SMNULL); }
-#line 4808 "gram1.tab.c" /* yacc.c:1646  */
+#line 4752 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 23:
-#line 1023 "gram1.y" /* yacc.c:1646  */
+#line 1024 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, ELEMENTAL_OP, LLNULL, LLNULL, SMNULL); }
-#line 4814 "gram1.tab.c" /* yacc.c:1646  */
+#line 4758 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 24:
-#line 1027 "gram1.y" /* yacc.c:1646  */
+#line 1028 "gram1.y" /* yacc.c:1646  */
     { PTR_BFND p;
 
 	      (yyval.symbol) = make_procedure((yyvsp[0].hash_entry), LOCAL);
@@ -4829,11 +4773,11 @@ yyreduce:
 	      set_blobs(p, pred_bfnd, NEW_GROUP1);
               add_scope_level(p, NO);
             }
-#line 4833 "gram1.tab.c" /* yacc.c:1646  */
+#line 4777 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 25:
-#line 1044 "gram1.y" /* yacc.c:1646  */
+#line 1045 "gram1.y" /* yacc.c:1646  */
     { PTR_BFND p;
 
 	      (yyval.symbol) = make_function((yyvsp[0].hash_entry), TYNULL, LOCAL);
@@ -4845,11 +4789,11 @@ yyreduce:
 	      set_blobs(p, pred_bfnd, NEW_GROUP1);
               add_scope_level(p, NO);
             }
-#line 4849 "gram1.tab.c" /* yacc.c:1646  */
+#line 4793 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 26:
-#line 1058 "gram1.y" /* yacc.c:1646  */
+#line 1059 "gram1.y" /* yacc.c:1646  */
     { PTR_BFND p;
              PTR_LLND l;
 
@@ -4873,11 +4817,11 @@ yyreduce:
               add_scope_level(p, NO);
 */
            }
-#line 4877 "gram1.tab.c" /* yacc.c:1646  */
+#line 4821 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 27:
-#line 1082 "gram1.y" /* yacc.c:1646  */
+#line 1083 "gram1.y" /* yacc.c:1646  */
     { PTR_BFND p;
              PTR_LLND l;
 	      (yyval.symbol) = make_function((yyvsp[0].hash_entry), (yyvsp[-4].data_type), LOCAL);
@@ -4893,11 +4837,11 @@ yyreduce:
 	      set_blobs(p, pred_bfnd, NEW_GROUP1);
               add_scope_level(p, NO);
             }
-#line 4897 "gram1.tab.c" /* yacc.c:1646  */
+#line 4841 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 28:
-#line 1098 "gram1.y" /* yacc.c:1646  */
+#line 1099 "gram1.y" /* yacc.c:1646  */
     { PTR_BFND p;
 
 	      (yyval.symbol) = make_function((yyvsp[0].hash_entry), TYNULL, LOCAL);
@@ -4911,11 +4855,11 @@ yyreduce:
 	      set_blobs(p, pred_bfnd, NEW_GROUP1);
               add_scope_level(p, NO);
             }
-#line 4915 "gram1.tab.c" /* yacc.c:1646  */
+#line 4859 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 29:
-#line 1112 "gram1.y" /* yacc.c:1646  */
+#line 1113 "gram1.y" /* yacc.c:1646  */
     { PTR_BFND p;
               PTR_LLND l;
 	      (yyval.symbol) = make_function((yyvsp[0].hash_entry), (yyvsp[-3].data_type), LOCAL);
@@ -4931,171 +4875,171 @@ yyreduce:
 	      set_blobs(p, pred_bfnd, NEW_GROUP1);
               add_scope_level(p, NO);
             }
-#line 4935 "gram1.tab.c" /* yacc.c:1646  */
+#line 4879 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 30:
-#line 1130 "gram1.y" /* yacc.c:1646  */
+#line 1131 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 4941 "gram1.tab.c" /* yacc.c:1646  */
+#line 4885 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 31:
-#line 1132 "gram1.y" /* yacc.c:1646  */
+#line 1133 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
               s = make_scalar((yyvsp[-1].hash_entry), TYNULL, LOCAL);
               (yyval.ll_node) = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
             }
-#line 4950 "gram1.tab.c" /* yacc.c:1646  */
+#line 4894 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 32:
-#line 1139 "gram1.y" /* yacc.c:1646  */
+#line 1140 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_sym(yytext); }
-#line 4956 "gram1.tab.c" /* yacc.c:1646  */
+#line 4900 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 33:
-#line 1142 "gram1.y" /* yacc.c:1646  */
+#line 1143 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = make_program(look_up_sym("_MAIN")); }
-#line 4962 "gram1.tab.c" /* yacc.c:1646  */
+#line 4906 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 34:
-#line 1144 "gram1.y" /* yacc.c:1646  */
+#line 1145 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.symbol) = make_program((yyvsp[0].hash_entry));
 	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
             }
-#line 4971 "gram1.tab.c" /* yacc.c:1646  */
+#line 4915 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 35:
-#line 1150 "gram1.y" /* yacc.c:1646  */
+#line 1151 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = make_program(look_up_sym("_BLOCK")); }
-#line 4977 "gram1.tab.c" /* yacc.c:1646  */
+#line 4921 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 36:
-#line 1152 "gram1.y" /* yacc.c:1646  */
+#line 1153 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.symbol) = make_program((yyvsp[0].hash_entry)); 
 	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
 	    }
-#line 4986 "gram1.tab.c" /* yacc.c:1646  */
+#line 4930 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 37:
-#line 1159 "gram1.y" /* yacc.c:1646  */
+#line 1160 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = SMNULL; }
-#line 4992 "gram1.tab.c" /* yacc.c:1646  */
+#line 4936 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 38:
-#line 1161 "gram1.y" /* yacc.c:1646  */
+#line 1162 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = SMNULL; }
-#line 4998 "gram1.tab.c" /* yacc.c:1646  */
+#line 4942 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 39:
-#line 1163 "gram1.y" /* yacc.c:1646  */
+#line 1164 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = (yyvsp[-1].symbol); }
-#line 5004 "gram1.tab.c" /* yacc.c:1646  */
+#line 4948 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 41:
-#line 1168 "gram1.y" /* yacc.c:1646  */
+#line 1169 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = set_id_list((yyvsp[-2].symbol), (yyvsp[0].symbol)); }
-#line 5010 "gram1.tab.c" /* yacc.c:1646  */
+#line 4954 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 42:
-#line 1172 "gram1.y" /* yacc.c:1646  */
+#line 1173 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.symbol) = make_scalar((yyvsp[0].hash_entry), TYNULL, IO);
             }
-#line 5018 "gram1.tab.c" /* yacc.c:1646  */
+#line 4962 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 43:
-#line 1176 "gram1.y" /* yacc.c:1646  */
+#line 1177 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = make_scalar(look_up_sym("*"), TYNULL, IO); }
-#line 5024 "gram1.tab.c" /* yacc.c:1646  */
+#line 4968 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 44:
-#line 1182 "gram1.y" /* yacc.c:1646  */
+#line 1183 "gram1.y" /* yacc.c:1646  */
     { char *s;
 
 	      s = copyn(yyleng+1, yytext);
 	      s[yyleng] = '\0';
 	      (yyval.charp) = s;
 	    }
-#line 5035 "gram1.tab.c" /* yacc.c:1646  */
+#line 4979 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 45:
-#line 1191 "gram1.y" /* yacc.c:1646  */
+#line 1192 "gram1.y" /* yacc.c:1646  */
     { needkwd = 1; }
-#line 5041 "gram1.tab.c" /* yacc.c:1646  */
+#line 4985 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 46:
-#line 1195 "gram1.y" /* yacc.c:1646  */
+#line 1196 "gram1.y" /* yacc.c:1646  */
     { needkwd = NO; }
-#line 5047 "gram1.tab.c" /* yacc.c:1646  */
+#line 4991 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 47:
-#line 1200 "gram1.y" /* yacc.c:1646  */
+#line 1201 "gram1.y" /* yacc.c:1646  */
     { colon_flag = YES; }
-#line 5053 "gram1.tab.c" /* yacc.c:1646  */
+#line 4997 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 62:
-#line 1222 "gram1.y" /* yacc.c:1646  */
+#line 1223 "gram1.y" /* yacc.c:1646  */
     {
 	      saveall = YES;
 	      (yyval.bf_node) = get_bfnd(fi,SAVE_DECL, SMNULL, LLNULL, LLNULL, LLNULL);
 	    }
-#line 5062 "gram1.tab.c" /* yacc.c:1646  */
+#line 5006 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 63:
-#line 1227 "gram1.y" /* yacc.c:1646  */
+#line 1228 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.bf_node) = get_bfnd(fi,SAVE_DECL, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
             }
-#line 5070 "gram1.tab.c" /* yacc.c:1646  */
+#line 5014 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 64:
-#line 1232 "gram1.y" /* yacc.c:1646  */
+#line 1233 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 
 	      p = make_llnd(fi,STMT_STR, LLNULL, LLNULL, SMNULL);
 	      p->entry.string_val = copys(stmtbuf);
 	      (yyval.bf_node) = get_bfnd(fi,FORMAT_STAT, SMNULL, p, LLNULL, LLNULL);
              }
-#line 5081 "gram1.tab.c" /* yacc.c:1646  */
+#line 5025 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 65:
-#line 1239 "gram1.y" /* yacc.c:1646  */
+#line 1240 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,PARAM_DECL, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL); }
-#line 5087 "gram1.tab.c" /* yacc.c:1646  */
+#line 5031 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 78:
-#line 1255 "gram1.y" /* yacc.c:1646  */
+#line 1256 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, INTERFACE_STMT, SMNULL, LLNULL, LLNULL, LLNULL); 
               add_scope_level((yyval.bf_node), NO);     
             }
-#line 5095 "gram1.tab.c" /* yacc.c:1646  */
+#line 5039 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 79:
-#line 1259 "gram1.y" /* yacc.c:1646  */
+#line 1260 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 
 	      s = make_procedure((yyvsp[0].hash_entry), LOCAL);
@@ -5103,11 +5047,11 @@ yyreduce:
 	      (yyval.bf_node) = get_bfnd(fi, INTERFACE_STMT, s, LLNULL, LLNULL, LLNULL);
               add_scope_level((yyval.bf_node), NO);
 	    }
-#line 5107 "gram1.tab.c" /* yacc.c:1646  */
+#line 5051 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 80:
-#line 1267 "gram1.y" /* yacc.c:1646  */
+#line 1268 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 
 	      s = make_function((yyvsp[-1].hash_entry), global_default, LOCAL);
@@ -5115,11 +5059,11 @@ yyreduce:
 	      (yyval.bf_node) = get_bfnd(fi, INTERFACE_OPERATOR, s, LLNULL, LLNULL, LLNULL);
               add_scope_level((yyval.bf_node), NO);
 	    }
-#line 5119 "gram1.tab.c" /* yacc.c:1646  */
+#line 5063 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 81:
-#line 1275 "gram1.y" /* yacc.c:1646  */
+#line 1276 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 
 
@@ -5128,147 +5072,147 @@ yyreduce:
 	      (yyval.bf_node) = get_bfnd(fi, INTERFACE_ASSIGNMENT, s, LLNULL, LLNULL, LLNULL);
               add_scope_level((yyval.bf_node), NO);
 	    }
-#line 5132 "gram1.tab.c" /* yacc.c:1646  */
+#line 5076 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 82:
-#line 1284 "gram1.y" /* yacc.c:1646  */
+#line 1285 "gram1.y" /* yacc.c:1646  */
     { parstate = INDCL;
               (yyval.bf_node) = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
 	      /*process_interface($$);*/ /*podd 01.02.03*/
               delete_beyond_scope_level(pred_bfnd);
 	    }
-#line 5142 "gram1.tab.c" /* yacc.c:1646  */
+#line 5086 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 83:
-#line 1292 "gram1.y" /* yacc.c:1646  */
+#line 1293 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_sym(yytext); }
-#line 5148 "gram1.tab.c" /* yacc.c:1646  */
+#line 5092 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 84:
-#line 1296 "gram1.y" /* yacc.c:1646  */
+#line 1297 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = (yyvsp[0].hash_entry); }
-#line 5154 "gram1.tab.c" /* yacc.c:1646  */
+#line 5098 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 85:
-#line 1298 "gram1.y" /* yacc.c:1646  */
+#line 1299 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = (yyvsp[0].hash_entry); }
-#line 5160 "gram1.tab.c" /* yacc.c:1646  */
+#line 5104 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 86:
-#line 1302 "gram1.y" /* yacc.c:1646  */
+#line 1303 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(PLUS); }
-#line 5166 "gram1.tab.c" /* yacc.c:1646  */
+#line 5110 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 87:
-#line 1304 "gram1.y" /* yacc.c:1646  */
+#line 1305 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(MINUS); }
-#line 5172 "gram1.tab.c" /* yacc.c:1646  */
+#line 5116 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 88:
-#line 1306 "gram1.y" /* yacc.c:1646  */
+#line 1307 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(ASTER); }
-#line 5178 "gram1.tab.c" /* yacc.c:1646  */
+#line 5122 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 89:
-#line 1308 "gram1.y" /* yacc.c:1646  */
+#line 1309 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(DASTER); }
-#line 5184 "gram1.tab.c" /* yacc.c:1646  */
+#line 5128 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 90:
-#line 1310 "gram1.y" /* yacc.c:1646  */
+#line 1311 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(SLASH); }
-#line 5190 "gram1.tab.c" /* yacc.c:1646  */
+#line 5134 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 91:
-#line 1312 "gram1.y" /* yacc.c:1646  */
+#line 1313 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(DSLASH); }
-#line 5196 "gram1.tab.c" /* yacc.c:1646  */
+#line 5140 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 92:
-#line 1314 "gram1.y" /* yacc.c:1646  */
+#line 1315 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(AND); }
-#line 5202 "gram1.tab.c" /* yacc.c:1646  */
+#line 5146 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 93:
-#line 1316 "gram1.y" /* yacc.c:1646  */
+#line 1317 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(OR); }
-#line 5208 "gram1.tab.c" /* yacc.c:1646  */
+#line 5152 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 94:
-#line 1318 "gram1.y" /* yacc.c:1646  */
+#line 1319 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(XOR); }
-#line 5214 "gram1.tab.c" /* yacc.c:1646  */
+#line 5158 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 95:
-#line 1320 "gram1.y" /* yacc.c:1646  */
+#line 1321 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(NOT); }
-#line 5220 "gram1.tab.c" /* yacc.c:1646  */
+#line 5164 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 96:
-#line 1322 "gram1.y" /* yacc.c:1646  */
+#line 1323 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(EQ); }
-#line 5226 "gram1.tab.c" /* yacc.c:1646  */
+#line 5170 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 97:
-#line 1324 "gram1.y" /* yacc.c:1646  */
+#line 1325 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(NE); }
-#line 5232 "gram1.tab.c" /* yacc.c:1646  */
+#line 5176 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 98:
-#line 1326 "gram1.y" /* yacc.c:1646  */
+#line 1327 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(GT); }
-#line 5238 "gram1.tab.c" /* yacc.c:1646  */
+#line 5182 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 99:
-#line 1328 "gram1.y" /* yacc.c:1646  */
+#line 1329 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(GE); }
-#line 5244 "gram1.tab.c" /* yacc.c:1646  */
+#line 5188 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 100:
-#line 1330 "gram1.y" /* yacc.c:1646  */
+#line 1331 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(LT); }
-#line 5250 "gram1.tab.c" /* yacc.c:1646  */
+#line 5194 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 101:
-#line 1332 "gram1.y" /* yacc.c:1646  */
+#line 1333 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(LE); }
-#line 5256 "gram1.tab.c" /* yacc.c:1646  */
+#line 5200 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 102:
-#line 1334 "gram1.y" /* yacc.c:1646  */
+#line 1335 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(NEQV); }
-#line 5262 "gram1.tab.c" /* yacc.c:1646  */
+#line 5206 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 103:
-#line 1336 "gram1.y" /* yacc.c:1646  */
+#line 1337 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = look_up_op(EQV); }
-#line 5268 "gram1.tab.c" /* yacc.c:1646  */
+#line 5212 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 104:
-#line 1341 "gram1.y" /* yacc.c:1646  */
+#line 1342 "gram1.y" /* yacc.c:1646  */
     {
              PTR_SYMB s;
          
@@ -5276,11 +5220,11 @@ yyreduce:
              (yyval.bf_node) = get_bfnd(fi, STRUCT_DECL, s, LLNULL, LLNULL, LLNULL);
              add_scope_level((yyval.bf_node), NO);
 	   }
-#line 5280 "gram1.tab.c" /* yacc.c:1646  */
+#line 5224 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 105:
-#line 1350 "gram1.y" /* yacc.c:1646  */
+#line 1351 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
          
              type_var = s = make_derived_type((yyvsp[0].hash_entry), TYNULL, LOCAL);	
@@ -5288,11 +5232,11 @@ yyreduce:
              (yyval.bf_node) = get_bfnd(fi, STRUCT_DECL, s, (yyvsp[-2].ll_node), LLNULL, LLNULL);
              add_scope_level((yyval.bf_node), NO);
 	   }
-#line 5292 "gram1.tab.c" /* yacc.c:1646  */
+#line 5236 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 106:
-#line 1360 "gram1.y" /* yacc.c:1646  */
+#line 1361 "gram1.y" /* yacc.c:1646  */
     {
 	     (yyval.bf_node) = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
 	     if (type_var != SMNULL)
@@ -5300,11 +5244,11 @@ yyreduce:
              type_var = SMNULL;
 	     delete_beyond_scope_level(pred_bfnd);
            }
-#line 5304 "gram1.tab.c" /* yacc.c:1646  */
+#line 5248 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 107:
-#line 1368 "gram1.y" /* yacc.c:1646  */
+#line 1369 "gram1.y" /* yacc.c:1646  */
     {
              (yyval.bf_node) = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
 	     if (type_var != SMNULL)
@@ -5312,11 +5256,11 @@ yyreduce:
              type_var = SMNULL;
 	     delete_beyond_scope_level(pred_bfnd);	
            }
-#line 5316 "gram1.tab.c" /* yacc.c:1646  */
+#line 5260 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 108:
-#line 1378 "gram1.y" /* yacc.c:1646  */
+#line 1379 "gram1.y" /* yacc.c:1646  */
     { 
 	      PTR_LLND q, r, l;
 	     /* PTR_SYMB s;*/
@@ -5337,11 +5281,11 @@ yyreduce:
 	      l->type = vartype;
 	      (yyval.bf_node) = get_bfnd(fi,VAR_DECL, SMNULL, r, l, (yyvsp[-5].ll_node));
 	    }
-#line 5341 "gram1.tab.c" /* yacc.c:1646  */
+#line 5285 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 109:
-#line 1399 "gram1.y" /* yacc.c:1646  */
+#line 1400 "gram1.y" /* yacc.c:1646  */
     { 
 	      PTR_LLND q, r;
 	    /*  PTR_SYMB s;*/
@@ -5358,177 +5302,177 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      add_to_lowLevelList(r, (yyvsp[-5].bf_node)->entry.Template.ll_ptr1);
        	    }
-#line 5362 "gram1.tab.c" /* yacc.c:1646  */
+#line 5306 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 110:
-#line 1418 "gram1.y" /* yacc.c:1646  */
+#line 1419 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 5368 "gram1.tab.c" /* yacc.c:1646  */
+#line 5312 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 111:
-#line 1420 "gram1.y" /* yacc.c:1646  */
+#line 1421 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 5374 "gram1.tab.c" /* yacc.c:1646  */
+#line 5318 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 112:
-#line 1422 "gram1.y" /* yacc.c:1646  */
+#line 1423 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-2].ll_node); }
-#line 5380 "gram1.tab.c" /* yacc.c:1646  */
+#line 5324 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 113:
-#line 1426 "gram1.y" /* yacc.c:1646  */
+#line 1427 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 5386 "gram1.tab.c" /* yacc.c:1646  */
+#line 5330 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 114:
-#line 1428 "gram1.y" /* yacc.c:1646  */
+#line 1429 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 5392 "gram1.tab.c" /* yacc.c:1646  */
+#line 5336 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 115:
-#line 1432 "gram1.y" /* yacc.c:1646  */
+#line 1433 "gram1.y" /* yacc.c:1646  */
     { type_options = type_options | PARAMETER_BIT; 
               (yyval.ll_node) = make_llnd(fi, PARAMETER_OP, LLNULL, LLNULL, SMNULL);
             }
-#line 5400 "gram1.tab.c" /* yacc.c:1646  */
+#line 5344 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 116:
-#line 1436 "gram1.y" /* yacc.c:1646  */
+#line 1437 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 5406 "gram1.tab.c" /* yacc.c:1646  */
+#line 5350 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 117:
-#line 1438 "gram1.y" /* yacc.c:1646  */
+#line 1439 "gram1.y" /* yacc.c:1646  */
     { type_options = type_options | ALLOCATABLE_BIT;
               (yyval.ll_node) = make_llnd(fi, ALLOCATABLE_OP, LLNULL, LLNULL, SMNULL);
 	    }
-#line 5414 "gram1.tab.c" /* yacc.c:1646  */
+#line 5358 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 118:
-#line 1442 "gram1.y" /* yacc.c:1646  */
+#line 1443 "gram1.y" /* yacc.c:1646  */
     { type_options = type_options | DIMENSION_BIT;
 	      attr_ndim = ndim;
 	      attr_dims = (yyvsp[0].ll_node);
               (yyval.ll_node) = make_llnd(fi, DIMENSION_OP, (yyvsp[0].ll_node), LLNULL, SMNULL);
             }
-#line 5424 "gram1.tab.c" /* yacc.c:1646  */
+#line 5368 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 119:
-#line 1448 "gram1.y" /* yacc.c:1646  */
+#line 1449 "gram1.y" /* yacc.c:1646  */
     { type_options = type_options | EXTERNAL_BIT;
               (yyval.ll_node) = make_llnd(fi, EXTERNAL_OP, LLNULL, LLNULL, SMNULL);
             }
-#line 5432 "gram1.tab.c" /* yacc.c:1646  */
+#line 5376 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 120:
-#line 1452 "gram1.y" /* yacc.c:1646  */
+#line 1453 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 5438 "gram1.tab.c" /* yacc.c:1646  */
+#line 5382 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 121:
-#line 1454 "gram1.y" /* yacc.c:1646  */
+#line 1455 "gram1.y" /* yacc.c:1646  */
     { type_options = type_options | INTRINSIC_BIT;
               (yyval.ll_node) = make_llnd(fi, INTRINSIC_OP, LLNULL, LLNULL, SMNULL);
             }
+#line 5390 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 122:
+#line 1459 "gram1.y" /* yacc.c:1646  */
+    { type_options = type_options | OPTIONAL_BIT;
+              (yyval.ll_node) = make_llnd(fi, OPTIONAL_OP, LLNULL, LLNULL, SMNULL);
+            }
+#line 5398 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 123:
+#line 1463 "gram1.y" /* yacc.c:1646  */
+    { type_options = type_options | POINTER_BIT;
+              (yyval.ll_node) = make_llnd(fi, POINTER_OP, LLNULL, LLNULL, SMNULL);
+            }
+#line 5406 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 124:
+#line 1467 "gram1.y" /* yacc.c:1646  */
+    { type_options = type_options | SAVE_BIT; 
+              (yyval.ll_node) = make_llnd(fi, SAVE_OP, LLNULL, LLNULL, SMNULL);
+            }
+#line 5414 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 125:
+#line 1471 "gram1.y" /* yacc.c:1646  */
+    { type_options = type_options | SAVE_BIT; 
+              (yyval.ll_node) = make_llnd(fi, STATIC_OP, LLNULL, LLNULL, SMNULL);
+            }
+#line 5422 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 126:
+#line 1475 "gram1.y" /* yacc.c:1646  */
+    { type_options = type_options | TARGET_BIT; 
+              (yyval.ll_node) = make_llnd(fi, TARGET_OP, LLNULL, LLNULL, SMNULL);
+            }
+#line 5430 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 127:
+#line 1481 "gram1.y" /* yacc.c:1646  */
+    { type_options = type_options | IN_BIT;  type_opt = IN_BIT; 
+              (yyval.ll_node) = make_llnd(fi, IN_OP, LLNULL, LLNULL, SMNULL);
+            }
+#line 5438 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 128:
+#line 1485 "gram1.y" /* yacc.c:1646  */
+    { type_options = type_options | OUT_BIT;  type_opt = OUT_BIT; 
+              (yyval.ll_node) = make_llnd(fi, OUT_OP, LLNULL, LLNULL, SMNULL);
+            }
 #line 5446 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
-  case 122:
-#line 1458 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | OPTIONAL_BIT;
-              (yyval.ll_node) = make_llnd(fi, OPTIONAL_OP, LLNULL, LLNULL, SMNULL);
+  case 129:
+#line 1489 "gram1.y" /* yacc.c:1646  */
+    { type_options = type_options | INOUT_BIT;  type_opt = INOUT_BIT;
+              (yyval.ll_node) = make_llnd(fi, INOUT_OP, LLNULL, LLNULL, SMNULL);
             }
 #line 5454 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
-  case 123:
-#line 1462 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | POINTER_BIT;
-              (yyval.ll_node) = make_llnd(fi, POINTER_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5462 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 124:
-#line 1466 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | SAVE_BIT; 
-              (yyval.ll_node) = make_llnd(fi, SAVE_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5470 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 125:
-#line 1470 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | SAVE_BIT; 
-              (yyval.ll_node) = make_llnd(fi, STATIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5478 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 126:
-#line 1474 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | TARGET_BIT; 
-              (yyval.ll_node) = make_llnd(fi, TARGET_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5486 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 127:
-#line 1480 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | IN_BIT;  type_opt = IN_BIT; 
-              (yyval.ll_node) = make_llnd(fi, IN_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5494 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 128:
-#line 1484 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | OUT_BIT;  type_opt = OUT_BIT; 
-              (yyval.ll_node) = make_llnd(fi, OUT_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5502 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 129:
-#line 1488 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | INOUT_BIT;  type_opt = INOUT_BIT;
-              (yyval.ll_node) = make_llnd(fi, INOUT_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5510 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
   case 130:
-#line 1494 "gram1.y" /* yacc.c:1646  */
+#line 1495 "gram1.y" /* yacc.c:1646  */
     { type_options = type_options | PUBLIC_BIT; 
               type_opt = PUBLIC_BIT;
               (yyval.ll_node) = make_llnd(fi, PUBLIC_OP, LLNULL, LLNULL, SMNULL);
             }
-#line 5519 "gram1.tab.c" /* yacc.c:1646  */
+#line 5463 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 131:
-#line 1499 "gram1.y" /* yacc.c:1646  */
+#line 1500 "gram1.y" /* yacc.c:1646  */
     { type_options =  type_options | PRIVATE_BIT;
                type_opt = PRIVATE_BIT;
               (yyval.ll_node) = make_llnd(fi, PRIVATE_OP, LLNULL, LLNULL, SMNULL);
             }
-#line 5528 "gram1.tab.c" /* yacc.c:1646  */
+#line 5472 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 132:
-#line 1506 "gram1.y" /* yacc.c:1646  */
+#line 1507 "gram1.y" /* yacc.c:1646  */
     { 
 	      PTR_LLND q, r;
 	      PTR_SYMB s;
@@ -5539,11 +5483,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi, INTENT_STMT, SMNULL, r, (yyvsp[-3].ll_node), LLNULL);
 	    }
-#line 5543 "gram1.tab.c" /* yacc.c:1646  */
+#line 5487 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 133:
-#line 1517 "gram1.y" /* yacc.c:1646  */
+#line 1518 "gram1.y" /* yacc.c:1646  */
     { 
 	      PTR_LLND q, r;
 	      PTR_SYMB s;
@@ -5554,11 +5498,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
   	    }
-#line 5558 "gram1.tab.c" /* yacc.c:1646  */
+#line 5502 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 134:
-#line 1530 "gram1.y" /* yacc.c:1646  */
+#line 1531 "gram1.y" /* yacc.c:1646  */
     { 
 	      PTR_LLND q, r;
 	      PTR_SYMB s;
@@ -5569,11 +5513,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi, OPTIONAL_STMT, SMNULL, r, LLNULL, LLNULL);
 	    }
-#line 5573 "gram1.tab.c" /* yacc.c:1646  */
+#line 5517 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 135:
-#line 1541 "gram1.y" /* yacc.c:1646  */
+#line 1542 "gram1.y" /* yacc.c:1646  */
     { 
 	      PTR_LLND q, r;
 	      PTR_SYMB s;
@@ -5584,11 +5528,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
   	    }
-#line 5588 "gram1.tab.c" /* yacc.c:1646  */
+#line 5532 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 136:
-#line 1554 "gram1.y" /* yacc.c:1646  */
+#line 1555 "gram1.y" /* yacc.c:1646  */
     { 
 	      PTR_LLND r;
 	      PTR_SYMB s;
@@ -5598,11 +5542,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi, STATIC_STMT, SMNULL, r, LLNULL, LLNULL);
 	    }
-#line 5602 "gram1.tab.c" /* yacc.c:1646  */
+#line 5546 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 137:
-#line 1564 "gram1.y" /* yacc.c:1646  */
+#line 1565 "gram1.y" /* yacc.c:1646  */
     { 
 	      PTR_LLND r;
 	      PTR_SYMB s;
@@ -5612,67 +5556,67 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
   	    }
-#line 5616 "gram1.tab.c" /* yacc.c:1646  */
+#line 5560 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 138:
-#line 1577 "gram1.y" /* yacc.c:1646  */
+#line 1578 "gram1.y" /* yacc.c:1646  */
     {
 	      privateall = 1;
 	      (yyval.bf_node) = get_bfnd(fi, PRIVATE_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
 	    }
-#line 5625 "gram1.tab.c" /* yacc.c:1646  */
+#line 5569 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 139:
-#line 1582 "gram1.y" /* yacc.c:1646  */
+#line 1583 "gram1.y" /* yacc.c:1646  */
     {
 	      /*type_options = type_options | PRIVATE_BIT;*/
 	      (yyval.bf_node) = get_bfnd(fi, PRIVATE_STMT, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
             }
-#line 5634 "gram1.tab.c" /* yacc.c:1646  */
+#line 5578 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 140:
-#line 1588 "gram1.y" /* yacc.c:1646  */
+#line 1589 "gram1.y" /* yacc.c:1646  */
     {type_opt = PRIVATE_BIT;}
-#line 5640 "gram1.tab.c" /* yacc.c:1646  */
+#line 5584 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 141:
-#line 1592 "gram1.y" /* yacc.c:1646  */
+#line 1593 "gram1.y" /* yacc.c:1646  */
     { 
 	      (yyval.bf_node) = get_bfnd(fi, SEQUENCE_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
             }
-#line 5648 "gram1.tab.c" /* yacc.c:1646  */
+#line 5592 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 142:
-#line 1597 "gram1.y" /* yacc.c:1646  */
+#line 1598 "gram1.y" /* yacc.c:1646  */
     {
 	      /*saveall = YES;*/ /*14.03.03*/
 	      (yyval.bf_node) = get_bfnd(fi, PUBLIC_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
 	    }
-#line 5657 "gram1.tab.c" /* yacc.c:1646  */
+#line 5601 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 143:
-#line 1602 "gram1.y" /* yacc.c:1646  */
+#line 1603 "gram1.y" /* yacc.c:1646  */
     {
 	      /*type_options = type_options | PUBLIC_BIT;*/
 	      (yyval.bf_node) = get_bfnd(fi, PUBLIC_STMT, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
             }
-#line 5666 "gram1.tab.c" /* yacc.c:1646  */
+#line 5610 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 144:
-#line 1608 "gram1.y" /* yacc.c:1646  */
+#line 1609 "gram1.y" /* yacc.c:1646  */
     {type_opt = PUBLIC_BIT;}
-#line 5672 "gram1.tab.c" /* yacc.c:1646  */
+#line 5616 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 145:
-#line 1612 "gram1.y" /* yacc.c:1646  */
+#line 1613 "gram1.y" /* yacc.c:1646  */
     {
 	      type_options = 0;
               /* following block added by dbg */
@@ -5682,11 +5626,11 @@ yyreduce:
 	      /* end section added by dbg */
               (yyval.data_type) = make_type_node((yyvsp[-3].data_type), (yyvsp[-1].ll_node));
             }
-#line 5686 "gram1.tab.c" /* yacc.c:1646  */
+#line 5630 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 146:
-#line 1622 "gram1.y" /* yacc.c:1646  */
+#line 1623 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE t;
 
 	      type_options = 0;
@@ -5697,17 +5641,17 @@ yyreduce:
 	      vartype = t;
 	      (yyval.data_type) = make_type_node(t, LLNULL);
             }
-#line 5701 "gram1.tab.c" /* yacc.c:1646  */
+#line 5645 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 147:
-#line 1635 "gram1.y" /* yacc.c:1646  */
+#line 1636 "gram1.y" /* yacc.c:1646  */
     {opt_kwd_hedr = YES;}
-#line 5707 "gram1.tab.c" /* yacc.c:1646  */
+#line 5651 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 148:
-#line 1640 "gram1.y" /* yacc.c:1646  */
+#line 1641 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE p;
 	      PTR_LLND q;
 	      PTR_SYMB s;
@@ -5724,11 +5668,11 @@ yyreduce:
 	      q = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi,ATTR_DECL, SMNULL, q, LLNULL, LLNULL);
 	    }
-#line 5728 "gram1.tab.c" /* yacc.c:1646  */
+#line 5672 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 149:
-#line 1659 "gram1.y" /* yacc.c:1646  */
+#line 1660 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE p;
 	      PTR_LLND q, r;
 	      PTR_SYMB s;
@@ -5752,156 +5696,156 @@ yyreduce:
 	      r->entry.list.next = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 
 	    }
-#line 5756 "gram1.tab.c" /* yacc.c:1646  */
+#line 5700 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 150:
-#line 1685 "gram1.y" /* yacc.c:1646  */
+#line 1686 "gram1.y" /* yacc.c:1646  */
     { (yyval.token) = ATT_GLOBAL; }
-#line 5762 "gram1.tab.c" /* yacc.c:1646  */
+#line 5706 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 151:
-#line 1687 "gram1.y" /* yacc.c:1646  */
+#line 1688 "gram1.y" /* yacc.c:1646  */
     { (yyval.token) = ATT_CLUSTER; }
-#line 5768 "gram1.tab.c" /* yacc.c:1646  */
+#line 5712 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 152:
-#line 1699 "gram1.y" /* yacc.c:1646  */
+#line 1700 "gram1.y" /* yacc.c:1646  */
     {
 /*		  varleng = ($1<0 || $1==TYLONG ? 0 : typesize[$1]); */
 		  vartype = (yyvsp[0].data_type);
 		}
-#line 5777 "gram1.tab.c" /* yacc.c:1646  */
+#line 5721 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 153:
-#line 1706 "gram1.y" /* yacc.c:1646  */
+#line 1707 "gram1.y" /* yacc.c:1646  */
     { (yyval.data_type) = global_int; }
-#line 5783 "gram1.tab.c" /* yacc.c:1646  */
+#line 5727 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 154:
-#line 1707 "gram1.y" /* yacc.c:1646  */
+#line 1708 "gram1.y" /* yacc.c:1646  */
     { (yyval.data_type) = global_float; }
-#line 5789 "gram1.tab.c" /* yacc.c:1646  */
+#line 5733 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 155:
-#line 1708 "gram1.y" /* yacc.c:1646  */
+#line 1709 "gram1.y" /* yacc.c:1646  */
     { (yyval.data_type) = global_complex; }
-#line 5795 "gram1.tab.c" /* yacc.c:1646  */
+#line 5739 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 156:
-#line 1709 "gram1.y" /* yacc.c:1646  */
+#line 1710 "gram1.y" /* yacc.c:1646  */
     { (yyval.data_type) = global_double; }
-#line 5801 "gram1.tab.c" /* yacc.c:1646  */
+#line 5745 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 157:
-#line 1710 "gram1.y" /* yacc.c:1646  */
+#line 1711 "gram1.y" /* yacc.c:1646  */
     { (yyval.data_type) = global_dcomplex; }
-#line 5807 "gram1.tab.c" /* yacc.c:1646  */
+#line 5751 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 158:
-#line 1711 "gram1.y" /* yacc.c:1646  */
+#line 1712 "gram1.y" /* yacc.c:1646  */
     { (yyval.data_type) = global_bool; }
-#line 5813 "gram1.tab.c" /* yacc.c:1646  */
+#line 5757 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 159:
-#line 1712 "gram1.y" /* yacc.c:1646  */
+#line 1713 "gram1.y" /* yacc.c:1646  */
     { (yyval.data_type) = global_string; }
-#line 5819 "gram1.tab.c" /* yacc.c:1646  */
+#line 5763 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 160:
-#line 1717 "gram1.y" /* yacc.c:1646  */
+#line 1718 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 5825 "gram1.tab.c" /* yacc.c:1646  */
+#line 5769 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 161:
-#line 1719 "gram1.y" /* yacc.c:1646  */
+#line 1720 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 5831 "gram1.tab.c" /* yacc.c:1646  */
+#line 5775 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 162:
-#line 1723 "gram1.y" /* yacc.c:1646  */
+#line 1724 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, LEN_OP, (yyvsp[-2].ll_node), LLNULL, SMNULL); }
-#line 5837 "gram1.tab.c" /* yacc.c:1646  */
+#line 5781 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 163:
-#line 1725 "gram1.y" /* yacc.c:1646  */
+#line 1726 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND l;
 
                  l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL); 
                  l->entry.string_val = (char *)"*";
                  (yyval.ll_node) = make_llnd(fi, LEN_OP, l,l, SMNULL);
                 }
-#line 5848 "gram1.tab.c" /* yacc.c:1646  */
+#line 5792 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 164:
-#line 1732 "gram1.y" /* yacc.c:1646  */
+#line 1733 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi, LEN_OP, (yyvsp[-1].ll_node), (yyvsp[-1].ll_node), SMNULL);}
-#line 5854 "gram1.tab.c" /* yacc.c:1646  */
+#line 5798 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 165:
-#line 1736 "gram1.y" /* yacc.c:1646  */
+#line 1737 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 5860 "gram1.tab.c" /* yacc.c:1646  */
+#line 5804 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 166:
-#line 1738 "gram1.y" /* yacc.c:1646  */
+#line 1739 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 5866 "gram1.tab.c" /* yacc.c:1646  */
+#line 5810 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 167:
-#line 1740 "gram1.y" /* yacc.c:1646  */
+#line 1741 "gram1.y" /* yacc.c:1646  */
     { /*$$ = make_llnd(fi, PAREN_OP, $2, LLNULL, SMNULL);*/  (yyval.ll_node) = (yyvsp[-2].ll_node);  }
-#line 5872 "gram1.tab.c" /* yacc.c:1646  */
+#line 5816 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 168:
-#line 1748 "gram1.y" /* yacc.c:1646  */
+#line 1749 "gram1.y" /* yacc.c:1646  */
     { if((yyvsp[-2].ll_node)->variant==LENGTH_OP && (yyvsp[-6].ll_node)->variant==(yyvsp[-2].ll_node)->variant)
                 (yyvsp[-2].ll_node)->variant=KIND_OP;
                 (yyval.ll_node) = make_llnd(fi, CONS, (yyvsp[-6].ll_node), (yyvsp[-2].ll_node), SMNULL); 
             }
-#line 5881 "gram1.tab.c" /* yacc.c:1646  */
+#line 5825 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 169:
-#line 1755 "gram1.y" /* yacc.c:1646  */
+#line 1756 "gram1.y" /* yacc.c:1646  */
     { if(vartype->variant == T_STRING)
                 (yyval.ll_node) = make_llnd(fi,LENGTH_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);
               else
                 (yyval.ll_node) = make_llnd(fi,KIND_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);
             }
-#line 5891 "gram1.tab.c" /* yacc.c:1646  */
+#line 5835 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 170:
-#line 1761 "gram1.y" /* yacc.c:1646  */
+#line 1762 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND l;
 	      l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
 	      l->entry.string_val = (char *)"*";
               (yyval.ll_node) = make_llnd(fi,LENGTH_OP,l,LLNULL,SMNULL);
             }
-#line 5901 "gram1.tab.c" /* yacc.c:1646  */
+#line 5845 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 171:
-#line 1767 "gram1.y" /* yacc.c:1646  */
+#line 1768 "gram1.y" /* yacc.c:1646  */
     { /* $$ = make_llnd(fi, SPEC_PAIR, $2, LLNULL, SMNULL); */
 	     char *q;
              q = (yyvsp[-1].ll_node)->entry.string_val;
@@ -5910,45 +5854,45 @@ yyreduce:
              else
                 (yyval.ll_node) = make_llnd(fi,KIND_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);              
             }
-#line 5914 "gram1.tab.c" /* yacc.c:1646  */
+#line 5858 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 172:
-#line 1776 "gram1.y" /* yacc.c:1646  */
+#line 1777 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND l;
 	      l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
 	      l->entry.string_val = (char *)"*";
               (yyval.ll_node) = make_llnd(fi,LENGTH_OP,l,LLNULL,SMNULL);
             }
-#line 5924 "gram1.tab.c" /* yacc.c:1646  */
+#line 5868 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 173:
-#line 1784 "gram1.y" /* yacc.c:1646  */
+#line 1785 "gram1.y" /* yacc.c:1646  */
     {endioctl();}
-#line 5930 "gram1.tab.c" /* yacc.c:1646  */
+#line 5874 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 174:
-#line 1797 "gram1.y" /* yacc.c:1646  */
+#line 1798 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 5936 "gram1.tab.c" /* yacc.c:1646  */
+#line 5880 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 175:
-#line 1799 "gram1.y" /* yacc.c:1646  */
+#line 1800 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 5942 "gram1.tab.c" /* yacc.c:1646  */
+#line 5886 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 176:
-#line 1802 "gram1.y" /* yacc.c:1646  */
+#line 1803 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, POINTST_OP, LLNULL, (yyvsp[0].ll_node), SMNULL); }
-#line 5948 "gram1.tab.c" /* yacc.c:1646  */
+#line 5892 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 177:
-#line 1806 "gram1.y" /* yacc.c:1646  */
+#line 1807 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	      PTR_LLND q, r;
 	      if(! (yyvsp[0].ll_node)) {
@@ -5963,11 +5907,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi,DIM_STAT, SMNULL, r, LLNULL, LLNULL);
 	    }
-#line 5967 "gram1.tab.c" /* yacc.c:1646  */
+#line 5911 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 178:
-#line 1821 "gram1.y" /* yacc.c:1646  */
+#line 1822 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	      PTR_LLND q, r;
 	      if(! (yyvsp[0].ll_node)) {
@@ -5980,11 +5924,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      add_to_lowLevelList(r, (yyvsp[-3].bf_node)->entry.Template.ll_ptr1);
 	}
-#line 5984 "gram1.tab.c" /* yacc.c:1646  */
+#line 5928 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 179:
-#line 1837 "gram1.y" /* yacc.c:1646  */
+#line 1838 "gram1.y" /* yacc.c:1646  */
     {/* PTR_SYMB s;*/
 	      PTR_LLND r;
 
@@ -6001,11 +5945,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi, ALLOCATABLE_STMT, SMNULL, r, LLNULL, LLNULL);
 	    }
-#line 6005 "gram1.tab.c" /* yacc.c:1646  */
+#line 5949 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 180:
-#line 1855 "gram1.y" /* yacc.c:1646  */
+#line 1856 "gram1.y" /* yacc.c:1646  */
     {  /*PTR_SYMB s;*/
 	      PTR_LLND r;
 
@@ -6023,11 +5967,11 @@ yyreduce:
               r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
 	}
-#line 6027 "gram1.tab.c" /* yacc.c:1646  */
+#line 5971 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 181:
-#line 1875 "gram1.y" /* yacc.c:1646  */
+#line 1876 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	      PTR_LLND  r;
            
@@ -6047,11 +5991,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi, POINTER_STMT, SMNULL, r, LLNULL, LLNULL);
 	    }
-#line 6051 "gram1.tab.c" /* yacc.c:1646  */
+#line 5995 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 182:
-#line 1895 "gram1.y" /* yacc.c:1646  */
+#line 1896 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	      PTR_LLND r;
 
@@ -6071,11 +6015,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
 	}
-#line 6075 "gram1.tab.c" /* yacc.c:1646  */
+#line 6019 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 183:
-#line 1917 "gram1.y" /* yacc.c:1646  */
+#line 1918 "gram1.y" /* yacc.c:1646  */
     {/* PTR_SYMB s;*/
 	      PTR_LLND r;
 
@@ -6092,11 +6036,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi, TARGET_STMT, SMNULL, r, LLNULL, LLNULL);
 	    }
-#line 6096 "gram1.tab.c" /* yacc.c:1646  */
+#line 6040 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 184:
-#line 1934 "gram1.y" /* yacc.c:1646  */
+#line 1935 "gram1.y" /* yacc.c:1646  */
     {  /*PTR_SYMB s;*/
 	      PTR_LLND r;
 
@@ -6112,44 +6056,44 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
 	}
-#line 6116 "gram1.tab.c" /* yacc.c:1646  */
+#line 6060 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 185:
-#line 1952 "gram1.y" /* yacc.c:1646  */
+#line 1953 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q;
 
               p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      q = make_llnd(fi,COMM_LIST, p, LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi,COMM_STAT, SMNULL, q, LLNULL, LLNULL);
 	    }
-#line 6127 "gram1.tab.c" /* yacc.c:1646  */
+#line 6071 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 186:
-#line 1959 "gram1.y" /* yacc.c:1646  */
+#line 1960 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q;
 
               p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      q = make_llnd(fi,COMM_LIST, p, LLNULL, (yyvsp[-1].symbol));
 	      (yyval.bf_node) = get_bfnd(fi,COMM_STAT, SMNULL, q, LLNULL, LLNULL);
 	    }
-#line 6138 "gram1.tab.c" /* yacc.c:1646  */
+#line 6082 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 187:
-#line 1966 "gram1.y" /* yacc.c:1646  */
+#line 1967 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q;
 
               p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      q = make_llnd(fi,COMM_LIST, p, LLNULL, (yyvsp[-2].symbol));
 	      add_to_lowList(q, (yyvsp[-4].bf_node)->entry.Template.ll_ptr1);
 	    }
-#line 6149 "gram1.tab.c" /* yacc.c:1646  */
+#line 6093 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 188:
-#line 1973 "gram1.y" /* yacc.c:1646  */
+#line 1974 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, r;
 
               p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
@@ -6159,33 +6103,33 @@ yyreduce:
 		   r = r->entry.list.next);
 	      add_to_lowLevelList(p, r->entry.Template.ll_ptr1);
 	    }
-#line 6163 "gram1.tab.c" /* yacc.c:1646  */
+#line 6107 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 189:
-#line 1986 "gram1.y" /* yacc.c:1646  */
+#line 1987 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND q, r;
 
               q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      r = make_llnd(fi,NAMELIST_LIST, q, LLNULL, (yyvsp[-1].symbol));
 	      (yyval.bf_node) = get_bfnd(fi,NAMELIST_STAT, SMNULL, r, LLNULL, LLNULL);
 	    }
-#line 6174 "gram1.tab.c" /* yacc.c:1646  */
+#line 6118 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 190:
-#line 1993 "gram1.y" /* yacc.c:1646  */
+#line 1994 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND q, r;
 
               q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      r = make_llnd(fi,NAMELIST_LIST, q, LLNULL, (yyvsp[-2].symbol));
 	      add_to_lowList(r, (yyvsp[-4].bf_node)->entry.Template.ll_ptr1);
 	    }
-#line 6185 "gram1.tab.c" /* yacc.c:1646  */
+#line 6129 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 191:
-#line 2000 "gram1.y" /* yacc.c:1646  */
+#line 2001 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND q, r;
 
               q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
@@ -6194,29 +6138,29 @@ yyreduce:
 		   r = r->entry.list.next);
 	      add_to_lowLevelList(q, r->entry.Template.ll_ptr1);
 	    }
-#line 6198 "gram1.tab.c" /* yacc.c:1646  */
+#line 6142 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 192:
-#line 2011 "gram1.y" /* yacc.c:1646  */
+#line 2012 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) =  make_local_entity((yyvsp[-1].hash_entry), NAMELIST_NAME,global_default,LOCAL); }
-#line 6204 "gram1.tab.c" /* yacc.c:1646  */
+#line 6148 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 193:
-#line 2015 "gram1.y" /* yacc.c:1646  */
+#line 2016 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = NULL; /*make_common(look_up_sym("*"));*/ }
-#line 6210 "gram1.tab.c" /* yacc.c:1646  */
+#line 6154 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 194:
-#line 2017 "gram1.y" /* yacc.c:1646  */
+#line 2018 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = make_common((yyvsp[-1].hash_entry)); }
-#line 6216 "gram1.tab.c" /* yacc.c:1646  */
+#line 6160 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 195:
-#line 2022 "gram1.y" /* yacc.c:1646  */
+#line 2023 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	
 	      if((yyvsp[0].ll_node)) {
@@ -6231,11 +6175,11 @@ yyreduce:
 	      }
 
           }
-#line 6235 "gram1.tab.c" /* yacc.c:1646  */
+#line 6179 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 196:
-#line 2040 "gram1.y" /* yacc.c:1646  */
+#line 2041 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q;
               PTR_SYMB s;
 
@@ -6245,11 +6189,11 @@ yyreduce:
 	      p = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi,EXTERN_STAT, SMNULL, p, LLNULL, LLNULL);
 	    }
-#line 6249 "gram1.tab.c" /* yacc.c:1646  */
+#line 6193 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 197:
-#line 2051 "gram1.y" /* yacc.c:1646  */
+#line 2052 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q;
               PTR_SYMB s;
 
@@ -6259,11 +6203,11 @@ yyreduce:
 	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
 	      add_to_lowLevelList(q, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
 	    }
-#line 6263 "gram1.tab.c" /* yacc.c:1646  */
+#line 6207 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 198:
-#line 2063 "gram1.y" /* yacc.c:1646  */
+#line 2064 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q;
               PTR_SYMB s;
 
@@ -6274,11 +6218,11 @@ yyreduce:
 	      (yyval.bf_node) = get_bfnd(fi,INTRIN_STAT, SMNULL, p,
 			     LLNULL, LLNULL);
 	    }
-#line 6278 "gram1.tab.c" /* yacc.c:1646  */
+#line 6222 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 199:
-#line 2075 "gram1.y" /* yacc.c:1646  */
+#line 2076 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q;
               PTR_SYMB s;
 
@@ -6288,77 +6232,77 @@ yyreduce:
 	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
 	      add_to_lowLevelList(q, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
 	    }
-#line 6292 "gram1.tab.c" /* yacc.c:1646  */
+#line 6236 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 200:
-#line 2089 "gram1.y" /* yacc.c:1646  */
+#line 2090 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.bf_node) = get_bfnd(fi,EQUI_STAT, SMNULL, (yyvsp[0].ll_node),
 			     LLNULL, LLNULL);
 	    }
-#line 6301 "gram1.tab.c" /* yacc.c:1646  */
+#line 6245 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 201:
-#line 2095 "gram1.y" /* yacc.c:1646  */
+#line 2096 "gram1.y" /* yacc.c:1646  */
     { 
 	      add_to_lowLevelList((yyvsp[0].ll_node), (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
 	    }
-#line 6309 "gram1.tab.c" /* yacc.c:1646  */
+#line 6253 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 202:
-#line 2102 "gram1.y" /* yacc.c:1646  */
+#line 2103 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,EQUI_LIST, (yyvsp[-1].ll_node), LLNULL, SMNULL);
            }
-#line 6317 "gram1.tab.c" /* yacc.c:1646  */
+#line 6261 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 203:
-#line 2108 "gram1.y" /* yacc.c:1646  */
+#line 2109 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 	      p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[-2].ll_node), p, SMNULL);
 	    }
-#line 6326 "gram1.tab.c" /* yacc.c:1646  */
+#line 6270 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 204:
-#line 2114 "gram1.y" /* yacc.c:1646  */
+#line 2115 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 
 	      p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      add_to_lowLevelList(p, (yyvsp[-2].ll_node));
 	    }
-#line 6336 "gram1.tab.c" /* yacc.c:1646  */
+#line 6280 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 205:
-#line 2122 "gram1.y" /* yacc.c:1646  */
+#line 2123 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
            s=make_scalar((yyvsp[0].hash_entry),TYNULL,LOCAL);
            (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
            s->attr = s->attr | EQUIVALENCE_BIT;
             /*$$=$1; $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT; */
         }
-#line 6347 "gram1.tab.c" /* yacc.c:1646  */
+#line 6291 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 206:
-#line 2129 "gram1.y" /* yacc.c:1646  */
+#line 2130 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
            s=make_array((yyvsp[-3].hash_entry),TYNULL,LLNULL,0,LOCAL);
            (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[-1].ll_node), LLNULL, s);
            s->attr = s->attr | EQUIVALENCE_BIT;
             /*$$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT; */
         }
-#line 6358 "gram1.tab.c" /* yacc.c:1646  */
+#line 6302 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 208:
-#line 2148 "gram1.y" /* yacc.c:1646  */
+#line 2149 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
               data_stat = NO;
 	      p = make_llnd(fi,STMT_STR, LLNULL, LLNULL,
@@ -6366,17 +6310,17 @@ yyreduce:
               p->entry.string_val = copys(stmtbuf);
 	      (yyval.bf_node) = get_bfnd(fi,DATA_DECL, SMNULL, p, LLNULL, LLNULL);
             }
-#line 6370 "gram1.tab.c" /* yacc.c:1646  */
+#line 6314 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 211:
-#line 2162 "gram1.y" /* yacc.c:1646  */
+#line 2163 "gram1.y" /* yacc.c:1646  */
     {data_stat = YES;}
-#line 6376 "gram1.tab.c" /* yacc.c:1646  */
+#line 6320 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 212:
-#line 2166 "gram1.y" /* yacc.c:1646  */
+#line 2167 "gram1.y" /* yacc.c:1646  */
     {
 	      if (parstate == OUTSIDE)
 	         { PTR_BFND p;
@@ -6395,200 +6339,200 @@ yyreduce:
 		  parstate = INDCL;
 		}
 	    }
-#line 6399 "gram1.tab.c" /* yacc.c:1646  */
+#line 6343 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 223:
-#line 2211 "gram1.y" /* yacc.c:1646  */
+#line 2212 "gram1.y" /* yacc.c:1646  */
     {;}
-#line 6405 "gram1.tab.c" /* yacc.c:1646  */
+#line 6349 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 224:
-#line 2215 "gram1.y" /* yacc.c:1646  */
+#line 2216 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol)= make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);}
-#line 6411 "gram1.tab.c" /* yacc.c:1646  */
+#line 6355 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 225:
-#line 2219 "gram1.y" /* yacc.c:1646  */
+#line 2220 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol)= make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL); 
               (yyval.symbol)->attr = (yyval.symbol)->attr | DATA_BIT; 
             }
-#line 6419 "gram1.tab.c" /* yacc.c:1646  */
+#line 6363 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 226:
-#line 2225 "gram1.y" /* yacc.c:1646  */
+#line 2226 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, DATA_SUBS, (yyvsp[-1].ll_node), LLNULL, SMNULL); }
-#line 6425 "gram1.tab.c" /* yacc.c:1646  */
+#line 6369 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 227:
-#line 2229 "gram1.y" /* yacc.c:1646  */
+#line 2230 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, DATA_RANGE, (yyvsp[-3].ll_node), (yyvsp[-1].ll_node), SMNULL); }
-#line 6431 "gram1.tab.c" /* yacc.c:1646  */
+#line 6375 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 228:
-#line 2233 "gram1.y" /* yacc.c:1646  */
+#line 2234 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6437 "gram1.tab.c" /* yacc.c:1646  */
+#line 6381 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 229:
-#line 2235 "gram1.y" /* yacc.c:1646  */
+#line 2236 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = add_to_lowLevelList((yyvsp[0].ll_node), (yyvsp[-2].ll_node)); }
-#line 6443 "gram1.tab.c" /* yacc.c:1646  */
+#line 6387 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 230:
-#line 2239 "gram1.y" /* yacc.c:1646  */
+#line 2240 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 6449 "gram1.tab.c" /* yacc.c:1646  */
+#line 6393 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 231:
-#line 2241 "gram1.y" /* yacc.c:1646  */
+#line 2242 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6455 "gram1.tab.c" /* yacc.c:1646  */
+#line 6399 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 232:
-#line 2245 "gram1.y" /* yacc.c:1646  */
+#line 2246 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node)= make_llnd(fi, DATA_IMPL_DO, (yyvsp[-5].ll_node), (yyvsp[-1].ll_node), (yyvsp[-3].symbol)); }
-#line 6461 "gram1.tab.c" /* yacc.c:1646  */
+#line 6405 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 233:
-#line 2249 "gram1.y" /* yacc.c:1646  */
+#line 2250 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6467 "gram1.tab.c" /* yacc.c:1646  */
+#line 6411 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 234:
-#line 2251 "gram1.y" /* yacc.c:1646  */
+#line 2252 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = add_to_lowLevelList((yyvsp[0].ll_node), (yyvsp[-2].ll_node)); }
-#line 6473 "gram1.tab.c" /* yacc.c:1646  */
+#line 6417 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 235:
-#line 2255 "gram1.y" /* yacc.c:1646  */
+#line 2256 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, DATA_ELT, (yyvsp[0].ll_node), LLNULL, (yyvsp[-1].symbol)); }
-#line 6479 "gram1.tab.c" /* yacc.c:1646  */
+#line 6423 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 236:
-#line 2257 "gram1.y" /* yacc.c:1646  */
+#line 2258 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, DATA_ELT, (yyvsp[0].ll_node), LLNULL, (yyvsp[-1].symbol)); }
-#line 6485 "gram1.tab.c" /* yacc.c:1646  */
+#line 6429 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 237:
-#line 2259 "gram1.y" /* yacc.c:1646  */
+#line 2260 "gram1.y" /* yacc.c:1646  */
     {
               (yyvsp[-1].ll_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
               (yyval.ll_node) = make_llnd(fi, DATA_ELT, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-2].symbol)); 
             }
-#line 6494 "gram1.tab.c" /* yacc.c:1646  */
+#line 6438 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 238:
-#line 2264 "gram1.y" /* yacc.c:1646  */
+#line 2265 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, DATA_ELT, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 6500 "gram1.tab.c" /* yacc.c:1646  */
+#line 6444 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 252:
-#line 2288 "gram1.y" /* yacc.c:1646  */
+#line 2289 "gram1.y" /* yacc.c:1646  */
     {if((yyvsp[-4].ll_node)->entry.Template.symbol->variant != TYPE_NAME)
                errstr("Undefined type %s",(yyvsp[-4].ll_node)->entry.Template.symbol->ident,319); 
            }
-#line 6508 "gram1.tab.c" /* yacc.c:1646  */
+#line 6452 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 269:
-#line 2333 "gram1.y" /* yacc.c:1646  */
+#line 2334 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ICON_EXPR, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 6514 "gram1.tab.c" /* yacc.c:1646  */
+#line 6458 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 270:
-#line 2335 "gram1.y" /* yacc.c:1646  */
+#line 2336 "gram1.y" /* yacc.c:1646  */
     {
               PTR_LLND p;
 
               p = intrinsic_op_node("+", UNARY_ADD_OP, (yyvsp[0].ll_node), LLNULL);
               (yyval.ll_node) = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
             }
-#line 6525 "gram1.tab.c" /* yacc.c:1646  */
+#line 6469 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 271:
-#line 2342 "gram1.y" /* yacc.c:1646  */
+#line 2343 "gram1.y" /* yacc.c:1646  */
     {
               PTR_LLND p;
  
               p = intrinsic_op_node("-", MINUS_OP, (yyvsp[0].ll_node), LLNULL);
               (yyval.ll_node) = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
             }
-#line 6536 "gram1.tab.c" /* yacc.c:1646  */
+#line 6480 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 272:
-#line 2349 "gram1.y" /* yacc.c:1646  */
+#line 2350 "gram1.y" /* yacc.c:1646  */
     {
               PTR_LLND p;
  
               p = intrinsic_op_node("+", ADD_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node));
               (yyval.ll_node) = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
             }
-#line 6547 "gram1.tab.c" /* yacc.c:1646  */
+#line 6491 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 273:
-#line 2356 "gram1.y" /* yacc.c:1646  */
+#line 2357 "gram1.y" /* yacc.c:1646  */
     {
               PTR_LLND p;
  
               p = intrinsic_op_node("-", SUBT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node));
               (yyval.ll_node) = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
             }
-#line 6558 "gram1.tab.c" /* yacc.c:1646  */
+#line 6502 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 274:
-#line 2365 "gram1.y" /* yacc.c:1646  */
+#line 2366 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6564 "gram1.tab.c" /* yacc.c:1646  */
+#line 6508 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 275:
-#line 2367 "gram1.y" /* yacc.c:1646  */
+#line 2368 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("*", MULT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 6570 "gram1.tab.c" /* yacc.c:1646  */
+#line 6514 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 276:
-#line 2369 "gram1.y" /* yacc.c:1646  */
+#line 2370 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("/", DIV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 6576 "gram1.tab.c" /* yacc.c:1646  */
+#line 6520 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 277:
-#line 2373 "gram1.y" /* yacc.c:1646  */
+#line 2374 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6582 "gram1.tab.c" /* yacc.c:1646  */
+#line 6526 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 278:
-#line 2375 "gram1.y" /* yacc.c:1646  */
+#line 2376 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("**", EXP_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 6588 "gram1.tab.c" /* yacc.c:1646  */
+#line 6532 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 279:
-#line 2379 "gram1.y" /* yacc.c:1646  */
+#line 2380 "gram1.y" /* yacc.c:1646  */
     {
               PTR_LLND p;
 
@@ -6597,127 +6541,127 @@ yyreduce:
               p->type = global_int;
               (yyval.ll_node) = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
             }
-#line 6601 "gram1.tab.c" /* yacc.c:1646  */
+#line 6545 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 280:
-#line 2388 "gram1.y" /* yacc.c:1646  */
+#line 2389 "gram1.y" /* yacc.c:1646  */
     {
               PTR_LLND p;
  
               p = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
               (yyval.ll_node) = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
             }
-#line 6612 "gram1.tab.c" /* yacc.c:1646  */
+#line 6556 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 281:
-#line 2395 "gram1.y" /* yacc.c:1646  */
+#line 2396 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[-1].ll_node), LLNULL, SMNULL);
             }
-#line 6620 "gram1.tab.c" /* yacc.c:1646  */
+#line 6564 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 282:
-#line 2402 "gram1.y" /* yacc.c:1646  */
+#line 2403 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 6626 "gram1.tab.c" /* yacc.c:1646  */
+#line 6570 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 283:
-#line 2404 "gram1.y" /* yacc.c:1646  */
+#line 2405 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6632 "gram1.tab.c" /* yacc.c:1646  */
+#line 6576 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 284:
-#line 2408 "gram1.y" /* yacc.c:1646  */
+#line 2409 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);
              (yyval.ll_node)->entry.Template.symbol->attr = (yyval.ll_node)->entry.Template.symbol->attr | SAVE_BIT;
            }
-#line 6640 "gram1.tab.c" /* yacc.c:1646  */
+#line 6584 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 285:
-#line 2412 "gram1.y" /* yacc.c:1646  */
+#line 2413 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,COMM_LIST, LLNULL, LLNULL, (yyvsp[0].symbol)); 
             (yyval.ll_node)->entry.Template.symbol->attr = (yyval.ll_node)->entry.Template.symbol->attr | SAVE_BIT;
           }
-#line 6648 "gram1.tab.c" /* yacc.c:1646  */
+#line 6592 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 286:
-#line 2418 "gram1.y" /* yacc.c:1646  */
+#line 2419 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST); }
-#line 6654 "gram1.tab.c" /* yacc.c:1646  */
+#line 6598 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 287:
-#line 2420 "gram1.y" /* yacc.c:1646  */
+#line 2421 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node), (yyvsp[-1].ll_node), EXPR_LIST); }
-#line 6660 "gram1.tab.c" /* yacc.c:1646  */
+#line 6604 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 288:
-#line 2424 "gram1.y" /* yacc.c:1646  */
+#line 2425 "gram1.y" /* yacc.c:1646  */
     { as_op_kwd_ = YES; }
-#line 6666 "gram1.tab.c" /* yacc.c:1646  */
+#line 6610 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 289:
-#line 2428 "gram1.y" /* yacc.c:1646  */
+#line 2429 "gram1.y" /* yacc.c:1646  */
     { as_op_kwd_ = NO; }
-#line 6672 "gram1.tab.c" /* yacc.c:1646  */
+#line 6616 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 290:
-#line 2433 "gram1.y" /* yacc.c:1646  */
+#line 2434 "gram1.y" /* yacc.c:1646  */
     { 
              PTR_SYMB s; 
              s = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);	
 	     s->attr = s->attr | type_opt;
 	     (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
             }
-#line 6683 "gram1.tab.c" /* yacc.c:1646  */
+#line 6627 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 291:
-#line 2440 "gram1.y" /* yacc.c:1646  */
+#line 2441 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	      s = make_function((yyvsp[-1].hash_entry), global_default, LOCAL);
 	      s->variant = INTERFACE_NAME;
               s->attr = s->attr | type_opt;
               (yyval.ll_node) = make_llnd(fi,OPERATOR_OP, LLNULL, LLNULL, s);
 	    }
-#line 6694 "gram1.tab.c" /* yacc.c:1646  */
+#line 6638 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 292:
-#line 2447 "gram1.y" /* yacc.c:1646  */
+#line 2448 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	      s = make_procedure(look_up_sym("="), LOCAL);
 	      s->variant = INTERFACE_NAME;
               s->attr = s->attr | type_opt;
               (yyval.ll_node) = make_llnd(fi,ASSIGNMENT_OP, LLNULL, LLNULL, s);
 	    }
-#line 6705 "gram1.tab.c" /* yacc.c:1646  */
+#line 6649 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 293:
-#line 2457 "gram1.y" /* yacc.c:1646  */
+#line 2458 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 6711 "gram1.tab.c" /* yacc.c:1646  */
+#line 6655 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 294:
-#line 2459 "gram1.y" /* yacc.c:1646  */
+#line 2460 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6717 "gram1.tab.c" /* yacc.c:1646  */
+#line 6661 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 295:
-#line 2463 "gram1.y" /* yacc.c:1646  */
+#line 2464 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB p;
 
                 /* The check if name and expr have compatible types has
@@ -6727,17 +6671,17 @@ yyreduce:
                 p->entry.const_value = (yyvsp[0].ll_node);
 		(yyval.ll_node) = make_llnd(fi,CONST_REF, LLNULL, LLNULL, p);
 	    }
-#line 6731 "gram1.tab.c" /* yacc.c:1646  */
+#line 6675 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 296:
-#line 2475 "gram1.y" /* yacc.c:1646  */
+#line 2476 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, MODULE_PROC_STMT, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL); }
-#line 6737 "gram1.tab.c" /* yacc.c:1646  */
+#line 6681 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 297:
-#line 2478 "gram1.y" /* yacc.c:1646  */
+#line 2479 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
  	      PTR_LLND q;
 
@@ -6746,11 +6690,11 @@ yyreduce:
               q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
 	      (yyval.ll_node) = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	    }
-#line 6750 "gram1.tab.c" /* yacc.c:1646  */
+#line 6694 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 298:
-#line 2487 "gram1.y" /* yacc.c:1646  */
+#line 2488 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q;
               PTR_SYMB s;
 
@@ -6760,51 +6704,51 @@ yyreduce:
 	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
 	      add_to_lowLevelList(q, (yyvsp[-2].ll_node));
 	    }
-#line 6764 "gram1.tab.c" /* yacc.c:1646  */
+#line 6708 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 299:
-#line 2500 "gram1.y" /* yacc.c:1646  */
+#line 2501 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, USE_STMT, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL);
               /*add_scope_level($3->entry.Template.func_hedr, YES);*/ /*17.06.01*/
               copy_module_scope((yyvsp[0].symbol),LLNULL); /*17.03.03*/
               colon_flag = NO;
             }
-#line 6774 "gram1.tab.c" /* yacc.c:1646  */
+#line 6718 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 300:
-#line 2506 "gram1.y" /* yacc.c:1646  */
+#line 2507 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, USE_STMT, (yyvsp[-3].symbol), (yyvsp[0].ll_node), LLNULL, LLNULL); 
               /*add_scope_level(module_scope, YES); *//* 17.06.01*/
               copy_module_scope((yyvsp[-3].symbol),(yyvsp[0].ll_node)); /*17.03.03 */
               colon_flag = NO;
             }
-#line 6784 "gram1.tab.c" /* yacc.c:1646  */
+#line 6728 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 301:
-#line 2512 "gram1.y" /* yacc.c:1646  */
+#line 2513 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND l;
 
 	      l = make_llnd(fi, ONLY_NODE, LLNULL, LLNULL, SMNULL);
               (yyval.bf_node) = get_bfnd(fi, USE_STMT, (yyvsp[-3].symbol), l, LLNULL, LLNULL);
             }
-#line 6794 "gram1.tab.c" /* yacc.c:1646  */
+#line 6738 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 302:
-#line 2518 "gram1.y" /* yacc.c:1646  */
+#line 2519 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND l;
 
 	      l = make_llnd(fi, ONLY_NODE, (yyvsp[0].ll_node), LLNULL, SMNULL);
               (yyval.bf_node) = get_bfnd(fi, USE_STMT, (yyvsp[-4].symbol), l, LLNULL, LLNULL);
             }
-#line 6804 "gram1.tab.c" /* yacc.c:1646  */
+#line 6748 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 303:
-#line 2526 "gram1.y" /* yacc.c:1646  */
+#line 2527 "gram1.y" /* yacc.c:1646  */
     {
               if ((yyvsp[0].hash_entry)->id_attr == SMNULL)
 	         warn1("Unknown module %s", (yyvsp[0].hash_entry)->ident,308);
@@ -6812,29 +6756,29 @@ yyreduce:
 	      module_scope = (yyval.symbol)->entry.Template.func_hedr;
            
             }
-#line 6816 "gram1.tab.c" /* yacc.c:1646  */
+#line 6760 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 304:
-#line 2536 "gram1.y" /* yacc.c:1646  */
+#line 2537 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 6822 "gram1.tab.c" /* yacc.c:1646  */
+#line 6766 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 305:
-#line 2538 "gram1.y" /* yacc.c:1646  */
+#line 2539 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6828 "gram1.tab.c" /* yacc.c:1646  */
+#line 6772 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 306:
-#line 2542 "gram1.y" /* yacc.c:1646  */
+#line 2543 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6834 "gram1.tab.c" /* yacc.c:1646  */
+#line 6778 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 307:
-#line 2544 "gram1.y" /* yacc.c:1646  */
+#line 2545 "gram1.y" /* yacc.c:1646  */
     {  PTR_HASH oldhash,copyhash;
 	       PTR_SYMB oldsym, newsym;
 	       PTR_LLND m;
@@ -6864,23 +6808,23 @@ yyreduce:
 		 (yyval.ll_node) = make_llnd(fi, RENAME_NODE, m, LLNULL, oldsym);
  	      }
             }
-#line 6868 "gram1.tab.c" /* yacc.c:1646  */
+#line 6812 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 308:
-#line 2577 "gram1.y" /* yacc.c:1646  */
+#line 2578 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 6874 "gram1.tab.c" /* yacc.c:1646  */
+#line 6818 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 309:
-#line 2579 "gram1.y" /* yacc.c:1646  */
+#line 2580 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6880 "gram1.tab.c" /* yacc.c:1646  */
+#line 6824 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 310:
-#line 2583 "gram1.y" /* yacc.c:1646  */
+#line 2584 "gram1.y" /* yacc.c:1646  */
     {  PTR_HASH oldhash,copyhash;
 	       PTR_SYMB oldsym, newsym;
 	       PTR_LLND l, m;
@@ -6908,44 +6852,44 @@ yyreduce:
 		 (yyval.ll_node) = make_llnd(fi, RENAME_NODE, m, l, SMNULL);
  	      }
             }
-#line 6912 "gram1.tab.c" /* yacc.c:1646  */
+#line 6856 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 311:
-#line 2621 "gram1.y" /* yacc.c:1646  */
+#line 2622 "gram1.y" /* yacc.c:1646  */
     { ndim = 0;	explicit_shape = 1; (yyval.ll_node) = LLNULL; }
-#line 6918 "gram1.tab.c" /* yacc.c:1646  */
+#line 6862 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 312:
-#line 2623 "gram1.y" /* yacc.c:1646  */
+#line 2624 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 6924 "gram1.tab.c" /* yacc.c:1646  */
+#line 6868 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 313:
-#line 2626 "gram1.y" /* yacc.c:1646  */
+#line 2627 "gram1.y" /* yacc.c:1646  */
     { ndim = 0; explicit_shape = 1;}
-#line 6930 "gram1.tab.c" /* yacc.c:1646  */
+#line 6874 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 314:
-#line 2627 "gram1.y" /* yacc.c:1646  */
+#line 2628 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      (yyval.ll_node)->type = global_default;
 	    }
-#line 6939 "gram1.tab.c" /* yacc.c:1646  */
+#line 6883 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 315:
-#line 2632 "gram1.y" /* yacc.c:1646  */
+#line 2633 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6945 "gram1.tab.c" /* yacc.c:1646  */
+#line 6889 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 316:
-#line 2636 "gram1.y" /* yacc.c:1646  */
+#line 2637 "gram1.y" /* yacc.c:1646  */
     {
 	      if(ndim == maxdim)
 		err("Too many dimensions", 43);
@@ -6953,11 +6897,11 @@ yyreduce:
 		(yyval.ll_node) = (yyvsp[0].ll_node);
 	      ++ndim;
 	    }
-#line 6957 "gram1.tab.c" /* yacc.c:1646  */
+#line 6901 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 317:
-#line 2644 "gram1.y" /* yacc.c:1646  */
+#line 2645 "gram1.y" /* yacc.c:1646  */
     {
 	      if(ndim == maxdim)
 		err("Too many dimensions", 43);
@@ -6966,11 +6910,11 @@ yyreduce:
 	      ++ndim;
               explicit_shape = 0;
 	    }
-#line 6970 "gram1.tab.c" /* yacc.c:1646  */
+#line 6914 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 318:
-#line 2653 "gram1.y" /* yacc.c:1646  */
+#line 2654 "gram1.y" /* yacc.c:1646  */
     {
 	      if(ndim == maxdim)
 		err("Too many dimensions", 43);
@@ -6979,11 +6923,11 @@ yyreduce:
 	      ++ndim;
               explicit_shape = 0;
 	    }
-#line 6983 "gram1.tab.c" /* yacc.c:1646  */
+#line 6927 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 319:
-#line 2662 "gram1.y" /* yacc.c:1646  */
+#line 2663 "gram1.y" /* yacc.c:1646  */
     {
 	      if(ndim == maxdim)
 		err("Too many dimensions", 43);
@@ -6991,131 +6935,131 @@ yyreduce:
 		(yyval.ll_node) = make_llnd(fi,DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
 	      ++ndim;
 	    }
-#line 6995 "gram1.tab.c" /* yacc.c:1646  */
+#line 6939 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 320:
-#line 2672 "gram1.y" /* yacc.c:1646  */
+#line 2673 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,STAR_RANGE, LLNULL, LLNULL, SMNULL);
 	      (yyval.ll_node)->type = global_default;
               explicit_shape = 0;
 	    }
-#line 7005 "gram1.tab.c" /* yacc.c:1646  */
+#line 6949 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 322:
-#line 2681 "gram1.y" /* yacc.c:1646  */
+#line 2682 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 7011 "gram1.tab.c" /* yacc.c:1646  */
+#line 6955 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 323:
-#line 2683 "gram1.y" /* yacc.c:1646  */
+#line 2684 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 7017 "gram1.tab.c" /* yacc.c:1646  */
+#line 6961 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 324:
-#line 2687 "gram1.y" /* yacc.c:1646  */
+#line 2688 "gram1.y" /* yacc.c:1646  */
     {PTR_LABEL p;
 	     p = make_label_node(fi,convci(yyleng, yytext));
 	     p->scope = cur_scope();
 	     (yyval.ll_node) = make_llnd_label(fi,LABEL_REF, p);
 	  }
-#line 7027 "gram1.tab.c" /* yacc.c:1646  */
+#line 6971 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 325:
-#line 2695 "gram1.y" /* yacc.c:1646  */
+#line 2696 "gram1.y" /* yacc.c:1646  */
     { /*PTR_LLND l;*/
 
           /*   l = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);*/
              (yyval.bf_node) = get_bfnd(fi,IMPL_DECL, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
              redefine_func_arg_type();
            }
-#line 7038 "gram1.tab.c" /* yacc.c:1646  */
+#line 6982 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 326:
-#line 2710 "gram1.y" /* yacc.c:1646  */
+#line 2711 "gram1.y" /* yacc.c:1646  */
     { /*undeftype = YES;
 	    setimpl(TYNULL, (int)'a', (int)'z'); FB COMMENTED---> NOT QUITE RIGHT BUT AVOID PB WITH COMMON*/
 	    (yyval.bf_node) = get_bfnd(fi,IMPL_DECL, SMNULL, LLNULL, LLNULL, LLNULL);
 	  }
-#line 7047 "gram1.tab.c" /* yacc.c:1646  */
+#line 6991 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 327:
-#line 2717 "gram1.y" /* yacc.c:1646  */
+#line 2718 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 7053 "gram1.tab.c" /* yacc.c:1646  */
+#line 6997 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 328:
-#line 2719 "gram1.y" /* yacc.c:1646  */
+#line 2720 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 7059 "gram1.tab.c" /* yacc.c:1646  */
+#line 7003 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 329:
-#line 2723 "gram1.y" /* yacc.c:1646  */
+#line 2724 "gram1.y" /* yacc.c:1646  */
     { 
 
             (yyval.ll_node) = make_llnd(fi, IMPL_TYPE, (yyvsp[-1].ll_node), LLNULL, SMNULL);
             (yyval.ll_node)->type = vartype;
           }
-#line 7069 "gram1.tab.c" /* yacc.c:1646  */
+#line 7013 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 330:
-#line 2738 "gram1.y" /* yacc.c:1646  */
+#line 2739 "gram1.y" /* yacc.c:1646  */
     { implkwd = YES; }
-#line 7075 "gram1.tab.c" /* yacc.c:1646  */
+#line 7019 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 331:
-#line 2739 "gram1.y" /* yacc.c:1646  */
+#line 2740 "gram1.y" /* yacc.c:1646  */
     { vartype = (yyvsp[0].data_type); }
-#line 7081 "gram1.tab.c" /* yacc.c:1646  */
+#line 7025 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 332:
-#line 2743 "gram1.y" /* yacc.c:1646  */
+#line 2744 "gram1.y" /* yacc.c:1646  */
     { (yyval.data_type) = (yyvsp[0].data_type); }
-#line 7087 "gram1.tab.c" /* yacc.c:1646  */
+#line 7031 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 333:
-#line 2745 "gram1.y" /* yacc.c:1646  */
+#line 2746 "gram1.y" /* yacc.c:1646  */
     { (yyval.data_type) = (yyvsp[0].data_type);}
-#line 7093 "gram1.tab.c" /* yacc.c:1646  */
+#line 7037 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 334:
-#line 2757 "gram1.y" /* yacc.c:1646  */
+#line 2758 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 7099 "gram1.tab.c" /* yacc.c:1646  */
+#line 7043 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 335:
-#line 2759 "gram1.y" /* yacc.c:1646  */
+#line 2760 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 7105 "gram1.tab.c" /* yacc.c:1646  */
+#line 7049 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 336:
-#line 2763 "gram1.y" /* yacc.c:1646  */
+#line 2764 "gram1.y" /* yacc.c:1646  */
     {
 	      setimpl(vartype, (int)(yyvsp[0].charv), (int)(yyvsp[0].charv));
 	      (yyval.ll_node) = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
 	      (yyval.ll_node)->entry.cval = (yyvsp[0].charv);
 	    }
-#line 7115 "gram1.tab.c" /* yacc.c:1646  */
+#line 7059 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 337:
-#line 2769 "gram1.y" /* yacc.c:1646  */
+#line 2770 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p,q;
 	      
 	      setimpl(vartype, (int)(yyvsp[-2].charv), (int)(yyvsp[0].charv));
@@ -7125,11 +7069,11 @@ yyreduce:
 	      q->entry.cval = (yyvsp[0].charv);
 	      (yyval.ll_node)= make_llnd(fi,DDOT, p, q, SMNULL);
 	    }
-#line 7129 "gram1.tab.c" /* yacc.c:1646  */
+#line 7073 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 338:
-#line 2781 "gram1.y" /* yacc.c:1646  */
+#line 2782 "gram1.y" /* yacc.c:1646  */
     {
 	      if(yyleng!=1 || yytext[0]<'a' || yytext[0]>'z')
 		{
@@ -7138,11 +7082,11 @@ yyreduce:
 		}
 	      else (yyval.charv) = yytext[0];
 	    }
-#line 7142 "gram1.tab.c" /* yacc.c:1646  */
+#line 7086 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 339:
-#line 2792 "gram1.y" /* yacc.c:1646  */
+#line 2793 "gram1.y" /* yacc.c:1646  */
     {
 	      if (parstate == OUTSIDE)
 	         { PTR_BFND p;
@@ -7157,11 +7101,11 @@ yyreduce:
                  }
 	  
 	    }
-#line 7161 "gram1.tab.c" /* yacc.c:1646  */
+#line 7105 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 340:
-#line 2809 "gram1.y" /* yacc.c:1646  */
+#line 2810 "gram1.y" /* yacc.c:1646  */
     { switch(parstate)
 		{
                 case OUTSIDE:  
@@ -7188,253 +7132,253 @@ yyreduce:
                            err("Declaration among executables", 30);
                 }
         }
-#line 7192 "gram1.tab.c" /* yacc.c:1646  */
+#line 7136 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 343:
-#line 2847 "gram1.y" /* yacc.c:1646  */
+#line 2848 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; endioctl(); }
-#line 7198 "gram1.tab.c" /* yacc.c:1646  */
+#line 7142 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 344:
-#line 2849 "gram1.y" /* yacc.c:1646  */
+#line 2850 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);  endioctl();}
-#line 7204 "gram1.tab.c" /* yacc.c:1646  */
+#line 7148 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 345:
-#line 2853 "gram1.y" /* yacc.c:1646  */
+#line 2854 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7210 "gram1.tab.c" /* yacc.c:1646  */
+#line 7154 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 346:
-#line 2855 "gram1.y" /* yacc.c:1646  */
+#line 2856 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7216 "gram1.tab.c" /* yacc.c:1646  */
+#line 7160 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 347:
-#line 2857 "gram1.y" /* yacc.c:1646  */
+#line 2858 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND l;
 	      l = make_llnd(fi, KEYWORD_ARG, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL);
 	      l->type = (yyvsp[0].ll_node)->type;
               (yyval.ll_node) = l; 
 	    }
-#line 7226 "gram1.tab.c" /* yacc.c:1646  */
+#line 7170 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 348:
-#line 2868 "gram1.y" /* yacc.c:1646  */
+#line 2869 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);
               endioctl(); 
             }
-#line 7234 "gram1.tab.c" /* yacc.c:1646  */
+#line 7178 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 349:
-#line 2872 "gram1.y" /* yacc.c:1646  */
+#line 2873 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST);
               endioctl(); 
             }
-#line 7242 "gram1.tab.c" /* yacc.c:1646  */
+#line 7186 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 350:
-#line 2878 "gram1.y" /* yacc.c:1646  */
+#line 2879 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 7248 "gram1.tab.c" /* yacc.c:1646  */
+#line 7192 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 351:
-#line 2880 "gram1.y" /* yacc.c:1646  */
+#line 2881 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 7254 "gram1.tab.c" /* yacc.c:1646  */
+#line 7198 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 352:
-#line 2884 "gram1.y" /* yacc.c:1646  */
+#line 2885 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7260 "gram1.tab.c" /* yacc.c:1646  */
+#line 7204 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 353:
-#line 2886 "gram1.y" /* yacc.c:1646  */
+#line 2887 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 7266 "gram1.tab.c" /* yacc.c:1646  */
+#line 7210 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 354:
-#line 2888 "gram1.y" /* yacc.c:1646  */
+#line 2889 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7272 "gram1.tab.c" /* yacc.c:1646  */
+#line 7216 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 355:
-#line 2892 "gram1.y" /* yacc.c:1646  */
+#line 2893 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7278 "gram1.tab.c" /* yacc.c:1646  */
+#line 7222 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 356:
-#line 2894 "gram1.y" /* yacc.c:1646  */
+#line 2895 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7284 "gram1.tab.c" /* yacc.c:1646  */
+#line 7228 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 357:
-#line 2898 "gram1.y" /* yacc.c:1646  */
+#line 2899 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7290 "gram1.tab.c" /* yacc.c:1646  */
+#line 7234 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 358:
-#line 2900 "gram1.y" /* yacc.c:1646  */
+#line 2901 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("+", ADD_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7296 "gram1.tab.c" /* yacc.c:1646  */
+#line 7240 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 359:
-#line 2902 "gram1.y" /* yacc.c:1646  */
+#line 2903 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("-", SUBT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7302 "gram1.tab.c" /* yacc.c:1646  */
+#line 7246 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 360:
-#line 2904 "gram1.y" /* yacc.c:1646  */
+#line 2905 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("*", MULT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7308 "gram1.tab.c" /* yacc.c:1646  */
+#line 7252 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 361:
-#line 2906 "gram1.y" /* yacc.c:1646  */
+#line 2907 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("/", DIV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7314 "gram1.tab.c" /* yacc.c:1646  */
+#line 7258 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 362:
-#line 2908 "gram1.y" /* yacc.c:1646  */
+#line 2909 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("**", EXP_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7320 "gram1.tab.c" /* yacc.c:1646  */
+#line 7264 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 363:
-#line 2910 "gram1.y" /* yacc.c:1646  */
+#line 2911 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = defined_op_node((yyvsp[-1].hash_entry), (yyvsp[0].ll_node), LLNULL); }
-#line 7326 "gram1.tab.c" /* yacc.c:1646  */
+#line 7270 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 364:
-#line 2912 "gram1.y" /* yacc.c:1646  */
+#line 2913 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("+", UNARY_ADD_OP, (yyvsp[0].ll_node), LLNULL); }
-#line 7332 "gram1.tab.c" /* yacc.c:1646  */
+#line 7276 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 365:
-#line 2914 "gram1.y" /* yacc.c:1646  */
+#line 2915 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("-", MINUS_OP, (yyvsp[0].ll_node), LLNULL); }
-#line 7338 "gram1.tab.c" /* yacc.c:1646  */
+#line 7282 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 366:
-#line 2916 "gram1.y" /* yacc.c:1646  */
+#line 2917 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".eq.", EQ_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7344 "gram1.tab.c" /* yacc.c:1646  */
+#line 7288 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 367:
-#line 2918 "gram1.y" /* yacc.c:1646  */
+#line 2919 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".gt.", GT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7350 "gram1.tab.c" /* yacc.c:1646  */
+#line 7294 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 368:
-#line 2920 "gram1.y" /* yacc.c:1646  */
+#line 2921 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".lt.", LT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7356 "gram1.tab.c" /* yacc.c:1646  */
+#line 7300 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 369:
-#line 2922 "gram1.y" /* yacc.c:1646  */
+#line 2923 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".ge.", GTEQL_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7362 "gram1.tab.c" /* yacc.c:1646  */
+#line 7306 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 370:
-#line 2924 "gram1.y" /* yacc.c:1646  */
+#line 2925 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".ge.", LTEQL_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7368 "gram1.tab.c" /* yacc.c:1646  */
+#line 7312 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 371:
-#line 2926 "gram1.y" /* yacc.c:1646  */
+#line 2927 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".ne.", NOTEQL_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7374 "gram1.tab.c" /* yacc.c:1646  */
+#line 7318 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 372:
-#line 2928 "gram1.y" /* yacc.c:1646  */
+#line 2929 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".eqv.", EQV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7380 "gram1.tab.c" /* yacc.c:1646  */
+#line 7324 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 373:
-#line 2930 "gram1.y" /* yacc.c:1646  */
+#line 2931 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".neqv.", NEQV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7386 "gram1.tab.c" /* yacc.c:1646  */
+#line 7330 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 374:
-#line 2932 "gram1.y" /* yacc.c:1646  */
+#line 2933 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".xor.", XOR_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7392 "gram1.tab.c" /* yacc.c:1646  */
+#line 7336 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 375:
-#line 2934 "gram1.y" /* yacc.c:1646  */
+#line 2935 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".or.", OR_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7398 "gram1.tab.c" /* yacc.c:1646  */
+#line 7342 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 376:
-#line 2936 "gram1.y" /* yacc.c:1646  */
+#line 2937 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".and.", AND_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7404 "gram1.tab.c" /* yacc.c:1646  */
+#line 7348 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 377:
-#line 2938 "gram1.y" /* yacc.c:1646  */
+#line 2939 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node(".not.", NOT_OP, (yyvsp[0].ll_node), LLNULL); }
-#line 7410 "gram1.tab.c" /* yacc.c:1646  */
+#line 7354 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 378:
-#line 2940 "gram1.y" /* yacc.c:1646  */
+#line 2941 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = intrinsic_op_node("//", CONCAT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7416 "gram1.tab.c" /* yacc.c:1646  */
+#line 7360 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 379:
-#line 2942 "gram1.y" /* yacc.c:1646  */
+#line 2943 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = defined_op_node((yyvsp[-1].hash_entry), (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7422 "gram1.tab.c" /* yacc.c:1646  */
+#line 7366 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 380:
-#line 2945 "gram1.y" /* yacc.c:1646  */
+#line 2946 "gram1.y" /* yacc.c:1646  */
     { (yyval.token) = ADD_OP; }
-#line 7428 "gram1.tab.c" /* yacc.c:1646  */
+#line 7372 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 381:
-#line 2946 "gram1.y" /* yacc.c:1646  */
+#line 2947 "gram1.y" /* yacc.c:1646  */
     { (yyval.token) = SUBT_OP; }
-#line 7434 "gram1.tab.c" /* yacc.c:1646  */
+#line 7378 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 382:
-#line 2958 "gram1.y" /* yacc.c:1646  */
+#line 2959 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	      PTR_TYPE t;
 	     /* PTR_LLND l;*/
@@ -7506,11 +7450,11 @@ yyreduce:
 	      }
               */ /*11.02.03*/
            }
-#line 7510 "gram1.tab.c" /* yacc.c:1646  */
+#line 7454 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 383:
-#line 3032 "gram1.y" /* yacc.c:1646  */
+#line 3033 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB  s;
 	      (yyval.ll_node) = (yyvsp[0].ll_node); 
               s= (yyval.ll_node)->entry.Template.symbol;
@@ -7522,23 +7466,23 @@ yyreduce:
 		  }
               }
             }
-#line 7526 "gram1.tab.c" /* yacc.c:1646  */
+#line 7470 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 384:
-#line 3044 "gram1.y" /* yacc.c:1646  */
+#line 3045 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7532 "gram1.tab.c" /* yacc.c:1646  */
+#line 7476 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 385:
-#line 3046 "gram1.y" /* yacc.c:1646  */
+#line 3047 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7538 "gram1.tab.c" /* yacc.c:1646  */
+#line 7482 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 386:
-#line 3050 "gram1.y" /* yacc.c:1646  */
+#line 3051 "gram1.y" /* yacc.c:1646  */
     { int num_triplets;
 	      PTR_SYMB s;  /*, sym;*/
 	      /* PTR_LLND l; */
@@ -7669,11 +7613,11 @@ yyreduce:
 
 	     endioctl(); 
            }
-#line 7673 "gram1.tab.c" /* yacc.c:1646  */
+#line 7617 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 387:
-#line 3181 "gram1.y" /* yacc.c:1646  */
+#line 3182 "gram1.y" /* yacc.c:1646  */
     { int num_triplets;
 	      PTR_SYMB s;
 	      PTR_LLND l;
@@ -7723,11 +7667,11 @@ yyreduce:
              }
              endioctl();
           }
-#line 7727 "gram1.tab.c" /* yacc.c:1646  */
+#line 7671 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 388:
-#line 3231 "gram1.y" /* yacc.c:1646  */
+#line 3232 "gram1.y" /* yacc.c:1646  */
     {  int num_triplets;
 	      PTR_LLND l,l1,l2;
               PTR_TYPE tp;
@@ -7770,11 +7714,11 @@ yyreduce:
                    {err("Can't subscript",44); /*fprintf(stderr,"%d  %d",$1->variant,l2);*/}
                    /*errstr("Can't subscript %s",l2->entry.Template.symbol->ident,441);*/
          }
-#line 7774 "gram1.tab.c" /* yacc.c:1646  */
+#line 7718 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 389:
-#line 3275 "gram1.y" /* yacc.c:1646  */
+#line 3276 "gram1.y" /* yacc.c:1646  */
     { int num_triplets;
 	      PTR_LLND l,q;
 
@@ -7813,11 +7757,11 @@ yyreduce:
                }
              }
           }
-#line 7817 "gram1.tab.c" /* yacc.c:1646  */
+#line 7761 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 390:
-#line 3317 "gram1.y" /* yacc.c:1646  */
+#line 3318 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE t;
 	      PTR_SYMB  field;
 	    /*  PTR_BFND at_scope;*/
@@ -7863,23 +7807,23 @@ yyreduce:
                else 
                     errstr("Can't take component  %s", yytext,311);
              }
-#line 7867 "gram1.tab.c" /* yacc.c:1646  */
+#line 7811 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 391:
-#line 3375 "gram1.y" /* yacc.c:1646  */
+#line 3376 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 7873 "gram1.tab.c" /* yacc.c:1646  */
+#line 7817 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 392:
-#line 3377 "gram1.y" /* yacc.c:1646  */
+#line 3378 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 7879 "gram1.tab.c" /* yacc.c:1646  */
+#line 7823 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 393:
-#line 3379 "gram1.y" /* yacc.c:1646  */
+#line 3380 "gram1.y" /* yacc.c:1646  */
     {  int num_triplets;
                PTR_TYPE tp;
               /* PTR_LLND l;*/
@@ -7918,11 +7862,11 @@ yyreduce:
 
             endioctl();
            }
-#line 7922 "gram1.tab.c" /* yacc.c:1646  */
+#line 7866 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 394:
-#line 3419 "gram1.y" /* yacc.c:1646  */
+#line 3420 "gram1.y" /* yacc.c:1646  */
     {  int num_triplets;
 	      PTR_LLND l,l1,l2;
 
@@ -7962,11 +7906,11 @@ yyreduce:
               } else 
                    err("Can't subscript",44);
          }
-#line 7966 "gram1.tab.c" /* yacc.c:1646  */
+#line 7910 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 395:
-#line 3461 "gram1.y" /* yacc.c:1646  */
+#line 3462 "gram1.y" /* yacc.c:1646  */
     { 
 	      if ((yyvsp[-1].ll_node)->type->variant == T_STRING) {
                  (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
@@ -7974,73 +7918,73 @@ yyreduce:
               }
               else errstr("can't subscript of %s", (yyvsp[-1].ll_node)->entry.Template.symbol->ident,44);
             }
-#line 7978 "gram1.tab.c" /* yacc.c:1646  */
+#line 7922 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 396:
-#line 3471 "gram1.y" /* yacc.c:1646  */
+#line 3472 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 7984 "gram1.tab.c" /* yacc.c:1646  */
+#line 7928 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 397:
-#line 3473 "gram1.y" /* yacc.c:1646  */
+#line 3474 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7990 "gram1.tab.c" /* yacc.c:1646  */
+#line 7934 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 398:
-#line 3477 "gram1.y" /* yacc.c:1646  */
+#line 3478 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, DDOT, (yyvsp[-3].ll_node), (yyvsp[-1].ll_node), SMNULL); }
-#line 7996 "gram1.tab.c" /* yacc.c:1646  */
+#line 7940 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 399:
-#line 3481 "gram1.y" /* yacc.c:1646  */
+#line 3482 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 8002 "gram1.tab.c" /* yacc.c:1646  */
+#line 7946 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 400:
-#line 3483 "gram1.y" /* yacc.c:1646  */
+#line 3484 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8008 "gram1.tab.c" /* yacc.c:1646  */
+#line 7952 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 401:
-#line 3487 "gram1.y" /* yacc.c:1646  */
+#line 3488 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 8014 "gram1.tab.c" /* yacc.c:1646  */
+#line 7958 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 402:
-#line 3489 "gram1.y" /* yacc.c:1646  */
+#line 3490 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE t;
                t = make_type_node((yyvsp[-2].ll_node)->type, (yyvsp[0].ll_node));
                (yyval.ll_node) = (yyvsp[-2].ll_node);
                (yyval.ll_node)->type = t;
              }
-#line 8024 "gram1.tab.c" /* yacc.c:1646  */
+#line 7968 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 403:
-#line 3495 "gram1.y" /* yacc.c:1646  */
+#line 3496 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8030 "gram1.tab.c" /* yacc.c:1646  */
+#line 7974 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 404:
-#line 3497 "gram1.y" /* yacc.c:1646  */
+#line 3498 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE t;
                t = make_type_node((yyvsp[-2].ll_node)->type, (yyvsp[0].ll_node));
                (yyval.ll_node) = (yyvsp[-2].ll_node);
                (yyval.ll_node)->type = t;
              }
-#line 8040 "gram1.tab.c" /* yacc.c:1646  */
+#line 7984 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 405:
-#line 3503 "gram1.y" /* yacc.c:1646  */
+#line 3504 "gram1.y" /* yacc.c:1646  */
     {
               if ((yyvsp[0].ll_node) != LLNULL)
               {
@@ -8050,61 +7994,61 @@ yyreduce:
 	      else 
                  (yyval.ll_node) = (yyvsp[-1].ll_node);
              }
-#line 8054 "gram1.tab.c" /* yacc.c:1646  */
+#line 7998 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 406:
-#line 3516 "gram1.y" /* yacc.c:1646  */
+#line 3517 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,BOOL_VAL, LLNULL, LLNULL, SMNULL);
 	      (yyval.ll_node)->entry.bval = 1;
 	      (yyval.ll_node)->type = global_bool;
 	    }
-#line 8064 "gram1.tab.c" /* yacc.c:1646  */
+#line 8008 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 407:
-#line 3522 "gram1.y" /* yacc.c:1646  */
+#line 3523 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,BOOL_VAL, LLNULL, LLNULL, SMNULL);
 	      (yyval.ll_node)->entry.bval = 0;
 	      (yyval.ll_node)->type = global_bool;
 	    }
-#line 8074 "gram1.tab.c" /* yacc.c:1646  */
+#line 8018 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 408:
-#line 3529 "gram1.y" /* yacc.c:1646  */
+#line 3530 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,FLOAT_VAL, LLNULL, LLNULL, SMNULL);
 	      (yyval.ll_node)->entry.string_val = copys(yytext);
 	      (yyval.ll_node)->type = global_float;
 	    }
-#line 8084 "gram1.tab.c" /* yacc.c:1646  */
+#line 8028 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 409:
-#line 3535 "gram1.y" /* yacc.c:1646  */
+#line 3536 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
 	      (yyval.ll_node)->entry.string_val = copys(yytext);
 	      (yyval.ll_node)->type = global_double;
 	    }
-#line 8094 "gram1.tab.c" /* yacc.c:1646  */
+#line 8038 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 410:
-#line 3543 "gram1.y" /* yacc.c:1646  */
+#line 3544 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
 	      (yyval.ll_node)->entry.ival = atoi(yytext);
 	      (yyval.ll_node)->type = global_int;
 	    }
-#line 8104 "gram1.tab.c" /* yacc.c:1646  */
+#line 8048 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 411:
-#line 3551 "gram1.y" /* yacc.c:1646  */
+#line 3552 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE t;
 	      PTR_LLND p,q;
 	      (yyval.ll_node) = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
@@ -8120,11 +8064,11 @@ yyreduce:
               q = make_llnd(fi, LEN_OP, p, LLNULL, SMNULL); 
               (yyval.ll_node)->type = make_type_node(t, q);
 	    }
-#line 8124 "gram1.tab.c" /* yacc.c:1646  */
+#line 8068 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 412:
-#line 3567 "gram1.y" /* yacc.c:1646  */
+#line 3568 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE t;
 	      (yyval.ll_node) = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
 	      (yyval.ll_node)->entry.string_val = copys(yytext);
@@ -8134,11 +8078,11 @@ yyreduce:
 	        t = global_string;
 	      (yyval.ll_node)->type = make_type_node(t, (yyvsp[-2].ll_node));
             }
-#line 8138 "gram1.tab.c" /* yacc.c:1646  */
+#line 8082 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 413:
-#line 3577 "gram1.y" /* yacc.c:1646  */
+#line 3578 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE t;
 	      (yyval.ll_node) = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
 	      (yyval.ll_node)->entry.string_val = copys(yytext);
@@ -8148,92 +8092,92 @@ yyreduce:
 	        t = global_string;
 	      (yyval.ll_node)->type = make_type_node(t, (yyvsp[-2].ll_node));
             }
-#line 8152 "gram1.tab.c" /* yacc.c:1646  */
+#line 8096 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 414:
-#line 3590 "gram1.y" /* yacc.c:1646  */
+#line 3591 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,COMPLEX_VAL, (yyvsp[-3].ll_node), (yyvsp[-1].ll_node), SMNULL);
 	      (yyval.ll_node)->type = global_complex;
 	    }
-#line 8161 "gram1.tab.c" /* yacc.c:1646  */
+#line 8105 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 415:
-#line 3597 "gram1.y" /* yacc.c:1646  */
+#line 3598 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 8167 "gram1.tab.c" /* yacc.c:1646  */
+#line 8111 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 416:
-#line 3599 "gram1.y" /* yacc.c:1646  */
+#line 3600 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8173 "gram1.tab.c" /* yacc.c:1646  */
+#line 8117 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 417:
-#line 3622 "gram1.y" /* yacc.c:1646  */
+#line 3623 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL); }
-#line 8179 "gram1.tab.c" /* yacc.c:1646  */
+#line 8123 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 418:
-#line 3624 "gram1.y" /* yacc.c:1646  */
+#line 3625 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-1].ll_node),LLNULL,SMNULL); }
-#line 8185 "gram1.tab.c" /* yacc.c:1646  */
+#line 8129 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 419:
-#line 3626 "gram1.y" /* yacc.c:1646  */
+#line 3627 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,make_llnd(fi,DDOT,(yyvsp[-4].ll_node),(yyvsp[-2].ll_node),SMNULL),(yyvsp[0].ll_node),SMNULL); }
-#line 8191 "gram1.tab.c" /* yacc.c:1646  */
+#line 8135 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 420:
-#line 3628 "gram1.y" /* yacc.c:1646  */
+#line 3629 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,make_llnd(fi,DDOT,(yyvsp[-3].ll_node),LLNULL,SMNULL),(yyvsp[0].ll_node),SMNULL); }
-#line 8197 "gram1.tab.c" /* yacc.c:1646  */
+#line 8141 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 421:
-#line 3630 "gram1.y" /* yacc.c:1646  */
+#line 3631 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT, make_llnd(fi,DDOT,LLNULL,(yyvsp[-2].ll_node),SMNULL),(yyvsp[0].ll_node),SMNULL); }
-#line 8203 "gram1.tab.c" /* yacc.c:1646  */
+#line 8147 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 422:
-#line 3632 "gram1.y" /* yacc.c:1646  */
+#line 3633 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL),(yyvsp[0].ll_node),SMNULL); }
-#line 8209 "gram1.tab.c" /* yacc.c:1646  */
+#line 8153 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 423:
-#line 3634 "gram1.y" /* yacc.c:1646  */
+#line 3635 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,(yyvsp[0].ll_node),SMNULL); }
-#line 8215 "gram1.tab.c" /* yacc.c:1646  */
+#line 8159 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 424:
-#line 3636 "gram1.y" /* yacc.c:1646  */
+#line 3637 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL); }
-#line 8221 "gram1.tab.c" /* yacc.c:1646  */
+#line 8165 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 425:
-#line 3639 "gram1.y" /* yacc.c:1646  */
+#line 3640 "gram1.y" /* yacc.c:1646  */
     {in_vec=YES;}
-#line 8227 "gram1.tab.c" /* yacc.c:1646  */
+#line 8171 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 426:
-#line 3639 "gram1.y" /* yacc.c:1646  */
+#line 3640 "gram1.y" /* yacc.c:1646  */
     {in_vec=NO;}
-#line 8233 "gram1.tab.c" /* yacc.c:1646  */
+#line 8177 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 427:
-#line 3640 "gram1.y" /* yacc.c:1646  */
+#line 3641 "gram1.y" /* yacc.c:1646  */
     { PTR_TYPE array_type;
              (yyval.ll_node) = make_llnd (fi,CONSTRUCTOR_REF,(yyvsp[-2].ll_node),LLNULL,SMNULL); 
              /*$$->type = $2->type;*/ /*28.02.03*/
@@ -8245,108 +8189,108 @@ yyreduce:
                array_type->entry.ar_decl.base_type = (yyvsp[-2].ll_node)->type;
              (yyval.ll_node)->type = array_type;
            }
-#line 8249 "gram1.tab.c" /* yacc.c:1646  */
+#line 8193 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 428:
-#line 3654 "gram1.y" /* yacc.c:1646  */
+#line 3655 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8255 "gram1.tab.c" /* yacc.c:1646  */
+#line 8199 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 429:
-#line 3656 "gram1.y" /* yacc.c:1646  */
+#line 3657 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8261 "gram1.tab.c" /* yacc.c:1646  */
+#line 8205 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 430:
-#line 3679 "gram1.y" /* yacc.c:1646  */
+#line 3680 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 8267 "gram1.tab.c" /* yacc.c:1646  */
+#line 8211 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 431:
-#line 3681 "gram1.y" /* yacc.c:1646  */
+#line 3682 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST); endioctl(); }
-#line 8273 "gram1.tab.c" /* yacc.c:1646  */
+#line 8217 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 432:
-#line 3683 "gram1.y" /* yacc.c:1646  */
+#line 3684 "gram1.y" /* yacc.c:1646  */
     { stat_alloc = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL);
                   endioctl();
                 }
-#line 8281 "gram1.tab.c" /* yacc.c:1646  */
+#line 8225 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 433:
-#line 3699 "gram1.y" /* yacc.c:1646  */
+#line 3700 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 8287 "gram1.tab.c" /* yacc.c:1646  */
+#line 8231 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 434:
-#line 3701 "gram1.y" /* yacc.c:1646  */
+#line 3702 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST); endioctl(); }
-#line 8293 "gram1.tab.c" /* yacc.c:1646  */
+#line 8237 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 435:
-#line 3703 "gram1.y" /* yacc.c:1646  */
+#line 3704 "gram1.y" /* yacc.c:1646  */
     { stat_alloc = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL);
              endioctl();
            }
-#line 8301 "gram1.tab.c" /* yacc.c:1646  */
+#line 8245 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 436:
-#line 3716 "gram1.y" /* yacc.c:1646  */
+#line 3717 "gram1.y" /* yacc.c:1646  */
     {stat_alloc = LLNULL;}
-#line 8307 "gram1.tab.c" /* yacc.c:1646  */
+#line 8251 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 437:
-#line 3720 "gram1.y" /* yacc.c:1646  */
+#line 3721 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 8313 "gram1.tab.c" /* yacc.c:1646  */
+#line 8257 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 438:
-#line 3722 "gram1.y" /* yacc.c:1646  */
+#line 3723 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 8319 "gram1.tab.c" /* yacc.c:1646  */
+#line 8263 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 439:
-#line 3730 "gram1.y" /* yacc.c:1646  */
+#line 3731 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8325 "gram1.tab.c" /* yacc.c:1646  */
+#line 8269 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 440:
-#line 3732 "gram1.y" /* yacc.c:1646  */
+#line 3733 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8331 "gram1.tab.c" /* yacc.c:1646  */
+#line 8275 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 441:
-#line 3734 "gram1.y" /* yacc.c:1646  */
+#line 3735 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8337 "gram1.tab.c" /* yacc.c:1646  */
+#line 8281 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 442:
-#line 3736 "gram1.y" /* yacc.c:1646  */
+#line 3737 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.bf_node) = (yyvsp[0].bf_node);
               (yyval.bf_node)->entry.Template.ll_ptr3 = (yyvsp[-1].ll_node);
             }
-#line 8346 "gram1.tab.c" /* yacc.c:1646  */
+#line 8290 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 443:
-#line 3790 "gram1.y" /* yacc.c:1646  */
+#line 3791 "gram1.y" /* yacc.c:1646  */
     { PTR_BFND biff;
 
 	      (yyval.bf_node) = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
@@ -8366,373 +8310,373 @@ yyreduce:
                 (yyval.bf_node)->control_parent = biff;
               delete_beyond_scope_level(pred_bfnd);
             }
-#line 8370 "gram1.tab.c" /* yacc.c:1646  */
+#line 8314 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 444:
-#line 3812 "gram1.y" /* yacc.c:1646  */
+#line 3813 "gram1.y" /* yacc.c:1646  */
     {
               make_extend((yyvsp[0].symbol));
               (yyval.bf_node) = BFNULL; 
               /* delete_beyond_scope_level(pred_bfnd); */
              }
-#line 8380 "gram1.tab.c" /* yacc.c:1646  */
+#line 8324 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 445:
-#line 3825 "gram1.y" /* yacc.c:1646  */
+#line 3826 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
 	    bind(); 
 	    delete_beyond_scope_level(pred_bfnd);
 	    position = IN_OUTSIDE;
           }
-#line 8390 "gram1.tab.c" /* yacc.c:1646  */
+#line 8334 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 446:
-#line 3834 "gram1.y" /* yacc.c:1646  */
+#line 3835 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8396 "gram1.tab.c" /* yacc.c:1646  */
+#line 8340 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 447:
-#line 3837 "gram1.y" /* yacc.c:1646  */
+#line 3838 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.bf_node) = (yyvsp[0].bf_node);
               (yyval.bf_node)->entry.Template.ll_ptr3 = (yyvsp[-1].ll_node);
             }
-#line 8405 "gram1.tab.c" /* yacc.c:1646  */
+#line 8349 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 448:
-#line 3887 "gram1.y" /* yacc.c:1646  */
+#line 3888 "gram1.y" /* yacc.c:1646  */
     { thiswasbranch = NO;
               (yyvsp[-1].bf_node)->variant = LOGIF_NODE;
               (yyval.bf_node) = make_logif((yyvsp[-1].bf_node), (yyvsp[0].bf_node));
 	      set_blobs((yyvsp[-1].bf_node), pred_bfnd, SAME_GROUP);
 	    }
-#line 8415 "gram1.tab.c" /* yacc.c:1646  */
+#line 8359 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 449:
-#line 3893 "gram1.y" /* yacc.c:1646  */
+#line 3894 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.bf_node) = (yyvsp[-1].bf_node);
 	      set_blobs((yyval.bf_node), pred_bfnd, NEW_GROUP1); 
             }
-#line 8424 "gram1.tab.c" /* yacc.c:1646  */
+#line 8368 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 450:
-#line 3898 "gram1.y" /* yacc.c:1646  */
+#line 3899 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.bf_node) = (yyvsp[-1].bf_node);
               (yyval.bf_node)->entry.Template.ll_ptr3 = (yyvsp[-2].ll_node);
 	      set_blobs((yyval.bf_node), pred_bfnd, NEW_GROUP1); 
             }
-#line 8434 "gram1.tab.c" /* yacc.c:1646  */
+#line 8378 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 451:
-#line 3916 "gram1.y" /* yacc.c:1646  */
+#line 3917 "gram1.y" /* yacc.c:1646  */
     { make_elseif((yyvsp[-3].ll_node),(yyvsp[0].symbol)); lastwasbranch = NO; (yyval.bf_node) = BFNULL;}
-#line 8440 "gram1.tab.c" /* yacc.c:1646  */
+#line 8384 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 452:
-#line 3918 "gram1.y" /* yacc.c:1646  */
+#line 3919 "gram1.y" /* yacc.c:1646  */
     { make_else((yyvsp[0].symbol)); lastwasbranch = NO; (yyval.bf_node) = BFNULL; }
-#line 8446 "gram1.tab.c" /* yacc.c:1646  */
+#line 8390 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 453:
-#line 3920 "gram1.y" /* yacc.c:1646  */
+#line 3921 "gram1.y" /* yacc.c:1646  */
     { make_endif((yyvsp[0].symbol)); (yyval.bf_node) = BFNULL; }
-#line 8452 "gram1.tab.c" /* yacc.c:1646  */
+#line 8396 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 454:
-#line 3922 "gram1.y" /* yacc.c:1646  */
+#line 3923 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8458 "gram1.tab.c" /* yacc.c:1646  */
+#line 8402 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 455:
-#line 3924 "gram1.y" /* yacc.c:1646  */
+#line 3925 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, CONTAINS_STMT, SMNULL, LLNULL, LLNULL, LLNULL); }
-#line 8464 "gram1.tab.c" /* yacc.c:1646  */
+#line 8408 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 456:
-#line 3927 "gram1.y" /* yacc.c:1646  */
+#line 3928 "gram1.y" /* yacc.c:1646  */
     { thiswasbranch = NO;
               (yyvsp[-1].bf_node)->variant = FORALL_STAT;
               (yyval.bf_node) = make_logif((yyvsp[-1].bf_node), (yyvsp[0].bf_node));
 	      set_blobs((yyvsp[-1].bf_node), pred_bfnd, SAME_GROUP);
 	    }
-#line 8474 "gram1.tab.c" /* yacc.c:1646  */
+#line 8418 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 457:
-#line 3933 "gram1.y" /* yacc.c:1646  */
+#line 3934 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8480 "gram1.tab.c" /* yacc.c:1646  */
+#line 8424 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 458:
-#line 3935 "gram1.y" /* yacc.c:1646  */
+#line 3936 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); (yyval.bf_node)->entry.Template.ll_ptr3 = (yyvsp[-1].ll_node);}
-#line 8486 "gram1.tab.c" /* yacc.c:1646  */
+#line 8430 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 459:
-#line 3937 "gram1.y" /* yacc.c:1646  */
+#line 3938 "gram1.y" /* yacc.c:1646  */
     { make_endforall((yyvsp[0].symbol)); (yyval.bf_node) = BFNULL; }
-#line 8492 "gram1.tab.c" /* yacc.c:1646  */
+#line 8436 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 460:
-#line 3940 "gram1.y" /* yacc.c:1646  */
+#line 3941 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8498 "gram1.tab.c" /* yacc.c:1646  */
+#line 8442 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 461:
-#line 3942 "gram1.y" /* yacc.c:1646  */
+#line 3943 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8504 "gram1.tab.c" /* yacc.c:1646  */
+#line 8448 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 462:
-#line 3944 "gram1.y" /* yacc.c:1646  */
+#line 3945 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8510 "gram1.tab.c" /* yacc.c:1646  */
+#line 8454 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 463:
-#line 3971 "gram1.y" /* yacc.c:1646  */
+#line 3972 "gram1.y" /* yacc.c:1646  */
     { 	     
 	     /*  if($5 && $5->labdefined)
 		 execerr("no backward DO loops", (char *)NULL); */
 	       (yyval.bf_node) = make_do(WHILE_NODE, LBNULL, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL);
 	       /*$$->entry.Template.ll_ptr3 = $1;*/	     
            }
-#line 8521 "gram1.tab.c" /* yacc.c:1646  */
+#line 8465 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 464:
-#line 3980 "gram1.y" /* yacc.c:1646  */
+#line 3981 "gram1.y" /* yacc.c:1646  */
     {
                if( (yyvsp[-3].label) && (yyvsp[-3].label)->labdefined)
 		  err("No backward DO loops", 46);
 	        (yyval.bf_node) = make_do(WHILE_NODE, (yyvsp[-3].label), SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);            
 	    }
-#line 8531 "gram1.tab.c" /* yacc.c:1646  */
+#line 8475 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 465:
-#line 3988 "gram1.y" /* yacc.c:1646  */
+#line 3989 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 8537 "gram1.tab.c" /* yacc.c:1646  */
+#line 8481 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 466:
-#line 3990 "gram1.y" /* yacc.c:1646  */
+#line 3991 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 8543 "gram1.tab.c" /* yacc.c:1646  */
+#line 8487 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 467:
-#line 3992 "gram1.y" /* yacc.c:1646  */
+#line 3993 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 8549 "gram1.tab.c" /* yacc.c:1646  */
+#line 8493 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 468:
-#line 3997 "gram1.y" /* yacc.c:1646  */
+#line 3998 "gram1.y" /* yacc.c:1646  */
     {  
                if( (yyvsp[-7].label) && (yyvsp[-7].label)->labdefined)
 		  err("No backward DO loops", 46);
 	        (yyval.bf_node) = make_do(FOR_NODE, (yyvsp[-7].label), (yyvsp[-4].symbol), (yyvsp[-2].ll_node), (yyvsp[0].ll_node), LLNULL);            
 	    }
-#line 8559 "gram1.tab.c" /* yacc.c:1646  */
+#line 8503 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 469:
-#line 4004 "gram1.y" /* yacc.c:1646  */
+#line 4005 "gram1.y" /* yacc.c:1646  */
     {
                if( (yyvsp[-9].label) && (yyvsp[-9].label)->labdefined)
 		  err("No backward DO loops", 46);
 	        (yyval.bf_node) = make_do(FOR_NODE, (yyvsp[-9].label), (yyvsp[-6].symbol), (yyvsp[-4].ll_node), (yyvsp[-2].ll_node), (yyvsp[0].ll_node));            
 	    }
-#line 8569 "gram1.tab.c" /* yacc.c:1646  */
+#line 8513 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 470:
-#line 4012 "gram1.y" /* yacc.c:1646  */
+#line 4013 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, CASE_NODE, (yyvsp[0].symbol), (yyvsp[-1].ll_node), LLNULL, LLNULL); }
-#line 8575 "gram1.tab.c" /* yacc.c:1646  */
+#line 8519 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 471:
-#line 4014 "gram1.y" /* yacc.c:1646  */
+#line 4015 "gram1.y" /* yacc.c:1646  */
     { /*PTR_LLND p;*/
 	     /* p = make_llnd(fi, DEFAULT, LLNULL, LLNULL, SMNULL); */
 	      (yyval.bf_node) = get_bfnd(fi, DEFAULT_NODE, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL); }
-#line 8583 "gram1.tab.c" /* yacc.c:1646  */
+#line 8527 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 472:
-#line 4018 "gram1.y" /* yacc.c:1646  */
+#line 4019 "gram1.y" /* yacc.c:1646  */
     { make_endselect((yyvsp[0].symbol)); (yyval.bf_node) = BFNULL; }
-#line 8589 "gram1.tab.c" /* yacc.c:1646  */
+#line 8533 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 473:
-#line 4021 "gram1.y" /* yacc.c:1646  */
+#line 4022 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, SWITCH_NODE, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL) ; }
-#line 8595 "gram1.tab.c" /* yacc.c:1646  */
+#line 8539 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 474:
-#line 4023 "gram1.y" /* yacc.c:1646  */
+#line 4024 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, SWITCH_NODE, SMNULL, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-7].ll_node)) ; }
-#line 8601 "gram1.tab.c" /* yacc.c:1646  */
+#line 8545 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 475:
-#line 4027 "gram1.y" /* yacc.c:1646  */
+#line 4028 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 8607 "gram1.tab.c" /* yacc.c:1646  */
+#line 8551 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 476:
-#line 4033 "gram1.y" /* yacc.c:1646  */
+#line 4034 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8613 "gram1.tab.c" /* yacc.c:1646  */
+#line 8557 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 477:
-#line 4035 "gram1.y" /* yacc.c:1646  */
+#line 4036 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, DDOT, (yyvsp[-1].ll_node), LLNULL, SMNULL); }
-#line 8619 "gram1.tab.c" /* yacc.c:1646  */
+#line 8563 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 478:
-#line 4037 "gram1.y" /* yacc.c:1646  */
+#line 4038 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, DDOT, LLNULL, (yyvsp[0].ll_node), SMNULL); }
-#line 8625 "gram1.tab.c" /* yacc.c:1646  */
+#line 8569 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 479:
-#line 4039 "gram1.y" /* yacc.c:1646  */
+#line 4040 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 8631 "gram1.tab.c" /* yacc.c:1646  */
+#line 8575 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 480:
-#line 4043 "gram1.y" /* yacc.c:1646  */
+#line 4044 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 8637 "gram1.tab.c" /* yacc.c:1646  */
+#line 8581 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 481:
-#line 4045 "gram1.y" /* yacc.c:1646  */
+#line 4046 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 	      
 	      p = make_llnd(fi, EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      add_to_lowLevelList(p, (yyvsp[-2].ll_node));
 	    }
-#line 8647 "gram1.tab.c" /* yacc.c:1646  */
+#line 8591 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 482:
-#line 4053 "gram1.y" /* yacc.c:1646  */
+#line 4054 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = SMNULL; }
-#line 8653 "gram1.tab.c" /* yacc.c:1646  */
+#line 8597 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 483:
-#line 4055 "gram1.y" /* yacc.c:1646  */
+#line 4056 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), CONSTRUCT_NAME, global_default,
                                      LOCAL); }
-#line 8660 "gram1.tab.c" /* yacc.c:1646  */
+#line 8604 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 484:
-#line 4061 "gram1.y" /* yacc.c:1646  */
+#line 4062 "gram1.y" /* yacc.c:1646  */
     {(yyval.hash_entry) = HSNULL;}
-#line 8666 "gram1.tab.c" /* yacc.c:1646  */
+#line 8610 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 485:
-#line 4063 "gram1.y" /* yacc.c:1646  */
+#line 4064 "gram1.y" /* yacc.c:1646  */
     { (yyval.hash_entry) = (yyvsp[0].hash_entry);}
-#line 8672 "gram1.tab.c" /* yacc.c:1646  */
+#line 8616 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 486:
-#line 4067 "gram1.y" /* yacc.c:1646  */
+#line 4068 "gram1.y" /* yacc.c:1646  */
     {(yyval.hash_entry) = look_up_sym(yytext);}
-#line 8678 "gram1.tab.c" /* yacc.c:1646  */
+#line 8622 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 487:
-#line 4071 "gram1.y" /* yacc.c:1646  */
+#line 4072 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	             s = make_local_entity( (yyvsp[-1].hash_entry), CONSTRUCT_NAME, global_default, LOCAL);             
                     (yyval.ll_node) = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
                    }
-#line 8687 "gram1.tab.c" /* yacc.c:1646  */
+#line 8631 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 488:
-#line 4092 "gram1.y" /* yacc.c:1646  */
+#line 4093 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = make_if((yyvsp[-1].ll_node)); }
-#line 8693 "gram1.tab.c" /* yacc.c:1646  */
+#line 8637 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 489:
-#line 4095 "gram1.y" /* yacc.c:1646  */
+#line 4096 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = make_forall((yyvsp[-2].ll_node),(yyvsp[-1].ll_node)); }
-#line 8699 "gram1.tab.c" /* yacc.c:1646  */
+#line 8643 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 490:
-#line 4099 "gram1.y" /* yacc.c:1646  */
+#line 4100 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 8705 "gram1.tab.c" /* yacc.c:1646  */
+#line 8649 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 491:
-#line 4101 "gram1.y" /* yacc.c:1646  */
+#line 4102 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;	      
 	      p = make_llnd(fi, EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      add_to_lowLevelList(p, (yyvsp[-2].ll_node));
 	    }
-#line 8714 "gram1.tab.c" /* yacc.c:1646  */
+#line 8658 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 492:
-#line 4108 "gram1.y" /* yacc.c:1646  */
+#line 4109 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi, FORALL_OP, (yyvsp[0].ll_node), LLNULL, (yyvsp[-2].symbol)); }
-#line 8720 "gram1.tab.c" /* yacc.c:1646  */
+#line 8664 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 493:
-#line 4112 "gram1.y" /* yacc.c:1646  */
+#line 4113 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node)=LLNULL;}
-#line 8726 "gram1.tab.c" /* yacc.c:1646  */
+#line 8670 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 494:
-#line 4114 "gram1.y" /* yacc.c:1646  */
+#line 4115 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node)=(yyvsp[0].ll_node);}
-#line 8732 "gram1.tab.c" /* yacc.c:1646  */
+#line 8676 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 495:
-#line 4125 "gram1.y" /* yacc.c:1646  */
+#line 4126 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB  s;
               s = (yyvsp[0].hash_entry)->id_attr;
       	      if (!s || s->variant == DEFAULT)
@@ -8742,11 +8686,11 @@ yyreduce:
 	      }
               (yyval.symbol) = s; 
 	 }
-#line 8746 "gram1.tab.c" /* yacc.c:1646  */
+#line 8690 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 496:
-#line 4138 "gram1.y" /* yacc.c:1646  */
+#line 4139 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
               PTR_LLND l;
               int vrnt;
@@ -8768,11 +8712,11 @@ yyreduce:
 		do_name_err = YES;
 	      }
 	    }
-#line 8772 "gram1.tab.c" /* yacc.c:1646  */
+#line 8716 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 497:
-#line 4161 "gram1.y" /* yacc.c:1646  */
+#line 4162 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
               PTR_LLND l;
               int vrnt;
@@ -8793,56 +8737,56 @@ yyreduce:
 		do_name_err = YES;
 	      }
 	    }
-#line 8797 "gram1.tab.c" /* yacc.c:1646  */
+#line 8741 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 498:
-#line 4184 "gram1.y" /* yacc.c:1646  */
+#line 4185 "gram1.y" /* yacc.c:1646  */
     { (yyval.label) = LBNULL; }
-#line 8803 "gram1.tab.c" /* yacc.c:1646  */
+#line 8747 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 499:
-#line 4186 "gram1.y" /* yacc.c:1646  */
+#line 4187 "gram1.y" /* yacc.c:1646  */
     {
 	       (yyval.label)  = make_label_node(fi,convci(yyleng, yytext));
 	       (yyval.label)->scope = cur_scope();
 	    }
-#line 8812 "gram1.tab.c" /* yacc.c:1646  */
+#line 8756 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 500:
-#line 4193 "gram1.y" /* yacc.c:1646  */
+#line 4194 "gram1.y" /* yacc.c:1646  */
     { make_endwhere((yyvsp[0].symbol)); (yyval.bf_node) = BFNULL; }
-#line 8818 "gram1.tab.c" /* yacc.c:1646  */
+#line 8762 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 501:
-#line 4195 "gram1.y" /* yacc.c:1646  */
+#line 4196 "gram1.y" /* yacc.c:1646  */
     { make_elsewhere((yyvsp[0].symbol)); lastwasbranch = NO; (yyval.bf_node) = BFNULL; }
-#line 8824 "gram1.tab.c" /* yacc.c:1646  */
+#line 8768 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 502:
-#line 4197 "gram1.y" /* yacc.c:1646  */
+#line 4198 "gram1.y" /* yacc.c:1646  */
     { make_elsewhere_mask((yyvsp[-2].ll_node),(yyvsp[0].symbol)); lastwasbranch = NO; (yyval.bf_node) = BFNULL; }
-#line 8830 "gram1.tab.c" /* yacc.c:1646  */
+#line 8774 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 503:
-#line 4199 "gram1.y" /* yacc.c:1646  */
+#line 4200 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, WHERE_BLOCK_STMT, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL); }
-#line 8836 "gram1.tab.c" /* yacc.c:1646  */
+#line 8780 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 504:
-#line 4201 "gram1.y" /* yacc.c:1646  */
+#line 4202 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, WHERE_BLOCK_STMT, SMNULL, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-5].ll_node)); }
-#line 8842 "gram1.tab.c" /* yacc.c:1646  */
+#line 8786 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 505:
-#line 4206 "gram1.y" /* yacc.c:1646  */
+#line 4207 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, r;
              PTR_SYMB s1, s2 = SMNULL, s3, arg_list;
 	     PTR_HASH hash_entry;
@@ -8918,44 +8862,44 @@ yyreduce:
                  parstate = INEXEC;
              }
 	  }
-#line 8922 "gram1.tab.c" /* yacc.c:1646  */
+#line 8866 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 506:
-#line 4282 "gram1.y" /* yacc.c:1646  */
+#line 4283 "gram1.y" /* yacc.c:1646  */
     { /*PTR_SYMB s;*/
 	
 	      /*s = make_scalar($2, TYNULL, LOCAL);*/
   	      (yyval.bf_node) = get_bfnd(fi, POINTER_ASSIGN_STAT, SMNULL, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), LLNULL);
 	    }
-#line 8932 "gram1.tab.c" /* yacc.c:1646  */
+#line 8876 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 507:
-#line 4294 "gram1.y" /* yacc.c:1646  */
+#line 4295 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB p;
 
 	      p = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);
 	      p->variant = LABEL_VAR;
   	      (yyval.bf_node) = get_bfnd(fi,ASSLAB_STAT, p, (yyvsp[-2].ll_node),LLNULL,LLNULL);
             }
-#line 8943 "gram1.tab.c" /* yacc.c:1646  */
+#line 8887 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 508:
-#line 4301 "gram1.y" /* yacc.c:1646  */
+#line 4302 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,CONT_STAT,SMNULL,LLNULL,LLNULL,LLNULL); }
-#line 8949 "gram1.tab.c" /* yacc.c:1646  */
+#line 8893 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 510:
-#line 4304 "gram1.y" /* yacc.c:1646  */
+#line 4305 "gram1.y" /* yacc.c:1646  */
     { inioctl = NO; }
-#line 8955 "gram1.tab.c" /* yacc.c:1646  */
+#line 8899 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 511:
-#line 4306 "gram1.y" /* yacc.c:1646  */
+#line 4307 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND	p;
 
 	      p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
@@ -8964,113 +8908,113 @@ yyreduce:
 			    make_llnd(fi,EXPR_LIST, (yyvsp[-4].ll_node), p, SMNULL), LLNULL);
 	      thiswasbranch = YES;
             }
-#line 8968 "gram1.tab.c" /* yacc.c:1646  */
+#line 8912 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 512:
-#line 4315 "gram1.y" /* yacc.c:1646  */
+#line 4316 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.bf_node) = subroutine_call((yyvsp[0].symbol), LLNULL, LLNULL, PLAIN);
 /*	      match_parameters($1, LLNULL);
 	      $$= get_bfnd(fi,PROC_STAT, $1, LLNULL, LLNULL, LLNULL);
 */	      endioctl(); 
             }
-#line 8979 "gram1.tab.c" /* yacc.c:1646  */
+#line 8923 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 513:
-#line 4322 "gram1.y" /* yacc.c:1646  */
+#line 4323 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.bf_node) = subroutine_call((yyvsp[-2].symbol), LLNULL, LLNULL, PLAIN);
 /*	      match_parameters($1, LLNULL);
 	      $$= get_bfnd(fi,PROC_STAT,$1,LLNULL,LLNULL,LLNULL);
 */	      endioctl(); 
 	    }
-#line 8990 "gram1.tab.c" /* yacc.c:1646  */
+#line 8934 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 514:
-#line 4329 "gram1.y" /* yacc.c:1646  */
+#line 4330 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.bf_node) = subroutine_call((yyvsp[-3].symbol), (yyvsp[-1].ll_node), LLNULL, PLAIN);
 /*	      match_parameters($1, $3);
 	      $$= get_bfnd(fi,PROC_STAT,$1,$3,LLNULL,LLNULL);
 */	      endioctl(); 
 	    }
-#line 9001 "gram1.tab.c" /* yacc.c:1646  */
+#line 8945 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 515:
-#line 4337 "gram1.y" /* yacc.c:1646  */
+#line 4338 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.bf_node) = get_bfnd(fi,RETURN_STAT,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
 	      thiswasbranch = YES;
 	    }
-#line 9010 "gram1.tab.c" /* yacc.c:1646  */
+#line 8954 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 516:
-#line 4342 "gram1.y" /* yacc.c:1646  */
+#line 4343 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.bf_node) = get_bfnd(fi,(yyvsp[-2].token),SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
 	      thiswasbranch = ((yyvsp[-2].token) == STOP_STAT);
 	    }
-#line 9019 "gram1.tab.c" /* yacc.c:1646  */
+#line 8963 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 517:
-#line 4347 "gram1.y" /* yacc.c:1646  */
+#line 4348 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, CYCLE_STMT, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL); }
-#line 9025 "gram1.tab.c" /* yacc.c:1646  */
+#line 8969 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 518:
-#line 4350 "gram1.y" /* yacc.c:1646  */
+#line 4351 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, EXIT_STMT, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL); }
-#line 9031 "gram1.tab.c" /* yacc.c:1646  */
+#line 8975 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 519:
-#line 4353 "gram1.y" /* yacc.c:1646  */
+#line 4354 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, ALLOCATE_STMT,  SMNULL, (yyvsp[-1].ll_node), stat_alloc, LLNULL); }
-#line 9037 "gram1.tab.c" /* yacc.c:1646  */
+#line 8981 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 520:
-#line 4356 "gram1.y" /* yacc.c:1646  */
+#line 4357 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, DEALLOCATE_STMT, SMNULL, (yyvsp[-1].ll_node), stat_alloc , LLNULL); }
-#line 9043 "gram1.tab.c" /* yacc.c:1646  */
+#line 8987 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 521:
-#line 4359 "gram1.y" /* yacc.c:1646  */
+#line 4360 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, NULLIFY_STMT, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL); }
-#line 9049 "gram1.tab.c" /* yacc.c:1646  */
+#line 8993 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 522:
-#line 4362 "gram1.y" /* yacc.c:1646  */
+#line 4363 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi, WHERE_NODE, SMNULL, (yyvsp[-4].ll_node), (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 9055 "gram1.tab.c" /* yacc.c:1646  */
+#line 8999 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 523:
-#line 4380 "gram1.y" /* yacc.c:1646  */
+#line 4381 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = LLNULL;}
-#line 9061 "gram1.tab.c" /* yacc.c:1646  */
+#line 9005 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 524:
-#line 4384 "gram1.y" /* yacc.c:1646  */
+#line 4385 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.bf_node)=get_bfnd(fi,GOTO_NODE,SMNULL,LLNULL,LLNULL,(PTR_LLND)(yyvsp[0].ll_node));
 	      thiswasbranch = YES;
 	    }
-#line 9070 "gram1.tab.c" /* yacc.c:1646  */
+#line 9014 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 525:
-#line 4389 "gram1.y" /* yacc.c:1646  */
+#line 4390 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB p;
 
 	      if((yyvsp[0].hash_entry)->id_attr)
@@ -9089,11 +9033,11 @@ yyreduce:
 		  (yyval.bf_node) = BFNULL;
 	      }
 	    }
-#line 9093 "gram1.tab.c" /* yacc.c:1646  */
+#line 9037 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 526:
-#line 4408 "gram1.y" /* yacc.c:1646  */
+#line 4409 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB p;
 
 	      if((yyvsp[-4].hash_entry)->id_attr)
@@ -9112,71 +9056,71 @@ yyreduce:
 		(yyval.bf_node) = BFNULL;
 	      }
 	    }
-#line 9116 "gram1.tab.c" /* yacc.c:1646  */
+#line 9060 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 527:
-#line 4427 "gram1.y" /* yacc.c:1646  */
+#line 4428 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,COMGOTO_NODE, SMNULL, (yyvsp[-3].ll_node), (yyvsp[0].ll_node), LLNULL); }
-#line 9122 "gram1.tab.c" /* yacc.c:1646  */
+#line 9066 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 530:
-#line 4435 "gram1.y" /* yacc.c:1646  */
+#line 4436 "gram1.y" /* yacc.c:1646  */
     { (yyval.symbol) = make_procedure((yyvsp[-1].hash_entry), LOCAL); }
-#line 9128 "gram1.tab.c" /* yacc.c:1646  */
+#line 9072 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 531:
-#line 4439 "gram1.y" /* yacc.c:1646  */
+#line 4440 "gram1.y" /* yacc.c:1646  */
     { 
               (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);
               endioctl();
             }
-#line 9137 "gram1.tab.c" /* yacc.c:1646  */
+#line 9081 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 532:
-#line 4444 "gram1.y" /* yacc.c:1646  */
+#line 4445 "gram1.y" /* yacc.c:1646  */
     { 
                (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST);
                endioctl();
             }
-#line 9146 "gram1.tab.c" /* yacc.c:1646  */
+#line 9090 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 533:
-#line 4451 "gram1.y" /* yacc.c:1646  */
+#line 4452 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9152 "gram1.tab.c" /* yacc.c:1646  */
+#line 9096 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 534:
-#line 4453 "gram1.y" /* yacc.c:1646  */
+#line 4454 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node)  = make_llnd(fi, KEYWORD_ARG, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 9158 "gram1.tab.c" /* yacc.c:1646  */
+#line 9102 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 535:
-#line 4455 "gram1.y" /* yacc.c:1646  */
+#line 4456 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,LABEL_ARG,(yyvsp[0].ll_node),LLNULL,SMNULL); }
-#line 9164 "gram1.tab.c" /* yacc.c:1646  */
+#line 9108 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 536:
-#line 4458 "gram1.y" /* yacc.c:1646  */
+#line 4459 "gram1.y" /* yacc.c:1646  */
     { (yyval.token) = PAUSE_NODE; }
-#line 9170 "gram1.tab.c" /* yacc.c:1646  */
+#line 9114 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 537:
-#line 4459 "gram1.y" /* yacc.c:1646  */
+#line 4460 "gram1.y" /* yacc.c:1646  */
     { (yyval.token) = STOP_STAT; }
-#line 9176 "gram1.tab.c" /* yacc.c:1646  */
+#line 9120 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 538:
-#line 4470 "gram1.y" /* yacc.c:1646  */
+#line 4471 "gram1.y" /* yacc.c:1646  */
     { if(parstate == OUTSIDE)
 		{ PTR_BFND p;
 
@@ -9189,30 +9133,30 @@ yyreduce:
 		parstate = INEXEC;
 		yystno = 0;
 	      }
-#line 9193 "gram1.tab.c" /* yacc.c:1646  */
+#line 9137 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 539:
-#line 4485 "gram1.y" /* yacc.c:1646  */
+#line 4486 "gram1.y" /* yacc.c:1646  */
     { intonly = YES; }
-#line 9199 "gram1.tab.c" /* yacc.c:1646  */
+#line 9143 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 540:
-#line 4489 "gram1.y" /* yacc.c:1646  */
+#line 4490 "gram1.y" /* yacc.c:1646  */
     { intonly = NO; }
-#line 9205 "gram1.tab.c" /* yacc.c:1646  */
+#line 9149 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 541:
-#line 4497 "gram1.y" /* yacc.c:1646  */
+#line 4498 "gram1.y" /* yacc.c:1646  */
     { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
 		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9212 "gram1.tab.c" /* yacc.c:1646  */
+#line 9156 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 542:
-#line 4500 "gram1.y" /* yacc.c:1646  */
+#line 4501 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q = LLNULL;
 
 		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
@@ -9222,11 +9166,11 @@ yyreduce:
 		  (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = p;
 		  endioctl();
 		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9226 "gram1.tab.c" /* yacc.c:1646  */
+#line 9170 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 543:
-#line 4510 "gram1.y" /* yacc.c:1646  */
+#line 4511 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q, r;
 
 		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
@@ -9239,11 +9183,11 @@ yyreduce:
 		  (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = r;
 		  endioctl();
 		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9243 "gram1.tab.c" /* yacc.c:1646  */
+#line 9187 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 544:
-#line 4523 "gram1.y" /* yacc.c:1646  */
+#line 4524 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q, r;
 
 		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
@@ -9256,136 +9200,136 @@ yyreduce:
 		  (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = r;
 		  endioctl();
 		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9260 "gram1.tab.c" /* yacc.c:1646  */
+#line 9204 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 545:
-#line 4536 "gram1.y" /* yacc.c:1646  */
+#line 4537 "gram1.y" /* yacc.c:1646  */
     { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
 		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9267 "gram1.tab.c" /* yacc.c:1646  */
+#line 9211 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 546:
-#line 4539 "gram1.y" /* yacc.c:1646  */
+#line 4540 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 9273 "gram1.tab.c" /* yacc.c:1646  */
+#line 9217 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 547:
-#line 4541 "gram1.y" /* yacc.c:1646  */
+#line 4542 "gram1.y" /* yacc.c:1646  */
     { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
 		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9280 "gram1.tab.c" /* yacc.c:1646  */
+#line 9224 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 548:
-#line 4544 "gram1.y" /* yacc.c:1646  */
+#line 4545 "gram1.y" /* yacc.c:1646  */
     { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
 		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9287 "gram1.tab.c" /* yacc.c:1646  */
+#line 9231 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 549:
-#line 4547 "gram1.y" /* yacc.c:1646  */
+#line 4548 "gram1.y" /* yacc.c:1646  */
     { (yyvsp[-2].bf_node)->entry.Template.ll_ptr2 = (yyvsp[-1].ll_node);
 		  (yyvsp[-2].bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
 		  (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9295 "gram1.tab.c" /* yacc.c:1646  */
+#line 9239 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 550:
-#line 4551 "gram1.y" /* yacc.c:1646  */
+#line 4552 "gram1.y" /* yacc.c:1646  */
     { (yyvsp[-3].bf_node)->entry.Template.ll_ptr2 = (yyvsp[-2].ll_node);
 		  (yyvsp[-3].bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
 		  (yyval.bf_node) = (yyvsp[-3].bf_node); }
-#line 9303 "gram1.tab.c" /* yacc.c:1646  */
+#line 9247 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 551:
-#line 4560 "gram1.y" /* yacc.c:1646  */
+#line 4561 "gram1.y" /* yacc.c:1646  */
     { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
 		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9310 "gram1.tab.c" /* yacc.c:1646  */
+#line 9254 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 552:
-#line 4563 "gram1.y" /* yacc.c:1646  */
+#line 4564 "gram1.y" /* yacc.c:1646  */
     { (yyvsp[-2].bf_node)->entry.Template.ll_ptr2 = (yyvsp[-1].ll_node);
 		  (yyvsp[-2].bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
 		  (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9318 "gram1.tab.c" /* yacc.c:1646  */
+#line 9262 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 553:
-#line 4567 "gram1.y" /* yacc.c:1646  */
+#line 4568 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 9324 "gram1.tab.c" /* yacc.c:1646  */
+#line 9268 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 554:
-#line 4569 "gram1.y" /* yacc.c:1646  */
+#line 4570 "gram1.y" /* yacc.c:1646  */
     { (yyvsp[-2].bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
 		  (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9331 "gram1.tab.c" /* yacc.c:1646  */
+#line 9275 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 555:
-#line 4575 "gram1.y" /* yacc.c:1646  */
+#line 4576 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9337 "gram1.tab.c" /* yacc.c:1646  */
+#line 9281 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 556:
-#line 4579 "gram1.y" /* yacc.c:1646  */
+#line 4580 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi, BACKSPACE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9343 "gram1.tab.c" /* yacc.c:1646  */
+#line 9287 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 557:
-#line 4581 "gram1.y" /* yacc.c:1646  */
+#line 4582 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi, REWIND_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9349 "gram1.tab.c" /* yacc.c:1646  */
+#line 9293 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 558:
-#line 4583 "gram1.y" /* yacc.c:1646  */
+#line 4584 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi, ENDFILE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9355 "gram1.tab.c" /* yacc.c:1646  */
+#line 9299 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 559:
-#line 4590 "gram1.y" /* yacc.c:1646  */
+#line 4591 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9361 "gram1.tab.c" /* yacc.c:1646  */
+#line 9305 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 560:
-#line 4594 "gram1.y" /* yacc.c:1646  */
+#line 4595 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi, OPEN_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9367 "gram1.tab.c" /* yacc.c:1646  */
+#line 9311 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 561:
-#line 4596 "gram1.y" /* yacc.c:1646  */
+#line 4597 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi, CLOSE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9373 "gram1.tab.c" /* yacc.c:1646  */
+#line 9317 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 562:
-#line 4600 "gram1.y" /* yacc.c:1646  */
+#line 4601 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi, INQUIRE_STAT, SMNULL, LLNULL, (yyvsp[0].ll_node), LLNULL);}
-#line 9379 "gram1.tab.c" /* yacc.c:1646  */
+#line 9323 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 563:
-#line 4602 "gram1.y" /* yacc.c:1646  */
+#line 4603 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi, INQUIRE_STAT, SMNULL, (yyvsp[0].ll_node), (yyvsp[-1].ll_node), LLNULL);}
-#line 9385 "gram1.tab.c" /* yacc.c:1646  */
+#line 9329 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 564:
-#line 4606 "gram1.y" /* yacc.c:1646  */
+#line 4607 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 		  PTR_LLND q = LLNULL;
 
@@ -9404,11 +9348,11 @@ yyreduce:
 		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
 		  endioctl();
 		}
-#line 9408 "gram1.tab.c" /* yacc.c:1646  */
+#line 9352 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 565:
-#line 4625 "gram1.y" /* yacc.c:1646  */
+#line 4626 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 		  PTR_LLND q;
 
@@ -9421,11 +9365,11 @@ yyreduce:
 		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
 		  endioctl();
 		}
-#line 9425 "gram1.tab.c" /* yacc.c:1646  */
+#line 9369 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 566:
-#line 4641 "gram1.y" /* yacc.c:1646  */
+#line 4642 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 
 		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
@@ -9434,32 +9378,32 @@ yyreduce:
 		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, p, (yyvsp[-1].ll_node), SMNULL);
 		  endioctl();
 		}
-#line 9438 "gram1.tab.c" /* yacc.c:1646  */
+#line 9382 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 567:
-#line 4652 "gram1.y" /* yacc.c:1646  */
+#line 4653 "gram1.y" /* yacc.c:1646  */
     { 
 		  (yyval.ll_node) = (yyvsp[-1].ll_node);
 		  endioctl();
 		 }
-#line 9447 "gram1.tab.c" /* yacc.c:1646  */
+#line 9391 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 568:
-#line 4659 "gram1.y" /* yacc.c:1646  */
+#line 4660 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); endioctl();}
-#line 9453 "gram1.tab.c" /* yacc.c:1646  */
+#line 9397 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 569:
-#line 4661 "gram1.y" /* yacc.c:1646  */
+#line 4662 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST); endioctl();}
-#line 9459 "gram1.tab.c" /* yacc.c:1646  */
+#line 9403 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 570:
-#line 4665 "gram1.y" /* yacc.c:1646  */
+#line 4666 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 		  PTR_LLND q;
  
@@ -9485,11 +9429,11 @@ yyreduce:
 		  q->type = global_string;
 		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
 		}
-#line 9489 "gram1.tab.c" /* yacc.c:1646  */
+#line 9433 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 571:
-#line 4691 "gram1.y" /* yacc.c:1646  */
+#line 4692 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 		  PTR_LLND q;
 
@@ -9504,11 +9448,11 @@ yyreduce:
 		  q->type = global_string;
 		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
 		}
-#line 9508 "gram1.tab.c" /* yacc.c:1646  */
+#line 9452 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 572:
-#line 4706 "gram1.y" /* yacc.c:1646  */
+#line 4707 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 		  PTR_LLND q;
 
@@ -9523,11 +9467,11 @@ yyreduce:
 		  q->type = global_string;
 		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
 		}
-#line 9527 "gram1.tab.c" /* yacc.c:1646  */
+#line 9471 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 573:
-#line 4721 "gram1.y" /* yacc.c:1646  */
+#line 4722 "gram1.y" /* yacc.c:1646  */
     { 
 		  PTR_LLND p;
 		  char *q;
@@ -9544,11 +9488,11 @@ yyreduce:
 		  else p = (yyvsp[0].ll_node);
 
 		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), p, SMNULL); }
-#line 9548 "gram1.tab.c" /* yacc.c:1646  */
+#line 9492 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 574:
-#line 4738 "gram1.y" /* yacc.c:1646  */
+#line 4739 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
                   
 		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
@@ -9556,43 +9500,43 @@ yyreduce:
 		  p->type = global_string;
 		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), p, SMNULL);
 		}
-#line 9560 "gram1.tab.c" /* yacc.c:1646  */
+#line 9504 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 575:
-#line 4746 "gram1.y" /* yacc.c:1646  */
+#line 4747 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
 		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
 		  p->entry.string_val = (char *)"*";
 		  p->type = global_string;
 		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), p, SMNULL);
 		}
-#line 9571 "gram1.tab.c" /* yacc.c:1646  */
+#line 9515 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 576:
-#line 4755 "gram1.y" /* yacc.c:1646  */
+#line 4756 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
 		  (yyval.ll_node)->entry.string_val = copys(yytext);
 		  (yyval.ll_node)->type = global_string;
 	        }
-#line 9580 "gram1.tab.c" /* yacc.c:1646  */
+#line 9524 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 577:
-#line 4763 "gram1.y" /* yacc.c:1646  */
+#line 4764 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi, READ_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9586 "gram1.tab.c" /* yacc.c:1646  */
+#line 9530 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 578:
-#line 4768 "gram1.y" /* yacc.c:1646  */
+#line 4769 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi, WRITE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9592 "gram1.tab.c" /* yacc.c:1646  */
+#line 9536 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 579:
-#line 4773 "gram1.y" /* yacc.c:1646  */
+#line 4774 "gram1.y" /* yacc.c:1646  */
     {
 	    PTR_LLND p, q, l;
 
@@ -9614,11 +9558,11 @@ yyreduce:
             (yyval.bf_node) = get_bfnd(fi, PRINT_STAT, SMNULL, LLNULL, l, LLNULL);
 	    endioctl();
 	   }
-#line 9618 "gram1.tab.c" /* yacc.c:1646  */
+#line 9562 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 580:
-#line 4795 "gram1.y" /* yacc.c:1646  */
+#line 4796 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p, q, r;
 		
 	     p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
@@ -9631,208 +9575,208 @@ yyreduce:
 	     (yyval.bf_node) = get_bfnd(fi, PRINT_STAT, SMNULL, LLNULL, r, LLNULL);
 	     endioctl();
            }
-#line 9635 "gram1.tab.c" /* yacc.c:1646  */
+#line 9579 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 581:
-#line 4811 "gram1.y" /* yacc.c:1646  */
+#line 4812 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);}
-#line 9641 "gram1.tab.c" /* yacc.c:1646  */
+#line 9585 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 582:
-#line 4813 "gram1.y" /* yacc.c:1646  */
+#line 4814 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST);}
-#line 9647 "gram1.tab.c" /* yacc.c:1646  */
+#line 9591 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 583:
-#line 4817 "gram1.y" /* yacc.c:1646  */
+#line 4818 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9653 "gram1.tab.c" /* yacc.c:1646  */
+#line 9597 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 584:
-#line 4819 "gram1.y" /* yacc.c:1646  */
+#line 4820 "gram1.y" /* yacc.c:1646  */
     {
 		  (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-3].ll_node);
 		  (yyval.ll_node) = (yyvsp[-1].ll_node);
 		}
-#line 9662 "gram1.tab.c" /* yacc.c:1646  */
+#line 9606 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 585:
-#line 4826 "gram1.y" /* yacc.c:1646  */
+#line 4827 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);  (yyval.ll_node)->type = (yyvsp[0].ll_node)->type;}
-#line 9668 "gram1.tab.c" /* yacc.c:1646  */
+#line 9612 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 586:
-#line 4828 "gram1.y" /* yacc.c:1646  */
+#line 4829 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9674 "gram1.tab.c" /* yacc.c:1646  */
+#line 9618 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 587:
-#line 4830 "gram1.y" /* yacc.c:1646  */
+#line 4831 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9680 "gram1.tab.c" /* yacc.c:1646  */
+#line 9624 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 588:
-#line 4834 "gram1.y" /* yacc.c:1646  */
+#line 4835 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9686 "gram1.tab.c" /* yacc.c:1646  */
+#line 9630 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 589:
-#line 4836 "gram1.y" /* yacc.c:1646  */
+#line 4837 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9692 "gram1.tab.c" /* yacc.c:1646  */
+#line 9636 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 590:
-#line 4838 "gram1.y" /* yacc.c:1646  */
+#line 4839 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9698 "gram1.tab.c" /* yacc.c:1646  */
+#line 9642 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 591:
-#line 4840 "gram1.y" /* yacc.c:1646  */
+#line 4841 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9704 "gram1.tab.c" /* yacc.c:1646  */
+#line 9648 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 592:
-#line 4842 "gram1.y" /* yacc.c:1646  */
+#line 4843 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9710 "gram1.tab.c" /* yacc.c:1646  */
+#line 9654 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 593:
-#line 4844 "gram1.y" /* yacc.c:1646  */
+#line 4845 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9716 "gram1.tab.c" /* yacc.c:1646  */
+#line 9660 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 594:
-#line 4848 "gram1.y" /* yacc.c:1646  */
+#line 4849 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) =  set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);
 	          (yyval.ll_node)->type = global_complex; }
-#line 9723 "gram1.tab.c" /* yacc.c:1646  */
+#line 9667 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 595:
-#line 4851 "gram1.y" /* yacc.c:1646  */
+#line 4852 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) =  set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST);
                   (yyval.ll_node)->type = (yyvsp[-1].ll_node)->type; }
-#line 9730 "gram1.tab.c" /* yacc.c:1646  */
+#line 9674 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 596:
-#line 4854 "gram1.y" /* yacc.c:1646  */
+#line 4855 "gram1.y" /* yacc.c:1646  */
     {
 		  (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-3].ll_node);
 		  (yyval.ll_node) =  set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST);
                   (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type; 
 		}
-#line 9740 "gram1.tab.c" /* yacc.c:1646  */
+#line 9684 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 597:
-#line 4860 "gram1.y" /* yacc.c:1646  */
+#line 4861 "gram1.y" /* yacc.c:1646  */
     {
 		  (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-3].ll_node);
 		  (yyval.ll_node) =  set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST);
                   (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type; 
 		}
-#line 9750 "gram1.tab.c" /* yacc.c:1646  */
+#line 9694 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 598:
-#line 4866 "gram1.y" /* yacc.c:1646  */
+#line 4867 "gram1.y" /* yacc.c:1646  */
     {
 		  (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-3].ll_node);
 		  (yyval.ll_node) =  set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST);
                   (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type; 
 		}
-#line 9760 "gram1.tab.c" /* yacc.c:1646  */
+#line 9704 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 599:
-#line 4874 "gram1.y" /* yacc.c:1646  */
+#line 4875 "gram1.y" /* yacc.c:1646  */
     { inioctl = YES; }
-#line 9766 "gram1.tab.c" /* yacc.c:1646  */
+#line 9710 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 600:
-#line 4878 "gram1.y" /* yacc.c:1646  */
+#line 4879 "gram1.y" /* yacc.c:1646  */
     { startioctl();}
-#line 9772 "gram1.tab.c" /* yacc.c:1646  */
+#line 9716 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 601:
-#line 4886 "gram1.y" /* yacc.c:1646  */
+#line 4887 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9778 "gram1.tab.c" /* yacc.c:1646  */
+#line 9722 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 602:
-#line 4888 "gram1.y" /* yacc.c:1646  */
+#line 4889 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 9784 "gram1.tab.c" /* yacc.c:1646  */
+#line 9728 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 603:
-#line 4892 "gram1.y" /* yacc.c:1646  */
+#line 4893 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9790 "gram1.tab.c" /* yacc.c:1646  */
+#line 9734 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 604:
-#line 4894 "gram1.y" /* yacc.c:1646  */
+#line 4895 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9796 "gram1.tab.c" /* yacc.c:1646  */
+#line 9740 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 605:
-#line 4896 "gram1.y" /* yacc.c:1646  */
+#line 4897 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,(yyvsp[-1].token), (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
 	      set_expr_type((yyval.ll_node));
 	    }
-#line 9805 "gram1.tab.c" /* yacc.c:1646  */
+#line 9749 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 606:
-#line 4901 "gram1.y" /* yacc.c:1646  */
+#line 4902 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,MULT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
 	      set_expr_type((yyval.ll_node));
 	    }
-#line 9814 "gram1.tab.c" /* yacc.c:1646  */
+#line 9758 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 607:
-#line 4906 "gram1.y" /* yacc.c:1646  */
+#line 4907 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,DIV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
 	      set_expr_type((yyval.ll_node));
 	    }
-#line 9823 "gram1.tab.c" /* yacc.c:1646  */
+#line 9767 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 608:
-#line 4911 "gram1.y" /* yacc.c:1646  */
+#line 4912 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,EXP_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
 	      set_expr_type((yyval.ll_node));
 	    }
-#line 9832 "gram1.tab.c" /* yacc.c:1646  */
+#line 9776 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 609:
-#line 4916 "gram1.y" /* yacc.c:1646  */
+#line 4917 "gram1.y" /* yacc.c:1646  */
     {
 	      if((yyvsp[-1].token) == SUBT_OP)
 		{
@@ -9841,32 +9785,32 @@ yyreduce:
 		}
 	      else	(yyval.ll_node) = (yyvsp[0].ll_node);
 	    }
-#line 9845 "gram1.tab.c" /* yacc.c:1646  */
+#line 9789 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 610:
-#line 4925 "gram1.y" /* yacc.c:1646  */
+#line 4926 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,CONCAT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
 	      set_expr_type((yyval.ll_node));
 	    }
-#line 9854 "gram1.tab.c" /* yacc.c:1646  */
+#line 9798 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 611:
-#line 4930 "gram1.y" /* yacc.c:1646  */
+#line 4931 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 9860 "gram1.tab.c" /* yacc.c:1646  */
+#line 9804 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 612:
-#line 4935 "gram1.y" /* yacc.c:1646  */
+#line 4936 "gram1.y" /* yacc.c:1646  */
     { comments = cur_comment = CMNULL; }
-#line 9866 "gram1.tab.c" /* yacc.c:1646  */
+#line 9810 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 613:
-#line 4937 "gram1.y" /* yacc.c:1646  */
+#line 4938 "gram1.y" /* yacc.c:1646  */
     { PTR_CMNT p;
 	    p = make_comment(fi,*commentbuf, HALF);
 	    if (cur_comment)
@@ -9880,17 +9824,17 @@ yyreduce:
             }
 	    comments = cur_comment = CMNULL;
           }
-#line 9884 "gram1.tab.c" /* yacc.c:1646  */
+#line 9828 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 677:
-#line 5020 "gram1.y" /* yacc.c:1646  */
+#line 5021 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,HPF_TEMPLATE_STAT, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL); }
-#line 9890 "gram1.tab.c" /* yacc.c:1646  */
+#line 9834 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 678:
-#line 5022 "gram1.y" /* yacc.c:1646  */
+#line 5023 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
                 if((yyvsp[-2].bf_node)->entry.Template.ll_ptr2)
                 {
@@ -9899,11 +9843,11 @@ yyreduce:
                 }
 	        add_to_lowLevelList((yyvsp[0].ll_node), (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
 	      }
-#line 9903 "gram1.tab.c" /* yacc.c:1646  */
+#line 9847 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 679:
-#line 5033 "gram1.y" /* yacc.c:1646  */
+#line 5034 "gram1.y" /* yacc.c:1646  */
     {PTR_SYMB s;
 	      PTR_LLND q;
 	    /* 27.06.18
@@ -9922,29 +9866,29 @@ yyreduce:
 	      s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
 	      (yyval.ll_node) = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	     }
-#line 9926 "gram1.tab.c" /* yacc.c:1646  */
+#line 9870 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 680:
-#line 5054 "gram1.y" /* yacc.c:1646  */
+#line 5055 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_DYNAMIC_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 9932 "gram1.tab.c" /* yacc.c:1646  */
+#line 9876 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 681:
-#line 5058 "gram1.y" /* yacc.c:1646  */
+#line 5059 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 9938 "gram1.tab.c" /* yacc.c:1646  */
+#line 9882 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 682:
-#line 5060 "gram1.y" /* yacc.c:1646  */
+#line 5061 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 9944 "gram1.tab.c" /* yacc.c:1646  */
+#line 9888 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 683:
-#line 5064 "gram1.y" /* yacc.c:1646  */
+#line 5065 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
               if(s->attr &  DYNAMIC_BIT)
@@ -9955,29 +9899,29 @@ yyreduce:
                 s->attr = s->attr | DYNAMIC_BIT;        
 	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
 	   }
-#line 9959 "gram1.tab.c" /* yacc.c:1646  */
+#line 9903 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 684:
-#line 5077 "gram1.y" /* yacc.c:1646  */
+#line 5078 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_INHERIT_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 9965 "gram1.tab.c" /* yacc.c:1646  */
+#line 9909 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 685:
-#line 5081 "gram1.y" /* yacc.c:1646  */
+#line 5082 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 9971 "gram1.tab.c" /* yacc.c:1646  */
+#line 9915 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 686:
-#line 5083 "gram1.y" /* yacc.c:1646  */
+#line 5084 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 9977 "gram1.tab.c" /* yacc.c:1646  */
+#line 9921 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 687:
-#line 5087 "gram1.y" /* yacc.c:1646  */
+#line 5088 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
               if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT)) 
@@ -9986,61 +9930,61 @@ yyreduce:
                 s->attr = s->attr | INHERIT_BIT;        
 	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
 	   }
-#line 9990 "gram1.tab.c" /* yacc.c:1646  */
+#line 9934 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 688:
-#line 5098 "gram1.y" /* yacc.c:1646  */
+#line 5099 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND q;
              q = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
               /* (void)fprintf(stderr,"hpf.gram: shadow\n");*/ 
 	     (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_DIR,SMNULL,q,(yyvsp[0].ll_node),LLNULL);
             }
-#line 10000 "gram1.tab.c" /* yacc.c:1646  */
+#line 9944 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 689:
-#line 5109 "gram1.y" /* yacc.c:1646  */
+#line 5110 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 10006 "gram1.tab.c" /* yacc.c:1646  */
+#line 9950 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 690:
-#line 5113 "gram1.y" /* yacc.c:1646  */
+#line 5114 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10012 "gram1.tab.c" /* yacc.c:1646  */
+#line 9956 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 691:
-#line 5115 "gram1.y" /* yacc.c:1646  */
+#line 5116 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10018 "gram1.tab.c" /* yacc.c:1646  */
+#line 9962 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 692:
-#line 5119 "gram1.y" /* yacc.c:1646  */
+#line 5120 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10024 "gram1.tab.c" /* yacc.c:1646  */
+#line 9968 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 693:
-#line 5121 "gram1.y" /* yacc.c:1646  */
+#line 5122 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);}
-#line 10030 "gram1.tab.c" /* yacc.c:1646  */
+#line 9974 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 694:
-#line 5123 "gram1.y" /* yacc.c:1646  */
+#line 5124 "gram1.y" /* yacc.c:1646  */
     {
             if(parstate!=INEXEC) 
                err("Illegal shadow width specification", 56);  
             (yyval.ll_node) = make_llnd(fi,SHADOW_NAMES_OP, (yyvsp[-1].ll_node), LLNULL, SMNULL);
           }
-#line 10040 "gram1.tab.c" /* yacc.c:1646  */
+#line 9984 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 695:
-#line 5138 "gram1.y" /* yacc.c:1646  */
+#line 5139 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
               if(s->attr & SHADOW_BIT)
@@ -10051,11 +9995,11 @@ yyreduce:
         	      s->attr = s->attr | SHADOW_BIT;  
 	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
 	   }
-#line 10055 "gram1.tab.c" /* yacc.c:1646  */
+#line 9999 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 696:
-#line 5150 "gram1.y" /* yacc.c:1646  */
+#line 5151 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	      PTR_LLND q, r;
 	      if(! explicit_shape) {
@@ -10075,11 +10019,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi,HPF_PROCESSORS_STAT, SMNULL, r, LLNULL, LLNULL);
 	    }
-#line 10079 "gram1.tab.c" /* yacc.c:1646  */
+#line 10023 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 697:
-#line 5170 "gram1.y" /* yacc.c:1646  */
+#line 5171 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	      PTR_LLND q, r;
 	      if(! explicit_shape) {
@@ -10099,11 +10043,11 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      (yyval.bf_node) = get_bfnd(fi,HPF_PROCESSORS_STAT, SMNULL, r, LLNULL, LLNULL);
 	    }
-#line 10103 "gram1.tab.c" /* yacc.c:1646  */
+#line 10047 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 698:
-#line 5190 "gram1.y" /* yacc.c:1646  */
+#line 5191 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	      PTR_LLND q, r;
 	      if(! explicit_shape) {
@@ -10123,124 +10067,124 @@ yyreduce:
 	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	      add_to_lowLevelList(r, (yyvsp[-3].bf_node)->entry.Template.ll_ptr1);
 	}
-#line 10127 "gram1.tab.c" /* yacc.c:1646  */
+#line 10071 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 699:
-#line 5212 "gram1.y" /* yacc.c:1646  */
+#line 5213 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q,r;
                    q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
                    r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	           (yyval.bf_node) = get_bfnd(fi,DVM_INDIRECT_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
                 }
-#line 10137 "gram1.tab.c" /* yacc.c:1646  */
+#line 10081 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 700:
-#line 5218 "gram1.y" /* yacc.c:1646  */
+#line 5219 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q,r;
                    q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
                    r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
                    add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
 	           ;
                 }
-#line 10148 "gram1.tab.c" /* yacc.c:1646  */
+#line 10092 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 701:
-#line 5227 "gram1.y" /* yacc.c:1646  */
+#line 5228 "gram1.y" /* yacc.c:1646  */
     {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), REF_GROUP_NAME,global_default,LOCAL);
           if((yyval.symbol)->attr &  INDIRECT_BIT)
                 errstr( "Multiple declaration of identifier  %s ", (yyval.symbol)->ident, 73);
            (yyval.symbol)->attr = (yyval.symbol)->attr | INDIRECT_BIT;
           }
-#line 10158 "gram1.tab.c" /* yacc.c:1646  */
+#line 10102 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 702:
-#line 5235 "gram1.y" /* yacc.c:1646  */
+#line 5236 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q,r;
                    q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
                    r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	           (yyval.bf_node) = get_bfnd(fi,DVM_REMOTE_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
                 }
-#line 10168 "gram1.tab.c" /* yacc.c:1646  */
+#line 10112 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 703:
-#line 5241 "gram1.y" /* yacc.c:1646  */
+#line 5242 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q,r;
                    q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
                    r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
                    add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
                 }
-#line 10178 "gram1.tab.c" /* yacc.c:1646  */
+#line 10122 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 704:
-#line 5249 "gram1.y" /* yacc.c:1646  */
+#line 5250 "gram1.y" /* yacc.c:1646  */
     {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), REF_GROUP_NAME,global_default,LOCAL);
            if((yyval.symbol)->attr &  INDIRECT_BIT)
                 errstr( "Inconsistent declaration of identifier  %s ", (yyval.symbol)->ident, 16);
           }
-#line 10187 "gram1.tab.c" /* yacc.c:1646  */
+#line 10131 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 705:
-#line 5256 "gram1.y" /* yacc.c:1646  */
+#line 5257 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q,r;
                    q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
                    r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	           (yyval.bf_node) = get_bfnd(fi,DVM_REDUCTION_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
                 }
-#line 10197 "gram1.tab.c" /* yacc.c:1646  */
+#line 10141 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 706:
-#line 5262 "gram1.y" /* yacc.c:1646  */
+#line 5263 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q,r;
                    q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
                    r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
                    add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
 	           ;
                 }
-#line 10208 "gram1.tab.c" /* yacc.c:1646  */
+#line 10152 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 707:
-#line 5271 "gram1.y" /* yacc.c:1646  */
+#line 5272 "gram1.y" /* yacc.c:1646  */
     {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), REDUCTION_GROUP_NAME,global_default,LOCAL);}
-#line 10214 "gram1.tab.c" /* yacc.c:1646  */
+#line 10158 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 708:
-#line 5275 "gram1.y" /* yacc.c:1646  */
+#line 5276 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q,r;
                    q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
                    r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	           (yyval.bf_node) = get_bfnd(fi,DVM_CONSISTENT_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
                 }
-#line 10224 "gram1.tab.c" /* yacc.c:1646  */
+#line 10168 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 709:
-#line 5281 "gram1.y" /* yacc.c:1646  */
+#line 5282 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q,r;
                    q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
                    r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
                    add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);	           
                 }
-#line 10234 "gram1.tab.c" /* yacc.c:1646  */
+#line 10178 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 710:
-#line 5289 "gram1.y" /* yacc.c:1646  */
+#line 5290 "gram1.y" /* yacc.c:1646  */
     {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), CONSISTENT_GROUP_NAME,global_default,LOCAL);}
-#line 10240 "gram1.tab.c" /* yacc.c:1646  */
+#line 10184 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 711:
-#line 5303 "gram1.y" /* yacc.c:1646  */
+#line 5304 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
             if(parstate == INEXEC){
               if (!(s = (yyvsp[-1].hash_entry)->id_attr))
@@ -10253,17 +10197,17 @@ yyreduce:
 
               (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
             }
-#line 10257 "gram1.tab.c" /* yacc.c:1646  */
+#line 10201 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 712:
-#line 5316 "gram1.y" /* yacc.c:1646  */
+#line 5317 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; opt_kwd_ = NO;}
-#line 10263 "gram1.tab.c" /* yacc.c:1646  */
+#line 10207 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 713:
-#line 5322 "gram1.y" /* yacc.c:1646  */
+#line 5323 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND q;
              if(!(yyvsp[-1].ll_node))
                err("Distribution format list is omitted", 51);
@@ -10272,11 +10216,11 @@ yyreduce:
              q = set_ll_list((yyvsp[-2].ll_node),LLNULL,EXPR_LIST);
 	     (yyval.bf_node) = get_bfnd(fi,DVM_DISTRIBUTE_DIR,SMNULL,q,(yyvsp[-1].ll_node),(yyvsp[0].ll_node));
             }
-#line 10276 "gram1.tab.c" /* yacc.c:1646  */
+#line 10220 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 714:
-#line 5338 "gram1.y" /* yacc.c:1646  */
+#line 5339 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND q;
                 /*  if(!$4)
                   {err("Distribution format is omitted", 51); errcnt--;}
@@ -10290,11 +10234,11 @@ yyreduce:
                      if($7) r = set_ll_list(r,$7,EXPR_LIST);
                  */
 	      (yyval.bf_node) = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,SMNULL,q,(yyvsp[-2].ll_node),(yyvsp[0].ll_node));}
-#line 10294 "gram1.tab.c" /* yacc.c:1646  */
+#line 10238 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 715:
-#line 5353 "gram1.y" /* yacc.c:1646  */
+#line 5354 "gram1.y" /* yacc.c:1646  */
     {
                  /* r = LLNULL;
                     if($5){
@@ -10305,35 +10249,35 @@ yyreduce:
                   */
 	      (yyval.bf_node) = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,SMNULL,(yyvsp[0].ll_node) ,(yyvsp[-5].ll_node),(yyvsp[-3].ll_node) );
              }
-#line 10309 "gram1.tab.c" /* yacc.c:1646  */
+#line 10253 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 716:
-#line 5381 "gram1.y" /* yacc.c:1646  */
+#line 5382 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10315 "gram1.tab.c" /* yacc.c:1646  */
+#line 10259 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 717:
-#line 5383 "gram1.y" /* yacc.c:1646  */
+#line 5384 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10321 "gram1.tab.c" /* yacc.c:1646  */
+#line 10265 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 718:
-#line 5387 "gram1.y" /* yacc.c:1646  */
+#line 5388 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10327 "gram1.tab.c" /* yacc.c:1646  */
+#line 10271 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 719:
-#line 5389 "gram1.y" /* yacc.c:1646  */
+#line 5390 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10333 "gram1.tab.c" /* yacc.c:1646  */
+#line 10277 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 720:
-#line 5393 "gram1.y" /* yacc.c:1646  */
+#line 5394 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
  
           if(parstate == INEXEC){
@@ -10360,11 +10304,11 @@ yyreduce:
                errstr("A distributee may not have the ALIGN attribute:%s",s->ident, 54);
           (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);               	  
 	}
-#line 10364 "gram1.tab.c" /* yacc.c:1646  */
+#line 10308 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 721:
-#line 5422 "gram1.y" /* yacc.c:1646  */
+#line 5423 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
           s = make_array((yyvsp[-3].hash_entry), TYNULL, LLNULL, 0, LOCAL);
         
@@ -10384,11 +10328,11 @@ yyreduce:
           }
         
 	}
-#line 10388 "gram1.tab.c" /* yacc.c:1646  */
+#line 10332 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 722:
-#line 5445 "gram1.y" /* yacc.c:1646  */
+#line 5446 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
           if((s=(yyvsp[0].hash_entry)->id_attr) == SMNULL)
             s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
@@ -10396,104 +10340,104 @@ yyreduce:
                errstr( "'%s' is not processor array ", s->ident, 67);
 	  (yyval.symbol) = s;
 	}
-#line 10400 "gram1.tab.c" /* yacc.c:1646  */
+#line 10344 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 723:
-#line 5465 "gram1.y" /* yacc.c:1646  */
+#line 5466 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL;  }
-#line 10406 "gram1.tab.c" /* yacc.c:1646  */
+#line 10350 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 724:
-#line 5467 "gram1.y" /* yacc.c:1646  */
+#line 5468 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 10412 "gram1.tab.c" /* yacc.c:1646  */
+#line 10356 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 725:
-#line 5471 "gram1.y" /* yacc.c:1646  */
+#line 5472 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 10418 "gram1.tab.c" /* yacc.c:1646  */
+#line 10362 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 726:
-#line 5492 "gram1.y" /* yacc.c:1646  */
+#line 5493 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10424 "gram1.tab.c" /* yacc.c:1646  */
+#line 10368 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 727:
-#line 5494 "gram1.y" /* yacc.c:1646  */
+#line 5495 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10430 "gram1.tab.c" /* yacc.c:1646  */
+#line 10374 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 728:
-#line 5497 "gram1.y" /* yacc.c:1646  */
+#line 5498 "gram1.y" /* yacc.c:1646  */
     { opt_kwd_ = YES; }
-#line 10436 "gram1.tab.c" /* yacc.c:1646  */
+#line 10380 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 729:
-#line 5506 "gram1.y" /* yacc.c:1646  */
+#line 5507 "gram1.y" /* yacc.c:1646  */
     {  
                (yyval.ll_node) = make_llnd(fi,BLOCK_OP, LLNULL, LLNULL, SMNULL);
         }
-#line 10444 "gram1.tab.c" /* yacc.c:1646  */
+#line 10388 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 730:
-#line 5510 "gram1.y" /* yacc.c:1646  */
+#line 5511 "gram1.y" /* yacc.c:1646  */
     {  err("Distribution format BLOCK(n) is not permitted in FDVM", 55);
           (yyval.ll_node) = make_llnd(fi,BLOCK_OP, (yyvsp[-1].ll_node), LLNULL, SMNULL);
           endioctl();
         }
-#line 10453 "gram1.tab.c" /* yacc.c:1646  */
+#line 10397 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 731:
-#line 5515 "gram1.y" /* yacc.c:1646  */
+#line 5516 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,BLOCK_OP, LLNULL, LLNULL, (yyvsp[-1].symbol)); }
-#line 10459 "gram1.tab.c" /* yacc.c:1646  */
+#line 10403 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 732:
-#line 5517 "gram1.y" /* yacc.c:1646  */
+#line 5518 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,BLOCK_OP,  (yyvsp[-1].ll_node),  LLNULL,  (yyvsp[-3].symbol)); }
-#line 10465 "gram1.tab.c" /* yacc.c:1646  */
+#line 10409 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 733:
-#line 5519 "gram1.y" /* yacc.c:1646  */
+#line 5520 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,BLOCK_OP,  LLNULL, (yyvsp[-1].ll_node),  SMNULL); }
-#line 10471 "gram1.tab.c" /* yacc.c:1646  */
+#line 10415 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 734:
-#line 5521 "gram1.y" /* yacc.c:1646  */
+#line 5522 "gram1.y" /* yacc.c:1646  */
     { 
           (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
           (yyval.ll_node)->entry.string_val = (char *) "*";
           (yyval.ll_node)->type = global_string;
         }
-#line 10481 "gram1.tab.c" /* yacc.c:1646  */
+#line 10425 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 735:
-#line 5527 "gram1.y" /* yacc.c:1646  */
+#line 5528 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,INDIRECT_OP, LLNULL, LLNULL, (yyvsp[-1].symbol)); }
-#line 10487 "gram1.tab.c" /* yacc.c:1646  */
+#line 10431 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 736:
-#line 5529 "gram1.y" /* yacc.c:1646  */
+#line 5530 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,INDIRECT_OP, (yyvsp[-1].ll_node), LLNULL, SMNULL); }
-#line 10493 "gram1.tab.c" /* yacc.c:1646  */
+#line 10437 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 737:
-#line 5533 "gram1.y" /* yacc.c:1646  */
+#line 5534 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
               if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT)) 
@@ -10501,57 +10445,57 @@ yyreduce:
        
 	      (yyval.symbol) = s;
 	   }
-#line 10505 "gram1.tab.c" /* yacc.c:1646  */
+#line 10449 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 738:
-#line 5543 "gram1.y" /* yacc.c:1646  */
+#line 5544 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DERIVED_OP, (yyvsp[-4].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 10511 "gram1.tab.c" /* yacc.c:1646  */
+#line 10455 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 739:
-#line 5547 "gram1.y" /* yacc.c:1646  */
+#line 5548 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10517 "gram1.tab.c" /* yacc.c:1646  */
+#line 10461 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 740:
-#line 5549 "gram1.y" /* yacc.c:1646  */
+#line 5550 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10523 "gram1.tab.c" /* yacc.c:1646  */
+#line 10467 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 741:
-#line 5554 "gram1.y" /* yacc.c:1646  */
+#line 5555 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10529 "gram1.tab.c" /* yacc.c:1646  */
+#line 10473 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 742:
-#line 5556 "gram1.y" /* yacc.c:1646  */
+#line 5557 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);}
-#line 10535 "gram1.tab.c" /* yacc.c:1646  */
+#line 10479 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 743:
-#line 5560 "gram1.y" /* yacc.c:1646  */
+#line 5561 "gram1.y" /* yacc.c:1646  */
     { 
               (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
 	    }
-#line 10543 "gram1.tab.c" /* yacc.c:1646  */
+#line 10487 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 744:
-#line 5564 "gram1.y" /* yacc.c:1646  */
+#line 5565 "gram1.y" /* yacc.c:1646  */
     { 
               (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-3].symbol));
 	    }
-#line 10551 "gram1.tab.c" /* yacc.c:1646  */
+#line 10495 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 745:
-#line 5570 "gram1.y" /* yacc.c:1646  */
+#line 5571 "gram1.y" /* yacc.c:1646  */
     { 
               if (!((yyval.symbol) = (yyvsp[0].hash_entry)->id_attr))
               {
@@ -10559,87 +10503,87 @@ yyreduce:
 	         (yyval.symbol)->decl = SOFT;
 	      } 
             }
-#line 10563 "gram1.tab.c" /* yacc.c:1646  */
+#line 10507 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 746:
-#line 5580 "gram1.y" /* yacc.c:1646  */
+#line 5581 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10569 "gram1.tab.c" /* yacc.c:1646  */
+#line 10513 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 747:
-#line 5582 "gram1.y" /* yacc.c:1646  */
+#line 5583 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10575 "gram1.tab.c" /* yacc.c:1646  */
+#line 10519 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 748:
-#line 5586 "gram1.y" /* yacc.c:1646  */
+#line 5587 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10581 "gram1.tab.c" /* yacc.c:1646  */
+#line 10525 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 749:
-#line 5588 "gram1.y" /* yacc.c:1646  */
+#line 5589 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10587 "gram1.tab.c" /* yacc.c:1646  */
+#line 10531 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 750:
-#line 5590 "gram1.y" /* yacc.c:1646  */
+#line 5591 "gram1.y" /* yacc.c:1646  */
     {
                       (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node); 
                       (yyval.ll_node) = (yyvsp[-1].ll_node);   
                    }
-#line 10596 "gram1.tab.c" /* yacc.c:1646  */
+#line 10540 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 751:
-#line 5597 "gram1.y" /* yacc.c:1646  */
+#line 5598 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
             s = make_scalar((yyvsp[0].hash_entry),TYNULL,LOCAL);
 	    (yyval.ll_node) = make_llnd(fi,DUMMY_REF, LLNULL, LLNULL, s);
             /*$$->type = global_int;*/
           }
-#line 10606 "gram1.tab.c" /* yacc.c:1646  */
+#line 10550 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 752:
-#line 5614 "gram1.y" /* yacc.c:1646  */
+#line 5615 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = LLNULL; }
-#line 10612 "gram1.tab.c" /* yacc.c:1646  */
+#line 10556 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 753:
-#line 5616 "gram1.y" /* yacc.c:1646  */
+#line 5617 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 10618 "gram1.tab.c" /* yacc.c:1646  */
+#line 10562 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 754:
-#line 5620 "gram1.y" /* yacc.c:1646  */
+#line 5621 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10624 "gram1.tab.c" /* yacc.c:1646  */
+#line 10568 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 755:
-#line 5622 "gram1.y" /* yacc.c:1646  */
+#line 5623 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10630 "gram1.tab.c" /* yacc.c:1646  */
+#line 10574 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 756:
-#line 5626 "gram1.y" /* yacc.c:1646  */
+#line 5627 "gram1.y" /* yacc.c:1646  */
     {  if((yyvsp[0].ll_node)->type->variant != T_STRING)
                  errstr( "Illegal type of shadow_name", 627);
                (yyval.ll_node) = (yyvsp[0].ll_node); 
             }
-#line 10639 "gram1.tab.c" /* yacc.c:1646  */
+#line 10583 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 757:
-#line 5633 "gram1.y" /* yacc.c:1646  */
+#line 5634 "gram1.y" /* yacc.c:1646  */
     { char *q;
           nioctl = 1;
           q = (yyvsp[-1].ll_node)->entry.string_val;
@@ -10649,11 +10593,11 @@ yyreduce:
              (yyval.ll_node) = LLNULL;
           }
         }
-#line 10653 "gram1.tab.c" /* yacc.c:1646  */
+#line 10597 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 758:
-#line 5643 "gram1.y" /* yacc.c:1646  */
+#line 5644 "gram1.y" /* yacc.c:1646  */
     { char *ql, *qh;
           PTR_LLND p1, p2;
           nioctl = 2;
@@ -10670,54 +10614,54 @@ yyreduce:
              (yyval.ll_node) = LLNULL;
           }
         }
-#line 10674 "gram1.tab.c" /* yacc.c:1646  */
+#line 10618 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 759:
-#line 5672 "gram1.y" /* yacc.c:1646  */
+#line 5673 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND q;
               q = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
               (yyval.bf_node) = (yyvsp[0].bf_node);
               (yyval.bf_node)->entry.Template.ll_ptr1 = q;
             }
-#line 10684 "gram1.tab.c" /* yacc.c:1646  */
+#line 10628 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 760:
-#line 5687 "gram1.y" /* yacc.c:1646  */
+#line 5688 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND q;
               q = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
               (yyval.bf_node) = (yyvsp[0].bf_node);
               (yyval.bf_node)->variant = DVM_REALIGN_DIR; 
               (yyval.bf_node)->entry.Template.ll_ptr1 = q;
             }
-#line 10695 "gram1.tab.c" /* yacc.c:1646  */
+#line 10639 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 761:
-#line 5694 "gram1.y" /* yacc.c:1646  */
+#line 5695 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.bf_node) = (yyvsp[-3].bf_node);
               (yyval.bf_node)->variant = DVM_REALIGN_DIR; 
               (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
             }
-#line 10705 "gram1.tab.c" /* yacc.c:1646  */
+#line 10649 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 762:
-#line 5712 "gram1.y" /* yacc.c:1646  */
+#line 5713 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10711 "gram1.tab.c" /* yacc.c:1646  */
+#line 10655 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 763:
-#line 5714 "gram1.y" /* yacc.c:1646  */
+#line 5715 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10717 "gram1.tab.c" /* yacc.c:1646  */
+#line 10661 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 764:
-#line 5718 "gram1.y" /* yacc.c:1646  */
+#line 5719 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
           s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
           if((s->attr & ALIGN_BIT)) 
@@ -10729,11 +10673,11 @@ yyreduce:
                 s->attr = s->attr | ALIGN_BIT;     
 	  (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
 	}
-#line 10733 "gram1.tab.c" /* yacc.c:1646  */
+#line 10677 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 765:
-#line 5732 "gram1.y" /* yacc.c:1646  */
+#line 5733 "gram1.y" /* yacc.c:1646  */
     {PTR_SYMB s;
         s = (yyvsp[0].ll_node)->entry.Template.symbol;
         if(s->attr & PROCESSORS_BIT)
@@ -10757,11 +10701,11 @@ yyreduce:
           }
 	  (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
 	}
-#line 10761 "gram1.tab.c" /* yacc.c:1646  */
+#line 10705 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 766:
-#line 5758 "gram1.y" /* yacc.c:1646  */
+#line 5759 "gram1.y" /* yacc.c:1646  */
     { /* PTR_LLND r;
               if($7) {
                 r = set_ll_list($6,LLNULL,EXPR_LIST);
@@ -10772,53 +10716,53 @@ yyreduce:
               */
             (yyval.bf_node) = get_bfnd(fi,DVM_ALIGN_DIR,SMNULL,LLNULL,(yyvsp[-4].ll_node),(yyvsp[0].ll_node));
            }
-#line 10776 "gram1.tab.c" /* yacc.c:1646  */
+#line 10720 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 767:
-#line 5771 "gram1.y" /* yacc.c:1646  */
+#line 5772 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-3].symbol));        
           }
-#line 10784 "gram1.tab.c" /* yacc.c:1646  */
+#line 10728 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 768:
-#line 5787 "gram1.y" /* yacc.c:1646  */
+#line 5788 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10790 "gram1.tab.c" /* yacc.c:1646  */
+#line 10734 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 769:
-#line 5789 "gram1.y" /* yacc.c:1646  */
+#line 5790 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10796 "gram1.tab.c" /* yacc.c:1646  */
+#line 10740 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 770:
-#line 5792 "gram1.y" /* yacc.c:1646  */
+#line 5793 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10802 "gram1.tab.c" /* yacc.c:1646  */
+#line 10746 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 771:
-#line 5794 "gram1.y" /* yacc.c:1646  */
+#line 5795 "gram1.y" /* yacc.c:1646  */
     {
                   (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
                   (yyval.ll_node)->entry.string_val = (char *) "*";
                   (yyval.ll_node)->type = global_string;
                  }
-#line 10812 "gram1.tab.c" /* yacc.c:1646  */
+#line 10756 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 772:
-#line 5800 "gram1.y" /* yacc.c:1646  */
+#line 5801 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10818 "gram1.tab.c" /* yacc.c:1646  */
+#line 10762 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 773:
-#line 5804 "gram1.y" /* yacc.c:1646  */
+#line 5805 "gram1.y" /* yacc.c:1646  */
     { 
          /* if(parstate == INEXEC){ *for REALIGN directive*
               if (!($$ = $1->id_attr))
@@ -10844,23 +10788,23 @@ yyreduce:
              &&   !((yyval.symbol)->attr & DIMENSION_BIT) && !((yyval.symbol)->attr & DVM_POINTER_BIT))
             errstr("The align-target %s isn't declared as array", (yyval.symbol)->ident, 61); 
          }
-#line 10848 "gram1.tab.c" /* yacc.c:1646  */
+#line 10792 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 774:
-#line 5832 "gram1.y" /* yacc.c:1646  */
+#line 5833 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10854 "gram1.tab.c" /* yacc.c:1646  */
+#line 10798 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 775:
-#line 5834 "gram1.y" /* yacc.c:1646  */
+#line 5835 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10860 "gram1.tab.c" /* yacc.c:1646  */
+#line 10804 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 776:
-#line 5838 "gram1.y" /* yacc.c:1646  */
+#line 5839 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
             s = make_scalar((yyvsp[0].hash_entry),TYNULL,LOCAL);
             if(s->type->variant != T_INT || s->attr & PARAMETER_BIT)             
@@ -10868,27 +10812,27 @@ yyreduce:
 	   (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
            (yyval.ll_node)->type = global_int;
          }
-#line 10872 "gram1.tab.c" /* yacc.c:1646  */
+#line 10816 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 777:
-#line 5846 "gram1.y" /* yacc.c:1646  */
+#line 5847 "gram1.y" /* yacc.c:1646  */
     {  
           (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
           (yyval.ll_node)->entry.string_val = (char *) "*";
           (yyval.ll_node)->type = global_string;
         }
-#line 10882 "gram1.tab.c" /* yacc.c:1646  */
+#line 10826 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 778:
-#line 5852 "gram1.y" /* yacc.c:1646  */
+#line 5853 "gram1.y" /* yacc.c:1646  */
     {   (yyval.ll_node) = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL); }
-#line 10888 "gram1.tab.c" /* yacc.c:1646  */
+#line 10832 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 779:
-#line 5855 "gram1.y" /* yacc.c:1646  */
+#line 5856 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	             PTR_LLND q, r, p;
                      int numdim;
@@ -10946,11 +10890,11 @@ yyreduce:
 	             r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	             (yyval.bf_node) = get_bfnd(fi,DVM_VAR_DECL, SMNULL, r, LLNULL,(yyvsp[-5].ll_node));
 	            }
-#line 10950 "gram1.tab.c" /* yacc.c:1646  */
+#line 10894 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 780:
-#line 5913 "gram1.y" /* yacc.c:1646  */
+#line 5914 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
 	             PTR_LLND q, r, p;
                      int numdim;
@@ -11006,55 +10950,55 @@ yyreduce:
 	             r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
 	             add_to_lowLevelList(r, (yyvsp[-3].bf_node)->entry.Template.ll_ptr1);
 	            }
-#line 11010 "gram1.tab.c" /* yacc.c:1646  */
+#line 10954 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 781:
-#line 5977 "gram1.y" /* yacc.c:1646  */
+#line 5978 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); type_options = type_opt; }
-#line 11016 "gram1.tab.c" /* yacc.c:1646  */
+#line 10960 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 782:
-#line 5979 "gram1.y" /* yacc.c:1646  */
+#line 5980 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node),(yyvsp[0].ll_node),EXPR_LIST); type_options = type_options | type_opt;}
-#line 11022 "gram1.tab.c" /* yacc.c:1646  */
+#line 10966 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 783:
-#line 5982 "gram1.y" /* yacc.c:1646  */
+#line 5983 "gram1.y" /* yacc.c:1646  */
     { type_opt = TEMPLATE_BIT;
                (yyval.ll_node) = make_llnd(fi,TEMPLATE_OP,LLNULL,LLNULL,SMNULL);
                }
-#line 11030 "gram1.tab.c" /* yacc.c:1646  */
+#line 10974 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 784:
-#line 5986 "gram1.y" /* yacc.c:1646  */
+#line 5987 "gram1.y" /* yacc.c:1646  */
     { type_opt = PROCESSORS_BIT;
                 (yyval.ll_node) = make_llnd(fi,PROCESSORS_OP,LLNULL,LLNULL,SMNULL);
                }
-#line 11038 "gram1.tab.c" /* yacc.c:1646  */
+#line 10982 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 785:
-#line 5990 "gram1.y" /* yacc.c:1646  */
+#line 5991 "gram1.y" /* yacc.c:1646  */
     { type_opt = PROCESSORS_BIT;
                 (yyval.ll_node) = make_llnd(fi,PROCESSORS_OP,LLNULL,LLNULL,SMNULL);
                }
-#line 11046 "gram1.tab.c" /* yacc.c:1646  */
+#line 10990 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 786:
-#line 5994 "gram1.y" /* yacc.c:1646  */
+#line 5995 "gram1.y" /* yacc.c:1646  */
     { type_opt = DYNAMIC_BIT;
                 (yyval.ll_node) = make_llnd(fi,DYNAMIC_OP,LLNULL,LLNULL,SMNULL);
                }
-#line 11054 "gram1.tab.c" /* yacc.c:1646  */
+#line 10998 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 787:
-#line 6011 "gram1.y" /* yacc.c:1646  */
+#line 6012 "gram1.y" /* yacc.c:1646  */
     {
                 if(! explicit_shape) {
                   err("Explicit shape specification is required", 50);
@@ -11066,79 +11010,79 @@ yyreduce:
                 attr_ndim = ndim; attr_dims = (yyvsp[-1].ll_node);
                 (yyval.ll_node) = make_llnd(fi,DIMENSION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);
 	       }
-#line 11070 "gram1.tab.c" /* yacc.c:1646  */
+#line 11014 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 788:
-#line 6023 "gram1.y" /* yacc.c:1646  */
+#line 6024 "gram1.y" /* yacc.c:1646  */
     { type_opt = SHADOW_BIT;
                   (yyval.ll_node) = make_llnd(fi,SHADOW_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);
                  }
-#line 11078 "gram1.tab.c" /* yacc.c:1646  */
+#line 11022 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 789:
-#line 6027 "gram1.y" /* yacc.c:1646  */
+#line 6028 "gram1.y" /* yacc.c:1646  */
     { type_opt = ALIGN_BIT;
                   (yyval.ll_node) = make_llnd(fi,ALIGN_OP,(yyvsp[-4].ll_node),(yyvsp[0].ll_node),SMNULL);
                  }
-#line 11086 "gram1.tab.c" /* yacc.c:1646  */
+#line 11030 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 790:
-#line 6031 "gram1.y" /* yacc.c:1646  */
+#line 6032 "gram1.y" /* yacc.c:1646  */
     { type_opt = ALIGN_BIT;
                   (yyval.ll_node) = make_llnd(fi,ALIGN_OP,LLNULL,SMNULL,SMNULL);
                 }
-#line 11094 "gram1.tab.c" /* yacc.c:1646  */
+#line 11038 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 791:
-#line 6041 "gram1.y" /* yacc.c:1646  */
+#line 6042 "gram1.y" /* yacc.c:1646  */
     { 
                  type_opt = DISTRIBUTE_BIT;
                  (yyval.ll_node) = make_llnd(fi,DISTRIBUTE_OP,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL);
                 }
-#line 11103 "gram1.tab.c" /* yacc.c:1646  */
+#line 11047 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 792:
-#line 6046 "gram1.y" /* yacc.c:1646  */
+#line 6047 "gram1.y" /* yacc.c:1646  */
     { 
                  type_opt = DISTRIBUTE_BIT;
                  (yyval.ll_node) = make_llnd(fi,DISTRIBUTE_OP,LLNULL,LLNULL,SMNULL);
                 }
-#line 11112 "gram1.tab.c" /* yacc.c:1646  */
+#line 11056 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 793:
-#line 6051 "gram1.y" /* yacc.c:1646  */
+#line 6052 "gram1.y" /* yacc.c:1646  */
     {
                  type_opt = COMMON_BIT;
                  (yyval.ll_node) = make_llnd(fi,COMMON_OP, LLNULL, LLNULL, SMNULL);
                 }
-#line 11121 "gram1.tab.c" /* yacc.c:1646  */
+#line 11065 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 794:
-#line 6058 "gram1.y" /* yacc.c:1646  */
+#line 6059 "gram1.y" /* yacc.c:1646  */
     { 
 	      PTR_LLND  l;
 	      l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
 	      l->type = (yyvsp[-10].data_type);
 	      (yyval.bf_node) = get_bfnd(fi,DVM_POINTER_DIR, SMNULL, (yyvsp[0].ll_node),(yyvsp[-4].ll_node), l);
 	    }
-#line 11132 "gram1.tab.c" /* yacc.c:1646  */
+#line 11076 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 795:
-#line 6066 "gram1.y" /* yacc.c:1646  */
+#line 6067 "gram1.y" /* yacc.c:1646  */
     {ndim = 0;}
-#line 11138 "gram1.tab.c" /* yacc.c:1646  */
+#line 11082 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 796:
-#line 6067 "gram1.y" /* yacc.c:1646  */
+#line 6068 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND  q;
              if(ndim == maxdim)
 		err("Too many dimensions", 43);
@@ -11149,11 +11093,11 @@ yyreduce:
 	       /*$$ = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);*/
 	       /*$$->type = global_default;*/
 	    }
-#line 11153 "gram1.tab.c" /* yacc.c:1646  */
+#line 11097 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 797:
-#line 6078 "gram1.y" /* yacc.c:1646  */
+#line 6079 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND  q;
              if(ndim == maxdim)
 		err("Too many dimensions", 43);
@@ -11162,23 +11106,23 @@ yyreduce:
 	      ++ndim;
               (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), q, EXPR_LIST);
             }
-#line 11166 "gram1.tab.c" /* yacc.c:1646  */
+#line 11110 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 798:
-#line 6089 "gram1.y" /* yacc.c:1646  */
+#line 6090 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11172 "gram1.tab.c" /* yacc.c:1646  */
+#line 11116 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 799:
-#line 6091 "gram1.y" /* yacc.c:1646  */
+#line 6092 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11178 "gram1.tab.c" /* yacc.c:1646  */
+#line 11122 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 800:
-#line 6095 "gram1.y" /* yacc.c:1646  */
+#line 6096 "gram1.y" /* yacc.c:1646  */
     {PTR_SYMB s;
            /* s = make_scalar($1,TYNULL,LOCAL);*/
             s = make_array((yyvsp[0].hash_entry),TYNULL,LLNULL,0,LOCAL);
@@ -11187,29 +11131,29 @@ yyreduce:
                errstr( "Inconsistent declaration of identifier %s", s->ident, 16);     
             (yyval.ll_node) = make_llnd(fi,VAR_REF,LLNULL,LLNULL,s);
             }
-#line 11191 "gram1.tab.c" /* yacc.c:1646  */
+#line 11135 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 801:
-#line 6106 "gram1.y" /* yacc.c:1646  */
+#line 6107 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_HEAP_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 11197 "gram1.tab.c" /* yacc.c:1646  */
+#line 11141 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 802:
-#line 6110 "gram1.y" /* yacc.c:1646  */
+#line 6111 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11203 "gram1.tab.c" /* yacc.c:1646  */
+#line 11147 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 803:
-#line 6112 "gram1.y" /* yacc.c:1646  */
+#line 6113 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11209 "gram1.tab.c" /* yacc.c:1646  */
+#line 11153 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 804:
-#line 6116 "gram1.y" /* yacc.c:1646  */
+#line 6117 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
               s->attr = s->attr | HEAP_BIT;
@@ -11218,29 +11162,29 @@ yyreduce:
       
 	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
 	   }
-#line 11222 "gram1.tab.c" /* yacc.c:1646  */
+#line 11166 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 805:
-#line 6127 "gram1.y" /* yacc.c:1646  */
+#line 6128 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_CONSISTENT_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 11228 "gram1.tab.c" /* yacc.c:1646  */
+#line 11172 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 806:
-#line 6131 "gram1.y" /* yacc.c:1646  */
+#line 6132 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11234 "gram1.tab.c" /* yacc.c:1646  */
+#line 11178 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 807:
-#line 6133 "gram1.y" /* yacc.c:1646  */
+#line 6134 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11240 "gram1.tab.c" /* yacc.c:1646  */
+#line 11184 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 808:
-#line 6137 "gram1.y" /* yacc.c:1646  */
+#line 6138 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
 	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
               s->attr = s->attr | CONSISTENT_BIT;
@@ -11249,38 +11193,38 @@ yyreduce:
       
 	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
 	   }
-#line 11253 "gram1.tab.c" /* yacc.c:1646  */
+#line 11197 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 809:
-#line 6149 "gram1.y" /* yacc.c:1646  */
+#line 6150 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_ASYNCID_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 11259 "gram1.tab.c" /* yacc.c:1646  */
+#line 11203 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 810:
-#line 6151 "gram1.y" /* yacc.c:1646  */
+#line 6152 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
               p = make_llnd(fi,COMM_LIST, LLNULL, LLNULL, SMNULL);              
               (yyval.bf_node) = get_bfnd(fi,DVM_ASYNCID_DIR, SMNULL, (yyvsp[0].ll_node), p, LLNULL);
             }
-#line 11268 "gram1.tab.c" /* yacc.c:1646  */
+#line 11212 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 811:
-#line 6158 "gram1.y" /* yacc.c:1646  */
+#line 6159 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11274 "gram1.tab.c" /* yacc.c:1646  */
+#line 11218 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 812:
-#line 6160 "gram1.y" /* yacc.c:1646  */
+#line 6161 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11280 "gram1.tab.c" /* yacc.c:1646  */
+#line 11224 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 813:
-#line 6164 "gram1.y" /* yacc.c:1646  */
+#line 6165 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
               if((yyvsp[0].ll_node)){
                   s = make_array((yyvsp[-1].hash_entry), global_default, (yyvsp[0].ll_node), ndim, LOCAL);
@@ -11293,51 +11237,51 @@ yyreduce:
 	      (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
               }
 	   }
-#line 11297 "gram1.tab.c" /* yacc.c:1646  */
+#line 11241 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 814:
-#line 6180 "gram1.y" /* yacc.c:1646  */
+#line 6181 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_NEW_VALUE_DIR,SMNULL, LLNULL, LLNULL,LLNULL);}
-#line 11303 "gram1.tab.c" /* yacc.c:1646  */
+#line 11247 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 815:
-#line 6190 "gram1.y" /* yacc.c:1646  */
+#line 6191 "gram1.y" /* yacc.c:1646  */
     {  if((yyvsp[-1].ll_node) &&  (yyvsp[-1].ll_node)->entry.Template.symbol->attr & TASK_BIT)
                         (yyval.bf_node) = get_bfnd(fi,DVM_PARALLEL_TASK_DIR,SMNULL,(yyvsp[-1].ll_node),(yyvsp[0].ll_node),(yyvsp[-3].ll_node));
                     else
                         (yyval.bf_node) = get_bfnd(fi,DVM_PARALLEL_ON_DIR,SMNULL,(yyvsp[-1].ll_node),(yyvsp[0].ll_node),(yyvsp[-3].ll_node));
                  }
-#line 11313 "gram1.tab.c" /* yacc.c:1646  */
+#line 11257 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 816:
-#line 6199 "gram1.y" /* yacc.c:1646  */
+#line 6200 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11319 "gram1.tab.c" /* yacc.c:1646  */
+#line 11263 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 817:
-#line 6201 "gram1.y" /* yacc.c:1646  */
+#line 6202 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11325 "gram1.tab.c" /* yacc.c:1646  */
+#line 11269 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 818:
-#line 6205 "gram1.y" /* yacc.c:1646  */
+#line 6206 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11331 "gram1.tab.c" /* yacc.c:1646  */
+#line 11275 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 819:
-#line 6208 "gram1.y" /* yacc.c:1646  */
+#line 6209 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; opt_kwd_ = NO;}
-#line 11337 "gram1.tab.c" /* yacc.c:1646  */
+#line 11281 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 820:
-#line 6213 "gram1.y" /* yacc.c:1646  */
+#line 6214 "gram1.y" /* yacc.c:1646  */
     {
           if((yyvsp[-3].ll_node)->type->variant != T_ARRAY) 
              errstr("'%s' isn't array", (yyvsp[-3].ll_node)->entry.Template.symbol->ident, 66);
@@ -11345,92 +11289,92 @@ yyreduce:
           (yyval.ll_node) = (yyvsp[-3].ll_node);
           (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type->entry.ar_decl.base_type;
         }
-#line 11349 "gram1.tab.c" /* yacc.c:1646  */
+#line 11293 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 821:
-#line 6223 "gram1.y" /* yacc.c:1646  */
+#line 6224 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11355 "gram1.tab.c" /* yacc.c:1646  */
+#line 11299 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 822:
-#line 6225 "gram1.y" /* yacc.c:1646  */
+#line 6226 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11361 "gram1.tab.c" /* yacc.c:1646  */
+#line 11305 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 823:
-#line 6229 "gram1.y" /* yacc.c:1646  */
+#line 6230 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11367 "gram1.tab.c" /* yacc.c:1646  */
+#line 11311 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 824:
-#line 6231 "gram1.y" /* yacc.c:1646  */
+#line 6232 "gram1.y" /* yacc.c:1646  */
     {
              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
              (yyval.ll_node)->entry.string_val = (char *) "*";
              (yyval.ll_node)->type = global_string;
             }
-#line 11377 "gram1.tab.c" /* yacc.c:1646  */
+#line 11321 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 825:
-#line 6239 "gram1.y" /* yacc.c:1646  */
+#line 6240 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = LLNULL;}
-#line 11383 "gram1.tab.c" /* yacc.c:1646  */
+#line 11327 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 826:
-#line 6241 "gram1.y" /* yacc.c:1646  */
+#line 6242 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11389 "gram1.tab.c" /* yacc.c:1646  */
+#line 11333 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 827:
-#line 6245 "gram1.y" /* yacc.c:1646  */
+#line 6246 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11395 "gram1.tab.c" /* yacc.c:1646  */
+#line 11339 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 828:
-#line 6247 "gram1.y" /* yacc.c:1646  */
+#line 6248 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11401 "gram1.tab.c" /* yacc.c:1646  */
+#line 11345 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 840:
-#line 6265 "gram1.y" /* yacc.c:1646  */
+#line 6266 "gram1.y" /* yacc.c:1646  */
     { if((yyvsp[-3].symbol)->attr & INDIRECT_BIT)
                             errstr("'%s' is not remote group name", (yyvsp[-3].symbol)->ident, 68);
                           (yyval.ll_node) = make_llnd(fi,REMOTE_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,(yyvsp[-3].symbol));
                         }
-#line 11410 "gram1.tab.c" /* yacc.c:1646  */
+#line 11354 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 841:
-#line 6270 "gram1.y" /* yacc.c:1646  */
+#line 6271 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,REMOTE_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11416 "gram1.tab.c" /* yacc.c:1646  */
+#line 11360 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 842:
-#line 6274 "gram1.y" /* yacc.c:1646  */
+#line 6275 "gram1.y" /* yacc.c:1646  */
     {
                           (yyval.ll_node) = make_llnd(fi,CONSISTENT_OP,(yyvsp[-1].ll_node),LLNULL,(yyvsp[-3].symbol));
                         }
-#line 11424 "gram1.tab.c" /* yacc.c:1646  */
+#line 11368 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 843:
-#line 6278 "gram1.y" /* yacc.c:1646  */
+#line 6279 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,CONSISTENT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11430 "gram1.tab.c" /* yacc.c:1646  */
+#line 11374 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 844:
-#line 6282 "gram1.y" /* yacc.c:1646  */
+#line 6283 "gram1.y" /* yacc.c:1646  */
     {  
             if(((yyval.symbol)=(yyvsp[0].hash_entry)->id_attr) == SMNULL){
                 errstr("'%s' is not declared as group", (yyvsp[0].hash_entry)->ident, 74);
@@ -11440,184 +11384,184 @@ yyreduce:
                    errstr("'%s' is not declared as group", (yyvsp[0].hash_entry)->ident, 74);
             }
           }
-#line 11444 "gram1.tab.c" /* yacc.c:1646  */
+#line 11388 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 845:
-#line 6295 "gram1.y" /* yacc.c:1646  */
+#line 6296 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi,NEW_SPEC_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11450 "gram1.tab.c" /* yacc.c:1646  */
+#line 11394 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 846:
-#line 6299 "gram1.y" /* yacc.c:1646  */
+#line 6300 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi,NEW_SPEC_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11456 "gram1.tab.c" /* yacc.c:1646  */
+#line 11400 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 847:
-#line 6303 "gram1.y" /* yacc.c:1646  */
+#line 6304 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11462 "gram1.tab.c" /* yacc.c:1646  */
+#line 11406 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 848:
-#line 6307 "gram1.y" /* yacc.c:1646  */
+#line 6308 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_CUDA_BLOCK_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11468 "gram1.tab.c" /* yacc.c:1646  */
+#line 11412 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 849:
-#line 6310 "gram1.y" /* yacc.c:1646  */
+#line 6311 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11474 "gram1.tab.c" /* yacc.c:1646  */
+#line 11418 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 850:
-#line 6312 "gram1.y" /* yacc.c:1646  */
+#line 6313 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11480 "gram1.tab.c" /* yacc.c:1646  */
+#line 11424 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 851:
-#line 6314 "gram1.y" /* yacc.c:1646  */
+#line 6315 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-2].ll_node),EXPR_LIST); (yyval.ll_node) = set_ll_list((yyval.ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11486 "gram1.tab.c" /* yacc.c:1646  */
+#line 11430 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 852:
-#line 6318 "gram1.y" /* yacc.c:1646  */
+#line 6319 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11492 "gram1.tab.c" /* yacc.c:1646  */
+#line 11436 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 853:
-#line 6320 "gram1.y" /* yacc.c:1646  */
+#line 6321 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11498 "gram1.tab.c" /* yacc.c:1646  */
+#line 11442 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 854:
-#line 6324 "gram1.y" /* yacc.c:1646  */
+#line 6325 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_TIE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11504 "gram1.tab.c" /* yacc.c:1646  */
+#line 11448 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 855:
-#line 6328 "gram1.y" /* yacc.c:1646  */
+#line 6329 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11510 "gram1.tab.c" /* yacc.c:1646  */
+#line 11454 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 856:
-#line 6330 "gram1.y" /* yacc.c:1646  */
+#line 6331 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11516 "gram1.tab.c" /* yacc.c:1646  */
+#line 11460 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 857:
-#line 6334 "gram1.y" /* yacc.c:1646  */
+#line 6335 "gram1.y" /* yacc.c:1646  */
     { if(!((yyvsp[-3].symbol)->attr & INDIRECT_BIT))
                          errstr("'%s' is not indirect group name", (yyvsp[-3].symbol)->ident, 313);
                       (yyval.ll_node) = make_llnd(fi,INDIRECT_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,(yyvsp[-3].symbol));
                     }
-#line 11525 "gram1.tab.c" /* yacc.c:1646  */
+#line 11469 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 858:
-#line 6339 "gram1.y" /* yacc.c:1646  */
+#line 6340 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,INDIRECT_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11531 "gram1.tab.c" /* yacc.c:1646  */
+#line 11475 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 859:
-#line 6343 "gram1.y" /* yacc.c:1646  */
+#line 6344 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi,STAGE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11537 "gram1.tab.c" /* yacc.c:1646  */
+#line 11481 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 860:
-#line 6347 "gram1.y" /* yacc.c:1646  */
+#line 6348 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi,ACROSS_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);}
-#line 11543 "gram1.tab.c" /* yacc.c:1646  */
+#line 11487 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 861:
-#line 6349 "gram1.y" /* yacc.c:1646  */
+#line 6350 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi,ACROSS_OP,(yyvsp[-1].ll_node),(yyvsp[0].ll_node),SMNULL);}
-#line 11549 "gram1.tab.c" /* yacc.c:1646  */
+#line 11493 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 862:
-#line 6353 "gram1.y" /* yacc.c:1646  */
+#line 6354 "gram1.y" /* yacc.c:1646  */
     {  if((yyvsp[-2].ll_node))
                      (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[-1].ll_node),SMNULL);
                    else
                      (yyval.ll_node) = (yyvsp[-1].ll_node);
                 }
-#line 11559 "gram1.tab.c" /* yacc.c:1646  */
+#line 11503 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 863:
-#line 6361 "gram1.y" /* yacc.c:1646  */
+#line 6362 "gram1.y" /* yacc.c:1646  */
     { opt_in_out = YES; }
-#line 11565 "gram1.tab.c" /* yacc.c:1646  */
+#line 11509 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 864:
-#line 6365 "gram1.y" /* yacc.c:1646  */
+#line 6366 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "in";
               (yyval.ll_node)->type = global_string;
             }
-#line 11575 "gram1.tab.c" /* yacc.c:1646  */
+#line 11519 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 865:
-#line 6371 "gram1.y" /* yacc.c:1646  */
+#line 6372 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "out";
               (yyval.ll_node)->type = global_string;
             }
-#line 11585 "gram1.tab.c" /* yacc.c:1646  */
+#line 11529 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 866:
-#line 6377 "gram1.y" /* yacc.c:1646  */
+#line 6378 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = LLNULL; opt_in_out = NO;}
-#line 11591 "gram1.tab.c" /* yacc.c:1646  */
+#line 11535 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 867:
-#line 6381 "gram1.y" /* yacc.c:1646  */
+#line 6382 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11597 "gram1.tab.c" /* yacc.c:1646  */
+#line 11541 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 868:
-#line 6383 "gram1.y" /* yacc.c:1646  */
+#line 6384 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11603 "gram1.tab.c" /* yacc.c:1646  */
+#line 11547 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 869:
-#line 6387 "gram1.y" /* yacc.c:1646  */
+#line 6388 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11609 "gram1.tab.c" /* yacc.c:1646  */
+#line 11553 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 870:
-#line 6389 "gram1.y" /* yacc.c:1646  */
+#line 6390 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-3].ll_node);
                     (yyval.ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);  
                   }
-#line 11617 "gram1.tab.c" /* yacc.c:1646  */
+#line 11561 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 871:
-#line 6393 "gram1.y" /* yacc.c:1646  */
+#line 6394 "gram1.y" /* yacc.c:1646  */
     { /*  PTR_LLND p;
                        p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
                        p->entry.string_val = (char *) "corner";
@@ -11626,145 +11570,145 @@ yyreduce:
                    (yyvsp[-6].ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-4].ll_node);  
                    (yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-6].ll_node),(yyvsp[-1].ll_node),SMNULL);
                  }
-#line 11630 "gram1.tab.c" /* yacc.c:1646  */
+#line 11574 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 872:
-#line 6405 "gram1.y" /* yacc.c:1646  */
+#line 6406 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11636 "gram1.tab.c" /* yacc.c:1646  */
+#line 11580 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 873:
-#line 6407 "gram1.y" /* yacc.c:1646  */
+#line 6408 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11642 "gram1.tab.c" /* yacc.c:1646  */
+#line 11586 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 874:
-#line 6411 "gram1.y" /* yacc.c:1646  */
+#line 6412 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);}
-#line 11648 "gram1.tab.c" /* yacc.c:1646  */
+#line 11592 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 875:
-#line 6415 "gram1.y" /* yacc.c:1646  */
+#line 6416 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11654 "gram1.tab.c" /* yacc.c:1646  */
+#line 11598 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 876:
-#line 6417 "gram1.y" /* yacc.c:1646  */
+#line 6418 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11660 "gram1.tab.c" /* yacc.c:1646  */
+#line 11604 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 877:
-#line 6421 "gram1.y" /* yacc.c:1646  */
+#line 6422 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-4].ll_node),make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL),SMNULL); }
-#line 11666 "gram1.tab.c" /* yacc.c:1646  */
+#line 11610 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 878:
-#line 6423 "gram1.y" /* yacc.c:1646  */
+#line 6424 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),make_llnd(fi,DDOT,(yyvsp[0].ll_node),LLNULL,SMNULL),SMNULL); }
-#line 11672 "gram1.tab.c" /* yacc.c:1646  */
+#line 11616 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 879:
-#line 6425 "gram1.y" /* yacc.c:1646  */
+#line 6426 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),make_llnd(fi,DDOT,LLNULL,(yyvsp[0].ll_node),SMNULL),SMNULL); }
-#line 11678 "gram1.tab.c" /* yacc.c:1646  */
+#line 11622 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 880:
-#line 6427 "gram1.y" /* yacc.c:1646  */
+#line 6428 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[0].ll_node),LLNULL,SMNULL); }
-#line 11684 "gram1.tab.c" /* yacc.c:1646  */
+#line 11628 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 881:
-#line 6429 "gram1.y" /* yacc.c:1646  */
+#line 6430 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL),SMNULL); }
-#line 11690 "gram1.tab.c" /* yacc.c:1646  */
+#line 11634 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 882:
-#line 6431 "gram1.y" /* yacc.c:1646  */
+#line 6432 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,(yyvsp[0].ll_node),LLNULL,SMNULL),SMNULL); }
-#line 11696 "gram1.tab.c" /* yacc.c:1646  */
+#line 11640 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 883:
-#line 6433 "gram1.y" /* yacc.c:1646  */
+#line 6434 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,LLNULL,(yyvsp[0].ll_node),SMNULL),SMNULL); }
-#line 11702 "gram1.tab.c" /* yacc.c:1646  */
+#line 11646 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 884:
-#line 6437 "gram1.y" /* yacc.c:1646  */
+#line 6438 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11708 "gram1.tab.c" /* yacc.c:1646  */
+#line 11652 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 885:
-#line 6441 "gram1.y" /* yacc.c:1646  */
+#line 6442 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11714 "gram1.tab.c" /* yacc.c:1646  */
+#line 11658 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 886:
-#line 6445 "gram1.y" /* yacc.c:1646  */
+#line 6446 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11720 "gram1.tab.c" /* yacc.c:1646  */
+#line 11664 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 887:
-#line 6449 "gram1.y" /* yacc.c:1646  */
+#line 6450 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 11726 "gram1.tab.c" /* yacc.c:1646  */
+#line 11670 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 888:
-#line 6453 "gram1.y" /* yacc.c:1646  */
+#line 6454 "gram1.y" /* yacc.c:1646  */
     {PTR_LLND q;
                 /* q = set_ll_list($9,$6,EXPR_LIST); */
                  q = set_ll_list((yyvsp[-4].ll_node),LLNULL,EXPR_LIST); /*podd 11.10.01*/
                  q = add_to_lowLevelList((yyvsp[-1].ll_node),q);        /*podd 11.10.01*/
                  (yyval.ll_node) = make_llnd(fi,REDUCTION_OP,q,LLNULL,SMNULL);
                 }
-#line 11737 "gram1.tab.c" /* yacc.c:1646  */
+#line 11681 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 889:
-#line 6460 "gram1.y" /* yacc.c:1646  */
+#line 6461 "gram1.y" /* yacc.c:1646  */
     {PTR_LLND q;
                  q = set_ll_list((yyvsp[-2].ll_node),LLNULL,EXPR_LIST);
                  (yyval.ll_node) = make_llnd(fi,REDUCTION_OP,q,LLNULL,SMNULL);
                 }
-#line 11746 "gram1.tab.c" /* yacc.c:1646  */
+#line 11690 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 890:
-#line 6466 "gram1.y" /* yacc.c:1646  */
+#line 6467 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = make_llnd(fi,REDUCTION_OP,(yyvsp[-1].ll_node),LLNULL,(yyvsp[-4].symbol)); }
-#line 11752 "gram1.tab.c" /* yacc.c:1646  */
+#line 11696 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 891:
-#line 6470 "gram1.y" /* yacc.c:1646  */
+#line 6471 "gram1.y" /* yacc.c:1646  */
     { opt_kwd_r = YES; }
-#line 11758 "gram1.tab.c" /* yacc.c:1646  */
+#line 11702 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 892:
-#line 6473 "gram1.y" /* yacc.c:1646  */
+#line 6474 "gram1.y" /* yacc.c:1646  */
     { opt_kwd_r = NO; }
-#line 11764 "gram1.tab.c" /* yacc.c:1646  */
+#line 11708 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 893:
-#line 6477 "gram1.y" /* yacc.c:1646  */
+#line 6478 "gram1.y" /* yacc.c:1646  */
     { 
                   if(((yyval.symbol)=(yyvsp[0].hash_entry)->id_attr) == SMNULL) {
                       errstr("'%s' is not declared as reduction group", (yyvsp[0].hash_entry)->ident, 69);
@@ -11774,220 +11718,220 @@ yyreduce:
                       errstr("'%s' is not declared as reduction group", (yyvsp[0].hash_entry)->ident, 69);
                   }
                 }
-#line 11778 "gram1.tab.c" /* yacc.c:1646  */
+#line 11722 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 894:
-#line 6490 "gram1.y" /* yacc.c:1646  */
+#line 6491 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11784 "gram1.tab.c" /* yacc.c:1646  */
+#line 11728 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 895:
-#line 6492 "gram1.y" /* yacc.c:1646  */
+#line 6493 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11790 "gram1.tab.c" /* yacc.c:1646  */
+#line 11734 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 896:
-#line 6496 "gram1.y" /* yacc.c:1646  */
+#line 6497 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),SMNULL);}
-#line 11796 "gram1.tab.c" /* yacc.c:1646  */
+#line 11740 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 897:
-#line 6498 "gram1.y" /* yacc.c:1646  */
+#line 6499 "gram1.y" /* yacc.c:1646  */
     {(yyvsp[-3].ll_node) = set_ll_list((yyvsp[-3].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
             (yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-5].ll_node),(yyvsp[-3].ll_node),SMNULL);}
-#line 11803 "gram1.tab.c" /* yacc.c:1646  */
+#line 11747 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 898:
-#line 6503 "gram1.y" /* yacc.c:1646  */
+#line 6504 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "sum";
               (yyval.ll_node)->type = global_string;
              }
-#line 11813 "gram1.tab.c" /* yacc.c:1646  */
+#line 11757 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 899:
-#line 6509 "gram1.y" /* yacc.c:1646  */
+#line 6510 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "product";
               (yyval.ll_node)->type = global_string;
              }
-#line 11823 "gram1.tab.c" /* yacc.c:1646  */
+#line 11767 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 900:
-#line 6515 "gram1.y" /* yacc.c:1646  */
+#line 6516 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "min";
               (yyval.ll_node)->type = global_string;
              }
-#line 11833 "gram1.tab.c" /* yacc.c:1646  */
+#line 11777 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 901:
-#line 6521 "gram1.y" /* yacc.c:1646  */
+#line 6522 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "max";
               (yyval.ll_node)->type = global_string;
              }
-#line 11843 "gram1.tab.c" /* yacc.c:1646  */
+#line 11787 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 902:
-#line 6527 "gram1.y" /* yacc.c:1646  */
+#line 6528 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "or";
               (yyval.ll_node)->type = global_string;
              }
-#line 11853 "gram1.tab.c" /* yacc.c:1646  */
+#line 11797 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 903:
-#line 6533 "gram1.y" /* yacc.c:1646  */
+#line 6534 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "and";
               (yyval.ll_node)->type = global_string;
              }
-#line 11863 "gram1.tab.c" /* yacc.c:1646  */
+#line 11807 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 904:
-#line 6539 "gram1.y" /* yacc.c:1646  */
+#line 6540 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "eqv";
               (yyval.ll_node)->type = global_string;
              }
-#line 11873 "gram1.tab.c" /* yacc.c:1646  */
+#line 11817 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 905:
-#line 6545 "gram1.y" /* yacc.c:1646  */
+#line 6546 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "neqv";
               (yyval.ll_node)->type = global_string;
              }
-#line 11883 "gram1.tab.c" /* yacc.c:1646  */
+#line 11827 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 906:
-#line 6551 "gram1.y" /* yacc.c:1646  */
+#line 6552 "gram1.y" /* yacc.c:1646  */
     { err("Illegal reduction operation name", 70);
                errcnt--;
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "unknown";
               (yyval.ll_node)->type = global_string;
              }
-#line 11894 "gram1.tab.c" /* yacc.c:1646  */
+#line 11838 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 907:
-#line 6560 "gram1.y" /* yacc.c:1646  */
+#line 6561 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "maxloc";
               (yyval.ll_node)->type = global_string;
              }
-#line 11904 "gram1.tab.c" /* yacc.c:1646  */
+#line 11848 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 908:
-#line 6566 "gram1.y" /* yacc.c:1646  */
+#line 6567 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "minloc";
               (yyval.ll_node)->type = global_string;
              }
-#line 11914 "gram1.tab.c" /* yacc.c:1646  */
+#line 11858 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 909:
-#line 6583 "gram1.y" /* yacc.c:1646  */
+#line 6584 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,SHADOW_RENEW_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11920 "gram1.tab.c" /* yacc.c:1646  */
+#line 11864 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 910:
-#line 6591 "gram1.y" /* yacc.c:1646  */
+#line 6592 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,SHADOW_START_OP,LLNULL,LLNULL,(yyvsp[0].symbol));}
-#line 11926 "gram1.tab.c" /* yacc.c:1646  */
+#line 11870 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 911:
-#line 6599 "gram1.y" /* yacc.c:1646  */
+#line 6600 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,SHADOW_WAIT_OP,LLNULL,LLNULL,(yyvsp[0].symbol));}
-#line 11932 "gram1.tab.c" /* yacc.c:1646  */
+#line 11876 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 912:
-#line 6601 "gram1.y" /* yacc.c:1646  */
+#line 6602 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,SHADOW_COMP_OP,LLNULL,LLNULL,SMNULL);}
-#line 11938 "gram1.tab.c" /* yacc.c:1646  */
+#line 11882 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 913:
-#line 6603 "gram1.y" /* yacc.c:1646  */
+#line 6604 "gram1.y" /* yacc.c:1646  */
     {  (yyvsp[-4].ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-2].ll_node); (yyval.ll_node) = make_llnd(fi,SHADOW_COMP_OP,(yyvsp[-4].ll_node),LLNULL,SMNULL);}
-#line 11944 "gram1.tab.c" /* yacc.c:1646  */
+#line 11888 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 914:
-#line 6607 "gram1.y" /* yacc.c:1646  */
+#line 6608 "gram1.y" /* yacc.c:1646  */
     {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), SHADOW_GROUP_NAME,global_default,LOCAL);}
-#line 11950 "gram1.tab.c" /* yacc.c:1646  */
+#line 11894 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 915:
-#line 6611 "gram1.y" /* yacc.c:1646  */
+#line 6612 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11956 "gram1.tab.c" /* yacc.c:1646  */
+#line 11900 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 916:
-#line 6613 "gram1.y" /* yacc.c:1646  */
+#line 6614 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11962 "gram1.tab.c" /* yacc.c:1646  */
+#line 11906 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 917:
-#line 6617 "gram1.y" /* yacc.c:1646  */
+#line 6618 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11968 "gram1.tab.c" /* yacc.c:1646  */
+#line 11912 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 918:
-#line 6619 "gram1.y" /* yacc.c:1646  */
+#line 6620 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
           p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
           p->entry.string_val = (char *) "corner";
           p->type = global_string;
           (yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-4].ll_node),p,SMNULL);
          }
-#line 11979 "gram1.tab.c" /* yacc.c:1646  */
+#line 11923 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 919:
-#line 6627 "gram1.y" /* yacc.c:1646  */
+#line 6628 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-4].ll_node);
           (yyval.ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);  
         }
-#line 11987 "gram1.tab.c" /* yacc.c:1646  */
+#line 11931 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 920:
-#line 6631 "gram1.y" /* yacc.c:1646  */
+#line 6632 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND p;
           p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
           p->entry.string_val = (char *) "corner";
@@ -11995,17 +11939,17 @@ yyreduce:
           (yyvsp[-8].ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-5].ll_node);  
           (yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-8].ll_node),p,SMNULL);
        }
-#line 11999 "gram1.tab.c" /* yacc.c:1646  */
+#line 11943 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 921:
-#line 6642 "gram1.y" /* yacc.c:1646  */
+#line 6643 "gram1.y" /* yacc.c:1646  */
     { optcorner = YES; }
-#line 12005 "gram1.tab.c" /* yacc.c:1646  */
+#line 11949 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 922:
-#line 6646 "gram1.y" /* yacc.c:1646  */
+#line 6647 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
          s = (yyvsp[0].ll_node)->entry.Template.symbol;
          if(s->attr & PROCESSORS_BIT)
@@ -12021,92 +11965,92 @@ yyreduce:
                 
          (yyval.ll_node) = (yyvsp[0].ll_node);
         }
-#line 12025 "gram1.tab.c" /* yacc.c:1646  */
+#line 11969 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 923:
-#line 6664 "gram1.y" /* yacc.c:1646  */
+#line 6665 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12031 "gram1.tab.c" /* yacc.c:1646  */
+#line 11975 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 924:
-#line 6666 "gram1.y" /* yacc.c:1646  */
+#line 6667 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12037 "gram1.tab.c" /* yacc.c:1646  */
+#line 11981 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 925:
-#line 6670 "gram1.y" /* yacc.c:1646  */
+#line 6671 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_START_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12043 "gram1.tab.c" /* yacc.c:1646  */
+#line 11987 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 926:
-#line 6672 "gram1.y" /* yacc.c:1646  */
+#line 6673 "gram1.y" /* yacc.c:1646  */
     {errstr("Missing DVM directive prefix", 49);}
-#line 12049 "gram1.tab.c" /* yacc.c:1646  */
+#line 11993 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 927:
-#line 6676 "gram1.y" /* yacc.c:1646  */
+#line 6677 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_WAIT_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12055 "gram1.tab.c" /* yacc.c:1646  */
+#line 11999 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 928:
-#line 6678 "gram1.y" /* yacc.c:1646  */
+#line 6679 "gram1.y" /* yacc.c:1646  */
     {errstr("Missing DVM directive prefix", 49);}
-#line 12061 "gram1.tab.c" /* yacc.c:1646  */
+#line 12005 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 929:
-#line 6682 "gram1.y" /* yacc.c:1646  */
+#line 6683 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_GROUP_DIR,(yyvsp[-3].symbol),(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 12067 "gram1.tab.c" /* yacc.c:1646  */
+#line 12011 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 930:
-#line 6686 "gram1.y" /* yacc.c:1646  */
+#line 6687 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_REDUCTION_START_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12073 "gram1.tab.c" /* yacc.c:1646  */
+#line 12017 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 931:
-#line 6690 "gram1.y" /* yacc.c:1646  */
+#line 6691 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_REDUCTION_WAIT_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12079 "gram1.tab.c" /* yacc.c:1646  */
+#line 12023 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 932:
-#line 6699 "gram1.y" /* yacc.c:1646  */
+#line 6700 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_CONSISTENT_START_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12085 "gram1.tab.c" /* yacc.c:1646  */
+#line 12029 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 933:
-#line 6703 "gram1.y" /* yacc.c:1646  */
+#line 6704 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_CONSISTENT_WAIT_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12091 "gram1.tab.c" /* yacc.c:1646  */
+#line 12035 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 934:
-#line 6707 "gram1.y" /* yacc.c:1646  */
+#line 6708 "gram1.y" /* yacc.c:1646  */
     { if(((yyvsp[-3].symbol)->attr & INDIRECT_BIT))
                 errstr("'%s' is not remote group name", (yyvsp[-3].symbol)->ident, 68);
            (yyval.bf_node) = get_bfnd(fi,DVM_REMOTE_ACCESS_DIR,(yyvsp[-3].symbol),(yyvsp[-1].ll_node),LLNULL,LLNULL);
          }
-#line 12100 "gram1.tab.c" /* yacc.c:1646  */
+#line 12044 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 935:
-#line 6712 "gram1.y" /* yacc.c:1646  */
+#line 6713 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_REMOTE_ACCESS_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 12106 "gram1.tab.c" /* yacc.c:1646  */
+#line 12050 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 936:
-#line 6716 "gram1.y" /* yacc.c:1646  */
+#line 6717 "gram1.y" /* yacc.c:1646  */
     {  
             if(((yyval.symbol)=(yyvsp[0].hash_entry)->id_attr) == SMNULL){
                 errstr("'%s' is not declared as group", (yyvsp[0].hash_entry)->ident, 74);
@@ -12116,80 +12060,80 @@ yyreduce:
                 errstr("'%s' is not declared as group", (yyvsp[0].hash_entry)->ident, 74);
             }
           }
-#line 12120 "gram1.tab.c" /* yacc.c:1646  */
+#line 12064 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 937:
-#line 6728 "gram1.y" /* yacc.c:1646  */
+#line 6729 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12126 "gram1.tab.c" /* yacc.c:1646  */
+#line 12070 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 938:
-#line 6730 "gram1.y" /* yacc.c:1646  */
+#line 6731 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12132 "gram1.tab.c" /* yacc.c:1646  */
+#line 12076 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 939:
-#line 6734 "gram1.y" /* yacc.c:1646  */
+#line 6735 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = (yyvsp[-3].ll_node);
               (yyval.ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
             }
-#line 12141 "gram1.tab.c" /* yacc.c:1646  */
+#line 12085 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 940:
-#line 6739 "gram1.y" /* yacc.c:1646  */
+#line 6740 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12147 "gram1.tab.c" /* yacc.c:1646  */
+#line 12091 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 941:
-#line 6743 "gram1.y" /* yacc.c:1646  */
+#line 6744 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12153 "gram1.tab.c" /* yacc.c:1646  */
+#line 12097 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 942:
-#line 6745 "gram1.y" /* yacc.c:1646  */
+#line 6746 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12159 "gram1.tab.c" /* yacc.c:1646  */
+#line 12103 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 943:
-#line 6749 "gram1.y" /* yacc.c:1646  */
+#line 6750 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12165 "gram1.tab.c" /* yacc.c:1646  */
+#line 12109 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 944:
-#line 6751 "gram1.y" /* yacc.c:1646  */
+#line 6752 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL);}
-#line 12171 "gram1.tab.c" /* yacc.c:1646  */
+#line 12115 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 945:
-#line 6755 "gram1.y" /* yacc.c:1646  */
+#line 6756 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q;
              q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
              (yyval.bf_node) = get_bfnd(fi,DVM_TASK_DIR,SMNULL,q,LLNULL,LLNULL);
           }
-#line 12180 "gram1.tab.c" /* yacc.c:1646  */
+#line 12124 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 946:
-#line 6760 "gram1.y" /* yacc.c:1646  */
+#line 6761 "gram1.y" /* yacc.c:1646  */
     {   PTR_LLND q;
               q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
 	      add_to_lowLevelList(q, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
           }
-#line 12189 "gram1.tab.c" /* yacc.c:1646  */
+#line 12133 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 947:
-#line 6767 "gram1.y" /* yacc.c:1646  */
+#line 6768 "gram1.y" /* yacc.c:1646  */
     { 
              PTR_SYMB s;
 	      s = make_array((yyvsp[-1].hash_entry), global_int, (yyvsp[0].ll_node), ndim, LOCAL);
@@ -12210,41 +12154,41 @@ yyreduce:
     
 	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);	  
 	    }
-#line 12214 "gram1.tab.c" /* yacc.c:1646  */
+#line 12158 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 948:
-#line 6790 "gram1.y" /* yacc.c:1646  */
+#line 6791 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12220 "gram1.tab.c" /* yacc.c:1646  */
+#line 12164 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 949:
-#line 6792 "gram1.y" /* yacc.c:1646  */
+#line 6793 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[-1].symbol),(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12226 "gram1.tab.c" /* yacc.c:1646  */
+#line 12170 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 950:
-#line 6794 "gram1.y" /* yacc.c:1646  */
+#line 6795 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[-1].symbol),LLNULL,(yyvsp[0].ll_node),LLNULL);}
-#line 12232 "gram1.tab.c" /* yacc.c:1646  */
+#line 12176 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 951:
-#line 6796 "gram1.y" /* yacc.c:1646  */
+#line 6797 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[-2].symbol),(yyvsp[-1].ll_node),(yyvsp[0].ll_node),LLNULL);}
-#line 12238 "gram1.tab.c" /* yacc.c:1646  */
+#line 12182 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 952:
-#line 6798 "gram1.y" /* yacc.c:1646  */
+#line 6799 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[-2].symbol),(yyvsp[0].ll_node),(yyvsp[-1].ll_node),LLNULL);}
-#line 12244 "gram1.tab.c" /* yacc.c:1646  */
+#line 12188 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 953:
-#line 6802 "gram1.y" /* yacc.c:1646  */
+#line 6803 "gram1.y" /* yacc.c:1646  */
     { PTR_SYMB s;
               if((s=(yyvsp[0].hash_entry)->id_attr) == SMNULL)
                 s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
@@ -12253,17 +12197,17 @@ yyreduce:
                  errstr("'%s' is not task array", s->ident, 77);
               (yyval.symbol) = s;
               }
-#line 12257 "gram1.tab.c" /* yacc.c:1646  */
+#line 12201 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 954:
-#line 6813 "gram1.y" /* yacc.c:1646  */
+#line 6814 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_END_TASK_REGION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12263 "gram1.tab.c" /* yacc.c:1646  */
+#line 12207 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 955:
-#line 6817 "gram1.y" /* yacc.c:1646  */
+#line 6818 "gram1.y" /* yacc.c:1646  */
     {  PTR_SYMB s;
               PTR_LLND q;
              /*
@@ -12278,46 +12222,46 @@ yyreduce:
               q =  set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
 	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, q, LLNULL, s);
 	   }
-#line 12282 "gram1.tab.c" /* yacc.c:1646  */
+#line 12226 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 956:
-#line 6832 "gram1.y" /* yacc.c:1646  */
+#line 6833 "gram1.y" /* yacc.c:1646  */
     {  PTR_LLND q; 
               q =  set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
 	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, q, LLNULL, (yyvsp[-3].symbol));
 	   }
-#line 12291 "gram1.tab.c" /* yacc.c:1646  */
+#line 12235 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 957:
-#line 6839 "gram1.y" /* yacc.c:1646  */
+#line 6840 "gram1.y" /* yacc.c:1646  */
     {              
          (yyval.bf_node) = get_bfnd(fi,DVM_ON_DIR,SMNULL,(yyvsp[-1].ll_node),(yyvsp[0].ll_node),LLNULL);
     }
-#line 12299 "gram1.tab.c" /* yacc.c:1646  */
+#line 12243 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 958:
-#line 6845 "gram1.y" /* yacc.c:1646  */
+#line 6846 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = LLNULL;}
-#line 12305 "gram1.tab.c" /* yacc.c:1646  */
+#line 12249 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 959:
-#line 6847 "gram1.y" /* yacc.c:1646  */
+#line 6848 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12311 "gram1.tab.c" /* yacc.c:1646  */
+#line 12255 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 960:
-#line 6851 "gram1.y" /* yacc.c:1646  */
+#line 6852 "gram1.y" /* yacc.c:1646  */
     {(yyval.bf_node) = get_bfnd(fi,DVM_END_ON_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12317 "gram1.tab.c" /* yacc.c:1646  */
+#line 12261 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 961:
-#line 6855 "gram1.y" /* yacc.c:1646  */
+#line 6856 "gram1.y" /* yacc.c:1646  */
     { PTR_LLND q;
         /* if(!($6->attr & PROCESSORS_BIT))
            errstr("'%s' is not processor array", $6->ident, 67);
@@ -12325,116 +12269,116 @@ yyreduce:
         q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, (yyvsp[-1].symbol));
         (yyval.bf_node) = get_bfnd(fi,DVM_MAP_DIR,SMNULL,(yyvsp[-4].ll_node),q,LLNULL);
       }
-#line 12329 "gram1.tab.c" /* yacc.c:1646  */
+#line 12273 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 962:
-#line 6863 "gram1.y" /* yacc.c:1646  */
+#line 6864 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_MAP_DIR,SMNULL,(yyvsp[-3].ll_node),LLNULL,(yyvsp[0].ll_node)); }
-#line 12335 "gram1.tab.c" /* yacc.c:1646  */
+#line 12279 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 963:
-#line 6867 "gram1.y" /* yacc.c:1646  */
+#line 6868 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_PREFETCH_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12341 "gram1.tab.c" /* yacc.c:1646  */
+#line 12285 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 964:
-#line 6871 "gram1.y" /* yacc.c:1646  */
+#line 6872 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_RESET_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12347 "gram1.tab.c" /* yacc.c:1646  */
+#line 12291 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 965:
-#line 6879 "gram1.y" /* yacc.c:1646  */
+#line 6880 "gram1.y" /* yacc.c:1646  */
     { if(!((yyvsp[-3].symbol)->attr & INDIRECT_BIT))
                          errstr("'%s' is not indirect group name", (yyvsp[-3].symbol)->ident, 313);
                       (yyval.bf_node) = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,(yyvsp[-3].symbol),(yyvsp[-1].ll_node),LLNULL,LLNULL);
                     }
-#line 12356 "gram1.tab.c" /* yacc.c:1646  */
+#line 12300 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 966:
-#line 6884 "gram1.y" /* yacc.c:1646  */
+#line 6885 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 12362 "gram1.tab.c" /* yacc.c:1646  */
+#line 12306 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 967:
-#line 6898 "gram1.y" /* yacc.c:1646  */
+#line 6899 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12368 "gram1.tab.c" /* yacc.c:1646  */
+#line 12312 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 968:
-#line 6900 "gram1.y" /* yacc.c:1646  */
+#line 6901 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12374 "gram1.tab.c" /* yacc.c:1646  */
+#line 12318 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 969:
-#line 6904 "gram1.y" /* yacc.c:1646  */
+#line 6905 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12380 "gram1.tab.c" /* yacc.c:1646  */
+#line 12324 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 970:
-#line 6906 "gram1.y" /* yacc.c:1646  */
+#line 6907 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[-3].ll_node); (yyval.ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);}
-#line 12386 "gram1.tab.c" /* yacc.c:1646  */
+#line 12330 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 971:
-#line 6915 "gram1.y" /* yacc.c:1646  */
+#line 6916 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12392 "gram1.tab.c" /* yacc.c:1646  */
+#line 12336 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 972:
-#line 6917 "gram1.y" /* yacc.c:1646  */
+#line 6918 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 12398 "gram1.tab.c" /* yacc.c:1646  */
+#line 12342 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 973:
-#line 6919 "gram1.y" /* yacc.c:1646  */
+#line 6920 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, LLNULL, (yyvsp[0].ll_node), LLNULL);}
-#line 12404 "gram1.tab.c" /* yacc.c:1646  */
+#line 12348 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 974:
-#line 6921 "gram1.y" /* yacc.c:1646  */
+#line 6922 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, (yyvsp[-1].ll_node), (yyvsp[0].ll_node),LLNULL);}
-#line 12410 "gram1.tab.c" /* yacc.c:1646  */
+#line 12354 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 975:
-#line 6957 "gram1.y" /* yacc.c:1646  */
+#line 6958 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi,REDUCTION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 12416 "gram1.tab.c" /* yacc.c:1646  */
+#line 12360 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 976:
-#line 6961 "gram1.y" /* yacc.c:1646  */
+#line 6962 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_ASYNCHRONOUS_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12422 "gram1.tab.c" /* yacc.c:1646  */
+#line 12366 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 977:
-#line 6965 "gram1.y" /* yacc.c:1646  */
+#line 6966 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_ENDASYNCHRONOUS_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12428 "gram1.tab.c" /* yacc.c:1646  */
+#line 12372 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 978:
-#line 6969 "gram1.y" /* yacc.c:1646  */
+#line 6970 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_ASYNCWAIT_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12434 "gram1.tab.c" /* yacc.c:1646  */
+#line 12378 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 979:
-#line 6973 "gram1.y" /* yacc.c:1646  */
+#line 6974 "gram1.y" /* yacc.c:1646  */
     {  
             if(((yyval.symbol)=(yyvsp[0].hash_entry)->id_attr) == SMNULL) {
                 errstr("'%s' is not declared as ASYNCID", (yyvsp[0].hash_entry)->ident, 115);
@@ -12444,180 +12388,180 @@ yyreduce:
                 errstr("'%s' is not declared as ASYNCID", (yyvsp[0].hash_entry)->ident, 115);
             }
      }
-#line 12448 "gram1.tab.c" /* yacc.c:1646  */
+#line 12392 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 980:
-#line 6985 "gram1.y" /* yacc.c:1646  */
+#line 6986 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));}
-#line 12454 "gram1.tab.c" /* yacc.c:1646  */
+#line 12398 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 981:
-#line 6987 "gram1.y" /* yacc.c:1646  */
+#line 6988 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-3].symbol));}
-#line 12460 "gram1.tab.c" /* yacc.c:1646  */
+#line 12404 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 982:
-#line 6991 "gram1.y" /* yacc.c:1646  */
+#line 6992 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_F90_DIR,SMNULL,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),LLNULL);}
-#line 12466 "gram1.tab.c" /* yacc.c:1646  */
+#line 12410 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 983:
-#line 6994 "gram1.y" /* yacc.c:1646  */
+#line 6995 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_DEBUG_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12472 "gram1.tab.c" /* yacc.c:1646  */
+#line 12416 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 984:
-#line 6996 "gram1.y" /* yacc.c:1646  */
+#line 6997 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_DEBUG_DIR,SMNULL,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),LLNULL);}
-#line 12478 "gram1.tab.c" /* yacc.c:1646  */
+#line 12422 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 985:
-#line 7000 "gram1.y" /* yacc.c:1646  */
+#line 7001 "gram1.y" /* yacc.c:1646  */
     { 
               (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);
               endioctl();
             }
-#line 12487 "gram1.tab.c" /* yacc.c:1646  */
+#line 12431 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 986:
-#line 7005 "gram1.y" /* yacc.c:1646  */
+#line 7006 "gram1.y" /* yacc.c:1646  */
     { 
               (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST);
               endioctl();
             }
-#line 12496 "gram1.tab.c" /* yacc.c:1646  */
+#line 12440 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 987:
-#line 7012 "gram1.y" /* yacc.c:1646  */
+#line 7013 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node)  = make_llnd(fi, KEYWORD_ARG, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 12502 "gram1.tab.c" /* yacc.c:1646  */
+#line 12446 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 988:
-#line 7015 "gram1.y" /* yacc.c:1646  */
+#line 7016 "gram1.y" /* yacc.c:1646  */
     {
 	         (yyval.ll_node) = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
 	         (yyval.ll_node)->entry.ival = atoi(yytext);
 	         (yyval.ll_node)->type = global_int;
 	        }
-#line 12512 "gram1.tab.c" /* yacc.c:1646  */
+#line 12456 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 989:
-#line 7023 "gram1.y" /* yacc.c:1646  */
+#line 7024 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_ENDDEBUG_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12518 "gram1.tab.c" /* yacc.c:1646  */
+#line 12462 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 990:
-#line 7027 "gram1.y" /* yacc.c:1646  */
+#line 7028 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_INTERVAL_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12524 "gram1.tab.c" /* yacc.c:1646  */
+#line 12468 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 991:
-#line 7031 "gram1.y" /* yacc.c:1646  */
+#line 7032 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL;}
-#line 12530 "gram1.tab.c" /* yacc.c:1646  */
+#line 12474 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 992:
-#line 7034 "gram1.y" /* yacc.c:1646  */
+#line 7035 "gram1.y" /* yacc.c:1646  */
     { if((yyvsp[0].ll_node)->type->variant != T_INT)             
                     err("Illegal interval number", 78);
                   (yyval.ll_node) = (yyvsp[0].ll_node);
                  }
-#line 12539 "gram1.tab.c" /* yacc.c:1646  */
+#line 12483 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 993:
-#line 7042 "gram1.y" /* yacc.c:1646  */
+#line 7043 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_EXIT_INTERVAL_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12545 "gram1.tab.c" /* yacc.c:1646  */
+#line 12489 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 994:
-#line 7046 "gram1.y" /* yacc.c:1646  */
+#line 7047 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_ENDINTERVAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12551 "gram1.tab.c" /* yacc.c:1646  */
+#line 12495 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 995:
-#line 7050 "gram1.y" /* yacc.c:1646  */
+#line 7051 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_TRACEON_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12557 "gram1.tab.c" /* yacc.c:1646  */
+#line 12501 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 996:
-#line 7054 "gram1.y" /* yacc.c:1646  */
+#line 7055 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_TRACEOFF_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12563 "gram1.tab.c" /* yacc.c:1646  */
+#line 12507 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 997:
-#line 7058 "gram1.y" /* yacc.c:1646  */
+#line 7059 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_BARRIER_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12569 "gram1.tab.c" /* yacc.c:1646  */
+#line 12513 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 998:
-#line 7062 "gram1.y" /* yacc.c:1646  */
+#line 7063 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_CHECK_DIR,SMNULL,(yyvsp[0].ll_node),(yyvsp[-4].ll_node),LLNULL); }
-#line 12575 "gram1.tab.c" /* yacc.c:1646  */
+#line 12519 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 999:
-#line 7066 "gram1.y" /* yacc.c:1646  */
+#line 7067 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_IO_MODE_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 12581 "gram1.tab.c" /* yacc.c:1646  */
+#line 12525 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1000:
-#line 7069 "gram1.y" /* yacc.c:1646  */
+#line 7070 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12587 "gram1.tab.c" /* yacc.c:1646  */
+#line 12531 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1001:
-#line 7071 "gram1.y" /* yacc.c:1646  */
+#line 7072 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12593 "gram1.tab.c" /* yacc.c:1646  */
+#line 12537 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1002:
-#line 7075 "gram1.y" /* yacc.c:1646  */
+#line 7076 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);}
-#line 12599 "gram1.tab.c" /* yacc.c:1646  */
+#line 12543 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1003:
-#line 7077 "gram1.y" /* yacc.c:1646  */
+#line 7078 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_LOCAL_OP, LLNULL,LLNULL,SMNULL);}
-#line 12605 "gram1.tab.c" /* yacc.c:1646  */
+#line 12549 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1004:
-#line 7079 "gram1.y" /* yacc.c:1646  */
+#line 7080 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,PARALLEL_OP, LLNULL,LLNULL,SMNULL);}
-#line 12611 "gram1.tab.c" /* yacc.c:1646  */
+#line 12555 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1005:
-#line 7083 "gram1.y" /* yacc.c:1646  */
+#line 7084 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_ADD_DIR,SMNULL,(yyvsp[-5].ll_node),(yyvsp[-3].ll_node),(yyvsp[0].ll_node)); }
-#line 12617 "gram1.tab.c" /* yacc.c:1646  */
+#line 12561 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1006:
-#line 7087 "gram1.y" /* yacc.c:1646  */
+#line 7088 "gram1.y" /* yacc.c:1646  */
     {
                  if((yyvsp[-3].ll_node)->type->variant != T_ARRAY) 
                     errstr("'%s' isn't array", (yyvsp[-3].ll_node)->entry.Template.symbol->ident, 66);
@@ -12627,63 +12571,63 @@ yyreduce:
                  (yyval.ll_node) = (yyvsp[-3].ll_node);
                  /*$$->type = $1->type->entry.ar_decl.base_type;*/
                }
-#line 12631 "gram1.tab.c" /* yacc.c:1646  */
+#line 12575 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1007:
-#line 7099 "gram1.y" /* yacc.c:1646  */
+#line 7100 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12637 "gram1.tab.c" /* yacc.c:1646  */
+#line 12581 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1008:
-#line 7101 "gram1.y" /* yacc.c:1646  */
+#line 7102 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12643 "gram1.tab.c" /* yacc.c:1646  */
+#line 12587 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1009:
-#line 7105 "gram1.y" /* yacc.c:1646  */
+#line 7106 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 12649 "gram1.tab.c" /* yacc.c:1646  */
+#line 12593 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1010:
-#line 7107 "gram1.y" /* yacc.c:1646  */
+#line 7108 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 12655 "gram1.tab.c" /* yacc.c:1646  */
+#line 12599 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1011:
-#line 7111 "gram1.y" /* yacc.c:1646  */
+#line 7112 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12661 "gram1.tab.c" /* yacc.c:1646  */
+#line 12605 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1012:
-#line 7113 "gram1.y" /* yacc.c:1646  */
+#line 7114 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; opt_kwd_ = NO;}
-#line 12667 "gram1.tab.c" /* yacc.c:1646  */
+#line 12611 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1013:
-#line 7117 "gram1.y" /* yacc.c:1646  */
+#line 7118 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_LOCALIZE_DIR,SMNULL,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),LLNULL); }
-#line 12673 "gram1.tab.c" /* yacc.c:1646  */
+#line 12617 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1014:
-#line 7121 "gram1.y" /* yacc.c:1646  */
+#line 7122 "gram1.y" /* yacc.c:1646  */
     {
                  if((yyvsp[0].ll_node)->type->variant != T_ARRAY) 
                     errstr("'%s' isn't array", (yyvsp[0].ll_node)->entry.Template.symbol->ident, 66); 
                  (yyval.ll_node) = (yyvsp[0].ll_node);
                 }
-#line 12683 "gram1.tab.c" /* yacc.c:1646  */
+#line 12627 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1015:
-#line 7127 "gram1.y" /* yacc.c:1646  */
+#line 7128 "gram1.y" /* yacc.c:1646  */
     {
                  if((yyvsp[-3].ll_node)->type->variant != T_ARRAY) 
                     errstr("'%s' isn't array", (yyvsp[-3].ll_node)->entry.Template.symbol->ident, 66); 
@@ -12692,45 +12636,45 @@ yyreduce:
                  (yyval.ll_node) = (yyvsp[-3].ll_node);
                  (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type->entry.ar_decl.base_type;
                 }
-#line 12696 "gram1.tab.c" /* yacc.c:1646  */
+#line 12640 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1016:
-#line 7139 "gram1.y" /* yacc.c:1646  */
+#line 7140 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12702 "gram1.tab.c" /* yacc.c:1646  */
+#line 12646 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1017:
-#line 7141 "gram1.y" /* yacc.c:1646  */
+#line 7142 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12708 "gram1.tab.c" /* yacc.c:1646  */
+#line 12652 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1018:
-#line 7145 "gram1.y" /* yacc.c:1646  */
+#line 7146 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 12714 "gram1.tab.c" /* yacc.c:1646  */
+#line 12658 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1019:
-#line 7147 "gram1.y" /* yacc.c:1646  */
+#line 7148 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL);}
-#line 12720 "gram1.tab.c" /* yacc.c:1646  */
+#line 12664 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1020:
-#line 7151 "gram1.y" /* yacc.c:1646  */
+#line 7152 "gram1.y" /* yacc.c:1646  */
     { 
             (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
             (yyval.ll_node)->entry.string_val = (char *) "*";
             (yyval.ll_node)->type = global_string;
           }
-#line 12730 "gram1.tab.c" /* yacc.c:1646  */
+#line 12674 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1021:
-#line 7159 "gram1.y" /* yacc.c:1646  */
+#line 7160 "gram1.y" /* yacc.c:1646  */
     { 
                 PTR_LLND q;
                 if((yyvsp[0].ll_node))
@@ -12739,425 +12683,425 @@ yyreduce:
                   q = (yyvsp[-2].ll_node);                  
                 (yyval.bf_node) = get_bfnd(fi,DVM_CP_CREATE_DIR,SMNULL,(yyvsp[-13].ll_node),(yyvsp[-8].ll_node),q); 
               }
-#line 12743 "gram1.tab.c" /* yacc.c:1646  */
+#line 12687 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1022:
-#line 7170 "gram1.y" /* yacc.c:1646  */
+#line 7171 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL; }
-#line 12749 "gram1.tab.c" /* yacc.c:1646  */
+#line 12693 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1023:
-#line 7172 "gram1.y" /* yacc.c:1646  */
+#line 7173 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi, PARALLEL_OP, LLNULL, LLNULL, SMNULL); }
-#line 12755 "gram1.tab.c" /* yacc.c:1646  */
+#line 12699 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1024:
-#line 7174 "gram1.y" /* yacc.c:1646  */
+#line 7175 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_LOCAL_OP, LLNULL, LLNULL, SMNULL); }
-#line 12761 "gram1.tab.c" /* yacc.c:1646  */
+#line 12705 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1025:
-#line 7178 "gram1.y" /* yacc.c:1646  */
+#line 7179 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_CP_LOAD_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL); }
-#line 12767 "gram1.tab.c" /* yacc.c:1646  */
+#line 12711 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1026:
-#line 7182 "gram1.y" /* yacc.c:1646  */
+#line 7183 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_CP_SAVE_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL); }
-#line 12773 "gram1.tab.c" /* yacc.c:1646  */
+#line 12717 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1027:
-#line 7184 "gram1.y" /* yacc.c:1646  */
+#line 7185 "gram1.y" /* yacc.c:1646  */
     {
                 PTR_LLND q;
                 q = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);
                 (yyval.bf_node) = get_bfnd(fi,DVM_CP_SAVE_DIR,SMNULL,(yyvsp[-3].ll_node),q,LLNULL);
               }
-#line 12783 "gram1.tab.c" /* yacc.c:1646  */
+#line 12727 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1028:
-#line 7192 "gram1.y" /* yacc.c:1646  */
+#line 7193 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_CP_WAIT_DIR,SMNULL,(yyvsp[-6].ll_node),(yyvsp[-1].ll_node),LLNULL); }
-#line 12789 "gram1.tab.c" /* yacc.c:1646  */
+#line 12733 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1029:
-#line 7196 "gram1.y" /* yacc.c:1646  */
+#line 7197 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_TEMPLATE_CREATE_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL); }
-#line 12795 "gram1.tab.c" /* yacc.c:1646  */
+#line 12739 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1030:
-#line 7199 "gram1.y" /* yacc.c:1646  */
+#line 7200 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 12801 "gram1.tab.c" /* yacc.c:1646  */
+#line 12745 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1031:
-#line 7201 "gram1.y" /* yacc.c:1646  */
+#line 7202 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 12807 "gram1.tab.c" /* yacc.c:1646  */
+#line 12751 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1032:
-#line 7205 "gram1.y" /* yacc.c:1646  */
+#line 7206 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,DVM_TEMPLATE_DELETE_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL); }
-#line 12813 "gram1.tab.c" /* yacc.c:1646  */
+#line 12757 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1060:
-#line 7239 "gram1.y" /* yacc.c:1646  */
+#line 7240 "gram1.y" /* yacc.c:1646  */
     {
           (yyval.bf_node) = get_bfnd(fi,OMP_ONETHREAD_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
 	}
-#line 12821 "gram1.tab.c" /* yacc.c:1646  */
+#line 12765 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1061:
-#line 7245 "gram1.y" /* yacc.c:1646  */
+#line 7246 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_endparallel();
 	}
-#line 12829 "gram1.tab.c" /* yacc.c:1646  */
+#line 12773 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1062:
-#line 7251 "gram1.y" /* yacc.c:1646  */
+#line 7252 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_parallel();
            (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
 	   opt_kwd_ = NO;
 	}
-#line 12839 "gram1.tab.c" /* yacc.c:1646  */
+#line 12783 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1063:
-#line 7257 "gram1.y" /* yacc.c:1646  */
+#line 7258 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_parallel();
 	   opt_kwd_ = NO;
 	}
-#line 12848 "gram1.tab.c" /* yacc.c:1646  */
+#line 12792 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1064:
-#line 7263 "gram1.y" /* yacc.c:1646  */
+#line 7264 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
 	}
+#line 12800 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1065:
+#line 7268 "gram1.y" /* yacc.c:1646  */
+    { 
+		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);	
+	}
+#line 12808 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1075:
+#line 7285 "gram1.y" /* yacc.c:1646  */
+    {
+		(yyval.ll_node) = (yyvsp[-1].ll_node);
+        }
+#line 12816 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1076:
+#line 7290 "gram1.y" /* yacc.c:1646  */
+    {
+		(yyval.ll_node) = make_llnd(fi,OMP_PRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
+	}
+#line 12824 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1077:
+#line 7295 "gram1.y" /* yacc.c:1646  */
+    {
+		(yyval.ll_node) = make_llnd(fi,OMP_FIRSTPRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
+	}
+#line 12832 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1078:
+#line 7301 "gram1.y" /* yacc.c:1646  */
+    {
+		(yyval.ll_node) = make_llnd(fi,OMP_LASTPRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
+	}
+#line 12840 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1079:
+#line 7307 "gram1.y" /* yacc.c:1646  */
+    {
+		(yyval.ll_node) = make_llnd(fi,OMP_COPYIN,(yyvsp[0].ll_node),LLNULL,SMNULL);
+	}
+#line 12848 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1080:
+#line 7313 "gram1.y" /* yacc.c:1646  */
+    {
+		(yyval.ll_node) = make_llnd(fi,OMP_SHARED,(yyvsp[0].ll_node),LLNULL,SMNULL);
+	}
 #line 12856 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
-  case 1065:
-#line 7267 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);	
+  case 1081:
+#line 7318 "gram1.y" /* yacc.c:1646  */
+    {
+		(yyval.ll_node) = make_llnd(fi,OMP_DEFAULT,(yyvsp[-1].ll_node),LLNULL,SMNULL);
 	}
 #line 12864 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
-  case 1075:
-#line 7284 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = (yyvsp[-1].ll_node);
-        }
-#line 12872 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1076:
-#line 7289 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_PRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12880 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1077:
-#line 7294 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_FIRSTPRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12888 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1078:
-#line 7300 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_LASTPRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12896 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1079:
-#line 7306 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_COPYIN,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12904 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1080:
-#line 7312 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_SHARED,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12912 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1081:
-#line 7317 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_DEFAULT,(yyvsp[-1].ll_node),LLNULL,SMNULL);
-	}
-#line 12920 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
   case 1082:
-#line 7323 "gram1.y" /* yacc.c:1646  */
+#line 7324 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
 		(yyval.ll_node)->entry.string_val = (char *) "private";
 		(yyval.ll_node)->type = global_string;
 	}
-#line 12930 "gram1.tab.c" /* yacc.c:1646  */
+#line 12874 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1083:
-#line 7329 "gram1.y" /* yacc.c:1646  */
+#line 7330 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
 		(yyval.ll_node)->entry.string_val = (char *) "shared";
 		(yyval.ll_node)->type = global_string;
 	}
-#line 12940 "gram1.tab.c" /* yacc.c:1646  */
+#line 12884 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1084:
-#line 7335 "gram1.y" /* yacc.c:1646  */
+#line 7336 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
 		(yyval.ll_node)->entry.string_val = (char *) "none";
 		(yyval.ll_node)->type = global_string;
 	}
-#line 12950 "gram1.tab.c" /* yacc.c:1646  */
+#line 12894 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1085:
-#line 7342 "gram1.y" /* yacc.c:1646  */
+#line 7343 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,OMP_IF,(yyvsp[-1].ll_node),LLNULL,SMNULL);
 	}
-#line 12958 "gram1.tab.c" /* yacc.c:1646  */
+#line 12902 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1086:
-#line 7348 "gram1.y" /* yacc.c:1646  */
+#line 7349 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,OMP_NUM_THREADS,(yyvsp[-1].ll_node),LLNULL,SMNULL);
 	}
-#line 12966 "gram1.tab.c" /* yacc.c:1646  */
+#line 12910 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1087:
-#line 7354 "gram1.y" /* yacc.c:1646  */
+#line 7355 "gram1.y" /* yacc.c:1646  */
     {
 		PTR_LLND q;
 		q = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
 		(yyval.ll_node) = make_llnd(fi,OMP_REDUCTION,q,LLNULL,SMNULL);
 	}
-#line 12976 "gram1.tab.c" /* yacc.c:1646  */
+#line 12920 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1088:
-#line 7361 "gram1.y" /* yacc.c:1646  */
+#line 7362 "gram1.y" /* yacc.c:1646  */
     {(yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL);}
-#line 12982 "gram1.tab.c" /* yacc.c:1646  */
+#line 12926 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1090:
-#line 7367 "gram1.y" /* yacc.c:1646  */
+#line 7368 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "+";
               (yyval.ll_node)->type = global_string;
              }
-#line 12992 "gram1.tab.c" /* yacc.c:1646  */
+#line 12936 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1091:
-#line 7373 "gram1.y" /* yacc.c:1646  */
+#line 7374 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "-";
               (yyval.ll_node)->type = global_string;
              }
-#line 13002 "gram1.tab.c" /* yacc.c:1646  */
+#line 12946 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1092:
-#line 7380 "gram1.y" /* yacc.c:1646  */
+#line 7381 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "*";
               (yyval.ll_node)->type = global_string;
              }
-#line 13012 "gram1.tab.c" /* yacc.c:1646  */
+#line 12956 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1093:
-#line 7386 "gram1.y" /* yacc.c:1646  */
+#line 7387 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "/";
               (yyval.ll_node)->type = global_string;
              }
-#line 13022 "gram1.tab.c" /* yacc.c:1646  */
+#line 12966 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1094:
-#line 7392 "gram1.y" /* yacc.c:1646  */
+#line 7393 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "min";
               (yyval.ll_node)->type = global_string;
              }
-#line 13032 "gram1.tab.c" /* yacc.c:1646  */
+#line 12976 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1095:
-#line 7398 "gram1.y" /* yacc.c:1646  */
+#line 7399 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "max";
               (yyval.ll_node)->type = global_string;
              }
-#line 13042 "gram1.tab.c" /* yacc.c:1646  */
+#line 12986 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1096:
-#line 7404 "gram1.y" /* yacc.c:1646  */
+#line 7405 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) ".or.";
               (yyval.ll_node)->type = global_string;
              }
-#line 13052 "gram1.tab.c" /* yacc.c:1646  */
+#line 12996 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1097:
-#line 7410 "gram1.y" /* yacc.c:1646  */
+#line 7411 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) ".and.";
               (yyval.ll_node)->type = global_string;
              }
-#line 13062 "gram1.tab.c" /* yacc.c:1646  */
+#line 13006 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1098:
-#line 7416 "gram1.y" /* yacc.c:1646  */
+#line 7417 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) ".eqv.";
               (yyval.ll_node)->type = global_string;
              }
-#line 13072 "gram1.tab.c" /* yacc.c:1646  */
+#line 13016 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1099:
-#line 7422 "gram1.y" /* yacc.c:1646  */
+#line 7423 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) ".neqv.";
               (yyval.ll_node)->type = global_string;
              }
-#line 13082 "gram1.tab.c" /* yacc.c:1646  */
+#line 13026 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1100:
-#line 7428 "gram1.y" /* yacc.c:1646  */
+#line 7429 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "iand";
               (yyval.ll_node)->type = global_string;
              }
-#line 13092 "gram1.tab.c" /* yacc.c:1646  */
+#line 13036 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1101:
-#line 7434 "gram1.y" /* yacc.c:1646  */
+#line 7435 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "ieor";
               (yyval.ll_node)->type = global_string;
              }
-#line 13102 "gram1.tab.c" /* yacc.c:1646  */
+#line 13046 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1102:
-#line 7440 "gram1.y" /* yacc.c:1646  */
+#line 7441 "gram1.y" /* yacc.c:1646  */
     {
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "ior";
               (yyval.ll_node)->type = global_string;
              }
-#line 13112 "gram1.tab.c" /* yacc.c:1646  */
+#line 13056 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1103:
-#line 7446 "gram1.y" /* yacc.c:1646  */
+#line 7447 "gram1.y" /* yacc.c:1646  */
     { err("Illegal reduction operation name", 70);
                errcnt--;
               (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
               (yyval.ll_node)->entry.string_val = (char *) "unknown";
               (yyval.ll_node)->type = global_string;
              }
-#line 13123 "gram1.tab.c" /* yacc.c:1646  */
+#line 13067 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1104:
-#line 7456 "gram1.y" /* yacc.c:1646  */
+#line 7457 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_sections((yyvsp[0].ll_node));
 	   opt_kwd_ = NO;
 	}
-#line 13132 "gram1.tab.c" /* yacc.c:1646  */
+#line 13076 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1105:
-#line 7461 "gram1.y" /* yacc.c:1646  */
+#line 7462 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_sections(LLNULL);
 	   opt_kwd_ = NO;
 	}
-#line 13141 "gram1.tab.c" /* yacc.c:1646  */
+#line 13085 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1106:
-#line 7467 "gram1.y" /* yacc.c:1646  */
+#line 7468 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
 	}
-#line 13149 "gram1.tab.c" /* yacc.c:1646  */
+#line 13093 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1107:
-#line 7471 "gram1.y" /* yacc.c:1646  */
+#line 7472 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
 	}
-#line 13157 "gram1.tab.c" /* yacc.c:1646  */
+#line 13101 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1112:
-#line 7483 "gram1.y" /* yacc.c:1646  */
+#line 7484 "gram1.y" /* yacc.c:1646  */
     {
 		PTR_LLND q;
    	        (yyval.bf_node) = make_endsections();
@@ -13165,247 +13109,247 @@ yyreduce:
                 (yyval.bf_node)->entry.Template.ll_ptr1 = q;
                 opt_kwd_ = NO;
 	}
-#line 13169 "gram1.tab.c" /* yacc.c:1646  */
+#line 13113 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1113:
-#line 7491 "gram1.y" /* yacc.c:1646  */
+#line 7492 "gram1.y" /* yacc.c:1646  */
     {
    	        (yyval.bf_node) = make_endsections();
 	        opt_kwd_ = NO; 
 	}
-#line 13178 "gram1.tab.c" /* yacc.c:1646  */
+#line 13122 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1114:
-#line 7497 "gram1.y" /* yacc.c:1646  */
+#line 7498 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = make_ompsection();
 	}
-#line 13186 "gram1.tab.c" /* yacc.c:1646  */
+#line 13130 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1115:
-#line 7503 "gram1.y" /* yacc.c:1646  */
+#line 7504 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = get_bfnd(fi,OMP_DO_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
 	   opt_kwd_ = NO;
 	}
-#line 13195 "gram1.tab.c" /* yacc.c:1646  */
+#line 13139 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1116:
-#line 7508 "gram1.y" /* yacc.c:1646  */
+#line 7509 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = get_bfnd(fi,OMP_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
 	   opt_kwd_ = NO;
 	}
-#line 13204 "gram1.tab.c" /* yacc.c:1646  */
+#line 13148 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1117:
-#line 7514 "gram1.y" /* yacc.c:1646  */
+#line 7515 "gram1.y" /* yacc.c:1646  */
     {
 		PTR_LLND q;
 		q = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);
 	        (yyval.bf_node) = get_bfnd(fi,OMP_END_DO_DIR,SMNULL,q,LLNULL,LLNULL);
       	        opt_kwd_ = NO;
 	}
-#line 13215 "gram1.tab.c" /* yacc.c:1646  */
+#line 13159 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1118:
-#line 7521 "gram1.y" /* yacc.c:1646  */
+#line 7522 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = get_bfnd(fi,OMP_END_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
 	   opt_kwd_ = NO;
 	}
-#line 13224 "gram1.tab.c" /* yacc.c:1646  */
+#line 13168 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1119:
-#line 7527 "gram1.y" /* yacc.c:1646  */
+#line 7528 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
 	}
-#line 13232 "gram1.tab.c" /* yacc.c:1646  */
+#line 13176 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1120:
-#line 7531 "gram1.y" /* yacc.c:1646  */
+#line 7532 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
 	}
-#line 13240 "gram1.tab.c" /* yacc.c:1646  */
+#line 13184 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1127:
-#line 7545 "gram1.y" /* yacc.c:1646  */
+#line 7546 "gram1.y" /* yacc.c:1646  */
     {
 		/*$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
 		$$->entry.string_val = (char *) "ORDERED";
 		$$->type = global_string;*/
                 (yyval.ll_node) = make_llnd(fi,OMP_ORDERED,LLNULL,LLNULL,SMNULL);
 	}
-#line 13251 "gram1.tab.c" /* yacc.c:1646  */
+#line 13195 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1128:
-#line 7554 "gram1.y" /* yacc.c:1646  */
+#line 7555 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,OMP_SCHEDULE,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),SMNULL);
 	}
-#line 13259 "gram1.tab.c" /* yacc.c:1646  */
+#line 13203 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1129:
-#line 7558 "gram1.y" /* yacc.c:1646  */
+#line 7559 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,OMP_SCHEDULE,(yyvsp[-1].ll_node),LLNULL,SMNULL);
 	}
-#line 13267 "gram1.tab.c" /* yacc.c:1646  */
+#line 13211 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1130:
-#line 7564 "gram1.y" /* yacc.c:1646  */
+#line 7565 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
 		(yyval.ll_node)->entry.string_val = (char *) "STATIC";
 		(yyval.ll_node)->type = global_string;
 		
 	}
-#line 13278 "gram1.tab.c" /* yacc.c:1646  */
+#line 13222 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1131:
-#line 7571 "gram1.y" /* yacc.c:1646  */
+#line 7572 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
 		(yyval.ll_node)->entry.string_val = (char *) "DYNAMIC";
 		(yyval.ll_node)->type = global_string;
 		
 	}
-#line 13289 "gram1.tab.c" /* yacc.c:1646  */
+#line 13233 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1132:
-#line 7578 "gram1.y" /* yacc.c:1646  */
+#line 7579 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
 		(yyval.ll_node)->entry.string_val = (char *) "GUIDED";
 		(yyval.ll_node)->type = global_string;
 		
 	}
-#line 13300 "gram1.tab.c" /* yacc.c:1646  */
+#line 13244 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1133:
-#line 7585 "gram1.y" /* yacc.c:1646  */
+#line 7586 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
 		(yyval.ll_node)->entry.string_val = (char *) "RUNTIME";
 		(yyval.ll_node)->type = global_string;
 		
 	}
-#line 13311 "gram1.tab.c" /* yacc.c:1646  */
+#line 13255 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1134:
-#line 7594 "gram1.y" /* yacc.c:1646  */
+#line 7595 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_single();
            (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
 	   opt_kwd_ = NO;
 	}
-#line 13321 "gram1.tab.c" /* yacc.c:1646  */
+#line 13265 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1135:
-#line 7600 "gram1.y" /* yacc.c:1646  */
+#line 7601 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_single();
 	   opt_kwd_ = NO;
 	}
-#line 13330 "gram1.tab.c" /* yacc.c:1646  */
+#line 13274 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1136:
-#line 7606 "gram1.y" /* yacc.c:1646  */
+#line 7607 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
 	}
-#line 13338 "gram1.tab.c" /* yacc.c:1646  */
+#line 13282 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1137:
-#line 7610 "gram1.y" /* yacc.c:1646  */
+#line 7611 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
 	}
-#line 13346 "gram1.tab.c" /* yacc.c:1646  */
+#line 13290 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1140:
-#line 7620 "gram1.y" /* yacc.c:1646  */
+#line 7621 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_endsingle();
            (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
 	   opt_kwd_ = NO;
 	}
-#line 13356 "gram1.tab.c" /* yacc.c:1646  */
+#line 13300 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1141:
-#line 7626 "gram1.y" /* yacc.c:1646  */
+#line 7627 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_endsingle();
 	   opt_kwd_ = NO;
 	}
-#line 13365 "gram1.tab.c" /* yacc.c:1646  */
+#line 13309 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1142:
-#line 7632 "gram1.y" /* yacc.c:1646  */
+#line 7633 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
 	}
-#line 13373 "gram1.tab.c" /* yacc.c:1646  */
+#line 13317 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1143:
-#line 7636 "gram1.y" /* yacc.c:1646  */
+#line 7637 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
 	}
-#line 13381 "gram1.tab.c" /* yacc.c:1646  */
+#line 13325 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1146:
-#line 7647 "gram1.y" /* yacc.c:1646  */
+#line 7648 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,OMP_COPYPRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
 	}
-#line 13389 "gram1.tab.c" /* yacc.c:1646  */
+#line 13333 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1147:
-#line 7653 "gram1.y" /* yacc.c:1646  */
+#line 7654 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = make_llnd(fi,OMP_NOWAIT,LLNULL,LLNULL,SMNULL);
 	}
-#line 13397 "gram1.tab.c" /* yacc.c:1646  */
+#line 13341 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1148:
-#line 7659 "gram1.y" /* yacc.c:1646  */
+#line 7660 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = make_workshare();
 	}
-#line 13405 "gram1.tab.c" /* yacc.c:1646  */
+#line 13349 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1149:
-#line 7664 "gram1.y" /* yacc.c:1646  */
+#line 7665 "gram1.y" /* yacc.c:1646  */
     {
 		PTR_LLND q;
    	        (yyval.bf_node) = make_endworkshare();
@@ -13413,221 +13357,221 @@ yyreduce:
                 (yyval.bf_node)->entry.Template.ll_ptr1 = q;
   	        opt_kwd_ = NO;
 	}
-#line 13417 "gram1.tab.c" /* yacc.c:1646  */
+#line 13361 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1150:
-#line 7672 "gram1.y" /* yacc.c:1646  */
+#line 7673 "gram1.y" /* yacc.c:1646  */
     {
    	        (yyval.bf_node) = make_endworkshare();
                 opt_kwd_ = NO;
 	}
-#line 13426 "gram1.tab.c" /* yacc.c:1646  */
+#line 13370 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1151:
-#line 7678 "gram1.y" /* yacc.c:1646  */
+#line 7679 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = get_bfnd(fi,OMP_PARALLEL_DO_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
 	   opt_kwd_ = NO;
 	}
-#line 13435 "gram1.tab.c" /* yacc.c:1646  */
+#line 13379 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1152:
-#line 7683 "gram1.y" /* yacc.c:1646  */
+#line 7684 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = get_bfnd(fi,OMP_PARALLEL_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
 	   opt_kwd_ = NO;
 	}
-#line 13444 "gram1.tab.c" /* yacc.c:1646  */
+#line 13388 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1153:
-#line 7690 "gram1.y" /* yacc.c:1646  */
+#line 7691 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
 	}
-#line 13452 "gram1.tab.c" /* yacc.c:1646  */
+#line 13396 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1154:
-#line 7694 "gram1.y" /* yacc.c:1646  */
+#line 7695 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
 	}
-#line 13460 "gram1.tab.c" /* yacc.c:1646  */
+#line 13404 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1166:
-#line 7714 "gram1.y" /* yacc.c:1646  */
+#line 7715 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = get_bfnd(fi,OMP_END_PARALLEL_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
 	}
-#line 13468 "gram1.tab.c" /* yacc.c:1646  */
+#line 13412 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1167:
-#line 7719 "gram1.y" /* yacc.c:1646  */
+#line 7720 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = make_parallelsections((yyvsp[0].ll_node));
 	   opt_kwd_ = NO;
 	}
-#line 13477 "gram1.tab.c" /* yacc.c:1646  */
+#line 13421 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1168:
-#line 7724 "gram1.y" /* yacc.c:1646  */
+#line 7725 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = make_parallelsections(LLNULL);
 	   opt_kwd_ = NO;
 	}
-#line 13486 "gram1.tab.c" /* yacc.c:1646  */
+#line 13430 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1169:
-#line 7731 "gram1.y" /* yacc.c:1646  */
+#line 7732 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = make_endparallelsections();
 	}
-#line 13494 "gram1.tab.c" /* yacc.c:1646  */
+#line 13438 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1170:
-#line 7736 "gram1.y" /* yacc.c:1646  */
+#line 7737 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = make_parallelworkshare();
            (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
 	   opt_kwd_ = NO;
 	}
-#line 13504 "gram1.tab.c" /* yacc.c:1646  */
+#line 13448 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1171:
-#line 7742 "gram1.y" /* yacc.c:1646  */
+#line 7743 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = make_parallelworkshare();
 	   opt_kwd_ = NO;
 	}
-#line 13513 "gram1.tab.c" /* yacc.c:1646  */
+#line 13457 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1172:
-#line 7748 "gram1.y" /* yacc.c:1646  */
+#line 7749 "gram1.y" /* yacc.c:1646  */
     {
            (yyval.bf_node) = make_endparallelworkshare();
 	}
+#line 13465 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1173:
+#line 7754 "gram1.y" /* yacc.c:1646  */
+    { 
+	   (yyval.bf_node) = get_bfnd(fi,OMP_THREADPRIVATE_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
+	}
+#line 13473 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1174:
+#line 7759 "gram1.y" /* yacc.c:1646  */
+    {
+  	   (yyval.bf_node) = make_master();
+	}
+#line 13481 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1175:
+#line 7764 "gram1.y" /* yacc.c:1646  */
+    {
+  	   (yyval.bf_node) = make_endmaster();
+	}
+#line 13489 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1176:
+#line 7768 "gram1.y" /* yacc.c:1646  */
+    {
+  	   (yyval.bf_node) = make_ordered();
+	}
+#line 13497 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1177:
+#line 7773 "gram1.y" /* yacc.c:1646  */
+    {
+  	   (yyval.bf_node) = make_endordered();
+	}
+#line 13505 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1178:
+#line 7778 "gram1.y" /* yacc.c:1646  */
+    {
+           (yyval.bf_node) = get_bfnd(fi,OMP_BARRIER_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
+	}
+#line 13513 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1179:
+#line 7782 "gram1.y" /* yacc.c:1646  */
+    {
+           (yyval.bf_node) = get_bfnd(fi,OMP_ATOMIC_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
+	}
 #line 13521 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
-  case 1173:
-#line 7753 "gram1.y" /* yacc.c:1646  */
-    { 
-	   (yyval.bf_node) = get_bfnd(fi,OMP_THREADPRIVATE_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
+  case 1180:
+#line 7787 "gram1.y" /* yacc.c:1646  */
+    {
+           (yyval.bf_node) = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
 	}
 #line 13529 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
-  case 1174:
-#line 7758 "gram1.y" /* yacc.c:1646  */
+  case 1181:
+#line 7791 "gram1.y" /* yacc.c:1646  */
     {
-  	   (yyval.bf_node) = make_master();
+           (yyval.bf_node) = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
 	}
 #line 13537 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
-  case 1175:
-#line 7763 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_endmaster();
-	}
-#line 13545 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1176:
-#line 7767 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_ordered();
-	}
-#line 13553 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1177:
-#line 7772 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_endordered();
-	}
-#line 13561 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1178:
-#line 7777 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_BARRIER_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-#line 13569 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1179:
-#line 7781 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_ATOMIC_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-#line 13577 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1180:
-#line 7786 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
-	}
-#line 13585 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1181:
-#line 7790 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-#line 13593 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
   case 1182:
-#line 7796 "gram1.y" /* yacc.c:1646  */
+#line 7797 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_critical();
            (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
 	}
-#line 13602 "gram1.tab.c" /* yacc.c:1646  */
+#line 13546 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1183:
-#line 7801 "gram1.y" /* yacc.c:1646  */
+#line 7802 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_critical();
 	}
-#line 13610 "gram1.tab.c" /* yacc.c:1646  */
+#line 13554 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1184:
-#line 7807 "gram1.y" /* yacc.c:1646  */
+#line 7808 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_endcritical();
            (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
 	}
-#line 13619 "gram1.tab.c" /* yacc.c:1646  */
+#line 13563 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1185:
-#line 7812 "gram1.y" /* yacc.c:1646  */
+#line 7813 "gram1.y" /* yacc.c:1646  */
     {
   	   (yyval.bf_node) = make_endcritical();
 	}
-#line 13627 "gram1.tab.c" /* yacc.c:1646  */
+#line 13571 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1186:
-#line 7818 "gram1.y" /* yacc.c:1646  */
+#line 7819 "gram1.y" /* yacc.c:1646  */
     { 
 		PTR_SYMB s;
 		PTR_LLND l;
@@ -13635,253 +13579,253 @@ yyreduce:
 		l = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
 		(yyval.ll_node) = make_llnd(fi,OMP_THREADPRIVATE, l, LLNULL, SMNULL);
 	}
-#line 13639 "gram1.tab.c" /* yacc.c:1646  */
+#line 13583 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1187:
-#line 7828 "gram1.y" /* yacc.c:1646  */
+#line 7829 "gram1.y" /* yacc.c:1646  */
     {
 		(yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);
 	}
-#line 13647 "gram1.tab.c" /* yacc.c:1646  */
+#line 13591 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1188:
-#line 7832 "gram1.y" /* yacc.c:1646  */
+#line 7833 "gram1.y" /* yacc.c:1646  */
     {	
 		(yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);
 	}
-#line 13655 "gram1.tab.c" /* yacc.c:1646  */
+#line 13599 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1189:
-#line 7836 "gram1.y" /* yacc.c:1646  */
+#line 7837 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);
 	}
-#line 13663 "gram1.tab.c" /* yacc.c:1646  */
+#line 13607 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1190:
-#line 7840 "gram1.y" /* yacc.c:1646  */
+#line 7841 "gram1.y" /* yacc.c:1646  */
     { 
 		(yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);
 	}
-#line 13671 "gram1.tab.c" /* yacc.c:1646  */
+#line 13615 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1191:
-#line 7845 "gram1.y" /* yacc.c:1646  */
+#line 7846 "gram1.y" /* yacc.c:1646  */
     {
 		operator_slash = 1;
 	}
-#line 13679 "gram1.tab.c" /* yacc.c:1646  */
+#line 13623 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1192:
-#line 7848 "gram1.y" /* yacc.c:1646  */
+#line 7849 "gram1.y" /* yacc.c:1646  */
     {
 		operator_slash = 0;
 	}
-#line 13687 "gram1.tab.c" /* yacc.c:1646  */
+#line 13631 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1201:
-#line 7864 "gram1.y" /* yacc.c:1646  */
+#line 7865 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_REGION_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 13693 "gram1.tab.c" /* yacc.c:1646  */
+#line 13637 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1202:
-#line 7868 "gram1.y" /* yacc.c:1646  */
+#line 7869 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_CHECKSECTION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13699 "gram1.tab.c" /* yacc.c:1646  */
+#line 13643 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1203:
-#line 7872 "gram1.y" /* yacc.c:1646  */
+#line 7873 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13705 "gram1.tab.c" /* yacc.c:1646  */
+#line 13649 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1204:
-#line 7874 "gram1.y" /* yacc.c:1646  */
+#line 7875 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13711 "gram1.tab.c" /* yacc.c:1646  */
+#line 13655 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1205:
-#line 7876 "gram1.y" /* yacc.c:1646  */
+#line 7877 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13717 "gram1.tab.c" /* yacc.c:1646  */
+#line 13661 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1206:
-#line 7880 "gram1.y" /* yacc.c:1646  */
+#line 7881 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13723 "gram1.tab.c" /* yacc.c:1646  */
+#line 13667 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1207:
-#line 7882 "gram1.y" /* yacc.c:1646  */
+#line 7883 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13729 "gram1.tab.c" /* yacc.c:1646  */
+#line 13673 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1208:
-#line 7884 "gram1.y" /* yacc.c:1646  */
+#line 7885 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13735 "gram1.tab.c" /* yacc.c:1646  */
+#line 13679 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1209:
-#line 7888 "gram1.y" /* yacc.c:1646  */
+#line 7889 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = LLNULL;}
-#line 13741 "gram1.tab.c" /* yacc.c:1646  */
+#line 13685 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1210:
-#line 7890 "gram1.y" /* yacc.c:1646  */
+#line 7891 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 13747 "gram1.tab.c" /* yacc.c:1646  */
+#line 13691 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1211:
-#line 7894 "gram1.y" /* yacc.c:1646  */
+#line 7895 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 13753 "gram1.tab.c" /* yacc.c:1646  */
+#line 13697 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1212:
-#line 7896 "gram1.y" /* yacc.c:1646  */
+#line 7897 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 13759 "gram1.tab.c" /* yacc.c:1646  */
+#line 13703 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1213:
-#line 7900 "gram1.y" /* yacc.c:1646  */
+#line 7901 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13765 "gram1.tab.c" /* yacc.c:1646  */
+#line 13709 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1214:
-#line 7903 "gram1.y" /* yacc.c:1646  */
+#line 7904 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13771 "gram1.tab.c" /* yacc.c:1646  */
+#line 13715 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1215:
-#line 7906 "gram1.y" /* yacc.c:1646  */
+#line 7907 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13777 "gram1.tab.c" /* yacc.c:1646  */
+#line 13721 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1216:
-#line 7911 "gram1.y" /* yacc.c:1646  */
+#line 7912 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_INOUT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13783 "gram1.tab.c" /* yacc.c:1646  */
+#line 13727 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1217:
-#line 7913 "gram1.y" /* yacc.c:1646  */
+#line 7914 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_IN_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13789 "gram1.tab.c" /* yacc.c:1646  */
+#line 13733 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1218:
-#line 7915 "gram1.y" /* yacc.c:1646  */
+#line 7916 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_OUT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13795 "gram1.tab.c" /* yacc.c:1646  */
+#line 13739 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1219:
-#line 7917 "gram1.y" /* yacc.c:1646  */
+#line 7918 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_LOCAL_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13801 "gram1.tab.c" /* yacc.c:1646  */
+#line 13745 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1220:
-#line 7919 "gram1.y" /* yacc.c:1646  */
+#line 7920 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_INLOCAL_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13807 "gram1.tab.c" /* yacc.c:1646  */
+#line 13751 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1221:
-#line 7923 "gram1.y" /* yacc.c:1646  */
+#line 7924 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_TARGETS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13813 "gram1.tab.c" /* yacc.c:1646  */
+#line 13757 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1222:
-#line 7927 "gram1.y" /* yacc.c:1646  */
+#line 7928 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);}
-#line 13819 "gram1.tab.c" /* yacc.c:1646  */
+#line 13763 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1223:
-#line 7932 "gram1.y" /* yacc.c:1646  */
+#line 7933 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13825 "gram1.tab.c" /* yacc.c:1646  */
+#line 13769 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1224:
-#line 7936 "gram1.y" /* yacc.c:1646  */
+#line 7937 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 13831 "gram1.tab.c" /* yacc.c:1646  */
+#line 13775 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1225:
-#line 7938 "gram1.y" /* yacc.c:1646  */
+#line 7939 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 13837 "gram1.tab.c" /* yacc.c:1646  */
+#line 13781 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1226:
-#line 7942 "gram1.y" /* yacc.c:1646  */
+#line 7943 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_HOST_OP, LLNULL,LLNULL,SMNULL);}
-#line 13843 "gram1.tab.c" /* yacc.c:1646  */
+#line 13787 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1227:
-#line 7944 "gram1.y" /* yacc.c:1646  */
+#line 7945 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_CUDA_OP, LLNULL,LLNULL,SMNULL);}
-#line 13849 "gram1.tab.c" /* yacc.c:1646  */
+#line 13793 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1228:
-#line 7948 "gram1.y" /* yacc.c:1646  */
+#line 7949 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_END_REGION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13855 "gram1.tab.c" /* yacc.c:1646  */
+#line 13799 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1229:
-#line 7952 "gram1.y" /* yacc.c:1646  */
+#line 7953 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_END_CHECKSECTION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13861 "gram1.tab.c" /* yacc.c:1646  */
+#line 13805 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1230:
-#line 7956 "gram1.y" /* yacc.c:1646  */
+#line 7957 "gram1.y" /* yacc.c:1646  */
     {
 	      (yyval.bf_node) = get_bfnd(fi,ACC_DECLARE_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
            }
-#line 13869 "gram1.tab.c" /* yacc.c:1646  */
+#line 13813 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1231:
-#line 7961 "gram1.y" /* yacc.c:1646  */
+#line 7962 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 13875 "gram1.tab.c" /* yacc.c:1646  */
+#line 13819 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1232:
-#line 7963 "gram1.y" /* yacc.c:1646  */
+#line 7964 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 13881 "gram1.tab.c" /* yacc.c:1646  */
+#line 13825 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1233:
-#line 7967 "gram1.y" /* yacc.c:1646  */
+#line 7968 "gram1.y" /* yacc.c:1646  */
     {
               PTR_SYMB s;
               s = make_scalar((yyvsp[0].hash_entry),TYNULL,LOCAL);
@@ -13889,406 +13833,418 @@ yyreduce:
                 errstr("Inconsistent declaration of identifier  %s", s->ident, 16);	
 	      (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s); 
            }
-#line 13893 "gram1.tab.c" /* yacc.c:1646  */
+#line 13837 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1234:
-#line 7977 "gram1.y" /* yacc.c:1646  */
+#line 7978 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,ACC_ROUTINE_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 13899 "gram1.tab.c" /* yacc.c:1646  */
+#line 13843 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1235:
-#line 7981 "gram1.y" /* yacc.c:1646  */
+#line 7982 "gram1.y" /* yacc.c:1646  */
     {  (yyval.ll_node) = LLNULL;}
-#line 13905 "gram1.tab.c" /* yacc.c:1646  */
+#line 13849 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1236:
-#line 7983 "gram1.y" /* yacc.c:1646  */
+#line 7984 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13911 "gram1.tab.c" /* yacc.c:1646  */
+#line 13855 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1237:
-#line 7987 "gram1.y" /* yacc.c:1646  */
+#line 7988 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 13917 "gram1.tab.c" /* yacc.c:1646  */
+#line 13861 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1238:
-#line 7989 "gram1.y" /* yacc.c:1646  */
+#line 7990 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 13923 "gram1.tab.c" /* yacc.c:1646  */
+#line 13867 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1239:
-#line 7993 "gram1.y" /* yacc.c:1646  */
+#line 7994 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = make_llnd(fi,ACC_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13929 "gram1.tab.c" /* yacc.c:1646  */
+#line 13873 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1240:
-#line 7995 "gram1.y" /* yacc.c:1646  */
+#line 7996 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13935 "gram1.tab.c" /* yacc.c:1646  */
+#line 13879 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1247:
-#line 8006 "gram1.y" /* yacc.c:1646  */
+#line 8007 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,SPF_ANALYSIS_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13941 "gram1.tab.c" /* yacc.c:1646  */
+#line 13885 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1248:
-#line 8010 "gram1.y" /* yacc.c:1646  */
+#line 8011 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,SPF_PARALLEL_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13947 "gram1.tab.c" /* yacc.c:1646  */
+#line 13891 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1249:
-#line 8014 "gram1.y" /* yacc.c:1646  */
+#line 8015 "gram1.y" /* yacc.c:1646  */
     {  (yyval.bf_node) = get_bfnd(fi,SPF_TRANSFORM_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13953 "gram1.tab.c" /* yacc.c:1646  */
+#line 13897 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1250:
-#line 8018 "gram1.y" /* yacc.c:1646  */
+#line 8019 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,SPF_PARALLEL_REG_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 13959 "gram1.tab.c" /* yacc.c:1646  */
+#line 13903 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1251:
-#line 8020 "gram1.y" /* yacc.c:1646  */
+#line 8021 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,SPF_PARALLEL_REG_DIR,(yyvsp[-7].symbol),(yyvsp[-2].ll_node),(yyvsp[0].ll_node),LLNULL);}
-#line 13965 "gram1.tab.c" /* yacc.c:1646  */
+#line 13909 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1252:
-#line 8022 "gram1.y" /* yacc.c:1646  */
+#line 8023 "gram1.y" /* yacc.c:1646  */
     { (yyval.bf_node) = get_bfnd(fi,SPF_PARALLEL_REG_DIR,(yyvsp[-7].symbol),(yyvsp[0].ll_node),(yyvsp[-2].ll_node),LLNULL);}
-#line 13971 "gram1.tab.c" /* yacc.c:1646  */
+#line 13915 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1253:
-#line 8026 "gram1.y" /* yacc.c:1646  */
+#line 8027 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 13977 "gram1.tab.c" /* yacc.c:1646  */
+#line 13921 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1254:
-#line 8028 "gram1.y" /* yacc.c:1646  */
+#line 8029 "gram1.y" /* yacc.c:1646  */
     { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 13983 "gram1.tab.c" /* yacc.c:1646  */
+#line 13927 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1255:
-#line 8032 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
-#line 13989 "gram1.tab.c" /* yacc.c:1646  */
+#line 8033 "gram1.y" /* yacc.c:1646  */
+    {  (yyval.ll_node) = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
+#line 13933 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1256:
-#line 8036 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL;}
-#line 13995 "gram1.tab.c" /* yacc.c:1646  */
+#line 8035 "gram1.y" /* yacc.c:1646  */
+    { 
+                   PTR_LLND w;
+                   w = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
+	           w->entry.string_val = copys(yytext);
+	           w->type = global_double;
+                   (yyval.ll_node) = make_llnd(fi,SPF_WEIGHT_OP,w,LLNULL,SMNULL);
+                }
+#line 13945 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1257:
-#line 8038 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 14001 "gram1.tab.c" /* yacc.c:1646  */
+#line 8045 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = LLNULL;}
+#line 13951 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1258:
-#line 8042 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL;}
-#line 14007 "gram1.tab.c" /* yacc.c:1646  */
+#line 8047 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
+#line 13957 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1259:
-#line 8044 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 14013 "gram1.tab.c" /* yacc.c:1646  */
+#line 8051 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = LLNULL;}
+#line 13963 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1260:
-#line 8048 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,SPF_END_PARALLEL_REG_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 14019 "gram1.tab.c" /* yacc.c:1646  */
+#line 8053 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
+#line 13969 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1261:
-#line 8052 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 14025 "gram1.tab.c" /* yacc.c:1646  */
+#line 8057 "gram1.y" /* yacc.c:1646  */
+    { (yyval.bf_node) = get_bfnd(fi,SPF_END_PARALLEL_REG_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
+#line 13975 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1262:
-#line 8054 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 14031 "gram1.tab.c" /* yacc.c:1646  */
+#line 8061 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
+#line 13981 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
-  case 1268:
-#line 8065 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,REDUCTION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL); }
-#line 14037 "gram1.tab.c" /* yacc.c:1646  */
+  case 1263:
+#line 8063 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
+#line 13987 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1269:
-#line 8069 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14043 "gram1.tab.c" /* yacc.c:1646  */
+#line 8074 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,REDUCTION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL); }
+#line 13993 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1270:
-#line 8073 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_PROCESS_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14049 "gram1.tab.c" /* yacc.c:1646  */
+#line 8078 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,ACC_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 13999 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1271:
-#line 8077 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_COVER_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14055 "gram1.tab.c" /* yacc.c:1646  */
+#line 8082 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_PROCESS_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14005 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1272:
-#line 8081 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_PARAMETER_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14061 "gram1.tab.c" /* yacc.c:1646  */
+#line 8086 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_COVER_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14011 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1273:
-#line 8084 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 14067 "gram1.tab.c" /* yacc.c:1646  */
+#line 8090 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_PARAMETER_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14017 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1274:
-#line 8086 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 14073 "gram1.tab.c" /* yacc.c:1646  */
+#line 8093 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
+#line 14023 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1275:
-#line 8090 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, ASSGN_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 14079 "gram1.tab.c" /* yacc.c:1646  */
+#line 8095 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
+#line 14029 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1276:
-#line 8094 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 14085 "gram1.tab.c" /* yacc.c:1646  */
+#line 8099 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi, ASSGN_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL); }
+#line 14035 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1277:
-#line 8096 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 14091 "gram1.tab.c" /* yacc.c:1646  */
+#line 8103 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
+#line 14041 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
-  case 1281:
+  case 1278:
 #line 8105 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SHADOW_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14097 "gram1.tab.c" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
+#line 14047 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1282:
-#line 8109 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACROSS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14103 "gram1.tab.c" /* yacc.c:1646  */
+#line 8114 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SHADOW_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14053 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1283:
-#line 8113 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,REMOTE_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14109 "gram1.tab.c" /* yacc.c:1646  */
+#line 8118 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,ACROSS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14059 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1284:
-#line 8117 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 14115 "gram1.tab.c" /* yacc.c:1646  */
+#line 8122 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,REMOTE_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14065 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1285:
-#line 8119 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 14121 "gram1.tab.c" /* yacc.c:1646  */
+#line 8126 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
+#line 14071 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1286:
-#line 8123 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_NOINLINE_OP,LLNULL,LLNULL,SMNULL);}
-#line 14127 "gram1.tab.c" /* yacc.c:1646  */
+#line 8128 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
+#line 14077 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1287:
-#line 8125 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_FISSION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14133 "gram1.tab.c" /* yacc.c:1646  */
+#line 8132 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_NOINLINE_OP,LLNULL,LLNULL,SMNULL);}
+#line 14083 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1288:
-#line 8127 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_EXPAND_OP,LLNULL,LLNULL,SMNULL);}
-#line 14139 "gram1.tab.c" /* yacc.c:1646  */
+#line 8134 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_FISSION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14089 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1289:
-#line 8129 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_EXPAND_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14145 "gram1.tab.c" /* yacc.c:1646  */
+#line 8136 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_EXPAND_OP,LLNULL,LLNULL,SMNULL);}
+#line 14095 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1290:
-#line 8132 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_SHRINK_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14151 "gram1.tab.c" /* yacc.c:1646  */
+#line 8138 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_EXPAND_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14101 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1291:
-#line 8134 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_UNROLL_OP,LLNULL,LLNULL,SMNULL);}
-#line 14157 "gram1.tab.c" /* yacc.c:1646  */
+#line 8141 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_SHRINK_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14107 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1292:
-#line 8136 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_UNROLL_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14163 "gram1.tab.c" /* yacc.c:1646  */
+#line 8143 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_UNROLL_OP,LLNULL,LLNULL,SMNULL);}
+#line 14113 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1293:
-#line 8138 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_MERGE_OP,LLNULL,LLNULL,SMNULL);}
-#line 14169 "gram1.tab.c" /* yacc.c:1646  */
+#line 8145 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_UNROLL_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14119 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1294:
-#line 8142 "gram1.y" /* yacc.c:1646  */
+#line 8147 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_MERGE_OP,LLNULL,LLNULL,SMNULL);}
+#line 14125 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1295:
+#line 8151 "gram1.y" /* yacc.c:1646  */
     {
                (yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node), (yyvsp[-2].ll_node), EXPR_LIST);
                (yyval.ll_node) = set_ll_list((yyval.ll_node), (yyvsp[0].ll_node), EXPR_LIST);
              }
-#line 14178 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1295:
-#line 8149 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = make_parallel_region((yyvsp[0].hash_entry));}
-#line 14184 "gram1.tab.c" /* yacc.c:1646  */
+#line 14134 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1296:
-#line 8153 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 14190 "gram1.tab.c" /* yacc.c:1646  */
+#line 8158 "gram1.y" /* yacc.c:1646  */
+    { (yyval.symbol) = make_parallel_region((yyvsp[0].hash_entry));}
+#line 14140 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1297:
-#line 8155 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 14196 "gram1.tab.c" /* yacc.c:1646  */
+#line 8162 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
+#line 14146 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1298:
-#line 8159 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,SPF_CHECKPOINT_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 14202 "gram1.tab.c" /* yacc.c:1646  */
+#line 8164 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
+#line 14152 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1299:
-#line 8163 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 14208 "gram1.tab.c" /* yacc.c:1646  */
+#line 8168 "gram1.y" /* yacc.c:1646  */
+    {  (yyval.bf_node) = get_bfnd(fi,SPF_CHECKPOINT_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
+#line 14158 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1300:
-#line 8165 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 14214 "gram1.tab.c" /* yacc.c:1646  */
+#line 8172 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
+#line 14164 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1301:
-#line 8169 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_TYPE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14220 "gram1.tab.c" /* yacc.c:1646  */
+#line 8174 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
+#line 14170 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1302:
-#line 8171 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_VARLIST_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14226 "gram1.tab.c" /* yacc.c:1646  */
+#line 8178 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_TYPE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14176 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1303:
-#line 8173 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_EXCEPT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14232 "gram1.tab.c" /* yacc.c:1646  */
+#line 8180 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_VARLIST_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14182 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1304:
-#line 8175 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_FILES_COUNT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14238 "gram1.tab.c" /* yacc.c:1646  */
+#line 8182 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_EXCEPT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14188 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1305:
-#line 8177 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_INTERVAL_OP,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),SMNULL);}
-#line 14244 "gram1.tab.c" /* yacc.c:1646  */
+#line 8184 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_FILES_COUNT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
+#line 14194 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1306:
-#line 8181 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 14250 "gram1.tab.c" /* yacc.c:1646  */
+#line 8186 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_INTERVAL_OP,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),SMNULL);}
+#line 14200 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1307:
-#line 8183 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 14256 "gram1.tab.c" /* yacc.c:1646  */
+#line 8190 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
+#line 14206 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1308:
-#line 8187 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_ASYNC_OP, LLNULL,LLNULL,SMNULL);}
-#line 14262 "gram1.tab.c" /* yacc.c:1646  */
+#line 8192 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
+#line 14212 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1309:
-#line 8189 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_FLEXIBLE_OP, LLNULL,LLNULL,SMNULL);}
-#line 14268 "gram1.tab.c" /* yacc.c:1646  */
+#line 8196 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,ACC_ASYNC_OP, LLNULL,LLNULL,SMNULL);}
+#line 14218 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1310:
-#line 8193 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_TIME_OP, LLNULL,LLNULL,SMNULL);}
-#line 14274 "gram1.tab.c" /* yacc.c:1646  */
+#line 8198 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_FLEXIBLE_OP, LLNULL,LLNULL,SMNULL);}
+#line 14224 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1311:
-#line 8195 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_ITER_OP, LLNULL,LLNULL,SMNULL);}
-#line 14280 "gram1.tab.c" /* yacc.c:1646  */
+#line 8202 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_TIME_OP, LLNULL,LLNULL,SMNULL);}
+#line 14230 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
   case 1312:
-#line 8199 "gram1.y" /* yacc.c:1646  */
+#line 8204 "gram1.y" /* yacc.c:1646  */
+    { (yyval.ll_node) = make_llnd(fi,SPF_ITER_OP, LLNULL,LLNULL,SMNULL);}
+#line 14236 "gram1.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 1313:
+#line 8208 "gram1.y" /* yacc.c:1646  */
     { if(position==IN_OUTSIDE)
                  err("Misplaced SPF-directive",103);
              }
-#line 14288 "gram1.tab.c" /* yacc.c:1646  */
+#line 14244 "gram1.tab.c" /* yacc.c:1646  */
     break;
 
 
-#line 14292 "gram1.tab.c" /* yacc.c:1646  */
+#line 14248 "gram1.tab.c" /* yacc.c:1646  */
       default: break;
     }
   /* User semantic actions sometimes alter yychar, and that requires
diff --git a/dvm/fdvm/trunk/parser/gram1.tab.h b/dvm/fdvm/trunk/parser/gram1.tab.h
index 5573afb..cbb2086 100644
--- a/dvm/fdvm/trunk/parser/gram1.tab.h
+++ b/dvm/fdvm/trunk/parser/gram1.tab.h
@@ -401,8 +401,9 @@ extern int yydebug;
     SPF_MERGE = 354,
     SPF_COVER = 355,
     SPF_PROCESS_PRIVATE = 356,
-    BINARY_OP = 359,
-    UNARY_OP = 360
+    SPF_WEIGHT = 357,
+    BINARY_OP = 360,
+    UNARY_OP = 361
   };
 #endif
 
@@ -411,7 +412,7 @@ extern int yydebug;
 
 union YYSTYPE
 {
-#line 439 "gram1.y" /* yacc.c:1909  */
+#line 440 "gram1.y" /* yacc.c:1909  */
 
     int token;
     char charv;
@@ -423,7 +424,7 @@ union YYSTYPE
     PTR_HASH hash_entry;
     PTR_LABEL label;
 
-#line 427 "gram1.tab.h" /* yacc.c:1909  */
+#line 428 "gram1.tab.h" /* yacc.c:1909  */
 };
 
 typedef union YYSTYPE YYSTYPE;
diff --git a/dvm/fdvm/trunk/parser/gram1.y b/dvm/fdvm/trunk/parser/gram1.y
index 12aa48c..1b2c22a 100644
--- a/dvm/fdvm/trunk/parser/gram1.y
+++ b/dvm/fdvm/trunk/parser/gram1.y
@@ -354,6 +354,7 @@
 %token SPF_MERGE 354
 %token SPF_COVER 355
 %token SPF_PROCESS_PRIVATE 356
+%token SPF_WEIGHT 357
 
 %{
 #include <string.h>
@@ -8029,7 +8030,15 @@ characteristic_list:  characteristic
              ;
 
 characteristic: needkeyword SPF_CODE_COVERAGE
-               { $$ = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
+                {  $$ = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
+              | needkeyword SPF_WEIGHT LEFTPAR DP_CONSTANT RIGHTPAR
+                { 
+                   PTR_LLND w;
+                   w = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
+	           w->entry.string_val = copys(yytext);
+	           w->type = global_double;
+                   $$ = make_llnd(fi,SPF_WEIGHT_OP,w,LLNULL,SMNULL);
+                }
               ;
 
 opt_clause_apply_fragment: 
diff --git a/dvm/fdvm/trunk/parser/lexfdvm.c b/dvm/fdvm/trunk/parser/lexfdvm.c
index 540cb37..677ee73 100644
--- a/dvm/fdvm/trunk/parser/lexfdvm.c
+++ b/dvm/fdvm/trunk/parser/lexfdvm.c
@@ -610,6 +610,7 @@ struct Keylist keys[] = {
         {"varlist", VARLIST},
 	{"virtual", VIRTUAL},
         {"wait", WAIT},
+        {"weight", SPF_WEIGHT},
         {"wgt_block", WGT_BLOCK},
 	{"where", WHERE},
 	{"while", WHILE},
diff --git a/dvm/fdvm/trunk/parser/tag b/dvm/fdvm/trunk/parser/tag
index adffa06..343d1f5 100644
--- a/dvm/fdvm/trunk/parser/tag
+++ b/dvm/fdvm/trunk/parser/tag
@@ -624,4 +624,5 @@
 #define SPF_COVER_OP                     972     /* SAPFOR */
 #define SPF_MERGE_OP                     973     /* SAPFOR */
 #define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
+#define SPF_WEIGHT_OP			 975     /* SAPFOR */
 
diff --git a/dvm/fdvm/trunk/parser/tag.h b/dvm/fdvm/trunk/parser/tag.h
index d8131c1..02ff849 100644
--- a/dvm/fdvm/trunk/parser/tag.h
+++ b/dvm/fdvm/trunk/parser/tag.h
@@ -239,7 +239,7 @@ script using "tag".  Run make tag.h to regenerate this file */
   tag [ DVM_TEMPLATE_CREATE_DIR ] = "DVM_TEMPLATE_CREATE_DIR";
   tag [ DVM_TEMPLATE_DELETE_DIR ] = "DVM_TEMPLATE_DELETE_DIR";
   tag [ PRIVATE_AR_DECL ] = "PRIVATE_AR_DECL";
-  
+    
 /***************** variant tags for low level nodes ********************/
 
   tag [ INT_VAL ] = "INT_VAL";
@@ -626,4 +626,5 @@ script using "tag".  Run make tag.h to regenerate this file */
   tag [ SPF_COVER_OP ] = "SPF_COVER_OP";
   tag [ SPF_MERGE_OP ] = "SPF_MERGE_OP";
   tag [ SPF_PROCESS_PRIVATE_OP ] = "SPF_PROCESS_PRIVATE_OP";
+  tag [ SPF_WEIGHT_OP ] = "SPF_WEIGHT_OP";
 
diff --git a/dvm/fdvm/trunk/parser/tokdefs.h b/dvm/fdvm/trunk/parser/tokdefs.h
index 4cd4f58..7dd70ee 100644
--- a/dvm/fdvm/trunk/parser/tokdefs.h
+++ b/dvm/fdvm/trunk/parser/tokdefs.h
@@ -354,3 +354,4 @@
 #define SPF_MERGE 354
 #define SPF_COVER 355
 #define SPF_PROCESS_PRIVATE 356
+#define SPF_WEIGHT 357
diff --git a/dvm/fdvm/trunk/parser/tokens b/dvm/fdvm/trunk/parser/tokens
index b3bf4af..bf8e1bc 100644
--- a/dvm/fdvm/trunk/parser/tokens
+++ b/dvm/fdvm/trunk/parser/tokens
@@ -354,3 +354,4 @@ SPF_UNROLL
 SPF_MERGE
 SPF_COVER
 SPF_PROCESS_PRIVATE
+SPF_WEIGHT
\ No newline at end of file

From 817a910a4bf52073805cceb56d362d350f146fa1 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Thu, 6 Mar 2025 20:13:06 +0300
Subject: [PATCH 21/44] version updated

---
 sapfor/experts/Sapfor_2017/_src/Utils/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 88a95aa..8ad9dca 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2394"
+#define VERSION_SPF "2395"

From 1c851baa7ed45026519ca64b73318d9ed6c70f69 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Tue, 11 Mar 2025 15:24:36 +0300
Subject: [PATCH 22/44] added module symbols initiazliation

---
 sapfor/experts/Sapfor_2017/_src/Sapfor.cpp      | 17 +++++++++++++++--
 .../Sapfor_2017/_src/Utils/module_utils.cpp     |  2 +-
 .../Sapfor_2017/_src/Utils/module_utils.h       |  1 +
 sapfor/experts/Sapfor_2017/_src/Utils/version.h |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
index 71c2929..2e2b5fc 100644
--- a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
@@ -35,6 +35,8 @@
 
 #include "Utils/errors.h"
 #include "Utils/SgUtils.h"
+#include "Utils/module_utils.h"
+
 #include "ProjectManipulation/ParseFiles.h"
 #include "ProjectManipulation/PerfAnalyzer.h"
 #include "ProjectManipulation/ConvertFiles.h"
@@ -57,7 +59,6 @@
 
 #include "Predictor/PredictScheme.h"
 #include "Predictor/PredictorModel.h"
-#include "ExpressionTransform/expr_transform.h"
 #include "SageAnalysisTool/depInterfaceExt.h"
 #include "DvmhRegions/DvmhRegionInserter.h"
 #include "DvmhRegions/LoopChecker.h"
@@ -495,8 +496,20 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         else if (curr_regime == CALL_GRAPH)
         {
             auto it = allFuncInfo.find(file_name);
-            if (it == allFuncInfo.end())
+            if (it == allFuncInfo.end()) {
                 functionAnalyzer(file, allFuncInfo, getObjectForFileFromMap(file_name, loopGraph), getObjectForFileFromMap(file_name, SPF_messages), fullIR);
+
+                it = allFuncInfo.find(file_name);
+                //init module symbols
+                if (it != allFuncInfo.end())
+                {
+                    for (auto& func : it->second)
+                    {
+                        SgStatement* currF = func->funcPointer;
+                        const auto& tmp = getModuleSymbols(currF);
+                    }
+                }
+            }
         }
         else if (curr_regime == CALL_GRAPH2)
         {
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
index 84659fc..1db7ad5 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
@@ -307,7 +307,7 @@ static void getModuleSymbols(SgStatement* func, set<SgSymbol*>& symbs)
     }
 }
 
-static const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
+const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
 {
     if (symbolsForFunc.find(func) != symbolsForFunc.end())
         return symbolsForFunc[func];
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
index fb14657..8fd21da 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
@@ -1,5 +1,6 @@
 #pragma once
 
+const std::set<SgSymbol*>& getModuleSymbols(SgStatement* func);
 void getModulesAndFunctions(SgFile* file, std::vector<SgStatement*>& modulesAndFunctions);
 void findModulesInFile(SgFile* file, std::vector<SgStatement*>& modules);
 std::map<std::string, std::set<std::string>> createMapOfModuleUses(SgFile* file);
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
index 8ad9dca..fefbd0c 100644
--- a/sapfor/experts/Sapfor_2017/_src/Utils/version.h
+++ b/sapfor/experts/Sapfor_2017/_src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2395"
+#define VERSION_SPF "2396"

From 6a4040be3ed0569c2309a366288223ba2f8257f3 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Wed, 12 Mar 2025 12:37:19 +0300
Subject: [PATCH 23/44] moved

---
 .../experts/Sapfor_2017 => Sapfor}/CMakeLists.txt   |   0
 .../Sapfor_2017 => Sapfor}/FDVM/CMakeLists.txt      |   0
 .../Sapfor_2017 => Sapfor}/Parser/CMakeLists.txt    |   0
 .../Sapfor_2017 => Sapfor}/SageLib/CMakeLists.txt   |   0
 .../SageNewSrc/CMakeLists.txt                       |   0
 .../SageOldSrc/CMakeLists.txt                       |   0
 .../Sapfor_2017 => Sapfor}/Sapc++/Sapc++.sln        |   0
 .../experts/Sapfor_2017 => Sapfor}/Sapfor/Makefile  |   0
 .../Sapfor_2017 => Sapfor}/_src/CFGraph/CFGraph.cpp |   0
 .../Sapfor_2017 => Sapfor}/_src/CFGraph/CFGraph.h   |   0
 .../_src/CFGraph/DataFlow/backward_data_flow.h      |   0
 .../_src/CFGraph/DataFlow/backward_data_flow_impl.h |   0
 .../_src/CFGraph/DataFlow/data_flow.h               |   0
 .../_src/CFGraph/DataFlow/data_flow_impl.h          |   0
 .../Sapfor_2017 => Sapfor}/_src/CFGraph/IR.cpp      |   0
 .../Sapfor_2017 => Sapfor}/_src/CFGraph/IR.h        |   0
 .../_src/CFGraph/RD_subst.cpp                       |   0
 .../Sapfor_2017 => Sapfor}/_src/CFGraph/RD_subst.h  |   0
 .../_src/CFGraph/live_variable_analysis.cpp         |   0
 .../_src/CFGraph/live_variable_analysis.h           |   0
 .../_src/CFGraph/private_variables_analysis.cpp     |   0
 .../_src/CFGraph/private_variables_analysis.h       |   0
 .../_src/CreateInterTree/CreateInterTree.cpp        |   0
 .../_src/CreateInterTree/CreateInterTree.h          |   0
 .../_src/DirectiveProcessing/directive_analyzer.cpp |   0
 .../_src/DirectiveProcessing/directive_analyzer.h   |   0
 .../_src/DirectiveProcessing/directive_creator.cpp  |   0
 .../_src/DirectiveProcessing/directive_creator.h    |   0
 .../DirectiveProcessing/directive_creator_base.cpp  |   0
 .../DirectiveProcessing/directive_omp_parser.cpp    |   0
 .../_src/DirectiveProcessing/directive_omp_parser.h |   0
 .../_src/DirectiveProcessing/directive_parser.cpp   |   0
 .../_src/DirectiveProcessing/directive_parser.h     |   0
 .../_src/DirectiveProcessing/insert_directive.cpp   |   0
 .../_src/DirectiveProcessing/insert_directive.h     |   0
 .../_src/DirectiveProcessing/remote_access.cpp      |   0
 .../_src/DirectiveProcessing/remote_access.h        |   0
 .../_src/DirectiveProcessing/remote_access_base.cpp |   0
 .../_src/DirectiveProcessing/shadow.cpp             |   0
 .../_src/DirectiveProcessing/shadow.h               |   0
 .../DirectiveProcessing/spf_directive_preproc.cpp   |   0
 .../_src/Distribution/Array.cpp                     |   0
 .../_src/Distribution/Array.h                       |   0
 .../_src/Distribution/ArrayAnalysis.cpp             |   0
 .../_src/Distribution/Arrays.h                      |   0
 .../_src/Distribution/CreateDistributionDirs.cpp    |   0
 .../_src/Distribution/CreateDistributionDirs.h      |   0
 .../_src/Distribution/Cycle.cpp                     |   0
 .../_src/Distribution/Cycle.h                       |   0
 .../_src/Distribution/Distribution.cpp              |   0
 .../_src/Distribution/Distribution.h                |   0
 .../_src/Distribution/DvmhDirective.cpp             |   0
 .../_src/Distribution/DvmhDirective.h               |   0
 .../_src/Distribution/DvmhDirectiveBase.cpp         |   0
 .../_src/Distribution/DvmhDirectiveBase.h           |   0
 .../_src/Distribution/DvmhDirective_func.h          |   0
 .../_src/Distribution/GraphCSR.cpp                  |   0
 .../_src/Distribution/GraphCSR.h                    |   0
 .../_src/DvmhRegions/DvmhRegion.cpp                 |   0
 .../_src/DvmhRegions/DvmhRegion.h                   |   0
 .../_src/DvmhRegions/DvmhRegionInserter.cpp         |   0
 .../_src/DvmhRegions/DvmhRegionInserter.h           |   0
 .../_src/DvmhRegions/LoopChecker.cpp                |   0
 .../_src/DvmhRegions/LoopChecker.h                  |   0
 .../_src/DvmhRegions/ReadWriteAnalyzer.cpp          |   0
 .../_src/DvmhRegions/ReadWriteAnalyzer.h            |   0
 .../_src/DvmhRegions/RegionsMerger.cpp              |   0
 .../_src/DvmhRegions/RegionsMerger.h                |   0
 .../_src/DvmhRegions/TypedSymbol.cpp                |   0
 .../_src/DvmhRegions/TypedSymbol.h                  |   0
 .../_src/DvmhRegions/VarUsages.cpp                  |   0
 .../_src/DvmhRegions/VarUsages.h                    |   0
 .../_src/DynamicAnalysis/createParallelRegions.cpp  |   0
 .../_src/DynamicAnalysis/createParallelRegions.h    |   0
 .../_src/DynamicAnalysis/gCov_parser.cpp            |   0
 .../_src/DynamicAnalysis/gCov_parser_func.h         |   0
 .../_src/DynamicAnalysis/gcov_info.cpp              |   0
 .../_src/DynamicAnalysis/gcov_info.h                |   0
 .../ExpressionTransform/control_flow_graph_part.cpp |   0
 .../_src/ExpressionTransform/expr_transform.cpp     |   0
 .../_src/ExpressionTransform/expr_transform.h       |   0
 .../_src/GraphCall/graph_calls.cpp                  |   0
 .../_src/GraphCall/graph_calls.h                    |   0
 .../_src/GraphCall/graph_calls_base.cpp             |   0
 .../_src/GraphCall/graph_calls_func.h               |   0
 .../_src/GraphLoop/graph_loops.cpp                  |   0
 .../_src/GraphLoop/graph_loops.h                    |   0
 .../_src/GraphLoop/graph_loops_base.cpp             |   0
 .../_src/GraphLoop/graph_loops_func.h               |   0
 .../Sapfor_2017 => Sapfor}/_src/Inliner/inliner.cpp |   0
 .../Sapfor_2017 => Sapfor}/_src/Inliner/inliner.h   |   0
 .../_src/LoopAnalyzer/allocations_prepoc.cpp        |   0
 .../_src/LoopAnalyzer/dep_analyzer.cpp              |   0
 .../_src/LoopAnalyzer/loop_analyzer.cpp             |   0
 .../_src/LoopAnalyzer/loop_analyzer.h               |   0
 .../_src/ParallelizationRegions/ParRegions.cpp      |   0
 .../_src/ParallelizationRegions/ParRegions.h        |   0
 .../_src/ParallelizationRegions/ParRegions_func.h   |   0
 .../ParallelizationRegions/expand_extract_reg.cpp   |   0
 .../ParallelizationRegions/expand_extract_reg.h     |   0
 .../resolve_par_reg_conflicts.cpp                   |   0
 .../resolve_par_reg_conflicts.h                     |   0
 .../_src/Predictor/Lib/AMView.cpp                   |   0
 .../_src/Predictor/Lib/AMView.h                     |   0
 .../_src/Predictor/Lib/AlignAxis.cpp                |   0
 .../_src/Predictor/Lib/AlignAxis.h                  |   0
 .../_src/Predictor/Lib/BGroup.cpp                   |   0
 .../_src/Predictor/Lib/BGroup.h                     |   0
 .../_src/Predictor/Lib/Block.cpp                    |   0
 .../_src/Predictor/Lib/Block.h                      |   0
 .../_src/Predictor/Lib/CallInfoStructs.h            |   0
 .../_src/Predictor/Lib/CallParams.cpp               |   0
 .../_src/Predictor/Lib/CommCost.cpp                 |   0
 .../_src/Predictor/Lib/CommCost.h                   |   0
 .../_src/Predictor/Lib/DArray.cpp                   |   0
 .../_src/Predictor/Lib/DArray.h                     |   0
 .../_src/Predictor/Lib/DimBound.cpp                 |   0
 .../_src/Predictor/Lib/DimBound.h                   |   0
 .../_src/Predictor/Lib/DistAxis.cpp                 |   0
 .../_src/Predictor/Lib/DistAxis.h                   |   0
 .../_src/Predictor/Lib/Event.cpp                    |   0
 .../_src/Predictor/Lib/Event.h                      |   0
 .../_src/Predictor/Lib/FuncCall.cpp                 |   0
 .../_src/Predictor/Lib/FuncCall.h                   |   0
 .../_src/Predictor/Lib/Interval.cpp                 |   0
 .../_src/Predictor/Lib/Interval.h                   |   0
 .../_src/Predictor/Lib/IntervalTemplate.cpp         |   0
 .../_src/Predictor/Lib/LoopBlock.cpp                |   0
 .../_src/Predictor/Lib/LoopBlock.h                  |   0
 .../_src/Predictor/Lib/LoopLS.cpp                   |   0
 .../_src/Predictor/Lib/LoopLS.h                     |   0
 .../_src/Predictor/Lib/Ls.cpp                       |   0
 .../Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Ls.h  |   0
 .../_src/Predictor/Lib/ModelDArray.cpp              |   0
 .../_src/Predictor/Lib/ModelIO.cpp                  |   0
 .../_src/Predictor/Lib/ModelInterval.cpp            |   0
 .../_src/Predictor/Lib/ModelMPS_AM.cpp              |   0
 .../_src/Predictor/Lib/ModelParLoop.cpp             |   0
 .../_src/Predictor/Lib/ModelReduct.cpp              |   0
 .../_src/Predictor/Lib/ModelRegular.cpp             |   0
 .../_src/Predictor/Lib/ModelRemAccess.cpp           |   0
 .../_src/Predictor/Lib/ModelShadow.cpp              |   0
 .../_src/Predictor/Lib/ModelStructs.h               |   0
 .../_src/Predictor/Lib/ParLoop.cpp                  |   0
 .../_src/Predictor/Lib/ParLoop.h                    |   0
 .../_src/Predictor/Lib/ParseString.cpp              |   0
 .../_src/Predictor/Lib/ParseString.h                |   0
 .../_src/Predictor/Lib/Processor.cpp                |   0
 .../_src/Predictor/Lib/Processor.h                  |   0
 .../_src/Predictor/Lib/Ps.cpp                       |   0
 .../Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Ps.h  |   0
 .../_src/Predictor/Lib/RedGroup.cpp                 |   0
 .../_src/Predictor/Lib/RedGroup.h                   |   0
 .../_src/Predictor/Lib/RedVar.cpp                   |   0
 .../_src/Predictor/Lib/RedVar.h                     |   0
 .../_src/Predictor/Lib/RemAccessBuf.cpp             |   0
 .../_src/Predictor/Lib/RemAccessBuf.h               |   0
 .../_src/Predictor/Lib/Space.cpp                    |   0
 .../_src/Predictor/Lib/Space.h                      |   0
 .../_src/Predictor/Lib/StdAfx.h                     |   0
 .../_src/Predictor/Lib/TraceLine.cpp                |   0
 .../_src/Predictor/Lib/TraceLine.h                  |   0
 .../Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Ver.h |   0
 .../_src/Predictor/Lib/Vm.cpp                       |   0
 .../Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Vm.h  |   0
 .../_src/Predictor/Lib/adler32.c                    |   0
 .../_src/Predictor/Lib/compress.c                   |   0
 .../_src/Predictor/Lib/crc32.c                      |   0
 .../_src/Predictor/Lib/deflate.c                    |   0
 .../_src/Predictor/Lib/deflate.h                    |   0
 .../_src/Predictor/Lib/gzio.c                       |   0
 .../_src/Predictor/Lib/infblock.c                   |   0
 .../_src/Predictor/Lib/infblock.h                   |   0
 .../_src/Predictor/Lib/infcodes.c                   |   0
 .../_src/Predictor/Lib/infcodes.h                   |   0
 .../_src/Predictor/Lib/inffast.c                    |   0
 .../_src/Predictor/Lib/inffast.h                    |   0
 .../_src/Predictor/Lib/inffixed.h                   |   0
 .../_src/Predictor/Lib/inflate.c                    |   0
 .../_src/Predictor/Lib/inftrees.c                   |   0
 .../_src/Predictor/Lib/inftrees.h                   |   0
 .../_src/Predictor/Lib/infutil.c                    |   0
 .../_src/Predictor/Lib/infutil.h                    |   0
 .../_src/Predictor/Lib/intersection.cpp             |   0
 .../_src/Predictor/Lib/predictor.cpp                |   0
 .../_src/Predictor/Lib/trees.c                      |   0
 .../_src/Predictor/Lib/trees.h                      |   0
 .../_src/Predictor/Lib/uncompr.c                    |   0
 .../_src/Predictor/Lib/zconf.h                      |   0
 .../_src/Predictor/Lib/zlib.h                       |   0
 .../_src/Predictor/Lib/zutil.c                      |   0
 .../_src/Predictor/Lib/zutil.h                      |   0
 .../_src/Predictor/PredictScheme.cpp                |   0
 .../_src/Predictor/PredictScheme.h                  |   0
 .../_src/Predictor/PredictorInterface.h             |   0
 .../_src/Predictor/PredictorModel.cpp               |   0
 .../_src/Predictor/PredictorModel.h                 |   0
 .../_src/PrivateAnalyzer/private_analyzer.cpp       |   0
 .../_src/PrivateAnalyzer/private_analyzer.h         |   0
 .../_src/ProjectManipulation/ConvertFiles.cpp       |   0
 .../_src/ProjectManipulation/ConvertFiles.h         |   0
 .../_src/ProjectManipulation/FileInfo.cpp           |   0
 .../_src/ProjectManipulation/FileInfo.h             |   0
 .../_src/ProjectManipulation/ParseFiles.cpp         |   0
 .../_src/ProjectManipulation/ParseFiles.h           |   0
 .../_src/ProjectManipulation/PerfAnalyzer.cpp       |   0
 .../_src/ProjectManipulation/PerfAnalyzer.h         |   0
 .../_src/ProjectManipulation/StdCapture.h           |   0
 .../_src/ProjectParameters/projectParameters.cpp    |   0
 .../_src/ProjectParameters/projectParameters.h      |   0
 .../_src/RenameSymbols/rename_symbols.cpp           |   0
 .../_src/RenameSymbols/rename_symbols.h             |   0
 .../_src/SageAnalysisTool/Makefile                  |   0
 .../_src/SageAnalysisTool/OmegaForSage/Makefile     |   0
 .../_src/SageAnalysisTool/OmegaForSage/README       |   0
 .../SageAnalysisTool/OmegaForSage/add-assert.cpp    |   0
 .../_src/SageAnalysisTool/OmegaForSage/affine.cpp   |   0
 .../_src/SageAnalysisTool/OmegaForSage/cover.cpp    |   0
 .../SageAnalysisTool/OmegaForSage/ddomega-build.cpp |   0
 .../SageAnalysisTool/OmegaForSage/ddomega-use.cpp   |   0
 .../_src/SageAnalysisTool/OmegaForSage/ddomega.cpp  |   0
 .../_src/SageAnalysisTool/OmegaForSage/debug.cpp    |   0
 .../SageAnalysisTool/OmegaForSage/include/Exit.h    |   0
 .../OmegaForSage/include/add-assert.h               |   0
 .../SageAnalysisTool/OmegaForSage/include/affine.h  |   0
 .../SageAnalysisTool/OmegaForSage/include/cover.h   |   0
 .../SageAnalysisTool/OmegaForSage/include/dddir.h   |   0
 .../OmegaForSage/include/ddomega-build.h            |   0
 .../OmegaForSage/include/ddomega-use.h              |   0
 .../SageAnalysisTool/OmegaForSage/include/ddomega.h |   0
 .../SageAnalysisTool/OmegaForSage/include/debug.h   |   0
 .../SageAnalysisTool/OmegaForSage/include/flags.h   |   0
 .../_src/SageAnalysisTool/OmegaForSage/include/ip.h |   0
 .../SageAnalysisTool/OmegaForSage/include/kill.h    |   0
 .../OmegaForSage/include/lang-interf.generic        |   0
 .../OmegaForSage/include/lang-interf.h              |   0
 .../SageAnalysisTool/OmegaForSage/include/missing.h |   0
 .../OmegaForSage/include/omega2flags.h              |   0
 .../OmegaForSage/include/portable.h                 |   0
 .../OmegaForSage/include/portable.h.origine         |   0
 .../SageAnalysisTool/OmegaForSage/include/range.h   |   0
 .../SageAnalysisTool/OmegaForSage/include/refine.h  |   0
 .../SageAnalysisTool/OmegaForSage/include/screen.h  |   0
 .../OmegaForSage/include/timeTrials.h               |   0
 .../_src/SageAnalysisTool/OmegaForSage/ip.cpp       |   0
 .../_src/SageAnalysisTool/OmegaForSage/kill.cpp     |   0
 .../_src/SageAnalysisTool/OmegaForSage/refine.cpp   |   0
 .../SageAnalysisTool/OmegaForSage/sagedriver.cpp    |   0
 .../_src/SageAnalysisTool/README                    |   0
 .../_src/SageAnalysisTool/annotationDriver.cpp      |   0
 .../_src/SageAnalysisTool/annotationDriver.h        |   0
 .../_src/SageAnalysisTool/arrayRef.cpp              |   0
 .../_src/SageAnalysisTool/arrayRef.h                |   0
 .../_src/SageAnalysisTool/computeInducVar.cpp       |   0
 .../_src/SageAnalysisTool/constanteProp.cpp         |   0
 .../_src/SageAnalysisTool/constanteSet.h            |   0
 .../_src/SageAnalysisTool/controlFlow.cpp           |   0
 .../_src/SageAnalysisTool/defUse.cpp                |   0
 .../_src/SageAnalysisTool/definesValues.h           |   0
 .../_src/SageAnalysisTool/definitionSet.h           |   0
 .../_src/SageAnalysisTool/depGraph.cpp              |   0
 .../_src/SageAnalysisTool/depGraph.h                |   0
 .../_src/SageAnalysisTool/depInterface.cpp          |   0
 .../_src/SageAnalysisTool/depInterface.h            |   0
 .../_src/SageAnalysisTool/depInterfaceExt.h         |   0
 .../_src/SageAnalysisTool/dependence.cpp            |   0
 .../_src/SageAnalysisTool/dependence.h              |   0
 .../_src/SageAnalysisTool/flowAnalysis.cpp          |   0
 .../_src/SageAnalysisTool/inducVar.h                |   0
 .../_src/SageAnalysisTool/intrinsic.cpp             |   0
 .../_src/SageAnalysisTool/intrinsic.h               |   0
 .../_src/SageAnalysisTool/invariant.cpp             |   0
 .../_src/SageAnalysisTool/loopTransform.cpp         |   0
 .../_src/SageAnalysisTool/reductionCode.h           |   0
 .../_src/SageAnalysisTool/set.cpp                   |   0
 .../_src/SageAnalysisTool/set.h                     |   0
 .../experts/Sapfor_2017 => Sapfor}/_src/Sapfor.cpp  |   0
 .../experts/Sapfor_2017 => Sapfor}/_src/Sapfor.h    |   0
 .../Sapfor_2017 => Sapfor}/_src/SapforData.h        |   0
 .../_src/Server/checkUniq.cpp                       |   0
 .../Sapfor_2017 => Sapfor}/_src/Server/server.cpp   |   0
 .../Sapfor_2017 => Sapfor}/_src/Server/spf_icon.ico | Bin
 .../_src/Transformations/array_assign_to_loop.cpp   |   0
 .../_src/Transformations/array_assign_to_loop.h     |   0
 .../_src/Transformations/checkpoints.cpp            |   0
 .../_src/Transformations/checkpoints.h              |   0
 .../_src/Transformations/convert_to_c.cpp           |   0
 .../_src/Transformations/convert_to_c.h             |   0
 .../_src/Transformations/dead_code.cpp              |   0
 .../_src/Transformations/dead_code.h                |   0
 .../_src/Transformations/enddo_loop_converter.cpp   |   0
 .../_src/Transformations/enddo_loop_converter.h     |   0
 .../_src/Transformations/fix_common_blocks.cpp      |   0
 .../_src/Transformations/fix_common_blocks.h        |   0
 .../_src/Transformations/function_purifying.cpp     |   0
 .../_src/Transformations/function_purifying.h       |   0
 .../_src/Transformations/loop_transform.cpp         |   0
 .../_src/Transformations/loop_transform.h           |   0
 .../_src/Transformations/loops_combiner.cpp         |   0
 .../_src/Transformations/loops_combiner.h           |   0
 .../_src/Transformations/loops_splitter.cpp         |   0
 .../_src/Transformations/loops_splitter.h           |   0
 .../_src/Transformations/loops_unrolling.cpp        |   0
 .../_src/Transformations/loops_unrolling.h          |   0
 .../Transformations/private_arrays_resizing.cpp     |   0
 .../_src/Transformations/private_arrays_resizing.h  |   0
 .../_src/Transformations/private_removing.cpp       |   0
 .../_src/Transformations/private_removing.h         |   0
 .../Transformations/replace_dist_arrays_in_io.cpp   |   0
 .../Transformations/replace_dist_arrays_in_io.h     |   0
 .../_src/Transformations/set_implicit_none.cpp      |   0
 .../_src/Transformations/set_implicit_none.h        |   0
 .../_src/Transformations/swap_array_dims.cpp        |   0
 .../_src/Transformations/swap_array_dims.h          |   0
 .../_src/Transformations/uniq_call_chain_dup.cpp    |   0
 .../_src/Transformations/uniq_call_chain_dup.h      |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/AstWrapper.h  |   0
 .../_src/Utils/BoostStackTrace.cpp                  |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/CommonBlock.h |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/DefUseList.h  |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/PassManager.h |   0
 .../_src/Utils/RationalNum.cpp                      |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/RationalNum.h |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/SgUtils.cpp   |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/SgUtils.h     |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/errors.h      |   0
 .../_src/Utils/leak_detector.h                      |   0
 .../_src/Utils/module_utils.cpp                     |   0
 .../_src/Utils/module_utils.h                       |   0
 .../_src/Utils/russian_errors_text.txt              |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/types.h       |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/utils.cpp     |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/utils.h       |   0
 .../Sapfor_2017 => Sapfor}/_src/Utils/version.h     |   0
 .../_src/VerificationCode/CorrectVarDecl.cpp        |   0
 .../_src/VerificationCode/IncludeChecker.cpp        |   0
 .../_src/VerificationCode/StructureChecker.cpp      |   0
 .../_src/VerificationCode/VerifySageStructures.cpp  |   0
 .../_src/VerificationCode/verifications.h           |   0
 .../_src/VisualizerCalls/BuildGraph.cpp             |   0
 .../_src/VisualizerCalls/BuildGraph.h               |   0
 .../_src/VisualizerCalls/SendMessage.cpp            |   0
 .../_src/VisualizerCalls/SendMessage.h              |   0
 .../_src/VisualizerCalls/get_information.cpp        |   0
 .../_src/VisualizerCalls/get_information.h          |   0
 .../_src/VisualizerCalls/graphLayout/algebra.cpp    |   0
 .../_src/VisualizerCalls/graphLayout/algebra.hpp    |   0
 .../graphLayout/fruchterman_reingold.cpp            |   0
 .../graphLayout/fruchterman_reingold.hpp            |   0
 .../VisualizerCalls/graphLayout/kamada_kawai.cpp    |   0
 .../VisualizerCalls/graphLayout/kamada_kawai.hpp    |   0
 .../_src/VisualizerCalls/graphLayout/layout.cpp     |   0
 .../_src/VisualizerCalls/graphLayout/layout.hpp     |   0
 .../_src/VisualizerCalls/graphLayout/nodesoup.cpp   |   0
 .../_src/VisualizerCalls/graphLayout/nodesoup.hpp   |   0
 .../Sapfor_2017 => Sapfor}/_test/inliner/alex.f     |   0
 .../_test/inliner/array_sum.f                       |   0
 .../_test/inliner/inlineFunctionWithAllocatable.f90 |   0
 .../Sapfor_2017 => Sapfor}/_test/inliner/sub.f      |   0
 .../Sapfor_2017 => Sapfor}/_test/inliner/test.f     |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f    |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f    |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f     |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f     |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f     |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_err1.f     |   0
 .../sapfor/check_args_decl/arg_decl_test_err2.f     |   0
 .../sapfor/check_args_decl/arg_decl_test_err3.f     |   0
 .../sapfor/check_args_decl/arg_decl_test_ok1.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_ok2.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_ok3.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_wr1.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_wr3.f      |   0
 .../_test/sapfor/checkpoint/checkpoint.f90          |   0
 .../_test/sapfor/checkpoint/checkpoint2.f90         |   0
 .../anyArguments_fromLittleToBig.f90                |   0
 .../convert_assign_to_loop/assign_with_sections.f   |   0
 .../sapfor/convert_assign_to_loop/simple_assign.f   |   0
 .../convert_assign_to_loop/two_dimensional_assign.f |   0
 .../convert_expr_to_loop/expr_with_sections.f       |   0
 .../_test/sapfor/convert_expr_to_loop/simple_expr.f |   0
 .../convert_expr_to_loop/two_dimensional_expr.f     |   0
 .../_test/sapfor/convert_sum_to_loop/simple_sum.f   |   0
 .../sapfor/convert_sum_to_loop/sum_with_sections.f  |   0
 .../convert_sum_to_loop/two_dimensional_sum.f       |   0
 .../sapfor/convert_where_to_loop/simple_where.f     |   0
 .../convert_where_to_loop/two_dimensional_where.f   |   0
 .../convert_where_to_loop/where_with_sections.f     |   0
 .../sapfor/create_nested_loops/program.expected.f90 |   0
 .../_test/sapfor/create_nested_loops/program.f90    |   0
 .../_test/sapfor/create_nested_loops/test.bat       |   0
 .../_test/sapfor/create_nested_loops/test.sh        |   0
 .../fission_and_private_exp/fission_priv_exp.f90    |   0
 .../_test/sapfor/loops_combiner/test_1.for          |   0
 .../_test/sapfor/loops_combiner/test_2.for          |   0
 .../_test/sapfor/loops_combiner/test_3.for          |   0
 .../_test/sapfor/loops_combiner/test_4.for          |   0
 .../_test/sapfor/loops_combiner/test_5.for          |   0
 .../sapfor/merge_regions/array_read_before_write.in |   0
 .../merge_regions/array_read_before_write.out       |   0
 .../_test/sapfor/merge_regions/read_before_read.in  |   0
 .../_test/sapfor/merge_regions/read_before_read.out |   0
 .../sapfor/merge_regions/read_in_loop_header.in     |   0
 .../sapfor/merge_regions/read_in_loop_header.out    |   0
 .../sapfor/merge_regions/var_modified_in_fun.in     |   0
 .../sapfor/merge_regions/var_modified_in_fun.out    |   0
 .../sapfor/merge_regions/var_read_before_write.in   |   0
 .../sapfor/merge_regions/var_read_before_write.out  |   0
 .../_test/sapfor/merge_regions/write_before_read.in |   0
 .../sapfor/merge_regions/write_before_read.out      |   0
 .../sapfor/merge_regions/write_before_write.in      |   0
 .../sapfor/merge_regions/write_before_write.out     |   0
 .../_test/sapfor/parameter/magnit_3d.for            |   0
 .../_test/sapfor/parameter/mycom.for                |   0
 .../_test/sapfor/parameter/parameter.f90            |   0
 .../_test/sapfor/private_removing/test.f            |   0
 .../sapfor/private_removing/test_cannot_remove.f    |   0
 .../_test/sapfor/private_removing/test_cascade.f    |   0
 .../_test/sapfor/shrink/error.f                     |   0
 .../_test/sapfor/shrink/error2.f                    |   0
 .../_test/sapfor/shrink/error3.f                    |   0
 .../_test/sapfor/shrink/shrink.f                    |   0
 .../_test/sapfor/shrink/shrink2.f                   |   0
 .../_test/sapfor/shrink/shrink3.f                   |   0
 .../Sapfor_2017 => Sapfor}/paths.default.txt        |   0
 426 files changed, 0 insertions(+), 0 deletions(-)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/CMakeLists.txt (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/FDVM/CMakeLists.txt (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/Parser/CMakeLists.txt (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/SageLib/CMakeLists.txt (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/SageNewSrc/CMakeLists.txt (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/SageOldSrc/CMakeLists.txt (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/Sapc++/Sapc++.sln (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/Sapfor/Makefile (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/CFGraph.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/CFGraph.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/DataFlow/backward_data_flow.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/DataFlow/backward_data_flow_impl.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/DataFlow/data_flow.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/DataFlow/data_flow_impl.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/IR.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/IR.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/RD_subst.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/RD_subst.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/live_variable_analysis.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/live_variable_analysis.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/private_variables_analysis.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CFGraph/private_variables_analysis.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CreateInterTree/CreateInterTree.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/CreateInterTree/CreateInterTree.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/directive_analyzer.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/directive_analyzer.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/directive_creator.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/directive_creator.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/directive_creator_base.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/directive_omp_parser.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/directive_omp_parser.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/directive_parser.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/directive_parser.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/insert_directive.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/insert_directive.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/remote_access.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/remote_access.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/remote_access_base.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/shadow.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/shadow.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DirectiveProcessing/spf_directive_preproc.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/Array.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/Array.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/ArrayAnalysis.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/Arrays.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/CreateDistributionDirs.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/CreateDistributionDirs.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/Cycle.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/Cycle.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/Distribution.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/Distribution.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/DvmhDirective.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/DvmhDirective.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/DvmhDirectiveBase.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/DvmhDirectiveBase.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/DvmhDirective_func.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/GraphCSR.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Distribution/GraphCSR.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/DvmhRegion.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/DvmhRegion.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/DvmhRegionInserter.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/DvmhRegionInserter.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/LoopChecker.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/LoopChecker.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/ReadWriteAnalyzer.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/ReadWriteAnalyzer.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/RegionsMerger.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/RegionsMerger.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/TypedSymbol.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/TypedSymbol.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/VarUsages.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DvmhRegions/VarUsages.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DynamicAnalysis/createParallelRegions.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DynamicAnalysis/createParallelRegions.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DynamicAnalysis/gCov_parser.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DynamicAnalysis/gCov_parser_func.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DynamicAnalysis/gcov_info.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/DynamicAnalysis/gcov_info.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ExpressionTransform/control_flow_graph_part.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ExpressionTransform/expr_transform.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ExpressionTransform/expr_transform.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/GraphCall/graph_calls.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/GraphCall/graph_calls.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/GraphCall/graph_calls_base.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/GraphCall/graph_calls_func.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/GraphLoop/graph_loops.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/GraphLoop/graph_loops.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/GraphLoop/graph_loops_base.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/GraphLoop/graph_loops_func.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Inliner/inliner.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Inliner/inliner.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/LoopAnalyzer/allocations_prepoc.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/LoopAnalyzer/dep_analyzer.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/LoopAnalyzer/loop_analyzer.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/LoopAnalyzer/loop_analyzer.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ParallelizationRegions/ParRegions.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ParallelizationRegions/ParRegions.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ParallelizationRegions/ParRegions_func.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ParallelizationRegions/expand_extract_reg.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ParallelizationRegions/expand_extract_reg.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ParallelizationRegions/resolve_par_reg_conflicts.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/AMView.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/AMView.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/AlignAxis.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/AlignAxis.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/BGroup.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/BGroup.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Block.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Block.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/CallInfoStructs.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/CallParams.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/CommCost.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/CommCost.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/DArray.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/DArray.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/DimBound.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/DimBound.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/DistAxis.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/DistAxis.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Event.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Event.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/FuncCall.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/FuncCall.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Interval.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Interval.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/IntervalTemplate.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/LoopBlock.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/LoopBlock.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/LoopLS.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/LoopLS.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Ls.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Ls.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelDArray.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelIO.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelInterval.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelMPS_AM.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelParLoop.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelReduct.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelRegular.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelRemAccess.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelShadow.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ModelStructs.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ParLoop.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ParLoop.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ParseString.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/ParseString.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Processor.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Processor.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Ps.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Ps.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/RedGroup.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/RedGroup.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/RedVar.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/RedVar.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/RemAccessBuf.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/RemAccessBuf.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Space.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Space.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/StdAfx.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/TraceLine.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/TraceLine.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Ver.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Vm.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/Vm.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/adler32.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/compress.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/crc32.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/deflate.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/deflate.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/gzio.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/infblock.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/infblock.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/infcodes.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/infcodes.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/inffast.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/inffast.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/inffixed.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/inflate.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/inftrees.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/inftrees.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/infutil.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/infutil.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/intersection.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/predictor.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/trees.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/trees.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/uncompr.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/zconf.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/zlib.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/zutil.c (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/Lib/zutil.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/PredictScheme.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/PredictScheme.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/PredictorInterface.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/PredictorModel.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Predictor/PredictorModel.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/PrivateAnalyzer/private_analyzer.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/PrivateAnalyzer/private_analyzer.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectManipulation/ConvertFiles.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectManipulation/ConvertFiles.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectManipulation/FileInfo.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectManipulation/FileInfo.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectManipulation/ParseFiles.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectManipulation/ParseFiles.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectManipulation/PerfAnalyzer.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectManipulation/PerfAnalyzer.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectManipulation/StdCapture.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectParameters/projectParameters.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/ProjectParameters/projectParameters.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/RenameSymbols/rename_symbols.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/RenameSymbols/rename_symbols.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/Makefile (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/Makefile (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/README (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/affine.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/cover.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/debug.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/Exit.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/affine.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/cover.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/dddir.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/debug.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/flags.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/ip.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/kill.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/missing.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/portable.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/range.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/refine.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/screen.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/ip.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/kill.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/refine.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/README (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/annotationDriver.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/annotationDriver.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/arrayRef.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/arrayRef.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/computeInducVar.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/constanteProp.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/constanteSet.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/controlFlow.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/defUse.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/definesValues.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/definitionSet.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/depGraph.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/depGraph.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/depInterface.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/depInterface.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/depInterfaceExt.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/dependence.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/dependence.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/flowAnalysis.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/inducVar.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/intrinsic.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/intrinsic.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/invariant.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/loopTransform.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/reductionCode.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/set.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SageAnalysisTool/set.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Sapfor.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Sapfor.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/SapforData.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Server/checkUniq.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Server/server.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Server/spf_icon.ico (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/array_assign_to_loop.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/array_assign_to_loop.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/checkpoints.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/checkpoints.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/convert_to_c.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/convert_to_c.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/dead_code.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/dead_code.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/enddo_loop_converter.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/enddo_loop_converter.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/fix_common_blocks.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/fix_common_blocks.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/function_purifying.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/function_purifying.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/loop_transform.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/loop_transform.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/loops_combiner.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/loops_combiner.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/loops_splitter.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/loops_splitter.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/loops_unrolling.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/loops_unrolling.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/private_arrays_resizing.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/private_arrays_resizing.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/private_removing.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/private_removing.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/replace_dist_arrays_in_io.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/replace_dist_arrays_in_io.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/set_implicit_none.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/set_implicit_none.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/swap_array_dims.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/swap_array_dims.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/uniq_call_chain_dup.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Transformations/uniq_call_chain_dup.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/AstWrapper.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/BoostStackTrace.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/CommonBlock.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/DefUseList.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/PassManager.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/RationalNum.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/RationalNum.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/SgUtils.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/SgUtils.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/errors.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/leak_detector.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/module_utils.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/module_utils.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/russian_errors_text.txt (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/types.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/utils.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/utils.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/Utils/version.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VerificationCode/CorrectVarDecl.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VerificationCode/IncludeChecker.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VerificationCode/StructureChecker.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VerificationCode/VerifySageStructures.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VerificationCode/verifications.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/BuildGraph.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/BuildGraph.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/SendMessage.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/SendMessage.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/get_information.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/get_information.h (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/algebra.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/algebra.hpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/layout.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/layout.hpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/nodesoup.cpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_src/VisualizerCalls/graphLayout/nodesoup.hpp (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/inliner/alex.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/inliner/array_sum.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/inliner/inlineFunctionWithAllocatable.f90 (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/inliner/sub.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/inliner/test.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/check_args_decl/arg_decl_test_err1.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/check_args_decl/arg_decl_test_err2.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/check_args_decl/arg_decl_test_err3.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/check_args_decl/arg_decl_test_ok1.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/check_args_decl/arg_decl_test_ok2.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/check_args_decl/arg_decl_test_ok3.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/check_args_decl/arg_decl_test_wr1.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/check_args_decl/arg_decl_test_wr3.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/checkpoint/checkpoint.f90 (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/checkpoint/checkpoint2.f90 (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90 (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_assign_to_loop/assign_with_sections.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_assign_to_loop/simple_assign.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_expr_to_loop/expr_with_sections.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_expr_to_loop/simple_expr.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_sum_to_loop/simple_sum.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_sum_to_loop/sum_with_sections.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_where_to_loop/simple_where.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_where_to_loop/two_dimensional_where.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/convert_where_to_loop/where_with_sections.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/create_nested_loops/program.expected.f90 (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/create_nested_loops/program.f90 (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/create_nested_loops/test.bat (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/create_nested_loops/test.sh (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90 (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/loops_combiner/test_1.for (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/loops_combiner/test_2.for (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/loops_combiner/test_3.for (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/loops_combiner/test_4.for (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/loops_combiner/test_5.for (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/array_read_before_write.in (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/array_read_before_write.out (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/read_before_read.in (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/read_before_read.out (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/read_in_loop_header.in (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/read_in_loop_header.out (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/var_modified_in_fun.in (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/var_modified_in_fun.out (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/var_read_before_write.in (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/var_read_before_write.out (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/write_before_read.in (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/write_before_read.out (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/write_before_write.in (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/merge_regions/write_before_write.out (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/parameter/magnit_3d.for (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/parameter/mycom.for (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/parameter/parameter.f90 (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/private_removing/test.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/private_removing/test_cannot_remove.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/private_removing/test_cascade.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/shrink/error.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/shrink/error2.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/shrink/error3.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/shrink/shrink.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/shrink/shrink2.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/_test/sapfor/shrink/shrink3.f (100%)
 rename {sapfor/experts/Sapfor_2017 => Sapfor}/paths.default.txt (100%)

diff --git a/sapfor/experts/Sapfor_2017/CMakeLists.txt b/Sapfor/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/CMakeLists.txt
rename to Sapfor/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/FDVM/CMakeLists.txt b/Sapfor/FDVM/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/FDVM/CMakeLists.txt
rename to Sapfor/FDVM/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/Parser/CMakeLists.txt b/Sapfor/Parser/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/Parser/CMakeLists.txt
rename to Sapfor/Parser/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/SageLib/CMakeLists.txt b/Sapfor/SageLib/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/SageLib/CMakeLists.txt
rename to Sapfor/SageLib/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/SageNewSrc/CMakeLists.txt b/Sapfor/SageNewSrc/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/SageNewSrc/CMakeLists.txt
rename to Sapfor/SageNewSrc/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/SageOldSrc/CMakeLists.txt b/Sapfor/SageOldSrc/CMakeLists.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/SageOldSrc/CMakeLists.txt
rename to Sapfor/SageOldSrc/CMakeLists.txt
diff --git a/sapfor/experts/Sapfor_2017/Sapc++/Sapc++.sln b/Sapfor/Sapc++/Sapc++.sln
similarity index 100%
rename from sapfor/experts/Sapfor_2017/Sapc++/Sapc++.sln
rename to Sapfor/Sapc++/Sapc++.sln
diff --git a/sapfor/experts/Sapfor_2017/Sapfor/Makefile b/Sapfor/Sapfor/Makefile
similarity index 100%
rename from sapfor/experts/Sapfor_2017/Sapfor/Makefile
rename to Sapfor/Sapfor/Makefile
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.cpp b/Sapfor/_src/CFGraph/CFGraph.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.cpp
rename to Sapfor/_src/CFGraph/CFGraph.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.h b/Sapfor/_src/CFGraph/CFGraph.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/CFGraph.h
rename to Sapfor/_src/CFGraph/CFGraph.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h b/Sapfor/_src/CFGraph/DataFlow/backward_data_flow.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow.h
rename to Sapfor/_src/CFGraph/DataFlow/backward_data_flow.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow_impl.h b/Sapfor/_src/CFGraph/DataFlow/backward_data_flow_impl.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/backward_data_flow_impl.h
rename to Sapfor/_src/CFGraph/DataFlow/backward_data_flow_impl.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow.h b/Sapfor/_src/CFGraph/DataFlow/data_flow.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow.h
rename to Sapfor/_src/CFGraph/DataFlow/data_flow.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h b/Sapfor/_src/CFGraph/DataFlow/data_flow_impl.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/DataFlow/data_flow_impl.h
rename to Sapfor/_src/CFGraph/DataFlow/data_flow_impl.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/IR.cpp b/Sapfor/_src/CFGraph/IR.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/IR.cpp
rename to Sapfor/_src/CFGraph/IR.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/IR.h b/Sapfor/_src/CFGraph/IR.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/IR.h
rename to Sapfor/_src/CFGraph/IR.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/RD_subst.cpp b/Sapfor/_src/CFGraph/RD_subst.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/RD_subst.cpp
rename to Sapfor/_src/CFGraph/RD_subst.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/RD_subst.h b/Sapfor/_src/CFGraph/RD_subst.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/RD_subst.h
rename to Sapfor/_src/CFGraph/RD_subst.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.cpp b/Sapfor/_src/CFGraph/live_variable_analysis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.cpp
rename to Sapfor/_src/CFGraph/live_variable_analysis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.h b/Sapfor/_src/CFGraph/live_variable_analysis.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/live_variable_analysis.h
rename to Sapfor/_src/CFGraph/live_variable_analysis.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.cpp b/Sapfor/_src/CFGraph/private_variables_analysis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.cpp
rename to Sapfor/_src/CFGraph/private_variables_analysis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.h b/Sapfor/_src/CFGraph/private_variables_analysis.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CFGraph/private_variables_analysis.h
rename to Sapfor/_src/CFGraph/private_variables_analysis.h
diff --git a/sapfor/experts/Sapfor_2017/_src/CreateInterTree/CreateInterTree.cpp b/Sapfor/_src/CreateInterTree/CreateInterTree.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CreateInterTree/CreateInterTree.cpp
rename to Sapfor/_src/CreateInterTree/CreateInterTree.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/CreateInterTree/CreateInterTree.h b/Sapfor/_src/CreateInterTree/CreateInterTree.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/CreateInterTree/CreateInterTree.h
rename to Sapfor/_src/CreateInterTree/CreateInterTree.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_analyzer.cpp b/Sapfor/_src/DirectiveProcessing/directive_analyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_analyzer.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_analyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_analyzer.h b/Sapfor/_src/DirectiveProcessing/directive_analyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_analyzer.h
rename to Sapfor/_src/DirectiveProcessing/directive_analyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.cpp b/Sapfor/_src/DirectiveProcessing/directive_creator.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_creator.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.h b/Sapfor/_src/DirectiveProcessing/directive_creator.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator.h
rename to Sapfor/_src/DirectiveProcessing/directive_creator.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator_base.cpp b/Sapfor/_src/DirectiveProcessing/directive_creator_base.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_creator_base.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_creator_base.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_omp_parser.cpp b/Sapfor/_src/DirectiveProcessing/directive_omp_parser.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_omp_parser.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_omp_parser.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_omp_parser.h b/Sapfor/_src/DirectiveProcessing/directive_omp_parser.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_omp_parser.h
rename to Sapfor/_src/DirectiveProcessing/directive_omp_parser.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.cpp b/Sapfor/_src/DirectiveProcessing/directive_parser.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.cpp
rename to Sapfor/_src/DirectiveProcessing/directive_parser.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.h b/Sapfor/_src/DirectiveProcessing/directive_parser.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/directive_parser.h
rename to Sapfor/_src/DirectiveProcessing/directive_parser.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp b/Sapfor/_src/DirectiveProcessing/insert_directive.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.cpp
rename to Sapfor/_src/DirectiveProcessing/insert_directive.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.h b/Sapfor/_src/DirectiveProcessing/insert_directive.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/insert_directive.h
rename to Sapfor/_src/DirectiveProcessing/insert_directive.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp b/Sapfor/_src/DirectiveProcessing/remote_access.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.cpp
rename to Sapfor/_src/DirectiveProcessing/remote_access.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.h b/Sapfor/_src/DirectiveProcessing/remote_access.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access.h
rename to Sapfor/_src/DirectiveProcessing/remote_access.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access_base.cpp b/Sapfor/_src/DirectiveProcessing/remote_access_base.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/remote_access_base.cpp
rename to Sapfor/_src/DirectiveProcessing/remote_access_base.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp b/Sapfor/_src/DirectiveProcessing/shadow.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.cpp
rename to Sapfor/_src/DirectiveProcessing/shadow.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.h b/Sapfor/_src/DirectiveProcessing/shadow.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/shadow.h
rename to Sapfor/_src/DirectiveProcessing/shadow.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/spf_directive_preproc.cpp b/Sapfor/_src/DirectiveProcessing/spf_directive_preproc.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DirectiveProcessing/spf_directive_preproc.cpp
rename to Sapfor/_src/DirectiveProcessing/spf_directive_preproc.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Array.cpp b/Sapfor/_src/Distribution/Array.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Array.cpp
rename to Sapfor/_src/Distribution/Array.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Array.h b/Sapfor/_src/Distribution/Array.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Array.h
rename to Sapfor/_src/Distribution/Array.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/ArrayAnalysis.cpp b/Sapfor/_src/Distribution/ArrayAnalysis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/ArrayAnalysis.cpp
rename to Sapfor/_src/Distribution/ArrayAnalysis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Arrays.h b/Sapfor/_src/Distribution/Arrays.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Arrays.h
rename to Sapfor/_src/Distribution/Arrays.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/CreateDistributionDirs.cpp b/Sapfor/_src/Distribution/CreateDistributionDirs.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/CreateDistributionDirs.cpp
rename to Sapfor/_src/Distribution/CreateDistributionDirs.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/CreateDistributionDirs.h b/Sapfor/_src/Distribution/CreateDistributionDirs.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/CreateDistributionDirs.h
rename to Sapfor/_src/Distribution/CreateDistributionDirs.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Cycle.cpp b/Sapfor/_src/Distribution/Cycle.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Cycle.cpp
rename to Sapfor/_src/Distribution/Cycle.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Cycle.h b/Sapfor/_src/Distribution/Cycle.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Cycle.h
rename to Sapfor/_src/Distribution/Cycle.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.cpp b/Sapfor/_src/Distribution/Distribution.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.cpp
rename to Sapfor/_src/Distribution/Distribution.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.h b/Sapfor/_src/Distribution/Distribution.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/Distribution.h
rename to Sapfor/_src/Distribution/Distribution.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp b/Sapfor/_src/Distribution/DvmhDirective.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.cpp
rename to Sapfor/_src/Distribution/DvmhDirective.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.h b/Sapfor/_src/Distribution/DvmhDirective.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective.h
rename to Sapfor/_src/Distribution/DvmhDirective.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirectiveBase.cpp b/Sapfor/_src/Distribution/DvmhDirectiveBase.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirectiveBase.cpp
rename to Sapfor/_src/Distribution/DvmhDirectiveBase.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirectiveBase.h b/Sapfor/_src/Distribution/DvmhDirectiveBase.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirectiveBase.h
rename to Sapfor/_src/Distribution/DvmhDirectiveBase.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective_func.h b/Sapfor/_src/Distribution/DvmhDirective_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/DvmhDirective_func.h
rename to Sapfor/_src/Distribution/DvmhDirective_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/GraphCSR.cpp b/Sapfor/_src/Distribution/GraphCSR.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/GraphCSR.cpp
rename to Sapfor/_src/Distribution/GraphCSR.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Distribution/GraphCSR.h b/Sapfor/_src/Distribution/GraphCSR.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Distribution/GraphCSR.h
rename to Sapfor/_src/Distribution/GraphCSR.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegion.cpp b/Sapfor/_src/DvmhRegions/DvmhRegion.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegion.cpp
rename to Sapfor/_src/DvmhRegions/DvmhRegion.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegion.h b/Sapfor/_src/DvmhRegions/DvmhRegion.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegion.h
rename to Sapfor/_src/DvmhRegions/DvmhRegion.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp b/Sapfor/_src/DvmhRegions/DvmhRegionInserter.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.cpp
rename to Sapfor/_src/DvmhRegions/DvmhRegionInserter.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h b/Sapfor/_src/DvmhRegions/DvmhRegionInserter.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/DvmhRegionInserter.h
rename to Sapfor/_src/DvmhRegions/DvmhRegionInserter.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/LoopChecker.cpp b/Sapfor/_src/DvmhRegions/LoopChecker.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/LoopChecker.cpp
rename to Sapfor/_src/DvmhRegions/LoopChecker.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/LoopChecker.h b/Sapfor/_src/DvmhRegions/LoopChecker.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/LoopChecker.h
rename to Sapfor/_src/DvmhRegions/LoopChecker.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/ReadWriteAnalyzer.cpp b/Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/ReadWriteAnalyzer.cpp
rename to Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/ReadWriteAnalyzer.h b/Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/ReadWriteAnalyzer.h
rename to Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/RegionsMerger.cpp b/Sapfor/_src/DvmhRegions/RegionsMerger.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/RegionsMerger.cpp
rename to Sapfor/_src/DvmhRegions/RegionsMerger.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/RegionsMerger.h b/Sapfor/_src/DvmhRegions/RegionsMerger.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/RegionsMerger.h
rename to Sapfor/_src/DvmhRegions/RegionsMerger.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/TypedSymbol.cpp b/Sapfor/_src/DvmhRegions/TypedSymbol.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/TypedSymbol.cpp
rename to Sapfor/_src/DvmhRegions/TypedSymbol.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/TypedSymbol.h b/Sapfor/_src/DvmhRegions/TypedSymbol.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/TypedSymbol.h
rename to Sapfor/_src/DvmhRegions/TypedSymbol.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/VarUsages.cpp b/Sapfor/_src/DvmhRegions/VarUsages.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/VarUsages.cpp
rename to Sapfor/_src/DvmhRegions/VarUsages.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DvmhRegions/VarUsages.h b/Sapfor/_src/DvmhRegions/VarUsages.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DvmhRegions/VarUsages.h
rename to Sapfor/_src/DvmhRegions/VarUsages.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/createParallelRegions.cpp b/Sapfor/_src/DynamicAnalysis/createParallelRegions.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/createParallelRegions.cpp
rename to Sapfor/_src/DynamicAnalysis/createParallelRegions.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/createParallelRegions.h b/Sapfor/_src/DynamicAnalysis/createParallelRegions.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/createParallelRegions.h
rename to Sapfor/_src/DynamicAnalysis/createParallelRegions.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gCov_parser.cpp b/Sapfor/_src/DynamicAnalysis/gCov_parser.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gCov_parser.cpp
rename to Sapfor/_src/DynamicAnalysis/gCov_parser.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gCov_parser_func.h b/Sapfor/_src/DynamicAnalysis/gCov_parser_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gCov_parser_func.h
rename to Sapfor/_src/DynamicAnalysis/gCov_parser_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gcov_info.cpp b/Sapfor/_src/DynamicAnalysis/gcov_info.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gcov_info.cpp
rename to Sapfor/_src/DynamicAnalysis/gcov_info.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gcov_info.h b/Sapfor/_src/DynamicAnalysis/gcov_info.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/DynamicAnalysis/gcov_info.h
rename to Sapfor/_src/DynamicAnalysis/gcov_info.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ExpressionTransform/control_flow_graph_part.cpp b/Sapfor/_src/ExpressionTransform/control_flow_graph_part.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ExpressionTransform/control_flow_graph_part.cpp
rename to Sapfor/_src/ExpressionTransform/control_flow_graph_part.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ExpressionTransform/expr_transform.cpp b/Sapfor/_src/ExpressionTransform/expr_transform.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ExpressionTransform/expr_transform.cpp
rename to Sapfor/_src/ExpressionTransform/expr_transform.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ExpressionTransform/expr_transform.h b/Sapfor/_src/ExpressionTransform/expr_transform.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ExpressionTransform/expr_transform.h
rename to Sapfor/_src/ExpressionTransform/expr_transform.h
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp b/Sapfor/_src/GraphCall/graph_calls.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.cpp
rename to Sapfor/_src/GraphCall/graph_calls.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.h b/Sapfor/_src/GraphCall/graph_calls.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls.h
rename to Sapfor/_src/GraphCall/graph_calls.h
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp b/Sapfor/_src/GraphCall/graph_calls_base.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_base.cpp
rename to Sapfor/_src/GraphCall/graph_calls_base.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_func.h b/Sapfor/_src/GraphCall/graph_calls_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphCall/graph_calls_func.h
rename to Sapfor/_src/GraphCall/graph_calls_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.cpp b/Sapfor/_src/GraphLoop/graph_loops.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.cpp
rename to Sapfor/_src/GraphLoop/graph_loops.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.h b/Sapfor/_src/GraphLoop/graph_loops.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops.h
rename to Sapfor/_src/GraphLoop/graph_loops.h
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_base.cpp b/Sapfor/_src/GraphLoop/graph_loops_base.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_base.cpp
rename to Sapfor/_src/GraphLoop/graph_loops_base.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_func.h b/Sapfor/_src/GraphLoop/graph_loops_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/GraphLoop/graph_loops_func.h
rename to Sapfor/_src/GraphLoop/graph_loops_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Inliner/inliner.cpp b/Sapfor/_src/Inliner/inliner.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Inliner/inliner.cpp
rename to Sapfor/_src/Inliner/inliner.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Inliner/inliner.h b/Sapfor/_src/Inliner/inliner.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Inliner/inliner.h
rename to Sapfor/_src/Inliner/inliner.h
diff --git a/sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/allocations_prepoc.cpp b/Sapfor/_src/LoopAnalyzer/allocations_prepoc.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/allocations_prepoc.cpp
rename to Sapfor/_src/LoopAnalyzer/allocations_prepoc.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/dep_analyzer.cpp b/Sapfor/_src/LoopAnalyzer/dep_analyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/dep_analyzer.cpp
rename to Sapfor/_src/LoopAnalyzer/dep_analyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/loop_analyzer.cpp b/Sapfor/_src/LoopAnalyzer/loop_analyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/loop_analyzer.cpp
rename to Sapfor/_src/LoopAnalyzer/loop_analyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/loop_analyzer.h b/Sapfor/_src/LoopAnalyzer/loop_analyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/LoopAnalyzer/loop_analyzer.h
rename to Sapfor/_src/LoopAnalyzer/loop_analyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.cpp b/Sapfor/_src/ParallelizationRegions/ParRegions.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.cpp
rename to Sapfor/_src/ParallelizationRegions/ParRegions.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.h b/Sapfor/_src/ParallelizationRegions/ParRegions.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions.h
rename to Sapfor/_src/ParallelizationRegions/ParRegions.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions_func.h b/Sapfor/_src/ParallelizationRegions/ParRegions_func.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/ParRegions_func.h
rename to Sapfor/_src/ParallelizationRegions/ParRegions_func.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/expand_extract_reg.cpp b/Sapfor/_src/ParallelizationRegions/expand_extract_reg.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/expand_extract_reg.cpp
rename to Sapfor/_src/ParallelizationRegions/expand_extract_reg.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/expand_extract_reg.h b/Sapfor/_src/ParallelizationRegions/expand_extract_reg.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/expand_extract_reg.h
rename to Sapfor/_src/ParallelizationRegions/expand_extract_reg.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp b/Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
rename to Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/resolve_par_reg_conflicts.h b/Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ParallelizationRegions/resolve_par_reg_conflicts.h
rename to Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AMView.cpp b/Sapfor/_src/Predictor/Lib/AMView.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AMView.cpp
rename to Sapfor/_src/Predictor/Lib/AMView.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AMView.h b/Sapfor/_src/Predictor/Lib/AMView.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AMView.h
rename to Sapfor/_src/Predictor/Lib/AMView.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AlignAxis.cpp b/Sapfor/_src/Predictor/Lib/AlignAxis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AlignAxis.cpp
rename to Sapfor/_src/Predictor/Lib/AlignAxis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AlignAxis.h b/Sapfor/_src/Predictor/Lib/AlignAxis.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/AlignAxis.h
rename to Sapfor/_src/Predictor/Lib/AlignAxis.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/BGroup.cpp b/Sapfor/_src/Predictor/Lib/BGroup.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/BGroup.cpp
rename to Sapfor/_src/Predictor/Lib/BGroup.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/BGroup.h b/Sapfor/_src/Predictor/Lib/BGroup.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/BGroup.h
rename to Sapfor/_src/Predictor/Lib/BGroup.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Block.cpp b/Sapfor/_src/Predictor/Lib/Block.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Block.cpp
rename to Sapfor/_src/Predictor/Lib/Block.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Block.h b/Sapfor/_src/Predictor/Lib/Block.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Block.h
rename to Sapfor/_src/Predictor/Lib/Block.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CallInfoStructs.h b/Sapfor/_src/Predictor/Lib/CallInfoStructs.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CallInfoStructs.h
rename to Sapfor/_src/Predictor/Lib/CallInfoStructs.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CallParams.cpp b/Sapfor/_src/Predictor/Lib/CallParams.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CallParams.cpp
rename to Sapfor/_src/Predictor/Lib/CallParams.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CommCost.cpp b/Sapfor/_src/Predictor/Lib/CommCost.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CommCost.cpp
rename to Sapfor/_src/Predictor/Lib/CommCost.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CommCost.h b/Sapfor/_src/Predictor/Lib/CommCost.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/CommCost.h
rename to Sapfor/_src/Predictor/Lib/CommCost.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DArray.cpp b/Sapfor/_src/Predictor/Lib/DArray.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DArray.cpp
rename to Sapfor/_src/Predictor/Lib/DArray.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DArray.h b/Sapfor/_src/Predictor/Lib/DArray.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DArray.h
rename to Sapfor/_src/Predictor/Lib/DArray.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DimBound.cpp b/Sapfor/_src/Predictor/Lib/DimBound.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DimBound.cpp
rename to Sapfor/_src/Predictor/Lib/DimBound.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DimBound.h b/Sapfor/_src/Predictor/Lib/DimBound.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DimBound.h
rename to Sapfor/_src/Predictor/Lib/DimBound.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DistAxis.cpp b/Sapfor/_src/Predictor/Lib/DistAxis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DistAxis.cpp
rename to Sapfor/_src/Predictor/Lib/DistAxis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DistAxis.h b/Sapfor/_src/Predictor/Lib/DistAxis.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/DistAxis.h
rename to Sapfor/_src/Predictor/Lib/DistAxis.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Event.cpp b/Sapfor/_src/Predictor/Lib/Event.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Event.cpp
rename to Sapfor/_src/Predictor/Lib/Event.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Event.h b/Sapfor/_src/Predictor/Lib/Event.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Event.h
rename to Sapfor/_src/Predictor/Lib/Event.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/FuncCall.cpp b/Sapfor/_src/Predictor/Lib/FuncCall.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/FuncCall.cpp
rename to Sapfor/_src/Predictor/Lib/FuncCall.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/FuncCall.h b/Sapfor/_src/Predictor/Lib/FuncCall.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/FuncCall.h
rename to Sapfor/_src/Predictor/Lib/FuncCall.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Interval.cpp b/Sapfor/_src/Predictor/Lib/Interval.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Interval.cpp
rename to Sapfor/_src/Predictor/Lib/Interval.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Interval.h b/Sapfor/_src/Predictor/Lib/Interval.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Interval.h
rename to Sapfor/_src/Predictor/Lib/Interval.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/IntervalTemplate.cpp b/Sapfor/_src/Predictor/Lib/IntervalTemplate.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/IntervalTemplate.cpp
rename to Sapfor/_src/Predictor/Lib/IntervalTemplate.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopBlock.cpp b/Sapfor/_src/Predictor/Lib/LoopBlock.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopBlock.cpp
rename to Sapfor/_src/Predictor/Lib/LoopBlock.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopBlock.h b/Sapfor/_src/Predictor/Lib/LoopBlock.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopBlock.h
rename to Sapfor/_src/Predictor/Lib/LoopBlock.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopLS.cpp b/Sapfor/_src/Predictor/Lib/LoopLS.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopLS.cpp
rename to Sapfor/_src/Predictor/Lib/LoopLS.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopLS.h b/Sapfor/_src/Predictor/Lib/LoopLS.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/LoopLS.h
rename to Sapfor/_src/Predictor/Lib/LoopLS.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ls.cpp b/Sapfor/_src/Predictor/Lib/Ls.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ls.cpp
rename to Sapfor/_src/Predictor/Lib/Ls.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ls.h b/Sapfor/_src/Predictor/Lib/Ls.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ls.h
rename to Sapfor/_src/Predictor/Lib/Ls.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelDArray.cpp b/Sapfor/_src/Predictor/Lib/ModelDArray.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelDArray.cpp
rename to Sapfor/_src/Predictor/Lib/ModelDArray.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelIO.cpp b/Sapfor/_src/Predictor/Lib/ModelIO.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelIO.cpp
rename to Sapfor/_src/Predictor/Lib/ModelIO.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelInterval.cpp b/Sapfor/_src/Predictor/Lib/ModelInterval.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelInterval.cpp
rename to Sapfor/_src/Predictor/Lib/ModelInterval.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelMPS_AM.cpp b/Sapfor/_src/Predictor/Lib/ModelMPS_AM.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelMPS_AM.cpp
rename to Sapfor/_src/Predictor/Lib/ModelMPS_AM.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelParLoop.cpp b/Sapfor/_src/Predictor/Lib/ModelParLoop.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelParLoop.cpp
rename to Sapfor/_src/Predictor/Lib/ModelParLoop.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelReduct.cpp b/Sapfor/_src/Predictor/Lib/ModelReduct.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelReduct.cpp
rename to Sapfor/_src/Predictor/Lib/ModelReduct.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelRegular.cpp b/Sapfor/_src/Predictor/Lib/ModelRegular.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelRegular.cpp
rename to Sapfor/_src/Predictor/Lib/ModelRegular.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelRemAccess.cpp b/Sapfor/_src/Predictor/Lib/ModelRemAccess.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelRemAccess.cpp
rename to Sapfor/_src/Predictor/Lib/ModelRemAccess.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelShadow.cpp b/Sapfor/_src/Predictor/Lib/ModelShadow.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelShadow.cpp
rename to Sapfor/_src/Predictor/Lib/ModelShadow.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelStructs.h b/Sapfor/_src/Predictor/Lib/ModelStructs.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ModelStructs.h
rename to Sapfor/_src/Predictor/Lib/ModelStructs.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParLoop.cpp b/Sapfor/_src/Predictor/Lib/ParLoop.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParLoop.cpp
rename to Sapfor/_src/Predictor/Lib/ParLoop.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParLoop.h b/Sapfor/_src/Predictor/Lib/ParLoop.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParLoop.h
rename to Sapfor/_src/Predictor/Lib/ParLoop.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParseString.cpp b/Sapfor/_src/Predictor/Lib/ParseString.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParseString.cpp
rename to Sapfor/_src/Predictor/Lib/ParseString.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParseString.h b/Sapfor/_src/Predictor/Lib/ParseString.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/ParseString.h
rename to Sapfor/_src/Predictor/Lib/ParseString.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Processor.cpp b/Sapfor/_src/Predictor/Lib/Processor.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Processor.cpp
rename to Sapfor/_src/Predictor/Lib/Processor.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Processor.h b/Sapfor/_src/Predictor/Lib/Processor.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Processor.h
rename to Sapfor/_src/Predictor/Lib/Processor.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ps.cpp b/Sapfor/_src/Predictor/Lib/Ps.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ps.cpp
rename to Sapfor/_src/Predictor/Lib/Ps.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ps.h b/Sapfor/_src/Predictor/Lib/Ps.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ps.h
rename to Sapfor/_src/Predictor/Lib/Ps.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedGroup.cpp b/Sapfor/_src/Predictor/Lib/RedGroup.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedGroup.cpp
rename to Sapfor/_src/Predictor/Lib/RedGroup.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedGroup.h b/Sapfor/_src/Predictor/Lib/RedGroup.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedGroup.h
rename to Sapfor/_src/Predictor/Lib/RedGroup.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedVar.cpp b/Sapfor/_src/Predictor/Lib/RedVar.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedVar.cpp
rename to Sapfor/_src/Predictor/Lib/RedVar.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedVar.h b/Sapfor/_src/Predictor/Lib/RedVar.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RedVar.h
rename to Sapfor/_src/Predictor/Lib/RedVar.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RemAccessBuf.cpp b/Sapfor/_src/Predictor/Lib/RemAccessBuf.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RemAccessBuf.cpp
rename to Sapfor/_src/Predictor/Lib/RemAccessBuf.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RemAccessBuf.h b/Sapfor/_src/Predictor/Lib/RemAccessBuf.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/RemAccessBuf.h
rename to Sapfor/_src/Predictor/Lib/RemAccessBuf.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Space.cpp b/Sapfor/_src/Predictor/Lib/Space.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Space.cpp
rename to Sapfor/_src/Predictor/Lib/Space.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Space.h b/Sapfor/_src/Predictor/Lib/Space.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Space.h
rename to Sapfor/_src/Predictor/Lib/Space.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/StdAfx.h b/Sapfor/_src/Predictor/Lib/StdAfx.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/StdAfx.h
rename to Sapfor/_src/Predictor/Lib/StdAfx.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/TraceLine.cpp b/Sapfor/_src/Predictor/Lib/TraceLine.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/TraceLine.cpp
rename to Sapfor/_src/Predictor/Lib/TraceLine.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/TraceLine.h b/Sapfor/_src/Predictor/Lib/TraceLine.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/TraceLine.h
rename to Sapfor/_src/Predictor/Lib/TraceLine.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ver.h b/Sapfor/_src/Predictor/Lib/Ver.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Ver.h
rename to Sapfor/_src/Predictor/Lib/Ver.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Vm.cpp b/Sapfor/_src/Predictor/Lib/Vm.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Vm.cpp
rename to Sapfor/_src/Predictor/Lib/Vm.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Vm.h b/Sapfor/_src/Predictor/Lib/Vm.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/Vm.h
rename to Sapfor/_src/Predictor/Lib/Vm.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/adler32.c b/Sapfor/_src/Predictor/Lib/adler32.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/adler32.c
rename to Sapfor/_src/Predictor/Lib/adler32.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/compress.c b/Sapfor/_src/Predictor/Lib/compress.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/compress.c
rename to Sapfor/_src/Predictor/Lib/compress.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/crc32.c b/Sapfor/_src/Predictor/Lib/crc32.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/crc32.c
rename to Sapfor/_src/Predictor/Lib/crc32.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/deflate.c b/Sapfor/_src/Predictor/Lib/deflate.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/deflate.c
rename to Sapfor/_src/Predictor/Lib/deflate.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/deflate.h b/Sapfor/_src/Predictor/Lib/deflate.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/deflate.h
rename to Sapfor/_src/Predictor/Lib/deflate.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/gzio.c b/Sapfor/_src/Predictor/Lib/gzio.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/gzio.c
rename to Sapfor/_src/Predictor/Lib/gzio.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infblock.c b/Sapfor/_src/Predictor/Lib/infblock.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infblock.c
rename to Sapfor/_src/Predictor/Lib/infblock.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infblock.h b/Sapfor/_src/Predictor/Lib/infblock.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infblock.h
rename to Sapfor/_src/Predictor/Lib/infblock.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infcodes.c b/Sapfor/_src/Predictor/Lib/infcodes.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infcodes.c
rename to Sapfor/_src/Predictor/Lib/infcodes.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infcodes.h b/Sapfor/_src/Predictor/Lib/infcodes.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infcodes.h
rename to Sapfor/_src/Predictor/Lib/infcodes.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffast.c b/Sapfor/_src/Predictor/Lib/inffast.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffast.c
rename to Sapfor/_src/Predictor/Lib/inffast.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffast.h b/Sapfor/_src/Predictor/Lib/inffast.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffast.h
rename to Sapfor/_src/Predictor/Lib/inffast.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffixed.h b/Sapfor/_src/Predictor/Lib/inffixed.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inffixed.h
rename to Sapfor/_src/Predictor/Lib/inffixed.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inflate.c b/Sapfor/_src/Predictor/Lib/inflate.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inflate.c
rename to Sapfor/_src/Predictor/Lib/inflate.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inftrees.c b/Sapfor/_src/Predictor/Lib/inftrees.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inftrees.c
rename to Sapfor/_src/Predictor/Lib/inftrees.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inftrees.h b/Sapfor/_src/Predictor/Lib/inftrees.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/inftrees.h
rename to Sapfor/_src/Predictor/Lib/inftrees.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infutil.c b/Sapfor/_src/Predictor/Lib/infutil.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infutil.c
rename to Sapfor/_src/Predictor/Lib/infutil.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infutil.h b/Sapfor/_src/Predictor/Lib/infutil.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/infutil.h
rename to Sapfor/_src/Predictor/Lib/infutil.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/intersection.cpp b/Sapfor/_src/Predictor/Lib/intersection.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/intersection.cpp
rename to Sapfor/_src/Predictor/Lib/intersection.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/predictor.cpp b/Sapfor/_src/Predictor/Lib/predictor.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/predictor.cpp
rename to Sapfor/_src/Predictor/Lib/predictor.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/trees.c b/Sapfor/_src/Predictor/Lib/trees.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/trees.c
rename to Sapfor/_src/Predictor/Lib/trees.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/trees.h b/Sapfor/_src/Predictor/Lib/trees.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/trees.h
rename to Sapfor/_src/Predictor/Lib/trees.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/uncompr.c b/Sapfor/_src/Predictor/Lib/uncompr.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/uncompr.c
rename to Sapfor/_src/Predictor/Lib/uncompr.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zconf.h b/Sapfor/_src/Predictor/Lib/zconf.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zconf.h
rename to Sapfor/_src/Predictor/Lib/zconf.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zlib.h b/Sapfor/_src/Predictor/Lib/zlib.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zlib.h
rename to Sapfor/_src/Predictor/Lib/zlib.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zutil.c b/Sapfor/_src/Predictor/Lib/zutil.c
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zutil.c
rename to Sapfor/_src/Predictor/Lib/zutil.c
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zutil.h b/Sapfor/_src/Predictor/Lib/zutil.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/Lib/zutil.h
rename to Sapfor/_src/Predictor/Lib/zutil.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictScheme.cpp b/Sapfor/_src/Predictor/PredictScheme.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictScheme.cpp
rename to Sapfor/_src/Predictor/PredictScheme.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictScheme.h b/Sapfor/_src/Predictor/PredictScheme.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictScheme.h
rename to Sapfor/_src/Predictor/PredictScheme.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictorInterface.h b/Sapfor/_src/Predictor/PredictorInterface.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictorInterface.h
rename to Sapfor/_src/Predictor/PredictorInterface.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictorModel.cpp b/Sapfor/_src/Predictor/PredictorModel.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictorModel.cpp
rename to Sapfor/_src/Predictor/PredictorModel.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Predictor/PredictorModel.h b/Sapfor/_src/Predictor/PredictorModel.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Predictor/PredictorModel.h
rename to Sapfor/_src/Predictor/PredictorModel.h
diff --git a/sapfor/experts/Sapfor_2017/_src/PrivateAnalyzer/private_analyzer.cpp b/Sapfor/_src/PrivateAnalyzer/private_analyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/PrivateAnalyzer/private_analyzer.cpp
rename to Sapfor/_src/PrivateAnalyzer/private_analyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/PrivateAnalyzer/private_analyzer.h b/Sapfor/_src/PrivateAnalyzer/private_analyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/PrivateAnalyzer/private_analyzer.h
rename to Sapfor/_src/PrivateAnalyzer/private_analyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ConvertFiles.cpp b/Sapfor/_src/ProjectManipulation/ConvertFiles.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ConvertFiles.cpp
rename to Sapfor/_src/ProjectManipulation/ConvertFiles.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ConvertFiles.h b/Sapfor/_src/ProjectManipulation/ConvertFiles.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ConvertFiles.h
rename to Sapfor/_src/ProjectManipulation/ConvertFiles.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/FileInfo.cpp b/Sapfor/_src/ProjectManipulation/FileInfo.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/FileInfo.cpp
rename to Sapfor/_src/ProjectManipulation/FileInfo.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/FileInfo.h b/Sapfor/_src/ProjectManipulation/FileInfo.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/FileInfo.h
rename to Sapfor/_src/ProjectManipulation/FileInfo.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ParseFiles.cpp b/Sapfor/_src/ProjectManipulation/ParseFiles.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ParseFiles.cpp
rename to Sapfor/_src/ProjectManipulation/ParseFiles.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ParseFiles.h b/Sapfor/_src/ProjectManipulation/ParseFiles.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/ParseFiles.h
rename to Sapfor/_src/ProjectManipulation/ParseFiles.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/PerfAnalyzer.cpp b/Sapfor/_src/ProjectManipulation/PerfAnalyzer.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/PerfAnalyzer.cpp
rename to Sapfor/_src/ProjectManipulation/PerfAnalyzer.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/PerfAnalyzer.h b/Sapfor/_src/ProjectManipulation/PerfAnalyzer.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/PerfAnalyzer.h
rename to Sapfor/_src/ProjectManipulation/PerfAnalyzer.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectManipulation/StdCapture.h b/Sapfor/_src/ProjectManipulation/StdCapture.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectManipulation/StdCapture.h
rename to Sapfor/_src/ProjectManipulation/StdCapture.h
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectParameters/projectParameters.cpp b/Sapfor/_src/ProjectParameters/projectParameters.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectParameters/projectParameters.cpp
rename to Sapfor/_src/ProjectParameters/projectParameters.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/ProjectParameters/projectParameters.h b/Sapfor/_src/ProjectParameters/projectParameters.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/ProjectParameters/projectParameters.h
rename to Sapfor/_src/ProjectParameters/projectParameters.h
diff --git a/sapfor/experts/Sapfor_2017/_src/RenameSymbols/rename_symbols.cpp b/Sapfor/_src/RenameSymbols/rename_symbols.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/RenameSymbols/rename_symbols.cpp
rename to Sapfor/_src/RenameSymbols/rename_symbols.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/RenameSymbols/rename_symbols.h b/Sapfor/_src/RenameSymbols/rename_symbols.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/RenameSymbols/rename_symbols.h
rename to Sapfor/_src/RenameSymbols/rename_symbols.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/Makefile b/Sapfor/_src/SageAnalysisTool/Makefile
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/Makefile
rename to Sapfor/_src/SageAnalysisTool/Makefile
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/Makefile b/Sapfor/_src/SageAnalysisTool/OmegaForSage/Makefile
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/Makefile
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/Makefile
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/README b/Sapfor/_src/SageAnalysisTool/OmegaForSage/README
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/README
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/README
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/affine.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/affine.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/affine.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/affine.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/cover.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/cover.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/cover.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/cover.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/debug.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/debug.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/debug.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/debug.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/Exit.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/Exit.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/Exit.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/Exit.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/affine.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/affine.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/affine.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/affine.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/cover.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/cover.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/cover.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/cover.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/dddir.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/dddir.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/dddir.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/dddir.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/debug.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/debug.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/debug.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/debug.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/flags.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/flags.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/flags.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/flags.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ip.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ip.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/ip.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ip.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/kill.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/kill.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/kill.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/kill.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/missing.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/missing.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/missing.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/missing.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/portable.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/portable.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/range.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/range.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/range.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/range.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/refine.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/refine.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/refine.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/refine.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/screen.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/screen.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/screen.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/screen.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h b/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ip.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/ip.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/ip.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/ip.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/kill.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/kill.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/kill.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/kill.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/refine.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/refine.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/refine.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/refine.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp b/Sapfor/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
rename to Sapfor/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/README b/Sapfor/_src/SageAnalysisTool/README
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/README
rename to Sapfor/_src/SageAnalysisTool/README
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/annotationDriver.cpp b/Sapfor/_src/SageAnalysisTool/annotationDriver.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/annotationDriver.cpp
rename to Sapfor/_src/SageAnalysisTool/annotationDriver.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/annotationDriver.h b/Sapfor/_src/SageAnalysisTool/annotationDriver.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/annotationDriver.h
rename to Sapfor/_src/SageAnalysisTool/annotationDriver.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/arrayRef.cpp b/Sapfor/_src/SageAnalysisTool/arrayRef.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/arrayRef.cpp
rename to Sapfor/_src/SageAnalysisTool/arrayRef.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/arrayRef.h b/Sapfor/_src/SageAnalysisTool/arrayRef.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/arrayRef.h
rename to Sapfor/_src/SageAnalysisTool/arrayRef.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/computeInducVar.cpp b/Sapfor/_src/SageAnalysisTool/computeInducVar.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/computeInducVar.cpp
rename to Sapfor/_src/SageAnalysisTool/computeInducVar.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/constanteProp.cpp b/Sapfor/_src/SageAnalysisTool/constanteProp.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/constanteProp.cpp
rename to Sapfor/_src/SageAnalysisTool/constanteProp.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/constanteSet.h b/Sapfor/_src/SageAnalysisTool/constanteSet.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/constanteSet.h
rename to Sapfor/_src/SageAnalysisTool/constanteSet.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/controlFlow.cpp b/Sapfor/_src/SageAnalysisTool/controlFlow.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/controlFlow.cpp
rename to Sapfor/_src/SageAnalysisTool/controlFlow.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/defUse.cpp b/Sapfor/_src/SageAnalysisTool/defUse.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/defUse.cpp
rename to Sapfor/_src/SageAnalysisTool/defUse.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/definesValues.h b/Sapfor/_src/SageAnalysisTool/definesValues.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/definesValues.h
rename to Sapfor/_src/SageAnalysisTool/definesValues.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/definitionSet.h b/Sapfor/_src/SageAnalysisTool/definitionSet.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/definitionSet.h
rename to Sapfor/_src/SageAnalysisTool/definitionSet.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depGraph.cpp b/Sapfor/_src/SageAnalysisTool/depGraph.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depGraph.cpp
rename to Sapfor/_src/SageAnalysisTool/depGraph.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depGraph.h b/Sapfor/_src/SageAnalysisTool/depGraph.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depGraph.h
rename to Sapfor/_src/SageAnalysisTool/depGraph.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterface.cpp b/Sapfor/_src/SageAnalysisTool/depInterface.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterface.cpp
rename to Sapfor/_src/SageAnalysisTool/depInterface.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterface.h b/Sapfor/_src/SageAnalysisTool/depInterface.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterface.h
rename to Sapfor/_src/SageAnalysisTool/depInterface.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterfaceExt.h b/Sapfor/_src/SageAnalysisTool/depInterfaceExt.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/depInterfaceExt.h
rename to Sapfor/_src/SageAnalysisTool/depInterfaceExt.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/dependence.cpp b/Sapfor/_src/SageAnalysisTool/dependence.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/dependence.cpp
rename to Sapfor/_src/SageAnalysisTool/dependence.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/dependence.h b/Sapfor/_src/SageAnalysisTool/dependence.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/dependence.h
rename to Sapfor/_src/SageAnalysisTool/dependence.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/flowAnalysis.cpp b/Sapfor/_src/SageAnalysisTool/flowAnalysis.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/flowAnalysis.cpp
rename to Sapfor/_src/SageAnalysisTool/flowAnalysis.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/inducVar.h b/Sapfor/_src/SageAnalysisTool/inducVar.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/inducVar.h
rename to Sapfor/_src/SageAnalysisTool/inducVar.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/intrinsic.cpp b/Sapfor/_src/SageAnalysisTool/intrinsic.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/intrinsic.cpp
rename to Sapfor/_src/SageAnalysisTool/intrinsic.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/intrinsic.h b/Sapfor/_src/SageAnalysisTool/intrinsic.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/intrinsic.h
rename to Sapfor/_src/SageAnalysisTool/intrinsic.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/invariant.cpp b/Sapfor/_src/SageAnalysisTool/invariant.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/invariant.cpp
rename to Sapfor/_src/SageAnalysisTool/invariant.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/loopTransform.cpp b/Sapfor/_src/SageAnalysisTool/loopTransform.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/loopTransform.cpp
rename to Sapfor/_src/SageAnalysisTool/loopTransform.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/reductionCode.h b/Sapfor/_src/SageAnalysisTool/reductionCode.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/reductionCode.h
rename to Sapfor/_src/SageAnalysisTool/reductionCode.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/set.cpp b/Sapfor/_src/SageAnalysisTool/set.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/set.cpp
rename to Sapfor/_src/SageAnalysisTool/set.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/set.h b/Sapfor/_src/SageAnalysisTool/set.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SageAnalysisTool/set.h
rename to Sapfor/_src/SageAnalysisTool/set.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.cpp b/Sapfor/_src/Sapfor.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Sapfor.cpp
rename to Sapfor/_src/Sapfor.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Sapfor.h b/Sapfor/_src/Sapfor.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Sapfor.h
rename to Sapfor/_src/Sapfor.h
diff --git a/sapfor/experts/Sapfor_2017/_src/SapforData.h b/Sapfor/_src/SapforData.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/SapforData.h
rename to Sapfor/_src/SapforData.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Server/checkUniq.cpp b/Sapfor/_src/Server/checkUniq.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Server/checkUniq.cpp
rename to Sapfor/_src/Server/checkUniq.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Server/server.cpp b/Sapfor/_src/Server/server.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Server/server.cpp
rename to Sapfor/_src/Server/server.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Server/spf_icon.ico b/Sapfor/_src/Server/spf_icon.ico
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Server/spf_icon.ico
rename to Sapfor/_src/Server/spf_icon.ico
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/array_assign_to_loop.cpp b/Sapfor/_src/Transformations/array_assign_to_loop.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/array_assign_to_loop.cpp
rename to Sapfor/_src/Transformations/array_assign_to_loop.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/array_assign_to_loop.h b/Sapfor/_src/Transformations/array_assign_to_loop.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/array_assign_to_loop.h
rename to Sapfor/_src/Transformations/array_assign_to_loop.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/checkpoints.cpp b/Sapfor/_src/Transformations/checkpoints.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/checkpoints.cpp
rename to Sapfor/_src/Transformations/checkpoints.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/checkpoints.h b/Sapfor/_src/Transformations/checkpoints.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/checkpoints.h
rename to Sapfor/_src/Transformations/checkpoints.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/convert_to_c.cpp b/Sapfor/_src/Transformations/convert_to_c.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/convert_to_c.cpp
rename to Sapfor/_src/Transformations/convert_to_c.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/convert_to_c.h b/Sapfor/_src/Transformations/convert_to_c.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/convert_to_c.h
rename to Sapfor/_src/Transformations/convert_to_c.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp b/Sapfor/_src/Transformations/dead_code.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.cpp
rename to Sapfor/_src/Transformations/dead_code.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.h b/Sapfor/_src/Transformations/dead_code.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/dead_code.h
rename to Sapfor/_src/Transformations/dead_code.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/enddo_loop_converter.cpp b/Sapfor/_src/Transformations/enddo_loop_converter.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/enddo_loop_converter.cpp
rename to Sapfor/_src/Transformations/enddo_loop_converter.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/enddo_loop_converter.h b/Sapfor/_src/Transformations/enddo_loop_converter.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/enddo_loop_converter.h
rename to Sapfor/_src/Transformations/enddo_loop_converter.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/fix_common_blocks.cpp b/Sapfor/_src/Transformations/fix_common_blocks.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/fix_common_blocks.cpp
rename to Sapfor/_src/Transformations/fix_common_blocks.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/fix_common_blocks.h b/Sapfor/_src/Transformations/fix_common_blocks.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/fix_common_blocks.h
rename to Sapfor/_src/Transformations/fix_common_blocks.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/function_purifying.cpp b/Sapfor/_src/Transformations/function_purifying.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/function_purifying.cpp
rename to Sapfor/_src/Transformations/function_purifying.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/function_purifying.h b/Sapfor/_src/Transformations/function_purifying.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/function_purifying.h
rename to Sapfor/_src/Transformations/function_purifying.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.cpp b/Sapfor/_src/Transformations/loop_transform.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.cpp
rename to Sapfor/_src/Transformations/loop_transform.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.h b/Sapfor/_src/Transformations/loop_transform.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loop_transform.h
rename to Sapfor/_src/Transformations/loop_transform.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_combiner.cpp b/Sapfor/_src/Transformations/loops_combiner.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_combiner.cpp
rename to Sapfor/_src/Transformations/loops_combiner.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_combiner.h b/Sapfor/_src/Transformations/loops_combiner.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_combiner.h
rename to Sapfor/_src/Transformations/loops_combiner.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_splitter.cpp b/Sapfor/_src/Transformations/loops_splitter.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_splitter.cpp
rename to Sapfor/_src/Transformations/loops_splitter.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_splitter.h b/Sapfor/_src/Transformations/loops_splitter.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_splitter.h
rename to Sapfor/_src/Transformations/loops_splitter.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_unrolling.cpp b/Sapfor/_src/Transformations/loops_unrolling.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_unrolling.cpp
rename to Sapfor/_src/Transformations/loops_unrolling.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/loops_unrolling.h b/Sapfor/_src/Transformations/loops_unrolling.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/loops_unrolling.h
rename to Sapfor/_src/Transformations/loops_unrolling.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_arrays_resizing.cpp b/Sapfor/_src/Transformations/private_arrays_resizing.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/private_arrays_resizing.cpp
rename to Sapfor/_src/Transformations/private_arrays_resizing.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_arrays_resizing.h b/Sapfor/_src/Transformations/private_arrays_resizing.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/private_arrays_resizing.h
rename to Sapfor/_src/Transformations/private_arrays_resizing.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp b/Sapfor/_src/Transformations/private_removing.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
rename to Sapfor/_src/Transformations/private_removing.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.h b/Sapfor/_src/Transformations/private_removing.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.h
rename to Sapfor/_src/Transformations/private_removing.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/replace_dist_arrays_in_io.cpp b/Sapfor/_src/Transformations/replace_dist_arrays_in_io.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/replace_dist_arrays_in_io.cpp
rename to Sapfor/_src/Transformations/replace_dist_arrays_in_io.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/replace_dist_arrays_in_io.h b/Sapfor/_src/Transformations/replace_dist_arrays_in_io.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/replace_dist_arrays_in_io.h
rename to Sapfor/_src/Transformations/replace_dist_arrays_in_io.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.cpp b/Sapfor/_src/Transformations/set_implicit_none.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.cpp
rename to Sapfor/_src/Transformations/set_implicit_none.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.h b/Sapfor/_src/Transformations/set_implicit_none.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/set_implicit_none.h
rename to Sapfor/_src/Transformations/set_implicit_none.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/swap_array_dims.cpp b/Sapfor/_src/Transformations/swap_array_dims.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/swap_array_dims.cpp
rename to Sapfor/_src/Transformations/swap_array_dims.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/swap_array_dims.h b/Sapfor/_src/Transformations/swap_array_dims.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/swap_array_dims.h
rename to Sapfor/_src/Transformations/swap_array_dims.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/uniq_call_chain_dup.cpp b/Sapfor/_src/Transformations/uniq_call_chain_dup.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/uniq_call_chain_dup.cpp
rename to Sapfor/_src/Transformations/uniq_call_chain_dup.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/uniq_call_chain_dup.h b/Sapfor/_src/Transformations/uniq_call_chain_dup.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Transformations/uniq_call_chain_dup.h
rename to Sapfor/_src/Transformations/uniq_call_chain_dup.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/AstWrapper.h b/Sapfor/_src/Utils/AstWrapper.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/AstWrapper.h
rename to Sapfor/_src/Utils/AstWrapper.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/BoostStackTrace.cpp b/Sapfor/_src/Utils/BoostStackTrace.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/BoostStackTrace.cpp
rename to Sapfor/_src/Utils/BoostStackTrace.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/CommonBlock.h b/Sapfor/_src/Utils/CommonBlock.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/CommonBlock.h
rename to Sapfor/_src/Utils/CommonBlock.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/DefUseList.h b/Sapfor/_src/Utils/DefUseList.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/DefUseList.h
rename to Sapfor/_src/Utils/DefUseList.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/PassManager.h b/Sapfor/_src/Utils/PassManager.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/PassManager.h
rename to Sapfor/_src/Utils/PassManager.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/RationalNum.cpp b/Sapfor/_src/Utils/RationalNum.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/RationalNum.cpp
rename to Sapfor/_src/Utils/RationalNum.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/RationalNum.h b/Sapfor/_src/Utils/RationalNum.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/RationalNum.h
rename to Sapfor/_src/Utils/RationalNum.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp b/Sapfor/_src/Utils/SgUtils.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.cpp
rename to Sapfor/_src/Utils/SgUtils.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h b/Sapfor/_src/Utils/SgUtils.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/SgUtils.h
rename to Sapfor/_src/Utils/SgUtils.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/errors.h b/Sapfor/_src/Utils/errors.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/errors.h
rename to Sapfor/_src/Utils/errors.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/leak_detector.h b/Sapfor/_src/Utils/leak_detector.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/leak_detector.h
rename to Sapfor/_src/Utils/leak_detector.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp b/Sapfor/_src/Utils/module_utils.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/module_utils.cpp
rename to Sapfor/_src/Utils/module_utils.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h b/Sapfor/_src/Utils/module_utils.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/module_utils.h
rename to Sapfor/_src/Utils/module_utils.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt b/Sapfor/_src/Utils/russian_errors_text.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/russian_errors_text.txt
rename to Sapfor/_src/Utils/russian_errors_text.txt
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/types.h b/Sapfor/_src/Utils/types.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/types.h
rename to Sapfor/_src/Utils/types.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/utils.cpp b/Sapfor/_src/Utils/utils.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/utils.cpp
rename to Sapfor/_src/Utils/utils.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/utils.h b/Sapfor/_src/Utils/utils.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/utils.h
rename to Sapfor/_src/Utils/utils.h
diff --git a/sapfor/experts/Sapfor_2017/_src/Utils/version.h b/Sapfor/_src/Utils/version.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/Utils/version.h
rename to Sapfor/_src/Utils/version.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/CorrectVarDecl.cpp b/Sapfor/_src/VerificationCode/CorrectVarDecl.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/CorrectVarDecl.cpp
rename to Sapfor/_src/VerificationCode/CorrectVarDecl.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/IncludeChecker.cpp b/Sapfor/_src/VerificationCode/IncludeChecker.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/IncludeChecker.cpp
rename to Sapfor/_src/VerificationCode/IncludeChecker.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/StructureChecker.cpp b/Sapfor/_src/VerificationCode/StructureChecker.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/StructureChecker.cpp
rename to Sapfor/_src/VerificationCode/StructureChecker.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/VerifySageStructures.cpp b/Sapfor/_src/VerificationCode/VerifySageStructures.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/VerifySageStructures.cpp
rename to Sapfor/_src/VerificationCode/VerifySageStructures.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VerificationCode/verifications.h b/Sapfor/_src/VerificationCode/verifications.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VerificationCode/verifications.h
rename to Sapfor/_src/VerificationCode/verifications.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/BuildGraph.cpp b/Sapfor/_src/VisualizerCalls/BuildGraph.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/BuildGraph.cpp
rename to Sapfor/_src/VisualizerCalls/BuildGraph.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/BuildGraph.h b/Sapfor/_src/VisualizerCalls/BuildGraph.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/BuildGraph.h
rename to Sapfor/_src/VisualizerCalls/BuildGraph.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.cpp b/Sapfor/_src/VisualizerCalls/SendMessage.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.cpp
rename to Sapfor/_src/VisualizerCalls/SendMessage.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.h b/Sapfor/_src/VisualizerCalls/SendMessage.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/SendMessage.h
rename to Sapfor/_src/VisualizerCalls/SendMessage.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.cpp b/Sapfor/_src/VisualizerCalls/get_information.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.cpp
rename to Sapfor/_src/VisualizerCalls/get_information.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.h b/Sapfor/_src/VisualizerCalls/get_information.h
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/get_information.h
rename to Sapfor/_src/VisualizerCalls/get_information.h
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/algebra.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/algebra.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/algebra.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/algebra.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/algebra.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/algebra.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/algebra.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/algebra.hpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/layout.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/layout.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/layout.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/layout.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/layout.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/layout.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/layout.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/layout.hpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/nodesoup.cpp b/Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.cpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/nodesoup.cpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.cpp
diff --git a/sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/nodesoup.hpp b/Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.hpp
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_src/VisualizerCalls/graphLayout/nodesoup.hpp
rename to Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.hpp
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/alex.f b/Sapfor/_test/inliner/alex.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/alex.f
rename to Sapfor/_test/inliner/alex.f
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/array_sum.f b/Sapfor/_test/inliner/array_sum.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/array_sum.f
rename to Sapfor/_test/inliner/array_sum.f
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/inlineFunctionWithAllocatable.f90 b/Sapfor/_test/inliner/inlineFunctionWithAllocatable.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/inlineFunctionWithAllocatable.f90
rename to Sapfor/_test/inliner/inlineFunctionWithAllocatable.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/sub.f b/Sapfor/_test/inliner/sub.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/sub.f
rename to Sapfor/_test/inliner/sub.f
diff --git a/sapfor/experts/Sapfor_2017/_test/inliner/test.f b/Sapfor/_test/inliner/test.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/inliner/test.f
rename to Sapfor/_test/inliner/test.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f b/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
rename to Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err1.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err1.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err2.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err2.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err3.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_err3.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err3.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok1.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok1.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok2.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok2.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok3.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_ok3.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok3.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_wr1.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr1.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_wr1.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr1.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_wr3.f b/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/check_args_decl/arg_decl_test_wr3.f
rename to Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr3.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/checkpoint/checkpoint.f90 b/Sapfor/_test/sapfor/checkpoint/checkpoint.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/checkpoint/checkpoint.f90
rename to Sapfor/_test/sapfor/checkpoint/checkpoint.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/checkpoint/checkpoint2.f90 b/Sapfor/_test/sapfor/checkpoint/checkpoint2.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/checkpoint/checkpoint2.f90
rename to Sapfor/_test/sapfor/checkpoint/checkpoint2.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90 b/Sapfor/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
rename to Sapfor/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/assign_with_sections.f b/Sapfor/_test/sapfor/convert_assign_to_loop/assign_with_sections.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/assign_with_sections.f
rename to Sapfor/_test/sapfor/convert_assign_to_loop/assign_with_sections.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/simple_assign.f b/Sapfor/_test/sapfor/convert_assign_to_loop/simple_assign.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/simple_assign.f
rename to Sapfor/_test/sapfor/convert_assign_to_loop/simple_assign.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f b/Sapfor/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f
rename to Sapfor/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/expr_with_sections.f b/Sapfor/_test/sapfor/convert_expr_to_loop/expr_with_sections.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/expr_with_sections.f
rename to Sapfor/_test/sapfor/convert_expr_to_loop/expr_with_sections.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/simple_expr.f b/Sapfor/_test/sapfor/convert_expr_to_loop/simple_expr.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/simple_expr.f
rename to Sapfor/_test/sapfor/convert_expr_to_loop/simple_expr.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f b/Sapfor/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f
rename to Sapfor/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/simple_sum.f b/Sapfor/_test/sapfor/convert_sum_to_loop/simple_sum.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/simple_sum.f
rename to Sapfor/_test/sapfor/convert_sum_to_loop/simple_sum.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/sum_with_sections.f b/Sapfor/_test/sapfor/convert_sum_to_loop/sum_with_sections.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/sum_with_sections.f
rename to Sapfor/_test/sapfor/convert_sum_to_loop/sum_with_sections.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f b/Sapfor/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f
rename to Sapfor/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/simple_where.f b/Sapfor/_test/sapfor/convert_where_to_loop/simple_where.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/simple_where.f
rename to Sapfor/_test/sapfor/convert_where_to_loop/simple_where.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/two_dimensional_where.f b/Sapfor/_test/sapfor/convert_where_to_loop/two_dimensional_where.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/two_dimensional_where.f
rename to Sapfor/_test/sapfor/convert_where_to_loop/two_dimensional_where.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/where_with_sections.f b/Sapfor/_test/sapfor/convert_where_to_loop/where_with_sections.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/convert_where_to_loop/where_with_sections.f
rename to Sapfor/_test/sapfor/convert_where_to_loop/where_with_sections.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/program.expected.f90 b/Sapfor/_test/sapfor/create_nested_loops/program.expected.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/program.expected.f90
rename to Sapfor/_test/sapfor/create_nested_loops/program.expected.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/program.f90 b/Sapfor/_test/sapfor/create_nested_loops/program.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/program.f90
rename to Sapfor/_test/sapfor/create_nested_loops/program.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/test.bat b/Sapfor/_test/sapfor/create_nested_loops/test.bat
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/test.bat
rename to Sapfor/_test/sapfor/create_nested_loops/test.bat
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/test.sh b/Sapfor/_test/sapfor/create_nested_loops/test.sh
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/create_nested_loops/test.sh
rename to Sapfor/_test/sapfor/create_nested_loops/test.sh
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90 b/Sapfor/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90
rename to Sapfor/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_1.for b/Sapfor/_test/sapfor/loops_combiner/test_1.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_1.for
rename to Sapfor/_test/sapfor/loops_combiner/test_1.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_2.for b/Sapfor/_test/sapfor/loops_combiner/test_2.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_2.for
rename to Sapfor/_test/sapfor/loops_combiner/test_2.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_3.for b/Sapfor/_test/sapfor/loops_combiner/test_3.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_3.for
rename to Sapfor/_test/sapfor/loops_combiner/test_3.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_4.for b/Sapfor/_test/sapfor/loops_combiner/test_4.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_4.for
rename to Sapfor/_test/sapfor/loops_combiner/test_4.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_5.for b/Sapfor/_test/sapfor/loops_combiner/test_5.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/loops_combiner/test_5.for
rename to Sapfor/_test/sapfor/loops_combiner/test_5.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/array_read_before_write.in b/Sapfor/_test/sapfor/merge_regions/array_read_before_write.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/array_read_before_write.in
rename to Sapfor/_test/sapfor/merge_regions/array_read_before_write.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/array_read_before_write.out b/Sapfor/_test/sapfor/merge_regions/array_read_before_write.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/array_read_before_write.out
rename to Sapfor/_test/sapfor/merge_regions/array_read_before_write.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_before_read.in b/Sapfor/_test/sapfor/merge_regions/read_before_read.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_before_read.in
rename to Sapfor/_test/sapfor/merge_regions/read_before_read.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_before_read.out b/Sapfor/_test/sapfor/merge_regions/read_before_read.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_before_read.out
rename to Sapfor/_test/sapfor/merge_regions/read_before_read.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_in_loop_header.in b/Sapfor/_test/sapfor/merge_regions/read_in_loop_header.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_in_loop_header.in
rename to Sapfor/_test/sapfor/merge_regions/read_in_loop_header.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_in_loop_header.out b/Sapfor/_test/sapfor/merge_regions/read_in_loop_header.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/read_in_loop_header.out
rename to Sapfor/_test/sapfor/merge_regions/read_in_loop_header.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_modified_in_fun.in b/Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_modified_in_fun.in
rename to Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_modified_in_fun.out b/Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_modified_in_fun.out
rename to Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_read_before_write.in b/Sapfor/_test/sapfor/merge_regions/var_read_before_write.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_read_before_write.in
rename to Sapfor/_test/sapfor/merge_regions/var_read_before_write.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_read_before_write.out b/Sapfor/_test/sapfor/merge_regions/var_read_before_write.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/var_read_before_write.out
rename to Sapfor/_test/sapfor/merge_regions/var_read_before_write.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_read.in b/Sapfor/_test/sapfor/merge_regions/write_before_read.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_read.in
rename to Sapfor/_test/sapfor/merge_regions/write_before_read.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_read.out b/Sapfor/_test/sapfor/merge_regions/write_before_read.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_read.out
rename to Sapfor/_test/sapfor/merge_regions/write_before_read.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_write.in b/Sapfor/_test/sapfor/merge_regions/write_before_write.in
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_write.in
rename to Sapfor/_test/sapfor/merge_regions/write_before_write.in
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_write.out b/Sapfor/_test/sapfor/merge_regions/write_before_write.out
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/merge_regions/write_before_write.out
rename to Sapfor/_test/sapfor/merge_regions/write_before_write.out
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/parameter/magnit_3d.for b/Sapfor/_test/sapfor/parameter/magnit_3d.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/parameter/magnit_3d.for
rename to Sapfor/_test/sapfor/parameter/magnit_3d.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/parameter/mycom.for b/Sapfor/_test/sapfor/parameter/mycom.for
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/parameter/mycom.for
rename to Sapfor/_test/sapfor/parameter/mycom.for
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/parameter/parameter.f90 b/Sapfor/_test/sapfor/parameter/parameter.f90
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/parameter/parameter.f90
rename to Sapfor/_test/sapfor/parameter/parameter.f90
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test.f b/Sapfor/_test/sapfor/private_removing/test.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test.f
rename to Sapfor/_test/sapfor/private_removing/test.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test_cannot_remove.f b/Sapfor/_test/sapfor/private_removing/test_cannot_remove.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test_cannot_remove.f
rename to Sapfor/_test/sapfor/private_removing/test_cannot_remove.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test_cascade.f b/Sapfor/_test/sapfor/private_removing/test_cascade.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/private_removing/test_cascade.f
rename to Sapfor/_test/sapfor/private_removing/test_cascade.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error.f b/Sapfor/_test/sapfor/shrink/error.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error.f
rename to Sapfor/_test/sapfor/shrink/error.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error2.f b/Sapfor/_test/sapfor/shrink/error2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error2.f
rename to Sapfor/_test/sapfor/shrink/error2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error3.f b/Sapfor/_test/sapfor/shrink/error3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/error3.f
rename to Sapfor/_test/sapfor/shrink/error3.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink.f b/Sapfor/_test/sapfor/shrink/shrink.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink.f
rename to Sapfor/_test/sapfor/shrink/shrink.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink2.f b/Sapfor/_test/sapfor/shrink/shrink2.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink2.f
rename to Sapfor/_test/sapfor/shrink/shrink2.f
diff --git a/sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink3.f b/Sapfor/_test/sapfor/shrink/shrink3.f
similarity index 100%
rename from sapfor/experts/Sapfor_2017/_test/sapfor/shrink/shrink3.f
rename to Sapfor/_test/sapfor/shrink/shrink3.f
diff --git a/sapfor/experts/Sapfor_2017/paths.default.txt b/Sapfor/paths.default.txt
similarity index 100%
rename from sapfor/experts/Sapfor_2017/paths.default.txt
rename to Sapfor/paths.default.txt

From 24210c8bfb327586619713cc87dd214922e231b1 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Wed, 12 Mar 2025 12:45:22 +0300
Subject: [PATCH 24/44] fixed paths

---
 .gitignore               | 157 ++++++++++++++++++++-------------------
 Sapfor/CMakeLists.txt    |  18 ++---
 Sapfor/paths.default.txt |  21 +++---
 3 files changed, 98 insertions(+), 98 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab041ca..0000101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,78 +1,79 @@
-# Add any directories, files, or patterns you don't want to be tracked by version control
-*.o
-sapfor/experts/Sapfor_2017/.idea/
-sapfor/experts/Sapfor_2017/cmake-build-debug/
-sapfor/experts/Sapfor_2017/.vs/
-sapfor/experts/Sapfor_2017/_bin/
-sapfor/experts/Sapfor_2017/_lib/
-sapfor/experts/Sapfor_2017/Inliner/x64/
-sapfor/experts/Sapfor_2017/Parser/x64/
-sapfor/experts/Sapfor_2017/SageLib/x64/
-sapfor/experts/Sapfor_2017/SageNewSrc/x64/
-sapfor/experts/Sapfor_2017/SageOldSrc/x64/
-sapfor/experts/Sapfor_2017/Sapfor/x64/
-sapfor/experts/Sapfor_2017/TransformCommonLib/x64/
-sapfor/experts/Sapfor_2017/TransformLib/x64/
-sapfor/experts/Sapfor_2017/TransformUtils/x64/
-dvm/fdvm/trunk/.svn/
-sapfor/experts/Sapfor_2017/.svn/
-sapfor/transformers
-sapfor/transformers/.svn/
-sapfor/experts/Sapfor_2017/_src/boost
-sapfor/experts/Sapfor_2017/Sapfor/Sapfor.vcxproj.user
-sapfor/analyzers/
-sapfor/general/
-sapfor/generators/
-sapfor/idb/
-sapfor/CMakeLists.txt
-sapfor/experts/expert/
-sapfor/experts/expert_maxim_last_version/
-sapfor/experts/visualizer/
-sapfor/.svn/
-
-sapfor/experts/Sapfor_2017/cmake-build-debug/
-sapfor/experts/Sapfor_2017/build/
-sapfor/experts/Sapfor_2017/Inliner/build/
-sapfor/experts/Sapfor_2017/Parser/build/
-sapfor/experts/Sapfor_2017/Sapfor/*.o
-sapfor/transformers/ftransform/trunk/cmake-build-debug/
-sapfor/transformers/ftransform/trunk/build/
-sapfor/transformers/ftransform/trunk/parser/build/
-**/.idea
-
-dvm/cdvm/
-dvm/cdvmh-clang/
-dvm/driver/
-dvm/general/
-dvm/releases/
-dvm/rts/
-dvm/rts-dvmh/
-dvm/tools/projectStructureForFortran/
-dvm/tools/pppa/.svn
-dvm/tools/Zlib/.svn
-dvm/tools/predictor/
-dvm/tools/omp-dbg/
-dvm/tools/omp-otc/
-dvm/tools/omp-pa/
-dvm/CMakeLists.txt
-dvm/.svn/
-dvm/fdvm/branches/
-sapfor/experts/Sapfor_2017/TransformCommonLib/TransformCommonLib.vcxproj.user
-sapfor/experts/Sapfor_2017/SageOldSrc/SageOldSrc.vcxproj.user
-sapfor/experts/Sapfor_2017/SageNewSrc/SageNewSrc.vcxproj.user
-sapfor/experts/Sapfor_2017/SageLib/SageLib.vcxproj.user
-sapfor/experts/Sapfor_2017/Inliner/Inliner.vcxproj.user
-sapfor/experts/Sapfor_2017/TransformUtils/TransformUtils.vcxproj.user
-sapfor/experts/Sapfor_2017/Parser/Parser.vcxproj.user
-.vscode/*
-.vs/
-**/**/.DS_Store
-sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj.user
-sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj.filters
-sapfor/experts/Sapfor_2017/Sapc++/Sapc++/Sapc++.vcxproj
-sapfor/experts/Sapfor_2017/Sapc++/Sapc++/x64/
-sapfor/experts/Sapfor_2017/Sapc++/x64/
-
-/build
-
-sapfor/experts/Sapfor_2017/out/
+# Add any directories, files, or patterns you don't want to be tracked by version control
+*.o
+Sapfor/.idea/
+Sapfor/cmake-build-debug/
+Sapfor/.vs/
+Sapfor/_bin/
+Sapfor/_lib/
+Sapfor/Inliner/x64/
+Sapfor/Parser/x64/
+Sapfor/SageLib/x64/
+Sapfor/SageNewSrc/x64/
+Sapfor/SageOldSrc/x64/
+Sapfor/Sapfor/x64/
+Sapfor/TransformCommonLib/x64/
+Sapfor/TransformLib/x64/
+Sapfor/TransformUtils/x64/
+dvm/fdvm/trunk/.svn/
+Sapfor/.svn/
+sapfor/transformers
+sapfor/transformers/.svn/
+Sapfor/_src/boost
+Sapfor/Sapfor/Sapfor.vcxproj.user
+sapfor/analyzers/
+sapfor/general/
+sapfor/generators/
+sapfor/idb/
+sapfor/CMakeLists.txt
+sapfor/experts/expert/
+sapfor/experts/expert_maxim_last_version/
+sapfor/experts/visualizer/
+sapfor/.svn/
+
+Sapfor/cmake-build-debug/
+Sapfor/build/
+Sapfor/Inliner/build/
+Sapfor/Parser/build/
+Sapfor/Sapfor/*.o
+sapfor/transformers/ftransform/trunk/cmake-build-debug/
+sapfor/transformers/ftransform/trunk/build/
+sapfor/transformers/ftransform/trunk/parser/build/
+**/.idea
+
+dvm/cdvm/
+dvm/cdvmh-clang/
+dvm/driver/
+dvm/general/
+dvm/releases/
+dvm/rts/
+dvm/rts-dvmh/
+dvm/tools/projectStructureForFortran/
+dvm/tools/pppa/.svn
+dvm/tools/Zlib/.svn
+dvm/tools/predictor/
+dvm/tools/omp-dbg/
+dvm/tools/omp-otc/
+dvm/tools/omp-pa/
+dvm/CMakeLists.txt
+dvm/.svn/
+dvm/fdvm/branches/
+Sapfor/TransformCommonLib/TransformCommonLib.vcxproj.user
+Sapfor/SageOldSrc/SageOldSrc.vcxproj.user
+Sapfor/SageNewSrc/SageNewSrc.vcxproj.user
+Sapfor/SageLib/SageLib.vcxproj.user
+Sapfor/Inliner/Inliner.vcxproj.user
+Sapfor/TransformUtils/TransformUtils.vcxproj.user
+Sapfor/Parser/Parser.vcxproj.user
+.vscode/*
+.vs/
+**/**/.DS_Store
+Sapfor/Sapc++/Sapc++/Sapc++.vcxproj.user
+Sapfor/Sapc++/Sapc++/Sapc++.vcxproj.filters
+Sapfor/Sapc++/Sapc++/Sapc++.vcxproj
+Sapfor/Sapc++/Sapc++/x64/
+Sapfor/Sapc++/x64/
+
+/build
+
+Sapfor/out/
+Sapfor/_bin/*
diff --git a/Sapfor/CMakeLists.txt b/Sapfor/CMakeLists.txt
index 9379792..0bc42a4 100644
--- a/Sapfor/CMakeLists.txt
+++ b/Sapfor/CMakeLists.txt
@@ -13,15 +13,15 @@ add_definitions("-D YYDEBUG")
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(fdvm_include ../../../dvm/fdvm/trunk/include)
-set(sage_include_1 ../../../dvm/fdvm/trunk/Sage/lib/include)
-set(sage_include_2 ../../../dvm/fdvm/trunk/Sage/h/)
-set(libdb_sources ../../../dvm/fdvm/trunk/Sage/lib/oldsrc)
-set(sage_sources ../../../dvm/fdvm/trunk/Sage/lib/newsrc)
-set(sagepp_sources ../../../dvm/fdvm/trunk/Sage/Sage++)
-set(parser_sources ../../../dvm/fdvm/trunk/parser)
-set(pppa_sources ../../../dvm/tools/pppa/trunk/src)
-set(zlib_sources ../../../dvm/tools/Zlib)
+set(fdvm_include ../dvm/fdvm/trunk/include)
+set(sage_include_1 ../dvm/fdvm/trunk/Sage/lib/include)
+set(sage_include_2 ../dvm/fdvm/trunk/Sage/h/)
+set(libdb_sources ../dvm/fdvm/trunk/Sage/lib/oldsrc)
+set(sage_sources ../dvm/fdvm/trunk/Sage/lib/newsrc)
+set(sagepp_sources ../dvm/fdvm/trunk/Sage/Sage++)
+set(parser_sources ../dvm/fdvm/trunk/parser)
+set(pppa_sources ../dvm/tools/pppa/trunk/src)
+set(zlib_sources ../dvm/tools/Zlib)
 
 # Read pathes to external sapfor directories
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/paths.txt")
diff --git a/Sapfor/paths.default.txt b/Sapfor/paths.default.txt
index 70cdf30..bb19b87 100644
--- a/Sapfor/paths.default.txt
+++ b/Sapfor/paths.default.txt
@@ -1,11 +1,10 @@
-fdvm_include=../../../dvm/fdvm/trunk/include/
-sage_include_1=../../../dvm/fdvm/trunk/Sage/lib/include/
-sage_include_2=../../../dvm/fdvm/trunk/Sage/h/
-fdvm_sources=../../../dvm/fdvm/trunk/fdvm/
-libdb_sources=../../../dvm/fdvm/trunk/Sage/lib/oldsrc/
-sage_sources=../../../dvm/fdvm/trunk/Sage/lib/newsrc/
-sagepp_sources=../../../dvm/fdvm/trunk/Sage/Sage++/
-parser_sources=../../../dvm/fdvm/trunk/parser/
-inline_expansion_sources=../../../dvm/fdvm/trunk/InlineExpansion/
-pppa_sources=../../../dvm/tools/pppa/trunk/src/
-zlib_sources=../../../dvm/tools/Zlib/
\ No newline at end of file
+fdvm_include=../dvm/fdvm/trunk/include/
+sage_include_1=../dvm/fdvm/trunk/Sage/lib/include/
+sage_include_2=../dvm/fdvm/trunk/Sage/h/
+fdvm_sources=../dvm/fdvm/trunk/fdvm/
+libdb_sources=../dvm/fdvm/trunk/Sage/lib/oldsrc/
+sage_sources=../dvm/fdvm/trunk/Sage/lib/newsrc/
+sagepp_sources=../dvm/fdvm/trunk/Sage/Sage++/
+parser_sources=../dvm/fdvm/trunk/parser/
+pppa_sources=../dvm/tools/pppa/trunk/src/
+zlib_sources=../dvm/tools/Zlib/
\ No newline at end of file

From 684d391bff7283ae3c44964ee058b4fbcfa5a46b Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Wed, 12 Mar 2025 14:11:06 +0300
Subject: [PATCH 25/44] fixed paths

---
 Sapfor/CMakeLists.txt                         |  43 +-
 Sapfor/Sapfor/Makefile                        | 468 ------------------
 Sapfor/{ => _projects}/FDVM/CMakeLists.txt    |   0
 Sapfor/{ => _projects}/Parser/CMakeLists.txt  |   0
 Sapfor/{ => _projects}/SageLib/CMakeLists.txt |   0
 .../{ => _projects}/SageNewSrc/CMakeLists.txt |   0
 .../{ => _projects}/SageOldSrc/CMakeLists.txt |   0
 Sapfor/{ => _projects}/Sapc++/Sapc++.sln      |   0
 .../_projects/dvm}/fdvm/CMakeLists.txt        |   0
 .../_projects/dvm}/fdvm/trunk/CMakeLists.txt  |   0
 .../fdvm/trunk/InlineExpansion/CMakeLists.txt |   0
 .../dvm}/fdvm/trunk/InlineExpansion/dvm_tag.h |   0
 .../dvm}/fdvm/trunk/InlineExpansion/hlp.cpp   |   0
 .../fdvm/trunk/InlineExpansion/inl_exp.cpp    |   0
 .../dvm}/fdvm/trunk/InlineExpansion/inline.h  |   0
 .../fdvm/trunk/InlineExpansion/inliner.cpp    |   0
 .../fdvm/trunk/InlineExpansion/intrinsic.h    |   0
 .../fdvm/trunk/InlineExpansion/makefile.uni   |   0
 .../fdvm/trunk/InlineExpansion/makefile.win   |   0
 .../_projects/dvm}/fdvm/trunk/Makefile        |   0
 .../dvm}/fdvm/trunk/Sage/CMakeLists.txt       |   0
 .../_projects/dvm}/fdvm/trunk/Sage/LICENSE    |   0
 .../_projects/dvm}/fdvm/trunk/Sage/Makefile   |   0
 .../fdvm/trunk/Sage/Sage++/CMakeLists.txt     |   0
 .../dvm}/fdvm/trunk/Sage/Sage++/Makefile      |   0
 .../dvm}/fdvm/trunk/Sage/Sage++/libSage++.cpp |   0
 .../dvm}/fdvm/trunk/Sage/Sage++/makefile.uni  |   0
 .../dvm}/fdvm/trunk/Sage/Sage++/makefile.win  |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/Makefile |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/bif.h    |   0
 .../dvm}/fdvm/trunk/Sage/h/compatible.h       |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/db.h     |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/db.new.h |   0
 .../dvm}/fdvm/trunk/Sage/h/defines.h          |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/defs.h   |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/dep.h    |   0
 .../dvm}/fdvm/trunk/Sage/h/dep_str.h          |   0
 .../dvm}/fdvm/trunk/Sage/h/dep_struct.h       |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/elist.h  |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/f90.h    |   0
 .../dvm}/fdvm/trunk/Sage/h/fixcray.h          |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/fm.h     |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/head     |   0
 .../dvm}/fdvm/trunk/Sage/h/leak_detector.h    |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/list.h   |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/ll.h     |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/prop.h   |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/sage.h   |   0
 .../dvm}/fdvm/trunk/Sage/h/sagearch.h         |   0
 .../dvm}/fdvm/trunk/Sage/h/sageroot.h         |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/sets.h   |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/symb.h   |   0
 .../dvm}/fdvm/trunk/Sage/h/symblob.h          |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/tag      |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/tag.doc  |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/tag.h    |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/tag_make |   0
 .../dvm}/fdvm/trunk/Sage/h/version.h          |   0
 .../dvm}/fdvm/trunk/Sage/h/vextern.h          |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/vparse.h |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/vpc.h    |   0
 .../_projects/dvm}/fdvm/trunk/Sage/h/window.h |   0
 .../dvm}/fdvm/trunk/Sage/lib/CMakeLists.txt   |   0
 .../dvm}/fdvm/trunk/Sage/lib/Makefile         |   0
 .../fdvm/trunk/Sage/lib/include/attributes.h  |   0
 .../fdvm/trunk/Sage/lib/include/baseClasses.h |   0
 .../fdvm/trunk/Sage/lib/include/bif_node.def  |   0
 .../fdvm/trunk/Sage/lib/include/dependence.h  |   0
 .../fdvm/trunk/Sage/lib/include/ext_ann.h     |   0
 .../fdvm/trunk/Sage/lib/include/ext_high.h    |   0
 .../fdvm/trunk/Sage/lib/include/ext_lib.h     |   0
 .../fdvm/trunk/Sage/lib/include/ext_low.h     |   0
 .../fdvm/trunk/Sage/lib/include/ext_mid.h     |   0
 .../fdvm/trunk/Sage/lib/include/extcxx_low.h  |   0
 .../fdvm/trunk/Sage/lib/include/libSage++.h   |   0
 .../dvm}/fdvm/trunk/Sage/lib/include/macro.h  |   0
 .../trunk/Sage/lib/include/sage++callgraph.h  |   0
 .../Sage/lib/include/sage++classhierarchy.h   |   0
 .../trunk/Sage/lib/include/sage++extern.h     |   0
 .../fdvm/trunk/Sage/lib/include/sage++proto.h |   0
 .../fdvm/trunk/Sage/lib/include/sage++user.h  |   0
 .../dvm}/fdvm/trunk/Sage/lib/include/symb.def |   0
 .../dvm}/fdvm/trunk/Sage/lib/include/type.def |   0
 .../fdvm/trunk/Sage/lib/include/unparse.def   |   0
 .../trunk/Sage/lib/include/unparseC++.def     |   0
 .../trunk/Sage/lib/include/unparseDVM.def     |   0
 .../dvm}/fdvm/trunk/Sage/lib/makefile.uni     |   0
 .../dvm}/fdvm/trunk/Sage/lib/makefile.win     |   0
 .../fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt |   0
 .../dvm}/fdvm/trunk/Sage/lib/newsrc/Makefile  |   0
 .../fdvm/trunk/Sage/lib/newsrc/annotate.tab.c |   0
 .../fdvm/trunk/Sage/lib/newsrc/annotate.tab.h |   0
 .../fdvm/trunk/Sage/lib/newsrc/annotate.y     |   0
 .../fdvm/trunk/Sage/lib/newsrc/comments.c     |   0
 .../fdvm/trunk/Sage/lib/newsrc/low_level.c    |   0
 .../fdvm/trunk/Sage/lib/newsrc/makefile.uni   |   0
 .../fdvm/trunk/Sage/lib/newsrc/makefile.win   |   0
 .../fdvm/trunk/Sage/lib/newsrc/toolsann.c     |   0
 .../dvm}/fdvm/trunk/Sage/lib/newsrc/unparse.c |   0
 .../fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt |   0
 .../dvm}/fdvm/trunk/Sage/lib/oldsrc/Makefile  |   0
 .../fdvm/trunk/Sage/lib/oldsrc/anal_ind.c     |   0
 .../dvm}/fdvm/trunk/Sage/lib/oldsrc/db.c      |   0
 .../dvm}/fdvm/trunk/Sage/lib/oldsrc/db_unp.c  |   0
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c  |   0
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c   |   0
 .../dvm}/fdvm/trunk/Sage/lib/oldsrc/dbutils.c |   0
 .../fdvm/trunk/Sage/lib/oldsrc/garb_coll.c    |   0
 .../fdvm/trunk/Sage/lib/oldsrc/glob_anal.c    |   0
 .../dvm}/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c |   0
 .../dvm}/fdvm/trunk/Sage/lib/oldsrc/list.c    |   0
 .../fdvm/trunk/Sage/lib/oldsrc/make_nodes.c   |   0
 .../fdvm/trunk/Sage/lib/oldsrc/makefile.uni   |   0
 .../fdvm/trunk/Sage/lib/oldsrc/makefile.win   |   0
 .../dvm}/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c |   0
 .../dvm}/fdvm/trunk/Sage/lib/oldsrc/ndeps.c   |   0
 .../fdvm/trunk/Sage/lib/oldsrc/readnodes.c    |   0
 .../dvm}/fdvm/trunk/Sage/lib/oldsrc/sets.c    |   0
 .../fdvm/trunk/Sage/lib/oldsrc/setutils.c     |   0
 .../fdvm/trunk/Sage/lib/oldsrc/symb_alg.c     |   0
 .../fdvm/trunk/Sage/lib/oldsrc/writenodes.c   |   0
 .../dvm}/fdvm/trunk/Sage/makefile.uni         |   0
 .../dvm}/fdvm/trunk/Sage/makefile.win         |   0
 .../CodeTransformer/CodeTransformer.vcxproj   |   0
 .../CodeTransformer.vcxproj.filters           |   0
 .../FDVM/FDVM.sln                             |   0
 .../FDVM/FDVM/FDVM.vcxproj                    |   0
 .../FDVM/FDVM/FDVM.vcxproj.filters            |   0
 .../FDVM/NEWsrc/NEWsrc.vcxproj                |   0
 .../FDVM/NEWsrc/NEWsrc.vcxproj.filters        |   0
 .../FDVM/OLDsrc/OLDsrc.vcxproj                |   0
 .../FDVM/OLDsrc/OLDsrc.vcxproj.filters        |   0
 .../FDVM/Parser/Parser.vcxproj                |   0
 .../FDVM/Parser/Parser.vcxproj.filters        |   0
 .../FDVM/SageLib++/SageLib++.vcxproj          |   0
 .../FDVM/SageLib++/SageLib++.vcxproj.filters  |   0
 .../FDVM/inlineExp/inlineExp.vcxproj          |   0
 .../FDVM/inlineExp/inlineExp.vcxproj.filters  |   0
 .../fdvm/trunk/acrossDebugging/across.cpp     |   0
 .../dvm}/fdvm/trunk/examples/gausf.fdv        |   0
 .../dvm}/fdvm/trunk/examples/gausgb.fdv       |   0
 .../dvm}/fdvm/trunk/examples/gaush.hpf        |   0
 .../dvm}/fdvm/trunk/examples/gauswh.fdv       |   0
 .../dvm}/fdvm/trunk/examples/jac.fdv          |   0
 .../dvm}/fdvm/trunk/examples/jacas.fdv        |   0
 .../dvm}/fdvm/trunk/examples/jach.hpf         |   0
 .../dvm}/fdvm/trunk/examples/redbf.fdv        |   0
 .../dvm}/fdvm/trunk/examples/redbh.hpf        |   0
 .../dvm}/fdvm/trunk/examples/sor.fdv          |   0
 .../dvm}/fdvm/trunk/examples/task2j.fdv       |   0
 .../dvm}/fdvm/trunk/examples/tasks.fdv        |   0
 .../dvm}/fdvm/trunk/examples/taskst.fdv       |   0
 .../dvm}/fdvm/trunk/fdvm/CMakeLists.txt       |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/Makefile   |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/acc.cpp    |   0
 .../dvm}/fdvm/trunk/fdvm/acc_across.cpp       |   0
 .../fdvm/trunk/fdvm/acc_across_analyzer.cpp   |   0
 .../dvm}/fdvm/trunk/fdvm/acc_analyzer.cpp     |   0
 .../dvm}/fdvm/trunk/fdvm/acc_data.cpp         |   0
 .../dvm}/fdvm/trunk/fdvm/acc_f2c.cpp          |   0
 .../dvm}/fdvm/trunk/fdvm/acc_f2c_handlers.cpp |   0
 .../fdvm/trunk/fdvm/acc_index_analyzer.cpp    |   0
 .../dvm}/fdvm/trunk/fdvm/acc_rtc.cpp          |   0
 .../dvm}/fdvm/trunk/fdvm/acc_unused_code.cpp  |   0
 .../dvm}/fdvm/trunk/fdvm/acc_utilities.cpp    |   0
 .../dvm}/fdvm/trunk/fdvm/aks_analyzeLoops.cpp |   0
 .../fdvm/trunk/fdvm/aks_loopStructure.cpp     |   0
 .../dvm}/fdvm/trunk/fdvm/aks_structs.cpp      |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/calls.cpp  |   0
 .../dvm}/fdvm/trunk/fdvm/checkpoint.cpp       |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/debug.cpp  |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/dvm.cpp    |   0
 .../dvm}/fdvm/trunk/fdvm/funcall.cpp          |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/help.cpp   |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/hpf.cpp    |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/io.cpp     |   0
 .../dvm}/fdvm/trunk/fdvm/makefile.uni         |   0
 .../dvm}/fdvm/trunk/fdvm/makefile.win         |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/omp.cpp    |   0
 .../dvm}/fdvm/trunk/fdvm/ompdebug.cpp         |   0
 .../dvm}/fdvm/trunk/fdvm/parloop.cpp          |   0
 .../_projects/dvm}/fdvm/trunk/fdvm/stmt.cpp   |   0
 .../fdvm/trunk/include/acc_across_analyzer.h  |   0
 .../dvm}/fdvm/trunk/include/acc_analyzer.h    |   0
 .../dvm}/fdvm/trunk/include/acc_data.h        |   0
 .../fdvm/trunk/include/aks_loopStructure.h    |   0
 .../dvm}/fdvm/trunk/include/aks_structs.h     |   0
 .../_projects/dvm}/fdvm/trunk/include/calls.h |   0
 .../_projects/dvm}/fdvm/trunk/include/dvm.h   |   0
 .../dvm}/fdvm/trunk/include/dvm_tag.h         |   0
 .../dvm}/fdvm/trunk/include/extern.h          |   0
 .../_projects/dvm}/fdvm/trunk/include/fdvm.h  |   0
 .../dvm}/fdvm/trunk/include/fdvm_version.h    |   0
 .../_projects/dvm}/fdvm/trunk/include/inc.h   |   0
 .../dvm}/fdvm/trunk/include/leak_detector.h   |   0
 .../dvm}/fdvm/trunk/include/libSageOMP.h      |   0
 .../dvm}/fdvm/trunk/include/libdvm.h          |   0
 .../dvm}/fdvm/trunk/include/libnum.h          |   0
 .../dvm}/fdvm/trunk/include/unparse.hpf       |   0
 .../dvm}/fdvm/trunk/include/unparse1.hpf      |   0
 .../_projects/dvm}/fdvm/trunk/include/user.h  |   0
 .../_projects/dvm}/fdvm/trunk/makefile.uni    |   0
 .../_projects/dvm}/fdvm/trunk/makefile.win    |   0
 .../dvm}/fdvm/trunk/parser/CMakeLists.txt     |   0
 .../_projects/dvm}/fdvm/trunk/parser/Makefile |   0
 .../_projects/dvm}/fdvm/trunk/parser/cftn.c   |   0
 .../_projects/dvm}/fdvm/trunk/parser/errors.c |   0
 .../dvm}/fdvm/trunk/parser/facc.gram          |   0
 .../dvm}/fdvm/trunk/parser/fdvm.gram          |   0
 .../dvm}/fdvm/trunk/parser/fomp.gram          |   0
 .../dvm}/fdvm/trunk/parser/fspf.gram          |   0
 .../_projects/dvm}/fdvm/trunk/parser/ftn.gram |   0
 .../dvm}/fdvm/trunk/parser/gram1.tab.c        |   0
 .../dvm}/fdvm/trunk/parser/gram1.tab.h        |   0
 .../_projects/dvm}/fdvm/trunk/parser/gram1.y  |   0
 .../_projects/dvm}/fdvm/trunk/parser/hash.c   |   0
 .../_projects/dvm}/fdvm/trunk/parser/head     |   0
 .../_projects/dvm}/fdvm/trunk/parser/init.c   |   0
 .../dvm}/fdvm/trunk/parser/lexfdvm.c          |   0
 .../_projects/dvm}/fdvm/trunk/parser/lists.c  |   0
 .../dvm}/fdvm/trunk/parser/low_hpf.c          |   0
 .../dvm}/fdvm/trunk/parser/makefile.uni       |   0
 .../dvm}/fdvm/trunk/parser/makefile.win       |   0
 .../_projects/dvm}/fdvm/trunk/parser/misc.c   |   0
 .../_projects/dvm}/fdvm/trunk/parser/stat.c   |   0
 .../_projects/dvm}/fdvm/trunk/parser/sym.c    |   0
 .../_projects/dvm}/fdvm/trunk/parser/tag      |   0
 .../_projects/dvm}/fdvm/trunk/parser/tag.h    |   0
 .../dvm}/fdvm/trunk/parser/tokdefs.h          |   0
 .../_projects/dvm}/fdvm/trunk/parser/tokens   |   0
 .../_projects/dvm}/fdvm/trunk/parser/types.c  |   0
 .../dvm}/fdvm/trunk/parser/unparse_hpf.c      |   0
 .../dvm}/fdvm/trunk/sageExample/SwapFors.cpp  |   0
 .../dvm}/fdvm/trunk/sageExample/makefile.uni  |   0
 .../dvm}/fdvm/trunk/sageExample/makefile.win  |   0
 .../_projects/dvm}/tools/Zlib/CMakeLists.txt  |   0
 .../dvm}/tools/Zlib/include/deflate.h         |   0
 .../dvm}/tools/Zlib/include/infblock.h        |   0
 .../dvm}/tools/Zlib/include/infcodes.h        |   0
 .../dvm}/tools/Zlib/include/inffast.h         |   0
 .../dvm}/tools/Zlib/include/inffixed.h        |   0
 .../dvm}/tools/Zlib/include/inftrees.h        |   0
 .../dvm}/tools/Zlib/include/infutil.h         |   0
 .../_projects/dvm}/tools/Zlib/include/trees.h |   0
 .../_projects/dvm}/tools/Zlib/include/zconf.h |   0
 .../_projects/dvm}/tools/Zlib/include/zlib.h  |   0
 .../_projects/dvm}/tools/Zlib/include/zutil.h |   0
 .../_projects/dvm}/tools/Zlib/makefile.uni    |   0
 .../_projects/dvm}/tools/Zlib/makefile.win    |   0
 .../dvm}/tools/Zlib/src/CMakeLists.txt        |   0
 .../_projects/dvm}/tools/Zlib/src/adler32.c   |   0
 .../_projects/dvm}/tools/Zlib/src/compress.c  |   0
 .../_projects/dvm}/tools/Zlib/src/crc32.c     |   0
 .../_projects/dvm}/tools/Zlib/src/deflate.c   |   0
 .../_projects/dvm}/tools/Zlib/src/example.c   |   0
 .../_projects/dvm}/tools/Zlib/src/gzio.c      |   0
 .../_projects/dvm}/tools/Zlib/src/infblock.c  |   0
 .../_projects/dvm}/tools/Zlib/src/infcodes.c  |   0
 .../_projects/dvm}/tools/Zlib/src/inffast.c   |   0
 .../_projects/dvm}/tools/Zlib/src/inflate.c   |   0
 .../_projects/dvm}/tools/Zlib/src/inftrees.c  |   0
 .../_projects/dvm}/tools/Zlib/src/infutil.c   |   0
 .../_projects/dvm}/tools/Zlib/src/maketree.c  |   0
 .../_projects/dvm}/tools/Zlib/src/minigzip.c  |   0
 .../_projects/dvm}/tools/Zlib/src/trees.c     |   0
 .../_projects/dvm}/tools/Zlib/src/uncompr.c   |   0
 .../_projects/dvm}/tools/Zlib/src/zutil.c     |   0
 .../tools/pppa/branches/dvm4.07/makefile.uni  |   0
 .../tools/pppa/branches/dvm4.07/makefile.win  |   0
 .../tools/pppa/branches/dvm4.07/src/bool.h    |   0
 .../tools/pppa/branches/dvm4.07/src/dvmvers.h |   0
 .../tools/pppa/branches/dvm4.07/src/inter.cpp |   0
 .../tools/pppa/branches/dvm4.07/src/inter.h   |   0
 .../pppa/branches/dvm4.07/src/makefile.uni    |   0
 .../pppa/branches/dvm4.07/src/makefile.win    |   0
 .../pppa/branches/dvm4.07/src/potensyn.cpp    |   0
 .../pppa/branches/dvm4.07/src/potensyn.h      |   0
 .../pppa/branches/dvm4.07/src/statfile.cpp    |   0
 .../tools/pppa/branches/dvm4.07/src/statist.h |   0
 .../pppa/branches/dvm4.07/src/statprintf.cpp  |   0
 .../pppa/branches/dvm4.07/src/statprintf.h    |   0
 .../pppa/branches/dvm4.07/src/statread.cpp    |   0
 .../pppa/branches/dvm4.07/src/statread.h      |   0
 .../tools/pppa/branches/dvm4.07/src/strall.h  |   0
 .../tools/pppa/branches/dvm4.07/src/sysstat.h |   0
 .../pppa/branches/dvm4.07/src/treeinter.cpp   |   0
 .../pppa/branches/dvm4.07/src/treeinter.h     |   0
 .../tools/pppa/branches/dvm4.07/src/ver.h     |   0
 .../pppa/stuff/Zlib_1.1.3/Include/deflate.h   |   0
 .../pppa/stuff/Zlib_1.1.3/Include/infblock.h  |   0
 .../pppa/stuff/Zlib_1.1.3/Include/infcodes.h  |   0
 .../pppa/stuff/Zlib_1.1.3/Include/inffast.h   |   0
 .../pppa/stuff/Zlib_1.1.3/Include/inffixed.h  |   0
 .../pppa/stuff/Zlib_1.1.3/Include/inftrees.h  |   0
 .../pppa/stuff/Zlib_1.1.3/Include/infutil.h   |   0
 .../pppa/stuff/Zlib_1.1.3/Include/trees.h     |   0
 .../pppa/stuff/Zlib_1.1.3/Include/zconf.h     |   0
 .../pppa/stuff/Zlib_1.1.3/Include/zlib.h      |   0
 .../pppa/stuff/Zlib_1.1.3/Include/zutil.h     |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/Makefile  |   0
 .../pppa/stuff/Zlib_1.1.3/Src/Makefile.1      |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c |   0
 .../pppa/stuff/Zlib_1.1.3/Src/compress.c      |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c   |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/example.c |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c    |   0
 .../pppa/stuff/Zlib_1.1.3/Src/infblock.c      |   0
 .../pppa/stuff/Zlib_1.1.3/Src/infcodes.c      |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c |   0
 .../pppa/stuff/Zlib_1.1.3/Src/inftrees.c      |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c |   0
 .../pppa/stuff/Zlib_1.1.3/Src/makefile.uni    |   0
 .../pppa/stuff/Zlib_1.1.3/Src/maketree.c      |   0
 .../pppa/stuff/Zlib_1.1.3/Src/minigzip.c      |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/trees.c   |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c   |   0
 .../dvm}/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak |   0
 .../dvm}/tools/pppa/stuff/Zlib_1.1.3/readme   |   0
 .../dvm}/tools/pppa/trunk/CMakeLists.txt      |   0
 .../dvm}/tools/pppa/trunk/makefile.uni        |   0
 .../dvm}/tools/pppa/trunk/makefile.win        |   0
 .../dvm}/tools/pppa/trunk/src/CMakeLists.txt  |   0
 .../tools/pppa/trunk/src/LibraryImport.cpp    |   0
 .../dvm}/tools/pppa/trunk/src/LibraryImport.h |   0
 .../dvm}/tools/pppa/trunk/src/PPPA/PPPA.sln   |   0
 .../pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj     |   0
 .../trunk/src/PPPA/PPPA/PPPA.vcxproj.filters  |   0
 .../dvm}/tools/pppa/trunk/src/bool.h          |   0
 .../dvm}/tools/pppa/trunk/src/dvmh_stat.h     |   0
 .../dvm}/tools/pppa/trunk/src/dvmvers.h.in    |   0
 .../dvm}/tools/pppa/trunk/src/inter.cpp       |   0
 .../dvm}/tools/pppa/trunk/src/inter.h         |   0
 .../dvm}/tools/pppa/trunk/src/json.hpp        |   0
 .../dvm}/tools/pppa/trunk/src/makefile.uni    |   0
 .../dvm}/tools/pppa/trunk/src/makefile.win    |   0
 .../dvm}/tools/pppa/trunk/src/makefileJnilib  |   0
 .../dvm}/tools/pppa/trunk/src/potensyn.cpp    |   0
 .../dvm}/tools/pppa/trunk/src/potensyn.h      |   0
 .../dvm}/tools/pppa/trunk/src/stat.cpp        |   0
 .../dvm}/tools/pppa/trunk/src/statfile.cpp    |   0
 .../dvm}/tools/pppa/trunk/src/statinter.cpp   |   0
 .../dvm}/tools/pppa/trunk/src/statinter.h     |   0
 .../dvm}/tools/pppa/trunk/src/statist.h       |   0
 .../dvm}/tools/pppa/trunk/src/statlist.cpp    |   0
 .../dvm}/tools/pppa/trunk/src/statlist.h      |   0
 .../dvm}/tools/pppa/trunk/src/statprintf.cpp  |   0
 .../dvm}/tools/pppa/trunk/src/statprintf.h    |   0
 .../dvm}/tools/pppa/trunk/src/statread.cpp    |   0
 .../dvm}/tools/pppa/trunk/src/statread.h      |   0
 .../dvm}/tools/pppa/trunk/src/strall.h        |   0
 .../dvm}/tools/pppa/trunk/src/sysstat.h       |   0
 .../dvm}/tools/pppa/trunk/src/treeinter.cpp   |   0
 .../dvm}/tools/pppa/trunk/src/treeinter.h     |   0
 .../_projects/dvm}/tools/pppa/trunk/src/ver.h |   0
 .../tester/trunk/automation/build-and-test.sh |   0
 .../tester/trunk/automation/check-repo.sh     |   0
 .../tester/trunk/automation/dvm-tester.config |   0
 .../tester/trunk/automation/dvm-tester.sh     |   0
 .../trunk/automation/populate-report.sh       |   0
 .../tester/trunk/automation/test-revision.sh  |   0
 .../tools/tester/trunk/main/configure-run.sh  |   0
 .../trunk/main/default-test-analyzer.sh       |   0
 .../tools/tester/trunk/main/gen-report.sh     |   0
 .../tools/tester/trunk/main/machine-config.sh |   0
 .../tools/tester/trunk/main/perform-tests.sh  |   0
 .../dvm}/tools/tester/trunk/main/report.css   |   0
 .../dvm}/tools/tester/trunk/main/report.js    |   0
 .../tools/tester/trunk/main/task-processor.sh |   0
 .../tools/tester/trunk/main/test-system.sh    |   0
 .../tools/tester/trunk/main/test-utils.sh     |   0
 .../Correctness/C/ACROSS/acr014.cdv           |   0
 .../test-suite/Correctness/C/ACROSS/acr11.cdv |   0
 .../test-suite/Correctness/C/ACROSS/acr12.cdv |   0
 .../test-suite/Correctness/C/ACROSS/acr22.cdv |   0
 .../test-suite/Correctness/C/ACROSS/acr23.cdv |   0
 .../test-suite/Correctness/C/ACROSS/acr33.cdv |   0
 .../test-suite/Correctness/C/ACROSS/acr34.cdv |   0
 .../test-suite/Correctness/C/ACROSS/acr44.cdv |   0
 .../test-suite/Correctness/C/ACROSS/settings  |   0
 .../Correctness/C/ALIGN/align11.cdv           |   0
 .../Correctness/C/ALIGN/align12.cdv           |   0
 .../Correctness/C/ALIGN/align214.cdv          |   0
 .../Correctness/C/ALIGN/align22.cdv           |   0
 .../Correctness/C/ALIGN/align32.cdv           |   0
 .../Correctness/C/ALIGN/align33.cdv           |   0
 .../Correctness/C/ALIGN/align44.cdv           |   0
 .../Correctness/C/ALIGN/aligndyn11.cdv        |   0
 .../test-suite/Correctness/C/DISTR/distr1.cdv |   0
 .../test-suite/Correctness/C/DISTR/distr2.cdv |   0
 .../test-suite/Correctness/C/DISTR/distr3.cdv |   0
 .../test-suite/Correctness/C/DISTR/distr4.cdv |   0
 .../Correctness/C/DISTR_GEN/distrgen1.cdv     |   0
 .../Correctness/C/DISTR_GEN/distrgen2.cdv     |   0
 .../Correctness/C/DISTR_GEN/distrgen3.cdv     |   0
 .../Correctness/C/DISTR_MIX/deldistr1.cdv     |   0
 .../Correctness/C/DISTR_MIX/deldistr2.cdv     |   0
 .../Correctness/C/DISTR_MIX/deldistr3.cdv     |   0
 .../Correctness/C/DISTR_MIX/distrmix1.cdv     |   0
 .../Correctness/C/DISTR_MIX/distrmix2.cdv     |   0
 .../Correctness/C/DISTR_MIX/distrmix3.cdv     |   0
 .../Correctness/C/DISTR_MULT/distrmult1.cdv   |   0
 .../Correctness/C/DISTR_MULT/distrmult2.cdv   |   0
 .../Correctness/C/DISTR_MULT/distrmult3.cdv   |   0
 .../Correctness/C/DISTR_WGT/distrwgt1.cdv     |   0
 .../Correctness/C/DISTR_WGT/distrwgt2.cdv     |   0
 .../Correctness/C/DISTR_WGT/distrwgt3.cdv     |   0
 .../test-suite/Correctness/C/IO/fopen11.cdv   |   0
 .../test-suite/Correctness/C/IO/fpsc11.cdv    |   0
 .../test-suite/Correctness/C/IO/fpsc12.cdv    |   0
 .../test-suite/Correctness/C/IO/fpsc21.cdv    |   0
 .../test-suite/Correctness/C/IO/fpsc22.cdv    |   0
 .../test-suite/Correctness/C/IO/fwrre11.cdv   |   0
 .../test-suite/Correctness/C/IO/fwrre12.cdv   |   0
 .../test-suite/Correctness/C/IO/fwrre21.cdv   |   0
 .../test-suite/Correctness/C/IO/fwrre22.cdv   |   0
 .../test-suite/Correctness/C/IO/fwrre23.cdv   |   0
 .../test-suite/Correctness/C/IO/fwrre24.cdv   |   0
 .../test-suite/Correctness/C/IO/remove11.cdv  |   0
 .../test-suite/Correctness/C/IO/rename11.cdv  |   0
 .../test-suite/Correctness/C/IO/tmpfile11.cdv |   0
 .../Correctness/C/OWNCALC/owncal11.cdv        |   0
 .../Correctness/C/OWNCALC/owncal21.cdv        |   0
 .../Correctness/C/OWNCALC/owncal31.cdv        |   0
 .../Correctness/C/OWNCALC/owncal41.cdv        |   0
 .../test-suite/Correctness/C/OWNCALC/settings |   0
 .../Correctness/C/PARALLEL/parallel1.cdv      |   0
 .../Correctness/C/PARALLEL/parallel2.cdv      |   0
 .../Correctness/C/PARALLEL/parallel3.cdv      |   0
 .../Correctness/C/PARALLEL/parallel4.cdv      |   0
 .../Correctness/C/PARALLEL/paralplus124.cdv   |   0
 .../Correctness/C/PARALLEL/paralplus234.cdv   |   0
 .../Correctness/C/PARALLEL/paralplus34.cdv    |   0
 .../Correctness/C/REALIGN/realign11.cdv       |   0
 .../Correctness/C/REALIGN/realign22.cdv       |   0
 .../Correctness/C/REALIGN/realign33.cdv       |   0
 .../Correctness/C/REALIGN/realign44.cdv       |   0
 .../Correctness/C/REDUCTION/red11n.cdv        |   0
 .../Correctness/C/REDUCTION/red21m.cdv        |   0
 .../test-suite/Correctness/C/REMOTE/rem11.cdv |   0
 .../test-suite/Correctness/C/REMOTE/rem12.cdv |   0
 .../test-suite/Correctness/C/REMOTE/rem21.cdv |   0
 .../test-suite/Correctness/C/REMOTE/rem22.cdv |   0
 .../test-suite/Correctness/C/REMOTE/rem31.cdv |   0
 .../test-suite/Correctness/C/REMOTE/rem32.cdv |   0
 .../test-suite/Correctness/C/REMOTE/rem41.cdv |   0
 .../test-suite/Correctness/C/REMOTE/rem42.cdv |   0
 .../test-suite/Correctness/C/REMOTE/rem43.cdv |   0
 .../test-suite/Correctness/C/SHADOW/sh21.cdv  |   0
 .../test-suite/Correctness/C/SHADOW/sh31.cdv  |   0
 .../test-suite/Correctness/C/SHADOW/sh41.cdv  |   0
 .../Correctness/C/TEMPLATE/templ1.cdv         |   0
 .../Correctness/C/TEMPLATE/templ2.cdv         |   0
 .../Correctness/C/TEMPLATE/templ4.cdv         |   0
 .../Correctness/Fortran/ACROSS/acr11.fdv      |   0
 .../Correctness/Fortran/ACROSS/acr12.fdv      |   0
 .../Correctness/Fortran/ACROSS/acr21.fdv      |   0
 .../Correctness/Fortran/ACROSS/acr22.fdv      |   0
 .../Correctness/Fortran/ACROSS/acr31.fdv      |   0
 .../Correctness/Fortran/ACROSS/acr32.fdv      |   0
 .../Correctness/Fortran/ACROSS/acr41.fdv      |   0
 .../Correctness/Fortran/ACROSS/acr42.fdv      |   0
 .../Correctness/Fortran/ACROSS/acr43.fdv      |   0
 .../Correctness/Fortran/ACROSS/settings       |   0
 .../Correctness/Fortran/ALIGN/align11.fdv     |   0
 .../Correctness/Fortran/ALIGN/align12.fdv     |   0
 .../Correctness/Fortran/ALIGN/align21.fdv     |   0
 .../Correctness/Fortran/ALIGN/align22.fdv     |   0
 .../Correctness/Fortran/ALIGN/align24.fdv     |   0
 .../Correctness/Fortran/ALIGN/align32.fdv     |   0
 .../Correctness/Fortran/ALIGN/align33.fdv     |   0
 .../Correctness/Fortran/ALIGN/align44.fdv     |   0
 .../Fortran/ALIGN/alignfloat11.fdv            |   0
 .../Correctness/Fortran/ALIGN/alignplus21.fdv |   0
 .../Correctness/Fortran/ALIGN/alignplus33.fdv |   0
 .../Fortran/CONSISTENT/cons01234.fdv          |   0
 .../Correctness/Fortran/CONSISTENT/cons11.fdv |   0
 .../Fortran/CONSISTENT/cons1234.fdv           |   0
 .../Correctness/Fortran/CONSISTENT/cons22.fdv |   0
 .../Fortran/CONSISTENT/cons234.fdv            |   0
 .../Correctness/Fortran/CONSISTENT/cons33.fdv |   0
 .../Correctness/Fortran/CONSISTENT/cons34.fdv |   0
 .../Correctness/Fortran/CONSISTENT/cons44.fdv |   0
 .../Correctness/Fortran/DISTR/distr1.fdv      |   0
 .../Correctness/Fortran/DISTR/distr2.fdv      |   0
 .../Correctness/Fortran/DISTR/distr3.fdv      |   0
 .../Correctness/Fortran/DISTR/distr4.fdv      |   0
 .../Correctness/Fortran/DISTR/distrfloat1.fdv |   0
 .../Fortran/DISTR_GEN/distrgen1.fdv           |   0
 .../Fortran/DISTR_GEN/distrgen2.fdv           |   0
 .../Fortran/DISTR_GEN/distrgen3.fdv           |   0
 .../Fortran/DISTR_MIX/distrmix1.fdv           |   0
 .../Fortran/DISTR_MIX/distrmix2.fdv           |   0
 .../Fortran/DISTR_MIX/distrmix3.fdv           |   0
 .../Fortran/DISTR_MULT/distrmult1.fdv         |   0
 .../Fortran/DISTR_MULT/distrmult2.fdv         |   0
 .../Fortran/DISTR_MULT/distrmult3.fdv         |   0
 .../Fortran/DISTR_WGT/distrwgt1.fdv           |   0
 .../Fortran/DISTR_WGT/distrwgt2.fdv           |   0
 .../Fortran/DISTR_WGT/distrwgt3.fdv           |   0
 .../Correctness/Fortran/F2C/f2c_do.fdv        |   0
 .../Correctness/Fortran/F2C/f2c_math.fdv      |   0
 .../Fortran/F2C/f2c_math_intel.fdv            |   0
 .../Correctness/Fortran/F2C/f2c_select.fdv    |   0
 .../Correctness/Fortran/F2C/settings          |   0
 .../Correctness/Fortran/F95/copy11.fdv        |   0
 .../Correctness/Fortran/F95/copy21.fdv        |   0
 .../Correctness/Fortran/F95/module21.fdv      |   0
 .../Correctness/Fortran/F95/settings          |   0
 .../Correctness/Fortran/F95/type21.fdv        |   0
 .../INDIRECT_DERIVED/distrderived1.fdv        |   0
 .../INDIRECT_DERIVED/distrindirect1.f90       |   0
 .../INDIRECT_DERIVED/distrindirect3.f90       |   0
 .../Fortran/INOUTLOCAL/inoutlocal31.fdv       |   0
 .../Fortran/INOUTLOCAL/inoutlocal32.fdv       |   0
 .../Fortran/INOUTLOCAL/inoutlocal33.fdv       |   0
 .../Fortran/PARALLEL/parallel1.fdv            |   0
 .../Fortran/PARALLEL/parallel2.fdv            |   0
 .../Fortran/PARALLEL/parallel3.fdv            |   0
 .../Fortran/PARALLEL/parallel4.fdv            |   0
 .../Fortran/PARALLEL/paralplus12.fdv          |   0
 .../Fortran/PARALLEL/paralplus14.fdv          |   0
 .../Fortran/PARALLEL/paralplus23.fdv          |   0
 .../Fortran/PARALLEL/paralplus24.fdv          |   0
 .../Fortran/PARALLEL/paralplus34.fdv          |   0
 .../Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv  |   0
 .../Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv |   0
 .../Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv |   0
 .../Fortran/PARALLEL_NO_ON/settings           |   0
 .../Correctness/Fortran/PREFETCH/prf11.fdv    |   0
 .../Correctness/Fortran/PREFETCH/prf12.fdv    |   0
 .../Correctness/Fortran/PREFETCH/prf21.fdv    |   0
 .../Correctness/Fortran/PREFETCH/prf22.fdv    |   0
 .../Correctness/Fortran/PREFETCH/prf23.f90    |   0
 .../Correctness/Fortran/PREFETCH/prf24.f90    |   0
 .../Correctness/Fortran/PREFETCH/prf31.fdv    |   0
 .../Correctness/Fortran/PREFETCH/prf32.fdv    |   0
 .../Correctness/Fortran/PREFETCH/prf33.f90    |   0
 .../Correctness/Fortran/PREFETCH/prf34.f90    |   0
 .../Correctness/Fortran/PREFETCH/prf41.fdv    |   0
 .../Correctness/Fortran/PREFETCH/prf42.fdv    |   0
 .../Correctness/Fortran/PREFETCH/prf43.fdv    |   0
 .../Correctness/Fortran/PREFETCH/prf44.f90    |   0
 .../Correctness/Fortran/PREFETCH/prf45.f90    |   0
 .../Correctness/Fortran/PREFETCH/prf46.f90    |   0
 .../Correctness/Fortran/PREFETCH/settings     |   0
 .../Correctness/Fortran/REALIGN/realign11.fdv |   0
 .../Correctness/Fortran/REALIGN/realign22.fdv |   0
 .../Correctness/Fortran/REALIGN/realign33.fdv |   0
 .../Correctness/Fortran/REALIGN/realign44.fdv |   0
 .../Correctness/Fortran/REDUCTION/red11.fdv   |   0
 .../Correctness/Fortran/REDUCTION/red12.fdv   |   0
 .../Correctness/Fortran/REDUCTION/red21.fdv   |   0
 .../Correctness/Fortran/REDUCTION/red22.fdv   |   0
 .../Correctness/Fortran/REDUCTION/red31.fdv   |   0
 .../Correctness/Fortran/REDUCTION/red32.fdv   |   0
 .../Correctness/Fortran/REDUCTION/red41.fdv   |   0
 .../Correctness/Fortran/REDUCTION/red42.fdv   |   0
 .../Correctness/Fortran/REDUCTION/red43.fdv   |   0
 .../Correctness/Fortran/REDUCTIONA/reda11.fdv |   0
 .../Correctness/Fortran/REDUCTIONA/reda12.fdv |   0
 .../Correctness/Fortran/REDUCTIONA/reda21.fdv |   0
 .../Correctness/Fortran/REDUCTIONA/reda22.fdv |   0
 .../Correctness/Fortran/REDUCTIONA/reda31.fdv |   0
 .../Correctness/Fortran/REDUCTIONA/reda32.fdv |   0
 .../Correctness/Fortran/REDUCTIONA/reda41.fdv |   0
 .../Correctness/Fortran/REDUCTIONA/reda42.fdv |   0
 .../Correctness/Fortran/REDUCTIONA/reda43.fdv |   0
 .../Correctness/Fortran/REDUCTIONA/settings   |   0
 .../Correctness/Fortran/REMOTE/rem11.fdv      |   0
 .../Correctness/Fortran/REMOTE/rem12.fdv      |   0
 .../Correctness/Fortran/REMOTE/rem21.fdv      |   0
 .../Correctness/Fortran/REMOTE/rem22.fdv      |   0
 .../Correctness/Fortran/REMOTE/rem31.fdv      |   0
 .../Correctness/Fortran/REMOTE/rem32.fdv      |   0
 .../Correctness/Fortran/REMOTE/rem41.fdv      |   0
 .../Correctness/Fortran/REMOTE/rem42.fdv      |   0
 .../Correctness/Fortran/REMOTE/rem43.fdv      |   0
 .../Correctness/Fortran/SHADOW/sh11.fdv       |   0
 .../Correctness/Fortran/SHADOW/sh12.fdv       |   0
 .../Correctness/Fortran/SHADOW/sh21.fdv       |   0
 .../Correctness/Fortran/SHADOW/sh22.fdv       |   0
 .../Correctness/Fortran/SHADOW/sh31.fdv       |   0
 .../Correctness/Fortran/SHADOW/sh32.fdv       |   0
 .../Correctness/Fortran/SHADOW/sh41.fdv       |   0
 .../Correctness/Fortran/SHADOW/sh42.fdv       |   0
 .../Correctness/Fortran/SHADOWA/settings      |   0
 .../Correctness/Fortran/SHADOWA/sha11.fdv     |   0
 .../Correctness/Fortran/SHADOWA/sha12.fdv     |   0
 .../Correctness/Fortran/SHADOWA/sha21.fdv     |   0
 .../Correctness/Fortran/SHADOWA/sha22.fdv     |   0
 .../Correctness/Fortran/SHADOWA/sha31.fdv     |   0
 .../Correctness/Fortran/SHADOWA/sha32.fdv     |   0
 .../Correctness/Fortran/SHADOWA/sha41.fdv     |   0
 .../Correctness/Fortran/SHADOWA/sha42.fdv     |   0
 .../Correctness/Fortran/SHADOWA/sha43.fdv     |   0
 .../Correctness/Fortran/SHADOW_COMP/sc11.fdv  |   0
 .../Correctness/Fortran/SHADOW_COMP/sc21.fdv  |   0
 .../Correctness/Fortran/SHADOW_COMP/sc22.fdv  |   0
 .../Correctness/Fortran/SHADOW_COMP/sc31.fdv  |   0
 .../Correctness/Fortran/SHADOW_COMP/sc32.fdv  |   0
 .../Correctness/Fortran/SHADOW_COMP/sc41.fdv  |   0
 .../Correctness/Fortran/SHADOW_COMP/sc42.fdv  |   0
 .../Correctness/Fortran/TASK/taskst11.fdv     |   0
 .../Correctness/Fortran/TASK/taskst12.fdv     |   0
 .../Correctness/Fortran/TASK/taskst21.f90     |   0
 .../Correctness/Fortran/TASK/taskst22.f90     |   0
 .../Correctness/Fortran/TASK/taskst31.f90     |   0
 .../Correctness/Fortran/TASK/taskst32.f90     |   0
 .../Correctness/Fortran/TEMPLATE/templ1.fdv   |   0
 .../Correctness/Fortran/TEMPLATE/templ2.fdv   |   0
 .../Correctness/Fortran/TEMPLATE/templ4.fdv   |   0
 .../trunk/test-suite/Correctness/settings     |   0
 .../test-suite/Correctness/test-analyzer.sh   |   0
 .../Performance/NPB/FDVMH.fdv/BT/Makefile     |   0
 .../NPB/FDVMH.fdv/BT/TODO_make.bat            |   0
 .../Performance/NPB/FDVMH.fdv/BT/bt.fdv       |   0
 .../NPB/FDVMH.fdv/BT/compute_errors.fdv       |   0
 .../NPB/FDVMH.fdv/BT/compute_rhs.fdv          |   0
 .../NPB/FDVMH.fdv/BT/compute_rhs_block.fdv    |   0
 .../NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv   |   0
 .../NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv      |   0
 .../NPB/FDVMH.fdv/BT/exact_rhs.fdv            |   0
 .../NPB/FDVMH.fdv/BT/exact_rhs_block.fdv      |   0
 .../NPB/FDVMH.fdv/BT/exact_solution.fdv       |   0
 .../Performance/NPB/FDVMH.fdv/BT/header3d.h   |   0
 .../NPB/FDVMH.fdv/BT/initialize.fdv           |   0
 .../NPB/FDVMH.fdv/BT/print_result.fdv         |   0
 .../NPB/FDVMH.fdv/BT/set_constants.fdv        |   0
 .../Performance/NPB/FDVMH.fdv/BT/timers.fdv   |   0
 .../Performance/NPB/FDVMH.fdv/BT/verify.fdv   |   0
 .../Performance/NPB/FDVMH.fdv/BT/x_solve.fdv  |   0
 .../NPB/FDVMH.fdv/BT/x_solve_block.fdv        |   0
 .../NPB/FDVMH.fdv/BT/x_solve_mpi.fdv          |   0
 .../Performance/NPB/FDVMH.fdv/BT/y_solve.fdv  |   0
 .../NPB/FDVMH.fdv/BT/y_solve_block.fdv        |   0
 .../NPB/FDVMH.fdv/BT/y_solve_mpi.fdv          |   0
 .../Performance/NPB/FDVMH.fdv/BT/z_solve.fdv  |   0
 .../NPB/FDVMH.fdv/BT/z_solve_block.fdv        |   0
 .../NPB/FDVMH.fdv/BT/z_solve_mpi.fdv          |   0
 .../Performance/NPB/FDVMH.fdv/CG/Makefile     |   0
 .../NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt      |   0
 .../Performance/NPB/FDVMH.fdv/CG/cg.fdv       |   0
 .../FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt  |   0
 .../NPB/FDVMH.fdv/CG/cluster/cg.fdv           |   0
 .../Performance/NPB/FDVMH.fdv/CG/globals.h    |   0
 .../Performance/NPB/FDVMH.fdv/CG/make.bat     |   0
 .../NPB/FDVMH.fdv/CG/print_results.f          |   0
 .../Performance/NPB/FDVMH.fdv/CG/randdp.f     |   0
 .../Performance/NPB/FDVMH.fdv/CG/timers.f     |   0
 .../Performance/NPB/FDVMH.fdv/EP/Makefile     |   0
 .../Performance/NPB/FDVMH.fdv/EP/ep.fdv       |   0
 .../Performance/NPB/FDVMH.fdv/EP/make.bat     |   0
 .../Performance/NPB/FDVMH.fdv/FT/Makefile     |   0
 .../Performance/NPB/FDVMH.fdv/FT/dtime.h      |   0
 .../Performance/NPB/FDVMH.fdv/FT/ft.fdv       |   0
 .../Performance/NPB/FDVMH.fdv/FT/global.h     |   0
 .../Performance/NPB/FDVMH.fdv/FT/make.bat     |   0
 .../Performance/NPB/FDVMH.fdv/LU/Makefile     |   0
 .../Performance/NPB/FDVMH.fdv/LU/applu.incl   |   0
 .../Performance/NPB/FDVMH.fdv/LU/domain.f     |   0
 .../Performance/NPB/FDVMH.fdv/LU/erhs.f       |   0
 .../Performance/NPB/FDVMH.fdv/LU/error.f      |   0
 .../Performance/NPB/FDVMH.fdv/LU/exact.f      |   0
 .../Performance/NPB/FDVMH.fdv/LU/l2norm.f     |   0
 .../Performance/NPB/FDVMH.fdv/LU/lu.f         |   0
 .../Performance/NPB/FDVMH.fdv/LU/makeTODO.bat |   0
 .../Performance/NPB/FDVMH.fdv/LU/old/lu.fdv   |   0
 .../Performance/NPB/FDVMH.fdv/LU/pintgr.f     |   0
 .../NPB/FDVMH.fdv/LU/print_results.f          |   0
 .../Performance/NPB/FDVMH.fdv/LU/read_input.f |   0
 .../Performance/NPB/FDVMH.fdv/LU/rhs.f        |   0
 .../Performance/NPB/FDVMH.fdv/LU/rhs.f1       |   0
 .../Performance/NPB/FDVMH.fdv/LU/rhs.f2       |   0
 .../Performance/NPB/FDVMH.fdv/LU/setbv.f      |   0
 .../Performance/NPB/FDVMH.fdv/LU/setcoeff.f   |   0
 .../Performance/NPB/FDVMH.fdv/LU/setiv.f      |   0
 .../Performance/NPB/FDVMH.fdv/LU/ssor.f       |   0
 .../Performance/NPB/FDVMH.fdv/LU/timers.f     |   0
 .../Performance/NPB/FDVMH.fdv/LU/verify.f     |   0
 .../Performance/NPB/FDVMH.fdv/MG/Makefile     |   0
 .../NPB/FDVMH.fdv/MG/TODO_make.bat            |   0
 .../Performance/NPB/FDVMH.fdv/MG/comm3.fdv    |   0
 .../Performance/NPB/FDVMH.fdv/MG/dvmvars.h    |   0
 .../Performance/NPB/FDVMH.fdv/MG/globals.h    |   0
 .../Performance/NPB/FDVMH.fdv/MG/interp.fdv   |   0
 .../Performance/NPB/FDVMH.fdv/MG/mg.fdv       |   0
 .../Performance/NPB/FDVMH.fdv/MG/mg3p.fdv     |   0
 .../Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv  |   0
 .../Performance/NPB/FDVMH.fdv/MG/psinv.fdv    |   0
 .../Performance/NPB/FDVMH.fdv/MG/resid.fdv    |   0
 .../Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv    |   0
 .../Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv |   0
 .../NPB/FDVMH.fdv/MG/utilities.fdv            |   0
 .../Performance/NPB/FDVMH.fdv/MG/zran3.fdv    |   0
 .../Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h  |   0
 .../Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h |   0
 .../NPB/FDVMH.fdv/MG_DVM/globals.h            |   0
 .../NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv          |   0
 .../Performance/NPB/FDVMH.fdv/SP/Makefile     |   0
 .../NPB/FDVMH.fdv/SP/TODO_make.bat            |   0
 .../NPB/FDVMH.fdv/SP/compute_errors.for       |   0
 .../NPB/FDVMH.fdv/SP/compute_rhs.for          |   0
 .../NPB/FDVMH.fdv/SP/exact_rhs.for            |   0
 .../Performance/NPB/FDVMH.fdv/SP/header.h     |   0
 .../NPB/FDVMH.fdv/SP/initialize.for           |   0
 .../NPB/FDVMH.fdv/SP/print_result.for         |   0
 .../NPB/FDVMH.fdv/SP/set_constants.for        |   0
 .../Performance/NPB/FDVMH.fdv/SP/sp.for       |   0
 .../Performance/NPB/FDVMH.fdv/SP/timers.for   |   0
 .../Performance/NPB/FDVMH.fdv/SP/verify.for   |   0
 .../Performance/NPB/FDVMH.fdv/SP/x_solve.for  |   0
 .../NPB/FDVMH.fdv/SP/x_solve_mpi.for          |   0
 .../Performance/NPB/FDVMH.fdv/SP/y_solve.for  |   0
 .../NPB/FDVMH.fdv/SP/y_solve_mpi.for          |   0
 .../Performance/NPB/FDVMH.fdv/SP/z_solve.for  |   0
 .../NPB/FDVMH.fdv/SP/z_solve_mpi.for          |   0
 .../Performance/NPB/FDVMH.fdv/clear.bat       |   0
 .../Performance/NPB/FDVMH.fdv/compile.bat     |   0
 .../Performance/NPB/FDVMH.fdv/compile.sh      |   0
 .../Performance/NPB/FDVMH.fdv/compileTest.bat |   0
 .../Performance/NPB/FDVMH.fdv/config/make.def |   0
 .../NPB/FDVMH.fdv/config/make.def.bat         |   0
 .../Performance/NPB/FDVMH.fdv/run.bat         |   0
 .../Performance/NPB/FDVMH.fdv/run.sh          |   0
 .../Performance/NPB/FDVMH.fdv/sys/Makefile    |   0
 .../Performance/NPB/FDVMH.fdv/sys/make.common |   0
 .../Performance/NPB/FDVMH.fdv/sys/setparams.c |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile        |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/add.f           |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f           |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f            |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f          |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f   |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f    |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/define.f        |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f          |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/error.f         |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f     |   0
 .../MPI+FDVMH.fdv/BT_dvmh/exact_solution.f    |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f    |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f    |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/header.h        |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f    |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f      |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h        |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f           |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f     |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f  |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f        |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h      |   0
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f       |   0
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile        |   0
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f            |   0
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h        |   0
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h     |   0
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h        |   0
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile        |   0
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/README          |   0
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for          |   0
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h        |   0
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h     |   0
 .../Performance/NPB/MPI+FDVMH.fdv/clear.bat   |   0
 .../Performance/NPB/MPI+FDVMH.fdv/compile.bat |   0
 .../Performance/NPB/MPI+FDVMH.fdv/compile.sh  |   0
 .../NPB/MPI+FDVMH.fdv/compileTest.bat         |   0
 .../NPB/MPI+FDVMH.fdv/config/make_dvmh.def    |   0
 .../MPI+FDVMH.fdv/config/make_dvmh.def.bat    |   0
 .../Performance/NPB/MPI+FDVMH.fdv/run.bat     |   0
 .../Performance/NPB/MPI+FDVMH.fdv/run.sh      |   0
 .../NPB/MPI+FDVMH.fdv/sys/Makefile            |   0
 .../NPB/MPI+FDVMH.fdv/sys/make.common         |   0
 .../NPB/MPI+FDVMH.fdv/sys/setparams.c         |   0
 .../trunk/test-suite/Performance/NPB/settings |   0
 .../trunk/test-suite/Performance/adi3d.cdv    |   0
 .../trunk/test-suite/Performance/adi3d.fdv    |   0
 .../trunk/test-suite/Performance/d_sor2d.fdv  |   0
 .../trunk/test-suite/Performance/d_sor3d.fdv  |   0
 .../trunk/test-suite/Performance/f_sor2d.fdv  |   0
 .../trunk/test-suite/Performance/f_sor3d.fdv  |   0
 .../trunk/test-suite/Performance/jac2d.cdv    |   0
 .../trunk/test-suite/Performance/jac2d.fdv    |   0
 .../trunk/test-suite/Performance/jac3d.cdv    |   0
 .../trunk/test-suite/Performance/jac3d.fdv    |   0
 .../trunk/test-suite/Performance/settings     |   0
 .../test-suite/Performance/test-analyzer.sh   |   0
 .../tools/tester/trunk/test-suite/settings    |   0
 Sapfor/_projects/paths.default.txt            |  10 +
 Sapfor/paths.default.txt                      |  10 -
 792 files changed, 32 insertions(+), 499 deletions(-)
 delete mode 100644 Sapfor/Sapfor/Makefile
 rename Sapfor/{ => _projects}/FDVM/CMakeLists.txt (100%)
 rename Sapfor/{ => _projects}/Parser/CMakeLists.txt (100%)
 rename Sapfor/{ => _projects}/SageLib/CMakeLists.txt (100%)
 rename Sapfor/{ => _projects}/SageNewSrc/CMakeLists.txt (100%)
 rename Sapfor/{ => _projects}/SageOldSrc/CMakeLists.txt (100%)
 rename Sapfor/{ => _projects}/Sapc++/Sapc++.sln (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/InlineExpansion/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/InlineExpansion/dvm_tag.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/InlineExpansion/hlp.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/InlineExpansion/inl_exp.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/InlineExpansion/inline.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/InlineExpansion/inliner.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/InlineExpansion/intrinsic.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/InlineExpansion/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/InlineExpansion/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/LICENSE (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/Sage++/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/Sage++/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/Sage++/libSage++.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/Sage++/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/Sage++/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/bif.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/compatible.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/db.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/db.new.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/defines.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/defs.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/dep.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/dep_str.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/dep_struct.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/elist.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/f90.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/fixcray.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/fm.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/head (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/leak_detector.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/list.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/ll.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/prop.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/sage.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/sagearch.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/sageroot.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/sets.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/symb.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/symblob.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/tag (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/tag.doc (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/tag.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/tag_make (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/version.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/vextern.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/vparse.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/vpc.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/h/window.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/attributes.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/baseClasses.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/bif_node.def (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/dependence.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/ext_ann.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/ext_high.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/ext_lib.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/ext_low.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/ext_mid.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/extcxx_low.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/libSage++.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/macro.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/sage++callgraph.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/sage++extern.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/sage++proto.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/sage++user.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/symb.def (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/type.def (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/unparse.def (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/unparseC++.def (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/include/unparseDVM.def (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/annotate.y (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/comments.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/low_level.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/toolsann.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/newsrc/unparse.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/db.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/db_unp.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/dbutils.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/list.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/ndeps.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/readnodes.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/sets.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/setutils.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/lib/oldsrc/writenodes.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/Sage/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/acrossDebugging/across.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/gausf.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/gausgb.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/gaush.hpf (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/gauswh.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/jac.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/jacas.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/jach.hpf (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/redbf.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/redbh.hpf (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/sor.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/task2j.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/tasks.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/examples/taskst.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_across.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_across_analyzer.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_analyzer.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_data.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_f2c.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_f2c_handlers.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_index_analyzer.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_rtc.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_unused_code.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/acc_utilities.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/aks_analyzeLoops.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/aks_loopStructure.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/aks_structs.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/calls.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/checkpoint.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/debug.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/dvm.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/funcall.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/help.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/hpf.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/io.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/omp.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/ompdebug.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/parloop.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/fdvm/stmt.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/acc_across_analyzer.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/acc_analyzer.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/acc_data.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/aks_loopStructure.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/aks_structs.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/calls.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/dvm.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/dvm_tag.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/extern.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/fdvm.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/fdvm_version.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/inc.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/leak_detector.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/libSageOMP.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/libdvm.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/libnum.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/unparse.hpf (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/unparse1.hpf (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/include/user.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/cftn.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/errors.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/facc.gram (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/fdvm.gram (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/fomp.gram (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/fspf.gram (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/ftn.gram (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/gram1.tab.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/gram1.tab.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/gram1.y (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/hash.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/head (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/init.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/lexfdvm.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/lists.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/low_hpf.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/misc.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/stat.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/sym.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/tag (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/tag.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/tokdefs.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/tokens (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/types.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/parser/unparse_hpf.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/sageExample/SwapFors.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/sageExample/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/fdvm/trunk/sageExample/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/deflate.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/infblock.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/infcodes.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/inffast.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/inffixed.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/inftrees.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/infutil.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/trees.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/zconf.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/zlib.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/include/zutil.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/adler32.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/compress.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/crc32.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/deflate.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/example.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/gzio.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/infblock.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/infcodes.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/inffast.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/inflate.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/inftrees.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/infutil.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/maketree.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/minigzip.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/trees.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/uncompr.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/Zlib/src/zutil.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/bool.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/dvmvers.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/inter.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/inter.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/potensyn.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/potensyn.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/statfile.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/statist.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/statprintf.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/statprintf.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/statread.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/statread.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/strall.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/sysstat.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/treeinter.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/treeinter.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/branches/dvm4.07/src/ver.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/example.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/stuff/Zlib_1.1.3/readme (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/CMakeLists.txt (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/LibraryImport.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/LibraryImport.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/PPPA/PPPA.sln (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/bool.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/dvmh_stat.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/dvmvers.h.in (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/inter.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/inter.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/json.hpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/makefile.uni (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/makefile.win (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/makefileJnilib (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/potensyn.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/potensyn.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/stat.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statfile.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statinter.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statinter.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statist.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statlist.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statlist.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statprintf.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statprintf.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statread.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/statread.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/strall.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/sysstat.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/treeinter.cpp (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/treeinter.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/pppa/trunk/src/ver.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/automation/build-and-test.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/automation/check-repo.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/automation/dvm-tester.config (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/automation/dvm-tester.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/automation/populate-report.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/automation/test-revision.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/configure-run.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/default-test-analyzer.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/gen-report.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/machine-config.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/perform-tests.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/report.css (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/report.js (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/task-processor.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/test-system.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/main/test-utils.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr014.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr12.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr22.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr23.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr33.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr34.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr44.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ACROSS/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align12.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align214.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align22.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align32.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align33.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align44.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/ALIGN/aligndyn11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr1.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr2.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr3.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr4.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen1.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen2.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen3.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr1.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr2.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr3.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix1.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix2.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix3.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult1.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult2.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult3.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt1.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt2.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt3.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fopen11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc12.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc21.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc22.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre12.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre21.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre22.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre23.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre24.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/remove11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/rename11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/IO/tmpfile11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal21.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal31.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal41.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel1.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel2.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel3.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel4.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus124.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus234.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus34.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign22.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign33.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign44.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red11n.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red21m.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem11.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem12.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem21.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem22.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem31.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem32.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem41.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem42.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem43.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh21.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh31.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh41.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ1.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ2.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ4.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr31.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr41.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr42.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr43.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align24.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align33.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align44.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignfloat11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus33.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons01234.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons1234.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons234.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons33.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons34.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons44.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr2.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr4.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distrfloat1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen2.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix2.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult2.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt2.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_do.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math_intel.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_select.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F95/module21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F95/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/F95/type21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrderived1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect1.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect3.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal31.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal33.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel2.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel4.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus14.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus23.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus24.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus34.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf23.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf24.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf31.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf33.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf34.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf41.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf42.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf43.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf44.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf45.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf46.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign33.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign44.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red31.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red41.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red42.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red43.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda31.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda41.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda42.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda43.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem31.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem41.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem42.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem43.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh31.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh41.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh42.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha31.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha41.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha42.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha43.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc21.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc22.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc31.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc32.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc41.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc42.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ1.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ2.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ4.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Correctness/test-analyzer.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/TODO_make.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/bt.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_errors.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs_block.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_solution.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/header3d.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/initialize.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/print_result.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/set_constants.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/timers.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/verify.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_block.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_mpi.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_block.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_mpi.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_block.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_mpi.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/globals.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/make.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/print_results.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/randdp.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/timers.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/ep.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/make.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/dtime.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/global.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/make.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/applu.incl (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/domain.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/erhs.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/error.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/exact.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/l2norm.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/lu.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/makeTODO.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/old/lu.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/pintgr.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/print_results.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/read_input.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f1 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f2 (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setbv.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setcoeff.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setiv.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/ssor.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/timers.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/verify.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/TODO_make.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/comm3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/dvmvars.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/globals.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/interp.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg3p.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/psinv.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/resid.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/utilities.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/zran3.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/globals.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/TODO_make.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_errors.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_rhs.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/exact_rhs.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/header.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/initialize.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/print_result.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/set_constants.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/sp.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/timers.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/verify.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve_mpi.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve_mpi.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve_mpi.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/clear.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compileTest.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/make.common (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/setparams.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/add.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/define.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/error.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_solution.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/header.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/README (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/clear.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compileTest.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.bat (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/Makefile (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/make.common (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/setparams.c (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/NPB/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/adi3d.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/adi3d.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/d_sor2d.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/d_sor3d.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/f_sor2d.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/f_sor3d.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/jac2d.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/jac2d.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/jac3d.cdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/jac3d.fdv (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/settings (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/Performance/test-analyzer.sh (100%)
 rename {dvm => Sapfor/_projects/dvm}/tools/tester/trunk/test-suite/settings (100%)
 create mode 100644 Sapfor/_projects/paths.default.txt
 delete mode 100644 Sapfor/paths.default.txt

diff --git a/Sapfor/CMakeLists.txt b/Sapfor/CMakeLists.txt
index 0bc42a4..90da4c5 100644
--- a/Sapfor/CMakeLists.txt
+++ b/Sapfor/CMakeLists.txt
@@ -13,24 +13,25 @@ add_definitions("-D YYDEBUG")
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(fdvm_include ../dvm/fdvm/trunk/include)
-set(sage_include_1 ../dvm/fdvm/trunk/Sage/lib/include)
-set(sage_include_2 ../dvm/fdvm/trunk/Sage/h/)
-set(libdb_sources ../dvm/fdvm/trunk/Sage/lib/oldsrc)
-set(sage_sources ../dvm/fdvm/trunk/Sage/lib/newsrc)
-set(sagepp_sources ../dvm/fdvm/trunk/Sage/Sage++)
-set(parser_sources ../dvm/fdvm/trunk/parser)
-set(pppa_sources ../dvm/tools/pppa/trunk/src)
-set(zlib_sources ../dvm/tools/Zlib)
+set(fdvm_include _projects/dvm/fdvm/trunk/include)
+set(fdvm_sources _projects//dvm/fdvm/trunk/fdvm/)
+set(sage_include_1 _projects/dvm/fdvm/trunk/Sage/lib/include)
+set(sage_include_2 _projects/dvm/fdvm/trunk/Sage/h/)
+set(libdb_sources _projects/dvm/fdvm/trunk/Sage/lib/oldsrc)
+set(sage_sources _projects/dvm/fdvm/trunk/Sage/lib/newsrc)
+set(sagepp_sources _projects/dvm/fdvm/trunk/Sage/Sage++)
+set(parser_sources _projects/dvm/fdvm/trunk/parser)
+set(pppa_sources _projects/dvm/tools/pppa/trunk/src)
+set(zlib_sources _projects/dvm/tools/Zlib)
 
 # Read pathes to external sapfor directories
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/paths.txt")
-    message("Found paths.txt, using custom paths.")
-    FILE(STRINGS ./paths.txt SAPFOR_PATHS)
-else ()
-    message("Not found paths.txt, using default paths.")
-    FILE(STRINGS ./paths.default.txt SAPFOR_PATHS)
-endif ()
+#if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/_projects/paths.txt")
+#    message("Found paths.txt, using custom paths.")
+#    FILE(STRINGS ./_projects/paths.txt SAPFOR_PATHS)
+#else ()
+#    message("Not found paths.txt, using default paths.")
+#    FILE(STRINGS ./_projects/paths.default.txt SAPFOR_PATHS)
+#endif ()
   
 foreach (NameAndValue ${SAPFOR_PATHS})
     # Strip leading spaces
@@ -490,16 +491,16 @@ else()
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
 endif()
 
-add_subdirectory(FDVM)
+add_subdirectory(_projects/FDVM)
 
 add_definitions("-D __SPF")
 add_definitions("-D _CRT_SECURE_NO_WARNINGS")
 add_definitions("-D _CRT_NON_CONFORMING_SWPRINTFS")
 
-add_subdirectory(SageOldSrc)
-add_subdirectory(SageNewSrc)
-add_subdirectory(SageLib)
-add_subdirectory(Parser)
+add_subdirectory(_projects/SageOldSrc)
+add_subdirectory(_projects/SageNewSrc)
+add_subdirectory(_projects/SageLib)
+add_subdirectory(_projects/Parser)
 
 add_definitions("-D __SPF_BUILT_IN_FDVM")
 add_definitions("-D __SPF_BUILT_IN_PARSER")
diff --git a/Sapfor/Sapfor/Makefile b/Sapfor/Sapfor/Makefile
deleted file mode 100644
index 0f3db35..0000000
--- a/Sapfor/Sapfor/Makefile
+++ /dev/null
@@ -1,468 +0,0 @@
-########################################################################
-# Makefile for Sapfor 2017 
-########################################################################
-
-LIBDIR = ../_lib
-BINDIR = ../_bin
-SRCDIR = ../_src
-
-CXX = g++
-CC  = gcc
-CFLAGS = -O3 -D__SPF 
-STD=c++11
-
-REPO_FDVM_BASE      = ../../../../dvm/fdvm/trunk/
-REPO_SPF_BASE       = ../_src/
-
-SAGE_BASE_DIR = $(REPO_FDVM_BASE)Sage/
-SAGE_SRC_DIR  = $(SAGE_BASE_DIR)Sage++/
-SAGE_SRC_NEW  = $(SAGE_BASE_DIR)lib/newsrc/
-SAGE_SRC_OLD  = $(SAGE_BASE_DIR)lib/oldsrc/
-SAGE_INCL_DIR = $(SAGE_BASE_DIR)/h
-LIB_INCL      = $(SAGE_BASE_DIR)/lib/include
-
-DVMINCLUDE      = $(REPO_FDVM_BASE)/include
-PARSER_BASE_DIR = $(REPO_FDVM_BASE)parser/
-
-INLINER_BASE_DIR = $(REPO_FDVM_BASE)InlineExpansion/
-
-all: $(LIBDIR)/libPred.a $(LIBDIR)/libSage++.a $(LIBDIR)/SageNewSrc.a $(LIBDIR)/SageOldSrc.a $(BINDIR)/Parser $(BINDIR)/Inliner $(BINDIR)/Sapfor
-
-#Make Predictor
-PS=$(REPO_SPF_BASE)Predictor/Lib/
-PRED_OBJ_C=adler32.o  compress.o crc32.o deflate.o gzio.o infblock.o infcodes.o inffast.o inflate.o inftrees.o infutil.o \
-	       trees.o uncompr.o zutil.o
-PRED_SOURCE_C=$(PS)adler32.c $(PS)compress.c $(PS)crc32.c $(PS)deflate.c $(PS)gzio.c $(PS)infblock.c $(PS)infcodes.c $(PS)inffast.c \
-			  $(PS)inflate.c $(PS)inftrees.c $(PS)infutil.c $(PS)trees.c $(PS)uncompr.c $(PS)zutil.c
-		   
-PRED_OBJ_CPP=AlignAxis.o AMView.o BGroup.o Block.o CallParams.o CommCost.o DArray.o DimBound.o DistAxis.o Event.o FuncCall.o \
-			 Interval.o IntervalTemplate.o LoopBlock.o LoopLS.o Ls.o ModelDArray.o ModelInterval.o ModelIO.o ModelMPS_AM.o ModelParLoop.o \
-			 ModelReduct.o ModelRegular.o ModelRemAccess.o ModelShadow.o ParLoop.o ParseString.o Processor.o Ps.o RedGroup.o RedVar.o \
-			 RemAccessBuf.o Space.o TraceLine.o Vm.o intersection.o predictor.o 
-PRED_SOURCE_CPP=$(PS)AlignAxis.cpp $(PS)AMView.cpp $(PS)BGroup.cpp $(PS)Block.cpp $(PS)CallParams.cpp $(PS)CommCost.cpp $(PS)DArray.cpp \
-				$(PS)DimBound.cpp $(PS)DistAxis.cpp $(PS)Event.cpp $(PS)FuncCall.cpp $(PS)Interval.cpp $(PS)IntervalTemplate.cpp $(PS)LoopBlock.cpp \
-				$(PS)LoopLS.cpp $(PS)Ls.cpp $(PS)ModelDArray.cpp $(PS)ModelInterval.cpp $(PS)ModelIO.cpp $(PS)ModelMPS_AM.cpp $(PS)ModelParLoop.cpp \
-				$(PS)ModelReduct.cpp $(PS)ModelRegular.cpp $(PS)ModelRemAccess.cpp $(PS)ModelShadow.cpp $(PS)ParLoop.cpp $(PS)ParseString.cpp \
-				$(PS)Processor.cpp $(PS)Ps.cpp $(PS)RedGroup.cpp $(PS)RedVar.cpp $(PS)RemAccessBuf.cpp $(PS)Space.cpp $(PS)TraceLine.cpp $(PS)Vm.cpp \
-				$(PS)intersection.cpp $(PS)predictor.cpp 
-AlignAxis.o: $(PS)AlignAxis.cpp
-	$(CXX) $(CFLAGS) -c $(PS)AlignAxis.cpp
-AMView.o: $(PS)AMView.cpp
-	$(CXX) $(CFLAGS) -c $(PS)AMView.cpp
-BGroup.o: $(PS)BGroup.cpp
-	$(CXX) $(CFLAGS) -std=$(STD) -c $(PS)BGroup.cpp
-Block.o: $(PS)Block.cpp
-	$(CXX) $(CFLAGS) -c $(PS)Block.cpp
-CallParams.o: $(PS)CallParams.cpp
-	$(CXX) $(CFLAGS) -c $(PS)CallParams.cpp
-CommCost.o: $(PS)CommCost.cpp
-	$(CXX) $(CFLAGS) -c $(PS)CommCost.cpp
-DArray.o: $(PS)DArray.cpp
-	$(CXX) $(CFLAGS) -c $(PS)DArray.cpp
-DimBound.o: $(PS)DimBound.cpp
-	$(CXX) $(CFLAGS) -c $(PS)DimBound.cpp
-DistAxis.o: $(PS)DistAxis.cpp
-	$(CXX) $(CFLAGS) -c $(PS)DistAxis.cpp
-Event.o: $(PS)Event.cpp
-	$(CXX) $(CFLAGS) -c $(PS)Event.cpp
-FuncCall.o: $(PS)FuncCall.cpp
-	$(CXX) $(CFLAGS) -c $(PS)FuncCall.cpp
-Interval.o: $(PS)Interval.cpp
-	$(CXX) $(CFLAGS) -c $(PS)Interval.cpp
-IntervalTemplate.o: $(PS)IntervalTemplate.cpp
-	$(CXX) $(CFLAGS) -c $(PS)IntervalTemplate.cpp
-LoopBlock.o: $(PS)LoopBlock.cpp
-	$(CXX) $(CFLAGS) -c $(PS)LoopBlock.cpp
-LoopLS.o: $(PS)LoopLS.cpp
-	$(CXX) $(CFLAGS) -c $(PS)LoopLS.cpp
-Ls.o: $(PS)Ls.cpp
-	$(CXX) $(CFLAGS) -c $(PS)Ls.cpp
-ModelDArray.o: $(PS)ModelDArray.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ModelDArray.cpp
-ModelInterval.o: $(PS)ModelInterval.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ModelInterval.cpp
-ModelIO.o: $(PS)ModelIO.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ModelIO.cpp
-ModelMPS_AM.o: $(PS)ModelMPS_AM.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ModelMPS_AM.cpp
-ModelParLoop.o: $(PS)ModelParLoop.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ModelParLoop.cpp
-ModelReduct.o: $(PS)ModelReduct.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ModelReduct.cpp
-ModelRegular.o: $(PS)ModelRegular.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ModelRegular.cpp
-ModelRemAccess.o: $(PS)ModelRemAccess.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ModelRemAccess.cpp
-ModelShadow.o: $(PS)ModelShadow.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ModelShadow.cpp
-ParLoop.o: $(PS)ParLoop.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ParLoop.cpp
-ParseString.o: $(PS)ParseString.cpp
-	$(CXX) $(CFLAGS) -c $(PS)ParseString.cpp
-Processor.o: $(PS)Processor.cpp
-	$(CXX) $(CFLAGS) -c $(PS)Processor.cpp
-Ps.o: $(PS)Ps.cpp
-	$(CXX) $(CFLAGS) -c $(PS)Ps.cpp
-RedGroup.o: $(PS)RedGroup.cpp
-	$(CXX) $(CFLAGS) -c $(PS)RedGroup.cpp
-RedVar.o: $(PS)RedVar.cpp
-	$(CXX) $(CFLAGS) -c $(PS)RedVar.cpp
-RemAccessBuf.o: $(PS)RemAccessBuf.cpp
-	$(CXX) $(CFLAGS) -c $(PS)RemAccessBuf.cpp
-Space.o: $(PS)Space.cpp
-	$(CXX) $(CFLAGS) -c $(PS)Space.cpp
-TraceLine.o: $(PS)TraceLine.cpp
-	$(CXX) $(CFLAGS) -c $(PS)TraceLine.cpp	
-Vm.o: $(PS)Vm.cpp
-	$(CXX) $(CFLAGS) -c $(PS)Vm.cpp	
-intersection.o: $(PS)intersection.cpp
-	$(CXX) $(CFLAGS) -c $(PS)intersection.cpp	
-predictor.o: $(PS)predictor.cpp
-	$(CXX) $(CFLAGS) -c $(PS)predictor.cpp	
-	
-adler32.o:	$(PS)adler32.c
-	$(CC) $(CFLAGS) -c $(PS)adler32.c
-compress.o:	$(PS)compress.c
-	$(CC) $(CFLAGS) -c $(PS)compress.c
-crc32.o:	$(PS)crc32.c
-	$(CC) $(CFLAGS) -c $(PS)crc32.c
-deflate.o:	$(PS)deflate.c
-	$(CC) $(CFLAGS) -c $(PS)deflate.c
-gzio.o:	$(PS)gzio.c
-	$(CC) $(CFLAGS) -c $(PS)gzio.c
-infblock.o:	$(PS)infblock.c
-	$(CC) $(CFLAGS) -c $(PS)infblock.c
-infcodes.o:	$(PS)infcodes.c
-	$(CC) $(CFLAGS) -c $(PS)infcodes.c
-inffast.o:	$(PS)inffast.c
-	$(CC) $(CFLAGS) -c $(PS)inffast.c
-inflate.o:	$(PS)inflate.c
-	$(CC) $(CFLAGS) -c $(PS)inflate.c
-inftrees.o:	$(PS)inftrees.c
-	$(CC) $(CFLAGS) -c $(PS)inftrees.c
-infutil.o:	$(PS)infutil.c
-	$(CC) $(CFLAGS) -c $(PS)infutil.c
-trees.o:	$(PS)trees.c
-	$(CC) $(CFLAGS) -c $(PS)trees.c
-uncompr.o:	$(PS)uncompr.c
-	$(CC) $(CFLAGS) -c $(PS)uncompr.c
-zutil.o:	$(PS)zutil.c
-	$(CC) $(CFLAGS) -c $(PS)zutil.c
-	
-$(LIBDIR)/libPred.a: $(PRED_OBJ_C) $(PRED_OBJ_CPP)
-	ar qc $(LIBDIR)/libPred.a $(PRED_OBJ_C) $(PRED_OBJ_CPP)
-	
-#Make SAGE++
-libSage++.o: $(SAGE_SRC_DIR)libSage++.cpp $(LIB_INCL)/macro.h $(LIB_INCL)/bif_node.def $(LIB_INCL)/type.def $(LIB_INCL)/symb.def $(LIB_INCL)/libSage++.h
-	$(CXX) $(CFLAGS)  -c $(SAGE_SRC_DIR)libSage++.cpp -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-$(LIBDIR)/libSage++.a: libSage++.o
-	ar qc $(LIBDIR)/libSage++.a libSage++.o
-
-#Make SAGE newsrc
-low_level.o: $(SAGE_SRC_NEW)low_level.c $(LIB_INCL)/macro.h $(LIB_INCL)/bif_node.def $(LIB_INCL)/type.def  $(LIB_INCL)/symb.def 
-	$(CC) $(CFLAGS) -c -DSYS5  $(SAGE_SRC_NEW)low_level.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-unparse.o:  $(SAGE_SRC_NEW)unparse.c $(LIB_INCL)/macro.h $(LIB_INCL)/bif_node.def $(LIB_INCL)/type.def  $(LIB_INCL)/symb.def  $(LIB_INCL)/unparse.def $(LIB_INCL)/unparseC++.def
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_NEW)unparse.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-annotate.tab.o: $(SAGE_SRC_NEW)annotate.tab.c $(LIB_INCL)/macro.h $(LIB_INCL)/bif_node.def $(LIB_INCL)/type.def  $(LIB_INCL)/symb.def 
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_NEW)annotate.tab.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-comments.o: $(SAGE_SRC_NEW)comments.c $(LIB_INCL)/macro.h $(LIB_INCL)/bif_node.def $(LIB_INCL)/type.def  $(LIB_INCL)/symb.def 
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_NEW)comments.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-toolsann.o: $(SAGE_SRC_NEW)toolsann.c $(LIB_INCL)/macro.h $(LIB_INCL)/bif_node.def $(LIB_INCL)/type.def  $(LIB_INCL)/symb.def 
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_NEW)toolsann.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-
-$(LIBDIR)/SageNewSrc.a: low_level.o  unparse.o annotate.tab.o comments.o toolsann.o $(LIB_INCL)/macro.h $(LIB_INCL)/bif_node.def $(LIB_INCL)/type.def  $(LIB_INCL)/symb.def  
-	ar qc $(LIBDIR)/SageNewSrc.a low_level.o unparse.o annotate.tab.o comments.o toolsann.o
-
-#Make SAGE oldsrc
-OLD_SRC_OBJS = anal_ind.o  db.o  db_unp.o db_unp_vpc.o   dbutils.o  garb_coll.o glob_anal.o  ker_fun.o  \
-			   list.o make_nodes.o  mod_ref.o  ndeps.o readnodes.o  sets.o  setutils.o symb_alg.o  writenodes.o 
-
-H = $(SAGE_INCL_DIR)
-anal_ind.o: $(SAGE_SRC_OLD)anal_ind.c   $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)anal_ind.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-db.o: $(SAGE_SRC_OLD)db.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)db.c  -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-db_unp.o: $(SAGE_SRC_OLD)db_unp.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h 
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)db_unp.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-db_unp_vpc.o: $(SAGE_SRC_OLD)db_unp_vpc.c $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/db.h $(H)/vparse.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)db_unp_vpc.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-dbutils.o: $(SAGE_SRC_OLD)dbutils.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)dbutils.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-garb_coll.o: $(SAGE_SRC_OLD)garb_coll.c  $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)garb_coll.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-glob_anal.o: $(SAGE_SRC_OLD)glob_anal.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)glob_anal.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-ker_fun.o:  $(SAGE_SRC_OLD)ker_fun.c $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)ker_fun.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-list.o: $(SAGE_SRC_OLD)list.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/list.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)list.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-make_nodes.o: $(SAGE_SRC_OLD)make_nodes.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)make_nodes.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-mod_ref.o: $(SAGE_SRC_OLD)mod_ref.c $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/vparse.h $(H)/db.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)mod_ref.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-ndeps.o: $(SAGE_SRC_OLD)ndeps.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)ndeps.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-readnodes.o: $(SAGE_SRC_OLD)readnodes.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/dep_str.h $(H)/dep.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)readnodes.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-sets.o: $(SAGE_SRC_OLD)sets.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)sets.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-setutils.o: $(SAGE_SRC_OLD)setutils.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)setutils.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-symb_alg.o: $(SAGE_SRC_OLD)symb_alg.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)symb_alg.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-writenodes.o: $(SAGE_SRC_OLD)writenodes.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/dep_str.h $(H)/dep.h
-	$(CC) $(CFLAGS) -c -DSYS5 $(SAGE_SRC_OLD)writenodes.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-	
-$(LIBDIR)/SageOldSrc.a: $(OLD_SRC_OBJS)
-	ar qc $(LIBDIR)/SageOldSrc.a $(OLD_SRC_OBJS)
-	
-#Make Parser
-PARSER_OBJS = cftn.o errors.o hash.o init.o lexfdvm.o lists.o misc.o stat.o types.o gram1.tab.o sym.o low_hpf.o unparse_hpf.o
-$(BINDIR)/Parser: $(PARSER_OBJS) $(LIBDIR)/SageOldSrc.a
-	$(CXX) -o $(BINDIR)/Parser $(PARSER_OBJS) $(LIBDIR)/SageOldSrc.a
-	
-cftn.o: $(PARSER_BASE_DIR)cftn.c $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)cftn.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-errors.o: $(PARSER_BASE_DIR)errors.c $(H)/defs.h $(H)/tag $(H)/symb.h $(DVMINCLUDE)/extern.h $(H)/db.h $(H)/bif.h $(H)/ll.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)errors.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-hash.o: $(PARSER_BASE_DIR)hash.c $(H)/defs.h $(H)/symb.h $(H)/defines.h $(DVMINCLUDE)/extern.h $(H)/db.h $(H)/bif.h $(H)/ll.h $(H)/sets.h $(H)/tag 
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)hash.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-init.o: $(PARSER_BASE_DIR)init.c $(DVMINCLUDE)/inc.h $(H)/defs.h $(H)/bif.h $(H)/defines.h $(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/db.h $(H)/tag
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)init.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-lexfdvm.o: $(PARSER_BASE_DIR)lexfdvm.c $(DVMINCLUDE)/extern.h
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)lexfdvm.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-lists.o: $(PARSER_BASE_DIR)lists.c $(H)/defs.h $(H)/ll.h $(H)/symb.h $(H)/bif.h
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)lists.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-misc.o: $(PARSER_BASE_DIR)misc.c $(H)/defs.h $(H)/tag $(H)/defines.h $(H)/db.h $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)misc.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-stat.o: $(PARSER_BASE_DIR)stat.c $(H)/defs.h $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/defines.h $(DVMINCLUDE)/extern.h
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)stat.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-sym.o: $(PARSER_BASE_DIR)sym.c $(H)/defs.h $(H)/tag $(H)/symb.h $(H)/defines.h $(H)/bif.h $(DVMINCLUDE)/extern.h $(H)/db.h $(H)/ll.h $(H)/sets.h $(DVMINCLUDE)/fdvm.h
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)sym.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-types.o: $(PARSER_BASE_DIR)types.c $(H)/defs.h $(H)/ll.h $(H)/symb.h
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)types.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-low_hpf.o: $(PARSER_BASE_DIR)low_hpf.c $(DVMINCLUDE)/dvm_tag.h $(TOOLBOX_HDR)
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)low_hpf.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-unparse_hpf.o: $(PARSER_BASE_DIR)unparse_hpf.c $(DVMINCLUDE)/dvm_tag.h $(TOOLBOX_HDR) $(DVMINCLUDE)/unparse.hpf
-	$(CC) $(CFLAGS) -c -DSYS5  $(PARSER_BASE_DIR)unparse_hpf.c -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(DVMINCLUDE)
-gram1.tab.o: $(PARSER_BASE_DIR)gram1.tab.c
-	$(CC) $(CFLAGS) -c -DSYS5 -DYYDEBUG  $(PARSER_BASE_DIR)gram1.tab.c -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-
-#Make Inliner
-$(BINDIR)/Inliner: inl_exp.o inliner.o hlp.o $(LIBDIR)/libSage++.a $(LIBDIR)/SageNewSrc.a $(LIBDIR)/SageOldSrc.a
-	$(CXX) -o $(BINDIR)/Inliner inl_exp.o inliner.o hlp.o $(LIBDIR)/libSage++.a $(LIBDIR)/SageNewSrc.a $(LIBDIR)/SageOldSrc.a
-	
-inl_exp.o: $(INLINER_BASE_DIR)inl_exp.cpp $(INLINER_BASE_DIR)inline.h
-	$(CXX) $(CFLAGS) -std=$(STD)  -c $(INLINER_BASE_DIR)inl_exp.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-inliner.o: $(INLINER_BASE_DIR)inliner.cpp $(INLINER_BASE_DIR)inline.h
-	$(CXX) $(CFLAGS) -std=$(STD)  -c $(INLINER_BASE_DIR)inliner.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-hlp.o: $(INLINER_BASE_DIR)hlp.cpp $(INLINER_BASE_DIR)inline.h
-	$(CXX) $(CFLAGS) -std=$(STD)  -c $(INLINER_BASE_DIR)hlp.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-
-	
-#Make Sapfor
-SAPFOR_OBJ = private_analyzer.o utils.o SgUtils.o Sapfor.o CorrectVarDecl.o IncludeChecker.o LoopChecker.o ParRegions.o \
-             enddo_loop_converter.o array_assign_to_loop.o allocations_prepoc.o directive_creator.o insert_directive.o loop_analyzer.o spf_directive_preproc.o \
-			 graph_loops.o graph_loops_base.o graph_calls.o expr_transform.o CreateDistributionDirs.o DvmhDirective.o DvmhDirectiveBase.o DirectiveAnalyzer.o \
-			 acc_analyzer.o acc_data.o calls.o acc_utilities.o directive_parser.o GraphCSR.o Distribution.o Cycle.o \
-			 annotationDriver.o arrayRef.o computeInducVar.o constanteProp.o  controlFlow.o defUse.o dependence.o depGraph.o \
-			 depInterface.o flowAnalysis.o intrinsic.o invariant.o loopTransform.o set.o \
-			 add-assert.o affine.o cover.o ddomega.o ddomega-build.o ddomega-use.o debug.o ip.o kill.o refine.o sagedriver.o \
-			 dep_analyzer.o remote_access.o VerifySageStructures.o loop_transform.o PredictScheme.o control_flow_graph_part.o \
-			 shadow.o private_arrays_breeder.o resolve_par_reg_conflicts.o loops_splitter.o loops_combiner.o CreateInterTree.o gcov_info.o gCov_parser.o \
-			 graph_calls_base.o directive_creator_base.o PredictorModel.o createParallelRegions.o \
-			 expand_extract_reg.o RationalNum.o Array.o DvmhRegionInserter.o uniq_call_chain_dup.o
-
-$(BINDIR)/Sapfor: $(SAPFOR_OBJ) $(LIBDIR)/libSage++.a $(LIBDIR)/SageNewSrc.a $(LIBDIR)/SageOldSrc.a
-	$(CXX) -fopenmp -o $(BINDIR)/Sapfor $(SAPFOR_OBJ) $(LIBDIR)/libSage++.a $(LIBDIR)/SageNewSrc.a $(LIBDIR)/SageOldSrc.a $(LIBDIR)/libPred.a
-
-expand_extract_reg.o: $(REPO_SPF_BASE)ParallelizationRegions/expand_extract_reg.cpp $(REPO_SPF_BASE)ParallelizationRegions/expand_extract_reg.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)ParallelizationRegions/expand_extract_reg.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL) $(TR_LIB_INC)
-createParallelRegions.o: $(REPO_SPF_BASE)DynamicAnalysis/createParallelRegions.cpp $(REPO_SPF_BASE)DynamicAnalysis/createParallelRegions.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)DynamicAnalysis/createParallelRegions.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-gcov_info.o: $(REPO_SPF_BASE)DynamicAnalysis/gcov_info.cpp $(REPO_SPF_BASE)DynamicAnalysis/gcov_info.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)DynamicAnalysis/gcov_info.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-gCov_parser.o: $(REPO_SPF_BASE)DynamicAnalysis/gCov_parser.cpp $(REPO_SPF_BASE)DynamicAnalysis/gCov_parser_func.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)DynamicAnalysis/gCov_parser.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-CreateInterTree.o: $(REPO_SPF_BASE)CreateInterTree/CreateInterTree.cpp $(REPO_SPF_BASE)CreateInterTree/CreateInterTree.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)CreateInterTree/CreateInterTree.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-RationalNum.o: $(REPO_SPF_BASE)Utils/RationalNum.cpp $(REPO_SPF_BASE)Utils/RationalNum.h 
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Utils/RationalNum.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-utils.o: $(REPO_SPF_BASE)Utils/utils.cpp $(REPO_SPF_BASE)Utils/errors.h $(REPO_SPF_BASE)Utils/utils.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Utils/utils.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-SgUtils.o: $(REPO_SPF_BASE)Utils/SgUtils.cpp $(REPO_SPF_BASE)Utils/errors.h $(REPO_SPF_BASE)Utils/utils.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Utils/SgUtils.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-directive_parser.o: $(REPO_SPF_BASE)LoopAnalyzer/directive_parser.cpp $(REPO_SPF_BASE)LoopAnalyzer/directive_parser.h $(REPO_SPF_BASE)Utils/utils.h $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/directive_parser.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-Sapfor.o: $(REPO_SPF_BASE)Sapfor.cpp $(REPO_SPF_BASE)Utils/errors.h $(REPO_SPF_BASE)Utils/utils.h $(REPO_SPF_BASE)LoopConverter/enddo_loop_converter.h \
-			  $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h $(REPO_SPF_BASE)GraphCall/graph_calls.h $(REPO_SPF_BASE)GraphLoop/graph_loops.h \
-			  $(REPO_SPF_BASE)DirectiveAnalyzer/DirectiveAnalyzer.h $(REPO_SPF_BASE)VerificationCode/verifications.h $(REPO_SPF_BASE)Distribution/CreateDistributionDirs.h \
-			  $(REPO_SPF_BASE)PrivateAnalyzer/private_analyzer.h $(REPO_SPF_BASE)Sapfor.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Sapfor.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL) $(TR_LIB_INC)
-CorrectVarDecl.o: $(REPO_SPF_BASE)VerificationCode/CorrectVarDecl.cpp $(REPO_SPF_BASE)VerificationCode/verifications.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)VerificationCode/CorrectVarDecl.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-IncludeChecker.o: $(REPO_SPF_BASE)VerificationCode/IncludeChecker.cpp $(REPO_SPF_BASE)VerificationCode/verifications.h  $(REPO_SPF_BASE)Utils/utils.h  $(REPO_SPF_BASE)Distribution/DvmhDirective.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)VerificationCode/IncludeChecker.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-LoopChecker.o: $(REPO_SPF_BASE)VerificationCode/LoopChecker.cpp $(REPO_SPF_BASE)VerificationCode/verifications.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)VerificationCode/LoopChecker.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-VerifySageStructures.o: $(REPO_SPF_BASE)VerificationCode/VerifySageStructures.cpp $(REPO_SPF_BASE)VerificationCode/verifications.h $(REPO_SPF_BASE)Utils/utils.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)VerificationCode/VerifySageStructures.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-private_analyzer.o: $(REPO_SPF_BASE)PrivateAnalyzer/private_analyzer.cpp $(REPO_SPF_BASE)PrivateAnalyzer/private_analyzer.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)PrivateAnalyzer/private_analyzer.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-acc_analyzer.o: $(REPO_FDVM_BASE)fdvm/acc_analyzer.cpp $(REPO_FDVM_BASE)include/acc_analyzer.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_FDVM_BASE)fdvm/acc_analyzer.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL) -I$(REPO_SPF_BASE)	
-acc_data.o: $(REPO_FDVM_BASE)fdvm/acc_data.cpp 
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_FDVM_BASE)fdvm/acc_data.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-acc_utilities.o: $(REPO_FDVM_BASE)fdvm/acc_utilities.cpp
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_FDVM_BASE)fdvm/acc_utilities.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-calls.o: $(REPO_FDVM_BASE)fdvm/calls.cpp 
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_FDVM_BASE)fdvm/calls.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-ParRegions.o: $(REPO_SPF_BASE)ParallelizationRegions/ParRegions.cpp $(REPO_SPF_BASE)ParallelizationRegions/ParRegions.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)ParallelizationRegions/ParRegions.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-resolve_par_reg_conflicts.o: $(REPO_SPF_BASE)ParallelizationRegions/resolve_par_reg_conflicts.cpp $(REPO_SPF_BASE)ParallelizationRegions/resolve_par_reg_conflicts.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)ParallelizationRegions/resolve_par_reg_conflicts.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-enddo_loop_converter.o: $(REPO_SPF_BASE)LoopConverter/enddo_loop_converter.cpp $(REPO_SPF_BASE)LoopConverter/enddo_loop_converter.h $(REPO_SPF_BASE)Utils/errors.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopConverter/enddo_loop_converter.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-array_assign_to_loop.o: $(REPO_SPF_BASE)LoopConverter/array_assign_to_loop.cpp $(REPO_SPF_BASE)LoopConverter/array_assign_to_loop.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopConverter/array_assign_to_loop.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-uniq_call_chain_dup.o: $(REPO_SPF_BASE)LoopConverter/uniq_call_chain_dup.cpp $(REPO_SPF_BASE)LoopConverter/uniq_call_chain_dup.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopConverter/uniq_call_chain_dup.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-loop_transform.o: $(REPO_SPF_BASE)LoopConverter/loop_transform.cpp $(REPO_SPF_BASE)LoopConverter/loop_transform.h $(REPO_SPF_BASE)Utils/errors.h $(REPO_SPF_BASE)GraphLoop/graph_loops.h 
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopConverter/loop_transform.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL) $(TR_LIB_INC)
-shadow.o: $(REPO_SPF_BASE)LoopAnalyzer/shadow.cpp $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/shadow.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL) $(TR_LIB_INC)
-	
-allocations_prepoc.o: $(REPO_SPF_BASE)LoopAnalyzer/allocations_prepoc.cpp $(REPO_SPF_BASE)Utils/utils.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/allocations_prepoc.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-directive_creator.o: $(REPO_SPF_BASE)LoopAnalyzer/directive_creator.cpp $(REPO_SPF_BASE)ParallelizationRegions/ParRegions.h \
-					 $(REPO_SPF_BASE)Distribution/GraphCSR.h $(REPO_SPF_BASE)Distribution/Arrays.h $(REPO_SPF_BASE)Distribution/Distribution.h \
-					 $(REPO_SPF_BASE)Utils/errors.h $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h $(REPO_SPF_BASE)LoopAnalyzer/directive_parser.h $(REPO_SPF_BASE)Utils/utils.h \
-					 $(REPO_SPF_BASE)Sapfor.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/directive_creator.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL) 
-	$(TR_LIB_INC)
-directive_creator_base.o: $(REPO_SPF_BASE)LoopAnalyzer/directive_creator_base.cpp $(REPO_SPF_BASE)ParallelizationRegions/ParRegions.h \
-					 $(REPO_SPF_BASE)Distribution/GraphCSR.h $(REPO_SPF_BASE)Distribution/Arrays.h $(REPO_SPF_BASE)Distribution/Distribution.h \
-					 $(REPO_SPF_BASE)Utils/errors.h $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h $(REPO_SPF_BASE)LoopAnalyzer/directive_parser.h $(REPO_SPF_BASE)Utils/utils.h  $(REPO_SPF_BASE)LoopAnalyzer/directive_creator.h \
-					 $(REPO_SPF_BASE)Sapfor.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/directive_creator_base.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL) $(TR_LIB_INC)	
-insert_directive.o: $(REPO_SPF_BASE)LoopAnalyzer/insert_directive.cpp $(REPO_SPF_BASE)Distribution/GraphCSR.h $(REPO_SPF_BASE)Distribution/Arrays.h \
-					$(REPO_SPF_BASE)Distribution/Distribution.h $(REPO_SPF_BASE)Distribution/DvmhDirective.h $(REPO_SPF_BASE)Utils/errors.h \
-					$(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h $(REPO_SPF_BASE)LoopAnalyzer/directive_parser.h $(REPO_SPF_BASE)Utils/utils.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/insert_directive.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-loop_analyzer.o: $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.cpp $(REPO_SPF_BASE)Distribution/GraphCSR.h $(REPO_SPF_BASE)Distribution/Arrays.h \
-				 $(REPO_SPF_BASE)Distribution/Distribution.h $(REPO_SPF_BASE)ParallelizationRegions/ParRegions.h $(REPO_SPF_BASE)Utils/errors.h $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h \
-				 $(REPO_SPF_BASE)LoopAnalyzer/directive_parser.h $(REPO_SPF_BASE)Utils/utils.h $(REPO_SPF_BASE)GraphCall/graph_calls.h $(REPO_SPF_BASE)ExpressionTransform/expr_transform.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-remote_access.o: $(REPO_SPF_BASE)LoopAnalyzer/remote_access.cpp $(REPO_SPF_BASE)Distribution/Arrays.h \
-				 $(REPO_SPF_BASE)Utils/errors.h $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h \
-				 $(REPO_SPF_BASE)Utils/utils.h $(REPO_SPF_BASE)GraphCall/graph_calls.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/remote_access.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-dep_analyzer.o: $(REPO_SPF_BASE)LoopAnalyzer/dep_analyzer.cpp $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h $(REPO_SPF_BASE)Utils/utils.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/dep_analyzer.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-spf_directive_preproc.o: $(REPO_SPF_BASE)LoopAnalyzer/spf_directive_preproc.cpp
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopAnalyzer/spf_directive_preproc.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-graph_loops.o: $(REPO_SPF_BASE)GraphLoop/graph_loops.cpp $(REPO_SPF_BASE)GraphLoop/graph_loops.h $(REPO_SPF_BASE)GraphCall/graph_calls.h \
-			   $(REPO_SPF_BASE)Distribution/GraphCSR.h $(REPO_SPF_BASE)Distribution/Arrays.h $(REPO_SPF_BASE)Distribution/Distribution.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)GraphLoop/graph_loops.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-graph_loops_base.o: $(REPO_SPF_BASE)GraphLoop/graph_loops_base.cpp $(REPO_SPF_BASE)GraphLoop/graph_loops.h $(REPO_SPF_BASE)GraphCall/graph_calls.h \
-			   $(REPO_SPF_BASE)Distribution/GraphCSR.h $(REPO_SPF_BASE)Distribution/Arrays.h $(REPO_SPF_BASE)Distribution/Distribution.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)GraphLoop/graph_loops_base.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-PredictScheme.o: $(REPO_SPF_BASE)Predictor/PredictScheme.cpp $(REPO_SPF_BASE)Predictor/PredictScheme.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Predictor/PredictScheme.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-PredictorModel.o: $(REPO_SPF_BASE)Predictor/PredictorModel.cpp $(REPO_SPF_BASE)Predictor/PredictorModel.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Predictor/PredictorModel.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-graph_calls.o: $(REPO_SPF_BASE)GraphCall/graph_calls.cpp $(REPO_SPF_BASE)GraphLoop/graph_loops.h $(REPO_SPF_BASE)GraphCall/graph_calls.h $(REPO_SPF_BASE)LoopAnalyzer/directive_parser.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)GraphCall/graph_calls.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-graph_calls_base.o: $(REPO_SPF_BASE)GraphCall/graph_calls_base.cpp $(REPO_SPF_BASE)GraphCall/graph_calls_func.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)GraphCall/graph_calls_base.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-expr_transform.o: $(REPO_SPF_BASE)ExpressionTransform/expr_transform.cpp $(REPO_FDVM_BASE)include/acc_analyzer.h $(REPO_SPF_BASE)ExpressionTransform/expr_transform.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)ExpressionTransform/expr_transform.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-control_flow_graph_part.o: $(REPO_SPF_BASE)ExpressionTransform/control_flow_graph_part.cpp $(REPO_FDVM_BASE)include/acc_analyzer.h $(REPO_SPF_BASE)ExpressionTransform/expr_transform.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)ExpressionTransform/control_flow_graph_part.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-CreateDistributionDirs.o: $(REPO_SPF_BASE)Distribution/CreateDistributionDirs.cpp  $(REPO_SPF_BASE)Distribution/Distribution.h  $(REPO_SPF_BASE)Distribution/GraphCSR.h \
-						  $(REPO_SPF_BASE)Distribution/Arrays.h  $(REPO_SPF_BASE)Utils/errors.h  $(REPO_SPF_BASE)GraphLoop/graph_loops.h  $(REPO_SPF_BASE)LoopAnalyzer/loop_analyzer.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Distribution/CreateDistributionDirs.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-DvmhDirective.o: $(REPO_SPF_BASE)Distribution/DvmhDirective.cpp $(REPO_SPF_BASE)Distribution/DvmhDirective.h $(REPO_SPF_BASE)Utils/utils.h 
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Distribution/DvmhDirective.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-DvmhDirectiveBase.o: $(REPO_SPF_BASE)Distribution/DvmhDirectiveBase.cpp $(REPO_SPF_BASE)Distribution/DvmhDirectiveBase.h $(REPO_SPF_BASE)Utils/utils.h 
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Distribution/DvmhDirectiveBase.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-DirectiveAnalyzer.o: $(REPO_SPF_BASE)DirectiveAnalyzer/DirectiveAnalyzer.cpp $(REPO_SPF_BASE)Distribution/DvmhDirective.h $(REPO_SPF_BASE)GraphLoop/graph_loops.h \
-					 $(REPO_SPF_BASE)DirectiveAnalyzer/DirectiveAnalyzer.h $(REPO_SPF_BASE)Utils/utils.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)DirectiveAnalyzer/DirectiveAnalyzer.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-Cycle.o: $(REPO_SPF_BASE)Distribution/Cycle.cpp $(REPO_SPF_BASE)Distribution/Cycle.h $(REPO_SPF_BASE)Distribution/DvmhDirective.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Distribution/Cycle.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-Distribution.o: $(REPO_SPF_BASE)Distribution/Distribution.cpp $(REPO_SPF_BASE)Distribution/Distribution.h $(REPO_SPF_BASE)Distribution/DvmhDirective.h \
-				$(REPO_SPF_BASE)Utils/utils.h $(REPO_SPF_BASE)Distribution/GraphCSR.h $(REPO_SPF_BASE)Distribution/Arrays.h $(REPO_SPF_BASE)Distribution/Array.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Distribution/Distribution.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-Array.o: $(REPO_SPF_BASE)Distribution/Array.cpp $(REPO_SPF_BASE)Distribution/Arrays.h $(REPO_SPF_BASE)Distribution/Array.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Distribution/Array.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)		
-GraphCSR.o: $(REPO_SPF_BASE)Distribution/GraphCSR.cpp $(REPO_SPF_BASE)Distribution/GraphCSR.h $(REPO_SPF_BASE)Distribution/DvmhDirective.h \
-				$(REPO_SPF_BASE)Utils/utils.h $(REPO_SPF_BASE)Utils/errors.h $(REPO_SPF_BASE)Distribution/Arrays.h $(REPO_SPF_BASE)Distribution/Array.h \
-				$(REPO_SPF_BASE)Distribution/Cycle.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)Distribution/GraphCSR.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)	
-	
-annotationDriver.o: $(REPO_SPF_BASE)SageAnalysisTool/annotationDriver.cpp $(REPO_SPF_BASE)SageAnalysisTool/annotationDriver.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/annotationDriver.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-arrayRef.o: $(REPO_SPF_BASE)SageAnalysisTool/arrayRef.cpp $(REPO_SPF_BASE)SageAnalysisTool/arrayRef.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/arrayRef.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-computeInducVar.o: $(REPO_SPF_BASE)SageAnalysisTool/computeInducVar.cpp $(REPO_SPF_BASE)SageAnalysisTool/set.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/computeInducVar.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-constanteProp.o: $(REPO_SPF_BASE)SageAnalysisTool/constanteProp.cpp $(REPO_SPF_BASE)SageAnalysisTool/set.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/constanteProp.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-controlFlow.o: $(REPO_SPF_BASE)SageAnalysisTool/controlFlow.cpp
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/controlFlow.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-defUse.o: $(REPO_SPF_BASE)SageAnalysisTool/defUse.cpp $(REPO_SPF_BASE)SageAnalysisTool/set.h 
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/defUse.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-dependence.o: $(REPO_SPF_BASE)SageAnalysisTool/dependence.cpp $(REPO_SPF_BASE)SageAnalysisTool/set.h $(REPO_SPF_BASE)SageAnalysisTool/dependence.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/dependence.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-depGraph.o: $(REPO_SPF_BASE)SageAnalysisTool/depGraph.cpp
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/depGraph.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-depInterface.o: $(REPO_SPF_BASE)SageAnalysisTool/depInterface.cpp
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/depInterface.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-flowAnalysis.o: $(REPO_SPF_BASE)SageAnalysisTool/flowAnalysis.cpp
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/flowAnalysis.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-intrinsic.o: $(REPO_SPF_BASE)SageAnalysisTool/intrinsic.cpp $(REPO_SPF_BASE)SageAnalysisTool/intrinsic.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/intrinsic.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-invariant.o: $(REPO_SPF_BASE)SageAnalysisTool/invariant.cpp $(REPO_SPF_BASE)SageAnalysisTool/set.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/invariant.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-loopTransform.o: $(REPO_SPF_BASE)SageAnalysisTool/loopTransform.cpp $(REPO_SPF_BASE)SageAnalysisTool/set.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/loopTransform.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-set.o: $(REPO_SPF_BASE)SageAnalysisTool/set.cpp $(REPO_SPF_BASE)SageAnalysisTool/set.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)SageAnalysisTool/set.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-	
-add-assert.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/add-assert.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/add-assert.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-affine.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/affine.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/affine.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-cover.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/cover.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/cover.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-ddomega.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/ddomega.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/ddomega.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-ddomega-build.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/ddomega-build.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/ddomega-build.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-ddomega-use.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/ddomega-use.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/ddomega-use.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-debug.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/debug.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/debug.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-ip.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/ip.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/ip.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-kill.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/kill.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/kill.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-refine.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/refine.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/refine.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-sagedriver.o: $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/sagedriver.cpp
-	$(CXX) $(CFLAGS) -c  $(REPO_SPF_BASE)SageAnalysisTool/OmegaForSage/sagedriver.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-private_arrays_breeder.o: $(REPO_SPF_BASE)LoopConverter/private_arrays_breeder.cpp $(REPO_SPF_BASE)LoopConverter/private_arrays_breeder.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopConverter/private_arrays_breeder.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-loops_splitter.o: $(REPO_SPF_BASE)LoopConverter/loops_splitter.cpp $(REPO_SPF_BASE)LoopConverter/loops_splitter.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopConverter/loops_splitter.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-DvmhRegionInserter.o: $(REPO_SPF_BASE)DvmhRegions/DvmhRegionInserter.cpp $(REPO_SPF_BASE)DvmhRegions/DvmhRegionInserter.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)DvmhRegions/DvmhRegionInserter.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-loops_combiner.o: $(REPO_SPF_BASE)LoopConverter/loops_combiner.cpp $(REPO_SPF_BASE)LoopConverter/loops_combiner.h
-	$(CXX) $(CFLAGS) -c  -std=$(STD) $(REPO_SPF_BASE)LoopConverter/loops_combiner.cpp -I$(DVMINCLUDE) -I$(SAGE_INCL_DIR) -I$(LIB_INCL)
-
-clean:
-	rm -rf *.o
-
-cleanall:
-	rm -rf *.o ../_lib/*.a
diff --git a/Sapfor/FDVM/CMakeLists.txt b/Sapfor/_projects/FDVM/CMakeLists.txt
similarity index 100%
rename from Sapfor/FDVM/CMakeLists.txt
rename to Sapfor/_projects/FDVM/CMakeLists.txt
diff --git a/Sapfor/Parser/CMakeLists.txt b/Sapfor/_projects/Parser/CMakeLists.txt
similarity index 100%
rename from Sapfor/Parser/CMakeLists.txt
rename to Sapfor/_projects/Parser/CMakeLists.txt
diff --git a/Sapfor/SageLib/CMakeLists.txt b/Sapfor/_projects/SageLib/CMakeLists.txt
similarity index 100%
rename from Sapfor/SageLib/CMakeLists.txt
rename to Sapfor/_projects/SageLib/CMakeLists.txt
diff --git a/Sapfor/SageNewSrc/CMakeLists.txt b/Sapfor/_projects/SageNewSrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/SageNewSrc/CMakeLists.txt
rename to Sapfor/_projects/SageNewSrc/CMakeLists.txt
diff --git a/Sapfor/SageOldSrc/CMakeLists.txt b/Sapfor/_projects/SageOldSrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/SageOldSrc/CMakeLists.txt
rename to Sapfor/_projects/SageOldSrc/CMakeLists.txt
diff --git a/Sapfor/Sapc++/Sapc++.sln b/Sapfor/_projects/Sapc++/Sapc++.sln
similarity index 100%
rename from Sapfor/Sapc++/Sapc++.sln
rename to Sapfor/_projects/Sapc++/Sapc++.sln
diff --git a/dvm/fdvm/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/trunk/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/trunk/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/trunk/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h b/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
similarity index 100%
rename from dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
rename to Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
diff --git a/dvm/fdvm/trunk/InlineExpansion/hlp.cpp b/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp
similarity index 100%
rename from dvm/fdvm/trunk/InlineExpansion/hlp.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp
diff --git a/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp b/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
similarity index 100%
rename from dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
diff --git a/dvm/fdvm/trunk/InlineExpansion/inline.h b/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inline.h
similarity index 100%
rename from dvm/fdvm/trunk/InlineExpansion/inline.h
rename to Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inline.h
diff --git a/dvm/fdvm/trunk/InlineExpansion/inliner.cpp b/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp
similarity index 100%
rename from dvm/fdvm/trunk/InlineExpansion/inliner.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp
diff --git a/dvm/fdvm/trunk/InlineExpansion/intrinsic.h b/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h
similarity index 100%
rename from dvm/fdvm/trunk/InlineExpansion/intrinsic.h
rename to Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h
diff --git a/dvm/fdvm/trunk/InlineExpansion/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/InlineExpansion/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni
diff --git a/dvm/fdvm/trunk/InlineExpansion/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/InlineExpansion/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/makefile.win
diff --git a/dvm/fdvm/trunk/Makefile b/Sapfor/_projects/dvm/fdvm/trunk/Makefile
similarity index 100%
rename from dvm/fdvm/trunk/Makefile
rename to Sapfor/_projects/dvm/fdvm/trunk/Makefile
diff --git a/dvm/fdvm/trunk/Sage/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/trunk/Sage/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/trunk/Sage/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/Sage/LICENSE b/Sapfor/_projects/dvm/fdvm/trunk/Sage/LICENSE
similarity index 100%
rename from dvm/fdvm/trunk/Sage/LICENSE
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/LICENSE
diff --git a/dvm/fdvm/trunk/Sage/Makefile b/Sapfor/_projects/dvm/fdvm/trunk/Sage/Makefile
similarity index 100%
rename from dvm/fdvm/trunk/Sage/Makefile
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/Makefile
diff --git a/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/Sage/Sage++/Makefile b/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/Makefile
similarity index 100%
rename from dvm/fdvm/trunk/Sage/Sage++/Makefile
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/Makefile
diff --git a/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp b/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
similarity index 100%
rename from dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
diff --git a/dvm/fdvm/trunk/Sage/Sage++/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/Sage/Sage++/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni
diff --git a/dvm/fdvm/trunk/Sage/Sage++/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/Sage/Sage++/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win
diff --git a/dvm/fdvm/trunk/Sage/h/Makefile b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/Makefile
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/Makefile
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/Makefile
diff --git a/dvm/fdvm/trunk/Sage/h/bif.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/bif.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/bif.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/bif.h
diff --git a/dvm/fdvm/trunk/Sage/h/compatible.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/compatible.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/compatible.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/compatible.h
diff --git a/dvm/fdvm/trunk/Sage/h/db.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/db.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/db.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/db.h
diff --git a/dvm/fdvm/trunk/Sage/h/db.new.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/db.new.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/db.new.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/db.new.h
diff --git a/dvm/fdvm/trunk/Sage/h/defines.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/defines.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/defines.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/defines.h
diff --git a/dvm/fdvm/trunk/Sage/h/defs.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/defs.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/defs.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/defs.h
diff --git a/dvm/fdvm/trunk/Sage/h/dep.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/dep.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep.h
diff --git a/dvm/fdvm/trunk/Sage/h/dep_str.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep_str.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/dep_str.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep_str.h
diff --git a/dvm/fdvm/trunk/Sage/h/dep_struct.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep_struct.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/dep_struct.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep_struct.h
diff --git a/dvm/fdvm/trunk/Sage/h/elist.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/elist.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/elist.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/elist.h
diff --git a/dvm/fdvm/trunk/Sage/h/f90.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/f90.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/f90.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/f90.h
diff --git a/dvm/fdvm/trunk/Sage/h/fixcray.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/fixcray.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/fixcray.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/fixcray.h
diff --git a/dvm/fdvm/trunk/Sage/h/fm.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/fm.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/fm.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/fm.h
diff --git a/dvm/fdvm/trunk/Sage/h/head b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/head
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/head
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/head
diff --git a/dvm/fdvm/trunk/Sage/h/leak_detector.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/leak_detector.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/leak_detector.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/leak_detector.h
diff --git a/dvm/fdvm/trunk/Sage/h/list.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/list.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/list.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/list.h
diff --git a/dvm/fdvm/trunk/Sage/h/ll.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/ll.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/ll.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/ll.h
diff --git a/dvm/fdvm/trunk/Sage/h/prop.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/prop.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/prop.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/prop.h
diff --git a/dvm/fdvm/trunk/Sage/h/sage.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sage.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/sage.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sage.h
diff --git a/dvm/fdvm/trunk/Sage/h/sagearch.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sagearch.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/sagearch.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sagearch.h
diff --git a/dvm/fdvm/trunk/Sage/h/sageroot.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sageroot.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/sageroot.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sageroot.h
diff --git a/dvm/fdvm/trunk/Sage/h/sets.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sets.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/sets.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sets.h
diff --git a/dvm/fdvm/trunk/Sage/h/symb.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/symb.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/symb.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/symb.h
diff --git a/dvm/fdvm/trunk/Sage/h/symblob.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/symblob.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/symblob.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/symblob.h
diff --git a/dvm/fdvm/trunk/Sage/h/tag b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/tag
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag
diff --git a/dvm/fdvm/trunk/Sage/h/tag.doc b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag.doc
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/tag.doc
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag.doc
diff --git a/dvm/fdvm/trunk/Sage/h/tag.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/tag.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag.h
diff --git a/dvm/fdvm/trunk/Sage/h/tag_make b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag_make
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/tag_make
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag_make
diff --git a/dvm/fdvm/trunk/Sage/h/version.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/version.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/version.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/version.h
diff --git a/dvm/fdvm/trunk/Sage/h/vextern.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vextern.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/vextern.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vextern.h
diff --git a/dvm/fdvm/trunk/Sage/h/vparse.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vparse.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/vparse.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vparse.h
diff --git a/dvm/fdvm/trunk/Sage/h/vpc.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vpc.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/vpc.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vpc.h
diff --git a/dvm/fdvm/trunk/Sage/h/window.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/window.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/h/window.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/h/window.h
diff --git a/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/Sage/lib/Makefile b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/Makefile
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/Makefile
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/Makefile
diff --git a/dvm/fdvm/trunk/Sage/lib/include/attributes.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/attributes.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/bif_node.def b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/bif_node.def
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
diff --git a/dvm/fdvm/trunk/Sage/lib/include/dependence.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/dependence.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/ext_high.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/ext_high.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/ext_low.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/ext_low.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/libSage++.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/libSage++.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/macro.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/macro.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/macro.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/macro.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/sage++user.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/sage++user.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h
diff --git a/dvm/fdvm/trunk/Sage/lib/include/symb.def b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/symb.def
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/symb.def
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/symb.def
diff --git a/dvm/fdvm/trunk/Sage/lib/include/type.def b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/type.def
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/type.def
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/type.def
diff --git a/dvm/fdvm/trunk/Sage/lib/include/unparse.def b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/unparse.def
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def
diff --git a/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
diff --git a/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
diff --git a/dvm/fdvm/trunk/Sage/lib/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/makefile.uni
diff --git a/dvm/fdvm/trunk/Sage/lib/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/makefile.win
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
diff --git a/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
diff --git a/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c b/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
similarity index 100%
rename from dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
diff --git a/dvm/fdvm/trunk/Sage/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/Sage/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/Sage/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/makefile.uni
diff --git a/dvm/fdvm/trunk/Sage/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/Sage/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/Sage/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/Sage/makefile.win
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
diff --git a/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters b/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
similarity index 100%
rename from dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
rename to Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
diff --git a/dvm/fdvm/trunk/acrossDebugging/across.cpp b/Sapfor/_projects/dvm/fdvm/trunk/acrossDebugging/across.cpp
similarity index 100%
rename from dvm/fdvm/trunk/acrossDebugging/across.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/acrossDebugging/across.cpp
diff --git a/dvm/fdvm/trunk/examples/gausf.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/gausf.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/gausf.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/gausf.fdv
diff --git a/dvm/fdvm/trunk/examples/gausgb.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/gausgb.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/gausgb.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/gausgb.fdv
diff --git a/dvm/fdvm/trunk/examples/gaush.hpf b/Sapfor/_projects/dvm/fdvm/trunk/examples/gaush.hpf
similarity index 100%
rename from dvm/fdvm/trunk/examples/gaush.hpf
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/gaush.hpf
diff --git a/dvm/fdvm/trunk/examples/gauswh.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/gauswh.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/gauswh.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/gauswh.fdv
diff --git a/dvm/fdvm/trunk/examples/jac.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/jac.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/jac.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/jac.fdv
diff --git a/dvm/fdvm/trunk/examples/jacas.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/jacas.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/jacas.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/jacas.fdv
diff --git a/dvm/fdvm/trunk/examples/jach.hpf b/Sapfor/_projects/dvm/fdvm/trunk/examples/jach.hpf
similarity index 100%
rename from dvm/fdvm/trunk/examples/jach.hpf
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/jach.hpf
diff --git a/dvm/fdvm/trunk/examples/redbf.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/redbf.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/redbf.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/redbf.fdv
diff --git a/dvm/fdvm/trunk/examples/redbh.hpf b/Sapfor/_projects/dvm/fdvm/trunk/examples/redbh.hpf
similarity index 100%
rename from dvm/fdvm/trunk/examples/redbh.hpf
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/redbh.hpf
diff --git a/dvm/fdvm/trunk/examples/sor.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/sor.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/sor.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/sor.fdv
diff --git a/dvm/fdvm/trunk/examples/task2j.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/task2j.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/task2j.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/task2j.fdv
diff --git a/dvm/fdvm/trunk/examples/tasks.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/tasks.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/tasks.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/tasks.fdv
diff --git a/dvm/fdvm/trunk/examples/taskst.fdv b/Sapfor/_projects/dvm/fdvm/trunk/examples/taskst.fdv
similarity index 100%
rename from dvm/fdvm/trunk/examples/taskst.fdv
rename to Sapfor/_projects/dvm/fdvm/trunk/examples/taskst.fdv
diff --git a/dvm/fdvm/trunk/fdvm/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/fdvm/Makefile b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/Makefile
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/Makefile
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/Makefile
diff --git a/dvm/fdvm/trunk/fdvm/acc.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_across.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_across.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_across.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_across.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_data.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_data.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_data.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_data.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_f2c.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_f2c.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_rtc.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_rtc.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
diff --git a/dvm/fdvm/trunk/fdvm/acc_utilities.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/acc_utilities.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp
diff --git a/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
diff --git a/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
diff --git a/dvm/fdvm/trunk/fdvm/aks_structs.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/aks_structs.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp
diff --git a/dvm/fdvm/trunk/fdvm/calls.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/calls.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/calls.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/calls.cpp
diff --git a/dvm/fdvm/trunk/fdvm/checkpoint.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/checkpoint.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp
diff --git a/dvm/fdvm/trunk/fdvm/debug.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/debug.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/debug.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/debug.cpp
diff --git a/dvm/fdvm/trunk/fdvm/dvm.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/dvm.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/dvm.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/dvm.cpp
diff --git a/dvm/fdvm/trunk/fdvm/funcall.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/funcall.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/funcall.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/funcall.cpp
diff --git a/dvm/fdvm/trunk/fdvm/help.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/help.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/help.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/help.cpp
diff --git a/dvm/fdvm/trunk/fdvm/hpf.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/hpf.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/hpf.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/hpf.cpp
diff --git a/dvm/fdvm/trunk/fdvm/io.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/io.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/io.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/io.cpp
diff --git a/dvm/fdvm/trunk/fdvm/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/makefile.uni
diff --git a/dvm/fdvm/trunk/fdvm/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/makefile.win
diff --git a/dvm/fdvm/trunk/fdvm/omp.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/omp.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/omp.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/omp.cpp
diff --git a/dvm/fdvm/trunk/fdvm/ompdebug.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/ompdebug.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp
diff --git a/dvm/fdvm/trunk/fdvm/parloop.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/parloop.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/parloop.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/parloop.cpp
diff --git a/dvm/fdvm/trunk/fdvm/stmt.cpp b/Sapfor/_projects/dvm/fdvm/trunk/fdvm/stmt.cpp
similarity index 100%
rename from dvm/fdvm/trunk/fdvm/stmt.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/fdvm/stmt.cpp
diff --git a/dvm/fdvm/trunk/include/acc_across_analyzer.h b/Sapfor/_projects/dvm/fdvm/trunk/include/acc_across_analyzer.h
similarity index 100%
rename from dvm/fdvm/trunk/include/acc_across_analyzer.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/acc_across_analyzer.h
diff --git a/dvm/fdvm/trunk/include/acc_analyzer.h b/Sapfor/_projects/dvm/fdvm/trunk/include/acc_analyzer.h
similarity index 100%
rename from dvm/fdvm/trunk/include/acc_analyzer.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/acc_analyzer.h
diff --git a/dvm/fdvm/trunk/include/acc_data.h b/Sapfor/_projects/dvm/fdvm/trunk/include/acc_data.h
similarity index 100%
rename from dvm/fdvm/trunk/include/acc_data.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/acc_data.h
diff --git a/dvm/fdvm/trunk/include/aks_loopStructure.h b/Sapfor/_projects/dvm/fdvm/trunk/include/aks_loopStructure.h
similarity index 100%
rename from dvm/fdvm/trunk/include/aks_loopStructure.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/aks_loopStructure.h
diff --git a/dvm/fdvm/trunk/include/aks_structs.h b/Sapfor/_projects/dvm/fdvm/trunk/include/aks_structs.h
similarity index 100%
rename from dvm/fdvm/trunk/include/aks_structs.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/aks_structs.h
diff --git a/dvm/fdvm/trunk/include/calls.h b/Sapfor/_projects/dvm/fdvm/trunk/include/calls.h
similarity index 100%
rename from dvm/fdvm/trunk/include/calls.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/calls.h
diff --git a/dvm/fdvm/trunk/include/dvm.h b/Sapfor/_projects/dvm/fdvm/trunk/include/dvm.h
similarity index 100%
rename from dvm/fdvm/trunk/include/dvm.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/dvm.h
diff --git a/dvm/fdvm/trunk/include/dvm_tag.h b/Sapfor/_projects/dvm/fdvm/trunk/include/dvm_tag.h
similarity index 100%
rename from dvm/fdvm/trunk/include/dvm_tag.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/dvm_tag.h
diff --git a/dvm/fdvm/trunk/include/extern.h b/Sapfor/_projects/dvm/fdvm/trunk/include/extern.h
similarity index 100%
rename from dvm/fdvm/trunk/include/extern.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/extern.h
diff --git a/dvm/fdvm/trunk/include/fdvm.h b/Sapfor/_projects/dvm/fdvm/trunk/include/fdvm.h
similarity index 100%
rename from dvm/fdvm/trunk/include/fdvm.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/fdvm.h
diff --git a/dvm/fdvm/trunk/include/fdvm_version.h b/Sapfor/_projects/dvm/fdvm/trunk/include/fdvm_version.h
similarity index 100%
rename from dvm/fdvm/trunk/include/fdvm_version.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/fdvm_version.h
diff --git a/dvm/fdvm/trunk/include/inc.h b/Sapfor/_projects/dvm/fdvm/trunk/include/inc.h
similarity index 100%
rename from dvm/fdvm/trunk/include/inc.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/inc.h
diff --git a/dvm/fdvm/trunk/include/leak_detector.h b/Sapfor/_projects/dvm/fdvm/trunk/include/leak_detector.h
similarity index 100%
rename from dvm/fdvm/trunk/include/leak_detector.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/leak_detector.h
diff --git a/dvm/fdvm/trunk/include/libSageOMP.h b/Sapfor/_projects/dvm/fdvm/trunk/include/libSageOMP.h
similarity index 100%
rename from dvm/fdvm/trunk/include/libSageOMP.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/libSageOMP.h
diff --git a/dvm/fdvm/trunk/include/libdvm.h b/Sapfor/_projects/dvm/fdvm/trunk/include/libdvm.h
similarity index 100%
rename from dvm/fdvm/trunk/include/libdvm.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/libdvm.h
diff --git a/dvm/fdvm/trunk/include/libnum.h b/Sapfor/_projects/dvm/fdvm/trunk/include/libnum.h
similarity index 100%
rename from dvm/fdvm/trunk/include/libnum.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/libnum.h
diff --git a/dvm/fdvm/trunk/include/unparse.hpf b/Sapfor/_projects/dvm/fdvm/trunk/include/unparse.hpf
similarity index 100%
rename from dvm/fdvm/trunk/include/unparse.hpf
rename to Sapfor/_projects/dvm/fdvm/trunk/include/unparse.hpf
diff --git a/dvm/fdvm/trunk/include/unparse1.hpf b/Sapfor/_projects/dvm/fdvm/trunk/include/unparse1.hpf
similarity index 100%
rename from dvm/fdvm/trunk/include/unparse1.hpf
rename to Sapfor/_projects/dvm/fdvm/trunk/include/unparse1.hpf
diff --git a/dvm/fdvm/trunk/include/user.h b/Sapfor/_projects/dvm/fdvm/trunk/include/user.h
similarity index 100%
rename from dvm/fdvm/trunk/include/user.h
rename to Sapfor/_projects/dvm/fdvm/trunk/include/user.h
diff --git a/dvm/fdvm/trunk/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/makefile.uni
diff --git a/dvm/fdvm/trunk/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/makefile.win
diff --git a/dvm/fdvm/trunk/parser/CMakeLists.txt b/Sapfor/_projects/dvm/fdvm/trunk/parser/CMakeLists.txt
similarity index 100%
rename from dvm/fdvm/trunk/parser/CMakeLists.txt
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/CMakeLists.txt
diff --git a/dvm/fdvm/trunk/parser/Makefile b/Sapfor/_projects/dvm/fdvm/trunk/parser/Makefile
similarity index 100%
rename from dvm/fdvm/trunk/parser/Makefile
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/Makefile
diff --git a/dvm/fdvm/trunk/parser/cftn.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/cftn.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/cftn.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/cftn.c
diff --git a/dvm/fdvm/trunk/parser/errors.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/errors.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/errors.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/errors.c
diff --git a/dvm/fdvm/trunk/parser/facc.gram b/Sapfor/_projects/dvm/fdvm/trunk/parser/facc.gram
similarity index 100%
rename from dvm/fdvm/trunk/parser/facc.gram
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/facc.gram
diff --git a/dvm/fdvm/trunk/parser/fdvm.gram b/Sapfor/_projects/dvm/fdvm/trunk/parser/fdvm.gram
similarity index 100%
rename from dvm/fdvm/trunk/parser/fdvm.gram
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/fdvm.gram
diff --git a/dvm/fdvm/trunk/parser/fomp.gram b/Sapfor/_projects/dvm/fdvm/trunk/parser/fomp.gram
similarity index 100%
rename from dvm/fdvm/trunk/parser/fomp.gram
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/fomp.gram
diff --git a/dvm/fdvm/trunk/parser/fspf.gram b/Sapfor/_projects/dvm/fdvm/trunk/parser/fspf.gram
similarity index 100%
rename from dvm/fdvm/trunk/parser/fspf.gram
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/fspf.gram
diff --git a/dvm/fdvm/trunk/parser/ftn.gram b/Sapfor/_projects/dvm/fdvm/trunk/parser/ftn.gram
similarity index 100%
rename from dvm/fdvm/trunk/parser/ftn.gram
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/ftn.gram
diff --git a/dvm/fdvm/trunk/parser/gram1.tab.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.tab.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/gram1.tab.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.tab.c
diff --git a/dvm/fdvm/trunk/parser/gram1.tab.h b/Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.tab.h
similarity index 100%
rename from dvm/fdvm/trunk/parser/gram1.tab.h
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.tab.h
diff --git a/dvm/fdvm/trunk/parser/gram1.y b/Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.y
similarity index 100%
rename from dvm/fdvm/trunk/parser/gram1.y
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.y
diff --git a/dvm/fdvm/trunk/parser/hash.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/hash.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/hash.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/hash.c
diff --git a/dvm/fdvm/trunk/parser/head b/Sapfor/_projects/dvm/fdvm/trunk/parser/head
similarity index 100%
rename from dvm/fdvm/trunk/parser/head
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/head
diff --git a/dvm/fdvm/trunk/parser/init.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/init.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/init.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/init.c
diff --git a/dvm/fdvm/trunk/parser/lexfdvm.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/lexfdvm.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/lexfdvm.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/lexfdvm.c
diff --git a/dvm/fdvm/trunk/parser/lists.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/lists.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/lists.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/lists.c
diff --git a/dvm/fdvm/trunk/parser/low_hpf.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/low_hpf.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/low_hpf.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/low_hpf.c
diff --git a/dvm/fdvm/trunk/parser/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/parser/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/parser/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/makefile.uni
diff --git a/dvm/fdvm/trunk/parser/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/parser/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/parser/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/makefile.win
diff --git a/dvm/fdvm/trunk/parser/misc.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/misc.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/misc.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/misc.c
diff --git a/dvm/fdvm/trunk/parser/stat.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/stat.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/stat.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/stat.c
diff --git a/dvm/fdvm/trunk/parser/sym.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/sym.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/sym.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/sym.c
diff --git a/dvm/fdvm/trunk/parser/tag b/Sapfor/_projects/dvm/fdvm/trunk/parser/tag
similarity index 100%
rename from dvm/fdvm/trunk/parser/tag
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/tag
diff --git a/dvm/fdvm/trunk/parser/tag.h b/Sapfor/_projects/dvm/fdvm/trunk/parser/tag.h
similarity index 100%
rename from dvm/fdvm/trunk/parser/tag.h
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/tag.h
diff --git a/dvm/fdvm/trunk/parser/tokdefs.h b/Sapfor/_projects/dvm/fdvm/trunk/parser/tokdefs.h
similarity index 100%
rename from dvm/fdvm/trunk/parser/tokdefs.h
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/tokdefs.h
diff --git a/dvm/fdvm/trunk/parser/tokens b/Sapfor/_projects/dvm/fdvm/trunk/parser/tokens
similarity index 100%
rename from dvm/fdvm/trunk/parser/tokens
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/tokens
diff --git a/dvm/fdvm/trunk/parser/types.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/types.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/types.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/types.c
diff --git a/dvm/fdvm/trunk/parser/unparse_hpf.c b/Sapfor/_projects/dvm/fdvm/trunk/parser/unparse_hpf.c
similarity index 100%
rename from dvm/fdvm/trunk/parser/unparse_hpf.c
rename to Sapfor/_projects/dvm/fdvm/trunk/parser/unparse_hpf.c
diff --git a/dvm/fdvm/trunk/sageExample/SwapFors.cpp b/Sapfor/_projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp
similarity index 100%
rename from dvm/fdvm/trunk/sageExample/SwapFors.cpp
rename to Sapfor/_projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp
diff --git a/dvm/fdvm/trunk/sageExample/makefile.uni b/Sapfor/_projects/dvm/fdvm/trunk/sageExample/makefile.uni
similarity index 100%
rename from dvm/fdvm/trunk/sageExample/makefile.uni
rename to Sapfor/_projects/dvm/fdvm/trunk/sageExample/makefile.uni
diff --git a/dvm/fdvm/trunk/sageExample/makefile.win b/Sapfor/_projects/dvm/fdvm/trunk/sageExample/makefile.win
similarity index 100%
rename from dvm/fdvm/trunk/sageExample/makefile.win
rename to Sapfor/_projects/dvm/fdvm/trunk/sageExample/makefile.win
diff --git a/dvm/tools/Zlib/CMakeLists.txt b/Sapfor/_projects/dvm/tools/Zlib/CMakeLists.txt
similarity index 100%
rename from dvm/tools/Zlib/CMakeLists.txt
rename to Sapfor/_projects/dvm/tools/Zlib/CMakeLists.txt
diff --git a/dvm/tools/Zlib/include/deflate.h b/Sapfor/_projects/dvm/tools/Zlib/include/deflate.h
similarity index 100%
rename from dvm/tools/Zlib/include/deflate.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/deflate.h
diff --git a/dvm/tools/Zlib/include/infblock.h b/Sapfor/_projects/dvm/tools/Zlib/include/infblock.h
similarity index 100%
rename from dvm/tools/Zlib/include/infblock.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/infblock.h
diff --git a/dvm/tools/Zlib/include/infcodes.h b/Sapfor/_projects/dvm/tools/Zlib/include/infcodes.h
similarity index 100%
rename from dvm/tools/Zlib/include/infcodes.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/infcodes.h
diff --git a/dvm/tools/Zlib/include/inffast.h b/Sapfor/_projects/dvm/tools/Zlib/include/inffast.h
similarity index 100%
rename from dvm/tools/Zlib/include/inffast.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/inffast.h
diff --git a/dvm/tools/Zlib/include/inffixed.h b/Sapfor/_projects/dvm/tools/Zlib/include/inffixed.h
similarity index 100%
rename from dvm/tools/Zlib/include/inffixed.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/inffixed.h
diff --git a/dvm/tools/Zlib/include/inftrees.h b/Sapfor/_projects/dvm/tools/Zlib/include/inftrees.h
similarity index 100%
rename from dvm/tools/Zlib/include/inftrees.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/inftrees.h
diff --git a/dvm/tools/Zlib/include/infutil.h b/Sapfor/_projects/dvm/tools/Zlib/include/infutil.h
similarity index 100%
rename from dvm/tools/Zlib/include/infutil.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/infutil.h
diff --git a/dvm/tools/Zlib/include/trees.h b/Sapfor/_projects/dvm/tools/Zlib/include/trees.h
similarity index 100%
rename from dvm/tools/Zlib/include/trees.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/trees.h
diff --git a/dvm/tools/Zlib/include/zconf.h b/Sapfor/_projects/dvm/tools/Zlib/include/zconf.h
similarity index 100%
rename from dvm/tools/Zlib/include/zconf.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/zconf.h
diff --git a/dvm/tools/Zlib/include/zlib.h b/Sapfor/_projects/dvm/tools/Zlib/include/zlib.h
similarity index 100%
rename from dvm/tools/Zlib/include/zlib.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/zlib.h
diff --git a/dvm/tools/Zlib/include/zutil.h b/Sapfor/_projects/dvm/tools/Zlib/include/zutil.h
similarity index 100%
rename from dvm/tools/Zlib/include/zutil.h
rename to Sapfor/_projects/dvm/tools/Zlib/include/zutil.h
diff --git a/dvm/tools/Zlib/makefile.uni b/Sapfor/_projects/dvm/tools/Zlib/makefile.uni
similarity index 100%
rename from dvm/tools/Zlib/makefile.uni
rename to Sapfor/_projects/dvm/tools/Zlib/makefile.uni
diff --git a/dvm/tools/Zlib/makefile.win b/Sapfor/_projects/dvm/tools/Zlib/makefile.win
similarity index 100%
rename from dvm/tools/Zlib/makefile.win
rename to Sapfor/_projects/dvm/tools/Zlib/makefile.win
diff --git a/dvm/tools/Zlib/src/CMakeLists.txt b/Sapfor/_projects/dvm/tools/Zlib/src/CMakeLists.txt
similarity index 100%
rename from dvm/tools/Zlib/src/CMakeLists.txt
rename to Sapfor/_projects/dvm/tools/Zlib/src/CMakeLists.txt
diff --git a/dvm/tools/Zlib/src/adler32.c b/Sapfor/_projects/dvm/tools/Zlib/src/adler32.c
similarity index 100%
rename from dvm/tools/Zlib/src/adler32.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/adler32.c
diff --git a/dvm/tools/Zlib/src/compress.c b/Sapfor/_projects/dvm/tools/Zlib/src/compress.c
similarity index 100%
rename from dvm/tools/Zlib/src/compress.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/compress.c
diff --git a/dvm/tools/Zlib/src/crc32.c b/Sapfor/_projects/dvm/tools/Zlib/src/crc32.c
similarity index 100%
rename from dvm/tools/Zlib/src/crc32.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/crc32.c
diff --git a/dvm/tools/Zlib/src/deflate.c b/Sapfor/_projects/dvm/tools/Zlib/src/deflate.c
similarity index 100%
rename from dvm/tools/Zlib/src/deflate.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/deflate.c
diff --git a/dvm/tools/Zlib/src/example.c b/Sapfor/_projects/dvm/tools/Zlib/src/example.c
similarity index 100%
rename from dvm/tools/Zlib/src/example.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/example.c
diff --git a/dvm/tools/Zlib/src/gzio.c b/Sapfor/_projects/dvm/tools/Zlib/src/gzio.c
similarity index 100%
rename from dvm/tools/Zlib/src/gzio.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/gzio.c
diff --git a/dvm/tools/Zlib/src/infblock.c b/Sapfor/_projects/dvm/tools/Zlib/src/infblock.c
similarity index 100%
rename from dvm/tools/Zlib/src/infblock.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/infblock.c
diff --git a/dvm/tools/Zlib/src/infcodes.c b/Sapfor/_projects/dvm/tools/Zlib/src/infcodes.c
similarity index 100%
rename from dvm/tools/Zlib/src/infcodes.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/infcodes.c
diff --git a/dvm/tools/Zlib/src/inffast.c b/Sapfor/_projects/dvm/tools/Zlib/src/inffast.c
similarity index 100%
rename from dvm/tools/Zlib/src/inffast.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/inffast.c
diff --git a/dvm/tools/Zlib/src/inflate.c b/Sapfor/_projects/dvm/tools/Zlib/src/inflate.c
similarity index 100%
rename from dvm/tools/Zlib/src/inflate.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/inflate.c
diff --git a/dvm/tools/Zlib/src/inftrees.c b/Sapfor/_projects/dvm/tools/Zlib/src/inftrees.c
similarity index 100%
rename from dvm/tools/Zlib/src/inftrees.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/inftrees.c
diff --git a/dvm/tools/Zlib/src/infutil.c b/Sapfor/_projects/dvm/tools/Zlib/src/infutil.c
similarity index 100%
rename from dvm/tools/Zlib/src/infutil.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/infutil.c
diff --git a/dvm/tools/Zlib/src/maketree.c b/Sapfor/_projects/dvm/tools/Zlib/src/maketree.c
similarity index 100%
rename from dvm/tools/Zlib/src/maketree.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/maketree.c
diff --git a/dvm/tools/Zlib/src/minigzip.c b/Sapfor/_projects/dvm/tools/Zlib/src/minigzip.c
similarity index 100%
rename from dvm/tools/Zlib/src/minigzip.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/minigzip.c
diff --git a/dvm/tools/Zlib/src/trees.c b/Sapfor/_projects/dvm/tools/Zlib/src/trees.c
similarity index 100%
rename from dvm/tools/Zlib/src/trees.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/trees.c
diff --git a/dvm/tools/Zlib/src/uncompr.c b/Sapfor/_projects/dvm/tools/Zlib/src/uncompr.c
similarity index 100%
rename from dvm/tools/Zlib/src/uncompr.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/uncompr.c
diff --git a/dvm/tools/Zlib/src/zutil.c b/Sapfor/_projects/dvm/tools/Zlib/src/zutil.c
similarity index 100%
rename from dvm/tools/Zlib/src/zutil.c
rename to Sapfor/_projects/dvm/tools/Zlib/src/zutil.c
diff --git a/dvm/tools/pppa/branches/dvm4.07/makefile.uni b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/makefile.uni
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni
diff --git a/dvm/tools/pppa/branches/dvm4.07/makefile.win b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/makefile.win
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/makefile.win
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/makefile.win
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/bool.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/bool.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/inter.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/inter.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/makefile.win b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/makefile.win
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/statist.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/statist.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/statread.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/statread.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/strall.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/strall.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
diff --git a/dvm/tools/pppa/branches/dvm4.07/src/ver.h b/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h
similarity index 100%
rename from dvm/tools/pppa/branches/dvm4.07/src/ver.h
rename to Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1 b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
diff --git a/dvm/tools/pppa/stuff/Zlib_1.1.3/readme b/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme
similarity index 100%
rename from dvm/tools/pppa/stuff/Zlib_1.1.3/readme
rename to Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme
diff --git a/dvm/tools/pppa/trunk/CMakeLists.txt b/Sapfor/_projects/dvm/tools/pppa/trunk/CMakeLists.txt
similarity index 100%
rename from dvm/tools/pppa/trunk/CMakeLists.txt
rename to Sapfor/_projects/dvm/tools/pppa/trunk/CMakeLists.txt
diff --git a/dvm/tools/pppa/trunk/makefile.uni b/Sapfor/_projects/dvm/tools/pppa/trunk/makefile.uni
similarity index 100%
rename from dvm/tools/pppa/trunk/makefile.uni
rename to Sapfor/_projects/dvm/tools/pppa/trunk/makefile.uni
diff --git a/dvm/tools/pppa/trunk/makefile.win b/Sapfor/_projects/dvm/tools/pppa/trunk/makefile.win
similarity index 100%
rename from dvm/tools/pppa/trunk/makefile.win
rename to Sapfor/_projects/dvm/tools/pppa/trunk/makefile.win
diff --git a/dvm/tools/pppa/trunk/src/CMakeLists.txt b/Sapfor/_projects/dvm/tools/pppa/trunk/src/CMakeLists.txt
similarity index 100%
rename from dvm/tools/pppa/trunk/src/CMakeLists.txt
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/CMakeLists.txt
diff --git a/dvm/tools/pppa/trunk/src/LibraryImport.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/LibraryImport.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp
diff --git a/dvm/tools/pppa/trunk/src/LibraryImport.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/LibraryImport.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/LibraryImport.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/LibraryImport.h
diff --git a/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln b/Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
similarity index 100%
rename from dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
diff --git a/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj b/Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
similarity index 100%
rename from dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
diff --git a/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters b/Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
similarity index 100%
rename from dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
diff --git a/dvm/tools/pppa/trunk/src/bool.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/bool.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/bool.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/bool.h
diff --git a/dvm/tools/pppa/trunk/src/dvmh_stat.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/dvmh_stat.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/dvmh_stat.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/dvmh_stat.h
diff --git a/dvm/tools/pppa/trunk/src/dvmvers.h.in b/Sapfor/_projects/dvm/tools/pppa/trunk/src/dvmvers.h.in
similarity index 100%
rename from dvm/tools/pppa/trunk/src/dvmvers.h.in
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/dvmvers.h.in
diff --git a/dvm/tools/pppa/trunk/src/inter.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/inter.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/inter.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/inter.cpp
diff --git a/dvm/tools/pppa/trunk/src/inter.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/inter.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/inter.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/inter.h
diff --git a/dvm/tools/pppa/trunk/src/json.hpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/json.hpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/json.hpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/json.hpp
diff --git a/dvm/tools/pppa/trunk/src/makefile.uni b/Sapfor/_projects/dvm/tools/pppa/trunk/src/makefile.uni
similarity index 100%
rename from dvm/tools/pppa/trunk/src/makefile.uni
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/makefile.uni
diff --git a/dvm/tools/pppa/trunk/src/makefile.win b/Sapfor/_projects/dvm/tools/pppa/trunk/src/makefile.win
similarity index 100%
rename from dvm/tools/pppa/trunk/src/makefile.win
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/makefile.win
diff --git a/dvm/tools/pppa/trunk/src/makefileJnilib b/Sapfor/_projects/dvm/tools/pppa/trunk/src/makefileJnilib
similarity index 100%
rename from dvm/tools/pppa/trunk/src/makefileJnilib
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/makefileJnilib
diff --git a/dvm/tools/pppa/trunk/src/potensyn.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/potensyn.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/potensyn.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/potensyn.cpp
diff --git a/dvm/tools/pppa/trunk/src/potensyn.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/potensyn.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/potensyn.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/potensyn.h
diff --git a/dvm/tools/pppa/trunk/src/stat.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/stat.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/stat.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/stat.cpp
diff --git a/dvm/tools/pppa/trunk/src/statfile.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statfile.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statfile.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statfile.cpp
diff --git a/dvm/tools/pppa/trunk/src/statinter.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statinter.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statinter.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statinter.cpp
diff --git a/dvm/tools/pppa/trunk/src/statinter.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statinter.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statinter.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statinter.h
diff --git a/dvm/tools/pppa/trunk/src/statist.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statist.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statist.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statist.h
diff --git a/dvm/tools/pppa/trunk/src/statlist.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statlist.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statlist.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statlist.cpp
diff --git a/dvm/tools/pppa/trunk/src/statlist.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statlist.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statlist.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statlist.h
diff --git a/dvm/tools/pppa/trunk/src/statprintf.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statprintf.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statprintf.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statprintf.cpp
diff --git a/dvm/tools/pppa/trunk/src/statprintf.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statprintf.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statprintf.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statprintf.h
diff --git a/dvm/tools/pppa/trunk/src/statread.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statread.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statread.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statread.cpp
diff --git a/dvm/tools/pppa/trunk/src/statread.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/statread.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/statread.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/statread.h
diff --git a/dvm/tools/pppa/trunk/src/strall.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/strall.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/strall.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/strall.h
diff --git a/dvm/tools/pppa/trunk/src/sysstat.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/sysstat.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/sysstat.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/sysstat.h
diff --git a/dvm/tools/pppa/trunk/src/treeinter.cpp b/Sapfor/_projects/dvm/tools/pppa/trunk/src/treeinter.cpp
similarity index 100%
rename from dvm/tools/pppa/trunk/src/treeinter.cpp
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/treeinter.cpp
diff --git a/dvm/tools/pppa/trunk/src/treeinter.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/treeinter.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/treeinter.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/treeinter.h
diff --git a/dvm/tools/pppa/trunk/src/ver.h b/Sapfor/_projects/dvm/tools/pppa/trunk/src/ver.h
similarity index 100%
rename from dvm/tools/pppa/trunk/src/ver.h
rename to Sapfor/_projects/dvm/tools/pppa/trunk/src/ver.h
diff --git a/dvm/tools/tester/trunk/automation/build-and-test.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/build-and-test.sh
similarity index 100%
rename from dvm/tools/tester/trunk/automation/build-and-test.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/automation/build-and-test.sh
diff --git a/dvm/tools/tester/trunk/automation/check-repo.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/check-repo.sh
similarity index 100%
rename from dvm/tools/tester/trunk/automation/check-repo.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/automation/check-repo.sh
diff --git a/dvm/tools/tester/trunk/automation/dvm-tester.config b/Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.config
similarity index 100%
rename from dvm/tools/tester/trunk/automation/dvm-tester.config
rename to Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.config
diff --git a/dvm/tools/tester/trunk/automation/dvm-tester.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.sh
similarity index 100%
rename from dvm/tools/tester/trunk/automation/dvm-tester.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.sh
diff --git a/dvm/tools/tester/trunk/automation/populate-report.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/populate-report.sh
similarity index 100%
rename from dvm/tools/tester/trunk/automation/populate-report.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/automation/populate-report.sh
diff --git a/dvm/tools/tester/trunk/automation/test-revision.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/test-revision.sh
similarity index 100%
rename from dvm/tools/tester/trunk/automation/test-revision.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/automation/test-revision.sh
diff --git a/dvm/tools/tester/trunk/main/configure-run.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/configure-run.sh
similarity index 100%
rename from dvm/tools/tester/trunk/main/configure-run.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/configure-run.sh
diff --git a/dvm/tools/tester/trunk/main/default-test-analyzer.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/default-test-analyzer.sh
similarity index 100%
rename from dvm/tools/tester/trunk/main/default-test-analyzer.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/default-test-analyzer.sh
diff --git a/dvm/tools/tester/trunk/main/gen-report.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/gen-report.sh
similarity index 100%
rename from dvm/tools/tester/trunk/main/gen-report.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/gen-report.sh
diff --git a/dvm/tools/tester/trunk/main/machine-config.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/machine-config.sh
similarity index 100%
rename from dvm/tools/tester/trunk/main/machine-config.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/machine-config.sh
diff --git a/dvm/tools/tester/trunk/main/perform-tests.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/perform-tests.sh
similarity index 100%
rename from dvm/tools/tester/trunk/main/perform-tests.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/perform-tests.sh
diff --git a/dvm/tools/tester/trunk/main/report.css b/Sapfor/_projects/dvm/tools/tester/trunk/main/report.css
similarity index 100%
rename from dvm/tools/tester/trunk/main/report.css
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/report.css
diff --git a/dvm/tools/tester/trunk/main/report.js b/Sapfor/_projects/dvm/tools/tester/trunk/main/report.js
similarity index 100%
rename from dvm/tools/tester/trunk/main/report.js
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/report.js
diff --git a/dvm/tools/tester/trunk/main/task-processor.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/task-processor.sh
similarity index 100%
rename from dvm/tools/tester/trunk/main/task-processor.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/task-processor.sh
diff --git a/dvm/tools/tester/trunk/main/test-system.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/test-system.sh
similarity index 100%
rename from dvm/tools/tester/trunk/main/test-system.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/test-system.sh
diff --git a/dvm/tools/tester/trunk/main/test-utils.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/test-utils.sh
similarity index 100%
rename from dvm/tools/tester/trunk/main/test-utils.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/main/test-utils.sh
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr014.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr014.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr014.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr014.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr12.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr12.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr12.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr22.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr22.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr22.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr23.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr23.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr23.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr23.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr33.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr33.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr33.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr33.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr34.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr34.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr34.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr34.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr44.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr44.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr44.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr44.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align12.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align12.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align12.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align214.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align214.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align214.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align214.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align22.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align22.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align22.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align32.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align32.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align32.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align32.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align33.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align33.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align33.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align33.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align44.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align44.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align44.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align44.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/aligndyn11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/aligndyn11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/aligndyn11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/aligndyn11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr1.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr1.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr1.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr2.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr2.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr2.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr3.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr3.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr3.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr4.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr4.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr4.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr4.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen1.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen1.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen1.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen2.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen2.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen2.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen3.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen3.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen3.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr1.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr1.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr1.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr2.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr2.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr2.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr3.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr3.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr3.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix1.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix1.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix1.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix2.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix2.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix2.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix3.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix3.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix3.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult1.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult1.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult1.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult2.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult2.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult2.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult3.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult3.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult3.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt1.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt1.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt1.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt2.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt2.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt2.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt3.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt3.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt3.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fopen11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fopen11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fopen11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fopen11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc12.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc12.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc12.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc21.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc21.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc21.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc22.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc22.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc22.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre12.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre12.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre12.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre21.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre21.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre21.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre22.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre22.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre22.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre23.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre23.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre23.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre23.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre24.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre24.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre24.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre24.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/remove11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/remove11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/remove11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/remove11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/rename11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/rename11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/rename11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/rename11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/tmpfile11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/tmpfile11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/IO/tmpfile11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/tmpfile11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal21.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal21.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal21.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal31.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal31.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal31.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal31.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal41.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal41.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal41.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal41.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel1.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel1.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel1.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel2.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel2.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel2.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel3.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel3.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel3.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel4.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel4.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel4.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel4.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus124.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus124.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus124.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus124.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus234.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus234.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus234.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus234.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus34.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus34.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus34.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus34.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign22.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign22.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign22.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign33.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign33.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign33.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign33.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign44.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign44.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign44.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign44.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red11n.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red11n.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red11n.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red11n.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red21m.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red21m.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red21m.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red21m.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem11.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem11.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem11.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem12.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem12.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem12.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem21.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem21.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem21.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem22.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem22.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem22.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem31.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem31.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem31.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem31.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem32.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem32.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem32.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem32.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem41.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem41.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem41.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem41.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem42.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem42.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem42.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem42.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem43.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem43.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem43.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem43.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh21.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh21.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh21.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh31.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh31.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh31.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh31.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh41.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh41.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh41.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh41.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ1.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ1.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ1.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ2.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ2.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ2.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ4.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ4.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ4.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ4.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr31.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr31.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr31.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr41.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr41.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr41.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr42.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr42.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr42.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr43.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr43.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr43.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align24.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align24.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align24.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align24.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align33.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align33.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align33.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align44.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align44.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align44.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align44.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignfloat11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignfloat11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignfloat11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignfloat11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus33.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus33.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus33.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons01234.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons01234.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons01234.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons01234.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons1234.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons1234.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons1234.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons1234.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons234.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons234.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons234.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons234.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons33.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons33.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons33.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons34.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons34.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons34.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons34.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons44.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons44.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons44.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons44.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr2.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr2.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr2.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr4.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr4.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr4.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr4.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distrfloat1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distrfloat1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distrfloat1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distrfloat1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen2.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen2.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen2.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix2.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix2.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix2.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult2.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult2.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult2.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt2.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt2.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt2.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_do.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_do.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_do.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_do.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math_intel.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math_intel.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math_intel.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math_intel.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_select.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_select.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_select.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_select.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/module21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/module21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/module21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/module21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/type21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/type21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/type21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/type21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrderived1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrderived1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrderived1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrderived1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect1.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect1.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect1.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect1.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect3.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect3.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect3.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect3.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal31.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal31.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal31.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal33.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal33.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal33.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel2.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel2.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel2.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel4.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel4.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel4.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel4.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus14.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus14.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus14.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus14.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus23.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus23.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus23.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus23.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus24.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus24.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus24.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus24.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus34.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus34.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus34.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus34.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf23.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf23.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf23.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf23.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf24.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf24.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf24.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf24.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf31.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf31.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf31.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf33.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf33.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf33.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf33.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf34.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf34.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf34.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf34.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf41.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf41.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf41.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf42.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf42.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf42.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf43.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf43.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf43.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf44.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf44.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf44.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf44.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf45.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf45.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf45.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf45.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf46.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf46.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf46.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf46.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign33.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign33.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign33.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign44.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign44.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign44.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign44.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red31.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red31.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red31.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red41.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red41.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red41.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red42.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red42.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red42.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red43.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red43.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red43.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda31.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda31.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda31.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda41.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda41.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda41.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda42.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda42.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda42.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda43.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda43.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda43.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem31.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem31.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem31.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem41.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem41.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem41.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem42.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem42.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem42.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem43.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem43.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem43.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh31.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh31.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh31.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh41.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh41.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh41.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh42.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh42.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh42.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha31.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha31.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha31.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha41.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha41.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha41.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha42.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha42.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha42.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha43.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha43.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha43.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc21.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc21.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc21.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc22.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc22.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc22.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc31.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc31.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc31.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc32.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc32.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc32.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc41.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc41.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc41.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc42.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc42.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc42.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ1.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ1.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ1.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ2.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ2.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ2.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ4.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ4.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ4.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ4.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Correctness/test-analyzer.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/test-analyzer.sh
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Correctness/test-analyzer.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/test-analyzer.sh
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/TODO_make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/TODO_make.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/TODO_make.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/TODO_make.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/bt.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/bt.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/bt.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/bt.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_errors.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_errors.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_errors.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_errors.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs_block.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs_block.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs_block.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_solution.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_solution.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_solution.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_solution.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/header3d.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/header3d.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/header3d.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/header3d.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/initialize.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/initialize.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/initialize.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/initialize.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/print_result.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/print_result.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/print_result.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/print_result.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/set_constants.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/set_constants.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/set_constants.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/set_constants.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/timers.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/timers.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/timers.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/timers.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/verify.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/verify.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/verify.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/verify.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_block.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_block.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_block.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_mpi.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_mpi.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_mpi.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_mpi.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_block.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_block.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_block.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_mpi.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_mpi.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_mpi.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_mpi.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_block.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_block.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_block.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_mpi.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_mpi.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_mpi.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_mpi.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/globals.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/globals.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/globals.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/globals.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/make.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/make.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/make.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/print_results.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/print_results.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/print_results.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/print_results.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/randdp.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/randdp.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/randdp.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/randdp.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/timers.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/timers.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/timers.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/timers.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/ep.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/ep.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/ep.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/ep.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/make.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/make.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/make.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/dtime.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/dtime.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/dtime.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/dtime.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/global.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/global.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/global.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/global.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/make.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/make.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/make.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/applu.incl b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/applu.incl
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/applu.incl
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/applu.incl
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/domain.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/domain.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/domain.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/domain.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/erhs.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/erhs.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/erhs.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/erhs.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/error.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/error.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/error.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/error.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/exact.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/exact.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/exact.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/exact.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/l2norm.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/l2norm.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/l2norm.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/l2norm.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/lu.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/lu.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/lu.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/lu.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/makeTODO.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/makeTODO.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/makeTODO.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/makeTODO.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/old/lu.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/old/lu.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/old/lu.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/old/lu.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/pintgr.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/pintgr.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/pintgr.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/pintgr.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/print_results.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/print_results.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/print_results.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/print_results.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/read_input.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/read_input.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/read_input.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/read_input.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f1 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f1
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f1
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f1
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f2 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f2
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f2
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f2
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setbv.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setbv.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setbv.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setbv.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setcoeff.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setcoeff.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setcoeff.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setcoeff.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setiv.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setiv.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setiv.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setiv.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/ssor.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/ssor.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/ssor.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/ssor.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/timers.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/timers.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/timers.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/timers.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/verify.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/verify.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/verify.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/verify.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/TODO_make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/TODO_make.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/TODO_make.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/TODO_make.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/comm3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/comm3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/comm3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/comm3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/dvmvars.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/dvmvars.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/dvmvars.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/dvmvars.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/globals.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/globals.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/globals.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/globals.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/interp.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/interp.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/interp.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/interp.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg3p.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg3p.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg3p.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg3p.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/psinv.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/psinv.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/psinv.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/psinv.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/resid.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/resid.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/resid.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/resid.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/utilities.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/utilities.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/utilities.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/utilities.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/zran3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/zran3.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/zran3.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/zran3.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/globals.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/globals.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/globals.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/globals.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/TODO_make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/TODO_make.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/TODO_make.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/TODO_make.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_errors.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_errors.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_errors.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_errors.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_rhs.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_rhs.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_rhs.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_rhs.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/exact_rhs.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/exact_rhs.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/exact_rhs.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/exact_rhs.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/header.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/header.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/header.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/header.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/initialize.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/initialize.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/initialize.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/initialize.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/print_result.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/print_result.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/print_result.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/print_result.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/set_constants.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/set_constants.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/set_constants.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/set_constants.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/sp.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/sp.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/sp.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/sp.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/timers.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/timers.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/timers.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/timers.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/verify.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/verify.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/verify.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/verify.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve_mpi.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve_mpi.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve_mpi.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve_mpi.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve_mpi.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve_mpi.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve_mpi.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve_mpi.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve_mpi.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve_mpi.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve_mpi.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve_mpi.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/clear.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/clear.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/clear.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/clear.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.sh
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.sh
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compileTest.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compileTest.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compileTest.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compileTest.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.sh
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.sh
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/make.common b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/make.common
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/make.common
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/make.common
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/setparams.c b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/setparams.c
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/setparams.c
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/setparams.c
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/add.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/add.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/add.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/add.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/define.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/define.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/define.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/define.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/error.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/error.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/error.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/error.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_solution.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_solution.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_solution.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_solution.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/header.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/header.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/header.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/header.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/README b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/README
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/README
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/README
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/clear.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/clear.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/clear.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/clear.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.sh
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.sh
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compileTest.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compileTest.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compileTest.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compileTest.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.bat
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.bat
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.bat
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.sh
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.sh
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/Makefile
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/Makefile
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/Makefile
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/make.common b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/make.common
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/make.common
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/make.common
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/setparams.c b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/setparams.c
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/setparams.c
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/setparams.c
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/NPB/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/NPB/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/adi3d.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/adi3d.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/adi3d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/adi3d.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/d_sor2d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor2d.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/d_sor2d.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor2d.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/d_sor3d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor3d.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/d_sor3d.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor3d.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/f_sor2d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor2d.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/f_sor2d.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor2d.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/f_sor3d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor3d.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/f_sor3d.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor3d.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/jac2d.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/jac2d.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/jac2d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/jac2d.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/jac3d.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.cdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/jac3d.cdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.cdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/jac3d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.fdv
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/jac3d.fdv
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.fdv
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/settings
diff --git a/dvm/tools/tester/trunk/test-suite/Performance/test-analyzer.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/test-analyzer.sh
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/Performance/test-analyzer.sh
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/test-analyzer.sh
diff --git a/dvm/tools/tester/trunk/test-suite/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/settings
similarity index 100%
rename from dvm/tools/tester/trunk/test-suite/settings
rename to Sapfor/_projects/dvm/tools/tester/trunk/test-suite/settings
diff --git a/Sapfor/_projects/paths.default.txt b/Sapfor/_projects/paths.default.txt
new file mode 100644
index 0000000..29884d1
--- /dev/null
+++ b/Sapfor/_projects/paths.default.txt
@@ -0,0 +1,10 @@
+fdvm_include=./dvm/fdvm/trunk/include/
+sage_include_1=./dvm/fdvm/trunk/Sage/lib/include/
+sage_include_2=./dvm/fdvm/trunk/Sage/h/
+fdvm_sources=./dvm/fdvm/trunk/fdvm/
+libdb_sources=./dvm/fdvm/trunk/Sage/lib/oldsrc/
+sage_sources=./dvm/fdvm/trunk/Sage/lib/newsrc/
+sagepp_sources=./dvm/fdvm/trunk/Sage/Sage++/
+parser_sources=./dvm/fdvm/trunk/parser/
+pppa_sources=./dvm/tools/pppa/trunk/src/
+zlib_sources=./dvm/tools/Zlib/
\ No newline at end of file
diff --git a/Sapfor/paths.default.txt b/Sapfor/paths.default.txt
deleted file mode 100644
index bb19b87..0000000
--- a/Sapfor/paths.default.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-fdvm_include=../dvm/fdvm/trunk/include/
-sage_include_1=../dvm/fdvm/trunk/Sage/lib/include/
-sage_include_2=../dvm/fdvm/trunk/Sage/h/
-fdvm_sources=../dvm/fdvm/trunk/fdvm/
-libdb_sources=../dvm/fdvm/trunk/Sage/lib/oldsrc/
-sage_sources=../dvm/fdvm/trunk/Sage/lib/newsrc/
-sagepp_sources=../dvm/fdvm/trunk/Sage/Sage++/
-parser_sources=../dvm/fdvm/trunk/parser/
-pppa_sources=../dvm/tools/pppa/trunk/src/
-zlib_sources=../dvm/tools/Zlib/
\ No newline at end of file

From a4c8785e666c7ef79a816897b6877a5adcce41aa Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Wed, 12 Mar 2025 14:12:44 +0300
Subject: [PATCH 26/44] removed unnecessary

---
 .../tester/trunk/automation/build-and-test.sh |   104 -
 .../tester/trunk/automation/check-repo.sh     |    65 -
 .../tester/trunk/automation/dvm-tester.config |    19 -
 .../tester/trunk/automation/dvm-tester.sh     |    73 -
 .../trunk/automation/populate-report.sh       |    38 -
 .../tester/trunk/automation/test-revision.sh  |   100 -
 .../tools/tester/trunk/main/configure-run.sh  |    86 -
 .../trunk/main/default-test-analyzer.sh       |    26 -
 .../dvm/tools/tester/trunk/main/gen-report.sh |   348 -
 .../tools/tester/trunk/main/machine-config.sh |    17 -
 .../tools/tester/trunk/main/perform-tests.sh  |   352 -
 .../dvm/tools/tester/trunk/main/report.css    |    24 -
 .../dvm/tools/tester/trunk/main/report.js     |     7 -
 .../tools/tester/trunk/main/task-processor.sh |   366 -
 .../tools/tester/trunk/main/test-system.sh    |   103 -
 .../dvm/tools/tester/trunk/main/test-utils.sh |    19 -
 .../Correctness/C/ACROSS/acr014.cdv           |  1228 --
 .../test-suite/Correctness/C/ACROSS/acr11.cdv |   538 -
 .../test-suite/Correctness/C/ACROSS/acr12.cdv |   939 -
 .../test-suite/Correctness/C/ACROSS/acr22.cdv |   939 -
 .../test-suite/Correctness/C/ACROSS/acr23.cdv |   675 -
 .../test-suite/Correctness/C/ACROSS/acr33.cdv |   675 -
 .../test-suite/Correctness/C/ACROSS/acr34.cdv |   723 -
 .../test-suite/Correctness/C/ACROSS/acr44.cdv |   723 -
 .../test-suite/Correctness/C/ACROSS/settings  |     1 -
 .../Correctness/C/ALIGN/align11.cdv           |   415 -
 .../Correctness/C/ALIGN/align12.cdv           |   228 -
 .../Correctness/C/ALIGN/align214.cdv          |   727 -
 .../Correctness/C/ALIGN/align22.cdv           |   600 -
 .../Correctness/C/ALIGN/align32.cdv           |   600 -
 .../Correctness/C/ALIGN/align33.cdv           |   197 -
 .../Correctness/C/ALIGN/align44.cdv           |   855 -
 .../Correctness/C/ALIGN/aligndyn11.cdv        |   422 -
 .../test-suite/Correctness/C/DISTR/distr1.cdv |   297 -
 .../test-suite/Correctness/C/DISTR/distr2.cdv |   257 -
 .../test-suite/Correctness/C/DISTR/distr3.cdv |   125 -
 .../test-suite/Correctness/C/DISTR/distr4.cdv |   229 -
 .../Correctness/C/DISTR_GEN/distrgen1.cdv     |   386 -
 .../Correctness/C/DISTR_GEN/distrgen2.cdv     |   648 -
 .../Correctness/C/DISTR_GEN/distrgen3.cdv     |  1006 -
 .../Correctness/C/DISTR_MIX/deldistr1.cdv     |   217 -
 .../Correctness/C/DISTR_MIX/deldistr2.cdv     |  1001 -
 .../Correctness/C/DISTR_MIX/deldistr3.cdv     |  2846 ---
 .../Correctness/C/DISTR_MIX/distrmix1.cdv     |   398 -
 .../Correctness/C/DISTR_MIX/distrmix2.cdv     |   901 -
 .../Correctness/C/DISTR_MIX/distrmix3.cdv     |  1795 --
 .../Correctness/C/DISTR_MULT/distrmult1.cdv   |   474 -
 .../Correctness/C/DISTR_MULT/distrmult2.cdv   |   857 -
 .../Correctness/C/DISTR_MULT/distrmult3.cdv   |   569 -
 .../Correctness/C/DISTR_WGT/distrwgt1.cdv     |   483 -
 .../Correctness/C/DISTR_WGT/distrwgt2.cdv     |   859 -
 .../Correctness/C/DISTR_WGT/distrwgt3.cdv     |   478 -
 .../test-suite/Correctness/C/IO/fopen11.cdv   |   181 -
 .../test-suite/Correctness/C/IO/fpsc11.cdv    |   105 -
 .../test-suite/Correctness/C/IO/fpsc12.cdv    |   105 -
 .../test-suite/Correctness/C/IO/fpsc21.cdv    |   112 -
 .../test-suite/Correctness/C/IO/fpsc22.cdv    |   112 -
 .../test-suite/Correctness/C/IO/fwrre11.cdv   |   236 -
 .../test-suite/Correctness/C/IO/fwrre12.cdv   |   236 -
 .../test-suite/Correctness/C/IO/fwrre21.cdv   |   242 -
 .../test-suite/Correctness/C/IO/fwrre22.cdv   |   242 -
 .../test-suite/Correctness/C/IO/fwrre23.cdv   |   242 -
 .../test-suite/Correctness/C/IO/fwrre24.cdv   |   297 -
 .../test-suite/Correctness/C/IO/remove11.cdv  |    85 -
 .../test-suite/Correctness/C/IO/rename11.cdv  |   182 -
 .../test-suite/Correctness/C/IO/tmpfile11.cdv |   225 -
 .../Correctness/C/OWNCALC/owncal11.cdv        |   285 -
 .../Correctness/C/OWNCALC/owncal21.cdv        |   520 -
 .../Correctness/C/OWNCALC/owncal31.cdv        |   611 -
 .../Correctness/C/OWNCALC/owncal41.cdv        |   656 -
 .../test-suite/Correctness/C/OWNCALC/settings |     1 -
 .../Correctness/C/PARALLEL/parallel1.cdv      |   340 -
 .../Correctness/C/PARALLEL/parallel2.cdv      |   253 -
 .../Correctness/C/PARALLEL/parallel3.cdv      |   518 -
 .../Correctness/C/PARALLEL/parallel4.cdv      |   671 -
 .../Correctness/C/PARALLEL/paralplus124.cdv   |  1141 -
 .../Correctness/C/PARALLEL/paralplus234.cdv   |  1689 --
 .../Correctness/C/PARALLEL/paralplus34.cdv    |   672 -
 .../Correctness/C/REALIGN/realign11.cdv       |   774 -
 .../Correctness/C/REALIGN/realign22.cdv       |   855 -
 .../Correctness/C/REALIGN/realign33.cdv       |   775 -
 .../Correctness/C/REALIGN/realign44.cdv       |   553 -
 .../Correctness/C/REDUCTION/red11n.cdv        |   995 -
 .../Correctness/C/REDUCTION/red21m.cdv        |   915 -
 .../test-suite/Correctness/C/REMOTE/rem11.cdv |   537 -
 .../test-suite/Correctness/C/REMOTE/rem12.cdv |   537 -
 .../test-suite/Correctness/C/REMOTE/rem21.cdv |   943 -
 .../test-suite/Correctness/C/REMOTE/rem22.cdv |   943 -
 .../test-suite/Correctness/C/REMOTE/rem31.cdv |   702 -
 .../test-suite/Correctness/C/REMOTE/rem32.cdv |   705 -
 .../test-suite/Correctness/C/REMOTE/rem41.cdv |   811 -
 .../test-suite/Correctness/C/REMOTE/rem42.cdv |   811 -
 .../test-suite/Correctness/C/REMOTE/rem43.cdv |   811 -
 .../test-suite/Correctness/C/SHADOW/sh21.cdv  |  1169 --
 .../test-suite/Correctness/C/SHADOW/sh31.cdv  |   706 -
 .../test-suite/Correctness/C/SHADOW/sh41.cdv  |   923 -
 .../Correctness/C/TEMPLATE/templ1.cdv         |   190 -
 .../Correctness/C/TEMPLATE/templ2.cdv         |   198 -
 .../Correctness/C/TEMPLATE/templ4.cdv         |   265 -
 .../Correctness/Fortran/ACROSS/acr11.fdv      |   591 -
 .../Correctness/Fortran/ACROSS/acr12.fdv      |   587 -
 .../Correctness/Fortran/ACROSS/acr21.fdv      |   977 -
 .../Correctness/Fortran/ACROSS/acr22.fdv      |   995 -
 .../Correctness/Fortran/ACROSS/acr31.fdv      |   781 -
 .../Correctness/Fortran/ACROSS/acr32.fdv      |   772 -
 .../Correctness/Fortran/ACROSS/acr41.fdv      |   887 -
 .../Correctness/Fortran/ACROSS/acr42.fdv      |   881 -
 .../Correctness/Fortran/ACROSS/acr43.fdv      |   883 -
 .../Correctness/Fortran/ACROSS/settings       |     1 -
 .../Correctness/Fortran/ALIGN/align11.fdv     |   441 -
 .../Correctness/Fortran/ALIGN/align12.fdv     |   233 -
 .../Correctness/Fortran/ALIGN/align21.fdv     |   299 -
 .../Correctness/Fortran/ALIGN/align22.fdv     |   598 -
 .../Correctness/Fortran/ALIGN/align24.fdv     |   536 -
 .../Correctness/Fortran/ALIGN/align32.fdv     |   390 -
 .../Correctness/Fortran/ALIGN/align33.fdv     |   120 -
 .../Correctness/Fortran/ALIGN/align44.fdv     |   926 -
 .../Fortran/ALIGN/alignfloat11.fdv            |   449 -
 .../Correctness/Fortran/ALIGN/alignplus21.fdv |   569 -
 .../Correctness/Fortran/ALIGN/alignplus33.fdv |   478 -
 .../Fortran/CONSISTENT/cons01234.fdv          |  4834 -----
 .../Correctness/Fortran/CONSISTENT/cons11.fdv |  1113 -
 .../Fortran/CONSISTENT/cons1234.fdv           | 11332 ----------
 .../Correctness/Fortran/CONSISTENT/cons22.fdv |  1185 --
 .../Fortran/CONSISTENT/cons234.fdv            | 11628 ----------
 .../Correctness/Fortran/CONSISTENT/cons33.fdv |  1261 --
 .../Correctness/Fortran/CONSISTENT/cons34.fdv |  5274 -----
 .../Correctness/Fortran/CONSISTENT/cons44.fdv |  1333 --
 .../Correctness/Fortran/DISTR/distr1.fdv      |   350 -
 .../Correctness/Fortran/DISTR/distr2.fdv      |   303 -
 .../Correctness/Fortran/DISTR/distr3.fdv      |   136 -
 .../Correctness/Fortran/DISTR/distr4.fdv      |   251 -
 .../Correctness/Fortran/DISTR/distrfloat1.fdv |   352 -
 .../Fortran/DISTR_GEN/distrgen1.fdv           |   979 -
 .../Fortran/DISTR_GEN/distrgen2.fdv           |  1036 -
 .../Fortran/DISTR_GEN/distrgen3.fdv           |  2855 ---
 .../Fortran/DISTR_MIX/distrmix1.fdv           |   564 -
 .../Fortran/DISTR_MIX/distrmix2.fdv           |  1775 --
 .../Fortran/DISTR_MIX/distrmix3.fdv           |  3403 ---
 .../Fortran/DISTR_MULT/distrmult1.fdv         |   553 -
 .../Fortran/DISTR_MULT/distrmult2.fdv         |   996 -
 .../Fortran/DISTR_MULT/distrmult3.fdv         |   668 -
 .../Fortran/DISTR_WGT/distrwgt1.fdv           |   766 -
 .../Fortran/DISTR_WGT/distrwgt2.fdv           |  1334 --
 .../Fortran/DISTR_WGT/distrwgt3.fdv           |   835 -
 .../Correctness/Fortran/F2C/f2c_do.fdv        |   824 -
 .../Correctness/Fortran/F2C/f2c_math.fdv      | 17459 ----------------
 .../Fortran/F2C/f2c_math_intel.fdv            |  9645 ---------
 .../Correctness/Fortran/F2C/f2c_select.fdv    |   500 -
 .../Correctness/Fortran/F2C/settings          |     1 -
 .../Correctness/Fortran/F95/copy11.fdv        |    65 -
 .../Correctness/Fortran/F95/copy21.fdv        |    49 -
 .../Correctness/Fortran/F95/module21.fdv      |   114 -
 .../Correctness/Fortran/F95/settings          |     1 -
 .../Correctness/Fortran/F95/type21.fdv        |    89 -
 .../INDIRECT_DERIVED/distrderived1.fdv        |   236 -
 .../INDIRECT_DERIVED/distrindirect1.f90       |   235 -
 .../INDIRECT_DERIVED/distrindirect3.f90       |   262 -
 .../Fortran/INOUTLOCAL/inoutlocal31.fdv       |  1088 -
 .../Fortran/INOUTLOCAL/inoutlocal32.fdv       |  1088 -
 .../Fortran/INOUTLOCAL/inoutlocal33.fdv       |  1088 -
 .../Fortran/PARALLEL/parallel1.fdv            |   305 -
 .../Fortran/PARALLEL/parallel2.fdv            |   227 -
 .../Fortran/PARALLEL/parallel3.fdv            |   456 -
 .../Fortran/PARALLEL/parallel4.fdv            |   500 -
 .../Fortran/PARALLEL/paralplus12.fdv          |   439 -
 .../Fortran/PARALLEL/paralplus14.fdv          |   503 -
 .../Fortran/PARALLEL/paralplus23.fdv          |   892 -
 .../Fortran/PARALLEL/paralplus24.fdv          |   502 -
 .../Fortran/PARALLEL/paralplus34.fdv          |   501 -
 .../Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv  |   261 -
 .../Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv |   305 -
 .../Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv |   346 -
 .../Fortran/PARALLEL_NO_ON/settings           |     1 -
 .../Correctness/Fortran/PREFETCH/prf11.fdv    |   293 -
 .../Correctness/Fortran/PREFETCH/prf12.fdv    |   285 -
 .../Correctness/Fortran/PREFETCH/prf21.fdv    |   452 -
 .../Correctness/Fortran/PREFETCH/prf22.fdv    |   460 -
 .../Correctness/Fortran/PREFETCH/prf23.f90    |   268 -
 .../Correctness/Fortran/PREFETCH/prf24.f90    |   268 -
 .../Correctness/Fortran/PREFETCH/prf31.fdv    |   457 -
 .../Correctness/Fortran/PREFETCH/prf32.fdv    |   457 -
 .../Correctness/Fortran/PREFETCH/prf33.f90    |   326 -
 .../Correctness/Fortran/PREFETCH/prf34.f90    |   326 -
 .../Correctness/Fortran/PREFETCH/prf41.fdv    |   525 -
 .../Correctness/Fortran/PREFETCH/prf42.fdv    |   525 -
 .../Correctness/Fortran/PREFETCH/prf43.fdv    |   525 -
 .../Correctness/Fortran/PREFETCH/prf44.f90    |   401 -
 .../Correctness/Fortran/PREFETCH/prf45.f90    |   401 -
 .../Correctness/Fortran/PREFETCH/prf46.f90    |   401 -
 .../Correctness/Fortran/PREFETCH/settings     |     1 -
 .../Correctness/Fortran/REALIGN/realign11.fdv |   559 -
 .../Correctness/Fortran/REALIGN/realign22.fdv |   483 -
 .../Correctness/Fortran/REALIGN/realign33.fdv |   697 -
 .../Correctness/Fortran/REALIGN/realign44.fdv |   557 -
 .../Correctness/Fortran/REDUCTION/red11.fdv   |   929 -
 .../Correctness/Fortran/REDUCTION/red12.fdv   |   941 -
 .../Correctness/Fortran/REDUCTION/red21.fdv   |   938 -
 .../Correctness/Fortran/REDUCTION/red22.fdv   |   939 -
 .../Correctness/Fortran/REDUCTION/red31.fdv   |  1052 -
 .../Correctness/Fortran/REDUCTION/red32.fdv   |  1064 -
 .../Correctness/Fortran/REDUCTION/red41.fdv   |  1200 --
 .../Correctness/Fortran/REDUCTION/red42.fdv   |  1200 --
 .../Correctness/Fortran/REDUCTION/red43.fdv   |  1200 --
 .../Correctness/Fortran/REDUCTIONA/reda11.fdv |   400 -
 .../Correctness/Fortran/REDUCTIONA/reda12.fdv |   392 -
 .../Correctness/Fortran/REDUCTIONA/reda21.fdv |   495 -
 .../Correctness/Fortran/REDUCTIONA/reda22.fdv |   495 -
 .../Correctness/Fortran/REDUCTIONA/reda31.fdv |   568 -
 .../Correctness/Fortran/REDUCTIONA/reda32.fdv |   568 -
 .../Correctness/Fortran/REDUCTIONA/reda41.fdv |   643 -
 .../Correctness/Fortran/REDUCTIONA/reda42.fdv |   643 -
 .../Correctness/Fortran/REDUCTIONA/reda43.fdv |   643 -
 .../Correctness/Fortran/REDUCTIONA/settings   |     1 -
 .../Correctness/Fortran/REMOTE/rem11.fdv      |   538 -
 .../Correctness/Fortran/REMOTE/rem12.fdv      |   533 -
 .../Correctness/Fortran/REMOTE/rem21.fdv      |   992 -
 .../Correctness/Fortran/REMOTE/rem22.fdv      |   992 -
 .../Correctness/Fortran/REMOTE/rem31.fdv      |   763 -
 .../Correctness/Fortran/REMOTE/rem32.fdv      |   763 -
 .../Correctness/Fortran/REMOTE/rem41.fdv      |   883 -
 .../Correctness/Fortran/REMOTE/rem42.fdv      |   883 -
 .../Correctness/Fortran/REMOTE/rem43.fdv      |   884 -
 .../Correctness/Fortran/SHADOW/sh11.fdv       |   830 -
 .../Correctness/Fortran/SHADOW/sh12.fdv       |   831 -
 .../Correctness/Fortran/SHADOW/sh21.fdv       |  1220 --
 .../Correctness/Fortran/SHADOW/sh22.fdv       |  1221 --
 .../Correctness/Fortran/SHADOW/sh31.fdv       |   691 -
 .../Correctness/Fortran/SHADOW/sh32.fdv       |   692 -
 .../Correctness/Fortran/SHADOW/sh41.fdv       |   803 -
 .../Correctness/Fortran/SHADOW/sh42.fdv       |   803 -
 .../Correctness/Fortran/SHADOWA/settings      |     1 -
 .../Correctness/Fortran/SHADOWA/sha11.fdv     |   260 -
 .../Correctness/Fortran/SHADOWA/sha12.fdv     |   260 -
 .../Correctness/Fortran/SHADOWA/sha21.fdv     |   297 -
 .../Correctness/Fortran/SHADOWA/sha22.fdv     |   297 -
 .../Correctness/Fortran/SHADOWA/sha31.fdv     |   335 -
 .../Correctness/Fortran/SHADOWA/sha32.fdv     |   335 -
 .../Correctness/Fortran/SHADOWA/sha41.fdv     |   364 -
 .../Correctness/Fortran/SHADOWA/sha42.fdv     |   364 -
 .../Correctness/Fortran/SHADOWA/sha43.fdv     |   364 -
 .../Correctness/Fortran/SHADOW_COMP/sc11.fdv  |   829 -
 .../Correctness/Fortran/SHADOW_COMP/sc21.fdv  |  1220 --
 .../Correctness/Fortran/SHADOW_COMP/sc22.fdv  |  1220 --
 .../Correctness/Fortran/SHADOW_COMP/sc31.fdv  |   684 -
 .../Correctness/Fortran/SHADOW_COMP/sc32.fdv  |   684 -
 .../Correctness/Fortran/SHADOW_COMP/sc41.fdv  |   801 -
 .../Correctness/Fortran/SHADOW_COMP/sc42.fdv  |   801 -
 .../Correctness/Fortran/TASK/taskst11.fdv     |   236 -
 .../Correctness/Fortran/TASK/taskst12.fdv     |   207 -
 .../Correctness/Fortran/TASK/taskst21.f90     |   229 -
 .../Correctness/Fortran/TASK/taskst22.f90     |   221 -
 .../Correctness/Fortran/TASK/taskst31.f90     |   271 -
 .../Correctness/Fortran/TASK/taskst32.f90     |   254 -
 .../Correctness/Fortran/TEMPLATE/templ1.fdv   |   180 -
 .../Correctness/Fortran/TEMPLATE/templ2.fdv   |   194 -
 .../Correctness/Fortran/TEMPLATE/templ4.fdv   |   276 -
 .../trunk/test-suite/Correctness/settings     |     4 -
 .../test-suite/Correctness/test-analyzer.sh   |    53 -
 .../Performance/NPB/FDVMH.fdv/BT/Makefile     |    66 -
 .../NPB/FDVMH.fdv/BT/TODO_make.bat            |    12 -
 .../Performance/NPB/FDVMH.fdv/BT/bt.fdv       |   120 -
 .../NPB/FDVMH.fdv/BT/compute_errors.fdv       |   117 -
 .../NPB/FDVMH.fdv/BT/compute_rhs.fdv          |   218 -
 .../NPB/FDVMH.fdv/BT/compute_rhs_block.fdv    |   484 -
 .../NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv   |   247 -
 .../NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv      |   219 -
 .../NPB/FDVMH.fdv/BT/exact_rhs.fdv            |   307 -
 .../NPB/FDVMH.fdv/BT/exact_rhs_block.fdv      |     4 -
 .../NPB/FDVMH.fdv/BT/exact_solution.fdv       |    18 -
 .../Performance/NPB/FDVMH.fdv/BT/header3d.h   |   106 -
 .../NPB/FDVMH.fdv/BT/initialize.fdv           |   181 -
 .../NPB/FDVMH.fdv/BT/print_result.fdv         |    58 -
 .../NPB/FDVMH.fdv/BT/set_constants.fdv        |   165 -
 .../Performance/NPB/FDVMH.fdv/BT/timers.fdv   |    84 -
 .../Performance/NPB/FDVMH.fdv/BT/verify.fdv   |   312 -
 .../Performance/NPB/FDVMH.fdv/BT/x_solve.fdv  |   627 -
 .../NPB/FDVMH.fdv/BT/x_solve_block.fdv        |   640 -
 .../NPB/FDVMH.fdv/BT/x_solve_mpi.fdv          |   640 -
 .../Performance/NPB/FDVMH.fdv/BT/y_solve.fdv  |   622 -
 .../NPB/FDVMH.fdv/BT/y_solve_block.fdv        |   635 -
 .../NPB/FDVMH.fdv/BT/y_solve_mpi.fdv          |   634 -
 .../Performance/NPB/FDVMH.fdv/BT/z_solve.fdv  |   623 -
 .../NPB/FDVMH.fdv/BT/z_solve_block.fdv        |   636 -
 .../NPB/FDVMH.fdv/BT/z_solve_mpi.fdv          |   640 -
 .../Performance/NPB/FDVMH.fdv/CG/Makefile     |    23 -
 .../NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt      |  2286 --
 .../Performance/NPB/FDVMH.fdv/CG/cg.fdv       |  1008 -
 .../FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt  |  2285 --
 .../NPB/FDVMH.fdv/CG/cluster/cg.fdv           |  1008 -
 .../Performance/NPB/FDVMH.fdv/CG/globals.h    |   105 -
 .../Performance/NPB/FDVMH.fdv/CG/make.bat     |    12 -
 .../NPB/FDVMH.fdv/CG/print_results.f          |   111 -
 .../Performance/NPB/FDVMH.fdv/CG/randdp.f     |   137 -
 .../Performance/NPB/FDVMH.fdv/CG/timers.f     |   108 -
 .../Performance/NPB/FDVMH.fdv/EP/Makefile     |    21 -
 .../Performance/NPB/FDVMH.fdv/EP/ep.fdv       |   565 -
 .../Performance/NPB/FDVMH.fdv/EP/make.bat     |    12 -
 .../Performance/NPB/FDVMH.fdv/FT/Makefile     |    21 -
 .../Performance/NPB/FDVMH.fdv/FT/dtime.h      |     3 -
 .../Performance/NPB/FDVMH.fdv/FT/ft.fdv       |  1838 --
 .../Performance/NPB/FDVMH.fdv/FT/global.h     |    80 -
 .../Performance/NPB/FDVMH.fdv/FT/make.bat     |    12 -
 .../Performance/NPB/FDVMH.fdv/LU/Makefile     |    44 -
 .../Performance/NPB/FDVMH.fdv/LU/applu.incl   |   185 -
 .../Performance/NPB/FDVMH.fdv/LU/domain.f     |    79 -
 .../Performance/NPB/FDVMH.fdv/LU/erhs.f       |   369 -
 .../Performance/NPB/FDVMH.fdv/LU/error.f      |    77 -
 .../Performance/NPB/FDVMH.fdv/LU/exact.f      |    64 -
 .../Performance/NPB/FDVMH.fdv/LU/l2norm.f     |    69 -
 .../Performance/NPB/FDVMH.fdv/LU/lu.f         |   212 -
 .../Performance/NPB/FDVMH.fdv/LU/makeTODO.bat |    12 -
 .../Performance/NPB/FDVMH.fdv/LU/old/lu.fdv   |  2993 ---
 .../Performance/NPB/FDVMH.fdv/LU/pintgr.f     |   187 -
 .../NPB/FDVMH.fdv/LU/print_results.f          |   111 -
 .../Performance/NPB/FDVMH.fdv/LU/read_input.f |   115 -
 .../Performance/NPB/FDVMH.fdv/LU/rhs.f        |   420 -
 .../Performance/NPB/FDVMH.fdv/LU/rhs.f1       |   536 -
 .../Performance/NPB/FDVMH.fdv/LU/rhs.f2       |   415 -
 .../Performance/NPB/FDVMH.fdv/LU/setbv.f      |   104 -
 .../Performance/NPB/FDVMH.fdv/LU/setcoeff.f   |   166 -
 .../Performance/NPB/FDVMH.fdv/LU/setiv.f      |    82 -
 .../Performance/NPB/FDVMH.fdv/LU/ssor.f       |   765 -
 .../Performance/NPB/FDVMH.fdv/LU/timers.f     |    97 -
 .../Performance/NPB/FDVMH.fdv/LU/verify.f     |   382 -
 .../Performance/NPB/FDVMH.fdv/MG/Makefile     |    31 -
 .../NPB/FDVMH.fdv/MG/TODO_make.bat            |    12 -
 .../Performance/NPB/FDVMH.fdv/MG/comm3.fdv    |    88 -
 .../Performance/NPB/FDVMH.fdv/MG/dvmvars.h    |    57 -
 .../Performance/NPB/FDVMH.fdv/MG/globals.h    |    68 -
 .../Performance/NPB/FDVMH.fdv/MG/interp.fdv   |   169 -
 .../Performance/NPB/FDVMH.fdv/MG/mg.fdv       |   369 -
 .../Performance/NPB/FDVMH.fdv/MG/mg3p.fdv     |   167 -
 .../Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv  |    51 -
 .../Performance/NPB/FDVMH.fdv/MG/psinv.fdv    |   167 -
 .../Performance/NPB/FDVMH.fdv/MG/resid.fdv    |   196 -
 .../Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv    |   169 -
 .../Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv |   226 -
 .../NPB/FDVMH.fdv/MG/utilities.fdv            |   415 -
 .../Performance/NPB/FDVMH.fdv/MG/zran3.fdv    |   431 -
 .../Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h  |     4 -
 .../Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h |    21 -
 .../NPB/FDVMH.fdv/MG_DVM/globals.h            |    52 -
 .../NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv          |  2564 ---
 .../Performance/NPB/FDVMH.fdv/SP/Makefile     |    44 -
 .../NPB/FDVMH.fdv/SP/TODO_make.bat            |    12 -
 .../NPB/FDVMH.fdv/SP/compute_errors.for       |   116 -
 .../NPB/FDVMH.fdv/SP/compute_rhs.for          |   339 -
 .../NPB/FDVMH.fdv/SP/exact_rhs.for            |   307 -
 .../Performance/NPB/FDVMH.fdv/SP/header.h     |   120 -
 .../NPB/FDVMH.fdv/SP/initialize.for           |   189 -
 .../NPB/FDVMH.fdv/SP/print_result.for         |   121 -
 .../NPB/FDVMH.fdv/SP/set_constants.for        |   202 -
 .../Performance/NPB/FDVMH.fdv/SP/sp.for       |   231 -
 .../Performance/NPB/FDVMH.fdv/SP/timers.for   |    99 -
 .../Performance/NPB/FDVMH.fdv/SP/verify.for   |   356 -
 .../Performance/NPB/FDVMH.fdv/SP/x_solve.for  |   392 -
 .../NPB/FDVMH.fdv/SP/x_solve_mpi.for          |   321 -
 .../Performance/NPB/FDVMH.fdv/SP/y_solve.for  |   396 -
 .../NPB/FDVMH.fdv/SP/y_solve_mpi.for          |   330 -
 .../Performance/NPB/FDVMH.fdv/SP/z_solve.for  |   433 -
 .../NPB/FDVMH.fdv/SP/z_solve_mpi.for          |   338 -
 .../Performance/NPB/FDVMH.fdv/clear.bat       |    21 -
 .../Performance/NPB/FDVMH.fdv/compile.bat     |    13 -
 .../Performance/NPB/FDVMH.fdv/compile.sh      |    21 -
 .../Performance/NPB/FDVMH.fdv/compileTest.bat |    10 -
 .../Performance/NPB/FDVMH.fdv/config/make.def |     8 -
 .../NPB/FDVMH.fdv/config/make.def.bat         |     8 -
 .../Performance/NPB/FDVMH.fdv/run.bat         |    15 -
 .../Performance/NPB/FDVMH.fdv/run.sh          |    29 -
 .../Performance/NPB/FDVMH.fdv/sys/Makefile    |    14 -
 .../Performance/NPB/FDVMH.fdv/sys/make.common |    31 -
 .../Performance/NPB/FDVMH.fdv/sys/setparams.c |  1053 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile        |   106 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/add.f           |    38 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f           |    25 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f            |   330 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f          |    72 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f   |    30 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f    |   408 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/define.f        |    64 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f          |   165 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/error.f         |   107 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f     |   360 -
 .../MPI+FDVMH.fdv/BT_dvmh/exact_solution.f    |    29 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f    |   174 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f    |   307 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/header.h        |   146 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f    |   283 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f      |   125 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h        |    12 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f           |   542 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f |   202 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f     |    64 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f  |   213 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f        |   434 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h      |    14 -
 .../NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f       |  3547 ----
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile        |    23 -
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f            |  1623 --
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h        |     9 -
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h     |    40 -
 .../NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h        |     5 -
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile        |    23 -
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/README          |     6 -
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for          |   405 -
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h        |     9 -
 .../NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h     |    31 -
 .../Performance/NPB/MPI+FDVMH.fdv/clear.bat   |    21 -
 .../Performance/NPB/MPI+FDVMH.fdv/compile.bat |    13 -
 .../Performance/NPB/MPI+FDVMH.fdv/compile.sh  |    21 -
 .../NPB/MPI+FDVMH.fdv/compileTest.bat         |    10 -
 .../NPB/MPI+FDVMH.fdv/config/make_dvmh.def    |     8 -
 .../MPI+FDVMH.fdv/config/make_dvmh.def.bat    |     8 -
 .../Performance/NPB/MPI+FDVMH.fdv/run.bat     |    15 -
 .../Performance/NPB/MPI+FDVMH.fdv/run.sh      |    29 -
 .../NPB/MPI+FDVMH.fdv/sys/Makefile            |    14 -
 .../NPB/MPI+FDVMH.fdv/sys/make.common         |    31 -
 .../NPB/MPI+FDVMH.fdv/sys/setparams.c         |  1224 --
 .../trunk/test-suite/Performance/NPB/settings |     4 -
 .../trunk/test-suite/Performance/adi3d.cdv    |   100 -
 .../trunk/test-suite/Performance/adi3d.fdv    |    88 -
 .../trunk/test-suite/Performance/d_sor2d.fdv  |    65 -
 .../trunk/test-suite/Performance/d_sor3d.fdv  |    71 -
 .../trunk/test-suite/Performance/f_sor2d.fdv  |    65 -
 .../trunk/test-suite/Performance/f_sor3d.fdv  |    71 -
 .../trunk/test-suite/Performance/jac2d.cdv    |    93 -
 .../trunk/test-suite/Performance/jac2d.fdv    |    71 -
 .../trunk/test-suite/Performance/jac3d.cdv    |    96 -
 .../trunk/test-suite/Performance/jac3d.fdv    |    81 -
 .../trunk/test-suite/Performance/settings     |     3 -
 .../test-suite/Performance/test-analyzer.sh   |    74 -
 .../tools/tester/trunk/test-suite/settings    |     7 -
 433 files changed, 253782 deletions(-)
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/automation/build-and-test.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/automation/check-repo.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.config
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/automation/populate-report.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/automation/test-revision.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/configure-run.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/default-test-analyzer.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/gen-report.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/machine-config.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/perform-tests.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/report.css
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/report.js
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/task-processor.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/test-system.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/main/test-utils.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr014.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr12.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr22.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr23.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr33.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr34.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr44.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align12.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align214.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align22.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align32.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align33.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align44.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/aligndyn11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr1.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr2.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr3.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr4.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen1.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen2.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen3.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr1.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr2.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr3.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix1.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix2.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix3.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult1.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult2.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult3.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt1.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt2.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt3.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fopen11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc12.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc21.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc22.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre12.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre21.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre22.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre23.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre24.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/remove11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/rename11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/tmpfile11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal21.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal31.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal41.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel1.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel2.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel3.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel4.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus124.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus234.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus34.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign22.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign33.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign44.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red11n.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red21m.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem11.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem12.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem21.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem22.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem31.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem32.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem41.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem42.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem43.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh21.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh31.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh41.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ1.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ2.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ4.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr31.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr41.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr42.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr43.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align24.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align33.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align44.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignfloat11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus33.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons01234.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons1234.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons234.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons33.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons34.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons44.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr2.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr4.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distrfloat1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen2.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix2.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult2.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt2.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_do.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math_intel.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_select.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/module21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/type21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrderived1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect1.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect3.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal31.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal33.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel2.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel4.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus14.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus23.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus24.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus34.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf23.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf24.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf31.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf33.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf34.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf41.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf42.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf43.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf44.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf45.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf46.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign33.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign44.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red31.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red41.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red42.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red43.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda31.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda41.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda42.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda43.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem31.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem41.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem42.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem43.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh31.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh41.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh42.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha31.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha41.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha42.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha43.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc21.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc22.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc31.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc32.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc41.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc42.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ1.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ2.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ4.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/test-analyzer.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/TODO_make.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/bt.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_errors.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs_block.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_solution.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/header3d.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/initialize.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/print_result.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/set_constants.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/timers.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/verify.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_block.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_mpi.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_block.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_mpi.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_block.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_mpi.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/globals.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/make.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/print_results.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/randdp.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/timers.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/ep.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/make.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/dtime.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/global.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/make.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/applu.incl
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/domain.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/erhs.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/error.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/exact.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/l2norm.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/lu.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/makeTODO.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/old/lu.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/pintgr.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/print_results.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/read_input.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f1
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f2
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setbv.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setcoeff.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setiv.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/ssor.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/timers.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/verify.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/TODO_make.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/comm3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/dvmvars.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/globals.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/interp.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg3p.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/psinv.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/resid.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/utilities.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/zran3.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/globals.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/TODO_make.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_errors.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_rhs.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/exact_rhs.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/header.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/initialize.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/print_result.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/set_constants.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/sp.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/timers.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/verify.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve_mpi.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve_mpi.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve_mpi.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/clear.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compileTest.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/make.common
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/setparams.c
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/add.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/define.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/error.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_solution.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/header.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/README
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/clear.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compileTest.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.bat
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/Makefile
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/make.common
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/setparams.c
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor2d.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor3d.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor2d.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor3d.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.cdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.fdv
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/settings
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/test-analyzer.sh
 delete mode 100644 Sapfor/_projects/dvm/tools/tester/trunk/test-suite/settings

diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/automation/build-and-test.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/build-and-test.sh
deleted file mode 100644
index a0e04dc..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/automation/build-and-test.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-SAVE_DIR=`pwd`
-MY_DIR=$(cd "$(dirname "$(which "$0")")" && pwd)
-
-if [ "$1" = "--continue" ]; then
-    CONTINUE_FLAG=1
-    shift
-else
-    CONTINUE_FLAG=0
-fi
-ORIG_DIR="$1"
-REV_NUMBER=$2
-
-if [ -f "$SAVE_DIR/dvm-tester.config" ]; then
-    . "$SAVE_DIR/dvm-tester.config"
-fi
-
-if [ -z "$PLATFORMS" ]; then
-    exit 1
-fi
-
-if [ -z "$TEST_SUITE" ]; then
-    exit 1
-fi
-
-FULL_REP_URL="$PUBL_BASE_URL/r${REV_NUMBER}${PUBL_SUFFIX}/"
-
-TEST_SUITE=$(cd "$TEST_SUITE" && pwd)
-
-# Actually, can be taken any temporary name
-RESULTS_DIR="$ORIG_DIR.results"
-export TMPDIR="$ORIG_DIR.work"
-if [ -d "/home/scratch" ]; then
-    TEMPL_NAME="/home/scratch/$(basename "$TMPDIR").XXX"
-    TMPDIR=$(mktemp -d "$TEMPL_NAME")
-fi
-mkdir -p "$TMPDIR"
-
-# Launch task processor
-TASK_FIFO="$(mktemp -u).task-fifo"
-mkfifo "$TASK_FIFO"
-if [ $CONTINUE_FLAG -eq 0 ]; then
-    rm -rf "$RESULTS_DIR"
-fi
-mkdir -p "$RESULTS_DIR"
-cd "$SAVE_DIR"
-"$MY_DIR/task-processor.sh" "$RESULTS_DIR" <"$TASK_FIFO" &
-
-# Build DVM-systems for given platforms and sequentially feed task processor from our test-suite
-exec 4>"$TASK_FIFO"
-for platf in $PLATFORMS; do
-    WORK_DIR="$ORIG_DIR.$platf"
-    if [ $CONTINUE_FLAG -eq 0 ]; then
-        rm -rf "$WORK_DIR"
-    fi
-    if [ ! -e "$WORK_DIR" ]; then
-        cp -r "$ORIG_DIR" "$WORK_DIR"
-    fi
-    cd "$WORK_DIR/dvm_sys"
-    if [ ! -f platforms/$platf ]; then
-        if [ -f "$SAVE_DIR/$platf" ]; then
-            cp "$SAVE_DIR/$platf" platforms/
-        else
-            echo "Can not find platform $platf"
-        fi
-    fi
-    if [ -f platforms/$platf ]; then
-        PLATFORM=$platf ./dvminstall >install.log 2>& 1
-        INST_RES=$?
-        if [ $INST_RES -ne 0 -o ! -f user/dvm ]; then
-            :
-            # TODO: Handle errors with building DVM-system
-        else
-            cd "$SAVE_DIR"
-            "$MY_DIR/perform-tests.sh" "$WORK_DIR/dvm_sys" "$TEST_SUITE" 4
-        fi
-    fi
-done
-exec 4>&-
-
-# Wait for task processor to finish
-wait
-
-# Cleanup stuff
-rm "$TASK_FIFO"
-for platf in $PLATFORMS; do
-    WORK_DIR="$ORIG_DIR.$platf"
-#    rm -rf "$WORK_DIR"
-done
-
-# Generate final report
-cd "$SAVE_DIR"
-"$MY_DIR/gen-report.sh" "$TEST_SUITE" "$RESULTS_DIR" "$FULL_REP_URL" $REV_NUMBER
-
-# Publish the report and send summary e-mail
-if [ "$POPULATE_FLAG" = "1" ]; then
-    cd "$SAVE_DIR"
-    "$MY_DIR/populate-report.sh" "$RESULTS_DIR" "$REV_NUMBER"
-fi
-
-# Cleanup stuff finally
-#rm -rf "$RESULTS_DIR"
-#rm -rf "$TMPDIR"
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/automation/check-repo.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/check-repo.sh
deleted file mode 100644
index f1c9f80..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/automation/check-repo.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-unset CDPATH
-
-REPO_URL=http://svn.dvm-system.org/svn/dvmhrepo/dvm
-REPO_USER=dvmhuser
-REPO_PASS=dvmh2013
-PATHS_OF_INTEREST="cdvm/trunk cdvmh-clang/trunk driver/trunk fdvm/trunk general/examples/trunk general/platforms/trunk general/trunk rts/trunk rts-dvmh/trunk tools/pppa/trunk tools/predictor/trunk"
-
-SVN_PARAMS="--username $REPO_USER --password $REPO_PASS --non-interactive"
-
-PREV_REV=`cat latest-seen-revision`
-[ "$PREV_REV" -ge 0 ] 2>/dev/null
-if [ $? -ne 0 ]; then
-    PREV_REV=0
-fi
-
-NEW_REV=`svn info $SVN_PARAMS $REPO_URL | grep "Revision" | awk '{ print $2 }'`
-[ "$NEW_REV" -ge 1 ] 2>/dev/null
-if [ $? -ne 0 ]; then
-    NEW_REV=0
-fi
-
-# If latest-seen-revision is corrupted, then inspect only latest revision
-if [ $PREV_REV -eq 0 -a $NEW_REV -gt 0 ]; then
-    PREV_REV=$(( NEW_REV - 1 ))
-fi
-
-CUR_REV=$(( PREV_REV + 1 ))
-while [ $CUR_REV -le $NEW_REV ]; do
-    TO_TEST=1
-    COMMIT_MSG=`svn log $SVN_PARAMS --incremental -c $CUR_REV $REPO_URL | tail -n +4`
-    IS_INTERMEDIATE=`echo "$COMMIT_MSG" | grep -i "intermediate" | wc -l`
-    IS_TRIVIAL=`echo "$COMMIT_MSG" | grep -i "trivial" | wc -l`
-    IS_COSMETICS=`echo "$COMMIT_MSG" | grep -i "cosmetics" | wc -l`
-    IS_MAJOR=`echo "$COMMIT_MSG" | grep -i "major" | wc -l`
-    if [ $IS_INTERMEDIATE -ne 0 -o $IS_TRIVIAL -ne 0 -o $IS_COSMETICS -ne 0 ]; then
-        TO_TEST=0
-    elif [ $IS_MAJOR -ne 0 ]; then
-        TO_TEST=2
-    fi
-    if [ $TO_TEST -ne 0 -a -n "$PATHS_OF_INTEREST" ]; then
-        NO_TEST=1
-        for p in $PATHS_OF_INTEREST; do
-            WHAT_CHANGED=`svn diff $SVN_PARAMS --summarize -c $CUR_REV $REPO_URL/$p`
-            if [ -n "$WHAT_CHANGED" ]; then
-                NO_TEST=0
-                break
-            fi
-        done
-        if [ $NO_TEST -ne 0 ]; then
-            TO_TEST=0
-        fi
-    fi
-    if [ $TO_TEST -eq 1 ]; then
-        echo $CUR_REV >>pending-revisions
-    elif [ $TO_TEST -eq 2 ]; then
-        echo $CUR_REV >>pending-revisions-full
-    fi
-    CUR_REV=$(( CUR_REV + 1 ))
-done
-
-if [ $NEW_REV -gt 0 ]; then
-    echo $NEW_REV >latest-seen-revision
-fi
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.config b/Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.config
deleted file mode 100644
index e1ffa48..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.config
+++ /dev/null
@@ -1,19 +0,0 @@
-PLATFORMS="Titan"
-
-TEST_SUITE="test-suite"
-RECIPIENTS="krukov@keldysh.ru, bakhtin@keldysh.ru, pritmick@yandex.ru, alex-w900i@yandex.ru, valex@keldysh.ru, savol@keldysh.ru, socol@keldysh.ru, konov@keldysh.ru"
-
-REPO_BASE_URL="http://svn.dvm-system.org/svn/dvmhrepo"
-REPO_USER="dvmhuser"
-REPO_PASS="dvmh2013"
-
-LIST_SERVER="admdvm@svn.dvm-system.org"
-LIST_PATH="/home/admdvm/pending-revisions"
-
-PUBL_BASE_URL="http://svn.dvm-system.org/dvm-test-results"
-PUBL_SERVER="admdvm@svn.dvm-system.org"
-PUBL_BASE_PATH="/var/www/html/dvm-test-results"
-PUBL_SUFFIX=
-
-MAIL_SERVER="admdvm@svn.dvm-system.org"
-SENDMAIL="/usr/sbin/sendmail"
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.sh
deleted file mode 100644
index 170c256..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/automation/dvm-tester.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-
-unset CDPATH
-
-MY_DIR=$(cd "$(dirname "$(which "$0")")" && pwd)
-
-MAX_INVOCATIONS=-1
-WAIT_INTERVAL=60
-WORKING_DIR=`pwd`
-
-parse_params() {
-    while [ -n "$1" ]; do
-        if [ "$1" = "--once" ]; then
-            MAX_INVOCATIONS=1
-        elif [ "$1" = "--max-invocations" ]; then
-            MAX_INVOCATIONS=$2
-            shift
-        elif [ "$1" = "--working-dir" ]; then
-            WORKING_DIR="$2"
-            shift
-        elif [ "$1" = "--wait-interval" ]; then
-            WAIT_INTERVAL=$2
-            shift
-        fi
-        shift
-    done
-}
-
-parse_params "$@"
-
-if [ -f "$WORKING_DIR/dvm-tester.config" ]; then
-    . "$WORKING_DIR/dvm-tester.config"
-else
-    echo "No dvm-tester.config found!" >& 2
-    exit 1
-fi
-
-if [ $MAX_INVOCATIONS -lt 0 ]; then
-    INF_MODE=1
-else
-    INF_MODE=0
-fi
-
-counter=0
-while [ $INF_MODE -ne 0 -o $counter -lt $MAX_INVOCATIONS ]; do
-    while true; do
-        if [ -f "$WORKING_DIR/dvm-tester.pause" ] && [ -n "$(cat "$WORKING_DIR/dvm-tester.pause")" ]; then
-            echo "[$(date)] Paused explicitly (local)"
-        elif [ -f "$MY_DIR/dvm-tester.pause" ] && [ -n "$(cat "$MY_DIR/dvm-tester.pause")" ]; then
-            echo "[$(date)] Paused explicitly (global)"
-        elif [ $(ps aux | grep task-processor.sh | wc -l) -gt 1 ]; then
-            echo "[$(date)] Waiting existing task-processor.sh process to finish"
-        else
-            break
-        fi
-        sleep $WAIT_INTERVAL
-    done
-    echo "[$(date)] Attempting to get pending revision number"
-    REV=`ssh $LIST_SERVER "head -n 1 $LIST_PATH && tail -n +2 $LIST_PATH >$LIST_PATH.tmp && mv $LIST_PATH.tmp $LIST_PATH"`
-    echo "[$(date)] Got '$REV'"
-    if [ -z "$REV" ]; then
-        if [ $INF_MODE -ne 0 ]; then
-            sleep $WAIT_INTERVAL
-            continue
-        else
-            break
-        fi
-    fi
-    "$MY_DIR/test-revision.sh" --working-dir "$WORKING_DIR" --populate $REV
-    counter=$(( counter + 1 ))
-done
-
-echo "[$(date)] Exiting normally"
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/automation/populate-report.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/populate-report.sh
deleted file mode 100644
index ffd5c09..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/automation/populate-report.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-SAVE_DIR=`pwd`
-MY_DIR=$(cd "$(dirname "$(which "$0")")" && pwd)
-
-RESULTS_DIR="$1"
-REV_NUMBER=$2
-
-if [ -f "$SAVE_DIR/dvm-tester.config" ]; then
-    . "$SAVE_DIR/dvm-tester.config"
-fi
-
-if [ -z "$RECIPIENTS" ]; then
-    RECIPIENTS="pritmick@yandex.ru"
-fi
-
-PUBL_PATH="$PUBL_BASE_PATH/r${REV_NUMBER}${PUBL_SUFFIX}"
-COPY_PATHS="$PUBL_BASE_PATH/latest${PUBL_SUFFIX}"
-
-ssh $PUBL_SERVER "mkdir -p \"$PUBL_PATH\""
-scp "$RESULTS_DIR/report/full-report.html" "$PUBL_SERVER:$PUBL_PATH/index.html"
-scp "$RESULTS_DIR/report/sources.tgz" "$PUBL_SERVER:$PUBL_PATH/sources.tgz"
-for p in $COPY_PATHS; do
-    ssh $PUBL_SERVER "rm -rf \"$p\"; cp -r \"$PUBL_PATH\" \"$p\""
-done
-create_email()
-{
-    echo "MIME-Version: 1.0"
-    echo "Content-type: text/html;charset=UTF-8"
-    echo "From: dvm@keldysh.ru"
-    echo "To: $RECIPIENTS"
-    echo "Subject: DVM tester: Test results for revision $REV_NUMBER"
-    echo
-    cat "$1"
-    echo "."
-    echo
-}
-create_email "$RESULTS_DIR/report/brief-report.html" | ssh $MAIL_SERVER "$SENDMAIL $RECIPIENTS"
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/automation/test-revision.sh b/Sapfor/_projects/dvm/tools/tester/trunk/automation/test-revision.sh
deleted file mode 100644
index f468693..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/automation/test-revision.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-unset CDPATH
-
-MY_DIR=$(cd "$(dirname "$(which "$0")")" && pwd)
-
-POPULATE_FLAG=0
-WORKING_DIR=`pwd`
-REV=
-
-parse_params() {
-    while [ -n "$1" ]; do
-        if [ "$1" = "--working-dir" ]; then
-            WORKING_DIR="$2"
-            shift
-        elif [ "$1" = "--populate" ]; then
-            POPULATE_FLAG=1
-        else
-            REV=$1
-        fi
-        shift
-    done
-}
-
-parse_params $@
-
-if [ -z "$REV" ]; then
-    exit 1
-fi
-
-if [ -f "$WORKING_DIR/dvm-tester.config" ]; then
-    . "$WORKING_DIR/dvm-tester.config"
-else
-    exit 1
-fi
-
-REPO_URL="$REPO_BASE_URL/dvm/releases/current-trunk"
-SVN_PARAMS="--username $REPO_USER --password $REPO_PASS --non-interactive"
-
-update_test_suite() {
-    if [ -e "$TEST_SUITE/.svn" ]; then
-        ( cd "$TEST_SUITE" && svn $SVN_PARAMS update )
-    fi
-}
-
-test_revision() {
-    REV=$1
-    echo "[$(date)] Testing revision $REV"
-    SAVE_DIR=`pwd`
-    WORK_DIR="$WORKING_DIR/dvm_r$REV"
-    rm -rf "$WORK_DIR"
-    svn co $SVN_PARAMS -r $REV "$REPO_URL" "$WORK_DIR" >/dev/null
-    SVN_RES=$?
-    while [ $SVN_RES -ne 0 ]; do
-        sleep 1
-        rm -rf "$WORK_DIR"
-        svn co $SVN_PARAMS -r $REV "$REPO_URL" "$WORK_DIR" >/dev/null
-        SVN_RES=$?
-    done
-    cd "$WORK_DIR"
-    TMP_FILE=`mktemp`
-    svn propget svn:externals >$TMP_FILE
-    SVN_RES=$?
-    while [ $SVN_RES -ne 0 ]; do
-        svn propget svn:externals >$TMP_FILE
-        SVN_RES=$?
-    done
-    CHILDREN=`cat $TMP_FILE | sed '/^$/d' | awk '{print $(NF)}'`
-    rm $TMP_FILE
-    for d in $CHILDREN; do
-        cd "$WORK_DIR/$d"
-        svn up $SVN_PARAMS -r $REV >/dev/null
-        SVN_RES=$?
-        while [ $SVN_RES -ne 0 ]; do
-            sleep 1
-            svn cleanup $SVN_PARAMS
-            svn up $SVN_PARAMS -r $REV >/dev/null
-            SVN_RES=$?
-        done
-    done
-    rm -rf "$WORK_DIR.tmp"
-    mv "$WORK_DIR" "$WORK_DIR.tmp"
-    svn export "$WORK_DIR.tmp" "$WORK_DIR" >/dev/null
-    SVN_RES=$?
-    while [ $SVN_RES -ne 0 ]; do
-        sleep 1
-        rm -rf "$WORK_DIR"
-        svn export "$WORK_DIR.tmp" "$WORK_DIR" >/dev/null
-        SVN_RES=$?
-    done
-    rm -rf "$WORK_DIR.tmp"
-    cd "$WORKING_DIR"
-    POPULATE_FLAG=$POPULATE_FLAG "$MY_DIR/build-and-test.sh" "$WORK_DIR" $REV
-    echo "[$(date)] Testing revision $REV done"
-#    rm -rf "$WORK_DIR"
-    cd "$SAVE_DIR"
-}
-
-update_test_suite
-test_revision $REV
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/configure-run.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/configure-run.sh
deleted file mode 100644
index 857c890..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/configure-run.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# Common part
-MAX_PPN=60
-MAX_CPU_SHARING_FACTOR=4
-MAX_CUDA_SHARING_FACTOR=16
-
-# Default
-NODE_COUNT=1
-MAX_NODES_PER_TASK=1
-INTERACTIVE=1
-HAS_RES_MANAGER=0
-
-# Specializations
-if [ `hostname` = "k100" ]; then
-    NODE_COUNT=64
-    MAX_NODES_PER_TASK=8
-    INTERACTIVE=0
-    # Since launch isn't interactive - one must provide is_launched, is_finished, get_elapsed_time, stdout_fn, stderr_fn calls
-    get_task_dir() {
-        local n
-        for n in 1 2 3 4 5 6 7 8 9; do
-            if [ -d "$1.$n" ]; then
-                printf %s "$1.$n"
-                return
-            fi
-        done
-        printf %s "$1"
-    }
-    is_launched() {
-        local STDOUT_FN
-        STDOUT_FN="$1"
-        local STDERR_FN
-        STDERR_FN="$2"
-        # Add handling for refuses from SUPPZ
-        echo 1
-    }
-    is_finished() {
-        if [ "$(tail -n 1 $(get_task_dir "$1")/manager.log)" = "Exiting..." ]; then
-            echo 1
-        else
-            echo 0
-        fi
-    }
-    get_elapsed_time() {
-        local da
-        local mo
-        local ye
-        local dat
-        local tim
-        local sec1
-        local sec2
-        local task_dir
-        task_dir="$(get_task_dir "$1")"
-        dat=`grep "started at" <"$task_dir/manager.log" | awk '{print $5}' | sed 's/\./ /g'`
-        tim=`grep "started at" <"$task_dir/manager.log" | awk '{print $6}'`
-        da=`echo "$dat" | awk '{print $1}'`
-        mo=`echo "$dat" | awk '{print $2}'`
-        ye=`echo "$dat" | awk '{print $3}'`
-        dat="$ye-$mo-$da $tim"
-        sec1=`date -d "$dat" +%s`
-        dat=`grep "done at" <"$task_dir/manager.log" | awk '{print $6}' | sed 's/\./ /g'`
-        tim=`grep "done at" <"$task_dir/manager.log" | awk '{print $7}'`
-        da=`echo "$dat" | awk '{print $1}'`
-        mo=`echo "$dat" | awk '{print $2}'`
-        ye=`echo "$dat" | awk '{print $3}'`
-        dat="$ye-$mo-$da $tim"
-        sec2=`date -d "$dat" +%s`
-        echo $(( sec2 - sec1 ))
-    }
-    stdout_fn() {
-        echo "$(get_task_dir "$1")/output"
-    }
-    stderr_fn() {
-        echo "$(get_task_dir "$1")/errors"
-    }
-    HAS_RES_MANAGER=1
-    # Since machine has resource manager (task queue) - one must provide can_launch call
-    can_launch() {
-        if [ `mps 2>/dev/null | tail -n +3 | wc -l` -lt 6 ]; then
-            echo 1
-        else
-            echo 0
-        fi
-    }
-fi
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/default-test-analyzer.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/default-test-analyzer.sh
deleted file mode 100644
index 49123ff..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/default-test-analyzer.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-# Requires variables: LAUNCH_EXIT_CODE, STDERR_FN
-# Produces variables: TEST_PASSED, RESULT_COMMENT, ERROR_LEVEL
-
-if [ `grep -E 'Assertion' <"$STDERR_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Assertion failed"
-    ERROR_LEVEL=3
-elif [ `grep -E 'RTS fatal' <"$STDERR_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="RTS fatal"
-    ERROR_LEVEL=2
-elif [ `grep -E 'RTS err' <"$STDERR_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="RTS err"
-    ERROR_LEVEL=1
-elif [ $LAUNCH_EXIT_CODE -ne 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Launch failure"
-    ERROR_LEVEL=4
-else
-    TEST_PASSED=1
-    RESULT_COMMENT="OK"
-    ERROR_LEVEL=0
-fi
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/gen-report.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/gen-report.sh
deleted file mode 100644
index 3268fda..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/gen-report.sh
+++ /dev/null
@@ -1,348 +0,0 @@
-#!/bin/bash
-# Bash is required due to usage of associative arrays
-
-MY_DIR=$(cd "$(dirname "$(which "$0")")" && pwd)
-SAVE_DIR=`pwd`
-
-TEST_SUITE="$1"
-RESULTS_DIR="$2"
-FULL_REP_URL="$3"
-REV_NUMBER=$4
-
-if [ -z "$FULL_REP_URL" ]; then
-    FULL_REP_URL="full-report.html"
-fi
-
-if [ -z "$REV_NUMBER" ]; then
-    REV_NUMBER=UNKNOWN
-fi
-
-MAX_LONELY_OK=50
-REPORT_DIR="$RESULTS_DIR/report"
-rm -rf "$REPORT_DIR"
-RES_FILES=`mktemp`
-find "$RESULTS_DIR" -mindepth 1 -type f | LC_ALL=C sort >$RES_FILES
-BUGGY_FILE_DIR="$REPORT_DIR/sources"
-mkdir -p "$BUGGY_FILE_DIR"
-REPORT_FILE="$REPORT_DIR/brief-report.html"
-FULL_REPORT_FILE="$REPORT_DIR/full-report.html"
-
-COL_COUNT=2
-PLATFORMS=
-HAS_SUBTESTS=0
-TOTAL_LAUNCHES=0
-TOTAL_ERROR_LAUNCHES=0
-
-while IFS= read -r f; do
-    CUR_DEPTH=0
-    TEST_SHORT_PATH=`basename "$f" .result`
-    TMPSTR=`dirname "$f"`
-    while [ "$TMPSTR" != "$RESULTS_DIR" ]; do
-        CUR_DEPTH=$(( $CUR_DEPTH + 1 ))
-        TEST_SHORT_PATH="$(basename "$TMPSTR")/$TEST_SHORT_PATH"
-        TMPSTR=`dirname "$TMPSTR"`
-    done
-    IS_SUBTEST=0
-    if [ ! -e "$TEST_SUITE/$TEST_SHORT_PATH" ]; then
-        HAS_SUBTESTS=1
-        IS_SUBTEST=1
-    fi
-    if [ $(( CUR_DEPTH + 2 )) -gt $COL_COUNT ]; then
-        COL_COUNT=$(( $CUR_DEPTH + 2 ))
-    fi
-    if [ $IS_SUBTEST -eq 0 ]; then
-        while IFS= read -r lin; do
-            eval $lin
-            if [ -z "$PLATFORMS" ]; then
-                PLATFORMS=$PLATFORM
-            else
-                FOUND_FLAG=0
-                for platf in $PLATFORMS; do
-                    if [ $platf = $PLATFORM ]; then
-                        FOUND_FLAG=1
-                    fi
-                done
-                if [ $FOUND_FLAG -eq 0 ]; then
-                    PLATFORMS="$PLATFORMS $PLATFORM"
-                fi
-            fi
-            TOTAL_LAUNCHES=$(( $TOTAL_LAUNCHES + 1 ))
-            if [ "$ERROR_LEVEL" != "0" ]; then
-                TOTAL_ERROR_LAUNCHES=$(( $TOTAL_ERROR_LAUNCHES + 1 ))
-            fi
-        done <"$f"
-    fi
-done <$RES_FILES
-
-CAT_COUNT=$(( COL_COUNT - 1 - HAS_SUBTESTS - 1 ))
-
-exec 5>"$REPORT_FILE"
-exec 6>"$FULL_REPORT_FILE"
-
-echo "<html>" >& 5
-echo "<html>" >& 6
-echo "<head>" >& 5
-echo "<head>" >& 6
-echo "<title>Test results for DVM-system. Revision $REV_NUMBER.</title>" >& 5
-echo "<title>Test results for DVM-system. Revision $REV_NUMBER.</title>" >& 6
-echo "<style>" >& 6
-cat "$MY_DIR/report.css" >& 6
-echo "</style>" >& 6
-echo "<script type='text/javascript'>" >& 6
-cat "$MY_DIR/report.js" >& 6
-echo "</script>" >& 6
-echo "</head>" >& 5
-echo "</head>" >& 6
-echo "<body>" >& 5
-echo "<body>" >& 6
-echo "<h1 align=center>Test results for DVM-system. Revision $REV_NUMBER.</h1>" >& 5
-echo "<h1 align=center>Test results for DVM-system. Revision $REV_NUMBER.</h1>" >& 6
-echo "<h2 align=center>Tested on platforms: $PLATFORMS.</h2>" >& 5
-echo "<h2 align=center>Tested on platforms: $PLATFORMS.</h2>" >& 6
-echo "<h3 align=center>Full report can be seen on <a href='$FULL_REP_URL'>$FULL_REP_URL</a></h3>" >& 5
-echo "<p align=center>Launches with errors: $TOTAL_ERROR_LAUNCHES / $TOTAL_LAUNCHES</p>" >& 5
-echo "<p align=center>Launches with errors: $TOTAL_ERROR_LAUNCHES / $TOTAL_LAUNCHES</p>" >& 6
-echo "<h3 align=center><a href='sources.tgz'>Download sources of buggy tests</a></h3>" >& 6
-echo "<table border=1 cellspacing=0 align=center>" >& 5
-echo "<table border=1 cellspacing=0 align=center>" >& 6
-echo "<tr>" >& 5
-echo "<tr>" >& 6
-CUR_COL=0
-while [ $CUR_COL -lt $CAT_COUNT ]; do
-    echo "<th align=center>Category</th>" >& 5
-    echo "<th>Category</th>" >& 6
-    CUR_COL=$(( CUR_COL + 1 ))
-done
-echo "<th align=center>Test name</th>" >& 5
-echo "<th>Test name</th>" >& 6
-if [ $HAS_SUBTESTS -ne 0 ]; then
-    echo "<th>Subtest</th>" >& 6
-fi
-echo "<th align=center>Test result</th>" >& 5
-echo "<th>Test result</th>" >& 6
-echo "</tr>" >& 5
-echo "</tr>" >& 6
-
-output_cat_recursive()
-{
-    if [ `basename "$1"` != "$1" ]; then
-        output_cat_recursive `dirname "$1"`
-    fi
-    if [ $TO_BRIEF -ne 0 ]; then
-        echo "<td align=center>" >& 5
-        basename "$1" >& 5
-        echo "</td>" >& 5
-    fi
-    echo "<td>" >& 6
-    basename "$1" >& 6
-    echo "</td>" >& 6
-    FILLED_COLS=$(( FILLED_COLS + 1 ))
-    if [ $FILLED_COLS -eq 1 -a `basename "$1"` = "Performance" ]; then
-        FORCE_TABLE=1
-    fi
-}
-
-output_cat()
-{
-    FILLED_COLS=0
-    output_cat_recursive "$1"
-    while [ $FILLED_COLS -lt $CAT_COUNT ]; do
-        if [ $TO_BRIEF -ne 0 ]; then
-            echo "<td>&nbsp;</td>" >& 5
-        fi
-        echo "<td>&nbsp;</td>" >& 6
-        FILLED_COLS=$(( FILLED_COLS + 1 ))
-    done
-}
-
-nextDetailsId=1
-
-while IFS= read -r f; do
-    CUR_DEPTH=0
-    TEST_SHORT_PATH=`basename "$f" .result`
-    TMPSTR=`dirname "$f"`
-    while [ "$TMPSTR" != "$RESULTS_DIR" ]; do
-        CUR_DEPTH=$(( $CUR_DEPTH + 1 ))
-        TEST_SHORT_PATH="$(basename "$TMPSTR")/$TEST_SHORT_PATH"
-        TMPSTR=`dirname "$TMPSTR"`
-    done
-    SUBTEST_NAME=
-    if [ ! -e "$TEST_SUITE/$TEST_SHORT_PATH" ]; then
-        SUBTEST_NAME=`basename "$TEST_SHORT_PATH"`
-        TEST_SHORT_PATH=`dirname "$TEST_SHORT_PATH"`
-    fi
-    HAS_FAILS=0
-    if [ `grep "TEST_PASSED=0" <"$f" | wc -l` -gt 0 ]; then
-        HAS_FAILS=1
-        if [ ! -e "$BUGGY_FILE_DIR/$TEST_SHORT_PATH" ]; then
-            mkdir -p `dirname "$BUGGY_FILE_DIR/$TEST_SHORT_PATH"`
-            cp -ur "$TEST_SUITE/$TEST_SHORT_PATH" "$BUGGY_FILE_DIR/$TEST_SHORT_PATH"
-        fi
-    fi
-    TO_BRIEF=1
-    if [ -n "$SUBTEST_NAME" -o $HAS_FAILS -eq 0 ]; then
-        TO_BRIEF=0
-    fi
-    if [ $TO_BRIEF -ne 0 ]; then
-        echo "<tr>" >& 5
-    fi
-    echo "<tr>" >& 6
-    FORCE_TABLE=0
-    output_cat `dirname "$TEST_SHORT_PATH"`
-    if [ $TO_BRIEF -ne 0 ]; then
-        echo "<td align=center>" >& 5
-        echo `basename "$TEST_SHORT_PATH"` >& 5
-        echo "</td>" >& 5
-    fi
-    if [ -n "$SUBTEST_NAME" ]; then
-        echo "<td>" >& 6
-        echo `basename "$TEST_SHORT_PATH"` >& 6
-        echo "</td>" >& 6
-        echo "<td>" >& 6
-        echo "$SUBTEST_NAME" >& 6
-        echo "</td>" >& 6
-    else
-        echo "<td colspan=$((1 + HAS_SUBTESTS))>" >& 6
-        echo `basename "$TEST_SHORT_PATH"` >& 6
-        echo "</td>" >& 6
-    fi
-    ERROR_LEVELS=$(
-    while IFS= read -r lin; do
-        eval $lin
-        if [ -z "$ERROR_LEVEL" ]; then
-            ERROR_LEVEL=0
-        fi
-        echo $ERROR_LEVEL
-    done <"$f" | sort -unr)
-    if [ $TO_BRIEF -ne 0 ]; then
-        echo "<td align=center>" >& 5
-    fi
-    echo "<td>" >& 6
-    LAUNCH_COUNT=`wc -l <"$f"`
-#    echo "$LAUNCH_COUNT total" >& 5
-#    echo "$LAUNCH_COUNT total" >& 6
-    if [ -n "$ERROR_LEVELS" ]; then
-        for el in $ERROR_LEVELS; do
-            unset countByComment
-            unset passedByComment
-            declare -A countByComment
-            declare -A passedByComment
-            while IFS= read -r lin; do
-                eval $lin
-                if [ -z "$ERROR_LEVEL" ]; then
-                    ERROR_LEVEL=0
-                fi
-                if [ "$ERROR_LEVEL" = "$el" ]; then
-                    if [ -z "${countByComment["$RESULT_COMMENT"]}" ]; then
-                        countByComment["$RESULT_COMMENT"]=0
-                    fi
-                    countByComment["$RESULT_COMMENT"]=$(( countByComment["$RESULT_COMMENT"] + 1 ))
-                    passedByComment["$RESULT_COMMENT"]=$TEST_PASSED
-                fi
-            done <"$f"
-            for cmt in "${!countByComment[@]}"; do
-                if [ ${passedByComment["$cmt"]} -ne 0 ]; then
-                    DIV_CLASS=passed
-                    DIV_COLOR=green
-                else
-                    DIV_CLASS=failed
-                    DIV_COLOR=red
-                fi
-                if [ $TO_BRIEF -ne 0 ]; then
-                    echo "<div style='color: $DIV_COLOR'>" >& 5
-                    echo "${countByComment[$cmt]} $cmt" >& 5
-                    echo "</div>" >& 5
-                fi
-                echo "<div class=$DIV_CLASS>" >& 6
-                if [ $HAS_FAILS -ne 0 -o $LAUNCH_COUNT -le $MAX_LONELY_OK -o $FORCE_TABLE -ne 0 ]; then
-                    echo "<a href='#' class='details $DIV_CLASS' onclick='{ toggleElem(\"det$nextDetailsId\"); return false; }'>" >& 6
-                    echo "<span class=details>${countByComment[$cmt]} $cmt</span>" >& 6
-                    echo "</a>" >& 6
-                    echo "<table border=1 cellspacing=0 class=details$FORCE_TABLE id='det$nextDetailsId'>" >& 6
-                    echo "<tr>" >& 6
-                    echo "<th>Platform</th>" >& 6
-                    echo "<th>noH</th>" >& 6
-                    echo "<th>autoTfm</th>" >& 6
-                    echo "<th>Grid</th>" >& 6
-                    echo "<th>CPUs</th>" >& 6
-                    echo "<th>GPUs</th>" >& 6
-                    echo "<th>Time</th>" >& 6
-                    echo "</tr>" >& 6
-                    while IFS= read -r lin; do
-                        eval $lin
-                        if [ -z "$ERROR_LEVEL" ]; then
-                            ERROR_LEVEL=0
-                        fi
-                        if [ "$ERROR_LEVEL" = "$el" -a "$RESULT_COMMENT" = "$cmt" ]; then
-                            echo "<tr>" >& 6
-                            echo "<td>$PLATFORM</td>" >& 6
-                            if [ $NOH_FLAG -ne 0 ]; then
-                                echo "<td>+</td>" >& 6
-                            else
-                                echo "<td>-</td>" >& 6
-                            fi
-                            if [ $AUTOTFM_FLAG -ne 0 ]; then
-                                echo "<td>+</td>" >& 6
-                            else
-                                echo "<td>-</td>" >& 6
-                            fi
-                            if [ -n "$PROC_GRID" ]; then
-                                echo "<td>$PROC_GRID</td>" >& 6
-                            else
-                                echo "<td>N/A</td>" >& 6
-                            fi
-                            if [ -n "$CPUS_PER_PROC" ]; then
-                                echo "<td>$CPUS_PER_PROC</td>" >& 6
-                            else
-                                echo "<td>N/A</td>" >& 6
-                            fi
-                            if [ -n "$CUDAS_PER_PROC" ]; then
-                                echo "<td>$CUDAS_PER_PROC</td>" >& 6
-                            else
-                                echo "<td>N/A</td>" >& 6
-                            fi
-                            if [ -n "$CALC_TIME" ]; then
-                                echo "<td>$CALC_TIME</td>" >& 6
-                            else
-                                echo "<td>N/A</td>" >& 6
-                            fi
-                            echo "</tr>" >& 6
-                        fi
-                    done <"$f"
-                    echo "</table>" >& 6
-                    nextDetailsId=$(( nextDetailsId + 1 ))
-                else
-                    echo "${countByComment[$cmt]} $cmt" >& 6
-                fi
-                echo "</div>" >& 6
-            done
-        done
-    else
-        if [ $TO_BRIEF -ne 0 ]; then
-            echo "&nbsp;" >& 5
-        fi
-        echo "&nbsp;" >& 6
-    fi
-    if [ $TO_BRIEF -ne 0 ]; then
-        echo "</td>" >& 5
-        echo "</tr>" >& 5
-    fi
-    echo "</td>" >& 6
-    echo "</tr>" >& 6
-done <$RES_FILES
-
-echo "</table>" >& 5
-echo "</table>" >& 6
-echo "</body>" >& 5
-echo "</body>" >& 6
-echo "</html>" >& 5
-echo "</html>" >& 6
-
-exec 5>&-
-exec 6>&-
-
-cd "$REPORT_DIR"
-tar -czf "sources.tgz" "sources"
-cd "$SAVE_DIR"
-
-rm $RES_FILES
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/machine-config.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/machine-config.sh
deleted file mode 100644
index 5b3e82f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/machine-config.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-# Default
-# Assuming several identical processors and not counting HT cores
-CPUS_PER_NODE=$(( `cat /proc/cpuinfo | grep "cpu cores" | LC_ALL=C sort | uniq | awk '{ print $4 }'` * `cat /proc/cpuinfo | grep "physical id" | LC_ALL=C sort | uniq | wc -l` ))
-which nvidia-smi >/dev/null 2>& 1
-if [ $? -eq 0 ]; then
-    CUDAS_PER_NODE=`nvidia-smi -L 2>/dev/null | wc -l`
-else
-    CUDAS_PER_NODE=0
-fi
-
-# Specializations
-if [ `hostname` = "k100" ]; then
-    CPUS_PER_NODE=12
-    CUDAS_PER_NODE=3
-fi
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/perform-tests.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/perform-tests.sh
deleted file mode 100644
index 50724bf..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/perform-tests.sh
+++ /dev/null
@@ -1,352 +0,0 @@
-#!/bin/bash
-# Bash is required due to usage of arrays
-
-SAVE_DIR=`pwd`
-MY_DIR=$(cd "$(dirname "$(which "$0")")" && pwd)
-
-DVMSYS_DIR="$1"
-TEST_SUITE="$2"
-TASK_PROCESSOR_FD=$3
-
-. "$MY_DIR/machine-config.sh"
-
-if [ -f "$SAVE_DIR/machine-config.sh" ]; then
-    . "$SAVE_DIR/machine-config.sh"
-fi
-
-. "$MY_DIR/test-utils.sh"
-
-PLATFORM_CMD=$(grep "PLATFORM=" <"$DVMSYS_DIR/bin/dvm_settings.sh" | sed -s 's/export //g')
-eval $PLATFORM_CMD
-
-SETTINGS_FILE=settings
-ANALYZER_FILE=test-analyzer.sh
-
-prepare_new_dir() {
-    local TASK_DIR
-    TASK_DIR=`mktemp -d`
-    local COMP_OPTS
-    COMP_OPTS="$1"
-    local COMPILE_PID
-    local COMPILE_RES
-    cd "$TASK_DIR"
-    echo "#!/bin/sh" >dvm
-    echo "export dvmarithmloopsize=1000000" >>dvm
-    echo "exec '$DVMSYS_DIR/bin/dvm_drv' \"\$@\"" >>dvm
-    chmod a+x dvm
-    cp "$DVMSYS_DIR/user/usr.par" ./
-    set -m
-    if [ -f "$TEST_FILE" ]; then
-        cp "$TEST_FILE" "$TEST_NAME"
-        ./dvm $LANG_COMP -shared-dvm $COMP_OPTS "$TEST_NAME" >"build.log" 2>& 1 &
-        COMPILE_PID=$!
-    else
-        find "$TEST_FILE" -mindepth 1 -maxdepth 1 | xargs cp -r -t .
-        PATH="$TASK_DIR:$PATH" ./compile.sh $COMP_OPTS >"build.log" 2>& 1 &
-        COMPILE_PID=$!
-    fi
-    proc_killer -$COMPILE_PID 600 &
-    KILLER_PID=$!
-    disown
-    wait $COMPILE_PID
-    COMPILE_RES=$?
-    kill -2 $KILLER_PID >/dev/null 2>& 1
-    kill -15 $KILLER_PID >/dev/null 2>& 1
-    kill -9 $KILLER_PID >/dev/null 2>& 1
-    if [ ! -f "$TEST_FILE" ] && [ $COMPILE_RES -eq 0 ] && [ ! -f "$TEST_EXENAME" ]; then
-        :> "$TEST_EXENAME"
-    fi
-    echo "$TASK_DIR"
-}
-
-do_test() {
-    TEST_FILE="$1"
-    TEST_NAME=`basename "$TEST_FILE"`
-    TEST_SHORT_PATH="$TEST_NAME"
-    TMPSTR=`dirname $TEST_FILE`
-    while [ "$TMPSTR" != "$TEST_SUITE" ]; do
-        TEST_SHORT_PATH="$(basename $TMPSTR)/$TEST_SHORT_PATH"
-        TMPSTR=`dirname $TMPSTR`
-    done
-    TEST_EXENAME="${TEST_NAME%.*}"
-    case ${TEST_NAME##*.} in
-        c|cdv) IS_FORTRAN=0;;
-        f|f90|fdv) IS_FORTRAN=1;;
-    esac
-    if [ $IS_FORTRAN -ne 0 ]; then
-        LANG_COMP="f"
-    else
-        LANG_COMP="c"
-    fi
-    TEST_DIMS=
-    if [ -n "$DIMENSION_COUNT" ]; then
-        TEST_DIMS=$DIMENSION_COUNT
-    else
-        for t in $DIMENSION_MAP; do
-            FN=`echo $t | sed 's/=/ /g' | awk '{print $1}'`
-            DIM=`echo $t | sed 's/=/ /g' | awk '{print $2}'`
-            if [ "$FN" = "$TEST_NAME" ]; then
-                TEST_DIMS=$DIM
-                break
-            fi
-        done
-    fi
-    if [ -z "$TEST_DIMS" ]; then
-        # Trying to extract dimension number from filename - it is first digit in it.
-        TEST_DIMS=`echo "$TEST_EXENAME" | sed 's/[^0-9]//g' | cut -c1`
-    fi
-    if [ -z "$TEST_DIMS" ]; then
-        echo "Can not find information about dimension count for test $TEST_FILE" >& 2
-        TEST_DIMS=1
-    fi
-    if [ $MAX_DIM_PROC_COUNT -le 0 ]; then
-        MAX_DIM_PROC_COUNT=$MAX_PROC_COUNT
-    fi
-    while true; do
-        if [ -f "$SAVE_DIR/dvm-tester.pause" ] && [ "$(cat "$SAVE_DIR/dvm-tester.pause")" = "Immediate" ]; then
-            echo "Paused explicitly (local)"
-        elif [ -f "$MY_DIR/dvm-tester.pause" ] && [ "$(cat "$MY_DIR/dvm-tester.pause")" = "Immediate" ]; then
-            echo "Paused explicitly (global)"
-        else
-            break
-        fi
-        sleep 60
-    done
-    echo "Compiling $TEST_SHORT_PATH on $PLATFORM platform"
-    if [ $GPU_ONLY -eq 0 ]; then
-        # Compile with noH
-        NOH_DIR=`prepare_new_dir "-noH"`
-        if [ -f "$NOH_DIR/$TEST_EXENAME" ]; then
-            ISSUE_NOH=1
-        else
-            ISSUE_NOH=0
-        fi
-    fi
-    if [ $DVM_ONLY -eq 0 ]; then
-        # Compile without noH
-        H_DIR=`prepare_new_dir ""`
-        if [ -f "$H_DIR/$TEST_EXENAME" ]; then
-            ISSUE_H=1
-        else
-            ISSUE_H=0
-        fi
-        # And with autoTfm
-        AUTOTFM_DIR=`prepare_new_dir "-autoTfm"`
-        if [ -f "$AUTOTFM_DIR/$TEST_EXENAME" ]; then
-            ISSUE_AUTOTFM=1
-        else
-            ISSUE_AUTOTFM=0
-        fi
-    fi
-#    cat "$H_DIR/build.log"
-    echo "Generating tasks for $TEST_SHORT_PATH with $TEST_DIMS dimensions on $PLATFORM platform"
-    COMMON_PART=$(
-        echo -n "TASK_TYPE=1"
-        echo -n " TEST_PLATFORM=$PLATFORM"
-        echo -n " SHARE_RESOURCES=$SHARE_RESOURCES"
-        echo -n " TEST_ANALYZER=\"$TEST_ANALYZER\""
-        echo -n " TEST_SHORT_PATH=\"$TEST_SHORT_PATH\""
-        echo -n " TASK_EXE=\"$TEST_EXENAME\""
-        echo -n " TEST_MAX_TIME=$MAX_TIME"
-    )
-    # Additional size number 0 added
-    i=0
-    while [ $i -le $TEST_DIMS ]; do
-        sizes[$i]=1
-        i=$(( i + 1 ))
-    done
-    counter=0
-    totalSize=1
-    while [ $(( sizes[0] )) -eq 1 ]; do
-        PROC_GRID=
-        if [ $IS_FORTRAN -eq 0 ]; then
-            i=1
-            while [ $i -le $TEST_DIMS ]; do
-                PROC_GRID="$PROC_GRID $((sizes[i]))"
-                i=$(( i + 1 ))
-            done
-        else
-            i=$TEST_DIMS
-            while [ $i -ge 1 ]; do
-                PROC_GRID="$PROC_GRID $((sizes[i]))"
-                i=$(( i - 1 ))
-            done
-        fi
-        if [ $GPU_ONLY -eq 0 ]; then
-            if [ $ISSUE_NOH -ne 0 ]; then
-                echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-                echo -n " TASK_DIR=\"$NOH_DIR\"" >&$TASK_PROCESSOR_FD
-                echo -n " TASK_NOH_FLAG=1" >&$TASK_PROCESSOR_FD
-                echo -n " CPUS_PER_PROC=1" >&$TASK_PROCESSOR_FD
-                echo -n " PROC_GRID=\"$PROC_GRID\"" >&$TASK_PROCESSOR_FD
-                counter=$(( counter + 1 ))
-                echo >&$TASK_PROCESSOR_FD
-            fi
-        fi
-        if [ $DVM_ONLY -eq 0 ]; then
-            # Single-device and single-threaded configurations
-            if [ $GPU_ONLY -eq 0 ]; then
-                if [ $ISSUE_H -ne 0 ]; then
-                    echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-                    echo -n " TASK_DIR=\"$H_DIR\"" >&$TASK_PROCESSOR_FD
-                    echo -n " CPUS_PER_PROC=1" >&$TASK_PROCESSOR_FD
-                    echo -n " PROC_GRID=\"$PROC_GRID\"" >&$TASK_PROCESSOR_FD
-                    counter=$(( counter + 1 ))
-                    echo >&$TASK_PROCESSOR_FD
-                fi
-            fi
-            if [ $CUDAS_PER_NODE -gt 0 ]; then
-                if [ $ISSUE_H -ne 0 ]; then
-                    echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-                    echo -n " TASK_DIR=\"$H_DIR\"" >&$TASK_PROCESSOR_FD
-                    echo -n " CUDAS_PER_PROC=1" >&$TASK_PROCESSOR_FD
-                    echo -n " PROC_GRID=\"$PROC_GRID\"" >&$TASK_PROCESSOR_FD
-                    counter=$(( counter + 1 ))
-                    echo >&$TASK_PROCESSOR_FD
-                fi
-                if [ $ISSUE_AUTOTFM -ne 0 ]; then
-                    echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-                    echo -n " TASK_DIR=\"$AUTOTFM_DIR\"" >&$TASK_PROCESSOR_FD
-                    echo -n " TASK_AUTOTFM_FLAG=1" >&$TASK_PROCESSOR_FD
-                    echo -n " CUDAS_PER_PROC=1" >&$TASK_PROCESSOR_FD
-                    echo -n " PROC_GRID=\"$PROC_GRID\"" >&$TASK_PROCESSOR_FD
-                    counter=$(( counter + 1 ))
-                    echo >&$TASK_PROCESSOR_FD
-                fi
-            fi
-            # Multi-device and multi-threaded configurations
-            MAX_DEVS_PER_PROC=$((sizes[1]))
-            DEVS_PER_PROC=2
-            while [ $DEVS_PER_PROC -le $MAX_DEVS_PER_PROC ]; do
-                if [ $(( MAX_DEVS_PER_PROC % DEVS_PER_PROC )) -ne 0 ]; then
-                    DEVS_PER_PROC=$(( $DEVS_PER_PROC + 1 ))
-                    continue
-                fi
-                if [ $IS_FORTRAN -eq 0 ]; then
-                    MD_PROC_GRID=" $((MAX_DEVS_PER_PROC / DEVS_PER_PROC))"
-                    i=2
-                    while [ $i -le $TEST_DIMS ]; do
-                        MD_PROC_GRID="$MD_PROC_GRID $((sizes[i]))"
-                        i=$(( i + 1 ))
-                    done
-                else
-                    MD_PROC_GRID=
-                    i=$TEST_DIMS
-                    while [ $i -ge 2 ]; do
-                        MD_PROC_GRID="$MD_PROC_GRID $((sizes[i]))"
-                        i=$(( i - 1 ))
-                    done
-                    MD_PROC_GRID="$MD_PROC_GRID $((MAX_DEVS_PER_PROC / DEVS_PER_PROC))"
-                fi
-                if [ $GPU_ONLY -eq 0 ]; then
-                    if [ $ISSUE_H -ne 0 ]; then
-                        echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-                        echo -n " TASK_DIR=\"$H_DIR\"" >&$TASK_PROCESSOR_FD
-                        echo -n " CPUS_PER_PROC=$DEVS_PER_PROC" >&$TASK_PROCESSOR_FD
-                        echo -n " PROC_GRID=\"$MD_PROC_GRID\"" >&$TASK_PROCESSOR_FD
-                        counter=$(( counter + 1 ))
-                        echo >&$TASK_PROCESSOR_FD
-                    fi
-                fi
-                if [ $ALLOW_MULTIDEV -ne 0 ] && [ $CUDAS_PER_NODE -gt 0 ]; then
-                    for ((GPUS_PER_PROC=1; GPUS_PER_PROC<=$DEVS_PER_PROC; GPUS_PER_PROC++)); do
-                        if [ $ISSUE_H -ne 0 ]; then
-                            echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-                            echo -n " TASK_DIR=\"$H_DIR\"" >&$TASK_PROCESSOR_FD
-                            echo -n " CPUS_PER_PROC=$(($DEVS_PER_PROC - $GPUS_PER_PROC))" >&$TASK_PROCESSOR_FD
-                            echo -n " CUDAS_PER_PROC=$GPUS_PER_PROC" >&$TASK_PROCESSOR_FD
-                            echo -n " PROC_GRID=\"$MD_PROC_GRID\"" >&$TASK_PROCESSOR_FD
-                            counter=$(( counter + 1 ))
-                            echo >&$TASK_PROCESSOR_FD
-                        fi
-                        if [ $ISSUE_AUTOTFM -ne 0 ]; then
-                            echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-                            echo -n " TASK_DIR=\"$AUTOTFM_DIR\"" >&$TASK_PROCESSOR_FD
-                            echo -n " TASK_AUTOTFM_FLAG=1" >&$TASK_PROCESSOR_FD
-                            echo -n " CPUS_PER_PROC=$(($DEVS_PER_PROC - $GPUS_PER_PROC))" >&$TASK_PROCESSOR_FD
-                            echo -n " CUDAS_PER_PROC=$GPUS_PER_PROC" >&$TASK_PROCESSOR_FD
-                            echo -n " PROC_GRID=\"$MD_PROC_GRID\"" >&$TASK_PROCESSOR_FD
-                            counter=$(( counter + 1 ))
-                            echo >&$TASK_PROCESSOR_FD
-                        fi
-                    done
-                fi
-                DEVS_PER_PROC=$(( $DEVS_PER_PROC + 1 ))
-            done
-        fi
-        # Advance to next configuration
-        i=$TEST_DIMS
-        while [ $i -ge 0 ]; do
-            sizes[$i]=$(( sizes[i] + 1 ))
-            totalSize=1
-            j=1
-            while [ $j -le $TEST_DIMS ]; do
-                totalSize=$(( totalSize * sizes[j] ))
-                j=$(( j + 1 ))
-            done
-            if [ $(( sizes[i] )) -le $MAX_DIM_PROC_COUNT -a $totalSize -le $MAX_PROC_COUNT ]; then
-                break
-            elif [ $i -gt 0 ]; then
-                sizes[$i]=1
-            fi
-            i=$(( i - 1 ))
-        done
-    done
-    echo "Generated $counter tasks"
-    COMMON_PART=$(
-        echo -n "TASK_TYPE=0"
-        echo -n " TEST_PLATFORM=$PLATFORM"
-        echo -n " TEST_SHORT_PATH=\"$TEST_SHORT_PATH\""
-        echo -n " TASK_EXE=\"$TEST_EXENAME\""
-    )
-    if [ $GPU_ONLY -eq 0 ]; then
-        echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-        echo -n " TASK_DIR=\"$NOH_DIR\"" >&$TASK_PROCESSOR_FD
-        echo -n " TASK_NOH_FLAG=1" >&$TASK_PROCESSOR_FD
-        echo >&$TASK_PROCESSOR_FD
-    fi
-    if [ $DVM_ONLY -eq 0 ]; then
-        echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-        echo -n " TASK_DIR=\"$H_DIR\"" >&$TASK_PROCESSOR_FD
-        echo >&$TASK_PROCESSOR_FD
-        echo -n "$COMMON_PART" >&$TASK_PROCESSOR_FD
-        echo -n " TASK_DIR=\"$AUTOTFM_DIR\"" >&$TASK_PROCESSOR_FD
-        echo -n " TASK_AUTOTFM_FLAG=1" >&$TASK_PROCESSOR_FD
-        echo >&$TASK_PROCESSOR_FD
-    fi
-}
-
-traverse_tests() {
-    CUR_DIR="$1"
-    if [ -f "$CUR_DIR/$SETTINGS_FILE" ]; then
-        . "$CUR_DIR/$SETTINGS_FILE"
-    fi
-    if [ -f "$CUR_DIR/$ANALYZER_FILE" ]; then
-        TEST_ANALYZER="$CUR_DIR/$ANALYZER_FILE"
-    fi
-    TESTS=`mktemp`
-    find "$CUR_DIR" -mindepth 1 -maxdepth 1 -regex '.*[.]\(c\|cdv\|f\|f90\|fdv\)' | LC_ALL=C sort >$TESTS
-    DIRS=`mktemp`
-    find "$CUR_DIR" -mindepth 1 -maxdepth 1 -type d -regex '.*/[^.]*' | LC_ALL=C sort >$DIRS
-    while IFS= read -r f; do
-        ( do_test "$f" )
-    done <$TESTS
-    while IFS= read -r d; do
-        ( traverse_tests "$d" )
-    done <$DIRS
-    rm $DIRS $TESTS
-}
-
-set_default_settings() {
-    MAX_PROC_COUNT=1
-    MAX_DIM_PROC_COUNT=0
-    SHARE_RESOURCES=0
-    ALLOW_MULTIDEV=1
-    DVM_ONLY=0
-    GPU_ONLY=0
-    TEST_ANALYZER="$MY_DIR/default-test-analyzer.sh"
-    MAX_TIME=300
-}
-
-set_default_settings
-(traverse_tests "$TEST_SUITE")
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/report.css b/Sapfor/_projects/dvm/tools/tester/trunk/main/report.css
deleted file mode 100644
index 73c2b3a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/report.css
+++ /dev/null
@@ -1,24 +0,0 @@
-th, td {
-    text-align: center;
-}
-div.passed, a.passed {
-    color: green;
-}
-div.failed, a.failed {
-    color: red;
-}
-a.details {
-    text-decoration: none;
-    font-size: 50%;
-    border-bottom: 1px dashed;
-}
-span.details {
-    font-size: 200%;
-    line-height: normal;
-}
-table.details0 {
-    display: none;
-}
-table.details1 {
-    display: block;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/report.js b/Sapfor/_projects/dvm/tools/tester/trunk/main/report.js
deleted file mode 100644
index a06a4fb..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/report.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function toggleElem(id) {
-    var e = document.getElementById(id);
-    if(e.style.display == 'block')
-        e.style.display = 'none';
-    else
-        e.style.display = 'block';
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/task-processor.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/task-processor.sh
deleted file mode 100644
index 2c867d8..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/task-processor.sh
+++ /dev/null
@@ -1,366 +0,0 @@
-#!/bin/bash
-# Bash is required due to usage of 'disown' command
-
-SAVE_DIR=`pwd`
-MY_DIR=$(cd "$(dirname "$(which "$0")")" && pwd)
-
-RESULTS_DIR="$1"
-
-. "$MY_DIR/machine-config.sh"
-
-if [ -f "$SAVE_DIR/machine-config.sh" ]; then
-    . "$SAVE_DIR/machine-config.sh"
-fi
-
-. "$MY_DIR/configure-run.sh"
-
-if [ -f "$SAVE_DIR/configure-run.sh" ]; then
-    . "$SAVE_DIR/configure-run.sh"
-fi
-
-. "$MY_DIR/test-utils.sh"
-
-if [ $INTERACTIVE -ne 0 ]; then
-    stdout_fn() {
-        echo "$1.stdout"
-    }
-    stderr_fn() {
-        echo "$1.stderr"
-    }
-fi
-
-if [ $HAS_RES_MANAGER -eq 0 ]; then
-    RES_MAN_DIR=`mktemp -d`
-fi
-
-resources_freed() {
-    FN=`mktemp`
-    if [ $SHARE_RESOURCES -eq 0 ]; then
-        FREED_CPUS=$(( CPUS_PER_NODE * MAX_CPU_SHARING_FACTOR ))
-        FREED_CUDAS=$(( CUDAS_PER_NODE * MAX_CUDA_SHARING_FACTOR ))
-    else
-        FREED_CPUS=$(( totalProcs * CPUS_PER_PROC ))
-        FREED_CUDAS=$(( totalProcs * CUDAS_PER_PROC ))
-    fi
-    echo "FREED_CPUS=$FREED_CPUS" >>$FN
-    echo "FREED_CUDAS=$FREED_CUDAS" >>$FN
-#    echo "rm $FN" >>$FN
-    mv $FN $RES_MAN_DIR/
-}
-
-interactive_launcher() {
-    cd "$LAUNCH_DIR"
-    STDOUT_FN=`stdout_fn "$LAUNCH_NAME"`
-    STDERR_FN=`stderr_fn "$LAUNCH_NAME"`
-    :>$STDOUT_FN
-    :>$STDERR_FN
-    set -m
-#    echo ./dvm run $PROC_GRID "$TASK_EXE"
-    START_T=`date +%s`
-    if [ -f "run.sh" ]; then
-        PATH="$LAUNCH_DIR:$PATH" PROC_GRID="$PROC_GRID" DVMH_PPN=$LAUNCH_PPN DVMH_NUM_THREADS=$CPUS_PER_PROC DVMH_NUM_CUDAS=$CUDAS_PER_PROC ./run.sh </dev/null >"$STDOUT_FN" 2>"$STDERR_FN" &
-        LAUNCH_PID=$!
-    else
-        DVMH_PPN=$LAUNCH_PPN DVMH_NUM_THREADS=$CPUS_PER_PROC DVMH_NUM_CUDAS=$CUDAS_PER_PROC ./dvm run $PROC_GRID "$TASK_EXE" </dev/null >"$STDOUT_FN" 2>"$STDERR_FN" &
-        LAUNCH_PID=$!
-    fi
-    if [ $TEST_MAX_TIME -gt 0 ]; then
-#        echo "Setting proc_killer to process $LAUNCH_PID for $TEST_MAX_TIME"
-        proc_killer -$LAUNCH_PID $TEST_MAX_TIME </dev/null >/dev/null 2>& 1 &
-        KILLER_PID=$!
-        disown
-    fi
-    wait $LAUNCH_PID
-    START_RES=$?
-    END_T=`date +%s`
-    CALC_TIME=$(( END_T - START_T ))
-    if [ $TEST_MAX_TIME -gt 0 ]; then
-        kill -2 $KILLER_PID >/dev/null 2>& 1
-        kill -15 $KILLER_PID >/dev/null 2>& 1
-        kill -9 $KILLER_PID >/dev/null 2>& 1
-    fi
-    if [ $HAS_RES_MANAGER -eq 0 ]; then
-        resources_freed
-    fi
-    echo "$START_RES $CALC_TIME" >"$TASK_EXE.finished"
-}
-
-non_interactive_launcher() {
-    cd "$LAUNCH_DIR"
-    STDOUT_FN=`mktemp`
-    STDERR_FN=`mktemp`
-#    echo ./dvm run $PROC_GRID "$TASK_EXE"
-    if [ $TEST_MAX_TIME -gt 0 ]; then
-        export maxtime=$(( (TEST_MAX_TIME + 59) / 60))
-    fi
-    if [ -f "run.sh" ]; then
-        PATH="$LAUNCH_DIR:$PATH" PROC_GRID="$PROC_GRID" DVMH_PPN=$LAUNCH_PPN DVMH_NUM_THREADS=$CPUS_PER_PROC DVMH_NUM_CUDAS=$CUDAS_PER_PROC ./run.sh >$STDOUT_FN 2>$STDERR_FN
-        START_RES=$?
-    else
-        DVMH_PPN=$LAUNCH_PPN DVMH_NUM_THREADS=$CPUS_PER_PROC DVMH_NUM_CUDAS=$CUDAS_PER_PROC ./dvm run $PROC_GRID "$TASK_EXE" >$STDOUT_FN 2>$STDERR_FN
-        START_RES=$?
-    fi
-    unset maxtime
-    :>"$TASK_EXE.committed"
-    IS_LAUNCHED=`is_launched $STDOUT_FN $STDERR_FN`
-    rm $STDOUT_FN $STDERR_FN
-    if [ $START_RES -eq 0 -a $IS_LAUNCHED -ne 0 ]; then
-        while [ `is_finished "$LAUNCH_NAME"` -eq 0 ]; do
-            sleep 1
-        done
-        CALC_TIME=`get_elapsed_time "$LAUNCH_NAME"`
-    fi
-    if [ $HAS_RES_MANAGER -eq 0 ]; then
-        resources_freed
-    fi
-    echo "$START_RES $CALC_TIME" >"$TASK_EXE.finished"
-}
-
-already_analyzed() {
-#    echo -n "PLATFORM=\"$TEST_PLATFORM\""
-#    echo -n " NOH_FLAG=$TASK_NOH_FLAG"
-#    echo -n " AUTOTFM_FLAG=$TASK_AUTOTFM_FLAG"
-#    echo -n " PROC_GRID=\"$PROC_GRID\""
-#    echo -n " CPUS_PER_PROC=$CPUS_PER_PROC"
-#    echo -n " CUDAS_PER_PROC=$CUDAS_PER_PROC"
-    local res
-    res=0
-    if [ -f "$RESULTS_DIR/$TEST_SHORT_PATH.result" ]; then
-        if [ $( cat "$RESULTS_DIR/$TEST_SHORT_PATH.result" | grep "PLATFORM=\"$TEST_PLATFORM\"" | grep "NOH_FLAG=$TASK_NOH_FLAG" | grep "AUTOTFM_FLAG=$TASK_AUTOTFM_FLAG" | grep "PROC_GRID=\"$PROC_GRID\"" | grep "CPUS_PER_PROC=$CPUS_PER_PROC" | grep "CUDAS_PER_PROC=$CUDAS_PER_PROC" | wc -l ) -gt 0 ]; then
-            res=1
-        fi
-    fi
-    echo $res
-}
-
-launcher() {
-    counter=0
-    if [ $HAS_RES_MANAGER -eq 0 ]; then
-        if [ $MAX_NODES_PER_TASK -gt 1 ]; then
-            echo "Can manage resources only for one-node system"
-            MAX_NODES_PER_TASK=1
-        fi
-        FREE_CPUS=$(( CPUS_PER_NODE * MAX_CPU_SHARING_FACTOR ))
-        FREE_CUDAS=$(( CUDAS_PER_NODE * MAX_CUDA_SHARING_FACTOR ))
-    fi
-    exec 4>$1
-    while IFS= read -r TASK_SPEC; do
-        TEST_PLATFORM=Unknown
-        TASK_NOH_FLAG=0
-        TASK_AUTOTFM_FLAG=0
-        PROC_GRID=0
-        CPUS_PER_PROC=0
-        CUDAS_PER_PROC=0
-        eval $TASK_SPEC
-        LAUNCHED_FLAG=0
-        ALREADY_ANALYZED=$( already_analyzed )
-        if [ $TASK_TYPE -eq 1 -a $ALREADY_ANALYZED -eq 0 ]; then
-            CAN_CPUS=$CPUS_PER_NODE
-            CAN_CUDAS=$CUDAS_PER_NODE
-            if [ $SHARE_RESOURCES -ne 0 ]; then
-                CAN_CPUS=$(( CAN_CPUS * MAX_CPU_SHARING_FACTOR ))
-                CAN_CUDAS=$(( CAN_CUDAS * MAX_CUDA_SHARING_FACTOR ))
-            fi
-            LAUNCH_PPN=$MAX_PPN
-            CUR_PPN=$LAUNCH_PPN
-            if [ $CPUS_PER_PROC -gt 0 ]; then
-                CUR_PPN=$(( CAN_CPUS / $CPUS_PER_PROC ))
-            fi
-            if [ $CUR_PPN -lt $LAUNCH_PPN ]; then
-                LAUNCH_PPN=$CUR_PPN
-            fi
-            if [ $CUDAS_PER_PROC -gt 0 ]; then
-                CUR_PPN=$(( CAN_CUDAS / $CUDAS_PER_PROC ))
-            fi
-            if [ $CUR_PPN -lt $LAUNCH_PPN ]; then
-                LAUNCH_PPN=$CUR_PPN
-            fi
-            totalProcs=1
-            for proc in $PROC_GRID; do
-                totalProcs=$(( totalProcs * proc ))
-            done
-            if [ $LAUNCH_PPN -gt 0 ]; then
-                USE_NODES=$(( ( totalProcs + LAUNCH_PPN - 1 ) / LAUNCH_PPN ))
-            else
-                LAUNCH_PPN=1
-                USE_NODES=$(( MAX_NODES_PER_TASK + 1 ))
-            fi
-            NEED_CPUS=$(( totalProcs * CPUS_PER_PROC ))
-            NEED_CUDAS=$(( totalProcs * CUDAS_PER_PROC ))
-            if [ $USE_NODES -le $MAX_NODES_PER_TASK ]; then
-                # Launch
-                counter=$(( counter + 1 ))
-                LAUNCH_DIR=`mktemp -d`
-                cp -r $TASK_DIR/* $LAUNCH_DIR/
-                TASK_SPEC=$( echo -n "$TASK_SPEC" ;  echo " LAUNCH_DIR=\"$LAUNCH_DIR\"" )
-                if [ $HAS_RES_MANAGER -eq 0 ]; then
-                    LAUNCH_NAME="$LAUNCH_DIR/$TASK_EXE"
-                else
-                    LAUNCH_NAME="$LAUNCH_DIR/$TASK_EXE.$totalProcs.1"
-                fi
-                TASK_SPEC=$( echo -n "$TASK_SPEC" ; echo " LAUNCH_NAME=\"$LAUNCH_NAME\"" )
-                while true; do
-                    if [ -f "$SAVE_DIR/dvm-tester.pause" ] && [ "$(cat "$SAVE_DIR/dvm-tester.pause")" = "Immediate" ]; then
-                        :
-                    elif [ -f "$MY_DIR/dvm-tester.pause" ] && [ "$(cat "$MY_DIR/dvm-tester.pause")" = "Immediate" ]; then
-                        :
-                    else
-                        break
-                    fi
-                    sleep 60
-                done
-                if [ $HAS_RES_MANAGER -ne 0 ]; then
-                    while [ `can_launch` -eq 0 ]; do
-                        sleep 1
-                    done
-                else
-                    if [ $SHARE_RESOURCES -eq 0 ]; then
-                        NEED_CPUS=$(( CPUS_PER_NODE * MAX_CPU_SHARING_FACTOR ))
-                        NEED_CUDAS=$(( CUDAS_PER_NODE * MAX_CUDA_SHARING_FACTOR ))
-                    fi
-                    cd "$RES_MAN_DIR"
-                    while [ $FREE_CPUS -lt $NEED_CPUS -o $FREE_CUDAS -lt $NEED_CUDAS ]; do
-                        FOUND_SMTH=0
-                        for f in `ls`; do
-                            FREED_CPUS=
-                            FREED_CUDAS=
-                            . ./$f
-                            if [ -n "$FREED_CPUS" -a -n "$FREED_CUDAS" ]; then
-                                FOUND_SMTH=1
-                                FREE_CPUS=$(( FREE_CPUS + FREED_CPUS ))
-                                FREE_CUDAS=$(( FREE_CUDAS + FREED_CUDAS ))
-                                rm $f
-                            fi
-                        done
-                        if [ $FOUND_SMTH -eq 0 ]; then
-                            sleep 1
-                        fi
-                    done
-                    FREE_CPUS=$(( FREE_CPUS - NEED_CPUS ))
-                    FREE_CUDAS=$(( FREE_CUDAS - NEED_CUDAS ))
-                fi
-                # Actually launch
-                if [ $INTERACTIVE -ne 0 ]; then
-                    interactive_launcher &
-                else
-                    non_interactive_launcher &
-                    if [ $HAS_RES_MANAGER -ne 0 ]; then
-                        while [ ! -f "$LAUNCH_DIR/$TASK_EXE.committed" ]; do
-                            sleep 1
-                        done
-                    fi
-                fi
-                LAUNCHED_FLAG=1
-            else
-                # Can not launch such big task
-                echo "Discarding too big task: $TASK_SPEC"
-            fi
-        elif [ $TASK_TYPE -eq 0 ]; then
-            LAUNCHED_FLAG=1
-        else
-            echo "Discarding task: $TASK_SPEC"
-        fi
-        if [ $LAUNCHED_FLAG -ne 0 ]; then
-            echo "$TASK_SPEC" >& 4
-        fi
-    done
-    echo ":" >& 4
-    exec 4>&-
-    echo "Total tasks launched: $counter"
-}
-
-print_result_line() {
-    echo -n "PLATFORM=\"$TEST_PLATFORM\""
-    echo -n " NOH_FLAG=$TASK_NOH_FLAG"
-    echo -n " AUTOTFM_FLAG=$TASK_AUTOTFM_FLAG"
-    echo -n " PROC_GRID=\"$PROC_GRID\""
-    echo -n " CPUS_PER_PROC=$CPUS_PER_PROC"
-    echo -n " CUDAS_PER_PROC=$CUDAS_PER_PROC"
-    echo -n " CALC_TIME=$TASK_CALC_TIME"
-    echo -n " TEST_PASSED=$TEST_PASSED"
-    echo -n " RESULT_COMMENT=\"$RESULT_COMMENT\""
-    echo " ERROR_LEVEL=$ERROR_LEVEL"
-}
-
-analyzer() {
-    counter=0
-    FIFO_NAME="$1"
-    while IFS= read -r TASK_SPEC; do
-        if [ "$TASK_SPEC" = ":" ]; then
-            break
-        fi
-        CPUS_PER_PROC=0
-        CUDAS_PER_PROC=0
-        TASK_NOH_FLAG=0
-        TASK_AUTOTFM_FLAG=0
-        eval $TASK_SPEC
-        if [ $TASK_TYPE -eq 0 ]; then
-            if [ ! -f "$TASK_DIR/$TASK_EXE" ]; then
-                # Report compilation error
-                if [ `basename "$TEST_SHORT_PATH"` != "$TEST_SHORT_PATH" ]; then
-                    mkdir -p "$RESULTS_DIR/$(dirname "$TEST_SHORT_PATH")"
-                fi
-                PROC_GRID=
-                CPUS_PER_PROC=
-                CUDAS_PER_PROC=
-                TASK_CALC_TIME=
-                TEST_PASSED=0
-                RESULT_COMMENT="Compilation error"
-                ERROR_LEVEL=255
-                print_result_line >>"$RESULTS_DIR/$TEST_SHORT_PATH.result"
-            fi
-            # Cleanup all the test's stuff
-            rm -rf "$TASK_DIR"
-        else
-            counter=$(( counter + 1 ))
-            cd "$LAUNCH_DIR"
-            while [ ! -f "$TASK_EXE.finished" ]; do
-                sleep 1
-            done
-            read LAUNCH_EXIT_CODE TASK_CALC_TIME <"$TASK_EXE.finished"
-            STDOUT_FN=`stdout_fn "$LAUNCH_NAME"`
-            STDERR_FN=`stderr_fn "$LAUNCH_NAME"`
-            SUBTEST_COUNT=0
-            . $TEST_ANALYZER
-            if [ `basename "$TEST_SHORT_PATH"` != "$TEST_SHORT_PATH" ]; then
-                mkdir -p "$RESULTS_DIR/$(dirname "$TEST_SHORT_PATH")"
-            fi
-            print_result_line >>"$RESULTS_DIR/$TEST_SHORT_PATH.result"
-            if [ $SUBTEST_COUNT -gt 0 ]; then
-                mkdir -p $RESULTS_DIR/$TEST_SHORT_PATH
-                for i in `seq $SUBTEST_COUNT`; do
-                    SUBTEST_NAME=$i
-                    analyze_subtest $i
-                    print_result_line >>"$RESULTS_DIR/$TEST_SHORT_PATH/$SUBTEST_NAME.result"
-                done
-            fi
-#            if [ $LAUNCH_EXIT_CODE -ne 0 -o "$RESULT_COMMENT" = "Crash" ]; then
-#                echo "Test's $TEST_SHORT_PATH stdout:"
-#                cat "$STDOUT_FN"
-#                echo "Test's $TEST_SHORT_PATH stderr:"
-#                cat "$STDERR_FN"
-#            fi
-            rm -rf "$LAUNCH_DIR"
-        fi
-    done <$FIFO_NAME
-    echo "Total tasks analyzed: $counter"
-}
-
-FIFO_NAME="$(mktemp -u).launch-fifo"
-mkfifo $FIFO_NAME
-
-analyzer $FIFO_NAME &
-launcher $FIFO_NAME
-
-wait
-
-rm $FIFO_NAME
-
-if [ $HAS_RES_MANAGER -eq 0 ]; then
-    cd "$RES_MAN_DIR"
-    for f in `ls`; do
-        . ./$f
-    done
-    cd "$SAVE_DIR"
-    rm -rf "$RES_MAN_DIR"
-fi
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/test-system.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/test-system.sh
deleted file mode 100644
index cdaea50..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/test-system.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/sh
-
-unset CDPATH
-
-SAVE_DIR=`pwd`
-MY_DIR=$(cd "$(dirname "$(which "$0")")" && pwd)
-
-DVMSYS_DIR=
-if [ -f ./dvm ]; then
-    DVMSYS_DIR_CMD="DVMSYS_DIR=$(grep 'dvmdir=' <./dvm | sed -s 's/export //g' | sed -s 's/dvmdir=//g')"
-    eval $DVMSYS_DIR_CMD
-fi
-TEST_SUITE=test-suite
-RESULTS_DIR=
-APPEND_RESULTS=0
-
-parse_params() {
-    while [ -n "$1" ]; do
-        if [ "$1" = "--dvm_sys" ]; then
-            DVMSYS_DIR="$2"
-            shift
-        elif [ "$1" = "--test-suite" ]; then
-            TEST_SUITE="$2"
-            shift
-        elif [ "$1" = "--append-results" ]; then
-            APPEND_RESULTS=1
-            RESULTS_DIR="$2"
-            shift
-        else
-            echo "Unknown option '$1'"
-            exit 1
-        fi
-        shift
-    done
-}
-
-parse_params $@ || exit 1
-
-# Check settings
-cd "$SAVE_DIR"
-if [ ! -d "$DVMSYS_DIR" -o ! -d "$DVMSYS_DIR/user" -o ! -f "$DVMSYS_DIR/user/dvm" -o ! -d "$TEST_SUITE" ]; then
-    MY_NAME=`basename "$0"`
-    echo "Usage: $0 [<options>]"
-    echo "    --dvm_sys     Directory of already installed DVM-system. Note that it is a directory, which contains directory 'user' directly. Usually it is .../dvm_current/dvm_sys. By default $MY_NAME searches for 'dvm' file in current directory and makes attempt to use its DVM-system"
-    echo "    --test-suite  Directory with test suite, which is formed in special way. By default 'test-suite' directory is used."
-    echo "    --append-results  Directory with partial results, which will be appended. By default new directory will be created."
-    echo "Exiting"
-    exit 1
-fi
-
-# Make them global paths
-DVMSYS_DIR=$(cd "$DVMSYS_DIR" && pwd)
-TEST_SUITE=$(cd "$TEST_SUITE" && pwd)
-
-if [ $APPEND_RESULTS -eq 0 ]; then
-    RESULTS_DIR="$SAVE_DIR/$(basename "$TEST_SUITE").results"
-else
-    RESULTS_DIR=$(cd "$RESULTS_DIR" && pwd)
-fi
-export TMPDIR="$SAVE_DIR/$(basename "$TEST_SUITE").work"
-if [ -d "/home/scratch" ]; then
-    TEMPL_NAME="/home/scratch/$(basename "$TMPDIR").XXX"
-    TMPDIR=$(mktemp -d "$TEMPL_NAME")
-fi
-mkdir -p "$TMPDIR"
-
-# Launch task processor
-TASK_FIFO="$(mktemp -u).task-fifo"
-mkfifo "$TASK_FIFO"
-if [ $APPEND_RESULTS -eq 0 ]; then
-    if [ -e "$RESULTS_DIR" ]; then
-        echo -n "$RESULTS_DIR already exists. Do you want to rewrite it (Y/n)? "
-        ans=n
-        read ans
-        if [ "$ans" != "y" -a "$ans" != "Y" ]; then
-            echo "Exiting"
-            exit 1
-        fi
-    fi
-    rm -rf "$RESULTS_DIR"
-fi
-mkdir -p "$RESULTS_DIR"
-cd "$SAVE_DIR"
-"$MY_DIR/task-processor.sh" "$RESULTS_DIR" <"$TASK_FIFO" &
-
-# Sequentially feed task processor from our test-suite
-exec 4>"$TASK_FIFO"
-cd "$SAVE_DIR"
-"$MY_DIR/perform-tests.sh" "$DVMSYS_DIR" "$TEST_SUITE" 4
-exec 4>&-
-
-# Wait for task processor to finish
-wait
-
-# Cleanup stuff
-rm "$TASK_FIFO"
-
-# Generate final report
-cd "$SAVE_DIR"
-"$MY_DIR/gen-report.sh" "$TEST_SUITE" "$RESULTS_DIR"
-
-echo "Results can be seen in $RESULTS_DIR directory"
-rm -rf "$TMPDIR"
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/main/test-utils.sh b/Sapfor/_projects/dvm/tools/tester/trunk/main/test-utils.sh
deleted file mode 100644
index a260849..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/main/test-utils.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-proc_killer() {
-    local PROC
-    local TIMEOUT
-    local counter
-    PROC="$1"
-    TIMEOUT=$2
-    counter=0
-    while [ $counter -lt $TIMEOUT ]; do
-        sleep 10
-        counter=$(( counter + 10 ))
-    done
-    kill -2 $PROC >/dev/null 2>& 1
-    sleep 10
-    kill -15 $PROC >/dev/null 2>& 1
-    sleep 10
-    kill -9 $PROC >/dev/null 2>& 1
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr014.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr014.cdv
deleted file mode 100644
index 541b849..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr014.cdv
+++ /dev/null
@@ -1,1228 +0,0 @@
-/*  ACR014
-
-    TESTING OF THE ACROSS CLAUSE'.
-    DISTRIBUTED ARRAYS A(N), A(N, M, K, L) ARE TO HAVE NO DISTRIBUTED DIMENSIONS AND DIFFERENT
-    FLOW-DEP-LENGTH ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void ACR0101();
-static void ACR0102();
-static void ACR0103();
-static void ACR0104();
-static void ACR0105();
-static void ACR0106();
-static void ACR0107();
-static void ACR0108();
-static void ACR0109();
-static void ACR0110();
-
-static void acr0401();
-static void acr0402();
-static void acr0403();
-static void acr0404();
-static void acr0405();
-static void acr0406();
-static void acr0407();
-static void acr0408();
-static void acr0409();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int i, j, ii, jj;
-
-int main(int an, char **as)
-{
-    printf("===START OF ACR014========================\n");
-    /* ---------------------------------------- */
-    ACR0101();
-    /* ---------------------------------------- */
-    ACR0102();
-    /* ---------------------------------------- */
-    ACR0103();
-    /* ---------------------------------------- */
-    ACR0104();
-    /* ---------------------------------------- */
-    ACR0105();
-    /* ---------------------------------------- */
-    ACR0106();
-    /* ---------------------------------------- */
-    ACR0107();
-    /* ---------------------------------------- */
-    ACR0108();
-    /* ---------------------------------------- */
-    ACR0109();
-    /* ---------------------------------------- */
-    ACR0110();
-    /* ---------------------------------------- */
-
-    /* ---------------------------------------- */
-    acr0401();
-    /* ---------------------------------------- */
-    acr0402();
-    /* ---------------------------------------- */
-    acr0403();
-    /* ---------------------------------------- */
-    acr0404();
-    /* ---------------------------------------- */
-    acr0405();
-    /* ---------------------------------------- */
-    acr0406();
-    /* ---------------------------------------- */
-    acr0407();
-    /* ---------------------------------------- */
-    acr0408();
-    /* ---------------------------------------- */
-    acr0409();
-    /* ---------------------------------------- */
-
-    printf("=== END OF ACR014 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------ACR0101*/
-void ACR0101()
-{
-    #define N 8
-    #define NL 1000
-    char tname[] = "ACR0101 ";
-    int nloop;
-    #pragma dvm array distribute[*]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 1; i++)
-        C[i] = C[i - 1] + C[i + 1];
-
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[1:1])
-    for (i = 1; i < N - 1; i++)
-        A[i] = A[i - 1] + A[i + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0102 */
-void ACR0102()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR0102 ";
-    int nloop;
-    #pragma dvm array distribute[*]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 1; i++)
-        C[i] = C[i - 1] + C[i + 1];
-
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[0:1])
-    for (i = 1; i < N - 1; i++)
-        A[i] = A[i - 1] + A[i + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0103 */
-void ACR0103()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR0103 ";
-    int nloop;
-    #pragma dvm array distribute[*]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 1; i++)
-        C[i] = C[i - 1] + C[i + 1];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[1:0])
-    for (i = 1; i < N - 1; i++)
-        A[i] = A[i - 1] + A[i + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0104 */
-void ACR0104()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR0104 ";
-    int nloop;
-    #pragma dvm array distribute[*], shadow[2:2]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 2; i < N - 2; i++)
-        C[i] = C[i - 1] + C[i + 1] + C[i + 2] + C[i - 2];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[2:2])
-    for (i = 2; i < N - 2; i++)
-        A[i] = A[i - 1] + A[i + 1] + A[i + 2] + A[i - 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 2; i < N - 2; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0105 */
-void ACR0105()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR0105 ";
-    int nloop;
-    #pragma dvm array distribute[*], shadow[2:2]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 2; i++)
-        C[i] = C[i + 1] + C[i + 2];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[0:2])
-    for (i = 1; i < N - 2; i++)
-        A[i] = A[i + 1] + A[i + 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 2; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0106 */
-void ACR0106()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR0106 ";
-    int nloop;
-    #pragma dvm array distribute[*], shadow[2:2]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 2; i < N; i++)
-        C[i] = C[i - 1] + C[i - 2];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[2:0])
-    for (i = 2; i < N; i++)
-        A[i] = A[i - 1] + A[i - 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 2; i < N; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0107 */
-void ACR0107()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR0107 ";
-    int nloop;
-    #pragma dvm array distribute[*], shadow[3:3]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 3; i < N - 3; i++)
-        C[i] = C[i - 1] + C[i + 1] + C[i + 2] + C[i - 2] + C[i - 3] + C[i + 3];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[3:3])
-    for (i = 3; i < N - 3; i ++)
-        A[i] = A[i - 1] + A[i + 1] + A[i + 2] + A[i - 2] + A[i - 3] + A[i + 3];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 3; i < N - 3; i ++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0108 */
-void ACR0108()
-{
-    #define N 24
-    #define NL 1000
-    char tname[] = "ACR0108 ";
-    int nloop;
-    #pragma dvm array distribute[*], shadow[3:3]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 3; i++)
-        C[i] = C[i + 1] + C[i + 2] + C[i + 3];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[0:3])
-    for (i = 1; i < N - 3; i ++)
-        A[i] = A[i + 1] + A[i + 2] + A[i + 3];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 3; i ++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0109 */
-void ACR0109()
-{
-    #define N 24
-    #define NL 1000
-    char tname[] = "ACR0109 ";
-    int nloop;
-    #pragma dvm array distribute[*], shadow[3:3]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 3; i < N; i++)
-        C[i] = C[i - 1] + C[i - 2] + C[i - 3];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[3:0])
-    for (i = 3; i < N; i ++)
-        A[i] = A[i - 1] + A[i - 2] + A[i - 3];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 3; i < N; i ++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0110 */
-void ACR0110()
-{
-    #define N 60
-    #define NL 1000
-    char tname[] = "ACR0110 ";
-    int nloop;
-    #pragma dvm array distribute[*], shadow[11:11]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 11; i < N - 11; i++)
-        C[i] = C[i - 9] + C[i + 9] + C[i + 10] + C[i - 10] + C[i - 11] + C[i + 11];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[11:11])
-    for (i = 11; i < N - 11; i ++)
-        A[i] = A[i - 9] + A[i + 9] + A[i + 10] + A[i - 10] + A[i - 11] + A[i + 11];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 11; i < N - 11; i ++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR0401*/
-void acr0401()
-{
-    #define NL 1000
-    #define N 16
-    #define M 8
-    #define K 8
-    #define L 8
-    char tname[] = "ACR0401 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][*][*][*]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-    printf("1234r5\n");
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    C[i][j][ii][jj] = C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[1:1][1:1][1:1][1:1])
-    for (jj = 1; jj < L - 1; jj++)
-        for (ii = 1; ii < K - 1; ii++)
-            for (j = 1; j < M - 1; j++)
-                for (i = 1; i < N - 1; i++)
-                    A[i][j][ii][jj] = A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 1; jj < L - 1; jj++)
-        for (ii = 1; ii < K - 1; ii++)
-            for (j = 1; j < M - 1; j++)
-                for (i = 1; i < N - 1; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR0402*/
-void acr0402()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    #define L 10
-    char tname[] = "ACR0402 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][*][*][*], shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 2] + C[i - 1][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i][j][ii][jj - 1] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii][jj + 1] + C[i][j - 1][ii][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[1:2][2:2][2:1][1:2])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 2] + A[i - 1][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i][j][ii][jj - 1] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii][jj + 1] + A[i][j - 1][ii][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR0403*/
-void acr0403()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    #define L 10
-    char tname[] = "ACR0403 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][*][*][*], shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i][j][ii][jj - 2] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[2:0][2:2][2:0][2:0])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i][j][ii][jj - 2] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR0404*/
-void acr0404()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    #define L 10
-    char tname[] = "ACR0404 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][*][*][*], shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i + 2][j][ii][jj] + C[i][j][ii][jj + 2] + C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i + 1][j][ii][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[2:2][2:0][2:0][0:2])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i + 2][j][ii][jj] + A[i][j][ii][jj + 2] + A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i + 1][j][ii][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR0405*/
-void acr0405()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR0405 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][*][*][*], shadow[2:2][2:0][0:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i + 2][j][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj + 2] + C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii][jj - 2] + C[i + 1][j][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[2:2][2:0][0:2][2:2])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i + 2][j][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj + 2] + A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii][jj - 2] + A[i + 1][j][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR0406*/
-void acr0406()
-{
-    #define NL 1000
-    #define N 32
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR0406 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][*][*][*], shadow[3:3][3:3][3:3][3:3]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    C[i][j][ii][jj] = C[i + 3][j][ii][jj] + C[i][j + 3][ii][jj] + C[i][j][ii + 3][jj] + C[i][j][ii][jj + 3] + C[i - 3][j][ii][jj] + C[i][j - 3][ii][jj] + C[i][j][ii - 3][jj] + C[i][j][ii][jj - 3] + C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj + 2] + C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i][j][ii][jj - 2] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[3:3][3:3][3:3][3:3])
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    A[i][j][ii][jj] = A[i + 3][j][ii][jj] + A[i][j + 3][ii][jj] + A[i][j][ii + 3][jj] + A[i][j][ii][jj + 3] + A[i - 3][j][ii][jj] + A[i][j - 3][ii][jj] + A[i][j][ii - 3][jj] + A[i][j][ii][jj - 3] + A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj + 2] + A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i][j][ii][jj - 2] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR0407*/
-void acr0407()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR0407 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][*][*][*], shadow[0:3][3:3][0:3][0:3]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    C[i][j][ii][jj] = C[i + 3][j][ii][jj] + C[i][j + 3][ii][jj] + C[i][j][ii + 3][jj] + C[i][j][ii][jj + 3] + C[i][j - 3][ii][jj] + C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj + 2] + C[i][j - 2][ii][jj] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i][j - 1][ii][jj];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[0:3][3:3][0:3][0:3])
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    A[i][j][ii][jj] = A[i + 3][j][ii][jj] + A[i][j + 3][ii][jj] + A[i][j][ii + 3][jj] + A[i][j][ii][jj + 3] + A[i][j - 3][ii][jj] + A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj + 2] + A[i][j - 2][ii][jj] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i][j - 1][ii][jj];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR0408*/
-void acr0408()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR0408 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][*][*][*], shadow[0:3][3:3][0:3][3:0]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    C[i][j][ii][jj] = C[i + 3][j][ii][jj] + C[i][j + 3][ii][jj] + C[i][j][ii + 3][jj] + C[i][j][ii][jj - 3] + C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj - 2] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[0:3][0:3][0:3][3:0])
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    A[i][j][ii][jj] = A[i + 3][j][ii][jj] + A[i][j + 3][ii][jj] + A[i][j][ii + 3][jj] + A[i][j][ii][jj - 3] + A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj - 2] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR0409*/
-void acr0409()
-{
-    #define NL 1000
-    #define N 59
-    #define M 59
-    #define K 59
-    #define L 59
-    char tname[] = "ACR0409 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][*][*][*], shadow[11:11][11:11][11:11][11:11]
-    int (*A)[M][K][L];
-    int (*C)[M][K][L];
-    int NNL = NL;
-    A = malloc(N * M * K * L * sizeof(int));
-    C = malloc(N * M * K * L * sizeof(int));
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            for (ii = 11; ii < K - 11; ii++)
-                for (jj = 11; jj < L - 11; jj++)
-                    C[i][j][ii][jj] = C[i + 11][j][ii][jj] + C[i][j + 11][ii][jj] + C[i][j][ii + 11][jj] + C[i][j][ii][jj + 11] + C[i - 11][j][ii][jj] + C[i][j - 11][ii][jj] + C[i][j][ii - 11][jj] + C[i][j][ii][jj - 11];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[11:11][11:11][11:11][11:11])
-    for (jj = 11; jj < L - 11; jj++)
-        for (ii = 11; ii < K - 11; ii++)
-            for (j = 11; j < M - 11; j++)
-                for (i = 11; i < N - 11; i++)
-                    A[i][j][ii][jj] = A[i + 11][j][ii][jj] + A[i][j + 11][ii][jj] + A[i][j][ii + 11][jj] + A[i][j][ii][jj + 11] + A[i - 11][j][ii][jj] + A[i][j - 11][ii][jj] + A[i][j][ii - 11][jj] + A[i][j][ii][jj - 11];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 11; jj < L - 11; jj++)
-        for (ii = 11; ii < K - 11; ii++)
-            for (j = 11; j < M - 11; j++)
-                for (i = 11; i < N - 11; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ----------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr11.cdv
deleted file mode 100644
index 867ed75..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr11.cdv
+++ /dev/null
@@ -1,538 +0,0 @@
-/*  ACR11
-
-    TESTING OF THE ACROSS CLAUSE'.
-    DISTRIBUTED ARRAY A(N) IS TO HAVE DIFFERENT
-    FLOW-DEP-LENGTH ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void acr1101();
-static void acr1102();
-static void acr1103();
-static void acr1104();
-static void acr1105();
-static void acr1106();
-static void acr1107();
-static void acr1108();
-static void acr1109();
-static void acr1110();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int i;
-
-int main(int an, char **as)
-{
-    printf("===START OF ACR11========================\n");
-    /* ---------------------------------------- */
-    acr1101();
-    /* ---------------------------------------- */
-    acr1102();
-    /* ---------------------------------------- */
-    acr1103();
-    /* ---------------------------------------- */
-    acr1104();
-    /* ---------------------------------------- */
-    acr1105();
-    /* ---------------------------------------- */
-    acr1106();
-    /* ---------------------------------------- */
-    acr1107();
-    /* ---------------------------------------- */
-    acr1108();
-    /* ---------------------------------------- */
-    acr1109();
-    /* ---------------------------------------- */
-    acr1110();
-    /* ---------------------------------------- */
-
-    printf("=== END OF ACR11 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------ACR1101*/
-void acr1101()
-{
-    #define N 8
-    #define NL 1000
-    char tname[] = "ACR1101 ";
-    int nloop;
-    #pragma dvm array distribute[block]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 1; i++)
-        C[i] = C[i - 1] + C[i + 1];
-
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[1:1])
-    for (i = 1; i < N - 1; i++)
-        A[i] = A[i - 1] + A[i + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR1102 */
-void acr1102()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR1102 ";
-    int nloop;
-    #pragma dvm array distribute[block]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 1; i++)
-        C[i] = C[i] + C[i + 1];
-
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[0:1])
-    for (i = 1; i < N - 1; i++)
-        A[i] = A[i] + A[i + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR1103 */
-void acr1103()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR1103 ";
-    int nloop;
-    #pragma dvm array distribute[block]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 1; i++)
-        C[i] = C[i - 1] + C[i];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[1:0])
-    for (i = 1; i < N - 1; i++)
-        A[i] = A[i - 1] + A[i];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR1104 */
-void acr1104()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR1104 ";
-    int nloop;
-    #pragma dvm array distribute[block], shadow[2:2]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 2; i < N - 2; i++)
-        C[i] = C[i - 1] + C[i + 1] + C[i + 2] + C[i - 2];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[2:2])
-    for (i = 2; i < N - 2; i++)
-        A[i] = A[i - 1] + A[i + 1] + A[i + 2] + A[i - 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 2; i < N - 2; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR1105 */
-void acr1105()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR1105 ";
-    int nloop;
-    #pragma dvm array distribute[block], shadow[2:2]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 2; i++)
-        C[i] = C[i + 1] + C[i + 2];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[0:2])
-    for (i = 1; i < N - 2; i++)
-        A[i] = A[i + 1] + A[i + 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 2; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR1106 */
-void acr1106()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR1106 ";
-    int nloop;
-    #pragma dvm array distribute[block], shadow[2:2]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 2; i < N; i++)
-        C[i] = C[i - 1] + C[i - 2];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[2:0])
-    for (i = 2; i < N; i++)
-        A[i] = A[i - 1] + A[i - 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 2; i < N; i++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR1107 */
-void acr1107()
-{
-    #define N 16
-    #define NL 1000
-    char tname[] = "ACR1107 ";
-    int nloop;
-    #pragma dvm array distribute[block], shadow[3:3]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 3; i < N - 3; i++)
-        C[i] = C[i - 1] + C[i + 1] + C[i + 2] + C[i - 2] + C[i - 3] + C[i + 3];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[3:3])
-    for (i = 3; i < N - 3; i ++)
-        A[i] = A[i - 1] + A[i + 1] + A[i + 2] + A[i - 2] + A[i - 3] + A[i + 3];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 3; i < N - 3; i ++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR1108 */
-void acr1108()
-{
-    #define N 24
-    #define NL 1000
-    char tname[] = "ACR1108 ";
-    int nloop;
-    #pragma dvm array distribute[block], shadow[3:3]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 1; i < N - 3; i++)
-        C[i] = C[i + 1] + C[i + 2] + C[i + 3];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[0:3])
-    for (i = 1; i < N - 3; i ++)
-        A[i] = A[i + 1] + A[i + 2] + A[i + 3];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 1; i < N - 3; i ++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR1109 */
-void acr1109()
-{
-    #define N 24
-    #define NL 1000
-    char tname[] = "ACR1109 ";
-    int nloop;
-    #pragma dvm array distribute[block], shadow[3:3]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 3; i < N; i++)
-        C[i] = C[i - 1] + C[i - 2] + C[i - 3];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[3:0])
-    for (i = 3; i < N; i ++)
-        A[i] = A[i - 1] + A[i - 2] + A[i - 3];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 3; i < N; i ++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ---------------------------------------------ACR1110 */
-void acr1110()
-{
-    #define N 60
-    #define NL 1000
-    char tname[] = "ACR1110 ";
-    int nloop;
-    #pragma dvm array distribute[block], shadow[11:11]
-    int *A;
-    A = (int (*))malloc(N * sizeof(int));
-    int *C;
-    C = (int (*))malloc(N * sizeof(int));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        C[i] = NNL + i;
-    nloop = NL;
-
-    for (i = 11; i < N - 11; i++)
-        C[i] = C[i - 9] + C[i + 9] + C[i + 10] + C[i - 10] + C[i - 11] + C[i + 11];
-    #pragma dvm actual(nloop)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) across(A[11:11])
-    for (i = 11; i < N - 11; i ++)
-        A[i] = A[i - 9] + A[i + 9] + A[i + 10] + A[i - 10] + A[i - 11] + A[i + 11];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloop))
-    for (i = 11; i < N - 11; i ++)
-        if (A[i] != C[i])
-            nloop = Min(nloop, i);
-    #pragma dvm get_actual(nloop)
-    if (nloop == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef N
-    #undef NL
-}
-/* ----------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr12.cdv
deleted file mode 100644
index 62b721f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr12.cdv
+++ /dev/null
@@ -1,939 +0,0 @@
-/*  ACR12
-
-    TESTING OF THE ACROSS CLAUSE'.
-    DISTRIBUTED ARRAY A(N, M) IS TO HAVE 1 DISTRIBUTED DIMENSION AND DIFFERENT
-    FLOW-DEP-LENGTH ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void acr1201();
-static void acr1202();
-static void acr1203();
-static void acr1204();
-static void acr1205();
-static void acr1206();
-static void acr1207();
-static void acr1208();
-static void acr1209();
-static void acr1210();
-static void acr1211();
-static void acr1212();
-static void acr1213();
-static void acr1214();
-static void acr1215();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int i, j;
-
-int main(int an, char **as)
-{
-    printf("===START OF ACR12========================\n");
-    /* ---------------------------------------- */
-    acr1201();
-    /* ---------------------------------------- */
-    acr1202();
-    /* ---------------------------------------- */
-    acr1203();
-    /* ---------------------------------------- */
-    acr1204();
-    /* ---------------------------------------- */
-    acr1205();
-    /* ---------------------------------------- */
-    acr1206();
-    /* ---------------------------------------- */
-    acr1207();
-    /* ---------------------------------------- */
-    acr1208();
-    /* ---------------------------------------- */
-    acr1209();
-    /* ---------------------------------------- */
-    acr1210();
-    /* ---------------------------------------- */
-    acr1211();
-    /* ---------------------------------------- */
-    acr1212();
-    /* ---------------------------------------- */
-    acr1213();
-    /* ---------------------------------------- */
-    acr1214();
-    /* ---------------------------------------- */
-    acr1215();
-    /* ---------------------------------------- */
-
-    printf("=== END OF ACR12 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------acr1201*/
-void acr1201()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1201 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[*][block]
-    int (*A)[M];
-    A = (int (*)[M])malloc(N * sizeof(int[M]));
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i + 1][j] + C[i][j + 1] + C[i - 1][j] + C[i][j - 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[1:1][1:1])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i + 1][j] + A[i][j + 1] + A[i - 1][j] + A[i][j - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1202*/
-void acr1202()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1202 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][*]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i + 1][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:1][0:0])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i + 1][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1203*/
-void acr1203()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1203 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[*][block]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i - 1][j] + C[i][j + 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[1:0][0:1])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i - 1][j] + A[i][j + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1204*/
-void acr1204()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1204 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][*], shadow[1:1][0:1]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i + 1][j] + C[i][j + 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:1][0:1])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i + 1][j] + A[i][j + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi, nloopj)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1205*/
-void acr1205()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1205 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[*][block], shadow[0:1][1:1]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i][j - 1] + C[i + 1][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:1][1:0])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i][j - 1] + A[i + 1][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1206*/
-void acr1206()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1206 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][*], shadow[2:2][2:2]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i + 2][j] + C[i][j + 2] + C[i + 2][j] + C[i - 2][j] + C[i][j - 2];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[2:2][2:2])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i + 2][j] + A[i][j + 2] + A[i + 2][j] + A[i - 2][j] + A[i][j - 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1207*/
-void acr1207()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1207 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[*][block], shadow[2:2][2:2]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i + 2][j] + C[i][j + 2] + C[i][j - 2];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:2][2:2])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i + 2][j] + A[i][j + 2] + A[i][j - 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1208*/
-void acr1208()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1208 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][*], shadow[2:2][2:2]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i - 1][j] + C[i][j - 1] + C[i - 2][j] + C[i + 2][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[2:2][2:0])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i - 1][j] + A[i][j - 1] + A[i - 2][j] + A[i + 2][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1209*/
-void acr1209()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1209 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[*][block], shadow[2:2][0:2]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i][j + 2] + C[i + 1][j] + C[i + 2][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[2:2][0:2])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i][j + 2] + A[i + 1][j] + A[i + 2][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1210*/
-void acr1210()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1210 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][*], shadow[3:3][3:3]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            C[i][j] = C[i + 1][j] + C[i][j + 2] + C[i + 3][j] + C[i][j -3 ] + C[i - 2][j] + C[i][j - 1];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[3:3][3:3])
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            A[i][j] = A[i + 1][j] + A[i][j + 2] + A[i + 3][j] + A[i][j - 3] + A[i - 2][j] + A[i][j - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1211*/
-void acr1211()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1211 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[*][block], shadow[3:3][0:3]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i][j] + C[i][j + 1];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:0][0:1])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i][j] + A[i][j + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1212*/
-void acr1212()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1212 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][*], shadow[0:3][3:3]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i][j] + C[i + 1][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:1][0:0])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i][j] + A[i + 1][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1213*/
-void acr1213()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1213 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[*][block], shadow[3:3][3:0]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            C[i][j] = C[i][j - 3] + C[i + 3][j] + C[i - 3][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[3:3][3:0])
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            A[i][j] = A[i][j - 3] + A[i + 3][j] + A[i - 3][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1214*/
-void acr1214()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "acr1214 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][*], shadow[3:0][3:3]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            C[i][j] = C[i - 3][j] + C[i][j + 3];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[3:0][3:3])
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            A[i][j] = A[i - 3][j] + A[i][j + 3];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------acr1215*/
-void acr1215()
-{
-    #define NL 1000
-    #define N 59
-    #define M 59
-    char tname[] = "acr1215 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[*][block], shadow[11:11][11:11]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            C[i][j] = C[i + 11][j] + C[i][j + 10] + C[i + 9][j] + C[i][j - 11] + C[i - 10][j] + C[i][j - 9];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[10:11][11:10])
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            A[i][j] = A[i + 11][j] + A[i][j + 10] + A[i + 9][j] + A[i][j - 11] + A[i - 10][j] + A[i][j - 9];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ----------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr22.cdv
deleted file mode 100644
index a742575..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr22.cdv
+++ /dev/null
@@ -1,939 +0,0 @@
-/*  ACR22
-
-    TESTING OF THE ACROSS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M) IS TO HAVE DIFFERENT
-    FLOW-DEP-LENGTH ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void acr2201();
-static void acr2202();
-static void acr2203();
-static void acr2204();
-static void acr2205();
-static void acr2206();
-static void acr2207();
-static void acr2208();
-static void acr2209();
-static void acr2210();
-static void acr2211();
-static void acr2212();
-static void acr2213();
-static void acr2214();
-static void acr2215();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int i, j;
-
-int main(int an, char **as)
-{
-    printf("===START OF ACR22========================\n");
-    /* ---------------------------------------- */
-    acr2201();
-    /* ---------------------------------------- */
-    acr2202();
-    /* ---------------------------------------- */
-    acr2203();
-    /* ---------------------------------------- */
-    acr2204();
-    /* ---------------------------------------- */
-    acr2205();
-    /* ---------------------------------------- */
-    acr2206();
-    /* ---------------------------------------- */
-    acr2207();
-    /* ---------------------------------------- */
-    acr2208();
-    /* ---------------------------------------- */
-    acr2209();
-    /* ---------------------------------------- */
-    acr2210();
-    /* ---------------------------------------- */
-    acr2211();
-    /* ---------------------------------------- */
-    acr2212();
-    /* ---------------------------------------- */
-    acr2213();
-    /* ---------------------------------------- */
-    acr2214();
-    /* ---------------------------------------- */
-    acr2215();
-    /* ---------------------------------------- */
-
-    printf("=== END OF ACR22 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------ACR2201*/
-void acr2201()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2201 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block]
-    int (*A)[M];
-    A = (int (*)[M])malloc(N * sizeof(int[M]));
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i + 1][j] + C[i][j + 1] + C[i - 1][j] + C[i][j - 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[1:1][1:1])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i + 1][j] + A[i][j + 1] + A[i - 1][j] + A[i][j - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2202*/
-void acr2202()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2202 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i + 1][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:1][0:0])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i + 1][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2203*/
-void acr2203()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2203 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i - 1][j] + C[i][j + 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[1:0][0:1])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i - 1][j] + A[i][j + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2204*/
-void acr2204()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2204 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[1:1][0:1]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i + 1][j] + C[i][j + 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:1][0:1])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i + 1][j] + A[i][j + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi, nloopj)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2205*/
-void acr2205()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2205 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[0:1][1:1]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            C[i][j] = C[i][j - 1] + C[i + 1][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:1][1:0])
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            A[i][j] = A[i][j - 1] + A[i + 1][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2206*/
-void acr2206()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2206 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[2:2][2:2]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i + 2][j] + C[i][j + 2] + C[i + 2][j] + C[i - 2][j] + C[i][j - 2];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[2:2][2:2])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i + 2][j] + A[i][j + 2] + A[i + 2][j] + A[i - 2][j] + A[i][j - 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2207*/
-void acr2207()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2207 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[2:2][2:2]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i + 2][j] + C[i][j + 2] + C[i][j - 2];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:2][2:2])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i + 2][j] + A[i][j + 2] + A[i][j - 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2208*/
-void acr2208()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2208 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[2:2][2:2]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i - 1][j] + C[i][j - 1] + C[i - 2][j] + C[i + 2][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[2:2][2:0])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i - 1][j] + A[i][j - 1] + A[i - 2][j] + A[i + 2][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2209*/
-void acr2209()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2209 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[2:2][0:2]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i][j + 2] + C[i + 1][j] + C[i + 2][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[2:2][0:2])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i][j + 2] + A[i + 1][j] + A[i + 2][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2210*/
-void acr2210()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2210 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[3:3][3:3]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            C[i][j] = C[i + 1][j] + C[i][j + 2] + C[i + 3][j] + C[i][j -3 ] + C[i - 2][j] + C[i][j - 1];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[3:3][3:3])
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            A[i][j] = A[i + 1][j] + A[i][j + 2] + A[i + 3][j] + A[i][j - 3] + A[i - 2][j] + A[i][j - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2211*/
-void acr2211()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2211 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[3:3][0:3]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i][j] + C[i][j + 1];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:0][0:1])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i][j] + A[i][j + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2212*/
-void acr2212()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2212 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[0:3][3:3]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            C[i][j] = C[i][j] + C[i + 1][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[0:1][0:0])
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            A[i][j] = A[i][j] + A[i + 1][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2213*/
-void acr2213()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2213 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[3:3][3:0]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            C[i][j] = C[i][j - 3] + C[i + 3][j] + C[i - 3][j];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[3:3][3:0])
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            A[i][j] = A[i][j - 3] + A[i + 3][j] + A[i - 3][j];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2214*/
-void acr2214()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    char tname[] = "ACR2214 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[3:0][3:3]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            C[i][j] = C[i - 3][j] + C[i][j + 3];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[3:0][3:3])
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            A[i][j] = A[i - 3][j] + A[i][j + 3];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ---------------------------------------------ACR2215*/
-void acr2215()
-{
-    #define NL 1000
-    #define N 59
-    #define M 59
-    char tname[] = "ACR2215 ";
-    int nloopi, nloopj;
-    #pragma dvm array distribute[block][block], shadow[11:11][11:11]
-    int A[N][M];
-    int (*C)[M];
-    C = (int (*)[M])malloc(N * sizeof(int[M]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            C[i][j] = NNL + i + j;
-    nloopi = NL;
-    nloopj = NL;
-
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            C[i][j] = C[i + 11][j] + C[i][j + 10] + C[i + 9][j] + C[i][j - 11] + C[i - 10][j] + C[i][j - 9];
-
-    #pragma dvm actual(nloopi, nloopj)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) across(A[10:11][11:10])
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            A[i][j] = A[i + 11][j] + A[i][j + 10] + A[i + 9][j] + A[i][j - 11] + A[i - 10][j] + A[i][j - 9];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            if (A[i][j] != C[i][j]) {
-                nloopi = Min(nloopi, i);
-                nloopj = Min(nloopj, j);
-            }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    #undef NL
-    #undef N
-    #undef M
-}
-/* ----------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr23.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr23.cdv
deleted file mode 100644
index 9c87451..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr23.cdv
+++ /dev/null
@@ -1,675 +0,0 @@
-/*  ACR23
-
-    TESTING OF THE ACROSS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M,K) IS TO HAVE DIFFERENT
-    FLOW-DEP-LENGTH ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void acr2301();
-static void acr2302();
-static void acr2303();
-static void acr2304();
-static void acr2305();
-static void acr2306();
-static void acr2307();
-static void acr2308();
-static void acr2309();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int i, j, ii;
-
-int main(int an, char **as)
-{
-    printf("===START OF ACR23========================\n");
-    /* ---------------------------------------- */
-    acr2301();
-    /* ---------------------------------------- */
-    acr2302();
-    /* ---------------------------------------- */
-    acr2303();
-    /* ---------------------------------------- */
-    acr2304();
-    /* ---------------------------------------- */
-    acr2305();
-    /* ---------------------------------------- */
-    acr2306();
-    /* ---------------------------------------- */
-    acr2307();
-    /* ---------------------------------------- */
-    acr2308();
-    /* ---------------------------------------- */
-    acr2309();
-    /* ---------------------------------------- */
-
-    printf("=== END OF ACR23 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------ACR2301*/
-void acr2301()
-{
-    #define NL 1000
-    #define N 16
-    #define M 8
-    #define K 8
-    char tname[] = "ACR2301 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[*][block][block]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                C[i][j][ii] = C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1] + C[i - 1][j][ii] + C[i][j - 1][ii] +  C[i][j][ii - 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[1:1][1:1][1:1])
-    for (ii = 1; ii < K - 1; ii++)
-        for (j = 1; j < M - 1; j++)
-            for (i = 1; i < N - 1; i++)
-                A[i][j][ii] = A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1] + A[i - 1][j][ii] + A[i][j - 1][ii] +  A[i][j][ii - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 1; ii < K - 1; ii++)
-        for (j = 1; j < M - 1; j++)
-            for (i = 1; i < N - 1; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR2302*/
-void acr2302()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    char tname[] = "ACR2302 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][*][block], shadow[2:2][2:2][2:2]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                C[i][j][ii] = C[i + 2][j][ii] + C[i][j - 2][ii] + C[i][j][ii - 1] + C[i - 1][j][ii] + C[i + 1][j][ii] + C[i][j - 1][ii] + C[i][j + 2][ii] + C[i][j][ii + 2];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[1:2][2:2][1:2])
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                A[i][j][ii] = A[i + 2][j][ii] + A[i][j - 2][ii] + A[i][j][ii - 1] + A[i - 1][j][ii] + A[i + 1][j][ii] + A[i][j - 1][ii] + A[i][j + 2][ii] + A[i][j][ii + 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR2303*/
-void acr2303()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    char tname[] = "ACR2303 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][*], shadow[2:2][2:2][2:2]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                C[i][j][ii] = C[i + 2][j][ii] + C[i][j + 2][ii] + C[i][j][ii + 2] + C[i][j - 2][ii] +  C[i][j - 1][ii] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[0:2][2:2][0:2])
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                A[i][j][ii] = A[i + 2][j][ii] + A[i][j + 2][ii] + A[i][j][ii + 2] + A[i][j - 2][ii] +  A[i][j - 1][ii] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR2304*/
-void acr2304()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    char tname[] = "ACR2304 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[*][block][block], shadow[2:2][2:2][2:2]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                C[i][j][ii] = C[i + 2][j][ii] + C[i][j][ii - 2] + C[i - 2][j][ii] +  C[i][j - 2][ii] + C[i - 1][j][ii] + C[i][j - 1][ii] + C[i][j][ii - 1] + C[i + 1][j][ii];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[2:2][2:0][2:0])
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                A[i][j][ii] = A[i + 2][j][ii] + A[i][j][ii - 2] + A[i - 2][j][ii] +  A[i][j - 2][ii] + A[i - 1][j][ii] + A[i][j - 1][ii] + A[i][j][ii - 1] + A[i + 1][j][ii];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR2305*/
-void acr2305()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    char tname[] = "ACR2305 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][*][block], shadow[0:2][2:2][0:2]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                C[i][j][ii] = C[i + 2][j][ii] + C[i][j + 2][ii] + C[i][j][ii + 2] + C[i][j - 2][ii] + C[i][j - 1][ii] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[0:2][2:2][0:2])
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                A[i][j][ii] = A[i + 2][j][ii] + A[i][j + 2][ii] + A[i][j][ii + 2] + A[i][j - 2][ii] + A[i][j - 1][ii] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR2306*/
-void acr2306()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    char tname[] = "ACR2306 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][*], shadow[3:3][3:3][3:3]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                C[i][j][ii] = C[i + 3][j][ii] + C[i][j + 3][ii] + C[i][j][ii + 3] + C[i - 3][j][ii] + C[i][j - 3][ii] + C[i][j][ii - 3] + C[i + 2][j][ii] + C[i][j + 2][ii] + C[i][j][ii + 2] + C[i - 2][j][ii] + C[i][j - 2][ii] + C[i][j][ii - 2] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1] + C[i - 1][j][ii] + C[i][j - 1][ii] + C[i][j][ii - 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[3:3][3:3][3:3])
-    for (ii = 3; ii < K - 3; ii++)
-        for (j = 3; j < M - 3; j++)
-            for (i = 3; i < N - 3; i++)
-                A[i][j][ii] = A[i + 3][j][ii] + A[i][j + 3][ii] + A[i][j][ii + 3] + A[i - 3][j][ii] + A[i][j - 3][ii] + A[i][j][ii - 3] + A[i + 2][j][ii] + A[i][j + 2][ii] + A[i][j][ii + 2] + A[i - 2][j][ii] + A[i][j - 2][ii] + A[i][j][ii - 2] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1] + A[i - 1][j][ii] + A[i][j - 1][ii] + A[i][j][ii - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 3; ii < K - 3; ii++)
-        for (j = 3; j < M - 3; j++)
-            for (i = 3; i < N - 3; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR2307*/
-void acr2307()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    char tname[] = "ACR2307 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[*][block][block], shadow[3:3][0:3][3:0]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                C[i][j][ii] = C[i + 3][j][ii] + C[i][j + 3][ii] + C[i - 3][j][ii] + C[i][j][ii - 3] + C[i + 2][j][ii] + C[i][j + 2][ii] + C[i - 2][j][ii] + C[i][j][ii - 2] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i - 1][j][ii] + C[i][j][ii - 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[3:3][0:3][3:0])
-    for (ii = 3; ii < K - 3; ii++)
-        for (j = 3; j < M - 3; j++)
-            for (i = 3; i < N - 3; i++)
-                A[i][j][ii] = A[i + 3][j][ii] + A[i][j + 3][ii] + A[i - 3][j][ii] + A[i][j][ii - 3] + A[i + 2][j][ii] + A[i][j + 2][ii] + A[i - 2][j][ii] + A[i][j][ii - 2] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i - 1][j][ii] + A[i][j][ii - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 3; ii < K - 3; ii++)
-        for (j = 3; j < M - 3; j++)
-            for (i = 3; i < N - 3; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR2308*/
-void acr2308()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    char tname[] = "ACR2308 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][*][block], shadow[0:3][0:3][0:3]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 0; i < N - 3; i++)
-        for (j = 0; j < M - 3; j++)
-            for (ii = 0; ii < K - 3; ii++)
-                C[i][j][ii] = C[i + 3][j][ii] + C[i][j + 3][ii] + C[i][j][ii + 3] + C[i + 2][j][ii] + C[i][j + 2][ii] + C[i][j][ii + 2] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[0:3][0:3][0:3])
-    for (ii = 0; ii < K - 3; ii++)
-        for (j = 0; j < M - 3; j++)
-            for (i = 0; i < N - 3; i++)
-                A[i][j][ii] = A[i + 3][j][ii] + A[i][j + 3][ii] + A[i][j][ii + 3] + A[i + 2][j][ii] + A[i][j + 2][ii] + A[i][j][ii + 2] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 0; ii < K - 3; ii++)
-        for (j = 0; j < M - 3; j++)
-            for (i = 0; i < N - 3; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR2309*/
-void acr2309()
-{
-    #define NL 1000
-    #define N 59
-    #define M 59
-    #define K 59
-    char tname[] = "ACR2309 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][*], shadow[11:11][11:11][11:11]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            for (ii = 11; ii < K - 11; ii++)
-                C[i][j][ii] = C[i + 11][j][ii] + C[i][j + 11][ii] + C[i][j][ii + 11] + C[i - 11][j][ii] + C[i][j - 11][ii] + C[i][j][ii - 11] + C[i + 10][j][ii] + C[i][j + 10][ii] + C[i][j][ii + 10] + C[i - 10][j][ii] + C[i][j - 10][ii] + C[i][j][ii - 10] + C[i - 9][j][ii]  + C[i][j - 9][ii]  + C[i][j][ii - 9] + C[i + 9][j][ii]  + C[i][j + 9][ii]  + C[i][j][ii + 9];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[11:11][11:11][11:11])
-    for (ii = 11; ii < K - 11; ii++)
-        for (j = 11; j < M - 11; j++)
-            for (i = 11; i < N - 11; i++)
-                A[i][j][ii] = A[i + 11][j][ii] + A[i][j + 11][ii] + A[i][j][ii + 11] + A[i - 11][j][ii] + A[i][j - 11][ii] + A[i][j][ii - 11] + A[i + 10][j][ii] + A[i][j + 10][ii] + A[i][j][ii + 10] + A[i - 10][j][ii] + A[i][j - 10][ii] + A[i][j][ii - 10] + A[i - 9][j][ii]  + A[i][j - 9][ii]  + A[i][j][ii - 9] + A[i + 9][j][ii]  + A[i][j + 9][ii]  + A[i][j][ii + 9];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 11; ii < K - 11; ii++)
-        for (j = 11; j < M - 11; j++)
-            for (i = 11; i < N - 11; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ----------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr33.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr33.cdv
deleted file mode 100644
index 7e4aee2..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr33.cdv
+++ /dev/null
@@ -1,675 +0,0 @@
-/*  ACR33
-
-    TESTING OF THE ACROSS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M,K) IS TO HAVE DIFFERENT
-    FLOW-DEP-LENGTH ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void acr3301();
-static void acr3302();
-static void acr3303();
-static void acr3304();
-static void acr3305();
-static void acr3306();
-static void acr3307();
-static void acr3308();
-static void acr3309();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int i, j, ii;
-
-int main(int an, char **as)
-{
-    printf("===START OF ACR33========================\n");
-    /* ---------------------------------------- */
-    acr3301();
-    /* ---------------------------------------- */
-    acr3302();
-    /* ---------------------------------------- */
-    acr3303();
-    /* ---------------------------------------- */
-    acr3304();
-    /* ---------------------------------------- */
-    acr3305();
-    /* ---------------------------------------- */
-    acr3306();
-    /* ---------------------------------------- */
-    acr3307();
-    /* ---------------------------------------- */
-    acr3308();
-    /* ---------------------------------------- */
-    acr3309();
-    /* ---------------------------------------- */
-
-    printf("=== END OF ACR33 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------ACR3301*/
-void acr3301()
-{
-    #define NL 1000
-    #define N 16
-    #define M 8
-    #define K 8
-    char tname[] = "ACR3301 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][block]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                C[i][j][ii] = C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1] + C[i - 1][j][ii] + C[i][j - 1][ii] +  C[i][j][ii - 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[1:1][1:1][1:1])
-    for (ii = 1; ii < K - 1; ii++)
-        for (j = 1; j < M - 1; j++)
-            for (i = 1; i < N - 1; i++)
-                A[i][j][ii] = A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1] + A[i - 1][j][ii] + A[i][j - 1][ii] +  A[i][j][ii - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 1; ii < K - 1; ii++)
-        for (j = 1; j < M - 1; j++)
-            for (i = 1; i < N - 1; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR3302*/
-void acr3302()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    char tname[] = "ACR3302 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][block], shadow[2:2][2:2][2:2]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                C[i][j][ii] = C[i + 2][j][ii] + C[i][j - 2][ii] + C[i][j][ii - 1] + C[i - 1][j][ii] + C[i + 1][j][ii] + C[i][j - 1][ii] + C[i][j + 2][ii] + C[i][j][ii + 2];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[1:2][2:2][1:2])
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                A[i][j][ii] = A[i + 2][j][ii] + A[i][j - 2][ii] + A[i][j][ii - 1] + A[i - 1][j][ii] + A[i + 1][j][ii] + A[i][j - 1][ii] + A[i][j + 2][ii] + A[i][j][ii + 2];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR3303*/
-void acr3303()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    char tname[] = "ACR3303 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][block], shadow[2:2][2:2][2:2]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                C[i][j][ii] = C[i + 2][j][ii] + C[i][j + 2][ii] + C[i][j][ii + 2] + C[i][j - 2][ii] +  C[i][j - 1][ii] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[0:2][2:2][0:2])
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                A[i][j][ii] = A[i + 2][j][ii] + A[i][j + 2][ii] + A[i][j][ii + 2] + A[i][j - 2][ii] +  A[i][j - 1][ii] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR3304*/
-void acr3304()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    char tname[] = "ACR3304 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][block], shadow[2:2][2:2][2:2]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                C[i][j][ii] = C[i + 2][j][ii] + C[i][j][ii - 2] + C[i - 2][j][ii] +  C[i][j - 2][ii] + C[i - 1][j][ii] + C[i][j - 1][ii] + C[i][j][ii - 1] + C[i + 1][j][ii];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[2:2][2:0][2:0])
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                A[i][j][ii] = A[i + 2][j][ii] + A[i][j][ii - 2] + A[i - 2][j][ii] +  A[i][j - 2][ii] + A[i - 1][j][ii] + A[i][j - 1][ii] + A[i][j][ii - 1] + A[i + 1][j][ii];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR3305*/
-void acr3305()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    char tname[] = "ACR3305 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][block], shadow[0:2][2:2][0:2]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                C[i][j][ii] = C[i + 2][j][ii] + C[i][j + 2][ii] + C[i][j][ii + 2] + C[i][j - 2][ii] + C[i][j - 1][ii] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[0:2][2:2][0:2])
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                A[i][j][ii] = A[i + 2][j][ii] + A[i][j + 2][ii] + A[i][j][ii + 2] + A[i][j - 2][ii] + A[i][j - 1][ii] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 2; ii < K - 2; ii++)
-        for (j = 2; j < M - 2; j++)
-            for (i = 2; i < N - 2; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR3306*/
-void acr3306()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    char tname[] = "ACR3306 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][block], shadow[3:3][3:3][3:3]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                C[i][j][ii] = C[i + 3][j][ii] + C[i][j + 3][ii] + C[i][j][ii + 3] + C[i - 3][j][ii] + C[i][j - 3][ii] + C[i][j][ii - 3] + C[i + 2][j][ii] + C[i][j + 2][ii] + C[i][j][ii + 2] + C[i - 2][j][ii] + C[i][j - 2][ii] + C[i][j][ii - 2] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1] + C[i - 1][j][ii] + C[i][j - 1][ii] + C[i][j][ii - 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[3:3][3:3][3:3])
-    for (ii = 3; ii < K - 3; ii++)
-        for (j = 3; j < M - 3; j++)
-            for (i = 3; i < N - 3; i++)
-                A[i][j][ii] = A[i + 3][j][ii] + A[i][j + 3][ii] + A[i][j][ii + 3] + A[i - 3][j][ii] + A[i][j - 3][ii] + A[i][j][ii - 3] + A[i + 2][j][ii] + A[i][j + 2][ii] + A[i][j][ii + 2] + A[i - 2][j][ii] + A[i][j - 2][ii] + A[i][j][ii - 2] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1] + A[i - 1][j][ii] + A[i][j - 1][ii] + A[i][j][ii - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 3; ii < K - 3; ii++)
-        for (j = 3; j < M - 3; j++)
-            for (i = 3; i < N - 3; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR3307*/
-void acr3307()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    char tname[] = "ACR3307 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][block], shadow[3:3][0:3][3:0]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                C[i][j][ii] = C[i + 3][j][ii] + C[i][j + 3][ii] + C[i - 3][j][ii] + C[i][j][ii - 3] + C[i + 2][j][ii] + C[i][j + 2][ii] + C[i - 2][j][ii] + C[i][j][ii - 2] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i - 1][j][ii] + C[i][j][ii - 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[3:3][0:3][3:0])
-    for (ii = 3; ii < K - 3; ii++)
-        for (j = 3; j < M - 3; j++)
-            for (i = 3; i < N - 3; i++)
-                A[i][j][ii] = A[i + 3][j][ii] + A[i][j + 3][ii] + A[i - 3][j][ii] + A[i][j][ii - 3] + A[i + 2][j][ii] + A[i][j + 2][ii] + A[i - 2][j][ii] + A[i][j][ii - 2] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i - 1][j][ii] + A[i][j][ii - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 3; ii < K - 3; ii++)
-        for (j = 3; j < M - 3; j++)
-            for (i = 3; i < N - 3; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR3308*/
-void acr3308()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    char tname[] = "ACR3308 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][block], shadow[0:3][0:3][0:3]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 0; i < N - 3; i++)
-        for (j = 0; j < M - 3; j++)
-            for (ii = 0; ii < K - 3; ii++)
-                C[i][j][ii] = C[i + 3][j][ii] + C[i][j + 3][ii] + C[i][j][ii + 3] + C[i + 2][j][ii] + C[i][j + 2][ii] + C[i][j][ii + 2] + C[i + 1][j][ii] + C[i][j + 1][ii] + C[i][j][ii + 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[0:3][0:3][0:3])
-    for (ii = 0; ii < K - 3; ii++)
-        for (j = 0; j < M - 3; j++)
-            for (i = 0; i < N - 3; i++)
-                A[i][j][ii] = A[i + 3][j][ii] + A[i][j + 3][ii] + A[i][j][ii + 3] + A[i + 2][j][ii] + A[i][j + 2][ii] + A[i][j][ii + 2] + A[i + 1][j][ii] + A[i][j + 1][ii] + A[i][j][ii + 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 0; ii < K - 3; ii++)
-        for (j = 0; j < M - 3; j++)
-            for (i = 0; i < N - 3; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ---------------------------------------------ACR3309*/
-void acr3309()
-{
-    #define NL 1000
-    #define N 59
-    #define M 59
-    #define K 59
-    char tname[] = "ACR3309 ";
-    int nloopi, nloopj, nloopii;
-    #pragma dvm array distribute[block][block][block], shadow[11:11][11:11][11:11]
-    int (*A)[M][K];
-    A = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int (*C)[M][K];
-    C = (int (*)[M][K])malloc(N * sizeof(int[M][K]));
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                C[i][j][ii] = NNL + i + j + ii;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            for (ii = 11; ii < K - 11; ii++)
-                C[i][j][ii] = C[i + 11][j][ii] + C[i][j + 11][ii] + C[i][j][ii + 11] + C[i - 11][j][ii] + C[i][j - 11][ii] + C[i][j][ii - 11] + C[i + 10][j][ii] + C[i][j + 10][ii] + C[i][j][ii + 10] + C[i - 10][j][ii] + C[i][j - 10][ii] + C[i][j][ii - 10] + C[i - 9][j][ii]  + C[i][j - 9][ii]  + C[i][j][ii - 9] + C[i + 9][j][ii]  + C[i][j + 9][ii]  + C[i][j][ii + 9];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii])
-    for (ii = 0; ii < K; ii++)
-        for (j = 0; j < M; j++)
-            for (i = 0; i < N; i++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) across(A[11:11][11:11][11:11])
-    for (ii = 11; ii < K - 11; ii++)
-        for (j = 11; j < M - 11; j++)
-            for (i = 11; i < N - 11; i++)
-                A[i][j][ii] = A[i + 11][j][ii] + A[i][j + 11][ii] + A[i][j][ii + 11] + A[i - 11][j][ii] + A[i][j - 11][ii] + A[i][j][ii - 11] + A[i + 10][j][ii] + A[i][j + 10][ii] + A[i][j][ii + 10] + A[i - 10][j][ii] + A[i][j - 10][ii] + A[i][j][ii - 10] + A[i - 9][j][ii]  + A[i][j - 9][ii]  + A[i][j][ii - 9] + A[i + 9][j][ii]  + A[i][j + 9][ii]  + A[i][j][ii + 9];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([ii][j][i] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (ii = 11; ii < K - 11; ii++)
-        for (j = 11; j < M - 11; j++)
-            for (i = 11; i < N - 11; i++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    nloopi = Min(nloopi, i);
-                    nloopj = Min(nloopj, j);
-                    nloopii = Min(nloopii, ii);
-                }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-}
-/* ----------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr34.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr34.cdv
deleted file mode 100644
index a58a683..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr34.cdv
+++ /dev/null
@@ -1,723 +0,0 @@
-/*  ACR34
-
-    TESTING OF THE ACROSS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT
-    FLOW-DEP-LENGTH ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void acr3401();
-static void acr3402();
-static void acr3403();
-static void acr3404();
-static void acr3405();
-static void acr3406();
-static void acr3407();
-static void acr3408();
-static void acr3409();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int i, j, ii, jj;
-
-int main(int an, char **as)
-{
-    printf("===START OF ACR34========================\n");
-    /* ---------------------------------------- */
-    acr3401();
-    /* ---------------------------------------- */
-    acr3402();
-    /* ---------------------------------------- */
-    acr3403();
-    /* ---------------------------------------- */
-    acr3404();
-    /* ---------------------------------------- */
-    acr3405();
-    /* ---------------------------------------- */
-    acr3406();
-    /* ---------------------------------------- */
-    acr3407();
-    /* ---------------------------------------- */
-    acr3408();
-    /* ---------------------------------------- */
-    acr3409();
-    /* ---------------------------------------- */
-
-    printf("=== END OF ACR34 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------ACR3401*/
-void acr3401()
-{
-    #define NL 1000
-    #define N 16
-    #define M 8
-    #define K 8
-    #define L 8
-    char tname[] = "ACR3401 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][block][block][block]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-    printf("1234r5\n");
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    C[i][j][ii][jj] = C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[1:1][1:1][1:1][1:1])
-    for (jj = 1; jj < L - 1; jj++)
-        for (ii = 1; ii < K - 1; ii++)
-            for (j = 1; j < M - 1; j++)
-                for (i = 1; i < N - 1; i++)
-                    A[i][j][ii][jj] = A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 1; jj < L - 1; jj++)
-        for (ii = 1; ii < K - 1; ii++)
-            for (j = 1; j < M - 1; j++)
-                for (i = 1; i < N - 1; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR3402*/
-void acr3402()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    #define L 10
-    char tname[] = "ACR3402 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][block][block][block], shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 2] + C[i - 1][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i][j][ii][jj - 1] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii][jj + 1] + C[i][j - 1][ii][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[1:2][2:2][2:1][1:2])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 2] + A[i - 1][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i][j][ii][jj - 1] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii][jj + 1] + A[i][j - 1][ii][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR3403*/
-void acr3403()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    #define L 10
-    char tname[] = "ACR3403 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][block][block][block], shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i][j][ii][jj - 2] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[2:0][2:2][2:0][2:0])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i][j][ii][jj - 2] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR3404*/
-void acr3404()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    #define L 10
-    char tname[] = "ACR3404 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][block][block][block], shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i + 2][j][ii][jj] + C[i][j][ii][jj + 2] + C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i + 1][j][ii][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[2:2][2:0][2:0][0:2])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i + 2][j][ii][jj] + A[i][j][ii][jj + 2] + A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i + 1][j][ii][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR3405*/
-void acr3405()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR3405 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][block][block][block], shadow[2:2][2:0][0:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i + 2][j][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj + 2] + C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii][jj - 2] + C[i + 1][j][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[2:2][2:0][0:2][2:2])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i + 2][j][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj + 2] + A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii][jj - 2] + A[i + 1][j][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR3406*/
-void acr3406()
-{
-    #define NL 1000
-    #define N 32
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR3406 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][block][block][block], shadow[3:3][3:3][3:3][3:3]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    C[i][j][ii][jj] = C[i + 3][j][ii][jj] + C[i][j + 3][ii][jj] + C[i][j][ii + 3][jj] + C[i][j][ii][jj + 3] + C[i - 3][j][ii][jj] + C[i][j - 3][ii][jj] + C[i][j][ii - 3][jj] + C[i][j][ii][jj - 3] + C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj + 2] + C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i][j][ii][jj - 2] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[3:3][3:3][3:3][3:3])
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    A[i][j][ii][jj] = A[i + 3][j][ii][jj] + A[i][j + 3][ii][jj] + A[i][j][ii + 3][jj] + A[i][j][ii][jj + 3] + A[i - 3][j][ii][jj] + A[i][j - 3][ii][jj] + A[i][j][ii - 3][jj] + A[i][j][ii][jj - 3] + A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj + 2] + A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i][j][ii][jj - 2] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR3407*/
-void acr3407()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR3407 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][block][block][block], shadow[0:3][3:3][0:3][0:3]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    C[i][j][ii][jj] = C[i + 3][j][ii][jj] + C[i][j + 3][ii][jj] + C[i][j][ii + 3][jj] + C[i][j][ii][jj + 3] + C[i][j - 3][ii][jj] + C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj + 2] + C[i][j - 2][ii][jj] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i][j - 1][ii][jj];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[0:3][3:3][0:3][0:3])
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    A[i][j][ii][jj] = A[i + 3][j][ii][jj] + A[i][j + 3][ii][jj] + A[i][j][ii + 3][jj] + A[i][j][ii][jj + 3] + A[i][j - 3][ii][jj] + A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj + 2] + A[i][j - 2][ii][jj] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i][j - 1][ii][jj];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR3408*/
-void acr3408()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR3408 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][block][block][block], shadow[0:3][3:3][0:3][3:0]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    C[i][j][ii][jj] = C[i + 3][j][ii][jj] + C[i][j + 3][ii][jj] + C[i][j][ii + 3][jj] + C[i][j][ii][jj - 3] + C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj - 2] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[0:3][0:3][0:3][3:0])
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    A[i][j][ii][jj] = A[i + 3][j][ii][jj] + A[i][j + 3][ii][jj] + A[i][j][ii + 3][jj] + A[i][j][ii][jj - 3] + A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj - 2] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR3409*/
-void acr3409()
-{
-    #define NL 1000
-    #define N 59
-    #define M 59
-    #define K 59
-    #define L 59
-    char tname[] = "ACR3409 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[*][block][block][block], shadow[11:11][11:11][11:11][11:11]
-    int (*A)[M][K][L];
-    int (*C)[M][K][L];
-    int NNL = NL;
-    A = malloc(N * M * K * L * sizeof(int));
-    C = malloc(N * M * K * L * sizeof(int));
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            for (ii = 11; ii < K - 11; ii++)
-                for (jj = 11; jj < L - 11; jj++)
-                    C[i][j][ii][jj] = C[i + 11][j][ii][jj] + C[i][j + 11][ii][jj] + C[i][j][ii + 11][jj] + C[i][j][ii][jj + 11] + C[i - 11][j][ii][jj] + C[i][j - 11][ii][jj] + C[i][j][ii - 11][jj] + C[i][j][ii][jj - 11];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[11:11][11:11][11:11][11:11])
-    for (jj = 11; jj < L - 11; jj++)
-        for (ii = 11; ii < K - 11; ii++)
-            for (j = 11; j < M - 11; j++)
-                for (i = 11; i < N - 11; i++)
-                    A[i][j][ii][jj] = A[i + 11][j][ii][jj] + A[i][j + 11][ii][jj] + A[i][j][ii + 11][jj] + A[i][j][ii][jj + 11] + A[i - 11][j][ii][jj] + A[i][j - 11][ii][jj] + A[i][j][ii - 11][jj] + A[i][j][ii][jj - 11];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 11; jj < L - 11; jj++)
-        for (ii = 11; ii < K - 11; ii++)
-            for (j = 11; j < M - 11; j++)
-                for (i = 11; i < N - 11; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ----------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr44.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr44.cdv
deleted file mode 100644
index f6a6d92..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/acr44.cdv
+++ /dev/null
@@ -1,723 +0,0 @@
-/*  ACR44
-
-    TESTING OF THE ACROSS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT
-    FLOW-DEP-LENGTH ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void acr4401();
-static void acr4402();
-static void acr4403();
-static void acr4404();
-static void acr4405();
-static void acr4406();
-static void acr4407();
-static void acr4408();
-static void acr4409();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int i, j, ii, jj;
-
-int main(int an, char **as)
-{
-    printf("===START OF ACR44========================\n");
-    /* ---------------------------------------- */
-    acr4401();
-    /* ---------------------------------------- */
-    acr4402();
-    /* ---------------------------------------- */
-    acr4403();
-    /* ---------------------------------------- */
-    acr4404();
-    /* ---------------------------------------- */
-    acr4405();
-    /* ---------------------------------------- */
-    acr4406();
-    /* ---------------------------------------- */
-    acr4407();
-    /* ---------------------------------------- */
-    acr4408();
-    /* ---------------------------------------- */
-    acr4409();
-    /* ---------------------------------------- */
-
-    printf("=== END OF ACR44 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------ACR4401*/
-void acr4401()
-{
-    #define NL 1000
-    #define N 16
-    #define M 8
-    #define K 8
-    #define L 8
-    char tname[] = "ACR4401 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-    printf("1234r5\n");
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    C[i][j][ii][jj] = C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[1:1][1:1][1:1][1:1])
-    for (jj = 1; jj < L - 1; jj++)
-        for (ii = 1; ii < K - 1; ii++)
-            for (j = 1; j < M - 1; j++)
-                for (i = 1; i < N - 1; i++)
-                    A[i][j][ii][jj] = A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 1; jj < L - 1; jj++)
-        for (ii = 1; ii < K - 1; ii++)
-            for (j = 1; j < M - 1; j++)
-                for (i = 1; i < N - 1; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR4402*/
-void acr4402()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    #define L 10
-    char tname[] = "ACR4402 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[block][block][block][block], shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 2] + C[i - 1][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i][j][ii][jj - 1] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii][jj + 1] + C[i][j - 1][ii][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[1:2][2:2][2:1][1:2])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 2] + A[i - 1][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i][j][ii][jj - 1] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii][jj + 1] + A[i][j - 1][ii][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR4403*/
-void acr4403()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    #define L 10
-    char tname[] = "ACR4403 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[block][block][block][block], shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i][j][ii][jj - 2] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, nloopj, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[2:0][2:2][2:0][2:0])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i][j][ii][jj - 2] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR4404*/
-void acr4404()
-{
-    #define NL 1000
-    #define N 16
-    #define M 10
-    #define K 10
-    #define L 10
-    char tname[] = "ACR4404 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[block][block][block][block], shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i + 2][j][ii][jj] + C[i][j][ii][jj + 2] + C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i + 1][j][ii][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[2:2][2:0][2:0][0:2])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i + 2][j][ii][jj] + A[i][j][ii][jj + 2] + A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i + 1][j][ii][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR4405*/
-void acr4405()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR4405 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[block][block][block][block], shadow[2:2][2:0][0:2][2:2]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    C[i][j][ii][jj] = C[i + 2][j][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj + 2] + C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii][jj - 2] + C[i + 1][j][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[2:2][2:0][0:2][2:2])
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    A[i][j][ii][jj] = A[i + 2][j][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj + 2] + A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii][jj - 2] + A[i + 1][j][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 2; jj < L - 2; jj++)
-        for (ii = 2; ii < K - 2; ii++)
-            for (j = 2; j < M - 2; j++)
-                for (i = 2; i < N - 2; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR4406*/
-void acr4406()
-{
-    #define NL 1000
-    #define N 32
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR4406 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[block][block][block][block], shadow[3:3][3:3][3:3][3:3]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    C[i][j][ii][jj] = C[i + 3][j][ii][jj] + C[i][j + 3][ii][jj] + C[i][j][ii + 3][jj] + C[i][j][ii][jj + 3] + C[i - 3][j][ii][jj] + C[i][j - 3][ii][jj] + C[i][j][ii - 3][jj] + C[i][j][ii][jj - 3] + C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj + 2] + C[i - 2][j][ii][jj] + C[i][j - 2][ii][jj] + C[i][j][ii - 2][jj] + C[i][j][ii][jj - 2] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i - 1][j][ii][jj] + C[i][j - 1][ii][jj] + C[i][j][ii - 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[3:3][3:3][3:3][3:3])
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    A[i][j][ii][jj] = A[i + 3][j][ii][jj] + A[i][j + 3][ii][jj] + A[i][j][ii + 3][jj] + A[i][j][ii][jj + 3] + A[i - 3][j][ii][jj] + A[i][j - 3][ii][jj] + A[i][j][ii - 3][jj] + A[i][j][ii][jj - 3] + A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj + 2] + A[i - 2][j][ii][jj] + A[i][j - 2][ii][jj] + A[i][j][ii - 2][jj] + A[i][j][ii][jj - 2] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i - 1][j][ii][jj] + A[i][j - 1][ii][jj] + A[i][j][ii - 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR4407*/
-void acr4407()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR4407 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[block][block][block][block], shadow[0:3][3:3][0:3][0:3]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    C[i][j][ii][jj] = C[i + 3][j][ii][jj] + C[i][j + 3][ii][jj] + C[i][j][ii + 3][jj] + C[i][j][ii][jj + 3] + C[i][j - 3][ii][jj] + C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj + 2] + C[i][j - 2][ii][jj] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj + 1] + C[i][j - 1][ii][jj];
-
-    #pragma dvm actual(nloopi)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[0:3][3:3][0:3][0:3])
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    A[i][j][ii][jj] = A[i + 3][j][ii][jj] + A[i][j + 3][ii][jj] + A[i][j][ii + 3][jj] + A[i][j][ii][jj + 3] + A[i][j - 3][ii][jj] + A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj + 2] + A[i][j - 2][ii][jj] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj + 1] + A[i][j - 1][ii][jj];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR4408*/
-void acr4408()
-{
-    #define NL 1000
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-    char tname[] = "ACR4408 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[block][block][block][block], shadow[0:3][3:3][0:3][3:0]
-    int A[N][M][K][L];
-    int C[N][M][K][L];
-    int NNL = NL;
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    C[i][j][ii][jj] = C[i + 3][j][ii][jj] + C[i][j + 3][ii][jj] + C[i][j][ii + 3][jj] + C[i][j][ii][jj - 3] + C[i + 2][j][ii][jj] + C[i][j + 2][ii][jj] + C[i][j][ii + 2][jj] + C[i][j][ii][jj - 2] + C[i + 1][j][ii][jj] + C[i][j + 1][ii][jj] + C[i][j][ii + 1][jj] + C[i][j][ii][jj - 1];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region inout(C), out(A)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[0:3][0:3][0:3][3:0])
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    A[i][j][ii][jj] = A[i + 3][j][ii][jj] + A[i][j + 3][ii][jj] + A[i][j][ii + 3][jj] + A[i][j][ii][jj - 3] + A[i + 2][j][ii][jj] + A[i][j + 2][ii][jj] + A[i][j][ii + 2][jj] + A[i][j][ii][jj - 2] + A[i + 1][j][ii][jj] + A[i][j + 1][ii][jj] + A[i][j][ii + 1][jj] + A[i][j][ii][jj - 1];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 3; jj < L - 3; jj++)
-        for (ii = 3; ii < K - 3; ii++)
-            for (j = 3; j < M - 3; j++)
-                for (i = 3; i < N - 3; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------ACR4409*/
-void acr4409()
-{
-    #define NL 1000
-    #define N 59
-    #define M 59
-    #define K 59
-    #define L 59
-    char tname[] = "ACR4409 ";
-    int nloopi, nloopj, nloopii, nloopjj;
-    #pragma dvm array distribute[block][block][block][block], shadow[11:11][11:11][11:11][11:11]
-    int (*A)[M][K][L];
-    int (*C)[M][K][L];
-    int NNL = NL;
-    A = malloc(N * M * K * L * sizeof(int));
-    C = malloc(N * M * K * L * sizeof(int));
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NNL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    for (i = 11; i < N - 11; i++)
-        for (j = 11; j < M - 11; j++)
-            for (ii = 11; ii < K - 11; ii++)
-                for (jj = 11; jj < L - 11; jj++)
-                    C[i][j][ii][jj] = C[i + 11][j][ii][jj] + C[i][j + 11][ii][jj] + C[i][j][ii + 11][jj] + C[i][j][ii][jj + 11] + C[i - 11][j][ii][jj] + C[i][j - 11][ii][jj] + C[i][j][ii - 11][jj] + C[i][j][ii][jj - 11];
-
-    #pragma dvm actual(nloopi, C)
-    #pragma dvm region in(C)
-    {
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj])
-    for (jj = 0; jj < L; jj++)
-        for (ii = 0; ii < K; ii++)
-            for (j = 0; j < M; j++)
-                for (i = 0; i < N; i++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) across(A[11:11][11:11][11:11][11:11])
-    for (jj = 11; jj < L - 11; jj++)
-        for (ii = 11; ii < K - 11; ii++)
-            for (j = 11; j < M - 11; j++)
-                for (i = 11; i < N - 11; i++)
-                    A[i][j][ii][jj] = A[i + 11][j][ii][jj] + A[i][j + 11][ii][jj] + A[i][j][ii + 11][jj] + A[i][j][ii][jj + 11] + A[i - 11][j][ii][jj] + A[i][j - 11][ii][jj] + A[i][j][ii - 11][jj] + A[i][j][ii][jj - 11];
-    }
-    #pragma dvm get_actual(A)
-    #pragma dvm parallel([jj][ii][j][i] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (jj = 11; jj < L - 11; jj++)
-        for (ii = 11; ii < K - 11; ii++)
-            for (j = 11; j < M - 11; j++)
-                for (i = 11; i < N - 11; i++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        nloopi = Min(nloopi, i);
-                        nloopj = Min(nloopj, j);
-                        nloopii = Min(nloopii, ii);
-                        nloopjj = Min(nloopjj, jj);
-                    }
-
-    #pragma dvm get_actual(nloopi)
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(C);
-    free(A);
-    #undef NL
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ----------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/settings
deleted file mode 100644
index fd6919c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ACROSS/settings
+++ /dev/null
@@ -1 +0,0 @@
-ALLOW_MULTIDEV=0
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align11.cdv
deleted file mode 100644
index c87bdec..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align11.cdv
+++ /dev/null
@@ -1,415 +0,0 @@
-/*    ALIGN11
-TESTING align CLAUSE */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void align111();
-static void align1111();
-static void align1112();
-static void align112();
-static void align113();
-static void align114();
-static void align115();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF ALIGN11 ======================\n");
-        /* ALIGN arrB[i] WITH arrA[i] normal*/
-    align111();
-        /* ALIGN arrB[i] WITH arrA[i] small array*/
-    align1111();
-        /* ALIGN arrB[i] WITH arrA[2 * i+3] small array*/
-    align1112();
-        /* ALIGN arrB[i] WITH arrA[i + 4] shift along i*/
-    align112();
-        /* ALIGN arrB[i] WITH arrA[-i + 7] reverse on i*/
-//    align113();
-        /* ALIGN arrB[i] WITH arrA[2 * i + 8] stretching along i*/
-    align114();
-        /* ALIGN arrB[] WITH arrA[]*/
-    align115();
-
-    printf("=== END OF ALIGN11 ========================\n");
-    return 0;
-}
-/* ---------------------------------------------ALIGN111*/
-/* ALIGN arrB[i] WITH arrA[i] normal*/
-void align111()
-{
-/*    parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    #define AN1 8
-    #define BN1 8
-    int k1i = 1;
-    int li = 0;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-    char tname[] = "align111 ";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN1111*/
-/* ALIGN arrB[i] WITH arrA[i] small array*/
-void align1111()
-{
-/*    parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    #define AN1 5
-    #define BN1 2
-    int k1i = 1;
-    int li = 0;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-    char tname[] = "align1111";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN1112*/
-/* ALIGN arrB[i] WITH arrA[2 * i + 1] small array*/
-void align1112()
-{
-/*    parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    #define AN1 5
-    #define BN1 2
-    int k1i = 2;
-    int li  = 1;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-    char tname[] = "align1112";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN112*/
-/* ALIGN arrB[i] WITH arrA[i + 4] shift along i*/
-void align112()
-{
-/*    parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    #define AN1 8
-    #define BN1 4
-    int k1i = 1;
-    int li  = 4;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-    char tname[] = "align112 ";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN113*/
-/* ALIGN arrB[i] WITH arrA[-i + 7] reverse on i*/
-void align113()
-{
-/*    parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    #define AN1 8
-    #define BN1 8
-    int k1i = -1;
-    int li = 7;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-    char tname[] = "align113 ";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN114*/
-/* ALIGN arrB[i] WITH arrA[2 * i + 8] stretching along i*/
-void align114()
-{
-/*    parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    #define AN1 24
-    #define BN1 8
-    int k1i = 2;
-    int li  = 8;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-    char tname[] = "align114 ";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A1, B1), inout(erri)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN115*/
-/* ALIGN arrB[] WITH arrA[]*/
-void align115()
-{
-/*    parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    #define AN1 24
-    #define BN1 8
-    int k1i = 0;
-    int li  = 0;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([] with A1[])
-    int B1[BN1];
-    char tname[] = "align115 ";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = i;
-    #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), private(j)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < BN1; j++)
-            if (B1[j] != (j))
-                if (erri > j) erri = j;
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef BN1
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align12.cdv
deleted file mode 100644
index a3060e4..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align12.cdv
+++ /dev/null
@@ -1,228 +0,0 @@
-/*    ALIGN12
-TESTING align CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void align121();
-static void align122();
-static void align123();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int s, cs, erri, i, j, ia, ja, ib, jb;
-
-int main(int an, char **as)
-{
-    printf("=== START OF ALIGN12 ======================\n");
-/* ALIGN arrB[][i] WITH arrA[i]*/
-    align121();
-/*  ALIGN arrB[i][] WITH arrA[2 * i + 1]*/
-    align122();
-/*  ALIGN arrB[][] WITH arrA[]*/
-    align123();
-
-    printf("=== END OF ALIGN12 ========================\n");
-    return 0;
-}
-/* ---------------------------------------------ALIGN121*/
-/* ALIGN arrB[][i] WITH arrA[i]*/
-void align121()
-{
-/*     parameters for ALIGN arrB[][i] WITH arrA[k1i * i + li]*/
-    #define AN1 8
-    #define AN2 0
-    #define BN1 4
-    #define BN2 4
-    int k1i = 1;
-    int li = 0;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([][i] with A1[k1i * i + li])
-    int B2[BN1][BN2];
-    char tname[] = "align121";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A1, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib, jb, j)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        for (j = 0; j < BN1; j++)
-        {
-            if (((i - li) ==(((i - li) / k1i) * k1i)) &&
-                (((i - li) / k1i) >= 0)  &&
-                (((i - li) / k1i) < BN2))
-            {
-                ib = j;
-                jb = (i - li) / k1i;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    };
-
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            int val = i * NL / 10 + j;
-            s = s + B2[i][j];
-            if (B2[i][j] != i * NL + j)
-                if (erri > val) erri = val;
-        }
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            cs = cs + i * NL + j;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN122*/
-/*  ALIGN arrB[i][] WITH arrA[2 * i + 1]*/
-void align122()
-{
-/*     parameters for ALIGN arrB[i][] WITH arrA[k1i * i + li]*/
-    #define AN1 16
-    #define AN2 0
-    #define BN1 4
-    #define BN2 4
-    int k1i = 2;
-    int li  = 1;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i][] with A1[k1i * i + li])
-    int B2[BN1][BN2];
-    char tname[] = "align122";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A1, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib, jb, j)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        for (j = 0; j < BN1; j++)
-        {
-            if (((i - li) ==(((i - li) / k1i) * k1i)) &&
-                (((i - li) / k1i) >= 0)  &&
-                (((i - li) / k1i) < BN2))
-            {
-                jb = j;
-                ib = (i - li) / k1i;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    }
-
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            int val = i * NL / 10 + j;
-            s = s + B2[i][j];
-            if (B2[i][j] != (i * NL + j))
-                if (erri > val) erri = val;
-        }
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            cs = cs + i * NL + j;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN123*/
-/*  ALIGN arrB[][] WITH arrA[]*/
-void align123()
-{
-/*     parameters for ALIGN arrB[][] WITH arrA[]*/
-    #define AN1 16
-    #define AN2 0
-    #define BN1 4
-    #define BN2 4
-    int k1i = 0;
-    int li = 0;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([][] with A1[])
-    int B2[BN1][BN2];
-    char tname[] = "align123";
-
-    erri = ER;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A1, B2)
-    {
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = i * NL + j;
-    #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (ib = 0; ib < BN1; ib++)
-            for (jb = 0; jb < BN2; jb++)
-            {
-                int val = i * NL / 10 + j;
-                if (B2[ib][jb] != ib * NL + jb)
-                    if (erri > val) erri = val;
-            }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align214.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align214.cdv
deleted file mode 100644
index 9b64ce6..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align214.cdv
+++ /dev/null
@@ -1,727 +0,0 @@
-/*    ALIGN214
-TESTING align CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void align211();
-static void align212();
-static void align213();
-static void align214();
-
-static void align241();
-static void align2421();
-static void align2422();
-static void align243();
-static void align244();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int s, cs, erri, i, j, n, m, k, ia, ja, na, ma, ib, jb, nb, mb, Avalue, Bvalue;
-
-int main(int an, char **as)
-{
-    printf("=== START OF ALIGN214 ======================\n");
-
-/* ALIGN arrB[i] WITH arrA[1][i]   vector arrB on section
-                                              (the first line of arrA)*/
-    align211();
-/* ALIGN arrB[i] WITH arrA[2 * i + 2][2] vector arrB on section
-             (the second column of arrA) with stretching and shift*/
-    align212();
-/* ALIGN arrB[i] WITH arrA[][i] vector replication on every line of arrA*/
-    align213();
-/* ALIGN arrB[i] WITH arrA[2 * i + 2][] vector arrB on replication on
-             every column of arrA with stretching and shift*/
-    align214();
-
-/*  ALIGN arrB[i][j][][] WITH arrA[i][j]
-                     matrix compression*/
-    align241();
-/*  ALIGN arrB[][i][][j] WITH arrA[j+4][2*i] matrix compression*/
-    align2421();
-/*  ALIGN arrB[][i][][j] WITH arrA[j+1][2*i] small array*/
-    align2422();
-/*  ALIGN arrB[][][i][] WITH arrA[1][i] matrix compression
-                                        and replication*/
-    align243();
-/*  ALIGN arrB[][][][i] WITH arrA[i][] matrix compression
-                                    and replication*/
-    align244();
-
-    printf("=== END OF ALIGN214 ========================\n");
-    return 0;
-}
-/* ---------------------------------------------ALIGN211  */
-/* ALIGN arrB[i] WITH arrA[1][i]   vector arrB on section
-                                 (the first line of arrA)*/
-void align211()
-{
-/*    parameters for ALIGN arrB[i] WITH arrA[1][i]*/
-    #define AN1 8
-    #define AN2 8
-    #define BN1 4
-    int k1i = 0, k2i = 0, li = 1;
-    int k1j = 1, k2j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i] with A2[1][i])
-    int B1[BN1];
-    char tname[] = "align211";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if ((i == 1) && (j < BN1))
-            {
-                ib = j;
-                B1[ib] = ib;
-            }
-        }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = 1;
-        ja = i;
-        if (A2[ia][ja] != (ia * NL + ja))
-            if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-    }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN212*/
-/* ALIGN arrB[i] WITH arrA[2*i+2][2] vector arrB on section
-                    (the second column of arrA) with stretching and shift*/
-void align212()
-{
-    /*     parameters for ALIGN arrB[i] WITH arrA[2*i+2][2]*/
-    #define AN1 14
-    #define AN2 3
-    #define BN1 6
-    int k1i = 2, k2i = 0, li = 2;
-    int k1j = 0, k2j = 0, lj = 2;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i] with A2[k1i * i + li][lj])
-    int B1[BN1];
-    char tname[] = "align212";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (j == lj){
-                if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                    (((i - li) / k1i) >= 0) &&
-                    (((i - li) / k1i) < BN1))
-                {
-                    ib = (i - li) / k1i;
-                    B1[ib] = ib;
-                }
-            }
-        }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        ja = lj;
-        if (A2[ia][ja] != (ia * NL + ja))
-            if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-    }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN213*/
-/* ALIGN arrB[i] WITH arrA[][i]  vector replication on every line of arrA*/
-void align213()
-{
-/*     parameters for ALIGN arrB[i] WITH arrA[][k1j * i + lj]*/
-    #define AN1 8
-    #define AN2 8
-    #define BN1 6
-    int k1i = 0, k2i = 0, li = 0;
-    int k1j = 1, k2j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i] with A2[][k1j * i + lj])
-    int B1[BN1];
-    char tname[] = "align213";
-
-    erri = ER;
-    s = 0;
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A2, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = i;
-    #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), private(ib)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((j - lj) == (((j - lj) / k1j) * k1j)) &&
-                (((j - lj) / k1j) >= 0) &&
-                (((j - lj) / k1j) < BN1))
-            {
-                ib = (j - lj) / k1j;
-                if (B1[ib] != ib)
-                    if (erri > ib) erri = ib;
-            }
-        }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-    {
-        s = s + B1[i];
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-    }
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = (0 + BN1-1) * BN1 / 2;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//        printf("%d, %d, %d\n", erri, s, cs);
-    }
-    #undef AN1
-    #undef AN2
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN214*/
-/* ALIGN arrB[i] WITH arrA[2*i+2][ ] vector arrB on replication on
-             every column of arrA with stretching and shift*/
-void align214()
-{
-/*     parameters for ALIGN arrB[i] WITH arrA[k1i*i+li][]*/
-    #define AN1 28
-    #define AN2 8
-    #define BN1 5
-    int k1i = 2, k2i = 0, li = 2;
-    int k1j = 0, k2j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i] with A2[k1i * i + li][])
-    int B1[BN1];
-    char tname[] = "align214";
-
-    erri = ER;
-    s = 0;
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A2, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = i;
-    #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), private(ib)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                (((i - li) / k1i) >= 0) &&
-                (((i - li) / k1i) < BN1))
-            {
-                ib = (i - li) / k1i;
-                if (B1[ib] != ib)
-                    if (erri > i) erri = i;
-            }
-        }
-    #pragma dvm parallel([i] on B1[i]) reduction(sum(s))
-    for (i = 0; i < BN1; i++)
-        s = s + B1[i];
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = (0 + BN1-1) * BN1 / 2;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-}
-/* ---------------------------------------------ALIGN241  */
-/*  ALIGN arrB[i][j][][] WITH arrA[i][j]
-                     matrix compression*/
-void align241()
-{
-/*    parameters for ALIGN arrB[i][j][][] WITH arrA[k1i*i+li][k2j*j+lj]*/
-    #define AN1 5
-    #define AN2 5
-    #define BN1 2
-    #define BN2 2
-    #define BN3 2
-    #define BN4 2
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li = 0;
-    int k1j = 0, k2j = 1, k3j = 0, k4j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j][][] with A2[k1i*i+li][k2j*j+lj])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align241 ";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A2, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb, n, m, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL / 10 + j;
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                        ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                        (((i - li) / k1i) >= 0) &&
-                        (((j - lj) / k2j) >= 0) &&
-                        (((i - li) / k1i) < BN1) &&
-                        (((j - lj) / k2j) < BN2))
-                    {
-                        ib = (i - li) / k1i;
-                        jb = (j - lj) / k2j;
-                        nb = n;
-                        mb = m;
-                        B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-        }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] != val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN2421*/
-/*  ALIGN arrB[][i][][j] WITH arrA[j+4][2*i] matrix compression*/
-void align2421()
-{
-/*    parameters for ALIGN arrB[][i][][j] WITH arrA[k2i*j+li][k1j*i+lj]*/
-    #define AN1 12
-    #define AN2 9
-    #define BN1 4
-    #define BN2 4
-    #define BN3 4
-    #define BN4 4
-    int k1i = 0, k2i = 1, k3i = 0, k4i = 0, li = 4;
-    int k1j = 2, k2j = 0, k3j = 0, k4j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([][i][][j] with A2[k2i*j+li][k1j*i+lj])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align2421";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A2, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb, n, m, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL / 10 + j;
-            for (n = 0; n < BN1; n++)
-                for (m = 0; m < BN3; m++)
-                {
-                    if (((i - li) == (((i - li) / k2i) * k2i)) &&
-                        ((j - lj) == (((j - lj) / k1j) * k1j)) &&
-                        (((i - li) / k2i) >= 0) &&
-                        (((j - lj) / k1j) >= 0) &&
-                        (((i - li) / k2i) < BN4) &&
-                        (((j - lj) / k1j) < BN2))
-                    {
-                        ib = n;
-                        jb = (j - lj) / k1j;
-                        nb = m;
-                        mb = (i - li) / k2i;
-                        B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-        }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] != val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN2422*/
-/*  ALIGN arrB[][i][][j] WITH arrA[j+1][2*i] small array*/
-void align2422()
-{
-/*    parameters for ALIGN arrB[][i][][j] WITH arrA[k2i*j+li][k1j*i+lj]*/
-    #define AN1 3
-    #define AN2 4
-    #define BN1 2
-    #define BN2 2
-    #define BN3 2
-    #define BN4 2
-    int k1i = 0, k2i = 1, k3i = 0, k4i = 0, li = 1;
-    int k1j = 2, k2j = 0, k3j = 0, k4j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([][i][][j] with A2[k2i*j+li][k1j*i+lj])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align2422";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A2, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb, n, m, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL / 10 + j;
-            for (n = 0; n < BN1; n++)
-                for (m = 0; m < BN3; m++)
-                {
-                    if (((i - li) == (((i - li) / k2i) * k2i)) &&
-                        ((j - lj) == (((j - lj) / k1j) * k1j)) &&
-                        (((i - li) / k2i) >= 0) &&
-                        (((j - lj) / k1j) >= 0) &&
-                        (((i - li) / k2i) < BN4) &&
-                        (((j - lj) / k1j) < BN2))
-                    {
-                        ib = n;
-                        jb = (j - lj) / k1j;
-                        nb = m;
-                        mb = (i - li) / k2i;
-                        B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-        }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] != val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN243*/
-/*  ALIGN arrB[][][i][] WITH arrA[1][i] matrix compression
-                                        and replication*/
-void align243()
-{
-/*  parameters for ALIGN arrB[][][i][] WITH arrA[li][k1j*i+lj]*/
-    #define AN1 3
-    #define AN2 4
-    #define BN1 2
-    #define BN2 2
-    #define BN3 2
-    #define BN4 2
-    int k1i = 0, k2i = 0, k3i = 0, k4i = 0, li = 1;
-    int k1j = 1, k2j = 0, k3j = 0, k4j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([][][i][] with A2[li][k1j*i+lj])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align243 ";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A2, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb, k, n, m, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL / 10 + j;
-            if (i == li)
-                for (n = 0; n < BN1; n++)
-                    for (m = 0; m < BN2; m++)
-                        for (k = 0; k < BN4; k++)
-                        {
-                            if (((j - lj) == (((j - lj) / k1j) * k1j)) &&
-                                (((j - lj) / k1j) >= 0) &&
-                                (((j - lj) / k1j) < BN3))
-                            {
-                                ib = n;
-                                jb = m;
-                                nb = ((j - lj) / k1j);
-                                mb = k;
-                                B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                            }
-                        }
-        }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] != val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN244*/
-/*  ALIGN arrB[][][][i] WITH arrA[i][]  matrix compression
-                                    and replication*/
-void align244()
-{
-/*    parameters for ALIGN arrB[][][i][] WITH arrA[k1i*i+li][]*/
-    #define AN1 12
-    #define AN2 9
-    #define BN1 4
-    #define BN2 4
-    #define BN3 4
-    #define BN4 4
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li = 0;
-    int k1j = 0, k2j = 0, k3j = 0, k4j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([][][i][] with A2[k1i * i + li][])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align244 ";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A2, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), private(ib, jb, m, n, k, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL / 10 + j;
-            for (n = 0; n < BN1; n++)
-                for (m = 0; m < BN2; m++)
-                    for (k = 0; k < BN4; k++)
-                    {
-                        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                            (((i - li) / k1i) >= 0) &&
-                            (((i - li) / k1i) < BN3))
-                        {
-                            int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                            ib = n;
-                            jb = m;
-                            nb = ((i - li) / k1i);
-                            mb = k;
-                            if (B4[ib][jb][nb][mb] != ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb)
-                                if (erri > val) erri = val;
-                        }
-                    }
-        }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align22.cdv
deleted file mode 100644
index d03cef9..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align22.cdv
+++ /dev/null
@@ -1,600 +0,0 @@
-/*    ALIGN22
-TESTING align CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void align221();
-static void align222();
-static void align223();
-static void align224();
-static void align225();
-static void align2251();
-static void align226();
-static void align227();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int s, cs, erri, i, j, ia, ja, ib, jb;
-
-int main(int an, char **as)
-{
-    printf("=== START OF ALIGN22 ======================\n");
-            /* ALIGN arrB[i][j] WITH arrA[i][j] normal*/
-    align221();
-            /* ALIGN arrB[i][j] WITH arrA[i][2 * j] stretching along j*/
-    align222();
-            /* ALIGN arrB[i][j] WITH arrA[i + 4][j] shift along i*/
-    align223();
-             /* ALIGN arrB[i][j] WITH arrA[-i + 9][j] reverse on i*/
-//    align224();
-             /* ALIGN arrB[i][j] WITH arrA[i + 4][j + 4] shift along i and j*/
-    align225();
-             /*  */
-    align2251();
-             /* ALIGN arrB[i][j] WITH arrA[j][i] rotation*/
-    align226();
-             /* ALIGN arrB[i][j] WITH arrA[j + 1][i] rotation and shift*/
-    align227();
-
-    printf("=== END OF ALIGN22 ========================\n");
-    return 0;
-}
-/* ---------------------------------------------ALIGN221*/
-/* ALIGN arrB[i][j] WITH arrA[i][j] normal*/
-void align221()
-{
-/*     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]*/
-    #define AN1 8
-    #define AN2 8
-    #define BN1 8
-    #define BN2 8
-    int k1i = 1, k2i = 0, li = 0;
-    int k1j = 0, k2j = 1, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k1i * i + li][k2j * j + lj])
-    int B2[BN1][BN2];
-    char tname[] = "align221 ";
-
-    erri = ER;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for(j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                (((i - li) / k1i) >= 0) &&
-                (((j - lj) / k2j) >= 0) &&
-                (((i - li) / k1i) < BN1) &&
-                (((j - lj) / k2j) < BN2))
-            {
-                ib = (i - li) / k1i;
-                jb = (j - lj) / k2j;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-        }
-
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN222*/
-/* ALIGN arrB[i][j] WITH arrA[i][2*j] stretching along j*/
-void align222()
-{
-/*    parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]*/
-    #define AN1 8
-    #define AN2 8
-    #define BN1 8
-    #define BN2 4
-    int k1i = 1, k2i = 0, li = 0;
-    int k1j = 0, k2j = 2, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k1i * i + li][k2j * j + lj])
-    int B2[BN1][BN2];
-    char tname[] = "align222 ";
-
-    erri = ER;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for(j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                (((i - li) / k1i) >= 0) &&
-                (((j - lj) / k2j) >= 0) &&
-                (((i - li) / k1i) < BN1) &&
-                (((j - lj) / k2j) < BN2))
-            {
-                ib = (i - li) / k1i;
-                jb = (j - lj) / k2j;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-        }
-
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN223*/
-/* ALIGN arrB[i][j] WITH arrA[i+4][j] shift along i*/
-void align223()
-{
-/*    parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]*/
-    #define AN1 8
-    #define AN2 8
-    #define BN1 4
-    #define BN2 8
-    int k1i = 1, k2i = 0, li = 4;
-    int k1j = 0, k2j = 1, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k1i * i + li][k2j * j + lj])
-    int B2[BN1][BN2];
-    char tname[] = "align223 ";
-
-    erri = ER;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for(j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                (((i - li) / k1i) >= 0) &&
-                (((j - lj) / k2j) >= 0) &&
-                (((i - li) / k1i) < BN1) &&
-                (((j - lj) / k2j) < BN2))
-            {
-                ib = (i - li) / k1i;
-                jb = (j - lj) / k2j;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-        }
-
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN224*/
-/* ALIGN arrB[i][j] WITH arrA[-i+9][j]  reverse on i*/
-void align224()
-{
-/*    parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]*/
-    #define AN1 10
-    #define AN2 8
-    #define BN1 8
-    #define BN2 8
-    int k1i = -1, k2i = 0, li = 9;
-    int k1j = 0, k2j = 1, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k1i * i + li][k2j * j + lj])
-    int B2[BN1][BN2];
-    char tname[] = "align224 ";
-
-    erri = ER;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for(j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                (((i - li) / k1i) >= 0) &&
-                (((j - lj) / k2j) >= 0) &&
-                (((i - li) / k1i) < BN1) &&
-                (((j - lj) / k2j) < BN2))
-            {
-                ib = (i - li) / k1i;
-                jb = (j - lj) / k2j;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-        }
-
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN225*/
-/* ALIGN arrB[i][j] WITH arrA[i+4][j+4]shift along i and j*/
-void align225()
-{
-/*    parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]*/
-    #define AN1 8
-    #define AN2 8
-    #define BN1 4
-    #define BN2 4
-    int k1i = 1, k2i = 0, li = 4;
-    int k1j = 0, k2j = 1, lj = 4;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k1i * i + li][k2j * j + lj])
-    int B2[BN1][BN2];
-    char tname[] = "align225 ";
-
-    erri = ER;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for(j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                (((i - li) / k1i) >= 0) &&
-                (((j - lj) / k2j) >= 0) &&
-                (((i - li) / k1i) < BN1) &&
-                (((j - lj) / k2j) < BN2))
-            {
-                ib = (i - li) / k1i;
-                jb = (j - lj) / k2j;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-        }
-
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN2251*/
-/* ALIGN arrB[i][j] WITH arrA[i+1][2*j] small arrays*/
-void align2251()
-{
-/*    parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]*/
-    #define AN1 3
-    #define AN2 5
-    #define BN1 2
-    #define BN2 3
-    int k1i = 1, k2i = 0, li = 1;
-    int k1j = 0, k2j = 2, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k1i * i + li][k2j * j + lj])
-    int B2[BN1][BN2];
-    char tname[] = "align2251";
-
-    erri = ER;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for(j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                (((i - li) / k1i) >= 0) &&
-                (((j - lj) / k2j) >= 0) &&
-                (((i - li) / k1i) < BN1) &&
-                (((j - lj) / k2j) < BN2))
-            {
-                ib = (i - li) / k1i;
-                jb = (j - lj) / k2j;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-        }
-
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN226*/
-/* ALIGN arrB[i][j] WITH arrA[j][i] rotation*/
-void align226()
-{
-/*    parameters for ALIGN arrB[i][j] WITH arrA[k2i * j + li][k1j * i + lj]*/
-    #define AN1 4
-    #define AN2 4
-    #define BN1 4
-    #define BN2 4
-    int k1i = 0, k2i = 1, li = 0;
-    int k1j = 1, k2j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k2i * j + li][k1j * i + lj])
-    int B2[BN1][BN2];
-    char tname[] = "align226 ";
-
-    erri = ER;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k2i) * k2i)) &&
-                ((j - lj) == (((j - lj) / k1j) * k1j)) &&
-                (((i - li) / k2i) >= 0) &&
-                (((j - lj) / k1j) >= 0) &&
-                (((i - li) / k2i) < BN2) &&
-                (((j - lj) / k1j) < BN1))
-            {
-                jb = (i - li) / k2i;
-                ib = (j - lj) / k1j;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-            ia = k2i * j + li;
-            ja = k1j * i + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-        }
-
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN227*/
-/* ALIGN arrB[i][j] WITH arrA[j+1][i] rotation and shift*/
-void align227()
-{
-/*    parameters for ALIGN arrB[i][j] WITH arrA[k2i*j+li][k1j*i+lj]*/
-    #define AN1 8
-    #define AN2 8
-    #define BN1 4
-    #define BN2 4
-    int k1i = 0, k2i = 1, li = 1;
-    int k1j = 1, k2j = 0, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k2i * j + li][k1j * i + lj])
-    int B2[BN1][BN2];
-    char tname[] = "align227 ";
-
-    erri = ER;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region local(A2, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k2i) * k2i)) &&
-                ((j - lj) == (((j - lj) / k1j) * k1j)) &&
-                (((i - li) / k2i) >= 0) &&
-                (((j - lj) / k1j) >= 0) &&
-                (((i - li) / k2i) < BN2) &&
-                (((j - lj) / k1j) < BN1))
-            {
-                jb = (i - li) / k2i;
-                ib = (j - lj) / k1j;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-            ia = k2i * j + li;
-            ja = k1j * i + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                if (erri > i * NL / 10 + j) erri = i * NL / 10 + j;
-        }
-
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align32.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align32.cdv
deleted file mode 100644
index 861f4fd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align32.cdv
+++ /dev/null
@@ -1,600 +0,0 @@
-/*    ALIGN32
-TESTING align CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void align321();
-static void align322();
-static void align323();
-static void align324();
-static void align325();
-static void align326();
-static void align327();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int s, cs, erri, i, j, n, m, k, l, ia, ja, na, ma, ib, jb, nb, mb, Avalue, Bvalue;
-
-int main(int an, char **as)
-{
-    printf("=== START OF ALIGN32 ======================\n");
-/*  ALIGN arrB[i][j] WITH arrA[i][j][1] matrix on section*/
-    align321();
-/*  ALIGN arrB[i][j] WITH arrA[j][i][5] matrix on section with rotation*/
-    align322();
-/*  ALIGN arrB[i][j] WITH arrA[j][1][2*i] matrix on section with
-                                          rotation and stretching*/
-    align323();
-/*  ALIGN arrB[i][j] WITH arrA[][i][j] matrix replication*/
-    align324();
-/*  ALIGN arrB[i][j] WITH arrA[i+4][][j] matrix replication with shift*/
-    align325();
-/*  ALIGN arrB[i][j] WITH  arrA[-i+8][j][] matrix replication with reverse*/
-//    align326();
-/*  ALIGN arrB[][] WITH arrA[][][]*/
-    align327();
-    printf("=== END OF ALIGN32 ========================\n");
-    return 0;
-}
-/* ---------------------------------------------ALIGN321*/
-/* ALIGN arrB[i][j] WITH arrA[i][j][1] matrix on section*/
-void align321()
-{
-/*     parameters for ALIGN arrB[i][j]
-                      WITH arrA[k1i*i+li][k2j*j+lj][ln]*/
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    #define BN1 4
-    #define BN2 4
-    int k1i = 1, k2i = 0, k3i = 0, li = 0;
-    int k1j = 0, k2j = 1, k3j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 0, ln = 1;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j] with A3[k1i*i+li][k2j*j+lj][ln])
-    int B2[BN1][BN2];
-    char tname[] = "align321";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A3, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-            {
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n;
-                if ((n == ln ) &&
-                    ((i - li) == (((i - li) / k1i) * k1i)) &&
-                    ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                    (((i - li) / k1i) >= 0) &&
-                    (((j - lj) / k2j) >= 0) &&
-                    (((i - li) / k1i) < BN1) &&
-                    (((j - lj) / k2j) < BN2))
-                {
-                    ib = (i - li) / k1i;
-                    jb = (j - lj) / k2j;
-                    B2[ib][jb] = ib * NL / 10 + jb * NL / 100;
-                }
-            }
-
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri), sum(s)), private(ia, ja, na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            int val = i * NL / 10 + j * NL / 100;
-            s = s + B2[i][j];
-            if (B2[i][j] != val)
-                if (erri > val) erri = val;
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            na = ln;
-            if (A3[ia][ja][na] != ia * NL / 10 + ja * NL / 100 + na)
-                if (erri > val) erri = val;
-        }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            cs = cs + i * NL / 10 + j * NL / 100;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN322*/
-/* ALIGN arrB[i][j] WITH arrA[j][i][5] matrix on section with rotation*/
-void align322()
-{
-/*     parameters for ALIGN arrB[i][j]
-                      WITH arrA[k2i*j+li][k1j*i+lj][ln]*/
-    #define AN1 5
-    #define AN2 5
-    #define AN3 6
-    #define BN1 4
-    #define BN2 4
-    int k1i = 0, k2i = 1, k3i = 0, li = 0;
-    int k1j = 1, k2j = 0, k3j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 0, ln = 5;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j] with A3[k2i*j+li][k1j*i+lj][ln])
-    int B2[BN1][BN2];
-    char tname[] = "align322";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A3, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-            {
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n;
-                if ((n == ln ) &&
-                    ((i - li) == (((i - li) / k2i) * k2i)) &&
-                    ((j - lj) == (((j - lj) / k1j) * k1j)) &&
-                    (((i - li) / k2i) >= 0) &&
-                    (((j - lj) / k1j) >= 0) &&
-                    (((i - li) / k2i) < BN2) &&
-                    (((j - lj) / k1j) < BN1))
-                {
-                    ib = (j - lj) / k1j;
-                    jb = (i - li) / k2i;
-                    B2[ib][jb] = ib * NL / 10 + jb * NL / 100;
-                }
-            }
-
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri), sum(s)), private(ia, ja, na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            int val = i * NL / 10 + j * NL / 100;
-            s = s + B2[i][j];
-            if (B2[i][j] != val)
-                if (erri > val) erri = val;
-            ia = k2i * j + li;
-            ja = k1j * i + lj;
-            na = ln;
-            if (A3[ia][ja][na] != ia * NL / 10 + ja * NL / 100 + na)
-                if (erri > val) erri = val;
-        }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            cs = cs + i * NL / 10 + j * NL / 100;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN323*/
-/* ALIGN arrB[i][j] WITH arrA[j][1][2*i] matrix on section with
-                                         rotation and stretching*/
-void align323()
-{
-/*     parameters for ALIGN arrB[i][j]
-                      WITH arrA[k2i*j+li][lj][k1n*i+ln]*/
-    #define AN1 5
-    #define AN2 2
-    #define AN3 7
-    #define BN1 4
-    #define BN2 4
-    int k1i = 0, k2i = 1, k3i = 0, li = 0;
-    int k1j = 0, k2j = 0, k3j = 0, lj = 1;
-    int k1n = 2, k2n = 0, k3n = 0, ln = 0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j] with A3[k2i*j+li][lj][k1n*i+ln])
-    int B2[BN1][BN2];
-    char tname[] = "align323";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A3, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-            {
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n;
-                if ((j == lj) &&
-                    ((i - li) == (((i - li) / k2i) * k2i)) &&
-                    ((n - ln) == (((n - ln) / k1n) * k1n)) &&
-                    (((i - li) / k2i) >= 0) &&
-                    (((n - ln) / k1n) >= 0) &&
-                    (((i - li) / k2i) < BN2) &&
-                    (((n - ln) / k1n) < BN1))
-                {
-                    ib = (n - ln) / k1n;
-                    jb = (i - li) / k2i;
-                    B2[ib][jb] = ib * NL / 10 + jb * NL / 100;
-                }
-            }
-
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri), sum(s)), private(ia, ja, na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            int val = i * NL / 10 + j * NL / 100;
-            s = s + B2[i][j];
-            if (B2[i][j] != val)
-                if (erri > val) erri = val;
-            ia = k2i * j + li;
-            ja = lj;
-            na = k1n * i + ln;
-            if (A3[ia][ja][na] != ia * NL / 10 + ja * NL / 100 + na)
-                if (erri > val) erri = val;
-        }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            cs = cs + i * NL / 10 + j * NL / 100;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN324*/
-/* ALIGN arrB[i][j] WITH arrA[][i][j] matrix replication*/
-void align324()
-{
-/*     parameters for ALIGN arrB[i][j]
-                      WITH arrA[][k1j*i+lj][k2n*j+ln]*/
-    #define AN1 4
-    #define AN2 6
-    #define AN3 6
-    #define BN1 4
-    #define BN2 4
-    int k1i = 0, k2i = 0, k3i = 0, li = 0;
-    int k1j = 1, k2j = 0, k3j = 0, lj = 0;
-    int k1n = 0, k2n = 1, k3n = 0, ln = 0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j] with A3[][k1j*i+lj][k2n*j+ln])
-    int B2[BN1][BN2];
-    char tname[] = "align324";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A3, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = i * NL / 10 + j * NL / 100;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) reduction(min(erri)), private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-            {
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n;
-                if (((n - ln) == (((n - ln) / k2n) * k2n)) &&
-                    ((j - lj) == (((j - lj) / k1j) * k1j)) &&
-                    (((n - ln) / k2n) >= 0) &&
-                    (((j - lj) / k1j) >= 0) &&
-                    (((n - ln) / k2n) < BN2) &&
-                    (((j - lj) / k1j) < BN1))
-                {
-                    int val = i * NL / 10 + j * NL / 100;
-                    ib = (j - lj) / k1j;
-                    jb = (n - ln) / k2n;
-                    if (B2[ib][jb] != ib * NL / 10 + jb * NL / 100)
-                        if (erri > val) erri = val;
-                }
-            }
-
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri), sum(s)), private(ia, ja, na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            int val = i * NL / 10 + j * NL / 100;
-            s = s + B2[i][j];
-            if (B2[i][j] != val)
-                if (erri > val) erri = val;
-        }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            cs = cs + i * NL / 10 + j * NL / 100;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN325*/
-/*	ALIGN arrB[i][j] WITH arrA[i+4][][j] matrix replication with shift*/
-void align325()
-{
-/*     parameters for ALIGN arrB[i][j]
-                      WITH arrA[k1i*i+li][][k2n * j + ln]*/
-    #define AN1 12
-    #define AN2 6
-    #define AN3 6
-    #define BN1 4
-    #define BN2 4
-    int k1i = 1, k2i = 0, k3i = 0, li  = 4;
-    int k1j = 1, k2j = 0, k3j = 0, lj  = 0;
-    int k1n = 0, k2n = 1, k3n = 0, ln  = 0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j] with A3[k1i*i+li][][k2n*j+ln])
-    int B2[BN1][BN2];
-    char tname[] = "align325";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A3, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = i * NL / 10 + j * NL / 100;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) reduction(min(erri)), private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-            {
-                A3[i][j][n] = i*NL/10 + j*NL/100 + n;
-                if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                    ((n - ln) == (((n - ln) / k2n) * k2n)) &&
-                    (((i - li) / k1i) >= 0) &&
-                    (((n - ln) / k2n) >= 0) &&
-                    (((i - li) / k1i) < BN1) &&
-                    (((n - ln) / k2n) < BN2))
-                {
-                    int val = i * NL / 10 + j * NL / 100;
-                    ib = (i - li) / k1i;
-                    jb = (n - ln) / k2n;
-                    if (B2[ib][jb] != ib * NL / 10 + jb * NL / 100)
-                        if (erri > val) erri = val;
-                }
-            }
-
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri), sum(s)), private(ia, ja, na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            int val = i * NL / 10 + j * NL / 100;
-            s = s + B2[i][j];
-            if (B2[i][j] != val)
-                if (erri > val) erri = val;
-        }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            cs = cs + i * NL / 10 + j * NL / 100;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN326*/
-/*	ALIGN arrB[i][j] WITH arrA[-i+8][j][] matrix replication with reverse*/
-void align326()
-{
-/*     parameters for ALIGN arrB[i][j]
-                      WITH arrA[k1i*i+li][k2j*j+lj][]*/
-    #define AN1 9
-    #define AN2 5
-    #define AN3 5
-    #define BN1 7
-    #define BN2 4
-    int k1i = -1, k2i = 0, k3i = 0, li = 8;
-    int k1j = 0, k2j = 1, k3j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 0, ln = 0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j] with A3[k1i*i+li][k2j*j+lj][])
-    int B2[BN1][BN2];
-    char tname[] = "align326";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A3, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = i * NL / 10 + j * NL / 100;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) reduction(min(erri)), private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-            {
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n;
-                if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                    ((j - lj) == (((j  -lj) / k2j) * k2j)) &&
-                    (((i - li) / k1i) >= 0) &&
-                    (((j - lj) / k2j) >= 0) &&
-                    (((i - li) / k1i) < BN1) &&
-                    (((j - lj) / k2n) < BN2))
-                {
-                    int val = i * NL / 10 + j * NL / 100;
-                    ib = (i - li) / k1i;
-                    jb = (j - lj) / k2j;
-                    if (B2[ib][jb] != ib * NL / 10 + jb * NL / 100)
-                        if (erri > val) erri = val;
-                }
-            }
-
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erri), sum(s)), private(ia, ja, na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            int val = i * NL / 10 + j * NL / 100;
-            s = s + B2[i][j];
-            if (B2[i][j] != val)
-                if (erri > val) erri = val;
-        }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            cs = cs + i * NL / 10 + j * NL / 100;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------ALIGN327*/
-/*  ALIGN arrB[][] WITH arrA[][][]*/
-void align327()
-{
-/*     parameters for ALIGN arrB[][]
-                      WITH arrA[][][]*/
-    #define AN1 7
-    #define AN2 5
-    #define AN3 5
-    #define BN1 7
-    #define BN2 4
-    int k1i = 0, k2i = 0, k3i = 0, li = 0;
-    int k1j = 0, k2j = 0, k3j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 0, ln = 1;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([][] with A3[][][])
-    int B2[BN1][BN2];
-    char tname[] = "align327";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A3, B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = i * NL / 10 + j * NL / 100;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) reduction(min(erri)), private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-            {
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n;
-                for (ib = 0; ib < BN1; ib++)
-                    for (jb = 0; jb < BN2; jb++)
-                    {
-                        int val = i * NL / 10 + j * NL / 100;
-                        if (B2[ib][jb] != ib * NL / 10 + jb * NL / 100)
-                            if (erri > val) erri = val;
-                    }
-            }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align33.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align33.cdv
deleted file mode 100644
index 82df028..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align33.cdv
+++ /dev/null
@@ -1,197 +0,0 @@
-/*    ALIGN33
-TESTING align CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void align331();
-static void align332();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int s, cs, erri, i, j, n, m, k, l, ia, ja, na, ma, ib, jb, nb, mb, Avalue, Bvalue;
-
-int main(int an, char **as)
-{
-    printf("=== START OF ALIGN33 ======================\n");
-            /* ALIGN arrB[i][j][k] WITH arrA[i][j][k] normal*/
-    align331();
-            /* ALIGN arrB[][i][] WITH arrA[][lj][i]*/
-    align332();
-    printf("=== END OF ALIGN33 ========================\n");
-    return 0;
-}
-/* ---------------------------------------------ALIGN331*/
-/* ALIGN arrB[i][j][n] WITH arrA[i][j][n] normal*/
-void align331()
-{
-/*     parameters for ALIGN arrB[i][j][n]
-                      WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]*/
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    #define BN1 2
-    #define BN2 2
-    #define BN3 2
-    int k1i = 1, k2i = 0, k3i = 0, li = 0;
-    int k1j = 0, k2j = 1, k3j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 1, ln = 0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j][n] with A3[k1i*i+li][k2j*j+lj][k3n*n+ln])
-    int B3[BN1][BN2][BN3];
-    char tname[] = "align331";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A3, B3)
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = 0;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib, jb, nb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-            {
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-                if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                    ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                    ((n - ln) == (((n - ln) / k3n) * k3n)) &&
-                    (((i - li) / k1i) >= 0) &&
-                    (((j - lj) / k2j) >= 0) &&
-                    (((n - ln) / k3n) >= 0) &&
-                    (((i - li) / k1i) < BN1) &&
-                    (((j - lj) /k2j) < BN2) &&
-                    (((n - ln) / k3n) < BN3))
-                {
-                    ib = (i - li) / k1i;
-                    jb = (j - lj) / k2j;
-                    nb = (n - ln) / k3n;
-                    B3[ib][jb][nb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000;
-                }
-            }
-
-    #pragma dvm parallel([i][j][n] on B3[i][j][n]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-            {
-                int val = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-                s = s + B3[i][j][n];
-                if (B3[i][j][n] != val)
-                    if (erri > val) erri = val;
-            }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-/* ---------------------------------------------ALIGN332*/
-/* ALIGN arrB[][i][] WITH arrA[][lj][i]*/
-void align332()
-{
-/*     parameters for ALIGN arrB[][i][]
-                      WITH arrA[][lj][k3n*n+ln]*/
-    #define AN1 4
-    #define AN2 4
-    #define AN3 4
-    #define BN1 2
-    #define BN2 2
-    #define BN3 2
-    int k1i = 0, k2i = 0, k3i = 0, li = 0;
-    int k1j = 0, k2j = 0, k3j = 0, lj = 3;
-    int k1n = 1, k2n = 0, k3n = 0, ln = 0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([][i][] with A3[][lj][k1n*i+ln])
-    int B3[BN1][BN2][BN3];
-    char tname[] = "align332";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A3, B3)
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib, jb, nb, k, l), reduction(min(erri))
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-            {
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-                if (j == lj)
-                {
-                    for (k = 0; k < BN1; k++)
-                        for (l = 0; l < BN3; l++)
-                        {
-                            if (((n - ln) == (((n - ln) / k1n) * k1n)) &&
-                                (((n - ln) / k1n) >= 0) &&
-                                (((n - ln) / k1n) < BN2))
-                            {
-                                int val = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-                                ib = k;
-                                jb = (n - ln) / k1n;
-                                nb = l;
-                                if (B3[ib][jb][nb] != ib * NL / 10 + jb * NL / 100 + nb * NL / 1000)
-                                    if (erri > val) erri = val;
-                            }
-                        }
-                }
-            }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align44.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align44.cdv
deleted file mode 100644
index c6a497e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/align44.cdv
+++ /dev/null
@@ -1,855 +0,0 @@
-/*    ALIGN44
-TESTING align CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void align441();
-static void align442();
-static void align443();
-static void align444();
-static void align445();
-static void align446();
-static void align447();
-static void align448();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int s, cs, erri, i, j, n, m, k, l, ia, ja, na, ma, ib, jb, nb, mb, Avalue, Bvalue;
-
-int main(int an, char **as)
-{
-    printf("=== START OF ALIGN44 ======================\n");
-            /* ALIGN arrB[i][j][k][l] WITH arrA[i][j][k][l] normal*/
-    align441();
-            /* ALIGN arrB[i][j][k][l] WITH arrA[l][i][j][k] rotation*/
-    align442();
-            /* ALIGN arrB[i][j][k][l] WITH arrA[i][2* j][k][3*l] stretching*/
-    align443();
-             /* ALIGN arrB[i][j][k][l] WITH arrA[i+2][j][k][l+3] shift*/
-    align444();
-             /* ALIGN arrB[i][j][k][l] WITH arrA[i][j][-k+8][l+8] reverse*/
-//    align445();
-             /* ALIGN arrB[i][j][][l] WITH arrA[i][j][2][l]
-                compression and replication*/
-    align446();
-             /* ALIGN arrB[][j][k][i] WITH arrA[i][j][][k]
-                compression and replication*/
-    align447();
-             /* ALIGN arrB[][i][j][] WITH arrA[i][j][1][3]
-                compression and replication*/
-    align448();
-    printf("=== END OF ALIGN44 ========================\n");
-    return 0;
-}
-/* ---------------------------------------------ALIGN441*/
-/* ALIGN arrB[i][j][n][m] WITH arrA[i][ j][n][m] normal*/
-void align441()
-{
-/*     parameters for ALIGN arrB[i][j][n][m]
-                      WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]*/
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    #define AN4 5
-    #define BN1 2
-    #define BN2 2
-    #define BN3 2
-    #define BN4 2
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li = 0;
-    int k1j = 0, k2j = 1, k3j = 0, k4j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 1, k4n = 0, ln = 0;
-    int k1m = 0, k2m = 0, k3m = 0, k4m = 1, lm = 0;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([i][j][n][m] with A4[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align441";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A4, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                        ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                        ((n - ln) == (((n - ln) / k3n) * k3n)) &&
-                        ((m - lm) == (((m - lm) / k4m) * k4m)) &&
-                        (((i - li) / k1i) >= 0) &&
-                        (((j - lj) / k2j) >= 0) &&
-                        (((n - ln) / k3n) >= 0) &&
-                        (((m - lm) / k4m) >= 0) &&
-                        (((i - li) / k1i) < BN1) &&
-                        (((j - lj) / k2j) < BN2) &&
-                        (((n - ln) / k3n) < BN3) &&
-                        (((m - lm) / k4m) < BN4))
-                    {
-                        ib = (i - li) / k1i;
-                        jb = (j - lj) / k2j;
-                        nb = (n - ln) / k3n;
-                        mb = (m - lm) / k4m;
-                        B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] !=val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN442*/
-/* ALIGN arrB[i][j][k][l] WITH arrA[l][i][j][k]  rotation*/
-void align442()
-{
-/*     parameters for ALIGN arrB[i][j][n][m]
-                      WITH arrA4[k4i*n+li][k1j*i+lj][k2n*j+ln][k3m*n+lm]*/
-    #define AN1 4
-    #define AN2 4
-    #define AN3 4
-    #define AN4 4
-    #define BN1 4
-    #define BN2 4
-    #define BN3 4
-    #define BN4 4
-    int k1i = 0, k2i = 0, k3i = 0, k4i = 1, li = 0;
-    int k1j = 1, k2j = 0, k3j = 0, k4j = 0, lj = 0;
-    int k1n = 0, k2n = 1, k3n = 0, k4n = 0, ln = 0;
-    int k1m = 0, k2m = 0, k3m = 1, k4m = 0, lm = 0;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([i][j][n][m] with A4[k4i*m+li][k1j*i+lj][k2n*j+ln][k3m*n+lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align442";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A4, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    if (((i - li) == (((i - li) / k4i) * k4i)) &&
-                        ((j - lj) == (((j - lj) / k1j) * k1j)) &&
-                        ((n - ln) == (((n - ln) / k2n) * k2n)) &&
-                        ((m - lm) == (((m - lm) / k3m) * k3m)) &&
-                        (((i - li) / k4i) >= 0) &&
-                        (((j - lj) / k1j) >= 0) &&
-                        (((n - ln) / k2n) >= 0) &&
-                        (((m - lm) / k3m) >= 0) &&
-                        (((i - li) / k4i) < BN4) &&
-                        (((j - lj) / k1j) < BN1) &&
-                        (((n - ln) / k2n) < BN2) &&
-                        (((m - lm) / k3m) < BN3))
-                    {
-                        mb = (i - li) / k4i;
-                        ib = (j - lj) / k1j;
-                        jb = (n - ln) / k2n;
-                        nb = (m - lm) / k3m;
-                        B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] !=val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN443*/
-/* ALIGN arrB[i][j][k][l] WITH arrA[i][2* j][k][3*l] stretching*/
-void align443()
-{
-/*     parameters for ALIGN arrB[i][j][n][m]
-                      WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]*/
-    #define AN1 5
-    #define AN2 4
-    #define AN3 3
-    #define AN4 7
-    #define BN1 3
-    #define BN2 2
-    #define BN3 2
-    #define BN4 3
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li = 0;
-    int k1j = 0, k2j = 2, k3j = 0, k4j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 1, k4n = 0, ln = 0;
-    int k1m = 0, k2m = 0, k3m = 0, k4m = 3, lm = 0;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([i][j][n][m] with A4[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align443";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A4, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                        ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                        ((n - ln) == (((n - ln) / k3n) * k3n)) &&
-                        ((m - lm) == (((m - lm) / k4m) * k4m)) &&
-                        (((i - li) / k1i) >= 0) &&
-                        (((j - lj) / k2j) >= 0) &&
-                        (((n - ln) / k3n) >= 0) &&
-                        (((m - lm) / k4m) >= 0) &&
-                        (((i - li) / k1i) < BN1) &&
-                        (((j - lj) / k2j) < BN2) &&
-                        (((n - ln) / k3n) < BN3) &&
-                        (((m - lm) / k4m) < BN4))
-                    {
-                        ib = (i - li) / k1i;
-                        jb = (j - lj) / k2j;
-                        nb = (n - ln) / k3n;
-                        mb = (m - lm) / k4m;
-                        B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] !=val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN444*/
-/* ALIGN arrB[i][j][k][l] WITH arrA[i+2][j][k][l+3] shift*/
-void align444()
-{
-/*     parameters for ALIGN arrB[i][j][n][m]
-                      WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]*/
-    #define AN1 4
-    #define AN2 4
-    #define AN3 3
-    #define AN4 6
-    #define BN1 2
-    #define BN2 2
-    #define BN3 2
-    #define BN4 2
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li = 2;
-    int k1j = 0, k2j = 1, k3j = 0, k4j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 1, k4n = 0, ln = 0;
-    int k1m = 0, k2m = 0, k3m = 0, k4m = 1, lm = 3;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([i][j][n][m] with A4[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align444";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A4, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                        ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                        ((n - ln) == (((n - ln) / k3n) * k3n)) &&
-                        ((m - lm) == (((m - lm) / k4m) * k4m)) &&
-                        (((i - li) / k1i) >= 0) &&
-                        (((j - lj) / k2j) >= 0) &&
-                        (((n - ln) / k3n) >= 0) &&
-                        (((m - lm) / k4m) >= 0) &&
-                        (((i - li) / k1i) < BN1) &&
-                        (((j - lj) / k2j) < BN2) &&
-                        (((n - ln) / k3n) < BN3) &&
-                        (((m - lm) / k4m) < BN4))
-                    {
-                        ib = (i - li) / k1i;
-                        jb = (j - lj) / k2j;
-                        nb = (n - ln) / k3n;
-                        mb = (m - lm) / k4m;
-                        B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] !=val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN445*/
-/* ALIGN arrB[i][j][k][l] WITH arrA[i][j][-k+4][-l+3] reverse*/
-void align445()
-{
-/*     parameters for ALIGN arrB[i][j][n][m]
-                      WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]*/
-    #define AN1 4
-    #define AN2 4
-    #define AN3 8
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 5
-    #define BN4 4
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li = 0;
-    int k1j = 0, k2j = 1, k3j = 0, k4j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = -1, k4n = 0, ln = 4;
-    int k1m = 0, k2m = 0, k3m = 0, k4m = -1, lm = 3;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([i][j][n][m] with A4[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align445";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A4, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                        ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                        ((n - ln) == (((n - ln) / k3n) * k3n)) &&
-                        ((m - lm) == (((m - lm) / k4m) * k4m)) &&
-                        (((i - li) / k1i) >= 0) &&
-                        (((j - lj) / k2j) >= 0) &&
-                        (((n - ln) / k3n) >= 0) &&
-                        (((m - lm) / k4m) >= 0) &&
-                        (((i - li) / k1i) < BN1) &&
-                        (((j - lj) / k2j) < BN2) &&
-                        (((n - ln) / k3n) < BN3) &&
-                        (((m - lm) / k4m) < BN4))
-                    {
-                        ib = (i - li) / k1i;
-                        jb = (j - lj) / k2j;
-                        nb = (n - ln) / k3n;
-                        mb = (m - lm) / k4m;
-                        B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] !=val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN446*/
-/* ALIGN arrB[i][j][][l] WITH arrA[i][j][2][l]
-                compression and replication*/
-void align446()
-{
-/*    parameters for ALIGN arrB[i][j][][m] WITH arrA4[k1i*i+li][k2j*j+lj][ln][k4m*m+lm]*/
-    #define AN1 4
-    #define AN2 4
-    #define AN3 4
-    #define AN4 4
-    #define BN1 2
-    #define BN2 2
-    #define BN3 2
-    #define BN4 2
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li  = 0;
-    int k1j = 0, k2j = 1, k3j = 0, k4j = 0, lj  = 0;
-    int k1n = 0, k2n = 0, k3n = 0, k4n = 0, ln  = 2;
-    int k1m = 0, k2m = 0, k3m = 0, k4m = 1, lm  = 0;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([i][j][][m] with A4[k1i*i+li][k2j*j+lj][ln][k4m*m+lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align446";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A4, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb, k)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    if (n == ln)
-                    {
-                        for (k = 0; k < BN3; k++)
-                        {
-                            if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                                ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                                ((m - lm) == (((m - lm) / k4m) * k4m)) &&
-                                (((i - li) / k1i) >= 0) &&
-                                (((j - lj) / k2j) >= 0) &&
-                                (((m - lm) / k4m) >= 0) &&
-                                (((i - li) / k1i) < BN1) &&
-                                (((j - lj) / k2j) < BN2) &&
-                                (((m - lm) / k4m) < BN4))
-                            {
-                                ib = (i - li) / k1i;
-                                jb = (j - lj) / k2j;
-                                nb = k;
-                                mb = (m - lm) / k4m;
-                                B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                            }
-                        }
-                    }
-                }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] !=val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN447*/
-/* ALIGN arrB[][j][k][i] WITH arrA[i][j][][k]
-                compression and replication*/
-void align447()
-{
-/*   parameters for ALIGN arrB[][j][n][i] WITH arrA4[k1i*i+li][k2j*j+lj][][k3m*n+lm]*/
-    #define AN1 4
-    #define AN2 4
-    #define AN3 4
-    #define AN4 4
-    #define BN1 4
-    #define BN2 4
-    #define BN3 4
-    #define BN4 4
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li = 0;
-    int k1j = 0, k2j = 1, k3j = 0, k4j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 0, k4n = 0, ln = 0;
-    int k1m = 0, k2m = 0, k3m = 1, k4m = 0, lm = 0;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([][j][n][i] with A4[k1i*i+li][k2j*j+lj][][k3m*n+lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align447";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A4, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb, k)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    for (k = 0; k < BN1; k++)
-                    {
-                        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                            ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                            ((m - lm) == (((m - lm) / k3m) * k3m)) &&
-                            (((i - li) / k1i) >= 0) &&
-                            (((j - lj) / k2j) >= 0) &&
-                            (((m - lm) / k3m) >= 0) &&
-                            (((i - li) / k1i) < BN4) &&
-                            (((j - lj) / k2j) < BN2) &&
-                            (((m - lm) / k3m) < BN3))
-                        {
-                            mb = (i - li) / k1i;
-                            jb = (j - lj) / k2j;
-                            ib = k;
-                            nb = (m - lm) / k3m;
-                            B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                        }
-                    }
-                }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] !=val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* ---------------------------------------------ALIGN448*/
-/* ALIGN arrB[][i][j][] WITH arrA[i][j][1][3]
-   compression and replication*/
-void align448()
-{
-/*     parameters for ALIGN arrB[][i][j][]
-                      WITH arrA[k1i*i+li][k2j*j+lj][ln][lm]*/
-    #define AN1 4
-    #define AN2 4
-    #define AN3 4
-    #define AN4 6
-    #define BN1 4
-    #define BN2 4
-    #define BN3 4
-    #define BN4 4
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li = 0;
-    int k1j = 0, k2j = 1, k3j = 0, k4j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 0, k4n = 0, ln = 1;
-    int k1m = 0, k2m = 0, k3m = 0, k4m = 0, lm = 3;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([][i][j][] with A4[k1i*i+li][k2j*j+lj][ln][lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "align448";
-
-    erri = ER;
-    s = 0;
-
-    #pragma dvm actual(erri, s)
-    #pragma dvm region local(A4, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb, k, l)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    if ((n == ln) && (m == lm))
-                    {
-                        for (k = 0; k < BN1; k++)
-                            for (l = 0; l < BN4; l++)
-                            {
-                                if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                                    ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                                    (((i - li) / k1i) >= 0) &&
-                                    (((j - lj) / k2j) >= 0) &&
-                                    (((i - li) / k1i) < BN2) &&
-                                    (((j - lj) / k2j) < BN3))
-                                {
-                                    ib = k;
-                                    jb = (i - li) / k1i;
-                                    nb = (j - lj) / k2j;
-                                    mb = l;
-                                    B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                                }
-                            }
-                    }
-                }
-
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erri), sum(s))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s = s + B4[i][j][n][m];
-                    if (B4[i][j][n][m] !=val)
-                        if (erri > val) erri = val;
-                }
-
-    }
-    #pragma dvm get_actual(erri, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    if ((erri == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/aligndyn11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/aligndyn11.cdv
deleted file mode 100644
index 97eee25..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/ALIGN/aligndyn11.cdv
+++ /dev/null
@@ -1,422 +0,0 @@
-/*    ALIGNDYN11
-TESTING align CLAUSE for dynamic arrays*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void align111();
-static void align1111();
-static void align1112();
-static void align112();
-static void align113();
-static void align114();
-static void align115();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF ALIGNDYN11 ===================\n");
-            /* ALIGN arrB[i] WITH arrA[i]  normal*/
-    align111();
-            /* ALIGN arrB[i] WITH arrA[i]  small array*/
-    align1111();
-            /* ALIGN arrB[i] WITH arrA[2*i+3]  small array*/
-    align1112();
-             /* ALIGN arrB[i] WITH arrA[i+4]  shift along i*/
-    align112();
-             /* ALIGN arrB[i] WITH arrA[-i+8] reverse on i*/
-//    align113();
-             /* ALIGN arrB[i] WITH arrA[2*i+8]  stretching along i*/
-    align114();
-             /* ALIGN arrB[] WITH arrA[]*/
-    align115();
-    printf("=== END OF ALIGNDYN11 =====================\n");
-    return 0;
-}
-/* ---------------------------------------------ALIGN111*/
-/* ALIGN arrB[i] WITH arrA[i] normal*/
-void align111()
-{
-/*     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    int AN1 = 8;
-    int BN1 = 8;
-    int k1i = 1;
-    int k2i = 0;
-    int li = 0;
-    char tname[] = "align111 ";
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array
-    int *B1;
-
-    /* create arrays */
-    A1 = malloc(AN1 * sizeof(int));
-    B1 = malloc(BN1 * sizeof(int));
-    #pragma dvm realign(B1[i] with A1[k1i * i + li])
-
-    erri = ER;
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(B1);
-    free(A1);
-}
-/* ---------------------------------------------ALIGN1111*/
-/* ALIGN arrB[i] WITH arrA[i] small array*/
-void align1111()
-{
-/*     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    int AN1 = 5;
-    int BN1 = 2;
-    int k1i = 1;
-    int k2i = 0;
-    int li = 0;
-    char tname[] = "align1111";
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array
-    int *B1;
-
-    /* create arrays */
-    A1 = malloc(AN1 * sizeof(int));
-    B1 = malloc(BN1 * sizeof(int));
-    #pragma dvm realign(B1[i] with A1[k1i * i + li])
-
-    erri = ER;
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(B1);
-    free(A1);
-}
-/* ---------------------------------------------ALIGN1112*/
-/* ALIGN arrB[i] WITH arrA[2*i+1]  small array*/
-void align1112()
-{
-/*     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    int AN1 = 5;
-    int BN1 = 2;
-    int k1i = 2;
-    int k2i = 0;
-    int li = 1;
-    char tname[] = "align1112";
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array
-    int *B1;
-
-    /* create arrays */
-    A1 = malloc(AN1 * sizeof(int));
-    B1 = malloc(BN1 * sizeof(int));
-    #pragma dvm realign(B1[i] with A1[k1i * i + li])
-
-    erri = ER;
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(B1);
-    free(A1);
-}
-/* ---------------------------------------------ALIGN112*/
-/* ALIGN arrB[i] WITH arrA[i+4]  shift along i*/
-void align112()
-{
-/*     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    int AN1 = 8;
-    int BN1 = 4;
-    int k1i = 1;
-    int k2i = 0;
-    int li = 4;
-    char tname[] = "align112 ";
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array
-    int *B1;
-
-    /* create arrays */
-    A1 = malloc(AN1 * sizeof(int));
-    B1 = malloc(BN1 * sizeof(int));
-    #pragma dvm realign(B1[i] with A1[k1i * i + li])
-
-    erri = ER;
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(B1);
-    free(A1);
-}
-/* ---------------------------------------------ALIGN113*/
-/* ALIGN arrB[i] WITH arrA[-i+8] reverse on i*/
-void align113()
-{
-/*     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    int AN1 = 8;
-    int BN1 = 8;
-    int k1i = -1;
-    int k2i = 0;
-    int li = 8;
-    char tname[] = "align113 ";
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array
-    int *B1;
-
-    /* create arrays */
-    A1 = malloc(AN1 * sizeof(int));
-    B1 = malloc(BN1 * sizeof(int));
-    #pragma dvm realign(B1[i] with A1[k1i * i + li])
-
-    erri = ER;
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(B1);
-    free(A1);
-}
-/* ---------------------------------------------ALIGN114*/
-/* ALIGN arrB[i] WITH arrA[2*i+8]  stretching along i*/
-void align114()
-{
-/*     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]  */
-    int AN1 = 24;
-    int BN1 = 8;
-    int k1i = 2;
-    int k2i = 0;
-    int li = 8;
-    char tname[] = "align114 ";
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array
-    int *B1;
-
-    /* create arrays */
-    A1 = malloc(AN1 * sizeof(int));
-    B1 = malloc(BN1 * sizeof(int));
-    #pragma dvm realign(B1[i] with A1[k1i * i + li])
-
-    erri = ER;
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] = ib;
-        }
-    }
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erri)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i)
-            if (erri > i) erri = i;
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-            if (erri > i) erri = i;
-    }
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(B1);
-    free(A1);
-}
-/* ---------------------------------------------ALIGN115*/
-/* ALIGN arrB[] WITH arrA[]*/
-void align115()
-{
-/*    parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]*/
-    int AN1 = 24;
-    int BN1 = 8;
-    int k1i = 0;
-    int k2i = 0;
-    int li  = 0;
-    char tname[] = "align115 ";
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array
-    int (*B1);
-
-    A1 = malloc(AN1 * sizeof(int));
-    B1 = malloc(BN1 * sizeof(int));
-    #pragma dvm realign(B1[] with A1[])
-
-    erri = ER;
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = i;
-    #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), private(j)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < BN1; j++)
-        {
-            if (B1[j] != j)
-                if (erri > j) erri = j;
-        }
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(B1);
-    free(A1);
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr1.cdv
deleted file mode 100644
index b667ebd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr1.cdv
+++ /dev/null
@@ -1,297 +0,0 @@
-/*    DISTR1
-TESTING distribute and redistribute CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distr11();
-static void distr12();
-static void distr13();
-static void distr14();
-static void distr21();
-static void distr22();
-static void distr23();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTR1 ===================\n");
-            /* DISTRIBUTE arrA1[BLOCK] REDISTRIBUTE arrA1[*]*/
-    distr11();
-            /* DISTRIBUTE arrA1[*] REDISTRIBUTE arrA1[BLOCK]*/
-    distr12();
-            /* DISTRIBUTE arrA1[BLOCK] REDISTRIBUTE arrA1[*] small array*/
-    distr13();
-             /* DISTRIBUTE arrA1[*] REDISTRIBUTE arrA1[BLOCK] small array*/
-    distr14();
-             /* DISTRIBUTE arrA2[BLOCK][*] REDISTRIBUTE arrA2[*][BLOCK]*/
-    distr21();
-             /* DISTRIBUTE arrA2[*][BLOCK] REDISTRIBUTE arrA2[*][*]*/
-    distr22();
-             /* DISTRIBUTE arrA2[*][*] REDISTRIBUTE arrA2[*][BLOCK]*/
-    distr23();
-    printf("=== END OF DISTR1 =====================\n");
-    return 0;
-}
-/* ---------------------------------------------DISTR11*/
-            /* DISTRIBUTE arrA1[BLOCK] REDISTRIBUTE arrA1[*]*/
-void distr11()
-{
-    #define AN1 8
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    char tname[] = "distr11";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-}
-/* ---------------------------------------------DISTR12*/
-            /* DISTRIBUTE arrA1[*] REDISTRIBUTE arrA1[BLOCK]*/
-void distr12()
-{
-    #define AN1 8
-
-    #pragma dvm array distribute[*]
-    float A1[AN1];
-    char tname[] = "distr12";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-}
-/* ---------------------------------------------DISTR13*/
-            /* DISTRIBUTE arrA1[BLOCK] REDISTRIBUTE arrA1[*] small array*/
-void distr13()
-{
-    #define AN1 5
-
-    #pragma dvm array distribute[block]
-    double A1[AN1];
-    char tname[] = "distr13";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-}
-/* ---------------------------------------------DISTR14*/
-             /* DISTRIBUTE arrA1[*] REDISTRIBUTE arrA1[BLOCK] small array*/
-void distr14()
-{
-    #define AN1 5
-
-    #pragma dvm array distribute[*]
-    long A1[AN1];
-    char tname[] = "distr14";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-}
-/* ---------------------------------------------DISTR21*/
-             /* DISTRIBUTE arrA2[BLOCK][*] REDISTRIBUTE arrA2[*][BLOCK]*/
-void distr21()
-{
-    #define AN1 8
-    #define AN2 8
-
-    #pragma dvm array distribute[block][*]
-    int A2[AN1][AN2];
-    char tname[] = "distr21";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-    #pragma dvm redistribute(A2[*][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-}
-/* ---------------------------------------------DISTR22*/
-             /* DISTRIBUTE arrA2[*][BLOCK] REDISTRIBUTE arrA2[*][*]*/
-void distr22()
-{
-    #define AN1 8
-    #define AN2 8
-
-    #pragma dvm array distribute[*][block]
-    float A2[AN1][AN2];
-    char tname[] = "distr22";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-    #pragma dvm redistribute(A2[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-}
-/* ---------------------------------------------DISTR23*/
-             /* DISTRIBUTE arrA2[*][*] REDISTRIBUTE arrA2[*][BLOCK]*/
-void distr23()
-{
-    #define AN1 8
-    #define AN2 8
-
-    #pragma dvm array distribute[*][*]
-    double A2[AN1][AN2];
-    char tname[] = "distr23";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-    #pragma dvm redistribute(A2[*][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr2.cdv
deleted file mode 100644
index 5c99679..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr2.cdv
+++ /dev/null
@@ -1,257 +0,0 @@
-/*    DISTR2
-TESTING distribute and redistribute CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distr24();
-static void distr32();
-static void distr33();
-static void distr41();
-static void distr42();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, n, m, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTR2 ===================\n");
-    /* DISTRIBUTE arrA2[BLOCK][BLOCK]  REDISTRIBUTE arrA2[*][*]*/
-    distr24();
-    /* DISTRIBUTE  arrA3[BLOCK][*][BLOCK] REDISTRIBUTE arrA3[*][BLOCK][BLOCK] */
-    distr32();
-    /* DISTRIBUTE  arrA3[BLOCK][*][BLOCK] REDISTRIBUTE arrA3[*][BLOCK][*] */
-    distr33();
-    /* DISTRIBUTE arrA4[*][*][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]*/
-    distr41();
-    /* DISTRIBUTE arrA4[BLOCK][*][BLOCK][*] REDISTRIBUTE arrA4[*][BLOCK][BLOCK][*]*/
-    distr42();
-    printf("=== END OF DISTR2 =====================\n");
-    return 0;
-}
-/* ---------------------------------------------DISTR24*/
-/*  DISTRIBUTE arrA2[BLOCK][BLOCK] REDISTRIBUTE arrA2[*][*]*/
-void distr24()
-{
-    #define AN1 8
-    #define AN2 8
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    char tname[] = "distr24";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-    #pragma dvm redistribute(A2[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-}
-/* ---------------------------------------------DISTR32*/
-/* DISTRIBUTE arrA3[BLOCK][*][BLOCK] REDISTRIBUTE arrA3[*][BLOCK][BLOCK]*/
-void distr32()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-
-    #pragma dvm array distribute[block][*][block]
-    float A3[AN1][AN2][AN3];
-    char tname[] = "distr32";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n] on A3[i][j][n]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    A3[i][j][n] = i * NL / 10 + j * NL / 100 + n;
-    }
-    #pragma dvm redistribute(A3[*][block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n] on A3[i][j][n]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    if (A3[i][j][n] != i * NL / 10 + j * NL / 100 + n)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-/* ---------------------------------------------DISTR33*/
-/* DISTRIBUTE  arrA3[BLOCK][*][ BLOCK] REDISTRIBUTE arrA3[*][BLOCK][*] */
-void distr33()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-
-    #pragma dvm array distribute[block][*][block]
-    double A3[AN1][AN2][AN3];
-    char tname[] = "distr33";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n] on A3[i][j][n]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    A3[i][j][n] = i * NL / 10 + j * NL / 100 + n;
-    }
-    #pragma dvm redistribute(A3[*][block][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n] on A3[i][j][n]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    if (A3[i][j][n] != i * NL / 10 + j * NL / 100 + n)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-/* ---------------------------------------------DISTR41*/
-/* DISTRIBUTE arrA4[*][*][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]*/
-void distr41()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    #define AN4 5
-
-    #pragma dvm array distribute[*][*][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    char tname[] = "distr41";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    }
-    #pragma dvm redistribute(A4[*][*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        if (A4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                            erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-/* ---------------------------------------------DISTR42*/
-/* DISTRIBUTE arrA4[BLOCK][*][BLOCK][*] REDISTRIBUTE arrA4[*][BLOCK][BLOCK][*]*/
-void distr42()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    #define AN4 5
-
-    #pragma dvm array distribute[block][*][block][*]
-    float A4[AN1][AN2][AN3][AN4];
-    char tname[] = "distr42";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    }
-    #pragma dvm redistribute(A4[*][block][block][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        if (A4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                            erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr3.cdv
deleted file mode 100644
index 60347b3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr3.cdv
+++ /dev/null
@@ -1,125 +0,0 @@
-/*    DISTR3
-TESTING distribute and redistribute CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distr31();
-static void distr43();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, n, m, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTR3 ===================\n");
-    /* DISTRIBUTE  arrA3[BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA3[*][*][*]*/
-    distr31();
-    /* DISTRIBUTE arrA4[BLOCK][*][BLOCK][BLOCK] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][*]*/
-    distr43();
-    printf("=== END OF DISTR3 =====================\n");
-    return 0;
-}
-/* ---------------------------------------------DISTR31*/
-/* DISTRIBUTE  arrA3[BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA3[*][*][*]*/
-void distr31()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    char tname[] = "distr31";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n] on A3[i][j][n]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    A3[i][j][n] = i * NL / 10 + j * NL / 100 + n;
-    }
-    #pragma dvm redistribute(A3[*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n] on A3[i][j][n]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    if (A3[i][j][n] != i * NL / 10 + j * NL / 100 + n)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-/* ---------------------------------------------DISTR43*/
-/* DISTRIBUTE arrA4[BLOCK][*][BLOCK][BLOCK] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][*]*/
-void distr43()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    #define AN4 5
-
-    #pragma dvm array distribute[block][*][block][block]
-    double A4[AN1][AN2][AN3][AN4];
-    char tname[] = "distr43";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    }
-    #pragma dvm redistribute(A4[block][block][block][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        if (A4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                            erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr4.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr4.cdv
deleted file mode 100644
index 709ab73..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR/distr4.cdv
+++ /dev/null
@@ -1,229 +0,0 @@
-/*    DISTR4
-TESTING distribute and redistribute CLAUSE*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distr44();
-static void distr45();
-static void distr46();
-static void distr47();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, n, m, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTR4 ===================\n");
-    /* DISTRIBUTE arrA4[*][*][*][*] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]*/
-    distr44();
-    /* DISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]*/
-    distr45();
-    /* DISTRIBUTE arrA4[*][*][*][*] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]
-     small array*/
-    distr46();
-    /* DISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]
-     small array*/
-    distr47();
-    printf("=== END OF DISTR4 =====================\n");
-    return 0;
-}
-/* ---------------------------------------------DISTR44*/
-/* DISTRIBUTE arrA4[*][*][*][*] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]*/
-void distr44()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    #define AN4 8
-
-    #pragma dvm array distribute[*][*][*][*]
-    int A4[AN1][AN2][AN3][AN4];
-    char tname[] = "distr44";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    }
-    #pragma dvm redistribute(A4[block][block][block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        if (A4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                            erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-/* ---------------------------------------------DISTR45*/
-/* DISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]*/
-void distr45()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    #define AN4 5
-
-    #pragma dvm array distribute[block][block][block][block]
-    float A4[AN1][AN2][AN3][AN4];
-    char tname[] = "distr45";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    }
-    #pragma dvm redistribute(A4[*][*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        if (A4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                            erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-/* ---------------------------------------------DISTR46*/
-/* DISTRIBUTE arrA4[*][*][*][*] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]
-   small array*/
-void distr46()
-{
-    #define AN1 5
-    #define AN2 4
-    #define AN3 3
-    #define AN4 2
-
-    #pragma dvm array distribute[*][*][*][*]
-    double A4[AN1][AN2][AN3][AN4];
-    char tname[] = "distr46";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    }
-    #pragma dvm redistribute(A4[block][block][block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        if (A4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                            erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-/* ---------------------------------------------DISTR47*/
-/* DISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]
-   small array*/
-void distr47()
-{
-    #define AN1 1
-    #define AN2 2
-    #define AN3 3
-    #define AN4 4
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    char tname[] = "distr47";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    }
-    #pragma dvm redistribute(A4[*][*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (n = 0; n < AN3; n++)
-                    for (m = 0; m < AN4; m++)
-                        if (A4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                            erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen1.cdv
deleted file mode 100644
index 76d5b92..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen1.cdv
+++ /dev/null
@@ -1,386 +0,0 @@
-/*    DISTRGEN1
-TESTING distribute and redistribute CLAUSE
-for arrays distributed with GEN-block*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-#ifndef _DVMH
-#define dvmh_get_num_procs(X) 1
-#endif
-
-static void distrg10();
-static void distrg11();
-static void distrg12();
-static void distrg13();
-static void distrg14();
-static void distrg15();
-static void distrg161();
-static void distrg162();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRGEN1 ===================\n");
-    /* DISTRIBUTE arrA1[BLOCK] REDISTRIBUTE arrA1[GENBLOCK]*/
-    distrg10();
-
-    /* DISTRIBUTE arrA1[GENBLOCK] REDISTRIBUTE arrA1[BLOCK]*/
-    distrg11();
-
-    /* DISTRIBUTE arrA1[GENBLOCK] REDISTRIBUTE arrA1[*]*/
-    distrg12();
-
-    /* DISTRIBUTE arrA1[BLOCK] REDISTRIBUTE arrA1[*]*/
-    distrg13();
-
-    /* DISTRIBUTE arrA1[*] REDISTRIBUTE arrA1[BLOCK]*/
-    distrg14();
-
-    /* DISTRIBUTE arrA1[*] REDISTRIBUTE arrA1[GENBLOCK]*/
-    distrg15();
-
-    /* DISTRIBUTE arrA1[GENBLOCK] REDISTRIBUTE arrA1[GENBLOCK]
-       with 0 in BS.1*/
-    distrg161();
-
-    /* DISTRIBUTE arrA1[GENBLOCK] REDISTRIBUTE arrA1[GENBLOCK]
-       with 0 in BS.2*/
-    distrg162();
-
-    printf("=== END OF DISTRGEN1 =====================\n");
-    return 0;
-}
-
-static int myRand() {
-    const unsigned a = 1103515245U;
-    const unsigned c = 12345U;
-    const unsigned m = ((unsigned)RAND_MAX) + 1U;
-    static unsigned prev = 5;
-    prev = (a * prev + c) % m;
-    return prev;
-}
-
-static void genBlocksAxis(const int procCount, const int weight, const int withoutZero, int **blocks) {
-    *blocks = (int *)malloc(procCount * sizeof(int));
-    int restWeight = weight, i, zeroind = -1;
-    if (!withoutZero && procCount != 1)
-        zeroind = myRand() % (procCount - 1);
-    for (i = 0; i < (procCount - 1); i++) {
-        if (i == zeroind)
-            (*blocks)[i] = 0;
-        else
-            (*blocks)[i] = 1 * withoutZero + myRand() % (restWeight - (procCount - (i + 1)));
-        restWeight -= (*blocks)[i];
-    }
-    (*blocks)[i] = restWeight;
-}
-
-/* ---------------------------------------------DISTR10*/
-/* DISTRIBUTE arrA1[BLOCK] REDISTRIBUTE arrA1[GENBLOCK]*/
-void distrg10()
-{
-    #define AN1 8
-    int* BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS);
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    char tname[] = "distrg10";
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[genblock(BS)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR11*/
-/* DISTRIBUTE arrA1[GENBLOCK] REDISTRIBUTE arrA1[BLOCK]*/
-void distrg11()
-{
-    #define AN1 8
-    int *BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS);
-    #pragma dvm array distribute[genblock(BS)]
-    int A1[AN1];
-    char tname[] = "distrg11";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR12*/
-/* DISTRIBUTE arrA1[GENBLOCK] REDISTRIBUTE arrA1[*]*/
-void distrg12()
-{
-    #define AN1 8
-    int *BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS);
-    #pragma dvm array distribute[genblock(BS)]
-    int A1[AN1];
-    char tname[] = "distrg12";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR13*/
-/* DISTRIBUTE arrA1[BLOCK] REDISTRIBUTE arrA1[*]*/
-void distrg13()
-{
-    #define AN1 8
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    char tname[] = "distrg13";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR14*/
-/* DISTRIBUTE arrA1[*] REDISTRIBUTE arrA1[BLOCK]*/
-void distrg14()
-{
-    #define AN1 8
-
-    #pragma dvm array distribute[*]
-    int A1[AN1];
-    char tname[] = "distrg14";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR15*/
-/* DISTRIBUTE arrA1[*] REDISTRIBUTE arrA1[GENBLOCK]*/
-void distrg15()
-{
-    #define AN1 8
-    int *BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS);
-    #pragma dvm array distribute[*]
-    int A1[AN1];
-    char tname[] = "distrg15";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[genblock(BS)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR161*/
-/* DISTRIBUTE arrA1[GENBLOCK] REDISTRIBUTE arrA1[GENBLOCK]
-   wtih 0 in BS.1*/
-/*{0, 8} - works, {8, 0} - cycle*/
-void distrg161()
-{
-    #define AN1 8
-    int *BS1, *BS2;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 0, &BS1);
-    #pragma dvm array distribute[genblock(BS1)]
-    int A1[AN1];
-    char tname[] = "distrg161";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[genblock(BS2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(BS2);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR162*/
-/* DISTRIBUTE arrA1[GENBLOCK] REDISTRIBUTE arrA1[GENBLOCK]
-   wtih 0 in BS.2*/
-void distrg162()
-{
-    #define AN1 8
-    int *BS1, *BS2;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 0, &BS2);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    #pragma dvm array distribute[genblock(BS1)]
-    int A1[AN1];
-    char tname[] = "distrg162";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[genblock(BS2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(BS2);
-    #undef AN1
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen2.cdv
deleted file mode 100644
index cafcf03..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen2.cdv
+++ /dev/null
@@ -1,648 +0,0 @@
-/*    DISTRGEN2
-TESTING distribute and redistribute CLAUSE
-for arrays distributed with GEN-block*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-#ifndef _DVMH
-#define dvmh_get_num_procs(X) 1
-#endif
-
-static void distrg21();
-static void distrg22();
-static void distrg23();
-static void distrg24();
-static void distrg25();
-static void distrg26();
-static void distrg261();
-static void distrg27();
-static void distrg28();
-static void distrg29();
-static void distrg210();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRGEN2 ===================\n");
-    /* DISTRIBUTE arrA2[BLOCK][*] REDISTRIBUTE arrA2[*][GENBLOCK]*/
-    distrg21();
-
-    /* DISTRIBUTE arrA2[*][BLOCK] REDISTRIBUTE arrA2[GENBLOCK][*]*/
-    distrg22();
-
-    /* DISTRIBUTE arrA2[*][GENBLOCK] REDISTRIBUTE arrA2[*][*]*/
-    distrg23();
-
-    /* DISTRIBUTE arrA2[*][*] REDISTRIBUTE arrA2[GENBLOCK][*]*/
-    distrg24();
-
-    /* DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] other blocks*/
-    distrg25();
-
-    /* DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-                             REDISTRIBUTE arrA2[BLOCK][BLOCK]
-                             REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]*/
-    distrg26();
-
-    /* DISTRIBUTE arrA2[GEN_BLOCK][BLOCK]
-                         REDISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-                         REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]*/
-    distrg27();
-
-    /* DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-                         REDISTRIBUTE arrA2[BLOCK][BLOCK]
-                         REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]*/
-    distrg28();
-
-    /* DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-                         REDISTRIBUTE arrA2[*][*]
-                         REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]*/
-    distrg29();
-
-    /* DISTRIBUTE arrA2[GEN_BLOCK][*]
-                         REDISTRIBUTE arrA2[*][*]
-                         REDISTRIBUTE arrA2[*][GEN_BLOCK]*/
-    distrg210();
-
-    printf("=== END OF DISTRGEN2 =====================\n");
-    return 0;
-}
-
-static int myRand() {
-    const unsigned a = 1103515245U;
-    const unsigned c = 12345U;
-    const unsigned m = ((unsigned)RAND_MAX) + 1U;
-    static unsigned prev = 5;
-    prev = (a * prev + c) % m;
-    return prev;
-}
-
-static void genBlocksAxis(const int procCount, const int weight, const int withoutZero, int **blocks) {
-    *blocks = (int *)malloc(procCount * sizeof(int));
-    int restWeight = weight, i, zeroind = -1;
-    if (!withoutZero && procCount != 1)
-        zeroind = myRand() % (procCount - 1);
-    for (i = 0; i < (procCount - 1); i++) {
-        if (i == zeroind)
-            (*blocks)[i] = 0;
-        else
-            (*blocks)[i] = 1 * withoutZero + myRand() % (restWeight - (procCount - (i + 1)));
-        restWeight -= (*blocks)[i];
-    }
-    (*blocks)[i] = restWeight;
-}
-/* ---------------------------------------------DISTR21*/
-/* DISTRIBUTE arrA2[BLOCK][*] REDISTRIBUTE arrA2[*][GENBLOCK]*/
-void distrg21()
-{
-    #define AN1 8
-    #define AN2 8
-    int *BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN2, 1, &BS);
-    #pragma dvm array distribute[block][*]
-    int A1[AN1][AN2];
-    char tname[] = "distrg21";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A1[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A1[i][j] = i*NL + j;
-    }
-    #pragma dvm redistribute(A1[*][genblock(BS)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A1[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A1[i][j] != i*NL + j)
-                    erri = Min(erri, i*NL/10 + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR22*/
-/* DISTRIBUTE arrA2[*][BLOCK] REDISTRIBUTE arrA2[GENBLOCK][*]*/
-void distrg22()
-{
-    #define AN1 8
-    #define AN2 8
-    int *BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS);
-    #pragma dvm array distribute[*][block]
-    int A1[AN1][AN2];
-    char tname[] = "distrg22";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A1[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A1[i][j] = i*NL + j;
-    }
-    #pragma dvm redistribute(A1[genblock(BS)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A1[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A1[i][j] != i*NL + j)
-                    erri = Min(erri, i*NL/10 + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR23*/
-/* DISTRIBUTE arrA2[*][GENBLOCK] REDISTRIBUTE arrA2[*][*]*/
-void distrg23()
-{
-    #define AN1 8
-    #define AN2 8
-    int *BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN2, 1, &BS);
-    #pragma dvm array distribute[*][genblock(BS)]
-    int A1[AN1][AN2];
-    char tname[] = "distrg23";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A1[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A1[i][j] = i*NL + j;
-    }
-    #pragma dvm redistribute(A1[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A1[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A1[i][j] != i*NL + j)
-                    erri = Min(erri, i*NL/10 + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR24*/
-/* DISTRIBUTE arrA2[*][*] REDISTRIBUTE arrA2[GENBLOCK][*]*/
-void distrg24()
-{
-    #define AN1 8
-    #define AN2 8
-    int *BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS);
-    #pragma dvm array distribute[*][*]
-    int A1[AN1][AN2];
-    char tname[] = "distrg24";
-
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A1[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A1[i][j] = i*NL + j;
-    }
-    #pragma dvm redistribute(A1[genblock(BS)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A1[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A1[i][j] != i*NL + j)
-                    erri = Min(erri, i*NL/10 + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR25*/
-/* DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] other blocks*/
-void distrg25()
-{
-    #define AN1 10
-    #define AN2 12
-    int *BS1i, *BS1j, *BS2i, *BS2j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    //int BS1i[2] = {5, 5}, BS1j[2] = {7, 5};
-    //int BS2i[2] = {6, 4}, BS2j[2] = {5, 7};
-    #pragma dvm array distribute[genblock(BS1i)][genblock(BS1j)]
-    int A2[AN1][AN2];
-    char tname[] = "distrg25";
-
-    erri = ER;
-
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = 1;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += i*NL+j;
-    }
-
-    #pragma dvm redistribute(A2[genblock(BS2i)][genblock(BS2j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i*NL+j + 1)
-                    erri = Min(erri, i*NL/10+j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS2i);
-    free(BS2j);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR26*/
-/* DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-                             REDISTRIBUTE arrA2[BLOCK][BLOCK]
-                             REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]*/
-void distrg26()
-{
-    #define AN1 10
-    #define AN2 12
-    int *BS1i, *BS1j, *BS2i, *BS2j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    #pragma dvm array distribute[genblock(BS1i)][genblock(BS1j)]
-    int A2[AN1][AN2];
-    char tname[] = "distrg26";
-    erri = ER;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = 1;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += i*NL+j;
-    }
-    #pragma dvm redistribute(A2[block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[genblock(BS2i)][genblock(BS2j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i*NL+j + 3)
-                    erri = Min(erri, i*NL/10 + j + 3);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS2i);
-    free(BS2j);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR27*/
- /* DISTRIBUTE arrA2[GEN_BLOCK][BLOCK]
-                         REDISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-                         REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]*/
-
-void distrg27()
-{
-    #define AN1 10
-    #define AN2 12
-    int *BS1i, *BS2j, *BS3i;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS3i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    #pragma dvm array distribute[genblock(BS1i)][block]
-    int A2[AN1][AN2];
-    char tname[] = "distrg27";
-
-    erri = ER;
-
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = 1;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += i*NL+j;
-    }
-    #pragma dvm redistribute(A2[block][genblock(BS2j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[genblock(BS3i)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i*NL+j + 3)
-                    erri = Min(erri, i*NL/10+j + 3);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS3i);
-    free(BS2j);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR28*/
-/* DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-                         REDISTRIBUTE arrA2[BLOCK][BLOCK]
-                         REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]*/
-void distrg28()
-{
-    #define AN1 10
-    #define AN2 12
-    int *BS1j, *BS2i;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    #pragma dvm array distribute[block][genblock(BS1j)]
-    int A2[AN1][AN2];
-    char tname[] = "distrg28";
-
-    erri = ER;
-
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = 1;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += i*NL+j;
-    }
-    #pragma dvm redistribute(A2[block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-
-    #pragma dvm redistribute(A2[genblock(BS2i)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i*NL+j + 3)
-                    erri = Min(erri, i*NL/10+j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS2i);
-    free(BS1j);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR29*/
-/* DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-                         REDISTRIBUTE arrA2[*][*]
-                         REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]*/
-void distrg29()
-{
-    #define AN1 10
-    #define AN2 12
-    int *BS1i, *BS1j, *BS2i, *BS2j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    #pragma dvm array distribute[genblock(BS1i)][genblock(BS1j)]
-    int A2[AN1][AN2];
-    char tname[] = "distrg29";
-
-    erri = ER;
-
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = 1;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += i*NL+j;
-    }
-    #pragma dvm redistribute(A2[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[genblock(BS2i)][genblock(BS2j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i*NL+j + 3)
-                    erri = Min(erri, i*NL/10+j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS2i);
-    free(BS2j);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR210*/
-/* DISTRIBUTE arrA2[GEN_BLOCK][*]
-                         REDISTRIBUTE arrA2[*][*]
-                         REDISTRIBUTE arrA2[*][GEN_BLOCK]*/
-void distrg210()
-{
-    #define AN1 10
-    #define AN2 12
-    int *BS1i, *BS2i;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(1), AN2, 1, &BS2i);
-    #pragma dvm array distribute[genblock(BS1i)][*]
-    int A2[AN1][AN2];
-    char tname[] = "distrg210";
-
-    erri = ER;
-
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = 1;
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += i*NL+j;
-    }
-    #pragma dvm redistribute(A2[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[*][genblock(BS2i)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j])
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i*NL+j + 3)
-                    erri = Min(erri, i*NL/10+j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS2i);
-    #undef AN1
-    #undef AN2
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen3.cdv
deleted file mode 100644
index 6a4ccf5..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_GEN/distrgen3.cdv
+++ /dev/null
@@ -1,1006 +0,0 @@
-/*    DISTRGEN3
-TESTING distribute and redistribute CLAUSE
-for arrays distributed with GEN-block*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-#ifndef _DVMH
-#define dvmh_get_num_procs(X) 1
-#endif
-
-static void distrg31();
-static void distrg32();
-static void distrg33();
-static void distrg34();
-static void distrg35();
-static void distrg36();
-static void distrg37();
-static void distrg38();
-static void distrg39();
-static void distrg310();
-static void distrg311();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erria, errib, i, j, k, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRGEN3 ===================\n");
-    /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] other blocks*/
-    distrg31();
-
-    /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]*/
-    distrg32();
-
-    /* DISTRIBUTE arrA3[BLOCK][GEN_BLOCK][GEN_BLOCK]   allocatable
-       DISTRIBUTE arrB3[BLOCK][GEN_BLOCK][GEN_BLOCK]   static
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]*/
-    distrg33();
-
-    /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]  !static
-                REDISTRIBUTE [GEN_BLOCK][*][BLOCK]
-       DISTRIBUTE arrB3[GEN_BLOCK][*][BLOCK]            !static
-                REDISTRIBUTE [BLOCK][GEN_BLOCK][*]*/
-    distrg34();
-
-    /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE arrA2[*][*][*]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]*/
-    distrg35();
-
-    /* 36 DISTRIBUTE arrA3[GEN_BLOCK][BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-                REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]*/
-    distrg36();
-
-    /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][BLOCK]
-                REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-                REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]*/
-    distrg37();
-
-    /* DISTRIBUTE arrA3 [GEN_BLOCK][*][GEN_BLOCK]
-                REDISTRIBUTE [*][GEN_BLOCK][*]
-                REDISTRIBUTE[GEN_BLOCK][GEN_BLOCK][*]
-                REDISTRIBUTE[*][GEN_BLOCK][GEN_BLOCK]*/
-    distrg38();
-
-    /* 39 DISTRIBUTE arrA3 [*][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][*][*]
-                REDISTRIBUTE[GEN_BLOCK][*][GEN_BLOCK]*/
-    distrg39();
-
-    /* 310 DISTRIBUTE arrA3 [GEN_BLOCK][GEN_BLOCK][*]
-                REDISTRIBUTE [*][*][GEN_BLOCK]
-                REDISTRIBUTE[*][GEN_BLOCK][BLOCK]*/
-    distrg310();
-
-    /* 311 DISTRIBUTE arrA3 [GEN_BLOCK][*][*]
-                REDISTRIBUTE [*][*][*]
-                REDISTRIBUTE[*][*][GEN_BLOCK]*/
-    distrg311();
-
-    printf("=== END OF DISTRGEN3 =====================\n");
-    return 0;
-}
-
-static int myRand() {
-    const unsigned a = 1103515245U;
-    const unsigned c = 12345U;
-    const unsigned m = ((unsigned)RAND_MAX) + 1U;
-    static unsigned prev = 5;
-    prev = (a * prev + c) % m;
-    return prev;
-}
-
-static void genBlocksAxis(const int procCount, const int weight, const int withoutZero, int **blocks) {
-    *blocks = (int *)malloc(procCount * sizeof(int));
-    int restWeight = weight, i, zeroind = -1;
-    if (!withoutZero && procCount != 1)
-        zeroind = myRand() % (procCount - 1);
-    for (i = 0; i < (procCount - 1); i++) {
-        if (i == zeroind)
-            (*blocks)[i] = 0;
-        else
-            (*blocks)[i] = 1 * withoutZero + myRand() % (restWeight - (procCount - (i + 1)));
-        restWeight -= (*blocks)[i];
-    }
-    (*blocks)[i] = restWeight;
-}
-
-/* ---------------------------------------------DISTR31*/
-/* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] other blocks*/
-void distrg31()
-{
-    #define AN1 12
-    #define AN2 17
-    #define AN3 16
-    int *BS1i, *BS1j, *BS1k, *BS2i, *BS2j, *BS2k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS2k);
-    #pragma dvm array distribute[genblock(BS1i)][genblock(BS1j)][genblock(BS1k)]
-    int A3[AN1][AN2][AN3];
-    char tname[] = "distrg31";
-
-    erria = ER;
-
-    #pragma dvm region out(A3)
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-    #pragma dvm redistribute(A3[genblock(BS2i)][genblock(BS2j)][genblock(BS2k)])
-
-    #pragma dvm region in(A3)
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erria)
-    if (erria == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(BS2i);
-    free(BS2j);
-    free(BS2k);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR32*/
-/* DISTRIBUTE arrA32[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]*/
-void distrg32()
-{
-    #define AN1 8
-    #define AN2 14
-    #define AN3 6
-    int *BS1i, *BS1j, *BS1k, *BS2i, *BS2j, *BS2k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS2k);
-    #pragma dvm array distribute[genblock(BS1i)][genblock(BS1j)][genblock(BS1k)]
-    int A3[AN1][AN2][AN3];
-    char tname[] = "distrg32";
-
-    erria = ER;
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k + 1;
-    }
-
-    #pragma dvm redistribute(A3[block][block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k]++;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS2i)][genblock(BS2j)][genblock(BS2k)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k])  reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 2)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erria)
-    if (erria == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(BS2i);
-    free(BS2j);
-    free(BS2k);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------distrg33*/
-/* DISTRIBUTE arrA3[BLOCK][GEN_BLOCK][GEN_BLOCK]   allocatable
-     DISTRIBUTE arrB3[BLOCK][GEN_BLOCK][GEN_BLOCK]   static
-                REDISTRIBUTE [GEN_BLOCK][BLOCK][BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]*/
-void distrg33()
-{
-    #define AN1 12
-    #define AN2 17
-    #define AN3 16
-    #define BN1 10
-    #define BN2 10
-    #define BN3 10
-    int *BS1aj, *BS1ak, *BS1bi, *BS1bj, *BS1bk, *BS2ai, *BS2aj, *BS2ak, *BS2bi, *BS2bj, *BS2bk;
-    genBlocksAxis(dvmh_get_num_procs(1), BN1, 1, &BS1bi);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1aj);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1ak);
-    genBlocksAxis(dvmh_get_num_procs(2), BN2, 1, &BS1bj);
-    genBlocksAxis(dvmh_get_num_procs(3), BN3, 1, &BS1bk);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2aj);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS2ak);
-    genBlocksAxis(dvmh_get_num_procs(1), BN1, 1, &BS2bi);
-    genBlocksAxis(dvmh_get_num_procs(2), BN2, 1, &BS2bj);
-    genBlocksAxis(dvmh_get_num_procs(3), BN3, 1, &BS2bk);
-    #pragma dvm array distribute[block][genblock(BS1bj)][genblock(BS1bk)]
-    int B3[BN1][BN2][BN3];
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrg33";
-
-    erria = ER;
-    errib = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][genblock(BS1aj)][genblock(BS1ak)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-
-        #pragma dvm parallel([i][j][k] on B3[i][j][k]) cuda_block(256)
-        for (i = 0; i < BN1; i++)
-            for (j = 0; j < BN2; j++)
-                for (k = 0; k < BN3; k++)
-                    B3[i][j][k] = (i*NL/10 + j*NL/100 + k) * 2;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS2ai)][genblock(BS2aj)][block])
-    #pragma dvm redistribute(B3[genblock(BS2bi)][genblock(BS2bj)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k);
-
-        #pragma dvm parallel([i][j][k] on B3[i][j][k]) reduction(min(errib)), cuda_block(256)
-        for (i = 0; i < BN1; i++)
-            for(j = 0; j < BN2; j++)
-                for(k = 0; k < BN3; k++)
-                    if (B3[i][j][k] != (i*NL/10 + j*NL/100 + k) * 2)
-                        errib = Min(errib, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erria, errib)
-    if (erria == ER && errib == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    free(BS1aj);
-    free(BS1ak);
-    free(BS1bi);
-    free(BS1bj);
-    free(BS1bk);
-    free(BS2ai);
-    free(BS2aj);
-    free(BS2ak);
-    free(BS2bi);
-    free(BS2bj);
-    free(BS2bk);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-/* ---------------------------------------------distrg34*/
-/*DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][*][BLOCK]
-     DISTRIBUTE arrB3[GEN_BLOCK][*][BLOCK]
-                 REDISTRIBUTE [BLOCK][GEN_BLOCK][*]   */
-void distrg34()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 16
-    #define BN1 12
-    #define BN2 17
-    #define BN3 11
-    int *BS1ai, *BS1aj, *BS1ak, *BS1bi, *BS2ai, *BS2bj;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1aj);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1ak);
-    genBlocksAxis(dvmh_get_num_procs(1), BN1, 1, &BS1bi);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2ai);
-    genBlocksAxis(dvmh_get_num_procs(2), BN2, 1, &BS2bj);
-    #pragma dvm array distribute[genblock(BS1bi)][*][block]
-    int B3[BN1][BN2][BN3];
-    #pragma dvm array distribute[genblock(BS1ai)][genblock(BS1aj)][genblock(BS1ak)]
-    int A3[AN1][AN2][AN3];
-    char tname[] = "distrg34";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-
-        #pragma dvm parallel([i][j][k] on B3[i][j][k]) cuda_block(256)
-        for (i = 0; i < BN1; i++)
-            for (j = 0; j < BN2; j++)
-                for (k = 0; k < BN3; k++)
-                    B3[i][j][k] = (i*NL/10 + j*NL/100 + k) * 2;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS2ai)][*][block])
-    #pragma dvm redistribute(B3[block][genblock(BS2bj)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k);
-
-        #pragma dvm parallel([i][j][k] on B3[i][j][k]) reduction(min(errib)), cuda_block(256)
-        for (i = 0; i < BN1; i++)
-            for(j = 0; j < BN2; j++)
-                for(k = 0; k < BN3; k++)
-                    if (B3[i][j][k] != (i*NL/10 + j*NL/100 + k) * 2)
-                        errib = Min(errib, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erria, errib)
-    if (erria == ER && errib == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1ai);
-    free(BS1aj);
-    free(BS1ak);
-    free(BS1bi);
-    free(BS2ai);
-    free(BS2bj);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-/* ----------------------------------------------------distrg35
-    DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE arrA2[*][*][*]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]*/
-void distrg35()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 16
-    int *BS1ai, *BS1aj, *BS1ak, *BS2ai, *BS2aj, *BS2ak;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1aj);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1ak);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2aj);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS2ak);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrg35";
-
-    erria = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1ai)][genblock(BS1aj)][genblock(BS1ak)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 3;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS2ai)][genblock(BS2aj)][genblock(BS2ak)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 3;
-
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 6)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k + 6);
-    }
-
-    #pragma dvm get_actual(erria)
-    if (erria == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    free(BS1ai);
-    free(BS1aj);
-    free(BS1ak);
-    free(BS2ai);
-    free(BS2aj);
-    free(BS2ak);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ----------------------------------------------------distrg36
- 36 DISTRIBUTE arrA3[GEN_BLOCK][BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-                REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]*/
-void distrg36()
-{
-    #define AN1 12
-    #define AN2 12
-    #define AN3 5
-    int *BS1ai, *BS1ak, *BS2aj, *BS3aj, *BS3ak, *BS4ai, *BS4aj;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1ai);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1ak);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2aj);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS4ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS4aj);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS3aj);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS3ak);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrg36";
-
-    erria = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1ai)][block][genblock(BS1ak)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][genblock(BS2aj)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[block][genblock(BS3aj)][genblock(BS3ak)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS4ai)][genblock(BS3aj)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 3)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k + 3);
-    }
-
-    #pragma dvm get_actual(erria)
-    if (erria == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    free(BS1ai);
-    free(BS1ak);
-    free(BS2aj);
-    free(BS3ak);
-    free(BS4ai);
-    free(BS4aj);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ----------------------------------------------------distrg37
- 37 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][BLOCK]
-                REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-                REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]*/
-void distrg37()
-{
-    #define AN1 10
-    #define AN2 15
-    #define AN3 15
-    int *BS1ai, *BS1aj, *BS2aj, *BS3aj, *BS3ak, *BS4ai, *BS4ak;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1aj);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2aj);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS4ai);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS4ak);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS3aj);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS3ak);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrg37";
-
-    erria = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1ai)][genblock(BS1aj)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][genblock(BS2aj)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[block][genblock(BS3aj)][genblock(BS3ak)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS4ai)][block][genblock(BS4ak)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 3)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k + 3);
-    }
-
-    #pragma dvm get_actual(erria)
-    if (erria == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    free(BS1ai);
-    free(BS1aj);
-    free(BS2aj);
-    free(BS3aj);
-    free(BS3ak);
-    free(BS4ai);
-    free(BS4ak);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ----------------------------------------------------distrg38
- 38  DISTRIBUTE arrA3 [GEN_BLOCK][*][GEN_BLOCK]
-                REDISTRIBUTE [*][GEN_BLOCK][*]
-                REDISTRIBUTE[GEN_BLOCK][GEN_BLOCK][*]
-                REDISTRIBUTE[*][GEN_BLOCK][GEN_BLOCK]*/
-void distrg38()
-{
-    #define AN1 5
-    #define AN2 6
-    #define AN3 12
-    int *BS1ai, *BS1aj, *BS2ai, *BS3aj, *BS3ai, *BS4ai, *BS4aj;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN3, 1, &BS1aj);
-    genBlocksAxis(dvmh_get_num_procs(1), AN2, 1, &BS2ai);
-    genBlocksAxis(dvmh_get_num_procs(1), AN2, 1, &BS4ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN3, 1, &BS4aj);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS3aj);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS3ai);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrg38";
-
-    erria = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1ai)][*][genblock(BS1aj)])
-
-    #pragma dvm region out(A3)
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][genblock(BS2ai)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS3ai)][genblock(BS3aj)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[*][genblock(BS4ai)][genblock(BS4aj)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 3)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k + 3);
-   }
-
-    #pragma dvm get_actual(erria)
-    if (erria == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    free(BS1ai);
-    free(BS1aj);
-    free(BS2ai);
-    free(BS3aj);
-    free(BS3ai);
-    free(BS4ai);
-    free(BS4aj);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ----------------------------------------------------distrg39
- 39 DISTRIBUTE arrA3 [*][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][*][*]
-                REDISTRIBUTE[GEN_BLOCK][*][GEN_BLOCK]*/
-void distrg39()
-{
-    #define AN1 10
-    #define AN2 16
-    #define AN3 10
-    int *BS1ai, *BS1aj, *BS2ai, *BS3aj, *BS3ai;
-    genBlocksAxis(dvmh_get_num_procs(1), AN2, 1, &BS1ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN3, 1, &BS1aj);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2ai);
-    genBlocksAxis(dvmh_get_num_procs(2), AN3, 1, &BS3aj);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS3ai);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrg39";
-
-    erria = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][genblock(BS1ai)][genblock(BS1aj)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-
-    #pragma dvm redistribute(A3[genblock(BS2ai)][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k])
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS3ai)][*][genblock(BS3aj)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 2)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k + 2);
-    }
-
-    #pragma dvm get_actual(erria)
-    if (erria == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    free(BS1ai);
-    free(BS1aj);
-    free(BS2ai);
-    free(BS3aj);
-    free(BS3ai);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ----------------------------------------------------distrg310
- 310 DISTRIBUTE arrA3 [GEN_BLOCK][GEN_BLOCK][*]
-                REDISTRIBUTE [*][*][GEN_BLOCK]
-                REDISTRIBUTE[*][GEN_BLOCK][BLOCK]*/
-void distrg310()
-{
-    #define AN1 20
-    #define AN2 15
-    #define AN3 10
-    int *BS1aj, *BS1ai, *BS2ai, *BS3ai;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1aj);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1ai);
-    genBlocksAxis(dvmh_get_num_procs(1), AN3, 1, &BS2ai);
-    genBlocksAxis(dvmh_get_num_procs(1), AN2, 1, &BS3ai);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrg310";
-
-    erria = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1ai)][genblock(BS1aj)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-
-    #pragma dvm redistribute(A3[*][*][genblock(BS2ai)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[*][genblock(BS3ai)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 2)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k + 2);
-    }
-
-    #pragma dvm get_actual(erria)
-    if (erria == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    free(BS1aj);
-    free(BS1ai);
-    free(BS2ai);
-    free(BS3ai);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ----------------------------------------------------distrg311
- 311 DISTRIBUTE arrA3 [GEN_BLOCK][*][*]
-                REDISTRIBUTE [*][*][*]
-                REDISTRIBUTE[*][*][GEN_BLOCK]*/
-void distrg311()
-{
-    #define AN1 8
-    #define AN2 16
-    #define AN3 24
-    int *BS1ai, *BS3ai;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1ai);
-    genBlocksAxis(dvmh_get_num_procs(1), AN3, 1, &BS3ai);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrg311";
-
-    erria = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1ai)][*][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[*][*][genblock(BS3ai)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erria)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for(j = 0; j < AN2; j++)
-                for(k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 2)
-                        erria = Min(erria, i*NL/10 + j*NL/100 + k + 2);
-    }
-
-    #pragma dvm get_actual(erria)
-    if (erria == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    free(BS1ai);
-    free(BS3ai);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr1.cdv
deleted file mode 100644
index fd02e18..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr1.cdv
+++ /dev/null
@@ -1,217 +0,0 @@
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-#ifndef _DVMH
-#define dvmh_get_num_procs(X) 1
-#endif
-
-static void distr11();
-static void distr12();
-static void distr13();
-static void distr14();
-static void distr15();
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-static int ER = 10000;
-static int erri, i, j, k;
-
-int main(int an, char **as) {
-    printf("=== START OF DELDISTR1 ===================\n");
-    distr11();
-    distr12();
-    distr13();
-    distr14();
-    distr15();
-    printf("=== END OF DELDISTR1 ===================\n");
-    return 0;
-}
-
-static int myRand() {
-    const unsigned a = 1103515245U;
-    const unsigned c = 12345U;
-    const unsigned m = ((unsigned)RAND_MAX) + 1U;
-    static unsigned prev = 5;
-    prev = (a * prev + c) % m;
-    return prev;
-}
-
-static void genBlocksAxis(const int procCount, const int weight, const int withoutZero, int **blocks) {
-    *blocks = (int *)malloc(procCount * sizeof(int));
-    int restWeight = weight, i, zeroind = -1;
-    if (!withoutZero && procCount != 1)
-        zeroind = myRand() % (procCount - 1);
-    for (i = 0; i < (procCount - 1); i++) {
-        if (i == zeroind)
-            (*blocks)[i] = 0;
-        else
-            (*blocks)[i] = 1 * withoutZero + myRand() % (restWeight - (procCount - (i + 1)));
-        restWeight -= (*blocks)[i];
-    }
-    (*blocks)[i] = restWeight;
-}
-
-void distr11()
-{
-    #define AN1 8
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distr11";
-    erri = ER;
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-void distr12()
-{
-    #define AN1 8
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distr12";
-    erri = ER;
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++) {
-            if (A1[i] != i)
-                erri = Min(erri, i);
-        }
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-void distr13()
-{
-    #define AN1 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distr13";
-    erri = ER;
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A1);
-    #undef AN1
-}
-void distr14()
-{
-    #define AN1 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distr14";
-    erri = ER;
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-void distr15()
-{
-    #define AN1 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distr15";
-    erri = ER;
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-void ansyes(const char name[]) {
-    printf("%s  -  complete\n", name);
-}
-void ansno(const char name[]) {
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr2.cdv
deleted file mode 100644
index b9a4cdb..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr2.cdv
+++ /dev/null
@@ -1,1001 +0,0 @@
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-#ifndef _DVMH
-#define dvmh_get_num_procs(X) 1
-#endif
-
-static void distr21();
-static void distr22();
-static void distr23();
-static void distr24();
-static void distr25();
-static void distr26();
-static void distr27();
-static void distr28();
-static void distr29();
-static void distr210();
-static void distr211();
-static void distr212();
-static void distr213();
-static void distr214();
-static void distr215();
-static void distr216();
-static void distr217();
-static void distr218();
-static void distr219();
-static void distr220();
-static void distr221();
-static void distr222();
-static void distr223();
-static void distr224();
-static void distr225();
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-static int ER = 10000;
-static int erri, i, j, k;
-
-int main(int an, char **as) {
-    printf("=== START OF DELDISTR2 ===================\n");
-    distr21();
-    distr22();
-    distr23();
-    distr24();
-    distr25();
-    distr26();
-    distr27();
-    distr28();
-    distr29();
-    distr210();
-    distr211();
-    distr212();
-    distr213();
-    distr214();
-    distr215();
-    distr216();
-    distr217();
-    distr218();
-    distr219();
-    distr220();
-    distr221();
-    distr222();
-    distr223();
-    distr224();
-    distr225();
-    printf("=== END OF DELDISTR2 ===================\n");
-    return 0;
-}
-
-static int myRand() {
-    const unsigned a = 1103515245U;
-    const unsigned c = 12345U;
-    const unsigned m = ((unsigned)RAND_MAX) + 1U;
-    static unsigned prev = 5;
-    prev = (a * prev + c) % m;
-    return prev;
-}
-
-static void genBlocksAxis(const int procCount, const int weight, const int withoutZero, int **blocks) {
-    *blocks = (int *)malloc(procCount * sizeof(int));
-    int restWeight = weight, i, zeroind = -1;
-    if (!withoutZero && procCount != 1)
-        zeroind = myRand() % (procCount - 1);
-    for (i = 0; i < (procCount - 1); i++) {
-        if (i == zeroind)
-            (*blocks)[i] = 0;
-        else
-            (*blocks)[i] = 1 * withoutZero + myRand() % (restWeight - (procCount - (i + 1)));
-        restWeight -= (*blocks)[i];
-    }
-    (*blocks)[i] = restWeight;
-}
-
-void distr21()
-{
-    #define AN1 8
-    #define AN2 8
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr21";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr22()
-{
-    #define AN1 8
-    #define AN2 8
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr22";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr23()
-{
-    #define AN1 8
-    #define AN2 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    int* BS2;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2);
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr23";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[genblock(BS1)][genblock(BS2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(BS2);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr24()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    double wb2[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr24";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 8)][wgtblock(wb2, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr25()
-{
-    #define AN1 8
-    #define AN2 8
-    int m1 = 4;
-    int m2 = 4;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr25";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr26()
-{
-    #define AN1 8
-    #define AN2 8
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr26";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[*][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr27()
-{
-    #define AN1 8
-    #define AN2 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr27";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[*][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr28()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr28";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[*][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr29()
-{
-    #define AN1 8
-    #define AN2 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr29";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[*][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr210()
-{
-    #define AN1 8
-    #define AN2 8
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr210";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr211()
-{
-    #define AN1 8
-    #define AN2 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr211";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr212()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr212";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr213()
-{
-    #define AN1 8
-    #define AN2 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr213";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr214()
-{
-    #define AN1 8
-    #define AN2 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr214";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[genblock(BS1)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr215()
-{
-    #define AN1 8
-    #define AN2 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr215";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[genblock(BS1)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr216()
-{
-    #define AN1 8
-    #define AN2 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr216";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[genblock(BS1)][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr217()
-{
-    #define AN1 8
-    #define AN2 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    int m1 = 4;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr217";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[genblock(BS1)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr218()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr218";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 8)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr219()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr219";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 8)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr220()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr220";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 8)][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr221()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int m1 = 4;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr221";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 8)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr222()
-{
-    #define AN1 8
-    #define AN2 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr222";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr223()
-{
-    #define AN1 8
-    #define AN2 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr223";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr224()
-{
-    #define AN1 8
-    #define AN2 8
-    int m1 = 4;
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr224";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void distr225()
-{
-    #define AN1 8
-    #define AN2 8
-    int m1 = 4;
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distr225";
-    erri = ER;
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * 10 + j;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * 10 + j)
-                    erri = Min(erri, i * 10 + j);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-void ansyes(const char name[]) {
-    printf("%s  -  complete\n", name);
-}
-void ansno(const char name[]) {
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr3.cdv
deleted file mode 100644
index 79b67e5..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/deldistr3.cdv
+++ /dev/null
@@ -1,2846 +0,0 @@
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-#ifndef _DVMH
-#define dvmh_get_num_procs(X) 1
-#endif
-
-static void distr31();
-static void distr32();
-static void distr33();
-static void distr34();
-static void distr35();
-static void distr36();
-static void distr37();
-static void distr38();
-static void distr39();
-static void distr310();
-static void distr311();
-static void distr312();
-static void distr313();
-static void distr314();
-static void distr315();
-static void distr316();
-static void distr317();
-static void distr318();
-static void distr319();
-static void distr320();
-static void distr321();
-static void distr322();
-static void distr323();
-static void distr324();
-static void distr325();
-static void distr326();
-static void distr327();
-static void distr328();
-static void distr329();
-static void distr330();
-static void distr331();
-static void distr332();
-static void distr333();
-static void distr334();
-static void distr335();
-static void distr336();
-static void distr337();
-static void distr338();
-static void distr339();
-static void distr340();
-static void distr341();
-static void distr342();
-static void distr343();
-static void distr344();
-static void distr345();
-static void distr346();
-static void distr347();
-static void distr348();
-static void distr349();
-static void distr350();
-static void distr351();
-static void distr352();
-static void distr353();
-static void distr354();
-static void distr355();
-static void distr356();
-static void distr357();
-static void distr358();
-static void distr359();
-static void distr360();
-static void distr361();
-static void distr362();
-static void distr363();
-static void distr364();
-static void distr365();
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-static int ER = 10000;
-static int erri, i, j, k;
-
-int main(int an, char **as) {
-    printf("=== START OF DELDISTR3 ===================\n");
-    distr31();
-    distr32();
-    distr33();
-    distr34();
-    distr35();
-    distr36();
-    distr37();
-    distr38();
-    distr39();
-    distr310();
-    distr311();
-    distr312();
-    distr313();
-    distr314();
-    distr315();
-    distr316();
-    distr317();
-    distr318();
-    distr319();
-    distr320();
-    distr321();
-    distr322();
-    distr323();
-    distr324();
-    distr325();
-    distr326();
-    distr327();
-    distr328();
-    distr329();
-    distr330();
-    distr331();
-    distr332();
-    distr333();
-    distr334();
-    distr335();
-    distr336();
-    distr337();
-    distr338();
-    distr339();
-    distr340();
-    distr341();
-    distr342();
-    distr343();
-    distr344();
-    distr345();
-    distr346();
-    distr347();
-    distr348();
-    distr349();
-    distr350();
-    distr351();
-    distr352();
-    distr353();
-    distr354();
-    distr355();
-    distr356();
-    distr357();
-    distr358();
-    distr359();
-    distr360();
-    distr361();
-    distr362();
-    distr363();
-    distr364();
-    distr365();
-    printf("=== END OF DELDISTR3 ===================\n");
-    return 0;
-}
-
-static int myRand() {
-    const unsigned a = 1103515245U;
-    const unsigned c = 12345U;
-    const unsigned m = ((unsigned)RAND_MAX) + 1U;
-    static unsigned prev = 5;
-    prev = (a * prev + c) % m;
-    return prev;
-}
-
-static void genBlocksAxis(const int procCount, const int weight, const int withoutZero, int **blocks) {
-    *blocks = (int *)malloc(procCount * sizeof(int));
-    int restWeight = weight, i, zeroind = -1;
-    if (!withoutZero && procCount != 1)
-        zeroind = myRand() % (procCount - 1);
-    for (i = 0; i < (procCount - 1); i++) {
-        if (i == zeroind)
-            (*blocks)[i] = 0;
-        else
-            (*blocks)[i] = 1 * withoutZero + myRand() % (restWeight - (procCount - (i + 1)));
-        restWeight -= (*blocks)[i];
-    }
-    (*blocks)[i] = restWeight;
-}
-
-void distr31()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr31";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr32()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr32";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr33()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    int* BS2;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2);
-    int* BS3;
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS3);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr33";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][genblock(BS2)][genblock(BS3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(BS2);
-    free(BS3);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr34()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    double wb2[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    double wb3[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr34";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][wgtblock(wb2, 8)][wgtblock(wb3, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr35()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    int m2 = 4;
-    int m3 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr35";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr36()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr36";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][block][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr37()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr37";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][block][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr38()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr38";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][block][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr39()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr39";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][genblock(BS1)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr310()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr310";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][genblock(BS1)][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr311()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr311";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][genblock(BS1)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr312()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr312";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][wgtblock(wb1, 8)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr313()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr313";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][wgtblock(wb1, 8)][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr314()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr314";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][wgtblock(wb1, 8)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr315()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr315";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][multblock(m1)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr316()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr316";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][multblock(m1)][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr317()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr317";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][multblock(m1)][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr318()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr318";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][*][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr319()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr319";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][*][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr320()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr320";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][*][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr321()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr321";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][genblock(BS1)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr322()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr322";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][genblock(BS1)][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr323()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr323";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][genblock(BS1)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr324()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr324";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][wgtblock(wb1, 8)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr325()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr325";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][wgtblock(wb1, 8)][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr326()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr326";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][wgtblock(wb1, 8)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr327()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr327";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][multblock(m1)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr328()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr328";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][multblock(m1)][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr329()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr329";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][multblock(m1)][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr330()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr330";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][*][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr331()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr331";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][*][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr332()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr332";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][*][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr333()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr333";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][block][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr334()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr334";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][block][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr335()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr335";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][block][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr336()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr336";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][wgtblock(wb1, 8)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr337()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr337";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][wgtblock(wb1, 8)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr338()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr338";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][wgtblock(wb1, 8)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr339()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr339";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][multblock(m1)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr340()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr340";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][multblock(m1)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr341()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    int m1 = 4;
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr341";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1)][multblock(m1)][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr342()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr342";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][*][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr343()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr343";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][*][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr344()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr344";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][*][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr345()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr345";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][block][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr346()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr346";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][block][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr347()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr347";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][block][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr348()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr348";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][genblock(BS1)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr349()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr349";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][genblock(BS1)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr350()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr350";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][genblock(BS1)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr351()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr351";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][multblock(m1)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr352()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr352";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][multblock(m1)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr353()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int m1 = 4;
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr353";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][multblock(m1)][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr354()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr354";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][*][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr355()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr355";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][*][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr356()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr356";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][*][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr357()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr357";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][block][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr358()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr358";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][block][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr359()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr359";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][block][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr360()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr360";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][genblock(BS1)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr361()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr361";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][genblock(BS1)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr362()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1);
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr362";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][genblock(BS1)][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr363()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr363";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb1, 8)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr364()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr364";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb1, 8)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void distr365()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 4;
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1., 1.5, 2.};
-    int* BS1;
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distr365";
-    erri = ER;
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb1, 8)][genblock(BS1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i * 100 + j * 10 + k;
-    }
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i * 100 + j * 10 + k)
-                        erri = Min(erri, i * 100 + j * 10 + k);
-    }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-void ansyes(const char name[]) {
-    printf("%s  -  complete\n", name);
-}
-void ansno(const char name[]) {
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix1.cdv
deleted file mode 100644
index a439923..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix1.cdv
+++ /dev/null
@@ -1,398 +0,0 @@
-/*    DISTRMIX1
-Testing DISTRIBUTE and REDISTRIBUTE directive
-            GEN_BLOCK, WGT_BLOCK, MULT_BLOCK distributions
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-#ifndef _DVMH
-#define dvmh_get_num_procs(X) 1
-#endif
-
-static void distrmix11();
-static void distrmix12();
-static void distrmix13();
-static void distrmix14();
-static void distrmix15();
-static void distrmix16();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, errib, i, j, k, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRMIX1 ===================\n");
-    /* 11  DISTRIBUTE arrA1[MULT_BLOCK]
-                     REDISTRIBUTE arrA1[WGT_BLOCK]
-                     REDISTRIBUTE arrA1[MULT_BLOCK]*/
-    distrmix11();
-
-   /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] other blocks*/
-    distrmix12();
-    /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] other blocks*/
-    distrmix13();
-    /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] other blocks*/
-    distrmix14();
-    /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] other blocks*/
-    distrmix15();
-    /* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] other blocks*/
-    distrmix16();
-
-    printf("=== END OF DISTRMIX1 =====================\n");
-    return 0;
-}
-
-static int myRand() {
-    const unsigned a = 1103515245U;
-    const unsigned c = 12345U;
-    const unsigned m = ((unsigned)RAND_MAX) + 1U;
-    static unsigned prev = 5;
-    prev = (a * prev + c) % m;
-    return prev;
-}
-
-static void genBlocksAxis(const int procCount, const int weight, const int withoutZero, int **blocks) {
-    *blocks = (int *)malloc(procCount * sizeof(int));
-    int restWeight = weight, i, zeroind = -1;
-    if (!withoutZero && procCount > 1)
-        zeroind = myRand() % (procCount - 1);
-    for (i = 0; i < (procCount - 1); i++) {
-        if (i == zeroind)
-            (*blocks)[i] = 0;
-        else
-            (*blocks)[i] = 1 * withoutZero + myRand() % (restWeight - (procCount - (i + 1)));
-        restWeight -= (*blocks)[i];
-    }
-    (*blocks)[i] = restWeight;
-}
-
-/* ---------------------------------------------DISTR11*/
-/* 11  DISTRIBUTE arrA1[MULT_BLOCK]
-                     REDISTRIBUTE arrA1[WGT_BLOCK]
-                     REDISTRIBUTE arrA1[MULT_BLOCK]*/
-void distrmix11()
-{
-    #define AN1 64
-    int m1 = 4, m2 = 2;
-    double wb[7] = {2.1, 4.6, 3., 2.0, 1.5, 2., 3.1};
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrmix11";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[multblock(m1)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[wgtblock(wb, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] += 1;
-    }
-    #pragma dvm redistribute(A1[multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i + 1)
-                erri = Min(erri, i + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR12*/
-/* DISTRIBUTE arrA1[WGT_BLOCK]
-                     REDISTRIBUTE arrA1[MULT_BLOCK]
-                     REDISTRIBUTE arrA1[WGT_BLOCK]  */
-void distrmix12()
-{
-    #define AN1 75
-    int m1 = 15;
-    double wb1[6] = {3.1, 1.6, 2., 3.0, 0.5, 2.};
-    double wb2[8] = {1.5, 2.1, 2.6, 4.2, 2.5, 3.5, 1., 2.1};
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrmix12";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[wgtblock(wb1, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] += 1;
-    }
-    #pragma dvm redistribute(A1[wgtblock(wb2, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i + 1)
-                erri = Min(erri, i + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR13*/
-/* DISTRIBUTE arrA1[MULT_BLOCK]
-                     REDISTRIBUTE arrA1[GEN_BLOCK]
-                     REDISTRIBUTE arrA1[MULT_BLOCK]  */
-void distrmix13()
-{
-    #define AN1 30
-    int m1 = 5, m2 = 3;
-    int* BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS);
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrmix13";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[multblock(m1)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[genblock(BS)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] += 1;
-    }
-    #pragma dvm redistribute(A1[multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i + 1)
-                erri = Min(erri, i + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR14*/
-/* DISTRIBUTE arrA1[GEN_BLOCK]
-                     REDISTRIBUTE arrA1[MULT_BLOCK]
-                     REDISTRIBUTE arrA1[GEN_BLOCK] */
-void distrmix14()
-{
-    #define AN1 35
-    int m1 = 7;
-    int* BS1, * BS2;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2);
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrmix14";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[genblock(BS1)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] += 1;
-    }
-    #pragma dvm redistribute(A1[genblock(BS2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i + 1)
-                erri = Min(erri, i + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(BS2);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR15*/
-/* DISTRIBUTE arrA1[WGT_BLOCK]
-                     REDISTRIBUTE arrA1[GEN_BLOCK]
-                     REDISTRIBUTE arrA1[WGT_BLOCK]  */
-void distrmix15()
-{
-    #define AN1 10
-    double wb1[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    double wb2[5] = {2.0, 1., 2., 2.0, 2.};
-    int* BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS);
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrmix15";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[wgtblock(wb1, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[genblock(BS)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] += 1;
-    }
-    #pragma dvm redistribute(A1[wgtblock(wb2, 5)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i + 1)
-                erri = Min(erri, i + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR16*/
-/* DISTRIBUTE arrA1[GEN_BLOCK]
-                     REDISTRIBUTE arrA1[WGT_BLOCK]
-                      REDISTRIBUTE arrA1[GEN_BLOCK]*/
-void distrmix16()
-{
-    #define AN1 12
-    double wb[7] = {1.0, 2., 2., 3.0, 1., 1., 0.5};
-    int* BS1, * BS2;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2);
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrmix16";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[genblock(BS1)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-    #pragma dvm redistribute(A1[wgtblock(wb, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] += 1;
-    }
-    #pragma dvm redistribute(A1[genblock(BS2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i + 1)
-                erri = Min(erri, i + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1);
-    free(BS2);
-    free(A1);
-    #undef AN1
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix2.cdv
deleted file mode 100644
index afa6e73..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix2.cdv
+++ /dev/null
@@ -1,901 +0,0 @@
-/*    DISTRMIX2
-Testing DISTRIBUTE and REDISTRIBUTE directive
-            GEN_BLOCK, WGT_BLOCK, MULT_BLOCK distributions
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-#ifndef _DVMH
-#define dvmh_get_num_procs(X) 1
-#endif
-
-static void distrmix21();
-static void distrmix22();
-static void distrmix23();
-static void distrmix24();
-static void distrmix25();
-static void distrmix26();
-static void distrmix27();
-static void distrmix28();
-static void distrmix29();
-static void distrmix210();
-static void distrmix211();
-static void distrmix212();
-static void distrmix213();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, errib, i, j, k, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRMIX2 ===================\n");
-
-    /* 21  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]*/
-    distrmix21();
-    /* 22  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]*/
-    distrmix22();
-    /* 23  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]*/
-    distrmix23();
-    /* 24  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]*/
-    distrmix24();
-    /* 25  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]*/
-    distrmix25();
-    /* 26  DISTRIBUTE arrA2[WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]*/
-    distrmix26();
-    /* 27  DISTRIBUTE arrA2[BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][BLOCK]*/
-    distrmix27();
-    /* 28  DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [BLOCK][WGT_BLOCK]*/
-    distrmix28();
-    /* 29  DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [BLOCK][MULT_BLOCK]*/
-    distrmix29();
-    /* 210  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-               REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]*/
-    distrmix210();
-    /* 211  DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]
-               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE arrA2[BLOCK][WGT_BLOCK]*/
-    distrmix211();
-    /* 212  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-               REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]*/
-    distrmix212();
-    /* 213  DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-               REDISTRIBUTE arrA2[WGT_BLOCK][MULT_BLOCK]
-               REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]*/
-    distrmix213();
-
-    printf("=== END OF DISTRMIX2 =====================\n");
-    return 0;
-}
-
-static int myRand() {
-    const unsigned a = 1103515245U;
-    const unsigned c = 12345U;
-    const unsigned m = ((unsigned)RAND_MAX) + 1U;
-    static unsigned prev = 5;
-    prev = (a * prev + c) % m;
-    return prev;
-}
-
-static void genBlocksAxis(const int procCount, const int weight, const int withoutZero, int **blocks) {
-    *blocks = (int *)malloc(procCount * sizeof(int));
-    int restWeight = weight, i, zeroind = -1;
-    if (!withoutZero && procCount > 1)
-        zeroind = myRand() % (procCount - 1);
-    for (i = 0; i < (procCount - 1); i++) {
-        if (i == zeroind)
-            (*blocks)[i] = 0;
-        else
-            (*blocks)[i] = 1 * withoutZero + myRand() % (restWeight - (procCount - (i + 1)));
-        restWeight -= (*blocks)[i];
-    }
-    (*blocks)[i] = restWeight;
-}
-
-/* ---------------------------------------------DISTR21*/
-/*DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-             REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]
-             REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]*/
-void distrmix21()
-{
-    #define AN1 10
-    #define AN2 56
-    int m11 = 2, m12 = 7;
-    int m21 = 5, m22 = 8;
-    double wb1[8] = {1.0, 2., 1., 3.2, 1.0, 1.5, 2.3, 2.};
-    double wb2[7] = {1.3, 1.5, 2.2, 1.6, 2.6, 0.5, 1.7};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix21";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m11)][multblock(m12)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[wgtblock(wb1, 8)][wgtblock(wb2, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[multblock(m21)][multblock(m22)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR22*/
-/*DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]*/
-void distrmix22()
-{
-    #define AN1 16
-    #define AN2 32
-    int m1 = 2, m2 = 4;
-    double wb1[7] = {2.4, 1.2, 3.0, 0.2, 1.5, 2.8, 2.1};
-    double wb2[6] = {2.0, 1.2, 2.6, 1.6, 3.5, 0.7};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix22";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 7)][wgtblock(wb2, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-    #pragma dvm redistribute(A2[multblock(m1)][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                    A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[wgtblock(wb2, 6)][wgtblock(wb1, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR23*/
-/*DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]*/
-void distrmix23()
-{
-    #define AN1 18
-    #define AN2 12
-    int m11 = 2, m12 = 2;
-    int m21 = 3, m22 = 3;
-    double wb1[10] = {2., 1.2, 2., 2.5, 0.2, 1.5, 1., 2.8, 2.1, 3.};
-    double wb2[8] = {3.0, 3.5, 2.0, 1.2, 2.6, 1.6, 3.5, 0.7};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix23";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m11)][multblock(m12)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-    #pragma dvm redistribute(A2[wgtblock(wb1, 10)][multblock(m22)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[multblock(m21)][wgtblock(wb2, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR24*/
-/*DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]*/
-void distrmix24()
-{
-    #define AN1 30
-    #define AN2 30
-    int m1 = 3, m2 = 5;
-    int *BS1i, *BS1j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix24";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][multblock(m2)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-    #pragma dvm redistribute(A2[genblock(BS1i)][genblock(BS1j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[multblock(m2)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR25*/
-/*DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]*/
-void distrmix25()
-{
-    #define AN1 16
-    #define AN2 12
-    int m1 = 2, m2 = 3;
-    int *BS1i, *BS1j, *BS2i, *BS2j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix25";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[genblock(BS1i)][genblock(BS1j)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-    #pragma dvm redistribute(A2[multblock(m1)][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[genblock(BS2i)][genblock(BS2j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS2i);
-    free(BS2j);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR26*/
-/*DISTRIBUTE arrA2[WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]*/
-void distrmix26()
-{
-    #define AN1 52
-    #define AN2 50
-    int m1 = 13, m2 = 5;
-    int *BS1i, *BS1j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    double wb1[6] = {2.4, 2.2, 0.2, 3.5, 1.2, 1.};
-    double wb2[8] = {1.0, 2.5, 3.0, 2.8, 1.6, 1., 0.5, 1.7};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix26";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 6)][multblock(m2)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-    #pragma dvm redistribute(A2[multblock(m1)][wgtblock(wb2, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[genblock(BS1i)][genblock(BS1j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR27*/
-/*DISTRIBUTE arrA2[BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][BLOCK]*/
-void distrmix27()
-{
-    #define AN1 8
-    #define AN2 64
-    int m1 = 2, m2 = 8;
-    int *BS;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS);
-    double wb[7] = {2., 3.2, 2., 3.5, 1.2, 1., 4.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix27";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][multblock(m2)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[multblock(m1)][wgtblock(wb, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[genblock(BS)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR28*/
-/*DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [BLOCK][WGT_BLOCK]*/
-void distrmix28()
-{
-    #define AN1 42
-    #define AN2 16
-    int m1 = 3, m2 = 2;
-    int *BS;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS);
-    double wb1[6] = {2., 3., 1.2, 1.5, 1., 1.5};
-    double wb2[7] = {2.2, 1.5, 3.0, 2.8, 2.6, 1.4, 0.5};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix28";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][genblock(BS)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[wgtblock(wb1, 6)][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[block][wgtblock(wb2, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR29*/
-/*DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [BLOCK][MULT_BLOCK]*/
-void distrmix29()
-{
-    #define AN1 21
-    #define AN2 48
-    int m1 = 3, m2 = 2;
-    int *BS1i, *BS1j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    double wb[9] = {2.2, 1.5, 3.0, 2.8, 2.6, 1.4, 0.5, 1., 2.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix29";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb, 9)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[genblock(BS1i)][genblock(BS1j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[block][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR210*/
-/*DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-               REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]*/
-void distrmix210()
-{
-    #define AN1 9
-    #define AN2 11
-
-    int *BS1i, *BS1j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    double wb1[6] = {1.0, 1.2, 2.5, 1.4, 2.5, 1.3};
-    double wb2[4] = {1.0, 2., 1.5, 1.7};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix210";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 6)][wgtblock(wb2, 4)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[genblock(BS1i)][genblock(BS1j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[wgtblock(wb2, 4)][wgtblock(wb1, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR211*/
-/*DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]
-               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-               REDISTRIBUTE arrA2[BLOCK][WGT_BLOCK]*/
-void distrmix211()
-{
-    #define AN1 16
-    #define AN2 16
-
-    int *BS1i, *BS1j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    double wb[7] = {1.0, 1.2, 2.5, 1.4, 2.5, 1.3, 2};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix211";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb, 7)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[genblock(BS1i)][genblock(BS1j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[block][wgtblock(wb, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR212*/
-/*DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-               REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]*/
-void distrmix212()
-{
-    #define AN1 6
-    #define AN2 28
-
-    int *BS1i, *BS1j, *BS2i, *BS2j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    double wb1[8] = {1.0, 1.2, 2.5, 1.4, 2.5, 1.3, 1., 2.};
-    double wb2[5] = {2., 1.3, 2., 1.0, 1.7};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix212";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[genblock(BS1i)][genblock(BS1j)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[wgtblock(wb1, 6)][wgtblock(wb2, 4)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[genblock(BS2i)][genblock(BS2j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS2i);
-    free(BS2j);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR213*/
-/*DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-               REDISTRIBUTE arrA2[WGT_BLOCK][MULT_BLOCK]
-               REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]*/
-void distrmix213()
-{
-    #define AN1 27
-    #define AN2 14
-    int m1 = 3, m2 = 2;
-    int *BS1i, *BS1j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    double wb[4] = {1.2, 1.6, 2.0, 1.8};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrmix213";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][genblock(BS1j)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[wgtblock(wb, 4)][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] += 1;
-    }
-    #pragma dvm redistribute(A2[genblock(BS1i)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j + 1)
-                    erri = Min(erri, i * NL + j + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix3.cdv
deleted file mode 100644
index b4c2214..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MIX/distrmix3.cdv
+++ /dev/null
@@ -1,1795 +0,0 @@
-/*    DISTRMIX3
-Testing DISTRIBUTE and REDISTRIBUTE directive
-            GEN_BLOCK, WGT_BLOCK, MULT_BLOCK distributions
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-#ifndef _DVMH
-#define dvmh_get_num_procs(X) 1
-#endif
-
-static void distrmix31();
-static void distrmix32();
-static void distrmix33();
-static void distrmix34();
-static void distrmix35();
-static void distrmix36();
-static void distrmix37();
-static void distrmix38();
-static void distrmix39();
-static void distrmix310();
-static void distrmix311();
-static void distrmix312();
-static void distrmix313();
-static void distrmix314();
-static void distrmix315();
-static void distrmix316();
-static void distrmix317();
-static void distrmix318();
-static void distrmix319();
-static void distrmix320();
-static void distrmix321();
-static void distrmix322();
-static void distrmix323();
-static void distrmix324();
-static void distrmix325();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, errib, i, j, k, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRMIX3 ===================\n");
-
-    /* 31  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-    distrmix31();
-    /* 32 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]*/
-    distrmix32();
-    /* 33  DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-    distrmix33();
-    /* 34  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][WGT_BLOCK]*/
-    distrmix34();
-    /* 35  DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [BLOCK][MULT_BLOCK][WGT_BLOCK]*/
-    distrmix35();
-    /* 36  DISTRIBUTE arrA3[WGT_BLOCK][MULT_BLOCK][BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [BLOCK][WGT_BLOCK][MULT_BLOCK]*/
-    distrmix36();
-    /* 37  DISTRIBUTE arrA3[MULT_BLOCK][BLOCK][BLOCK]
-              REDISTRIBUTE [BLOCK][BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [BLOCK][WGT_BLOCK][MULT_BLOCK]*/
-    distrmix37();
-    /* 38  DISTRIBUTE arrA3[MULT_BLOCK][*][WGT_BLOCK]
-              REDISTRIBUTE [*][*][*]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][*]*/
-    distrmix38();
-    /* 39  DISTRIBUTE arrA3[MULT_BLOCK][BLOCK][*]
-              REDISTRIBUTE [WGT_BLOCK][*][WGT_BLOCK]
-              REDISTRIBUTE [*][MULT_BLOCK][*]*/
-    distrmix39();
-    /* 310  DISTRIBUTE arrA3[WGT_BLOCK][*][*]
-              REDISTRIBUTE [MULT_BLOCK][*][WGT_BLOCK]
-              REDISTRIBUTE [*][WGT_BLOCK][MULT_BLOCK]*/
-    distrmix310();
-
-    /* 311  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-             REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-             REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-    distrmix311();
-    /* 312 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-             REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-             REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]*/
-    distrmix312();
-    /* 313  DISTRIBUTE arrA3[BLOCK][BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][WGT_BLOCK]*/
-    distrmix313();
-    /* 314 DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][BLOCK][WGT_BLOCK]*/
-    distrmix314();
-    /* 315  DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]*/
-    distrmix315();
-    /* 316  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]*/
-    distrmix316();
-    /* 317  DISTRIBUTE arrA3[GEN_BLOCK][*][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][*]
-              REDISTRIBUTE [*][GEN_BLOCK][BLOCK]*/
-    distrmix317();
-    /* 318  DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]*/
-    distrmix318();
-
-    /* 319 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-               REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-               REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]*/
-    distrmix319();
-    /* 320  DISTRIBUTE arrA3[BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE arrB3[WGT_BLOCK][BLOCK][WGT_BLOCK]*/
-    distrmix320();
-    /* 321 DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]*/
-    distrmix321();
-    /* 322  DISTRIBUTE arrA3[GEN_BLOCK][BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [BLOCK][WGT_BLOCK][BLOCK]*/
-    distrmix322();
-    /* 323 DISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][*]*/
-    distrmix323();
-    /* 324 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][*]
-                REDISTRIBUTE [*][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][*][GEN_BLOCK]*/
-    distrmix324();
-    /* 325  DISTRIBUTE arrA3 [*][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [*][WGT_BLOCK][*]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]*/
-    distrmix325();
-
-    printf("=== END OF DISTRMIX3 =====================\n");
-    return 0;
-}
-
-static int myRand() {
-    const unsigned a = 1103515245U;
-    const unsigned c = 12345U;
-    const unsigned m = ((unsigned)RAND_MAX) + 1U;
-    static unsigned prev = 5;
-    prev = (a * prev + c) % m;
-    return prev;
-}
-
-static void genBlocksAxis(const int procCount, const int weight, const int withoutZero, int **blocks) {
-    *blocks = (int *)malloc(procCount * sizeof(int));
-    int restWeight = weight, i, zeroind = -1;
-    if (!withoutZero && procCount > 1)
-        zeroind = myRand() % (procCount - 1);
-    for (i = 0; i < (procCount - 1); i++) {
-        if (i == zeroind)
-            (*blocks)[i] = 0;
-        else
-            (*blocks)[i] = 1 * withoutZero + myRand() % (restWeight - (procCount - (i + 1)));
-        restWeight -= (*blocks)[i];
-    }
-    (*blocks)[i] = restWeight;
-}
-
-/* ---------------------------------------------DISTR31*/
-/*DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-void distrmix31()
-{
-    #define AN1 32
-    #define AN2 32
-    #define AN3 32
-    int m11 = 4, m21 = 8, m31 = 2;
-    int m12 = 2, m22 = 4, m32 = 4;
-    double wb1[7] = {2.0, 1.5, 4., 3.0, 2., 3., 2.};
-    double wb2[8] = {1.0, 1., 2., 2.0, 1., 1., 2., 2.};
-    double wb3[7] = {2.0, 2., 2.6, 3.0, 1., 1.5, 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix31";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m11)][multblock(m21)][multblock(m31)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb1, 7)][wgtblock(wb2, 8)][wgtblock(wb3, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[multblock(m12)][multblock(m22)][multblock(m32)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR32*/
-/*DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] */
-void distrmix32()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 12
-    int m1 = 2, m2 = 4, m3 = 4;
-    double wb1[6] = {2.0,5.,0.,3.0, 2., 3.};
-    double wb2[8] = {1.2,2.,4.,2.5,3.,1.,3.,2.};
-    double wb3[7] = {2.3,1.2,4.6,3.0, 1.5, 2.5, 1.2};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix32";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][wgtblock(wb2, 8)][wgtblock(wb3, 7)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[wgtblock(wb2, 8)][wgtblock(wb3, 7)][wgtblock(wb1, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR33*/
-/*DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-void distrmix33()
-{
-    #define AN1 12
-    #define AN2 18
-    #define AN3 20
-    int m11 = 2, m21 = 3, m31 = 2;
-    int m12 = 6, m22 = 9, m32 = 5;
-    double wb1[7] = {2.2, 2.4, 4., 2.5, 3.5, 1.,3};
-    double wb2[6] = {1.2, 2., 2.5, 3., 1.5, 3.};
-    double wb3[5] = {4.3, 2.2, 2.6, 2.0, 2.5};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix33";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m11)][wgtblock(wb2, 6)][multblock(m31)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb1, 7)][multblock(m21)][wgtblock(wb3, 5)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[multblock(m12)][multblock(m22)][multblock(m32)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR34*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][WGT_BLOCK]*/
-void distrmix34()
-{
-    #define AN1 35
-    #define AN2 28
-    #define AN3 16
-    int m1 = 7, m2 = 7, m3 = 4;
-    double wb1[8] = {2., 2., 4., 2.7, 3.5, 2., 1., 3.};
-    double wb2[6] = {12., 2.5, 3., 1.5, 3., 2.};
-    double wb3[7] = {4.,3., 2.2, 2.6, 2.0, 2.5, 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix34";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][wgtblock(wb2, 6)][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb2, 6)][multblock(m2)][wgtblock(wb3, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb3, 7)][wgtblock(wb1, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR35*/
-/* DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][BLOCK]
-               REDISTRIBUTE [WGT_BLOCK][BLOCK][MULT_BLOCK]
-               REDISTRIBUTE [BLOCK][MULT_BLOCK][WGT_BLOCK]*/
-void distrmix35()
-{
-    #define AN1 10
-    #define AN2 21
-    #define AN3 32
-    int m1 = 2, m2 = 3, m3 = 4;
-    double wb1[7] = {2., 4., 3., 2.5, 5., 1., 2.};
-    double wb2[10] = {1., 2., 5., 3., 1., 3., 2., 3., 2., 1.};
-    double wb3[8] = {2.3, 2.2, 1.6, 1., 2.0, 2.5, 3., 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix35";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb2, 10)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb1, 7)][block][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[block][multblock(m2)][wgtblock(wb3, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR36*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][MULT_BLOCK][BLOCK]
-             REDISTRIBUTE [MULT_BLOCK][BLOCK][WGT_BLOCK]
-             REDISTRIBUTE [BLOCK][WGT_BLOCK][MULT_BLOCK]*/
-void distrmix36()
-{
-    #define AN1 16
-    #define AN2 28
-    #define AN3 16
-    int m1 = 2, m2 = 7, m3 = 4;
-    double wb1[8] = {1.2, 2., 4., 2.5, 3., 1., 3., 2.};
-    double wb2[7] = {2., 2., 4., 2.5, 3., 1., 3.};
-    double wb3[7] = {2.5, 2.2, 4.2, 2.0, 1.5, 3.5, 1.2};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix36";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 8)][multblock(m2)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][block][wgtblock(wb3, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[block][wgtblock(wb2, 7)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR37*/
-/* DISTRIBUTE arrA3[MULT_BLOCK][BLOCK][BLOCK]
-              REDISTRIBUTE [BLOCK][BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [BLOCK][WGT_BLOCK][MULT_BLOCK]*/
-void distrmix37()
-{
-    #define AN1 10
-    #define AN2 10
-    #define AN3 30
-    int m1 = 2, m2 = 5, m3 = 3;
-    double wb2[6] = {4., 2.5, 3., 1., 3., 2.};
-    double wb3[8] = {1., 2., 3., 3.5, 4., 1., 3., 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix37";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][block][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][block][wgtblock(wb3, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[block][wgtblock(wb2, 6)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR38*/
-/* DISTRIBUTE arrA3[MULT_BLOCK][*][WGT_BLOCK]
-              REDISTRIBUTE [*][*][*]
-              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][*]*/
-void distrmix38()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 16
-    int m1 = 2, m2 = 1, m3 = 4;
-    double wb[11] = {2.2, 3.,3., 2.5, 2., 1., 4., 2., 1., 5., 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix38";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][*][wgtblock(wb, 11)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[wgtblock(wb, 8)][multblock(m2)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR39*/
-/* DISTRIBUTE arrA3[MULT_BLOCK][BLOCK][*]
-             REDISTRIBUTE [WGT_BLOCK][*][WGT_BLOCK]
-             REDISTRIBUTE [*][MULT_BLOCK][*]*/
-void distrmix39()
-{
-    #define AN1 18
-    #define AN2 6
-    #define AN3 30
-    int m1 = 3, m2 = 2, m3 = 5;
-    double wb[11] = {3.2, 2., 2., 1.5, 4., 2., 3., 2.5, 1.6, 3., 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix39";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][block][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb, 11)][*][wgtblock(wb, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[*][multblock(m2)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR310*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][*][*]
-             REDISTRIBUTE [MULT_BLOCK][*][WGT_BLOCK]
-             REDISTRIBUTE [*][WGT_BLOCK][MULT_BLOCK]*/
-void distrmix310()
-{
-    #define AN1 25
-    #define AN2 35
-    #define AN3 10
-    int m1 = 5, m2 = 7, m3 = 2;
-    double wb[12] = {3., 1., 2., 1.5, 3., 4., 3., 2.5, 1.6, 3., 1.2, 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix310";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb, 12)][*][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][*][wgtblock(wb, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[*][wgtblock(wb, 8)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR311*/
-/* DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-void distrmix311()
-{
-    #define AN1 15
-    #define AN2 15
-    #define AN3 28
-    int m11 = 3, m21 = 5, m31 = 4;
-    int m12 = 5, m22 = 3, m32 = 7;
-    int *BS1i, *BS1j, *BS1k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix311";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m11)][multblock(m21)][multblock(m31)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS1i)][genblock(BS1j)][genblock(BS1k)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[multblock(m12)][multblock(m22)][multblock(m32)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR312*/
-/* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]*/
-void distrmix312()
-{
-    #define AN1 24
-    #define AN2 10
-    #define AN3 24
-    int m1 = 3, m2 = 2, m3 = 4;
-    int *BS1i, *BS1j, *BS1k, *BS2i, *BS2j, *BS2k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS2k);
-    double wb[10] = {2., 2.5, 3., 4., 3.5, 2.5, 2.6, 3., 2.2, 3.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix312";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1i)][genblock(BS1j)][genblock(BS1k)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb, 10)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[genblock(BS2i)][genblock(BS2j)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(BS2i);
-    free(BS2j);
-    free(BS2k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR313*/
-/* DISTRIBUTE arrA3[BLOCK][BLOCK][MULT_BLOCK]
-           REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-           REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][WGT_BLOCK]*/
-void distrmix313()
-{
-    #define AN1 12
-    #define AN2 24
-    #define AN3 36
-    int m1 = 2, m2 = 3, m3 = 4;
-    int *BS1j;
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    double wb[9] = {1., 2.5, 3., 4., 2.5, 2.6, 3.5, 4.2, 3.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix313";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][block][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][genblock(BS1j)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][wgtblock(wb, 9)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1j);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR314*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][BLOCK][WGT_BLOCK]*/
-void distrmix314()
-{
-    #define AN1 24
-    #define AN2 15
-    #define AN3 12
-    int m1 = 4, m2 = 3, m3 = 2;
-    int *BS1i, *BS1j, *BS1k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    double wb[10] = {3., 2., 2., 4., 2., 3., 2.5, 2.6, 1.2, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix314";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb, 10)][block][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS1i)][block][genblock(BS1k)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[multblock(m1)][block][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR315*/
-/* DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-              REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]*/
-void distrmix315()
-{
-    #define AN1 21
-    #define AN2 14
-    #define AN3 16
-    int m1 = 3, m2 = 2, m3 = 4;
-    int *BS1i, *BS1j, *BS1k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    double wb1[8] = {2., 4., 3., 1., 2.5, 2.6, 2.2, 2.};
-    double wb2[10] = {4., 2., 2.5, 4., 2., 3., 3.5, 1.6, 3.2, 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix315";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb1, 8)][wgtblock(wb2, 10)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][genblock(BS1j)][genblock(BS1k)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb1, 6)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR316*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]*/
-void distrmix316()
-{
-    #define AN1 33
-    #define AN2 44
-    #define AN3 55
-    int m1 = 3, m2 = 11, m3 = 5;
-    int *BS1i, *BS1j, *BS1k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    double wb1[7] = {3., 2.5, 2., 4., 2.5, 2.0, 3.5};
-    double wb2[8] = {4., 3., 2.5, 2., 2., 3., 3.5, 2.6};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix316";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 7)][wgtblock(wb2, 8)][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS1i)][genblock(BS1j)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb1, 7)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR317*/
-/* DISTRIBUTE arrA3[GEN_BLOCK][*][GEN_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][*]
-              REDISTRIBUTE [*][GEN_BLOCK][BLOCK]*/
-void distrmix317()
-{
-    #define AN1 12
-    #define AN2 16
-    #define AN3 12
-    int m1 = 2, m2 = 4, m3 = 3;
-    int *BS1i, *BS1j, *BS2i;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(1), AN2, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN3, 1, &BS1j);
-    double wb[8] = {2., 1., 2.5, 3., 4., 3., 3.5, 4.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix317";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1i)][*][genblock(BS1j)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][wgtblock(wb, 8)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[*][genblock(BS2i)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS2i);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR318*/
-/* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]*/
-void distrmix318()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int *BS1i, *BS1j, *BS1k, *BS2i, *BS2j, *BS2k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS2k);
-    double wb1[7] = {2.0, 1.2, 2.5, 1.4, 2.5, 1.3, 1.};
-    double wb2[5] = {2., 1.3, 2., 1.0, 1.7};
-    double wb3[6] = {2., 3., 1.3, 2., 1.0, 1.7};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix318";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1i)][genblock(BS1j)][genblock(BS1k)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb1, 7)][wgtblock(wb2, 5)][wgtblock(wb3, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[genblock(BS2i)][genblock(BS2j)][genblock(BS2k)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(BS2i);
-    free(BS2j);
-    free(BS2k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR319*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-             REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-             REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]*/
-void distrmix319()
-{
-    #define AN1 12
-    #define AN2 6
-    #define AN3 10
-    int *BS1i, *BS1j, *BS1k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    double wb1[6] = {2.0, 1.2, 2., 2.4, 2.3, 1.6};
-    double wb2[5] = {2.4, 1.8, 2., 1.0, 1.7};
-    double wb3[8] = {2., 3., 1.3, 2., 1.0, 1.7, 3., 4};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix319";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][wgtblock(wb2, 5)][wgtblock(wb3, 8)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS1i)][genblock(BS1j)][genblock(BS1k)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-    #pragma dvm redistribute(A3[wgtblock(wb2, 5)][wgtblock(wb3, 6)][wgtblock(wb1, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR320*/
-/* DISTRIBUTE arrA3[BLOCK][GEN_BLOCK][GEN_BLOCK]
-           REDISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]*/
-void distrmix320()
-{
-    #define AN1 5
-    #define AN2 7
-    #define AN3 6
-    int *BS1i, *BS1j, *BS1k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    double wb1[7] = {2.0, 2.2, 3., 2.4, 2.3, 1.6, 0.5};
-    double wb2[6] = {2.4, 1.8, 3., 2.0, 1.7, 1.};
-    double wb3[8] = {1., 3.5, 2.3, 2., 1.5, 1.7, 3., 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix320";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][genblock(BS1j)][genblock(BS1k)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb1, 7)][block][wgtblock(wb3, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR321*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]*/
-void distrmix321()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 16
-    int *BS1i, *BS1j, *BS1k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    double wb1[6] = {2.5, 3.6, 2.4, 2.3, 1.2, 0.5};
-    double wb2[5] = {1.4, 2.8, 3., 3.0, 1.1};
-    double wb3[7] = {1., 2.3, 2.2, 3.5, 1.7, 3., 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix321";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][block][wgtblock(wb3, 7)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS1i)][block][genblock(BS1k)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR322*/
-/* DISTRIBUTE arrA3[GEN_BLOCK][BLOCK][GEN_BLOCK]
-               REDISTRIBUTE [BLOCK][WGT_BLOCK][BLOCK]*/
-void distrmix322()
-{
-    #define AN1 24
-    #define AN2 16
-    #define AN3 8
-    int *BS1i, *BS1j, *BS1k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    double wb1[5] = {3.2, 2.4, 2.0, 1.0, 2.5};
-    double wb2[4] = {2.1, 2.5, 3., 1.1};
-    double wb3[6] = {2.3, 2.0, 3.5, 1.5, 3., 2.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix322";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1i)][block][genblock(BS1k)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][wgtblock(wb2, 4)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR323*/
-/* DISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][*]*/
-void distrmix323()
-{
-    #define AN1 8
-    #define AN2 11
-    #define AN3 11
-    int *BS1i, *BS1j, *BS1k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    double wb1[7] = {3.2, 2.4, 1., 2., 2.0, 1.0, 2.5};
-    double wb2[6] = {3.1, 2.5, 4., 2.1, 2, 2};
-    double wb3[6] = {1.2, 3.0, 2.4, 1.0, 3., 2.5};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix323";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][wgtblock(wb2, 6)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS1i)][genblock(BS1j)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR324*/
-/* DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][*]
-                REDISTRIBUTE [*][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [GEN_BLOCK][*][GEN_BLOCK]*/
-void distrmix324()
-{
-    #define AN1 12
-    #define AN2 12
-    #define AN3 21
-    int *BS1i, *BS1j, *BS1k, *BS2i, *BS2j;
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS1k);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN3, 1, &BS2j);
-    double wb1[7] = {2.0, 1.2, 2.5, 1.4, 2.5, 1.3, 1.};
-    double wb2[5] = {2., 1.3, 2., 1.0, 1.7};
-    double wb3[6] = {2., 3., 1.3, 2., 1.0, 1.7};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix324";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[genblock(BS1i)][genblock(BS1j)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][wgtblock(wb2, 5)][wgtblock(wb3, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS2i)][*][genblock(BS2j)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS1k);
-    free(BS2i);
-    free(BS2j);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR325*/
-/* DISTRIBUTE arrA3 [*][GEN_BLOCK][GEN_BLOCK]
-               REDISTRIBUTE [*][WGT_BLOCK][*]
-               REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]*/
-void distrmix325()
-{
-    #define AN1 7
-    #define AN2 6
-    #define AN3 7
-    int *BS1i, *BS1j, *BS2i, *BS2j, *BS2k;
-    genBlocksAxis(dvmh_get_num_procs(1), AN2, 1, &BS1i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN3, 1, &BS1j);
-    genBlocksAxis(dvmh_get_num_procs(1), AN1, 1, &BS2i);
-    genBlocksAxis(dvmh_get_num_procs(2), AN2, 1, &BS2j);
-    genBlocksAxis(dvmh_get_num_procs(3), AN3, 1, &BS2k);
-    double wb1[6] = {2., 1.3, 2., 1.0, 1.7, 1};
-    double wb2[10] = {2.0, 1.2, 2.5, 1.0, 2.5, 1.3, 1., 3., 2., 1.};
-    double wb3[6] = {2., 2., 4., 1.3, 2., 1.7};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrmix325";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[*][genblock(BS1i)][genblock(BS1j)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][wgtblock(wb2, 10)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] += 1;
-    }
-
-    #pragma dvm redistribute(A3[genblock(BS2i)][genblock(BS2j)][genblock(BS2k)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k + 1)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k + 1);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(BS1i);
-    free(BS1j);
-    free(BS2i);
-    free(BS2j);
-    free(BS2k);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult1.cdv
deleted file mode 100644
index 9b1e5f3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult1.cdv
+++ /dev/null
@@ -1,474 +0,0 @@
-/*    DISTRMULT1
-    TESTING distribute and redistribute directive
-            MULT_BLOCK distribution*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distrm11();
-static void distrm12();
-static void distrm13();
-static void distrm14();
-static void distrm15();
-static void distrm16();
-static void distrm17();
-static void distrm21();
-static void distrm22();
-static void distrm23();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, k, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRMULT1 ===================\n");
-
-    /* 11  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[MULT_BLOCK] */
-    distrm11();
-    /* 12  DISTRIBUTE arrA1[MULT_BLOCK]  REDISTRIBUTE arrA1[BLOCK] */
-    distrm12();
-    /* 13  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[MULT_BLOCK] small array*/
-    distrm13();
-    /* 14  DISTRIBUTE arrA1[MULT_BLOCK]  REDISTRIBUTE arrA1[BLOCK] small array*/
-    distrm14();
-    /* 15  DISTRIBUTE arrA1[MULT_BLOCK]  REDISTRIBUTE arrA1[MULT_BLOCK] other m*/
-    distrm15();
-    /* 16  DISTRIBUTE arrA1[MULT_BLOCK]  REDISTRIBUTE arrA1[*]*/
-    distrm16();
-    /* 17  DISTRIBUTE arrA1[*]           REDISTRIBUTE arrA1[MULT_BLOCK]*/
-    distrm17();
-    /* 21  DISTRIBUTE arrA2[MULT_BLOCK][*]   REDISTRIBUTE arrA2[*][MULT_BLOCK]*/
-    distrm21();
-    /* 22  DISTRIBUTE arrA2[*][MULT_BLOCK]   REDISTRIBUTE arrA2[*][*]*/
-    distrm22();
-    /* 23  DISTRIBUTE arrA2[*][*]            REDISTRIBUTE arrA2[*][MULT_BLOCK]*/
-    distrm23();
-
-    printf("=== END OF DISTRMULT1 =====================\n");
-    return 0;
-}
-
-/* ---------------------------------------------DISTR11*/
-/* DISTR arrA1[BLOCK]    REDISTR arrA1[MULT_BLOCK]*/
-void distrm11()
-{
-    #define AN1 25
-    int m = 5;
-    #pragma dvm array distribute[block]
-    int (*A1);
-    char tname[] = "distrm11";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[multblock(m)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR12*/
-/* DISTRIBUTE arrA1[MULT_BLOCK]    REDISTRIBUTE arrA1[BLOCK] */
-void distrm12()
-{
-    #define AN1 48
-    int m = 6;
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrm12";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[multblock(m)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR13*/
-/* DISTR arrA1[BLOCK]    REDISTR arrA1[MULT_BLOCK] small array */
-void distrm13()
-{
-    #define AN1 4
-    int m = 4;
-    #pragma dvm array distribute[block]
-    int (*A1);
-    char tname[] = "distrm13";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[multblock(m)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR14*/
-/*  DISTRIBUTE arrA1[MULT_BLOCK]   REDISTRIBUTE arrA1[BLOCK]  small array*/
-void distrm14()
-{
-    #define AN1 3
-    int m = 3;
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrm14";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[multblock(m)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR15*/
-/*  DISTR arrA1[MULT_BLOCK]    REDISTR arrA1[MULT_BLOCK] other m */
-void distrm15()
-{
-    #define AN1 24
-    int m1 = 4, m2 = 3;
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrm15";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[multblock(m1)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR16*/
-/*  DISTR arrA1[MULT_BLOCK]    REDISTR arrA1[*]*/
-void distrm16()
-{
-    #define AN1 50
-    int m = 2;
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrm16";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[multblock(m)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR17*/
-/*  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[MULT_BLOCK]*/
-void distrm17()
-{
-    #define AN1 120
-    int m = 10;
-    #pragma dvm array distribute[*]
-    int (*A1);
-    char tname[] = "distrm17";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[multblock(m)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR21*/
-/*  DISTRIBUTE arrA2[MULT_BLOCK][*]    REDISTRIBUTE arrA2[*][MULT_BLOCK] */
-void distrm21()
-{
-    #define AN1 36
-    #define AN2 25
-    int m1 = 6,m2 = 5;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrm21";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[*][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR22*/
-/*  DISTRIBUTE arrA2[*][MULT_BLOCK]    REDISTRIBUTE arrA2[*][*] */
-void distrm22()
-{
-    #define AN1 8
-    #define AN2 121
-    int m2 = 11;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrm22";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[*][multblock(m2)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR23*/
-/*  DISTRIBUTE arrA2[*][*]    REDISTRIBUTE arrA2[*][MULT_BLOCK] */
-void distrm23()
-{
-    #define AN1 8
-    #define AN2 63
-    int m2 = 9;
-    #pragma dvm array distribute[*][*]
-    int (*A2)[AN2];
-    char tname[] = "distrm23";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[*][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult2.cdv
deleted file mode 100644
index ec70f83..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult2.cdv
+++ /dev/null
@@ -1,857 +0,0 @@
-/*    DISTRMULT2
-    TESTING distribute and redistribute directive
-            MULT_BLOCK distribution*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distrm24();
-static void distrm25();
-static void distrm26();
-static void distrm27();
-static void distrm28();
-static void distrm29();
-static void distrm210();
-static void distrm32();
-static void distrm33();
-static void distrm34();
-static void distrm35();
-static void distrm36();
-static void distrm37();
-static void distrm38();
-static void distrm41();
-static void distrm42();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, k, ia, ib, n;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRMULT2 ===================\n");
-
-    /* 24  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  REDISTRIBUTE arrA2[*][*]*/
-    distrm24();
-    /* 25  DISTRIBUTE arrA2[*][*]  REDISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]*/
-    distrm25();
-    /* 26  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-                             REDISTRIBUTE arrA2[BLOCK][BLOCK]*/
-    distrm26();
-    /* 27  DISTRIBUTE arrA2[BLOCK][BLOCK]
-                             REDISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]*/
-    distrm27();
-    /* 28  DISTRIBUTE arrA2[MULT_BLOCK][BLOCK]
-                         REDISTRIBUTE arrA2[BLOCK][MULT_BLOCK]*/
-    distrm28();
-    /* 29  DISTRIBUTE arrA2[BLOCK][MULT_BLOCK]
-                         REDISTRIBUTE arrA2[MULT_BLOCK][BLOCK]*/
-    distrm29();
-    /* 210  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  other m1,m2*/
-    distrm210();
-    /* 32  DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK] [*]
-                         REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]*/
-    distrm32();
-    /* 33  DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK][*]
-                          REDISTRIBUTE arrA3[MULT_BLOCK][*][BLOCK]*/
-    distrm33();
-    /* 34  DISTRIBUTE  arrA3[MULT_BLOCK][*][MULT_BLOCK]
-                         REDISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][*]*/
-    distrm34();
-    /* 35  DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK][*]
-                         REDISTRIBUTE arrA3[*][*]MULT_BLOCK]*/
-    distrm35();
-    /* 36  DISTRIBUTE  arrA3[MULT_BLOCK][*][BLOCK]
-                         REDISTRIBUTE arrA3[BLOCK][*][MULT_BLOCK]*/
-    distrm36();
-    /* 37  DISTRIBUTE  arrA3[MULT_BLOCK][BLOCK][*]
-                         REDISTRIBUTE arrA3[BLOCK][*][MULT_BLOCK]*/
-    distrm37();
-    /* 38  DISTRIBUTE  arrA3[BLOCK][*][MULT_BLOCK]
-                         REDISTRIBUTE arrA3[*][MULT_BLOCK][BLOCK]*/
-    distrm38();
-    /* 41  DISTRIBUTE arrA4[*][*][MULT_BLOCK][MULT_BLOCK]
-                         REDISTRIBUTE arrA4[*][*][*][*]*/
-    distrm41();
-    /* 42  DISTRIBUTE arrA4[MULT_BLOCK][*][MULT_BLOCK][*]
-                        REDISTRIBUTE arrA4[*][MULT_BLOCK][MULT_BLOCK][*]*/
-    distrm42();
-
-    printf("=== END OF DISTRMULT2 =====================\n");
-    return 0;
-}
-
-/* ---------------------------------------------DISTR24*/
-/* DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  REDISTRIBUTE arrA2[*][*] */
-void distrm24()
-{
-    #define AN1 15
-    #define AN2 12
-    int m1 = 5,m2 = 3;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrm24";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][multblock(m2)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR25*/
-/* DISTRIBUTE arrA2[*][*]  REDISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]*/
-void distrm25()
-{
-    #define AN1 18
-    #define AN2 8
-    int m1 = 3,m2 = 2;
-    #pragma dvm array distribute[*][*]
-    int (*A2)[AN2];
-    char tname[] = "distrm25";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[multblock(m1)][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-
-/* ---------------------------------------------DISTR26*/
-/* DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-                REDISTRIBUTE arrA2[BLOCK][BLOCK]*/
-void distrm26()
-{
-    #define AN1 49
-    #define AN2 12
-    int m1 = 7,m2 = 4;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrm26";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][multblock(m2)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR27*/
-/*  DISTRIBUTE arrA2[BLOCK][BLOCK]  REDISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]*/
-void distrm27()
-{
-    #define AN1 8
-    #define AN2 64
-    int m1 = 1,m2 = 8;
-    #pragma dvm array distribute[block][block]
-    int (*A2)[AN2];
-    char tname[] = "distrm27";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[multblock(m1)][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR28*/
-/* DISTRIBUTE arrA2[MULT_BLOCK][BLOCK]  REDISTRIBUTE arrA2[BLOCK][MULT_BLOCK]*/
-void distrm28()
-{
-    #define AN1 20
-    #define AN2 20
-    int m1 = 5, m2 = 4;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrm28";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[block][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR29*/
-/* DISTRIBUTE arrA2[BLOCK][MULT_BLOCK]
-                REDISTRIBUTE arrA2[MULT_BLOCK][BLOCK]*/
-void distrm29()
-{
-    #define AN1 30
-    #define AN2 60
-    int m1 = 10,m2 = 10;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrm29";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][multblock(m2)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[multblock(m1)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR210*/
-/* DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-                 REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  other m1, m2*/
-void distrm210()
-{
-    #define AN1 24
-    #define AN2 24
-    int m1 = 3,m2 = 2;
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrm210";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[multblock(m1)][multblock(m2)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[multblock(m2)][multblock(m1)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR32*/
-/* DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK] [*]
-                 REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]*/
-void distrm32()
-{
-    #define AN1 16
-    #define AN2 12
-    #define AN3 8
-    int m1 = 2, m2 = 3, m3 = 4;
-    #pragma dvm array
-
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm32";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][multblock(m2)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR33*/
-/* DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK][*]
-                 REDISTRIBUTE arrA3[MULT_BLOCK][*][MULTBLOCK]*/
-void distrm33()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 8
-    int m1 = 4, m2 = 2, m3 = 2;
-    #pragma dvm array
-
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm33";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][*][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR34*/
-/* DISTRIBUTE  arrA3[MULT_BLOCK][*][MULT_BLOCK]
-                 REDISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][*]*/
-void distrm34()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    int m1 = 2, m2 = 1, m3 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm34";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][*][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR35*/
-/* DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK][*]
-                         REDISTRIBUTE arrA3[*][*][MULT_BLOCK]*/
-void distrm35()
-{
-    #define AN1 18
-    #define AN2 28
-    #define AN3 38
-    int m1 = 3, m2 = 7, m3 = 19;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm35";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][*][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR36*/
-/* DISTRIBUTE  arrA3[MULT_BLOCK][*][BLOCK]
-                         REDISTRIBUTE arrA3[BLOCK][*][MULT_BLOCK]*/
-void distrm36()
-{
-    #define AN1 121
-    #define AN2 12
-    #define AN3 35
-    int m1 = 11, m2 = 2, m3 = 7;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm36";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][*][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][*][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR37*/
-/*DISTRIBUTE  arrA3[MULT_BLOCK][BLOCK][*]
-                         REDISTRIBUTE arrA3[BLOCK][*][MULT_BLOCK]*/
-void distrm37()
-{
-    #define AN1 8
-    #define AN2 28
-    #define AN3 8
-    int m1 = 2, m2 = 4, m3 = 2;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm37";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][block][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][*][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR38*/
-/*DISTRIBUTE  arrA3[BLOCK][*][MULT_BLOCK] REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]*/
-void distrm38()
-{
-    #define AN1 8
-    #define AN2 28
-    #define AN3 8
-    int m1 = 2, m2 = 4, m3 = 2;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm38";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][*][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][multblock(m2)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR41*/
-/*DISTRIBUTE arrA4[*][*][MULT_BLOCK][MULT_BLOCK] REDISTRIBUTE arrA4[*][*][*][*]*/
-void distrm41()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 16
-    #define AN4 16
-    int m1 = 2, m2 = 4, m3 = 2, m4 = 4;
-    #pragma dvm array
-    int (*A4)[AN2][AN3][AN4];
-    char tname[] = "distrm41";
-
-    erri = ER;
-
-    A4 = malloc(AN1 * AN2 * AN3 * AN4 * sizeof(int));
-    #pragma dvm redistribute(A4[*][*][multblock(m3)][multblock(m4)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        A4[i][j][k][n] = i*NL/10+j*NL/100+k*NL/1000+n;
-    }
-
-    #pragma dvm redistribute(A4[*][*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        if (A4[i][j][k][n] != i*NL/10+j*NL/100+k*NL/1000+n)
-                            erri = Min(erri, i*NL/10+j*NL/100+k*NL/1000+n);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A4);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-
-/* ---------------------------------------------DISTR42*/
-/*DISTRIBUTE arrA4[MULT_BLOCK][*][MULT_BLOCK][*]
-                REDISTRIBUTE arrA4[*][MULT_BLOCK][MULT_BLOCK][*]*/
-void distrm42()
-{
-    #define AN1 28
-    #define AN2 25
-    #define AN3 27
-    #define AN4 21
-    int m1 = 7, m2 = 5, m3 = 9, m4 = 3;
-    #pragma dvm array
-    int (*A4)[AN2][AN3][AN4];
-    char tname[] = "distrm42";
-
-    erri = ER;
-
-    A4 = malloc(AN1 * AN2 * AN3 * AN4 * sizeof(int));
-    #pragma dvm redistribute(A4[multblock(m1)][*][multblock(m3)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        A4[i][j][k][n] = i*NL/10+j*NL/100+k*NL/1000+n;
-    }
-
-    #pragma dvm redistribute(A4[*][multblock(m2)][multblock(m3)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        if (A4[i][j][k][n] != i*NL/10+j*NL/100+k*NL/1000+n)
-                            erri = Min(erri, i*NL/10+j*NL/100+k*NL/1000+n);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A4);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult3.cdv
deleted file mode 100644
index 6b5d849..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_MULT/distrmult3.cdv
+++ /dev/null
@@ -1,569 +0,0 @@
-/*    DISTRMULT3
-    TESTING distribute and redistribute directive
-            MULT_BLOCK distribution*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distrm311();
-static void distrm312();
-static void distrm313();
-static void distrm314();
-static void distrm315();
-static void distrm316();
-static void distrm317();
-static void distrm318();
-static void distrm319();
-static void distrm43();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, k, ia, ib, n;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRMULT3 ===================\n");
-
-    /* 311 DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]*/
-    distrm311();
-    /* 312 DISTRIBUTE arrA3DISTRIBUTE [BLOCK][BLOCK][BLOCK]
-               REDISTRIBUTE  [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-    distrm312();
-    /* 313 DISTRIBUTE arrA2[_BLOCK][BLOCK][WGT_BLOCK]
-                REDISTRIBUTE arrA3[BLOCK][MULT_BLOCK][BLOCK]*/
-    distrm313();
-    /* 314 DISTRIBUTE arrA3[BLOCK][MULT_BLOCK][BLOCK]
-                REDISTRIBUTE arrA3[MULT_BLOCK][BLOCK][MULT_BLOCK]*/
-    distrm314();
-    /* 315  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK] other m1,m2,m3*/
-    distrm315();
-    /* 316 DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-                REDISTRIBUTE arrA2[*][*][*]*/
-    distrm316();
-    /* 317  DISTRIBUTE arrA3[*][*][*]
-                REDISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-    distrm317();
-    /* 318 DISTRIBUTE arrA3[MULT_BLOCK][*][MULT_BLOCK]
-                REDISTRIBUTE arrA3[*][MULT_BLOCK][*]*/
-    distrm318();
-    /* 319 DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][*]
-                REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]*/
-    distrm319();
-    /* 43 DISTRIBUTE arrA4[MULT_BLOCK][*][MULT_BLOCK][*]
-                REDISTRIBUTE arrA4[[*][MULT_BLOCK][*][MULT_BLOCK]*/
-    distrm43();
-
-    printf("=== END OF DISTRMULT3 =====================\n");
-    return 0;
-}
-
-/* ---------------------------------------------DISTR311*/
-/*DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]*/
-void distrm311()
-{
-    #define AN1 14
-    #define AN2 12
-    #define AN3 10
-    int m1 = 7, m2 = 3, m3 = 5;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm311";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR312*/
-/*DISTRIBUTE arrA3[BLOCK][BLOCK][BLOCK]
-                REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-void distrm312()
-{
-    #define AN1 15
-    #define AN2 15
-    #define AN3 25
-    int m1 = 5, m2 = 5, m3 = 5;
-    #pragma dvm array distribute[block][block][block]
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm312";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR313*/
-/*DISTRIBUTE arrA2[MULT_BLOCK][BLOCK][MULT_BLOCK]
-                REDISTRIBUTE arrA3[BLOCK][MULT_BLOCK][BLOCK]*/
-void distrm313()
-{
-    #define AN1 24
-    #define AN2 24
-    #define AN3 24
-    int m1 = 2, m2 = 3, m3 = 4;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm313";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][block][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][multblock(m2)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR314*/
-/*DISTRIBUTE arrA3[BLOCK][MULT_BLOCK][BLOCK]
-                REDISTRIBUTE arrA3[MULT_BLOCK][BLOCK][MULT_BLOCK]*/
-void distrm314()
-{
-    #define AN1 20
-    #define AN2 30
-    #define AN3 30
-    int m1 = 5, m2 = 3, m3 = 3;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm314";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][multblock(m2)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][block][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR315*/
-/*DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-            REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK] other m1,m2,m3*/
-void distrm315()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 16
-    int m1 = 2, m2 = 4, m3 = 8;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm315";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m3)][multblock(m1)][multblock(m2)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR316*/
-/*DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-                REDISTRIBUTE arrA2[*][*][*]*/
-void distrm316()
-{
-    #define AN1 12
-    #define AN2 12
-    #define AN3 48
-    int m1 = 3, m2 = 2, m3 = 6;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm316";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR317*/
-/*DISTRIBUTE arrA3[*][*][*]
-                REDISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]*/
-void distrm317()
-{
-    #define AN1 10
-    #define AN2 35
-    #define AN3 10
-    int m1 = 2, m2 = 5, m3 = 2;
-    #pragma dvm array distribute[*][*][*]
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm317";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[multblock(m1)][multblock(m2)][multblock(m3)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR318*/
-/*DISTRIBUTE arrA3[MULT_BLOCK][*][MULT_BLOCK]
-                REDISTRIBUTE arrA3[*][MULT_BLOCK][*]*/
-void distrm318()
-{
-    #define AN1 11
-    #define AN2 14
-    #define AN3 24
-    int m1 = 1, m2 = 2, m3 = 6;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm318";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m1)][*][multblock(m3)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][multblock(m2)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR319*/
-/*DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][*]
-               REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]*/
-void distrm319()
-{
-    #define AN1 30
-    #define AN2 12
-    #define AN3 30
-    int m11 = 2, m12 = 2, m13 = 2;
-    int m21 = 5, m22 = 4, m23 = 10;
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrm319";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[multblock(m11)][multblock(m12)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][multblock(m22)][multblock(m23)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR43*/
-/*DISTRIBUTE arrA4[MULT_BLOCK][*][MULT_BLOCK][*]
-                REDISTRIBUTE arrA4[*][MULT_BLOCK][*][MULT_BLOCK]*/
-void distrm43()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 16
-    #define AN4 16
-    int m1 = 2, m2 = 4, m3 = 2, m4 = 4;
-    #pragma dvm array
-    int (*A4)[AN2][AN3][AN4];
-    char tname[] = "distrm43";
-
-    erri = ER;
-
-    A4 = malloc(AN1 * AN2 * AN3 * AN4 * sizeof(int));
-    #pragma dvm redistribute(A4[multblock(m1)][*][multblock(m3)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        A4[i][j][k][n] = i*NL/10+j*NL/100+k*NL/1000+n;
-    }
-
-    #pragma dvm redistribute(A4[*][multblock(m2)][*][multblock(m4)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        if (A4[i][j][k][n] != i*NL/10+j*NL/100+k*NL/1000+n)
-                            erri = Min(erri, i*NL/10+j*NL/100+k*NL/1000+n);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A4);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt1.cdv
deleted file mode 100644
index 2d6ecb2..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt1.cdv
+++ /dev/null
@@ -1,483 +0,0 @@
-/*    DISTRWGT1
-    Testing DISTRIBUTE and REDISTRIBUTE directives
-            WGT_BLOCK distribution*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distrwgt11();
-static void distrwgt12();
-static void distrwgt13();
-static void distrwgt14();
-static void distrwgt15();
-static void distrwgt16();
-static void distrwgt17();
-static void distrwgt21();
-static void distrwgt22();
-static void distrwgt23();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, k, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRWGT1 ===================\n");
-    /* 11  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[WGT_BLOCK]*/
-    distrwgt11();
-
-    /* DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK] */
-    distrwgt12();
-
-    /* DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[WGT_BLOCK] small array*/
-    distrwgt13();
-
-    /* DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK] small array*/
-    distrwgt14();
-
-    /* DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[WGT_BLOCK] other weights*/
-    distrwgt15();
-
-    /* DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[*]*/
-    distrwgt16();
-
-    /* DISTRIBUTE arrA1[*]           REDISTRIBUTE arrA1[WGT_BLOCK]*/
-    distrwgt17();
-
-    /* DISTRIBUTE arrA2[WGT_BLOCK][*]   REDISTRIBUTE arrA2[*][WGT_BLOCK]*/
-    distrwgt21();
-
-    /*DISTRIBUTE arrA2[*][WGT_BLOCK]   REDISTRIBUTE arrA2[*][*]*/
-    distrwgt22();
-
-    /* DISTRIBUTE arrA2[*][*]           REDISTRIBUTE arrA2[*][WGT_BLOCK]*/
-    distrwgt23();
-
-    printf("=== END OF DISTRWGT1 =====================\n");
-    return 0;
-}
-
-/* ---------------------------------------------DISTR11*/
-/* 11  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[WGT_BLOCK]*/
-void distrwgt11()
-{
-    #define AN1 16
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array distribute[block]
-    int (*A1);
-    char tname[] = "distrwgt11";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[wgtblock(wb, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR12*/
-/* 11   12  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK]*/
-void distrwgt12()
-{
-    #define AN1 8
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrwgt12";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[wgtblock(wb, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR13*/
-/* 13  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[WGT_BLOCK] small array*/
-void distrwgt13()
-{
-    #define AN1 5
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array distribute[block]
-    int (*A1);
-    char tname[] = "distrwgt13";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[wgtblock(wb, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR14*/
-/* 14  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK] small array*/
-void distrwgt14()
-{
-    #define AN1 5
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrwgt14";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[wgtblock(wb, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR15*/
-/* 15 DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[WGT_BLOCK] other weights*/
-void distrwgt15()
-{
-    #define AN1 16
-    double wb1[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    double wb2[6] = {2.0, 1., 2., 2.0, 2., 1.};
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrwgt15";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[wgtblock(wb1, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[wgtblock(wb2, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR16*/
-/* 16  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[*]*/
-void distrwgt16()
-{
-    #define AN1 8
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A1);
-    char tname[] = "distrwgt16";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-    #pragma dvm redistribute(A1[wgtblock(wb, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR17*/
-/* 17  DISTRIBUTE arrA1[*]   REDISTRIBUTE arrA1[WGT_BLOCK]*/
-void distrwgt17()
-{
-    #define AN1 28
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array distribute[*]
-    int (*A1);
-    char tname[] = "distrwgt17";
-
-    erri = ER;
-
-    A1 = malloc(AN1 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-                    A1[i] = i;
-    }
-
-    #pragma dvm redistribute(A1[wgtblock(wb, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on A1[i]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            if (A1[i] != i)
-                erri = Min(erri, i);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------DISTR17*/
-/* 21  DISTRIBUTE arrA2[WGT_BLOCK][*]   REDISTRIBUTE arrA2[*][WGT_BLOCK]*/
-void distrwgt21()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrwgt21";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb, 6)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[*][wgtblock(wb, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR22*/
-/* 22  DISTRIBUTE arrA2[*][WGT_BLOCK]   REDISTRIBUTE arrA2[*][*]*/
-void distrwgt22()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrwgt22";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[*][wgtblock(wb, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR23*/
-/* 23  DISTRIBUTE arrA2[*][*]           REDISTRIBUTE arrA2[*][WGT_BLOCK]*/
-void distrwgt23()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array distribute[*][*]
-    int (*A2)[AN2];
-    char tname[] = "distrwgt23";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[*][wgtblock(wb, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt2.cdv
deleted file mode 100644
index fa143fe..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt2.cdv
+++ /dev/null
@@ -1,859 +0,0 @@
-/*    DISTRWGT2
-    Testing DISTRIBUTE and REDISTRIBUTE directives
-            WGT_BLOCK distribution*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distrwgt24();
-static void distrwgt25();
-static void distrwgt26();
-static void distrwgt27();
-static void distrwgt28();
-static void distrwgt29();
-static void distrwgt210();
-static void distrwgt32();
-static void distrwgt33();
-static void distrwgt34();
-static void distrwgt35();
-static void distrwgt36();
-static void distrwgt37();
-static void distrwgt38();
-static void distrwgt41();
-static void distrwgt42();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, k, n, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRWGT2 ===================\n");
-    /* 24  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]  REDISTRIBUTE arrA2[*][*]*/
-    distrwgt24();
-    /* 25  DISTRIBUTE arrA2[*][*]  REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]*/
-    distrwgt25();
-    /* 26  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-                             REDISTRIBUTE arrA2[BLOCK][BLOCK]*/
-    distrwgt26();
-    /* 27  DISTRIBUTE arrA2[BLOCK][BLOCK]
-                             REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]*/
-    distrwgt27();
-    /* 28  DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]
-                         REDISTRIBUTE arrA2[BLOCK][WGT_BLOCK]*/
-    distrwgt28();
-    /* 29  DISTRIBUTE arrA2[BLOCK][WGT_BLOCK]
-                         REDISTRIBUTE arrA2[WGT_BLOCK][BLOCK]*/
-    distrwgt29();
-    /* 210  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]    other weigths
-                      REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]*/
-    distrwgt210();
-    /* 32  DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK] [*]
-                      REDISTRIBUTE arrA3[*][WGT_BLOCK][WGT_BLOCK]*/
-    distrwgt32();
-    /* 33  DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK][*]
-                     REDISTRIBUTE arrA3[WGT_BLOCK][*][BLOCK]*/
-    distrwgt33();
-    /* 34  DISTRIBUTE  arrA3[WGT_BLOCK][*][WGT_BLOCK]
-                      REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][*]*/
-    distrwgt34();
-    /* 35  DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK][*]
-                      REDISTRIBUTE arrA3[*][*][WGT_BLOCK]*/
-    distrwgt35();
-    /* 36  DISTRIBUTE  arrA3[WGT_BLOCK][*][BLOCK]
-                      REDISTRIBUTE arrA3[BLOCK][*][WGT_BLOCK]*/
-    distrwgt36();
-   /* 37  DISTRIBUTE  arrA3[WGT_BLOCK][BLOCK][*]
-                      REDISTRIBUTE arrA3[BLOCK][*][WGT_BLOCK]*/
-    distrwgt37();
-    /* 38  DISTRIBUTE  arrA3[BLOCK][*][WGT_BLOCK]
-                      REDISTRIBUTE arrA3[*][WGT_BLOCK][BLOCK]*/
-    distrwgt38();
-    /* 41  DISTRIBUTE arrA4[*][*][WGT_BLOCK][WGT_BLOCK]
-                     REDISTRIBUTE arrA4[*][*][*][*]*/
-    distrwgt41();
-    /* 42  DISTRIBUTE arrA4[WGT_BLOCK][*][WGT_BLOCK][*]
-                     REDISTRIBUTE arrA4[*][WGT_BLOCK][WGT_BLOCK][*]*/
-    distrwgt42();
-
-    printf("=== END OF DISTRWGT2 =====================\n");
-    return 0;
-}
-
-/* ---------------------------------------------DISTR24*/
-/* 24   DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]  REDISTRIBUTE arrA2[*][*]*/
-void distrwgt24()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb1[4] = {2., 2., 3.0, 1.};
-    double wb2[6] = {3.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrwgt24";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 4)][wgtblock(wb2, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR25*/
-/* DISTRIBUTE arrA2[*][*]  REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]*/
-void distrwgt25()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb1[5] = {1.0,2.,2.,3.0, 0.};
-    double wb2[7] = {1.0,1.,2.,1.0, 1.,1.,1.};
-    #pragma dvm array distribute[*][*]
-    int (*A2)[AN2];
-    char tname[] = "distrwgt25";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[wgtblock(wb1, 5)][wgtblock(wb2, 7)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR26*/
-/* DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]  REDISTRIBUTE arrA2[BLOCK][BLOCK]*/
-void distrwgt26()
-{
-    #define AN1 12
-    #define AN2 12
-    double wb[6] = {1.0, 4., 1., 1.0, 2., 1.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrwgt26";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb, 6)][wgtblock(wb, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR27*/
-/* DISTRIBUTE arrA2[BLOCK][BLOCK]  REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]*/
-void distrwgt27()
-{
-    #define AN1 8
-    #define AN2 8
-    double wb[6] = {2.0, 1., 3., 2.0, 1., 1.};
-    #pragma dvm array distribute[block][block]
-    int (*A2)[AN2];
-    char tname[] = "distrwgt27";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[wgtblock(wb, 6)][wgtblock(wb, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR28*/
-/* DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]  REDISTRIBUTE arrA2[BLOCK][WGT_BLOCK]*/
-void distrwgt28()
-{
-    #define AN1 12
-    #define AN2 12
-    double wb1[8] = {1.0, 2., 2., 3.0, 1., 1, 2, 4.};
-    double wb2[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrwgt28";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 8)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[block][wgtblock(wb2, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR29*/
-/* DISTRIBUTE arrA2[BLOCK][WGT_BLOCK]  REDISTRIBUTE arrA2[WGT_BLOCK][BLOCK]*/
-void distrwgt29()
-{
-    #define AN1 12
-    #define AN2 12
-    double wb1[6] = {1.0, 2., 2., 3.0, 3, 1};
-    double wb2[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrwgt29";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[block][wgtblock(wb1, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[wgtblock(wb2, 6)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR210*/
-/* DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-               REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK] with other weigths*/
-void distrwgt210()
-{
-    #define AN1 12
-    #define AN2 12
-    double wb1[4] = {1.0, 2., 1., 1.0};
-    double wb2[6] = {1.0, 1., 2., 1.0, 2., 1.};
-    #pragma dvm array
-    int (*A2)[AN2];
-    char tname[] = "distrwgt210";
-
-    erri = ER;
-
-    A2 = malloc(AN1 * AN2 * sizeof(int));
-    #pragma dvm redistribute(A2[wgtblock(wb1, 4)][wgtblock(wb2, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                A2[i][j] = i * NL + j;
-    }
-
-    #pragma dvm redistribute(A2[wgtblock(wb2, 6)][wgtblock(wb1, 4)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j] on A2[i][j]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                if (A2[i][j] != i * NL + j)
-                    erri = Min(erri, i * NL + j);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------DISTR32*/
-/* DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK][*]
-                 REDISTRIBUTE arrA3[*][WGT_BLOCK][WGT_BLOCK]*/
-void distrwgt32()
-{
-    #define AN1 16
-    #define AN2 12
-    #define AN3 8
-    double wb1[7] = {1., 1., 2., 1.0, 2., 2., 3.0};
-    double wb2[8] = {1.0, 2., 2., 3.0, 2, 1, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt32";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 7)][wgtblock(wb2, 6)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][wgtblock(wb2, 6)][wgtblock(wb1, 4)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR33*/
-/* DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK][*]
-                 REDISTRIBUTE arrA3[WGT_BLOCK][*][WGT_BLOCK]*/
-void distrwgt33()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 8
-    double wb[10] = {1.0, 2., 2., 3.0, 2., 4, 2., 1., 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt33";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb, 6)][wgtblock(wb, 8)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb, 10)][*][wgtblock(wb, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR34*/
-/* DISTRIBUTE  arrA3[WGT_BLOCK][*][WGT_BLOCK]
-                 REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][*]*/
-void distrwgt34()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb[8] = {1.0, 2., 2., 3.0, 1., 2, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt34";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb, 6)][*][wgtblock(wb, 8)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb, 8)][wgtblock(wb, 6)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR35*/
-/* DISTRIBUTE  arrA3[WGT_BLOCK][BLOCK][*]
-                         REDISTRIBUTE arrA3[*][*][WGT_BLOCK]*/
-void distrwgt35()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[6] = {1.0, 2., 2., 3.0, 1.5, 2.5};
-    double wb2[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt35";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][block][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][*][wgtblock(wb2, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR36*/
-/* DISTRIBUTE  arrA3[WGT_BLOCK][*][BLOCK]
-                         REDISTRIBUTE arrA3[BLOCK][*][WGT_BLOCK]*/
-void distrwgt36()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb[6] = {.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt36";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb, 6)][*][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][*][wgtblock(wb, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR37*/
-/*DISTRIBUTE  arrA3[WGT_BLOCK][BLOCK][*]
-                         REDISTRIBUTE arrA3[BLOCK][*][WGT_BLOCK]*/
-void distrwgt37()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[6] = {0.5, 1, 1.0, 2., 2., 3.0};
-    double wb2[8] = {1.0, 2., 2., 3.0, 0.5, 2, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt37";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][block][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][*][wgtblock(wb2, 8)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR38*/
-/*DISTRIBUTE  arrA3[BLOCK][*][WGT_BLOCK] REDISTRIBUTE arrA3[*][WGT_BLOCK][WGT_BLOCK]*/
-void distrwgt38()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[6] = {1.0, 2., 2., 3.0, 4, 5};
-    double wb2[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt38";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][*][wgtblock(wb1, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][wgtblock(wb1, 6)][wgtblock(wb2, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR41*/
-/*DISTRIBUTE arrA4[*][*][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE arrA4[*][*][*][*]*/
-void distrwgt41()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    #define AN4 8
-    double wb[8] = {1.0, 2., 2., 3.0, 1., 1., 2, 1};
-    #pragma dvm array
-    int (*A4)[AN2][AN3][AN4];
-    char tname[] = "distrwgt41";
-
-    erri = ER;
-
-    A4 = malloc(AN1 * AN2 * AN3 * AN4 * sizeof(int));
-    #pragma dvm redistribute(A4[*][*][wgtblock(wb, 6)][wgtblock(wb, 8)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        A4[i][j][k][n] = i*NL/10+j*NL/100+k*NL/1000+n;
-    }
-    #pragma dvm redistribute(A4[*][*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        if (A4[i][j][k][n] != i*NL/10+j*NL/100+k*NL/1000+n)
-                            erri = Min(erri, i*NL/10+j*NL/100+k*NL/1000+n);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A4);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-
-/* ---------------------------------------------DISTR42*/
-/*DISTRIBUTE arrA4[WGT_BLOCK][*][WGT_BLOCK][*] REDISTRIBUTE arrA4[*][WGT_BLOCK][WGT_BLOCK][*]*/
-void distrwgt42()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    #define AN4 8
-    double wb[6] = {1.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A4)[AN2][AN3][AN4];
-    char tname[] = "distrwgt42";
-
-    erri = ER;
-
-    A4 = malloc(AN1 * AN2 * AN3 * AN4 * sizeof(int));
-    #pragma dvm redistribute(A4[wgtblock(wb, 6)][*][wgtblock(wb, 6)][*])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        A4[i][j][k][n] = i*NL/10+j*NL/100+k*NL/1000+n;
-    }
-
-    #pragma dvm redistribute(A4[*][wgtblock(wb, 6)][wgtblock(wb, 6)][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        if (A4[i][j][k][n] != i*NL/10+j*NL/100+k*NL/1000+n)
-                            erri = Min(erri, i*NL/10+j*NL/100+k*NL/1000+n);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A4);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt3.cdv
deleted file mode 100644
index 1c9c9aa..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/DISTR_WGT/distrwgt3.cdv
+++ /dev/null
@@ -1,478 +0,0 @@
-/*    DISTRWGT3
-    Testing DISTRIBUTE and REDISTRIBUTE directives
-            WGT_BLOCK distribution*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void distrwgt39();
-static void distrwgt310();
-static void distrwgt311();
-static void distrwgt312();
-static void distrwgt313();
-static void distrwgt314();
-static void distrwgt315();
-static void distrwgt41();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, k, ia, ib, n;
-
-int main(int an, char **as)
-{
-    printf("=== START OF DISTRWGT3 ===================\n");
-    /* 39 DISTRIBUTE arrA3[BLOCK][BLOCK][BLOCK]
-                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]*/
-    distrwgt39();
-    /* 310 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]*/
-    distrwgt310();
-    /* 311  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] other weigths*/
-    distrwgt311();
-    /* 312 DISTRIBUTE arrA2[WGT_BLOCK][BLOCK][WGT_BLOCK]
-                REDISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]*/
-    distrwgt312();
-    /* 313 DISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]
-                REDISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]*/
-    distrwgt313();
-    /* 314 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE arrA2[*][*][*]*/
-    distrwgt314();
-    /* 315  DISTRIBUTE arrA3[*][*][*]
-                REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]*/
-    distrwgt315();
-    /* 41  DISTRIBUTE arrA4[WGT_BLOCK][*][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE arrA4[BLOCK][WGT_BLOCK][BLOCK][*]*/
-    distrwgt41();
-
-    printf("=== END OF DISTRWGT3 =====================\n");
-    return 0;
-}
-
-/* ---------------------------------------------DISTR39*/
-/* DISTRIBUTE arrA3[BLOCK][BLOCK][BLOCK]
-                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]*/
-void distrwgt39()
-{
-    #define AN1 16
-    #define AN2 16
-    #define AN3 16
-    double wb1[6] = {3.0, 1., 2., 2.0, 2.5, 1.2};
-    double wb2[7] = {1., 3., 4.0, 1., 2., 2., 4.};
-    double wb3[6] = {5.0, 1., 3., 6.0, 2., 4.};
-    #pragma dvm array distribute[block][block][block]
-
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt39";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][wgtblock(wb2, 7)][wgtblock(wb3, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR310*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]*/
-void distrwgt310()
-{
-    #define AN1 12
-    #define AN2 12
-    #define AN3 24
-    double wb1[6] = {2.0, 1., 1., 3.0, 2., 1.};
-    double wb2[8] = {1.0, 1., 2., 2.0, 1., 1., 2., 2.};
-    double wb3[6] = {2.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt310";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][wgtblock(wb2, 8)][wgtblock(wb3, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][block][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR311*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] other weigths*/
-void distrwgt311()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[6] = {2.0, 1., 1., 3.0, 2., 1.};
-    double wb2[8] = {1.0, 1., 2., 2.0, 1., 1., 2., 2.};
-    double wb3[6] = {2.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt311";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][wgtblock(wb2, 6)][wgtblock(wb3, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb3, 6)][wgtblock(wb1, 6)][wgtblock(wb2, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR312*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]
-                REDISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]*/
-void distrwgt312()
-{
-    #define AN1 10
-    #define AN2 10
-    #define AN3 30
-    double wb1[6] = {2.0, 1., 1., 3.0, 2., 1.};
-    double wb2[8] = {1.0, 1., 2., 2.0, 1., 1., 2., 2.};
-    double wb3[6] = {2.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt312";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][block][wgtblock(wb3, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[block][wgtblock(wb2, 8)][block])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR313*/
-/* DISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]
-                REDISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]*/
-void distrwgt313()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[6] = {2.0, 1., 1., 3.0, 2., 1.};
-    double wb2[8] = {1.0, 1., 2., 2.0, 1., 1., 2., 2.};
-    double wb3[6] = {2.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt313";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[block][wgtblock(wb2, 8)][block])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][block][wgtblock(wb3, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR314*/
-/* DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE arrA3[*][*][*]*/
-void distrwgt314()
-{
-    #define AN1 8
-    #define AN2 12
-    #define AN3 24
-    double wb1[6] = {2.0, 1., 1., 3.0, 2., 1.};
-    double wb2[8] = {1.0, 1., 2., 2.0, 1., 1., 2., 2.};
-    double wb3[6] = {2.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt314";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][wgtblock(wb2, 8)][wgtblock(wb3, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[*][*][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR315*/
-/*  DISTRIBUTE arrA3[*][*][*]
-                REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]*/
-void distrwgt315()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    double wb1[6] = {2.0, 1., 1., 3.0, 2., 1.};
-    double wb2[8] = {1.0, 1., 2., 2.0, 1., 1., 2., 2.};
-    double wb3[6] = {2.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array distribute[*][*][*]
-    int (*A3)[AN2][AN3];
-    char tname[] = "distrwgt315";
-
-    erri = ER;
-
-    A3 = malloc(AN1 * AN2 * AN3 * sizeof(int));
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    A3[i][j][k] = i*NL/10 + j*NL/100 + k;
-    }
-
-    #pragma dvm redistribute(A3[wgtblock(wb1, 6)][wgtblock(wb2, 8)][wgtblock(wb3, 6)])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k] on A3[i][j][k]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    if (A3[i][j][k] != i*NL/10 + j*NL/100 + k)
-                        erri = Min(erri, i*NL/10 + j*NL/100 + k);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A3);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------DISTR41*/
-/*DISTRIBUTE arrA4[WGT_BLOCK][*][WGT_BLOCK][WGT_BLOCK]
-                REDISTRIBUTE arrA4[BLOCK][WGT_BLOCK][BLOCK][*]*/
-void distrwgt41()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    #define AN4 8
-    double wb1[6] = {2.0, 1., 1., 3.0, 2., 1.};
-    double wb2[8] = {1.0, 1., 2., 2.0, 1., 1., 2., 2.};
-    double wb3[6] = {2.0, 2., 2., 3.0, 1., 1.};
-    #pragma dvm array
-    int (*A4)[AN2][AN3][AN4];
-    char tname[] = "distrwgt41";
-
-    erri = ER;
-
-    A4 = malloc(AN1 * AN2 * AN3 * AN4 * sizeof(int));
-    #pragma dvm redistribute(A4[wgtblock(wb1, 6)][*][wgtblock(wb2, 8)][wgtblock(wb3, 6)])
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        A4[i][j][k][n] = i*NL/10+j*NL/100+k*NL/1000+n;
-    }
-
-    #pragma dvm redistribute(A4[block][wgtblock(wb3, 6)][block][*])
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i][j][k][n] on A4[i][j][k][n]) reduction(min(erri)), cuda_block(256)
-        for (i = 0; i < AN1; i++)
-            for (j = 0; j < AN2; j++)
-                for (k = 0; k < AN3; k++)
-                    for (n = 0; n < AN4; n++)
-                        if (A4[i][j][k][n] != i*NL/10+j*NL/100+k*NL/1000+n)
-                            erri = Min(erri, i*NL/10+j*NL/100+k*NL/1000+n);
-    }
-
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-    free(A4);
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fopen11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fopen11.cdv
deleted file mode 100644
index 7a23b26..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fopen11.cdv
+++ /dev/null
@@ -1,181 +0,0 @@
-
-/*      TESTING OF THE function fopen        
-        FOR DISTRIBUTED ARRAY A[N].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define NL 1000
-
-static void fop1101();
-static void fop1102();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START TFOPEN11========================\n");
-      fop1101();
-      fop1102();
-
-      printf("=== END OF TFOPEN11 ========================= \n");
-      return 0;
-}
-/* -------------------------------------------------fop1101  */
-      void fop1101()
-{
-
-
-      char tname[]="FOPEN_1101";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-          B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARFOP01_%04d.txt", "wl"))==NULL) {
-     printf("ERROR OPENING FILE ARFOP01_%%4d.txt \n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++) {
-       #pragma dvm remote_access(A[i])
-        {  
-         na=A[i];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-     fclose(fp);
-     
-     if ((fp=fopen("ARFOP01_%04d.txt", "rl"))==NULL) {
-     printf("ERROR OPENING FILE ARFOP_%%4d.txt \n");
-     exit(1);
-     }
-//     rewind(fp);
-       
-      for (i=0;i<=N-1;i++)
-      {
-      ni=fscanf(fp, "%d ",&nb);
-      B[i]=nb;
-      }      
-     fclose(fp);
-     dvmh_remove_local("ARFOP01_%04d.txt");
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-/* -------------------------------------------------fop1102  */
-      void fop1102()
-{
-
-
-      char tname[]="FOPEN_1102";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-      #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-          B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARFOP02.txt", "wp"))==NULL) {
-     printf("ERROR OPENING FILE ARFOP02.txt \n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++) {
-       #pragma dvm remote_access(A[i])
-        {  
-         na=A[i];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-     fclose(fp);
-     
-     if ((fp=fopen("ARFOP02.txt", "rp"))==NULL) {
-     printf("ERROR OPENING FILE ARFOP02.txt \n");
-     exit(1);
-     }
-//     rewind(fp);
-       
-      for (i=0;i<=N-1;i++)
-      {
-      ni=fscanf(fp, "%d ",&nb);
-      B[i]=nb;
-      }      
-     fclose(fp);
-     remove("ARFOP02.txt");
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc11.cdv
deleted file mode 100644
index 149ce7c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc11.cdv
+++ /dev/null
@@ -1,105 +0,0 @@
-
-/*      TESTING OF THE function fprintf and fscanf       
-        FOR DISTRIBUTED ARRAY A[N].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define NL 1000
-static void prsc1101();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fpsc11========================\n");
-      prsc1101();
-
-      printf("=== END OF fpsc11 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------prsc1101  */
-      void prsc1101()
-{
-
-
-      char tname[]="FPRINT_FSCANF_1101";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-      #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-          B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARFPSC11", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARFPSC11\n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++) {
-       #pragma dvm remote_access(A[i])
-        {  
-         na=A[i];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-     fclose(fp);
-     
-     if ((fp=fopen("ARFPSC11", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARFPSC11\n");
-     exit(1);
-     }
-//     rewind(fp);
-       
-      for (i=0;i<=N-1;i++)
-      {
-      ni=fscanf(fp, "%d ",&nb);
-      B[i]=nb;
-      }      
-     fclose(fp);
-     remove("ARFPSC11");                
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc12.cdv
deleted file mode 100644
index 91c8a63..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc12.cdv
+++ /dev/null
@@ -1,105 +0,0 @@
-
-/*      TESTING OF THE function fprintf and fscanf       
-        FOR DISTRIBUTED ARRAY A[N].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define NL 1000
-static void prsc1201();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fpsc12========================\n");
-      prsc1201();
-
-      printf("=== END OF fpsc12 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------prsc1201  */
-      void prsc1201()
-{
-
-
-      char tname[]="FPRINT_FSCANF_1201";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[*]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-           B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARFPSC12", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARFPSC12\n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++) {
-       #pragma dvm remote_access(A[i])
-        {  
-         na=A[i];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-     fclose(fp);
-     
-     if ((fp=fopen("ARFPSC12", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARFPSC12\n");
-     exit(1);
-     }
-//     rewind(fp);
-       
-      for (i=0;i<=N-1;i++)
-      {
-      ni=fscanf(fp, "%d ",&nb);
-      B[i]=nb;
-      }      
-     fclose(fp);
-     remove("ARFPSC12");                
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc21.cdv
deleted file mode 100644
index 7ab27a3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc21.cdv
+++ /dev/null
@@ -1,112 +0,0 @@
-
-/*      TESTING OF THE function fprintf and fscanf       
-        FOR DISTRIBUTED ARRAY A[N][M].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define M 4
-#define NL 1000
-static void prsc2101();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fpsc21========================\n");
-      prsc2101();
-
-      printf("=== END OF fpsc21 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------prsc2101  */
-      void prsc2101()
-{
-
-
-      char tname[]="FPRINT_FSCANF_2101";
-      int i,j,nloopi,nloopj,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][block]          
-      int A[N][M];
-      #pragma dvm array align ([i][j] with A[i][j])
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARFPSC21", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARFPSC21 \n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-       {
-       #pragma dvm remote_access(A[i][j])
-        {  
-         na=A[i][j];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-     fclose(fp);
-     
-     if ((fp=fopen("ARFPSC21", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARFPSC21 \n");
-     exit(1);
-     }
-//     rewind(fp);
-       
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-      {
-      ni=fscanf(fp, "%d ",&nb);
-      B[i][j]=nb;
-      }      
-     fclose(fp);
-     remove("ARFPSC21");                    
-    #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc22.cdv
deleted file mode 100644
index bf85877..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fpsc22.cdv
+++ /dev/null
@@ -1,112 +0,0 @@
-
-/*      TESTING OF THE function fprintf and fscanf       
-        FOR DISTRIBUTED ARRAY A[N][M].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define M 4
-#define NL 1000
-static void prsc2201();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fpsc22========================\n");
-      prsc2201();
-
-      printf("=== END OF fpsc22 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------prsc2201  */
-      void prsc2201()
-{
-
-
-      char tname[]="FPRINT_FSCANF_2201";
-      int i,j,nloopi,nloopj,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[*][block]          
-      int A[N][M];
-      #pragma dvm array align ([i][j] with A[i][j])
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARFPSC22", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARFPSC22 \n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-       {
-       #pragma dvm remote_access(A[i][j])
-        {  
-         na=A[i][j];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-     fclose(fp);
-     
-     if ((fp=fopen("ARFPSC22", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARFPSC22 \n");
-     exit(1);
-     }
-//     rewind(fp);
-       
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-      {
-      ni=fscanf(fp, "%d ",&nb);
-      B[i][j]=nb;
-      }      
-     fclose(fp);
-     remove("ARFPSC22");                    
-    #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre11.cdv
deleted file mode 100644
index 6cf7d5e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre11.cdv
+++ /dev/null
@@ -1,236 +0,0 @@
-
-/*      TESTING OF THE function fwrite and fread       
-        FOR DISTRIBUTED ARRAY A[N].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define NL 1000
-static void wrre1101();
-static void wrre1102();
-static void wrre1103();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fwrre11========================\n");
-      wrre1101();
-      wrre1102();
-      wrre1103();
-
-      printf("=== END OF fwrre11 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------wrre1101  */
-      void wrre1101()
-{
-
-
-      char tname[]="FWRITE_FREAD_1101";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-           B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE01", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01\n");
-     exit(1);
-     }
-
-     if (fwrite(A, sizeof(int), N, fp)!=N)
-     printf("ERROR WRITING FILE ARWRRE01\n");
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE01", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01 \n");
-     exit(1);
-     }
-//     rewind(fp);
-     if (fread(B, sizeof(int), N, fp)!=N)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-     remove("ARWRRE01");
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-/* ---------------------------------------------wrre1102  */
-      void wrre1102()
-{
-
-
-      char tname[]="FWRITE_FREAD_1102";
-      int i,nloopi,ni,nb,na,K;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-           B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE02_%04d", "wbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE02_%04d", "rbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     dvmh_remove_local("ARWRRE02_%04d");
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-/* ---------------------------------------------wrre1103  */
-      void wrre1103()
-{
-
-
-      char tname[]="FWRITE_FREAD_1103";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-           B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE03", "wbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01\n");
-     exit(1);
-     }
-
-     if (fwrite(A, sizeof(int), N, fp)!=N)
-     printf("ERROR WRITING FILE ARWRRE01\n");
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE03", "rbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01 \n");
-     exit(1);
-     }
-//     rewind(fp);
-     if (fread(B, sizeof(int), N, fp)!=N)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-     remove("ARWRRE03");
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre12.cdv
deleted file mode 100644
index 2233ba5..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre12.cdv
+++ /dev/null
@@ -1,236 +0,0 @@
-
-/*      TESTING OF THE function fwrite and fread       
-        FOR LOCAL ARRAY A[N].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define NL 1000
-static void wrre1201();
-static void wrre1202();
-static void wrre1203();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fwrre12========================\n");
-      wrre1201();
-      wrre1202();
-      wrre1203();
-
-      printf("=== END OF fwrre12 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------wrre1201  */
-      void wrre1201()
-{
-
-
-      char tname[]="FWRITE_FREAD_1201";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[*]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-           B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE01", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01\n");
-     exit(1);
-     }
-
-     if (fwrite(A, sizeof(int), N, fp)!=N)
-     printf("ERROR WRITING FILE ARWRRE01\n");
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE01", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01 \n");
-     exit(1);
-     }
-//     rewind(fp);
-     if (fread(B, sizeof(int), N, fp)!=N)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-     remove("ARWRRE01");
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-/* ---------------------------------------------wrre1202  */
-      void wrre1202()
-{
-
-
-      char tname[]="FWRITE_FREAD_1202";
-      int i,nloopi,ni,nb,na,K;
-      FILE *fp;
-                
-      #pragma dvm array distribute[*]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-          B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE02_%04d", "wbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE02_%04d", "rbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     dvmh_remove_local("ARWRRE02_%04d");
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-/* ---------------------------------------------wrre1203  */
-      void wrre1203()
-{
-
-
-      char tname[]="FWRITE_FREAD_1203";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[*]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-          B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE03", "wbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01\n");
-     exit(1);
-     }
-
-     if (fwrite(A, sizeof(int), N, fp)!=N)
-     printf("ERROR WRITING FILE ARWRRE01\n");
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE03", "rbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01 \n");
-     exit(1);
-     }
-//     rewind(fp);
-     if (fread(B, sizeof(int), N, fp)!=N)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-     remove("ARWRRE03");
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre21.cdv
deleted file mode 100644
index 784ac13..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre21.cdv
+++ /dev/null
@@ -1,242 +0,0 @@
-
-/*      TESTING OF THE function fwrite and fread       
-        FOR DISTRIBUTED ARRAY A[N][M].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define M 16
-#define NL 1000
-static void wrre2101();
-static void wrre2102();
-static void wrre2103();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fwrre21========================\n");
-      wrre2101();
-      wrre2102();
-      wrre2103();
-
-      printf("=== END OF fwrre21 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------wrre2101  */
-      void wrre2101()
-{
-
-
-      char tname[]="FWRITE_FREAD_2101";
-      int i,j,nloopi,nloopj,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][block]          
-      int A[N][M];
-      #pragma dvm array align ([i][j] with A[i][j])
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE01", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01\n");
-     exit(1);
-     }
-
-     if (fwrite(A, sizeof(int), N*M, fp)!=N*M)
-     printf("ERROR WRITING FILE ARWRRE01\n");
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE01", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01 \n");
-     exit(1);
-     }
-//     rewind(fp);
-     if (fread(B, sizeof(int), N*M, fp)!=N*M)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-     remove("ARWRRE01");
-                    
-     #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi),min(nloopj))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-/* ---------------------------------------------wrre2102  */
-      void wrre2102()
-{
-
-
-      char tname[]="FWRITE_FREAD_2102";
-      int i,j,nloopi,nloopj,ni,nb,na,K;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][block]          
-      int A[N][M];
-      #pragma dvm array align ([i][j] with A[i][j])
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE02_%04d", "wbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N*M, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE02_%04d", "rbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N*M, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     dvmh_remove_local("ARWRRE02_%04d");
-                    
-    #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-/* ---------------------------------------------wrre2103  */
-      void wrre2103()
-{
-
-
-      char tname[]="FWRITE_FREAD_2103";
-      int i,j,nloopi,nloopj,ni,nb,na,K;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][block]          
-      int A[N][M];
-      #pragma dvm array align ([i][j] with A[i][j])
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-      #pragma dvm region out(A) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE03_%04d", "wbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE03_%%04d\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N*M, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE03_%04d", "rbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N*M, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     remove("ARWRRE03_%04d");
-                    
-    #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre22.cdv
deleted file mode 100644
index fba4f43..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre22.cdv
+++ /dev/null
@@ -1,242 +0,0 @@
-
-/*      TESTING OF THE function fwrite and fread       
-        FOR DISTRIBUTED ARRAY A[N][M].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define M 16
-#define NL 1000
-static void wrre2201();
-static void wrre2202();
-static void wrre2203();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fwrre22========================\n");
-      wrre2201();
-      wrre2202();
-      wrre2203();
-
-      printf("=== END OF fwrre22 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------wrre2201  */
-      void wrre2201()
-{
-
-
-      char tname[]="FWRITE_FREAD_2201";
-      int i,j,nloopi,nloopj,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][*]          
-      int A[N][M];
-      #pragma dvm array align ([i][j] with A[i][j])
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE01", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01\n");
-     exit(1);
-     }
-
-     if (fwrite(A, sizeof(int), N*M, fp)!=N*M)
-     printf("ERROR WRITING FILE ARWRRE01\n");
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE01", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01 \n");
-     exit(1);
-     }
-//     rewind(fp);
-     if (fread(B, sizeof(int), N*M, fp)!=N*M)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-     remove("ARWRRE01");
-                    
-     #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi),min(nloopj))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-/* ---------------------------------------------wrre2202  */
-      void wrre2202()
-{
-
-
-      char tname[]="FWRITE_FREAD_2202";
-      int i,j,nloopi,nloopj,ni,nb,na,K;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][*]          
-      int A[N][M];
-      #pragma dvm array align ([i][j] with A[i][j])
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE02_%04d", "wbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N*M, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE02_%04d", "rbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N*M, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     dvmh_remove_local("ARWRRE02_%04d");
-                    
-    #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-/* ---------------------------------------------wrre2203  */
-      void wrre2203()
-{
-
-
-      char tname[]="FWRITE_FREAD_2203";
-      int i,j,nloopi,nloopj,ni,nb,na,K;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][*]          
-      int A[N][M];
-      #pragma dvm array align ([i][j] with A[i][j])
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE03_%04d", "wbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE03_%%04d\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N*M, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE03_%04d", "rbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N*M, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     remove("ARWRRE03_%04d");
-                    
-    #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre23.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre23.cdv
deleted file mode 100644
index 429a047..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre23.cdv
+++ /dev/null
@@ -1,242 +0,0 @@
-
-/*      TESTING OF THE function fwrite and fread       
-        FOR DISTRIBUTED ARRAY A[N][M] AND LOCAL B[N][M].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define M 16
-#define NL 1000
-static void wrre2301();
-static void wrre2302();
-static void wrre2303();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fwrre23========================\n");
-      wrre2301();
-      wrre2302();
-      wrre2303();
-
-      printf("=== END OF fwrre23 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------wrre2301  */
-      void wrre2301()
-{
-
-
-      char tname[]="FWRITE_FREAD_2301";
-      int i,j,nloopi,nloopj,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][block]          
-      int A[N][M];
-      #pragma dvm array distribute[*][*]
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE01", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01\n");
-     exit(1);
-     }
-
-     if (fwrite(A, sizeof(int), N*M, fp)!=N*M)
-     printf("ERROR WRITING FILE ARWRRE01\n");
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE01", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01 \n");
-     exit(1);
-     }
-//     rewind(fp);
-     if (fread(B, sizeof(int), N*M, fp)!=N*M)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-     remove("ARWRRE01");
-                    
-     #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi),min(nloopj))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-/* ---------------------------------------------wrre2302  */
-      void wrre2302()
-{
-
-
-      char tname[]="FWRITE_FREAD_2302";
-      int i,j,nloopi,nloopj,ni,nb,na,K;
-      FILE *fp;
-                
-      #pragma dvm array distribute[*][*]          
-      int A[N][M];
-      #pragma dvm array distribute[*][*]          
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE02_%04d", "wbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N*M, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE02_%04d", "rbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N*M, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     dvmh_remove_local("ARWRRE02_%04d");
-                    
-    #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-/* ---------------------------------------------wrre2303  */
-      void wrre2303()
-{
-
-
-      char tname[]="FWRITE_FREAD_2303";
-      int i,j,nloopi,nloopj,ni,nb,na,K;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][block]          
-      int A[N][M];
-      #pragma dvm array distribute[*][*]          
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE03_%04d", "wbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE03_%%04d\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N*M, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE03_%04d", "rbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N*M, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     remove("ARWRRE03_%04d");
-                    
-    #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre24.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre24.cdv
deleted file mode 100644
index 366dc21..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/fwrre24.cdv
+++ /dev/null
@@ -1,297 +0,0 @@
-
-/*      TESTING OF THE function fwrite and fread       
-        FOR DISTRIBUTED ARRAY A[N][M] AND B[N][M].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define M 16
-#define NL 1000
-static void wrre2401();
-static void wrre2402();
-static void wrre2403();
-static void wrre2404();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START fwrre24========================\n");
-      wrre2401();
-      wrre2402();
-      wrre2403();
-      wrre2404();
-
-      printf("=== END OF fwrre24 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------wrre2401  */
-      void wrre2401()
-{
-
-
-      char tname[]="FWRITE_FREAD_2401";
-      int i,j,nloopi,nloopj,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][block]          
-      int A[N][M];
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE01", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01\n");
-     exit(1);
-     }
-
-     if (fwrite(A, sizeof(int), N*M, fp)!=N*M)
-     printf("ERROR WRITING FILE ARWRRE01\n");
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE01", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE01 \n");
-     exit(1);
-     }
-//     rewind(fp);
-     if (fread(B, sizeof(int), N*M, fp)!=N*M)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-     remove("ARWRRE01");
-                    
-     #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi),min(nloopj))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-/* ---------------------------------------------wrre2402  */
-      void wrre2402()
-{
-
-
-      char tname[]="FWRITE_FREAD_2402";
-      int i,j,nloopi,nloopj,ni,nb,na,K;
-      FILE *fp;
-                
-      int A[N][M];
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-        }
-
-     if((fp=fopen("ARWRRE02_%04d", "wbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N*M, fp);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE02_%04d", "rbl"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE02_%%04d\n");
-     exit(1);
-     }
-     K=fread(B, sizeof(int), N*M, fp);
-     fclose(fp);
-     dvmh_remove_local("ARWRRE02_%04d");
-                    
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-/* ---------------------------------------------wrre2403  */
-      void wrre2403()
-{
-
-
-      char tname[]="FWRITE_FREAD_2403";
-      int i,j,nloopi,nloopj,ni,nb,na,K;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block][block]          
-      int A[N][M];
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on A[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-        {  A[i][j] = NL+i+j;
-           B[i][j]=777;
-
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE03", "wbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE03\n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N*M, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE03", "rbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE03\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N*M, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     remove("ARWRRE03");
-                    
-    #pragma dvm parallel ([i][j] on A[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (A[i][j] !=B[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-/* ---------------------------------------------wrre2404  */
-      void wrre2404()
-{
-
-
-      char tname[]="FWRITE_FREAD_2404";
-      int i,j,nloopi,nloopj,ni,nb,na,K;
-      FILE *fp;
-                
-      int A[N][M];
-      #pragma dvm array distribute[block][block]          
-      int B[N][M];
-
-
-
-      nloopi=NL;
-      nloopj=NL;
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i][j] on B[i][j])
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-           B[i][j]=777;
-
-      } /*end region*/ 
-      for (i=0;i<=N-1;i++)
-          for(j=0;j<=M-1;j++)
-          A[i][j]=NL+i+j; 
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARWRRE04", "wbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE04 \n");
-     exit(1);
-     }
-
-     K=fwrite(A, sizeof(int), N*M, fp);
-//     printf("NUMBER=%d\n",K);
-     fclose(fp);
-     
-     if ((fp=fopen("ARWRRE04", "rbp"))==NULL) {
-     printf("ERROR OPENING FILE ARWRRE04\n");
-     exit(1);
-     }
-//     rewind(fp);
-     K=fread(B, sizeof(int), N*M, fp);
-//     printf("NUMBER1=%d\n",K);
-     fclose(fp);
-     remove("ARWRRE04");
-                    
-    #pragma dvm parallel ([i][j] on B[i][j])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          for (j=0;j<=M-1;j++)
-              if (B[i][j] !=A[i][j]) 
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/remove11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/remove11.cdv
deleted file mode 100644
index 63a7c58..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/remove11.cdv
+++ /dev/null
@@ -1,85 +0,0 @@
-
-/*      TESTING OF THE function remove        
-        FOR FILEs.  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define NL 1000
-static void remove1101();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START REMOVE11========================\n");
-      remove1101();
-
-      printf("=== END OF TREMOVE11 ========================= \n");
-      return 0;
-}
-/* -------------------------------------------------remove1101  */
-      void remove1101()
-{
-
-
-      char tname[]="REMOVE_1101";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-           B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARREMOVE_1101", "wl"))==NULL) {
-     printf("ERROR OPENING FILE ARREMOVE_1101 \n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++) {
-       #pragma dvm remote_access(A[i])
-        {  
-         na=A[i];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-     fclose(fp);
-     if (remove("ARREMOVE_1101"))
-        ansno(tname);
-    else
-        ansyes(tname);
-
-      return ;
-
-   
-}
-      
-
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/rename11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/rename11.cdv
deleted file mode 100644
index a2d8a04..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/rename11.cdv
+++ /dev/null
@@ -1,182 +0,0 @@
-
-/*      TESTING OF THE function rename       
-        FOR DISTRIBUTED ARRAY A[N].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define NL 1000
-static void rename1101();
-static void rename1102();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-      printf("===START TRENAME11============================ \n");
-      rename1101();
-      rename1102();
-      printf("=== END OF TRENAME11 ========================= \n");
-      return 0;
-}
-/* ---------------------------------------------rename1101  */
-      void rename1101()
-{
-
-
-      char tname[]="RENAME_1101";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-           B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARRENAMEA", "wb"))==NULL) {
-     printf("ERROR OPENING FILE ARRENAMEA\n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++) {
-       #pragma dvm remote_access(A[i])
-        {  
-         na=A[i];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-     fclose(fp);
-     if(rename("ARRENAMEA", "ARRENAMEB") != 0)
-     printf("ERROR WHEN RENAMING =>,ARRENAMEA,ARRENAMEB\n");
-     if ((fp=fopen("ARRENAMEB", "rb"))==NULL) {
-     printf("ERROR OPENING FILE ARRENAMEB \n");
-     exit(1);
-     }
-//     rewind(fp);
-       
-      for (i=0;i<=N-1;i++)
-      {
-      ni=fscanf(fp, "%d ",&nb);
-      B[i]=nb;
-      }      
-     fclose(fp);
-     remove("ARRENAMEB");                
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-/* -------------------------------------------------rename1102  */
-      void rename1102()
-{
-
-
-      char tname[]="RENAME_1102";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-      #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-          B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=fopen("ARRENAMEA2_%04d.txt", "wl"))==NULL) {
-     printf("ERROR OPENING FILE ARRENAMEA2.txt \n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++) {
-       #pragma dvm remote_access(A[i])
-        {  
-         na=A[i];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-     fclose(fp);
-
-     if (dvmh_rename_local("ARRENAMEA2_%04d.txt", "ARRENAMEB2_%04d.txt") !=0)
-     printf("ERROR WHEN RENAMING =>,ARRENAMEA2,ARRENAMEB2\n");
-     
-     if ((fp=fopen("ARRENAMEB2_%04d.txt", "rl"))==NULL) {
-     printf("ERROR OPENING FILE ARRENAMEB2.txt \n");
-     exit(1);
-     }
-//     rewind(fp);
-       
-      for (i=0;i<=N-1;i++)
-      {
-      ni=fscanf(fp, "%d ",&nb);
-      B[i]=nb;
-      }      
-     fclose(fp);
-     dvmh_remove_local("ARRENAMEB2_%04d.txt");
-               
-     #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/tmpfile11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/tmpfile11.cdv
deleted file mode 100644
index d4eb193..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/IO/tmpfile11.cdv
+++ /dev/null
@@ -1,225 +0,0 @@
-
-/*      TESTING OF THE function tmpfile        
-        FOR DISTRIBUTED ARRAY A[N].  
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-#define N 8
-#define NL 1000
-
-static void tmpfile1101();
-static void tmpfile1102();
-static void tmpfile1103();
-
-static void ansyes(char tname[]);
-static void ansno(char tname[]);
-
-int main(int argc, char *argv[])
-{
-   printf("===START TMPFILE11========================\n");
-      tmpfile1101();
-      tmpfile1102();
-      tmpfile1103();
-
-      printf("=== END OF TMPFILE11 ========================= \n");
-      return 0;
-}
-/* -------------------------------------------------tmpfile1101  */
-      void tmpfile1101()
-{
-
-
-      char tname[]="TMPFILE_1101";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-    #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-           B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=tmpfile())==NULL) {
-     printf("ERROR OPENING TMPFILE01 \n");
-     exit(1);
-     }
-        for (i=0;i<=N-1;i++) {
-       #pragma dvm remote_access(A[i])
-        {  
-         na=A[i];
-        }   
-        ni=fprintf(fp, "%d ", na);  
-        }
-      rewind(fp); 
-      for (i=0;i<=N-1;i++)
-      {
-      ni=fscanf(fp, "%d ",&nb);
-      B[i]=nb;
-      }      
-     fclose(fp);
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-
-   
-/* ---------------------------------------------tmpfile1102  */
-      void tmpfile1102()
-{
-
-
-      char tname[]="TMPFILE_1102";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-      #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-          B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-     if((fp=tmpfile())==NULL) {
-     printf("ERROR OPENING TMPFILE02 \n");
-     exit(1);
-     }
-
-     if (fwrite(A, sizeof(int), N, fp)!=N)
-     printf("ERROR WRITING FILE TMPFILE02\n");
-     rewind(fp);
-     
-     if (fread(B, sizeof(int), N, fp)!=N)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-/* ---------------------------------------------tmpfile1103  */
-      void tmpfile1103()
-{
-
-
-      char tname[]="TMPFILE_1103";
-      int i,nloopi,ni,nb,na;
-      FILE *fp;
-                
-      #pragma dvm array distribute[block]          
-      int A[N];
-      #pragma dvm array align ([i] with A[i])
-      int B[N];
-
-
-
-      nloopi=NL;
-
-      #pragma dvm region out(A,B) 
-      {
-      #pragma dvm parallel ([i] on A[i])
-      for (i=0;i<=N-1;i++)
-        {  A[i] = NL+i;
-          B[i]=777;
-        }
-      } /*end region*/  
-
-      #pragma dvm get_actual(A,B) 
-
-      fp=dvmh_tmpfile_local();
-
-     if (fwrite(A, sizeof(int), N, fp)!=N)
-     printf("ERROR WRITING FILE TMPFILE02\n");
-     rewind(fp);
-     
-     if (fread(B, sizeof(int), N, fp)!=N)
-        {
-        if(feof(fp)) printf("PREMATURE END OF FILE ARWRRE01");
-        else printf("ERROR READING FILE ARWRRE01\n");
-  }
-     fclose(fp);
-                    
-    #pragma dvm parallel ([i] on A[i])  reduction(min(nloopi))
-      for (i=0;i<=N-1;i++)
-          {
-              if (A[i] !=B[i]) 
-                if (nloopi > i) nloopi = i;
-          }
-//    printf ("nloopi=%d\n", nloopi);
-    if (nloopi == NL )
-        ansyes(tname);
-    else
-        ansno(tname);
-
-      return ;
-
-   
-}
-      
-
-void ansyes(char name[])
-{
-      printf ("%s  -  complete\n",name);
-    return ;
-}
-      void ansno(char name[])
-{
-     printf("%s  -  ***error\n",name);
-      return ;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal11.cdv
deleted file mode 100644
index 2423c50..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal11.cdv
+++ /dev/null
@@ -1,285 +0,0 @@
-/*      TESTING OF THE OWN CALCULASHION
-        FOR DISTRIBUTED ARRAY A[N].
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define N 32
-#define NL 1000
-
-static void owncal1101();
-static void owncal1102();
-static void owncal1103();
-static void owncal1104();
-static void owncal1105();
-static void owncal1106();
-
-static void serial(int AR[], int NN, int NNL);
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int argc, char *argv[])
-{
-    printf("===START OF OWNCAL11========================\n");
-    owncal1101();
-    owncal1102();
-    owncal1103();
-    owncal1104();
-    owncal1105();
-    owncal1106();
-
-    printf("=== END OF OWNCAL11 ========================= \n");
-    return 0;
-}
-/* ---------------------------------------------OWNCAL1101  */
-void owncal1101()
-{
-    int C[N];
-    char tname[] = "OWN1101";
-    int i, NN, NNL, nloopi;
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    NN = N;
-    NNL = NL;
-
-    serial(C, NN, NNL);
-
-    nloopi = NL;
-
-    #pragma dvm region out(A)
-    {
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloopi))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            if (nloopi > i) nloopi = i;
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL1102  */
-void owncal1102()
-{
-    int C[N];
-    char tname[] = "OWN1102";
-    int i, NN, NNL, nloopi;
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    NN = N;
-    NNL = NL;
-
-    serial(C, NN, NNL);
-    C[0] = N + NL + 2;
-
-    nloopi = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    A[0]=N+NL+2;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloopi))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            if (nloopi > i) nloopi = i;
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL1103  */
-void owncal1103()
-{
-    int C[N];
-    char tname[] = "OWN1103";
-    int i, NN, NNL, nloopi, ni;
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    NN = N;
-    NNL = NL;
-
-    serial(C, NN, NNL);
-    ni = N / 2;
-    C[ni] = N + NL + 3;
-
-    nloopi = NL;
-    #pragma dvm actual(ni)
-
-    #pragma dvm region out(A), in(ni)
-    {
-    #pragma dvm parallel([i] on A[i])
-      for (i = 0; i < N; i++)
-          A[i] = NL + i;
-
-    A[ni] = N + NL + 3;
-
-    } /*end region*/
-
-      #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloopi))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            if (nloopi > i) nloopi = i;
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL1104  */
-void owncal1104()
-{
-    int C[N];
-    char tname[] = "OWN1104";
-    int i, NN, NNL, nloopi, ni;
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    NN = N;
-    NNL = NL;
-
-    serial(C, NN, NNL);
-    ni = N / 2;
-    C[ni+1] = N + NL + 4;
-
-    nloopi = NL;
-
-    #pragma dvm region out(A), in(ni)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    A[ni + 1] = N + NL + 4;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloopi))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            if (nloopi > i) nloopi = i;
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL1105  */
-void owncal1105()
-{
-    int C[N];
-    char tname[] = "OWN1105";
-    int i, NN, NNL, nloopi, ni;
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    NN = N;
-    NNL = NL;
-
-    serial(C, NN, NNL);
-    ni = N / 2;
-    C[ni - 1] = -(N + NL + 5);
-
-    nloopi = NL;
-
-    #pragma dvm region out(A), in(ni)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    A[ni - 1] = -(N + NL + 5);
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloopi))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            if (nloopi > i) nloopi = i;
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL1106  */
-void owncal1106()
-{
-    int C[N];
-    char tname[] = "OWN1106";
-    int i, NN, NNL, nloopi, ni;
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    NN = N;
-    NNL = NL;
-
-    serial(C, NN, NNL);
-    C[N - 1] = N + NL + 6;
-
-    nloopi = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    A[N - 1] = N + NL + 1;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i] on A[i]) reduction(min(nloopi))
-    for (i = 1; i < N - 1; i++)
-        if (A[i] != C[i])
-            if (nloopi > i) nloopi = i;
-    if (nloopi == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-void serial(int AR[], int NN, int NNL)
-{
-    int i;
-    for (i = 0; i < NN; i++)
-        AR[i] = NNL+i;
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal21.cdv
deleted file mode 100644
index 81acf87..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal21.cdv
+++ /dev/null
@@ -1,520 +0,0 @@
-/*      TESTING OF THE OWN CALCULASHION
-        FOR DISTRIBUTED ARRAY A[N][M].
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define N 32
-#define M 32
-#define NL 1000
-
-static void owncal2101();
-static void owncal2102();
-static void owncal2103();
-static void owncal2104();
-static void owncal2105();
-static void owncal2106();
-static void owncal2107();
-static void owncal2108();
-static void owncal2109();
-static void owncal2110();
-
-static void serial2(int AR[][M], int NN, int NM, int NNL);
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int argc, char *argv[])
-{
-    printf("===START OF OWNCAL21========================\n");
-    owncal2101();
-    owncal2102();
-    owncal2103();
-    owncal2104();
-    owncal2105();
-    owncal2106();
-    owncal2107();
-    owncal2108();
-    owncal2109();
-    owncal2110();
-
-    printf("=== END OF OWNCAL21 ========================= \n");
-    return 0;
-}
-/* ---------------------------------------------OWNCAL2101  */
-void owncal2101()
-{
-    int C[N][M];
-    char tname[] = "OWN2101";
-    int i, j, NN, NM, NNL, nloopi, nloopj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region out(A)
-    {
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL2102  */
-void owncal2102()
-{
-    int C[N][M];
-    char tname[] = "OWN2102";
-    int i, j, NN, NM, NNL, nloopi, nloopj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-    C[0][0] = N + M + NL + 1;
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[0][0] = N + M + NL + 1;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL2103  */
-void owncal2103()
-{
-    int C[N][M];
-    char tname[] = "OWN2103";
-    int i, j, NN, NM, NNL, nloopi, nloopj, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    C[ni][nj] = N + M + NL + 1;
-
-    nloopi = NL;
-    nloopj = NL;
-    #pragma dvm actual(ni,nj)
-
-    #pragma dvm region out(A), in(ni, nj)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[ni][nj] = N + M + NL + 1;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL2104  */
-void owncal2104()
-{
-    int  C[N][M];
-    char tname[] = "OWN2104";
-    int i, j, NN, NM, NNL, nloopi, nloopj, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    C[ni + 1][nj + 1] = N + M + NL + 1;
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region out(A), in(ni, nj)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[ni + 1][nj + 1] = N + M + NL + 1;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL2105  */
-void owncal2105()
-{
-    int C[N][M];
-    char tname[] = "OWN2105";
-    int i, j, NN, NM, NNL, nloopi, nloopj, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-    ni = N / 2;
-    nj = M / 2 ;
-    C[ni - 1][nj - 1] = -(N + M + NL + 1);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region out(A), in(ni, nj)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[ni - 1][nj - 1] = -(N + M + NL + 1);
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL2106  */
-void owncal2106()
-{
-    int C[N][M];
-    char tname[] = "OWN2106";
-    int i, j, NN, NM, NNL, nloopi, nloopj, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-    ni = N / 2;
-    nj = M / 2 ;
-    C[ni + 1][nj - 1] = N + M + NL + 1;
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region out(A), in(ni, nj)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[ni + 1][nj - 1] = N + M + NL + 1;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL2107  */
-void owncal2107()
-{
-    int C[N][M];
-    char tname[] = "OWN2107";
-    int i, j, NN, NM, NNL, nloopi, nloopj, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-    ni = N / 2;
-    nj = M / 2 ;
-    C[ni - 1][nj + 1] = N + M + NL + 1;
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region out(A), in(ni, nj)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[ni - 1][nj + 1] = N + M + NL + 1;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL2108  */
-void owncal2108()
-{
-    int C[N][M];
-    char tname[] = "OWN2108";
-    int i, j, NN, NM, NNL, nloopi, nloopj, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-
-    C[0][M - 1] = N + M + NL + 1;
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[0][M - 1] = N + M + NL + 1;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL2109  */
-      void owncal2109()
-{
-    int C[N][M];
-    char tname[] = "OWN2109";
-    int i, j, NN, NM, NNL, nloopi, nloopj, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-    C[N - 1][0] = N + M + NL + 1;
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[N - 1][0] = N + M + NL + 1;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL2110  */
-void owncal2110()
-{
-    int C[N][M];
-    char tname[] = "OWN2110";
-    int i, j, NN, NM, NNL, nloopi, nloopj, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    serial2(C, NN, NM, NNL);
-    nj = M / 2;
-    C[0][nj + 1] = N + M + NL + 1;
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region out(A), in(nj)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[0][nj + 1] = N + M + NL + 1;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (A[i][j] != C[i][j]) {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-void serial2(int AR[][M], int NN, int NM, int NNL)
-{
-    int i, j;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            AR[i][j] = NNL + i + j;
-}
-
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal31.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal31.cdv
deleted file mode 100644
index 5adef10..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal31.cdv
+++ /dev/null
@@ -1,611 +0,0 @@
-/*      TESTING OF THE OWN CALCULASHION
-        FOR DISTRIBUTED ARRAY A[N][M].
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define N 32
-#define M 32
-#define K 32
-#define NL 1000
-
-static void owncal3101();
-static void owncal3102();
-static void owncal3103();
-static void owncal3104();
-static void owncal3105();
-static void owncal3106();
-static void owncal3107();
-static void owncal3108();
-static void owncal3109();
-static void owncal3110();
-
-static void serial3(int AR[][M][K], int NN, int NM, int NK, int NNL);
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int argc, char *argv[])
-{
-    printf("===START OF OWNCAL31========================\n");
-    owncal3101();
-    owncal3102();
-    owncal3103();
-    owncal3104();
-    owncal3105();
-    owncal3106();
-    owncal3107();
-    owncal3108();
-    owncal3109();
-    owncal3110();
-
-    printf("=== END OF OWNCAL31 ========================= \n");
-    return 0;
-}
-/* ---------------------------------------------OWNCAL3101  */
-void owncal3101()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3101";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region out(A)
-    {
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------OWNCAL3102  */
-void owncal3102()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3102";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-    C[0][0][0] = N + M + K + NL + 2;
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    A[0][0][0] = N + M + K + NL + 2;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL3103  */
-void owncal3103()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3103";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-    int ni, nj, nii;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-
-    C[ni][nj][nii] = N + M + K + NL + 3;
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm actual(ni, nj, nii)
-
-    #pragma dvm region out(A), in(ni, nj, nii)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    A[ni][nj][nii] = N + M + K + NL + 3;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------OWNCAL3104  */
-void owncal3104()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3104";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-    int ni, nj, nii;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-
-    C[ni + 1][nj + 1][nii + 1] = N + M + K + NL + 4;
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm actual(ni, nj, nii)
-
-    #pragma dvm region out(A), in(ni, nj, nii)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    A[ni + 1][nj + 1][nii + 1] = N + M + K + NL + 4;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-
-/* ---------------------------------------------OWNCAL3105  */
-void owncal3105()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3105";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-    int ni, nj, nii;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-
-    C[ni - 1][nj - 1][nii - 1] = -(N + M + K + NL + 5);
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm actual(ni, nj, nii)
-
-    #pragma dvm region out(A), in(ni, nj, nii)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    A[ni - 1][nj - 1][nii - 1] = -(N + M + K + NL + 5);
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL3106  */
-void owncal3106()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3106";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-    int ni, nj, nii;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-
-    C[ni + 1][nj - 1][nii + 1] = N + M + K + NL + 6;
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm actual(ni, nj, nii)
-
-    #pragma dvm region out(A), in(ni, nj, nii)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    A[ni + 1][nj - 1][nii + 1] = N + M + K + NL + 6;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-
-/* ---------------------------------------------OWNCAL3107  */
-void owncal3107()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3107";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-    int ni, nj, nii;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-
-    C[ni - 1][nj + 1][nii - 1] = N + M + K + NL + 7;
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm actual(ni, nj, nii)
-
-    #pragma dvm region out(A), in(ni, nj, nii)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    A[ni - 1][nj + 1][nii - 1] = N + M + K + NL + 7;
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL3108  */
-void owncal3108()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3108";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-
-    C[0][M - 1][K - 1] = N + M + K + NL + 8;
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    A[0][M - 1][K - 1] = N + M + K + NL + 8;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-
-/* ---------------------------------------------OWNCAL3109  */
-void owncal3109()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3109";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-
-    C[N - 1][M - 1][0] = N + M + K + NL + 9;
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    A[N - 1][M - 1][0] = N + M + K + NL + 9;
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------OWNCAL3110  */
-void owncal3110()
-{
-    int C[N][M][K];
-    char tname[] = "OWN3110";
-    int i, j, ii, NN, NM, NK, NNL, nloopi, nloopj, nloopii;
-    int nj;
-
-    #pragma dvm array distribute[block][block][block]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-
-    serial3(C, NN, NM, NK, NNL);
-
-    nj = M / 2;
-    C[0][nj + 1][K - 1] = N + M + K + NL + 10;
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm actual(nj)
-    #pragma dvm region out(A), in(nj)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                A[i][j][ii] = NL + i + j + ii;
-
-    A[0][nj + 1][K - 1] = N + M + K + NL + 10;
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (A[i][j][ii] != C[i][j][ii]) {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-
-void serial3(int AR[][M][K], int NN, int NM, int NK, int NNL)
-{
-    int i,j,ii;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            for (ii = 0; ii < NK; ii++)
-                AR[i][j][ii] = NNL + i + j + ii;
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal41.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal41.cdv
deleted file mode 100644
index d5232a6..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/owncal41.cdv
+++ /dev/null
@@ -1,656 +0,0 @@
-/*      TESTING OF THE OWN CALCULASHION
-        FOR DISTRIBUTED ARRAY A[N][M][K][L].
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define N 32
-#define M 32
-#define K 32
-#define L 32
-#define NL 1000
-
-static void owncal4101();
-static void owncal4102();
-static void owncal4103();
-static void owncal4104();
-static void owncal4105();
-static void owncal4106();
-static void owncal4107();
-static void owncal4108();
-static void owncal4109();
-static void owncal4110();
-
-static void serial4(int AR[][M][K][L], int NN, int NM, int NK, int NLL, int NNL);
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int argc, char *argv[])
-{
-    printf("===START OF OWNCAL41========================\n");
-    owncal4101();
-    owncal4102();
-    owncal4103();
-    owncal4104();
-    owncal4105();
-    owncal4106();
-    owncal4107();
-    owncal4108();
-    owncal4109();
-    owncal4110();
-
-    printf("=== END OF OWNCAL41 ========================= \n");
-    return 0;
-}
-/* ---------------------------------------------OWNCAL4101  */
-void owncal4101()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4101";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region out(A)
-    {
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------OWNCAL4102  */
-void owncal4102()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4102";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-    C[0][0][0][0] = N + M + K + L + NL + 2;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    A[0][0][0][0] = N + M + K + L + NL + 2;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------OWNCAL4103  */
-void owncal4103()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4103";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-    int ni, nj, nii, njj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-    njj = L / 2;
-
-    C[ni][nj][nii][njj] = N + M + K + L + NL + 3;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm actual(ni, nj, nii, njj)
-    #pragma dvm region out(A), in(ni, nj, nii, njj)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    A[ni][nj][nii][njj] = N + M + K + L + NL + 3;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------OWNCAL4104  */
-void owncal4104()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4104";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-    int ni, nj, nii, njj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-    njj = L / 2;
-
-    C[ni + 1][nj + 1][nii + 1][njj + 1] = N + M + K + L + NL + 4;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm actual(ni, nj, nii, njj)
-    #pragma dvm region out(A), in(ni, nj, nii, njj)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    A[ni + 1][nj + 1][nii + 1][njj + 1] = N + M + K + L + NL + 4;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-
-/* ---------------------------------------------OWNCAL4105  */
-void owncal4105()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4105";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-    int ni, nj, nii, njj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-    njj = L / 2;
-
-    C[ni - 1][nj - 1][nii - 1][njj - 1] = -(N + M + K + L + NL + 5);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm actual(ni, nj, nii, njj)
-    #pragma dvm region out(A), in(ni, nj, nii, njj)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    A[ni - 1][nj - 1][nii - 1][njj - 1] = -(N + M + K + L + NL + 5);
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------OWNCAL4106  */
-void owncal4106()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4106";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-    int ni, nj, nii, njj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-    njj = L / 2;
-
-    C[ni - 1][nj + 1][nii - 1][njj + 1] = N + M + K + L + NL + 6;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm actual(ni, nj, nii, njj)
-    #pragma dvm region out(A), in(ni, nj, nii, njj)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    A[ni - 1][nj + 1][nii - 1][njj + 1] = N + M + K + L + NL + 6;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL4107  */
-void owncal4107()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4107";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-    int ni, nj, nii, njj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-    ni = N / 2;
-    nj = M / 2;
-    nii = K / 2;
-    njj = L / 2;
-
-    C[ni + 1][nj - 1][nii + 1][njj - 1] = N + M + K + L + NL + 7;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm actual(ni, nj, nii, njj)
-    #pragma dvm region out(A), in(ni, nj, nii, njj)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    A[ni + 1][nj - 1][nii + 1][njj - 1] = N + M + K + L + NL + 7;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL4108  */
-void owncal4108()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4108";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-
-    C[0][M - 1][0][L - 1] = N + M + K + L + NL + 8;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    A[0][M - 1][0][L - 1] = N + M + K + L + NL + 8;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL4109  */
-void owncal4109()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4109";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-
-    C[N - 1][0][K - 1][0] = N + M + K + L + NL + 9;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    A[N][0][K - 1][0] = N + M + K + L + NL + 9;
-
-    } /*end region*/
-
-      #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------OWNCAL4110  */
-void owncal4110()
-{
-    int C[N][M][K][L];
-    char tname[] = "OWN4110";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    int nloopi, nloopj, nloopii, nloopjj;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A[N][M][K][L];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NLL = L;
-    NNL = NL;
-
-    serial4(C, NN, NM, NK, NLL, NNL);
-
-    C[0][0][K - 1][L - 1] = N + M + K + L + NL + 10;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    A[0][0][K - 1][L - 1] = N + M + K + L + NL + 10;
-
-    } /*end region*/
-
-    #pragma dvm get_actual(A)
-
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (A[i][j][ii][jj] != C[i][j][ii][jj]) {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-void serial4(int AR[][M][K][L], int NN, int NM, int NK, int NLL, int NNL)
-{
-    int i, j, ii, jj;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            for (ii = 0; ii < NK; ii++)
-                for (jj = 0; jj < NLL; jj++)
-                    AR[i][j][ii][jj] = NNL + i + j + ii + jj;
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/settings
deleted file mode 100644
index 3ef2d72..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/OWNCALC/settings
+++ /dev/null
@@ -1 +0,0 @@
-DVM_ONLY=1
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel1.cdv
deleted file mode 100644
index f23c9b1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel1.cdv
+++ /dev/null
@@ -1,340 +0,0 @@
-/* PARALLEL1
-Testing PARALLEL directive */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void parallel11();
-static void parallel12();
-static void parallel13();
-static void parallel131();
-static void parallel14();
-static void parallel15();
-
-
-static void ansyes(const char tname[]);
-static void ansno (const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-
-static int erri, i, j, ia;
-
-int main(int an, char **as)
-{
-    printf("=== START OF PARALLEL1 ===================\n");
-
-    /* arrA1[BLOCK] PARALLEL ON arrA[i+4] normal */
-    parallel11();
-    /* arrA1[BLOCK] PARALLEL ON arrA[-i+8] reverse */
-//  parallel12();
-    /* arrA1[BLOCK] PARALLEL ON arrA[2*i+8] stretch */
-    parallel13();
-    /* arrA1[BLOCK] PARALLEL ON arrA[2*i+1] small array */
-    parallel131();
-    /* arrA1[BLOCK] PARALLEL ON arrA[] */
-    parallel14();
-    /* arrA1[BLOCK] PARALLEL ON arrA[2] */
-    parallel15();
-
-    printf ("=== END OF PARALLEL1 ===================\n");
-    return 0;
-}
-/* ---------------------------------------------parallel11 */
-    /* arrA1[BLOCK]  PARALLEL ON arrA[i+4] normal */
-void parallel11()
-{
-    #define AN1 8
-
-/*  parameters for PARALLEL arrA1[k1i * i + li] */
-    int k1i = 1;
-    int li = 4;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    char tname[] = "paral11 ";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region local(A1)
-    {
-    #pragma dvm parallel([i] on A1[i])
-    for (i = 0; i < AN1; i++)
-        A1[i] = i;
-
-    #pragma dvm parallel([i] on A1[k1i * i + li]) private(ia), reduction(min(erri))
-    for (i = 0; i < ((AN1-li)/k1i); i++)
-    {
-        ia = k1i * i + li;
-        if (A1[ia] != ia)
-              erri = Min(erri, i);
-    }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-}
-
-/* ---------------------------------------------parallel12 */
-    /* arrA1[BLOCK]  PARALLEL ON arrA[-i+8]  reverse */
-void parallel12()
-{
-    #define AN1 7
-
-/*  parameters for PARALLEL arrA1[k1i * i + li] */
-    int k1i = -1;
-    int li = 8;
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    char tname[] = "paral12 ";
-
-    A1 = (int*)malloc(AN1*sizeof(int));
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A1[i])
-    for (i = 0; i < AN1; i++)
-        A1[i] = i * 2;
-
-    #pragma dvm parallel([i] on A1[k1i * i + li]) private(ia), reduction(min(erri))
-    for (i = 0; i < ((AN1-li)/k1i); i++)
-    {
-        ia = k1i * i + li;
-        if (A1[ia] != (ia*2))
-              erri = Min(erri, i);
-    }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free (A1);
-
-    #undef AN1
-}
-
-/* ---------------------------------------------parallel13 */
-    /* arrA1[BLOCK]  PARALLEL ON arrA[2*i+8] stretch */
-void parallel13()
-{
-    #define AN1 20
-
-/*  parameters for PARALLEL arrA1[k1i * i + li]*/
-    int k1i = 2;
-    int li = 8;
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    char tname[] = "paral13 ";
-
-    A1 = (int*)malloc(sizeof(int[AN1]));
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A1[i])
-    for (i = 0; i < AN1; i++)
-        A1[i] = i + 5;
-
-    #pragma dvm parallel([i] on A1[k1i * i + li]) private(ia), reduction(min(erri))
-    for (i = 0; i < ((AN1-li)/k1i); i++)
-    {
-        ia = k1i * i + li;
-        if (A1[ia] != (ia + 5))
-              erri = Min(erri, i);
-    }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A1);
-    #undef AN1
-}
-
-/* ---------------------------------------------parallel131 */
-    /* arrA1[BLOCK]  PARALLEL ON arrA[2*i+1] small array */
-void parallel131()
-{
-    #define AN1 5
-
-/*  parameters for PARALLEL arrA1[k1i * i + li] */
-    int k1i = 2;
-    int li = 1;
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    char tname[] = "paral131";
-
-    A1 = (int*)malloc(AN1*sizeof(int));
-
-    erri = ER;
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A1[i])
-    for (i = 0; i < AN1; i++)
-        A1[i] = i;
-    } /* end region */
-
-    #pragma dvm actual(erri)
-
-    #pragma dvm region local(A1)
-    {
-    #pragma dvm parallel([i] on A1[k1i * i + li]) private(ia), reduction(min(erri))
-    for (i = 0; i < ((AN1-li)/k1i); i++)
-    {
-        ia=k1i * i + li;
-        if (A1[ia] != ia)
-              erri = Min(erri, i);
-    }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free (A1);
-
-    #undef AN1
-}
-
-/* ---------------------------------------------parallel14 */
-    /* arrA1[BLOCK]  PARALLEL ON arrA[] */
-void parallel14()
-{
-    #define AN1 20
-    #define BN1 10
-
-/*  parameters for PARALLEL arrA1[*] */
-    #define k1i 0
-    #define li 0
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array distribute[*]
-    int *B1;
-
-    char tname[] = "paral14 ";
-
-    A1 = (int*)malloc(AN1*sizeof(int));
-    B1 = (int*)malloc(BN1*sizeof(int));
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region local(A1, B1)
-    {
-    #pragma dvm parallel([i] on A1[i])
-    for (i = 0; i < AN1; i++)
-        A1[i] = i;
-
-    for (i = 0; i < BN1; i++)
-        B1[i] = i;
-
-    #pragma dvm parallel([i] on A1[]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        if (B1[i] != i)
-              erri = Min(erri, i);
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free (A1);
-    free (B1);
-
-    #undef AN1
-    #undef BN1
-    #undef k1i
-    #undef li
-}
-
-/* ---------------------------------------------parallel15 */
-/* arrA1[BLOCK] PARALLEL ON arrA[2] */
-void parallel15()
-{
-    #define AN1 15
-
-/*  parameters for PARALLEL arrA1[li] */
-    #define k1i 0
-    #define li 2
-
-    #pragma dvm array distribute[block]
-    int *A1;
-
-    char tname[] = "paral15 ";
-
-    A1 = (int(*))malloc(AN1*sizeof(int));
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region local(A1)
-    {
-    #pragma dvm parallel([i] on A1[i])
-    for(i = 0; i < AN1; i++)
-        A1[i] = i;
-
-    #pragma dvm parallel ([i] on  A1[li]) reduction(min(erri)), private(ia)
-    for(i = 0; i < AN1; i++) {
-        ia = li;
-        if (A1[ia] != ia)
-           erri = Min(erri, i);
-    }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A1);
-    #undef AN1
-    #undef k1i
-    #undef li
-}
-
-/*-------------------------------------------------------*/
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel2.cdv
deleted file mode 100644
index bf400ef..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel2.cdv
+++ /dev/null
@@ -1,253 +0,0 @@
-/*    PARALLEL2
-Testing PARALLEL directive */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void parallel21();
-static void parallel22();
-static void parallel23();
-static void parallel24();
-
-static void ansyes(const char tname[]);
-static void ansno (const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-
-static int erri,i,j,ia,ja;
-
-int main(int an, char **as)
-{
-    printf("=== START OF PARALLEL2 ===================\n");
-
-    /* PARALLEL ON arrA[i][2*j]  stretching along j */
-    parallel21();
-    /* PARALLEL ON arrA[i+4][j]  shift along i */
-    parallel22();
-    /* PARALLEL ON arrA[-i+8][j] reverse on i */
-//  parallel23();
-    /* PARALLEL ON arrA[i+4][j+4]  shift along i and j */
-    parallel24();
-
-    printf ("=== END OF PARALLEL2 ===================\n");
-
-    return 0;
-}
-
-/* ---------------------------------------------parallel21 */
-    /* PARALLEL ON arrA[i][2*j]  stretching along j */
-void parallel21()
-{
-    #define AN1 8
-    #define AN2 8
-
-/*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    int k1i = 1, li = 0;
-    int k2j = 2, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-
-    char tname[] = "paral21";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region local(A2)
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i*NL+j;
-
-    #pragma dvm parallel([i][j] on A2[k1i*i+li][k2j*j+lj]) private(ia, ja), reduction(min(erri))
-    for (i = 0; i < (AN1-li)/k1i; i++)
-        for (j = 0; j < (AN2-lj)/k2j ; j++)
-        {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                erri = Min(erri, ia * NL + ja);
-        }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------parallel22 */
-    /* PARALLEL ON arrA[i+4][j]  shift along i */
-void parallel22()
-{
-    #define AN1 16
-    #define AN2 10
-
-/*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    int k1i = 1, li = 4;
-    int k2j = 1, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int (*A2)[AN2];
-
-    char tname[] = "paral22";
-
-    A2 = (int(*)[AN2])malloc(AN1*sizeof(int[AN2]));
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j + 2;
-
-    #pragma dvm parallel([i][j] on A2[k1i*i+li][k2j*j+lj]) private(ia, ja), reduction(min(erri))
-    for (i = 0; i < (AN1-li) / k1i; i++)
-        for (j = 0; j < (AN2-lj) / k2j; j++)
-        {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja) + 2)
-                erri = Min(erri, ia * NL + ja);
-        }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free (A2);
-
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------parallel23  */
-    /* PARALLEL ON arrA[-i+8][j] reverse on i*/
-void parallel23()
-{
-    #define AN1 8
-    #define AN2 14
-
-/*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    int k1i = -1, li = 8;
-    int k2j =  1, lj = 0;
-
-    #pragma dvm array distribute[block][block]
-    int (*A2)[AN2];
-
-    char tname[] = "paral23";
-
-    A2 = (int(*)[AN2])malloc(AN1*AN2*sizeof(int));
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region local(A2)
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j - 3;
-
-    #pragma dvm parallel([i][j] on A2[k1i*i+li][k2j*j+lj]) private(ia, ja), reduction(min(erri))
-    for (i = 0; i < (AN1 - li) / k1i; i++)
-        for (j = 0; j < (AN2 - lj) / k2j; j++)
-        {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja) - 3)
-                erri = Min(erri, ia * NL + ja);
-        }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A2);
-    #undef AN1
-    #undef AN2
-}
-
-/* ---------------------------------------------parallel24 */
-    /* PARALLEL ON arrA[i+4][j+4]  shift along i and j */
-void parallel24()
-{
-    #define AN1 16
-    #define AN2 15
-
-/*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    int k1i = 1, li = 4;
-    int k2j = 1, lj = 4;
-
-    #pragma dvm array distribute[block][block]
-    int (*A2)[AN2];
-
-    char tname[] = "paral24";
-
-    A2 = malloc(sizeof(int[AN1][AN2]));
-
-    erri= ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region local(A2)
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j;
-
-    #pragma dvm parallel([i][j] on A2[k1i*i+li][k2j*j+lj]) private(ia, ja), reduction(min(erri))
-    for (i = 0; i < (AN1 - li) / k1i; i++)
-        for (j = 0; j < (AN2 - lj) / k2j ; j++)
-        {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != (ia * NL + ja))
-                erri = Min(erri, ia * NL + ja);
-         }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free (A2);
-
-    #undef AN1
-    #undef AN2
-}
-
-/*-------------------------------------------------------*/
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel3.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel3.cdv
deleted file mode 100644
index 830cbe4..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel3.cdv
+++ /dev/null
@@ -1,518 +0,0 @@
-/*    PARALLEL3
-Testing PARALLEL directive */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void parallel31();
-static void parallel32();
-static void parallel33();
-static void parallel34();
-static void parallel341();
-static void parallel35();
-static void parallel36();
-
-static void ansyes(const char tname[]);
-static void ansno (const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-
-static int erri,i,j,n,l,ia,ja,na,ib,jb,nb;
-
-int main(int an, char **as)
-{
-    printf("=== START OF PARALLEL3 ===================\n");
-    /* PARALLEL ON  arrA[i][2* j][n] stretching */
-    parallel31();
-    /* PARALLEL ON  arrA[i+2][ j][n] shift */
-    parallel32();
-    /* PARALLEL ON  arrA[i][ j][-n+8] reverse */
-//  parallel33();
-    /* PARALLEL ON  arrA[i][ j][2]  compression */
-    parallel34();
-    /* PARALLEL ON  arrA[2*i][3*j][1] stretching and compression */
-    parallel341 ();
-    /* PARALLEL ON  arrA[][j][n]  replication */
-    parallel35();
-    /* PARALLEL ON arrA[1][2*j+1][3] */
-    parallel36();
-
-    printf ("=== END OF PARALLEL3 ===================\n");
-
-    return 0;
-}
-
-/* ---------------------------------------------parallel31 */
-    /* PARALLEL ON arrA[i][2*j][k] stretching */
-void parallel31()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 4
-
-/*  parameters for PARALLEL ON arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    int k1i = 1, li = 0;
-    int k2j = 2, lj = 0;
-    int k3n = 1, ln = 0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-
-    char tname[] = "paral31 ";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region local(A3)
-    {
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-
-    #pragma dvm parallel([i][j][n] on A3[k1i*i+li][k2j*j+lj][k3n*n+ln]) private(ia,ja,na), reduction(min(erri))
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-            {
-                ia = k1i * i + li;
-                ja = k2j * j + lj;
-                na = k3n * n + ln;
-                if (A3[ia][ja][na] != (ia * NL / 10 + ja * NL / 100 + na * NL / 1000))
-                    erri = Min(erri, ia * NL / 10 + ja * NL / 100 + na * NL / 1000);
-            }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-
-/* ---------------------------------------------parallel32 */
-    /* PARALLEL ON arrA[i+2][j][k] shift */
-void parallel32()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-
-/* parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    int k1i = 1, li = 2;
-    int k2j = 1, lj = 0;
-    int k3n = 1, ln = 0;
-
-    #pragma dvm array distribute[block][block][block]
-    int (*A3)[AN2][AN3];
-
-    char tname[] = "paral32 ";
-
-    A3 = (int(*)[AN2][AN3])malloc(AN1*sizeof(int[AN2][AN3]));
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++) {
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + 2;
-            }
-
-    #pragma dvm parallel([i][j][n] on A3[k1i*i+li][k2j*j+lj][k3n*n+ln]) private(ia,ja,na), reduction(min(erri))
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-            {
-                ia = k1i * i + li;
-                ja = k2j * j + lj;
-                na = k3n * n + ln;
-                if (A3[ia][ja][na] != (ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + 2))
-                    erri = Min(erri, ia * NL / 10 + ja * NL / 100 + na * NL / 1000);
-            }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free (A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-/* ---------------------------------------------parallel33 */
-    /* PARALLEL ON  arrA[i][j][-k+8] reverse */
-void parallel33()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 9
-
-/* parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    int k1i =  1, li = 0;
-    int k2j =  1, lj = 0;
-    int k3n = -1, ln = 8;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-
-    char tname[] = "paral33 ";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region inout(A3)
-    {
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL /1000;
-
-    #pragma dvm parallel([i][j][n] on A3[k1i*i+li][k2j*j+lj][k3n*n+ln]) private(ia,ja,na), reduction(min(erri))
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj - 1) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln - 1) / k3n); n++)
-            {
-                ia = k1i * i + li;
-                ja = k2j * j + lj;
-                na = k3n * n + ln;
-                if (A3[ia][ja][na] != (ia * NL / 10 + ja * NL / 100 + na * NL/1000))
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-            }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-}
-/* ---------------------------------------------parallel34 */
-    /* PARALLEL ON  arrA[i][ j][2] compression */
-void parallel34()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-
-/*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln] */
-    #define k1i 1
-    #define li 0
-    #define k2j 1
-    #define lj 0
-    #define k3n 0
-    #define ln 2
-
-    #pragma dvm array distribute[block][block][block]
-    int (*A3)[AN2][AN3];
-    #pragma dvm array     /* deferred aligning */
-    int (*B3)[BN2][BN3];
-
-    char tname[] = "paral34 ";
-
-    A3 = (int(*)[AN2][AN3])malloc(AN1*sizeof(int[AN2][AN3]));
-    B3 = (int(*)[BN2][BN3])malloc(BN1*sizeof(int[BN2][BN3]));
-
-    #pragma dvm realign(B3[i][j][] with A3[k1i*i+li][k2j*j+lj][ln])
-
-    erri = ER;
-
-    #pragma dvm region inout(A3, B3)
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for(i = 0; i < BN1; i++)
-        for(j = 0; j < BN2; j++)
-            for(n = 0; n < BN3; n++) {
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-            }
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for(i = 0; i < AN1; i++)
-        for(j = 0; j < AN2; j++)
-            for(n = 0; n < AN3; n++) {
-                 A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-             }
-    } /*end region*/
-
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel ([i][j][n] on  A3[k1i * i + li][k2j * j + lj][ln]) reduction(min(erri))
-     for(i = 0; i < BN1; i++)
-        for(j = 0; j < BN2; j++)
-            for(n = 0; n < BN3; n++) {
-                if (B3[i][j][n] != i * NL / 10 + j * NL / 100 + n * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-             }
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-         ansyes(tname);
-    else
-        ansno(tname);
-
-    free (B3);
-    free (A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef k1i
-    #undef li
-    #undef k2j
-    #undef lj
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel341 */
-    /* PARALLEL ON arrA[2*i][3*j][1]  stretching and compression */
-void parallel341()
-{
-    #define AN1 8
-    #define AN2 10
-    #define AN3 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-
-/* parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln] */
-    int k1i = 2, li = 0;
-    int k2j = 3, lj = 0;
-    int k3n = 0, ln = 1;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-
-    #pragma dvm array align([i][j][] with A3[k1i*i+li][k2j*j+lj][ln])
-    int B3[BN1][BN2][BN3];
-
-    char tname[] = "paral341";
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region local(A3, B3)
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + 4;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-
-    #pragma dvm parallel([i][j][n] on A3[k1i*i+li][k2j*j+lj][ln]) reduction(min(erri))
-    for (i = 0; i <BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                if (B3[i][j][n] != (i * NL / 10 + j * NL / 100 + n * NL / 1000 + 4))
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-/* ---------------------------------------------parallel35 */
-               /* PARALLEL ON arrA[][j][k] */
-void parallel35()
-{
-    #define AN1 10
-    #define AN2 12
-    #define AN3 16
-    #define BN1 6
-    #define BN2 5
-    #define BN3 4
-
-/* parameters for PARALLEL ON arrA[*][k2j*j+lj][k3n*n+ln] */
-    int k1i = 0, li = 0;
-    int k2j = 1, lj = 0;
-    int k3n = 1, ln = 0;
-
-    #pragma dvm array distribute[block][block][block]
-    int (*A3)[AN2][AN3];
-    #pragma dvm array   /* deferred aligning */
-    int (*B3)[BN2][BN3];
-
-    char tname[] = "paral35 ";
-
-    A3 = (int(*)[AN2][AN3])malloc(AN1*sizeof(int[AN2][AN3]));
-    B3 = (int(*)[BN2][BN3])malloc(BN1*sizeof(int[BN2][BN3]));
-
-    #pragma dvm realign(B3[][j][n] with A3[][k2j*j+lj][k3n*n+ln])
-
-    erri = ER;
-
-    #pragma dvm region in(A3, B3), out(A3, B3)
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + 5;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + 7;
-    } /* end region */
-
-    #pragma dvm actual(erri)
-
-    for (i = 0; i < BN1; i++)
-    {
-        #pragma dvm region
-        {
-        #pragma dvm parallel([j][n] on A3[][k2j*j+lj][k3n*n+ln]) reduction(min(erri))
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                if (B3[i][j][n] != (i * NL / 10 + j * NL / 100 + n * NL / 1000 + 5))
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-        } /* end region */
-    }
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free (B3);
-    free (A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-/* ---------------------------------------------parallel36 */
-               /* PARALLEL ON arrA[1][2*j+1][3] */
-void parallel36()
-{
-    #define AN1 6
-    #define AN2 8
-    #define AN3 7
-    #define BN1 4
-    #define BN2 3
-    #define BN3 5
-
-/* parameters for PARALLEL ON arrA[li][k2j*j+lj][ln] */
-    int k1i = 0, li = 1;
-    int k2j = 2, lj = 1;
-    int k3n = 0, ln = 3;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-
-    #pragma dvm array   /* deferred  aligning */
-    int (*B3)[BN2][BN3];
-
-    char tname[] = "paral36 ";
-
-    B3 = (int(*)[BN2][BN3])malloc(BN1*sizeof(int[BN2][BN3]));
-    #pragma dvm realign(B3[i][j][n] with A3[li][k2j*j+lj][ln])
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region inout(A3), inout(B3)
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-
-    #pragma dvm parallel([i][j][n] on A3[li][k2j*j+lj][ln]) reduction(min(erri))
-    for (i = 0; i <BN1; i++)
-       for (j = 0; j < BN2; j++)
-          for (n = 0; n < BN3; n++)
-                if (B3[i][j][n] != (i * NL / 10 + j * NL / 100 + n * NL / 1000))
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL /1000);
-    } /* end region */
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free (B3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-/*-------------------------------------------------------*/
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel4.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel4.cdv
deleted file mode 100644
index 8f6d15e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/parallel4.cdv
+++ /dev/null
@@ -1,671 +0,0 @@
-/* PARALLEL4
-
-TESTING parallel CLAUSE */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void parallel41();
-static void parallel42();
-static void parallel43();
-static void parallel44();
-static void parallel45();
-static void parallel46();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int PN = 2;
-static int erri, NNL, i, j, n, m, ia, ja, na, ma, ib, jb, nb, mb, Avalue, Bvalue, s, cs;
-
-int main(int an, char **as)
-{
-    printf("===START OF parallel4========================\n");
-/* PARALLEL ON  arrA[i][2* j][k][3*l] stretching */
-    parallel41();
-/* PARALLEL ON  arrA[i+2][ j][k][ l+3] */
-    parallel42();
-/* PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse */
-//    parallel43();
-/* PARALLEL ON  arrA[i][ j][2][ l]
-                                              compression             !! */
-    parallel44();
-/* PARALLEL ON  arrA[i][ j][ ][ k]
-                                                replication */
-    parallel45();
-/* PARALLEL ON  arrA[i][ j][ ][3]
-                                               compression and replication */
-    parallel46();
-
-    printf("=== END OF parallel4 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------parallel41 */
-/* arrA4[BLOCK][BLOCK] [BLOCK] [BLOCK]
-        PARALLEL ON  arrA[i][2* j][k][3*l] stretching */
-void parallel41()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 2
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 3
-    #define lm 0
-
-    #pragma dvm array distribute[block][block][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral41 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++) {
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel42 */
-/* PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift */
-void parallel42()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 2
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 3
-
-    #pragma dvm array distribute[block][block][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral42 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++) {
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel43 */
-/* PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse */
-void parallel43()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n -1
-    #define k4n 0
-    #define ln 8
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m -1
-    #define lm 8
-
-    #pragma dvm array distribute[block][block][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral43 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    //#pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++) {
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel44 */
-/* PARALLEL ON  arrA[i][ j][2][ l] */
-void parallel44()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 2
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 0
-
-    #pragma dvm array distribute[block][block][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1*sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][ln][k4m*m+lm])
-
-
-    char tname[] = "paral44 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][ln][k4m * m + lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel45 */
-/* PARALLEL ON  arrA[i][ j][ ][ k] */
-void parallel45()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 0
-
-    #pragma dvm array distribute[block][block][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1*sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][][k4m*m+lm])
-
-    char tname[] = "paral45 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][][k4m * m + lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel46 */
-/* PARALLEL ON  arrA[i][ j][ ][3] */
-void parallel46()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 0
-    #define lm 3
-
-    #pragma dvm array distribute[block][block][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1*sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][][lm])
-
-    char tname[] = "paral46 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][][lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/*-------------------------------------------------------*/
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus124.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus124.cdv
deleted file mode 100644
index 50bdabb..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus124.cdv
+++ /dev/null
@@ -1,1141 +0,0 @@
-/* PARALPLUS124
-
-TESTING parallel CLAUSE .
-arrA2[*][BLOCK]
-or arrA2[BLOCK][*]
-or arrA4[BLOCK][*][*][*]
-or arrA4[*][*][*][BLOCK]  etc. */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void parallel21();
-static void parallel22();
-static void parallel23();
-static void parallel24();
-static void parallel25();
-static void parallel26();
-static void parallel27();
-static void parallel28();
-
-static void parallel41();
-static void parallel42();
-static void parallel43();
-static void parallel44();
-static void parallel45();
-static void parallel46();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int PN = 2;
-static int erri, NNL, i, j, n, m, ia, ja, na, ma, ib, jb, nb, mb, Avalue, Bvalue, s, cs;
-
-int main(int an, char **as)
-{
-    printf("===START OF paralplus124========================\n");
-/* PARALLEL ON arrA[i][2*j]  stretching along j */
-    parallel21();
-/* PARALLEL ON arrA[i+4][j]  shift along i */
-    parallel22();
-/* PARALLEL ON arrA[-i+8][j] reverse on i */
-//    parallel23();
-/* ARALLEL ON arrA[i+4][j+4]  shift along i and j */
-    parallel24();
-/* PARALLEL ON arrA[i][2*j]  stretching along j */
-    parallel25();
-/* PARALLEL ON arrA[i+4][j]  shift along i */
-    parallel26();
-/* PARALLEL ON arrA[-i+8][j] reverse on i */
-//    parallel27();
-/* ARALLEL ON arrA[i+4][j+4]  shift along i and j */
-    parallel28();
-
-/* PARALLEL ON  arrA[i][2* j][k][3*l] stretching */
-    parallel41();
-/* PARALLEL ON  arrA[i+2][ j][k][ l+3] */
-    parallel42();
-/* PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse */
-//    parallel43();
-/* PARALLEL ON  arrA[i][ j][2][ l]
-                                              compression             !! */
-    parallel44();
-/* PARALLEL ON  arrA[i][ j][ ][ k]
-                                                replication */
-    parallel45();
-/* PARALLEL ON  arrA[i][ j][ ][3]
-                                               compression and replication */
-    parallel46();
-
-    printf("=== END OF paralplus124 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------parallel21 */
-/* PARALLEL ON arrA[i][2*j]  stretching along j */
-void parallel21()
-{
-    #define AN1 8
-    #define AN2 8
-    /*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    #define k1i 1
-    #define k2i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 2
-    #define lj 0
-
-    #pragma dvm array distribute[*][block]
-    int (*A2)[AN2];
-    A2 = (int (*)[AN2])malloc(AN1 * sizeof(int[AN2]));
-
-    char tname[] = "paral+21 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j;
-    } /*end region*/
-    #pragma dvm get_actual(A2)
-    #pragma dvm parallel([i][j] on  A2[k1i * i + li][k2j * j + lj]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++) {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != ia * NL + ja)
-                erri = Min(erri, ia * NL + ja);
-        }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A2);
-
-    #undef AN1
-    #undef AN2
-    #undef k1i
-    #undef k2i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef lj
-}
-/* ---------------------------------------------parallel22 */
-/* PARALLEL ON arrA[i+4][j]  shift along i */
-void parallel22()
-{
-    #define AN1 8
-    #define AN2 8
-    /*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    #define k1i 1
-    #define k2i 0
-    #define li 4
-    #define k1j 0
-    #define k2j 1
-    #define lj 0
-
-    #pragma dvm array distribute[*][block]
-    int (*A2)[AN2];
-    A2 = (int (*)[AN2])malloc(AN1 * sizeof(int[AN2]));
-
-    char tname[] = "paral+22 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j;
-    } /*end region*/
-    #pragma dvm get_actual(A2)
-    #pragma dvm parallel([i][j] on  A2[k1i * i + li][k2j * j + lj]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++) {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != ia * NL + ja)
-                erri = Min(erri, ia * NL + ja);
-        }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A2);
-
-    #undef AN1
-    #undef AN2
-    #undef k1i
-    #undef k2i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef lj
-}
-/* ---------------------------------------------parallel23 */
-/* PARALLEL ON arrA[-i+8][j] reverse on i */
-void parallel23()
-{
-    #define AN1 7
-    #define AN2 8
-    /*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    #define k1i -1
-    #define k2i 0
-    #define li 8
-    #define k1j 0
-    #define k2j 1
-    #define lj 0
-
-    #pragma dvm array distribute[*][block]
-    int (*A2)[AN2];
-    A2 = (int (*)[AN2])malloc(AN1 * sizeof(int[AN2]));
-
-    char tname[] = "paral+23 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j;
-    } /*end region*/
-    #pragma dvm get_actual(A2)
-//    #pragma dvm parallel([i][j] on  A2[k1i * i + li][k2j * j + lj]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++) {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != ia * NL + ja)
-                erri = Min(erri, ia * NL + ja);
-        }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A2);
-
-    #undef AN1
-    #undef AN2
-    #undef k1i
-    #undef k2i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef lj
-}
-/* ---------------------------------------------parallel24 */
-/* PARALLEL ON arrA[i+4][j+4]  shift along i and j */
-void parallel24()
-{
-    #define AN1 8
-    #define AN2 8
-    /*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    #define k1i 1
-    #define k2i 0
-    #define li 4
-    #define k1j 0
-    #define k2j 1
-    #define lj 4
-
-    #pragma dvm array distribute[*][block]
-    int (*A2)[AN2];
-    A2 = (int (*)[AN2])malloc(AN1 * sizeof(int[AN2]));
-
-    char tname[] = "paral+24 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j;
-    } /*end region*/
-    #pragma dvm get_actual(A2)
-    #pragma dvm parallel([i][j] on  A2[k1i * i + li][k2j * j + lj]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++) {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != ia * NL + ja)
-                erri = Min(erri, ia * NL + ja);
-        }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A2);
-
-    #undef AN1
-    #undef AN2
-    #undef k1i
-    #undef k2i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef lj
-}
-/* ---------------------------------------------parallel25 */
-/* PARALLEL ON arrA[i][2*j]  stretching along j */
-void parallel25()
-{
-    #define AN1 8
-    #define AN2 8
-    /*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    #define k1i 1
-    #define k2i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 2
-    #define lj 0
-
-    #pragma dvm array distribute[block][*]
-    int (*A2)[AN2];
-    A2 = (int (*)[AN2])malloc(AN1 * sizeof(int[AN2]));
-
-    char tname[] = "paral+25 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j;
-    } /*end region*/
-    #pragma dvm get_actual(A2)
-    #pragma dvm parallel([i][j] on  A2[k1i * i + li][k2j * j + lj]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++) {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != ia * NL + ja)
-                erri = Min(erri, ia * NL + ja);
-        }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A2);
-
-    #undef AN1
-    #undef AN2
-    #undef k1i
-    #undef k2i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef lj
-}
-/* ---------------------------------------------parallel26 */
-/* PARALLEL ON arrA[i+4][j]  shift along i */
-void parallel26()
-{
-    #define AN1 8
-    #define AN2 8
-    /*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    #define k1i 1
-    #define k2i 0
-    #define li 4
-    #define k1j 0
-    #define k2j 1
-    #define lj 0
-
-    #pragma dvm array distribute[block][*]
-    int (*A2)[AN2];
-    A2 = (int (*)[AN2])malloc(AN1 * sizeof(int[AN2]));
-
-    char tname[] = "paral+26 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j;
-    } /*end region*/
-    #pragma dvm get_actual(A2)
-    #pragma dvm parallel([i][j] on  A2[k1i * i + li][k2j * j + lj]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++) {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != ia * NL + ja)
-                erri = Min(erri, ia * NL + ja);
-        }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A2);
-
-    #undef AN1
-    #undef AN2
-    #undef k1i
-    #undef k2i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef lj
-}
-/* ---------------------------------------------parallel27 */
-/* PARALLEL ON arrA[-i+8][j] reverse on i */
-void parallel27()
-{
-    #define AN1 7
-    #define AN2 8
-    /*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    #define k1i -1
-    #define k2i 0
-    #define li 8
-    #define k1j 0
-    #define k2j 1
-    #define lj 0
-
-    #pragma dvm array distribute[block][*]
-    int (*A2)[AN2];
-    A2 = (int (*)[AN2])malloc(AN1 * sizeof(int[AN2]));
-
-    char tname[] = "paral+27 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j;
-    } /*end region*/
-    #pragma dvm get_actual(A2)
-//    #pragma dvm parallel([i][j] on  A2[k1i * i + li][k2j * j + lj]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++) {
-            ia = k1i * i + li;
-            ja = k2j * j + lj;
-            if (A2[ia][ja] != ia * NL + ja)
-                erri = Min(erri, ia * NL + ja);
-        }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A2);
-
-    #undef AN1
-    #undef AN2
-    #undef k1i
-    #undef k2i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef lj
-}
-/* ---------------------------------------------parallel28 */
-/* PARALLEL ON arrA[i+4][j+4]  shift along i and j */
-void parallel28()
-{
-    #define AN1 8
-    #define AN2 8
-    /*  parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj] */
-    #define k1i 1
-    #define k2i 0
-    #define li 4
-    #define k1j 0
-    #define k2j 1
-    #define lj 4
-
-    #pragma dvm array distribute[block][*]
-    int (*A2)[AN2];
-    A2 = (int (*)[AN2])malloc(AN1 * sizeof(int[AN2]));
-
-    char tname[] = "paral+28 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            A2[i][j] = i * NL + j;
-    } /*end region*/
-    #pragma dvm get_actual(A2)
-    #pragma dvm parallel([i][j] on  A2[k1i * i + li][k2j * j + lj]) reduction(min(erri)), private(ia, ja)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++) {
-            ia = k1i * i + li;
-            ja = k1j * j + lj;
-            if (A2[ia][ja] != ia * NL + ja)
-                erri = Min(erri, ia * NL + ja);
-        }
-    #pragma dvm get_actual(erri)
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A2);
-
-    #undef AN1
-    #undef AN2
-    #undef k1i
-    #undef k2i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef lj
-}
-/* ---------------------------------------------parallel41 */
-/* arrA4[*][*] [BLOCK] [*]
-        PARALLEL ON  arrA[i][2* j][k][3*l] stretching */
-void parallel41()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 2
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 3
-    #define lm 0
-
-    #pragma dvm array distribute[*][block][*][*]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral+41 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++){
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel42 */
-/* PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift */
-void parallel42()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 2
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 3
-
-    #pragma dvm array distribute[*][block][*][*]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral+42 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++){
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel43 */
-/* PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse */
-void parallel43()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n -1
-    #define k4n 0
-    #define ln 8
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m -1
-    #define lm 8
-
-    #pragma dvm array distribute[*][block][*][*]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral+43 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    //#pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++){
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel44 */
-/* PARALLEL ON  arrA[i][ j][2][ l] */
-void parallel44()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 2
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 0
-
-    #pragma dvm array distribute[*][*][*][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1*sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][ln][k4m*m+lm])
-
-
-    char tname[] = "paral+44 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][ln][k4m * m + lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel45 */
-/* PARALLEL ON  arrA[i][ j][ ][ k] */
-void parallel45()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 0
-
-    #pragma dvm array distribute[*][*][block][*]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1*sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][][k4m*m+lm])
-
-    char tname[] = "paral+45 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][][k4m * m + lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel46 */
-/* PARALLEL ON  arrA[i][ j][ ][3] */
-void parallel46()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 0
-    #define lm 3
-
-    #pragma dvm array distribute[*][*][block][*]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1*sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][][lm])
-
-    char tname[] = "paral+46 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][][lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/*-------------------------------------------------------*/
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus234.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus234.cdv
deleted file mode 100644
index b8e0fc7..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus234.cdv
+++ /dev/null
@@ -1,1689 +0,0 @@
-/* PARALPLUS234
-
-TESTING parallel CLAUSE
-arrA3[*][BLOCK][BLOCK]
-or arrA3[BLOCK][*][BLOCK]
-or arrA4[BLOCK][*][*][BLOCK]
-or arrA4[*][BLOCK][*][BLOCK]  etc. */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void parallel31();
-static void parallel32();
-static void parallel33();
-static void parallel34();
-static void parallel35();
-static void parallel36();
-static void parallel37();
-static void parallel38();
-static void parallel39();
-static void parallel310();
-static void parallel311();
-static void parallel312();
-
-static void parallel41();
-static void parallel42();
-static void parallel43();
-static void parallel44();
-static void parallel45();
-static void parallel46();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int PN = 2;
-static int erri, NNL, i, j, n, m, ia, ja, na, ma, ib, jb, nb, mb, Avalue, Bvalue, s, cs;
-
-int main(int an, char **as)
-{
-    printf("===START OF paralplus234========================\n");
-/* PARALLEL ON  arrA[i][2* j][k] stretching */
-    parallel31();
-/* PARALLEL ON  arrA[i+2][ j][k]  shift */
-    parallel32();
-/* PARALLEL ON  arrA[i][ j][-k+8]  reverse */
-//    parallel33();
-/* PARALLEL ON  arrA[i][ j][2]
-                                              compression             !! */
-    parallel34();
-/* PARALLEL ON  arrA[][ j][ k]
-                                                replication */
-    parallel35();
-/* PARALLEL ON  arrA[1][i][3]
-                                               compression and replication */
-    parallel36();
-/* PARALLEL ON  arrA[i][2* j][k] stretching */
-    parallel37();
-/* PARALLEL ON  arrA[i+2][ j][k]  shift */
-    parallel38();
-/* PARALLEL ON  arrA[i][ j][-k+8]  reverse */
-//    parallel39();
-/* PARALLEL ON  arrA[i][ j][2]
-                                              compression             !! */
-    parallel310();
-/* PARALLEL ON  arrA[][ j][ k]
-                                                replication */
-    parallel311();
-/* PARALLEL ON  arrA[1][i][3]
-                                               compression and replication */
-    parallel312();
-
-/* PARALLEL ON  arrA[i][2* j][k][3*l] stretching */
-    parallel41();
-/* PARALLEL ON  arrA[i+2][ j][k][ l+3] */
-    parallel42();
-/* PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse */
-//    parallel43();
-/* PARALLEL ON  arrA[i][ j][2][ l]
-                                              compression             !! */
-    parallel44();
-/* PARALLEL ON  arrA[i][ j][ ][ k]
-                                                replication */
-    parallel45();
-/* PARALLEL ON  arrA[i][ j][ ][3]
-                                               compression and replication */
-    parallel46();
-
-    printf("=== END OF paralplus234 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------parallel31 */
-/* arrA[*][BLOCK] [BLOCK]
-        PARALLEL ON  arrA[i][2* j][k] stretching */
-void parallel31()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 4
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 2
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define ln 0
-
-    #pragma dvm array distribute[*][block][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-
-    char tname[] = "paral+31 ";
-    erri = ER;
-    NNL = NL;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(A3)
-    #pragma dvm parallel([i][j][n] on  A3[k1i * i + li][k2j * j + lj][k3n * n + ln]) reduction(min(erri)), private(ia, ja, na)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++) {
-                ia = k1i * i + li;
-                ja = k2j * j + lj;
-                na = k3n * n + ln;
-                if (A3[ia][ja][na] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-            }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel32 */
-/* PARALLEL ON  arrA[i+2][ j][k]  shift */
-void parallel32()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define li 2
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define ln 0
-
-    #pragma dvm array distribute[*][block][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-
-    char tname[] = "paral+32 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(A3)
-    #pragma dvm parallel([i][j][n] on  A3[k1i * i + li][k2j * j + lj][k3n * n + ln]) reduction(min(erri)), private(ia, ja, na)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++) {
-                ia = k1i * i + li;
-                ja = k2j * j + lj;
-                na = k3n * n + ln;
-                if (A3[ia][ja][na] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-            }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel33 */
-/* PARALLEL ON  arrA[i][ j][-k+8]  reverse */
-void parallel33()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n -1
-    #define ln 6
-
-    #pragma dvm array distribute[*][block][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-
-    char tname[] = "paral+33 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(A3)
-    //#pragma dvm parallel([i][j][n] on  A3[k1i * i + li][k2j * j + lj][k3n * n + ln]) reduction(min(erri)), private(ia, ja, na)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++) {
-                ia = k1i * i + li;
-                ja = k2j * j + lj;
-                na = k3n * n + ln;
-                if (A3[ia][ja][na] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-            }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel34 */
-/* PARALLEL ON  arrA[i][ j][2] */
-void parallel34()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define ln 2
-
-    #pragma dvm array distribute[*][block][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-    #pragma dvm array
-    int (*B3)[BN2][BN3];
-    B3 = (int (*)[BN2][BN3])malloc(BN1 * sizeof(int[BN2][BN3]));
-    #pragma dvm realign(B3[i][j][n] with A3[k1i*i+li][k2j*j+lj][ln])
-
-    char tname[] = "paral+34 ";
-    erri = ER;
-    NNL = NL;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(B3)
-    #pragma dvm parallel([i][j][n] on  A3[k1i * i + li][k2j * j + lj][ln]) reduction(min(erri)), private(n)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                if (B3[i][j][n] != i * NL / 10 + j * NL / 100 + n * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B3);
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel35 */
-/* PARALLEL ON  arrA[][ j][ k] */
-void parallel35()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define BN1 6
-    #define BN2 6
-    #define BN3 6
-    /*  parameters for PARALLEL ON  arrA[*][k2j*j+lj][k3n*n+ln] */
-    #define k1i 0
-    #define k2i 0
-    #define k3i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define ln 0
-
-    #pragma dvm array distribute[*][block][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-    #pragma dvm array
-    int (*B3)[BN2][BN3];
-    B3 = (int (*)[BN2][BN3])malloc(BN1 * sizeof(int[BN2][BN3]));
-    #pragma dvm realign(B3[][j][n] with A3[][k2j*j+lj][k3n*n+ln])
-
-    char tname[] = "paral+35 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm region out(A3, B3)
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(A3, B3)
-    for (i = 0; i < BN1; i++) {
-        #pragma dvm parallel([j][n] on  A3[][k2j * j + lj][k3n * n + ln]) reduction(min(erri))
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                if (B3[i][j][n] != i * NL / 10 + j * NL / 100 + n * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-    }
-
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B3);
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel36 */
-/* PARALLEL ON  arrA[1][i][3] */
-void parallel36()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    /*  parameters for PARALLEL ON  arrA[li][k2j*j+lj][ln] */
-    #define k1i 0
-    #define k2i 0
-    #define k3i 0
-    #define li 1
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define ln 3
-
-    #pragma dvm array distribute[*][block][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-    #pragma dvm array
-    int (*B3)[BN2][BN3];
-    B3 = (int (*)[BN2][BN3])malloc(BN1 * sizeof(int[BN2][BN3]));
-    #pragma dvm realign(B3[i][j][n] with A3[li][k2j*j+lj][ln])
-
-    char tname[] = "paral+36 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(B3)
-    #pragma dvm parallel([i][j][n] on  A3[li][k2j * j + lj][ln]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                if (B3[i][j][n] != i * NL / 10 + j * NL / 100 + n * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-    #pragma dvm get_actual(erri)
-
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B3);
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel37 */
-/* arrA[BLOCK][*] [BLOCK]
-        PARALLEL ON  arrA[i][2* j][k] stretching */
-void parallel37()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 4
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 2
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define ln 0
-
-    #pragma dvm array distribute[block][*][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-
-    char tname[] = "paral+37 ";
-    erri = ER;
-    NNL = NL;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(A3)
-    #pragma dvm parallel([i][j][n] on  A3[k1i * i + li][k2j * j + lj][k3n * n + ln]) reduction(min(erri)), private(ia, ja, na)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++) {
-                ia = k1i * i + li;
-                ja = k2j * j + lj;
-                na = k3n * n + ln;
-                if (A3[ia][ja][na] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-            }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel38 */
-/* PARALLEL ON  arrA[i+2][ j][k]  shift */
-void parallel38()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define li 2
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define ln 0
-
-    #pragma dvm array distribute[block][*][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-
-    char tname[] = "paral+38 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(A3)
-    #pragma dvm parallel([i][j][n] on  A3[k1i * i + li][k2j * j + lj][k3n * n + ln]) reduction(min(erri)), private(ia, ja, na)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++) {
-                ia = k1i * i + li;
-                ja = k2j * j + lj;
-                na = k3n * n + ln;
-                if (A3[ia][ja][na] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-            }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel39 */
-/* PARALLEL ON  arrA[i][ j][-k+8]  reverse */
-void parallel39()
-{
-    #define AN1 5
-    #define AN2 5
-    #define AN3 5
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n -1
-    #define ln 6
-
-    #pragma dvm array distribute[block][*][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-
-    char tname[] = "paral+39 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(A3)
-    //#pragma dvm parallel([i][j][n] on  A3[k1i * i + li][k2j * j + lj][k3n * n + ln]) reduction(min(erri)), private(ia, ja, na)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++) {
-                ia = k1i * i + li;
-                ja = k2j * j + lj;
-                na = k3n * n + ln;
-                if (A3[ia][ja][na] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-            }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel310 */
-/* PARALLEL ON  arrA[i][ j][2] */
-void parallel310()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define ln 2
-
-    #pragma dvm array distribute[block][*][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-    #pragma dvm array
-    int (*B3)[BN2][BN3];
-    B3 = (int (*)[BN2][BN3])malloc(BN1 * sizeof(int[BN2][BN3]));
-    #pragma dvm realign(B3[i][j][n] with A3[k1i*i+li][k2j*j+lj][ln])
-
-    char tname[] = "paral+310 ";
-    erri = ER;
-    NNL = NL;
-
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(B3)
-    #pragma dvm parallel([i][j][n] on  A3[k1i * i + li][k2j * j + lj][ln]) reduction(min(erri)), private(n)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                if (B3[i][j][n] != i * NL / 10 + j * NL / 100 + n * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B3);
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel311 */
-/* PARALLEL ON  arrA[][ j][ k] */
-void parallel311()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define BN1 6
-    #define BN2 6
-    #define BN3 6
-    /*  parameters for PARALLEL ON  arrA[*][k2j*j+lj][k3n*n+ln] */
-    #define k1i 0
-    #define k2i 0
-    #define k3i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define ln 0
-
-    #pragma dvm array distribute[block][*][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-    #pragma dvm array
-    int (*B3)[BN2][BN3];
-    B3 = (int (*)[BN2][BN3])malloc(BN1 * sizeof(int[BN2][BN3]));
-    #pragma dvm realign(B3[][j][n] with A3[][k2j*j+lj][k3n*n+ln])
-
-    char tname[] = "paral+311 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm region out(A3, B3)
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(A3, B3)
-    for (i = 0; i < BN1; i++) {
-        #pragma dvm parallel([j][n] on  A3[][k2j * j + lj][k3n * n + ln]) reduction(min(erri))
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                if (B3[i][j][n] != i * NL / 10 + j * NL / 100 + n * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-    }
-
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B3);
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel312 */
-/* PARALLEL ON  arrA[1][i][3] */
-void parallel312()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    /*  parameters for PARALLEL ON  arrA[li][k2j*j+lj][ln] */
-    #define k1i 0
-    #define k2i 0
-    #define k3i 0
-    #define li 1
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define ln 3
-
-    #pragma dvm array distribute[block][*][block]
-    int (*A3)[AN2][AN3];
-    A3 = (int (*)[AN2][AN3])malloc(AN1 * sizeof(int[AN2][AN3]));
-    #pragma dvm array
-    int (*B3)[BN2][BN3];
-    B3 = (int (*)[BN2][BN3])malloc(BN1 * sizeof(int[BN2][BN3]));
-    #pragma dvm realign(B3[i][j][n] with A3[li][k2j*j+lj][ln])
-
-    char tname[] = "paral+312 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = i * NL / 10 + j * NL / 100 + n * NL / 1000;
-    } /*end region*/
-    #pragma dvm get_actual(B3)
-    #pragma dvm parallel([i][j][n] on  A3[li][k2j * j + lj][ln]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                if (B3[i][j][n] != i * NL / 10 + j * NL / 100 + n * NL / 1000)
-                    erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000);
-    #pragma dvm get_actual(erri)
-
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B3);
-    free(A3);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef ln
-}
-/* ---------------------------------------------parallel41 */
-/* arrA4[*][*] [BLOCK] [BLOCK]
-        PARALLEL ON  arrA[i][2* j][k][3*l] stretching */
-void parallel41()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 2
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 3
-    #define lm 0
-
-    #pragma dvm array distribute[*][*][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral+41 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++) {
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel42 */
-/* PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift */
-void parallel42()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 2
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 3
-
-    #pragma dvm array distribute[*][block][*][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral+42 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++) {
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel43 */
-/* PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse */
-void parallel43()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n -1
-    #define k4n 0
-    #define ln 8
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m -1
-    #define lm 8
-
-    #pragma dvm array distribute[block][block][*][*]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral+43 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    //#pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++) {
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel44 */
-/* PARALLEL ON  arrA[i][ j][2][ l] */
-void parallel44()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 2
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 0
-
-    #pragma dvm array distribute[block][*][*][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1 * sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][ln][k4m*m+lm])
-
-
-    char tname[] = "paral+44 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][ln][k4m * m + lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel45 */
-/* PARALLEL ON  arrA[i][ j][ ][ k] */
-void parallel45()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 0
-
-    #pragma dvm array distribute[*][block][block][*]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1 * sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][][k4m*m+lm])
-
-    char tname[] = "paral+45 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][][k4m * m + lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel46 */
-/* PARALLEL ON  arrA[i][ j][ ][3] */
-void parallel46()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 0
-    #define lm 3
-
-    #pragma dvm array distribute[*][*][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1 * sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][][lm])
-
-    char tname[] = "paral+46 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][][lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/*-------------------------------------------------------*/
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus34.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus34.cdv
deleted file mode 100644
index 967449b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/PARALLEL/paralplus34.cdv
+++ /dev/null
@@ -1,672 +0,0 @@
-/* PARALLELPLUS34
-
-TESTING parallel CLAUSE
-arrA4[BLOCK][*][ BLOCK][BLOCK] or arrA4[*][BLOCK][ BLOCK][BLOCK]  etc. */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) (((a) < (b)) ? (a) : (b))
-
-static void parallel41();
-static void parallel42();
-static void parallel43();
-static void parallel44();
-static void parallel45();
-static void parallel46();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int PN = 2;
-static int erri, NNL, i, j, n, m, ia, ja, na, ma, ib, jb, nb, mb, Avalue, Bvalue, s, cs;
-
-int main(int an, char **as)
-{
-    printf("===START OF paralplus34========================\n");
-/* PARALLEL ON  arrA[i][2* j][k][3*l] stretching */
-    parallel41();
-/* PARALLEL ON  arrA[i+2][ j][k][ l+3] */
-    parallel42();
-/* PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse */
-//    parallel43();
-/* PARALLEL ON  arrA[i][ j][2][ l]
-                                              compression             !! */
-    parallel44();
-/* PARALLEL ON  arrA[i][ j][ ][ k]
-                                                replication */
-    parallel45();
-/* PARALLEL ON  arrA[i][ j][ ][3]
-                                               compression and replication */
-    parallel46();
-
-    printf("=== END OF paralplus34 =========================\n");
-    return 0;
-}
-/* ---------------------------------------------parallel41 */
-/* arrA4[BLOCK][*] [BLOCK] [BLOCK]
-        PARALLEL ON  arrA[i][2* j][k][3*l] stretching */
-void parallel41()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 2
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 3
-    #define lm 0
-
-    #pragma dvm array distribute[block][*][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral+41 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++) {
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel42 */
-/* PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift */
-void parallel42()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 2
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 1
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 3
-
-    #pragma dvm array distribute[*][block][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral+42 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++) {
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel43 */
-/* PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse */
-void parallel43()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n -1
-    #define k4n 0
-    #define ln 8
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m -1
-    #define lm 8
-
-    #pragma dvm array distribute[block][block][*][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-
-    char tname[] = "paral+43 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(A4)
-    //#pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][k3n * n + ln][k4m * m + lm]) reduction(min(erri)), private(ia, ja, na, ma)
-    for (i = 0; i < ((AN1 - li) / k1i); i++)
-        for (j = 0; j < ((AN2 - lj) / k2j); j++)
-            for (n = 0; n < ((AN3 - ln) / k3n); n++)
-                for (m = 0; m < ((AN4 - lm) / k4m); m++) {
-                    ia = k1i * i + li;
-                    ja = k2j * j + lj;
-                    na = k3n * n + ln;
-                    ma = k4m * m + lm;
-                    if (A4[ia][ja][na][ma] != ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-                }
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel44 */
-/* PARALLEL ON  arrA[i][ j][2][ l] */
-void parallel44()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 2
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 0
-
-    #pragma dvm array distribute[block][block][*][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1 * sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][ln][k4m*m+lm])
-
-
-    char tname[] = "paral+44 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][ln][k4m * m + lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel45 */
-/* PARALLEL ON  arrA[i][ j][ ][ k] */
-void parallel45()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 1
-    #define lm 0
-
-    #pragma dvm array distribute[block][block][block][*]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1 * sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][][k4m*m+lm])
-
-    char tname[] = "paral+45 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][][k4m * m + lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/* ---------------------------------------------parallel46 */
-/* PARALLEL ON  arrA[i][ j][ ][3] */
-void parallel46()
-{
-    #define AN1 6
-    #define AN2 6
-    #define AN3 6
-    #define AN4 6
-    #define BN1 3
-    #define BN2 3
-    #define BN3 3
-    #define BN4 3
-    /*  parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    #define k1i 1
-    #define k2i 0
-    #define k3i 0
-    #define k4i 0
-    #define li 0
-    #define k1j 0
-    #define k2j 1
-    #define k3j 0
-    #define k4j 0
-    #define lj 0
-    #define k1n 0
-    #define k2n 0
-    #define k3n 0
-    #define k4n 0
-    #define ln 0
-    #define k1m 0
-    #define k2m 0
-    #define k3m 0
-    #define k4m 0
-    #define lm 3
-
-    #pragma dvm array distribute[*][block][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    A4 = (int (*)[AN2][AN3][AN4])malloc(AN1 * sizeof(int[AN2][AN3][AN4]));
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    B4 = (int (*)[BN2][BN3][BN4])malloc(BN1 * sizeof(int[BN2][BN3][BN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k1i*i+li][k2j*j+lj][][lm])
-
-    char tname[] = "paral+46 ";
-    erri = ER;
-    NNL = NL;
-    #pragma dvm actual(erri)
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-    } /*end region*/
-    #pragma dvm get_actual(B4)
-    #pragma dvm parallel([i][j][n][m] on  A4[k1i * i + li][k2j * j + lj][][lm]) reduction(min(erri))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    if (B4[i][j][n][m] != i * NL / 10 + j * NL / 100 + n * NL / 1000 + m)
-                        erri = Min(erri, i * NL / 10 + j * NL / 100 + n * NL / 1000 + m);
-    #pragma dvm get_actual(erri)
-    s = 0;
-    cs = 0;
-    if (erri == ER && s == cs)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef k1i
-    #undef k2i
-    #undef k3i
-    #undef k4i
-    #undef li
-    #undef k1j
-    #undef k2j
-    #undef k3j
-    #undef k4j
-    #undef lj
-    #undef k1n
-    #undef k2n
-    #undef k3n
-    #undef k4n
-    #undef ln
-    #undef k1m
-    #undef k2m
-    #undef k3m
-    #undef k4m
-    #undef lm
-}
-/*-------------------------------------------------------*/
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign11.cdv
deleted file mode 100644
index 01bc6ca..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign11.cdv
+++ /dev/null
@@ -1,774 +0,0 @@
-/*    REALIGN11
-Testing REALIGN directive */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void realign111();
-static void realign112();
-static void realign1121();
-static void realign112r();
-static void realign113();
-static void realign113r();
-static void realign114();
-static void realign1141();
-static void realign115();
-static void realign116();
-
-static void ansyes(const char tname[]);
-static void ansno (const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-
-static int erria, errib, i, j, ia, ib;
-
-int main(int an, char **as)
-{
-    printf("=== START OF REALIGN11 ======================\n");
-
-    /* ALIGN arrB[i] WITH arrA[i]  REALIGN arrB[i] WITH arrA[2*i+8] */
-    realign111();
-    /* ALIGN arrB[i] WITH arrA[i+4]  REALIGN arrB[i] WITH arrA[i+8] */
-    realign112();
-    /* ALIGN arrB[i] WITH arrA[i+2]  REALIGN arrB[i] WITH arrA[2*i+5] */
-    realign1121();
-    /* ALIGN arrB[i] WITH arrA[i+4]  REALIGN arrB[i] WITH arrA[-i+8] */
-//  realign112r();
-    /* ALIGN arrB[i] WITH arrA[3*i+2] REALIGN arrB[i] WITH arrA[2*i+1] */
-    realign113();
-    /* ALIGN arrB[i] WITH arrA[-i+8] REALIGN arrB[i] WITH arrA[3*i+2] */
-//  realign113r();
-    /* ALIGN arrB[i] WITH arrA[2*i+8]  REALIGN arrB[i] WITH arrA[i] */
-    realign114();
-    /* ALIGN arrB[i] WITH arrA[2*i]  REALIGN arrB[i] WITH arrA[i+2] */
-    realign1141();
-    /* ALIGN arrB[ ] WITH arrA[ ]  REALIGN arrB[i] WITH arrA[i+4] */
-    realign115();
-    /* ALIGN arrB[i] WITH arrA[4*i+3]  REALIGN arrB[] WITH arrA[] */
-    realign116();
-
-    printf ("=== END OF REALIGN11 ======================\n");
-    return 0;
-}
-
-/* ---------------------------------------------REALIGN111 */
-        /* ALIGN arrB[i] WITH arrA[i]  REALIGN arrB[i] WITH arrA[2*i+8] */
-void realign111()
-{
-    #define AN1 30
-    #define BN1 8
-
-/* parameters for ALIGN arrB[i] WITH arrA[k1i*i+li] */
-    int k1i = 1,li = 0;
-/* parameters for REALIGN arrB[i] WITH arrA[kr1i*i+lri] */
-    int kr1i = 2, lri = 8;   /* lri = -1 RTS err */
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-
-    char tname[] = "realign111 ";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i-li) == (((i-li)/k1i) * k1i)) &&
-           (((i-li)/k1i) >= 0) &&
-           (((i-li)/k1i) < BN1)) {
-                 ib = (i-li)/k1i;
-                 B1[ib] = ib;
-        }
-    }
-
-    } /* end region */
-
-    #pragma dvm realign (B1[i] with A1[kr1i * i + lri])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region inlocal(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i]) private(ia), reduction(min(erria), min(errib))
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != (i))
-            errib = Min(errib, i);
-        ia=kr1i * i + lri;
-        if (A1[ia] != (ia))
-            erria = Min(erria, i);
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------REALIGN112 */
-        /* ALIGN arrB[i] WITH arrA[i+4]  REALIGN arrB[i] WITH arrA[i+8] */
-void realign112()
-{
-    #define AN1 16
-    #define BN1 4
-
-/* parameters for ALIGN arrB[i] WITH arrA[k1i*i+li] */
-    int k1i = 1,li = 4;
-/* parameters for REALIGN arrB[i] WITH arrA[kr1i*i+lri] */
-    int kr1i = 1,lri = 8;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-
-    char tname[] = "realign112 ";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 1;
-
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i * 2;
-        if (((i-li) == (((i-li)/k1i) * k1i)) &&
-           (((i-li)/k1i) >= 0) &&
-           (((i-li)/k1i) < BN1)){
-              ib = (i-li)/k1i;
-              B1[ib] += ib;
-        }
-    }
-
-    } /* end region */
-
-    #pragma dvm realign(B1[i] with A1[kr1i * i + lri])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region inout(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i]) private(ia), reduction(min(erria), min(errib))
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != (i+1))
-            errib = Min(errib, i);
-        ia=kr1i * i + lri;
-        if (A1[ia] != ia*2)
-            erria = Min(erria, i);
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-       ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------REALIGN1121*/
-    /* ALIGN arrB[i] WITH arrA[i+2]  REALIGN arrB[i] WITH arrA[2*i+5] */
-void realign1121()
-{
-    int AN1 = 25;
-    int BN1 = 7;
-
-/* parameters for ALIGN arrB[i] WITH arrA[k1i*i+li] */
-    int k1i = 1;
-    int li = 4;
-/* parameters for REALIGN arrB[i] WITH arrA[kr1i*i+lri] */
-    int kr1i = 2;
-    int lri = 5;
-
-    char tname[] = "realign1121";
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array
-    int *B1;
-
-    A1 = malloc(sizeof(int[AN1]));
-    B1 = malloc(sizeof(int[BN1]));
-
-    #pragma dvm realign(B1[i] with A1[k1i * i + li])
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 2;
-    }
-
-    #pragma dvm region inout(B1), out(A1)
-    {
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] += ib;
-        }
-    }
-    }
-
-    #pragma dvm realign(B1[i] with A1[kr1i * i + lri])
-
-    #pragma dvm actual(erria, errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erria), min(errib)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i+2)
-            errib = Min(errib, i);
-        ia = kr1i * i + lri;
-        if (A1[ia] != ia)
-            erria = Min(erria, i);
-    }
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B1);
-    free(A1);
-}
-
-/* ---------------------------------------------REALIGN112r  */
-        /* ALIGN arrB[i] WITH arrA[i+4]  REALIGN arrB[i] WITH arrA[-i+8] */
-void realign112r()
-{
-    #define AN1 12
-    #define BN1 5
-
-/* parameters for ALIGN arrB[i] WITH arrA[k1i*i+li] */
-    int k1i = 1,li = 4;
-/* parameters for REALIGN arrB[i] WITH arrA[kr1i*i+lri] */
-    int kr1i = -1,lri = 8;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-
-    char tname[] = "realign112r ";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A1,B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i-li) == (((i-li)/k1i) * k1i)) &&
-           (((i-li)/k1i) >= 0) &&
-           (((i-li)/k1i) < BN1)){
-              ib = (i-li)/k1i;
-              B1[ib] = ib;
-        }
-    }
-
-    } /* end region */
-
-    #pragma dvm realign(B1[i] with A1[kr1i * i + lri])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region inout(A1,B1)
-    {
-    #pragma dvm parallel([i] on B1[i]) private(ia), reduction(min(erria), min(errib))
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != (i))
-            errib = Min(errib, i);
-        ia=kr1i * i + lri;
-        if (A1[ia] != (ia))
-            erria = Min(erria, i);
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef BN1
-}
-
-/* ---------------------------------------------REALIGN113 */
-        /* ALIGN arrB[i] WITH arrA[3*i+2] REALIGN arrB[i] WITH arrA[2*i+1] */
-void realign113()
-{
-    #define AN1 30
-    #define BN1 6
-
-/* parameters for ALIGN arrB[i] WITH arrA[k1i*i+li]  */
-    int k1i = 3,li = -2;   /* 3*i + (-2) - RTS err */
-/* parameters for REALIGN arrB[i] WITH arrA[kr1i*i+lri]  */
-    int kr1i = 2,lri = -1;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i - li])
-    int B1[BN1];
-
-    char tname[] = "realign113 ";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A1,B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 5;
-
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i+3;
-//        if (((i-li) == (((i-li)/k1i) * k1i)) &&
-//           (((i-li)/k1i) >= 0) &&
-//           (((i-li)/k1i) < BN1)) {
-//              ib = (i-li)/k1i;
-//              B1[ib] = B1[ib] + ib;
-//        }
-//    }
-        if (((i+li) == (((i+li)/k1i) * k1i)) &&
-           (((i+li)/k1i) >= 0) &&
-           (((i+li)/k1i) < BN1)) {
-              ib = (i+li)/k1i;
-              B1[ib] = B1[ib] + ib;
-        }
-    }
-
-    } /* end region */
-
-    #pragma dvm realign(B1[i] with A1[kr1i * i - lri])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region inout(A1,B1)
-    {
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erria), min(errib)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i+5)
-            errib = Min(errib, i);
-        ia=kr1i * i - lri;
-        if (A1[ia] != (ia+3))
-            erria = Min(erria, i);
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------REALIGN113r  */
-       /* ALIGN arrB[i] WITH arrA[-i+8] REALIGN arrB[i] WITH arrA[3*i+2] */
-void realign113r()
-{
-    #define AN1 18
-    #define BN1 5
-
-/* parameters for ALIGN arrB[i] WITH arrA[k1i*i+li]  */
-    int k1i = -1,li  = 8;
-/* parameters for REALIGN arrB[i] WITH arrA[kr1i*i+lri]  */
-    int kr1i = 3,lri  = 2;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-
-    char tname[] = "realign113r ";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A1,B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i-li) == (((i-li)/k1i) * k1i)) &&
-           (((i-li)/k1i) >= 0) &&
-           (((i-li)/k1i) < BN1)) {
-              ib = (i-li)/k1i;
-              B1[ib] = ib;
-        }
-    }
-
-    } /* end region */
-
-    #pragma dvm realign(B1[i] with A1[kr1i * i + lri])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erria),min(errib)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != (i))
-            errib = Min(errib, i);
-        ia=kr1i * i + lri;
-        if (A1[ia] != (ia))
-            erria = Min(erria, i);
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef BN1
-}
-
-/* ---------------------------------------------REALIGN114  */
-        /* ALIGN arrB[i] WITH arrA[2*i+8]  REALIGN arrB[i] WITH arrA[i] */
-void realign114()
-{
-    #define AN1 24
-    #define BN1 8
-
-/* parameters for ALIGN arrB[i] WITH arrA[k1i*i+li]  */
-    int k1i = 2, li = 8;
-/* parameters for REALIGN arrB[i] WITH arrA[kr1i*i+lri]  */
-    int kr1i = 1, lri = 0;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-
-    char tname[] = "realign114 ";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 0;
-
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i;
-        if (((i-li) == (((i-li)/k1i) * k1i)) &&
-           (((i-li)/k1i) >= 0) &&
-           (((i-li)/k1i) < BN1)) {
-              ib = (i-li)/k1i;
-              B1[ib] = ib;
-        }
-    }
-
-    } /* end region */
-
-    #pragma dvm realign(B1[i] with A1[kr1i * i + lri])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region inout(A1,B1)
-    {
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erria), min(errib)), private (ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != (i))
-            errib = Min(errib, i);
-        ia=kr1i * i + lri;
-        if (A1[ia] != (ia))
-            erria = Min(erria, i);
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef BN1
-}
-/* ------ ---------------------------------------REALIGN1141*/
-    /* ALIGN arrB[i] WITH arrA[4*i]  REALIGN arrB[i] WITH arrA[i+2] */
-void realign1141()
-{
-    int AN1 = 24;
-    int BN1 = 6;
-
-/* parameters for ALIGN arrB[i] WITH arrA[k1i*i+li]  */
-    int k1i = 4;
-    int li = 0;
-/* parameters for REALIGN arrB[i] WITH arrA[kr1i*i+lri]  */
-    int kr1i = 1;
-    int lri = 2;
-
-    char tname[] = "realign1141";
-
-    #pragma dvm array distribute[block]
-    int *A1;
-    #pragma dvm array
-    int *B1;
-
-    A1 = malloc(sizeof(int[AN1]));
-    B1 = malloc(sizeof(int[BN1]));
-
-    #pragma dvm realign(B1[i] with A1[k1i * i + li])
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region out(B1, A1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = 4;
-
-    #pragma dvm parallel([i] on A1[i]) private(ib)
-    for (i = 0; i < AN1; i++)
-    {
-        A1[i] = i+2;
-        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-            (((i - li) / k1i) >= 0) &&
-            (((i - li) / k1i) < BN1))
-        {
-            ib = (i - li) / k1i;
-            B1[ib] += ib;
-        }
-    }
-    }
-
-    #pragma dvm realign(B1[i] with A1[kr1i * i + lri])
-
-    #pragma dvm actual(erria, errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on B1[i]) reduction(min(erria), min(errib)), private(ia)
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != i+4)
-            errib = Min(errib, i);
-        ia = kr1i * i + lri;
-        if (A1[ia] != ia+2)
-            erria = Min(erria, i);
-    }
-    }
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B1);
-    free(A1);
-}
-/* ---------------------------------------------REALIGN115  */
-       /* ALIGN arrB[ ] WITH arrA[ ]  REALIGN arrB[i] WITH arrA[i+4] */
-void realign115()
-{
-    #define AN1 16
-    #define BN1 8
-
-/* parameters for ALIGN arrB[] WITH arrA[]  */
-    int k1i = 0,li  = 0;
-/* parameters for REALIGN arrB[i] WITH arrA[kr1i*i+lri]  */
-    int kr1i = 1,lri  = 4;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([] with A1[])
-    int B1[BN1];
-
-    char tname[] = "realign115 ";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = i;
-
-    #pragma dvm parallel([i] on A1[i])
-    for (i = 0; i < AN1; i++)
-        A1[i] = i;
-
-    } /* end region */
-
-    #pragma dvm realign(B1[i] with A1[kr1i * i + lri])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region inout(A1,B1)
-    {
-    #pragma dvm parallel([i] on B1[i]) private (ia), reduction(min(erria), min(errib))
-    for (i = 0; i < BN1; i++)
-    {
-        if (B1[i] != (i))
-            errib = Min(errib, i);
-        ia=kr1i * i + lri;
-        if (A1[ia] != (ia))
-            erria = Min(erria, i);
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef BN1
-}
-/* ---------------------------------------------REALIGN116 */
-       /* ALIGN arrB[i] WITH arrA[4*i+3]  REALIGN arrB[] WITH arrA[] */
-void realign116()
-{
-    #define AN1 35
-    #define BN1 8
-
-/* parameters for ALIGN arrB[i] WITH arrA[k1i*i+li]  */
-    int k1i = 4,li = 3;  /* 4*i-3  RTS err */
-/* parameters for REALIGN arrB[] WITH arrA[]  */
-    int kr1i = 0,lri = 0;
-
-    #pragma dvm array distribute[block]
-    int A1[AN1];
-    #pragma dvm array align([i] with A1[k1i*i+li])
-    int B1[BN1];
-
-    char tname[] = "realign116 ";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A1, B1)
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = i+6;
-
-    #pragma dvm parallel([i] on A1[i])
-    for (i = 0; i < AN1; i++)
-        A1[i] = (i+1)*3;
-
-    } /* end region */
-
-    #pragma dvm realign(B1[] with A1[])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region inout(A1,B1)
-    {
-    #pragma dvm parallel([i] on B1[i]) reduction(min(errib))
-    for (i = 0; i < BN1; i++)
-        if (B1[i] != i+6)
-            errib = Min(errib, i);
-    #pragma dvm parallel([i] on A1[i]) reduction(min(erria))
-    for (i = 0; i < AN1; i++)
-        if (A1[i] != (i+1)*3)
-            erria = Min(erria, i);
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef BN1
-}
-/*-------------------------------------------------------*/
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign22.cdv
deleted file mode 100644
index afd396f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign22.cdv
+++ /dev/null
@@ -1,855 +0,0 @@
-/*    REALIGN22
-Testing REALIGN directive */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void realign221();
-static void realign222();
-static void realign223();
-static void realign224();
-static void realign225();
-static void realign226();
-static void realign227();
-static void realign228();
-static void realign229();
-
-static void ansyes(const char tname[]);
-static void ansno (const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-
-static int s, cs, erri, erria, errib, i, j, k, n, ia, ja, ib, jb;
-
-int main(int an, char **as)
-{
-    printf("=== START OF REALIGN22 ======================\n");
-
-    /* ALIGN arrB[i][j] WITH arrA[i][j]
-       REALIGN arrB[i][j] WITH arrA[3*i+2][2*j+1] */
-    realign221();
-    /* ALIGN arrB[i][j] WITH arrA[j+1][i]
-       REALIGN arrB[i][j] WITH arrA[i+4][j] */
-    realign222();
-    /* ALIGN arrB[i][*] WITH arrA[*][i]
-       REALIGN arrB[i][j] WITH arrA[i+4][j+4] */
-    realign223();
-    /* ALIGN arrB[*][*] WITH arrA[*][1]
-       REALIGN arrB[i][j] WITH arrA[i+4][j+4] */
-    realign224();
-    /* ALIGN arrB[i][j] WITH arrA[i][j]
-       REALIGN arrB[*][*] WITH arrA[*][2] */
-    realign225();
-    /* ALIGN arrB[i][j] WITH arrA[i][j]
-       REALIGN arrB[i][j] WITH arrA[2*j+1][3*i+2] */
-    realign226();
-    /* ALIGN arrB[*][*] WITH arrA[4][*]
-       REALIGN arrB[i][j] WITH arrA[i+2][2*j] */
-    realign227();
-    /* ALIGN arrB[i][j] WITH arrA[j][i]
-       REALIGN arrB[*][*] WITH arrA[3][*] */
-    realign228();
-    /* ALIGN arrB[i][j] WITH arrA[2*i][3*j+1]
-       REALIGN arrB[i][j] WITH arrA[j+6][i+2] */
-    realign229();
-
-    printf ("=== END OF REALIGN22 ======================\n");
-    return 0;
-}
-
-/* ---------------------------------------------REALIGN221 */
-        /* ALIGN arrB[i][j] WITH arrA[i][j]
-           REALIGN arrB[i][j] WITH arrA[3*i+2][2*j+1] */
-void realign221()
-{
-    #define AN1 16
-    #define AN2 16
-    #define BN1 4
-    #define BN2 4
-
-/* parameters for ALIGN arrB[i][j] WITH arrA[k1i*i+li][k2j*j+lj] */
-    int k1i = 1, li = 0;
-    int k2j = 1, lj = 0;
-/* parameters for REALIGN arrB[i][j] WITH arrA[kr1i*i+lri][kr2j*j+lrj] */
-    int kr1i = 3, lri = 2;
-    int kr2j = 2, lrj = 1;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k1i * i + li][k2j * j + lj])
-    int B2[BN1][BN2];
-
-    char tname[] = "realign221";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region in(A2,B2), out(A2,B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib,jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = (i*NL+j)*2;
-            if (
-                ((i-li) ==(((i-li)/k1i) * k1i)) &&
-                ((j-lj) ==(((j-lj)/k2j) * k2j)) &&
-                (((i-li)/k1i) >= 0)  &&
-                (((j-lj)/k2j) >= 0)  &&
-                (((i-li)/k1i) < BN1)  &&
-                (((j-lj)/k2j) < BN2)
-               )
-               {
-                    ib = (i-li)/k1i;
-                    jb = (j-lj)/k2j;
-                    B2[ib][jb]= B2[ib][jb] + ib*NL+jb;
-               }
-       }
-
-    } /* end region */
-
-    #pragma dvm realign(B2[i][j] with A2[kr1i * i + lri][kr2j * j + lrj])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region in(A2,B2), local(A2,B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erria),min(errib)), private(ia,ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i*NL+j))
-                errib = Min(errib, i*NL/10+j);
-
-            ia=kr1i * i + lri;
-            ja=kr2j * j + lrj;
-            if (A2[ia][ja] != (ia*NL+ja)*2)
-                erria = Min(erria, i*NL/10+j);
-        }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------REALIGN222 */
-        /* ALIGN arrB[i][j] WITH arrA[j+1][i]
-           REALIGN arrB[i][j] WITH arrA[i+4][j] */
-void realign222()
-{
-    #define AN1 8
-    #define AN2 8
-    #define BN1 4
-    #define BN2 4
-
-/* parameters for ALIGN arrB[i][j] WITH arrA[k2j*j+lj][k1i*i+li] */
-    int k1i = 1,li  = 0;
-    int k2j = 1,lj  = 1;
-/* parameters for REALIGN arrB[i][j] WITH arrA[kr1i*i+lri][kr2j*j+lrj] */
-    int kr1i = 1,lri  = 4;
-    int kr2j = 1,lrj  = 0;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k2j * j + lj][k1i * i + li])
-    int B2[BN1][BN2];
-
-    char tname[] = "realign222";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A2,B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 1;
-
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib), private(jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i*NL+j;
-            if (
-                ((i-lj) ==(((i-lj)/k2j) * k2j)) &&
-                ((j-li) ==(((j-li)/k1i) *k1i)) &&
-                (((i-lj)/k2j) >= 0)  &&
-                (((j-li)/k1i) >= 0)  &&
-                (((i-lj)/k2j) < BN2)  &&
-                (((j-li)/k1i) < BN1)
-               )
-               {
-                     ib = (j-li)/k1i;
-                     jb = (i-lj)/k2j;
-                     B2[ib][jb]=B2[ib][jb]+ib*NL+jb;
-               }
-        }
-
-    } /* end region */
-
-    #pragma dvm realign(B2[i][j] with A2[kr1i * i + lri][kr2j * j + lrj])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j]) private(ia,ja), reduction(min(erria),min(errib))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i*NL+j)+1)
-                errib = Min(errib, i*NL/10+j);
-            ia=kr1i * i + lri;
-            ja=kr2j * j + lrj;
-            if (A2[ia][ja] != (ia*NL+ja))
-                erria = Min(erria, i*NL/10+j);
-        }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------REALIGN223 */
-        /* ALIGN arrB[i][*] WITH arrA[*][i]
-           REALIGN arrB[i][j] WITH arrA[i+4][j+4] */
-void realign223()
-{
-    #define AN1 10
-    #define AN2 10
-    #define BN1 4
-    #define BN2 4
-
-/* parameters for ALIGN arrB[i][] WITH arrA[][k1i*i+li] */
-    int k1i = 1, li = 0;
-    int k2j = 0, lj = 0;
-/* parameters for REALIGN arrB[i][j] WITH arrA[kr1i*i+lri][kr2j*j+lrj] */
-    int kr1i = 1, lri  = 4;
-    int kr2j = 1, lrj  = 4;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][] with A2[][k1i * i + li])
-    int B2[BN1][BN2];
-
-    char tname[] = "realign223";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm actual (errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = i*NL+j+5;
-
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib,jb,k), reduction (min(errib))
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i*NL+j;
-            for (k = 0; k < BN2; k++)
-            {
-                if (
-                     ((j-li) ==(((j-li)/k1i) *k1i)) &&
-                     (((j-li)/k1i) >= 0)  &&
-                     (((j-li)/k1i) < BN1)
-                    )
-                {
-                    ib = ((j-li)/k1i);
-                    jb = k;
-                    if (B2[ib][jb] !=(ib*NL+jb+5))
-                        errib = Min(errib, i*NL/10+j);
-                }
-            }
-        }
-
-    } /* end region */
-
-    #pragma dvm realign(B2[i][j] with A2[kr1i * i + lri][kr2j * j + lrj])
-
-    #pragma dvm get_actual (errib)
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erria), min(errib)), private(ia,ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i*NL+j+5))
-                errib = Min(errib, i*NL/10+j);
-            ia=kr1i * i + lri;
-            ja=kr2j * j + lrj;
-            if (A2[ia][ja] != (ia*NL+ja))
-                erria = Min(erria, i*NL/10+j);
-        }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------REALIGN224 */
-        /* ALIGN arrB[*][*] WITH arrA[*][1]
-           ALIGN arrB[i][j] WITH arrA[i+4][j+4] shift along i and j */
-void realign224()
-{
-    #define AN1 12
-    #define AN2 14
-    #define BN1 5
-    #define BN2 6
-
-/* parameters for ALIGN arrB[][] WITH arrA[][lj] */
-    int k1i = 0, li  = 0;
-    int k2j = 0, lj  = 1;
-/* parameters for REALIGN arrB[i][j] WITH arrA[kr1i*i+lri][kr2j*j+lrj] */
-    int kr1i = 1, lri  = 4;
-    int kr2j = 1, lrj  = 4;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([][] with A2[][k2j * j + lj])
-    int B2[BN1][BN2];
-
-    char tname[] = "realign224";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm actual (errib)
-
-    #pragma dvm region inout(A2,B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = (i*NL+j)*2;
-
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib,jb,k,n), reduction(min(errib))
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i*NL+j+5;
-            if (j == (lj))
-                for (k = 0; k < BN1; k++)
-                    for (n = 0; n < BN2; n++)
-                    {
-                        ib = k;
-                        jb = n;
-                        if (B2[ib][jb] !=(ib*NL+jb)*2)
-                             errib = Min(errib, i*NL/10+j);
-                    }
-        }
-
-    } /* end region */
-
-    #pragma dvm realign(B2[i][j] with A2[kr1i * i + lri][kr2j * j + lrj])
-
-    #pragma dvm get_actual (errib)
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erria), min(errib)), private(ia,ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i*NL+j)*2)
-                   errib = Min(errib, i*NL/10+j);
-            ia=kr1i * i + lri;
-            ja=kr2j * j + lrj;
-            if (A2[ia][ja] != (ia*NL+ja+5))
-                   erria = Min(erria, i*NL/10+j);
-        }
-
-    } /* end region */
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------REALIGN225 */
-        /* ALIGN arrB[i][j] WITH arrA[i][j]
-           REALIGN arrB[*][*] WITH arrA[*][2] */
-void realign225()
-{
-    #define AN1 10
-    #define AN2 10
-    #define BN1 4
-    #define BN2 4
-
-/* parameters for ALIGN arrB[i][j] WITH arrA[k1i*i+li][k2j*j+lj] */
-    int k1i = 1, li  = 0;
-    int k2j = 1, lj  = 0;
-/* parameters for REALIGN arrB[][] WITH arrA[][lrj] */
-    int kr1i = 0, lri  = 0;
-    int kr2j = 0, lrj  = 2;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k1i * i + li][k2j * j + lj])
-    int B2[BN1][BN2];
-
-    char tname[] = "realign225";
-
-    errib = ER;
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib,jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i*NL+j;
-            if (
-                  ((i-li) ==(((i-li)/k1i) * k1i)) &&
-                  ((j-lj) ==(((j-lj)/k2j) *k2j)) &&
-                  (((i-li)/k1i) >= 0)  &&
-                  (((j-lj)/k2j) >= 0)  &&
-                  (((i-li)/k1i) < BN1)  &&
-                  (((j-lj)/k2j) < BN2)
-                  )
-            {
-                ib = (i-li)/k1i;
-                jb = (j-lj)/k2j;
-                B2[ib][jb]=ib*NL+jb;
-            }
-        }
-
-    } /* end region */
-
-    #pragma dvm realign(B2[][] with A2[][kr2j * j + lrj])
-
-    #pragma dvm actual (errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction (min(errib))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            if (B2[i][j] != (i*NL+j))
-                errib = Min(errib, i*NL/10+j);
-
-    } /* end region */
-
-    #pragma dvm get_actual(errib)
-
-    if (errib == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------REALIGN226 */
-    /* ALIGN arrB[i][j] WITH arrA[i][j]
-       REALIGN arrB[i][j] WITH arrA[2*j+1][3*i+2] */
-void realign226()
-{
-    #define AN1 16
-    #define AN2 18
-    #define BN1 6
-    #define BN2 4
-
-/* parameters for ALIGN arrB[i][j] WITH arrA[k1i*i+li][k2j*j+lj] */
-    int k1i = 1, li  = 0;
-    int k2j = 1, lj  = 0;
-/* parameters for REALIGN arrB[i][j] WITH arrA[kr2j*j+lrj][kr1i*i+lri] */
-    int kr1i = 3, lri  = 2;
-    int kr2j = 2, lrj  = 1;
-
-    #pragma dvm array distribute[block][block]
-    int A2[AN1][AN2];
-    #pragma dvm array align([i][j] with A2[k1i * i + li][k2j * j + lj])
-    int B2[BN1][BN2];
-
-    char tname[] = "realign226";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A2), in(B2), out(B2)
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-
-    } /* end region */
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib,jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = (i*NL+j)*3;
-            if (
-                ((i-li) ==(((i-li)/k1i) * k1i)) &&
-                ((j-lj) ==(((j-lj)/k2j) * k2j)) &&
-                (((i-li)/k1i) >= 0)  &&
-                (((j-lj)/k2j) >= 0)  &&
-                (((i-li)/k1i) < BN1)  &&
-                (((j-lj)/k2j) < BN2)
-                )
-            {
-                ib = (i-li)/k1i;
-                jb = (j-lj)/k2j;
-                B2[ib][jb]=ib*NL+jb;
-            }
-        }
-
-    } /* end region */
-
-    #pragma dvm realign(B2[i][j] with A2[kr2j*j+lrj][kr1i*i+lri])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erria),min(errib)),private(ia,ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i*NL+j))
-                errib = Min(errib, i*NL/10+j);
-            ia=kr2j * j + lrj;
-            ja=kr1i * i + lri;
-            if (A2[ia][ja] != (ia*NL+ja)*3)
-                erria = Min(erria,i*NL/10+j);
-        }
-
-    } /* end region */
-
-    #pragma dvm get_actual(errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef BN2
-}
-/* ---------------------------------------------REALIGN227 */
-    /* ALIGN B2[*][*] WITH arrA[4][*]
-       REALIGN B2[i][j] WITH arrA[i+2][2*j] */
-void realign227()
-{
-    int AN1 = 10;
-    int AN2 = 12;
-    int BN1 = 4;
-    int BN2 = 6;
-
-/* parameters for ALIGN arrB[][] WITH arrA[li][] */
-    int k1i = 0, li = 4;
-    int k2j = 0, lj = 0;
-/* parameters for REALIGN arrB[i][j] WITH arrA[kr1i*i+li][kr2j*j+lj] */
-    int kr1i = 1, lri = 2;
-    int kr2j = 2, lrj = 0;
-
-    char tname[] = "realign227";
-
-    #pragma dvm array distribute[block][block]
-    int (*A2)[AN2];
-    #pragma dvm array
-    int (*B2)[BN2];
-
-    A2 = malloc(sizeof(int[AN1][AN2]));
-    B2 = malloc(sizeof(int[BN1][BN2]));
-
-    #pragma dvm realign(B2[][] with A2[li][])
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([j][i] on A2[i][j]) private(ib, jb, k, n)
-    for (j = 0; j < AN2; j++)
-        for (i = 0; i < AN1; i++)
-        {
-            A2[i][j] = i * NL + j + 4;
-            if (i == li)
-                for (k = 0; k < BN1; k++)
-                    for (n = 0; n < BN2; n++)
-                    {
-                        ib = k;
-                        jb = n;
-                        B2[ib][jb] = ib * NL + jb + 7;
-                    }
-        }
-    }
-
-    #pragma dvm realign(B2[i][j] with A2[kr1i * i + lri][kr2j * j + lrj])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erria), min(errib)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j + 7))
-                errib = Min(errib, i*NL/10+j);
-            ia = kr1i * i + lri;
-            ja = kr2j * j + lrj;
-            if (A2[ia][ja] != (ia * NL + ja + 4))
-                erria = Min(erria, i*NL/10+j);
-        }
-    }
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B2);
-    free(A2);
-}
-/* ---------------------------------------------REALIGN228 */
-    /* ALIGN arrB[i][j] WITH arrA[j][i]
-       REALIGN arrB[*][*] WITH arrA[3][*] */
-void realign228()
-{
-    int AN1 = 14;
-    int AN2 = 8;
-    int BN1 = 4;
-    int BN2 = 3;
-
-/* parameters for ALIGN arrB[i][j] WITH arrA[k2j*j+lj][k1i*i+li] */
-    int k1i = 1, li = 0;
-    int k2j = 1, lj = 0;
-/* parameters for REALIGN arrB[][] WITH arrA[lri][] */
-    int kr1i = 0, lri = 3;
-    int kr2j = 0, lrj = 0;
-
-    char tname[] = "realign228";
-
-    #pragma dvm array distribute[block][block]
-    int (*A2)[AN2];
-    #pragma dvm array
-    int (*B2)[BN2];
-
-    A2 = malloc(sizeof(int[AN1][AN2]));
-    B2 = malloc(sizeof(int[BN1][BN2]));
-
-    #pragma dvm realign(B2[i][j] with A2[k2j * j + lj][k1i * i + li])
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 1;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (
-                ((i-lj) ==(((i-lj)/k2j) * k2j)) &&
-                ((j-li) ==(((j-li)/k1i) * k1i)) &&
-                (((i-lj)/k2j) >= 0)  &&
-                (((j-li)/k1i) >= 0)  &&
-                (((i-lj)/k2j) < BN2)  &&
-                (((j-li)/k1i) < BN1)
-               )
-            {
-                ib = (j-li)/k1i;
-                jb = (i-lj)/k2j;
-                B2[ib][jb] += ib*NL+jb;
-            }
-        }
-    }
-
-    #pragma dvm realign(B2[][] with A2[lri][])
-
-    #pragma dvm actual(errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(errib))
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            if (B2[i][j] != i * NL + j + 1)
-                errib = Min(errib, i*NL/10+j);
-    }
-
-    #pragma dvm get_actual(errib)
-
-    if (errib == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B2);
-    free(A2);
-}
-/* ---------------------------------------------REALIGN229 */
-    /* ALIGN B2[i][j] WITH arrA[2*i][3*j+1]
-       REALIGN B2[i][j] WITH arrA[j+6][i+2] */
-void realign229()
-{
-    int AN1 = 12;
-    int AN2 = 18;
-    int BN1 = 4;
-    int BN2 = 6;
-
-/* parameters for ALIGN arrB[i][j] WITH arrA[k1i*i+li][k2j*j+lj] */
-    int k1i = 2, li = 0;
-    int k2j = 3, lj = 1;
-/* parameters for REALIGN arrB[i][j] WITH arrA[kr2j*j+lrj][kr1i*i+lri] */
-    int kr1i = 1, lri = 2;
-    int kr2j = 1, lrj = 6;
-
-    char tname[] = "realign229";
-
-    #pragma dvm array distribute[block][block]
-    int (*A2)[AN2];
-    #pragma dvm array
-    int (*B2)[BN2];
-
-    A2 = malloc(sizeof(int[AN1][AN2]));
-    B2 = malloc(sizeof(int[BN1][BN2]));
-
-    #pragma dvm realign(B2[i][j] with A2[k1i * i + li][k2j * j + lj])
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            B2[i][j] = 0;
-    #pragma dvm parallel([i][j] on A2[i][j]) private(ib, jb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-        {
-            A2[i][j] = i * NL + j;
-            if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                (((i - li) / k1i) >= 0) &&
-                (((j - lj) / k2j) >= 0) &&
-                (((i - li) / k1i) < BN1) &&
-                (((j - lj) / k2j) < BN2))
-            {
-                ib = (i - li) / k1i;
-                jb = (j - lj) / k2j;
-                B2[ib][jb] = ib * NL + jb;
-            }
-        }
-    }
-
-    #pragma dvm realign(B2[i][j] with A2[kr2j * j + lrj][kr1i * i + lri])
-
-    #pragma dvm actual (erria, errib)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j]) reduction(min(erria), min(errib)), private(ia, ja)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-        {
-            if (B2[i][j] != (i * NL + j))
-                errib = Min(errib, i*NL/10+j);
-            ia=kr2j * j + lrj;
-            ja=kr1i * i + lri;
-            if (A2[ia][ja] != (ia * NL + ja))
-                erria = Min(erria, i*NL/10+j);
-         }
-    }
-
-    #pragma dvm get_actual(erria, errib)
-
-    if ((erria == ER) && (errib == ER))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B2);
-    free(A2);
-}
-
-/*-------------------------------------------------------*/
-
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign33.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign33.cdv
deleted file mode 100644
index 2be207c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign33.cdv
+++ /dev/null
@@ -1,775 +0,0 @@
-/*    REALIGN33
-Testing ALIGN and REALIGN directives */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void realign331();
-static void realign332();
-static void realign333();
-static void realign334();
-static void realign335();
-static void realign336();
-
-static void ansyes(const char tname[]);
-static void ansno (const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-
-static int s,cs,erria,errib,i,j,n,l,ia,ja,na,ib,jb,nb;
-
-int main(int an, char **as)
-{
-    printf("=== START OF REALIGN33 ===================\n");
-
-    /* ALIGN arrB3[i][j][n] WITH arrA3[i][j][n]
-       REALIGN arrB3[i][j][n] WITH arrA3[i+1][j+2][n+3] */
-    realign331();
-    /* ALIGN arrB3[i][j][n] WITH arrA3[i][j][n]
-       REALIGN arrB3[i][j][n] WITH arrA3[2*i][3*j][5*n] */
-    realign332();
-    /* ALIGN arrB3[i][j][n] WITH arrA3[i+2][j+4][n+3]
-       REALIGN arrB3[i][j][n] WITH arrA3[2*i+1][2*n][j+1] */
-    realign333();
-    /* ALIGN arrB3[i][j][n] WITH arrA3[n+1][3*i+1][j+2]
-       REALIGN arrB3[i][j][n] WITH arrA3[2*j][i+1][2*n+1] */
-    realign334();
-    /* ALIGN arrB[*][*][*] WITH arrA[*][*][*]
-       REALIGN arrB[i][j][n] WITH arrA[i][j][n] */
-    realign335();
-    /* ALIGN arrB[i][j][n] WITH arrA[i][j+1][2*n+1]
-       REALIGN arrB[*][j][n] WITH arrA[j+1][n][1] */
-    realign336();
-
-    printf("=== END OF REALIGN33 ===================\n");
-    return 0;
-}
-
-/* ----------------------------------------------------realign331 */
-    /* ALIGN arrB3[i][j][n]   WITH arrA3[i][j][n]
-       REALIGN arrB3[i][j][n] WITH arrA3[i+1][j+2][n+3] */
-
-void realign331()
-{
-    #define AN1 10
-    #define AN2 10
-    #define AN3 10
-    #define BN1 9
-    #define BN2 8
-    #define BN3 6
-
-/* parameters for ALIGN arrB[i][j][n] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    int k1i=1, li=0;
-    int k2j=1, lj=0;
-    int k3n=1, ln=0;
-/* parameters for REALIGN arrB[i][j][n] WITH arrA[kr1i*i+lri][kr2j*j+lrj][kr3n*n+lrn] */
-    int kr1i=1, lri=1;
-    int kr2j=1, lrj=2;
-    int kr3n=1, lrn=3;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j][n] with A3[k1i*i+li][k2j*j+lj][k3n*n+ln])
-    int B3[BN1][BN2][BN3];
-
-    char tname[] = "realign331";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A3,B3)
-    {
-
-//  A3 = 0;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = 0;
-
-//  B3 = 0;
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = 0;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib,jb,nb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-    {
-                A3[i][j][n] = i*NL/10+j*NL/100+n*NL/1000;
-                if (((i-li) == (((i-li)/k1i) * k1i))  &&
-                    ((j-lj) == (((j-lj)/k2j) * k2j))  &&
-                    ((n-ln) == (((n-ln)/k3n) * k3n))  &&
-                    (((i-li)/k1i) >= 0)   &&
-                    (((j-lj)/k2j) >= 0)   &&
-                    (((n-ln)/k3n) >= 0)   &&
-                    (((i-li)/k1i) < BN1)  &&
-                    (((j-lj)/k2j) < BN2)  &&
-                    (((n-ln)/k3n) < BN3))
-                {
-                    ib = (i-li)/k1i;
-                    jb = (j-lj)/k2j;
-                    nb = (n-ln)/k3n;
-                    B3[ib][jb][nb]=ib*NL/10+jb*NL/100+nb*NL/1000;
-                }
-    } /* end of loop */
-
-    } /* end region */
-
-    #pragma dvm realign(B3[i][j][n] with A3[kr1i*i+lri][kr2j*j+lrj][kr3n*n+lrn])
-
-    s=0;
-
-    #pragma dvm actual (erria, errib, s)
-
-    #pragma dvm region inlocal(A3,B3)
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n]) reduction(min(erria),min(errib),sum(s)),private(ia,ja,na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-    {
-                s = s + B3[i][j][n];
-                if (B3[i][j][n] != (i*NL/10+j*NL/100+n*NL/1000))
-                    errib = Min(errib,i*NL/10 + j*NL/100 + n*NL/1000);
-                ia=kr1i * i + lri;
-                ja=kr2j * j + lrj;
-                na=kr3n * n + lrn;
-                if (A3[ia][ja][na] != (ia*NL/10+ja*NL/100+na*NL/1000))
-                    erria = Min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000);
-    } /* end of loop */
-
-    } /* end region */
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                cs = cs + i*NL/10 + j*NL/100 + n*NL/1000;
-
-    #pragma dvm get_actual(erria, errib, s)
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-/*  ----------------------------------------------------realign332 */
-    /* ALIGN arrB3[i][j][n] WITH arrA3[i][j][n]
-       REALIGN arrB3[i][j][n] WITH arrA3[2*i][3*j][5*n] */
-
-void realign332()
-{
-    #define AN1 12
-    #define AN2 16
-    #define AN3 25
-    #define BN1 4
-    #define BN2 3
-    #define BN3 5
-
-/* parameters for ALIGN arrB[i][j][n] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    int k1i=1, li=0;
-    int k2j=1, lj=0;
-    int k3n=1, ln=0;
-/* parameters for REALIGN arrB[i][j][n] WITH arrA[kr1i*i+lri][kr2j*j+lrj][kr3n*n+lrn] */
-    int kr1i=2, lri=0;
-    int kr2j=3, lrj=0;
-    int kr3n=5, lrn=0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j][n] with A3[k1i*i+li][k2j*j+lj][k3n*n+ln])
-    int B3[BN1][BN2][BN3];
-
-    char tname[] = "realign332";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A3,B3)
-    {
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = 0;
-
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = 0;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib,jb,nb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-    {
-                A3[i][j][n]=i*NL/10+j*NL/100+n*NL/1000 + 10;
-                if (
-                   ((i-li) == (((i-li)/k1i) * k1i)) &&
-                   ((j-lj) == (((j-lj)/k2j) *k2j))  &&
-                   ((n-ln) == (((n-ln)/k3n) * k3n)) &&
-                   (((i-li)/k1i) >= 0)  &&
-                   (((j-lj)/k2j) >= 0)  &&
-                   (((n-ln)/k3n) >= 0)  &&
-                   (((i-li)/k1i) < BN1)  &&
-                   (((j-lj)/k2j) < BN2)  &&
-                   (((n-ln)/k3n) < BN3)
-                   )
-                {
-                    ib = (i-li)/k1i;
-                    jb = (j-lj)/k2j;
-                    nb = (n-ln)/k3n;
-                    B3[i][j][n]=ib*NL/10+jb*NL/100+nb*NL/1000 + 5;
-                }
-    } /* end of loop */
-
-    } /* end region */
-
-    #pragma dvm realign(B3[i][j][n] with A3[kr1i*i+lri][kr2j*j+lrj][kr3n*n+lrn])
-
-    s=0;
-
-    #pragma dvm actual (erria, errib, s)
-
-    #pragma dvm region inlocal(A3),inlocal(B3)
-    {
-
-    #pragma dvm parallel([i][j][n] on B3[i][j][n]) reduction(min(erria), min(errib), sum(s)), private(ia, ja, na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++) {
-               s = s + B3[i][j][n];
-               if (B3[i][j][n] != (i*NL/10+j*NL/100+n*NL/1000) + 5)
-                   errib = Min(errib,i*NL/10 + j*NL/100 + n*NL/1000);
-               ia=kr1i * i + lri;
-               ja=kr2j * j + lrj;
-               na=kr3n * n + lrn;
-               if (A3[ia][ja][na] != (ia*NL/10+ja*NL/100+na*NL/1000)+10)
-                  erria = Min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000);
-    } /* end of loop */
-
-    } /* end region */
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                cs = cs + i*NL/10 + j*NL/100 + n*NL/1000 + 5;
-
-    #pragma dvm get_actual(erria, errib, s)
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-/*  --------------------------------------------------realign333 */
-    /* ALIGN arrB3[i][j][n]   WITH arrA3[i+2][j+4][n+3]
-       REALIGN arrB3[i][j][n] WITH arrA3[2*i+1][2*n][j+1] */
-
-void realign333()
-{
-    #define AN1 12
-    #define AN2 16
-    #define AN3 25
-    #define BN1 4
-    #define BN2 3
-    #define BN3 5
-
-/* parameters for ALIGN arrB[i][j][n] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    int k1i=1, li=2;
-    int k2j=1, lj=4;
-    int k3n=1, ln=3;
-/* parameters for REALIGN arrB[i][j][n] WITH arrA[kr1i*i+lri][kr3n*n+lrn][kr2j*j+lrj] */
-    int kr1i=2, lri=1;
-    int kr2j=1, lrj=1;
-    int kr3n=2, lrn=0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j][n] with A3[k1i*i+li][k2j*j+lj][k3n*n+ln])
-    int B3[BN1][BN2][BN3];
-
-    char tname[] = "realign333";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A3),inout(B3)
-    {
-
-//  A3 = 1;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++) 
-                A3[i][j][n] = 1;
-
-//  B3 = 2;
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = 2;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib,jb,nb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-    {
-                A3[i][j][n] = A3[i][j][n] + i*NL/10+j*NL/100+n*NL/1000;
-                if (
-                   ((i-li) == (((i-li)/k1i) * k1i)) &&
-                   ((j-lj) == (((j-lj)/k2j) *k2j))  &&
-                   ((n-ln) == (((n-ln)/k3n) * k3n)) &&
-                   (((i-li)/k1i) >= 0)  &&
-                   (((j-lj)/k2j) >= 0)  &&
-                   (((n-ln)/k3n) >= 0)  &&
-                   (((i-li)/k1i) < BN1)  &&
-                   (((j-lj)/k2j) < BN2)  &&
-                   (((n-ln)/k3n) < BN3)
-                   )
-                {
-                    ib = (i-li)/k1i;
-                    jb = (j-lj)/k2j;
-                    nb = (n-ln)/k3n;
-                    B3[ib][jb][nb] += ib*NL/10+jb*NL/100+nb*NL/1000;
-                }
-    } /* end of loop */
-
-    } /* end region */
-
-    #pragma dvm realign(B3[i][j][n] with A3[kr1i*i+lri][kr3n*n+lrn][kr2j*j+lrj])
-
-    s=0;
-
-    #pragma dvm actual (erria, errib, s)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n]) reduction(min(erria),min(errib),sum(s)),private(ia,ja,na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-    {
-                s = s + B3[i][j][n];
-                if (B3[i][j][n] != (i*NL/10+j*NL/100+n*NL/1000) + 2)
-                    errib = Min(errib,i*NL/10 + j*NL/100 + n*NL/1000);
-                ia=kr1i * i + lri;
-                ja=kr3n * n + lrn;
-                na=kr2j * j + lrj;
-                if (A3[ia][ja][na] != (ia*NL/10+ja*NL/100+na*NL/1000)+1)
-                    erria = Min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000);
-    } /* end of loop */
-
-    } /* end region */
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                cs = cs + i*NL/10 + j*NL/100 + n*NL/1000 + 2;
-
-    #pragma dvm get_actual(erria, errib, s)
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-/*  ----------------------------------------------------realign334 */
-    /* ALIGN arrB3[i][j][n] WITH arrA3[n+1][3*i+1][j+2]
-       REALIGN arrB3[i][j][n] WITH arrA3[2*j][i+1][2*n+1] */
-
-void realign334()
-{
-    #define AN1 15
-    #define AN2 28
-    #define AN3 20
-    #define BN1 4
-    #define BN2 6
-    #define BN3 6
-
-/* parameters for ALIGN arrB[i][j][n] WITH arrA[k3n*n+ln][k1i*i+li][k2j*j+lj] */
-    int k1i=3, li=1;
-    int k2j=1, lj=2;
-    int k3n=1, ln=1;
-/* parameters for REALIGN arrB[i][j][n] WITH arrA[kr2j*j+lrj][kr1i*i+lri][kr3n*n+lrn] */
-    int kr1i=1, lri=1;
-    int kr2j=2, lrj=0;
-    int kr3n=2, lrn=1;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j][n] with A3[k3n*n+ln][k1i*i+li][k2j*j+lj])
-    int B3[BN1][BN2][BN3];
-
-    char tname[] = "realign334";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region in(A3),in(B3),out(A3),out(B3)
-    {
-
-//  A3 = 0;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = 0;
-
-//  B3 = 0;
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = 0;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib,jb,nb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-    {
-                A3[i][j][n] += i*NL/10+j*NL/100+n*NL/1000;
-                if (
-                   ((i-ln) == (((i-ln)/k3n) * k3n)) &&
-                   ((j-li) == (((j-li)/k1i) * k1i)) &&
-                   ((n-lj) == (((n-lj)/k2j) * k2j)) &&
-                   (((i-ln)/k3n) >= 0) &&
-                   (((j-li)/k1i) >= 0) &&
-                   (((n-lj)/k2j) >= 0) &&
-                   (((i-ln)/k3n) < BN3) &&
-                   (((j-li)/k1i) < BN1) &&
-                   (((n-lj)/k2j) < BN2)
-                  )
-                {
-                    ib = (j-li)/k1i;
-                    jb = (n-lj)/k2j;
-                    nb = (i-ln)/k3n;
-                    B3[ib][jb][nb] += ib*NL/10+jb*NL/100+nb*NL/1000;
-                }
-    } /* end of loop */
-
-    } /* end region */
-
-    #pragma dvm realign(B3[i][j][n] with A3[kr2j*j+lrj][kr1i*i+lri][kr3n*n+lrn])
-
-    s=0;
-
-    #pragma dvm actual (erria, errib, s)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n]) reduction(min(erria),min(errib),sum(s)),private(ia,ja,na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-    {
-                s += B3[i][j][n];
-                if (B3[i][j][n] != (i*NL/10+j*NL/100+n*NL/1000))
-                    errib = Min(errib,i*NL/10 + j*NL/100 + n*NL/1000);
-                ia=kr2j * j + lrj;
-                ja=kr1i * i + lri;
-                na=kr3n * n + lrn;
-                if (A3[ia][ja][na] != (ia*NL/10+ja*NL/100+na*NL/1000))
-                    erria = Min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000);
-    } /* end of loop */
-
-    } /* end region */
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                cs = cs + i*NL/10 + j*NL/100 + n*NL/1000;
-
-    #pragma dvm get_actual(erria, errib, s)
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-/* ----------------------------------------------------realign335 */
-    /* ALIGN arrB[*][*][*] WITH arrA[*][*][*]
-       REALIGN arrB[i][j][n] WITH arrA[i][j][n] */
-
-void realign335()
-{
-    #define AN1 10
-    #define AN2 10
-    #define AN3 10
-    #define BN1 4
-    #define BN2 8
-    #define BN3 4
-
-/* parameters for  ALIGN arrB[*][*][*] WITH arrA[*][*][*] */
-    int k1i=0, li=0;
-    int k2j=0, lj=0;
-    int k3n=0, ln=0;
-/* parameters for REALIGN arrB[i][j][n] WITH arrA[kr1i*i+lri][kr2j*j+lrj][kr3n*n+lrn] */
-    int kr1i=1, lri=0;
-    int kr2j=1, lrj=0;
-    int kr3n=1, lrn=0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([][][] with A3[][][])
-    int B3[BN1][BN2][BN3];
-
-    char tname[] = "realign335";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm actual (A3, B3)
-
-    #pragma dvm region inout(B3)
-    {
-
-//  A3 = 0;
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                A3[i][j][n] = 0;
-
-//  B3 = 6;
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = 6;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n])
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-    {
-                A3[i][j][n] += i*NL/10+j*NL/100+n*NL/1000;
-    } 
-
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-    {
-                 B3[i][j][n] = B3[i][j][n] + i*NL/10+j*NL/100+n*NL/1000;
-    } 
-
-    } /* end region */
-
-    #pragma dvm realign(B3[i][j][n] with A3[kr1i*i+lri][kr2j*j+lrj][kr3n*n+lrn])
-
-    s=0;
-
-    #pragma dvm actual (erria, errib, s)
-
-    #pragma dvm region inlocal(A3,B3)
-    {
-
-    #pragma dvm parallel([i][j][n] on B3[i][j][n]) reduction(min(erria),min(errib),sum(s)),private(ia,ja,na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-    {
-                s += B3[i][j][n];
-                if (B3[i][j][n] != (i*NL/10+j*NL/100+n*NL/1000)+ 6)
-                    errib = Min(errib,i*NL/10 + j*NL/100 + n*NL/1000);
-                ia=kr1i * i + lri;
-                ja=kr2j * j + lrj;
-                na=kr3n * n + lrn;
-                if (A3[ia][ja][na] != (ia*NL/10+ja*NL/100+na*NL/1000))
-                    erria = Min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000);
-    } /* end of loop */
-
-    } /* end region */
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                cs = cs + i*NL/10 + j*NL/100 + n*NL/1000 + 6;
-
-    #pragma dvm get_actual(erria, errib, s)
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-/*  ----------------------------------------------------realign336 */
-    /* ALIGN arrB3[i][j][n] WITH arrA3[i][j+1][2*n+1]
-       REALIGN arrB3[*][j][n] WITH arrA[j+1][n][1] */
-
-void realign336()
-{
-    #define AN1 8
-    #define AN2 8
-    #define AN3 8
-    #define BN1 3
-    #define BN2 4
-    #define BN3 3
-
-/* parameters for ALIGN arrB[i][j][n] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    int k1i=1,li=0;
-    int k2j=1,lj=1;
-    int k3n=2,ln=1;
-/* parameters for REALIGN arrB[*][i][j] WITH arrA[kr2j*j+lrj][kr3n*n+lrn][lri] */
-    int kr1i=0,lri=1;
-    int kr2j=1,lrj=1;
-    int kr3n=1,lrn=0;
-
-    #pragma dvm array distribute[block][block][block]
-    int A3[AN1][AN2][AN3];
-    #pragma dvm array align([i][j][n] with A3[k1i*i+li][k2j*j+lj][k3n*n+ln])
-    int B3[BN1][BN2][BN3];
-
-    char tname[] = "realign336";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm actual (B3)
-
-    #pragma dvm region inout(B3), inout(A3)
-    {
-
-//  B3 = 0;
-    #pragma dvm parallel([i][j][n] on B3[i][j][n])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                B3[i][j][n] = 0;
-
-    #pragma dvm parallel([i][j][n] on A3[i][j][n]) private(ib,jb,nb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-    {
-                A3[i][j][n] = i*NL/10+j*NL/100+n*NL/1000;
-                if (
-                  ((i-li) == (((i-li)/k1i) * k1i)) &&
-                  ((j-lj) == (((j-lj)/k2j) *k2j))  &&
-                  ((n-ln) == (((n-ln)/k3n) * k3n)) &&
-                  (((i-li)/k1i) >= 0)  &&
-                  (((j-lj)/k2j) >= 0)  &&
-                  (((n-ln)/k3n) >= 0)  &&
-                  (((i-li)/k1i) < BN1)  &&
-                  (((j-lj)/k2j) < BN2)  &&
-                  (((n-ln)/k3n) < BN3)
-                  )
-                {
-                    ib = (i-li)/k1i;
-                    jb = (j-lj)/k2j;
-                    nb = (n-ln)/k3n;
-                    B3[ib][jb][nb]=ib*NL/10+jb*NL/100+nb*NL/1000;
-                }
-    } /* end of loop */
-
-    } /* end region */
-
-    #pragma dvm realign(B3[][j][n] with A3[kr2j*j+lrj][kr3n*n+lrn][lri])
-
-    s=0;
-
-    #pragma dvm actual (erria, errib, s)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n] on B3[i][j][n]) reduction(min(erria), min(errib), sum(s)), private(ia, ja, na)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-    {
-                s = s + B3[i][j][n];
-                if (B3[i][j][n] != (i*NL/10+j*NL/100+n*NL/1000))
-                    errib = Min(errib,i*NL/10 + j*NL/100+ n*NL/1000);
-                ia=kr2j*j+lrj;
-                ja=kr3n*n+lrn;
-                na=lri;
-                if (A3[ia][ja][na] != (ia*NL/10+ja*NL/100+na*NL/1000))
-                    erria = Min(erria,i*NL/10 + j*NL/100+ n*NL/1000);
-    } /* end of loop */
-
-    } /* end region */
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                cs = cs + i*NL/10 + j*NL/100+ n*NL/1000;
-
-    #pragma dvm get_actual(erria, errib, s)
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef BN1
-    #undef BN2
-    #undef BN3
-}
-
-/* ---------------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-void ansno(const char name[])
-{
-    printf ("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign44.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign44.cdv
deleted file mode 100644
index 99f8b76..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REALIGN/realign44.cdv
+++ /dev/null
@@ -1,553 +0,0 @@
-/*    REALIGN44
-Testing REALIGN directive */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-
-static void realign441();
-static void realign442();
-static void realign443();
-static void realign444();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 10000;
-static int ER = 100000;
-static int erria, errib, i, j, k, n, m, na, ma, ia, ib, nb, mb, ja, jb, s, cs;
-
-int main(int an, char **as)
-{
-    printf("=== START OF REALIGN44 ======================\n");
-
-    /* ALIGN arrB[i][j][n][m] WITH arrA[i][j][n][m]
-       REALIGN arrB[][j][n][] WITH arrA[j][n][1][3] */
-    realign441();
-    /* ALIGN arrB[][j][n][i] WITH arrA[i][j][][n]
-       REALIGN arrB[i][j][][m] WITH arrA[i][j][2][m] */
-    realign442();
-    /* ALIGN arrB[i][j][n][m] WITH arrA[i][2*j][3*n][4*m]
-       REALIGN arrB[i][j][n][m] WITH arrA[i+1][j+2]+[n+3][m+4] */
-    realign443();
-    /* ALIGN arrB[i][j][n][m] WITH arrA[m][i][j][n]
-       REALIGN arrB[i][j][n][m] WITH arrA[i+2][3*j+4][2*n+2][m+1] */
-    realign444();
-
-    printf("=== END OF REALIGN44 ========================\n");
-    return 0;
-}
-
-/* ---------------------------------------------REALIGN441*/
-    /* ALIGN arrB[i][j][n][m] WITH arrA[i][j][n][m]
-       REALIGN arrB[][j][n][] WITH arrA[j][n][1][3] */
-void realign441()
-{
-    #define AN1 6
-    #define AN2 8
-    #define AN3 5
-    #define AN4 7
-    #define BN1 2
-    #define BN2 5
-    #define BN3 4
-    #define BN4 3
-/*  parameters for ALIGN arrB[i][j][n][m] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    int k1i = 1, li = 0;
-    int k2j = 1, lj = 0;
-    int k3n = 1, ln = 0;
-    int k4m = 1, lm = 0;
-/*  parameters for REALIGN arrB[*][j][n][*] WITH arrA[kr2j*j+lrj][kr3n*n+lrn][lri][lrm] */
-    int kr1i = 0, lri = 1;
-    int kr2j = 1, lrj = 0;
-    int kr3n = 1, lrn = 0;
-    int kr4m = 0, lrm = 3;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([i][j][n][m] with A4[k1i*i + li][k2j*j + lj][k3n*n + ln][k4m*m + lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "realign441";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                        ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                        ((n - ln) == (((n - ln) / k3n) * k3n)) &&
-                        ((m - lm) == (((m - lm) / k4m) * k4m)) &&
-                        (((i - li) / k1i) >= 0) &&
-                        (((j - lj) / k2j) >= 0) &&
-                        (((n - ln) / k3n) >= 0) &&
-                        (((m - lm) / k4m) >= 0) &&
-                        (((i - li) / k1i) < BN1) &&
-                        (((j - lj) / k2j) < BN2) &&
-                        (((n - ln) / k3n) < BN3) &&
-                        (((m - lm) / k4m) < BN4))
-                    {
-                        ib = (i - li) / k1i;
-                        jb = (j - lj) / k2j;
-                        nb = (n - ln) / k3n;
-                        mb = (m - lm) / k4m;
-                        B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-    }
-
-    #pragma dvm realign(B4[][j][n][] with A4[kr2j*j+lrj][kr3n*n+lrn][lri][lrm])
-
-    s = 0;
-
-    #pragma dvm actual(erria, errib, s)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erria), min(errib), sum(s)), private(ia, ja, na, ma)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s += B4[i][j][n][m];
-                    if (B4[i][j][n][m] !=val)
-                        errib = Min(errib, val);
-
-                    ia=kr2j*j+lrj;
-                    ja=kr3n*n+lrn;
-                    na=lri;
-                    ma=lrm;
-                    val = ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma;
-                    if (A4[ia][ja][na][ma] != val)
-                        erria = Min(erria, val);
-                }
-
-    }
-
-    #pragma dvm get_actual(erria, errib, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else {
-        ansno(tname);
-        printf ("%d, %d, %d\n", erria, errib, s);
-    }
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-
-/* ---------------------------------------------REALIGN442*/
-    /*  ALIGN arrB[][j][n][i] WITH arrA[i][j][][n]
-        REALIGN arrB[i][j][][m] WITH arrA[i][j][2][m] */
-void realign442()
-{
-    int AN1 = 5, AN2 = 5, AN3 = 5, AN4 = 5;
-    int BN1 = 2, BN2 = 2, BN3 = 2, BN4 = 2;
-
-/*  parameters for ALIGN arrB[*][j][n][i] WITH arrA4(k1i*i+li,k2j*j+lj,*,k3m*n+lm) */
-    int k1i = 1, li = 0;
-    int k2j = 1, lj = 0;
-    int k3n = 0, ln = 0;
-    int k3m = 1, lm = 0;
-/*  parameters for REALIGN arrB[i][j][*][m] WITH arrA(kr1i*i+lri,kr2j*j+lrj,lrn,kr4m*m+lrm) */
-    int kr1i = 1, lri = 0;
-    int kr2j = 1, lrj = 0;
-    int kr3n = 0, lrn = 2;
-    int kr4m = 1, lrm = 0;
-
-    char tname[] = "realign442";
-
-    #pragma dvm array distribute[block][block][block][block]
-    int (*A4)[AN2][AN3][AN4];
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-
-    A4 = malloc(sizeof(int[AN1][AN2][AN3][AN4]));
-    B4 = malloc(sizeof(int[BN1][BN2][BN3][BN4]));
-
-    #pragma dvm realign(B4[][j][n][i] with A4[k1i*i + li][k2j*j + lj][][k3m*n + lm])
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region inout(A4, B4)
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 0;
-
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb, k)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    for (k = 0; k < BN1; k++)
-                    {
-                        if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                            ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                            ((m - lm) == (((m - lm) / k3m) * k3m)) &&
-                            (((i - li) / k1i) >= 0) &&
-                            (((j - lj) / k2j) >= 0) &&
-                            (((m - lm) / k3m) >= 0) &&
-                            (((i - li) / k1i) < BN4) &&
-                            (((j - lj) / k2j) < BN2) &&
-                            (((m - lm) / k3m) < BN3))
-                        {
-                            mb = (i - li) / k1i;
-                            jb = (j - lj) / k2j;
-                            ib = k;
-                            nb = (m - lm) / k3m;
-                            B4[ib][jb][nb][mb] = ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                        }
-                    }
-                }
-    }
-
-    #pragma dvm realign(B4[i][j][][m] with A4[kr1i*i+lri][kr2j*j+lrj][lrn][kr4m*m+lrm])
-    s = 0;
-    #pragma dvm actual(erria, errib, s)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erria), min(errib), sum(s)), private(ia, ja, na, ma)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s += B4[i][j][n][m];
-                    if (B4[i][j][n][m] != val)
-                        errib = Min(errib,val);
-
-                    ia = kr1i*i + lri;
-                    ja = kr2j*j + lrj;
-                    na = lrn;
-                    ma = kr4m*m + lrm;
-                    val = ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma;
-                    if (A4[ia][ja][na][ma] != val)
-                        erria = Min(erria, val);
-                }
-
-    }
-    #pragma dvm get_actual(erria, errib, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-
-    // printf("erri = %u, ER = %u, s = %u, cs = %u\n", erri, ER, s, cs);
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(A4);
-}
-
-/* ---------------------------------------------REALIGN443*/
-    /* ALIGN arrB[i][j][n][m] WITH arrA[i][2*j][3*n][4*m]
-       REALIGN arrB[i][j][n][m] WITH arrA[i+1][j+2]+[n+3][m+4] */
-
-void realign443()
-{
-    #define AN1 10
-    #define AN2 8
-    #define AN3 14
-    #define AN4 12
-    #define BN1 4
-    #define BN2 3
-    #define BN3 5
-    #define BN4 3
-/*  parameters for ALIGN arrB[i][j][n][m] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm] */
-    int k1i = 1, li = 0;
-    int k2j = 2, lj = 0;
-    int k3n = 3, ln = 0;
-    int k4m = 4, lm = 0;
-/*  parameters for REALIGN arrB[i][j][n][m] WITH arrA[kr1i*i+lri][kr2j*j+lrj][kr3n*n+lrn][kr4m*m+lrm] */
-    int kr1i = 1, lri = 1;
-    int kr2j = 1, lrj = 2;
-    int kr3n = 1, lrn = 3;
-    int kr4m = 1, lrm = 4;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([i][j][n][m] with A4[k1i*i + li][k2j*j + lj][k3n*n + ln][k4m*m + lm])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "realign443";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 5;
-
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m + 1;
-                    if (((i - li) == (((i - li) / k1i) * k1i)) &&
-                        ((j - lj) == (((j - lj) / k2j) * k2j)) &&
-                        ((n - ln) == (((n - ln) / k3n) * k3n)) &&
-                        ((m - lm) == (((m - lm) / k4m) * k4m)) &&
-                        (((i - li) / k1i) >= 0) &&
-                        (((j - lj) / k2j) >= 0) &&
-                        (((n - ln) / k3n) >= 0) &&
-                        (((m - lm) / k4m) >= 0) &&
-                        (((i - li) / k1i) < BN1) &&
-                        (((j - lj) / k2j) < BN2) &&
-                        (((n - ln) / k3n) < BN3) &&
-                        (((m - lm) / k4m) < BN4))
-                    {
-                        ib = (i - li) / k1i;
-                        jb = (j - lj) / k2j;
-                        nb = (n - ln) / k3n;
-                        mb = (m - lm) / k4m;
-                        B4[ib][jb][nb][mb] += ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-    }
-
-    #pragma dvm realign(B4[i][j][n][m] with A4[kr1i*i + lri][kr2j*j + lrj][kr3n*n + lrn][kr4m*m + lrm])
-
-    s = 0;
-
-    #pragma dvm actual(erria, errib, s)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erria), min(errib), sum(s)), private(ia, ja, na, ma)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s += B4[i][j][n][m];
-                    if (B4[i][j][n][m] != val + 5)
-                        errib = Min(errib, val);
-
-                    ia=kr1i*i+lri;
-                    ja=kr2j*j+lrj;
-                    na=kr3n*n+lrn;
-                    ma=kr4m*m+lrm;
-                    val = ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma;
-                    if (A4[ia][ja][na][ma] != val + 1)
-                        erria = Min(erria, val);
-                }
-
-    }
-
-    #pragma dvm get_actual(erria, errib, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m + 5;
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf ("%d, %d, %d\n", erria, errib, s);
-    }
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-
-/* ---------------------------------------------REAGLIGN444*/
-    /* ALIGN arrB[i][j][n][m] WITH arrA[m][i+1][j][2*n]
-       REALIGN arrB[i][j][n][m] WITH arrA[i+2][3*j+4][2*n+2][m+1] */
-
-void realign444()
-{
-    #define AN1 12
-    #define AN2 15
-    #define AN3 16
-    #define AN4 10
-    #define BN1 4
-    #define BN2 4
-    #define BN3 5
-    #define BN4 3
-/*  parameters for ALIGN arrB[i][j][n][m] WITH arrA4[k4m*m+lm][k1i*i+li][k2j*j+lj][k3n*n+ln] */
-    int k1i = 1, li = 1;
-    int k2j = 1, lj = 0;
-    int k3n = 2, ln = 0;
-    int k4m = 1, lm = 0;
-/*  parameters for REALIGN arrB[i][j][n][m] WITH arrA[kr1i*i+lri][kr2j*j+lrj][kr3n*n+lrn][kr4m*m+lrm] */
-    int kr1i = 1, lri = 2;
-    int kr2j = 3, lrj = 4;
-    int kr3n = 2, lrn = 2;
-    int kr4m = 1, lrm = 1;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int A4[AN1][AN2][AN3][AN4];
-    #pragma dvm array align([i][j][n][m] with A4[k4m*m+lm][k1i*i+li][k2j*j+lj][k3n*n+ln])
-    int B4[BN1][BN2][BN3][BN4];
-    char tname[] = "realign444";
-
-    erria = ER;
-    errib = ER;
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m])
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    B4[i][j][n][m] = 4;
-
-    #pragma dvm parallel([i][j][n][m] on A4[i][j][n][m]) private(ib, jb, nb, mb)
-    for (i = 0; i < AN1; i++)
-        for (j = 0; j < AN2; j++)
-            for (n = 0; n < AN3; n++)
-                for (m = 0; m < AN4; m++)
-                {
-                    A4[i][j][n][m] = 10 + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    if (
-                       ((i-lm) == (((i-lm)/k4m) * k4m)) &&
-                       ((j-li) == (((j-li)/k1i) * k1i)) &&
-                       ((n-lj) == (((n-lj)/k2j) * k2j)) &&
-                       ((m-ln) == (((m-ln)/k3n) * k3n)) &&
-                       (((i-lm)/k4m) >= 0) &&
-                       (((j-li)/k1i) >= 0) &&
-                       (((n-lj)/k2j) >= 0) &&
-                       (((m-ln)/k3n) >= 0) &&
-                       (((i-lm)/k4m) < BN4)&&
-                       (((j-li)/k1i) < BN1) &&
-                       (((n-lj)/k2j) < BN2) &&
-                       (((m-ln)/k3n) < BN3)
-                      )
-                    {
-                        ib = (j-li)/k1i;
-                        jb = (n-lj)/k2j;
-                        nb = (m-ln)/k3n;
-                        mb = (i-lm)/k4m;
-                        B4[ib][jb][nb][mb] += ib * NL / 10 + jb * NL / 100 + nb * NL / 1000 + mb;
-                    }
-                }
-
-    } /* end region */
-
-    #pragma dvm realign(B4[i][j][n][m] with A4[kr1i*i + lri][kr2j*j + lrj][kr3n*n + lrn][kr4m*m + lrm])
-
-    s = 0;
-
-    #pragma dvm actual(erria, errib, s)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j][n][m] on B4[i][j][n][m]) reduction(min(erria), min(errib), sum(s)), private(ia, ja, na, ma)
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                {
-                    int val = i * NL / 10 + j * NL / 100 + n * NL / 1000 + m;
-                    s += B4[i][j][n][m];
-                    if (B4[i][j][n][m] != val+4)
-                        errib = Min(errib, val);
-
-                    ia=kr1i*i+lri;
-                    ja=kr2j*j+lrj;
-                    na=kr3n*n+lrn;
-                    ma=kr4m*m+lrm;
-                    val = ia * NL / 10 + ja * NL / 100 + na * NL / 1000 + ma;
-                    if (A4[ia][ja][na][ma] != val+10)
-                        erria = Min(erria, val);
-                }
-    }
-
-    #pragma dvm get_actual(erria, errib, s)
-
-    cs = 0;
-    for (i = 0; i < BN1; i++)
-        for (j = 0; j < BN2; j++)
-            for (n = 0; n < BN3; n++)
-                for (m = 0; m < BN4; m++)
-                    cs = cs + i * NL / 10 + j * NL / 100 + n * NL / 1000 + m + 4;
-
-    if ((erria == ER) && (errib == ER) && (s == cs))
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-}
-/* --------------------------------------------- */
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red11n.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red11n.cdv
deleted file mode 100644
index 0cc5548..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red11n.cdv
+++ /dev/null
@@ -1,995 +0,0 @@
-/*  Testing  REDUCTION clause
-    REDUCTION operations: SUM,PRODUCT,MAX,MIN,AND,OR,MAXLOC,MINLOC and
-    their combinations are executed
-    for distributed array A(N)
-*/
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void red1101();
-static void red1102();
-static void red1103();
-static void red1104();
-static void red1105();
-static void red1106();
-static void red1107();
-static void red1108();
-static void red1111();  /* tests 109-110 are absent */
-static void red1112();
-static void red1113();
-static void red1114();
-static void red1115();
-static void red1116();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int sersum1(int *AR, int N, int NL);
-static int sersum1m(int *AR, int N, int NL);
-static float sers1mr(float *RAR, int N, float RNL);
-static int serprod1(int *AR, int N, int NL);
-static float serprodr1(float *AR, int N, float RNL);
-static int serand1(int *AR, int N);
-static int seror1(int *AR, int N);
-
-int main(int an, char **as)
-{
-    printf("===START OF red11n ========================\n");
-
-    red1101();
-    red1102();
-    red1103();
-    red1104();
-    red1105();
-    red1106();
-    red1107();
-    red1108();
-    red1111();
-    red1112();
-    red1113();
-    red1114();
-    red1115();
-    red1116();
-
-    printf("=== END OF red11n ========================= \n");
-    return 0;
-}
-
-/* ---------------------------------------------RED1101 */
-void red1101()
-{
-    #define N 32
-    #define NL 1000
-
-    int C[N];
-    int i, isum1, isumt1;
-
-    char tname[] = "RED1101";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    isum1 = sersum1(C, N, NL);
-    isumt1=0;
-
-    #pragma dvm actual(isumt1)
-
-    #pragma dvm region inout(A)
-    {
-
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL+i;
-
-    #pragma dvm parallel([i] on A[i]) reduction(sum(isumt1))
-    for (i = 0; i < N; i++)
-        isumt1 = isumt1 + A[i];
-
-    } /* end region */
-
-    #pragma dvm get_actual(isumt1)
-
-    if (isum1 == isumt1)
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf("isum1=%d isumt1=%d\n",isum1,isumt1);
-    }
-
-    #undef N
-    #undef NL
-}
-
-/* ---------------------------------------------RED1102  */
-void red1102()
- {
-    #define N 15
-    #define NL 2
-
-    int C[N];
-    int i;
-    int iprod1, iprodt1;
-    char tname[] = "RED1102";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    iprod1 = serprod1(C, N, NL);
-
-    iprodt1 = 1;
-
-    #pragma dvm actual(iprodt1)
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    #pragma dvm parallel([i] on A[i]) reduction(product(iprodt1))
-    for (i = 0; i < N; i++)
-        iprodt1 = iprodt1 * A[i];
-
-    } /* end region */
-
-    #pragma dvm get_actual(iprodt1)
-
-    if (iprod1 == iprodt1)
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf ("iprod1 = %d, iprodt1 = %d\n", iprod1, iprodt1);
-    }
-
-    #undef N
-    #undef NL
-}
-
-/* ---------------------------------------------RED1103  */
-void red1103()
-{
-    #define N 30
-    #define NL 1003
-
-    int C[N];
-    int i, imax1, imaxt1, ni;
-    char tname[] = "RED1103";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    ni = N / 2 - 1;
-    A[ni] = N + 1 + NL;
-
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[1])
-    {
-    imaxt1 = A[1];
-    }
-    #pragma dvm actual(imaxt1)
-    } /* end host_section */
-
-    #pragma dvm parallel([i] on A[i]) reduction(max(imaxt1))
-    for (i = 0; i < N; i++)
-        if (A[i] > imaxt1) imaxt1 = A[i];
-
-    } /* end region */
-
-    #pragma dvm get_actual(imaxt1)
-
-    imax1 = N + 1 + NL;
-
-    if (imax1 == imaxt1)
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf("imax1=%d imaxt1=%d\n",imax1,imaxt1);
-    }
-
-    #undef N
-    #undef NL
-}
-
-/* ---------------------------------------------RED1104  */
-void red1104()
-{
-    #define N 16
-    #define NL 1004
-    int C[N];
-    int i, imin1, imint1, ni;
-    char tname[] = "RED1104";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    } /* end region */
-
-    #pragma dvm remote_access(A[1])
-    {
-    imint1 = A[1];
-    }
-
-    ni = N / 2 + 1;
-    A[ni] = -(N + 1 + NL);
-    imin1 = -(N + 1 + NL);
-
-    #pragma dvm actual(imint1, A[ni])
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i]) reduction(min(imint1))
-    for (i = 0; i < N; i++)
-        if (A[i] < imint1) imint1 = A[i];
-    } /* end region */
-
-    #pragma dvm get_actual(imint1)
-
-    if (imin1 == imint1)
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf("imin1=%d imint1=%d\n",imin1,imint1);
-    }
-
-    #undef N
-    #undef NL
-}
-
-/* ---------------------------------------------RED1105 */
-void red1105()
-{
-    #define N 32
-    #define RNL 1005.
-
-    float C[N];
-    int i, ni;
-    float imax1, imaxt1;
-    char tname[] = "RED1105";
-
-    #pragma dvm array distribute[block]
-    float A[N];
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = RNL + i;
-
-    ni = N / 2 - 1;
-    A[ni] = N + 1. + RNL;
-    imax1 = N + 1. + RNL;
-
-    } /* end region */
-
-    #pragma dvm get_actual(imax1)
-
-    #pragma dvm remote_access(A[1])
-    {
-    imaxt1 = A[1];
-    }
-
-    #pragma dvm actual(imaxt1)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i]) reduction(max(imaxt1))
-    for (i = 0; i < N; i++)
-        if (A[i] > imaxt1) imaxt1=A[i];
-
-    } /* end region */
-
-    #pragma dvm get_actual(imaxt1)
-
-    if (imax1 == imaxt1)
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf("imax1=%f imaxt1=%f\n",imax1,imaxt1);
-    }
-
-    #undef N
-    #undef RNL
-}
-
-/* ---------------------------------------------RED1106  */
-void red1106()
-{
-    #define N 11
-    float RNL = 1.;
-
-    float C[N];
-    int i;
-    float iprod1, iprodt1;
-    char tname[] = "RED1106";
-
-    #pragma dvm array distribute[block]
-    float A[N];
-
-    iprod1 = serprodr1(C, N, RNL);
-    iprodt1 = 1.;
-
-    #pragma dvm actual(iprodt1)
-
-    #pragma dvm region out(A)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = RNL + i;
-
-    #pragma dvm parallel([i] on A[i]) reduction(product(iprodt1))
-    for (i = 0; i < N; i++)
-       iprodt1 = iprodt1 * A[i];
-
-    } /* end region */
-
-    #pragma dvm get_actual(iprodt1)
-
-    if (iprod1 == iprodt1)
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf ("iprod1 = %f, iprodt1 = %f\n",  iprod1, iprodt1);
-    }
-
-    #undef N
-}
-
-/* ---------------------------------------------RED1107 */
-void red1107()
-{
-    #define N 31
-
-    int CL[N];
-    int i;
-    int land1, landt1;
-    char tname[] = "RED1107";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    land1 = serand1(CL, N);
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i+=2)
-        A[i] = 1;
-
-    #pragma dvm parallel([i] on A[i])
-    for (i = 1; i < N; i+=2)
-        A[i] = 0;
-
-    } /* end region */
-
-//    # pragma dvm get_actual(A)
-
-    #pragma dvm remote_access(A[1])
-    {
-    landt1 = A[1];
-    }
-
-    #pragma dvm actual(landt1)
-
-    #pragma dvm region inlocal(A)
-    {
-    #pragma dvm parallel([i] on A[i]) reduction(and(landt1))
-    for (i = 0; i < N; i++)
-       landt1 = landt1 && A[i];
-
-    } /* end region */
-
-    #pragma dvm get_actual(landt1)
-
-    if (land1 == landt1)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-}
-
-/* ---------------------------------------------RED1108  */
-void red1108()
-{
-    #define N 17
-
-    int CL[N];
-    int i;
-    int lor1,lort1;
-    char tname[] = "RED1108";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    lor1 = seror1(CL, N);
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = i % 2;
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[1])
-    {
-    lort1 = A[1];
-    }
-    #pragma dvm actual(lort1)
-    }
-
-    #pragma dvm parallel([i] on A[i]) reduction(or(lort1))
-    for (i = 0; i < N; i++)
-       lort1 = lort1 || A[i];
-
-    } /* end region */
-
-    #pragma dvm get_actual(lort1)
-
-    if (lor1 == lort1)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-}
-
-/* ---------------------------------------------RED1111 */
-void red1111()
-{
-    #define N 32
-    #define NL 1000
-
-    int C[N];
-    int i, imaxloc1, imaxloct1, it1, ni;
-    char tname[] = "RED1111";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-
-    ni = N / 2 + 1;
-    A[ni] = N + 1 + NL;
-    imaxloc1 = N + 1 + NL;
-
-    #pragma dvm remote_access(A[0])
-    {
-    imaxloct1 = A[0];
-    }
-
-    #pragma dvm actual(imaxloct1)
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i]) reduction(maxloc(imaxloct1, it1))
-    for (i = 0; i < N; i++)
-        if (A[i] > imaxloct1) {
-            imaxloct1 = A[i];
-            it1 = i;
-        }
-    } /* end region */
-
-    #pragma dvm get_actual(imaxloct1,it1)
-
-    if ((imaxloct1 == imaxloc1) && (it1 == ni))
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf("imax1=%d imaxt1=%d imaxloct1=%d it1=%d ni=%d\n",
-//             imax1,imaxt1,imaxloct1,it1,ni);
-    }
-
-    #undef N
-    #undef NL
-}
-
-/* ---------------------------------------------RED1112  */
-void red1112()
-{
-    #define N 27
-    int NL = 1012;
-    int C[N];
-    int i, ni, iminloc1, iminloct1,it2;
-    char tname[] = "RED1112";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-    } /* end region */
-
-    #pragma dvm get_actual(A)
-
-    ni = N / 2 + 2;
-    A[ni] = - (N + 1 + NL);
-    #pragma dvm actual(A[ni])
-    iminloc1 = -(N + 1 + NL);
-
-    #pragma dvm remote_access(A[3])
-    {
-    iminloct1=A[3];
-    }
-
-    #pragma dvm actual(iminloct1)
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i]) reduction(minloc(iminloct1, it2))
-    for (i = 0; i < N; i++)
-        if (A[i] < iminloct1) {
-           iminloct1 = A[i];
-           it2 = i;
-        }
-    } /* end region */
-
-    #pragma dvm get_actual(iminloct1, it2)
-
-    if ((iminloct1 == iminloc1) && (it2 == ni))
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf("imin1=%d imint1=%d iminloct1=%d it2=%d ni=%d\n",
-//              imin1,imint1,iminloct1,it2,ni);
-    }
-
-    #undef N
-}
-
-/* ---------------------------------------------RED1113 */
-void red1113()
-{
-    #define N 24
-    #define NL 1003
-
-    int C[N];
-    int i, isum1, isumt1, imax1, imaxt1, imin1, imint1, ni;
-    char tname[] = "RED1113";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    isum1 = sersum1m(C, N, NL);
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL+i;
-    } /* end region */
-
-    ni = N / 2 - 2;
-    A[ni] = N + 1 + NL;
-    #pragma dvm actual(A[ni])
-
-    imax1 = N + 1 + NL;
-
-    #pragma dvm remote_access(A[1])
-    {
-    imaxt1 = A[1];
-    }
-
-    ni = N / 2;
-    A[ni] = -(N + 1 + NL);
-    #pragma dvm actual(A[ni])
-
-    imin1 = -(N + 1 + NL);
-    imint1 = imaxt1;
-
-    isumt1 = 0;
-
-    #pragma dvm actual(isumt1, imaxt1, imint1)
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i]) reduction(sum(isumt1), max(imaxt1), min(imint1))
-    for (i = 0; i < N; i++)
-    {
-        isumt1 = isumt1 + A[i];
-        if (A[i] > imaxt1) imaxt1 = A[i];
-        if (A[i] < imint1) imint1 = A[i];
-    }
-    } /* end region */
-
-    #pragma dvm get_actual(isumt1, imaxt1, imint1)
-
-    if ((isum1 == isumt1) && (imax1 == imaxt1) && (imin1 == imint1))
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf("isum1=%d isumt1=%d\n",isum1,isumt1);
-//      printf("imax1=%d imaxt1=%d\n",imax1,imaxt1);
-//      printf("imin1=%d imint1=%d\n",imin1,imint1);
-    }
-
-    #undef N
-    #undef NL
-}
-
-/* ---------------------------------------------RED1114  */
-void red1114()
-{
-    #define N 13
-    #define NL 2
-
-    int C[N],CL[N];
-    char tname[] = "RED1114";
-    int i;
-    int iprod1, iprodt1;
-    int land1, landt1;
-
-    #pragma dvm array distribute[block]
-    int A[N];
-    #pragma dvm array align([i] with A[i])
-    int B[N];
-
-    iprod1 = serprod1(C, N, NL);
-    land1 = serand1(CL, N);
-
-    #pragma dvm region inout(A)
-    {
-
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL + i;
-    #pragma dvm parallel([i] on B[i])
-    for (i = 0; i < N; i++)
-        B[i] = i%2;
-    } /* end region */
-
-//    #pragma dvm get_actual (B[1])
-
-    #pragma dvm remote_access(B[1])
-    {
-    landt1 = B[1];
-    }
-
-    iprodt1 = 1;
-
-    #pragma dvm actual (landt1, iprodt1)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on A[i]) reduction(product(iprodt1), and(landt1))
-    for (i = 0; i < N; i++)
-    {
-       iprodt1 = iprodt1 * A[i];
-       landt1 = landt1 && B[i];
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(iprodt1, landt1)
-
-    if ((iprod1 == iprodt1) && (land1 == landt1))
-       ansyes(tname);
-    else
-    {
-       ansno(tname);
-//     printf ("iprod1 = %f, iprodt1 = %f\n", iprod1, iprodt1);
-    }
-
-    #undef N
-    #undef NL
-}
-
-/* ---------------------------------------------RED1115  */
-void red1115()
-{
-    #define N 22
-    #define NL 1015
-
-    int C[N];
-    int i, imax1, imaxt1, imin1, ni1, ni2;
-    int imaxloct1, iminloct1, it1, it2;
-    char tname[] = "RED1115";
-
-    #pragma dvm array distribute[block]
-    int A[N];
-
-    #pragma dvm region inout(A)
-    {
-
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = NL+i;
-
-    } /* end region */
-
-    ni1 = N / 2 - 3;
-    A[ni1] = N + 1 + NL;
-    imax1 = N + 1 + NL;
-
-    ni2 = N / 2 + 2;
-    A[ni2] = -(N + 1 + NL);
-    imin1 = -(N + 1 + NL);
-
-    #pragma dvm remote_access(A[1])
-    {
-    imaxt1=A[1];
-    }
-
-    imaxloct1 = imaxt1;
-    iminloct1 = imaxloct1;
-
-    #pragma dvm actual(A[ni1], A[ni2], imaxt1, imaxloct1, iminloct1)
-
-    #pragma dvm region inout(A)
-    {
-    #pragma dvm parallel([i] on A[i]) reduction(max(imaxt1),maxloc(imaxloct1,it1), minloc(iminloct1,it2))
-    for (i = 0; i < N; i++)
-    {
-        if (A[i] > imaxt1) imaxt1 = A[i];
-        if (A[i] > imaxloct1)
-        {
-            imaxloct1 = A[i];
-            it1 = i;
-        }
-        if (A[i] < iminloct1)
-        {
-            iminloct1 = A[i];
-            it2 = i;
-        }
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(imaxt1, imaxloct1, it1, iminloct1, it2)
-
-    if ((imaxloct1 == imax1) && (iminloct1 == imin1) &&
-       (imaxt1 == imaxloct1) && (it1 == ni1) && (it2 == ni2))
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf("imax1=%d imaxt1=%d imaxloct1=%d it1=%d ni1=%d\n",
-//              imax1,imaxt1,imaxloct1,it1,ni1);
-//      printf("imin1=%d  iminloct1=%d it2=%d ni2=%d\n",
-//              imin1,iminloct1,it2,ni2);
-    }
-
-    #undef N
-    #undef NL
-}
-
-/* ---------------------------------------------RED1116  */
-void red1116()
-{
-    #define N 28
-    #define RNL 1016.
-
-    float C[N];
-    int i, ni1, ni2, it1, it2;
-    float isum1, isumt1, imax1, imin1;
-    float imaxloct1, iminloct1;
-    char tname[] = "RED1116";
-
-    #pragma dvm array distribute[block]
-    float A[N];
-
-    isum1 = sers1mr(C, N, RNL);
-
-/*  printf("c=%d isum1=%d\n",C[1],isum1); */
-
-    imax1 = N + 1. + RNL;
-    imin1 = -(N + 1 + RNL);
-
-    #pragma dvm region inout(A, ni1, ni2)
-    {
-    #pragma dvm parallel([i] on A[i])
-    for (i = 0; i < N; i++)
-        A[i] = RNL + i;
-
-    ni1 = N / 2 - 1;
-    A[ni1] = N + 1. + RNL;
-
-    ni2 = N / 2 + 1;
-    A[ni2] = -(N + 1 + RNL);
-
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[1])
-    {
-    imaxloct1 = A[1];
-    }
-    #pragma dvm actual(imaxloct1)
-    }
-
-    iminloct1 = imaxloct1;
-
-    isumt1 = 0.;
-
-    #pragma dvm parallel([i] on A[i]) reduction(sum(isumt1), maxloc(imaxloct1, it1), minloc(iminloct1, it2))
-    for (i = 0; i < N; i++)
-    {
-        isumt1 = isumt1 + A[i];
-        if (A[i] > imaxloct1)
-        {
-            imaxloct1 = A[i];
-            it1 = i;
-        }
-        if (A[i] < iminloct1)
-        {
-            iminloct1 = A[i];
-            it2 = i;
-        }
-    }
-
-    } /* end region */
-
-    #pragma dvm get_actual(isumt1, imaxloct1, iminloct1)
-
-    if ((isum1 == isumt1) && (imaxloct1 == imax1) && (iminloct1 == imin1) &&
-       (it1 == ni1) && (it2 == ni2))
-        ansyes(tname);
-    else
-    {
-        ansno(tname);
-//      printf("isum1=%f isumt1=%f\n",isum1,isumt1);
-//      printf("imax1=%f imaxloct1=%f it1=%d ni1=%d\n",
-//          imax1,imaxloct1,it1,ni1);
-//      printf("imin1=%f iminloct1=%f it2=%d ni2=%d\n",
-//          imin1,iminloct1,it2,ni2);
-    }
-
-    #undef N
-    #undef RNL
-}
-
-/* --------------------------------------------- */
-
-int sersum1(int *AR, int NN, int NL)
-{
-    int i, s;
-
-    for (i = 0; i < NN; i++)
-        AR[i] = NL+i;
-
-    s=0;
-
-    for (i = 0; i < NN; i++)
-        s = s + AR[i];
-
-//  printf("s=%d\n",s);
-
-    return s;
-}
-
-int sersum1m(int *AR, int NN, int NL)
-{
-    int i, ni, s;
-
-    for (i = 0; i < NN; i++)
-        AR[i] = NL + i;
-    ni = NN / 2 - 2;
-    AR[ni] = NN + 1 + NL;
-    ni= NN / 2;
-    AR[ni] = -(NN + 1 + NL);
-
-    s = 0;
-    for (i = 0; i < NN; i++)
-        s = s + AR[i];
-
-//  printf("s=%d\n",s);
-
-    return s;
-}
-
-float sers1mr(float *RAR, int NN, float RNL)
-{
-    int i, ni;
-    float s;
-
-    for (i = 0; i < NN; i++)
-        RAR[i] = RNL + i;
-    ni = NN / 2 - 1;
-    RAR[ni]=NN + 1.+ RNL;
-    ni = NN / 2 + 1;
-    RAR[ni] = -(NN + 1.+ RNL);
-
-    s = 0;
-    for (i = 0; i < NN; i++)
-        s = s + RAR[i];
-//  printf("s=%d\n",s);
-
-    return s;
-}
-
-int serprod1(int *AR, int NN, int NL)
-{
-    int i, p;
-
-    for (i = 0; i < NN; i++)
-        AR[i] = NL + i;
-
-    p = 1;
-    for (i = 0; i < NN; i++)
-       p = p * AR[i];
-
-    return p;
-}
-
-float serprodr1(float *AR, int NN, float RNL)
-{
-    int i;
-    float p;
-
-    for (i = 0; i < NN; i++)
-        AR[i] = RNL + i;
-
-    p = 1.;
-    for (i = 0; i < NN; i++)
-        p = p * AR[i];
-
-    return p;
-}
-
-int serand1(int *AR, int NN)
-{
-    int i, ni, LAND;
-
-    for (i = 0; i < NN; i++)
-        AR[i] = i % 2;
-
-    LAND = AR[1];
-
-    for (i = 0; i < NN; i++)
-        LAND = LAND && AR[i];
-
-    return LAND;
-}
-
-int seror1(int *AR, int NN)
-{
-    int i, LOR;
-
-    for (i = 0; i < NN; i++)
-        AR[i] = i % 2;
-
-    LOR = AR[1];
-
-    for (i = 0; i < NN; i++)
-        LOR = LOR || AR[i];
-
-    return LOR;
-}
-
-/* --------------------------------------------- */
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-     printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red21m.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red21m.cdv
deleted file mode 100644
index aac1b4e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REDUCTION/red21m.cdv
+++ /dev/null
@@ -1,915 +0,0 @@
-/*      TESTING OF THE REDUCTION CLAUSE .
-      REDUCTION OPERATION : SUM.PRODUCT,MAX,MIN,AND,OR,MAXLOC,MINLOC AND
-      THEIR COMBINATION ARE EXECUTED
-      FOR DISTRIBUTED ARRAY A[N][M].
-*/
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define N 8
-#define M 8
-#define NL 1000
-#define RNL 1000.
-#define PNL 1
-#define RPNL 1.
-
-static void red2101();
-static void red2102();
-static void red2103();
-static void red2104();
-static void red2105();
-static void red2106();
-static void red2107();
-static void red2108();
-static void red2109();
-static void red2111();
-static void red2112();
-static void red2113();
-static void red2114();
-
-static int sersum2(int AR[N][M], int NN, int NM, int NNL);
-static int sersum2m(int AR[N][M], int NN, int NM, int NNL);
-static float sers2mr(float RAR[N][M], int NN, int NM, float RNNL);
-static long serprod2(int AR[N][M], int NN, int NM, int NNL);
-static float serprodr2(float AR[N][M], int NN, int NM, float NNL);
-static int serand2(int AR[N][M], int NN, int NM, int NNL);
-static int seror2(int AR[N][M], int NN, int NM, int NNL);
-static int serxor2(int AR[N][M], int NN, int NM, int NNL);
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int argc, char *argv[])
-{
-    printf("===START OF red21m ========================\n");
-    red2101();
-    red2102();
-    red2103();
-    red2104();
-    red2105();
-    red2106();
-    red2107();
-    red2108();
-    red2109();
-    red2111();
-    red2112();
-    red2113();
-    red2114();
-
-    printf("=== END OF red21m ========================= \n");
-    return 0;
-}
-/* ---------------------------------------------RED2101  */
-void red2101()
-{
-    int C[N][M];
-    char tname[] = "RED2101";
-    int i, j, NN, NM, NNL, ISUM1, isum1, isumt1;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-    isum1 = sersum2(C, NN, NM, NNL);
-/*      printf("isum1=%d\n",isum1);*/
-
-    isumt1 = 0;
-    #pragma dvm actual(isumt1)
-    #pragma dvm region local(A)
-    {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(sum(isumt1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            isumt1 = isumt1 + A[i][j];
-    } /*end region*/
-
-    #pragma dvm get_actual(isumt1)
-
-    if (isum1 == isumt1)
-        ansyes(tname);
-    else
-        ansno(tname);
-//      printf("isum1=%d isumt1=%d\n",isum1,isumt1);
-}
-/* ---------------------------------------------RED2102  */
-void red2102()
-{
-    int C[N][M], CL[N][M];
-    char tname[] = "RED2102";
-    int i, j, NN, NM, NNL;
-    long iprod1, iprodt1;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = PNL;
-
-    iprod1 = serprod2(C, NN, NM, NNL);
-
-    iprodt1 = 1;
-    #pragma dvm actual(iprodt1)
-    #pragma dvm region local(A)
-    {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NNL + i + j;
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(product(iprodt1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            iprodt1 = iprodt1 * A[i][j];
-/*       printf("iprodt1=%ld\n",iprodt1);*/
-     } /*end region*/
-
-    #pragma dvm get_actual(iprodt1)
-/*       printf("iprod1=%ld iprodt1=%ld \n",
-             iprod1,iprodt1);*/
-
-    if (iprod1 == iprodt1)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/*  ---------------------------------------------RED2103*/
-void red2103()
-{
-    int C[N][M];
-    char tname[] = "RED2103";
-    int i, j, NN, NM, NNL, imax1, imaxt1, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-    ni = N / 2 - 1;
-    nj = M / 2 - 1;
-    imax1 = N + M + 1 + NL;
-
-    #pragma dvm actual(imax1, ni, nj)
-//      #pragma dvm region local(A)
-//      {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NNL + i + j;
-    A[ni][nj] = N + M + 1 + NNL;
-
-    #pragma dvm actual(A)
-    #pragma dvm region in(A)
-    {
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[0][0])
-    {
-    imaxt1=A[0][0];
-//      printf("imaxt1=%d\n",imaxt1);
-    }
-    #pragma dvm actual(imaxt1)
-    }
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(max(imaxt1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            if (A[i][j] > imaxt1) imaxt1=A[i][j];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(imaxt1)
-
-    if (imax1 == imaxt1)
-        ansyes(tname);
-    else
-        ansno(tname);
-//     printf("imax1=%d imaxt1=%d\n",imax1,imaxt1);
-}
-
- /*---------------------------------------------RED2104 */
-void red2104()
-{
-    int C[N][M];
-    char tname[] = "RED2104";
-    int i, j, NN, NM, NNL, imin1, imint1, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    ni = N / 2 +1;
-    nj = M / 2 + 1;
-    imin1 = -(N + M + 1 + NL);
-
-    #pragma dvm actual(imin1, ni, nj)
-//      #pragma dvm region local(A)
-//      {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[ni][nj] = -(N + M + 1 + NL);
-
-    #pragma dvm actual(A)
-    #pragma dvm region in(A)
-    {
-
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[0][0])
-    {
-    imint1=A[0][0];
-//      printf("imint1=%d\n",imint1);
-    }
-    #pragma dvm actual(imint1)
-    }
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(min(imint1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            if (A[i][j] < imint1) imint1=A[i][j];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(imint1)
-
-    if (imin1 == imint1)
-        ansyes(tname);
-    else
-        ansno(tname);
-//      printf("imin1=%d imint1=%d\n",imin1,imint1);
-}
-/* ---------------------------------------------RED2105*/
-void red2105()
-{
-    float C[N][M];
-    char tname[] = "RED2105";
-    int i, j, NN, NM, NNL, ni, nj;
-    float imax1, imaxt1;
-
-    #pragma dvm array distribute[block][block]
-    float A[N][M];
-
-    NN = N;
-    ni = N / 2 - 1;
-    nj = M / 2 - 1;
-    imax1= N + M + 1. + RNL;
-
-    #pragma dvm actual(imax1, ni, nj)
-//      #pragma dvm region local(A)
-//      {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-    A[ni][nj] = N + M + 1. + RNL;
-
-    #pragma dvm actual(A)
-    #pragma dvm region in(A)
-    {
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[0][0])
-    {
-    imaxt1=A[0][0];
-    }
-    #pragma dvm actual(imaxt1)
-    }
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(max(imaxt1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            if (A[i][j] > imaxt1) imaxt1 = A[i][j];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(imaxt1)
-    if (imax1 == imaxt1)
-        ansyes(tname);
-    else
-        ansno(tname);
-/*      printf("imax1=%f imaxt1=%f\n",imax1,imaxt1); */
-}
-/* ---------------------------------------------RED2106 */
-void red2106()
-{
-    float C[N][M], CL[N][M];
-    char tname[] = "RED2106";
-    int i, j, NN, NM, NNL;
-    float iprod1, iprodt1, RNNL;
-
-    #pragma dvm array distribute[block][block]
-    float A[N][M];
-
-    NN = N;
-    NM = M;
-    RNNL = RPNL;
-
-    iprod1 = serprodr2(C, NN, NM, RNNL);
-    iprodt1 = 1;
-
-    #pragma dvm actual(iprodt1)
-    #pragma dvm region local(A)
-    {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(product(iprodt1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            iprodt1 = iprodt1 * A[i][j];
-/*       printf("iprodt1=%ld\n",iprodt1);*/
-    } /*end region*/
-
-    #pragma dvm get_actual(iprodt1)
-/*       printf("iprod1=%ld iprodt1=%ld \n",
-             iprod1,iprodt1);
-*/
-    if (iprod1 == iprodt1)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------RED2107*/
-void red2107()
-{
-    int C[N][M], CL[N][M];
-    char tname[] = "RED2107";
-    int i, j, NN, NM, NNL;
-    int land1, landt1;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    land1 = serand2(CL, NN, NM, NNL);
-
-    #pragma dvm actual(land1)
-    #pragma dvm region local(A)
-    {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j += 2)
-            A[i][j] = 1;
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 1; j < M; j += 2)
-            A[i][j] = 0;
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[0][0])
-    {
-    landt1=A[0][0];
-    }
-    #pragma dvm actual(landt1)
-    }
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(and(landt1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            landt1 = landt1 && A[i][j];
-     } /*end region*/
-
-    #pragma dvm get_actual(landt1)
-/*       printf(" land1=%d landt1=%d\n",
-             land1,landt1);*/
-
-    if (land1 == landt1)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------RED2108*/
-void red2108()
-{
-    int C[N][M], CL[N][M];
-    char tname[] = "RED2108";
-    int i, j, NN, NM, NNL;
-    int lor1, lort1;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    lor1 = seror2(CL, NN, NM, NNL);
-
-    #pragma dvm actual(lor1)
-    #pragma dvm region local(A)
-    {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j += 2)
-            A[i][j] = 1;
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 1; j < M; j += 2)
-            A[i][j] = 0;
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[0][0])
-    {
-    lort1=A[0][0];
-    }
-    #pragma dvm actual(lort1)
-    }
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(or(lort1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            lort1 = lort1 || A[i][j];
-    } /*end region*/
-
-    #pragma dvm get_actual(lort1)
-
-    if (lor1 == lort1)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------RED2109*/
-void red2109()
-{
-    int C[N][M], CL[N][M];
-    char tname[] = "RED2109";
-    int i, j, NN, NM, NNL;
-    int lxor1, lxort1;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    lxor1 = serxor2(CL, NN, NM, NNL);
-
-    #pragma dvm actual(lxor1)
-    #pragma dvm region local(A)
-    {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j += 2)
-            A[i][j] = 1;
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 1; j < M; j += 2)
-            A[i][j] = 0;
-    #pragma dvm host_section
-    {
-    lxort1 = 0;
-    #pragma dvm actual(lxort1)
-    }
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(xor(lxort1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            lxort1 = lxort1 ^ A[i][j];
-    } /*end region*/
-
-    #pragma dvm get_actual(lxort1)
-
-    if (lxor1 == lxort1)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------RED2111*/
-void red2111()
-{
-    int C[N][M];
-    char tname[] = "RED2111";
-    int i, j, NN, NM, NNL, imax1, imaxt1, ni, ni1, nj, nj1;
-    int imaxloct1;
-    int coor[2];
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    ni = N / 2 - 1;
-    nj = M / 2 - 1;
-    imax1 = N + M + 1 + NL;
-
-    #pragma dvm actual(imax1,ni,nj)
-//      #pragma dvm region local(A)
-//      {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-             A[i][j] = NL + i + j;
-    A[ni][nj] = N + M + 1 + NL;
-
-    #pragma dvm actual(A)
-    #pragma dvm region in(A)
-    {
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[0][0])
-    {
-     imaxt1=A[0][0];
-    }
-    #pragma dvm actual(imaxt1)
-    }
-    imaxloct1 = imaxt1;
-    coor[0] = 0;
-    coor[1] = 0;
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(maxloc(imaxloct1, coor))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            if (A[i][j] > imaxloct1)
-            {
-                imaxloct1 = A[i][j];
-                coor[0] = i;
-                coor[1] = j;
-            }
-
-    } /*end region*/
-
-    #pragma dvm get_actual(imaxloct1, coor)
-    if ((imaxloct1 == imax1) && (coor[0] == ni) && (coor[1] == nj))
-        ansyes(tname);
-    else
-        ansno(tname);
-/*      printf("imax1=%d imaxt1=%d imaxloct1=%d coor=%d %d ni=%d\n",
-            imax1,imaxt1,imaxloct1,coor[0],coor[1],ni); */
-}
- /*---------------------------------------------RED2112*/
-void red2112()
-{
-    int C[N][M];
-    char tname[] = "RED2112";
-    int i, j, NN, NM, NNL, imin1, imint1, ni, ni1, nj1;
-    int iminloct1;
-    int coor[2];
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-    ni1 = N /2 + 1;
-    nj1 = M / 2 +1;
-    imin1 = -(N + 1 + M + NL);
-
-    #pragma dvm actual(imin1, ni1, nj1)
-//      #pragma dvm region local(A)
-//      {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-    A[ni1][nj1] = -(N + 1 + M + NL);
-
-    #pragma dvm actual(A)
-    #pragma dvm region in(A)
-    {
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[0][0])
-    {
-     imint1 = A[0][0];
-    }
-    #pragma dvm actual(imint1)
-    }
-    iminloct1 = imint1;
-    coor[0] = 0;
-    coor[1] = 0;
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(minloc(iminloct1,coor))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            if (A[i][j] < iminloct1)
-            {
-                iminloct1 = A[i][j];
-                coor[0] = i;
-                coor[1] = j;
-            }
-    } /*end region*/
-
-    #pragma dvm get_actual(iminloct1, coor)
-
-    if ((iminloct1 == imin1) && (coor[0] == ni1) && (coor[1] == nj1))
-        ansyes(tname);
-    else
-        ansno(tname);
-/*      printf("imin1=%d imint1=%d iminloct1=%d coor=%d %d ni1=%d\n",
-            imin1,imint1,iminloct1,coor[0],coor[1],ni1);*/
-}
-
-/* ---------------------------------------------RED2113*/
-void red2113()
-{
-    int C[N][M];
-    char tname[] = "RED2113";
-    int i, j, NN, NM, NNL, ISUM1, isum1, isumt1, imax1, imaxt1, imin1, imint1, ni, nj;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-    isum1 = sersum2m(C, NN, NM, NNL);
-    imax1 = N + M + 1 + NL;
-
-    ni = N / 2 - 1;
-    nj = M / 2 - 1;
-    imin1 = -(N + M + 1 + NL);
-    isumt1 = 0;
-
-    #pragma dvm actual(imin1, imax1, isumt1, ni, nj)
-//      #pragma dvm region local(A)
-//      {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    A[ni][nj] = -(N + M + 1 + NL);
-    A[ni+1][nj+1] = N + M + 1 + NL;
-
-    #pragma dvm actual(A)
-    #pragma dvm region in(A)
-    {
-
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(A[0][0])
-    {
-     imaxt1 = A[0][0];
-    }
-    #pragma dvm actual(imaxt1)
-    }
-    imint1 = imaxt1;
-
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(sum(isumt1), max(imaxt1), min(imint1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-        {
-            isumt1 = isumt1 + A[i][j];
-            if (A[i][j] > imaxt1) imaxt1 = A[i][j];
-            if (A[i][j] < imint1) imint1 = A[i][j];
-        }
-    } /*end region*/
-
-    #pragma dvm get_actual(isumt1, imaxt1, imint1)
-
-    if ((isum1 == isumt1) && (imax1 == imaxt1) && (imin1 == imint1))
-        ansyes(tname);
-    else
-        ansno(tname);
-/*     printf("isum1=%d isumt1=%d\n",isum1,isumt1);
-    printf("imax1=%d imaxt1=%d\n",imax1,imaxt1);
-    printf("imin1=%d imint1=%d\n",imin1,imint1);  */
-}
-/* ---------------------------------------------RED2114*/
-void red2114()
-{
-    int C[N][M], CL[N][M];
-    char tname[] = "RED2114";
-    int i, j, NN, NM, NNL;
-    int iprod1, iprodt1;
-    int land1, landt1;
-
-    #pragma dvm array distribute[block][block]
-    int A[N][M];
-    #pragma dvm array align([i][j]with A[i][j])
-    int B[N][M];
-
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-
-    iprod1 = serprod2(C, NN, NM, NNL);
-    land1 = serand2(CL, NN, NM, NNL);
-
-    #pragma dvm actual(iprod1, land1)
-    #pragma dvm region local(A), local(B)
-    {
-
-    #pragma dvm parallel([i][j] on B[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-    #pragma dvm parallel([i][j] on B[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j += 2)
-            B[i][j] = 1;
-
-    #pragma dvm parallel([i][j] on B[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 1; j < M; j += 2)
-            B[i][j] = 0;
-
-    #pragma dvm host_section
-    {
-    #pragma dvm remote_access(B[0][0])
-    {
-    landt1 = B[0][0];
-    }
-    #pragma dvm actual(landt1)
-    }
-
-    iprodt1 = 1;
-    #pragma dvm parallel([i][j] on A[i][j]) reduction(product(iprodt1), and(landt1))
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-        {
-            iprodt1 = iprodt1*A[i][j];
-            landt1 = landt1 && B[i][j];
-        }
-
-    } /*end region*/
-    #pragma dvm get_actual(iprodt1,landt1)
-
-/*       printf("iprod1=%d iprodt1=%d land1=%d landt1=%d\n",
-             iprod1,iprodt1,land1,landt1); */
-
-    if ((iprod1 == iprodt1) && (land1 == landt1))
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-int sersum2(int AR[N][M], int NN, int NM, int NNL)
-{
-    int i, j, S;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            AR[i][j] = NNL + i + j;
-
-    S = 0;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            S = S + AR[i][j];
-
-/*      printf("s=%d\n",S);*/
-    return S;
-}
-int sersum2m(int AR[N][M], int NN, int NM, int NNL)
-{
-    int i, j, ni, nj, S;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            AR[i][j] = NNL + i + j;
-    ni = NN / 2 - 1;
-    nj = NM / 2 - 1;
-    AR[ni][nj] = NN + NM + 1 + NNL;
-    ni = NN / 2;
-    nj = NM / 2;
-    AR[ni][nj] = -(NN + NM + 1 + NNL);
-    S = 0;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            S = S + AR[i][j];
-/*      printf("s=%d\n",S);*/
-    return S;
-}
-float sers2mr(float RAR[N][M], int NN, int NM, float NNL)
-{
-    int i, j, ni, nj;
-    float S;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            RAR[i][j] = NNL+i+j;
-
-    ni = NN / 2 - 1;
-    nj = NM / 2 - 1;
-    RAR[ni][nj] = NN + NM + 1. + NNL;
-    ni = NN / 2 + 1;
-    nj = NM / 2 + 1;
-    RAR[ni][nj] = -(NN + NM + 1. + NNL);
-    S = 0;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            S = S + RAR[i][j];
-
-/*      printf("s=%d\n",S);*/
-    return S;
-}
-long serprod2(int AR[N][M], int NN, int NM, int NNL)
-{
-    int i, j, ni, nj;
-    long P;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-             AR[i][j] = NNL+i+j;
-/*       printf("I=%d J=%d AR=%d\n",I,J,AR[I][J]);*/
-
-    P = 1;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-             P = P * AR[i][j];
-    return P;
-}
-float serprodr2(float AR[N][M], int NN, int NM, float NNL)
-{
-    int i, j;
-    float P;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-             AR[i][j] = NNL+i+j;
-    P = 1;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            P = P * AR[i][j];
-    return P;
-}
-int serand2(int AR[N][M], int NN, int NM, int NNL)
-{
-    int i, j, LAND;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j += 2)
-            AR[i][j] = 1;
-    for (i = 0; i < NN; i++)
-        for (j = 1; j < NM; j += 2)
-            AR[i][j] = 0;
-
-    LAND = AR[0][0];
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            LAND = LAND && AR[i][j];
-
-    return LAND;
-}
-
-int seror2(int AR[N][M], int NN, int NM, int NNL)
-{
-    int i, j, LOR;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j += 2)
-            AR[i][j] = 1;
-    for (i = 0; i < NN; i++)
-        for (j = 1; j < NM; j += 2)
-            AR[i][j] = 0;
-
-    LOR = AR[0][0];
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            LOR = LOR || AR[i][j];
-
-    return LOR;
-}
-
-int serxor2(int AR[N][M], int NN, int NM, int NNL)
-{
-    int i, j, LXOR;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j += 2)
-            AR[i][j] = 1;
-    for (i = 0; i < NN; i++)
-        for (j = 1; j < NM; j += 2)
-            AR[i][j] = 0;
-
-    LXOR = 0;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            LXOR = LXOR ^ AR[i][j];
-
-    return LXOR;
-}
-
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem11.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem11.cdv
deleted file mode 100644
index 1e44bc1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem11.cdv
+++ /dev/null
@@ -1,537 +0,0 @@
-//    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.
-//    DISTRIBUTED ARRAY A(N) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-//    ON ALL PROCESSORS.
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void rem1101();
-void rem1102();
-void rem1103();
-void rem1104();
-void rem1105();
-void rem1106();
-void rem1107();
-void rem1108();
-void rem1109();
-void rem1110();
-void rem1111();
-void rem1112();
-
-void serial1(int *ar, int n, int nl);
-void ansyes(const char *name);
-void ansno(const char *name);
-
-#define n 16
-#define nl 1000
-#define Min(x, y) (x < y) ? (x) : (y)
-
-int main(int argc, char *argv[]) {
-  printf("===START OF REM11========================\n");
-
-  // --------------------------------------------------
-  rem1101();
-
-  // --------------------------------------------------
-  rem1102();
-
-  // --------------------------------------------------
-  rem1103();
-
-  // -------------------------------------------------
-  rem1104();
-
-  // -------------------------------------------------
-  rem1105();
-
-  // -------------------------------------------------
-  rem1106();
-
-  // --------------------------------------------------
-  rem1107();
-
-  // --------------------------------------------------
-  rem1108();
-
-  // --------------------------------------------------
-  rem1109();
-
-  // -------------------------------------------------
-  rem1110();
-
-  // -------------------------------------------------
-  rem1111();
-
-  // -------------------------------------------------
-  rem1112();
-
-  // -------------------------------------------------
-  //
-  //
-  printf("=== END OF REM11 ========================= \n");
-  return 0;
-}
-
-// ---------------------------------------------REM1101
-void rem1101() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl, ib;
-
-  const char *tname = "REM1101";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-#pragma dvm get_actual(a[0])
-#pragma dvm remote_access(a[0])
-  { ib = a[0]; }
-
-  if (ib == c[0]) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1102() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl, ib;
-
-  const char *tname = "REM1102";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-#pragma dvm get_actual(a[n - 1])
-#pragma dvm remote_access(a[n - 1])
-  { ib = a[n - 1]; }
-
-  if (ib == c[n - 1]) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1103() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl, ib;
-
-  const char *tname = "REM1103";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-#pragma dvm get_actual(a[n / 2 - 1])
-#pragma dvm remote_access(a[n / 2 - 1])
-  { ib = a[n / 2 - 1]; }
-
-  if (ib == c[n / 2 - 1]) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1104() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n], d[n];
-  int nloop, i, nnl, isumc, isuma;
-
-  const char *tname = "REM1104";
-  isumc = 0;
-  isuma = 0;
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-  for (i = 1; i <= n; i++) {
-#pragma dvm get_actual(a[i - 1])
-#pragma dvm remote_access(a[i - 1])
-    { d[i - 1] = a[i - 1]; }
-    isumc = isumc + c[i - 1];
-    isuma = isuma + d[i - 1];
-  }
-
-  if (isumc == isuma) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1105() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n], d[n];
-  int nloop, i, nnl, isumc, isuma;
-
-  const char *tname = "REM1105";
-  isumc = 0;
-  isuma = 0;
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-#pragma dvm get_actual(a)
-  for (i = 1; i <= n; i++) {
-#pragma dvm remote_access(a[])
-    { d[i - 1] = a[i - 1]; }
-    isumc = isumc + c[i - 1];
-    isuma = isuma + d[i - 1];
-  }
-
-  if (isumc == isuma) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1106() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n], d[n];
-  int nloop, i, nnl, isumc, isuma;
-
-  const char *tname = "REM1106";
-  isumc = 0;
-  isuma = 0;
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-  int kk = 2;
-  int kk1 = 3;
-  for (i = 1; i <= n / kk - kk1; i++) {
-#pragma dvm get_actual(a[kk * (i - 1) + kk1])
-#pragma dvm remote_access(a[kk * (i - 1) + kk1])
-    { d[i - 1] = a[kk * (i - 1) + kk1]; }
-    isumc = isumc + c[kk * (i - 1) + kk1];
-    isuma = isuma + d[i - 1];
-  }
-
-  if (isumc == isuma) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1107() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1107";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[0])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[0];
-    }
-
-#pragma dvm parallel([i] on a[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[0]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1108() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1108";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[n - 1])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[n - 1];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[n - 1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1109() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1109";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[n / 2 - 1])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[n / 2 - 1];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[n / 2 - 1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1110() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1110";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[i - 1];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[i - 1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1111() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1111";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[i - 1])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[i - 1];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[i - 1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1112() {
-#pragma dvm array distribute[block]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1112";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-  int kk = 2;
-  int kk1 = 3;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[kk * i + (kk1 - kk)])
-    for (i = 1; i <= n / kk - kk1; i++) {
-      b[i - 1] = a[kk * i + (kk1 - kk)];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n / kk - kk1; i++) {
-      if (b[i - 1] != c[kk * (i - 1) + kk1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-#undef n
-#undef nl
-
-void serial1(int *ar, int n, int nl) {
-  int i;
-  for (i = 1; i <= n; i++) {
-    ar[i - 1] = nl + i;
-  }
-}
-
-void ansyes(const char *name) { printf("%s  -  complete\n", name); }
-
-void ansno(const char *name) { printf("%s  -  ***error\n", name); }
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem12.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem12.cdv
deleted file mode 100644
index a468fd3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem12.cdv
+++ /dev/null
@@ -1,537 +0,0 @@
-//    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.
-//    DISTRIBUTED ARRAY A(N) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-//    ON ALL PROCESSORS.
-
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-void rem1101();
-void rem1102();
-void rem1103();
-void rem1104();
-void rem1105();
-void rem1106();
-void rem1107();
-void rem1108();
-void rem1109();
-void rem1110();
-void rem1111();
-void rem1112();
-
-void serial1(int *ar, int n, int nl);
-void ansyes(const char *name);
-void ansno(const char *name);
-
-#define n 16
-#define nl 1000
-#define Min(x, y) (x < y) ? (x) : (y)
-
-int main(int argc, char *argv[]) {
-  printf("===START OF REM11========================\n");
-
-  // --------------------------------------------------
-  rem1101();
-
-  // --------------------------------------------------
-  rem1102();
-
-  // --------------------------------------------------
-  rem1103();
-
-  // -------------------------------------------------
-  rem1104();
-
-  // -------------------------------------------------
-  rem1105();
-
-  // -------------------------------------------------
-  rem1106();
-
-  // --------------------------------------------------
-  rem1107();
-
-  // --------------------------------------------------
-  rem1108();
-
-  // --------------------------------------------------
-  rem1109();
-
-  // -------------------------------------------------
-  rem1110();
-
-  // -------------------------------------------------
-  rem1111();
-
-  // -------------------------------------------------
-  rem1112();
-
-  // -------------------------------------------------
-  //
-  //
-  printf("=== END OF REM11 ========================= \n");
-  return 0;
-}
-
-// ---------------------------------------------REM1101
-void rem1101() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl, ib;
-
-  const char *tname = "REM1101";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-#pragma dvm get_actual(a[0])
-#pragma dvm remote_access(a[0])
-  { ib = a[0]; }
-
-  if (ib == c[0]) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1102() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl, ib;
-
-  const char *tname = "REM1102";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-#pragma dvm get_actual(a[n - 1])
-#pragma dvm remote_access(a[n - 1])
-  { ib = a[n - 1]; }
-
-  if (ib == c[n - 1]) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1103() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl, ib;
-
-  const char *tname = "REM1103";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-#pragma dvm get_actual(a[n / 2 - 1])
-#pragma dvm remote_access(a[n / 2 - 1])
-  { ib = a[n / 2 - 1]; }
-
-  if (ib == c[n / 2 - 1]) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1104() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n], d[n];
-  int nloop, i, nnl, isumc, isuma;
-
-  const char *tname = "REM1104";
-  isumc = 0;
-  isuma = 0;
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-  for (i = 1; i <= n; i++) {
-#pragma dvm get_actual(a[i - 1])
-#pragma dvm remote_access(a[i - 1])
-    { d[i - 1] = a[i - 1]; }
-    isumc = isumc + c[i - 1];
-    isuma = isuma + d[i - 1];
-  }
-
-  if (isumc == isuma) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1105() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n], d[n];
-  int nloop, i, nnl, isumc, isuma;
-
-  const char *tname = "REM1105";
-  isumc = 0;
-  isuma = 0;
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-#pragma dvm get_actual(a)
-  for (i = 1; i <= n; i++) {
-#pragma dvm remote_access(a[])
-    { d[i - 1] = a[i - 1]; }
-    isumc = isumc + c[i - 1];
-    isuma = isuma + d[i - 1];
-  }
-
-  if (isumc == isuma) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1106() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n], d[n];
-  int nloop, i, nnl, isumc, isuma;
-
-  const char *tname = "REM1106";
-  isumc = 0;
-  isuma = 0;
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region out(a)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-  }
-  int kk = 2;
-  int kk1 = 3;
-  for (i = 1; i <= n / kk - kk1; i++) {
-#pragma dvm get_actual(a[kk * (i - 1) + kk1])
-#pragma dvm remote_access(a[kk * (i - 1) + kk1])
-    { d[i - 1] = a[kk * (i - 1) + kk1]; }
-    isumc = isumc + c[kk * (i - 1) + kk1];
-    isuma = isuma + d[i - 1];
-  }
-
-  if (isumc == isuma) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1107() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1107";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[0])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[0];
-    }
-
-#pragma dvm parallel([i] on a[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[0]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1108() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1108";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[n - 1])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[n - 1];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[n - 1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1109() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1109";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[n / 2 - 1])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[n / 2 - 1];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[n / 2 - 1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1110() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1110";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[i - 1];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[i - 1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1111() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1111";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[i - 1])
-    for (i = 1; i <= n; i++) {
-      b[i - 1] = a[i - 1];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n; i++) {
-      if (b[i - 1] != c[i - 1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-void rem1112() {
-#pragma dvm array distribute[*]
-  int b[n];
-#pragma dvm array align([i] with b[i])
-  int a[n];
-  int c[n];
-  int nloop, i, nnl;
-
-  const char *tname = "REM1112";
-  nnl = nl;
-  serial1(c, n, nnl);
-  nloop = nl;
-  int kk = 2;
-  int kk1 = 3;
-
-#pragma dvm region local(a, b)
-  {
-#pragma dvm parallel([i] on a[i - 1])
-    for (i = 1; i <= n; i++) {
-      a[i - 1] = nl + i;
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) remote_access(a[kk * i + (kk1 - kk)])
-    for (i = 1; i <= n / kk - kk1; i++) {
-      b[i - 1] = a[kk * i + (kk1 - kk)];
-    }
-
-#pragma dvm parallel([i] on b[i - 1]) reduction(min(nloop))
-    for (i = 1; i <= n / kk - kk1; i++) {
-      if (b[i - 1] != c[kk * (i - 1) + kk1]) {
-        nloop = Min(nloop, i);
-      }
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == nl) {
-    ansyes(tname);
-  } else {
-    ansno(tname);
-  }
-}
-
-#undef n
-#undef nl
-
-void serial1(int *ar, int n, int nl) {
-  int i;
-  for (i = 1; i <= n; i++) {
-    ar[i - 1] = nl + i;
-  }
-}
-
-void ansyes(const char *name) { printf("%s  -  complete\n", name); }
-
-void ansno(const char *name) { printf("%s  -  ***error\n", name); }
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem21.cdv
deleted file mode 100644
index 31c2239..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem21.cdv
+++ /dev/null
@@ -1,943 +0,0 @@
-/*  TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-    ON ALL PROCESSORS. */
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-#define N 16
-#define M 8
-#define NL 1000
-
-static void rem2101();
-static void rem2102();
-static void rem2103();
-static void rem2104();
-static void rem2105();
-static void rem2106();
-static void rem2107();
-static void rem2108();
-static void rem2109();
-static void rem2110();
-static void rem2111();
-static void rem2112();
-static void rem2113();
-static void rem2114();
-static void rem2115();
-static void rem2116();
-static void rem2117();
-static void rem2118();
-static void rem2119();
-static void rem2120();
-static void serial2(int AR[N][M], int NN, int NM, int NNL);
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int an, char **as) {
-  printf("===START OF REM21========================\n");
-  rem2101();
-  rem2102();
-  rem2103();
-  rem2104();
-  rem2105();
-  rem2106();
-  rem2107();
-  rem2108();
-  rem2109();
-  rem2110();
-  rem2111();
-  rem2112();
-  rem2113();
-  rem2114();
-  rem2115();
-  rem2116();
-  rem2117();
-  rem2118();
-  rem2119();
-  rem2120();
-
-  printf("=== END OF REM21 ========================= \n");
-  return 0;
-}
-/* ---------------------------------------------REM2101  */
-void rem2101() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2101";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[0][0])
-#pragma dvm remote_access(A[0][0])
-  { ib = A[0][0]; }
-  if (ib == C[0][0])
-    ansyes(tname);
-  else
-    ansno(tname);
-  return;
-}
-
-/* ---------------------------------------------REM2102  */
-void rem2102() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2102";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-
-#pragma dvm get_actual(A[N - 1][M - 1])
-#pragma dvm remote_access(A[N - 1][M - 1])
-  { ib = A[N - 1][M - 1]; }
-  if (ib == C[N - 1][M - 1])
-    ansyes(tname);
-  else
-    ansno(tname);
-  return;
-}
-
-/* ---------------------------------------------REM2103  */
-void rem2103() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2103";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-
-#pragma dvm get_actual(A[0][M - 1])
-#pragma dvm remote_access(A[0][M - 1])
-  { ib = A[0][M - 1]; }
-  if (ib == C[0][M - 1])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2104  */
-void rem2104() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2104";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[N - 1][0])
-#pragma dvm remote_access(A[N - 1][0])
-  { ib = A[N - 1][0]; }
-  if (ib == C[N - 1][0])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2105  */
-void rem2105() {
-
-  int C[N][M], D[N][M];
-  int ib, isuma, isumc;
-  char tname[] = "REM2105";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int A[N][M];
-
-#pragma dvm array align([i][j] with A[i][j])
-  int B[N][M];
-  isuma = 0;
-  isumc = 0;
-  NNL = NL;
-  serial2(C, N, M, NNL);
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][])
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++) {
-#pragma dvm remote_access(A[][])
-      { D[i][j] = A[i][j]; }
-      isumc = isumc + C[i][j];
-      isuma = isuma + D[i][j];
-    }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2106  */
-void rem2106() {
-
-  int C[N][M], D[N][M];
-  int ib, isuma, isumc;
-  char tname[] = "REM2106";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int A[N][M];
-
-#pragma dvm array align([i][j] with A[i][j])
-  int B[N][M];
-  isuma = 0;
-  isumc = 0;
-  NNL = NL;
-  serial2(C, N, M, NNL);
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][0])
-  for (i = 0; i < N; i++) {
-#pragma dvm remote_access(A[][0])
-    { D[i][0] = A[i][0]; }
-    isumc = isumc + C[i][0];
-    isuma = isuma + D[i][0];
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2107  */
-void rem2107() {
-
-  int C[N][M], D[N][M];
-  int isuma, isumc;
-  char tname[] = "REM2107";
-
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int A[N][M];
-
-#pragma dvm array align([i][j] with A[i][j])
-  int B[N][M];
-  isuma = 0;
-  isumc = 0;
-  NNL = NL;
-  serial2(C, N, M, NNL);
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[0][])
-  for (j = 0; j < M; j++) {
-#pragma dvm remote_access(A[0][])
-    { D[0][j] = A[0][j]; }
-    isumc = isumc + C[0][j];
-    isuma = isuma + D[0][j];
-  }
-
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2108  */
-void rem2108() {
-
-  int C[N][M], D[N][M];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM2108";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-  isuma = 0;
-  isumc = 0;
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][M - 1])
-
-  for (i = 0; i < N; i++) {
-#pragma dvm remote_access(A[][M - 1])
-    { D[i][M - 1] = A[i][M - 1]; }
-    isumc = isumc + C[i][M - 1];
-    isuma = isuma + D[i][M - 1];
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2109  */
-void rem2109() {
-
-  int C[N][M], D[N][M];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM2109";
-
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-  isuma = 0;
-  isumc = 0;
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[N - 1][])
-  for (j = 0; j < M; j++) {
-#pragma dvm remote_access(A[N - 1][])
-    { D[N - 1][j] = A[N - 1][j]; }
-    isumc = isumc + C[N - 1][j];
-    isuma = isuma + D[N - 1][j];
-  }
-
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2110  */
-void rem2110() {
-
-  int C[N][M], D[N][M];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM2110";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-  isuma = 0;
-  isumc = 0;
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][])
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++) {
-#pragma dvm remote_access(A[i][j])
-      { D[i][j] = A[i][j]; }
-      isumc = isumc + C[i][j];
-      isuma = isuma + D[i][j];
-    }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2111  */
-void rem2111() {
-
-  int C[N][M], D[N][M];
-  int nloop, ib, isuma, isumc, kk, kk1;
-  char tname[] = "REM2111";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-  isuma = 0;
-  isumc = 0;
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][])
-
-  kk = 2;
-  kk1 = 3;
-
-  for (i = 0; i < N / (kk - kk1); i++)
-    for (j = 0; j < M / (kk - kk1); j++) {
-#pragma dvm remote_access(A[kk * i + kk1][kk * j + kk1])
-      { D[i][j] = A[kk * i + kk1][kk * j + kk1]; }
-      isumc = isumc + C[kk * i + kk1][kk * j + kk1];
-      isuma = isuma + D[i][j];
-    }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2112  */
-void rem2112() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2112";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[0][0])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[0][0];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[0][0])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2113  */
-void rem2113() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2113";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[N - 1][M - 1])
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++) {
-      B[i][j] = A[N - 1][M - 1];
-    }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++) {
-      if (B[i][j] != C[N - 1][M - 1])
-        nloop = i;
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2114  */
-void rem2114() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2114";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[0][M - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[0][M - 1];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[0][M - 1])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2115  */
-void rem2115() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2115";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[N - 1][0])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[N - 1][0];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[N - 1][0])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2116  */
-void rem2116() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2116";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[i][j];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[i][j])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2117  */
-void rem2117() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2117";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[][0])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[i][0];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[i][0])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2118  */
-void rem2118() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2118";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[0][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[0][j];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[0][j])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2119  */
-void rem2119() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2119";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[][M - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[i][M - 1];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[i][M - 1])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2120  */
-void rem2120() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2120";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[N - 1][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[N - 1][j];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[N - 1][j])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-void serial2(int AR[N][M], int NN, int NM, int NNL) {
-  int i, j;
-
-  for (i = 0; i < NN; i++)
-    for (j = 0; j < NM; j++) {
-      AR[i][j] = NNL + i + j;
-    }
-  return;
-}
-
-void ansyes(const char name[]) {
-  printf("%s  -  complete\n", name);
-  return;
-}
-void ansno(const char name[]) {
-  printf("%s  -  ***error\n", name);
-  return;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem22.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem22.cdv
deleted file mode 100644
index 79f7ae1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem22.cdv
+++ /dev/null
@@ -1,943 +0,0 @@
-/*  TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-    ON ALL PROCESSORS. */
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-#define N 16
-#define M 8
-#define NL 1000
-
-static void rem2101();
-static void rem2102();
-static void rem2103();
-static void rem2104();
-static void rem2105();
-static void rem2106();
-static void rem2107();
-static void rem2108();
-static void rem2109();
-static void rem2110();
-static void rem2111();
-static void rem2112();
-static void rem2113();
-static void rem2114();
-static void rem2115();
-static void rem2116();
-static void rem2117();
-static void rem2118();
-static void rem2119();
-static void rem2120();
-static void serial2(int AR[N][M], int NN, int NM, int NNL);
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int an, char **as) {
-  printf("===START OF REM21========================\n");
-  rem2101();
-  rem2102();
-  rem2103();
-  rem2104();
-  rem2105();
-  rem2106();
-  rem2107();
-  rem2108();
-  rem2109();
-  rem2110();
-  rem2111();
-  rem2112();
-  rem2113();
-  rem2114();
-  rem2115();
-  rem2116();
-  rem2117();
-  rem2118();
-  rem2119();
-  rem2120();
-
-  printf("=== END OF REM21 ========================= \n");
-  return 0;
-}
-/* ---------------------------------------------REM2101  */
-void rem2101() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2101";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int B[N][M];
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[0][0])
-#pragma dvm remote_access(A[0][0])
-  { ib = A[0][0]; }
-  if (ib == C[0][0])
-    ansyes(tname);
-  else
-    ansno(tname);
-  return;
-}
-
-/* ---------------------------------------------REM2102  */
-void rem2102() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2102";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-
-#pragma dvm get_actual(A[N - 1][M - 1])
-#pragma dvm remote_access(A[N - 1][M - 1])
-  { ib = A[N - 1][M - 1]; }
-  if (ib == C[N - 1][M - 1])
-    ansyes(tname);
-  else
-    ansno(tname);
-  return;
-}
-
-/* ---------------------------------------------REM2103  */
-void rem2103() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2103";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-
-#pragma dvm get_actual(A[0][M - 1])
-#pragma dvm remote_access(A[0][M - 1])
-  { ib = A[0][M - 1]; }
-  if (ib == C[0][M - 1])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2104  */
-void rem2104() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2104";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[N - 1][0])
-#pragma dvm remote_access(A[N - 1][0])
-  { ib = A[N - 1][0]; }
-  if (ib == C[N - 1][0])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2105  */
-void rem2105() {
-
-  int C[N][M], D[N][M];
-  int ib, isuma, isumc;
-  char tname[] = "REM2105";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int A[N][M];
-
-#pragma dvm array align([i][j] with A[i][j])
-  int B[N][M];
-  isuma = 0;
-  isumc = 0;
-  NNL = NL;
-  serial2(C, N, M, NNL);
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][])
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++) {
-#pragma dvm remote_access(A[][])
-      { D[i][j] = A[i][j]; }
-      isumc = isumc + C[i][j];
-      isuma = isuma + D[i][j];
-    }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2106  */
-void rem2106() {
-
-  int C[N][M], D[N][M];
-  int ib, isuma, isumc;
-  char tname[] = "REM2106";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int A[N][M];
-
-#pragma dvm array align([i][j] with A[i][j])
-  int B[N][M];
-  isuma = 0;
-  isumc = 0;
-  NNL = NL;
-  serial2(C, N, M, NNL);
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][0])
-  for (i = 0; i < N; i++) {
-#pragma dvm remote_access(A[][0])
-    { D[i][0] = A[i][0]; }
-    isumc = isumc + C[i][0];
-    isuma = isuma + D[i][0];
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2107  */
-void rem2107() {
-
-  int C[N][M], D[N][M];
-  int isuma, isumc;
-  char tname[] = "REM2107";
-
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int A[N][M];
-
-#pragma dvm array align([i][j] with A[i][j])
-  int B[N][M];
-  isuma = 0;
-  isumc = 0;
-  NNL = NL;
-  serial2(C, N, M, NNL);
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[0][])
-  for (j = 0; j < M; j++) {
-#pragma dvm remote_access(A[0][])
-    { D[0][j] = A[0][j]; }
-    isumc = isumc + C[0][j];
-    isuma = isuma + D[0][j];
-  }
-
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2108  */
-void rem2108() {
-
-  int C[N][M], D[N][M];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM2108";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-  isuma = 0;
-  isumc = 0;
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][M - 1])
-
-  for (i = 0; i < N; i++) {
-#pragma dvm remote_access(A[][M - 1])
-    { D[i][M - 1] = A[i][M - 1]; }
-    isumc = isumc + C[i][M - 1];
-    isuma = isuma + D[i][M - 1];
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2109  */
-void rem2109() {
-
-  int C[N][M], D[N][M];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM2109";
-
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-  isuma = 0;
-  isumc = 0;
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[N - 1][])
-  for (j = 0; j < M; j++) {
-#pragma dvm remote_access(A[N - 1][])
-    { D[N - 1][j] = A[N - 1][j]; }
-    isumc = isumc + C[N - 1][j];
-    isuma = isuma + D[N - 1][j];
-  }
-
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2110  */
-void rem2110() {
-
-  int C[N][M], D[N][M];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM2110";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-  isuma = 0;
-  isumc = 0;
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][])
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++) {
-#pragma dvm remote_access(A[i][j])
-      { D[i][j] = A[i][j]; }
-      isumc = isumc + C[i][j];
-      isuma = isuma + D[i][j];
-    }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2111  */
-void rem2111() {
-
-  int C[N][M], D[N][M];
-  int nloop, ib, isuma, isumc, kk, kk1;
-  char tname[] = "REM2111";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-  isuma = 0;
-  isumc = 0;
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-  }
-#pragma dvm get_actual(A[][])
-
-  kk = 2;
-  kk1 = 3;
-
-  for (i = 0; i < N / (kk - kk1); i++)
-    for (j = 0; j < M / (kk - kk1); j++) {
-#pragma dvm remote_access(A[kk * i + kk1][kk * j + kk1])
-      { D[i][j] = A[kk * i + kk1][kk * j + kk1]; }
-      isumc = isumc + C[kk * i + kk1][kk * j + kk1];
-      isuma = isuma + D[i][j];
-    }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2112  */
-void rem2112() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2112";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[0][0])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[0][0];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[0][0])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2113  */
-void rem2113() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2113";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[N - 1][M - 1])
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++) {
-      B[i][j] = A[N - 1][M - 1];
-    }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++) {
-      if (B[i][j] != C[N - 1][M - 1])
-        nloop = i;
-    }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2114  */
-void rem2114() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2114";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[0][M - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[0][M - 1];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[0][M - 1])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2115  */
-void rem2115() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2115";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[N - 1][0])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[N - 1][0];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[N - 1][0])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2116  */
-void rem2116() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2116";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[i][j];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[i][j])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM2117  */
-void rem2117() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2117";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[][0])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[i][0];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[i][0])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2118  */
-void rem2118() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2118";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[0][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[0][j];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[0][j])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2119  */
-void rem2119() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2119";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[*][block]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[][M - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[i][M - 1];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[i][M - 1])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM2120  */
-void rem2120() {
-
-  int C[N][M];
-  int nloop, ib;
-  char tname[] = "REM2120";
-  int i, j, NN, NM, NNL;
-
-#pragma dvm array distribute[block][*]
-  int B[N][M];
-
-#pragma dvm array align([i][j] with B[i][j])
-  int A[N][M];
-
-  NN = N;
-  NM = M;
-  NNL = NL;
-  serial2(C, NN, NM, NNL);
-  nloop = NL;
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        A[i][j] = NL + i + j;
-      }
-
-#pragma dvm parallel([i][j] on B[i][j]) remote_access(A[N - 1][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        B[i][j] = A[N - 1][j];
-      }
-#pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        if (B[i][j] != C[N - 1][j])
-          nloop = i;
-      }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-void serial2(int AR[N][M], int NN, int NM, int NNL) {
-  int i, j;
-
-  for (i = 0; i < NN; i++)
-    for (j = 0; j < NM; j++) {
-      AR[i][j] = NNL + i + j;
-    }
-  return;
-}
-
-void ansyes(const char name[]) {
-  printf("%s  -  complete\n", name);
-  return;
-}
-void ansno(const char name[]) {
-  printf("%s  -  ***error\n", name);
-  return;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem31.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem31.cdv
deleted file mode 100644
index 7216f6f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem31.cdv
+++ /dev/null
@@ -1,702 +0,0 @@
-/*  TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M,K) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-    ON ALL PROCESSORS. */
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-#define N 16
-#define M 8
-#define K 8
-#define NL 1000
-
-static void rem3101();
-static void rem3102();
-static void rem3103();
-static void rem3104();
-static void rem3105();
-static void rem3106();
-static void rem3107();
-static void rem3108();
-static void rem3109();
-static void rem3110();
-static void rem3111();
-static void rem3112();
-static void rem3113();
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-static void serial3(int AR[N][M][K], int NN, int NM, int NK, int NNL);
-
-int main(int an, char **as) {
-  printf("===START OF REM31========================\n");
-  rem3101();
-  rem3102();
-  rem3103();
-  rem3104();
-  rem3105();
-  rem3106();
-  rem3107();
-  rem3108();
-  rem3109();
-  rem3110();
-  rem3111();
-  rem3112();
-  rem3113();
-
-  printf("=== END OF REM31 ========================= \n");
-  return 0;
-}
-/* ---------------------------------------------REM3101  */
-void rem3101() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3101";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[0][0][0])
-#pragma dvm remote_access(A[0][0][0])
-  { ib = A[0][0][0]; }
-  if (ib == C[0][0][0])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3102  */
-void rem3102() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3102";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[N - 1][M - 1][K - 1])
-#pragma dvm remote_access(A[N - 1][M - 1][K - 1])
-  { ib = A[N - 1][M - 1][K - 1]; }
-  if (ib == C[N - 1][M - 1][K - 1])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3103  */
-void rem3103() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM3103";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[][][])
-#pragma dvm remote_access(A[][][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          isumc = isumc + C[i][j][ii];
-          isuma = isuma + A[i][j][ii];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3104  */
-void rem3104() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM3104";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[0][][])
-#pragma dvm remote_access(A[0][][])
-  {
-    for (j = 0; j < M; j++)
-      for (ii = 0; ii < K; ii++) {
-        isumc = isumc + C[0][j][ii];
-        isuma = isuma + A[0][j][ii];
-      }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM3105  */
-void rem3105() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM3105";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[][M - 1][])
-#pragma dvm remote_access(A[][M - 1][])
-  {
-    for (i = 0; i < N; i++)
-      for (ii = 0; ii < K; ii++) {
-        isumc = isumc + C[i][M - 1][ii];
-        isuma = isuma + A[i][M - 1][ii];
-      }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3106  */
-void rem3106() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM3106";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[][][K - 1])
-#pragma dvm remote_access(A[][][K - 1])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        isumc = isumc + C[i][j][K - 1];
-        isuma = isuma + A[i][j][K - 1];
-      }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM3107  */
-void rem3107() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  int ki, ki1, kj, kj1, kii, kii1;
-  char tname[] = "REM3107";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A)
-  ki = 2;
-  ki1 = 3;
-  kj = 2;
-  kj1 = 3;
-  kii = 2;
-  kii1 = 3;
-  for (i = 0; i < N / ki - ki1; i++)
-    for (j = 0; j < M / kj - kj1; j++)
-      for (ii = 0; ii < K / kii - kii1; ii++) {
-#pragma dvm remote_access(A[ki * i + ki1][kj * j + kj1][kii * ii + kii1])
-        { isuma = isuma + A[ki * i + ki1][kj * j + kj1][kii * ii + kii1]; }
-        isumc = isumc + C[ki * i + ki1][kj * j + kj1][kii * ii + kii1];
-      }
-
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-  return;
-}
-
-/* ---------------------------------------------REM3108  */
-void rem3108() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3108";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[0][0][0])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-
-          B[i][j][ii] = A[0][0][0];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[0][0][0])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3109  */
-void rem3109() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3109";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii])                                \
-    remote_access(A[N - 1][M - 1][K - 1])
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++)
-      for (ii = 0; ii < K; ii++) {
-
-        B[i][j][ii] = A[N - 1][M - 1][K - 1];
-      }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++)
-      for (ii = 0; ii < K; ii++) {
-        if (B[i][j][ii] != C[N - 1][M - 1][K - 1])
-          nloop = i;
-      }
-  }
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM3110  */
-void rem3110() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3110";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-            B[i][j][ii] = A[i][j][ii];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[i][j][ii])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3111  */
-void rem3111() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3111";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[0][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-
-          B[i][j][ii] = A[0][j][ii];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[0][j][ii])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3112  */
-void rem3112() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3112";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[][M - 1][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          B[i][j][ii] = A[i][M - 1][ii];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[i][M - 1][ii])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3113  */
-void rem3113() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3113";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[][][K - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-
-          B[i][j][ii] = A[i][j][K - 1];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[i][j][K - 1])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-void serial3(int AR[N][M][K], int NN, int NM, int NK, int NNL) {
-  int i, j, ii;
-
-  for (i = 0; i < NN; i++)
-    for (j = 0; j < NM; j++)
-      for (ii = 0; ii < NK; ii++)
-
-      {
-        AR[i][j][ii] = NNL + i + j + ii;
-      }
-}
-
-void ansyes(const char name[]) {
-  printf("%s  -  complete\n", name);
-  return;
-}
-void ansno(const char name[]) {
-  printf("%s  -  ***error\n", name);
-  return;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem32.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem32.cdv
deleted file mode 100644
index a2944b4..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem32.cdv
+++ /dev/null
@@ -1,705 +0,0 @@
-/*  TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M,K) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-    ON ALL PROCESSORS. */
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-#define N 16
-#define M 8
-#define K 8
-#define NL 1000
-
-static void rem3101();
-static void rem3102();
-static void rem3103();
-static void rem3104();
-static void rem3105();
-static void rem3106();
-static void rem3107();
-static void rem3108();
-static void rem3109();
-static void rem3110();
-static void rem3111();
-static void rem3112();
-static void rem3113();
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-static void serial3(int AR[N][M][K], int NN, int NM, int NK, int NNL);
-
-int main(int an, char **as) {
-  printf("===START OF REM31========================\n");
-  rem3101();
-  rem3102();
-  rem3103();
-  rem3104();
-  rem3105();
-  rem3106();
-  rem3107();
-  rem3108();
-  rem3109();
-  rem3110();
-  rem3111();
-  rem3112();
-  rem3113();
-
-  printf("=== END OF REM31 ========================= \n");
-  return 0;
-}
-/* ---------------------------------------------REM3101  */
-void rem3101() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3101";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[*][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[1][1][1])
-#pragma dvm remote_access(A[1][1][1])
-  { ib = A[1][1][1]; }
-  if (ib == C[1][1][1])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3102  */
-void rem3102() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3102";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][*][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[N - 1][M - 1][K - 1])
-#pragma dvm remote_access(A[N - 1][M - 1][K - 1])
-  { ib = A[N - 1][M - 1][K - 1]; }
-  if (ib == C[N - 1][M - 1][K - 1])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3103  */
-void rem3103() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM3103";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][*]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[][][])
-#pragma dvm remote_access(A[][][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          isumc = isumc + C[i][j][ii];
-          isuma = isuma + A[i][j][ii];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3104  */
-void rem3104() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM3104";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[*][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[1][][])
-#pragma dvm remote_access(A[1][][])
-  {
-    for (j = 0; j < M; j++)
-      for (ii = 0; ii < K; ii++) {
-        isumc = isumc + C[1][j][ii];
-        isuma = isuma + A[1][j][ii];
-      }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM3105  */
-void rem3105() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM3105";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][*][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[][M - 1][])
-#pragma dvm remote_access(A[][M - 1][])
-  {
-    for (i = 0; i < N; i++)
-      for (ii = 0; ii < K; ii++) {
-        isumc = isumc + C[i][M - 1][ii];
-        isuma = isuma + A[i][M - 1][ii];
-      }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3106  */
-void rem3106() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM3106";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][*]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A[][][K - 1])
-#pragma dvm remote_access(A[][][K - 1])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++) {
-        isumc = isumc + C[i][j][K - 1];
-        isuma = isuma + A[i][j][K - 1];
-      }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM3107  */
-void rem3107() {
-
-  int C[N][M][K];
-  int nloop, ib, isuma, isumc;
-  int ki, ki1, kj, kj1, kii, kii1;
-  char tname[] = "REM3107";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[*][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-  isuma = 0;
-  isumc = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-  }
-#pragma dvm get_actual(A)
-  ki = 2;
-  ki1 = 3;
-  kj = 2;
-  kj1 = 3;
-  kii = 2;
-  kii1 = 3;
-  for (i = 0; i < N / ki - ki1; i++)
-    for (j = 0; j < M / kj - kj1; j++)
-      for (ii = 0; ii < K / kii - kii1; ii++) {
-#pragma dvm remote_access(A[ki * i + ki1][kj * j + kj1][kii * ii + kii1])
-        { isuma = isuma + A[ki * i + ki1][kj * j + kj1][kii * ii + kii1]; }
-        isumc = isumc + C[ki * i + ki1][kj * j + kj1][kii * ii + kii1];
-      }
-
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-  return;
-}
-
-/* ---------------------------------------------REM3108  */
-void rem3108() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3108";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][*][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[1][1][1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-
-          B[i][j][ii] = A[1][1][1];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[1][1][1])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3109  */
-void rem3109() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3109";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][*]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii])                                \
-    remote_access(A[N - 1][M - 1][K - 1])
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++)
-      for (ii = 0; ii < K; ii++) {
-
-        B[i][j][ii] = A[N - 1][M - 1][K - 1];
-      }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-  for (i = 0; i < N; i++)
-    for (j = 0; j < M; j++)
-      for (ii = 0; ii < K; ii++) {
-        if (B[i][j][ii] != C[N - 1][M - 1][K - 1])
-          nloop = i;
-      }
-  }
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM3110  */
-void rem3110() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3110";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[*][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-
-          B[i][j][ii] = A[i][j][ii];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[i][j][ii])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3111  */
-void rem3111() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3111";
-
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][*][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[1][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-
-          B[i][j][ii] = A[1][j][ii];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[1][j][ii])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3112  */
-void rem3112() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3112";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[block][block][*]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[][M - 1][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-
-          B[i][j][ii] = A[i][M - 1][ii];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[i][M - 1][ii])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM3113  */
-void rem3113() {
-
-  int C[N][M][K];
-  int nloop, ib;
-  char tname[] = "REM3113";
-  int i, j, ii, NN, NM, NK, NNL;
-
-#pragma dvm array distribute[*][block][block]
-  int B[N][M][K];
-
-#pragma dvm array align([i][j][ii] with B[i][j][ii])
-  int A[N][M][K];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NNL = NL;
-  serial3(C, NN, NM, NK, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          A[i][j][ii] = NL + i + j + ii;
-        }
-
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) remote_access(A[][][K - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-
-          B[i][j][ii] = A[i][j][K - 1];
-        }
-#pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          if (B[i][j][ii] != C[i][j][K - 1])
-            nloop = i;
-        }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-void serial3(int AR[N][M][K], int NN, int NM, int NK, int NNL) {
-  int i, j, ii;
-
-  for (i = 0; i < NN; i++)
-    for (j = 0; j < NM; j++)
-      for (ii = 0; ii < NK; ii++)
-
-      {
-        AR[i][j][ii] = NNL + i + j + ii;
-      }
-}
-
-void ansyes(const char name[]) {
-  printf("%s  -  complete\n", name);
-  return;
-}
-void ansno(const char name[]) {
-  printf("%s  -  ***error\n", name);
-  return;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem41.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem41.cdv
deleted file mode 100644
index 95bc72f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem41.cdv
+++ /dev/null
@@ -1,811 +0,0 @@
-/*  TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M,K,L) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-    ON ALL PROCESSORS. */
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-#define N 16
-#define M 16
-#define K 16
-#define L 16
-#define NL 1000
-
-static void rem4101();
-static void rem4102();
-static void rem4103();
-static void rem4104();
-static void rem4105();
-static void rem4106();
-static void rem4107();
-static void rem4108();
-static void rem4109();
-static void rem4110();
-static void rem4111();
-static void rem4112();
-static void rem4113();
-static void rem4114();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-static void serial4(int AR[N][M][K][L], int NN, int NM, int NK, int NLL,
-                    int NNL);
-
-int main(int an, char **as) {
-  printf("===START OF REM41========================\n");
-  rem4101();
-  rem4102();
-  rem4103();
-  rem4104();
-  rem4105();
-  rem4106();
-  rem4107();
-  rem4108();
-  rem4109();
-  rem4110();
-  rem4111();
-  rem4112();
-  rem4113();
-  rem4114();
-
-  printf("=== END OF REM41 ========================= \n");
-  return 0;
-}
-/* ---------------------------------------------REM4101  */
-void rem4101() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4101";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[1][1][1][1])
-#pragma dvm remote_access(A[1][1][1][1])
-  { ib = A[1][1][1][1]; }
-  if (ib == C[1][1][1][1])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4102  */
-void rem4102() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4102";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[N - 1][M - 1][K - 1][L - 1])
-#pragma dvm remote_access(A[N - 1][M - 1][K - 1][L - 1])
-  { ib = A[N - 1][M - 1][K - 1][L - 1]; }
-
-  if (ib == C[N - 1][M - 1][K - 1][L - 1])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM4103  */
-void rem4103() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4103";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][][][])
-#pragma dvm remote_access(A[][][][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < K; jj++) {
-            isumc = isumc + C[i][j][ii][jj];
-            isuma = isuma + A[i][j][ii][jj];
-          }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4104  */
-void rem4104() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4104";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[1][][][])
-#pragma dvm remote_access(A[1][][][])
-  {
-    for (j = 0; j < M; j++)
-      for (ii = 0; ii < K; ii++)
-        for (jj = 0; jj < K; jj++) {
-          isumc = isumc + C[1][j][ii][jj];
-          isuma = isuma + A[1][j][ii][jj];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4105  */
-void rem4105() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4105";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][M - 1][][])
-#pragma dvm remote_access(A[][M - 1][][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < K; jj++) {
-            isumc = isumc + C[i][M - 1][ii][jj];
-            isuma = isuma + A[i][M - 1][ii][jj];
-          }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4106  */
-void rem4106() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4106";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][][K - 1][])
-
-#pragma dvm remote_access(A[][][K - 1][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (jj = 0; jj < L; jj++) {
-          isumc = isumc + C[i][j][K - 1][jj];
-          isuma = isuma + A[i][j][K - 1][jj];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4107  */
-void rem4107() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4107";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][][][L - 1])
-#pragma dvm remote_access(A[][][][L - 1])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          isumc = isumc + C[i][j][ii][L - 1];
-          isuma = isuma + A[i][j][ii][L - 1];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4108  */
-void rem4108() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4108";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[1][1][1][1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[1][1][1][1];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[1][1][1][1])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4109  */
-void rem4109() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4109";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[N - 1][M - 1][K - 1][L - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[N - 1][M - 1][K - 1][L - 1];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[N - 1][M - 1][K - 1][L - 1])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4110  */
-void rem4110() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4110";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) remote_access(A[][][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][j][ii][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][j][ii][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4111  */
-void rem4111() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4111";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[1][][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[1][j][ii][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[1][j][ii][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM4112  */
-void rem4112() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4112";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[][M - 1][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][M - 1][ii][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][M - 1][ii][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4113  */
-void rem4113() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4113";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[][][K - 1][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][j][K - 1][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][j][K - 1][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4114  */
-void rem4114() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4114";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[][][][L - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][j][ii][L - 1];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][j][ii][L - 1])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-void serial4(int AR[N][M][K][L], int NN, int NM, int NK, int NLL, int NNL) {
-  int i, j, ii, jj;
-
-  for (i = 0; i < NN; i++)
-    for (j = 0; j < NM; j++)
-      for (ii = 0; ii < NK; ii++)
-        for (jj = 0; jj < NLL; jj++)
-
-        {
-          AR[i][j][ii][jj] = NNL + i + j + ii + jj;
-        }
-}
-void ansyes(const char name[]) {
-  printf("%s  -  complete\n", name);
-  return;
-}
-void ansno(const char name[]) {
-  printf("%s  -  ***error\n", name);
-  return;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem42.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem42.cdv
deleted file mode 100644
index ad51022..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem42.cdv
+++ /dev/null
@@ -1,811 +0,0 @@
-/*  TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M,K,L) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-    ON ALL PROCESSORS. */
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-#define N 16
-#define M 16
-#define K 16
-#define L 16
-#define NL 1000
-
-static void rem4101();
-static void rem4102();
-static void rem4103();
-static void rem4104();
-static void rem4105();
-static void rem4106();
-static void rem4107();
-static void rem4108();
-static void rem4109();
-static void rem4110();
-static void rem4111();
-static void rem4112();
-static void rem4113();
-static void rem4114();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-static void serial4(int AR[N][M][K][L], int NN, int NM, int NK, int NLL,
-                    int NNL);
-
-int main(int an, char **as) {
-  printf("===START OF REM41========================\n");
-  rem4101();
-  rem4102();
-  rem4103();
-  rem4104();
-  rem4105();
-  rem4106();
-  rem4107();
-  rem4108();
-  rem4109();
-  rem4110();
-  rem4111();
-  rem4112();
-  rem4113();
-  rem4114();
-
-  printf("=== END OF REM41 ========================= \n");
-  return 0;
-}
-/* ---------------------------------------------REM4101  */
-void rem4101() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4101";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[0][0][0][0])
-#pragma dvm remote_access(A[0][0][0][0])
-  { ib = A[0][0][0][0]; }
-  if (ib == C[0][0][0][0])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4102  */
-void rem4102() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4102";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[N - 1][M - 1][K - 1][L - 1])
-#pragma dvm remote_access(A[N - 1][M - 1][K - 1][L - 1])
-  { ib = A[N - 1][M - 1][K - 1][L - 1]; }
-
-  if (ib == C[N - 1][M - 1][K - 1][L - 1])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM4103  */
-void rem4103() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4103";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][][][])
-#pragma dvm remote_access(A[][][][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < K; jj++) {
-            isumc = isumc + C[i][j][ii][jj];
-            isuma = isuma + A[i][j][ii][jj];
-          }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4104  */
-void rem4104() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4104";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[0][0][0][0])
-#pragma dvm remote_access(A[0][][][])
-  {
-    for (j = 0; j < M; j++)
-      for (ii = 0; ii < K; ii++)
-        for (jj = 0; jj < K; jj++) {
-          isumc = isumc + C[0][j][ii][jj];
-          isuma = isuma + A[0][j][ii][jj];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4105  */
-void rem4105() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4105";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][M - 1][][])
-#pragma dvm remote_access(A[][M - 1][][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < K; jj++) {
-            isumc = isumc + C[i][M - 1][ii][jj];
-            isuma = isuma + A[i][M - 1][ii][jj];
-          }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4106  */
-void rem4106() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4106";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][][K - 1][])
-
-#pragma dvm remote_access(A[][][K - 1][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (jj = 0; jj < L; jj++) {
-          isumc = isumc + C[i][j][K - 1][jj];
-          isuma = isuma + A[i][j][K - 1][jj];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4107  */
-void rem4107() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4107";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][][][L - 1])
-#pragma dvm remote_access(A[][][][L - 1])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          isumc = isumc + C[i][j][ii][L - 1];
-          isuma = isuma + A[i][j][ii][L - 1];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4108  */
-void rem4108() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4108";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[0][0][0][0])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[0][0][0][0];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[0][0][0][0])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4109  */
-void rem4109() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4109";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[N - 1][M - 1][K - 1][L - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[N - 1][M - 1][K - 1][L - 1];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[N - 1][M - 1][K - 1][L - 1])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4110  */
-void rem4110() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4110";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) remote_access(A[][][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][j][ii][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][j][ii][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4111  */
-void rem4111() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4111";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[0][][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[0][j][ii][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[0][j][ii][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM4112  */
-void rem4112() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4112";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[][M - 1][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][M - 1][ii][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][M - 1][ii][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4113  */
-void rem4113() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4113";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[][][K - 1][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][j][K - 1][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][j][K - 1][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4114  */
-void rem4114() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4114";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][*][*][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[][][][L - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][j][ii][L - 1];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][j][ii][L - 1])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-void serial4(int AR[N][M][K][L], int NN, int NM, int NK, int NLL, int NNL) {
-  int i, j, ii, jj;
-
-  for (i = 0; i < NN; i++)
-    for (j = 0; j < NM; j++)
-      for (ii = 0; ii < NK; ii++)
-        for (jj = 0; jj < NLL; jj++)
-
-        {
-          AR[i][j][ii][jj] = NNL + i + j + ii + jj;
-        }
-}
-void ansyes(const char name[]) {
-  printf("%s  -  complete\n", name);
-  return;
-}
-void ansno(const char name[]) {
-  printf("%s  -  ***error\n", name);
-  return;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem43.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem43.cdv
deleted file mode 100644
index 09f6d7a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/REMOTE/rem43.cdv
+++ /dev/null
@@ -1,811 +0,0 @@
-/*  TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.
-    DISTRIBUTED ARRAY A(N,M,K,L) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-    ON ALL PROCESSORS. */
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#define Min(a, b) ((a) < (b) ? (a) : (b))
-#define N 16
-#define M 16
-#define K 16
-#define L 16
-#define NL 1000
-
-static void rem4101();
-static void rem4102();
-static void rem4103();
-static void rem4104();
-static void rem4105();
-static void rem4106();
-static void rem4107();
-static void rem4108();
-static void rem4109();
-static void rem4110();
-static void rem4111();
-static void rem4112();
-static void rem4113();
-static void rem4114();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-static void serial4(int AR[N][M][K][L], int NN, int NM, int NK, int NLL,
-                    int NNL);
-
-int main(int an, char **as) {
-  printf("===START OF REM41========================\n");
-  rem4101();
-  rem4102();
-  rem4103();
-  rem4104();
-  rem4105();
-  rem4106();
-  rem4107();
-  rem4108();
-  rem4109();
-  rem4110();
-  rem4111();
-  rem4112();
-  rem4113();
-  rem4114();
-
-  printf("=== END OF REM41 ========================= \n");
-  return 0;
-}
-/* ---------------------------------------------REM4101  */
-void rem4101() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4101";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[0][0][0][0])
-#pragma dvm remote_access(A[0][0][0][0])
-  { ib = A[0][0][0][0]; }
-  if (ib == C[0][0][0][0])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4102  */
-void rem4102() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4102";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][*][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[N - 1][M - 1][K - 1][L - 1])
-#pragma dvm remote_access(A[N - 1][M - 1][K - 1][L - 1])
-  { ib = A[N - 1][M - 1][K - 1][L - 1]; }
-
-  if (ib == C[N - 1][M - 1][K - 1][L - 1])
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM4103  */
-void rem4103() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4103";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][*][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][][][])
-#pragma dvm remote_access(A[][][][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < K; jj++) {
-            isumc = isumc + C[i][j][ii][jj];
-            isuma = isuma + A[i][j][ii][jj];
-          }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4104  */
-void rem4104() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4104";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[0][0][0][0])
-#pragma dvm remote_access(A[0][][][])
-  {
-    for (j = 0; j < M; j++)
-      for (ii = 0; ii < K; ii++)
-        for (jj = 0; jj < K; jj++) {
-          isumc = isumc + C[0][j][ii][jj];
-          isuma = isuma + A[0][j][ii][jj];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4105  */
-void rem4105() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4105";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][M - 1][][])
-#pragma dvm remote_access(A[][M - 1][][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < K; jj++) {
-            isumc = isumc + C[i][M - 1][ii][jj];
-            isuma = isuma + A[i][M - 1][ii][jj];
-          }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4106  */
-void rem4106() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4106";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][*][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][][K - 1][])
-
-#pragma dvm remote_access(A[][][K - 1][])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (jj = 0; jj < L; jj++) {
-          isumc = isumc + C[i][j][K - 1][jj];
-          isuma = isuma + A[i][j][K - 1][jj];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4107  */
-void rem4107() {
-
-  int C[N][M][K][L];
-  int nloop, ib, isuma, isumc;
-  char tname[] = "REM4107";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][*][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-  isumc = 0;
-  isuma = 0;
-
-#pragma dvm region out(A)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-  }
-#pragma dvm get_actual(A[][][][L - 1])
-#pragma dvm remote_access(A[][][][L - 1])
-  {
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++) {
-          isumc = isumc + C[i][j][ii][L - 1];
-          isuma = isuma + A[i][j][ii][L - 1];
-        }
-  }
-  if (isuma == isumc)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4108  */
-void rem4108() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4108";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[0][0][0][0])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[0][0][0][0];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[0][0][0][0])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4109  */
-void rem4109() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4109";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[N - 1][M - 1][K - 1][L - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[N - 1][M - 1][K - 1][L - 1];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[N - 1][M - 1][K - 1][L - 1])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4110  */
-void rem4110() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4110";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][*][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) remote_access(A[][][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][j][ii][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][j][ii][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4111  */
-void rem4111() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4111";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][*][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[0][][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[0][j][ii][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[0][j][ii][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-
-/* ---------------------------------------------REM4112  */
-void rem4112() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4112";
-
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[*][block][block][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[][M - 1][][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][M - 1][ii][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][M - 1][ii][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4113  */
-void rem4113() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4113";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][block][*]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[][][K - 1][])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][j][K - 1][jj];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][j][K - 1][jj])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-/* ---------------------------------------------REM4114  */
-void rem4114() {
-
-  int C[N][M][K][L];
-  int nloop, ib;
-  char tname[] = "REM4114";
-  int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-#pragma dvm array distribute[block][block][*][block]
-  int B[N][M][K][L];
-
-#pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj])
-  int A[N][M][K][L];
-
-  NN = N;
-  NM = M;
-  NK = K;
-  NLL = L;
-  NNL = NL;
-  serial4(C, NN, NM, NK, NLL, NNL);
-  nloop = NL;
-
-#pragma dvm region local(A, B)
-  {
-
-#pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            A[i][j][ii][jj] = NL + i + j + ii + jj;
-          }
-
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj])                        \
-    remote_access(A[][][][L - 1])
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-
-            B[i][j][ii][jj] = A[i][j][ii][L - 1];
-          }
-#pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloop))
-    for (i = 0; i < N; i++)
-      for (j = 0; j < M; j++)
-        for (ii = 0; ii < K; ii++)
-          for (jj = 0; jj < L; jj++) {
-            if (B[i][j][ii][jj] != C[i][j][ii][L - 1])
-              nloop = i;
-          }
-  }
-#pragma dvm get_actual(nloop)
-  if (nloop == NL)
-    ansyes(tname);
-  else
-    ansno(tname);
-}
-void serial4(int AR[N][M][K][L], int NN, int NM, int NK, int NLL, int NNL) {
-  int i, j, ii, jj;
-
-  for (i = 0; i < NN; i++)
-    for (j = 0; j < NM; j++)
-      for (ii = 0; ii < NK; ii++)
-        for (jj = 0; jj < NLL; jj++)
-
-        {
-          AR[i][j][ii][jj] = NNL + i + j + ii + jj;
-        }
-}
-void ansyes(const char name[]) {
-  printf("%s  -  complete\n", name);
-  return;
-}
-void ansno(const char name[]) {
-  printf("%s  -  ***error\n", name);
-  return;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh21.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh21.cdv
deleted file mode 100644
index 977fb11..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh21.cdv
+++ /dev/null
@@ -1,1169 +0,0 @@
-/*    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.
-     DISTRIBUTED ARRAY A(N,M) IS TO HAVE DIFFERENT SHADOW WIDTH
-     ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define N 60
-#define M 60
-#define NL 1000
-
-static void sh2101();
-static void sh2102();
-static void sh2103();
-static void sh2104();
-static void sh2105();
-static void sh2106();
-static void sh2107();
-static void sh2108();
-static void sh2109();
-static void sh2110();
-static void sh2111();
-static void sh2112();
-static void sh2113();
-static void sh2114();
-static void sh2115();
-static void sh2116();
-static void sh2117();
-static void sh2118();
-static void sh2119();
-static void sh2120();
-static void sh2121();
-static void sh2122();
-
-static void serial2(int AR[N][M], int NN, int NM, int NNL);
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int argc, char *argv[])
-{
-    printf("===START OF SH21========================\n");
-    sh2101();
-    sh2102();
-    sh2103();
-    sh2104();
-    sh2105();
-    sh2106();
-    sh2107();
-    sh2108();
-    sh2109();
-    sh2110();
-    sh2111();
-    sh2112();
-    sh2113();
-    sh2114();
-    sh2115();
-    sh2116();
-    sh2117();
-    sh2118();
-    sh2119();
-    sh2120();
-    sh2121();
-    sh2122();
-
-    printf("=== END OF SH21 ========================= \n");
-    return 0;
-}
-/* ---------------------------------------------SH2101  */
-void sh2101()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2101";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j])
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A (corner))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            B[i][j] = A[i+1][j]+A[i][j+1]+A[i-1][j]+A[i][j-1]+ A[i-1][j-1]+
-                       A[i+1][j+1]+A[i-1][j+1]+A[i+1][j-1];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (B[i][j] !=C[i+1][j]+C[i][j+1]+C[i-1][j]+C[i][j-1]+C[i-1][j-1]+
-            C[i+1][j+1]+C[i-1][j+1]+C[i+1][j-1])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------SH2102  */
-void sh2102()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2102";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j])
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:1][0:1](corner))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            B[i][j] = A[i+1][j]+A[i][j+1]+ A[i+1][j+1];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (B[i][j] !=C[i+1][j]+C[i][j+1]+C[i+1][j+1])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------SH2103  */
-void sh2103()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2103";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[1:0][0:1]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[1:0][0:1](corner))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            B[i][j] = A[i-1][j]+A[i][j+1];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (B[i][j] !=C[i-1][j]+C[i][j+1])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2104  */
-void sh2104()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2104";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[0:1][0:1]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:1][0:1](corner))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            B[i][j] = A[i+1][j]+A[i][j+1]+ A[i+1][j+1];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (B[i][j] !=C[i+1][j]+C[i][j+1]+C[i+1][j+1])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------SH2105  */
-void sh2105()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2105";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[0:1][1:0]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:1][1:0](corner))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            B[i][j] = A[i][j-1]+A[i+1][j]+A[i+1][j-1];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (B[i][j] !=C[i][j-1]+C[i+1][j]+C[i+1][j-1])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2106  */
-void sh2106()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2106";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[0:1][0:0]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:1][0:0](corner))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            B[i][j] = A[i+1][j];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (B[i][j] != C[i+1][j])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2107  */
-void sh2107()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2107";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[0:0][1:0]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:0][1:0](corner))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            B[i][j] = A[i][j-1];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            if (B[i][j] !=C[i][j-1])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------SH2108  */
-void sh2108()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2108";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[2:2][2:2]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[2:2][2:2](corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            B[i][j] = A[i+2][j]+A[i][j+2]+A[i+2][j+2]+A[i-2][j+2]+
-                 A[i-2][j]+A[i][j-2]+A[i-2][j-2]+A[i+2][j];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (B[i][j] != C[i+2][j]+C[i][j+2]+C[i+2][j+2]+C[i-2][j+2]+
-                 C[i-2][j]+C[i][j-2]+C[i-2][j-2]+C[i+2][j])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2109  */
- void sh2109()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2109";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[0:2][2:2]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:2][2:2](corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            B[i][j] = A[i+2][j+2]+A[i+1][j+1]+A[i][j+2]+A[i][j-2]+A[i+2][j-2];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (B[i][j] != C[i+2][j+2]+C[i+1][j+1]+C[i][j+2]+C[i][j-2]+C[i+2][j-2])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-   if (nloopi == NL && nloopj == NL)
-       ansyes(tname);
-   else
-       ansno(tname);
-}
-/* ---------------------------------------------SH2110  */
-void sh2110()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2110";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[2:2][2:0]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[2:2][2:0](corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            B[i][j] = A[i-2][j-2]+A[i-1][j-1]+A[i-2][j]+A[i+2][j]+A[i+2][j-2];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (B[i][j] != C[i-2][j-2]+C[i-1][j-1]+C[i-2][j]+C[i+2][j]+C[i+2][j-2])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2111  */
-void sh2111()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2111";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[2:2][0:2]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[2:2][0:2](corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            B[i][j] = A[i+2][j+2]+A[i+1][j+1]+A[i-2][j+2]+A[i+2][j];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (B[i][j] != C[i+2][j+2]+C[i+1][j+1]+C[i-2][j+2]+C[i+2][j])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------SH2112  */
-void sh2112()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2112";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[2:0][2:2]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[1:0][0:1](corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            B[i][j] = A[i-1][j+1]+A[i][j+1]+A[i-1][j];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (B[i][j] != C[i-1][j+1]+C[i][j+1]+C[i-1][j])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2113  */
-void sh2113()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2113";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[2:2][2:0]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:1][0:0](corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            B[i][j] = A[i+1][j];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (B[i][j] !=C[i+1][j])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2114  */
-void sh2114()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2114";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[2:0][2:2]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:0][0:2](corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            B[i][j] = A[i][j+2]+A[i][j+1];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            if (B[i][j] !=C[i][j+2]+C[i][j+1])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2115  */
-void sh2115()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2115";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[3:3][3:3]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A(corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            B[i][j] = A[i+1][j+1]+A[i+2][j+2]+A[i+3][j+3]+A[i-3][j-3]+A[i-2][j-2]+
-                 A[i-1][j-1]+A[i-3][j+3]+A[i+3][j-3];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (B[i][j] !=C[i+1][j+1]+C[i+2][j+2]+C[i+3][j+3]+C[i-3][j-3]+C[i-2][j-2]+
-                 C[i-1][j-1]+C[i-3][j+3]+C[i+3][j-3])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/*  ---------------------------------------------SH2116  */
-void sh2116()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2116";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[3:3][0:3]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:0][0:1](corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            B[i][j] = A[i][j+1];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (B[i][j] !=C[i][j+1])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-/* ---------------------------------------------SH2117  */
-void sh2117()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2117";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[0:3][3:3]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[0:1][0:0](corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            B[i][j] = A[i+1][j];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (B[i][j] !=C[i+1][j])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2118  */
-void sh2118()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2118";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[3:3][3:0]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A(corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            B[i][j] = A[i-3][j-3]+A[i+3][j]+A[i-3][j];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (B[i][j] !=C[i-3][j-3]+C[i+3][j]+C[i-3][j])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2119  */
-void sh2119()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2119";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[3:0][3:3]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A[3:0][3:3](corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            B[i][j] = A[i-3][j-3]+A[i][j+3]+A[i-3][j+3];
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            if (B[i][j] !=C[i-3][j-3]+C[i][j+3]+C[i-3][j+3])
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2120  */
-void sh2120()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2120";
-    int i, j, NN, NM, NNL;
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-    #pragma dvm array align([i][j] with B[i][j]), shadow[9:9][9:9]
-    int A[N][M];
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-
-    nloopi = NL;
-    nloopj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A(corner))
-    for (i = 9; i < N - 9;i++)
-        for (j = 9; j < M - 9; j++)
-            B[i][j] = A[i+7][j+7]+A[i+8][j+8]+A[i+9][j+9]+A[i-9][j-9]+A[i-8][j-8]+
-                 A[i-7][j-7]+A[i-9][j+9]+A[i+9][j-9];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            if (B[i][j] !=C[i+7][j+7]+C[i+8][j+8]+C[i+9][j+9]+C[i-9][j-9]+C[i-8][j-8]+
-                 C[i-7][j-7]+C[i-9][j+9]+C[i+9][j-9] )
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2121  */
-void sh2121()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2121";
-    int i, j, NN, NM, NNL;
-
-    #pragma dvm array distribute[block][block]
-    int B[N][M];
-
-    #pragma dvm array shadow[9:9][9:9]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    #pragma dvm realign(A[i][j] with B[i][j])
-    #pragma dvm region local(A), out(B)
-    {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A(corner))
-    for (i = 9; i < N - 9;i++)
-        for (j = 9; j < M - 9; j++)
-            B[i][j] = A[i+7][j+7]+A[i+8][j+8]+A[i+9][j+9]+A[i-9][j-9]+A[i-8][j-8]+
-                 A[i-7][j-7]+A[i-9][j+9]+A[i+9][j-9];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            if (B[i][j] !=C[i+7][j+7]+C[i+8][j+8]+C[i+9][j+9]+C[i-9][j-9]+C[i-8][j-8]+
-                 C[i-7][j-7]+C[i-9][j+9]+C[i+9][j-9] )
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH2122  */
-void sh2122()
-{
-    int C[N][M];
-    int nloopi, nloopj;
-    char tname[] = "SH2122";
-    int i, j, NN, NM, NNL;
-
-    #pragma dvm array
-    int B[N][M];
-
-    #pragma dvm array shadow[9:9][9:9]
-    int A[N][M];
-
-    NN = N;
-    NM = M;
-    NNL = NL;
-    serial2(C, NN, NM, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    #pragma dvm redistribute(B[block][block])
-    #pragma dvm realign(A[i][j] with B[i][j])
-    #pragma dvm region local(A), out(B)
-    {
-
-    #pragma dvm parallel([i][j] on A[i][j])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            A[i][j] = NL + i + j;
-
-    #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A(corner))
-    for (i = 9; i < N - 9;i++)
-        for (j = 9; j < M - 9; j++)
-            B[i][j] = A[i+7][j+7]+A[i+8][j+8]+A[i+9][j+9]+A[i-9][j-9]+A[i-8][j-8]+
-                 A[i-7][j-7]+A[i-9][j+9]+A[i+9][j-9];
-
-    } /*end region*/
-
-    #pragma dvm get_actual(B)
-
-    #pragma dvm parallel([i][j] on B[i][j]) reduction(min(nloopi), min(nloopj))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            if (B[i][j] !=C[i+7][j+7]+C[i+8][j+8]+C[i+9][j+9]+C[i-9][j-9]+C[i-8][j-8]+
-                 C[i-7][j-7]+C[i-9][j+9]+C[i+9][j-9] )
-            {
-                if (nloopi > i) nloopi = i;
-                if (nloopj > j) nloopj = j;
-            }
-
-    if (nloopi == NL && nloopj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-void serial2(int AR[N][M], int NN, int NM, int NNL)
-{
-    int i,j;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            AR[i][j] = NNL + i + j;
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh31.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh31.cdv
deleted file mode 100644
index a5854ea..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh31.cdv
+++ /dev/null
@@ -1,706 +0,0 @@
-    /*    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.
-     DISTRIBUTED ARRAY A(N,M,K) IS TO HAVE DIFFERENT SHADOW WIDTH
-     ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define N 60
-#define M 60
-#define K 60
-#define NL 1000
-
-static void sh3101();
-static void sh3102();
-static void sh3103();
-static void sh3104();
-static void sh3105();
-static void sh3106();
-static void sh3107();
-static void sh3108();
-static void sh3109();
-static void sh3110();
-static void sh3111();
-static void serial3(int AR[N][M][K], int NN, int NM, int NK, int NNL);
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int argc, char *argv[])
-{
-    printf("===START OF SH31========================\n");
-    sh3101();
-    sh3102();
-    sh3103();
-    sh3104();
-    sh3105();
-    sh3106();
-    sh3107();
-    sh3108();
-    sh3109();
-    sh3110();
-    sh3111();
-
-    printf("=== END OF SH31 ========================= \n");
-    return 0;
-}
-/* ---------------------------------------------SH3101  */
-void sh3101()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3101";
-    int i, j, ii, NN, NM, NK, NNL;
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-    #pragma dvm array align([i][j][ii] with B[i][j][ii])
-    int A[N][M][K];
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A (corner))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1;j++)
-            for (ii = 1; ii < K - 1; ii++)
-                B[i][j][ii] = A[i+1][j][ii]+A[i][j+1][ii]+A[i][j][ii+1]+A[i-1][j][ii]+
-                     A[i][j-1][ii]+A[i][j][ii-1]+A[i-1][j-1][ii-1]+
-                     A[i+1][j+1][ii+1]+A[i-1][j+1][ii]+A[i+1][j-1][ii]+
-                     A[i-1][j+1][ii-1]+A[i-1][j+1][ii+1]+A[i+1][j-1][ii-1]+
-                     A[i+1][j-1][ii+1];
-
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1;j++)
-            for (ii = 1; ii < K - 1; ii++)
-                if (B[i][j][ii]!=C[i+1][j][ii]+C[i][j+1][ii]+C[i][j][ii+1]+
-                      C[i-1][j][ii]+C[i][j-1][ii]+C[i][j][ii-1]+
-                      C[i-1][j-1][ii-1]+C[i+1][j+1][ii+1]+C[i-1][j+1][ii]+
-                      C[i+1][j-1][ii]+C[i-1][j+1][ii-1]+C[i-1][j+1][ii+1]+
-                      C[i+1][j-1][ii-1]+C[i+1][j-1][ii+1])
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3102  */
-void sh3102()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3102";
-    int i, j, ii, NN, NM, NK, NNL;
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-    #pragma dvm array align([i][j][ii] with B[i][j][ii]), shadow[2:2][2:2][2:2]
-    int A[N][M][K];
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A[1:2][2:2][1:2](corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                B[i][j][ii] = A[i-1][j-2][ii+2]+A[i-1][j+2][ii-1]+A[i-1][j+2][ii+2]+
-                     A[i+2][j+2][ii+2]+A[i+2][j+2][ii-1]+A[i+2][j-2][ii+2]+
-                     A[i+2][j-2][ii-1]+A[i-1][j-2][ii-1];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                if (B[i][j][ii]!= C[i-1][j-2][ii+2]+C[i-1][j+2][ii-1]+C[i-1][j+2][ii+2]+
-                     C[i+2][j+2][ii+2]+C[i+2][j+2][ii-1]+C[i+2][j-2][ii+2]+
-                     C[i+2][j-2][ii-1]+C[i-1][j-2][ii-1])
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3103  */
-void sh3103()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3103";
-    int i, j, ii, NN, NM, NK, NNL;
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-    #pragma dvm array align([i][j][ii] with B[i][j][ii]), shadow[2:2][2:2][2:2]
-    int A[N][M][K];
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A[0:2][2:2][0:2] (corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                B[i][j][ii] = A[i+2][j+2][ii+2]+A[i][j-2][ii]+
-                     A[i+2][j-2][ii]+A[i][j+2][ii]+ A[i][j+2][ii+2]+
-                     A[i+2][j-2][ii+2]+A[i+2][j+2][ii];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                if (B[i][j][ii]!= C[i+2][j+2][ii+2]+C[i][j-2][ii]+
-                     C[i+2][j-2][ii]+C[i][j+2][ii]+ C[i][j+2][ii+2]+
-                     C[i+2][j-2][ii+2]+C[i+2][j+2][ii] )
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3104  */
-void sh3104()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3104";
-    int i, j, ii, NN, NM, NK, NNL;
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-    #pragma dvm array align([i][j][ii] with B[i][j][ii]), shadow[2:2][2:2][2:2]
-    int A[N][M][K];
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A[2:2][2:0][2:0] (corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                B[i][j][ii] =  A[i+2][j][ii]+A[i-2][j-2][ii-2]
-                  +   A[i+2][j-2][ii-2]+A[i-2][j][ii-2]+ A[i-2][j-2][ii]+
-                     A[i-2][j][ii]+A[i+2][j-2][ii]+A[i+2][j][ii-2];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                if (B[i][j][ii]!=C[i+2][j][ii]+C[i-2][j-2][ii-2]
-                  +   C[i+2][j-2][ii-2]+C[i-2][j][ii-2]+ C[i-2][j-2][ii]+
-                     C[i-2][j][ii]+C[i+2][j-2][ii]+C[i+2][j][ii-2])
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-/*    printf ("%i,%i,%i\n",nloopi,nloopj,nloopii);*/
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3105  */
-void sh3105()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3105";
-    int i, j, ii, NN, NM, NK, NNL;
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-    #pragma dvm array align([i][j][ii] with B[i][j][ii]), shadow[0:2][2:2][0:2]
-    int A[N][M][K];
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A[0:2][2:2][0:2] (corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                B[i][j][ii] = A[i+2][j+2][ii+2]+A[i][j-2][ii]+
-                     A[i+2][j-2][ii]+A[i][j+2][ii]+ A[i][j+2][ii+2]+
-                     A[i+2][j-2][ii+2]+A[i+2][j+2][ii];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                if (B[i][j][ii]!= C[i+2][j+2][ii+2]+C[i][j-2][ii]+
-                     C[i+2][j-2][ii]+C[i][j+2][ii]+ C[i][j+2][ii+2]+
-                     C[i+2][j-2][ii+2]+C[i+2][j+2][ii])
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3106  */
-void sh3106()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3106";
-    int i, j, ii, NN, NM, NK, NNL;
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-    #pragma dvm array align([i][j][ii] with B[i][j][ii]), shadow[3:3][3:3][3:3]
-    int A[N][M][K];
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A (corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                B[i][j][ii] = A[i-3][j-3][ii+3]+A[i+3][j+3][ii-3]+A[i+3][j-3][ii+3]+
-                     A[i-3][j+3][ii+3]+A[i-3][j+3][ii-3]+A[i+3][j-3][ii-3]+
-                     A[i+3][j+3][ii+3]+A[i-3][j-3][ii-3];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                if (B[i][j][ii]!= C[i-3][j-3][ii+3]+C[i+3][j+3][ii-3]+C[i+3][j-3][ii+3]+
-                     C[i-3][j+3][ii+3]+C[i-3][j+3][ii-3]+C[i+3][j-3][ii-3]+
-                     C[i+3][j+3][ii+3]+C[i-3][j-3][ii-3])
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3107  */
-void sh3107()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3107";
-    int i, j, ii, NN, NM, NK, NNL;
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-    #pragma dvm array align([i][j][ii] with B[i][j][ii]), shadow[3:3][0:3][3:0]
-    int A[N][M][K];
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A (corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                B[i][j][ii] = A[i+3][j+3][ii]+A[i-3][j][ii-3]+A[i+3][j][ii-3]+
-                     A[i-3][j+3][ii-3]+A[i-3][j][ii]+A[i-3][j+3][ii]+
-                     A[i+3][j][ii]+A[i+3][j+3][ii-3];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                if (B[i][j][ii]!= C[i-3][j-3][ii+3]+C[i+3][j+3][ii-3]+C[i+3][j-3][ii+3]+
-                     C[i-3][j+3][ii+3]+C[i-3][j+3][ii-3]+C[i+3][j-3][ii-3]+
-                     C[i+3][j+3][ii+3]+C[i-3][j-3][ii-3])
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3108  */
-void sh3108()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3108";
-    int i, j, ii, NN, NM, NK, NNL;
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-    #pragma dvm array align([i][j][ii] with B[i][j][ii]), shadow[0:3][0:3][0:3]
-    int A[N][M][K];
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A[0:3][0:3][0:3] (corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                B[i][j][ii] = A[i+3][j+3][ii+3]+A[i+3][j][ii]+A[i][j+3][ii]+
-                     A[i][j][ii+3]+A[i][j+3][ii+3]+A[i+3][j][ii+3]+
-                     A[i+3][j+3][ii];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                if (B[i][j][ii]!=C[i+3][j+3][ii+3]+C[i+3][j][ii]+C[i][j+3][ii]+
-                     C[i][j][ii+3]+C[i][j+3][ii+3]+C[i+3][j][ii+3]+
-                     C[i+3][j+3][ii] )
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3109  */
-void sh3109()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3109";
-    int i, j, ii, NN, NM, NK, NNL;
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-    #pragma dvm array align([i][j][ii] with B[i][j][ii]), shadow[9:9][9:9][9:9]
-    int A[N][M][K];
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A[9:9][9:9][9:9] (corner))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            for (ii = 9; ii < K - 9; ii++)
-                B[i][j][ii]=A[i+9][j+9][ii+9]+A[i-9][j-9][ii-9]+A[i+9][j-9][ii-9]+
-                      A[i-9][j+9][ii-9]+A[i-9][j-9][ii+9]+A[i-9][j+9][ii+9]+
-                      A[i+9][j-9][ii+9]+A[i+9][j+9][ii-9];
-
-
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            for (ii = 9; ii < K - 9; ii++)
-                if (B[i][j][ii]!=C[i+9][j+9][ii+9]+C[i-9][j-9][ii-9]+C[i+9][j-9][ii-9]+
-                     C[i-9][j+9][ii-9]+C[i-9][j-9][ii+9]+C[i-9][j+9][ii+9]+
-                     C[i+9][j-9][ii+9]+C[i+9][j+9][ii-9])
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3110  */
-void sh3110()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3110";
-    int i, j, ii, NN, NM, NK, NNL;
-
-    #pragma dvm array distribute[block][block][block]
-    int B[N][M][K];
-
-    #pragma dvm array shadow[9:9][9:9][9:9]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    #pragma dvm realign(A[i][j][ii] with B[i][j][ii])
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A[9:9][9:9][9:9] (corner))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            for (ii = 9; ii < K - 9; ii++)
-                B[i][j][ii]=A[i+9][j+9][ii+9]+A[i-9][j-9][ii-9]+A[i+9][j-9][ii-9]+
-                      A[i-9][j+9][ii-9]+A[i-9][j-9][ii+9]+A[i-9][j+9][ii+9]+
-                      A[i+9][j-9][ii+9]+A[i+9][j+9][ii-9];
-
-
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            for (ii = 9; ii < K - 9; ii++)
-                if (B[i][j][ii]!=C[i+9][j+9][ii+9]+C[i-9][j-9][ii-9]+C[i+9][j-9][ii-9]+
-                     C[i-9][j+9][ii-9]+C[i-9][j-9][ii+9]+C[i-9][j+9][ii+9]+
-                     C[i+9][j-9][ii+9]+C[i+9][j+9][ii-9])
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-/* ---------------------------------------------SH3111  */
-void sh3111()
-{
-    int C[N][M][K];
-    int nloopi, nloopj, nloopii;
-    char tname[] = "SH3111";
-    int i, j, ii, NN, NM, NK, NNL;
-
-    #pragma dvm array
-    int B[N][M][K];
-
-    #pragma dvm array shadow[9:9][9:9][9:9]
-    int A[N][M][K];
-
-    NN = N;
-    NM = M;
-    NK = K;
-    NNL = NL;
-    serial3(C, NN, NM, NK, NNL);
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    #pragma dvm redistribute(B[block][block][block])
-    #pragma dvm realign(A[i][j][ii] with B[i][j][ii])
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii] on A[i][j][ii])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++) {
-                A[i][j][ii] = NL + i + j + ii;
-                B[i][j][ii] = 0;
-            }
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) shadow_renew(A[9:9][9:9][9:9] (corner))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            for (ii = 9; ii < K - 9; ii++)
-                B[i][j][ii]=A[i+9][j+9][ii+9]+A[i-9][j-9][ii-9]+A[i+9][j-9][ii-9]+
-                      A[i-9][j+9][ii-9]+A[i-9][j-9][ii+9]+A[i-9][j+9][ii+9]+
-                      A[i+9][j-9][ii+9]+A[i+9][j+9][ii-9];
-
-
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii] on B[i][j][ii]) reduction(min(nloopi), min(nloopj), min(nloopii))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            for (ii = 9; ii < K - 9; ii++)
-                if (B[i][j][ii]!=C[i+9][j+9][ii+9]+C[i-9][j-9][ii-9]+C[i+9][j-9][ii-9]+
-                     C[i-9][j+9][ii-9]+C[i-9][j-9][ii+9]+C[i-9][j+9][ii+9]+
-                     C[i+9][j-9][ii+9]+C[i+9][j+9][ii-9])
-                {
-                    if (nloopi > i) nloopi = i;
-                    if (nloopj > j) nloopj = j;
-                    if (nloopii > ii) nloopii = ii;
-                }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-}
-
-void serial3(int AR[N][M][K], int NN, int NM, int NK, int NNL)
-{
-    int i, j, ii;
-    for (i = 0; i < NN; i++)
-        for (j = 0; j < NM; j++)
-            for (ii = 0; ii < NK; ii++)
-                AR[i][j][ii] = NNL + i + j + ii;
-}
-
-void ansyes(const char name[])
-{
-    printf ("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh41.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh41.cdv
deleted file mode 100644
index d0ff678..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/SHADOW/sh41.cdv
+++ /dev/null
@@ -1,923 +0,0 @@
-/*    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.
-     DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT SHADOW WIDTH
-     ON BOTH SIDES */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define NL 1000
-
-static void sh4101();
-static void sh4102();
-static void sh4103();
-static void sh4104();
-static void sh4105();
-static void sh4106();
-static void sh4107();
-static void sh4108();
-static void sh4109();
-static void sh4110();
-static void sh4111();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-int main(int an, char **as)
-{
-    printf("===START OF SH41========================\n");
-    sh4101();
-    sh4102();
-    sh4103();
-    sh4104();
-    sh4105();
-    sh4106();
-    sh4107();
-    sh4108();
-    sh4109();
-    sh4110();
-    sh4111();
-
-    printf("=== END OF SH41 ========================= \n");
-    return 0;
-}
-/* ---------------------------------------------SH4101  */
-void sh4101()
-{
-    #define N 16
-    #define M 8
-    #define K 8
-    #define L 8
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4101";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj]), shadow[1:1][1:1][1:1][1:1]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A(corner))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    B[i][j][ii][jj] = A[i+1][j+1][ii+1][jj+1]+A[i-1][j-1][ii-1][jj-1]+
-                                   A[i+1][j-1][ii-1][jj-1]+A[i-1][j+1][ii-1][jj-1]+
-                                   A[i-1][j-1][ii+1][jj-1]+A[i-1][j-1][ii-1][jj+1]+
-                                   A[i+1][j+1][ii-1][jj-1]+A[i-1][j+1][ii+1][jj-1]+
-                                   A[i-1][j-1][ii+1][jj+1]+A[i+1][j-1][ii-1][jj+1]+
-                                   A[i+1][j-1][ii+1][jj-1]+A[i-1][j+1][ii-1][jj+1]+
-                                   A[i+1][j+1][ii+1][jj-1]+A[i-1][j+1][ii+1][jj+1]+
-                                   A[i+1][j-1][ii+1][jj+1]+A[i+1][j+1][ii-1][jj+1];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 1; i < N - 1; i++)
-        for (j = 1; j < M - 1; j++)
-            for (ii = 1; ii < K - 1; ii++)
-                for (jj = 1; jj < L - 1; jj++)
-                    if (B[i][j][ii][jj]!=
-                     C[i+1][j+1][ii+1][jj+1]+C[i-1][j-1][ii-1][jj-1]+
-                     C[i+1][j-1][ii-1][jj-1]+C[i-1][j+1][ii-1][jj-1]+
-                     C[i-1][j-1][ii+1][jj-1]+C[i-1][j-1][ii-1][jj+1]+
-                     C[i+1][j+1][ii-1][jj-1]+C[i-1][j+1][ii+1][jj-1]+
-                     C[i-1][j-1][ii+1][jj+1]+C[i+1][j-1][ii-1][jj+1]+
-                     C[i+1][j-1][ii+1][jj-1]+C[i-1][j+1][ii-1][jj+1]+
-                     C[i+1][j+1][ii+1][jj-1]+C[i-1][j+1][ii+1][jj+1]+
-                     C[i+1][j-1][ii+1][jj+1]+C[i+1][j+1][ii-1][jj+1])
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/*-----------------------------------------------------------SH4102  */
-void sh4102()
-{
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4102";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj]), shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-      #pragma dvm parallel ([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A (corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    B[i][j][ii][jj] =
-                        A[i+2][j+2][ii+2][jj+2]+A[i-2][j-2][ii-2][jj-2]+
-                        A[i+2][j-2][ii-2][jj-2]+A[i-2][j+2][ii-2][jj-2]+
-                        A[i-2][j-2][ii+2][jj-2]+A[i-2][j-2][ii-2][jj+2]+
-                        A[i+2][j+2][ii-2][jj-2]+A[i-2][j+2][ii+2][jj-2]+
-                        A[i-2][j-2][ii+2][jj+2]+A[i+2][j-2][ii-2][jj+2]+
-                        A[i+2][j-2][ii+2][jj-2]+A[i-2][j+2][ii-2][jj+2]+
-                        A[i+2][j+2][ii+2][jj-2]+A[i-2][j+2][ii+2][jj+2]+
-                        A[i+2][j-2][ii+2][jj+2]+A[i+2][j+2][ii-2][jj+2];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    if (B[i][j][ii][jj]!=
-                       C[i+2][j+2][ii+2][jj+2]+C[i-2][j-2][ii-2][jj-2]+
-                       C[i+2][j-2][ii-2][jj-2]+C[i-2][j+2][ii-2][jj-2]+
-                       C[i-2][j-2][ii+2][jj-2]+C[i-2][j-2][ii-2][jj+2]+
-                       C[i+2][j+2][ii-2][jj-2]+C[i-2][j+2][ii+2][jj-2]+
-                       C[i-2][j-2][ii+2][jj+2]+C[i+2][j-2][ii-2][jj+2]+
-                       C[i+2][j-2][ii+2][jj-2]+C[i-2][j+2][ii-2][jj+2]+
-                       C[i+2][j+2][ii+2][jj-2]+C[i-2][j+2][ii+2][jj+2]+
-                       C[i+2][j-2][ii+2][jj+2]+C[i+2][j+2][ii-2][jj+2])
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------SH4103  */
-void sh4103()
-{
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4103";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj]), shadow[2:2][2:2][2:2][2:2]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A[2:0][2:2][2:0][2:0] (corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    B[i][j][ii][jj] =
-                        A[i-2][j-2][ii-2][jj-2]+A[i][j-2][ii][jj]+
-                        A[i-2][j-2][ii][jj]    +A[i][j-2][ii][jj]+
-                        A[i][j-2][ii-2][jj]    +A[i-2][j-2][ii][jj]+
-                        A[i][j-2][ii-2][jj-2]  +A[i][j-2][ii][jj-2]+
-                        A[i-2][j-2][ii-2][jj]  +A[i][j-2][ii-2][jj-2];
-    }/* end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    if (B[i][j][ii][jj]!=
-                        C[i-2][j-2][ii-2][jj-2]+C[i][j-2][ii][jj]+
-                        C[i-2][j-2][ii][jj]    +C[i][j-2][ii][jj]+
-                        C[i][j-2][ii-2][jj]    +C[i-2][j-2][ii][jj]+
-                        C[i][j-2][ii-2][jj-2]  +C[i][j-2][ii][jj-2]+
-                        C[i-2][j-2][ii-2][jj]  +C[i][j-2][ii-2][jj-2])
-
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------SH4104  */
-void sh4104()
-{
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4104";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj]), shadow[0:2][2:2][0:2][0:2]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-   #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A(corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    B[i][j][ii][jj] = A[i+2][j+2][ii+2][jj+2]+A[i][j-2][ii][jj]+
-                                          A[i+2][j-2][ii][jj]    +A[i][j-2][ii][jj]+
-                                          A[i][j+2][ii][jj]      +A[i][j-2][ii+2][jj]+
-                                          A[i+2][j+2][ii][jj]    +A[i][j-2][ii+2][jj+2]+
-                                          A[i][j+2][ii][jj+2]    +A[i+2][j+2][ii+2][jj]+
-                                          A[i][j+2][ii+2][jj+2]  +A[i+2][j-2][ii+2][jj+2];
-    }/*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    if (B[i][j][ii][jj]!=
-                        C[i+2][j+2][ii+2][jj+2]+C[i][j-2][ii][jj]+
-                        C[i+2][j-2][ii][jj]    +C[i][j-2][ii][jj]+
-                        C[i][j+2][ii][jj]      +C[i][j-2][ii+2][jj]+
-                        C[i+2][j+2][ii][jj]    +C[i][j-2][ii+2][jj+2]+
-                        C[i][j+2][ii][jj+2]    +C[i+2][j+2][ii+2][jj]+
-                        C[i][j+2][ii+2][jj+2]  +C[i+2][j-2][ii+2][jj+2])
-
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------SH4105  */
-void sh4105()
-{
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4105";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj]), shadow[2:2][2:0][0:2][2:2]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A[0:0][0:0][0:0][0:2] (corner))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    B[i][j][ii][jj] = A[i][j][ii][jj+2];
-    }/*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 2; i < N - 2; i++)
-        for (j = 2; j < M - 2; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    if (B[i][j][ii][jj]!=C[i][j][ii][jj+2])
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------SH4106  */
-void sh4106()
-{
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4106";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj]), shadow[3:3][3:3][3:3][3:3]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-      #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A (corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    B[i][j][ii][jj] = A[i+3][j+3][ii+3][jj+3]+A[i-3][j-3][ii-3][jj-3]+
-                                          A[i+3][j-3][ii-3][jj-3]+A[i-3][j+3][ii-3][jj-3]+
-                                          A[i-3][j-3][ii+3][jj-3]+A[i-3][j-3][ii-3][jj+3]+
-                                          A[i+3][j+3][ii-3][jj-3]+A[i-3][j+3][ii+3][jj-3]+
-                                          A[i-3][j-3][ii+3][jj+3]+A[i+3][j-3][ii-3][jj+3]+
-                                          A[i+3][j-3][ii+3][jj-3]+A[i-3][j+3][ii-3][jj+3]+
-                                          A[i+3][j+3][ii+3][jj-3]+A[i-3][j+3][ii+3][jj+3]+
-                                          A[i+3][j-3][ii+3][jj+3]+A[i+3][j+3][ii-3][jj+3];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    if (B[i][j][ii][jj]!=
-                            C[i+3][j+3][ii+3][jj+3]+C[i-3][j-3][ii-3][jj-3]+
-                            C[i+3][j-3][ii-3][jj-3]+C[i-3][j+3][ii-3][jj-3]+
-                            C[i-3][j-3][ii+3][jj-3]+C[i-3][j-3][ii-3][jj+3]+
-                            C[i+3][j+3][ii-3][jj-3]+C[i-3][j+3][ii+3][jj-3]+
-                            C[i-3][j-3][ii+3][jj+3]+C[i+3][j-3][ii-3][jj+3]+
-                            C[i+3][j-3][ii+3][jj-3]+C[i-3][j+3][ii-3][jj+3]+
-                            C[i+3][j+3][ii+3][jj-3]+C[i-3][j+3][ii+3][jj+3]+
-                            C[i+3][j-3][ii+3][jj+3]+C[i+3][j+3][ii-3][jj+3] )
-
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------SH4107  */
-void sh4107()
-{
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4107";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj]), shadow[0:3][3:3][0:3][0:3]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-      #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A(corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    B[i][j][ii][jj] =
-                        A[i+3][j+3][ii+3][jj+3]+A[i][j-3][ii][jj]+
-                        A[i+3][j-3][ii][jj]+A[i][j+3][ii][jj]+
-                        A[i][j-3][ii+3][jj]+A[i+3][j+3][ii][jj]+
-                        A[i][j-3][ii+3][jj+3]+A[i][j+3][ii][jj+3]+
-                        A[i+3][j+3][ii+3][jj]+A[i][j+3][ii+3][jj+3]+
-                        A[i+3][j-3][ii+3][jj+3];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    if (B[i][j][ii][jj]!=
-                             C[i+3][j+3][ii+3][jj+3]+C[i][j-3][ii][jj]+
-                             C[i+3][j-3][ii][jj]+       C[i][j+3][ii][jj]+
-                             C[i][j-3][ii+3][jj]+       C[i+3][j+3][ii][jj]+
-                             C[i][j-3][ii+3][jj+3]+     C[i][j+3][ii][jj+3]+
-                             C[i+3][j+3][ii+3][jj]+     C[i][j+3][ii+3][jj+3]+
-                             C[i+3][j-3][ii+3][jj+3])
-
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------SH4108  */
-void sh4108()
-{
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4108";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj]), shadow[0:3][3:3][0:3][0:3]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A[0:0][0:0][0:0][0:3] (corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    B[i][j][ii][jj] = A[i][j][ii][jj+3];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    if (B[i][j][ii][jj]!=C[i][j][ii][jj+3])
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------SH4109  */
-void sh4109()
-{
-    #define N 48
-    #define M 48
-    #define K 24
-    #define L 24
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4109";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array align([i][j][ii][jj] with B[i][j][ii][jj]), shadow[9:9][9:9][2:2][2:2]
-    int A[N][M][K][L];
-
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-      #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A[9:9][9:9][2:2][2:2] (corner))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    B[i][j][ii][jj] = A[i+9][j+9][ii+2][jj+2]+A[i-9][j-9][ii-2][jj-2]+
-                                          A[i+9][j-9][ii-2][jj-2]+A[i-9][j+9][ii-2][jj-2]+
-                                          A[i-9][j-9][ii+2][jj-2]+A[i-9][j-9][ii-2][jj+2]+
-                                          A[i+9][j+9][ii-2][jj-2]+A[i-9][j+9][ii+2][jj-2]+
-                                          A[i-9][j-9][ii+2][jj+2]+A[i+9][j-9][ii-2][jj+2]+
-                                          A[i+9][j-9][ii+2][jj-2]+A[i-9][j+9][ii-2][jj+2]+
-                                          A[i+9][j+9][ii+2][jj-2]+A[i-9][j+9][ii+2][jj+2]+
-                                          A[i+9][j-9][ii+2][jj+2]+A[i+9][j+9][ii-2][jj+2];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 9; i < N - 9; i++)
-        for (j = 9; j < M - 9; j++)
-            for (ii = 2; ii < K - 2; ii++)
-                for (jj = 2; jj < L - 2; jj++)
-                    if (B[i][j][ii][jj]!=
-                            C[i+9][j+9][ii+2][jj+2]+C[i-9][j-9][ii-2][jj-2]+
-                            C[i+9][j-9][ii-2][jj-2]+C[i-9][j+9][ii-2][jj-2]+
-                            C[i-9][j-9][ii+2][jj-2]+C[i-9][j-9][ii-2][jj+2]+
-                            C[i+9][j+9][ii-2][jj-2]+C[i-9][j+9][ii+2][jj-2]+
-                            C[i-9][j-9][ii+2][jj+2]+C[i+9][j-9][ii-2][jj+2]+
-                            C[i+9][j-9][ii+2][jj-2]+C[i-9][j+9][ii-2][jj+2]+
-                            C[i+9][j+9][ii+2][jj-2]+C[i-9][j+9][ii+2][jj+2]+
-                            C[i+9][j-9][ii+2][jj+2]+C[i+9][j+9][ii-2][jj+2] )
-
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------SH4110  */
-void sh4110()
-{
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4110";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    #pragma dvm array distribute[block][block][block][block]
-    int B[N][M][K][L];
-    #pragma dvm array shadow[3:3][3:3][3:3][3:3]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-    #pragma dvm realign(A[i][j][ii][jj] with B[i][j][ii][jj])
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A (corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    B[i][j][ii][jj] = A[i+3][j+3][ii+3][jj+3]+A[i-3][j-3][ii-3][jj-3]+
-                                          A[i+3][j-3][ii-3][jj-3]+A[i-3][j+3][ii-3][jj-3]+
-                                          A[i-3][j-3][ii+3][jj-3]+A[i-3][j-3][ii-3][jj+3]+
-                                          A[i+3][j+3][ii-3][jj-3]+A[i-3][j+3][ii+3][jj-3]+
-                                          A[i-3][j-3][ii+3][jj+3]+A[i+3][j-3][ii-3][jj+3]+
-                                          A[i+3][j-3][ii+3][jj-3]+A[i-3][j+3][ii-3][jj+3]+
-                                          A[i+3][j+3][ii+3][jj-3]+A[i-3][j+3][ii+3][jj+3]+
-                                          A[i+3][j-3][ii+3][jj+3]+A[i+3][j+3][ii-3][jj+3];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    if (B[i][j][ii][jj]!=
-                            C[i+3][j+3][ii+3][jj+3]+C[i-3][j-3][ii-3][jj-3]+
-                            C[i+3][j-3][ii-3][jj-3]+C[i-3][j+3][ii-3][jj-3]+
-                            C[i-3][j-3][ii+3][jj-3]+C[i-3][j-3][ii-3][jj+3]+
-                            C[i+3][j+3][ii-3][jj-3]+C[i-3][j+3][ii+3][jj-3]+
-                            C[i-3][j-3][ii+3][jj+3]+C[i+3][j-3][ii-3][jj+3]+
-                            C[i+3][j-3][ii+3][jj-3]+C[i-3][j+3][ii-3][jj+3]+
-                            C[i+3][j+3][ii+3][jj-3]+C[i-3][j+3][ii+3][jj+3]+
-                            C[i+3][j-3][ii+3][jj+3]+C[i+3][j+3][ii-3][jj+3] )
-
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-/* ---------------------------------------------SH4111  */
-void sh4111()
-{
-    #define N 16
-    #define M 16
-    #define K 16
-    #define L 16
-
-    int C[N][M][K][L];
-    int nloopi, nloopj, nloopii, nloopjj;
-    char tname[] = "SH4111";
-    int i, j, ii, jj, NN, NM, NK, NLL, NNL;
-    #pragma dvm array
-    int B[N][M][K][L];
-    #pragma dvm array shadow[3:3][3:3][3:3][3:3]
-    int A[N][M][K][L];
-
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    C[i][j][ii][jj] = NL + i + j + ii + jj;
-    nloopi = NL;
-    nloopj = NL;
-    nloopii = NL;
-    nloopjj = NL;
-
-    #pragma dvm redistribute(B[block][block][block][block])
-    #pragma dvm realign(A[i][j][ii][jj] with B[i][j][ii][jj])
-
-    #pragma dvm region local(A), out(B)
-    {
-    #pragma dvm parallel([i][j][ii][jj] on A[i][j][ii][jj])
-    for (i = 0; i < N; i++)
-        for (j = 0; j < M; j++)
-            for (ii = 0; ii < K; ii++)
-                for (jj = 0; jj < L; jj++)
-                    A[i][j][ii][jj] = NL + i + j + ii + jj;
-
-     #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) shadow_renew(A (corner))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    B[i][j][ii][jj] = A[i+3][j+3][ii+3][jj+3]+A[i-3][j-3][ii-3][jj-3]+
-                                          A[i+3][j-3][ii-3][jj-3]+A[i-3][j+3][ii-3][jj-3]+
-                                          A[i-3][j-3][ii+3][jj-3]+A[i-3][j-3][ii-3][jj+3]+
-                                          A[i+3][j+3][ii-3][jj-3]+A[i-3][j+3][ii+3][jj-3]+
-                                          A[i-3][j-3][ii+3][jj+3]+A[i+3][j-3][ii-3][jj+3]+
-                                          A[i+3][j-3][ii+3][jj-3]+A[i-3][j+3][ii-3][jj+3]+
-                                          A[i+3][j+3][ii+3][jj-3]+A[i-3][j+3][ii+3][jj+3]+
-                                          A[i+3][j-3][ii+3][jj+3]+A[i+3][j+3][ii-3][jj+3];
-    } /*end region*/
-    #pragma dvm get_actual(B)
-    #pragma dvm parallel([i][j][ii][jj] on B[i][j][ii][jj]) reduction(min(nloopi), min(nloopj), min(nloopii), min(nloopjj))
-    for (i = 3; i < N - 3; i++)
-        for (j = 3; j < M - 3; j++)
-            for (ii = 3; ii < K - 3; ii++)
-                for (jj = 3; jj < L - 3; jj++)
-                    if (B[i][j][ii][jj]!=
-                            C[i+3][j+3][ii+3][jj+3]+C[i-3][j-3][ii-3][jj-3]+
-                            C[i+3][j-3][ii-3][jj-3]+C[i-3][j+3][ii-3][jj-3]+
-                            C[i-3][j-3][ii+3][jj-3]+C[i-3][j-3][ii-3][jj+3]+
-                            C[i+3][j+3][ii-3][jj-3]+C[i-3][j+3][ii+3][jj-3]+
-                            C[i-3][j-3][ii+3][jj+3]+C[i+3][j-3][ii-3][jj+3]+
-                            C[i+3][j-3][ii+3][jj-3]+C[i-3][j+3][ii-3][jj+3]+
-                            C[i+3][j+3][ii+3][jj-3]+C[i-3][j+3][ii+3][jj+3]+
-                            C[i+3][j-3][ii+3][jj+3]+C[i+3][j+3][ii-3][jj+3] )
-
-                    {
-                        if (nloopi > i) nloopi = i;
-                        if (nloopj > j) nloopj = j;
-                        if (nloopii > ii) nloopii = ii;
-                        if (nloopjj > jj) nloopjj = jj;
-                    }
-
-    if (nloopi == NL && nloopj == NL && nloopii == NL && nloopjj == NL)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef N
-    #undef M
-    #undef K
-    #undef L
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ1.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ1.cdv
deleted file mode 100644
index c87edef..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ1.cdv
+++ /dev/null
@@ -1,190 +0,0 @@
-/*    TEMPL1
-TESTING template CLAUSE */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void templ111();
-static void templ121();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, ia, ib, ic, ja, jb, jc, k;
-
-int main(int an, char **as)
-{
-    printf("=== START OF TEMPL1 ======================\n");
-    /* TEMPLATE A1[BLOCK]   ALIGN B1[i] WITH A1[i + 4]
-                            ALIGN C1[i] WITH A1[2*i + 4] */
-    templ111();
-    /* TEMPLATE A1[BLOCK]   ALIGN B1[][i]  WITH A1[i]
-                            ALIGN C1[i][] WITH A1[2*i + 1] */
-    templ121();
-    printf("=== END OF TEMPL1 ========================\n");
-    return 0;
-}
-
-/* ---------------------------------------------TEMPL111*/
-/* TEMPLATE A1[BLOCK]   ALIGN B1[i] WITH A1[i + 4]
-                        ALIGN C1[i] WITH A1[2*i + 4] */
-void templ111()
-{
-    #define AN1 14
-    #define BN1 8
-    #define CN1 4
-    int k1i = 1, k2i = 0, li = 4;
-    int kc1i = 2, kc2i = 0, lci = 4;
-    char tname[] = "templ111 ";
-
-    #pragma dvm template[AN1] distribute[block]
-    void *A1;
-    #pragma dvm array align([i] with A1[k1i * i + li])
-    int B1[BN1];
-    #pragma dvm array align([i] with A1[kc1i * i + lci])
-    int C1[CN1];
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-        #pragma dvm parallel([i] on B1[i])
-        for (i = 0; i < BN1; i++)
-                B1[i] = i;
-
-        #pragma dvm parallel([i] on C1[i])
-        for (i = 0; i < CN1; i++)
-                C1[i] = i;
-
-        #pragma dvm parallel([i] on A1[i]) private(ib, erri, ic)
-        for (i = 0; i < AN1; i++)
-        {
-            if (((i-li) == (((i-li)/k1i) * k1i)) &&
-                    (((i-li)/k1i) >= 0) &&
-                    (((i-li)/k1i) < BN1))
-            {
-                ib = (i-li)/k1i;
-                if (B1[ib] != (ib))
-                    erri = i;
-            }
-            if (((i-lci) == (((i-lci)/kc1i) * kc1i)) &&
-                    (((i-lci)/kc1i) >= 0) &&
-                    (((i-lci)/kc1i) < CN1))
-            {
-                ic = (i-lci)/kc1i;
-                if (C1[ic] != (ic))
-                    erri = i;
-            }
-        }
-
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef BN1
-    #undef CN1
-}
-
-/* ---------------------------------------------TEMPL121*/
-/* TEMPLATE A1[BLOCK]   ALIGN B1[][i] WITH A1[i]
-                        ALIGN C1[i][] WITH A1[2*i + 1] */
-void templ121()
-{
-    int AN1 = 9;
-    int BN1 = 8;
-    int BN2 = 8;
-    int CN1 = 4;
-    int CN2 = 4;
-
-    int k1i = 1, k2i = 0, li = 0;
-    int kc1i = 2, kc2i = 0, lci = 1;
-
-    char tname[] = "templ121 ";
-
-    #pragma dvm template[AN1] distribute[block]
-    void *A1;
-    #pragma dvm array
-    int (*B2)[BN2];
-    #pragma dvm array
-    int (*C2)[CN2];
-
-    B2 = malloc(sizeof(int[BN1][BN2]));
-    C2 = malloc(sizeof(int[CN1][CN2]));
-    #pragma dvm realign(B2[][i] with A1[k1i * i + li])
-    #pragma dvm realign(C2[i][] with A1[kc1i * i + lci])
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i][j] on B2[i][j])
-    for (i = 0; i < BN1; i++)
-        for(j = 0; j < BN2; j++)
-            B2[i][j] = i*NL + j;
-
-    #pragma dvm parallel([i][j] on C2[i][j])
-    for (i = 0; i < CN1; i++)
-        for(j = 0; j < CN2; j++)
-            C2[i][j] = i*NL + j;
-
-
-    #pragma dvm parallel([i] on A1[i]) private(j, ib, jb, erri, jc, ic, k)
-    for (i = 0; i < AN1; i++)
-    {
-        for (j = 0; j < BN1; j++)
-        {
-            if (((i-li) == (((i-li)/k1i) * k1i)) &&
-                    (((i-li)/k1i) >= 0) &&
-                    (((i-li)/k1i) < BN2))
-            {
-                ib = j;
-                jb = (i-li)/k1i;
-                if (B2[ib][jb] != ib*NL + jb)
-                    erri = i*NL/10 + j;
-            }
-        }
-        for (k = 0; k < CN2; k++)
-        {
-            if (((i-lci) == (((i-lci)/kc1i) * kc1i)) &&
-                    (((i-lci)/kc1i) >= 0) &&
-                    (((i-lci)/kc1i) < CN1))
-            {
-                jc = k;
-                ic = (i-lci)/kc1i;
-                if (C2[ic][jc] != (ic*NL + jc))
-                    erri = i*NL/10 + j;
-            }
-        }
-    }
-    }
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B2);
-    free(C2);
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ2.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ2.cdv
deleted file mode 100644
index c2ca18b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ2.cdv
+++ /dev/null
@@ -1,198 +0,0 @@
-/*    TEMPL2
-TESTING template CLAUSE */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void templ211();
-static void templ221();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, ia, ib, ic, ja, jb, jc, k;
-
-int main(int an, char **as)
-{
-    printf("=== START OF TEMPL2 ======================\n");
-    /* TEMPLATE A2[BLOCK][BLOCK]   ALIGN B1[i] WITH A2[1][i]
-                            ALIGN C2[i][j] WITH A2[2*i+2][j] */
-    templ211();
-    /* TEMPLATE A2[BLOCK][BLOCK]   ALIGN B1[i][j] WITH A2[i+4][j+4]
-                            ALIGN C2[i][j] WITH A2[i+1][j+1] */
-    templ221();
-    printf("=== END OF TEMPL2 ========================\n");
-    return 0;
-}
-
-/* ---------------------------------------------TEMPL211*/
-/* TEMPLATE A2[BLOCK][BLOCK]   ALIGN B1[i] WITH A2[1][i]
-                               ALIGN C2[i][j] WITH A2[2*i+2][j] */
-void templ211()
-{
-    #define AN1 14
-    #define AN2 14
-    #define BN1 8
-    #define CN1 4
-    #define CN2 4
-
-    int k1i = 0, k2i = 0, li = 1, k1j = 1, k2j = 0, lj = 0;
-    int kc1i = 2, kc2i = 0, lci = 2, kc1j = 0, kc2j = 1, lcj = 0;
-    char tname[] = "templ211 ";
-
-    #pragma dvm template[AN1][AN2] distribute[block][block]
-    void *A2;
-    #pragma dvm array align([i] with A2[1][i])
-    int B1[BN1];
-    #pragma dvm array align([i][j] with A2[kc1i * i + lci][kc2j * j + lcj])
-    int C2[CN1][CN1];
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([i] on B1[i])
-    for (i = 0; i < BN1; i++)
-        B1[i] = i;
-
-    #pragma dvm parallel([j][i] on C2[i][j])
-    for (j = 0; j < CN2; j++)
-        for (i = 0; i < CN1; i++)
-            C2[i][j] = (i*NL+j);
-
-    #pragma dvm parallel([j][i] on A2[j][i]) private(ib, erri, ic, jc)
-    for (j = 0; j < AN2; j++)
-        for (i = 0; i < AN1; i++)
-        {
-            if (i == 0)
-            {
-                if (j < BN1)
-                {
-                    ib = j;
-                    if (B1[ib] != (ib))
-                        erri = i;
-                }
-            }
-            if (((i-lci) == (((i-lci)/kc1i) * kc1i)) &&
-                    ((j-lcj) == (((j-lcj)/kc2j) * kc2j)) &&
-                    (((i-lci)/kc1i) >= 0) &&
-                    (((j-lcj)/kc2j) >= 0) &&
-                    (((i-lci)/kc1i) < CN1) &&
-                    (((j-lcj)/kc2j) < CN2))
-            {
-                ic = (i-lci)/kc1i;
-                jc = (j-lcj)/kc2j;
-                if (C2[ic][jc] != (ic*NL+jc))
-                    erri = i;
-            }
-        }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef BN1
-    #undef CN1
-    #undef CN2
-}
-
-/* ---------------------------------------------TEMPL221*/
-/* TEMPLATE A2[BLOCK][BLOCK]   ALIGN B1[i][j] WITH A2[i+4][j+4]
-                               ALIGN C2[i][j] WITH A2[i+1][j+1] */
-void templ221()
-{
-    int AN1 = 14, AN2 = 14, CN1 = 4, CN2 = 4, BN1 = 8, BN2 = 8;
-
-    int k1i = 1, k2i = 0, li = 4, k1j = 0, k2j = 1, lj = 4;
-    int kc1i = 1, kc2i = 0, lci = 1, kc1j = 0, kc2j = 1, lcj = 1;
-
-    char tname[] = "templ221 ";
-
-    #pragma dvm template[AN1][AN2] distribute[block][block]
-    void *A2;
-    #pragma dvm array
-    int (*B2)[BN2];
-    #pragma dvm array
-    int (*C2)[CN2];
-
-    B2 = malloc(sizeof(int[BN1][BN2]));
-    C2 = malloc(sizeof(int[CN1][CN2]));
-    #pragma dvm realign(B2[i][j] with A2[k1i * i + li][k2j * j + lj])
-    #pragma dvm realign(C2[i][j] with A2[kc1i * i + lci][kc2j * j + lcj])
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([j][i] on B2[i][j])
-    for (j = 0; j < BN2; j++)
-        for (i = 0; i < BN1; i++)
-            B2[i][j] = i*NL + j;
-
-    #pragma dvm parallel([j][i] on C2[i][j])
-    for (j = 0; j < CN2; j++)
-        for (i = 0; i < CN1; i++)
-            C2[i][j] = i*NL + j;
-
-
-    #pragma dvm parallel([j][i] on A2[i][j]) private(ib, ic, erri, jb, jc)
-    for (j = 0; j < AN2; j++)
-        for (i = 0; i < AN1; i++)
-        {
-            if (((i-li) == (((i-li)/k1i) * k1i)) &&
-                    ((j-lj) == (((j-lj)/k2j) * k2j)) &&
-                    (((i-li)/k1i) >= 0) &&
-                    (((j-lj)/k2j) >= 0) &&
-                    (((i-li)/k1i) < BN1) &&
-                    (((j-lj)/k2j) < BN2))
-            {
-                ib = (i-li)/k1i;
-                jb = (j-lj)/k2j;
-                if (B2[ib][jb] != (ib*NL + jb))
-                    erri = i;
-            }
-            if (((i-lci) == (((i-lci)/kc1i) * kc1i)) &&
-                    ((j-lcj) == (((j-lcj)/kc2j) * kc2j)) &&
-                    (((i-lci)/kc1i) >= 0) &&
-                    (((j-lcj)/kc2j) >= 0) &&
-                    (((i-lci)/kc1i) < CN1) &&
-                    (((j-lcj)/kc2j) < CN2))
-            {
-                ic = (i-lci)/kc1i;
-                jc = (j-lcj)/kc2j;
-                if (C2[ic][jc] != (ic*NL+jc))
-                    erri = i;
-            }
-        }
-    }
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B2);
-    free(C2);
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ4.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ4.cdv
deleted file mode 100644
index d8afac8..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/C/TEMPLATE/templ4.cdv
+++ /dev/null
@@ -1,265 +0,0 @@
-/*    TEMPL4
-TESTING template CLAUSE */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void templ441();
-static void templ442();
-
-static void ansyes(const char tname[]);
-static void ansno(const char tname[]);
-
-static int NL = 1000;
-static int ER = 10000;
-static int erri, i, j, ia, ib, ic, ja, jb, jc, k, m, n, mb, nb, mc, nc;
-
-int main(int an, char **as)
-{
-    printf("=== START OF TEMPL4 ======================\n");
-    /* TEMPLATE A4[BLOCK][BLOCK][BLOCK][BLOCK]
-       ALIGN B4[i][j][k][l] WITH A4[i+2][j][k][l+3]
-       ALIGN C2[i][j] WITH A4[i+2][2][3][l+3]        */
-    templ441();
-    /* TEMPLATE A4[BLOCK][BLOCK][BLOCK][BLOCK]
-       ALIGN B4[i][j][k][l] WITH A4[l][i][j][k]
-       ALIGN C4[i][j][k][l] WITH A4[i+2][j][k][l+3]  */
-    templ442();
-    printf("=== END OF TEMPL4 ========================\n");
-    return 0;
-}
-
-/* ---------------------------------------------TEMPL441*/
-/* TEMPLATE A4[BLOCK][BLOCK][BLOCK][BLOCK]
-   ALIGN B4[i][j][k][l] WITH A4[i+2][j][k][l+3]
-   ALIGN C2[i][j] WITH A4[i+2][2][3][l+3]        */
-void templ441()
-{
-    #define AN1 7
-    #define AN2 7
-    #define AN3 7
-    #define AN4 7
-    #define BN1 2
-    #define BN2 2
-    #define BN3 2
-    #define BN4 2
-    #define CN1 4
-    #define CN2 4
-
-    int k1i = 1, k2i = 0, k3i = 0, k4i = 0, li = 2;
-    int k1j = 0, k2j = 1, k3j = 0, k4j = 0, lj = 0;
-    int k1n = 0, k2n = 0, k3n = 1, k4n = 0, ln = 0;
-    int k1m = 0, k2m = 0, k3m = 0, k4m = 1, lm = 3;
-    int kc1i = 1, kc2i = 0, kc3i = 0, kc4i = 0, lci = 2;
-    int kc1j = 0, kc2j = 0, kc3j = 0, kc4j = 0, lcj = 2;
-    int kc1n = 0, kc2n = 0, kc3n = 0, kc4n = 0, lcn = 3;
-    int kc1m = 0, kc2m = 1, kc3m = 0, kc4m = 0, lcm = 3;
-    char tname[] = "templ441 ";
-
-    #pragma dvm template[AN1][AN2][AN3][AN4] distribute[block][block][block][block]
-    void *A4;
-    #pragma dvm array align([i][j][n][m] with A4[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm])
-    int B4[BN1][BN2][BN3][BN4];
-    #pragma dvm array align([i][j] with A4[kc1i*i+lci][lcj][lcn][kc2m*j+lcm])
-    int C2[CN1][CN2];
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([m][n][j][i] on B4[i][j][n][m])
-    for (m = 0; m < BN4; m++)
-        for (n = 0; n < BN3; n++)
-            for (j = 0; j < BN2; j++)
-                for (i = 0; i < BN1; i++)
-                    B4[i][j][n][m] = (i*NL/10+j*NL/100+n*NL/1000+m);
-
-    #pragma dvm parallel([j][i] on C2[i][j])
-    for (j = 0; j < CN2; j++)
-        for (i = 0; i < CN1; i++)
-            C2[i][j] = (i*NL+j);
-
-    #pragma dvm parallel([m][n][j][i] on A4[i][j][n][m]) private(ib, jb, nb, mb, ic, jc, erri)
-    for (m = 0; m < AN4; m++)
-        for (n = 0; n < AN3; n++)
-            for (j = 0; j < AN2; j++)
-                for (i = 0; i < AN1; i++)
-                {
-                    if (((i-li) == (((i-li)/k1i) * k1i)) &&
-                            ((j-lj) == (((j-lj)/k2j) *k2j)) &&
-                            ((n-ln) == (((n-ln)/k3n) * k3n)) &&
-                            ((m-lm) == (((m-lm)/k4m) *k4m)) &&
-                            (((i-li)/k1i) >= 0) &&
-                            (((j-lj)/k2j) >= 0) &&
-                            (((n-ln)/k3n) >= 0) &&
-                            (((m-lm)/k4m) >= 0) &&
-                            (((i-li)/k1i) < BN1) &&
-                            (((j-lj)/k2j) < BN2) &&
-                            (((n-ln)/k3n) < BN3) &&
-                            (((m-lm)/k4m) < BN4))
-                    {
-                        ib = (i-li)/k1i;
-                        jb = (j-lj)/k2j;
-                        nb = (n-ln)/k3n;
-                        mb = (m-lm)/k4m;
-                        if (B4[ib][jb][nb][mb] != (ib*NL/10+jb*NL/100+nb*NL/1000+mb))
-                            erri = i*NL/10 + j*NL/100+ n*NL/1000+ m;
-                    }
-                    if ((j == lcj) && (n == lcn) &&
-                            ((i-lci) == (((i-lci)/kc1i) * kc1i)) &&
-                            ((m-lcm) == (((m-lcm)/kc2m) *kc2m)) &&
-                            (((i-lci)/kc1i) >= 0) &&
-                            (((m-lcm)/kc2m) >= 0) &&
-                            (((i-lci)/kc1i) < CN1) &&
-                            (((m-lcm)/kc2m) < CN2))
-                    {
-                        ic = (i-lci)/kc1i;
-                        jc = (m-lcm)/kc2m;
-                        if (C2[ic][jc] != (ic*NL+jc))
-                            erri = i;
-                    }
-                }
-    }
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    #undef AN1
-    #undef AN2
-    #undef AN3
-    #undef AN4
-    #undef BN1
-    #undef BN2
-    #undef BN3
-    #undef BN4
-    #undef CN1
-    #undef CN2
-}
-
-/* ---------------------------------------------TEMPL442*/
-/* TEMPLATE A4[BLOCK][BLOCK][BLOCK][BLOCK]
-   ALIGN B4[i][j][k][l] WITH A4[l][i][j][k]
-   ALIGN C4[i][j][k][l] WITH A4[i+2][j][k][l+3]  */
-void templ442()
-{
-    int AN1 = 7, AN2 = 7, AN3 = 7, AN4 = 7;
-    int BN1 = 2, BN2 = 2, BN3 = 2, BN4 = 2;
-    int CN1 = 4, CN2 = 4, CN3 = 4, CN4 = 4;
-
-    int k1i = 0, k2i = 0, k3i = 0, k4i = 1, li = 0;
-    int k1j = 1, k2j = 0, k3j = 0, k4j = 0, lj = 0;
-    int k1n = 0, k2n = 1, k3n = 0, k4n = 0, ln = 0;
-    int k1m = 0, k2m = 0, k3m = 1, k4m = 0, lm = 0;
-    int kc1i = 1, kc2i = 0, kc3i = 0, kc4i = 0, lci = 2;
-    int kc1j = 0, kc2j = 1, kc3j = 0, kc4j = 0, lcj = 0;
-    int kc1n = 0, kc2n = 0, kc3n = 1, kc4n = 0, lcn = 0;
-    int kc1m = 0, kc2m = 0, kc3m = 0, kc4m = 1, lcm = 3;
-
-    char tname[] = "templ442 ";
-
-    #pragma dvm template[AN1][AN2][AN3][AN4] distribute[block][block][block][block]
-    void *A4;
-    #pragma dvm array
-    int (*B4)[BN2][BN3][BN4];
-    #pragma dvm array
-    int (*C4)[CN2][CN3][CN4];
-
-    B4 = malloc(sizeof(int[BN1][BN2][BN3][BN4]));
-    C4 = malloc(sizeof(int[CN1][CN2][CN3][CN4]));
-    #pragma dvm realign(B4[i][j][n][m] with A4[k4i*m+li][k1j*i+lj][k2n*j+ln][k3m*n+lm])
-    #pragma dvm realign(C4[i][j][n][m] with A4[kc1i*i+lci][kc2j*j+lcj][ kc3n*n+lcn][kc4m*m+lcm])
-
-    erri = ER;
-    #pragma dvm actual(erri)
-
-    #pragma dvm region
-    {
-    #pragma dvm parallel([m][n][j][i] on B4[i][j][n][m])
-    for (m = 0; m < BN4; m++)
-        for (n = 0; n < BN3; n++)
-            for (j = 0; j < BN2; j++)
-                for (i = 0; i < BN1; i++)
-                    B4[i][j][n][m] = (i*NL/10+j*NL/100+n*NL/1000+m);
-
-    #pragma dvm parallel([m][n][j][i] on C4[i][j][n][m])
-    for (m = 0; m < CN4; m++)
-        for (n = 0; n < CN3; n++)
-            for (j = 0; j < CN2; j++)
-                for (i = 0; i < CN1; i++)
-                    C4[i][j][n][m] = (i*NL/10+j*NL/100+n*NL/1000+m);
-
-    #pragma dvm parallel([m][n][j][i] on A4[i][j][n][m]) private(ib, jb, nb, mb, ic, jc, nc, mc, erri)
-    for (m = 0; m < AN4; m++)
-        for (n = 0; n < AN3; n++)
-            for (j = 0; j < AN2; j++)
-                for (i = 0; i < AN1; i++)
-                {
-                    if (((i-li) == (((i-li)/k4i) * k4i)) &&
-                            ((j-lj) == (((j-lj)/k1j) *k1j)) &&
-                            ((n-ln) == (((n-ln)/k2n) * k2n)) &&
-                            ((m-lm) == (((m-lm)/k3m) *k3m)) &&
-                            (((i-li)/k4i) >= 0) &&
-                            (((j-lj)/k1j) >= 0) &&
-                            (((n-ln)/k2n) >= 0) &&
-                            (((m-lm)/k3m) >= 0) &&
-                            (((i-li)/k4i) < BN4) &&
-                            (((j-lj)/k1j) < BN1) &&
-                            (((n-ln)/k2n) < BN2) &&
-                            (((m-lm)/k3m) < BN3))
-                    {
-                        mb = (i-li)/k4i;
-                        ib = (j-lj)/k1j;
-                        jb = (n-ln)/k2n;
-                        nb = (m-lm)/k3m;
-                        if (B4[ib][jb][nb][mb] != (ib*NL/10+jb*NL/100+nb*NL/1000+mb))
-                            erri = i*NL/10 + j*NL/100+ n*NL/1000+ m;
-                    }
-                    if (
-                            ((i-lci) == (((i-lci)/kc1i) * kc1i)) &&
-                            ((j-lcj) == (((j-lcj)/kc2j) * kc2j)) &&
-                            ((n-lcn) == (((n-lcn)/kc3n) * kc3n)) &&
-                            ((m-lcm) == (((m-lcm)/kc4m) *kc4m)) &&
-                            (((i-lci)/kc1i) >= 0) &&
-                            (((j-lcj)/kc2j) >= 0) &&
-                            (((n-lcn)/kc3n) >= 0) &&
-                            (((m-lcm)/kc2m) >= 0) &&
-                            (((i-lci)/kc1i) < CN1) &&
-                            (((j-lcj)/kc2j) < CN2) &&
-                            (((n-lcn)/kc3n) < CN3) &&
-                            (((m-lcm)/kc2m) < CN2))
-                    {
-                        ic = (i-lci)/kc1i;
-                        jc = (j-lcj)/kc2j;
-                        nc = (n-lcn)/kc3n;
-                        mc = (m-lcm)/kc4m;
-                        if (C4[ic][jc][nc][mc] != (ic*NL/10+jc*NL/100+nc*NL/1000+mc))
-                            erri = i*NL/10 + j*NL/100+ n*NL/1000+ m;
-                    }
-                }
-    }
-
-    #pragma dvm get_actual(erri)
-
-    if (erri == ER)
-        ansyes(tname);
-    else
-        ansno(tname);
-
-    free(B4);
-    free(C4);
-}
-
-void ansyes(const char name[])
-{
-    printf("%s  -  complete\n", name);
-}
-
-void ansno(const char name[])
-{
-    printf("%s  -  ***error\n", name);
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr11.fdv
deleted file mode 100644
index a9124cb..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr11.fdv
+++ /dev/null
@@ -1,591 +0,0 @@
-      program ACR11
-     
-c    TESTING OF THE ACROSS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N) IS TO HAVE DIFFERENT 
-c    FLOW-DEP-LENGTH ON BOTH SIDES 
-
-      print *,'===START OF ACR11========================'
-C --------------------------------------------------
-      call acr1101
-C --------------------------------------------------
-      call acr1102
-C --------------------------------------------------
-      call acr1103
-C -------------------------------------------------
-      call acr1104
-C -------------------------------------------------
-      call acr1105
-C -------------------------------------------------
-      call acr1106
-C --------------------------------------------------
-      call acr1107
-C --------------------------------------------------
-      call acr1108
-C --------------------------------------------------
-      call acr1109
-C -------------------------------------------------
-      call acr1110
-C -------------------------------------------------
-
-C
-      print *,'=== END OF ACR11 ========================= '    
-      end
-C ---------------------------------------------ACR1101
-      subroutine ACR1101   
-      integer,parameter :: N = 8, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop                      
-!dvm$ distribute A(BLOCK)    
-
-      tname='ACR1101'
-      allocate (A(N), C(N))
-      nloop=NL
-      
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      
-      do i=2,N-1
-         C(i) = C(i-1)+C(i+1)
-      enddo
-!dvm$ actual (nloop, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on A(i),across(A(1:1)),stage(iloop)
-      do i=2,N-1
-         A(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ---------------------------------------------ACR1102     
-      subroutine ACR1102
-      integer,parameter :: N = 16, NL=1000
-
-      character*7 tname 
-      integer,allocatable::  A(:),C(:)
-      integer nloop 
-                      
-!dvm$ distribute A(BLOCK)    
-
-      tname='ACR1102'
-      allocate (A(N), C(N))
-      nloop=NL
-
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=1,N-1
-         C(i) = C(i)+C(i+1)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo                                                
-               
-!dvm$ parallel (i) on A(i),across(A(0:1)),stage(iloop)
-      do i=1,N-1
-         A(i) = A(i)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif
-          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-     
-      end
-C -----------------------------------------ACR1103      
-      subroutine acr1103
-      integer,parameter :: N = 16, NL=1000
-
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                     
-!dvm$ distribute A(BLOCK)    
-
-      tname='ACR1103'
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2      
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=2,N
-         C(i) = C(i)+ C(i-1)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo                                                
-               
-
-!dvm$ parallel (i) on A(i),across(A(1:0)),stage(iloop)
-      do i=2,N
-         A(i) =A(i)+ A(i-1)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-     
-      end
-      
-
-  
- 
-C -------------------------------------------ACR1104   
-         
-      subroutine ACR1104
-      integer,parameter :: N = 16, NL=1000
-
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                    
-!dvm$ distribute A(BLOCK)    
-!dvm$ shadow A(2:2)
-  
-      tname='ACR1104'
-      allocate (A(N), C(N))
-      nloop=NL
-	  
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=3,N-2
-         C(i) = C(i-1)+C(i+1)+C(i+2)+C(i-2)
-      enddo
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo                                                
-
-!dvm$ parallel (i) on A(i),across(A(2:2)),stage(iloop)
-      do i=3,N-2
-         A(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)
-      enddo
-         
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=3,N-2
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-       if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-      
-      end      
-C -------------------------------------------ACR1105   
-         
-      subroutine ACR1105
-      integer,parameter :: N = 16, NL=1000
-
-      character*7 tname 
-      integer,allocatable::  A(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute A(BLOCK)   
-!dvm$ shadow A(2:2)
-
-      tname='ACR1105'      
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=2,N-2
-         C(i) = C(i+1)+C(i+2)
-      enddo
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo                                                
-               
-!dvm$ parallel (i) on A(i),across(A(0:2)),stage(iloop)
-      do i=2,N-2
-         A(i) = A(i+1)+A(i+2)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-2
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-      call ansyes(tname)
-    
-       else
-      call ansno(tname)
-      endif
-      deallocate (A, C)
-  
-      end   
-      
-C -------------------------------------------ACR1106   
-         
-      subroutine ACR1106
-      integer,parameter :: N = 16, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop                
-!dvm$ distribute A(BLOCK)     
-!dvm$ shadow A(2:2)
-
-      tname='ACR1106'      
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=3,N
-         C(i) = C(i-1)+C(i-2)
-      enddo
-
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo                                                
-               
-
-!dvm$ parallel (i) on A(i),across(A(2:0)),stage(iloop)
-      do i=3,N
-         A(i) = A(i-1)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=3,N
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif               
-      deallocate (A, C)
-      end   
-
-C -------------------------------------------ACR1107   
-         
-      subroutine acr1107
-      integer,parameter :: N = 16, NL=1000
-
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                     
-!dvm$ distribute A(BLOCK)     
-!dvm$ shadow A(3:3)
-
-      tname='ACR1107'      
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=4,N-3
-         C(i) = C(i-1)+C(i+1)+C(i+2)+C(i-2)+C(i-3)+C(i+3)
-      enddo
-
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo                                                
-               
-!dvm$ parallel (i) on A(i),across(A(3:3)),stage(iloop)
-      do i=4,N-3
-         A(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)+A(i-3)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=4,N-3
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-         
-      end
-C -------------------------------------------ACR1108  
-         
-      subroutine acr1108
-      integer,parameter :: N = 24, NL=1000
-
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                    
-!dvm$ distribute A(BLOCK)     
-!dvm$ shadow A(3:3)
-
-      tname='ACR1108'
-      allocate (A(N), C(N))
-      nloop=NL
-
-      do iloop=0,2	  
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=2,N-3
-         C(i) = C(i+1)+C(i+2)+C(i+3)
-      enddo
-
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo                                                
-               
-
-!dvm$ parallel (i) on A(i),across(A(0:3)),stage(iloop)
-      do i=2,N-3
-         A(i) = A(i+1)+A(i+2)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-3
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-       
-      end
-C -------------------------------------------ACR1109   
-         
-      subroutine acr1109
-      integer,parameter :: N = 24, NL=1000
-
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                    
-!dvm$ distribute A(BLOCK)     
-!dvm$ shadow A(3:3)
-
-      tname='ACR1109'
-      allocate (A(N), C(N))
-	  nloop=NL
-
-      do iloop=0,2	  
-      NNL=NL
-      call serial1(C,N,NNL)
-
-      do i=4,N
-         C(i) = C(i-1)+C(i-2)+C(i-3)
-      enddo
-
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo                                                
-   
-!dvm$ parallel (i) on A(i),across(A(3:0)),stage(iloop)
-      do i=4,N
-         A(i) = A(i-1)+A(i-2)+A(i-3)
-      
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=4,N
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop) 
-      enddo
-       
-       if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-        
-      end 
-
-C --------------------------------------------acr1110  
-         
-      subroutine acr1110
-      integer,parameter :: N = 60, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                     
-!dvm$ distribute A(BLOCK)     
-!dvm$ shadow A(11:11)
-
-      tname='ACR1110'      
-      allocate (A(N), C(N))
-      nloop=NL
-      
-      do iloop=0,2	  
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=12,N-11
-         C(i) = C(i-9)+C(i+9)+C(i+10)+C(i-10)+C(i-11)+C(i+11)
-      enddo
-
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo                                                
-               
-
-!dvm$ parallel (i) on A(i),across(A(11:11)),stage(iloop)
-      do i=12,N-11
-         A(i) = A(i-9)+A(i+9)+A(i+10)+A(i-10)+A(i-11)+A(i+11)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=12,N-11
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-       if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-    
-      end
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer:: AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo
-                   
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr12.fdv
deleted file mode 100644
index 1b9949f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr12.fdv
+++ /dev/null
@@ -1,587 +0,0 @@
-      program ACR12
-     
-c    TESTING OF THE ACROSS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N) IS TO HAVE DIFFERENT 
-c    FLOW-DEP-LENGTH ON BOTH SIDES 
-
-      print *,'===START OF ACR12========================'
-C --------------------------------------------------
-      call acr1201
-C --------------------------------------------------
-      call acr1202
-C --------------------------------------------------
-      call acr1203
-C -------------------------------------------------
-      call acr1204
-C -------------------------------------------------
-      call acr1205
-C -------------------------------------------------
-      call acr1206
-C --------------------------------------------------
-      call acr1207
-C --------------------------------------------------
-      call acr1208
-C --------------------------------------------------
-      call acr1209
-C -------------------------------------------------
-      call acr1210
-C -------------------------------------------------
-
-C
-      print *,'=== END OF ACR12 ========================= '    
-      end
-C ---------------------------------------------ACR1201
-      subroutine acr1201
-     
-      integer, parameter :: N = 8, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                      
-!dvm$ distribute A(*)    
-
-      tname='ACR1201'
-      allocate (A(N), C(N))
-      nloop=NL
-      
-      do iloop=0,2	 
-      NNL=NL    
-      call serial1(C,N,NNL)
-      
-      do i=2,N-1
-         C(i) = C(i-1)+C(i+1)
-      enddo
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-
-!dvm$ parallel (i) on A(i),across(A(1:1)),stage(iloop)
-      do i=2,N-1
-         A(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-      
-      end
-C ---------------------------------------------ACR1202     
-      subroutine acr1202
-      integer, parameter :: N = 16, NL=1000
-     
-      character*7 tname 
-      integer,allocatable:: A(:), C(:)
-      integer nloop 
-                      
-!dvm$ distribute A(*)    
-
-      tname='ACR1202'
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=1,N-1
-         C(i) = C(i)+C(i+1)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo               
-
-!dvm$ parallel (i) on A(i),across(A(0:1)),stage(iloop)
-      do i=1,N-1
-         A(i) = A(i)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-      
-      end
-C -----------------------------------------ACR1203      
-      subroutine acr1203
-      integer, parameter :: N = 16, NL=1000
-     
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                     
-!dvm$ distribute A(*)    
-
-      tname='ACR1203'
-      allocate (A(N), C(N))
-      nloop=NL
-  
-      do iloop=0,2  
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=2,N
-         C(i) =C(i)+ C(i-1)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo               
-
-!dvm$ parallel (i) on A(i),across(A(1:0)),stage(iloop)
-      do i=2,N
-         A(i) =A(i)+ A(i-1)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)     
-
-      end
-      
-C -------------------------------------------ACR1204   
-         
-      subroutine acr1204
-      integer, parameter :: N = 16, NL=1000 
-      character*7 tname 
-      integer,allocatable:: A(:), C(:)
-      integer nloop 
-                    
-!dvm$ distribute A(*)    
-!dvm$ shadow A(2:2)
-  
-      tname='ACR1204'
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2
-      NNL=NL
-      call serial1(C,N,NNL)
-      do i=3,N-2
-         C(i) = C(i-1)+C(i+1)+C(i+2)+C(i-2)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on A(i),across(A(2:2)),stage(iloop)
-      do i=3,N-2
-         A(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=3,N-2
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)       
-      
-      end      
-C -------------------------------------------ACR1205   
-         
-      subroutine acr1205
-      integer, parameter :: N = 16, NL=1000
-     
-      character*7 tname 
-      integer,allocatable:: A(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute A(*)   
-!dvm$ shadow A(2:2)
-
-      tname='ACR1205'      
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=2,N-2
-         C(i) = C(i+1)+C(i+2)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on A(i),across(A(0:2)),stage(iloop)
-      do i=2,N-2
-         A(i) = A(i+1)+A(i+2)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-2
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-        call ansyes(tname)    
-      else
-        call ansno(tname)
-      endif
-      deallocate (A, C)
-  
-      end   
-      
-C -------------------------------------------ACR1206   
-         
-      subroutine acr1206
-      integer, parameter :: N = 16, NL=1000
-     
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop                
-!dvm$ distribute A(*)     
-!dvm$ shadow A(2:2)
-
-      tname='ACR1206'      
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=3,N
-         C(i) = C(i-1)+C(i-2)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on A(i),across(A(2:0)),stage(iloop)
-      do i=3,N
-         A(i) = A(i-1)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=3,N
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)         
-      end   
-
-C -------------------------------------------ACR1207   
-         
-      subroutine acr1207
-      integer, parameter :: N = 16, NL=1000
-     
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                     
-!dvm$ distribute A(*)     
-!dvm$ shadow A(3:3)
-
-      tname='ACR1207'      
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-       do i=4,N-3
-         C(i) = C(i-1)+C(i+1)+C(i+2)+C(i-2)+C(i-3)+C(i+3)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on A(i),across(A(3:3)),stage(iloop)
-      do i=4,N-3
-         A(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)+A(i-3)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=4,N-3
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-         
-      end
-C -------------------------------------------ACR1208  
-         
-      subroutine acr1208
-      integer, parameter :: N = 24, NL=1000
-     
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                    
-!dvm$ distribute A(*)     
-!dvm$ shadow A(3:3)
-
-      tname='ACR1208'
-      allocate (A(N), C(N))
- 	  nloop=NL
-      
-      do iloop=0,2   
-      NNL=NL    
-      call serial1(C,N,NNL)
-       do i=2,N-3
-         C(i) = C(i+1)+C(i+2)+C(i+3)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on A(i),across(A(0:3)),stage(iloop)
-      do i=2,N-3
-         A(i) = A(i+1)+A(i+2)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=2,N-3
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-       if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-       
-      end
-C -------------------------------------------ACR1209   
-         
-      subroutine acr1209
-      integer, parameter :: N = 24, NL=1000
-
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                    
-!dvm$ distribute A(*)     
-!dvm$ shadow A(3:3)
-
-      tname='ACR1209'
-      allocate (A(N), C(N))
-	  nloop=NL
-      
-      do iloop=0,2	  
-      NNL=NL
-      call serial1(C,N,NNL)
-
-      do i=4,N
-         C(i) = C(i-1)+C(i-2)+C(i-3)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-   
-!dvm$ parallel (i) on A(i),across(A(3:0)),stage(iloop)
-      do i=4,N
-         A(i) = A(i-1)+A(i-2)+A(i-3)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=4,N
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif
-        enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-      
-       if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-        
-      end 
-
-C --------------------------------------------ACR1210  
-         
-      subroutine acr1210
-      integer, parameter :: N = 50, NL=1000
-    
-      character*7 tname 
-      integer,allocatable::  A(:), C(:)
-      integer nloop 
-                     
-!dvm$ distribute A(*)     
-!dvm$ shadow A(11:11)
-
-      tname='ACR1210'      
-      allocate (A(N), C(N))
- 	  nloop=NL
-      
-      do iloop=0,2
-      NNL=NL    
-      call serial1(C,N,NNL)
-      do i=12,N-11
-         C(i) = C(i-9)+C(i+9)+C(i+10)+C(i-10)+C(i-11)+C(i+11)
-      enddo
-      
-!dvm$ actual (nloop, C)
-!dvm$ region
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on A(i),across(A(11:11)),stage(iloop)
-      do i=12,N-11
-         A(i) = A(i-9)+A(i+9)+A(i+10)+A(i-10)+A(i-11)+A(i+11)
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=12,N-11
-          if (A(i).ne. C(i)) then
-          nloop=min(nloop,i)
-          endif          
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloop)
-      enddo
-	  
-       if (nloop .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-     
-      end
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo                   
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr21.fdv
deleted file mode 100644
index b243e99..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr21.fdv
+++ /dev/null
@@ -1,977 +0,0 @@
-      program ACR21
-     
-c    TESTING OF THE ACROSS CLAUSE.       
-c    DISTRIBUTED ARRAY A(N,M) IS TO HAVE DIFFERENT 
-c    FLOW-DEP-LENGTH ON BOTH SIDES 
-
-      print *,'===START OF ACR21========================'
-C --------------------------------------------------
-      call acr2101
-C --------------------------------------------------
-      call acr2102
-C --------------------------------------------------
-      call acr2103
-C -------------------------------------------------
-      call acr2104
-C -------------------------------------------------
-      call acr2105
-C -------------------------------------------------
-      call acr2106
-C --------------------------------------------------
-      call acr2107
-C --------------------------------------------------
-      call acr2108
-C --------------------------------------------------
-      call acr2109
-C -------------------------------------------------
-      call acr2110
-C -------------------------------------------------
-      call acr2111
-C -------------------------------------------------
-      call acr2112
-C -------------------------------------------------
-      call acr2113
-C -------------------------------------------------
-      call acr2114
-C -------------------------------------------------
-      call acr2115
-C -------------------------------------------------
-      print *,'=== END OF ACR21 ========================= '    
-      end
-C ---------------------------------------------ACR2101
-      subroutine ACR2101
-     
-      integer,parameter :: N = 16, M=16, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:,:), C(:,:)
-      integer nloopi,nloopj
-                      
-!dvm$ distribute A(BLOCK,BLOCK)    
-
-      tname='ACR2101'
-      allocate (A(N,M), C(N,M))
-      
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i+1,j)+C(i,j+1)+C(i-1,j)+C(i,j-1)
-        enddo
-      enddo
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(1:1,1:1)),stage(iloop)
-      do j=2,M-1
-         do i=2,N-1
-            A(i,j) = A(i+1,j)+A(i,j+1)+A(i-1,j)+A(i,j-1)
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=2,M-1
-       do i=2,N-1
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi,nloopj)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-      
-      end
-C ---------------------------------------------ACR2102     
-      subroutine ACR2102
-      integer,parameter :: N = 16,M=16, NL=1000
-
-      character*7 tname 
-      integer,allocatable::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-                      
-!dvm$ distribute A(BLOCK,BLOCK)    
-
-      tname='ACR2102'
-      allocate (A(N,M), C(N,M))
-      
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i+1,j)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-!dvm$ parallel (j,i) on A(i,j),across(A(0:1,0:0)),stage(iloop)
-      do j=2,M-1
-       do i=2,N-1
-         A(i,j) = A(i+1,j)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-       do j=2,M-1
-        do i=2,N-1
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-       enddo
-	       
-      if (nloopi .eq.NL) then
-        call ansyes(tname)
-      else
-        call ansno(tname)
-      endif                                                 
-      deallocate (A, C)
-               
-      end
-
-C -----------------------------------------ACR2103      
-      subroutine acr2103
-      integer,parameter :: N = 16,M=16, NL=1000
-     
-      character*7 tname 
-      integer,allocatable::  A(:,:), C(:,:)
-
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-
-      tname='ACR2103'
-      allocate (A(N,M), C(N,M))  
-	        
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i-1,j)+C(i,j+1)
-        enddo
-      enddo
-!dvm$ actual (nloopi,nloopj,C(:,:))
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(1:0,0:1)),stage(iloop)
-      do j=2,M-1
-       do i=2,N-1
-         A(i,j) = A(i-1,j)+A(i,j+1)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-       do j=2,M-1
-        do i=2,N-1
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif
-      deallocate (A, C)
-    
-      end
-
-C ------------------------------------------ACR2104   
-      subroutine acr2104
-      integer,parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow A(1:1,0:1)
-      tname='ACR2104'
-      allocate (A(N,M), C(N,M))  
-	        
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i+1,j)+C(i,j+1)
-        enddo
-      enddo
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(0:1,0:1)),stage(iloop)
-      do j=2,M-1
-       do i=2,N-1
-         A(i,j) = A(i+1,j)+A(i,j+1)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-       do j=2,M-1
-        do i=2,N-1
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif
-      deallocate (A, C)
- 
-      end
-    
-C ------------------------------------------ACR2105   
-      subroutine acr2105 
-      integer,parameter :: N = 16,M=16, NL=1000
-      integer,allocatable::  A(:,:), C(:,:)
-      character*7 tname 
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow A(0:1,1:1)
-
-      tname='ACR2105'
-      allocate (A(N,M), C(N,M))  
-      
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i,j-1)+C(i+1,j)
-        enddo
-      enddo
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-!dvm$ parallel (j,i) on A(i,j),across(A(0:1,1:0)),stage(iloop)
-      do j=2,M-1
-       do i=2,N-1
-         A(i,j) = A(i,j-1)+A(i+1,j)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=2,M-1
-       do i=2,N-1         
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif      
-      deallocate (A, C) 
-
-      end
-       
-C -------------------------------------------ACR2106   
-         
-      subroutine acr2106
-      integer,parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-
-      tname='ACR2106'
-      allocate (A(N,M), C(N,M))  
-	        
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-       do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i+2,j)+C(i,j+2)+C(i+2,j)+C(i-2,j)+C(i,j-2) 
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-          
-!dvm$ parallel (j,i) on A(i,j),across(A(2:2,2:2)),stage(iloop)
-       do j=3,M-2
-        do i=3,N-2
-          A(i,j) = A(i+2,j)+A(i,j+2)+A(i+2,j)+A(i-2,j)+A(i,j-2)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-       do j=3,M-2
-        do i=3,N-2
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-      
-      end   
-C -------------------------------------------ACR2107   
-         
-      subroutine acr2107
-
-      integer,parameter :: N = 16,M=16, NL=1000
-      integer,allocatable::  A(:,:), C(:,:)
-      character*7 tname 
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-
-      tname='ACR2107'
-      allocate (A(N,M), C(N,M))  
-	        
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i+2,j)+C(i,j+2)+C(i,j-2)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(0:2,2:2)),stage(iloop)
-       do j=3,M-2
-        do i=3,N-2
-         A(i,j) =A(i+2,j)+A(i,j+2)+A(i,j-2)
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-       do j=3,M-2
-        do i=3,N-2
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)      
- 
-      end   
-C -------------------------------------------ACR2108  
-         
-      subroutine acr2108
-      integer,parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-
-      tname='ACR2108'
-      allocate (A(N,M), C(N,M))  
-	        
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-       do j=3,M-2
-         C(i,j) =C(i-1,j)+C(i,j-1)+C(i-2,j)+C(i+2,j)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-          
-!dvm$ parallel (j,i) on A(i,j),across(A(2:2,2:0)),stage(iloop)
-       do j=3,M-2
-        do i=3,N-2
-         A(i,j) = A(i-1,j)+A(i,j-1)+A(i-2,j)+A(i+2,j)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-       do j=3,M-2
-        do i=3,N-2   
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end          
-C -------------------------------------------ACR2109   
-         
-      subroutine acr2109
-      integer,parameter :: N = 16,M=16, NL=1000
-      integer,allocatable::  A(:,:), C(:,:)
-      character*7 tname 
-      integer nloopi,nloopj
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,0:2) :: A 
-
-      tname='ACR2109'
-      allocate (A(N,M), C(N,M))     
-      
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i,j+2)+ C(i+1,j)+C(i+2,j)
-        enddo
-      enddo
-
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-          
-!dvm$ parallel (j,i) on A(i,j),across(A(2:2,0:2)),stage(iloop)
-      do j=3,M-2
-        do i=3,N-2
-         A(i,j) = A(i,j+2)+ A(i+1,j)+A(i+2,j)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=3,M-2
-       do i=3,N-2      
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-      end  
-C -------------------------------------------ACR2110   
-         
-      subroutine acr2110
-      integer,parameter :: N = 16,M=16, NL=1000
-      integer,allocatable::  A(:,:), C(:,:)
-      character*7 tname 
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3) :: A 
-
-      tname='ACR2110'
-      allocate (A(N,M), C(N,M)) 
-      
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=4,N-3
-        do j=4,M-3
-         C(i,j) =C(i+1,j)+C(i,j+2)+C(i+3,j)+C(i,j-3)+
-     * C(i-2,j)+C(i,j-1)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(3:3,3:3)),stage(iloop)
-      do j=4,M-3
-        do i=4,N-3
-         A(i,j) = A(i+1,j)+A(i,j+2)+A(i+3,j)+A(i,j-3)+
-     * A(i-2,j)+A(i,j-1)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=4,M-3
-        do i=4,N-3
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)      
-      end 
-C -------------------------------------------ACR2111   
-         
-      subroutine ACR2111
-      integer,parameter :: N = 16,M=16, NL=1000
-      integer,allocatable::  A(:,:), C(:,:)
-      character*7 tname 
-      integer nloopi,nloopj
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(3:3,0:3) :: A 
-
-      tname='ACR2111'
-      allocate (A(N,M), C(N,M)) 
-	        
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i,j)+C(i,j+1)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(0:0,0:1)),stage(iloop)
-      do j=3,M-2
-        do i=3,N-2
-          A(i,j) = A(i,j)+A(i,j+1)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=3,M-2
-        do i=3,N-2
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)      
-      end 
-C --------------------------------------------ACR2112  
-         
-      subroutine acr2112
-      integer,parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3) :: A 
-
-      tname='ACR2112'
-      allocate (A(N,M), C(N,M))  
-	        
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i,j)+C(i+1,j)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(0:1,0:0)),stage(iloop)
-      do j=3,M-2
-        do i=3,N-2
-          A(i,j) = A(i,j)+A(i+1,j)
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-       do j=3,M-2
-        do i=3,N-2       
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end
-C --------------------------------------------ACR2113  
-         
-      subroutine acr2113
-      integer,parameter :: N = 16,M=16, NL=1000
-      integer,allocatable::  A(:,:), C(:,:)
-      character*7 tname 
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:0) :: A 
-
-      tname='ACR2113'
-      allocate (A(N,M), C(N,M))  
-      
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=4,N-3
-        do j=4,M-3
-         C(i,j) =C(i,j-3)+C(i+3,j)+C(i-3,j)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(3:3,3:0)),stage(iloop)
-      do j=4,M-3
-        do i=4,N-3
-         A(i,j) = A(i,j-3)+A(i+3,j)+A(i-3,j)
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=4,M-3
-       do i=4,N-3    
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end
-C --------------------------------------------ACR2114  
-         
-      subroutine acr2114
-      integer,parameter :: N = 16,M=16, NL=1000
-      integer,allocatable::  A(:,:), C(:,:)
-      character*7 tname 
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(3:0,3:3) :: A 
-
-      tname='ACR2114'
-      allocate (A(N,M), C(N,M)) 
-      
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=4,N-3
-        do j=4,M-3
-         C(i,j) =C(i-3,j)+C(i,j+3)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(3:0,3:3)),stage(iloop)
-      do j=4,M-3
-       do i=4,N-3
-         A(i,j) = A(i-3,j)+A(i,j+3)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=4,M-3
-       do i=4,N-3       
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end
-C --------------------------------------------ACR2115  
-         
-      subroutine acr2115
-      integer,parameter :: N = 59,M=59, NL=1000
-      character*7 tname 
-      integer,allocatable::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11) :: A 
-
-      tname='ACR2115'
-      allocate (A(N,M), C(N,M))   
-      
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=12,N-11
-        do j=12,M-11
-         C(i,j) =C(i+11,j)+C(i,j+10)+C(i+9,j)+
-     *C(i,j-11)+C(i-10,j)+C(i,j-9)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(11:11,11:11)),stage(iloop)
-      do j=12,M-11
-        do i=12,N-11
-         A(i,j) = A(i+11,j)+A(i,j+10)+A(i+9,j)+
-     *A(i,j-11)+A(i-10,j)+A(i,j-9)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=12,M-11
-        do i=12,N-11    
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          AR(i,j) = NL+i+j
-        enddo
-      enddo                
-      end 
-        
-     
-    
-    
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr22.fdv
deleted file mode 100644
index 8c0a6d6..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr22.fdv
+++ /dev/null
@@ -1,995 +0,0 @@
-       program ACR22
-     
-c    TESTING OF THE ACROSS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M) IS TO HAVE DIFFERENT 
-c    FLOW-DEP-LENGTH ON BOTH SIDES 
-
-      print *,'===START OF ACR22========================'
-C --------------------------------------------------
-      call acr2201
-C --------------------------------------------------
-      call acr2202
-C --------------------------------------------------
-      call acr2203
-C -------------------------------------------------
-      call acr2204
-C -------------------------------------------------
-      call acr2205
-C -------------------------------------------------
-      call acr2206
-C --------------------------------------------------
-      call acr2207
-C --------------------------------------------------
-      call acr2208
-C --------------------------------------------------
-      call acr2209
-C -------------------------------------------------
-      call acr2210
-C -------------------------------------------------
-      call acr2211
-C -------------------------------------------------
-      call acr2212
-C -------------------------------------------------
-      call acr2213
-C -------------------------------------------------
-      call acr2214
-C -------------------------------------------------
-      call acr2215
-C -------------------------------------------------
-      print *,'=== END OF ACR22 ========================= '    
-      end
-C ---------------------------------------------ACR2201
-      subroutine ACR2201
-     
-      integer, parameter :: N = 16,M=16, NL=1000
-
-     
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj
-                      
-!dvm$ distribute A(*,BLOCK)    
-      tname='ACR2201'
-      allocate (A(N,M), C(N,M))
-	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i+1,j)+C(i,j+1)+C(i-1,j)+C(i,j-1)
-        enddo
-      enddo
-
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region inout (C),out (A) 
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(1:1,1:1)),stage(iloop)
-      do j=2,M-1
-         do i=2,N-1
-            A(i,j) = A(i+1,j)+A(i,j+1)+A(i-1,j)+A(i,j-1)
-         enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=2,M-1
-       do i=2,N-1      
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)         
-          endif
-       enddo
-      enddo 
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	   
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-      
-      end
-C ---------------------------------------------ACR2202     
-      subroutine ACR2202
-        integer, parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj                      
-!dvm$ distribute A(BLOCK,*)    
-      tname='ACR2202'
-	  
-      do iloop=0,2	  
-      allocate (A(N,M), C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i+1,j)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-!dvm$ parallel (j,i) on A(i,j),across(A(0:1,0:0)),stage(iloop)
-      do j=2,M-1
-       do i=2,N-1
-        A(i,j) = A(i+1,j)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=2,M-1
-       do i=2,N-1
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo     
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      deallocate (A, C)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif                                                 
-               
-      end
-
-C -----------------------------------------ACR2203      
-      subroutine acr2203
-      integer, parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(*,BLOCK)   
-      tname='ACR2203'
-      allocate (A(N,M), C(N,M))
-	  
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i-1,j)+C(i,j+1)
-        enddo
-      enddo
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region in (C),out (A) 
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (j,i) on A(i,j),across(A(1:0,0:1)),stage(iloop)
-      do j=2,M-1
-       do i=2,N-1
-         A(i,j) = A(i-1,j)+A(i,j+1)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=2,M-1
-       do i=2,N-1
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi,nloopj)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A, C)
-    
-      end
-
-C ------------------------------------------ACR2204   
-      subroutine acr2204
-      integer, parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,*)   
-!dvm$ shadow A(1:1,0:1)
-      tname='ACR2204'
-      allocate (A(N,M), C(N,M))  
-	  	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i+1,j)+C(i,j+1)
-        enddo
-      enddo
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region in (C) 
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (j,i) on A(i,j),across(A(0:1,0:1)),stage(iloop)
-      do j=2,M-1
-       do i=2,N-1
-         A(i,j) = A(i+1,j)+A(i,j+1)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=2,M-1
-        do i=2,N-1
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif
-      deallocate (A, C)    
-     
-      end
-    
-C ------------------------------------------ACR2205   
-      subroutine acr2205
-   
-      integer, parameter :: N = 16,M=16, NL=1000
-
-      
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(*,BLOCK)   
-!dvm$ shadow A(0:1,1:1)
-
-      tname='ACR2205'
-      allocate (A(N,M), C(N,M)) 
-	  	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-      do i=2,N-1
-        do j=2,M-1
-         C(i,j) = C(i,j-1)+C(i+1,j)
-        enddo
-      enddo
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region  
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(0:1,1:0)),stage(iloop)
-      do j=2,M-1
-       do i=2,N-1
-         A(i,j) = A(i,j-1)+A(i+1,j)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=2,M-1
-       do i=2,N-1
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif      
-      deallocate (A, C) 
-
-      end
-       
-C -------------------------------------------ACR2206   
-         
-      subroutine acr2206
-      integer, parameter :: N = 16,M=16, NL=1000     
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,*)   
-!dvm$ shadow(2:2,2:2) :: A 
-      tname='ACR2206'
-      allocate (A(N,M), C(N,M))  
-	  	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i+2,j)+C(i,j+2)+C(i+2,j)+C(i-2,j)+C(i,j-2) 
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(2:2,2:2)),stage(iloop)
-      do j=3,M-2
-        do i=3,N-2
-         A(i,j) = A(i+2,j)+A(i,j+2)+A(i+2,j)+A(i-2,j)+A(i,j-2)
-        enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=3,M-2
-       do i=3,N-2      
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-      
-      end   
-C -------------------------------------------ACR2207   
-         
-      subroutine acr2207
-      integer, parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(*,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-      tname='ACR2207'
-      allocate (A(N,M), C(N,M)) 
-	  	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i+2,j)+C(i,j+2)+C(i,j-2)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi)
-!dvm$ region  
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(0:2,2:2)),stage(iloop)
-      do j=3,M-2
-       do i=3,N-2
-        A(i,j) =A(i+2,j)+A(i,j+2)+A(i,j-2)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=3,M-2
-       do i=3,N-2
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)      
- 
-      end   
-C -------------------------------------------ACR2208  
-         
-      subroutine acr2208
-      integer, parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,*)   
-!dvm$ shadow(2:2,2:2) :: A 
-      tname='ACR2208'
-      allocate (A(N,M), C(N,M))   
-	  	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i-1,j)+C(i,j-1)+C(i-2,j)+C(i+2,j)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region inout (C),out (A) 
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (j,i) on A(i,j),across(A(2:2,2:0)),stage(iloop)
-      do j=3,M-2
-       do i=3,N-2
-        A(i,j) = A(i-1,j)+A(i,j-1)+A(i-2,j)+A(i+2,j)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=3,M-2
-       do i=3,N-2
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-      end          
-C -------------------------------------------ACR2209   
-         
-      subroutine acr2209
-      integer, parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(*,BLOCK)   
-!dvm$ shadow(2:2,0:2) :: A 
-
-      tname='ACR2209'
-      allocate (A(N,M), C(N,M))  
-	  	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i,j+2)+ C(i+1,j)+C(i+2,j)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-!dvm$ actual (nloopi)
-!dvm$ region inout (C) 
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(2:2,0:2)),stage(iloop)
-      do j=3,M-2
-       do i=3,N-2
-        A(i,j) = A(i,j+2)+ A(i+1,j)+A(i+2,j)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=3,M-2
-       do i=3,N-2      
-         if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-         endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end  
-C -------------------------------------------ACR2210   
-         
-      subroutine acr2210
-      integer, parameter :: N = 16,M=16, NL=1000
-      
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,*)   
-!dvm$ shadow(3:3,3:3) :: A 
-
-      tname='ACR2210'
-      allocate (A(N,M), C(N,M))   
-	  
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=4,N-3
-        do j=4,M-3
-         C(i,j) =C(i+1,j)+C(i,j+2)+C(i+3,j)+C(i,j-3)+
-     * C(i-2,j)+C(i,j-1)    
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (j,i) on A(i,j),across(A(3:3,3:3)),stage(iloop)
-      do j=4,M-3
-       do i=4,N-3
-        A(i,j) = A(i+1,j)+A(i,j+2)+A(i+3,j)+A(i,j-3)+
-     * A(i-2,j)+A(i,j-1)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j = 4,M-3
-       do i= 4,N-3
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)      
-            
-      end 
-C -------------------------------------------ACR2211   
-         
-      subroutine ACR2211
-      integer, parameter :: N = 16,M=16, NL=1000
-      
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(*,BLOCK)   
-!dvm$ shadow(3:3,0:3) :: A 
-
-      tname='ACR2211'
-      allocate (A(N,M), C(N,M))  
-	  	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i,j)+C(i,j+1)       
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual (nloopi)
-!dvm$ region  
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(0:0,0:1)),stage(iloop)
-      do j=3,M-2
-       do i=3,N-2
-        A(i,j) = A(i,j)+A(i,j+1)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=3,M-2
-       do i=3,N-2       
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-     
-      end 
-C --------------------------------------------ACR2212  
-         
-      subroutine acr2212
-      integer, parameter :: N = 16,M=16, NL=1000
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,*)   
-!dvm$ shadow(0:3,3:3) :: A 
-
-      tname='ACR2212'
-      allocate (A(N,M), C(N,M))  
-	  	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=3,N-2
-        do j=3,M-2
-         C(i,j) =C(i,j)+C(i+1,j)
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region inout (C) 
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(0:1,0:0)),stage(iloop)
-      do j=3,M-2
-       do i=3,N-2
-        A(i,j) = A(i,j)+A(i+1,j)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=3,M-2
-       do i=3,N-2       
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end
-C --------------------------------------------ACR2213  
-         
-      subroutine acr2213
-      integer, parameter :: N = 16,M=16, NL=1000
-      
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(*,BLOCK)   
-!dvm$ shadow(3:3,3:0) :: A 
-
-      tname='ACR2213'
-      allocate (A(N,M), C(N,M)) 
-	  	  
-      do iloop=0,2
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=4,N-3
-        do j=4,M-3
-         C(i,j) =C(i,j-3)+C(i+3,j)+C(i-3,j)       
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(3:3,3:0)),stage(iloop)
-      do j=4,M-3
-       do i=4,N-3
-        A(i,j) = A(i,j-3)+A(i+3,j)+A(i-3,j)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=4,M-3
-       do i=4,N-3       
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end
-C --------------------------------------------ACR2214  
-         
-      subroutine acr2214
-      integer, parameter :: N = 16,M=16, NL=1000      
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(BLOCK,*)   
-!dvm$ shadow(3:0,3:3) :: A 
-
-      tname='ACR2214'
-      allocate (A(N,M), C(N,M)) 
-	  
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=4,N-3
-        do j=4,M-3
-         C(i,j) =C(i-3,j)+C(i,j+3)       
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-
-
-!dvm$ actual (nloopi,nloopj)
-!dvm$ region  
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo                                                          
-
-!dvm$ parallel (j,i) on A(i,j),across(A(3:0,3:3)),stage(iloop)
-      do j=4,M-3
-       do i=4,N-3
-        A(i,j) = A(i-3,j)+A(i,j+3)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=4,M-3
-       do i=4,N-3       
-          if (A(i,j).ne.c(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end
-C --------------------------------------------ACR2215  
-         
-      subroutine acr2215
-      integer, parameter :: N = 58,M=58, NL=1000
-      
-      character*7 tname 
-      integer, allocatable ::  A(:,:), C(:,:)
-      integer nloopi,nloopj 
-!dvm$ distribute A(*,BLOCK)   
-!dvm$ shadow(11:11,11:11) :: A 
-      tname='ACR2215'
-      allocate (A(N,M), C(N,M))   
-	  
-      do iloop=0,2	  
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      do i=12,N-11
-        do j=12,M-11
-         C(i,j) =C(i+11,j)+C(i,j+10)+C(i+9,j)+
-     *C(i,j-11)+C(i-10,j)+C(i,j-9)       
-        enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual (nloopi,nloopj,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (j,i) on A(i,j)
-      do j=1,M
-        do i=1,N
-         A(i,j) = NL+i+j
-        enddo
-      enddo
-
-!dvm$ parallel (j,i) on A(i,j),across(A(11:11,11:11)),stage(iloop)
-      do j=12,M-11
-       do i=12,N-11
-        A(i,j) = A(i+11,j)+A(i,j+10)+A(i+9,j)+
-     *A(i,j-11)+A(i-10,j)+A(i,j-9)
-       enddo
-      enddo
-  
-!dvm$ parallel (j,i) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do j=12,M-11
-       do i=12,N-11    
-          if (A(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A, C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-       do j=1,M
-        AR(i,j) = NL+i+j
-        enddo
-      enddo
-      end    
-    
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr31.fdv
deleted file mode 100644
index 33185ef..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr31.fdv
+++ /dev/null
@@ -1,781 +0,0 @@
-      program ACR31
-
-c    TESTING OF THE ACROSS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K) IS TO HAVE DIFFERENT 
-c    FLOW-DEP-LENGTH ON BOTH SIDES      
-
-      print *,'===START OF ACR31========================'
-C --------------------------------------------------
-      call acr3101
-C --------------------------------------------------
-      call acr3102
-C --------------------------------------------------
-      call acr3103
-C -------------------------------------------------
-      call acr3104
-C -------------------------------------------------
-      call acr3105
-C -------------------------------------------------
-      call acr3106
-C --------------------------------------------------
-      call acr3107
-C --------------------------------------------------
-      call acr3108
-C----------------------------------------------------
-      call acr3109
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF ACR31 ========================= '    
-      end
-C ---------------------------------------------ACR3101
-      subroutine acr3101
-     
-      integer, parameter :: N = 16,M=8,K=8, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)       
-      tname='ACR3101'     
-      allocate (A(N,M,K), C(N,M,K))
-      
-      do iloop=0,2	 	  
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=2,N-1
-       do j=2,M-1
-         do ii=2,K-1
-         C(i,j,ii) = C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1)+C(i-1,j,ii)+
-     *C(i,j-1,ii)+ C(i,j,ii-1)
-         enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo                                              
-!dvm$ parallel (ii,j,i) on A(i,j,ii),across(A(1:1,1:1,1:1)),
-!dvm$*stage(iloop)
-      do ii=2,K-1
-       do j=2,M-1
-         do i=2,N-1
-          A(i,j,ii) = A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)+A(i-1,j,ii)+
-     *A(i,j-1,ii)+ A(i,j,ii-1)
-         enddo
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=2,K-1
-       do j=2,M-1
-        do i=2,N-1       
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-C ---------------------------------------------ACR3102     
-      subroutine acr3102
-     
-      integer, parameter :: N = 16,M=10,K=10, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-      tname='ACR3102'     
-      allocate (A(N,M,K), C(N,M,K))
-      
-      do iloop=0,2	 	  
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         C(i,j,ii)=C(i+2,j,ii)    +C(i,j-2,ii)  +
-     *            C(i,j,ii-1)      +C(i-1,j,ii) +
-     *            C(i+1,j,ii)      +C(i,j-1,ii) +
-     *            C(i,j+2,ii)      +C(i,j,ii+2)  
-
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region in (C) 
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo                                             
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(1:2,2:2,1:2)),
-!dvm$*stage(iloop)
-      do ii=3,K-2
-       do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii)=A(i+2,j,ii)    +A(i,j-2,ii)  +
-     *            A(i,j,ii-1)      +A(i-1,j,ii) +
-     *            A(i+1,j,ii)      +A(i,j-1,ii) +
-     *            A(i,j+2,ii)      +A(i,j,ii+2)  
-         enddo
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=3,K-2
-       do j=3,M-2
-        do i=3,N-2       
-          if (A(i,j,ii).ne.C(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)         
-          endif
-        enddo
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi) 
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-C ---------------------------------------------ACR3103     
-      subroutine acr3103     
-      integer, parameter :: N = 16,M=10,K=10, NL=1000      
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-      tname='ACR3103'     
-      allocate (A(N,M,K), C(N,M,K))
-      
-      do iloop=0,2	 	  
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         C(i,j,ii) =C(i+2,j,ii)+C(i,j+2,ii)+C(i,j,ii+2)+
-     *              C(i,j-2,ii)+ C(i,j-1,ii)+C(i+1,j,ii)+
-     *              C(i,j+1,ii)+C(i,j,ii+1)
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo                                              
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(0:2,2:2,0:2)),
-!dvm$*stage(iloop)
-      do ii=3,K-2
-       do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii) =A(i+2,j,ii)+A(i,j+2,ii)+A(i,j,ii+2)+
-     *              A(i,j-2,ii)+ A(i,j-1,ii)+A(i+1,j,ii)+
-     *              A(i,j+1,ii)+A(i,j,ii+1)
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=3,K-2
-       do j=3,M-2
-        do i=3,N-2       
-          if (A(i,j,ii).ne.C(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)         
-          endif
-        enddo
-       enddo
-      enddo
-
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-C ---------------------------------------------ACR3104     
-      subroutine acr3104     
-      integer, parameter :: N = 16,M=10,K=10, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-      tname='ACR3104'     
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         C(i,j,ii) =C(i+2,j,ii)+C(i,j,ii-2)+
-     *C(i-2,j,ii)+ C(i,j-2,ii)+C(i-1,j,ii)+C(i,j-1,ii)+
-     *C(i,j,ii-1)+C(i+1,j,ii)
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii)
-!dvm$ region  
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo                                              
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(2:2,2:0,2:0)),
-!dvm$*stage(iloop)
-      do ii=3,K-2
-       do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii) =A(i+2,j,ii)+A(i,j,ii-2)+
-     *A(i-2,j,ii)+ A(i,j-2,ii)+A(i-1,j,ii)+A(i,j-1,ii)+
-     *A(i,j,ii-1)+A(i+1,j,ii)
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=3,K-2
-       do j=3,M-2
-        do i=3,N-2       
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-C ---------------------------------------------ACR3105     
-      subroutine acr3105
-      integer, parameter :: N = 16,M=10,K=10, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:2,2:2,0:2) :: A     
-      tname='ACR3105'     
-      allocate (A(N,M,K), C(N,M,K))
-      
-      do iloop=0,2	 	  
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         C(i,j,ii) =C(i+2,j,ii)+C(i,j+2,ii)+C(i,j,ii+2)+
-     *   C(i,j-2,ii)+C(i,j-1,ii)+C(i+1,j,ii)+C(i,j+1,ii)+
-     *   C(i,j,ii+1)
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region in (C) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo                                              
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(0:2,2:2,0:2)),
-!dvm$*stage(iloop)
-      do ii=3,K-2
-       do j=3,M-2
-         do i=3,N-2
-         A(i,j,ii) =A(i+2,j,ii)+A(i,j+2,ii)+A(i,j,ii+2)+
-     *   A(i,j-2,ii)+A(i,j-1,ii)+A(i+1,j,ii)+A(i,j+1,ii)+
-     *   A(i,j,ii+1)
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=3,K-2
-       do j=3,M-2
-        do i=3,N-2
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-
-C --------------------------------------------ACR3106  
-      subroutine acr3106   
-      integer, parameter :: N = 16,M=16,K=16, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3) :: A     
-      tname='ACR3106'     
-      allocate (A(N,M,K), C(N,M,K))
-      
-      do iloop=0,2	 	  
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=4,N-3
-       do j=4,M-3
-         do ii=4,K-3
-          C(i,j,ii) = C(i+3,j,ii)+C(i,j+3,ii)+C(i,j,ii+3)+
-     *               C(i-3,j,ii)+C(i,j-3,ii)+C(i,j,ii-3)+
-     *               C(i+2,j,ii)+C(i,j+2,ii)+C(i,j,ii+2)+
-     *               C(i-2,j,ii)+C(i,j-2,ii)+C(i,j,ii-2)+
-     *               C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1)+
-     *               C(i-1,j,ii)+C(i,j-1,ii)+C(i,j,ii-1)
-         enddo 
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo                                              
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(3:3,3:3,3:3)),
-!dvm$*stage(iloop)
-      do ii=4,K-3
-       do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii) = A(i+3,j,ii)+A(i,j+3,ii)+A(i,j,ii+3)+
-     *               A(i-3,j,ii)+A(i,j-3,ii)+A(i,j,ii-3)+
-     *               A(i+2,j,ii)+A(i,j+2,ii)+A(i,j,ii+2)+
-     *               A(i-2,j,ii)+A(i,j-2,ii)+A(i,j,ii-2)+
-     *               A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)+
-     *               A(i-1,j,ii)+A(i,j-1,ii)+A(i,j,ii-1)
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=4,K-3
-       do j=4,M-3
-        do i=4,N-3    
-          if (A(i,j,ii).ne.C(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)         
-          endif
-        enddo
-       enddo
-      enddo
-
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate(A,C)
-      end
-           
-         
-C --------------------------------------------ACR3107  
-      subroutine acr3107   
-      integer, parameter :: N = 16,M=16,K=16, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,0:3,3:0) :: A     
-      tname='ACR3107'     
-      allocate (A(N,M,K), C(N,M,K))
-      
-      do iloop=0,2	 	  
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=4,N-3
-       do j=4,M-3
-         do ii=4,K-3
-          C(i,j,ii) = C(i+3,j,ii)+C(i,j+3,ii)+C(i-3,j,ii)+
-     *               C(i,j,ii-3)+C(i+2,j,ii)+C(i,j+2,ii)+
-     *               C(i-2,j,ii)+C(i,j,ii-2)+
-     *               C(i+1,j,ii)+C(i,j+1,ii)+C(i+1,j,ii)+
-     *               C(i,j+1,ii)+C(i-1,j,ii)+C(i,j,ii-1) 
-         enddo 
-       enddo
-      enddo
-
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo                                              
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(3:3,0:3,3:0)),
-!dvm$*stage(iloop)
-      do ii=4,K-3
-       do j=4,M-3
-         do i=4,N-3
-         A(i,j,ii) = A(i+3,j,ii)+A(i,j+3,ii)+A(i-3,j,ii)+
-     *               A(i,j,ii-3)+A(i+2,j,ii)+A(i,j+2,ii)+
-     *               a(i-2,j,ii)+A(i,j,ii-2)+
-     *               A(i+1,j,ii)+A(i,j+1,ii)+A(i+1,j,ii)+
-     *               A(i,j+1,ii)+A(i-1,j,ii)+A(i,j,ii-1)   
-        enddo
-       enddo
-      enddo
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=4,K-3
-       do j=4,M-3
-        do i=4,N-3    
-          if (A(i,j,ii).ne.C(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)         
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-                    
-C --------------------------------------------ACR3108  
-      subroutine acr3108   
-      integer, parameter :: N = 16,M=16,K=16, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,0:3,0:3) :: A     
-      tname='ACR3108'     
-      allocate (A(N,M,K), C(N,M,K))
-      
-      do iloop=0,2	 	  
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-
-      do i=1,N-3
-       do j=1,M-3
-         do ii=1,K-3
-          C(i,j,ii) = C(i+3,j,ii)+C(i,j+3,ii)+C(i,j,ii+3)+
-     *               C(i+2,j,ii)+C(i,j+2,ii)+C(i,j,ii+2)+
-     *               C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1) 
-         enddo 
-       enddo
-      enddo
-
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region  
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo                                              
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(0:3,0:3,0:3)),
-!dvm$*stage(iloop)
-      do ii=1,K-3
-       do j=1,M-3
-         do i=1,N-3
-          A(i,j,ii) = A(i+3,j,ii)+A(i,j+3,ii)+A(i,j,ii+3)+
-     *               A(i+2,j,ii)+A(i,j+2,ii)+A(i,j,ii+2)+
-     *               A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)    
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=4,K-3
-       do j=4,M-3
-        do i=4,N-3    
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-           
-C --------------------------------------------ACR3109  
-      subroutine acr3109   
-      integer, parameter :: N = 58,M=58,K=58, NL=1000      
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11,11:11) :: A     
-      tname='ACR3109'     
-      allocate (A(N,M,K), C(N,M,K))
-      
-      do iloop=0,2	 	  
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=12,N-11
-       do j=12,M-11
-         do ii=12,K-11
-          C(i,j,ii) = C(i+11,j,ii)+C(i,j+11,ii)+C(i,j,ii+11)+
-     *               C(i-11,j,ii)+C(i,j-11,ii)+C(i,j,ii-11)+
-     *               C(i+10,j,ii)+C(i,j+10,ii)+C(i,j,ii+10)+
-     *               C(i-10,j,ii)+C(i,j-10,ii)+C(i,j,ii-10)+
-     *               C(i-9,j,ii) +C(i,j-9,ii) +C(i,j,ii-9)+
-     *               C(i+9,j,ii) +C(i,j+9,ii) +C(i,j,ii+9)  
-         enddo 
-        enddo
-      enddo
-
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(11:11,11:11,11:11)),
-!dvm$*stage(iloop)
-      do ii=12,K-11
-       do j=12,M-11
-         do i=12,N-11
-          A(i,j,ii) = A(i+11,j,ii)+A(i,j+11,ii)+A(i,j,ii+11)+
-     *               A(i-11,j,ii)+A(i,j-11,ii)+A(i,j,ii-11)+
-     *               A(i+10,j,ii)+A(i,j+10,ii)+A(i,j,ii+10)+
-     *               A(i-10,j,ii)+A(i,j-10,ii)+A(i,j,ii-10)+
-     *               A(i-9,j,ii)+A(i,j-9,ii)+A(i,j,ii-9)+
-     *               A(i+9,j,ii)+A(i,j+9,ii)+A(i,j,ii+9)  
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=4,K-3
-       do j=4,M-3
-        do i=4,N-3    
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-
-C -----------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         AR(i,j,ii) = NL+i+j+ii
-        enddo
-       enddo
-      enddo
-      end 
-    
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr32.fdv
deleted file mode 100644
index 82a6abe..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr32.fdv
+++ /dev/null
@@ -1,772 +0,0 @@
-      program ACR32
-
-c    TESTING OF THE ACROSS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K) IS TO HAVE DIFFERENT 
-c    FLOW-DEP-LENGTH ON BOTH SIDES      
-
-      print *,'===START OF ACR32========================'
-C --------------------------------------------------
-      call acr3201
-C --------------------------------------------------
-      call acr3202
-C --------------------------------------------------
-      call acr3203
-C -------------------------------------------------
-      call acr3204
-C -------------------------------------------------
-      call acr3205
-C -------------------------------------------------
-      call acr3206
-C --------------------------------------------------
-      call acr3207
-C --------------------------------------------------
-      call acr3208
-C----------------------------------------------------
-      call acr3209
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF ACR32 ========================= '    
-      end
-C ---------------------------------------------ACR3201
-      subroutine acr3201    
-      integer, parameter :: N = 16,M=8,K=8, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(*,BLOCK,BLOCK)     
-      tname='ACR3201'
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=2,N-1
-       do j=2,M-1
-         do ii=2,K-1
-          C(i,j,ii) = C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1)+C(i-1,j,ii)+
-     *C(i,j-1,ii)+ C(i,j,ii-1)
-         enddo 
-       enddo
-      enddo
-
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),across(A(1:1,1:1,1:1)),
-!dvm$*stage(iloop)
-      do ii=2,K-1
-       do j=2,M-1
-         do i=2,N-1
-          A(i,j,ii)=A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)+A(i-1,j,ii)+
-     *A(i,j-1,ii)+ A(i,j,ii-1)
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=2,K-1
-       do j=2,M-1
-         do i=2,N-1       
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-        enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-C ---------------------------------------------ACR3202     
-      subroutine acr3202
-      integer, parameter :: N = 16,M=10,K=10, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,*,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-      tname='ACR3202'
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         C(i,j,ii)=C(i+2,j,ii)+C(i,j-2,ii)  +
-     *            C(i,j,ii-1)+C(i-1,j,ii) +
-     *            C(i+1,j,ii)+C(i,j-1,ii) +
-     *            C(i,j+2,ii)+C(i,j,ii+2)  
-
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(1:2,2:2,1:2)),
-!dvm$*stage(iloop)
-      do ii=3,K-2
-       do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii)=A(i+2,j,ii)+A(i,j-2,ii)  +
-     *            A(i,j,ii-1)+A(i-1,j,ii) +
-     *            A(i+1,j,ii)+A(i,j-1,ii) +
-     *            A(i,j+2,ii)+A(i,j,ii+2)  
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=3,K-2
-       do j=3,M-2
-        do i=3,N-2       
-          if (A(i,j,ii).ne.C(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)         
-          endif
-        enddo
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-C ---------------------------------------------ACR3203     
-      subroutine acr3203     
-      integer, parameter :: N = 16,M=10,K=10, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,*)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-      tname='ACR3203'
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         C(i,j,ii) =C(i+2,j,ii)+C(i,j+2,ii)+C(i,j,ii+2)+
-     *              C(i,j-2,ii)+ C(i,j-1,ii)+C(i+1,j,ii)+
-     *              C(i,j+1,ii)+C(i,j,ii+1)
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii)
-!dvm$ region in (C) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(0:2,2:2,0:2)),
-!dvm$*stage(iloop)
-      do ii=3,K-2
-       do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii) =A(i+2,j,ii)+A(i,j+2,ii)+A(i,j,ii+2)+
-     *              A(i,j-2,ii)+ A(i,j-1,ii)+A(i+1,j,ii)+
-     *              A(i,j+1,ii)+A(i,j,ii+1)
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2       
-          if (A(i,j,ii).ne.C(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)        
-          endif
-         enddo
-        enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-C ---------------------------------------------ACR3204     
-      subroutine acr3204     
-      integer, parameter :: N = 16,M=10,K=10, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(*,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-      tname='ACR3204'     
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         C(i,j,ii) =C(i+2,j,ii)+C(i,j,ii-2)+
-     *C(i-2,j,ii)+ C(i,j-2,ii)+C(i-1,j,ii)+C(i,j-1,ii)+
-     *C(i,j,ii-1)+C(i+1,j,ii)
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(2:2,2:0,2:0)),
-!dvm$*stage(iloop)
-      do ii=3,K-2
-       do j=3,M-2
-         do i=3,N-2
-         A(i,j,ii) =A(i+2,j,ii)+A(i,j,ii-2)+
-     *A(i-2,j,ii)+ A(i,j-2,ii)+A(i-1,j,ii)+A(i,j-1,ii)+
-     *A(i,j,ii-1)+A(i+1,j,ii)
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=3,K-2
-       do j=3,M-2
-        do i=3,N-2       
-          if (A(i,j,ii).ne.C(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-C ---------------------------------------------ACR3205     
-      subroutine acr3205
-      integer, parameter :: N = 16,M=10,K=10, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,*,BLOCK)   
-!dvm$ shadow(0:2,2:2,0:2) :: A     
-      tname='ACR3205'     
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         C(i,j,ii) =C(i+2,j,ii)+C(i,j+2,ii)+C(i,j,ii+2)+
-     *   C(i,j-2,ii)+C(i,j-1,ii)+C(i+1,j,ii)+C(i,j+1,ii)+
-     *   C(i,j,ii+1)
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(0:2,2:2,0:2)),
-!dvm$*stage(iloop)
-      do ii=3,K-2
-       do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii) =A(i+2,j,ii)+A(i,j+2,ii)+A(i,j,ii+2)+
-     *   A(i,j-2,ii)+A(i,j-1,ii)+A(i+1,j,ii)+A(i,j+1,ii)+
-     *   A(i,j,ii+1)
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=3,K-2
-       do j=3,M-2
-        do i=3,N-2       
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-
-C --------------------------------------------ACR3206  
-      subroutine acr3206   
-      integer, parameter :: N = 16,M=16,K=16, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,*)   
-!dvm$ shadow(3:3,3:3,3:3) :: A     
-      tname='ACR3206'     
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=4,N-3
-       do j=4,M-3
-         do ii=4,K-3
-          C(i,j,ii) = C(i+3,j,ii)+C(i,j+3,ii)+C(i,j,ii+3)+
-     *               C(i-3,j,ii)+C(i,j-3,ii)+C(i,j,ii-3)+
-     *               C(i+2,j,ii)+C(i,j+2,ii)+C(i,j,ii+2)+
-     *               C(i-2,j,ii)+C(i,j-2,ii)+C(i,j,ii-2)+
-     *               C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1)+
-     *               C(i-1,j,ii)+C(i,j-1,ii)+C(i,j,ii-1)
-         enddo 
-       enddo
-      enddo
-
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C) 
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(3:3,3:3,3:3)),
-!dvm$*stage(iloop)
-      do ii=4,K-3
-       do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii) = A(i+3,j,ii)+A(i,j+3,ii)+A(i,j,ii+3)+
-     *               A(i-3,j,ii)+A(i,j-3,ii)+A(i,j,ii-3)+
-     *               A(i+2,j,ii)+A(i,j+2,ii)+A(i,j,ii+2)+
-     *               A(i-2,j,ii)+A(i,j-2,ii)+A(i,j,ii-2)+
-     *               A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)+
-     *               A(i-1,j,ii)+A(i,j-1,ii)+A(i,j,ii-1)
-         enddo 
-       enddo
-      enddo
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=4,K-3
-       do j=4,M-3
-        do i=4,N-3    
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-           
-         
-C --------------------------------------------ACR3207  
-      subroutine acr3207   
-      integer, parameter :: N = 16,M=16,K=16, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(*,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,0:3,3:0) :: A     
-      tname='ACR3207'     
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=4,N-3
-       do j=4,M-3
-         do ii=4,K-3
-          C(i,j,ii) = C(i+3,j,ii)+C(i,j+3,ii)+C(i-3,j,ii)+
-     *               C(i,j,ii-3)+C(i+2,j,ii)+C(i,j+2,ii)+
-     *               C(i-2,j,ii)+C(i,j,ii-2)+
-     *               C(i+1,j,ii)+C(i,j+1,ii)+C(i+1,j,ii)+
-     *               C(i,j+1,ii)+C(i-1,j,ii)+C(i,j,ii-1) 
-         enddo 
-       enddo
-      enddo
-
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(3:3,0:3,3:0)),
-!dvm$*stage(iloop)
-      do ii=4,K-3
-       do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii) = A(i+3,j,ii)+A(i,j+3,ii)+A(i-3,j,ii)+
-     *               A(i,j,ii-3)+A(i+2,j,ii)+A(i,j+2,ii)+
-     *               a(i-2,j,ii)+A(i,j,ii-2)+
-     *               A(i+1,j,ii)+A(i,j+1,ii)+A(i+1,j,ii)+
-     *               A(i,j+1,ii)+A(i-1,j,ii)+A(i,j,ii-1)   
-         enddo
-       enddo
-      enddo
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=4,K-3
-       do j=4,M-3
-        do i=4,N-3    
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-	  
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-           
-         
-C --------------------------------------------ACR3208  
-      subroutine acr3208   
-      integer, parameter :: N = 16,M=16,K=16, NL=1000
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,*,BLOCK)   
-!dvm$ shadow(0:3,0:3,0:3) :: A     
-      tname='ACR3208'     
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=1,N-3
-       do j=1,M-3
-         do ii=1,K-3
-          C(i,j,ii) = C(i+3,j,ii)+C(i,j+3,ii)+C(i,j,ii+3)+
-     *               C(i+2,j,ii)+C(i,j+2,ii)+C(i,j,ii+2)+
-     *               C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1) 
-         enddo 
-       enddo
-      enddo
-
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region  
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(0:3,0:3,0:3)),
-!dvm$*stage(iloop)
-      do ii=1,K-3
-       do j=1,M-3
-        do i=1,N-3
-         A(i,j,ii) = A(i+3,j,ii)+A(i,j+3,ii)+A(i,j,ii+3)+
-     *               A(i+2,j,ii)+A(i,j+2,ii)+A(i,j,ii+2)+
-     *               A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)    
-         enddo 
-       enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=4,K-3
-       do j=4,M-3
-        do i=4,N-3    
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end                   
-
-C --------------------------------------------ACR3209  
-      subroutine acr3209   
-      integer, parameter :: N = 58,M=58,K=58, NL=1000    
-      integer,allocatable :: A(:,:,:), C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*7 tname 
-!dvm$ distribute A(BLOCK,BLOCK,*)   
-!dvm$ shadow(11:11,11:11,11:11) :: A     
-      tname='ACR3209'     
-      allocate (A(N,M,K), C(N,M,K))
-	        
-      do iloop=0,2	 
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      do i=12,N-11
-       do j=12,M-11
-         do ii=12,K-11
-          C(i,j,ii) = C(i+11,j,ii)+C(i,j+11,ii)+C(i,j,ii+11)+
-     *               C(i-11,j,ii)+C(i,j-11,ii)+C(i,j,ii-11)+
-     *               C(i+10,j,ii)+C(i,j+10,ii)+C(i,j,ii+10)+
-     *               C(i-10,j,ii)+C(i,j-10,ii)+C(i,j,ii-10)+
-     *               C(i-9,j,ii) +C(i,j-9,ii) +C(i,j,ii-9)+
-     *               C(i+9,j,ii) +C(i,j+9,ii) +C(i,j,ii+9)  
-         enddo 
-       enddo
-      enddo
-
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,C)
-!dvm$ region inout (C),out (A) 
-
-
-!dvm$ parallel (ii,j,i) on A(i,j,ii)
-      do ii=1,K
-       do j=1,M
-         do i=1,N
-          A(i,j,ii) = NL+i+j+ii
-         enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*across(A(11:11,11:11,11:11)),
-!dvm$*stage(iloop)
-      do ii=12,K-11
-       do j=12,M-11
-        do i=12,N-11
-         A(i,j,ii) = A(i+11,j,ii)+A(i,j+11,ii)+A(i,j,ii+11)+
-     *               A(i-11,j,ii)+A(i,j-11,ii)+A(i,j,ii-11)+
-     *               A(i+10,j,ii)+A(i,j+10,ii)+A(i,j,ii+10)+
-     *               A(i-10,j,ii)+A(i,j-10,ii)+A(i,j,ii-10)+
-     *               A(i-9,j,ii)+A(i,j-9,ii)+A(i,j,ii-9)+
-     *               A(i+9,j,ii)+A(i,j+9,ii)+A(i,j,ii+9)  
-         enddo 
-        enddo
-      enddo
-  
-!dvm$ parallel (ii,j,i) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do ii=4,K-3
-       do j=4,M-3
-        do i=4,N-3    
-          if (A(i,j,ii).ne.C(i,j,ii)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-      enddo
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, C)
-      end
-
-C -----------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         AR(i,j,ii) = NL+i+j+ii
-        enddo
-       enddo
-      enddo
-      end 
-    
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr41.fdv
deleted file mode 100644
index 938a38a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr41.fdv
+++ /dev/null
@@ -1,887 +0,0 @@
-      program ACR41
-
-c    TESTING OF THE ACROSS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT 
-c    FLOW-DEP-LENGTH ON BOTH SIDES      
-
-      print *,'===START OF ACR41========================'
-C --------------------------------------------------
-      call acr4101
-C --------------------------------------------------
-      call acr4102
-C --------------------------------------------------
-      call acr4103
-C -------------------------------------------------
-      call acr4104
-C -------------------------------------------------
-      call acr4105
-C -------------------------------------------------
-      call acr4106
-C --------------------------------------------------
-      call acr4107
-C --------------------------------------------------
-      call acr4108
-C----------------------------------------------------
-c     call acr4109
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF ACR41 ========================= '    
-      end
-C ---------------------------------------------ACR4101 
-      subroutine ACR4101    
-      integer, parameter :: N = 16,M=8,K=8,L=8, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4101'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=2,N-1
-       do j=2,M-1
-         do ii=2,K-1
-          do jj=2,L-1
-           C(i,j,ii,jj)=
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+1)+
-     *   C(i-1,j,ii,jj)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii-1,jj)+ C(i,j,ii,jj-1)
-         enddo 
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in(C,B),out (A) 
-
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-        do ii=1,K
-         do j=1,M
-          do i=1,N
-           A(i,j,ii,jj) = NL+i+j+ii+jj
-          enddo
-         enddo
-        enddo
-       enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(1:1,1:1,1:1,1:1))
-      do jj=2,L-1
-       do ii=2,K-1
-        do j=2,M-1
-         do i=2,N-1
-          A(i,j,ii,jj)=
-     *   A(i+1,j,ii,jj)+A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+A(i,j,ii,jj+1)+
-     *   A(i-1,j,ii,jj)+A(i,j-1,ii,jj)+
-     *   A(i,j,ii-1,jj)+A(i,j,ii,jj-1)
-         enddo 
-        enddo
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=2,L-1
-       do ii=2,K-1
-        do j=2,M-1
-         do i=2,N-1         
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-           endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A,B, C)
-      end
-C ---------------------------------------------ACR4102     
-      subroutine ACR4102    
-      integer, parameter :: N = 16,M=10,K=10,L=10, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4102'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj) =
-     *   C(i+2,j,ii,jj)+ C(i,j+2,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+2)+
-     *   C(i-1,j,ii,jj)+ C(i,j-2,ii,jj)+
-     *   C(i,j,ii-2,jj)+ C(i,j,ii,jj-1)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii,jj+1)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo 
-      enddo 
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region  
-
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),across(A(1:2,2:2,2:1,1:2))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj) =
-     *   A(i+2,j,ii,jj)+ A(i,j+2,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj+2)+
-     *   A(i-1,j,ii,jj)+ A(i,j-2,ii,jj)+
-     *   A(i,j,ii-2,jj)+ A(i,j,ii,jj-1)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii,jj+1)+ A(i,j-1,ii,jj)+
-     *   A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end
-C -----------------------------------------ACR4103      
-      subroutine ACR4103     
-      integer, parameter :: N = 16,M=10,K=10,L=10, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4103'     
-      allocate (B(N,M,K,L), C(N,M,K,L), A(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj) =  C(i-2,j,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j,ii-2,jj)+
-     *   C(i,j,ii,jj-2)+ C(i-1,j,ii,jj)+
-     *   C(i,j-1,ii,jj)+ C(i,j,ii-1,jj)+
-     *   C(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo  
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A) 
-
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(2:0,2:2,2:0,2:0))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj) =  A(i-2,j,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j,ii-2,jj)+
-     *   A(i,j,ii,jj-2)+ A(i-1,j,ii,jj)+
-     *   A(i,j-1,ii,jj)+ A(i,j,ii-1,jj)+
-     *   A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A ,B, C)
-      end 
-C ------------------------------------------ACR4104   
-      subroutine ACR4104     
-      integer, parameter :: N = 16,M=10,K=10,L=10, NL=1000            
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4104'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj) =  C(i+2,j,ii,jj)+
-     *   C(i,j,ii,jj+2)+ C(i-2,j,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j,ii-2,jj)+
-     *   C(i+1,j,ii,jj)+ C(i,j,ii,jj+1)+
-     *   C(i-1,j,ii,jj)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii-1,jj)
-         enddo
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C) 
-
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(2:2,2:0,2:0,0:2))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj) =  A(i+2,j,ii,jj)+
-     *   A(i,j,ii,jj+2)+ A(i-2,j,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j,ii-2,jj)+
-     *   A(i+1,j,ii,jj)+ A(i,j,ii,jj+1)+
-     *   A(i-1,j,ii,jj)+ A(i,j-1,ii,jj)+
-     *   A(i,j,ii-1,jj)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate ( A, B, C)
-      end  
-C ------------------------------------------ACR4105
-      subroutine ACR4105
-      integer, parameter :: N = 16,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:0,0:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4105'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj)=
-     *   C(i+2,j,ii,jj)+ C(i,j,ii+2,jj)+
-     *   C(i,j,ii,jj+2)+ C(i-2,j,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j,ii,jj-2)+
-     *   C(i+1,j,ii,jj)+ C(i,j,ii+1,jj)+
-     *   C(i,j,ii,jj+1)+ C(i-1,j,ii,jj)+
-     *   C(i,j-1,ii,jj)+ C(i,j,ii,jj-1)         
-         enddo
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(2:2,2:0,0:2,2:2))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj)=
-     *   A(i+2,j,ii,jj)+ A(i,j,ii+2,jj)+
-     *   A(i,j,ii,jj+2)+ A(i-2,j,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j,ii,jj-2)+
-     *   A(i+1,j,ii,jj)+ A(i,j,ii+1,jj)+
-     *   A(i,j,ii,jj+1)+ A(i-1,j,ii,jj)+
-     *   A(i,j-1,ii,jj)+ A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end  
-C --------------------------------------------ACR4106  
-      subroutine ACR4106
-      integer, parameter :: N = 32,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3,3:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4106'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=4,N-3
-       do j=4,M-3
-        do ii=4,K-3
-         do jj=4,L-3
-          C(i,j,ii,jj) =
-     *   C(i+3,j,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j,ii+3,jj)+ C(i,j,ii,jj+3)+
-     *   C(i-3,j,ii,jj)+ C(i,j-3,ii,jj)+
-     *   C(i,j,ii-3,jj)+ C(i,j,ii,jj-3)+
-     *   C(i+2,j,ii,jj)+ C(i,j+2,ii,jj)+
-     *   C(i,j,ii+2,jj)+ C(i,j,ii,jj+2)+
-     *   C(i-2,j,ii,jj)+ C(i,j-2,ii,jj)+
-     *   C(i,j,ii-2,jj)+ C(i,j,ii,jj-2)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+1)+
-     *   C(i-1,j,ii,jj)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii-1,jj)+ C(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(3:3,3:3,3:3,3:3))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii,jj) =
-     *   A(i+3,j,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j,ii+3,jj)+ A(i,j,ii,jj+3)+
-     *   A(i-3,j,ii,jj)+ A(i,j-3,ii,jj)+
-     *   A(i,j,ii-3,jj)+ A(i,j,ii,jj-3)+
-     *   A(i+2,j,ii,jj)+ A(i,j+2,ii,jj)+
-     *   A(i,j,ii+2,jj)+ A(i,j,ii,jj+2)+
-     *   A(i-2,j,ii,jj)+ A(i,j-2,ii,jj)+
-     *   A(i,j,ii-2,jj)+ A(i,j,ii,jj-2)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj+1)+
-     *   A(i-1,j,ii,jj)+ A(i,j-1,ii,jj)+
-     *   A(i,j,ii-1,jj)+ A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end 
-C -------------------------------------------ACR4107   
-      subroutine ACR4107
-      integer, parameter :: N = 16,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,0:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4107'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=4,N-3
-       do j=4,M-3
-        do ii=4,K-3
-         do jj=4,L-3
-          C(i,j,ii,jj) =
-     *   C(i+3,j,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j,ii+3,jj)+ C(i,j,ii,jj+3)+ 
-     *   C(i,j-3,ii,jj)+ C(i+2,j,ii,jj)+
-     *   C(i,j+2,ii,jj)+ C(i,j,ii+2,jj)+
-     *   C(i,j,ii,jj+2)+ C(i,j-2,ii,jj)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+1)+ 
-     *   C(i,j-1,ii,jj)
-         enddo
-        enddo 
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region  
-
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(0:3,3:3,0:3,0:3))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii,jj) =
-     *   A(i+3,j,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j,ii+3,jj)+ A(i,j,ii,jj+3)+ 
-     *   A(i,j-3,ii,jj)+ A(i+2,j,ii,jj)+
-     *   A(i,j+2,ii,jj)+ A(i,j,ii+2,jj)+
-     *   A(i,j,ii,jj+2)+ A(i,j-2,ii,jj)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj+1)+ 
-     *   A(i,j-1,ii,jj)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end   
-C -------------------------------------------ACR4108   
-      subroutine ACR4108
-      integer, parameter :: N = 16,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,3:0) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4108'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=4,N-3
-       do j=4,M-3
-        do ii=4,K-3
-         do jj=4,L-3
-          C(i,j,ii,jj) = 
-     *   C(i+3,j,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j,ii+3,jj)+ C(i,j,ii,jj-3)+
-     *   C(i+2,j,ii,jj)+ C(i,j+2,ii,jj)+
-     *   C(i,j,ii+2,jj)+ C(i,j,ii,jj-2)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(0:3,0:3,0:3,3:0))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii,jj) = 
-     *   A(i+3,j,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j,ii+3,jj)+ A(i,j,ii,jj-3)+
-     *   A(i+2,j,ii,jj)+ A(i,j+2,ii,jj)+
-     *   A(i,j,ii+2,jj)+ A(i,j,ii,jj-2)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end   
-C -------------------------------------------ACR4109   
-      subroutine ACR4109
-      integer, parameter :: N = 48,M=48,K=48,L=48, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11,11:11,11:11) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4109'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=12,N-11
-       do j=12,M-11
-        do ii=12,K-11
-         do jj=12,L-11
-          C(i,j,ii,jj) =
-     *   C(i+11,j,ii,jj)+ C(i,j+11,ii,jj)+
-     *   C(i,j,ii+11,jj)+ C(i,j,ii,jj+11)+
-     *   C(i-11,j,ii,jj)+ C(i,j-11,ii,jj)+
-     *   C(i,j,ii-11,jj)+ C(i,j,ii,jj-11)
-         enddo
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(11:11,11:11,11:11,11:11))
-      do jj=12,L-11
-       do ii=12,K-11
-        do j=12,M-11
-         do i=12,N-11
-          A(i,j,ii,jj) =
-     *   A(i+11,j,ii,jj)+ A(i,j+11,ii,jj)+
-     *   A(i,j,ii+11,jj)+ A(i,j,ii,jj+11)+
-     *   A(i-11,j,ii,jj)+ A(i,j-11,ii,jj)+
-     *   A(i,j,ii-11,jj)+ A(i,j,ii,jj-11)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=12,L-11
-       do ii=12,K-11
-        do j=12,M-11
-         do i=12,N-11
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate ( A, B, C)
-      end    
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          AR(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo                 
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr42.fdv
deleted file mode 100644
index 81acd7a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr42.fdv
+++ /dev/null
@@ -1,881 +0,0 @@
-      program ACR42
-
-c    TESTING OF THE ACROSS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT 
-c    FLOW-DEP-LENGTH ON BOTH SIDES      
-
-      print *,'===START OF ACR42========================'
-C --------------------------------------------------
-      call acr4201
-C --------------------------------------------------
-      call acr4202
-C --------------------------------------------------
-      call acr4203
-C -------------------------------------------------
-      call acr4204
-C -------------------------------------------------
-      call acr4205
-C -------------------------------------------------
-      call acr4206
-C --------------------------------------------------
-      call acr4207
-C --------------------------------------------------
-      call acr4208
-C----------------------------------------------------
-      call acr4209
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF ACR42 ========================= '    
-      end
-C ---------------------------------------------ACR4201 
-      subroutine ACR4201    
-      integer, parameter :: N = 16,M=8,K=8,L=8, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,*,*,*)      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4201'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=2,N-1
-       do j=2,M-1
-         do ii=2,K-1
-          do jj=2,L-1
-           C(i,j,ii,jj)=
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+1)+
-     *   C(i-1,j,ii,jj)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii-1,jj)+ C(i,j,ii,jj-1)
-         enddo 
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-        do ii=1,K
-         do j=1,M
-          do i=1,N
-           A(i,j,ii,jj) = NL+i+j+ii+jj
-          enddo
-         enddo
-        enddo
-       enddo
- 
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*across(A(1:1,1:1,1:1,1:1))
-      do jj=2,L-1
-       do ii=2,K-1
-        do j=2,M-1
-         do i=2,N-1
-          A(i,j,ii,jj)=
-     *   A(i+1,j,ii,jj)+A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+A(i,j,ii,jj+1)+
-     *   A(i-1,j,ii,jj)+A(i,j-1,ii,jj)+
-     *   A(i,j,ii-1,jj)+A(i,j,ii,jj-1)
-         enddo 
-        enddo
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=2,L-1
-       do ii=2,K-1
-        do j=2,M-1
-         do i=2,N-1         
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-           endif
-         enddo
-        enddo
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end
-C ---------------------------------------------ACR4202     
-      subroutine ACR4202    
-      integer, parameter :: N = 16,M=8,K=8,L=8, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4202'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj) =
-     *   C(i+2,j,ii,jj)+ C(i,j+2,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+2)+
-     *   C(i-1,j,ii,jj)+ C(i,j-2,ii,jj)+
-     *   C(i,j,ii-2,jj)+ C(i,j,ii,jj-1)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii,jj+1)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo 
-      enddo 
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A) 
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo 
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),across(A(1:2,2:2,2:1,1:2))
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          A(i,j,ii,jj) =
-     *   A(i+2,j,ii,jj)+ A(i,j+2,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj+2)+
-     *   A(i-1,j,ii,jj)+ A(i,j-2,ii,jj)+
-     *   A(i,j,ii-2,jj)+ A(i,j,ii,jj-1)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii,jj+1)+ A(i,j-1,ii,jj)+
-     *   A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end
-C -----------------------------------------ACR4203      
-      subroutine ACR4203     
-      integer, parameter :: N = 16,M=8,K=8,L=8, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4203'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj) =  C(i-2,j,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j,ii-2,jj)+
-     *   C(i,j,ii,jj-2)+ C(i-1,j,ii,jj)+
-     *   C(i,j-1,ii,jj)+ C(i,j,ii-1,jj)+
-     *   C(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo  
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out( A) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(2:0,2:2,2:0,2:0))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj) =  A(i-2,j,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j,ii-2,jj)+
-     *   A(i,j,ii,jj-2)+ A(i-1,j,ii,jj)+
-     *   A(i,j-1,ii,jj)+ A(i,j,ii-1,jj)+
-     *   A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then         
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end 
-C ------------------------------------------ACR4204   
-      subroutine ACR4204     
-      integer, parameter :: N = 16,M=8,K=8,L=8, NL=1000            
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4204'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj) =  C(i+2,j,ii,jj)+
-     *   C(i,j,ii,jj+2)+ C(i-2,j,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j,ii-2,jj)+
-     *   C(i+1,j,ii,jj)+ C(i,j,ii,jj+1)+
-     *   C(i-1,j,ii,jj)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii-1,jj)
-         enddo
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(2:2,2:0,2:0,0:2))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj) =  A(i+2,j,ii,jj)+
-     *   A(i,j,ii,jj+2)+ A(i-2,j,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j,ii-2,jj)+
-     *   A(i+1,j,ii,jj)+ A(i,j,ii,jj+1)+
-     *   A(i-1,j,ii,jj)+ A(i,j-1,ii,jj)+
-     *   A(i,j,ii-1,jj)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end  
-C ------------------------------------------ACR4205
-      subroutine ACR4205
-      integer, parameter :: N = 16,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(2:2,2:0,0:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4205'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj)=
-     *   C(i+2,j,ii,jj)+ C(i,j,ii+2,jj)+
-     *   C(i,j,ii,jj+2)+ C(i-2,j,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j,ii,jj-2)+
-     *   C(i+1,j,ii,jj)+ C(i,j,ii+1,jj)+
-     *   C(i,j,ii,jj+1)+ C(i-1,j,ii,jj)+
-     *   C(i,j-1,ii,jj)+ C(i,j,ii,jj-1)         
-         enddo
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(2:2,2:0,0:2,2:2))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj)=
-     *   A(i+2,j,ii,jj)+ A(i,j,ii+2,jj)+
-     *   A(i,j,ii,jj+2)+ A(i-2,j,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j,ii,jj-2)+
-     *   A(i+1,j,ii,jj)+ A(i,j,ii+1,jj)+
-     *   A(i,j,ii,jj+1)+ A(i-1,j,ii,jj)+
-     *   A(i,j-1,ii,jj)+ A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end  
-C --------------------------------------------ACR4206  
-      subroutine ACR4206
-      integer, parameter :: N = 32,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(3:3,3:3,3:3,3:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4206'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=4,N-3
-       do j=4,M-3
-        do ii=4,K-3
-         do jj=4,L-3
-          C(i,j,ii,jj) =
-     *   C(i+3,j,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j,ii+3,jj)+ C(i,j,ii,jj+3)+
-     *   C(i-3,j,ii,jj)+ C(i,j-3,ii,jj)+
-     *   C(i,j,ii-3,jj)+ C(i,j,ii,jj-3)+
-     *   C(i+2,j,ii,jj)+ C(i,j+2,ii,jj)+
-     *   C(i,j,ii+2,jj)+ C(i,j,ii,jj+2)+
-     *   C(i-2,j,ii,jj)+ C(i,j-2,ii,jj)+
-     *   C(i,j,ii-2,jj)+ C(i,j,ii,jj-2)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+1)+
-     *   C(i-1,j,ii,jj)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii-1,jj)+ C(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(3:3,3:3,3:3,3:3))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii,jj) =
-     *   A(i+3,j,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j,ii+3,jj)+ A(i,j,ii,jj+3)+
-     *   A(i-3,j,ii,jj)+ A(i,j-3,ii,jj)+
-     *   A(i,j,ii-3,jj)+ A(i,j,ii,jj-3)+
-     *   A(i+2,j,ii,jj)+ A(i,j+2,ii,jj)+
-     *   A(i,j,ii+2,jj)+ A(i,j,ii,jj+2)+
-     *   A(i-2,j,ii,jj)+ A(i,j-2,ii,jj)+
-     *   A(i,j,ii-2,jj)+ A(i,j,ii,jj-2)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj+1)+
-     *   A(i-1,j,ii,jj)+ A(i,j-1,ii,jj)+
-     *   A(i,j,ii-1,jj)+ A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end 
-C -------------------------------------------ACR4207   
-      subroutine ACR4207
-      integer, parameter :: N = 16,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(0:3,3:3,0:3,0:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4207'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=4,N-3
-       do j=4,M-3
-        do ii=4,K-3
-         do jj=4,L-3
-          C(i,j,ii,jj) =
-     *   C(i+3,j,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j,ii+3,jj)+ C(i,j,ii,jj+3)+ 
-     *   C(i,j-3,ii,jj)+ C(i+2,j,ii,jj)+
-     *   C(i,j+2,ii,jj)+ C(i,j,ii+2,jj)+
-     *   C(i,j,ii,jj+2)+ C(i,j-2,ii,jj)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+1)+ 
-     *   C(i,j-1,ii,jj)
-         enddo
-        enddo 
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(0:3,3:3,0:3,0:3))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii,jj) =
-     *   A(i+3,j,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j,ii+3,jj)+ A(i,j,ii,jj+3)+ 
-     *   A(i,j-3,ii,jj)+ A(i+2,j,ii,jj)+
-     *   A(i,j+2,ii,jj)+ A(i,j,ii+2,jj)+
-     *   A(i,j,ii,jj+2)+ A(i,j-2,ii,jj)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj+1)+ 
-     *   A(i,j-1,ii,jj)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end   
-C -------------------------------------------ACR4208   
-      subroutine ACR4208
-      integer, parameter :: N = 16,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(0:3,3:3,0:3,3:0) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4208'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=4,N-3
-       do j=4,M-3
-        do ii=4,K-3
-         do jj=4,L-3
-          C(i,j,ii,jj) = 
-     *   C(i+3,j,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j,ii+3,jj)+ C(i,j,ii,jj-3)+
-     *   C(i+2,j,ii,jj)+ C(i,j+2,ii,jj)+
-     *   C(i,j,ii+2,jj)+ C(i,j,ii,jj-2)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(0:3,0:3,0:3,3:0))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii,jj) = 
-     *   A(i+3,j,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j,ii+3,jj)+ A(i,j,ii,jj-3)+
-     *   A(i+2,j,ii,jj)+ A(i,j+2,ii,jj)+
-     *   A(i,j,ii+2,jj)+ A(i,j,ii,jj-2)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end   
-C -------------------------------------------ACR4209   
-      subroutine ACR4209
-      integer, parameter :: N = 48,M=48,K=48,L=48, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(11:11,11:11,11:11,11:11) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4209'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=12,N-11
-       do j=12,M-11
-        do ii=12,K-11
-         do jj=12,L-11
-          C(i,j,ii,jj) =
-     *   C(i+11,j,ii,jj)+ C(i,j+11,ii,jj)+
-     *   C(i,j,ii+11,jj)+ C(i,j,ii,jj+11)+
-     *   C(i-11,j,ii,jj)+ C(i,j-11,ii,jj)+
-     *   C(i,j,ii-11,jj)+ C(i,j,ii,jj-11)
-         enddo
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region  
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(11:11,11:11,11:11,11:11))
-      do jj=12,L-11
-       do ii=12,K-11
-        do j=12,M-11
-         do i=12,N-11
-          A(i,j,ii,jj) =
-     *   A(i+11,j,ii,jj)+ A(i,j+11,ii,jj)+
-     *   A(i,j,ii+11,jj)+ A(i,j,ii,jj+11)+
-     *   A(i-11,j,ii,jj)+ A(i,j-11,ii,jj)+
-     *   A(i,j,ii-11,jj)+ A(i,j,ii,jj-11)
-         enddo
-        enddo 
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=12,L-11
-       do ii=12,K-11
-        do j=12,M-11
-         do i=12,N-11
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end    
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          AR(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo                 
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr43.fdv
deleted file mode 100644
index fbec076..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/acr43.fdv
+++ /dev/null
@@ -1,883 +0,0 @@
-      program ACR43
-
-c    TESTING OF THE ACROSS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT 
-c    FLOW-DEP-LENGTH ON BOTH SIDES      
-
-      print *,'===START OF ACR43========================'
-C --------------------------------------------------
-      call acr4301
-C --------------------------------------------------
-      call acr4302
-C --------------------------------------------------
-      call acr4303
-C -------------------------------------------------
-      call acr4304
-C -------------------------------------------------
-      call acr4305
-C -------------------------------------------------
-      call acr4306
-C --------------------------------------------------
-      call acr4307
-C --------------------------------------------------
-      call acr4308
-C----------------------------------------------------
-       call acr4309
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF ACR43 ========================= '    
-      end
-C ---------------------------------------------ACR4301 
-      subroutine ACR4301    
-      integer, parameter :: N = 16,M=8,K=8,L=8, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4301'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=2,N-1
-       do j=2,M-1
-         do ii=2,K-1
-          do jj=2,L-1
-           C(i,j,ii,jj)=
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+1)+
-     *   C(i-1,j,ii,jj)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii-1,jj)+ C(i,j,ii,jj-1)
-         enddo 
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-        do ii=1,K
-         do j=1,M
-          do i=1,N
-           A(i,j,ii,jj) = NL+i+j+ii+jj
-          enddo
-         enddo
-        enddo
-       enddo
- 
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*across(A(1:1,1:1,1:1,1:1))
-      do jj=2,L-1
-       do ii=2,K-1
-        do j=2,M-1
-         do i=2,N-1
-          A(i,j,ii,jj)=
-     *   A(i+1,j,ii,jj)+A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+A(i,j,ii,jj+1)+
-     *   A(i-1,j,ii,jj)+A(i,j-1,ii,jj)+
-     *   A(i,j,ii-1,jj)+A(i,j,ii,jj-1)
-         enddo 
-        enddo
-       enddo 
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=2,L-1
-       do ii=2,K-1
-        do j=2,M-1
-         do i=2,N-1
-            if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-           endif
-         enddo
-        enddo
-       enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end
-C ---------------------------------------------ACR4302     
-      subroutine ACR4302    
-      integer, parameter :: N = 16,M=10,K=10,L=10, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A 
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4302'
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj) =
-     *   C(i+2,j,ii,jj)+ C(i,j+2,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+2)+
-     *   C(i-1,j,ii,jj)+ C(i,j-2,ii,jj)+
-     *   C(i,j,ii-2,jj)+ C(i,j,ii,jj-1)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii,jj+1)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo 
-      enddo 
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in( C),out( A) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),across(A(1:2,2:2,2:1,1:2))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj) =
-     *   A(i+2,j,ii,jj)+ A(i,j+2,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj+2)+
-     *   A(i-1,j,ii,jj)+ A(i,j-2,ii,jj)+
-     *   A(i,j,ii-2,jj)+ A(i,j,ii,jj-1)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii,jj+1)+ A(i,j-1,ii,jj)+
-     *   A(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end
-C -----------------------------------------ACR4303      
-      subroutine ACR4303     
-      integer, parameter :: N = 16,M=10,K=10,L=10, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4303'
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj) =  C(i-2,j,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j,ii-2,jj)+
-     *   C(i,j,ii,jj-2)+ C(i-1,j,ii,jj)+
-     *   C(i,j-1,ii,jj)+ C(i,j,ii-1,jj)+
-     *   C(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo 
-      enddo  
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C)
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(2:0,2:2,2:0,2:0))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj) =  A(i-2,j,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j,ii-2,jj)+
-     *   A(i,j,ii,jj-2)+ A(i-1,j,ii,jj)+
-     *   A(i,j-1,ii,jj)+ A(i,j,ii-1,jj)+
-     *   A(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end 
-C ------------------------------------------ACR4304   
-      subroutine ACR4304     
-      integer, parameter :: N = 16,M=10,K=10,L=10, NL=1000            
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4304'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj) =  C(i+2,j,ii,jj)+
-     *   C(i,j,ii,jj+2)+ C(i-2,j,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j,ii-2,jj)+
-     *   C(i+1,j,ii,jj)+ C(i,j,ii,jj+1)+
-     *   C(i-1,j,ii,jj)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii-1,jj)
-         enddo
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C)
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(2:2,2:0,2:0,0:2))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj) =  A(i+2,j,ii,jj)+
-     *   A(i,j,ii,jj+2)+ A(i-2,j,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j,ii-2,jj)+
-     *   A(i+1,j,ii,jj)+ A(i,j,ii,jj+1)+
-     *   A(i-1,j,ii,jj)+ A(i,j-1,ii,jj)+
-     *   A(i,j,ii-1,jj)
-         enddo
-        enddo
-       enddo
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end
-C ------------------------------------------ACR4305
-      subroutine ACR4305
-      integer, parameter :: N = 16,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:0,0:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4305'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=3,N-2
-       do j=3,M-2
-        do ii=3,K-2
-         do jj=3,L-2
-          C(i,j,ii,jj)=
-     *   C(i+2,j,ii,jj)+ C(i,j,ii+2,jj)+
-     *   C(i,j,ii,jj+2)+ C(i-2,j,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j,ii,jj-2)+
-     *   C(i+1,j,ii,jj)+ C(i,j,ii+1,jj)+
-     *   C(i,j,ii,jj+1)+ C(i-1,j,ii,jj)+
-     *   C(i,j-1,ii,jj)+ C(i,j,ii,jj-1)         
-         enddo
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A)
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(2:2,2:0,0:2,2:2))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          A(i,j,ii,jj)=
-     *   A(i+2,j,ii,jj)+ A(i,j,ii+2,jj)+
-     *   A(i,j,ii,jj+2)+ A(i-2,j,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j,ii,jj-2)+
-     *   A(i+1,j,ii,jj)+ A(i,j,ii+1,jj)+
-     *   A(i,j,ii,jj+1)+ A(i-1,j,ii,jj)+
-     *   A(i,j-1,ii,jj)+ A(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=3,L-2
-       do ii=3,K-2
-        do j=3,M-2
-         do i=3,N-2
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end  
-C --------------------------------------------ACR4306  
-      subroutine ACR4306
-      integer, parameter :: N = 32,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3,3:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4306'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=4,N-3
-       do j=4,M-3
-        do ii=4,K-3
-         do jj=4,L-3
-          C(i,j,ii,jj) =
-     *   C(i+3,j,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j,ii+3,jj)+ C(i,j,ii,jj+3)+
-     *   C(i-3,j,ii,jj)+ C(i,j-3,ii,jj)+
-     *   C(i,j,ii-3,jj)+ C(i,j,ii,jj-3)+
-     *   C(i+2,j,ii,jj)+ C(i,j+2,ii,jj)+
-     *   C(i,j,ii+2,jj)+ C(i,j,ii,jj+2)+
-     *   C(i-2,j,ii,jj)+ C(i,j-2,ii,jj)+
-     *   C(i,j,ii-2,jj)+ C(i,j,ii,jj-2)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+1)+
-     *   C(i-1,j,ii,jj)+ C(i,j-1,ii,jj)+
-     *   C(i,j,ii-1,jj)+ C(i,j,ii,jj-1)
-         enddo
-        enddo 
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C) 
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(3:3,3:3,3:3,3:3))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii,jj) =
-     *   A(i+3,j,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j,ii+3,jj)+ A(i,j,ii,jj+3)+
-     *   A(i-3,j,ii,jj)+ A(i,j-3,ii,jj)+
-     *   A(i,j,ii-3,jj)+ A(i,j,ii,jj-3)+
-     *   A(i+2,j,ii,jj)+ A(i,j+2,ii,jj)+
-     *   A(i,j,ii+2,jj)+ A(i,j,ii,jj+2)+
-     *   A(i-2,j,ii,jj)+ A(i,j-2,ii,jj)+
-     *   A(i,j,ii-2,jj)+ A(i,j,ii,jj-2)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj+1)+
-     *   A(i-1,j,ii,jj)+ A(i,j-1,ii,jj)+
-     *   A(i,j,ii-1,jj)+ A(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end 
-C -------------------------------------------ACR4307   
-      subroutine ACR4307
-      integer, parameter :: N = 16,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,0:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4307'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=4,N-3
-       do j=4,M-3
-        do ii=4,K-3
-         do jj=4,L-3
-          C(i,j,ii,jj) =
-     *   C(i+3,j,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j,ii+3,jj)+ C(i,j,ii,jj+3)+ 
-     *   C(i,j-3,ii,jj)+ C(i+2,j,ii,jj)+
-     *   C(i,j+2,ii,jj)+ C(i,j,ii+2,jj)+
-     *   C(i,j,ii,jj+2)+ C(i,j-2,ii,jj)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj+1)+ 
-     *   C(i,j-1,ii,jj)
-         enddo
-        enddo
-       enddo
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C),out (A)
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(0:3,3:3,0:3,0:3))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii,jj) =
-     *   A(i+3,j,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j,ii+3,jj)+ A(i,j,ii,jj+3)+ 
-     *   A(i,j-3,ii,jj)+ A(i+2,j,ii,jj)+
-     *   A(i,j+2,ii,jj)+ A(i,j,ii+2,jj)+
-     *   A(i,j,ii,jj+2)+ A(i,j-2,ii,jj)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj+1)+ 
-     *   A(i,j-1,ii,jj)
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ parallel (jj,ii,j,i) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end
-C -------------------------------------------ACR4308   
-      subroutine ACR4308
-      integer, parameter :: N = 16,M=16,K=16,L=16, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,3:0) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4308'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=4,N-3
-       do j=4,M-3
-        do ii=4,K-3
-         do jj=4,L-3
-          C(i,j,ii,jj) = 
-     *   C(i+3,j,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j,ii+3,jj)+ C(i,j,ii,jj-3)+
-     *   C(i+2,j,ii,jj)+ C(i,j+2,ii,jj)+
-     *   C(i,j,ii+2,jj)+ C(i,j,ii,jj-2)+
-     *   C(i+1,j,ii,jj)+ C(i,j+1,ii,jj)+
-     *   C(i,j,ii+1,jj)+ C(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C)
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(0:3,0:3,0:3,3:0))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          A(i,j,ii,jj) = 
-     *   A(i+3,j,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j,ii+3,jj)+ A(i,j,ii,jj-3)+
-     *   A(i+2,j,ii,jj)+ A(i,j+2,ii,jj)+
-     *   A(i,j,ii+2,jj)+ A(i,j,ii,jj-2)+
-     *   A(i+1,j,ii,jj)+ A(i,j+1,ii,jj)+
-     *   A(i,j,ii+1,jj)+ A(i,j,ii,jj-1)
-         enddo
-        enddo
-       enddo
-      enddo
-  
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=4,L-3
-       do ii=4,K-3
-        do j=4,M-3
-         do i=4,N-3
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end
-C -------------------------------------------ACR4309   
-      subroutine ACR4309
-      integer, parameter :: N = 58,M=58,K=58,L=58, NL=1000
-      integer, allocatable :: A(:,:,:,:), B(:,:,:,:), C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj
-      character*7 tname 
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11,11:11,11:11) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-      tname='ACR4309'     
-      allocate (B(N,M,K,L), A(N,M,K,L), C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      do i=12,N-11
-       do j=12,M-11
-        do ii=12,K-11
-         do jj=12,L-11
-          C(i,j,ii,jj) =
-     *   C(i+11,j,ii,jj)+ C(i,j+11,ii,jj)+
-     *   C(i,j,ii+11,jj)+ C(i,j,ii,jj+11)+
-     *   C(i-11,j,ii,jj)+ C(i,j-11,ii,jj)+
-     *   C(i,j,ii-11,jj)+ C(i,j,ii,jj-11)
-         enddo
-        enddo
-       enddo 
-      enddo
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual (nloopi,nloopj,nloopii,nloopjj,C)
-!dvm$ region in (C)
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj)
-      do jj=1,L
-       do ii=1,K
-        do j=1,M
-         do i=1,N
-          A(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
- 
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*across(A(11:11,11:11,11:11,11:11))
-      do jj=12,L-11
-       do ii=12,K-11
-        do j=12,M-11
-         do i=12,N-11
-          A(i,j,ii,jj) =
-     *   A(i+11,j,ii,jj)+ A(i,j+11,ii,jj)+
-     *   A(i,j,ii+11,jj)+ A(i,j,ii,jj+11)+
-     *   A(i-11,j,ii,jj)+ A(i,j-11,ii,jj)+
-     *   A(i,j,ii-11,jj)+ A(i,j,ii,jj-11)
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ parallel (jj,ii,j,i) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do jj=12,L-11
-       do ii=12,K-11
-        do j=12,M-11
-         do i=12,N-11
-          if (A(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-           nloopjj=min(nloopjj,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (nloopi)
-
-      if (nloopi .eq.NL) then
-       call ansyes(tname)
-      else
-       call ansno(tname)
-      endif
-      deallocate (A, B, C)
-      end
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          AR(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
-      end
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
-      
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/settings
deleted file mode 100644
index fd6919c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ACROSS/settings
+++ /dev/null
@@ -1 +0,0 @@
-ALLOW_MULTIDEV=0
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align11.fdv
deleted file mode 100644
index d33c1f1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align11.fdv
+++ /dev/null
@@ -1,441 +0,0 @@
-      program ALIGN11
-
-c    TESTING align CLAUSE .       
-
-      print *,'===START OF align11========================'
-C --------------------------------------------------
-c 111 arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[i]  normal 
-      call align111
-C --------------------------------------------------
-c 1111  arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[i]  small array 
-      call align1111
-C --------------------------------------------------
-c 1112  arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[2*i+1]  small array 
-      call align1112
-C --------------------------------------------------
-c 112                         ALIGN arrB[i] WITH arrA[i+4]  shift along i 
-      call align112
-C --------------------------------------------------
-c 113                         ALIGN arrB[i] WITH arrA[-i+9] reverse on i
-c      call align113
-C --------------------------------------------------
-c 114                         ALIGN arrB[i] WITH arrA[2*i+8]  stretching along i
-      call align114
-C --------------------------------------------------
-c 115                             ALIGN arrB[*] WITH arrA[*]   
-      call align115
-C --------------------------------------------------
-C
-C
-      print *,'=== END OF align11 ========================= '    
-      end
-
-C ----------------------------------------------------align111
-c 111 arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[i]  normal 
-      subroutine align111
-      integer, parameter :: AN1=8,BN1=8,PN = 4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=0
-      character*9 tname
-      integer,allocatable :: A1(:),B1(:)
-      integer erri,i
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align111'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-c      call stralign111 
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-      end
-C ----------------------------------------------------align1111
-c 1111  arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[i]  small array 
-      subroutine align1111
-      integer, parameter :: AN1=5,BN1=2,PN = 4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=0
-      character*9 tname
-      integer,allocatable :: A1(:),B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align1111'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri)   
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align1112
-c 1112  arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[2*i+1]  small array 
-      subroutine align1112
-      integer, parameter :: AN1=5,BN1=2,PN = 4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=2,k2i=0,li=1
-      character*9 tname
-      integer,allocatable :: A1(:),B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align1112'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align112
-c 112                         ALIGN arrB[i] WITH arrA[i+4]  shift along i 
-      subroutine align112
-      integer, parameter :: AN1=8,BN1=4,PN = 4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4
-      character*9 tname
-      integer,allocatable :: A1(:),B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align112'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align113
-c 113     ALIGN arrB[i] WITH arrA[-i+9] reverse on i
-      subroutine align113
-      integer, parameter :: AN1=8,BN1=8,PN = 4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=-1,k2i=0,li=9
-      character*9 tname
-      integer,allocatable :: A1(:),B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align113'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align114
-c 114     ALIGN arrB[i] WITH arrA[2*i+8]  stretching along i
-      subroutine align114
-      integer, parameter :: AN1=24,BN1=8,PN = 4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=2,k2i=0,li=8
-      character*9 tname
-      integer,allocatable :: A1(:),B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-
-      tname='align114'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1),inout(erri)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align115
-c 115                             ALIGN arrB[*] WITH arrA[*]   
-      subroutine align115
-      integer, parameter :: AN1=24,BN1=8,PN = 4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[*] WITH arrA[*]                                                 
-      integer, parameter :: k1i=0,k2i=0,li=0
-      character*9 tname
-      integer,allocatable :: A1(:),B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(*) WITH A1(*)
-
-      tname='align115'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) ),private(j)
-      do i=1,AN1
-        do j=1,BN1
-            if (B1(j) .eq.(j)) then     
-            else
-               erri = min(erri,j)
-            endif 
-        enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align12.fdv
deleted file mode 100644
index cd9610b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align12.fdv
+++ /dev/null
@@ -1,233 +0,0 @@
-      program ALIGN12
-
-c    TESTING align CLAUSE .       
-
-      print *,'===START OF align12========================'
-C --------------------------------------------------
-c 121	arrA1[BLOCK]	arrB2[][]	ALIGN arrB[][i] WITH arrA[i]	matrix compression: 
-c                                                              column on vector element
-      call align121
-C -------------------------------------------------
-c 122			                    ALIGN arrB[i][ ] WITH arrA[2*i+1]	matrix compression: 
-c                                                               line on vector element
-      call align122
-C -------------------------------------------------
-c 123			                    ALIGN arrB[][ ] WITH arrA[]	 
-      call align123
-C -------------------------------------------------
-C
-C
-      print *,'=== END OF align12 ========================= '    
-      end
-
-C ----------------------------------------------------align121
-c 121	arrA1[BLOCK]	arrB2[][]	ALIGN arrB[][i] WITH arrA[i]	matrix compression: 
-c                                                              column on vector element
-      subroutine align121
-      integer, parameter ::  AN1=8,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB(*,i) WITH arrA[k1i*i+li]                                                
-      integer, parameter ::  k1i=1,k2i=0,li=0
-      character*9 tname
-      integer, allocatable :: A1(:),B2(:,:)
-      integer s,cs,erri,i,j,ib,jb              
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B2(*,i) WITH A1(k1i*i+li)
-
-      tname='align121'
-      allocate (A1(AN1),B2(BN1,BN2))
-      erri= ER
-c      call stralign121 
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri, s)
-!dvm$ region local(A1,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib,jb,j)
-      do i=1,AN1
-          A1(i) = i
-          do j=1,BN1
-             if (  
-     *          ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN2)  )then
-                ib = j
-                jb = (i-li)/k1i
-                B2(ib,jb) = ib*NL+jb
-             endif   
-          enddo 
-      enddo 
-      
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            s = s + B2(i,j)
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-                cs = cs + i*NL+j
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-          write (*,*) erri,s,cs
-      endif 
-      deallocate (B2,A1)
-
-      end
-C ----------------------------------------------------align122
-c 122			                    ALIGN arrB[i][ ] WITH arrA[2*i+1]	matrix compression: 
-c                                                               line on vector element
-      subroutine align122
-      integer, parameter ::  AN1=16,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB(i,*) WITH arrA[k1i*i+li]                                                
-      integer, parameter ::  k1i=2,k2i=0,li=1
-      character*9 tname
-      integer, allocatable :: A1(:),B2(:,:)
-      integer s,cs,erri,i,j,ib,jb
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B2(i,*) WITH A1(k1i*i+li)
-
-
-      tname='align122'
-      allocate (A1(AN1),B2(BN1,BN2))
-      erri= ER
-c      call stralign122 
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri, s)
-!dvm$ region local(A1,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib,jb,j)
-      do i=1,AN1
-          A1(i) = i
-          do j=1,BN2
-             if (  
-     *          ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  )then
-                jb = j
-                ib = (i-li)/k1i
-                B2(ib,jb) = ib*NL+jb
-             endif   
-          enddo 
-      enddo 
-       
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            s = s + B2(i,j)
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-                cs = cs + i*NL+j
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-          write (*,*) erri,s,cs
-      endif 
-      deallocate (B2,A1)
-      end
-C ----------------------------------------------------align123
-c 123			                    ALIGN arrB[][ ] WITH arrA[]	 
-      subroutine align123
-      integer, parameter ::  AN1=16,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB(*,*) WITH arrA[*]                                                
-      integer, parameter ::  k1i=0,k2i=0,li=0
-      character*9 tname
-      integer, allocatable :: A1(:),B2(:,:)
-      integer s,erri,i,j,ib,jb
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B2(*,*) WITH A1(*)
-
-
-      tname='align123'
-      allocate (A1(AN1),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =i*NL+j     
-          enddo
-      enddo 
-
-!dvm$ parallel (i) on A1(i), reduction( min( erri )), private(ib,jb)
-      do i=1,AN1
-        do ib=1,BN1
-          do jb=1,BN2
-            if (B2(ib,jb) .eq.(ib*NL+jb)) then     
-            else
-               erri = min(erri,ib*NL/10+jb)
-            endif 
-          enddo 
-        enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-       
-     
-      if ((erri .eq.ER) 
-     *     ) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-          write (*,*) erri
-      endif
-      deallocate (B2,A1)
-
-      end
-C ------------------------------------------------------------
-
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align21.fdv
deleted file mode 100644
index 095d59e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align21.fdv
+++ /dev/null
@@ -1,299 +0,0 @@
-      program ALIGN21
-
-c    TESTING align CLAUSE .       
-c    arrA2[BLOCK][ BLOCK] arrB1[]
-      print *,'===START OF align21========================'
-C --------------------------------------------------
-c 211       ALIGN arrB[i] WITH arrA[1][i]   vector arrB on section 
-*                                                 (the first line of arrA)
-      call align211
-C -------------------------------------------------
-c 212     ALIGN arrB[i] WITH arrA[2*i+2][2] vector arrB on section 
-*                                       (the second column of arrA) with stretching and shift
-      call align212
-C -------------------------------------------------
-c 213     ALIGN arrB[i] WITH arrA[][i]  vector replication on every line of arrA
-      call align213
-C -------------------------------------------------
-c 214     ALIGN arrB[i] WITH arrA[2*i+2][ ] vector arrB on replication on 
-*                                          every column of arrA with stretching and shift
-      call align214
-C -------------------------------------------------
-C
-C
-      print *,'=== END OF align21 ========================= '    
-      end
-
-C ----------------------------------------------------align211
-c 211 arrA2[BLOCK][ BLOCK]  arrB1[] ALIGN arrB[i] WITH arrA[1][i]vector arrB on section 
-*                                                                   (the first line of arrA)
-      subroutine align211
-      integer, parameter :: AN1=8,AN2=8,BN1=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(1,i)                                                
-      integer, parameter :: k1i=0,k2i=0,li=1,k1j=1,k2j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B1(:)
-      integer erri,i,j,ia,ja,ib,jb
-cdvm$ distribute A2(BLOCK,BLOCK)    
-cdvm$ ALIGN B1(i) WITH A2(1,i)
-
-
-      tname='align211'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B1)
-*dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-*dvm$ parallel (i,j) on A2(i,j), private (ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if ((i .eq. 1) ) then
-                      if ( 
-     *                  (j .le. BN1)  
-     *                  )  then 
-                        ib = j
-                        B1(ib) = ib
-                      endif 
-             endif   
-          enddo 
-      enddo 
-
-*dvm$ parallel (i) on B1(i),reduction( min( erri ) ), private(ia,ja)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-            ia=1
-            ja=i
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-                erri = min(erri,i*NL/10+j)
-            endif 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A2)
-      end
-C ----------------------------------------------------align212
-c 212     ALIGN arrB[i] WITH arrA[2*i+2][2] vector arrB on section 
-*                                       (the second column of arrA) with stretching and shift
-      subroutine align212
-      integer, parameter :: AN1=14,AN2=3,BN1=6,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(k1i*i+li,lj)                                                
-      integer, parameter :: k1i=2,k2i=0,li=2,k1j=0,k2j=0,lj=2
-      character*9 tname
-      integer, allocatable :: A2(:,:),B1(:)
-      integer erri
-         
-cdvm$ distribute A2(BLOCK,BLOCK)
-cdvm$ ALIGN B1(i) WITH A2(k1i*i+li,lj)
-
-      tname='align212'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B1)
-*dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-*dvm$ parallel (i,j) on A2(i,j), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if ((j .eq. lj) .and. 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  
-     *                  )  then 
-               ib = (i-li)/k1i
-               B1(ib) = ib
-             endif   
-          enddo 
-      enddo 
-
-*dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia,ja)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-            ia=k1i*i+li
-            ja=lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-                erri = min(erri,i*NL/10+j)
-            endif 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A2)
-
-      end
-C ----------------------------------------------------align213
-c 213     ALIGN arrB[i] WITH arrA[][i]  vector replication on every line of arrA
-      subroutine align213
-      integer, parameter :: AN1=8,AN2=8,BN1=6,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[][k1j * i + lj]                                                
-      integer, parameter :: k1i=0,k2i=0,li=0,k1j=1,k2j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B1(:)
-      integer s,cs,erri,i,j,ia,ja,ib,jb
-               
-cdvm$ distribute A2(BLOCK,BLOCK)    
-cdvm$ ALIGN B1(i) WITH A2(*,k1j * i + lj)
-
-
-      tname='align213'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-      s=0
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B1)
-*dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i     
-      enddo 
-
-*dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) ), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (
-     *          ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *          (((j-lj)/k1j) .gt. 0)  .and.
-     *          (((j-lj)/k1j) .le. BN1)  )then
-                ib = (j-lj)/k1j
-                if (B1(ib) .eq.(ib)) then     
-                else
-                    erri = min(erri,ib)
-                endif
-             endif   
-          enddo 
-      enddo 
-
-*dvm$ parallel (i) on B1(i), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-            s = s + B1(i)
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = ((1 + BN1)* BN1/ 2)
-c      write (*,*) erri,s,cs
-  
-      if ((erri .eq.ER) .and.
-     *     (s .eq.cs )) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A2)
-
-      end
-C ----------------------------------------------------align214
-c 214     ALIGN arrB[i] WITH arrA[2*i+2][ ] vector arrB on replication on 
-*                                          every column of arrA with stretching and shift
-      subroutine align214
-      integer, parameter :: AN1=28,AN2=8,BN1=5,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(k1i*i+li,*)                                                
-      integer, parameter :: k1i=2,k2i=0,li=2,k1j=0,k2j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B1(:)
-      integer s,erri,i,j,ia,ja,ib,jb
-               
-cdvm$ distribute A2(BLOCK,BLOCK)    
-cdvm$ ALIGN B1(i) WITH A2(k1i*i+li,*)
-
-
-      tname='align214'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-      s=0  
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B1)
-*dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i
-      enddo 
-
-*dvm$ parallel (i,j) on A2(i,j), reduction( min( erri )), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (  
-     *          ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  )then
-                ib = (i-li)/k1i
-                if (B1(ib) .eq.(ib)) then     
-                else
-                    erri = min(erri,ib)
-                endif
-             endif   
-          enddo 
-      enddo 
-
-*dvm$ parallel (i) on B1(i), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-            s = s + B1(i)
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. ((1 + BN1)* BN1/ 2))) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-          write (*,*) erri,s
-      endif 
-      deallocate (B1,A2)
-
-      end
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align22.fdv
deleted file mode 100644
index a3309c3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align22.fdv
+++ /dev/null
@@ -1,598 +0,0 @@
-      program ALIGN22
-
-c    TESTING align CLAUSE .       
-
-      print *,'===START OF align22========================'
-C --------------------------------------------------
-c 221	arrA2[BLOCK][ BLOCK] arrB2[][]	ALIGN arrB[i][j] WITH arrA[i][j]	normal
-      call align221
-C -------------------------------------------------
-c 222		                    	ALIGN arrB[i][j] WITH arrA[i][2*j]	stretching along j
-      call align222
-C -------------------------------------------------
-c 223			                    ALIGN arrB[i][j] WITH arrA[i+4][j]	shift along i
-      call align223
-C -------------------------------------------------
-c 224			                    ALIGN arrB[i][j] WITH arrA[-i+9][j]	reverse on i
-c      call align224
-C -------------------------------------------------
-c 225			                    ALIGN arrB[i][j] WITH arrA[i+4][j+4]shift along i and j
-      call align225
-      call align2251
-C -------------------------------------------------
-c 226			                    ALIGN arrB[i][j] WITH arrA[j][i]	rotation
-      call align226
-C -------------------------------------------------
-c 227			                    ALIGN arrB[i][j] WITH arrA[j+1][i]	rotation and shift
-      call align227
-C -------------------------------------------------
-C
-C
-      print *,'=== END OF align22 ========================= '    
-      end
-
-C ----------------------------------------------------align221
-c 221	arrA2[BLOCK][ BLOCK]	arrB2[][]	ALIGN arrB[i][j] WITH arrA[i][j]	normal
-      subroutine align221
-      integer, parameter :: AN1=8,AN2=8,BN1=8,BN2=8,NL=1000,ER=10000
-      character*9 tname
-      integer, allocatable :: A2(:,:),B2(:,:)
-      integer erri,i,j,ia,ja,ib,jb
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A2(i,j)
-
-
-      tname='align221'
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-  
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             B2(i,j) = i*NL+j
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri )), private(ia,ja)
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-            ia=i
-            ja=j
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-  
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A2)
-      end
-
-
-C ----------------------------------------------------align222
-c 222		                    	ALIGN arrB[i][j] WITH arrA[i][2*j]	stretching along j
-      subroutine align222
-      integer, parameter :: AN1=8,AN2=8,BN1=8,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=0,k1j=0,k2j=2,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B2(:,:)
-      integer erri,i,j,ia,ja,ib,jb              
-
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A2(k1i * i + li,k2j * j + lj)
-
-      tname='align222'
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL
-       
-!dvm$ actual(erri)
-!dvm$ region local(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2))  then 
-                ib = (i-li)/k1i
-                jb = (j-lj)/k2j  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri )), private(ia,ja)
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A2)
-      end
-
-C ----------------------------------------------------align223
-c 223			                    ALIGN arrB[i][j] WITH arrA[i+4][j]	shift along i
-      subroutine align223
-      integer, parameter :: AN1=8,AN2=8,BN1=4,BN2=8,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4,k1j=0,k2j=1,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B2(:,:)
-      integer erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-!dvm$ ALIGN B2(i,j) WITH A2(k1i * i + li,k2j * j + lj)
-
-
-      tname='align223'
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((j-lj)/k2j) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2))  then 
-                ib = (i-li)/k1i
-                jb = (j-lj)/k2j  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri )), private(ia,ja)
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A2)
-      end
-
-C ----------------------------------------------------align224
-c 224			                    ALIGN arrB[i][j] WITH arrA[-i+9][j]	reverse on i
-      subroutine align224
-      integer, parameter :: AN1=8,AN2=8,BN1=8,BN2=8,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=-1,k2i=0,li=9,k1j=0,k2j=1,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B2(:,:)
-      integer erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-!dvm$ ALIGN B2(i,j) WITH A2(k1i * i + li,k2j * j + lj)
-
-
-      tname='align224'
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B2)
-
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((j-lj)/k2j) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2))  then 
-                ib = (i-li)/k1i
-                jb = (j-lj)/k2j  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri )), private(ia,ja)
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A2)
-      end
-
-C ----------------------------------------------------align225
-c 225			                    ALIGN arrB[i][j] WITH arrA[i+4][j+4]shift along i and j
-      subroutine align225
-      integer, parameter :: AN1=8,AN2=8,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4,k1j=0,k2j=1,lj=4
-      character*9 tname
-      integer, allocatable :: A2(:,:),B2(:,:)
-      integer erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-!dvm$ ALIGN B2(i,j) WITH A2(k1i * i + li,k2j * j + lj)
-
-
-      tname='align225'
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((j-lj)/k2j) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2))  then 
-                ib = (i-li)/k1i
-                jb = (j-lj)/k2j  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri )), private(ia,ja)
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A2)
-      end
-C ----------------------------------------------------align2251
-c 2251			                    ALIGN arrB[i][j] WITH arrA[i+1][2*j]shift along i and j
-      subroutine align2251
-      integer, parameter :: AN1=3,AN2=4,BN1=2,BN2=2,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=1,k1j=0,k2j=2,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B2(:,:)
-      integer erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-!dvm$ ALIGN B2(i,j) WITH A2(k1i * i + li,k2j * j + lj)
-
-
-      tname='align2251'
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((j-lj)/k2j) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2))  then 
-                ib = (i-li)/k1i
-                jb = (j-lj)/k2j  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri )), private(ia,ja)
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A2)
-      end
-C ----------------------------------------------------align226
-c 226			                    ALIGN arrB[i][j] WITH arrA[j][i]	rotation
-      subroutine align226
-      integer, parameter :: AN1=4,AN2=4,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k2i * j + li][k1j * i + lj]                                                 
-      integer, parameter :: k1i=0,k2i=1,li=0,k1j=1,k2j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B2(:,:)
-      integer erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A2(k2i * j + li,k1j * i + lj)
-
-
-      tname='align226'
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (((i-li) .eq.(((i-li)/k2i) * k2i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *          (((i-li)/k2i) .gt. 0)  .and.
-     *          (((j-lj)/k1j) .gt. 0)  .and.
-     *          (((i-li)/k2i) .le. BN2)  .and.
-     *          (((j-lj)/k1j) .le. BN1))  then 
-                ib = (j-lj)/k1j
-                jb = (i-li)/k2i  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri )), private(ia,ja)
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-            ia=k2i * j + li
-            ja=k1j * i + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A2)
-      end
-
-
-C ----------------------------------------------------align227
-c 227			                    ALIGN arrB[i][j] WITH arrA[j+1][i]	rotation and shift
-      subroutine align227
-      integer, parameter :: AN1=8,AN2=8,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k2i * j + li][k1j * i + lj]                                                 
-      integer, parameter :: k1i=0,k2i=1,li=1,k1j=1,k2j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B2(:,:)
-      integer erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-!dvm$ ALIGN B2(i,j) WITH A2(k2i * j + li,k1j * i + lj)
-
-      tname='align227'
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (((i-li) .eq.(((i-li)/k2i) * k2i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *          (((i-li)/k2i) .gt. 0)  .and.
-     *          (((j-lj)/k1j) .gt. 0)  .and.
-     *          (((i-li)/k2i) .le. BN2)  .and.
-     *          (((j-lj)/k1j) .le. BN1))  then 
-                ib = (j-lj)/k1j
-                jb = (i-li)/k2i  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri )), private(ia,ja)
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-            ia=k2i * j + li
-            ja=k1j * i + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri)
-  
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A2)
-      end
-
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align24.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align24.fdv
deleted file mode 100644
index aeb4d43..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align24.fdv
+++ /dev/null
@@ -1,536 +0,0 @@
-      program ALIGN24
-
-c    TESTING align CLAUSE .       
-
-      print *,'===START OF align24========================'
-C --------------------------------------------------
-c      call forcat     
-C --------------------------------------------------
-c 241 arrA2[BLOCK][ BLOCK]  arrB4[ ][ ][ ][ ] ALIGN arrB[i][j][][] WITH arrA[i][j]  
-c                                                       matrix compression      
-      call align241
-C -------------------------------------------------
-c 242     ALIGN arrB[ ][ j][][i] WITH arrA[i+4][ 2*j] matrix compression
-      call align2421
-      call align2422
-C -------------------------------------------------
-c 243     ALIGN arrB[ ][ ][i][] WITH arrA[1][i] matrix compression 
-c                                                       and replication     !!
-      call align243
-C -------------------------------------------------
-      print *,'=== END OF align24 ========================'
-      end
-
-C ----------------------------------------------------align241
-c 241 arrA2[BLOCK][ BLOCK]  arrB4[ ][ ][ ][ ] ALIGN arrB[i][j][][] WITH arrA[i][j]  
-c                                                       matrix compression      
-
-      subroutine align241
-      integer, parameter :: AN1=5,AN2=5,BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][][] WITH arrA[k1i*i+li][k2j*j+lj]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B4(i,j,*,*) WITH A2(k1i * i + li,k2j * j + lj)
-
-
-      tname='align241'
-      allocate (A2(AN1,AN2), B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo  
-             enddo  
-          enddo  
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb,n,m,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-                A2(i,j) = i*NL/10 + j
-                do n=1,BN3
-                    do m=1,BN4
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = n
-                        mb = m  
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-                    enddo
-                enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-          write (*,*) erri,s,cs
-          print *,B4  
-      endif 
-      deallocate (B4,A2)
-      end
-
-C ----------------------------------------------------align242
-c 242     ALIGN arrB[ ][ j][][i] WITH arrA[i+4][ 2*j] matrix compression
-
-      subroutine align242
-
-      integer, parameter :: AN1=3,AN2=4,BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for ALIGN arrB[][j][][i] WITH arrA[k1i*i+li][k2j*j+lj]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=1
-      integer, parameter :: k1j=0,k2j=2,k3j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-!dvm$ ALIGN B4(*,j,*,i) WITH A2(k1i * i + li,k2j * j + lj)
-
-      tname='align242'
-      allocate (A2(AN1,AN2), B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo  
-             enddo  
-          enddo  
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb,n,m,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-                A2(i,j) = i*NL/10 + j
-                do n=1,BN1
-                    do m=1,BN3
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN4)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)
-     *                  )  then 
-                        mb = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        ib = n
-                        nb = m  
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-                    enddo
-                enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-c          print *,B4  
-      endif 
-      deallocate (B4,A2)
-
-      end
-
-C ----------------------------------------------------align2421
-c 2421      ALIGN arrB[ ][ i][][j] WITH arrA[j+4][ 2*i] matrix compression
-
-      subroutine align2421
-      integer, parameter :: AN1=12,AN2=9,BN1=4,BN2=4,BN3=4,BN4=4
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for ALIGN arrB[][i][][j] WITH arrA[k2i*j+li][k1j*i+lj]                                               
-      integer, parameter :: k1i=0,k2i=1,k3i=0,li=4
-      integer, parameter :: k1j=2,k2j=0,k3j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-!dvm$ ALIGN B4(*,i,*,j) WITH A2(k2i * j + li,k1j * i + lj)
-
-      tname='align2421'
-      allocate (A2(AN1,AN2), B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo  
-             enddo  
-          enddo  
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb,nb,mb,n,m)
-      do i=1,AN1
-          do j=1,AN2
-                A2(i,j) = i*NL/10 + j
-                do n=1,BN1
-                    do m=1,BN3
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k2i) * k2i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *                  (((i-li)/k2i) .gt. 0)  .and.
-     *                  (((j-lj)/k1j) .gt. 0)  .and.
-     *                  (((i-li)/k2i) .le. BN4)  .and.
-     *                  (((j-lj)/k1j) .le. BN2)
-     *                  )  then 
-                        mb = (i-li)/k2i
-                        jb = (j-lj)/k1j
-                        ib = n
-                        nb = m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-                    enddo
-                enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-c          print *,B4  
-      endif 
-      deallocate (B4,A2)
-
-      end
-
-C ----------------------------------------------------align2422
-c 2422      ALIGN arrB[ ][ i][][j] WITH arrA[j+1][ 2*i] matrix compression
-
-      subroutine align2422
-      integer, parameter :: AN1=3,AN2=4,BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for ALIGN arrB[][i][][j] WITH arrA[k2i*j+li][k1j*i+lj]                                               
-      integer, parameter :: k1i=0,k2i=1,k3i=0,li=1
-      integer, parameter :: k1j=2,k2j=0,k3j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-!dvm$ ALIGN B4(*,i,*,j) WITH A2(k2i * j + li,k1j * i + lj)
-
-
-      tname='align2422'
-      allocate (A2(AN1,AN2), B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo  
-             enddo  
-          enddo  
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb,nb,mb,n,m)
-      do i=1,AN1
-          do j=1,AN2
-                A2(i,j) = i*NL/10 + j
-                do n=1,BN1
-                    do m=1,BN3
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k2i) * k2i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *                  (((i-li)/k2i) .gt. 0)  .and.
-     *                  (((j-lj)/k1j) .gt. 0)  .and.
-     *                  (((i-li)/k2i) .le. BN4)  .and.
-     *                  (((j-lj)/k1j) .le. BN2)
-     *                  )  then 
-                        mb = (i-li)/k2i
-                        jb = (j-lj)/k1j
-                        ib = n
-                        nb = m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-                    enddo
-                enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B4,A2)
-
-      end
-
-C ----------------------------------------------------align243
-c 243     ALIGN arrB[ ][ ][i][] WITH arrA[1][i] matrix compression 
-c                                                       and replication     !!
-
-      subroutine align243
-      integer, parameter :: AN1=3,AN2=4,BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: PN=2,NL=10000,ER=100000
-
-c     parameters for ALIGN arrB[][ ][i][ ] WITH arrA[li][k1j*i+lj]                                               
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=1
-      integer, parameter :: k1j=1,k2j=0,k3j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-!dvm$ ALIGN B4(*,*,i,*) WITH A2(li,k1j * i + lj)
-
-
-      tname='align243'
-      allocate (A2(AN1,AN2), B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo  
-             enddo  
-          enddo  
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb,nb,mb,n,m,k)
-      do i=1,AN1
-          do j=1,AN2
-                A2(i,j) = i*NL/10 + j
-                if (i .eq. (li)) then
-                  do n=1,BN1
-                    do m=1,BN2
-                     do k=1,BN4
-                      if ( 
-     *                  ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *                  (((j-lj)/k1j) .gt. 0)  .and.
-     *                  (((j-lj)/k1j) .le. BN3)
-     *                  )  then 
-                        mb = k
-                        jb = m
-                        ib = n
-                        nb = ((j-lj)/k1j)  
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-                     enddo
-                    enddo
-                  enddo
-                endif
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo 
-            enddo 
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B4,A2)
-
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align32.fdv
deleted file mode 100644
index 7190467..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align32.fdv
+++ /dev/null
@@ -1,390 +0,0 @@
-      program ALIGN32
-
-c    TESTING align CLAUSE .       
-
-      print *,'===START OF align32========================'
-C --------------------------------------------------
-c 321	arrA3[BLOCK][ BLOCK] [ BLOCK]	arrB2[][]	ALIGN arrB[i][j] WITH arrA[i][j][1]	
-c                                                   matrix on section
-      call align321
-C -------------------------------------------------
-c 322			ALIGN arrB[i][j] WITH arrA[j][i][5]	matrix on section with rotation
-      call align322
-C -------------------------------------------------
-c 323			ALIGN arrB[i][j] WITH arrA[j][1][2*i]	matrix on section with 
-c                                                       rotation and stretching
-      call align323
-C -------------------------------------------------
-c 324			ALIGN arrB[i][j] WITH arrA[][i][j]	matrix replication
-      call align324
-C -------------------------------------------------
-      print *,'=== END OF align32 ========================'
-      end
-
-C ----------------------------------------------------align321
-c 321	arrA3[BLOCK][ BLOCK] [ BLOCK]	arrB2[][]	ALIGN arrB[i][j] WITH arrA[i][j][1]	
-c                                                   matrix on section
-
-      subroutine align321
-      integer, parameter :: AN1=5,AN2=5,AN3=5,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj][ln]                                                 
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,ln=1
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B2(:,:)
-      integer s,cs,erri,i,j,n,ia,ja,na,ib,jb,nb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A3(k1i * i + li,k2j * j + lj,ln)
-
-      tname='align321'
-      allocate (A3(AN1,AN2,AN3), B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A3,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n
-                if ( (n .eq. ln ) .and.
-     *              ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *              ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *              (((i-li)/k1i) .gt. 0)  .and.
-     *              (((j-lj)/k2j) .gt. 0)  .and.
-     *              (((i-li)/k1i) .le. BN1)  .and.
-     *              (((j-lj)/k2j) .le. BN2)
-     *              )  then 
-                    ib = (i-li)/k1i
-                    jb = (j-lj)/k2j  
-                    B2(ib,jb) = ib*NL/10 + jb*NL/100 
-                endif 
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri ),sum(s) ),
-!dvm$* private(ia,ja,na)
-      do i=1,BN1
-          do j=1,BN2
-            s = s + B2(i,j)
-            if (B2(i,j) .eq.(i*NL/10 + j*NL/100)) then     
-            else
-               erri = min(erri,i*NL/10 + j*NL/100)
-            endif
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            na = ln 
-            if (A3(ia,ja,na) .eq.(ia*NL/10 + ja*NL/100 + na)) then     
-            else
-               erri = min(erri,ia*NL/10 + ja*NL/100 + na)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-                cs = cs + i*NL/10 + j*NL/100
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-      endif 
-      deallocate (B2,A3)
-
-      end
-
-C ----------------------------------------------------align322
-c 322			ALIGN arrB[i][j] WITH arrA[j][i][5]	matrix on section with rotation
-
-      subroutine align322
-      integer, parameter :: AN1=5,AN2=5,AN3=5,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k2i * j + li][k1j * i + lj][ln]                                                 
-      integer, parameter :: k1i=0,k2i=1,k3i=0,li=0
-      integer, parameter :: k1j=1,k2j=0,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,ln=5
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B2(:,:)
-      integer s,cs,erri,i,j,n,ia,ja,na,ib,jb,nb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A3(k2i * j + li,k1j * i + lj,ln)
-
-
-      tname='align322'
-      allocate (A3(AN1,AN2,AN3), B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A3,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n
-                if ( (n .eq. ln ) .and.
-     *              ((i-li) .eq.(((i-li)/k2i) * k2i)) .and.
-     *              ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *              (((i-li)/k2i) .gt. 0)  .and.
-     *              (((j-lj)/k1j) .gt. 0)  .and.
-     *              (((i-li)/k2i) .le. BN2)  .and.
-     *              (((j-lj)/k1j) .le. BN1)
-     *              )  then 
-                    ib = (j-lj)/k1j
-                    jb = (i-li)/k2i  
-                    B2(ib,jb) = ib*NL/10 + jb*NL/100 
-                endif 
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri ),sum(s) ),
-!dvm$* private(ia,ja,na)
-      do i=1,BN1
-          do j=1,BN2
-            s = s + B2(i,j)
-            if (B2(i,j) .eq.(i*NL/10 + j*NL/100)) then     
-            else
-               erri = min(erri,i*NL/10 + j*NL/100)
-            endif
-            ia=k2i * j + li
-            ja=k1j * i + lj
-            na = ln 
-            if (A3(ia,ja,na) .eq.(ia*NL/10 + ja*NL/100 + na)) then     
-            else
-               erri = min(erri,ia*NL/10 + ja*NL/100 + na)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-                cs = cs + i*NL/10 + j*NL/100
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A3)
-
-      end
-
-C ----------------------------------------------------align323
-c 323			ALIGN arrB[i][j] WITH arrA[j][1][2*i]	matrix on section with 
-c                                                       rotation and stretching
-      subroutine align323
-      integer, parameter :: AN1=5,AN2=2,AN3=8,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k2i * j + li][lj][k1n * i + ln]                                                 
-      integer, parameter :: k1i=0,k2i=1,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=0,k3j=0,lj=1
-      integer, parameter :: k1n=2,k2n=0,k3n=0,ln=0
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B2(:,:)
-      integer s,cs,erri,i,j,n,ia,ja,na,ib,jb,nb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A3(k2i * j + li,lj,k1n * i + ln)
-
-      tname='align323'
-      allocate (A3(AN1,AN2,AN3), B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A3,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =0     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n
-                if ( (j .eq. lj ) .and.
-     *              ((i-li) .eq.(((i-li)/k2i) * k2i)) .and.
-     *              ((n-ln) .eq.(((n-ln)/k1n) *k1n)) .and.
-     *              (((i-li)/k2i) .gt. 0)  .and.
-     *              (((n-ln)/k1n) .gt. 0)  .and.
-     *              (((i-li)/k2i) .le. BN2)  .and.
-     *              (((n-ln)/k1n) .le. BN1)
-     *              )  then 
-                    ib = (n-ln)/k1n
-                    jb = (i-li)/k2i  
-                    B2(ib,jb) = ib*NL/10 + jb*NL/100 
-                endif 
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri ),sum(s) ),
-!dvm$* private(ia,ja,na)
-      do i=1,BN1
-          do j=1,BN2
-            s = s + B2(i,j)
-            if (B2(i,j) .eq.(i*NL/10 + j*NL/100)) then     
-            else
-               erri = min(erri,i*NL/10 + j*NL/100)
-            endif
-            ia=k2i * j + li
-            ja=lj
-            na = k1n * i + ln 
-            if (A3(ia,ja,na) .eq.(ia*NL/10 + ja*NL/100 + na)) then     
-            else
-               erri = min(erri,ia*NL/10 + ja*NL/100 + na)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-                cs = cs + i*NL/10 + j*NL/100
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-      endif 
-      deallocate (B2,A3)
-
-      end
-C ----------------------------------------------------align324
-c 324			ALIGN arrB[i][j] WITH arrA[][i][j]	matrix replication
-      subroutine align324
-      integer, parameter :: AN1=4,AN2=6,AN3=6,BN1=4,BN2=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[*,k1j * i + lj,k2n * j + ln]                                                 
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=1,k2j=0,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=1,k3n=0,ln=0
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B2(:,:)
-      integer s,cs,erri,i,j,n,ia,ja,na,ib,jb,nb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B2(i,j) WITH A3(*,k1j * i + lj,k2n * j + ln)
-
-
-      tname='align324'
-      allocate (A3(AN1,AN2,AN3), B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A3,B2)
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =i*NL/10 + j*NL/100     
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) ),
-!dvm$* private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n
-                if ( 
-     *              ((j-lj) .eq.(((j-lj)/k1j) * k1j)) .and.
-     *              ((n-ln) .eq.(((n-ln)/k2n) *k2n)) .and.
-     *              (((j-lj)/k1j) .gt. 0)  .and.
-     *              (((n-ln)/k2n) .gt. 0)  .and.
-     *              (((j-lj)/k1j) .le. BN1)  .and.
-     *              (((n-ln)/k2n) .le. BN2)
-     *              )  then 
-                    jb = (n-ln)/k2n
-                    ib = (j-lj)/k1j  
-                    if (B2(ib,jb) .eq.(ib*NL/10 + jb*NL/100)) then     
-                    else
-                        erri = ib*NL/10 + jb*NL/100
-                    endif
-                endif 
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            s = s + B2(i,j)
-            if (B2(i,j) .eq.(i*NL/10 + j*NL/100)) then     
-            else
-               erri = min(erri,i*NL/10 + j*NL/100)
-            endif
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-                cs = cs + i*NL/10 + j*NL/100
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B2,A3)
-
-      end
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align33.fdv
deleted file mode 100644
index 945671d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align33.fdv
+++ /dev/null
@@ -1,120 +0,0 @@
-      program ALIGN33
-
-c    TESTING align CLAUSE .       
-
-      print *,'===START OF align33========================'
-C --------------------------------------------------
-c 331 arrA3[BLOCK][BLOCK] [BLOCK]  arrB3[][][]
-c       ALIGN arrB[i][j][k] WITH arrA[i][ j][k] normal      
-        call align331
-C -------------------------------------------------
-C
-      print *,'=== END OF align33 ========================= '    
-      end
-
-C ----------------------------------------------------align331
-c 331 arrA3[BLOCK][BLOCK] [BLOCK]  arrB3[][][] 
-c       ALIGN arrB[i][j][n] WITH arrA[i][ j][n] normal      
-
-      subroutine align331
-      integer, parameter :: AN1=5,AN2=5,AN3=5,BN1=2,BN2=2,BN3=2
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(k1i*i+li,k2j*j+lj,k3n*n+ln)
-
-      tname='align331'
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-      s=0
-      m=-1
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do  j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =0     
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb,nb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10+j*NL/100+n*NL/1000+m
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        B3(ib,jb,nb)=ib*NL/10+jb*NL/100+nb*NL/1000 
-                      endif 
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on B3(i,j,n), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                  s = s + B3(i,j,n)
-                  if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000))then     
-                  else
-                      erri = min(erri, i*NL/10 + j*NL/100+ n*NL/1000)
-                  endif
-            enddo 
-          enddo 
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000
-            enddo 
-          enddo 
-      enddo 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri,s,cs
-c          print *,B3  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align44.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align44.fdv
deleted file mode 100644
index d8f2f75..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/align44.fdv
+++ /dev/null
@@ -1,926 +0,0 @@
-      program ALIGN44
-	
-c    TESTING align CLAUSE .       
-
-      print *,'===START OF align44========================'
-C --------------------------------------------------
-c 441 arrA4[BLOCK][BLOCK] [BLOCK] [BLOCK] arrB4[][][][] 
-c       ALIGN arrB[i][j][k][l] WITH arrA[i][ j][k][l] normal      
-       call align441
-C -------------------------------------------------
-c 442     ALIGN arrB[i][j][k][l] WITH arrA[l][i][j][k]  rotation
-       call align442
-C -------------------------------------------------
-c 443     ALIGN arrB[i][j][k][l] WITH arrA[i][2* j][k][3*l] stretching
-       call align443
-C -------------------------------------------------
-c 444     ALIGN arrB[i][j][k][l] WITH arrA[i+2][ j][k][ l+3]  shift
-       call align444
-C -------------------------------------------------
-c 445     ALIGN arrB[i][j][k][l] WITH arrA[i][ j][-k+8][- l+8]  reverse
-c      call align445
-C -------------------------------------------------
-c 446     ALIGN arrB[i][j][ ][l] WITH arrA[i][ j][2][ l]  
-c                                               compression and replication            
-       call align446
-C -------------------------------------------------
-c 447     ALIGN arrB[][j][k][i] WITH arrA[i][ j][ ][ k] 
-c                                               compression and replication            
-      call align447
-C -------------------------------------------------
-c 448     ALIGN arrB[][i][j][] WITH arrA[i][ j][1][3] 
-c                                               compression and replication            
-      call align448
-C -------------------------------------------------
-C
-      print *,'=== END OF align44 ========================= '    
-      end
-
-C ----------------------------------------------------align441
-c 441 arrA4[BLOCK][BLOCK] [BLOCK] [BLOCK] arrB4[][][][] 
-c       ALIGN arrB[i][j][n][m] WITH arrA[i][ j][n][m] normal      
-
-      subroutine align441
-      integer, parameter :: AN1=5,AN2=5,AN3=5,AN4=5
-      integer, parameter :: BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA[k1i*i+li][k2j*j+lj]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)
-
-
-      tname='align441'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo 
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(ib,jb,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k4m) *k4m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((m-lm)/k4m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  .and.
-     *                  (((m-lm)/k4m) .le. BN4)
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        mb = (m-lm)/k4m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-              enddo
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-               do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo
-            enddo
-          enddo
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri,s,cs
-c          print *,B4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------align442
-c 442     ALIGN arrB[i][j][k][l] WITH arrA[l][i][j][k]  rotation
-
-      subroutine align442
-      integer, parameter :: AN1=4,AN2=4,AN3=4,AN4=4
-      integer, parameter :: BN1=4,BN2=4,BN3=4,BN4=4
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA4(k4i*n+li,k1j*i+lj,k2n*j+ln,k3m*n+lm)                                              
-      integer, parameter :: k1i=0,k2i=0,k3i=0,k4i=1,li=0
-      integer, parameter :: k1j=1,k2j=0,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=1,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=1,k4m=0,lm=0
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k4i*m+li,k1j*i+lj,k2n*j+ln,k3m*n+lm)
-
-
-      tname='align442'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo 
-             enddo 
-          enddo 
-      enddo 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(ib,jb,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k4i) * k4i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k2n) * k2n)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k3m) *k3m)) .and.
-     *                  (((i-li)/k4i) .gt. 0)  .and.
-     *                  (((j-lj)/k1j) .gt. 0)  .and.
-     *                  (((n-ln)/k2n) .gt. 0)  .and.
-     *                  (((m-lm)/k3m) .gt. 0)  .and.
-     *                  (((i-li)/k4i) .le. BN4)  .and.
-     *                  (((j-lj)/k1j) .le. BN1)  .and.
-     *                  (((n-ln)/k2n) .le. BN2)  .and.
-     *                  (((m-lm)/k3m) .le. BN3)
-     *                  )  then 
-                        mb = (i-li)/k4i
-                        ib = (j-lj)/k1j
-                        jb = (n-ln)/k2n
-                        nb = (m-lm)/k3m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-              enddo
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo
-            enddo
-          enddo
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-c          print *,B4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------align443
-c 443     ALIGN arrB[i][j][k][l] WITH arrA[i][2* j][k][3*l] stretching
-
-      subroutine align443
-      integer, parameter :: AN1=3,AN2=4,AN3=3,AN4=6
-      integer, parameter :: BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=2,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=3,lm=0
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)
-
-      tname='align443'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo 
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(ib,jb,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k4m) *k4m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((m-lm)/k4m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  .and.
-     *                  (((m-lm)/k4m) .le. BN4)
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        mb = (m-lm)/k4m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-              enddo
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo
-            enddo
-          enddo
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-c          print *,B4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------align444
-c 444     ALIGN arrB[i][j][k][l] WITH arrA[i+2][ j][k][ l+3]  shift
-
-      subroutine align444
-      integer, parameter :: AN1=4,AN2=4,AN3=3,AN4=6
-      integer, parameter :: BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=3
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)
-
-
-      tname='align444'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s = 0
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo 
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(ib,jb,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k4m) *k4m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((m-lm)/k4m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  .and.
-     *                  (((m-lm)/k4m) .le. BN4)
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        mb = (m-lm)/k4m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-              enddo
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo
-            enddo
-          enddo
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-c          print *,B4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------align445
-c 445     ALIGN arrB[i][j][k][l] WITH arrA[i][ j][-k+4][- l+3]  reverse
-
-      subroutine align445
-      integer, parameter :: AN1=4,AN2=4,AN3=8,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=2
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=-1,k4n=0,ln=4
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=-1,lm=3
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)
-
-
-      tname='align445'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo 
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(ib,jb,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k4m) *k4m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((m-lm)/k4m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  .and.
-     *                  (((m-lm)/k4m) .le. BN4)
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        mb = (m-lm)/k4m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-              enddo
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo
-            enddo
-          enddo
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-c          print *,B4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------align446
-c 446     ALIGN arrB[i][j][ ][l] WITH arrA[i][ j][2][ l]  
-c                                               compression and replication            !!
-
-      subroutine align446
-      integer, parameter :: AN1=4,AN2=4,AN3=4,AN4=4
-      integer, parameter :: BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][*][m] WITH arrA4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm)                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=2
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,*,m) WITH A4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm)
-
-
-      tname='align446'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo 
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(k,ib,jb,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                  if (n .eq. ln ) then
-                    do k = 1,BN3
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k4m) *k4m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((m-lm)/k4m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((m-lm)/k4m) .le. BN4)
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = k
-                        mb = (m-lm)/k4m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif
-                   enddo 
-                 endif
-              enddo
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo
-            enddo
-          enddo
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-c          print *,B4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------align447
-c 447     ALIGN arrB[][j][k][i] WITH arrA[i][ j][ ][ k] 
-c                                               compression and replication            !!
-
-      subroutine align447
-      integer, parameter :: AN1=4,AN2=4,AN3=4,AN4=4
-      integer, parameter :: BN1=4,BN2=4,BN3=4,BN4=4
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[*][j][n][i] WITH arrA4(k1i*i+li,k2j*j+lj,*,k3m*n+lm)
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=1,k4m=0,lm=0
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(*,j,n,i) WITH A4(k1i*i+li,k2j*j+lj,*,k3m*n+lm)
-
-      tname='align447'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo 
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(k,ib,jb,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                    do k = 1,BN1
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k3m) *k3m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((m-lm)/k3m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN4)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((m-lm)/k3m) .le. BN3)
-     *                  )  then 
-                        mb = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        ib = k
-                        nb = (m-lm)/k3m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-                   enddo 
-              enddo
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo
-            enddo
-          enddo
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-   
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-          write (*,*) erri,s,cs
-          print *,B4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-C ----------------------------------------------------align448
-c 448     ALIGN arrB[][i][j][] WITH arrA[i][ j][1][3] 
-c                                               compression and replication            
-
-      subroutine align448
-      integer, parameter :: AN1=4,AN2=4,AN3=4,AN4=4
-      integer, parameter :: BN1=4,BN2=4,BN3=4,BN4=4
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[*][i][j][*] WITH arrA4(k1i*i+li,k2j*j+lj,ln,lm)                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=1
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=0,lm=3
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(*,i,j,*) WITH A4(k1i*i+li,k2j*j+lj,ln,lm)
-
-      tname='align448'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =0     
-                enddo 
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(k,l,ib,jb,nb,mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                  if ((n .eq. ln ) .and. (m .eq. lm)) then
-                    do k = 1,BN1
-                    do l = 1,BN4
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN2)  .and.
-     *                  (((j-lj)/k2j) .le. BN3)  
-     *                  )  then 
-                        jb = (i-li)/k1i
-                        nb = (j-lj)/k2j
-                        ib = k
-                        mb = l
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-                   enddo 
-                   enddo 
-                 endif
-              enddo
-            enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                  endif
-                enddo
-            enddo
-          enddo
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(erri,s)
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c          write (*,*) erri,s,cs
-c          print *,B4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignfloat11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignfloat11.fdv
deleted file mode 100644
index ac8850f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignfloat11.fdv
+++ /dev/null
@@ -1,449 +0,0 @@
-      program ALIGNFLOAT11
-
-c    TESTING align CLAUSE .       
-
-      print *,'===START OF alignfloat11========================'
-C --------------------------------------------------
-c 111 arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[i]  normal 
-      call align111
-C --------------------------------------------------
-c 1111  arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[i]  small array 
-      call align1111
-C --------------------------------------------------
-c 1112  arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[2*i+1]  small array 
-      call align1112
-C --------------------------------------------------
-c 112                         ALIGN arrB[i] WITH arrA[i+4]  shift along i 
-      call align112
-C --------------------------------------------------
-c 113                         ALIGN arrB[i] WITH arrA[-i+9] reverse on i
-c      call align113
-C --------------------------------------------------
-c 114                         ALIGN arrB[i] WITH arrA[2*i+8]  stretching along i
-      call align114
-C --------------------------------------------------
-c 115                             ALIGN arrB[*] WITH arrA[*]   
-      call align115
-C --------------------------------------------------
-C
-C
-      print *,'=== END OF alignfloat11 ========================= '    
-      end
-
-C ----------------------------------------------------align111
-c 111 arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[i]  normal 
-      subroutine align111
-      integer, parameter :: AN1=8,BN1=8,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=0
-      character*9 tname
-      integer, allocatable :: A1(:)
-      real, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align111'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri)   
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align1111
-c 1111  arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[i]  small array 
-      subroutine align1111
-      integer, parameter :: AN1=5,BN1=2,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=0
-      character*9 tname
-      real, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align1111'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-c      call stralign1111 
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align1112
-c 1112  arrA1[BLOCK]  arrB1[ ]  ALIGN arrB[i] WITH arrA[2*i+1]  small array 
-      subroutine align1112
-      integer, parameter :: AN1=5,BN1=2,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=2,k2i=0,li=1
-      character*9 tname
-      complex, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align1112'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align112
-c 112                         ALIGN arrB[i] WITH arrA[i+4]  shift along i 
-      subroutine align112
-      integer, parameter :: AN1=8,BN1=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4
-      character*9 tname
-      real, allocatable :: B1(:)
-      complex, allocatable ::  A1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align112'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align113
-c 113     ALIGN arrB[i] WITH arrA[-i+9] reverse on i
-      subroutine align113
-      integer, parameter :: AN1=8,BN1=8,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=-1,k2i=0,li=9
-      character*9 tname
-      real, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align113'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align114
-c 114     ALIGN arrB[i] WITH arrA[2*i+8]  stretching along i
-      subroutine align114
-      integer, parameter :: AN1=24,BN1=8,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=2,k2i=0,li=8
-      character*9 tname
-      integer, allocatable :: A1(:)
-      complex, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-
-      tname='align114'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C ----------------------------------------------------align115
-c 115                             ALIGN arrB[*] WITH arrA[*]   
-      subroutine align115
-      integer, parameter :: AN1=24,BN1=8,NL=1000,ER=10000
-c     parameters for ALIGN arrB[*] WITH arrA[*]                                                 
-      integer, parameter :: k1i=0,k2i=0,li=0
-      character*9 tname
-      integer, allocatable :: A1(:)
-      real, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(*) WITH A1(*)
-
-      tname='align115'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i     
-      enddo 
-
-!dvm$ parallel (i) on A1(i), reduction(min(erri)), private(j)
-      do i=1,AN1
-        do j=1,BN1
-            if (B1(j) .eq.(j)) then     
-            else
-               erri = min(erri,j)
-            endif 
-        enddo 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus21.fdv
deleted file mode 100644
index 95d8a09..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus21.fdv
+++ /dev/null
@@ -1,569 +0,0 @@
-      program ALIGNPLUS21
-
-c    TESTING align CLAUSE .       
-c    arrA2[*][ BLOCK] arrB1[]
-c    or arrA2[ BLOCK][*] arrB1[]
-      print *, '===START OF alignplus21=================='
-C --------------------------------------------------
-c 211       ALIGN arrB[i] WITH arrA[1][i]   vector arrB on section 
-*                                                 (the first line of arrA)
-      call align211
-C -------------------------------------------------
-c 212     ALIGN arrB[i] WITH arrA[2*i+2][2] vector arrB on section 
-*                                       (the second column of arrA) with stretching and shift
-      call align212
-C -------------------------------------------------
-c 213     ALIGN arrB[i] WITH arrA[][i]  vector replication on every line of arrA
-      call align213
-C -------------------------------------------------
-c 214     ALIGN arrB[i] WITH arrA[2*i+2][ ] vector arrB on replication on 
-*                                          every column of arrA with stretching and shift
-      call align214
-C --------------------------------------------------
-c 215       ALIGN arrB[i] WITH arrA[1][i]   vector arrB on section 
-*                                                 (the first line of arrA)
-      call align215
-C -------------------------------------------------
-c 216     ALIGN arrB[i] WITH arrA[2*i+2][2] vector arrB on section 
-*                                       (the second column of arrA) with stretching and shift
-      call align216
-C -------------------------------------------------
-c 217     ALIGN arrB[i] WITH arrA[][i]  vector replication on every line of arrA
-      call align217
-C -------------------------------------------------
-c 218     ALIGN arrB[i] WITH arrA[2*i+2][ ] vector arrB on replication on 
-*                                          every column of arrA with stretching and shift
-      call align218
-C -------------------------------------------------
-      print *, '=== END OF alignplus21 =================='
-C
-C
-      end
-
-C ----------------------------------------------------align211
-c 211 arrA2[*][ BLOCK]  arrB1[] ALIGN arrB[i] WITH arrA[1][i]vector arrB on section 
-*                                                                   (the first line of arrA)
-      subroutine align211
-      integer, parameter :: AN1=8,AN2=8,BN1=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(1,i)                                                
-      character*9 tname
-      integer, allocatable :: A2(:,:), B1(:)
-      integer erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(*,BLOCK)    
-!dvm$ ALIGN B1(i) WITH A2(1,i)
-
-      tname='align211'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if ((i .eq. 1) ) then
-                      if ( 
-     *                  (j .le. BN1)  
-     *                  )  then 
-                        ib = j
-                        B1(ib) = ib
-                      endif 
-             endif   
-          enddo 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia,ja)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-            ia=1
-            ja=i
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-                erri = i*NL/10+j
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A2)
-
-      end
-C ----------------------------------------------------align212
-c 212     ALIGN arrB[i] WITH arrA[2*i+2][2] vector arrB on section 
-*                                       (the second column of arrA) with stretching and shift
-      subroutine align212
-      integer, parameter :: AN1=14,AN2=3,BN1=6,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(k1i*i+li,lj)                                                
-      integer, parameter :: k1i=2,k2i=0,li=2,k1j=0,k2j=0,lj=2
-      character*9 tname
-      integer, allocatable :: A2(:,:), B1(:)
-      integer :: erri, i
-               
-!dvm$ distribute A2(*,BLOCK)    
-!dvm$ ALIGN B1(i) WITH A2(k1i*i+li,lj)
-
-      tname='align212'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if ((j .eq. lj) .and. 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  
-     *                  )  then 
-               ib = (i-li)/k1i
-               B1(ib) = ib
-             endif   
-          enddo 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia,ja)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-            ia=k1i*i+li
-            ja=lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-                erri = min(erri,i*NL/10+j)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A2)
-
-      end
-C ----------------------------------------------------align213
-c 213     ALIGN arrB[i] WITH arrA[][i]  vector replication on every line of arrA
-      subroutine align213
-      integer, parameter :: AN1=8,AN2=8,BN1=6,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[][k1j * i + lj]                                                
-      integer, parameter :: k1i=0,k2i=0,li=0,k1j=1,k2j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:), B1(:)
-      integer s,cs,erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(*,BLOCK)    
-!dvm$ ALIGN B1(i) WITH A2(*,k1j * i + lj)
-
-      tname='align213'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-      s=0
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i     
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) ), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (
-     *          ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *          (((j-lj)/k1j) .gt. 0)  .and.
-     *          (((j-lj)/k1j) .le. BN1)  )then
-                ib = (j-lj)/k1j
-                if (B1(ib) .eq.(ib)) then     
-                else
-                    erri = min(erri,ib)
-                endif
-             endif   
-          enddo 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-            s = s + B1(i)
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri,s) 
-  
-      cs = ((1 + BN1)* BN1/ 2)
-c      write (*,*) erri,s,cs
-  
-      if ((erri .eq.ER) .and.
-     *     (s .eq.cs )) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A2)
-
-      end
-C ----------------------------------------------------align214
-c 214     ALIGN arrB[i] WITH arrA[2*i+2][ ] vector arrB on replication on 
-*                                          every column of arrA with stretching and shift
-      subroutine align214
-      integer, parameter :: AN1=28,AN2=8,BN1=5,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(k1i*i+li,*)                                                
-      integer, parameter :: k1i=2,k2i=0,li=2,k1j=0,k2j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:), B1(:)
-      integer s,erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(*,BLOCK)    
-!dvm$ ALIGN B1(i) WITH A2(k1i*i+li,*)
-
-      tname='align214'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-      s=0  
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri )), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (  
-     *          ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  )then
-                ib = (i-li)/k1i
-                if (B1(ib) .eq.(ib)) then     
-                else
-                    erri = min(erri,ib)
-                endif
-             endif   
-          enddo 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-            s = s + B1(i)
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri,s) 
-
-      if ((erri .eq.ER) .and.
-     *     (s .eq. ((1 + BN1)* BN1/ 2))) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-          write (*,*) erri,s
-      endif 
-      deallocate(B1,A2)
-      end
-C ----------------------------------------------------align215
-c 215 arrA2[*][ BLOCK]  arrB1[] ALIGN arrB[i] WITH arrA[1][i]vector arrB on section 
-*                                                                   (the first line of arrA)
-      subroutine align215
-      integer, parameter :: AN1=8,AN2=8,BN1=4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(1,i)                                                
-      character*9 tname
-      integer, allocatable :: A2(:,:), B1(:)
-      integer erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(BLOCK,*)    
-!dvm$ ALIGN B1(i) WITH A2(1,i)
-
-      tname='align215'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if ((i .eq. 1) ) then
-                      if ( 
-     *                  (j .le. BN1)  
-     *                  )  then 
-                        ib = j
-                        B1(ib) = ib
-                      endif 
-             endif   
-          enddo 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia,ja)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-            ia=1
-            ja=i
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-                erri = min(erri,i*NL/10+j)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-  
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A2)
-
-      end
-C ----------------------------------------------------align216
-c 216     ALIGN arrB[i] WITH arrA[2*i+2][2] vector arrB on section 
-*                                       (the second column of arrA) with stretching and shift
-      subroutine align216
-      integer, parameter :: AN1=14,AN2=3,BN1=6,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(k1i*i+li,lj)                                                
-      integer, parameter :: k1i=2,k2i=0,li=2,k1j=0,k2j=0,lj=2
-      character*9 tname
-      integer, allocatable :: A2(:,:), B1(:)
-      integer :: erri, i
-               
-!dvm$ distribute A2(BLOCK,*)   
-!dvm$ ALIGN B1(i) WITH A2(k1i*i+li,lj)
-
-      tname='align216'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =0     
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if ((j .eq. lj) .and. 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  
-     *                  )  then 
-               ib = (i-li)/k1i
-               B1(ib) = ib
-             endif   
-          enddo 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ) ), private(ia,ja)
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-            ia=k1i*i+li
-            ja=lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-                erri = min(erri,i*NL/10+j)
-            endif 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-  
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A2)
-
-      end
-C ----------------------------------------------------align217
-c 217     ALIGN arrB[i] WITH arrA[][i]  vector replication on every line of arrA
-      subroutine align217
-      integer, parameter :: AN1=8,AN2=8,BN1=6,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[][k1j * i + lj]                                                
-      integer, parameter :: k1i=0,k2i=0,li=0,k1j=1,k2j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:), B1(:)
-      integer s,cs,erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(BLOCK,*)    
-!dvm$ ALIGN B1(i) WITH A2(*,k1j * i + lj)
-
-      tname='align217'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-      s=0
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i     
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) ), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (
-     *          ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *          (((j-lj)/k1j) .gt. 0)  .and.
-     *          (((j-lj)/k1j) .le. BN1)  )then
-                ib = (j-lj)/k1j
-                if (B1(ib) .eq.(ib)) then     
-                else
-                    erri = min(erri,ib)
-                endif
-             endif   
-          enddo 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-            s = s + B1(i)
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri,s) 
-  
-      cs = ((1 + BN1)* BN1/ 2)
-      if ((erri .eq.ER) .and.
-     *     (s .eq.cs )) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A2)
-
-      end
-C ----------------------------------------------------align218
-c 218     ALIGN arrB[i] WITH arrA[2*i+2][ ] vector arrB on replication on 
-*                                          every column of arrA with stretching and shift
-      subroutine align218
-      integer, parameter :: AN1=28,AN2=8,BN1=5,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(k1i*i+li,*)                                                
-      integer, parameter :: k1i=2,k2i=0,li=2,k1j=0,k2j=0,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:), B1(:)
-      integer s,erri,i,j,ia,ja,ib,jb
-               
-!dvm$ distribute A2(BLOCK,*)    
-!dvm$ ALIGN B1(i) WITH A2(k1i*i+li,*)
-
-      tname='align218'
-      allocate (A2(AN1,AN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-      s=0  
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A2,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i
-      enddo 
-
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri )), private(ib)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (  
-     *          ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  )then
-                ib = (i-li)/k1i
-                if (B1(ib) .eq.(ib)) then     
-                else
-                    erri = min(erri,ib)
-                endif
-             endif   
-          enddo 
-      enddo 
-
-!dvm$ parallel (i) on B1(i), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-            s = s + B1(i)
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri,s) 
-
-      if ((erri .eq.ER) .and.
-     *     (s .eq. ((1 + BN1)* BN1/ 2))) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-          write (*,*) erri,s
-      endif 
-      deallocate (B1,A2)
-
-      end
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end  
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus33.fdv
deleted file mode 100644
index 4a1c6e8..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/ALIGN/alignplus33.fdv
+++ /dev/null
@@ -1,478 +0,0 @@
-      program ALIGNPLUS33
-
-c    TESTING align CLAUSE .       
-
-      print *, '====START OF alignplus33================'
-c --------------------------------------------------
-c 331 arrA3[*][BLOCK] [BLOCK]  arrB3[][][]
-c       ALIGN arrB[i][j][k] WITH arrA[i][ j][k] normal      
-       call align331
-C --------------------------------------------------
-c 332 arrA3[*][BLOCK] [BLOCK]  arrB3[][][]
-c       ALIGN arrB[*][i][*] WITH arrA[*][ 3][i]       
-       call align332
-c --------------------------------------------------
-c 333 arrA3[BLOCK][*] [BLOCK]  arrB3[][][]
-c       ALIGN arrB[i][j][k] WITH arrA[i+4][2*j+1][3*k+1]       
-C       call align333
-C --------------------------------------------------
-c 334 arrA3[BLOCK][BLOCK] [*]  arrB3[][][]
-c       ALIGN arrB[*][i][*] WITH arrA[*][ 7][2*i-1]       
-       call align334
-C --------------------------------------------------
-c 335 arrA3[BLOCK][*] [BLOCK]  arrB3[][][]
-c       ALIGN arrB[*][i][*] WITH arrA[*][ 1][i]       
-       call align335
-C -------------------------------------------------
-      print *, '==== END OF alignplus33 ================'
-C
-      end
-
-C ----------------------------------------------------align331
-c 331 arrA3[*][BLOCK] [BLOCK]  arrB3[][][]
-c       ALIGN arrB[i][j][n] WITH arrA[i][ j][n] normal      
-
-      subroutine align331
-      integer, parameter :: AN1=5,AN2=5,AN3=5,BN1=2,BN2=2,BN3=2
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-cdvm$ distribute A3(*,BLOCK,BLOCK)    
-cdvm$ ALIGN B3(i,j,n) WITH A3(k1i*i+li,k2j*j+lj,k3n*n+ln)
-
-      tname='align331'
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-      s=0
-      m=-1
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A3,B3)
-*dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =0     
-             enddo 
-          enddo 
-      enddo 
-
-*dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb,nb)
-      do i=1,AN1
-         do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10+j*NL/100+n*NL/1000+m
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        B3(ib,jb,nb)=ib*NL/10+jb*NL/100+nb*NL/1000 
-                      endif 
-            enddo 
-          enddo 
-      enddo 
-
-*dvm$ parallel (i,j,n) on B3(i,j,n), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                  s = s + B3(i,j,n)
-                  if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000)
-                  endif
-            enddo
-          enddo 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri,s) 
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri,s,cs
-c          print *,B3  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------align332
-c 332 arrA3[*][BLOCK] [BLOCK]  arrB3[][][]
-c       ALIGN arrB[*][i][*] WITH arrA[*][ 3][i] normal      
-
-      subroutine align332
-      integer, parameter :: AN1=4,AN2=4,AN3=4,BN1=2,BN2=2,BN3=2
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for ALIGN arrB[*][i][*] WITH arrA[*][lj][k1n*i+ln]                                               
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=0,k3j=0,lj=3
-      integer, parameter :: k1n=1,k2n=0,k3n=0,ln=0
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,k,l,ia,ja,na,ma,ib,jb,nb,mb,
-     * Avalue,Bvalue
-               
-cdvm$ distribute A3(*,BLOCK,BLOCK)    
-cdvm$ ALIGN B3(*,i,*) WITH A3(*,lj,k1n*i+ln)
-
-      tname='align332'
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-*dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(k,l,ib,jb,nb),
-!dvm$& reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10+j*NL/100+n*NL/1000
-                  if ((j .eq. lj ) ) then
-                    do k = 1,BN1
-                    do l = 1,BN3
-                      if ( 
-     *                  ((n-ln) .eq.(((n-ln)/k1n) * k1n)) .and.
-     *                  (((n-ln)/k1n) .gt. 0)  .and.
-     *                  (((n-ln)/k1n) .le. BN2)  
-     *                  )  then 
-                        ib = k
-                        jb = ((n-ln)/k1n)
-                        nb = l
-                        if (B3(ib,jb,nb).eq.
-     *                      (ib*NL/10+jb*NL/100+nb*NL/1000))then     
-                        else
-                        erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000)
-                        endif
-                      endif 
-                   enddo 
-                   enddo 
-                 endif
-            enddo 
-          enddo 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-
-      cs=0  
-      s=0 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri,s,cs
-c          print *,B3  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------align333
-c 333 arrA3[BLOCK][*] [BLOCK]  arrB3[][][]
-c       ALIGN arrB[i][j][k] WITH arrA[i+4][2*j+1][3*k+1]       
-
-      subroutine align333
-      integer, parameter :: AN1=8,AN2=8,AN3=13,BN1=4,BN2=3,BN3=4
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=4
-      integer, parameter :: k1j=0,k2j=2,k3j=0,lj=1
-      integer, parameter :: k1n=0,k2n=0,k3n=3,ln=1
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-cdvm$ distribute A3(BLOCK,*,BLOCK)    
-cdvm$ ALIGN B3(i,j,n) WITH A3(k1i*i+li,k2j*j+lj,k3n*n+ln)
-
-      tname='align333'
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-      s=0 
-
-!dvm$ actual(erri,s)
-!dvm$ region local(A3,B3)
-*dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =0     
-             enddo 
-          enddo 
-      enddo 
-
-*dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb,nb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10+j*NL/100+n*NL/1000+m
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        B3(ib,jb,nb)=ib*NL/10+jb*NL/100+nb*NL/1000 
-                      endif 
-            enddo 
-          enddo 
-      enddo 
-
-*dvm$ parallel (i,j,n) on B3(i,j,n), reduction( min( erri ),sum(s) )
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                  s = s + B3(i,j,n)
-                  if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000))then     
-                  else
-                      erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000)
-                  endif
-            enddo
-          enddo
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri,s) 
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000
-            enddo
-          enddo
-      enddo
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri,s,cs
-c          print *,B3  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------align334
-c 334 arrA3[BLOCK][BLOCK] [*]  arrB3[][][]
-c       ALIGN arrB[*][i][*] WITH arrA[*][ 7][2*i-1]       
-
-      subroutine align334
-      integer, parameter :: AN1=5,AN2=7,AN3=9,BN1=4,BN2=3,BN3=5
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for ALIGN arrB[*][i][*] WITH arrA[*][lj][k1n*i+ln]                                               
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=0,k3j=0,lj=7
-      integer, parameter :: k1n=2,k2n=0,k3n=0,ln=-1
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,k,l,ia,ja,na,ma,ib,jb,nb,mb,
-     * Avalue,Bvalue
-               
-cdvm$ distribute A3(BLOCK,BLOCK,*)    
-cdvm$ ALIGN B3(*,i,*) WITH A3(*,lj,k1n*i+ln)
-
-      tname='align334'
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-*dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(k,l,ib,jb,nb),
-!dvm$& reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10+j*NL/100+n*NL/1000
-                  if ((j .eq. lj ) ) then
-                    do k = 1,BN1
-                    do l = 1,BN3
-                      if ( 
-     *                  ((n-ln) .eq.(((n-ln)/k1n) * k1n)) .and.
-     *                  (((n-ln)/k1n) .gt. 0)  .and.
-     *                  (((n-ln)/k1n) .le. BN2)  
-     *                  )  then 
-                        ib = k
-                        jb = ((n-ln)/k1n)
-                        nb = l
-                        if (B3(ib,jb,nb).eq.
-     *                      (ib*NL/10+jb*NL/100+nb*NL/1000))then     
-                        else
-                        erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000)
-                        endif
-                      endif 
-                   enddo 
-                   enddo 
-                 endif
-            enddo 
-          enddo 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-
-      cs=0  
-      s=0 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri,s,cs
-c          print *,B3  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------align335
-c 335 arrA3[BLOCK][*] [BLOCK]  arrB3[][][]
-c       ALIGN arrB[*][i][*] WITH arrA[*][ 1][i]       
-
-      subroutine align335
-      integer, parameter :: AN1=5,AN2=7,AN3=9,BN1=4,BN2=3,BN3=5
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for ALIGN arrB[*][i][*] WITH arrA[*][lj][k1n*i+ln]                                               
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=0,k3j=0,lj=1
-      integer, parameter :: k1n=1,k2n=0,k3n=0,ln=0
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,k,l,ia,ja,na,ma,ib,jb,nb,mb,
-     * Avalue,Bvalue
-              
-cdvm$ distribute A3(BLOCK,*,BLOCK)    
-cdvm$ ALIGN B3(*,i,*) WITH A3(*,lj,k1n*i+ln)
-
-      tname='align335'
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-*dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(k,l,ib,jb,nb),
-!dvm$& reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10+j*NL/100+n*NL/1000
-                  if ((j .eq. lj ) ) then
-                    do k = 1,BN1
-                    do l = 1,BN3
-                      if ( 
-     *                  ((n-ln) .eq.(((n-ln)/k1n) * k1n)) .and.
-     *                  (((n-ln)/k1n) .gt. 0)  .and.
-     *                  (((n-ln)/k1n) .le. BN2)  
-     *                  )  then 
-                        ib = k
-                        jb = ((n-ln)/k1n)
-                        nb = l
-                        if (B3(ib,jb,nb).eq.
-     *                      (ib*NL/10+jb*NL/100+nb*NL/1000))then     
-                        else
-                        erri = min(erri,i*NL/10 + j*NL/100+ n*NL/1000)
-                        endif
-                      endif 
-                   enddo 
-                   enddo 
-                 endif
-            enddo 
-          enddo 
-      enddo 
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-
-      cs=0  
-      s=0 
-     
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri,s,cs
-c          print *,B3  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons01234.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons01234.fdv
deleted file mode 100644
index b72b0b2..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons01234.fdv
+++ /dev/null
@@ -1,4834 +0,0 @@
-      program CONS01234
-
-c     TESTING OF THE CONSISTENT CLAUSE'.
-c     CHECKING DISTRIBUTION WITH NO BLOCKS.
-
-      print *,'===START OF CONS01234========================'
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons0101
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons0102
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0103
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0104
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons0105
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons0106
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0107
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0108
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons0109
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons0110
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0111
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0112
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons0113
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons0114
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0115
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0116
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons0201
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons0202
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0203
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0204
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons0205
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons0206
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0207
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0208
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons0209
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons0210
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0211
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0212
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons0213
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons0214
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0215
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0216
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons0301
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons0302
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0303
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0304
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons0305
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons0306
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0307
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0308
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons0309
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons0310
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0311
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0312
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons0313
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons0314
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0315
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0316
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons0401
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons0402
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0403
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0404
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons0405
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons0406
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0407
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0408
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons0409
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons0410
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0411
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0412
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons0413
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons0414
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons0415
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons0416
-C --------------------------------------------------
-C
-      print *,'=== END OF CONS01234 ========================= '
-      end
-C ---------------------------------------------cons0101
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0101
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N),C(N))
-      tname='CONS0101'
-      DO I = 1, N
-            C(I)  = I
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-            B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0102
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0102
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),V(N),W(N),C(N))
-      tname='CONS0102'
-      DO I = 1, N
-            C(I)  = I
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-      IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0103
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0103
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),A(:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   DISTRIBUTE     ( * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),A(N),V(N),W(N),C(N))
-      tname='CONS0103'
-      DO I = 1, N
-            C(I)  = I
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL    (I)   ON   A(I)
-      DO I = 1, N
-                  A(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-      IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0104
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0104
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N),C(N))
-      tname='CONS0104'
-      DO I = 1, N
-            C(I)  = I
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0105
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0105
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N),C(N,N))
-      tname='CONS0105'
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-            B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(V(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  V(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0106
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0106
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),V(N,N),W(N,N),C(N,N))
-      tname='CONS0106'
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(V(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  V(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(W(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  W(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0107
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0107
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),A(:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   DISTRIBUTE     ( * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),A(N),V(N,N),W(N,N),C(N,N))
-      tname='CONS0107'
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL    (I)   ON   A(I)
-      DO I = 1, N
-                  A(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(V(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  V(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I), private(J), CONSISTENT(W(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  W(I,J) = A(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0108
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0108
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N),C(N,N))
-      tname='CONS0108'
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(V(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  V(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0109
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0109
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N,N),C(N,N,N))
-      tname='CONS0109'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-            B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(V(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0110
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0110
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS0110'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(V(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(W(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            W(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0111
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0111
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),A(:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   DISTRIBUTE     ( * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),A(N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS0111'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL    (I)   ON   A(I)
-      DO I = 1, N
-                  A(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(V(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I), private(J,K), CONSISTENT(W(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            W(I,J,K) = A(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0112
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0112
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N,N),C(N,N,N))
-      tname='CONS0112'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(V(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0113
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0113
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS0113'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-            B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(V(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0114
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0114
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS0114'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(V(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(W(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0115
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0115
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),A(:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   DISTRIBUTE     ( * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),A(N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS0115'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL    (I)   ON   A(I)
-      DO I = 1, N
-                  A(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(V(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I), private(J,K,L), CONSISTENT(W(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0116
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0116
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS0116'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(V(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0201
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0201
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N),C(N))
-      tname='CONS0201'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0202
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0202
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N),W(N),C(N))
-      tname='CONS0202'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0203
-C consistent arrays with 1 dimensions
-      subroutine CONS0203
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N),W(N),C(N))
-      tname='CONS0203'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!DVM$ PARALLEL (I) ON A(I,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0204
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0204
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N),C(N))
-      tname='CONS0204'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0205
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0205
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N),C(N,N))
-      tname='CONS0205'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0206
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0206
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS0206'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0207
-C consistent arrays with 2 dimensions
-      subroutine CONS0207
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS0207'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0208
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0208
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N),C(N,N))
-      tname='CONS0208'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0209
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0209
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N),C(N,N,N))
-      tname='CONS0209'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0210
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0210
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS0210'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(W(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            W(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0211
-C consistent arrays with 3 dimensions
-      subroutine CONS0211
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS0211'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), private(K), CONSISTENT(W(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            W(I,J,K) = A(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0212
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0212
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N),C(N,N,N))
-      tname='CONS0212'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0213
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0213
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS0213'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0214
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0214
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS0214'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(W(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            W(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0215
-C consistent arrays with 4 dimensions
-      subroutine CONS0215
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS0215'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), private(K,L), CONSISTENT(W(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            W(I,J,K,L)=A(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0216
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0216
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS0216'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0301
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0301
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS0301'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0302
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0302
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N),W(N),C(N))
-      tname='CONS0302'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0303
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0303
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N),W(N),C(N))
-      tname='CONS0303'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON A(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0304
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0304
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS0304'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0305
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0305
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS0305'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0306
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0306
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS0306'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0307
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0307
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS0307'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON A(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0308
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0308
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS0308'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0309
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0309
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS0309'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0310
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0310
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS0310'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0311
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0311
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS0311'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0312
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0312
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS0312'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0313
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0313
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS0313'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0314
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0314
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS0314'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0315
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0315
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS0315'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0316
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0316
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS0316'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0401
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0401
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS0401'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0402
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0402
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS0402'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0403
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0403
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS0403'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0404
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0404
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS0404'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0405
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0405
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS0405'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0406
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0406
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS0406'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0407
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0407
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS0407'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0408
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0408
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS0408'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0409
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0409
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS0409'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0410
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0410
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS0410'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0411
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0411
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS0411'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0412
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0412
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS0412'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0413
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS0413
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS0413'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons0414
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS0414
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS0414'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons0415
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS0415
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS0415'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons0416
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS0416
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS0416'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-
-C --------------------------------------------------
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons11.fdv
deleted file mode 100644
index fea541c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons11.fdv
+++ /dev/null
@@ -1,1113 +0,0 @@
-      program CONS11
-
-c     TESTING OF THE CONSISTENT CLAUSE'.
-c      CHECKING ( BLOCK ) DISTRIBUTION.
-
-      print *,'===START OF CONS11========================'
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1101
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1102
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1103
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1104
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1105
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1106
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1107
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1108
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1109
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1110
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1111
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1112
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1113
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1114
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1115
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1116
-C --------------------------------------------------
-
-C
-      print *,'=== END OF CONS11 ========================= '
-      end
-C ---------------------------------------------cons1101
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1101
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N),C(N))
-      tname='CONS1101'
-      DO I = 1, N
-            C(I)  = I
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-            B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1102
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1102
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),V(N),W(N),C(N))
-      tname='CONS1102'
-      DO I = 1, N
-            C(I)  = I
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-      IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1103
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1103
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),A(:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),A(N),V(N),W(N),C(N))
-      tname='CONS1103'
-      DO I = 1, N
-            C(I)  = I
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL    (I)   ON   A(I)
-      DO I = 1, N
-                  A(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-      IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1104
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1104
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N),C(N))
-      tname='CONS1104'
-      DO I = 1, N
-            C(I)  = I
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1105
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1105
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N),C(N,N))
-      tname='CONS1105'
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-            B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(V(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  V(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1106
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1106
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1106'
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(V(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  V(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(W(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  W(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1107
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1107
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),A(:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),A(N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1107'
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL    (I)   ON   A(I)
-      DO I = 1, N
-                  A(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(V(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  V(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I), private(J), CONSISTENT(W(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  W(I,J) = A(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1108
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1108
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N),C(N,N))
-      tname='CONS1108'
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J), CONSISTENT(V(I,:))
-      DO I = 1, N
-      DO J = 1, N
-                  V(I,J) = B(I) + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J) .NE. C(I,J)) THEN
-                              IERR = C(I,J)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1109
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1109
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N,N),C(N,N,N))
-      tname='CONS1109'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-            B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(V(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1110
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1110
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1110'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(V(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(W(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            W(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1111
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1111
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),A(:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),A(N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1111'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL    (I)   ON   A(I)
-      DO I = 1, N
-                  A(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(V(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I), private(J,K), CONSISTENT(W(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            W(I,J,K) = A(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1112
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1112
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N,N),C(N,N,N))
-      tname='CONS1112'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K), CONSISTENT(V(I,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I) + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                              IERR = C(I,J,K)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1113
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1113
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1113'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-            B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(V(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1114
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1114
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1114'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(V(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(W(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1115
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1115
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:),A(:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N),A(N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1115'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL    (I)   ON   A(I)
-      DO I = 1, N
-                  A(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(V(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I), private(J,K,L), CONSISTENT(W(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1116
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1116
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1116'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (I)   ON   B(I)
-      DO I = 1, N
-                  B(I) = I
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I), private(J,K,L), CONSISTENT(V(I,:,:,:))
-      DO I = 1, N
-      DO J = 1, N
-      DO K = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I)+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-                  IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                              IERR = C(I,J,K,L)
-                              EXIT
-                  ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (I)   ON  B(I), REDUCTION(MIN(ERROR))
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-
-C --------------------------------------------------
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons1234.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons1234.fdv
deleted file mode 100644
index 2adb18e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons1234.fdv
+++ /dev/null
@@ -1,11332 +0,0 @@
-      program CONS1234
-
-c      TESTING OF THE CONSISTENT CLAUSE'.
-c      CHECKING DISTRIBUTION WITH ONE BLOCK.
-
-      print *,'===START OF CONS1234========================'
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1201
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1202
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1203
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1204
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1205
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1206
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1207
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1208
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1209
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1210
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1211
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1212
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1213
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1214
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1215
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1216
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1217
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1218
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1219
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1220
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1221
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1222
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1223
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1224
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1225
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1226
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1227
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1228
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1229
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1230
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1231
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1232
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1301
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1302
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1303
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1304
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1305
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1306
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1307
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1308
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1309
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1310
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1311
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1312
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1313
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1314
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1315
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1316
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1317
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1318
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1319
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1320
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1321
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1322
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1323
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1324
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1325
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1326
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1327
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1328
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1329
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1330
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1331
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1332
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1333
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1334
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1335
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1336
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1337
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1338
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1339
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1340
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1341
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1342
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1343
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1344
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1345
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1346
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1347
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1348
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1401
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1402
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1403
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1404
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1405
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1406
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1407
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1408
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1409
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1410
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1411
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1412
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1413
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1414
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1415
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1416
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1417
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1418
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1419
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1420
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1421
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1422
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1423
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1424
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1425
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1426
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1427
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1428
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1429
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1430
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1431
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1432
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1433
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1434
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1435
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1436
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1437
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1438
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1439
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1440
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1441
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1442
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1443
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1444
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1445
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1446
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1447
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1448
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons1449
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons1450
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1451
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1452
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons1453
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons1454
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1455
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1456
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons1457
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons1458
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1459
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1460
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons1461
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons1462
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons1463
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons1464
-C --------------------------------------------------
-C
-      print *,'=== END OF CONS1234 ========================= '
-      end
-C ---------------------------------------------cons1201
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1201
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N),C(N))
-      tname='CONS1201'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1202
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1202
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N),W(N),C(N))
-      tname='CONS1202'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1203
-C consistent arrays with 1 dimensions
-      subroutine CONS1203
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N),W(N),C(N))
-      tname='CONS1203'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!DVM$ PARALLEL (I) ON A(I,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1204
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1204
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N),C(N))
-      tname='CONS1204'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1205
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1205
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N),C(N,N))
-      tname='CONS1205'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1206
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1206
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1206'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1207
-C consistent arrays with 2 dimensions
-      subroutine CONS1207
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1207'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1208
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1208
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N),C(N,N))
-      tname='CONS1208'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1209
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1209
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1209'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1210
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1210
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1210'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(W(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            W(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1211
-C consistent arrays with 3 dimensions
-      subroutine CONS1211
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1211'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), private(K), CONSISTENT(W(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            W(I,J,K) = A(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1212
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1212
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1212'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1213
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1213
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1213'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1214
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1214
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1214'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(W(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            W(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1215
-C consistent arrays with 4 dimensions
-      subroutine CONS1215
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1215'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), private(K,L), CONSISTENT(W(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            W(I,J,K,L)=A(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1216
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1216
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1216'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1217
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1217
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N),C(N))
-      tname='CONS1217'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1218
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1218
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N),W(N),C(N))
-      tname='CONS1218'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1219
-C consistent arrays with 1 dimensions
-      subroutine CONS1219
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N),W(N),C(N))
-      tname='CONS1219'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!DVM$ PARALLEL (I) ON A(I,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1220
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1220
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N),C(N))
-      tname='CONS1220'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1221
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1221
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N),C(N,N))
-      tname='CONS1221'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1222
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1222
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1222'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1223
-C consistent arrays with 2 dimensions
-      subroutine CONS1223
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1223'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1224
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1224
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N),C(N,N))
-      tname='CONS1224'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1225
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1225
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1225'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1226
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1226
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1226'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(W(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            W(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1227
-C consistent arrays with 3 dimensions
-      subroutine CONS1227
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1227'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), private(K), CONSISTENT(W(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            W(I,J,K) = A(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1228
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1228
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1228'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1229
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1229
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1229'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1230
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1230
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1230'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(W(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            W(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1231
-C consistent arrays with 4 dimensions
-      subroutine CONS1231
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1231'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), private(K,L), CONSISTENT(W(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            W(I,J,K,L)=A(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1232
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1232
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1232'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1301
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1301
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS1301'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1302
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1302
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N),W(N),C(N))
-      tname='CONS1302'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1303
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1303
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N),W(N),C(N))
-      tname='CONS1303'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON A(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1304
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1304
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS1304'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1305
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1305
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS1305'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1306
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1306
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1306'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1307
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1307
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1307'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON A(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1308
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1308
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS1308'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1309
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1309
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1309'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1310
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1310
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1310'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1311
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1311
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1311'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1312
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1312
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1312'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1313
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1313
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1313'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1314
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1314
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1314'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1315
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1315
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1315'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1316
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1316
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1316'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1317
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1317
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS1317'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1318
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1318
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N),W(N),C(N))
-      tname='CONS1318'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1319
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1319
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N),W(N),C(N))
-      tname='CONS1319'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON A(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1320
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1320
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS1320'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1321
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1321
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS1321'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1322
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1322
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1322'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1323
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1323
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1323'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON A(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1324
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1324
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS1324'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1325
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1325
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1325'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1326
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1326
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1326'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1327
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1327
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1327'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1328
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1328
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1328'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1329
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1329
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1329'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1330
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1330
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1330'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1331
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1331
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1331'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1332
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1332
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1332'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1333
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1333
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS1333'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1334
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1334
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N),W(N),C(N))
-      tname='CONS1334'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1335
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1335
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N),W(N),C(N))
-      tname='CONS1335'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON A(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1336
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1336
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS1336'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1337
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1337
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS1337'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1338
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1338
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1338'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1339
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1339
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1339'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON A(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1340
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1340
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS1340'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1341
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1341
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1341'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1342
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1342
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1342'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1343
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1343
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1343'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1344
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1344
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1344'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1345
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1345
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1345'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1346
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1346
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1346'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1347
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1347
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1347'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1348
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1348
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1348'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1401
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1401
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS1401'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1402
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1402
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS1402'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1403
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1403
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS1403'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1404
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1404
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS1404'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1405
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1405
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS1405'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1406
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1406
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1406'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1407
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1407
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1407'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1408
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1408
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS1408'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1409
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1409
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1409'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1410
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1410
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1410'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1411
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1411
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1411'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1412
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1412
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1412'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1413
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1413
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1413'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1414
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1414
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1414'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1415
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1415
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1415'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1416
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1416
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1416'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1417
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1417
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS1417'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1418
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1418
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS1418'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1419
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1419
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS1419'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1420
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1420
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS1420'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1421
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1421
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS1421'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1422
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1422
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1422'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1423
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1423
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1423'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1424
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1424
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS1424'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1425
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1425
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1425'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1426
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1426
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1426'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1427
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1427
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1427'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1428
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1428
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1428'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1429
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1429
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1429'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1430
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1430
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1430'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1431
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1431
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1431'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1432
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1432
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1432'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1433
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1433
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS1433'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1434
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1434
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS1434'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1435
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1435
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS1435'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1436
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1436
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS1436'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1437
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1437
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS1437'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1438
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1438
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1438'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1439
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1439
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1439'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1440
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1440
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS1440'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1441
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1441
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1441'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1442
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1442
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1442'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1443
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1443
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1443'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1444
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1444
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1444'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1445
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1445
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1445'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1446
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1446
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1446'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1447
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1447
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1447'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1448
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1448
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1448'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1449
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1449
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS1449'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1450
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1450
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS1450'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1451
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1451
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS1451'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1452
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1452
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS1452'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1453
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1453
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS1453'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1454
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1454
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1454'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1455
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1455
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS1455'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1456
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1456
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS1456'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1457
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1457
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1457'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1458
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1458
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1458'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1459
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1459
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS1459'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1460
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1460
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS1460'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1461
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS1461
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1461'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons1462
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS1462
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1462'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons1463
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS1463
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS1463'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons1464
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS1464
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS1464'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=(I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-
-C --------------------------------------------------
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons22.fdv
deleted file mode 100644
index 3449556..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons22.fdv
+++ /dev/null
@@ -1,1185 +0,0 @@
-      program CONS22
-
-c      TESTING OF THE CONSISTENT CLAUSE'.
-c      CHECKING ( BLOCK, BLOCK ) DISTRIBUTION.
-
-      print *,'===START OF CONS22========================'
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2201
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2202
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2203
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2204
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2205
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2206
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2207
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2208
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2209
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2210
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2211
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2212
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2213
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2214
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2215
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2216
-C --------------------------------------------------
-
-C
-      print *,'=== END OF CONS22 ========================= '
-      end
-C ---------------------------------------------cons2201
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2201
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N),C(N))
-      tname='CONS2201'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2202
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2202
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N),W(N),C(N))
-      tname='CONS2202'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2203
-C consistent arrays with 1 dimensions
-      subroutine CONS2203
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N),W(N),C(N))
-      tname='CONS2203'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!DVM$ PARALLEL (I) ON A(I,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2204
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2204
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N),C(N))
-      tname='CONS2204'
-      DO I = 1, N
-            C(I)  = I + (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2205
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2205
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N),C(N,N))
-      tname='CONS2205'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2206
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2206
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2206'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2207
-C consistent arrays with 2 dimensions
-      subroutine CONS2207
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2207'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2208
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2208
-      INTEGER,PARAMETER:: N=16, ER=10000
-      integer,allocatable:: B(:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N),C(N,N))
-      tname='CONS2208'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2209
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2209
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2209'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2210
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2210
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2210'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(W(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            W(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2211
-C consistent arrays with 3 dimensions
-      subroutine CONS2211
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2211'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), private(K), CONSISTENT(W(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            W(I,J,K) = A(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2212
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2212
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2212'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K), CONSISTENT(V(I,J,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO K = 1, N
-            V(I,J,K) = B(I,J) + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2213
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2213
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2213'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2214
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2214
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2214'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(W(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            W(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2215
-C consistent arrays with 4 dimensions
-      subroutine CONS2215
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:),A(:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N),A(N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2215'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (J,I)   ON   A(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$ PARALLEL (J,I) ON A(I,J), private(K,L), CONSISTENT(W(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            W(I,J,K,L)=A(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2216
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2216
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2216'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (J,I)   ON   B(I,J)
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J) = I+(N-1)*J
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J), private(K,L), CONSISTENT(V(I,J,:,:))
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-      DO K = 1, N
-            V(I,J,K,L)=B(I,J)+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (J,I)   ON  B(I,J), REDUCTION(MIN(ERROR))
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-
-C --------------------------------------------------
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons234.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons234.fdv
deleted file mode 100644
index c5d2cba..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons234.fdv
+++ /dev/null
@@ -1,11628 +0,0 @@
-      program CONS234
-
-c      TESTING OF THE CONSISTENT CLAUSE'.
-c      CHECKING DISTRIBUTION WITH TWO BLOCKS.
-
-      print *,'===START OF CONS234========================'
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2301
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2302
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2303
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2304
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2305
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2306
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2307
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2308
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2309
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2310
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2311
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2312
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2313
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2314
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2315
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2316
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2317
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2318
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2319
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2320
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2321
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2322
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2323
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2324
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2325
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2326
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2327
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2328
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2329
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2330
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2331
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2332
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2333
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2334
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2335
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2336
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2337
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2338
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2339
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2340
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2341
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2342
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2343
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2344
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2345
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2346
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2347
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2348
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2401
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2402
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2403
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2404
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2405
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2406
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2407
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2408
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2409
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2410
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2411
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2412
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2413
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2414
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2415
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2416
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2417
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2418
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2419
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2420
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2421
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2422
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2423
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2424
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2425
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2426
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2427
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2428
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2429
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2430
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2431
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2432
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2433
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2434
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2435
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2436
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2437
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2438
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2439
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2440
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2441
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2442
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2443
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2444
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2445
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2446
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2447
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2448
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2449
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2450
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2451
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2452
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2453
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2454
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2455
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2456
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2457
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2458
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2459
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2460
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2461
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2462
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2463
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2464
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2465
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2466
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2467
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2468
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2469
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2470
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2471
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2472
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2473
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2474
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2475
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2476
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2477
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2478
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2479
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2480
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons2481
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons2482
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2483
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2484
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons2485
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons2486
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2487
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2488
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons2489
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons2490
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2491
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2492
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons2493
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons2494
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons2495
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons2496
-C --------------------------------------------------
-C
-      print *,'=== END OF CONS234 ========================= '
-      end
-C ---------------------------------------------cons2301
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2301
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS2301'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2302
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2302
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N),W(N),C(N))
-      tname='CONS2302'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2303
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2303
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N),W(N),C(N))
-      tname='CONS2303'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON A(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2304
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2304
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS2304'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2305
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2305
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS2305'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2306
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2306
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2306'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2307
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2307
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2307'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON A(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2308
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2308
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS2308'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2309
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2309
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2309'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2310
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2310
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2310'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2311
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2311
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2311'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2312
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2312
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2312'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2313
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2313
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2313'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2314
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2314
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2314'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2315
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2315
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2315'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2316
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2316
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2316'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2317
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2317
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS2317'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2318
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2318
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N),W(N),C(N))
-      tname='CONS2318'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2319
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2319
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N),W(N),C(N))
-      tname='CONS2319'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON A(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2320
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2320
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS2320'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2321
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2321
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS2321'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2322
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2322
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2322'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2323
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2323
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2323'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON A(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2324
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2324
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS2324'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2325
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2325
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2325'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2326
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2326
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2326'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2327
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2327
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2327'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2328
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2328
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2328'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2329
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2329
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2329'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2330
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2330
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2330'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2331
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2331
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2331'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2332
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2332
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2332'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2333
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2333
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS2333'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2334
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2334
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N),W(N),C(N))
-      tname='CONS2334'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2335
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2335
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N),W(N),C(N))
-      tname='CONS2335'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON A(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2336
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2336
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS2336'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2337
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2337
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS2337'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2338
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2338
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2338'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2339
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2339
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2339'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON A(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2340
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2340
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS2340'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2341
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2341
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2341'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2342
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2342
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2342'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2343
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2343
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2343'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2344
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2344
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2344'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2345
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2345
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2345'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2346
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2346
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2346'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2347
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2347
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2347'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2348
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2348
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2348'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2401
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2401
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2401'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2402
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2402
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2402'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2403
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2403
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2403'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2404
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2404
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2404'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2405
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2405
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2405'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2406
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2406
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2406'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2407
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2407
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2407'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2408
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2408
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2408'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2409
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2409
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2409'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2410
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2410
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2410'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2411
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2411
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2411'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2412
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2412
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2412'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2413
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2413
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2413'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2414
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2414
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2414'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2415
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2415
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2415'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2416
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2416
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2416'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2417
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2417
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2417'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2418
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2418
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2418'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2419
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2419
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2419'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2420
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2420
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2420'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2421
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2421
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2421'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2422
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2422
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2422'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2423
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2423
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2423'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2424
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2424
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2424'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2425
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2425
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2425'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2426
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2426
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2426'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2427
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2427
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2427'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2428
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2428
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2428'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2429
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2429
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2429'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2430
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2430
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2430'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2431
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2431
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2431'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2432
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2432
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2432'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2433
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2433
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2433'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2434
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2434
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2434'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2435
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2435
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2435'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2436
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2436
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2436'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2437
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2437
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2437'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2438
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2438
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2438'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2439
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2439
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2439'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2440
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2440
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2440'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2441
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2441
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2441'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2442
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2442
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2442'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2443
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2443
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2443'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2444
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2444
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2444'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2445
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2445
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2445'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2446
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2446
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2446'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2447
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2447
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2447'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2448
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2448
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2448'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2449
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2449
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2449'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2450
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2450
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2450'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2451
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2451
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2451'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2452
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2452
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2452'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2453
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2453
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2453'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2454
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2454
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2454'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2455
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2455
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2455'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2456
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2456
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2456'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2457
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2457
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2457'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2458
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2458
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2458'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2459
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2459
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2459'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2460
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2460
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2460'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2461
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2461
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2461'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2462
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2462
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2462'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2463
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2463
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2463'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2464
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2464
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2464'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2465
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2465
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2465'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2466
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2466
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2466'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2467
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2467
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2467'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2468
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2468
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2468'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2469
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2469
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2469'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2470
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2470
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2470'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2471
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2471
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2471'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2472
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2472
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2472'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2473
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2473
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2473'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2474
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2474
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2474'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2475
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2475
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2475'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2476
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2476
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2476'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2477
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2477
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2477'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2478
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2478
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2478'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2479
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2479
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2479'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2480
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2480
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2480'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2481
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2481
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2481'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2482
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2482
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2482'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2483
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2483
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS2483'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2484
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2484
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS2484'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2485
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2485
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2485'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2486
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2486
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2486'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2487
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2487
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS2487'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2488
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2488
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS2488'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2489
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2489
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2489'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2490
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2490
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2490'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2491
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2491
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS2491'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2492
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2492
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS2492'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2493
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS2493
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2493'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons2494
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS2494
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2494'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons2495
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS2495
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS2495'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons2496
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS2496
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS2496'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-
-C --------------------------------------------------
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons33.fdv
deleted file mode 100644
index 99554bd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons33.fdv
+++ /dev/null
@@ -1,1261 +0,0 @@
-      program CONS33
-
-c      TESTING OF THE CONSISTENT CLAUSE'.
-c      CHECKING ( BLOCK, BLOCK, BLOCK ) DISTRIBUTION.
-
-      print *,'===START OF CONS33========================'
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons3301
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons3302
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3303
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3304
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons3305
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons3306
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3307
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3308
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons3309
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons3310
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3311
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3312
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons3313
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons3314
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3315
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3316
-C --------------------------------------------------
-
-C
-      print *,'=== END OF CONS33 ========================= '
-      end
-C ---------------------------------------------cons3301
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3301
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS3301'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3302
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3302
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N),W(N),C(N))
-      tname='CONS3302'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3303
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3303
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N),W(N),C(N))
-      tname='CONS3303'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!DVM$   PARALLEL (I) ON A(I,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3304
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3304
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N),C(N))
-      tname='CONS3304'
-      DO I = 1, N
-            C(I)  = I + (N - 1) + (N - 1) * (N - 1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (I) ON B(I,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3305
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3305
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS3305'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3306
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3306
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3306'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3307
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3307
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3307'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON A(I,J,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3308
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3308
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N),C(N,N))
-      tname='CONS3308'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)  = I + (N - 1) * J + (N - 1) * (N - 1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (J,I) ON B(I,J,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3309
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3309
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3309'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3310
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3310
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3310'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3311
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3311
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3311'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3312
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3312
-      INTEGER,PARAMETER:: N=16, ER=100000
-      integer,allocatable:: B(:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3312'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)  = I + (N - 1) * J + (N - 1) * (N - 1) * K
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3313
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3313
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3313'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3314
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3314
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3314'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3315
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3315
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:),A(:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N),A(N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3315'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (K,J,I)   ON   A(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON A(I,J,K), private(L), CONSISTENT(W(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            W(I,J,K,L)=A(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3316
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3316
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3316'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (K,J,I)   ON   B(I,J,K)
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K) = I+(N-1)*J+(N-1)*(N-1)*K
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL (K,J,I) ON B(I,J,K), private(L), CONSISTENT(V(I,J,K,:))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-      DO L = 1, N
-            V(I,J,K,L)=B(I,J,K)+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (K,J,I)   ON  B(I,J,K), REDUCTION(MIN(ERROR))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-
-C --------------------------------------------------
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons34.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons34.fdv
deleted file mode 100644
index fe3cc2c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons34.fdv
+++ /dev/null
@@ -1,5274 +0,0 @@
-      program CONS34
-
-c      TESTING OF THE CONSISTENT CLAUSE'.
-c      CHECKING DISTRIBUTION WITH THREE BLOCKS.
-
-      print *,'===START OF CONS34========================'
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons3401
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons3402
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3403
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3404
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons3405
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons3406
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3407
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3408
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons3409
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons3410
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3411
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3412
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons3413
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons3414
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3415
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3416
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons3417
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons3418
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3419
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3420
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons3421
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons3422
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3423
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3424
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons3425
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons3426
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3427
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3428
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons3429
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons3430
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3431
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3432
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons3433
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons3434
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3435
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3436
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons3437
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons3438
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3439
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3440
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons3441
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons3442
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3443
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3444
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons3445
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons3446
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3447
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3448
-C --------------------------------------------------
-
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons3449
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons3450
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3451
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3452
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons3453
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons3454
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3455
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3456
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons3457
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons3458
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3459
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3460
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons3461
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons3462
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons3463
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons3464
-C --------------------------------------------------
-C
-      print *,'=== END OF CONS34 ========================= '
-      end
-C ---------------------------------------------cons3401
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3401
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS3401'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3402
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3402
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS3402'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3403
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3403
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS3403'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3404
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3404
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS3404'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3405
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3405
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS3405'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3406
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3406
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3406'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3407
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3407
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3407'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3408
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3408
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS3408'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3409
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3409
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3409'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3410
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3410
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3410'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3411
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3411
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3411'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3412
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3412
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3412'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3413
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3413
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3413'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3414
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3414
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3414'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3415
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3415
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3415'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3416
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3416
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( *, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3416'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3417
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3417
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS3417'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3418
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3418
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS3418'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3419
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3419
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS3419'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3420
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3420
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS3420'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3421
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3421
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS3421'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3422
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3422
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3422'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3423
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3423
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3423'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3424
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3424
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS3424'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3425
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3425
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3425'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3426
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3426
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3426'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3427
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3427
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3427'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3428
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3428
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3428'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3429
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3429
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3429'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3430
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3430
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3430'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3431
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3431
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3431'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3432
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3432
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, *, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3432'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3433
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3433
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS3433'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3434
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3434
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS3434'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3435
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3435
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS3435'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3436
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3436
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS3436'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3437
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3437
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS3437'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3438
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3438
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3438'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3439
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3439
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3439'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3440
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3440
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS3440'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3441
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3441
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3441'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3442
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3442
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3442'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3443
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3443
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3443'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3444
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3444
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3444'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3445
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3445
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3445'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3446
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3446
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3446'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3447
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3447
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3447'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3448
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3448
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, *, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3448'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3449
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3449
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS3449'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3450
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3450
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS3450'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3451
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3451
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS3451'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3452
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3452
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS3452'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3453
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3453
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS3453'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3454
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3454
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3454'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3455
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3455
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS3455'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3456
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3456
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS3456'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3457
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3457
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3457'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3458
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3458
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3458'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3459
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3459
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS3459'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3460
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3460
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS3460'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3461
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS3461
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3461'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons3462
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS3462
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3462'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons3463
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS3463
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS3463'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons3464
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS3464
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, * )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS3464'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-
-C --------------------------------------------------
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons44.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons44.fdv
deleted file mode 100644
index cf27f2e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/CONSISTENT/cons44.fdv
+++ /dev/null
@@ -1,1333 +0,0 @@
-      program CONS44
-
-c      TESTING OF THE CONSISTENT CLAUSE'.
-c      CHECKING ( BLOCK, BLOCK, BLOCK, BLOCK ) DISTRIBUTION.
-
-      print *,'===START OF CONS44========================'
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      call cons4401
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      call cons4402
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      call cons4403
-C --------------------------------------------------
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons4404
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      call cons4405
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      call cons4406
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      call cons4407
-C --------------------------------------------------
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons4408
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      call cons4409
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      call cons4410
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      call cons4411
-C --------------------------------------------------
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons4412
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      call cons4413
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      call cons4414
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      call cons4415
-C --------------------------------------------------
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      call cons4416
-C --------------------------------------------------
-
-C
-      print *,'=== END OF CONS44 ========================= '
-      end
-C ---------------------------------------------cons4401
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-      subroutine CONS4401
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS4401'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons4402
-C consistent arrays with 1 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS4402
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:),W(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS4402'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons4403
-C consistent arrays with 1 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS4403
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:),W(:)
-     *,C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N),W(N),C(N))
-      tname='CONS4403'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  A(I,1,1,1), CONSISTENT(W(I))
-      DO I = 1, N
-            W(I) = A(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      DO I = 1, N
-            IF(W(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons4404
-C consistent arrays with 1 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS4404
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:),C(:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N),C(N))
-      tname='CONS4404'
-      DO I = 1, N
-            C(I)=I+(N-1)+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (I)   ON  B(I,1,1,1), CONSISTENT(V(I))
-      DO I = 1, N
-            V(I) = B(I,1,1,1)
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO I = 1, N
-            IF(V(I) .NE. C(I)) THEN
-                  IERR = C(I)
-                  EXIT
-            ENDIF
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons4405
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-      subroutine CONS4405
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS4405'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons4406
-C consistent arrays with 2 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS4406
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:),W(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS4406'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons4407
-C consistent arrays with 2 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS4407
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:),W(:,:)
-     *,C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N),W(N,N),C(N,N))
-      tname='CONS4407'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  A(I,J,1,1), CONSISTENT(W(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J) = A(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons4408
-C consistent arrays with 2 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS4408
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:),C(:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N),C(N,N))
-      tname='CONS4408'
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J)=I+(N-1)*J+(N-1)*(N-1)+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (J,I)   ON  B(I,J,1,1), CONSISTENT(V(I,J))
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J) = B(I,J,1,1)
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J) .NE. C(I,J)) THEN
-                  IERR = C(I,J)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons4409
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-      subroutine CONS4409
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS4409'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons4410
-C consistent arrays with 3 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS4410
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),W(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS4410'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons4411
-C consistent arrays with 3 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS4411
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:),W(:,:,:)
-     *,C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N),W(N,N,N),C(N,N,N))
-      tname='CONS4411'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  A(I,J,K,1), CONSISTENT(W(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K) = A(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons4412
-C consistent arrays with 3 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS4412
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:),C(:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N),C(N,N,N))
-      tname='CONS4412'
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (K,J,I)   ON  B(I,J,K,1), CONSISTENT(V(I,J,K))
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K) = B(I,J,K,1)
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K) .NE. C(I,J,K)) THEN
-                  IERR = C(I,J,K)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons4413
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-      subroutine CONS4413
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS4413'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-C ---------------------------------------------cons4414
-C consistent arrays with 4 dimensions
-C two consistent arrays and one distributed array
-      subroutine CONS4414
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),W(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS4414'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, W, C)
-      END
-C ---------------------------------------------cons4415
-C consistent arrays with 4 dimensions
-C two consistent arrays and two distributed arrays
-      subroutine CONS4415
-      INTEGER,PARAMETER:: N=8, ER=10000
-      integer,allocatable::B(:,:,:,:),A(:,:,:,:),V(:,:,:,:),W(:,:,:,:)
-     *,C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   A
-!DVM$   CONSISTENT V
-!DVM$   CONSISTENT W
-      allocate (B(N,N,N,N),A(N,N,N,N),V(N,N,N,N),W(N,N,N,N),C(N,N,N,N))
-      tname='CONS4415'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL    (L,K,J,I)   ON   A(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            A(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  A(I,J,K,L), CONSISTENT(W(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            W(I,J,K,L)=A(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V, W)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(W(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, A, V, W, C)
-      END
-C ---------------------------------------------cons4416
-C consistent arrays with 4 dimensions
-C one consistent array and one distributed array
-C big data
-      subroutine CONS4416
-      INTEGER,PARAMETER:: N=16, ER=1000000
-      integer,allocatable:: B(:,:,:,:),V(:,:,:,:),C(:,:,:,:)
-      character*8 tname
-      INTEGER ERROR,IERR
-!DVM$   DISTRIBUTE     ( BLOCK, BLOCK, BLOCK, BLOCK )   ::   B
-!DVM$   CONSISTENT V
-      allocate (B(N,N,N,N),V(N,N,N,N),C(N,N,N,N))
-      tname='CONS4416'
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            C(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ region
-!DVM$   PARALLEL    (L,K,J,I)   ON   B(I,J,K,L)
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            B(I,J,K,L)=I+(N-1)*J+(N-1)*(N-1)*K+(N-1)*(N-1)*(N-1)*L
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!DVM$   PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), CONSISTENT(V(I,J,K,L))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            V(I,J,K,L)=B(I,J,K,L)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-!dvm$ end region
-!dvm$ get_actual (V)
-      IERR = ER
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            IF(V(I,J,K,L) .NE. C(I,J,K,L)) THEN
-                  IERR = C(I,J,K,L)
-                  EXIT
-            ENDIF
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      ERROR = ER
-!DVM$  PARALLEL  (L,K,J,I)   ON  B(I,J,K,L), REDUCTION(MIN(ERROR))
-      DO L = 1, N
-      DO K = 1, N
-      DO J = 1, N
-      DO I = 1, N
-            ERROR = MIN(ERROR,IERR)
-      ENDDO
-      ENDDO
-      ENDDO
-      ENDDO
-      IF(ERROR .EQ. ER) THEN
-            call ansyes(tname)
-      ELSE
-            call ansno(tname)
-      ENDIF
-      deallocate (B, V, C)
-      END
-
-C --------------------------------------------------
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr1.fdv
deleted file mode 100644
index bb52d04..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr1.fdv
+++ /dev/null
@@ -1,350 +0,0 @@
-      program DISTR1
-
-c    TESTING distribute and redistribute CLAUSE .       
-
-      print *,'===START OF distr1========================'
-C --------------------------------------------------
-c 11  DISTRIBUTE arrA1[BLOCK]    REDISTRIBUTE arrA1[*] 
-      call distr11
-C --------------------------------------------------
-c 12  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[BLOCK] 
-      call distr12
-C --------------------------------------------------
-c 13  DISTRIBUTE arrA1[BLOCK]    REDISTRIBUTE arrA1[*] small array
-      call distr13
-C --------------------------------------------------
-c 14  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[BLOCK] small array 
-      call distr14
-C --------------------------------------------------
-c 21  DISTRIBUTE arrA2[BLOCK][*]	REDISTRIBUTE arrA2[*][ BLOCK]
-      call distr21
-C --------------------------------------------------
-c 22  DISTRIBUTE arrA2[*][BLOCK]	REDISTRIBUTE arrA2[*][*]
-      call distr22
-C --------------------------------------------------
-c 23  DISTRIBUTE arrA2[*][*]	REDISTRIBUTE arrA2[*][ BLOCK]
-      call distr23
-C -------------------------------------------------
-C
-C
-      print *,'=== END OF distr1 ========================= '    
-      end
-
-C ----------------------------------------------------distr11
-c 11  DISTR arrA1[BLOCK]    REDISTR arrA1[*]  
-      subroutine distr11
-      integer, parameter :: AN1=8,NL=1000,ER=10000
-      integer :: erri= ER, i
-      integer, allocatable :: A1(:)
-      character(9) :: tname = 'distr11'
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-
-      end
-C ---------------------------------------------distr12
-c 12  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[BLOCK] 
-      subroutine distr12
-      integer, parameter :: AN1=8,NL=1000,ER=10000
-      integer :: erri= ER,i
-      integer, allocatable :: A1(:)
-      character(9), parameter :: tname='distr12'
-
-!dvm$ distribute A1(*)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-c !dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region 
-
-!dvm$ get_actual(erri)
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end
-C ----------------------------------------------------distr13
-c 13  DISTR arrA1[BLOCK]    REDISTR arrA1[*] small array  
-      subroutine distr13
-      integer, parameter :: AN1=5,NL=1000,ER=10000
-      integer :: erri= ER,i
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distr13  '
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A1(*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region 
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end
-C ---------------------------------------------distr14
-c 14  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[BLOCK]  small array
-      subroutine distr14
-      integer, parameter :: AN1=5,NL=1000,ER=10000
-      integer :: erri=ER,i
-      integer, allocatable :: A1(:)
-      character(9)  ::  tname='distr14'
-
-!dvm$ distribute A1(*)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-c !dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region 
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-   
-      deallocate (A1)
-
-      end
-C ----------------------------------------------------distr21
-c 21  DISTRIBUTE arrA2[BLOCK][*]	REDISTRIBUTE arrA2[*][ BLOCK]
-      subroutine distr21
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri=ER,i
-      integer, allocatable :: A2(:,:)
-      character(9), parameter :: tname='distr21'
-               
-!dvm$ distribute A2(BLOCK,*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(*,BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A2)
-
-      end
-
-C ----------------------------------------------------distr22
-c 22  DISTRIBUTE arrA2[*][BLOCK]	REDISTRIBUTE arrA2[*][*]
-      subroutine distr22
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri=ER,i
-      integer, allocatable :: A2(:,:)
-      character(9) :: tname='distr22'
-               
-!dvm$ distribute A2(*,BLOCK)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(*,*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-
-C ----------------------------------------------------distr23
-c 23  DISTRIBUTE arrA2[BLOCK][*]	REDISTRIBUTE arrA2[*][ BLOCK]
-      subroutine distr23
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri=ER,i
-      integer, allocatable :: A2(:,:)
-      character(9) :: tname='distr23'
-               
-!dvm$ distribute A2(*,*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-c *dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ redistribute A2(*,BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$  region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr2.fdv
deleted file mode 100644
index 35161b5..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr2.fdv
+++ /dev/null
@@ -1,303 +0,0 @@
-      program DISTR2
-
-c    TESTING distr CLAUSE .       
-
-      print *,'===START OF distr2========================'
-C -------------------------------------------------
-c 24  DISTRIBUTE arrA2[BLOCK][BLOCK]  REDISTRIBUTE arrA2[*][*]
-      call distr24
-C -------------------------------------------------
-c 32  DISTRIBUTE  arrA3[BLOCK][*][ BLOCK] REDISTRIBUTE arrA3[*][BLOCK][BLOCK]
-      call distr32
-C -------------------------------------------------
-c 33  DISTRIBUTE  arrA3[BLOCK][*][ BLOCK] REDISTRIBUTE arrA3[*][BLOCK][*]
-      call distr33
-C -------------------------------------------------
-c 41  DISTRIBUTE arrA4[*][*][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]
-      call distr41
-C -------------------------------------------------
-c 42  DISTRIBUTE arrA4[BLOCK][*][BLOCK][*] REDISTRIBUTE arrA4[*][BLOCK][BLOCK][*]
-      call distr42
-C -------------------------------------------------
-C
-C
-      print *,'=== END OF distr2 ========================= '    
-      end
-
-
-C ----------------------------------------------------distr24
-c 24  DISTRIBUTE arrA2[BLOCK][BLOCK]  REDISTRIBUTE arrA2[*][*]
-      subroutine distr24
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,ia,ja,ib,jb
-      integer, allocatable :: A2(:,:)
-      character(9) :: tname = 'distr24'
-              
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A2(*,*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end
-
-C ----------------------------------------------------distr32
-c 32  DISTRIBUTE  arrA3[BLOCK] [][ BLOCK] REDISTRIBUTE arrA3[] [BLOCK][BLOCK]
-      subroutine distr32
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,ia,ja,na,ib,jb,nb
-      integer, allocatable ::  A3(:,:,:)
-      character(9) :: tname = 'distr32'
-               
-!dvm$ distribute A3(BLOCK,*,BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A3(*,BLOCK,BLOCK)    
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) .eq.(i*NL/10 + j*NL/100 + n)) then     
-                else
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
- 
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distr33
-c 33  DISTRIBUTE  arrA3[BLOCK] [][ BLOCK] REDISTRIBUTE arrA3[] [BLOCK][BLOCK]
-      subroutine distr33
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,ia,ja,na,ib,jb,nb
-      integer, allocatable :: A3(:,:,:)
-      character(9) :: tname = 'distr33'
-               
-!dvm$ distribute A3(BLOCK,*,BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A3(*,BLOCK,*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) .eq.(i*NL/10 + j*NL/100 + n)) then     
-                else
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
- 
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distr41
-c 41  DISTRIBUTE arrA4[*][*][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]
-      subroutine distr41
-      integer, parameter :: AN1=8,AN2=8,AN3=8,AN4=8,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      integer, allocatable :: A4(:,:,:,:)
-      character(9) :: tname = 'distr41'
-               
-!dvm$ distribute A4(*,*,BLOCK,BLOCK)   
-!dvm$ dynamic A4
-
-      allocate (A4(AN1,AN2,AN3,AN4))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A4(*,*,*,*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) .eq.(i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
- 
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-
-      deallocate (A4)
-
-      end
-
-
-C ----------------------------------------------------distr42
-c 42  DISTRIBUTE arrA4[BLOCK][*][BLOCK][*] REDISTRIBUTE arrA4[*][BLOCK][BLOCK][*]
-      subroutine distr42
-      integer, parameter :: AN1=8,AN2=8,AN3=8,AN4=8,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      integer, allocatable :: A4(:,:,:,:)
-      character(9) :: tname = 'distr42'
-               
-!dvm$ distribute A4(BLOCK,*,BLOCK,*)   
-!dvm$ dynamic A4
-
-      allocate (A4(AN1,AN2,AN3,AN4))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A4(*,BLOCK,BLOCK,*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) .eq.(i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
- 
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A4)
-
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr3.fdv
deleted file mode 100644
index 4120c7a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr3.fdv
+++ /dev/null
@@ -1,136 +0,0 @@
-      program DISTR3
-
-c    TESTING distr CLAUSE .       
-
-      print *,'===START OF distr3========================'
-C -------------------------------------------------
-c 31  DISTRIBUTE  arrA3[BLOCK][BLOCK][ BLOCK] REDISTRIBUTE arrA3[*][*][*]
-      call distr31
-C -------------------------------------------------
-c 43  DISTRIBUTE arrA4[BLOCK][*][BLOCK][BLOCK] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][*]
-      call distr43
-C -------------------------------------------------
-C
-      print *,'=== END OF distr3 ========================= '    
-      end
-
-
-C ----------------------------------------------------distr31
-c 31  DISTRIBUTE  arrA3[BLOCK][BLOCK][ BLOCK] REDISTRIBUTE arrA3[*][*][*]
-      subroutine distr31
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri = ER,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      integer, allocatable :: A3(:,:,:)
-      character(9) :: tname = 'distr31'
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A3(*,*,*)    
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) .eq.(i*NL/10 + j*NL/100 + n)) then     
-                else
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distr43
-c 43  DISTRIBUTE arrA4[BLOCK][*][BLOCK][BLOCK] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][*]
-      subroutine distr43
-      integer, parameter :: AN1=8,AN2=8,AN3=8,AN4=8,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      integer, allocatable ::  A4(:,:,:,:)
-      character(9), parameter :: tname = 'distr43'
-               
-!dvm$ distribute A4(BLOCK,*,BLOCK,BLOCK)   
-!dvm$ dynamic A4
-
-      allocate (A4(AN1,AN2,AN3,AN4))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A4(BLOCK,BLOCK,BLOCK,*)    
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) .eq.(i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
- 
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A4)
-
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr4.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr4.fdv
deleted file mode 100644
index 59d7d50..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distr4.fdv
+++ /dev/null
@@ -1,251 +0,0 @@
-      program DISTR4
-
-c    TESTING distr CLAUSE .       
-
-      print *,'===START OF distr4========================'
-C -------------------------------------------------
-c 44  DISTRIBUTE arrA4[*][*][*][*] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]
-      call distr44
-C -------------------------------------------------
-c 45  DISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]
-      call distr45
-C -------------------------------------------------
-c 46  DISTRIBUTE arrA4[*][*][*][*] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]
-c     small array
-      call distr46
-C -------------------------------------------------
-c 47  DISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]
-c     small array
-      call distr47
-C -------------------------------------------------
-C
-      print *,'=== END OF distr4 ========================= '    
-      end
-
-
-C ----------------------------------------------------distr44
-c 44  DISTRIBUTE arrA4[*][*][*][*] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]
-      subroutine distr44
-      integer, parameter :: AN1=8,AN2=8,AN3=8,AN4=8,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      integer, allocatable :: A4(:,:,:,:)
-      character(9), parameter :: tname = 'distr44'
-               
-!dvm$ distribute A4(*,*,*,*)   
-!dvm$ dynamic A4
-
-      allocate ( A4(AN1,AN2,AN3,AN4))     
-
-c *dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ redistribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) .eq.(i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
- 
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------distr45
-c 45  DISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]
-      subroutine distr45
-      integer, parameter :: AN1=8,AN2=8,AN3=8,AN4=8,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      integer, allocatable :: A4(:,:,:,:)
-      character(9), parameter :: tname = 'distr45'
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ dynamic A4
-
-      allocate ( A4(AN1,AN2,AN3,AN4))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A4(*,*,*,*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) .eq.(i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------distr46
-c 46  DISTRIBUTE arrA4[*][*][*][*] REDISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]
-      subroutine distr46
-      integer, parameter :: AN1=5,AN2=4,AN3=3,AN4=2,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      integer, allocatable :: A4(:,:,:,:)
-      character(9), parameter :: tname = 'distr46'
-               
-!dvm$ distribute A4(*,*,*,*)   
-!dvm$ dynamic A4
-
-      allocate ( A4(AN1,AN2,AN3,AN4))
-
-c *dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ redistribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) .eq.(i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
- 
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------distr47
-c 47  DISTRIBUTE arrA4[BLOCK][BLOCK][BLOCK][BLOCK] REDISTRIBUTE arrA4[*][*][*][*]
-      subroutine distr47
-      integer, parameter :: AN1=1,AN2=2,AN3=3,AN4=4,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      integer, allocatable :: A4(:,:,:,:)
-      character(9), parameter :: tname = 'distr47'
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ dynamic A4
-
-      allocate ( A4(AN1,AN2,AN3,AN4))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A4(*,*,*,*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) .eq.(i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A4)
-
-      end
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distrfloat1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distrfloat1.fdv
deleted file mode 100644
index 694873a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR/distrfloat1.fdv
+++ /dev/null
@@ -1,352 +0,0 @@
-      program DISTRFLOAT1
-
-c    TESTING distribute and redistribute CLAUSE .       
-
-      print *, '===START OF distrfloat1=================='
-C --------------------------------------------------
-c 11  DISTRIBUTE arrA1[BLOCK]    REDISTRIBUTE arrA1[*] 
-      call distrf11
-C --------------------------------------------------
-c 12  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[BLOCK] 
-c      call distr12
-C --------------------------------------------------
-c 13  DISTRIBUTE arrA1[BLOCK]    REDISTRIBUTE arrA1[*] small array
-      call distrf13
-C --------------------------------------------------
-c 14  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[BLOCK] small array 
-c      call distrf14
-C --------------------------------------------------
-c 21  DISTRIBUTE arrA2[BLOCK][*]	REDISTRIBUTE arrA2[*][ BLOCK]
-      call distrf21
-C --------------------------------------------------
-c 22  DISTRIBUTE arrA2[*][BLOCK]	REDISTRIBUTE arrA2[*][*]
-c      call distrf22
-C --------------------------------------------------
-c 23  DISTRIBUTE arrA2[*][*]	REDISTRIBUTE arrA2[*][ BLOCK]
-      call distrf23
-C -------------------------------------------------
-C
-      print *, '=== END OF distrfloat1 =================='
-C
-      end
-
-C ----------------------------------------------------distrf11
-c 11  DISTR arrA1[BLOCK]    REDISTR arrA1[*]  
-      subroutine distrf11
-      integer, parameter :: AN1=8,NL=1000,ER=10000
-      integer :: erri= ER,i
-      real, allocatable :: A1(:)
-      character(10) :: tname = 'distrf11'
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end
-C ---------------------------------------------distrf12
-c 12  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[BLOCK] 
-      subroutine distrf12
-      integer, parameter :: AN1=8,NL=1000,ER=10000
-      integer :: erri= ER,i
-      real*8, allocatable :: A1(:)
-      character(10) :: tname = 'distrf12'
-               
-!dvm$ distribute A1(*)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-c *dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-
-      end
-C ----------------------------------------------------distrf13
-c 13  DISTR arrA1[BLOCK]    REDISTR arrA1[*] small array  
-      subroutine distrf13
-      integer, parameter :: AN1=5,NL=1000,ER=10000
-      integer :: erri= ER,i
-      complex, allocatable :: A1(:)
-      character(10) :: tname = 'distrf13'
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end
-C ---------------------------------------------distrf14
-c 14  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[BLOCK]  small array
-      subroutine distrf14
-      integer, parameter :: AN1=5,NL=1000,ER=10000
-      integer :: erri= ER,i
-      complex*16, allocatable :: A1(:)
-      character(10), parameter :: tname = 'distrf14'
-               
-!dvm$ distribute A1(*)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-c *dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end
-C ----------------------------------------------------distrf21
-c 21  DISTRIBUTE arrA2[BLOCK][*]	REDISTRIBUTE arrA2[*][ BLOCK]
-      subroutine distrf21
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER,i
-      real, allocatable ::  A2(:,:)
-      character(10), parameter :: tname = 'distrf21'
-               
-!dvm$ distribute A2(BLOCK,*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A2(*,BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-
-C ----------------------------------------------------distrf22
-c 22  DISTRIBUTE arrA2[*][BLOCK]	REDISTRIBUTE arrA2[*][*]
-      subroutine distrf22
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER,i
-      real*8, allocatable :: A2(:,:)
-      character(10), parameter :: tname = 'distrf22'
-               
-!dvm$ distribute A2(*,BLOCK)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A2(*,*)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end
-
-C ----------------------------------------------------distrf23
-c 23  DISTRIBUTE arrA2[BLOCK][*]	REDISTRIBUTE arrA2[*][ BLOCK]
-      subroutine distrf23
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER,i
-      complex, allocatable :: A2(:,:)
-      character(10), parameter :: tname = 'distrf23'
-               
-!dvm$ distribute A2(*,*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-c *dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ redistribute A2(*,BLOCK)    
-
-!dvm$ actual(erri)
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .eq.(i*NL+j)) then     
-            else
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen1.fdv
deleted file mode 100644
index c89bf3e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen1.fdv
+++ /dev/null
@@ -1,979 +0,0 @@
-      program DISTRGEN1
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directives
-!            GEN_BLOCK, BLOCK, *  distributions
-      
-      integer nproc
-      number_of_processors()=1  
-
-      print *,'===START OF distrgen1 ========================'
-
-      nproc = number_of_processors()  
-
-      if (nproc > 4 ) then  ! may be temporary
-         goto 1
-      endif
-
-C --------------------------------------------------
-c 11  DISTRIBUTE arrA1 [GEN_BLOCK]  
-c                 REDISTRIBUTE arrA1[BLOCK] 
-c                 REDISTRIBUTE arrA1[GEN_BLOCK] 
-        call distrg11 (nproc)
-C --------------------------------------------------
-c 12 DISTRIBUTE arrA1[BLOCK]  
-c                REDISTRIBUTE arrA1[GEN_BLOCK] 
-c                REDISTRIBUTE arrA1[BLOCK] 
-       call distrg12 (nproc)
-C --------------------------------------------------
-c 13  DISTRIBUTE arrA1 [GEN_BLOCK] 
-c                REDISTRIBUTE arrA1[*] 
-c                REDISTRIBUTE arrA1[GEN_BLOCK] 
-        call distrg13 (nproc)
-C --------------------------------------------------
-c 14  DISTRIBUTE arrA1[*]    
-c                 REDISTRIBUTE arrA1[GEN_BLOCK] 
-c                 REDISTRIBUTE arrA1[*] 
-        call distrg14 (nproc)
-C --------------------------------------------------
-c 15  DISTRIBUTE arrA1[GEN_BLOCK] 
-c                REDISTRIBUTE arrA1[GEN_BLOCK] 
-        call distrg15 (nproc)
-C --------------------------------------------------
-c 151 DISTRIBUTE arrA1[GEN_BLOCK] 
-c                                with 0 in BS.1
-c                REDISTRIBUTE arrA1[GEN_BLOCK] 
-        call distrg151 (nproc)
-C --------------------------------------------------
-c 152 DISTRIBUTE arrA1[GEN_BLOCK] 
-c                                with 0 in BS.2
-c                REDISTRIBUTE arrA1[GEN_BLOCK] 
-        call distrg152 (nproc)
-C --------------------------------------------------
-c 21  DISTRIBUTE arrA2[BLOCK][*] 
-c                REDISTRIBUTE arrA2[*][GEN_BLOCK]
-        call distrg21 (nproc)
-C --------------------------------------------------
-c 22  DISTRIBUTE arrA2[*][BLOCK]
-c                 REDISTRIBUTE arrA2[GEN_BLOCK][*]
-        call distrg22 (nproc)
-C --------------------------------------------------
-c 23  DISTRIBUTE arrA2[*][GEN_BLOCK]
-c                 REDISTRIBUTE arrA2[*][*]
-        call distrg23 (nproc)
-C --------------------------------------------------
-c 24  DISTRIBUTE arrA2[*][*]
-c                 REDISTRIBUTE arrA2[GEN_BLOCK][*]
-        call distrg24 (nproc)
-C -------------------------------------------------
-
- 1    print *,'=== END OF distrgen1 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrg11
-c 11  DISTRIBUTE arrA1 [GEN_BLOCK]  
-c                 REDISTRIBUTE arrA1[BLOCK] 
-c                 REDISTRIBUTE arrA1[GEN_BLOCK] 
-
-      subroutine distrg11 (nproc)
-      integer, parameter :: AN1=16,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BS11(1) = (/16/)
-      integer :: BS12(1) = (/16/)
-      integer :: BS21(2) = (/6,10/)
-      integer :: BS22(2) = (/8,8/)
-      integer :: BS31(3) = (/3,7,6/)
-      integer :: BS32(3) = (/4,5,7/)
-      integer :: BS41(4) = (/3,4,8,1/)  
-      integer :: BS42(4) = (/4,4,5,3/)
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrg11  '
-
-!dvm$ distribute :: A1   
-!dvm$ dynamic A1
- 
-      allocate (A1(AN1))
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS1))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS11))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS21))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS31))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS41))    
-      case default 
-      goto 10
-      endselect  
-
-      A1 = 5
-
-!dvm$ actual(A1)
-
-!dvm$ region  
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + i     
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + 2      
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS2))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS12))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS22))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS32))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS42))    
-      case default 
-      goto 10
-      endselect  
-       
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= (i+7)) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-   
- 10   deallocate (A1)
-
-      end subroutine distrg11
-
-C ----------------------------------------------------distrg12
-c 12 DISTRIBUTE arrA1[BLOCK]                    
-c                REDISTRIBUTE arrA1[GEN_BLOCK]  
-c                REDISTRIBUTE arrA1[BLOCK] 
-
-      subroutine distrg12 (nproc)
-      integer nproc
-      
-      integer, parameter :: AN1=14,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BS1(1) = (/14/)
-      integer :: BS2(2) = (/6,8/)
-      integer :: BS3(3) = (/3,5,6/)
-      integer :: BS4(4) = (/4,3,5,2/)
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrg12  '
-
-!dvm$ distribute A1(BLOCK)   
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region inout (A1) 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS))    
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS1))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS2))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS3))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS4))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + 2
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(BLOCK)   
-
-!dvm$ actual(erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            A1(i) = A1(i) - 2
-            if (A1(i) /= i) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A1)
-
-      end subroutine distrg12
-
-C ----------------------------------------------------distrg13
-c 13  DISTRIBUTE arrA1 [GEN_BLOCK] 
-c                REDISTRIBUTE arrA1[*] 
-c                REDISTRIBUTE arrA1[GEN_BLOCK] 
-
-      subroutine distrg13 (nproc)
-      integer, parameter :: AN1=24,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BS11(1) = (/24/)
-      integer :: BS12(1) = (/24/)
-      integer :: BS21(2) = (/3,21/)
-      integer :: BS22(2) = (/17,7/)
-      integer :: BS31(3) = (/13,1,10/)
-      integer :: BS32(3) = (/4,12,8/)
-      integer :: BS41(4) = (/5,7,3,9/)  
-      integer :: BS42(4) = (/10,1,12,1/)  
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrg13  '
-
-!dvm$ distribute :: A1   
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS1))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS11))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS21))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS31))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS41))    
-      case default 
-      goto 10
-      endselect  
-      
-      A1 = 3
-
-!dvm$ actual(A1)
-
-!dvm$ region inout(A1(:AN1)) 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i)*i     
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(*)    
-
-!dvm$ region  inout(A1)
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i)*2     
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS2))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS12))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS22))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS32))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS42))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region inlocal(A1)
-!dvm$ parallel (i) on A1(i), reduction( min(erri) )
-      do i=1,AN1
-            if (A1(i) /= (i*6)) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A1)
-
-      end subroutine distrg13
-
-C ---------------------------------------------distrg14
-c 14  DISTRIBUTE arrA1[*]    
-c                 REDISTRIBUTE arrA1[GEN_BLOCK] 
-c                 REDISTRIBUTE arrA1[*] 
-
-      subroutine distrg14 (nproc)
-      integer nproc
-      integer, parameter :: AN1=13,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BS1(1) = (/13/)
-      integer :: BS2(2) = (/6,7/)
-      integer :: BS3(3) = (/2,1,10/)
-      integer :: BS4(4) = (/4,3,5,1/)
-
-      integer, allocatable :: A1(:)
-      character(*), parameter ::  tname='distrg14  '
-     
-!dvm$ distribute A1(*)   
-!dvm$ dynamic A1
-       
-      allocate (A1(AN1))
-      
-      A1 = 4
-
-!dvm$ actual(A1)
-
-!dvm$ region  inout(A1(1:AN1))
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =A1(i)+i     
-      enddo
-!dvm$ end region   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS1))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS2))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS3))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS4))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ region inout (A1)
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) - 2     
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(*)   
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            A1(i) = A1(i) - 2     
-            if (A1(i) /= (i)) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A1)
-
-      end
-
-C ---------------------------------------------distrg15
-c 15  DISTRIBUTE arrA1[GEN_BLOCK]   different BS1 and BS2
-c                REDISTRIBUTE arrA1[GEN_BLOCK] 
-
-      subroutine distrg15 (nproc)
-      integer, parameter :: AN1=15,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BS11(1) = (/15/)
-      integer :: BS12(1) = (/15/)
-      integer :: BS21(2) = (/5,10/)
-      integer :: BS22(2) = (/8,7/)
-      integer :: BS31(3) = (/2,7,6/)
-      integer :: BS32(3) = (/4,4,7/)
-      integer :: BS41(4) = (/3,4,7,1/)  
-      integer :: BS42(4) = (/4,4,5,2/)
-
-      integer, allocatable :: A1(:)
-      character(*), parameter ::  tname='distrg15  '
-     
-!dvm$ distribute :: A1   
-!dvm$ dynamic A1
-       
-      allocate (A1(AN1))
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS1))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS11))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS21))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS31))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS41))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ region inout (A1(1:5), A1(6:AN1))
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i*4     
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS2))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS12))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS22))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS32))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS42))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  in(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i*4) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A1)
-
-      end subroutine distrg15
-
-C ---------------------------------------------distrg151
-c 151 DISTRIBUTE arrA1[GEN_BLOCK] 
-c                                with 0 in BS.1
-c                REDISTRIBUTE arrA1[GEN_BLOCK] 
-
-      subroutine distrg151 (nproc) 
-      integer, parameter :: AN1=9,ER=10000
-      integer :: erri= ER, i
-     
-      integer :: BS11(1) = (/9/)  ! (/0/) causes RTS err 036.027 
-      integer :: BS12(1) = (/9/)
-      integer :: BS21(2) = (/0,9/)
-      integer :: BS22(2) = (/8,1/)
-      integer :: BS31(3) = (/2,0,7/)
-      integer :: BS32(3) = (/3,5,1/)
-      integer :: BS41(4) = (/3,4,2,0/)  
-      integer :: BS42(4) = (/4,3,1,1/)
-
-      integer, allocatable :: A1(:)
-      character(10), parameter ::  tname='distrg151 '
-     
-!dvm$ distribute :: A1   
-!dvm$ dynamic A1
-       
-      allocate (A1(AN1))
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS1))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS11))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS21))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS31))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS41))    
-      case default 
-      goto 10
-      endselect  
-      
-!dvm$ region in(A1), out(A1)
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i*6     
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS2))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS12))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS22))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS32))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS42))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region inlocal (A1(1:AN1))
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i*6) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10     deallocate (A1)
-
-      end subroutine distrg151
-
-C ---------------------------------------------distrg152
-c 152 DISTRIBUTE arrA1[GEN_BLOCK] 
-c                                with 0 in BS.2
-c                REDISTRIBUTE arrA1[GEN_BLOCK] 
-
-      subroutine distrg152 (nproc)
-      integer, parameter :: AN1=10,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BS11(1) = (/10/)
-      integer :: BS12(1) = (/10/)  ! (/0/) causes RTS err 036.027
-      integer :: BS21(2) = (/1,9/)
-      integer :: BS22(2) = (/10,0/)
-      integer :: BS31(3) = (/2,1,7/)
-      integer :: BS32(3) = (/3,7,0/)
-      integer :: BS41(4) = (/3,4,2,1/)  
-      integer :: BS42(4) = (/4,3,0,3/)
-
-      integer, allocatable :: A1(:)
-      character(10), parameter ::  tname='distrg152 '
-     
-!dvm$ distribute :: A1   
-!dvm$ dynamic A1
-       
-      allocate (A1(AN1))
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS1))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS11))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS21))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS31))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS41))    
-      case default 
-        goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i*2     
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS2))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS12))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS22))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS32))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS42))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i*2) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A1)
-
-      end subroutine distrg152
-
-C ----------------------------------------------------distrg21
-c 21  DISTRIBUTE arrA2[BLOCK][*] 
-c                REDISTRIBUTE arrA2[*][GEN_BLOCK]
-
-      subroutine distrg21 (nproc)
-      integer nproc
-
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER, i
-      
-      integer :: BSj1(1) = (/8/)
-      integer :: BSj2(2) = (/6,2/)
-      integer :: BSj3(3) = (/2,5,1/)
-      integer :: BSj4(4) = (/2,3,1,2/)
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter ::  tname='distrg21  '
-
-!dvm$ distribute A2(BLOCK,*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region inout(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A2(*, GEN_BLOCK(BSj1))    
-      case(2)
-!dvm$ redistribute A2(*, GEN_BLOCK(BSj2))    
-      case (3)
-!dvm$ redistribute A2(*, GEN_BLOCK(BSj3))    
-      case(4)
-!dvm$ redistribute A2(*, GEN_BLOCK(BSj4))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end subroutine distrg21
-
-C ----------------------------------------------------distrg22
-c 22  DISTRIBUTE arrA2[*][BLOCK]
-c                 REDISTRIBUTE arrA2[GEN_BLOCK][*]
-
-      subroutine distrg22 (nproc)
-      integer nproc
-      integer, parameter :: AN1=7,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BSi1(1) = (/7/)
-      integer :: BSi2(2) = (/6,1/)
-      integer :: BSi3(3) = (/2,4,1/)
-      integer :: BSi4(4) = (/2,2,1,2/)
-
-      integer, allocatable :: A2(:,:)
-      character(10), parameter ::  tname='distrg22  '
-
-!dvm$ distribute A2(*,BLOCK)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =2*i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi),*)   
-       
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi1), * )    
-      case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2), * )    
-      case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3), * )    
-      case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4), * )    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  inlocal(A1)
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (2*i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end subroutine distrg22
-
-C ----------------------------------------------------distr23
-c 23  DISTRIBUTE arrA2[*][GEN_BLOCK]
-c                 REDISTRIBUTE arrA2[*][*]
-
-      subroutine distrg23 (nproc)
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BSj1(1) = (/8/)
-      integer :: BSj2(2) = (/6,2/)
-      integer :: BSj3(3) = (/2,2,4/)
-      integer :: BSj4(4) = (/1,2,2,3/)  
-
-      integer, allocatable :: A2(:,:)
-      character(10) :: tname='distrg23  '
-
-!dvm$ distribute :: A2   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ redistribute A2(*,GEN_BLOCK(BSj))   
-       
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A2(*, GEN_BLOCK(BSj1))    
-      case(2)
-!dvm$ redistribute A2(*, GEN_BLOCK(BSj2))    
-      case (3)
-!dvm$ redistribute A2(*, GEN_BLOCK(BSj3))    
-      case(4)
-!dvm$ redistribute A2(*, GEN_BLOCK(BSj4))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ region    in(A2), out(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =3*i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A2(*,*)    
-
-!dvm$ actual(erri)
-
-!dvm$ region in(A2), local(A2)
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (3*i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end subroutine distrg23
-
-C ----------------------------------------------------distrg24
-c 24  DISTRIBUTE arrA2[*][*]
-c                 REDISTRIBUTE arrA2[GEN_BLOCK][*]
-      subroutine distrg24 (nproc)
-      integer, parameter :: AN1=6,AN2=24,NL=1000,ER=10000
-
-      integer :: erri= ER, i
-
-      integer :: BSi1(1) = (/6/)
-      integer :: BSi2(2) = (/5,1/)
-      integer :: BSi3(3) = (/2,3,1/)
-      integer :: BSi4(4) = (/2,1,1,2/)
-
-      integer, allocatable :: A2(:,:)
-      character(10) ::  tname='distrg24  '
-
-!dvm$ distribute A2(*,*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BS1),*)    
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),*)    
-      case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),*)    
-      case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),*)    
-      case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),*)    
-      case default 
-      goto 10
-      endselect  
-                                                                    
-!dvm$ actual(erri)
-
-!dvm$ region  inout(A2)
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10     deallocate (A2)
-
-      end subroutine distrg24
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen2.fdv
deleted file mode 100644
index 605a696..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen2.fdv
+++ /dev/null
@@ -1,1036 +0,0 @@
-      program DISTRG2
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directives
-!            GEN_BLOCK, BLOCK, *  distributions
-      
-      integer PROCESSORS_RANK, PROCESSORS_SIZE 
-      integer psize(2), rank
-
-      PROCESSORS_RANK() = 2
-      PROCESSORS_SIZE(i) = 1
-
-      print *,'===START OF distrgen2========================'
-
-      rank = PROCESSORS_RANK()
-
-      do i=1,rank
-         psize(i)=PROCESSORS_SIZE(i)
-         if (psize(i) > 4) then   !may be temporary
-             goto 1
-         endif
-      enddo
-
-C -------------------------------------------------
-c 25  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] other blocks
-         call distrg25 (psize)
-C -------------------------------------------------
-c 26  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c                             REDISTRIBUTE arrA2[BLOCK][BLOCK]
-c                             REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-         call distrg26 (psize)
-C -------------------------------------------------
-c 27  DISTRIBUTE arrA2[GEN_BLOCK][BLOCK]
-c                         REDISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-c                         REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]
-         call distrg27 (psize)
-C -------------------------------------------------
-c 28  DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-c                         REDISTRIBUTE arrA2[BLOCK][BLOCK]
-c                         REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]
-      call distrg28 (psize)
-C -------------------------------------------------
-c 29  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c                         REDISTRIBUTE arrA2[*][*]
-c                         REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-      call distrg29 (psize)
-C -------------------------------------------------
-c 210 DISTRIBUTE arrA2[GEN_BLOCK][*] 
-c                         REDISTRIBUTE arrA2[*][*]
-c                         REDISTRIBUTE arrA2[*][GEN_BLOCK]
-      call distrg210 (psize)
-C ----------------------------------------------------
-
- 1    print *,'=== END OF distrgen2 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrg25
-c 25  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] other blocks
-
-      subroutine distrg25 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=10,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
- 
-      integer, dimension(1) :: BSi11=(/10/)     
-      integer, dimension(1) :: BSi12=(/10/)     
-      integer, dimension(2) :: BSi21=(/5,5/)     
-      integer, dimension(2) :: BSi22=(/6,4/)     
-      integer, dimension(3) :: BSi31=(/2,3,5/)     
-      integer, dimension(3) :: BSi32=(/8,1,1/)     
-      integer, dimension(4) :: BSi41=(/2,3,4,1/)     
-      integer, dimension(4) :: BSi42=(/2,1,3,4/)     
-
-      integer, dimension(1) :: BSj11=(/12/)     
-      integer, dimension(1) :: BSj12=(/12/)     
-      integer, dimension(2) :: BSj21=(/7,5/)     
-      integer, dimension(2) :: BSj22=(/5,7/)     
-      integer, dimension(3) :: BSj31=(/5,6,1/)     
-      integer, dimension(3) :: BSj32=(/2,6,4/)     
-      integer, dimension(4) :: BSj41=(/1,4,2,5/)     
-      integer, dimension(4) :: BSj42=(/2,4,4,2/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrg25  '
-               
-!dvm$ distribute :: A2   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1))   
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case default 
-        goto 10
-      endselect  
-
-      A2 = 1
-
-!dvm$ actual(A2) 
-
-!dvm$ region  
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j)+ i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))    
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .ne.(i*NL+j) + 1) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-                                                    
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
- 10   deallocate (A2)
-
-      end subroutine distrg25
-
-C ----------------------------------------------------distrg26
-c 26  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c                             REDISTRIBUTE arrA2[BLOCK][BLOCK]
-c                             REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-
-      subroutine distrg26 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=16,AN2=16,NL=1000,ER=10000
-      integer :: erri= ER,i
-
-      integer, dimension(1) :: BSi11=(/16/)     
-      integer, dimension(1) :: BSi12=(/16/)     
-      integer, dimension(2) :: BSi21=(/5,11/)     
-      integer, dimension(2) :: BSi22=(/10,6/)     
-      integer, dimension(3) :: BSi31=(/6,3,7/)     
-      integer, dimension(3) :: BSi32=(/8,4,4/)     
-      integer, dimension(4) :: BSi41=(/4,3,4,5/)     
-      integer, dimension(4) :: BSi42=(/2,5,3,6/)     
-
-      integer, dimension(1) :: BSj11=(/16/)     
-      integer, dimension(1) :: BSj12=(/16/)     
-      integer, dimension(2) :: BSj21=(/7,9/)     
-      integer, dimension(2) :: BSj22=(/10,6/)     
-      integer, dimension(3) :: BSj31=(/5,6,5/)     
-      integer, dimension(3) :: BSj32=(/6,6,4/)     
-      integer, dimension(4) :: BSj41=(/1,8,2,5/)     
-      integer, dimension(4) :: BSj42=(/4,4,4,4/)     
-
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrg26  '
-               
-!dvm$ distribute :: A2   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1))   
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ region out(A2) 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A2(BLOCK,BLOCK)    
-
-!dvm$ region  
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) + 1    
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))   
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case default 
-        goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region in(A2), local(A2) 
-!dvm$ parallel (i,j) on A2(i,j), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) - 1    
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end subroutine distrg26
-
-C ----------------------------------------------------distrg27
-c 27  DISTRIBUTE arrA2[GEN_BLOCK][BLOCK]
-c                         REDISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-c                         REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]
-
-      subroutine distrg27 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=11,AN2=15,NL=1000,ER=10000
-      integer :: erri= ER,i,j
- 
-      integer, dimension(1) :: BSi11=(/11/)     
-      integer, dimension(1) :: BSi12=(/11/)     
-      integer, dimension(2) :: BSi21=(/6,5/)     
-      integer, dimension(2) :: BSi22=(/7,4/)     
-      integer, dimension(3) :: BSi31=(/4,3,4/)     
-      integer, dimension(3) :: BSi32=(/8,2,1/)     
-      integer, dimension(4) :: BSi41=(/3,3,4,1/)     
-      integer, dimension(4) :: BSi42=(/2,2,3,4/)     
-
-      integer, dimension(1) :: BSj11=(/15/)     
-      integer, dimension(1) :: BSj12=(/15/)     
-      integer, dimension(2) :: BSj21=(/10,5/)     
-      integer, dimension(2) :: BSj22=(/8,7/)     
-      integer, dimension(3) :: BSj31=(/5,6,4/)     
-      integer, dimension(3) :: BSj32=(/2,7,8/)     
-      integer, dimension(4) :: BSj41=(/4,4,2,5/)     
-      integer, dimension(4) :: BSj42=(/2,3,7,4/)     
-
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrg27  '
-               
-!dvm$ distribute :: A2   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi1),BLOCK)   
-
-      select case(psize(1))
-
-      case(1)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),BLOCK)    
-      case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),BLOCK)    
-      case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),BLOCK)    
-      case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),BLOCK)    
-      case default 
-      goto 10
-      endselect  
-
-      A2 = 5
-
-!dvm$ actual(A2) 
-
-!dvm$ region  inout (A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j)+ i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj1))    
-
-      select case(psize(2))
-
-      case(1)
-!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj11))    
-      case(2)
-!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj21))    
-      case (3)
-!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj31))    
-      case(4)
-!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj41))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) * 2    
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi2),BLOCK)   
-
-      select case(psize(1))
-
-      case(1)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),BLOCK)    
-      case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),BLOCK)    
-      case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),BLOCK)    
-      case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),BLOCK)    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  in(A2), local(A2)
-!dvm$ parallel (i,j) on A2(i,j), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) / 2    
-            if (A2(i,j) /= (i*NL+j+5)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end subroutine distrg27
-
-C ----------------------------------------------------distrg28
-c 28  DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]
-c                         REDISTRIBUTE arrA2[BLOCK][BLOCK]
-c                         REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK]
-
-      subroutine distrg28 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER,i,j
- 
-      integer, dimension(1) :: BSi1=(/8/)     
-      integer, dimension(2) :: BSi2=(/6,2/)     
-      integer, dimension(3) :: BSi3=(/3,3,2/)     
-      integer, dimension(4) :: BSi4=(/2,2,2,2/)     
-
-      integer, dimension(1) :: BSj1=(/8/)     
-      integer, dimension(2) :: BSj2=(/4,4/)     
-      integer, dimension(3) :: BSj3=(/5,1,2/)     
-      integer, dimension(4) :: BSj4=(/2,1,2,3/)     
-
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrg28  '
-               
-!dvm$ distribute :: A2   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj1))   
-
-      select case(psize(2))
-
-      case(1)
-!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj1))    
-      case(2)
-!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj2))    
-      case (3)
-!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj3))    
-      case(4)
-!dvm$ redistribute A2(BLOCK, GEN_BLOCK(BSj4))    
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ region out(A2(1:AN1, 1:AN2)) 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A2(BLOCK, BLOCK)
-
-!dvm$ region  inout(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) + 5    
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi2),BLOCK)   
-
-      select case(psize(1))
-
-      case(1)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),BLOCK)    
-      case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),BLOCK)    
-      case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),BLOCK)    
-      case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),BLOCK)    
-      case default 
-        goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j) on A2(i,j), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) - 5    
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end subroutine distrg28
-
-C ----------------------------------------------------distrg29
-c 29  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c                         REDISTRIBUTE arrA2[*][*]
-c                         REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]
-
-      subroutine distrg29 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=10,AN2=14,NL=1000,ER=10000
-      integer :: erri= ER,i,j
- 
-      integer, dimension(1) :: BSi11=(/10/)     
-      integer, dimension(1) :: BSi12=(/10/)     
-      integer, dimension(2) :: BSi21=(/5,5/)     
-      integer, dimension(2) :: BSi22=(/6,4/)     
-      integer, dimension(3) :: BSi31=(/2,3,5/)     
-      integer, dimension(3) :: BSi32=(/8,1,1/)     
-      integer, dimension(4) :: BSi41=(/2,3,4,1/)     
-      integer, dimension(4) :: BSi42=(/2,1,3,4/)     
-
-      integer, dimension(1) :: BSj11=(/14/)     
-      integer, dimension(1) :: BSj12=(/14/)     
-      integer, dimension(2) :: BSj21=(/7,7/)     
-      integer, dimension(2) :: BSj22=(/5,9/)     
-      integer, dimension(3) :: BSj31=(/5,6,3/)     
-      integer, dimension(3) :: BSj32=(/2,6,6/)     
-      integer, dimension(4) :: BSj41=(/3,4,2,5/)     
-      integer, dimension(4) :: BSj42=(/4,4,5,1/)     
-
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrg29  '
-               
-!dvm$ distribute :: A2   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi1), GEN_BLOCK(BSj1))   
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41))    
-              case default 
-              goto 10
-          endselect  
-
-      case default 
-        goto 10
-      endselect  
-
-!dvm$ region out (A2(1:AN1, 1:4)), out(A2(1:AN1, 5:AN2)) 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A2(*,*)
-
-!dvm$ region  in(A2), out (A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) * 3    
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))   
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj12))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj22))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj32))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42))    
-              case default 
-              goto 10
-          endselect  
-
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j) on A2(i,j), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) / 3    
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end subroutine distrg29
-
-C ----------------------------------------------------distrg210
-c 210 DISTRIBUTE arrA2[GEN_BLOCK][*] 
-c                         REDISTRIBUTE arrA2[*][*]
-c                         REDISTRIBUTE arrA2[*][GEN_BLOCK]
-
-      subroutine distrg210 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=8,AN2=6,NL=1000,ER=10000
-      integer :: erri= ER,i,j
- 
-      integer, dimension(1) :: BSi1=(/8/)     
-      integer, dimension(2) :: BSi2=(/6,2/)     
-      integer, dimension(3) :: BSi3=(/3,3,2/)     
-      integer, dimension(4) :: BSi4=(/1,2,2,3/)     
-
-      integer, dimension(1) :: BSj1=(/6/)     
-      integer, dimension(2) :: BSj2=(/2,4/)     
-      integer, dimension(3) :: BSj3=(/4,1,1/)     
-      integer, dimension(4) :: BSj4=(/2,1,2,1/)     
-
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrg210 '
-               
-!dvm$ distribute :: A2   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi1),*)   
-
-      select case(psize(1))
-      case(1)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),*)    
-      case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),*)    
-      case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),*)    
-      case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),*)    
-      case default 
-      goto 10
-      endselect  
-      
-!dvm$ region out (A2(1:3, 1:AN2), A2(4:AN1, 1:AN2)) 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A2(*,*)
-
-!dvm$ region  
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) * 3    
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A2(*,GEN_BLOCK(BSj2))   
-
-      select case(psize(1))    ! it's true - psize(1))
-      case(1)
-!dvm$ redistribute A2(*,GEN_BLOCK(BSj1))    
-      case(2)
-!dvm$ redistribute A2(*,GEN_BLOCK(BSj2))    
-      case (3)
-!dvm$ redistribute A2(*,GEN_BLOCK(BSj3))    
-      case(4)
-!dvm$ redistribute A2(*,GEN_BLOCK(BSj4))    
-      case default 
-        goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region   inlocal (A2)
-!dvm$ parallel (i,j) on A2(i,j), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) / 3    
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end subroutine distrg210
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen3.fdv
deleted file mode 100644
index b1bb4b7..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_GEN/distrgen3.fdv
+++ /dev/null
@@ -1,2855 +0,0 @@
-        program DISTRG3
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directives
-!            GEN_BLOCK, BLOCK, *  distributions
-      
-      integer PROCESSORS_RANK, PROCESSORS_SIZE 
-      integer psize(3), rank
-
-      PROCESSORS_RANK() = 3
-      PROCESSORS_SIZE(i) = 1
-
-      print *,'===START OF distrgen3========================'
-
-      rank = PROCESSORS_RANK()
-
-      do i=1,rank
-         psize(i)=PROCESSORS_SIZE(i)
-         if (psize(i) > 4) then   !may be temporary
-             goto 1
-         endif
-      enddo
-C -------------------------------------------------
-      if
-     > ((psize(1) == 1 .and. psize(2) == 1 .and. psize(3) == 1)  !range 1 1 1
-     >.or.
-     >  (psize(1) == 1 .and. psize(2) == 2 .and. psize(3) == 3)  !range 1 2 3
-     >.or.
-     >  (psize(1) == 2 .and. psize(2) == 3 .and. psize(3) == 2)  !range 2 3 2
-     >.or.
-     >  (psize(1) == 3 .and. psize(2) == 1 .and. psize(3) == 4)  !range 3 1 4
-     >.or.
-     >  (psize(1) == 4 .and. psize(2) == 2 .and. psize(3) == 2)) !range 4 2 2
-     >then
-! 31  DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]  
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] other blocks
-        call distrg31 (psize)
-      endif
-! -------------------------------------------------
-      if
-     > ((psize(1) == 1 .and. psize(2) == 1 .and. psize(3) == 1)  !range 1 1 1
-     >.or.
-     >  (psize(1) == 1 .and. psize(2) == 3 .and. psize(3) == 4)  !range 1 3 4
-     >.or.
-     >  (psize(1) == 2 .and. psize(2) == 2 .and. psize(3) == 3)  !range 2 2 3
-     >.or.
-     >  (psize(1) == 3 .and. psize(2) == 4 .and. psize(3) == 1)  !range 3 4 1
-     >.or.
-     >  (psize(1) == 4 .and. psize(2) == 2 .and. psize(3) == 2)) !range 4 2 2
-     >then
-! 32 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] 
-!                REDISTRIBUTE [BLOCK][BLOCK][BLOCK] 
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] 
-        call distrg32 (psize)
-      endif
-! -------------------------------------------------
-! 33  DISTRIBUTE arrA3[BLOCK][GEN_BLOCK][GEN_BLOCK]   allocatable 
-!     DISTRIBUTE arrB3[BLOCK][GEN_BLOCK][GEN_BLOCK]   static
-!                REDISTRIBUTE [GEN_BLOCK][BLOCK][BLOCK]
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]
-        call distrg33  (psize)
-! -------------------------------------------------
-      if
-     > ((psize(1) == 1 .and. psize(2) == 1 .and. psize(3) == 1)  !range 1 1 1
-     >.or.
-     >  (psize(1) == 1 .and. psize(2) == 2 .and. psize(3) == 2)  !range 1 2 2
-     >.or.
-     >  (psize(1) == 2 .and. psize(2) == 4 .and. psize(3) == 2)  !range 2 4 2
-     >.or.
-     >  (psize(1) == 3 .and. psize(2) == 1 .and. psize(3) == 2)  !range 3 1 2
-     >.or.
-     >  (psize(1) == 4 .and. psize(2) == 1 .and. psize(3) == 4) !range 4 1 4
-     >) then
-! 34 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]  !static 
-!                REDISTRIBUTE [GEN_BLOCK][*][BLOCK]
-!      DISTRIBUTE arrB3[GEN_BLOCK][*][BLOCK]            !static
-!                 REDISTRIBUTE [BLOCK][GEN_BLOCK][*]
-        call distrg34 (psize)
-      endif
-! -------------------------------------------------
-      if
-     > ((psize(1) == 1 .and. psize(2) == 1 .and. psize(3) == 1)  !range 1 1 1
-     >.or.
-     >  (psize(1) == 1 .and. psize(2) == 3 .and. psize(3) == 2)  !range 1 3 2
-     >.or.
-     >  (psize(1) == 2 .and. psize(2) == 2 .and. psize(3) == 4)  !range 2 2 4
-     >.or.
-     >  (psize(1) == 3 .and. psize(2) == 2 .and. psize(3) == 2)  !range 3 2 2
-     >.or.
-     >  (psize(1) == 4 .and. psize(2) == 2 .and. psize(3) == 2)) !range 4 2 2
-     >then
-
-! 35  DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] 
-!                REDISTRIBUTE arrA2[*][*][*]
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-        call distrg35 (psize)
-      endif
-! -------------------------------------------------
-! 36 DISTRIBUTE arrA3[GEN_BLOCK][BLOCK][GEN_BLOCK]   
-!                REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-!                REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]
-        call distrg36 (psize)
-! -------------------------------------------------
-! 37 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][BLOCK]
-!                REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-!                REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-!                REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]
-      call distrg37 (psize)
-! -------------------------------------------------
-! 38  DISTRIBUTE arrA3 [GEN_BLOCK][*][GEN_BLOCK] 
-!                REDISTRIBUTE [*][GEN_BLOCK][*]
-!                REDISTRIBUTE[GEN_BLOCK][GEN_BLOCK][*]
-!                REDISTRIBUTE[*][GEN_BLOCK][GEN_BLOCK]
-      call distrg38 (psize)
-! -------------------------------------------------
-! 39 DISTRIBUTE arrA3 [*][GEN_BLOCK][GEN_BLOCK]  
-!                REDISTRIBUTE [GEN_BLOCK][*][*]
-!                REDISTRIBUTE[GEN_BLOCK][*][GEN_BLOCK]
-      call distrg39 (psize)
-! -------------------------------------------------
-! 310 DISTRIBUTE arrA3 [GEN_BLOCK][GEN_BLOCK][BLOCK]  
-!                REDISTRIBUTE [*][*][GEN_BLOCK]
-!                REDISTRIBUTE[*][GEN_BLOCK][BLOCK]
-       call distrg310 (psize)
-! -------------------------------------------------
-! 311 DISTRIBUTE arrA3 [GEN_BLOCK][*][*]  
-!                REDISTRIBUTE [*][*][*]
-!                REDISTRIBUTE [BLOCK][*][GEN_BLOCK]
-        call distrg311 (psize)
-
-! -------------------------------------------------
-
- 1    print *,'=== END OF distrgen3 ========================= '    
-
-      end
-                                             
-! ----------------------------------------------------distrg31
-! 31  DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]     range 1 1 1
-!        REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]     range 1 2 3
-!                                                           range 2 3 2
-!                                                           range 3 1 4
-!                                                           range 4 2 2
-      subroutine distrg31 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=6,AN2=6,AN3=6,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
- 
-      integer, dimension(1) :: BSi111=(/6/)       !range 1 1 1  
-      integer, dimension(1) :: BSj111=(/6/)     
-      integer, dimension(1) :: BSk111=(/6/)     
-
-      integer, dimension(1) :: BSi11=(/6/)        !range 1 2 3  
-      integer, dimension(1) :: BSi12=(/6/)           
-      integer, dimension(2) :: BSj11=(/5,1/)     
-      integer, dimension(2) :: BSj12=(/2,4/)     
-      integer, dimension(3) :: BSk11=(/1,4,1/)     
-      integer, dimension(3) :: BSk12=(/1,2,3/)     
-
-      integer, dimension(2) :: BSi21=(/4,2/)      !range 2 3 2  
-      integer, dimension(2) :: BSi22=(/1,5/)     
-      integer, dimension(3) :: BSj21=(/3,2,1/)     
-      integer, dimension(3) :: BSj22=(/5,1,0/)     
-      integer, dimension(2) :: BSk21=(/2,4/)     
-      integer, dimension(2) :: BSk22=(/5,1/)    
-
-      integer, dimension(3) :: BSi31=(/2,2,2/)    !range 3 1 4  
-      integer, dimension(3) :: BSi32=(/3,2,1/)     
-      integer, dimension(1) :: BSj31=(/6/)     
-      integer, dimension(1) :: BSj32=(/6/)     
-      integer, dimension(4) :: BSk31=(/1,2,2,1/)     
-      integer, dimension(4) :: BSk32=(/2,2,1,1/)     
-
-      integer, dimension(4) :: BSi41=(/2,1,2,1/)  !range 4 2 2  
-      integer, dimension(4) :: BSi42=(/1,2,1,2/)     
-      integer, dimension(2) :: BSj41=(/5,1/)     
-      integer, dimension(2) :: BSj42=(/2,4/)     
-      integer, dimension(2) :: BSk41=(/4,2/)     
-      integer, dimension(2) :: BSk42=(/6,0/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrg31  '
-
-!dvm$ distribute :: A3
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ distribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))   
-
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11),GEN_BLOCK(BSk11))   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21),GEN_BLOCK(BSk21))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31),GEN_BLOCK(BSk31))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41),GEN_BLOCK(BSk41))   
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ region  out(A3)
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-  
-
-!!!!dvm$  redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2),GEN_BLOCK(BSk2))   
-
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12),GEN_BLOCK(BSk12))   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22),GEN_BLOCK(BSk22))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32),GEN_BLOCK(BSk32))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42),GEN_BLOCK(BSk42))   
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region in(A3) 
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo 
-!dvm$ end region   
-     
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrg31
-
-! ----------------------------------------------------distrg32
-! 32  DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]         range 1 1 1 
-!                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]             range 1 3 4
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] range 2 2 3
-!                                                               range 3 4 1
-!                                                               range 4 2 2
-      subroutine distrg32 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=8,AN2=6,AN3=14,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, dimension(1) :: BSi111=(/8/)        !range 1 1 1  
-      integer, dimension(1) :: BSj111=(/6/)     
-      integer, dimension(1) :: BSk111=(/14/)     
-
-      integer, dimension(1) :: BSi11=(/8/)         !range 1 3 4
-      integer, dimension(1) :: BSi12=(/8/)           
-      integer, dimension(3) :: BSj11=(/2,4,0/)     
-      integer, dimension(3) :: BSj12=(/3,2,1/)     
-      integer, dimension(4) :: BSk11=(/1,4,3,6/)     
-      integer, dimension(4) :: BSk12=(/5,2,4,3/)     
-
-      integer, dimension(2) :: BSi21=(/6,2/)       !range 2 2 3  
-      integer, dimension(2) :: BSi22=(/1,7/)     
-      integer, dimension(2) :: BSj21=(/3,3/)     
-      integer, dimension(2) :: BSj22=(/5,1/)     
-      integer, dimension(3) :: BSk21=(/10,3,1/)     
-      integer, dimension(3) :: BSk22=(/4,8,2/)    
-
-      integer, dimension(3) :: BSi31=(/3,2,3/)     !range 3 4 1 
-      integer, dimension(3) :: BSi32=(/2,4,2/)     
-      integer, dimension(4) :: BSj31=(/2,1,1,2/)     
-      integer, dimension(4) :: BSj32=(/1,2,3,0/)     
-      integer, dimension(1) :: BSk31=(/14/)     
-      integer, dimension(1) :: BSk32=(/14/)     
-
-      integer, dimension(4) :: BSi41=(/3,2,1,2/)   !range 4 2 2  
-      integer, dimension(4) :: BSi42=(/4,1,2,1/)     
-      integer, dimension(2) :: BSj41=(/5,1/)     
-      integer, dimension(2) :: BSj42=(/2,4/)     
-      integer, dimension(2) :: BSk41=(/7,7/)     
-      integer, dimension(2) :: BSk42=(/6,8/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrg32  '
-
-!dvm$ distribute :: A3   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ distribute A3(GEN_BLOCK(BSi),GEN_BLOCK(BSj),GEN_BLOCK(BSk))   
-
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11),GEN_BLOCK(BSk11))   
-         endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21),GEN_BLOCK(BSk21))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31),GEN_BLOCK(BSk31))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41),GEN_BLOCK(BSk41))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k + 1   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A3(BLOCK,BLOCK,BLOCK)   
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 1   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi),GEN_BLOCK(BSj),GEN_BLOCK(BSk))   
-
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute 
-!dvm$*    A3(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12),GEN_BLOCK(BSk12))   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22),GEN_BLOCK(BSk22))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32),GEN_BLOCK(BSk32))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42),GEN_BLOCK(BSk42))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region   inlocal(A3)
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 2)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrg32
-
-! ----------------------------------------------------distrg33
-! 33  DISTRIBUTE arrA3[BLOCK][GEN_BLOCK][GEN_BLOCK]   allocatable 
-!     DISTRIBUTE arrB3[BLOCK][GEN_BLOCK][GEN_BLOCK]   static
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]
-
-      subroutine distrg33 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=12,AN2=17,AN3=16,NL=1000,ER=10000
-      integer, parameter :: BN1=10,BN2=10,BN3=10
-      integer :: erria=ER, errib=ER,i,j,k
-
-      integer, dimension(1) :: BSai11=(/12/)      
-      integer, dimension(1) :: BSai12=(/12/)           
-      integer, dimension(2) :: BSai21=(/3,9/)       
-      integer, dimension(2) :: BSai22=(/11,1/)     
-      integer, dimension(3) :: BSai31=(/4,0,8/)     
-      integer, dimension(3) :: BSai32=(/6,4,2/)     
-      integer, dimension(4) :: BSai41=(/1,2,3,6/)   !rem
-      integer, dimension(4) :: BSai42=(/3,8,0,1/)     
-
-      integer, dimension(1) :: BSaj11=(/17/)     
-      integer, dimension(1) :: BSaj12=(/17/)     
-      integer, dimension(2) :: BSaj21=(/3,14/)     
-      integer, dimension(2) :: BSaj22=(/4,13/)     
-      integer, dimension(3) :: BSaj31=(/6,1,10/)     
-      integer, dimension(3) :: BSaj32=(/11,6,0/)     
-      integer, dimension(4) :: BSaj41=(/5,0,11,1/)     
-      integer, dimension(4) :: BSaj42=(/11,3,1,2/)     
-
-      integer, dimension(1) :: BSak11=(/16/)     
-      integer, dimension(1) :: BSak12=(/16/)     
-      integer, dimension(2) :: BSak21=(/12,4/)     
-      integer, dimension(2) :: BSak22=(/7,9/)    	!rem
-      integer, dimension(3) :: BSak31=(/2,4,10/)     
-      integer, dimension(3) :: BSak32=(/3,1,12/)     
-      integer, dimension(4) :: BSak41=(/6,2,5,3/)     
-      integer, dimension(4) :: BSak42=(/1,7,6,2/)     
-
-
-      integer, dimension(1) :: BSbi11=(/10/)        
-      integer, dimension(1) :: BSbi12=(/10/)           
-      integer, dimension(2) :: BSbi21=(/3,7/)       
-      integer, dimension(2) :: BSbi22=(/1,9/)     
-      integer, dimension(3) :: BSbi31=(/3,2,5/)     
-      integer, dimension(3) :: BSbi32=(/2,6,2/)     
-      integer, dimension(4) :: BSbi41=(/1,2,5,2/)   
-      integer, dimension(4) :: BSbi42=(/3,1,0,6/)     
-
-      integer, dimension(1) :: BSbj11=(/10/)     
-      integer, dimension(1) :: BSbj12=(/10/)     
-      integer, dimension(2) :: BSbj21=(/6,4/)     
-      integer, dimension(2) :: BSbj22=(/7,3/)     
-      integer, dimension(3) :: BSbj31=(/1,5,4/)     
-      integer, dimension(3) :: BSbj32=(/3,1,6/)     
-      integer, dimension(4) :: BSbj41=(/5,0,2,3/)     
-      integer, dimension(4) :: BSbj42=(/2,3,4,1/)     
-
-      integer, dimension(1) :: BSbk11=(/10/)     
-      integer, dimension(1) :: BSbk12=(/10/)     
-      integer, dimension(2) :: BSbk21=(/5,5/)     
-      integer, dimension(2) :: BSbk22=(/2,8/)    
-      integer, dimension(3) :: BSbk31=(/1,1,8/)     
-      integer, dimension(3) :: BSbk32=(/3,5,2/)     
-      integer, dimension(4) :: BSbk41=(/1,2,3,4/)     
-      integer, dimension(4) :: BSbk42=(/4,3,2,1/)     
-
-      integer, allocatable :: A3(:,:,:)
-      integer B3(BN1,BN2,BN3)
-      character(10), parameter :: tname='distrg33  '
-
-!dvm$ distribute :: A3
-!dvm$ distribute :: B3
-!dvm$ dynamic A3, B3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSaj1),GEN_BLOCK(BSak1))   
-!!!!dvm$ redistribute B3(BLOCK,GEN_BLOCK(BSbj1),GEN_BLOCK(BSbk1))   
-
-      select case(psize(2))
-      case(1)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj11),GEN_BLOCK(BSak11))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj11),GEN_BLOCK(BSbk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj11),GEN_BLOCK(BSak21))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj11),GEN_BLOCK(BSbk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj11),GEN_BLOCK(BSak31))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj11),GEN_BLOCK(BSbk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj11),GEN_BLOCK(BSak41))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj11),GEN_BLOCK(BSbk41))   
-         case default 
-           goto 10
-         endselect  
-
-      case(2)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj21),GEN_BLOCK(BSak11))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj21),GEN_BLOCK(BSbk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj21),GEN_BLOCK(BSak21))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj21),GEN_BLOCK(BSbk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj21),GEN_BLOCK(BSak31))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj21),GEN_BLOCK(BSbk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj21),GEN_BLOCK(BSak41))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj21),GEN_BLOCK(BSbk41))   
-         case default 
-           goto 10
-         endselect  
-
-      case (3)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj31),GEN_BLOCK(BSak11))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj31),GEN_BLOCK(BSbk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj31),GEN_BLOCK(BSak21))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj31),GEN_BLOCK(BSbk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj31),GEN_BLOCK(BSak31))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj31),GEN_BLOCK(BSbk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj31),GEN_BLOCK(BSak41))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj31),GEN_BLOCK(BSbk41))   
-         case default 
-           goto 10
-         endselect  
-
-      case (4)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj41),GEN_BLOCK(BSak11))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj41),GEN_BLOCK(BSbk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj41),GEN_BLOCK(BSak21))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj41),GEN_BLOCK(BSbk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj41),GEN_BLOCK(BSak31))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj41),GEN_BLOCK(BSbk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSaj41),GEN_BLOCK(BSak41))   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj41),GEN_BLOCK(BSbk41))   
-         case default 
-           goto 10
-         endselect  
-
-      case default 
-        goto 10
-      endselect  
-
-!dvm$ region   out (A3, B3)
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,k) on B3(i,j,k)
-      do i=1,BN1
-          do j=1,BN2
-             do k=1,BN3
-                B3(i,j,k) = (i*NL/10 + j*NL/100 + k) * 2   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSai2),BLOCK,BLOCK)   
-!!!!dvm$ redistribute B3(GEN_BLOCK(BSbi2),BLOCK,BLOCK)   
-
-      select case(psize(1))
-      case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai11),BLOCK,BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi11),BLOCK,BLOCK)   
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai21),BLOCK,BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi21),BLOCK,BLOCK)   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai31),BLOCK,BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi31),BLOCK,BLOCK)   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai41),BLOCK,BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi41),BLOCK,BLOCK)   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  inout (A3, B3)
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) * 2   
-             enddo
-          enddo
-      enddo
-!dvm$ parallel (i,j,k) on B3(i,j,k)
-      do i=1,BN1
-          do j=1,BN2
-             do k=1,BN3
-                B3(i,j,k) = B3(i,j,k)/ 2   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSai2),GEN_BLOCK(BSaj2),BLOCK)   
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSbi2),GEN_BLOCK(BSbj2),BLOCK)   
-
-      select case(psize(1))
-      case(1)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai12),GEN_BLOCK(BSaj12),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi12),GEN_BLOCK(BSbj12),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai12),GEN_BLOCK(BSaj22),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi12),GEN_BLOCK(BSbj22),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai12),GEN_BLOCK(BSaj32),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi12),GEN_BLOCK(BSbj32),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai12),GEN_BLOCK(BSaj42),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi12),GEN_BLOCK(BSbj42),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai22),GEN_BLOCK(BSaj12),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi22),GEN_BLOCK(BSbj12),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai22),GEN_BLOCK(BSaj22),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi22),GEN_BLOCK(BSbj22),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai22),GEN_BLOCK(BSaj32),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi22),GEN_BLOCK(BSbj32),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai22),GEN_BLOCK(BSaj42),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi22),GEN_BLOCK(BSbj42),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case (3)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai32),GEN_BLOCK(BSaj12),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi32),GEN_BLOCK(BSbj12),BLOCK)   !rem
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai32),GEN_BLOCK(BSaj22),BLOCK)   !rem
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi32),GEN_BLOCK(BSbj22),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai32),GEN_BLOCK(BSaj32),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi32),GEN_BLOCK(BSbj32),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai32),GEN_BLOCK(BSaj42),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi32),GEN_BLOCK(BSbj42),BLOCK)   
-         case default 
-           goto 10
-         endselect  
-
-      case (4)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai42),GEN_BLOCK(BSaj12),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi42),GEN_BLOCK(BSbj12),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai42),GEN_BLOCK(BSaj22),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi42),GEN_BLOCK(BSbj22),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai42),GEN_BLOCK(BSaj32),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi42),GEN_BLOCK(BSbj32),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai42),GEN_BLOCK(BSaj42),BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi42),GEN_BLOCK(BSbj42),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region inlocal (a3), inlocal (B3) 
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erria))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k)/ 2   
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erria = min(erria,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ parallel (i,j,k) on B3(i,j,k), reduction(min(errib))
-      do i=1,BN1
-          do j=1,BN2
-             do k=1,BN3
-                if (B3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    errib = min(errib,i*NL/10 + j*NL/100 + k)
-                endif 
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erria, errib)
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrg33
-
-! ----------------------------------------------------distrg34
-! 34 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]    static  range 1 1 1
-!                REDISTRIBUTE [GEN_BLOCK][*][BLOCK]               range 1 2 2
-!     DISTRIBUTE arrB3[GEN_BLOCK][*][BLOCK]               static  range 2 4 2
-!                 REDISTRIBUTE [BLOCK][GEN_BLOCK][*]              range 3 1 2
-!                                                                 range 4 1 4
-      subroutine distrg34 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=16,AN2=16,AN3=16,NL=1000,ER=10000
-      integer, parameter :: BN1=12,BN2=17,BN3=11
-      integer :: erria=ER, errib=ER,i,j,k
-
-      integer, dimension(1) :: BSai111=(/16/)       !range 1 1 1  
-      integer, dimension(1) :: BSaj111=(/16/)     
-      integer, dimension(1) :: BSak111=(/16/)     
-
-      integer, dimension(1) :: BSai11=(/16/)        !range 1 2 2  
-      integer, dimension(1) :: BSai12=(/16/)           
-      integer, dimension(2) :: BSaj11=(/6,10/)     
-      integer, dimension(2) :: BSaj12=(/4,12/)     
-      integer, dimension(2) :: BSak11=(/10,6/)     
-      integer, dimension(2) :: BSak12=(/12,4/)     
-
-      integer, dimension(2) :: BSai21=(/2,14/)      !range 2 4 2  
-      integer, dimension(2) :: BSai22=(/13,3/)     
-      integer, dimension(4) :: BSaj21=(/3,4,3,6/)     
-      integer, dimension(4) :: BSaj22=(/6,6,2,2/)     
-      integer, dimension(2) :: BSak21=(/1,15/)     
-      integer, dimension(2) :: BSak22=(/7,9/)    
-
-      integer, dimension(3) :: BSai31=(/3,2,11/)    !range 3 1 2  
-      integer, dimension(3) :: BSai32=(/2,12,2/)     
-      integer, dimension(1) :: BSaj31=(/16/)     
-      integer, dimension(1) :: BSaj32=(/16/)     
-      integer, dimension(2) :: BSak31=(/3,13/)     
-      integer, dimension(2) :: BSak32=(/4,12/)     
-
-      integer, dimension(4) :: BSai41=(/1,2,5,8/)   !range 4 1 4  
-      integer, dimension(4) :: BSai42=(/3,11,0,2/)     
-      integer, dimension(1) :: BSaj41=(/16/)     
-      integer, dimension(1) :: BSaj42=(/16/)     
-c      integer, dimension(4) :: BSak41=(/1,5,0,10/)     
-      integer, dimension(4) :: BSak41=(/1,5,2,8/)     !rem
-      integer, dimension(4) :: BSak42=(/6,2,5,3/)     
-
-      integer, dimension(1) :: BSbi111=(/12/)        !range 1 1 1  
-      integer, dimension(1) :: BSbj111=(/17/)     
-      integer, dimension(1) :: BSbk111=(/11/)     
-
-
-      integer, dimension(1) :: BSbi11=(/12/)        !range 1 2 2  
-      integer, dimension(1) :: BSbi12=(/12/)           
-      integer, dimension(2) :: BSbj11=(/6,11/)     
-      integer, dimension(2) :: BSbj12=(/14,3/)     
-      integer, dimension(2) :: BSbk11=(/10,1/)     
-      integer, dimension(2) :: BSbk12=(/4,7/)     
-
-      integer, dimension(2) :: BSbi21=(/5,7/)       !range 2 4 2  
-      integer, dimension(2) :: BSbi22=(/3,9/)     
-      integer, dimension(4) :: BSbj21=(/5,2,8,2/)     
-      integer, dimension(4) :: BSbj22=(/7,3,2,5/)     
-      integer, dimension(2) :: BSbk21=(/5,6/)     
-      integer, dimension(2) :: BSbk22=(/3,8/)    
-
-      integer, dimension(3) :: BSbi31=(/3,4,5/)     !range 3 1 2  
-      integer, dimension(3) :: BSbi32=(/4,6,2/)     
-      integer, dimension(1) :: BSbj31=(/17/)     
-      integer, dimension(1) :: BSbj32=(/17/)     
-      integer, dimension(2) :: BSbk31=(/4,7/)     
-      integer, dimension(2) :: BSbk32=(/8,3/)     
-
-      integer, dimension(4) :: BSbi41=(/4,1,5,2/)   !range 4 1 4  
-c      integer, dimension(4) :: BSbi42=(/3,4,2,4/)     
-      integer, dimension(4) :: BSbi42=(/3,4,2,3/)     
-      integer, dimension(1) :: BSbj41=(/17/)     
-      integer, dimension(1) :: BSbj42=(/17/)     
-c      integer, dimension(4) :: BSbk41=(/1,4,2,5/)     
-      integer, dimension(4) :: BSbk41=(/1,4,2,4/)     
-      integer, dimension(4) :: BSbk42=(/2,3,4,2/)     
-
-      integer A3(AN1,AN2,AN3), B3(BN1,BN2,BN3)
-      character(10), parameter :: tname='distrg34  '
-
-!dvm$ distribute :: A3
-!dvm$ distribute :: B3
-!dvm$ dynamic A3, B3
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSai1),GEN_BLOCK(BSaj1),GEN_BLOCK(BSak1))   
-!!!!dvm$ redistribute B3(GEN_BLOCK(BSbi1),*, BLOCK)   
-
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai111),GEN_BLOCK(BSaj111),GEN_BLOCK(BSak111))   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi111),*, BLOCK)   
-         else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai11),GEN_BLOCK(BSaj11),GEN_BLOCK(BSak11))   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi11),*, BLOCK)   
-         endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai21),GEN_BLOCK(BSaj21),GEN_BLOCK(BSak21))   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi21),*, BLOCK)   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai31),GEN_BLOCK(BSaj31),GEN_BLOCK(BSak31))   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi31),*, BLOCK)   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai41),GEN_BLOCK(BSaj41),GEN_BLOCK(BSak41))   
-!dvm$ redistribute
-!dvm$*    B3(GEN_BLOCK(BSbi41),*, BLOCK)   
-      case default 
-        goto 10
-      endselect  
-      A3 = 10
-      B3 = 7
-!dvm$ actual(A3, B3)
-
-!dvm$ region  in(A3,B3), out(A3,B3) 
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k  
-             enddo
-          enddo
-      enddo
-   
-!dvm$ parallel (i,j,k) on B3(i,j,k)
-      do i=1,BN1
-          do j=1,BN2
-             do k=1,BN3
-                B3(i,j,k) = B3(i,j,k) + (i*NL/10 + j*NL/100 + k)   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSai1),*,BLOCK)   
-!!!!dvm$ redistribute B3(BLOCK, GEN_BLOCK(BSbj2),*)   
-
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai111),*,BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK, GEN_BLOCK(BSbj111),*)   
-         else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai12),*,BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj12),*)   
-          endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai22),*,BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj22),*)   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai32),*,BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj32),*)   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSai42),*,BLOCK)   
-!dvm$ redistribute
-!dvm$*    B3(BLOCK,GEN_BLOCK(BSbj42),*)   
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erria))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) - 10   
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erria = min(erria,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ parallel (i,j,k) on B3(i,j,k), reduction (min(errib))
-      do i=1,BN1
-          do j=1,BN2
-             do k=1,BN3
-                if (B3(i,j,k) /= (i*NL/10 + j*NL/100 + k+ 7)) then     
-                    errib = min(errib,i*NL/10 + j*NL/100 + k)
-                endif 
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erria, errib)
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 10   continue
-      end subroutine distrg34
-
-! ----------------------------------------------------distrg35
-! 35  DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]         range 1 1 1
-!                REDISTRIBUTE arrA2[*][*][*]                    range 1 3 2
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] range 2 2 4
-!                                                               range 3 2 2
-!                                                               range 4 2 2
-      subroutine distrg35 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=16,AN2=16,AN3=16,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, dimension(1) :: BSi111=(/16/)        !range 1 1 1  
-      integer, dimension(1) :: BSj111=(/16/)     
-      integer, dimension(1) :: BSk111=(/16/)     
-
-      integer, dimension(1) :: BSi11=(/16/)         !range 1 3 2  
-      integer, dimension(1) :: BSi12=(/16/)           
-      integer, dimension(3) :: BSj11=(/6,5,5/)     
-      integer, dimension(3) :: BSj12=(/3,2, 11/)     
-      integer, dimension(2) :: BSk11=(/12,4/)     
-      integer, dimension(2) :: BSk12=(/10,6/)     
-
-      integer, dimension(2) :: BSi21=(/6,10/)       !range 2 2 4 
-      integer, dimension(2) :: BSi22=(/1,15/)     
-      integer, dimension(2) :: BSj21=(/4,12/)     
-      integer, dimension(2) :: BSj22=(/5,11/)     
-      integer, dimension(4) :: BSk21=(/10,4,1,1/)     
-      integer, dimension(4) :: BSk22=(/5,3,2,6/)    
-
-      integer, dimension(3) :: BSi31=(/3,2,11/)     !range 3 2 2  
-      integer, dimension(3) :: BSi32=(/12,1,3/)     
-      integer, dimension(2) :: BSj31=(/6,10/)     
-      integer, dimension(2) :: BSj32=(/4,12/)     
-      integer, dimension(2) :: BSk31=(/3,13/)     
-      integer, dimension(2) :: BSk32=(/15,1/)     
-
-      integer, dimension(4) :: BSi41=(/3,2,1,10/)   !range 4 2 2  
-      integer, dimension(4) :: BSi42=(/4,8,2,2/)     
-      integer, dimension(2) :: BSj41=(/13,3/)     
-      integer, dimension(2) :: BSj42=(/12,4/)     
-      integer, dimension(2) :: BSk41=(/7,9/)     
-      integer, dimension(2) :: BSk42=(/10,6/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrg35  '
-
-!dvm$ distribute ::A3
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))   
-
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11),GEN_BLOCK(BSk11))   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21),GEN_BLOCK(BSk21))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31),GEN_BLOCK(BSk31))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41),GEN_BLOCK(BSk41))   
-      case default 
-      goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k + 3   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A3(*,*,*)    
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 3   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2),GEN_BLOCK(BSk2))   
-
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12),GEN_BLOCK(BSk12))   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22),GEN_BLOCK(BSk22))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32),GEN_BLOCK(BSk32))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42),GEN_BLOCK(BSk42))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 6)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrg35
-
-! ----------------------------------------------------distrg36
-! 36 DISTRIBUTE arrA3[GEN_BLOCK][BLOCK][GEN_BLOCK]   
-!                REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-!                REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-!                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]
-
-      subroutine distrg36 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=12,AN2=12,AN3=5,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, dimension(1) :: BSi11=(/12/)       
-      integer, dimension(1) :: BSi12=(/12/)           
-      integer, dimension(2) :: BSi21=(/10,2/)     
-      integer, dimension(2) :: BSi22=(/4,8/)     
-      integer, dimension(3) :: BSi31=(/4,2,6/)    
-      integer, dimension(3) :: BSi32=(/6,4,2/)     
-      integer, dimension(4) :: BSi41=(/4,2,4,2/)  
-      integer, dimension(4) :: BSi42=(/4,1,6,1/)     
-
-      integer, dimension(1) :: BSj11=(/12/)     
-      integer, dimension(1) :: BSj12=(/12/)     
-      integer, dimension(2) :: BSj21=(/4,8/)     
-      integer, dimension(2) :: BSj22=(/5,7/)     
-      integer, dimension(3) :: BSj31=(/3,3,6/)     
-      integer, dimension(3) :: BSj32=(/6,4,2/)     
-      integer, dimension(4) :: BSj41=(/5,1,2,4/)     
-      integer, dimension(4) :: BSj42=(/2,1,3,6/)     
-
-      integer, dimension(1) :: BSk11=(/5/)     
-      integer, dimension(1) :: BSk12=(/5/)     
-      integer, dimension(2) :: BSk21=(/0,5/)     
-      integer, dimension(2) :: BSk22=(/3,2/)    
-      integer, dimension(3) :: BSk31=(/2,2,1/)     
-      integer, dimension(3) :: BSk32=(/1,1,3/)     
-      integer, dimension(4) :: BSk41=(/1,0,2,2/)     
-      integer, dimension(4) :: BSk42=(/1,0,1,3/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrg36  '
-
-!dvm$ distribute :: A3
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk1))   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(3))
-              case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),BLOCK,GEN_BLOCK(BSk11))    
-              case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),BLOCK,GEN_BLOCK(BSk21))    
-              case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),BLOCK,GEN_BLOCK(BSk31))    
-              case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),BLOCK,GEN_BLOCK(BSk41))    
-              case default 
-                goto 10
-          endselect  
-
-      case(2)
-          select case(psize(3))
-              case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),BLOCK,GEN_BLOCK(BSk11))    
-              case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),BLOCK,GEN_BLOCK(BSk21))    
-              case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),BLOCK,GEN_BLOCK(BSk31))    
-              case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),BLOCK,GEN_BLOCK(BSk41))    
-              case default 
-                goto 10
-          endselect  
-
-      case (3)
-          select case(psize(3))
-              case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),BLOCK,GEN_BLOCK(BSk11))    
-              case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),BLOCK,GEN_BLOCK(BSk21))    
-              case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),BLOCK,GEN_BLOCK(BSk31))    
-              case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),BLOCK,GEN_BLOCK(BSk41))    
-              case default 
-                 goto 10
-          endselect  
-
-      case(4)
-          select case(psize(3))
-              case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),BLOCK,GEN_BLOCK(BSk11))    
-              case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),BLOCK,GEN_BLOCK(BSk21))    
-              case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),BLOCK,GEN_BLOCK(BSk31))    
-              case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),BLOCK,GEN_BLOCK(BSk41))    
-              case default 
-                 goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),BLOCK)   
-
-      select case(psize(2))
-      case(1) 
-!dvm$ redistribute  A3(BLOCK,GEN_BLOCK(BSj11),BLOCK)   
-      case(2)
-!dvm$ redistribute  A3(BLOCK,GEN_BLOCK(BSj21),BLOCK)   
-      case(3)
-!dvm$ redistribute  A3(BLOCK,GEN_BLOCK(BSj31),BLOCK)   
-      case(4)
-!dvm$ redistribute  A3(BLOCK,GEN_BLOCK(BSj41),BLOCK)   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) * 2   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(BLOCK,GEN_BLOCK(BSj2),GEN_BLOCK(BSk2))   
-
-      select case(psize(2))
-      case(1)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj12),GEN_BLOCK(BSk12))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj12),GEN_BLOCK(BSk22))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj12),GEN_BLOCK(BSk32))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj12),GEN_BLOCK(BSk42))   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj22),GEN_BLOCK(BSk12))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj22),GEN_BLOCK(BSk22))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj22),GEN_BLOCK(BSk32))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj22),GEN_BLOCK(BSk42))   
-         case default 
-            goto 10               
-         endselect  
-
-      case (3)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj32),GEN_BLOCK(BSk12))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj32),GEN_BLOCK(BSk22))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj32),GEN_BLOCK(BSk32))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj32),GEN_BLOCK(BSk42))   
-         case default 
-            goto 10
-         endselect  
-
-      case (4)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj42),GEN_BLOCK(BSk12))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj42),GEN_BLOCK(BSk22))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj42),GEN_BLOCK(BSk32))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj42),GEN_BLOCK(BSk42))   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) * 2   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2),BLOCK)   
-
-      select case(psize(1))
-      case(1)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi12),GEN_BLOCK(BSj22),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi12),GEN_BLOCK(BSj32),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi12),GEN_BLOCK(BSj42),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),GEN_BLOCK(BSj12),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),GEN_BLOCK(BSj32),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),GEN_BLOCK(BSj42),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case (3)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),GEN_BLOCK(BSj12),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),GEN_BLOCK(BSj22),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),GEN_BLOCK(BSj42),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case (4)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),GEN_BLOCK(BSj12),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),GEN_BLOCK(BSj22),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),GEN_BLOCK(BSj32),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) / 4   
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrg36
-
-! ----------------------------------------------------distrg37
-! 37 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][BLOCK]    
-!                REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]
-!                REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]
-!                REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]
-
-      subroutine distrg37 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=10,AN2=15,AN3=15,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, dimension(1) :: BSi11=(/10/)         
-      integer, dimension(1) :: BSi12=(/10/)           
-      integer, dimension(2) :: BSi21=(/6,4/)        
-      integer, dimension(2) :: BSi22=(/2,8/)     
-      integer, dimension(3) :: BSi31=(/2,3,5/)      
-      integer, dimension(3) :: BSi32=(/3,4,3/)     
-      integer, dimension(4) :: BSi41=(/4,1,3,2/)    
-      integer, dimension(4) :: BSi42=(/3,3,2,2/)     
-
-      integer, dimension(1) :: BSj11=(/15/)     
-      integer, dimension(1) :: BSj12=(/15/)     
-      integer, dimension(2) :: BSj21=(/3,12/)     
-      integer, dimension(2) :: BSj22=(/10,5/)     
-      integer, dimension(3) :: BSj31=(/6,4,5/)     
-      integer, dimension(3) :: BSj32=(/3,2,10/)     
-      integer, dimension(4) :: BSj41=(/5,2,3,5/)     
-      integer, dimension(4) :: BSj42=(/2,4,8,1/)     
-
-      integer, dimension(1) :: BSk11=(/15/)     
-      integer, dimension(1) :: BSk12=(/15/)     
-      integer, dimension(2) :: BSk21=(/10,5/)     
-      integer, dimension(2) :: BSk22=(/7,8/)    
-      integer, dimension(3) :: BSk31=(/1,11,3/)     
-      integer, dimension(3) :: BSk32=(/5,7,3/)     
-      integer, dimension(4) :: BSk41=(/3,4,2,6/)     
-      integer, dimension(4) :: BSk42=(/4,2,5,4/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrg37  '
-
-!dvm$ distribute :: A3 
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ distribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),BLOCK)   
-
-      select case(psize(1))
-      case(1)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj21),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj31),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj41),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj11),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj31),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj41),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case (3)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj11),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj21),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj41),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case (4)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj11),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj21),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj31),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),BLOCK)   
-
-      select case(psize(2))
-      case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj12),BLOCK)   
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj22),BLOCK)   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj32),BLOCK)   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj42),BLOCK)   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) * 2   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))   
-
-      select case(psize(2))
-      case(1)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj11),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj11),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj11),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj11),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj21),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj21),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj21),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj21),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10               
-         endselect  
-
-      case (3)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj31),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj31),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj31),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj31),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10
-         endselect  
-
-      case (4)
-         select case(psize(3))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj41),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj41),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj41),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,GEN_BLOCK(BSj41),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) * 2   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk2))   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),BLOCK,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),BLOCK,GEN_BLOCK(BSk22))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),BLOCK,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),BLOCK,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),BLOCK,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),BLOCK,GEN_BLOCK(BSk22))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),BLOCK,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),BLOCK,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),BLOCK,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),BLOCK,GEN_BLOCK(BSk22))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),BLOCK,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),BLOCK,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),BLOCK,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),BLOCK,GEN_BLOCK(BSk22))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),BLOCK,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),BLOCK,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) / 4   
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrg37
-
-! ----------------------------------------------------distrg38
-! 38  DISTRIBUTE arrA3 [GEN_BLOCK][*][GEN_BLOCK] 
-!                REDISTRIBUTE [*][GEN_BLOCK][*]
-!                REDISTRIBUTE[GEN_BLOCK][GEN_BLOCK][*]
-!                REDISTRIBUTE[*][GEN_BLOCK][GEN_BLOCK]
-
-      subroutine distrg38 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=5,AN2=6,AN3=12,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, dimension(1) :: BSi11=(/5/)         
-      integer, dimension(1) :: BSi12=(/5/)           
-      integer, dimension(2) :: BSi21=(/4,1/)      
-      integer, dimension(2) :: BSi22=(/3,2/)     
-      integer, dimension(3) :: BSi31=(/3,1,1/)     
-      integer, dimension(3) :: BSi32=(/1,2,2/)     
-      integer, dimension(4) :: BSi41=(/1,2,1,1/)   
-      integer, dimension(4) :: BSi42=(/3,1,0,2/)     
-
-      integer, dimension(1) :: BSj11=(/6/)     
-      integer, dimension(1) :: BSj12=(/6/)     
-      integer, dimension(2) :: BSj21=(/2,4/)     
-      integer, dimension(2) :: BSj22=(/4,2/)     
-      integer, dimension(3) :: BSj31=(/2,3,1/)     
-      integer, dimension(3) :: BSj32=(/1,2,3/)     
-      integer, dimension(4) :: BSj41=(/2,1,2,1/)     
-      integer, dimension(4) :: BSj42=(/1,1,3,1/)     
-
-      integer, dimension(1) :: BSk11=(/12/)     
-      integer, dimension(1) :: BSk12=(/12/)    
-      integer, dimension(2) :: BSk21=(/10,2/)     
-      integer, dimension(2) :: BSk22=(/5,7/)     
-      integer, dimension(3) :: BSk31=(/2,6,4/)     
-      integer, dimension(3) :: BSk32=(/3,4,5/)     
-      integer, dimension(4) :: BSk41=(/2,4,5,1/)     
-      integer, dimension(4) :: BSk42=(/3,2,4,3/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrg38  '
-
-!dvm$ distribute :: A3   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi1),*,GEN_BLOCK(BSk1))   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(2))   ! it's true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),*,GEN_BLOCK(BSk11))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),*,GEN_BLOCK(BSk21))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),*,GEN_BLOCK(BSk31))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),*,GEN_BLOCK(BSk41))    
-          case default 
-              goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2)) ! it's true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),*,GEN_BLOCK(BSk11))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),*,GEN_BLOCK(BSk21))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),*,GEN_BLOCK(BSk31))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),*,GEN_BLOCK(BSk41))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2)) ! it's true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),*,GEN_BLOCK(BSk11))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),*,GEN_BLOCK(BSk21))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),*,GEN_BLOCK(BSk31))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),*,GEN_BLOCK(BSk41))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2)) ! it's true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),*,GEN_BLOCK(BSk11))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),*,GEN_BLOCK(BSk21))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),*,GEN_BLOCK(BSk31))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),*,GEN_BLOCK(BSk41))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k + 5  
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(*,GEN_BLOCK(BSj2),*)   
-
-      select case(psize(1))  ! it's true - psize(1)
-      case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj12),*)   
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj22),*)   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj32),*)   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj42),*)   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 5   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),*)   
-
-      select case(psize(1))
-      case(1)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11),*)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj21),*)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj31),*)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj41),*)   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj11),*)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21),*)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj31),*)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj41),*)   
-         case default 
-            goto 10
-         endselect  
-
-      case (3)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj11),*)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj21),*)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31),*)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj41),*)   
-         case default 
-            goto 10
-         endselect  
-
-      case (4)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj11),*)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj21),*)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj31),*)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41),*)   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 5   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(*,GEN_BLOCK(BSj2),GEN_BLOCK(BSk2))   
-
-      select case(psize(1))     ! it's true - psize(1)
-      case(1)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj12),GEN_BLOCK(BSk12))   
-         case(2)                                     
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj12),GEN_BLOCK(BSk22))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj12),GEN_BLOCK(BSk32))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj12),GEN_BLOCK(BSk42))   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj22),GEN_BLOCK(BSk12))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj22),GEN_BLOCK(BSk22))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj22),GEN_BLOCK(BSk32))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj22),GEN_BLOCK(BSk42))   
-         case default 
-            goto 10               
-         endselect  
-
-      case (3)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj32),GEN_BLOCK(BSk12))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj32),GEN_BLOCK(BSk22))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj32),GEN_BLOCK(BSk32))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj32),GEN_BLOCK(BSk42))   
-         case default 
-            goto 10
-         endselect  
-
-      case (4)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj42),GEN_BLOCK(BSk12))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj42),GEN_BLOCK(BSk22))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj42),GEN_BLOCK(BSk32))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj42),GEN_BLOCK(BSk42))   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 15)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrg38
-
-! ----------------------------------------------------distrg39
-! 39 DISTRIBUTE arrA3 [*][GEN_BLOCK][GEN_BLOCK]  
-!                REDISTRIBUTE [GEN_BLOCK][*][*]
-!                REDISTRIBUTE[GEN_BLOCK][*][GEN_BLOCK]
-
-      subroutine distrg39 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=10,AN2=16,AN3=10,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, dimension(1) :: BSi11=(/10/)        
-      integer, dimension(1) :: BSi12=(/10/)           
-      integer, dimension(2) :: BSi21=(/6,4/)       
-      integer, dimension(2) :: BSi22=(/2,8/)     
-      integer, dimension(3) :: BSi31=(/5,2,3/)    
-      integer, dimension(3) :: BSi32=(/2,4,4/)     
-      integer, dimension(4) :: BSi41=(/3,2,1,4/)   
-      integer, dimension(4) :: BSi42=(/5,1,1,3/)     
-
-      integer, dimension(1) :: BSj11=(/16/)     
-      integer, dimension(1) :: BSj12=(/16/)     
-      integer, dimension(2) :: BSj21=(/5,11/)     
-      integer, dimension(2) :: BSj22=(/12,4/)     
-      integer, dimension(3) :: BSj31=(/6,2,8/)     
-      integer, dimension(3) :: BSj32=(/10,3,3/)     
-      integer, dimension(4) :: BSj41=(/6,3,5,2/)     
-      integer, dimension(4) :: BSj42=(/3,2,1,10/)     
-
-      integer, dimension(1) :: BSk11=(/10/)     
-      integer, dimension(1) :: BSk12=(/10/)     
-      integer, dimension(2) :: BSk21=(/9,1/)     
-      integer, dimension(2) :: BSk22=(/4,6/)     
-      integer, dimension(3) :: BSk31=(/10,0,0/)     
-      integer, dimension(3) :: BSk32=(/5,3,2/)    
-      integer, dimension(4) :: BSk41=(/0,2,3,5/)     
-      integer, dimension(4) :: BSk42=(/0,4,0,6/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrg39  '
-
-!dvm$ distribute :: A3   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(*,GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))   
-
-      select case(psize(1))     ! it's true - psize(1)
-      case(1)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj11),GEN_BLOCK(BSk11))   
-         case(2) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj11),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj11),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj11),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj21),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj21),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj21),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj21),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10               
-         endselect  
-
-      case (3)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj31),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj31),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj31),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj31),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10
-         endselect  
-
-      case (4)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj41),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj41),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj41),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj41),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k + 5  
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(GEN_BLOCK(BSi2),*,*)   
-
-      select case(psize(1))
-      case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi12),*,*)   
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),*,*)   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),*,*)   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),*,*)   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 5   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(GEN_BLOCK(BSi2),*,GEN_BLOCK(BSk2))   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(2))  ! it's true - psize(2)
-              case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),*,GEN_BLOCK(BSk12))    
-              case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),*,GEN_BLOCK(BSk22))    
-              case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),*,GEN_BLOCK(BSk32))    
-              case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),*,GEN_BLOCK(BSk42))    
-              case default 
-                 goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))  ! it's true - psize(2)
-              case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),*,GEN_BLOCK(BSk12))    
-              case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),*,GEN_BLOCK(BSk22))    
-              case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),*,GEN_BLOCK(BSk32))    
-              case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),*,GEN_BLOCK(BSk42))    
-              case default 
-                goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))  ! it's true - psize(2)
-              case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),*,GEN_BLOCK(BSk12))    
-              case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),*,GEN_BLOCK(BSk22))    
-              case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),*,GEN_BLOCK(BSk32))    
-              case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),*,GEN_BLOCK(BSk42))    
-              case default 
-                 goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))  ! it's true - psize(2)
-              case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),*,GEN_BLOCK(BSk12))    
-              case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),*,GEN_BLOCK(BSk22))    
-              case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),*,GEN_BLOCK(BSk32))    
-              case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),*,GEN_BLOCK(BSk42))    
-              case default 
-                 goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 10)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-  10  deallocate (A3)
-
-      end subroutine distrg39
-
-! ----------------------------------------------------distrg310
-! 310 DISTRIBUTE arrA3 [GEN_BLOCK][GEN_BLOCK][BLOCK]  
-!                REDISTRIBUTE [*][*][GEN_BLOCK]
-!                REDISTRIBUTE[*][GEN_BLOCK][BLOCK]
-
-      subroutine distrg310 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=20,AN2=15,AN3=10,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, dimension(1) :: BSi11=(/20/)        
-      integer, dimension(1) :: BSi12=(/20/)           
-      integer, dimension(2) :: BSi21=(/2,18/)      
-      integer, dimension(2) :: BSi22=(/12,8/)     
-      integer, dimension(3) :: BSi31=(/3,12,5/)    
-      integer, dimension(3) :: BSi32=(/2,4,14/)     
-      integer, dimension(4) :: BSi41=(/3,12,3,2/)   
-      integer, dimension(4) :: BSi42=(/4,6,2,8/)     
-
-      integer, dimension(1) :: BSj11=(/15/)     
-      integer, dimension(1) :: BSj12=(/15/)     
-      integer, dimension(2) :: BSj21=(/3,12/)     
-      integer, dimension(2) :: BSj22=(/5,10/)     
-      integer, dimension(3) :: BSj31=(/6,3,6/)     
-      integer, dimension(3) :: BSj32=(/3,1,11/)     
-      integer, dimension(4) :: BSj41=(/5,1,3,6/)     
-      integer, dimension(4) :: BSj42=(/2,2,6,5/)     
-
-      integer, dimension(1) :: BSk11=(/10/)     
-      integer, dimension(1) :: BSk12=(/10/)     
-      integer, dimension(2) :: BSk21=(/1,9/)     
-      integer, dimension(2) :: BSk22=(/6,4/)    
-      integer, dimension(3) :: BSk31=(/3,3,4/)     
-      integer, dimension(3) :: BSk32=(/1,2,7/)     
-      integer, dimension(4) :: BSk41=(/2,4,1,3/)     
-      integer, dimension(4) :: BSk42=(/1,6,2,1/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrg310 '
-
-!dvm$ distribute :: A3   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),BLOCK)   
-
-      select case(psize(1))
-      case(1)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj21),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj31),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj41),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj11),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj31),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj41),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case (3)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj11),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj21),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj41),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case (4)
-         select case(psize(2))
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj11),BLOCK)   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj21),BLOCK)   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj31),BLOCK)   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41),BLOCK)   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k + 8  
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(*,*,GEN_BLOCK(BSk2))   
-
-      select case(psize(1))  ! it's true - psize(1)
-      case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,*,GEN_BLOCK(BSk12))   
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,*,GEN_BLOCK(BSk22))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,*,GEN_BLOCK(BSk32))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,*,GEN_BLOCK(BSk42))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 8   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(*,GEN_BLOCK(BSj2),BLOCK)   
-
-      select case(psize(1))  ! it's true - psize(1)
-      case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj12),BLOCK)   
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj22),BLOCK)   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj32),BLOCK)   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj42),BLOCK)   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 16)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrg310
-
-! ---------------------------------------------------------distrg311
-! 311 DISTRIBUTE arrA3 [GEN_BLOCK][*][*]  
-!                REDISTRIBUTE [*][*][*]
-!                REDISTRIBUTE[BLOCK][*][GEN_BLOCK]
-
-      subroutine distrg311 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=8,AN2=16,AN3=24,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, dimension(1) :: BSi11=(/8/)        
-      integer, dimension(1) :: BSi12=(/8/)           
-      integer, dimension(2) :: BSi21=(/1,7/)     
-      integer, dimension(2) :: BSi22=(/5,3/)     
-      integer, dimension(3) :: BSi31=(/1,5,2/)   
-      integer, dimension(3) :: BSi32=(/2,2,4/)     
-      integer, dimension(4) :: BSi41=(/1,2,3,2/)  
-      integer, dimension(4) :: BSi42=(/4,1,2,1/)     
-
-      integer, dimension(1) :: BSj11=(/16/)     
-      integer, dimension(1) :: BSj12=(/16/)     
-      integer, dimension(2) :: BSj21=(/4,12/)     
-      integer, dimension(2) :: BSj22=(/7,9/)     
-      integer, dimension(3) :: BSj31=(/3,12,1/)     
-      integer, dimension(3) :: BSj32=(/6,2,8/)     
-      integer, dimension(4) :: BSj41=(/4,1,2,9/)     
-      integer, dimension(4) :: BSj42=(/2,3,6,5/)     
-
-      integer, dimension(1) :: BSk11=(/24/)     
-      integer, dimension(1) :: BSk12=(/24/)     
-      integer, dimension(2) :: BSk21=(/20,4/)     
-      integer, dimension(2) :: BSk22=(/10,14/)     
-      integer, dimension(3) :: BSk31=(/5,11,8/)     
-      integer, dimension(3) :: BSk32=(/6,7,11/)    
-      integer, dimension(4) :: BSk41=(/12,4,6,2/)     
-      integer, dimension(4) :: BSk42=(/10,8,2,4/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrg311 '
-
-!dvm$ distribute :: A3   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi1),*,*)   
-
-      select case(psize(1))
-      case(1) 
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),*,*)   
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),*,*)   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),*,*)   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),*,*)   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k + 6  
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!dvm$  redistribute A3(*,*,*)   
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 6   
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-!!!!dvm$  redistribute A3(BLOCK,*, GEN_BLOCK(BSk2))   
-
-      select case(psize(2))  ! it's true - psize(2)
-      case(1) 
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,*,GEN_BLOCK(BSk12))   
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,*,GEN_BLOCK(BSk22))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,*,GEN_BLOCK(BSk32))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,*,GEN_BLOCK(BSk42))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ get_actual(erri)
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 12)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrg311
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
- 
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix1.fdv
deleted file mode 100644
index 9a3a5f0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix1.fdv
+++ /dev/null
@@ -1,564 +0,0 @@
-      program DISTRMIX1
-
-      integer nproc
-      number_of_processors()=1  
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directive       
-!            GEN_BLOCK, WGT_BLOCK, MULT_BLOCK distributions
-
-      print *,'===START OF distrmix1========================'
-
-      nproc = number_of_processors()  
-
-C --------------------------------------------------
-c 11  DISTRIBUTE arrA1[MULT_BLOCK]
-c                     REDISTRIBUTE arrA1[WGT_BLOCK] 
-c                     REDISTRIBUTE arrA1[MULT_BLOCK]  
-      call distrmix11
-C --------------------------------------------------
-c 12  DISTRIBUTE arrA1[WGT_BLOCK]
-c                     REDISTRIBUTE arrA1[MULT_BLOCK]  
-c                     REDISTRIBUTE arrA1[WGT_BLOCK]  
-      call distrmix12
-C --------------------------------------------------
-
-      if (nproc > 4 ) then     ! may be temporary
-         goto 1
-      endif
-
-C --------------------------------------------------
-c 13  DISTRIBUTE arrA1[MULT_BLOCK]
-c                     REDISTRIBUTE arrA1[GEN_BLOCK] 
-c                     REDISTRIBUTE arrA1[MULT_BLOCK]  
-      call distrmix13 (nproc)
-C --------------------------------------------------
-c 14  DISTRIBUTE arrA1[GEN_BLOCK]
-c                     REDISTRIBUTE arrA1[MULT_BLOCK]
-c                     REDISTRIBUTE arrA1[GEN_BLOCK] 
-      call distrmix14 (nproc)
-C --------------------------------------------------
-c 15  DISTRIBUTE arrA1[WGT_BLOCK]    
-c                     REDISTRIBUTE arrA1[GEN_BLOCK] 
-c                     REDISTRIBUTE arrA1[WGT_BLOCK] 
-      call distrmix15 (nproc)
-C --------------------------------------------------
-c 16  DISTRIBUTE arrA1[GEN_BLOCK]
-c                     REDISTRIBUTE arrA1[WGT_BLOCK] 
-c                     REDISTRIBUTE arrA1[GEN_BLOCK] 
-      call distrmix16 (nproc)
-C -------------------------------------------------
-C
- 1    print *,'=== END OF distrmix1 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrmix11
-c 11  DISTRIBUTE arrA1[MULT_BLOCK]
-c                     REDISTRIBUTE arrA1[WGT_BLOCK] 
-c                     REDISTRIBUTE arrA1[MULT_BLOCK]  
- 
-      subroutine distrmix11
-      integer nproc
-      
-      integer, parameter :: AN1=64,ER=10000
-      integer :: erri=ER,i
-
-      integer, parameter :: m1 = 4, m2 = 2
-
-      double precision :: WB(7) = (/2.1,4.6,3.,2.0,1.5,2.,3.1/)
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrmix11  '
-               
-!dvm$ distribute :: A1    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ redistribute A1(MULT_BLOCK(m1))    
-
-      A1 = 5
-
-!dvm$ actual(A1)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + i    
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(WGT_BLOCK(WB,7))    
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + 5 
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(MULT_BLOCK(m2))    
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction(min(erri))
-      do i=1,AN1
-          if (A1(i) /= i + 10) then     
-             erri = min(erri,i)
-          endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrmix11
-
-C ---------------------------------------------distrmix12
-c 12  DISTRIBUTE arrA1[WGT_BLOCK]
-c                     REDISTRIBUTE arrA1[MULT_BLOCK]  
-c                     REDISTRIBUTE arrA1[WGT_BLOCK]  
-
-      subroutine distrmix12
-
-      integer, parameter :: AN1=75,ER=10000
-      integer :: erri=ER,i
-
-      integer, parameter :: m1 = 15
-
-      double precision :: WB1(6) = (/3.1,1.6,2.,3.0,0.5,2./)
-      double precision :: WB2(8) 
-     >                    = (/1.5,2.1,2.6,4.2,2.5,3.5,1.,2.1/)
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrmix12  '
-               
-!dvm$ distribute :: A1    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ redistribute A1(WGT_BLOCK(WB1,6))    
-
-      A1 = 0
-
-!dvm$ actual(A1)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + i    
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(MULT_BLOCK(m1))    
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i)**2 
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(WGT_BLOCK(WB2,8))    
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction(min(erri))
-      do i=1,AN1
-          if (A1(i) /= i**2) then     
-             erri = min(erri,i)
-          endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrmix12
-
-C ----------------------------------------------------distrm13
-c 13  DISTRIBUTE arrA1[MULT_BLOCK]
-c                     REDISTRIBUTE arrA1[GEN_BLOCK] 
-c                     REDISTRIBUTE arrA1[MULT_BLOCK]  
-
-      subroutine distrmix13 (nproc)
-      integer nproc
-
-      integer, parameter :: AN1=30,ER=10000
-      integer :: erri=ER,i
-
-      integer, parameter :: m1 = 5, m2 = 3
-
-      integer :: BS1(1) = (/30/)
-      integer :: BS2(2) = (/25,5/)
-      integer :: BS3(3) = (/3,15,12/)
-      integer :: BS4(4) = (/14,3,11,2/)
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrmix13  '
-               
-!dvm$ distribute A1(MULT_BLOCK(m1))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region   
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BSnproc))    
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS1))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS2))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS3))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS4))    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i)*2
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(MULT_BLOCK(m2))    
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min(erri) )
-      do i=1,AN1
-          if (A1(i) /= i*2) then     
-             erri = min(erri,i)
-          endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
- 10   deallocate (A1)
-
-      end subroutine distrmix13
-
-C ----------------------------------------------------distrmmix14
-c 14  DISTRIBUTE arrA1[GEN_BLOCK]
-c                     REDISTRIBUTE arrA1[MULT_BLOCK]
-c                     REDISTRIBUTE arrA1[GEN_BLOCK] 
-
-      subroutine distrmix14 (nproc)
-      integer nproc
-
-      integer, parameter :: AN1=35,ER=10000
-      integer :: m1 = 7
-      integer :: erri= ER, i
-
-      integer :: BS11(1) = (/35/)
-      integer :: BS12(1) = (/35/)
-      integer :: BS21(2) = (/15,20/)
-      integer :: BS22(2) = (/8,27/)
-      integer :: BS31(3) = (/12,17,6/)
-      integer :: BS32(3) = (/14,4,17/)
-      integer :: BS41(4) = (/5,7,12,11/)  
-      integer :: BS42(4) = (/14,10,5,6/)
-
-      integer, allocatable :: A1(:)
-      character(*), parameter ::  tname='distrmix14  '
-     
-!dvm$ distribute :: A1   
-!dvm$ dynamic A1
-       
-      allocate (A1(AN1))
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS1))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS11))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS21))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS31))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS41))    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i*4     
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(MULT_BLOCK(m1))    
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + 4     
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS2))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS12))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS22))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS32))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS42))    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i*4 + 4) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A1)
-
-      end subroutine distrmix14
-
-C ----------------------------------------------------distrmix15
-c 15  DISTRIBUTE arrA1[WGT_BLOCK]    
-c                     REDISTRIBUTE arrA1[GEN_BLOCK] 
-c                     REDISTRIBUTE arrA1[WGT_BLOCK] 
-
-      subroutine distrmix15 (nproc)
-      integer nproc
-       
-      integer, parameter :: AN1=10,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BS1(1) = (/10/)
-      integer :: BS2(2) = (/6,4/)
-      integer :: BS3(3) = (/2,4,4/)
-      integer :: BS4(4) = (/3,1,4,2/)
-
-      double precision, dimension(6) :: WB1=(/1.0, 2., 2., 3.0, 1., 1./)     
-      double precision, dimension(5) :: WB2=(/2.0, 1., 2., 2.0, 2./)     
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrmix15  '
-
-!dvm$ distribute A1(WGT_BLOCK(WB1,6))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i
-      enddo
-!dvm$ end region   
-     
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS1))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS2))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS3))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS4))    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i)*A1(i)
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(WGT_BLOCK(WB2,5))    
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) .ne.i**2) then     
-                erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A1)
-
-      end subroutine distrmix15
-
-C ----------------------------------------------------distrmix16
-c 16  DISTRIBUTE arrA1[GEN_BLOCK]     
-c                     REDISTRIBUTE arrA1[WGT_BLOCK] 
-c                     REDISTRIBUTE arrA1[GEN_BLOCK] 
-
-      subroutine distrmix16 (nproc)
-      integer nproc
-
-      integer, parameter :: AN1=12,ER=10000
-      integer :: erri= ER, i
-
-      integer :: BS11(1) = (/12/)
-      integer :: BS12(1) = (/12/)
-      integer :: BS21(2) = (/8,4/)
-      integer :: BS22(2) = (/2,10/)	!rem
-      integer :: BS31(3) = (/4,4,4/)
-      integer :: BS32(3) = (/2,3,7/)
-      integer :: BS41(4) = (/2,3,4,3/)
-      integer :: BS42(4) = (/6,1,3,2/)
-
-      double precision, dimension(7) ::
-     >         WB1=(/1.0, 2., 2., 3.0, 1., 1., 0.5/)     
-      double precision, dimension(6) ::
-     >         WB2=(/2.0, 0.1, 2.5, 2.0, 2., 0.7/)     
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrmix16  '
-
-!dvm$ distribute :: A1    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS1))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS11))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS21))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS31))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS41))    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i
-      enddo
-!dvm$ end region   
-
-!dvm$ redistribute A1(WGT_BLOCK(WB1,7))    
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + A1(i)
-      enddo
-!dvm$ end region   
-
-!!!!dvm$ redistribute A1(GEN_BLOCK(BS2))   
-
-      select case(nproc)
-      case(1) 
-!dvm$ redistribute A1(GEN_BLOCK(BS12))    
-      case(2)
-!dvm$ redistribute A1(GEN_BLOCK(BS22))    
-      case (3)
-!dvm$ redistribute A1(GEN_BLOCK(BS32))    
-      case(4)
-!dvm$ redistribute A1(GEN_BLOCK(BS42))    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) .ne.i*2) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A1)
-
-      end subroutine distrmix16
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix2.fdv
deleted file mode 100644
index 51da563..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix2.fdv
+++ /dev/null
@@ -1,1775 +0,0 @@
-      program DISTRMIX2
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directives       
-!            GEN_BLOCK, WGT_BLOCK, MULT_BLOCK, BLOCK distributions
-       
-      integer PROCESSORS_RANK, PROCESSORS_SIZE 
-      integer psize(2), rank
-
-      PROCESSORS_RANK() = 2
-      PROCESSORS_SIZE(i) = 1
-
-      print *,'===START OF distrmix2========================'
-
-C -------------------------------------------------
-c 21  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  
-      call distrmix21
-C -------------------------------------------------
-c 22  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]  
-      call distrmix22
-C -------------------------------------------------
-c 23  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]  
-      call distrmix23
-C -------------------------------------------------
-      rank = PROCESSORS_RANK()
-
-      do i=1,rank
-         psize(i)=PROCESSORS_SIZE(i)
-         if (psize(i) > 4) then    ! may be temporary
-            goto 1
-         endif  
-      enddo
-
-C -------------------------------------------------
-
-c 24  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  
-      call distrmix24 (psize)
-C -------------------------------------------------
-c 25  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]  
-      call distrmix25 (psize)
-C -------------------------------------------------
-c 26  DISTRIBUTE arrA2[WGT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]  
-      call distrmix26 (psize)
-C -------------------------------------------------
-c 27  DISTRIBUTE arrA2[BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][BLOCK]  
-      call distrmix27 (psize)
-C -------------------------------------------------
-c 28  DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]  
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [BLOCK][WGT_BLOCK]  
-      call distrmix28 (psize)
-C -------------------------------------------------
-c 29  DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]  
-c              REDISTRIBUTE [BLOCK][MULT_BLOCK]  
-      call distrmix29 (psize)
-C -------------------------------------------------
-c 210  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK] 
-c               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-       call distrmix210 (psize)
-C -------------------------------------------------
-c 211  DISTRIBUTE arrA2[WGT_BLOCK][BLOCK] 
-c               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA2[BLOCK][WGT_BLOCK]
-         call distrmix211 (psize)
-C -------------------------------------------------
-c 212  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-c               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-         call distrmix212 (psize)
-C -------------------------------------------------
-c 213  DISTRIBUTE arrA2[BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA2[WGT_BLOCK][MULT_BLOCK]
-c               REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK] 
-         call distrmix213 (psize)
-C -------------------------------------------------
-C
- 1    print *,'=== END OF distrmix2 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrmix21
-c 21  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  
-
-      subroutine distrmix21
-
-      integer, parameter :: AN1=10,AN2=56,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      integer, parameter :: m11 = 2, m21 = 7
-      integer, parameter :: m12 = 5, m22 = 8
-
-      double precision, dimension(8) ::
-     >                  WB1=(/1.0,2.,1.,3.2,1.0, 1.5, 2.3, 2./)     
-      double precision, dimension(7) ::
-     >                  WB2=(/1.3, 1.5, 2.2, 1.6, 2.6, 0.5, 1.7/)     
-
-      integer A2(AN1,AN2)  !static array
-      character(*), parameter :: tname='distrmix21 '
-               
-!dvm$ distribute A2(MULT_BLOCK(m11),MULT_BLOCK(m21))   
-!dvm$ dynamic A2
-
-      A2 = 3
-
-!dvm$ actual(A2)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(WGT_BLOCK(WB1,8),WGT_BLOCK(WB2,7))   
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) + 3     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(MULT_BLOCK(m12),MULT_BLOCK(m22))   
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)+6) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-                                                    
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      end subroutine distrmix21
-
-C ----------------------------------------------------distrmix22
-c 22  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]  
-
-      subroutine distrmix22
-
-      integer, parameter :: AN1=16,AN2=32,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      integer, parameter :: m1 = 2, m2 = 4
-
-      double precision, dimension(7) ::
-     >                  WB1=(/2.4, 1.2, 3.0, 0.2, 1.5, 2.8, 2.1/)     
-      double precision, dimension(6) ::
-     >                  WB2=(/2.0, 1.2, 2.6, 1.6, 3.5, 0.7/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix22 '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,7),WGT_BLOCK(WB2,6))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = 4
-
-!dvm$ actual(A2)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(MULT_BLOCK(m1),MULT_BLOCK(m2))   
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) - 4     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(WGT_BLOCK(WB2,6),WGT_BLOCK(WB1,7))   
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-                                                    
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate(A2) 
-
-      end subroutine distrmix22
-
-C ----------------------------------------------------distrmix23
-c 23  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]  
-
-      subroutine distrmix23
-
-      integer, parameter :: AN1=18,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      integer, parameter :: m11 = 2, m21 = 2
-      integer, parameter :: m12 = 3, m22 = 3
-
-      double precision, dimension(10) ::
-     >       WB1=(/2., 1.2, 2., 2.5, 0.2, 1.5, 1., 2.8, 2.1, 3./)
-      double precision, dimension(8) ::
-     >       WB2=(/3.0, 3.5, 2.0, 1.2, 2.6, 1.6, 3.5, 0.7/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix23 '
-               
-!dvm$ distribute A2(MULT_BLOCK(m11),MULT_BLOCK(m21))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = 5
-
-!dvm$ actual(A2)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(WGT_BLOCK(WB1,10),MULT_BLOCK(m22))   
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) - 4     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(MULT_BLOCK(m12),WGT_BLOCK(WB2,8))   
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)+ 1) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-                                                    
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate(A2)
-  
-      end subroutine distrmix23
-
-C ----------------------------------------------------distrmix24
-c 24  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  
-
-      subroutine distrmix24 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=30,AN2=30,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      integer, parameter :: m1 = 3, m2 = 5
-
-      integer, dimension(1) :: BSi1=(/30/)     
-      integer, dimension(2) :: BSi2=(/25,5/)     
-      integer, dimension(3) :: BSi3=(/12,4,14/)     
-      integer, dimension(4) :: BSi4=(/8,7,5,10/)     
-
-      integer, dimension(1) :: BSj1=(/30/)     
-      integer, dimension(2) :: BSj2=(/12,18/)     
-      integer, dimension(3) :: BSj3=(/5,16,9/)     
-      integer, dimension(4) :: BSj4=(/10,4,14,2/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix24 '
-               
-!dvm$ distribute A2(MULT_BLOCK(m1),MULT_BLOCK(m2))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi),GEN_BLOCK(BSj))   
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj2))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj3))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj4))    
-              case default 
-                 goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj1))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj3))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj4))    
-              case default 
-                 goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj1))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj2))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj3))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj4))    
-              case default 
-                 goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj1))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj2))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj3))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj4))    
-              case default 
-                 goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) * 2     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(MULT_BLOCK(m2),MULT_BLOCK(m1))   
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) / 2     
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-                                                    
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
- 10   deallocate (A2)
-
-      end subroutine distrmix24
-
-C ----------------------------------------------------distrmix25
-c 25  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]  
-
-      subroutine distrmix25 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=16,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      integer, parameter :: m1 = 2, m2 = 3
-
-      integer, dimension(1) :: BSi11=(/16/)     
-      integer, dimension(1) :: BSi12=(/16/)     
-      integer, dimension(2) :: BSi21=(/15,1/)     
-      integer, dimension(2) :: BSi22=(/6,10/)     
-      integer, dimension(3) :: BSi31=(/3,8,5/)     
-      integer, dimension(3) :: BSi32=(/7,3,6/)     
-      integer, dimension(4) :: BSi41=(/2,3,4,7/)     
-      integer, dimension(4) :: BSi42=(/5,1,6,4/)     
-
-      integer, dimension(1) :: BSj11=(/12/)     
-      integer, dimension(1) :: BSj12=(/12/)     
-      integer, dimension(2) :: BSj21=(/7,5/)     
-      integer, dimension(2) :: BSj22=(/5,7/)     
-      integer, dimension(3) :: BSj31=(/5,6,1/)     
-      integer, dimension(3) :: BSj32=(/2,6,4/)     
-      integer, dimension(4) :: BSj41=(/1,4,2,5/)     
-      integer, dimension(4) :: BSj42=(/2,4,4,2/)     
-
-      integer  :: A2(AN1,AN2)            ! static array
-      character(*), parameter :: tname='distrmix25 '
-               
-!dvm$ distribute :: A2   
-!dvm$ dynamic A2
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1))   
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj41))    
-              case default 
-                 goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj41))    
-              case default 
-                 goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj41))    
-              case default 
-                 goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-              case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj11))    
-              case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj21))    
-              case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj31))    
-              case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41))    
-              case default 
-                 goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-      A2 = 2
-
-!dvm$ actual(A2)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(MULT_BLOCK(m1),MULT_BLOCK(m2))   
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + 2     
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))    
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj22))    
-          case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj32))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj12))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj32))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj42))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj12))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj22))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj12))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj22))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj32))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j)      
-            if (A2(i,j) /= (i*NL+j)+ 4) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-                                                    
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
- 10   continue
-
-      end subroutine distrmix25
-
-C ----------------------------------------------------distrmix26
-c 26  DISTRIBUTE arrA2[WGT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]  
-
-      subroutine distrmix26 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=52,AN2=50,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      integer, parameter :: m1 = 13, m2 = 5
-
-      double precision, dimension(6) ::
-     >       WB1=(/2.4, 2.2, 0.2, 3.5, 1.2, 1./)     
-      double precision, dimension(8) ::
-     >       WB2=(/1.0, 2.5, 3.0, 2.8, 1.6, 1., 0.5, 1.7/)     
-
-      integer, dimension(1) :: BSi1=(/52/)     
-      integer, dimension(2) :: BSi2=(/15,37/)     
-      integer, dimension(3) :: BSi3=(/20,28,4/)     
-      integer, dimension(4) :: BSi4=(/6,24,4,18/)     
-
-      integer, dimension(1) :: BSj1=(/50/)     
-      integer, dimension(2) :: BSj2=(/16,34/)     
-      integer, dimension(3) :: BSj3=(/22,28,0/)     
-      integer, dimension(4) :: BSj4=(/11,14,8,17/)     !rem
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix26 '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,6),MULT_BLOCK(m2))   
-
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(MULT_BLOCK(m1),WGT_BLOCK(WB2,8))   
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) * 5     
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi),GEN_BLOCK(BSj))    
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj2))    
-          case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)* 5) then     
-                erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-                                                    
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
- 10   deallocate (A2)
-
-      end subroutine distrmix26
-
-C ----------------------------------------------------distrmix27
-c 27  DISTRIBUTE arrA2[BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][BLOCK]  
-
-      subroutine distrmix27 (psize)
-      integer psize (2)
-
-      integer, parameter :: AN1=8,AN2=64,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      integer, parameter :: m1 = 2, m2 = 8
-
-      double precision, dimension(7) ::
-     >       WB=(/2., 3.2, 2., 3.5, 1.2, 1., 4./)     
-
-      integer, dimension(1) :: BSi1=(/8/)     
-      integer, dimension(2) :: BSi2=(/2,6/)     
-      integer, dimension(3) :: BSi3=(/4,3,1/)     
-      integer, dimension(4) :: BSi4=(/2,3,2,1/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix27 '
-               
-!dvm$ distribute A2(BLOCK,MULT_BLOCK(m2))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =(i*NL+j)*2     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(MULT_BLOCK(m1),WGT_BLOCK(WB,7))    
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) * 2     
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi),BLOCK)    
-
-      select case(psize(1))
-      case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),BLOCK)    
-      case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),BLOCK)    
-      case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),BLOCK)    
-      case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),BLOCK)    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)* 4) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-                                                    
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
- 10   deallocate (A2)
-
-      end subroutine distrmix27
-
-C ----------------------------------------------------distrmix28
-c 28  DISTRIBUTE arrA2[BLOCK][GEN_BLOCK]  
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [BLOCK][WGT_BLOCK]  
-
-      subroutine distrmix28 (psize)
-      integer psize (2)
-
-      integer, parameter :: AN1=42,AN2=16,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-               
-      integer, parameter :: m1 = 3, m2 = 2
-
-      double precision, dimension(6) ::
-     >       WB1=(/2., 3., 1.2, 1.5, 1., 1.5/)     
-      double precision, dimension(7) ::
-     >       WB2=(/2.2, 1.5, 3.0, 2.8, 2.6, 1.4, 0.5/)     
-
-      integer, dimension(1) :: BSj1=(/16/)     
-      integer, dimension(2) :: BSj2=(/12,4/)     
-      integer, dimension(3) :: BSj3=(/5,1,10/)     
-      integer, dimension(4) :: BSj4=(/2,4,6,4/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix28 '
-
-!dvm$ distribute :: A2
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ distribute A2(BLOCK(m1),GEN_BLOCK(Bj))   
-
-      select case(psize(2))
-      case(1) 
-!dvm$ redistribute A2(BLOCK,GEN_BLOCK(BSj1))    
-      case(2)
-!dvm$ redistribute A2(BLOCK,GEN_BLOCK(BSj2))    
-      case (3)
-!dvm$ redistribute A2(BLOCK,GEN_BLOCK(BSj3))    
-      case(4)
-!dvm$ redistribute A2(BLOCK,GEN_BLOCK(BSj4))    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =(i*NL+j)*3     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(WGT_BLOCK(WB1,6),MULT_BLOCK(m2))    
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j)*2     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(BLOCK, WGT_BLOCK(WB2,7))    
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)*6) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end
-
-C ----------------------------------------------------distrmix29
-c 29  DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]  
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK]  
-c              REDISTRIBUTE [BLOCK][MULT_BLOCK]  
-
-      subroutine distrmix29 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=21,AN2=48, NL=1000,ER=10000
-      integer :: erri= ER,i,j
-               
-      integer, parameter :: m1 = 3, m2 = 2
-
-      double precision, dimension(9) ::
-     >     WB=(/2.2, 1.5, 3.0, 2.8, 2.6, 1.4, 0.5, 1., 2./)     
-
-      integer, dimension(1) :: BSi1=(/21/)     
-      integer, dimension(2) :: BSi2=(/15,6/)     
-      integer, dimension(3) :: BSi3=(/10,6,5/)     
-      integer, dimension(4) :: BSi4=(/6,4,8,3/)     
-
-      integer, dimension(1) :: BSj1=(/48/)     
-      integer, dimension(2) :: BSj2=(/16,32/)     
-      integer, dimension(3) :: BSj3=(/20,18,10/)     
-      integer, dimension(4) :: BSj4=(/2,42,1,3/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix29 '
-
-!dvm$ distribute :: A2
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ redistribute A2(WGT_BLOCK(WB,9),BLOCK)   
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =(i*NL+j)     
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi),GEN_BLOCK(BSj))    
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj2))    
-          case (3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j)*4     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(BLOCK, MULT_BLOCK(m2))    
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)*4) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A2)
-
-      end subroutine distrmix29
-
-C ----------------------------------------------------distrmix210
-c 210  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK] 
-c               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-
-      subroutine distrmix210 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=9,AN2=11,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      integer, dimension(1) :: BSi1=(/9/)     
-      integer, dimension(2) :: BSi2=(/3,6/)     
-      integer, dimension(3) :: BSi3=(/1,3,5/)     
-      integer, dimension(4) :: BSi4=(/2,3,1,3/)     
-
-      integer, dimension(1) :: BSj1=(/11/)     
-      integer, dimension(2) :: BSj2=(/7,4/)     
-      integer, dimension(3) :: BSj3=(/5,6,0/)     
-      integer, dimension(4) :: BSj4=(/2,3,2,4/)     
-
-      double precision, dimension(6) :: 
-     >             WB1=(/1.0, 1.2, 2.5, 1.4, 2.5, 1.3/)     
-      double precision, dimension(4) ::
-     >             WB2=(/1.0,2.,1.5,1.7/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix210'
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,4))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi),GEN_BLOCK(BSj))    
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) * 2     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(WGT_BLOCK(WB2,4),WGT_BLOCK(WB1,6))   
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .ne.(i*NL+j)*2) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-                                                    
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
- 10   deallocate (A2)
-
-      end subroutine distrmix210
-
-C ----------------------------------------------------distrmix211
-c 211  DISTRIBUTE arrA2[WGT_BLOCK][BLOCK] 
-c               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA2[BLOCK][WGT_BLOCK]
-
-      subroutine distrmix211 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=16,AN2=16,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(7) :: 
-     >             WB=(/1.0, 1.2, 2.5, 1.4, 2.5, 1.3, 2./)
-
-      integer, dimension(1) :: BSi1=(/16/)     
-      integer, dimension(2) :: BSi2=(/10,6/)     
-      integer, dimension(3) :: BSi3=(/8,3,5/)     
-      integer, dimension(4) :: BSi4=(/2,3,4,7/)     !rem
-
-      integer, dimension(1) :: BSj1=(/16/)     
-      integer, dimension(2) :: BSj2=(/7,9/)     
-      integer, dimension(3) :: BSj3=(/5,6,5/)     
-      integer, dimension(4) :: BSj4=(/1,4,8,3/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix211'
-               
-!dvm$ distribute A2(WGT_BLOCK(WB,7),BLOCK)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j + 2     
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi),GEN_BLOCK(BSj))    
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj1))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj2))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj3))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),GEN_BLOCK(BSj4))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + 2     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(BLOCK,WGT_BLOCK(WB,5))   
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) .ne.(i*NL+j + 4)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-                                                    
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
- 10   deallocate (A2)
-
-      end subroutine distrmix211
-
-C ----------------------------------------------------distrmix212
-c 212  DISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK]  
-c               REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-c               REDISTRIBUTE arrA2[GEN_BLOCK][GEN_BLOCK] 
-
-      subroutine distrmix212 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=6,AN2=28,NL=1000,ER=10000
-      integer :: erri= ER,i
-
-      double precision, dimension(8) :: 
-     >             WB1=(/1.0, 1.2, 2.5, 1.4, 2.5, 1.3, 1., 2./)     
-      double precision, dimension(5) ::
-     >             WB2=(/2., 1.3, 2., 1.0, 1.7/)     
-
-      integer, dimension(1) :: BSi11=(/6/)     
-      integer, dimension(1) :: BSi12=(/6/)     
-      integer, dimension(2) :: BSi21=(/1,5/)     
-      integer, dimension(2) :: BSi22=(/4,2/)     
-      integer, dimension(3) :: BSi31=(/0,4,2/)     
-      integer, dimension(3) :: BSi32=(/1,3,2/)     
-      integer, dimension(4) :: BSi41=(/2,3,1,0/)     
-      integer, dimension(4) :: BSi42=(/1,2,1,2/)     
-
-      integer, dimension(1) :: BSj11=(/28/)     
-      integer, dimension(1) :: BSj12=(/28/)     
-      integer, dimension(2) :: BSj21=(/13,15/)     
-      integer, dimension(2) :: BSj22=(/7,21/)     
-      integer, dimension(3) :: BSj31=(/8,8,12/)     
-      integer, dimension(3) :: BSj32=(/5,18,5/)     
-      integer, dimension(4) :: BSj41=(/2,12,3,11/)     
-      integer, dimension(4) :: BSj42=(/6,4,8,10/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix212'
-               
-!dvm$ distribute :: A2   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ distribute A2(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1))   
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj21))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj31))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi11),GEN_BLOCK(BSj41))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj11))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj31))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi21),GEN_BLOCK(BSj41))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj11))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj21))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi31),GEN_BLOCK(BSj41))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj11))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj21))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj31))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2          
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region 
-
-!      print *, 'A2 =' 
-!      print *, A2
- 
-!dvm$ redistribute A2(WGT_BLOCK(WB1,8),WGT_BLOCK(WB2,5))   
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + 1    
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2))   
-
-      select case(psize(1))
-
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj22))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj32))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi12),GEN_BLOCK(BSj42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj12))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj32))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi22),GEN_BLOCK(BSj42))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj12))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj22))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi32),GEN_BLOCK(BSj42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj12))    
-          case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj22))    
-          case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj32))    
-          case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) - 1    
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-
-!      print *, 'A2 =' 
-!      print *, A2
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10    deallocate (A2)
-
-      end subroutine distrmix212
-
-C ----------------------------------------------------distrmix213
-c 213  DISTRIBUTE arrA2[BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA2[WGT_BLOCK][MULT_BLOCK]
-c               REDISTRIBUTE arrA2[GEN_BLOCK][BLOCK] 
-
-      subroutine distrmix213 (psize)
-      integer psize(2)
-
-      integer, parameter :: AN1=27,AN2=14,NL=1000,ER=10000
-      integer :: erri= ER,i
-
-      integer, parameter :: m1 = 3, m2 = 2
-
-      double precision, dimension(4) :: 
-     >             WB=(/1.2, 1.6, 2.0, 1.8/)     
-
-      integer, dimension(1) :: BSi1=(/27/)     
-      integer, dimension(2) :: BSi2=(/13,14/)     
-      integer, dimension(3) :: BSi3=(/11,13,3/)     
-      integer, dimension(4) :: BSi4=(/3,5,11,8/)     
-
-      integer, dimension(1) :: BSj1=(/14/)     
-      integer, dimension(2) :: BSj2=(/12,2/)     
-      integer, dimension(3) :: BSj3=(/5,6,3/)     
-      integer, dimension(4) :: BSj4=(/2,3,5,4/)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrmix213'
-               
-!dvm$ distribute ::A2   
-!dvm$ dynamic A2    
-
-      allocate (A2(AN1,AN2))
-
-!!!!dvm$ redistribute A2(BLOCK,GEN_BLOCK(BSj))   
-
-      select case(psize(2))
-      case(1) 
-!dvm$ redistribute A2(BLOCK,GEN_BLOCK(BSj1))    
-      case(2)
-!dvm$ redistribute A2(BLOCK,GEN_BLOCK(BSj2))    
-      case(3)
-!dvm$ redistribute A2(BLOCK,GEN_BLOCK(BSj3))    
-      case(4)
-!dvm$ redistribute A2(BLOCK,GEN_BLOCK(BSj4))    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j + 4     
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A2(WGT_BLOCK(WB,4), MULT_BLOCK(m2))    
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) + 4     
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A2(GEN_BLOCK(BSi),BLOCK)   
-
-      select case(psize(1))
-      case(1) 
-!dvm$ redistribute A2(GEN_BLOCK(BSi1),BLOCK)    
-      case(2)
-!dvm$ redistribute A2(GEN_BLOCK(BSi2),BLOCK)    
-      case(3)
-!dvm$ redistribute A2(GEN_BLOCK(BSi3),BLOCK)    
-      case(4)
-!dvm$ redistribute A2(GEN_BLOCK(BSi4),BLOCK)    
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual(erri)
-
-!dvm$ region 
-!dvm$ parallel (i,j) on A2(i,j), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= i*NL+j+8) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ get_actual(erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10     deallocate (A2)
-
-      end subroutine distrmix213
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix3.fdv
deleted file mode 100644
index bf3fbb7..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MIX/distrmix3.fdv
+++ /dev/null
@@ -1,3403 +0,0 @@
-      program DISTRMIX3
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directives
-!            GEN_BLOCK, WGT_BLOCK, MULT_BLOCK, BLOCK, *  distributions
-
-      integer PROCESSORS_RANK, PROCESSORS_SIZE 
-      integer psize(3), rank
-
-      PROCESSORS_RANK() = 3
-      PROCESSORS_SIZE(i) = 1
-
-      print *,'===START OF distrmix3========================'
-
-C -------------------------------------------------
-c 31  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-      call distrmix31
-C -------------------------------------------------
-c 32 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-      call distrmix32
-C -------------------------------------------------
-c 33  DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-      call distrmix33
-C -------------------------------------------------
-c 34  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-      call distrmix34
-C -------------------------------------------------
-c 35  DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][BLOCK]
-c              REDISTRIBUTE [WGT_BLOCK][BLOCK][MULT_BLOCK] 
-c              REDISTRIBUTE [BLOCK][MULT_BLOCK][WGT_BLOCK]
-      call distrmix35
-C -------------------------------------------------
-c 36  DISTRIBUTE arrA3[WGT_BLOCK][MULT_BLOCK][BLOCK]
-c              REDISTRIBUTE [MULT_BLOCK][BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [BLOCK][WGT_BLOCK][MULT_BLOCK]
-      call distrmix36
-C -------------------------------------------------
-c 37  DISTRIBUTE arrA3[MULT_BLOCK][BLOCK][BLOCK]
-c              REDISTRIBUTE [BLOCK][BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [BLOCK][WGT_BLOCK][MULT_BLOCK]
-      call distrmix37
-C -------------------------------------------------
-c 38  DISTRIBUTE arrA3[MULT_BLOCK][*][WGT_BLOCK]
-c              REDISTRIBUTE [*][*][*] 
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][*]
-      call distrmix38
-C -------------------------------------------------
-c 39  DISTRIBUTE arrA3[MULT_BLOCK][BLOCK][*]
-c              REDISTRIBUTE [WGT_BLOCK][*][WGT_BLOCK] 
-c              REDISTRIBUTE [*][MULT_BLOCK][*]
-      call distrmix39
-C -------------------------------------------------
-c 310  DISTRIBUTE arrA3[WGT_BLOCK][*][*]
-c              REDISTRIBUTE [MULT_BLOCK][*][WGT_BLOCK] 
-c              REDISTRIBUTE [*][WGT_BLOCK][MULT_BLOCK]
-      call distrmix310                         
-C -------------------------------------------------
-
-      rank = PROCESSORS_RANK()
-
-      do i=1,rank
-         psize(i)=PROCESSORS_SIZE(i)
-         if (psize(i) >  4) then ! may be temporary
-             goto 1 
-         endif
-      enddo
-
-C -------------------------------------------------
-       if
-     > ((psize(1) == 1 .and. psize(2) == 1 .and. psize(3) == 1)  !range 1 1 1
-     >.or.
-     >  (psize(1) == 1 .and. psize(2) == 2 .and. psize(3) == 3)  !range 1 2 3
-     >.or.
-     >  (psize(1) == 2 .and. psize(2) == 3 .and. psize(3) == 2)  !range 2 3 2
-     >.or.
-     >  (psize(1) == 3 .and. psize(2) == 4 .and. psize(3) == 1)  !range 3 4 1
-     >.or.
-     >  (psize(1) == 4 .and. psize(2) == 1 .and. psize(3) == 4)) !range 4 1 4
-     >then
-c 311  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-c             REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] 
-c             REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-        call distrmix311 (psize)
-      endif
-C-------------------------------------------------
-      if
-     > ((psize(1) == 1 .and. psize(2) == 1 .and. psize(3) == 1)  !range 1 1 1
-     >.or.
-     >  (psize(1) == 1 .and. psize(2) == 4 .and. psize(3) == 4)  !range 1 4 4
-     >.or.
-     >  (psize(1) == 2 .and. psize(2) == 4 .and. psize(3) == 2)  !range 2 4 2
-     >.or.
-     >  (psize(1) == 3 .and. psize(2) == 1 .and. psize(3) == 3)  !range 3 1 3
-     >.or.
-     >  (psize(1) == 4 .and. psize(2) == 2 .and. psize(3) == 2)) !range 4 2 2
-     >then
-c 312 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-c             REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-c             REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]
-        call distrmix312 (psize)
-      endif
-C-------------------------------------------------
-c 313  DISTRIBUTE arrA3[BLOCK][BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][WGT_BLOCK]
-         call distrmix313 (psize)
-C -------------------------------------------------
-c 314 DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][BLOCK][WGT_BLOCK]
-         call distrmix314 (psize)
-C -------------------------------------------------
-c 315  DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-c              REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-         call distrmix315 (psize)
-C -------------------------------------------------
-c 316  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-          call distrmix316 (psize)
-C -------------------------------------------------
-c 317  DISTRIBUTE arrA3[GEN_BLOCK][*][GEN_BLOCK]
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][*]
-c              REDISTRIBUTE [*][GEN_BLOCK][BLOCK] 
-         call distrmix317 (psize)
-C -------------------------------------------------
-      if
-     > ((psize(1) == 1 .and. psize(2) == 1 .and. psize(3) == 1)  !range 1 1 1
-     >.or.
-     >  (psize(1) == 1 .and. psize(2) == 4 .and. psize(3) == 3)  !range 1 4 3
-     >.or.
-     >  (psize(1) == 2 .and. psize(2) == 3 .and. psize(3) == 2)  !range 2 3 2
-     >.or.
-     >  (psize(1) == 3 .and. psize(2) == 1 .and. psize(3) == 4)  !range 3 1 4
-     >.or.
-     >  (psize(1) == 4 .and. psize(2) == 2 .and. psize(3) == 2)) !range 4 2 2
-     >then
-c 318  DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]  
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]  
-        call distrmix318 (psize)
-      endif
-C -------------------------------------------------
-      if
-     > ((psize(1) == 1 .and. psize(2) == 2 .and. psize(3) == 1)  !range 1 2 1
-     >.or.
-     >  (psize(1) == 2 .and. psize(2) == 2 .and. psize(3) == 2)  !range 2 2 2
-     >.or.
-     >  (psize(1) == 3 .and. psize(2) == 2 .and. psize(3) == 2)  !range 3 2 2
-     >.or.
-     >  (psize(1) == 4 .and. psize(2) == 4 .and. psize(3) == 1)) !range 4 4 1
-     >then
-
-c 319 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-c               REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK] 
-c               REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-        call distrmix319 (psize)
-      endif
-C -------------------------------------------------
-c 320  DISTRIBUTE arrA3[BLOCK][GEN_BLOCK][GEN_BLOCK]  
-c                REDISTRIBUTE arrB3[WGT_BLOCK][BLOCK][WGT_BLOCK] 
-        call distrmix320 (psize)
-C -------------------------------------------------
-c 321 DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]  ! static
-c                REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]
-        call distrmix321 (psize)
-C -------------------------------------------------
-c 322  DISTRIBUTE arrA3[GEN_BLOCK][BLOCK][GEN_BLOCK]
-c                REDISTRIBUTE [BLOCK][WGT_BLOCK][BLOCK]
-         call distrmix322 (psize)
-C -------------------------------------------------
-c 323 DISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]
-c                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][*]
-         call distrmix323 (psize)
-C -------------------------------------------------
-c 324 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][*]    
-c                REDISTRIBUTE [*][WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE [GEN_BLOCK][*][GEN_BLOCK]
-         call distrmix324 (psize)
-C -------------------------------------------------
-c 325  DISTRIBUTE arrA3 [*][GEN_BLOCK][GEN_BLOCK]  
-c                REDISTRIBUTE [*][WGT_BLOCK][*]
-c                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]
-        call distrmix325 (psize)
-C -------------------------------------------------
-C
- 1     print *,'=== END OF distrmix3 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrmix31
-c 31  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-
-      subroutine distrmix31
-      
-      integer, parameter :: AN1=32,AN2=32,AN3=32,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m11 = 4, m21 = 8, m31 = 2 
-      integer, parameter :: m12 = 2, m22 = 4, m32 = 4 
-
-      double precision, dimension(7) :: 
-     >            WB1=(/2.0,1.5,4.,3.0, 2., 3., 2./)     
-      double precision, dimension(8)::
-     >            WB2=(/1.0,1.,2.,2.0,1.,1.,2.,2./)     
-      double precision, dimension(7) :: 
-     >            WB3=(/2.0,2.,2.6,3.0, 1., 1.5, 1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix31  '
-
-               
-!dvm$ distribute A3(MULT_BLOCK(m11),MULT_BLOCK(m21),MULT_BLOCK(m31))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute 
-!dvm$* A3(WGT_BLOCK(WB1,7),WGT_BLOCK(WB2,8),WGT_BLOCK(WB3,7))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 2    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m12),MULT_BLOCK(m22),MULT_BLOCK(m32))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) + 2) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri  == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrmix31
-
-C ----------------------------------------------------distrmix32
-c 32 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-
-      subroutine distrmix32
-
-      integer, parameter :: AN1=16,AN2=16,AN3=12,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 2, m2 = 4, m3 = 4
-
-      double precision, dimension(6) :: 
-     >            WB1=(/2.0,5.,0.,3.0, 2., 3./)     
-      double precision, dimension(8)::
-     >            WB2=(/1.2,2.,4.,2.5,3.,1.,3.,2./)     
-      double precision, dimension(7) :: 
-     >            WB3=(/2.3,1.2,4.6,3.0, 1.5, 2.5, 1.2/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix32  '
-
-!dvm$ distribute 
-!dvm$* A3(WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,8),WGT_BLOCK(WB3,7))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-     
-      A3 = 10 
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),MULT_BLOCK(m3))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 2    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute 
-!dvm$* A3(WGT_BLOCK(WB2,8),WGT_BLOCK(WB3,7),WGT_BLOCK(WB1,6))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 12)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrmix32
-
-C----------------------------------------------------distrmix33
-c 33  DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-
-      subroutine distrmix33
-
-      integer, parameter :: AN1=12,AN2=18,AN3=20,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m11 = 2, m21 = 3, m31 = 2
-      integer, parameter :: m12 = 6, m22 = 9, m32 = 5
- 
-      double precision, dimension(7) :: 
-     >            WB1=(/2.2, 2.4, 4., 2.5, 3.5, 1.,3./)     
-      double precision, dimension(6)::
-     >            WB2=(/1.2, 2., 2.5, 3., 1.5, 3./)     
-      double precision, dimension(5) :: 
-     >            WB3=(/4.3, 2.2, 2.6, 2.0, 2.5/)     
-                                        
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix33  '
- 
-!dvm$ distribute A3(MULT_BLOCK(m11),WGT_BLOCK(WB2,6),MULT_BLOCK(m31))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 7
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute 
-!dvm$*    A3(WGT_BLOCK(WB1,7),MULT_BLOCK(m21),WGT_BLOCK(WB3,5))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-         do j=1, AN2
-            do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) - 5
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-    
-!dvm$ redistribute
-!dvm$*    A3(MULT_BLOCK(m12),MULT_BLOCK(m22),MULT_BLOCK(m32))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-           do j=1,AN2
-             do k=1,AN3
-                 if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 2)) then     
-                     erri = min(erri,i*NL/10 + j*NL/100 + k)
-                 endif 
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-    
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrmix33
-
-C------------------------------------------------------distrmix34
-c 34  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-
-      subroutine distrmix34
-
-      integer, parameter :: AN1=35,AN2=28,AN3=16,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 7, m2 = 7, m3 = 4
-
-      double precision, dimension(8) :: 
-     >            WB1=(/2., 2., 4., 2.7, 3.5, 2., 1., 3./)     
-      double precision, dimension(6)::
-     >            WB2=(/12., 2.5, 3., 1.5, 3., 2./)     
-      double precision, dimension(7) :: 
-     >            WB3=(/4.,3., 2.2, 2.6, 2.0, 2.5, 1./)     
-                                        
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix34  '
-
-!dvm$ distribute :: A3
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ redistribute
-!dvm$*  A3(WGT_BLOCK(WB1,8),WGT_BLOCK(WB2,6),MULT_BLOCK(m3))   
-
-        A3 = 0
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo                               
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*  A3(WGT_BLOCK(WB2,6),MULT_BLOCK(m2),WGT_BLOCK(WB3,7))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-       do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k)*2     
-            enddo
-          enddo
-       enddo
-!dvm$ end region
- 
-!dvm$ redistribute
-!dvm$*  A3(MULT_BLOCK(m1),WGT_BLOCK(WB3,7),WGT_BLOCK(WB1,8))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) * 2) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-               endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrmix34
-
-C------------------------------------------------------distrmix35
-c 35   DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][BLOCK]
-c               REDISTRIBUTE [WGT_BLOCK][BLOCK][MULT_BLOCK] 
-c               REDISTRIBUTE [BLOCK][MULT_BLOCK][WGT_BLOCK]
-
-      subroutine distrmix35
-
-      integer, parameter :: AN1= 10, AN2=21, AN3=32,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 2, m2 = 3, m3 = 4 
- 
-      double precision, dimension(7) :: 
-     >            WB1=(/2., 4., 3., 2.5, 5., 1., 2./)     
-      double precision, dimension(10)::
-     >            WB2=(/1., 2., 5., 3., 1., 3., 2., 3., 2., 1./)     
-      double precision, dimension(8) :: 
-     >            WB3=(/2.3, 2.2, 1.6, 1., 2.0, 2.5, 3., 2./)     
-                                        
-      integer A3(AN1,AN2,AN3)    ! static array
-      character(12), parameter :: tname='distrmix35  '
-
-!dvm$ distribute A3(MULT_BLOCK(m1),WGT_BLOCK(WB2,10),BLOCK)   
-!dvm$ dynamic A3
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-           do k=1,AN3
-               A3(i,j,k) = i*NL/10 + j*NL/100 + k + 5   
-            enddo
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(WGT_BLOCK(WB1,7),BLOCK,MULT_BLOCK(m3))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-           do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) + 2
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(BLOCK, MULT_BLOCK(m2),WGT_BLOCK(WB3,8))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-         do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 7)) then     
-                   erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      end subroutine distrmix35
-
-C------------------------------------------------------distrmix36
-c 36  DISTRIBUTE arrA3[WGT_BLOCK][MULT_BLOCK][BLOCK]
-c             REDISTRIBUTE [MULT_BLOCK][BLOCK][WGT_BLOCK] 
-c             REDISTRIBUTE [BLOCK][WGT_BLOCK][MULT_BLOCK]
- 
-      subroutine distrmix36
-
-      integer, parameter :: AN1=16,AN2=28,AN3=16,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 2, m2 = 7, m3 = 4
-
-      double precision, dimension(8) :: 
-     >           WB1=(/1.2,2.,4.,2.5,3.,1.,3.,2./)     
-      double precision, dimension(7)::
-     >           WB2=(/2.,2.,4.,2.5,3.,1.,3./)     
-      double precision, dimension(7) :: 
-     >           WB3=(/2.5,2.2,4.2,2.0, 1.5, 3.5, 1.2/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix36  '
-
-!dvm$ distribute A3(WGT_BLOCK(WB1,8),MULT_BLOCK(m2),BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-           do k=1,AN3
-               A3(i,j,k) = (i*NL/10 + j*NL/100 + k) * 3     
-           enddo  
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(MULT_BLOCK(m1),BLOCK,WGT_BLOCK(WB3,7))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-           do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) * 2
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(BLOCK, WGT_BLOCK(WB2,7),MULT_BLOCK(m3))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-         do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) * 6) then     
-                   erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrmix36
- 
-C -----------------------------------------------------distrmix37
-c 37  DISTRIBUTE arrA3[MULT_BLOCK][BLOCK][BLOCK]
-c              REDISTRIBUTE [BLOCK][BLOCK][WGT_BLOCK] 
-c              REDISTRIBUTE [BLOCK][WGT_BLOCK][MULT_BLOCK]
-
-      subroutine distrmix37
-
-      integer, parameter :: AN1=10,AN2=10,AN3=30,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 2, m2 = 5, m3 = 3
-
-      double precision, dimension(6) :: 
-     >           WB2=(/4., 2.5, 3., 1., 3., 2./)     
-      double precision, dimension(8)::
-     >           WB3=(/1.,2.,3.,3.5, 4., 1., 3., 2./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix37  '
-
-!dvm$ distribute A3(MULT_BLOCK(m1),BLOCK,BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-           do k=1,AN3
-               A3(i,j,k) = (i*NL/10 + j*NL/100 + k) * 3     
-           enddo  
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(BLOCK,BLOCK,WGT_BLOCK(WB3,8))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-           do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) * 2
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(BLOCK, WGT_BLOCK(WB2,6),MULT_BLOCK(m3))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-         do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) * 6) then     
-                   erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrmix37
- 
-C------------------------------------------------------distrmix38
-c 38  DISTRIBUTE arrA3[MULT_BLOCK][*][WGT_BLOCK]
-c              REDISTRIBUTE [*][*][*] 
-c              REDISTRIBUTE [WGT_BLOCK][MULT_BLOCK][*]
-
-      subroutine distrmix38
-
-      integer, parameter :: AN1=16,AN2=16,AN3=16,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-    
-      integer, parameter :: m1 = 2, m2 = 1, m3 = 4
-
-      double precision, dimension(11) :: 
-     >   WB=(/2.2, 3.,3., 2.5, 2., 1., 4., 2., 1., 5., 2./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix38  '
-
-!dvm$ distribute A3(MULT_BLOCK(m1),*,WGT_BLOCK(WB,11))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 5
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-           do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) + (i*NL/10 + j*NL/100 + k) 
-           enddo  
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute  A3(*,*,*)   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-           do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) + 2
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(WGT_BLOCK(WB,8),MULT_BLOCK(m2),*)   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-         do j=1,AN2
-            do k=1,AN3
-              if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) + 7) then     
-                   erri = min(erri,i*NL/10 + j*NL/100 + k)
-               endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrmix38
-
-C ----------------------------------------------------distrmix39
-C 39  DISTRIBUTE arrA3[MULT_BLOCK][BLOCK][*]
-c             REDISTRIBUTE [WGT_BLOCK][*][WGT_BLOCK] 
-c             REDISTRIBUTE [*][MULT_BLOCK][*]
-
-      subroutine distrmix39
-
-      integer, parameter :: AN1=18,AN2=6,AN3=30,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-   
-      integer, parameter :: m1 = 3, m2 = 2, m3 = 5
-      
-      double precision, dimension(11) :: 
-     >   WB=(/3.2, 2., 2., 1.5, 4., 2., 3., 2.5, 1.6, 3., 2./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix39  '
-
-!dvm$ distribute A3(MULT_BLOCK(m1),BLOCK,*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 7
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-          do k=1,AN3
-             A3(i,j,k) = A3(i,j,k) + (i*NL/10 + j*NL/100 + k) 
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(WGT_BLOCK(WB,11),*,WGT_BLOCK(WB,7))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 4    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ redistribute
-!dvm$*    A3(*,MULT_BLOCK(m2),*)   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) + 11) then     
-                    erri = min(erri, i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-
-      deallocate (A3)
-
-      end subroutine distrmix39
-
-C ----------------------------------------------------distrmix310
-c 310  DISTRIBUTE arrA3[WGT_BLOCK][*][*]
-c             REDISTRIBUTE [MULT_BLOCK][*][WGT_BLOCK] 
-c             REDISTRIBUTE [*][WGT_BLOCK][MULT_BLOCK]
-
-      subroutine distrmix310
-
-      integer, parameter :: AN1=25,AN2=35,AN3=10,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 5, m2 = 7, m3 = 2
-
-      double precision, dimension(12) :: 
-     >  WB=(/3., 1., 2., 1.5, 3., 4., 3., 2.5, 1.6, 3., 1.2, 1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix310 '
-
-!dvm$ distribute A3(WGT_BLOCK(WB,12),*,*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(MULT_BLOCK(m1), *, WGT_BLOCK(WB,8))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) - 2    
-            enddo
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(*,MULT_BLOCK(m2),WGT_BLOCK(WB,8))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-         do j=1,AN2
-             do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) - 2) then     
-                   erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-
-      deallocate (A3)
-
-      end subroutine distrmix310
-
-C ----------------------------------------------------distrmix311
-c 311  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]       range 1 1 1
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]     range 1 2 3
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]  range 2 3 2
-c                                                                 range 3 2 2
-c                                                                 range 4 1 4
-      subroutine distrmix311 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=15,AN2=15,AN3=28,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m11 = 3, m21 = 5, m31 = 4 
-      integer, parameter :: m12 = 5, m22 = 3, m32 = 7 
-
-      integer, dimension(1) :: BSi111=(/15/)      !range 1 1 1  
-      integer, dimension(1) :: BSj111=(/15/)     
-      integer, dimension(1) :: BSk111=(/28/)     
-
-      integer, dimension(1) :: BSi1=(/15/)        !range 1 2 3  
-      integer, dimension(2) :: BSj1=(/8,7/)     
-      integer, dimension(3) :: BSk1=(/12,10,6/)     
-
-      integer, dimension(2) :: BSi2=(/4,11/)      !range 2 3 2  
-      integer, dimension(3) :: BSj2=(/7,5,3/)     
-      integer, dimension(2) :: BSk2=(/10,18/)     
-
-      integer, dimension(3) :: BSi3=(/2,8,5/)     !range 3 4 1  
-      integer, dimension(4) :: BSj3=(/3,2,6,4/)     
-      integer, dimension(1) :: BSk3=(/28/)     
-
-      integer, dimension(4) :: BSi4=(/1,2,4,8/)   !range 4 1 4  
-      integer, dimension(1) :: BSj4=(/15/)     
-      integer, dimension(4) :: BSk4=(/12,4,6,6/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix311 '
-
-!dvm$ distribute A3(MULT_BLOCK(m11),MULT_BLOCK(m21),MULT_BLOCK(m31))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi),BLOCK,GEN_BLOCK(BSk))   
-
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2),GEN_BLOCK(BSk2))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj3),GEN_BLOCK(BSk3))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj4),GEN_BLOCK(BSk4))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) * 2    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m12),MULT_BLOCK(m22),MULT_BLOCK(m32))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) * 2) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix311
-
-C ----------------------------------------------------distrmix312
-c 312  DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]          range 1 1 1
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]   range 1 4 4
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]         range 2 4 2
-c                                                                 range 3 1 3
-c                                                                 range 4 2 2
-      subroutine distrmix312 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=24,AN2=10,AN3=24,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 3, m2 = 2, m3 = 4 
-
-      double precision, dimension(10) :: 
-     >  WB=(/2., 2.5, 3., 4., 3.5, 2.5, 2.6, 3., 2.2, 3./)     
-
-      integer, dimension(1) :: BSi111=(/24/)        !range 1 1 1  
-      integer, dimension(1) :: BSj111=(/10/)     
-      integer, dimension(1) :: BSk111=(/24/)     
-                                                              
-      integer, dimension(1) :: BSi11=(/24/)         !range 1 4 4  
-      integer, dimension(1) :: BSi12=(/24/)           
-      integer, dimension(4) :: BSj11=(/3,2,4,1/)     
-      integer, dimension(4) :: BSj12=(/4,2,1,3/)     
-      integer, dimension(4) :: BSk11=(/10,4,3,7/)     
-      integer, dimension(4) :: BSk12=(/5,6,7,6/)     
-
-      integer, dimension(2) :: BSi21=(/14,10/)      !range 2 4 2  
-      integer, dimension(2) :: BSi22=(/8,16/)     
-      integer, dimension(4) :: BSj21=(/3,2,1,4/)     
-      integer, dimension(4) :: BSj22=(/5,3,2,0/)     
-      integer, dimension(2) :: BSk21=(/20,4/)     
-      integer, dimension(2) :: BSk22=(/16,8/)          
-
-      integer, dimension(3) :: BSi31=(/8,12,4/)     !range 3 1 3  
-      integer, dimension(3) :: BSi32=(/3,10,11/)     
-      integer, dimension(1) :: BSj31=(/10/)     
-      integer, dimension(1) :: BSj32=(/10/)     
-      integer, dimension(3) :: BSk31=(/7,9,8/)     
-      integer, dimension(3) :: BSk32=(/4,6,14/)     
-
-      integer, dimension(4) :: BSi41=(/2,6,12,4/)   !range 4 2 2  
-      integer, dimension(4) :: BSi42=(/3,2,9,10/)     
-      integer, dimension(2) :: BSj41=(/6,4/)     
-      integer, dimension(2) :: BSj42=(/10,0/)     
-      integer, dimension(2) :: BSk41=(/14,10/)     
-      integer, dimension(2) :: BSk42=(/6,18/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix312 '
-
-!dvm$ distribute :: A3   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))   
-      select case(psize(1))
-      case(1) 
-        if (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11),GEN_BLOCK(BSk11))   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21),GEN_BLOCK(BSk21))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31),GEN_BLOCK(BSk31))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41),GEN_BLOCK(BSk41))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k  + 30 
-             enddo                                     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),WGT_BLOCK(WB,10),MULT_BLOCK(m3))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 30 
-             enddo                                     
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2),BLOCK)
-
-      select case(psize(1))
-      case(1)
-        if  (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),BLOCK)   
-        else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12),BLOCK)   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22),BLOCK)   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32),BLOCK)   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42),BLOCK)   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) - 30 
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 30)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix312
-
-C------------------------------------------------------distrmix313
-c 313  DISTRIBUTE arrA3[BLOCK][BLOCK][MULT_BLOCK]             
-c           REDISTRIBUTE [BLOCK][GEN_BLOCK][BLOCK]            
-c           REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][WGT_BLOCK]  
-
-      subroutine distrmix313 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=12,AN2=24,AN3=36,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 2, m2 = 3, m3 = 4 
-
-      double precision, dimension(9) :: 
-     >  WB=(/1., 2.5, 3., 4., 2.5, 2.6, 3.5, 4.2, 3./)     
-
-      integer, dimension(1) :: BSj1=(/24/)        
-      integer, dimension(2) :: BSj2=(/21,3/)      
-      integer, dimension(3) :: BSj3=(/7,9,8/)     
-      integer, dimension(4) :: BSj4=(/10,4,6,4/)  
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix313 '
-
-!dvm$ distribute A3(BLOCK, BLOCK, MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k  + 20       
-             enddo                                     
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj),BLOCK)   
-      select case(psize(2))
-      case(1)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),BLOCK)   
-      case(2)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),BLOCK)   
-      case(3)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj3),BLOCK)   
-      case(4)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj4),BLOCK)   
-      case default 
-        goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-         do j=1,AN2
-           do k=1,AN3
-              A3(i,j,k) = A3(i,j,k) + 5
-           enddo                                     
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),WGT_BLOCK(WB,9))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) - 20 
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 5)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-    
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix313
-
-C-----------------------------------------------------distrmix314
-c 314 DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][MULT_BLOCK]        
-c              REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]   
-c              REDISTRIBUTE [MULT_BLOCK][BLOCK][WGT_BLOCK]  
-c                                                            
-      subroutine distrmix314 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=24,AN2=15,AN3=12,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 4, m2 = 3, m3 = 2 
-
-      double precision, dimension(10) :: 
-     >  WB=(/3., 2., 2., 4., 2., 3., 2.5, 2.6, 1.2, 2./)     
-
-      integer, dimension(1) :: BSi1=(/24/)         
-      integer, dimension(2) :: BSi2=(/14,10/)        
-      integer, dimension(3) :: BSi3=(/12,8,4/)       
-      integer, dimension(4) :: BSi4=(/6,6,5,7/)      
-
-      integer, dimension(1) :: BSj1=(/15/)     
-      integer, dimension(2) :: BSj2=(/7,8/)     
-      integer, dimension(3) :: BSj3=(/3,4,8/)     
-      integer, dimension(4) :: BSj4=(/1,6,3,5/)                
-
-      integer, dimension(1) :: BSk1=(/12/)     
-      integer, dimension(2) :: BSk2=(/4,8/)     
-      integer, dimension(3) :: BSk3=(/6,2,4/)     
-      integer, dimension(4) :: BSk4=(/2,3,6,1/)     
-
-      integer A3(AN1,AN2,AN3)      ! static
-      character(12), parameter :: tname='distrmix314 '
-
-!dvm$ distribute A3(WGT_BLOCK(WB,10), BLOCK, MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k        
-             enddo                                     
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi),BLOCK,GEN_BLOCK(BSk))   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-              goto 10
-          endselect  
-
-      case(2)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-       do i=1,AN1
-         do j=1,AN2
-           do k=1,AN3
-              A3(i,j,k) = i*NL/10 + j*NL/100 + k  + 2
-           enddo                                     
-         enddo
-       enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),BLOCK,MULT_BLOCK(m3))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 2)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-    
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   continue
-
-      end subroutine distrmix314
-
-C ----------------------------------------------------distrmix315
-c 315  DISTRIBUTE arrA3[MULT_BLOCK][WGT_BLOCK][WGT_BLOCK]        
-c              REDISTRIBUTE [BLOCK][GEN_BLOCK][GEN_BLOCK]        
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]  
-                                                                
-      subroutine distrmix315 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=21, AN2=14, AN3=16, NL=1000,ER=10000           
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 3, m2 = 2, m3 = 4 
-
-      double precision, dimension(8) :: 
-     >  WB1=(/2., 4., 3., 1., 2.5, 2.6, 2.2, 2./)     
-      double precision, dimension(10) :: 
-     >  WB2=(/4., 2., 2.5, 4., 2., 3., 3.5, 1.6, 3.2, 2./)     
-
-      integer, dimension(1) :: BSi1=(/21/)         
-      integer, dimension(2) :: BSi2=(/14,7/)        
-      integer, dimension(3) :: BSi3=(/10,8,3/)       
-      integer, dimension(4) :: BSi4=(/6,6,5,4/)      
-
-      integer, dimension(1) :: BSj1=(/14/)     
-      integer, dimension(2) :: BSj2=(/3,11/)     
-      integer, dimension(3) :: BSj3=(/4,3,7/)     
-      integer, dimension(4) :: BSj4=(/2,6,2,4/)                
-
-      integer, dimension(1) :: BSk1=(/16/)     
-      integer, dimension(2) :: BSk2=(/4,12/)     
-      integer, dimension(3) :: BSk3=(/6,3,7/)     !rem
-      integer, dimension(4) :: BSk4=(/2,3,6,5/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix315 '
-
-!dvm$ distribute 
-!dvm$* A3 (MULT_BLOCK(m1), WGT_BLOCK(WB1,8), WGT_BLOCK(WB2,10))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k  + 12
-             enddo                                     
-         enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj),GEN_BLOCK(BSk))   
-
-      select case(psize(2))
-      case(1)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj3),GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj3),GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj3),GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj3),GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj4),GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj4),GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj4),GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj4),GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-        do j=1,AN2
-          do k=1,AN3
-             A3(i,j,k) = A3(i,j,k) + 12
-          enddo                                     
-        enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),WGT_BLOCK(WB1,6),MULT_BLOCK(m3))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-        do j=1,AN2
-           do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) - 20 
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 4)) then     
-                   erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-         enddo
-      enddo
-!dvm$ end region
-  
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-         call ansyes(tname)
-      else
-         call ansno (tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix315
-
-C-----------------------------------------------------distrmix316
-c 316  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][MULT_BLOCK]         
-c              REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][BLOCK]        
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][MULT_BLOCK]  
-                                                                
-      subroutine distrmix316 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=33,AN2=44,AN3=55,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 3, m2 = 11, m3 = 5 
-
-      double precision, dimension (7) ::
-     >  WB1=(/3., 2.5, 2., 4., 2.5, 2.0, 3.5/)     
-      double precision, dimension(8) :: 
-     >  WB2=(/4., 3., 2.5, 2., 2., 3., 3.5, 2.6/)     
-
-      integer, dimension(1) :: BSi1=(/33/)            
-      integer, dimension(2) :: BSi2=(/23,10/)         
-      integer, dimension(3) :: BSi3=(/12,15,6/)      
-      integer, dimension(4) :: BSi4=(/6,13,11,3/)    !rem 
-
-      integer, dimension(1) :: BSj1=(/44/)     
-      integer, dimension(2) :: BSj2=(/14,30/)     
-      integer, dimension(3) :: BSj3=(/11,21,12/)     
-      integer, dimension(4) :: BSj4=(/6,14,10,14/)     
-
-      integer, dimension(1) :: BSk1=(/55/)     
-      integer, dimension(2) :: BSk2=(/28,27/)     
-      integer, dimension(3) :: BSk3=(/12,18,25/)     
-      integer, dimension(4) :: BSk4=(/10,18,15,12/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix316 '
-
-!dvm$ distribute
-!dvm$* A3(WGT_BLOCK(WB1,7), WGT_BLOCK(WB2,8), MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-         do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k  + 2       
-             enddo                                     
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi),GEN_BLOCK(BSj),BLOCK)   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),BLOCK)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj2),BLOCK)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj3),BLOCK)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj4),BLOCK)    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj1),BLOCK)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2),BLOCK)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj3),BLOCK)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj4),BLOCK)    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj1),BLOCK)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj2),BLOCK)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj3),BLOCK)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj4),BLOCK)    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj1),BLOCK)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj2),BLOCK)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj3),BLOCK)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj4),BLOCK)    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-         do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 5
-            enddo                                     
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),WGT_BLOCK(WB1,7),MULT_BLOCK(m2))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-         do j=1,AN2
-            do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) - 2 
-               if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 5)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-               endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-  
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix316
-
-C-----------------------------------------------------distrmix317
-c 317  DISTRIBUTE arrA3[GEN_BLOCK][*][GEN_BLOCK]            
-c              REDISTRIBUTE [MULT_BLOCK][WGT_BLOCK][*]     
-c              REDISTRIBUTE [*][GEN_BLOCK][BLOCK]                                                         range 3 4 1
-                                                          
-      subroutine distrmix317 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=12,AN2=16,AN3=12,NL=1000,ER=100000
-      integer :: erri=ER,i,j,k
-
-      integer, parameter :: m1 = 2, m2 = 4, m3 = 3 
-
-      double precision, dimension(8) :: 
-     >  WB=(/2., 1., 2.5, 3., 4., 3., 3.5, 4./)     
-
-      integer, dimension(1) :: BSi1=(/12/)          
-      integer, dimension(2) :: BSi2=(/4,8/)         
-      integer, dimension(3) :: BSi3=(/2,7,3/)     
-      integer, dimension(4) :: BSi4=(/2,3,4,3/)     
-
-      integer, dimension(1) :: BSj1=(/16/)     
-      integer, dimension(2) :: BSj2=(/11,5/)     
-      integer, dimension(3) :: BSj3=(/8,2,6/)     
-      integer, dimension(4) :: BSj4=(/1,3,4,8/)     !rem
-
-      integer, dimension(1) :: BSk1=(/12/)     
-      integer, dimension(2) :: BSk2=(/2,10/)     
-      integer, dimension(3) :: BSk3=(/1,4,7/)     
-      integer, dimension(4) :: BSk4=(/2,4,3,3/)     
-
-      integer, allocatable ::  A3(:,:,:)
-      character(12), parameter :: tname='distrmix317 '
-               
-!dvm$ distribute  :: A3
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi),*,GEN_BLOCK(BSk))   
-      select case(psize(1))
-      case(1)
-          select case(psize(2)) ! it's is true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),*,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),*,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),*,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),*,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2)) ! it's is true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),*,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),*,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),*,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),*,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(2)) ! it's is true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),*,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),*,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),*,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),*,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2)) ! it's is true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),*,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),*,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),*,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),*,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                  A3(i,j,k) = i*NL/10+j*NL/100+k
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),WGT_BLOCK(WB,8),*)   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                 A3(i,j,k) = A3(i,j,k) * 2
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$*  redistribute A3(*,GEN_BLOCK(BSj),BLOCK)   
-
-      select case (psize(1))                        !rem
-      case(1)
-!dvm$ redistribute A3(*,GEN_BLOCK(BSj1),BLOCK)    
-      case(2)
-!dvm$ redistribute A3(*,GEN_BLOCK(BSj2),BLOCK) 
-      case(3)
-!dvm$ redistribute A3(*,GEN_BLOCK(BSj3),BLOCK) 
-      case(4)
-!dvm$ redistribute A3(*,GEN_BLOCK(BSj4),BLOCK)  
-      case default
-         goto 10
-      endselect
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-              A3(i,j,k) = A3(i,j,k) / 2
-              if (A3(i,j,k) /= i*NL/10+j*NL/100+k) then
-                  erri = min(erri,i*NL/10 + j*NL/100 + k)
-              endif 
-             enddo
-           enddo
-       enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix317 
-
-C ----------------------------------------------------distrmix318
-c 318  DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]          range 1 1 1 
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]   range 1 4 3
-c                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]   range 2 3 2
-c                                                                 range 3 1 4
-c                                                                 range 4 2 2
-      subroutine distrmix318 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      double precision, dimension(7) :: 
-     >             WB1=(/2.0, 1.2, 2.5, 1.4, 2.5, 1.3, 1./)     
-      double precision, dimension(5) ::
-     >             WB2=(/2., 1.3, 2., 1.0, 1.7/)     
-      double precision, dimension(6) ::
-     >             WB3=(/2., 3., 1.3, 2., 1.0, 1.7/)     
-
-      integer, dimension(1) :: BSi111=(/8/)        !range 1 1 1  
-      integer, dimension(1) :: BSj111=(/8/)     
-      integer, dimension(1) :: BSk111=(/8/)     
-
-      integer, dimension(1) :: BSi11=(/8/)         !range 1 4 3 
-      integer, dimension(1) :: BSi12=(/8/)           
-      integer, dimension(4) :: BSj11=(/3,2,2,1/)     
-      integer, dimension(4) :: BSj12=(/4,2,1,1/)     
-      integer, dimension(3) :: BSk11=(/4,3,1/)     
-      integer, dimension(3) :: BSk12=(/2,4,2/)     
-
-      integer, dimension(2) :: BSi21=(/6,2/)       !range 2 3 2  
-      integer, dimension(2) :: BSi22=(/4,4/)         
-      integer, dimension(3) :: BSj21=(/3,2,3/)     
-      integer, dimension(3) :: BSj22=(/3,1,4/)     
-      integer, dimension(2) :: BSk21=(/1,7/)     
-      integer, dimension(2) :: BSk22=(/2,6/)     
-
-      integer, dimension(3) :: BSi31=(/3,2,3/)     !range 3 1 4  
-      integer, dimension(3) :: BSi32=(/4,2,2/)     
-      integer, dimension(1) :: BSj31=(/8/)     
-      integer, dimension(1) :: BSj32=(/8/)     
-      integer, dimension(4) :: BSk31=(/1,3,2,2/)     
-      integer, dimension(4) :: BSk32=(/1,1,4,2/)     
-
-      integer, dimension(4) :: BSi41=(/3,2,1,2/)   !range 4 2 2  
-      integer, dimension(4) :: BSi42=(/5,1,1,1/)   
-      integer, dimension(2) :: BSj41=(/5,3/)     
-      integer, dimension(2) :: BSj42=(/6,2/)     
-      integer, dimension(2) :: BSk41=(/2,6/)     
-      integer, dimension(2) :: BSk42=(/1,7/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix318 '
-
-!dvm$ distribute :: A3   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))   
-
-      select case(psize(1))
-      case(1) 
-        if  (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11),GEN_BLOCK(BSk11))   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21),GEN_BLOCK(BSk21))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31),GEN_BLOCK(BSk31))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41),GEN_BLOCK(BSk41))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(WGT_BLOCK(WB1,7),WGT_BLOCK(WB2,5),WGT_BLOCK(WB3,6))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 1   
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2),GEN_BLOCK(BSk2))   
-
-      select case(psize(1))
-      case(1) 
-        if  (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute 
-!dvm$*    A3(GEN_BLOCK(BSi12),GEN_BLOCK(BSj12),GEN_BLOCK(BSk12))   
-        endif 
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi22),GEN_BLOCK(BSj22),GEN_BLOCK(BSk22))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi32),GEN_BLOCK(BSj32),GEN_BLOCK(BSk32))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi42),GEN_BLOCK(BSj42),GEN_BLOCK(BSk42))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 1)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix318
-
-C ----------------------------------------------------distrmix319
-c  
-c 319 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]           range 1 1 1 
-c             REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][GEN_BLOCK]      range 1 2 1
-c             REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] range 2 2 2
-c                                                                 range 3 2 2
-c                                                                 range 4 4 1
-      subroutine distrmix319 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=12,AN2=6,AN3=10,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      double precision, dimension(6) :: 
-     >             WB1=(/2.0, 1.2, 2., 2.4, 2.3, 1.6/)     
-      double precision, dimension(5) ::
-     >             WB2=(/2.4, 1.8, 2., 1.0, 1.7/)     
-      double precision, dimension(8) ::
-     >             WB3=(/2., 3., 1.3, 2., 1.0, 1.7, 3., 4./)     
-
-      integer, dimension(1) :: BSi111=(/8/)       !range 1 1 1  
-      integer, dimension(1) :: BSj111=(/8/)     
-      integer, dimension(1) :: BSk111=(/8/)     
-
-      integer, dimension(1) :: BSi1=(/12/)        !range 1 2 1  
-      integer, dimension(2) :: BSj1=(/5,1/)     
-      integer, dimension(1) :: BSk1=(/10/)     !rem
-
-      integer, dimension(2) :: BSi2=(/6,6/)       !range 2 2 2  
-      integer, dimension(2) :: BSj2=(/4,2/)     
-      integer, dimension(2) :: BSk2=(/3,7/)     
-
-      integer, dimension(3) :: BSi3=(/5,2,5/)     !range 3 2 2  
-      integer, dimension(2) :: BSj3=(/2,4/)     
-      integer, dimension(2) :: BSk3=(/2,8/)     
-
-      integer, dimension(4) :: BSi4=(/4,2,4,2/)   !range 4 4 1 !rem 
-      integer, dimension(4) :: BSj4=(/1,1,2,2/)     
-      integer, dimension(1) :: BSk4=(/10/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix319 '
-
-!dvm$ distribute :: A3  
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ redistribute
-!dvm$*    A3(WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,5),WGT_BLOCK(WB3,8))   
-
-       A3 = 10
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k)+ i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi),GEN_BLOCK(BSj),GEN_BLOCK(BSk))   
-
-      select case(psize(1))
-      case(1) 
-        if  (psize(2) == 1 .and. psize(3) == 1) then
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi111),GEN_BLOCK(BSj111),GEN_BLOCK(BSk111))   
-        else
-!dvm$ redistribute 
-!dvm$*    A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))   
-        endif
-      case(2)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2),GEN_BLOCK(BSk2))   
-      case(3)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj3),GEN_BLOCK(BSk3))   
-      case(4)
-!dvm$ redistribute
-!dvm$*    A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj4),GEN_BLOCK(BSk4))   
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 2   
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(WGT_BLOCK(WB2,5),WGT_BLOCK(WB3,6),WGT_BLOCK(WB1,6))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) - 12   
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix319
-
-C ----------------------------------------------------distrmix320
-c 320  DISTRIBUTE arrA3[BLOCK][GEN_BLOCK][GEN_BLOCK]  
-c           REDISTRIBUTE arrB3[WGT_BLOCK][BLOCK][WGT_BLOCK]   
-
-      subroutine distrmix320 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=5,AN2=7,AN3=6,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      double precision, dimension(7) :: 
-     >             WB1=(/2.0, 2.2, 3., 2.4, 2.3, 1.6, 0.5/)     
-      double precision, dimension(6) ::
-     >             WB2=(/2.4, 1.8, 3., 2.0, 1.7, 1./)     
-      double precision, dimension(8) ::
-     >             WB3=(/1., 3.5, 2.3, 2., 1.5, 1.7, 3., 2./)     
-
-      integer, dimension(1) :: BSi1=(/5/)         
-      integer, dimension(2) :: BSi2=(/1,4/)        
-      integer, dimension(3) :: BSi3=(/1,2,2/)       
-      integer, dimension(4) :: BSi4=(/2,1,1,1/)      
-
-      integer, dimension(1) :: BSj1=(/7/)     
-      integer, dimension(2) :: BSj2=(/3,4/)     
-      integer, dimension(3) :: BSj3=(/2,4,1/)     
-      integer, dimension(4) :: BSj4=(/1,2,1,3/)                
-
-      integer, dimension(1) :: BSk1=(/6/)     
-      integer, dimension(2) :: BSk2=(/3,3/)     
-      integer, dimension(3) :: BSk3=(/2,3,1/)     
-      integer, dimension(4) :: BSk4=(/3,2,0,1/)     
-
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix320 '
-
-!dvm$ distribute  :: A3
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj),GEN_BLOCK(BSk))   
-
-      select case(psize(2))
-      case(1)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj1),GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj2),GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj3),GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj3),GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj3),GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj3),GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj4),GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj4),GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj4),GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(BLOCK,GEN_BLOCK(BSj4),GEN_BLOCK(BSk4))   
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-      A3 = 5
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(WGT_BLOCK(WB1,7),BLOCK,WGT_BLOCK(WB3,8))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) - 5   
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix320
-
-C ----------------------------------------------------distrmix321
-c 321 DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]         
-c                REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK] 
-                                                           
-      subroutine distrmix321 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=16,AN2=16,AN3=16,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      double precision, dimension(6) :: 
-     >             WB1=(/2.5, 3.6, 2.4, 2.3, 1.2, 0.5/)     
-      double precision, dimension(5) ::
-     >             WB2=(/1.4, 2.8, 3., 3.0, 1.1/)     
-      double precision, dimension(7) ::
-     >             WB3=(/1., 2.3, 2.2, 3.5, 1.7, 3., 2./)     
-
-      integer, dimension(1) :: BSi1=(/16/)         
-      integer, dimension(2) :: BSi2=(/11,5/)        
-      integer, dimension(3) :: BSi3=(/1,12,3/)       
-      integer, dimension(4) :: BSi4=(/6,4,5,1/)      
-
-      integer, dimension(1) :: BSj1=(/16/)     
-      integer, dimension(2) :: BSj2=(/3,13/)     
-      integer, dimension(3) :: BSj3=(/2,4,10/)     
-      integer, dimension(4) :: BSj4=(/5,1,7,3/)                
-
-      integer, dimension(1) :: BSk1=(/16/)     
-      integer, dimension(2) :: BSk2=(/10,6/)     
-      integer, dimension(3) :: BSk3=(/2,8,6/)     
-      integer, dimension(4) :: BSk4=(/3,2,10,1/)     
-
-      integer A3(AN1,AN2,AN3)   ! static array
-      character(12), parameter :: tname='distrmix321 '
-
-!dvm$ distribute A3(WGT_BLOCK(WB1,6),BLOCK,WGT_BLOCK(WB3,7))   
-!dvm$ dynamic A3
-
-      A3 = 20 
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) =  A3(i,j,k)+ i*NL/10 + j*NL/100 + k   
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-   
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi),BLOCK,GEN_BLOCK(BSk))   
-   
-      select case(psize(1))
-      case(1)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) - 20   
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   continue
-
-      end subroutine distrmix321
-
-C ----------------------------------------------------distrmix322
-c 322  DISTRIBUTE arrA3[GEN_BLOCK][BLOCK][GEN_BLOCK]    
-c                REDISTRIBUTE [BLOCK][WGT_BLOCK][BLOCK] 
-                                                       
-      subroutine distrmix322 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=24,AN2=16,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      double precision, dimension(5) :: 
-     >             WB1=(/ 3.2, 2.4, 2.0, 1.0, 2.5/)     
-      double precision, dimension(4) ::
-     >             WB2=(/2.1, 2.5, 3., 1.1/)     
-      double precision, dimension(6) ::
-     >             WB3=(/2.3, 2.0, 3.5, 1.5, 3., 2./)     
-
-      integer, dimension(1) :: BSi1=(/24/)         
-      integer, dimension(2) :: BSi2=(/11,13/)        
-      integer, dimension(3) :: BSi3=(/10,12,2/)       
-      integer, dimension(4) :: BSi4=(/6,14,3,1/)      
-
-      integer, dimension(1) :: BSj1=(/16/)     
-      integer, dimension(2) :: BSj2=(/12,4/)     
-      integer, dimension(3) :: BSj3=(/3,7,6/)     
-      integer, dimension(4) :: BSj4=(/4,2,6,4/)                
-
-      integer, dimension(1) :: BSk1=(/8/)     
-      integer, dimension(2) :: BSk2=(/2,6/)     
-      integer, dimension(3) :: BSk3=(/3,1,4/)     
-      integer, dimension(4) :: BSk4=(/4,2,1,1/)                
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix322 '
-
-!dvm$ distribute :: A3
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi),BLOCK,GEN_BLOCK(BSk))   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk1))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk2))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk3))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),BLOCK,GEN_BLOCK(BSk4))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-      A3 = 15  
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute  A3(BLOCK,WGT_BLOCK(WB2,4),BLOCK)   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 15)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix322
-
-C ----------------------------------------------------distrmix323
-c 323 DISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]             
-c                REDISTRIBUTE [GEN_BLOCK][GEN_BLOCK][*] 
-                                                           
-      subroutine distrmix323 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=8,AN2=11,AN3=11,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      double precision, dimension(7) :: 
-     >             WB1=(/ 3.2, 2.4, 1., 2., 2.0, 1.0, 2.5/)     
-      double precision, dimension(6) ::
-     >             WB2=(/3.1, 2.5, 4., 2.1, 2., 2./)
-      double precision, dimension(6) ::
-     >             WB3=(/1.2, 3.0, 2.4, 1.0, 3., 2.5/)     
-
-      integer, dimension(1) :: BSi1=(/8/)         
-      integer, dimension(2) :: BSi2=(/2,6/)        
-      integer, dimension(3) :: BSi3=(/1,3,4/)       
-      integer, dimension(4) :: BSi4=(/3,2,1,2/)      
-
-      integer, dimension(1) :: BSj1=(/11/)     
-      integer, dimension(2) :: BSj2=(/3,8/)     
-      integer, dimension(3) :: BSj3=(/1,7,3/)     
-      integer, dimension(4) :: BSj4=(/5,3,1,2/)                
-
-      integer, dimension(1) :: BSk1=(/11/)     
-      integer, dimension(2) :: BSk2=(/1,10/)     
-      integer, dimension(3) :: BSk3=(/3,4,4/)     
-      integer, dimension(4) :: BSk4=(/4,2,2,3/)                
-
-      integer :: A3(AN1,AN2,AN3)
-      character(12), parameter :: tname='distrmix323 '
-
-!dvm$ distribute A3(BLOCK,WGT_BLOCK(WB2,6),BLOCK)   
-!dvm$ dynamic A3
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi),GEN_BLOCK(BSj),*)   
-   
-      select case(psize(1))
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),*)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj2),*)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj3),*)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj4),*)    
-          case default 
-              goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj1),*)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj2),*)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj3),*)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi2),GEN_BLOCK(BSj4),*)    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj1),*)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj2),*)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj3),*)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi3),GEN_BLOCK(BSj4),*)    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj1),*)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj2),*)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj3),*)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi4),GEN_BLOCK(BSj4),*)    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   continue
-
-      end subroutine distrmix323
-
-C ----------------------------------------------------distrmix324
-c 324 DISTRIBUTE arrA3[GEN_BLOCK][GEN_BLOCK][*]         
-c                REDISTRIBUTE [*][WGT_BLOCK][WGT_BLOCK] 
-c                REDISTRIBUTE [GEN_BLOCK][*][GEN_BLOCK] 
-c                                                       
-      subroutine distrmix324 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=12,AN2=12,AN3=21,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      double precision, dimension(7) :: 
-     >             WB1=(/2.0, 1.2, 2.5, 1.4, 2.5, 1.3, 1./)     
-      double precision, dimension(5) ::
-     >             WB2=(/2., 1.3, 2., 1.0, 1.7/)     
-      double precision, dimension(6) ::
-     >             WB3=(/2., 3., 1.3, 2., 1.0, 1.7/)     
-
-      integer, dimension(1) :: BSi11=(/12/)      
-      integer, dimension(1) :: BSi12=(/12/)            
-      integer, dimension(2) :: BSi21=(/8,4/)    
-      integer, dimension(2) :: BSi22=(/2,10/)         
-      integer, dimension(3) :: BSi31=(/1,6,5/)    
-      integer, dimension(3) :: BSi32=(/4,6,2/)     
-      integer, dimension(4) :: BSi41=(/3,2,4,3/)  
-      integer, dimension(4) :: BSi42=(/4,2,2,4/)   
-
-      integer, dimension(1) :: BSj11=(/12/) 
-      integer, dimension(1) :: BSj12=(/12/)     
-      integer, dimension(2) :: BSj21=(/6,6/)     
-      integer, dimension(2) :: BSj22=(/1,11/)     
-      integer, dimension(3) :: BSj31=(/8,2,2/)     
-      integer, dimension(3) :: BSj32=(/1,10,1/)     
-      integer, dimension(4) :: BSj41=(/2,5,3,2/)     
-      integer, dimension(4) :: BSj42=(/2,8,1,1/)     
-
-      integer, dimension(1) :: BSk11=(/21/)     
-      integer, dimension(1) :: BSk12=(/21/)     
-      integer, dimension(2) :: BSk21=(/11,10/)     
-      integer, dimension(2) :: BSk22=(/7,14/)     
-      integer, dimension(3) :: BSk31=(/1,5,15/)     
-      integer, dimension(3) :: BSk32=(/4,6,11/)     
-      integer, dimension(4) :: BSk41=(/1,2,10,8/)     
-      integer, dimension(4) :: BSk42=(/12,4,2,3/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(*), parameter :: tname='distrmix324 '
-
-!dvm$ distribute :: A3   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi1),GEN_BLOCK(BSj1),*)   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj11),*)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj21),*)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj31),*)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi11),GEN_BLOCK(BSj41),*)    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj11),*)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj21),*)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj31),*)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi21),GEN_BLOCK(BSj41),*)    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj11),*)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj21),*)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj31),*)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi31),GEN_BLOCK(BSj41),*)    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj11),*)    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj21),*)    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj31),*)    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi41),GEN_BLOCK(BSj41),*)    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-      A3 = 1 
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k)+i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(*, WGT_BLOCK(WB2,5),WGT_BLOCK(WB3,6))   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) * 2   
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi2),*,GEN_BLOCK(BSk2))   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(2)) ! it's true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),*,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),*,GEN_BLOCK(BSk22))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),*,GEN_BLOCK(BSk32))    
-          case(4)                                            
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),*,GEN_BLOCK(BSk42))
-          case default
-             goto 10
-          endselect 
-      case(2)
-          select case(psize(2)) ! it's true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),*,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),*,GEN_BLOCK(BSk22))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),*,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),*,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(3)
-          select case(psize(2)) ! it's true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),*,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),*,GEN_BLOCK(BSk22))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),*,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),*,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(2)) ! it's true - psize(2)
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),*,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),*,GEN_BLOCK(BSk22))    
-          case(3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),*,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),*,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) / 2   
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 1)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix324
-
-C ----------------------------------------------------distrmix325
-c 325  DISTRIBUTE arrA3 [*][GEN_BLOCK][GEN_BLOCK]                
-c                REDISTRIBUTE [*][WGT_BLOCK][*]                 
-c                REDISTRIBUTE [GEN_BLOCK][BLOCK][GEN_BLOCK]  
-c                                                               
-c                                                               
-      subroutine distrmix325 (psize)
-      integer psize(3)
-
-      integer, parameter :: AN1=7,AN2=6,AN3=7,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-
-      double precision, dimension(10) ::
-     >          WB2=(/2.0, 1.2, 2.5, 1.0, 2.5, 1.3, 1., 3., 2., 1./)     
-
-      integer, dimension(1) :: BSi11=(/7/)      
-      integer, dimension(1) :: BSi12=(/7/)            
-      integer, dimension(2) :: BSi21=(/3,4/)    
-      integer, dimension(2) :: BSi22=(/2,5/)         
-      integer, dimension(3) :: BSi31=(/1,6,0/)    
-      integer, dimension(3) :: BSi32=(/4,2,1/)     
-      integer, dimension(4) :: BSi41=(/3,2,1,1/)  
-      integer, dimension(4) :: BSi42=(/2,1,2,2/)   
-
-      integer, dimension(1) :: BSj11=(/6/) 
-      integer, dimension(1) :: BSj12=(/6/)     
-      integer, dimension(2) :: BSj21=(/2,4/)     
-      integer, dimension(2) :: BSj22=(/0,6/)     
-      integer, dimension(3) :: BSj31=(/2,2,2/)     
-      integer, dimension(3) :: BSj32=(/1,3,2/)     
-      integer, dimension(4) :: BSj41=(/2,1,1,2/)     
-      integer, dimension(4) :: BSj42=(/3,0,2,1/)     
-
-      integer, dimension(1) :: BSk11=(/7/)     
-      integer, dimension(1) :: BSk12=(/7/)     
-      integer, dimension(2) :: BSk21=(/3,4/)     
-      integer, dimension(2) :: BSk22=(/6,1/)     
-      integer, dimension(3) :: BSk31=(/1,5,1/)     
-      integer, dimension(3) :: BSk32=(/4,2,1/)     
-      integer, dimension(4) :: BSk41=(/2,0,3,2/)     
-      integer, dimension(4) :: BSk42=(/2,4,0,1/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(12), parameter :: tname='distrmix325 '
-
-!dvm$ distribute :: A3
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!!!!dvm$ redistribute A3(*,GEN_BLOCK(BSj1),GEN_BLOCK(BSk1))   
-
-                select case(psize(1))     ! it's true - psize(1)
-      case(1)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj11),GEN_BLOCK(BSk11))   
-         case(2) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj11),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj11),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj11),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10
-         endselect  
-
-      case(2)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj21),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj21),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj21),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj21),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10               
-         endselect  
-
-      case (3)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj31),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj31),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj31),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj31),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10
-         endselect  
-
-      case (4)
-         select case(psize(2))  ! it's true - psize(2)
-         case(1) 
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj41),GEN_BLOCK(BSk11))   
-         case(2)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj41),GEN_BLOCK(BSk21))   
-         case(3)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj41),GEN_BLOCK(BSk31))   
-         case(4)
-!dvm$ redistribute
-!dvm$*    A3(*,GEN_BLOCK(BSj41),GEN_BLOCK(BSk41))   
-         case default 
-            goto 10
-         endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-!dvm$ region  
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k + 5  
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-
-
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k + 5  
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(*, WGT_BLOCK(WB2,10), *)   
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + 5   
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!!!!dvm$ redistribute A3(GEN_BLOCK(BSi2),BLOCK,GEN_BLOCK(BSk2))   
-
-      select case(psize(1))
-      case(1)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),BLOCK,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),BLOCK,GEN_BLOCK(BSk22))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),BLOCK,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi12),BLOCK,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(2)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),BLOCK,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),BLOCK,GEN_BLOCK(BSk22))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),BLOCK,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi22),BLOCK,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case (3)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),BLOCK,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),BLOCK,GEN_BLOCK(BSk22))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),BLOCK,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi32),BLOCK,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case(4)
-          select case(psize(3))
-          case(1) 
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),BLOCK,GEN_BLOCK(BSk12))    
-          case(2)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),BLOCK,GEN_BLOCK(BSk22))    
-          case (3)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),BLOCK,GEN_BLOCK(BSk32))    
-          case(4)
-!dvm$ redistribute A3(GEN_BLOCK(BSi42),BLOCK,GEN_BLOCK(BSk42))    
-          case default 
-             goto 10
-          endselect  
-
-      case default 
-         goto 10
-      endselect  
-
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction(min(erri))
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k)    
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 10)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
- 10   deallocate (A3)
-
-      end subroutine distrmix325
-
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult1.fdv
deleted file mode 100644
index dac94e9..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult1.fdv
+++ /dev/null
@@ -1,553 +0,0 @@
-      program DISTRM1
-
-!    TESTING distribute and redistribute directive       
-!            MULT_BLOCK distribution
-
-      print *,'===START OF distrmult1========================'
-
-C --------------------------------------------------
-c 11  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[MULT_BLOCK] 
-      call distrm11
-C --------------------------------------------------
-c 12  DISTRIBUTE arrA1[MULT_BLOCK]  REDISTRIBUTE arrA1[BLOCK] 
-      call distrm12
-C --------------------------------------------------
-c 13  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[MULT_BLOCK] small array
-      call distrm13
-C --------------------------------------------------
-c 14  DISTRIBUTE arrA1[MULT_BLOCK]  REDISTRIBUTE arrA1[BLOCK] small array
-      call distrm14
-C --------------------------------------------------
-c 15  DISTRIBUTE arrA1[MULT_BLOCK]  REDISTRIBUTE arrA1[MULT_BLOCK] other m
-      call distrm15
-C --------------------------------------------------
-c 16  DISTRIBUTE arrA1[MULT_BLOCK]  REDISTRIBUTE arrA1[*]
-      call distrm16
-C --------------------------------------------------
-c 17  DISTRIBUTE arrA1[*]           REDISTRIBUTE arrA1[MULT_BLOCK] 
-      call distrm17
-C --------------------------------------------------
-c 21  DISTRIBUTE arrA2[MULT_BLOCK][*]   REDISTRIBUTE arrA2[*][MULT_BLOCK]
-      call distrm21
-C --------------------------------------------------
-c 22  DISTRIBUTE arrA2[*][MULT_BLOCK]   REDISTRIBUTE arrA2[*][*]
-      call distrm22
-C --------------------------------------------------
-c 23  DISTRIBUTE arrA2[*][*]            REDISTRIBUTE arrA2[*][MULT_BLOCK]
-      call distrm23
-C -------------------------------------------------
-C
-      print *,'=== END OF distrmult1 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrm11
-c 11  DISTR arrA1[BLOCK]    REDISTR arrA1[MULT_BLOCK]  
-
-      subroutine distrm11
-      integer, parameter :: AN1=25,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m = 5
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrm11  '
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i    
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(MULT_BLOCK(m))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction(min(erri))
-      do i=1,AN1
-          if (A1(i) /= i) then     
-             erri = min(erri,i)
-          endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrm11
-
-C ---------------------------------------------distrm12
-c 12  DISTRIBUTE arrA1[MULT_BLOCK]    REDISTRIBUTE arrA1[BLOCK] 
-
-      subroutine distrm12
-
-      integer, parameter :: AN1=48,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m = 6
-      integer, allocatable :: A1(:)
-      character(10), parameter :: tname='distrm12  '
-               
-!dvm$ distribute A1(MULT_BLOCK(m))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i ** 2    
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i**2) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end subroutine distrm12
-
-C ----------------------------------------------------distrm13
-c 13  DISTR arrA1[BLOCK]    REDISTR arrA1[MULT_BLOCK] small array  
-
-      subroutine distrm13
-
-      integer, parameter :: AN1=4,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m = 4
-      integer, allocatable :: A1(:)
-      character(10) :: tname='distrm13  '
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i*2     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(MULT_BLOCK(m))  
-  
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i*2 ) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end  subroutine distrm13
-C ---------------------------------------------distrm14
-c 14  DISTRIBUTE arrA1[MULT_BLOCK]   REDISTRIBUTE arrA1[BLOCK]  small array
-
-      subroutine distrm14
-
-      integer, parameter :: AN1=3,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m = 3
-      integer, allocatable :: A1(:)
-      character(10) :: tname='distrm14  '
-
-!dvm$ distribute A1(MULT_BLOCK(m))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-      A1 = 5
-
-!dvm$ actual (A1)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + i   
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i+5) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end  subroutine distrm14
-
-C ----------------------------------------------------distrm15
-c 15  DISTR arrA1[MULT_BLOCK]    REDISTR arrA1[MULT_BLOCK] other m 
-
-      subroutine distrm15
-
-      integer, parameter :: AN1=24,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m1 = 4, m2 = 3
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrm15  '
-               
-!dvm$ distribute A1(MULT_BLOCK(m1))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(MULT_BLOCK(m2))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-          if (A1(i) /= i) then     
-             erri = min(erri,i)
-          endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrm15
-
-C ----------------------------------------------------distrm16
-c 16  DISTR arrA1[MULT_BLOCK]    REDISTR arrA1[*]  
-
-      subroutine distrm16
-
-      integer, parameter :: AN1=50,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m = 2
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrm16  '
-               
-!dvm$ distribute A1(MULT_BLOCK(m))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i * 3    
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i*3 ) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrm16
-
-C ---------------------------------------------distrm17
-c 17  DISTRIBUTE arrA1[*]    REDISTRIBUTE arrA1[MULT_BLOCK] 
-
-      subroutine distrm17
-
-      integer, parameter :: AN1=120,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m = 10
-      integer, allocatable :: A1(:)
-      character(10), parameter :: tname='distrm17  '
-               
-!dvm$ distribute A1(*)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-      A1 = -2
-
-!dvm$ actual (A1)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i - A1(i)     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(MULT_BLOCK(m))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i+2) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrm17
-
-C ----------------------------------------------------distrm21
-c 21  DISTRIBUTE arrA2[MULT_BLOCK][*]	REDISTRIBUTE arrA2[*][MULT_BLOCK]
-
-      subroutine distrm21
-
-      integer, parameter :: AN1=36,AN2=25,NL=1000,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m1 = 6,  m2 = 5
-      integer, allocatable :: A2(:,:)
-      character(10) :: tname='distrm21'
-               
-!dvm$ distribute A2(MULT_BLOCK(m1),*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,MULT_BLOCK(m2))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end  subroutine distrm21
-
-C ----------------------------------------------------distrm22
-c 22  DISTRIBUTE arrA2[*][MULT_BLOCK]	REDISTRIBUTE arrA2[*][*]
-
-      subroutine distrm22
-
-      integer, parameter :: AN1=8,AN2=121,NL=1000,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m2 = 11
-      integer, allocatable :: A2(:,:)
-      character(10) :: tname='distrm22'
-               
-!dvm$ distribute A2(*,MULT_BLOCK(m2))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = 4 
-
-!dvm$ actual(A2)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) + (i*NL+j)     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j+4)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end  subroutine distrm22
-
-C ----------------------------------------------------distrm23
-c 23  DISTRIBUTE arrA2[*][*]	REDISTRIBUTE arrA2[*][MULT_BLOCK]
-
-      subroutine distrm23
-
-      integer, parameter :: AN1=8,AN2=63,NL=1000,ER=10000
-      integer :: erri=ER,i
-      integer, parameter :: m2 = 9
-      integer, allocatable :: A2(:,:)
-      character(10) :: tname='distrm23'
-               
-!dvm$ distribute A2(*,*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,MULT_BLOCK(m2))    
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrm23
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult2.fdv
deleted file mode 100644
index b47c2f2..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult2.fdv
+++ /dev/null
@@ -1,996 +0,0 @@
-      program DISTRM2
-
-!    TESTING distribute and redistribute directive       
-!            MULT_BLOCK distribution
-       
-      print *,'===START OF distrmult2========================'
-
-C -------------------------------------------------
-c 24  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  REDISTRIBUTE arrA2[*][*]
-      call distrm24
-C -------------------------------------------------
-c 25  DISTRIBUTE arrA2[*][*]  REDISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-      call distrm25
-C -------------------------------------------------
-c 26  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK] 
-C                             REDISTRIBUTE arrA2[BLOCK][BLOCK]
-      call distrm26
-C -------------------------------------------------
-c 27  DISTRIBUTE arrA2[BLOCK][BLOCK]
-c                             REDISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-      call distrm27
-C -------------------------------------------------
-c 28  DISTRIBUTE arrA2[MULT_BLOCK][BLOCK]
-c                         REDISTRIBUTE arrA2[BLOCK][MULT_BLOCK]
-      call distrm28
-C -------------------------------------------------
-c 29  DISTRIBUTE arrA2[BLOCK][MULT_BLOCK]
-c                         REDISTRIBUTE arrA2[MULT_BLOCK][BLOCK]
-      call distrm29
-C -------------------------------------------------
-c 210  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  other m1,m2
-      call distrm210
-C -------------------------------------------------
-c 32  DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK] [*] 
-c                         REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]
-      call distrm32
-C -------------------------------------------------
-c 33  DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK][*]
-c                          REDISTRIBUTE arrA3[MULT_BLOCK][*][BLOCK]
-      call distrm33
-C -------------------------------------------------
-c 34  DISTRIBUTE  arrA3[MULT_BLOCK][*][MULT_BLOCK] 
-c                         REDISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][*]
-      call distrm34
-C -------------------------------------------------
-c 35  DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK][*]
-c                         REDISTRIBUTE arrA3[*][*]MULT_BLOCK]
-      call distrm35
-C -------------------------------------------------
-c 36  DISTRIBUTE  arrA3[MULT_BLOCK][*][BLOCK]
-c                         REDISTRIBUTE arrA3[BLOCK][*][MULT_BLOCK]
-      call distrm36
-C -------------------------------------------------
-c 37  DISTRIBUTE  arrA3[MULT_BLOCK][BLOCK][*]
-c                         REDISTRIBUTE arrA3[BLOCK][*][MULT_BLOCK]
-      call distrm37
-C -------------------------------------------------
-c 38  DISTRIBUTE  arrA3[BLOCK][*][MULT_BLOCK]
-c                         REDISTRIBUTE arrA3[*][MULT_BLOCK][BLOCK]
-      call distrm38
-C -------------------------------------------------
-c 41  DISTRIBUTE arrA4[*][*][MULT_BLOCK][MULT_BLOCK]
-c                         REDISTRIBUTE arrA4[*][*][*][*]
-      call distrm41
-C -------------------------------------------------
-c 42  DISTRIBUTE arrA4[MULT_BLOCK][*][MULT_BLOCK][*]
-c                        REDISTRIBUTE arrA4[*][MULT_BLOCK][MULT_BLOCK][*]
-      call distrm42                           
-C -------------------------------------------------
-C
-      print *,'=== END OF distrmult2 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrm24
-c 24  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]  REDISTRIBUTE arrA2[*][*]
-
-      subroutine distrm24
-
-      integer, parameter :: AN1=15,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-      integer, parameter :: m1 = 5, m2 = 3
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrm24  '
-               
-!dvm$ distribute A2(MULT_BLOCK(m1),MULT_BLOCK(m2))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = 4 
-
-!dvm$ actual (A2)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j)+ (i*NL+j)     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)+4 ) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A2)
-
-      end subroutine distrm24
-
-C ----------------------------------------------------distrm25
-c 25  DISTRIBUTE arrA2[*][*]  REDISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-
-      subroutine distrm25
-
-      integer, parameter :: AN1=18,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-      integer, parameter :: m1 = 3, m2 = 2
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrm25  '
-               
-!dvm$ distribute A2(*,*)   
-!dvm$ dynamic A2
-
-       allocate (A2(AN1,AN2))
-
-       A2 = 5
-
-!dvm$  actual(A2)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + (i*NL+j)     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(MULT_BLOCK(m1), MULT_BLOCK(m2))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) - 5     
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrm25
-
-C ----------------------------------------------------distrm26
-c 26  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-c                REDISTRIBUTE arrA2[BLOCK][BLOCK]
-
-      subroutine distrm26
-
-      integer, parameter :: AN1=49,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-      integer, parameter :: m1 = 7, m2 = 4
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrm26  '
-               
-!dvm$ distribute A2(MULT_BLOCK(m1),MULT_BLOCK(m2))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(BLOCK,BLOCK)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrm26
-
-C ----------------------------------------------------distrm27
-c 27  DISTRIBUTE arrA2[BLOCK][BLOCK]  REDISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-
-      subroutine distrm27
-
-      integer, parameter :: AN1=8,AN2= 64,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-      integer, parameter :: m1 = 1, m2 = 8
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrm27'
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =(i*NL+j)*2     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(MULT_BLOCK(m1),MULT_BLOCK(m2))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j)  /= (i*NL+j)*2) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrm27
-
-C ----------------------------------------------------distrm28
-c 28  DISTRIBUTE arrA2[MULT_BLOCK][BLOCK]  REDISTRIBUTE arrA2[BLOCK][MULT_BLOCK]
-
-      subroutine distrm28
-
-      integer, parameter :: AN1=20,AN2=20,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-      integer, parameter :: m1 = 5, m2 = 4
-      integer, allocatable :: A2(:,:)
-      character(10) :: tname='distrm28  '
-               
-!dvm$ distribute A2(MULT_BLOCK(m1),BLOCK)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =(i*NL+j)*3     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(BLOCK,MULT_BLOCK(m2))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)*3) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrm28
-
-C ----------------------------------------------------distrm29
-c 29  DISTRIBUTE arrA2[BLOCK][MULT_BLOCK]
-c                REDISTRIBUTE arrA2[MULT_BLOCK][BLOCK]
-
-      subroutine distrm29
-
-      integer, parameter :: AN1=30,AN2=60,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-      integer, parameter :: m1 = 10, m2 = 10
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrm29'
-               
-!dvm$ distribute A2(BLOCK,MULT_BLOCK(m2))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = -1
-
-!dvm$ actual (A2)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + (i*NL+j)     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(MULT_BLOCK(m1),BLOCK)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)-1) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrm29
-
-C ----------------------------------------------------distrm210
-c 210  DISTRIBUTE arrA2[MULT_BLOCK][MULT_BLOCK]
-c                 REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK]  other m1, m2
-
-      subroutine distrm210
-
-      integer, parameter :: AN1=24,AN2=24,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-      integer, parameter :: m1 = 3, m2 = 2
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrm210 '
-               
-!dvm$ distribute A2(MULT_BLOCK(m1),MULT_BLOCK(m2))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(MULT_BLOCK(m2),MULT_BLOCK(m1))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-                                                    
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A2)
-
-      end subroutine distrm210
-
-C ----------------------------------------------------distrm32
-c 32  DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK] [*]
-c                 REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]
-
-      subroutine distrm32
-
-      integer, parameter :: AN1=16,AN2=12,AN3=8,NL=1000,ER=10000
-      integer :: erri = ER,i,j,k
-      integer, parameter :: m1 = 2, m2 = 3 , m3 = 4
-      integer, allocatable ::  A3(:,:,:)
-      character(10), parameter :: tname='distrm32  '
-               
-!dvm$ distribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(*,MULT_BLOCK(m2),MULT_BLOCK(m3))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distrm33
-c 33  DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK][*]
-c                 REDISTRIBUTE arrA3[MULT_BLOCK][*][BLOCK]
-
-      subroutine distrm33
-
-      integer, parameter :: AN1=16,AN2=16,AN3=8,NL=1000,ER=10000
-      integer :: erri = ER,i,j,k
-      integer, parameter :: m1 = 4, m2 = 2, m3 = 2
-      integer, allocatable :: A3(:,:,:)
-      character(*), parameter :: tname='distrm33  '
-               
-!dvm$ distribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k*2    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),*,MULT_BLOCK(m3))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k*2)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distrm34
-c 34  DISTRIBUTE  arrA3[MULT_BLOCK][*][MULT_BLOCK]
-c                 REDISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][*]
-
-      subroutine distrm34
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 2, m2 = 1, m3 = 4
-      integer, allocatable ::  A3(:,:,:)
-      character(10) :: tname='distrm34'
-               
-!dvm$ distribute A3(MULT_BLOCK(m1),*,MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 3
-     
-!dvm$ actual(A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 3)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distrm35
-c 35  DISTRIBUTE  arrA3[MULT_BLOCK][MULT_BLOCK][*]
-c                         REDISTRIBUTE arrA3[*][*][MULT_BLOCK]
-
-      subroutine distrm35
-
-      integer, parameter :: AN1=18,AN2=28,AN3=38,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 3, m2 = 7 , m3 = 19
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrm35  '
-               
-!dvm$ distribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(*,*,MULT_BLOCK(m3))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distrm36
-c 36  DISTRIBUTE  arrA3[MULT_BLOCK][*][BLOCK]
-c                         REDISTRIBUTE arrA3[BLOCK][*][MULT_BLOCK]
-
-      subroutine distrm36
-
-      integer, parameter :: AN1=121,AN2=12,AN3=35,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 11, m2 = 2, m3 = 7
-      integer, allocatable ::  A3(:,:,:)
-      character(10), parameter :: tname='distrm36  '
-               
-!dvm$ distribute A3(MULT_BLOCK(m1),*,BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 10
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(BLOCK,*,MULT_BLOCK(m3))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k + 10)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distrm37
-c 37  DISTRIBUTE  arrA3[MULT_BLOCK][BLOCK][*]
-c                         REDISTRIBUTE arrA3[BLOCK][*][MULT_BLOCK]
-
-      subroutine distrm37
-
-      integer, parameter :: AN1=8,AN2=28,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 2, m2 = 4, m3 = 2
-      integer, allocatable :: A3(:,:,:)
-      character(*), parameter :: tname='distrm37  '
-               
-!dvm$ distribute A3(MULT_BLOCK(m1),BLOCK,*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(BLOCK,*,MULT_BLOCK(m3))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distrm38
-c 38  DISTRIBUTE  arrA3[BLOCK][*][MULT_BLOCK] REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]
-
-      subroutine distrm38
-
-      integer, parameter :: AN1=50,AN2=40,AN3=30,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 5, m2 = 4, m3 = 3
-      integer, allocatable :: A3(:,:,:)
-      character(10) :: tname='distrm38'
-               
-!dvm$ distribute A3(BLOCK, *, MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k*5    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(*,MULT_BLOCK(m2),MULT_BLOCK(m3))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k*5)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------distrm41
-c 41  DISTRIBUTE arrA4[*][*][MULT_BLOCK][MULT_BLOCK] REDISTRIBUTE arrA4[*][*][*][*]
-
-      subroutine distrm41
-
-      integer, parameter :: AN1=16,AN2=16,AN3=16,AN4=16,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m
-      integer, parameter :: m1 = 2, m2 = 4, m3 = 2, m4 = 4
-      integer, allocatable :: A4(:,:,:,:)
-      character(10), parameter :: tname='distrm41  '
-               
-!dvm$ distribute A4(*,*,MULT_BLOCK(m3),MULT_BLOCK(m4))   
-!dvm$ dynamic A4
-
-      allocate (A4(AN1,AN2,AN3,AN4))
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A4(*,*,*,*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) /= (i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------distrm42
-c 42  DISTRIBUTE arrA4[MULT_BLOCK][*][MULT_BLOCK][*] 
-c                REDISTRIBUTE arrA4[*][MULT_BLOCK][MULT_BLOCK][*]
-
-      subroutine distrm42
-
-      integer, parameter :: AN1=28,AN2=25,AN3=27,AN4=21,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m
-      integer, parameter :: m1 = 7, m2 = 5, m3 = 9, m4  = 3
-      integer, allocatable :: A4(:,:,:,:)
-      character(10) :: tname='distrm42  '
-               
-!dvm$ distribute A4(MULT_BLOCK(m1),*,MULT_BLOCK(m3),*)   
-!dvm$ dynamic A4
-
-      allocate (A4(AN1,AN2,AN3,AN4))
-
-      A4 = 6   
-
-!dvm$ actual (A4)
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-         do j=1,AN2
-            do n=1,AN3
-               do m=1,AN4
-                A4(i,j,n,m) = A4(i,j,n,m)+ i*NL/10+j*NL/100+n*NL/1000+m
-               enddo
-            enddo
-         enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A4(*,MULT_BLOCK(m2),MULT_BLOCK(m3),*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-        do j=1,AN2
-          do n=1,AN3
-            do m=1,AN4
-              if (A4(i,j,n,m) /= (i*NL/10+j*NL/100+n*NL/1000+m+6)) then     
-                  erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-              endif 
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A4)
-
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult3.fdv
deleted file mode 100644
index 0dec62d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_MULT/distrmult3.fdv
+++ /dev/null
@@ -1,668 +0,0 @@
-      program DISTRM3
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directive       
-!            use MULT_BLOCK distribution
-
-      print *,'===START OF distrmult3========================'
-
-C -------------------------------------------------
-c 311 DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-c                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]
-      call distrm311
-C -------------------------------------------------
-c 312 DISTRIBUTE arrA3DISTRIBUTE [BLOCK][BLOCK][BLOCK]
-c                REDISTRIBUTE  [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-      call distrm312  
-C -------------------------------------------------
-c 313 DISTRIBUTE arrA2[_BLOCK][BLOCK][WGT_BLOCK] 
-c                REDISTRIBUTE arrA3[BLOCK][MULT_BLOCK][BLOCK]
-      call distrm313
-C -------------------------------------------------
-c 314 DISTRIBUTE arrA3[BLOCK][MULT_BLOCK][BLOCK] 
-c                REDISTRIBUTE arrA3[MULT_BLOCK][BLOCK][MULT_BLOCK]
-      call distrm314
-C -------------------------------------------------
-c 315  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-c              REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK] other m1,m2,m3 
-      call distrm315
-C -------------------------------------------------
-c 316 DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK] 
-c                REDISTRIBUTE arrA2[*][*][*]
-      call distrm316
-C -------------------------------------------------
-c 317  DISTRIBUTE arrA3[*][*][*] 
-c                REDISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-      call distrm317
-C -------------------------------------------------
-c 318 DISTRIBUTE arrA3[MULT_BLOCK][*][MULT_BLOCK] 
-c                REDISTRIBUTE arrA3[*][MULT_BLOCK][*]
-      call distrm318
-C -------------------------------------------------
-c 319  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][*] 
-c                REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]
-      call distrm319
-C -------------------------------------------------
-c 43  DISTRIBUTE arrA4[MULT_BLOCK][*][MULT_BLOCK][*]
-c                REDISTRIBUTE arrA4[[*][MULT_BLOCK][*][MULT_BLOCK]
-      call distrm43
-C -------------------------------------------------
-C
-      print *,'=== END OF distrmult3 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrm311
-c 311 DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-c                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]
-
-      subroutine distrm311
-
-      integer, parameter :: AN1=14,AN2=12,AN3=10,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 7, m2 = 3, m3 = 5
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrm311 '
-
-!dvm$ distribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 1 
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(BLOCK,BLOCK,BLOCK)   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) + 1) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrm311
-
-C ----------------------------------------------------distrm312
-c 312 DISTRIBUTE arrA3[BLOCK][BLOCK][BLOCK]
-c                REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-
-      subroutine distrm312
-
-      integer, parameter :: AN1=15,AN2=15,AN3=25,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 5, m2 = 5, m3 = 5 
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrm312 '
-
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),MULT_BLOCK(m3))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrm312
-
-C ----------------------------------------------------distrm313
-c 313 DISTRIBUTE arrA2[MULT_BLOCK][BLOCK][MULT_BLOCK] 
-c                REDISTRIBUTE arrA3[BLOCK][MULT_BLOCK][BLOCK]
-
-      subroutine distrm313
-
-      integer, parameter :: AN1=24,AN2=24,AN3=24,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 2, m2 = 3, m3 = 4 
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrm313 '
-
-!dvm$ distribute A3(MULT_BLOCK(m1),BLOCK,MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 3
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(BLOCK,MULT_BLOCK(m2),BLOCK)   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) - 3    
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrm313
-
-C ----------------------------------------------------distrm314
-c 314 DISTRIBUTE arrA3[BLOCK][MULT_BLOCK][BLOCK] 
-c                REDISTRIBUTE arrA3[MULT_BLOCK][BLOCK][MULT_BLOCK]
-
-      subroutine distrm314
-
-      integer, parameter :: AN1=20,AN2=30,AN3=30,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 5, m2 = 3, m3 = 3
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrm314 '
-
-!dvm$ distribute A3(BLOCK, MULT_BLOCK(m2),BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k*2    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(MULT_BLOCK(m1),BLOCK,MULT_BLOCK(m3))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k*2)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrm314
-
-C ----------------------------------------------------distrm315
-c 315  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-c            REDISTRIBUTE [MULT_BLOCK][MULT_BLOCK][MULT_BLOCK] other m1,m2,m3
-
-      subroutine distrm315
-
-      integer, parameter :: AN1=16,AN2=16,AN3=16,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 2, m2 = 4, m3 = 8 
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrm315 '
-
-!dvm$ distribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 5
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute 
-!dvm$* A3(MULT_BLOCK(m1),MULT_BLOCK(m2),MULT_BLOCK(m3))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)+ 5) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrm315
-
-C ----------------------------------------------------distrm316
-c 316 DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK] 
-c                REDISTRIBUTE arrA2[*][*][*]
-
-      subroutine distrm316
-
-      integer, parameter :: AN1=12,AN2=12,AN3=48,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 3, m2 = 2, m3 = 6 
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrm316 '
-               
-!dvm$ distribute A3(MULT_BLOCK(m1),MULT_BLOCK(m2),MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(*,*,*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrm316
-
-C ----------------------------------------------------distrm317
-c 317  DISTRIBUTE arrA3[*][*][*] 
-c                REDISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][MULT_BLOCK]
-
-      subroutine distrm317
-
-      integer, parameter :: AN1= 10, AN2=35, AN3=10,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 2, m2 = 5, m3 = 2 
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrm317 '
-
-!dvm$ distribute A3(*,*,*)    
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 7
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(MULT_BLOCK(m1),MULT_BLOCK(m2),MULT_BLOCK(m3))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) - 7   
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrm317
-
-C ----------------------------------------------------distrm318
-c 318 DISTRIBUTE arrA3[MULT_BLOCK][*][MULT_BLOCK] 
-c                REDISTRIBUTE arrA3[*][MULT_BLOCK][*]
-
-      subroutine distrm318
-
-      integer, parameter :: AN1=11,AN2=14,AN3=24,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m1 = 1, m2 = 2, m3 = 6 
-      integer :: A3(AN1,AN2,AN3)   !static array
-      character(10), parameter :: tname='distrm318 '
-               
-!dvm$ distribute A3(MULT_BLOCK(m1),*,MULT_BLOCK(m3))   
-!dvm$ dynamic A3
-
-      A3 = 8
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(*,MULT_BLOCK(m2),*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-                if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) + 8) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      end subroutine distrm318
-
-C ----------------------------------------------------distrm319
-c 319  DISTRIBUTE arrA3[MULT_BLOCK][MULT_BLOCK][*] 
-c                REDISTRIBUTE arrA3[*][MULT_BLOCK][MULT_BLOCK]
-
-      subroutine distrm319
-
-      integer, parameter :: AN1= 30, AN2=12, AN3=30,NL=1000,ER=10000
-      integer :: erri=ER,i,j,k
-      integer, parameter :: m11 = 2, m21 = 2, m31 = 2 
-      integer, parameter :: m12 = 5, m22 = 4, m32 = 10 
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrm319 '
-
-!dvm$ distribute :: A3
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ redistribute A3(MULT_BLOCK(m11),MULT_BLOCK(m21),*)    
-
-      A3 = -1
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k)
-      do i=1,AN1
-          do j=1,AN2
-             do k=1,AN3
-                A3(i,j,k) = A3(i,j,k) + i*NL/10 + j*NL/100 + k    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute
-!dvm$*    A3(*,MULT_BLOCK(m21),MULT_BLOCK(m32))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,k) on A3(i,j,k), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do k=1,AN3
-               A3(i,j,k) = A3(i,j,k) + 2
-               if (A3(i,j,k) /= (i*NL/10 + j*NL/100 + k) + 1) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + k)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrm319
-
-C ----------------------------------------------------distrm43
-c 43  DISTRIBUTE arrA4[MULT_BLOCK][*][MULT_BLOCK][*]
-c                REDISTRIBUTE arrA4[[*][MULT_BLOCK][*][MULT_BLOCK]
-
-      subroutine distrm43
-
-      integer, parameter :: AN1=16,AN2=16,AN3=16,AN4=16,NL=1000,ER=100000
-      integer, parameter :: m1 = 2, m2 = 4, m3 = 2, m4 = 4 
-      integer :: erri=ER,i,j,n,m
-      integer, allocatable ::  A4(:,:,:,:)
-      character(10), parameter :: tname='distrm43  '
-               
-!dvm$ distribute
-!dvm$*  A4(MULT_BLOCK(m1),*,MULT_BLOCK(m3),*)   
-!dvm$ dynamic A4
-
-      allocate (A4(AN1,AN2,AN3,AN4))
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A4(*,MULT_BLOCK(m2),*,MULT_BLOCK(m4))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) /= (i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A4)
-
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt1.fdv
deleted file mode 100644
index 233f25f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt1.fdv
+++ /dev/null
@@ -1,766 +0,0 @@
-      program DISTRW1
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directives       
-!            WGT_BLOCK distribution
-
-      print *,'===START OF distrwgt1========================'
-
-C --------------------------------------------------
-c 11  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[WGT_BLOCK] 
-      call distrw11
-C --------------------------------------------------
-c 12  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK] 
-      call distrw12
-C --------------------------------------------------
-c 13  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[WGT_BLOCK] small array
-      call distrw13
-C --------------------------------------------------
-c 14  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK] small array
-      call distrw14
-C --------------------------------------------------
-c 15  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[WGT_BLOCK] other weigts
-      call distrw15
-C --------------------------------------------------
-c 16  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[*]
-      call distrw16
-C --------------------------------------------------
-c 17  DISTRIBUTE arrA1[*]           REDISTRIBUTE arrA1[WGT_BLOCK] 
-      call distrw17
-C --------------------------------------------------
-c 18  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[WGT_BLOCK] with zero weigts
-      call distrw18
-C --------------------------------------------------
-c 181 DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK] with zero weigts
-c                                   REDISTRIBUTE arrA1[WGT_BLOCK]
-      call distrw181
-C --------------------------------------------------
-c 182 DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[*] with zero weigts
-c                                   REDISTRIBUTE arrA1[WGT_BLOCK]
-      call distrw182
-C --------------------------------------------------
-c 21  DISTRIBUTE arrA2[WGT_BLOCK][*]   REDISTRIBUTE arrA2[*][WGT_BLOCK]
-      call distrw21
-C --------------------------------------------------
-c 22  DISTRIBUTE arrA2[*][WGT_BLOCK]   REDISTRIBUTE arrA2[*][*]
-      call distrw22
-C --------------------------------------------------
-c 23  DISTRIBUTE arrA2[*][*]           REDISTRIBUTE arrA2[*][WGT_BLOCK]
-      call distrw23
-C -------------------------------------------------
-C
-      print *,'=== END OF distrwgt1 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrw11
-c 11  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[WGT_BLOCK] 
-
-      subroutine distrw11
-
-      integer, parameter :: AN1=16,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB=(/1.0, 2., 2., 3.0, 1., 1./)     
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrw11  '
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(WGT_BLOCK(WB,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-          if (A1(i) /= i) then     
-             erri = min(erri,i)
-          endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrw11
-
-C ---------------------------------------------distrw12
-c 12  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK] 
-
-      subroutine distrw12
-
-      integer, parameter :: AN1=8,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB=(/1.0, 2., 2., 3.0, 1., 1./)     
-
-      integer, allocatable :: A1(:)
-      character(10), parameter :: tname='distrw12'
-               
-!dvm$ distribute A1(WGT_BLOCK(WB,6))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i ** 2     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min(erri) )
-      do i=1,AN1
-            if (A1(i) /= i ** 2) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end
-C ----------------------------------------------------distrw13
-c 13  DISTRIBUTE arrA1[BLOCK]       REDISTRIBUTE arrA1[WGT_BLOCK] small array
-
-      subroutine distrw13
-
-      integer, parameter :: AN1=5,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB=(/1.0, 2., 2., 3.0, 1., 1./)     
-
-      integer, allocatable :: A1(:)
-      character(10) :: tname='distrw13'
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-      A1 = 2
-
-!dvm$ actual (A1)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + i      
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(WGT_BLOCK(WB,6))  
-  
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min(erri) )
-      do i=1,AN1
-            if (A1(i) /= i + 2) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end
-C ---------------------------------------------distrw14
-c 14  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK] small array
-
-      subroutine distrw14
-
-      integer, parameter :: AN1=5,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB=(/1.0, 2., 2., 3.0, 1., 1./)     
-
-      integer, allocatable :: A1(:)
-      character(10) :: tname='distrw14'
-
-!dvm$ distribute A1(WGT_BLOCK(WB,6))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= i) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end
-
-C ----------------------------------------------------distrw15
-c 15  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[WGT_BLOCK] other weigts
-
-      subroutine distrw15
-
-      integer, parameter :: AN1=16,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB1=(/1.0, 2., 2., 3.0, 1., 1./)     
-      double precision, dimension(6) :: WB2=(/2.0, 1., 2., 2.0, 2., 1./)     
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrw15  '
-               
-!dvm$ distribute A1(WGT_BLOCK(WB1,6))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i * 3    
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(WGT_BLOCK(WB2,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-          if (A1(i) /= i * 3) then     
-             erri = min(erri,i)
-          endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrw15
-
-C ----------------------------------------------------distrw16
-c 16  DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[*]
-
-      subroutine distrw16
-
-      integer, parameter :: AN1=8,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB=(/1.0, 2., 2., 3.0, 1., 1./)     
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrw16  '
-               
-!dvm$ distribute A1(WGT_BLOCK(WB,6))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i + 5     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min(erri) )
-      do i=1,AN1
-            A1(i) = A1(i) - 5   
-            if (A1(i) /= i) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrw16
-
-C ---------------------------------------------distrw17
-c 17  DISTRIBUTE arrA1[*]           REDISTRIBUTE arrA1[WGT_BLOCK] 
-
-      subroutine distrw17
-
-      integer, parameter :: AN1=28,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB=(/1.0, 2., 2., 3.0, 1., 1./)     
-
-      integer, allocatable :: A1(:)
-      character(10), parameter :: tname='distrw17'
-               
-!dvm$ distribute A1(*)    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-      A1 = 6
-
-!dvm$ actual (A1)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) - i     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(WGT_BLOCK(WB,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if (A1(i) /= 6 - i) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrw17
-
-C ----------------------------------------------------distrw18
-c 18  DISTRIBUTE arrA1[WGT_BLOCK] REDISTRIBUTE arrA1[WGT_BLOCK] with zero weigts
-
-      subroutine distrw18
-
-      integer, parameter :: AN1=17,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6):: WB1=(/1.0, 2., 2., 0., 1., 1./)     
-      double precision, dimension(8):: WB2=(/0.,1.,0.2,2.,3.,1.,1.5,0./)     
-
-      integer, allocatable :: A1(:)
-      character(*), parameter :: tname='distrw18  '
-               
-!dvm$ distribute A1(WGT_BLOCK(WB1,6))    
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = i * 3    
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(WGT_BLOCK(WB2,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-          if (A1(i) /= i * 3) then     
-             erri = min(erri,i)
-          endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A1)
-
-      end subroutine distrw18
-
-C --------------------------------------------------distrw181
-c 181 DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[BLOCK] with zero weigts
-c                                   REDISTRIBUTE arrA1[WGT_BLOCK]
-      subroutine distrw181
-
-      integer, parameter :: AN1=11,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(7) ::
-     >         WB1=(/0., 2., 2., 0., 1., 1., 0./)     
-      double precision, dimension(8) ::
-     >         WB2=(/0., 1., 0., 2., 0., 3., 1.2, 1.5/)     
-
-      integer, allocatable :: A1(:)
-      character(10) :: tname='distrw181'
-               
-!dvm$ distribute A1(WGT_BLOCK(WB1,7))   
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-      A1 = 2
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + i     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(BLOCK)    
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) * 2     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(WGT_BLOCK(WB2,8))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            A1(i) = A1(i) / 2       
-            if (A1(i) /= (i+2)) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end subroutine distrw181
-
-C --------------------------------------------------distrw182
-c 182 DISTRIBUTE arrA1[WGT_BLOCK]   REDISTRIBUTE arrA1[*] with zero weigts
-c                                   REDISTRIBUTE arrA1[WGT_BLOCK]
-      subroutine distrw182
-
-      integer, parameter :: AN1=8,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(7) ::
-     >         WB1=(/0.2, 2., 0., 0., 0., 1., 0./)     
-      double precision, dimension(8) ::
-     >         WB2=(/0., 1.1, 0., 2.5, 0., 3.3, 2.2, 0./)     
-
-      integer, allocatable :: A1(:)
-      character(10) :: tname='distrw182'
-               
-!dvm$ distribute A1(WGT_BLOCK(WB1,7))   
-!dvm$ dynamic A1
-
-      allocate (A1(AN1))
-
-      A1 = -5
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) + i     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(*)    
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) = A1(i) * 3     
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A1(WGT_BLOCK(WB2,8))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            A1(i) = A1(i) / 3       
-            if (A1(i) /= (i-5)) then     
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A1)
-
-      end subroutine distrw182
-
-C ----------------------------------------------------distrw21
-c 21  DISTRIBUTE arrA2[WGT_BLOCK][*]   REDISTRIBUTE arrA2[*][WGT_BLOCK]
-
-      subroutine distrw21
-
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB=(/1.0, 2., 2., 3.0, 1., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(10) :: tname='distrw21'
-               
-!dvm$ distribute A2(WGT_BLOCK(WB,6),*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,WGT_BLOCK(WB,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrw21
-
-C ----------------------------------------------------distrw22
-c 22  DISTRIBUTE arrA2[*][WGT_BLOCK]   REDISTRIBUTE arrA2[*][*]
-
-      subroutine distrw22
-
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB=(/1.0, 2., 2., 3.0, 1., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(10) :: tname='distrw22'
-               
-!dvm$ distribute A2(*,WGT_BLOCK(WB,6))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j + 10    
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)+10) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrw22
-
-C ----------------------------------------------------distrw23
-c 23  DISTRIBUTE arrA2[*][*]           REDISTRIBUTE arrA2[*][WGT_BLOCK]
-
-      subroutine distrw23
-
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri=ER,i
-
-      double precision, dimension(6) :: WB=(/1.0, 2., 2., 3.0, 1., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(10) :: tname='distrw23'
-               
-!dvm$ distribute A2(*,*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =(i*NL+j) * 2     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,WGT_BLOCK(WB,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) / 2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt2.fdv
deleted file mode 100644
index 3c394fb..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt2.fdv
+++ /dev/null
@@ -1,1334 +0,0 @@
-      program DISTRW2
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directives       
-!            WGT_BLOCK distribution
-       
-      print *,'===START OF distrwgt2========================'
-
-C -------------------------------------------------
-c 24  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]  REDISTRIBUTE arrA2[*][*]
-      call distrw24
-C -------------------------------------------------
-c 25  DISTRIBUTE arrA2[*][*]  REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-      call distrw25
-C -------------------------------------------------
-c 26  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK] 
-C                             REDISTRIBUTE arrA2[BLOCK][BLOCK]
-      call distrw26
-C -------------------------------------------------
-c 27  DISTRIBUTE arrA2[BLOCK][BLOCK]
-c                             REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-      call distrw27
-C -------------------------------------------------
-c 28  DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]
-c                         REDISTRIBUTE arrA2[BLOCK][WGT_BLOCK]
-      call distrw28
-C -------------------------------------------------
-c 29  DISTRIBUTE arrA2[BLOCK][WGT_BLOCK]
-c                         REDISTRIBUTE arrA2[WGT_BLOCK][BLOCK]
-      call distrw29
-C -------------------------------------------------
-c 210  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]    other weigths
-c                      REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]
-      call distrw210
-C -------------------------------------------------
-c 211  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]   with zero weigths
-c                      REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]
-      call distrw211
-C -------------------------------------------------
-c 212  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]   with zero weigths
-c                      REDISTRIBUTE [BLOCK][WGT_BLOCK]
-c                      REDISTRIBUTE [WGT_BLOCK][BLOCK]
-      call distrw212
-C -------------------------------------------------
-c 213  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]   with zero weigths
-c                      REDISTRIBUTE [*][*]
-c                      REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]
-      call distrw213
-C -------------------------------------------------
-c 214  DISTRIBUTE arrA2[WGT_BLOCK][*]           with zero weigths
-c                      REDISTRIBUTE [*][WGT_BLOCK]
-c                      REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]
-      call distrw214
-C -------------------------------------------------
-c 32  DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK] [*] 
-c                      REDISTRIBUTE arrA3[*][WGT_BLOCK][WGT_BLOCK]
-      call distrw32
-C -------------------------------------------------
-c 33  DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK][*]
-c                      REDISTRIBUTE arrA3[WGT_BLOCK][*][BLOCK]
-      call distrw33
-C -------------------------------------------------
-c 34  DISTRIBUTE  arrA3[WGT_BLOCK][*][WGT_BLOCK] 
-c                      REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][*]
-      call distrw34
-C -------------------------------------------------
-c 35  DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK][*]
-c                      REDISTRIBUTE arrA3[*][*][WGT_BLOCK]
-      call distrw35
-C -------------------------------------------------
-c 36  DISTRIBUTE  arrA3[WGT_BLOCK][*][BLOCK]
-c                      REDISTRIBUTE arrA3[BLOCK][*][WGT_BLOCK]
-      call distrw36
-C -------------------------------------------------
-c 37  DISTRIBUTE  arrA3[WGT_BLOCK][BLOCK][*]
-c                      REDISTRIBUTE arrA3[BLOCK][*][WGT_BLOCK]
-      call distrw37
-C -------------------------------------------------
-c 38  DISTRIBUTE  arrA3[BLOCK][*][WGT_BLOCK]
-c                      REDISTRIBUTE arrA3[*][WGT_BLOCK][BLOCK]
-      call distrw38
-C -------------------------------------------------
-c 41  DISTRIBUTE arrA4[*][*][WGT_BLOCK][WGT_BLOCK]
-c                     REDISTRIBUTE arrA4[*][*][*][*]
-      call distrw41
-C -------------------------------------------------
-c 42  DISTRIBUTE arrA4[WGT_BLOCK][*][WGT_BLOCK][*]
-c                     REDISTRIBUTE arrA4[*][WGT_BLOCK][WGT_BLOCK][*]
-      call distrw42
-C -------------------------------------------------
-C
-      print *,'=== END OF distrwgt2 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrw24
-c 24  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]  REDISTRIBUTE arrA2[*][*]
-
-      subroutine distrw24
-
-      integer, parameter :: AN1=12,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(6) ::
-     >        WB1=(/2., 2., 3., 1., 5., 1./)     
-      double precision, dimension(7) ::
-     >        WB2=(/3., 2., 2., 3., 1., 1., 4./)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrw24  '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,7))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A2)
-
-      end subroutine distrw24
-
-C ----------------------------------------------------distrw25
-c 25  DISTRIBUTE arrA2[*][*]  REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-
-      subroutine distrw25
-
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(5) :: WB1=(/1.0,2.,2.,3.0, 0./)     
-      double precision, dimension(7) :: WB2=(/1.0,1.,2.,1.0, 1.,1.,1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrw25  '
-               
-!dvm$ distribute A2(*,*)   
-!dvm$ dynamic A2
-
-       allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j+10     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(WGT_BLOCK(WB1,5), WGT_BLOCK(WB2,7))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)+10) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrw25
-
-C ----------------------------------------------------distrw26
-c 26  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]  REDISTRIBUTE arrA2[BLOCK][BLOCK]
-
-      subroutine distrw26
-
-      integer, parameter :: AN1=12,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(6) :: WB=(/1.0,4.,1.,1.0, 2., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrw26  '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB,6),WGT_BLOCK(WB,6))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = 3
-
-!dvm$ actual (A2)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) + i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(BLOCK,BLOCK)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j) + 3) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrw26
-
-C ----------------------------------------------------distrw27
-c 27  DISTRIBUTE arrA2[BLOCK][BLOCK]  REDISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-
-      subroutine distrw27
-
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(6) :: WB=(/2.0,1.,3.,2.0, 1., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrw27'
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =(i*NL+j) * 2     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(WGT_BLOCK(WB,6),WGT_BLOCK(WB,4))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) / 2 
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrw27
-
-C ----------------------------------------------------distrw28
-c 28  DISTRIBUTE arrA2[WGT_BLOCK][BLOCK]  REDISTRIBUTE arrA2[BLOCK][WGT_BLOCK]
-
-      subroutine distrw28
-
-      integer, parameter :: AN1=12,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(8) :: WB1=(/1.,2.,2.,3.,1.,1.,2.,4./)
-      double precision, dimension(6) :: WB2=(/1.0,2.,2.,3.0, 1., 1./)
-
-      integer, allocatable :: A2(:,:)
-      character(10) :: tname='distrw28  '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,8),BLOCK)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(BLOCK,WGT_BLOCK(WB2,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrw28
-
-C ----------------------------------------------------distrw29
-c 29  DISTRIBUTE arrA2[BLOCK][WGT_BLOCK]  REDISTRIBUTE arrA2[WGT_BLOCK][BLOCK]
-
-      subroutine distrw29
-
-      integer, parameter :: AN1=12,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(6) :: WB1=(/1.0,2.,2.,3.,3.,1./)
-      double precision, dimension(6) :: WB2=(/1.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(10), parameter :: tname='distrw29'
-               
-!dvm$ distribute A2(BLOCK,WGT_BLOCK(WB1,6))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-      
-      A2 = 8
-
-!dvm$ actual (A2)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =A2(i,j) * (i*NL+j)     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(WGT_BLOCK(WB2,6),BLOCK)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)*8) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A2)
-
-      end subroutine distrw29
-
-C ----------------------------------------------------distrw210
-c 210  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK] with other weigths
-
-      subroutine distrw210
-
-      integer, parameter :: AN1=10,AN2=8,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(8) ::
-     >       WB1 = (/1.0, 2., 1., 1.0, 3.2, 2., 3., 1./)     
-      double precision, dimension(6) ::
-     >       WB2 = (/1.0, 1., 2., 1.0, 2., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrw210 '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,8),WGT_BLOCK(WB2,6))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(WGT_BLOCK(WB2,6),WGT_BLOCK(WB1,7))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-                                                    
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A2)
-
-      end subroutine distrw210
-
-C ----------------------------------------------------distrw211
-c 211  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK] with zero weigths
-
-      subroutine distrw211
-
-      integer, parameter :: AN1=8,AN2=17,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(6) ::
-     >       WB1=(/0., 1.0, 2., 1., 1.0, 0./)     
-      double precision, dimension(9) ::
-     >       WB2=(/1.0, 1., 0., 2., 0., 0., 1.0, 2., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrw211 '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,9))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = 1
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(WGT_BLOCK(WB2,7),WGT_BLOCK(WB1,5))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j+1)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-                                                    
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A2)
-
-      end subroutine distrw211
-
-C ----------------------------------------------------distrw212
-c 212  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]   with zero weigths
-c                      REDISTRIBUTE [BLOCK][WGT_BLOCK]
-c                      REDISTRIBUTE [WGT_BLOCK][BLOCK]
-
-      subroutine distrw212
-
-      integer, parameter :: AN1=10,AN2=12,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(7) ::
-     >       WB1=(/2., 0., 2., 1.0, 1.0, 1., 0./)     
-      double precision, dimension(8) ::
-     >       WB2=(/3.2, 2., 3.1, 2., 1.0, 4., 0., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrw212 '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,7),WGT_BLOCK(WB2,8))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = 0
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(BLOCK, WGT_BLOCK(WB1,6))    
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) * 2     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(WGT_BLOCK(WB2,7), BLOCK)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j)*2) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-                                                    
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A2)
-
-      end subroutine distrw212
-
-C ----------------------------------------------------distrw213
-c 213  DISTRIBUTE arrA2[WGT_BLOCK][WGT_BLOCK]   with zero weigths
-c                      REDISTRIBUTE [*][*]
-c                      REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]
-      subroutine distrw213
-
-      integer, parameter :: AN1=16,AN2=7,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(8) ::
-     >       WB1=(/2., 4., 2., 1.5, 1., 0.5, 0., 3./)     
-      double precision, dimension(8) ::
-     >       WB2=(/0., 0., 3.1, 2., 1.0, 4., 0., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrw213 '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,8),WGT_BLOCK(WB2,8))   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = 4
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,*)    
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) * 3     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(WGT_BLOCK(WB2,6),WGT_BLOCK(WB1,6))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j+4)*3) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-                                                    
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A2)
-
-      end subroutine distrw213
-
-C ----------------------------------------------------distrw214
-c 214  DISTRIBUTE arrA2[WGT_BLOCK][*]           with zero weigths
-c                      REDISTRIBUTE [*][WGT_BLOCK]
-c                      REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK]
-      subroutine distrw214
-
-      integer, parameter :: AN1=12,AN2=10,NL=1000,ER=10000
-      integer :: erri= ER,i,j
-
-      double precision, dimension(7) ::
-     >       WB1=(/ 4., 0., 1.5, 1., 2., 0.5, 0./)     
-      double precision, dimension(8) ::
-     >       WB2=(/1.7, 0., 3.1, 2., 2.5, 4., 0., 1./)     
-
-      integer, allocatable :: A2(:,:)
-      character(*), parameter :: tname='distrw214 '
-               
-!dvm$ distribute A2(WGT_BLOCK(WB1,6),*)   
-!dvm$ dynamic A2
-
-      allocate (A2(AN1,AN2))
-
-      A2 = 0
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + i*NL+j     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(*,WGT_BLOCK(WB2,8))    
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) = A2(i,j) + 3     
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A2(WGT_BLOCK(WB2,7),WGT_BLOCK(WB1,7))   
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            if (A2(i,j) /= (i*NL+j+3)) then     
-               erri = min(erri,i*NL/10+j)
-            endif 
-          enddo
-      enddo
-!dvm$ end region
-                                                    
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A2)
-
-      end subroutine distrw214
-
-C ----------------------------------------------------distrw32
-c 32  DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK][*]
-c                 REDISTRIBUTE arrA3[*][WGT_BLOCK][WGT_BLOCK]
-
-      subroutine distrw32
-
-      integer, parameter :: AN1=16,AN2=12,AN3=8,NL=1000,ER=10000
-      integer :: erri = ER,i,j,n
-
-      double precision, dimension(7) :: WB1=(/1.,1.,2.,1.0,2.,2.,3.0/)
-      double precision, dimension(8) :: WB2=(/1.,2.,2.,3.,2.,1.,1.,1./)
-
-      integer, allocatable ::  A3(:,:,:)
-      character(10), parameter :: tname='distrw32  '
-               
-!dvm$ distribute A3(WGT_BLOCK(WB1,7),WGT_BLOCK(WB2,8),*)   
-!dvm$ dynamic A3
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(*,WGT_BLOCK(WB2,7),WGT_BLOCK(WB1,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min(erri) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw32
-
-C ----------------------------------------------------distrw33
-c 33  DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK][*]
-c                 REDISTRIBUTE arrA3[WGT_BLOCK][*][BLOCK]
-
-      subroutine distrw33
-
-      integer, parameter :: AN1=16,AN2=16,AN3=8,NL=1000,ER=10000
-      integer :: erri = ER,i,j,n
-
-      double precision, dimension(10) ::
-     >                  WB=(/1.,2.,2.,3., 2., 4., 2., 1.,1., 1./)
-
-      integer, allocatable :: A3(:,:,:)
-      character(*), parameter :: tname='distrw33  '
-               
-!dvm$ distribute A3(WGT_BLOCK(WB,6),WGT_BLOCK(WB,8),*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-      
-      A3 = 5
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = A3(i,j,n) + i*NL/10 + j*NL/100 + n    
-             enddo                   
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(WGT_BLOCK(WB,10),*,WGT_BLOCK(WB,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) + 5) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw33
-
-C ----------------------------------------------------distrw34
-c 34  DISTRIBUTE  arrA3[WGT_BLOCK][*][WGT_BLOCK]
-c                 REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][*]
-
-      subroutine distrw34
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n
-
-      double precision, dimension(8) ::
-     >                   WB=(/1.0,2.,2.,3.,1.,2., 1., 1./)
-
-      integer, allocatable ::  A3(:,:,:)
-      character(10) :: tname='distrw34'
-               
-!dvm$ distribute A3(WGT_BLOCK(WB,6),*,WGT_BLOCK(WB,8))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = (i*NL/10 + j*NL/100 + n) * 7    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(WGT_BLOCK(WB,6),WGT_BLOCK(WB,8),*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) * 7) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw34
-
-C ----------------------------------------------------distrw35
-c 35  DISTRIBUTE  arrA3[WGT_BLOCK][WGT_BLOCK][*]
-c                         REDISTRIBUTE arrA3[*][*][WGT_BLOCK]
-
-      subroutine distrw35
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n
-
-      double precision, dimension(6) :: WB1=(/1.0,2.,2.,3.0,1.5, 2.5/)     
-      double precision, dimension(6) :: WB2=(/1.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw35  '
-               
-!dvm$ distribute A3(WGT_BLOCK(WB1,6),BLOCK,*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(*,*,WGT_BLOCK(WB2,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A3)
-
-      end subroutine distrw35
-
-C ----------------------------------------------------distrw36
-c 36  DISTRIBUTE  arrA3[WGT_BLOCK][*][BLOCK]
-c                         REDISTRIBUTE arrA3[BLOCK][*][WGT_BLOCK]
-
-      subroutine distrw36
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n
-
-      double precision, dimension(6) :: WB=(/1.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable ::  A3(:,:,:)
-      character(10), parameter :: tname='distrw36  '
-               
-!dvm$ distribute A3(WGT_BLOCK(WB,6),*,BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-     
-      A3 = 2
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = (i*NL/10 + j*NL/100 + n) + A3(i,j,n)    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(BLOCK,*,WGT_BLOCK(WB,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) + 2) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw36
-
-C ----------------------------------------------------distrw37
-c 37  DISTRIBUTE  arrA3[WGT_BLOCK][BLOCK][*]
-c                         REDISTRIBUTE arrA3[BLOCK][*][WGT_BLOCK]
-
-      subroutine distrw37
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n
-
-      double precision,dimension(6) :: WB1=(/0.5, 1.,1.,2.,2.,3./)
-      double precision,dimension(8) :: WB2=(/1.,2.,2.,3.,0.5,2.,1.,1./)
-
-      integer, allocatable :: A3(:,:,:)
-      character(*), parameter :: tname='distrw37  '
-               
-!dvm$ distribute A3(WGT_BLOCK(WB1,6),BLOCK,*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(BLOCK,*,WGT_BLOCK(WB2,8))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw37
-
-C ----------------------------------------------------distrw38
-c 38  DISTRIBUTE  arrA3[BLOCK][*][WGT_BLOCK] REDISTRIBUTE arrA3[*][WGT_BLOCK][WGT_BLOCK]
-
-      subroutine distrw38
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n
-
-      double precision, dimension(6) :: WB1=(/1.0,2.,2.,3.0, 4.,5./)
-      double precision, dimension(6) :: WB2=(/1.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10) :: tname='distrw38'
-               
-!dvm$ distribute A3(BLOCK, *, WGT_BLOCK(WB1,6))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-      
-      A3 = 5
-
-!dvm$ actual (A3)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = A3(i,j,n) + i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A3(*,WGT_BLOCK(WB2,6),WGT_BLOCK(WB1,6))    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) + 5) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw38
-
-C ----------------------------------------------------distrw41
-c 41  DISTRIBUTE arrA4[*][*][WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE arrA4[*][*][*][*]
-
-      subroutine distrw41
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,AN4=8,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m
-
-      double precision, dimension(8) :: WB=(/1.,2.,2.,3.,1.,1.,2.,1./)
-
-      integer, allocatable :: A4(:,:,:,:)
-      character(10), parameter :: tname='distrw41  '
-               
-!dvm$ distribute A4(*,*,WGT_BLOCK(WB,6),WGT_BLOCK(WB,8))   
-!dvm$ dynamic A4
-
-      allocate (A4(AN1,AN2,AN3,AN4))
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A4(*,*,*,*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) /= (i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A4)
-
-      end subroutine distrw41
-
-C ----------------------------------------------------distrw42
-c 42  DISTRIBUTE arrA4[WGT_BLOCK][*][WGT_BLOCK][*] REDISTRIBUTE arrA4[*][WGT_BLOCK][WGT_BLOCK][*]
-
-      subroutine distrw42
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,AN4=8,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m
-
-      double precision, dimension(6) :: WB1=(/1.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable :: A4(:,:,:,:)
-      character(10) :: tname='distrw42  '
-               
-!dvm$ distribute A4(WGT_BLOCK(wb1,6),*,WGT_BLOCK(wb1,6),*)   
-!dvm$ dynamic A4
-
-      allocate (A4(AN1,AN2,AN3,AN4))
-    
-      A4 = 3
-
-!dvm$ actual (A4)
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                  A4(i,j,n,m) = A4(i,j,n,m) +
-     >                          i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ redistribute A4(*,WGT_BLOCK(wb1,6),WGT_BLOCK(wb1,6),*)    
-
-!dvm$ actual (erri)
-
-!dvm$ region
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-               if (A4(i,j,n,m) /= (i*NL/10+j*NL/100+n*NL/1000+m)+3)
-     >         then     
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-               endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region
- 
-!dvm$ get_actual (erri)
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A4)
-
-      end subroutine distrw42
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt3.fdv
deleted file mode 100644
index b1cd362..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/DISTR_WGT/distrwgt3.fdv
+++ /dev/null
@@ -1,835 +0,0 @@
-      program DISTRW3
-
-!    Testing DISTRIBUTE and REDISTRIBUTE directives       
-!            WGT_BLOCK distribution
-
-      print *,'===START OF distrwgt3========================'
-
-C -------------------------------------------------
-c 39 DISTRIBUTE arrA3[BLOCK][BLOCK][BLOCK]
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-      call distrw39
-C -------------------------------------------------
-c 310 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]
-      call distrw310
-C -------------------------------------------------
-c 311  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] other weigths
-      call distrw311
-C -------------------------------------------------
-c 312 DISTRIBUTE arrA2[WGT_BLOCK][BLOCK][WGT_BLOCK] 
-c                REDISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]
-      call distrw312
-C -------------------------------------------------
-c 313 DISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK] 
-c                REDISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]
-      call distrw313
-C -------------------------------------------------
-c 314 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-c                REDISTRIBUTE arrA2[*][*][*]
-      call distrw314
-C -------------------------------------------------
-c 315  DISTRIBUTE arrA3[*][*][*] 
-c                REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-      call distrw315
-C -------------------------------------------------
-c 316  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]   with zero weigths
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-      call distrw316
-C -------------------------------------------------
-c 317  DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]       with zero weigths
-c                REDISTRIBUTE [BLOCK][WGT_BLOCK][BLOCK]
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][BLOCK]
-      call distrw317
-C -------------------------------------------------
-c 318  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][*]           with zero weigths
-c                REDISTRIBUTE [*][WGT_BLOCK][*]
-c                REDISTRIBUTE [WGT_BLOCK][*][WGT_BLOCK]
-      call distrw318
-C -------------------------------------------------
-c 43  DISTRIBUTE arrA4[WGT_BLOCK][*][WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE arrA4[BLOCK][WGT_BLOCK][BLOCK][*]
-      call distrw43
-C -------------------------------------------------
-C
-      print *,'=== END OF distrwgt3 ========================= '    
-
-      end
-
-C ----------------------------------------------------distrw310
-c 39 DISTRIBUTE arrA3[BLOCK][BLOCK][BLOCK]
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-
-      subroutine distrw39
-
-      integer, parameter :: AN1=16,AN2=16,AN3=16,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision, dimension(6) ::
-     >                  WB1=(/3.0,1.,2.,2.0, 2.5, 1.2/)     
-      double precision, dimension(7) ::
-     >                  WB2=(/1.,3.,4.0,1.,2.,2.,4./)     
-      double precision, dimension(8) ::
-     >                  WB3=(/5.0,1.,3.,6.0,2.,4.,3.,1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw39  '
-
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n + 6   
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute
-!dvm$*    A3(WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,7),WGT_BLOCK(WB3,8))   
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) +6 )
-     >          then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw39
-
-C ----------------------------------------------------distrw310
-c 310 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE [BLOCK][BLOCK][BLOCK]
-
-      subroutine distrw310
-
-      integer, parameter :: AN1=12,AN2=12,AN3=24,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision, dimension(6) :: WB1=(/2.0,1.,1.,3.0, 2., 1./)     
-      double precision, dimension(8):: WB2=(/1.0,1.,2.,2.0,1.,1.,2.,2./)     
-      double precision, dimension(6) :: WB3=(/2.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw310 '
-
-!dvm$ distribute A3(WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,6),WGT_BLOCK(WB3,6))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 2
-
-!dvm$ actual (A3) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = A3(i,j,n) + i*NL/10 + j*NL/100 + n   
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A3(BLOCK,BLOCK,BLOCK)   
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) + 2 )
-     >          then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw310
-
-C ----------------------------------------------------distrw311
-c 311  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] other weigths
-
-      subroutine distrw311
-
-      integer, parameter :: AN1=8,AN2=12,AN3=10,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision,dimension(6):: WB1=(/2.0,1.,1.,3.0, 2.,1./)     
-      double precision,dimension(8):: WB2=(/1.0,1.,2.,2.0,1.,1.,2.,2./)     
-      double precision,dimension(6):: WB3=(/2.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw311 '
-
-               
-!dvm$ distribute A3(WGT_BLOCK(WB1,5),WGT_BLOCK(WB2,8),WGT_BLOCK(WB3,6))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 5
-
-!dvm$ actual(A3)
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = A3(i,j,n) + i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute 
-!dvm$* A3(WGT_BLOCK(WB3,6),WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,6))   
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) + 5) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw311
-
-C ----------------------------------------------------distrw312
-c 312 DISTRIBUTE arrA2[WGT_BLOCK][BLOCK][WGT_BLOCK] 
-c                REDISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK]
-
-      subroutine distrw312
-
-      integer, parameter :: AN1=30,AN2=10,AN3=5,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision, dimension(7) ::
-     >            WB1=(/2.0,1.,1.,3.0, 2.,4., 1./)     
-      double precision, dimension(8):: WB2=(/1.0,1.,2.,2.0,1.,1.,2.,2./)     
-      double precision, dimension(6) :: WB3=(/2.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw312 '
-
-               
-!dvm$ distribute A3(WGT_BLOCK(WB1,7),BLOCK,WGT_BLOCK(WB3,6))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n + 10   
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A3(BLOCK,WGT_BLOCK(WB2,8),BLOCK)   
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n)+ 10) then
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw312
-
-C ----------------------------------------------------distrw313
-c 313 DISTRIBUTE arrA3[BLOCK][WGT_BLOCK][BLOCK] 
-c                REDISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]
-
-      subroutine distrw313
-
-      integer, parameter :: AN1=8,AN2=8,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision, dimension(7) ::
-     >            WB1=(/2.0,1.,1.,3.0, 2., 1., 3.5/)     
-      double precision, dimension(7) ::
-     >            WB2=(/1.0,1.,2.,2.0,1.,1.,2./)     
-      double precision, dimension(6) :: WB3=(/2.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw313 '
-
-!dvm$ distribute A3(BLOCK, WGT_BLOCK(WB2,7),BLOCK)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A3(WGT_BLOCK(WB1,7),BLOCK,WGT_BLOCK(WB3,6))   
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw313
-
-C ----------------------------------------------------distrw314
-c 314 DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-c                REDISTRIBUTE arrA2[*][*][*]
-
-      subroutine distrw314
-
-      integer, parameter :: AN1=8,AN2=15,AN3=24,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision, dimension(6)  :: WB1=(/2.0,1.,1.,3.0, 2., 1./)     
-      double precision, dimension(10) :: 
-     >                 WB2=(/1.0,1.,2.,2.0,1.,1.,2.,2., 4., 6./)     
-      double precision, dimension(8) ::
-     >                 WB3=(/2.0,2.,2.,3.0, 1., 1., 3., 2.6/)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw314 '
-
-!dvm$ distribute A3(WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,10),WGT_BLOCK(WB3,8))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 2
-
-      !dvm$ actual (A3) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n - A3(i,j,n)
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A3(*,*,*)    
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) - 2) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw314
-
-C ----------------------------------------------------distrw315
-c 315  DISTRIBUTE arrA3[*][*][*] 
-c                REDISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]
-
-      subroutine distrw315
-
-      integer, parameter :: AN1=12,AN2=10,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision, dimension(6) :: WB1=(/2.0,1.,1.,3.0, 2., 1./)     
-      double precision,dimension(8) :: WB2=(/1.0,1.,2.,2.0,1.,1.,2.,2./)     
-      double precision, dimension(6) :: WB3=(/2.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw315 '
-
-!dvm$ distribute A3(*,*,*)    
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute
-!dvm$*    A3(WGT_BLOCK(WB3,6),WGT_BLOCK(WB2,8),WGT_BLOCK(WB1,6))   
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n)) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw315
-
-C ----------------------------------------------------distrw316
-c 316  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][WGT_BLOCK]  with zero weigths
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][WGT_BLOCK] 
-
-      subroutine distrw316
-
-      integer, parameter :: AN1=8,AN2=12,AN3=10,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision,dimension(7)::
-     >           WB1=(/2.0,1.,0.,1.,3.0, 2.,0./)     
-      double precision,dimension(8)::
-     >           WB2=(/0.,4.,2.,3.,1.,1.,2.,0./)     
-      double precision,dimension(8)::
-     >           WB3=(/2.0,3.,2.,4.,0.,0.,1.,2./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw316 '
-
-               
-!dvm$ distribute A3(WGT_BLOCK(WB1,7),WGT_BLOCK(WB2,8),WGT_BLOCK(WB3,8))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 2
-
-!dvm$ actual(A3)
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = A3(i,j,n) + i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute 
-!dvm$* A3(WGT_BLOCK(WB3,6),WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,6))   
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) + 2) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw316
-
-C ----------------------------------------------------distrw317
-c 317  DISTRIBUTE arrA3[WGT_BLOCK][BLOCK][WGT_BLOCK]       with zero weigths
-c                REDISTRIBUTE [BLOCK][WGT_BLOCK][BLOCK]
-c                REDISTRIBUTE [WGT_BLOCK][WGT_BLOCK][BLOCK]
-      subroutine distrw317
-
-      integer, parameter :: AN1=12,AN2=10,AN3=8,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision,dimension(7)::
-     >           WB1=(/1.,0.5,0.,0.4, 2.,0.8, 0./)     
-      double precision,dimension(8)::
-     >           WB2=(/0.,4.,2.,3.,1.2,1.,0., 2.4/)     
-      double precision,dimension(10)::
-     >           WB3=(/2.0,3.,2.,4.,0.,0.,1.,2.,0.,2./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw317 '
-
-               
-!dvm$ distribute A3(WGT_BLOCK(WB1,7),BLOCK,WGT_BLOCK(WB3,10))   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-!dvm$ actual(A3)
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute 
-!dvm$* A3(BLOCK,WGT_BLOCK(WB2,8),BLOCK)   
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = A3(i,j,n) + 4  
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A3(WGT_BLOCK(WB1,6),WGT_BLOCK(WB2,6),BLOCK)   
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = A3(i,j,n) - 1  
-             enddo
-          enddo
-      enddo
-!dvm$ end region
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) + 3) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw317
-
-C ----------------------------------------------------distrw318
-c 318  DISTRIBUTE arrA3[WGT_BLOCK][WGT_BLOCK][*]           with zero weigths
-c                REDISTRIBUTE [*][WGT_BLOCK][*]
-c                REDISTRIBUTE [WGT_BLOCK][*][WGT_BLOCK]
-      subroutine distrw318
-
-      integer, parameter :: AN1=22,AN2=12,AN3=15,NL=1000,ER=10000
-      integer :: erri=ER,i,j,n,m
-
-      double precision,dimension(5)::
-     >           WB1=(/0.,1.5,0.7,0.,2./)     
-      double precision,dimension(8)::
-     >           WB2=(/2.0,4.2,0.,3.,2.2,3.,0.4, 2.4/)     
-      double precision,dimension(7)::
-     >           WB3=(/3.,2.,4.,0.,1.,2.,0./)     
-
-      integer, allocatable :: A3(:,:,:)
-      character(10), parameter :: tname='distrw318 '
-
-               
-!dvm$ distribute A3(WGT_BLOCK(WB1,5),WGT_BLOCK(WB2,8),*)   
-!dvm$ dynamic A3
-
-      allocate (A3(AN1,AN2,AN3))
-
-      A3 = 6
-
-!dvm$ actual(A3)
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = A3(i,j,n) + i*NL/10 + j*NL/100 + n    
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute 
-!dvm$* A3(*,WGT_BLOCK(WB2,8),*)   
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                A3(i,j,n) = A3(i,j,n) + 4  
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A3(WGT_BLOCK(WB2,6),*,WGT_BLOCK(WB3,6))   
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n) on A3(i,j,n), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                if (A3(i,j,n) /= (i*NL/10 + j*NL/100 + n) + 10) then     
-                    erri = min(erri,i*NL/10 + j*NL/100 + n)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
-     
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A3)
-
-      end subroutine distrw318
-
-C ----------------------------------------------------distrw43
-c 43  DISTRIBUTE arrA4[WGT_BLOCK][*][WGT_BLOCK][WGT_BLOCK]
-c                REDISTRIBUTE arrA4[BLOCK][WGT_BLOCK][BLOCK][*]
-
-      subroutine distrw43
-
-      integer, parameter :: AN1=24,AN2=16,AN3=8,AN4=8,NL=1000,ER=100000
-      integer :: erri=ER,i,j,n,m
-
-      double precision, dimension(6) :: WB1=(/2.0,1.,1.,3.0, 2., 1./)     
-      double precision,dimension(8):: WB2=(/1.0,1.,2.,2.0,1.,1.,2.,2./)     
-      double precision, dimension(6) :: WB3=(/2.0,2.,2.,3.0, 1., 1./)     
-
-      integer, allocatable ::  A4(:,:,:,:)
-      character(10), parameter :: tname='distrw43  '
-               
-!dvm$ distribute
-!dvm$*  A4(WGT_BLOCK(WB1,6),*,WGT_BLOCK(WB2,8),WGT_BLOCK(WB3,6))   
-!dvm$ dynamic A4
-
-      allocate (A4(AN1,AN2,AN3,AN4))
-
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                     A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                enddo
-             enddo
-          enddo
-      enddo
-!dvm$ end region 
-
-!dvm$ redistribute A4(BLOCK,WGT_BLOCK(WB3,6),BLOCK,*)   
-
-!dvm$ actual (erri) 
-
-!dvm$ region 
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), reduction( min( erri ) )
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                if (A4(i,j,n,m) /= (i*NL/10+j*NL/100+n*NL/1000+m)) then     
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region 
- 
-!dvm$ get_actual (erri) 
-
-      if (erri == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (A4)
-
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_do.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_do.fdv
deleted file mode 100644
index 4ff3740..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_do.fdv
+++ /dev/null
@@ -1,824 +0,0 @@
-      program DO1
-
-c    TESTING convert statement DO  .       
-
-      print *,'===START OF F2C_DO========================'
-C --------------------------------------------------
-c   do with enddo
-      call do_enddo
-c   do with label (continue)
-      call do_continue
-c   do with label (last stmt)
-      call do_without_end
-c   check iterator value after DO
-      call do_value_iter
-c   check iterator value in same step (+3)
-      call do_with_same_step1
-c   check iterator value in same step (-2)
-      call do_with_same_step2
-c   multi do
-      call do_multi
-c   cycle stmt
-      call do_cycle_stmt_1
-      call do_cycle_stmt_2
-c   exit stmt
-      call do_exit_stmt
-c   do while with var-expr
-      call do_while_true
-c   do while const-expr
-      call do_while_expr
-    
-
-      print *,'=== END OF F2C_DO ========================= '    
-      end
-
-C ----------------------------------------------------do1
-      subroutine do_enddo
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_enddo'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia)
-      do i=1, AN1
-            do ia = 1, i
-                 A1(i) = A1(i) + ia + (i-5)
-            enddo
-      enddo
-      
-!dvm$ end region   
-      do i=1, AN1
-            do ia = 1, i
-                B1(i) = B1(i) + ia + (i-5)
-            enddo
-      enddo
-      erri= ER
-     
-
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-      end
-C ----------------------------------------------------do12
-      subroutine do_continue
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_continue'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia)
-      do i=1, AN1
-            do 101, ia = 1, i
-                 A1(i) = A1(i) + ia + (i-5)
-101          continue
-      enddo
-      
-!dvm$ end region   
-      do i=1, AN1
-            do 201, ia = 1, i
-                B1(i) = B1(i) + ia + (i-5)
-201          continue
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-      erri= ER
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-      end
-
-C ----------------------------------------------------do13
-      subroutine do_without_end
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_without_end'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia)
-      do i=1, AN1
-            do 102, ia = 1, i
-102            A1(i) = A1(i) + ia + (i-5)
-         
-      enddo
-      
-!dvm$ end region   
-      do i=1, AN1
-            do 202, ia = 1, i
-202             B1(i) = B1(i) + ia + (i-5)
-          
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-      end
-
-
-C ----------------------------------------------------do14
-      subroutine do_value_iter
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_value_iter'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia)
-      do i=1, AN1
-            do ia = 1, i*2-5
-                 A1(i) = A1(i) + ia + (i-5)
-            enddo
-            A1(i) = ia
-            
-      enddo
-      
-!dvm$ end region   
-      do i=1, AN1
-            do ia = 1, i*2-5
-                B1(i) = B1(i) + ia + (i-5)
-            enddo
-            B1(i) = ia
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-      end
-
-C ----------------------------------------------------do15
-      subroutine do_with_same_step1
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_with_same_step1'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia)
-      do i=1, AN1
-            do ia = 1, i*2-5, 3
-                 A1(i) = A1(i) + ia + (i-5)
-            enddo
-            
-      enddo
-      
-!dvm$ end region   
-      do i=1, AN1
-            do ia = 1, i*2-5, 3
-                B1(i) = B1(i) + ia + (i-5)
-            enddo
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-      end
-C ----------------------------------------------------do16
-      subroutine do_with_same_step2
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_with_same_step2'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia)
-      do i=1, AN1
-            do ia = i*2-5, 1, -2
-                 A1(i) = A1(i) + ia + (i-5)
-            enddo
-            
-      enddo
-      
-!dvm$ end region   
-      do i=1, AN1
-            do ia = i*2-5, 1, -2
-                B1(i) = B1(i) + ia + (i-5)
-            enddo
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-      end
-C ----------------------------------------------------do17
-      subroutine do_multi
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_multi'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia,j,n)
-      do i=1, AN1
-        n = 0
-        do 107, ia = 1, A1(i)
-            do 107, j = ia, A1(i)
-107             n = n+1         
-        A1(i) = n + j - 2*ia
-      enddo
-!dvm$ end region
-
-      do i=1, AN1
-        n = 0
-        do 207, ia = 1, B1(i)
-            do 207, j = ia, B1(i)
-207             n = n+1         
-        B1(i) = n + j - 2*ia
-      enddo
-
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo   
-
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-      end
-C ----------------------------------------------------do18
-      subroutine do_cycle_stmt_1
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_cycle_stmt_1'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia)
-      do i=1, AN1
-            do ia = 1, i*2-5, 2
-                 if(mod(A1(i),2) .eq.0) cycle
-                 A1(i) = A1(i) + ia  + (i-5)
-            enddo            
-      enddo
-      
-!dvm$ end region   
-      do i=1, AN1
-            do ia = 1, i*2-5, 2
-                if(mod(B1(i),2) .eq.0) cycle
-                B1(i) = B1(i) + ia + (i-5)
-            enddo
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-      end
-C ----------------------------------------------------do19
-      subroutine do_cycle_stmt_2
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_cycle_stmt_2'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia)
-      do i=1, AN1
-            if(A1(i) .gt. 5)  cycle
-            do ia = 1, i-200
-                 A1(i) = A1(i)+ia+(i-5)
-            enddo            
-      enddo      
-!dvm$ end region   
-      do i=1, AN1
-            if(B1(i) .gt. 5)  cycle
-            do ia = 1, i-200
-                 B1(i) = B1(i)+ia+(i-5)
-            enddo
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-      end
-
-C ----------------------------------------------------do20
-      subroutine do_exit_stmt
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_exit_stmt'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-
-
-!dvm$ parallel (i) on A1(i)
-!dvm$*, private(ia,j,n)
-      do i=1, AN1
-        n = 0
-        do ia = 1, A1(i)
-            j = 1
-            do
-                n = n+1
-                if(j .gt. ia) then 
-                    n = n-1
-                    exit
-                endif
-                j = j+1
-            enddo        
-        enddo    
-        A1(i) = n+A1(i)+2*j-3*ia 
-      enddo
-!dvm$ end region   
-
-
-      do i=1, AN1
-        n = 0
-        do ia = 1, B1(i)
-            j = 1
-            do
-                n = n+1
-                if(j .gt. ia) then 
-                    n = n-1
-                    exit
-                endif
-                j = j+1
-            enddo        
-        enddo    
-        B1(i) = n+B1(i)+2*j-3*ia
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo  
-      
-      
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-      end
-C ----------------------------------------------------do21
-      subroutine do_while_true
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_while_true'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-
-!dvm$ parallel (i) on A1(i)
-      do i=1, AN1
-            do while(.true.)
-                A1(i) = A1(i) + i
-                if(A1(i) .gt. 2*A1(i) .or. i .gt. A1(i) / 3 - 5) exit
-            enddo
-      enddo
-      
-!dvm$ end region   
-      do i=1, AN1
-            do while(.true.)
-                B1(i) = B1(i) + i
-                if(B1(i) .gt. 2*B1(i) .or. i .gt. B1(i) / 3 - 5) exit
-            enddo
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-      end
-C ----------------------------------------------------do22
-      subroutine do_while_expr
-      integer, parameter :: AN1=256, ER=10000    
-      character*18 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i, ia
-!dvm$ distribute A1(BLOCK)
-      tname='do_while_expr'
-	  
-	  
-    
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      erri= ER
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-
-!dvm$ parallel (i) on A1(i)
-      do i=1, AN1
-            do while(A1(i)*3 -40 .lt. A1(i) + 15)
-                A1(i) = A1(i) + i
-                if(A1(i) .gt. 2*A1(i) .or. i .gt. A1(i) / 3 - 5) exit
-            enddo
-      enddo
-      
-!dvm$ end region   
-      do i=1, AN1
-            do while(B1(i)*3 -40 .lt. B1(i) + 15)
-                B1(i) = B1(i) + i
-                if(B1(i) .gt. 2*B1(i) .or. i .gt. B1(i) / 3 - 5) exit
-            enddo
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-	  deallocate (A1)
-	  deallocate (B1)
-
-
-
-      end
-            
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*18 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*18 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math.fdv
deleted file mode 100644
index 7f98cc7..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math.fdv
+++ /dev/null
@@ -1,17459 +0,0 @@
-
-      program INTRINSICS
-      print *, '=== START OF F2C_MATH intrinsic test ==========='
-
-c     TESTING abs GENERIC INTRINSIC
-c     integer*4 abs(integer*4)
-      call abs1
-c     real*4 abs(real*4)
-      call abs2
-c     real*8 abs(real*8)
-      call abs3
-c     real*4 abs(complex*8)
-      call abs4
-c     real*8 abs(complex*16)
-      call abs5
-c     real*4 cabs(complex*8)
-      call abs6
-c     real*8 dabs(real*8)
-      call abs7
-c     integer*4 iabs(integer*4)
-      call abs8
-c     real*8 cdabs(complex*16)
-      call abs14
-c     real*8 zabs(complex*16)
-      call abs15
-
-c     TESTING acos GENERIC INTRINSIC
-c     real*4 acos(real*4)
-      call acos1
-c     real*8 acos(real*8)
-      call acos2
-c     real*8 dacos(real*8)
-      call acos3
-
-c     TESTING acosh GENERIC INTRINSIC
-c     real*4 acosh(real*4)
-      call acosh1
-c     real*8 acosh(real*8)
-      call acosh2
-c     real*8 dacosh(real*8)
-      call acosh3
-
-c     TESTING aimag GENERIC INTRINSIC
-c     real*4 aimag(complex*8)
-      call aimag1
-c     real*8 aimag(complex*16)
-      call aimag2
-c     real*4 imag(complex*8)
-      call aimag3
-c     real*8 imag(complex*16)
-      call aimag4
-c     real*8 dimag(complex*16)
-      call aimag5
-
-c     TESTING asin GENERIC INTRINSIC
-c     real*4 asin(real*4)
-      call asin1
-c     real*8 asin(real*8)
-      call asin2
-c     real*8 dasin(real*8)
-      call asin3
-
-c     TESTING asinh GENERIC INTRINSIC
-c     real*4 asinh(real*4)
-      call asinh1
-c     real*8 asinh(real*8)
-      call asinh2
-c     real*8 dasinh(real*8)
-      call asinh3
-
-c     TESTING atan GENERIC INTRINSIC
-c     real*4 atan(real*4)
-      call atan1
-c     real*8 atan(real*8)
-      call atan2_
-c     real*8 datan(real*8)
-      call atan3
-
-c     TESTING atan2 GENERIC INTRINSIC
-c     real*4 atan2(real*4, real*4)
-      call atan21
-c     real*8 atan2(real*8, real*8)
-      call atan22
-c     real*8 datan2(real*8, real*8)
-      call atan23
-
-c     TESTING atanh GENERIC INTRINSIC
-c     real*4 atanh(real*4)
-      call atanh1
-c     real*8 atanh(real*8)
-      call atanh2
-c     real*8 datanh(real*8)
-      call atanh3
-
-c     TESTING bessel_j0 GENERIC INTRINSIC
-c     real*4 bessel_j0(real*4)
-      call bessel_j01
-c     real*8 bessel_j0(real*8)
-      call bessel_j02
-
-c     TESTING bessel_j1 GENERIC INTRINSIC
-c     real*4 bessel_j1(real*4)
-      call bessel_j11
-c     real*8 bessel_j1(real*8)
-      call bessel_j12
-
-c     TESTING bessel_jn GENERIC INTRINSIC
-c     real*4 bessel_jn(integer*4, real*4)
-      call bessel_jn1
-c     real*8 bessel_jn(integer*4, real*8)
-      call bessel_jn2
-
-c     TESTING bessel_y0 GENERIC INTRINSIC
-c     real*4 bessel_y0(real*4)
-      call bessel_y01
-c     real*8 bessel_y0(real*8)
-      call bessel_y02
-
-c     TESTING bessel_y1 GENERIC INTRINSIC
-c     real*4 bessel_y1(real*4)
-      call bessel_y11
-c     real*8 bessel_y1(real*8)
-      call bessel_y12
-c     TESTING bessel_yn GENERIC INTRINSIC
-c     real*4 bessel_yn(integer*4, real*4)
-      call bessel_yn1
-c     real*8 bessel_yn(integer*4, real*8)
-      call bessel_yn2
-c     TESTING btest GENERIC INTRINSIC
-c     logical*1 btest(integer*1)
-      call btest1
-c     logical*2 btest(integer*2)
-      call btest2
-c     logical*4 btest(integer*4)
-      call btest3
-c     logical*8 btest(integer*8)
-      call btest4
-
-c     TESTING cmplx GENERIC INTRINSIC
-c     complex*8 cmplx(integer*4)
-      call cmplx1
-c     complex*8 cmplx(real*4)
-      call cmplx2
-c     complex*8 cmplx(real*8)
-      call cmplx3
-c     complex*8 cmplx(complex*8)
-      call cmplx4
-c     complex*8 cmplx(complex*16)
-      call cmplx5
-c     complex*8 cmplx(integer*4, integer*4)
-      call cmplx6
-c     complex*8 cmplx(real*4, real*4)
-      call cmplx7
-c     complex*8 cmplx(real*8, real*8)
-      call cmplx8
-c     complex*8 cmplx(integer*4, integer*4, 4)
-      call cmplx9
-c     complex*8 cmplx(real*4, real*4, 4)
-      call cmplx10
-c     complex*8 cmplx(real*8, real*8, 4)
-      call cmplx11
-c     complex*16 cmplx(integer*4, integer*4, 8)
-      call cmplx12
-c     complex*16 cmplx(real*4, real*4, 8)
-      call cmplx13
-c     complex*16 cmplx(real*8, real*8, 8)
-      call cmplx14
-c     complex*16 dcmplx(integer*4)
-      call cmplx15
-c     complex*16 dcmplx(real*4)
-      call cmplx16
-c     complex*16 dcmplx(real*8)
-      call cmplx17
-c     complex*16 dcmplx(complex*8)
-      call cmplx18
-c     complex*16 dcmplx(complex*16)
-      call cmplx19
-c     complex*16 dcmplx(integer*4, integer*4)
-      call cmplx20
-c     complex*16 dcmplx(real*4, real*4)
-      call cmplx21
-c     complex*16 dcmplx(real*8, real*8)
-      call cmplx22
-
-c     TESTING conjg GENERIC INTRINSIC
-c     complex*8 conjg(complex*8)
-      call conjg1
-c     complex*16 conjg(complex*16)
-      call conjg2
-c     complex*16 dconjg(complex*16)
-      call conjg3
-
-c     TESTING cos GENERIC INTRINSIC
-c     real*4 cos(real*4)
-      call cos1
-c     real*8 cos(real*8)
-      call cos2
-c     complex*8 cos(complex*8)
-      call cos3
-c     complex*16 cos(complex*16)
-      call cos4
-c     real*8 dcos(real*8)
-      call cos5
-c     complex*8 ccos(complex*8)
-      call cos6
-c     complex*16 cdcos(complex*16)
-      call cos7
-c     complex*16 zcos(complex*16)
-      call cos8
-
-c     TESTING cosh GENERIC INTRINSIC
-c     real*4 cosh(real*4)
-      call cosh1
-c     real*8 cosh(real*8)
-      call cosh2
-c     real*8 dcosh(real*8)
-      call cosh3
-
-c     TESTING dble GENERIC INTRINSIC
-c     real*8 dble(integer*1)
-      call dble1
-c     real*8 dble(integer*2)
-      call dble2
-c     real*8 dble(integer*4)
-      call dble3
-c     real*8 dble(integer*8)
-      call dble4
-c     real*8 dble(real*4)
-      call dble5
-c     real*8 dble(real*8)
-      call dble6
-c     real*8 dble(complex*8)
-      call dble7
-c     real*8 dble(complex*16)
-      call dble8
-
-c     TESTING dfloat GENERIC INTRINSIC
-c     real*8 dfloat(integer*1)
-      call dfloat1
-c     real*8 dfloat(integer*2)
-      call dfloat2
-c     real*8 dfloat(integer*4)
-      call dfloat3
-c     real*8 dfloat(integer*8)
-      call dfloat4
-
-c     TESTING dim GENERIC INTRINSIC
-c     integer*1 dim(integer*1)
-      call dim1
-c     integer*2 dim(integer*2)
-      call dim2
-c     integer*4 dim(integer*4)
-      call dim3
-c     integer*8 dim(integer*8)
-      call dim4
-c     real*4 dim(real*4)
-      call dim5
-c     real*8 dim(real*8)
-      call dim6
-c     real*8 ddim(real*8)
-      call dim13
-
-c     TESTING dprod SPECIFIC INTRINSIC
-c     real*8 dprod(real*4)
-      call dprod1
-
-c     TESTING dreal SPECIFIC INTRINSIC
-c     real*8 dreal(complex*16)
-      call dreal1
-
-c     TESTING dshiftl SPECIFIC INTRINSIC
-c     integer*8 dshiftl(integer*8)
-      call dshiftl1
-
-c     TESTING dshiftr SPECIFIC INTRINSIC
-c     integer*8 dshiftr(integer*8)
-      call dshiftr1
-
-c     TESTING erf GENERIC INTRINSIC
-c     real*4 erf(real*4)
-      call erf1
-c     real*8 erf(real*8)
-      call erf2
-c     real*8 derf(real*8)
-      call erf3
-
-c     TESTING erfc GENERIC INTRINSIC
-c     real*4 erfc(real*4)
-      call erfc1
-c     real*8 erfc(real*8)
-      call erfc2
-c     real*8 derfc(real*8)
-      call erfc3
-
-c     TESTING erfc_scaled GENERIC INTRINSIC
-c     real*4 erfc_scaled(real*4)
-      call erfc_scaled1
-c     real*8 erfc_scaled(real*8)
-      call erfc_scaled2
-
-c     TESTING exp GENERIC INTRINSIC
-c     real*4 exp(real*4)
-      call exp1
-c     real*8 exp(real*8)
-      call exp2
-c     complex*8 exp(complex*8)
-      call exp3
-c     complex*16 exp(complex*16)
-      call exp4
-c     real*8 dexp(real*8)
-      call exp5
-c     complex*8 cexp(complex*8)
-      call exp6
-c     complex*16 cdexp(complex*16)
-      call exp7
-c     complex*16 zexp(complex*16)
-      call exp8
-
-c     TESTING gamma GENERIC INTRINSIC
-c     real*4 gamma(real*4)
-      call gamma1
-c     real*8 gamma(real*8)
-      call gamma2
-
-c     TESTING hypot GENERIC INTRINSIC
-c     real*4 hypot(real*4)
-      call hypot1
-c     real*8 hypot(real*8)
-      call hypot2
-
-c     TESTING iand GENERIC INTRINSIC
-c     integer*1 iand(integer*1)
-      call iand1
-c     integer*2 iand(integer*2)
-      call iand2
-c     integer*4 iand(integer*4)
-      call iand3
-c     integer*8 iand(integer*8)
-      call iand4
-c     integer*1 and(integer*1)
-      call iand5
-c     integer*2 and(integer*2)
-      call iand6
-c     integer*4 and(integer*4)
-      call iand7
-c     integer*8 and(integer*8)
-      call iand8
-
-c     TESTING ibclr GENERIC INTRINSIC
-c     integer*1 ibclr(integer*1)
-      call ibclr1
-c     integer*2 ibclr(integer*2)
-      call ibclr2
-c     integer*4 ibclr(integer*4)
-      call ibclr3
-c     integer*8 ibclr(integer*8)
-      call ibclr4
-
-c     TESTING ibits GENERIC INTRINSIC
-c     integer*1 ibits(integer*1)
-      call ibits1
-c     integer*2 ibits(integer*2)
-      call ibits2
-c     integer*4 ibits(integer*4)
-      call ibits3
-c     integer*8 ibits(integer*8)
-      call ibits4
-
-c     TESTING ibset GENERIC INTRINSIC
-c     integer*1 ibset(integer*1)
-      call ibset1
-c     integer*2 ibset(integer*2)
-      call ibset2
-c     integer*4 ibset(integer*4)
-      call ibset3
-c     integer*8 ibset(integer*8)
-      call ibset4
-
-c     TESTING ieor GENERIC INTRINSIC
-c     integer*1 ieor(integer*1)
-      call ieor1
-c     integer*2 ieor(integer*2)
-      call ieor2
-c     integer*4 ieor(integer*4)
-      call ieor3
-c     integer*8 ieor(integer*8)
-      call ieor4
-c     integer*1 xor(integer*1)
-      call ieor9
-c     integer*2 xor(integer*2)
-      call ieor10
-c     integer*4 xor(integer*4)
-      call ieor11
-c     integer*8 xor(integer*8)
-      call ieor12
-
-c     TESTING ior GENERIC INTRINSIC
-c     integer*1 ior(integer*1)
-      call ior1
-c     integer*2 ior(integer*2)
-      call ior2
-c     integer*4 ior(integer*4)
-      call ior3
-c     integer*8 ior(integer*8)
-      call ior4
-c     integer*1 or(integer*1)
-      call ior5
-c     integer*2 or(integer*2)
-      call ior6
-c     integer*4 or(integer*4)
-      call ior7
-c     integer*8 or(integer*8)
-      call ior8
-
-c     TESTING ishft GENERIC INTRINSIC
-c     integer*1 ishft(integer*1)
-      call ishft1
-c     integer*2 ishft(integer*2)
-      call ishft2
-c     integer*4 ishft(integer*4)
-      call ishft3
-c     integer*8 ishft(integer*8)
-      call ishft4
-
-c     TESTING lshift GENERIC INTRINSIC
-c     integer*1 lshift(integer*1)
-      call lshift1
-c     integer*2 lshift(integer*2)
-      call lshift2
-c     integer*4 lshift(integer*4)
-      call lshift3
-c     integer*8 lshift(integer*8)
-      call lshift4
-
-c     TESTING rshift GENERIC INTRINSIC
-c     integer*1 rshift(integer*1)
-      call rshift1
-c     integer*2 rshift(integer*2)
-      call rshift2
-c     integer*4 rshift(integer*4)
-      call rshift3
-c     integer*8 rshift(integer*8)
-      call rshift4
-
-c     TESTING ishftc GENERIC INTRINSIC
-c     integer*1 ishftc(integer*1)
-      call ishftc1
-c     integer*2 ishftc(integer*2)
-      call ishftc2
-c     integer*4 ishftc(integer*4)
-      call ishftc3
-c     integer*8 ishftc(integer*8)
-      call ishftc4
-c     integer*1 ishftc(integer*1)
-      call ishftc5
-c     integer*2 ishftc(integer*2)
-      call ishftc6
-c     integer*4 ishftc(integer*4)
-      call ishftc7
-c     integer*8 ishftc(integer*8)
-      call ishftc8
-
-c     TESTING log GENERIC INTRINSIC
-c     real*4 log(real*4)
-      call log1
-c     real*8 log(real*8)
-      call log2
-c     complex*8 log(complex*8)
-      call log3
-c     complex*16 log(complex*16)
-      call log4
-c     real*4 alog(real*4)
-      call log5
-c     real*8 dlog(real*8)
-      call log6
-c     complex*8 clog(complex*8)
-      call log7
-c     complex*16 cdlog(complex*16)
-      call log8
-c     complex*16 zlog(complex*16)
-      call log9
-
-c     TESTING log10 GENERIC INTRINSIC
-c     real*4 log10(real*4)
-      call log101
-c     real*8 log10(real*8)
-      call log102
-
-c     real*4 alog10(real*4)
-      call log105
-c     real*8 dlog10(real*8)
-      call log106
-
-c     TESTING log_gamma GENERIC INTRINSIC
-c     real*4 log_gamma(real*4)
-      call log_gamma1
-c     real*8 log_gamma(real*8)
-      call log_gamma2
-
-c     TESTING max GENERIC INTRINSIC
-c     integer*1 max(integer*1)
-      call max1_
-c     integer*2 max(integer*2)
-      call max2_
-c     integer*4 max(integer*4)
-      call max3_
-c     integer*8 max(integer*8)
-      call max4_
-c     real*4 max(real*4)
-      call max5_
-c     real*8 max(real*8)
-      call max6_
-c     integer*4 max0(integer*4)
-      call max7_
-c     real*4 amax1(real*4)
-      call max8_
-c     real*8 dmax1(real*8)
-      call max9_
-
-c     integer*4 max1(real*4)
-      call max13_
-
-c     real*4 amax0(integer*4)
-      call max17_
-
-c     TESTING merge_bits GENERIC INTRINSIC
-c     integer*1 merge_bits(integer*1)
-      call merge_bits1
-c     integer*2 merge_bits(integer*2)
-      call merge_bits2
-c     integer*4 merge_bits(integer*4)
-      call merge_bits3
-c     integer*8 merge_bits(integer*8)
-      call merge_bits4
-
-c     TESTING min GENERIC INTRINSIC
-c     integer*1 min(integer*1)
-      call min1_
-c     integer*2 min(integer*2)
-      call min2_
-c     integer*4 min(integer*4)
-      call min3_
-c     integer*8 min(integer*8)
-      call min4_
-c     real*4 min(real*4)
-      call min5_
-c     real*8 min(real*8)
-      call min6_
-c     integer*4 min0(integer*4)
-      call min7_
-c     real*4 amin1(real*4)
-      call min8_
-c     real*8 dmin1(real*8)
-      call min9_
-c     integer*4 min1(real*4)
-      call min13_
-c     real*4 amin0(integer*4)
-      call min17_
-
-c     TESTING mod GENERIC INTRINSIC
-c     integer*1 mod(integer*1)
-      call mod1
-c     integer*2 mod(integer*2)
-      call mod2
-c     integer*4 mod(integer*4)
-      call mod3
-c     integer*8 mod(integer*8)
-      call mod4
-c     real*4 amod(real*4)
-      call mod10
-c     real*8 dmod(real*8)
-      call mod11
-
-c     TESTING modulo GENERIC INTRINSIC
-c     integer*1 modulo(integer*1)
-      call modulo1
-c     integer*2 modulo(integer*2)
-      call modulo2
-c     integer*4 modulo(integer*4)
-      call modulo3
-c     integer*8 modulo(integer*8)
-      call modulo4
-c     real*4 modulo(real*4)
-      call modulo5
-c     real*8 modulo(real*8)
-      call modulo6
-
-c     TESTING not GENERIC INTRINSIC
-c     integer*1 not(integer*1)
-      call not1
-c     integer*2 not(integer*2)
-      call not2
-c     integer*4 not(integer*4)
-      call not3
-c     integer*8 not(integer*8)
-      call not4
-
-c     TESTING popcnt GENERIC INTRINSIC
-c     integer*1 popcnt(integer*1)
-      call popcnt1
-c     integer*2 popcnt(integer*2)
-      call popcnt2
-c     integer*4 popcnt(integer*4)
-      call popcnt3
-c     integer*8 popcnt(integer*8)
-      call popcnt4
-
-c     TESTING poppar GENERIC INTRINSIC
-c     integer*1 poppar(integer*1)
-      call poppar1
-c     integer*2 poppar(integer*2)
-      call poppar2
-c     integer*4 poppar(integer*4)
-      call poppar3
-c     integer*8 poppar(integer*8)
-      call poppar4
-
-c     TESTING real GENERIC INTRINSIC
-c     real*4 real(integer*1)
-      call real1
-c     real*4 real(integer*2)
-      call real2
-c     real*4 real(integer*4)
-      call real3
-c     real*4 real(integer*8)
-      call real4
-c     real*4 real(real*4)
-      call real5
-c     real*4 real(real*8)
-      call real6
-c     real*4 real(complex*8)
-      call real7
-c     real*4 real(complex*16)
-      call real8
-c     real*4 float(integer*4)
-      call real10
-c     real*4 sngl(real*4)
-      call real13
-c     real*4 sngl(real*8)
-      call real14
-
-c     TESTING shifta GENERIC INTRINSIC
-c     integer*1 shifta(integer*1)
-      call shifta1
-c     integer*2 shifta(integer*2)
-      call shifta2
-c     integer*4 shifta(integer*4)
-      call shifta3
-c     integer*8 shifta(integer*8)
-      call shifta4
-
-c     TESTING shiftl GENERIC INTRINSIC
-c     integer*1 shiftl(integer*1)
-      call shiftl1
-c     integer*2 shiftl(integer*2)
-      call shiftl2
-c     integer*4 shiftl(integer*4)
-      call shiftl3
-c     integer*8 shiftl(integer*8)
-      call shiftl4
-
-c     TESTING shiftr GENERIC INTRINSIC
-c     integer*1 shiftr(integer*1)
-      call shiftr1
-c     integer*2 shiftr(integer*2)
-      call shiftr2
-c     integer*4 shiftr(integer*4)
-      call shiftr3
-c     integer*8 shiftr(integer*8)
-      call shiftr4
-
-c     TESTING sign GENERIC INTRINSIC
-c     integer*1 sign(integer*1)
-      call sign1
-c     integer*2 sign(integer*2)
-      call sign2
-c     integer*4 sign(integer*4)
-      call sign3
-c     integer*8 sign(integer*8)
-      call sign4
-c     real*4 sign(real*4)
-      call sign5
-c     real*8 sign(real*8)
-      call sign6
-c     integer*4 isign(integer*4)
-      call sign9
-c     real*8 dsign(real*8)
-      call sign16
-
-c     TESTING sin GENERIC INTRINSIC
-c     real*4 sin(real*4)
-      call sin1
-c     real*8 sin(real*8)
-      call sin2
-c     complex*8 sin(complex*8)
-      call sin3
-c     complex*16 sin(complex*16)
-      call sin4
-c     real*8 dsin(real*8)
-      call sin5
-c     complex*8 csin(complex*8)
-      call sin6
-c     complex*16 cdsin(complex*16)
-      call sin7
-c     complex*16 zsin(complex*16)
-      call sin8
-
-c     TESTING sinh GENERIC INTRINSIC
-c     real*4 sinh(real*4)
-      call sinh1
-c     real*8 sinh(real*8)
-      call sinh2
-c     real*8 dsinh(real*8)
-      call sinh3
-
-c     TESTING sqrt GENERIC INTRINSIC
-c     real*4 sqrt(real*4)
-      call sqrt1
-c     real*8 sqrt(real*8)
-      call sqrt2
-c     complex*8 sqrt(complex*8)
-      call sqrt3
-c     complex*16 sqrt(complex*16)
-      call sqrt4
-c     real*8 dsqrt(real*8)
-      call sqrt5
-c     complex*8 csqrt(complex*8)
-      call sqrt6
-c     complex*16 cdsqrt(complex*16)
-      call sqrt7
-c     complex*16 zsqrt(complex*16)
-      call sqrt8
-
-c     TESTING tan GENERIC INTRINSIC
-c     real*4 tan(real*4)
-      call tan1
-c     real*8 tan(real*8)
-      call tan2
-c     complex*8 tan(complex*8)
-      call tan3
-c     complex*16 tan(complex*16)
-      call tan4
-c     real*8 dtan(real*8)
-      call tan5
-
-c     TESTING tanh GENERIC INTRINSIC
-c     real*4 tanh(real*4)
-      call tanh1
-c     real*8 tanh(real*8)
-      call tanh2
-c     real*8 dtanh(real*8)
-      call tanh3
-
-c     TESTING trailz SPECIFIC INTRINSIC
-c     integer*1 trailz(integer*1)
-      call trailz1
-c     integer*2 trailz(integer*2)
-      call trailz2
-c     integer*4 trailz(integer*4)
-      call trailz3
-c     integer*8 trailz(integer*8)
-      call trailz4
-
-      print *, '=== END OF F2C_MATH intrinsic test ============='
-      end
-
-C -------------------------------------------------
-
-      subroutine abs1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'abs_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = abs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'abs_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = abs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'abs_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = abs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N)
-      complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y, tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'abs_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = abs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = abs(B(i))
-          if (abs(tmp - A(i))/tmp .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y, tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'abs_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = abs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = abs(B(i))
-          if (abs(tmp - A(i)) / tmp .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N)
-      complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y, tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cabs_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cabs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cabs(B(i))
-          if (abs(tmp - A(i))/tmp .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dabs_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dabs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dabs(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iabs_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iabs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iabs(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs14
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y, tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cdabs_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cdabs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cdabs(B(i))
-          if (abs(tmp - A(i))/tmp .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs15
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y, tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'zabs_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = zabs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = zabs(B(i))
-          if (abs(tmp - A(i))/tmp .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine acos1
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'acos_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = acos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = acos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine acos2
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'acos_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = acos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = acos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine acos3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dacos_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dacos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dacos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine acosh1
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'acosh_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = acosh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = acosh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine acosh2
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'acosh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = acosh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = acosh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine acosh3
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dacosh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dacosh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dacosh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine aimag1
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      character*24 tname
-      real A(N)
-      complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'aimag_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = aimag(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (aimag(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine aimag2
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      character*24 tname
-      real*8 A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'aimag_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = aimag(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (aimag(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine aimag3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      character*24 tname
-      real A(N)
-      complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'imag_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = imag(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (imag(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine aimag4
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      character*24 tname
-      real*8 A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'imag_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = imag(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (imag(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine aimag5
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      character*24 tname
-      real*8 A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dimag_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dimag(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dimag(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine asin1
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'asin_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = asin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = asin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine asin2
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'asin_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = asin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = asin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine asin3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dasin_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dasin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dasin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine asinh1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'asinh_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = asinh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = asinh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine asinh2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'asinh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = asinh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = asinh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine asinh3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dasinh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dasinh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dasinh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atan1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atan_float'
-      
-      
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atan2_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atan_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atan3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'datan_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = datan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = datan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atan21
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atan2_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W1 + S1
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atan2(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atan2(B(i), C(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atan22
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atan2_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W1 + S1
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atan2(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atan2(B(i), C(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atan23
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'datan2_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W1 + S1
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = datan2(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = datan2(B(i), C(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atanh1
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atanh_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atanh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atanh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine atanh2
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atanh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atanh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atanh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine atanh3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'datanh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = datanh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = datanh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_j01
-      integer, parameter :: N = 256, ER = N + 1, W = 20, S = -10
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_j0_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_j0(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_j0(B(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_j02
-      integer, parameter :: N = 256, ER = N + 1, W = 20, S = -10
-      real*8, parameter :: EPS = 1d-12
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_j0_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_j0(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_j0(B(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_j11
-      integer, parameter :: N = 256, ER = N + 1, W = 20, S = -10
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_j1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_j1(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_j1(B(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_j12
-      integer, parameter :: N = 256, ER = N + 1, W = 20, S = -10
-      real*8, parameter :: EPS = 1d-12
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_j1_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_j1(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_j1(B(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_jn1
-      integer, parameter :: N = 256, ER = N + 1, W1 = 19, S1 = 1, W2 = 
-     &20, S2 = -10
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), C(N)
-      integer B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_jn_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          call random_number(C(i))
-          B(i) = int(tmp * W1 + S1)
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_jn(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_jn(B(i), C(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_jn2
-      integer, parameter :: N = 256, ER = N + 1, W1 = 19, S1 = 1, W2 = 
-     &20, S2 = -10
-      real*8, parameter :: EPS = 1d-12
-      character*24 tname
-      real*8 A(N), C(N)
-      integer B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_jn_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          call random_number(C(i))
-          B(i) = int(tmp * W1 + S1)
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_jn(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_jn(B(i), C(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_y01
-      integer, parameter :: N = 256, ER = N + 1, W = 10, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_y0_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_y0(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_y0(B(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_y02
-      integer, parameter :: N = 256, ER = N + 1, W = 10, S = 1
-      real*8, parameter :: EPS = 1d-12
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_y0_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_y0(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_y0(B(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_y11
-      integer, parameter :: N = 256, ER = N + 1, W = 10, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_y1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_y1(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_y1(B(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_y12
-      integer, parameter :: N = 256, ER = N + 1, W = 10, S = 1
-      real*8, parameter :: EPS = 1d-12
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_y1_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_y1(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_y1(B(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_yn1
-      integer, parameter :: N = 256, ER = N + 1, W1 = 10, S1 = 0, W2 = 
-     &19, S2 = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), C(N)
-      integer B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_yn_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          call random_number(C(i))
-          B(i) = int(tmp * W1 + S1)
-          C(i) = C(i) * W2 + S2 + B(i)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_yn(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_yn(B(i), C(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine bessel_yn2
-      integer, parameter :: N = 256, ER = N + 1, W1 = 10, S1 = 0, W2 = 
-     &19, S2 = 1
-      real*8, parameter :: EPS = 1d-12
-      character*24 tname
-      real*8 A(N), C(N)
-      integer B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bessel_yn_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          call random_number(C(i))
-          B(i) = int(tmp * W1 + S1)
-          C(i) = C(i) * W2 + S2 + B(i)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bessel_yn(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(bessel_yn(B(i), C(i)) - A(i)) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine btest1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      logical*1 A(N)
-      integer*1 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'btest_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = btest(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (btest(B(i), C(i)) .neqv. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine btest2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      logical*2 A(N)
-      integer*2 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'btest_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = btest(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (btest(B(i), C(i)) .neqv. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine btest3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      logical*4 A(N)
-      integer*4 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'btest_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = btest(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (btest(B(i), C(i)) .neqv. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine btest4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      logical*8 A(N)
-      integer*8 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'btest_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = btest(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (btest(B(i), C(i)) .neqv. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      integer B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      real B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      real*8 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      integer B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_long_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i), C(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      real B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_float_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W + S
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i), C(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      real*8 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_double_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W + S
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i), C(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      integer B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_long_long_4'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i), C(i), 4)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i), C(i), 4) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx10
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      real B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_float_float_4'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W + S
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i), C(i), 4)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i), C(i), 4) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx11
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N)
-      real*8 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_double_double_4'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W + S
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i), C(i), 4)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i), C(i), 4) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx12
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      integer B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_long_long_8'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i), C(i), 8)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i), C(i), 8) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx13
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      real B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_float_float_8'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W + S
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i), C(i), 8)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i), C(i), 8) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx14
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      real*8 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cmplx_double_double_8'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W + S
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cmplx(B(i), C(i), 8)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (cmplx(B(i), C(i), 8) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx15
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      integer B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcmplx_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dcmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx16
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      real B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcmplx_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dcmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx17
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      real*8 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcmplx_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dcmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx18
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcmplx_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dcmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx19
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcmplx_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcmplx(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dcmplx(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx20
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      integer B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcmplx_long_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcmplx(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dcmplx(B(i), C(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx21
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      real B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcmplx_float_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W + S
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcmplx(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dcmplx(B(i), C(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cmplx22
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N)
-      real*8 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcmplx_double_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W + S
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcmplx(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dcmplx(B(i), C(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine conjg1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'conjg_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = conjg(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (conjg(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine conjg2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'conjg_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = conjg(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (conjg(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine conjg3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      double complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dconjg_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dconjg(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dconjg(B(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cos1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cos_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cos2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cos_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cos3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      complex tmp
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cos_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cos4
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cos_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cos5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcos_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dcos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cos6
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ccos_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ccos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = ccos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cos7
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cdcos_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cdcos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cdcos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cos8
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'zcos_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = zcos(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = zcos(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cosh1
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cosh_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cosh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cosh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cosh2
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cosh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cosh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cosh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cosh3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcosh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcosh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dcosh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dble1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*1 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dble_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dble(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dble(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dble2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*2 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dble_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dble(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dble(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dble3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*4 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dble_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dble(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dble(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dble4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*8 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dble_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dble(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dble(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dble5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      real B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dble_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dble(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dble(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dble6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dble_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dble(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dble(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dble7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dble_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dble(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dble(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dble8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dble_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dble(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dble(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dfloat1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*1 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dfloat_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dfloat(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dfloat(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dfloat2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*2 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dfloat_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dfloat(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dfloat(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dfloat3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*4 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dfloat_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dfloat(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dfloat(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dfloat4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*8 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dfloat_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dfloat(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dfloat(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dim_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dim_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dim_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dim_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dim_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dim_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim13
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ddim_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ddim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ddim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dprod1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N)
-      real B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dprod_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dprod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dprod(B(i), C(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dreal1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dreal_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dreal(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dreal(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-!! it does not work with D(i) == 0 && 64 with Intel 2015
-      subroutine dshiftl1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dshiftl_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = 1 + int(tmp * 62)  !!! HERE
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dshiftl(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dshiftl(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-!! it does not work with D(i) == 0 && 64 with Intel 2015
-      subroutine dshiftr1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dshiftr_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = 1 + int(tmp * 62)  !!! HERE
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dshiftr(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dshiftr(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine erf1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'erf_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = erf(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = erf(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine erf2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'erf_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = erf(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = erf(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine erf3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'derf_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = derf(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = derf(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine erfc1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'erfc_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = erfc(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = erfc(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine erfc2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'erfc_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = erfc(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = erfc(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine erfc3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'derfc_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = derfc(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = derfc(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine erfc_scaled1
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'erfc_scaled_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = erfc_scaled(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = erfc_scaled(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine erfc_scaled2
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'erfc_scaled_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = erfc_scaled(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = erfc_scaled(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine exp1
-      integer, parameter :: N = 256, ER = N + 1, W = 4, S = -2
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'exp_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = exp(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = exp(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine exp2
-      integer, parameter :: N = 256, ER = N + 1, W = 4, S = -2
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'exp_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = exp(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = exp(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine exp3
-      integer, parameter :: N = 256, ER = N + 1, W = 4, S = -2
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'exp_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = exp(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = exp(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine exp4
-      integer, parameter :: N = 256, ER = N + 1, W = 4, S = -2
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'exp_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = exp(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = exp(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine exp5
-      integer, parameter :: N = 256, ER = N + 1, W = 4, S = -2
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dexp_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dexp(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dexp(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine exp6
-      integer, parameter :: N = 256, ER = N + 1, W = 4, S = -2
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cexp_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cexp(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cexp(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine exp7
-      integer, parameter :: N = 256, ER = N + 1, W = 4, S = -2
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cdexp_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cdexp(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cdexp(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine exp8
-      integer, parameter :: N = 256, ER = N + 1, W = 4, S = -2
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 x, y
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'zexp_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = zexp(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = zexp(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine gamma1
-      integer, parameter :: N = 256, ER = N + 1, W = 3, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'gamma_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = gamma(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = gamma(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine gamma2
-      integer, parameter :: N = 256, ER = N + 1, W = 3, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'gamma_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = gamma(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = gamma(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine hypot1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hypot_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hypot(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = hypot(B(i), C(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine hypot2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hypot_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hypot(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = hypot(B(i), C(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iand_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iand(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iand(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iand_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iand(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iand(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iand_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iand(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iand(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iand_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iand(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iand(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'and_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = and(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (and(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'and_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = and(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (and(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'and_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = and(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (and(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'and_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = and(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (and(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibclr1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibclr_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibclr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibclr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibclr2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibclr_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibclr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibclr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibclr3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibclr_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibclr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibclr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibclr4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibclr_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibclr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibclr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibits1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibits_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * (bit_size(D(i)) + 1))
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1 - D(i)))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibits2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibits_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * (bit_size(D(i)) + 1))
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1 - D(i)))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibits3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibits_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * (bit_size(D(i)) + 1))
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1 - D(i)))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibits4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibits_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * (bit_size(D(i)) + 1))
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1 - D(i)))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibset1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibset_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibset(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibset(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibset2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibset_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibset(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibset(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibset3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibset_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibset(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibset(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibset4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibset_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibset(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibset(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ieor_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ieor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ieor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ieor_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ieor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ieor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ieor_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ieor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ieor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ieor_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ieor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ieor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'xor_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = xor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (xor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor10
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'xor_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = xor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (xor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor11
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'xor_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = xor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (xor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor12
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'xor_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = xor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (xor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-      intrinsic ior
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ior_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ior(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ior(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-      intrinsic ior
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ior_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ior(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ior(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-      intrinsic ior
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ior_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ior(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ior(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-      intrinsic ior
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ior_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ior(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ior(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'or_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = or(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (or(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'or_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = or(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (or(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'or_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = or(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (or(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'or_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = or(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (or(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishft1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishft_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishft2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishft_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishft3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishft_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishft4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishft_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine lshift1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'lshift_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = lshift(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (lshift(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine lshift2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'lshift_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = lshift(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (lshift(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine lshift3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'lshift_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = lshift(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (lshift(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine lshift4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'lshift_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = lshift(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (lshift(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine rshift1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'rshift_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = rshift(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (rshift(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine rshift2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'rshift_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = rshift(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (rshift(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine rshift3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'rshift_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = rshift(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (rshift(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine rshift4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'rshift_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = rshift(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (rshift(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishftc_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishftc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishftc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishftc_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishftc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishftc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishftc_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishftc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishftc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishftc_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishftc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishftc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishftc_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * bit_size(D(i)) + 1)
-          call random_number(tmp)
-          C(i) = int(tmp * D(i))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishftc(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishftc(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishftc_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * bit_size(D(i)) + 1)
-          call random_number(tmp)
-          C(i) = int(tmp * D(i))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishftc(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishftc(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishftc_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * bit_size(D(i)) + 1)
-          call random_number(tmp)
-          C(i) = int(tmp * D(i))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishftc(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishftc(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishftc_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * bit_size(D(i)) + 1)
-          call random_number(tmp)
-          C(i) = int(tmp * D(i))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishftc(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishftc(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log1
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log2
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log3
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log4
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log5
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'alog_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = alog(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = alog(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log6
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dlog_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dlog(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dlog(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log7
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'clog_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = clog(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = clog(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log8
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cdlog_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cdlog(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cdlog(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log9
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'zlog_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = zlog(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = zlog(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log101
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log10_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log10(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log10(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log102
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log10_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log10(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log10(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log105
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'alog10_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = alog10(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = alog10(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log106
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dlog10_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dlog10(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dlog10(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log_gamma1
-      integer, parameter :: N = 256, ER = N + 1, W = 3, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log_gamma_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log_gamma(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log_gamma(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log_gamma2
-      integer, parameter :: N = 256, ER = N + 1, W = 3, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log_gamma_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log_gamma(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log_gamma(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max1_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'max_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = max(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (max(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max2_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'max_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = max(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (max(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max3_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'max_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = max(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (max(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max4_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'max_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = max(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (max(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max5_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'max_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = max(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (max(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max6_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'max_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = max(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (max(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max7_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'max0_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = max0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (max0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max8_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'amax1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = amax1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (amax1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max9_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dmax1_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dmax1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dmax1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max13_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N)
-      real B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'max1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = max1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (max1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max17_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*4 B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'amax0_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = amax0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (amax0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-
-C -------------------------------------------------
-
-      subroutine merge_bits1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'merge_bits_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = merge_bits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (merge_bits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine merge_bits2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'merge_bits_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = merge_bits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (merge_bits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine merge_bits3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'merge_bits_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = merge_bits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (merge_bits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine merge_bits4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'merge_bits_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = merge_bits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (merge_bits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min1_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'min_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = min(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (min(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min2_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'min_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = min(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (min(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min3_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'min_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = min(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (min(B(i), C(i), D(i)) .ne. A(i)) then
-              if (i < erri) then
-                   erri = i
-              endif
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min4_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'min_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = min(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (min(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min5_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'min_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = min(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (min(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min6_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'min_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = min(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (min(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min7_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'min0_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = min0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (min0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min8_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'amin1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = amin1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (amin1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min9_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dmin1_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dmin1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dmin1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min13_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N)
-      real B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'min1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = min1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (min1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min17_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*4 B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'amin0_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = amin0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (amin0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod1
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'mod_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = mod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (mod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod2
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'mod_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = mod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (mod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod3
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'mod_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = mod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (mod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod4
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'mod_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = mod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (mod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod10
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      real A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'amod_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = amod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (amod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod11
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dmod_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dmod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dmod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine modulo1
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'modulo_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = modulo(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (modulo(B(i), C(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine modulo2
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'modulo_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = modulo(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (modulo(B(i), C(i)) .ne. A(i)) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine modulo3
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'modulo_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = modulo(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (modulo(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine modulo4
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'modulo_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = modulo(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (modulo(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine modulo5
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      real, parameter :: EPS = 1e-5
-      character*24 tname
-      real A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'modulo_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W1 + S1
-          call random_number(C(i))
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = modulo(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(modulo(B(i), C(i)) - A(i)) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine modulo6
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      real*8, parameter :: EPS = 1d-12
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'modulo_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W1 + S1
-          call random_number(C(i))
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = modulo(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (abs(modulo(B(i), C(i)) - A(i)) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine not1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'not_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = not(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (not(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine not2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'not_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = not(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (not(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine not3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'not_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = not(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (not(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine not4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'not_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = not(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (not(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine popcnt1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'popcnt_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = popcnt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (popcnt(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine popcnt2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'popcnt_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = popcnt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (popcnt(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine popcnt3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'popcnt_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = popcnt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (popcnt(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine popcnt4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'popcnt_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = popcnt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (popcnt(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine poppar1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'poppar_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = poppar(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (poppar(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine poppar2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'poppar_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = poppar(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (poppar(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine poppar3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'poppar_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = poppar(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (poppar(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine poppar4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'poppar_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = poppar(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (poppar(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*1 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'real_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = real(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (real(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*2 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'real_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = real(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (real(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*4 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'real_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = real(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (real(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*8 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'real_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = real(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (real(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      real B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'real_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = real(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (real(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'real_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = real(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (real(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'real_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = real(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (real(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      double complex B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real x, y
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'real_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = real(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (real(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real10
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*4 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'float_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = float(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (float(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real13
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      real B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sngl_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sngl(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (sngl(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real14
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sngl_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sngl(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (sngl(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shifta1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shifta_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shifta(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shifta(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shifta2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shifta_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shifta(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shifta(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shifta3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shifta_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shifta(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shifta(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shifta4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shifta_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shifta(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shifta(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shiftl1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shiftl_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shiftl(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shiftl(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shiftl2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shiftl_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shiftl(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shiftl(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shiftl3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shiftl_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shiftl(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shiftl(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shiftl4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shiftl_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shiftl(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shiftl(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shiftr1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shiftr_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shiftr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shiftr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shiftr2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shiftr_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shiftr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shiftr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shiftr3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shiftr_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shiftr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shiftr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine shiftr4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'shiftr_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = shiftr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (shiftr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sign_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (sign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sign_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (sign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sign_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (sign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sign_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (sign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sign_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (sign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sign_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (sign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'isign_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = isign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (isign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign16
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dsign_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dsign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dsign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sin1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sin_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sin2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sin_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sin3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sin_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sin4
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sin_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sin5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dsin_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dsin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dsin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sin6
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'csin_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = csin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = csin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sin7
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cdsin_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cdsin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cdsin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sin8
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'zsin_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = zsin(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = zsin(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sinh1
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sinh_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sinh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sinh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sinh2
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sinh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sinh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sinh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sinh3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dsinh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dsinh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dsinh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sqrt1
-      integer, parameter :: N = 256, ER = N + 1, W = 100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sqrt_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sqrt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sqrt(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sqrt2
-      integer, parameter :: N = 256, ER = N + 1, W = 100, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sqrt_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sqrt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sqrt(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sqrt3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sqrt_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sqrt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sqrt(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sqrt4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sqrt_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sqrt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sqrt(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sqrt5
-      integer, parameter :: N = 256, ER = N + 1, W = 100, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dsqrt_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dsqrt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dsqrt(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sqrt6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'csqrt_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = csqrt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = csqrt(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sqrt7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cdsqrt_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cdsqrt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cdsqrt(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sqrt8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'zsqrt_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = zsqrt(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = zsqrt(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tan1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'tan_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = tan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = tan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tan2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'tan_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = tan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = tan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tan3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'tan_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = tan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = tan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tan4
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'tan_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = tan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = tan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tan5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dtan_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dtan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dtan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tanh1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'tanh_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = tanh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = tanh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tanh2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'tanh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = tanh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = tanh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tanh3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dtanh_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dtanh(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dtanh(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine trailz1
-      integer, parameter :: N = 256, ER = N + 1, W = 8
-      character*24 tname
-      integer*1 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'trailz_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = 2 ** int(tmp * W)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = trailz(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (trailz(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine trailz2
-      integer, parameter :: N = 256, ER = N + 1, W = 16
-      character*24 tname
-      integer*2 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'trailz_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = 2 ** int(tmp * W)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = trailz(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (trailz(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine trailz3
-      integer, parameter :: N = 256, ER = N + 1, W = 32
-      character*24 tname
-      integer*4 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'trailz_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = 2 ** int(tmp * W)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = trailz(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (trailz(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine trailz4
-      integer, parameter :: N = 256, ER = N + 1, W = 64
-      character*24 tname
-      integer*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'trailz_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = 2 ** int(tmp * W)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = trailz(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (trailz(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*24 name
-      print *, name, '  -  complete'
-      end
-
-      subroutine ansno(name)
-      character*24 name
-      print *, name, '  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math_intel.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math_intel.fdv
deleted file mode 100644
index a14a3f0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_math_intel.fdv
+++ /dev/null
@@ -1,9645 +0,0 @@
-
-      program INTRINSICS
-      print *, '=== START OF F2C_MATH intrinsic test ==========='
-
-c     TESTING abs SPECIFIC INTRINSIC
-c     integer*1 babs(integer*1)
-      call abs9
-c     integer*2 iiabs(integer*2)
-      call abs10
-c     integer*2 habs(integer*2)
-      call abs11
-c     integer*4 jiabs(integer*4)
-      call abs12
-c     integer*8 kiabs(integer*8)
-      call abs13
-
-c     TESTING acosd GENERIC INTRINSIC
-c     real*4 acosd(real*4)
-      call acosd1
-c     real*8 acosd(real*8)
-      call acosd2
-c     real*8 dacosd(real*8)
-      call acosd3
-
-c     TESTING asind GENERIC INTRINSIC
-c     real*4 asind(real*4)
-      call asind1
-c     real*8 asind(real*8)
-      call asind2
-c     real*8 dasind(real*8)
-      call asind3
-
-c     TESTING atand GENERIC INTRINSIC
-c     real*4 atand(real*4)
-      call atand1
-c     real*8 atand(real*8)
-      call atand2
-c     real*8 datand(real*8)
-      call atand3
-
-c     TESTING atan2d GENERIC INTRINSIC
-c     real*4 atan2d(real*4, real*4)
-      call atan2d1
-c     real*8 atan2d(real*8, real*8)
-      call atan2d2
-c     real*8 datan2d(real*8, real*8)
-      call atan2d3
-
-c     TESTING btest SPECIFIC INTRINSIC
-c     logical*1 bbtest(integer*1)
-      call btest5
-c     logical*2 bitest(integer*2)
-      call btest6
-c     logical*2 htest(integer*2)
-      call btest7
-c     logical*4 bjtest(integer*4)
-      call btest8
-c     logical*8 bktest(integer*8)
-      call btest9
-
-c     TESTING cosd GENERIC INTRINSIC
-c     real*4 cosd(real*4)
-      call cosd1
-c     real*8 cosd(real*8)
-      call cosd2
-c     real*8 dcosd(real*8)
-      call cosd3
-
-c     TESTING cotan GENERIC INTRINSIC
-c     real*4 cotan(real*4)
-      call cotan1
-c     real*8 cotan(real*8)
-      call cotan2
-c     real*8 dcotan(real*8)
-      call cotan3
-
-c     TESTING cotand GENERIC INTRINSIC
-c     real*4 cotand(real*4)
-      call cotand1
-c     real*8 cotand(real*8)
-      call cotand2
-c     real*8 dcotand(real*8)
-      call cotand3
-
-c     TESTING dfloat SPECIFIC INTRINSIC
-c     real*8 dfloti(integer*2)
-      call dfloat5
-c     real*8 dflotj(integer*4)
-      call dfloat6
-c     real*8 dflotk(integer*8)
-      call dfloat7
-
-c     TESTING dim SPECIFIC INTRINSIC
-c     integer*1 bdim(integer*1)
-      call dim7
-c     integer*2 iidim(integer*2)
-      call dim8
-c     integer*2 hdim(integer*2)
-      call dim9
-c     integer*4 idim(integer*4)
-      call dim10
-c     integer*4 jidim(integer*4)
-      call dim11
-c     integer*8 kidim(integer*8)
-      call dim12
-
-c     TESTING iand SPECIFIC INTRINSIC
-c     integer*1 biand(integer*1)
-      call iand9
-c     integer*2 iiand(integer*2)
-      call iand10
-c     integer*2 hiand(integer*2)
-      call iand11
-c     integer*4 jiand(integer*4)
-      call iand12
-c     integer*8 kiand(integer*8)
-      call iand13
-
-c     TESTING ibchng GENERIC INTRINSIC
-c     integer*1 ibchng(integer*1)
-      call ibchng1
-c     integer*2 ibchng(integer*2)
-      call ibchng2
-c     integer*4 ibchng(integer*4)
-      call ibchng3
-c     integer*8 ibchng(integer*8)
-      call ibchng4
-
-c     TESTING ibclr SPECIFIC INTRINSIC
-c     integer*1 bbclr(integer*1)
-      call ibclr5
-c     integer*2 iibclr(integer*2)
-      call ibclr6
-c     integer*2 hbclr(integer*2)
-      call ibclr7
-c     integer*4 jibclr(integer*4)
-      call ibclr8
-c     integer*8 kibclr(integer*8)
-      call ibclr9
-
-c     TESTING ibits SPECIFIC INTRINSIC
-c     integer*1 bbits(integer*1)
-      call ibits5
-c     integer*2 iibits(integer*2)
-      call ibits6
-c     integer*2 hbits(integer*2)
-      call ibits7
-c     integer*4 jibits(integer*4)
-      call ibits8
-c     integer*8 kibits(integer*8)
-      call ibits9
-
-c     TESTING ibset SPECIFIC INTRINSIC
-c     integer*1 bbset(integer*1)
-      call ibset5
-c     integer*2 iibset(integer*2)
-      call ibset6
-c     integer*2 hbset(integer*2)
-      call ibset7
-c     integer*4 jibset(integer*4)
-      call ibset8
-c     integer*8 kibset(integer*8)
-      call ibset9
-
-c     TESTING ieor GENERIC INTRINSIC
-c     integer*1 ixor(integer*1)
-      call ieor5
-c     integer*2 ixor(integer*2)
-      call ieor6
-c     integer*4 ixor(integer*4)
-      call ieor7
-c     integer*8 ixor(integer*8)
-      call ieor8
-c     integer*1 bieor(integer*1)
-      call ieor13
-c     integer*1 bixor(integer*1)
-      call ieor14
-c     integer*2 iieor(integer*2)
-      call ieor15
-c     integer*2 hieor(integer*2)
-      call ieor16
-c     integer*2 iixor(integer*2)
-      call ieor17
-c     integer*2 hixor(integer*2)
-      call ieor18
-c     integer*4 jieor(integer*4)
-      call ieor19
-c     integer*4 jixor(integer*4)
-      call ieor20
-c     integer*8 kieor(integer*8)
-      call ieor21
-
-c     TESTING ilen GENERIC INTRINSIC
-c     integer*1 ilen(integer*1)
-      call ilen1
-c     integer*2 ilen(integer*2)
-      call ilen2
-c     integer*4 ilen(integer*4)
-      call ilen3
-c     integer*8 ilen(integer*8)
-      call ilen4
-
-c     TESTING ior SPECIFIC INTRINSIC
-c     integer*1 bior(integer*1)
-      call ior9
-c     integer*2 iior(integer*2)
-      call ior10
-c     integer*2 hior(integer*2)
-      call ior11
-c     integer*4 jior(integer*4)
-      call ior12
-c     integer*8 kior(integer*8)
-      call ior13
-
-c     TESTING isha GENERIC INTRINSIC
-c     integer*1 isha(integer*1)
-      call isha1
-c     integer*2 isha(integer*2)
-      call isha2
-c     integer*4 isha(integer*4)
-      call isha3
-c     integer*8 isha(integer*8)
-      call isha4
-
-c     TESTING ishc GENERIC INTRINSIC
-c     integer*1 ishc(integer*1)
-      call ishc1
-c     integer*2 ishc(integer*2)
-      call ishc2
-c     integer*4 ishc(integer*4)
-      call ishc3
-c     integer*8 ishc(integer*8)
-      call ishc4
-
-c     TESTING ishft GENERIC INTRINSIC
-c     integer*1 bshft(integer*1)
-      call ishft5
-c     integer*2 iishft(integer*2)
-      call ishft6
-c     integer*2 hshft(integer*2)
-      call ishft7
-c     integer*4 jishft(integer*4)
-      call ishft8
-c     integer*8 kishft(integer*8)
-      call ishft9
-
-c     TESTING lshft GENERIC INTRINSIC
-c     integer*1 lshft(integer*1)
-      call lshft1
-c     integer*2 lshft(integer*2)
-      call lshft2
-c     integer*4 lshft(integer*4)
-      call lshft3
-c     integer*8 lshft(integer*8)
-      call lshft4
-
-c     TESTING rshft GENERIC INTRINSIC
-c     integer*1 rshft(integer*1)
-      call rshft1
-c     integer*2 rshft(integer*2)
-      call rshft2
-c     integer*4 rshft(integer*4)
-      call rshft3
-c     integer*8 rshft(integer*8)
-      call rshft4
-
-c     TESTING ishftc SPECIFIC INTRINSIC
-c     integer*1 bshftc(integer*1)
-      call ishftc9
-c     integer*1 bshftc(integer*1)
-      call ishftc10
-c     integer*2 iishftc(integer*2)
-      call ishftc11
-c     integer*2 iishftc(integer*2)
-      call ishftc12
-c     integer*2 hshftc(integer*2)
-      call ishftc13
-c     integer*2 hshftc(integer*2)
-      call ishftc14
-c     integer*4 jishftc(integer*4)
-      call ishftc15
-c     integer*4 jishftc(integer*4)
-      call ishftc16
-c     integer*8 kishftc(integer*8)
-      call ishftc17
-c     integer*8 kishftc(integer*8)
-      call ishftc18
-
-c     TESTING ishl GENERIC INTRINSIC
-c     integer*1 ishl(integer*1)
-      call ishl1
-c     integer*2 ishl(integer*2)
-      call ishl2
-c     integer*4 ishl(integer*4)
-      call ishl3
-c     integer*8 ishl(integer*8)
-      call ishl4
-                                    
-c     TESTING log10 GENERIC INTRINSIC
-c     complex*8 log10(complex*8)
-      call log103
-c     complex*16 log10(complex*16)
-      call log104 
-c     complex*8 clog10(complex*8)
-      call log107
-c     complex*16 cdlog10(complex*16)
-      call log108
-
-c     TESTING max SPECIFIC INTRINSIC
-c     integer*2 imax0(integer*2)
-      call max10_
-c     integer*4 jmax0(integer*4)
-      call max11_
-c     integer*8 kmax0(integer*8)
-      call max12_
-c     integer*2 imax1(real*4)
-      call max14_
-c     integer*4 jmax1(real*4)
-      call max15_
-c     integer*8 kmax1(real*4)
-      call max16_
-c     real*4 aimax0(integer*2)
-      call max18_
-c     real*4 ajmax0(integer*4)
-      call max19_
-c     real*4 akmax0(integer*8)
-      call max20_
-
-c     TESTING min SPECIFIC INTRINSIC
-c     integer*2 imin0(integer*2)
-      call min10_
-c     integer*4 jmin0(integer*4)
-      call min11_
-c     integer*8 kmin0(integer*8)
-      call min12_
-
-c     integer*2 imin1(real*4)
-      call min14_
-c     integer*4 jmin1(real*4)
-      call min15_
-c     integer*8 kmin1(real*4)
-      call min16_
-c     real*4 aimin0(integer*2)
-
-      call min18_
-c     real*4 ajmin0(integer*4)
-      call min19_
-c     real*4 akmin0(integer*8)
-      call min20_
-
-c     TESTING mod SPECIFIC INTRINSIC
-c     integer*1 bmod(integer*1)
-      call mod5
-c     integer*2 imod(integer*2)
-      call mod6
-c     integer*2 hmod(integer*2)
-      call mod7
-c     integer*4 jmod(integer*4)
-      call mod8
-c     integer*8 kmod(integer*8)
-      call mod9
-
-c     TESTING not SPECIFIC INTRINSIC
-c     integer*1 bnot(integer*1)
-      call not5
-c     integer*2 inot(integer*2)
-      call not6
-c     integer*2 hnot(integer*2)
-      call not7
-c     integer*4 jnot(integer*4)
-      call not8
-c     integer*8 knot(integer*8)
-      call not9
-
-c     TESTING isign SPECIFIC INTRINSIC
-c     integer*1 isign(integer*1)
-      call sign7
-c     integer*2 isign(integer*2)
-      call sign8
-c     integer*8 isign(integer*8)
-      call sign10
-c     integer*1 bsign(integer*1)
-      call sign11
-c     integer*2 iisign(integer*2)
-      call sign12
-c     integer*2 hsign(integer*2)
-      call sign13
-c     integer*4 jisign(integer*4)
-      call sign14
-c     integer*8 kisign(integer*8)
-      call sign15
-
-c     TESTING float SPECIFIC INTRINSIC
-c     real*4 floati(integer*2)
-      call real9
-c     real*4 floatj(integer*4)
-      call real11
-c     real*4 floatk(integer*8)
-      call real12
-
-
-c     TESTING tan SPECIFIC INTRINSIC
-c     complex*8 ctan(complex*8)
-      call tan6
-c     complex*16 cdtan(complex*16)
-      call tan7
-c     complex*16 ztan(complex*16)
-      call tan8
-
-c     TESTING sind SPECIFIC INTRINSIC
-c     real*4 sind(real*4)
-      call sind1
-c     real*8 sind(real*8)
-      call sind2
-c     real*8 dsind(real*8)
-      call sind3
-                       
-c     TESTING tand GENERIC INTRINSIC
-c     real*4 tand(real*4)
-      call tand1
-c     real*8 tand(real*8)
-      call tand2
-c     real*8 dtand(real*8)
-      call tand3
-
-
-      print *, '=== END OF F2C_MATH intrinsic test ============='
-      end
-
-C -------------------------------------------------
-
-      subroutine abs9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'babs_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = babs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (babs(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs10
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iiabs_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iiabs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iiabs(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs11
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'habs_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = habs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (habs(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs12
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jiabs_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jiabs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jiabs(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine abs13
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kiabs_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kiabs(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kiabs(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine acosd1
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'acosd_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = acosd(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = acosd(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine acosd2
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'acosd_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = acosd(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = acosd(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-             erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine acosd3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dacosd_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dacosd(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dacosd(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine asind1
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'asind_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = asind(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = asind(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine asind2
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'asind_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = asind(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = asind(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine asind3
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dasind_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dasind(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dasind(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-C -------------------------------------------------
-
-      subroutine atand1
-      integer, parameter :: N = 256, ER = N + 1, W = 100, S = 0
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atand_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atand(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atand(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atand2
-      integer, parameter :: N = 256, ER = N + 1, W = 100, S = 0
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atand_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atand(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atand(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine atand3
-      integer, parameter :: N = 256, ER = N + 1, W = 100, S = 0
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'datand_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = datand(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = datand(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-               erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine atan2d1
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atan2d_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W1 + S1
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atan2d(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atan2d(B(i), C(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atan2d2
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'atan2d_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W1 + S1
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = atan2d(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = atan2d(B(i), C(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine atan2d3
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'datan2d_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          call random_number(C(i))
-          B(i) = B(i) * W1 + S1
-          C(i) = C(i) * W2 + S2
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = datan2d(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = datan2d(B(i), C(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-             erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine btest5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      logical*1 A(N)
-      integer*1 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bbtest_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bbtest(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bbtest(B(i), C(i)) .neqv. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine btest6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      logical*2 A(N)
-      integer*2 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bitest_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bitest(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bitest(B(i), C(i)) .neqv. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine btest7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      logical*2 A(N)
-      integer*2 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'htest_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = htest(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (htest(B(i), C(i)) .neqv. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine btest8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      logical*4 A(N)
-      integer*4 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bjtest_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bjtest(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bjtest(B(i), C(i)) .neqv. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine btest9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      logical*8 A(N)
-      integer*8 B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bktest_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bktest(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bktest(B(i), C(i)) .neqv. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine cosd1
-      integer, parameter :: N = 256, ER = N + 1, W = 720, S = -360
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cosd_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cosd(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cosd(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cosd2
-      integer, parameter :: N = 256, ER = N + 1, W = 720, S = -360
-      real*8, parameter :: EPS = 1d-11
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cosd_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cosd(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cosd(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cosd3
-      integer, parameter :: N = 256, ER = N + 1, W = 720, S = -360
-      real*8, parameter :: EPS = 1d-11
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcosd_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcosd(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dcosd(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cotan1
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cotan_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cotan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cotan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cotan2
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cotan_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cotan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cotan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cotan3
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-11
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcotan_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcotan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dcotan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cotand1
-      integer, parameter :: N = 256, ER = N + 1, W = 120, S = 30
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cotand_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cotand(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cotand(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cotand2
-      integer, parameter :: N = 256, ER = N + 1, W = 120, S = 30
-      real*8, parameter :: EPS = 1d-11
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cotand_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cotand(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cotand(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine cotand3
-      integer, parameter :: N = 256, ER = N + 1, W = 120, S = 30
-      real*8, parameter :: EPS = 1d-12
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dcotand_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dcotand(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dcotand(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dfloat5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*2 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dfloti_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dfloti(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dfloti(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dfloat6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*4 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dflotj_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dflotj(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dflotj(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dfloat7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real*8 A(N)
-      integer*8 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dflotk_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dflotk(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (dflotk(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bdim_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bdim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bdim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iidim_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iidim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iidim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hdim_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hdim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hdim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim10
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'idim_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = idim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (idim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim11
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jidim_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jidim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jidim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine dim12
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kidim_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kidim(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kidim(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'biand_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = biand(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (biand(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand10
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iiand_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iiand(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iiand(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand11
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hiand_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hiand(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hiand(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand12
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jiand_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jiand(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jiand(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine iand13
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kiand_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kiand(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kiand(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibchng1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibchng_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibchng(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibchng(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine ibchng2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibchng_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibchng(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibchng(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine ibchng3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibchng_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibchng(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibchng(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine ibchng4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ibchng_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ibchng(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ibchng(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      end
-
-C -------------------------------------------------
-
-      subroutine ibclr5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bbclr_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bbclr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bbclr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibclr6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iibclr_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iibclr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iibclr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibclr7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hbclr_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hbclr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hbclr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibclr8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jibclr_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jibclr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jibclr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibclr9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kibclr_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kibclr(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kibclr(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibits5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bbits_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * (bit_size(D(i)) + 1))
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1 - D(i)))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bbits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bbits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibits6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iibits_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * (bit_size(D(i)) + 1))
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1 - D(i)))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iibits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iibits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibits7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hbits_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * (bit_size(D(i)) + 1))
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1 - D(i)))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hbits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hbits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibits8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jibits_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * (bit_size(D(i)) + 1))
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1 - D(i)))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jibits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jibits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibits9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kibits_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * (bit_size(D(i)) + 1))
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1 - D(i)))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kibits(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kibits(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibset5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bbset_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bbset(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bbset(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibset6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iibset_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iibset(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iibset(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibset7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hbset_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hbset(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hbset(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibset8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jibset_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jibset(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jibset(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ibset9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kibset_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kibset(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kibset(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ixor_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ixor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ixor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ixor_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ixor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ixor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ixor_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ixor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ixor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ixor_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ixor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ixor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor13
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bieor_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bieor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bieor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor14
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bixor_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bixor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bixor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor15
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iieor_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iieor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iieor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor16
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hieor_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hieor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hieor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor17
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iixor_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iixor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iixor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor18
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hixor_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hixor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hixor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor19
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jieor_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jieor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jieor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor20
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jixor_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jixor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jixor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ieor21
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kieor_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kieor(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kieor(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ilen1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ilen_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ilen(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ilen(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ilen2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ilen_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ilen(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ilen(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ilen3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ilen_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ilen(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ilen(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ilen4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ilen_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ilen(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ilen(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bior_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bior(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bior(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior10
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iior_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iior(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iior(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior11
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hior_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hior(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hior(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior12
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jior_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jior(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jior(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ior13
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-	  
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kior_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kior(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kior(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine isha1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'isha_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = isha(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (isha(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine isha2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'isha_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = isha(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (isha(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine isha3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'isha_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = isha(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (isha(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine isha4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'isha_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = isha(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (isha(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishc1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishc_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishc2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishc_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishc3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishc_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishc4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishc_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishft5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bshft_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishft6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iishft_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iishft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iishft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishft7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hshft_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishft8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jishft_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jishft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jishft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishft9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kishft_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kishft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kishft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine lshft1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'lshft_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = lshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (lshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine lshft2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'lshft_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = lshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (lshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine lshft3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'lshft_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = lshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (lshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine lshft4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'lshft_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = lshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (lshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine rshft1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'rshft_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = rshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (rshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine rshft2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'rshft_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = rshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (rshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine rshft3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'rshft_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = rshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (rshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine rshft4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'rshft_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = rshft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (rshft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bshftc_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bshftc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bshftc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc10
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bshftc_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * bit_size(D(i)) + 1)
-          call random_number(tmp)
-          C(i) = int(tmp * D(i))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bshftc(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bshftc(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc11
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iishftc_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iishftc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iishftc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc12
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iishftc_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * bit_size(D(i)) + 1)
-          call random_number(tmp)
-          C(i) = int(tmp * D(i))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iishftc(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iishftc(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc13
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hshftc_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hshftc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hshftc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc14
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hshftc_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * bit_size(D(i)) + 1)
-          call random_number(tmp)
-          C(i) = int(tmp * D(i))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hshftc(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hshftc(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc15
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jishftc_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (2 * bit_size(C(i)) + 1) - bit_size(C(i)))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jishft(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jishft(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc16
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jishftc_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * bit_size(D(i)) + 1)
-          call random_number(tmp)
-          C(i) = int(tmp * D(i))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jishftc(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jishftc(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc17
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kishftc_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kishftc(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kishftc(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishftc18
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kishftc_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * bit_size(D(i)) + 1)
-          call random_number(tmp)
-          C(i) = int(tmp * D(i))
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kishftc(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kishftc(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishl1
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishl_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishl(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishl(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishl2
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishl_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishl(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishl(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishl3
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishl_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishl(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishl(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ishl4
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ishl_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * (bit_size(C(i)) + 1))
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ishl(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ishl(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log103
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log10_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log10(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log10(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log104
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'log10_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = log10(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = log10(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log107
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'clog10_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = clog10(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = clog10(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine log108
-      integer, parameter :: N = 256, ER = N + 1, W = 99, S = 1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cdlog10_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cdlog10(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cdlog10(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max10_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'imax0_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = imax0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (imax0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max11_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jmax0_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jmax0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jmax0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max12_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kmax0_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kmax0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kmax0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max14_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N)
-      real B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'imax1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = imax1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (imax1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max15_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N)
-      real B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jmax1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jmax1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jmax1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max16_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N)
-      real B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kmax1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kmax1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kmax1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-C -------------------------------------------------
-
-      subroutine max18_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*2 B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'aimax0_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = aimax0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (aimax0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max19_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*4 B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ajmax0_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ajmax0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ajmax0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine max20_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*8 B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'akmax0_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = akmax0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (akmax0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min10_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'imin0_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = imin0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (imin0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min11_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jmin0_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jmin0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jmin0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min12_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kmin0_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kmin0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kmin0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-C -------------------------------------------------
-
-      subroutine min14_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N)
-      real B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'imin1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = imin1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (imin1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min15_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N)
-      real B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jmin1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jmin1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jmin1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min16_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N)
-      real B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kmin1_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-          call random_number(C(i))
-          C(i) = C(i) * W + S
-          call random_number(D(i))
-          D(i) = D(i) * W + S
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kmin1(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kmin1(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min18_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*2 B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'aimin0_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = aimin0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (aimin0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min19_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*4 B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ajmin0_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ajmin0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (ajmin0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine min20_
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*8 B(N), C(N), D(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'akmin0_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-          call random_number(tmp)
-          D(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C, D)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = akmin0(B(i), C(i), D(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (akmin0(B(i), C(i), D(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod5
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bmod_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bmod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bmod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod6
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'imod_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = imod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (imod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod7
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hmod_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hmod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hmod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod8
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jmod_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jmod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jmod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine mod9
-      integer, parameter :: N = 256, ER = N + 1, W1 = 200, S1 = -100, W2
-     & = 99, S2 = 1
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kmod_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W1 + S1)
-          call random_number(tmp)
-          C(i) = int(tmp * W2 + S2)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kmod(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kmod(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine not5
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bnot_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bnot(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bnot(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine not6
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'inot_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = inot(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (inot(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine not7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hnot_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hnot(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hnot(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine not8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jnot_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jnot(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jnot(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine not9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'knot_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = knot(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (knot(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign7
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'isign_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = isign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (isign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign8
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'isign_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = isign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (isign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign10
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'isign_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = isign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (isign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-C -------------------------------------------------
-
-      subroutine sign11
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*1 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'bsign_char'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = bsign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (bsign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign12
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'iisign_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = iisign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (iisign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign13
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*2 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'hsign_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = hsign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (hsign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign14
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*4 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'jisign_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = jisign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (jisign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sign15
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      integer*8 A(N), B(N), C(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'kisign_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-          call random_number(tmp)
-          C(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B, C)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = kisign(B(i), C(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (kisign(B(i), C(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real9
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*2 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'floati_short'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = floati(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (floati(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real11
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*4 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'floatj_long'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = floatj(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (floatj(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine real12
-      integer, parameter :: N = 256, ER = N + 1, W = 200, S = -100
-      character*24 tname
-      real A(N)
-      integer*8 B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'floatk_longlong'
-      erri = ER
-
-      do i = 1, N
-          call random_number(tmp)
-          B(i) = int(tmp * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = floatk(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri))
-      do i = 1, N
-          if (floatk(B(i)) .ne. A(i)) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-
-C -------------------------------------------------
-
-      subroutine tan6
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      complex A(N), B(N)
-      real x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ctan_complexf'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = cmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ctan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = ctan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tan7
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'cdtan_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = cdtan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = cdtan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tan8
-      integer, parameter :: N = 256, ER = N + 1, W = 2, S = -1
-      real*8, parameter :: EPS = 1d-15
-      character*24 tname
-      double complex A(N), B(N)
-      real*8 x, y
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      double complex tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'ztan_complexd'
-      erri = ER
-
-      do i = 1, N
-          call random_number(x)
-          call random_number(y)
-          B(i) = dcmplx(x * W + S, y * W + S)
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = ztan(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = ztan(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-
-C -------------------------------------------------
-
-      subroutine sind1
-      integer, parameter :: N = 256, ER = N + 1, W = 720, S = -360
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sind_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sind(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sind(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sind2
-      integer, parameter :: N = 256, ER = N + 1, W = 720, S = -360
-      real*8, parameter :: EPS = 1d-11
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'sind_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = sind(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = sind(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine sind3
-      integer, parameter :: N = 256, ER = N + 1, W = 720, S = -360
-      real*8, parameter :: EPS = 1d-11
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dsind_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dsind(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dsind(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tand1
-      integer, parameter :: N = 256, ER = N + 1, W = 720, S = -360
-      real, parameter :: EPS = 1e-6
-      character*24 tname
-      real A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'tand_float'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)	  
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = tand(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = tand(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tand2
-      integer, parameter :: N = 256, ER = N + 1, W = 720, S = -360
-      real*8, parameter :: EPS = 1d-11
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'tand_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = tand(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = tand(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine tand3
-      integer, parameter :: N = 256, ER = N + 1, W = 720, S = -360
-      real*8, parameter :: EPS = 1d-11
-      character*24 tname
-      real*8 A(N), B(N)
-      integer erri, i, asize, clock
-      integer, allocatable :: seed(:)
-      real*8 tmp
-
-!dvm$ distribute A(BLOCK)
-
-      call random_seed(size = asize)
-      allocate(seed(asize))
-      call system_clock(count = clock)
-      seed = clock + 37 * (/(i - 1, i = 1, asize)/)
-      call random_seed(put = seed)
-      deallocate(seed)
-
-      tname = 'dtand_double'
-      erri = ER
-
-      do i = 1, N
-          call random_number(B(i))
-          B(i) = B(i) * W + S
-      enddo
-
-!dvm$ actual(B)
-!dvm$ region
-!dvm$ parallel (i) on A(i)
-      do i = 1, N
-          A(i) = dtand(B(i))
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-
-!dvm$ parallel (i) on A(i), reduction(min(erri)), private(tmp)
-      do i = 1, N
-          tmp = dtand(B(i))
-          if (abs(tmp - A(i))/abs(tmp) .gt. EPS) then
-              erri = min(erri, i)
-          endif
-      enddo
-
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*24 name
-      print *, name, '  -  complete'
-      end
-
-      subroutine ansno(name)
-      character*24 name
-      print *, name, '  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_select.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_select.fdv
deleted file mode 100644
index 17a81a0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/f2c_select.fdv
+++ /dev/null
@@ -1,500 +0,0 @@
-      program SELECT_SIMPLE
-
-c    TESTING convert statement SELECT .       
-
-      print *,'===START OF F2C_SELECT ========================'
-C --------------------------------------------------
-c   normal select
-      call select_with_default
-c   only default node select
-      call select_only_default
-c   select without default node
-      call select_without_default
-c   select with interval
-      call select_interval
-c   select with multi interval
-      call select_multi_interval
-c   select with multi select
-      call select_multi_select
-      print *,'=== END OF F2C_SELECT ========================= '    
-      end
-
-C ----------------------------------------------------select11
-      subroutine select_with_default
-      integer, parameter :: AN1=8, ER=10000    
-      character*22 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-
-      tname='select_with_default'
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1, AN1
-        ia = A1(i)
-        select case( MOD( A1(i), 4 ) )
-        case(0)
-            ia = ia + 4
-        case(1)
-            ia = ia+3
-        case(2)
-            ia = ia+2
-        case default
-            ia = ia+1
-        end select  
-        A1(i) = ia*2+3
-      enddo
-!dvm$ end region   
-
-      do i=1, AN1
-        ia = B1(i)
-        select case( MOD( B1(i), 4 ) )
-        case(0)
-            ia = ia + 4
-        case(1)
-            ia = ia+3
-        case(2)
-            ia = ia+2
-        case default
-            ia = ia+1
-        end select    
-        B1(i) = ia*2+3
-      enddo
-      
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-      erri= ER
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-      deallocate (B1)
-
-      end
-C ----------------------------------------------------select12
-      subroutine select_only_default
-      integer, parameter :: AN1=8, ER=10000    
-      character*22 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-
-      tname='select_only_default'
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1, AN1
-        ia = A1(i)
-        select case( MOD( A1(i), 4) )
-          case default
-            ia = ia*A1(i)-15
-        end select    
-        A1(i) = ia
-      enddo
-!dvm$ end region   
-
-      do i=1, AN1
-        ia = B1(i)
-        select case( MOD( B1(i), 4) )
-          case default
-            ia = ia*B1(i)-15
-        end select    
-        B1(i) = ia
-      enddo
-      
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-      erri= ER
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-      deallocate (B1)
-
-      end
-
-C ----------------------------------------------------select13
-      subroutine select_without_default
-      integer, parameter :: AN1=8, ER=10000    
-      character*22 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-
-      tname='select_without_default'
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1, AN1
-        ia = A1(i)
-        select case( MOD( A1(i), 4 ) )
-        case(0)
-            ia = ia + 4
-        case(1)
-            ia = ia*2+3
-        case(2)
-            ia = ia*3-7
-        end select  
-        A1(i) = ia
-      enddo
-!dvm$ end region   
-
-      do i=1, AN1
-        ia = B1(i)
-        select case( MOD( B1(i), 4 ) )
-        case(0)
-            ia = ia + 4
-        case(1)
-            ia = ia*2+3
-        case(2)
-            ia = ia*3-7
-        end select  
-        B1(i) = ia
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-      erri= ER
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-      deallocate (B1)
-
-      end
-
-
-C ----------------------------------------------------select14
-      subroutine select_interval
-      integer, parameter :: AN1=8, ER=10000    
-      character*22 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-
-      tname='select_interval'
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1, AN1
-        ia = A1(i)
-        select case( MOD( A1(i), 20 ) )
-        case(:7)
-            ia = ia + 4
-        case(9:13)
-            ia = ia*2+3
-        case(16:)
-            ia = ia*3-7
-        case default
-            ia = A1(i)*1/8 +ia*A1(i)-ia
-        end select  
-        A1(i) = ia
-      enddo
-!dvm$ end region   
-
-      do i=1, AN1
-        ia = B1(i)
-        select case( MOD( B1(i), 20 ) )
-        case(:7)
-            ia = ia + 4
-        case(9:13)
-            ia = ia*2+3
-        case(16:)
-            ia = ia*3-7
-        case default
-            ia = B1(i)*1/8 +ia*B1(i)-ia
-        end select  
-        B1(i) = ia
-      enddo
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-      erri= ER
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-      deallocate (B1)
-
-      end
-
-C ----------------------------------------------------select15
-      subroutine select_multi_interval
-      integer, parameter :: AN1=8, ER=10000    
-      character*22 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-
-      tname='select_multi_interval'
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1, AN1
-        ia = A1(i)
-        select case( MOD( A1(i), 30 ) )
-        case(:4)
-            ia = ia + 4
-        case(9:13, 20:24, 5)
-            ia = ia*2+3
-        case(7, 17:19, 26: )
-            ia = ia*3-7
-        case default
-            ia = A1(i)*1/8 +ia*A1(i)-ia
-        end select  
-        A1(i) = ia
-      enddo
-!dvm$ end region   
-
-      do i=1, AN1
-        ia = B1(i)
-        select case( MOD( B1(i), 30 ) )
-        case(:4)
-            ia = ia + 4
-        case(9:13, 20:24, 5)
-            ia = ia*2+3
-        case(7, 17:19, 26: )
-            ia = ia*3-7
-        case default
-            ia = B1(i)*1/8 +ia*B1(i)-ia
-        end select  
-        B1(i) = ia
-      enddo
-      
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-      erri= ER
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-      deallocate (B1)
-
-      end
-C ----------------------------------------------------select16
-      subroutine select_multi_select
-      integer, parameter :: AN1=8, ER=10000    
-      character*22 tname
-      integer, allocatable :: A1(:)
-      integer, allocatable :: B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-
-      tname='select_multi_interval'
-      allocate (A1(AN1))
-      allocate (B1(AN1))
-      
-      do i=1,AN1
-            B1(i) =i     
-      enddo
-!dvm$ region
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1, AN1
-        ia = A1(i)
-        select case( MOD( A1(i), 30 ) )
-        case(:4)
-            ia = ia + 4
-        case(9:13, 20:24, 5)
-            ia = ia*2+3
-            select case(ia + min(A1(i) +7, A1(i)*A1(i)*1/4-19 ))
-            case(:10)
-                ia = max(ia, 19) + 7
-            case default
-                ia = ia/2 -9
-            case(17)
-                ia = ia+1
-            case(20:)
-                ia = A1(i)-7
-            end select
-        case(7, 17:19, 26: )
-            ia = ia*3-7
-        case default
-            ia = A1(i)*1/8 +ia*A1(i)-ia
-        end select  
-        A1(i) = ia
-      enddo
-!dvm$ end region   
-
-      do i=1, AN1
-        ia = B1(i)
-         select case( MOD( B1(i), 30 ) )
-        case(:4)
-            ia = ia + 4
-        case(9:13, 20:24, 5)
-            ia = ia*2+3
-            select case(ia + min(B1(i) +7, A1(i)*B1(i)*1/4-19 ))
-            case(:10)
-                ia = max(ia, 19) + 7
-            case default
-                ia = ia/2 -9
-            case(17)
-                ia = ia+1
-            case(20:)
-                ia = B1(i)-7
-            end select
-        case(7, 17:19, 26: )
-            ia = ia*3-7
-        case default
-            ia = B1(i)*1/8 +ia*B1(i)-ia
-        end select  
-        B1(i) = ia
-       enddo
-      
-      erri= ER
-!dvm$ get_actual(A1)
-!dvm$ parallel (i) on A1(i), reduction( min( erri ) )
-      do i=1,AN1
-            if ( abs(A1(i) - B1(i) ) .lt. 0.001 ) then         
-            else
-               erri = min(erri,i)
-            endif     
-      enddo
-      
-
-      erri= ER
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-      deallocate (B1)
-
-      end
-      
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*22 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*22 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/settings
deleted file mode 100644
index a80f859..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F2C/settings
+++ /dev/null
@@ -1 +0,0 @@
-DIMENSION_COUNT=0
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy11.fdv
deleted file mode 100644
index 1adfeb3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy11.fdv
+++ /dev/null
@@ -1,65 +0,0 @@
-      PROGRAM COPY11
-      PARAMETER (ERR=100, L=10, ITMAX=1)
-      INTEGER A(L),X(L), C(L),B(L),D(L)
-      INTEGER ERRI,i
-CDVM$ DISTRIBUTE (BLOCK) :: A
-CDVM$ ALIGN C(I) WITH A(I)
-CDVM$ ALIGN D(I) WITH A(I)
-
-CDVM$ ASYNCID GR
-      CHARACTER*7 tname
-      PRINT *,  '======== START OF COPY11  ========'
-      tname='COPY11'
-      ERRI= ERR
-      do I=1,L
-        X(I)=I
-      enddo
-      B(1)=X(1)*ITMAX
-      do I=2,L
-        B(I)=B(I-1)+X(I)
-        B(I)=ITMAX*B(I)
-      enddo
-
-CDVM$ ASYNCHRONOUS GR
-      D(:)=B(:)
-CDVM$ END ASYNCHRONOUS
-
-CDVM$ PARALLEL  ( I)   ON  A( I)
-      DO I =  1,  L
-        A( I)  =  I
-      ENDDO
-        
-      C(1)=A(1)
-                           
-      DO  IT = 1,  ITMAX
-CDVM$   PARALLEL (I) ON A( I), ACROSS(C(1:1))
-        DO I =  2, L
-          C(I) = C(I-1) + A(I)
-        ENDDO
-      ENDDO
-
-CDVM$ ASYNCWAIT GR
-
-CDVM$ PARALLEL (I) ON C(I), reduction (min(ERRI))
-      do i=1,L
-        if (D(i) .ne. C(i)) then     
-          ERRI = min (I,ERRI)
-        endif
-      enddo
-     
-      if (ERRI .eq.ERR) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      print *,'=== END OF COPY11 ======================'
-      end
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy21.fdv
deleted file mode 100644
index 08f64e9..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/copy21.fdv
+++ /dev/null
@@ -1,49 +0,0 @@
-      program copy21
-      parameter (ERR=10000, L=10)
-      integer A(L,L),X(L,L), C(L,L),B(L,L),D(L,L)
-      integer:: ERRI=ERR
-!DVM$ DISTRIBUTE (BLOCK,BLOCK) :: A
-!DVM$ ALIGN C(I,J) WITH A(I,J)
-!DVM$ ALIGN D(I,J) WITH A(I,J)
-
-      character*6:: tname ='copy21'
-      print *,'========  START OF copy21  =================='
-      
-      
-      do J=1,L
-      do I=1,L
-        X(I,J)=I+J
-      enddo
-      enddo 
-      B = 0
-      C(:,:)=B(:,:)
-      D(1:L,1) = X(1:L,1)
-      C(1:L,1) = D(1:L,1)
-
-
-!DVM$ PARALLEL (J,I) ON C(I,J), REDUCTION (min(ERRI))
-      do J=1,L
-      do I=1,L
-        if (J.eq.1 .and. X(I,1) .ne. C(I,1)) then     
-          ERRI = min (I,ERRI)
-        else  if(J.ne.1 .and. C(I,J) .ne. 0)  then
-          ERRI = min (I,ERRI)
-        endif        
-      enddo
-      enddo
-      if (ERRI .eq.ERR) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      print *,'======== END OF copy21 ======================'
-      end
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/module21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/module21.fdv
deleted file mode 100644
index d292a68..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/module21.fdv
+++ /dev/null
@@ -1,114 +0,0 @@
-       MODULE FOR_JAC
-         PARAMETER    (K=8,  ITMAX=20)
-         REAL AA(K,K), EPS, MAXEPS, BB(K,K)
-CDVM$    DISTRIBUTE (BLOCK, BLOCK) :: AA
-CDVM$    ALIGN BB(I,J) WITH  AA(I,J)
-       END MODULE
-
-       MODULE MOD1
-          USE  FOR_JAC
-       END MODULE
-
-       PROGRAM  MODULE21
-       USE MOD1,A=>AA,B=>BB  !FOR_JAC
-
-CDVM$  REDUCTION_GROUP REPS 
-       REAL A1(K,K), EPS1, B1(K,K)
-CDVM$  DISTRIBUTE (BLOCK, BLOCK) :: A1
-CDVM$  ALIGN B1(I,J) WITH A1(I,J)
-
-       PRINT *,  '======== START OF MODULE21  ========'
-CDVM$  SHADOW_GROUP  SA (A)
-C      creation of descriptor for operations with imported/exported 
-C      elements of array A
-       MAXEPS = 0.5E - 7
-
-CDVM$  PARALLEL  ( J, I)   ON  A( I,  J)
-       DO  J =  1,  K
-         DO  I =  1,  K
-             A( I,   J)  =  0.
-             IF(I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.K .OR. J.EQ.K) THEN
-                B(I,  J) = 0.
-             ELSE
-                B(I,  J)  = ( 1. + I + J )
-             ENDIF
-         ENDDO
-       ENDDO
-       DO  IT = 1,  ITMAX
-         EPS = 0.
-CDVM$    PARALLEL  ( J,  I)   ON  A( I,  J), SHADOW_START SA,
-CDVM$*   REDUCTION(REPS:MAX(EPS))
-C        the loops iteration order is changed: at first
-C        exported (boundary) elements of A are calculated and sent
-C        then internal elements of array A are calculated     
-         DO J =  2, K-1
-            DO I =  2,  K-1
-               EPS =  MAX  ( EPS,  ABS( B( I, J) - A( I, J)))
-               A( I, J) = B( I, J)
-            ENDDO
-         ENDDO
-
-CDVM$    REDUCTION_START  REPS
-CDVM$    PARALLEL  ( J,  I)  ON B( I,   J),  SHADOW_WAIT SA
-         DO  J =  2,  K-1
-            DO I =  2,  K-1
-               B(I, J) =   (A( I-1, J ) + A( I, J-1 ) + A( I+1, J ) +
-     *            A( I, J+1 ))/4 
-            ENDDO
-         ENDDO  
-CDVM$    REDUCTION_WAIT REPS
-         IF  (EPS .LT. MAXEPS) GO TO  3
-      ENDDO
-
-    3 CONTINUE
-CDVM$ PARALLEL  ( J, I)   ON  A( I,  J)
-C		nest of parallel loops for initialization of arrays
-       DO J =  1, K
-         DO I =  1, K
-             A1( I,   J)  =  0.
-             IF(I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.K .OR. J.EQ.K) THEN
-                B1(I,  J) = 0.
-             ELSE
-                B1(I,  J)  = ( 1. + I + J )
-             ENDIF
-         ENDDO
-       ENDDO
-       DO  IT = 1,  ITMAX
-         EPS1 = 0.
-CDVM$    PARALLEL  ( J,  I)   ON  A1( I,  J), 
-CDVM$*   REDUCTION (MAX(EPS1))
-         DO J =  2, K-1
-            DO I =  2,  K-1
-               EPS1 =  MAX (EPS1,  ABS(B1( I, J) - A1(I, J)))
-               A1(I, J) = B1( I, J)
-            ENDDO
-         ENDDO
-
-CDVM$    PARALLEL ( J, I) ON B1 (I,  J),  SHADOW_RENEW(A1)
-         DO  J =  2,  K-1
-            DO I =  2,  K-1
-               B1(I, J) = (A1 (I-1, J) + A1 (I, J-1) + A1 (I+1, J) +
-     *            A1( I, J+1 ))/4 
-            ENDDO
-         ENDDO  
-         IF  (EPS1 .LT. MAXEPS ) GO TO 4
-      ENDDO
-       
-    4 IF (EPS .EQ. EPS1) THEN
-          call ansyes('module21')
-      ELSE
-          call ansno('module21')
-      ENDIF
-      PRINT *,  '=== END OF MODULE21 =================='
-
-      END
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/settings
deleted file mode 100644
index 3ef2d72..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/settings
+++ /dev/null
@@ -1 +0,0 @@
-DVM_ONLY=1
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/type21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/type21.fdv
deleted file mode 100644
index f8d9a45..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/F95/type21.fdv
+++ /dev/null
@@ -1,89 +0,0 @@
-      program type21
-      integer(4),parameter:: n=4,m=4,l=4,err=100
-      real ,dimension (n,m,l):: a     
-      integer::k,p,q,err1,err2,err3
-      type OBJECT
-         character (15) name
-         integer st(n)
-         integer bl(n,m)
-         integer matr(n,m)
-      end type OBJECT
-
-      integer, dimension(n,m) :: a1, b, c
-      integer, dimension(n) :: qq
-
-CDVM$ distribute (BLOCK, *):: a1 
-CDVM$ align qq(i) with a1( i, *)
-CDVM$ align (i,j) with a1(i,j):: c,b
-      type(OBJECT) :: GR,OTD
-CDVM$ ASYNCID Y
-
-      print *,'====== START OF TYPE21 =========='
-! Testing of different variants of deffinitions a
-      do k=1,n
-        do p=1,m
-          do q=1,l
-             a(k,p,q)=10+k+p+q
-          end do
-        end do
-      end do
-      a=1; a(1:n,1:m,1:l)=10+n+m+l!!; print*,a
-      a=1; forall(k=1:n,p=1:m,q=1:l) a(k,p,q) = 10+k+p+q;
-      do k=1,n
-        do p=1,m
-          a1(k,p)=k
-        end do
-      end do
-      c=0
-
-CDVM$ ASYNCHRONOUS Y
-      qq(:)= a1(:,2)
-      b(:,:) = a1(:,:)
-      c(1:2,:) = a1(3:4,:)
-CDVM$ END ASYNCHRONOUS
-      GR%st=(/1,2,3,4/)
-
-      do k=1,n
-        do p=1,m
-          GR%matr(k,p)=k
-        end do
-      end do
-
-      GR%bl=reshape((/3,4,0,0,3,4,0,0,3,4,0,0,3,4,0,0/),(/4,4/))
-
-CDVM$ ASYNCWAIT Y
-      err1=err;err2=err;err3=err
-CDVM$ parallel(i) on qq(i),reduction (min(err1))
-      do i=1,n
-        if (qq(i) .ne. GR%st(i)) then        
-          err1 = min (i,err1)
-        endif 
-      enddo
-
-CDVM$ parallel(i,j) on a1(i,j), reduction (min(err2))
-      do i=1,n
-        do j=1,m
-          if (a1(i,j) .ne. GR%matr(i,j)) then     
-            err2 = min (i,err2)
-          endif
-        enddo
-      enddo
-
-CDVM$ parallel(i,j) on c(i,j), reduction (min(err3))
-      do i=1,n
-        do j=1,m
-           if (c(i,j) .ne.GR%bl(i,j)) then     
-             err3 = min (i,err3)
-           endif
-        enddo
-      enddo
-  
-      if ((err1 .ne. err).OR.(err2 .ne.err).OR.(err3.ne.err)) then
-      print *,'type21 - ***error '
-      else
-      print *,'type21 - complete'
-      endif
-      print *,'=== END OF TYPE21 ======================='
-
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrderived1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrderived1.fdv
deleted file mode 100644
index ba2ae4b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrderived1.fdv
+++ /dev/null
@@ -1,236 +0,0 @@
-      program DISTRDERIVED1
-!    Testing DISTRIBUTE and REDISTRIBUTE directives
-!            INDIRECT, DERIVED  distributions (format with range)
-	print *,'=== START OF distrderived1 ========================'
-      call distrderived11
- 1    print *,'=== END OF distrderived1 ========================= '    
-
-      end
-      subroutine distrderived11
-      parameter (L=10, ER=100000)
-      integer:: x_t, y_t, z_t, cur, erri = ER
-      integer, allocatable :: A(:), B(:), AS(:), BS(:)
-      integer, allocatable :: ibstart(:), ibend(:), ib(:)
-      integer, allocatable :: indir_x(:), indir_y(:), indir_z(:)
-      integer MAP(L*L*L)
-      character*14:: tname="distrderived11"
-!DVM$ TEMPLATE E(L*L*L)
-!DVM$ TEMPLATE :: E2(:)
-!DVM$ DISTRIBUTE :: E
-!DVM$ DISTRIBUTE :: E2
-!DVM$ ALIGN :: A,B
-!DVM$ ALIGN :: indir_x, indir_y,indir_z, ibstart, ibend
-!DVM$ ALIGN :: ib
-     
-      allocate(AS(L*L*L),BS(L*L*L))
-      call  distrderived11_s(AS,BS)
-      call fillMap(map,L,1)
-      allocate(A(L*L*L),B(L*L*L), ibstart(L*L*L), ibend(L*L*L))
-      allocate(indir_x(L*L*L), indir_y(L*L*L), indir_z(L*L*L))
-!DVM$ REDISTRIBUTE E(INDIRECT(map))
-!DVM$ REALIGN (I) WITH E(I) :: A,B,indir_x, indir_y,indir_z
-!DVM$ REALIGN (I) WITH E(I) :: ibstart, ibend
-      cur = 1
-      do i = 1,L*L*L
-        x_t = (i-1) / (L*L)
-        y_t = mod((i-1) / L, L)
-        z_t = mod(i-1, L)
-        indir_x(i) = x_t
-        indir_y(i) = y_t
-        indir_z(i) = z_t
-        ibstart(i) = cur
-        if (x_t.gt.0) cur = cur + 1
-        if (x_t.lt.L-1) cur = cur + 1
-        if (y_t.gt.0) cur = cur + 1
-        if (y_t.lt.L-1) cur = cur + 1
-        if (z_t.gt.0) cur = cur + 1
-        if (z_t.lt.L-1) cur = cur + 1
-        ibend(i) = cur - 1
-      enddo
-      allocate(ib(cur-1))
-!DVM$ TEMPLATE_CREATE(E2(cur-1))
-!DVM$ REDISTRIBUTE E2(DERIVED((ibstart(i):ibend(i)) with E(@i)))
-!DVM$ REALIGN (I) WITH E2(I) :: ib
-
-      cur = 1
-      do i = 1,L*L*L
-        x_t = (i-1) / (L*L)
-        y_t = mod((i-1) / L, L)
-        z_t = mod(i-1, L)
-        if (x_t.gt.0) then
-          ib(cur) = i - (L*L)
-          cur = cur + 1
-        endif
-        if (x_t.lt.L-1) then
-          ib(cur) = i+(L*L)
-          cur = cur + 1
-        endif
-        if (y_t.gt.0) then
-          ib(cur) = i-L
-          cur = cur + 1
-        endif
-        if (y_t.lt.L-1) then
-          ib(cur) = i+L
-          cur = cur + 1
-        endif
-        if (z_t.gt.0) then
-          ib(cur) = i-1
-          cur = cur + 1
-        endif
-        if (z_t.lt.L-1) then
-          ib(cur) = i+1
-          cur = cur + 1
-        endif
-      enddo
-
-!DVM$ LOCALIZE(ibstart => ib(:))
-!DVM$ LOCALIZE(ibend => ib(:))
-!DVM$ SHADOW_ADD(E((ib(ibstart(i):ibend(i))) with E(@i)) = "nei1")
-!DVM$&  include_to A
-!DVM$ LOCALIZE(ib => A(:))
-!DVM$ REGION
-!DVM$ PARALLEL (i) ON B(i)
-      do i = 1, L*L*L
-         if (indir_x(i) == 0 .or. indir_x(i) == L-1 .or.    
-     &       indir_y(i) == 0 .or. indir_y(i) == L-1 .or.    
-     &       indir_z(i) == 0 .or. indir_z(i) == L-1) then
-           A(i) = 0
-         else
-           A(i) = 4 + indir_x(i) + indir_y(i) + indir_z(i)
-         endif
-      enddo
-!DVM$ PARALLEL (i) ON B(i), SHADOW_RENEW(A)
-        do i = 1, L*L*L
-          if (indir_x(i) /= 0 .and. indir_x(i) /= L-1 .and.    
-     &        indir_y(i) /= 0 .and. indir_y(i) /= L-1 .and.    
-     &        indir_z(i) /= 0 .and. indir_z(i) /= L-1) then
-            B(i) = (A(ib(ibstart(i)))   + A(ib(ibstart(i)+1))  
-     &            + A(ib(ibstart(i)+2)) + A(ib(ibstart(i)+3))  
-     &            + A(ib(ibstart(i)+4)) + A(ib(ibstart(i)+5)))/ 6.0
-          endif
-        enddo
-!DVM$ PARALLEL (i) ON B(i), REDUCTION(min(erri))
-        do i = 1, L*L*L
-          if (indir_x(i) /= 0 .and. indir_x(i) /= L-1 .and.    
-     &        indir_y(i) /= 0 .and. indir_y(i) /= L-1 .and.    
-     &        indir_z(i) /= 0 .and. indir_z(i) /= L-1) then
-            if(B(i) .ne. BS(i)) erri =  min(erri, ABS(B(i)-BS(i)))
-          endif
-        enddo
-!DVM$ END REGION
-!DVM$ GET_ACTUAL(erri)
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate(ibstart,ibend)
-      deallocate(ib)
-      deallocate(A,B,indir_x,indir_y,indir_z)
-      end
-!-------------------------------------------------------------
-      subroutine fillMap(map,L,axis)
-      integer numproc
-      integer i,L,axis
-      integer map(L*L*L)
-      PROCESSORS_SIZE(axis) = 1
-      numproc = PROCESSORS_SIZE(axis)
-      do i = 1,L*L*L
-        map(i) = ((i-1) * numproc) / (L*L*L)
-      enddo
-      end
-!---------------------------------------------------------------
-      subroutine distrderived11_s(A,B)
-      parameter (L=10)
-      integer x_t, y_t, z_t, cur
-      integer:: A(L*L*L), B(L*L*L)
-      integer, allocatable :: ibstart(:), ibend(:), ib(:)
-      integer, allocatable :: indir_x(:), indir_y(:),indir_z(:)
-      allocate(ibstart(L*L*L), ibend(L*L*L))
-      allocate(indir_x(L*L*L), indir_y(L*L*L), indir_z(L*L*L))
-      cur = 1
-      do i = 1,L*L*L
-	x_t = (i-1) / (L*L)
-	y_t = mod((i-1) / L, L)
-	z_t = mod(i-1, L)
-	indir_x(i) = x_t
-	indir_y(i) = y_t
-	indir_z(i) = z_t
-	ibstart(i) = cur
-	if (x_t.gt.0) cur = cur + 1
-	if (x_t.lt.L-1) cur = cur + 1
-	if (y_t.gt.0) cur = cur + 1
-	if (y_t.lt.L-1) cur = cur + 1
-	if (z_t.gt.0) cur = cur + 1
-	if (z_t.lt.L-1) cur = cur + 1
-	ibend(i) = cur - 1
-      enddo
-      allocate(ib(cur-1))
-      cur = 1
-      do i = 1,L*L*L
-	x_t = (i-1) / (L*L)
-	y_t = mod((i-1) / L, L)
-	z_t = mod(i-1, L)
-	if (x_t.gt.0) then
-	ib(cur) = i - (L*L)
-	cur = cur + 1
-	endif
-	if (x_t.lt.L-1) then
-	ib(cur) = i+(L*L)
-	cur = cur + 1
-	endif
-	if (y_t.gt.0) then
-	ib(cur) = i-L
-	cur = cur + 1
-	endif
-	if (y_t.lt.L-1) then
-	ib(cur) = i+L
-	cur = cur + 1
-	endif
-	if (z_t.gt.0) then
-	ib(cur) = i-1
-	cur = cur + 1
-	endif
-	if (z_t.lt.L-1) then
-	ib(cur) = i+1
-	cur = cur + 1
-	endif
-      enddo
-
-      do i = 1, L*L*L	
-	if (indir_x(i) == 0 .or. indir_x(i) == L-1 .or.  
-     & indir_y(i) == 0 .or. indir_y(i) == L-1 .or.    
-     & indir_z(i) == 0 .or. indir_z(i) == L-1) then
-	A(i) = 0
-	else
-	A(i) = 4 + indir_x(i) + indir_y(i) + indir_z(i)
-	endif
-      enddo
-
-      do i = 1, L*L*L
-	if (indir_x(i) /= 0 .and. indir_x(i) /= L-1 .and. 
-     & indir_y(i) /= 0 .and. indir_y(i) /= L-1 .and.   
-     & indir_z(i) /= 0 .and. indir_z(i) /= L-1) then
-
-	B(i) = (A(ib(ibstart(i)))   + A(ib(ibstart(i)+1))    
-     &        + A(ib(ibstart(i)+2)) + A(ib(ibstart(i)+3))    
-     &        + A(ib(ibstart(i)+4)) + A(ib(ibstart(i)+5)))/ 6.0
-	endif
-      enddo
-      deallocate(ibstart,ibend)
-      deallocate(ib)
-      deallocate(indir_x,indir_y,indir_z)
-      end 
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*14 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
-
-
-     
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect1.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect1.f90
deleted file mode 100644
index 8ba8992..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect1.f90
+++ /dev/null
@@ -1,235 +0,0 @@
-      program DISTRINDIRECT1
-!    Testing DISTRIBUTE and REDISTRIBUTE directives
-!            INDIRECT  distribution
-	print *,'=== START OF distrindirect1 ========================'
-      call distrindirect11
-      print *,'=== END OF distrindirect1 ========================= '    
-      end
-
-        subroutine distrindirect11
-        parameter    (L=10,  ER=100000)
-        integer:: x_t, y_t, z_t, erri = ER
-        integer A(L*L*L), B(L*L*L), AS(L*L*L), BS(L*L*L)
-        integer,dimension(:),allocatable:: ib1,ib2,ib3,ib4,ib5,ib6 
-        integer,dimension(L*L*L):: indir_x, indir_y,indir_z
-        integer MAP(L*L*L)
-        character*15:: tname="distrindirect11"
-
-!DVM$   DISTRIBUTE MAP (BLOCK)
-!DVM$   TEMPLATE E(L*L*L)
-!DVM$   DISTRIBUTE :: E
-!DVM$   ALIGN :: A,B
-!DVM$   ALIGN :: indir_x, indir_y,indir_z
-!DVM$   ALIGN :: ib1,ib2,ib3,ib4,ib5,ib6
-
-      call distrindirect11_s(AS,BS)
-      call fillMap(MAP,L)
-      allocate( ib1(L*L*L),ib2(L*L*L),ib3(L*L*L)  &
-     &         ,ib4(L*L*L),ib5(L*L*L),ib6(L*L*L) )
-!DVM$ REDISTRIBUTE E(INDIRECT(MAP))
-!DVM$ REALIGN (I)  WITH  E(I) :: A,B
-!DVM$ REALIGN (I)  WITH  E(I) :: indir_x, indir_y,indir_z
-!DVM$ REALIGN (I)  WITH  E(I) :: ib1,ib2,ib3,ib4,ib5,ib6
-      do i = 1,L*L*L
-      
-        x_t = (i-1) / (L*L)
-        y_t = mod((i-1) / L, L)
-        z_t = mod(i-1 , L)
-
-        indir_x(i) = x_t
-        indir_y(i) = y_t
-        indir_z(i) = z_t
-
-        if (x_t.gt.0) then
-            ib1(i) = i - (L*L)
-        else
-            ib1(i) = -1
-        endif
-        if ((x_t+1).lt.L) then
-            ib2(i) = i+(L*L)
-        else
-            ib2(i) = -1
-        endif
-        if (y_t.gt.0) then
-            ib3(i) = i-L
-        else
-            ib3(i) = -1
-        endif
-        if ((y_t+1).lt.L) then
-            ib4(i) = i+L
-        else
-            ib4(i) = -1
-        endif
-        if (z_t.gt.0) then
-            ib5(i) = i-1
-        else
-            ib5(i) = -1
-        endif
-        if ((z_t+1).lt.L) then
-            ib6(i) = i+1
-        else
-            ib6(i) = -1
-        endif
-      enddo
-	  
-!DVM$ SHADOW_ADD (E((ib1(i)) with E(@i)) = "nei1") include_to A
-!DVM$ SHADOW_ADD (E((ib2(i)) with E(@i)) = "nei2") include_to A
-!DVM$ SHADOW_ADD (E((ib3(i)) with E(@i)) = "nei3") include_to A
-!DVM$ SHADOW_ADD (E((ib4(i)) with E(@i)) = "nei4") include_to A
-!DVM$ SHADOW_ADD (E((ib5(i)) with E(@i)) = "nei5") include_to A
-!DVM$ SHADOW_ADD (E((ib6(i)) with E(@i)) = "nei6") include_to A
-
-!DVM$ LOCALIZE(ib1 => A(:))
-!DVM$ LOCALIZE(ib2 => A(:))
-!DVM$ LOCALIZE(ib3 => A(:))
-!DVM$ LOCALIZE(ib4 => A(:))
-!DVM$ LOCALIZE(ib5 => A(:))
-!DVM$ LOCALIZE(ib6 => A(:))
-
-!DVM$ REGION
-!DVM$ PARALLEL (i) ON B(i)
-      do i = 1, L*L*L
-        A(i) = 0
-        if (indir_x(i) == 0 .or. indir_x(i) == L-1 .or.   &
-     &      indir_y(i) == 0 .or. indir_y(i) == L-1 .or.   &
-     &      indir_z(i) == 0 .or. indir_z(i) == L-1) then  
-
-            B(i) = 0
-        else
-            B(i) = 4 + indir_x(i) + indir_y(i) + indir_z(i)
-        endif
-      enddo
-!DVM$   PARALLEL (i) ON B(i), SHADOW_RENEW (A)
-        do i = 1, L*L*L
-           if (indir_x(i) /= 0 .and. indir_x(i) /= L-1 .and.  &
-     &         indir_y(i) /= 0 .and. indir_y(i) /= L-1 .and.  &
-     &         indir_z(i) /= 0 .and. indir_z(i) /= L-1) then
-               B(i) = (A(ib1(i)) + A(ib2(i)) + A(ib3(i)) +    &
-     &                 A(ib4(i)) + A(ib5(i)) + A(ib6(i))) / 6.0
-           endif
-        enddo
-!DVM$ PARALLEL (i) ON B(i), REDUCTION(min(erri))
-        do i = 1, L*L*L
-          if (indir_x(i) /= 0 .and. indir_x(i) /= L-1 .and.  &  
-     &        indir_y(i) /= 0 .and. indir_y(i) /= L-1 .and.  &  
-     &        indir_z(i) /= 0 .and. indir_z(i) /= L-1) then
-            if(B(i) .ne. BS(i)) erri =  min(erri, ABS(B(i)-BS(i)))
-          endif
-        enddo
-
-!DVM$ END REGION
-
-!DVM$ GET_ACTUAL(erri)
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-
-      deallocate(ib1,ib2,ib3,ib4,ib5,ib6)
-      end subroutine
-
-!---------------------------------------------------------------
-      subroutine fillMap(MAP,L)
-      integer  numproc 
-      integer i,L
-      real:: x=1
-      integer MAP(L*L*L)
-      intrinsic INT
-      NUMBER_OF_PROCESSORS() = 1
-!DVM$ INHERIT MAP
-      numproc = NUMBER_OF_PROCESSORS() 
-!DVM$ PARALLEL (i) ON MAP(i)
-        do i=1,L*L*L
-           call RANDOM_NUMBER(x) 
-           MAP(i) = MOD(INT(x*10), numproc) 
-        enddo
-      end subroutine    
-
-!---------------------------------------------------------------
-        subroutine distrindirect11_s (A,B)
-        parameter    (L=10)
-        integer:: x_t, y_t, z_t
-        integer A(L*L*L), B(L*L*L)
-        integer,dimension(:),allocatable:: ib1,ib2,ib3,ib4,ib5,ib6 
-        integer,dimension(L*L*L):: indir_x, indir_y,indir_z      
-
-      allocate( ib1(L*L*L),ib2(L*L*L),ib3(L*L*L)  &
-     &         ,ib4(L*L*L),ib5(L*L*L),ib6(L*L*L) )
-      do i = 1,L*L*L
-      
-        x_t = (i-1) / (L*L)
-        y_t = mod((i-1) / L, L)
-        z_t = mod(i-1 , L)
-
-        indir_x(i) = x_t
-        indir_y(i) = y_t
-        indir_z(i) = z_t
-
-        if (x_t.gt.0) then
-            ib1(i) = i - (L*L)
-        else
-            ib1(i) = -1
-        endif
-        if ((x_t+1).lt.L) then
-            ib2(i) = i+(L*L)
-        else
-            ib2(i) = -1
-        endif
-        if (y_t.gt.0) then
-            ib3(i) = i-L
-        else
-            ib3(i) = -1
-        endif
-        if ((y_t+1).lt.L) then
-            ib4(i) = i+L
-        else
-            ib4(i) = -1
-        endif
-        if (z_t.gt.0) then
-            ib5(i) = i-1
-        else
-            ib5(i) = -1
-        endif
-        if ((z_t+1).lt.L) then
-            ib6(i) = i+1
-        else
-            ib6(i) = -1
-        endif
-      enddo
-	  
-      do i = 1, L*L*L
-        A(i) = 0
-        if (indir_x(i) == 0 .or. indir_x(i) == L-1 .or.   &
-     &      indir_y(i) == 0 .or. indir_y(i) == L-1 .or.   &
-     &      indir_z(i) == 0 .or. indir_z(i) == L-1) then  
-
-            B(i) = 0
-        else
-            B(i) = 4 + indir_x(i) + indir_y(i) + indir_z(i)
-        endif
-      enddo
-
-        do i = 1, L*L*L
-           if (indir_x(i) /= 0 .and. indir_x(i) /= L-1 .and.  &
-     &         indir_y(i) /= 0 .and. indir_y(i) /= L-1 .and.  &
-     &         indir_z(i) /= 0 .and. indir_z(i) /= L-1) then
-               B(i) = (A(ib1(i)) + A(ib2(i)) + A(ib3(i)) +    &
-     &                 A(ib4(i)) + A(ib5(i)) + A(ib6(i))) / 6.0
-           endif
-        enddo
-      deallocate(ib1,ib2,ib3,ib4,ib5,ib6)
-      end subroutine
-
-!---------------------------------------------------------------
-      subroutine ansyes(name)
-      character*14 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
-
-
-     
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect3.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect3.f90
deleted file mode 100644
index 317b66b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INDIRECT_DERIVED/distrindirect3.f90
+++ /dev/null
@@ -1,262 +0,0 @@
-      program DISTRINDIRECT3
-!    Testing DISTRIBUTE and REDISTRIBUTE directives
-!            INDIRECT  distribution
-	print *,'=== START OF distrindirect3 ========================'
-      call distrindirect31
-      print *,'=== END OF distrindirect3 ========================= '    
-      end
-
-        subroutine distrindirect31
-        parameter    (L=10,  ER=100000)
-        integer::     A(L,L,L), B(L,L,L),AS(L,L,L), BS(L,L,L)
-        integer,dimension(:,:,:),allocatable:: ib1, ib2, ib3, ib4, ib5, ib6
-        integer,dimension(L,L,L):: indir_x, indir_y, indir_z
-        integer MAP1(L), MAP2(L), MAP3(L)
-        integer:: erri=ER
-        character*15:: tname="distrindirect31"
-!DVM$   TEMPLATE E(L,L,L)
-!DVM$   DISTRIBUTE :: E
-!DVM$   ALIGN :: A,B
-!DVM$   ALIGN :: indir_x, indir_y,indir_z
-!DVM$   ALIGN :: ib1,ib2,ib3,ib4,ib5,ib6
-
-      call distrindirect31_s (AS, BS)
-      call fillMap(MAP1,L,1)
-      call fillMap(MAP2,L,2)
-      call fillMap(MAP3,L,3)
-      allocate( ib1(L,L,L), ib2(L,L,L), ib3(L,L,L),  &
-     &          ib4(L,L,L), ib5(L,L,L), ib6(L,L,L) )
-
-!DVM$ REDISTRIBUTE E(INDIRECT(MAP1),INDIRECT(MAP2),INDIRECT(MAP3))
-!DVM$ REALIGN (I,J,K)  WITH  E(I,J,K) :: A,B
-!DVM$ REALIGN (I,J,K)  WITH  E(I,J,K) :: indir_x, indir_y,indir_z
-!DVM$ REALIGN (I,J,K)  WITH  E(I,J,K) :: ib1,ib2,ib3,ib4,ib5,ib6
-      do i = 1,L
-        do j = 1,L
-          do k = 1,L
-
-            indir_x(i,j,k) = i
-            indir_y(i,j,k) = j
-            indir_z(i,j,k) = k
-
-            if (i.gt.1) then
-              ib1(i,j,k) = i - 1
-            else
-              ib1(i,j,k) = 0
-            endif
-            if (i.lt.L) then
-              ib2(i,j,k) = i + 1
-            else
-              ib2(i,j,k) = 0
-            endif
-            if (j.gt.1) then
-              ib3(i,j,k) = j - 1
-            else
-              ib3(i,j,k) = 0
-            endif
-            if (j.lt.L) then
-              ib4(i,j,k) = j + 1
-            else
-              ib4(i,j,k) = 0
-            endif
-            if (k.gt.1) then
-              ib5(i,j,k) = k - 1
-            else
-              ib5(i,j,k) = 0
-            endif
-            if (k.lt.L) then
-              ib6(i,j,k) = k + 1
-            else
-              ib6(i,j,k) = 0
-            endif
-          enddo
-        enddo
-      enddo
-
-!DVM$ SHADOW_ADD (E((ib1(i,j,k)) with E(@i,@j,@k),*,*) = "nei1") include_to A
-!DVM$ SHADOW_ADD (E((ib2(i,j,k)) with E(@i,@j,@k),*,*) = "nei2") include_to A
-!DVM$ SHADOW_ADD (E(*,(ib3(i,j,k)) with E(@i,@j,@k),*) = "nei3") include_to A
-!DVM$ SHADOW_ADD (E(*,(ib4(i,j,k)) with E(@i,@j,@k),*) = "nei4") include_to A
-!DVM$ SHADOW_ADD (E(*,*,(ib5(i,j,k)) with E(@i,@j,@k)) = "nei5") include_to A
-!DVM$ SHADOW_ADD (E(*,*,(ib6(i,j,k)) with E(@i,@j,@k)) = "nei6") include_to A
-
-!DVM$ LOCALIZE(ib1 => A(:,*,*))
-!DVM$ LOCALIZE(ib2 => A(:,*,*))
-!DVM$ LOCALIZE(ib3 => A(*,:,*))
-!DVM$ LOCALIZE(ib4 => A(*,:,*))
-!DVM$ LOCALIZE(ib5 => A(*,*,:))
-!DVM$ LOCALIZE(ib6 => A(*,*,:))
-
-!DVM$ REGION
-
-!DVM$ PARALLEL (k,j,i) ON B(i,j,k)
-      do k = 1,L
-        do j = 1,L
-          do i = 1,L
-
-            A(i,j,k) = 0
-
-            if (indir_x(i,j,k) == 1 .or. indir_x(i,j,k) == L .or.   &
-     &          indir_y(i,j,k) == 1 .or. indir_y(i,j,k) == L .or.   &
-     &          indir_z(i,j,k) == 1 .or. indir_z(i,j,k) == L) then
-              B(i,j,k) = 0
-            else
-              B(i,j,k) = 1 + indir_x(i,j,k) + indir_y(i,j,k) + indir_z(i,j,k)
-            endif
-
-          enddo
-        enddo
-      enddo
-
-!DVM$ PARALLEL (k,j,i) ON B(i,j,k), SHADOW_RENEW (A)
-      do k = 2,L-1
-      do j = 2,L-1
-      do i = 2,L-1
-            if (indir_x(i,j,k) /= 1 .and. indir_x(i,j,k) /= L .and.    &
-     &          indir_y(i,j,k) /= 1 .and. indir_y(i,j,k) /= L .and.    &
-     &          indir_z(i,j,k) /= 1 .and. indir_z(i,j,k) /= L) then
- 
-        B(i,j,k) = (A(ib1(i,j,k),j,k) + A(ib2(i,j,k),j,k) +            &
-     & A(i,ib3(i,j,k),k) + A(i,ib4(i,j,k),k) + A(i,j,ib5(i,j,k)) +     &
-     & A(i,j,ib6(i,j,k))) / 6.0
-        endif
-      enddo
-      enddo
-      enddo
-!DVM$ PARALLEL (k,j,i) ON B(i,j,k), REDUCTION(min(erri))
-      do k = 2,L-1
-      do j = 2,L-1
-      do i = 2,L-1
-             if (indir_x(i,j,k) /= 1 .and. indir_x(i,j,k) /= L .and.    &
-     &           indir_y(i,j,k) /= 1 .and. indir_y(i,j,k) /= L .and.    &
-     &           indir_z(i,j,k) /= 1 .and. indir_z(i,j,k) /= L) then
-
-            if(B(i,j,k) .ne. BS(i,j,k)) erri =  min(erri, ABS(B(i,j,k)-BS(i,j,k)))
-        endif
-      enddo
-      enddo
-      enddo
-
-!DVM$ END REGION
-!DVM$ GET_ACTUAL(erri)
-      if (erri .eq. ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      
-      deallocate (ib1,ib2,ib3,ib4,ib5,ib6)
-      end subroutine
-
-!---------------------------------------------------------------
-      subroutine fillMap(MAP,L,dim)
-      integer  numproc 
-      integer i,L,dim
-      real x
-      integer MAP(L)      
-      PROCESSORS_SIZE(i) = 1
-      numproc = PROCESSORS_SIZE(dim) ! dvmh_get_num_procs(1) 
-        do i=1,L
-           call RANDOM_NUMBER(x) 
-           MAP(i) = MOD(INT(x*10), numproc)     !rand()
-        enddo
-      end subroutine    
-!---------------------------------------------------------------
-        subroutine distrindirect31_s (A,B)
-        parameter    (L=10)
-        integer::     A(L,L,L), B(L,L,L)
-        integer,dimension(:,:,:),allocatable:: ib1, ib2, ib3, ib4, ib5, ib6
-        integer,dimension(L,L,L):: indir_x, indir_y, indir_z
-      allocate( ib1(L,L,L), ib2(L,L,L), ib3(L,L,L),  &
-     &          ib4(L,L,L), ib5(L,L,L), ib6(L,L,L) )
-
-      do i = 1,L
-        do j = 1,L
-          do k = 1,L
-
-            indir_x(i,j,k) = i
-            indir_y(i,j,k) = j
-            indir_z(i,j,k) = k
-
-            if (i.gt.1) then
-              ib1(i,j,k) = i - 1
-            else
-              ib1(i,j,k) = 0
-            endif
-            if (i.lt.L) then
-              ib2(i,j,k) = i + 1
-            else
-              ib2(i,j,k) = 0
-            endif
-            if (j.gt.1) then
-              ib3(i,j,k) = j - 1
-            else
-              ib3(i,j,k) = 0
-            endif
-            if (j.lt.L) then
-              ib4(i,j,k) = j + 1
-            else
-              ib4(i,j,k) = 0
-            endif
-            if (k.gt.1) then
-              ib5(i,j,k) = k - 1
-            else
-              ib5(i,j,k) = 0
-            endif
-            if (k.lt.L) then
-              ib6(i,j,k) = k + 1
-            else
-              ib6(i,j,k) = 0
-            endif
-          enddo
-        enddo
-      enddo
-
-      do k = 1,L
-        do j = 1,L
-          do i = 1,L
-
-            A(i,j,k) = 0
-
-            if (indir_x(i,j,k) == 1 .or. indir_x(i,j,k) == L .or.   &
-     &          indir_y(i,j,k) == 1 .or. indir_y(i,j,k) == L .or.   &
-     &          indir_z(i,j,k) == 1 .or. indir_z(i,j,k) == L) then
-              B(i,j,k) = 0
-            else
-              B(i,j,k) = 1 + indir_x(i,j,k) + indir_y(i,j,k) + indir_z(i,j,k)
-            endif
-
-          enddo
-        enddo
-      enddo
-
-      do k = 2,L-1
-      do j = 2,L-1
-      do i = 2,L-1
-            if (indir_x(i,j,k) /= 1 .and. indir_x(i,j,k) /= L .and.    &
-     &          indir_y(i,j,k) /= 1 .and. indir_y(i,j,k) /= L .and.    &
-     &          indir_z(i,j,k) /= 1 .and. indir_z(i,j,k) /= L) then
- 
-        B(i,j,k) = (A(ib1(i,j,k),j,k) + A(ib2(i,j,k),j,k) +            &
-     & A(i,ib3(i,j,k),k) + A(i,ib4(i,j,k),k) + A(i,j,ib5(i,j,k)) +     &
-     & A(i,j,ib6(i,j,k))) / 6.0
-        endif
-      enddo
-      enddo
-      enddo
-
-      deallocate (ib1,ib2,ib3,ib4,ib5,ib6)
-      end subroutine
-
-
-
-!---------------------------------------------------------------
-      subroutine ansyes(name)
-      character*14 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal31.fdv
deleted file mode 100644
index 9a6b38e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal31.fdv
+++ /dev/null
@@ -1,1088 +0,0 @@
-      program INOUTLOCAL31
-     
-c    TESTING OF INOULOCAL CLAUSE'.       
-
-      print *,'===START OF INOUTLOCAL31========================'
-C --------------------------------------------------
-      call inoutlocal3101
-      call inoutlocal3102
-      call inoutlocal3103
-      call inoutlocal3104
-      call inoutlocal3105
-      call inoutlocal3106
-      call inoutlocal3107
-      call inoutlocal3108
-      call inoutlocal3109
-      call inoutlocal3110
-      call inoutlocal3111
-      call inoutlocal3112
-      call inoutlocal3113
-      call inoutlocal3114
-      call inoutlocal3115
-      call inoutlocal3116
-
-C --------------------------------------------------
-C
-      print *,'=== END OF inoutlocal31 ========================= '    
-      end
-C ---------------------------------------------IN3101
-      subroutine INOUTLOCAL3101     
-      integer, parameter :: N = 16,M=8,K=8,NL=1000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3101'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-! dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region 
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-      end
-c------------------------------------------------IN3102
-      subroutine INOUTLOCAL3102     
-      integer, parameter :: N = 16,M=8,K=8,NL=1100     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3102'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region OUT(B(2:N-1,2:M-1,2:K-1)),IN(NL),LOCAL(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------IN3103
-      subroutine INOUTLOCAL3103     
-      integer, parameter :: N = 16,M=8,K=8,NL=1200     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3103'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-! dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region OUT(B(2:N-1,2:M-1,2:K-1)),IN(NL)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------IN3104
-      subroutine INOUTLOCAL3104     
-      integer, parameter :: N = 16,M=8,K=8,NL=1300     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3104'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region
-!dvm$*LOCAL(B(1,1,1)
-!dvm$*,B(N,M,K),B(1,M,K),B(N,1,K),B(N,M,1),
-!dvm$*B(1,1,K),B(N,1,1),B(1,M,1))
-!dvm$*,OUT(B(2:N-1,2:M-1,3:K-1),B(2:N-1,2:M-1,2))
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------IN3105
-      subroutine INOUTLOCAL3105     
-      integer, parameter :: N = 16,M=8,K=8,NL=1600     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3105'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region  
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------IN3106
-      subroutine INOUTLOCAL3106     
-      integer, parameter :: N = 16,M=8,K=8,NL=1700     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3106'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)),OUT (B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------IN3107
-      subroutine INOUTLOCAL3107     
-      integer, parameter :: N = 16,M=8,K=8,NL=1800     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3107'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN(A(2:N-1,2:M-1,2:K-1)),OUT (B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-     
-C ---------------------------------------------IN3108
-      subroutine INOUTLOCAL3108     
-      integer, parameter :: N = 16,M=8,K=8,NL=1900     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3108'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region INLOCAL(A(2:N-1,2:M-1,2:K-1)),OUT (B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-     
-C ---------------------------------------------IN3109
-      subroutine INOUTLOCAL3109     
-      integer, parameter :: N = 16,M=8,K=8,NL=2000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3109'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region INOUT (A(2:N-1,2:M-1,2:K-1),B(2:N-1,2:M-1,2:K-1)) 
-! dvm$ region IN (A(2:N-1,2:M-1,2:K-1)),OUT(B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------IN3110
-      subroutine INOUTLOCAL3110     
-      integer, parameter :: N = 16,M=8,K=8,NL=2100     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3110'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)),IN(A)
-!dvm$*,IN(A(2,2,2)),IN(A(2,M-1,K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1)),OUT(B(2,M-1,3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------IN3111
-      subroutine INOUTLOCAL3111     
-      integer, parameter :: N = 16,M=8,K=8,NL=2200     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3111'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B)
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------IN3112
-      subroutine INOUTLOCAL3112     
-      integer, parameter :: N = 16,M=8,K=8,NL=2300     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3112'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-cdvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-! dvm$*,OUT(B(3:N-1,2:M-2,4:K-1)),OUT(B(2,M-1,2:3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------IN3113
-      subroutine INOUTLOCAL3113     
-      integer, parameter :: N = 16,M=8,K=8,NL=2400     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3113'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(3:N-1,2:M-2,4:K-1)),OUT(B(2,M-1,2:3),
-!dvm$*B(2,2:M-2,2:K-1),B(2,2:M-2,2:K-1),
-!dvm$*B(2:N-1,2:M-2,2:K-1),B(2:N-1,2:M-1,4:K-1),
-!dvm$*B(2:N-1,2:M-1,2:3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-cdvm$ region
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-cdvm$ end region
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C  ---------------------------------------------IN3114
-      subroutine INOUTLOCAL3114     
-      integer, parameter :: N = 16,M=8,K=8,NL=2500     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3114'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-Cdvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-cdvm$ end region
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(3:N-1,2:M-2,4:K-1)),OUT(B(2,M-1,2:3),
-!dvm$*B(2,2:M-2,2:K-1),B(2,2:M-2,2:K-1),
-!dvm$*B(2:N-1,2:M-2,2:K-1),B(2:N-1,2:M-1,4:K-1),
-!dvm$*B(2:N-1,2:M-1,2:3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ region 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-cdvm$ end region
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C  ---------------------------------------------IN3115
-      subroutine INOUTLOCAL3115     
-      integer, parameter :: N = 16,M=8,K=8,NL=2600     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3115'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-cdvm$ end region
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ get_actual(B)
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C  ---------------------------------------------IN3116
-      subroutine INOUTLOCAL3116     
-      integer, parameter :: N = 16,M=8,K=8,NL=2700     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3116'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-Cdvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-cdvm$ end region
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:2,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,2
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)
-!dvm$*, B(2:2,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:2,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=3,N-1
-        do j=2,2
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)
-!dvm$*,B(2:N-1,2:2,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=3,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ region
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-cdvm$ end region
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
- 
-    
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                
-      enddo
-      end 
-    
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal32.fdv
deleted file mode 100644
index 7355522..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal32.fdv
+++ /dev/null
@@ -1,1088 +0,0 @@
-      program INOUTLOCAL32
-     
-c    TESTING OF INOULOCAL CLAUSE'.       
-
-      print *,'===START OF INOUTLOCAL32========================'
-C --------------------------------------------------
-      call inoutlocal3201
-      call inoutlocal3202
-      call inoutlocal3203
-      call inoutlocal3204
-      call inoutlocal3205
-      call inoutlocal3206
-      call inoutlocal3207
-      call inoutlocal3208
-      call inoutlocal3209
-      call inoutlocal3210
-      call inoutlocal3211
-      call inoutlocal3212
-      call inoutlocal3213
-      call inoutlocal3214
-      call inoutlocal3215
-      call inoutlocal3216
-
-C --------------------------------------------------
-C
-      print *,'=== END OF INOUTLOCAL32 ========================= '    
-      end
-C ---------------------------------------------IN3201
-      subroutine INOUTLOCAL3201     
-      integer, parameter :: N = 16,M=8,K=8,NL=1000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3201'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-! dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region 
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-      end
-c------------------------------------------------IN3202
-      subroutine INOUTLOCAL3202     
-      integer, parameter :: N = 16,M=8,K=8,NL=1100     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3202'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region OUT(B(2:N-1,2:M-1,2:K-1)),IN(NL),LOCAL(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------IN3203
-      subroutine INOUTLOCAL3203     
-      integer, parameter :: N = 16,M=8,K=8,NL=1200     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3203'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-! dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region OUT(B(2:N-1,2:M-1,2:K-1)),IN(NL)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------IN3204
-      subroutine INOUTLOCAL3204     
-      integer, parameter :: N = 16,M=8,K=8,NL=1300     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3204'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region
-!dvm$*LOCAL(B(1,1,1)
-!dvm$*,B(N,M,K),B(1,M,K),B(N,1,K),B(N,M,1),
-!dvm$*B(1,1,K),B(N,1,1),B(1,M,1))
-!dvm$*,OUT(B(2:N-1,2:M-1,3:K-1),B(2:N-1,2:M-1,2))
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------IN3205
-      subroutine INOUTLOCAL3205     
-      integer, parameter :: N = 16,M=8,K=8,NL=1600     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3205'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region  
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------IN3206
-      subroutine INOUTLOCAL3206     
-      integer, parameter :: N = 16,M=8,K=8,NL=1700     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3206'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)),OUT (B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------IN3207
-      subroutine INOUTLOCAL3207     
-      integer, parameter :: N = 16,M=8,K=8,NL=1800     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3207'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN(A(2:N-1,2:M-1,2:K-1)),OUT (B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-     
-C ---------------------------------------------IN3208
-      subroutine INOUTLOCAL3208     
-      integer, parameter :: N = 16,M=8,K=8,NL=1900     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3208'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region INLOCAL(A(2:N-1,2:M-1,2:K-1)),OUT (B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-     
-C ---------------------------------------------IN3209
-      subroutine INOUTLOCAL3209     
-      integer, parameter :: N = 16,M=8,K=8,NL=2000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3209'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region INOUT (A(2:N-1,2:M-1,2:K-1),B(2:N-1,2:M-1,2:K-1)) 
-! dvm$ region IN (A(2:N-1,2:M-1,2:K-1)),OUT(B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------IN3210
-      subroutine INOUTLOCAL3210     
-      integer, parameter :: N = 16,M=8,K=8,NL=2100     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3210'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)),IN(A)
-!dvm$*,IN(A(2,2,2)),IN(A(2,M-1,K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1)),OUT(B(2,M-1,3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------IN3211
-      subroutine INOUTLOCAL3211     
-      integer, parameter :: N = 16,M=8,K=8,NL=2200     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3211'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B)
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------IN3212
-      subroutine INOUTLOCAL3212     
-      integer, parameter :: N = 16,M=8,K=8,NL=2300     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3212'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-cdvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-! dvm$*,OUT(B(3:N-1,2:M-2,4:K-1)),OUT(B(2,M-1,2:3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------IN3213
-      subroutine INOUTLOCAL3213     
-      integer, parameter :: N = 16,M=8,K=8,NL=2400     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3213'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(3:N-1,2:M-2,4:K-1)),OUT(B(2,M-1,2:3),
-!dvm$*B(2,2:M-2,2:K-1),B(2,2:M-2,2:K-1),
-!dvm$*B(2:N-1,2:M-2,2:K-1),B(2:N-1,2:M-1,4:K-1),
-!dvm$*B(2:N-1,2:M-1,2:3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-cdvm$ region
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-cdvm$ end region
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C  ---------------------------------------------IN3214
-      subroutine INOUTLOCAL3214     
-      integer, parameter :: N = 16,M=8,K=8,NL=2500     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3214'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-Cdvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-cdvm$ end region
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(3:N-1,2:M-2,4:K-1)),OUT(B(2,M-1,2:3),
-!dvm$*B(2,2:M-2,2:K-1),B(2,2:M-2,2:K-1),
-!dvm$*B(2:N-1,2:M-2,2:K-1),B(2:N-1,2:M-1,4:K-1),
-!dvm$*B(2:N-1,2:M-1,2:3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ region 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-cdvm$ end region
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C  ---------------------------------------------IN3215
-      subroutine INOUTLOCAL3215     
-      integer, parameter :: N = 16,M=8,K=8,NL=2600     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3215'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-cdvm$ end region
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ get_actual(B)
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C  ---------------------------------------------IN3216
-      subroutine INOUTLOCAL3216     
-      integer, parameter :: N = 16,M=8,K=8,NL=2700     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3216'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-Cdvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-cdvm$ end region
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:2,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,2
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)
-!dvm$*, B(2:2,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:2,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=3,N-1
-        do j=2,2
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)
-!dvm$*,B(2:N-1,2:2,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=3,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ region
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-cdvm$ end region
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
- 
-    
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                
-      enddo
-      end 
-    
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal33.fdv
deleted file mode 100644
index 554708f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/INOUTLOCAL/inoutlocal33.fdv
+++ /dev/null
@@ -1,1088 +0,0 @@
-      program INOUTLOCAL33
-     
-c    TESTING OF INOULOCAL CLAUSE'.       
-
-      print *,'===START OF INOUTLOCAL33========================'
-C --------------------------------------------------
-      call inoutlocal3301
-      call inoutlocal3302
-      call inoutlocal3303
-      call inoutlocal3304
-      call inoutlocal3305
-      call inoutlocal3306
-      call inoutlocal3307
-      call inoutlocal3308
-      call inoutlocal3309
-      call inoutlocal3310
-      call inoutlocal3311
-      call inoutlocal3312
-      call inoutlocal3313
-      call inoutlocal3314
-      call inoutlocal3315
-      call inoutlocal3316
-
-C --------------------------------------------------
-C
-      print *,'=== END OF INOUTLOCAL33 ========================= '    
-      end
-C ---------------------------------------------IN3301
-      subroutine INOUTLOCAL3301     
-      integer, parameter :: N = 16,M=8,K=8,NL=1000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3301'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-! dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region 
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-      end
-c------------------------------------------------IN3302
-      subroutine INOUTLOCAL3302     
-      integer, parameter :: N = 16,M=8,K=8,NL=1100     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3302'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region OUT(B(2:N-1,2:M-1,2:K-1)),IN(NL),LOCAL(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------IN3303
-      subroutine INOUTLOCAL3303     
-      integer, parameter :: N = 16,M=8,K=8,NL=1200     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3303'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-! dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region OUT(B(2:N-1,2:M-1,2:K-1)),IN(NL)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------IN3304
-      subroutine INOUTLOCAL3304     
-      integer, parameter :: N = 16,M=8,K=8,NL=1300     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3304'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region
-!dvm$*LOCAL(B(1,1,1)
-!dvm$*,B(N,M,K),B(1,M,K),B(N,1,K),B(N,M,1),
-!dvm$*B(1,1,K),B(N,1,1),B(1,M,1))
-!dvm$*,OUT(B(2:N-1,2:M-1,3:K-1),B(2:N-1,2:M-1,2))
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------IN3305
-      subroutine INOUTLOCAL3305     
-      integer, parameter :: N = 16,M=8,K=8,NL=1600     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3305'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region  
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------IN3306
-      subroutine INOUTLOCAL3306     
-      integer, parameter :: N = 16,M=8,K=8,NL=1700     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3306'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)),OUT (B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------IN3307
-      subroutine INOUTLOCAL3307     
-      integer, parameter :: N = 16,M=8,K=8,NL=1800     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3307'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN(A(2:N-1,2:M-1,2:K-1)),OUT (B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-     
-C ---------------------------------------------IN3308
-      subroutine INOUTLOCAL3308     
-      integer, parameter :: N = 16,M=8,K=8,NL=1900     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3308'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region INLOCAL(A(2:N-1,2:M-1,2:K-1)),OUT (B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-     
-C ---------------------------------------------IN3309
-      subroutine INOUTLOCAL3309     
-      integer, parameter :: N = 16,M=8,K=8,NL=2000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3309'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region INOUT (A(2:N-1,2:M-1,2:K-1),B(2:N-1,2:M-1,2:K-1)) 
-! dvm$ region IN (A(2:N-1,2:M-1,2:K-1)),OUT(B(2:N-1,2:M-1,2:K-1)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------IN3310
-      subroutine INOUTLOCAL3310     
-      integer, parameter :: N = 16,M=8,K=8,NL=2100     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3310'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)),IN(A)
-!dvm$*,IN(A(2,2,2)),IN(A(2,M-1,K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1)),OUT(B(2,M-1,3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------IN3311
-      subroutine INOUTLOCAL3311     
-      integer, parameter :: N = 16,M=8,K=8,NL=2200     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3311'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B)
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------IN3312
-      subroutine INOUTLOCAL3312     
-      integer, parameter :: N = 16,M=8,K=8,NL=2300     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3312'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-cdvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-! dvm$*,OUT(B(3:N-1,2:M-2,4:K-1)),OUT(B(2,M-1,2:3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------IN3313
-      subroutine INOUTLOCAL3313     
-      integer, parameter :: N = 16,M=8,K=8,NL=2400     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3313'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(3:N-1,2:M-2,4:K-1)),OUT(B(2,M-1,2:3),
-!dvm$*B(2,2:M-2,2:K-1),B(2,2:M-2,2:K-1),
-!dvm$*B(2:N-1,2:M-2,2:K-1),B(2:N-1,2:M-1,4:K-1),
-!dvm$*B(2:N-1,2:M-1,2:3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)    
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ get_actual(B) 
-cdvm$ region
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-cdvm$ end region
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C  ---------------------------------------------IN3314
-      subroutine INOUTLOCAL3314     
-      integer, parameter :: N = 16,M=8,K=8,NL=2500     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3314'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-Cdvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-cdvm$ end region
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(3:N-1,2:M-2,4:K-1)),OUT(B(2,M-1,2:3),
-!dvm$*B(2,2:M-2,2:K-1),B(2,2:M-2,2:K-1),
-!dvm$*B(2:N-1,2:M-2,2:K-1),B(2:N-1,2:M-1,4:K-1),
-!dvm$*B(2:N-1,2:M-1,2:3)) 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ region 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-cdvm$ end region
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-
-C  ---------------------------------------------IN3315
-      subroutine INOUTLOCAL3315     
-      integer, parameter :: N = 16,M=8,K=8,NL=2600     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3315'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-cdvm$ end region
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ get_actual(B)
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C  ---------------------------------------------IN3316
-      subroutine INOUTLOCAL3316     
-      integer, parameter :: N = 16,M=8,K=8,NL=2700     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='IN3316'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ actual(nloopi,nloopj,nloopii)
-Cdvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
-cdvm$ end region
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:2,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,2
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)
-!dvm$*, B(2:2,2:M-1,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:2,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=3,N-1
-        do j=2,2
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-!dvm$ region IN (A(2:N-1,2:M-1,2:K-1)
-!dvm$*,B(2:N-1,2:2,2:K-1))
-!dvm$*,OUT(B(2:N-1,2:M-1,2:K-1))
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-	do i=2,N-1
-        do j=3,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i,j,ii)
-                   enddo 
-        enddo 
-      enddo
-cdvm$ end region 
-cdvm$ region
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          if (B(i,j,ii).ne.c(i,j,ii)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-cdvm$ end region
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
- 
-    
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                
-      enddo
-      end 
-    
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel1.fdv
deleted file mode 100644
index f4570c9..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel1.fdv
+++ /dev/null
@@ -1,305 +0,0 @@
-      program PARALLEL1
-
-c    TESTING parallel CLAUSE .       
-
-      print *,'===START OF parallel1========================'
-C --------------------------------------------------
-c 11  arrA1[BLOCK]  PARALLEL ON arrA[i+4] normal
-      call parallel11
-C --------------------------------------------------
-c 12  arrA1[BLOCK]  PARALLEL ON arrA[-i+8]  reverse
-c      call parallel12
-C --------------------------------------------------
-c 13  arrA1[BLOCK]  PARALLEL ON arrA[2*i+8] stretch
-      call parallel13
-C --------------------------------------------------
-c 131 arrA1[BLOCK]  PARALLEL ON arrA[2*i+1] small array
-      call parallel13
-C --------------------------------------------------
-c 14  arrA1[BLOCK]  PARALLEL ON arrA[] 
-      call parallel14
-C --------------------------------------------------
-c 15  arrA1[BLOCK]  PARALLEL ON arrA[2] 
-      call parallel15
-C --------------------------------------------------
-      print *,'=== END OF parallel1 ========================= '    
-      end
-
-C ----------------------------------------------------parallel11
-c 11  arrA1[BLOCK]  PARALLEL ON arrA[i+4] normal
-      subroutine parallel11
-      integer, parameter :: AN1=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA1[k1i * i + li]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4      
-      character*9 tname
-      integer, allocatable :: A1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)    
-
-      tname='paral11'
-      allocate (A1(AN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1)
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(k1i * i + li), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1,((AN1-li)/k1i)
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-
-      end
-C ----------------------------------------------------parallel12
-c 12  arrA1[BLOCK]  PARALLEL ON arrA[-i+8]  reverse
-      subroutine parallel12
-      integer, parameter :: AN1=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA1[k1i * i + li]                                                 
-      integer, parameter :: k1i=-1,k2i=0,li=9      
-      character*9 tname
-      integer, allocatable :: A1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)   
-
-      tname='paral12'
-      allocate (A1(AN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1)
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(k1i * i + li), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1,AN1
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-
-      end
-C ----------------------------------------------------parallel13
-c 13  arrA1[BLOCK]  PARALLEL ON arrA[2*i+8] stretch
-      subroutine parallel13
-      integer, parameter :: AN1=20,NL=1000,ER=10000
-c     parameters for PARALLEL arrA1[k1i * i + li]                                                 
-      integer, parameter :: k1i=2,k2i=0,li=8      
-      character*9 tname
-      integer, allocatable :: A1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)   
-
-      tname='paral13'
-      allocate (A1(AN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1)
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(k1i * i + li), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1,((AN1-li)/k1i)
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-
-      end
-C ----------------------------------------------------parallel131
-c 131  arrA1[BLOCK]  PARALLEL ON arrA[2*i+1] small array
-      subroutine parallel131
-      integer, parameter :: AN1=5,NL=1000,ER=10000
-c     parameters for PARALLEL arrA1[k1i * i + li]                                                 
-      integer, parameter :: k1i=2,k2i=0,li=1      
-      character*9 tname
-      integer, allocatable :: A1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)   
-
-      tname='paral131'
-      allocate (A1(AN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1)
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(k1i * i + li), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1,((AN1-li)/k1i)
-            ia=k1i * i + li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-
-      end
-C ----------------------------------------------------parallel14
-c 14  arrA1[BLOCK]  PARALLEL ON arrA[] 
-      subroutine parallel14
-      integer, parameter :: AN1=20,BN1=10,NL=1000,ER=10000
-c     parameters for PARALLEL arrA1[*]                                                 
-      integer, parameter :: k1i=0,k2i=0,li=0
-      character*9 tname
-      integer, allocatable :: A1(:),B1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)   
-!dvm$ distribute B1(*)
-
-      tname='paral14'
-      allocate (A1(AN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1,B1)
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(*), reduction( min( erri ) )
-      do i=1,BN1
-            if (B1(i) .eq.(i)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1,B1)
-
-      end
-C ----------------------------------------------------parallel15
-c 15  arrA1[BLOCK]  PARALLEL ON arrA[2] 
-      subroutine parallel15
-      integer, parameter :: AN1=20,NL=1000,ER=10000
-c     parameters for PARALLEL arrA1[li]                                                 
-      integer, parameter :: k1i=0,k2i=0,li=2
-      character*9 tname
-      integer, allocatable :: A1(:)
-      integer erri,i
-               
-!dvm$ distribute A1(BLOCK)   
-
-      tname='paral15'
-      allocate (A1(AN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A1)
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-            A1(i) =i     
-      enddo
-
-!dvm$ parallel (i) on A1(li), reduction( min( erri ) )
-!dvm$*, private(ia)
-      do i=1,AN1
-            ia=li
-            if (A1(ia) .eq.(ia)) then     
-            else
-               erri = min(erri,i)
-            endif 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A1)
-
-      end
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel2.fdv
deleted file mode 100644
index 7371ea0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel2.fdv
+++ /dev/null
@@ -1,227 +0,0 @@
-      program PARALLEL2
-
-c    TESTING parallel CLAUSE .       
-
-      print *, '====START OF parallel2============='
-C --------------------------------------------------
-c 21    PARALLEL ON arrA[i][2*j]  stretching along j
-      call parallel21
-C --------------------------------------------------
-c 22    PARALLEL ON arrA[i+4][j]  shift along i
-      call parallel22
-C --------------------------------------------------
-c 23    PARALLEL ON arrA[-i+8][j] reverse on i
-c      call parallel23
-C --------------------------------------------------
-c 24    PARALLEL ON arrA[i+4][j+4]  shift along i and j
-      call parallel24
-C --------------------------------------------------
-      print *, '==== END OF parallel2 ============='
-      end
-
-C ----------------------------------------------------parallel21
-c 21    PARALLEL ON arrA[i][2*j]  stretching along j
-      subroutine parallel21
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=0,k1j=0,k2j=2,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-              
-!dvm$ distribute A2(BLOCK,BLOCK)    
-
-      tname='paral21'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction (min (erri))
-!dvm$*, private(ia,ja)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel22
-c 22    PARALLEL ON arrA[i+4][j]  shift along i
-      subroutine parallel22
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]
-      integer, parameter :: k1i=1,k2i=0,li=4,k1j=0,k2j=1,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-
-      tname='paral22'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction( min( erri ))
-!dvm$*, private(ia,ja)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel23
-c 23    PARALLEL ON arrA[-i+8][j] reverse on i
-      subroutine parallel23
-      integer, parameter :: AN1=7,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]
-      integer, parameter :: k1i=-1,k2i=0,li=8,k1j=0,k2j=1,lj=0
-      character*9 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-
-      tname='paral23'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction( min( erri ) )
-!dvm$*, private(ia,ja)
-      do i=1,AN1
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel24
-c 24    PARALLEL ON arrA[i+4][j+4]  shift along i and j
-      subroutine parallel24
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]
-      integer, parameter :: k1i=1,k2i=0,li=4,k1j=0,k2j=1,lj=4
-      character*9 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(BLOCK,BLOCK)    
-
-      tname='paral24'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction( min( erri ) )
-!dvm$*, private(ia,ja)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel3.fdv
deleted file mode 100644
index a98de5e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel3.fdv
+++ /dev/null
@@ -1,456 +0,0 @@
-      program PARALLEL3
-
-c    TESTING parallel CLAUSE .       
-
-      print *,'===START OF parallel3========================'
-C -------------------------------------------------
-c 31     PARALLEL ON  arrA[i][2* j][k] stretching
-       call paral31
-C -------------------------------------------------
-c 32     PARALLEL ON  arrA[i+2][ j][k]  shift
-       call paral32
-C -------------------------------------------------
-c 33     PARALLEL ON  arrA[i][ j][-k+8]  reverse
-c      call paral33
-C -------------------------------------------------
-c 34     PARALLEL ON  arrA[i][ j][2]  
-c                                               compression             !!
-       call paral34
-C -------------------------------------------------
-c 35     PARALLEL ON  arrA[][ j][ k] 
-c                                                replication            
-      call paral35
-C -------------------------------------------------
-c 36     PARALLEL ON  arrA[1][i][3] 
-c                                               compression and replication            
-      call paral36
-C -------------------------------------------------
-      print *,'=== END OF parallel3 ========================'
-C
-      end
-
-C ----------------------------------------------------paral31
-c 31 arrA4[BLOCK][BLOCK] [BLOCK] 
-c       PARALLEL ON  arrA[i][2* j][k] stretching      
-
-      subroutine paral31
-      integer, parameter :: AN1=6,AN2=6,AN3=4
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=2,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*9 tname
-      integer, allocatable :: A3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-
-      tname='paral31'
-      allocate (A3(AN1,AN2,AN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,k3n*n+ln),
-!dvm$*reduction (min (erri))
-!dvm$*, private(ia,ja,na)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                if (A3(ia,ja,na).eq.(ia*NL/10+ja*NL/100+na*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-
-      s=0              
-      cs = 0              
-    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c           print *,A3  
-      endif 
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------paral32
-c 32     PARALLEL ON  arrA[i+2][ j][k]  shift
-
-      subroutine paral32
-      integer, parameter :: AN1=5,AN2=5,AN3=5
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*9 tname
-      integer, allocatable :: A3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-
-      tname='paral32'
-      allocate (A3(AN1,AN2,AN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,k3n*n+ln),
-!dvm$*                                          reduction (min (erri))
-!dvm$*, private(ia,ja,na)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                if (A3(ia,ja,na).eq.(ia*NL/10+ja*NL/100+na*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0              
-      cs = 0              
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c           print *,A3  
-      endif 
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------paral33
-c 33     PARALLEL ON  arrA[i][ j][-k+8]  reverse
-
-      subroutine paral33
-      integer, parameter :: AN1=5,AN2=5,AN3=5
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=-1,ln=6
-      character*9 tname
-      integer, allocatable :: A3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-
-      tname='paral33'
-      allocate (A3(AN1,AN2,AN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,k3n*n+ln),
-!dvm$*                                          reduction (min (erri))
-!dvm$*, private(ia,ja,na)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3))
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                if (A3(ia,ja,na).eq.(ia*NL/10+ja*NL/100+na*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0              
-      cs = 0              
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c           print *,A3  
-      endif 
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------paral34
-c 34     PARALLEL ON  arrA[i][ j][2]  
-
-      subroutine paral34
-      integer, parameter :: AN1=6,AN2=6,AN3=6,BN1=3,BN2=3,BN3=3
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,ln=2
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,*) WITH A3(k1i*i+li,k2j*j+lj,ln)
-
-      tname='paral34'
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do  i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A3(k1i*i+li,k2j*j+lj,ln),
-!dvm$*            reduction (min (erri)), private(n)
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0              
-      cs = 0              
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------paral35
-c 35     PARALLEL ON  arrA[][ j][ k] 
-
-      subroutine paral35
-      integer, parameter :: AN1=6,AN2=6,AN3=6,BN1=6,BN2=6,BN3=6
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[*][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(*,j,n) WITH A3(*,k2j*j+lj,k3n*n+ln)
-
-      tname='paral35'
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ region out(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do  i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(A3,B3) 
-
-      do i=1,BN1
-!dvm$ parallel (j,n) on A3(*,k2j*j+lj,k3n*n+ln),
-!dvm$*                                          reduction (min (erri))
-          do j=1,BN2
-            do n=1,BN3
-                if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-     
-      s=0              
-      cs = 0              
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------paral36
-c 36     PARALLEL ON  arrA[1][i][3] 
-
-      subroutine paral36
-      integer, parameter :: AN1=6,AN2=6,AN3=6,BN1=3,BN2=3,BN3=3
-      integer, parameter :: PN=2,NL=10000,ER=100000
-
-c     parameters for PARALLEL ON  arrA[li][k2j*j+lj][ln]                                              
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=1
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,ln=3
-      character*9 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(li,k2j*j+lj,ln)
-
-      tname='paral36'
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do  i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(li,k2j*j+lj,ln),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0              
-      cs = 0              
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel4.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel4.fdv
deleted file mode 100644
index 8c8db72..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/parallel4.fdv
+++ /dev/null
@@ -1,500 +0,0 @@
-      program PARALLEL4
-
-c    TESTING parallel CLAUSE .       
-
-      print *,'===START OF parallel4======================'
-C -------------------------------------------------
-c 41     PARALLEL ON  arrA[i][2* j][k][3*l] stretching
-       call paral41
-C -------------------------------------------------
-c 42     PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift
-       call paral42
-C -------------------------------------------------
-c 43     PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse
-c      call paral43
-C -------------------------------------------------
-c 44     PARALLEL ON  arrA[i][ j][2][ l]  
-c                                               compression            !!
-      call paral44
-C -------------------------------------------------
-c 45     PARALLEL ON  arrA[i][ j][ ][ k] 
-c                                               replication            
-      call paral45
-C -------------------------------------------------
-c 46     PARALLEL ON  arrA[i][ j][ ][3] 
-c                                               compression and replication            
-      call paral46
-C -------------------------------------------------
-C
-      print *,'=== END OF parallel4 ====================== '
-      end
-
-C ----------------------------------------------------paral41
-c 41 arrA4[BLOCK][BLOCK] [BLOCK] [BLOCK] 
-c       PARALLEL ON  arrA[i][2* j][k][3*l] stretching      
-
-      subroutine paral41
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=2,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=3,lm=0    
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-
-      tname='paral41'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* ,private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral42
-c 42     PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift
-
-      subroutine paral42
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=3
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-
-      tname='paral42'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* ,private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral43
-c 43     PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse
-
-      subroutine paral43
-      integer, parameter :: AN1=6,AN2=6,AN3=7,AN4=7
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=-1,k4n=0,ln=8
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=-1,lm=8
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-
-      tname='paral42'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* ,private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral44
-c 44     PARALLEL ON  arrA[i][ j][2][ l]  
-
-      subroutine paral44
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=2
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm)
-
-      tname='paral44'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do  i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------paral45
-c 45     PARALLEL ON  arrA[i][ j][ ][ k] 
-
-      subroutine paral45
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,*,k4m*m+lm)
-
-      tname='paral45'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do  i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,*,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------paral46
-c 46     PARALLEL ON  arrA[i][ j][ ][3] 
-
-      subroutine paral46
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][*][lm]
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=0,lm=3
-      character*9 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,*,lm)
-
-      tname='paral46'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do  i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,*,lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus12.fdv
deleted file mode 100644
index 882a882..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus12.fdv
+++ /dev/null
@@ -1,439 +0,0 @@
-      program PARALLELPLUS2
-
-c    TESTING parallel CLAUSE .       
-c    arrA2[*][ BLOCK] 
-c    or arrA2[ BLOCK][*] 
-
-      print *,'===START OF paralplus12======================'
-C --------------------------------------------------
-c 21    PARALLEL ON arrA[i][2*j]  stretching along j
-      call parallel21
-C --------------------------------------------------
-c 22    PARALLEL ON arrA[i+4][j]  shift along i
-      call parallel22
-C --------------------------------------------------
-c 23    PARALLEL ON arrA[-i+8][j] reverse on i
-c      call parallel23
-C --------------------------------------------------
-c 24    PARALLEL ON arrA[i+4][j+4]  shift along i and j
-      call parallel24
-C --------------------------------------------------
-c 25    PARALLEL ON arrA[i][2*j]  stretching along j
-      call parallel21
-C --------------------------------------------------
-c 26    PARALLEL ON arrA[i+4][j]  shift along i
-      call parallel22
-C --------------------------------------------------
-c 27    PARALLEL ON arrA[-i+8][j] reverse on i
-c      call parallel23
-C --------------------------------------------------
-c 28    PARALLEL ON arrA[i+4][j+4]  shift along i and j
-      call parallel24
-C --------------------------------------------------
-      print *,'=== END OF paralplus12======================== '
-      end
-
-C ----------------------------------------------------parallel21
-c 21    PARALLEL ON arrA[i][2*j]  stretching along j
-      subroutine parallel21
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=0,k1j=0,k2j=2,lj=0
-
-      character*11 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(*,BLOCK)    
-
-      tname='paral+1221'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction (min (erri))
-!dvm$* ,private(ia,ja)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel22
-c 22    PARALLEL ON arrA[i+4][j]  shift along i
-      subroutine parallel22
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4,k1j=0,k2j=1,lj=0
-      character*11 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(*,BLOCK)    
-
-      tname='paral+1222'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction( min( erri ))
-!dvm$* ,private(ia,ja)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel23
-c 23    PARALLEL ON arrA[-i+8][j] reverse on i
-      subroutine parallel23
-      integer, parameter :: AN1=7,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=-1,k2i=0,li=8,k1j=0,k2j=1,lj=0
-      character*11 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(*,BLOCK)    
-
-      tname='paral+1223'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction( min( erri ) )
-!dvm$* ,private(ia,ja)
-      do i=1,AN1
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel24
-c 24    PARALLEL ON arrA[i+4][j+4]  shift along i and j
-      subroutine parallel24
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4,k1j=0,k2j=1,lj=4
-      character*11 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(*,BLOCK)    
-
-      tname='paral+1224'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction( min( erri ) )
-!dvm$* ,private(ia,ja)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel25
-c 25    PARALLEL ON arrA[i][2*j]  stretching along j
-      subroutine parallel25
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=0,k1j=0,k2j=2,lj=0
-      character*11 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(BLOCK,*)    
-
-      tname='paral+1225'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction (min (erri))
-!dvm$* ,private(ia,ja)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel26
-c 26    PARALLEL ON arrA[i+4][j]  shift along i
-      subroutine parallel26
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4,k1j=0,k2j=1,lj=0
-      character*11 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(BLOCK,*)    
-
-      tname='paral+1226'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction( min( erri ))
-!dvm$* ,private(ia,ja)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel27
-c 27    PARALLEL ON arrA[-i+8][j] reverse on i
-      subroutine parallel27
-      integer, parameter :: AN1=7,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=-1,k2i=0,li=8,k1j=0,k2j=1,lj=0
-      character*11 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(BLOCK,*)    
-
-      tname='paral+1227'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction( min( erri ) )
-!dvm$* ,private(ia,ja)
-      do i=1,AN1
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-
-      end
-C ----------------------------------------------------parallel28
-c 28    PARALLEL ON arrA[i+4][j+4]  shift along i and j
-      subroutine parallel28
-      integer, parameter :: AN1=8,AN2=8,NL=1000,ER=10000
-c     parameters for PARALLEL arrA2[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4,k1j=0,k2j=1,lj=4
-      character*11 tname
-      integer, allocatable :: A2(:,:)
-      integer erri,i,j,n,m,ia,ja,na,ma
-               
-!dvm$ distribute A2(BLOCK,*)    
-
-      tname='paral+1228'
-      allocate (A2(AN1,AN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A2)
-!dvm$ parallel (i,j) on A2(i,j)
-      do i=1,AN1
-          do j=1,AN2
-            A2(i,j) =i*NL+j     
-          enddo
-      enddo
-
-!dvm$ parallel (i,j) on A2(k1i*i+li,k2j*j+lj), reduction( min( erri ) )
-!dvm$* ,private(ia,ja)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            ia=k1i * i + li
-            ja=k2j * j + lj
-            if (A2(ia,ja) .eq.(ia*NL+ja)) then     
-            else
-               erri = min(erri,ia*NL+ja)
-            endif 
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A2)
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*11 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*11 name
-      print *,name,'  -  ***error'
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus14.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus14.fdv
deleted file mode 100644
index 3b9dc2b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus14.fdv
+++ /dev/null
@@ -1,503 +0,0 @@
-      program PARALLEL14
-
-c    TESTING parallel CLAUSE .       
-c    arrA4[BLOCK][*][*][*] or arrA4[*][*][*][BLOCK]  etc.
-
-      print *,'===START OF paralplus14===================='
-C -------------------------------------------------
-c 41     PARALLEL ON  arrA[i][2* j][k][3*l] stretching
-       call paral41
-C -------------------------------------------------
-c 42     PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift
-       call paral42
-C -------------------------------------------------
-c 43     PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse
-c      call paral43
-C -------------------------------------------------
-c 44     PARALLEL ON  arrA[i][ j][2][ l]  
-c                                               compression            !!
-      call paral44
-C -------------------------------------------------
-c 45     PARALLEL ON  arrA[i][ j][ ][ k] 
-c                                               replication            
-      call paral45
-C -------------------------------------------------
-c 46     PARALLEL ON  arrA[i][ j][ ][3] 
-c                                               compression and replication            
-      call paral46
-C -------------------------------------------------
-C
-      print *,'=== END OF paralplus14======================'
-      end
-
-C ----------------------------------------------------paral41
-c 41 arrA4[*][*] [BLOCK] [*] 
-c       PARALLEL ON  arrA[i][2* j][k][3*l] stretching      
-
-      subroutine paral41
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=2,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=3,lm=0
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,BLOCK,*,*)    
-
-      tname='paral+1441'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* ,private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral42
-c 42     PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift
-
-      subroutine paral42
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=3
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,BLOCK,*,*)    
-
-      tname='paral+1442'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* ,private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral43
-c 43     PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse
-
-      subroutine paral43
-      integer, parameter :: AN1=6,AN2=6,AN3=7,AN4=7
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=-1,k4n=0,ln=8
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=-1,lm=8
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,BLOCK,*,*)    
-
-      tname='paral+1442'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-c      call strparal42 
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* ,private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral44
-c 44     PARALLEL ON  arrA[i][ j][2][ l]  
-
-      subroutine paral44
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=2
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,*,*,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm)
-
-      tname='paral+1444'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do  i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri)) 
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------paral45
-c 45     PARALLEL ON  arrA[i][ j][ ][ k] 
-
-      subroutine paral45
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,*,BLOCK,*)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,*,k4m*m+lm)
-
-      tname='paral+1445'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do  i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,*,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------paral46
-c 46     PARALLEL ON  arrA[i][ j][ ][3] 
-
-      subroutine paral46
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: PN=2,NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][*][lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=0,lm=3
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,*,BLOCK,*)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,*,lm)
-
-      tname='paral+1446'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do  i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,*,lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*11 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*11 name
-      print *,name,'  -  ***error'
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus23.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus23.fdv
deleted file mode 100644
index 90aa08d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus23.fdv
+++ /dev/null
@@ -1,892 +0,0 @@
-      program PARALLELPLUS23
-c    TESTING parallel CLAUSE .       
-c    arrA3[*][ BLOCK][BLOCK] 
-c    or arrA3[ BLOCK][*][BLOCK] 
-
-      print *, '===START OF paralplus23================='
-C -------------------------------------------------
-c 31     PARALLEL ON  arrA[i][2* j][k] stretching
-       call paral31
-C -------------------------------------------------
-c 32     PARALLEL ON  arrA[i+2][ j][k]  shift
-       call paral32
-C -------------------------------------------------
-c 33     PARALLEL ON  arrA[i][ j][-k+8]  reverse
-c      call paral33
-C -------------------------------------------------
-c 34     PARALLEL ON  arrA[i][ j][2]  
-c                                               compression             !!
-       call paral34
-C -------------------------------------------------
-c 35     PARALLEL ON  arrA[][ j][ k] 
-c                                                replication            
-      call paral35
-C -------------------------------------------------
-c 36     PARALLEL ON  arrA[1][i][3] 
-c                                               compression and replication            
-      call paral36
-C -------------------------------------------------
-c 37     PARALLEL ON  arrA[i][2* j][k] stretching
-       call paral37
-C -------------------------------------------------
-c 38     PARALLEL ON  arrA[i+2][ j][k]  shift
-       call paral38
-C -------------------------------------------------
-c 39     PARALLEL ON  arrA[i][ j][-k+8]  reverse
-c      call paral39
-C -------------------------------------------------
-c 310     PARALLEL ON  arrA[i][ j][2]  
-c                                               compression             !!
-       call paral310
-C -------------------------------------------------
-c 311     PARALLEL ON  arrA[][ j][ k] 
-c                                                replication            
-      call paral311
-C -------------------------------------------------
-c 312     PARALLEL ON  arrA[1][i][3] 
-c                                               compression and replication            
-      call paral312
-C -------------------------------------------------
-      print *, '=== END OF paralplus23================='
-C
-      end
-
-C ----------------------------------------------------paral31
-c 31 arrA4[*][BLOCK] [BLOCK] 
-c       PARALLEL ON  arrA[i][2* j][k] stretching      
-
-      subroutine paral31
-      integer, parameter :: AN1=6,AN2=6,AN3=4
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=2,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*11 tname
-      integer, allocatable :: A3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-!dvm$ distribute A3(*,BLOCK,BLOCK)    
-
-      tname='paral+2331'
-      allocate (A3(AN1,AN2,AN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,k3n*n+ln),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                if (A3(ia,ja,na).eq.(ia*NL/10+ja*NL/100+na*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c           print *,A3  
-      endif 
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------paral32
-c 32     PARALLEL ON  arrA[i+2][ j][k]  shift
-
-      subroutine paral32
-      integer, parameter :: AN1=5,AN2=5,AN3=5
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*11 tname
-      integer, allocatable :: A3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(*,BLOCK,BLOCK)    
-
-      tname='paral+2332'
-      allocate (A3(AN1,AN2,AN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,k3n*n+ln),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                if (A3(ia,ja,na).eq.(ia*NL/10+ja*NL/100+na*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c           print *,A3  
-      endif 
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------paral33
-c 33     PARALLEL ON  arrA[i][ j][-k+8]  reverse
-
-      subroutine paral33
-      integer, parameter :: AN1=5,AN2=5,AN3=5
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=-1,ln=6
-      character*11 tname
-      integer, allocatable :: A3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(*,BLOCK,BLOCK)    
-
-      tname='paral+2333'
-      allocate (A3(AN1,AN2,AN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,k3n*n+ln),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                if (A3(ia,ja,na).eq.(ia*NL/10+ja*NL/100+na*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c           print *,A3  
-      endif 
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------paral34
-c 34     PARALLEL ON  arrA[i][ j][2]  
-
-      subroutine paral34
-      integer, parameter :: AN1=6,AN2=6,AN3=6,BN1=3,BN2=3,BN3=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,ln=2
-      character*11 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(*,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(k1i*i+li,k2j*j+lj,ln)
-
-      tname='paral+2334'
-      allocate (A3(AN1,AN2,AN3), B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,ln),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------paral35
-c 35     PARALLEL ON  arrA[][ j][ k] 
-
-      subroutine paral35
-      integer, parameter :: AN1=6,AN2=6,AN3=6,BN1=6,BN2=6,BN3=6
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[*][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*11 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(*,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(*,k2j*j+lj,k3n*n+ln)
-
-      tname='paral+2335'
-      allocate (A3(AN1,AN2,AN3), B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(*,k2j*j+lj,k3n*n+ln),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------paral36
-c 36     PARALLEL ON  arrA[1][i][3] 
-
-      subroutine paral36
-      integer, parameter :: AN1=6,AN2=6,AN3=6,BN1=3,BN2=3,BN3=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[li][k2j*j+lj][ln]                                              
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=1
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,ln=3
-      character*11 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(*,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(*,j,*) WITH A3(li,k2j*j+lj,ln)
-
-      tname='paral+2336'
-      allocate (A3(AN1,AN2,AN3), B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region out(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(A3,B3) 
-
-      do i=1,BN1
-            do n=1,BN3
-!dvm$ parallel (j) on A3(li,k2j*j+lj,ln),
-!dvm$*                                          reduction (min (erri))
-          do j=1,BN2
-                if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo 
-          enddo 
-      enddo
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,B3  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------paral37
-c 37 arrA4[BLOCK][BLOCK] [BLOCK] 
-c       PARALLEL ON  arrA[i][2* j][k] stretching      
-
-      subroutine paral37
-      integer, parameter :: AN1=6,AN2=6,AN3=4
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=2,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*11 tname
-      integer, allocatable :: A3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,*,BLOCK)    
-
-      tname='paral+2337'
-      allocate (A3(AN1,AN2,AN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,k3n*n+ln),
-!dvm$* private (ia,ja,na), reduction (min (erri))
-
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                if (A3(ia,ja,na).eq.(ia*NL/10+ja*NL/100+na*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c           print *,A3  
-      endif 
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------paral38
-c 38     PARALLEL ON  arrA[i+2][ j][k]  shift
-
-      subroutine paral38
-      integer, parameter :: AN1=5,AN2=5,AN3=5
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*11 tname
-      integer, allocatable :: A3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,*,BLOCK)    
-
-      tname='paral+2338'
-      allocate (A3(AN1,AN2,AN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,k3n*n+ln),
-!dvm$* reduction (min (erri))
-!dvm$* , private(ia,ja,na)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                if (A3(ia,ja,na).eq.(ia*NL/10+ja*NL/100+na*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c           print *,A3  
-      endif
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------paral39
-c 39     PARALLEL ON  arrA[i][ j][-k+8]  reverse
-
-      subroutine paral39
-      integer, parameter :: AN1=5,AN2=5,AN3=5
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=-1,ln=6
-      character*11 tname
-      integer, allocatable :: A3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,*,BLOCK)    
-
-      tname='paral+2339'
-      allocate (A3(AN1,AN2,AN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,k3n*n+ln),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                if (A3(ia,ja,na).eq.(ia*NL/10+ja*NL/100+na*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c           print *,A3  
-      endif 
-      deallocate (A3)
-
-      end
-
-C ----------------------------------------------------paral310
-c 310     PARALLEL ON  arrA[i][ j][2]  
-
-      subroutine paral310
-      integer, parameter :: AN1=6,AN2=6,AN3=6,BN1=3,BN2=3,BN3=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln]                                              
-      integer, parameter :: k1i=1,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,ln=2     
-      character*11 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,*,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(k1i*i+li,k2j*j+lj,ln)
-
-      tname='paral+23310'
-      allocate (A3(AN1,AN2,AN3), B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(k1i*i+li,k2j*j+lj,ln),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-
-      s=0
-      cs=0
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------paral311
-c 311     PARALLEL ON  arrA[][ j][ k] 
-
-      subroutine paral311
-      integer, parameter :: AN1=6,AN2=6,AN3=6,BN1=6,BN2=6,BN3=6
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[*][k2j*j+lj][k3n*n+ln]                                              
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,ln=0
-      character*11 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,*,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(*,k2j*j+lj,k3n*n+ln)
-
-      tname='paral+23311'
-      allocate (A3(AN1,AN2,AN3), B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(*,k2j*j+lj,k3n*n+ln),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C ----------------------------------------------------paral312
-c 312     PARALLEL ON  arrA[1][i][3] 
-
-      subroutine paral312
-      integer, parameter :: AN1=6,AN2=6,AN3=6,BN1=3,BN2=3,BN3=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[li][k2j*j+lj][ln]                                              
-      integer, parameter :: k1i=0,k2i=0,k3i=0,li=1
-      integer, parameter :: k1j=0,k2j=1,k3j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,ln=3
-      character*11 tname
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A3(BLOCK,*,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(li,k2j*j+lj,ln)
-
-      tname='paral+23312'
-      allocate (A3(AN1,AN2,AN3), B3(BN1,BN2,BN3))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(i,j,n)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                    A3(i,j,n) =i*NL/10+j*NL/100+n*NL/1000     
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n) on A3(li,k2j*j+lj,ln),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                if (B3(i,j,n).eq.(i*NL/10+j*NL/100+n*NL/1000)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000)
-                endif 
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0    
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B3,A3)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*11 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*11 name
-      print *,name,'  -  ***error'
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus24.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus24.fdv
deleted file mode 100644
index 37e51ca..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus24.fdv
+++ /dev/null
@@ -1,502 +0,0 @@
-      program PARALLELPLUS24
-
-c    TESTING parallel CLAUSE .       
-c    arrA4[BLOCK][*][*][BLOCK] or arrA4[*][BLOCK][*][BLOCK]  etc.
-
-      print *, '====START OF paralplus24====================='
-C -------------------------------------------------
-c 41     PARALLEL ON  arrA[i][2* j][k][3*l] stretching
-       call paral41
-C -------------------------------------------------
-c 42     PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift
-       call paral42
-C -------------------------------------------------
-c 43     PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse
-c      call paral43
-C -------------------------------------------------
-c 44     PARALLEL ON  arrA[i][ j][2][ l]  
-c                                               compression            !!
-      call paral44
-C -------------------------------------------------
-c 45     PARALLEL ON  arrA[i][ j][ ][ k] 
-c                                               replication            
-      call paral45
-C -------------------------------------------------
-c 46     PARALLEL ON  arrA[i][ j][ ][3] 
-c                                               compression and replication            
-      call paral46
-C -------------------------------------------------
-      print *, '==== END OF paralplus24====================='
-C
-      end
-
-C ----------------------------------------------------paral41
-c 41 arrA4[*][*] [BLOCK] [BLOCK] 
-c       PARALLEL ON  arrA[i][2* j][k][3*l] stretching      
-
-      subroutine paral41
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=2,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=3,lm=0
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,*,BLOCK,BLOCK)    
-
-      tname='paral+2441'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral42
-c 42     PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift
-
-      subroutine paral42
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=3
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,BLOCK,*,BLOCK)    
-
-      tname='paral+2442'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral43
-c 43     PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse
-
-      subroutine paral43
-      integer, parameter :: AN1=6,AN2=6,AN3=7,AN4=7
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=-1,k4n=0,ln=8
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=-1,lm=8      
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,*,*)    
-
-      tname='paral+2442'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral44
-c 44     PARALLEL ON  arrA[i][ j][2][ l]  
-
-      subroutine paral44
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=2
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,*,*,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm)
-
-      tname='paral+2444'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------paral45
-c 45     PARALLEL ON  arrA[i][ j][ ][ k] 
-
-      subroutine paral45
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,BLOCK,BLOCK,*)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,*,k4m*m+lm)
-
-      tname='paral+2445'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,*,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------paral46
-c 46     PARALLEL ON  arrA[i][ j][ ][3] 
-
-      subroutine paral46
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][*][lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=0,lm=3
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,*,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,*,lm)
-
-      tname='paral+2446'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,*,lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*11 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*11 name
-      print *,name,'  -  ***error'
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus34.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus34.fdv
deleted file mode 100644
index 333410d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL/paralplus34.fdv
+++ /dev/null
@@ -1,501 +0,0 @@
-      program PARALLELPLUS34
-
-c    TESTING parallel CLAUSE .       
-c    arrA4[BLOCK][*][ BLOCK][BLOCK] or arrA4[*][BLOCK][ BLOCK][BLOCK]  etc.
-
-      print *, '====START OF paralplus34====================='
-C -------------------------------------------------
-c 41     PARALLEL ON  arrA[i][2* j][k][3*l] stretching
-       call paral41
-C -------------------------------------------------
-c 42     PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift
-       call paral42
-C -------------------------------------------------
-c 43     PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse
-c      call paral43
-C -------------------------------------------------
-c 44     PARALLEL ON  arrA[i][ j][2][ l]  
-c                                               compression            !!
-      call paral44
-C -------------------------------------------------
-c 45     PARALLEL ON  arrA[i][ j][ ][ k] 
-c                                               replication            
-      call paral45
-C -------------------------------------------------
-c 46     PARALLEL ON  arrA[i][ j][ ][3] 
-c                                               compression and replication            
-      call paral46
-C -------------------------------------------------
-      print *, '==== END OF paralplus34====================='
-C
-      end
-
-C ----------------------------------------------------paral41
-c 41 arrA4[BLOCK][*] [BLOCK] [BLOCK] 
-c       PARALLEL ON  arrA[i][2* j][k][3*l] stretching      
-
-      subroutine paral41
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=2,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=3,lm=0
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,*,BLOCK,BLOCK)    
-
-      tname='paral+3441'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral42
-c 42     PARALLEL ON  arrA[i+2][ j][k][ l+3]  shift
-
-      subroutine paral42
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=3
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,BLOCK,BLOCK,BLOCK)    
-
-      tname='paral+3442'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral43
-c 43     PARALLEL ON  arrA[i][ j][-k+8][- l+8]  reverse
-
-      subroutine paral43
-      integer, parameter :: AN1=6,AN2=6,AN3=7,AN4=7
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=-1,k4n=0,ln=8
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=-1,lm=8
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,*,BLOCK)    
-
-      tname='paral+3442'
-      allocate (A4(AN1,AN2,AN3,AN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4)
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-!dvm$* , private(ia,ja,na,ma)
-      do i=1,((AN1-li)/k1i)
-          do j=1,((AN2-lj)/k2j)
-            do n=1,((AN3-ln)/k3n)
-              do m=1,((AN4-lm)/k4m)
-                ia=k1i * i + li
-                ja=k2j * j + lj
-                na=k3n * n + ln
-                ma=k4m * m + lm
-                if (A4(ia,ja,na,ma).eq.
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (A4)
-
-      end
-
-C ----------------------------------------------------paral44
-c 44     PARALLEL ON  arrA[i][ j][2][ l]  
-
-      subroutine paral44
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][ln][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=2
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,*,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm)
-
-      tname='paral+3444'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,ln,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------paral45
-c 45     PARALLEL ON  arrA[i][ j][ ][ k] 
-
-      subroutine paral45
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][][k4m*m+lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=0
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,*)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,*,k4m*m+lm)
-
-      tname='paral+3445'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,*,k4m*m+lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------paral46
-c 46     PARALLEL ON  arrA[i][ j][ ][3] 
-
-      subroutine paral46
-      integer, parameter :: AN1=6,AN2=6,AN3=6,AN4=6
-      integer, parameter :: BN1=3,BN2=3,BN3=3,BN4=3
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for PARALLEL ON  arrA[k1i*i+li][k2j*j+lj][*][lm]                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=0
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=0,lm=3
-      character*11 tname
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,Avalue,Bvalue
-               
-!dvm$ distribute A4(*,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,*,lm)
-
-      tname='paral+3446'
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region local(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m)
-      do i=1,AN1
-          do j=1,AN2
-             do n=1,AN3
-                do m=1,AN4
-                    A4(i,j,n,m) =i*NL/10+j*NL/100+n*NL/1000+m     
-                enddo 
-             enddo
-          enddo
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(k1i*i+li,k2j*j+lj,*,lm),
-!dvm$*                                          reduction (min (erri))
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-              do m=1,BN4
-                if (B4(i,j,n,m).eq.(i*NL/10+j*NL/100+n*NL/1000+m)) 
-     *          then     
-                else
-                    erri = min(erri,i*NL/10+j*NL/100+n*NL/1000+m)
-                endif 
-              enddo
-            enddo
-          enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-     
-      s=0
-      cs=0		
-      if ((erri .eq.ER) .and.
-     *     (s .eq. cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-c           write (*,*) erri
-c          print *,A4  
-      endif 
-      deallocate (B4,A4)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character*11 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*11 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv
deleted file mode 100644
index 03cf886..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn1.fdv
+++ /dev/null
@@ -1,261 +0,0 @@
-      program PARALLELNoOn1
-
-c    TESTING parallel CLAUSE .       
-
-      print *,'===START OF parallelNoOn1========================'
-C --------------------------------------------------
-c 11  PARALLEL , REDUCTION
-      call parallelNoOn11
-C --------------------------------------------------
-c 12  PARALLEL, PRIVATE, REDUCTION
-      call parallelNoOn12
-C --------------------------------------------------
-c 13  PARALLEL, ACROSS , TIE, REDUCTION
-      call parallelNoOn13
-C --------------------------------------------------
-c 14  PARALLEL, ACROSS, TIE, REDUCTION
-      call parallelNoOn14
-C --------------------------------------------------
-      print *,'=== END OF parallelNoOn1 ========================= '    
-      end
-
-C ---------------------------------------------parallelNoOn11
-      subroutine parallelNoOn11
-      integer, parameter :: N = 100,  ER=10000
-      character*14:: tname='parallelNoOn11' 
-      integer, allocatable :: A(:),B(:),AS(:),BS(:)
-      integer:: erri=ER
-                      
-      allocate (B(N),A(N),BS(N),AS(N))
-
-
-      do i=1,N
-        if(i == N .or. i==1) then
-           AS(i) = 0
-        else
-           AS(i) = 1+i
-        endif
-      enddo
-
-      do i=2,N-1
-         BS(i) = AS(i-1)+AS(i+1)
-      enddo
-
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (i)
-      do i=1,N
-        if(i == N .or. i==1) then
-           A(i) = 0
-        else
-           A(i) = 1+i
-        endif
-
-      enddo
-
-!dvm$ parallel (i)
-      do i=2,N-1
-         B(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i), reduction( min( erri ) )
-      do i=2,N-1
-        if(B(i) .ne. BS(i)) erri =  min(erri, ABS(B(i)-BS(i)))
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-C ---------------------------------------------parallelNoOn12
-      subroutine parallelNoOn12
-      integer, parameter :: N = 100,  ER=10000
-      character*14:: tname='parallelNoOn12' 
-      integer, allocatable :: A(:),B(:),AS(:),BS(:)
-      integer:: erri=ER
-                      
-      allocate (B(N),A(N),BS(N),AS(N))
-
-
-      do i=1,N
-        if(i == N .or. i==1) then
-           AS(i) = 0
-        else
-           AS(i) = 1+i
-        endif
-      enddo
-
-      do i=2,N-1
-         BS(i) = AS(i-1)+AS(i+1)
-      enddo
-
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (i)
-      do i=1,N
-        if(i == N .or. i==1) then
-           A(i) = 0
-        else
-           A(i) = 1+i
-        endif
-
-      enddo
-
-!dvm$ parallel (i), private(IA1,IA2)
-      do i=2,N-1
-         IA1 = A(i-1)
-         IA2 = A(i+1)
-         B(i) = IA1+IA2
-      enddo
-  
-!dvm$ parallel (i), reduction( min( erri ) )
-      do i=2,N-1
-        if(B(i) .ne. BS(i)) erri =  min(erri, ABS(B(i)-BS(i)))
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-
-C ---------------------------------------------parallelNoOn13
-      subroutine parallelNoOn13
-      integer, parameter :: N = 100,  ER=10000
-      character*14:: tname='parallelNoOn13' 
-      integer, allocatable :: A(:),AS(:)
-      integer:: erri=ER
-                      
-      allocate (A(N),AS(N))
-
-
-      do i=1,N
-        if(i == N .or. i==1) then
-           AS(i) = 0
-        else
-           AS(i) = 1+i
-        endif
-      enddo
-
-      do i=2,N-1
-         AS(i) = AS(i-1)+AS(i+1)
-      enddo
-
-!dvm$ actual(erri)
-!dvm$ region local(A)
-!dvm$ parallel (i)
-      do i=1,N
-        if(i == N .or. i==1) then
-           A(i) = 0
-        else
-           A(i) = 1+i
-        endif
-
-      enddo
-
-!dvm$ parallel (i), across(A(1:1)), tie(A(i))
-      do i=2,N-1
-         A(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i), reduction( min( erri ) )
-      do i=2,N-1
-        if(A(i) .ne. AS(i)) erri =  min(erri, ABS(A(i)-AS(i)))
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,AS)
-
-      end
-
-C ---------------------------------------------parallelNoOn14
-      subroutine parallelNoOn14
-      integer, parameter :: N = 100,  ER=10000
-      character*14:: tname='parallelNoOn14' 
-      integer, allocatable :: A(:),B(:),AS(:),BS(:)
-      integer:: erri=ER
-                      
-      allocate (B(N),A(N),BS(N),AS(N))
-
-
-      do i=1,N
-        if(i == N .or. i==1) then
-           AS(i) = 0
-           BS(i) = 0
-        else
-           AS(i) = 1+i
-           BS(i) = i
-        endif
-      enddo
-
-      do i=3,N-1
-         AS(i) = AS(i-1)+AS(i+1)
-         BS(i) = BS(i-2)
-      enddo
-
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (i)
-      do i=1,N
-        if(i == N .or. i==1) then
-           A(i) = 0
-           B(i) = 0
-        else
-           A(i) = 1+i
-           B(i) = i
-        endif
-
-      enddo
-
-!dvm$ parallel (i), across(A(1:1),B(2:0)), tie(A(i),B(i)) 
-      do i=3,N-1
-         A(i) = A(i-1)+A(i+1)
-         B(i) = B(i-2)
-      enddo
-  
-!dvm$ parallel (i), reduction( min( erri ) )
-      do i=2,N-1
-        if(A(i) .ne. AS(i)) erri =  min(erri, ABS(A(i)-AS(i)))
-        if(B(i) .ne. BS(i)) erri =  min(erri, ABS(B(i)-BS(i)))
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*14 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*14 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv
deleted file mode 100644
index 3d0e659..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn12.fdv
+++ /dev/null
@@ -1,305 +0,0 @@
-      program PARALLELNoOn2
-
-c    TESTING parallel CLAUSE .       
-
-      print *,'===START OF parallelNoOn2========================'
-C --------------------------------------------------
-c 11  PARALLEL , REDUCTION
-      call parallelNoOn21
-C --------------------------------------------------
-c 12  PARALLEL, PRIVATE, REDUCTION
-      call parallelNoOn22
-C --------------------------------------------------
-c 13  PARALLEL, ACROSS , TIE, REDUCTION
-      call parallelNoOn23
-C --------------------------------------------------
-c 14  PARALLEL, ACROSS, TIE, REDUCTION
-      call parallelNoOn24
-C --------------------------------------------------
-      print *,'=== END OF parallelNoOn2 ========================= '    
-      end
-
-C ---------------------------------------------parallelNoOn21
-      subroutine parallelNoOn21
-      integer, parameter :: N = 100,  ER=10000
-      character*14:: tname='parallelNoOn21' 
-      integer, allocatable :: A(:,:),B(:,:),AS(:,:),BS(:,:)
-      integer:: erri=ER
-                      
-      allocate (B(N,N),A(N,N),BS(N,N),AS(N,N))
-
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1) then
-           AS(i,j) = 0
-        else
-           AS(i,j) = i+j
-        endif
-      enddo
-      enddo
-
-      do j=2,N-1
-      do i=2,N-1
-         BS(i,j) = AS(i-1,j)+AS(i+1,j)+AS(i,j+1)+AS(i,j-1)
-      enddo
-      enddo
-
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (j,i)
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1) then
-           A(i,j) = 0
-        else
-           A(i,j) = i+j
-        endif
-      enddo
-      enddo
-
-!dvm$ parallel (j,i)
-      do j=2,N-1
-      do i=2,N-1
-        B(i,j) = A(i-1,j)+A(i+1,j)+A(i,j+1)+A(i,j-1)
-      enddo
-      enddo
-  
-!dvm$ parallel (j,i), reduction( min( erri ) )
-      do j=2,N-1
-      do i=2,N-1
-        if(B(i,j) .ne. BS(i,j)) erri =  min(erri, ABS(B(i,j)-BS(i,j)))
-      enddo
-      enddo
-
-!dvm$ end region
-   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-C ---------------------------------------------parallelNoOn22
-      subroutine parallelNoOn22
-      integer, parameter :: N = 100,  ER=10000
-      character*14:: tname='parallelNoOn22' 
-      integer, allocatable :: A(:,:),B(:,:),AS(:,:),BS(:,:)
-      integer:: erri=ER
-                      
-      allocate (B(N,N),A(N,N),BS(N,N),AS(N,N))
-
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1) then
-           AS(i,j) = 0
-        else
-           AS(i,j) = i+j
-        endif
-      enddo
-      enddo
-
-      do j=2,N-1
-      do i=2,N-1
-         BS(i,j) = AS(i-1,j)+AS(i+1,j)+AS(i,j+1)+AS(i,j-1)
-      enddo
-      enddo
-
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (j,i), private(ij)
-      do j=1,N
-      do i=1,N
-        ij = i+j
-        if(i == N .or. i==1 .or. j==N .or. j==1) then
-           A(i,j) = 0
-        else
-           A(i,j) = ij
-        endif
-
-      enddo
-      enddo
-
-!dvm$ parallel (j,i), private(iai,iaj)
-      do j=2,N-1
-      do i=2,N-1
-        iai = A(i-1,j)+A(i+1,j)
-        iaj = A(i,j+1)+A(i,j-1)
-        B(i,j) = iai+iaj
-      enddo
-      enddo
-  
-!dvm$ parallel (j,i), reduction( min( erri ) )
-      do j=2,N-1
-      do i=2,N-1
-        if(B(i,j) .ne. BS(i,j)) erri =  min(erri, ABS(B(i,j)-BS(i,j)))
-      enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-C ---------------------------------------------parallelNoOn23
-      subroutine parallelNoOn23
-      integer, parameter :: N = 100,  ER=10000
-      character*14:: tname='parallelNoOn23' 
-      integer, allocatable :: A(:,:),B(:,:),AS(:,:),BS(:,:)
-      integer:: erri=ER
-                      
-      allocate (B(N,N),A(N,N),BS(N,N),AS(N,N))
-
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1) then
-           AS(i,j) = 0
-           BS(i,j) = 0
-        else
-           AS(i,j) = i+j
-           BS(i,j) = i+j+2
-        endif
-      enddo
-      enddo
-
-      do j=2,N-1
-      do i=2,N-2
-         AS(i,j) = AS(i-1,j)+AS(i+1,j)+AS(i,j+1)+AS(i,j-1)
-         BS(i,j) = BS(i-1,j)+BS(i+2,j)+AS(i,j)
-      enddo
-      enddo
-
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (j,i)
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1) then
-           A(i,j) = 0
-           B(i,j) = 0
-        else
-           A(i,j) = i+j
-           B(i,j) = i+j+2
-        endif
-
-      enddo
-      enddo
-
-!dvm$ parallel (j,i), across(A(1:1,1:1),B(1:2,0:0)),tie(A(i,j),B(i,j))
-      do j=2,N-1
-      do i=2,N-2
-        A(i,j) = A(i-1,j)+A(i+1,j)+A(i,j+1)+A(i,j-1)
-        B(i,j) = B(i-1,j)+B(i+2,j)+A(i,j)
-      enddo
-      enddo
-  
-!dvm$ parallel (j,i), reduction( min( erri ) )
-      do j=1,N
-      do i=1,N
-        if(A(i,j) .ne. AS(i,j)) erri =  min(erri, ABS(A(i,j)-AS(i,j)))
-        if(B(i,j) .ne. BS(i,j)) erri =  min(erri, ABS(B(i,j)-BS(i,j)))
-      enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-C ---------------------------------------------parallelNoOn24
-      subroutine parallelNoOn24
-      integer, parameter :: N = 100,  ER=10000
-      character*14:: tname='parallelNoOn24' 
-      integer, allocatable :: A(:,:),B(:,:),AS(:,:),BS(:,:)
-      integer:: erri=ER
-                      
-      allocate (B(N,N),A(N,N),BS(N,N),AS(N,N))
-
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1) then
-           AS(i,j) = 0
-           BS(i,j) = 0
-        else
-           AS(i,j) = i+j
-           BS(i,j) = i+j+2
-        endif
-      enddo
-      enddo
-
-      do j=2,N-1
-      do i=2,N-1
-         AS(i,j) = AS(i-1,j)+AS(i+1,j)+AS(i,j+1)+AS(i,j-1)
-         BS(i+1,j) = BS(i-1,j)+BS(i+1,j)+AS(i,j)
-      enddo
-      enddo
-
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (j,i)
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1) then
-           A(i,j) = 0
-           B(i,j) = 0
-        else
-           A(i,j) = i+j
-           B(i,j) = i+j+2
-        endif
-
-      enddo
-      enddo
-
-!dvm$ parallel (j,i),across(A(1:1,1:1),B(2:0,0:0)),tie(A(i,j),B(i+1,j))
-      do j=2,N-1
-      do i=2,N-1
-        A(i,j) = A(i-1,j)+A(i+1,j)+A(i,j+1)+A(i,j-1)
-        B(i+1,j) = B(i-1,j)+B(i+1,j)+A(i,j)
-      enddo
-      enddo
-  
-!dvm$ parallel (j,i), reduction( min( erri ) )
-      do j=1,N
-      do i=1,N
-        if(A(i,j) .ne. AS(i,j)) erri =  min(erri, ABS(A(i,j)-AS(i,j)))
-        if(B(i,j) .ne. BS(i,j)) erri =  min(erri, ABS(B(i,j)-BS(i,j)))
-      enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*14 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*14 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv
deleted file mode 100644
index 3e24af7..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/parallelNoOn13.fdv
+++ /dev/null
@@ -1,346 +0,0 @@
-      program PARALLELNoOn3
-
-c    TESTING parallel CLAUSE .       
-
-      print *,'===START OF parallelNoOn3========================'
-C --------------------------------------------------
-c 11  PARALLEL , REDUCTION
-      call parallelNoOn31
-C --------------------------------------------------
-c 12  PARALLEL, PRIVATE, REDUCTION
-      call parallelNoOn32
-C --------------------------------------------------
-c 13  PARALLEL, ACROSS , TIE, REDUCTION
-      call parallelNoOn33
-C --------------------------------------------------
-c 14  PARALLEL, ACROSS, TIE, REDUCTION
-      call parallelNoOn34
-C --------------------------------------------------
-      print *,'=== END OF parallelNoOn3 ========================= '    
-      end
-
-C ---------------------------------------------parallelNoOn31
-      subroutine parallelNoOn31
-      integer, parameter :: N = 10,  ER=10000
-      character*14:: tname='parallelNoOn31' 
-      integer, allocatable :: A(:,:,:),B(:,:,:),AS(:,:,:),BS(:,:,:)
-      integer:: erri=ER
-                      
-      allocate (B(N,N,N),A(N,N,N),BS(N,N,N),AS(N,N,N))
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1 .or.k==N .or.k==1) then
-           AS(i,j,k) = 0
-           BS(i,j,k) = 0
-        else
-           AS(i,j,k) = i+j+k
-        endif
-      enddo
-      enddo
-      enddo
-      do k=2,N-1
-      do j=2,N-1
-      do i=2,N-1
-         BS(i,j,k) = AS(i-1,j,k)+AS(i+1,j,k)+AS(i,j+1,k)+AS(i,j-1,k)
-     &             + AS(i,j,k-1) + AS(i,j,k+1)
-      enddo
-      enddo
-      enddo
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (k,j,i)
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1 .or.k==N .or.k==1) then
-           A(i,j,k) = 0
-           B(i,j,k) = 0
-        else
-           A(i,j,k) = i+j+k
-        endif
-      enddo
-      enddo
-      enddo
-!dvm$ parallel (k,j,i)
-      do k=2,N-1
-      do j=2,N-1
-      do i=2,N-1
-        B(i,j,k) =  A(i-1,j,k)+A(i+1,j,k)+A(i,j+1,k)+A(i,j-1,k)
-     &          + A(i,j,k-1) + A(i,j,k+1)
-      enddo
-      enddo
-      enddo
-!dvm$ parallel (k,j,i), reduction( min( erri ) )
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(B(i,j,k) .ne. BS(i,j,k)) 
-     &      erri =  min(erri, ABS(B(i,j,k)-BS(i,j,k)))
-      enddo
-      enddo
-      enddo
-!dvm$ end region
-   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-C ---------------------------------------------parallelNoOn32
-      subroutine parallelNoOn32
-      integer, parameter :: N = 10,  ER=10000
-      character*14:: tname='parallelNoOn32' 
-      integer, allocatable :: A(:,:,:),B(:,:,:),AS(:,:,:),BS(:,:,:)
-      integer:: erri=ER
-                      
-      allocate (B(N,N,N),A(N,N,N),BS(N,N,N),AS(N,N,N))
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1 .or.k==N .or.k==1) then
-           AS(i,j,k) = 0
-           BS(i,j,k) = 0
-        else
-           AS(i,j,k) = i+j+k
-        endif
-      enddo
-      enddo
-      enddo
-      do k=2,N-1
-      do j=2,N-1
-      do i=2,N-1
-         BS(i,j,k) = AS(i-1,j,k)+AS(i+1,j,k)+AS(i,j+1,k)+AS(i,j-1,k)
-     &             + AS(i,j,k-1) + AS(i,j,k+1)
-      enddo
-      enddo
-      enddo
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (k,j,i), private(i0) 
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1 .or.k==N .or.k==1) then
-           i0 = 0
-           A(i,j,k) = i0
-           B(i,j,k) = i0
-        else
-           A(i,j,k) = i+j+k
-        endif
-      enddo
-      enddo
-      enddo
-!dvm$ parallel (k,j,i),private(ia1,ja1,ka1)
-      do k=2,N-1
-      do j=2,N-1
-      do i=2,N-1
-        ia1 = A(i-1,j,k)
-        ja1 = A(i,j-1,k)
-        ka1 = A(i,j,k-1)
-        B(i,j,k) = ia1+A(i+1,j,k)+A(i,j+1,k)+ ja1
-     &          + ka1 + A(i,j,k+1)
-      enddo
-      enddo
-      enddo
-!dvm$ parallel (k,j,i), reduction( min( erri ) )
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(B(i,j,k) .ne. BS(i,j,k)) 
-     &      erri =  min(erri, ABS(B(i,j,k)-BS(i,j,k)))
-      enddo
-      enddo
-      enddo
-!dvm$ end region
-   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-C ---------------------------------------------parallelNoOn33
-      subroutine parallelNoOn33
-      integer, parameter :: N = 10,  ER=10000
-      character*14:: tname='parallelNoOn33' 
-      integer, allocatable :: A(:,:,:),B(:,:,:),AS(:,:,:),BS(:,:,:)
-      integer:: erri=ER
-                      
-      allocate (B(N,N,N),A(N,N,N),BS(N,N,N),AS(N,N,N))
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1 .or.k==N .or.k==1) then
-           AS(i,j,k) = 0
-           BS(i,j,k) = 0
-        else
-           AS(i,j,k) = i+j+k
-           BS(i,j,k) = i+j+k+1
-        endif
-      enddo
-      enddo
-      enddo
-      do k=2,N-2
-      do j=2,N-1
-      do i=2,N-1
-         AS(i,j,k) = AS(i-1,j,k)+AS(i+1,j,k)+AS(i,j+1,k)+AS(i,j-1,k)
-     &             + AS(i,j,k-1) + AS(i,j,k+1)
-         BS(i,j,k) = BS(i,j,k) + BS(i-1,j,k) + BS(i,j,k+2)
-      enddo
-      enddo
-      enddo
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (k,j,i)
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1 .or.k==N .or.k==1) then
-           A(i,j,k) = 0
-           B(i,j,k) = 0
-        else
-           A(i,j,k) = i+j+k
-           B(i,j,k) = i+j+k+1
-        endif
-      enddo
-      enddo
-      enddo
-!dvm$ parallel (k,j,i), tie(A(i,j,k),B(i,j,k)), 
-!dvm$&     across(A(1:1,1:1,1:1),B(1:0,0:0,0:2))
-      do k=2,N-2
-      do j=2,N-1
-      do i=2,N-1
-
-         A(i,j,k) =  A(i-1,j,k)+A(i+1,j,k)+A(i,j+1,k)+A(i,j-1,k)
-     &          + A(i,j,k-1) + A(i,j,k+1)
-         B(i,j,k) = B(i,j,k) + B(i-1,j,k) + B(i,j,k+2)
-      enddo
-      enddo
-      enddo
-!dvm$ parallel (k,j,i), reduction( min( erri ) )
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(A(i,j,k) .ne. AS(i,j,k)) 
-     &      erri =  min(erri, ABS(A(i,j,k)-AS(i,j,k)))
-        if(B(i,j,k) .ne. BS(i,j,k)) 
-     &      erri =  min(erri, ABS(B(i,j,k)-BS(i,j,k)))
-      enddo
-      enddo
-      enddo
-!dvm$ end region
-   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-C ---------------------------------------------parallelNoOn34
-      subroutine parallelNoOn34
-      integer, parameter :: N = 10,  ER=10000
-      character*14:: tname='parallelNoOn34' 
-      integer, allocatable :: A(:,:,:),B(:,:,:),AS(:,:,:),BS(:,:,:)
-      integer:: erri=ER
-                      
-      allocate (B(N,N,N),A(N,N,N),BS(N,N,N),AS(N,N,N))
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1 .or.k==N .or.k==1) then
-           AS(i,j,k) = 0
-           BS(i,j,k) = 0
-        else
-           AS(i,j,k) = i+j+k
-           BS(i,j,k) = i+j+k+1
-        endif
-      enddo
-      enddo
-      enddo
-      do k=2,N-1
-      do j=2,N-1
-      do i=2,N-1
-         AS(i,j,k) = AS(i-1,j,k)+AS(i+1,j,k)+AS(i,j+1,k)+AS(i,j-1,k)
-     &             + AS(i,j,k-1) + AS(i,j,k+1)
-         BS(i+1,j,k-1) = BS(i+1,j,k) + BS(i-1,j,k-1) + BS(i+1,j,k+1)
-      enddo
-      enddo
-      enddo
-!dvm$ actual(erri)
-!dvm$ region local(A,B)
-!dvm$ parallel (k,j,i)
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(i == N .or. i==1 .or. j==N .or. j==1 .or.k==N .or.k==1) then
-           A(i,j,k) = 0
-           B(i,j,k) = 0
-        else
-           A(i,j,k) = i+j+k
-           B(i,j,k) = i+j+k+1
-        endif
-      enddo
-      enddo
-      enddo
-!dvm$ parallel (k,j,i), tie(A(i,j,k),B(i+1,j,k-1)), 
-!dvm$&     across(A(1:1,1:1,1:1),B(2:0,0:0,0:2))
-      do k=2,N-1
-      do j=2,N-1
-      do i=2,N-1
-
-         A(i,j,k) =  A(i-1,j,k)+A(i+1,j,k)+A(i,j+1,k)+A(i,j-1,k)
-     &          + A(i,j,k-1) + A(i,j,k+1)
-         B(i+1,j,k-1) = B(i+1,j,k) + B(i-1,j,k-1) + B(i+1,j,k+1)
-      enddo
-      enddo
-      enddo
-!dvm$ parallel (k,j,i), reduction( min( erri ) )
-      do k=1,N
-      do j=1,N
-      do i=1,N
-        if(A(i,j,k) .ne. AS(i,j,k)) 
-     &      erri =  min(erri, ABS(A(i,j,k)-AS(i,j,k)))
-        if(B(i,j,k) .ne. BS(i,j,k)) 
-     &      erri =  min(erri, ABS(B(i,j,k)-BS(i,j,k)))
-      enddo
-      enddo
-      enddo
-!dvm$ end region
-   
-!dvm$ get_actual(erri) 
-      
-      if (erri .eq. ER) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,AS,BS)
-      
-      end
-
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*14 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*14 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/settings
deleted file mode 100644
index fd6919c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PARALLEL_NO_ON/settings
+++ /dev/null
@@ -1 +0,0 @@
-ALLOW_MULTIDEV=0
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf11.fdv
deleted file mode 100644
index d6e257d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf11.fdv
+++ /dev/null
@@ -1,293 +0,0 @@
-      program PRF11
-     
-c    TESTING OF THE PREFETCH DIRECTIVE . 
-
-      print *,'===START OF PRF11========================'
-C --------------------------------------------------
-      call prf1101
-      call prf1102
-      call prf1103
-C --------------------------------------------------
-
-C
-      print *,'=== END OF PRF11 ========================= '    
-      end
-C ---------------------------------------------PRF1101
-      subroutine PRF1101
-      integer, parameter ::  N = 16,NL=1000,NIT=3
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop, ib1,ib2,ib3,ib4,ib5,ib6,ib7,ib8,ib9
-      character*7 tname
-                
-cdvm$ distribute B(BLOCK)     
-
-cdvm$ align (I) with B(I) ::A,D
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF1101'
-      allocate (B(N),A(N),C(N),D(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-        B(i)=NL+i
-        D(i)=NL+i
-      enddo
-
-      it=0
-      do it=1,NIT
-
-cdvm$ prefetch GR1 
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-                                              
-cdvm$ remote_access (GR1:A(1))
-      ib1=A(1)
-               
-cdvm$ remote_access (GR2:A(N/2))
-      ib2=A(N/2)  
-cdvm$ remote_access (GR3:A(N))
-      ib3=A(N)
-
-cdvm$ remote_access (GR1:B(2))
-      ib4=B(2)
-               
-cdvm$ remote_access (GR2:B(N/2-1))
-      ib5=B(N/2-1)  
-cdvm$ remote_access (GR3:B(N-1))
-      ib6=B(N-1)
-cdvm$ remote_access (GR1:D(3))
-      ib7=D(3)
-               
-cdvm$ remote_access (GR2:D(N/2-2))
-      ib8=D(N/2-2)  
-cdvm$ remote_access (GR3:D(N-2))
-      ib9=D(N-2)
-
-
-      if ((ib1 .eq.C(1)).and.(ib2.eq.C(N/2)).and.(ib3.eq.C(N))
-     * .and.(ib4 .eq.C(2)) .and.(ib5 .eq.C(N/2-1))
-     * .and.(ib6 .eq.C(N-1))
-     * .and.(ib7 .eq.C(3)).and.(ib8 .eq.C(N/2-2))
-     * .and.(ib9 .eq.C(N-2))) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      end
-C ---------------------------------------------PRF1102
-      subroutine PRF1102
-      integer, parameter ::  N = 16,NL=1000,NIT=3
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop 
-      character*7 tname
-                
-cdvm$ distribute B(BLOCK)     
-
-cdvm$ align (I) with B(I) ::A
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF1102'
-      allocate (B(N),A(N),C(N),D(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-      it=0
-      do it=1,NIT
-
-
-cdvm$ prefetch GR1 
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-                                              
-      isumc1=0
-      isuma1=0  
-
-cdvm$ remote_access (GR1:A(:))
-                                            
-      do i=1,N         
-       D(i)=A(i)
-       isumc1=isumc1+C(i)
-       isuma1=isuma1+D(i)
-      enddo
-      isumc2=0
-      isuma2=0
-
-
-      kk=2
-      kk1=3
-cdvm$ remote_access (GR2:A(:))                                               
-      do i=1,N/kk-kk1
-       D(i)=A(kk*i+kk1)
-       isumc2=isumc2+C(kk*i+kk1)
-       isuma2=isuma2+D(i)
-      enddo
-
-
-      if ((isumc1 .eq.isuma1) .and.(isumc2 .eq.isuma2)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-      enddo
-      deallocate (A,B,C,D)
-
-      end
-C ---------------------------------------------PRF1103
-      subroutine PRF1103     
-      integer, parameter ::  N = 16,NL=1000,NIT=3
-      integer, allocatable :: A(:),B(:),C(:),A1(:)
-      integer nloop 
-      character*7 tname
-                
-cdvm$ distribute B(BLOCK)     
-
-cdvm$ align (I) with B(I) ::A,A1
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF1103'
-      allocate (B(N),A(N),C(N),A1(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-        A1(i) = NL+i
-      enddo
-
-      it=0
-      do it=1,NIT
-
-cdvm$ prefetch GR1 
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-
-      nloop1=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR1:A(1))
-      do i=1,N
-         B(i) = A(1)
-      enddo
-*dvm$ parallel (i) on A(i), reduction( min( nloop1 ) )
-      do i=1,N
-          if (B(i).ne.C(1)) nloop1=min(nloop1,i)
-      enddo
-
-      nloop2=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR1:A(N))
-      do i=1,N
-         B(i) = A(N)
-      enddo
-*dvm$ parallel (i) on B(i), reduction( min( nloop2 ) )
-      do i=1,N
-
-          if (B(i).ne.C(N)) nloop2=min(nloop2,i)
-      enddo                                     
-      nloop3=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR2:A(N/2))
-      do  i=1,N
-         B(i) = A(N/2)
-      enddo
-*dvm$ parallel (i) on B(i), reduction( min( nloop3 ) )
-      do i=1,N
-          if (B(i).ne.C(N/2)) nloop3=min(nloop3,i)
-      enddo
-               
-      nloop4=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR2:A)
-      do  i=1,N
-         B(i) = A(i)
-      enddo
-*dvm$ parallel (i) on B(i), reduction( min( nloop4 ) )
-      do  i=1,N
-          if (B(i).ne.C(i)) nloop4=min(nloop4,i)
-      enddo
-      nloop5=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR3:A1(i))
-      do i=1,N
-         B(i) = A1(i)
-      enddo
-*dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(i)) nloop=min(nloop,i)
-      enddo
-
-      nloop6=NL
-      kk=2
-      kk1=3         
-*dvm$ parallel (i) on B(i),remote_access(GR3:A(kk*i+kk1))
-      do i=1,N/kk-kk1
-         B(i) = A(kk*i+kk1)
-      enddo
-
-*dvm$ parallel (i) on B(i), reduction( min( nloop6 ) )
-      do i=1,N/kk-kk1
-          if (B(i).ne.C(kk*i+kk1)) nloop6=min(nloop6,i)
-      enddo
-
-          
-       if ((nloop1 .eq.NL) .and.(nloop2 .eq.NL).and.(nloop2 .eq.NL)
-     * .and.(nloop3 .eq.NL).and.(nloop4 .eq.NL).and.(nloop5 .eq.NL)
-     * .and.(nloop6 .eq.NL)  ) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,A1)
-      end
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-         AR(i) = NL+i
-      enddo                   
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf12.fdv
deleted file mode 100644
index ee5f7b3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf12.fdv
+++ /dev/null
@@ -1,285 +0,0 @@
-      program PRF12
-     
-c    TESTING OF THE PREFETCH DIRECTIVE . 
-
-      print *,'===START OF PRF11========================'
-C --------------------------------------------------
-      call prf1201
-      call prf1202
-      call prf1203
-C --------------------------------------------------
-
-C
-      print *,'=== END OF PRF12 ========================= '    
-      end
-C ---------------------------------------------PRF1201
-      subroutine PRF1201
-      integer, parameter ::  N = 16,NL=1000,NIT=3
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop 
-      character*7 tname
-                
-cdvm$ distribute B(*)     
-
-cdvm$ align (I) with B(I) ::A,D
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF1201'
-      allocate (B(N),A(N),C(N),D(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-        B(i)=NL+i
-        D(i)=NL+i
-      enddo
-      it=0
-      do it=1,NIT
-
-cdvm$ prefetch GR1 
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-                                              
-cdvm$ remote_access (GR1:A(1))
-      ib1=A(1)
-               
-cdvm$ remote_access (GR2:A(N/2))
-      ib2=A(N/2)  
-
-cdvm$ remote_access (GR3:A(N))
-      ib3=A(N)
-
-cdvm$ remote_access (GR1:B(2))
-      ib4=B(2)
-               
-cdvm$ remote_access (GR2:B(N/2-1))
-      ib5=B(N/2-1)  
-
-cdvm$ remote_access (GR3:B(N-1))
-      ib6=B(N-1)
-
-cdvm$ remote_access (GR1:D(3))
-      ib7=D(3)
-               
-cdvm$ remote_access (GR2:D(N/2-2))
-      ib8=D(N/2-2)  
-
-cdvm$ remote_access (GR3:D(N-2))
-      ib9=D(N-2)
-
-      if ((ib1 .eq.C(1)).and.(ib2.eq.C(N/2)).and.(ib3.eq.C(N))
-     * .and.(ib4 .eq.C(2)) .and.(ib5 .eq.C(N/2-1))
-     * .and.(ib6 .eq.C(N-1))
-     * .and.(ib7 .eq.C(3)).and.(ib8 .eq.C(N/2-2))
-     * .and.(ib9 .eq.C(N-2))) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-      enddo
-      deallocate (A,B,C,D)
-      end
-C ---------------------------------------------PRF1202
-      subroutine PRF1202     
-      integer, parameter ::  N = 16,NL=1000,NIT=3
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop 
-      character*7 tname
-                
-cdvm$ distribute B(*)     
-
-cdvm$ align (I) with B(I) ::A
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF1202'
-      allocate (B(N),A(N),C(N),D(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-      it=0
-      do it=1,NIT
-
-cdvm$ prefetch GR1 
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-                                              
-      isumc1=0
-      isuma1=0  
-
-cdvm$ remote_access (GR1:A(:))                                           
-      do i=1,N         
-       D(i)=A(i)
-       isumc1=isumc1+C(i)
-       isuma1=isuma1+D(i)
-      enddo
-
-      isumc2=0
-      isuma2=0
-
-      kk=2
-      kk1=3
-cdvm$ remote_access (GR2:A(:))                                               
-      do i=1,N/kk-kk1
-       D(i)=A(kk*i+kk1)
-       isumc2=isumc2+C(kk*i+kk1)
-       isuma2=isuma2+D(i)
-      enddo
-      if ((isumc1 .eq.isuma1) .and.(isumc2 .eq.isuma2)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,D)
-      end
-C ---------------------------------------------PRF1203
-      subroutine PRF1203     
-      integer, parameter ::  N = 16,NL=1000,NIT=3
-      integer, allocatable :: A(:),B(:),C(:),A1(:)
-      integer nloop 
-      character*7 tname
-                
-cdvm$ distribute B(*)     
-
-cdvm$ align (I) with B(I) ::A,A1
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF1203'
-      allocate (B(N),A(N),C(N),A1(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-        A1(i) = NL+i
-      enddo
-
-      it=0
-      do it=1,NIT
-
-cdvm$ prefetch GR1 
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-
-      nloop1=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR1:A(1))
-      do i=1,N
-         B(i) = A(1)
-      enddo
-*dvm$ parallel (i) on A(i), reduction( min( nloop1 ) )
-      do i=1,N
-          if (B(i).ne.C(1)) nloop1=min(nloop1,i)
-      enddo
-
-      nloop2=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR1:A(N))
-      do i=1,N
-         B(i) = A(N)
-      enddo
-*dvm$ parallel (i) on B(i), reduction( min( nloop2 ) )
-      do i=1,N
-          if (B(i).ne.C(N)) nloop2=min(nloop2,i)
-      enddo
-      nloop3=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR2:A(N/2))
-      do  i=1,N
-         B(i) = A(N/2)
-      enddo
-*dvm$ parallel (i) on B(i), reduction( min( nloop3 ) )
-      do i=1,N
-          if (B(i).ne.C(N/2)) nloop3=min(nloop3,i)
-      enddo
-               
-      nloop4=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR2:A)
-      do  i=1,N
-         B(i) = A(i)
-      enddo
-*dvm$ parallel (i) on B(i), reduction( min( nloop4 ) )
-      do  i=1,N
-          if (B(i).ne.C(i)) nloop4=min(nloop4,i)
-      enddo
-      nloop5=NL
-
-*dvm$ parallel (i) on B(i),remote_access(GR3:A1(i))
-      do i=1,N
-         B(i) = A1(i)
-      enddo
-*dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(i)) nloop=min(nloop,i)
-      enddo
-
-      nloop6=NL
-      kk=2
-      kk1=3         
-*dvm$ parallel (i) on B(i),remote_access(GR3:A(kk*i+kk1))
-      do i=1,N/kk-kk1
-         B(i) = A(kk*i+kk1)
-      enddo
-
-*dvm$ parallel (i) on B(i), reduction( min( nloop6 ) )
-      do i=1,N/kk-kk1
-          if (B(i).ne.C(kk*i+kk1)) nloop6=min(nloop6,i)
-      enddo
-          
-      if ((nloop1 .eq.NL) .and.(nloop2 .eq.NL).and.(nloop2 .eq.NL)
-     * .and.(nloop3 .eq.NL).and.(nloop4 .eq.NL).and.(nloop5 .eq.NL)
-     * .and.(nloop6 .eq.NL)  ) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,A1)
-      end
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo                   
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf21.fdv
deleted file mode 100644
index ac15437..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf21.fdv
+++ /dev/null
@@ -1,452 +0,0 @@
-      program PRF21
-     
-c    TESTING OF THE PREFETCH DIRECTIVE. 
-
-      print *,'===START OF PRF21========================'
-C --------------------------------------------------
-      call prf2101
-      call prf2102
-      call prf2103
-C
-      print *,'=== END OF PRF21 ========================= '    
-      end
-C ---------------------------------------------------------PRF2101
-      subroutine PRF2101
-      integer, parameter ::  N = 4,M=4,NL=1000,NIT=3
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer, allocatable :: A1(:,:),A2(:,:),A3(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-cdvm$ distribute B(BLOCK,BLOCK)    
-cdvm$ align(:,:) with B(:,:) :: A,A1,A2,A3
- 
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF2101'
-      allocate (B(N,M),A(N,M))
-      allocate (C(N,M),D(N,M))
-      allocate (A1(N,M),A2(N,M),A3(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-      enddo
-      enddo 
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-
-cdvm$ remote_access (GR1:A(1,1))
-      ib1=A(1,1)
-cdvm$ remote_access (GR1:A(N,M))
-      ib2=A(N,M)            
-cdvm$ remote_access (GR2:A(1,M))
-      ib3=A(1,M)            
-cdvm$ remote_access (GR3:A(N,1))
-      ib4=A(N,1)
-      if ((ib1 .eq.C(1,1)).and.(ib2.eq.C(N,M)).and.(ib3.eq.C(1,M)).and.
-     *      (ib4 .eq. C(N,1)) ) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-      enddo
-      deallocate (A,B,C,D)
-      deallocate (A1,A2,A3)
-      end 
-C ---------------------------------------------------------PRF2102
-      subroutine PRF2102
-      integer, parameter ::  N = 4,M=4,NL=1000,NIT=3
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer, allocatable :: A1(:,:),A2(:,:),A3(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-cdvm$ distribute B(BLOCK,BLOCK)    
-cdvm$ align(:,:) with B(:,:) :: A,A1,A2,A3
- 
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF2102'
-      allocate (B(N,M),A(N,M),C(N,M),D(N,M))
-      allocate (A1(N,M),A2(N,M),A3(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-         A1(i,j) =NL+i+j
-         A2(i,j) =NL+i+j
-      enddo
-      enddo 
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-      isumc1=0
-      isuma1=0
-cdvm$ remote_access (GR1:A(:,:))
-      do i=1,N         
-      do j=i,M
-       D(i,j)=A(i,j)
-       isumc1=isumc1+C(i,j)
-       isuma1=isuma1+D(i,j)
-      enddo
-      enddo
-
-      isumc2=0
-      isuma2=0
-      
-cdvm$ remote_access (GR1:A(:,1))
-      do i=1,N               
-       D(i,1)=A(i,1)
-       isumc2=isumc2+C(i,1)
-       isuma2=isuma2+D(i,1)      
-      enddo
-
-      isumc3=0
-      isuma3=0
-
-cdvm$ remote_access (GR2:A(1,:))
-      do j=1,M         
-       D(1,j)=A(1,j)
-       isumc3=isumc3+C(1,j)
-       isuma3=isuma3+D(1,j)
-      enddo 
-
-      isumc4=0
-      isuma4=0
-
-cdvm$ remote_access (GR2:A(:,M))
-      do i=1,N         
-       D(i,M)=A(i,M)
-       isumc4=isumc4+C(i,M)
-       isuma4=isuma4+D(i,M)
-      enddo
-
-      isumc5=0
-      isuma5=0
-
-cdvm$ remote_access (GR2:A1(N,:))
-      do j=1,M         
-       D(N,j)=A1(N,j)
-       isumc5=isumc5+C(N,j)
-       isuma5=isuma5+D(N,j)
-      enddo
-
-      isumc6=0
-      isuma6=0                                                                 
-
-cdvm$ remote_access (GR3:A1(:,:))
-      do i=1,N         
-      do j=i,M
-       D(i,j)=A1(i,j)
-       isumc6=isumc6+C(i,j)
-       isuma6=isuma6+D(i,j)
-      enddo
-      enddo
-
-      isumc7=0
-      isuma7=0
-
-      ki=2
-      ki1=3
-      kj=2
-      kj1=3
-
-cdvm$ remote_access (GR3:A2(:,:))
-      do i=1,N/ki-ki1         
-      do j=i,M/kj-kj1
-       D(i,j)=A2(ki*i+ki1,kj*j+kj1)
-       isumc7=isumc7+C(ki*i+ki1,kj*j+kj1 )
-       isuma7=isuma7+D(i,j)
-      enddo
-      enddo
-      if ((isumc1.eq.isuma1).and.(isumc2 .eq.isuma2).and.
-     * (isumc3.eq.isuma3)
-     * .and.(isumc4 .eq.isuma4).and.(isumc5 .eq.isuma5).and.
-     * (isumc6 .eq.isuma6).and.(isumc7 .eq.isuma7)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-c      print *,isumc1,isuma1,isumc2,isuma2 
-            
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-      enddo
-      deallocate (A,B,C,D)
-      deallocate (A1,A2,A3)
-      end
-C ---------------------------------------------------------PRF2103
-      subroutine PRF2103
-      integer, parameter ::  N = 4,M=4,NL=1000,NIT=3
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer, allocatable :: A1(:,:),A2(:,:),A3(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-cdvm$ distribute B(BLOCK,BLOCK)    
-cdvm$ align(:,:) with B(:,:) :: A,A1,A2,A3
- 
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF2103'
-      allocate (B(N,M),A(N,M),C(N,M),D(N,M))
-      allocate (A1(N,M),A2(N,M),A3(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-         A1(i,j) = NL+i+j
-        enddo
-      enddo 
-
-      do it=1,NIT
-
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-                             
-      nloopi1=NL
-      nloopj1=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR1:A(1,1))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(1,1)
-      enddo
-      enddo
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi1),min(nloopj1))
-       do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(1,1)) then
-           nloopi1=min(nloopi1,i)
-           nloopj1=min(nloopj1,j)
-           endif
-       enddo
-       enddo
-
-      nloopi2=NL
-      nloopj2=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR1:A(N,M))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(N,M)
-       enddo
-      enddo 
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi2),min(nloopj2))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(N,M)) then
-           nloopi2=min(nloopi2,i)
-           nloopj2=min(nloopj2,j)
-           endif
-       enddo
-      enddo
-
-      nloopi3=NL
-      nloopj3=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR2:A(1,M))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(1,M)
-      
-      enddo
-      enddo 
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi3),min(nloopj3))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(1,M)) then
-           nloopi3=min(nloopi3,i)
-           nloopj3=min(nloopj3,j)
-           endif
-       enddo
-      enddo
-
-      nloopi4=NL
-      nloopj4=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR2:A(N,1))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(N,1)
-       enddo
-      enddo 
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi4),min(nloopj4))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(N,1)) then
-           nloopi4=min(nloopi4,i)
-           nloopj4=min(nloopj4,j)
-           endif
-       enddo
-      enddo 
-  
-      nloopi5=NL
-      nloopj5=NL
-
-*dvm$ parallel (i,J) on A(i,j),remote_access(GR3:A)
-c *dvm$ parallel (i,J) on B(i,j),remote_access(A(:,:))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(i,j)
-      
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi5),min(nloopj5))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(i,j)) then
-           nloopi5=min(nloopi5,i)
-           nloopj5=min(nloopj5,j)
-          endif
-       enddo
-      enddo 
-
-      nloopi6=NL
-      nloopj6=NL
-
-*dvm$ parallel (i) on B(i,1),remote_access(GR3:A1(:,1))
-      do i=1,N
-         B(i,1) = A1(i,1)
-      enddo
-      
-*dvm$ parallel (i) on B(i,1), reduction( min( nloopi6),min(nloopj6))
-      do i=1,N
-          if (B(i,1).ne.C(i,1)) then
-           nloopi6=min(nloopi6,i)
-           nloopj6=j
-          endif
-      enddo
-
-      nloopi7=NL
-      nloopj7=NL
-
-*dvm$ parallel (i,J) on A(i,j),remote_access(GR3:A1(1,:))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A1(1,j)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi7),min(nloopj7))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(1,j)) then
-           nloopi7=min(nloopi7,i)
-           nloopj7=min(nloopj7,j)
-          endif
-       enddo
-      enddo 
-
-      nloopi8=NL
-      nloopj8=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR3:A1(:,M))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A1(i,M)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi8),min(nloopj8))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(i,M)) then
-           nloopi8=min(nloopi8,i)
-           nloopj8=min(nloopj8,j)
-          endif
-       enddo
-      enddo
-
-      nloopi9=NL
-      nloopj9=NL
-
-*dvm$ parallel (i,J) on A(i,j),remote_access(GR3:A1(N,:))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A1(N,j)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on A(i,j), reduction( min( nloopi9),min(nloopj9))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(N,j)) then
-           nloopi9=min(nloopi9,i)
-           nloopj9=min(nloopj9,j)
-          endif
-       enddo
-      enddo 
-      if ((nloopi1 .eq.NL).and.(nloopj1 .eq.NL) .and.
-     *      (nloopi2 .eq.NL).and.(nloopj2 .eq.NL) .and.
-     *      (nloopi3 .eq.NL).and.(nloopj3 .eq.NL) .and.
-     *      (nloopi4 .eq.NL).and.(nloopj4 .eq.NL) .and.
-     *      (nloopi5 .eq.NL).and.(nloopj5 .eq.NL) .and.
-     *      (nloopi6 .eq.NL).and.(nloopj6 .eq.NL) .and.
-     *      (nloopi7 .eq.NL).and.(nloopj7 .eq.NL) .and.
-     *      (nloopi8 .eq.NL).and.(nloopj8 .eq.NL) .and.
-     *      (nloopi9 .eq.NL).and.(nloopj9 .eq.NL)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,D)
-      deallocate (A1,A2,A3)
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-       do j=1,M
-        AR(i,j) = NL+i+j
-       enddo
-      enddo 
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf22.fdv
deleted file mode 100644
index 4d19ada..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf22.fdv
+++ /dev/null
@@ -1,460 +0,0 @@
-      program PRF22
-     
-c    TESTING OF THE PREFETCH DIRECTIVE. 
-
-      print *,'===START OF PRF22========================'
-C --------------------------------------------------
-      call prf2201
-      call prf2202
-      call prf2203
-C
-      print *,'=== END OF PRF22 ========================= '    
-      end
-C ---------------------------------------------------------PRF2201
-      subroutine PRF2201
-      integer, parameter ::  N = 4,M=4,NL=1000,NIT=3
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer,allocatable :: A1(:,:),A2(:,:),A3(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-cdvm$ distribute B(BLOCK,*)    
-cdvm$ align(:,:) with B(:,:) :: A,A1,A2,A3
- 
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF2201'
-      allocate (B(N,M),A(N,M),C(N,M),D(N,M))
-      allocate (A1(N,M),A2(N,M),A3(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-      enddo
-      enddo                                         
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-
-cdvm$ remote_access (GR1:A(1,1))
-      ib1=A(1,1)
-
-cdvm$ remote_access (GR1:A(N,M))
-      ib2=A(N,M)            
-
-cdvm$ remote_access (GR2:A(1,M))
-      ib3=A(1,M)            
-
-cdvm$ remote_access (GR3:A(N,1))
-      ib4=A(N,1)
-
-      if ((ib1 .eq.C(1,1)).and.(ib2.eq.C(N,M)).and.(ib3.eq.C(1,M)).and.
-     *      (ib4 .eq. C(N,1)) ) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-      enddo
-      deallocate (A,B,C,D)
-      deallocate (A1,A2,A3)
-
-      end 
-C ---------------------------------------------------------PRF2202
-      subroutine PRF2202
-      integer, parameter ::  N = 4,M=4,NL=1000,NIT=3
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer,allocatable :: A1(:,:),A2(:,:),A3(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-cdvm$ distribute B(*,BLOCK)    
-cdvm$ align(:,:) with B(:,:) :: A,A1,A2,A3
- 
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF2202'
-      allocate (B(N,M),A(N,M),C(N,M),D(N,M))
-      allocate (A1(N,M),A2(N,M),A3(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-         A1(i,j) =NL+i+j
-         A2(i,j) =NL+i+j
-        enddo
-      enddo                                         
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-      isumc1=0
-      isuma1=0
-
-cdvm$ remote_access (GR1:A(:,:))
-      do i=1,N         
-      do j=i,M
-       D(i,j)=A(i,j)
-       isumc1=isumc1+C(i,j)
-       isuma1=isuma1+D(i,j)
-      enddo
-      enddo
-
-      isumc2=0
-      isuma2=0
-      
-cdvm$ remote_access (GR1:A(:,1))
-      do i=1,N               
-       D(i,1)=A(i,1)
-       isumc2=isumc2+C(i,1)
-       isuma2=isuma2+D(i,1)
-      enddo
-
-      isumc3=0
-      isuma3=0
-
-cdvm$ remote_access (GR2:A(1,:))
-      do j=1,M         
-       D(1,j)=A(1,j)
-       isumc3=isumc3+C(1,j)
-       isuma3=isuma3+D(1,j)
-      enddo 
-
-      isumc4=0
-      isuma4=0
-
-cdvm$ remote_access (GR2:A(:,M))
-      do i=1,N         
-       D(i,M)=A(i,M)
-       isumc4=isumc4+C(i,M)
-       isuma4=isuma4+D(i,M)
-      enddo
-
-      isumc5=0
-      isuma5=0
-cdvm$ remote_access (GR2:A1(N,:))
-      do j=1,M         
-       D(N,j)=A1(N,j)
-       isumc5=isumc5+C(N,j)
-       isuma5=isuma5+D(N,j)
-      enddo
-
-      isumc6=0
-      isuma6=0                                                                 
-
-cdvm$ remote_access (GR3:A1(:,:))
-      do i=1,N         
-       do j=i,M
-        D(i,j)=A1(i,j)
-        isumc6=isumc6+C(i,j)
-        isuma6=isuma6+D(i,j)
-       enddo
-      enddo
-
-      isumc7=0
-      isuma7=0
-
-      ki=2
-      ki1=3
-      kj=2
-      kj1=3
-
-cdvm$ remote_access (GR3:A2(:,:))
-      do i=1,N/ki-ki1         
-       do j=i,M/kj-kj1
-        D(i,j)=A2(ki*i+ki1,kj*j+kj1)
-        isumc7=isumc7+C(ki*i+ki1,kj*j+kj1 )
-        isuma7=isuma7+D(i,j)
-       enddo
-      enddo
-
-      if ((isumc1.eq.isuma1).and.(isumc2 .eq.isuma2).and.
-     * (isumc3.eq.isuma3)
-     * .and.(isumc4 .eq.isuma4).and.(isumc5 .eq.isuma5).and.
-     * (isumc6 .eq.isuma6).and.(isumc7 .eq.isuma7)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-c      print *,isumc1,isuma1,isumc2,isuma2 
-            
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,D)
-      deallocate (A1,A2,A3)
-
-      end
-C ---------------------------------------------------------PRF2203
-      subroutine PRF2203
-      integer, parameter ::  N = 4,M=4,NL=1000,NIT=3
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer,allocatable :: A1(:,:),A2(:,:),A3(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-cdvm$ distribute B(BLOCK,*)    
-cdvm$ align(:,:) with B(:,:) :: A,A1,A2,A3
- 
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF2203'
-      allocate (B(N,M),A(N,M),C(N,M),D(N,M))
-      allocate (A1(N,M),A2(N,M),A3(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-         A1(i,j) = NL+i+j
-        enddo
-      enddo                                         
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-                             
-      nloopi1=NL
-      nloopj1=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR1:A(1,1))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(1,1)
-       enddo
-      enddo
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi1),min(nloopj1))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(1,1)) then
-           nloopi1=min(nloopi1,i)
-           nloopj1=min(nloopj1,j)
-          endif
-       enddo
-      enddo
-
-      nloopi2=NL
-      nloopj2=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR1:A(N,M))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(N,M)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi2),min(nloopj2))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(N,M)) then
-           nloopi2=min(nloopi2,i)
-           nloopj2=min(nloopj2,j)
-          endif
-       enddo
-      enddo
-
-      nloopi3=NL
-      nloopj3=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR2:A(1,M))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(1,M)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi3),min(nloopj3))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(1,M)) then
-           nloopi3=min(nloopi3,i)
-           nloopj3=min(nloopj3,j)
-          endif
-       enddo
-      enddo
-
-      nloopi4=NL
-      nloopj4=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR2:A(N,1))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(N,1)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi4),min(nloopj4))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(N,1)) then
-           nloopi4=min(nloopi4,i)
-           nloopj4=min(nloopj4,j)
-          endif
-       enddo
-      enddo 
-
-      nloopi5=NL
-      nloopj5=NL
-
-*dvm$ parallel (i,J) on A(i,j),remote_access(GR3:A)
-c *dvm$ parallel (i,J) on B(i,j),remote_access(A(:,:))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A(i,j)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi5),min(nloopj5))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(i,j)) then
-           nloopi5=min(nloopi5,i)
-           nloopj5=min(nloopj5,j)
-          endif
-       enddo
-      enddo 
-
-      nloopi6=NL
-      nloopj6=NL
-
-*dvm$ parallel (i) on B(i,1),remote_access(GR3:A1(:,1))
-      do i=1,N
-         B(i,1) = A1(i,1)
-      enddo
-      
-*dvm$ parallel (i) on B(i,1), reduction( min( nloopi6),min(nloopj6))
-      do i=1,N
-          if (B(i,1).ne.C(i,1)) then
-           nloopi6=min(nloopi6,i)
-           nloopj6=min(nloopj6,j)
-          endif
-      enddo
-
-      nloopi7=NL
-      nloopj7=NL
-
-*dvm$ parallel (i,J) on A(i,j),remote_access(GR3:A1(1,:))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A1(1,j)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi7),min(nloopj7))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(1,j)) then
-           nloopi7=min(nloopi7,i)
-           nloopj7=min(nloopj7,j)
-          endif
-       enddo
-      enddo 
-
-      nloopi8=NL
-      nloopj8=NL
-
-*dvm$ parallel (i,J) on B(i,j),remote_access(GR3:A1(:,M))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A1(i,M)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi8),min(nloopj8))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(i,M)) then
-           nloopi8=min(nloopi8,i)
-           nloopj8=min(nloopj8,j)
-          endif
-       enddo
-      enddo
-
-      nloopi9=NL
-      nloopj9=NL
-
-*dvm$ parallel (i,J) on A(i,j),remote_access(GR3:A1(N,:))
-      do i=1,N
-       do j=1,M
-         B(i,j) = A1(N,j)
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j) on A(i,j), reduction( min( nloopi9),min(nloopj9))
-      do i=1,N
-       do j=1,M
-          if (B(i,j).ne.C(N,j)) then
-           nloopi9=min(nloopi9,i)
-           nloopj9=min(nloopj9,j)
-          endif
-       enddo
-      enddo         
-      if ((nloopi1 .eq.NL).and.(nloopj1 .eq.NL) .and.
-     *      (nloopi2 .eq.NL).and.(nloopj2 .eq.NL) .and.
-     *      (nloopi3 .eq.NL).and.(nloopj3 .eq.NL) .and.
-     *      (nloopi4 .eq.NL).and.(nloopj4 .eq.NL) .and.
-     *      (nloopi5 .eq.NL).and.(nloopj5 .eq.NL) .and.
-     *      (nloopi6 .eq.NL).and.(nloopj6 .eq.NL) .and.
-     *      (nloopi7 .eq.NL).and.(nloopj7 .eq.NL) .and.
-     *      (nloopi8 .eq.NL).and.(nloopj8 .eq.NL) .and.
-     *      (nloopi9 .eq.NL).and.(nloopj9 .eq.NL)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,D)
-      deallocate (A1,A2,A3)
-
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do 10 i=1,N
-      do 10 j=1,M
-   10 AR(i,j) = NL+i+j
-                   
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf23.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf23.f90
deleted file mode 100644
index eaef382..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf23.f90
+++ /dev/null
@@ -1,268 +0,0 @@
-program prf23
-    !TESTING OF THE PREFETCH DIRECTIVE.
-
-    print *, '===START OF PRF23========================'
-
-    call prf2301
-    call prf2302
-    call prf2303
-
-    print *, '===END OF PRF23=========================='
-end
-
-subroutine prf2301
-    integer, parameter :: N = 4, M = 4, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, : ), B( :, : ), C( :, : ), D( :, : )
-    character * 7 :: tname = 'PRF2301'
-
-    !dvm$ distribute B( block, block )
-    !dvm$ align ( :, : ) with B( :, : ) :: A, D
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate( B( N, M ), A( N, M ), C( N, M ), D( N, M ) )
-    call serial2( C, N, M, NL )
-
-    !dvm$ parallel ( i, j ) on A( i, j )
-    do i = 1, N
-        do j = 1, M
-            A( i, j ) = NL + i + j
-            B( i, j ) = NL + i + j
-            D( i, j ) = NL + i + j
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        !dvm$ remote_access( GR1:A( N / 2, M / 2 ) )
-        ib1 = A( N / 2, M / 2 )
-
-        !dvm$ remote_access( GR1:B( N / 2, M ) )
-        ib2 = B( N / 2, M )
-
-        !dvm$ remote_access( GR2:D( N, M / 2 ) )
-        ib3 = D( N, M / 2 )
-
-        !dvm$ remote_access( GR3:D( N / 2, 1 ) )
-        ib4 = D( N / 2, 1 )
-
-        if ( ( ib1 .eq. C( N / 2, M / 2 ) ) .and. ( ib2 .eq. C( N / 2, M ) ) .and. &
-             ( ib3 .eq. C( N, M / 2 ) ) .and. ( ib4 .eq. C( N / 2, 1 ) ) ) then
-          call ansyes( tname )
-        else
-          call ansno( tname )
-        endif
-        if ( it .eq. 2 ) cycle
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C, D )
-end
-
-subroutine prf2302
-    integer, parameter ::  N = 4, M = 4, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, : ), B( :, : ), C( :, : ), D( :, : )
-    integer, allocatable :: A1( :, : )
-    character * 7 :: tname = 'prf2302'
-
-    !dvm$ distribute B( block, block )
-    !dvm$ align( :, : ) with B( :, : ) :: A, A1
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate( B( N, M ), A( N, M ), C( N, M ), D( N, M ), A1( N, M ) )
-    call serial2( C, N, M, NL )
-
-    !dvm$ parallel ( i, j ) on A( i, j )
-    do i = 1, N
-        do j = 1, M
-            A( i, j ) = NL + i + j
-            A1( i, j ) = NL + i + j
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        isumc1 = 0
-        isuma1 = 0
-        !dvm$ remote_access ( GR1:A( :, M / 2 ) )
-        do i = 1, N
-            D( i, M / 2 ) = A( i, M / 2 )
-            isumc1 = isumc1 + C( i, M / 2 )
-            isuma1 = isuma1 + D( i, M / 2 )
-        enddo
-
-        isumc2 = 0
-        isuma2 = 0
-        !dvm$ remote_access ( GR2:A( N / 2, : ) )
-        do j = 1, M
-            D( N / 2, j ) = A( N / 2, j )
-            isumc2 = isumc2 + C( N / 2, j )
-            isuma2 = isuma2 + D( N / 2, j )
-        enddo
-
-        isumc3 = 0
-        isuma3 = 0
-        ki = 2
-        ki1 = 3
-        !dvm$ remote_access ( GR3:A1( :, M / 2 ) )
-        do i = 1, N / ki - ki1
-            D( i, M / 2 ) = A1( ki * i + ki1, M / 2 )
-            isumc3 = isumc3 + C( ki * i + ki1, M / 2 )
-            isuma3 = isuma3 + D( i, M / 2 )
-        enddo
-
-        isumc4 = 0
-        isuma4 = 0
-        kj = 2
-        kj1 = 3
-        !dvm$ remote_access ( GR3:A1( N / 2, : ) )
-        do j = 1, M/kj-kj1
-            D( N / 2, j ) = A1( N / 2, kj * j + kj1 )
-            isumc7 = isumc7 + C( N / 2, kj * j + kj1 )
-            isuma7 = isuma7 + D( N / 2, j )
-        enddo
-
-        if ( ( isumc1 .eq. isuma1 ) .and. ( isumc2 .eq. isuma2 ) .and. ( isumc3 .eq. isuma3 ) .and. &
-             ( isumc4 .eq. isuma4 ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C, D, A1 )
-end
-
-subroutine prf2303
-    integer, parameter ::  N = 4, M = 4, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, : ), B( :, : ), C( :, : ), A1( :, : )
-    character * 7 :: tname ='PRF2303'
-
-    !dvm$ distribute B( block, block )
-    !dvm$ align( :, : ) with B( :, : ) :: A, A1
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( B( N, M ), A( N, M ), C( N, M ), A1( N, M ) )
-    call serial2( C, N, M, NL )
-
-    !dvm$ parallel ( i, j ) on A( i, j )
-    do i = 1, N
-        do j = 1, M
-            A( i, j ) = NL + i + j
-            A1( i, j ) = NL + i + j
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-
-        nloopi1 = NL
-        nloopj1 = NL
-        !dvm$ parallel ( i, J ) on B( i, j ), remote_access( GR1:A( N / 2, M / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                B( i, j ) = A( N / 2, M / 2 )
-            enddo
-        enddo
-        !dvm$ parallel ( i, j ) on B( i, j ), reduction( min( nloopi1 ), min( nloopj1 ) )
-        do i = 1, N
-            do j = 1, M
-                if ( B( i, j ).ne.C( N / 2, M / 2 ) ) then
-                    nloopi1 = min( nloopi1, i )
-                    nloopj1 = min( nloopj1, j )
-                endif
-            enddo
-        enddo
-
-        nloopi2 = NL
-        nloopj2 = NL
-        !dvm$ parallel ( i, J ) on B( i, j ), remote_access( GR2:A1( :, M / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                B( i, j ) = A1( i, M / 2 )
-            enddo
-        enddo
-        !dvm$ parallel ( i, j ) on B( i, j ), reduction( min( nloopi2 ), min( nloopj2 ) )
-        do i = 1, N
-            do j = 1, M
-                if ( B( i, j ).ne.C( i, M / 2 ) ) then
-                    nloopi2 = min( nloopi2, i )
-                    nloopj2 = min( nloopj2, j )
-                endif
-            enddo
-        enddo
-
-        nloopi3 = NL
-        nloopj3 = NL
-        !dvm$ parallel ( i, j ) on A( i, j ), remote_access( GR2:A1( N / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                B( i, j ) = A1( N / 2, j )
-            enddo
-        enddo
-        !dvm$ parallel ( i, j ) on A( i, j ), reduction( min( nloopi3 ), min( nloopj3 ) )
-        do i = 1, N
-            do j = 1, M
-                if ( B( i, j ).ne.C( N / 2, j ) ) then
-                    nloopi3 = min( nloopi3, i )
-                    nloopj3 = min( nloopj3, j )
-                endif
-            enddo
-        enddo
-
-        if ( ( nloopi1 .eq. NL ) .and. ( nloopj1 .eq. NL ) .and. &
-             ( nloopi2 .eq. NL ) .and. ( nloopj2 .eq. NL ) .and. &
-             ( nloopi3 .eq. NL ) .and. ( nloopj3 .eq. NL ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-    enddo
-
-    deallocate( A, B, C, A1 )
-end
-
-subroutine serial2( AR, N, M, NL )
-    integer AR( N, M )
-    integer NL
-    do i = 1, N
-        do j = 1, M
-            AR( i, j ) = NL + i + j
-        enddo
-    enddo
-end
-
-subroutine ansyes( name )
-    character * 7 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno( name )
-    character * 7 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf24.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf24.f90
deleted file mode 100644
index 722dcf3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf24.f90
+++ /dev/null
@@ -1,268 +0,0 @@
-program prf24
-    !TESTING OF THE PREFETCH DIRECTIVE.
-
-    print *, '===START OF PRF24========================'
-
-    call prf2401
-    call prf2402
-    call prf2403
-
-    print *, '===END OF PRF24=========================='
-end
-
-subroutine prf2401
-    integer, parameter :: N = 4, M = 4, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, : ), B( :, : ), C( :, : ), D( :, : )
-    character * 7 :: tname = 'PRF2401'
-
-    !dvm$ distribute B( block, * )
-    !dvm$ align ( :, : ) with B( :, : ) :: A, D
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate( B( N, M ), A( N, M ), C( N, M ), D( N, M ) )
-    call serial2( C, N, M, NL )
-
-    !dvm$ parallel ( i, j ) on A( i, j )
-    do i = 1, N
-        do j = 1, M
-            A( i, j ) = NL + i + j
-            B( i, j ) = NL + i + j
-            D( i, j ) = NL + i + j
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        !dvm$ remote_access( GR1:A( N / 2, M / 2 ) )
-        ib1 = A( N / 2, M / 2 )
-
-        !dvm$ remote_access( GR1:B( N / 2, M ) )
-        ib2 = B( N / 2, M )
-
-        !dvm$ remote_access( GR2:D( N, M / 2 ) )
-        ib3 = D( N, M / 2 )
-
-        !dvm$ remote_access( GR3:D( N / 2, 1 ) )
-        ib4 = D( N / 2, 1 )
-
-        if ( ( ib1 .eq. C( N / 2, M / 2 ) ) .and. ( ib2 .eq. C( N / 2, M ) ) .and. &
-             ( ib3 .eq. C( N, M / 2 ) ) .and. ( ib4 .eq. C( N / 2, 1 ) ) ) then
-          call ansyes( tname )
-        else
-          call ansno( tname )
-        endif
-        if ( it .eq. 2 ) cycle
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C, D )
-end
-
-subroutine prf2402
-    integer, parameter ::  N = 4, M = 4, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, : ), B( :, : ), C( :, : ), D( :, : )
-    integer, allocatable :: A1( :, : )
-    character * 7 :: tname = 'PRF2402'
-
-    !dvm$ distribute B( *, block )
-    !dvm$ align( :, : ) with B( :, : ) :: A, A1
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate( B( N, M ), A( N, M ), C( N, M ), D( N, M ), A1( N, M ) )
-    call serial2( C, N, M, NL )
-
-    !dvm$ parallel ( i, j ) on A( i, j )
-    do i = 1, N
-        do j = 1, M
-            A( i, j ) = NL + i + j
-            A1( i, j ) = NL + i + j
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        isumc1 = 0
-        isuma1 = 0
-        !dvm$ remote_access ( GR1:A( :, M / 2 ) )
-        do i = 1, N
-            D( i, M / 2 ) = A( i, M / 2 )
-            isumc1 = isumc1 + C( i, M / 2 )
-            isuma1 = isuma1 + D( i, M / 2 )
-        enddo
-
-        isumc2 = 0
-        isuma2 = 0
-        !dvm$ remote_access ( GR2:A( N / 2, : ) )
-        do j = 1, M
-            D( N / 2, j ) = A( N / 2, j )
-            isumc2 = isumc2 + C( N / 2, j )
-            isuma2 = isuma2 + D( N / 2, j )
-        enddo
-
-        isumc3 = 0
-        isuma3 = 0
-        ki = 2
-        ki1 = 3
-        !dvm$ remote_access ( GR3:A1( :, M / 2 ) )
-        do i = 1, N / ki - ki1
-            D( i, M / 2 ) = A1( ki * i + ki1, M / 2 )
-            isumc3 = isumc3 + C( ki * i + ki1, M / 2 )
-            isuma3 = isuma3 + D( i, M / 2 )
-        enddo
-
-        isumc4 = 0
-        isuma4 = 0
-        kj = 2
-        kj1 = 3
-        !dvm$ remote_access ( GR3:A1( N / 2, : ) )
-        do j = 1, M/kj-kj1
-            D( N / 2, j ) = A1( N / 2, kj * j + kj1 )
-            isumc7 = isumc7 + C( N / 2, kj * j + kj1 )
-            isuma7 = isuma7 + D( N / 2, j )
-        enddo
-
-        if ( ( isumc1 .eq. isuma1 ) .and. ( isumc2 .eq. isuma2 ) .and. ( isumc3 .eq. isuma3 ) .and. &
-             ( isumc4 .eq. isuma4 ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C, D, A1 )
-end
-
-subroutine prf2403
-    integer, parameter ::  N = 4, M = 4, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, : ), B( :, : ), C( :, : ), A1( :, : )
-    character * 7 :: tname ='PRF2403'
-
-    !dvm$ distribute B( block, * )
-    !dvm$ align( :, : ) with B( :, : ) :: A, A1
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( B( N, M ), A( N, M ), C( N, M ), A1( N, M ) )
-    call serial2( C, N, M, NL )
-
-    !dvm$ parallel ( i, j ) on A( i, j )
-    do i = 1, N
-        do j = 1, M
-            A( i, j ) = NL + i + j
-            A1( i, j ) = NL + i + j
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-
-        nloopi1 = NL
-        nloopj1 = NL
-        !dvm$ parallel ( i, j ) on B( i, j ), remote_access( GR1:A( N / 2, M / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                B( i, j ) = A( N / 2, M / 2 )
-            enddo
-        enddo
-        !dvm$ parallel ( i, j ) on B( i, j ), reduction( min( nloopi1 ), min( nloopj1 ) )
-        do i = 1, N
-            do j = 1, M
-                if ( B( i, j )  .ne. C( N / 2, M / 2 ) ) then
-                    nloopi1 = min( nloopi1, i )
-                    nloopj1 = min( nloopj1, j )
-                endif
-            enddo
-        enddo
-
-        nloopi2 = NL
-        nloopj2 = NL
-        !dvm$ parallel ( i, j ) on B( i, j ), remote_access( GR2:A1( :, M / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                B( i, j ) = A1( i, M / 2 )
-            enddo
-        enddo
-        !dvm$ parallel ( i, j ) on B( i, j ), reduction( min( nloopi2 ), min( nloopj2 ) )
-        do i = 1, N
-            do j = 1, M
-                if ( B( i, j ) .ne. C( i, M / 2 ) ) then
-                    nloopi2 = min( nloopi2, i )
-                    nloopj2 = min( nloopj2, j )
-                endif
-            enddo
-        enddo
-
-        nloopi3 = NL
-        nloopj3 = NL
-        !dvm$ parallel ( i, j ) on A( i, j ), remote_access( GR2:A1( N / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                B( i, j ) = A1( N / 2, j )
-            enddo
-        enddo
-        !dvm$ parallel ( i, j ) on A( i, j ), reduction( min( nloopi3 ), min( nloopj3 ) )
-        do i = 1, N
-            do j = 1, M
-                if ( B( i, j ) .ne. C( N / 2, j ) ) then
-                    nloopi3 = min( nloopi3, i )
-                    nloopj3 = min( nloopj3, j )
-                endif
-            enddo
-        enddo
-
-        if ( ( nloopi1 .eq. NL ) .and. ( nloopj1 .eq. NL ) .and. &
-             ( nloopi2 .eq. NL ) .and. ( nloopj2 .eq. NL ) .and. &
-             ( nloopi3 .eq. NL ) .and. ( nloopj3 .eq. NL ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-    enddo
-
-    deallocate( A, B, C, A1 )
-end
-
-subroutine serial2( AR, N, M, NL )
-    integer AR( N, M )
-    integer NL
-    do i = 1, N
-        do j = 1, M
-            AR( i, j ) = NL + i + j
-        enddo
-    enddo
-end
-
-subroutine ansyes( name )
-    character * 7 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno( name )
-    character * 7 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf31.fdv
deleted file mode 100644
index c234a8f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf31.fdv
+++ /dev/null
@@ -1,457 +0,0 @@
-      program PRF31
-     
-c    TESTING OF THE PREFETCH DIRECTIVE. 
-
-      print *,'===START OF PRF31========================'
-C --------------------------------------------------
-      call prf3101
-      call prf3102
-      call prf3103
-C
-      print *,'=== END OF PRF31 ========================= '    
-      end
-C ---------------------------------------------------------PRF3101
-      subroutine PRF3101
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),A1(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-cdvm$ distribute B(BLOCK,BLOCK,BLOCK)
-cdvm$ align(:,:,:) with B(:,:,:) :: A,A1
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3 
-
-      tname='PRF3101'
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K),A1(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                                         
-      enddo                                        
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-cdvm$ remote_access (GR1:A(1,1,1))
-      ib1=A(1,1,1)               
-
-cdvm$ remote_access (GR1:A(N,M,K))
-      ib2=A(N,M,K)               
-
-cdvm$ remote_access (GR2:A(1,M,K))
-      ib3=A(1,M,K)               
-
-cdvm$ remote_access (GR3:A(N,1,K))
-      ib4=A(N,1,K)               
-
-cdvm$ remote_access (GR3:A(N,M,1))
-      ib5=A(N,M,1)               
-
-      if ((ib1 .eq.C(1,1,1)) .and.(ib2 .eq.C(N,M,K)) .and.
-     * (ib3 .eq.C(1,M,K)) .and.(ib4 .eq.C(N,1,K)) .and.
-     * (ib5 .eq.C(N,M,1))) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,A1)
-      end
-
-C ------------------------------------------------------PRF3102
-      subroutine PRF3102
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK)
-cdvm$ align(:,:,:) with A(:,:,:) :: B 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF3102'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                                         
-      enddo                                        
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-      isumc1=0
-      isuma1=0
-
-cdvm$ remote_access (GR1:A(:,:,:))               
-      do i=1,N         
-       do j=i,M
-        do ii=1,K
-         D(i,j,ii)=A(i,j,ii)
-         isumc1=isumc1+C(i,j,ii)
-         isuma1=isuma1+D(i,j,ii)
-        enddo
-       enddo
-      enddo
-
-      isumc2=0
-      isuma2=0
-
-cdvm$ remote_access (GR1:A(1,:,:))
-      do j=1,M         
-       do ii=1,K
-        D(1,j,ii)=A(1,j,ii)
-        isumc2=isumc2+C(1,j,ii)
-        isuma2=isuma2+D(1,j,ii)
-       enddo
-      enddo
-
-      isumc3=0
-      isuma3=0
-
-cdvm$ remote_access (GR1:A(:,M,:))
-      do i=1,N         
-       do ii=1,K
-        D(i,M,ii)=A(i,M,ii)
-        isumc3=isumc3+C(i,M,ii)
-        isuma3=isuma3+D(i,M,ii)
-       enddo
-      enddo 
-
-      isumc4=0
-      isuma4=0
-
-cdvm$ remote_access (GR2:A(:,:,K))
-      do i=1,N
-       do j=1,M         
-        D(i,j,K)=A(i,j,K)
-        isumc4=isumc4+C(i,j,K)
-        isuma4=isuma4+D(i,j,K)
-       enddo
-      enddo 
- 
-      ki=2
-      ki1=3
-      kj=2
-      kj1=3
-      kii=2
-      kii1=3
- 
-      isumc5=0
-      isuma5=0       
-cdvm$ remote_access (GR3:A(:,:,:))
-      do i=1,N/ki-ki1         
-       do j=1,M/kj-kj1
-        do ii=1,K/kii-kii1
-         D(i,j,ii)=A(ki*i+ki1,kj*j+kj1,kii*ii+kii1)
-         isumc5=isumc5+C(ki*i+ki1,kj*j+kj1,kii*ii+kii1)
-         isuma5=isuma5+D(i,j,ii)
-        enddo
-       enddo
-      enddo
-      if ((isumc1 .eq.isuma1).and.(isumc2 .eq.isuma2).and. 
-     *      (isumc3 .eq.isuma3).and.(isumc4 .eq.isuma4).and.
-     *      (isumc5 .eq.isuma5)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo  
-      deallocate (A,B,C,D)
-     
-      end
-C ------------------------------------------------------PRF3103
-      subroutine PRF3103
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),A1(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK)
-cdvm$ align(:,:,:) with A(:,:,:) :: B ,A1
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF3102'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),A1(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           A(i,j,ii) = NL+i+j+ii
-           A1(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                                         
-      enddo
-                                         
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-
-      nloopi1=NL
-      nloopj1=NL
-      nloopii1=NL
-               
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR1:A(1,1,1))
-      do i=1,N
-       do j=1,M
-         do ii=1,K
-          B(i,j,ii) = A(1,1,1)
-         enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$* reduction( min( nloopi1),min(nloopj1),min(nloopii1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-          if (B(i,j,ii).ne.C(1,1,1)) then
-           nloopi1=min(nloopi1,i)
-           nloopj1=min(nloopj1,j)
-           nloopii1=min(nloopii1,ii)
-          endif
-        enddo
-       enddo
-      enddo 
-
-      nloopi2=NL
-      nloopj2=NL
-      nloopii2=NL
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR1:A(N,M,K))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A(N,M,K)
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$*reduction( min( nloopi2),min(nloopj2),min(nloopii2))
-      do i=1,N
-       do j=1,M
-         do ii=1,K
-          if (B(i,j,ii).ne.C(N,M,K)) then
-           nloopi2=min(nloopi2,i)
-           nloopj2=min(nloopj2,j)
-           nloopii2=min(nloopii2,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      nloopi3=NL
-      nloopj3=NL
-      nloopii3=NL
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR2:A)
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A(i,j,ii)      
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$* reduction( min( nloopi3),min(nloopj3),min(nloopii3))
-       do i=1,N
-        do j=1,M
-         do ii=1,K
-          if (B(i,j,ii).ne.C(i,j,ii)) then
-           nloopi3=min(nloopi3,i)
-           nloopj3=min(nloopj3,j)
-           nloopii3=min(nloopii3,ii)
-          endif
-        enddo
-       enddo
-      enddo                                     
-   
-      nloopi4=NL
-      nloopj4=NL
-      nloopii4=NL            
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR2:A(1,1,1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A(1,1,1)
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$* reduction( min( nloopi4),min(nloopj4),min(nloopii4))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-          if (B(i,j,ii).ne.C(1,1,1)) then
-           nloopi4=min(nloopi4,i)
-           nloopj4=min(nloopj4,j)
-           nloopii4=min(nloopii4,ii)
-          endif
-         enddo
-        enddo
-       enddo
-
-      nloopi5=NL
-      nloopj5=NL
-      nloopii5=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),remote_access(GR3:A(1,:,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A(1,j,ii)      
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$*reduction( min( nloopi5),min(nloopj5),min(nloopii5))
-       do i=1,N
-        do j=1,M
-         do ii=1,K
-          if (B(i,j,ii).ne.C(1,j,ii)) then
-           nloopi5=min(nloopi5,i)
-           nloopj5=min(nloopj5,j)
-           nloopii5=min(nloopii5,ii)
-          endif
-         enddo
-        enddo
-       enddo
-
-      nloopi6=NL
-      nloopj6=NL
-      nloopii6=NL
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR3:A1(:,M,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A1(i,M,ii)      
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$* reduction( min( nloopi6),min(nloopj6),min(nloopii6))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         if (B(i,j,ii).ne.C(i,M,ii)) then
-           nloopi6=min(nloopi6,i)
-           nloopj6=min(nloopj6,j)
-           nloopii6=min(nloopii6,ii)
-         endif
-        enddo
-       enddo
-      enddo
-
-      nloopi7=NL
-      nloopj7=NL
-      nloopii7=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*remote_access(GR3:A1(:,:,K))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A1(i,j,K)      
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction( min( nloopi7),min(nloopj7),min(nloopii7))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         if (B(i,j,ii).ne.C(i,j,K)) then
-           nloopi7=min(nloopi7,i)
-           nloopj7=min(nloopj7,j)
-           nloopii7=min(nloopii7,ii)
-         endif
-        enddo
-       enddo
-      enddo
-      if ((nloopi1 .eq.NL).and.(nloopi2 .eq.NL).and.
-     *     (nloopi3 .eq.NL).and. (nloopi4 .eq.NL).and.
-     *     (nloopi5 .eq.NL).and.(nloopi6 .eq.NL).and.
-     *     (nloopi7 .eq.NL)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-   
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-      enddo    
-      deallocate (A,B,C,A1)
-      end
-
-
-
-C ---------------------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do 10 i=1,N
-      do 10 j=1,M
-      do 10 ii=1,K
-   10 AR(i,j,ii) = NL+i+j+ii
-                   
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf32.fdv
deleted file mode 100644
index ab289e8..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf32.fdv
+++ /dev/null
@@ -1,457 +0,0 @@
-      program PRF32
-     
-c    TESTING OF THE PREFETCH DIRECTIVE. 
-
-      print *,'===START OF PRF32========================'
-C --------------------------------------------------
-      call prf3201
-      call prf3202
-      call prf3203
-C
-      print *,'=== END OF PRF32 ========================= '    
-      end
-C ---------------------------------------------------------PRF3201
-      subroutine PRF3201
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),A1(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-cdvm$ distribute B(BLOCK,BLOCK,*)
-cdvm$ align(:,:,:) with B(:,:,:) :: A,A1
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3 
-
-      tname='PRF3201'
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K),A1(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                                         
-      enddo                                        
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-cdvm$ remote_access (GR1:A(1,1,1))
-      ib1=A(1,1,1)               
-
-cdvm$ remote_access (GR1:A(N,M,K))
-      ib2=A(N,M,K)               
-
-cdvm$ remote_access (GR2:A(1,M,K))
-      ib3=A(1,M,K)               
-
-cdvm$ remote_access (GR3:A(N,1,K))
-      ib4=A(N,1,K)               
-
-cdvm$ remote_access (GR3:A(N,M,1))
-      ib5=A(N,M,1)               
-
-      if ((ib1 .eq.C(1,1,1)) .and.(ib2 .eq.C(N,M,K)) .and.
-     * (ib3 .eq.C(1,M,K)) .and.(ib4 .eq.C(N,1,K)) .and.
-     * (ib5 .eq.C(N,M,1))) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,A1)
-      end
-
-C ------------------------------------------------------PRF3202
-      subroutine PRF3202
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-cdvm$ distribute A(BLOCK,*,BLOCK)
-cdvm$ align(:,:,:) with A(:,:,:) :: B 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF3202'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                                         
-      enddo                                        
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-      isumc1=0
-      isuma1=0
-
-cdvm$ remote_access (GR1:A(:,:,:))               
-      do i=1,N         
-       do j=i,M
-        do ii=1,K
-         D(i,j,ii)=A(i,j,ii)
-         isumc1=isumc1+C(i,j,ii)
-         isuma1=isuma1+D(i,j,ii)
-        enddo
-       enddo
-      enddo
-
-      isumc2=0
-      isuma2=0
-
-cdvm$ remote_access (GR1:A(1,:,:))
-      do j=1,M         
-       do ii=1,K
-        D(1,j,ii)=A(1,j,ii)
-        isumc2=isumc2+C(1,j,ii)
-        isuma2=isuma2+D(1,j,ii)
-       enddo
-      enddo
-
-      isumc3=0
-      isuma3=0
-
-cdvm$ remote_access (GR1:A(:,M,:))
-      do i=1,N         
-       do ii=1,K
-        D(i,M,ii)=A(i,M,ii)
-        isumc3=isumc3+C(i,M,ii)
-        isuma3=isuma3+D(i,M,ii)
-       enddo
-      enddo 
-
-      isumc4=0
-      isuma4=0
-
-cdvm$ remote_access (GR2:A(:,:,K))
-      do i=1,N
-       do j=1,M         
-        D(i,j,K)=A(i,j,K)
-        isumc4=isumc4+C(i,j,K)
-        isuma4=isuma4+D(i,j,K)
-       enddo
-      enddo 
- 
-      ki=2
-      ki1=3
-      kj=2
-      kj1=3
-      kii=2
-      kii1=3
- 
-      isumc5=0
-      isuma5=0       
-cdvm$ remote_access (GR3:A(:,:,:))
-      do i=1,N/ki-ki1         
-       do j=1,M/kj-kj1
-        do ii=1,K/kii-kii1
-         D(i,j,ii)=A(ki*i+ki1,kj*j+kj1,kii*ii+kii1)
-         isumc5=isumc5+C(ki*i+ki1,kj*j+kj1,kii*ii+kii1)
-         isuma5=isuma5+D(i,j,ii)
-        enddo
-       enddo
-      enddo
-      if ((isumc1 .eq.isuma1).and.(isumc2 .eq.isuma2).and. 
-     *      (isumc3 .eq.isuma3).and.(isumc4 .eq.isuma4).and.
-     *      (isumc5 .eq.isuma5)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo  
-      deallocate (A,B,C,D)
-     
-      end
-C ------------------------------------------------------PRF3203
-      subroutine PRF3203
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),A1(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-cdvm$ distribute A(*,BLOCK,BLOCK)
-cdvm$ align(:,:,:) with A(:,:,:) :: B ,A1
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF3202'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),A1(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           A(i,j,ii) = NL+i+j+ii
-           A1(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                                         
-      enddo
-                                         
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-
-      nloopi1=NL
-      nloopj1=NL
-      nloopii1=NL
-               
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR1:A(1,1,1))
-      do i=1,N
-       do j=1,M
-         do ii=1,K
-          B(i,j,ii) = A(1,1,1)
-         enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$* reduction( min( nloopi1),min(nloopj1),min(nloopii1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-          if (B(i,j,ii).ne.C(1,1,1)) then
-           nloopi1=min(nloopi1,i)
-           nloopj1=min(nloopj1,j)
-           nloopii1=min(nloopii1,ii)
-          endif
-        enddo
-       enddo
-      enddo 
-
-      nloopi2=NL
-      nloopj2=NL
-      nloopii2=NL
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR1:A(N,M,K))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A(N,M,K)
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$*reduction( min( nloopi2),min(nloopj2),min(nloopii2))
-      do i=1,N
-       do j=1,M
-         do ii=1,K
-          if (B(i,j,ii).ne.C(N,M,K)) then
-           nloopi2=min(nloopi2,i)
-           nloopj2=min(nloopj2,j)
-           nloopii2=min(nloopii2,ii)
-          endif
-         enddo
-       enddo
-      enddo
-
-      nloopi3=NL
-      nloopj3=NL
-      nloopii3=NL
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR2:A)
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A(i,j,ii)      
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$* reduction( min( nloopi3),min(nloopj3),min(nloopii3))
-       do i=1,N
-        do j=1,M
-         do ii=1,K
-          if (B(i,j,ii).ne.C(i,j,ii)) then
-           nloopi3=min(nloopi3,i)
-           nloopj3=min(nloopj3,j)
-           nloopii3=min(nloopii3,ii)
-          endif
-        enddo
-       enddo
-      enddo                                     
-   
-      nloopi4=NL
-      nloopj4=NL
-      nloopii4=NL            
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR2:A(1,1,1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A(1,1,1)
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$* reduction( min( nloopi4),min(nloopj4),min(nloopii4))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-          if (B(i,j,ii).ne.C(1,1,1)) then
-           nloopi4=min(nloopi4,i)
-           nloopj4=min(nloopj4,j)
-           nloopii4=min(nloopii4,ii)
-          endif
-         enddo
-        enddo
-       enddo
-
-      nloopi5=NL
-      nloopj5=NL
-      nloopii5=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),remote_access(GR3:A(1,:,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A(1,j,ii)      
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$*reduction( min( nloopi5),min(nloopj5),min(nloopii5))
-       do i=1,N
-        do j=1,M
-         do ii=1,K
-          if (B(i,j,ii).ne.C(1,j,ii)) then
-           nloopi5=min(nloopi5,i)
-           nloopj5=min(nloopj5,j)
-           nloopii5=min(nloopii5,ii)
-          endif
-         enddo
-        enddo
-       enddo
-
-      nloopi6=NL
-      nloopj6=NL
-      nloopii6=NL
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(GR3:A1(:,M,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A1(i,M,ii)      
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii) on B(i,j,ii),
-*dvm$* reduction( min( nloopi6),min(nloopj6),min(nloopii6))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         if (B(i,j,ii).ne.C(i,M,ii)) then
-           nloopi6=min(nloopi6,i)
-           nloopj6=min(nloopj6,j)
-           nloopii6=min(nloopii6,ii)
-         endif
-        enddo
-       enddo
-      enddo
-
-      nloopi7=NL
-      nloopj7=NL
-      nloopii7=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*remote_access(GR3:A1(:,:,K))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         B(i,j,ii) = A1(i,j,K)      
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction( min( nloopi7),min(nloopj7),min(nloopii7))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         if (B(i,j,ii).ne.C(i,j,K)) then
-           nloopi7=min(nloopi7,i)
-           nloopj7=min(nloopj7,j)
-           nloopii7=min(nloopii7,ii)
-         endif
-        enddo
-       enddo
-      enddo
-      if ((nloopi1 .eq.NL).and.(nloopi2 .eq.NL).and.
-     *     (nloopi3 .eq.NL).and. (nloopi4 .eq.NL).and.
-     *     (nloopi5 .eq.NL).and.(nloopi6 .eq.NL).and.
-     *     (nloopi7 .eq.NL)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-   
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-      enddo    
-      deallocate (A,B,C,A1)
-      end
-
-
-
-C ---------------------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do 10 i=1,N
-      do 10 j=1,M
-      do 10 ii=1,K
-   10 AR(i,j,ii) = NL+i+j+ii
-                   
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf33.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf33.f90
deleted file mode 100644
index 85e3c90..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf33.f90
+++ /dev/null
@@ -1,326 +0,0 @@
-program prf33
-    !TESTING OF THE PREFETCH DIRECTIVE.
-
-    print *, '===START OF PRF33========================'
-
-    call prf3301
-    call prf3302
-    call prf3303
-
-    print *, '===END OF PRF33=========================='
-end
-
-subroutine prf3301
-    integer, parameter ::  N = 16, M = 8, K = 8, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, : ), B( :, :, : ), C( :, :, : )
-    character * 7 :: tname = 'PRF3301'
-
-    !dvm$ distribute B( block, block, block )
-    !dvm$ align( :, :, : ) with B( :, :, : ) :: A
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( B( N, M, K ), A( N, M, K ), C( N, M, K ) )
-    call serial3( C, N, M, K, NL )
-
-    !dvm$ parallel ( i, j, ii ) on A( i, j, ii )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                A( i, j, ii ) = NL + i + j + ii
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        !dvm$ remote_access ( GR1:A( N / 2, M / 2, K / 2 ) )
-        ib1 = A( N / 2, M / 2, K / 2 )
-
-        !dvm$ remote_access ( GR1:A( N / 2, M, K ) )
-        ib2 = A( N / 2, M, K )
-
-        !dvm$ remote_access ( GR2:A( N, M / 2, K ) )
-        ib3 = A( N, M / 2, K )
-
-        !dvm$ remote_access ( GR2:A( N, M, K / 2 ) )
-        ib4 = A( N, M, K / 2 )
-
-        !dvm$ remote_access ( GR3:A( N / 2, M, 1 ) )
-        ib5 = A( N / 2, M, 1 )
-
-        if ( ( ib1 .eq. C( N / 2, M / 2, K / 2 ) ) .and. ( ib2 .eq. C( N / 2, M, K ) ) .and. &
-             ( ib3 .eq. C( N, M / 2, K ) ) .and. ( ib4 .eq. C( N, M, K / 2 ) ) .and. &
-             ( ib5 .eq. C( N / 2, M, 1 ) ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C )
-end
-
-subroutine prf3302
-    integer, parameter ::  N = 16, M = 8, K = 8, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, : ), B( :, :, : ), C( :, :, : ), D( :, :, : )
-    character * 7 :: tname = 'PRF3302'
-
-    !dvm$ distribute A( block, block, block )
-    !dvm$ align( :, :, : ) with A( :, :, : ) :: B
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K ), B( N, M, K ), C( N, M, K ), D( N, M, K ) )
-    call serial3( C, N, M, K, NL )
-
-    !dvm$ parallel ( i, j, ii ) on A( i, j, ii )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                A( i, j, ii ) = NL + i + j + ii
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        isumc1 = 0
-        isuma1 = 0
-        !dvm$ remote_access ( GR1:A( N / 2, :, : ) )
-        do j = 1, M
-            do ii = 1, K
-                D( N / 2, j, ii ) = A( N / 2, j, ii )
-                isumc1 = isumc1 + C( N / 2, j, ii )
-                isuma1 = isuma1 + D( N / 2, j, ii )
-            enddo
-        enddo
-
-        isumc2 = 0
-        isuma2 = 0
-        !dvm$ remote_access ( GR1:A( :, M / 2, : ) )
-        do i = 1, N
-            do ii = 1, K
-                D( i, M / 2, ii ) = A( i, M / 2, ii )
-                isumc2 = isumc2 + C( i, M / 2, ii )
-                isuma2 = isuma2 + D( i, M / 2, ii )
-            enddo
-        enddo
-
-        isumc3 = 0
-        isuma3 = 0
-        !dvm$ remote_access ( GR2:A( :, :, K / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                D( i, j, K / 2 ) = A( i, j, K / 2 )
-                isumc3 = isumc3 + C( i, j, K / 2 )
-                isuma3 = isuma3 + D( i, j, K / 2 )
-            enddo
-        enddo
-
-        isumc4 = 0
-        isuma4 = 0
-        kj = 2
-        kj1 = 3
-        kii = 2
-        kii1 = 3
-        !dvm$ remote_access ( GR3:A( N / 2, :, : ) )
-        do j = 1, M / kj-kj1
-            do ii = 1, K / kii-kii1
-                D( N / 2, j, ii ) = A( N / 2, kj * j + kj1, kii * ii + kii1 )
-                isumc4 = isumc4 + C( N / 2, kj * j + kj1, kii * ii + kii1 )
-                isuma4 = isuma4 + D( N / 2, j, ii )
-            enddo
-        enddo
-
-        if ( ( isumc1 .eq. isuma1 ) .and. ( isumc2 .eq. isuma2 ) .and. &
-             ( isumc3 .eq. isuma3 ) .and. ( isumc4 .eq. isuma4 ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C, D )
-end
-
-subroutine prf3303
-    integer, parameter ::  N = 16, M = 8, K = 8, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, : ), B( :, :, : ), C( :, :, : ), A1( :, :, : )
-    character * 7 :: tname = 'PRF3303'
-
-    !dvm$ distribute A( block, block, block )
-    !dvm$ align( :, :, : ) with A( :, :, : ) :: B, A1
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K ), B( N, M, K ), C( N, M, K ), A1( N, M, K ) )
-    call serial3( C, N, M, K, NL )
-
-    !dvm$ parallel ( i, j, ii ) on A( i, j, ii )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                A( i, j, ii ) = NL + i + j + ii
-                A1( i, j, ii ) = NL + i + j + ii
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-
-        nloopi1 = NL
-        nloopj1 = NL
-        nloopii1 = NL
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), remote_access( GR1:A( N / 2, M / 2, K / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    B( i, j, ii ) = A( N / 2, M / 2, K / 2 )
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), reduction( min( nloopi1 ), min( nloopj1 ), min( nloopii1 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    if ( B( i, j, ii ) .ne. C( N / 2, M / 2, K / 2 ) ) then
-                        nloopi1 = min( nloopi1, i )
-                        nloopj1 = min( nloopj1, j )
-                        nloopii1 = min( nloopii1, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-
-        nloopi2 = NL
-        nloopj2 = NL
-        nloopii2 = NL
-        !dvm$ parallel ( i, j, ii ) on A( i, j, ii ), remote_access( GR1:A( N / 2, :, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    B( i, j, ii ) = A( N / 2, j, ii )
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), reduction( min( nloopi2 ), min( nloopj2 ), min( nloopii2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    if ( B( i, j, ii ) .ne. C( N / 2, j, ii ) ) then
-                        nloopi2 = min( nloopi2, i )
-                        nloopj2 = min( nloopj2, j )
-                        nloopii2 = min( nloopii2, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-
-        nloopi3 = NL
-        nloopj3 = NL
-        nloopii3 = NL
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), remote_access( GR2:A1( :, M / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    B( i, j, ii ) = A1( i, M / 2, ii )
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), reduction( min( nloopi3 ), min( nloopj3 ), min( nloopii3 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    if ( B( i, j, ii ) .ne. C( i, M / 2, ii ) ) then
-                        nloopi3 = min( nloopi3, i )
-                        nloopj3 = min( nloopj3, j )
-                        nloopii3 = min( nloopii3, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-
-        nloopi4 = NL
-        nloopj4 = NL
-        nloopii4 = NL
-        !dvm$ parallel ( i, j, ii ) on A( i, j, ii ), remote_access( GR2:A1( :, :, K / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    B( i, j, ii ) = A1( i, j, K / 2 )
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii ) on A( i, j, ii ), reduction( min( nloopi4 ), min( nloopj4 ), min( nloopii4 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    if ( B( i, j, ii ) .ne. C( i, j, K / 2 ) ) then
-                        nloopi4 = min( nloopi4, i )
-                        nloopj4 = min( nloopj4, j )
-                        nloopii4 = min( nloopii4, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-
-        if ( ( nloopi1 .eq. NL ) .and. ( nloopi2 .eq. NL ) .and. &
-             ( nloopi3 .eq. NL ) .and. ( nloopi4 .eq. NL ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-    enddo
-    deallocate( A, B, C, A1 )
-end
-
-subroutine serial3( AR, N, M, K, NL )
-    integer AR( N, M, K )
-    integer NL
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-            AR( i, j, ii ) = NL + i + j + ii
-            enddo
-        enddo
-    enddo
-end
-
-subroutine ansyes( name )
-    character * 7 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno( name )
-    character * 7 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf34.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf34.f90
deleted file mode 100644
index 76f70e2..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf34.f90
+++ /dev/null
@@ -1,326 +0,0 @@
-program prf34
-    !TESTING OF THE PREFETCH DIRECTIVE.
-
-    print *, '===START OF PRF34========================'
-
-    call prf3401
-    call prf3402
-    call prf3403
-
-    print *, '===END OF PRF34=========================='
-end
-
-subroutine prf3401
-    integer, parameter ::  N = 16, M = 8, K = 8, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, : ), B( :, :, : ), C( :, :, : )
-    character * 7 :: tname = 'PRF3401'
-
-    !dvm$ distribute B( block, block, * )
-    !dvm$ align( :, :, : ) with B( :, :, : ) :: A
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( B( N, M, K ), A( N, M, K ), C( N, M, K ) )
-    call serial3( C, N, M, K, NL )
-
-    !dvm$ parallel ( i, j, ii ) on A( i, j, ii )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                A( i, j, ii ) = NL + i + j + ii
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        !dvm$ remote_access ( GR1:A( N / 2, M / 2, K / 2 ) )
-        ib1 = A( N / 2, M / 2, K / 2 )
-
-        !dvm$ remote_access ( GR1:A( N / 2, M, K ) )
-        ib2 = A( N / 2, M, K )
-
-        !dvm$ remote_access ( GR2:A( N, M / 2, K ) )
-        ib3 = A( N, M / 2, K )
-
-        !dvm$ remote_access ( GR2:A( N, M, K / 2 ) )
-        ib4 = A( N, M, K / 2 )
-
-        !dvm$ remote_access ( GR3:A( N / 2, M, 1 ) )
-        ib5 = A( N / 2, M, 1 )
-
-        if ( ( ib1 .eq. C( N / 2, M / 2, K / 2 ) ) .and. ( ib2 .eq. C( N / 2, M, K ) ) .and. &
-             ( ib3 .eq. C( N, M / 2, K ) ) .and. ( ib4 .eq. C( N, M, K / 2 ) ) .and. &
-             ( ib5 .eq. C( N / 2, M, 1 ) ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C )
-end
-
-subroutine prf3402
-    integer, parameter :: N = 16, M = 8, K = 8, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, : ), B( :, :, : ), C( :, :, : ), D( :, :, : )
-    character * 7 :: tname = 'PRF3402'
-
-    !dvm$ distribute A( block, *, block )
-    !dvm$ align( :, :, : ) with A( :, :, : ) :: B
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K ), B( N, M, K ), C( N, M, K ), D( N, M, K ) )
-    call serial3( C, N, M, K, NL )
-
-    !dvm$ parallel ( i, j, ii ) on A( i, j, ii )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                A( i, j, ii ) = NL + i + j + ii
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        isumc1 = 0
-        isuma1 = 0
-        !dvm$ remote_access ( GR1:A( N / 2, :, : ) )
-        do j = 1, M
-            do ii = 1, K
-                D( N / 2, j, ii ) = A( N / 2, j, ii )
-                isumc1 = isumc1 + C( N / 2, j, ii )
-                isuma1 = isuma1 + D( N / 2, j, ii )
-            enddo
-        enddo
-
-        isumc2 = 0
-        isuma2 = 0
-        !dvm$ remote_access ( GR1:A( :, M / 2, : ) )
-        do i = 1, N
-            do ii = 1, K
-                D( i, M / 2, ii ) = A( i, M / 2, ii )
-                isumc2 = isumc2 + C( i, M / 2, ii )
-                isuma2 = isuma2 + D( i, M / 2, ii )
-            enddo
-        enddo
-
-        isumc3 = 0
-        isuma3 = 0
-        !dvm$ remote_access ( GR2:A( :, :, K / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                D( i, j, K / 2 ) = A( i, j, K / 2 )
-                isumc3 = isumc3 + C( i, j, K / 2 )
-                isuma3 = isuma3 + D( i, j, K / 2 )
-            enddo
-        enddo
-
-        isumc4 = 0
-        isuma4 = 0
-        kj = 2
-        kj1 = 3
-        kii = 2
-        kii1 = 3
-        !dvm$ remote_access ( GR3:A( N / 2, :, : ) )
-        do j = 1, M / kj-kj1
-            do ii = 1, K / kii-kii1
-                D( N / 2, j, ii ) = A( N / 2, kj * j + kj1, kii * ii + kii1 )
-                isumc4 = isumc4 + C( N / 2, kj * j + kj1, kii * ii + kii1 )
-                isuma4 = isuma4 + D( N / 2, j, ii )
-            enddo
-        enddo
-
-        if ( ( isumc1 .eq. isuma1 ) .and. ( isumc2 .eq. isuma2 ) .and. &
-             ( isumc3 .eq. isuma3 ) .and. ( isumc4 .eq. isuma4 ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C, D )
-end
-
-subroutine prf3403
-    integer, parameter ::  N = 16, M = 8, K = 8, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, : ), B( :, :, : ), C( :, :, : ), A1( :, :, : )
-    character * 7 :: tname = 'PRF3403'
-
-    !dvm$ distribute A( *, block, block )
-    !dvm$ align( :, :, : ) with A( :, :, : ) :: B, A1
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K ), B( N, M, K ), C( N, M, K ), A1( N, M, K ) )
-    call serial3( C, N, M, K, NL )
-
-    !dvm$ parallel ( i, j, ii ) on A( i, j, ii )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                A( i, j, ii ) = NL + i + j + ii
-                A1( i, j, ii ) = NL + i + j + ii
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-
-        nloopi1 = NL
-        nloopj1 = NL
-        nloopii1 = NL
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), remote_access( GR1:A( N / 2, M / 2, K / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    B( i, j, ii ) = A( N / 2, M / 2, K / 2 )
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), reduction( min( nloopi1 ), min( nloopj1 ), min( nloopii1 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    if ( B( i, j, ii ) .ne. C( N / 2, M / 2, K / 2 ) ) then
-                        nloopi1 = min( nloopi1, i )
-                        nloopj1 = min( nloopj1, j )
-                        nloopii1 = min( nloopii1, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-
-        nloopi2 = NL
-        nloopj2 = NL
-        nloopii2 = NL
-        !dvm$ parallel ( i, j, ii ) on A( i, j, ii ), remote_access( GR1:A( N / 2, :, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    B( i, j, ii ) = A( N / 2, j, ii )
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), reduction( min( nloopi2 ), min( nloopj2 ), min( nloopii2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    if ( B( i, j, ii ) .ne. C( N / 2, j, ii ) ) then
-                        nloopi2 = min( nloopi2, i )
-                        nloopj2 = min( nloopj2, j )
-                        nloopii2 = min( nloopii2, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-
-        nloopi3 = NL
-        nloopj3 = NL
-        nloopii3 = NL
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), remote_access( GR2:A1( :, M / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    B( i, j, ii ) = A1( i, M / 2, ii )
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii ) on B( i, j, ii ), reduction( min( nloopi3 ), min( nloopj3 ), min( nloopii3 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    if ( B( i, j, ii ) .ne. C( i, M / 2, ii ) ) then
-                        nloopi3 = min( nloopi3, i )
-                        nloopj3 = min( nloopj3, j )
-                        nloopii3 = min( nloopii3, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-
-        nloopi4 = NL
-        nloopj4 = NL
-        nloopii4 = NL
-        !dvm$ parallel ( i, j, ii ) on A( i, j, ii ), remote_access( GR2:A1( :, :, K / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    B( i, j, ii ) = A1( i, j, K / 2 )
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii ) on A( i, j, ii ), reduction( min( nloopi4 ), min( nloopj4 ), min( nloopii4 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    if ( B( i, j, ii ) .ne. C( i, j, K / 2 ) ) then
-                        nloopi4 = min( nloopi4, i )
-                        nloopj4 = min( nloopj4, j )
-                        nloopii4 = min( nloopii4, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-
-        if ( ( nloopi1 .eq. NL ) .and. ( nloopi2 .eq. NL ) .and. &
-             ( nloopi3 .eq. NL ) .and. ( nloopi4 .eq. NL ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-    enddo
-    deallocate( A, B, C, A1 )
-end
-
-subroutine serial3( AR, N, M, K, NL )
-    integer AR( N, M, K )
-    integer NL
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-            AR( i, j, ii ) = NL + i + j + ii
-            enddo
-        enddo
-    enddo
-end
-
-subroutine ansyes( name )
-    character * 7 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno( name )
-    character * 7 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf41.fdv
deleted file mode 100644
index 24fb9cd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf41.fdv
+++ /dev/null
@@ -1,525 +0,0 @@
-      program PRF41
-     
-c    TESTING OF THE PREFETCH DIRECTIVE. 
-
-      print *,'===START OF PRF41========================'
-C --------------------------------------------------
-      call prf4101
-      call prf4102
-      call prf4103
-C
-      print *,'=== END OF PRF41 ========================= '    
-      end
-C ---------------------------------------------------------PRF4101
-      subroutine PRF4101
-      integer, parameter ::  N = 16,M=8,K=8,L=16,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:)
-      integer, allocatable :: C(:,:,:,:),A1(:,:,:,:)
-      character*7 tname
-                 
-cdvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)    
-cdvm$ align(:,:,:,:) with B(:,:,:,:) :: A,A1 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF4101'
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L),A1(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             A(i,j,ii,jj) = NL+i+j+ii+jj
-             A1(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo                                         
-      enddo 
-                                        
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3
-
-cdvm$ remote_access (GR1:A(1,1,1,1))
-      ib1=A(1,1,1,1)               
-
-cdvm$ remote_access (GR1:A(N,M,K,L))
-      ib2=A(N,M,K,L)               
-
-cdvm$ remote_access (GR2:A(1,M,K,L))
-      ib3=A(1,M,K,L)               
-
-cdvm$ remote_access (GR3:A(N,1,K,L))
-      ib4=A(N,1,K,L)               
-
-cdvm$ remote_access (GR3:A(N,M,1,L))
-      ib5=A(N,M,1,L)               
-
-cdvm$ remote_access (GR3:A1(N,M,K,1))
-      ib6=A1(N,M,K,1)                
-
-      if ((ib1 .eq.C(1,1,1,1)) .and.(ib2 .eq.C(N,M,K,L)) .and.
-     * (ib3 .eq.C(1,M,K,L)) .and.(ib4 .eq.C(N,1,K,L)) .and.
-     * (ib5 .eq.C(N,M,1,L)).and.(ib6 .eq.C(N,M,K,1))) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,A1)
-
-      end
-
-C ------------------------------------------------------PRF4102
-      subroutine PRF4102     
-      integer, parameter ::  N = 16,M=8,K=8,L=16,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:)
-      integer, allocatable :: C(:,:,:,:),D(:,:,:,:)
-      character*7 tname
-                 
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-cdvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF4102'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo                                         
-      enddo 
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-      isumc1=0
-      isuma1=0
-
-cdvm$ remote_access (GR1:A(:,:,:,:))
-      do i=1,N         
-       do j=i,M
-        do ii=1,K
-         do jj=1,L
-          D(i,j,ii,jj)=A(i,j,ii,jj)
-          isumc1=isumc1+C(i,j,ii,jj)
-          isuma1=isuma1+D(i,j,ii,jj)
-         enddo
-        enddo
-       enddo
-      enddo 
-
-      isumc2=0
-      isuma2=0
-
-cdvm$ remote_access (GR1:A(1,:,:,:))
-      do j=1,M         
-       do ii=1,K
-        do jj=1,L
-         D(1,j,ii,jj)=A(1,j,ii,jj)
-         isumc2=isumc2+C(1,j,ii,jj)
-         isuma2=isuma2+D(1,j,ii,jj)
-        enddo
-       enddo
-      enddo 
-
-      isumc3=0
-      isuma3=0
-
-cdvm$ remote_access (GR2:A(:,M,:,:))
-      do i=1,N         
-       do ii=1,K
-        do jj=1,L
-         D(i,M,ii,jj)=A(i,M,ii,jj)
-         isumc3=isumc3+C(i,M,ii,jj)
-         isuma3=isuma3+D(i,M,ii,jj)
-        enddo
-       enddo
-      enddo            
-
-      isumc4=0
-      isuma4=0
-
-cdvm$ remote_access (GR3:A(:,:,K,:))
-      do i=1,N
-       do j=1,M         
-        do jj=1,L
-         D(i,j,K,jj)=A(i,j,K,jj)
-         isumc4=isumc4+C(i,j,K,jj)
-         isuma4=isuma4+D(i,j,K,jj)
-        enddo
-       enddo             
-      enddo
-
-      isumc5=0
-      isuma5=0
-
-cdvm$ remote_access (GR3:A(:,:,:,L))
-      do i=1,N
-       do j=1,M         
-        do ii=1,K
-         D(i,j,ii,L)=A(i,j,ii,L)
-         isumc5=isumc5+C(i,j,ii,L)
-         isuma5=isuma5+D(i,j,ii,L)
-        enddo
-       enddo             
-      enddo
-           
-      if ((isumc1 .eq.isuma1).and.(isumc2 .eq.isuma2).and. 
-     *      (isumc3 .eq.isuma3).and.(isumc4 .eq.isuma4).and.
-     *      (isumc5 .eq.isuma5)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo  
-      deallocate (A,B,C,D)
-     
-      end
-
-C ------------------------------------------------------PRF4103
-      subroutine PRF4103
-      integer, parameter ::  N = 16,M=8,K=8,L=16,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:)
-      integer, allocatable :: C(:,:,:,:),A1(:,:,:,:)
-      character*7 tname
-                 
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-cdvm$ align(:,:,:,:) with A(:,:,:,:) :: B,A1 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF4103'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),A1(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              A1(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo                                         
-      enddo 
- 
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-
-      nloopi1=NL
-      nloopj1=NL
-      nloopii1=NL
-      nloopjj1=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR1:A(1,1,1,1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(1,1,1,1)
-         enddo
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$* reduction( min( nloopi1),min(nloopj1),min(nloopii1),
-*dvm$*  min(nloopjj1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(1,1,1,1)) then
-           nloopi1=min(nloopi1,i)
-           nloopj1=min(nloopj1,j)
-           nloopii1=min(nloopii1,ii)
-           nloopjj1=min(nloopjj1,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi2=NL
-      nloopj2=NL
-      nloopii2=NL
-      nloopjj2=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(GR1:A(N,M,K,L))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(N,M,K,L)      
-         enddo
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi2),min(nloopj2),min(nloopii2),min(nloopjj2))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(N,M,K,L)) then
-           nloopi2=min(nloopi2,i)
-           nloopj2=min(nloopj2,j)
-           nloopii2=min(nloopii2,ii)
-           nloopjj2=min(nloopjj2,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi3=NL
-      nloopj3=NL
-      nloopii3=NL
-      nloopjj3=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(GR2:A)
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(i,j,ii,jj)      
-         enddo
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$* reduction( min( nloopi3),min(nloopj3),min(nloopii3),
-*dvm$* min(nloopjj3))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi3=min(nloopi3,i)
-           nloopj3=min(nloopj3,j)
-           nloopii3=min(nloopii3,ii)
-           nloopjj3=min(nloopjj3,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi4=NL
-      nloopj4=NL
-      nloopii4=NL
-      nloopjj4=NL
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),remote_access(GR2:A(1,:,:,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-           B(i,j,ii,jj) = A(1,j,ii,jj)      
-         enddo
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi4),min(nloopj4),min(nloopii4),
-*dvm$*min(nlooopjj4))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(1,j,ii,jj)) then
-           nloopi4=min(nloopi4,i)
-           nloopj4=min(nloopj4,j)
-           nloopii4=min(nloopii4,ii)
-           nloopjj4=min(nloopjj4,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi5=NL
-      nloopj5=NL
-      nloopii5=NL
-      nloopjj5=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR3:A(:,M,:,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(i,M,ii,jj)      
-         enddo
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$* reduction( min( nloopi5),min(nloopj5),min(nloopii5),
-*dvm$* min(nloopjj5))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,M,ii,jj)) then
-           nloopi5=min(nloopi5,i)
-           nloopj5=min(nloopj5,j)
-           nloopii5=min(nloopii5,ii)
-           nloopjj5=min(nloopjj5,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi6=NL
-      nloopj6=NL
-      nloopii6=NL
-      nloopjj6=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR3:A1(:,:,K,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-           B(i,j,ii,jj) = A1(i,j,K,jj)      
-         enddo
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi6),min(nloopj6),min(nloopii6),min(nloopjj6))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,j,K,jj)) then
-           nloopi6=min(nloopi6,i)
-           nloopj6=min(nloopj6,j)
-           nloopii6=min(nloopii6,ii)
-           nloopjj6=min(nloopjj6,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi7=NL
-      nloopj7=NL
-      nloopii7=NL
-      nloopjj7=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR3:A1(:,:,:,L))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A1(i,j,ii,L)      
-         enddo
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi7),min(nloopj7),min(nloopii7),min(nloopjj7))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,j,ii,L)) then
-           nloopi7=min(nloopi7,i)
-           nloopj7=min(nloopj7,j)
-           nloopii7=min(nloopii7,ii)
-           nloopjj7=min(nloopjj7,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo 
-
-      if ((nloopi1 .eq.NL).and.(nloopi2 .eq.NL).and.
-     *     (nloopi3 .eq.NL).and. (nloopi4 .eq.NL).and.
-     *     (nloopi5 .eq.NL).and.(nloopi6 .eq.NL).and.
-     *     (nloopi7 .eq.NL)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-   
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo    
-      deallocate (A,B,C,A1)
-
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-           AR(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf42.fdv
deleted file mode 100644
index 745109f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf42.fdv
+++ /dev/null
@@ -1,525 +0,0 @@
-      program PRF42
-     
-c    TESTING OF THE PREFETCH DIRECTIVE. 
-
-      print *,'===START OF PRF42========================'
-C --------------------------------------------------
-      call prf4201
-      call prf4202
-      call prf4203
-C
-      print *,'=== END OF PRF42 ========================= '    
-      end
-C ---------------------------------------------------------PRF4201
-      subroutine PRF4201
-      integer, parameter ::  N = 16,M=8,K=8,L=16,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:)
-      integer, allocatable :: C(:,:,:,:),A1(:,:,:,:)
-      character*7 tname
-                 
-cdvm$ distribute B(*,*,*,*)    
-cdvm$ align(:,:,:,:) with B(:,:,:,:) :: A,A1 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF4201'
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L),A1(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             A(i,j,ii,jj) = NL+i+j+ii+jj
-             A1(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo                                         
-      enddo 
-                                        
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3
-
-cdvm$ remote_access (GR1:A(1,1,1,1))
-      ib1=A(1,1,1,1)               
-
-cdvm$ remote_access (GR1:A(N,M,K,L))
-      ib2=A(N,M,K,L)               
-
-cdvm$ remote_access (GR2:A(1,M,K,L))
-      ib3=A(1,M,K,L)               
-
-cdvm$ remote_access (GR3:A(N,1,K,L))
-      ib4=A(N,1,K,L)               
-
-cdvm$ remote_access (GR3:A(N,M,1,L))
-      ib5=A(N,M,1,L)               
-
-cdvm$ remote_access (GR3:A1(N,M,K,1))
-      ib6=A1(N,M,K,1)                
-
-      if ((ib1 .eq.C(1,1,1,1)) .and.(ib2 .eq.C(N,M,K,L)) .and.
-     * (ib3 .eq.C(1,M,K,L)) .and.(ib4 .eq.C(N,1,K,L)) .and.
-     * (ib5 .eq.C(N,M,1,L)).and.(ib6 .eq.C(N,M,K,1))) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,A1)
-
-      end
-
-C ------------------------------------------------------PRF4202
-      subroutine PRF4202     
-      integer, parameter ::  N = 16,M=8,K=8,L=16,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:)
-      integer, allocatable :: C(:,:,:,:),D(:,:,:,:)
-      character*7 tname
-                 
-cdvm$ distribute A(*,*,*,*)    
-cdvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF4202'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo                                         
-      enddo 
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-      isumc1=0
-      isuma1=0
-
-cdvm$ remote_access (GR1:A(:,:,:,:))
-      do i=1,N         
-       do j=i,M
-        do ii=1,K
-         do jj=1,L
-          D(i,j,ii,jj)=A(i,j,ii,jj)
-          isumc1=isumc1+C(i,j,ii,jj)
-          isuma1=isuma1+D(i,j,ii,jj)
-         enddo
-        enddo
-       enddo
-      enddo 
-
-      isumc2=0
-      isuma2=0
-
-cdvm$ remote_access (GR1:A(1,:,:,:))
-      do j=1,M         
-       do ii=1,K
-        do jj=1,L
-         D(1,j,ii,jj)=A(1,j,ii,jj)
-         isumc2=isumc2+C(1,j,ii,jj)
-         isuma2=isuma2+D(1,j,ii,jj)
-        enddo
-       enddo
-      enddo 
-
-      isumc3=0
-      isuma3=0
-
-cdvm$ remote_access (GR2:A(:,M,:,:))
-      do i=1,N         
-       do ii=1,K
-        do jj=1,L
-         D(i,M,ii,jj)=A(i,M,ii,jj)
-         isumc3=isumc3+C(i,M,ii,jj)
-         isuma3=isuma3+D(i,M,ii,jj)
-        enddo
-       enddo
-      enddo            
-
-      isumc4=0
-      isuma4=0
-
-cdvm$ remote_access (GR3:A(:,:,K,:))
-      do i=1,N
-       do j=1,M         
-        do jj=1,L
-         D(i,j,K,jj)=A(i,j,K,jj)
-         isumc4=isumc4+C(i,j,K,jj)
-         isuma4=isuma4+D(i,j,K,jj)
-        enddo
-       enddo             
-      enddo
-
-      isumc5=0
-      isuma5=0
-
-cdvm$ remote_access (GR3:A(:,:,:,L))
-      do i=1,N
-       do j=1,M         
-        do ii=1,K
-         D(i,j,ii,L)=A(i,j,ii,L)
-         isumc5=isumc5+C(i,j,ii,L)
-         isuma5=isuma5+D(i,j,ii,L)
-        enddo
-       enddo             
-      enddo
-           
-      if ((isumc1 .eq.isuma1).and.(isumc2 .eq.isuma2).and. 
-     *      (isumc3 .eq.isuma3).and.(isumc4 .eq.isuma4).and.
-     *      (isumc5 .eq.isuma5)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo  
-      deallocate (A,B,C,D)
-     
-      end
-
-C ------------------------------------------------------PRF4203
-      subroutine PRF4203
-      integer, parameter ::  N = 16,M=8,K=8,L=16,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:)
-      integer, allocatable :: C(:,:,:,:),A1(:,:,:,:)
-      character*7 tname
-                 
-cdvm$ distribute A(*,*,*,*)    
-cdvm$ align(:,:,:,:) with A(:,:,:,:) :: B,A1 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF4203'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),A1(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              A1(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo                                         
-      enddo 
- 
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-
-      nloopi1=NL
-      nloopj1=NL
-      nloopii1=NL
-      nloopjj1=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR1:A(1,1,1,1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(1,1,1,1)
-         enddo
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$* reduction( min( nloopi1),min(nloopj1),min(nloopii1),
-*dvm$*  min(nloopjj1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(1,1,1,1)) then
-           nloopi1=min(nloopi1,i)
-           nloopj1=min(nloopj1,j)
-           nloopii1=min(nloopii1,ii)
-           nloopjj1=min(nloopjj1,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi2=NL
-      nloopj2=NL
-      nloopii2=NL
-      nloopjj2=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(GR1:A(N,M,K,L))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(N,M,K,L)      
-         enddo
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi2),min(nloopj2),min(nloopii2),min(nloopjj2))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(N,M,K,L)) then
-           nloopi2=min(nloopi2,i)
-           nloopj2=min(nloopj2,j)
-           nloopii2=min(nloopii2,ii)
-           nloopjj2=min(nloopjj2,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi3=NL
-      nloopj3=NL
-      nloopii3=NL
-      nloopjj3=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(GR2:A)
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(i,j,ii,jj)      
-         enddo
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$* reduction( min( nloopi3),min(nloopj3),min(nloopii3),
-*dvm$* min(nloopjj3))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi3=min(nloopi3,i)
-           nloopj3=min(nloopj3,j)
-           nloopii3=min(nloopii3,ii)
-           nloopjj3=min(nloopjj3,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi4=NL
-      nloopj4=NL
-      nloopii4=NL
-      nloopjj4=NL
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),remote_access(GR2:A(1,:,:,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-           B(i,j,ii,jj) = A(1,j,ii,jj)      
-         enddo
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi4),min(nloopj4),min(nloopii4),
-*dvm$*min(nlooopjj4))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(1,j,ii,jj)) then
-           nloopi4=min(nloopi4,i)
-           nloopj4=min(nloopj4,j)
-           nloopii4=min(nloopii4,ii)
-           nloopjj4=min(nloopjj4,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi5=NL
-      nloopj5=NL
-      nloopii5=NL
-      nloopjj5=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR3:A(:,M,:,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(i,M,ii,jj)      
-         enddo
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$* reduction( min( nloopi5),min(nloopj5),min(nloopii5),
-*dvm$* min(nloopjj5))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,M,ii,jj)) then
-           nloopi5=min(nloopi5,i)
-           nloopj5=min(nloopj5,j)
-           nloopii5=min(nloopii5,ii)
-           nloopjj5=min(nloopjj5,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi6=NL
-      nloopj6=NL
-      nloopii6=NL
-      nloopjj6=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR3:A1(:,:,K,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-           B(i,j,ii,jj) = A1(i,j,K,jj)      
-         enddo
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi6),min(nloopj6),min(nloopii6),min(nloopjj6))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,j,K,jj)) then
-           nloopi6=min(nloopi6,i)
-           nloopj6=min(nloopj6,j)
-           nloopii6=min(nloopii6,ii)
-           nloopjj6=min(nloopjj6,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi7=NL
-      nloopj7=NL
-      nloopii7=NL
-      nloopjj7=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR3:A1(:,:,:,L))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A1(i,j,ii,L)      
-         enddo
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi7),min(nloopj7),min(nloopii7),min(nloopjj7))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,j,ii,L)) then
-           nloopi7=min(nloopi7,i)
-           nloopj7=min(nloopj7,j)
-           nloopii7=min(nloopii7,ii)
-           nloopjj7=min(nloopjj7,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo 
-
-      if ((nloopi1 .eq.NL).and.(nloopi2 .eq.NL).and.
-     *     (nloopi3 .eq.NL).and. (nloopi4 .eq.NL).and.
-     *     (nloopi5 .eq.NL).and.(nloopi6 .eq.NL).and.
-     *     (nloopi7 .eq.NL)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-   
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo    
-      deallocate (A,B,C,A1)
-
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-           AR(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf43.fdv
deleted file mode 100644
index ffe30d1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf43.fdv
+++ /dev/null
@@ -1,525 +0,0 @@
-      program PRF43
-     
-c    TESTING OF THE PREFETCH DIRECTIVE. 
-
-      print *,'===START OF PRF43========================'
-C --------------------------------------------------
-      call prf4301
-      call prf4302
-      call prf4303
-C
-      print *,'=== END OF PRF43 ========================= '    
-      end
-C ---------------------------------------------------------PRF4301
-      subroutine PRF4301
-      integer, parameter ::  N = 16,M=8,K=8,L=16,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:)
-      integer, allocatable :: C(:,:,:,:),A1(:,:,:,:)
-      character*7 tname
-                 
-cdvm$ distribute B(BLOCK,BLOCK,BLOCK,*)    
-cdvm$ align(:,:,:,:) with B(:,:,:,:) :: A,A1 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF4301'
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L),A1(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             A(i,j,ii,jj) = NL+i+j+ii+jj
-             A1(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo                                         
-      enddo 
-                                        
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3
-
-cdvm$ remote_access (GR1:A(1,1,1,1))
-      ib1=A(1,1,1,1)               
-
-cdvm$ remote_access (GR1:A(N,M,K,L))
-      ib2=A(N,M,K,L)               
-
-cdvm$ remote_access (GR2:A(1,M,K,L))
-      ib3=A(1,M,K,L)               
-
-cdvm$ remote_access (GR3:A(N,1,K,L))
-      ib4=A(N,1,K,L)               
-
-cdvm$ remote_access (GR3:A(N,M,1,L))
-      ib5=A(N,M,1,L)               
-
-cdvm$ remote_access (GR3:A1(N,M,K,1))
-      ib6=A1(N,M,K,1)                
-
-      if ((ib1 .eq.C(1,1,1,1)) .and.(ib2 .eq.C(N,M,K,L)) .and.
-     * (ib3 .eq.C(1,M,K,L)) .and.(ib4 .eq.C(N,1,K,L)) .and.
-     * (ib5 .eq.C(N,M,1,L)).and.(ib6 .eq.C(N,M,K,1))) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo
-      deallocate (A,B,C,A1)
-
-      end
-
-C ------------------------------------------------------PRF4302
-      subroutine PRF4302     
-      integer, parameter ::  N = 16,M=8,K=8,L=16,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:)
-      integer, allocatable :: C(:,:,:,:),D(:,:,:,:)
-      character*7 tname
-                 
-cdvm$ distribute A(BLOCK,BLOCK,*,BLOCK)    
-cdvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF4302'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo                                         
-      enddo 
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-      isumc1=0
-      isuma1=0
-
-cdvm$ remote_access (GR1:A(:,:,:,:))
-      do i=1,N         
-       do j=i,M
-        do ii=1,K
-         do jj=1,L
-          D(i,j,ii,jj)=A(i,j,ii,jj)
-          isumc1=isumc1+C(i,j,ii,jj)
-          isuma1=isuma1+D(i,j,ii,jj)
-         enddo
-        enddo
-       enddo
-      enddo 
-
-      isumc2=0
-      isuma2=0
-
-cdvm$ remote_access (GR1:A(1,:,:,:))
-      do j=1,M         
-       do ii=1,K
-        do jj=1,L
-         D(1,j,ii,jj)=A(1,j,ii,jj)
-         isumc2=isumc2+C(1,j,ii,jj)
-         isuma2=isuma2+D(1,j,ii,jj)
-        enddo
-       enddo
-      enddo 
-
-      isumc3=0
-      isuma3=0
-
-cdvm$ remote_access (GR2:A(:,M,:,:))
-      do i=1,N         
-       do ii=1,K
-        do jj=1,L
-         D(i,M,ii,jj)=A(i,M,ii,jj)
-         isumc3=isumc3+C(i,M,ii,jj)
-         isuma3=isuma3+D(i,M,ii,jj)
-        enddo
-       enddo
-      enddo            
-
-      isumc4=0
-      isuma4=0
-
-cdvm$ remote_access (GR3:A(:,:,K,:))
-      do i=1,N
-       do j=1,M         
-        do jj=1,L
-         D(i,j,K,jj)=A(i,j,K,jj)
-         isumc4=isumc4+C(i,j,K,jj)
-         isuma4=isuma4+D(i,j,K,jj)
-        enddo
-       enddo             
-      enddo
-
-      isumc5=0
-      isuma5=0
-
-cdvm$ remote_access (GR3:A(:,:,:,L))
-      do i=1,N
-       do j=1,M         
-        do ii=1,K
-         D(i,j,ii,L)=A(i,j,ii,L)
-         isumc5=isumc5+C(i,j,ii,L)
-         isuma5=isuma5+D(i,j,ii,L)
-        enddo
-       enddo             
-      enddo
-           
-      if ((isumc1 .eq.isuma1).and.(isumc2 .eq.isuma2).and. 
-     *      (isumc3 .eq.isuma3).and.(isumc4 .eq.isuma4).and.
-     *      (isumc5 .eq.isuma5)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo  
-      deallocate (A,B,C,D)
-     
-      end
-
-C ------------------------------------------------------PRF4303
-      subroutine PRF4303
-      integer, parameter ::  N = 16,M=8,K=8,L=16,NL=1000,NIT=3
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:)
-      integer, allocatable :: C(:,:,:,:),A1(:,:,:,:)
-      character*7 tname
-                 
-cdvm$ distribute A(BLOCK,*,BLOCK,BLOCK)    
-cdvm$ align(:,:,:,:) with A(:,:,:,:) :: B,A1 
-
-cdvm$ remote_group GR1
-cdvm$ remote_group GR2
-cdvm$ remote_group GR3
-
-      tname='PRF4303'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),A1(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              A1(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo                                         
-      enddo 
- 
-      do it=1,NIT
-cdvm$ prefetch GR1                                                  
-cdvm$ prefetch GR2 
-cdvm$ prefetch GR3 
-               
-
-      nloopi1=NL
-      nloopj1=NL
-      nloopii1=NL
-      nloopjj1=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR1:A(1,1,1,1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(1,1,1,1)
-         enddo
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$* reduction( min( nloopi1),min(nloopj1),min(nloopii1),
-*dvm$*  min(nloopjj1))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(1,1,1,1)) then
-           nloopi1=min(nloopi1,i)
-           nloopj1=min(nloopj1,j)
-           nloopii1=min(nloopii1,ii)
-           nloopjj1=min(nloopjj1,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi2=NL
-      nloopj2=NL
-      nloopii2=NL
-      nloopjj2=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(GR1:A(N,M,K,L))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(N,M,K,L)      
-         enddo
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi2),min(nloopj2),min(nloopii2),min(nloopjj2))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(N,M,K,L)) then
-           nloopi2=min(nloopi2,i)
-           nloopj2=min(nloopj2,j)
-           nloopii2=min(nloopii2,ii)
-           nloopjj2=min(nloopjj2,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi3=NL
-      nloopj3=NL
-      nloopii3=NL
-      nloopjj3=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(GR2:A)
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(i,j,ii,jj)      
-         enddo
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$* reduction( min( nloopi3),min(nloopj3),min(nloopii3),
-*dvm$* min(nloopjj3))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-           nloopi3=min(nloopi3,i)
-           nloopj3=min(nloopj3,j)
-           nloopii3=min(nloopii3,ii)
-           nloopjj3=min(nloopjj3,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi4=NL
-      nloopj4=NL
-      nloopii4=NL
-      nloopjj4=NL
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),remote_access(GR2:A(1,:,:,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-           B(i,j,ii,jj) = A(1,j,ii,jj)      
-         enddo
-        enddo
-       enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi4),min(nloopj4),min(nloopii4),
-*dvm$*min(nlooopjj4))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(1,j,ii,jj)) then
-           nloopi4=min(nloopi4,i)
-           nloopj4=min(nloopj4,j)
-           nloopii4=min(nloopii4,ii)
-           nloopjj4=min(nloopjj4,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi5=NL
-      nloopj5=NL
-      nloopii5=NL
-      nloopjj5=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR3:A(:,M,:,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A(i,M,ii,jj)      
-         enddo
-        enddo
-       enddo
-      enddo
- 
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$* reduction( min( nloopi5),min(nloopj5),min(nloopii5),
-*dvm$* min(nloopjj5))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,M,ii,jj)) then
-           nloopi5=min(nloopi5,i)
-           nloopj5=min(nloopj5,j)
-           nloopii5=min(nloopii5,ii)
-           nloopjj5=min(nloopjj5,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi6=NL
-      nloopj6=NL
-      nloopii6=NL
-      nloopjj6=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR3:A1(:,:,K,:))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-           B(i,j,ii,jj) = A1(i,j,K,jj)      
-         enddo
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi6),min(nloopj6),min(nloopii6),min(nloopjj6))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,j,K,jj)) then
-           nloopi6=min(nloopi6,i)
-           nloopj6=min(nloopj6,j)
-           nloopii6=min(nloopii6,ii)
-           nloopjj6=min(nloopjj6,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo
-
-      nloopi7=NL
-      nloopj7=NL
-      nloopii7=NL
-      nloopjj7=NL
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*remote_access(GR3:A1(:,:,:,L))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          B(i,j,ii,jj) = A1(i,j,ii,L)      
-         enddo
-        enddo
-       enddo
-      enddo
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-*dvm$*reduction( min( nloopi7),min(nloopj7),min(nloopii7),min(nloopjj7))
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-          if (B(i,j,ii,jj).ne.C(i,j,ii,L)) then
-           nloopi7=min(nloopi7,i)
-           nloopj7=min(nloopj7,j)
-           nloopii7=min(nloopii7,ii)
-           nloopjj7=min(nloopjj7,jj)
-          endif
-         enddo
-        enddo
-       enddo
-      enddo 
-
-      if ((nloopi1 .eq.NL).and.(nloopi2 .eq.NL).and.
-     *     (nloopi3 .eq.NL).and. (nloopi4 .eq.NL).and.
-     *     (nloopi5 .eq.NL).and.(nloopi6 .eq.NL).and.
-     *     (nloopi7 .eq.NL)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-   
-      if (it .eq. 2) cycle 
-cdvm$ reset GR1
-cdvm$ reset GR2
-cdvm$ reset GR3
-
-      enddo    
-      deallocate (A,B,C,A1)
-
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-       do j=1,M
-        do ii=1,K
-         do jj=1,L
-           AR(i,j,ii,jj) = NL+i+j+ii+jj
-         enddo
-        enddo
-       enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf44.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf44.f90
deleted file mode 100644
index aff877b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf44.f90
+++ /dev/null
@@ -1,401 +0,0 @@
-program prf44
-    !TESTING OF THE PREFETCH DIRECTIVE.
-
-    print *, '===START OF PRF44========================'
-
-    call prf4401
-    call prf4402
-    call prf4403
-
-    print *, '===END OF PRF44=========================='
-end
-
-subroutine prf4401
-    integer, parameter :: N = 16, M = 8, K = 8, L = 16, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, :, : ), B( :, :, :, : )
-    integer, allocatable :: C( :, :, :, : ), A1( :, :, :, : )
-    character * 7 :: tname = 'PRF4401'
-
-    !dvm$ distribute B( block, block, block, block )
-    !dvm$ align( :, :, :, : ) with B( :, :, :, : ) :: A, A1
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( B( N, M, K, L ), A( N, M, K, L ), C( N, M, K, L ), A1( N, M, K, L ) )
-    call serial4( C, N, M, K, L, NL )
-
-    !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    A( i, j, ii, jj ) = NL + i + j + ii + jj
-                    A1( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        !dvm$ remote_access ( GR1:A( N / 2, M / 2, K / 2, L / 2 ) )
-        ib1 = A( N / 2, M / 2, K / 2, L / 2 )
-
-        !dvm$ remote_access ( GR1:A( N / 2, M, K, L ) )
-        ib2 = A( N / 2, M, K, L )
-
-        !dvm$ remote_access ( GR2:A( N, M / 2, K, L ) )
-        ib3 = A( N, M / 2, K, L )
-
-        !dvm$ remote_access ( GR2:A( N, M, K / 2, L ) )
-        ib4 = A( N, M, K / 2, L )
-
-        !dvm$ remote_access ( GR3:A( N, M, K, L / 2 ) )
-        ib5 = A( N, M, K, L / 2 )
-
-        !dvm$ remote_access ( GR3:A1( 1, M, K, L / 2 ) )
-        ib6 = A1( 1, M, K, L / 2 )
-
-        if ( ( ib1 .eq. C( N / 2, M / 2, K / 2, L / 2 ) ) .and. ( ib2 .eq. C( N / 2, M, K, L ) ) .and. &
-             ( ib3 .eq. C( N, M / 2, K, L ) ) .and. ( ib4 .eq. C( N, M, K / 2, L ) ) .and. &
-             ( ib5 .eq. C( N, M, K, L / 2 ) ) .and. ( ib6 .eq. C( 1, M, K, L / 2 ) ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate ( A, B, C, A1 )
-end
-
-subroutine prf4402
-    integer, parameter ::  N = 16, M = 8, K = 8, L = 16, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, :, : ), B( :, :, :, : )
-    integer, allocatable :: C( :, :, :, : ), D( :, :, :, : )
-    character * 7 :: tname = 'PRF4402'
-
-    !dvm$ distribute A( block, block, block, block )
-    !dvm$ align( :, :, :, : ) with A( :, :, :, : ) :: B
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K, L ), B( N, M, K, L ), C( N, M, K, L ), D( N, M, K, L ) )
-    call serial4( C, N, M, K, L, NL )
-
-    !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    A( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        isumc1 = 0
-        isuma1 = 0
-        !dvm$ remote_access ( GR1:A( N / 2, :, :, : ) )
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    D( N / 2, j, ii, jj ) = A( N / 2, j, ii, jj )
-                    isumc1 = isumc1 + C( N / 2, j, ii, jj )
-                    isuma1 = isuma1 + D( N / 2, j, ii, jj )
-                enddo
-            enddo
-        enddo
-
-        isumc2 = 0
-        isuma2 = 0
-        !dvm$ remote_access ( GR2:A( :, M / 2, :, : ) )
-        do i = 1, N
-            do ii = 1, K
-                do jj = 1, L
-                    D( i, M / 2, ii, jj ) = A( i, M / 2, ii, jj )
-                    isumc2 = isumc2 + C( i, M / 2, ii, jj )
-                    isuma2 = isuma2 + D( i, M / 2, ii, jj )
-                enddo
-            enddo
-        enddo
-
-        isumc3 = 0
-        isuma3 = 0
-        !dvm$ remote_access ( GR3:A( :, :, K / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                do jj = 1, L
-                    D( i, j, K / 2, jj ) = A( i, j, K / 2, jj )
-                    isumc3 = isumc3 + C( i, j, K / 2, jj )
-                    isuma3 = isuma3 + D( i, j, K / 2, jj )
-                enddo
-            enddo
-        enddo
-
-        isumc4 = 0
-        isuma4 = 0
-        !dvm$ remote_access ( GR3:A( :, :, :, L / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    D( i, j, ii, L / 2 ) = A( i, j, ii, L / 2 )
-                    isumc4 = isumc4 + C( i, j, ii, L / 2 )
-                    isuma4 = isuma4 + D( i, j, ii, L / 2 )
-                enddo
-            enddo
-        enddo
-
-        if ( ( isumc1 .eq. isuma1 ) .and. ( isumc2 .eq. isuma2 ) .and. &
-              ( isumc3 .eq. isuma3 ) .and. ( isumc4 .eq. isuma4 ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C, D )
-end
-
-subroutine prf4403
-    integer, parameter ::  N = 16, M = 8, K = 8, L = 16, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, :, : ), B( :, :, :, : ), C( :, :, :, : )
-    character * 7 :: tname = 'PRF4403'
-
-    !dvm$ distribute A( block, block, block, block )
-    !dvm$ align( :, :, :, : ) with A( :, :, :, : ) :: B
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K, L ), B( N, M, K, L ), C( N, M, K, L ) )
-    call serial4( C, N, M, K, L, NL )
-
-    !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    A( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        nloopi1 = NL
-        nloopj1 = NL
-        nloopii1 = NL
-        nloopjj1 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR1:A( N / 2, M / 2, K / 2, L / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( N / 2, M / 2, K / 2, L / 2 )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi1 ), min( nloopj1 ), min( nloopii1 ), min( nloopjj1 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( N / 2, M / 2, K / 2, L / 2 ) ) then
-                            nloopi1 = min( nloopi1, i )
-                            nloopj1 = min( nloopj1, j )
-                            nloopii1 = min( nloopii1, ii )
-                            nloopjj1 = min( nloopjj1, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi2 = NL
-        nloopj2 = NL
-        nloopii2 = NL
-        nloopjj2 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj ), remote_access( GR2:A( N / 2, :, :, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( N / 2, j, ii, jj )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi2 ), min( nloopj2 ), min( nloopii2 ), min( nlooopjj4 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( N / 2, j, ii, jj ) ) then
-                            nloopi2 = min( nloopi2, i )
-                            nloopj2 = min( nloopj2, j )
-                            nloopii2 = min( nloopii2, ii )
-                            nloopjj2 = min( nloopjj2, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi3 = NL
-        nloopj3 = NL
-        nloopii3 = NL
-        nloopjj3 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR2:A( :, M / 2, :, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( i, M / 2, ii, jj )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi3 ), min( nloopj3 ), min( nloopii3 ), min( nloopjj3 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( i, M / 2, ii, jj ) ) then
-                            nloopi3 = min( nloopi3, i )
-                            nloopj3 = min( nloopj3, j )
-                            nloopii3 = min( nloopii3, ii )
-                            nloopjj3 = min( nloopjj3, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi4 = NL
-        nloopj4 = NL
-        nloopii4 = NL
-        nloopjj4 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR3:A( :, :, K / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( i, j, K / 2, jj )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi4 ), min( nloopj4 ), min( nloopii4 ), min( nloopjj4 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( i, j, K / 2, jj ) ) then
-                            nloopi4 = min( nloopi4, i )
-                            nloopj4 = min( nloopj4, j )
-                            nloopii4 = min( nloopii4, ii )
-                            nloopjj4 = min( nloopjj4, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi5 = NL
-        nloopj5 = NL
-        nloopii5 = NL
-        nloopjj5 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR3:A( :, :, :, L / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( i, j, ii, L / 2 )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi5 ), min( nloopj5 ), min( nloopii5 ), min( nloopjj5 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( i, j, ii, L / 2 ) ) then
-                            nloopi5 = min( nloopi5, i )
-                            nloopj5 = min( nloopj5, j )
-                            nloopii5 = min( nloopii5, ii )
-                            nloopjj5 = min( nloopjj5, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        if ( ( nloopi1 .eq. NL ) .and. ( nloopi2 .eq. NL ) .and. &
-             ( nloopi3 .eq. NL ) .and. ( nloopi4 .eq. NL ) .and. &
-             ( nloopi5 .eq. NL ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C )
-end
-
-subroutine serial4( AR, N, M, K, L, NL )
-    integer AR( N, M, K, L )
-    integer NL
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    AR( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-end
-
-subroutine ansyes( name )
-    character * 7 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno( name )
-    character * 7 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf45.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf45.f90
deleted file mode 100644
index bbbba57..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf45.f90
+++ /dev/null
@@ -1,401 +0,0 @@
-program prf45
-    !TESTING OF THE PREFETCH DIRECTIVE.
-
-    print *, '===START OF PRF45========================'
-
-    call prf4501
-    call prf4502
-    call prf4503
-
-    print *, '===END OF PRF45=========================='
-end
-
-subroutine prf4501
-    integer, parameter :: N = 16, M = 8, K = 8, L = 16, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, :, : ), B( :, :, :, : )
-    integer, allocatable :: C( :, :, :, : ), A1( :, :, :, : )
-    character * 7 :: tname = 'PRF4501'
-
-    !dvm$ distribute B( *, *, *, * )
-    !dvm$ align( :, :, :, : ) with B( :, :, :, : ) :: A, A1
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( B( N, M, K, L ), A( N, M, K, L ), C( N, M, K, L ), A1( N, M, K, L ) )
-    call serial4( C, N, M, K, L, NL )
-
-    !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    A( i, j, ii, jj ) = NL + i + j + ii + jj
-                    A1( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        !dvm$ remote_access ( GR1:A( N / 2, M / 2, K / 2, L / 2 ) )
-        ib1 = A( N / 2, M / 2, K / 2, L / 2 )
-
-        !dvm$ remote_access ( GR1:A( N / 2, M, K, L ) )
-        ib2 = A( N / 2, M, K, L )
-
-        !dvm$ remote_access ( GR2:A( N, M / 2, K, L ) )
-        ib3 = A( N, M / 2, K, L )
-
-        !dvm$ remote_access ( GR2:A( N, M, K / 2, L ) )
-        ib4 = A( N, M, K / 2, L )
-
-        !dvm$ remote_access ( GR3:A( N, M, K, L / 2 ) )
-        ib5 = A( N, M, K, L / 2 )
-
-        !dvm$ remote_access ( GR3:A1( 1, M, K, L / 2 ) )
-        ib6 = A1( 1, M, K, L / 2 )
-
-        if ( ( ib1 .eq. C( N / 2, M / 2, K / 2, L / 2 ) ) .and. ( ib2 .eq. C( N / 2, M, K, L ) ) .and. &
-             ( ib3 .eq. C( N, M / 2, K, L ) ) .and. ( ib4 .eq. C( N, M, K / 2, L ) ) .and. &
-             ( ib5 .eq. C( N, M, K, L / 2 ) ) .and. ( ib6 .eq. C( 1, M, K, L / 2 ) ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate ( A, B, C, A1 )
-end
-
-subroutine prf4502
-    integer, parameter ::  N = 16, M = 8, K = 8, L = 16, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, :, : ), B( :, :, :, : )
-    integer, allocatable :: C( :, :, :, : ), D( :, :, :, : )
-    character * 7 :: tname = 'PRF4502'
-
-    !dvm$ distribute A( *, *, *, * )
-    !dvm$ align( :, :, :, : ) with A( :, :, :, : ) :: B
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K, L ), B( N, M, K, L ), C( N, M, K, L ), D( N, M, K, L ) )
-    call serial4( C, N, M, K, L, NL )
-
-    !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    A( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        isumc1 = 0
-        isuma1 = 0
-        !dvm$ remote_access ( GR1:A( N / 2, :, :, : ) )
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    D( N / 2, j, ii, jj ) = A( N / 2, j, ii, jj )
-                    isumc1 = isumc1 + C( N / 2, j, ii, jj )
-                    isuma1 = isuma1 + D( N / 2, j, ii, jj )
-                enddo
-            enddo
-        enddo
-
-        isumc2 = 0
-        isuma2 = 0
-        !dvm$ remote_access ( GR2:A( :, M / 2, :, : ) )
-        do i = 1, N
-            do ii = 1, K
-                do jj = 1, L
-                    D( i, M / 2, ii, jj ) = A( i, M / 2, ii, jj )
-                    isumc2 = isumc2 + C( i, M / 2, ii, jj )
-                    isuma2 = isuma2 + D( i, M / 2, ii, jj )
-                enddo
-            enddo
-        enddo
-
-        isumc3 = 0
-        isuma3 = 0
-        !dvm$ remote_access ( GR3:A( :, :, K / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                do jj = 1, L
-                    D( i, j, K / 2, jj ) = A( i, j, K / 2, jj )
-                    isumc3 = isumc3 + C( i, j, K / 2, jj )
-                    isuma3 = isuma3 + D( i, j, K / 2, jj )
-                enddo
-            enddo
-        enddo
-
-        isumc4 = 0
-        isuma4 = 0
-        !dvm$ remote_access ( GR3:A( :, :, :, L / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    D( i, j, ii, L / 2 ) = A( i, j, ii, L / 2 )
-                    isumc4 = isumc4 + C( i, j, ii, L / 2 )
-                    isuma4 = isuma4 + D( i, j, ii, L / 2 )
-                enddo
-            enddo
-        enddo
-
-        if ( ( isumc1 .eq. isuma1 ) .and. ( isumc2 .eq. isuma2 ) .and. &
-              ( isumc3 .eq. isuma3 ) .and. ( isumc4 .eq. isuma4 ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C, D )
-end
-
-subroutine prf4503
-    integer, parameter ::  N = 16, M = 8, K = 8, L = 16, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, :, : ), B( :, :, :, : ), C( :, :, :, : )
-    character * 7 :: tname = 'PRF4503'
-
-    !dvm$ distribute A( *, *, *, * )
-    !dvm$ align( :, :, :, : ) with A( :, :, :, : ) :: B
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K, L ), B( N, M, K, L ), C( N, M, K, L ) )
-    call serial4( C, N, M, K, L, NL )
-
-    !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    A( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        nloopi1 = NL
-        nloopj1 = NL
-        nloopii1 = NL
-        nloopjj1 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR1:A( N / 2, M / 2, K / 2, L / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( N / 2, M / 2, K / 2, L / 2 )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi1 ), min( nloopj1 ), min( nloopii1 ), min( nloopjj1 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( N / 2, M / 2, K / 2, L / 2 ) ) then
-                            nloopi1 = min( nloopi1, i )
-                            nloopj1 = min( nloopj1, j )
-                            nloopii1 = min( nloopii1, ii )
-                            nloopjj1 = min( nloopjj1, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi2 = NL
-        nloopj2 = NL
-        nloopii2 = NL
-        nloopjj2 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj ), remote_access( GR2:A( N / 2, :, :, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( N / 2, j, ii, jj )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi2 ), min( nloopj2 ), min( nloopii2 ), min( nlooopjj4 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( N / 2, j, ii, jj ) ) then
-                            nloopi2 = min( nloopi2, i )
-                            nloopj2 = min( nloopj2, j )
-                            nloopii2 = min( nloopii2, ii )
-                            nloopjj2 = min( nloopjj2, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi3 = NL
-        nloopj3 = NL
-        nloopii3 = NL
-        nloopjj3 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR2:A( :, M / 2, :, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( i, M / 2, ii, jj )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi3 ), min( nloopj3 ), min( nloopii3 ), min( nloopjj3 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( i, M / 2, ii, jj ) ) then
-                            nloopi3 = min( nloopi3, i )
-                            nloopj3 = min( nloopj3, j )
-                            nloopii3 = min( nloopii3, ii )
-                            nloopjj3 = min( nloopjj3, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi4 = NL
-        nloopj4 = NL
-        nloopii4 = NL
-        nloopjj4 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR3:A( :, :, K / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( i, j, K / 2, jj )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi4 ), min( nloopj4 ), min( nloopii4 ), min( nloopjj4 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( i, j, K / 2, jj ) ) then
-                            nloopi4 = min( nloopi4, i )
-                            nloopj4 = min( nloopj4, j )
-                            nloopii4 = min( nloopii4, ii )
-                            nloopjj4 = min( nloopjj4, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi5 = NL
-        nloopj5 = NL
-        nloopii5 = NL
-        nloopjj5 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR3:A( :, :, :, L / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( i, j, ii, L / 2 )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi5 ), min( nloopj5 ), min( nloopii5 ), min( nloopjj5 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( i, j, ii, L / 2 ) ) then
-                            nloopi5 = min( nloopi5, i )
-                            nloopj5 = min( nloopj5, j )
-                            nloopii5 = min( nloopii5, ii )
-                            nloopjj5 = min( nloopjj5, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        if ( ( nloopi1 .eq. NL ) .and. ( nloopi2 .eq. NL ) .and. &
-             ( nloopi3 .eq. NL ) .and. ( nloopi4 .eq. NL ) .and. &
-             ( nloopi5 .eq. NL ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C )
-end
-
-subroutine serial4( AR, N, M, K, L, NL )
-    integer AR( N, M, K, L )
-    integer NL
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    AR( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-end
-
-subroutine ansyes( name )
-    character * 7 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno( name )
-    character * 7 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf46.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf46.f90
deleted file mode 100644
index 9520b00..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/prf46.f90
+++ /dev/null
@@ -1,401 +0,0 @@
-program prf46
-    !TESTING OF THE PREFETCH DIRECTIVE.
-
-    print *, '===START OF PRF46========================'
-
-    call prf4601
-    call prf4602
-    call prf4603
-
-    print *, '===END OF PRF46=========================='
-end
-
-subroutine prf4601
-    integer, parameter :: N = 16, M = 8, K = 8, L = 16, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, :, : ), B( :, :, :, : )
-    integer, allocatable :: C( :, :, :, : ), A1( :, :, :, : )
-    character * 7 :: tname = 'PRF4601'
-
-    !dvm$ distribute B( block, block, block, * )
-    !dvm$ align( :, :, :, : ) with B( :, :, :, : ) :: A, A1
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( B( N, M, K, L ), A( N, M, K, L ), C( N, M, K, L ), A1( N, M, K, L ) )
-    call serial4( C, N, M, K, L, NL )
-
-    !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    A( i, j, ii, jj ) = NL + i + j + ii + jj
-                    A1( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        !dvm$ remote_access ( GR1:A( N / 2, M / 2, K / 2, L / 2 ) )
-        ib1 = A( N / 2, M / 2, K / 2, L / 2 )
-
-        !dvm$ remote_access ( GR1:A( N / 2, M, K, L ) )
-        ib2 = A( N / 2, M, K, L )
-
-        !dvm$ remote_access ( GR2:A( N, M / 2, K, L ) )
-        ib3 = A( N, M / 2, K, L )
-
-        !dvm$ remote_access ( GR2:A( N, M, K / 2, L ) )
-        ib4 = A( N, M, K / 2, L )
-
-        !dvm$ remote_access ( GR3:A( N, M, K, L / 2 ) )
-        ib5 = A( N, M, K, L / 2 )
-
-        !dvm$ remote_access ( GR3:A1( 1, M, K, L / 2 ) )
-        ib6 = A1( 1, M, K, L / 2 )
-
-        if ( ( ib1 .eq. C( N / 2, M / 2, K / 2, L / 2 ) ) .and. ( ib2 .eq. C( N / 2, M, K, L ) ) .and. &
-             ( ib3 .eq. C( N, M / 2, K, L ) ) .and. ( ib4 .eq. C( N, M, K / 2, L ) ) .and. &
-             ( ib5 .eq. C( N, M, K, L / 2 ) ) .and. ( ib6 .eq. C( 1, M, K, L / 2 ) ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate ( A, B, C, A1 )
-end
-
-subroutine prf4602
-    integer, parameter ::  N = 16, M = 8, K = 8, L = 16, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, :, : ), B( :, :, :, : )
-    integer, allocatable :: C( :, :, :, : ), D( :, :, :, : )
-    character * 7 :: tname = 'PRF4602'
-
-    !dvm$ distribute A( block, block, *, block )
-    !dvm$ align( :, :, :, : ) with A( :, :, :, : ) :: B
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K, L ), B( N, M, K, L ), C( N, M, K, L ), D( N, M, K, L ) )
-    call serial4( C, N, M, K, L, NL )
-
-    !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    A( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        isumc1 = 0
-        isuma1 = 0
-        !dvm$ remote_access ( GR1:A( N / 2, :, :, : ) )
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    D( N / 2, j, ii, jj ) = A( N / 2, j, ii, jj )
-                    isumc1 = isumc1 + C( N / 2, j, ii, jj )
-                    isuma1 = isuma1 + D( N / 2, j, ii, jj )
-                enddo
-            enddo
-        enddo
-
-        isumc2 = 0
-        isuma2 = 0
-        !dvm$ remote_access ( GR2:A( :, M / 2, :, : ) )
-        do i = 1, N
-            do ii = 1, K
-                do jj = 1, L
-                    D( i, M / 2, ii, jj ) = A( i, M / 2, ii, jj )
-                    isumc2 = isumc2 + C( i, M / 2, ii, jj )
-                    isuma2 = isuma2 + D( i, M / 2, ii, jj )
-                enddo
-            enddo
-        enddo
-
-        isumc3 = 0
-        isuma3 = 0
-        !dvm$ remote_access ( GR3:A( :, :, K / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                do jj = 1, L
-                    D( i, j, K / 2, jj ) = A( i, j, K / 2, jj )
-                    isumc3 = isumc3 + C( i, j, K / 2, jj )
-                    isuma3 = isuma3 + D( i, j, K / 2, jj )
-                enddo
-            enddo
-        enddo
-
-        isumc4 = 0
-        isuma4 = 0
-        !dvm$ remote_access ( GR3:A( :, :, :, L / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    D( i, j, ii, L / 2 ) = A( i, j, ii, L / 2 )
-                    isumc4 = isumc4 + C( i, j, ii, L / 2 )
-                    isuma4 = isuma4 + D( i, j, ii, L / 2 )
-                enddo
-            enddo
-        enddo
-
-        if ( ( isumc1 .eq. isuma1 ) .and. ( isumc2 .eq. isuma2 ) .and. &
-              ( isumc3 .eq. isuma3 ) .and. ( isumc4 .eq. isuma4 ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C, D )
-end
-
-subroutine prf4603
-    integer, parameter ::  N = 16, M = 8, K = 8, L = 16, NL = 1000, NIT = 3
-    integer, allocatable :: A( :, :, :, : ), B( :, :, :, : ), C( :, :, :, : )
-    character * 7 :: tname = 'PRF4603'
-
-    !dvm$ distribute A( block, *, block, block )
-    !dvm$ align( :, :, :, : ) with A( :, :, :, : ) :: B
-
-    !dvm$ remote_group GR1
-    !dvm$ remote_group GR2
-    !dvm$ remote_group GR3
-
-    allocate ( A( N, M, K, L ), B( N, M, K, L ), C( N, M, K, L ) )
-    call serial4( C, N, M, K, L, NL )
-
-    !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj )
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    A( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-
-    do it = 1, NIT
-        !dvm$ prefetch GR1
-        !dvm$ prefetch GR2
-        !dvm$ prefetch GR3
-
-        nloopi1 = NL
-        nloopj1 = NL
-        nloopii1 = NL
-        nloopjj1 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR1:A( N / 2, M / 2, K / 2, L / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( N / 2, M / 2, K / 2, L / 2 )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi1 ), min( nloopj1 ), min( nloopii1 ), min( nloopjj1 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( N / 2, M / 2, K / 2, L / 2 ) ) then
-                            nloopi1 = min( nloopi1, i )
-                            nloopj1 = min( nloopj1, j )
-                            nloopii1 = min( nloopii1, ii )
-                            nloopjj1 = min( nloopjj1, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi2 = NL
-        nloopj2 = NL
-        nloopii2 = NL
-        nloopjj2 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on A( i, j, ii, jj ), remote_access( GR2:A( N / 2, :, :, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( N / 2, j, ii, jj )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi2 ), min( nloopj2 ), min( nloopii2 ), min( nlooopjj4 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( N / 2, j, ii, jj ) ) then
-                            nloopi2 = min( nloopi2, i )
-                            nloopj2 = min( nloopj2, j )
-                            nloopii2 = min( nloopii2, ii )
-                            nloopjj2 = min( nloopjj2, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi3 = NL
-        nloopj3 = NL
-        nloopii3 = NL
-        nloopjj3 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR2:A( :, M / 2, :, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( i, M / 2, ii, jj )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi3 ), min( nloopj3 ), min( nloopii3 ), min( nloopjj3 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( i, M / 2, ii, jj ) ) then
-                            nloopi3 = min( nloopi3, i )
-                            nloopj3 = min( nloopj3, j )
-                            nloopii3 = min( nloopii3, ii )
-                            nloopjj3 = min( nloopjj3, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi4 = NL
-        nloopj4 = NL
-        nloopii4 = NL
-        nloopjj4 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR3:A( :, :, K / 2, : ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( i, j, K / 2, jj )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi4 ), min( nloopj4 ), min( nloopii4 ), min( nloopjj4 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( i, j, K / 2, jj ) ) then
-                            nloopi4 = min( nloopi4, i )
-                            nloopj4 = min( nloopj4, j )
-                            nloopii4 = min( nloopii4, ii )
-                            nloopjj4 = min( nloopjj4, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        nloopi5 = NL
-        nloopj5 = NL
-        nloopii5 = NL
-        nloopjj5 = NL
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), remote_access( GR3:A( :, :, :, L / 2 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        B( i, j, ii, jj ) = A( i, j, ii, L / 2 )
-                    enddo
-                enddo
-            enddo
-        enddo
-        !dvm$ parallel ( i, j, ii, jj ) on B( i, j, ii, jj ), reduction( min( nloopi5 ), min( nloopj5 ), min( nloopii5 ), min( nloopjj5 ) )
-        do i = 1, N
-            do j = 1, M
-                do ii = 1, K
-                    do jj = 1, L
-                        if ( B( i, j, ii, jj ) .ne. C( i, j, ii, L / 2 ) ) then
-                            nloopi5 = min( nloopi5, i )
-                            nloopj5 = min( nloopj5, j )
-                            nloopii5 = min( nloopii5, ii )
-                            nloopjj5 = min( nloopjj5, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-
-        if ( ( nloopi1 .eq. NL ) .and. ( nloopi2 .eq. NL ) .and. &
-             ( nloopi3 .eq. NL ) .and. ( nloopi4 .eq. NL ) .and. &
-             ( nloopi5 .eq. NL ) ) then
-            call ansyes( tname )
-        else
-            call ansno( tname )
-        endif
-
-        if ( it .eq. 2 ) cycle
-
-        !dvm$ reset GR1
-        !dvm$ reset GR2
-        !dvm$ reset GR3
-    enddo
-    deallocate( A, B, C )
-end
-
-subroutine serial4( AR, N, M, K, L, NL )
-    integer AR( N, M, K, L )
-    integer NL
-    do i = 1, N
-        do j = 1, M
-            do ii = 1, K
-                do jj = 1, L
-                    AR( i, j, ii, jj ) = NL + i + j + ii + jj
-                enddo
-            enddo
-        enddo
-    enddo
-end
-
-subroutine ansyes( name )
-    character * 7 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno( name )
-    character * 7 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/settings
deleted file mode 100644
index 3ef2d72..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/PREFETCH/settings
+++ /dev/null
@@ -1 +0,0 @@
-DVM_ONLY=1
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign11.fdv
deleted file mode 100644
index d455fdd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign11.fdv
+++ /dev/null
@@ -1,559 +0,0 @@
-      program REALIGN11
-
-c    Testing REALIGN directive       
-
-      print *,'===START OF realign11========================'
-C --------------------------------------------------
-C 111 ALIGN arrB(i) WITH arrA(i)  REALIGN arrB(i) WITH arrA(2*i+8) 
-       call realign111
-C --------------------------------------------------
-C 112 ALIGN arrB(i) WITH arrA(i+4)  REALIGN arrB(i) WITH arrA(i+8) 
-       call realign112
-C --------------------------------------------------
-C 112r ALIGN arrB(i) WITH arrA(i+4)  REALIGN arrB(i) WITH arrA(-i+8) 
-c      call realign112r
-C --------------------------------------------------
-C 113  ALIGN arrB(i) WITH arrA(3*i-2) REALIGN arrB(i) WITH arrA(2*i+1)  
-       call realign113
-C --------------------------------------------------
-C 113r ALIGN arrB(i) WITH arrA(-i+8) REALIGN arrB(i) WITH arrA(3*i-2) 
-c       call realign113r
-C --------------------------------------------------
-C 114  ALIGN arrB(i) WITH arrA(2*i+8)  REALIGN arrB(i) WITH arrA(i) 
-       call realign114
-C --------------------------------------------------
-C 115  ALIGN arrB(*) WITH arrA(*)  REALIGN arrB(i) WITH arrA(i+4) 
-       call realign115
-C --------------------------------------------------
-C 116  ALIGN arrB(i) WITH arrA(4*i-3)  REALIGN arrB(i) WITH arrA(*) 
-       call realign116
-C --------------------------------------------------
-C
-      print *,'=== END OF realign11 ========================= '    
-      end
-
-C ----------------------------------------------------realign111
- 
-C 111 ALIGN arrB(i) WITH arrA(i)  REALIGN arrB(i) WITH arrA(2*i+8) 
-      subroutine realign111
-      integer, parameter ::  AN1=25,BN1=8,NL=1000,ER=10000
-      integer ::   erria = ER, errib = ER
-c     parameters for ALIGN                                                  
-      integer, parameter ::  k1i=1,li=0
-c     parameters for REALIGN                                                 
-      integer, parameter ::  kr1i=2,lri=8
-      integer, allocatable :: A1(:),B1(:)
-      character(*), parameter :: tname = 'realign111'
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-!dvm$ DYNAMIC B1
-
-      allocate (A1(AN1),B1(BN1))
-
-!dvm$ region  out(A1,B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) = 0     
-      enddo
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ REALIGN B1(i) WITH A1(kr1i * i + lri)
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region inlocal(A1,B1)
-!dvm$ parallel (i) on B1(i), private(ia),
-!dvm$*                reduction(min(erria),min(errib))
-      do i=1,BN1
-            if (B1(i) /= i) then     
-               errib = min(errib,i)
-            endif 
-            ia=kr1i * i + lri
-            if (A1(ia) /= ia) then     
-               erria = min(erria,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erria,errib) 
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B1,A1)
-
-      end subroutine realign111
-C ----------------------------------------------------realign112
-
-C 112 ALIGN arrB(i) WITH arrA(i+4)  REALIGN arrB(i) WITH arrA(i+8)   
-      subroutine realign112
-      integer, parameter ::  AN1=16,BN1=4,NL=1000,ER=10000
-      integer ::   erria = ER, errib = ER
-c     parameters for ALIGN                                                 
-      integer, parameter ::  k1i=1,li=4
-c     parameters for REALIGN                                                 
-      integer, parameter ::  kr1i=1,lri=8
-      integer, allocatable :: A1(:),B1(:)
-      character(*), parameter :: tname = 'realign112'
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-!dvm$ DYNAMIC B1
-
-      allocate (A1(AN1),B1(BN1))
-
-      B1 = 1     
-
-!dvm$ actual (B1)
-
-!dvm$ region inout (B1), out(A1)
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i * 2
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = B1(ib) + ib
-             endif 
-      enddo
-!dvm$ end region 
-
-!dvm$ REALIGN B1(i) WITH A1(kr1i * i + lri)
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region  
-!dvm$ parallel (i) on B1(i), private(ia), 
-!dvm$*                reduction(min(erria),min(errib))
-      do i=1,BN1
-            if (B1(i) /= i+1) then     
-               errib = min(errib,i)
-            endif 
-            ia=kr1i * i + lri
-            if (A1(ia) /= ia*2) then     
-               erria = min(erria,i)
-            endif 
-      enddo
-!dvm$ end region 
-  
-!dvm$ get_actual(erria,errib) 
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B1,A1)
-
-      end subroutine realign112
-C ----------------------------------------------------realign112r
-C 112r ALIGN arrB(i) WITH arrA(i+4)  REALIGN arrB(i) WITH arrA(-i+8)
-      subroutine realign112r
-      integer, parameter ::  AN1=16,BN1=4,NL=1000,ER=10000
-      integer ::   erria = ER, errib = ER
-c     parameters for ALIGN                                                 
-      integer, parameter ::  k1i=1,li=4
-c     parameters for REALIGN                                                  
-      integer, parameter ::  kr1i=-1,lri=8
-      integer, allocatable :: A1(:),B1(:)
-      character(*), parameter :: tname = 'realign112r'
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-!dvm$ DYNAMIC B1
-
-      allocate (A1(AN1),B1(BN1))
-
-      B1 = 1     
-
-!dvm$ actual (B1)
-
-!dvm$ region inout (B1), out(A1)
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i * 2
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = B1(ib) + ib
-             endif 
-      enddo
-!dvm$ end region 
-
-!dvm$ REALIGN B1(i) WITH A1(kr1i * i + lri)
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region  
-!dvm$ parallel (i) on B1(i), private(ia), 
-!dvm$*                reduction(min(erria),min(errib))
-      do i=1,BN1
-            if (B1(i) /= i+1) then     
-               errib = min(errib,i)
-            endif 
-            ia=kr1i * i + lri
-            if (A1(ia) /= ia*2) then     
-               erria = min(erria,i)
-            endif 
-      enddo
-!dvm$ end region 
-  
-!dvm$ get_actual(erria,errib) 
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B1,A1)
-
-      end subroutine realign112r
-C ----------------------------------------------------realign113
-C 113 ALIGN arrB(i) WITH arrA(3*i-2) REALIGN arrB(i) WITH arrA(2*i+1)   
-      subroutine realign113
-      integer, parameter ::  AN1=30,BN1=6,NL=1000,ER=10000
-      integer ::   erria = ER, errib = ER
-c     parameters for ALIGN                                                  
-      integer, parameter ::  k1i=3,li=-2
-c     parameters for REALIGN                                                 
-      integer, parameter ::  kr1i=2,lri=1
-      integer, allocatable :: A1(:),B1(:)
-      character(*), parameter :: tname = 'realign113'
-               
-!dvm$ distribute A1(BLOCK)   
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-!dvm$ DYNAMIC B1
-
-      allocate (A1(AN1),B1(BN1))
-
-!dvm$ region 
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) = 5     
-      enddo
-
-!dvm$ end region   
-
-!dvm$ region in(B1), out(A1,B1)
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i + 3
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = B1(ib) + ib
-             endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ REALIGN B1(i) WITH A1(kr1i * i + lri)
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region 
-!dvm$ parallel (i) on B1(i), private(ia), 
-!dvm$*                reduction(min(erria),min(errib))
-      do i=1,BN1
-            if (B1(i) /= (i+5)) then     
-               errib = min(errib,i)
-            endif 
-            ia=kr1i * i + lri
-            if (A1(ia) /= (ia+3)) then     
-               erria = min(erria,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erria,errib) 
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end subroutine realign113
-C ----------------------------------------------------realign113r
-C 113r ALIGN arrB(i) WITH arrA(-i+8) REALIGN arrB(i) WITH arrA(3*i-2) 
-      subroutine realign113r
-      integer, parameter ::  AN1=30,BN1=6,NL=1000,ER=10000
-      integer ::   erria = ER, errib = ER
-c     parameters for ALIGN                                                  
-      integer, parameter ::  k1i=-1,li=8
-c     parameters for REALIGN                                                 
-      integer, parameter ::  kr1i=3,lri=-2
-      integer, allocatable :: A1(:),B1(:)
-      character(*), parameter :: tname = 'realign113r'
-               
-!dvm$ distribute A1(BLOCK)   
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-!dvm$ DYNAMIC B1
-
-      allocate (A1(AN1),B1(BN1))
-
-!dvm$ region 
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) = 5     
-      enddo
-
-!dvm$ end region   
-
-!dvm$ region in(B1), out(A1,B1)
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i + 3
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = B1(ib) + ib
-             endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ REALIGN B1(i) WITH A1(kr1i * i + lri)
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region 
-!dvm$ parallel (i) on B1(i), private(ia), 
-!dvm$*                reduction(min(erria),min(errib))
-      do i=1,BN1
-            if (B1(i) /= (i+5)) then     
-               errib = min(errib,i)
-            endif 
-            ia=kr1i * i + lri
-            if (A1(ia) /= (ia+3)) then     
-               erria = min(erria,i)
-            endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ get_actual(erria,errib) 
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B1,A1)
-
-      end subroutine realign113r
-C ----------------------------------------------------realign114
-C 114 ALIGN arrB(i) WITH arrA(2*i+8)  REALIGN arrB(i) WITH arrA(i) 
-      subroutine realign114
-      integer, parameter ::  AN1=24,BN1=8,NL=1000,ER=10000
-      integer ::   erria = ER, errib = ER
-c     parameters for ALIGN                                                 
-      integer, parameter ::  k1i=2,li=8
-c     parameters for REALIGN                                                  
-      integer, parameter ::  kr1i=1,lri=0
-      integer, allocatable :: A1(:),B1(:)
-      character(*), parameter :: tname = 'realign114'
-               
-!dvm$ distribute A1(BLOCK)   
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-!dvm$ DYNAMIC B1
-
-      allocate (A1(AN1),B1(BN1))
-
-!dvm$ region  out(A1, B1)
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) = 0     
-      enddo
-
-!dvm$ parallel (i) on A1(i), private(ib)
-      do i=1,AN1
-             A1(i) = i
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                B1(ib) = ib
-             endif 
-      enddo
-!dvm$ end region   
-
-!dvm$ REALIGN B1(i) WITH A1(kr1i * i + lri)
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region 
-!dvm$ parallel (i) on B1(i), reduction(min(erria),min(errib)),
-!dvm$*      private(ia)      
-      do i=1,BN1
-            if (B1(i) /= (i)) then     
-               errib = min(errib,i)
-            endif 
-            ia=kr1i * i + lri
-            if (A1(ia) /= (ia)) then     
-               erria = min(erria,i)
-            endif 
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erria,errib) 
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B1,A1)
-
-      end subroutine realign114
-C ----------------------------------------------------realign115
-C 115 ALIGN arrB(*) WITH arrA(*)  REALIGN arrB(i) WITH arrA(i+4)
-      subroutine realign115
-      integer, parameter ::  AN1=24,BN1=8,NL=1000,ER=10000
-      integer ::   erria = ER, errib = ER
-c     parameters for ALIGN                                                  
-      integer, parameter ::  k1i=0,li=0
-c     parameters for REALIGN                                                 
-      integer, parameter ::  kr1i=1,lri=4
-      integer, allocatable :: A1(:),B1(:)
-      character(*), parameter :: tname = 'realign115'
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(*) WITH A1(*)
-!dvm$ DYNAMIC B1
-
-      allocate (A1(AN1),B1(BN1))
-
-      do i=1,BN1
-            B1(i) = i+4     
-      enddo
-
-!dvm$ region 
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-             A1(i) = (i+1) ** 2
-      enddo
-!dvm$ end region 
-
-!dvm$ REALIGN B1(i) WITH A1(kr1i * i + lri)
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region 
-!dvm$ parallel (i) on B1(i),
-!dvm$*      private(ia),      
-!dvm$*      reduction(min(erria),min(errib))
-      do i=1,BN1
-            if (B1(i) /= (i+4)) then     
-               errib = min(errib,i)
-            endif 
-            ia=kr1i * i + lri
-            if (A1(ia) /= (ia+1)**2) then     
-              erria = min(erria,i)
-            endif 
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erria,errib) 
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B1,A1)
-
-      end subroutine realign115
-C ----------------------------------------------------realign116
-C 116  ALIGN arrB(i) WITH arrA(4*i-3)  REALIGN arrB(i) WITH arrA(*) 
-      subroutine realign116
-      integer, parameter ::  AN1=36,BN1=8,NL=1000,ER=10000
-      integer ::   erria = ER, errib = ER
-c     parameters for ALIGN                                                  
-      integer, parameter ::  k1i=4,li=-3
-c     parameters for REALIGN                                                  
-      integer, parameter ::  kr1i=0,lri=0
-      integer, allocatable :: A1(:),B1(:)
-      character(*), parameter :: tname = 'realign116'
-               
-!dvm$ distribute A1(BLOCK)    
-!dvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-!dvm$ DYNAMIC B1
-
-      allocate (A1(AN1),B1(BN1))
-
-!dvm$ region 
-!dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) = i+6     
-      enddo
-
-!dvm$ parallel (i) on A1(i)
-      do i=1,AN1
-             A1(i) = (i+1) ** 3
-      enddo
-!dvm$ end region 
-
-!dvm$ REALIGN B1(*) WITH A1(*)
-
-!dvm$ actual(erria, errib)
-
-!dvm$ region 
-!dvm$ parallel (i) on B1(i), reduction(min(errib))
-      do i=1,BN1
-            if (B1(i) /= (i+6)) then     
-               errib = min(errib,i)
-            endif 
-      enddo
-!dvm$ parallel (i) on A1(i),reduction(min(erria))
-      do i=1,AN1
-            if (A1(i) /= ((i+1)**3)) then     
-               erria = min(erria,i)
-            endif 
-      enddo
-!dvm$ end region   
-     
-!dvm$ get_actual(erria,errib) 
-
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B1,A1)
-
-      end subroutine realign116
-C -------------------------------------------------
-
-
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
-   
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign22.fdv
deleted file mode 100644
index 5db0f1f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign22.fdv
+++ /dev/null
@@ -1,483 +0,0 @@
-      program REALIGN22
-
-c    Testing REALIGN directive        
-
-      print *,'===START OF realign22===================='
-C -------------------------------------------------
-c 221 ALIGN arrB[i][j] WITH arrA[i][j] REALIGN arrB[i][j] WITH arrA[3*i-2][2*j+1]	
-      call realign221
-C -------------------------------------------------
-c 222 ALIGN arrB[i][j] WITH arrA[j+1][i] REALIGN arrB[i][j] WITH arrA[i+4][j]	
-      call realign222
-C -------------------------------------------------
-c 223 ALIGN arrB[i][*] WITH arrA[*][i]  REALIGN arrB[i][j] WITH arrA[i+4][j+4]	
-      call realign223
-C -------------------------------------------------
-c 224 ALIGN arrB[*][*] WITH arrA[*][1]  REALIGN arrB[i][j] WITH arrA[i+4][j+4] shift along i and j
-      call realign224
-C -------------------------------------------------
-c 225 ALIGN arrB[i][j] WITH arrA[i][j] REALIGN arrB[*][*] WITH arrA[*][2]	
-      call realign225
-C -------------------------------------------------
-c 226 ALIGN arrB[i][j] WITH arrA[i][j] REALIGN arrB[i][j] WITH arrA[2*j+1][3*i-2]	
-      call realign226
-C -------------------------------------------------
-C
-      print *,'=== END OF realign22 ===================='
-C
-      end
-C ----------------------------------------------------realign221
-c 221 ALIGN arrB[i][j] WITH arrA[i][j] REALIGN arrB[i][j] WITH arrA[3*i-2][2*j+1]	
-      subroutine realign221
-      integer, parameter :: AN1=10,AN2=10,BN1=4,BN2=4,NL=1000,ER=10000
-      integer :: erria=ER, errib=ER
-      integer :: i,j,ia,ja,ib,jb
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter ::  k1i=1,k2i=0,li=0,k1j=0,k2j=1,lj=0
-c     parameters for REALIGN arrB[i][j] WITH arrA[kr1i * i + lri][kr2j * j + lrj]                                                 
-      integer, parameter ::  kr1i=3,kr2i=0,lri=-2,kr1j=0,kr2j=2,lrj=1
-      integer, allocatable :: A2(:,:),B2(:,:)
-      character(10) ::  tname = 'realign221'
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A2(k1i * i + li,k2j * j + lj)
-!dvm$ DYNAMIC B2
-
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-       
-!dvm$ region
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) = 0     
-          enddo 
-      enddo
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((j-lj)/k2j) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2))  then 
-                ib = (i-li)/k1i
-                jb = (j-lj)/k2j  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B2(i,j) WITH A2(kr1i * i + lri,kr2j * j + lrj)
-
-!dvm$ actual(erria,errib)
-!dvm$ region in(A2,B2), out(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j), private(ia,ja), 
-!dvm$*       reduction(min(erria),min(errib))
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) /= (i*NL+j)) then     
-               errib = min(errib,i*NL/10+j)
-            endif 
-            ia=kr1i * i + lri
-            ja=kr2j * j + lrj
-            if (A2(ia,ja) /= (ia*NL+ja)) then     
-               erria = min(erria,i*NL/10+j)
-            endif 
-          enddo 
-      enddo
-!dvm$ end region
-  
-!dvm$ get_actual(erria,errib)
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B2,A2)
-
-      end
-
-C ----------------------------------------------------realign222
-c 222 ALIGN arrB[i][j] WITH arrA[j+1][i] REALIGN arrB[i][j] WITH arrA[i+4][j]	
-      subroutine realign222
-      integer, parameter :: AN1=8,AN2=8,BN1=4,BN2=4,NL=1000,ER=10000
-      integer :: erria=ER, errib=ER
-      integer :: i,j,ia,ja,ib,jb
-c     parameters for ALIGN arrB[i][j] WITH arrA[k2i * j + li][k1j * i + lj]                                                 
-      integer, parameter ::  k1i=0,k2i=1,li=1,k1j=1,k2j=0,lj=0
-c     parameters for REALIGN arrB[i][j] WITH arrA[kr1i * i + lri][kr2j * j + lrj]                                                 
-      integer, parameter ::  kr1i=1,kr2i=0,lri=0,kr1j=0,kr2j=1,lrj=0
-      integer, allocatable :: A2(:,:),B2(:,:)
-      character(10) ::  tname = 'realign222'
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A2(k2i * j + li,k1j * i + lj)
-!dvm$ DYNAMIC B2
-
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-       
-!dvm$ region
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) = 1     
-          enddo 
-      enddo
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = (i*NL+j)*2
-             if (((i-li) .eq.(((i-li)/k2i) * k2i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *          (((i-li)/k2i) .gt. 0)  .and.
-     *          (((j-lj)/k1j) .gt. 0)  .and.
-     *          (((i-li)/k2i) .le. BN2)  .and.
-     *          (((j-lj)/k1j) .le. BN1))  then 
-                ib = (j-lj)/k1j
-                jb = (i-li)/k2i  
-                B2(ib,jb) = B2(ib,jb) + ib*NL+jb
-             endif 
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B2(i,j) WITH A2(kr1i * i + lri,kr2j * j + lrj)
-
-!dvm$ actual(erria,errib)
-!dvm$ region 
-!dvm$ parallel (i,j) on B2(i,j),
-!dvm$*       reduction(min(erria),min(errib)),
-!dvm$*       private(ia,ja) 
-
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) /= (i*NL+j+1)) then     
-               errib = min(errib,i*NL/10+j)
-            endif 
-            ia=kr1i * i + lri
-            ja=kr2j * j + lrj
-            if (A2(ia,ja) /= (ia*NL+ja)*2) then     
-               erria = min(erria,i*NL/10+j)
-            endif 
-          enddo 
-      enddo
-!dvm$ end region
-  
-!dvm$ get_actual(erria,eriib)
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B2,A2)
-
-      end
-
-C ----------------------------------------------------realign223
-c 223 ALIGN arrB[i][*] WITH arrA[*][i]  REALIGN arrB[i][j] WITH arrA[i+4][j+4]	
-      subroutine realign223
-      integer, parameter :: AN1=10,AN2=10,BN1=4,BN2=4,NL=1000,ER=10000
-      integer :: erria=ER, errib=ER
-      integer :: i,j,ia,ja,ib,jb
-c     parameters for ALIGN arrB[i][*] WITH arrA[*][k1j*i + lj]                                                 
-      integer, parameter ::  k1i=0,k2i=0,li=0,k1j=1,k2j=0,lj=0
-c     parameters for REALIGN arrB[i][j] WITH arrA[kr1i * i + lri][kr2j * j + lrj]                                                 
-      integer, parameter ::  kr1i=1,kr2i=0,lri=4,kr1j=0,kr2j=1,lrj=4
-      integer, allocatable :: A2(:,:),B2(:,:)
-      character(10) ::  tname = 'realign223'
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,*) WITH A2(*,k1j * i + lj)
-!dvm$ DYNAMIC B2
-
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-       
-      B2 = 0     
-
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb,k)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             do k=1,BN2
-              if (
-     *          ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *          (((j-lj)/k1j) .gt. 0)  .and.
-     *          (((j-lj)/k1j) .le. BN1)
-     *          )  then 
-                ib = ((j-lj)/k1j)
-                jb = k 
-!               B2(ib,jb) = B2(ib,jb) + ib*NL+jb
-                B2(ib,jb) = ib*NL+jb+5
-              endif 
-             enddo
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B2(i,j) WITH A2(kr1i * i + lri,kr2j * j + lrj)
-
-!dvm$ actual(erria,errib)
-!dvm$ region in(A2,B2), local(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j), private(ia,ja),
-!dvm$*       reduction(min(erria),min(errib))
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) /= (i*NL+j+5)) then     
-               errib = min(errib,i*NL/10+j)
-            endif 
-            ia=kr1i * i + lri
-            ja=kr2j * j + lrj
-            if (A2(ia,ja) /= (ia*NL+ja)) then     
-               erria = min(erria,i*NL/10+j)
-            endif 
-          enddo 
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual(erria,errib)
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-!         print *,erria, errib
-      endif 
-
-      deallocate (B2,A2)
-
-      end
-
-C ----------------------------------------------------realign224
-c 224 ALIGN arrB[*][*] WITH arrA[*][1]  REALIGN arrB[i][j] WITH arrA[i+4][j+4] 
-      subroutine realign224
-      integer, parameter :: AN1=10,AN2=10,BN1=4,BN2=4,NL=1000,ER=10000
-      integer :: erria=ER, errib=ER
-      integer :: i,j,ia,ja,ib,jb
-c     parameters for ALIGN arrB[*][*] WITH arrA[*][lj]                                                 
-      integer, parameter ::  k1i=0,k2i=0,li=0,k1j=0,k2j=0,lj=1
-c     parameters for REALIGN arrB[i][j] WITH arrA[kr1i * i + lri][kr2j * j + lrj]                                                 
-      integer, parameter ::  kr1i=1,kr2i=0,lri=4,kr1j=0,kr2j=1,lrj=4
-      integer, allocatable :: A2(:,:),B2(:,:)
-      character(10) ::  tname = 'realign224'
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B2(*,*) WITH A2(*,lj)
-!dvm$ DYNAMIC B2
-
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-
-      B2 = 0
- 
-!dvm$ region
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb,k,n)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j+3
-             if (j == (lj)) then
-                do k=1,BN1
-                    do n=1,BN2
-                         ib = k
-                         jb = n 
-!                        B2(ib,jb) = B2(ib,jb) + (ib*NL+jb)*2
-                         B2(ib,jb) = (ib*NL+jb)*2
-                    enddo
-                enddo
-            endif
-          enddo 
-       enddo
-!dvm$ end region
-
-!dvm$ REALIGN B2(i,j) WITH A2(kr1i * i + lri,kr2j * j + lrj)
-
-!dvm$ actual(erria,errib)
-!dvm$ region
-!dvm$ parallel (i,j) on B2(i,j), private(ia,ja),
-!dvm$*       reduction(min(erria),min(errib))
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) /= (i*NL+j)*2) then     
-               errib = min(errib,i*NL/10+j)
-            endif 
-            ia=kr1i * i + lri
-            ja=kr2j * j + lrj
-            if (A2(ia,ja) /= (ia*NL+ja+3)) then     
-               erria = min(erria,i*NL/10+j)
-            endif 
-          enddo 
-      enddo
-!dvm$ end region
-     
-!dvm$ get_actual(erria,errib)
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-!         print *,erria, errib
-      endif 
-
-      deallocate (B2,A2)
-
-      end
-
-C ----------------------------------------------------realign225
-c 225	ALIGN arrB[i][j] WITH arrA[i][j] REALIGN arrB[*][*] WITH arrA[*][2]	
-      subroutine realign225
-      integer, parameter :: AN1=10,AN2=10,BN1=4,BN2=4,NL=1000,ER=10000
-      integer :: erria=ER, errib=ER
-      integer :: i,j,ia,ja,ib,jb
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter ::  k1i=1,k2i=0,li=0,k1j=0,k2j=1,lj=0
-c     parameters for REALIGN arrB[*][*] WITH arrA[*][lrj]                                                 
-      integer, parameter ::  kr1i=0,kr2i=0,lri=0,kr1j=0,kr2j=0,lrj=2
-      integer, allocatable :: A2(:,:),B2(:,:)
-      character(10) ::  tname = 'realign225'
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A2(k1i * i + li,k2j * j + lj)
-!dvm$ DYNAMIC B2
-
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-       
-!dvm$ region
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) = 0     
-          enddo 
-      enddo
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = i*NL+j
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((j-lj)/k2j) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2))  then 
-                ib = (i-li)/k1i
-                jb = (j-lj)/k2j  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B2(*,*) WITH A2(*,lrj)
-
-!dvm$ actual(errib)
-!dvm$ region
-!dvm$ parallel (i,j) on B2(i,j), reduction( min( errib ) )
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) /= (i*NL+j)) then     
-               errib = min(errib,i*NL/10+j)
-            endif 
-          enddo 
-      enddo
-!dvm$ end region
-  
-!dvm$ get_actual(errib)
-      if (errib == ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B2,A2)
-
-      end
-C ----------------------------------------------------realign226
-c 226 ALIGN arrB[i][j] WITH arrA[i][j] REALIGN arrB[i][j] WITH arrA[2*j+1][3*i-2]	
-      subroutine realign226
-      integer, parameter :: AN1=16,AN2=18,BN1=6,BN2=4,NL=1000,ER=10000
-      integer :: erria=ER, errib=ER
-      integer :: i,j,ia,ja,ib,jb
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter ::  k1i=1,li=0,k2j=1,lj=0
-c     parameters for REALIGN arrB[i][j] WITH arrA[kr1i * i + lri][kr2j * j + lrj]                                                 
-      integer, parameter ::  kr1i=3,lri=-2,kr2j=2,lrj=1
-      integer, allocatable :: A2(:,:),B2(:,:)
-      character(10) ::  tname = 'realign226'
-               
-!dvm$ distribute A2(BLOCK,BLOCK)   
-!dvm$ ALIGN B2(i,j) WITH A2(k1i * i + li,k2j * j + lj)
-!dvm$ DYNAMIC B2
-
-      allocate (A2(AN1,AN2),B2(BN1,BN2))
-       
-!dvm$ region
-!dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) = 0     
-          enddo 
-      enddo
-
-!dvm$ parallel (i,j) on A2(i,j), private(ib,jb)
-      do i=1,AN1
-          do j=1,AN2
-             A2(i,j) = (i*NL+j) * 3
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((j-lj)/k2j) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2))  then 
-                ib = (i-li)/k1i
-                jb = (j-lj)/k2j  
-                B2(ib,jb) = ib*NL+jb
-             endif 
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B2(i,j) WITH A2(kr2j * j + lrj,kr1i * i + lri)
-
-!dvm$ actual(erria,errib)
-!dvm$ region inlocal(A2,B2)
-!dvm$ parallel (i,j) on B2(i,j), private(ia,ja),
-!dvm$*       reduction(min(erria),min(errib))
-      do i=1,BN1
-          do j=1,BN2
-            if (B2(i,j) /= (i*NL+j)) then     
-               errib = min(errib,i*NL/10+j)
-            endif 
-            ia=kr2j * j + lrj
-            ja=kr1i * i + lri
-            if (A2(ia,ja) /= (ia*NL+ja)*3) then     
-               erria = min(erria,i*NL/10+j)
-            endif 
-          enddo 
-      enddo 
-!dvm$ end region
-
-!dvm$ get_actual(erria,errib)
-      if ((erria == ER) .and. (errib == ER)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B2,A2)
-
-      end
-
-C ---------------------------------------------------
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
-   
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign33.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign33.fdv
deleted file mode 100644
index 95cd2bd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign33.fdv
+++ /dev/null
@@ -1,697 +0,0 @@
-      program REALIGN33
-
-!    Testing  ALIGN and REALIGN directives       
-
-      print *,'===START OF realign33========================'
-
-! --------------------------------------------------
-! 331 ALIGN arrB3(i,j,n)   WITH arrA3(i,j,n)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(i+1,j+2,n+3) 
-
-      call realign331
-! --------------------------------------------------
-! 332 ALIGN arrB3(i,j,n)   WITH arrA3(i,j,n)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(2*i,3*j,5*n) 
- 
-      call realign332
-! --------------------------------------------------
-! 333 ALIGN arrB3(i,j,n)   WITH arrA3(i+2,j+4,n+3)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(2*i-1,2*n,j+1) 
- 
-      call realign333
-! --------------------------------------------------
-! 334 ALIGN arrB3(i,j,n)   WITH arrA3(n+1,3*i+1,j+2)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(2*j,i+1,2*n+1) 
- 
-      call realign334
-! --------------------------------------------------
-! 335 ALIGN arrB3(*,*,*)   WITH arrA3(*,*,*)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(i,j,n) 
-       
-      call realign335
-! --------------------------------------------------
-! 336 ALIGN arrB3(i,j,n)   WITH arrA3(i,j+1,2*n+1)    
-!     REALIGN arrB3(*,j,n) WITH arrA3(j+1,n,1) 
-
-      call realign336
-! -------------------------------------------------
-!
-      print *,'=== END OF realign33 ========================= '    
-
-      end
-
-! ----------------------------------------------------realign331
-! 331 ALIGN arrB3(i,j,n)   WITH arrA3(i,j,n)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(i+1,j+2,n+3) 
-
-      subroutine realign331
-      integer, parameter :: AN1=10,AN2=10,AN3=10,BN1=9,BN2=8,BN3=6
-      integer, parameter :: NL=10000,ER=100000
-!     parameters for ALIGN                                               
-      integer, parameter :: k1i=1, li=0
-      integer, parameter :: k2j=1, lj=0
-      integer, parameter :: k3n=1, ln=0
-!     parameters for REALIGN                                               
-      integer, parameter :: kr1i=1, lri=1
-      integer, parameter :: kr2j=1, lrj=2
-      integer, parameter :: kr3n=1, lrn=3
-
-      integer :: erria = ER, errib = ER
-      integer s,cs,i,j,n,ia,ja,na,ib,jb,nb
-
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      character(*), parameter :: tname ='realign331'
-             
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(k1i*i+li,k2j*j+lj,k3n*n+ln)
-!dvm$ DYNAMIC B3
-
-      allocate (A3(AN1,AN2,AN3), B3(BN1,BN2,BN3))
-
-!dvm$ region  out(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n)
-      do i=1,BN1
-          do  j=1,BN2
-             do n=1,BN3
-                    B3(i,j,n) = 0     
-             enddo 
-          enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb,nb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                      A3(i,j,n)=i*NL/10+j*NL/100+n*NL/1000
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) * k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  
-     *                  ) then 
-                            ib = (i-li)/k1i
-                            jb = (j-lj)/k2j
-                            nb = (n-ln)/k3n
-                            B3(ib,jb,nb)=ib*NL/10+jb*NL/100+nb*NL/1000
-                      endif 
-              enddo 
-          enddo 
-      enddo 
-!dvm$ end region
-
-!dvm$ REALIGN B3(i,j,n) WITH A3(kr1i*i+lri,kr2j*j+lrj,kr3n*n+lrn)
-
-      s=0 
-
-!dvm$ actual(erria, errib, s)
-!dvm$ region inlocal(A3,B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n), 
-!dvm$*reduction(min(erria),min(errib),sum(s)),private(ia,ja,na)
-      do i=1,BN1
-         do j=1,BN2
-            do n=1,BN3
-               s = s + B3(i,j,n)
-               if (B3(i,j,n) /= (i*NL/10+j*NL/100+n*NL/1000)) then     
-                   errib = min(errib,i*NL/10 + j*NL/100 + n*NL/1000)
-               endif
-               ia=kr1i * i + lri
-               ja=kr2j * j + lrj
-               na=kr3n * n + lrn
-               if (A3(ia,ja,na) /= (ia*NL/10+ja*NL/100+na*NL/1000))
-     *         then     
-                 erria = min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000)
-               endif
-           enddo 
-        enddo 
-      enddo 
-!dvm$ end region
-
-      cs = 0              
-      do i=1,BN1
-         do j=1,BN2
-            do n=1,BN3
-                    cs = cs + i*NL/10 + j*NL/100 + n*NL/1000
-            enddo 
-         enddo 
-      enddo 
-     
-!dvm$ get_actual(erria, errib, s)
-      if ((erria == ER) .and. (errib == ER) 
-     *    .and. (s == cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-!         write (*,*) erria,errib,s,cs
-      endif 
-
-      deallocate (B3,A3)
-
-      end subroutine realign331
-
-! ----------------------------------------------------realign332
-! 332 ALIGN arrB3(i,j,n)   WITH arrA3(i,j,n)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(2*i,3*j,5*n) 
-
-      subroutine realign332
-      integer, parameter :: AN1=12,AN2=16,AN3=25,BN1=4,BN2=3,BN3=5
-      integer, parameter :: NL=10000,ER=100000
-!     parameters for ALIGN                                               
-      integer, parameter :: k1i=1, li=0
-      integer, parameter :: k2j=1, lj=0
-      integer, parameter :: k3n=1, ln=0
-!     parameters for REALIGN                                               
-      integer, parameter :: kr1i=2, lri=0
-      integer, parameter :: kr2j=3, lrj=0
-      integer, parameter :: kr3n=5, lrn=0
-
-      integer :: erria = ER, errib = ER
-      integer s,cs,i,j,n,ia,ja,na,ib,jb,nb
-
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      character(*), parameter :: tname ='realign332'
-             
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(k1i*i+li,k2j*j+lj,k3n*n+ln)
-!dvm$ DYNAMIC B3
-
-      allocate (A3(AN1,AN2,AN3), B3(BN1,BN2,BN3))
-
-      A3 = 0
-      B3 = 0
-
-!dvm$ region inout(A3,B3)
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb,nb)
-      do i=1,AN1
-        do j=1,AN2
-           do n=1,AN3
-              A3(i,j,n)=i*NL/10+j*NL/100+n*NL/1000 + 10
-              if ( 
-     *           ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *           ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *           ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *           (((i-li)/k1i) .gt. 0)  .and.
-     *           (((j-lj)/k2j) .gt. 0)  .and.
-     *           (((n-ln)/k3n) .gt. 0)  .and.
-     *           (((i-li)/k1i) .le. BN1)  .and.
-     *           (((j-lj)/k2j) .le. BN2)  .and.
-     *           (((n-ln)/k3n) .le. BN3)  
-     *           ) then 
-                      ib = (i-li)/k1i
-                      jb = (j-lj)/k2j
-                      nb = (n-ln)/k3n
-                      B3(ib,jb,nb)=ib*NL/10+jb*NL/100+nb*NL/1000 + 5
-               endif 
-           enddo 
-        enddo 
-      enddo 
-!dvm$ end region
-
-!dvm$ REALIGN B3(i,j,n) WITH A3(kr1i*i+lri, kr2j*j+lrj, kr3n*n+lrn)
-
-      s=0 
-
-!dvm$ actual(erria, errib, s)
-!dvm$ region inlocal(A3),inlocal(B3)
-!dvm$ parallel (i,j,n) on B3(i,j,n),
-!dvm$*reduction(min(erria),min(errib),sum(s)),private(ia,ja,na)
-      do i=1,BN1
-         do j=1,BN2
-            do n=1,BN3
-               s = s + B3(i,j,n)
-               if (B3(i,j,n) /= (i*NL/10+j*NL/100+n*NL/1000) + 5) then 
-                   errib = min(errib,i*NL/10 + j*NL/100 + n*NL/1000)
-               endif
-               ia=kr1i * i + lri
-               ja=kr2j * j + lrj
-               na=kr3n * n + lrn
-               if (A3(ia,ja,na) /= (ia*NL/10+ja*NL/100+na*NL/1000)+10)
-     *         then
-                  erria = min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000)
-               endif
-            enddo 
-         enddo 
-      enddo 
-!dvm$ end region
-  
-      cs = 0              
-      do i=1,BN1
-         do j=1,BN2
-            do n=1,BN3
-                    cs = cs + i*NL/10 + j*NL/100 + n*NL/1000 + 5
-            enddo 
-         enddo 
-      enddo 
-     
-!dvm$ get_actual(erria, errib, s)
-      if ((erria == ER) .and. (errib == ER) 
-     *    .and. (s == cs)) then     
-          call ansyes(tname)
-      else                     
-          call ansno(tname)
-!          write (*,*) erria,errib,s,cs
-!          print *,B3  
-      endif 
-
-      deallocate (B3,A3)
-
-      end subroutine realign332
-
-! --------------------------------------------------realign333
-! 333 ALIGN arrB3(i,j,n)   WITH arrA3(i+2,j+4,n+3)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(2*i-1,2*n,j+1) 
-      
-      subroutine realign333
-      integer, parameter :: AN1=12,AN2=16,AN3=25,BN1=4,BN2=3,BN3=5
-      integer, parameter :: NL=10000,ER=100000
-!     parameters for ALIGN                                                
-      integer, parameter :: k1i=1, li=2
-      integer, parameter :: k2j=1, lj=4
-      integer, parameter :: k3n=1, ln=3
-!     parameters for REALIGN                                                
-      integer, parameter :: kr1i=2, lri=-1
-      integer, parameter :: kr2j=1, lrj=1
-      integer, parameter :: kr3n=2, lrn=0
-
-      integer :: erria = ER, errib = ER
-      integer s,cs,i,j,n,ia,ja,na,ib,jb,nb
-
-      integer A3(AN1,AN2,AN3)
-      integer, allocatable :: B3(:,:,:)
-      character(*), parameter :: tname ='realign333'
-             
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(k1i*i+li,k2j*j+lj,k3n*n+ln)
-!dvm$ DYNAMIC B3
-
-      allocate (B3(BN1,BN2,BN3))
-
-      A3 = 1
-      B3 = 2
-
-!dvm$ region inout(A3),inout(B3)
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb,nb)
-      do i=1,AN1
-        do j=1,AN2
-          do n=1,AN3
-             A3(i,j,n) = A3(i,j,n)+ i*NL/10+j*NL/100+n*NL/1000 
-             if ( 
-     *          ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((j-lj)/k2j) .gt. 0)  .and.
-     *          (((n-ln)/k3n) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2)  .and.
-     *          (((n-ln)/k3n) .le. BN3)  
-     *          ) then 
-                   ib = (i-li)/k1i
-                   jb = (j-lj)/k2j
-                   nb = (n-ln)/k3n
-                   B3(ib,jb,nb) = B3(ib,jb,nb) + 
-     *                            ib*NL/10+jb*NL/100+nb*NL/1000
-               endif 
-             enddo 
-          enddo 
-      enddo 
-!dvm$ end region
-
-!dvm$ REALIGN B3(i,j,n) WITH A3(kr1i*i+lri, kr3n*n+lrn, kr2j*j+lrj)
-
-      s=0 
-
-!dvm$ actual(erria, errib, s)
-!dvm$ region
-!dvm$ parallel (i,j,n) on B3(i,j,n), private(ia,ja,na),
-!dvm$*reduction(min(erria),min(errib),sum(s))
-      do i=1,BN1
-         do j=1,BN2
-            do n=1,BN3
-               s = s + B3(i,j,n)
-               if (B3(i,j,n) /= (i*NL/10+j*NL/100+n*NL/1000) + 2) then 
-                   errib = min(errib,i*NL/10 + j*NL/100 + n*NL/1000)
-               endif
-               ia=kr1i * i + lri
-               ja=kr3n * n + lrn
-               na=kr2j * j + lrj
-               if (A3(ia,ja,na) /= (ia*NL/10+ja*NL/100+na*NL/1000)+1)
-     *         then  
-                  erria = min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000)
-               endif
-            enddo 
-         enddo 
-      enddo 
-!dvm$ end region
-  
-      cs = 0              
-      do i=1,BN1
-         do j=1,BN2
-            do n=1,BN3
-                    cs = cs + i*NL/10 + j*NL/100 + n*NL/1000 + 2
-            enddo 
-         enddo 
-      enddo 
-     
-!dvm$ get_actual(erria, errib, s)
-      if ((erria == ER) .and. (errib == ER) 
-     *    .and. (s == cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-!          write (*,*) erria,errib,s,cs
-!          print *,B3  
-      endif 
-
-      deallocate (B3)
-
-      end subroutine realign333
-
-! ----------------------------------------------------realign334
-! 334 ALIGN arrB3(i,j,n)   WITH arrA3(n+1,3*i+1,j+2)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(2*j,i+1,2*n+1) 
-      
-      subroutine realign334
-      integer, parameter :: AN1=15,AN2=28,AN3=20,BN1=4,BN2=6,BN3=6
-      integer, parameter :: NL=10000,ER=100000
-!     parameters for ALIGN                                              
-      integer, parameter :: k1i=3, li=1
-      integer, parameter :: k2j=1, lj=2
-      integer, parameter :: k3n=1, ln=1
-!     parameters for REALIGN                                                
-      integer, parameter :: kr1i=1, lri=1
-      integer, parameter :: kr2j=2, lrj=0
-      integer, parameter :: kr3n=2, lrn=1
-
-      integer :: erria = ER, errib = ER
-      integer s,cs,i,j,n,ia,ja,na,ib,jb,nb
-
-      integer A3(AN1,AN2,AN3),B3(BN1,BN2,BN3)
-      character(*), parameter :: tname ='realign334'
-             
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(k3n*n+ln,k1i*i+li,k2j*j+lj)
-!dvm$ DYNAMIC B3
-
-      A3 = 0
-      B3 = 0
-
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb,nb)
-      do i=1,AN1
-         do j=1,AN2
-            do n=1,AN3
-                  A3(i,j,n) = A3(i,j,n) + i*NL/10+j*NL/100+n*NL/1000 
-                  if ( 
-     *               ((i-ln) .eq.(((i-ln)/k3n) * k3n)) .and.
-     *               ((j-li) .eq.(((j-li)/k1i) * k1i)) .and.
-     *               ((n-lj) .eq.(((n-lj)/k2j) * k2j)) .and.
-     *               (((i-ln)/k3n) .gt. 0) .and.
-     *               (((j-li)/k1i) .gt. 0) .and.
-     *               (((n-lj)/k2j) .gt. 0) .and.
-     *               (((i-ln)/k3n) .le. BN3) .and.
-     *               (((j-li)/k1i) .le. BN1) .and.
-     *               (((n-lj)/k2j) .le. BN2)  
-     *               ) then 
-                        ib = (j-li)/k1i
-                        jb = (n-lj)/k2j
-                        nb = (i-ln)/k3n
-                        B3(ib,jb,nb) = B3(ib,jb,nb) + 
-     *                         ib*NL/10+jb*NL/100+nb*NL/1000
-                      endif 
-              enddo 
-          enddo 
-      enddo 
-!dvm$ end region
-
-!dvm$ REALIGN B3(i,j,n) WITH A3(kr2j*j+lrj, kr1i*i+lri, kr3n*n+lrn)
-
-      s=0 
-
-!dvm$ actual(erria, errib, s)
-!dvm$ region
-!dvm$ parallel (i,j,n) on B3(i,j,n),
-!dvm$*reduction(min(erria),min(errib),sum(s)),
-!dvm$*private(ia,ja,na)
-      do i=1,BN1
-        do j=1,BN2
-          do n=1,BN3
-             s = s + B3(i,j,n)
-             if (B3(i,j,n) /= (i*NL/10+j*NL/100+n*NL/1000)) then     
-                 errib = min(errib,i*NL/10 + j*NL/100 + n*NL/1000)
-             endif
-             ia=kr2j * j + lrj
-             ja=kr1i * i + lri
-             na=kr3n * n + lrn
-             if (A3(ia,ja,na) /= (ia*NL/10+ja*NL/100+na*NL/1000)) then     
-                  erria = min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000)
-!                 print *, ia, ja, na
-             endif
-          enddo 
-        enddo 
-      enddo 
-!dvm$ end region
-  
-      cs = 0              
-      do i=1,BN1
-         do j=1,BN2
-            do n=1,BN3
-                    cs = cs + i*NL/10 + j*NL/100 + n*NL/1000
-            enddo 
-         enddo 
-      enddo 
-     
-!dvm$ get_actual(erria, errib, s)
-      if ((erria == ER) .and. (errib == ER) 
-     *    .and. (s == cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      end subroutine realign334
-
-! ----------------------------------------------------realign335
-! 335 ALIGN arrB3(*,*,*)   WITH arrA3(*,*,*)    
-!     REALIGN arrB3(i,j,n) WITH arrA3(i,j,n) 
-
-      subroutine realign335
-      integer, parameter :: AN1=10,AN2=10,AN3=10,BN1=4,BN2=8,BN3=4
-      integer, parameter :: NL=10000,ER=100000
-!     parameters for  ALIGN        
-      integer, parameter :: k1i=0, li=0
-      integer, parameter :: k2j=0, lj=0
-      integer, parameter :: k3n=0, ln=0
-!     parameters for REALIGN                                               
-      integer, parameter :: kr1i=1, lri=0
-      integer, parameter :: kr2j=1, lrj=0
-      integer, parameter :: kr3n=1, lrn=0
-
-      integer :: erria = ER, errib = ER
-      integer s,cs,i,j,n,ia,ja,na,ib,jb,nb
-
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      character(*), parameter ::  tname = 'realign335'
-               
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(*,*,*) WITH A3(*,*,*)
-!dvm$ DYNAMIC B3
-
-      allocate (A3(AN1,AN2,AN3), B3(BN1,BN2,BN3))
-
-      A3 = 0
-      B3 = 6
-
-!dvm$ actual (A3,B3)
-!dvm$ region
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb,nb)
-      do i=1,AN1
-        do j=1,AN2
-          do n=1,AN3
-             A3(i,j,n) = A3(i,j,n) + i*NL/10+j*NL/100+n*NL/1000
-           enddo 
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,n) on B3(i,j,n), private(ib,jb,nb)
-      do i=1,BN1
-        do j=1,BN2
-          do n=1,BN3
-                B3(i,j,n) = B3(i,j,n) + i*NL/10+j*NL/100+n*NL/1000              
-           enddo 
-        enddo 
-      enddo 
-
-!dvm$ end region
-
-!dvm$ REALIGN B3(i,j,n) WITH A3(kr1i*i+lri, kr2j*j+lrj, kr3n*n+lrn)
-
-      s=0 
-
-!dvm$ actual(erria, errib, s)
-!dvm$ region  inlocal(A3)
-!dvm$ parallel (i,j,n) on B3(i,j,n),
-!dvm$* reduction(min(erria),min(errib),sum(s)),private(ia,ja,na)
-      do i=1,BN1
-         do j=1,BN2
-            do n=1,BN3
-               s = s + B3(i,j,n)
-               if (B3(i,j,n) /= (i*NL/10+j*NL/100+n*NL/1000)+ 6) then     
-                  errib = min(errib,i*NL/10 + j*NL/100 + n*NL/1000)
-               endif
-               ia=kr1i * i + lri
-               ja=kr2j * j + lrj
-               na=kr3n * n + lrn
-               if (A3(ia,ja,na) /= (ia*NL/10+ja*NL/100+na*NL/1000)) then     
-                    erria = min(erria,ia*NL/10 + ja*NL/100 + na*NL/1000)
-               endif
-           enddo         
-         enddo 
-      enddo 
-!dvm$ end region
-  
-      cs = 0              
-      do i=1,BN1
-         do j=1,BN2
-            do n=1,BN3
-                    cs = cs + i*NL/10 + j*NL/100 + n*NL/1000 + 6
-            enddo 
-         enddo 
-      enddo 
-     
-!dvm$ get_actual(erria, errib, s)
-      if ((erria == ER) .and. (errib == ER) 
-     *    .and. (s == cs)) then     
-          call ansyes(tname)
-      else                     
-          call ansno(tname)
-!          write (*,*) erria,errib,s,cs
-!          print *,B3  
-      endif 
-
-      deallocate (B3,A3)
-
-      end subroutine realign335
-
-! ----------------------------------------------------realign336
-! 336 ALIGN arrB3(i,j,n)   WITH arrA3(i,j+1,2*n+1)    
-!     REALIGN arrB3(*,j,n) WITH arrA3(j+1,n,1) 
-
-      subroutine realign336
-      integer, parameter ::  AN1=8,AN2=8,AN3=8
-      integer, parameter ::  BN1=3,BN2=4,BN3=3
-      integer, parameter ::  NL=10000,ER=100000
-!     parameters for ALIGN                                                
-      integer, parameter ::  k1i=1,li=0
-      integer, parameter ::  k2j=1,lj=1
-      integer, parameter ::  k3n=2,ln=1
-!     parameters for REALIGN                                                
-      integer, parameter ::  kr1i=0,lri=1
-      integer, parameter ::  kr2j=1,lrj=1
-      integer, parameter ::  kr3n=1,lrn=0
-      integer, allocatable :: A3(:,:,:),B3(:,:,:)
-      integer :: s,cs,erria = ER, errib = ER,
-     >           i,j,n,m,ia,ja,na,ib,jb,nb
-      character(10) :: tname='realign336'
-
-!dvm$ distribute A3(BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B3(i,j,n) WITH A3(k1i*i+li,k2j*j+lj,k3n*n+ln)
-!dvm$ DYNAMIC B3
-
-      allocate (A3(AN1,AN2,AN3),B3(BN1,BN2,BN3))
-
-      B3 = 0     
-
-!dvm actual (B3)
-!dvm$ region inout(B3), inout(A3)
-!dvm$ parallel (i,j,n) on A3(i,j,n), private(ib,jb,nb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-                A3(i,j,n) = i*NL/10+j*NL/100+n*NL/1000
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        B3(ib,jb,nb)=ib*NL/10+jb*NL/100+nb*NL/1000 
-                      endif 
-             enddo
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B3(*,j,n) WITH A3(kr2j*j+lrj,kr3n*n+lrn,lri)
-
-      s=0 
-
-!dvm$ actual(erria, errib, s)
-!dvm$ region
-!dvm$ parallel (i,j,n) on B3(i,j,n),
-!dvm$* reduction(min(erria), min(errib), sum(s)) 
-!dvm$*,private(ia,ja,na)
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                  s = s + B3(i,j,n)
-                  if (B3(i,j,n) /= (i*NL/10+j*NL/100+n*NL/1000))then     
-                      errib = min(errib,i*NL/10 + j*NL/100+ n*NL/1000)
-                  endif
-                  ia=kr2j*j+lrj
-                  ja=kr3n*n+lrn
-                  na=lri
-                  if (A3(ia,ja,na)/=
-     *               (ia*NL/10+ja*NL/100+na*NL/1000))then     
-                      erria = min(erria,i*NL/10 + j*NL/100+ n*NL/1000)
-                  endif
-            enddo
-          enddo 
-      enddo
-!dvm$ end region
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000
-             enddo
-          enddo
-      enddo
-     
-!dvm$ get_actual(erria, errib, s)
-
-
-      if ((erria == ER) .and. (errib == ER) .and.
-     *     (s ==  cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-!         print *, erria, errib
-      endif 
-
-      deallocate (B3,A3)
-
-      end
-
-! ----------------------------------------------------
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign44.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign44.fdv
deleted file mode 100644
index e55a9bd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REALIGN/realign44.fdv
+++ /dev/null
@@ -1,557 +0,0 @@
-      program REALIGN44
-
-c    Testing REALIGN directive
-       
-      print *,'===START OF realign44===================='
-C --------------------------------------------------
-c 441 ALIGN arrB[i][j][n][m] WITH arrA[i][j][n][m]
-c     REALIGN arrB[][j][k][] WITH arrA[j][k][1][3]
-      call realign441
-C -------------------------------------------------
-c 442 ALIGN arrB[][j][n][i] WITH arrA[i][j][ ][n]
-c     REALIGN arrB[i][j][ ][m] WITH arrA[i][j][2][m]
-      call realign442
-C --------------------------------------------------
-c 443 ALIGN arrB[i][j][n][m] WITH arrA[i][2*j][3*n][4*m]
-c     REALIGN arrB[i][j][n][m] WITH arrA[i+1][j+2][n+3][m+4]
-      call realign443
-C -------------------------------------------------
-c 444 ALIGN arrB[i][j][n][m] WITH arrA[m][i+1][j][2*n]
-c     REALIGN arrB[i][j][n][m] WITH arrA[i+2][3*j-2][2*n-2][m+1]
-      call realign444
-C -------------------------------------------------
-C
-      print *,'=== END OF realign44 ===================='
-
-      end
-
-C ----------------------------------------------------realign441
-c 441 ALIGN arrB[i][j][n][m] WITH arrA[i][j][n][m]
-c     REALIGN arrB[][j][n][] WITH arrA[j][n][1][3]
-
-      subroutine realign441
-      integer, parameter ::  AN1=6,AN2=8,AN3=5,AN4=7
-      integer, parameter ::  BN1=2,BN2=5,BN3=4,BN4=3
-      integer, parameter ::  NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]
-      integer, parameter ::  k1i=1,li=0
-      integer, parameter ::  k2j=1,lj=0
-      integer, parameter ::  k3n=1,ln=0
-      integer, parameter ::  k4m=1,lm=0
-c     parameters for REALIGN arrB[*][j][n][*] WITH arrA[kr2j*j+lrj][kr3n*n+lrn][lri][lrm]
-      integer, parameter ::  kr1i=0,lri=1
-      integer, parameter ::  kr2j=1,lrj=0
-      integer, parameter ::  kr3n=1,lrn=0
-      integer, parameter ::  kr4m=0,lrm=3
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer :: s=0,cs,erria=ER, errib=ER,
-     >           i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-
-      character(10) :: tname='realign441'
-
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)
-!dvm$ DYNAMIC B4
-
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-
-!dvm$ region  out(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) = 0
-                enddo
-             enddo
-          enddo 
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(ib,jb, nb, mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                      if (
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) * k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k4m) * k4m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((m-lm)/k4m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  .and.
-     *                  (((m-lm)/k4m) .le. BN4)
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        mb = (m-lm)/k4m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-              enddo
-            enddo
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B4(*,j,n,*) WITH A4(kr2j*j+lrj,kr3n*n+lrn,lri,lrm)
-
-!dvm$ actual(erria, errib, s)
-
-!dvm$ region
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m),
-!dvm$*         reduction(min(erria),min(errib),sum(s)),
-!dvm$*         private(ia,ja, na, ma)
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m)/= (i*NL/10+j*NL/100+n*NL/1000+m))then     
-                    errib = min(errib,i*NL/10+j*NL/100+n*NL/1000+m)
-                  endif
-                  ia=kr2j*j+lrj
-                  ja=kr3n*n+lrn
-                  na=lri
-                  ma=lrm
-                  if (A4(ia,ja,na,ma) /=
-     *              (ia*NL/10+ja*NL/100+na*NL/1000+ma))then     
-                     erria = min(erria,ia*NL/10+ja*NL/100+na*NL/1000+ma)
-                  endif
-                enddo
-            enddo
-          enddo 
-      enddo
-!dvm$ end region
-  
-      cs = 0
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-!dvm$ get_actual(erria, errib, s)
-
-      if ((erria == ER) .and. (errib == ER) .and.
-     *   (s == cs)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------realign442
-c 442 ALIGN arrB[*][j][n][i] WITH arrA[i][j][*][n] 
-c     REALIGN arrB[i][j][*][m] WITH arrA[i][j][2][m]  
-
-      subroutine realign442
-      integer, parameter ::  AN1=5,AN2=5,AN3=5,AN4=5
-      integer, parameter ::  BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter ::  NL=10000,ER=100000
-c     parameters for ALIGN arrB[*][j][n][i] WITH arrA4(k1i*i+li,k2j*j+lj,*,k3m*n+lm)                                               
-      integer, parameter ::  k1i=1, li=0
-      integer, parameter ::  k2j=1, lj=0
-      integer, parameter ::  k3n=0, ln=0
-      integer, parameter ::  k3m=1, lm=0
-c     parameters for REALIGN arrB[i][j][*][m] WITH arrA(kr1i*i+lri,kr2j*j+lrj,lrn,kr4m*m+lrm)                                               
-      integer, parameter ::  kr1i=1, lri=0
-      integer, parameter ::  kr2j=1, lrj=0
-      integer, parameter ::  kr3n=0, lrn=2
-      integer, parameter ::  kr4m=1, lrm=0
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer :: s=0,cs,erria=ER, errib=ER,
-     >           i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      character(10) :: tname='realign442'
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(*,j,n,i) WITH A4(k1i*i+li,k2j*j+lj,*,k3m*n+lm)
-!dvm$ DYNAMIC B4
-
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-
-!dvm$ region inout(A4, B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) = 0     
-                enddo
-             enddo
-          enddo 
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(ib,jb, nb, mb,k)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m
-                    do k = 1,BN1
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k3m) *k3m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((m-lm)/k3m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN4)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((m-lm)/k3m) .le. BN3)
-     *                  )  then 
-                        mb = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        ib = k
-                        nb = (m-lm)/k3m
-                        B4(ib,jb,nb,mb)=ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-                   enddo
-              enddo
-            enddo
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B4(i,j,*,m) WITH A4(kr1i*i+lri,kr2j*j+lrj,lrn,kr4m*m+lrm)
-
-!dvm$ actual(erria, errib, s)
-
-!dvm$ region
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), 
-!dvm$*         reduction(min(erria),min(errib),sum(s)),
-!dvm$*         private(ia,ja,na,ma)
-      do i=1,BN1
-        do j=1,BN2
-          do n=1,BN3
-            do m=1,BN4
-                s = s + B4(i,j,n,m)
-                if (B4(i,j,n,m) /= (i*NL/10+j*NL/100+n*NL/1000+m)) then
-                   errib = min(errib,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                endif
-                ia=kr1i*i+lri
-                ja=kr2j*j+lrj
-                na=lrn
-                ma=kr4m*m+lrm
-                if (A4(ia,ja,na,ma) /=
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma)) then
-                    erria = min(erria,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                endif
-              enddo
-          enddo
-        enddo 
-      enddo
-!dvm$ end region
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m
-                enddo
-            enddo
-          enddo
-      enddo
-     
-!dvm$ get_actual(erria, errib, s)
-
-      if ((erria == ER) .and. (errib == ER) .and.
-     *     (s == cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------realign443
-c 443 ALIGN arrB[i][j][n][m] WITH arrA[i][2*j][3*n][4*m]    
-c     REALIGN arrB[i][j][n][m] WITH arrA[i+1][j+2][n+3][m+4] 
-
-      subroutine realign443
-      integer, parameter ::  AN1=10,AN2=8,AN3=15,AN4=12
-      integer, parameter ::  BN1=4,BN2=3,BN3=5,BN4=3
-      integer, parameter ::  NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA[k1i*i+li][k2j*j+lj][k3n*n+ln][k4m*m+lm]
-      integer, parameter ::  k1i=1,li=0
-      integer, parameter ::  k2j=2,lj=0
-      integer, parameter ::  k3n=3,ln=0
-      integer, parameter ::  k4m=4,lm=0
-c     parameters for REALIGN arrB[i][j][n][m] WITH arrA[kr1i*i+lri][kr2j*j+lrj][kr3n*n+lrn][kr4m*m+lrm]
-      integer, parameter ::  kr1i=1,lri=1
-      integer, parameter ::  kr2j=1,lrj=2
-      integer, parameter ::  kr3n=1,lrn=3
-      integer, parameter ::  kr4m=1,lrm=4
-
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer :: s=0,cs,erria=ER, errib=ER,
-     >           i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-
-      character(10) :: tname='realign443'
-
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)
-!dvm$ DYNAMIC B4
-
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-
-!dvm$ region  out(A4,B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) = 5     
-                enddo
-             enddo
-          enddo 
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(ib,jb, nb, mb)
-      do i=1,AN1
-         do j=1,AN2
-            do n=1,AN3
-               do m=1,AN4
-                  A4(i,j,n,m) = i*NL/10+j*NL/100+n*NL/1000+m+1
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) * k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k4m) * k4m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((m-lm)/k4m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  .and.
-     *                  (((m-lm)/k4m) .le. BN4)
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        mb = (m-lm)/k4m
-                        B4(ib,jb,nb,mb)=B4(ib,jb,nb,mb)+
-     *                               ib*NL/10+jb*NL/100+nb*NL/1000+mb 
-                      endif 
-                enddo
-             enddo
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B4(i,j,n,m)
-!dvm$*   WITH A4(kr1i*i+lri,kr2j*j+lrj,kr3n*n+lrn,kr4m*m+lrm)
-
-!dvm$ actual(erria, errib, s)
-
-!dvm$ region
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m),
-!dvm$*         reduction(min(erria),min(errib),sum(s)),
-!dvm$*         private(ia,ja, na, ma)
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                  s = s + B4(i,j,n,m)
-                  if (B4(i,j,n,m)/= (i*NL/10+j*NL/100+n*NL/1000+m+5))
-     *            then     
-                    errib = min(errib,i*NL/10+j*NL/100+n*NL/1000+m)
-                  endif
-                  ia=kr1i*i+lri
-                  ja=kr2j*j+lrj
-                  na=kr3n*n+lrn
-                  ma=kr4m*m+lrm
-                  if (A4(ia,ja,na,ma) /=
-     *               (ia*NL/10+ja*NL/100+na*NL/1000+ma+1)) then     
-                      erria = min(erria,i*NL/10+j*NL/100+n*NL/1000+m)
-                  endif
-                enddo
-            enddo
-          enddo 
-      enddo
-!dvm$ end region
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000 + m + 5
-                enddo
-            enddo
-          enddo
-      enddo
-     
-!dvm$ get_actual(erria, errib, s)
-
-      if ((erria == ER) .and. (errib == ER) .and.
-     *     (s == cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B4,A4)
-
-      end
-
-C ----------------------------------------------------realign444
-c 444 ALIGN arrB[i][j][n][m] WITH arrA[m][i+1][j][2*n] 
-c     REALIGN arrB[i][j][n][m] WITH arrA[i+2][3*j-2][2*n-2][m+1]  
-
-      subroutine realign444
-      integer, parameter ::  AN1=12,AN2=15,AN3=16,AN4=10
-      integer, parameter ::  BN1=4,BN2=4,BN3=5,BN4=3
-      integer, parameter ::  NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA4(k4m*m+lm,k1i*i+li,k2j*j+lj,k3n*n+ln)
-      integer, parameter ::  k1i=1, li=1
-      integer, parameter ::  k2j=1, lj=0
-      integer, parameter ::  k3n=2, ln=0
-      integer, parameter ::  k4m=1, lm=0
-c     parameters for REALIGN arrB[i][j][n][m] WITH arrA(kr1i*i+lri,kr2j*j+lrj,k3n*n+lrn,kr4m*m+lrm)
-      integer, parameter ::  kr1i=1, lri=2
-      integer, parameter ::  kr2j=3, lrj=-2
-      integer, parameter ::  kr3n=2, lrn=-1
-      integer, parameter ::  kr4m=1, lrm=1
-
-      integer, allocatable :: A4(:,:,:,:),B4(:,:,:,:)
-      integer :: s=0,cs,erria=ER, errib=ER,
-     >           i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb
-      character(10) :: tname='realign444'
-               
-!dvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ ALIGN B4(i,j,n,m) WITH A4(k4m*m+lm,k1i*i+li,k2j*j+lj,k3n*n+ln)
-!dvm$ DYNAMIC B4
-
-      allocate (A4(AN1,AN2,AN3,AN4),B4(BN1,BN2,BN3,BN4))
-
-!dvm$ region inout(A4, B4)
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m)
-      do i=1,BN1
-          do j=1,BN2
-             do n=1,BN3
-                do m=1,BN4
-                    B4(i,j,n,m) = 4     
-                enddo
-             enddo
-          enddo 
-      enddo
-
-!dvm$ parallel (i,j,n,m) on A4(i,j,n,m), private(ib, jb, nb, mb)
-      do i=1,AN1
-          do j=1,AN2
-            do n=1,AN3
-              do m=1,AN4
-                A4(i,j,n,m) = 10+i*NL/10+j*NL/100+n*NL/1000+m
-                  if ( 
-     *               ((i-lm) == (((i-lm)/k4m) * k4m)) .and.
-     *               ((j-li) == (((j-li)/k1i) * k1i)) .and.
-     *               ((n-lj) == (((n-lj)/k2j) * k2j)) .and.
-     *               ((m-ln) == (((m-ln)/k3n) * k3n)) .and.
-     *               (((i-lm)/k4m) > 0) .and.
-     *               (((j-li)/k1i) > 0) .and.
-     *               (((n-lj)/k2j) > 0) .and.
-     *               (((m-ln)/k3n) > 0) .and.
-     *               (((i-lm)/k4m) <= BN4) .and.
-     *               (((j-li)/k1i) <= BN1) .and.
-     *               (((n-lj)/k2j) <= BN2) .and.
-     *               (((m-ln)/k3n) <= BN3) 
-     *               ) then
-                        ib = (j-li)/k1i
-                        jb = (n-lj)/k2j
-                        nb = (m-ln)/k3n
-                        mb = (i-lm)/k4m
-                        B4(ib,jb,nb,mb) = B4(ib,jb,nb,mb) +
-     *                          ib*NL/10+jb*NL/100+nb*NL/1000+mb;
-                      endif
-                enddo
-             enddo
-          enddo 
-      enddo
-!dvm$ end region
-
-!dvm$ REALIGN B4(i,j,n,m)
-!dvm$*        WITH A4(kr1i*i+lri,kr2j*j+lrj,kr3n*n+lrn,kr4m*m+lrm)
-
-!dvm$ actual(erria, errib, s)
-
-!dvm$ region
-
-!dvm$ parallel (i,j,n,m) on B4(i,j,n,m), 
-!dvm$*         reduction(min(erria),min(errib),sum(s)),
-!dvm$*         private(ia,ja,na,ma)
-      do i=1,BN1
-        do j=1,BN2
-          do n=1,BN3
-            do m=1,BN4
-                s = s + B4(i,j,n,m)
-                if (B4(i,j,n,m) /= (i*NL/10+j*NL/100+n*NL/1000+m+4))then     
-                   errib = min(errib,i*NL/10 + j*NL/100+ n*NL/1000 + m)
-                endif
-                ia=kr1i*i+lri;
-                ja=kr2j*j+lrj;
-                na=kr3n*n+lrn;
-                ma=kr4m*m+lrm;
-                if (A4(ia,ja,na,ma) /=
-     *             (ia*NL/10+ja*NL/100+na*NL/1000+ma+10))then     
-                    erria = min(erria,i*NL/10 + j*NL/100+ n*NL/1000+ m)
-                endif
-              enddo
-          enddo
-        enddo 
-      enddo
-!dvm$ end region
-  
-      cs = 0              
-      do i=1,BN1
-          do j=1,BN2
-            do n=1,BN3
-                do m=1,BN4
-                    cs = cs + i*NL/10 + j*NL/100+ n*NL/1000+ m + 4
-                enddo
-            enddo
-          enddo
-      enddo
-     
-!dvm$ get_actual(erria, errib, s)
-
-      if ((erria == ER) .and. (errib == ER) .and.
-     *     (s == cs)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      deallocate (B4,A4)
-
-      end
-
-C -------------------------------------------------
-      subroutine ansyes(name)
-      character(*) name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character(*) name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red11.fdv
deleted file mode 100644
index edb8b90..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red11.fdv
+++ /dev/null
@@ -1,929 +0,0 @@
-      program RED11
-
-c    TESTING OF THE REDUCTION CLAUSE .       
-c    REDUCTION OPERATION : SUM.PRODUCT,MAX,MIN,AND,OR, EQV,
-C    NEQV,MAXLOC,MINLOC AND THEIR COMBINATION ARE EXECUTED
-c    FOR DISTRIBUTED ARRAY A(N). 
-
-      print *,'===START OF RED11========================'
-C --------------------------------------------------
-      call red1101
-C --------------------------------------------------
-      call red1102
-C --------------------------------------------------
-      call red1103
-C -------------------------------------------------
-      call red1104
-C -------------------------------------------------
-      call red1105
-C -------------------------------------------------
-      call red1106
-C --------------------------------------------------
-      call red1107
-C --------------------------------------------------
-      call red1108
-C --------------------------------------------------
-       call red1109
-C -------------------------------------------------
-      call red1110
-C -------------------------------------------------
-      call red1111
-C -------------------------------------------------
-      call red1112
-C ------------------------------------------------- 
-      call red1113
-C --------------------------------------------------
-      call red1114
-C --------------------------------------------------
-      call red1115
-C -------------------------------------------------
-      call red1116
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF RED11 ========================= '    
-      end
-
-C ----------------------------------------------------RED1101
-      subroutine RED1101
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer isum1,isumt1 
-                 
-!dvm$ distribute A(BLOCK)    
-
-      tname='RED1101'
-      allocate (A(N),C(N))
-      NNL=NL 
-      NN=N
-      call sersum1(C,NN,NNL,isum1)
-      isumt1 = 0
-
-!dvm$ actual(isumt1)
-!dvm$ region local(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( sum( isumt1 ) )
-      do i=1,N
-         isumt1 = isumt1+A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1) 
-     
-      if (isum1 .eq.isumt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED1102
-      subroutine RED1102
-      integer, parameter :: N = 16 ,NL=1002
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer iprod1,iprodt1 
-                       
-!dvm$ distribute A(BLOCK)  
-      
-      tname='RED1102'
-      allocate (A(N),C(N))
-      NNL=NL
-      NN=N
-      call serprod1(C,NN,NNL,iprod1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( product( iprodt1 ) )
-      do i=1,N
-         iprodt1 = iprodt1*A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED1103
-      subroutine RED1103
-      integer, parameter :: N = 16,NL=1003
-      character*7 tname
-      integer, allocatable :: A(:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(BLOCK)  
-
-      tname='RED1103'
-      allocate (A(N))
-     
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-      ni=N/2
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-!dvm$ actual(imaxt1,A)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( max( imaxt1 ) )
-      do i=2,N
-         if (A(i).GT.imaxt1) imaxt1=A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A)
-      
-      end
-    
-C ----------------------------------------------------RED1104
-      subroutine RED1104
-      integer, parameter :: N = 16,NL=1004
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(BLOCK)    
-
-      tname='RED1104'
-      allocate (A(N),C(N))
- 
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-      ni=N/2
-      A(ni)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-
-!dvm$ actual(imint1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( min( imint1 ) )
-      do i=2,N
-         if (A(i).LT.imint1) imint1=A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1) 
-
-      if (imin1 .eq.imint1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif  
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED1105
-      subroutine RED1105
-      integer, parameter :: N = 16
-      real, parameter :: NL=1005
-      character*7 tname
-      real, allocatable :: A(:),C(:)
-      integer ni
-      real imax1,imaxt1                  
-!dvm$ distribute A(BLOCK)    
-
-      tname='RED1105'
-      allocate (A(N),C(N))
-     
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-      ni=N/2
-      A(ni)=N+1.+NL
-      imax1=N+1.+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( max( imaxt1 ) )
-      do i=2,N
-         if (A(i).GT.imaxt1) imaxt1=A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-                    
-C -----------------------------------------------------RED1106
-      subroutine RED1106
-      integer, parameter :: N = 8 ,NL=1.
-      character*7 tname
-      real, allocatable :: A(:),C(:)
-      real iprod1,iprodt1 
-      real NNl
-                 
-!dvm$ distribute A(BLOCK)    
-      
-      tname='RED1106'
-      allocate (A(N),C(N))
-      NNL=NL
-      NN=N 
-      call serprodr1(C,NN,NNL,iprod1)
-      iprodt1 = 1.
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( product( iprodt1 ) )
-      do i=1,N
-         iprodt1 = iprodt1*A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
-
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED1107
-      subroutine RED1107
-      integer, parameter :: N = 16
-      character*7 tname
-      logical, allocatable :: A(:),C(:)
-      logical land1,landt1,leqv1,lneqv1,lor1
-
-!dvm$ distribute A(BLOCK)   
-
-      tname='RED1107'
-      allocate (A(N),C(N))
-      NN=N            
-      call serlog1(C,NN,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i) on A(i)
-      do i=1,N,2
-         A(i) = .true.
-      enddo
-
-!dvm$ parallel (i) on A(i+1)
-      do i=1,N-1,2        
-         A(i+1)=.false.
-      enddo
-
-!dvm$ remote_access (A(1))
-      landt1 = A(1)
-
-!dvm$ actual(landt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( AND( landt1 ) )
-      do i=2,N
-         landt1 = landt1 .and.A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(landt1) 
-      
-      if (land1 .eqv.landt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED1108
-      subroutine RED1108
-      integer, parameter :: N = 16
-      character*7 tname
-      logical, allocatable :: A(:),C(:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1
-
-!dvm$ distribute A(BLOCK) 
-
-      tname='RED1108'
-      allocate (A(N),C(N))
-      NN=N
-      call serlog1(C,NN,land1,lor1,leqv1,lneqv1)
-               
-!dvm$ parallel (i) on A(i)
-      do i=1,N,2
-         A(i) = .true.
-      enddo
-
-!dvm$ parallel (i) on A(i)
-      do i=2,N,2
-         A(i)=.false.
-      enddo
-
-!dvm$ remote_access (A(1))
-      lort1 = A(1)
-
-!dvm$ actual(lort1)
-!dvm$ region
-!dvm$ parallel (i) on A(i),reduction( OR( lort1 ) )
-      do i=2,N
-         lort1 = lort1 .or.A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lort1) 
-
-      if (lor1 .eqv.lort1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED1109
-      subroutine RED1109
-      integer, parameter :: N = 16
-      character*7 tname
-      logical, allocatable :: A(:),C(:)
-      logical land1,landt1,lor1,lort1,leqv1,leqvt1,lneqv1
-
-!dvm$ distribute A(BLOCK)    
-
-      tname='RED1109'
-      allocate (A(N),C(N))
-      NN=N
-      call serlog1(C,NN,land1,lor1,leqv1,lneqv1)
-               
-!dvm$ parallel (i) on A(i)
-      do i=1,N,2
-         A(i) = .true.
-      enddo
-
-!dvm$ parallel (i) on A(i)
-      do i=2,N,2
-         A(i)=.false.
-      enddo
-
-!dvm$ remote_access (A(1))
-       leqvt1 = A(1)
-
-!dvm$ actual(leqvt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( EQV( leqvt1 ) )
-      do i=2,N
-         leqvt1 = leqvt1 .eqv.A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(leqvt1) 
-
-      if (leqv1 .eqv.leqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED1110
-      subroutine RED1110
-      integer, parameter :: N = 8
-      character*7 tname
-      logical, allocatable :: A(:),C(:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1,lneqvt1
-
-!dvm$ distribute A(BLOCK)    
-
-      tname='RED1110'
-      allocate (A(N),C(N))
-      NN=N
-      call serlog1(C,NN,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i) on A(i)
-      do i=1,N,2
-         A(i) = .true.
-      enddo
-
-!dvm$ parallel (i) on A(i)
-      do i=2,N,2
-         A(i)=.false.
-      enddo
-
-!dvm$ remote_access (A(1))
-      lneqvt1 = A(1)
-
-!dvm$ actual(lneqvt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( NEQV( lneqvt1 ) )
-      do i=2,N
-         lneqvt1 = lneqvt1 .neqv.A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lneqvt1) 
-
-      if (lneqv1 .eqv.lneqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-
-C ----------------------------------------------------RED1111
-      subroutine RED1111
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin
-                      
-!dvm$ distribute A(BLOCK)    
-
-      tname='RED1111'
-      allocate (A(N),C(N))
-     
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-      ni=N/2+2
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)   
-      it1=0
-
-!dvm$ actual(imaxt1,it1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( maxloc( imaxt1,it1,1 ) )
-      do i=2,N
-         if (A(i).GT.imaxt1)then
-         imaxt1=A(i)
-         it1=i
-         endif
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,it1) 
-
-      if ((imax1 .eq.imaxt1) .and. (it1.eq.ni)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-    
-C ----------------------------------------------------RED1112
-      subroutine RED1112
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin,imint1
-                      
-!dvm$ distribute A(BLOCK)   
-
-      tname='RED1112'
-      allocate (A(N),C(N))
-     
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-      ni=N/2
-      A(ni)=-(N+1+NL)
-      imin1=-(N+1+NL)
-!dvm$ remote_access (A(1))
-      imint1=A(1)        
-      it1=0
-
-!dvm$ actual(imint1,it1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( minloc( imint1,it1,1 ) )
-      do i=2,N
-         if (A(i).LT.imint1)then
-         imint1=A(i)
-         it1=i
-         endif
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,it1) 
-
-      if ((imin1 .eq.imint1) .and. (it1.eq.ni)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-
-C ----------------------------------------------------RED1113
-      subroutine RED1113
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer isum1,isumt1 
-      integer imax1,imaxt1 ,ni,imin1,imint1
-                 
-!dvm$ distribute A(BLOCK)    
-
-      tname='RED1113'
-      allocate (A(N),C(N))
-      NNL=NL 
-      NN=N
-      call sersum1m(C,NN,NNL,isum1)
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2-1
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      ni=N/2
-      A(ni)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-      isumt1 = 0
-
-!dvm$ actual(imint1,imaxt1,isumt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( sum( isumt1 ),
-!dvm$*max( imaxt1 ),min( imint1 ) )
-      do i=1,N
-         isumt1 = isumt1+A(i)
-         if (A(i).GT.imaxt1) imaxt1=A(i)
-         if (A(i).LT.imint1) imint1=A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,imaxt1,isumt1) 
-
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-       else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-C -----------------------------------------------------RED1114
-      subroutine RED1114
-      integer, parameter :: N = 16 ,NL=1
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:),CL(:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-                 
-!dvm$ distribute A(BLOCK)   
-!dvm$ align B(I) with A(I)
-      
-      tname='RED1114'
-      allocate (A(N),C(N))
-      allocate (B(N),CL(N))
-      NNL=NL
-      NN=N
-      call serprod1(C,NN,NNL,iprod1)
-      call serlog1(CL,NN,land1,lor1,leqv1,lneqv1)  
-               
-!dvm$ parallel (i) on B(i)
-      do i=1,N,2
-         B(i) = .true.        
-      enddo
-
-!dvm$ parallel (i) on B(i+1)
-      do i=1,N-1,2         
-         B(i+1)=.false.
-      enddo
-
-!dvm$ remote_access (B(1))
-      landt1 = B(1)
-      iprodt1 = 1
-
-
-!dvm$ actual(iprodt1,landt1)
-!dvm$ region local(A)
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( product( iprodt1 ),
-!dvm$* and(landt1))
-      do i=1,N
-         iprodt1 = iprodt1*A(i)
-         if (i.eq.1) then 
-!         landt1=B(1)
-         else
-         landt1 = landt1 .and.B(i)
-         endif
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1,landt1) 
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,CL)
-      deallocate (A,C)
- 
-      end
-
-
-C ----------------------------------------------------RED1115
-      subroutine RED1115
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin1,imint1,it1,it2
-      integer imaxloct1,iminloct1          
-
-!dvm$ distribute A(BLOCK)    
-
-      tname='RED1115'
-      allocate (A(N),C(N))
-      
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2-1
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-      imaxloct1=imaxt1
-      ni1=N/2
-      A(ni1)=-(N+1+NL)
-      imin1=-(N+1+NL)
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-      iminloct1=imint1
-      it1=0
-      it2=0
-
-!dvm$ actual(imaxloct1,it1,iminloct1,it2)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( max( imaxt1 ),
-!dvm$*maxloc( imaxloct1,it1,1 ),minloc( iminloct1,it2,1 ) )
-      do i=1,N
-         if (A(i).GT.imaxt1) imaxt1 =A(i)
-         if (A(i).GT.imaxloct1) then
-         imaxloct1=A(i)
-         it1=i
-         endif
-         if (A(i).LT.iminloct1) then
-         iminloct1=A(i)
-         it2=i
-         endif
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxloct1,it1,iminloct1,it2) 
-
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-c      print *,it1,it2,ni,ni1
-
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(imaxt1.eq.imaxloct1).and.(it1.eq.ni)
-     *.and.(it2.eq.ni1) )   then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------RED1116
-      subroutine RED1116
-      integer, parameter :: N = 16
-      real, parameter :: NL=1000.
-      character*7 tname
-      real, allocatable :: A(:),C(:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer it1,it2,ni,ni1          
-!dvm$ distribute A(BLOCK)    
-
-      tname='RED1116'
-      allocate (A(N),C(N))
-      NNL=NL
-      NN=N 
-      call sersum1mr(C,NN,NNL,isum1)
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2-1
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2
-      A(ni1)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      it1=0
-      it2=0
-
-
-!dvm$ actual(isumt1,imaxloct1,it1,iminloct1,it2)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( sum( isumt1 ),
-!dvm$*maxloc( imaxloct1,it1,1 ),minloc( iminloct1,it2,1 ) )
-      do i=1,N
-         isumt1 = isumt1+A(i)
-         if (A(i).GT.imaxloct1) then
-         imaxloct1=A(i)
-         it1=i
-         endif
-         
-         if (A(i).LT.iminloct1) then
-         iminloct1=A(i)
-         it2=i
-         endif     
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxloct1,it1,iminloct1,it2) 
-
-c      print *,A
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-c      print *,it1,it2,ni,ni1
-c      print *,isum1,isumt1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(it1.eq.ni)
-     *.and.(it2.eq.ni1) )   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-C -----------------------------------------------------
-
-      subroutine sersum1(AR,N,NL,S)
-      integer AR(N)
-      integer S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      S=0
-      do i=1,N
-         s = s+ AR(i)
-      enddo
-      end   
-   
-   
-      subroutine sersum1m(AR,N,NL,S)
-      integer AR(N)
-      integer S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      ni=N/2-1
-      AR(ni)=N+1+NL
-      ni=N/2
-      AR(ni)=-(N+1+NL)
-      S=0
-      do i=1,N
-         s = s+ AR(i)
-      enddo
-      end   
-
-      subroutine sersum1mr(AR,N,NL,S)
-      real AR(N)
-      real S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      ni=N/2-1
-      AR(ni)=N+1+NL
-      ni=N/2
-      AR(ni)=-(N+1+NL)
-      S=0.
-      do i=1,N
-         S = S+ AR(i)
-      enddo
-      end  
-  
-      subroutine serprod1(AR,N,NL,P)
-      integer AR(N)
-      integer P,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      P=1
-      do i=1,N
-         P = P* AR(i)
-      enddo
-      end   
- 
-      subroutine serprodr1(AR,N,NL,P)
-      real AR(N)
-      real P,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      P=1.
-      do i=1,N
-         P = P* AR(i)
-      enddo
-      end
-     
-      subroutine serlog1(AR,N,LAND,LOR,LEQV,LNEQV)
-      logical AR(N)
-      logical LAND,LOR,LEQV,LNEQV
-      do i=1,N,2
-         AR(i) = .true.
-         AR(i+1)=.false.          
-      enddo
-      LAND=AR(1)
-      LOR=AR(1)
-c      LEQV=.true.
-c      LNEQV=.false.
-       LEQV=AR(1)
-       LNEQV=AR(1)
-      do i=2,N
-         LAND = LAND .and. AR(i)
-         LOR = LOR .or.AR(i)
-      enddo
-      do i=2,N
-         LEQV = LEQV .eqv. AR(i)
-      enddo
-      do i=2,N
-         LNEQV = LNEQV .neqv. AR(i)
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red12.fdv
deleted file mode 100644
index 67164a1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red12.fdv
+++ /dev/null
@@ -1,941 +0,0 @@
-      program RED12
-
-c    TESTING OF THE REDUCTION CLAUSE .       
-c    REDUCTION OPERATION : SUM.PRODUCT,MAX,MIN,AND,OR, EQV,
-C    NEQV,MAXLOC,MINLOC AND THEIR COMBINATION ARE EXECUTED
-c    FOR DISTRIBUTED ARRAY A(N). 
-
-      print *,'===START OF RED12========================'
-C --------------------------------------------------
-      call red1201
-C --------------------------------------------------
-      call red1202
-C --------------------------------------------------
-      call red1203
-C -------------------------------------------------
-      call red1204
-C -------------------------------------------------
-      call red1205
-C -------------------------------------------------
-      call red1206
-C --------------------------------------------------
-      call red1207
-C --------------------------------------------------
-      call red1208
-C --------------------------------------------------
-      call red1209
-C -------------------------------------------------
-      call red1210
-C -------------------------------------------------
-      call red1211
-C -------------------------------------------------
-      call red1212
-C ------------------------------------------------- 
-      call red1213
-C --------------------------------------------------
-      call red1214
-C --------------------------------------------------
-      call red1215
-C -------------------------------------------------
-      call red1216
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF RED12 ========================= '    
-      end
-
-C ----------------------------------------------------RED1201
-      subroutine RED1201
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer isum1,isumt1 
-      
-!dvm$ distribute A(*)   
-
-      tname='RED1201'
-      allocate (A(N),C(N))
-      NNL=NL 
-      NN=N
-      call sersum1(C,NN,NNL,isum1)
-      isumt1 = 0
-
-!dvm$ actual(isumt1)
-!dvm$ region local(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( sum( isumt1 ) )
-      do i=1,N
-         isumt1 = isumt1+A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1) 
-     
-      if (isum1 .eq.isumt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED1202
-      subroutine RED1202
-      integer, parameter :: N = 16, NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer iprod1,iprodt1 
-                 
-!dvm$ distribute A(*)    
-      
-      tname='RED1202'
-      allocate (A(N),C(N))
-      NNL=NL
-      NN=N
-      call serprod1(C,NN,NNL,iprod1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( product( iprodt1 ) )
-      do i=1,N
-         iprodt1 = iprodt1*A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED1203
-      subroutine RED1203
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(*)     
-
-      tname='RED1203'
-      allocate (A(N),C(N))
-     
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( max( imaxt1 ) )
-      do i=2,N
-         if (A(i).GT.imaxt1) imaxt1=A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-    
-C ----------------------------------------------------RED1204
-      subroutine RED1204
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(*)     
-
-      tname='RED1204'
-      allocate (A(N),C(N))
- 
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2
-      A(ni)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-
-!dvm$ actual(imint1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( min( imint1 ) )
-      do i=2,N
-         if (A(i).LT.imint1) imint1=A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1) 
-
-      if (imin1 .eq.imint1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED1205
-      subroutine RED1205
-      integer, parameter :: N = 16
-      real, parameter :: NL=1000.
-      character*7 tname
-      real, allocatable :: A(:),C(:)
-      integer ni
-      real imax1,imaxt1                  
-!dvm$ distribute A(*)     
-
-      tname='RED1205'
-      allocate (A(N),C(N))
-     
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2
-      A(ni)=N+1.+NL
-      imax1=N+1.+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( max( imaxt1 ) )
-      do i=2,N
-         if (A(i).GT.imaxt1) imaxt1=A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-                    
-C -----------------------------------------------------RED1206
-      subroutine RED1206
-      integer, parameter :: N = 8
-      real, parameter :: NL=1.
-      character*7 tname
-      real, allocatable :: A(:),C(:)
-      real iprod1,iprodt1 
-      real NNl
-                 
-!dvm$ distribute A(*)     
-
-      tname='RED1206'
-      allocate (A(N),C(N))
-      NNL=NL
-      NN=N
-      call serprodr1(C,NN,NNL,iprod1)
-      iprodt1 = 1.
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( product( iprodt1 ) )
-      do i=1,N
-         iprodt1 = iprodt1*A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-
-C -----------------------------------------------------RED1207
-      subroutine RED1207
-      integer, parameter :: N = 16
-      character*7 tname
-      logical, allocatable :: A(:),C(:)
-      logical land1,landt1,leqv1,lneqv1,lor1
-
-!dvm$ distribute A(*)     
-
-      tname='RED1207'
-      allocate (A(N),C(N))
-      NN=N     
-      call serlog1(C,NN,land1,lor1,leqv1,lneqv1)
-                                    
-               
-!dvm$ parallel (i) on A(i)
-      do i=1,N,2
-         A(i) = .true.
-      enddo
-
-!dvm$ parallel (i) on A(i+1)
-      do i=1,N-1,2
-         A(i+1)=.false.
-      enddo
-
-!dvm$ remote_access (A(1))
-      landt1 = A(1)
-
-!dvm$ actual(landt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( AND( landt1 ) )
-      do i=2,N
-         landt1 = landt1 .and.A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(landt1) 
-      
-
-      if (land1 .eqv.landt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED1208
-      subroutine RED1208
-      integer, parameter :: N = 16
-      character*7 tname
-      logical, allocatable :: A(:),C(:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1
-
-!dvm$ distribute A(*)     
-
-      tname='RED1208'
-      allocate (A(N),C(N))
-      NN=N
-      call serlog1(C,NN,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i) on A(i)
-      do i=1,N,2
-         A(i) = .true.
-      enddo
-
-!dvm$ parallel (i) on A(i+1)
-      do i=1,N-1,2
-         A(i+1)=.false.
-      enddo
-
-!dvm$ remote_access (A(1))
-      lort1 = A(1)
-
-!dvm$ actual(lort1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( OR( lort1 ) )
-      do i=2,N
-         lort1 = lort1 .or.A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lort1) 
-      
-      if (lor1 .eqv.lort1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED1209
-      subroutine RED1209
-      integer, parameter :: N = 16     
-      character*7 tname
-      logical, allocatable :: A(:),C(:)
-      logical land1,landt1,lor1,leqv1,leqvt1,lneqv1
-
-!dvm$ distribute A(*)     
-
-      tname='RED1209'
-      allocate (A(N),C(N))
-      NN=N
-      call serlog1(C,NN,land1,lor1,leqv1,lneqv1)
-               
-!dvm$ parallel (i) on A(i)
-      do i=1,N,2
-         A(i) = .true.
-      enddo
-
-!dvm$ parallel (i) on A(i+1)
-      do i=1,N-1,2
-         A(i+1)=.false.
-      enddo
-
-!dvm$ remote_access (A(1))
-      leqvt1 = A(1)
-
-!dvm$ actual(leqvt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( EQV( leqvt1 ) )
-      do i=2,N
-         leqvt1 = leqvt1 .eqv.A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(leqvt1) 
-
-      if (leqv1 .eqv.leqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif  
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED1210
-      subroutine RED1210
-      integer, parameter :: N = 16
-      character*7 tname
-      logical, allocatable :: A(:),C(:)
-      logical land1,landt1,lor1,leqv1,lneqv1,lneqvt1
-
-!dvm$ distribute A(*)    
-
-      tname='RED1210'
-      allocate (A(N),C(N))
-      NN=N
-      call serlog1(C,NN,land1,lor1,leqv1,lneqv1)
-               
-!dvm$ parallel (i) on A(i)
-      do i=1,N,2
-         A(i) = .true.
-      enddo
-
-!dvm$ parallel (i) on A(i+1)
-      do i=1,N-1,2
-         A(i+1)=.false.
-      enddo
-
-!dvm$ remote_access (A(1))
-      lneqvt1 = A(1)
-
-!dvm$ actual(lneqvt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( NEQV( lneqvt1 ) )
-      do i=2,N
-         lneqvt1 = lneqvt1 .neqv.A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lneqvt1) 
-
-      if (lneqv1 .eqv.lneqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-
-C ----------------------------------------------------RED1211
-
-      subroutine RED1211
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin,lit
-                       
-!dvm$ distribute A(*)     
-
-      tname='RED1211'
-      allocate (A(N),C(N))
-     
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-      ni=N/2
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      lit=1
-      it1=0
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( maxloc( imaxt1,it1,1 ) )
-      do i=2,N
-         if (A(i).GT.imaxt1)then
-         imaxt1=A(i)
-         it1=i
-         endif
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,it1,lit) 
-
-      if ((imax1 .eq.imaxt1) .and. (it1.eq.ni)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)      
-
-      end
-    
- 
-C ----------------------------------------------------RED1212
-      subroutine RED1212
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin,lit
-                       
-!dvm$ distribute A(*)     
-
-      tname='RED1212'
-      allocate (A(N),C(N))
-     
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-      ni=N/2
-      A(ni)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))
-      imint1=A(1)  
-
-      lit=1
-      it1=0
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( minloc( imint1,it1,1 ) )
-      do i=2,N
-         if (A(i).LT.imint1)then
-         imint1=A(i)
-         it1=i
-         endif
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,it1,lit) 
-
-      if ((imin1 .eq.imint1) .and. (it1.eq.ni)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)      
-
-      end
-
-
-C ----------------------------------------------------RED1213
-      subroutine RED1213
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer isum1,isumt1 
-      integer imax1,imaxt1 ,ni,imin1,imint1
-                 
-!dvm$ distribute A(*)     
-
-      tname='RED1213'
-      allocate (A(N),C(N))
-      NNL=NL 
-      NN=N
-      call sersum1m(C,NN,NNL,isum1)
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2-1
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      ni=N/2
-      A(ni)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-  
-      isumt1 = 0
-
-!dvm$ actual(isumt1,imaxt1, imint1)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( sum( isumt1 ),
-!dvm$*max( imaxt1 ),min( imint1 ) )
-      do i=1,N
-         isumt1 = isumt1+A(i)
-         if (A(i).GT.imaxt1) imaxt1=A(i)
-         if (A(i).LT.imint1) imint1=A(i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxt1, imint1)
-
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-C -----------------------------------------------------RED1214
-      subroutine RED1214
-      integer, parameter :: N = 16 ,NL=1
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:),CL(:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-                 
-!dvm$ distribute A(*)     
-!dvm$ align B(I) with A(I)
-      
-      tname='RED1214'
-      allocate (A(N),C(N))
-      allocate (B(N),CL(N))
-      NNL=NL
-      NN=N
-      call serprod1(C,NN,NNL,iprod1)
-      call serlog1(CL,NN,land1,lor1,leqv1,lneqv1)  
-               
-!dvm$ parallel (i) on B(i)
-      do i=1,N,2
-         B(i) = .true.
-      enddo
-
-!dvm$ parallel (i) on B(i+1)
-      do i=1,N-1,2
-         B(i+1)=.false.
-      enddo
-
-!dvm$ remote_access (B(1))
-      landt1 = B(1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1,landt1)
-!dvm$ region local(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-!dvm$ parallel (i) on A(i), reduction( product( iprodt1 ),
-!dvm$* and(landt1))
-      do i=1,N
-         iprodt1 = iprodt1*A(i)
-         if (i.eq.1) then 
-!         landt1=B(1)
-         else
-         landt1 = landt1 .and.B(i)
-         endif
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1,landt1)
-
- 
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,CL)
-      deallocate (A,C)
- 
-      end
-
-
-C ----------------------------------------------------RED1215
-      subroutine RED1215
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin1,imint1,it1,it2
-      integer imaxloct1,iminloct1,lit          
-!dvm$ distribute A(*)     
-
-      tname='RED1215'
-      allocate (A(N),C(N))
-      
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2-1
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2
-      A(ni1)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-
-      iminloct1=imint1
-      lit=1
-      it1=0
-      it2=0
-
-!dvm$ actual(imaxt1,imaxloct1,it1,lit,iminloct1,it2,lit)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( max( imaxt1 ),
-!dvm$*maxloc( imaxloct1,it1,1 ),minloc( iminloct1,it2,1 ) )
-      do i=1,N
-         if (A(i).GT.imaxt1) imaxt1 =A(i)
-         if (A(i).GT.imaxloct1) then
-         imaxloct1=A(i)
-         it1=i
-         endif
-         if (A(i).LT.iminloct1) then
-         iminloct1=A(i)
-         it2=i
-         endif
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,imaxloct1,it1,iminloct1,it2) 
-
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(imaxt1.eq.imaxloct1).and.(it1.eq.ni)
-     *.and.(it2.eq.ni1) )   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------RED1216
-      subroutine RED1216
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname
-      real, allocatable :: A(:),C(:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer it1,it2,ni,ni1,lit
-          
-!dvm$ distribute A(*)     
-
-      tname='RED1216'
-      allocate (A(N),C(N))
-      NNL=NL
-      NN=N 
-      call sersum1mr(C,NN,NNL,isum1)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2-1
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2
-      A(ni1)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lit=1
-      it1=0
-      it2=0
-
-!dvm$ actual(isumt1,imaxloct1,it1,lit,iminloct1,it2)
-!dvm$ region
-!dvm$ parallel (i) on A(i), reduction( sum( isumt1 ),
-!dvm$*maxloc( imaxloct1,it1,1 ),minloc( iminloct1,it2,1 ) )
-      do i=1,N
-         isumt1 = isumt1+A(i)
-         if (A(i).GT.imaxloct1) then
-         imaxloct1=A(i)
-         it1=i
-         endif
-         if (A(i).LT.iminloct1) then
-         iminloct1=A(i)
-         it2=i
-         endif
-     
-
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxloct1,it1,iminloct1,it2) 
-         
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(it1.eq.ni)
-     *.and.(it2.eq.ni1) )   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-C -----------------------------------------------------
-
-      subroutine sersum1(AR,N,NL,S)
-      integer AR(N)
-      integer S,NL
-
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      S=0
-      do i=1,N
-         s = s+ AR(i)
-      enddo
-      end   
-   
-      subroutine sersum1m(AR,N,NL,S)
-      integer AR(N)
-      integer S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      ni=N/2-1
-      AR(ni)=N+1+NL
-      ni=N/2
-      AR(ni)=-(N+1+NL)
-      S=0
-      do i=1,N
-         s = s+ AR(i)
-      enddo
-      end   
-
-      subroutine sersum1mr(AR,N,NL,S)
-      real AR(N)
-      real S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      ni=N/2-1
-      AR(ni)=N+1+NL
-      ni=N/2
-      AR(ni)=-(N+1+NL)
-      S=0.
-      do i=1,N
-         S = S+ AR(i)
-      enddo
-      end  
-  
-      subroutine serprod1(AR,N,NL,P)
-      integer AR(N)
-      integer P,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      P=1
-      do i=1,N
-         P = P* AR(i)
-      enddo
-      end   
- 
-      subroutine serprodr1(AR,N,NL,P)
-      real AR(N)
-      real P,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      P=1.
-      do i=1,N
-         P = P* AR(i)
-      enddo
-      end
-     
-      subroutine serlog1(AR,N,LAND,LOR,LEQV,LNEQV)
-      logical AR(N)
-      logical LAND,LOR,LEQV,LNEQV
-      do i=1,N,2
-         AR(i) = .true.
-         AR(i+1)=.false.          
-      enddo
-      LAND=AR(1)
-      LOR=AR(1)
-C      LEQV=.true.
-C      LNEQV=.false.
-       LEQV=AR(1)
-       LNEQV=AR(1)
-      do i=2,N
-         LAND = LAND .and. AR(i)
-         LOR = LOR .or.AR(i)
-      enddo
-      do i=2,N
-         LEQV = LEQV .eqv. AR(i)
-      enddo
-      do i=2,N
-         LNEQV = LNEQV .neqv. AR(i)
-      enddo
-      end   
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red21.fdv
deleted file mode 100644
index 2383968..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red21.fdv
+++ /dev/null
@@ -1,938 +0,0 @@
-      program RED21
-
-c    TESTING OF THE REDUCTION CLAUSE .       
-c    REDUCTION OPERATION : SUM,PRODUCT,MAX,MIN,AND,OR, EQV,
-C    NEQV,MAXLOC,MINLOC AND THEIR COMBINATION ARE EXECUTED
-c    FOR DISTRIBUTED ARRAY A(N,M). 
-
-      print *,'===START OF RED21======================='
-C --------------------------------------------------
-      call red2101
-C --------------------------------------------------
-      call red2102
-C --------------------------------------------------
-      call red2103
-C -------------------------------------------------
-      call red2104
-C -------------------------------------------------
-      call red2105
-C -------------------------------------------------
-      call red2106
-C --------------------------------------------------
-      call red2107
-C --------------------------------------------------
-      call red2108
-C --------------------------------------------------
-      call red2109
-C -------------------------------------------------
-      call red2110
-C -------------------------------------------------
-      call red2111
-C -------------------------------------------------
-      call red2112
-C --------------------------------------------------
-      call red2113
-C --------------------------------------------------
-      call red2114
-C --------------------------------------------------
-C
-C
-      print *,'=== END OF RED21 ========================= '    
-      end
-
-C ----------------------------------------------------RED2101
-      subroutine RED2101
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer isum1,isumt1 
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-
-      tname='RED2101'
-      allocate (A(N,M),C(N,M))
-      NNL=NL 
-      NN=N
-      MM=M
-      call sersum2(C,NN,MM,NNL,isum1)
-      isumt1 = 0
-
-!dvm$ actual(isumt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j) on A(i,j), reduction( sum( isumt1 ) )
-      do i=1,N
-         do j=1,M
-           isumt1 = isumt1+A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1) 
-     
-      if (isum1 .eq.isumt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED2102
-      subroutine RED2102
-      integer, parameter :: N = 16,M=8,NL=1
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer iprod1,iprodt1 
-      
-!dvm$ distribute A(BLOCK,BLOCK)    
-      
-      tname='RED2102'
-      allocate (A(N,M),C(N,M))
-      NNL=NL
-      NN=N
-      MM=M
-      call serprod2(C,NN,MM,NNL,iprod1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j) on A(i,j), reduction( product( iprodt1 ) )
-      do i=1,N
-         do j=1,M
-           iprodt1 = iprodt1*A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED2103
-      subroutine RED2103
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:)
-      integer imax1,imaxt1 ,ni,imin,nj
-                       
-!dvm$ distribute A(BLOCK,BLOCK) 
-
-      tname='RED2103'
-      allocate (A(N,M))
-     
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1+NL
-      imax1=N+M+1+NL
-
-!dvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-!dvm$ actual(imaxt1,A)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( max( imaxt1 ) )
-      do i=1,N
-         do j=1,M
-           if (A(i,j).GT.imaxt1) imaxt1=A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A)
-      
-      end
-    
-C ----------------------------------------------------RED2104
-      subroutine RED2104
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imax1,imaxt1 ,ni,imin,nj
-                       
-!dvm$ distribute A(BLOCK,BLOCK)
-
-      tname='RED2104'
-      allocate (A(N,M),C(N,M))
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-  
-      ni=N/2
-      nj=M/2 
-      A(ni,nj)=-(N+M+1+NL)
-      imin1=-(N+M+1+NL)
-
-!dvm$ remote_access (A(1,1))      
-      imint1=A(1,1)
-
-!dvm$ actual(imint1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( min( imint1 ) )
-      do i=2,N
-         do j=1,M
-           if (A(i,j).LT.imint1) imint1=A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1) 
-
-      if (imin1 .eq.imint1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED2105
-      subroutine RED2105
-      integer, parameter :: N = 16,M=8
-      real, parameter :: NL=1000.
-      character*7 tname
-      real, allocatable :: A(:,:),C(:,:)
-      integer ni
-      real imax1,imaxt1                  
-!dvm$ distribute A(BLOCK,BLOCK)
-
-      tname='RED2105'
-      allocate (A(N,M),C(N,M))
-     
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1.+NL
-      imax1=N+M+1.+NL
-
-!dvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( max( imaxt1 ) )
-      do i=2,N
-         do j=1,M
-           if (A(i,j).GT.imaxt1) imaxt1=A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-                    
-C -----------------------------------------------------RED2106
-      subroutine RED2106
-      integer, parameter :: N = 8,M=6
-      real, parameter :: NL=1.
-      character*7 tname
-      real, allocatable :: A(:,:),C(:,:)
-      real iprod1,iprodt1 
-      real NNl
-      intrinsic INT           
-!dvm$ distribute A(BLOCK,BLOCK)    
-
-      tname='RED2106'
-      allocate (A(N,M),C(N,M))
-      NNL=NL
-      NN=N
-      MM=M
-      call serprodr2(C,NN,Mm,NNL,iprod1)
-      iprodt1 = 1.
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-            if(i.eq.j) then
-               A(i,j) = I+NL
-            else
-               A(i,j) = 1.
-            endif
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j) on A(i,j), reduction( product( iprodt1 ) )
-      do i=1,N
-         do j=1,M
-           iprodt1 = iprodt1*A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
-       if(INT(iprod1) .eq. INT(iprodt1))  then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED2107
-      subroutine RED2107
-      integer, parameter :: N = 16,M=8
-      character*7 tname
-      logical, allocatable :: A(:,:),C(:,:)
-      logical land1,landt1,leqv1,lneqv1,lor1
-
-!dvm$ distribute A(BLOCK,BLOCK)     
-
-      tname='RED2107'
-      allocate (A(N,M),C(N,M))
-      NN=N
-      MM=M     
-      call serlog2(C,NN,MM,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M,2
-           A(i,J) = .true. 
-         enddo        
-      enddo
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=2,M,2
-           A(i,j)=.false.
-         enddo
-      enddo
-
-!dvm$ remote_access (A(1,1))
-      landt1 = A(1,1)
-
-!dvm$ actual(landt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( AND( landt1 ) )
-      do i=1,N
-         do j=1,M
-          if ((i.eq.1).and.(j.eq.1))  then
-          continue
-!           landt1=A(i,j)
-          else
-           landt1 = landt1 .and. A(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(landt1) 
-
-      if (land1 .eqv.landt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C) 
-
-      end
-C -----------------------------------------------------RED2108
-      subroutine RED2108
-      integer, parameter :: N = 16,M=8
-      character*7 tname
-      logical, allocatable :: A(:,:),C(:,:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1
-
-!dvm$ distribute A(BLOCK,BLOCK)   
-
-      tname='RED2108'
-      allocate (A(N,M),C(N,M))
-      NN=N
-      MM=M
-      call serlog2(C,NN,MM,land1,lor1,leqv1,lneqv1)                                    
-               
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M,2
-           A(i,J) = .true.
-         enddo
-      enddo
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=2,M,2
-           A(i,j)=.false.
-         enddo
-      enddo
-
-!dvm$ remote_access (A(1,1))
-      lort1 = A(1,1)
-
-!dvm$ actual(lort1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( OR( lort1 ) )
-      do i=1,N
-         do j=1,M
-          if ((i.eq.1).and.(j.eq.1))  then
-          continue
-!           lort1=A(i,j)
-          else
-           lort1 = lort1 .or. A(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lort1) 
-
-      if (lort1 .eqv.lort1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED2109
-      subroutine RED2109
-      integer, parameter :: N = 16,M=8
-      character*7 tname
-      logical, allocatable :: A(:,:),C(:,:)
-      logical land1,landt1,lor1,leqv1,leqvt1,lneqv1
-
-!dvm$ distribute A(BLOCK,BLOCK)
-
-      tname='RED2109'
-      allocate (A(N,M),C(N,M))
-      NN=N
-      MM=M
-      call serlog2(C,NN,MM,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M,2
-           A(i,J) = .true.
-         enddo         
-      enddo
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=2,M,2
-           A(i,j)=.false.
-         enddo
-      enddo
-
-!dvm$ remote_access (A(1,1))
-      leqvt1 = A(1,1)
-
-!dvm$ actual(leqvt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( EQV( leqvt1 ) )
-      do i=1,N
-         do j=1,M
-          if ((i.eq.1).and.(j.eq.1))  then
-          continue
-!           leqvt1=A(i,j)
-          else
-           leqvt1 = leqvt1 .eqv. A(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(leqvt1) 
-      
-      if (leqv1 .eqv.leqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED2110
-      subroutine RED2110
-      integer, parameter :: N = 16,M=8
-      character*7 tname
-      logical, allocatable :: A(:,:),C(:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1,lneqvt1
-
-!dvm$ distribute A(BLOCK,BLOCK)
-
-      tname='RED2110'
-      allocate (A(N,M),C(N,M))
-
-      NN=N
-      MM=M
-      call serlog2(C,NN,MM,land1,lor1,leqv1,lneqv1)
-               
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M,2
-           A(i,J) = .true.
-         enddo         
-      enddo
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=2,M,2
-           A(i,j)=.false.
-         enddo
-      enddo
-
-!dvm$ remote_access (A(1,1))
-      lneqvt1 = A(1,1)
-
-!dvm$ actual(lneqvt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( NEQV( lneqvt1 ) )
-      do i=1,N
-         do j=1,M
-          if ((i.eq.1).and.(j.eq.1))  then
-           continue
-!           lneqvt1=A(i,j)
-          else
-           lneqvt1 = lneqvt1 .neqv. A(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lneqvt1) 
-      
-      if (lneqv1 .eqv.lneqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED2111
-      subroutine RED2111
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imax1,imaxt1 ,ni,imin,nj
-      integer it1,jt1,it2,jt2
-      integer coor(2),lcoor           
-!dvm$ distribute A(BLOCK,BLOCK)
-
-      tname='RED2111'
-      allocate (A(N,M),C(N,M))
-     
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i * NL + j
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1+NL * NL
-      imax1=N+M+1+NL * NL
-
-!dvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-      lcoor=2
-      coor(1)=0
-      coor(2)=0
-
-!dvm$ actual(imaxt1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( maxloc( imaxt1,coor,2))
-      do i=2,N
-         do j=1,M
-          if (A(i,j).GT.imaxt1)then
-           imaxt1=A(i,j)
-           coor(1)=i
-           coor(2)=j         
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,coor)
-
-      if ((imax1 .eq.imaxt1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED2112
-      subroutine RED2112
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imin1,imint1 ,ni
-c      integer it1,jt1,it2,jt2 
-      integer coor(2),lcoor
-                
-!dvm$ distribute A(BLOCK,BLOCK)
-
-      tname='RED2112'
-      allocate (A(N,M),C(N,M))
-     
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i * NL + j
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2 
-      A(ni,nj)=-(N+M+1+NL * NL)
-      imin1=-(N+M+1+NL * NL)
-
-!dvm$ remote_access (A(1,1))
-      imint1=A(1,1)  
-
-      lcoor=2
-      coor(1)=0
-      coor(2)=0
-
-!dvm$ actual(imint1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( minloc( imint1,coor,2))
-      do i=2,N
-         do j=1,M
-          if (A(i,j).LT.imint1)then
-           imint1=A(i,j)
-           coor(1)=i
-           coor(2)=j
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,coor) 
-
-c      print *,imin1, imint1
-c      print *,coor(1),ni
-c      print *,coor(2),nj
-      if ((imin1 .eq.imint1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED2113
-      subroutine RED2113
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-!dvm$ distribute A(BLOCK,BLOCK)
-
-      tname='RED2113'
-      allocate (A(N,M),C(N,M))
-      NNL=NL 
-      NN=N
-      MM=M
-      call sersum2m(C,NN,MM,NNL,isum1)
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      A(ni,nj)=N+M+1+NL
-      imax1=N+M+1+NL
-
-!dvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-      ni1=N/2
-      nj1=M/2
-      A(ni1,nj1)=-(N+M+1+NL)
-      imin1=-(N+M+1+NL)
-
-!dvm$ remote_access (A(1,1))
-      imint1=A(1,1)
-
-      isumt1 = 0
-!dvm$ actual(isumt1,imaxt1,imint1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( sum( isumt1 ),
-!dvm$*max( imaxt1 ),min( imint1 ) )
-      do i=1,N
-         do j=1,M
-           isumt1 = isumt1+A(i,j)
-           if (A(i,j).GT.imaxt1) imaxt1=A(i,j)
-           if (A(i,j).LT.imint1) imint1=A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxt1,imint1) 
-
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED2114
-      subroutine RED2114
-      integer, parameter :: N = 16,M=8,NL=1
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:),CL(:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align B(I,J) with A(I,J)      
-
-      tname='RED2114'
-      allocate (A(N,M),C(N,M))
-      allocate (B(N,M),CL(N,M))
-      NNL=NL
-      NN=N
-      MM=M
-      call serprod2(C,NN,MM,NNL,iprod1)
-      call serlog2(CL,NN,MM,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j) on B(i,j)
-      do i=1,N
-         do j=1,M,2
-           B(i,J) = .true.
-         enddo         
-      enddo
-
-!dvm$ parallel (i,j) on B(i,j)
-      do i=1,N
-         do j=2,M,2
-           B(i,j)=.false.
-         enddo
-      enddo
-          
-!dvm$ remote_access (B(1,1))
-      landt1 = B(1,1)    
-               
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-  
-C      print *,A
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1,landt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( product( iprodt1 ),
-!dvm$* and(landt1))
-      do i=1,N
-         do j=1,M
-          iprodt1 = iprodt1*A(i,j)
-c         print *,i, j,iprodt1
-          if ((i.eq.1).and.(j.eq.1))  then
-          continue
-!           landt1=B(i,j)
-          else
-           landt1 = landt1 .and. B(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1,landt1) 
-
-c      print *,iprod1,iprodt1,land1,landt1
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,CL)
-      deallocate (A,C)
- 
-      end   
-C -----------------------------------------------------
-
-      subroutine sersum2(AR,N,M,NL,S)
-      integer AR(N,M)
-      integer S,NL
-      do i=1,N
-         do j=1,M
-         AR(i,j) = i+j+NL
-         enddo          
-      enddo
-      S=0
-      do i=1,N
-         do j=1,M
-         s = s+ AR(i,j)
-         enddo
-      enddo
-      end   
-   
-      subroutine sersum2m(AR,N,M,NL,S)
-      integer AR(N,M)
-      integer S,NL
-      do i=1,N
-         do j=1,M
-          AR(i,j) = i+j+NL
-         enddo          
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      AR(ni,nj)=N+M+1+NL
-      ni=N/2 
-      nj=M/2
-      AR(ni,nj)=-(N+M+1+NL)
-      S=0
-      do i=1,N
-         do j=1,M
-          s = s+ AR(i,j)
-         enddo
-      enddo
-    
-      end   
-
-      subroutine sersum2mr(AR,N,M,NL,S)
-      real AR(N,M)
-      real S,NL
-      do i=1,N
-         do j=1,M
-          AR(i,j) = i+j+NL
-         enddo 
-         enddo 
-      ni=N/2-1
-      nj=M/2-1
-      AR(ni,nj)=N+M+1.+NL
-      ni=N/2
-      nj=M/2
-      AR(ni,ni)=-(N+M+1.+NL)
-      S=0.
-      do i=1,N
-         do j=1,M
-          s = s+ AR(i,j)
-         enddo
-      enddo
-      end  
-  
-      subroutine serprod2(AR,N,M,NL,P)
-      integer AR(N,M)
-      integer P,NL
-      do i=1,N
-         do j=1,M
-          AR(i,j) = i+j+NL
-         enddo
-      enddo   
-      P=1
-      do i=1,N
-         do j=1,M
-          P = P* AR(i,j)
-         enddo
-      enddo
-      end   
- 
-      subroutine serprodr2(AR,N,M,NL,P)
-      real AR(N,M)
-      real P,NL
-      do i=1,N
-         do j=1,M
-            if(i.eq.j)then
-               AR(i,j) = I+NL
-            else
-               AR(i,j) = 1.  
-            endif  
-         enddo
-      enddo 
-      P=1.
-      do i=1,N
-         do j=1,M
-          P = P* AR(i,j)
-         enddo
-      enddo
-      end
-     
-      subroutine serlog2(AR,N,M,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N
-         do j=1,M,2
-          AR(i,J) = .true.
-          enddo         
-      enddo
-      do i=1,N
-         do j=2,M,2
-          AR(i,j)=.false.
-         enddo
-      enddo 
-      do i=1,N
-       do j= 1,M
-        if ((i.eq.1).and.(j.eq.1))  then
-         LAND=AR(1,1)
-         LOR=AR(1,1)
-C         LEQV=.true.
-C         LNEQV=.false.
-          LNEQV=AR(1,1)
-          LEQV=AR(1,1)
-        else
-         LAND = LAND .and. AR(i,j)
-         LOR = LOR .or.AR(i,j)
-         LEQV = LEQV .eqv. AR(i,j)
-         LNEQV = LNEQV .neqv. AR(i,j)
-        endif
-       enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red22.fdv
deleted file mode 100644
index 91b1a3c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red22.fdv
+++ /dev/null
@@ -1,939 +0,0 @@
-      program RED22
-
-c    TESTING OF THE REDUCTION CLAUSE .       
-c    REDUCTION OPERATION : SUM,PRODUCT,MAX,MIN,AND,OR, EQV,
-C    NEQV,MAXLOC,MINLOC AND THEIR COMBINATION ARE EXECUTED
-c    FOR DISTRIBUTED ARRAY A(N,M). 
-
-      print *,'===START OF RED22======================='
-C --------------------------------------------------
-      call red2201
-C --------------------------------------------------
-      call red2202
-C --------------------------------------------------
-      call red2203
-C -------------------------------------------------
-      call red2204
-C -------------------------------------------------
-      call red2205
-C -------------------------------------------------
-      call red2206
-C --------------------------------------------------
-      call red2207
-C --------------------------------------------------
-      call red2208
-C --------------------------------------------------
-      call red2209
-C -------------------------------------------------
-      call red2210
-C -------------------------------------------------
-      call red2211
-C -------------------------------------------------
-      call red2212
-C ------------------------------------------------- 
-      call red2213
-C --------------------------------------------------
-      call red2214
-C --------------------------------------------------
-
-C
-C
-      print *,'=== END OF RED22 ========================= '    
-      end
-
-C ----------------------------------------------------RED2201
-      subroutine RED2201
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer isum1,isumt1 
-                 
-!dvm$ distribute A(BLOCK,*)   
-
-
-      tname='RED2201'
-      allocate (A(N,M),C(N,M))
-      NNL=NL 
-      NN=N
-      MM=M
-      call sersum2(C,NN,MM,NNL,isum1)
-      isumt1 = 0
-
-!dvm$ actual(isumt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j) on A(i,j), reduction( sum( isumt1 ) )
-      do i=1,N
-         do j=1,M
-           isumt1 = isumt1+A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1) 
-     
-      if (isum1 .eq.isumt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED2202
-      subroutine RED2202
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer iprod1,iprodt1       
-                 
-!dvm$ distribute A(*,BLOCK)    
-     
-      tname='RED2202'
-      allocate (A(N,M),C(N,M))
-      NNL=NL
-      NN=N
-      MM=M
-      call serprod2(C,N,M,NNL,iprod1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-          if (i.eq.j)  then
-           A(i,j) = i
-          else
-           A(i,j) =1
-          endif
-         enddo
-      enddo
-  
-
-!dvm$ parallel (i,j) on A(i,j), reduction( product( iprodt1 ) )
-      do i=1,N
-         do j=1,M
-          iprodt1 = iprodt1*A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif  
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED2203
-      subroutine RED2203
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(BLOCK,*) 
-
-      tname='RED2203'
-      allocate (A(N,M),C(N,M))
-     
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1+NL
-      imax1=N+M+1+NL
-
-!dvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( max( imaxt1 ) )
-      do i=1,N
-         do j=1,M
-           if (A(i,j).GT.imaxt1) imaxt1=A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-    
-C ----------------------------------------------------RED2204
-      subroutine RED2204
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(*,BLOCK)
-
-      tname='RED2204'
-      allocate (A(N,M),C(N,M))
- 
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-  
-      ni=N/2
-      nj=M/2 
-      A(ni,nj)=-(N+M+1+NL)
-      imin1=-(N+M+1+NL)
-
-!dvm$ remote_access (A(1,1))      
-      imint1=A(1,1)
-
-!dvm$ actual(imint1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( min( imint1 ) )
-      do i=2,N
-         do j=1,M
-           if (A(i,j).LT.imint1) imint1=A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1) 
-
-      if (imin1 .eq.imint1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED2205
-      subroutine RED2205
-      integer, parameter :: N = 16,M=8
-      real, parameter :: NL=1000.
-      character*7 tname
-      real, allocatable :: A(:,:),C(:,:)
-      integer ni
-      real imax1,imaxt1                  
-!dvm$ distribute A(BLOCK,*)
-
-      tname='RED2205'
-      allocate (A(N,M),C(N,M))
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1.+NL
-      imax1=N+M+1.+NL
-
-!dvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( max( imaxt1 ) )
-      do i=2,N
-         do j=1,M
-           if (A(i,j).GT.imaxt1) imaxt1=A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-                    
-C -----------------------------------------------------RED2206
-      subroutine RED2206
-      integer, parameter :: N = 8,M=8
-      real, parameter :: NL=1.
-      character*7 tname
-      real, allocatable :: A(:,:),C(:,:)
-      real iprod1,iprodt1 
-      real NNl
-                 
-!dvm$ distribute A(*,BLOCK)    
-      
-      tname='RED2206'
-      allocate (A(N,M),C(N,M))
-
-      NNL=NL
-      NN=N
-      MM=M
-      call serprodr2(C,NN,MM,NNL,iprod1)
-	  iprodt1 = 1.
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-          if (i.eq.j)  then
-           A(i,j) = i
-          else
-           A(i,j) =1.
-          endif
-         enddo
-      enddo
-      
-!dvm$ parallel (i,j) on A(i,j), reduction( product( iprodt1 ) )
-      do i=1,N
-         do j=1,M
-          iprodt1 = iprodt1*A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED2207
-      subroutine RED2207
-      integer, parameter :: N = 16,M=8
-      character*7 tname
-      logical, allocatable :: A(:,:),C(:,:)
-      logical land1,landt1,leqv1,lneqv1,lor1
-
-!dvm$ distribute A(BLOCK,*)    
-
-      tname='RED2207'
-      allocate (A(N,M),C(N,M))
-      NN=N
-      MM=M            
-      call serlog2(C,NN,MM,land1,lor1,leqv1,lneqv1)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M,2
-           A(i,J) = .true. 
-         enddo        
-      enddo
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=2,M,2
-           A(i,j)=.false.
-         enddo
-      enddo
- 
-!dvm$ remote_access (A(1,1))
-      landt1 = A(1,1)
-
-!dvm$ actual(landt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( AND( landt1 ) )
-      do i=1,N
-         do j=1,M
-          if ((i.eq.1).and.(j.eq.1))  then
-!            landt1=A(i,j)
-          else
-            landt1 = landt1 .and. A(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(landt1) 
-
-      if (land1 .eqv.landt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED2208
-      subroutine RED2208
-      integer, parameter :: N = 16,M=8
-      character*7 tname
-      logical, allocatable :: A(:,:),C(:,:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1
-
-!dvm$ distribute A(*,BLOCK)    
-
-      tname='RED2208'
-      allocate (A(N,M),C(N,M))
-      NN=N
-      MM=M
-      call serlog2(C,NN,MM,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M,2
-          A(i,j) = .true.
-         enddo
-      enddo
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=2,M,2
-          A(i,j)=.false.
-         enddo
-      enddo
-
-!dvm$ remote_access (A(1,1))
-      lort1 = A(1,1)
-
-!dvm$ actual(lort1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( OR( lort1 ) )
-      do i=1,N
-         do j=1,M
-          if ((i.eq.1).and.(j.eq.1))  then
-!           lort1=A(i,j)
-          else
-           lort1 = lort1 .or. A(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lort1) 
-
-      if (lor1 .eqv.lort1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED2209
-      subroutine RED2209
-      integer, parameter :: N = 16,M=8
-      character*7 tname
-      logical, allocatable :: A(:,:),C(:,:)
-      logical land1,landt1,lor1,leqv1,leqvt1,lneqv1
-
-!dvm$ distribute A(BLOCK,*)
-
-      tname='RED2209'
-      allocate (A(N,M),C(N,M))
-      NN=N
-      MM=M
-      call serlog2(C,NN,MM,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M,2
-          A(i,J) = .true.
-         enddo         
-      enddo
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=2,M,2
-          A(i,j)=.false.
-         enddo
-      enddo
-
-!dvm$ remote_access (A(1,1))
-      leqvt1 = A(1,1)
-
-!dvm$ actual(leqvt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( EQV( leqvt1 ) )
-      do i=1,N
-         do j=1,M
-          if ((i.eq.1).and.(j.eq.1))  then
-!           leqvt1=A(i,j)
-          else
-           leqvt1 = leqvt1 .eqv. A(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(leqvt1) 
-
-      if (leqv1 .eqv.leqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED2210
-      subroutine RED2210
-      integer, parameter :: N = 16,M=8
-      character*7 tname
-      logical, allocatable :: A(:,:),C(:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1,lneqvt1
-
-!dvm$ distribute A(*,BLOCK)
-
-      tname='RED2210'
-      allocate (A(N,M),C(N,M))
-      NN=N
-      MM=M
-      call serlog2(C,NN,MM,land1,lor1,leqv1,lneqv1)
-               
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M,2
-           A(i,J) = .true.
-         enddo         
-      enddo
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=2,M,2
-          A(i,j)=.false.
-         enddo
-      enddo
-
-!dvm$ remote_access (A(1,1))
-      lneqvt1 = A(1,1)
-
-!dvm$ actual(lneqvt1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( NEQV( lneqvt1 ) )
-      do i=1,N
-         do j=1,M
-          if ((i.eq.1).and.(j.eq.1))  then
-           continue
-!           lneqvt1=A(i,j)
-          else
-           lneqvt1 = lneqvt1 .neqv. A(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lneqvt1) 
-      
-      if (lneqv1 .eqv.lneqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED2211
-      subroutine RED2211
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imax1,imaxt1 ,ni,imin
-      integer it1,jt1,it2,jt2              
-      integer coor(2),lcoor
-   
-!dvm$ distribute A(BLOCK,*)
-
-      tname='RED2211'
-      allocate (A(N,M),C(N,M))
-     
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-          A(i,j) = i*NL+j
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1+NL*NL
-      imax1=N+M+1+NL*NL
-
-!dvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-      lcoor=2
-      coor(1)=0
-      coor(2)=0
-
-!dvm$ actual(imaxt1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( maxloc( imaxt1,coor,2))
-      do i=2,N
-         do j=1,M
-          if (A(i,j).GT.imaxt1)then
-           imaxt1=A(i,j)
-           coor(1)=i
-           coor(2)=j
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,coor) 
-
-      if ((imax1 .eq.imaxt1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED2212
-      subroutine RED2212
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imin1,imint1 ,ni
-      integer it1,jt1,it2,jt2
-      integer coor(2),lcoor
-                 
-!dvm$ distribute A(*,BLOCK)
-
-      tname='RED2212'
-      allocate (A(N,M),C(N,M))
-     
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i*NL+j
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2 
-      A(ni,nj)=-(N+M+1+NL*NL)
-      imin1=-(N+M+1+NL*NL)
-
-!dvm$ remote_access (A(1,1))
-      imint1=A(1,1)  
-
-      lcoor=2
-      coor(1)=0
-      coor(2)=0
-
-!dvm$ actual(imint1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( minloc( imint1,coor,2))
-      do i=2,N
-         do j=1,M
-          if (A(i,j).LT.imint1)then
-           imint1=A(i,j)
-           coor(1)=i
-           coor(2)=j
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,coor)
-
-      if ((imin1 .eq.imint1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED2213
-      subroutine RED2213
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-!dvm$ distribute A(BLOCK,*)
-
-      tname='RED2213'
-      allocate (A(N,M),C(N,M))
-      NNL=NL 
-      NN=N
-      MM=M
-      call sersum2m(C,NN,MM,NNL,isum1)
-
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      A(ni,nj)=N+M+1+NL
-      imax1=N+M+1+NL
-
-!dvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-      ni1=N/2
-      nj1=M/2
-      A(ni1,nj1)=-(N+M+1+NL)
-      imin1=-(N+M+1+NL)
-
-!dvm$ remote_access (A(1,1))
-      imint1=A(1,1)
-
-      isumt1 = 0
-!dvm$ actual(isumt1,imaxt1,imint1)
-!dvm$ region
-!dvm$ parallel (i,j) on A(i,j), reduction( sum( isumt1 ),
-!dvm$*max( imaxt1 ),min( imint1 ) )
-      do i=1,N
-         do j=1,M
-          isumt1 = isumt1+A(i,j)
-          if (A(i,j).GT.imaxt1) imaxt1=A(i,j)
-          if (A(i,j).LT.imint1) imint1=A(i,j)
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxt1,imint1) 
-
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED2214
-      subroutine RED2214
-      integer, parameter :: N = 16,M=8,NL=1
-      character*7 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:),CL(:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-               
-!dvm$ distribute A(BLOCK,*)    
-!dvm$ align B(I,J) with A(I,J)      
-
-      tname='RED2214'
-      allocate (A(N,M),C(N,M))
-      allocate (B(N,M),CL(N,M))
-
-      NNL=NL
-      NN=N
-      MM=M
-      call serprod2(C,NN,MM,NNL,iprod1)
-      call serlog2(CL,NN,MM,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j) on B(i,j)
-      do i=1,N
-         do j=1,M,2
-          B(i,J) = .true.
-         enddo         
-      enddo
-!dvm$ parallel (i,j) on B(i,j)
-      do i=1,N
-         do j=2,M,2
-          B(i,j)=.false.
-         enddo
-      enddo
-
-!dvm$ remote_access (B(1,1))
-      landt1 = B(1,1)    
-      iprodt1 = 1
-               
-!dvm$ actual(iprodt1,landt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-          if (i.eq.j)  then
-           A(i,j) = i
-          else
-           A(i,j) =1
-          endif
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j) on A(i,j), reduction( product( iprodt1 ),
-!dvm$* and(landt1))
-      do i=1,N
-         do j=1,M
-          iprodt1 = iprodt1*A(i,j)
-          if ((i.eq.1).and.(j.eq.1))  then
-!            landt1=B(i,j)
-          else
-            landt1 = landt1 .and. B(i,j)
-          endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1,landt1) 
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,CL)
-      deallocate (A,C)
- 
-      end   
-C -----------------------------------------------------
-
-      subroutine sersum2(AR,N,M,NL,S)
-      integer AR(N,M)
-      integer S,NL
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo          
-      enddo
-      S=0
-      do i=1,N
-         do j=1,M
-           s = s+ AR(i,j)
-         enddo
-      enddo
-      end   
-   
-      subroutine sersum2m(AR,N,M,NL,S)
-      integer AR(N,M)
-      integer S,NL
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo          
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      AR(ni,nj)=N+M+1+NL
-      ni=N/2 
-      nj=M/2
-      AR(ni,nj)=-(N+M+1+NL)
-      S=0
-      do i=1,N
-         do j=1,M
-           s = s+ AR(i,j)
-         enddo
-      enddo
-      end   
-
-      subroutine sersum2mr(AR,N,M,NL,S)
-      real AR(N,M)
-      real S,NL
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo 
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      AR(ni,nj)=N+M+1.+NL
-      ni=N/2
-      nj=M/2
-      AR(ni,ni)=-(N+M+1.+NL)
-      S=0.
-      do i=1,N
-         do j=1,M
-           s = s+ AR(i,j)
-         enddo
-      enddo
-      end  
-  
-      subroutine serprod2(AR,N,M,NL,P)
-      integer AR(N,M)
-      integer P,NL
-      do i=1,N
-         do j=1,M
-           if (i.eq.j)  then
-            AR(i,j) = i
-           else
-            AR(i,j) =1
-           endif
-         enddo
-      enddo   
-      P=1
-      do i=1,N
-         do j=1,M
-           P = P* AR(i,j)
-         enddo
-      enddo
-      end   
- 
-      subroutine serprodr2(AR,N,M,NL,P)
-      real AR(N,M)
-      real P,NL
-      do i=1,N
-         do j=1,M
-           if (i.eq.j)  then
-            AR(i,j) = i
-           else
-            AR(i,j) =1.
-           endif
-         enddo
-      enddo 
-      P=1.
-      do i=1,N
-         do j=1,M
-           P = P* AR(i,j)
-         enddo
-      enddo
-      end
-     
-      subroutine serlog2(AR,N,M,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N,1
-         do j=1,M,2
-           AR(i,j) = .true.
-         enddo         
-      enddo
-      do i=1,N,1
-         do j=2,M,2
-           AR(i,j)=.false.
-         enddo
-      enddo 
-      do i=1,N
-       do j= 1,M
-        if ((i.eq.1).and.(j.eq.1))  then
-         LAND=AR(1,1)
-         LOR=AR(1,1)
-         LEQV=AR(1,1)
-         LNEQV=AR(1,1)
-        else
-         LAND = LAND .and. AR(i,j)
-         LOR = LOR .or.AR(i,j)
-         LEQV = LEQV .eqv. AR(i,j)
-         LNEQV = LNEQV .neqv. AR(i,j)
-        endif
-       enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red31.fdv
deleted file mode 100644
index 9716b99..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red31.fdv
+++ /dev/null
@@ -1,1052 +0,0 @@
-      program RED31
-
-c    TESTING OF THE REDUCTION CLAUSE .       
-c    REDUCTION OPERATION : SUM,PRODUCT,MAX,MIN,AND,OR, EQV,
-C    NEQV,MAXLOC,MINLOC AND THEIR COMBINATION ARE EXECUTED
-c    FOR DISTRIBUTED ARRAY A(N,M,K). 
-
-      print *,'===START OF RED31======================='
-C --------------------------------------------------
-      call red3101
-C --------------------------------------------------
-      call red3102
-C --------------------------------------------------
-      call red3103
-C -------------------------------------------------
-      call red3104
-C -------------------------------------------------
-      call red3105
-C -------------------------------------------------
-      call red3106
-C --------------------------------------------------
-      call red3107
-C --------------------------------------------------
-      call red3108
-C --------------------------------------------------
-      call red3109
-C -------------------------------------------------
-      call red3110
-C -------------------------------------------------
-       call red3111
-C -------------------------------------------------
-      call red3112
-C ------------------------------------------------- 
-      call red3113
-C --------------------------------------------------
-      call red3114
-C --------------------------------------------------
-
-C
-C
-      print *,'=== END OF RED31 ========================= '    
-      end
-
-C ----------------------------------------------------RED3101
-      subroutine RED3101
-      integer, parameter :: N = 16,M=8,K=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer isum1,isumt1 
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)    
-
-      tname='RED3101'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      call sersum3(C,NN,MM,KK,NNL,isum1)
-      isumt1 = 0
-
-!dvm$ actual(isumt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-         do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-         enddo
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( sum( isumt1 ) )
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-             isumt1 = isumt1+A(i,j,ii)
-           enddo
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1) 
-     
-      if (isum1 .eq.isumt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED3102
-      subroutine RED3102
-      integer, parameter :: N = 16,M=8,K=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer iprod1,iprodt1 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)    
-
-      tname='RED3102'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      call serprod3(C,NN,MM,KK,NNL,iprod1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-            if ((i.eq.j).and.(j.eq.ii))  then
-             A(i,j,ii) = i
-            else
-             A(i,j,ii) =1
-            endif
-           enddo
-         enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( product( iprodt1 ) )
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-            iprodt1 = iprodt1*A(i,j,ii)
-           enddo
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED3103
-      subroutine RED3103
-      integer, parameter :: N = 16,M=8,K=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK) 
-
-      tname='RED3103'
-      allocate (A(N,M,K),C(N,M,K))
-     
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-         do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1+NL
-      imax1=N+M+K+1+NL
-
-!dvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( max( imaxt1 ) )
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-            if (A(i,j,ii).GT.imaxt1) imaxt1=A(i,j,ii)
-           enddo
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-    
-C ----------------------------------------------------RED3104
-      subroutine RED3104
-      integer, parameter :: N = 16,M=8,K=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-
-      tname='RED3104'
-      allocate (A(N,M,K),C(N,M,K))
- 
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-             A(i,j,ii) = i+j+ii+NL
-           enddo
-         enddo
-      enddo
-  
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=-(N+M+K+1+NL)
-      imin1=-(N+M+K+1+NL)
-
-!dvm$ remote_access (A(1,1,1))      
-      imint1=A(1,1,1)
-
-!dvm$ actual(imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( min( imint1 ) )
-      do i=2,N
-         do j=1,M
-           do ii=1,K
-             if (A(i,j,ii).LT.imint1) imint1=A(i,j,ii)
-           enddo
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1) 
-
-      if (imin1 .eq.imint1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED3105
-      subroutine RED3105
-      integer, parameter :: N = 16,M=8,K=8
-      real, parameter :: NL=1000.
-      character*7 tname
-      real, allocatable :: A(:,:,:),C(:,:,:)
-      integer ni
-      real imax1,imaxt1                  
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-
-      tname='RED3105'
-      allocate (A(N,M,K),C(N,M,K))
-     
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-              A(i,j,ii) = i+j+ii+NL
-           enddo
-         enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1.+NL
-      imax1=N+M+K+1.+NL
-
-!dvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( max( imaxt1 ) )
-      do i=2,N
-         do j=1,M
-           do ii=1,K                 
-                 if (A(i,j,ii).GT.imaxt1) imaxt1=A(i,j,ii)
-           enddo
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)      
-
-      end
-                    
-C -----------------------------------------------------RED3106
-      subroutine RED3106
-      integer, parameter :: N = 16,M=8,K=8
-      real, parameter :: NL=1.
-      character*7 tname
-      real, allocatable :: A(:,:,:),C(:,:,:)
-      real iprod1,iprodt1 
-      real NNl
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)    
-      
-      tname='RED3106'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      call serprodr3(C,NN,MM,KK,NNL,iprod1)
-      iprodt1 = 1.
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-         do j=1,M
-          do ii=1,K
-            if ((i.eq.j).and.(j.eq.ii))  then
-             A(i,j,ii) = i
-            else
-             A(i,j,ii) =1.
-            endif
-          enddo
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( product( iprodt1 ) )
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-            iprodt1 = iprodt1*A(i,j,ii)
-            enddo
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED3107
-      subroutine RED3107
-      integer, parameter :: N = 16,M=8,K=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:),C(:,:,:)
-      logical land1,landt1,leqv1,lneqv1,lor1
-
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)     
-
-      tname='RED3107'
-      allocate (A(N,M,K),C(N,M,K))
-      NN=N
-      MM=M
-      KK=K           
-      call serlog3(C,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-	  
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-         do j=1,M
-           do ii=1,K,2
-             A(i,j,ii) = .true.
-           enddo
-         enddo         
-      enddo
-	  
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-           A(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo
-                                  
-!dvm$ remote_access (A(1,1,1))
-      landt1 = A(1,1,1)
-
-!dvm$ actual(landt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( AND( landt1 ) )
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-            if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-            else
-              landt1 = landt1 .and. A(i,j,ii)
-            endif
-           enddo
-         enddo 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(landt1) 
-      
-      if (land1 .eqv.landt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED3108
-      subroutine RED3108
-      integer, parameter :: N = 16,M=8,K=16
-      character*7 tname
-      logical, allocatable :: A(:,:,:),C(:,:,:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1
-
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK) 
-
-      tname='RED3108'
-      allocate (A(N,M,K),C(N,M,K))
-
-      NN=N
-      MM=M
-      KK=K
-      call serlog3(C,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-           A(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-           A(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo
-                                                 
-!dvm$ remote_access (A(1,1,1))
-      lort1 = A(1,1,1)
-
-!dvm$ actual(lort1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( OR( lort1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-           else
-             lort1 = lort1 .or. A(i,j,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lort1) 
-      
-      if (lor1 .eqv.lort1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED3109
-      subroutine RED3109
-      integer, parameter :: N = 16,M=8,K=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:),C(:,:,:)
-      logical land1,landt1,lor1,leqv1,leqvt1,lneqv1
-
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-
-      tname='RED3109'
-      allocate (A(N,M,K),C(N,M,K))
-      NN=N
-      MM=M
-      KK=K
-      call serlog3(C,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            A(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-            A(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo                                    
-
-!dvm$ remote_access (A(1,1,1))
-      leqvt1 = A(1,1,1)
-
-!dvm$ actual(leqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( EQV( leqvt1 ) )
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-            if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-            else
-              leqvt1 = leqvt1 .eqv. A(i,j,ii)
-            endif
-           enddo
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(leqvt1) 
-      
-      if (leqv1 .eqv.leqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED3110
-      subroutine RED3110
-      integer, parameter :: N = 16,M=8,K=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:),C(:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1,lneqvt1
-
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-
-      tname='RED3110'
-      allocate (A(N,M,K),C(N,M,K))
-
-      NN=N
-      MM=M
-      KK=K 
-      call serlog3(C,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            A(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-            A(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo
-                                  
-!dvm$ remote_access (A(1,1,1))
-      lneqvt1 = A(1,1,1)
-
-!dvm$ actual(lneqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( NEQV( lneqvt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-             continue
-           else
-             lneqvt1 = lneqvt1 .neqv. A(i,j,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lneqvt1) 
-      
-      if (lneqv1 .eqv.lneqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED3111
-      subroutine RED3111
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-      integer it1,jt1,it2,jt2,iit1   
-      integer coor(3),lcoor              
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-
-      tname='RED3111'
-      allocate (A(N,M,K),C(N,M,K))
-     
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-             A(i,j,ii) = i*NL*NL+j*NL+ii
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1+NL*NL*NL
-      imax1=N+M+K+1+NL*NL*NL
-
-!dvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      lcoor=3
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-
-!dvm$ actual(imaxt1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii),
-!dvm$* reduction( maxloc( imaxt1,coor,3))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-           if (A(i,j,ii).GT.imaxt1)then
-             imaxt1=A(i,j,ii)
-             coor(1)=i
-             coor(2)=j
-             coor(3)=ii
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,coor)
-
-      if ((imax1 .eq.imaxt1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED3112
-      subroutine RED3112
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imin1,imint1 ,ni
-      integer it1,jt1,it2,jt2,iit1                 
-      integer coor(3),lcoor
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-
-      tname='RED3112'
-      allocate (A(N,M,K),C(N,M,K))
-     
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i*NL*NL+j*NL+ii
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=-(N+M+K+1+NL*NL*NL)
-      imin1=-(N+M+K+1+NL*NL*NL)
-
-!dvm$ remote_access (A(1,1,1))
-      imint1=A(1,1,1)  
-
-      lcoor=3
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-
-!dvm$ actual(imint1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii),
-!dvm$* reduction( minloc( imint1,coor,3))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            if (A(i,j,ii).LT.imint1)then
-              imint1=A(i,j,ii)
-              coor(1)=i
-              coor(2)=j
-              coor(3)=ii
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,coor)
-
-      if ((imin1 .eq.imint1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED3113
-      subroutine RED3113
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-
-      tname='RED3113'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      call sersum3m(C,NN,MM,KK,NNL,isum1)
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      A(ni,nj,nii)=N+M+K+1+NL
-      imax1=N+M+K+1+NL
-
-!dvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      ni1=N/2
-      nj1=M/2
-      nii1=K/2
-      A(ni1,nj1,nii1)=-(N+M+K+1+NL)
-      imin1=-(N+M+K+1+NL)
-
-!dvm$ remote_access (A(1,1,1))
-      imint1=A(1,1,1)
-
-      isumt1 = 0
-	  
-!dvm$ actual(isumt1,imaxt1,imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( sum( isumt1 ),
-!dvm$*max( imaxt1 ),min( imint1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            isumt1 = isumt1+A(i,j,ii)
-            if (A(i,j,ii).GT.imaxt1) imaxt1=A(i,j,ii)
-            if (A(i,j,ii).LT.imint1) imint1=A(i,j,ii)
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxt1,imint1) 
-	  
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED3114
-      subroutine RED3114
-      integer, parameter :: N = 16,M=8,K=16,NL=1
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:),CL(:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)    
-!dvm$ align B(I,J,II) with A(I,J,II)      
-
-      tname='RED3114'
-      allocate (A(N,M,K),C(N,M,K))
-      allocate (B(N,M,K),CL(N,M,K))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      call serprod3(C,NN,MM,KK,NNL,iprod1)
-      call serlog3(CL,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=1,N,2
-        do j=1,M,2
-          do ii=1,K,2
-            B(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-!dvm$ parallel (i,j,ii) on B(i+1,j+1,ii+1)
-      do i=1,N-1,2
-        do j=1,M-1,2
-          do ii=1,K-1,2
-             B(i+1,j+1,ii+1)=.false.
-          enddo
-        enddo
-      enddo
-
-!dvm$ remote_access (B(1,1,1))
-      landt1 = B(1,1,1)    
-      iprodt1 = 1
-               
-!dvm$ actual(iprodt1,landt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.j).and.(j.eq.ii))  then
-              A(i,j,ii) = i
-            else
-              A(i,j,ii) =1
-            endif
-          enddo
-        enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( product( iprodt1 ),
-!dvm$* and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            iprodt1 = iprodt1*A(i,j,ii)
-            if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-            else
-              landt1 = landt1 .and. B(i,j,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1,landt1) 
- 
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,CL)
- 
-      end   
-C -----------------------------------------------------
-
-      subroutine sersum3(AR,N,M,K,NL,S)
-      integer AR(N,M,K)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo          
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
-      
-      subroutine sersum3m(AR,N,M,K,NL,S)
-      integer AR(N,M,K)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo 
-        enddo         
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      AR(ni,nj,nii)=N+M+K+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      AR(ni,nj,nii)=-(N+M+K+1+NL)
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-    
-      end   
-
-      subroutine sersum3mr(AR,N,M,K,NL,S)
-      real AR(N,M,K)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo 
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      AR(ni,nj,nii)=N+M+K+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      AR(ni,nj,nii)=-(N+M+K+1+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod3(AR,N,M,K,NL,P)
-      integer AR(N,M,K)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.j).and.(j.eq.ii))  then
-              AR(i,j,ii) = i
-            else
-              AR(i,j,ii) = 1
-            endif
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            P = P* AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr3(AR,N,M,K,NL,P)
-      real AR(N,M,K)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K 
-           if ((i.eq.j).and.(j.eq.ii))  then
-             AR(i,j,ii) = i
-           else
-             AR(i,j,ii) = 1.
-           endif
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            P = P* AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end
-
-      subroutine serlog3(AR,N,M,K,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K)
-      logical LAND,LOR,LEQV,LNEQV
-
-      do  i=1,N,1
-        do j=1,M,1
-          do ii=1,K,2
-            AR(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-            AR(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo 
-      do i=1,N
-        do j= 1,M
-          do ii=1,K
-           if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-            LAND=AR(1,1,1)
-            LOR=AR(1,1,1)
-            LEQV=AR(1,1,1)
-            LNEQV=AR(1,1,1)
-           else
-            LAND = LAND .and. AR(i,j,ii)
-            LOR = LOR .or.AR(i,j,ii)
-            LEQV = LEQV .eqv. AR(i,j,ii)
-            LNEQV = LNEQV .neqv. AR(i,j,ii)
-          endif
-         enddo
-        enddo
-      enddo
-      end   
-
-   
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red32.fdv
deleted file mode 100644
index 5a8909a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red32.fdv
+++ /dev/null
@@ -1,1064 +0,0 @@
-      program RED32
-
-c    TESTING OF THE REDUCTION CLAUSE .       
-c    REDUCTION OPERATION : SUM,PRODUCT,MAX,MIN,AND,OR, EQV,
-C    NEQV,MAXLOC,MINLOC AND THEIR COMBINATION ARE EXECUTED
-c    FOR DISTRIBUTED ARRAY A(N,M,K). 
-
-      print *,'===START OF RED32======================='
-C --------------------------------------------------
-      call red3201
-C --------------------------------------------------
-      call red3202
-C --------------------------------------------------
-      call red3203
-C -------------------------------------------------
-      call red3204
-C -------------------------------------------------
-      call red3205
-C -------------------------------------------------
-      call red3206
-C --------------------------------------------------
-      call red3207
-C --------------------------------------------------
-      call red3208
-C --------------------------------------------------
-      call red3209
-C -------------------------------------------------
-      call red3210
-C -------------------------------------------------
-       call red3211
-C -------------------------------------------------
-      call red3212
-C ------------------------------------------------- 
-      call red3213
-C --------------------------------------------------
-      call red3214
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF RED32 ========================= '    
-      end
-
-C ----------------------------------------------------RED3201
-      subroutine RED3201
-      integer, parameter :: N = 16,M=8,K=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer isum1,isumt1 
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*)    
-
-
-      tname='RED3201'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      call sersum3(C,NN,MM,KK,NNL,isum1)
-      isumt1 = 0
-
-!dvm$ actual(isumt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( sum( isumt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            isumt1 = isumt1+A(i,j,ii)
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1) 
-     
-      if (isum1 .eq.isumt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED3202
-      subroutine RED3202
-      integer, parameter :: N = 16,M=8,K=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer iprod1,iprodt1 
-                 
-!dvm$ distribute A(BLOCK,*,BLOCK)    
-      
-      tname='RED3202'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      call serprod3(C,NN,MM,KK,NNL,iprod1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.j).and.(j.eq.ii))  then
-              A(i,j,ii) = i
-            else
-              A(i,j,ii) =1
-            endif
-          enddo
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( product( iprodt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            iprodt1 = iprodt1*A(i,j,ii)
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED3203
-      subroutine RED3203
-      integer, parameter :: N = 16,M=8,K=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(*,BLOCK,BLOCK) 
-
-      tname='RED3203'
-      allocate (A(N,M,K),C(N,M,K))
-     
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-             A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1+NL
-      imax1=N+M+K+1+NL
-
-!dvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( max( imaxt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (A(i,j,ii).GT.imaxt1) imaxt1=A(i,j,ii)
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif    
-      deallocate (A,C)
-
-      end
-    
-C ----------------------------------------------------RED3204
-      subroutine RED3204
-      integer, parameter :: N = 16,M=8,K=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(BLOCK,BLOCK,*)
-
-      tname='RED3204'
-      allocate (A(N,M,K),C(N,M,K))
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-  
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=-(N+M+K+1+NL)
-      imin1=-(N+M+K+1+NL)
-
-!dvm$ remote_access (A(1,1,1))      
-      imint1=A(1,1,1)
-
-!dvm$ actual(imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( min( imint1 ) )
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            if (A(i,j,ii).LT.imint1) imint1=A(i,j,ii)
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1) 
-
-      if (imin1 .eq.imint1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED3205
-      subroutine RED3205
-      integer, parameter :: N = 16,M=8,K=8
-      real, parameter :: NL=1000.
-      character*7 tname
-      real, allocatable :: A(:,:,:),C(:,:,:)
-      integer ni
-      real imax1,imaxt1                  
-!dvm$ distribute A(BLOCK,*,BLOCK)
-
-      tname='RED3205'
-      allocate (A(N,M,K),C(N,M,K))
-     
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-           do ii=1,K
-             A(i,j,ii) = i+j+ii+NL
-           enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1.+NL
-      imax1=N+M+K+1.+NL
-
-!dvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( max( imaxt1 ) )
-      do i=2,N
-        do j=1,M
-          do ii=1,K                  
-            if (A(i,j,ii).GT.imaxt1) imaxt1=A(i,j,ii)
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-                    
-C -----------------------------------------------------RED3206
-      subroutine RED3206
-      integer, parameter :: N =8,M=8,K=8
-      real, parameter :: NL=1.
-      character*7 tname
-      real, allocatable :: A(:,:,:),C(:,:,:)
-      real iprod1,iprodt1 
-      real NNl
-                 
-!dvm$ distribute A(*,BLOCK,BLOCK)    
-
-      tname='RED3206'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      call serprodr3(C,NN,MM,KK,NNL,iprod1)
-      iprodt1 = 1.
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.j).and.(j.eq.ii))  then
-              A(i,j,ii) = i
-            else
-              A(i,j,ii) =1.
-            endif
-          enddo
-        enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( product( iprodt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            iprodt1 = iprodt1*A(i,j,ii)
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED3207
-      subroutine RED3207
-      integer, parameter :: N = 16,M=8,K=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:),C(:,:,:)
-      logical land1,landt1,leqv1,lneqv1,lor1
-
-!dvm$ distribute A(BLOCK,BLOCK,*)     
-
-      tname='RED3207'
-      allocate (A(N,M,K),C(N,M,K))
-      NN=N
-      MM=M
-      KK=K
-          
-      call serlog3(C,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            A(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-            A(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo
-                                  
-!dvm$ remote_access (A(1,1,1))
-      landt1 = A(1,1,1)
-
-!dvm$ actual(landt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( AND( landt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-!              landt1=A(i,j,ii)
-            else
-              landt1 = landt1 .and. A(i,j,ii)
-            endif
-          enddo
-        enddo 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(landt1) 
-      
-      if (land1 .eqv.landt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED3208
-      subroutine RED3208
-      integer, parameter :: N = 16,M=8,K=16      
-      character*7 tname
-      logical, allocatable :: A(:,:,:),C(:,:,:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1
-
-!dvm$ distribute A(BLOCK,*,BLOCK) 
-
-      tname='RED3208'
-      allocate (A(N,M,K),C(N,M,K))
-      NN=N
-      MM=M
-      KK=K
-      call serlog3(C,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            A(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-           A(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo
-                                                 
-!dvm$ remote_access (A(1,1,1))
-      lort1 = A(1,1,1)
-
-!dvm$ actual(lort1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( OR( lort1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-!              lort1=A(i,j,ii)
-            else
-              lort1 = lort1 .or. A(i,j,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lort1) 
-      
-      if (lor1 .eqv.lort1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED3209
-      subroutine RED3209
-      integer, parameter :: N = 16,M=8,K=8
-      logical, allocatable :: A(:,:,:),C(:,:,:)      
-      character*7 tname
-      logical land1,landt1,lor1,leqv1,leqvt1,lneqv1
-
-!dvm$ distribute A(*,BLOCK,BLOCK)
-
-      tname='RED3209'
-      allocate (A(N,M,K),C(N,M,K))
-      NN=N
-      MM=M
-      KK=K
-
-      call serlog3(C,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            A(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-            A(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo                                    
-
-!dvm$ remote_access (A(1,1,1))
-      leqvt1 = A(1,1,1)
-
-!dvm$ actual(leqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( EQV( leqvt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-!              leqvt1=A(i,j,ii)
-            else
-              leqvt1 = leqvt1 .eqv. A(i,j,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(leqvt1) 
-      
-      if (leqv1 .eqv.leqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED3210
-      subroutine RED3210
-      integer, parameter :: N = 16,M=8,K=8
-      logical, allocatable :: A(:,:,:),C(:,:,:)      
-      character*7 tname
-      logical land1,landt1,lor1,leqv1,lneqv1,lneqvt1
-
-!dvm$ distribute A(BLOCK,BLOCK,*)
-
-      tname='RED3210'
-      allocate (A(N,M,K),C(N,M,K))
-      NN=N
-      MM=M
-      KK=K
-      call serlog3(C,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            A(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-            A(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo
-                                  
-!dvm$ remote_access (A(1,1,1))
-      lneqvt1 = A(1,1,1)
-
-!dvm$ actual(lneqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( NEQV( lneqvt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-             continue
-!             lneqvt1=A(i,j,ii)
-            else
-             lneqvt1 = lneqvt1 .neqv. A(i,j,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lneqvt1) 
-
-      if (lneqv1 .eqv.lneqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C) 
- 
-      end
-C ----------------------------------------------------RED3211
-      subroutine RED3211
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-      integer it1,jt1,it2,jt2,iit1   
-      integer coor(3),lcoor              
-!dvm$ distribute A(BLOCK,*,BLOCK)
-
-      tname='RED3211'
-      allocate (A(N,M,K),C(N,M,K))
-     
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i*NL*NL+j*NL+ii
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1+NL*NL*NL
-      imax1=N+M+K+1+NL*NL*NL
-
-!dvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      lcoor=3
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-
-!dvm$ actual(imaxt1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii),
-!dvm$* reduction( maxloc( imaxt1,coor,3))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            if (A(i,j,ii).GT.imaxt1)then
-              imaxt1=A(i,j,ii)
-              coor(1)=i
-              coor(2)=j
-              coor(3)=ii
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,coor)
-
-      if ((imax1 .eq.imaxt1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED3212
-      subroutine RED3212
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imin1,imint1 ,ni
-      integer it1,jt1,it2,jt2,iit1                 
-      integer coor(3),lcoor
-!dvm$ distribute A(*,BLOCK,BLOCK)
-
-      tname='RED3212'
-      allocate (A(N,M,K),C(N,M,K))
-     
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i*NL*NL+j*NL+ii
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=-(N+M+K+1+NL*NL*NL)
-      imin1=-(N+M+K+1+NL*NL*NL)
-
-!dvm$ remote_access (A(1,1,1))
-      imint1=A(1,1,1)  
-
-      lcoor=3
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-
-!dvm$ actual(imint1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii),
-!dvm$* reduction( minloc( imint1,coor,3))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            if (A(i,j,ii).LT.imint1)then
-              imint1=A(i,j,ii)
-              coor(1)=i
-              coor(2)=j
-              coor(3)=ii
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,coor)
-
-      if ((imin1 .eq.imint1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED3213
-      subroutine RED3213
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-!dvm$ distribute A(BLOCK,BLOCK,*)
-
-      tname='RED3213'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      call sersum3m(C,NN,MM,KK,NNL,isum1)
-
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      A(ni,nj,nii)=N+M+K+1+NL
-      imax1=N+M+K+1+NL
-
-!dvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      ni1=N/2
-      nj1=M/2
-      nii1=K/2
-      A(ni1,nj1,nii1)=-(N+M+K+1+NL)
-      imin1=-(N+M+K+1+NL)
-
-!dvm$ remote_access (A(1,1,1))
-      imint1=A(1,1,1)
-
-      isumt1 = 0
-!dvm$ actual(isumt1,imaxt1,imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( sum( isumt1 ),
-!dvm$*max( imaxt1 ),min( imint1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            isumt1 = isumt1+A(i,j,ii)
-            if (A(i,j,ii).GT.imaxt1) imaxt1=A(i,j,ii)
-            if (A(i,j,ii).LT.imint1) imint1=A(i,j,ii)
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxt1,imint1) 
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED3214
-      subroutine RED3214
-      integer, parameter :: N = 16,M=8,K=16,NL=1
-      character*7 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:),CL(:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-               
-!dvm$ distribute A(BLOCK,*,BLOCK)    
-!dvm$ align B(I,J,II) with A(I,J,II)      
-
-      tname='RED3214'
-      allocate (A(N,M,K),C(N,M,K))
-      allocate (B(N,M,K),CL(N,M,K))
-
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      call serprod3(C,NN,MM,KK,NNL,iprod1)
-      call serlog3(CL,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            B(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            B(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo
-
-!dvm$ remote_access (B(1,1,1))
-      landt1 = B(1,1,1)    
-      iprodt1 = 1
-               
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.j).and.(j.eq.ii))  then
-              A(i,j,ii) = i
-            else
-              A(i,j,ii) =1
-            endif
-          enddo
-        enddo
-      enddo
-  
-!dvm$ actual(iprodt1,landt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii) on A(i,j,ii), reduction( product( iprodt1 ),
-!dvm$* and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            iprodt1 = iprodt1*A(i,j,ii)
-            if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-!              landt1=B(i,j,ii)
-            else
-              landt1 = landt1 .and. B(i,j,ii)
-            endif             
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1,landt1) 
- 
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,CL)
-      deallocate (A,C)
- 
-      end   
-C -----------------------------------------------------
-
-      subroutine sersum3(AR,N,M,K,NL,S)
-      integer AR(N,M,K)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo          
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
-   
-   
-      subroutine sersum3m(AR,N,M,K,NL,S)
-      integer AR(N,M,K)
-      integer S,NL
-
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo 
-        enddo         
-      enddo
-     
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      AR(ni,nj,nii)=N+M+K+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      AR(ni,nj,nii)=-(N+M+K+1+NL)
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-    
-      end   
-
-      subroutine sersum3mr(AR,N,M,K,NL,S)
-      real AR(N,M,K)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo 
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      AR(ni,nj,nii)=N+M+K+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      AR(ni,nj,nii)=-(N+M+K+1+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod3(AR,N,M,K,NL,P)
-      integer AR(N,M,K)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if ((i.eq.j).and.(j.eq.ii))  then
-              AR(i,j,ii) = i
-            else
-              AR(i,j,ii) =1
-            endif
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            P = P* AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr3(AR,N,M,K,NL,P)
-      real AR(N,M,K)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K 
-           if ((i.eq.j).and.(j.eq.ii))  then
-             AR(i,j,ii) = i
-           else
-             AR(i,j,ii) =1.
-           endif
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            P = P* AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end
-
-
-      subroutine serlog3(AR,N,M,K,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N,1
-        do j=1,M,1
-          do ii=1,K,2
-            AR(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-           AR(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo 
-
-      do i=1,N
-        do j= 1,M
-          do ii=1,K
-           if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1))  then
-             LAND=AR(1,1,1)
-             LOR=AR(1,1,1)
-             LEQV=AR(1,1,1)
-             LNEQV=AR(1,1,1)
-           else
-             LAND = LAND .and. AR(i,j,ii)
-             LOR = LOR .or.AR(i,j,ii)
-             LEQV = LEQV .eqv. AR(i,j,ii)
-             LNEQV = LNEQV .neqv. AR(i,j,ii)
-           endif
-         enddo
-       enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red41.fdv
deleted file mode 100644
index 0ceaa97..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red41.fdv
+++ /dev/null
@@ -1,1200 +0,0 @@
-      program RED41
-
-c    TESTING OF THE REDUCTION CLAUSE .       
-c    REDUCTION OPERATION : SUM,PRODUCT,MAX,MIN,AND,OR, EQV,
-C    NEQV,MAXLOC,MINLOC AND THEIR COMBINATION ARE EXECUTED
-c    FOR DISTRIBUTED ARRAY A(N,M,K,L). 
-
-      print *,'===START OF RED41======================='
-C --------------------------------------------------
-      call red4101
-C --------------------------------------------------
-      call red4102
-C --------------------------------------------------
-      call red4103
-C -------------------------------------------------
-      call red4104
-C -------------------------------------------------
-      call red4105
-C -------------------------------------------------
-      call red4106
-C --------------------------------------------------
-      call red4107
-C --------------------------------------------------
-      call red4108
-C --------------------------------------------------
-      call red4109
-C -------------------------------------------------
-      call red4110
-C -------------------------------------------------
-       call red4111
-C -------------------------------------------------
-      call red4112
-C ------------------------------------------------- 
-      call red4113
-C --------------------------------------------------
-      call red4114
-C --------------------------------------------------
-
-C
-C
-      print *,'=== END OF RED41 ========================= '    
-      end
-
-C ----------------------------------------------------RED4101
-      subroutine RED4101
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer isum1,isumt1 
-      
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)     
-
-      tname='RED4101'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call sersum4(C,NN,MM,KK,LL,NNL,isum1)
-      isumt1 = 0
-
-!dvm$ actual(isumt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj), reduction( sum( isumt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              isumt1 = isumt1+A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1) 
-     
-      if (isum1 .eq.isumt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED4102
-      subroutine RED4102
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=10
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer iprod1,iprodt1       
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-      
-      tname='RED4102'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprod4(C,NN,MM,KK,LL,NNL,iprod1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj)) then
-                A(i,j,ii,jj) = i
-              else
-                A(i,j,ii,jj) =1
-              endif
-            enddo
-          enddo
-        enddo 
-      enddo
-    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( product( iprodt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED4103
-      subroutine RED4103
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK) 
-
-      tname='RED4103'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( max( imaxt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-    
-C ----------------------------------------------------RED4104
-      subroutine RED4104
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)
-
-      tname='RED4104'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-  
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL)
-      imin1=-(N+M+K+L+1+NL)
-
-!dvm$ remote_access (A(1,1,1,1))      
-      imint1=A(1,1,1,1)
-
-!dvm$ actual(imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( min( imint1 ) )
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).LT.imint1) imint1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1) 
-
-      if (imin1 .eq.imint1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED4105
-      subroutine RED4105
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      real, parameter :: NL=1000.
-      character*7 tname
-      real, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer ni
-      real imax1,imaxt1                  
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)
-
-      tname='RED4105'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      
-      imax1=N+M+K+L+1.+NL
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( max( imaxt1 ) )
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L      
-              if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-                    
-C -----------------------------------------------------RED4106
-      subroutine RED4106
-      integer, parameter :: N = 8,M=8,K=8,L=8
-      real, parameter :: NL=1.
-      character*7 tname
-      real, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      real iprod1,iprodt1 
-      real NNl
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-      
-      tname='RED4106'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprodr4(C,NN,MM,KK,LL,NNL,iprod1)
-      iprodt1 = 1.
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj))  then
-                A(i,j,ii,jj) = i
-              else
-                A(i,j,ii,jj) =1.
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( product( iprodt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4107
-      subroutine RED4107
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,leqv1,lneqv1,lor1
-
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK) 
-
-      tname='RED4107'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NN=N
-      MM=M
-      KK=K
-      LL=L           
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              A(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ remote_access (A(1,1,1,1))
-      landt1 = A(1,1,1,1)
-
-!dvm$ actual(landt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( AND( landt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                landt1=A(i,j,ii,jj)
-              else
-                landt1 = landt1 .and. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo      
-!dvm$ end region   
-!dvm$ get_actual(landt1) 
-
-      if (land1 .eqv.landt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4108
-      subroutine RED4108
-      integer, parameter :: N = 16,M=8,K=16,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1
-
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK) 
-
-      tname='RED4108'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-               A(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-                
-!dvm$ remote_access (A(1,1,1,1))
-      lort1 = A(1,1,1,1)
-
-!dvm$ actual(lort1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( OR( lort1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                lORt1=A(i,j,ii,jj)
-              else
-                lort1 = lort1 .or. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lort1) 
-      
-      if (lor1 .eqv.lort1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4109
-      subroutine RED4109
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,leqvt1,lneqv1
-
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)
-
-      tname='RED4109'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-             do jj=1,L,2
-               A(i,j,ii,jj) = .true. 
-             enddo 
-           enddo
-         enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-                                     
-!dvm$ remote_access (A(1,1,1,1))
-      leqvt1 = A(1,1,1,1)
-
-!dvm$ actual(leqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( EQV( leqvt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                leqvt1=A(i,j,ii,jj)
-              else
-                leqvt1 = leqvt1 .eqv. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(leqvt1) 
-      
-      if (leqv1 .eqv.leqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4110
-      subroutine RED4110
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1,lneqvt1
-
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)
-
-      tname='RED4110'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              A(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ remote_access (A(1,1,1,1))
-      lneqvt1 = A(1,1,1,1)
-
-!dvm$ actual(lneqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( NEQV( lneqvt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                lneqvt1=A(i,j,ii,jj)
-              else
-                lneqvt1 = lneqvt1 .neqv. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lneqvt1) 
-      
-      if (lneqv1 .eqv.lneqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED4111
-      subroutine RED4111
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=100
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-      integer it1,jt1,it2,jt2,iit1,jjt1                 
-      integer coor(4),lcoor
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)
-
-      tname='RED4111'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i * NL*NL*NL+j*NL*NL+ii*NL+jj
-            enddo
-          enddo
-        enddo
-      enddo
-      
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL*NL*NL*NL      
-      imax1=N+M+K+L+1+NL*NL*NL*NL
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      lcoor=4
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-      coor(4)=0
-
-!dvm$ actual(imaxt1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( maxloc( imaxt1,coor,4))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).GT.imaxt1)then
-                imaxt1=A(i,j,ii,jj)
-                coor(1)=i
-                coor(2)=j
-                coor(3)=ii
-                coor(4)=jj 
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,coor)
-
-      if ((imax1 .eq.imaxt1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)
-     *.and.(coor(4).eq.njj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED4112
-      subroutine RED4112
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=100
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imin1,imint1 ,ni
-      integer it1,jt1,it2,jt2,iit1,jjt1
-      integer coor(4),lcoor
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)
-
-      tname='RED4112'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i*NL*NL*NL+j*NL*NL+ii*NL+jj
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL*NL*NL*NL )
-      
-      imin1=-(N+M+K+L+1+NL*NL*NL*NL )
-
-!dvm$ remote_access (A(1,1,1,1))
-      imint1=A(1,1,1,1)  
-
-      lcoor=4
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-      coor(4)=0
-
-!dvm$ actual(imint1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( minloc( imint1,coor,4))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).LT.imint1)then
-                imint1=A(i,j,ii,jj)
-                coor(1)=i
-                coor(2)=j
-                coor(3)=ii
-                coor(4)=jj 
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,coor)
-
-      if ((imin1 .eq.imint1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)
-     * .and.(coor(4).eq.njj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED4113
-      subroutine RED4113
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)
-
-      tname='RED4113'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-
-      call sersum4m(C,NN,MM,KK,LL,NNL,isum1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-c      print *,'before remote'
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL)              
-      imin1=-(N+M+K+L+1+NL)
-
-!dvm$ remote_access (A(1,1,1,1))
-      imint1=A(1,1,1,1)
-
-      isumt1 = 0
-c      print *,'before cycle' 
-!dvm$ actual(isumt1,imaxt1,imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( sum( isumt1 ),
-!dvm$*max( imaxt1 ),min( imint1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             isumt1 = isumt1+A(i,j,ii,jj)
-             if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-             if (A(i,j,ii,jj).LT.imint1) imint1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxt1,imint1) 
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED4114
-      subroutine RED4114
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:,:),CL(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1               
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ align B(I,J,II,JJ) with A(I,J,II,JJ)      
-
-      tname='RED4114'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      allocate (B(N,M,K,L),CL(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprod4(C,NN,MM,KK,LL,NNL,iprod1)
-      call serlog4(CL,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              B(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              B(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ remote_access (B(1,1,1,1))
-      landt1 = B(1,1,1,1)                   
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1,landt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj)) then
-               A(i,j,ii,jj) = i
-             else
-               A(i,j,ii,jj) =1
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( product( iprodt1 ), and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                 landt1=B(i,j,ii,jj)
-              else
-                 landt1 = landt1 .and. B(i,j,ii,jj)
-              endif
-!              landt1 = landt1 .and.B(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1,landt1) 
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,CL) 
-      deallocate (A,C)
-
-      end   
-C -----------------------------------------------------
-
-      subroutine sersum4(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo          
-          enddo
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end      
-   
-      subroutine sersum4m(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo 
-        enddo        
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1+NL)      
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo    
-      end   
-
-      subroutine sersum4mr(AR,N,M,K,L,NL,S)
-      real AR(N,M,K,L)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1.+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod4(AR,N,M,K,L,NL,P)
-      integer AR(N,M,K,L)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj))  then
-               AR(i,j,ii,jj) = i
-             else
-               AR(i,j,ii,jj) =1
-             endif
-            enddo
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr4(AR,N,M,K,L,NL,P)
-      real AR(N,M,K,L)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj)) then
-                AR(i,j,ii,jj) = i
-              else
-                AR(i,j,ii,jj) =1.
-              endif
-            enddo
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end
-     
-      subroutine serlog4(AR,N,M,K,L,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K,L)
-      logical LAND,LOR,LEQV,LNEQV
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-             AR(i,j,ii,jj) = .true.
-            enddo
-          enddo
-        enddo         
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              AR(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo 
-
-      do i=1,N
-        do j= 1,M
-          do ii=1,K
-            do jj=1,L
-             if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1).and.(jj.eq.1)) then
-               LAND=AR(1,1,1,1)
-               LOR=AR(1,1,1,1)
-               LEQV=AR(1,1,1,1)
-               LNEQV=AR(1,1,1,1)
-             else
-               LAND = LAND .and. AR(i,j,ii,jj)
-               LOR = LOR .or.AR(i,j,ii,jj)
-               LEQV = LEQV .eqv. AR(i,j,ii,jj)
-               LNEQV = LNEQV .neqv. AR(i,j,ii,jj)
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red42.fdv
deleted file mode 100644
index 8bf183e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red42.fdv
+++ /dev/null
@@ -1,1200 +0,0 @@
-      program RED42
-
-c    TESTING OF THE REDUCTION CLAUSE .       
-c    REDUCTION OPERATION : SUM,PRODUCT,MAX,MIN,AND,OR, EQV,
-C    NEQV,MAXLOC,MINLOC AND THEIR COMBINATION ARE EXECUTED
-c    FOR DISTRIBUTED ARRAY A(N,M,K,L). 
-
-      print *,'===START OF RED42======================='
-C --------------------------------------------------
-      call red4201
-C --------------------------------------------------
-      call red4202
-C --------------------------------------------------
-      call red4203
-C -------------------------------------------------
-      call red4204
-C -------------------------------------------------
-      call red4205
-C -------------------------------------------------
-      call red4206
-C --------------------------------------------------
-      call red4207
-C --------------------------------------------------
-      call red4208
-C --------------------------------------------------
-      call red4209
-C -------------------------------------------------
-      call red4210
-C -------------------------------------------------
-       call red4211
-C -------------------------------------------------
-      call red4212
-C ------------------------------------------------- 
-      call red4213
-C --------------------------------------------------
-      call red4214
-C --------------------------------------------------
-
-C
-C
-      print *,'=== END OF RED42 ========================= '    
-      end
-
-C ----------------------------------------------------RED4201
-      subroutine RED4201
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer isum1,isumt1 
-      
-!dvm$ distribute A(*,*,*,*)     
-
-      tname='RED4201'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call sersum4(C,NN,MM,KK,LL,NNL,isum1)
-      isumt1 = 0
-
-!dvm$ actual(isumt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj), reduction( sum( isumt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              isumt1 = isumt1+A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1) 
-     
-      if (isum1 .eq.isumt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED4202
-      subroutine RED4202
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=10
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer iprod1,iprodt1       
-                 
-!dvm$ distribute A(*,*,*,*)    
-      
-      tname='RED4202'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprod4(C,NN,MM,KK,LL,NNL,iprod1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj)) then
-                A(i,j,ii,jj) = i
-              else
-                A(i,j,ii,jj) =1
-              endif
-            enddo
-          enddo
-        enddo 
-      enddo
-    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( product( iprodt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED4203
-      subroutine RED4203
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(*,*,*,*) 
-
-      tname='RED4203'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( max( imaxt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-    
-C ----------------------------------------------------RED4204
-      subroutine RED4204
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(*,*,*,*)
-
-      tname='RED4204'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-  
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL)
-      imin1=-(N+M+K+L+1+NL)
-
-!dvm$ remote_access (A(1,1,1,1))      
-      imint1=A(1,1,1,1)
-
-!dvm$ actual(imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( min( imint1 ) )
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).LT.imint1) imint1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1) 
-
-      if (imin1 .eq.imint1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED4205
-      subroutine RED4205
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      real, parameter :: NL=1000.
-      character*7 tname
-      real, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer ni
-      real imax1,imaxt1                  
-!dvm$ distribute A(*,*,*,*)
-
-      tname='RED4205'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      
-      imax1=N+M+K+L+1.+NL
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( max( imaxt1 ) )
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L      
-              if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-                    
-C -----------------------------------------------------RED4206
-      subroutine RED4206
-      integer, parameter :: N = 8,M=8,K=8,L=8
-      real, parameter :: NL=1.
-      character*7 tname
-      real, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      real iprod1,iprodt1 
-      real NNl
-                 
-!dvm$ distribute A(*,*,*,*)    
-      
-      tname='RED4206'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprodr4(C,NN,MM,KK,LL,NNL,iprod1)
-      iprodt1 = 1.
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj))  then
-                A(i,j,ii,jj) = i
-              else
-                A(i,j,ii,jj) =1.
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( product( iprodt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4207
-      subroutine RED4207
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,leqv1,lneqv1,lor1
-
-!dvm$ distribute A(*,*,*,*) 
-
-      tname='RED4207'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NN=N
-      MM=M
-      KK=K
-      LL=L           
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              A(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ remote_access (A(1,1,1,1))
-      landt1 = A(1,1,1,1)
-
-!dvm$ actual(landt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( AND( landt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                landt1=A(i,j,ii,jj)
-              else
-                landt1 = landt1 .and. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo      
-!dvm$ end region   
-!dvm$ get_actual(landt1) 
-
-      if (land1 .eqv.landt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4208
-      subroutine RED4208
-      integer, parameter :: N = 16,M=8,K=16,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1
-
-!dvm$ distribute A(*,*,*,*) 
-
-      tname='RED4208'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-               A(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-                
-!dvm$ remote_access (A(1,1,1,1))
-      lort1 = A(1,1,1,1)
-
-!dvm$ actual(lort1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( OR( lort1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                lORt1=A(i,j,ii,jj)
-              else
-                lort1 = lort1 .or. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lort1) 
-      
-      if (lor1 .eqv.lort1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4209
-      subroutine RED4209
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,leqvt1,lneqv1
-
-!dvm$ distribute A(*,*,*,*)
-
-      tname='RED4209'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-             do jj=1,L,2
-               A(i,j,ii,jj) = .true. 
-             enddo 
-           enddo
-         enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-                                     
-!dvm$ remote_access (A(1,1,1,1))
-      leqvt1 = A(1,1,1,1)
-
-!dvm$ actual(leqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( EQV( leqvt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                leqvt1=A(i,j,ii,jj)
-              else
-                leqvt1 = leqvt1 .eqv. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(leqvt1) 
-      
-      if (leqv1 .eqv.leqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4210
-      subroutine RED4210
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1,lneqvt1
-
-!dvm$ distribute A(*,*,*,*)
-
-      tname='RED4210'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              A(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ remote_access (A(1,1,1,1))
-      lneqvt1 = A(1,1,1,1)
-
-!dvm$ actual(lneqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( NEQV( lneqvt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                lneqvt1=A(i,j,ii,jj)
-              else
-                lneqvt1 = lneqvt1 .neqv. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lneqvt1) 
-      
-      if (lneqv1 .eqv.lneqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED4211
-      subroutine RED4211
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=100
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-      integer it1,jt1,it2,jt2,iit1,jjt1                 
-      integer coor(4),lcoor
-!dvm$ distribute A(*,*,*,*)
-
-      tname='RED4211'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i*NL*NL*NL+j*NL*NL+ii*NL+jj
-            enddo
-          enddo
-        enddo
-      enddo
-      
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL*NL*NL*NL       
-      imax1=N+M+K+L+1+NL*NL*NL*NL 
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      lcoor=4
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-      coor(4)=0
-
-!dvm$ actual(imaxt1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( maxloc( imaxt1,coor,4))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).GT.imaxt1)then
-                imaxt1=A(i,j,ii,jj)
-                coor(1)=i
-                coor(2)=j
-                coor(3)=ii
-                coor(4)=jj 
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,coor)
-
-      if ((imax1 .eq.imaxt1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)
-     *.and.(coor(4).eq.njj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED4212
-      subroutine RED4212
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=100
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imin1,imint1 ,ni
-      integer it1,jt1,it2,jt2,iit1,jjt1
-      integer coor(4),lcoor
-                 
-!dvm$ distribute A(*,*,*,*)
-
-      tname='RED4212'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i*NL*NL*NL+j*NL*NL+ii*NL+jj
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL*NL*NL*NL )
-      
-      imin1=-(N+M+K+L+1+NL*NL*NL*NL )
-
-!dvm$ remote_access (A(1,1,1,1))
-      imint1=A(1,1,1,1)  
-
-      lcoor=4
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-      coor(4)=0
-
-!dvm$ actual(imint1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( minloc( imint1,coor,4))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).LT.imint1)then
-                imint1=A(i,j,ii,jj)
-                coor(1)=i
-                coor(2)=j
-                coor(3)=ii
-                coor(4)=jj 
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,coor)
-
-      if ((imin1 .eq.imint1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)
-     * .and.(coor(4).eq.njj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED4213
-      subroutine RED4213
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-!dvm$ distribute A(*,*,*,*)
-
-      tname='RED4213'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-
-      call sersum4m(C,NN,MM,KK,LL,NNL,isum1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-c      print *,'before remote'
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL)              
-      imin1=-(N+M+K+L+1+NL)
-
-!dvm$ remote_access (A(1,1,1,1))
-      imint1=A(1,1,1,1)
-
-      isumt1 = 0
-c      print *,'before cycle' 
-!dvm$ actual(isumt1,imaxt1,imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( sum( isumt1 ),
-!dvm$*max( imaxt1 ),min( imint1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             isumt1 = isumt1+A(i,j,ii,jj)
-             if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-             if (A(i,j,ii,jj).LT.imint1) imint1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxt1,imint1) 	  
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED4214
-      subroutine RED4214
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:,:),CL(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1               
-                 
-!dvm$ distribute A(*,*,*,*)    
-!dvm$ align B(I,J,II,JJ) with A(I,J,II,JJ)      
-
-      tname='RED4214'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      allocate (B(N,M,K,L),CL(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprod4(C,NN,MM,KK,LL,NNL,iprod1)
-      call serlog4(CL,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              B(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              B(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ remote_access (B(1,1,1,1))
-      landt1 = B(1,1,1,1)                   
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1,landt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj)) then
-               A(i,j,ii,jj) = i
-             else
-               A(i,j,ii,jj) =1
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( product( iprodt1 ), and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                 landt1=B(i,j,ii,jj)
-              else
-                 landt1 = landt1 .and. B(i,j,ii,jj)
-              endif
-!              landt1 = landt1 .and.B(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1,landt1) 
- 
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,CL) 
-      deallocate (A,C)
-
-      end   
-C -----------------------------------------------------
-
-      subroutine sersum4(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo          
-          enddo
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end      
-   
-      subroutine sersum4m(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo 
-        enddo        
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1+NL)      
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo    
-      end   
-
-      subroutine sersum4mr(AR,N,M,K,L,NL,S)
-      real AR(N,M,K,L)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1.+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod4(AR,N,M,K,L,NL,P)
-      integer AR(N,M,K,L)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj))  then
-               AR(i,j,ii,jj) = i
-             else
-               AR(i,j,ii,jj) =1
-             endif
-            enddo
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr4(AR,N,M,K,L,NL,P)
-      real AR(N,M,K,L)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj)) then
-                AR(i,j,ii,jj) = i
-              else
-                AR(i,j,ii,jj) =1.
-              endif
-            enddo
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end
-     
-      subroutine serlog4(AR,N,M,K,L,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K,L)
-      logical LAND,LOR,LEQV,LNEQV
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-             AR(i,j,ii,jj) = .true.
-            enddo
-          enddo
-        enddo         
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              AR(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo 
-
-      do i=1,N
-        do j= 1,M
-          do ii=1,K
-            do jj=1,L
-             if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1).and.(jj.eq.1)) then
-               LAND=AR(1,1,1,1)
-               LOR=AR(1,1,1,1)
-               LEQV=AR(1,1,1,1)
-               LNEQV=AR(1,1,1,1)
-             else
-               LAND = LAND .and. AR(i,j,ii,jj)
-               LOR = LOR .or.AR(i,j,ii,jj)
-               LEQV = LEQV .eqv. AR(i,j,ii,jj)
-               LNEQV = LNEQV .neqv. AR(i,j,ii,jj)
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red43.fdv
deleted file mode 100644
index 0739f5b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTION/red43.fdv
+++ /dev/null
@@ -1,1200 +0,0 @@
-      program RED43
-
-c    TESTING OF THE REDUCTION CLAUSE .       
-c    REDUCTION OPERATION : SUM,PRODUCT,MAX,MIN,AND,OR, EQV,
-C    NEQV,MAXLOC,MINLOC AND THEIR COMBINATION ARE EXECUTED
-c    FOR DISTRIBUTED ARRAY A(N,M,K,L). 
-
-      print *,'===START OF RED43======================='
-C --------------------------------------------------
-      call red4301
-C --------------------------------------------------
-      call red4302
-C --------------------------------------------------
-      call red4303
-C -------------------------------------------------
-      call red4304
-C -------------------------------------------------
-      call red4305
-C -------------------------------------------------
-      call red4306
-C --------------------------------------------------
-      call red4307
-C --------------------------------------------------
-      call red4308
-C --------------------------------------------------
-      call red4309
-C -------------------------------------------------
-      call red4310
-C -------------------------------------------------
-       call red4311
-C -------------------------------------------------
-      call red4312
-C ------------------------------------------------- 
-      call red4313
-C --------------------------------------------------
-      call red4314
-C --------------------------------------------------
-
-C
-C
-      print *,'=== END OF RED43 ========================= '    
-      end
-
-C ----------------------------------------------------RED4301
-      subroutine RED4301
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer isum1,isumt1 
-      
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,*)     
-
-      tname='RED4301'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call sersum4(C,NN,MM,KK,LL,NNL,isum1)
-      isumt1 = 0
-
-!dvm$ actual(isumt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj), reduction( sum( isumt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              isumt1 = isumt1+A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1) 
-     
-      if (isum1 .eq.isumt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C -----------------------------------------------------RED4302
-      subroutine RED4302
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=10
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer iprod1,iprodt1       
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*,BLOCK)    
-      
-      tname='RED4302'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprod4(C,NN,MM,KK,LL,NNL,iprod1)
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj)) then
-                A(i,j,ii,jj) = i
-              else
-                A(i,j,ii,jj) =1
-              endif
-            enddo
-          enddo
-        enddo 
-      enddo
-    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( product( iprodt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED4303
-      subroutine RED4303
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(BLOCK,*,BLOCK,BLOCK) 
-
-      tname='RED4303'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( max( imaxt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-    
-C ----------------------------------------------------RED4304
-      subroutine RED4304
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-                       
-!dvm$ distribute A(*,BLOCK,BLOCK,BLOCK)
-
-      tname='RED4304'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-  
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL)
-      imin1=-(N+M+K+L+1+NL)
-
-!dvm$ remote_access (A(1,1,1,1))      
-      imint1=A(1,1,1,1)
-
-!dvm$ actual(imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( min( imint1 ) )
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).LT.imint1) imint1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1) 
-
-      if (imin1 .eq.imint1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED4305
-      subroutine RED4305
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      real, parameter :: NL=1000.
-      character*7 tname
-      real, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer ni
-      real imax1,imaxt1                  
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,*)
-
-      tname='RED4305'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      
-      imax1=N+M+K+L+1.+NL
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-!dvm$ actual(imaxt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( max( imaxt1 ) )
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L      
-              if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1) 
-
-      if (imax1 .eq.imaxt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-                    
-C -----------------------------------------------------RED4306
-      subroutine RED4306
-      integer, parameter :: N = 8,M=8,K=8,L=8
-      real, parameter :: NL=1.
-      character*7 tname
-      real, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      real iprod1,iprodt1 
-      real NNl
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*,BLOCK)    
-      
-      tname='RED4306'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprodr4(C,NN,MM,KK,LL,NNL,iprod1)
-      iprodt1 = 1.
-
-!dvm$ actual(iprodt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj))  then
-                A(i,j,ii,jj) = i
-              else
-                A(i,j,ii,jj) =1.
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( product( iprodt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1) 
- 
-      if (iprod1 .eq.iprodt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4307
-      subroutine RED4307
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,leqv1,lneqv1,lor1
-
-!dvm$ distribute A(BLOCK,*,BLOCK,BLOCK) 
-
-      tname='RED4307'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NN=N
-      MM=M
-      KK=K
-      LL=L           
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              A(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ remote_access (A(1,1,1,1))
-      landt1 = A(1,1,1,1)
-
-!dvm$ actual(landt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( AND( landt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                landt1=A(i,j,ii,jj)
-              else
-                landt1 = landt1 .and. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo      
-!dvm$ end region   
-!dvm$ get_actual(landt1) 
-
-      if (land1 .eqv.landt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4308
-      subroutine RED4308
-      integer, parameter :: N = 16,M=8,K=16,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,lor1,lort1,leqv1,lneqv1
-
-!dvm$ distribute A(*,BLOCK,BLOCK,BLOCK) 
-
-      tname='RED4308'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-               A(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-                
-!dvm$ remote_access (A(1,1,1,1))
-      lort1 = A(1,1,1,1)
-
-!dvm$ actual(lort1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( OR( lort1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                lORt1=A(i,j,ii,jj)
-              else
-                lort1 = lort1 .or. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lort1) 
-      
-      if (lor1 .eqv.lort1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4309
-      subroutine RED4309
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,leqvt1,lneqv1
-
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,*)
-
-      tname='RED4309'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-         do j=1,M
-           do ii=1,K
-             do jj=1,L,2
-               A(i,j,ii,jj) = .true. 
-             enddo 
-           enddo
-         enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-                                     
-!dvm$ remote_access (A(1,1,1,1))
-      leqvt1 = A(1,1,1,1)
-
-!dvm$ actual(leqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( EQV( leqvt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                leqvt1=A(i,j,ii,jj)
-              else
-                leqvt1 = leqvt1 .eqv. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(leqvt1) 
-      
-      if (leqv1 .eqv.leqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C -----------------------------------------------------RED4310
-      subroutine RED4310
-      integer, parameter :: N = 16,M=8,K=8,L=8
-      character*7 tname
-      logical, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1,lneqvt1
-
-!dvm$ distribute A(BLOCK,BLOCK,*,BLOCK)
-
-      tname='RED4310'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serlog4(C,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-                                    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              A(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              A(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ remote_access (A(1,1,1,1))
-      lneqvt1 = A(1,1,1,1)
-
-!dvm$ actual(lneqvt1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( NEQV( lneqvt1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                lneqvt1=A(i,j,ii,jj)
-              else
-                lneqvt1 = lneqvt1 .neqv. A(i,j,ii,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(lneqvt1) 
-      
-      if (lneqv1 .eqv.lneqvt1) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
- 
-      end
-C ----------------------------------------------------RED4311
-      subroutine RED4311
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=100
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin
-      integer it1,jt1,it2,jt2,iit1,jjt1                 
-      integer coor(4),lcoor
-!dvm$ distribute A(BLOCK,*,BLOCK,BLOCK)
-
-      tname='RED4311'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i*NL*NL*NL+j*NL*NL+ii*NL+jj
-            enddo
-          enddo
-        enddo
-      enddo
-      
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL*NL*NL*NL       
-      imax1=N+M+K+L+1+NL*NL*NL*NL 
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      lcoor=4
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-      coor(4)=0
-
-!dvm$ actual(imaxt1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( maxloc( imaxt1,coor,4))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).GT.imaxt1)then
-                imaxt1=A(i,j,ii,jj)
-                coor(1)=i
-                coor(2)=j
-                coor(3)=ii
-                coor(4)=jj 
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imaxt1,coor)
-
-      if ((imax1 .eq.imaxt1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)
-     *.and.(coor(4).eq.njj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED4312
-      subroutine RED4312
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=100
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imin1,imint1 ,ni
-      integer it1,jt1,it2,jt2,iit1,jjt1
-      integer coor(4),lcoor
-                 
-!dvm$ distribute A(*,BLOCK,BLOCK,BLOCK)
-
-      tname='RED4312'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-     
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i*NL*NL*NL+j*NL*NL+ii*NL+jj
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL*NL*NL*NL )
-      
-      imin1=-(N+M+K+L+1+NL*NL*NL*NL )
-
-!dvm$ remote_access (A(1,1,1,1))
-      imint1=A(1,1,1,1)  
-
-      lcoor=4
-      coor(1)=0
-      coor(2)=0
-      coor(3)=0
-      coor(4)=0
-
-!dvm$ actual(imint1,coor,lcoor)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( minloc( imint1,coor,4))
-      do i=2,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (A(i,j,ii,jj).LT.imint1)then
-                imint1=A(i,j,ii,jj)
-                coor(1)=i
-                coor(2)=j
-                coor(3)=ii
-                coor(4)=jj 
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(imint1,coor)
-
-      if ((imin1 .eq.imint1) .and.(coor(1).eq.ni)
-     *.and.(coor(2).eq.nj).and.(coor(3).eq.nii)
-     * .and.(coor(4).eq.njj)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      
-      end
-C ----------------------------------------------------RED4313
-      subroutine RED4313
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1000
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,*)
-
-      tname='RED4313'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-
-      call sersum4m(C,NN,MM,KK,LL,NNL,isum1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-c      print *,'before remote'
-
-!dvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL)              
-      imin1=-(N+M+K+L+1+NL)
-
-!dvm$ remote_access (A(1,1,1,1))
-      imint1=A(1,1,1,1)
-
-      isumt1 = 0
-c      print *,'before cycle' 
-!dvm$ actual(isumt1,imaxt1,imint1)
-!dvm$ region
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( sum( isumt1 ),
-!dvm$*max( imaxt1 ),min( imint1 ) )
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             isumt1 = isumt1+A(i,j,ii,jj)
-             if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-             if (A(i,j,ii,jj).LT.imint1) imint1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo 
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(isumt1,imaxt1,imint1) 
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------RED4314
-      subroutine RED4314
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1
-      character*7 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:,:),CL(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1               
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*,BLOCK)    
-!dvm$ align B(I,J,II,JJ) with A(I,J,II,JJ)      
-
-      tname='RED4314'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      allocate (B(N,M,K,L),CL(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprod4(C,NN,MM,KK,LL,NNL,iprod1)
-      call serlog4(CL,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              B(i,j,ii,jj) = .true. 
-            enddo 
-          enddo
-        enddo        
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              B(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ remote_access (B(1,1,1,1))
-      landt1 = B(1,1,1,1)                   
-      iprodt1 = 1
-
-!dvm$ actual(iprodt1,landt1)
-!dvm$ region local(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj)) then
-               A(i,j,ii,jj) = i
-             else
-               A(i,j,ii,jj) =1
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$* reduction( product( iprodt1 ), and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-              if ((i.eq.1).and.(j.eq.1)
-     *.and.(ii.eq.1).and.(jj.eq.1)) then
-!                 landt1=B(i,j,ii,jj)
-              else
-                 landt1 = landt1 .and. B(i,j,ii,jj)
-              endif
-!              landt1 = landt1 .and.B(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(iprodt1,landt1) 
- 
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,CL) 
-      deallocate (A,C)
-
-      end   
-C -----------------------------------------------------
-
-      subroutine sersum4(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo          
-          enddo
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end      
-   
-      subroutine sersum4m(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo 
-        enddo        
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1+NL)      
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo    
-      end   
-
-      subroutine sersum4mr(AR,N,M,K,L,NL,S)
-      real AR(N,M,K,L)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1.+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod4(AR,N,M,K,L,NL,P)
-      integer AR(N,M,K,L)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj))  then
-               AR(i,j,ii,jj) = i
-             else
-               AR(i,j,ii,jj) =1
-             endif
-            enddo
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr4(AR,N,M,K,L,NL,P)
-      real AR(N,M,K,L)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              if ((i.eq.j).and.(j.eq.ii).and.(ii.eq.jj)) then
-                AR(i,j,ii,jj) = i
-              else
-                AR(i,j,ii,jj) =1.
-              endif
-            enddo
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end
-     
-      subroutine serlog4(AR,N,M,K,L,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K,L)
-      logical LAND,LOR,LEQV,LNEQV
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-             AR(i,j,ii,jj) = .true.
-            enddo
-          enddo
-        enddo         
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2
-              AR(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo 
-
-      do i=1,N
-        do j= 1,M
-          do ii=1,K
-            do jj=1,L
-             if ((i.eq.1).and.(j.eq.1).and.(ii.eq.1).and.(jj.eq.1)) then
-               LAND=AR(1,1,1,1)
-               LOR=AR(1,1,1,1)
-               LEQV=AR(1,1,1,1)
-               LNEQV=AR(1,1,1,1)
-             else
-               LAND = LAND .and. AR(i,j,ii,jj)
-               LOR = LOR .or.AR(i,j,ii,jj)
-               LEQV = LEQV .eqv. AR(i,j,ii,jj)
-               LNEQV = LNEQV .neqv. AR(i,j,ii,jj)
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda11.fdv
deleted file mode 100644
index 677f781..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda11.fdv
+++ /dev/null
@@ -1,400 +0,0 @@
-      program REDA11
-
-c    TESTING OF THE REDUCTION_GROUP DIRECTIVE,REDUCTION_START
-c    DIRECTIVE,REDUCTION_WAIT DIRECTIVE.
-c    REDUCTION GROUP IS EXECUTED FOR DISTRIBUTED ARRAY A(N).  
-c
-
-      print *,'===START OF REDA11========================'
-C --------------------------------------------------
-      call reda1101
-C --------------------------------------------------
-      call reda1102
-C --------------------------------------------------
-      call reda1103
-C --------------------------------------------------
-      call reda1104
-C --------------------------------------------------
-C
-      print *,'=== END OF REDA11 ========================= '    
-
-      end
-
-C ----------------------------------------------------REDA1101
-      subroutine REDA1101
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),C(:)
-      integer isum1,isumt1 
-      integer imax1,imaxt1 ,ni,imin1,imint1
-      character(8) :: tname='REDA1101'
-
-!dvm$ distribute A(BLOCK)     
-!dvm$ reduction_group smaxmin
-      allocate (A(N),C(N))
-      NNL=NL 
-      NN=N
-      call sersum1m(C,NN,NNL,isum1)
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-
-      ni=N/2-1
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      ni=N/2
-      A(ni)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-  
-      isumt1 = 0
-
-!dvm$ parallel (i) on A(i),
-!dvm$*reduction(smaxmin:sum(isumt1),max(imaxt1),min(imint1))
-      do i=1,N
-         isumt1 = isumt1+A(i)
-         if (A(i).GT.imaxt1) imaxt1=A(i)
-         if (A(i).LT.imint1) imint1=A(i)
-      enddo
-
-!dvm$ reduction_start smaxmin
-!dvm$ reduction_wait smaxmin
-
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A,C)
-
-      end
-
-C -----------------------------------------------------REDA1102
-      subroutine REDA1102
-      integer, parameter :: N = 16, NL=1000
-      integer, allocatable :: A(:),C(:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:),CL(:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-      character(8) :: tname='REDA1102'
-                 
-!dvm$ distribute A(BLOCK)     
-!dvm$ align B(I) with A(I)
-!dvm$ reduction_group prodand      
-      allocate (A(N),C(N))
-      allocate (B(N),CL(N))
-      NNL=NL
-      NN=N
-      call serprod1(C,NN,NNL,iprod1)
-      call serlog1(CL,NN,land1,lor1,leqv1,lneqv1)  
-               
-!dvm$ parallel (i) on B(i)
-      do i=1,N,2
-         B(i) = .true.
-      enddo
-!dvm$ parallel (i) on B(i+1)
-      do i=1,N-1,2
-         B(i+1)=.false.
-      enddo
-
-!dvm$ remote_access (B(1))
-      landt1 = B(1)
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-      iprodt1 = 1
-
-!dvm$ parallel (i) on B(i),
-!dvm$*reduction(prodand:product( iprodt1 ),and(landt1))
-      do i=1,N
-         iprodt1 = iprodt1*A(i)
-         landt1 = landt1 .and.B(i)
-      enddo
-
-!dvm$ reduction_start prodand
-
-!dvm$ parallel (i) on A(i)
-      do  i=1,N
-         A(i) = i+NL
-      enddo
-
-!dvm$ reduction_wait prodand
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then     
-          call ansyes(tname)
-       else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A,C)
-      deallocate (B,CL)
- 
-      end
-
-C ----------------------------------------------------REDA1103
-      subroutine REDA1103
-      integer, parameter :: N = 8,NL=1000
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin1,imint1,it1,it2,lit
-      integer imaxloct1,iminloct1
-      character(8) :: tname='REDA1103'
-
-!dvm$ distribute A(BLOCK)    
-!dvm$ reduction_group locmaxmin
-c dvm$ reduction_group maxminloc
-
-      allocate (A(N),C(N))
-      
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2+2
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2+1
-      A(ni1)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-
-      iminloct1=imint1
-      lit=1
-      it1=0
-      it2=0
-
-!dvm$ parallel (i) on A(i),
-!dvm$*reduction(locmaxmin:max( imaxt1 ),
-!dvm$*maxloc( imaxloct1,it1,lit),
-!dvm$*minloc( iminloct1,it2,lit))
-
-      do i=1,N
-         if (A(i).GT.imaxt1) imaxt1 =A(i)
-         if (A(i).GT.imaxloct1) then
-	   imaxloct1=A(i)
-           it1=i 
-         endif
-         if (A(i).LT.iminloct1) then
-           iminloct1=A(i)
-           it2=i
-         endif
-      enddo
-
-!dvm$ reduction_start locmaxmin
-!dvm$ reduction_wait locmaxmin
-
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(imaxt1.eq.imaxloct1).and.(it1.eq.ni)
-     *.and.(it2.eq.ni1) )   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------REDA1104
-      subroutine REDA1104
-      integer, parameter :: N = 16
-      real, parameter :: NL=1000.
-      real, allocatable :: A(:),C(:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer it1,it2,ni,ni1,lit          
-      character(8) :: tname='REDA1104'
-
-!dvm$ distribute A(BLOCK)     
-!dvm$ reduction_group locsumloc
-
-      allocate (A(N),C(N))
-      NNL=NL 
-      NN=N
-      call sersum1mr(C,NN,NNL,isum1)
-
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2+1
-      A(ni)=N+1.+NL
-      imax1=N+1.+NL
-
-!dvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2+2
-      A(ni1)=-(N+1.+NL)
-      imin1=-(N+1.+NL)
-
-!dvm$ remote_access (A(1))      
-      imint1=A(1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lit=1
-      it1=0
-      it2=0
-
-!dvm$ parallel (i) on A(i),
-!dvm$*reduction(locsumloc:sum( isumt1 ),
-!dvm$*maxloc( imaxloct1,it1,lit),minloc( iminloct1,it2,lit ))
-      do i=1,N
-         isumt1 = isumt1+A(i)
-         if (A(i).GT.imaxloct1) then
-           imaxloct1=A(i)
-           it1=i
-         endif         
-         if (A(i).LT.iminloct1) then
-           iminloct1=A(i)
-           it2=i
-         endif
-      enddo
-
-!dvm$ reduction_start locsumloc
-!dvm$ reduction_wait locsumloc
-
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(it1.eq.ni)
-     *.and.(it2.eq.ni1) )   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
- 
-      deallocate (A,C)
-
-      end
-
-C -----------------------------------------------------
-
-      subroutine sersum1(AR,N,NL,S)
-      integer AR(N)
-      integer S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      S=0
-      do i=1,N
-         s = s+ AR(i)
-      enddo
-      end   
-   
-C ------
-      subroutine sersum1m(AR,N,NL,S)
-      integer AR(N)
-      integer S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      ni=N/2-1
-      AR(ni)=N+1+NL
-      ni=N/2
-      AR(ni)=-(N+1+NL)
-      S=0
-      do i=1,N
-         s = s+ AR(i)
-      enddo
-      end 
-  
-C ------
-      subroutine sersum1mr(AR,N,NL,S)
-      real AR(N)
-      real S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      ni=N/2+1
-      AR(ni)=N+1.+NL
-      ni=N/2+2
-      AR(ni)=-(N+1.+NL)
-      S=0.
-      do i=1,N
-         S = S+ AR(i)
-      enddo
-      end  
-  
-C ------
-      subroutine serprod1(AR,N,NL,P)
-      integer AR(N)
-      integer P,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      P=1
-      do i=1,N
-         P = P* AR(i)
-      enddo
-      end   
- 
-      subroutine serprodr1(AR,N,NL,P)
-      real AR(N)
-      real P,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      P=1.
-      do i=1,N
-         P = P* AR(i)
-      enddo
-      end
-     
-C ------
-      subroutine serlog1(AR,N,LAND,LOR,LEQV,LNEQV)
-      logical AR(N)
-      logical LAND,LOR,LEQV,LNEQV
-      do i=1,N,2
-         AR(i) = .true.
-         AR(i+1)=.false.          
-      enddo
-      LAND=AR(1)
-      LOR=AR(1)
-      LEQV=AR(1)
-      LNEQV=AR(1)
-      do i=2,N
-         LAND = LAND .and. AR(i)
-         LOR = LOR .or.AR(i)
-      enddo
-      do i=1,N,2
-         LEQV = LEQV .eqv. AR(i)
-      enddo
-      do i=1,N
-         LNEQV = LNEQV .neqv. AR(i)
-      enddo
-      end   
-
-C -----------------------------------------------------
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda12.fdv
deleted file mode 100644
index 2a36de2..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda12.fdv
+++ /dev/null
@@ -1,392 +0,0 @@
-      program REDA12
-
-c    TESTING OF THE REDUCTION_GROUP DIRECTIVE,REDUCTION_START
-c    DIRECTIVE,REDUCTION_WAIT DIRECTIVE.
-c    REDUCTION GROUPE IS EXECUTED FOR DISTRIBUTED ARRAY A(N).  
-c
-
-      print *,'===START OF REDA12========================'
-C --------------------------------------------------
-      call reda1201
-C --------------------------------------------------
-      call reda1202
-C --------------------------------------------------
-       call reda1203
-C --------------------------------------------------
-       call reda1204
-C --------------------------------------------------
-C
-      print *,'=== END OF REDA12 ========================= '    
-      end
-
-
-C ----------------------------------------------------REDA1201
-      subroutine REDA1201
-      integer, parameter :: N = 16,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:),C(:)
-      integer isum1,isumt1 
-      integer imax1,imaxt1 ,ni,imin1,imint1
-                 
-cdvm$ distribute A(*)     
-cdvm$ reduction_group smaxmin
-      tname='REDA1201'
-      allocate (A(N),C(N))
-      NNL=NL 
-      NN=N
-      call sersum1m(C,NN,NNL,isum1)
-
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2-1
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-cdvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      ni=N/2
-      A(ni)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-cdvm$ remote_access (A(1))      
-      imint1=A(1)
-  
-      isumt1 = 0
-
-*dvm$ parallel (i) on A(i),
-*dvm$*reduction(smaxmin:sum(isumt1),max(imaxt1),min(imint1))
-      do i=1,N
-         isumt1 = isumt1+A(i)
-         if (A(i).GT.imaxt1) imaxt1=A(i)
-         if (A(i).LT.imint1) imint1=A(i)
-      enddo
-
-cdvm$ reduction_start smaxmin
-cdvm$ reduction_wait smaxmin
-
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-C -----------------------------------------------------REDA1202
-      subroutine REDA1202
-      integer, parameter :: N = 16, NL=1000
-      character*8 tname
-      integer, allocatable :: A(:),C(:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:),CL(:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-                 
-cdvm$ distribute A(*)     
-cdvm$ align B(I) with A(I)
-cdvm$ reduction_group prodand      
-      tname='REDA1202'
-      allocate (A(N),C(N))
-      allocate (B(N),CL(N))
-      NNL=NL
-      NN=N
-      call serprod1(C,NN,NNL,iprod1)
-      call serlog1(CL,NN,land1,lor1,leqv1,lneqv1)  
-               
-*dvm$ parallel (i) on B(i)
-      do i=1,N,2
-         B(i) = .true.
-      enddo
-*dvm$ parallel (i) on B(i+1)
-      do i=1,N-1,2
-         B(i+1)=.false.
-      enddo
-
-cdvm$ remote_access (B(1))
-      landt1 = B(1)
-
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-  
-      iprodt1 = 1
-
-*dvm$ parallel (i) on A(i),
-*dvm$*reduction(prodand:product( iprodt1 ),and(landt1))
-      do i=1,N
-         iprodt1 = iprodt1*A(i)
-         landt1 = landt1 .and.B(i)
-      enddo
-
-cdvm$ reduction_start prodand
-
-*dvm$ parallel (i) on A(i)
-      do  i=1,N
-         A(i) = i+NL
-      enddo
-
-cdvm$ reduction_wait prodand
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then     
-          call ansyes(tname)
-       else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      deallocate (B,CL)
- 
-      end
-
-
-C ----------------------------------------------------REDA1203
-      subroutine REDA1203
-      integer, parameter :: N = 8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:),C(:)
-      integer imax1,imaxt1 ,ni,imin1,imint1,it1,it2,lit
-      integer imaxloct1,iminloct1
-cdvm$ distribute A(*)    
-cdvm$ reduction_group locmaxmin
-c dvm$ reduction_group maxminloc
-      tname='REDA1203'
-      allocate (A(N),C(N))
-      
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2+2
-      A(ni)=N+1+NL
-      imax1=N+1+NL
-
-cdvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2+1
-      A(ni1)=-(N+1+NL)
-      imin1=-(N+1+NL)
-
-cdvm$ remote_access (A(1))      
-      imint1=A(1)
-
-      iminloct1=imint1
-      lit=1
-      it1=0
-      it2=0
-
-*dvm$ parallel (i) on A(i),
-*dvm$*reduction(locmaxmin:max( imaxt1 ),
-*dvm$*maxloc( imaxloct1,it1,lit),
-*dvm$*minloc( iminloct1,it2,lit))
-      do i=1,N
-         if (A(i).GT.imaxt1) imaxt1 =A(i)
-         if (A(i).GT.imaxloct1) then
-	   imaxloct1=A(i)
-           it1=i 
-         endif
-         if (A(i).LT.iminloct1) then
-           iminloct1=A(i)
-           it2=i
-         endif
-      enddo
-
-cdvm$ reduction_start locmaxmin
-cdvm$ reduction_wait locmaxmin
-
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(imaxt1.eq.imaxloct1).and.(it1.eq.ni)
-     *.and.(it2.eq.ni1) )   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------REDA1204
-      subroutine REDA1204
-      integer, parameter :: N = 16
-      real, parameter :: NL=1000.
-      character*8 tname
-      real, allocatable :: A(:),C(:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer it1,it2,ni,ni1,lit          
-
-cdvm$ distribute A(*)     
-cdvm$ reduction_group locsumloc
-
-      tname='REDA1204'
-      allocate (A(N),C(N))
-      NNL=NL 
-      NN=N
-      call sersum1mr(C,NN,NNL,isum1)
-
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-         A(i) = i+NL
-      enddo
-
-      ni=N/2+1
-      A(ni)=N+1.+NL
-      imax1=N+1.+NL
-
-cdvm$ remote_access (A(1))
-      imaxt1=A(1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2+2
-      A(ni1)=-(N+1.+NL)
-      imin1=-(N+1.+NL)
-
-cdvm$ remote_access (A(1))      
-      imint1=A(1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lit=1
-      it1=0
-      it2=0
-
-*dvm$ parallel (i) on A(i),
-*dvm$*reduction(locsumloc:sum( isumt1 ),
-*dvm$*maxloc( imaxloct1,it1,lit),minloc( iminloct1,it2,lit ))
-      do i=1,N
-         isumt1 = isumt1+A(i)
-         if (A(i).GT.imaxloct1) then
-           imaxloct1=A(i)
-           it1=i
-         endif         
-         if (A(i).LT.iminloct1) then
-           iminloct1=A(i)
-           it2=i
-         endif
-      enddo
-
-cdvm$ reduction_start locsumloc
-cdvm$ reduction_wait locsumloc
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(it1.eq.ni)
-     *.and.(it2.eq.ni1) )   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-C -----------------------------------------------------
-
-      subroutine sersum1(AR,N,NL,S)
-      integer AR(N)
-      integer S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      S=0
-      do i=1,N
-         s = s+ AR(i)
-      enddo
-      end   
-   
-      subroutine sersum1m(AR,N,NL,S)
-      integer AR(N)
-      integer S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      ni=N/2-1
-      AR(ni)=N+1+NL
-      ni=N/2
-      AR(ni)=-(N+1+NL)
-      S=0
-      do i=1,N
-         s = s+ AR(i)
-      enddo
-      end 
-  
-      subroutine sersum1mr(AR,N,NL,S)
-      real AR(N)
-      real S,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      ni=N/2+1
-      AR(ni)=N+1.+NL
-      ni=N/2+2
-      AR(ni)=-(N+1.+NL)
-      S=0.
-      do i=1,N
-         S = S+ AR(i)
-      enddo
-      end  
-  
-      subroutine serprod1(AR,N,NL,P)
-      integer AR(N)
-      integer P,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      P=1
-      do i=1,N
-         P = P* AR(i)
-      enddo
-      end   
- 
-      subroutine serprodr1(AR,N,NL,P)
-      real AR(N)
-      real P,NL
-      do i=1,N
-         AR(i) = i+NL
-      enddo
-      P=1.
-      do i=1,N
-         P = P* AR(i)
-      enddo
-      end
-     
-      subroutine serlog1(AR,N,LAND,LOR,LEQV,LNEQV)
-      logical AR(N)
-      logical LAND,LOR,LEQV,LNEQV
-      do i=1,N,2
-         AR(i) = .true.
-         AR(i+1)=.false.          
-      enddo
-      LAND=AR(1)
-      LOR=AR(1)
-      LEQV=AR(1)
-      LNEQV=AR(1)
-      do i=2,N
-         LAND = LAND .and. AR(i)
-         LOR = LOR .or.AR(i)
-      enddo
-      do i=1,N,2
-         LEQV = LEQV .eqv. AR(i)
-      enddo
-      do i=1,N
-         LNEQV = LNEQV .neqv. AR(i)
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
-   
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda21.fdv
deleted file mode 100644
index 19c313b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda21.fdv
+++ /dev/null
@@ -1,495 +0,0 @@
-      program REDA21
-
-c    TESTING OF THE REDUCTION_GROUP DIRECTIVE,REDUCTION_START
-c    DIRECTIVE,REDUCTION_WAIT DIRECTIVE.
-c    REDUCTION GROUPE IS EXECUTED FOR DISTRIBUTED ARRAY A(N,M).  
-c
-      print *,'===START OF REDA21======================='
-C --------------------------------------------------
-      call reda2101
-C --------------------------------------------------
-      call reda2102
-C --------------------------------------------------
-      call reda2103
-C -------------------------------------------------
-      call reda2104
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF REDA21 ========================= '    
-      end
-
-
- 
-
-C ----------------------------------------------------REDA2101
-      subroutine REDA2101
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-cdvm$ distribute A(BLOCK,BLOCK)
-cdvm$ reduction_group smaxmin
-      tname='REDA2101'
-      allocate (A(N,M),C(N,M))
-      NNL=NL 
-      NN=N
-      MM=M
-      call sersum2m(C,NN,MM,NNL,isum1)
-
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      A(ni,nj)=N+M+1+NL
-      imax1=N+M+1+NL
-
-cdvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=-(N+M+1+NL)
-      imin1=-(N+M+1+NL)
-
-cdvm$ remote_access (A(1,1))
-      imint1=A(1,1)
-
-      isumt1 = 0
-
-*dvm$ parallel (i,j) on A(i,j),
-*dvm$*reduction(smaxmin:sum(isumt1),max(imaxt1),min(imint1))
-      do i=1,N
-         do j=1,M
-           isumt1 = isumt1+A(i,j)
-           if (A(i,j).GT.imaxt1) imaxt1=A(i,j)
-           if (A(i,j).LT.imint1) imint1=A(i,j)
-         enddo
-      enddo
-
-cdvm$ reduction_start smaxmin
-cdvm$ reduction_wait smaxmin
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------REDA2102
-      subroutine REDA2102
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:),CL(:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-                 
-cdvm$ distribute A(BLOCK,BLOCK)    
-cdvm$ align B(I,J) with A(I,J)      
-cdvm$ reduction_group prodand
-
-      tname='REDA2102'
-      allocate (A(N,M),C(N,M))
-      allocate (B(N,M),CL(N,M))
-      NNL=NL
-      NN=N
-      MM=M
-      call serprod2(C,NN,MM,NNL,iprod1)
-      call serlog2(CL,NN,MM,land1,lor1,leqv1,lneqv1)
-
-*dvm$ parallel (i,j) on B(i,j)
-      do i=1,N
-         do j=1,M,2
-            B(i,j) = .true.
-         enddo         
-      enddo
-
-*dvm$ parallel (i,j) on B(i,j)
-      do i=1,N
-         do j=2,M,2
-            B(i,j)=.false.
-         enddo
-      enddo
-cdvm$ remote_access (B(1,1))
-      landt1 = B(1,1)    
-
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-            A(i,j) = i+j+NL
-         enddo
-      enddo
-  
-      iprodt1 = 1
-
-*dvm$ parallel (i,j) on A(i,j),
-*dvm$*reduction(prodand:product( iprodt1 ),and(landt1))
-      do i=1,N
-         do j=1,M
-           iprodt1 = iprodt1*A(i,j)
-           landt1 = landt1 .and.B(i,j)
-         enddo
-      enddo
-cdvm$ reduction_start prodand
-
-*dvm$ parallel (i,j) on A(i,j)
-      do  i=1,N
-        do j=1,M
-          A(i,j) = i+j+NL
-        enddo
-      enddo
-
-cdvm$ reduction_wait prodand 
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      deallocate (B,CL)
- 
-      end   
-
-
-C ----------------------------------------------------REDA2103
-      subroutine REDA2103
-      integer, parameter :: N = 8, M=4,PN = 2,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imax1,imaxt1 ,ni,imin1,imint1,it1,it2,jt1,jt2
-      integer imaxloct1,iminloct1,lcoor
-      integer coor1(2),coor2(2)          
-cdvm$ distribute A(BLOCK,BLOCK)    
-cdvm$ reduction_group locmaxmin
-      tname='REDA2103'
-      allocate (A(N,M),C(N,M))
-      
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-           A(i,j) = i+j+NL
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1+NL
-      imax1=N+M+1+NL
-
-cdvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      A(ni1,nj1)=-(N+M+1+NL)
-      imin1=-(N+M+1+NL)
-
-cdvm$ remote_access (A(1,1))      
-      imint1=A(1,1)
-
-      iminloct1=imint1
-      lcoor=2
-      coor1(1)=0
-      coor1(2)=0
-      coor2(1)=0
-      coor2(2)=0
-
-*dvm$ parallel (i,j) on A(i,j),
-*dvm$*reduction(locmaxmin:max( imaxt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor),
-*dvm$*minloc( iminloct1,coor2,lcoor))
-      do i=1,N
-        do j=1,M
-         if (A(i,j).GT.imaxt1) imaxt1 =A(i,j)
-         if (A(i,j).GT.imaxloct1) then
-           imaxloct1=A(i,j)
-           coor1(1)=i
-           coor1(2)=j 
-         endif
-         if (A(i,j).LT.iminloct1) then
-           iminloct1=A(i,j)
-           coor2(1)=i
-           coor2(2)=j
-         endif
-        enddo 
-      enddo
-
-cdvm$ reduction_start locmaxmin
-cdvm$ reduction_wait locmaxmin
-
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(imaxt1.eq.imaxloct1).and.(coor1(1).eq.ni)
-     *.and.(coor2(1).eq.ni1) 
-     *.and.(coor1(2).eq.nj) .and.(coor2(2).eq.nj1))then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------REDA2104
-      subroutine REDA2104
-
-      integer, parameter :: N = 8,M=6
-      real, parameter :: NL=1000.
-      character*8 tname
-      real, allocatable :: A(:,:),C(:,:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer it1,it2,ni,ni1,jt1,jt2
-      integer coor1(2),coor2(2),lcoor          
-cdvm$ distribute A(BLOCK,BLOCK)     
-cdvm$ reduction_group locsum
-
-      tname='REDA2104'
-      allocate (A(N,M),C(N,M))
-      NNL=NL 
-      NN=N
-      MM=M
-      call sersum2mr(C,NN,MM,NNL,isum1)
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-
-c      ni=N/2+1
-c      nj=M/2+1
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1.+NL
-      imax1=N+M+1.+NL
-
-cdvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      A(ni1,nj1)=-(N+M+1.+NL)
-      imin1=-(N+M+1.+NL)
-
-cdvm$ remote_access (A(1,1))      
-      imint1=A(1,1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lcoor=2
-      coor1(1)=0
-      coor1(2)=0
-      coor2(1)=0
-      coor2(2)=0
-
-*dvm$ parallel (i,j) on A(i,j),
-*dvm$*reduction(locsum:sum( isumt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor ),minloc( iminloct1,coor2,lcoor ))
-      do i=1,N
-        do j=1,M
-          isumt1 = isumt1+A(i,j)
-          if (A(i,j).GT.imaxloct1) then
-           imaxloct1=A(i,j)
-           coor1(1)=i
-           coor1(2)=j  
-          endif
-          if (A(i,j).LT.iminloct1) then
-           iminloct1=A(i,j)
-           coor2(1)=i
-           coor2(2)=j  
-          endif
-        enddo
-      enddo
-
-cdvm$ reduction_start locsum
-cdvm$ reduction_wait locsum
-c      print *,A
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-     
-c      print *,isum1,isumt1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(coor1(1).eq.ni)
-     *.and.(coor2(1).eq.ni1)
-     *.and.(coor1(2).eq.nj) .and.(coor2(2).eq.nj1))then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C -----------------------------------------------------
-      subroutine sersum2(AR,N,M,NL,S)
-      integer AR(N,M)
-      integer S,NL
-
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo          
-      enddo
-      S=0
-      do i=1,N
-         do j=1,M
-           s = s+ AR(i,j)
-         enddo
-      enddo
-      end   
-   
-      subroutine sersum2m(AR,N,M,NL,S)
-      integer AR(N,M)
-      integer S,NL
-
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo          
-      enddo
-     
-      ni=N/2-1
-      nj=M/2-1
-      AR(ni,nj)=N+M+1+NL
-      ni=N/2
-      nj=M/2
-      AR(ni,nj)=-(N+M+1+NL)
-      S=0
-
-      do i=1,N
-         do j=1,M
-           s = s+ AR(i,j)
-         enddo
-      enddo
-    
-      end   
-
-      subroutine sersum2mr(AR,N,M,NL,S)
-      real AR(N,M)
-      real S,NL
-
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo 
-         enddo 
-      ni=N/2
-      nj=M/2
-      AR(ni,nj)=N+M+1.+NL
-      ni1=N/2-1
-      nj1=M/2-1
-      AR(ni1,nj1)=-(N+M+1.+NL)
-      S=0.
-      do i=1,N
-         do j=1,M
-           s = s+ AR(i,j)
-         enddo
-      enddo
-      end  
-  
-      subroutine serprod2(AR,N,M,NL,P)
-      integer AR(N,M)
-      integer P,NL
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo
-      enddo   
-      P=1
-      do i=1,N
-         do j=1,M
-           P = P* AR(i,j)
-         enddo
-      enddo
-      end   
- 
-      subroutine serprodr2(AR,N,M,NL,P)
-      real AR(N,M)
-      real P,NL
-
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo
-      enddo 
-      P=1.
-      do i=1,N
-         do j=1,M
-           P = P* AR(i,j)
-         enddo
-      enddo
-      end
-     
-      subroutine serlog2(AR,N,M,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N
-         do j=1,M,2
-           AR(i,J) = .true.
-         enddo         
-      enddo
-      do i=1,N
-         do j=2,M,2
-           AR(i,j)=.false.
-         enddo
-      enddo 
-      LAND=AR(1,1)
-      LOR=AR(1,1)
-      LEQV=AR(1,1)
-      LNEQV=AR(1,1)
-      do i=1,N
-         do j=1,M
-           LAND = LAND .and. AR(i,j)
-           LOR = LOR .or.AR(i,j)
-         enddo
-      enddo
-       do i=1,N
-         do j=1,M
-           LEQV = LEQV .eqv. AR(i,j)
-         enddo
-      enddo
-      do i=1,N
-         do j=1,M
-           LNEQV = LNEQV .neqv. AR(i,j)
-         enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda22.fdv
deleted file mode 100644
index 25ab6fd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda22.fdv
+++ /dev/null
@@ -1,495 +0,0 @@
-      program REDA22
-
-c    TESTING OF THE REDUCTION_GROUP DIRECTIVE,REDUCTION_START
-c    DIRECTIVE,REDUCTION_WAIT DIRECTIVE.
-c    REDUCTION GROUPE IS EXECUTED FOR DISTRIBUTED ARRAY A(N,M).  
-c
-      print *,'===START OF REDA22======================='
-C --------------------------------------------------
-      call reda2201
-C --------------------------------------------------
-      call reda2202
-C --------------------------------------------------
-      call reda2203
-C -------------------------------------------------
-      call reda2204
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF REDA22 ========================= '    
-      end
-
-
- 
-
-C ----------------------------------------------------REDA2201
-      subroutine REDA2201
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-cdvm$ distribute A(BLOCK,*)
-cdvm$ reduction_group smaxmin
-      tname='REDA2201'
-      allocate (A(N,M),C(N,M))
-      NNL=NL 
-      NN=N
-      MM=M
-      call sersum2m(C,NN,MM,NNL,isum1)
-
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      A(ni,nj)=N+M+1+NL
-      imax1=N+M+1+NL
-
-cdvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=-(N+M+1+NL)
-      imin1=-(N+M+1+NL)
-
-cdvm$ remote_access (A(1,1))
-      imint1=A(1,1)
-
-      isumt1 = 0
-
-*dvm$ parallel (i,j) on A(i,j),
-*dvm$*reduction(smaxmin:sum(isumt1),max(imaxt1),min(imint1))
-      do i=1,N
-         do j=1,M
-           isumt1 = isumt1+A(i,j)
-           if (A(i,j).GT.imaxt1) imaxt1=A(i,j)
-           if (A(i,j).LT.imint1) imint1=A(i,j)
-         enddo
-      enddo
-
-cdvm$ reduction_start smaxmin
-cdvm$ reduction_wait smaxmin
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------REDA2202
-      subroutine REDA2202
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:),CL(:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-                 
-cdvm$ distribute A(*,BLOCK)    
-cdvm$ align B(I,J) with A(I,J)      
-cdvm$ reduction_group prodand
-
-      tname='REDA2202'
-      allocate (A(N,M),C(N,M))
-      allocate (B(N,M),CL(N,M))
-      NNL=NL
-      NN=N
-      MM=M
-      call serprod2(C,NN,MM,NNL,iprod1)
-      call serlog2(CL,NN,MM,land1,lor1,leqv1,lneqv1)
-
-*dvm$ parallel (i,j) on B(i,j)
-      do i=1,N
-         do j=1,M,2
-            B(i,j) = .true.
-         enddo         
-      enddo
-
-*dvm$ parallel (i,j) on B(i,j)
-      do i=1,N
-         do j=2,M,2
-            B(i,j)=.false.
-         enddo
-      enddo
-cdvm$ remote_access (B(1,1))
-      landt1 = B(1,1)    
-
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-            A(i,j) = i+j+NL
-         enddo
-      enddo
-  
-      iprodt1 = 1
-
-*dvm$ parallel (i,j) on A(i,j),
-*dvm$*reduction(prodand:product( iprodt1 ),and(landt1))
-      do i=1,N
-         do j=1,M
-           iprodt1 = iprodt1*A(i,j)
-           landt1 = landt1 .and.B(i,j)
-         enddo
-      enddo
-cdvm$ reduction_start prodand
-
-*dvm$ parallel (i,j) on A(i,j)
-      do  i=1,N
-        do j=1,M
-          A(i,j) = i+j+NL
-        enddo
-      enddo
-
-cdvm$ reduction_wait prodand 
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      deallocate (B,CL)
- 
-      end   
-
-
-C ----------------------------------------------------REDA2203
-      subroutine REDA2203
-      integer, parameter :: N = 8, M=4,PN = 2,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:),C(:,:)
-      integer imax1,imaxt1 ,ni,imin1,imint1,it1,it2,jt1,jt2
-      integer imaxloct1,iminloct1,lcoor
-      integer coor1(2),coor2(2)          
-cdvm$ distribute A(BLOCK,*)    
-cdvm$ reduction_group locmaxmin
-      tname='REDA2203'
-      allocate (A(N,M),C(N,M))
-      
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-           A(i,j) = i+j+NL
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1+NL
-      imax1=N+M+1+NL
-
-cdvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      A(ni1,nj1)=-(N+M+1+NL)
-      imin1=-(N+M+1+NL)
-
-cdvm$ remote_access (A(1,1))      
-      imint1=A(1,1)
-
-      iminloct1=imint1
-      lcoor=2
-      coor1(1)=0
-      coor1(2)=0
-      coor2(1)=0
-      coor2(2)=0
-
-*dvm$ parallel (i,j) on A(i,j),
-*dvm$*reduction(locmaxmin:max( imaxt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor),
-*dvm$*minloc( iminloct1,coor2,lcoor))
-      do i=1,N
-        do j=1,M
-         if (A(i,j).GT.imaxt1) imaxt1 =A(i,j)
-         if (A(i,j).GT.imaxloct1) then
-           imaxloct1=A(i,j)
-           coor1(1)=i
-           coor1(2)=j 
-         endif
-         if (A(i,j).LT.iminloct1) then
-           iminloct1=A(i,j)
-           coor2(1)=i
-           coor2(2)=j
-         endif
-        enddo 
-      enddo
-
-cdvm$ reduction_start locmaxmin
-cdvm$ reduction_wait locmaxmin
-
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(imaxt1.eq.imaxloct1).and.(coor1(1).eq.ni)
-     *.and.(coor2(1).eq.ni1) 
-     *.and.(coor1(2).eq.nj) .and.(coor2(2).eq.nj1))then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------REDA2204
-      subroutine REDA2204
-
-      integer, parameter :: N = 8,M=6
-      real, parameter :: NL=1000.
-      character*8 tname
-      real, allocatable :: A(:,:),C(:,:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer it1,it2,ni,ni1,jt1,jt2
-      integer coor1(2),coor2(2),lcoor          
-cdvm$ distribute A(*,BLOCK)     
-cdvm$ reduction_group locsum
-
-      tname='REDA2204'
-      allocate (A(N,M),C(N,M))
-      NNL=NL 
-      NN=N
-      MM=M
-      call sersum2mr(C,NN,MM,NNL,isum1)
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-         do j=1,M
-           A(i,j) = i+j+NL
-         enddo
-      enddo
-
-c      ni=N/2+1
-c      nj=M/2+1
-      ni=N/2
-      nj=M/2
-      A(ni,nj)=N+M+1.+NL
-      imax1=N+M+1.+NL
-
-cdvm$ remote_access (A(1,1))
-      imaxt1=A(1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      A(ni1,nj1)=-(N+M+1.+NL)
-      imin1=-(N+M+1.+NL)
-
-cdvm$ remote_access (A(1,1))      
-      imint1=A(1,1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lcoor=2
-      coor1(1)=0
-      coor1(2)=0
-      coor2(1)=0
-      coor2(2)=0
-
-*dvm$ parallel (i,j) on A(i,j),
-*dvm$*reduction(locsum:sum( isumt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor ),minloc( iminloct1,coor2,lcoor ))
-      do i=1,N
-        do j=1,M
-          isumt1 = isumt1+A(i,j)
-          if (A(i,j).GT.imaxloct1) then
-           imaxloct1=A(i,j)
-           coor1(1)=i
-           coor1(2)=j  
-          endif
-          if (A(i,j).LT.iminloct1) then
-           iminloct1=A(i,j)
-           coor2(1)=i
-           coor2(2)=j  
-          endif
-        enddo
-      enddo
-
-cdvm$ reduction_start locsum
-cdvm$ reduction_wait locsum
-c      print *,A
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-     
-c      print *,isum1,isumt1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(coor1(1).eq.ni)
-     *.and.(coor2(1).eq.ni1)
-     *.and.(coor1(2).eq.nj) .and.(coor2(2).eq.nj1))then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C -----------------------------------------------------
-      subroutine sersum2(AR,N,M,NL,S)
-      integer AR(N,M)
-      integer S,NL
-
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo          
-      enddo
-      S=0
-      do i=1,N
-         do j=1,M
-           s = s+ AR(i,j)
-         enddo
-      enddo
-      end   
-   
-      subroutine sersum2m(AR,N,M,NL,S)
-      integer AR(N,M)
-      integer S,NL
-
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo          
-      enddo
-     
-      ni=N/2-1
-      nj=M/2-1
-      AR(ni,nj)=N+M+1+NL
-      ni=N/2
-      nj=M/2
-      AR(ni,nj)=-(N+M+1+NL)
-      S=0
-
-      do i=1,N
-         do j=1,M
-           s = s+ AR(i,j)
-         enddo
-      enddo
-    
-      end   
-
-      subroutine sersum2mr(AR,N,M,NL,S)
-      real AR(N,M)
-      real S,NL
-
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo 
-         enddo 
-      ni=N/2
-      nj=M/2
-      AR(ni,nj)=N+M+1.+NL
-      ni1=N/2-1
-      nj1=M/2-1
-      AR(ni1,nj1)=-(N+M+1.+NL)
-      S=0.
-      do i=1,N
-         do j=1,M
-           s = s+ AR(i,j)
-         enddo
-      enddo
-      end  
-  
-      subroutine serprod2(AR,N,M,NL,P)
-      integer AR(N,M)
-      integer P,NL
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo
-      enddo   
-      P=1
-      do i=1,N
-         do j=1,M
-           P = P* AR(i,j)
-         enddo
-      enddo
-      end   
- 
-      subroutine serprodr2(AR,N,M,NL,P)
-      real AR(N,M)
-      real P,NL
-
-      do i=1,N
-         do j=1,M
-           AR(i,j) = i+j+NL
-         enddo
-      enddo 
-      P=1.
-      do i=1,N
-         do j=1,M
-           P = P* AR(i,j)
-         enddo
-      enddo
-      end
-     
-      subroutine serlog2(AR,N,M,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N
-         do j=1,M,2
-           AR(i,J) = .true.
-         enddo         
-      enddo
-      do i=1,N
-         do j=2,M,2
-           AR(i,j)=.false.
-         enddo
-      enddo 
-      LAND=AR(1,1)
-      LOR=AR(1,1)
-      LEQV=AR(1,1)
-      LNEQV=AR(1,1)
-      do i=1,N
-         do j=1,M
-           LAND = LAND .and. AR(i,j)
-           LOR = LOR .or.AR(i,j)
-         enddo
-      enddo
-       do i=1,N
-         do j=1,M
-           LEQV = LEQV .eqv. AR(i,j)
-         enddo
-      enddo
-      do i=1,N
-         do j=1,M
-           LNEQV = LNEQV .neqv. AR(i,j)
-         enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda31.fdv
deleted file mode 100644
index f15e2af..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda31.fdv
+++ /dev/null
@@ -1,568 +0,0 @@
-      program REDA31
-
-c    TESTING OF THE REDUCTION_GROUP DIRECTIVE,REDUCTION_START
-c    DIRECTIVE,REDUCTION_WAIT DIRECTIVE.
-c    REDUCTION GROUPE IS EXECUTED FOR DISTRIBUTED ARRAY A(N,M,K).  
-c
-      print *,'===START OF REDA31======================='
-C --------------------------------------------------
-      call reda3101
-C --------------------------------------------------
-      call reda3102
-C --------------------------------------------------
-      call reda3103
-C -------------------------------------------------
-      call reda3104
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF REDA31 ========================= '    
-      end
-
-
- 
-
-C ----------------------------------------------------REDA3101
-      subroutine REDA3101
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK)
-cdvm$ reduction_group smaxmin
-
-      tname='REDA3101'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      call sersum3m(C,NN,MM,KK,NNL,isum1)
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      A(ni,nj,nii)=N+M+K+1+NL
-      imax1=N+M+K+1+NL
-
-cdvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      ni=N/2
-      nj=M/2
-      nii=K/2 
-      A(ni,nj,nii)=-(N+M+K+1+NL)
-      imin1=-(N+M+K+1+NL)
-
-cdvm$ remote_access (A(1,1,1))
-      imint1=A(1,1,1)
-
-      isumt1 = 0
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction(smaxmin:sum(isumt1),max(imaxt1),min(imint1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            isumt1 = isumt1+A(i,j,ii)
-            if (A(i,j,ii).GT.imaxt1) imaxt1=A(i,j,ii)
-            if (A(i,j,ii).LT.imint1) imint1=A(i,j,ii)
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start smaxmin
-cdvm$ reduction_wait smaxmin
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------REDA3102
-      subroutine REDA3102
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:),CL(:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-                 
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK)    
-cdvm$ align B(I,J,II) with A(I,J,II)      
-cdvm$ reduction_group prodand
-
-      tname='REDA3102'
-      allocate (A(N,M,K),C(N,M,K))
-      allocate (B(N,M,K),CL(N,M,K))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      call serprod3(C,NN,MM,KK,NNL,iprod1)
-      call serlog3(CL,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            B(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2 
-           B(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo
-
-cdvm$ remote_access (B(1,1,1))
-      landt1 = B(1,1,1)    
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-  
-      iprodt1 = 1
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction(prodand:product( iprodt1 ),and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           iprodt1 = iprodt1*A(i,j,ii)
-           landt1 = landt1 .and.B(i,j,ii)
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start prodand
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do  i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-cdvm$ reduction_wait prodand 
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      deallocate (B,CL)
- 
-      end   
-
-
-C ----------------------------------------------------REDA3103
-      subroutine REDA3103
-      integer, parameter :: N = 8, M=4,K=16,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imax1,imaxt1 ,ni,imin1,imint1,it1,it2,jt1,jt2
-      integer imaxloct1,iminloct1,lcoor
-      integer coor1(3),coor2(3)
-            
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK)    
-cdvm$ reduction_group locmaxmin
-
-      tname='REDA3103'
-      allocate (A(N,M,K),C(N,M,K))
-      
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1+NL
-      imax1=N+M+K+1+NL
-
-cdvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1
-      A(ni1,nj1,nii1)=-(N+M+K+1+NL)
-      imin1=-(N+M+K+1+NL)
-
-cdvm$ remote_access (A(1,1,1))      
-      imint1=A(1,1,1)
-
-      iminloct1=imint1
-      lcoor=3
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction(locmaxmin:max( imaxt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor),
-*dvm$*minloc( iminloct1,coor2,lcoor))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           if (A(i,j,ii).GT.imaxt1) imaxt1 =A(i,j,ii)
-           if (A(i,j,ii).GT.imaxloct1) then
-             imaxloct1=A(i,j,ii)         
-             coor1(1)=i
-             coor1(2)=j 
-             coor1(3)=ii 
-           endif
-           if (A(i,j,ii).LT.iminloct1) then
-             iminloct1=A(i,j,ii)
-             coor2(1)=i
-             coor2(2)=j 
-             coor2(3)=ii  
-           endif
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_startlocmaxmin
-cdvm$ reduction_wait locmaxmin
-
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-       if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1).and.
-     * (imaxt1.eq.imaxloct1).and.(coor1(1).eq.ni).and.
-     * (coor1(2).eq.nj).and.(coor1(3).eq.nii).and.
-     * (coor2(1).eq.ni1) .and.(coor2(2).eq.nj1) 
-     * .and.(coor2(3).eq.nii1)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------REDA3104
-      subroutine REDA3104
-      integer, parameter :: N = 8,M=6,K=16
-      real, parameter :: NL=1000.
-      character*8 tname
-      real, allocatable :: A(:,:,:),C(:,:,:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer ni,ni1,lcoor
-      integer coor1(3),coor2(3)
-          
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK)     
-cdvm$ reduction_group locsum
-
-      tname='REDA3104'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      call sersum3mr(C,NN,MM,KK,NNL,isum1)
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1.+NL
-      imax1=N+M+K+1.+NL
-
-cdvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1 
-      A(ni1,nj1,nii1)=-(N+M+K+1.+NL)
-      imin1=-(N+M+K+1.+NL)
-
-cdvm$ remote_access (A(1,1,1))      
-      imint1=A(1,1,1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lcoor=3
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction(locsum:sum( isumt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor),minloc( iminloct1,coor2,lcoor))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           isumt1 = isumt1+A(i,j,ii)
-           if (A(i,j,ii).GT.imaxloct1) then
-             imaxloct1=A(i,j,ii)
-             coor1(1)=i
-             coor1(2)=j 
-             coor1(3)=ii  
-           endif
-           if (A(i,j,ii).LT.iminloct1) then
-             iminloct1=A(i,j,ii)
-             coor2(1)=i
-             coor2(2)=j 
-             coor2(3)=ii  
-           endif
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start locsum
-cdvm$ reduction_wait locsum
-c      print *,A
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-     
-c      print *,isum1,isumt1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(coor1(1).eq.ni)
-     *.and.(coor2(1).eq.ni1).and.(coor1(2).eq.nj) 
-     *.and.(coor2(2).eq.nj1)
-     *.and.(coor1(3).eq.nii).and.(coor2(3).eq.nii1))then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C -----------------------------------------------------
-
-      subroutine sersum3(AR,N,M,K,NL,S)
-      integer AR(N,M,K)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo          
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
-      
-      subroutine sersum3m(AR,N,M,K,NL,S)
-      integer AR(N,M,K)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo 
-        enddo         
-      enddo     
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      AR(ni,nj,nii)=N+M+K+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      AR(ni,nj,nii)=-(N+M+K+1+NL)
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo    
-      end   
-
-      subroutine sersum3mr(AR,N,M,K,NL,S)
-      real AR(N,M,K)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo 
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      AR(ni,nj,nii)=N+M+K+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      AR(ni,nj,nii)=-(N+M+K+1+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod3(AR,N,M,K,NL,P)
-      integer AR(N,M,K)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           AR(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            P = P* AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr3(AR,N,M,K,NL,P)
-      real AR(N,M,K)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K 
-            AR(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            P = P* AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end
-     
-      subroutine serlog3(AR,N,M,K,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N
-        do j=1,M
-          do ii=1,K,2
-            AR(i,j,ii) = .true.
-          enddo         
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-            AR(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo 
-      LAND=AR(1,1,1)
-      LOR=AR(1,1,1)
-      LEQV=AR(1,1,1)
-      LNEQV=AR(1,1,1)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            LAND = LAND .and. AR(i,j,ii)
-            LOR = LOR .or.AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            LEQV = LEQV .eqv. AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            LNEQV = LNEQV .neqv. AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda32.fdv
deleted file mode 100644
index ae5d390..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda32.fdv
+++ /dev/null
@@ -1,568 +0,0 @@
-      program REDA32
-
-c    TESTING OF THE REDUCTION_GROUP DIRECTIVE,REDUCTION_START
-c    DIRECTIVE,REDUCTION_WAIT DIRECTIVE.
-c    REDUCTION GROUPE IS EXECUTED FOR DISTRIBUTED ARRAY A(N,M,K).  
-c
-      print *,'===START OF REDA32======================='
-C --------------------------------------------------
-      call reda3201
-C --------------------------------------------------
-      call reda3202
-C --------------------------------------------------
-      call reda3203
-C -------------------------------------------------
-      call reda3204
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF REDA32 ========================= '    
-      end
-
-
- 
-
-C ----------------------------------------------------REDA3201
-      subroutine REDA3201
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-cdvm$ distribute A(BLOCK,BLOCK,*)
-cdvm$ reduction_group smaxmin
-
-      tname='REDA3201'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      call sersum3m(C,NN,MM,KK,NNL,isum1)
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      A(ni,nj,nii)=N+M+K+1+NL
-      imax1=N+M+K+1+NL
-
-cdvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      ni=N/2
-      nj=M/2
-      nii=K/2 
-      A(ni,nj,nii)=-(N+M+K+1+NL)
-      imin1=-(N+M+K+1+NL)
-
-cdvm$ remote_access (A(1,1,1))
-      imint1=A(1,1,1)
-
-      isumt1 = 0
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction(smaxmin:sum(isumt1),max(imaxt1),min(imint1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            isumt1 = isumt1+A(i,j,ii)
-            if (A(i,j,ii).GT.imaxt1) imaxt1=A(i,j,ii)
-            if (A(i,j,ii).LT.imint1) imint1=A(i,j,ii)
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start smaxmin
-cdvm$ reduction_wait smaxmin
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------REDA3202
-      subroutine REDA3202
-      integer, parameter :: N = 16,M=8,K=16,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:),CL(:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-                 
-cdvm$ distribute A(BLOCK,*,BLOCK)    
-cdvm$ align B(I,J,II) with A(I,J,II)      
-cdvm$ reduction_group prodand
-
-      tname='REDA3202'
-      allocate (A(N,M,K),C(N,M,K))
-      allocate (B(N,M,K),CL(N,M,K))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      call serprod3(C,NN,MM,KK,NNL,iprod1)
-      call serlog3(CL,NN,MM,KK,land1,lor1,leqv1,lneqv1)
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K,2
-            B(i,j,ii) = .true.
-          enddo
-        enddo         
-      enddo
-
-*dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2 
-           B(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo
-
-cdvm$ remote_access (B(1,1,1))
-      landt1 = B(1,1,1)    
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-  
-      iprodt1 = 1
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction(prodand:product( iprodt1 ),and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           iprodt1 = iprodt1*A(i,j,ii)
-           landt1 = landt1 .and.B(i,j,ii)
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start prodand
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do  i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-cdvm$ reduction_wait prodand 
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      deallocate (B,CL)
- 
-      end   
-
-
-C ----------------------------------------------------REDA3203
-      subroutine REDA3203
-      integer, parameter :: N = 8, M=4,K=16,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:),C(:,:,:)
-      integer imax1,imaxt1 ,ni,imin1,imint1,it1,it2,jt1,jt2
-      integer imaxloct1,iminloct1,lcoor
-      integer coor1(3),coor2(3)
-            
-cdvm$ distribute A(*,BLOCK,BLOCK)    
-cdvm$ reduction_group locmaxmin
-
-      tname='REDA3203'
-      allocate (A(N,M,K),C(N,M,K))
-      
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1+NL
-      imax1=N+M+K+1+NL
-
-cdvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1
-      A(ni1,nj1,nii1)=-(N+M+K+1+NL)
-      imin1=-(N+M+K+1+NL)
-
-cdvm$ remote_access (A(1,1,1))      
-      imint1=A(1,1,1)
-
-      iminloct1=imint1
-      lcoor=3
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction(locmaxmin:max( imaxt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor),
-*dvm$*minloc( iminloct1,coor2,lcoor))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           if (A(i,j,ii).GT.imaxt1) imaxt1 =A(i,j,ii)
-           if (A(i,j,ii).GT.imaxloct1) then
-             imaxloct1=A(i,j,ii)         
-             coor1(1)=i
-             coor1(2)=j 
-             coor1(3)=ii 
-           endif
-           if (A(i,j,ii).LT.iminloct1) then
-             iminloct1=A(i,j,ii)
-             coor2(1)=i
-             coor2(2)=j 
-             coor2(3)=ii  
-           endif
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_startlocmaxmin
-cdvm$ reduction_wait locmaxmin
-
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-       if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1).and.
-     * (imaxt1.eq.imaxloct1).and.(coor1(1).eq.ni).and.
-     * (coor1(2).eq.nj).and.(coor1(3).eq.nii).and.
-     * (coor2(1).eq.ni1) .and.(coor2(2).eq.nj1) 
-     * .and.(coor2(3).eq.nii1)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------REDA3204
-      subroutine REDA3204
-      integer, parameter :: N = 8,M=6,K=16
-      real, parameter :: NL=1000.
-      character*8 tname
-      real, allocatable :: A(:,:,:),C(:,:,:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer ni,ni1,lcoor
-      integer coor1(3),coor2(3)
-          
-cdvm$ distribute A(BLOCK,BLOCK,*)     
-cdvm$ reduction_group locsum
-
-      tname='REDA3204'
-      allocate (A(N,M,K),C(N,M,K))
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      call sersum3mr(C,NN,MM,KK,NNL,isum1)
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      A(ni,nj,nii)=N+M+K+1.+NL
-      imax1=N+M+K+1.+NL
-
-cdvm$ remote_access (A(1,1,1))
-      imaxt1=A(1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1 
-      A(ni1,nj1,nii1)=-(N+M+K+1.+NL)
-      imin1=-(N+M+K+1.+NL)
-
-cdvm$ remote_access (A(1,1,1))      
-      imint1=A(1,1,1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lcoor=3
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),
-*dvm$*reduction(locsum:sum( isumt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor),minloc( iminloct1,coor2,lcoor))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           isumt1 = isumt1+A(i,j,ii)
-           if (A(i,j,ii).GT.imaxloct1) then
-             imaxloct1=A(i,j,ii)
-             coor1(1)=i
-             coor1(2)=j 
-             coor1(3)=ii  
-           endif
-           if (A(i,j,ii).LT.iminloct1) then
-             iminloct1=A(i,j,ii)
-             coor2(1)=i
-             coor2(2)=j 
-             coor2(3)=ii  
-           endif
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start locsum
-cdvm$ reduction_wait locsum
-c      print *,A
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-     
-c      print *,isum1,isumt1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(coor1(1).eq.ni)
-     *.and.(coor2(1).eq.ni1).and.(coor1(2).eq.nj) 
-     *.and.(coor2(2).eq.nj1)
-     *.and.(coor1(3).eq.nii).and.(coor2(3).eq.nii1))then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C -----------------------------------------------------
-
-      subroutine sersum3(AR,N,M,K,NL,S)
-      integer AR(N,M,K)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo          
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
-      
-      subroutine sersum3m(AR,N,M,K,NL,S)
-      integer AR(N,M,K)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo 
-        enddo         
-      enddo     
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      AR(ni,nj,nii)=N+M+K+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      AR(ni,nj,nii)=-(N+M+K+1+NL)
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo    
-      end   
-
-      subroutine sersum3mr(AR,N,M,K,NL,S)
-      real AR(N,M,K)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = i+j+ii+NL
-          enddo 
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      AR(ni,nj,nii)=N+M+K+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      AR(ni,nj,nii)=-(N+M+K+1+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            s = s+ AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod3(AR,N,M,K,NL,P)
-      integer AR(N,M,K)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           AR(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            P = P* AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr3(AR,N,M,K,NL,P)
-      real AR(N,M,K)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K 
-            AR(i,j,ii) = i+j+ii+NL
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            P = P* AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end
-     
-      subroutine serlog3(AR,N,M,K,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N
-        do j=1,M
-          do ii=1,K,2
-            AR(i,j,ii) = .true.
-          enddo         
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=2,K,2
-            AR(i,j,ii)=.false.
-          enddo
-        enddo
-      enddo 
-      LAND=AR(1,1,1)
-      LOR=AR(1,1,1)
-      LEQV=AR(1,1,1)
-      LNEQV=AR(1,1,1)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            LAND = LAND .and. AR(i,j,ii)
-            LOR = LOR .or.AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            LEQV = LEQV .eqv. AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            LNEQV = LNEQV .neqv. AR(i,j,ii)
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda41.fdv
deleted file mode 100644
index 05c1048..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda41.fdv
+++ /dev/null
@@ -1,643 +0,0 @@
-      program REDA41
-
-c    TESTING OF THE REDUCTION_GROUP DIRECTIVE,REDUCTION_START
-c    DIRECTIVE,REDUCTION_WAIT DIRECTIVE.
-c    REDUCTION GROUPE IS EXECUTED FOR DISTRIBUTED ARRAY A(N,M,K,L).  
-c
-      print *,'===START OF REDA41======================='
-C --------------------------------------------------
-      call reda4101
-C --------------------------------------------------
-      call reda4102
-C --------------------------------------------------
-      call reda4103
-C -------------------------------------------------
-      call reda4104
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF REDA41 ========================= '    
-      end
-
-C ----------------------------------------------------REDA4101
-      subroutine REDA4101
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)
-cdvm$ reduction_group smaxmin
-
-      tname='REDA4101'
-      allocate (A(N,M,K,L),C(N,M,K,L))      
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call sersum4m(C,NN,MM,KK,LL,NNL,isum1)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L      
-             A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-
-cdvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2 
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL)
-      imin1=-(N+M+K+L+1+NL)
-
-cdvm$ remote_access (A(1,1,1,1))
-      imint1=A(1,1,1,1)
-
-      isumt1 = 0
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(smaxmin:sum(isumt1),max(imaxt1),min(imint1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             isumt1 = isumt1+A(i,j,ii,jj)
-             if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-             if (A(i,j,ii,jj).LT.imint1) imint1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start smaxmin
-cdvm$ reduction_wait smaxmin
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------REDA4102
-      subroutine REDA4102
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:,:),CL(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-               
-                 
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-cdvm$ align B(I,J,II,JJ) with A(I,J,II,JJ)      
-cdvm$ reduction_group prodand
-
-      tname='REDA4102'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      allocate (B(N,M,K,L),CL(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprod4(C,NN,MM,KK,LL,NNL,iprod1)
-      call serlog4(CL,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              B(i,j,ii,jj) = .true.
-            enddo
-          enddo 
-        enddo         
-      enddo
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K 
-            do jj=2,L,2
-              B(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ remote_access (B(1,1,1,1))
-      landt1 = B(1,1,1,1)                   
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      iprodt1 = 1
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(prodand:product( iprodt1 ),and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L      
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-              landt1 = landt1 .and.B(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start prodand
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do  i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_wait prodand 
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      deallocate (B,CL)
- 
-      end   
-
-
-C ----------------------------------------------------REDA4103
-      subroutine REDA4103
-      integer, parameter :: N = 8, M=4,K=16,L=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin1,imint1
-      integer imaxloct1,iminloct1,lcoor
-      integer coor1(4),coor2(4)         
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-cdvm$ reduction_group locmaxmin
-
-      tname='REDA4103'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-
-cdvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1
-      njj1=L/2-1
-      A(ni1,nj1,nii1,njj1)=-(N+M+K+L+1+NL)
-      imin1=-(N+M+K+L+1+NL)
-
-cdvm$ remote_access (A(1,1,1,1))      
-      imint1=A(1,1,1,1)
-
-      iminloct1=imint1
-      lcoor=4
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor1(4)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-      coor2(4)=0
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(locmaxmin:max( imaxt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor),
-*dvm$*minloc( iminloct1,coor2,lcoor))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           do jj=1,L
-            if (A(i,j,ii,jj).GT.imaxt1) imaxt1 =A(i,j,ii,jj)
-            if (A(i,j,ii,jj).GT.imaxloct1) then
-              imaxloct1=A(i,j,ii,jj)
-              coor1(1)=i
-              coor1(2)=j 
-              coor1(3)=ii
-              coor1(4)=jj  
-            endif
-            if (A(i,j,ii,jj).LT.iminloct1) then
-              iminloct1=A(i,j,ii,jj)
-              coor2(1)=i
-              coor2(2)=j 
-              coor2(3)=ii 
-              coor2(4)=jj
-            endif
-           enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start locmaxmin
-cdvm$ reduction_wait locmaxmin
-
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-       if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1).and.
-     * (imaxt1.eq.imaxloct1).and.( coor1(1).eq.ni).and.
-     * (coor1(2).eq.nj).and.(coor1(3).eq.nii)
-     * .and.(coor1(4).eq.njj).and.
-     * (coor2(1).eq.ni1) .and.(coor2(2).eq.nj1) 
-     * .and.(coor2(3).eq.nii1).and.
-     * (coor2(4).eq.njj1)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------REDA4104
-      subroutine REDA4104
-      integer, parameter :: N = 8,M=6,K=16,L=8
-      real, parameter :: NL=1000.
-      character*8 tname
-      real, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer ni,ni1,lcoor
-      integer coor1(4),coor2(4)
-   
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)     
-cdvm$ reduction_group locsum
-
-      tname='REDA4104'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call sersum4mr(C,NN,MM,KK,LL,NNL,isum1)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      imax1=N+M+K+L+1.+NL
-
-cdvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1
-      njj1=L/2-1 
-      A(ni1,nj1,nii1,njj1)=-(N+M+K+L+1.+NL)
-      imin1=-(N+M+K+L+1.+NL)
-
-cdvm$ remote_access (A(1,1,1,1))      
-      imint1=A(1,1,1,1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lcoor=4
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor1(4)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-      coor2(4)=0
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(locsum:sum( isumt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor ),minloc( iminloct1,coor2,lcoor ))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-             isumt1 = isumt1+A(i,j,ii,jj)
-             if (A(i,j,ii,jj).GT.imaxloct1) then
-               imaxloct1=A(i,j,ii,jj)
-               coor1(1)=i
-               coor1(2)=j 
-               coor1(3)=ii
-               coor1(4)=jj  
-             endif
-             if (A(i,j,ii,jj).LT.iminloct1) then
-               iminloct1=A(i,j,ii,jj)
-               coor2(1)=i
-               coor2(2)=j 
-               coor2(3)=ii 
-               coor2(4)=jj
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start locsum
-cdvm$ reduction_wait locsum
-c      print *,A
-c       print *,imax1,imaxt1,imaxloct1
-c       print *,imin1,imint1,iminloct1
-     
-c       print *,isum1,isumt1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(coor1(1).eq.ni)
-     *.and.(coor2(1).eq.ni1).and.(coor1(2).eq.nj)
-     * .and.(coor2(2).eq.nj1)
-     *.and.(coor1(3).eq.nii).and.(coor2(3).eq.nii1).and.
-     * (coor1(4).eq.njj).and.(coor2(4).eq.njj1))then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C -----------------------------------------------------
-
-      subroutine sersum4(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo          
-          enddo
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
-   
-      subroutine sersum4m(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo 
-        enddo        
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1+NL)      
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo    
-      end   
-
-      subroutine sersum4mr(AR,N,M,K,L,NL,S)
-      real AR(N,M,K,L)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1.+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod4(AR,N,M,K,L,NL,P)
-      integer AR(N,M,K,L)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr4(AR,N,M,K,L,NL,P)
-      real AR(N,M,K,L)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end
-     
-      subroutine serlog4(AR,N,M,K,L,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K,L)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              AR(i,j,ii,jj) = .true.
-            enddo         
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2     
-              AR(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo 
-      enddo
-      LAND=AR(1,1,1,1)
-      LOR=AR(1,1,1,1)
-      LEQV=AR(1,1,1,1)
-      LNEQV=AR(1,1,1,1)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              LAND = LAND .and. AR(i,j,ii,jj)
-              LOR = LOR .or.AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              LEQV = LEQV .eqv. AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              LNEQV = LNEQV .neqv. AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
-   
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda42.fdv
deleted file mode 100644
index aa7748d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda42.fdv
+++ /dev/null
@@ -1,643 +0,0 @@
-      program REDA42
-
-c    TESTING OF THE REDUCTION_GROUP DIRECTIVE,REDUCTION_START
-c    DIRECTIVE,REDUCTION_WAIT DIRECTIVE.
-c    REDUCTION GROUPE IS EXECUTED FOR DISTRIBUTED ARRAY A(N,M,K,L).  
-c
-      print *,'===START OF REDA42======================='
-C --------------------------------------------------
-      call reda4201
-C --------------------------------------------------
-      call reda4202
-C --------------------------------------------------
-      call reda4203
-C -------------------------------------------------
-      call reda4204
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF REDA42 ========================= '    
-      end
-
-C ----------------------------------------------------REDA4201
-      subroutine REDA4201
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-cdvm$ distribute A(*,*,*,*)
-cdvm$ reduction_group smaxmin
-
-      tname='REDA4201'
-      allocate (A(N,M,K,L),C(N,M,K,L))      
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call sersum4m(C,NN,MM,KK,LL,NNL,isum1)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L      
-             A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-
-cdvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2 
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL)
-      imin1=-(N+M+K+L+1+NL)
-
-cdvm$ remote_access (A(1,1,1,1))
-      imint1=A(1,1,1,1)
-
-      isumt1 = 0
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(smaxmin:sum(isumt1),max(imaxt1),min(imint1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             isumt1 = isumt1+A(i,j,ii,jj)
-             if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-             if (A(i,j,ii,jj).LT.imint1) imint1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start smaxmin
-cdvm$ reduction_wait smaxmin
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------REDA4202
-      subroutine REDA4202
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:,:),CL(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-               
-                 
-cdvm$ distribute A(*,*,*,*)    
-cdvm$ align B(I,J,II,JJ) with A(I,J,II,JJ)      
-cdvm$ reduction_group prodand
-
-      tname='REDA4202'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      allocate (B(N,M,K,L),CL(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprod4(C,NN,MM,KK,LL,NNL,iprod1)
-      call serlog4(CL,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = .true.
-            enddo
-          enddo 
-        enddo         
-      enddo
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K 
-            do jj=2,L,2
-              B(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ remote_access (B(1,1,1,1))
-      landt1 = B(1,1,1,1)                   
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      iprodt1 = 1
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(prodand:product( iprodt1 ),and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L      
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-              landt1 = landt1 .and.B(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start prodand
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do  i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_wait prodand 
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      deallocate (B,CL)
- 
-      end   
-
-
-C ----------------------------------------------------REDA4203
-      subroutine REDA4203
-      integer, parameter :: N = 8, M=4,K=16,L=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin1,imint1
-      integer imaxloct1,iminloct1,lcoor
-      integer coor1(4),coor2(4)         
-cdvm$ distribute A(*,*,*,*)    
-cdvm$ reduction_group locmaxmin
-
-      tname='REDA4203'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-
-cdvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1
-      njj1=L/2-1
-      A(ni1,nj1,nii1,njj1)=-(N+M+K+L+1+NL)
-      imin1=-(N+M+K+L+1+NL)
-
-cdvm$ remote_access (A(1,1,1,1))      
-      imint1=A(1,1,1,1)
-
-      iminloct1=imint1
-      lcoor=4
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor1(4)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-      coor2(4)=0
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(locmaxmin:max( imaxt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor),
-*dvm$*minloc( iminloct1,coor2,lcoor))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           do jj=1,L
-            if (A(i,j,ii,jj).GT.imaxt1) imaxt1 =A(i,j,ii,jj)
-            if (A(i,j,ii,jj).GT.imaxloct1) then
-              imaxloct1=A(i,j,ii,jj)
-              coor1(1)=i
-              coor1(2)=j 
-              coor1(3)=ii
-              coor1(4)=jj  
-            endif
-            if (A(i,j,ii,jj).LT.iminloct1) then
-              iminloct1=A(i,j,ii,jj)
-              coor2(1)=i
-              coor2(2)=j 
-              coor2(3)=ii 
-              coor2(4)=jj
-            endif
-           enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start locmaxmin
-cdvm$ reduction_wait locmaxmin
-
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-       if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1).and.
-     * (imaxt1.eq.imaxloct1).and.( coor1(1).eq.ni).and.
-     * (coor1(2).eq.nj).and.(coor1(3).eq.nii)
-     * .and.(coor1(4).eq.njj).and.
-     * (coor2(1).eq.ni1) .and.(coor2(2).eq.nj1) 
-     * .and.(coor2(3).eq.nii1).and.
-     * (coor2(4).eq.njj1)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------REDA4204
-      subroutine REDA4204
-      integer, parameter :: N = 8,M=6,K=16,L=8
-      real, parameter :: NL=1000.
-      character*8 tname
-      real, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer ni,ni1,lcoor
-      integer coor1(4),coor2(4)
-   
-cdvm$ distribute A(*,*,*,*)     
-cdvm$ reduction_group locsum
-
-      tname='REDA4204'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call sersum4mr(C,NN,MM,KK,LL,NNL,isum1)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      imax1=N+M+K+L+1.+NL
-
-cdvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1
-      njj1=L/2-1 
-      A(ni1,nj1,nii1,njj1)=-(N+M+K+L+1.+NL)
-      imin1=-(N+M+K+L+1.+NL)
-
-cdvm$ remote_access (A(1,1,1,1))      
-      imint1=A(1,1,1,1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lcoor=4
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor1(4)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-      coor2(4)=0
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(locsum:sum( isumt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor ),minloc( iminloct1,coor2,lcoor ))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-             isumt1 = isumt1+A(i,j,ii,jj)
-             if (A(i,j,ii,jj).GT.imaxloct1) then
-               imaxloct1=A(i,j,ii,jj)
-               coor1(1)=i
-               coor1(2)=j 
-               coor1(3)=ii
-               coor1(4)=jj  
-             endif
-             if (A(i,j,ii,jj).LT.iminloct1) then
-               iminloct1=A(i,j,ii,jj)
-               coor2(1)=i
-               coor2(2)=j 
-               coor2(3)=ii 
-               coor2(4)=jj
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start locsum
-cdvm$ reduction_wait locsum
-c      print *,A
-c       print *,imax1,imaxt1,imaxloct1
-c       print *,imin1,imint1,iminloct1
-     
-c       print *,isum1,isumt1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(coor1(1).eq.ni)
-     *.and.(coor2(1).eq.ni1).and.(coor1(2).eq.nj)
-     * .and.(coor2(2).eq.nj1)
-     *.and.(coor1(3).eq.nii).and.(coor2(3).eq.nii1).and.
-     * (coor1(4).eq.njj).and.(coor2(4).eq.njj1))then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C -----------------------------------------------------
-
-      subroutine sersum4(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo          
-          enddo
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
-   
-      subroutine sersum4m(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo 
-        enddo        
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1+NL)      
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo    
-      end   
-
-      subroutine sersum4mr(AR,N,M,K,L,NL,S)
-      real AR(N,M,K,L)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1.+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod4(AR,N,M,K,L,NL,P)
-      integer AR(N,M,K,L)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr4(AR,N,M,K,L,NL,P)
-      real AR(N,M,K,L)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end
-     
-      subroutine serlog4(AR,N,M,K,L,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K,L)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              AR(i,j,ii,jj) = .true.
-            enddo         
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2     
-              AR(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo 
-      enddo
-      LAND=AR(1,1,1,1)
-      LOR=AR(1,1,1,1)
-      LEQV=AR(1,1,1,1)
-      LNEQV=AR(1,1,1,1)
-      do i=2,N
-        do j=2,M
-          do ii=2,K
-            do jj=2,L
-              LAND = LAND .and. AR(i,j,ii,jj)
-              LOR = LOR .or.AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      do i=1,N,2
-        do j=1,M,2
-          do ii=1,K,2
-            do jj=1,L,2
-              LEQV = LEQV .eqv. AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              LNEQV = LNEQV .neqv. AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
-   
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda43.fdv
deleted file mode 100644
index 19af3be..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/reda43.fdv
+++ /dev/null
@@ -1,643 +0,0 @@
-      program REDA43
-
-c    TESTING OF THE REDUCTION_GROUP DIRECTIVE,REDUCTION_START
-c    DIRECTIVE,REDUCTION_WAIT DIRECTIVE.
-c    REDUCTION GROUPE IS EXECUTED FOR DISTRIBUTED ARRAY A(N,M,K,L).  
-c
-      print *,'===START OF REDA43======================='
-C --------------------------------------------------
-      call reda4301
-C --------------------------------------------------
-      call reda4302
-C --------------------------------------------------
-      call reda4303
-C -------------------------------------------------
-      call reda4304
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF REDA43 ========================= '    
-      end
-
-C ----------------------------------------------------REDA4301
-      subroutine REDA4301
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imin1,imint1 ,ni
-      integer isum1,isumt1 
-      integer imax1,imaxt1
-                      
-cdvm$ distribute A(BLOCK,BLOCK,BLOCK,*)
-cdvm$ reduction_group smaxmin
-
-      tname='REDA4301'
-      allocate (A(N,M,K,L),C(N,M,K,L))      
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call sersum4m(C,NN,MM,KK,LL,NNL,isum1)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L      
-             A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-
-cdvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2 
-      A(ni,nj,nii,njj)=-(N+M+K+L+1+NL)
-      imin1=-(N+M+K+L+1+NL)
-
-cdvm$ remote_access (A(1,1,1,1))
-      imint1=A(1,1,1,1)
-
-      isumt1 = 0
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(smaxmin:sum(isumt1),max(imaxt1),min(imint1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-             isumt1 = isumt1+A(i,j,ii,jj)
-             if (A(i,j,ii,jj).GT.imaxt1) imaxt1=A(i,j,ii,jj)
-             if (A(i,j,ii,jj).LT.imint1) imint1=A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start smaxmin
-cdvm$ reduction_wait smaxmin
-c      print *,isumt1,isum1
-c      print *,imaxt1,imax1
-c      print *,imint1,imin1
-      if ((isum1 .eq.isumt1) .and.(imax1 .eq.imaxt1)
-     *   .and.(imin1 .eq.imint1))   then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-C ----------------------------------------------------REDA4302
-      subroutine REDA4302
-      integer, parameter :: N = 16,M=8,K=16,L=8,NL=10
-      character*8 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer iprod1,iprodt1 
-      logical, allocatable :: B(:,:,:,:),CL(:,:,:,:)
-      logical land1,landt1,lor1,leqv1,lneqv1
-               
-                 
-cdvm$ distribute A(BLOCK,BLOCK,*,BLOCK)    
-cdvm$ align B(I,J,II,JJ) with A(I,J,II,JJ)      
-cdvm$ reduction_group prodand
-
-      tname='REDA4302'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      allocate (B(N,M,K,L),CL(N,M,K,L))
-      NNL=NL
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call serprod4(C,NN,MM,KK,LL,NNL,iprod1)
-      call serlog4(CL,NN,MM,KK,LL,land1,lor1,leqv1,lneqv1)
-
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = .true.
-            enddo
-          enddo 
-        enddo         
-      enddo
-*dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K 
-            do jj=2,L,2
-              B(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ remote_access (B(1,1,1,1))
-      landt1 = B(1,1,1,1)                   
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-      iprodt1 = 1
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(prodand:product( iprodt1 ),and(landt1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L      
-              iprodt1 = iprodt1*A(i,j,ii,jj)
-              landt1 = landt1 .and.B(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start prodand
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do  i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_wait prodand 
-
-      if ((iprod1 .eq.iprodt1)
-     *.and. (land1 .eqv.landt1)) then       
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-      deallocate (B,CL)
- 
-      end   
-
-
-C ----------------------------------------------------REDA4303
-      subroutine REDA4303
-      integer, parameter :: N = 8, M=4,K=16,L=8,NL=1000
-      character*8 tname
-      integer, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      integer imax1,imaxt1 ,ni,imin1,imint1
-      integer imaxloct1,iminloct1,lcoor
-      integer coor1(4),coor2(4)         
-cdvm$ distribute A(BLOCK,*,BLOCK,BLOCK)    
-cdvm$ reduction_group locmaxmin
-
-      tname='REDA4303'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-      
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1+NL
-      imax1=N+M+K+L+1+NL
-
-cdvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1
-      njj1=L/2-1
-      A(ni1,nj1,nii1,njj1)=-(N+M+K+L+1+NL)
-      imin1=-(N+M+K+L+1+NL)
-
-cdvm$ remote_access (A(1,1,1,1))      
-      imint1=A(1,1,1,1)
-
-      iminloct1=imint1
-      lcoor=4
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor1(4)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-      coor2(4)=0
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(locmaxmin:max( imaxt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor),
-*dvm$*minloc( iminloct1,coor2,lcoor))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-           do jj=1,L
-            if (A(i,j,ii,jj).GT.imaxt1) imaxt1 =A(i,j,ii,jj)
-            if (A(i,j,ii,jj).GT.imaxloct1) then
-              imaxloct1=A(i,j,ii,jj)
-              coor1(1)=i
-              coor1(2)=j 
-              coor1(3)=ii
-              coor1(4)=jj  
-            endif
-            if (A(i,j,ii,jj).LT.iminloct1) then
-              iminloct1=A(i,j,ii,jj)
-              coor2(1)=i
-              coor2(2)=j 
-              coor2(3)=ii 
-              coor2(4)=jj
-            endif
-           enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start locmaxmin
-cdvm$ reduction_wait locmaxmin
-
-c      print *,imax1,imaxt1,imaxloct1
-c      print *,imin1,imint1,iminloct1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-       if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1).and.
-     * (imaxt1.eq.imaxloct1).and.( coor1(1).eq.ni).and.
-     * (coor1(2).eq.nj).and.(coor1(3).eq.nii)
-     * .and.(coor1(4).eq.njj).and.
-     * (coor2(1).eq.ni1) .and.(coor2(2).eq.nj1) 
-     * .and.(coor2(3).eq.nii1).and.
-     * (coor2(4).eq.njj1)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C ----------------------------------------------------REDA4304
-      subroutine REDA4304
-      integer, parameter :: N = 8,M=6,K=16,L=8
-      real, parameter :: NL=1000.
-      character*8 tname
-      real, allocatable :: A(:,:,:,:),C(:,:,:,:)
-      real isum1,isumt1
-      real imax1,imaxt1 ,imin1,imint1
-      real imaxloct1,iminloct1,NNL
-      integer ni,ni1,lcoor
-      integer coor1(4),coor2(4)
-   
-cdvm$ distribute A(*,BLOCK,BLOCK,BLOCK)     
-cdvm$ reduction_group locsum
-
-      tname='REDA4304'
-      allocate (A(N,M,K,L),C(N,M,K,L))
-
-      NNL=NL 
-      NN=N
-      MM=M
-      KK=K
-      LL=L
-      call sersum4mr(C,NN,MM,KK,LL,NNL,isum1)
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo
-
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      A(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      imax1=N+M+K+L+1.+NL
-
-cdvm$ remote_access (A(1,1,1,1))
-      imaxt1=A(1,1,1,1)  
-
-      imaxloct1=imaxt1
-      ni1=N/2-1
-      nj1=M/2-1
-      nii1=K/2-1
-      njj1=L/2-1 
-      A(ni1,nj1,nii1,njj1)=-(N+M+K+L+1.+NL)
-      imin1=-(N+M+K+L+1.+NL)
-
-cdvm$ remote_access (A(1,1,1,1))      
-      imint1=A(1,1,1,1)
-
-      iminloct1=imint1
-      isumt1 = 0.
-      lcoor=4
-      coor1(1)=0
-      coor1(2)=0
-      coor1(3)=0
-      coor1(4)=0
-      coor2(1)=0
-      coor2(2)=0
-      coor2(3)=0
-      coor2(4)=0
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-*dvm$*reduction(locsum:sum( isumt1 ),
-*dvm$*maxloc( imaxloct1,coor1,lcoor ),minloc( iminloct1,coor2,lcoor ))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-             isumt1 = isumt1+A(i,j,ii,jj)
-             if (A(i,j,ii,jj).GT.imaxloct1) then
-               imaxloct1=A(i,j,ii,jj)
-               coor1(1)=i
-               coor1(2)=j 
-               coor1(3)=ii
-               coor1(4)=jj  
-             endif
-             if (A(i,j,ii,jj).LT.iminloct1) then
-               iminloct1=A(i,j,ii,jj)
-               coor2(1)=i
-               coor2(2)=j 
-               coor2(3)=ii 
-               coor2(4)=jj
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-
-cdvm$ reduction_start locsum
-cdvm$ reduction_wait locsum
-c      print *,A
-c       print *,imax1,imaxt1,imaxloct1
-c       print *,imin1,imint1,iminloct1
-     
-c       print *,isum1,isumt1
-c      print *,it1,ni
-c      print *,it2,ni1
-c      print *,jt1,nj
-c      print *,jt2,nj1
-      if ((imaxloct1.eq.imax1).and.(iminloct1.eq.imin1)
-     *.and.(isumt1.eq.isum1).and.(coor1(1).eq.ni)
-     *.and.(coor2(1).eq.ni1).and.(coor1(2).eq.nj)
-     * .and.(coor2(2).eq.nj1)
-     *.and.(coor1(3).eq.nii).and.(coor2(3).eq.nii1).and.
-     * (coor1(4).eq.njj).and.(coor2(4).eq.njj1))then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,C)
-
-      end
-
-
-C -----------------------------------------------------
-
-      subroutine sersum4(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo          
-          enddo
-        enddo
-      enddo
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
-   
-      subroutine sersum4m(AR,N,M,K,L,NL,S)
-      integer AR(N,M,K,L)
-      integer S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo 
-        enddo        
-      enddo
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1+NL)      
-      S=0
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo    
-      end   
-
-      subroutine sersum4mr(AR,N,M,K,L,NL,S)
-      real AR(N,M,K,L)
-      real S,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo 
-          enddo
-        enddo
-      enddo 
-      ni=N/2-1
-      nj=M/2-1
-      nii=K/2-1
-      njj=L/2-1
-      AR(ni,nj,nii,njj)=N+M+K+L+1.+NL
-      ni=N/2
-      nj=M/2
-      nii=K/2
-      njj=L/2
-      AR(ni,nj,nii,njj)=-(N+M+K+L+1.+NL)
-      S=0.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              s = s+ AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end  
-  
-      subroutine serprod4(AR,N,M,K,L,NL,P)
-      integer AR(N,M,K,L)
-      integer P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo   
-      P=1
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
- 
-      subroutine serprodr4(AR,N,M,K,L,NL,P)
-      real AR(N,M,K,L)
-      real P,NL
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              AR(i,j,ii,jj) = i+j+ii+jj+NL
-            enddo
-          enddo
-        enddo
-      enddo 
-      P=1.
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              P = P* AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end
-     
-      subroutine serlog4(AR,N,M,K,L,LAND,LOR,LEQV,LNEQV)
-      logical AR(N,M,K,L)
-      logical LAND,LOR,LEQV,LNEQV
-      do  i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L,2
-              AR(i,j,ii,jj) = .true.
-            enddo         
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=2,L,2     
-              AR(i,j,ii,jj)=.false.
-            enddo
-          enddo
-        enddo 
-      enddo
-      LAND=AR(1,1,1,1)
-      LOR=AR(1,1,1,1)
-      LEQV=AR(1,1,1,1)
-      LNEQV=AR(1,1,1,1)
-      do i=2,N
-        do j=2,M
-          do ii=2,K
-            do jj=2,L
-              LAND = LAND .and. AR(i,j,ii,jj)
-              LOR = LOR .or.AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      do i=1,N,2
-        do j=1,M,2
-          do ii=1,K,2
-            do jj=1,L,2
-              LEQV = LEQV .eqv. AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L 
-              LNEQV = LNEQV .neqv. AR(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-      end   
-
-      subroutine ansyes(name)
-      character*8 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*8 name
-      print *,name,'  -  ***error'
-      end
-   
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/settings
deleted file mode 100644
index 3ef2d72..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REDUCTIONA/settings
+++ /dev/null
@@ -1 +0,0 @@
-DVM_ONLY=1
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem11.fdv
deleted file mode 100644
index a8a2118..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem11.fdv
+++ /dev/null
@@ -1,538 +0,0 @@
-      program REM11
-     
-c    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-c    ON ALL PROCESSORS. 
-
-      print *,'===START OF REM11========================'
-C --------------------------------------------------
-      call rem1101
-C --------------------------------------------------
-      call rem1102
-C --------------------------------------------------
-      call rem1103
-C -------------------------------------------------
-      call rem1104
-C -------------------------------------------------
-      call rem1105
-C -------------------------------------------------
-      call rem1106
-C --------------------------------------------------
-      call rem1107
-C --------------------------------------------------
-      call rem1108
-C --------------------------------------------------
-      call rem1109
-C -------------------------------------------------
-      call rem1110
-C -------------------------------------------------
-      call rem1111
-C -------------------------------------------------
-      call rem1112
-C ------------------------------------------------- 
-
-C
-C
-      print *,'=== END OF REM11 ========================= '    
-      end
-C ---------------------------------------------REM1101
-      subroutine REM1101
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1101'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(1))
-!dvm$ remote_access (A(1))
-      ib=A(1)
-
-      if (ib .eq.C(1)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------REM1102
-      subroutine REM1102
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1102'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ end region
-!dvm$ get_actual(A(N))
-!dvm$ remote_access (A(N))
-      ib=A(N)               
-      if (ib .eq.C(N)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end     
- 
-C ----------------------------------------REM1103
-      subroutine REM1103
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1103'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ end region
-!dvm$ get_actual(A(N/2))
-!dvm$ remote_access (A(N/2))
-      ib=A(N/2)               
-      if (ib .eq.C(N/2)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end      
-C ----------------------------------------REM1104
-      subroutine REM1104
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop,isumc,isuma 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1104'
-      allocate (B(N),A(N),C(N),D(N))
-      isumc=0
-      isuma=0    
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ end region
-      do i=1,N         
-!dvm$ get_actual(A(i))
-!dvm$   remote_access (A(i))
-        D(i)=A(i)
-        isumc=isumc+C(i)
-        isuma=isuma+D(i)
-      enddo
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C,D)
-
-      end           
- 
-C ----------------------------------------REM1105
-      subroutine REM1105
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop,isumc,isuma 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)     
-
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1105'
-      allocate (B(N),A(N),C(N),D(N))
-      isumc=0
-      isuma=0    
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-!dvm$   remote_access (A(:))
-        D(i)=A(i)
-        isumc=isumc+C(i)
-        isuma=isuma+D(i)
-      enddo
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C,D)
-
-      end           
- 
-C ----------------------------------------REM1106
-      subroutine REM1106
-      integer, parameter :: N = 16,NL=1000     
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop,isumc,isuma 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1106'
-      allocate (B(N),A(N),C(N),D(N))
-      isumc=0
-      isuma=0    
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ end region
-      kk=2
-      kk1=3                                               
-
-      do i=1,N/kk-kk1
-!dvm$ get_actual(A(kk*i+kk1))
-!dvm$  remote_access (A(kk*i+kk1))
-       D(i)=A(kk*i+kk1)
-       isumc=isumc+C(kk*i+kk1)
-       isuma=isuma+D(i)
-      enddo
-      if (isumc .eq.isuma) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C,D)
-
-      end           
-C ---------------------------------------------REM1107
-      subroutine REM1107
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1107'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region local(A, B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),remote_access(A(1))
-      do i=1,N
-         B(i) = A(1)
-      enddo
-
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(1)) nloop=min(nloop, i);
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-
-      if (nloop .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------REM1108
-      subroutine REM1108
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1108'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),remote_access(A(N))
-      do i=1,N
-         B(i) = A(N)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(N)) nloop=min(nloop,i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-
-      if (nloop .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------REM1109
-
-      subroutine REM1109
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)   
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1109'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),remote_access(A(N/2))
-      do i=1,N
-         B(i) = A(N/2)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(N/2)) nloop=min(nloop,i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-
-      if (nloop .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------REM1110
-
-      subroutine REM1110
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1110'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),remote_access(A)
-      do i=1,N
-         B(i) = A(i)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(i)) nloop=min(nloop,i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-
-               
-      if (nloop .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------REM1111
-      subroutine REM1111
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1111'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),remote_access(A(i))
-      do i=1,N
-         B(i) = A(i)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(i)) nloop=min(nloop,i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-      if (nloop .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------REM1112
-      subroutine REM1112
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(BLOCK)   
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1112'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-      kk=2
-      kk1=3         
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),remote_access(A(kk*i+kk1))
-      do i=1,N/kk-kk1
-         B(i) = A(kk*i+kk1)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N/kk-kk1
-          if (B(i).ne.C(kk*i+kk1)) nloop=min(nloop,i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-               
-      if (nloop .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem12.fdv
deleted file mode 100644
index 2d67fc7..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem12.fdv
+++ /dev/null
@@ -1,533 +0,0 @@
-      program REM12
-     
-c    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-c    ON ALL PROCESSORS. 
-
-      print *,'===START OF REM12========================'
-C --------------------------------------------------
-      call rem1201
-C --------------------------------------------------
-      call rem1202
-C --------------------------------------------------
-      call rem1203
-C -------------------------------------------------
-      call rem1204
-C -------------------------------------------------
-      call rem1205
-C -------------------------------------------------
-      call rem1206
-C --------------------------------------------------
-      call rem1207
-C --------------------------------------------------
-      call rem1208
-C --------------------------------------------------
-      call rem1209
-C -------------------------------------------------
-      call rem1210
-C -------------------------------------------------
-      call rem1211
-C -------------------------------------------------
-      call rem1212
-C ------------------------------------------------- 
-
-C
-C
-      print *,'=== END OF REM12 ========================= '    
-      end
-C ---------------------------------------------REM1201
-      subroutine REM1201
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1201'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(1))
-!dvm$ remote_access (A(1))
-      ib=A(1)
-
-      if (ib .eq.C(1)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------REM1202
-      subroutine REM1202
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1202'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(N))
-!dvm$ remote_access (A(N))
-      ib=A(N)               
-      if (ib .eq.C(N)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end     
- 
-C ----------------------------------------REM1203
-      subroutine REM1203
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1203'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(N/2))
-!dvm$ remote_access (A(N/2))
-      ib=A(N/2)               
-      if (ib .eq.C(N/2)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end      
-C ----------------------------------------REM1204
-      subroutine REM1204
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop,isumc,isuma 
-      character*7 tname
-                
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1204'
-      allocate (B(N),A(N),C(N),D(N))
-      isumc=0
-      isuma=0    
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-!dvm$   remote_access (A(i))
-        D(i)=A(i)
-        isumc=isumc+C(i)
-        isuma=isuma+D(i)
-      enddo
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C,D)
-
-      end           
- 
-C ----------------------------------------REM1205
-      subroutine REM1205
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop,isumc,isuma 
-      character*7 tname
-                
-!dvm$ distribute B(*)     
-
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1205'
-      allocate (B(N),A(N),C(N),D(N))
-      isumc=0
-      isuma=0    
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-!dvm$   remote_access (A(:))
-        D(i)=A(i)
-        isumc=isumc+C(i)
-        isuma=isuma+D(i)
-      enddo
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C,D)
-
-      end           
- 
-C ----------------------------------------REM1206
-      subroutine REM1206
-      integer, parameter :: N = 16,NL=1000     
-      integer, allocatable :: A(:),B(:),C(:),D(:)
-      integer nloop,isumc,isuma 
-      character*7 tname
-                
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1206'
-      allocate (B(N),A(N),C(N),D(N))
-      isumc=0
-      isuma=0    
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-      kk=2
-      kk1=3                                               
-!dvm$ region out(A)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual(A)
-
-      do i=1,N/kk-kk1
-!dvm$  remote_access (A(kk*i+kk1))
-       D(i)=A(kk*i+kk1)
-       isumc=isumc+C(kk*i+kk1)
-       isuma=isuma+D(i)
-      enddo
-      if (isumc .eq.isuma) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C,D)
-
-      end           
-C ---------------------------------------------REM1207
-      subroutine REM1207
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1207'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),remote_access(A(1))
-      do i=1,N
-         B(i) = A(1)
-      enddo
-
-!dvm$ parallel (i) on A(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(1)) nloop=min(nloop,i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-      if (nloop .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------REM1208
-      subroutine REM1208
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1208'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),remote_access(A(N))
-      do i=1,N
-         B(i) = A(N)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(N)) nloop=min(nloop, i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-      if (nloop .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------REM1209
-
-      subroutine REM1209
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(*)   
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1209'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),remote_access(A(N/2))
-      do i=1,N
-         B(i) = A(N/2)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(N/2)) nloop=min(nloop, i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-
-      if (nloop .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------REM1210
-
-      subroutine REM1210
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1210'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-c !dvm$ parallel (i) on B(i),remote_access(A)
-!dvm$ parallel (i) on B(i),remote_access(A(:))
-      do i=1,N
-         B(i) = A(i)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(i)) nloop=min(nloop, i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-
-               
-      if (nloop .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C ---------------------------------------------REM1211
-      subroutine REM1211
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1211'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),remote_access(A(:))
-      do i=1,N
-         B(i) = A(i)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N
-          if (B(i).ne.C(i)) nloop=min(nloop, i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-      if (nloop .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-
-C ---------------------------------------------REM1212
-      subroutine REM1212
-      integer, parameter :: N = 16,NL=1000
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-      character*7 tname
-                
-!dvm$ distribute B(*)   
-!dvm$ align (I) with B(I) ::A
-
-      tname='REM1212'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-      kk=2
-      kk1=3         
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),remote_access(A(:))
-      do i=1,N/kk-kk1
-         B(i) = A(kk*i+kk1)
-      enddo
-
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=1,N/kk-kk1
-          if (B(i).ne.C(kk*i+kk1)) nloop=min(nloop, i)
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloop)
-      if (nloop .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem21.fdv
deleted file mode 100644
index 8e2ecb2..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem21.fdv
+++ /dev/null
@@ -1,992 +0,0 @@
-      program REM21
-     
-c    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-c    ON ALL PROCESSORS. 
-
-      print *,'===START OF REM21========================'
-C --------------------------------------------------
-      call rem2101
-C --------------------------------------------------
-      call rem2102
-C --------------------------------------------------
-      call rem2103
-C -------------------------------------------------
-      call rem2104
-C -------------------------------------------------
-      call rem2105
-C -------------------------------------------------
-      call rem2106
-C --------------------------------------------------
-      call rem2107
-C --------------------------------------------------
-      call rem2108
-C --------------------------------------------------
-      call rem2109
-C -------------------------------------------------
-      call rem2110
-C -------------------------------------------------
-      call rem2111
-C -------------------------------------------------
-      call rem2112
-C ------------------------------------------------- 
-      call rem2113
-C ------------------------------------------------- 
-      call rem2114
-C ------------------------------------------------- 
-      call rem2115
-C ----------------------------------------------- 
-      call rem2116
-C ----------------------------------------------- 
-      call rem2117
-C ------------------------------------------------- 
-      call rem2118
-C ------------------------------------------------ 
-      call rem2119
-C ------------------------------------------------- 
-      call rem2120
-C ------------------------------------------------- 
-
-C
-      print *,'=== END OF REM21 ========================= '    
-      end
-C ---------------------------------------------------------REM2101
-
-      subroutine REM2101     
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute B(BLOCK,BLOCK)    
-!dvm$ align :: A 
-
-      tname='REM2101'
-      allocate(B(N,M),A(N,M),C(N,M))
-!dvm$ realign A(i,j) with B(i,j)
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(1,1))
-!dvm$ remote_access (A(1,1))
-      ib=A(1,1)               
-
-      if (ib .eq.C(1,1)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(A,B,C)
-
-      end
-
-C ------------------------------------------------------REM2102
-      subroutine REM2102
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)     
-!dvm$ align :: B 
-
-      tname='REM2102'
-      allocate(A(N,M),B(N,M),C(N,M))
-!dvm$ realign B(i,j) with A(i,j)
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(N,M))
-!dvm$ remote_access (A(N,M))
-      ib=A(N,M)               
-      if (ib .eq.C(N,M)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C)
-
-      end
-
-C ------------------------------------------------------REM2103
-      subroutine REM2103
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2103'
-      allocate(A(N,M),B(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(1,M))
-!dvm$ remote_access (A(1,M))
-      ib=A(1,M)               
-
-      if (ib .eq.C(1,M)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C)
-
-      end
-
-C ------------------------------------------------------REM2104
-      subroutine REM2104
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)     
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2104'
-      allocate(A(N,M),B(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(N,1))
-!dvm$ remote_access (A(N,1))
-      ib=A(N,1)               
-      if (ib .eq.C(N,1)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C)
-
-      end
-
-C ------------------------------------------------------REM2105
-      subroutine REM2105
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)     
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2105'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-        do j=i,M
-!dvm$     remote_access (A(:,:))
-          D(i,j)=A(i,j)
-          isumc=isumc+C(i,j)
-          isuma=isuma+D(i,j)
-        enddo
-      enddo           
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)
-   
-      end
-
-C ------------------------------------------------------REM2106
-      subroutine REM2106     
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)     
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2106'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(:,1))
-      do i=1,N         
-!dvm$   remote_access (A(:,1))
-        D(i,1)=A(i,1)
-        isumc=isumc+C(i,1)
-        isuma=isuma+D(i,1)
-      enddo           
-
-      if (isumc .eq.isuma) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)
-        
-      end
-
-C ------------------------------------------------------REM2107
-      subroutine REM2107
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2107'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(1,:))
-      do j=1,M               
-!dvm$   remote_access (A(1,:))
-        D(1,j)=A(1,j)
-        isumc=isumc+C(1,j)
-        isuma=isuma+D(1,j)
-      enddo           
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C -----------------------------------------------------REM2108
-      subroutine REM2108
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2108'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(:,M))
-      do i=1,N         
-!dvm$   remote_access (A(:,M))
-        D(i,M)=A(i,M)
-        isumc=isumc+C(i,M)
-        isuma=isuma+D(i,M)
-      enddo           
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)
-        
-      end
-C ------------------------------------------------------REM2109
-      subroutine REM2109
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2109'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out (A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(N,:))
-      do j=1,M               
-!dvm$   remote_access (A(N,:))
-        D(N,j)=A(N,j)
-        isumc=isumc+C(N,j)
-        isuma=isuma+D(N,j)
-      enddo
-
-      if (isumc .eq.isuma) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM2110
-      subroutine REM2110
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)   
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2110'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-        do j=i,M
-!dvm$     remote_access (A(i,j))
-          D(i,j)=A(i,j)
-          isumc=isumc+C(i,j)
-          isuma=isuma+D(i,j)
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif   
-      deallocate(B,A,C,D)     
-
-      end
-
-C ------------------------------------------------------REM2111
-      subroutine REM2111
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-      integer ki           
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2111'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A)
-      ki=2
-      ki1=3
-      kj=2
-      kj1=3        
-      do i=1,N/ki-ki1         
-        do j=i,M/kj-kj1
-!dvm$     remote_access (A(ki*i+ki1,kj*j+kj1))
-          D(i,j)=A(ki*i+ki1,kj*j+kj1)
-          isumc=isumc+C(ki*i+ki1,kj*j+kj1 )
-          isuma=isuma+D(i,j)
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM2112
-      subroutine REM2112
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2112'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(1,1))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(1,1)
-        enddo
-      enddo
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(1,1)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM2113
-      subroutine REM2113
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2113'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-           A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(N,M))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(N,M)
-        enddo
-      enddo
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(N,M)) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM2114
-      subroutine REM2114
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2114'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(1,M))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(1,M)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(1,M)) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM2115
-      subroutine REM2115
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2115'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(N,1))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(N,1)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(N,1)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM2116
-      subroutine REM2116
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2116'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(:,:))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(i,j)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM2117
-      subroutine REM2117
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2117'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i) on B(i,1),remote_access(A(:,1))
-      do i=1,N      
-        B(i,1) = A(i,1)
-      enddo
-      
-!dvm$ parallel (i) on B(i,1), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-          if (B(i,1).ne.C(i,1)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C -----------------------------------------------------REM2118
-      subroutine REM2118
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)    
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2118'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,J) on A(i,j),remote_access(A(1,:))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(1,j)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(1,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C ----------------------------------------------------REM2119
-      subroutine REM2119
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)     
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2119'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(:,M))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(i,M)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(i,M)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM2120
-      subroutine REM2120
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK)     
-!dvm$ align(i,j) with A(i,j) :: B 
-
-      tname='REM2120'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on A(i,j),remote_access(A(N,:))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(N,j)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(N,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif   
-      deallocate(B,A,C,D)     
-
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          AR(i,j) = NL+i+j
-        enddo
-      enddo
-                   
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem22.fdv
deleted file mode 100644
index fd7d9e1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem22.fdv
+++ /dev/null
@@ -1,992 +0,0 @@
-      program REM22
-     
-c    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-c    ON ALL PROCESSORS. 
-
-      print *,'===START OF REM22========================'
-C --------------------------------------------------
-      call rem2201
-C --------------------------------------------------
-      call rem2202
-C --------------------------------------------------
-      call rem2203
-C -------------------------------------------------
-      call rem2204
-C -------------------------------------------------
-      call rem2205
-C -------------------------------------------------
-      call rem2206
-C --------------------------------------------------
-      call rem2207
-C --------------------------------------------------
-      call rem2208
-C --------------------------------------------------
-      call rem2209
-C -------------------------------------------------
-      call rem2210
-C -------------------------------------------------
-      call rem2211
-C -------------------------------------------------
-      call rem2212
-C ------------------------------------------------- 
-      call rem2213
-C ------------------------------------------------- 
-      call rem2214
-C ------------------------------------------------- 
-      call rem2215
-C ----------------------------------------------- 
-      call rem2216
-C ----------------------------------------------- 
-      call rem2217
-C ------------------------------------------------- 
-      call rem2218
-C ------------------------------------------------ 
-      call rem2219
-C ------------------------------------------------- 
-      call rem2220
-C ------------------------------------------------- 
-
-C
-      print *,'=== END OF REM22 ========================= '    
-      end
-C ---------------------------------------------------------REM2201
-
-      subroutine REM2201     
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute B(*,BLOCK)    
-!dvm$ align(:,:) with B(:,:) :: A 
-
-      tname='REM2201'
-      allocate(B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(1,1))
-!dvm$ remote_access (A(1,1))
-      ib=A(1,1)               
-
-      if (ib .eq.C(1,1)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(A,B,C)
-
-      end
-
-C ------------------------------------------------------REM2202
-      subroutine REM2202
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)     
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2202'
-      allocate(A(N,M),B(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(N,M))
-!dvm$ remote_access (A(N,M))
-      ib=A(N,M)               
-      if (ib .eq.C(N,M)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C)
-
-      end
-
-C ------------------------------------------------------REM2203
-      subroutine REM2203
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2203'
-      allocate(A(N,M),B(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(1,M))
-!dvm$ remote_access (A(1,M))
-      ib=A(1,M)               
-
-      if (ib .eq.C(1,M)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C)
-
-      end
-
-C ------------------------------------------------------REM2204
-      subroutine REM2204
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)     
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2204'
-      allocate(A(N,M),B(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(N,1))
-!dvm$ remote_access (A(N,1))
-      ib=A(N,1)               
-      if (ib .eq.C(N,1)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C)
-
-      end
-
-C ------------------------------------------------------REM2205
-      subroutine REM2205
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK)     
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2205'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-        do j=i,M
-!dvm$     remote_access (A(:,:))
-          D(i,j)=A(i,j)
-          isumc=isumc+C(i,j)
-          isuma=isuma+D(i,j)
-        enddo
-      enddo           
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)
-   
-      end
-
-C ------------------------------------------------------REM2206
-      subroutine REM2206     
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)     
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2206'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(:,1))
-      do i=1,N         
-!dvm$   remote_access (A(:,1))
-        D(i,1)=A(i,1)
-        isumc=isumc+C(i,1)
-        isuma=isuma+D(i,1)
-      enddo           
-
-      if (isumc .eq.isuma) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)
-        
-      end
-
-C ------------------------------------------------------REM2207
-      subroutine REM2207
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2207'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(1,:))
-      do j=1,M               
-!dvm$   remote_access (A(1,:))
-        D(1,j)=A(1,j)
-        isumc=isumc+C(1,j)
-        isuma=isuma+D(1,j)
-      enddo           
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C -----------------------------------------------------REM2208
-      subroutine REM2208
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2208'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(:,M))
-      do i=1,N         
-!dvm$   remote_access (A(:,M))
-        D(i,M)=A(i,M)
-        isumc=isumc+C(i,M)
-        isuma=isuma+D(i,M)
-      enddo           
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)
-        
-      end
-C ------------------------------------------------------REM2209
-      subroutine REM2209
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2209'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A(N,:))
-      do j=1,M               
-!dvm$   remote_access (A(N,:))
-        D(N,j)=A(N,j)
-        isumc=isumc+C(N,j)
-        isuma=isuma+D(N,j)
-      enddo
-
-      if (isumc .eq.isuma) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM2210
-      subroutine REM2210
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)   
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2210'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-        do j=i,M
-!dvm$     remote_access (A(i,j))
-          D(i,j)=A(i,j)
-          isumc=isumc+C(i,j)
-          isuma=isuma+D(i,j)
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif   
-      deallocate(B,A,C,D)     
-
-      end
-
-C ------------------------------------------------------REM2211
-      subroutine REM2211
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj,isumc,isuma 
-      character*7 tname
-      integer ki           
-!dvm$ distribute A(*,BLOCK)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2211'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region out(A)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                       
-!dvm$ end region
-!dvm$ get_actual(A)
-      ki=2
-      ki1=3
-      kj=2
-      kj1=3        
-      do i=1,N/ki-ki1         
-        do j=i,M/kj-kj1
-!dvm$     remote_access (A(ki*i+ki1,kj*j+kj1))
-          D(i,j)=A(ki*i+ki1,kj*j+kj1)
-          isumc=isumc+C(ki*i+ki1,kj*j+kj1 )
-          isuma=isuma+D(i,j)
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM2212
-      subroutine REM2212
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2212'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(1,1))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(1,1)
-        enddo
-      enddo
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(1,1)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-     
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM2213
-      subroutine REM2213
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2213'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-           A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(N,M))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(N,M)
-        enddo
-      enddo
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(N,M)) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM2214
-      subroutine REM2214
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2214'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(1,M))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(1,M)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(1,M)) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM2215
-      subroutine REM2215
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2215'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(N,1))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(N,1)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(N,1)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM2216
-      subroutine REM2216
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2216'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-c !dvm$ parallel (i,J) on A(i,j),remote_access(A)
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(:,:))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(i,j)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(i,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM2217
-      subroutine REM2217
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2217'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i) on B(i,1),remote_access(A(:,1))
-      do i=1,N      
-        B(i,1) = A(i,1)
-      enddo
-      
-!dvm$ parallel (i) on B(i,1), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-          if (B(i,1).ne.C(i,1)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C -----------------------------------------------------REM2218
-      subroutine REM2218
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)    
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2218'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,J) on A(i,j),remote_access(A(1,:))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(1,j)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(1,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-
-C ----------------------------------------------------REM2219
-      subroutine REM2219
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK)     
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2219'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,J) on B(i,j),remote_access(A(:,M))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(i,M)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(i,M)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate(B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM2220
-      subroutine REM2220
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:),D(:,:)
-      integer nloopi,nloopj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*)     
-!dvm$ align(:,:) with A(:,:) :: B 
-
-      tname='REM2220'
-      allocate(A(N,M),B(N,M),C(N,M),D(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,J) on A(i,j),remote_access(A(N,:))
-      do i=1,N
-        do j=1,M
-          B(i,j) = A(N,j)
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j) on A(i,j), reduction( min( nloopi),min(nloopj))
-      do i=1,N
-        do j=1,M
-          if (B(i,j).ne.C(N,j)) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif   
-      deallocate(B,A,C,D)     
-
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          AR(i,j) = NL+i+j
-        enddo
-      enddo
-                   
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem31.fdv
deleted file mode 100644
index 921f5ff..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem31.fdv
+++ /dev/null
@@ -1,763 +0,0 @@
-      program REM31
-     
-c    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-c    ON ALL PROCESSORS. 
-
-      print *,'===START OF REM31========================'
-C --------------------------------------------------
-      call rem3101
-C --------------------------------------------------
-      call rem3102
-C --------------------------------------------------
-      call rem3103
-C -------------------------------------------------
-      call rem3104
-C -------------------------------------------------
-      call rem3105
-C -------------------------------------------------
-      call rem3106
-C --------------------------------------------------
-      call rem3107
-C --------------------------------------------------
-      call rem3108
-C --------------------------------------------------
-      call rem3109
-C -------------------------------------------------
-      call rem3110
-C -------------------------------------------------
-      call rem3111
-C -------------------------------------------------
-      call rem3112
-C ------------------------------------------------- 
-      call rem3113
-C ------------------------------------------------- 
-C
-      print *,'=== END OF REM31 ========================= '    
-      end
-C ---------------------------------------------------------REM3101
-      subroutine REM3101     
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)
-!dvm$ align(:,:,:) with B(:,:,:) :: A 
-
-      tname='REM3101'
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo      
-!dvm$ end region
-!dvm$ get_actual(A(1,1,1))
-!dvm$ remote_access (A(1,1,1))
-      ib=A(1,1,1)               
-
-      if (ib .eq.C(1,1,1)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C ------------------------------------------------------REM3102
-      subroutine REM3102
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3102'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo      
-!dvm$ end region
-!dvm$ get_actual(A(N,M,K))
-!dvm$ remote_access (A(N,M,K))
-      ib=A(N,M,K)               
-      if (ib .eq.C(N,M,K)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C)
-
-      end
-
-C ------------------------------------------------------REM3103
-      subroutine REM3103
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)     
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3103'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-        do j=i,M
-          do ii=1,K
-!dvm$        remote_access (A(:,:,:))
-             D(i,j,ii)=A(i,j,ii)
-             isumc=isumc+C(i,j,ii)
-             isuma=isuma+D(i,j,ii)
-          enddo
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C ------------------------------------------------------REM3104
-      subroutine REM3104
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)     
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3104'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=Nl
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(1,:,:))
-
-      do j=1,M         
-        do ii=1,K
-!dvm$     remote_access (A(1,:,:))
-          D(1,j,ii)=A(1,j,ii)
-          isumc=isumc+C(1,j,ii)
-          isuma=isuma+D(1,j,ii)
-        enddo
-      enddo
-              
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-        
-      end
-C -----------------------------------------------------REM3105
-      subroutine REM3105
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3105'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,M,:))
-
-      do i=1,N         
-        do ii=1,K
-!dvm$     remote_access (A(:,M,:))
-          D(i,M,ii)=A(i,M,ii)
-          isumc=isumc+C(i,M,ii)
-          isuma=isuma+D(i,M,ii)
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-   
-      end
-C ------------------------------------------------------REM3106
-      subroutine REM3106
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3106'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,:,K))
-    
-      do i=1,N
-        do j=1,M         
-!dvm$     remote_access (A(:,:,K))
-          D(i,j,K)=A(i,j,K)
-          isumc=isumc+C(i,j,K)
-          isuma=isuma+D(i,j,K)
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C ------------------------------------------------------REM3107
-      subroutine REM3107
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3107'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-                                          
-      ki=2
-      ki1=3
-      kj=2
-      kj1=3
-      kii=2
-      kii1=3        
-      do i=1,N/ki-ki1         
-        do j=1,M/kj-kj1
-          do ii=1,K/kii-kii1
-!dvm$       remote_access (A(ki*i+ki1,kj*j+kj1,kii*ii+kii1))
-            D(i,j,ii)=A(ki*i+ki1,kj*j+kj1,kii*ii+kii1)
-            isumc=isumc+C(ki*i+ki1,kj*j+kj1,kii*ii+kii1)
-            isuma=isuma+D(i,j,ii)
-          enddo
-        enddo
-      enddo
-              
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-        
-      end
-C ------------------------------------------------------REM3108
-      subroutine REM3108
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3108'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(A(1,1,1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(1,1,1)
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(1,1,1)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-C ------------------------------------------------------REM3109
-      subroutine REM3109
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3109'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(A(N,M,K))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(N,M,K)
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(N,M,K)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C -----------------------------------------------------REM3110
-      subroutine REM3110
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3110'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(A)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(i,j,ii)
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(i,j,ii)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C -----------------------------------------------------REM3111
-      subroutine REM3111
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3111'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-                     
-!dvm$ parallel (i,j,ii) on A(i,j,ii),remote_access(A(1,:,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(1,j,ii)
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(1,j,ii)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C ----------------------------------------------------REM3112
-      subroutine REM3112
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3112'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(A(:,M,:))
-      do i=1,N
-        do j=1,M
-           do ii=1,K
-             B(i,j,ii) = A(i,M,ii)
-           enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(i,M,ii)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-C ------------------------------------------------------REM3113
-      subroutine REM3113
-      integer, parameter ::  N = 16,M=8,K=8,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3113'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K        
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,j,ii) on A(i,j,ii),
-!dvm$*remote_access(A(:,:,K))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(i,j,K)
-          enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(i,j,K)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo     
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem32.fdv
deleted file mode 100644
index 6bc085f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem32.fdv
+++ /dev/null
@@ -1,763 +0,0 @@
-      program REM32
-     
-c    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-c    ON ALL PROCESSORS. 
-
-      print *,'===START OF REM32========================'
-C --------------------------------------------------
-      call rem3201
-C --------------------------------------------------
-      call rem3202
-C --------------------------------------------------
-      call rem3203
-C -------------------------------------------------
-      call rem3204
-C -------------------------------------------------
-      call rem3205
-C -------------------------------------------------
-      call rem3206
-C --------------------------------------------------
-      call rem3207
-C --------------------------------------------------
-      call rem3208
-C --------------------------------------------------
-      call rem3209
-C -------------------------------------------------
-      call rem3210
-C -------------------------------------------------
-      call rem3211
-C -------------------------------------------------
-      call rem3212
-C ------------------------------------------------- 
-      call rem3213
-C ------------------------------------------------- 
-C
-      print *,'=== END OF REM32 ========================= '    
-      end
-C ---------------------------------------------------------REM3201
-      subroutine REM3201     
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute B(*,BLOCK,BLOCK)
-!dvm$ align(:,:,:) with B(:,:,:) :: A 
-
-      tname='REM3201'
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo      
-!dvm$ end region
-!dvm$ get_actual(A(1,1,1))
-!dvm$ remote_access (A(1,1,1))
-      ib=A(1,1,1)               
-
-      if (ib .eq.C(1,1,1)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C ------------------------------------------------------REM3202
-      subroutine REM3202
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*,BLOCK)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3202'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo      
-!dvm$ end region
-!dvm$ get_actual(A(N,M,K))
-!dvm$ remote_access (A(N,M,K))
-      ib=A(N,M,K)               
-      if (ib .eq.C(N,M,K)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C)
-
-      end
-
-C ------------------------------------------------------REM3203
-      subroutine REM3203
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*)     
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3203'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-        do j=i,M
-          do ii=1,K
-!dvm$        remote_access (A(:,:,:))
-             D(i,j,ii)=A(i,j,ii)
-             isumc=isumc+C(i,j,ii)
-             isuma=isuma+D(i,j,ii)
-          enddo
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C ------------------------------------------------------REM3204
-      subroutine REM3204
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK,BLOCK)     
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3204'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=Nl
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(1,:,:))
-
-      do j=1,M         
-        do ii=1,K
-!dvm$     remote_access (A(1,:,:))
-          D(1,j,ii)=A(1,j,ii)
-          isumc=isumc+C(1,j,ii)
-          isuma=isuma+D(1,j,ii)
-        enddo
-      enddo
-              
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-        
-      end
-C -----------------------------------------------------REM3205
-      subroutine REM3205
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*,BLOCK)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3205'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,M,:))
-
-      do i=1,N         
-        do ii=1,K
-!dvm$     remote_access (A(:,M,:))
-          D(i,M,ii)=A(i,M,ii)
-          isumc=isumc+C(i,M,ii)
-          isuma=isuma+D(i,M,ii)
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-   
-      end
-C ------------------------------------------------------REM3206
-      subroutine REM3206
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3206'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,:,K))
-    
-      do i=1,N
-        do j=1,M         
-!dvm$     remote_access (A(:,:,K))
-          D(i,j,K)=A(i,j,K)
-          isumc=isumc+C(i,j,K)
-          isuma=isuma+D(i,j,K)
-        enddo
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C ------------------------------------------------------REM3207
-      subroutine REM3207
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii,isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK,BLOCK) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3207'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A)
-                                          
-      ki=2
-      ki1=3
-      kj=2
-      kj1=3
-      kii=2
-      kii1=3        
-      do i=1,N/ki-ki1         
-        do j=1,M/kj-kj1
-          do ii=1,K/kii-kii1
-!dvm$       remote_access (A(ki*i+ki1,kj*j+kj1,kii*ii+kii1))
-            D(i,j,ii)=A(ki*i+ki1,kj*j+kj1,kii*ii+kii1)
-            isumc=isumc+C(ki*i+ki1,kj*j+kj1,kii*ii+kii1)
-            isuma=isuma+D(i,j,ii)
-          enddo
-        enddo
-      enddo
-              
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-        
-      end
-C ------------------------------------------------------REM3208
-      subroutine REM3208
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*,BLOCK) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3208'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(A(1,1,1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(1,1,1)
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(1,1,1)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-C ------------------------------------------------------REM3209
-      subroutine REM3209
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3209'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(A(N,M,K))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(N,M,K)
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(N,M,K)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C -----------------------------------------------------REM3210
-      subroutine REM3210
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK,BLOCK) 
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3210'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(A)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(i,j,ii)
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(i,j,ii)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C -----------------------------------------------------REM3211
-      subroutine REM3211
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*,BLOCK)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3211'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-                     
-!dvm$ parallel (i,j,ii) on A(i,j,ii),remote_access(A(1,:,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(1,j,ii)
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(1,j,ii)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C ----------------------------------------------------REM3212
-      subroutine REM3212
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3212'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii) on B(i,j,ii),remote_access(A(:,M,:))
-      do i=1,N
-        do j=1,M
-           do ii=1,K
-             B(i,j,ii) = A(i,M,ii)
-           enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(i,M,ii)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-C ------------------------------------------------------REM3213
-      subroutine REM3213
-      integer, parameter ::  N=8,M=4,K=4,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:),D(:,:,:)
-      integer nloopi,nloopj,nloopii 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK,BLOCK)
-!dvm$ align(:,:,:) with A(:,:,:) :: B 
-
-      tname='REM3213'
-      allocate (A(N,M,K),B(N,M,K),C(N,M,K),D(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K        
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo 
-      enddo 
-               
-!dvm$ parallel (i,j,ii) on A(i,j,ii),
-!dvm$*remote_access(A(:,:,K))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            B(i,j,ii) = A(i,j,K)
-          enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii) on A(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            if (B(i,j,ii).ne.C(i,j,K)) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)      
-     
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo     
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem41.fdv
deleted file mode 100644
index 4d5852a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem41.fdv
+++ /dev/null
@@ -1,883 +0,0 @@
-      program REM41
-     
-c    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K,L) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-c    ON ALL PROCESSORS. 
-
-      print *,'===START OF REM41========================'
-C --------------------------------------------------
-      call rem4101
-C --------------------------------------------------
-      call rem4102
-C --------------------------------------------------
-      call rem4103
-C -------------------------------------------------
-      call rem4104
-C -------------------------------------------------
-      call rem4105
-C -------------------------------------------------
-      call rem4106
-C --------------------------------------------------
-      call rem4107
-C --------------------------------------------------
-      call rem4108
-C --------------------------------------------------
-      call rem4109
-C -------------------------------------------------
-      call rem4110
-C -------------------------------------------------
-      call rem4111
-C -------------------------------------------------
-      call rem4112
-C ------------------------------------------------- 
-      call rem4113
-C ------------------------------------------------- 
-      call rem4114
-C ------------------------------------------------- 
-C
-      print *,'=== END OF REM41 ========================= '    
-      end
-C ---------------------------------------------------------REM3101
-      subroutine REM4101
-      integer, parameter :: N = 16,M=8,K=8,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      character*7 tname
-                 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(:,:,:,:) with B(:,:,:,:) :: A 
-
-      tname='REM4101'
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo 
-          enddo
-        enddo     
-      enddo    
-!dvm$ end region
-!dvm$ get_actual(A(1,1,1,1))
-               
-!dvm$ remote_access (A(1,1,1,1))
-      ib=A(1,1,1,1)
-
-      if (ib .eq.C(1,1,1,1)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C ------------------------------------------------------REM4102
-      subroutine REM4102     
-      integer, parameter :: N = 16,M=8,K=8,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4102'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo    
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(A(N,M,K,L))
-
-!dvm$ remote_access (A(N,M,K,L))
-      ib=A(N,M,K,L)               
-
-      if (ib .eq.C(N,M,K,L)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C)
-
-      end
-
-C ------------------------------------------------------REM4103
-      subroutine REM4103
-      integer, parameter :: N = 4,M=4,K=4,L=4,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4103'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo   
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-        do j=i,M
-          do ii=1,K
-            do jj=1,L
-!dvm$         remote_access (A(:,:,:,:))
-              D(i,j,ii,jj)=A(i,j,ii,jj)
-              isumc=isumc+C(i,j,ii,jj)
-              isuma=isuma+D(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo 
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C)   
-     
-      end
-
-C ------------------------------------------------------REM4104
-      subroutine REM4104
-      integer, parameter :: N = 6,M=8,K=8,L=4,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4104'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo 
-          enddo
-        enddo                                          
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(1,:,:,:))
-      
-      do j=1,M         
-        do ii=1,K
-          do jj=1,L
-!dvm$       remote_access (A(1,:,:,:))
-            D(1,j,ii,jj)=A(1,j,ii,jj)
-            isumc=isumc+C(1,j,ii,jj)
-            isuma=isuma+D(1,j,ii,jj)
-          enddo
-        enddo
-      enddo
-        
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C -----------------------------------------------------REM4105
-      subroutine REM4105
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4105'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo   
-!dvm$ end region
-!dvm$ get_actual(A(:,M,:,:))
-
-      do i=1,N         
-        do ii=1,K
-          do jj=1,L
-!dvm$       remote_access (A(:,M,:,:))
-            D(i,M,ii,jj)=A(i,M,ii,jj)
-            isumc=isumc+C(i,M,ii,jj)
-            isuma=isuma+D(i,M,ii,jj)
-          enddo
-        enddo
-      enddo 
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4106
-      subroutine REM4106
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)  
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4106'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,:,K,:))
-
-      do i=1,N
-        do j=1,M         
-          do jj=1,L
-!dvm$       remote_access (A(:,:,K,:))
-            D(i,j,K,jj)=A(i,j,K,jj)
-            isumc=isumc+C(i,j,K,jj)
-            isuma=isuma+D(i,j,K,jj)
-          enddo
-        enddo 
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4107
-      subroutine REM4107
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4107'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,:,:,L))
-
-      do i=1,N
-        do j=1,M         
-          do ii=1,K
-!dvm$       remote_access (A(:,:,:,L))
-            D(i,j,ii,L)=A(i,j,ii,L)
-            isumc=isumc+C(i,j,ii,L)
-            isuma=isuma+D(i,j,ii,L)
-          enddo
-        enddo 
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4108
-      subroutine REM4108
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4108'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo 
-          enddo
-        enddo 
-      enddo 
-      
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*remote_access(A(1,1,1,1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(1,1,1,1)
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(1,1,1,1)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4109
-      subroutine REM4109
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)     
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4109'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-     
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(A(N,M,K,L))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(N,M,K,L)
-            enddo
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(N,M,K,L)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM4110
-      subroutine REM4110
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4110'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(A)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM4111
-      subroutine REM4111
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4111'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-                    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),remote_access(A(1,:,:,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(1,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(1,j,ii,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C ----------------------------------------------------REM4112
-      subroutine REM4112
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4112'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-              
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*remote_access(A(:,M,:,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,M,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,M,ii,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4113
-      subroutine REM4113
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4113'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L        
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-              
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*remote_access(A(:,:,K,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,j,K,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,j,K,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4114
-      subroutine REM4114
-      integer, parameter :: N = 16,M=8,K=8,L=16,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4114'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L        
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-             enddo
-          enddo
-        enddo 
-      enddo 
-              
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*remote_access(A(:,:,:,L))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,j,ii,L)
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,j,ii,L)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem42.fdv
deleted file mode 100644
index 46a7963..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem42.fdv
+++ /dev/null
@@ -1,883 +0,0 @@
-      program REM42
-     
-c    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K,L) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-c    ON ALL PROCESSORS. 
-
-      print *,'===START OF REM42========================'
-C --------------------------------------------------
-      call rem4201
-C --------------------------------------------------
-      call rem4202
-C --------------------------------------------------
-      call rem4203
-C -------------------------------------------------
-      call rem4204
-C -------------------------------------------------
-      call rem4205
-C -------------------------------------------------
-      call rem4206
-C --------------------------------------------------
-      call rem4207
-C --------------------------------------------------
-      call rem4208
-C --------------------------------------------------
-      call rem4209
-C -------------------------------------------------
-      call rem4210
-C -------------------------------------------------
-      call rem4211
-C -------------------------------------------------
-      call rem4212
-C ------------------------------------------------- 
-      call rem4213
-C ------------------------------------------------- 
-      call rem4214
-C ------------------------------------------------- 
-C
-      print *,'=== END OF REM42 ========================= '    
-      end
-C ---------------------------------------------------------REM3101
-      subroutine REM4201
-      integer, parameter :: N = 16,M=8,K=8,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      character*7 tname
-                 
-!dvm$ distribute B(*,*,*,*)    
-!dvm$ align(:,:,:,:) with B(:,:,:,:) :: A 
-
-      tname='REM4201'
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo 
-          enddo
-        enddo     
-      enddo    
-!dvm$ end region
-!dvm$ get_actual(A(1,1,1,1))
-               
-!dvm$ remote_access (A(1,1,1,1))
-      ib=A(1,1,1,1)
-
-      if (ib .eq.C(1,1,1,1)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C ------------------------------------------------------REM4202
-      subroutine REM4202     
-      integer, parameter :: N = 16,M=8,K=8,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4202'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo    
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(A(N,M,K,L))
-
-!dvm$ remote_access (A(N,M,K,L))
-      ib=A(N,M,K,L)               
-
-      if (ib .eq.C(N,M,K,L)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C)
-
-      end
-
-C ------------------------------------------------------REM4203
-      subroutine REM4203
-      integer, parameter :: N = 4,M=4,K=4,L=4,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)   
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4203'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo   
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-        do j=i,M
-          do ii=1,K
-            do jj=1,L
-!dvm$         remote_access (A(:,:,:,:))
-              D(i,j,ii,jj)=A(i,j,ii,jj)
-              isumc=isumc+C(i,j,ii,jj)
-              isuma=isuma+D(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo 
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C)   
-     
-      end
-
-C ------------------------------------------------------REM4204
-      subroutine REM4204
-      integer, parameter :: N = 6,M=8,K=8,L=4,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4204'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo 
-          enddo
-        enddo                                          
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(1,:,:,:))
-      
-      do j=1,M         
-        do ii=1,K
-          do jj=1,L
-!dvm$       remote_access (A(1,:,:,:))
-            D(1,j,ii,jj)=A(1,j,ii,jj)
-            isumc=isumc+C(1,j,ii,jj)
-            isuma=isuma+D(1,j,ii,jj)
-          enddo
-        enddo
-      enddo
-        
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C -----------------------------------------------------REM4205
-      subroutine REM4205
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)   
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4205'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo   
-!dvm$ end region
-!dvm$ get_actual(A(:,M,:,:))
-
-      do i=1,N         
-        do ii=1,K
-          do jj=1,L
-!dvm$       remote_access (A(:,M,:,:))
-            D(i,M,ii,jj)=A(i,M,ii,jj)
-            isumc=isumc+C(i,M,ii,jj)
-            isuma=isuma+D(i,M,ii,jj)
-          enddo
-        enddo
-      enddo 
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4206
-      subroutine REM4206
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)  
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4206'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,:,K,:))
-
-      do i=1,N
-        do j=1,M         
-          do jj=1,L
-!dvm$       remote_access (A(:,:,K,:))
-            D(i,j,K,jj)=A(i,j,K,jj)
-            isumc=isumc+C(i,j,K,jj)
-            isuma=isuma+D(i,j,K,jj)
-          enddo
-        enddo 
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4207
-      subroutine REM4207
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4207'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,:,:,L))
-
-      do i=1,N
-        do j=1,M         
-          do ii=1,K
-!dvm$       remote_access (A(:,:,:,L))
-            D(i,j,ii,L)=A(i,j,ii,L)
-            isumc=isumc+C(i,j,ii,L)
-            isuma=isuma+D(i,j,ii,L)
-          enddo
-        enddo 
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4208
-      subroutine REM4208
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)   
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4208'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo 
-          enddo
-        enddo 
-      enddo 
-      
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*remote_access(A(1,1,1,1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(1,1,1,1)
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(1,1,1,1)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4209
-      subroutine REM4209
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)     
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4209'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-     
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(A(N,M,K,L))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(N,M,K,L)
-            enddo
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(N,M,K,L)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM4210
-      subroutine REM4210
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4210'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(A)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM4211
-      subroutine REM4211
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4211'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-                    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),remote_access(A(1,:,:,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(1,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(1,j,ii,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C ----------------------------------------------------REM4212
-      subroutine REM4212
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4212'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-              
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*remote_access(A(:,M,:,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,M,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,M,ii,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4213
-      subroutine REM4213
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)   
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4213'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L        
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-              
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*remote_access(A(:,:,K,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,j,K,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,j,K,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4214
-      subroutine REM4214
-      integer, parameter :: N = 16,M=8,K=8,L=16,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,*,*,*)    
-!dvm$ align(:,:,:,:) with A(:,:,:,:) :: B 
-
-      tname='REM4214'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L        
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-             enddo
-          enddo
-        enddo 
-      enddo 
-              
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*remote_access(A(:,:,:,L))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,j,ii,L)
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,j,ii,L)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem43.fdv
deleted file mode 100644
index d58a86a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/REMOTE/rem43.fdv
+++ /dev/null
@@ -1,884 +0,0 @@
-      program REM43
-     
-c    TESTING OF THE REMOTE_ACCESS DIRECTIVE AND THE REMOTE_ACCESS CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K,L) OR ELEMENTS OF THIS ARRAY ARE REPLICATED
-c    ON ALL PROCESSORS. 
-
-      print *,'===START OF REM43========================'
-C --------------------------------------------------
-      call rem4301
-C --------------------------------------------------
-      call rem4302
-C --------------------------------------------------
-      call rem4303
-C -------------------------------------------------
-      call rem4304
-C -------------------------------------------------
-      call rem4305
-C -------------------------------------------------
-      call rem4306
-C --------------------------------------------------
-      call rem4307
-C --------------------------------------------------
-      call rem4308
-C --------------------------------------------------
-      call rem4309
-C -------------------------------------------------
-      call rem4310
-C -------------------------------------------------
-      call rem4311
-C -------------------------------------------------
-      call rem4312
-C ------------------------------------------------- 
-      call rem4313
-C ------------------------------------------------- 
-      call rem4314
-C ------------------------------------------------- 
-C
-      print *,'=== END OF REM43 ========================= '    
-      end
-C ---------------------------------------------------------REM3101
-      subroutine REM4301
-      integer, parameter :: N = 16,M=8,K=8,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      character*7 tname
-      integer :: i,j,ii,jj
-                 
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,*)    
-!dvm$ align(i,j,ii,jj) with B(i,j,ii,jj) :: A 
-
-      tname='REM4301'
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo 
-          enddo
-        enddo     
-      enddo    
-!dvm$ end region
-!dvm$ get_actual(A(1,1,1,1))
-               
-!dvm$ remote_access (A(1,1,1,1))
-      ib=A(1,1,1,1)
-
-      if (ib .eq.C(1,1,1,1)) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-
-C ------------------------------------------------------REM4302
-      subroutine REM4302     
-      integer, parameter :: N = 16,M=8,K=8,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*,BLOCK)    
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4302'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo    
-      enddo 
-!dvm$ end region
-!dvm$ get_actual(A(N,M,K,L))
-
-!dvm$ remote_access (A(N,M,K,L))
-      ib=A(N,M,K,L)               
-
-      if (ib .eq.C(N,M,K,L)) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C)
-
-      end
-
-C ------------------------------------------------------REM4303
-      subroutine REM4303
-      integer, parameter :: N = 4,M=4,K=4,L=4,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*,BLOCK,BLOCK)   
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4303'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo   
-!dvm$ end region
-!dvm$ get_actual(A)
-      do i=1,N         
-        do j=i,M
-          do ii=1,K
-            do jj=1,L
-!dvm$         remote_access (A(:,:,:,:))
-              D(i,j,ii,jj)=A(i,j,ii,jj)
-              isumc=isumc+C(i,j,ii,jj)
-              isuma=isuma+D(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo 
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C)   
-     
-      end
-
-C ------------------------------------------------------REM4304
-      subroutine REM4304
-      integer, parameter :: N = 6,M=8,K=8,L=4,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(i1,i2,i3,i4) with A(i1,i2,i3,i4) :: B 
-
-      tname='REM4304'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo 
-          enddo
-        enddo                                          
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(1,:,:,:))
-      
-      do j=1,M         
-        do ii=1,K
-          do jj=1,L
-!dvm$       remote_access (A(1,:,:,:))
-            D(1,j,ii,jj)=A(1,j,ii,jj)
-            isumc=isumc+C(1,j,ii,jj)
-            isuma=isuma+D(1,j,ii,jj)
-          enddo
-        enddo
-      enddo
-        
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C -----------------------------------------------------REM4305
-      subroutine REM4305
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,*)   
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4305'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo   
-!dvm$ end region
-!dvm$ get_actual(A(:,M,:,:))
-
-      do i=1,N         
-        do ii=1,K
-          do jj=1,L
-!dvm$       remote_access (A(:,M,:,:))
-            D(i,M,ii,jj)=A(i,M,ii,jj)
-            isumc=isumc+C(i,M,ii,jj)
-            isuma=isuma+D(i,M,ii,jj)
-          enddo
-        enddo
-      enddo 
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4306
-      subroutine REM4306
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*,BLOCK)  
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4306'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,:,K,:))
-
-      do i=1,N
-        do j=1,M         
-          do jj=1,L
-!dvm$       remote_access (A(:,:,K,:))
-            D(i,j,K,jj)=A(i,j,K,jj)
-            isumc=isumc+C(i,j,K,jj)
-            isuma=isuma+D(i,j,K,jj)
-          enddo
-        enddo 
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4307
-      subroutine REM4307
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer isumc,isuma 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*,BLOCK,BLOCK)    
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4307'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      isumc=0
-      isuma=0
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-
-!dvm$ region out(A)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo     
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(A(:,:,:,L))
-
-      do i=1,N
-        do j=1,M         
-          do ii=1,K
-!dvm$       remote_access (A(:,:,:,L))
-            D(i,j,ii,L)=A(i,j,ii,L)
-            isumc=isumc+C(i,j,ii,L)
-            isuma=isuma+D(i,j,ii,L)
-          enddo
-        enddo 
-      enddo
-
-      if (isumc .eq.isuma) then     
-         call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4308
-      subroutine REM4308
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK,BLOCK,BLOCK)   
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4308'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo 
-          enddo
-        enddo 
-      enddo 
-      
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*remote_access(A(1,1,1,1))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(1,1,1,1)
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(1,1,1,1)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4309
-      subroutine REM4309
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,*)     
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4309'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-     
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(A(N,M,K,L))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(N,M,K,L)
-            enddo
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(N,M,K,L)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM4310
-      subroutine REM4310
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*,BLOCK)    
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4310'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),remote_access(A)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,j,ii,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C -----------------------------------------------------REM4311
-      subroutine REM4311
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,*,BLOCK,BLOCK)    
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4311'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-                    
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),remote_access(A(1,:,:,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(1,j,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo 
-
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(1,j,ii,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C ----------------------------------------------------REM4312
-      subroutine REM4312
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(*,BLOCK,BLOCK,BLOCK)    
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4312'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-              
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*remote_access(A(:,M,:,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,M,ii,jj)
-            enddo
-          enddo
-        enddo
-      enddo
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$* reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,M,ii,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4313
-      subroutine REM4313
-      integer, parameter :: N = 6,M=8,K=8,L=6,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,BLOCK,*)   
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4313'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L        
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo 
-      enddo 
-              
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*remote_access(A(:,:,K,:))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,j,K,jj)
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,j,K,jj)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-C ------------------------------------------------------REM4314
-      subroutine REM4314
-      integer, parameter :: N = 16,M=8,K=8,L=16,NL=1000
-      integer,allocatable::A(:,:,:,:),B(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj 
-      character*7 tname
-                 
-!dvm$ distribute A(BLOCK,BLOCK,*,BLOCK)    
-!dvm$ align(i,j,ii,jj) with A(i,j,ii,jj) :: B 
-
-      tname='REM4314'
-      allocate (A(N,M,K,L),B(N,M,K,L),C(N,M,K,L),D(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L        
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-             enddo
-          enddo
-        enddo 
-      enddo 
-              
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*remote_access(A(:,:,:,L))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              B(i,j,ii,jj) = A(i,j,ii,L)
-            enddo
-          enddo
-        enddo
-      enddo
-
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              if (B(i,j,ii,jj).ne.C(i,j,ii,L)) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(nloopi)
-
-      if (nloopi .eq.NL) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (B,A,C,D)   
-     
-      end
-
-C ---------------------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh11.fdv
deleted file mode 100644
index 6dfa3ea..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh11.fdv
+++ /dev/null
@@ -1,830 +0,0 @@
-      program SH11
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SH11========================'
-C --------------------------------------------------
-      call sh1101
-C --------------------------------------------------
-      call sh1102
-C --------------------------------------------------
-      call sh1103
-C -------------------------------------------------
-      call sh1104
-C -------------------------------------------------
-      call sh1105
-C -------------------------------------------------
-      call sh1106
-C --------------------------------------------------
-      call sh1107
-C --------------------------------------------------
-      call sh1108
-C --------------------------------------------------
-      call sh1109
-C -------------------------------------------------
-      call sh1110
-C -------------------------------------------------
-      call sh1111
-C -------------------------------------------------
-      call sh1112
-C ------------------------------------------------- 
-      call sh1113
-C --------------------------------------------------
-      call sh1114
-C --------------------------------------------------
-      call sh1115
-C -------------------------------------------------
-      call sh1116
-C -------------------------------------------------
-      call sh1117
-C -------------------------------------------------
-   
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF SH11 ========================= '    
-      end
-C ---------------------------------------------SH1101
-      subroutine SH1101
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                      
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SH1101'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=2,N-1
-         B(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(C(i-1)+c(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-      
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end
-C ---------------------------------------------SH1102     
-      subroutine sh1102
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                      
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SH1102'
-      allocate (B(N),A(N),C(N))     
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(1:1))
-      do i=2,N-1
-         B(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(C(i-1)+c(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end
-C -----------------------------------------SH1103      
-      subroutine sh1103
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SH1103'
-      allocate (B(N),A(N),C(N))            
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(0:1))
-      do i=2,N-1
-         B(i) = A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(c(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-     
-      end
-      
-C ------------------------------------------SH1104   
-      subroutine sh1104
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SH1104'
-      allocate (B(N),A(N),C(N))      
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(1:0))
-      do i=2,N
-         B(i) = A(i-1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N
-          if (B(i).ne.(c(i-1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-         
-      end
-      
-C ------------------------------------------SH1105   
-      subroutine sh1105
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(0:1)
-
-      tname='SH1105'     
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(0:1))
-      do i=2,N-1
-         B(i) = A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(c(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)  
-    
-      end
-      
-C --------------------------------------------SH1106  
-         
-      subroutine sh1106
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(1:0)
-
-      tname='SH1106'
-      allocate (B(N),A(N),C(N))          
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(1:0))
-      do i=2,N
-         B(i) = A(i-1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N
-          if (B(i).ne.(c(i-1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)                
-
-      end
-C -------------------------------------------SH1107   
-         
-      subroutine sh1107
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:2)      
-
-      tname='SH1107'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(2:2))
-      do i=3,N-2
-         B(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=3,N-2
-          if (B(i).ne.(C(i-1)+c(i+1)+c(i-2)+c(i+2))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C)   
-      
-      end      
-C -------------------------------------------SH1108   
-         
-      subroutine sh1108
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)   
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:2)
-
-      tname='SH1108'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo               
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(0:2))
-      do i=2,N-2
-         B(i) = A(i+1)+A(i+2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-2
-          if (B(i).ne.(c(i+1)+c(i+2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif  
-      deallocate (A,B,C)
-
-      end   
-      
-C -------------------------------------------SH1109   
-         
-      subroutine sh1109
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop                
-
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:2)
-
-      tname='SH1109'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(2:0))
-      do i=3,N
-         B(i) = A(i-1)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=3,N
-          if (B(i).ne.(c(i-1)+c(i-2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
-         
-      end   
-C -------------------------------------------SH1110   
-         
-      subroutine sh1110
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(0:2)
-
-      tname='SH1110'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=2,N-2
-         B(i) = A(i+1)+A(i+2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-2
-          if (B(i).ne.(c(i+1)+c(i+2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
-   
-      end 
-C -------------------------------------------SH1111   
-         
-      subroutine sh1111
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:0)
-
-      tname='SH1111'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=3,N
-         B(i) = A(i-1)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=3,N
-          if (B(i).ne.(c(i-1)+c(i-2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-      
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-        
-      end  
-C -------------------------------------------SH1112   
-         
-      subroutine sh1112
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:3)
-
-      tname='SH1112'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=4,N-3
-         B(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)+A(i-3)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=4,N-3
-         if (B(i).ne.(C(i-1)+c(i+1)+c(i-2)+c(i+2)+c(i-3)+c(i+3))) then
-            nloop=min(nloop,i)
-         endif    
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-         
-      end
-C -------------------------------------------SH1113  
-         
-      subroutine sh1113
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:3)
-
-      tname='SH1113'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(0:3))
-      do i=2,N-3
-         B(i) = A(i+1)+A(i+2)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-3
-          if (B(i).ne.(c(i+1)+c(i+2)+c(i+3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-       
-      end
-C -------------------------------------------SH1114   
-         
-      subroutine sh1114
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:3)
-
-      tname='SH1114'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(3:0))
-      do i=4,N
-         B(i) = A(i-1)+A(i-2)+A(i-3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=4,N
-          if (B(i).ne.(c(i-1)+c(i-2)+c(i-3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-        
-      end 
-C -------------------------------------------SH1115   
-         
-      subroutine sh1115
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:0)
-
-      tname='SH1115'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=4,N
-         B(i) = A(i-1)+A(i-2)+A(i-3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=4,N
-          if (B(i).ne.(c(i-1)+c(i-2)+c(i-3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-        
-      end 
-C -------------------------------------------SH1116   
-         
-      subroutine sh1116
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(0:3)
-
-      tname='SH1116'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=2,N-3
-         B(i) = A(i+1)+A(i+2)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-3
-          if (B(i).ne.(c(i+1)+c(i+2)+c(i+3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-  
-      end 
-C --------------------------------------------SH1117  
-         
-      subroutine sh1117
-      integer, parameter :: N = 500,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(11:11)
-
-      tname='SH1117'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=12,N-11
-         B(i) = A(i-9)+A(i+9)+A(i+10)+A(i-10)+A(i-11)+A(i+11)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=12,N-11
-        if (B(i).ne.(C(i-9)+c(i+9)+c(i-10)+c(i+10)+
-     *c(i-11)+c(i+11))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-     
-      end
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh12.fdv
deleted file mode 100644
index 27ca477..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh12.fdv
+++ /dev/null
@@ -1,831 +0,0 @@
-      program SH12
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SH12========================'
-C --------------------------------------------------
-      call sh1201
-C --------------------------------------------------
-      call sh1202
-C --------------------------------------------------
-      call sh1203
-C -------------------------------------------------
-      call sh1204
-C -------------------------------------------------
-      call sh1205
-C -------------------------------------------------
-      call sh1206
-C --------------------------------------------------
-      call sh1207
-C --------------------------------------------------
-      call sh1208
-C --------------------------------------------------
-      call sh1209
-C -------------------------------------------------
-      call sh1210
-C -------------------------------------------------
-      call sh1211
-C -------------------------------------------------
-      call sh1212
-C ------------------------------------------------- 
-      call sh1213
-C --------------------------------------------------
-      call sh1214
-C --------------------------------------------------
-      call sh1215
-C -------------------------------------------------
-      call sh1216
-C -------------------------------------------------
-      call sh1217
-C -------------------------------------------------
-   
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF SH12 ========================= '    
-      end
-C ---------------------------------------------SH1201
-      subroutine SH1201
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                      
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SH1201'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=2,N-1
-         B(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(C(i-1)+c(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-      
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end
-C ---------------------------------------------SH1202     
-      subroutine sh1202
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                      
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SH1202'
-      allocate (B(N),A(N),C(N))     
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(1:1))
-      do i=2,N-1
-         B(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(C(i-1)+c(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end
-C -----------------------------------------SH1203      
-      subroutine sh1203
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SH1203'
-      allocate (B(N),A(N),C(N))            
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(0:1))
-      do i=2,N-1
-         B(i) = A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(c(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-     
-      end
-      
-C ------------------------------------------SH1204   
-      subroutine sh1204
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SH1204'
-      allocate (B(N),A(N),C(N))      
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(1:0))
-      do i=2,N
-         B(i) = A(i-1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N
-          if (B(i).ne.(c(i-1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-         
-      end
-      
-C ------------------------------------------SH1205   
-      subroutine sh1205
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(0:1)
-
-      tname='SH1205'     
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(0:1))
-      do i=2,N-1
-         B(i) = A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(c(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)  
-    
-      end
-      
-C --------------------------------------------SH1206  
-         
-      subroutine sh1206
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(1:0)
-
-      tname='SH1206'
-      allocate (B(N),A(N),C(N))          
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(1:0))
-      do i=2,N
-         B(i) = A(i-1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N
-          if (B(i).ne.(c(i-1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)                
-
-      end
-C -------------------------------------------SH1207   
-         
-      subroutine sh1207
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:2)      
-
-      tname='SH1207'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(2:2))
-      do i=3,N-2
-         B(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=3,N-2
-          if (B(i).ne.(C(i-1)+c(i+1)+c(i-2)+c(i+2))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C)   
-      
-      end      
-C -------------------------------------------SH1208   
-         
-      subroutine sh1208
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(*)   
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:2)
-
-      tname='SH1208'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo               
-
-!dvm$ parallel (i) on B(i),shadow_renew(A(0:2))
-      do i=2,N-2
-         B(i) = A(i+1)+A(i+2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-2
-          if (B(i).ne.(c(i+1)+c(i+2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif  
-      deallocate (A,B,C)
-
-      end   
-      
-C -------------------------------------------SH1209   
-         
-      subroutine sh1209
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop                
-
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:2)
-
-      tname='SH1209'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(2:0))
-      do i=3,N
-         B(i) = A(i-1)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=3,N
-          if (B(i).ne.(c(i-1)+c(i-2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
-         
-      end   
-C -------------------------------------------SH1210   
-         
-      subroutine sh1210
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(0:2)
-
-      tname='SH1210'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=2,N-2
-         B(i) = A(i+1)+A(i+2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-2
-          if (B(i).ne.(c(i+1)+c(i+2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
-   
-      end 
-C -------------------------------------------SH1211   
-         
-      subroutine sh1211
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:0)
-
-      tname='SH1211'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=3,N
-         B(i) = A(i-1)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=3,N
-          if (B(i).ne.(c(i-1)+c(i-2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-      
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-        
-      end  
-C -------------------------------------------SH1212   
-         
-      subroutine sh1212
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:3)
-
-      tname='SH1212'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=4,N-3
-         B(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)+A(i-3)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=4,N-3
-         if (B(i).ne.(C(i-1)+c(i+1)+c(i-2)+c(i+2)+c(i-3)+c(i+3))) then
-            nloop=min(nloop,i)
-         endif    
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-         
-      end
-C -------------------------------------------SH1213  
-         
-      subroutine sh1213
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:3)
-
-      tname='SH1213'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(0:3))
-      do i=2,N-3
-         B(i) = A(i+1)+A(i+2)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-3
-          if (B(i).ne.(c(i+1)+c(i+2)+c(i+3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-       
-      end
-C -------------------------------------------SH1214   
-         
-      subroutine sh1214
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:3)
-
-      tname='SH1214'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A(3:0))
-      do i=4,N
-         B(i) = A(i-1)+A(i-2)+A(i-3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=4,N
-          if (B(i).ne.(c(i-1)+c(i-2)+c(i-3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-        
-      end 
-C -------------------------------------------SH1215   
-         
-      subroutine sh1215
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(*)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:0)
-
-      tname='SH1215'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=4,N
-         B(i) = A(i-1)+A(i-2)+A(i-3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=4,N
-          if (B(i).ne.(c(i-1)+c(i-2)+c(i-3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-        
-      end 
-C -------------------------------------------SH1216   
-         
-      subroutine sh1216
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(0:3)
-
-      tname='SH1216'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=2,N-3
-         B(i) = A(i+1)+A(i+2)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-3
-          if (B(i).ne.(c(i+1)+c(i+2)+c(i+3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-  
-      end 
-C --------------------------------------------SH1217  
-         
-      subroutine sh1217
-      integer, parameter :: N = 50,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(*)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(11:11)
-
-      tname='SH1217'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-
-!dvm$ parallel (i) on B(i),shadow_renew(A)
-      do i=12,N-11
-         B(i) = A(i-9)+A(i+9)+A(i+10)+A(i-10)+A(i-11)+A(i+11)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=12,N-11
-        if (B(i).ne.(C(i-9)+c(i+9)+c(i-10)+c(i+10)+
-     *c(i-11)+c(i+11))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-     
-      end
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh21.fdv
deleted file mode 100644
index 696cb49..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh21.fdv
+++ /dev/null
@@ -1,1220 +0,0 @@
-      program SH21
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SH21========================'
-C --------------------------------------------------
-      call sh2101
-C --------------------------------------------------
-      call sh2102
-C --------------------------------------------------
-      call sh2103
-C -------------------------------------------------
-      call sh2104
-C -------------------------------------------------
-      call sh2105
-C -------------------------------------------------
-      call sh2106
-C --------------------------------------------------
-      call sh2107
-C --------------------------------------------------
-      call sh2108
-C----------------------------------------------------
-      call sh2109
-C -------------------------------------------------
-      call sh2110
-C -------------------------------------------------
-      call sh2111
-C -------------------------------------------------
-      call sh2112
-C ------------------------------------------------- 
-      call sh2113
-C --------------------------------------------------
-      call sh2114
-C --------------------------------------------------
-      call sh2115
-C -------------------------------------------------
-      call sh2116
-C -------------------------------------------------
-      call sh2117
-C -------------------------------------------------
-      call sh2118
-C -------------------------------------------------
-      call sh2119
-C -------------------------------------------------
-      call sh2120
-C -------------------------------------------------
-   
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF SH21 ========================= '    
-      end
-C ---------------------------------------------SH2101
-      subroutine SH2101
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-!dvm$ distribute B(BLOCK,BLOCK)       
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2101'     
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                               
- 
-!dvm$ parallel (i,j) on B(i,j),shadow_renew(A(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i-1,j)+A(i,j-1)+
-     *A(i-1,j-1)+ A(i+1,j+1)+A(i-1,j+1)+A(i+1,j-1)          
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i-1,j)+C(i,j-1)+
-     *C(i-1,j-1)+ C(i+1,j+1)+C(i-1,j+1)+C(i+1,j-1)       
-          if (B(i,j).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SH2102     
-      subroutine sh2102
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)       
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2102'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:1)(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i+1,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i+1,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-      
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-         
-      end
-C -----------------------------------------SH2103      
-      subroutine sh2103
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)      
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2103'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(1:0,0:1))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i-1,j)+A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i-1,j)+C(i,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-    
-      end
-      
-C ------------------------------------------SH2104   
-      subroutine sh2104
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(1:1,0:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2104'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:1)(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i+1,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i+1,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)        
- 
-      end
-  
-C ------------------------------------------SH2105   
-      subroutine sh2105
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(0:1,1:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2105'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,1:0)(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i,j-1)+A(i+1,j)+A(i+1,j-1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i,j-1)+C(i+1,j)+C(i+1,j-1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)      
- 
-      end
-      
-C --------------------------------------------SH2106  
-         
-      subroutine sh2106
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(0:1,0:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2106'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:0))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) =A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)          
-  
-      end
-C -------------------------------------------SH2107   
-         
-      subroutine sh2107
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(1:0,1:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2107'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:0,1:0))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) =A(i,j-1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i,j-1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-     
-      end      
-C -------------------------------------------SH2108   
-         
-      subroutine sh2108
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2108'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+2,j)+A(i,j+2)+A(i+2,j)+A(i+2,j+2)+
-     * A(i-2,j+2)+A(i-2,j)+A(i,j-2)+A(i-2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j)+C(i,j+2)+C(i+2,j)+C(i+2,j+2)+
-     *C(i-2,j+2)+C(i-2,j)+C(i,j-2)+C(i-2,j-2)       
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end   
-      
-C -------------------------------------------SH2109   
-         
-      subroutine sh2109
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2109'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:2,2:2)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-         B(i,j) = A(i+2,j+2)+ A(i+1,j+1)+A(i,j+2)+A(i,j-2)+A(i+2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j+2)+ C(i+1,j+1)+C(i,j+2)+C(i,j-2)+A(i+2,j-2)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
- 
-      end   
-C -------------------------------------------SH2110  
-         
-      subroutine sh2110
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2110'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(2:2,2:0)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-         B(i,j) = A(i-2,j-2)+ A(i-1,j-1)+A(i-2,j)+A(i+2,j)+A(i+2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-         do j=3,M-2
-           isum = C(i-2,j-2)+C(i-1,j-1)+C(i-2,j)+C(i+2,j)+C(i+2,j-2)
-           if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-           endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-   
-      end 
-C -------------------------------------------SH2111   
-         
-      subroutine sh2111
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,0:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2111'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(2:2,0:2)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+2,j+2)+ A(i+1,j+1)+A(i-2,j+2)+A(i+2,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j+2)+ C(i+1,j+1)+C(i-2,j+2)+C(i+2,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C) 
- 
-      end  
-C -------------------------------------------SH2112   
-         
-      subroutine sh2112
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:0,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2112'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(1:0,0:1)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i-1,j+1)+ A(i,j+1)+A(i-1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i-1,j+1)+ C(i,j+1)+C(i-1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)        
-
-      end
-C -------------------------------------------SH2113  
-         
-      subroutine sh2113
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2113'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo          
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:0))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C -------------------------------------------SH2114   
-         
-      subroutine sh2114
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:0,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2114'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:0,0:2))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i,j+2)+A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i,j+2)+C(i,j+1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C) 
-   
-      end 
-C -------------------------------------------SH2115   
-         
-      subroutine sh2115
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2115'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i+1,j+1)+A(i+2,j+2)+A(i+3,j+3)+A(i-3,j-3)+
-     * A(i-2,j-2)+A(i-1,j-1)+A(i-3,j+3)+A(i+3,j-3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i+1,j+1)+C(i+2,j+2)+C(i+3,j+3)+C(i-3,j-3)+
-     * C(i-2,j-2)+C(i-1,j-1)+C(i-3,j+3)+C(i+3,j-3)       
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C)             
-
-      end 
-C -------------------------------------------SH2116   
-         
-      subroutine sh2116
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(3:3,0:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2116'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:0,0:1))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i,j+1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)         
-     
-      end 
-C --------------------------------------------SH2117  
-         
-      subroutine sh2117
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2117'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:0))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SH2118  
-         
-      subroutine sh2118
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2118'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i-3,j-3)+A(i+3,j)+A(i-3,j)+A(i-3,j-3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i-3,j-3)+C(i+3,j)+C(i-3,j)+C(i-3,j-3)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SH2119  
-         
-      subroutine sh2119
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(3:0,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2119'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(3:0,3:3)(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i-3,j-3)+A(i,j+3)+A(i-3,j+3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i-3,j-3)+C(i,j+3)+C(i-3,j+3)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SH2120  
-         
-      subroutine sh2120
-      integer, parameter :: N = 480,M=480,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2120'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(CORNER))
-      do i=12,N-11
-        do j=12,M-11
-          B(i,j) = A(i+11,j+11)+A(i+10,j+10)+A(i+9,j+9)+
-     *A(i-11,j-11)+A(i-10,j-10)+A(i-9,j-9)+A(i+11,j-11)+
-     *A(i-11,j+11)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=12,N-11
-        do j=12,M-11
-          isum = C(i+11,j+11)+C(i+10,j+10)+C(i+9,j+9)+
-     *C(i-11,j-11)+C(i-10,j-10)+C(i-9,j-9)+C(i+11,j-11)+
-     *C(i-11,j+11)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          AR(i,j) = NL+i+j
-        enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh22.fdv
deleted file mode 100644
index 1b573c1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh22.fdv
+++ /dev/null
@@ -1,1221 +0,0 @@
-      program SH22
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SH22========================'
-C --------------------------------------------------
-      call sh2201
-C --------------------------------------------------
-      call sh2202
-C --------------------------------------------------
-      call sh2203
-C -------------------------------------------------
-      call sh2204
-C -------------------------------------------------
-      call sh2205
-C -------------------------------------------------
-      call sh2206
-C --------------------------------------------------
-      call sh2207
-C --------------------------------------------------
-      call sh2208
-C----------------------------------------------------
-      call sh2209
-C -------------------------------------------------
-      call sh2210
-C -------------------------------------------------
-      call sh2211
-C -------------------------------------------------
-      call sh2212
-C ------------------------------------------------- 
-      call sh2213
-C --------------------------------------------------
-      call sh2214
-C --------------------------------------------------
-      call sh2215
-C -------------------------------------------------
-      call sh2216
-C -------------------------------------------------
-      call sh2217
-C -------------------------------------------------
-      call sh2218
-C -------------------------------------------------
-      call sh2219
-C -------------------------------------------------
-      call sh2220
-C -------------------------------------------------
-   
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF SH22 ========================= '    
-      end
-C ---------------------------------------------SH2201
-      subroutine SH2201
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-!dvm$ distribute B(BLOCK,*)       
-!dvm$ align (I,J) with B(I,J) ::A
-
-
-      tname='SH2201'     
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                               
- 
-!dvm$ parallel (i,j) on B(i,j),shadow_renew(A(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i-1,j)+A(i,j-1)+
-     *A(i-1,j-1)+ A(i+1,j+1)+A(i-1,j+1)+A(i+1,j-1)          
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i-1,j)+C(i,j-1)+
-     *C(i-1,j-1)+ C(i+1,j+1)+C(i-1,j+1)+C(i+1,j-1)       
-          if (B(i,j).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SH2202     
-      subroutine sh2202
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)       
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2202'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:1)(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i+1,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i+1,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-      
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-         
-      end
-C -----------------------------------------SH2203      
-      subroutine sh2203
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)      
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2203'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(1:0,0:1))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i-1,j)+A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i-1,j)+C(i,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-    
-      end
-      
-C ------------------------------------------SH2204   
-      subroutine sh2204
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(1:1,0:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2204'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:1)(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i+1,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i+1,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)        
- 
-      end
-  
-C ------------------------------------------SH2205   
-      subroutine sh2205
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(0:1,1:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2205'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,1:0)(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i,j-1)+A(i+1,j)+A(i+1,j-1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i,j-1)+C(i+1,j)+C(i+1,j-1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)      
- 
-      end
-      
-C --------------------------------------------SH2206  
-         
-      subroutine sh2206
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(0:1,0:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2206'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:0))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) =A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)          
-  
-      end
-C -------------------------------------------SH2207   
-         
-      subroutine sh2207
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(1:0,1:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2207'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:0,1:0))
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) =A(i,j-1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i,j-1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-     
-      end      
-C -------------------------------------------SH2208   
-         
-      subroutine sh2208
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2208'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+2,j)+A(i,j+2)+A(i+2,j)+A(i+2,j+2)+
-     * A(i-2,j+2)+A(i-2,j)+A(i,j-2)+A(i-2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j)+C(i,j+2)+C(i+2,j)+C(i+2,j+2)+
-     *C(i-2,j+2)+C(i-2,j)+C(i,j-2)+C(i-2,j-2)       
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end   
-      
-C -------------------------------------------SH2209   
-         
-      subroutine sh2209
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2209'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:2,2:2)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-         B(i,j) = A(i+2,j+2)+ A(i+1,j+1)+A(i,j+2)+A(i,j-2)+A(i+2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j+2)+ C(i+1,j+1)+C(i,j+2)+C(i,j-2)+A(i+2,j-2)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
- 
-      end   
-C -------------------------------------------SH2210  
-         
-      subroutine sh2210
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2210'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(2:2,2:0)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-         B(i,j) = A(i-2,j-2)+ A(i-1,j-1)+A(i-2,j)+A(i+2,j)+A(i+2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-         do j=3,M-2
-           isum = C(i-2,j-2)+C(i-1,j-1)+C(i-2,j)+C(i+2,j)+C(i+2,j-2)
-           if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-           endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-   
-      end 
-C -------------------------------------------SH2211   
-         
-      subroutine sh2211
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(2:2,0:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2211'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(2:2,0:2)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+2,j+2)+ A(i+1,j+1)+A(i-2,j+2)+A(i+2,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j+2)+ C(i+1,j+1)+C(i-2,j+2)+C(i+2,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C) 
- 
-      end  
-C -------------------------------------------SH2212   
-         
-      subroutine sh2212
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(2:0,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2212'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(1:0,0:1)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i-1,j+1)+ A(i,j+1)+A(i-1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i-1,j+1)+ C(i,j+1)+C(i-1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)        
-
-      end
-C -------------------------------------------SH2213  
-         
-      subroutine sh2213
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(2:2,2:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2213'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo          
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:0))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C -------------------------------------------SH2214   
-         
-      subroutine sh2214
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(2:0,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2214'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:0,0:2))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i,j+2)+A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i,j+2)+C(i,j+1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C) 
-   
-      end 
-C -------------------------------------------SH2215   
-         
-      subroutine sh2215
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(3:3,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2215'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i+1,j+1)+A(i+2,j+2)+A(i+3,j+3)+A(i-3,j-3)+
-     * A(i-2,j-2)+A(i-1,j-1)+A(i-3,j+3)+A(i+3,j-3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i+1,j+1)+C(i+2,j+2)+C(i+3,j+3)+C(i-3,j-3)+
-     * C(i-2,j-2)+C(i-1,j-1)+C(i-3,j+3)+C(i+3,j-3)       
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C)             
-
-      end 
-C -------------------------------------------SH2216   
-         
-      subroutine sh2216
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(3:3,0:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2216'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:0,0:1))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i,j+1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)         
-     
-      end 
-C --------------------------------------------SH2217  
-         
-      subroutine sh2217
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(0:3,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2217'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(0:1,0:0))
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SH2218  
-         
-      subroutine sh2218
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(3:3,3:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2218'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i-3,j-3)+A(i+3,j)+A(i-3,j)+A(i-3,j-3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i-3,j-3)+C(i+3,j)+C(i-3,j)+C(i-3,j-3)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SH2219  
-         
-      subroutine sh2219
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(3:0,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2219'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(3:0,3:3)(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i-3,j-3)+A(i,j+3)+A(i-3,j+3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i-3,j-3)+C(i,j+3)+C(i-3,j+3)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SH2220  
-         
-      subroutine sh2220
-      integer, parameter :: N = 480,M=480,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(11:11,11:11) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SH2220'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j),shadow_renew(A(CORNER))
-      do i=12,N-11
-        do j=12,M-11
-          B(i,j) = A(i+11,j+11)+A(i+10,j+10)+A(i+9,j+9)+
-     *A(i-11,j-11)+A(i-10,j-10)+A(i-9,j-9)+A(i+11,j-11)+
-     *A(i-11,j+11)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=12,N-11
-        do j=12,M-11
-          isum = C(i+11,j+11)+C(i+10,j+10)+C(i+9,j+9)+
-     *C(i-11,j-11)+C(i-10,j-10)+C(i-9,j-9)+C(i+11,j-11)+
-     *C(i-11,j+11)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          AR(i,j) = NL+i+j
-        enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh31.fdv
deleted file mode 100644
index b2eac6f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh31.fdv
+++ /dev/null
@@ -1,691 +0,0 @@
-      program SH31
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SH31========================'
-C --------------------------------------------------
-      call sh3101
-C --------------------------------------------------
-      call sh3102
-C --------------------------------------------------
-      call sh3103
-C -------------------------------------------------
-      call sh3104
-C -------------------------------------------------
-      call sh3105
-C -------------------------------------------------
-      call sh3106
-C --------------------------------------------------
-      call sh3107
-C --------------------------------------------------
-      call sh3108
-C----------------------------------------------------
-      call sh3109
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF SH31 ========================= '    
-      end
-C ---------------------------------------------SH3101
-      subroutine SH3101     
-      integer, parameter :: N = 16,M=8,K=8,NL=1000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3101'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),shadow_renew(A(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)+A(i-1,j,ii)+
-     *A(i,j-1,ii)+ A(i,j,ii-1)+A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)+
-     *A(i-1,j+1,ii)+A(i+1,j-1,ii)+A(i-1,j+1,ii-1)+A(i-1,j+1,ii+1)+
-     *A(i+1,j-1,ii-1)+A(i+1,j-1,ii+1)
-         enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          isum = C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1)+C(i-1,j,ii)+
-     *C(i,j-1,ii)+ C(i,j,ii-1)+C(i-1,j-1,ii-1)+C(i+1,j+1,ii+1)+
-     *C(i-1,j+1,ii)+C(i+1,j-1,ii)+C(i-1,j+1,ii-1)+C(i-1,j+1,ii+1)+
-     *C(i+1,j-1,ii-1)+C(i+1,j-1,ii+1)       
-          if (B(i,j,ii).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SH3102     
-      subroutine SH3102
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3102'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(1:2,2:2,1:2)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-          B(i,j,ii) = A(i-1,j-2,ii+2)+A(i-1,j+2,ii-1)+A(i-1,j+2,ii+2)+
-     *A(i+2,j+2,ii+2)+ A(i+2,j+2,ii-1)+A(i+2,j-2,ii+2)+A(i+2,j-2,ii-1)+
-     *A(i-1,j-2,ii-1)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            isum = C(i-1,j-2,ii+2)+C(i-1,j+2,ii-1)+C(i-1,j+2,ii+2)+
-     *C(i+2,j+2,ii+2)+ C(i+2,j+2,ii-1)+C(i+2,j-2,ii+2)+C(i+2,j-2,ii-1)+
-     *C(i-1,j-2,ii-1)      
-           if (B(i,j,ii).ne.isum) then
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)         
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------SH3103      
-      subroutine SH3103
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3103'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(0:2,2:2,0:2)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            B(i,j,ii) = A(i+2,j+2,ii+2)+A(i,j-2,ii)+
-     *A(i+2,j-2,ii)+A(i,j+2,ii)+ A(i,j+2,ii+2)+A(i+2,j-2,ii+2)+
-     * A(i+2,j+2,ii)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            isum = C(i+2,j+2,ii+2)+C(i,j-2,ii)+
-     *C(i+2,j-2,ii)+C(i,j+2,ii)+ C(i,j+2,ii+2)+C(i+2,j-2,ii+2)+
-     *C(i+2,j+2,ii)
-            if (B(i,j,ii).ne.isum) then         
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-      
-C ------------------------------------------SH3104   
-      subroutine SH3104     
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3104'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(2:2,2:0,2:0)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           B(i,j,ii) = A(i+2,j,ii)+A(i-2,j-2,ii-2)+
-     *A(i+2,j-2,ii-2)+ A(i-2,j,ii-2)+A(i-2,j-2,ii)+
-     *A(i-2,j,ii)+A(i+2,j-2,ii)+A(i+2,j,ii-2)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           isum = C(i+2,j,ii)+C(i-2,j-2,ii-2)+
-     *C(i+2,j-2,ii-2)+ C(i-2,j,ii-2)+C(i-2,j-2,ii)+
-     *C(i-2,j,ii)+C(i+2,j-2,ii)+C(i+2,j,ii-2)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-      
-C ------------------------------------------SH3105
-      subroutine SH3105   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:2,2:2,0:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3105'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            B(i,j,ii) = A(i+2,j+2,ii+2)+A(i,j-2,ii)+
-     *   A(i+2,j-2,ii)+ A(i,j+2,ii)+A(i,j+2,ii+2)+
-     *   A(i+2,j-2,ii+2)+A(i+2,j+2,ii) 
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           isum = C(i+2,j+2,ii+2)+C(i,j-2,ii)+
-     *   C(i+2,j-2,ii)+ C(i,j+2,ii)+C(i,j+2,ii+2)+
-     *   C(i+2,j-2,ii+2)+C(i+2,j+2,ii)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-           
-
-C --------------------------------------------SH3106  
-      subroutine SH3106   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3106'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            B(i,j,ii) = A(i-3,j-3,ii+3)+A(i+3,j+3,ii-3)+
-     *   A(i+3,j-3,ii+3)+ A(i-3,j+3,ii+3)+A(i-3,j+3,ii-3)+
-     *   A(i+3,j-3,ii-3)+A(i+3,j+3,ii+3)+A(i-3,j-3,ii-3) 
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            isum = C(i-3,j-3,ii+3)+C(i+3,j+3,ii-3)+
-     *   C(i+3,j-3,ii+3)+ C(i-3,j+3,ii+3)+C(i-3,j+3,ii-3)+
-     *   C(i+3,j-3,ii-3)+ C(i+3,j+3,ii+3)+ C(i-3,j-3,ii-3)    
-            if (B(i,j,ii).ne.isum) then         
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-           
-C -------------------------------------------SH3107   
-       subroutine SH3107   
-       integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,0:3,3:0) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3107'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-             B(i,j,ii) = A(i+3,j+3,ii)+A(i-3,j,ii-3)+
-     *   A(i+3,j,ii-3)+ A(i-3,j+3,ii-3)+ A(i-3,j,ii)+
-     *   A(i-3,j+3,ii)+ A(i+3,j,ii)+ A(i+3,j+3,ii-3)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            isum = C(i+3,j+3,ii)+C(i-3,j,ii-3)+
-     *   C(i+3,j,ii-3)+ C(i-3,j+3,ii-3)+C(i-3,j,ii)+
-     *   C(i-3,j+3,ii)+ C(i+3,j,ii)+ C(i+3,j+3,ii-3)    
-            if (B(i,j,ii).ne.isum) then        
-               nloopi=min(nloopi,i)
-               nloopj=min(nloopj,j)
-               nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-                    
-     
-C -------------------------------------------SH3108   
-      subroutine SH3108   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,0:3,0:3) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3108'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(0:3,0:3,0:3)(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-             B(i,j,ii) = A(i+3,j+3,ii+3)+A(i+3,j,ii)+
-     *   A(i,j+3,ii)+ A(i,j,ii+3)+ A(i,j+3,ii+3)+
-     *   A(i+3,j,ii+3)+ A(i+3,j+3,ii)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-           isum = C(i+3,j+3,ii+3)+C(i+3,j,ii)+
-     *   C(i,j+3,ii)+ C(i,j,ii+3)+ C(i,j+3,ii+3)+
-     *   C(i+3,j,ii+3)+ C(i+3,j+3,ii)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-                    
-C -------------------------------------------SH3109   
-      subroutine SH3109   
-      integer, parameter :: N = 120,M=120,K=120,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11,11:11) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3109'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(CORNER))
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-             B(i,j,ii) = A(i+11,j+11,ii+11)+A(i-11,j-11,ii-11)+
-     *   A(i+11,j-11,ii-11)+ A(i-11,j+11,ii-11)+ A(i-11,j-11,ii+11)+
-     *   A(i-11,j+11,ii+11)+ A(i+11,j-11,ii+11)+A(i+11,j+11,ii-11)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            isum = C(i+11,j+11,ii+11)+C(i-11,j-11,ii-11)+
-     *   C(i+11,j-11,ii-11)+ C(i-11,j+11,ii-11)+ C(i-11,j-11,ii+11)+
-     *   C(i-11,j+11,ii+11)+ C(i+11,j-11,ii+11)+C(i+11,j+11,ii-11)
-            if (B(i,j,ii).ne.isum) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)         
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C -----------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                
-      enddo
-      end 
-    
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh32.fdv
deleted file mode 100644
index c1c800c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh32.fdv
+++ /dev/null
@@ -1,692 +0,0 @@
-      program SH32
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SH32========================'
-C --------------------------------------------------
-      call sh3201
-C --------------------------------------------------
-      call sh3202
-C --------------------------------------------------
-      call sh3203
-C -------------------------------------------------
-      call sh3204
-C -------------------------------------------------
-      call sh3205
-C -------------------------------------------------
-      call sh3206
-C --------------------------------------------------
-      call sh3207
-C --------------------------------------------------
-      call sh3208
-C----------------------------------------------------
-      call sh3209
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF SH32 ========================= '    
-      end
-C ---------------------------------------------SH3201
-      subroutine SH3201     
-      integer, parameter :: N = 16,M=8,K=8,NL=1000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3201'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),shadow_renew(A(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)+A(i-1,j,ii)+
-     *A(i,j-1,ii)+ A(i,j,ii-1)+A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)+
-     *A(i-1,j+1,ii)+A(i+1,j-1,ii)+A(i-1,j+1,ii-1)+A(i-1,j+1,ii+1)+
-     *A(i+1,j-1,ii-1)+A(i+1,j-1,ii+1)
-         enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          isum = C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1)+C(i-1,j,ii)+
-     *C(i,j-1,ii)+ C(i,j,ii-1)+C(i-1,j-1,ii-1)+C(i+1,j+1,ii+1)+
-     *C(i-1,j+1,ii)+C(i+1,j-1,ii)+C(i-1,j+1,ii-1)+C(i-1,j+1,ii+1)+
-     *C(i+1,j-1,ii-1)+C(i+1,j-1,ii+1)       
-          if (B(i,j,ii).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SH3202     
-      subroutine SH3202
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3202'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(1:2,2:2,1:2)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-          B(i,j,ii) = A(i-1,j-2,ii+2)+A(i-1,j+2,ii-1)+A(i-1,j+2,ii+2)+
-     *A(i+2,j+2,ii+2)+ A(i+2,j+2,ii-1)+A(i+2,j-2,ii+2)+A(i+2,j-2,ii-1)+
-     *A(i-1,j-2,ii-1)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            isum = C(i-1,j-2,ii+2)+C(i-1,j+2,ii-1)+C(i-1,j+2,ii+2)+
-     *C(i+2,j+2,ii+2)+ C(i+2,j+2,ii-1)+C(i+2,j-2,ii+2)+C(i+2,j-2,ii-1)+
-     *C(i-1,j-2,ii-1)      
-           if (B(i,j,ii).ne.isum) then
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)         
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------SH3203      
-      subroutine SH3203
-      integer, parameter :: N = 16,M=116,K=116,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3203'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(0:2,2:2,0:2)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            B(i,j,ii) = A(i+2,j+2,ii+2)+A(i,j-2,ii)+
-     *A(i+2,j-2,ii)+A(i,j+2,ii)+ A(i,j+2,ii+2)+A(i+2,j-2,ii+2)+
-     * A(i+2,j+2,ii)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            isum = C(i+2,j+2,ii+2)+C(i,j-2,ii)+
-     *C(i+2,j-2,ii)+C(i,j+2,ii)+ C(i,j+2,ii+2)+C(i+2,j-2,ii+2)+
-     *C(i+2,j+2,ii)
-            if (B(i,j,ii).ne.isum) then         
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-      
-C ------------------------------------------SH3204   
-      subroutine SH3204     
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3204'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(2:2,2:0,2:0)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           B(i,j,ii) = A(i+2,j,ii)+A(i-2,j-2,ii-2)+
-     *A(i+2,j-2,ii-2)+ A(i-2,j,ii-2)+A(i-2,j-2,ii)+
-     *A(i-2,j,ii)+A(i+2,j-2,ii)+A(i+2,j,ii-2)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           isum = C(i+2,j,ii)+C(i-2,j-2,ii-2)+
-     *C(i+2,j-2,ii-2)+ C(i-2,j,ii-2)+C(i-2,j-2,ii)+
-     *C(i-2,j,ii)+C(i+2,j-2,ii)+C(i+2,j,ii-2)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-      
-C ------------------------------------------SH3205
-      subroutine SH3205   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)   
-!dvm$ shadow(0:2,2:2,0:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3205'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            B(i,j,ii) = A(i+2,j+2,ii+2)+A(i,j-2,ii)+
-     *   A(i+2,j-2,ii)+ A(i,j+2,ii)+A(i,j+2,ii+2)+
-     *   A(i+2,j-2,ii+2)+A(i+2,j+2,ii) 
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           isum = C(i+2,j+2,ii+2)+C(i,j-2,ii)+
-     *   C(i+2,j-2,ii)+ C(i,j+2,ii)+C(i,j+2,ii+2)+
-     *   C(i+2,j-2,ii+2)+C(i+2,j+2,ii)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-           
-
-C --------------------------------------------SH3206  
-      subroutine SH3206   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3206'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            B(i,j,ii) = A(i-3,j-3,ii+3)+A(i+3,j+3,ii-3)+
-     *   A(i+3,j-3,ii+3)+ A(i-3,j+3,ii+3)+A(i-3,j+3,ii-3)+
-     *   A(i+3,j-3,ii-3)+A(i+3,j+3,ii+3)+A(i-3,j-3,ii-3) 
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            isum = C(i-3,j-3,ii+3)+C(i+3,j+3,ii-3)+
-     *   C(i+3,j-3,ii+3)+ C(i-3,j+3,ii+3)+C(i-3,j+3,ii-3)+
-     *   C(i+3,j-3,ii-3)+ C(i+3,j+3,ii+3)+ C(i-3,j-3,ii-3)    
-            if (B(i,j,ii).ne.isum) then         
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-           
-C -------------------------------------------SH3207   
-       subroutine SH3207   
-       integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)   
-!dvm$ shadow(3:3,0:3,3:0) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3207'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-             B(i,j,ii) = A(i+3,j+3,ii)+A(i-3,j,ii-3)+
-     *   A(i+3,j,ii-3)+ A(i-3,j+3,ii-3)+ A(i-3,j,ii)+
-     *   A(i-3,j+3,ii)+ A(i+3,j,ii)+ A(i+3,j+3,ii-3)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            isum = C(i+3,j+3,ii)+C(i-3,j,ii-3)+
-     *   C(i+3,j,ii-3)+ C(i-3,j+3,ii-3)+C(i-3,j,ii)+
-     *   C(i-3,j+3,ii)+ C(i+3,j,ii)+ C(i+3,j+3,ii-3)    
-            if (B(i,j,ii).ne.isum) then        
-               nloopi=min(nloopi,i)
-               nloopj=min(nloopj,j)
-               nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-                    
-     
-C -------------------------------------------SH3208   
-      subroutine SH3208   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)   
-!dvm$ shadow(0:3,0:3,0:3) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3208'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(0:3,0:3,0:3)(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-             B(i,j,ii) = A(i+3,j+3,ii+3)+A(i+3,j,ii)+
-     *   A(i,j+3,ii)+ A(i,j,ii+3)+ A(i,j+3,ii+3)+
-     *   A(i+3,j,ii+3)+ A(i+3,j+3,ii)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-           isum = C(i+3,j+3,ii+3)+C(i+3,j,ii)+
-     *   C(i,j+3,ii)+ C(i,j,ii+3)+ C(i,j+3,ii+3)+
-     *   C(i+3,j,ii+3)+ C(i+3,j+3,ii)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-                    
-C -------------------------------------------SH3209   
-      subroutine SH3209   
-      integer, parameter :: N = 120,M=120,K=120,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11,11:11) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SH3209'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*shadow_renew(A(CORNER))
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-             B(i,j,ii) = A(i+11,j+11,ii+11)+A(i-11,j-11,ii-11)+
-     *   A(i+11,j-11,ii-11)+ A(i-11,j+11,ii-11)+ A(i-11,j-11,ii+11)+
-     *   A(i-11,j+11,ii+11)+ A(i+11,j-11,ii+11)+A(i+11,j+11,ii-11)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            isum = C(i+11,j+11,ii+11)+C(i-11,j-11,ii-11)+
-     *   C(i+11,j-11,ii-11)+ C(i-11,j+11,ii-11)+ C(i-11,j-11,ii+11)+
-     *   C(i-11,j+11,ii+11)+ C(i+11,j-11,ii+11)+C(i+11,j+11,ii-11)
-            if (B(i,j,ii).ne.isum) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)         
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C -----------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                
-      enddo
-      end 
-    
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh41.fdv
deleted file mode 100644
index 2b81283..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh41.fdv
+++ /dev/null
@@ -1,803 +0,0 @@
-      program SH41
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SH41========================'
-C --------------------------------------------------
-      call sh4101
-C --------------------------------------------------
-      call sh4102
-C --------------------------------------------------
-      call sh4103
-C -------------------------------------------------
-      call sh4104
-C -------------------------------------------------
-      call sh4105
-C -------------------------------------------------
-      call sh4106
-C --------------------------------------------------
-      call sh4107
-C --------------------------------------------------
-      call sh4108
-C----------------------------------------------------
-       call sh4109
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF SH41 ========================= '    
-      end
-C ---------------------------------------------SH4101
-      subroutine SH4101
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)       
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4101'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-            do jj=2,L-1
-            B(i,j,ii,jj) = A(i+1,j+1,ii+1,jj+1)+A(i-1,j-1,ii-1,jj-1)+
-     *   A(i+1,j-1,ii-1,jj-1)+A(i-1,j+1,ii-1,jj-1)+
-     *   A(i-1,j-1,ii+1,jj-1)+ A(i-1,j-1,ii-1,jj+1)+
-     *   A(i+1,j+1,ii-1,jj-1)+A(i-1,j+1,ii+1,jj-1)+
-     *   A(i-1,j-1,ii+1,jj+1)+A(i+1,j-1,ii-1,jj+1)+
-     *   A(i+1,j-1,ii+1,jj-1)+A(i-1,j+1,ii-1,jj+1)+
-     *   A(i+1,j+1,ii+1,jj-1)+A(i-1,j+1,ii+1,jj+1)+
-     *   A(i+1,j-1,ii+1,jj+1)+A(i+1,j+1,ii-1,jj+1)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-            do jj=2,L-1
-              isum = C(i+1,j+1,ii+1,jj+1)+C(i-1,j-1,ii-1,jj-1)+
-     *   C(i+1,j-1,ii-1,jj-1)+ C(i-1,j+1,ii-1,jj-1)+
-     *   C(i-1,j-1,ii+1,jj-1)+ C(i-1,j-1,ii-1,jj+1)+
-     *   C(i+1,j+1,ii-1,jj-1)+ C(i-1,j+1,ii+1,jj-1)+
-     *   C(i-1,j-1,ii+1,jj+1)+ C(i+1,j-1,ii-1,jj+1)+
-     *   C(i+1,j-1,ii+1,jj-1)+ C(i-1,j+1,ii-1,jj+1)+
-     *   C(i+1,j+1,ii+1,jj-1)+ C(i-1,j+1,ii+1,jj+1)+
-     *   C(i+1,j-1,ii+1,jj+1)+ C(i+1,j+1,ii-1,jj+1)         
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SH4102     
-
-      subroutine SH4102     
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4102'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-            B(i,j,ii,jj) = A(i+2,j+2,ii+2,jj+2)+A(i-2,j-2,ii-2,jj-2)+
-     *   A(i+2,j-2,ii-2,jj-2)+ A(i-2,j+2,ii-2,jj-2)+
-     *   A(i-2,j-2,ii+2,jj-2)+ A(i-2,j-2,ii-2,jj+2)+
-     *   A(i+2,j+2,ii-2,jj-2)+ A(i-2,j+2,ii+2,jj-2)+
-     *   A(i-2,j-2,ii+2,jj+2)+ A(i+2,j-2,ii-2,jj+2)+
-     *   A(i+2,j-2,ii+2,jj-2)+ A(i-2,j+2,ii-2,jj+2)+
-     *   A(i+2,j+2,ii+2,jj-2)+ A(i-2,j+2,ii+2,jj+2)+
-     *   A(i+2,j-2,ii+2,jj+2)+ A(i+2,j+2,ii-2,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i+2,j+2,ii+2,jj+2)+C(i-2,j-2,ii-2,jj-2)+
-     *   C(i+2,j-2,ii-2,jj-2)+ C(i-2,j+2,ii-2,jj-2)+
-     *   C(i-2,j-2,ii+2,jj-2)+ C(i-2,j-2,ii-2,jj+2)+
-     *   C(i+2,j+2,ii-2,jj-2)+ C(i-2,j+2,ii+2,jj-2)+
-     *   C(i-2,j-2,ii+2,jj+2)+ C(i+2,j-2,ii-2,jj+2)+
-     *   C(i+2,j-2,ii+2,jj-2)+ C(i-2,j+2,ii-2,jj+2)+
-     *   C(i+2,j+2,ii+2,jj-2)+ C(i-2,j+2,ii+2,jj+2)+
-     *   C(i+2,j-2,ii+2,jj+2)+ C(i+2,j+2,ii-2,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------SH4103      
-      subroutine SH4103
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4103'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*shadow_renew(A(2:0,2:2,2:0,2:0)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i-2,j-2,ii-2,jj-2)+
-     *   A(i,j-2,ii,jj)+ A(i-2,j-2,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j-2,ii-2,jj)+
-     *   A(i-2,j-2,ii,jj)+ A(i,j-2,ii-2,jj-2)+
-     *   A(i,j-2,ii,jj-2)+ A(i-2,j-2,ii-2,jj)+
-     *   A(i,j-2,ii-2,jj-2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i-2,j-2,ii-2,jj-2)+
-     *   C(i,j-2,ii,jj)+ C(i-2,j-2,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j-2,ii-2,jj)+
-     *   C(i-2,j-2,ii,jj)+ C(i,j-2,ii-2,jj-2)+
-     *   C(i,j-2,ii,jj-2)+ C(i-2,j-2,ii-2,jj)+
-     *   C(i,j-2,ii-2,jj-2)
-             if (B(i,j,ii,jj).ne.isum) then
-               nloopi=min(nloopi,i)
-               nloopj=min(nloopj,j)
-               nloopii=min(nloopii,ii)
-               nloopjj=min(nloopjj,jj)         
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end      
-C ------------------------------------------SH4104   
-      subroutine SH4104
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:2,2:2,0:2,0:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4104'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*shadow_renew(A(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i+2,j+2,ii+2,jj)+
-     *   A(i,j-2,ii,jj)+ A(i+2,j-2,ii,jj)+
-     *   A(i,j+2,ii,jj)+ A(i,j-2,ii+2,jj)+
-     *   A(i+2,j+2,ii,jj)+ A(i,j-2,ii+2,jj+2)+
-     *   A(i,j+2,ii,jj+2)+ A(i+2,j+2,ii+2,jj)+
-     *   A(i,j+2,ii+2,jj+2)+A(i+2,j-2,ii+2,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i+2,j+2,ii+2,jj)+
-     *   C(i,j-2,ii,jj)+ C(i+2,j-2,ii,jj)+
-     *   C(i,j+2,ii,jj)+ C(i,j-2,ii+2,jj)+
-     *   C(i+2,j+2,ii,jj)+ C(i,j-2,ii+2,jj+2)+
-     *   C(i,j+2,ii,jj+2)+ C(i+2,j+2,ii+2,jj)+
-     *   C(i,j+2,ii+2,jj+2)+C(i+2,j-2,ii+2,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end  
-C ------------------------------------------SH4105
-      subroutine SH4105
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:0,0:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4105'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*shadow_renew(A(0:0,0:0,0:0,0:2))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i,j,ii,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i,j,ii,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end  
-C --------------------------------------------SH4106  
-      subroutine SH4106
-      integer, parameter :: N = 32,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3,3:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4106'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            B(i,j,ii,jj) = A(i+3,j+3,ii+3,jj+3)+A(i-3,j-3,ii-3,jj-3)+
-     *   A(i+3,j-3,ii-3,jj-3)+ A(i-3,j+3,ii-3,jj-3)+
-     *   A(i-3,j-3,ii+3,jj-3)+ A(i-3,j-3,ii-3,jj+3)+
-     *   A(i+3,j+3,ii-3,jj-3)+ A(i-3,j+3,ii+3,jj-3)+
-     *   A(i-3,j-3,ii+3,jj+3)+ A(i+3,j-3,ii-3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj-3)+ A(i-3,j+3,ii-3,jj+3)+
-     *   A(i+3,j+3,ii+3,jj-3)+ A(i-3,j+3,ii+3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj+3)+ A(i+3,j+3,ii-3,jj+3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum = C(i+3,j+3,ii+3,jj+3)+C(i-3,j-3,ii-3,jj-3)+
-     *   C(i+3,j-3,ii-3,jj-3)+ C(i-3,j+3,ii-3,jj-3)+
-     *   C(i-3,j-3,ii+3,jj-3)+ C(i-3,j-3,ii-3,jj+3)+
-     *   C(i+3,j+3,ii-3,jj-3)+ C(i-3,j+3,ii+3,jj-3)+
-     *   C(i-3,j-3,ii+3,jj+3)+ C(i+3,j-3,ii-3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj-3)+ C(i-3,j+3,ii-3,jj+3)+
-     *   C(i+3,j+3,ii+3,jj-3)+ C(i-3,j+3,ii+3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj+3)+ C(i+3,j+3,ii-3,jj+3)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -------------------------------------------SH4107   
-      subroutine SH4107
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,0:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4107'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              B(i,j,ii,jj) = A(i+3,j+3,ii+3,jj+3)+A(i,j-3,ii,jj)+
-     *   A(i+3,j-3,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j-3,ii+3,jj)+ A(i+3,j+3,ii,jj)+
-     *   A(i,j-3,ii+3,jj+3)+ A(i,j+3,ii,jj+3)+
-     *   A(i+3,j+3,ii+3,jj)+ A(i,j+3,ii+3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj+3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum = C(i+3,j+3,ii+3,jj+3)+C(i,j-3,ii,jj)+
-     *   C(i+3,j-3,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j-3,ii+3,jj)+ C(i+3,j+3,ii,jj)+
-     *   C(i,j-3,ii+3,jj+3)+ C(i,j+3,ii,jj+3)+
-     *   C(i+3,j+3,ii+3,jj)+ C(i,j+3,ii+3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj+3)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end   
-C -------------------------------------------SH4108   
-      subroutine SH4108
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,3:0) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4108'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*shadow_renew(A(0:0,0:0,0:0,3:0))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              B(i,j,ii,jj) = A(i,j,ii,jj-3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum =C(i,j,ii,jj-3) 
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end   
-C -------------------------------------------SH4109   
-      subroutine SH4109
-      integer, parameter :: N = 60,M=60,K=60,L=60,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11,11:11,11:11) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4109'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            do jj=12,L-11
-              B(i,j,ii,jj) = A(i+11,j+11,ii+11,jj+11)+
-     *   A(i-11,j-11,ii-11,jj-11)+
-     *   A(i+11,j-11,ii-11,jj-11)+ A(i-11,j+11,ii-11,jj-11)+
-     *   A(i-11,j-11,ii+11,jj-11)+ A(i-11,j-11,ii-11,jj+11)+
-     *   A(i+11,j+11,ii-11,jj-11)+ A(i-11,j+11,ii+11,jj-11)+
-     *   A(i-11,j-11,ii+11,jj+11)+ A(i+11,j-11,ii-11,jj+11)+
-     *   A(i+11,j-11,ii+11,jj-11)+ A(i-11,j+11,ii-11,jj+11)+
-     *   A(i+11,j+11,ii+11,jj-11)+ A(i-11,j+11,ii+11,jj+11)+
-     *   A(i+11,j-11,ii+11,jj+11)+ A(i+11,j+11,ii-11,jj+11)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            do jj=12,L-11
-              isum = C(i+11,j+11,ii+11,jj+11)+
-     *   C(i-11,j-11,ii-11,jj-11)+
-     *   C(i+11,j-11,ii-11,jj-11)+ C(i-11,j+11,ii-11,jj-11)+
-     *   C(i-11,j-11,ii+11,jj-11)+ C(i-11,j-11,ii-11,jj+11)+
-     *   C(i+11,j+11,ii-11,jj-11)+ C(i-11,j+11,ii+11,jj-11)+
-     *   C(i-11,j-11,ii+11,jj+11)+ C(i+11,j-11,ii-11,jj+11)+
-     *   C(i+11,j-11,ii+11,jj-11)+ C(i-11,j+11,ii-11,jj+11)+
-     *   C(i+11,j+11,ii+11,jj-11)+ C(i-11,j+11,ii+11,jj+11)+
-     *   C(i+11,j-11,ii+11,jj+11)+ C(i+11,j+11,ii-11,jj+11)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                
-      end 
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh42.fdv
deleted file mode 100644
index 17ae5de..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW/sh42.fdv
+++ /dev/null
@@ -1,803 +0,0 @@
-      program SH42
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_RENEW CLAUSE'.       
-c    DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SH42========================'
-C --------------------------------------------------
-      call sh4201
-C --------------------------------------------------
-      call sh4202
-C --------------------------------------------------
-      call sh4203
-C -------------------------------------------------
-      call sh4204
-C -------------------------------------------------
-      call sh4205
-C -------------------------------------------------
-      call sh4206
-C --------------------------------------------------
-      call sh4207
-C --------------------------------------------------
-      call sh4208
-C----------------------------------------------------
-       call sh4209
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF SH42 ========================= '    
-      end
-C ---------------------------------------------SH4201
-      subroutine SH4201
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*,*)       
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4201'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-            do jj=2,L-1
-            B(i,j,ii,jj) = A(i+1,j+1,ii+1,jj+1)+A(i-1,j-1,ii-1,jj-1)+
-     *   A(i+1,j-1,ii-1,jj-1)+A(i-1,j+1,ii-1,jj-1)+
-     *   A(i-1,j-1,ii+1,jj-1)+ A(i-1,j-1,ii-1,jj+1)+
-     *   A(i+1,j+1,ii-1,jj-1)+A(i-1,j+1,ii+1,jj-1)+
-     *   A(i-1,j-1,ii+1,jj+1)+A(i+1,j-1,ii-1,jj+1)+
-     *   A(i+1,j-1,ii+1,jj-1)+A(i-1,j+1,ii-1,jj+1)+
-     *   A(i+1,j+1,ii+1,jj-1)+A(i-1,j+1,ii+1,jj+1)+
-     *   A(i+1,j-1,ii+1,jj+1)+A(i+1,j+1,ii-1,jj+1)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-            do jj=2,L-1
-              isum = C(i+1,j+1,ii+1,jj+1)+C(i-1,j-1,ii-1,jj-1)+
-     *   C(i+1,j-1,ii-1,jj-1)+ C(i-1,j+1,ii-1,jj-1)+
-     *   C(i-1,j-1,ii+1,jj-1)+ C(i-1,j-1,ii-1,jj+1)+
-     *   C(i+1,j+1,ii-1,jj-1)+ C(i-1,j+1,ii+1,jj-1)+
-     *   C(i-1,j-1,ii+1,jj+1)+ C(i+1,j-1,ii-1,jj+1)+
-     *   C(i+1,j-1,ii+1,jj-1)+ C(i-1,j+1,ii-1,jj+1)+
-     *   C(i+1,j+1,ii+1,jj-1)+ C(i-1,j+1,ii+1,jj+1)+
-     *   C(i+1,j-1,ii+1,jj+1)+ C(i+1,j+1,ii-1,jj+1)         
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SH4202     
-
-      subroutine SH4202     
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4202'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-            B(i,j,ii,jj) = A(i+2,j+2,ii+2,jj+2)+A(i-2,j-2,ii-2,jj-2)+
-     *   A(i+2,j-2,ii-2,jj-2)+ A(i-2,j+2,ii-2,jj-2)+
-     *   A(i-2,j-2,ii+2,jj-2)+ A(i-2,j-2,ii-2,jj+2)+
-     *   A(i+2,j+2,ii-2,jj-2)+ A(i-2,j+2,ii+2,jj-2)+
-     *   A(i-2,j-2,ii+2,jj+2)+ A(i+2,j-2,ii-2,jj+2)+
-     *   A(i+2,j-2,ii+2,jj-2)+ A(i-2,j+2,ii-2,jj+2)+
-     *   A(i+2,j+2,ii+2,jj-2)+ A(i-2,j+2,ii+2,jj+2)+
-     *   A(i+2,j-2,ii+2,jj+2)+ A(i+2,j+2,ii-2,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i+2,j+2,ii+2,jj+2)+C(i-2,j-2,ii-2,jj-2)+
-     *   C(i+2,j-2,ii-2,jj-2)+ C(i-2,j+2,ii-2,jj-2)+
-     *   C(i-2,j-2,ii+2,jj-2)+ C(i-2,j-2,ii-2,jj+2)+
-     *   C(i+2,j+2,ii-2,jj-2)+ C(i-2,j+2,ii+2,jj-2)+
-     *   C(i-2,j-2,ii+2,jj+2)+ C(i+2,j-2,ii-2,jj+2)+
-     *   C(i+2,j-2,ii+2,jj-2)+ C(i-2,j+2,ii-2,jj+2)+
-     *   C(i+2,j+2,ii+2,jj-2)+ C(i-2,j+2,ii+2,jj+2)+
-     *   C(i+2,j-2,ii+2,jj+2)+ C(i+2,j+2,ii-2,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------SH4203      
-      subroutine SH4203
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4203'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*shadow_renew(A(2:0,2:2,2:0,2:0)(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i-2,j-2,ii-2,jj-2)+
-     *   A(i,j-2,ii,jj)+ A(i-2,j-2,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j-2,ii-2,jj)+
-     *   A(i-2,j-2,ii,jj)+ A(i,j-2,ii-2,jj-2)+
-     *   A(i,j-2,ii,jj-2)+ A(i-2,j-2,ii-2,jj)+
-     *   A(i,j-2,ii-2,jj-2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i-2,j-2,ii-2,jj-2)+
-     *   C(i,j-2,ii,jj)+ C(i-2,j-2,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j-2,ii-2,jj)+
-     *   C(i-2,j-2,ii,jj)+ C(i,j-2,ii-2,jj-2)+
-     *   C(i,j-2,ii,jj-2)+ C(i-2,j-2,ii-2,jj)+
-     *   C(i,j-2,ii-2,jj-2)
-             if (B(i,j,ii,jj).ne.isum) then
-               nloopi=min(nloopi,i)
-               nloopj=min(nloopj,j)
-               nloopii=min(nloopii,ii)
-               nloopjj=min(nloopjj,jj)         
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end      
-C ------------------------------------------SH4204   
-      subroutine SH4204
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(0:2,2:2,0:2,0:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4204'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*shadow_renew(A(CORNER))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i+2,j+2,ii+2,jj)+
-     *   A(i,j-2,ii,jj)+ A(i+2,j-2,ii,jj)+
-     *   A(i,j+2,ii,jj)+ A(i,j-2,ii+2,jj)+
-     *   A(i+2,j+2,ii,jj)+ A(i,j-2,ii+2,jj+2)+
-     *   A(i,j+2,ii,jj+2)+ A(i+2,j+2,ii+2,jj)+
-     *   A(i,j+2,ii+2,jj+2)+A(i+2,j-2,ii+2,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i+2,j+2,ii+2,jj)+
-     *   C(i,j-2,ii,jj)+ C(i+2,j-2,ii,jj)+
-     *   C(i,j+2,ii,jj)+ C(i,j-2,ii+2,jj)+
-     *   C(i+2,j+2,ii,jj)+ C(i,j-2,ii+2,jj+2)+
-     *   C(i,j+2,ii,jj+2)+ C(i+2,j+2,ii+2,jj)+
-     *   C(i,j+2,ii+2,jj+2)+C(i+2,j-2,ii+2,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end  
-C ------------------------------------------SH4205
-      subroutine SH4205
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(2:2,2:0,0:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4205'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*shadow_renew(A(0:0,0:0,0:0,0:2))
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i,j,ii,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i,j,ii,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end  
-C --------------------------------------------SH4206  
-      subroutine SH4206
-      integer, parameter :: N = 32,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(3:3,3:3,3:3,3:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4206'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            B(i,j,ii,jj) = A(i+3,j+3,ii+3,jj+3)+A(i-3,j-3,ii-3,jj-3)+
-     *   A(i+3,j-3,ii-3,jj-3)+ A(i-3,j+3,ii-3,jj-3)+
-     *   A(i-3,j-3,ii+3,jj-3)+ A(i-3,j-3,ii-3,jj+3)+
-     *   A(i+3,j+3,ii-3,jj-3)+ A(i-3,j+3,ii+3,jj-3)+
-     *   A(i-3,j-3,ii+3,jj+3)+ A(i+3,j-3,ii-3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj-3)+ A(i-3,j+3,ii-3,jj+3)+
-     *   A(i+3,j+3,ii+3,jj-3)+ A(i-3,j+3,ii+3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj+3)+ A(i+3,j+3,ii-3,jj+3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum = C(i+3,j+3,ii+3,jj+3)+C(i-3,j-3,ii-3,jj-3)+
-     *   C(i+3,j-3,ii-3,jj-3)+ C(i-3,j+3,ii-3,jj-3)+
-     *   C(i-3,j-3,ii+3,jj-3)+ C(i-3,j-3,ii-3,jj+3)+
-     *   C(i+3,j+3,ii-3,jj-3)+ C(i-3,j+3,ii+3,jj-3)+
-     *   C(i-3,j-3,ii+3,jj+3)+ C(i+3,j-3,ii-3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj-3)+ C(i-3,j+3,ii-3,jj+3)+
-     *   C(i+3,j+3,ii+3,jj-3)+ C(i-3,j+3,ii+3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj+3)+ C(i+3,j+3,ii-3,jj+3)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -------------------------------------------SH4207   
-      subroutine SH4207
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(0:3,3:3,0:3,0:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4207'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              B(i,j,ii,jj) = A(i+3,j+3,ii+3,jj+3)+A(i,j-3,ii,jj)+
-     *   A(i+3,j-3,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j-3,ii+3,jj)+ A(i+3,j+3,ii,jj)+
-     *   A(i,j-3,ii+3,jj+3)+ A(i,j+3,ii,jj+3)+
-     *   A(i+3,j+3,ii+3,jj)+ A(i,j+3,ii+3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj+3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum = C(i+3,j+3,ii+3,jj+3)+C(i,j-3,ii,jj)+
-     *   C(i+3,j-3,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j-3,ii+3,jj)+ C(i+3,j+3,ii,jj)+
-     *   C(i,j-3,ii+3,jj+3)+ C(i,j+3,ii,jj+3)+
-     *   C(i+3,j+3,ii+3,jj)+ C(i,j+3,ii+3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj+3)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end   
-C -------------------------------------------SH4208   
-      subroutine SH4208
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(0:3,3:3,0:3,3:0) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4208'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*shadow_renew(A(0:0,0:0,0:0,3:0))
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              B(i,j,ii,jj) = A(i,j,ii,jj-3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum =C(i,j,ii,jj-3) 
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end   
-C -------------------------------------------SH4209   
-      subroutine SH4209
-      integer, parameter :: N = 32,M=32,K=32,L=32,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,*,*,*)   
-!dvm$ shadow(11:11,11:11,11:11,11:11) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SH4209'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),shadow_renew(A(CORNER))
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            do jj=12,L-11
-              B(i,j,ii,jj) = A(i+11,j+11,ii+11,jj+11)+
-     *   A(i-11,j-11,ii-11,jj-11)+
-     *   A(i+11,j-11,ii-11,jj-11)+ A(i-11,j+11,ii-11,jj-11)+
-     *   A(i-11,j-11,ii+11,jj-11)+ A(i-11,j-11,ii-11,jj+11)+
-     *   A(i+11,j+11,ii-11,jj-11)+ A(i-11,j+11,ii+11,jj-11)+
-     *   A(i-11,j-11,ii+11,jj+11)+ A(i+11,j-11,ii-11,jj+11)+
-     *   A(i+11,j-11,ii+11,jj-11)+ A(i-11,j+11,ii-11,jj+11)+
-     *   A(i+11,j+11,ii+11,jj-11)+ A(i-11,j+11,ii+11,jj+11)+
-     *   A(i+11,j-11,ii+11,jj+11)+ A(i+11,j+11,ii-11,jj+11)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            do jj=12,L-11
-              isum = C(i+11,j+11,ii+11,jj+11)+
-     *   C(i-11,j-11,ii-11,jj-11)+
-     *   C(i+11,j-11,ii-11,jj-11)+ C(i-11,j+11,ii-11,jj-11)+
-     *   C(i-11,j-11,ii+11,jj-11)+ C(i-11,j-11,ii-11,jj+11)+
-     *   C(i+11,j+11,ii-11,jj-11)+ C(i-11,j+11,ii+11,jj-11)+
-     *   C(i-11,j-11,ii+11,jj+11)+ C(i+11,j-11,ii-11,jj+11)+
-     *   C(i+11,j-11,ii+11,jj-11)+ C(i-11,j+11,ii-11,jj+11)+
-     *   C(i+11,j+11,ii+11,jj-11)+ C(i-11,j+11,ii+11,jj+11)+
-     *   C(i+11,j-11,ii+11,jj+11)+ C(i+11,j+11,ii-11,jj+11)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                
-      end 
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/settings
deleted file mode 100644
index 3ef2d72..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/settings
+++ /dev/null
@@ -1 +0,0 @@
-DVM_ONLY=1
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha11.fdv
deleted file mode 100644
index bc624eb..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha11.fdv
+++ /dev/null
@@ -1,260 +0,0 @@
-      program SHA11
-     
-c    TESTING OF THE SHADOW_GROUP DIRECTIVE ,SHADOW_START DIRECRIVE AND
-c    SHADOW_WAIT DIRECTIVE.       
-c    DISTRIBUTED ARRAYES A(N),D(N),F(N) IS TO HAVE DIFFERENT 
-c    SHADOW WIDTH ON BOTH SIDES 
-
-      print *,'===START OF SHA11========================'
-C --------------------------------------------------
-      call sha1101
-C --------------------------------------------------
-      call sha1102
-C --------------------------------------------------
-      call sha1103
-C -------------------------------------------------
-      call sha1104
-C -------------------------------------------------
- 
-C
-C
-      print *,'=== END OF SHA11 ========================= '    
-      end
-C ---------------------------------------------SHA1101
-      subroutine SHA1101
-     
-      integer, parameter :: N = 32,NL=1000
-
-
-      character*7 tname 
-      integer, allocatable :: A(:),BA(:),BD(:),BF(:),C(:),D(:),F(:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK)     
-cdvm$ shadow D(2:2)
-cdvm$ shadow F(3:3)
-cdvm$ align (I) with BA(I) ::A,D,F,BD,BF
-
-      tname='SHA1101'
-      allocate (BA(N),A(N),BD(N),BF(N),C(N),D(N),F(N))
-cdvm$ shadow_group ADF(A(1:1),D(2:2),F(3:3))
-
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-        D(i) =NL+i
-        F(i) =NL+i
-      enddo
-
-cdvm$ shadow_start ADF
-cdvm$ shadow_wait ADF               
-
-*dvm$ parallel (i) on BA(i)
-      do i=4,N-3
-         BA(i) = A(i-1)+A(i+1)
-         BD(i)=  D(i-2)+D(i+2)
-         BF(i)=  F(i-3)+F(i+3)         
-      enddo 
-  
-*dvm$ parallel (i) on BA(i), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-          if (BA(i).ne.(C(i-1)+c(i+1))) nloopa=min(nloopa,i)
-          if (BD(i).ne.(C(i-2)+c(i+2))) nloopd=min(nloopd,i)
-          if (BF(i).ne.(C(i-3)+c(i+3))) nloopf=min(nloopf,i)          
-      enddo 
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA1102
-      subroutine SHA1102     
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:),BA(:),BD(:),BF(:),C(:),D(:),F(:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK)   
-cdvm$ shadow D(2:2)
-cdvm$ shadow F(3:3)
-cdvm$ align (I) with BA(I) ::A,D,F,BD,BF
-
-      tname='SHA1102'
-      allocate (BA(N),A(N),BD(N),BF(N),C(N),D(N),F(N))
-cdvm$ shadow_group ADF(A(1:1),D(2:2),F(3:3))
-
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-        D(i) =NL+i
-        F(i) =NL+i
-      enddo
-
-cdvm$ shadow_start ADF
-     
-*dvm$ parallel (i) on BA(i),shadow_wait ADF
-      do i=4,N-3
-         BA(i) = A(i-1)+A(i+1)
-         BD(i)=  D(i-2)+D(i+2)
-         BF(i)=  F(i-3)+F(i+3)         
-      enddo 
-    
-*dvm$ parallel (i) on BA(i), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-          if (BA(i).ne.(C(i-1)+c(i+1))) nloopa=min(nloopa,i)
-          if (BD(i).ne.(C(i-2)+c(i+2))) nloopd=min(nloopd,i)
-          if (BF(i).ne.(C(i-3)+c(i+3))) nloopf=min(nloopf,i)          
-      enddo 
-     
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA1103
-   
-
-      subroutine SHA1103
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:),BA(:),BD(:),BF(:),C(:),D(:),F(:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK)    
-cdvm$ shadow D(2:2)
-cdvm$ shadow F(3:3)
-cdvm$ align (I) with BA(I) ::A,D,F,BD,BF
-
-      tname='SHA1103'
-      allocate (BA(N),A(N),BD(N),BF(N),C(N),D(N),F(N))
-cdvm$ shadow_group ADF(A(1:1),D(2:2),F(3:3))
-
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i) on A(i),shadow_start ADF
-      do i=1,N
-        A(i) = NL+i
-        D(i) =NL+i
-        F(i) =NL+i
-      enddo
-
-cdvm$ shadow_wait ADF 
-*dvm$ parallel (i) on BA(i)
-      do i=4,N-3
-         BA(i) = A(i-1)+A(i+1)
-         BD(i)=  D(i-2)+D(i+2)
-         BF(i)=  F(i-3)+F(i+3)
-      enddo 
-     
-*dvm$ parallel (i) on BA(i), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-          if (BA(i).ne.(C(i-1)+c(i+1))) nloopa=min(nloopa,i)
-          if (BD(i).ne.(C(i-2)+c(i+2))) nloopd=min(nloopd,i)
-          if (BF(i).ne.(C(i-3)+c(i+3))) nloopf=min(nloopf,i)
-      enddo 
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-C ---------------------------------------------SHA1104
-      subroutine SHA1104
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:),BA(:),BD(:),BF(:),C(:),D(:),F(:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK)     
-cdvm$ shadow D(2:2)
-cdvm$ shadow F(3:3)
-cdvm$ align (I) with BA(I) ::A,D,F,BD,BF
-
-      tname='SHA1104'
-      allocate (BA(N),A(N),BD(N),BF(N),C(N),D(N),F(N))
-cdvm$ shadow_group ADF(A(1:1),D(2:2),F(3:3))
-
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i) on A(i),shadow_start ADF
-      do i=1,N
-        A(i) = NL+i
-        D(i) =NL+i
-        F(i) =NL+i
-      enddo
-
-*dvm$ parallel (i) on BA(i),shadow_wait ADF
-      do i=4,N-3
-         BA(i) = A(i-1)+A(i+1)
-         BD(i)=  D(i-2)+D(i+2)
-         BF(i)=  F(i-3)+F(i+3)
-      enddo 
-      
-*dvm$ parallel (i) on BA(i), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-          if (BA(i).ne.(C(i-1)+c(i+1))) nloopa=min(nloopa,i)
-          if (BD(i).ne.(C(i-2)+c(i+2))) nloopd=min(nloopd,i)
-          if (BF(i).ne.(C(i-3)+c(i+3))) nloopf=min(nloopf,i)          
-      enddo 
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo                   
-      end 
-
-
-       subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha12.fdv
deleted file mode 100644
index a631e8d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha12.fdv
+++ /dev/null
@@ -1,260 +0,0 @@
-      program SHA12
-     
-c    TESTING OF THE SHADOW_GROUP DIRECTIVE ,SHADOW_START DIRECRIVE AND
-c    SHADOW_WAIT DIRECTIVE.       
-c    DISTRIBUTED ARRAYES A(N),D(N),F(N) IS TO HAVE DIFFERENT 
-c    SHADOW WIDTH ON BOTH SIDES 
-
-      print *,'===START OF SHA12========================'
-C --------------------------------------------------
-      call sha1201
-C --------------------------------------------------
-      call sha1202
-C --------------------------------------------------
-      call sha1203
-C -------------------------------------------------
-      call sha1204
-C -------------------------------------------------
- 
-C
-C
-      print *,'=== END OF SHA12 ========================= '    
-      end
-C ---------------------------------------------SHA1201
-      subroutine SHA1201
-     
-      integer, parameter :: N = 32,NL=1000
-
-
-      character*7 tname 
-      integer, allocatable :: A(:),BA(:),BD(:),BF(:),C(:),D(:),F(:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*)     
-cdvm$ shadow D(2:2)
-cdvm$ shadow F(3:3)
-cdvm$ align (I) with BA(I) ::A,D,F,BD,BF
-
-      tname='SHA1201'
-      allocate (BA(N),A(N),BD(N),BF(N),C(N),D(N),F(N))
-cdvm$ shadow_group ADF(A(1:1),D(2:2),F(3:3))
-
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-        D(i) =NL+i
-        F(i) =NL+i
-      enddo
-
-cdvm$ shadow_start ADF
-cdvm$ shadow_wait ADF               
-
-*dvm$ parallel (i) on BA(i)
-      do i=4,N-3
-         BA(i) = A(i-1)+A(i+1)
-         BD(i)=  D(i-2)+D(i+2)
-         BF(i)=  F(i-3)+F(i+3)         
-      enddo 
-  
-*dvm$ parallel (i) on BA(i), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-          if (BA(i).ne.(C(i-1)+c(i+1))) nloopa=min(nloopa,i)
-          if (BD(i).ne.(C(i-2)+c(i+2))) nloopd=min(nloopd,i)
-          if (BF(i).ne.(C(i-3)+c(i+3))) nloopf=min(nloopf,i)          
-      enddo 
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA1202
-      subroutine SHA1202     
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:),BA(:),BD(:),BF(:),C(:),D(:),F(:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*)   
-cdvm$ shadow D(2:2)
-cdvm$ shadow F(3:3)
-cdvm$ align (I) with BA(I) ::A,D,F,BD,BF
-
-      tname='SHA1202'
-      allocate (BA(N),A(N),BD(N),BF(N),C(N),D(N),F(N))
-cdvm$ shadow_group ADF(A(1:1),D(2:2),F(3:3))
-
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i) on A(i)
-      do i=1,N
-        A(i) = NL+i
-        D(i) =NL+i
-        F(i) =NL+i
-      enddo
-
-cdvm$ shadow_start ADF
-     
-*dvm$ parallel (i) on BA(i),shadow_wait ADF
-      do i=4,N-3
-         BA(i) = A(i-1)+A(i+1)
-         BD(i)=  D(i-2)+D(i+2)
-         BF(i)=  F(i-3)+F(i+3)         
-      enddo 
-    
-*dvm$ parallel (i) on BA(i), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-          if (BA(i).ne.(C(i-1)+c(i+1))) nloopa=min(nloopa,i)
-          if (BD(i).ne.(C(i-2)+c(i+2))) nloopd=min(nloopd,i)
-          if (BF(i).ne.(C(i-3)+c(i+3))) nloopf=min(nloopf,i)          
-      enddo 
-     
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA1203
-   
-
-      subroutine SHA1203
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:),BA(:),BD(:),BF(:),C(:),D(:),F(:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*)    
-cdvm$ shadow D(2:2)
-cdvm$ shadow F(3:3)
-cdvm$ align (I) with BA(I) ::A,D,F,BD,BF
-
-      tname='SHA1203'
-      allocate (BA(N),A(N),BD(N),BF(N),C(N),D(N),F(N))
-cdvm$ shadow_group ADF(A(1:1),D(2:2),F(3:3))
-
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i) on A(i),shadow_start ADF
-      do i=1,N
-        A(i) = NL+i
-        D(i) =NL+i
-        F(i) =NL+i
-      enddo
-
-cdvm$ shadow_wait ADF 
-*dvm$ parallel (i) on BA(i)
-      do i=4,N-3
-         BA(i) = A(i-1)+A(i+1)
-         BD(i)=  D(i-2)+D(i+2)
-         BF(i)=  F(i-3)+F(i+3)
-      enddo 
-     
-*dvm$ parallel (i) on BA(i), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-          if (BA(i).ne.(C(i-1)+c(i+1))) nloopa=min(nloopa,i)
-          if (BD(i).ne.(C(i-2)+c(i+2))) nloopd=min(nloopd,i)
-          if (BF(i).ne.(C(i-3)+c(i+3))) nloopf=min(nloopf,i)
-      enddo 
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-C ---------------------------------------------SHA1204
-      subroutine SHA1204
-      integer, parameter :: N = 16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:),BA(:),BD(:),BF(:),C(:),D(:),F(:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*)     
-cdvm$ shadow D(2:2)
-cdvm$ shadow F(3:3)
-cdvm$ align (I) with BA(I) ::A,D,F,BD,BF
-
-      tname='SHA1204'
-      allocate (BA(N),A(N),BD(N),BF(N),C(N),D(N),F(N))
-cdvm$ shadow_group ADF(A(1:1),D(2:2),F(3:3))
-
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i) on A(i),shadow_start ADF
-      do i=1,N
-        A(i) = NL+i
-        D(i) =NL+i
-        F(i) =NL+i
-      enddo
-
-*dvm$ parallel (i) on BA(i),shadow_wait ADF
-      do i=4,N-3
-         BA(i) = A(i-1)+A(i+1)
-         BD(i)=  D(i-2)+D(i+2)
-         BF(i)=  F(i-3)+F(i+3)
-      enddo 
-      
-*dvm$ parallel (i) on BA(i), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-          if (BA(i).ne.(C(i-1)+c(i+1))) nloopa=min(nloopa,i)
-          if (BD(i).ne.(C(i-2)+c(i+2))) nloopd=min(nloopd,i)
-          if (BF(i).ne.(C(i-3)+c(i+3))) nloopf=min(nloopf,i)          
-      enddo 
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo                   
-      end 
-
-
-       subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha21.fdv
deleted file mode 100644
index ffcefe5..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha21.fdv
+++ /dev/null
@@ -1,297 +0,0 @@
-      program SHA21
-     
-c    TESTING OF THE SHADOW_GROUP DIRECTIVE ,SHADOW_START DIRECRIVE AND
-c    SHADOW_WAIT DIRECTIVE.       
-c    DISTRIBUTED ARRAYES A(N,M),D(N,M),F(N,M) IS TO HAVE DIFFERENT 
-c    SHADOW WIDTH ON BOTH SIDES 
-
-      print *,'===START OF SHA21========================'
-C --------------------------------------------------
-      call sha2101
-C --------------------------------------------------
-      call sha2102
-C --------------------------------------------------
-      call sha2103
-C -------------------------------------------------
-      call sha2104
-C -------------------------------------------------
- 
-C
-C
-      print *,'=== END OF SHA21 ========================= '    
-      end
-C ---------------------------------------------SHA2101
-      subroutine SHA2101
-      integer,parameter :: N = 16,M=16, PN = 16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:),BA(:,:),BD(:,:)
-      integer, allocatable :: BF(:,:),C(:,:),D(:,:),F(:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2)
-cdvm$ shadow F(3:3,3:3)
-cdvm$ align (I,J) with BA(I,J) ::A,D,F,BD,BF
-
-      tname='SHA2101'
-      allocate (BA(N,M),A(N,M),BD(N,M))
-      allocate (BF(N,M),C(N,M),D(N,M),F(N,M))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-          D(i,j) =NL+i+j
-          F(i,j) =NL+i+j
-        enddo
-      enddo
-
-cdvm$ shadow_start ADF
-cdvm$ shadow_wait ADF               
-
-c      print *,'C'
-c      print *,C  
-c      print *,'A'
-c      print *,A
-*dvm$ parallel (i,j) on BA(i,j),NEW(K)
-      do i=4,N-3
-        do j=4,M-3
-          BA(i,j) = A(i-1,j-1)+A(i+1,j+1)
-          BD(i,j)=  D(i-2,j-2)+D(i+2,j+2)
-          BF(i,j)=  F(i-3,j-3)+F(i+3,j+3)         
-        enddo
-      enddo
-  
-c      print *,'BA'
-c      print *,BA
-*dvm$ parallel (i,j) on BA(i,j),NEW(K),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          if (BA(i,j).ne.(C(i-1,j-1)+c(i+1,j+1))) nloopa=min(nloopa,i)
-          if (BD(i,j).ne.(C(i-2,j-2)+c(i+2,j+2))) nloopd=min(nloopd,i)
-          if (BF(i,j).ne.(C(i-3,j-3)+c(i+3,j+3))) nloopf=min(nloopf,i)        
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA2102
-      subroutine SHA2102
-      integer,parameter :: N = 32,M=32,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:),BA(:,:),BD(:,:)
-      integer, allocatable :: BF(:,:),C(:,:),D(:,:),F(:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2)
-cdvm$ shadow F(3:3,3:3)
-cdvm$ align (I,J) with BA(I,J) ::A,D,F,BD,BF
-
-      tname='SHA2102'
-      allocate (BA(N,M),A(N,M),BD(N,M))
-      allocate (BF(N,M),C(N,M),D(N,M),F(N,M))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-          D(i,j) =NL+i+j
-          F(i,j) =NL+i+j
-        enddo
-      enddo                
-
-cdvm$ shadow_start ADF
-
-*dvm$ parallel (i,j) on BA(i,j),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          BA(i,j) = A(i-1,j-1)+A(i+1,j+1)
-          BD(i,j)=  D(i-2,j-2)+D(i+2,j+2)
-          BF(i,j)=  F(i-3,j-3)+F(i+3,j+3)         
-        enddo
-      enddo
-  
-*dvm$ parallel (i,j) on BA(i,j), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          if (BA(i,j).ne.(C(i-1,j-1)+c(i+1,j+1))) nloopa=min(nloopa,i)
-          if (BD(i,j).ne.(C(i-2,j-2)+c(i+2,j+2))) nloopd=min(nloopd,i)
-          if (BF(i,j).ne.(C(i-3,j-3)+c(i+3,j+3))) nloopf=min(nloopf,i)          
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA2103
-   
-
-      subroutine SHA2103
-      integer,parameter :: N = 32,M=32,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:),BA(:,:),BD(:,:)
-      integer, allocatable :: BF(:,:),C(:,:),D(:,:),F(:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2)
-cdvm$ shadow F(3:3,3:3)
-cdvm$ align (I,J) with BA(I,J) ::A,D,F,BD,BF
-
-      tname='SHA2103'
-      allocate (BA(N,M),A(N,M),BD(N,M))
-      allocate (BF(N,M),C(N,M),D(N,M),F(N,M))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j) on A(i,j),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-          D(i,j) =NL+i+j
-          F(i,j) =NL+i+j
-        enddo
-      enddo                
-    
-cdvm$ shadow_wait ADF 
-
-*dvm$ parallel (i,j) on BA(i,j)
-      do i=4,N-3
-        do j=4,M-3
-          BA(i,j) = A(i-1,j-1)+A(i+1,j+1)
-          BD(i,j)=  D(i-2,j-2)+D(i+2,j+2)
-          BF(i,j)=  F(i-3,j-3)+F(i+3,j+3)         
-         enddo
-      enddo
-  
-*dvm$ parallel (i,j) on BA(i,j), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          if (BA(i,j).ne.(C(i-1,j-1)+c(i+1,j+1))) nloopa=min(nloopa,i)
-          if (BD(i,j).ne.(C(i-2,j-2)+c(i+2,j+2))) nloopd=min(nloopd,i)
-          if (BF(i,j).ne.(C(i-3,j-3)+c(i+3,j+3))) nloopf=min(nloopf,i)          
-        enddo
-      enddo     
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-C ---------------------------------------------SHA2104
-      subroutine SHA2104
-      integer,parameter :: N = 32,M=32,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:),BA(:,:),BD(:,:)
-      integer, allocatable :: BF(:,:),C(:,:),D(:,:),F(:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2)
-cdvm$ shadow F(3:3,3:3)
-cdvm$ align (I,J) with BA(I,J) ::A,D,F,BD,BF
-
-      tname='SHA2104'
-      allocate (BA(N,M),A(N,M),BD(N,M))
-      allocate (BF(N,M),C(N,M),D(N,M),F(N,M))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i,j) on A(i,j),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-          D(i,j) =NL+i+j
-          F(i,j) =NL+i+j
-        enddo
-      enddo                
-
-*dvm$ parallel (i,j) on BA(i,j),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          BA(i,j) = A(i-1,j-1)+A(i+1,j+1)
-          BD(i,j)=  D(i-2,j-2)+D(i+2,j+2)
-          BF(i,j)=  F(i-3,j-3)+F(i+3,j+3)         
-        enddo
-      enddo
-  
-*dvm$ parallel (i,j) on BA(i,j), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          if (BA(i,j).ne.(C(i-1,j-1)+c(i+1,j+1))) nloopa=min(nloopa,i)
-          if (BD(i,j).ne.(C(i-2,j-2)+c(i+2,j+2))) nloopd=min(nloopd,i)
-          if (BF(i,j).ne.(C(i-3,j-3)+c(i+3,j+3))) nloopf=min(nloopf,i)          
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-C -----------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          AR(i,j) = NL+i+j
-        enddo
-      enddo
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha22.fdv
deleted file mode 100644
index 48ef178..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha22.fdv
+++ /dev/null
@@ -1,297 +0,0 @@
-      program SHA22
-     
-c    TESTING OF THE SHADOW_GROUP DIRECTIVE ,SHADOW_START DIRECRIVE AND
-c    SHADOW_WAIT DIRECTIVE.       
-c    DISTRIBUTED ARRAYES A(N,M),D(N,M),F(N,M) IS TO HAVE DIFFERENT 
-c    SHADOW WIDTH ON BOTH SIDES 
-
-      print *,'===START OF SHA22========================'
-C --------------------------------------------------
-      call sha2201
-C --------------------------------------------------
-      call sha2202
-C --------------------------------------------------
-      call sha2203
-C -------------------------------------------------
-      call sha2204
-C -------------------------------------------------
- 
-C
-C
-      print *,'=== END OF SHA22 ========================= '    
-      end
-C ---------------------------------------------SHA2201
-      subroutine SHA2201
-      integer,parameter :: N = 16,M=16, PN = 16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:),BA(:,:),BD(:,:)
-      integer, allocatable :: BF(:,:),C(:,:),D(:,:),F(:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,*)     
-cdvm$ shadow D(2:2,2:2)
-cdvm$ shadow F(3:3,3:3)
-cdvm$ align (I,J) with BA(I,J) ::A,D,F,BD,BF
-
-      tname='SHA2201'
-      allocate (BA(N,M),A(N,M),BD(N,M))
-      allocate (BF(N,M),C(N,M),D(N,M),F(N,M))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-          D(i,j) =NL+i+j
-          F(i,j) =NL+i+j
-        enddo
-      enddo
-
-cdvm$ shadow_start ADF
-cdvm$ shadow_wait ADF               
-
-c      print *,'C'
-c      print *,C  
-c      print *,'A'
-c      print *,A
-*dvm$ parallel (i,j) on BA(i,j),NEW(K)
-      do i=4,N-3
-        do j=4,M-3
-          BA(i,j) = A(i-1,j-1)+A(i+1,j+1)
-          BD(i,j)=  D(i-2,j-2)+D(i+2,j+2)
-          BF(i,j)=  F(i-3,j-3)+F(i+3,j+3)         
-        enddo
-      enddo
-  
-c      print *,'BA'
-c      print *,BA
-*dvm$ parallel (i,j) on BA(i,j),NEW(K),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          if (BA(i,j).ne.(C(i-1,j-1)+c(i+1,j+1))) nloopa=min(nloopa,i)
-          if (BD(i,j).ne.(C(i-2,j-2)+c(i+2,j+2))) nloopd=min(nloopd,i)
-          if (BF(i,j).ne.(C(i-3,j-3)+c(i+3,j+3))) nloopf=min(nloopf,i)        
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA2202
-      subroutine SHA2202
-      integer,parameter :: N = 32,M=32,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:),BA(:,:),BD(:,:)
-      integer, allocatable :: BF(:,:),C(:,:),D(:,:),F(:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*,BLOCK)     
-cdvm$ shadow D(2:2,2:2)
-cdvm$ shadow F(3:3,3:3)
-cdvm$ align (I,J) with BA(I,J) ::A,D,F,BD,BF
-
-      tname='SHA2202'
-      allocate (BA(N,M),A(N,M),BD(N,M))
-      allocate (BF(N,M),C(N,M),D(N,M),F(N,M))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j) on A(i,j)
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-          D(i,j) =NL+i+j
-          F(i,j) =NL+i+j
-        enddo
-      enddo                
-
-cdvm$ shadow_start ADF
-
-*dvm$ parallel (i,j) on BA(i,j),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          BA(i,j) = A(i-1,j-1)+A(i+1,j+1)
-          BD(i,j)=  D(i-2,j-2)+D(i+2,j+2)
-          BF(i,j)=  F(i-3,j-3)+F(i+3,j+3)         
-        enddo
-      enddo
-  
-*dvm$ parallel (i,j) on BA(i,j), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          if (BA(i,j).ne.(C(i-1,j-1)+c(i+1,j+1))) nloopa=min(nloopa,i)
-          if (BD(i,j).ne.(C(i-2,j-2)+c(i+2,j+2))) nloopd=min(nloopd,i)
-          if (BF(i,j).ne.(C(i-3,j-3)+c(i+3,j+3))) nloopf=min(nloopf,i)          
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA2203
-   
-
-      subroutine SHA2203
-      integer,parameter :: N = 32,M=32,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:),BA(:,:),BD(:,:)
-      integer, allocatable :: BF(:,:),C(:,:),D(:,:),F(:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*,BLOCK)     
-cdvm$ shadow D(2:2,2:2)
-cdvm$ shadow F(3:3,3:3)
-cdvm$ align (I,J) with BA(I,J) ::A,D,F,BD,BF
-
-      tname='SHA2203'
-      allocate (BA(N,M),A(N,M),BD(N,M))
-      allocate (BF(N,M),C(N,M),D(N,M),F(N,M))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j) on A(i,j),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-          D(i,j) =NL+i+j
-          F(i,j) =NL+i+j
-        enddo
-      enddo                
-    
-cdvm$ shadow_wait ADF 
-
-*dvm$ parallel (i,j) on BA(i,j)
-      do i=4,N-3
-        do j=4,M-3
-          BA(i,j) = A(i-1,j-1)+A(i+1,j+1)
-          BD(i,j)=  D(i-2,j-2)+D(i+2,j+2)
-          BF(i,j)=  F(i-3,j-3)+F(i+3,j+3)         
-         enddo
-      enddo
-  
-*dvm$ parallel (i,j) on BA(i,j), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          if (BA(i,j).ne.(C(i-1,j-1)+c(i+1,j+1))) nloopa=min(nloopa,i)
-          if (BD(i,j).ne.(C(i-2,j-2)+c(i+2,j+2))) nloopd=min(nloopd,i)
-          if (BF(i,j).ne.(C(i-3,j-3)+c(i+3,j+3))) nloopf=min(nloopf,i)          
-        enddo
-      enddo     
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-C ---------------------------------------------SHA2204
-      subroutine SHA2204
-      integer,parameter :: N = 32,M=32,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:),BA(:,:),BD(:,:)
-      integer, allocatable :: BF(:,:),C(:,:),D(:,:),F(:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*,BLOCK)     
-cdvm$ shadow D(2:2,2:2)
-cdvm$ shadow F(3:3,3:3)
-cdvm$ align (I,J) with BA(I,J) ::A,D,F,BD,BF
-
-      tname='SHA2204'
-      allocate (BA(N,M),A(N,M),BD(N,M))
-      allocate (BF(N,M),C(N,M),D(N,M),F(N,M))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i,j) on A(i,j),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-          D(i,j) =NL+i+j
-          F(i,j) =NL+i+j
-        enddo
-      enddo                
-
-*dvm$ parallel (i,j) on BA(i,j),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          BA(i,j) = A(i-1,j-1)+A(i+1,j+1)
-          BD(i,j)=  D(i-2,j-2)+D(i+2,j+2)
-          BF(i,j)=  F(i-3,j-3)+F(i+3,j+3)         
-        enddo
-      enddo
-  
-*dvm$ parallel (i,j) on BA(i,j), reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          if (BA(i,j).ne.(C(i-1,j-1)+c(i+1,j+1))) nloopa=min(nloopa,i)
-          if (BD(i,j).ne.(C(i-2,j-2)+c(i+2,j+2))) nloopd=min(nloopd,i)
-          if (BF(i,j).ne.(C(i-3,j-3)+c(i+3,j+3))) nloopf=min(nloopf,i)          
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-C -----------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          AR(i,j) = NL+i+j
-        enddo
-      enddo
-      end 
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha31.fdv
deleted file mode 100644
index c694075..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha31.fdv
+++ /dev/null
@@ -1,335 +0,0 @@
-      program SHA31
-     
-c    TESTING OF THE SHADOW_GROUP DIRECTIVE ,SHADOW_START DIRECRIVE AND
-c    SHADOW_WAIT DIRECTIVE.       
-c    DISTRIBUTED ARRAYES A(N,M,K),D(N,M,K),F(N,M,K) IS TO HAVE DIFFERENT 
-c    SHADOW WIDTH ON BOTH SIDES 
-
-      print *,'===START OF SHA31========================'
-C --------------------------------------------------
-      call sha3101
-C --------------------------------------------------
-      call sha3102
-C --------------------------------------------------
-      call sha3103
-C -------------------------------------------------
-      call sha3104
-C -------------------------------------------------
- 
-C
-C
-      print *,'=== END OF SHA31 ========================= '    
-      end
-C ---------------------------------------------SHA3101
-      subroutine SHA3101
-      integer, parameter :: N = 16,M=16, K=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:),BA(:,:,:),BD(:,:,:)
-      integer, allocatable :: BF(:,:,:),C(:,:,:),D(:,:,:),F(:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3)
-cdvm$ align (I,J,II) with BA(I,J,II) ::A,D,F,BD,BF
-
-      tname='SHA3101'
-      allocate (BA(N,M,K),A(N,M,K),BD(N,M,K))
-      allocate (BF(N,M,K),C(N,M,K),D(N,M,K),F(N,M,K))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-            D(i,j,ii) =NL+i+j+ii
-            F(i,j,ii) =NL+i+j+ii
-          enddo
-        enddo
-      enddo                                                
-
-cdvm$ shadow_start ADF
-cdvm$ shadow_wait ADF               
-
-c      print *,'C'
-c      print *,C  
-c      print *,'A'
-c      print *,A
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            BA(i,j,ii) = A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)
-            BD(i,j,ii)=  D(i-2,j-2,ii-2)+D(i+2,j+2,ii+2)
-            BF(i,j,ii)=  F(i-3,j-3,ii-3)+F(i+3,j+3,ii+3)
-          enddo  
-        enddo
-      enddo 
-c      print *,'BA'
-c      print *,BA
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            if (BA(i,j,ii).ne.(C(i-1,j-1,ii-1)+c(i+1,j+1,ii+1)))
-     *    nloopa=min(nloopa,i)
-            if (BD(i,j,ii).ne.(C(i-2,j-2,ii-2)+c(i+2,j+2,ii+2)))
-     *    nloopd=min(nloopd,i)
-            if (BF(i,j,ii).ne.(C(i-3,j-3,ii-3)+c(i+3,j+3,ii+3)))
-     *    nloopf=min(nloopf,i)
-          enddo
-        enddo
-      enddo 
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA3102
-      subroutine SHA3102
-      integer, parameter :: N = 16,M=16, K=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:),BA(:,:,:),BD(:,:,:)
-      integer, allocatable :: BF(:,:,:),C(:,:,:),D(:,:,:),F(:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3)
-cdvm$ align (I,J,II) with BA(I,J,II) ::A,D,F,BD,BF
-
-      tname='SHA3102'
-      allocate (BA(N,M,K),A(N,M,K),BD(N,M,K))
-      allocate (BF(N,M,K),C(N,M,K),D(N,M,K),F(N,M,K))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-            D(i,j,ii) =NL+i+j+ii
-            F(i,j,ii) =NL+i+j+ii
-          enddo
-        enddo
-      enddo                                                
-
-cdvm$ shadow_start ADF
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            BA(i,j,ii) = A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)
-            BD(i,j,ii)=  D(i-2,j-2,ii-2)+D(i+2,j+2,ii+2)
-            BF(i,j,ii)=  F(i-3,j-3,ii-3)+F(i+3,j+3,ii+3)
-          enddo  
-        enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            if (BA(i,j,ii).ne.(C(i-1,j-1,ii-1)+c(i+1,j+1,ii+1)))
-     *    nloopa=min(nloopa,i)
-            if (BD(i,j,ii).ne.(C(i-2,j-2,ii-2)+c(i+2,j+2,ii+2)))
-     *    nloopd=min(nloopd,i)
-            if (BF(i,j,ii).ne.(C(i-3,j-3,ii-3)+c(i+3,j+3,ii+3)))
-     *    nloopf=min(nloopf,i)
-          enddo   
-        enddo
-      enddo
-
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-     
-C ---------------------------------------------SHA3103
-      subroutine SHA3103
-      integer, parameter :: N = 16,M=16, K=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:),BA(:,:,:),BD(:,:,:)
-      integer, allocatable :: BF(:,:,:),C(:,:,:),D(:,:,:),F(:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3)
-cdvm$ align (I,J,II) with BA(I,J,II) ::A,D,F,BD,BF
-
-      tname='SHA3103'
-      allocate (BA(N,M,K),A(N,M,K),BD(N,M,K))
-      allocate (BF(N,M,K),C(N,M,K),D(N,M,K),F(N,M,K))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-            D(i,j,ii) =NL+i+j+ii
-            F(i,j,ii) =NL+i+j+ii
-          enddo
-        enddo
-      enddo                                                
-
-cdvm$ shadow_wait ADF 
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            BA(i,j,ii) = A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)
-            BD(i,j,ii)=  D(i-2,j-2,ii-2)+D(i+2,j+2,ii+2)
-            BF(i,j,ii)=  F(i-3,j-3,ii-3)+F(i+3,j+3,ii+3)
-          enddo  
-        enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            if (BA(i,j,ii).ne.(C(i-1,j-1,ii-1)+c(i+1,j+1,ii+1)))
-     *    nloopa=min(nloopa,i)
-            if (BD(i,j,ii).ne.(C(i-2,j-2,ii-2)+c(i+2,j+2,ii+2)))
-     *    nloopd=min(nloopd,i)
-            if (BF(i,j,ii).ne.(C(i-3,j-3,ii-3)+c(i+3,j+3,ii+3)))
-     *    nloopf=min(nloopf,i)
-          enddo   
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-     
-C ---------------------------------------------SHA3104
-      subroutine SHA3104
-      integer, parameter :: N = 16,M=16, K=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:),BA(:,:,:),BD(:,:,:)
-      integer, allocatable :: BF(:,:,:),C(:,:,:),D(:,:,:),F(:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3)
-cdvm$ align (I,J,II) with BA(I,J,II) ::A,D,F,BD,BF
-
-      tname='SHA3104'
-      allocate (BA(N,M,K),A(N,M,K),BD(N,M,K))
-      allocate (BF(N,M,K),C(N,M,K),D(N,M,K),F(N,M,K))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-            D(i,j,ii) =NL+i+j+ii
-            F(i,j,ii) =NL+i+j+ii
-          enddo
-        enddo
-      enddo                                                
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            BA(i,j,ii) = A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)
-            BD(i,j,ii)=  D(i-2,j-2,ii-2)+D(i+2,j+2,ii+2)
-            BF(i,j,ii)=  F(i-3,j-3,ii-3)+F(i+3,j+3,ii+3)
-          enddo  
-        enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            if (BA(i,j,ii).ne.(C(i-1,j-1,ii-1)+c(i+1,j+1,ii+1)))
-     *    nloopa=min(nloopa,i)
-            if (BD(i,j,ii).ne.(C(i-2,j-2,ii-2)+c(i+2,j+2,ii+2)))
-     *    nloopd=min(nloopd,i)
-            if (BF(i,j,ii).ne.(C(i-3,j-3,ii-3)+c(i+3,j+3,ii+3)))
-     *    nloopf=min(nloopf,i)
-          enddo   
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,BA,BD,BF,C,D,F)
-
-      end
-C -----------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo                
-      end      
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha32.fdv
deleted file mode 100644
index e8b6ada..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha32.fdv
+++ /dev/null
@@ -1,335 +0,0 @@
-      program SHA32
-     
-c    TESTING OF THE SHADOW_GROUP DIRECTIVE ,SHADOW_START DIRECRIVE AND
-c    SHADOW_WAIT DIRECTIVE.       
-c    DISTRIBUTED ARRAYES A(N,M,K),D(N,M,K),F(N,M,K) IS TO HAVE DIFFERENT 
-c    SHADOW WIDTH ON BOTH SIDES 
-
-      print *,'===START OF SHA32========================'
-C --------------------------------------------------
-      call sha3201
-C --------------------------------------------------
-      call sha3202
-C --------------------------------------------------
-      call sha3203
-C -------------------------------------------------
-      call sha3204
-C -------------------------------------------------
- 
-C
-C
-      print *,'=== END OF SHA32 ========================= '    
-      end
-C ---------------------------------------------SHA3201
-      subroutine SHA3201
-      integer, parameter :: N = 16,M=16, K=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:),BA(:,:,:),BD(:,:,:)
-      integer, allocatable :: BF(:,:,:),C(:,:,:),D(:,:,:),F(:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,*)     
-cdvm$ shadow D(2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3)
-cdvm$ align (I,J,II) with BA(I,J,II) ::A,D,F,BD,BF
-
-      tname='SHA3201'
-      allocate (BA(N,M,K),A(N,M,K),BD(N,M,K))
-      allocate (BF(N,M,K),C(N,M,K),D(N,M,K),F(N,M,K))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-            D(i,j,ii) =NL+i+j+ii
-            F(i,j,ii) =NL+i+j+ii
-          enddo
-        enddo
-      enddo                                                
-
-cdvm$ shadow_start ADF
-cdvm$ shadow_wait ADF               
-
-c      print *,'C'
-c      print *,C  
-c      print *,'A'
-c      print *,A
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            BA(i,j,ii) = A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)
-            BD(i,j,ii)=  D(i-2,j-2,ii-2)+D(i+2,j+2,ii+2)
-            BF(i,j,ii)=  F(i-3,j-3,ii-3)+F(i+3,j+3,ii+3)
-          enddo  
-        enddo
-      enddo 
-c      print *,'BA'
-c      print *,BA
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            if (BA(i,j,ii).ne.(C(i-1,j-1,ii-1)+c(i+1,j+1,ii+1)))
-     *    nloopa=min(nloopa,i)
-            if (BD(i,j,ii).ne.(C(i-2,j-2,ii-2)+c(i+2,j+2,ii+2)))
-     *    nloopd=min(nloopd,i)
-            if (BF(i,j,ii).ne.(C(i-3,j-3,ii-3)+c(i+3,j+3,ii+3)))
-     *    nloopf=min(nloopf,i)
-          enddo
-        enddo
-      enddo 
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-
-C ---------------------------------------------SHA3202
-      subroutine SHA3202
-      integer, parameter :: N = 16,M=16, K=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:),BA(:,:,:),BD(:,:,:)
-      integer, allocatable :: BF(:,:,:),C(:,:,:),D(:,:,:),F(:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,*,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3)
-cdvm$ align (I,J,II) with BA(I,J,II) ::A,D,F,BD,BF
-
-      tname='SHA3202'
-      allocate (BA(N,M,K),A(N,M,K),BD(N,M,K))
-      allocate (BF(N,M,K),C(N,M,K),D(N,M,K),F(N,M,K))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-            D(i,j,ii) =NL+i+j+ii
-            F(i,j,ii) =NL+i+j+ii
-          enddo
-        enddo
-      enddo                                                
-
-cdvm$ shadow_start ADF
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            BA(i,j,ii) = A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)
-            BD(i,j,ii)=  D(i-2,j-2,ii-2)+D(i+2,j+2,ii+2)
-            BF(i,j,ii)=  F(i-3,j-3,ii-3)+F(i+3,j+3,ii+3)
-          enddo  
-        enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            if (BA(i,j,ii).ne.(C(i-1,j-1,ii-1)+c(i+1,j+1,ii+1)))
-     *    nloopa=min(nloopa,i)
-            if (BD(i,j,ii).ne.(C(i-2,j-2,ii-2)+c(i+2,j+2,ii+2)))
-     *    nloopd=min(nloopd,i)
-            if (BF(i,j,ii).ne.(C(i-3,j-3,ii-3)+c(i+3,j+3,ii+3)))
-     *    nloopf=min(nloopf,i)
-          enddo   
-        enddo
-      enddo
-
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-     
-C ---------------------------------------------SHA3203
-      subroutine SHA3203
-      integer, parameter :: N = 16,M=16, K=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:),BA(:,:,:),BD(:,:,:)
-      integer, allocatable :: BF(:,:,:),C(:,:,:),D(:,:,:),F(:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3)
-cdvm$ align (I,J,II) with BA(I,J,II) ::A,D,F,BD,BF
-
-      tname='SHA3203'
-      allocate (BA(N,M,K),A(N,M,K),BD(N,M,K))
-      allocate (BF(N,M,K),C(N,M,K),D(N,M,K),F(N,M,K))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-            D(i,j,ii) =NL+i+j+ii
-            F(i,j,ii) =NL+i+j+ii
-          enddo
-        enddo
-      enddo                                                
-
-cdvm$ shadow_wait ADF 
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            BA(i,j,ii) = A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)
-            BD(i,j,ii)=  D(i-2,j-2,ii-2)+D(i+2,j+2,ii+2)
-            BF(i,j,ii)=  F(i-3,j-3,ii-3)+F(i+3,j+3,ii+3)
-          enddo  
-        enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            if (BA(i,j,ii).ne.(C(i-1,j-1,ii-1)+c(i+1,j+1,ii+1)))
-     *    nloopa=min(nloopa,i)
-            if (BD(i,j,ii).ne.(C(i-2,j-2,ii-2)+c(i+2,j+2,ii+2)))
-     *    nloopd=min(nloopd,i)
-            if (BF(i,j,ii).ne.(C(i-3,j-3,ii-3)+c(i+3,j+3,ii+3)))
-     *    nloopf=min(nloopf,i)
-          enddo   
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,BA,BD,BF,C,D,F)
-      
-      end
-     
-C ---------------------------------------------SHA3204
-      subroutine SHA3204
-      integer, parameter :: N = 16,M=16, K=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:),BA(:,:,:),BD(:,:,:)
-      integer, allocatable :: BF(:,:,:),C(:,:,:),D(:,:,:),F(:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,*)     
-cdvm$ shadow D(2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3)
-cdvm$ align (I,J,II) with BA(I,J,II) ::A,D,F,BD,BF
-
-      tname='SHA3204'
-      allocate (BA(N,M,K),A(N,M,K),BD(N,M,K))
-      allocate (BF(N,M,K),C(N,M,K),D(N,M,K),F(N,M,K))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-            D(i,j,ii) =NL+i+j+ii
-            F(i,j,ii) =NL+i+j+ii
-          enddo
-        enddo
-      enddo                                                
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            BA(i,j,ii) = A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)
-            BD(i,j,ii)=  D(i-2,j-2,ii-2)+D(i+2,j+2,ii+2)
-            BF(i,j,ii)=  F(i-3,j-3,ii-3)+F(i+3,j+3,ii+3)
-          enddo  
-        enddo
-      enddo 
-
-*dvm$ parallel (i,j,ii) on BA(i,j,ii),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            if (BA(i,j,ii).ne.(C(i-1,j-1,ii-1)+c(i+1,j+1,ii+1)))
-     *    nloopa=min(nloopa,i)
-            if (BD(i,j,ii).ne.(C(i-2,j-2,ii-2)+c(i+2,j+2,ii+2)))
-     *    nloopd=min(nloopd,i)
-            if (BF(i,j,ii).ne.(C(i-3,j-3,ii-3)+c(i+3,j+3,ii+3)))
-     *    nloopf=min(nloopf,i)
-          enddo   
-        enddo
-      enddo
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,BA,BD,BF,C,D,F)
-
-      end
-C -----------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo                
-      end      
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha41.fdv
deleted file mode 100644
index 0f74676..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha41.fdv
+++ /dev/null
@@ -1,364 +0,0 @@
-      program SHA41
-     
-c    TESTING OF THE SHADOW_GROUP DIRECTIVE ,SHADOW_START DIRECRIVE AND
-c    SHADOW_WAIT DIRECTIVE.       
-c    DISTRIBUTED ARRAYES A(N,M,K,L),D(N,M,K,L),F(N,M,K,L)
-c    IS TO HAVE DIFFERENT SHADOW WIDTH ON BOTH SIDES 
-
-      print *,'===START OF SHA41========================'
-C --------------------------------------------------
-      call sha4101
-C --------------------------------------------------
-      call sha4102
-C --------------------------------------------------
-      call sha4103
-C -------------------------------------------------
-      call sha4104
-C -------------------------------------------------
- 
-C
-C
-      print *,'=== END OF SHA41 ========================= '    
-      end
-C ---------------------------------------------------------SHA4101
-      subroutine SHA4101
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4101'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-
-cdvm$ shadow_start ADF
-cdvm$ shadow_wait ADF               
-c      print *,'C'
-c      print *,C  
-c      print *,'A'
-c      print *,A
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-             BA(i,j,ii,jj)=A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-             BD(i,j,ii,jj)= D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-             BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C ------------------------------------------------------------SHA4102
-      subroutine SHA4102
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4102'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-
-cdvm$ shadow_start ADF
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            BA(i,j,ii,jj) = A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-            BD(i,j,ii,jj)=  D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-            BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C --------------------------------------------------------------SHA4103
-      subroutine SHA4103
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4103'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-                                        
-cdvm$ shadow_wait ADF 
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            BA(i,j,ii,jj) = A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-            BD(i,j,ii,jj)=  D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-            BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-C --------------------------------------------------------------SHA4104
-      subroutine SHA4104
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4104'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            BA(i,j,ii,jj) = A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-            BD(i,j,ii,jj)=  D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-            BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-      end      
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha42.fdv
deleted file mode 100644
index f886ad0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha42.fdv
+++ /dev/null
@@ -1,364 +0,0 @@
-      program SHA42
-     
-c    TESTING OF THE SHADOW_GROUP DIRECTIVE ,SHADOW_START DIRECRIVE AND
-c    SHADOW_WAIT DIRECTIVE.       
-c    DISTRIBUTED ARRAYES A(N,M,K,L),D(N,M,K,L),F(N,M,K,L)
-c    IS TO HAVE DIFFERENT SHADOW WIDTH ON BOTH SIDES 
-
-      print *,'===START OF SHA42========================'
-C --------------------------------------------------
-      call sha4201
-C --------------------------------------------------
-      call sha4202
-C --------------------------------------------------
-      call sha4203
-C -------------------------------------------------
-      call sha4204
-C -------------------------------------------------
- 
-C
-C
-      print *,'=== END OF SHA42 ========================= '    
-      end
-C ---------------------------------------------------------SHA4201
-      subroutine SHA4201
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*,*,*,*)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4201'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-
-cdvm$ shadow_start ADF
-cdvm$ shadow_wait ADF               
-c      print *,'C'
-c      print *,C  
-c      print *,'A'
-c      print *,A
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-             BA(i,j,ii,jj)=A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-             BD(i,j,ii,jj)= D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-             BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C ------------------------------------------------------------SHA4202
-      subroutine SHA4202
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*,*,*,*)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4202'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-
-cdvm$ shadow_start ADF
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            BA(i,j,ii,jj) = A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-            BD(i,j,ii,jj)=  D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-            BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C --------------------------------------------------------------SHA4203
-      subroutine SHA4203
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*,*,*,*)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4203'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-                                        
-cdvm$ shadow_wait ADF 
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            BA(i,j,ii,jj) = A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-            BD(i,j,ii,jj)=  D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-            BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-C --------------------------------------------------------------SHA4204
-      subroutine SHA4204
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*,*,*,*)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4204'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            BA(i,j,ii,jj) = A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-            BD(i,j,ii,jj)=  D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-            BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-      end      
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha43.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha43.fdv
deleted file mode 100644
index f32afd9..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOWA/sha43.fdv
+++ /dev/null
@@ -1,364 +0,0 @@
-      program SHA43
-     
-c    TESTING OF THE SHADOW_GROUP DIRECTIVE ,SHADOW_START DIRECRIVE AND
-c    SHADOW_WAIT DIRECTIVE.       
-c    DISTRIBUTED ARRAYES A(N,M,K,L),D(N,M,K,L),F(N,M,K,L)
-c    IS TO HAVE DIFFERENT SHADOW WIDTH ON BOTH SIDES 
-
-      print *,'===START OF SHA43========================'
-C --------------------------------------------------
-      call sha4301
-C --------------------------------------------------
-      call sha4302
-C --------------------------------------------------
-      call sha4303
-C -------------------------------------------------
-      call sha4304
-C -------------------------------------------------
- 
-C
-C
-      print *,'=== END OF SHA43 ========================= '    
-      end
-C ---------------------------------------------------------SHA4301
-      subroutine SHA4301
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,BLOCK,*)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4301'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-
-cdvm$ shadow_start ADF
-cdvm$ shadow_wait ADF               
-c      print *,'C'
-c      print *,C  
-c      print *,'A'
-c      print *,A
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-             BA(i,j,ii,jj)=A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-             BD(i,j,ii,jj)= D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-             BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C ------------------------------------------------------------SHA4302
-      subroutine SHA4302
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,BLOCK,*,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4302'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-
-cdvm$ shadow_start ADF
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            BA(i,j,ii,jj) = A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-            BD(i,j,ii,jj)=  D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-            BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-C --------------------------------------------------------------SHA4303
-      subroutine SHA4303
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(BLOCK,*,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4303'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-                                        
-cdvm$ shadow_wait ADF 
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            BA(i,j,ii,jj) = A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-            BD(i,j,ii,jj)=  D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-            BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-      
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-C --------------------------------------------------------------SHA4304
-      subroutine SHA4304
-      integer, parameter :: N = 16,M=16, K=16,L=16,NL=1000
-      character*7 tname 
-      integer, allocatable :: A(:,:,:,:),BA(:,:,:,:),BD(:,:,:,:)
-      integer, allocatable :: BF(:,:,:,:),C(:,:,:,:),D(:,:,:,:)
-      integer, allocatable :: F(:,:,:,:)
-      integer nloop 
-                      
-cdvm$ distribute BA(*,BLOCK,BLOCK,BLOCK)     
-cdvm$ shadow D(2:2,2:2,2:2,2:2)
-cdvm$ shadow F(3:3,3:3,3:3,3:3)
-cdvm$ align (I,J,II,JJ) with BA(I,J,II,JJ) ::A,D,F,BD,BF
-
-      tname='SHA4304'
-      allocate (BA(N,M,K,L),A(N,M,K,L),BD(N,M,K,L))
-      allocate (BF(N,M,K,L),C(N,M,K,L),D(N,M,K,L),F(N,M,K,L))
-cdvm$ shadow_group ADF(A(CORNER),D(CORNER),F(CORNER))
-
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopa=NL
-      nloopd=NL
-      nloopf=NL
-
-*dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_start ADF
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-              D(i,j,ii,jj) =NL+i+j+ii+jj
-              F(i,j,ii,jj) =NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),shadow_wait ADF
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            BA(i,j,ii,jj) = A(i-1,j-1,ii-1,jj-1)+A(i+1,j+1,ii+1,jj+1)
-            BD(i,j,ii,jj)=  D(i-2,j-2,ii-2,jj-2)+D(i+2,j+2,ii+2,jj+2)
-            BF(i,j,ii,jj)=  F(i-3,j-3,ii-3,jj-3)+F(i+3,j+3,ii+3,jj+3)
-            enddo   
-          enddo
-        enddo  
-      enddo
-c      print *,'BA'
-c      print *,BA
-
-*dvm$ parallel (i,j,ii,jj) on BA(i,j,ii,jj),reduction( min( nloopa),
-*dvm$* min(nloopd),min(nloopf) )
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3 
-            do jj=4,L-3
-      if (BA(i,j,ii,jj).ne.(C(i-1,j-1,ii-1,jj-1)+c(i+1,j+1,ii+1,jj+1)))
-     *     nloopa=min(nloopa,i)
-      if (BD(i,j,ii,jj).ne.(C(i-2,j-2,ii-2,jj-2)+c(i+2,j+2,ii+2,jj+2))) 
-     *     nloopd=min(nloopd,i)
-      if (BF(i,j,ii,jj).ne.(C(i-3,j-3,ii-3,jj-3)+c(i+3,j+3,ii+3,jj+3)))
-     *     nloopf=min(nloopf,i)
-            enddo
-          enddo
-        enddo
-      enddo               
-
-      if ((nloopa .eq.NL).and.(nloopd.eq.NL).and.(nloopf.eq.NL)) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      
-      end
-
-
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo               
-      end      
-
-      subroutine ansyes(name)
-      character*7 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*7 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc11.fdv
deleted file mode 100644
index 450b018..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc11.fdv
+++ /dev/null
@@ -1,829 +0,0 @@
-      program SC11
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_COMPUTE CLAUSE       
-c    DISTRIBUTED ARRAY A(N) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SC11========================'
-C --------------------------------------------------
-      call sc1101
-C --------------------------------------------------
-      call sc1102
-C --------------------------------------------------
-      call sc1103
-C -------------------------------------------------
-      call sc1104
-C -------------------------------------------------
-      call sc1105
-C -------------------------------------------------
-      call sc1106
-C --------------------------------------------------
-      call sc1107
-C --------------------------------------------------
-      call sc1108
-C --------------------------------------------------
-      call sc1109
-C -------------------------------------------------
-      call sc1110
-C -------------------------------------------------
-      call sc1111
-C -------------------------------------------------
-      call sc1112
-C ------------------------------------------------- 
-      call sc1113
-C --------------------------------------------------
-      call sc1114
-C --------------------------------------------------
-      call sc1115
-C -------------------------------------------------
-      call sc1116
-C -------------------------------------------------
-      call sc1117
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF SC11 ========================= '    
-      end
-C ---------------------------------------------SC1101
-      subroutine SC1101
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                      
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SC1101'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute    
-
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i)
-      do i=2,N-1
-         B(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(C(i-1)+C(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-      
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end
-C ---------------------------------------------SC1102     
-      subroutine SC1102
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                      
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SC1102'
-      allocate (B(N),A(N),C(N))     
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute (A(1:1))
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i)
-      do i=2,N-1
-         B(i) = A(i-1)+A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(C(i-1)+C(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end
-C -----------------------------------------SC1103      
-      subroutine SC1103
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SC1103'
-      allocate (B(N),A(N),C(N))            
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute(A(0:1))
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i)
-      do i=2,N-1
-         B(i) = A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.(C(i+1))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-     
-      end
-      
-C ------------------------------------------SC1104   
-      subroutine SC1104
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-
-      tname='SC1104'
-      allocate (B(N),A(N),C(N))      
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute(A(1:0))
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i)
-      do i=2,N
-         B(i) = A(i-1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N
-          if (B(i).ne.C(i-1)) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-         
-      end
-      
-C ------------------------------------------SC1105   
-      subroutine SC1105
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(0:1)
-
-      tname='SC1105'     
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute(A(0:1))
-      do i=1,N
-        A(i) = NL+i
-      enddo
-
-!dvm$ parallel (i) on B(i)
-      do i=2,N-1
-         B(i) = A(i+1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-1
-          if (B(i).ne.C(i+1)) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)  
-    
-      end
-      
-C --------------------------------------------SC1106  
-         
-      subroutine SC1106
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(1:0)
-
-      tname='SC1106'
-      allocate (B(N),A(N),C(N))          
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute(A(1:0))
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=2,N
-         B(i) = A(i-1)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N
-          if (B(i).ne.C(i-1)) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)                
-
-      end
-C -------------------------------------------SC1107   
-         
-      subroutine SC1107
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:2)      
-
-      tname='SC1107'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i) ,shadow_compute(A(2:2))
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=3,N-2
-         B(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=3,N-2
-          if (B(i).ne.(C(i-1)+C(i+1)+C(i-2)+C(i+2))) nloop=min(nloop,i)
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C)   
-      
-      end      
-C -------------------------------------------SC1108   
-         
-      subroutine SC1108
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)   
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:2)
-
-      tname='SC1108'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute(A(0:2))
-      do i=1,N
-        A(i) = NL+i
-      enddo               
-
-!dvm$ parallel (i) on B(i)
-      do i=2,N-2
-         B(i) = A(i+1)+A(i+2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-2
-          if (B(i).ne.(C(i+1)+C(i+2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif  
-      deallocate (A,B,C)
-
-      end   
-      
-C -------------------------------------------SC1109   
-         
-      subroutine SC1109
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop                
-
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:2)
-
-      tname='SC1109'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute(A(2:0))
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=3,N
-         B(i) = A(i-1)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=3,N
-          if (B(i).ne.(C(i-1)+C(i-2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
-         
-      end   
-C -------------------------------------------SC1110   
-         
-      subroutine SC1110
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(0:2)
-
-      tname='SC1110'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=2,N-2
-         B(i) = A(i+1)+A(i+2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-2
-          if (B(i).ne.(C(i+1)+C(i+2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
-   
-      end 
-C -------------------------------------------SC1111   
-         
-      subroutine SC1111
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(2:0)
-
-      tname='SC1111'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=3,N
-         B(i) = A(i-1)+A(i-2)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=3,N
-          if (B(i).ne.(C(i-1)+C(i-2))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-      
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-        
-      end  
-C -------------------------------------------SC1112   
-         
-      subroutine SC1112
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:3)
-
-      tname='SC1112'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=4,N-3
-         B(i) = A(i-1)+A(i+1)+A(i+2)+A(i-2)+A(i-3)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=4,N-3
-         if (B(i).ne.(C(i-1)+C(i+1)+C(i-2)+C(i+2)+C(i-3)+C(i+3))) then
-            nloop=min(nloop,i)
-         endif    
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-         
-      end
-C -------------------------------------------SC1113  
-         
-      subroutine SC1113
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:3)
-
-      tname='SC1113'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute(A(0:3))
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=2,N-3
-         B(i) = A(i+1)+A(i+2)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-3
-          if (B(i).ne.(C(i+1)+C(i+2)+C(i+3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-       
-      end
-C -------------------------------------------SC1114   
-         
-      subroutine SC1114
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:3)
-
-      tname='SC1114'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute(A(3:0))
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=4,N
-         B(i) = A(i-1)+A(i-2)+A(i-3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=4,N
-          if (B(i).ne.(C(i-1)+C(i-2)+C(i-3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-        
-      end 
-C -------------------------------------------SC1115   
-         
-      subroutine SC1115
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)    
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(3:0)
-
-      tname='SC1115'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=4,N
-         B(i) = A(i-1)+A(i-2)+A(i-3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=4,N
-          if (B(i).ne.(C(i-1)+C(i-2)+C(i-3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-        
-      end 
-C -------------------------------------------SC1116   
-         
-      subroutine SC1116
-      integer, parameter :: N = 16,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                    
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(0:3)
-
-      tname='SC1116'
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=2,N-3
-         B(i) = A(i+1)+A(i+2)+A(i+3)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=2,N-3
-          if (B(i).ne.(C(i+1)+C(i+2)+C(i+3))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-  
-      end 
-C --------------------------------------------SC1117  
-         
-      subroutine SC1117
-      integer, parameter :: N = 500,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:),B(:),C(:)
-      integer nloop 
-                     
-!dvm$ distribute B(BLOCK)     
-!dvm$ align (I) with B(I) ::A
-!dvm$ shadow A(11:11)
-
-      tname='SC1117'      
-      allocate (B(N),A(N),C(N))
-      NNL=NL    
-      call serial1(C,N,NNL)
-      nloop=NL
-
-!dvm$ actual(nloop)
-!dvm$ region local(A,B)
-!dvm$ parallel (i) on A(i),shadow_compute
-      do i=1,N
-        A(i) = NL+i
-      enddo
-               
-!dvm$ parallel (i) on B(i)
-      do i=12,N-11
-         B(i) = A(i-9)+A(i+9)+A(i+10)+A(i-10)+A(i-11)+A(i+11)
-      enddo
-  
-!dvm$ parallel (i) on B(i), reduction( min( nloop ) )
-      do i=12,N-11
-        if (B(i).ne.(C(i-9)+C(i+9)+C(i-10)+C(i+10)+
-     *C(i-11)+C(i+11))) nloop=min(nloop,i)          
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloop) 
-
-      if (nloop .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-     
-      end
-C -----------------------------------------------         
-      subroutine serial1(AR,N,NL)
-      integer AR(N)
-      integer NL 
-      do i=1,N
-        AR(i) = NL+i
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc21.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc21.fdv
deleted file mode 100644
index cfc2512..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc21.fdv
+++ /dev/null
@@ -1,1220 +0,0 @@
-      program SC21
-
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_COMPUTE CLAUSE'.            
-c    DISTRIBUTED ARRAY A(N,M) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SC21========================'
-C --------------------------------------------------
-      call sc2101
-C --------------------------------------------------
-      call sc2102
-C --------------------------------------------------
-      call sc2103
-C -------------------------------------------------
-      call sc2104
-C -------------------------------------------------
-      call sc2105
-C -------------------------------------------------
-      call sc2106
-C -------------------------------------------------
-      call sc2107
-C --------------------------------------------------
-      call sc2108
-C----------------------------------------------------
-      call sc2109
-C -------------------------------------------------
-      call sc2110
-C -------------------------------------------------
-      call sc2111
-C -------------------------------------------------
-      call sc2112
-C ------------------------------------------------- 
-      call sc2113
-C --------------------------------------------------
-      call sc2114
-C --------------------------------------------------
-      call sc2115
-C -------------------------------------------------
-      call sc2116
-C -------------------------------------------------
-      call sc2117
-C -------------------------------------------------
-      call sc2118
-C -------------------------------------------------
-      call sc2119
-C -------------------------------------------------
-      call sc2120
-C -------------------------------------------------
-   
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF SC21 ========================= '    
-      end
-C ---------------------------------------------SC2101
-      subroutine sc2101
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-!dvm$ distribute B(BLOCK,BLOCK)       
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2101'     
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                               
- 
-!dvm$ parallel (i,j) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i-1,j)+A(i,j-1)+
-     *A(i-1,j-1)+ A(i+1,j+1)+A(i-1,j+1)+A(i+1,j-1)          
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i-1,j)+C(i,j-1)+
-     *C(i-1,j-1)+ C(i+1,j+1)+C(i-1,j+1)+C(i+1,j-1)       
-          if (B(i,j).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SC2102     
-      subroutine sc2102
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)       
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2102'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i+1,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i+1,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-      
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-         
-      end
-C -----------------------------------------SC2103      
-      subroutine sc2103
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)      
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2103'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(1:0,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i-1,j)+A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i-1,j)+C(i,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-    
-      end
-      
-C ------------------------------------------SC2104   
-      subroutine sc2104
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(1:1,0:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2104'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i+1,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i+1,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)        
- 
-      end
-  
-C ------------------------------------------SC2105   
-      subroutine sc2105
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(0:1,1:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2105'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,1:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i,j-1)+A(i+1,j)+A(i+1,j-1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i,j-1)+C(i+1,j)+C(i+1,j-1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)      
- 
-      end
-      
-C --------------------------------------------SC2106  
-         
-      subroutine sc2106
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(0:1,0:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2106'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) =A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)          
-  
-      end
-C -------------------------------------------SC2107   
-         
-      subroutine sc2107
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(1:0,1:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2107'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:0,1:0))
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) =A(i,j-1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i,j-1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-     
-      end      
-C -------------------------------------------SC2108   
-         
-      subroutine sc2108
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2108'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+2,j)+A(i,j+2)+A(i+2,j)+A(i+2,j+2)+
-     * A(i-2,j+2)+A(i-2,j)+A(i,j-2)+A(i-2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j)+C(i,j+2)+C(i+2,j)+C(i+2,j+2)+
-     *C(i-2,j+2)+C(i-2,j)+C(i,j-2)+C(i-2,j-2)       
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end   
-      
-C -------------------------------------------SC2109   
-         
-      subroutine sc2109
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2109'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:2,2:2))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-         B(i,j) = A(i+2,j+2)+ A(i+1,j+1)+A(i,j+2)+A(i,j-2)+A(i+2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j+2)+ C(i+1,j+1)+C(i,j+2)+C(i,j-2)+A(i+2,j-2)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
- 
-      end   
-C -------------------------------------------SC2110  
-         
-      subroutine sc2110
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2110'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(2:2,2:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-         B(i,j) = A(i-2,j-2)+ A(i-1,j-1)+A(i-2,j)+A(i+2,j)+A(i+2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-         do j=3,M-2
-           isum = C(i-2,j-2)+C(i-1,j-1)+C(i-2,j)+C(i+2,j)+C(i+2,j-2)
-           if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-           endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-   
-      end 
-C -------------------------------------------SC2111   
-         
-      subroutine sc2111
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,0:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2111'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(2:2,0:2))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+2,j+2)+ A(i+1,j+1)+A(i-2,j+2)+A(i+2,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j+2)+ C(i+1,j+1)+C(i-2,j+2)+C(i+2,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C) 
- 
-      end  
-C -------------------------------------------SC2112   
-         
-      subroutine sc2112
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:0,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2112'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(1:0,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i-1,j+1)+ A(i,j+1)+A(i-1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i-1,j+1)+ C(i,j+1)+C(i-1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)        
-
-      end
-C -------------------------------------------SC2113  
-         
-      subroutine sc2113
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2113'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo          
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C -------------------------------------------SC2114   
-         
-      subroutine sc2114
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(2:0,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2114'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:0,0:2))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i,j+2)+A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i,j+2)+C(i,j+1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C) 
-   
-      end 
-C -------------------------------------------SC2115   
-         
-      subroutine sc2115
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2115'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i+1,j+1)+A(i+2,j+2)+A(i+3,j+3)+A(i-3,j-3)+
-     * A(i-2,j-2)+A(i-1,j-1)+A(i-3,j+3)+A(i+3,j-3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i+1,j+1)+C(i+2,j+2)+C(i+3,j+3)+C(i-3,j-3)+
-     * C(i-2,j-2)+C(i-1,j-1)+C(i-3,j+3)+C(i+3,j-3)       
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C)             
-
-      end 
-C -------------------------------------------SC2116   
-         
-      subroutine sc2116
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(3:3,0:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2116'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:0,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i,j+1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)         
-     
-      end 
-C --------------------------------------------SC2117  
-         
-      subroutine sc2117
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2117'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SC2118  
-         
-      subroutine sc2118
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2118'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i-3,j-3)+A(i+3,j)+A(i-3,j)+A(i-3,j-3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i-3,j-3)+C(i+3,j)+C(i-3,j)+C(i-3,j-3)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SC2119  
-         
-      subroutine sc2119
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(3:0,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2119'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(3:0,3:3))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i-3,j-3)+A(i,j+3)+A(i-3,j+3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i-3,j-3)+C(i,j+3)+C(i-3,j+3)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SC2120  
-         
-      subroutine sc2120
-      integer, parameter :: N = 480,M=480,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2120'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=12,N-11
-        do j=12,M-11
-          B(i,j) = A(i+11,j+11)+A(i+10,j+10)+A(i+9,j+9)+
-     *A(i-11,j-11)+A(i-10,j-10)+A(i-9,j-9)+A(i+11,j-11)+
-     *A(i-11,j+11)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=12,N-11
-        do j=12,M-11
-          isum = C(i+11,j+11)+C(i+10,j+10)+C(i+9,j+9)+
-     *C(i-11,j-11)+C(i-10,j-10)+C(i-9,j-9)+C(i+11,j-11)+
-     *C(i-11,j+11)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          AR(i,j) = NL+i+j
-        enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc22.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc22.fdv
deleted file mode 100644
index 1441eef..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc22.fdv
+++ /dev/null
@@ -1,1220 +0,0 @@
-      program SC22
-
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_COMPUTE CLAUSE'.            
-c    DISTRIBUTED ARRAY A(N,M) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SC22========================'
-C --------------------------------------------------
-      call sc2201
-C --------------------------------------------------
-      call sc2202
-C --------------------------------------------------
-      call sc2203
-C -------------------------------------------------
-      call sc2204
-C -------------------------------------------------
-      call sc2205
-C -------------------------------------------------
-      call sc2206
-C -------------------------------------------------
-      call sc2207
-C --------------------------------------------------
-      call sc2208
-C----------------------------------------------------
-      call sc2209
-C -------------------------------------------------
-      call sc2210
-C -------------------------------------------------
-      call sc2211
-C -------------------------------------------------
-      call sc2212
-C ------------------------------------------------- 
-      call sc2213
-C --------------------------------------------------
-      call sc2214
-C --------------------------------------------------
-      call sc2215
-C -------------------------------------------------
-      call sc2216
-C -------------------------------------------------
-      call sc2217
-C -------------------------------------------------
-      call sc2218
-C -------------------------------------------------
-      call sc2219
-C -------------------------------------------------
-      call sc2220
-C -------------------------------------------------
-   
-C -------------------------------------------------
-
-C
-C
-      print *,'=== END OF SC22 ========================= '    
-      end
-C ---------------------------------------------SC2201
-      subroutine SC2201
-      integer, parameter :: N = 16,M=8,NL=1000
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-!dvm$ distribute B(BLOCK,*)       
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2201'     
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                               
- 
-!dvm$ parallel (i,j) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i-1,j)+A(i,j-1)+
-     *A(i-1,j-1)+ A(i+1,j+1)+A(i-1,j+1)+A(i+1,j-1)          
-         enddo
-      enddo
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i-1,j)+C(i,j-1)+
-     *C(i-1,j-1)+ C(i+1,j+1)+C(i-1,j+1)+C(i+1,j-1)       
-          if (B(i,j).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SC2202     
-      subroutine SC2202
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)       
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2202'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i+1,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i+1,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-      
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-         
-      end
-C -----------------------------------------SC2203      
-      subroutine SC2203
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)      
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2203'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(1:0,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i-1,j)+A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i-1,j)+C(i,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-    
-      end
-      
-C ------------------------------------------SC2204   
-      subroutine SC2204
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(1:1,0:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2204'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i+1,j)+A(i,j+1)+A(i+1,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)+C(i,j+1)+C(i+1,j+1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)        
- 
-      end
-  
-C ------------------------------------------SC2205   
-      subroutine SC2205
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(0:1,1:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2205'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,1:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) = A(i,j-1)+A(i+1,j)+A(i+1,j-1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i,j-1)+C(i+1,j)+C(i+1,j-1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)      
- 
-      end
-      
-C --------------------------------------------SC2206  
-         
-      subroutine SC2206
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(0:1,0:1) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2206'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) =A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)          
-  
-      end
-C -------------------------------------------SC2207   
-         
-      subroutine SC2207
-      integer, parameter :: N = 16,M=8,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(1:0,1:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2207'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:0,1:0))
-      do i=1,N
-        do j=1,M
-         A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=2,N-1
-        do j=2,M-1
-          B(i,j) =A(i,j-1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=2,N-1
-        do j=2,M-1
-          isum = C(i,j-1)
-          if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-     
-      end      
-C -------------------------------------------SC2208   
-         
-      subroutine SC2208
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2208'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+2,j)+A(i,j+2)+A(i+2,j)+A(i+2,j+2)+
-     * A(i-2,j+2)+A(i-2,j)+A(i,j-2)+A(i-2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j)+C(i,j+2)+C(i+2,j)+C(i+2,j+2)+
-     *C(i-2,j+2)+C(i-2,j)+C(i,j-2)+C(i-2,j-2)       
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-      
-      end   
-      
-C -------------------------------------------SC2209   
-         
-      subroutine SC2209
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2209'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:2,2:2))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-         B(i,j) = A(i+2,j+2)+ A(i+1,j+1)+A(i,j+2)+A(i,j-2)+A(i+2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j+2)+ C(i+1,j+1)+C(i,j+2)+C(i,j-2)+A(i+2,j-2)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)      
- 
-      end   
-C -------------------------------------------SC2210  
-         
-      subroutine sc2210
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(2:2,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2210'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(2:2,2:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-         B(i,j) = A(i-2,j-2)+ A(i-1,j-1)+A(i-2,j)+A(i+2,j)+A(i+2,j-2)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-         do j=3,M-2
-           isum = C(i-2,j-2)+C(i-1,j-1)+C(i-2,j)+C(i+2,j)+C(i+2,j-2)
-           if (B(i,j).ne.isum) then
-            nloopi=min(nloopi,i)
-            nloopj=min(nloopj,j)
-           endif
-         enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-   
-      end 
-C -------------------------------------------SC2211   
-         
-      subroutine SC2211
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(2:2,0:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2211'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(2:2,0:2))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+2,j+2)+ A(i+1,j+1)+A(i-2,j+2)+A(i+2,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+2,j+2)+ C(i+1,j+1)+C(i-2,j+2)+C(i+2,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C) 
- 
-      end  
-C -------------------------------------------SC2212   
-         
-      subroutine SC2212
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(2:0,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2212'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(1:0,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i-1,j+1)+ A(i,j+1)+A(i-1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i-1,j+1)+ C(i,j+1)+C(i-1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)        
-
-      end
-C -------------------------------------------SC2213  
-         
-      subroutine SC2213
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(2:2,2:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2213'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo          
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C -------------------------------------------SC2214   
-         
-      subroutine SC2214
-      integer, parameter :: N = 16,M=17,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(2:0,2:2) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2214'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:0,0:2))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i,j+2)+A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i,j+2)+C(i,j+1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C) 
-   
-      end 
-C -------------------------------------------SC2215   
-         
-      subroutine SC2215
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(3:3,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2215'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i+1,j+1)+A(i+2,j+2)+A(i+3,j+3)+A(i-3,j-3)+
-     * A(i-2,j-2)+A(i-1,j-1)+A(i-3,j+3)+A(i+3,j-3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i+1,j+1)+C(i+2,j+2)+C(i+3,j+3)+C(i-3,j-3)+
-     * C(i-2,j-2)+C(i-1,j-1)+C(i-3,j+3)+C(i+3,j-3)       
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif       
-      deallocate (A,B,C)             
-
-      end 
-C -------------------------------------------SC2216   
-         
-      subroutine SC2216
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(3:3,0:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2216'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:0,0:1))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i,j+1)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i,j+1)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)         
-     
-      end 
-C --------------------------------------------SC2217  
-         
-      subroutine SC2217
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(0:3,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2217'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(0:1,0:0))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-
-!dvm$ parallel (i,J) on B(i,j)
-      do i=3,N-2
-        do j=3,M-2
-          B(i,j) = A(i+1,j)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=3,N-2
-        do j=3,M-2
-          isum = C(i+1,j)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SC2218  
-         
-      subroutine SC2218
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(3:3,3:0) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2218'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i-3,j-3)+A(i+3,j)+A(i-3,j)+A(i-3,j-3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i-3,j-3)+C(i+3,j)+C(i-3,j)+C(i-3,j-3)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SC2219  
-         
-      subroutine SC2219
-      integer, parameter :: N = 32,M=32,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(BLOCK,*)   
-!dvm$ shadow(3:0,3:3) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2219'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute(A(3:0,3:3))
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=4,N-3
-        do j=4,M-3
-          B(i,j) = A(i-3,j-3)+A(i,j+3)+A(i-3,j+3)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=4,N-3
-        do j=4,M-3
-          isum = C(i-3,j-3)+C(i,j+3)+C(i-3,j+3)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C --------------------------------------------SC2220  
-         
-      subroutine SC2220
-      integer, parameter :: N = 480,M=480,NL=1000
-      character*6 tname 
-      integer, allocatable :: A(:,:),B(:,:),C(:,:)
-      integer nloopi,nloopj,isum 
-
-!dvm$ distribute B(*,BLOCK)   
-!dvm$ shadow(11:11,11:11) :: A 
-!dvm$ align (I,J) with B(I,J) ::A
-
-      tname='SC2220'
-      allocate (B(N,M),A(N,M),C(N,M))
-      NNL=NL    
-      call serial2(C,N,M,NNL)
-      nloopi=NL
-      nloopj=NL
-
-!dvm$ actual(nloopi,nloopj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j) on A(i,j),shadow_compute
-      do i=1,N
-        do j=1,M
-          A(i,j) = NL+i+j
-        enddo
-      enddo                                                
-          
-!dvm$ parallel (i,J) on B(i,j)
-      do i=12,N-11
-        do j=12,M-11
-          B(i,j) = A(i+11,j+11)+A(i+10,j+10)+A(i+9,j+9)+
-     *A(i-11,j-11)+A(i-10,j-10)+A(i-9,j-9)+A(i+11,j-11)+
-     *A(i-11,j+11)
-        enddo
-      enddo 
-  
-!dvm$ parallel (i,j) on B(i,j), reduction( min( nloopi),min(nloopj))
-!dvm$*,private(isum) 
-      do i=12,N-11
-        do j=12,M-11
-          isum = C(i+11,j+11)+C(i+10,j+10)+C(i+9,j+9)+
-     *C(i-11,j-11)+C(i-10,j-10)+C(i-9,j-9)+C(i+11,j-11)+
-     *C(i-11,j+11)
-          if (B(i,j).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-          endif
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial2(AR,N,M,NL)
-      integer AR(N,M)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          AR(i,j) = NL+i+j
-        enddo
-      enddo
-      end 
-
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc31.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc31.fdv
deleted file mode 100644
index 54e6a2a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc31.fdv
+++ /dev/null
@@ -1,684 +0,0 @@
-      program SC31
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_COMPUTE CLAUSE       
-c    DISTRIBUTED ARRAY A(N,M,K) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SC31========================'
-C --------------------------------------------------
-      call sc3101
-C --------------------------------------------------
-      call sc3102
-C --------------------------------------------------
-      call sc3103
-C -------------------------------------------------
-      call sc3104
-C -------------------------------------------------
-      call sc3105
-C -------------------------------------------------
-      call sc3106
-C --------------------------------------------------
-      call sc3107
-C --------------------------------------------------
-      call sc3108
-C----------------------------------------------------
-      call sc3109
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF SC31 ========================= '    
-      end
-C ---------------------------------------------SC3101
-      subroutine sc3101     
-      integer, parameter :: N = 16,M=8,K=8,NL=1000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3101'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)+A(i-1,j,ii)+
-     *A(i,j-1,ii)+ A(i,j,ii-1)+A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)+
-     *A(i-1,j+1,ii)+A(i+1,j-1,ii)+A(i-1,j+1,ii-1)+A(i-1,j+1,ii+1)+
-     *A(i+1,j-1,ii-1)+A(i+1,j-1,ii+1)
-         enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          isum = C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1)+C(i-1,j,ii)+
-     *C(i,j-1,ii)+ C(i,j,ii-1)+C(i-1,j-1,ii-1)+C(i+1,j+1,ii+1)+
-     *C(i-1,j+1,ii)+C(i+1,j-1,ii)+C(i-1,j+1,ii-1)+C(i-1,j+1,ii+1)+
-     *C(i+1,j-1,ii-1)+C(i+1,j-1,ii+1)       
-          if (B(i,j,ii).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SC3102     
-      subroutine SC3102
-      integer, parameter :: N = 16,M=10,K=10,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3102'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute(A(1:2,2:2,1:2))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-          B(i,j,ii) = A(i-1,j-2,ii+2)+A(i-1,j+2,ii-1)+A(i-1,j+2,ii+2)+
-     *A(i+2,j+2,ii+2)+ A(i+2,j+2,ii-1)+A(i+2,j-2,ii+2)+A(i+2,j-2,ii-1)+
-     *A(i-1,j-2,ii-1)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            isum = C(i-1,j-2,ii+2)+C(i-1,j+2,ii-1)+C(i-1,j+2,ii+2)+
-     *C(i+2,j+2,ii+2)+ C(i+2,j+2,ii-1)+C(i+2,j-2,ii+2)+C(i+2,j-2,ii-1)+
-     *C(i-1,j-2,ii-1)      
-           if (B(i,j,ii).ne.isum) then
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)         
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------SC3103      
-      subroutine SC3103
-      integer, parameter :: N = 16,M=10,K=10,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3103'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute(A(0:2,2:2,0:2))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            B(i,j,ii) = A(i+2,j+2,ii+2)+A(i,j-2,ii)+
-     *A(i+2,j-2,ii)+A(i,j+2,ii)+ A(i,j+2,ii+2)+A(i+2,j-2,ii+2)+
-     * A(i+2,j+2,ii)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            isum = C(i+2,j+2,ii+2)+C(i,j-2,ii)+
-     *C(i+2,j-2,ii)+C(i,j+2,ii)+ C(i,j+2,ii+2)+C(i+2,j-2,ii+2)+
-     *C(i+2,j+2,ii)
-            if (B(i,j,ii).ne.isum) then         
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-      
-C ------------------------------------------SC3104   
-      subroutine SC3104     
-      integer, parameter :: N = 16,M=10,K=10,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3104'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute(A(2:2,2:0,2:0))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           B(i,j,ii) = A(i+2,j,ii)+A(i-2,j-2,ii-2)+
-     *A(i+2,j-2,ii-2)+ A(i-2,j,ii-2)+A(i-2,j-2,ii)+
-     *A(i-2,j,ii)+A(i+2,j-2,ii)+A(i+2,j,ii-2)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           isum = C(i+2,j,ii)+C(i-2,j-2,ii-2)+
-     *C(i+2,j-2,ii-2)+ C(i-2,j,ii-2)+C(i-2,j-2,ii)+
-     *C(i-2,j,ii)+C(i+2,j-2,ii)+C(i+2,j,ii-2)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-      
-C ------------------------------------------SC3105
-      subroutine SC3105   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:2,2:2,0:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3105'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute 
-
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            B(i,j,ii) = A(i+2,j+2,ii+2)+A(i,j-2,ii)+
-     *   A(i+2,j-2,ii)+ A(i,j+2,ii)+A(i,j+2,ii+2)+
-     *   A(i+2,j-2,ii+2)+A(i+2,j+2,ii) 
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           isum = C(i+2,j+2,ii+2)+C(i,j-2,ii)+
-     *   C(i+2,j-2,ii)+ C(i,j+2,ii)+C(i,j+2,ii+2)+
-     *   C(i+2,j-2,ii+2)+C(i+2,j+2,ii)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-           
-
-C --------------------------------------------SC3106  
-      subroutine SC3106   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3106'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            B(i,j,ii) = A(i-3,j-3,ii+3)+A(i+3,j+3,ii-3)+
-     *   A(i+3,j-3,ii+3)+ A(i-3,j+3,ii+3)+A(i-3,j+3,ii-3)+
-     *   A(i+3,j-3,ii-3)+A(i+3,j+3,ii+3)+A(i-3,j-3,ii-3) 
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            isum = C(i-3,j-3,ii+3)+C(i+3,j+3,ii-3)+
-     *   C(i+3,j-3,ii+3)+ C(i-3,j+3,ii+3)+C(i-3,j+3,ii-3)+
-     *   C(i+3,j-3,ii-3)+ C(i+3,j+3,ii+3)+ C(i-3,j-3,ii-3)    
-            if (B(i,j,ii).ne.isum) then         
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-           
-C -------------------------------------------SC3107   
-       subroutine SC3107   
-       integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,0:3,3:0) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3107'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-             B(i,j,ii) = A(i+3,j+3,ii)+A(i-3,j,ii-3)+
-     *   A(i+3,j,ii-3)+ A(i-3,j+3,ii-3)+ A(i-3,j,ii)+
-     *   A(i-3,j+3,ii)+ A(i+3,j,ii)+ A(i+3,j+3,ii-3)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            isum = C(i+3,j+3,ii)+C(i-3,j,ii-3)+
-     *   C(i+3,j,ii-3)+ C(i-3,j+3,ii-3)+C(i-3,j,ii)+
-     *   C(i-3,j+3,ii)+ C(i+3,j,ii)+ C(i+3,j+3,ii-3)    
-            if (B(i,j,ii).ne.isum) then        
-               nloopi=min(nloopi,i)
-               nloopj=min(nloopj,j)
-               nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-                    
-     
-C -------------------------------------------SC3108   
-      subroutine SC3108   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,0:3,0:3) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3108'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute(A(0:3,0:3,0:3))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-             B(i,j,ii) = A(i+3,j+3,ii+3)+A(i+3,j,ii)+
-     *   A(i,j+3,ii)+ A(i,j,ii+3)+ A(i,j+3,ii+3)+
-     *   A(i+3,j,ii+3)+ A(i+3,j+3,ii)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-           isum = C(i+3,j+3,ii+3)+C(i+3,j,ii)+
-     *   C(i,j+3,ii)+ C(i,j,ii+3)+ C(i,j+3,ii+3)+
-     *   C(i+3,j,ii+3)+ C(i+3,j+3,ii)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-                    
-C -------------------------------------------SC3109   
-      subroutine SC3109   
-      integer, parameter :: N = 120,M=120,K=120,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11,11:11) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3109'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-             B(i,j,ii) = A(i+11,j+11,ii+11)+A(i-11,j-11,ii-11)+
-     *   A(i+11,j-11,ii-11)+ A(i-11,j+11,ii-11)+ A(i-11,j-11,ii+11)+
-     *   A(i-11,j+11,ii+11)+ A(i+11,j-11,ii+11)+A(i+11,j+11,ii-11)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            isum = C(i+11,j+11,ii+11)+C(i-11,j-11,ii-11)+
-     *   C(i+11,j-11,ii-11)+ C(i-11,j+11,ii-11)+ C(i-11,j-11,ii+11)+
-     *   C(i-11,j+11,ii+11)+ C(i+11,j-11,ii+11)+C(i+11,j+11,ii-11)
-            if (B(i,j,ii).ne.isum) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)         
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C -----------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                
-      enddo
-      end 
-    
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc32.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc32.fdv
deleted file mode 100644
index 090814f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc32.fdv
+++ /dev/null
@@ -1,684 +0,0 @@
-      program SC32
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_COMPUTE CLAUSE       
-c    DISTRIBUTED ARRAY A(N,M,K) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SC32========================'
-C --------------------------------------------------
-      call sc3201
-C --------------------------------------------------
-      call sc3202
-C --------------------------------------------------
-      call sc3203
-C -------------------------------------------------
-      call sc3204
-C -------------------------------------------------
-      call sc3205
-C -------------------------------------------------
-      call sc3206
-C --------------------------------------------------
-      call sc3207
-C --------------------------------------------------
-      call sc3208
-C----------------------------------------------------
-      call sc3209
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF SC32 ========================= '    
-      end
-C ---------------------------------------------SC3201
-      subroutine sc3201     
-      integer, parameter :: N = 16,M=8,K=8,NL=1000     
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)       
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3201'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-          B(i,j,ii) = A(i+1,j,ii)+A(i,j+1,ii)+A(i,j,ii+1)+A(i-1,j,ii)+
-     *A(i,j-1,ii)+ A(i,j,ii-1)+A(i-1,j-1,ii-1)+A(i+1,j+1,ii+1)+
-     *A(i-1,j+1,ii)+A(i+1,j-1,ii)+A(i-1,j+1,ii-1)+A(i-1,j+1,ii+1)+
-     *A(i+1,j-1,ii-1)+A(i+1,j-1,ii+1)
-         enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=2,N-1
-        do j=2,M-1
-         do ii=2,K-1
-          isum = C(i+1,j,ii)+C(i,j+1,ii)+C(i,j,ii+1)+C(i-1,j,ii)+
-     *C(i,j-1,ii)+ C(i,j,ii-1)+C(i-1,j-1,ii-1)+C(i+1,j+1,ii+1)+
-     *C(i-1,j+1,ii)+C(i+1,j-1,ii)+C(i-1,j+1,ii-1)+C(i-1,j+1,ii+1)+
-     *C(i+1,j-1,ii-1)+C(i+1,j-1,ii+1)       
-          if (B(i,j,ii).ne.isum) then
-           nloopi=min(nloopi,i)
-           nloopj=min(nloopj,j)
-           nloopii=min(nloopii,ii)
-          endif
-         enddo
-       enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SC3202     
-      subroutine SC3202
-      integer, parameter :: N = 16,M=10,K=10,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3202'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute(A(1:2,2:2,1:2))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-          B(i,j,ii) = A(i-1,j-2,ii+2)+A(i-1,j+2,ii-1)+A(i-1,j+2,ii+2)+
-     *A(i+2,j+2,ii+2)+ A(i+2,j+2,ii-1)+A(i+2,j-2,ii+2)+A(i+2,j-2,ii-1)+
-     *A(i-1,j-2,ii-1)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            isum = C(i-1,j-2,ii+2)+C(i-1,j+2,ii-1)+C(i-1,j+2,ii+2)+
-     *C(i+2,j+2,ii+2)+ C(i+2,j+2,ii-1)+C(i+2,j-2,ii+2)+C(i+2,j-2,ii-1)+
-     *C(i-1,j-2,ii-1)      
-           if (B(i,j,ii).ne.isum) then
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)         
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------SC3203      
-      subroutine SC3203
-      integer, parameter :: N = 16,M=10,K=10,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3203'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute(A(0:2,2:2,0:2))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            B(i,j,ii) = A(i+2,j+2,ii+2)+A(i,j-2,ii)+
-     *A(i+2,j-2,ii)+A(i,j+2,ii)+ A(i,j+2,ii+2)+A(i+2,j-2,ii+2)+
-     * A(i+2,j+2,ii)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            isum = C(i+2,j+2,ii+2)+C(i,j-2,ii)+
-     *C(i+2,j-2,ii)+C(i,j+2,ii)+ C(i,j+2,ii+2)+C(i+2,j-2,ii+2)+
-     *C(i+2,j+2,ii)
-            if (B(i,j,ii).ne.isum) then         
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-      
-C ------------------------------------------SC3204   
-      subroutine SC3204     
-      integer, parameter :: N = 16,M=10,K=10,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)   
-!dvm$ shadow(2:2,2:2,2:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3204'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute(A(2:2,2:0,2:0))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           B(i,j,ii) = A(i+2,j,ii)+A(i-2,j-2,ii-2)+
-     *A(i+2,j-2,ii-2)+ A(i-2,j,ii-2)+A(i-2,j-2,ii)+
-     *A(i-2,j,ii)+A(i+2,j-2,ii)+A(i+2,j,ii-2)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           isum = C(i+2,j,ii)+C(i-2,j-2,ii-2)+
-     *C(i+2,j-2,ii-2)+ C(i-2,j,ii-2)+C(i-2,j-2,ii)+
-     *C(i-2,j,ii)+C(i+2,j-2,ii)+C(i+2,j,ii-2)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-      
-C ------------------------------------------SC3205
-      subroutine SC3205   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)   
-!dvm$ shadow(0:2,2:2,0:2) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3205'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute 
-
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            B(i,j,ii) = A(i+2,j+2,ii+2)+A(i,j-2,ii)+
-     *   A(i+2,j-2,ii)+ A(i,j+2,ii)+A(i,j+2,ii+2)+
-     *   A(i+2,j-2,ii+2)+A(i+2,j+2,ii) 
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-           isum = C(i+2,j+2,ii+2)+C(i,j-2,ii)+
-     *   C(i+2,j-2,ii)+ C(i,j+2,ii)+C(i,j+2,ii+2)+
-     *   C(i+2,j-2,ii+2)+C(i+2,j+2,ii)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-           
-
-C --------------------------------------------SC3206  
-      subroutine SC3206   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3206'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            B(i,j,ii) = A(i-3,j-3,ii+3)+A(i+3,j+3,ii-3)+
-     *   A(i+3,j-3,ii+3)+ A(i-3,j+3,ii+3)+A(i-3,j+3,ii-3)+
-     *   A(i+3,j-3,ii-3)+A(i+3,j+3,ii+3)+A(i-3,j-3,ii-3) 
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            isum = C(i-3,j-3,ii+3)+C(i+3,j+3,ii-3)+
-     *   C(i+3,j-3,ii+3)+ C(i-3,j+3,ii+3)+C(i-3,j+3,ii-3)+
-     *   C(i+3,j-3,ii-3)+ C(i+3,j+3,ii+3)+ C(i-3,j-3,ii-3)    
-            if (B(i,j,ii).ne.isum) then         
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-         call ansyes(tname)
-      else
-         call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-           
-C -------------------------------------------SC3207   
-       subroutine SC3207   
-       integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*)   
-!dvm$ shadow(3:3,0:3,3:0) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3207'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-             B(i,j,ii) = A(i+3,j+3,ii)+A(i-3,j,ii-3)+
-     *   A(i+3,j,ii-3)+ A(i-3,j+3,ii-3)+ A(i-3,j,ii)+
-     *   A(i-3,j+3,ii)+ A(i+3,j,ii)+ A(i+3,j+3,ii-3)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            isum = C(i+3,j+3,ii)+C(i-3,j,ii-3)+
-     *   C(i+3,j,ii-3)+ C(i-3,j+3,ii-3)+C(i-3,j,ii)+
-     *   C(i-3,j+3,ii)+ C(i+3,j,ii)+ C(i+3,j+3,ii-3)    
-            if (B(i,j,ii).ne.isum) then        
-               nloopi=min(nloopi,i)
-               nloopj=min(nloopj,j)
-               nloopii=min(nloopii,ii)
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-                    
-     
-C -------------------------------------------SC3208   
-      subroutine SC3208   
-      integer, parameter :: N = 16,M=16,K=16,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK)   
-!dvm$ shadow(0:3,0:3,0:3) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3208'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute(A(0:3,0:3,0:3))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-             B(i,j,ii) = A(i+3,j+3,ii+3)+A(i+3,j,ii)+
-     *   A(i,j+3,ii)+ A(i,j,ii+3)+ A(i,j+3,ii+3)+
-     *   A(i+3,j,ii+3)+ A(i+3,j+3,ii)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-           isum = C(i+3,j+3,ii+3)+C(i+3,j,ii)+
-     *   C(i,j+3,ii)+ C(i,j,ii+3)+ C(i,j+3,ii+3)+
-     *   C(i+3,j,ii+3)+ C(i+3,j+3,ii)
-           if (B(i,j,ii).ne.isum) then         
-             nloopi=min(nloopi,i)
-             nloopj=min(nloopj,j)
-             nloopii=min(nloopii,ii)
-           endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-                    
-C -------------------------------------------SC3209   
-      subroutine SC3209   
-      integer, parameter :: N = 120,M=120,K=120,NL=1000
-      integer, allocatable :: A(:,:,:),B(:,:,:),C(:,:,:)
-      integer nloopi,nloopj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11,11:11) :: A     
-!dvm$ align (I,J,II) with B(I,J,II) ::A
-
-      tname='SC3209'     
-      allocate (B(N,M,K),A(N,M,K),C(N,M,K))
-      NNL=NL    
-      call serial3(C,N,M,K,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii) on A(i,j,ii),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            A(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo
-      enddo 
- 
-!dvm$ parallel (i,j,ii) on B(i,j,ii)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-             B(i,j,ii) = A(i+11,j+11,ii+11)+A(i-11,j-11,ii-11)+
-     *   A(i+11,j-11,ii-11)+ A(i-11,j+11,ii-11)+ A(i-11,j-11,ii+11)+
-     *   A(i-11,j+11,ii+11)+ A(i+11,j-11,ii+11)+A(i+11,j+11,ii-11)
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii) on B(i,j,ii),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii))
-!dvm$*,private(isum)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            isum = C(i+11,j+11,ii+11)+C(i-11,j-11,ii-11)+
-     *   C(i+11,j-11,ii-11)+ C(i-11,j+11,ii-11)+ C(i-11,j-11,ii+11)+
-     *   C(i-11,j+11,ii+11)+ C(i+11,j-11,ii+11)+C(i+11,j+11,ii-11)
-            if (B(i,j,ii).ne.isum) then
-              nloopi=min(nloopi,i)
-              nloopj=min(nloopj,j)
-              nloopii=min(nloopii,ii)         
-            endif
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-
-C -----------------------------------------------         
-      subroutine serial3(AR,N,M,K,NL)
-      integer AR(N,M,K)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            AR(i,j,ii) = NL+i+j+ii
-          enddo
-        enddo                
-      enddo
-      end 
-    
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc41.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc41.fdv
deleted file mode 100644
index 49e9dba..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc41.fdv
+++ /dev/null
@@ -1,801 +0,0 @@
-      program SC41
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_COMPUTE CLAUSE       
-c    DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SC41========================'
-C --------------------------------------------------
-      call sc4101
-C --------------------------------------------------
-      call sc4102
-C --------------------------------------------------
-      call sc4103
-C -------------------------------------------------
-      call sc4104
-C -------------------------------------------------
-      call sc4105
-C -------------------------------------------------
-      call sc4106
-C --------------------------------------------------
-      call sc4107
-C --------------------------------------------------
-      call sc4108
-C----------------------------------------------------
-       call sc4109
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF SC41 ========================= '    
-      end
-C ---------------------------------------------SC4101
-      subroutine SC4101
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)       
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4101'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-            do jj=2,L-1
-            B(i,j,ii,jj) = A(i+1,j+1,ii+1,jj+1)+A(i-1,j-1,ii-1,jj-1)+
-     *   A(i+1,j-1,ii-1,jj-1)+A(i-1,j+1,ii-1,jj-1)+
-     *   A(i-1,j-1,ii+1,jj-1)+ A(i-1,j-1,ii-1,jj+1)+
-     *   A(i+1,j+1,ii-1,jj-1)+A(i-1,j+1,ii+1,jj-1)+
-     *   A(i-1,j-1,ii+1,jj+1)+A(i+1,j-1,ii-1,jj+1)+
-     *   A(i+1,j-1,ii+1,jj-1)+A(i-1,j+1,ii-1,jj+1)+
-     *   A(i+1,j+1,ii+1,jj-1)+A(i-1,j+1,ii+1,jj+1)+
-     *   A(i+1,j-1,ii+1,jj+1)+A(i+1,j+1,ii-1,jj+1)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-            do jj=2,L-1
-              isum = C(i+1,j+1,ii+1,jj+1)+C(i-1,j-1,ii-1,jj-1)+
-     *   C(i+1,j-1,ii-1,jj-1)+ C(i-1,j+1,ii-1,jj-1)+
-     *   C(i-1,j-1,ii+1,jj-1)+ C(i-1,j-1,ii-1,jj+1)+
-     *   C(i+1,j+1,ii-1,jj-1)+ C(i-1,j+1,ii+1,jj-1)+
-     *   C(i-1,j-1,ii+1,jj+1)+ C(i+1,j-1,ii-1,jj+1)+
-     *   C(i+1,j-1,ii+1,jj-1)+ C(i-1,j+1,ii-1,jj+1)+
-     *   C(i+1,j+1,ii+1,jj-1)+ C(i-1,j+1,ii+1,jj+1)+
-     *   C(i+1,j-1,ii+1,jj+1)+ C(i+1,j+1,ii-1,jj+1)         
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SC4102     
-
-      subroutine SC4102     
-      integer, parameter :: N = 16,M=10,K=10,L=10,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4102'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-            B(i,j,ii,jj) = A(i+2,j+2,ii+2,jj+2)+A(i-2,j-2,ii-2,jj-2)+
-     *   A(i+2,j-2,ii-2,jj-2)+ A(i-2,j+2,ii-2,jj-2)+
-     *   A(i-2,j-2,ii+2,jj-2)+ A(i-2,j-2,ii-2,jj+2)+
-     *   A(i+2,j+2,ii-2,jj-2)+ A(i-2,j+2,ii+2,jj-2)+
-     *   A(i-2,j-2,ii+2,jj+2)+ A(i+2,j-2,ii-2,jj+2)+
-     *   A(i+2,j-2,ii+2,jj-2)+ A(i-2,j+2,ii-2,jj+2)+
-     *   A(i+2,j+2,ii+2,jj-2)+ A(i-2,j+2,ii+2,jj+2)+
-     *   A(i+2,j-2,ii+2,jj+2)+ A(i+2,j+2,ii-2,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i+2,j+2,ii+2,jj+2)+C(i-2,j-2,ii-2,jj-2)+
-     *   C(i+2,j-2,ii-2,jj-2)+ C(i-2,j+2,ii-2,jj-2)+
-     *   C(i-2,j-2,ii+2,jj-2)+ C(i-2,j-2,ii-2,jj+2)+
-     *   C(i+2,j+2,ii-2,jj-2)+ C(i-2,j+2,ii+2,jj-2)+
-     *   C(i-2,j-2,ii+2,jj+2)+ C(i+2,j-2,ii-2,jj+2)+
-     *   C(i+2,j-2,ii+2,jj-2)+ C(i-2,j+2,ii-2,jj+2)+
-     *   C(i+2,j+2,ii+2,jj-2)+ C(i-2,j+2,ii+2,jj+2)+
-     *   C(i+2,j-2,ii+2,jj+2)+ C(i+2,j+2,ii-2,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------SC4103      
-      subroutine SC4103
-      integer, parameter :: N = 16,M=10,K=10,L=10,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4103'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-!dvm$*,shadow_compute(A(2:0,2:2,2:0,2:0))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i-2,j-2,ii-2,jj-2)+
-     *   A(i,j-2,ii,jj)+ A(i-2,j-2,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j-2,ii-2,jj)+
-     *   A(i-2,j-2,ii,jj)+ A(i,j-2,ii-2,jj-2)+
-     *   A(i,j-2,ii,jj-2)+ A(i-2,j-2,ii-2,jj)+
-     *   A(i,j-2,ii-2,jj-2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i-2,j-2,ii-2,jj-2)+
-     *   C(i,j-2,ii,jj)+ C(i-2,j-2,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j-2,ii-2,jj)+
-     *   C(i-2,j-2,ii,jj)+ C(i,j-2,ii-2,jj-2)+
-     *   C(i,j-2,ii,jj-2)+ C(i-2,j-2,ii-2,jj)+
-     *   C(i,j-2,ii-2,jj-2)
-             if (B(i,j,ii,jj).ne.isum) then
-               nloopi=min(nloopi,i)
-               nloopj=min(nloopj,j)
-               nloopii=min(nloopii,ii)
-               nloopjj=min(nloopjj,jj)         
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end      
-C ------------------------------------------SC4104   
-      subroutine SC4104
-      integer, parameter :: N = 16,M=10,K=10,L=10,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:2,2:2,0:2,0:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4104'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i+2,j+2,ii+2,jj)+
-     *   A(i,j-2,ii,jj)+ A(i+2,j-2,ii,jj)+
-     *   A(i,j+2,ii,jj)+ A(i,j-2,ii+2,jj)+
-     *   A(i+2,j+2,ii,jj)+ A(i,j-2,ii+2,jj+2)+
-     *   A(i,j+2,ii,jj+2)+ A(i+2,j+2,ii+2,jj)+
-     *   A(i,j+2,ii+2,jj+2)+A(i+2,j-2,ii+2,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i+2,j+2,ii+2,jj)+
-     *   C(i,j-2,ii,jj)+ C(i+2,j-2,ii,jj)+
-     *   C(i,j+2,ii,jj)+ C(i,j-2,ii+2,jj)+
-     *   C(i+2,j+2,ii,jj)+ C(i,j-2,ii+2,jj+2)+
-     *   C(i,j+2,ii,jj+2)+ C(i+2,j+2,ii+2,jj)+
-     *   C(i,j+2,ii+2,jj+2)+C(i+2,j-2,ii+2,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end  
-C ------------------------------------------SC4105
-      subroutine SC4105
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:0,0:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4105'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-!dvm$*,shadow_compute(A(0:0,0:0,0:0,0:2)) 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i,j,ii,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i,j,ii,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end  
-C --------------------------------------------SC4106  
-      subroutine SC4106
-      integer, parameter :: N = 32,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3,3:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4106'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            B(i,j,ii,jj) = A(i+3,j+3,ii+3,jj+3)+A(i-3,j-3,ii-3,jj-3)+
-     *   A(i+3,j-3,ii-3,jj-3)+ A(i-3,j+3,ii-3,jj-3)+
-     *   A(i-3,j-3,ii+3,jj-3)+ A(i-3,j-3,ii-3,jj+3)+
-     *   A(i+3,j+3,ii-3,jj-3)+ A(i-3,j+3,ii+3,jj-3)+
-     *   A(i-3,j-3,ii+3,jj+3)+ A(i+3,j-3,ii-3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj-3)+ A(i-3,j+3,ii-3,jj+3)+
-     *   A(i+3,j+3,ii+3,jj-3)+ A(i-3,j+3,ii+3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj+3)+ A(i+3,j+3,ii-3,jj+3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum = C(i+3,j+3,ii+3,jj+3)+C(i-3,j-3,ii-3,jj-3)+
-     *   C(i+3,j-3,ii-3,jj-3)+ C(i-3,j+3,ii-3,jj-3)+
-     *   C(i-3,j-3,ii+3,jj-3)+ C(i-3,j-3,ii-3,jj+3)+
-     *   C(i+3,j+3,ii-3,jj-3)+ C(i-3,j+3,ii+3,jj-3)+
-     *   C(i-3,j-3,ii+3,jj+3)+ C(i+3,j-3,ii-3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj-3)+ C(i-3,j+3,ii-3,jj+3)+
-     *   C(i+3,j+3,ii+3,jj-3)+ C(i-3,j+3,ii+3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj+3)+ C(i+3,j+3,ii-3,jj+3)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -------------------------------------------SC4107   
-      subroutine SC4107
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,0:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4107'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              B(i,j,ii,jj) = A(i+3,j+3,ii+3,jj+3)+A(i,j-3,ii,jj)+
-     *   A(i+3,j-3,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j-3,ii+3,jj)+ A(i+3,j+3,ii,jj)+
-     *   A(i,j-3,ii+3,jj+3)+ A(i,j+3,ii,jj+3)+
-     *   A(i+3,j+3,ii+3,jj)+ A(i,j+3,ii+3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj+3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum = C(i+3,j+3,ii+3,jj+3)+C(i,j-3,ii,jj)+
-     *   C(i+3,j-3,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j-3,ii+3,jj)+ C(i+3,j+3,ii,jj)+
-     *   C(i,j-3,ii+3,jj+3)+ C(i,j+3,ii,jj+3)+
-     *   C(i+3,j+3,ii+3,jj)+ C(i,j+3,ii+3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj+3)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end   
-C -------------------------------------------SC4108   
-      subroutine SC4108
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,3:0) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4108'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-!dvm$*,shadow_compute(A(0:0,0:0,0:0,3:0)) 
-       do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              B(i,j,ii,jj) = A(i,j,ii,jj-3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum =C(i,j,ii,jj-3) 
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end   
-C -------------------------------------------SC4109   
-      subroutine SC4109
-      integer, parameter :: N = 60,M=60,K=60,L=60,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(11:11,11:11,11:11,11:11) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4109'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            do jj=12,L-11
-              B(i,j,ii,jj) = A(i+11,j+11,ii+11,jj+11)+
-     *   A(i-11,j-11,ii-11,jj-11)+
-     *   A(i+11,j-11,ii-11,jj-11)+ A(i-11,j+11,ii-11,jj-11)+
-     *   A(i-11,j-11,ii+11,jj-11)+ A(i-11,j-11,ii-11,jj+11)+
-     *   A(i+11,j+11,ii-11,jj-11)+ A(i-11,j+11,ii+11,jj-11)+
-     *   A(i-11,j-11,ii+11,jj+11)+ A(i+11,j-11,ii-11,jj+11)+
-     *   A(i+11,j-11,ii+11,jj-11)+ A(i-11,j+11,ii-11,jj+11)+
-     *   A(i+11,j+11,ii+11,jj-11)+ A(i-11,j+11,ii+11,jj+11)+
-     *   A(i+11,j-11,ii+11,jj+11)+ A(i+11,j+11,ii-11,jj+11)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            do jj=12,L-11
-              isum = C(i+11,j+11,ii+11,jj+11)+
-     *   C(i-11,j-11,ii-11,jj-11)+
-     *   C(i+11,j-11,ii-11,jj-11)+ C(i-11,j+11,ii-11,jj-11)+
-     *   C(i-11,j-11,ii+11,jj-11)+ C(i-11,j-11,ii-11,jj+11)+
-     *   C(i+11,j+11,ii-11,jj-11)+ C(i-11,j+11,ii+11,jj-11)+
-     *   C(i-11,j-11,ii+11,jj+11)+ C(i+11,j-11,ii-11,jj+11)+
-     *   C(i+11,j-11,ii+11,jj-11)+ C(i-11,j+11,ii-11,jj+11)+
-     *   C(i+11,j+11,ii+11,jj-11)+ C(i-11,j+11,ii+11,jj+11)+
-     *   C(i+11,j-11,ii+11,jj+11)+ C(i+11,j+11,ii-11,jj+11)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                
-      end 
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc42.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc42.fdv
deleted file mode 100644
index f57e6d1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/SHADOW_COMP/sc42.fdv
+++ /dev/null
@@ -1,801 +0,0 @@
-      program SC42
-     
-c    TESTING OF THE SHADOW DIRECTIVE AND THE SHADOW_COMPUTE CLAUSE       
-c    DISTRIBUTED ARRAY A(N,M,K,L) IS TO HAVE DIFFERENT SHADOW WIDTH
-c    ON BOTH SIDES 
-
-      print *,'===START OF SC42========================'
-C --------------------------------------------------
-      call sc4201
-C --------------------------------------------------
-      call sc4202
-C --------------------------------------------------
-      call sc4203
-C -------------------------------------------------
-      call sc4204
-C -------------------------------------------------
-      call sc4205
-C -------------------------------------------------
-      call sc4206
-C --------------------------------------------------
-      call sc4207
-C --------------------------------------------------
-      call sc4208
-C----------------------------------------------------
-       call sc4209
-C----------------------------------------------------
-
-C
-C
-      print *,'=== END OF SC42 ========================= '    
-      end
-C ---------------------------------------------SC4201
-      subroutine SC4201
-      integer, parameter :: N = 16,M=8,K=8,L=8,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,*)       
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4201'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-            do jj=2,L-1
-            B(i,j,ii,jj) = A(i+1,j+1,ii+1,jj+1)+A(i-1,j-1,ii-1,jj-1)+
-     *   A(i+1,j-1,ii-1,jj-1)+A(i-1,j+1,ii-1,jj-1)+
-     *   A(i-1,j-1,ii+1,jj-1)+ A(i-1,j-1,ii-1,jj+1)+
-     *   A(i+1,j+1,ii-1,jj-1)+A(i-1,j+1,ii+1,jj-1)+
-     *   A(i-1,j-1,ii+1,jj+1)+A(i+1,j-1,ii-1,jj+1)+
-     *   A(i+1,j-1,ii+1,jj-1)+A(i-1,j+1,ii-1,jj+1)+
-     *   A(i+1,j+1,ii+1,jj-1)+A(i-1,j+1,ii+1,jj+1)+
-     *   A(i+1,j-1,ii+1,jj+1)+A(i+1,j+1,ii-1,jj+1)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=2,N-1
-        do j=2,M-1
-          do ii=2,K-1
-            do jj=2,L-1
-              isum = C(i+1,j+1,ii+1,jj+1)+C(i-1,j-1,ii-1,jj-1)+
-     *   C(i+1,j-1,ii-1,jj-1)+ C(i-1,j+1,ii-1,jj-1)+
-     *   C(i-1,j-1,ii+1,jj-1)+ C(i-1,j-1,ii-1,jj+1)+
-     *   C(i+1,j+1,ii-1,jj-1)+ C(i-1,j+1,ii+1,jj-1)+
-     *   C(i-1,j-1,ii+1,jj+1)+ C(i+1,j-1,ii-1,jj+1)+
-     *   C(i+1,j-1,ii+1,jj-1)+ C(i-1,j+1,ii-1,jj+1)+
-     *   C(i+1,j+1,ii+1,jj-1)+ C(i-1,j+1,ii+1,jj+1)+
-     *   C(i+1,j-1,ii+1,jj+1)+ C(i+1,j+1,ii-1,jj+1)         
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C ---------------------------------------------SC4202     
-
-      subroutine SC4202     
-      integer, parameter :: N = 16,M=10,K=10,L=10,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4202'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-            B(i,j,ii,jj) = A(i+2,j+2,ii+2,jj+2)+A(i-2,j-2,ii-2,jj-2)+
-     *   A(i+2,j-2,ii-2,jj-2)+ A(i-2,j+2,ii-2,jj-2)+
-     *   A(i-2,j-2,ii+2,jj-2)+ A(i-2,j-2,ii-2,jj+2)+
-     *   A(i+2,j+2,ii-2,jj-2)+ A(i-2,j+2,ii+2,jj-2)+
-     *   A(i-2,j-2,ii+2,jj+2)+ A(i+2,j-2,ii-2,jj+2)+
-     *   A(i+2,j-2,ii+2,jj-2)+ A(i-2,j+2,ii-2,jj+2)+
-     *   A(i+2,j+2,ii+2,jj-2)+ A(i-2,j+2,ii+2,jj+2)+
-     *   A(i+2,j-2,ii+2,jj+2)+ A(i+2,j+2,ii-2,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i+2,j+2,ii+2,jj+2)+C(i-2,j-2,ii-2,jj-2)+
-     *   C(i+2,j-2,ii-2,jj-2)+ C(i-2,j+2,ii-2,jj-2)+
-     *   C(i-2,j-2,ii+2,jj-2)+ C(i-2,j-2,ii-2,jj+2)+
-     *   C(i+2,j+2,ii-2,jj-2)+ C(i-2,j+2,ii+2,jj-2)+
-     *   C(i-2,j-2,ii+2,jj+2)+ C(i+2,j-2,ii-2,jj+2)+
-     *   C(i+2,j-2,ii+2,jj-2)+ C(i-2,j+2,ii-2,jj+2)+
-     *   C(i+2,j+2,ii+2,jj-2)+ C(i-2,j+2,ii+2,jj+2)+
-     *   C(i+2,j-2,ii+2,jj+2)+ C(i+2,j+2,ii-2,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------SC4203      
-      subroutine SC4203
-      integer, parameter :: N = 16,M=10,K=10,L=10,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK,BLOCK)   
-!dvm$ shadow(2:2,2:2,2:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4203'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-!dvm$*,shadow_compute(A(2:0,2:2,2:0,2:0))
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i-2,j-2,ii-2,jj-2)+
-     *   A(i,j-2,ii,jj)+ A(i-2,j-2,ii,jj)+
-     *   A(i,j-2,ii,jj)+ A(i,j-2,ii-2,jj)+
-     *   A(i-2,j-2,ii,jj)+ A(i,j-2,ii-2,jj-2)+
-     *   A(i,j-2,ii,jj-2)+ A(i-2,j-2,ii-2,jj)+
-     *   A(i,j-2,ii-2,jj-2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i-2,j-2,ii-2,jj-2)+
-     *   C(i,j-2,ii,jj)+ C(i-2,j-2,ii,jj)+
-     *   C(i,j-2,ii,jj)+ C(i,j-2,ii-2,jj)+
-     *   C(i-2,j-2,ii,jj)+ C(i,j-2,ii-2,jj-2)+
-     *   C(i,j-2,ii,jj-2)+ C(i-2,j-2,ii-2,jj)+
-     *   C(i,j-2,ii-2,jj-2)
-             if (B(i,j,ii,jj).ne.isum) then
-               nloopi=min(nloopi,i)
-               nloopj=min(nloopj,j)
-               nloopii=min(nloopii,ii)
-               nloopjj=min(nloopjj,jj)         
-             endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end      
-C ------------------------------------------SC4204   
-      subroutine SC4204
-      integer, parameter :: N = 16,M=10,K=10,L=10,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:2,2:2,0:2,0:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4204'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i+2,j+2,ii+2,jj)+
-     *   A(i,j-2,ii,jj)+ A(i+2,j-2,ii,jj)+
-     *   A(i,j+2,ii,jj)+ A(i,j-2,ii+2,jj)+
-     *   A(i+2,j+2,ii,jj)+ A(i,j-2,ii+2,jj+2)+
-     *   A(i,j+2,ii,jj+2)+ A(i+2,j+2,ii+2,jj)+
-     *   A(i,j+2,ii+2,jj+2)+A(i+2,j-2,ii+2,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i+2,j+2,ii+2,jj)+
-     *   C(i,j-2,ii,jj)+ C(i+2,j-2,ii,jj)+
-     *   C(i,j+2,ii,jj)+ C(i,j-2,ii+2,jj)+
-     *   C(i+2,j+2,ii,jj)+ C(i,j-2,ii+2,jj+2)+
-     *   C(i,j+2,ii,jj+2)+ C(i+2,j+2,ii+2,jj)+
-     *   C(i,j+2,ii+2,jj+2)+C(i+2,j-2,ii+2,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end  
-C ------------------------------------------SC4205
-      subroutine SC4205
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,*)   
-!dvm$ shadow(2:2,2:0,0:2,2:2) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4205'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-!dvm$*,shadow_compute(A(0:0,0:0,0:0,0:2)) 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              B(i,j,ii,jj) = A(i,j,ii,jj+2)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=3,N-2
-        do j=3,M-2
-          do ii=3,K-2
-            do jj=3,L-2
-              isum = C(i,j,ii,jj+2)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end  
-C --------------------------------------------SC4206  
-      subroutine SC4206
-      integer, parameter :: N = 32,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,*,BLOCK)   
-!dvm$ shadow(3:3,3:3,3:3,3:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4206'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-            B(i,j,ii,jj) = A(i+3,j+3,ii+3,jj+3)+A(i-3,j-3,ii-3,jj-3)+
-     *   A(i+3,j-3,ii-3,jj-3)+ A(i-3,j+3,ii-3,jj-3)+
-     *   A(i-3,j-3,ii+3,jj-3)+ A(i-3,j-3,ii-3,jj+3)+
-     *   A(i+3,j+3,ii-3,jj-3)+ A(i-3,j+3,ii+3,jj-3)+
-     *   A(i-3,j-3,ii+3,jj+3)+ A(i+3,j-3,ii-3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj-3)+ A(i-3,j+3,ii-3,jj+3)+
-     *   A(i+3,j+3,ii+3,jj-3)+ A(i-3,j+3,ii+3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj+3)+ A(i+3,j+3,ii-3,jj+3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum = C(i+3,j+3,ii+3,jj+3)+C(i-3,j-3,ii-3,jj-3)+
-     *   C(i+3,j-3,ii-3,jj-3)+ C(i-3,j+3,ii-3,jj-3)+
-     *   C(i-3,j-3,ii+3,jj-3)+ C(i-3,j-3,ii-3,jj+3)+
-     *   C(i+3,j+3,ii-3,jj-3)+ C(i-3,j+3,ii+3,jj-3)+
-     *   C(i-3,j-3,ii+3,jj+3)+ C(i+3,j-3,ii-3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj-3)+ C(i-3,j+3,ii-3,jj+3)+
-     *   C(i+3,j+3,ii+3,jj-3)+ C(i-3,j+3,ii+3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj+3)+ C(i+3,j+3,ii-3,jj+3)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -------------------------------------------SC4207   
-      subroutine SC4207
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,*,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,0:3) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4207'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              B(i,j,ii,jj) = A(i+3,j+3,ii+3,jj+3)+A(i,j-3,ii,jj)+
-     *   A(i+3,j-3,ii,jj)+ A(i,j+3,ii,jj)+
-     *   A(i,j-3,ii+3,jj)+ A(i+3,j+3,ii,jj)+
-     *   A(i,j-3,ii+3,jj+3)+ A(i,j+3,ii,jj+3)+
-     *   A(i+3,j+3,ii+3,jj)+ A(i,j+3,ii+3,jj+3)+
-     *   A(i+3,j-3,ii+3,jj+3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum = C(i+3,j+3,ii+3,jj+3)+C(i,j-3,ii,jj)+
-     *   C(i+3,j-3,ii,jj)+ C(i,j+3,ii,jj)+
-     *   C(i,j-3,ii+3,jj)+ C(i+3,j+3,ii,jj)+
-     *   C(i,j-3,ii+3,jj+3)+ C(i,j+3,ii,jj+3)+
-     *   C(i+3,j+3,ii+3,jj)+ C(i,j+3,ii+3,jj+3)+
-     *   C(i+3,j-3,ii+3,jj+3)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end   
-C -------------------------------------------SC4208   
-      subroutine SC4208
-      integer, parameter :: N = 16,M=16,K=16,L=16,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(*,BLOCK,BLOCK,BLOCK)   
-!dvm$ shadow(0:3,3:3,0:3,3:0) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4208'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj)
-!dvm$*,shadow_compute(A(0:0,0:0,0:0,3:0)) 
-       do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              B(i,j,ii,jj) = A(i,j,ii,jj-3)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=4,N-3
-        do j=4,M-3
-          do ii=4,K-3
-            do jj=4,L-3
-              isum =C(i,j,ii,jj-3) 
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end   
-C -------------------------------------------SC4209   
-      subroutine SC4209
-      integer, parameter :: N = 60,M=60,K=60,L=60,NL=1000
-      integer, allocatable :: A(:,:,:,:),B(:,:,:,:),C(:,:,:,:)
-      integer nloopi,nloopj,nloopii,nloopjj,isum
-      character*6 tname 
-
-!dvm$ distribute B(BLOCK,BLOCK,BLOCK,*)   
-!dvm$ shadow(11:11,11:11,11:11,11:11) :: A      
-!dvm$ align (i,j,ii,jj) with B(i,j,ii,jj) ::A
-
-      tname='SC4209'     
-      allocate (B(N,M,K,L),A(N,M,K,L),C(N,M,K,L))
-      NNL=NL    
-      call serial4(C,N,M,K,L,NNL)
-      nloopi=NL
-      nloopj=NL
-      nloopii=NL
-      nloopjj=NL
-
-!dvm$ actual(nloopi,nloopj,nloopii,nloopjj)
-!dvm$ region local(A,B)
-!dvm$ parallel (i,j,ii,jj) on A(i,j,ii,jj),shadow_compute 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              A(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                                                
- 
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            do jj=12,L-11
-              B(i,j,ii,jj) = A(i+11,j+11,ii+11,jj+11)+
-     *   A(i-11,j-11,ii-11,jj-11)+
-     *   A(i+11,j-11,ii-11,jj-11)+ A(i-11,j+11,ii-11,jj-11)+
-     *   A(i-11,j-11,ii+11,jj-11)+ A(i-11,j-11,ii-11,jj+11)+
-     *   A(i+11,j+11,ii-11,jj-11)+ A(i-11,j+11,ii+11,jj-11)+
-     *   A(i-11,j-11,ii+11,jj+11)+ A(i+11,j-11,ii-11,jj+11)+
-     *   A(i+11,j-11,ii+11,jj-11)+ A(i-11,j+11,ii-11,jj+11)+
-     *   A(i+11,j+11,ii+11,jj-11)+ A(i-11,j+11,ii+11,jj+11)+
-     *   A(i+11,j-11,ii+11,jj+11)+ A(i+11,j+11,ii-11,jj+11)
-            enddo
-          enddo 
-        enddo 
-      enddo
-  
-!dvm$ parallel (i,j,ii,jj) on B(i,j,ii,jj),
-!dvm$*reduction( min( nloopi),min(nloopj),min(nloopii),min(nloopjj))
-!dvm$*,private(isum)
-      do i=12,N-11
-        do j=12,M-11
-          do ii=12,K-11
-            do jj=12,L-11
-              isum = C(i+11,j+11,ii+11,jj+11)+
-     *   C(i-11,j-11,ii-11,jj-11)+
-     *   C(i+11,j-11,ii-11,jj-11)+ C(i-11,j+11,ii-11,jj-11)+
-     *   C(i-11,j-11,ii+11,jj-11)+ C(i-11,j-11,ii-11,jj+11)+
-     *   C(i+11,j+11,ii-11,jj-11)+ C(i-11,j+11,ii+11,jj-11)+
-     *   C(i-11,j-11,ii+11,jj+11)+ C(i+11,j-11,ii-11,jj+11)+
-     *   C(i+11,j-11,ii+11,jj-11)+ C(i-11,j+11,ii-11,jj+11)+
-     *   C(i+11,j+11,ii+11,jj-11)+ C(i-11,j+11,ii+11,jj+11)+
-     *   C(i+11,j-11,ii+11,jj+11)+ C(i+11,j+11,ii-11,jj+11)
-              if (B(i,j,ii,jj).ne.isum) then
-                nloopi=min(nloopi,i)
-                nloopj=min(nloopj,j)
-                nloopii=min(nloopii,ii)
-                nloopjj=min(nloopjj,jj)         
-              endif
-            enddo
-          enddo
-        enddo
-      enddo
-!dvm$ end region   
-!dvm$ get_actual(nloopi,nloopj,nloopii,nloopjj) 
-
-      if (nloopi .eq.NL) then
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif
-      deallocate (A,B,C)
-
-      end
-C -----------------------------------------------         
-      subroutine serial4(AR,N,M,K,L,NL)
-      integer AR(N,M,K,L)
-      integer NL 
-      do i=1,N
-        do j=1,M
-          do ii=1,K
-            do jj=1,L
-              AR(i,j,ii,jj) = NL+i+j+ii+jj
-            enddo
-          enddo
-        enddo
-      enddo                
-      end 
-
-      subroutine ansyes(name)
-      character*6 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*6 name
-      print *,name,'  -  ***error'
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv
deleted file mode 100644
index b082d22..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst11.fdv
+++ /dev/null
@@ -1,236 +0,0 @@
-	PROGRAM    taskst11
-!	rectangular grid is distributed on two blocks
-!
-!	
-	PARAMETER   (K=8, N1 = 4, ITMAX=20, N2 = K-N1, ER = 10000)
-	REAL,ALLOCATABLE :: A(:,:),A1(:,:),A2(:,:)
-        REAL,ALLOCATABLE :: B(:,:),B1(:,:),B2(:,:),B_1(:,:),B_2(:,:) 
-        INTEGER LP(2),HP(2), ERRT1, ERRT2
-        CHARACTER*8:: TNAME='taskst11'
-!DVM$	PROCESSORS    P(NUMBER_OF_PROCESSORS( ))
-!DVM$	TASK  MB( 2 )
-!DVM$	DISTRIBUTE   A(*,BLOCK) ONTO P
-!DVM$	ALIGN   B( I, J )  WITH  A( I, J )
-!DVM$	ALIGN   B1( I, J )  WITH  A1( I, J ) 
-!DVM$	ALIGN   B2( I, J )  WITH  A2( I, J ) 
-!DVM$	DISTRIBUTE  ::  A1, A2 
-
-        PRINT *,  '===START OF taskst11 ====================='
-        CALL DPT(LP,HP,2)
-!DVM$	MAP  MB( 1 )  ONTO  P( LP(1) : HP(1) )
-        ALLOCATE(A1(N1+1,K))
-!DVM$	REDISTRIBUTE  A1( *, BLOCK )  ONTO  MB( 1 )
-        ALLOCATE(B1(N1+1,K))
-!DVM$	MAP  MB( 2 )   ONTO  P( LP(2) : HP(2) )
-        ALLOCATE(A2(N2+1,K))
-!DVM$	REDISTRIBUTE  A2( *, BLOCK )  ONTO  MB( 2 )
-        ALLOCATE(B2(N2+1,K))
-        ALLOCATE(A(K,K),B(K,K),B_1(K,K),B_2(K,K))
-!		Initialization
-!DVM$   TASK_REGION MB
-!DVM$   ON MB(1)
-!DVM$   REGION
-!DVM$	PARALLEL    ( J, I )   ON   A1(I, J)
-	DO  J  =  1, K
-	   DO I  =  1, N1
-		IF(I.EQ.1 .OR. J.EQ.1 .OR. J.EQ.K) THEN
-			A1(I, J) = 0.
-			B1(I, J) = 0.
-		ELSE
-			B1(I, J)  = 1. + I + J 
-			A1(I, J) = B1(I, J)
-		ENDIF
-           ENDDO
-        ENDDO
-!DVM$   END REGION
-!DVM$   END ON
-!DVM$   ON MB(2)
-!DVM$   REGION
-!DVM$	PARALLEL    ( J, I )   ON   A2(I, J)
-	DO  J  =  1, K
-           DO  I  =  2, N2+1
-		IF(I.EQ.N2+1 .OR. J.EQ.1 .OR. J.EQ.K) THEN
-			A2(I, J) = 0.
-			B2(I, J) = 0.
-		ELSE
-			B2(I, J)  = 1. + (I+N1-1) + J 
-			A2(I, J) = B2(I, J)
-		ENDIF
-           ENDDO
-        ENDDO
-!DVM$   END REGION
-!DVM$   END ON
-!DVM$   END TASK_REGION
-      
-	DO  2   IT  =  1, ITMAX
-
-!		exchange bounds
-!DVM$   GET_ACTUAL (B2(2,:),B1(N1, :))
-!DVM$	PARALLEL    ( J )   ON   A1(N1+1, J),
-!DVM$*  REMOTE_ACCESS  (B2( 2, J ) )
-	DO  J  =  1, K
-            A1(N1+1, J) = B2(2, J)
-        ENDDO
-!DVM$	PARALLEL    ( J )   ON   A2( 1, J),
-!DVM$*  REMOTE_ACCESS  (B1( N1, J ) )
-	DO  J  =  1, K
-            A2(1, J) = B1(N1, J)
-        ENDDO
-!DVM$   ACTUAL (A2(1, :),A1(N1+1,:))
-!DVM$	TASK_REGION MB
-!DVM$	ON   MB( 1 )
-!DVM$   REGION
-!DVM$	PARALLEL    ( J, I )   ON   B1(I, J),
-!DVM$*  SHADOW_RENEW ( A1 )
-	DO  J  =  2, K-1
-            DO  I  =  2, N1
-                 B1(I, J)=(A1(I-1, J) + A1(I,J-1) + 
-     *           A1(I+1,J) + A1(I,J+1))/4
-            ENDDO
-        ENDDO
-
-!DVM$	PARALLEL    ( J, I )   ON   A1(I, J)
-	DO  J  =  2, K-1
-   	    DO  I  =  2, N1
-                A1(I, J) =  B1( I, J )
-            ENDDO
-        ENDDO 
-!DVM$   END REGION
-!DVM$	END ON
-!DVM$	ON   MB( 2 )
-!DVM$   REGION
-!DVM$	PARALLEL    ( J, I )   ON   B2(I, J),
-!DVM$*  SHADOW_RENEW ( A2 )
-	DO  J  =  2, K-1
-            DO  I  =  2, N2
-                B2(I,J) = (A2(I-1,J) + A2(I,J-1) + 
-     *          A2(I+1,J) + A2(I,J+1))/4
-            ENDDO
-        ENDDO          
-!DVM$	PARALLEL    ( J, I )   ON   A2(I, J)
-	DO  J  =  2, K-1
-            DO  I  =  2, N2
-                A2(I, J) =  B2( I, J )
-            ENDDO
-        ENDDO 
-!DVM$   END REGION
-!DVM$	END ON
-!DVM$	END  TASK_REGION
-2       CONTINUE
-!1-task JACOBI   
-
-!DVM$   REGION   
-!DVM$   PARALLEL    (J,I)   ON   A(I, J)
-!		nest of two parallel loops, iteration (i,j) will be executed on 
-!		processor, which is owner of element A(i,j) 
-            DO  J  =  1, K
-                DO  I  =  1, K
-                    A(I,  J)  =  0.
-                    IF(I.EQ.1.OR.J.EQ.1.OR.I.EQ.K.OR.J.EQ.K) THEN
-                       B(I,  J) = 0.
-                    ELSE
-                       B(I,  J)  = ( 1. + I + J )
-                    ENDIF
-                ENDDO
-            ENDDO
-!DVM$   END REGION            
-        DO  IT  =  1,  ITMAX
-!DVM$  REGION       
-!DVM$   PARALLEL  (J,  I)   ON  A(I,  J)
-!		variable EPS is used for calculation of maximum value
-                  DO  J  =  2, K-1
-                      DO  I  =  2, K-1
-                         A(I, J)  =  B(I, J)
-                      ENDDO
-                  ENDDO
-!DVM$   PARALLEL  (J,  I)   ON  B(I,  J),   SHADOW_RENEW   (A)
-!		Copying shadow elements of array A from 
-!		neighbouring processors before loop execution
-                  DO  J = 2,  K-1
-                      DO  I = 2,  K-1
-        B(I, J) =  (A( I-1, J ) + A( I, J-1 ) + A( I+1, J)+
-     *                        A( I, J+1 )) / 4
-                      ENDDO
-                  ENDDO
-!DVM$ END REGION
-        ENDDO
-!DVM$ GET_ACTUAL (B,B1,B2)
-      ERRT1 = ER
-      ERRT2 = ER
-!   compare 2-task JACOBI with 1-task JACOBI
-!DVM$ PARALLEL (I,J)  ON B1(I,J),REMOTE_ACCESS (B(I,J))
-      DO I = 2,N1
-         DO J = 2, K-1
-            B_1(I,J) = B(I,J)
-         ENDDO
-      ENDDO 
-!DVM$ PARALLEL (I,J)  ON B2(I,J),REMOTE_ACCESS (B(I+(N1-1),J))
-      DO I = 2,N2
-         DO J = 2, K-1
-            B_2(I,J) = B(I+(N1-1),J)
-         ENDDO
-      ENDDO 
-
-!DVM$ TASK_REGION MB
-!DVM$ ON MB(1) 
-!DVM$ PARALLEL (I,J)  ON B1(I,J), REDUCTION(MIN(ERRT1))
-      DO I = 2,N1
-         DO J = 2, K-1            
-            IF(B1(I,J).NE.B_1(I,J)) THEN
-              ERRT1 = MIN(ERRT1, I)  
-            ENDIF 
-         ENDDO
-      ENDDO 
-!DVM$ END ON
-!DVM$ ON MB(2)
-!DVM$ PARALLEL (I,J)  ON B2(I,J), REDUCTION(MIN(ERRT2))
-      DO I = 2,N2
-         DO J = 2, K-1
-            IF(B2(I,J).NE.B_2(I,J)) THEN   
-              ERRT2 = MIN(ERRT2, I)  
-            ENDIF 
-         ENDDO
-      ENDDO 
-!DVM$ END ON
-!DVM$ END TASK_REGION
-!DVM$ GET_ACTUAL(ERRT1,ERRT2)
-      IF (ERRT1 .EQ. ER .AND. ERRT2 .EQ. ER) THEN    
-          CALL ANSYES(TNAME)
-      ELSE
-          CALL ANSNO (TNAME)
-      ENDIF
-      DEALLOCATE (B,B_1,B_2,B1,B2,A,A1,A2)
-   
-      PRINT *,  '=== END OF taskst11 ======================'
-      END
-
-      SUBROUTINE DPT(LP,HP,NT)
-!     distributing processors for NT tasks (NT = 2)      
-      INTEGER LP(2), HP(2)
-      NUMBER_OF_PROCESSORS() = 1
-!DVM$ DEBUG 1 (D = 0)
-      NP = NUMBER_OF_PROCESSORS()
-      NTP = NP/NT
-      IF(NP.EQ.1) THEN
-         LP(1) = 1
-         HP(1) = 1
-         LP(2) = 1
-         HP(2) = 1
-      ELSE
-         LP(1) = 1
-         HP(1) = NTP
-         LP(2) = NTP+1
-         HP(2) = NP
-      END IF
-!DVM$ ENDDEBUG 1
-      END
-C -------------------------------------------------
-
-      SUBROUTINE ANSYES(NAME)
-      CHARACTER*8 NAME
-      PRINT *, NAME, '  -  complete'
-      END
-      SUBROUTINE ANSNO (NAME)
-      CHARACTER*8 NAME
-      PRINT *, NAME, '  -  ***error'
-      END
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv
deleted file mode 100644
index adf117b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst12.fdv
+++ /dev/null
@@ -1,207 +0,0 @@
-	PROGRAM    taskst12
-!	rectangular grid is distributed on two blocks
-!
-!	
-	INTEGER,PARAMETER :: K=8, N1=4, ITMAX=20, N2=K-N1, ER=10000
-	REAL,ALLOCATABLE :: A(:,:),A1(:,:),A2(:,:)
-        REAL,ALLOCATABLE :: B(:,:),B1(:,:),B2(:,:) 
-        INTEGER,DIMENSION(2) :: LP,HP
-        INTEGER :: ERRT
-        CHARACTER*8:: TNAME='taskst12'
-CDVM$	PROCESSORS    P(NUMBER_OF_PROCESSORS( ))
-CDVM$	TASK  MB( 2 )
-CDVM$	DISTRIBUTE   A(*,BLOCK)
-CDVM$	ALIGN   B( I, J )  WITH  A( I, J )
-CDVM$	DISTRIBUTE  ::  A1, A2
-CDVM$	ALIGN ::  B1,B2
-   
-        PRINT *,  '===START OF taskst12 ====================='
-        CALL DPT(LP,HP,2)
-CDVM$	MAP  MB( 1 )  ONTO  P( LP(1) : HP(1) )
-        ALLOCATE(A1(N1+1,K))
-CDVM$	REDISTRIBUTE  A1( *, BLOCK )  ONTO  MB( 1 )
-        ALLOCATE(B1(N1+1,K))
-CDVM$	REALIGN   B1( I, J )  WITH  A1( I, J ) 
-
-CDVM$	MAP  MB( 2 )   ONTO  P( LP(2) : HP(2) )
-        ALLOCATE(A2(N2+1,K))
-CDVM$	REDISTRIBUTE  A2( *, BLOCK )  ONTO  MB( 2 )
-        ALLOCATE(B2(N2+1,K))
-CDVM$	REALIGN   B2( I, J )  WITH  A2( I, J )
-
-        ALLOCATE(A(K,K),B(K,K))
-
-!		Initialization
-!DVM$   TASK_REGION MB
-!DVM$   ON MB(1)
-!DVM$   REGION
-!DVM$	PARALLEL    ( J, I )   ON   A1(I, J)
-	DO  J  =  1, K
-	   DO I  =  1, N1
-		IF(I.EQ.1 .OR. J.EQ.1 .OR. J.EQ.K) THEN
-			A1(I, J) = 0.
-			B1(I, J) = 0.
-		ELSE
-			B1(I, J)  = 1. + I + J 
-			A1(I, J) = B1(I, J)
-		ENDIF
-           ENDDO
-        ENDDO
-!DVM$   END REGION
-!DVM$   END ON
-!DVM$   ON MB(2)
-!DVM$   REGION
-!DVM$	PARALLEL    ( J, I )   ON   A2(I, J)
-	DO  J  =  1, K
-           DO  I  =  2, N2+1
-		IF(I.EQ.N2+1 .OR. J.EQ.1 .OR. J.EQ.K) THEN
-			A2(I, J) = 0.
-			B2(I, J) = 0.
-		ELSE
-			B2(I, J)  = 1. + (I+N1-1) + J 
-			A2(I, J) = B2(I, J)
-		ENDIF
-           ENDDO
-        ENDDO
-!DVM$   END REGION
-!DVM$   END ON
-!DVM$   END TASK_REGION
-      
-	DO  2   IT  =  1, ITMAX
-
-!		exchange bounds
-!DVM$   GET_ACTUAL (B2(2,:),B1(N1, :))
-        A1(N1+1,:) = B2(2, :)
-        A2(1, :)   = B1(N1, :)
-!DVM$   ACTUAL (A2(1, :),A1(N1+1,:))
-!DVM$	TASK_REGION MB
-!DVM$	ON   MB( 1 )
-!DVM$   REGION
-!DVM$	PARALLEL    ( J, I )   ON   B1(I, J),
-!DVM$*  SHADOW_RENEW ( A1 )
-	DO  J  =  2, K-1
-            DO  I  =  2, N1
-                 B1(I, J)=(A1(I-1, J) + A1(I,J-1) + 
-     *           A1(I+1,J) + A1(I,J+1))/4
-            ENDDO
-        ENDDO
-
-!DVM$	PARALLEL    ( J, I )   ON   A1(I, J)
-	DO  J  =  2, K-1
-   	    DO  I  =  2, N1
-                A1(I, J) =  B1( I, J )
-            ENDDO
-        ENDDO 
-!DVM$   END REGION
-!DVM$	END ON
-!DVM$	ON   MB( 2 )
-!DVM$   REGION
-!DVM$	PARALLEL    ( J, I )   ON   B2(I, J),
-!DVM$*  SHADOW_RENEW ( A2 )
-	DO  J  =  2, K-1
-            DO  I  =  2, N2
-                B2(I,J) = (A2(I-1,J) + A2(I,J-1) + 
-     *          A2(I+1,J) + A2(I,J+1))/4
-            ENDDO
-        ENDDO          
-!DVM$	PARALLEL    ( J, I )   ON   A2(I, J)
-	DO  J  =  2, K-1
-            DO  I  =  2, N2
-                A2(I, J) =  B2( I, J )
-            ENDDO
-        ENDDO 
-!DVM$   END REGION
-!DVM$	END ON
-!DVM$	END  TASK_REGION
-2       CONTINUE
-!1-task JACOBI   
-
-!DVM$   REGION   
-!DVM$   PARALLEL    (J,I)   ON   A(I, J)
-!		nest of two parallel loops, iteration (i,j) will be executed on 
-!		processor, which is owner of element A(i,j) 
-            DO  J  =  1, K
-                DO  I  =  1, K
-                    A(I,  J)  =  0.
-                    IF(I.EQ.1.OR.J.EQ.1.OR.I.EQ.K.OR.J.EQ.K) THEN
-                       B(I,  J) = 0.
-                    ELSE
-                       B(I,  J)  = ( 1. + I + J )
-                    ENDIF
-                ENDDO
-            ENDDO
-!DVM$   END REGION            
-        DO  IT  =  1,  ITMAX
-!DVM$  REGION       
-!DVM$   PARALLEL  (J,  I)   ON  A(I,  J)
-!		variable EPS is used for calculation of maximum value
-                  DO  J  =  2, K-1
-                      DO  I  =  2, K-1
-                         A(I, J)  =  B(I, J)
-                      ENDDO
-                  ENDDO
-!DVM$   PARALLEL  (J,  I)   ON  B(I,  J),   SHADOW_RENEW   (A)
-!		Copying shadow elements of array A from 
-!		neighbouring processors before loop execution
-                  DO  J = 2,  K-1
-                      DO  I = 2,  K-1
-        B(I, J) =  (A( I-1, J ) + A( I, J-1 ) + A( I+1, J)+
-     *                        A( I, J+1 )) / 4
-                      ENDDO
-                  ENDDO
-!DVM$ END REGION
-        ENDDO
-!DVM$ GET_ACTUAL (B,B1,B2)
-!   compare 2-task JACOBI with 1-task JACOBI
-      A(2:N1,:) = B1(2:N1,:)
-      A(N1+1:N1+N2-1,:) = B2(2:N2,:)
-      ERRT = ER
-!DVM$ PARALLEL (I,J)  ON B(I,J), REDUCTION(MIN(ERRT))
-      DO I = 2, K-1
-         DO J = 2, K-1
-            IF(A(I,J) .NE. B(I,J)) THEN
-               ERRT = MIN(ERRT,I)
-            ENDIF 
-         ENDDO
-      ENDDO 
-      IF (ERRT .EQ. ER) THEN     
-          CALL ANSYES(TNAME)
-      ELSE
-          CALL ANSNO(TNAME)
-      ENDIF 
-
-      DEALLOCATE (B,B1,B2,A,A1,A2)
-      PRINT *,  '=== END OF taskst12 ====================='
-
-      END
-
-      SUBROUTINE DPT(LP,HP,NT)
-!     distributing processors for NT tasks (NT = 2)      
-      INTEGER LP(2), HP(2)
-      NUMBER_OF_PROCESSORS() = 1
-!DVM$ DEBUG 1 (D = 0)
-      NP = NUMBER_OF_PROCESSORS()
-      NTP = NP/NT
-      IF(NP.EQ.1) THEN
-         LP(1) = 1
-         HP(1) = 1
-         LP(2) = 1
-         HP(2) = 1
-      ELSE
-         LP(1) = 1
-         HP(1) = NTP
-         LP(2) = NTP+1
-         HP(2) = NP
-      END IF
-!DVM$ ENDDEBUG 1
-      END
-C -------------------------------------------------
-
-      SUBROUTINE ANSYES(NAME)
-      CHARACTER*8 NAME
-      PRINT *, NAME, '  -  complete'
-      END
-      SUBROUTINE ANSNO (NAME)
-      CHARACTER*8 NAME
-      PRINT *, NAME, '  -  ***error'
-      END
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90
deleted file mode 100644
index 5e1dc26..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst21.f90
+++ /dev/null
@@ -1,229 +0,0 @@
-program taskst21
-    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1, er = 10000
-    real, allocatable :: a( :, :, : ), a1( :, :, : ), a2( :, :, : )
-    real, allocatable :: b( :, :, : ), b1( :, :, : ), b2( :, :, : )
-    integer lp( 2 ), hp( 2 ), errt
-    character*8 :: tname = 'taskst21'
-    !dvm$ processors p( processors_size( 1 ), processors_size( 2 ) )
-    !dvm$ task mb( 2 )
-
-    !dvm$ distribute a( *, block, block ) onto p
-    !dvm$ align b( i, j, ii ) with a( i, j, ii )
-
-    !dvm$ distribute :: a1, a2
-    !dvm$ align b1( i, j, ii ) with a1( i, j, ii )
-    !dvm$ align b2( i, j, ii ) with a2( i, j, ii )
-    print *,  '===START OF taskst21 ====================='
-    call dpt( lp, hp, 2 )
-    !dvm$ map mb( 1 ) onto p( lp( 1 ) : hp( 1 ), : )
-    allocate( a1( n1 + 1, k, k ) )
-    !dvm$ redistribute a1( *, block, block ) onto mb( 1 )
-    allocate( b1( n1 + 1, k, k ) )
-
-    !dvm$ map mb( 2 ) onto p( lp( 2 ) : hp( 2 ), : )
-    allocate( a2( n2 + 1, k, k ) )
-    !dvm$ redistribute a2( *, block, block ) onto mb( 2 )
-    allocate( b2( n2 + 1, k, k ) )
-
-    allocate( a( k, k, k ), b( k, k, k ) )
-
-    !initialization
-    !dvm$ task_region mb
-    !dvm$ on mb( 1 )
-    !dvm$ region
-        !dvm$ parallel ( ii, j, i ) on a1( i, j, ii )
-        do ii = 1, k
-            do j = 1, k
-                do i = 1, n1
-                    if( i .eq. 1 .or. j .eq. 1 .or. j .eq. k .or. ii .eq. 1 .or. ii .eq. k ) then
-                        a1( i, j, ii ) = 0.
-                        b1( i, j, ii ) = 0.
-                    else
-                        b1( i, j, ii ) = 1. + i + j + ii
-                        a1( i, j, ii ) = b1( i, j, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-    !dvm$ end on
-    !dvm$ on mb( 2 )
-    !dvm$ region
-        !dvm$ parallel ( ii, j, i ) on a2( i, j, ii )
-        do ii = 1, k
-            do j = 1, k
-                do i = 2, n2 + 1
-                    if( i .eq. n2 + 1 .or. j .eq. 1 .or. j .eq. k .or. ii .eq. 1 .or. ii .eq. k ) then
-                        a2( i, j, ii ) = 0.
-                        b2( i, j, ii ) = 0.
-                    else
-                        b2( i, j, ii ) = 1. + ( i + n1 - 1 ) + j + ii
-                        a2( i, j, ii ) = b2( i, j, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-    !dvm$ end on
-    !dvm$ end task_region
-
-    do it = 1, itmax
-        !exchange bounds
-	!dvm$ get_actual(b2( 2, :, : ),b1( n1, :, : ))
-        !dvm$ parallel ( ii, j ) on a1( n1 + 1, j, ii ), remote_access ( b2( 2, j, ii ) )
-        do ii = 1, k
-            do j = 1, k
-                a1( n1 + 1, j, ii ) = b2( 2, j, ii )
-            enddo
-        enddo
-	
-        !dvm$ parallel ( ii, j ) on a2( 1, j, ii ), remote_access ( b1( n1, j, ii ) )
-        do ii = 1, k
-            do j = 1, k
-                a2( 1, j, ii ) = b1( n1, j, ii )
-            enddo
-        enddo
-	!dvm$ actual(a1( n1 + 1, :, : ),a2( 1, :, : ))
-        !dvm$ task_region mb
-            !dvm$ on mb( 1 )
-                !dvm$ region
-                    !dvm$ parallel ( ii, j, i ) on b1( i, j, ii ), shadow_renew ( a1 )
-                    do ii = 2, k - 1
-                        do j = 2, k - 1
-                            do i = 2, n1
-                                b1( i, j, ii ) = ( a1( i - 1, j, ii ) + a1( i + 1, j, ii ) + &
-                                                   a1( i, j - 1, ii ) + a1( i, j + 1, ii ) + &
-                                                   a1( i, j, ii - 1 ) + a1( i, j, ii + 1 ) ) / 6
-                            enddo
-                        enddo
-                    enddo
-
-                    !dvm$ parallel ( ii, j, i ) on a1( i, j, ii )
-                    do ii = 2, k - 1
-                        do j = 2, k - 1
-                            do i = 2, n1
-                                a1( i, j, ii ) = b1( i, j, ii )
-                            enddo
-                        enddo
-                    enddo
-                !dvm$ end region
-            !dvm$ end on
-
-            !dvm$ on mb( 2 )
-                !dvm$ region
-                    !dvm$ parallel ( ii, j, i ) on b2( i, j, ii ), shadow_renew ( a2 )
-                    do ii = 2, k - 1
-                        do j = 2, k - 1
-                            do i = 2, n2
-                                b2( i, j, ii ) = ( a2( i - 1, j, ii ) + a2( i + 1, j, ii ) + &
-                                                   a2( i, j - 1, ii ) + a2( i, j + 1, ii ) + &
-                                                   a2( i, j, ii - 1 ) + a2( i, j, ii + 1 ) ) / 6
-                            enddo
-                        enddo
-                    enddo
-                    !dvm$ parallel ( ii, j, i ) on a2( i, j, ii )
-                    do ii = 2, k - 1
-                        do j = 2, k - 1
-                            do i = 2, n2
-                                a2( i, j, ii ) = b2( i, j, ii )
-                            enddo
-                        enddo
-                    enddo
-                !dvm$ end region
-            !dvm$ end on
-        !dvm$ end task_region
-    enddo
-
-    !1 - task jacobi
-    !dvm$ region
-        !dvm$ parallel ( ii, j, i ) on a( i, j, ii )
-        do ii = 1, k
-            do j = 1, k
-                do i = 1, k
-                    a( i, j, ii ) = 0.
-                    if( i .eq. 1 .or. j .eq. 1 .or. i .eq. k .or. j .eq. k .or. ii .eq. 1 .or. ii .eq. k ) then
-                        b( i, j, ii ) = 0.
-                    else
-                        b( i, j, ii ) = ( 1. + i + j + ii )
-                    endif
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-
-    do it = 1, itmax
-        !dvm$ region
-            !dvm$ parallel ( ii, j, i ) on a( i, j, ii )
-            do ii = 2, k - 1
-                do j = 2, k - 1
-                    do i = 2, k - 1
-                        a( i, j, ii ) = b( i, j, ii )
-                    enddo
-                enddo
-            enddo
-            !dvm$ parallel ( ii, j, i ) on b( i, j, ii ), shadow_renew( a )
-            do ii = 2, k - 1
-                do j = 2, k - 1
-                    do i = 2, k - 1
-                        b( i, j, ii ) = ( a( i - 1, j, ii ) + a( i + 1, j, ii ) + &
-                                          a( i, j - 1, ii ) + a( i, j + 1, ii ) + &
-                                          a( i, j, ii - 1 ) + a( i, j, ii + 1 ) ) / 6
-                    enddo
-                enddo
-            enddo
-        !dvm$ end region
-    enddo
-
-    ! compare 2 - task jacobi with 1 - task jacobi
-    !dvm$ get_actual(b,b1,b2)
-    a(2:n1,:,:) = b1(2:n1,:,:)
-    a(n1+1:n1+n2-1,:,:) = b2(2:n2,:,:)
-    errt = er
-    !dvm$ parallel ( ii, j, i ) on b( i, j, ii ), reduction(min(errt))
-    do ii = 2, k - 1
-        do j = 2, k - 1
-            do i = 2, k - 1
-                if(a( i, j, ii ) .ne. b( i, j, ii ))  errt = min(errt, i)
-            enddo
-        enddo
-    enddo
-    if (errt .eq. er)  then
-        call ansyes(tname)
-    else
-        call ansno (tname)
-    endif
-    deallocate(b,b1,b2,a,a1,a2)
-    print *,  '=== END OF taskst21 ====================='
-
-end
-
-subroutine dpt( lp, hp, nt )
-    !distributing processors for nt tasks ( nt = 2 )
-    integer lp( 2 ), hp( 2 )
-    processors_size( i ) = 1
-    !dvm$ debug 1 ( d = 0 )
-        np = processors_size( 1 )
-        ntp = np/nt
-        if( np .eq. 1 ) then
-            lp( 1 ) = 1
-            hp( 1 ) = 1
-            lp( 2 ) = 1
-            hp( 2 ) = 1
-        else
-            lp( 1 ) = 1
-            hp( 1 ) = ntp
-            lp( 2 ) = ntp + 1
-            hp( 2 ) = np
-        end if
-    !dvm$ enddebug 1
-end
-
-subroutine ansyes(name)
-    character*8 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno(name)
-    character*8 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90
deleted file mode 100644
index 168b788..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst22.f90
+++ /dev/null
@@ -1,221 +0,0 @@
-program taskst22
-    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1, er = 10000
-    real, allocatable :: a( :, :, : ), a1( :, :, : ), a2( :, :, : )
-    real, allocatable :: b( :, :, : ), b1( :, :, : ), b2( :, :, : )
-    integer, dimension( 2 ) :: lp, hp
-    integer :: errt
-    character*8 :: tname = 'taskst22'
-    !dvm$ processors p( processors_size( 1 ), processors_size( 2 ) )
-    !dvm$ task mb( 2 )
-
-    !dvm$ distribute a( *, block, block ) onto p
-    !dvm$ align b( i, j, ii ) with a( i, j, ii )
-
-    !dvm$ distribute :: a1, a2
-    !dvm$ align :: b1, b2
-    print *,  '===START OF taskst22 ====================='
-    call dpt( lp, hp, 2 )
-    !dvm$ map mb( 1 ) onto p( lp( 1 ) : hp( 1 ), : )
-    allocate( a1( n1 + 1, k, k ) )
-    !dvm$ redistribute a1( *, block, block ) onto mb( 1 )
-    allocate( b1( n1 + 1, k, k ) )
-    !dvm$ realign b1( i, j, ii ) with a1( i, j, ii )
-
-    !dvm$ map mb( 2 ) onto p( lp( 2 ) : hp( 2 ), : )
-    allocate( a2( n2 + 1, k, k ) )
-    !dvm$ redistribute a2( *, block, block ) onto mb( 2 )
-    allocate( b2( n2 + 1, k, k ) )
-    !dvm$ realign b2( i, j, ii ) with a2( i, j, ii )
-
-    allocate( a( k, k, k ), b( k, k, k ) )
-
-    !initialization
-    !dvm$ task_region mb
-    !dvm$ on mb( 1 )
-    !dvm$ region
-        !dvm$ parallel ( ii, j, i ) on a1( i, j, ii )
-        do ii = 1, k
-            do j = 1, k
-                do i = 1, n1
-                    if( i .eq. 1 .or. j .eq. 1 .or. j .eq. k .or. ii .eq. 1 .or. ii .eq. k ) then
-                        a1( i, j, ii ) = 0.
-                        b1( i, j, ii ) = 0.
-                    else
-                        b1( i, j, ii ) = 1. + i + j + ii
-                        a1( i, j, ii ) = b1( i, j, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-    !dvm$ end on
-    !dvm$ on mb( 2 )
-    !dvm$ region
-        !dvm$ parallel ( ii, j, i ) on a2( i, j, ii )
-        do ii = 1, k
-            do j = 1, k
-                do i = 2, n2 + 1
-                    if( i .eq. n2 + 1 .or. j .eq. 1 .or. j .eq. k .or. ii .eq. 1 .or. ii .eq. k ) then
-                        a2( i, j, ii ) = 0.
-                        b2( i, j, ii ) = 0.
-                    else
-                        b2( i, j, ii ) = 1. + ( i + n1 - 1 ) + j + ii
-                        a2( i, j, ii ) = b2( i, j, ii )
-                    endif
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-    !dvm$ end on
-        !dvm$ end task_region
-
-    do it = 1, itmax
-        !exchange bounds
-	!dvm$ get_actual(b2( 2, :, : ),b1( n1, :, : ))
-        a1( n1 + 1, :, : ) = b2( 2, :, : )
-        a2( 1, :, : ) = b1( n1, :, : )
-	!dvm$ actual(a1( n1 + 1, :, : ),a2( 1, :, : ))
-        !dvm$ task_region mb
-            !dvm$ on mb( 1 )
-                !dvm$ region
-                    !dvm$ parallel ( ii, j, i ) on b1( i, j, ii ), shadow_renew ( a1 )
-                    do ii = 2, k - 1
-                        do j = 2, k - 1
-                            do i = 2, n1
-                                b1( i, j, ii ) = ( a1( i - 1, j, ii ) + a1( i + 1, j, ii ) + &
-                                                   a1( i, j - 1, ii ) + a1( i, j + 1, ii ) + &
-                                                   a1( i, j, ii - 1 ) + a1( i, j, ii + 1 ) ) / 6
-                            enddo
-                        enddo
-                    enddo
-
-                    !dvm$ parallel ( ii, j, i ) on a1( i, j, ii )
-                    do ii = 2, k - 1
-                        do j = 2, k - 1
-                            do i = 2, n1
-                                a1( i, j, ii ) = b1( i, j, ii )
-                            enddo
-                        enddo
-                    enddo
-                !dvm$ end region
-            !dvm$ end on
-
-            !dvm$ on mb( 2 )
-                !dvm$ region
-                    !dvm$ parallel ( ii, j, i ) on b2( i, j, ii ), shadow_renew ( a2 )
-                    do ii = 2, k - 1
-                        do j = 2, k - 1
-                            do i = 2, n2
-                                b2( i, j, ii ) = ( a2( i - 1, j, ii ) + a2( i + 1, j, ii ) + &
-                                                   a2( i, j - 1, ii ) + a2( i, j + 1, ii ) + &
-                                                   a2( i, j, ii - 1 ) + a2( i, j, ii + 1 ) ) / 6
-                            enddo
-                        enddo
-                    enddo
-                    !dvm$ parallel ( ii, j, i ) on a2( i, j, ii )
-                    do ii = 2, k - 1
-                        do j = 2, k - 1
-                            do i = 2, n2
-                                a2( i, j, ii ) = b2( i, j, ii )
-                            enddo
-                        enddo
-                    enddo
-                !dvm$ end region
-            !dvm$ end on
-        !dvm$ end task_region
-    enddo
-
-    !1 - task jacobi
-    !dvm$ region
-        !dvm$ parallel ( ii, j, i ) on a( i, j, ii )
-        do ii = 1, k
-            do j = 1, k
-                do i = 1, k
-                    a( i, j, ii ) = 0.
-                    if( i .eq. 1 .or. j .eq. 1 .or. i .eq. k .or. j .eq. k .or. ii .eq. 1 .or. ii .eq. k ) then
-                        b( i, j, ii ) = 0.
-                    else
-                        b( i, j, ii ) = ( 1. + i + j + ii )
-                    endif
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-
-    do it = 1, itmax
-        !dvm$ region
-            !dvm$ parallel ( ii, j, i ) on a( i, j, ii )
-            do ii = 2, k - 1
-                do j = 2, k - 1
-                    do i = 2, k - 1
-                        a( i, j, ii ) = b( i, j, ii )
-                    enddo
-                enddo
-            enddo
-            !dvm$ parallel ( ii, j, i ) on b( i, j, ii ), shadow_renew( a )
-            do ii = 2, k - 1
-                do j = 2, k - 1
-                    do i = 2, k - 1
-                        b( i, j, ii ) = ( a( i - 1, j, ii ) + a( i + 1, j, ii ) + &
-                                          a( i, j - 1, ii ) + a( i, j + 1, ii ) + &
-                                          a( i, j, ii - 1 ) + a( i, j, ii + 1 ) ) / 6
-                    enddo
-                enddo
-            enddo
-        !dvm$ end region
-    enddo
-
-    ! compare 2 - task jacobi with 1 - task jacobi
-    !dvm$ get_actual(b,b1,b2)
-    a(2:n1,:,:) = b1(2:n1,:,:)
-    a(n1+1:n1+n2-1,:,:) = b2(2:n2,:,:)
-    errt = er
-    !dvm$ parallel ( ii, j, i ) on b( i, j, ii ), reduction(min(errt))
-    do ii = 2, k - 1
-        do j = 2, k - 1
-            do i = 2, k - 1
-                if(a( i, j, ii ) .ne. b( i, j, ii ))  errt = min(errt, i)
-            enddo
-        enddo
-    enddo
-    if (errt .eq. er)  then
-        call ansyes(tname)
-    else
-        call ansno (tname)
-    endif
-    deallocate(b,b1,b2,a,a1,a2)
-    print *,  '=== END OF taskst22 ====================='
-end
-
-
-
-subroutine dpt( lp, hp, nt )
-    !distributing processors for nt tasks ( nt = 2 )
-    integer lp( 2 ), hp( 2 )
-    processors_size( i ) = 1
-    !dvm$ debug 1 ( d = 0 )
-        np = processors_size( 1 )
-        ntp = np/nt
-        if( np .eq. 1 ) then
-            lp( 1 ) = 1
-            hp( 1 ) = 1
-            lp( 2 ) = 1
-            hp( 2 ) = 1
-        else
-            lp( 1 ) = 1
-            hp( 1 ) = ntp
-            lp( 2 ) = ntp + 1
-            hp( 2 ) = np
-        end if
-    !dvm$ enddebug 1
-end
-
-subroutine ansyes(name)
-    character*8 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno(name)
-    character*8 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90
deleted file mode 100644
index d9169ed..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst31.f90
+++ /dev/null
@@ -1,271 +0,0 @@
-program taskst31
-    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1, er = 10000
-    real, allocatable :: a( :, :, :, : ), a1( :, :, :, : ), a2( :, :, :, : )
-    real, allocatable :: b( :, :, :, : ), b1( :, :, :, : ), b2( :, :, :, : )
-    integer lp( 2 ), hp( 2 ), errt
-    character*8 :: tname = 'taskst31'
-    !dvm$ processors p( processors_size( 1 ), processors_size( 2 ), processors_size( 3 ) )
-    !dvm$ task mb( 2 )
-
-    !dvm$ distribute a( *, block, block, block ) onto p
-    !dvm$ align b( i, j, ii, jj ) with a( i, j, ii, jj )
-
-    !dvm$ distribute :: a1, a2
-    !dvm$ align b1( i, j, ii, jj ) with a1( i, j, ii, jj )
-    !dvm$ align b2( i, j, ii, jj ) with a2( i, j, ii, jj )
-    
-    print *,  '===START OF taskst31 ====================='
-
-    call dpt( lp, hp, 2 )
-    !dvm$ map mb( 1 ) onto p( lp( 1 ) : hp( 1 ), :, : )
-    allocate( a1( n1 + 1, k, k, k ) )
-    !dvm$ redistribute a1( *, block, block, block ) onto mb( 1 )
-    allocate( b1( n1 + 1, k, k, k ) )
-
-    !dvm$ map mb( 2 ) onto p( lp( 2 ) : hp( 2 ), :, : )
-    allocate( a2( n2 + 1, k, k, k ) )
-    !dvm$ redistribute a2( *, block, block, block ) onto mb( 2 )
-    allocate( b2( n2 + 1, k, k, k ) )
-
-    allocate( a( k, k, k, k ), b( k, k, k, k ) )
-
-    !initialization
-    !dvm$ task_region mb
-    !dvm$ on mb( 1 )
-    !dvm$ region
-	!dvm$ parallel ( jj, ii, j, i ) on a1( i, j, ii, jj )
-	do jj = 1, k
-	    do ii = 1, k
-	        do j = 1, k
-	            do i = 1, n1
-	                if( i .eq. 1 .or. &
-	                    j .eq. 1 .or. j .eq. k .or. &
-	                    ii .eq. 1 .or. ii .eq. k .or. &
-	                    jj .eq. 1 .or. jj .eq. k ) then
-	                    a1( i, j, ii, jj ) = 0.
-	                    b1( i, j, ii, jj ) = 0.
-	                else
-	                    b1( i, j, ii, jj ) = 1. + i + j + ii + jj
-	                    a1( i, j, ii, jj ) = b1( i, j, ii, jj )
-	                endif
-	            enddo
-	        enddo
-	    enddo
-	enddo
-    !dvm$ end region
-    !dvm$ end on
-
-    !dvm$ on mb( 2 )
-    !dvm$ region
-        !dvm$ parallel ( jj, ii, j, i ) on a2( i, j, ii, jj )
-        do jj = 1, k
-            do ii = 1, k
-                do j = 1, k
-                    do i = 2, n2 + 1
-                        if( i .eq. n2 + 1 .or. &
-                            j .eq. 1 .or. j .eq. k .or. &
-                            ii .eq. 1 .or. ii .eq. k .or. &
-                            jj .eq. 1 .or. jj .eq. k ) then
-                            a2( i, j, ii, jj ) = 0.
-                            b2( i, j, ii, jj ) = 0.
-                        else
-                            b2( i, j, ii, jj ) = 1. + ( i + n1 - 1 ) + j + ii + jj
-                            a2( i, j, ii, jj ) = b2( i, j, ii, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-    !dvm$ end on
-    !dvm$ end task_region
-
-    do it = 1, itmax
-     
-        !exchange bounds
-        !dvm$ get_actual(b2(2,:,:,:))
-        !dvm$ parallel ( jj, ii, j ) on a1( n1 + 1, j, ii, jj ), remote_access ( b2( 2, j, ii, jj ) )
-        do jj = 1, k
-            do ii = 1, k
-                do j = 1, k
-                    a1( n1 + 1, j, ii, jj ) = b2( 2, j, ii, jj )
-                enddo
-            enddo
-        enddo
-        !dvm$ actual(a1(n1+1,:,:,:))
-        !dvm$ get_actual (b1(n1,:,:,:))
-        !dvm$ parallel ( jj, ii, j ) on a2( 1, j, ii, jj ), remote_access (  b1( n1, j, ii, jj ) )
-        do jj = 1, k
-            do ii = 1, k
-                do j = 1, k
-                    a2( 1, j, ii, jj ) = b1( n1, j, ii, jj )
-                enddo
-            enddo
-        enddo
-        !dvm$ actual(a2(1,:,:,:))
-        
-        !dvm$ task_region mb
-            !dvm$ on mb( 1 )
-                !dvm$ region
-                    !dvm$ parallel ( jj, ii, j, i ) on b1( i, j, ii, jj ), shadow_renew ( a1 )
-                    do jj = 2, k - 1
-                        do ii = 2, k - 1
-                            do j = 2, k - 1
-                                do i = 2, n1
-                                    b1( i, j, ii, jj ) = ( a1( i - 1, j, ii, jj ) + a1( i + 1, j, ii, jj ) + &
-                                                           a1( i, j - 1, ii, jj ) + a1( i, j + 1, ii, jj ) + &
-                                                           a1( i, j, ii - 1, jj ) + a1( i, j, ii + 1, jj ) + &
-                                                           a1( i, j, ii, jj - 1 ) + a1( i, j, ii, jj + 1 ) ) / 8
-                                enddo
-                            enddo
-                        enddo
-                    enddo
-
-                    !dvm$ parallel ( jj, ii, j, i ) on a1( i, j, ii, jj )
-                    do jj = 2, k - 1
-                        do ii = 2, k - 1
-                            do j = 2, k - 1
-                                do i = 2, n1
-                                    a1( i, j, ii, jj ) = b1( i, j, ii, jj )
-                                enddo
-                            enddo
-                        enddo
-                    enddo
-                !dvm$ end region
-            !dvm$ end on
-
-            !dvm$ on mb( 2 )
-                !dvm$ region
-                    !dvm$ parallel ( jj, ii, j, i ) on b2( i, j, ii, jj ), shadow_renew ( a2 )
-                    do jj = 2, k - 1
-                        do ii = 2, k - 1
-                            do j = 2, k - 1
-                                do i = 2, n2
-                                    b2( i, j, ii, jj ) = ( a2( i - 1, j, ii, jj ) + a2( i + 1, j, ii, jj ) + &
-                                                           a2( i, j - 1, ii, jj ) + a2( i, j + 1, ii, jj ) + &
-                                                           a2( i, j, ii - 1, jj ) + a2( i, j, ii + 1, jj ) + &
-                                                           a2( i, j, ii, jj - 1 ) + a2( i, j, ii, jj + 1 ) ) / 8
-                                enddo
-                            enddo
-                        enddo
-                    enddo
-                    !dvm$ parallel ( jj, ii, j, i ) on a2( i, j, ii, jj )
-                    do jj = 2, k - 1
-                        do ii = 2, k - 1
-                            do j = 2, k - 1
-                                do i = 2, n2
-                                    a2( i, j, ii, jj ) = b2( i, j, ii, jj )
-                                enddo
-                            enddo
-                        enddo
-                    enddo
-                !dvm$ end region
-            !dvm$ end on
-        !dvm$ end task_region
-    enddo
-
-    !1 - task jacobi
-    !dvm$ region
-        !dvm$ parallel ( jj, ii, j, i ) on a( i, j, ii, jj )
-        do jj = 1, k
-            do ii = 1, k
-                do j = 1, k
-                    do i = 1, k
-                        a( i, j, ii, jj ) = 0.
-                        if( i .eq. 1 .or. j .eq. 1 .or. &
-                            i .eq. k .or. j .eq. k .or. &
-                            ii .eq. 1 .or. ii .eq. k .or. &
-                            jj .eq. 1 .or. jj .eq. k ) then
-                            b( i, j, ii, jj ) = 0.
-                        else
-                            b( i, j, ii, jj ) = ( 1. + i + j + ii + jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-
-    do it = 1, itmax
-        !dvm$ region
-            !dvm$ parallel ( jj, ii, j, i ) on a( i, j, ii, jj )
-            do jj = 2, k - 1
-                do ii = 2, k - 1
-                    do j = 2, k - 1
-                        do i = 2, k - 1
-                            a( i, j, ii, jj ) = b( i, j, ii, jj )
-                        enddo
-                    enddo
-                enddo
-            enddo
-            !dvm$ parallel ( jj, ii, j, i ) on b( i, j, ii, jj ), shadow_renew( a )
-            do jj = 2, k - 1
-                do ii = 2, k - 1
-                    do j = 2, k - 1
-                        do i = 2, k - 1
-                            b( i, j, ii, jj ) = ( a( i - 1, j, ii, jj ) + a( i + 1, j, ii, jj ) + &
-                                                  a( i, j - 1, ii, jj ) + a( i, j + 1, ii, jj ) + &
-                                                  a( i, j, ii - 1, jj ) + a( i, j, ii + 1, jj ) + &
-                                                  a( i, j, ii, jj - 1 ) + a( i, j, ii, jj + 1 ) ) / 8
-                        enddo
-                    enddo
-                enddo
-            enddo
-        !dvm$ end region
-    enddo
-
-    ! compare 2 - task jacobi with 1 - task jacobi
-    !dvm$ get_actual(b,b1,b2)
-    a(2:n1,:,:,:) = b1(2:n1,:,:,:)
-    a(n1+1:n1+n2-1,:,:,:) = b2(2:n2,:,:,:)
-    errt = er
-    !dvm$ parallel ( jj, ii, j, i ) on b( i, j, ii, jj ), reduction(min(errt))
-    do jj = 2, k - 1
-        do ii = 2, k - 1
-            do j = 2, k - 1
-                do i = 2, k - 1
-                    if(a( i, j, ii, jj) .ne. b( i, j, ii, jj))  errt = min(errt, i)
-                enddo        
-            enddo
-        enddo
-    enddo
-    if (errt .eq. er)  then
-        call ansyes(tname)
-    else
-        call ansno (tname)
-    endif
-    deallocate(b,b1,b2,a,a1,a2)
-    print *,  '=== END OF taskst31 ====================='
-end
-
-subroutine dpt( lp, hp, nt )
-    !distributing processors for nt tasks ( nt = 2 )
-    integer lp( 2 ), hp( 2 )
-    processors_size( i ) = 1
-    !dvm$ debug 1 ( d = 0 )
-        np = processors_size( 1 )
-        ntp = np/nt
-        if( np .eq. 1 ) then
-            lp( 1 ) = 1
-            hp( 1 ) = 1
-            lp( 2 ) = 1
-            hp( 2 ) = 1
-        else
-            lp( 1 ) = 1
-            hp( 1 ) = ntp
-            lp( 2 ) = ntp + 1
-            hp( 2 ) = np
-        end if
-    !dvm$ enddebug 1
-end
-
-subroutine ansyes(name)
-    character*8 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno(name)
-    character*8 name
-    print *, name, '  -  ***error'
-end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90
deleted file mode 100644
index dcd3ded..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TASK/taskst32.f90
+++ /dev/null
@@ -1,254 +0,0 @@
-program taskst32
-    integer, parameter :: k = 8, n1 = 4, itmax = 20, n2 = k - n1, er = 10000
-    real, allocatable :: a( :, :, :, : ), a1( :, :, :, : ), a2( :, :, :, : )
-    real, allocatable :: b( :, :, :, : ), b1( :, :, :, : ), b2( :, :, :, : )
-    integer lp( 2 ), hp( 2 )
-    integer errt
-    character*8 :: tname = 'taskst32'
-    !dvm$ processors p( processors_size( 1 ), processors_size( 2 ), processors_size( 3 ) )
-    !dvm$ task mb( 2 )
-
-    !dvm$ distribute a( *, block, block, block ) onto p
-    !dvm$ align b( i, j, ii, jj ) with a( i, j, ii, jj )
-
-    !dvm$ distribute :: a1, a2
-    !dvm$ align :: b1, b2
-    print *,  '===START OF taskst32 ====================='
-    call dpt( lp, hp, 2 )
-    !dvm$ map mb( 1 ) onto p( lp( 1 ) : hp( 1 ), :, : )
-    allocate( a1( n1 + 1, k, k, k ) )
-    !dvm$ redistribute a1( *, block, block, block ) onto mb( 1 )
-    allocate( b1( n1 + 1, k, k, k ) )
-    !dvm$ realign b1( i, j, ii, jj ) with a1( i, j, ii, jj )
-
-    !dvm$ map mb( 2 ) onto p( lp( 2 ) : hp( 2 ), :, : )
-    allocate( a2( n2 + 1, k, k, k ) )
-    !dvm$ redistribute a2( *, block, block, block ) onto mb( 2 )
-    allocate( b2( n2 + 1, k, k, k ) )
-    !dvm$ realign b2( i, j, ii, jj ) with a2( i, j, ii, jj )
-
-    allocate( a( k, k, k, k ), b( k, k, k, k ) )
-
-    !initialization
-    !dvm$ task_region mb
-    !dvm$ on mb( 1 )
-    !dvm$ region
-	!dvm$ parallel ( jj, ii, j, i ) on a1( i, j, ii, jj )
-	do jj = 1, k
-	    do ii = 1, k
-	        do j = 1, k
-	            do i = 1, n1
-	                if( i .eq. 1 .or. &
-	                    j .eq. 1 .or. j .eq. k .or. &
-	                    ii .eq. 1 .or. ii .eq. k .or. &
-	                    jj .eq. 1 .or. jj .eq. k ) then
-	                    a1( i, j, ii, jj ) = 0.
-	                    b1( i, j, ii, jj ) = 0.
-	                else
-	                    b1( i, j, ii, jj ) = 1. + i + j + ii + jj
-	                    a1( i, j, ii, jj ) = b1( i, j, ii, jj )
-	                endif
-	            enddo
-	        enddo
-	    enddo
-	enddo
-    !dvm$ end region
-    !dvm$ end on
-
-    !dvm$ on mb( 2 )
-    !dvm$ region
-        !dvm$ parallel ( jj, ii, j, i ) on a2( i, j, ii, jj )
-        do jj = 1, k
-            do ii = 1, k
-                do j = 1, k
-                    do i = 2, n2 + 1
-                        if( i .eq. n2 + 1 .or. &
-                            j .eq. 1 .or. j .eq. k .or. &
-                            ii .eq. 1 .or. ii .eq. k .or. &
-                            jj .eq. 1 .or. jj .eq. k ) then
-                            a2( i, j, ii, jj ) = 0.
-                            b2( i, j, ii, jj ) = 0.
-                        else
-                            b2( i, j, ii, jj ) = 1. + ( i + n1 - 1 ) + j + ii + jj
-                            a2( i, j, ii, jj ) = b2( i, j, ii, jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-    !dvm$ end on
-    !dvm$ end task_region
-
-    do it = 1, itmax            
-    !exchange bounds
-        !dvm$ get_actual(b2(2,:,:,:)) 
-        a1( n1 + 1, :, :, : ) = b2( 2, :, :, : )
-        !dvm$ actual(a1(n1+1,:,:,:))
-        !dvm$ get_actual (b1(n1,:,:,:))
-        a2( 1, :, :, : ) = b1( n1, :, :, : )
-        !dvm$ actual(a2(1,:,:,:))
-       
-        !dvm$ task_region mb
-            !dvm$ on mb( 1 )
-                !dvm$ region
-                    !dvm$ parallel ( jj, ii, j, i ) on b1( i, j, ii, jj ), shadow_renew ( a1 )
-                    do jj = 2, k - 1
-                        do ii = 2, k - 1
-                            do j = 2, k - 1
-                                do i = 2, n1
-                                    b1( i, j, ii, jj ) = ( a1( i - 1, j, ii, jj ) + a1( i + 1, j, ii, jj ) + &
-                                                           a1( i, j - 1, ii, jj ) + a1( i, j + 1, ii, jj ) + &
-                                                           a1( i, j, ii - 1, jj ) + a1( i, j, ii + 1, jj ) + &
-                                                           a1( i, j, ii, jj - 1 ) + a1( i, j, ii, jj + 1 ) ) / 8
-                                enddo
-                            enddo
-                        enddo
-                    enddo
-
-                    !dvm$ parallel ( jj, ii, j, i ) on a1( i, j, ii, jj )
-                    do jj = 2, k - 1
-                        do ii = 2, k - 1
-                            do j = 2, k - 1
-                                do i = 2, n1
-                                    a1( i, j, ii, jj ) = b1( i, j, ii, jj )
-                                enddo
-                            enddo
-                        enddo
-                    enddo
-                !dvm$ end region
-            !dvm$ end on
-
-            !dvm$ on mb( 2 )
-                !dvm$ region
-                    !dvm$ parallel ( jj, ii, j, i ) on b2( i, j, ii, jj ), shadow_renew ( a2 )
-                    do jj = 2, k - 1
-                        do ii = 2, k - 1
-                            do j = 2, k - 1
-                                do i = 2, n2
-                                    b2( i, j, ii, jj ) = ( a2( i - 1, j, ii, jj ) + a2( i + 1, j, ii, jj ) + &
-                                                           a2( i, j - 1, ii, jj ) + a2( i, j + 1, ii, jj ) + &
-                                                           a2( i, j, ii - 1, jj ) + a2( i, j, ii + 1, jj ) + &
-                                                           a2( i, j, ii, jj - 1 ) + a2( i, j, ii, jj + 1 ) ) / 8
-                                enddo
-                            enddo
-                        enddo
-                    enddo
-                    !dvm$ parallel ( jj, ii, j, i ) on a2( i, j, ii, jj )
-                    do jj = 2, k - 1
-                        do ii = 2, k - 1
-                            do j = 2, k - 1
-                                do i = 2, n2
-                                    a2( i, j, ii, jj ) = b2( i, j, ii, jj )
-                                enddo
-                            enddo
-                        enddo
-                    enddo
-                !dvm$ end region
-            !dvm$ end on
-        !dvm$ end task_region
-    enddo
-
-    !1 - task jacobi
-    !dvm$ region
-        !dvm$ parallel ( jj, ii, j, i ) on a( i, j, ii, jj )
-        do jj = 1, k
-            do ii = 1, k
-                do j = 1, k
-                    do i = 1, k
-                        a( i, j, ii, jj ) = 0.
-                        if( i .eq. 1 .or. j .eq. 1 .or. &
-                            i .eq. k .or. j .eq. k .or. &
-                            ii .eq. 1 .or. ii .eq. k .or. &
-                            jj .eq. 1 .or. jj .eq. k ) then
-                            b( i, j, ii, jj ) = 0.
-                        else
-                            b( i, j, ii, jj ) = ( 1. + i + j + ii + jj )
-                        endif
-                    enddo
-                enddo
-            enddo
-        enddo
-    !dvm$ end region
-
-    do it = 1, itmax
-        !dvm$ region
-            !dvm$ parallel ( jj, ii, j, i ) on a( i, j, ii, jj )
-            do jj = 2, k - 1
-                do ii = 2, k - 1
-                    do j = 2, k - 1
-                        do i = 2, k - 1
-                            a( i, j, ii, jj ) = b( i, j, ii, jj )
-                        enddo
-                    enddo
-                enddo
-            enddo
-            !dvm$ parallel ( jj, ii, j, i ) on b( i, j, ii, jj ), shadow_renew( a )
-            do jj = 2, k - 1
-                do ii = 2, k - 1
-                    do j = 2, k - 1
-                        do i = 2, k - 1
-                            b( i, j, ii, jj ) = ( a( i - 1, j, ii, jj ) + a( i + 1, j, ii, jj ) + &
-                                                  a( i, j - 1, ii, jj ) + a( i, j + 1, ii, jj ) + &
-                                                  a( i, j, ii - 1, jj ) + a( i, j, ii + 1, jj ) + &
-                                                  a( i, j, ii, jj - 1 ) + a( i, j, ii, jj + 1 ) ) / 8
-                        enddo
-                    enddo
-                enddo
-            enddo
-        !dvm$ end region
-    enddo
-    ! compare 2-task jacobi with 1-task jacobi
-    !dvm$ get_actual(b,b1,b2)
-    a(2:n1,:,:,:) = b1(2:n1,:,:,:)
-    a(n1+1:n1+n2-1,:,:,:) = b2(2:n2,:,:,:)
-    errt = er
-    !dvm$ parallel ( jj, ii, j, i ) on b( i, j, ii, jj ), reduction(min(errt))
-    do jj = 2, k - 1
-        do ii = 2, k - 1
-            do j = 2, k - 1
-                do i = 2, k - 1
-                    if(a( i, j, ii, jj) .ne. b( i, j, ii, jj))  errt = min(errt, i)
-                enddo    
-            enddo
-        enddo
-    enddo
-    if (errt .eq. er)  then
-        call ansyes(tname)
-    else
-        call ansno (tname)
-    endif
-    deallocate(b,b1,b2,a,a1,a2)
-    print *,  '=== END OF taskst32 ====================='
-end
-
-subroutine dpt( lp, hp, nt )
-    !distributing processors for nt tasks ( nt = 2 )
-    integer lp( 2 ), hp( 2 )
-    processors_size( i ) = 1
-    !dvm$ debug 1 ( d = 0 )
-        np = processors_size( 1 )
-        ntp = np/nt
-        if( np .eq. 1 ) then
-            lp( 1 ) = 1
-            hp( 1 ) = 1
-            lp( 2 ) = 1
-            hp( 2 ) = 1
-        else
-            lp( 1 ) = 1
-            hp( 1 ) = ntp
-            lp( 2 ) = ntp + 1
-            hp( 2 ) = np
-        end if
-    !dvm$ enddebug 1
-end
-
-subroutine ansyes(name)
-    character*8 name
-    print *, name, '  -  complete'
-end
-
-subroutine ansno(name)
-    character*8 name
-    print *, name, '  -  ***error'
-end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ1.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ1.fdv
deleted file mode 100644
index bfcf11b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ1.fdv
+++ /dev/null
@@ -1,180 +0,0 @@
-       program TEMPL11
-
-c    TESTING template CLAUSE .       
-
-      print *,'===START OF templ11======================'
-C --------------------------------------------------
-c 111 TEMPLATE arrA1[BLOCK]   ALIGN arrB[i] WITH arrA[i+4] 
-c                             ALIGN arrC[i] WITH arrA[2*i+4] 
-      call templ111
-C --------------------------------------------------
-c 121 TEMPLATE arrA1[BLOCK]   ALIGN arrB[][i]  WITH arrA[i]	
-c                             ALIGN arrC[i][ ] WITH arrA[2*i+1]
-      call templ121
-C --------------------------------------------------
-      print *,'=== END OF templ11 ======================'
-      end
-
-C ----------------------------------------------------templ111
-c 111   TEMPLATE arrA[BLOCK]  ALIGN arrB[i] WITH arrA[i+4]  
-c                             ALIGN arrC[i] WITH arrA[2*i+4] 
-      subroutine templ111
-      integer, parameter :: AN1=14,CN1=4,BN1=8,PN = 4,NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA[k1i * i + li]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4
-c     parameters for ALIGN arrC[i] WITH arrA[kc1i * i + lci]                                                 
-      integer, parameter :: kc1i=2,kc2i=0,lci=4
-      character*9 tname
-      integer, allocatable :: C1(:),B1(:)
-      integer erri,i,ib,ic
-
-cdvm$ template A1(AN1)               
-cdvm$ ALIGN B1(i) WITH A1(k1i * i + li)
-cdvm$ ALIGN C1(i) WITH A1(kc1i * i + lci)
-cdvm$ distribute A1(BLOCK)    
-
-      tname='templ111'
-      allocate (C1(CN1),B1(BN1))
-      erri= ER
-      NNL=NL 
-!dvm$ actual (erri)
-!dvm$ region
-*dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i     
-      enddo
-
-*dvm$ parallel (i) on C1(i)
-      do i=1,CN1
-            C1(i) =i     
-      enddo
-
-*dvm$ parallel (i) on A1(i), private (ib,erri,ic)
-      do i=1,AN1
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)) then
-                ib = (i-li)/k1i
-                if (B1(ib) .eq.(ib)) then     
-                else
-                    erri = i
-                endif 
-             endif 
-             if (((i-lci) .eq.(((i-lci)/kc1i) * kc1i)) .and.
-     *          (((i-lci)/kc1i) .gt. 0)  .and.
-     *          (((i-lci)/kc1i) .le. CN1)) then
-                ic = (i-lci)/kc1i
-                if (C1(ic) .eq.(ic)) then     
-                else
-                    erri = i
-                endif 
-             endif 
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (erri)
-
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (C1,B1)
-
-      end
-C ----------------------------------------------------templ121
-c   121	TEMPLATE arrA1[BLOCK]	
-c       	ALIGN arrB[][i]  WITH arrA[i]	
-c           ALIGN arrC[i][ ] WITH arrA[2*i+1]
-      subroutine templ121
-      integer, parameter :: AN1=9,CN1=4,CN2=4,BN1=8,BN2=8
-      integer, parameter :: NL=1000,ER=10000
-c     parameters for ALIGN arrB(*,i) WITH arrA[k1i*i+li]                                                
-      integer, parameter :: k1i=1,k2i=0,li=0
-c     parameters for ALIGN arrC(i,*) WITH arrA[kc1i*i+lci]                                                
-      integer, parameter :: kc1i=2,kc2i=0,lci=1
-      character*9 tname
-      integer, allocatable :: C2(:,:),B2(:,:)
-      integer erri,i,ib,jb,ic,jc
-
-cdvm$ template A1(AN1)               
-cdvm$ ALIGN B2(*,i) WITH A1(k1i*i+li)
-cdvm$ ALIGN C2(i,*) WITH A1(kc1i*i+lci)
-cdvm$ distribute A1(BLOCK)    
-
-      tname='templ121'
-      allocate (C2(CN1,CN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual (erri)
-!dvm$ region
-
-*dvm$ parallel (i,j) on B2(i,j)
-      do i=1,BN1
-          do j=1,BN2
-            B2(i,j) =(i*NL+j)     
-          enddo
-      enddo
-
-*dvm$ parallel (i,j) on C2(i,j)
-      do i=1,CN1
-          do j=1,CN2
-            C2(i,j) =(i*NL+j)     
-          enddo
-      enddo
-
-*dvm$ parallel (i) on A1(i), private (j,ib,jb,erri,jc,ic,k)
-      do i=1,AN1
-          do j=1,BN1
-             if (  
-     *          ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN2)  )then
-                ib = j
-                jb = (i-li)/k1i
-                if (B2(ib,jb) .eq.(ib*NL+jb)) then     
-                else
-                    erri = i*NL/10+j
-                endif 
-             endif   
-          enddo
-          do k=1,CN2
-             if (  
-     *          ((i-lci) .eq.(((i-lci)/kc1i) * kc1i)) .and.
-     *          (((i-lci)/kc1i) .gt. 0)  .and.
-     *          (((i-lci)/kc1i) .le. CN1)  )then
-                jc = k
-                ic = (i-lci)/kc1i
-                if (C2(ic,jc) .eq.(ic*NL+jc)) then     
-                else
-                    erri = i*NL/10+j
-                endif 
-             endif   
-          enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (erri)
-
-
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-          else
-          call ansno(tname)
-      endif 
-      deallocate (C2,B2)
-
-      end
-C -------------------------------------------------
-
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
-         
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ2.fdv
deleted file mode 100644
index 619c78c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ2.fdv
+++ /dev/null
@@ -1,194 +0,0 @@
-      program TEMPL2
-
-c    TESTING template CLAUSE .       
-
-      print *,'===START OF templ2======================='
-C --------------------------------------------------
-c 211 TEMPLATE arrA2[BLOCK][BLOCK]
-c                     ALIGN arrB[i] WITH arrA[1][i] 
-c                     ALIGN arrC[i][j] WITH arrA[2*i+2][j] 
-      call templ211
-C --------------------------------------------------
-c 221 TEMPLATE arrA1[BLOCK][BLOCK]
-c                     ALIGN arrB[i][j] WITH arrA[i+4][j+4] 
-c                     ALIGN arrC[i][j] WITH arrA[i+1][j+1] 
-      call templ221
-C --------------------------------------------------
-      print *,'=== END OF templ2 ======================='
-      end
-
-C ----------------------------------------------------templ211
-c 211 TEMPLATE arrA2[BLOCK][BLOCK]
-c                     ALIGN arrB[i] WITH arrA[1][i] 
-c                     ALIGN arrC[i][j] WITH arrA[2*i+2][j] 
-      subroutine templ211
-      integer, parameter :: AN1=14,AN2=14,CN1=4,CN2=4,BN1=8
-      integer, parameter :: NL=1000,ER=10000
-c     parameters for ALIGN arrB[i] WITH arrA(1,i)                                                
-      integer, parameter :: k1i=0,k2i=0,li=1,k1j=1,k2j=0,lj=0
-c     parameters for ALIGN arrC[i][j] WITH arrA[kc1i * i + lci][kc2j * j + lcj]
-      integer, parameter :: kc1i=2,kc2i=0,lci=2,kc1j=0,kc2j=1,lcj=0
-      character*9 tname
-      integer, allocatable :: C2(:,:),B1(:)
-      integer erri,i,ib,ic,jc
-
-cdvm$ template A2(AN1,AN2)               
-cdvm$ ALIGN B1(i) WITH A2(1,i)
-cdvm$ ALIGN C2(i,j) WITH A2(kc1i * i + lci,kc2j * j + lcj)
-cdvm$ distribute A2(BLOCK,BLOCK)    
-
-      tname='templ211'
-      allocate (C2(CN1,CN2),B1(BN1))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual(erri)
-!dvm$ region
-
-*dvm$ parallel (i) on B1(i)
-      do i=1,BN1
-            B1(i) =i     
-      enddo
-
-*dvm$ parallel (j,i) on C2(i,j)
-      do j=1,CN2
-          do i=1,CN1
-            C2(i,j) =(i*NL+j)     
-          enddo
-      enddo
-
-*dvm$ parallel (j,i) on A2(i,j), private (ib,erri,ic,jc)
-      do j=1,AN2
-          do i=1,AN1
-             if ((i .eq. 1) ) then
-               if( 
-     *           (j .le. BN1)  
-     *           )  then 
-                        ib = j
-                if (B1(ib) .eq.(ib)) then     
-                else
-                    erri = i
-                endif 
-               endif 
-             endif   
-             if (((i-lci) .eq.(((i-lci)/kc1i) * kc1i)) .and.
-     *          ((j-lcj) .eq.(((j-lcj)/kc2j) *kc2j)) .and.
-     *          (((i-lci)/kc1i) .gt. 0)  .and.
-     *          (((j-lcj)/kc2j) .gt. 0)  .and.
-     *          (((i-lci)/kc1i) .le. CN1)  .and.
-     *          (((j-lcj)/kc2j) .le. CN2))  then 
-                ic = (i-lci)/kc1i
-                jc = (j-lcj)/kc2j  
-                if (C2(ic,jc) .eq.(ic*NL+jc)) then     
-                else
-                    erri = i
-                endif
-             endif 
-          enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (erri)
-
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (C2,B1)
-
-      end
-C ----------------------------------------------------templ221
-c 221 TEMPLATE arrA1[BLOCK][BLOCK]
-c                     ALIGN arrB[i][j] WITH arrA[i+4][j+4] 
-c                     ALIGN arrC[i][j] WITH arrA[i+1][j+1] 
-      subroutine templ221
-      integer, parameter :: AN1=14,AN2=14,CN1=4,CN2=4,BN1=8,BN2=8
-      integer, parameter :: NL=1000,ER=10000
-c     parameters for ALIGN arrB[i][j] WITH arrA[k1i * i + li][k2j * j + lj]                                                 
-      integer, parameter :: k1i=1,k2i=0,li=4,k1j=0,k2j=1,lj=4
-c     parameters for ALIGN arrC[i][j] WITH arrA[kc1i * i + lci][kc2j * j + lcj]                                                 
-      integer, parameter :: kc1i=1,kc2i=0,lci=1,kc1j=0,kc2j=1,lcj=1
-      character*9 tname
-      integer, allocatable :: C2(:,:),B2(:,:)
-      integer erri,i,ib,jb,ic,jc
-
-cdvm$ template A2(AN1,AN2)               
-cdvm$ ALIGN B2(i,j) WITH A2(k1i * i + li,k2j * j + lj)
-cdvm$ ALIGN C2(i,j) WITH A2(kc1i * i + lci,kc2j * j + lcj)
-cdvm$ distribute A2(BLOCK,BLOCK)    
-
-      tname='templ221'
-      allocate (C2(CN1,CN2),B2(BN1,BN2))
-      erri= ER
-      NNL=NL 
-!dvm$ actual (erri)
-!dvm$ region
-
-
-*dvm$ parallel (j,i) on B2(i,j)
-      do j=1,BN2
-          do i=1,BN1
-            B2(i,j) =(i*NL+j)     
-          enddo
-      enddo
-
-*dvm$ parallel (j,i) on C2(i,j)
-      do j=1,CN2
-          do i=1,CN1
-            C2(i,j) =(i*NL+j)     
-          enddo
-      enddo
-
-*dvm$ parallel (j,i) on A2(i,j),private (ib,ic,erri,jb,jc)
-      do j=1,AN2
-          do i=1,AN1
-             if (((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *          ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *          (((i-li)/k1i) .gt. 0)  .and.
-     *          (((j-lj)/k2j) .gt. 0)  .and.
-     *          (((i-li)/k1i) .le. BN1)  .and.
-     *          (((j-lj)/k2j) .le. BN2))  then 
-                ib = (i-li)/k1i
-                jb = (j-lj)/k2j  
-                if (B2(ib,jb) .eq.(ib*NL+jb)) then     
-                else
-                    erri = i
-                endif 
-             endif 
-             if (((i-lci) .eq.(((i-lci)/kc1i) * kc1i)) .and.
-     *          ((j-lcj) .eq.(((j-lcj)/kc2j) *kc2j)) .and.
-     *          (((i-lci)/kc1i) .gt. 0)  .and.
-     *          (((j-lcj)/kc2j) .gt. 0)  .and.
-     *          (((i-lci)/kc1i) .le. CN1)  .and.
-     *          (((j-lcj)/kc2j) .le. CN2))  then 
-                ic = (i-lci)/kc1i
-                jc = (j-lcj)/kc2j  
-                if (C2(ic,jc) .eq.(ic*NL+jc)) then     
-                else
-                    erri = i
-                endif
-             endif 
-          enddo
-      enddo
-!dvm$ end region
-!dvm$ get_actual(erri)
-
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-
-      end
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
-   
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ4.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ4.fdv
deleted file mode 100644
index ca1765b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/Fortran/TEMPLATE/templ4.fdv
+++ /dev/null
@@ -1,276 +0,0 @@
-      program TEMPL4
-
-c    TESTING template CLAUSE .       
-
-      print *,'===START OF templ4======================='
-C --------------------------------------------------
-c 441 TEMPLATE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]
-c                     arrB[i][j][k][l] WITH arrA[i+2][ j][k][ l+3] 
-c                     ALIGN arrC[i][j] WITH arrA[i+2][2][3][ l+3] 
-      call templ441
-C --------------------------------------------------
-c 442 TEMPLATE arrA1[BLOCK][BLOCK][BLOCK][BLOCK]
-c                     ALIGN arrB[i][j][k][l] WITH  arrA[l][i][j][k] 
-c                     ALIGN arrC[i][j][k][l] WITH [i+2][ j][k][ l+3] 
-      call templ442
-C --------------------------------------------------
-      print *,'=== END OF templ4 ======================='
-      end
-
-C ----------------------------------------------------templ441
-c 441 TEMPLATE arrA4[BLOCK][BLOCK][BLOCK][BLOCK]
-c                     arrB[i][j][k][l] WITH arrA[i+2][ j][k][ l+3] 
-c                     ALIGN arrC[i][j] WITH arrA[i+2][2][3][ l+3] 
-      subroutine templ441
-      integer, parameter :: AN1=7,AN2=7,AN3=7,AN4=7
-      integer, parameter :: BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: CN1=4,CN2=4
-      integer, parameter :: NL=10000,ER=100000
-
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)                                               
-      integer, parameter :: k1i=1,k2i=0,k3i=0,k4i=0,li=2
-      integer, parameter :: k1j=0,k2j=1,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=0,k3n=1,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=0,k4m=1,lm=3
-c     parameters for ALIGN arrC[i][j] WITH arrA4(kc1i*i+lci,lcj,lcn,kc2m*j+lcm)                                               
-      integer, parameter :: kc1i=1,kc2i=0,kc3i=0,kc4i=0,lci=2
-      integer, parameter :: kc1j=0,kc2j=0,kc3j=0,kc4j=0,lcj=2
-      integer, parameter :: kc1n=0,kc2n=0,kc3n=0,kc4n=0,lcn=3
-      integer, parameter :: kc1m=0,kc2m=1,kc3m=0,kc4m=0,lcm=3
-
-      character*9 tname
-      integer, allocatable :: C2(:,:), B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,ic,jc,nc,mc
-
-cdvm$ template A4(AN1,AN2,AN3,AN4)              
-cdvm$ ALIGN B4(i,j,n,m) WITH A4(k1i*i+li,k2j*j+lj,k3n*n+ln,k4m*m+lm)
-cdvm$ ALIGN C2(i,j) WITH A4(kc1i*i+lci,lcj,lcn,kc2m*j+lcm)
-cdvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-
-      tname='templ441'
-      allocate (C2(CN1,CN2),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-!dvm$ actual (erri)
-!dvm$ region
-
-
-*dvm$ parallel (m,n,j,i) on B4(i,j,n,m)
-      do m=1,BN4
-          do n=1,BN3
-             do j=1,BN2
-                do i=1,BN1
-                    B4(i,j,n,m) =(i*NL/10+j*NL/100+n*NL/1000+m)     
-                enddo
-             enddo
-          enddo
-      enddo
-
-*dvm$ parallel (j,i) on C2(i,j)
-      do j=1,CN2
-          do i=1,CN1
-            C2(i,j) =(i*NL+j)     
-          enddo
-      enddo
-
-*dvm$  parallel (m,n,j,i) on A4(i,j,n,m),private(ib,jb,nb,mb,ic,jc,erri)
-       do m=1,AN4
-          do n=1,AN3
-            do j=1,AN2
-              do i=1,AN1
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k1i) * k1i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k2j) *k2j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k3n) * k3n)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k4m) *k4m)) .and.
-     *                  (((i-li)/k1i) .gt. 0)  .and.
-     *                  (((j-lj)/k2j) .gt. 0)  .and.
-     *                  (((n-ln)/k3n) .gt. 0)  .and.
-     *                  (((m-lm)/k4m) .gt. 0)  .and.
-     *                  (((i-li)/k1i) .le. BN1)  .and.
-     *                  (((j-lj)/k2j) .le. BN2)  .and.
-     *                  (((n-ln)/k3n) .le. BN3)  .and.
-     *                  (((m-lm)/k4m) .le. BN4)
-     *                  )  then 
-                        ib = (i-li)/k1i
-                        jb = (j-lj)/k2j
-                        nb = (n-ln)/k3n
-                        mb = (m-lm)/k4m
-                        if  (B4(ib,jb,nb,mb).eq.
-     *                      (ib*NL/10+jb*NL/100+nb*NL/1000+mb))then     
-                        else
-                            erri = i*NL/10 + j*NL/100+ n*NL/1000+ m
-                        endif
-                      endif 
-             if (
-     *          (j .eq. lcj) .and. (n .eq. lcn) .and.
-     *          ((i-lci) .eq.(((i-lci)/kc1i) * kc1i)) .and.
-     *          ((m-lcm) .eq.(((m-lcm)/kc2m) *kc2m)) .and.
-     *          (((i-lci)/kc1i) .gt. 0)  .and.
-     *          (((m-lcm)/kc2m) .gt. 0)  .and.
-     *          (((i-lci)/kc1i) .le. CN1)  .and.
-     *          (((m-lcm)/kc2m) .le. CN2))  then 
-                ic = (i-lci)/kc1i
-                jc = (m-lcm)/kc2m  
-                if (C2(ic,jc) .eq.(ic*NL+jc)) then     
-                else
-                    erri = i
-                endif
-             endif 
-              enddo
-            enddo
-          enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual (erri)
-
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (C2,B4)
-
-      end
-C ----------------------------------------------------templ442
-c 442 TEMPLATE arrA1[BLOCK][BLOCK][BLOCK][BLOCK]
-c                     ALIGN arrB[i][j][k][l] WITH  arrA[l][i][j][k] 
-c                     ALIGN arrC[i][j][k][l] WITH [i+2][ j][k][ l+3] 
-    
-      subroutine templ442
-      integer, parameter :: AN1=7,AN2=7,AN3=7,AN4=7
-      integer, parameter :: BN1=2,BN2=2,BN3=2,BN4=2
-      integer, parameter :: CN1=4,CN2=4,CN3=4,CN4=4
-      integer, parameter :: NL=10000,ER=100000
-c     parameters for ALIGN arrB[i][j][n][m] WITH arrA4(k4i*m+li,k1j*i+lj,k2n*j+ln,k3m*n+lm)                                              
-      integer, parameter :: k1i=0,k2i=0,k3i=0,k4i=1,li=0
-      integer, parameter :: k1j=1,k2j=0,k3j=0,k4j=0,lj=0
-      integer, parameter :: k1n=0,k2n=1,k3n=0,k4n=0,ln=0
-      integer, parameter :: k1m=0,k2m=0,k3m=1,k4m=0,lm=0
-c     parameters for ALIGN arrC[i][j][n][m] WITH arrA4(kc1i*i+lci,kc2j*j+lcj,kc3n*n+lcn,kc4m*m+lcm)                                               
-      integer, parameter :: kc1i=1,kc2i=0,kc3i=0,kc4i=0,lci=2
-      integer, parameter :: kc1j=0,kc2j=1,kc3j=0,kc4j=0,lcj=0
-      integer, parameter :: kc1n=0,kc2n=0,kc3n=1,kc4n=0,lcn=0
-      integer, parameter :: kc1m=0,kc2m=0,kc3m=0,kc4m=1,lcm=3
-
-      character*9 tname
-      integer, allocatable :: C4(:,:,:,:),B4(:,:,:,:)
-      integer s,cs,erri,i,j,n,m,ia,ja,na,ma,ib,jb,nb,mb,ic,jc,nc,mc
-cdvm$ template A4(AN1,AN2,AN3,AN4)              
-cdvm$ ALIGN B4(i,j,n,m) WITH A4(k4i*m+li,k1j*i+lj,k2n*j+ln,k3m*n+lm)
-cdvm$ ALIGN C4(i,j,n,m) WITH A4(kc1i*i+lci,kc2j*j+lcj,
-cdvm$*kc3n*n+lcn,kc4m*m+lcm)
-cdvm$ distribute A4(BLOCK,BLOCK,BLOCK,BLOCK)    
-
-      tname='templ442'
-      allocate (C4(CN1,CN2,CN3,CN4),B4(BN1,BN2,BN3,BN4))
-      erri= ER
-      NNL=NL 
-
-!dvm$ actual (erri)
-!dvm$ region
-
-*dvm$ parallel (m,n,j,i) on B4(i,j,n,m)
-      do m=1,BN4
-          do n=1,BN3
-             do j=1,BN2
-                do i=1,BN1
-                    B4(i,j,n,m) =(i*NL/10+j*NL/100+n*NL/1000+m)     
-                enddo
-             enddo
-          enddo
-      enddo
-
-*dvm$ parallel (m,n,j,i) on C4(i,j,n,m)
-      do m=1,CN4
-          do n=1,CN3
-             do j=1,CN2
-                do i=1,CN1
-                    C4(i,j,n,m) =(i*NL/10+j*NL/100+n*NL/1000+m)     
-                enddo
-             enddo
-          enddo
-      enddo
-
-*dvm$ parallel (m,n,j,i) on A4(i,j,n,m),
-*dvm$*private(ib,jb,nb,mb,ic,jc,nc,mc,erri)
-      do m=1,AN4
-          do n=1,AN3
-            do j=1,AN2
-              do i=1,AN1
-                      if ( 
-     *                  ((i-li) .eq.(((i-li)/k4i) * k4i)) .and.
-     *                  ((j-lj) .eq.(((j-lj)/k1j) *k1j)) .and.
-     *                  ((n-ln) .eq.(((n-ln)/k2n) * k2n)) .and.
-     *                  ((m-lm) .eq.(((m-lm)/k3m) *k3m)) .and.
-     *                  (((i-li)/k4i) .gt. 0)  .and.
-     *                  (((j-lj)/k1j) .gt. 0)  .and.
-     *                  (((n-ln)/k2n) .gt. 0)  .and.
-     *                  (((m-lm)/k3m) .gt. 0)  .and.
-     *                  (((i-li)/k4i) .le. BN4)  .and.
-     *                  (((j-lj)/k1j) .le. BN1)  .and.
-     *                  (((n-ln)/k2n) .le. BN2)  .and.
-     *                  (((m-lm)/k3m) .le. BN3)
-     *                  )  then 
-                        mb = (i-li)/k4i
-                        ib = (j-lj)/k1j
-                        jb = (n-ln)/k2n
-                        nb = (m-lm)/k3m
-                        if  (B4(ib,jb,nb,mb).eq.
-     *                      (ib*NL/10+jb*NL/100+nb*NL/1000+mb))then     
-                        else
-                            erri = i*NL/10 + j*NL/100+ n*NL/1000+ m
-                        endif
-                      endif 
-                      if ( 
-     *                  ((i-lci) .eq.(((i-lci)/kc1i) * kc1i)) .and.
-     *                  ((j-lcj) .eq.(((j-lcj)/kc2j) *kc2j)) .and.
-     *                  ((n-lcn) .eq.(((n-lcn)/kc3n) * kc3n)) .and.
-     *                  ((m-lcm) .eq.(((m-lcm)/kc4m) *kc4m)) .and.
-     *                  (((i-lci)/kc1i) .gt. 0)  .and.
-     *                  (((j-lcj)/kc2j) .gt. 0)  .and.
-     *                  (((n-lcn)/kc3n) .gt. 0)  .and.
-     *                  (((m-lcm)/kc4m) .gt. 0)  .and.
-     *                  (((i-lci)/kc1i) .le. BN1)  .and.
-     *                  (((j-lcj)/kc2j) .le. BN2)  .and.
-     *                  (((n-lcn)/kc3n) .le. BN3)  .and.
-     *                  (((m-lcm)/kc4m) .le. BN4)
-     *                  )  then 
-                        ic = (i-lci)/kc1i
-                        jc = (j-lcj)/kc2j
-                        nc = (n-lcn)/kc3n
-                        mc = (m-lcm)/kc4m
-                        if (C4(ic,jc,nc,mc) .eq.     
-     *                      (ic*NL/10+jc*NL/100+nc*NL/1000+mc))then     
-                        else
-                            erri = i*NL/10 + j*NL/100+ n*NL/1000+ m
-                        endif
-             endif 
-              enddo
-            enddo
-          enddo
-      enddo
-
-!dvm$ end region
-!dvm$ get_actual(erri)
-
-      if (erri .eq.ER) then     
-          call ansyes(tname)
-      else
-          call ansno(tname)
-      endif 
-      deallocate (C4,B4)
-
-      end
-C -------------------------------------------------
-
-      subroutine ansyes(name)
-      character*9 name
-      print *,name,'  -  complete'
-      end
-      subroutine ansno(name)
-      character*9 name
-      print *,name,'  -  ***error'
-      end
-         
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/settings
deleted file mode 100644
index 9a42eb0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/settings
+++ /dev/null
@@ -1,4 +0,0 @@
-MAX_PROC_COUNT=16
-MAX_DIM_PROC_COUNT=5
-SHARE_RESOURCES=1
-MAX_TIME=120 # In seconds
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/test-analyzer.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/test-analyzer.sh
deleted file mode 100644
index 640168b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Correctness/test-analyzer.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-# This is analyzer of output of standard-formed tests
-# Requires variables: LAUNCH_EXIT_CODE, STDOUT_FN, STDERR_FN
-# Produces variables: SUBTEST_COUNT, TEST_PASSED, RESULT_COMMENT, ERROR_LEVEL
-# Produces functions: analyze_subtest
-
-SUBTEST_COUNT=`grep -E 'complete|\*\*\*error' <"$STDOUT_FN" | wc -l`
-
-if [ `grep -E 'Assertion' <"$STDERR_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Assertion failed"
-    ERROR_LEVEL=5
-elif [ `grep -E 'RTS fatal' <"$STDERR_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="RTS fatal"
-    ERROR_LEVEL=4
-elif [ `grep -E 'RTS err' <"$STDERR_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="RTS err"
-    ERROR_LEVEL=3
-elif [ `grep "END OF" <"$STDOUT_FN" | wc -l` -eq 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Crash"
-    ERROR_LEVEL=2
-elif [ $LAUNCH_EXIT_CODE -ne 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Launch failure"
-    ERROR_LEVEL=6
-elif [ `grep '\*\*\*error' <"$STDOUT_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Has failed subtests"
-    ERROR_LEVEL=1
-else
-    TEST_PASSED=1
-    RESULT_COMMENT="OK"
-    ERROR_LEVEL=0
-fi
-
-analyze_subtest() {
-    # Produces variables: SUBTEST_NAME, TEST_PASSED, RESULT_COMMENT, ERROR_LEVEL
-    local SUBTEST_LINE=`grep -E 'complete|\*\*\*error' <"$STDOUT_FN" | head -n $1 | tail -n 1`
-    SUBTEST_NAME=`echo "$SUBTEST_LINE" | awk '{print $1}'`
-    if [ `echo $SUBTEST_LINE | grep "complete" | wc -l` -eq 0 ]; then
-        TEST_PASSED=0
-        RESULT_COMMENT="Subtest failed"
-        ERROR_LEVEL=1
-    else
-        TEST_PASSED=1
-        RESULT_COMMENT="OK"
-        ERROR_LEVEL=0
-    fi
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile
deleted file mode 100644
index 856ab65..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=bt
-BENCHMARKU=BT
-
-include ../config/make.def
-include ../sys/make.common
-
-SOURCES = bt.fdv \
-	set_constants.fdv \
-	initialize.fdv \
-	exact_solution.fdv \
-	verify.fdv \
-	compute_errors.fdv \
-	timers.fdv \
-	print_result.fdv
-
-SOURCES_MPI = z_solve_mpi.fdv y_solve_mpi.fdv x_solve_mpi.fdv compute_rhs_mpi.fdv exact_rhs.fdv
-SOURCES_SINGLE = z_solve.fdv y_solve.fdv x_solve.fdv compute_rhs.fdv exact_rhs.fdv
-SOURCES_BLOCK = z_solve_block.fdv y_solve_block.fdv x_solve_block.fdv compute_rhs_block.fdv exact_rhs_block.fdv
-SOURCES_BLOCK1 = z_solve_block.fdv y_solve_block.fdv x_solve_block.fdv compute_rhs.fdv exact_rhs.fdv
-SOURCES_BLOCK2 = z_solve_block.fdv y_solve_block.fdv x_solve_block.fdv compute_rhs_block2.fdv exact_rhs.fdv
-
-OBJS = ${SOURCES:.fdv=.o}
-OBJS_SINGLE = ${SOURCES_SINGLE:.fdv=.o}
-OBJS_MPI = ${SOURCES_MPI:.fdv=.o}
-OBJS_BLOCK = ${SOURCES_BLOCK:.fdv=.o}
-OBJS_BLOCK1 = ${SOURCES_BLOCK1:.fdv=.o}
-OBJS_BLOCK2 = ${SOURCES_BLOCK2:.fdv=.o}
-
-${PROGRAM}: config
-	@if [ "$(VERSION)" = "MPI" ] ; then	\
-		${MAKE} MPI_VER;  \
-	else       \
-		if [ "$(VERSION)" = "BLOCK" ] ; then \
-			${MAKE} BLOCK_VER; \
-		else \
-			if [ "$(VERSION)" = "BLOCK1" ] ; then \
-				${MAKE} BLOCK_VER1; \
-			else \
-				${MAKE} SINGLE_VER;\
-			fi \
-		fi \
-	fi
-	
-MPI_VER: $(OBJS) $(OBJS_MPI)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
-
-SINGLE_VER: $(OBJS) $(OBJS_SINGLE)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
-
-BLOCK_VER: $(OBJS) $(OBJS_BLOCK)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK)
-
-BLOCK_VER1: $(OBJS) $(OBJS_BLOCK1)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK1)
-
-BLOCK_VER2: $(OBJS) $(OBJS_BLOCK2)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_BLOCK2)	
-
-%.o: %.fdv npbparams.h header3d.h
-	${F77} f ${FFLAGS} -c -o $@ $<
-
-clean:
-	rm -f npbparams.h
-	rm -f *.o *~
-	rm -f *.cu *.cuf *.c *.f
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/TODO_make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/TODO_make.bat
deleted file mode 100644
index 31052e1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/TODO_make.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-set CLASS=%1
-set OPT=%2
-
-CALL ..\sys\setparams BT %CLASS%
-CALL %F77% %OPT% bt 1>out_%CLASS%.txt 2>err_%CLASS%.txt
-if exist bt.exe ( 
-  copy bt.exe %BIN%\bt.%CLASS%.x.exe 
-  del bt.exe 
-)
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/bt.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/bt.fdv
deleted file mode 100644
index 4e6bab8..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/bt.fdv
+++ /dev/null
@@ -1,120 +0,0 @@
-
-!---------------------------------------------------------------------
-      program btdv3
-
-      include 'header3d.h'
-      integer  i,niter,step,fstatus,n3
-      double precision  navg,mflops
-      external timer_read,verify
-      double precision  tmax,timer_read
-      logical  verified
-      character  class
-
-!---------------------------------------------------------------------
-!      Root node reads input file (if it exists) else takes
-!      defaults from parameters
-!---------------------------------------------------------------------
-      write (unit = *,fmt = 1000) 
-      open (unit = 2,file = 'inputbt.data',status = 'old',iostat = fstat
-     &us)
-      if (fstatus .eq. 0) then
-         write (unit = *,fmt = 233) 
-233      format(' Reading from input file inputbt.data')
-         read (unit = 2,fmt = *) niter
-         read (unit = 2,fmt = *) dt
-         read (unit = 2,fmt = *) grid_points(1),grid_points(2),grid_poin
-     &ts(3)
-         close (unit = 2)
-      else  
-         write (unit = *,fmt = 234) 
-         niter = niter_default
-         dt = dt_default
-         grid_points(1) = problem_size
-         grid_points(2) = problem_size
-         grid_points(3) = problem_size
-      endif  
-234   format(' No input file inputbt.data. Using compiled defaults')
-      write (unit = *,fmt = 1001) grid_points(1),grid_points(2),grid_poi
-     &nts(3)
-      write (unit = *,fmt = 1002) niter,dt
-1000  format(//, ' NAS Parallel Benchmarks 3.3.1 - DVMH version',' - BT 
-     &Benchmark ',/)
-1001  format(' Size: ', i3, 'x', i3, 'x', i3)
-1002  format(' Iterations: ', i3, '    dt: ', F10.6)
-      if (grid_points(1) .gt. imax .or. grid_points(2) .gt. jmax .or. gr
-     &id_points(3) .gt. kmax) then
-         print *, (grid_points(i), i = 1,3)
-         print *, ' Problem size too big for compiled array sizes'
-         goto 999
-      endif  
-      open (unit = 2,file = 'inputStage',status = 'old',iostat = fstat
-     &us)	
-      if (fstatus .eq. 0) then
-         read (unit = 2,fmt = *) stage_n
-         close (unit = 2)
-      else  
-         stage_n = 0
-      endif 
-      write(*,*) 'stage = ', stage_n
-	  
-      call set_constants()     
-      call initialize()	
-      call exact_rhs()
-	  
-! ************* DO 2 iterations for touch all code 
-       call adi_first
-       call adi_first
-       call initialize
-
-      call timer_clear(1)
-      call timer_start(1)
-      do  step = 1,niter
-         if (mod (step,20) .eq. 0 .or. step .eq. 1) then
-            write (unit = *,fmt = 200) step
-200         format(' Time step ', i8)
-         endif  
-         call adi()
-      enddo  
-      call timer_stop(1)
-      tmax = timer_read (1)
-      call verify(niter,class,verified)
-      n3 = grid_points(1) * grid_points(2) * grid_points(3)
-      navg = (grid_points(1) + grid_points(2) + grid_points(3)) / 3.0
-      if (tmax .ne. 0.) then
-         mflops = 1.0e-6 * float (niter) * (3478.8 * float (n3) - 17655.
-     &7 * navg** 2 + 28023.7 * navg) / tmax
-      else  
-         mflops = 0.0
-      endif  
-      call print_results('BT',class,grid_points(1),grid_points(2),grid_p
-     &oints(3),niter,tmax,mflops,'          floating point',verified,npb
-     &version)
-
-!       ,compiletime, cs1, cs2, cs3, cs4, cs5,cs6, '(none)')
-999   continue
-      end
-	  
-      subroutine adi_first()
-      call compute_rhs()  
-      call x_solve()  
-      call y_solve()  
-      call z_solve()
-      return
-      end
-	  
-      subroutine adi ()
-
-!DVM$ interval 1
-      call compute_rhs()
-!DVM$ end interval	  
-!DVM$ interval 11	  
-      call x_solve()
-!DVM$ end interval	  
-!DVM$ interval 12	  
-      call y_solve()
-!DVM$ end interval	  
-!DVM$ interval 13	  
-      call z_solve()
-!DVM$ end interval
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_errors.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_errors.fdv
deleted file mode 100644
index 15e0d30..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_errors.fdv
+++ /dev/null
@@ -1,117 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     this function computes the norm of the difference between the
-!     computed solution and the exact solution
-!---------------------------------------------------------------------
-      subroutine error_norm (rms)
-
-      include 'header3d.h'
-      integer  i,j,k,m,d
-      double precision  xi,eta,zeta,u_exact(5),rms(5),add
-      double precision  r1,r2,r3,r4,r5
-      do  m = 1,5
-         rms(m) = 0.0d0
-      enddo  
-      r1 = 0.0d0
-      r2 = 0.0d0
-      r3 = 0.0d0
-      r4 = 0.0d0
-      r5 = 0.0d0
-
-!DVM$ region
-!DVM$ PARALLEL (k,j,i) ON  u(*,i,j,k),
-!DVM$& REDUCTION(SUM(r1),SUM(r2),SUM(r3),SUM(r4),SUM(r5)),
-!DVM$&private(u_exact,xi,eta,zeta,m,add)
-      do  k = 0,problem_size - 1
-         do  j = 0,problem_size - 1
-            do  i = 0,problem_size - 1
-               zeta = dble (k) * dnzm1
-               eta = dble (j) * dnym1
-               xi = dble (i) * dnxm1
-
-!               call exact_solution(xi, eta, zeta, u_exact)
-               do  m = 1,5
-                  u_exact(m) = ce(m,1) + xi * (ce(m,2) + xi * (ce(m,5) +
-     & xi * (ce(m,8) + xi * ce(m,11)))) + eta * (ce(m,3) + eta * (ce(m,6
-     &) + eta * (ce(m,9) + eta * ce(m,12)))) + zeta * (ce(m,4) + zeta * 
-     &(ce(m,7) + zeta * (ce(m,10) + zeta * ce(m,13))))
-               enddo  
-               add = u(1,i,j,k) - u_exact(1)
-               r1 = r1 + add * add
-               add = u(2,i,j,k) - u_exact(2)
-               r2 = r2 + add * add
-               add = u(3,i,j,k) - u_exact(3)
-               r3 = r3 + add * add
-               add = u(4,i,j,k) - u_exact(4)
-               r4 = r4 + add * add
-               add = u(5,i,j,k) - u_exact(5)
-               r5 = r5 + add * add
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      rms(1) = r1
-      rms(2) = r2
-      rms(3) = r3
-      rms(4) = r4
-      rms(5) = r5
-      do  m = 1,5
-         do  d = 1,3
-            rms(m) = rms(m) / dble (grid_points(d) - 2)
-         enddo  
-         rms(m) = dsqrt (rms(m))
-      enddo  
-      return
-      end
-
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine rhs_norm (rms)
-
-      include 'header3d.h'
-      integer  i,j,k,d,m
-      double precision rms(5),add,r1,r2,r3,r4,r5
-      r1 = 0.0d0
-      r2 = 0.0d0
-      r3 = 0.0d0
-      r4 = 0.0d0
-      r5 = 0.0d0
-
-!DVM$ region
-!DVM$ PARALLEL (k,j,i) ON  rhs(*,i,j,k), 
-!DVM$&REDUCTION(SUM(r1),SUM(r2),SUM(r3),SUM(r4),SUM(r5)),
-!DVM$&private(add)
-      do  k = 1,problem_size - 2
-         do  j = 1,problem_size - 2
-            do  i = 1,problem_size - 2
-               add = rhs(1,i,j,k)
-               r1 = r1 + add * add
-               add = rhs(2,i,j,k)
-               r2 = r2 + add * add
-               add = rhs(3,i,j,k)
-               r3 = r3 + add * add
-               add = rhs(4,i,j,k)
-               r4 = r4 + add * add
-               add = rhs(5,i,j,k)
-               r5 = r5 + add * add
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      rms(1) = r1
-      rms(2) = r2
-      rms(3) = r3
-      rms(4) = r4
-      rms(5) = r5
-      do  m = 1,5
-         do  d = 1,3
-            rms(m) = rms(m) / dble (grid_points(d) - 2)
-         enddo  
-         rms(m) = dsqrt (rms(m))
-      enddo  
-      return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs.fdv
deleted file mode 100644
index 6f3b785..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs.fdv
+++ /dev/null
@@ -1,218 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine compute_rhs ()
-
-      include 'header3d.h'
-      integer  i,j,k,m
-      double precision  rho_inv,uijk,up1,um1,vijk,vp1,vm1,wijk,wp1,wm1,r
-     &hs_(5)
-
-!DVM$ region out(rho_i, us, vs, ws, qs, square)
-!DVM$ PARALLEL (k,j,i)  ON  us(i,j,k), SHADOW_COMPUTE,
-!DVM$& PRIVATE(rho_inv,m),cuda_block(128)
-      do  k = 0,problem_size - 1
-         do  j = 0,problem_size - 1
-            do  i = 0,problem_size - 1
-               rho_inv = 1.0d0 / u(1,i,j,k)
-               rho_i(i,j,k) = rho_inv
-               us(i,j,k) = u(2,i,j,k) * rho_inv
-               vs(i,j,k) = u(3,i,j,k) * rho_inv
-               ws(i,j,k) = u(4,i,j,k) * rho_inv
-               square(i,j,k) = 0.5d0 * (u(2,i,j,k) * u(2,i,j,k) + u(3,i,
-     &j,k) * u(3,i,j,k) + u(4,i,j,k) * u(4,i,j,k)) * rho_inv
-               qs(i,j,k) = square(i,j,k) * rho_inv
-               do  m = 1,5
-                  rhs(m,i,j,k) = forcing(m,i,j,k)
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!     compute xi-direction fluxes 
-!---------------------------------------------------------------------
-!DVM$ PARALLEL (k,j,i)  ON  rhs(*,i,j,k), PRIVATE(uijk,up1,um1,m,
-!DVM$&vijk,vp1,vm1,wijk,wp1,wm1,rhs_),cuda_block(32)
-      do  k = 1,problem_size - 2
-         do  j = 1,problem_size - 2
-            do  i = 1,problem_size - 2
-               uijk = us(i,j,k)
-               up1 = us(i + 1,j,k)
-               um1 = us(i - 1,j,k)
-               rhs_(1) = forcing(1,i,j,k) 
-               rhs_(2) = forcing(2,i,j,k) 
-               rhs_(3) = forcing(3,i,j,k) 
-               rhs_(4) = forcing(4,i,j,k) 
-               rhs_(5) = forcing(5,i,j,k)
-			   
-               rhs_(1) = rhs_(1) + dx1tx1 * (u(1,i + 1,j,k) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i - 1,j,k)) - tx2 * (u(2,i + 1,j,k) - u(2,i - 1,j,k
-     &))
-               rhs_(2) = rhs_(2) + dx2tx1 * (u(2,i + 1,j,k) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i - 1,j,k)) + xxcon2 * con43 * (up1 - 2.0d0 * uijk 
-     &+ um1) - tx2 * (u(2,i + 1,j,k) * up1 - u(2,i - 1,j,k) * um1 + (u(5
-     &,i + 1,j,k) - square(i + 1,j,k) - u(5,i - 1,j,k) + square(i - 1,j,
-     &k)) * c2)
-               rhs_(3) = rhs_(3) + dx3tx1 * (u(3,i + 1,j,k) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i - 1,j,k)) + xxcon2 * (vs(i + 1,j,k) - 2.0d0 * vs(
-     &i,j,k) + vs(i - 1,j,k)) - tx2 * (u(3,i + 1,j,k) * up1 - u(3,i - 1,
-     &j,k) * um1)
-               rhs_(4) = rhs_(4) + dx4tx1 * (u(4,i + 1,j,k) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i - 1,j,k)) + xxcon2 * (ws(i + 1,j,k) - 2.0d0 * ws(
-     &i,j,k) + ws(i - 1,j,k)) - tx2 * (u(4,i + 1,j,k) * up1 - u(4,i - 1,
-     &j,k) * um1)
-               rhs_(5) = rhs_(5) + dx5tx1 * (u(5,i + 1,j,k) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i - 1,j,k)) + xxcon3 * (qs(i + 1,j,k) - 2.0d0 * qs(
-     &i,j,k) + qs(i - 1,j,k)) + xxcon4 * (up1 * up1 - 2.0d0 * uijk * uij
-     &k + um1 * um1) + xxcon5 * (u(5,i + 1,j,k) * rho_i(i + 1,j,k) - 2.0
-     &d0 * u(5,i,j,k) * rho_i(i,j,k) + u(5,i - 1,j,k) * rho_i(i - 1,j,k)
-     &) - tx2 * ((c1 * u(5,i + 1,j,k) - c2 * square(i + 1,j,k)) * up1 - 
-     &(c1 * u(5,i - 1,j,k) - c2 * square(i - 1,j,k)) * um1)
-               if (i .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i + 1,j,k) + u(m,i + 2,j,k))
-                  enddo  
-               else if (i .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i - 1,
-     &j,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k) + u(m,i + 2,j,k
-     &))
-                  enddo  
-               else if (i .ge. 3 .and. i .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.0d0 
-     &* u(m,i - 1,j,k) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k) + u(m
-     &,i + 2,j,k))
-                  enddo  
-               else if (i .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.0d0 
-     &* u(m,i - 1,j,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k))
-                  enddo  
-               else if (i .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.d0 *
-     & u(m,i - 1,j,k) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-               vijk = vs(i,j,k)
-               vp1 = vs(i,j + 1,k)
-               vm1 = vs(i,j - 1,k)
-               rhs_(1) = rhs_(1) + dy1ty1 * (u(1,i,j + 1,k) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i,j - 1,k)) - ty2 * (u(3,i,j + 1,k) - u(3,i,j - 1,k
-     &))
-               rhs_(2) = rhs_(2) + dy2ty1 * (u(2,i,j + 1,k) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i,j - 1,k)) + yycon2 * (us(i,j + 1,k) - 2.0d0 * us(
-     &i,j,k) + us(i,j - 1,k)) - ty2 * (u(2,i,j + 1,k) * vp1 - u(2,i,j - 
-     &1,k) * vm1)
-               rhs_(3) = rhs_(3) + dy3ty1 * (u(3,i,j + 1,k) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i,j - 1,k)) + yycon2 * con43 * (vp1 - 2.0d0 * vijk 
-     &+ vm1) - ty2 * (u(3,i,j + 1,k) * vp1 - u(3,i,j - 1,k) * vm1 + (u(5
-     &,i,j + 1,k) - square(i,j + 1,k) - u(5,i,j - 1,k) + square(i,j - 1,
-     &k)) * c2)
-               rhs_(4) = rhs_(4) + dy4ty1 * (u(4,i,j + 1,k) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i,j - 1,k)) + yycon2 * (ws(i,j + 1,k) - 2.0d0 * ws(
-     &i,j,k) + ws(i,j - 1,k)) - ty2 * (u(4,i,j + 1,k) * vp1 - u(4,i,j - 
-     &1,k) * vm1)
-               rhs_(5) = rhs_(5) + dy5ty1 * (u(5,i,j + 1,k) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i,j - 1,k)) + yycon3 * (qs(i,j + 1,k) - 2.0d0 * qs(
-     &i,j,k) + qs(i,j - 1,k)) + yycon4 * (vp1 * vp1 - 2.0d0 * vijk * vij
-     &k + vm1 * vm1) + yycon5 * (u(5,i,j + 1,k) * rho_i(i,j + 1,k) - 2.0
-     &d0 * u(5,i,j,k) * rho_i(i,j,k) + u(5,i,j - 1,k) * rho_i(i,j - 1,k)
-     &) - ty2 * ((c1 * u(5,i,j + 1,k) - c2 * square(i,j + 1,k)) * vp1 - 
-     &(c1 * u(5,i,j - 1,k) - c2 * square(i,j - 1,k)) * vm1)
-               if (j .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i,j + 1,k) + u(m,i,j + 2,k))
-                  enddo  
-               else if (j .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i,j - 
-     &1,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k) + u(m,i,j + 2,k
-     &))
-                  enddo  
-               else if (j .ge. 3 .and. j .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.0d0 
-     &* u(m,i,j - 1,k) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k) + u(m
-     &,i,j + 2,k))
-                  enddo  
-               else if (j .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.0d0 
-     &* u(m,i,j - 1,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k))
-                  enddo  
-               else if (j .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.d0 *
-     & u(m,i,j - 1,k) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-               wijk = ws(i,j,k)
-               wp1 = ws(i,j,k + 1)
-               wm1 = ws(i,j,k - 1)
-               rhs_(1) = rhs_(1) + dz1tz1 * (u(1,i,j,k + 1) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i,j,k - 1)) - tz2 * (u(4,i,j,k + 1) - u(4,i,j,k - 1
-     &))
-               rhs_(2) = rhs_(2) + dz2tz1 * (u(2,i,j,k + 1) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i,j,k - 1)) + zzcon2 * (us(i,j,k + 1) - 2.0d0 * us(
-     &i,j,k) + us(i,j,k - 1)) - tz2 * (u(2,i,j,k + 1) * wp1 - u(2,i,j,k 
-     &- 1) * wm1)
-               rhs_(3) = rhs_(3) + dz3tz1 * (u(3,i,j,k + 1) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i,j,k - 1)) + zzcon2 * (vs(i,j,k + 1) - 2.0d0 * vs(
-     &i,j,k) + vs(i,j,k - 1)) - tz2 * (u(3,i,j,k + 1) * wp1 - u(3,i,j,k 
-     &- 1) * wm1)
-               rhs_(4) = rhs_(4) + dz4tz1 * (u(4,i,j,k + 1) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i,j,k - 1)) + zzcon2 * con43 * (wp1 - 2.0d0 * wijk 
-     &+ wm1) - tz2 * (u(4,i,j,k + 1) * wp1 - u(4,i,j,k - 1) * wm1 + (u(5
-     &,i,j,k + 1) - square(i,j,k + 1) - u(5,i,j,k - 1) + square(i,j,k - 
-     &1)) * c2)
-               rhs_(5) = rhs_(5) + dz5tz1 * (u(5,i,j,k + 1) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i,j,k - 1)) + zzcon3 * (qs(i,j,k + 1) - 2.0d0 * qs(
-     &i,j,k) + qs(i,j,k - 1)) + zzcon4 * (wp1 * wp1 - 2.0d0 * wijk * wij
-     &k + wm1 * wm1) + zzcon5 * (u(5,i,j,k + 1) * rho_i(i,j,k + 1) - 2.0
-     &d0 * u(5,i,j,k) * rho_i(i,j,k) + u(5,i,j,k - 1) * rho_i(i,j,k - 1)
-     &) - tz2 * ((c1 * u(5,i,j,k + 1) - c2 * square(i,j,k + 1)) * wp1 - 
-     &(c1 * u(5,i,j,k - 1) - c2 * square(i,j,k - 1)) * wm1)
-               if (k .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i,j,k + 1) + u(m,i,j,k + 2))
-                  enddo  
-               else if (k .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i,j,k 
-     &- 1) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1) + u(m,i,j,k + 2
-     &))
-                  enddo  
-               else if (k .ge. 3 .and. k .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.0d0 
-     &* u(m,i,j,k - 1) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1) + u(m
-     &,i,j,k + 2))
-                  enddo  
-               else if (k .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.0d0 
-     &* u(m,i,j,k - 1) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1))
-                  enddo  
-               else if (k .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.d0 *
-     & u(m,i,j,k - 1) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-               rhs(1,i,j,k) = rhs_(1) * dt
-               rhs(2,i,j,k) = rhs_(2) * dt
-               rhs(3,i,j,k) = rhs_(3) * dt
-               rhs(4,i,j,k) = rhs_(4) * dt
-               rhs(5,i,j,k) = rhs_(5) * dt
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block.fdv
deleted file mode 100644
index 924af91..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block.fdv
+++ /dev/null
@@ -1,484 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine compute_rhs ()
-
-      include 'header3d.h'
-      integer  i,j,k,m,z
-      double precision  rho_inv,uijk,up1,um1,vijk,vp1,vm1,wijk,wp1,wm1,r
-     &hs_(5),s1,s2,s3,s4,s5,s6,s7,qs1,qs2,qs3,qs4,qs5,qs6,qs7
-      double precision ue_(-2:2, 5), buf_(-2:2, 5),cuf_(-2:2),q_(-2:2) 
-      double precision dtemp(5), xi, eta, zeta, dtpp	  
-!DVM$ region 
-!DVM$ PARALLEL (k,j,i) ON us(i,j,k),PRIVATE(m),cuda_block(128)
-      do  k = 0,problem_size - 1
-         do  j = 0,problem_size - 1
-            do  i = 0,problem_size - 1
-               do  m = 1,5
-                  rhs(m,i,j,k) = 0
-               enddo  
-            enddo
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!     compute xi-direction fluxes 
-!---------------------------------------------------------------------
-!DVM$ PARALLEL (k,j,i)  ON  rhs(*,i,j,k), PRIVATE(uijk,up1,um1,m,
-!DVM$&vijk,vp1,vm1,wijk,wp1,wm1,rhs_,s1,s2,s3,s4,s5,s6,s7,
-!DVM$&qs1,qs2,qs3,qs4,qs5,qs6,qs7,
-!DVM$&zeta,eta,xi,dtemp,buf_,cuf_,q_,dtpp,z,ue_),cuda_block(32)
-      do  k = 1,problem_size - 2
-         do  j = 1,problem_size - 2
-            do  i = 1,problem_size - 2
-               rhs_(1) = 0
-               rhs_(2) = 0
-               rhs_(3) = 0
-               rhs_(4) = 0
-               rhs_(5) = 0
-			   
-                zeta = dble(k) * dnzm1
-                eta = dble(j) * dnym1			 
-			    do z = -2, 2 
-                  xi = dble(i + z) * dnxm1
-       do  m = 1, 5
-          dtemp(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-       end do
-                  do  m = 1, 5
-                     ue_(z,m) = dtemp(m)
-                  end do
-                  dtpp = 1.0d0 / dtemp(1)
-                  do  m = 2, 5
-                     buf_(z, m) = dtpp * dtemp(m)
-                  end do
-
-                  cuf_(z) = buf_(z,2) * buf_(z,2)
-                  buf_(z,1) = cuf_(z) + buf_(z,3) * buf_(z,3) + 
-     >                     buf_(z,4) * buf_(z,4) 
-                  q_(z) = 0.5d0*(buf_(z,2)*ue_(z,2) + buf_(z,3)*
-     >                       ue_(z,3) + buf_(z,4)*ue_(z,4))
-                enddo	 
-
-                rhs_(1) = rhs_(1) -
-     >                 tx2*( ue_(1,2)-ue_(-1,2) )+
-     >                 dx1tx1*(ue_(1,1)-2.0d0*ue_(0,1)+ue_(-1,1))
-
-                rhs_(2) = rhs_(2) - tx2 * (
-     >                (ue_(1,2)*buf_(1,2)+c2*(ue_(1,5)-q_(1)))-
-     >                (ue_(-1,2)*buf_(-1,2)+c2*(ue_(-1,5)-q_(-1))))+
-     >                 xxcon1*(buf_(1,2)-2.0d0*buf_(0,2)+buf_(-1,2))+
-     >                 dx2tx1*( ue_(1,2)-2.0d0* ue_(0,2)+ue_(-1,2))
-
-                rhs_(3) = rhs_(3) - tx2 * (
-     >                 ue_(1,3)*buf_(1,2)-ue_(-1,3)*buf_(-1,2))+
-     >                 xxcon2*(buf_(1,3)-2.0d0*buf_(0,3)+buf_(-1,3))+
-     >                 dx3tx1*( ue_(1,3)-2.0d0*ue_(0,3) +ue_(-1,3))
-                  
-                rhs_(4) = rhs_(4) - tx2*(
-     >                 ue_(1,4)*buf_(1,2)-ue_(-1,4)*buf_(-1,2))+
-     >                 xxcon2*(buf_(1,4)-2.0d0*buf_(0,4)+buf_(-1,4))+
-     >                 dx4tx1*( ue_(1,4)-2.0d0* ue_(0,4)+ ue_(-1,4))
-
-                rhs_(5) = rhs_(5) - tx2*(
-     >                 buf_(1,2)*(c1*ue_(1,5)-c2*q_(1))-
-     >                 buf_(-1,2)*(c1*ue_(-1,5)-c2*q_(-1)))+
-     >                 0.5d0*xxcon3*(buf_(1,1)-2.0d0*buf_(0,1)+
-     >                               buf_(-1,1))+
-     >                 xxcon4*(cuf_(1)-2.0d0*cuf_(0)+cuf_(-1))+
-     >                 xxcon5*(buf_(1,5)-2.0d0*buf_(0,5)+buf_(-1,5))+
-     >                 dx5tx1*( ue_(1,5)-2.0d0* ue_(0,5)+ ue_(-1,5))
-               do   m = 1, 5
-                if(i .eq. 1) then
-                  rhs_(m) = rhs_(m) - dssp *
-     >                    (5.0d0*ue_(0,m) - 4.0d0*ue_(1,m) +ue_(2,m))
-	            else if(i .eq. 2) then
-                  rhs_(m) = rhs_(m) - dssp *
-     >                   (-4.0d0*ue_(-1,m) + 6.0d0*ue_(0,m) -
-     >                     4.0d0*ue_(1,m) + ue_(2,m))
-	            else if(i .eq. problem_size-3) then
-                   rhs_(m) = rhs_(m) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m))
-                else if(i .eq. problem_size-2) then	 
-                   rhs_(m) = rhs_(m) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) + 5.0d0*ue_(0,m))				
-                else
-                  rhs_(m) = rhs_(m) - dssp*
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m) + ue_(2,m))
-                endif				  
-               end do
-
-                zeta = dble(k) * dnzm1
-                xi = dble(i) * dnxm1			 
-                do z = -2, 2 
-                  eta = dble(j + z) * dnym1
-       do  m = 1, 5
-          dtemp(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-       end do
-                  do  m = 1, 5
-                     ue_(z,m) = dtemp(m)
-                  end do
-                  dtpp = 1.0d0 / dtemp(1)
-                  do  m = 2, 5
-                     buf_(z, m) = dtpp * dtemp(m)
-                  end do
-
-                  cuf_(z)   = buf_(z,3) * buf_(z,3)
-                  buf_(z,1) = cuf_(z) + buf_(z,2) * buf_(z,2) + 
-     >                     buf_(z,4) * buf_(z,4)
-                  q_(z) = 0.5d0*(buf_(z,2)*ue_(z,2) + buf_(z,3)
-     >                        *ue_(z,3) + buf_(z,4) * ue_(z,4))
-                enddo	
-                  
-                rhs_(1) = rhs_(1) -
-     >                ty2*( ue_(1,3)-ue_(-1,3) )+
-     >                dy1ty1*(ue_(1,1)-2.0d0*ue_(0,1)+ue_(-1,1))
-
-                rhs_(2) = rhs_(2) - ty2*(
-     >                ue_(1,2)*buf_(1,3)-ue_(-1,2)*buf_(-1,3))+
-     >                yycon2*(buf_(1,2)-2.0d0*buf_(0,2)+buf_(-1,2))+
-     >                dy2ty1*( ue_(1,2)-2.0* ue_(0,2)+ ue_(-1,2))
-
-                rhs_(3) = rhs_(3) - ty2*(
-     >                (ue_(1,3)*buf_(1,3)+c2*(ue_(1,5)-q_(1)))-
-     >                (ue_(-1,3)*buf_(-1,3)+c2*(ue_(-1,5)-q_(-1))))+
-     >                yycon1*(buf_(1,3)-2.0d0*buf_(0,3)+buf_(-1,3))+
-     >                dy3ty1*( ue_(1,3)-2.0d0*ue_(0,3) +ue_(-1,3))
-
-                rhs_(4) = rhs_(4) - ty2*(
-     >                ue_(1,4)*buf_(1,3)-ue_(-1,4)*buf_(-1,3))+
-     >                yycon2*(buf_(1,4)-2.0d0*buf_(0,4)+buf_(-1,4))+
-     >                dy4ty1*( ue_(1,4)-2.0d0*ue_(0,4)+ ue_(-1,4))
-
-                rhs_(5) = rhs_(5) - ty2*(
-     >                buf_(1,3)*(c1*ue_(1,5)-c2*q_(1))-
-     >                buf_(-1,3)*(c1*ue_(-1,5)-c2*q_(-1)))+
-     >                0.5d0*yycon3*(buf_(1,1)-2.0d0*buf_(0,1)+
-     >                              buf_(-1,1))+
-     >                yycon4*(cuf_(1)-2.0d0*cuf_(0)+cuf_(-1))+
-     >                yycon5*(buf_(1,5)-2.0d0*buf_(0,5)+buf_(-1,5))+
-     >                dy5ty1*(ue_(1,5)-2.0d0*ue_(0,5)+ue_(-1,5))
-               do   m = 1, 5	 
-                 if(j .eq. 1) then	
-                   rhs_(m) = rhs_(m) - dssp *
-     >                    (5.0d0*ue_(0,m) - 4.0d0*ue_(1,m) +ue_(2,m))
-                 else if(j .eq. 2) then	
-                   rhs_(m) = rhs_(m) - dssp *
-     >                   (-4.0d0*ue_(-1,m) + 6.0d0*ue_(0,m) -
-     >                     4.0d0*ue_(1,m) +  ue_(2,m))	
-	             else if(j .eq. problem_size-3) then
-                   rhs_(m) = rhs_(m) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m))
-	 	         else if(j .eq. problem_size-2) then
-                   rhs_(m) = rhs_(m) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) + 5.0d0*ue_(0,m))	
-                 else
-                   rhs_(m) = rhs_(m) - dssp*
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m) + ue_(2,m))	
-                 endif	 
-	           end do
-                
-                xi = dble(i) * dnxm1                
-                eta = dble(j) * dnym1		  
-                do z = -2, 2 
-                  zeta = dble(k + z) * dnzm1
-       do  m = 1, 5
-          dtemp(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-       end do
-                  do  m = 1, 5
-                     ue_(z,m) = dtemp(m)
-                  end do
-                  dtpp = 1.0d0 / dtemp(1)
-                  do  m = 2, 5
-                     buf_(z, m) = dtpp * dtemp(m)
-                  end do
-
-                  cuf_(z)   = buf_(z,4) * buf_(z,4)
-                  buf_(z,1) = cuf_(z) + buf_(z,2) * buf_(z,2) +
-     >                     buf_(z,3) * buf_(z,3)
-                  q_(z) = 0.5d0*(buf_(z,2)*ue_(z,2) + buf_(z,3)*
-     >                        ue_(z,3) + buf_(z,4)*ue_(z,4))
-                enddo	
-
-                rhs_(1) = rhs_(1) -
-     >                 tz2*( ue_(1,4)-ue_(-1,4) )+
-     >                 dz1tz1*(ue_(1,1)-2.0d0*ue_(0,1)+ue_(-1,1))
-
-                rhs_(2) = rhs_(2) - tz2 * (
-     >                 ue_(1,2)*buf_(1,4)-ue_(-1,2)*buf_(-1,4))+
-     >                 zzcon2*(buf_(1,2)-2.0d0*buf_(0,2)+buf_(-1,2))+
-     >                 dz2tz1*( ue_(1,2)-2.0d0* ue_(0,2)+ ue_(-1,2))
-
-                rhs_(3) = rhs_(3) - tz2 * (
-     >                 ue_(1,3)*buf_(1,4)-ue_(-1,3)*buf_(-1,4))+
-     >                 zzcon2*(buf_(1,3)-2.0d0*buf_(0,3)+buf_(-1,3))+
-     >                 dz3tz1*(ue_(1,3)-2.0d0*ue_(0,3)+ue_(-1,3))
-
-                rhs_(4) = rhs_(4) - tz2 * (
-     >                (ue_(1,4)*buf_(1,4)+c2*(ue_(1,5)-q_(1)))-
-     >                (ue_(-1,4)*buf_(-1,4)+c2*(ue_(-1,5)-q_(-1))))+
-     >                zzcon1*(buf_(1,4)-2.0d0*buf_(0,4)+buf_(-1,4))+
-     >                dz4tz1*( ue_(1,4)-2.0d0*ue_(0,4) +ue_(-1,4))
-
-                rhs_(5) = rhs_(5) - tz2 * (
-     >                 buf_(1,4)*(c1*ue_(1,5)-c2*q_(1))-
-     >                 buf_(-1,4)*(c1*ue_(-1,5)-c2*q_(-1)))+
-     >                 0.5d0*zzcon3*(buf_(1,1)-2.0d0*buf_(0,1)
-     >                              +buf_(-1,1))+
-     >                 zzcon4*(cuf_(1)-2.0d0*cuf_(0)+cuf_(-1))+
-     >                 zzcon5*(buf_(1,5)-2.0d0*buf_(0,5)+buf_(-1,5))+
-     >                 dz5tz1*( ue_(1,5)-2.0d0*ue_(0,5)+ ue_(-1,5))
-               do   m = 1, 5
-                 if(k .eq. 1) then
-                   rhs_(m) = rhs_(m) - dssp *
-     >                    (5.0d0*ue_(0,m) - 4.0d0*ue_(1,m) +ue_(2,m))
-	             else if(k .eq. 2) then
-                   rhs_(m) = rhs_(m) - dssp *
-     >                   (-4.0d0*ue_(-1,m) + 6.0d0*ue_(0,m) -
-     >                     4.0d0*ue_(1,m) + ue_(2,m))
-                 else if(k .eq. problem_size-3) then
-                   rhs_(m) = rhs_(m) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m))
-	             else if(k .eq. problem_size-2) then	
-                   rhs_(m) = rhs_(m) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) + 5.0d0*ue_(0,m))		
-                 else
-                   rhs_(m) = rhs_(m) - dssp*
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m) + ue_(2,m))				 
-	             endif
-               end do   
-
-               do   m = 1, 5
-                  rhs_(m) = -1.d0 * rhs_(m)
-               end do	
-			   
-               uijk = u(2,i,j,k) / u(1,i,j,k)
-               up1 = u(2,i + 1,j,k) / u(1,i + 1,j,k)
-               um1 = u(2,i - 1,j,k) / u(1,i - 1,j,k)
-			   
-               vijk = u(3,i,j,k) / u(1,i,j,k)
-               vp1 = u(3,i,j + 1,k) / u(1,i,j + 1,k)
-               vm1 = u(3,i,j - 1,k) / u(1,i,j - 1,k)
-			   
-               wijk = u(4,i,j,k) / u(1,i,j,k)
-               wp1 = u(4,i,j,k + 1) / u(1,i,j,k + 1)
-               wm1 = u(4,i,j,k - 1) / u(1,i,j,k - 1)
-	
-	           s1 = 0.5d0 * (u(2,i,j,k) * u(2,i,j,k) + u(3,i,
-     &j,k) * u(3,i,j,k) + u(4,i,j,k) * u(4,i,j,k)) / u(1,i,j,k)
-	           s2 = 0.5d0 * (u(2,i+1,j,k) * u(2,i+1,j,k) + u(3,i
-     &+1,j,k) * u(3,i+1,j,k) + u(4,i+1,j,k) * u(4,i+1,j,k)) / 
-     &u(1,i+1,j,k)
-	           s3 = 0.5d0 * (u(2,i-1,j,k) * u(2,i-1,j,k) + u(3,i
-     &-1,j,k) * u(3,i-1,j,k) + u(4,i-1,j,k) * u(4,i-1,j,k)) / 
-     &u(1,i-1,j,k)
-	           s4 = 0.5d0 * (u(2,i,j+1,k) * u(2,i,j+1,k) + u(3,i,
-     &j+1,k) * u(3,i,j+1,k) + u(4,i,j+1,k) * u(4,i,j+1,k)) / 
-     &u(1,i,j+1,k)
-	           s5 = 0.5d0 * (u(2,i,j-1,k) * u(2,i,j-1,k) + u(3,i,
-     &j-1,k) * u(3,i,j-1,k) + u(4,i,j-1,k) * u(4,i,j-1,k)) / 
-     &u(1,i,j-1,k)
-	           s6 = 0.5d0 * (u(2,i,j,k+1) * u(2,i,j,k+1) + u(3,i,
-     &j,k+1) * u(3,i,j,k+1) + u(4,i,j,k+1) * u(4,i,j,k+1)) / 
-     &u(1,i,j,k+1)
-	           s7 = 0.5d0 * (u(2,i,j,k-1) * u(2,i,j,k-1) + u(3,i,
-     &j,k-1) * u(3,i,j,k-1) + u(4,i,j,k-1) * u(4,i,j,k-1)) / 
-     &u(1,i,j,k-1)
-	 
-               qs1 = s1 / u(1,i,j,k)	 
-               qs2 = s2 / u(1,i+1,j,k)
-               qs3 = s3 / u(1,i-1,j,k)
-               qs4 = s4 / u(1,i,j+1,k)
-               qs5 = s5 / u(1,i,j-1,k)
-               qs6 = s6 / u(1,i,j,k+1)
-               qs7 = s7 / u(1,i,j,k-1)
-			   
-!               rhs_(1) = forcing(1,i,j,k) 
-!               rhs_(2) = forcing(2,i,j,k) 
-!               rhs_(3) = forcing(3,i,j,k) 
-!               rhs_(4) = forcing(4,i,j,k) 
-!               rhs_(5) = forcing(5,i,j,k)
-			   
-               rhs_(1) = rhs_(1) + dx1tx1 * (u(1,i + 1,j,k) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i - 1,j,k)) - tx2 * (u(2,i + 1,j,k) - u(2,i - 1,j,k
-     &))
-               rhs_(2) = rhs_(2) + dx2tx1 * (u(2,i + 1,j,k) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i - 1,j,k)) + xxcon2 * con43 * (up1 - 2.0d0 * uijk 
-     &+ um1) - tx2 * (u(2,i + 1,j,k) * up1 - u(2,i - 1,j,k) * um1 + (u(5
-     &,i + 1,j,k) - s2 - u(5,i - 1,j,k) + s3) * c2)
-               rhs_(3) = rhs_(3) + dx3tx1 * (u(3,i + 1,j,k) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i - 1,j,k)) + xxcon2 * (u(3,i + 1,j,k) / 
-     &u(1,i + 1,j,k) - 2.0d0 * vijk + u(3,i - 1,j,k)/u(1,i - 1,j,k)) 
-     &- tx2 * (u(3,i + 1,j,k) * up1 - u(3,i - 1,j,k) * um1)
-               rhs_(4) = rhs_(4) + dx4tx1 * (u(4,i + 1,j,k) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i - 1,j,k)) + xxcon2 * (u(4,i + 1,j,k) /
-     &u(1,i + 1,j,k) - 2.0d0 * wijk + u(4,i - 1,j,k) / u(1,i - 1,j,k)) 
-     &- tx2 * (u(4,i + 1,j,k) * up1 - u(4,i - 1,j,k) * um1)
-               rhs_(5) = rhs_(5) + dx5tx1 * (u(5,i + 1,j,k) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i - 1,j,k)) + xxcon3 * (qs2 - 2.0d0 * qs1 + 
-     &qs3) + xxcon4 * (up1 * up1 - 2.0d0 * uijk * uij
-     &k + um1 * um1) + xxcon5 * (u(5,i + 1,j,k) * 1.0d0 / u(1,i + 1,j,k)
-     & - 2.0d0 * u(5,i,j,k) * 1.0d0 / u(1,i,j,k) + u(5,i - 1,j,k) * 
-     &1.0d0 / u(1,i - 1,j,k)) - tx2 * ((c1 * u(5,i + 1,j,k) -
-     &c2 * s2) * up1 - 
-     &(c1 * u(5,i - 1,j,k) - c2 * s3) * um1)
-               if (i .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i + 1,j,k) + u(m,i + 2,j,k))
-                  enddo  
-               else if (i .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i - 1,
-     &j,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k) + u(m,i + 2,j,k
-     &))
-                  enddo  
-               else if (i .ge. 3 .and. i .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.0d0 
-     &* u(m,i - 1,j,k) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k) + u(m
-     &,i + 2,j,k))
-                  enddo  
-               else if (i .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.0d0 
-     &* u(m,i - 1,j,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k))
-                  enddo  
-               else if (i .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.d0 *
-     & u(m,i - 1,j,k) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-
-               rhs_(1) = rhs_(1) + dy1ty1 * (u(1,i,j + 1,k) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i,j - 1,k)) - ty2 * (u(3,i,j + 1,k) - u(3,i,j - 1,k
-     &))
-               rhs_(2) = rhs_(2) + dy2ty1 * (u(2,i,j + 1,k) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i,j - 1,k)) + yycon2 * (u(2,i,j + 1,k) / 
-     &u(1,i,j + 1,k) - 2.0d0 * uijk + u(2,i,j - 1,k)/u(1,i,j - 1,k))
-     &- ty2 * (u(2,i,j + 1,k) * vp1 - u(2,i,j -1,k) * vm1)
-               rhs_(3) = rhs_(3) + dy3ty1 * (u(3,i,j + 1,k) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i,j - 1,k)) + yycon2 * con43 * (vp1 - 2.0d0 * vijk 
-     &+ vm1) - ty2 * (u(3,i,j + 1,k) * vp1 - u(3,i,j - 1,k) * vm1 + (u(5
-     &,i,j + 1,k) - s4 - u(5,i,j - 1,k) + s5) * c2)
-               rhs_(4) = rhs_(4) + dy4ty1 * (u(4,i,j + 1,k) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i,j - 1,k)) + yycon2 * (u(4,i,j + 1,k) / 
-     &u(1,i,j + 1,k) - 2.0d0 * wijk + u(4,i,j - 1,k) / u(1,i,j - 1,k)) 
-     &- ty2 * (u(4,i,j + 1,k) * vp1 - u(4,i,j - 1,k) * vm1)
-               rhs_(5) = rhs_(5) + dy5ty1 * (u(5,i,j + 1,k) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i,j - 1,k)) + yycon3 * (qs4 - 2.0d0 * qs1
-     & + qs5) + yycon4 * (vp1 * vp1 - 2.0d0 * vijk * vij
-     &k + vm1 * vm1) + yycon5 * (u(5,i,j + 1,k) * 1.0d0 / u(1,i,j + 1,k)
-     &- 2.0d0 * u(5,i,j,k) * 1.0d0 / u(1,i,j,k) + u(5,i,j - 1,k) * 
-     &1.0d0 / u(1,i,j - 1,k)
-     &) - ty2 * ((c1 * u(5,i,j + 1,k) - c2 * s4) * vp1 - 
-     &(c1 * u(5,i,j - 1,k) - c2 * s5) * vm1)
-               if (j .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i,j + 1,k) + u(m,i,j + 2,k))
-                  enddo  
-               else if (j .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i,j - 
-     &1,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k) + u(m,i,j + 2,k
-     &))
-                  enddo  
-               else if (j .ge. 3 .and. j .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.0d0 
-     &* u(m,i,j - 1,k) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k) + u(m
-     &,i,j + 2,k))
-                  enddo  
-               else if (j .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.0d0 
-     &* u(m,i,j - 1,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k))
-                  enddo  
-               else if (j .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.d0 *
-     & u(m,i,j - 1,k) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-
-               rhs_(1) = rhs_(1) + dz1tz1 * (u(1,i,j,k + 1) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i,j,k - 1)) - tz2 * (u(4,i,j,k + 1) - u(4,i,j,k - 1
-     &))
-               rhs_(2) = rhs_(2) + dz2tz1 * (u(2,i,j,k + 1) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i,j,k - 1)) + zzcon2 * (u(2,i,j,k + 1) /  
-     &u(1,i,j,k + 1) - 2.0d0 * uijk + u(2,i,j,k - 1) / u(1,i,j,k - 1)) 
-     &- tz2 * (u(2,i,j,k + 1) * wp1 - u(2,i,j,k - 1) * wm1)
-               rhs_(3) = rhs_(3) + dz3tz1 * (u(3,i,j,k + 1) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i,j,k - 1)) + zzcon2 * (u(3,i,j,k + 1) / 
-     &u(1,i,j,k + 1) - 2.0d0 * vijk + u(3,i,j,k - 1) / u(1,i,j,k - 1)) 
-     &- tz2 * (u(3,i,j,k + 1) * wp1 - u(3,i,j,k - 1) * wm1)
-               rhs_(4) = rhs_(4) + dz4tz1 * (u(4,i,j,k + 1) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i,j,k - 1)) + zzcon2 * con43 * (wp1 - 2.0d0 * wijk 
-     &+ wm1) - tz2 * (u(4,i,j,k + 1) * wp1 - u(4,i,j,k - 1) * wm1 + (u(5
-     &,i,j,k + 1) - s6 - u(5,i,j,k - 1) + s7) * c2)
-               rhs_(5) = rhs_(5) + dz5tz1 * (u(5,i,j,k + 1) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i,j,k - 1)) + zzcon3 * (qs6 - 2.0d0 * qs1 + 
-     &qs7) + zzcon4 * (wp1 * wp1 - 2.0d0 * wijk * wij
-     &k + wm1 * wm1) + zzcon5 * (u(5,i,j,k + 1) * 1.0d0 / u(1,i,j,k+1)
-     &- 2.0d0 * u(5,i,j,k) * 1.0d0 / u(1,i,j,k) + u(5,i,j,k - 1) * 
-     &1.0d0 / u(1,i,j,k-1)
-     &) - tz2 * ((c1 * u(5,i,j,k + 1) - c2 * s6) * wp1 - 
-     &(c1 * u(5,i,j,k - 1) - c2 * s7) * wm1)
-               if (k .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i,j,k + 1) + u(m,i,j,k + 2))
-                  enddo  
-               else if (k .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i,j,k 
-     &- 1) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1) + u(m,i,j,k + 2
-     &))
-                  enddo  
-               else if (k .ge. 3 .and. k .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.0d0 
-     &* u(m,i,j,k - 1) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1) + u(m
-     &,i,j,k + 2))
-                  enddo  
-               else if (k .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.0d0 
-     &* u(m,i,j,k - 1) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1))
-                  enddo  
-               else if (k .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.d0 *
-     & u(m,i,j,k - 1) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-               rhs(1,i,j,k) = rhs_(1) * dt
-               rhs(2,i,j,k) = rhs_(2) * dt
-               rhs(3,i,j,k) = rhs_(3) * dt
-               rhs(4,i,j,k) = rhs_(4) * dt
-               rhs(5,i,j,k) = rhs_(5) * dt
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv
deleted file mode 100644
index 4a8a164..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_block2.fdv
+++ /dev/null
@@ -1,247 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine compute_rhs ()
-
-      include 'header3d.h'
-      integer  i,j,k,m,z
-      double precision  rho_inv,uijk,up1,um1,vijk,vp1,vm1,wijk,wp1,wm1,r
-     &hs_(5),s1,s2,s3,s4,s5,s6,s7,qs1,qs2,qs3,qs4,qs5,qs6,qs7
-!DVM$ region 
-!DVM$ PARALLEL (k,j,i) ON us(i,j,k),PRIVATE(m),cuda_block(128)
-      do  k = 0,problem_size - 1
-         do  j = 0,problem_size - 1
-            do  i = 0,problem_size - 1
-               do  m = 1,5
-                  rhs(m,i,j,k) = 0
-               enddo  
-            enddo
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!     compute xi-direction fluxes 
-!---------------------------------------------------------------------
-!DVM$ PARALLEL (k,j,i)  ON  rhs(*,i,j,k), PRIVATE(uijk,up1,um1,m,
-!DVM$&vijk,vp1,vm1,wijk,wp1,wm1,rhs_,s1,s2,s3,s4,s5,s6,s7,
-!DVM$&qs1,qs2,qs3,qs4,qs5,qs6,qs7),cuda_block(32)
-      do  k = 1,problem_size - 2
-         do  j = 1,problem_size - 2
-            do  i = 1,problem_size - 2
-               do   m = 1, 5
-                  rhs_(m) = forcing(m,i,j,k)
-               end do	
-			   
-               uijk = u(2,i,j,k) / u(1,i,j,k)
-               up1 = u(2,i + 1,j,k) / u(1,i + 1,j,k)
-               um1 = u(2,i - 1,j,k) / u(1,i - 1,j,k)
-			   
-               vijk = u(3,i,j,k) / u(1,i,j,k)
-               vp1 = u(3,i,j + 1,k) / u(1,i,j + 1,k)
-               vm1 = u(3,i,j - 1,k) / u(1,i,j - 1,k)
-			   
-               wijk = u(4,i,j,k) / u(1,i,j,k)
-               wp1 = u(4,i,j,k + 1) / u(1,i,j,k + 1)
-               wm1 = u(4,i,j,k - 1) / u(1,i,j,k - 1)
-	
-	           s1 = 0.5d0 * (u(2,i,j,k) * u(2,i,j,k) + u(3,i,
-     &j,k) * u(3,i,j,k) + u(4,i,j,k) * u(4,i,j,k)) / u(1,i,j,k)
-	           s2 = 0.5d0 * (u(2,i+1,j,k) * u(2,i+1,j,k) + u(3,i
-     &+1,j,k) * u(3,i+1,j,k) + u(4,i+1,j,k) * u(4,i+1,j,k)) / 
-     &u(1,i+1,j,k)
-	           s3 = 0.5d0 * (u(2,i-1,j,k) * u(2,i-1,j,k) + u(3,i
-     &-1,j,k) * u(3,i-1,j,k) + u(4,i-1,j,k) * u(4,i-1,j,k)) / 
-     &u(1,i-1,j,k)
-	           s4 = 0.5d0 * (u(2,i,j+1,k) * u(2,i,j+1,k) + u(3,i,
-     &j+1,k) * u(3,i,j+1,k) + u(4,i,j+1,k) * u(4,i,j+1,k)) / 
-     &u(1,i,j+1,k)
-	           s5 = 0.5d0 * (u(2,i,j-1,k) * u(2,i,j-1,k) + u(3,i,
-     &j-1,k) * u(3,i,j-1,k) + u(4,i,j-1,k) * u(4,i,j-1,k)) / 
-     &u(1,i,j-1,k)
-	           s6 = 0.5d0 * (u(2,i,j,k+1) * u(2,i,j,k+1) + u(3,i,
-     &j,k+1) * u(3,i,j,k+1) + u(4,i,j,k+1) * u(4,i,j,k+1)) / 
-     &u(1,i,j,k+1)
-	           s7 = 0.5d0 * (u(2,i,j,k-1) * u(2,i,j,k-1) + u(3,i,
-     &j,k-1) * u(3,i,j,k-1) + u(4,i,j,k-1) * u(4,i,j,k-1)) / 
-     &u(1,i,j,k-1)
-	 
-               qs1 = s1 / u(1,i,j,k)	 
-               qs2 = s2 / u(1,i+1,j,k)
-               qs3 = s3 / u(1,i-1,j,k)
-               qs4 = s4 / u(1,i,j+1,k)
-               qs5 = s5 / u(1,i,j-1,k)
-               qs6 = s6 / u(1,i,j,k+1)
-               qs7 = s7 / u(1,i,j,k-1)
-			   
-!               rhs_(1) = forcing(1,i,j,k) 
-!               rhs_(2) = forcing(2,i,j,k) 
-!               rhs_(3) = forcing(3,i,j,k) 
-!               rhs_(4) = forcing(4,i,j,k) 
-!               rhs_(5) = forcing(5,i,j,k)
-			   
-               rhs_(1) = rhs_(1) + dx1tx1 * (u(1,i + 1,j,k) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i - 1,j,k)) - tx2 * (u(2,i + 1,j,k) - u(2,i - 1,j,k
-     &))
-               rhs_(2) = rhs_(2) + dx2tx1 * (u(2,i + 1,j,k) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i - 1,j,k)) + xxcon2 * con43 * (up1 - 2.0d0 * uijk 
-     &+ um1) - tx2 * (u(2,i + 1,j,k) * up1 - u(2,i - 1,j,k) * um1 + (u(5
-     &,i + 1,j,k) - s2 - u(5,i - 1,j,k) + s3) * c2)
-               rhs_(3) = rhs_(3) + dx3tx1 * (u(3,i + 1,j,k) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i - 1,j,k)) + xxcon2 * (u(3,i + 1,j,k) / 
-     &u(1,i + 1,j,k) - 2.0d0 * vijk + u(3,i - 1,j,k)/u(1,i - 1,j,k)) 
-     &- tx2 * (u(3,i + 1,j,k) * up1 - u(3,i - 1,j,k) * um1)
-               rhs_(4) = rhs_(4) + dx4tx1 * (u(4,i + 1,j,k) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i - 1,j,k)) + xxcon2 * (u(4,i + 1,j,k) /
-     &u(1,i + 1,j,k) - 2.0d0 * wijk + u(4,i - 1,j,k) / u(1,i - 1,j,k)) 
-     &- tx2 * (u(4,i + 1,j,k) * up1 - u(4,i - 1,j,k) * um1)
-               rhs_(5) = rhs_(5) + dx5tx1 * (u(5,i + 1,j,k) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i - 1,j,k)) + xxcon3 * (qs2 - 2.0d0 * qs1 + 
-     &qs3) + xxcon4 * (up1 * up1 - 2.0d0 * uijk * uij
-     &k + um1 * um1) + xxcon5 * (u(5,i + 1,j,k) * 1.0d0 / u(1,i + 1,j,k)
-     & - 2.0d0 * u(5,i,j,k) * 1.0d0 / u(1,i,j,k) + u(5,i - 1,j,k) * 
-     &1.0d0 / u(1,i - 1,j,k)) - tx2 * ((c1 * u(5,i + 1,j,k) -
-     &c2 * s2) * up1 - 
-     &(c1 * u(5,i - 1,j,k) - c2 * s3) * um1)
-               if (i .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i + 1,j,k) + u(m,i + 2,j,k))
-                  enddo  
-               else if (i .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i - 1,
-     &j,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k) + u(m,i + 2,j,k
-     &))
-                  enddo  
-               else if (i .ge. 3 .and. i .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.0d0 
-     &* u(m,i - 1,j,k) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k) + u(m
-     &,i + 2,j,k))
-                  enddo  
-               else if (i .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.0d0 
-     &* u(m,i - 1,j,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k))
-                  enddo  
-               else if (i .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.d0 *
-     & u(m,i - 1,j,k) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-
-               rhs_(1) = rhs_(1) + dy1ty1 * (u(1,i,j + 1,k) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i,j - 1,k)) - ty2 * (u(3,i,j + 1,k) - u(3,i,j - 1,k
-     &))
-               rhs_(2) = rhs_(2) + dy2ty1 * (u(2,i,j + 1,k) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i,j - 1,k)) + yycon2 * (u(2,i,j + 1,k) / 
-     &u(1,i,j + 1,k) - 2.0d0 * uijk + u(2,i,j - 1,k)/u(1,i,j - 1,k))
-     &- ty2 * (u(2,i,j + 1,k) * vp1 - u(2,i,j -1,k) * vm1)
-               rhs_(3) = rhs_(3) + dy3ty1 * (u(3,i,j + 1,k) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i,j - 1,k)) + yycon2 * con43 * (vp1 - 2.0d0 * vijk 
-     &+ vm1) - ty2 * (u(3,i,j + 1,k) * vp1 - u(3,i,j - 1,k) * vm1 + (u(5
-     &,i,j + 1,k) - s4 - u(5,i,j - 1,k) + s5) * c2)
-               rhs_(4) = rhs_(4) + dy4ty1 * (u(4,i,j + 1,k) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i,j - 1,k)) + yycon2 * (u(4,i,j + 1,k) / 
-     &u(1,i,j + 1,k) - 2.0d0 * wijk + u(4,i,j - 1,k) / u(1,i,j - 1,k)) 
-     &- ty2 * (u(4,i,j + 1,k) * vp1 - u(4,i,j - 1,k) * vm1)
-               rhs_(5) = rhs_(5) + dy5ty1 * (u(5,i,j + 1,k) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i,j - 1,k)) + yycon3 * (qs4 - 2.0d0 * qs1
-     & + qs5) + yycon4 * (vp1 * vp1 - 2.0d0 * vijk * vij
-     &k + vm1 * vm1) + yycon5 * (u(5,i,j + 1,k) * 1.0d0 / u(1,i,j + 1,k)
-     &- 2.0d0 * u(5,i,j,k) * 1.0d0 / u(1,i,j,k) + u(5,i,j - 1,k) * 
-     &1.0d0 / u(1,i,j - 1,k)
-     &) - ty2 * ((c1 * u(5,i,j + 1,k) - c2 * s4) * vp1 - 
-     &(c1 * u(5,i,j - 1,k) - c2 * s5) * vm1)
-               if (j .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i,j + 1,k) + u(m,i,j + 2,k))
-                  enddo  
-               else if (j .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i,j - 
-     &1,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k) + u(m,i,j + 2,k
-     &))
-                  enddo  
-               else if (j .ge. 3 .and. j .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.0d0 
-     &* u(m,i,j - 1,k) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k) + u(m
-     &,i,j + 2,k))
-                  enddo  
-               else if (j .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.0d0 
-     &* u(m,i,j - 1,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k))
-                  enddo  
-               else if (j .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.d0 *
-     & u(m,i,j - 1,k) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-
-               rhs_(1) = rhs_(1) + dz1tz1 * (u(1,i,j,k + 1) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i,j,k - 1)) - tz2 * (u(4,i,j,k + 1) - u(4,i,j,k - 1
-     &))
-               rhs_(2) = rhs_(2) + dz2tz1 * (u(2,i,j,k + 1) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i,j,k - 1)) + zzcon2 * (u(2,i,j,k + 1) /  
-     &u(1,i,j,k + 1) - 2.0d0 * uijk + u(2,i,j,k - 1) / u(1,i,j,k - 1)) 
-     &- tz2 * (u(2,i,j,k + 1) * wp1 - u(2,i,j,k - 1) * wm1)
-               rhs_(3) = rhs_(3) + dz3tz1 * (u(3,i,j,k + 1) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i,j,k - 1)) + zzcon2 * (u(3,i,j,k + 1) / 
-     &u(1,i,j,k + 1) - 2.0d0 * vijk + u(3,i,j,k - 1) / u(1,i,j,k - 1)) 
-     &- tz2 * (u(3,i,j,k + 1) * wp1 - u(3,i,j,k - 1) * wm1)
-               rhs_(4) = rhs_(4) + dz4tz1 * (u(4,i,j,k + 1) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i,j,k - 1)) + zzcon2 * con43 * (wp1 - 2.0d0 * wijk 
-     &+ wm1) - tz2 * (u(4,i,j,k + 1) * wp1 - u(4,i,j,k - 1) * wm1 + (u(5
-     &,i,j,k + 1) - s6 - u(5,i,j,k - 1) + s7) * c2)
-               rhs_(5) = rhs_(5) + dz5tz1 * (u(5,i,j,k + 1) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i,j,k - 1)) + zzcon3 * (qs6 - 2.0d0 * qs1 + 
-     &qs7) + zzcon4 * (wp1 * wp1 - 2.0d0 * wijk * wij
-     &k + wm1 * wm1) + zzcon5 * (u(5,i,j,k + 1) * 1.0d0 / u(1,i,j,k+1)
-     &- 2.0d0 * u(5,i,j,k) * 1.0d0 / u(1,i,j,k) + u(5,i,j,k - 1) * 
-     &1.0d0 / u(1,i,j,k-1)
-     &) - tz2 * ((c1 * u(5,i,j,k + 1) - c2 * s6) * wp1 - 
-     &(c1 * u(5,i,j,k - 1) - c2 * s7) * wm1)
-               if (k .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i,j,k + 1) + u(m,i,j,k + 2))
-                  enddo  
-               else if (k .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i,j,k 
-     &- 1) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1) + u(m,i,j,k + 2
-     &))
-                  enddo  
-               else if (k .ge. 3 .and. k .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.0d0 
-     &* u(m,i,j,k - 1) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1) + u(m
-     &,i,j,k + 2))
-                  enddo  
-               else if (k .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.0d0 
-     &* u(m,i,j,k - 1) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1))
-                  enddo  
-               else if (k .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.d0 *
-     & u(m,i,j,k - 1) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-               rhs(1,i,j,k) = rhs_(1) * dt
-               rhs(2,i,j,k) = rhs_(2) * dt
-               rhs(3,i,j,k) = rhs_(3) * dt
-               rhs(4,i,j,k) = rhs_(4) * dt
-               rhs(5,i,j,k) = rhs_(5) * dt
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv
deleted file mode 100644
index 549948e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/compute_rhs_mpi.fdv
+++ /dev/null
@@ -1,219 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine compute_rhs ()
-
-      include 'header3d.h'
-      integer  i,j,k,m
-      double precision  rho_inv,uijk,up1,um1,vijk,vp1,vm1,wijk,wp1,wm1,r
-     &hs_(5)
-
-!DVM$ region out(rho_i, us, vs, ws, qs, square)
-!DVM$ PARALLEL (k,j,i)  ON  us(i,j,k), SHADOW_COMPUTE,
-!DVM$& PRIVATE(rho_inv,m),cuda_block(128)
-!DVM$& ,SHADOW_RENEW(u(0:0,2:2,2:2,2:2))
-      do  k = 0,problem_size - 1
-         do  j = 0,problem_size - 1
-            do  i = 0,problem_size - 1
-               rho_inv = 1.0d0 / u(1,i,j,k)
-               rho_i(i,j,k) = rho_inv
-               us(i,j,k) = u(2,i,j,k) * rho_inv
-               vs(i,j,k) = u(3,i,j,k) * rho_inv
-               ws(i,j,k) = u(4,i,j,k) * rho_inv
-               square(i,j,k) = 0.5d0 * (u(2,i,j,k) * u(2,i,j,k) + u(3,i,
-     &j,k) * u(3,i,j,k) + u(4,i,j,k) * u(4,i,j,k)) * rho_inv
-               qs(i,j,k) = square(i,j,k) * rho_inv
-               do  m = 1,5
-                  rhs(m,i,j,k) = forcing(m,i,j,k)
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!     compute xi-direction fluxes 
-!---------------------------------------------------------------------
-!DVM$ PARALLEL (k,j,i)  ON  rhs(*,i,j,k), PRIVATE(uijk,up1,um1,m,
-!DVM$&vijk,vp1,vm1,wijk,wp1,wm1,rhs_),cuda_block(32)
-      do  k = 1,problem_size - 2
-         do  j = 1,problem_size - 2
-            do  i = 1,problem_size - 2
-               uijk = us(i,j,k)
-               up1 = us(i + 1,j,k)
-               um1 = us(i - 1,j,k)
-               rhs_(1) = forcing(1,i,j,k) 
-               rhs_(2) = forcing(2,i,j,k) 
-               rhs_(3) = forcing(3,i,j,k) 
-               rhs_(4) = forcing(4,i,j,k) 
-               rhs_(5) = forcing(5,i,j,k)
-			   
-               rhs_(1) = rhs_(1) + dx1tx1 * (u(1,i + 1,j,k) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i - 1,j,k)) - tx2 * (u(2,i + 1,j,k) - u(2,i - 1,j,k
-     &))
-               rhs_(2) = rhs_(2) + dx2tx1 * (u(2,i + 1,j,k) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i - 1,j,k)) + xxcon2 * con43 * (up1 - 2.0d0 * uijk 
-     &+ um1) - tx2 * (u(2,i + 1,j,k) * up1 - u(2,i - 1,j,k) * um1 + (u(5
-     &,i + 1,j,k) - square(i + 1,j,k) - u(5,i - 1,j,k) + square(i - 1,j,
-     &k)) * c2)
-               rhs_(3) = rhs_(3) + dx3tx1 * (u(3,i + 1,j,k) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i - 1,j,k)) + xxcon2 * (vs(i + 1,j,k) - 2.0d0 * vs(
-     &i,j,k) + vs(i - 1,j,k)) - tx2 * (u(3,i + 1,j,k) * up1 - u(3,i - 1,
-     &j,k) * um1)
-               rhs_(4) = rhs_(4) + dx4tx1 * (u(4,i + 1,j,k) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i - 1,j,k)) + xxcon2 * (ws(i + 1,j,k) - 2.0d0 * ws(
-     &i,j,k) + ws(i - 1,j,k)) - tx2 * (u(4,i + 1,j,k) * up1 - u(4,i - 1,
-     &j,k) * um1)
-               rhs_(5) = rhs_(5) + dx5tx1 * (u(5,i + 1,j,k) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i - 1,j,k)) + xxcon3 * (qs(i + 1,j,k) - 2.0d0 * qs(
-     &i,j,k) + qs(i - 1,j,k)) + xxcon4 * (up1 * up1 - 2.0d0 * uijk * uij
-     &k + um1 * um1) + xxcon5 * (u(5,i + 1,j,k) * rho_i(i + 1,j,k) - 2.0
-     &d0 * u(5,i,j,k) * rho_i(i,j,k) + u(5,i - 1,j,k) * rho_i(i - 1,j,k)
-     &) - tx2 * ((c1 * u(5,i + 1,j,k) - c2 * square(i + 1,j,k)) * up1 - 
-     &(c1 * u(5,i - 1,j,k) - c2 * square(i - 1,j,k)) * um1)
-               if (i .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i + 1,j,k) + u(m,i + 2,j,k))
-                  enddo  
-               else if (i .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i - 1,
-     &j,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k) + u(m,i + 2,j,k
-     &))
-                  enddo  
-               else if (i .ge. 3 .and. i .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.0d0 
-     &* u(m,i - 1,j,k) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k) + u(m
-     &,i + 2,j,k))
-                  enddo  
-               else if (i .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.0d0 
-     &* u(m,i - 1,j,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i + 1,j,k))
-                  enddo  
-               else if (i .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i - 2,j,k) - 4.d0 *
-     & u(m,i - 1,j,k) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-               vijk = vs(i,j,k)
-               vp1 = vs(i,j + 1,k)
-               vm1 = vs(i,j - 1,k)
-               rhs_(1) = rhs_(1) + dy1ty1 * (u(1,i,j + 1,k) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i,j - 1,k)) - ty2 * (u(3,i,j + 1,k) - u(3,i,j - 1,k
-     &))
-               rhs_(2) = rhs_(2) + dy2ty1 * (u(2,i,j + 1,k) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i,j - 1,k)) + yycon2 * (us(i,j + 1,k) - 2.0d0 * us(
-     &i,j,k) + us(i,j - 1,k)) - ty2 * (u(2,i,j + 1,k) * vp1 - u(2,i,j - 
-     &1,k) * vm1)
-               rhs_(3) = rhs_(3) + dy3ty1 * (u(3,i,j + 1,k) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i,j - 1,k)) + yycon2 * con43 * (vp1 - 2.0d0 * vijk 
-     &+ vm1) - ty2 * (u(3,i,j + 1,k) * vp1 - u(3,i,j - 1,k) * vm1 + (u(5
-     &,i,j + 1,k) - square(i,j + 1,k) - u(5,i,j - 1,k) + square(i,j - 1,
-     &k)) * c2)
-               rhs_(4) = rhs_(4) + dy4ty1 * (u(4,i,j + 1,k) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i,j - 1,k)) + yycon2 * (ws(i,j + 1,k) - 2.0d0 * ws(
-     &i,j,k) + ws(i,j - 1,k)) - ty2 * (u(4,i,j + 1,k) * vp1 - u(4,i,j - 
-     &1,k) * vm1)
-               rhs_(5) = rhs_(5) + dy5ty1 * (u(5,i,j + 1,k) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i,j - 1,k)) + yycon3 * (qs(i,j + 1,k) - 2.0d0 * qs(
-     &i,j,k) + qs(i,j - 1,k)) + yycon4 * (vp1 * vp1 - 2.0d0 * vijk * vij
-     &k + vm1 * vm1) + yycon5 * (u(5,i,j + 1,k) * rho_i(i,j + 1,k) - 2.0
-     &d0 * u(5,i,j,k) * rho_i(i,j,k) + u(5,i,j - 1,k) * rho_i(i,j - 1,k)
-     &) - ty2 * ((c1 * u(5,i,j + 1,k) - c2 * square(i,j + 1,k)) * vp1 - 
-     &(c1 * u(5,i,j - 1,k) - c2 * square(i,j - 1,k)) * vm1)
-               if (j .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i,j + 1,k) + u(m,i,j + 2,k))
-                  enddo  
-               else if (j .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i,j - 
-     &1,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k) + u(m,i,j + 2,k
-     &))
-                  enddo  
-               else if (j .ge. 3 .and. j .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.0d0 
-     &* u(m,i,j - 1,k) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k) + u(m
-     &,i,j + 2,k))
-                  enddo  
-               else if (j .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.0d0 
-     &* u(m,i,j - 1,k) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j + 1,k))
-                  enddo  
-               else if (j .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j - 2,k) - 4.d0 *
-     & u(m,i,j - 1,k) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-               wijk = ws(i,j,k)
-               wp1 = ws(i,j,k + 1)
-               wm1 = ws(i,j,k - 1)
-               rhs_(1) = rhs_(1) + dz1tz1 * (u(1,i,j,k + 1) - 2.0d0 * u(
-     &1,i,j,k) + u(1,i,j,k - 1)) - tz2 * (u(4,i,j,k + 1) - u(4,i,j,k - 1
-     &))
-               rhs_(2) = rhs_(2) + dz2tz1 * (u(2,i,j,k + 1) - 2.0d0 * u(
-     &2,i,j,k) + u(2,i,j,k - 1)) + zzcon2 * (us(i,j,k + 1) - 2.0d0 * us(
-     &i,j,k) + us(i,j,k - 1)) - tz2 * (u(2,i,j,k + 1) * wp1 - u(2,i,j,k 
-     &- 1) * wm1)
-               rhs_(3) = rhs_(3) + dz3tz1 * (u(3,i,j,k + 1) - 2.0d0 * u(
-     &3,i,j,k) + u(3,i,j,k - 1)) + zzcon2 * (vs(i,j,k + 1) - 2.0d0 * vs(
-     &i,j,k) + vs(i,j,k - 1)) - tz2 * (u(3,i,j,k + 1) * wp1 - u(3,i,j,k 
-     &- 1) * wm1)
-               rhs_(4) = rhs_(4) + dz4tz1 * (u(4,i,j,k + 1) - 2.0d0 * u(
-     &4,i,j,k) + u(4,i,j,k - 1)) + zzcon2 * con43 * (wp1 - 2.0d0 * wijk 
-     &+ wm1) - tz2 * (u(4,i,j,k + 1) * wp1 - u(4,i,j,k - 1) * wm1 + (u(5
-     &,i,j,k + 1) - square(i,j,k + 1) - u(5,i,j,k - 1) + square(i,j,k - 
-     &1)) * c2)
-               rhs_(5) = rhs_(5) + dz5tz1 * (u(5,i,j,k + 1) - 2.0d0 * u(
-     &5,i,j,k) + u(5,i,j,k - 1)) + zzcon3 * (qs(i,j,k + 1) - 2.0d0 * qs(
-     &i,j,k) + qs(i,j,k - 1)) + zzcon4 * (wp1 * wp1 - 2.0d0 * wijk * wij
-     &k + wm1 * wm1) + zzcon5 * (u(5,i,j,k + 1) * rho_i(i,j,k + 1) - 2.0
-     &d0 * u(5,i,j,k) * rho_i(i,j,k) + u(5,i,j,k - 1) * rho_i(i,j,k - 1)
-     &) - tz2 * ((c1 * u(5,i,j,k + 1) - c2 * square(i,j,k + 1)) * wp1 - 
-     &(c1 * u(5,i,j,k - 1) - c2 * square(i,j,k - 1)) * wm1)
-               if (k .eq. 1) then
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (5.0d0 * u(m,i,j,k) - 4.
-     &0d0 * u(m,i,j,k + 1) + u(m,i,j,k + 2))
-                  enddo  
-               else if (k .eq. 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * ((-(4.0d0)) * u(m,i,j,k 
-     &- 1) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1) + u(m,i,j,k + 2
-     &))
-                  enddo  
-               else if (k .ge. 3 .and. k .le. problem_size - 4) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.0d0 
-     &* u(m,i,j,k - 1) + 6.0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1) + u(m
-     &,i,j,k + 2))
-                  enddo  
-               else if (k .eq. problem_size - 3) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.0d0 
-     &* u(m,i,j,k - 1) + 6.0d0 * u(m,i,j,k) - 4.0d0 * u(m,i,j,k + 1))
-                  enddo  
-               else if (k .eq. problem_size - 2) then  
-                  do  m = 1,5
-                     rhs_(m) = rhs_(m) - dssp * (u(m,i,j,k - 2) - 4.d0 *
-     & u(m,i,j,k - 1) + 5.d0 * u(m,i,j,k))
-                  enddo  
-               endif  
-               rhs(1,i,j,k) = rhs_(1) * dt
-               rhs(2,i,j,k) = rhs_(2) * dt
-               rhs(3,i,j,k) = rhs_(3) * dt
-               rhs(4,i,j,k) = rhs_(4) * dt
-               rhs(5,i,j,k) = rhs_(5) * dt
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs.fdv
deleted file mode 100644
index 01c5640..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs.fdv
+++ /dev/null
@@ -1,307 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine exact_rhs
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-
-       include 'header3d.h'
-
-       double precision dtemp(5), xi, eta, zeta, dtpp
-       integer          m, i, j, k, ip1, im1, jp1, p, p1,
-     >                  jm1, km1, kp1,z
-       double precision ue_(-2:2, 5), buf_(-2:2, 5),cuf_(-2:2),q_(-2:2)   
-
-
-!DVM$ region
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(m)
-       do   k= 0, problem_size-1
-          do   j = 0, problem_size-1
-             do   i = 0, problem_size-1
-                do   m = 1, 5
-                   forcing(m,i,j,k) = 0.0d0
-                end do
-             end do
-          end do
-       end do
-
-c---------------------------------------------------------------------
-c      xi-direction flux differences                      
-c---------------------------------------------------------------------
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(zeta,eta,xi,m,dtemp
-!DVM$& ,buf_,cuf_,q_,dtpp,z,ue_)
-       do k = 1, problem_size-2
-          do j = 1, problem_size-2
-             do  i = 1, problem_size-2
-                zeta = dble(k) * dnzm1
-                eta = dble(j) * dnym1			 
-			    do z = -2, 2 
-                  xi = dble(i + z) * dnxm1
-       do  m = 1, 5
-          dtemp(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-       end do
-                  do  m = 1, 5
-                     ue_(z,m) = dtemp(m)
-                  end do
-                  dtpp = 1.0d0 / dtemp(1)
-                  do  m = 2, 5
-                     buf_(z, m) = dtpp * dtemp(m)
-                  end do
-
-                  cuf_(z) = buf_(z,2) * buf_(z,2)
-                  buf_(z,1) = cuf_(z) + buf_(z,3) * buf_(z,3) + 
-     >                     buf_(z,4) * buf_(z,4) 
-                  q_(z) = 0.5d0*(buf_(z,2)*ue_(z,2) + buf_(z,3)*
-     >                       ue_(z,3) + buf_(z,4)*ue_(z,4))
-                enddo	 
-
-                forcing(1,i,j,k) = forcing(1,i,j,k) -
-     >                 tx2*( ue_(1,2)-ue_(-1,2) )+
-     >                 dx1tx1*(ue_(1,1)-2.0d0*ue_(0,1)+ue_(-1,1))
-
-                forcing(2,i,j,k) = forcing(2,i,j,k) - tx2 * (
-     >                (ue_(1,2)*buf_(1,2)+c2*(ue_(1,5)-q_(1)))-
-     >                (ue_(-1,2)*buf_(-1,2)+c2*(ue_(-1,5)-q_(-1))))+
-     >                 xxcon1*(buf_(1,2)-2.0d0*buf_(0,2)+buf_(-1,2))+
-     >                 dx2tx1*( ue_(1,2)-2.0d0* ue_(0,2)+ue_(-1,2))
-
-                forcing(3,i,j,k) = forcing(3,i,j,k) - tx2 * (
-     >                 ue_(1,3)*buf_(1,2)-ue_(-1,3)*buf_(-1,2))+
-     >                 xxcon2*(buf_(1,3)-2.0d0*buf_(0,3)+buf_(-1,3))+
-     >                 dx3tx1*( ue_(1,3)-2.0d0*ue_(0,3) +ue_(-1,3))
-                  
-                forcing(4,i,j,k) = forcing(4,i,j,k) - tx2*(
-     >                 ue_(1,4)*buf_(1,2)-ue_(-1,4)*buf_(-1,2))+
-     >                 xxcon2*(buf_(1,4)-2.0d0*buf_(0,4)+buf_(-1,4))+
-     >                 dx4tx1*( ue_(1,4)-2.0d0* ue_(0,4)+ ue_(-1,4))
-
-                forcing(5,i,j,k) = forcing(5,i,j,k) - tx2*(
-     >                 buf_(1,2)*(c1*ue_(1,5)-c2*q_(1))-
-     >                 buf_(-1,2)*(c1*ue_(-1,5)-c2*q_(-1)))+
-     >                 0.5d0*xxcon3*(buf_(1,1)-2.0d0*buf_(0,1)+
-     >                               buf_(-1,1))+
-     >                 xxcon4*(cuf_(1)-2.0d0*cuf_(0)+cuf_(-1))+
-     >                 xxcon5*(buf_(1,5)-2.0d0*buf_(0,5)+buf_(-1,5))+
-     >                 dx5tx1*( ue_(1,5)-2.0d0* ue_(0,5)+ ue_(-1,5))
-               do   m = 1, 5
-                if(i .eq. 1) then
-                  forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                    (5.0d0*ue_(0,m) - 4.0d0*ue_(1,m) +ue_(2,m))
-	            else if(i .eq. 2) then
-                  forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (-4.0d0*ue_(-1,m) + 6.0d0*ue_(0,m) -
-     >                     4.0d0*ue_(1,m) + ue_(2,m))
-	            else if(i .eq. problem_size-3) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m))
-                else if(i .eq. problem_size-2) then	 
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) + 5.0d0*ue_(0,m))				
-                else
-                  forcing(m,i,j,k) = forcing(m,i,j,k) - dssp*
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m) + ue_(2,m))
-                endif				  
-               end do
-            end do
-          end do
-       end do
-
-c---------------------------------------------------------------------
-c  eta-direction flux differences             
-c---------------------------------------------------------------------
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(zeta,eta,xi,m,dtemp
-!DVM$& ,buf_,cuf_,q_,dtpp,z,ue_)
-       do  k = 1, problem_size- 2
-         do  j = 1, problem_size-2	   
-           do i = 1, problem_size- 2
-                zeta = dble(k) * dnzm1
-                xi = dble(i) * dnxm1			 
-                do z = -2, 2 
-                  eta = dble(j + z) * dnym1
-       do  m = 1, 5
-          dtemp(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-       end do
-                  do  m = 1, 5
-                     ue_(z,m) = dtemp(m)
-                  end do
-                  dtpp = 1.0d0 / dtemp(1)
-                  do  m = 2, 5
-                     buf_(z, m) = dtpp * dtemp(m)
-                  end do
-
-                  cuf_(z)   = buf_(z,3) * buf_(z,3)
-                  buf_(z,1) = cuf_(z) + buf_(z,2) * buf_(z,2) + 
-     >                     buf_(z,4) * buf_(z,4)
-                  q_(z) = 0.5d0*(buf_(z,2)*ue_(z,2) + buf_(z,3)
-     >                        *ue_(z,3) + buf_(z,4) * ue_(z,4))
-                enddo	
-                  
-                forcing(1,i,j,k) = forcing(1,i,j,k) -
-     >                ty2*( ue_(1,3)-ue_(-1,3) )+
-     >                dy1ty1*(ue_(1,1)-2.0d0*ue_(0,1)+ue_(-1,1))
-
-                forcing(2,i,j,k) = forcing(2,i,j,k) - ty2*(
-     >                ue_(1,2)*buf_(1,3)-ue_(-1,2)*buf_(-1,3))+
-     >                yycon2*(buf_(1,2)-2.0d0*buf_(0,2)+buf_(-1,2))+
-     >                dy2ty1*( ue_(1,2)-2.0* ue_(0,2)+ ue_(-1,2))
-
-                forcing(3,i,j,k) = forcing(3,i,j,k) - ty2*(
-     >                (ue_(1,3)*buf_(1,3)+c2*(ue_(1,5)-q_(1)))-
-     >                (ue_(-1,3)*buf_(-1,3)+c2*(ue_(-1,5)-q_(-1))))+
-     >                yycon1*(buf_(1,3)-2.0d0*buf_(0,3)+buf_(-1,3))+
-     >                dy3ty1*( ue_(1,3)-2.0d0*ue_(0,3) +ue_(-1,3))
-
-                forcing(4,i,j,k) = forcing(4,i,j,k) - ty2*(
-     >                ue_(1,4)*buf_(1,3)-ue_(-1,4)*buf_(-1,3))+
-     >                yycon2*(buf_(1,4)-2.0d0*buf_(0,4)+buf_(-1,4))+
-     >                dy4ty1*( ue_(1,4)-2.0d0*ue_(0,4)+ ue_(-1,4))
-
-                forcing(5,i,j,k) = forcing(5,i,j,k) - ty2*(
-     >                buf_(1,3)*(c1*ue_(1,5)-c2*q_(1))-
-     >                buf_(-1,3)*(c1*ue_(-1,5)-c2*q_(-1)))+
-     >                0.5d0*yycon3*(buf_(1,1)-2.0d0*buf_(0,1)+
-     >                              buf_(-1,1))+
-     >                yycon4*(cuf_(1)-2.0d0*cuf_(0)+cuf_(-1))+
-     >                yycon5*(buf_(1,5)-2.0d0*buf_(0,5)+buf_(-1,5))+
-     >                dy5ty1*(ue_(1,5)-2.0d0*ue_(0,5)+ue_(-1,5))
-               do   m = 1, 5	 
-                 if(j .eq. 1) then	
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                    (5.0d0*ue_(0,m) - 4.0d0*ue_(1,m) +ue_(2,m))
-                 else if(j .eq. 2) then	
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (-4.0d0*ue_(-1,m) + 6.0d0*ue_(0,m) -
-     >                     4.0d0*ue_(1,m) +  ue_(2,m))	
-	             else if(j .eq. problem_size-3) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m))
-	 	         else if(j .eq. problem_size-2) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) + 5.0d0*ue_(0,m))	
-                 else
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp*
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m) + ue_(2,m))	
-                 endif	 
-	           end do
-             end do
-          end do
-       end do
-	   
-c---------------------------------------------------------------------
-c      zeta-direction flux differences                      
-c---------------------------------------------------------------------
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(zeta,eta,xi,m
-!DVM$& ,buf_,cuf_,q_,ue_,dtpp,dtemp,z)
-      do k = 1, problem_size-2
-        do  j = 1, problem_size-2
-          do i = 1, problem_size-2                  
-                xi = dble(i) * dnxm1                
-                eta = dble(j) * dnym1		  
-                do z = -2, 2 
-                  zeta = dble(k + z) * dnzm1
-       do  m = 1, 5
-          dtemp(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-       end do
-                  do  m = 1, 5
-                     ue_(z,m) = dtemp(m)
-                  end do
-                  dtpp = 1.0d0 / dtemp(1)
-                  do  m = 2, 5
-                     buf_(z, m) = dtpp * dtemp(m)
-                  end do
-
-                  cuf_(z)   = buf_(z,4) * buf_(z,4)
-                  buf_(z,1) = cuf_(z) + buf_(z,2) * buf_(z,2) +
-     >                     buf_(z,3) * buf_(z,3)
-                  q_(z) = 0.5d0*(buf_(z,2)*ue_(z,2) + buf_(z,3)*
-     >                        ue_(z,3) + buf_(z,4)*ue_(z,4))
-                enddo	
-
-                forcing(1,i,j,k) = forcing(1,i,j,k) -
-     >                 tz2*( ue_(1,4)-ue_(-1,4) )+
-     >                 dz1tz1*(ue_(1,1)-2.0d0*ue_(0,1)+ue_(-1,1))
-
-                forcing(2,i,j,k) = forcing(2,i,j,k) - tz2 * (
-     >                 ue_(1,2)*buf_(1,4)-ue_(-1,2)*buf_(-1,4))+
-     >                 zzcon2*(buf_(1,2)-2.0d0*buf_(0,2)+buf_(-1,2))+
-     >                 dz2tz1*( ue_(1,2)-2.0d0* ue_(0,2)+ ue_(-1,2))
-
-                forcing(3,i,j,k) = forcing(3,i,j,k) - tz2 * (
-     >                 ue_(1,3)*buf_(1,4)-ue_(-1,3)*buf_(-1,4))+
-     >                 zzcon2*(buf_(1,3)-2.0d0*buf_(0,3)+buf_(-1,3))+
-     >                 dz3tz1*(ue_(1,3)-2.0d0*ue_(0,3)+ue_(-1,3))
-
-                forcing(4,i,j,k) = forcing(4,i,j,k) - tz2 * (
-     >                (ue_(1,4)*buf_(1,4)+c2*(ue_(1,5)-q_(1)))-
-     >                (ue_(-1,4)*buf_(-1,4)+c2*(ue_(-1,5)-q_(-1))))+
-     >                zzcon1*(buf_(1,4)-2.0d0*buf_(0,4)+buf_(-1,4))+
-     >                dz4tz1*( ue_(1,4)-2.0d0*ue_(0,4) +ue_(-1,4))
-
-                forcing(5,i,j,k) = forcing(5,i,j,k) - tz2 * (
-     >                 buf_(1,4)*(c1*ue_(1,5)-c2*q_(1))-
-     >                 buf_(-1,4)*(c1*ue_(-1,5)-c2*q_(-1)))+
-     >                 0.5d0*zzcon3*(buf_(1,1)-2.0d0*buf_(0,1)
-     >                              +buf_(-1,1))+
-     >                 zzcon4*(cuf_(1)-2.0d0*cuf_(0)+cuf_(-1))+
-     >                 zzcon5*(buf_(1,5)-2.0d0*buf_(0,5)+buf_(-1,5))+
-     >                 dz5tz1*( ue_(1,5)-2.0d0*ue_(0,5)+ ue_(-1,5))
-               do   m = 1, 5
-                 if(k .eq. 1) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                    (5.0d0*ue_(0,m) - 4.0d0*ue_(1,m) +ue_(2,m))
-	             else if(k .eq. 2) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (-4.0d0*ue_(-1,m) + 6.0d0*ue_(0,m) -
-     >                     4.0d0*ue_(1,m) + ue_(2,m))
-                 else if(k .eq. problem_size-3) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m))
-	             else if(k .eq. problem_size-2) then	
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) + 5.0d0*ue_(0,m))		
-                 else
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp*
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m) + ue_(2,m))				 
-	             endif
-               end do              	 
-             end do
-          end do
-       end do
-
-c---------------------------------------------------------------------
-c now change the sign of the forcing function, 
-c---------------------------------------------------------------------
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(m)
-       do   k = 1, problem_size-2
-          do   j = 1, problem_size-2
-             do   i = 1, problem_size-2
-                do   m = 1, 5
-                   forcing(m,i,j,k) = -1.d0 * forcing(m,i,j,k)
-                end do
-             end do
-          end do
-       end do
-!DVM$ end region
-
-       return
-       end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs_block.fdv
deleted file mode 100644
index 3d74e46..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_rhs_block.fdv
+++ /dev/null
@@ -1,4 +0,0 @@
-       subroutine exact_rhs
-
-       return
-       end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_solution.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_solution.fdv
deleted file mode 100644
index 28e00a0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/exact_solution.fdv
+++ /dev/null
@@ -1,18 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     this function returns the exact solution at point xi, eta, zeta  
-!---------------------------------------------------------------------
-      subroutine exact_solution (xi, eta, zeta, dtemp)
-
-      include 'header3d.h'
-      double precision  xi,eta,zeta,dtemp(5)
-      integer  m
-      do  m = 1,5
-         dtemp(m) = ce(m,1) + xi * (ce(m,2) + xi * (ce(m,5) + xi * (ce(m
-     &,8) + xi * ce(m,11)))) + eta * (ce(m,3) + eta * (ce(m,6) + eta * (
-     &ce(m,9) + eta * ce(m,12)))) + zeta * (ce(m,4) + zeta * (ce(m,7) + 
-     &zeta * (ce(m,10) + zeta * ce(m,13))))
-      enddo  
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/header3d.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/header3d.h
deleted file mode 100644
index 88298ef..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/header3d.h
+++ /dev/null
@@ -1,106 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!
-!  header.h
-!
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
- 
-      implicit none
-
-!---------------------------------------------------------------------
-! The following include file is generated automatically by the
-! "setparams" utility. It defines 
-!      maxcells:      the square root of the maximum number of processors
-!      problem_size:  12, 64, 102, 162 (for class T, A, B, C)
-!      dt_default:    default time step for this problem size if no
-!                     config file
-!      niter_default: default number of iterations for this problem size
-!---------------------------------------------------------------------
-
-      include 'npbparams.h'
-
-      integer           aa, bb, cc, BLOCK_SIZE
-      parameter        (aa=1, bb=2, cc=3, BLOCK_SIZE=5)
-
-      integer           grid_points(3)
-      double precision  elapsed_time
-      common /global/   elapsed_time, grid_points
-
-      double precision  tx1, tx2, tx3, ty1, ty2, ty3, tz1, tz2, tz3
-      double precision dx1, dx2, dx3, dx4, dx5, dy1, dy2, dy3, dy4
-      double precision dy5, dz1, dz2, dz3, dz4, dz5, dssp, dt
-      double precision ce(5,13), dxmax, dymax, dzmax, xxcon1, xxcon2 
-      double precision xxcon3, xxcon4, xxcon5, dx1tx1, dx2tx1, dx3tx1
-      double precision dx4tx1, dx5tx1, yycon1, yycon2, yycon3, yycon4
-      double precision yycon5, dy1ty1, dy2ty1, dy3ty1, dy4ty1, dy5ty1
-      double precision zzcon1, zzcon2, zzcon3, zzcon4, zzcon5, dz1tz1
-      double precision dz2tz1, dz3tz1, dz4tz1, dz5tz1, dnxm1, dnym1 
-      double precision dnzm1, c1c2, c1c5, c3c4, c1345, conz1, c1, c2
-      double precision c3, c4, c5, c4dssp, c5dssp, dtdssp, dttx1
-      double precision dttx2, dtty1, dtty2, dttz1, dttz2, c2dttx1
-      double precision c2dtty1, c2dttz1, comz1, comz4, comz5, comz6
-      double precision c3c4tx3, c3c4ty3, c3c4tz3, c2iv, con43, con16
-      integer stage_n, BL, R
-
-      common /constants/ tx1, tx2, tx3, ty1, ty2, ty3, tz1, tz2, tz3
-      common /constants/ dx1, dx2, dx3, dx4, dx5, dy1, dy2, dy3, dy4 
-      common /constants/ dy5, dz1, dz2, dz3, dz4, dz5, dssp, dt
-      common /constants/ ce, dxmax, dymax, dzmax, xxcon1, xxcon2 
-      common /constants/ xxcon3, xxcon4, xxcon5, dx1tx1, dx2tx1, dx3tx1
-      common /constants/ dx4tx1, dx5tx1, yycon1, yycon2, yycon3, yycon4
-      common /constants/ yycon5, dy1ty1, dy2ty1, dy3ty1, dy4ty1, dy5ty1
-      common /constants/ zzcon1, zzcon2, zzcon3, zzcon4, zzcon5, dz1tz1 
-      common /constants/ dz2tz1, dz3tz1, dz4tz1, dz5tz1, dnxm1, dnym1
-      common /constants/ dnzm1, c1c2, c1c5, c3c4, c1345, conz1, c1, c2 
-      common /constants/ c3, c4, c5, c4dssp, c5dssp, dtdssp, dttx1
-      common /constants/ dttx2, dtty1, dtty2, dttz1, dttz2, c2dttx1 
-      common /constants/ c2dtty1, c2dttz1, comz1, comz4, comz5, comz6 
-      common /constants/ c3c4tx3, c3c4ty3, c3c4tz3, c2iv, con43, con16
-      common /constants/ stage_n
-	  
-      integer IMAX, JMAX, KMAX
-
-      parameter (IMAX=problem_size,JMAX=problem_size,KMAX=problem_size)
-      parameter (BL=1, R=0)
-!
-!   to improve cache performance, grid dimensions padded by 1 
-!   for even number sizes only.
-!
-      double precision us(0:IMAX/2*2, 0:JMAX/2*2,  0:KMAX/2*2)
-      double precision vs(0:IMAX/2*2, 0:JMAX/2*2,  0:KMAX/2*2)
-      double precision ws(0:IMAX/2*2, 0:JMAX/2*2,  0:KMAX/2*2)
-      double precision qs(0:IMAX/2*2, 0:JMAX/2*2,  0:KMAX/2*2)
-      double precision rho_i(0:IMAX/2*2, 0:JMAX/2*2,  0:KMAX/2*2)
-      double precision square(0:IMAX/2*2, 0:JMAX/2*2,  0:KMAX/2*2)
-      double precision forcing (5,0:IMAX/2*2,0:JMAX/2*2, 0:KMAX/2*2)
-      double precision u(5,0:(IMAX+1)/2*2,0:(JMAX+1)/2*2,0:(KMAX+1)/2*2)
-      double precision rhs(5,0:IMAX/2*2, 0:JMAX/2*2,   0:KMAX/2*2)
-      double precision lhs__(5,5,0:IMAX/2*2,0:JMAX/2*2,0:KMAX/2*2/BL+R)
-      common /fields/  u, us, vs, ws, qs, rho_i, square
-      common /fields/ rhs, forcing, lhs__
-
-      double precision cv(-2:problem_size+1)
-      double precision cuf(-2:problem_size+1),  q(-2:problem_size+1)
-      double precision ue(-2:problem_size+1,5), buf(-2:problem_size+1,5)
-      common /work_1d/ cv, cuf, q, ue, buf
-
-      double precision tmp1, tmp2, tmp3, tmp11, tmp22
-      double precision t1, t2, t3, tm1, tm2, tm3
-
-      common /work_lhs/ tmp1, tmp2, tmp3, tmp11, tmp22
-      common /work_lhs/ t1, t2, t3, tm1, tm2, tm3
-      double precision  tmp_block(5,5), b_inverse(5,5), tmp_vec(5)
-      common /work_solve/ tmp_block, b_inverse, tmp_vec
-!--------------------------------------------------------------------      
-!               FDVM Specifications
-!--------------------------------------------------------------------
-
-!DVM$ DISTRIBUTE  us (BLOCK,BLOCK,BLOCK)
-!DVM$ ALIGN (i,j,k)       WITH us(i,j,k)  :: vs, ws, qs, rho_i, square
-!DVM$ ALIGN (*,*,i,j,k)   WITH us(i,j,k)  :: lhs__
-!DVM$ ALIGN (*,i,j,k)     WITH us(i,j,k)  :: u, rhs
-!DVM$ ALIGN (*,i,j,k)     WITH us(i,j,k)  :: forcing
-
-!DVM$ SHADOW  u(2:2,2:2,2:2,2:2)
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/initialize.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/initialize.fdv
deleted file mode 100644
index 7c39d39..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/initialize.fdv
+++ /dev/null
@@ -1,181 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     This subroutine initializes the field variable u using 
-!     tri-linear transfinite interpolation of the boundary values     
-!---------------------------------------------------------------------
-      subroutine initialize ()
-
-      include 'header3d.h'
-      integer  i,j,k,m,ix,iy,iz
-      double precision  xi,eta,zeta,pface(5,3,2),pxi,peta,pzeta,temp(5),
-     &xi1,yi1,zi1
-      xi = 0.0
-      eta = 0.0
-      zeta = 0.0
-
-!---------------------------------------------------------------------
-!  Later (in compute_rhs) we compute 1/u for every element. A few of 
-!  the corner elements are not used, but it convenient (and faster) 
-!  to compute the whole thing with a simple loop. Make sure those 
-!  values are nonzero by initializing the whole thing here. 
-!---------------------------------------------------------------------
-!DVM$ region out(u)
-!DVM$ PARALLEL (k,j,i)  ON  u(*,i,j,k), SHADOW_COMPUTE, private(m)
-      do  k = 0,imax - 1
-         do  j = 0,imax - 1
-            do  i = 0,imax - 1
-               do  m = 1,5
-                  u(m,i,j,k) = 1.0
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ PARALLEL (k,j,i)  ON  u(*,i,j,k), private(m,zeta,eta, xi,ix,
-!DVM$& iy,iz,Pxi,Peta,Pzeta,Pface,xi1,yi1,zi1,temp),SHADOW_COMPUTE
-      do  k = 0,grid_points(3) - 1
-         do  j = 0,grid_points(2) - 1
-            do  i = 0,grid_points(1) - 1
-               zeta = dble (k) * dnzm1
-               eta = dble (j) * dnym1
-               xi = dble (i) * dnxm1
-               do  ix = 1,2
-
-!                  call exact_solution(dble(ix-1), eta, zeta, Pface(1,1,ix))
-                  xi1 = dble (ix - 1)
-                  do  m = 1,5
-                     pface(m,1,ix) = ce(m,1) + xi1 * (ce(m,2) + xi1 * (c
-     &e(m,5) + xi1 * (ce(m,8) + xi1 * ce(m,11)))) + eta * (ce(m,3) + eta
-     & * (ce(m,6) + eta * (ce(m,9) + eta * ce(m,12)))) + zeta * (ce(m,4)
-     & + zeta * (ce(m,7) + zeta * (ce(m,10) + zeta * ce(m,13))))
-                  enddo  
-               enddo  
-               do  iy = 1,2
-
-!                  call exact_solution(xi, dble(iy-1) , zeta, Pface(1,2,iy))
-                  yi1 = dble (iy - 1)
-                  do  m = 1,5
-                     pface(m,2,iy) = ce(m,1) + xi * (ce(m,2) + xi * (ce(
-     &m,5) + xi * (ce(m,8) + xi * ce(m,11)))) + yi1 * (ce(m,3) + yi1 * (
-     &ce(m,6) + yi1 * (ce(m,9) + yi1 * ce(m,12)))) + zeta * (ce(m,4) + z
-     &eta * (ce(m,7) + zeta * (ce(m,10) + zeta * ce(m,13))))
-                  enddo  
-               enddo  
-               do  iz = 1,2
-
-!                  call exact_solution(xi, eta, dble(iz-1), Pface(1,3,iz))
-                  zi1 = dble (iz - 1)
-                  do  m = 1,5
-                     pface(m,3,iz) = ce(m,1) + xi * (ce(m,2) + xi * (ce(
-     &m,5) + xi * (ce(m,8) + xi * ce(m,11)))) + eta * (ce(m,3) + eta * (
-     &ce(m,6) + eta * (ce(m,9) + eta * ce(m,12)))) + zi1 * (ce(m,4) + zi
-     &1 * (ce(m,7) + zi1 * (ce(m,10) + zi1 * ce(m,13))))
-                  enddo  
-               enddo  
-               do  m = 1,5
-                  pxi = xi * pface(m,1,2) + (1.0d0 - xi) * pface(m,1,1)
-                  peta = eta * pface(m,2,2) + (1.0d0 - eta) * pface(m,2,
-     &1)
-                  pzeta = zeta * pface(m,3,2) + (1.0d0 - zeta) * pface(m
-     &,3,1)
-                  u(m,i,j,k) = pxi + peta + pzeta - pxi * peta - pxi * p
-     &zeta - peta * pzeta + pxi * peta * pzeta
-               enddo  
-			   
-			   if(i .eq. 0) then  
-	               do  m = 1,5
-                  temp(m) = ce(m,1) + xi * (ce(m,2) + xi * (ce(m,5) + xi
-     & * (ce(m,8) + xi * ce(m,11)))) + eta * (ce(m,3) + eta * (ce(m,6) +
-     & eta * (ce(m,9) + eta * ce(m,12)))) + zeta * (ce(m,4) + zeta * (ce
-     &(m,7) + zeta * (ce(m,10) + zeta * ce(m,13))))
-               enddo  
-               do  m = 1,5
-                  u(m,i,j,k) = temp(m)
-               enddo 
-               endif
-			   if(i .eq. grid_points(1) - 1) then
-			   xi = 1.0d0
-               do  m = 1,5
-                  temp(m) = ce(m,1) + xi * (ce(m,2) + xi * (ce(m,5) + xi
-     & * (ce(m,8) + xi * ce(m,11)))) + eta * (ce(m,3) + eta * (ce(m,6) +
-     & eta * (ce(m,9) + eta * ce(m,12)))) + zeta * (ce(m,4) + zeta * (ce
-     &(m,7) + zeta * (ce(m,10) + zeta * ce(m,13))))
-               enddo  
-               do  m = 1,5
-                  u(m,i,j,k) = temp(m)
-               enddo  			   
-			   endif
-			   
-			   if(j .eq. 0) then
-			   zeta = dble (k) * dnzm1
-               xi = dble (i) * dnxm1
-			   eta = 0.0d0
-			   
-			   do  m = 1,5
-                  temp(m) = ce(m,1) + xi * (ce(m,2) + xi * (ce(m,5) + xi
-     & * (ce(m,8) + xi * ce(m,11)))) + eta * (ce(m,3) + eta * (ce(m,6) +
-     & eta * (ce(m,9) + eta * ce(m,12)))) + zeta * (ce(m,4) + zeta * (ce
-     &(m,7) + zeta * (ce(m,10) + zeta * ce(m,13))))
-               enddo  
-               do  m = 1,5
-                  u(m,i,j,k) = temp(m)
-               enddo  
-			   endif
-			   
-               if(j .eq. grid_points(2) - 1) then
-               zeta = dble (k) * dnzm1
-               xi = dble (i) * dnxm1
-               eta = 1.0d0
-!            call exact_solution(xi, eta, zeta, temp)
-               do  m = 1,5
-                  temp(m) = ce(m,1) + xi * (ce(m,2) + xi * (ce(m,5) + xi
-     & * (ce(m,8) + xi * ce(m,11)))) + eta * (ce(m,3) + eta * (ce(m,6) +
-     & eta * (ce(m,9) + eta * ce(m,12)))) + zeta * (ce(m,4) + zeta * (ce
-     &(m,7) + zeta * (ce(m,10) + zeta * ce(m,13))))
-               enddo  
-               do  m = 1,5
-                  u(m,i,j,k) = temp(m)
-               enddo 			   
-			   endif
-			   
-			   if(k .eq. 0) then
-               zeta = 0.0d0
-               xi = dble (i) * dnxm1
-               eta = dble (j) * dnym1
-
-!            call exact_solution(xi, eta, zeta, temp)
-               do  m = 1,5
-                  temp(m) = ce(m,1) + xi * (ce(m,2) + xi * (ce(m,5) + xi
-     & * (ce(m,8) + xi * ce(m,11)))) + eta * (ce(m,3) + eta * (ce(m,6) +
-     & eta * (ce(m,9) + eta * ce(m,12)))) + zeta * (ce(m,4) + zeta * (ce
-     &(m,7) + zeta * (ce(m,10) + zeta * ce(m,13))))
-               enddo  
-               do  m = 1,5
-                  u(m,i,j,k) = temp(m)
-               enddo                			   
-			   endif
-			   
-			   if(k .eq. grid_points(3) - 1) then
-               zeta = 1.0d0
-               xi = dble (i) * dnxm1
-               eta = dble (j) * dnym1
-
-!            call exact_solution(xi, eta, zeta, temp)
-               do  m = 1,5
-                  temp(m) = ce(m,1) + xi * (ce(m,2) + xi * (ce(m,5) + xi
-     & * (ce(m,8) + xi * ce(m,11)))) + eta * (ce(m,3) + eta * (ce(m,6) +
-     & eta * (ce(m,9) + eta * ce(m,12)))) + zeta * (ce(m,4) + zeta * (ce
-     &(m,7) + zeta * (ce(m,10) + zeta * ce(m,13))))
-               enddo  
-               do  m = 1,5
-                  u(m,i,j,k) = temp(m)
-               enddo 			   
-			   endif
-            enddo  
-         enddo  
-      enddo 
-!DVM$ end region
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/print_result.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/print_result.fdv
deleted file mode 100644
index 8d72bdd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/print_result.fdv
+++ /dev/null
@@ -1,58 +0,0 @@
-
-      subroutine print_results (name, class, n1, n2, n3, niter, t, mops,
-     & optype, verified, npbversion)
-
-!                  , compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-      implicit none
-      character*2  name
-      character*1  class
-      integer  n1,n2,n3,niter,j
-      double precision  t,mops
-      character  optype*24,size*13
-      logical  verified
-      character*(*)  npbversion
-
-!                  , compiletime,cs1, cs2, cs3, cs4, cs5, cs6, cs7
-      write (unit = *,fmt = 2) name
-2     format(//, ' ', A2, ' Benchmark Completed.')
-      write (unit = *,fmt = 3) class
-3     format(' Class           = ', 12x, a12)
-
-!   If this is not a grid-based problem (EP, FT, CG), then
-!   we only print n1, which contains some measure of the
-!   problem size. In that case, n2 and n3 are both zero.
-!   Otherwise, we print the grid size n1xn2xn3
-      if (n2 .eq. 0 .and. n3 .eq. 0) then
-         if (name(1:2) .eq. 'EP') then
-            write (unit = size,fmt = '(f12.0)') 2.d0** n1
-            do  j = 13,1,(-(1))
-               if (size(j:j) .eq. '.')                size(j:j) = ' '
-            enddo  
-            write (unit = *,fmt = 42) size
-42          format(' Size            = ',12x, a14)
-         else  
-            write (unit = *,fmt = 44) n1
-44          format(' Size            = ',12x, i12)
-         endif  
-      else  
-         write (unit = *,fmt = 4) n1,n2,n3
-4        format(' Size            =  ',12x, i3,'x',i3,'x',i3)
-      endif  
-      write (unit = *,fmt = 5) niter
-5     format(' Iterations      = ', 12x, i12)
-      write (unit = *,fmt = 6) t
-6     format(' Time in seconds = ',12x, f12.2)
-      write (unit = *,fmt = 9) mops
-9     format(' Mop/s total     = ',12x, f12.2)
-      write (unit = *,fmt = 11) optype
-11    format(' Operation type  = ', a24)
-      if (verified) then
-         write (unit = *,fmt = 12) '  SUCCESSFUL'
-      else  
-         write (unit = *,fmt = 12) 'UNSUCCESSFUL'
-      endif  
-12    format(' Verification    = ', 12x, a)
-      write (unit = *,fmt = 13) npbversion
-13    format(' Version         = ', 12x, a12)
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/set_constants.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/set_constants.fdv
deleted file mode 100644
index ff3c15f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/set_constants.fdv
+++ /dev/null
@@ -1,165 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine set_constants ()
-
-      include 'header3d.h'
-      ce(1,1) = 2.0d0
-      ce(1,2) = 0.0d0
-      ce(1,3) = 0.0d0
-      ce(1,4) = 4.0d0
-      ce(1,5) = 5.0d0
-      ce(1,6) = 3.0d0
-      ce(1,7) = 0.5d0
-      ce(1,8) = 0.02d0
-      ce(1,9) = 0.01d0
-      ce(1,10) = 0.03d0
-      ce(1,11) = 0.5d0
-      ce(1,12) = 0.4d0
-      ce(1,13) = 0.3d0
-      ce(2,1) = 1.0d0
-      ce(2,2) = 0.0d0
-      ce(2,3) = 0.0d0
-      ce(2,4) = 0.0d0
-      ce(2,5) = 1.0d0
-      ce(2,6) = 2.0d0
-		ce(2,7) = 3.0d0
-      ce(2,8) = 0.01d0
-      ce(2,9) = 0.03d0
-      ce(2,10) = 0.02d0
-      ce(2,11) = 0.4d0
-      ce(2,12) = 0.3d0
-      ce(2,13) = 0.5d0
-      ce(3,1) = 2.0d0
-      ce(3,2) = 2.0d0
-      ce(3,3) = 0.0d0
-      ce(3,4) = 0.0d0
-      ce(3,5) = 0.0d0
-      ce(3,6) = 2.0d0
-      ce(3,7) = 3.0d0
-      ce(3,8) = 0.04d0
-      ce(3,9) = 0.03d0
-      ce(3,10) = 0.05d0
-      ce(3,11) = 0.3d0
-      ce(3,12) = 0.5d0
-      ce(3,13) = 0.4d0
-      ce(4,1) = 2.0d0
-      ce(4,2) = 2.0d0
-      ce(4,3) = 0.0d0
-      ce(4,4) = 0.0d0
-      ce(4,5) = 0.0d0
-      ce(4,6) = 2.0d0
-      ce(4,7) = 3.0d0
-      ce(4,8) = 0.03d0
-      ce(4,9) = 0.05d0
-      ce(4,10) = 0.04d0
-      ce(4,11) = 0.2d0
-      ce(4,12) = 0.1d0
-      ce(4,13) = 0.3d0
-      ce(5,1) = 5.0d0
-      ce(5,2) = 4.0d0
-      ce(5,3) = 3.0d0
-      ce(5,4) = 2.0d0
-      ce(5,5) = 0.1d0
-      ce(5,6) = 0.4d0
-      ce(5,7) = 0.3d0
-      ce(5,8) = 0.05d0
-      ce(5,9) = 0.04d0
-      ce(5,10) = 0.03d0
-      ce(5,11) = 0.1d0
-      ce(5,12) = 0.3d0
-      ce(5,13) = 0.2d0
-      c1 = 1.4d0
-      c2 = 0.4d0
-      c3 = 0.1d0
-      c4 = 1.0d0
-      c5 = 1.4d0
-      dnxm1 = 1.0d0 / dble (grid_points(1) - 1)
-      dnym1 = 1.0d0 / dble (grid_points(2) - 1)
-      dnzm1 = 1.0d0 / dble (grid_points(3) - 1)
-      c1c2 = c1 * c2
-      c1c5 = c1 * c5
-      c3c4 = c3 * c4
-      c1345 = c1c5 * c3c4
-      conz1 = 1.0d0 - c1c5
-      tx1 = 1.0d0 / (dnxm1 * dnxm1)
-      tx2 = 1.0d0 / (2.0d0 * dnxm1)
-      tx3 = 1.0d0 / dnxm1
-      ty1 = 1.0d0 / (dnym1 * dnym1)
-      ty2 = 1.0d0 / (2.0d0 * dnym1)
-      ty3 = 1.0d0 / dnym1
-      tz1 = 1.0d0 / (dnzm1 * dnzm1)
-      tz2 = 1.0d0 / (2.0d0 * dnzm1)
-      tz3 = 1.0d0 / dnzm1
-      dx1 = 0.75d0
-      dx2 = 0.75d0
-      dx3 = 0.75d0
-      dx4 = 0.75d0
-      dx5 = 0.75d0
-      dy1 = 0.75d0
-      dy2 = 0.75d0
-      dy3 = 0.75d0
-      dy4 = 0.75d0
-      dy5 = 0.75d0
-      dz1 = 1.0d0
-      dz2 = 1.0d0
-      dz3 = 1.0d0
-      dz4 = 1.0d0
-      dz5 = 1.0d0
-      dxmax = dmax1 (dx3,dx4)
-      dymax = dmax1 (dy2,dy4)
-      dzmax = dmax1 (dz2,dz3)
-      dssp = 0.25d0 * dmax1 (dx1,dmax1 (dy1,dz1))
-      c4dssp = 4.0d0 * dssp
-      c5dssp = 5.0d0 * dssp
-      dttx1 = dt * tx1
-      dttx2 = dt * tx2
-      dtty1 = dt * ty1
-      dtty2 = dt * ty2
-      dttz1 = dt * tz1
-      dttz2 = dt * tz2
-      c2dttx1 = 2.0d0 * dttx1
-      c2dtty1 = 2.0d0 * dtty1
-      c2dttz1 = 2.0d0 * dttz1
-      dtdssp = dt * dssp
-      comz1 = dtdssp
-      comz4 = 4.0d0 * dtdssp
-      comz5 = 5.0d0 * dtdssp
-      comz6 = 6.0d0 * dtdssp
-      c3c4tx3 = c3c4 * tx3
-      c3c4ty3 = c3c4 * ty3
-      c3c4tz3 = c3c4 * tz3
-      dx1tx1 = dx1 * tx1
-      dx2tx1 = dx2 * tx1
-      dx3tx1 = dx3 * tx1
-      dx4tx1 = dx4 * tx1
-      dx5tx1 = dx5 * tx1
-      dy1ty1 = dy1 * ty1
-      dy2ty1 = dy2 * ty1
-      dy3ty1 = dy3 * ty1
-      dy4ty1 = dy4 * ty1
-      dy5ty1 = dy5 * ty1
-      dz1tz1 = dz1 * tz1
-      dz2tz1 = dz2 * tz1
-      dz3tz1 = dz3 * tz1
-      dz4tz1 = dz4 * tz1
-      dz5tz1 = dz5 * tz1
-      c2iv = 2.5d0
-      con43 = 4.0d0 / 3.0d0
-      con16 = 1.0d0 / 6.0d0
-      xxcon1 = c3c4tx3 * con43 * tx3
-      xxcon2 = c3c4tx3 * tx3
-      xxcon3 = c3c4tx3 * conz1 * tx3
-      xxcon4 = c3c4tx3 * con16 * tx3
-      xxcon5 = c3c4tx3 * c1c5 * tx3
-      yycon1 = c3c4ty3 * con43 * ty3
-      yycon2 = c3c4ty3 * ty3
-      yycon3 = c3c4ty3 * conz1 * ty3
-      yycon4 = c3c4ty3 * con16 * ty3
-      yycon5 = c3c4ty3 * c1c5 * ty3
-      zzcon1 = c3c4tz3 * con43 * tz3
-      zzcon2 = c3c4tz3 * tz3
-      zzcon3 = c3c4tz3 * conz1 * tz3
-      zzcon4 = c3c4tz3 * con16 * tz3
-      zzcon5 = c3c4tz3 * c1c5 * tz3
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/timers.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/timers.fdv
deleted file mode 100644
index d824693..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/timers.fdv
+++ /dev/null
@@ -1,84 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine timer_clear (n)
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      implicit none
-      integer  n
-      double precision  start(64),elapsed(64)
-      common /tt/start,elapsed
-      elapsed(n) = 0.0
-      return
-      end
-
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine timer_start (n)
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      implicit none
-      external elapsed_time
-      double precision  elapsed_time
-      integer  n
-      double precision  start(64),elapsed(64)
-      common /tt/start,elapsed
-      start(n) = elapsed_time ()
-      return
-      end
-
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine timer_stop (n)
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      implicit none
-      external elapsed_time
-      double precision  elapsed_time
-      integer  n
-      double precision  start(64),elapsed(64)
-      common /tt/start,elapsed
-      double precision  t,now
-      now = elapsed_time ()
-      t = now - start(n)
-      elapsed(n) = elapsed(n) + t
-      return
-      end
-
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      double precision  function timer_read (n) 
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      implicit none
-      integer  n
-      double precision  start(64),elapsed(64)
-      common /tt/start,elapsed
-      timer_read = elapsed(n)
-      return
-      end
-
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      double precision  function elapsed_time () 
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      implicit none
-      double precision  t,dvtime
-      integer  dvm_debug
-
-!      dvm_debug = 0 - standard mode, dvm_debug > 0 - debugging mode
-      parameter (dvm_debug = 0)
-      data t/0.d0/
-      t = dvtime ()
-      elapsed_time = t
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/verify.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/verify.fdv
deleted file mode 100644
index 874799b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/verify.fdv
+++ /dev/null
@@ -1,312 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  verification routine                         
-!---------------------------------------------------------------------
-      subroutine verify (no_time_steps, class, verified)
-
-      include 'header3d.h'
-      double precision  xcrref(5),xceref(5),xcrdif(5),xcedif(5),epsilon,
-     &xce(5),xcr(5),dtref
-      integer  m,no_time_steps
-      character  class
-      logical  verified
-
-!---------------------------------------------------------------------
-!   tolerance level
-!---------------------------------------------------------------------
-      epsilon = 1.0d-08
-
-!---------------------------------------------------------------------
-!   compute the error norm and the residual norm, and exit if not printing
-!---------------------------------------------------------------------
-      call error_norm(xce)
-      call compute_rhs()
-      call rhs_norm(xcr)
-      do  m = 1,5
-         xcr(m) = xcr(m) / dt
-      enddo  
-      class = 'U'
-      verified = .TRUE.
-      do  m = 1,5
-         xcrref(m) = 1.0
-         xceref(m) = 1.0
-      enddo  
-
-!---------------------------------------------------------------------
-!    reference data for 12X12X12 grids after 100 time steps, with DT = 1.0d-02
-!---------------------------------------------------------------------
-      if (problem_size .eq. 12 .and. problem_size .eq. 12 .and. problem_
-     &size .eq. 12 .and. no_time_steps .eq. 60) then
-         class = 'S'
-         dtref = 1.0d-2
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of residual.
-!---------------------------------------------------------------------
-         xcrref(1) = 1.7034283709541311d-01
-         xcrref(2) = 1.2975252070034097d-02
-         xcrref(3) = 3.2527926989486055d-02
-         xcrref(4) = 2.6436421275166801d-02
-         xcrref(5) = 1.9211784131744430d-01
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of solution error.
-!---------------------------------------------------------------------
-         xceref(1) = 4.9976913345811579d-04
-         xceref(2) = 4.5195666782961927d-05
-         xceref(3) = 7.3973765172921357d-05
-         xceref(4) = 7.3821238632439731d-05
-         xceref(5) = 8.9269630987491446d-04
-
-!---------------------------------------------------------------------
-!    reference data for 24X24X24 grids after 200 time steps, with DT = 0.8d-3
-!---------------------------------------------------------------------
-      else if (problem_size .eq. 24 .and. problem_size .eq. 24 .and. pro
-     &blem_size .eq. 24 .and. no_time_steps .eq. 200) then  
-         class = 'W'
-         dtref = 0.8d-3
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of residual.
-!---------------------------------------------------------------------
-         xcrref(1) = 0.1125590409344d+03
-         xcrref(2) = 0.1180007595731d+02
-         xcrref(3) = 0.2710329767846d+02
-         xcrref(4) = 0.2469174937669d+02
-         xcrref(5) = 0.2638427874317d+03
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of solution error.
-!---------------------------------------------------------------------
-         xceref(1) = 0.4419655736008d+01
-         xceref(2) = 0.4638531260002d+00
-         xceref(3) = 0.1011551749967d+01
-         xceref(4) = 0.9235878729944d+00
-         xceref(5) = 0.1018045837718d+02
-
-!---------------------------------------------------------------------
-!    reference data for 64X64X64 grids after 200 time steps, with DT = 0.8d-3
-!---------------------------------------------------------------------
-      else if (problem_size .eq. 64 .and. problem_size .eq. 64 .and. pro
-     &blem_size .eq. 64 .and. no_time_steps .eq. 200) then  
-         class = 'A'
-         dtref = 0.8d-3
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of residual.
-!---------------------------------------------------------------------
-         xcrref(1) = 1.0806346714637264d+02
-         xcrref(2) = 1.1319730901220813d+01
-         xcrref(3) = 2.5974354511582465d+01
-         xcrref(4) = 2.3665622544678910d+01
-         xcrref(5) = 2.5278963211748344d+02
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of solution error.
-!---------------------------------------------------------------------
-         xceref(1) = 4.2348416040525025d+00
-         xceref(2) = 4.4390282496995698d-01
-         xceref(3) = 9.6692480136345650d-01
-         xceref(4) = 8.8302063039765474d-01
-         xceref(5) = 9.7379901770829278d+00
-
-!---------------------------------------------------------------------
-!    reference data for 102X102X102 grids after 200 time steps,
-!    with DT = 3.0d-04
-!---------------------------------------------------------------------
-      else if (problem_size .eq. 102 .and. problem_size .eq. 102 .and. p
-     &roblem_size .eq. 102 .and. no_time_steps .eq. 200) then  
-         class = 'B'
-         dtref = 3.0d-4
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of residual.
-!---------------------------------------------------------------------
-         xcrref(1) = 1.4233597229287254d+03
-         xcrref(2) = 9.9330522590150238d+01
-         xcrref(3) = 3.5646025644535285d+02
-         xcrref(4) = 3.2485447959084092d+02
-         xcrref(5) = 3.2707541254659363d+03
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of solution error.
-!---------------------------------------------------------------------
-         xceref(1) = 5.2969847140936856d+01
-         xceref(2) = 4.4632896115670668d+00
-         xceref(3) = 1.3122573342210174d+01
-         xceref(4) = 1.2006925323559144d+01
-         xceref(5) = 1.2459576151035986d+02
-
-!---------------------------------------------------------------------
-!    reference data for 162X162X162 grids after 200 time steps,
-!    with DT = 1.0d-04
-!---------------------------------------------------------------------
-      else if (problem_size .eq. 162 .and. problem_size .eq. 162 .and. p
-     &roblem_size .eq. 162 .and. no_time_steps .eq. 200) then  
-         class = 'C'
-         dtref = 1.0d-4
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of residual.
-!---------------------------------------------------------------------
-         xcrref(1) = 0.62398116551764615d+04
-         xcrref(2) = 0.50793239190423964d+03
-         xcrref(3) = 0.15423530093013596d+04
-         xcrref(4) = 0.13302387929291190d+04
-         xcrref(5) = 0.11604087428436455d+05
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of solution error.
-!---------------------------------------------------------------------
-         xceref(1) = 0.16462008369091265d+03
-         xceref(2) = 0.11497107903824313d+02
-         xceref(3) = 0.41207446207461508d+02
-         xceref(4) = 0.37087651059694167d+02
-         xceref(5) = 0.36211053051841265d+03
-!---------------------------------------------------------------------
-!    reference data for 408x408x408 grids after 250 time steps, with DT = 0.2d-04
-!---------------------------------------------------------------------
-        elseif ( (grid_points(1) .eq. 408) .and. 
-     &           (grid_points(2) .eq. 408) .and.
-     &           (grid_points(3) .eq. 408) .and.
-     &           (no_time_steps . eq. 250) ) then
-
-           class = 'D'
-           dtref = 0.2d-4
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of residual.
-!---------------------------------------------------------------------
-         xcrref(1) = 0.2533188551738d+05
-         xcrref(2) = 0.2346393716980d+04
-         xcrref(3) = 0.6294554366904d+04
-         xcrref(4) = 0.5352565376030d+04
-         xcrref(5) = 0.3905864038618d+05
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of solution error.
-!---------------------------------------------------------------------
-
-         xceref(1) = 0.3100009377557d+03
-         xceref(2) = 0.2424086324913d+02
-         xceref(3) = 0.7782212022645d+02
-         xceref(4) = 0.6835623860116d+02
-         xceref(5) = 0.6065737200368d+03
-
-!---------------------------------------------------------------------
-!    reference data for 1020x1020x1020 grids after 250 time steps, with DT = 0.4d-05
-!---------------------------------------------------------------------
-        elseif ( (grid_points(1) .eq. 1020) .and. 
-     &           (grid_points(2) .eq. 1020) .and.
-     &           (grid_points(3) .eq. 1020) .and.
-     &           (no_time_steps . eq. 250) ) then
-
-           class = 'E'
-           dtref = 0.4d-5
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of residual.
-!---------------------------------------------------------------------
-         xcrref(1) = 0.9795372484517d+05
-         xcrref(2) = 0.9739814511521d+04
-         xcrref(3) = 0.2467606342965d+05
-         xcrref(4) = 0.2092419572860d+05
-         xcrref(5) = 0.1392138856939d+06
-
-!---------------------------------------------------------------------
-!  Reference values of RMS-norms of solution error.
-!---------------------------------------------------------------------
-
-         xceref(1) = 0.4327562208414d+03
-         xceref(2) = 0.3699051964887d+02
-         xceref(3) = 0.1089845040954d+03
-         xceref(4) = 0.9462517622043d+02
-         xceref(5) = 0.7765512765309d+03
-
-      else  
-         verified = .FALSE.
-      endif  
-
-!---------------------------------------------------------------------
-!    verification test for residuals if gridsize is either 12X12X12 or 
-!    64X64X64 or 102X102X102 or 162X162X162
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!    Compute the difference of solution values and the known reference values.
-!---------------------------------------------------------------------
-      do  m = 1,5
-         xcrdif(m) = dabs ((xcr(m) - xcrref(m)) / xcrref(m))
-         xcedif(m) = dabs ((xce(m) - xceref(m)) / xceref(m))
-      enddo  
-
-!---------------------------------------------------------------------
-!    Output the comparison of computed results to known cases.
-!---------------------------------------------------------------------
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 1990) class
-1990     format(' Verification being performed for class ', a)
-         write (unit = *,fmt = 2000) epsilon
-2000     format(' accuracy setting for epsilon = ', E20.13)
-         if (dabs (dt - dtref) .gt. epsilon) then
-            verified = .FALSE.
-            class = 'U'
-            write (unit = *,fmt = 1000) dtref
-1000        format(' DT does not match the reference value of ',        
-     &          E15.8)
-         endif  
-      else  
-         write (unit = *,fmt = 1995) 
-1995     format(' Unknown class')
-      endif  
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 2001) 
-      else  
-         write (unit = *,fmt = 2005) 
-      endif  
-2001  format(' Comparison of RMS-norms of residual')
-2005  format(' RMS-norms of residual')
-      do  m = 1,5
-         if (class .eq. 'U') then
-            write (unit = *,fmt = 2015) m,xcr(m)
-         else if (xcrdif(m) .gt. epsilon .or. isnan(xcrdif(m)))then
-            verified = .FALSE.
-            write (unit = *,fmt = 2010) m,xcr(m),xcrref(m),xcrdif(m)
-         else  
-            write (unit = *,fmt = 2011) m,xcr(m),xcrref(m),xcrdif(m)
-         endif  
-      enddo  
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 2002) 
-      else  
-         write (unit = *,fmt = 2006) 
-      endif  
-2002  format(' Comparison of RMS-norms of solution error')
-2006  format(' RMS-norms of solution error')
-      do  m = 1,5
-         if (class .eq. 'U') then
-            write (unit = *,fmt = 2015) m,xce(m)
-         else if (xcedif(m) .gt. epsilon .or. isnan(xcedif(m))) then  
-            verified = .FALSE.
-            write (unit = *,fmt = 2010) m,xce(m),xceref(m),xcedif(m)
-         else  
-            write (unit = *,fmt = 2011) m,xce(m),xceref(m),xcedif(m)
-         endif  
-      enddo  
-2010  format(' FAILURE: ', i2, E20.13, E20.13, E20.13)
-2011  format('          ', i2, E20.13, E20.13, E20.13)
-2015  format('          ', i2, E20.13)
-      if (class .eq. 'U') then
-         write (unit = *,fmt = 2022) 
-         write (unit = *,fmt = 2023) 
-2022     format(' No reference values provided')
-2023     format(' No verification performed')
-      else if (verified) then  
-         write (unit = *,fmt = 2020) 
-2020     format(' Verification Successful')
-      else  
-         write (unit = *,fmt = 2021) 
-2021     format(' Verification failed')
-      endif  
-      return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve.fdv
deleted file mode 100644
index 623ac1c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve.fdv
+++ /dev/null
@@ -1,627 +0,0 @@
-!---------------------------------------------------------------------
-!     performs guaussian elimination on this cell.
-!     
-!     assumes that unpacking routines for non-first cells 
-!     preload C' and rhs' from previous cell.
-!     
-!     assumed send happens outside this routine, but that
-!     c'(IMAX) and rhs'(IMAX) will be sent to next cell
-!---------------------------------------------------------------------
-      subroutine x_solve ()
-
-      include 'header3d.h'
-      double precision  pivot,coeff
-      integer  i__0,j__1
-      integer  m,n
-      double precision  coeff__2
-      double precision  pivot__3
-      double precision  lhs_(5,5,3),u_(0:3,5)
-      double precision  rhs_(5)
-      integer  i,j,k,isize
-      isize = problem_size - 1
-
-!---------------------------------------------------------------------
-!     outer most do loops - sweeping in i direction
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     begin inner most do loop
-!     do all the elements of the cell unless last 
-!---------------------------------------------------------------------
-!, ACROSS(rhs(1:0,0:0,0:0,0:0),lhs__(1:0,0:0,0:0,0:0,0:0))
-!DVM$ region local(lhs__)
-!DVM$ PARALLEL (k,j)  ON  rhs(*,*,j,k),private(u_,i,rhs_,tmp1,tmp2,
-!DVM$&tmp3,t1,t2,t3,tm1,tm2,pivot,coeff, tm3,i__0,j__1,tmp11,
-!DVM$&tmp22,lhs_,m,n,coeff__2, pivot__3)
-      do  k = 1,problem_size - 2
-         do  j = 1,problem_size - 2
-            do  m = 1,5
-               u_(0,m) = u(m,0,j,k)
-               u_(1,m) = u(m,1,j,k)
-            enddo  
-            do  i = 1,isize - 1
-               do  m = 1,5
-                  u_(2,m) = u(m,i + 1,j,k)
-               enddo  
-
-!			   if(i .ne. isize) then
-               tmp1 = 1.0d+00 / u_(1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               t1 = 1.0d+00 / u_(0,1)
-               t2 = t1 * t1
-               t3 = t1 * t2
-               tm1 = 1.0d+00 / u_(2,1)
-               tm2 = tm1 * tm1
-               tm3 = tm1 * tm2
-               tmp11 = dt * tx1
-               tmp22 = dt * tx2
-               lhs_(1,1,1) = (-(tmp11)) * dx1
-               lhs_(1,2,1) = (-(tmp22))
-               lhs_(1,3,1) = 0.
-               lhs_(1,4,1) = 0.
-               lhs_(1,5,1) = 0.
-               lhs_(2,1,1) = (-(tmp22)) * ((-(u_(0,2) * t2 * u_(0,2))) +
-     & c2 * 0.50d+00 * (u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4) 
-     &* u_(0,4)) * t2) - tmp11 * ((-(con43)) * c3c4 * t2 * u_(0,2))
-               lhs_(2,2,1) = (-(tmp22)) * ((2.0d+00 - c2) * (u_(0,2) / u
-     &_(0,1))) - tmp11 * con43 * c3c4 * t1 - tmp11 * dx2
-               lhs_(2,3,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * t1))
-               lhs_(2,4,1) = (-(tmp22)) * ((-(c2)) * (u_(0,4) * t1))
-               lhs_(2,5,1) = (-(tmp22)) * c2
-               lhs_(3,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,3))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,3))
-               lhs_(3,2,1) = (-(tmp22)) * u_(0,3) * t1
-               lhs_(3,3,1) = (-(tmp22)) * u_(0,2) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dx3
-               lhs_(3,4,1) = 0.
-               lhs_(3,5,1) = 0.
-               lhs_(4,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,4))
-               lhs_(4,2,1) = (-(tmp22)) * u_(0,4) * t1
-               lhs_(4,3,1) = 0.
-               lhs_(4,4,1) = (-(tmp22)) * u_(0,2) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dx4
-               lhs_(4,5,1) = 0.
-               lhs_(5,1,1) = (-(tmp22)) * ((c2 * (u_(0,2) * u_(0,2) + u_
-     &(0,3) * u_(0,3) + u_(0,4) * u_(0,4)) * t2 - c1 * (u_(0,5) * t1)) *
-     & (u_(0,2) * t1)) - tmp11 * ((-(con43 * c3c4 - c1345)) * t3 * u_(0,
-     &2)** 2 - (c3c4 - c1345) * t3 * u_(0,3)** 2 - (c3c4 - c1345) * t3 *
-     & u_(0,4)** 2 - c1345 * t2 * u_(0,5))
-               lhs_(5,2,1) = (-(tmp22)) * (c1 * u_(0,5) * t1 - 0.50d+00 
-     &* c2 * (3.0d+00 * u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4) 
-     &* u_(0,4)) * t2) - tmp11 * ((con43 * c3c4 - c1345) * t2 * u_(0,2))
-               lhs_(5,3,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * u_(0,2))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,3)
-               lhs_(5,4,1) = (-(tmp22)) * ((-(c2)) * (u_(0,4) * u_(0,2))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,4)
-               lhs_(5,5,1) = (-(tmp22)) * c1 * (u_(0,2) * t1) - tmp11 * 
-     &c1345 * t1 - tmp11 * dx5
-               lhs_(1,1,2) = 1.0d+00 + tmp11 * 2.0d+00 * dx1
-               lhs_(1,2,2) = 0.
-               lhs_(1,3,2) = 0.
-               lhs_(1,4,2) = 0.
-               lhs_(1,5,2) = 0.
-               lhs_(2,1,2) = tmp11 * 2.0d+00 * ((-(con43)) * c3c4 * tmp2
-     & * u_(1,2))
-               lhs_(2,2,2) = 1.0d+00 + tmp11 * 2.0d+00 * con43 * c3c4 * 
-     &tmp1 + tmp11 * 2.0d+00 * dx2
-               lhs_(2,3,2) = 0.
-               lhs_(2,4,2) = 0.
-               lhs_(2,5,2) = 0.
-               lhs_(3,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &3))
-               lhs_(3,2,2) = 0.
-               lhs_(3,3,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dx3
-               lhs_(3,4,2) = 0.
-               lhs_(3,5,2) = 0.
-               lhs_(4,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &4))
-               lhs_(4,2,2) = 0.
-               lhs_(4,3,2) = 0.
-               lhs_(4,4,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dx4
-               lhs_(4,5,2) = tmp11 * 2.0d+00 * 0
-               lhs_(5,1,2) = tmp11 * 2.0d+00 * ((-(con43 * c3c4 - c1345)
-     &) * tmp3 * u_(1,2)** 2 - (c3c4 - c1345) * tmp3 * u_(1,3)** 2 - (c3
-     &c4 - c1345) * tmp3 * u_(1,4)** 2 - c1345 * tmp2 * u_(1,5))
-               lhs_(5,2,2) = tmp11 * 2.0d+00 * ((con43 * c3c4 - c1345) *
-     & tmp2 * u_(1,2))
-               lhs_(5,3,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,3)
-               lhs_(5,4,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,4)
-               lhs_(5,5,2) = 1.0d+00 + tmp11 * 2.0d+00 * c1345 * tmp1 + 
-     &tmp11 * 2.0d+00 * dx5
-               if (i .ne. 1) then
-                  do  j__1 = 1,5
-                     lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs
-     &_(1,j__1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,
-     &j__1,3) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs
-     &_(1,j__1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,
-     &j__1,3) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs
-     &_(1,j__1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,
-     &j__1,3) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs
-     &_(1,j__1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,
-     &j__1,3) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs
-     &_(1,j__1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,
-     &j__1,3) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1
-     &,3)
-                  enddo  
-               endif  
-               lhs_(1,1,3) = (-(tmp11)) * dx1
-               lhs_(1,2,3) = tmp22
-               lhs_(1,3,3) = 0.
-               lhs_(1,4,3) = 0.
-               lhs_(1,5,3) = 0.
-               lhs_(2,1,3) = tmp22 * ((-(u_(2,2) * tm2 * u_(2,2))) + c2 
-     &* 0.50d+00 * (u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u_
-     &(2,4)) * tm2) - tmp11 * ((-(con43)) * c3c4 * tm2 * u_(2,2))
-               lhs_(2,2,3) = tmp22 * ((2.0d+00 - c2) * (u_(2,2) / u_(2,1
-     &))) - tmp11 * con43 * c3c4 * tm1 - tmp11 * dx2
-               lhs_(2,3,3) = tmp22 * ((-(c2)) * (u_(2,3) * tm1))
-               lhs_(2,4,3) = tmp22 * ((-(c2)) * (u_(2,4) * tm1))
-               lhs_(2,5,3) = tmp22 * c2
-               lhs_(3,1,3) = tmp22 * ((-(u_(2,2) * u_(2,3))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,3))
-               lhs_(3,2,3) = tmp22 * u_(2,3) * tm1
-               lhs_(3,3,3) = tmp22 * u_(2,2) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dx3
-               lhs_(3,4,3) = 0.
-               lhs_(3,5,3) = 0.
-               lhs_(4,1,3) = tmp22 * ((-(u_(2,2) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,4))
-               lhs_(4,2,3) = tmp22 * u_(2,4) * tm1
-               lhs_(4,3,3) = 0.
-               lhs_(4,4,3) = tmp22 * u_(2,2) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dx4
-               lhs_(4,5,3) = 0.
-               lhs_(5,1,3) = tmp22 * ((c2 * (u_(2,2) * u_(2,2) + u_(2,3)
-     & * u_(2,3) + u_(2,4) * u_(2,4)) * tm2 - c1 * (u_(2,5) * tm1)) * (u
-     &_(2,2) * tm1)) - tmp11 * ((-(con43 * c3c4 - c1345)) * tm3 * u_(2,2
-     &)** 2 - (c3c4 - c1345) * tm3 * u_(2,3)** 2 - (c3c4 - c1345) * tm3 
-     &* u_(2,4)** 2 - c1345 * tm2 * u_(2,5))
-               lhs_(5,2,3) = tmp22 * (c1 * u_(2,5) * tm1 - 0.50d+00 * c2
-     & * (3.0d+00 * u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u_
-     &(2,4)) * tm2) - tmp11 * ((con43 * c3c4 - c1345) * tm2 * u_(2,2))
-               lhs_(5,3,3) = tmp22 * ((-(c2)) * (u_(2,3) * u_(2,2)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,3)
-               lhs_(5,4,3) = tmp22 * ((-(c2)) * (u_(2,4) * u_(2,2)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,4)
-               lhs_(5,5,3) = tmp22 * c1 * (u_(2,2) * tm1) - tmp11 * c134
-     &5 * tm1 - tmp11 * dx5
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  i__0 = 1,5
-                  rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i - 1
-     &,j,k) - lhs_(i__0,2,1) * rhs(2,i - 1,j,k) - lhs_(i__0,3,1) * rhs(3
-     &,i - 1,j,k) - lhs_(i__0,4,1) * rhs(4,i - 1,j,k) - lhs_(i__0,5,1) *
-     & rhs(5,i - 1,j,k)
-               enddo  
-               pivot = 1.00d0 / lhs_(1,1,2)
-               lhs_(1,2,2) = lhs_(1,2,2) * pivot
-               lhs_(1,3,2) = lhs_(1,3,2) * pivot
-               lhs_(1,4,2) = lhs_(1,4,2) * pivot
-               lhs_(1,5,2) = lhs_(1,5,2) * pivot
-               lhs_(1,1,3) = lhs_(1,1,3) * pivot
-               lhs_(1,2,3) = lhs_(1,2,3) * pivot
-               lhs_(1,3,3) = lhs_(1,3,3) * pivot
-               lhs_(1,4,3) = lhs_(1,4,3) * pivot
-               lhs_(1,5,3) = lhs_(1,5,3) * pivot
-               rhs_(1) = rhs_(1) * pivot
-               coeff = lhs_(2,1,2)
-               lhs_(2,2,2) = lhs_(2,2,2) - coeff * lhs_(1,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) - coeff * lhs_(1,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(1,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(1,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(1,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(1,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(1,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(1,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(1,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(1)
-               coeff = lhs_(3,1,2)
-               lhs_(3,2,2) = lhs_(3,2,2) - coeff * lhs_(1,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(1,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(1,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(1,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(1,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(1,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(1,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(1,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(1,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(1)
-               coeff = lhs_(4,1,2)
-               lhs_(4,2,2) = lhs_(4,2,2) - coeff * lhs_(1,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(1,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(1,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(1,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(1,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(1,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(1,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(1,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(1,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(1)
-               coeff = lhs_(5,1,2)
-               lhs_(5,2,2) = lhs_(5,2,2) - coeff * lhs_(1,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(1,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(1,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(1,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(1,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(1,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(1,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(1,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(1,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(1)
-               pivot = 1.00d0 / lhs_(2,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) * pivot
-               lhs_(2,4,2) = lhs_(2,4,2) * pivot
-               lhs_(2,5,2) = lhs_(2,5,2) * pivot
-               lhs_(2,1,3) = lhs_(2,1,3) * pivot
-               lhs_(2,2,3) = lhs_(2,2,3) * pivot
-               lhs_(2,3,3) = lhs_(2,3,3) * pivot
-               lhs_(2,4,3) = lhs_(2,4,3) * pivot
-               lhs_(2,5,3) = lhs_(2,5,3) * pivot
-               rhs_(2) = rhs_(2) * pivot
-               coeff = lhs_(1,2,2)
-               lhs_(1,3,2) = lhs_(1,3,2) - coeff * lhs_(2,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(2,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(2,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(2,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(2,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(2,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(2,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(2,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(2)
-               coeff = lhs_(3,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(2,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(2,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(2,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(2,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(2,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(2,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(2,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(2,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(2)
-               coeff = lhs_(4,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(2,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(2,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(2,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(2,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(2,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(2,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(2,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(2,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(2)
-               coeff = lhs_(5,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(2,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(2,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(2,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(2,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(2,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(2,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(2,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(2,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(2)
-               pivot = 1.00d0 / lhs_(3,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) * pivot
-               lhs_(3,5,2) = lhs_(3,5,2) * pivot
-               lhs_(3,1,3) = lhs_(3,1,3) * pivot
-               lhs_(3,2,3) = lhs_(3,2,3) * pivot
-               lhs_(3,3,3) = lhs_(3,3,3) * pivot
-               lhs_(3,4,3) = lhs_(3,4,3) * pivot
-               lhs_(3,5,3) = lhs_(3,5,3) * pivot
-               rhs_(3) = rhs_(3) * pivot
-               coeff = lhs_(1,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(3,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(3,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(3,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(3,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(3,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(3,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(3,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(3)
-               coeff = lhs_(2,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(3,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(3,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(3,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(3,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(3,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(3,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(3,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(3)
-               coeff = lhs_(4,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(3,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(3,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(3,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(3,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(3,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(3,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(3,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(3)
-               coeff = lhs_(5,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(3,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(3,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(3,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(3,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(3,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(3,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(3,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(3)
-               pivot = 1.00d0 / lhs_(4,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) * pivot
-               lhs_(4,1,3) = lhs_(4,1,3) * pivot
-               lhs_(4,2,3) = lhs_(4,2,3) * pivot
-               lhs_(4,3,3) = lhs_(4,3,3) * pivot
-               lhs_(4,4,3) = lhs_(4,4,3) * pivot
-               lhs_(4,5,3) = lhs_(4,5,3) * pivot
-               rhs_(4) = rhs_(4) * pivot
-               coeff = lhs_(1,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(4,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(4,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(4,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(4,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(4,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(4,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(4)
-               coeff = lhs_(2,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(4,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(4,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(4,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(4,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(4,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(4,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(4)
-               coeff = lhs_(3,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(4,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(4,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(4,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(4,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(4,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(4,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(4)
-               coeff = lhs_(5,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(4,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(4,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(4,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(4,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(4,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(4,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(4)
-               pivot = 1.00d0 / lhs_(5,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) * pivot
-               lhs_(5,2,3) = lhs_(5,2,3) * pivot
-               lhs_(5,3,3) = lhs_(5,3,3) * pivot
-               lhs_(5,4,3) = lhs_(5,4,3) * pivot
-               lhs_(5,5,3) = lhs_(5,5,3) * pivot
-               rhs_(5) = rhs_(5) * pivot
-               coeff = lhs_(1,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(5,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(5,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(5,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(5,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(5,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(5)
-               coeff = lhs_(2,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(5,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(5,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(5,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(5,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(5,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(5)
-               coeff = lhs_(3,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(5,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(5,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(5,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(5,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(5,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(5)
-               coeff = lhs_(4,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(5,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(5,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(5,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(5,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(5,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(5)
-               do  i__0 = 1,5
-                  lhs__(i__0,1,i,j,k) = lhs_(i__0,1,3)
-                  lhs__(i__0,2,i,j,k) = lhs_(i__0,2,3)
-                  lhs__(i__0,3,i,j,k) = lhs_(i__0,3,3)
-                  lhs__(i__0,4,i,j,k) = lhs_(i__0,4,3)
-                  lhs__(i__0,5,i,j,k) = lhs_(i__0,5,3)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-                  u_(0,m) = u_(1,m)
-                  u_(1,m) = u_(2,m)
-               enddo  
-            enddo  
-
-!               else  ! ******************* else case *************************
-            do  n = 1,5
-               lhs_(1,n,1) = 0.0d0
-               lhs_(1,n,2) = 0.0d0
-               lhs_(1,n,3) = 0.0d0
-               lhs_(2,n,1) = 0.0d0
-               lhs_(2,n,2) = 0.0d0
-               lhs_(2,n,3) = 0.0d0
-               lhs_(3,n,1) = 0.0d0
-               lhs_(3,n,2) = 0.0d0
-               lhs_(3,n,3) = 0.0d0
-               lhs_(4,n,1) = 0.0d0
-               lhs_(4,n,2) = 0.0d0
-               lhs_(4,n,3) = 0.0d0
-               lhs_(5,n,1) = 0.0d0
-               lhs_(5,n,2) = 0.0d0
-               lhs_(5,n,3) = 0.0d0
-            enddo  
-            do  m = 1,5
-               lhs_(m,m,2) = 1.0d0
-            enddo  
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-            enddo  
-            do  i__0 = 1,5
-               rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i - 1,j,
-     &k) - lhs_(i__0,2,1) * rhs(2,i - 1,j,k) - lhs_(i__0,3,1) * rhs(3,i 
-     &- 1,j,k) - lhs_(i__0,4,1) * rhs(4,i - 1,j,k) - lhs_(i__0,5,1) * rh
-     &s(5,i - 1,j,k)
-            enddo  
-            do  j__1 = 1,5
-               lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,j__1,3
-     &) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1,3)
-               lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,j__1,3
-     &) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1,3)
-               lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,j__1,3
-     &) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1,3)
-               lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,j__1,3
-     &) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1,3)
-               lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,j__1,3
-     &) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1,3)
-            enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-            pivot__3 = 1.00d0 / lhs_(1,1,2)
-            lhs_(1,2,2) = lhs_(1,2,2) * pivot__3
-            lhs_(1,3,2) = lhs_(1,3,2) * pivot__3
-            lhs_(1,4,2) = lhs_(1,4,2) * pivot__3
-            lhs_(1,5,2) = lhs_(1,5,2) * pivot__3
-            rhs_(1) = rhs_(1) * pivot__3
-            coeff__2 = lhs_(2,1,2)
-            lhs_(2,2,2) = lhs_(2,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(3,1,2)
-            lhs_(3,2,2) = lhs_(3,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(4,1,2)
-            lhs_(4,2,2) = lhs_(4,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(5,1,2)
-            lhs_(5,2,2) = lhs_(5,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(1)
-            pivot__3 = 1.00d0 / lhs_(2,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) * pivot__3
-            lhs_(2,4,2) = lhs_(2,4,2) * pivot__3
-            lhs_(2,5,2) = lhs_(2,5,2) * pivot__3
-            rhs_(2) = rhs_(2) * pivot__3
-            coeff__2 = lhs_(1,2,2)
-            lhs_(1,3,2) = lhs_(1,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(3,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(4,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(5,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(2)
-            pivot__3 = 1.00d0 / lhs_(3,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) * pivot__3
-            lhs_(3,5,2) = lhs_(3,5,2) * pivot__3
-            rhs_(3) = rhs_(3) * pivot__3
-            coeff__2 = lhs_(1,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(2,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(4,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(5,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(3)
-            pivot__3 = 1.00d0 / lhs_(4,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) * pivot__3
-            rhs_(4) = rhs_(4) * pivot__3
-            coeff__2 = lhs_(1,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(2,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(3,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(5,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(4)
-            pivot__3 = 1.00d0 / lhs_(5,5,2)
-            rhs_(5) = rhs_(5) * pivot__3
-            coeff__2 = lhs_(1,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(2,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(3,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(4,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(5)
-
-!               endif
-            do  m = 1,5
-               rhs(m,i,j,k) = rhs_(m)
-            enddo  
-
-!            enddo  
-            do  i = problem_size - 2,0,(-(1))
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  m = 1,5
-                rhs_(m) = rhs_(m) - lhs__(m,1,i,j,k) * rhs(1,i + 1,j,k)
-                rhs_(m) = rhs_(m) - lhs__(m,2,i,j,k) * rhs(2,i + 1,j,k)
-                rhs_(m) = rhs_(m) - lhs__(m,3,i,j,k) * rhs(3,i + 1,j,k)
-                rhs_(m) = rhs_(m) - lhs__(m,4,i,j,k) * rhs(4,i + 1,j,k)
-                rhs_(m) = rhs_(m) - lhs__(m,5,i,j,k) * rhs(5,i + 1,j,k)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_block.fdv
deleted file mode 100644
index 5219404..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_block.fdv
+++ /dev/null
@@ -1,640 +0,0 @@
-!---------------------------------------------------------------------
-!     performs guaussian elimination on this cell.
-!     
-!     assumes that unpacking routines for non-first cells 
-!     preload C' and rhs' from previous cell.
-!     
-!     assumed send happens outside this routine, but that
-!     c'(IMAX) and rhs'(IMAX) will be sent to next cell
-!---------------------------------------------------------------------
-      subroutine x_solve ()
-
-      include 'header3d.h'      
-      double precision  pivot,coeff
-      integer  i__0,j__1
-      integer  m,n
-      double precision  coeff__2
-      double precision  pivot__3
-      double precision  lhs_(5,5,3),u_(0:3,5)
-      double precision  rhs_(5)
-      integer  i,j,k,isize,low_k,high_k,k1,maxBlK
-      isize = problem_size - 1
-      if(mod((problem_size - 2), BL) .eq. 0) then
-	      maxBlK = (problem_size - 2) / BL
-      else
-	      maxblK = (problem_size - 2) / BL + 1
-      endif
-!---------------------------------------------------------------------
-!     outer most do loops - sweeping in i direction
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     begin inner most do loop
-!     do all the elements of the cell unless last 
-!---------------------------------------------------------------------
-!, ACROSS(rhs(1:0,0:0,0:0,0:0),lhs__(1:0,0:0,0:0,0:0,0:0))
-!DVM$ region local(lhs__)
-!DVM$ PARALLEL (k1, j)  ON  rhs(*,*,j,k1),private(u_,i,rhs_,tmp1,tmp2,
-!DVM$&tmp3,t1,t2,t3,tm1,tm2,pivot,coeff, tm3,i__0,j__1,tmp11,
-!DVM$&tmp22,lhs_,m,n,coeff__2, pivot__3,low_k,high_k,k),
-!DVM$&cuda_block(32)
-      do  k1 = 1, maxblK
-         do  j = 1, problem_size - 2
-             low_k = (k1 - 1) * BL + 1
-             high_k = k1 * BL
-             if(high_k .gt. problem_size - 2) then
-			     high_k = problem_size - 2
-		     endif
-          do k = low_k, high_k
-            do  m = 1,5
-               u_(0,m) = u(m,0,j,k)
-               u_(1,m) = u(m,1,j,k)
-            enddo  
-            do  i = 1,isize - 1
-               do  m = 1,5
-                  u_(2,m) = u(m,i + 1,j,k)
-               enddo  
-
-!			   if(i .ne. isize) then
-               tmp1 = 1.0d+00 / u_(1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               t1 = 1.0d+00 / u_(0,1)
-               t2 = t1 * t1
-               t3 = t1 * t2
-               tm1 = 1.0d+00 / u_(2,1)
-               tm2 = tm1 * tm1
-               tm3 = tm1 * tm2
-               tmp11 = dt * tx1
-               tmp22 = dt * tx2
-               lhs_(1,1,1) = (-(tmp11)) * dx1
-               lhs_(1,2,1) = (-(tmp22))
-               lhs_(1,3,1) = 0.
-               lhs_(1,4,1) = 0.
-               lhs_(1,5,1) = 0.
-               lhs_(2,1,1) = (-(tmp22)) * ((-(u_(0,2) * t2 * u_(0,2))) +
-     & c2 * 0.50d+00 * (u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4) 
-     &* u_(0,4)) * t2) - tmp11 * ((-(con43)) * c3c4 * t2 * u_(0,2))
-               lhs_(2,2,1) = (-(tmp22)) * ((2.0d+00 - c2) * (u_(0,2) / u
-     &_(0,1))) - tmp11 * con43 * c3c4 * t1 - tmp11 * dx2
-               lhs_(2,3,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * t1))
-               lhs_(2,4,1) = (-(tmp22)) * ((-(c2)) * (u_(0,4) * t1))
-               lhs_(2,5,1) = (-(tmp22)) * c2
-               lhs_(3,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,3))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,3))
-               lhs_(3,2,1) = (-(tmp22)) * u_(0,3) * t1
-               lhs_(3,3,1) = (-(tmp22)) * u_(0,2) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dx3
-               lhs_(3,4,1) = 0.
-               lhs_(3,5,1) = 0.
-               lhs_(4,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,4))
-               lhs_(4,2,1) = (-(tmp22)) * u_(0,4) * t1
-               lhs_(4,3,1) = 0.
-               lhs_(4,4,1) = (-(tmp22)) * u_(0,2) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dx4
-               lhs_(4,5,1) = 0.
-               lhs_(5,1,1) = (-(tmp22)) * ((c2 * (u_(0,2) * u_(0,2) + u_
-     &(0,3) * u_(0,3) + u_(0,4) * u_(0,4)) * t2 - c1 * (u_(0,5) * t1)) *
-     & (u_(0,2) * t1)) - tmp11 * ((-(con43 * c3c4 - c1345)) * t3 * u_(0,
-     &2)** 2 - (c3c4 - c1345) * t3 * u_(0,3)** 2 - (c3c4 - c1345) * t3 *
-     & u_(0,4)** 2 - c1345 * t2 * u_(0,5))
-               lhs_(5,2,1) = (-(tmp22)) * (c1 * u_(0,5) * t1 - 0.50d+00 
-     &* c2 * (3.0d+00 * u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4) 
-     &* u_(0,4)) * t2) - tmp11 * ((con43 * c3c4 - c1345) * t2 * u_(0,2))
-               lhs_(5,3,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * u_(0,2))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,3)
-               lhs_(5,4,1) = (-(tmp22)) * ((-(c2)) * (u_(0,4) * u_(0,2))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,4)
-               lhs_(5,5,1) = (-(tmp22)) * c1 * (u_(0,2) * t1) - tmp11 * 
-     &c1345 * t1 - tmp11 * dx5
-               lhs_(1,1,2) = 1.0d+00 + tmp11 * 2.0d+00 * dx1
-               lhs_(1,2,2) = 0.
-               lhs_(1,3,2) = 0.
-               lhs_(1,4,2) = 0.
-               lhs_(1,5,2) = 0.
-               lhs_(2,1,2) = tmp11 * 2.0d+00 * ((-(con43)) * c3c4 * tmp2
-     & * u_(1,2))
-               lhs_(2,2,2) = 1.0d+00 + tmp11 * 2.0d+00 * con43 * c3c4 * 
-     &tmp1 + tmp11 * 2.0d+00 * dx2
-               lhs_(2,3,2) = 0.
-               lhs_(2,4,2) = 0.
-               lhs_(2,5,2) = 0.
-               lhs_(3,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &3))
-               lhs_(3,2,2) = 0.
-               lhs_(3,3,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dx3
-               lhs_(3,4,2) = 0.
-               lhs_(3,5,2) = 0.
-               lhs_(4,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &4))
-               lhs_(4,2,2) = 0.
-               lhs_(4,3,2) = 0.
-               lhs_(4,4,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dx4
-               lhs_(4,5,2) = tmp11 * 2.0d+00 * 0
-               lhs_(5,1,2) = tmp11 * 2.0d+00 * ((-(con43 * c3c4 - c1345)
-     &) * tmp3 * u_(1,2)** 2 - (c3c4 - c1345) * tmp3 * u_(1,3)** 2 - (c3
-     &c4 - c1345) * tmp3 * u_(1,4)** 2 - c1345 * tmp2 * u_(1,5))
-               lhs_(5,2,2) = tmp11 * 2.0d+00 * ((con43 * c3c4 - c1345) *
-     & tmp2 * u_(1,2))
-               lhs_(5,3,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,3)
-               lhs_(5,4,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,4)
-               lhs_(5,5,2) = 1.0d+00 + tmp11 * 2.0d+00 * c1345 * tmp1 + 
-     &tmp11 * 2.0d+00 * dx5
-               if (i .ne. 1) then
-                  do  j__1 = 1,5
-                     lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs
-     &_(1,j__1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,
-     &j__1,3) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs
-     &_(1,j__1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,
-     &j__1,3) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs
-     &_(1,j__1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,
-     &j__1,3) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs
-     &_(1,j__1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,
-     &j__1,3) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs
-     &_(1,j__1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,
-     &j__1,3) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1
-     &,3)
-                  enddo  
-               endif  
-               lhs_(1,1,3) = (-(tmp11)) * dx1
-               lhs_(1,2,3) = tmp22
-               lhs_(1,3,3) = 0.
-               lhs_(1,4,3) = 0.
-               lhs_(1,5,3) = 0.
-               lhs_(2,1,3) = tmp22 * ((-(u_(2,2) * tm2 * u_(2,2))) + c2 
-     &* 0.50d+00 * (u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u_
-     &(2,4)) * tm2) - tmp11 * ((-(con43)) * c3c4 * tm2 * u_(2,2))
-               lhs_(2,2,3) = tmp22 * ((2.0d+00 - c2) * (u_(2,2) / u_(2,1
-     &))) - tmp11 * con43 * c3c4 * tm1 - tmp11 * dx2
-               lhs_(2,3,3) = tmp22 * ((-(c2)) * (u_(2,3) * tm1))
-               lhs_(2,4,3) = tmp22 * ((-(c2)) * (u_(2,4) * tm1))
-               lhs_(2,5,3) = tmp22 * c2
-               lhs_(3,1,3) = tmp22 * ((-(u_(2,2) * u_(2,3))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,3))
-               lhs_(3,2,3) = tmp22 * u_(2,3) * tm1
-               lhs_(3,3,3) = tmp22 * u_(2,2) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dx3
-               lhs_(3,4,3) = 0.
-               lhs_(3,5,3) = 0.
-               lhs_(4,1,3) = tmp22 * ((-(u_(2,2) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,4))
-               lhs_(4,2,3) = tmp22 * u_(2,4) * tm1
-               lhs_(4,3,3) = 0.
-               lhs_(4,4,3) = tmp22 * u_(2,2) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dx4
-               lhs_(4,5,3) = 0.
-               lhs_(5,1,3) = tmp22 * ((c2 * (u_(2,2) * u_(2,2) + u_(2,3)
-     & * u_(2,3) + u_(2,4) * u_(2,4)) * tm2 - c1 * (u_(2,5) * tm1)) * (u
-     &_(2,2) * tm1)) - tmp11 * ((-(con43 * c3c4 - c1345)) * tm3 * u_(2,2
-     &)** 2 - (c3c4 - c1345) * tm3 * u_(2,3)** 2 - (c3c4 - c1345) * tm3 
-     &* u_(2,4)** 2 - c1345 * tm2 * u_(2,5))
-               lhs_(5,2,3) = tmp22 * (c1 * u_(2,5) * tm1 - 0.50d+00 * c2
-     & * (3.0d+00 * u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u_
-     &(2,4)) * tm2) - tmp11 * ((con43 * c3c4 - c1345) * tm2 * u_(2,2))
-               lhs_(5,3,3) = tmp22 * ((-(c2)) * (u_(2,3) * u_(2,2)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,3)
-               lhs_(5,4,3) = tmp22 * ((-(c2)) * (u_(2,4) * u_(2,2)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,4)
-               lhs_(5,5,3) = tmp22 * c1 * (u_(2,2) * tm1) - tmp11 * c134
-     &5 * tm1 - tmp11 * dx5
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  i__0 = 1,5
-                  rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i - 1
-     &,j,k) - lhs_(i__0,2,1) * rhs(2,i - 1,j,k) - lhs_(i__0,3,1) * rhs(3
-     &,i - 1,j,k) - lhs_(i__0,4,1) * rhs(4,i - 1,j,k) - lhs_(i__0,5,1) *
-     & rhs(5,i - 1,j,k)
-               enddo  
-               pivot = 1.00d0 / lhs_(1,1,2)
-               lhs_(1,2,2) = lhs_(1,2,2) * pivot
-               lhs_(1,3,2) = lhs_(1,3,2) * pivot
-               lhs_(1,4,2) = lhs_(1,4,2) * pivot
-               lhs_(1,5,2) = lhs_(1,5,2) * pivot
-               lhs_(1,1,3) = lhs_(1,1,3) * pivot
-               lhs_(1,2,3) = lhs_(1,2,3) * pivot
-               lhs_(1,3,3) = lhs_(1,3,3) * pivot
-               lhs_(1,4,3) = lhs_(1,4,3) * pivot
-               lhs_(1,5,3) = lhs_(1,5,3) * pivot
-               rhs_(1) = rhs_(1) * pivot
-               coeff = lhs_(2,1,2)
-               lhs_(2,2,2) = lhs_(2,2,2) - coeff * lhs_(1,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) - coeff * lhs_(1,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(1,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(1,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(1,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(1,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(1,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(1,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(1,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(1)
-               coeff = lhs_(3,1,2)
-               lhs_(3,2,2) = lhs_(3,2,2) - coeff * lhs_(1,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(1,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(1,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(1,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(1,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(1,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(1,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(1,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(1,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(1)
-               coeff = lhs_(4,1,2)
-               lhs_(4,2,2) = lhs_(4,2,2) - coeff * lhs_(1,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(1,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(1,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(1,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(1,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(1,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(1,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(1,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(1,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(1)
-               coeff = lhs_(5,1,2)
-               lhs_(5,2,2) = lhs_(5,2,2) - coeff * lhs_(1,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(1,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(1,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(1,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(1,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(1,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(1,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(1,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(1,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(1)
-               pivot = 1.00d0 / lhs_(2,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) * pivot
-               lhs_(2,4,2) = lhs_(2,4,2) * pivot
-               lhs_(2,5,2) = lhs_(2,5,2) * pivot
-               lhs_(2,1,3) = lhs_(2,1,3) * pivot
-               lhs_(2,2,3) = lhs_(2,2,3) * pivot
-               lhs_(2,3,3) = lhs_(2,3,3) * pivot
-               lhs_(2,4,3) = lhs_(2,4,3) * pivot
-               lhs_(2,5,3) = lhs_(2,5,3) * pivot
-               rhs_(2) = rhs_(2) * pivot
-               coeff = lhs_(1,2,2)
-               lhs_(1,3,2) = lhs_(1,3,2) - coeff * lhs_(2,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(2,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(2,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(2,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(2,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(2,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(2,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(2,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(2)
-               coeff = lhs_(3,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(2,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(2,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(2,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(2,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(2,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(2,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(2,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(2,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(2)
-               coeff = lhs_(4,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(2,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(2,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(2,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(2,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(2,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(2,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(2,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(2,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(2)
-               coeff = lhs_(5,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(2,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(2,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(2,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(2,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(2,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(2,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(2,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(2,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(2)
-               pivot = 1.00d0 / lhs_(3,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) * pivot
-               lhs_(3,5,2) = lhs_(3,5,2) * pivot
-               lhs_(3,1,3) = lhs_(3,1,3) * pivot
-               lhs_(3,2,3) = lhs_(3,2,3) * pivot
-               lhs_(3,3,3) = lhs_(3,3,3) * pivot
-               lhs_(3,4,3) = lhs_(3,4,3) * pivot
-               lhs_(3,5,3) = lhs_(3,5,3) * pivot
-               rhs_(3) = rhs_(3) * pivot
-               coeff = lhs_(1,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(3,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(3,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(3,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(3,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(3,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(3,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(3,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(3)
-               coeff = lhs_(2,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(3,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(3,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(3,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(3,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(3,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(3,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(3,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(3)
-               coeff = lhs_(4,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(3,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(3,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(3,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(3,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(3,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(3,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(3,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(3)
-               coeff = lhs_(5,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(3,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(3,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(3,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(3,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(3,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(3,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(3,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(3)
-               pivot = 1.00d0 / lhs_(4,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) * pivot
-               lhs_(4,1,3) = lhs_(4,1,3) * pivot
-               lhs_(4,2,3) = lhs_(4,2,3) * pivot
-               lhs_(4,3,3) = lhs_(4,3,3) * pivot
-               lhs_(4,4,3) = lhs_(4,4,3) * pivot
-               lhs_(4,5,3) = lhs_(4,5,3) * pivot
-               rhs_(4) = rhs_(4) * pivot
-               coeff = lhs_(1,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(4,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(4,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(4,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(4,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(4,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(4,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(4)
-               coeff = lhs_(2,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(4,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(4,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(4,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(4,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(4,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(4,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(4)
-               coeff = lhs_(3,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(4,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(4,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(4,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(4,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(4,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(4,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(4)
-               coeff = lhs_(5,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(4,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(4,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(4,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(4,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(4,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(4,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(4)
-               pivot = 1.00d0 / lhs_(5,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) * pivot
-               lhs_(5,2,3) = lhs_(5,2,3) * pivot
-               lhs_(5,3,3) = lhs_(5,3,3) * pivot
-               lhs_(5,4,3) = lhs_(5,4,3) * pivot
-               lhs_(5,5,3) = lhs_(5,5,3) * pivot
-               rhs_(5) = rhs_(5) * pivot
-               coeff = lhs_(1,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(5,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(5,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(5,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(5,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(5,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(5)
-               coeff = lhs_(2,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(5,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(5,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(5,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(5,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(5,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(5)
-               coeff = lhs_(3,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(5,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(5,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(5,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(5,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(5,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(5)
-               coeff = lhs_(4,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(5,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(5,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(5,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(5,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(5,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(5)
-               do  i__0 = 1,5
-                  lhs__(i__0,1,i,j,k1) = lhs_(i__0,1,3)
-                  lhs__(i__0,2,i,j,k1) = lhs_(i__0,2,3)
-                  lhs__(i__0,3,i,j,k1) = lhs_(i__0,3,3)
-                  lhs__(i__0,4,i,j,k1) = lhs_(i__0,4,3)
-                  lhs__(i__0,5,i,j,k1) = lhs_(i__0,5,3)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-                  u_(0,m) = u_(1,m)
-                  u_(1,m) = u_(2,m)
-               enddo  
-            enddo  
-
-!               else  ! ******************* else case *************************
-            do  n = 1,5
-               lhs_(1,n,1) = 0.0d0
-               lhs_(1,n,2) = 0.0d0
-               lhs_(1,n,3) = 0.0d0
-               lhs_(2,n,1) = 0.0d0
-               lhs_(2,n,2) = 0.0d0
-               lhs_(2,n,3) = 0.0d0
-               lhs_(3,n,1) = 0.0d0
-               lhs_(3,n,2) = 0.0d0
-               lhs_(3,n,3) = 0.0d0
-               lhs_(4,n,1) = 0.0d0
-               lhs_(4,n,2) = 0.0d0
-               lhs_(4,n,3) = 0.0d0
-               lhs_(5,n,1) = 0.0d0
-               lhs_(5,n,2) = 0.0d0
-               lhs_(5,n,3) = 0.0d0
-            enddo  
-            do  m = 1,5
-               lhs_(m,m,2) = 1.0d0
-            enddo  
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-            enddo  
-            do  i__0 = 1,5
-               rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i - 1,j,
-     &k) - lhs_(i__0,2,1) * rhs(2,i - 1,j,k) - lhs_(i__0,3,1) * rhs(3,i 
-     &- 1,j,k) - lhs_(i__0,4,1) * rhs(4,i - 1,j,k) - lhs_(i__0,5,1) * rh
-     &s(5,i - 1,j,k)
-            enddo  
-            do  j__1 = 1,5
-               lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,j__1,3
-     &) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1,3)
-               lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,j__1,3
-     &) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1,3)
-               lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,j__1,3
-     &) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1,3)
-               lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,j__1,3
-     &) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1,3)
-               lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,j__1,3
-     &) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1,3)
-            enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-            pivot__3 = 1.00d0 / lhs_(1,1,2)
-            lhs_(1,2,2) = lhs_(1,2,2) * pivot__3
-            lhs_(1,3,2) = lhs_(1,3,2) * pivot__3
-            lhs_(1,4,2) = lhs_(1,4,2) * pivot__3
-            lhs_(1,5,2) = lhs_(1,5,2) * pivot__3
-            rhs_(1) = rhs_(1) * pivot__3
-            coeff__2 = lhs_(2,1,2)
-            lhs_(2,2,2) = lhs_(2,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(3,1,2)
-            lhs_(3,2,2) = lhs_(3,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(4,1,2)
-            lhs_(4,2,2) = lhs_(4,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(5,1,2)
-            lhs_(5,2,2) = lhs_(5,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(1)
-            pivot__3 = 1.00d0 / lhs_(2,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) * pivot__3
-            lhs_(2,4,2) = lhs_(2,4,2) * pivot__3
-            lhs_(2,5,2) = lhs_(2,5,2) * pivot__3
-            rhs_(2) = rhs_(2) * pivot__3
-            coeff__2 = lhs_(1,2,2)
-            lhs_(1,3,2) = lhs_(1,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(3,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(4,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(5,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(2)
-            pivot__3 = 1.00d0 / lhs_(3,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) * pivot__3
-            lhs_(3,5,2) = lhs_(3,5,2) * pivot__3
-            rhs_(3) = rhs_(3) * pivot__3
-            coeff__2 = lhs_(1,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(2,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(4,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(5,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(3)
-            pivot__3 = 1.00d0 / lhs_(4,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) * pivot__3
-            rhs_(4) = rhs_(4) * pivot__3
-            coeff__2 = lhs_(1,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(2,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(3,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(5,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(4)
-            pivot__3 = 1.00d0 / lhs_(5,5,2)
-            rhs_(5) = rhs_(5) * pivot__3
-            coeff__2 = lhs_(1,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(2,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(3,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(4,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(5)
-
-!               endif
-            do  m = 1,5
-               rhs(m,i,j,k) = rhs_(m)
-            enddo  
-
-!            enddo  
-            do  i = problem_size - 2,0,(-(1))
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  m = 1,5
-                rhs_(m) = rhs_(m) - lhs__(m,1,i,j,k1) * rhs(1,i + 1,j,k)
-                rhs_(m) = rhs_(m) - lhs__(m,2,i,j,k1) * rhs(2,i + 1,j,k)
-                rhs_(m) = rhs_(m) - lhs__(m,3,i,j,k1) * rhs(3,i + 1,j,k)
-                rhs_(m) = rhs_(m) - lhs__(m,4,i,j,k1) * rhs(4,i + 1,j,k)
-                rhs_(m) = rhs_(m) - lhs__(m,5,i,j,k1) * rhs(5,i + 1,j,k)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-               enddo  
-            enddo  
-			
-          enddo	
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_mpi.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_mpi.fdv
deleted file mode 100644
index 4665bbd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/x_solve_mpi.fdv
+++ /dev/null
@@ -1,640 +0,0 @@
-!---------------------------------------------------------------------
-!     performs guaussian elimination on this cell.
-!     
-!     assumes that unpacking routines for non-first cells 
-!     preload C' and rhs' from previous cell.
-!     
-!     assumed send happens outside this routine, but that
-!     c'(IMAX) and rhs'(IMAX) will be sent to next cell
-!---------------------------------------------------------------------
-      subroutine x_solve ()
-
-      include 'header3d.h'
-      double precision  pivot,coeff
-      integer  i__0,j__1
-      integer  m,n
-      double precision  coeff__2
-      double precision  pivot__3
-      double precision  lhs_(5,5,3),u_(0:3,5)
-      double precision  rhs_(5),rhsp_(5)
-      integer  i,j,k,isize
-      isize = problem_size - 1
-
-!---------------------------------------------------------------------
-!     outer most do loops - sweeping in i direction
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     begin inner most do loop
-!     do all the elements of the cell unless last 
-!---------------------------------------------------------------------
-
-!DVM$ region local(lhs__)
-!DVM$ PARALLEL (k,j,i)  ON  rhs(*,i,j,k),private(u_,rhs_,tmp1,tmp2,
-!DVM$&tmp3,t1,t2,t3,tm1,tm2,pivot,coeff, tm3,i__0,j__1,tmp11,
-!DVM$&tmp22,lhs_,m,n,coeff__2, pivot__3),stage(stage_n),
-!DVM$& ACROSS(rhs(0:0,1:0,0:0,0:0),lhs__(0:0,0:0,1:0,0:0,0:0))
-      do  k = 1,problem_size - 2
-        do  j = 1,problem_size - 2
-          do  i = 1,isize - 1
-			   if(i .ne. isize) then			   
-               do  m = 1,5
-                  lhs_(m,1,3) = lhs__(m,1,i-1,j,k)
-                  lhs_(m,2,3) = lhs__(m,2,i-1,j,k)
-                  lhs_(m,3,3) = lhs__(m,3,i-1,j,k)
-                  lhs_(m,4,3) = lhs__(m,4,i-1,j,k)
-                  lhs_(m,5,3) = lhs__(m,5,i-1,j,k)
-               
-			      u_(0,m) = u(m,i-1,j,k)
-                  u_(1,m) = u(m,i,j,k)
-                  u_(2,m) = u(m,i+1,j,k)
-               enddo
-			   
-               tmp1 = 1.0d+00 / u_(1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               t1 = 1.0d+00 / u_(0,1)
-               t2 = t1 * t1
-               t3 = t1 * t2
-               tm1 = 1.0d+00 / u_(2,1)
-               tm2 = tm1 * tm1
-               tm3 = tm1 * tm2
-               tmp11 = dt * tx1
-               tmp22 = dt * tx2
-               lhs_(1,1,1) = (-(tmp11)) * dx1
-               lhs_(1,2,1) = (-(tmp22))
-               lhs_(1,3,1) = 0.
-               lhs_(1,4,1) = 0.
-               lhs_(1,5,1) = 0.
-               lhs_(2,1,1) = (-(tmp22)) * ((-(u_(0,2) * t2 * u_(0,2))) +
-     & c2 * 0.50d+00 * (u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4) 
-     &* u_(0,4)) * t2) - tmp11 * ((-(con43)) * c3c4 * t2 * u_(0,2))
-               lhs_(2,2,1) = (-(tmp22)) * ((2.0d+00 - c2) * (u_(0,2) / u
-     &_(0,1))) - tmp11 * con43 * c3c4 * t1 - tmp11 * dx2
-               lhs_(2,3,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * t1))
-               lhs_(2,4,1) = (-(tmp22)) * ((-(c2)) * (u_(0,4) * t1))
-               lhs_(2,5,1) = (-(tmp22)) * c2
-               lhs_(3,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,3))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,3))
-               lhs_(3,2,1) = (-(tmp22)) * u_(0,3) * t1
-               lhs_(3,3,1) = (-(tmp22)) * u_(0,2) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dx3
-               lhs_(3,4,1) = 0.
-               lhs_(3,5,1) = 0.
-               lhs_(4,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,4))
-               lhs_(4,2,1) = (-(tmp22)) * u_(0,4) * t1
-               lhs_(4,3,1) = 0.
-               lhs_(4,4,1) = (-(tmp22)) * u_(0,2) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dx4
-               lhs_(4,5,1) = 0.
-               lhs_(5,1,1) = (-(tmp22)) * ((c2 * (u_(0,2) * u_(0,2) + u_
-     &(0,3) * u_(0,3) + u_(0,4) * u_(0,4)) * t2 - c1 * (u_(0,5) * t1)) *
-     & (u_(0,2) * t1)) - tmp11 * ((-(con43 * c3c4 - c1345)) * t3 * u_(0,
-     &2)** 2 - (c3c4 - c1345) * t3 * u_(0,3)** 2 - (c3c4 - c1345) * t3 *
-     & u_(0,4)** 2 - c1345 * t2 * u_(0,5))
-               lhs_(5,2,1) = (-(tmp22)) * (c1 * u_(0,5) * t1 - 0.50d+00 
-     &* c2 * (3.0d+00 * u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4) 
-     &* u_(0,4)) * t2) - tmp11 * ((con43 * c3c4 - c1345) * t2 * u_(0,2))
-               lhs_(5,3,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * u_(0,2))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,3)
-               lhs_(5,4,1) = (-(tmp22)) * ((-(c2)) * (u_(0,4) * u_(0,2))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,4)
-               lhs_(5,5,1) = (-(tmp22)) * c1 * (u_(0,2) * t1) - tmp11 * 
-     &c1345 * t1 - tmp11 * dx5
-               lhs_(1,1,2) = 1.0d+00 + tmp11 * 2.0d+00 * dx1
-               lhs_(1,2,2) = 0.
-               lhs_(1,3,2) = 0.
-               lhs_(1,4,2) = 0.
-               lhs_(1,5,2) = 0.
-               lhs_(2,1,2) = tmp11 * 2.0d+00 * ((-(con43)) * c3c4 * tmp2
-     & * u_(1,2))
-               lhs_(2,2,2) = 1.0d+00 + tmp11 * 2.0d+00 * con43 * c3c4 * 
-     &tmp1 + tmp11 * 2.0d+00 * dx2
-               lhs_(2,3,2) = 0.
-               lhs_(2,4,2) = 0.
-               lhs_(2,5,2) = 0.
-               lhs_(3,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &3))
-               lhs_(3,2,2) = 0.
-               lhs_(3,3,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dx3
-               lhs_(3,4,2) = 0.
-               lhs_(3,5,2) = 0.
-               lhs_(4,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &4))
-               lhs_(4,2,2) = 0.
-               lhs_(4,3,2) = 0.
-               lhs_(4,4,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dx4
-               lhs_(4,5,2) = tmp11 * 2.0d+00 * 0
-               lhs_(5,1,2) = tmp11 * 2.0d+00 * ((-(con43 * c3c4 - c1345)
-     &) * tmp3 * u_(1,2)** 2 - (c3c4 - c1345) * tmp3 * u_(1,3)** 2 - (c3
-     &c4 - c1345) * tmp3 * u_(1,4)** 2 - c1345 * tmp2 * u_(1,5))
-               lhs_(5,2,2) = tmp11 * 2.0d+00 * ((con43 * c3c4 - c1345) *
-     & tmp2 * u_(1,2))
-               lhs_(5,3,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,3)
-               lhs_(5,4,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,4)
-               lhs_(5,5,2) = 1.0d+00 + tmp11 * 2.0d+00 * c1345 * tmp1 + 
-     &tmp11 * 2.0d+00 * dx5
-               if (i .ne. 1) then
-                  do  j__1 = 1,5
-                     lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs
-     &_(1,j__1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,
-     &j__1,3) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs
-     &_(1,j__1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,
-     &j__1,3) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs
-     &_(1,j__1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,
-     &j__1,3) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs
-     &_(1,j__1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,
-     &j__1,3) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs
-     &_(1,j__1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,
-     &j__1,3) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1
-     &,3)
-                  enddo  
-               endif  
-               lhs_(1,1,3) = (-(tmp11)) * dx1
-               lhs_(1,2,3) = tmp22
-               lhs_(1,3,3) = 0.
-               lhs_(1,4,3) = 0.
-               lhs_(1,5,3) = 0.
-               lhs_(2,1,3) = tmp22 * ((-(u_(2,2) * tm2 * u_(2,2))) + c2 
-     &* 0.50d+00 * (u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u_
-     &(2,4)) * tm2) - tmp11 * ((-(con43)) * c3c4 * tm2 * u_(2,2))
-               lhs_(2,2,3) = tmp22 * ((2.0d+00 - c2) * (u_(2,2) / u_(2,1
-     &))) - tmp11 * con43 * c3c4 * tm1 - tmp11 * dx2
-               lhs_(2,3,3) = tmp22 * ((-(c2)) * (u_(2,3) * tm1))
-               lhs_(2,4,3) = tmp22 * ((-(c2)) * (u_(2,4) * tm1))
-               lhs_(2,5,3) = tmp22 * c2
-               lhs_(3,1,3) = tmp22 * ((-(u_(2,2) * u_(2,3))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,3))
-               lhs_(3,2,3) = tmp22 * u_(2,3) * tm1
-               lhs_(3,3,3) = tmp22 * u_(2,2) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dx3
-               lhs_(3,4,3) = 0.
-               lhs_(3,5,3) = 0.
-               lhs_(4,1,3) = tmp22 * ((-(u_(2,2) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,4))
-               lhs_(4,2,3) = tmp22 * u_(2,4) * tm1
-               lhs_(4,3,3) = 0.
-               lhs_(4,4,3) = tmp22 * u_(2,2) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dx4
-               lhs_(4,5,3) = 0.
-               lhs_(5,1,3) = tmp22 * ((c2 * (u_(2,2) * u_(2,2) + u_(2,3)
-     & * u_(2,3) + u_(2,4) * u_(2,4)) * tm2 - c1 * (u_(2,5) * tm1)) * (u
-     &_(2,2) * tm1)) - tmp11 * ((-(con43 * c3c4 - c1345)) * tm3 * u_(2,2
-     &)** 2 - (c3c4 - c1345) * tm3 * u_(2,3)** 2 - (c3c4 - c1345) * tm3 
-     &* u_(2,4)** 2 - c1345 * tm2 * u_(2,5))
-               lhs_(5,2,3) = tmp22 * (c1 * u_(2,5) * tm1 - 0.50d+00 * c2
-     & * (3.0d+00 * u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u_
-     &(2,4)) * tm2) - tmp11 * ((con43 * c3c4 - c1345) * tm2 * u_(2,2))
-               lhs_(5,3,3) = tmp22 * ((-(c2)) * (u_(2,3) * u_(2,2)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,3)
-               lhs_(5,4,3) = tmp22 * ((-(c2)) * (u_(2,4) * u_(2,2)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,4)
-               lhs_(5,5,3) = tmp22 * c1 * (u_(2,2) * tm1) - tmp11 * c134
-     &5 * tm1 - tmp11 * dx5
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  i__0 = 1,5
-                  rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i - 1
-     &,j,k) - lhs_(i__0,2,1) * rhs(2,i - 1,j,k) - lhs_(i__0,3,1) * rhs(3
-     &,i - 1,j,k) - lhs_(i__0,4,1) * rhs(4,i - 1,j,k) - lhs_(i__0,5,1) *
-     & rhs(5,i - 1,j,k)
-               enddo  
-               pivot = 1.00d0 / lhs_(1,1,2)
-               lhs_(1,2,2) = lhs_(1,2,2) * pivot
-               lhs_(1,3,2) = lhs_(1,3,2) * pivot
-               lhs_(1,4,2) = lhs_(1,4,2) * pivot
-               lhs_(1,5,2) = lhs_(1,5,2) * pivot
-               lhs_(1,1,3) = lhs_(1,1,3) * pivot
-               lhs_(1,2,3) = lhs_(1,2,3) * pivot
-               lhs_(1,3,3) = lhs_(1,3,3) * pivot
-               lhs_(1,4,3) = lhs_(1,4,3) * pivot
-               lhs_(1,5,3) = lhs_(1,5,3) * pivot
-               rhs_(1) = rhs_(1) * pivot
-               coeff = lhs_(2,1,2)
-               lhs_(2,2,2) = lhs_(2,2,2) - coeff * lhs_(1,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) - coeff * lhs_(1,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(1,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(1,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(1,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(1,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(1,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(1,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(1,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(1)
-               coeff = lhs_(3,1,2)
-               lhs_(3,2,2) = lhs_(3,2,2) - coeff * lhs_(1,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(1,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(1,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(1,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(1,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(1,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(1,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(1,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(1,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(1)
-               coeff = lhs_(4,1,2)
-               lhs_(4,2,2) = lhs_(4,2,2) - coeff * lhs_(1,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(1,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(1,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(1,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(1,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(1,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(1,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(1,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(1,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(1)
-               coeff = lhs_(5,1,2)
-               lhs_(5,2,2) = lhs_(5,2,2) - coeff * lhs_(1,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(1,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(1,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(1,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(1,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(1,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(1,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(1,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(1,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(1)
-               pivot = 1.00d0 / lhs_(2,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) * pivot
-               lhs_(2,4,2) = lhs_(2,4,2) * pivot
-               lhs_(2,5,2) = lhs_(2,5,2) * pivot
-               lhs_(2,1,3) = lhs_(2,1,3) * pivot
-               lhs_(2,2,3) = lhs_(2,2,3) * pivot
-               lhs_(2,3,3) = lhs_(2,3,3) * pivot
-               lhs_(2,4,3) = lhs_(2,4,3) * pivot
-               lhs_(2,5,3) = lhs_(2,5,3) * pivot
-               rhs_(2) = rhs_(2) * pivot
-               coeff = lhs_(1,2,2)
-               lhs_(1,3,2) = lhs_(1,3,2) - coeff * lhs_(2,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(2,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(2,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(2,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(2,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(2,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(2,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(2,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(2)
-               coeff = lhs_(3,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(2,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(2,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(2,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(2,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(2,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(2,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(2,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(2,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(2)
-               coeff = lhs_(4,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(2,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(2,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(2,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(2,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(2,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(2,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(2,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(2,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(2)
-               coeff = lhs_(5,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(2,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(2,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(2,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(2,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(2,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(2,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(2,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(2,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(2)
-               pivot = 1.00d0 / lhs_(3,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) * pivot
-               lhs_(3,5,2) = lhs_(3,5,2) * pivot
-               lhs_(3,1,3) = lhs_(3,1,3) * pivot
-               lhs_(3,2,3) = lhs_(3,2,3) * pivot
-               lhs_(3,3,3) = lhs_(3,3,3) * pivot
-               lhs_(3,4,3) = lhs_(3,4,3) * pivot
-               lhs_(3,5,3) = lhs_(3,5,3) * pivot
-               rhs_(3) = rhs_(3) * pivot
-               coeff = lhs_(1,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(3,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(3,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(3,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(3,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(3,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(3,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(3,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(3)
-               coeff = lhs_(2,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(3,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(3,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(3,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(3,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(3,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(3,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(3,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(3)
-               coeff = lhs_(4,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(3,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(3,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(3,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(3,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(3,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(3,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(3,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(3)
-               coeff = lhs_(5,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(3,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(3,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(3,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(3,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(3,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(3,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(3,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(3)
-               pivot = 1.00d0 / lhs_(4,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) * pivot
-               lhs_(4,1,3) = lhs_(4,1,3) * pivot
-               lhs_(4,2,3) = lhs_(4,2,3) * pivot
-               lhs_(4,3,3) = lhs_(4,3,3) * pivot
-               lhs_(4,4,3) = lhs_(4,4,3) * pivot
-               lhs_(4,5,3) = lhs_(4,5,3) * pivot
-               rhs_(4) = rhs_(4) * pivot
-               coeff = lhs_(1,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(4,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(4,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(4,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(4,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(4,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(4,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(4)
-               coeff = lhs_(2,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(4,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(4,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(4,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(4,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(4,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(4,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(4)
-               coeff = lhs_(3,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(4,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(4,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(4,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(4,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(4,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(4,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(4)
-               coeff = lhs_(5,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(4,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(4,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(4,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(4,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(4,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(4,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(4)
-               pivot = 1.00d0 / lhs_(5,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) * pivot
-               lhs_(5,2,3) = lhs_(5,2,3) * pivot
-               lhs_(5,3,3) = lhs_(5,3,3) * pivot
-               lhs_(5,4,3) = lhs_(5,4,3) * pivot
-               lhs_(5,5,3) = lhs_(5,5,3) * pivot
-               rhs_(5) = rhs_(5) * pivot
-               coeff = lhs_(1,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(5,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(5,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(5,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(5,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(5,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(5)
-               coeff = lhs_(2,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(5,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(5,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(5,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(5,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(5,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(5)
-               coeff = lhs_(3,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(5,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(5,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(5,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(5,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(5,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(5)
-               coeff = lhs_(4,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(5,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(5,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(5,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(5,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(5,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(5)
-               do  i__0 = 1,5
-                  lhs__(i__0,1,i,j,k) = lhs_(i__0,1,3)
-                  lhs__(i__0,2,i,j,k) = lhs_(i__0,2,3)
-                  lhs__(i__0,3,i,j,k) = lhs_(i__0,3,3)
-                  lhs__(i__0,4,i,j,k) = lhs_(i__0,4,3)
-                  lhs__(i__0,5,i,j,k) = lhs_(i__0,5,3)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-               enddo  
-!            enddo  
-
-               else  ! ******************* else case *************************
-            do  n = 1,5
-               lhs_(1,n,1) = 0.0d0
-               lhs_(1,n,2) = 0.0d0
-               lhs_(1,n,3) = 0.0d0
-               lhs_(2,n,1) = 0.0d0
-               lhs_(2,n,2) = 0.0d0
-               lhs_(2,n,3) = 0.0d0
-               lhs_(3,n,1) = 0.0d0
-               lhs_(3,n,2) = 0.0d0
-               lhs_(3,n,3) = 0.0d0
-               lhs_(4,n,1) = 0.0d0
-               lhs_(4,n,2) = 0.0d0
-               lhs_(4,n,3) = 0.0d0
-               lhs_(5,n,1) = 0.0d0
-               lhs_(5,n,2) = 0.0d0
-               lhs_(5,n,3) = 0.0d0
-            enddo  
-            do  m = 1,5
-               lhs_(m,m,2) = 1.0d0
-            enddo  
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-            enddo  
-            do  i__0 = 1,5
-               rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i - 1,j,
-     &k) - lhs_(i__0,2,1) * rhs(2,i - 1,j,k) - lhs_(i__0,3,1) * rhs(3,i 
-     &- 1,j,k) - lhs_(i__0,4,1) * rhs(4,i - 1,j,k) - lhs_(i__0,5,1) * rh
-     &s(5,i - 1,j,k)
-            enddo  
-            do  j__1 = 1,5
-               lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,j__1,3
-     &) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1,3)
-               lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,j__1,3
-     &) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1,3)
-               lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,j__1,3
-     &) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1,3)
-               lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,j__1,3
-     &) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1,3)
-               lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,j__1,3
-     &) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1,3)
-            enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-            pivot__3 = 1.00d0 / lhs_(1,1,2)
-            lhs_(1,2,2) = lhs_(1,2,2) * pivot__3
-            lhs_(1,3,2) = lhs_(1,3,2) * pivot__3
-            lhs_(1,4,2) = lhs_(1,4,2) * pivot__3
-            lhs_(1,5,2) = lhs_(1,5,2) * pivot__3
-            rhs_(1) = rhs_(1) * pivot__3
-            coeff__2 = lhs_(2,1,2)
-            lhs_(2,2,2) = lhs_(2,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(3,1,2)
-            lhs_(3,2,2) = lhs_(3,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(4,1,2)
-            lhs_(4,2,2) = lhs_(4,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(5,1,2)
-            lhs_(5,2,2) = lhs_(5,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(1)
-            pivot__3 = 1.00d0 / lhs_(2,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) * pivot__3
-            lhs_(2,4,2) = lhs_(2,4,2) * pivot__3
-            lhs_(2,5,2) = lhs_(2,5,2) * pivot__3
-            rhs_(2) = rhs_(2) * pivot__3
-            coeff__2 = lhs_(1,2,2)
-            lhs_(1,3,2) = lhs_(1,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(3,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(4,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(5,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(2)
-            pivot__3 = 1.00d0 / lhs_(3,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) * pivot__3
-            lhs_(3,5,2) = lhs_(3,5,2) * pivot__3
-            rhs_(3) = rhs_(3) * pivot__3
-            coeff__2 = lhs_(1,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(2,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(4,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(5,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(3)
-            pivot__3 = 1.00d0 / lhs_(4,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) * pivot__3
-            rhs_(4) = rhs_(4) * pivot__3
-            coeff__2 = lhs_(1,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(2,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(3,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(5,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(4)
-            pivot__3 = 1.00d0 / lhs_(5,5,2)
-            rhs_(5) = rhs_(5) * pivot__3
-            coeff__2 = lhs_(1,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(2,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(3,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(4,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(5)
-
-               endif
-            do  m = 1,5
-               rhs(m,i,j,k) = rhs_(m)
-            enddo  
-			
-            enddo  
-         enddo  
-      enddo 
-	  
-!            enddo  
-
-!DVM$ PARALLEL (k,j,i)  ON  rhs(*,i,j,k),private(m,rhsp_,rhs_),
-!DVM$& ACROSS(rhs(0:0,0:1,0:0,0:0)),stage(stage_n)
-      do  k = 1,problem_size - 2
-        do  j = 1,problem_size - 2
-            do  i = problem_size - 2,0,(-(1))
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-				  rhsp_(m) = rhs(m,i+1,j,k)
-               enddo  
-               do  m = 1,5
-                rhs_(m) = rhs_(m) - lhs__(m,1,i,j,k) * rhsp_(1)
-                rhs_(m) = rhs_(m) - lhs__(m,2,i,j,k) * rhsp_(2)
-                rhs_(m) = rhs_(m) - lhs__(m,3,i,j,k) * rhsp_(3)
-                rhs_(m) = rhs_(m) - lhs__(m,4,i,j,k) * rhsp_(4)
-                rhs_(m) = rhs_(m) - lhs__(m,5,i,j,k) * rhsp_(5)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve.fdv
deleted file mode 100644
index 5bd0f87..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve.fdv
+++ /dev/null
@@ -1,622 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     performs guaussian elimination on this cell.
-!     
-!     assumes that unpacking routines for non-first cells 
-!     preload C' and rhs' from previous cell.
-!     
-!     assumed send happens outside this routine, but that
-!     c'(JMAX) and rhs'(JMAX) will be sent to next cell
-!---------------------------------------------------------------------
-      subroutine y_solve ()
-
-      include 'header3d.h'
-      double precision  coeff
-      double precision  pivot
-      integer  i__0
-      integer  j__1,m,n
-      double precision  coeff__2
-      double precision  pivot__3
-      double precision  lhs_(5,5,3),rhs_(5),u_(0:3,5)
-      integer  i,j,k,jsize,jstart
-      jstart = 0
-      jsize = problem_size - 1
-
-!ACROSS (rhs(0:0,1:0,0:0,0:0),lhs__(0:0,1:0,0:0,0:0,0:0))
-!DVM$ region local(lhs__)
-!DVM$ PARALLEL (k,i) ON  rhs(*,i,*,k), private(u_,j,rhs_,pivot, 
-!DVM$&coeff,tmp1, tmp2, tmp3, t1, t2, t3, tm1, tm2, tm3, tmp11, 
-!DVM$&tmp22, i__0, j__1,lhs_,coeff__2,pivot__3,m,n)
-      do  k = 1,problem_size - 2
-         do  i = 1,problem_size - 2
-            do  m = 1,5
-               u_(0,m) = u(m,i,0,k)
-               u_(1,m) = u(m,i,1,k)
-            enddo  
-            do  j = 1,jsize - 1
-               do  m = 1,5
-                  u_(2,m) = u(m,i,j + 1,k)
-               enddo  
-
-!             if(j .ne. jsize) then
-               tmp1 = 1.0d+00 / u_(1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               t1 = 1.0d+00 / u_(0,1)
-               t2 = t1 * t1
-               t3 = t1 * t2
-               tm1 = 1.0d+00 / u_(2,1)
-               tm2 = tm1 * tm1
-               tm3 = tm1 * tm2
-               tmp11 = dt * ty1
-               tmp22 = dt * ty2
-               lhs_(1,1,1) = (-(tmp11)) * dy1
-               lhs_(1,2,1) = 0.
-               lhs_(1,3,1) = (-(tmp22))
-               lhs_(1,4,1) = 0.
-               lhs_(1,5,1) = 0.
-               lhs_(2,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,3))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,2))
-               lhs_(2,2,1) = (-(tmp22)) * u_(0,3) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dy2
-               lhs_(2,3,1) = (-(tmp22)) * u_(0,2) * t1
-               lhs_(2,4,1) = 0.
-               lhs_(2,5,1) = 0.
-               lhs_(3,1,1) = (-(tmp22)) * ((-(u_(0,3) * u_(0,3) * t2)) +
-     & 0.50d+00 * c2 * ((u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4)
-     & * u_(0,4)) * t2)) - tmp11 * ((-(con43)) * c3c4 * t2 * u_(0,3))
-               lhs_(3,2,1) = (-(tmp22)) * ((-(c2)) * u_(0,2) * t1)
-               lhs_(3,3,1) = (-(tmp22)) * ((2.0d+00 - c2) * u_(0,3) * t1
-     &) - tmp11 * con43 * c3c4 * t1 - tmp11 * dy3
-               lhs_(3,4,1) = (-(tmp22)) * ((-(c2)) * u_(0,4) * t1)
-               lhs_(3,5,1) = (-(tmp22)) * c2
-               lhs_(4,1,1) = (-(tmp22)) * ((-(u_(0,3) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,4))
-               lhs_(4,2,1) = 0.
-               lhs_(4,3,1) = (-(tmp22)) * u_(0,4) * t1
-               lhs_(4,4,1) = (-(tmp22)) * u_(0,3) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dy4
-               lhs_(4,5,1) = 0.
-               lhs_(5,1,1) = (-(tmp22)) * ((c2 * (u_(0,2) * u_(0,2) + u_
-     &(0,3) * u_(0,3) + u_(0,4) * u_(0,4)) * t2 - c1 * u_(0,5) * t1) * u
-     &_(0,3) * t1) - tmp11 * ((-(c3c4 - c1345)) * t3 * u_(0,2)** 2 - (co
-     &n43 * c3c4 - c1345) * t3 * u_(0,3)** 2 - (c3c4 - c1345) * t3 * u_(
-     &0,4)** 2 - c1345 * t2 * u_(0,5))
-               lhs_(5,2,1) = (-(tmp22)) * ((-(c2)) * u_(0,2) * u_(0,3) *
-     & t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,2)
-               lhs_(5,3,1) = (-(tmp22)) * (c1 * u_(0,5) * t1 - 0.50d+00 
-     &* c2 * ((u_(0,2) * u_(0,2) + 3.0d+00 * u_(0,3) * u_(0,3) + u_(0,4)
-     & * u_(0,4)) * t2)) - tmp11 * (con43 * c3c4 - c1345) * t2 * u_(0,3)
-               lhs_(5,4,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * u_(0,4))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,4)
-               lhs_(5,5,1) = (-(tmp22)) * c1 * u_(0,3) * t1 - tmp11 * c1
-     &345 * t1 - tmp11 * dy5
-               lhs_(1,1,2) = 1.0d+00 + tmp11 * 2.0d+00 * dy1
-               lhs_(1,2,2) = 0.
-               lhs_(1,3,2) = 0.
-               lhs_(1,4,2) = 0.
-               lhs_(1,5,2) = 0.
-               lhs_(2,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &2))
-               lhs_(2,2,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dy2
-               lhs_(2,3,2) = 0.
-               lhs_(2,4,2) = 0.
-               lhs_(2,5,2) = 0.
-               lhs_(3,1,2) = tmp11 * 2.0d+00 * ((-(con43)) * c3c4 * tmp2
-     & * u_(1,3))
-               lhs_(3,2,2) = 0.
-               lhs_(3,3,2) = 1.0d+00 + tmp11 * 2.0d+00 * con43 * c3c4 * 
-     &tmp1 + tmp11 * 2.0d+00 * dy3
-               lhs_(3,4,2) = 0.
-               lhs_(3,5,2) = 0.
-               lhs_(4,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &4))
-               lhs_(4,2,2) = 0.
-               lhs_(4,3,2) = 0.
-               lhs_(4,4,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dy4
-               lhs_(4,5,2) = 0.
-               lhs_(5,1,2) = tmp11 * 2.0d+00 * ((-(c3c4 - c1345)) * tmp3
-     & * u_(1,2)** 2 - (con43 * c3c4 - c1345) * tmp3 * u_(1,3)** 2 - (c3
-     &c4 - c1345) * tmp3 * u_(1,4)** 2 - c1345 * tmp2 * u_(1,5))
-               lhs_(5,2,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,2)
-               lhs_(5,3,2) = tmp11 * 2.0d+00 * (con43 * c3c4 - c1345) * 
-     &tmp2 * u_(1,3)
-               lhs_(5,4,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,4)
-               lhs_(5,5,2) = 1.0d+00 + tmp11 * 2.0d+00 * c1345 * tmp1 + 
-     &tmp11 * 2.0d+00 * dy5
-               if (j .ne. 1) then
-                  do  j__1 = 1,5
-                     lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs
-     &_(1,j__1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,
-     &j__1,3) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs
-     &_(1,j__1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,
-     &j__1,3) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs
-     &_(1,j__1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,
-     &j__1,3) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs
-     &_(1,j__1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,
-     &j__1,3) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs
-     &_(1,j__1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,
-     &j__1,3) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1
-     &,3)
-                  enddo  
-               endif  
-               lhs_(1,1,3) = (-(tmp11)) * dy1
-               lhs_(1,2,3) = 0.
-               lhs_(1,3,3) = tmp22
-               lhs_(1,4,3) = 0.
-               lhs_(1,5,3) = 0.
-               lhs_(2,1,3) = tmp22 * ((-(u_(2,2) * u_(2,3))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,2))
-               lhs_(2,2,3) = tmp22 * u_(2,3) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dy2
-               lhs_(2,3,3) = tmp22 * u_(2,2) * tm1
-               lhs_(2,4,3) = 0.
-               lhs_(2,5,3) = 0.
-               lhs_(3,1,3) = tmp22 * ((-(u_(2,3) * u_(2,3) * tm2)) + 0.5
-     &0d+00 * c2 * ((u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u
-     &_(2,4)) * tm2)) - tmp11 * ((-(con43)) * c3c4 * tm2 * u_(2,3))
-               lhs_(3,2,3) = tmp22 * ((-(c2)) * u_(2,2) * tm1)
-               lhs_(3,3,3) = tmp22 * ((2.0d+00 - c2) * u_(2,3) * tm1) - 
-     &tmp11 * con43 * c3c4 * tm1 - tmp11 * dy3
-               lhs_(3,4,3) = tmp22 * ((-(c2)) * u_(2,4) * tm1)
-               lhs_(3,5,3) = tmp22 * c2
-               lhs_(4,1,3) = tmp22 * ((-(u_(2,3) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,4))
-               lhs_(4,2,3) = 0.
-               lhs_(4,3,3) = tmp22 * u_(2,4) * tm1
-               lhs_(4,4,3) = tmp22 * u_(2,3) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dy4
-               lhs_(4,5,3) = 0.
-               lhs_(5,1,3) = tmp22 * ((c2 * (u_(2,2) * u_(2,2) + u_(2,3)
-     & * u_(2,3) + u_(2,4) * u_(2,4)) * tm2 - c1 * u_(2,5) * tm1) * u_(2
-     &,3) * tm1) - tmp11 * ((-(c3c4 - c1345)) * tm3 * u_(2,2)** 2 - (con
-     &43 * c3c4 - c1345) * tm3 * u_(2,3)** 2 - (c3c4 - c1345) * tm3 * u_
-     &(2,4)** 2 - c1345 * tm2 * u_(2,5))
-               lhs_(5,2,3) = tmp22 * ((-(c2)) * u_(2,2) * u_(2,3) * tm2)
-     & - tmp11 * (c3c4 - c1345) * tm2 * u_(2,2)
-               lhs_(5,3,3) = tmp22 * (c1 * u_(2,5) * tm1 - 0.50d+00 * c2
-     & * ((u_(2,2) * u_(2,2) + 3.0d+00 * u_(2,3) * u_(2,3) + u_(2,4) * u
-     &_(2,4)) * tm2)) - tmp11 * (con43 * c3c4 - c1345) * tm2 * u_(2,3)
-               lhs_(5,4,3) = tmp22 * ((-(c2)) * (u_(2,3) * u_(2,4)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,4)
-               lhs_(5,5,3) = tmp22 * c1 * u_(2,3) * tm1 - tmp11 * c1345 
-     &* tm1 - tmp11 * dy5
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  i__0 = 1,5
-                  rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,j -
-     & 1,k) - lhs_(i__0,2,1) * rhs(2,i,j - 1,k) - lhs_(i__0,3,1) * rhs(3
-     &,i,j - 1,k) - lhs_(i__0,4,1) * rhs(4,i,j - 1,k) - lhs_(i__0,5,1) *
-     & rhs(5,i,j - 1,k)
-               enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-               pivot = 1.00d0 / lhs_(1,1,2)
-               lhs_(1,2,2) = lhs_(1,2,2) * pivot
-               lhs_(1,3,2) = lhs_(1,3,2) * pivot
-               lhs_(1,4,2) = lhs_(1,4,2) * pivot
-               lhs_(1,5,2) = lhs_(1,5,2) * pivot
-               lhs_(1,1,3) = lhs_(1,1,3) * pivot
-               lhs_(1,2,3) = lhs_(1,2,3) * pivot
-               lhs_(1,3,3) = lhs_(1,3,3) * pivot
-               lhs_(1,4,3) = lhs_(1,4,3) * pivot
-               lhs_(1,5,3) = lhs_(1,5,3) * pivot
-               rhs_(1) = rhs_(1) * pivot
-               coeff = lhs_(2,1,2)
-               lhs_(2,2,2) = lhs_(2,2,2) - coeff * lhs_(1,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) - coeff * lhs_(1,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(1,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(1,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(1,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(1,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(1,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(1,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(1,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(1)
-               coeff = lhs_(3,1,2)
-               lhs_(3,2,2) = lhs_(3,2,2) - coeff * lhs_(1,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(1,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(1,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(1,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(1,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(1,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(1,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(1,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(1,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(1)
-               coeff = lhs_(4,1,2)
-               lhs_(4,2,2) = lhs_(4,2,2) - coeff * lhs_(1,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(1,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(1,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(1,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(1,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(1,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(1,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(1,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(1,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(1)
-               coeff = lhs_(5,1,2)
-               lhs_(5,2,2) = lhs_(5,2,2) - coeff * lhs_(1,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(1,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(1,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(1,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(1,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(1,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(1,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(1,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(1,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(1)
-               pivot = 1.00d0 / lhs_(2,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) * pivot
-               lhs_(2,4,2) = lhs_(2,4,2) * pivot
-               lhs_(2,5,2) = lhs_(2,5,2) * pivot
-               lhs_(2,1,3) = lhs_(2,1,3) * pivot
-               lhs_(2,2,3) = lhs_(2,2,3) * pivot
-               lhs_(2,3,3) = lhs_(2,3,3) * pivot
-               lhs_(2,4,3) = lhs_(2,4,3) * pivot
-               lhs_(2,5,3) = lhs_(2,5,3) * pivot
-               rhs_(2) = rhs_(2) * pivot
-               coeff = lhs_(1,2,2)
-               lhs_(1,3,2) = lhs_(1,3,2) - coeff * lhs_(2,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(2,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(2,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(2,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(2,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(2,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(2,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(2,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(2)
-               coeff = lhs_(3,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(2,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(2,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(2,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(2,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(2,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(2,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(2,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(2,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(2)
-               coeff = lhs_(4,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(2,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(2,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(2,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(2,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(2,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(2,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(2,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(2,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(2)
-               coeff = lhs_(5,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(2,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(2,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(2,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(2,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(2,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(2,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(2,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(2,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(2)
-               pivot = 1.00d0 / lhs_(3,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) * pivot
-               lhs_(3,5,2) = lhs_(3,5,2) * pivot
-               lhs_(3,1,3) = lhs_(3,1,3) * pivot
-               lhs_(3,2,3) = lhs_(3,2,3) * pivot
-               lhs_(3,3,3) = lhs_(3,3,3) * pivot
-               lhs_(3,4,3) = lhs_(3,4,3) * pivot
-               lhs_(3,5,3) = lhs_(3,5,3) * pivot
-               rhs_(3) = rhs_(3) * pivot
-               coeff = lhs_(1,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(3,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(3,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(3,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(3,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(3,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(3,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(3,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(3)
-               coeff = lhs_(2,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(3,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(3,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(3,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(3,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(3,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(3,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(3,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(3)
-               coeff = lhs_(4,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(3,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(3,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(3,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(3,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(3,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(3,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(3,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(3)
-               coeff = lhs_(5,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(3,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(3,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(3,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(3,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(3,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(3,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(3,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(3)
-               pivot = 1.00d0 / lhs_(4,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) * pivot
-               lhs_(4,1,3) = lhs_(4,1,3) * pivot
-               lhs_(4,2,3) = lhs_(4,2,3) * pivot
-               lhs_(4,3,3) = lhs_(4,3,3) * pivot
-               lhs_(4,4,3) = lhs_(4,4,3) * pivot
-               lhs_(4,5,3) = lhs_(4,5,3) * pivot
-               rhs_(4) = rhs_(4) * pivot
-               coeff = lhs_(1,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(4,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(4,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(4,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(4,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(4,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(4,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(4)
-               coeff = lhs_(2,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(4,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(4,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(4,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(4,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(4,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(4,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(4)
-               coeff = lhs_(3,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(4,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(4,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(4,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(4,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(4,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(4,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(4)
-               coeff = lhs_(5,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(4,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(4,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(4,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(4,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(4,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(4,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(4)
-               pivot = 1.00d0 / lhs_(5,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) * pivot
-               lhs_(5,2,3) = lhs_(5,2,3) * pivot
-               lhs_(5,3,3) = lhs_(5,3,3) * pivot
-               lhs_(5,4,3) = lhs_(5,4,3) * pivot
-               lhs_(5,5,3) = lhs_(5,5,3) * pivot
-               rhs_(5) = rhs_(5) * pivot
-               coeff = lhs_(1,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(5,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(5,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(5,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(5,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(5,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(5)
-               coeff = lhs_(2,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(5,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(5,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(5,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(5,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(5,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(5)
-               coeff = lhs_(3,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(5,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(5,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(5,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(5,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(5,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(5)
-               coeff = lhs_(4,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(5,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(5,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(5,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(5,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(5,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(5)
-               do  i__0 = 1,5
-                  lhs__(i__0,1,i,j,k) = lhs_(i__0,1,3)
-                  lhs__(i__0,2,i,j,k) = lhs_(i__0,2,3)
-                  lhs__(i__0,3,i,j,k) = lhs_(i__0,3,3)
-                  lhs__(i__0,4,i,j,k) = lhs_(i__0,4,3)
-                  lhs__(i__0,5,i,j,k) = lhs_(i__0,5,3)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-                  u_(0,m) = u_(1,m)
-                  u_(1,m) = u_(2,m)
-               enddo  
-            enddo  
-
-!			   else	 ! ******************* else case *************************
-            do  n = 1,5
-               lhs_(1,n,1) = 0.0d0
-               lhs_(1,n,2) = 0.0d0
-               lhs_(1,n,3) = 0.0d0
-               lhs_(2,n,1) = 0.0d0
-               lhs_(2,n,2) = 0.0d0
-               lhs_(2,n,3) = 0.0d0
-               lhs_(3,n,1) = 0.0d0
-               lhs_(3,n,2) = 0.0d0
-               lhs_(3,n,3) = 0.0d0
-               lhs_(4,n,1) = 0.0d0
-               lhs_(4,n,2) = 0.0d0
-               lhs_(4,n,3) = 0.0d0
-               lhs_(5,n,1) = 0.0d0
-               lhs_(5,n,2) = 0.0d0
-               lhs_(5,n,3) = 0.0d0
-            enddo  
-            do  m = 1,5
-               lhs_(m,m,2) = 1.0d0
-            enddo  
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-            enddo  
-            do  i__0 = 1,5
-               rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,jsize 
-     &- 1,k) - lhs_(i__0,2,1) * rhs(2,i,jsize - 1,k) - lhs_(i__0,3,1) * 
-     &rhs(3,i,jsize - 1,k) - lhs_(i__0,4,1) * rhs(4,i,jsize - 1,k) - lhs
-     &_(i__0,5,1) * rhs(5,i,jsize - 1,k)
-            enddo  
-            do  j__1 = 1,5
-               lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,j__1,3
-     &) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1,3)
-               lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,j__1,3
-     &) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1,3)
-               lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,j__1,3
-     &) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1,3)
-               lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,j__1,3
-     &) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1,3)
-               lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,j__1,3
-     &) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1,3)
-            enddo  
-            pivot__3 = 1.00d0 / lhs_(1,1,2)
-            lhs_(1,2,2) = lhs_(1,2,2) * pivot__3
-            lhs_(1,3,2) = lhs_(1,3,2) * pivot__3
-            lhs_(1,4,2) = lhs_(1,4,2) * pivot__3
-            lhs_(1,5,2) = lhs_(1,5,2) * pivot__3
-            rhs_(1) = rhs_(1) * pivot__3
-            coeff__2 = lhs_(2,1,2)
-            lhs_(2,2,2) = lhs_(2,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(3,1,2)
-            lhs_(3,2,2) = lhs_(3,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(4,1,2)
-            lhs_(4,2,2) = lhs_(4,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(5,1,2)
-            lhs_(5,2,2) = lhs_(5,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(1)
-            pivot__3 = 1.00d0 / lhs_(2,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) * pivot__3
-            lhs_(2,4,2) = lhs_(2,4,2) * pivot__3
-            lhs_(2,5,2) = lhs_(2,5,2) * pivot__3
-            rhs_(2) = rhs_(2) * pivot__3
-            coeff__2 = lhs_(1,2,2)
-            lhs_(1,3,2) = lhs_(1,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(3,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(4,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(5,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(2)
-            pivot__3 = 1.00d0 / lhs_(3,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) * pivot__3
-            lhs_(3,5,2) = lhs_(3,5,2) * pivot__3
-            rhs_(3) = rhs_(3) * pivot__3
-            coeff__2 = lhs_(1,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(2,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(4,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(5,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(3)
-            pivot__3 = 1.00d0 / lhs_(4,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) * pivot__3
-            rhs_(4) = rhs_(4) * pivot__3
-            coeff__2 = lhs_(1,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(2,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(3,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(5,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(4)
-            pivot__3 = 1.00d0 / lhs_(5,5,2)
-            rhs_(5) = rhs_(5) * pivot__3
-            coeff__2 = lhs_(1,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(2,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(3,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(4,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(5)
-
-!			   endif
-            do  m = 1,5
-               rhs(m,i,j,k) = rhs_(m)
-            enddo  
-
-!            enddo  
-            do  j = problem_size - 2,0,(-(1))
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  m = 1,5
-                rhs_(m) = rhs_(m) - lhs__(m,1,i,j,k) * rhs(1,i,j + 1,k)
-                rhs_(m) = rhs_(m) - lhs__(m,2,i,j,k) * rhs(2,i,j + 1,k)
-                rhs_(m) = rhs_(m) - lhs__(m,3,i,j,k) * rhs(3,i,j + 1,k)
-                rhs_(m) = rhs_(m) - lhs__(m,4,i,j,k) * rhs(4,i,j + 1,k)
-                rhs_(m) = rhs_(m) - lhs__(m,5,i,j,k) * rhs(5,i,j + 1,k)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_block.fdv
deleted file mode 100644
index 5d91c64..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_block.fdv
+++ /dev/null
@@ -1,635 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     performs guaussian elimination on this cell.
-!     
-!     assumes that unpacking routines for non-first cells 
-!     preload C' and rhs' from previous cell.
-!     
-!     assumed send happens outside this routine, but that
-!     c'(JMAX) and rhs'(JMAX) will be sent to next cell
-!---------------------------------------------------------------------
-      subroutine y_solve ()
-
-      include 'header3d.h'
-      double precision  coeff
-      double precision  pivot
-      integer  i__0
-      integer  j__1,m,n
-      double precision  coeff__2
-      double precision  pivot__3
-      double precision  lhs_(5,5,3),rhs_(5),u_(0:3,5)
-      integer  i,j,k,jsize,low_k,high_k,k1,maxBlK
-      jsize = problem_size - 1
-      
-      if(mod((problem_size - 2), BL) .eq. 0) then
-	      maxBlK = (problem_size - 2) / BL
-      else
-	      maxblK = (problem_size - 2) / BL + 1
-      endif
-!ACROSS (rhs(0:0,1:0,0:0,0:0),lhs__(0:0,1:0,0:0,0:0,0:0))
-!DVM$ region local(lhs__)
-!DVM$ PARALLEL (k1,i) ON  rhs(*,i,*,k1), private(u_,j,rhs_,pivot, 
-!DVM$&coeff,tmp1, tmp2, tmp3, t1, t2, t3, tm1, tm2, tm3, tmp11, 
-!DVM$&tmp22, i__0, j__1,lhs_,coeff__2,pivot__3,m,n,k,low_k,high_k)
-!DVM$&,cuda_block(32)
-      do  k1 = 1, maxBlK
-         do  i = 1, problem_size - 2
-             low_k = (k1 - 1) * BL + 1
-             high_k = k1 * BL
-             if(high_k .gt. problem_size - 2) then
-			     high_k = problem_size - 2
-		     endif
-          do k = low_k, high_k		 
-            do  m = 1,5
-               u_(0,m) = u(m,i,0,k)
-               u_(1,m) = u(m,i,1,k)
-            enddo  
-            do  j = 1,jsize - 1
-               do  m = 1,5
-                  u_(2,m) = u(m,i,j + 1,k)
-               enddo  
-
-!             if(j .ne. jsize) then
-               tmp1 = 1.0d+00 / u_(1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               t1 = 1.0d+00 / u_(0,1)
-               t2 = t1 * t1
-               t3 = t1 * t2
-               tm1 = 1.0d+00 / u_(2,1)
-               tm2 = tm1 * tm1
-               tm3 = tm1 * tm2
-               tmp11 = dt * ty1
-               tmp22 = dt * ty2
-               lhs_(1,1,1) = (-(tmp11)) * dy1
-               lhs_(1,2,1) = 0.
-               lhs_(1,3,1) = (-(tmp22))
-               lhs_(1,4,1) = 0.
-               lhs_(1,5,1) = 0.
-               lhs_(2,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,3))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,2))
-               lhs_(2,2,1) = (-(tmp22)) * u_(0,3) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dy2
-               lhs_(2,3,1) = (-(tmp22)) * u_(0,2) * t1
-               lhs_(2,4,1) = 0.
-               lhs_(2,5,1) = 0.
-               lhs_(3,1,1) = (-(tmp22)) * ((-(u_(0,3) * u_(0,3) * t2)) +
-     & 0.50d+00 * c2 * ((u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4)
-     & * u_(0,4)) * t2)) - tmp11 * ((-(con43)) * c3c4 * t2 * u_(0,3))
-               lhs_(3,2,1) = (-(tmp22)) * ((-(c2)) * u_(0,2) * t1)
-               lhs_(3,3,1) = (-(tmp22)) * ((2.0d+00 - c2) * u_(0,3) * t1
-     &) - tmp11 * con43 * c3c4 * t1 - tmp11 * dy3
-               lhs_(3,4,1) = (-(tmp22)) * ((-(c2)) * u_(0,4) * t1)
-               lhs_(3,5,1) = (-(tmp22)) * c2
-               lhs_(4,1,1) = (-(tmp22)) * ((-(u_(0,3) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,4))
-               lhs_(4,2,1) = 0.
-               lhs_(4,3,1) = (-(tmp22)) * u_(0,4) * t1
-               lhs_(4,4,1) = (-(tmp22)) * u_(0,3) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dy4
-               lhs_(4,5,1) = 0.
-               lhs_(5,1,1) = (-(tmp22)) * ((c2 * (u_(0,2) * u_(0,2) + u_
-     &(0,3) * u_(0,3) + u_(0,4) * u_(0,4)) * t2 - c1 * u_(0,5) * t1) * u
-     &_(0,3) * t1) - tmp11 * ((-(c3c4 - c1345)) * t3 * u_(0,2)** 2 - (co
-     &n43 * c3c4 - c1345) * t3 * u_(0,3)** 2 - (c3c4 - c1345) * t3 * u_(
-     &0,4)** 2 - c1345 * t2 * u_(0,5))
-               lhs_(5,2,1) = (-(tmp22)) * ((-(c2)) * u_(0,2) * u_(0,3) *
-     & t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,2)
-               lhs_(5,3,1) = (-(tmp22)) * (c1 * u_(0,5) * t1 - 0.50d+00 
-     &* c2 * ((u_(0,2) * u_(0,2) + 3.0d+00 * u_(0,3) * u_(0,3) + u_(0,4)
-     & * u_(0,4)) * t2)) - tmp11 * (con43 * c3c4 - c1345) * t2 * u_(0,3)
-               lhs_(5,4,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * u_(0,4))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,4)
-               lhs_(5,5,1) = (-(tmp22)) * c1 * u_(0,3) * t1 - tmp11 * c1
-     &345 * t1 - tmp11 * dy5
-               lhs_(1,1,2) = 1.0d+00 + tmp11 * 2.0d+00 * dy1
-               lhs_(1,2,2) = 0.
-               lhs_(1,3,2) = 0.
-               lhs_(1,4,2) = 0.
-               lhs_(1,5,2) = 0.
-               lhs_(2,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &2))
-               lhs_(2,2,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dy2
-               lhs_(2,3,2) = 0.
-               lhs_(2,4,2) = 0.
-               lhs_(2,5,2) = 0.
-               lhs_(3,1,2) = tmp11 * 2.0d+00 * ((-(con43)) * c3c4 * tmp2
-     & * u_(1,3))
-               lhs_(3,2,2) = 0.
-               lhs_(3,3,2) = 1.0d+00 + tmp11 * 2.0d+00 * con43 * c3c4 * 
-     &tmp1 + tmp11 * 2.0d+00 * dy3
-               lhs_(3,4,2) = 0.
-               lhs_(3,5,2) = 0.
-               lhs_(4,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &4))
-               lhs_(4,2,2) = 0.
-               lhs_(4,3,2) = 0.
-               lhs_(4,4,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dy4
-               lhs_(4,5,2) = 0.
-               lhs_(5,1,2) = tmp11 * 2.0d+00 * ((-(c3c4 - c1345)) * tmp3
-     & * u_(1,2)** 2 - (con43 * c3c4 - c1345) * tmp3 * u_(1,3)** 2 - (c3
-     &c4 - c1345) * tmp3 * u_(1,4)** 2 - c1345 * tmp2 * u_(1,5))
-               lhs_(5,2,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,2)
-               lhs_(5,3,2) = tmp11 * 2.0d+00 * (con43 * c3c4 - c1345) * 
-     &tmp2 * u_(1,3)
-               lhs_(5,4,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,4)
-               lhs_(5,5,2) = 1.0d+00 + tmp11 * 2.0d+00 * c1345 * tmp1 + 
-     &tmp11 * 2.0d+00 * dy5
-               if (j .ne. 1) then
-                  do  j__1 = 1,5
-                     lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs
-     &_(1,j__1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,
-     &j__1,3) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs
-     &_(1,j__1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,
-     &j__1,3) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs
-     &_(1,j__1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,
-     &j__1,3) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs
-     &_(1,j__1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,
-     &j__1,3) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs
-     &_(1,j__1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,
-     &j__1,3) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1
-     &,3)
-                  enddo  
-               endif  
-               lhs_(1,1,3) = (-(tmp11)) * dy1
-               lhs_(1,2,3) = 0.
-               lhs_(1,3,3) = tmp22
-               lhs_(1,4,3) = 0.
-               lhs_(1,5,3) = 0.
-               lhs_(2,1,3) = tmp22 * ((-(u_(2,2) * u_(2,3))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,2))
-               lhs_(2,2,3) = tmp22 * u_(2,3) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dy2
-               lhs_(2,3,3) = tmp22 * u_(2,2) * tm1
-               lhs_(2,4,3) = 0.
-               lhs_(2,5,3) = 0.
-               lhs_(3,1,3) = tmp22 * ((-(u_(2,3) * u_(2,3) * tm2)) + 0.5
-     &0d+00 * c2 * ((u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u
-     &_(2,4)) * tm2)) - tmp11 * ((-(con43)) * c3c4 * tm2 * u_(2,3))
-               lhs_(3,2,3) = tmp22 * ((-(c2)) * u_(2,2) * tm1)
-               lhs_(3,3,3) = tmp22 * ((2.0d+00 - c2) * u_(2,3) * tm1) - 
-     &tmp11 * con43 * c3c4 * tm1 - tmp11 * dy3
-               lhs_(3,4,3) = tmp22 * ((-(c2)) * u_(2,4) * tm1)
-               lhs_(3,5,3) = tmp22 * c2
-               lhs_(4,1,3) = tmp22 * ((-(u_(2,3) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,4))
-               lhs_(4,2,3) = 0.
-               lhs_(4,3,3) = tmp22 * u_(2,4) * tm1
-               lhs_(4,4,3) = tmp22 * u_(2,3) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dy4
-               lhs_(4,5,3) = 0.
-               lhs_(5,1,3) = tmp22 * ((c2 * (u_(2,2) * u_(2,2) + u_(2,3)
-     & * u_(2,3) + u_(2,4) * u_(2,4)) * tm2 - c1 * u_(2,5) * tm1) * u_(2
-     &,3) * tm1) - tmp11 * ((-(c3c4 - c1345)) * tm3 * u_(2,2)** 2 - (con
-     &43 * c3c4 - c1345) * tm3 * u_(2,3)** 2 - (c3c4 - c1345) * tm3 * u_
-     &(2,4)** 2 - c1345 * tm2 * u_(2,5))
-               lhs_(5,2,3) = tmp22 * ((-(c2)) * u_(2,2) * u_(2,3) * tm2)
-     & - tmp11 * (c3c4 - c1345) * tm2 * u_(2,2)
-               lhs_(5,3,3) = tmp22 * (c1 * u_(2,5) * tm1 - 0.50d+00 * c2
-     & * ((u_(2,2) * u_(2,2) + 3.0d+00 * u_(2,3) * u_(2,3) + u_(2,4) * u
-     &_(2,4)) * tm2)) - tmp11 * (con43 * c3c4 - c1345) * tm2 * u_(2,3)
-               lhs_(5,4,3) = tmp22 * ((-(c2)) * (u_(2,3) * u_(2,4)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,4)
-               lhs_(5,5,3) = tmp22 * c1 * u_(2,3) * tm1 - tmp11 * c1345 
-     &* tm1 - tmp11 * dy5
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  i__0 = 1,5
-                  rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,j -
-     & 1,k) - lhs_(i__0,2,1) * rhs(2,i,j - 1,k) - lhs_(i__0,3,1) * rhs(3
-     &,i,j - 1,k) - lhs_(i__0,4,1) * rhs(4,i,j - 1,k) - lhs_(i__0,5,1) *
-     & rhs(5,i,j - 1,k)
-               enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-               pivot = 1.00d0 / lhs_(1,1,2)
-               lhs_(1,2,2) = lhs_(1,2,2) * pivot
-               lhs_(1,3,2) = lhs_(1,3,2) * pivot
-               lhs_(1,4,2) = lhs_(1,4,2) * pivot
-               lhs_(1,5,2) = lhs_(1,5,2) * pivot
-               lhs_(1,1,3) = lhs_(1,1,3) * pivot
-               lhs_(1,2,3) = lhs_(1,2,3) * pivot
-               lhs_(1,3,3) = lhs_(1,3,3) * pivot
-               lhs_(1,4,3) = lhs_(1,4,3) * pivot
-               lhs_(1,5,3) = lhs_(1,5,3) * pivot
-               rhs_(1) = rhs_(1) * pivot
-               coeff = lhs_(2,1,2)
-               lhs_(2,2,2) = lhs_(2,2,2) - coeff * lhs_(1,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) - coeff * lhs_(1,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(1,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(1,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(1,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(1,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(1,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(1,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(1,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(1)
-               coeff = lhs_(3,1,2)
-               lhs_(3,2,2) = lhs_(3,2,2) - coeff * lhs_(1,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(1,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(1,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(1,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(1,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(1,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(1,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(1,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(1,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(1)
-               coeff = lhs_(4,1,2)
-               lhs_(4,2,2) = lhs_(4,2,2) - coeff * lhs_(1,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(1,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(1,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(1,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(1,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(1,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(1,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(1,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(1,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(1)
-               coeff = lhs_(5,1,2)
-               lhs_(5,2,2) = lhs_(5,2,2) - coeff * lhs_(1,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(1,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(1,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(1,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(1,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(1,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(1,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(1,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(1,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(1)
-               pivot = 1.00d0 / lhs_(2,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) * pivot
-               lhs_(2,4,2) = lhs_(2,4,2) * pivot
-               lhs_(2,5,2) = lhs_(2,5,2) * pivot
-               lhs_(2,1,3) = lhs_(2,1,3) * pivot
-               lhs_(2,2,3) = lhs_(2,2,3) * pivot
-               lhs_(2,3,3) = lhs_(2,3,3) * pivot
-               lhs_(2,4,3) = lhs_(2,4,3) * pivot
-               lhs_(2,5,3) = lhs_(2,5,3) * pivot
-               rhs_(2) = rhs_(2) * pivot
-               coeff = lhs_(1,2,2)
-               lhs_(1,3,2) = lhs_(1,3,2) - coeff * lhs_(2,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(2,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(2,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(2,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(2,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(2,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(2,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(2,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(2)
-               coeff = lhs_(3,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(2,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(2,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(2,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(2,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(2,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(2,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(2,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(2,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(2)
-               coeff = lhs_(4,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(2,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(2,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(2,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(2,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(2,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(2,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(2,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(2,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(2)
-               coeff = lhs_(5,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(2,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(2,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(2,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(2,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(2,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(2,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(2,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(2,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(2)
-               pivot = 1.00d0 / lhs_(3,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) * pivot
-               lhs_(3,5,2) = lhs_(3,5,2) * pivot
-               lhs_(3,1,3) = lhs_(3,1,3) * pivot
-               lhs_(3,2,3) = lhs_(3,2,3) * pivot
-               lhs_(3,3,3) = lhs_(3,3,3) * pivot
-               lhs_(3,4,3) = lhs_(3,4,3) * pivot
-               lhs_(3,5,3) = lhs_(3,5,3) * pivot
-               rhs_(3) = rhs_(3) * pivot
-               coeff = lhs_(1,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(3,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(3,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(3,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(3,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(3,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(3,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(3,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(3)
-               coeff = lhs_(2,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(3,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(3,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(3,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(3,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(3,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(3,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(3,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(3)
-               coeff = lhs_(4,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(3,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(3,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(3,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(3,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(3,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(3,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(3,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(3)
-               coeff = lhs_(5,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(3,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(3,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(3,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(3,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(3,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(3,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(3,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(3)
-               pivot = 1.00d0 / lhs_(4,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) * pivot
-               lhs_(4,1,3) = lhs_(4,1,3) * pivot
-               lhs_(4,2,3) = lhs_(4,2,3) * pivot
-               lhs_(4,3,3) = lhs_(4,3,3) * pivot
-               lhs_(4,4,3) = lhs_(4,4,3) * pivot
-               lhs_(4,5,3) = lhs_(4,5,3) * pivot
-               rhs_(4) = rhs_(4) * pivot
-               coeff = lhs_(1,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(4,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(4,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(4,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(4,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(4,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(4,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(4)
-               coeff = lhs_(2,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(4,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(4,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(4,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(4,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(4,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(4,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(4)
-               coeff = lhs_(3,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(4,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(4,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(4,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(4,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(4,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(4,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(4)
-               coeff = lhs_(5,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(4,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(4,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(4,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(4,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(4,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(4,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(4)
-               pivot = 1.00d0 / lhs_(5,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) * pivot
-               lhs_(5,2,3) = lhs_(5,2,3) * pivot
-               lhs_(5,3,3) = lhs_(5,3,3) * pivot
-               lhs_(5,4,3) = lhs_(5,4,3) * pivot
-               lhs_(5,5,3) = lhs_(5,5,3) * pivot
-               rhs_(5) = rhs_(5) * pivot
-               coeff = lhs_(1,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(5,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(5,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(5,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(5,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(5,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(5)
-               coeff = lhs_(2,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(5,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(5,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(5,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(5,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(5,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(5)
-               coeff = lhs_(3,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(5,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(5,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(5,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(5,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(5,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(5)
-               coeff = lhs_(4,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(5,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(5,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(5,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(5,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(5,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(5)
-               do  i__0 = 1,5
-                  lhs__(i__0,1,i,j,k1) = lhs_(i__0,1,3)
-                  lhs__(i__0,2,i,j,k1) = lhs_(i__0,2,3)
-                  lhs__(i__0,3,i,j,k1) = lhs_(i__0,3,3)
-                  lhs__(i__0,4,i,j,k1) = lhs_(i__0,4,3)
-                  lhs__(i__0,5,i,j,k1) = lhs_(i__0,5,3)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-                  u_(0,m) = u_(1,m)
-                  u_(1,m) = u_(2,m)
-               enddo  
-            enddo  
-
-!			   else	 ! ******************* else case *************************
-            do  n = 1,5
-               lhs_(1,n,1) = 0.0d0
-               lhs_(1,n,2) = 0.0d0
-               lhs_(1,n,3) = 0.0d0
-               lhs_(2,n,1) = 0.0d0
-               lhs_(2,n,2) = 0.0d0
-               lhs_(2,n,3) = 0.0d0
-               lhs_(3,n,1) = 0.0d0
-               lhs_(3,n,2) = 0.0d0
-               lhs_(3,n,3) = 0.0d0
-               lhs_(4,n,1) = 0.0d0
-               lhs_(4,n,2) = 0.0d0
-               lhs_(4,n,3) = 0.0d0
-               lhs_(5,n,1) = 0.0d0
-               lhs_(5,n,2) = 0.0d0
-               lhs_(5,n,3) = 0.0d0
-            enddo  
-            do  m = 1,5
-               lhs_(m,m,2) = 1.0d0
-            enddo  
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-            enddo  
-            do  i__0 = 1,5
-               rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,jsize 
-     &- 1,k) - lhs_(i__0,2,1) * rhs(2,i,jsize - 1,k) - lhs_(i__0,3,1) * 
-     &rhs(3,i,jsize - 1,k) - lhs_(i__0,4,1) * rhs(4,i,jsize - 1,k) - lhs
-     &_(i__0,5,1) * rhs(5,i,jsize - 1,k)
-            enddo  
-            do  j__1 = 1,5
-               lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,j__1,3
-     &) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1,3)
-               lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,j__1,3
-     &) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1,3)
-               lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,j__1,3
-     &) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1,3)
-               lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,j__1,3
-     &) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1,3)
-               lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,j__1,3
-     &) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1,3)
-            enddo  
-            pivot__3 = 1.00d0 / lhs_(1,1,2)
-            lhs_(1,2,2) = lhs_(1,2,2) * pivot__3
-            lhs_(1,3,2) = lhs_(1,3,2) * pivot__3
-            lhs_(1,4,2) = lhs_(1,4,2) * pivot__3
-            lhs_(1,5,2) = lhs_(1,5,2) * pivot__3
-            rhs_(1) = rhs_(1) * pivot__3
-            coeff__2 = lhs_(2,1,2)
-            lhs_(2,2,2) = lhs_(2,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(3,1,2)
-            lhs_(3,2,2) = lhs_(3,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(4,1,2)
-            lhs_(4,2,2) = lhs_(4,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(5,1,2)
-            lhs_(5,2,2) = lhs_(5,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(1)
-            pivot__3 = 1.00d0 / lhs_(2,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) * pivot__3
-            lhs_(2,4,2) = lhs_(2,4,2) * pivot__3
-            lhs_(2,5,2) = lhs_(2,5,2) * pivot__3
-            rhs_(2) = rhs_(2) * pivot__3
-            coeff__2 = lhs_(1,2,2)
-            lhs_(1,3,2) = lhs_(1,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(3,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(4,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(5,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(2)
-            pivot__3 = 1.00d0 / lhs_(3,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) * pivot__3
-            lhs_(3,5,2) = lhs_(3,5,2) * pivot__3
-            rhs_(3) = rhs_(3) * pivot__3
-            coeff__2 = lhs_(1,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(2,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(4,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(5,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(3)
-            pivot__3 = 1.00d0 / lhs_(4,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) * pivot__3
-            rhs_(4) = rhs_(4) * pivot__3
-            coeff__2 = lhs_(1,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(2,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(3,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(5,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(4)
-            pivot__3 = 1.00d0 / lhs_(5,5,2)
-            rhs_(5) = rhs_(5) * pivot__3
-            coeff__2 = lhs_(1,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(2,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(3,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(4,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(5)
-
-!			   endif
-            do  m = 1,5
-               rhs(m,i,j,k) = rhs_(m)
-            enddo  
-
-!            enddo  
-            do  j = problem_size - 2,0,(-(1))
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  m = 1,5
-                rhs_(m) = rhs_(m) - lhs__(m,1,i,j,k1) * rhs(1,i,j + 1,k)
-                rhs_(m) = rhs_(m) - lhs__(m,2,i,j,k1) * rhs(2,i,j + 1,k)
-                rhs_(m) = rhs_(m) - lhs__(m,3,i,j,k1) * rhs(3,i,j + 1,k)
-                rhs_(m) = rhs_(m) - lhs__(m,4,i,j,k1) * rhs(4,i,j + 1,k)
-                rhs_(m) = rhs_(m) - lhs__(m,5,i,j,k1) * rhs(5,i,j + 1,k)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-               enddo  
-            enddo  
-			
-            enddo			
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_mpi.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_mpi.fdv
deleted file mode 100644
index d0d5fdd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/y_solve_mpi.fdv
+++ /dev/null
@@ -1,634 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     performs guaussian elimination on this cell.
-!     
-!     assumes that unpacking routines for non-first cells 
-!     preload C' and rhs' from previous cell.
-!     
-!     assumed send happens outside this routine, but that
-!     c'(JMAX) and rhs'(JMAX) will be sent to next cell
-!---------------------------------------------------------------------
-      subroutine y_solve ()
-
-      include 'header3d.h'
-      double precision  coeff
-      double precision  pivot
-      integer  i__0
-      integer  j__1,m,n
-      double precision  coeff__2
-      double precision  pivot__3
-      double precision  lhs_(5,5,3),rhs_(5),rhsp_(5),u_(0:3,5)
-      integer  i,j,k,jsize,jstart
-      jstart = 0
-      jsize = problem_size - 1
-
-!DVM$ region local(lhs__)
-!DVM$ PARALLEL (k,j,i) ON  rhs(*,i,j,k), private(u_,rhs_,pivot, 
-!DVM$&coeff,tmp1, tmp2, tmp3, t1, t2, t3, tm1, tm2, tm3, tmp11, 
-!DVM$&tmp22, i__0, j__1,lhs_,coeff__2,pivot__3,m,n),stage(stage_n),
-!DVM$& ACROSS(rhs(0:0,0:0,1:0,0:0),lhs__(0:0,0:0,0:0,1:0,0:0))
-      do  k = 1,problem_size - 2
-        do  j = 1,jsize - 1	  
-         do  i = 1,problem_size - 2
-             if(j .ne. jsize) then
-			 
-               do  m = 1,5
-                  lhs_(m,1,3) = lhs__(m,1,i,j-1,k)
-                  lhs_(m,2,3) = lhs__(m,2,i,j-1,k)
-                  lhs_(m,3,3) = lhs__(m,3,i,j-1,k)
-                  lhs_(m,4,3) = lhs__(m,4,i,j-1,k)
-                  lhs_(m,5,3) = lhs__(m,5,i,j-1,k)
-               
-			      u_(0,m) = u(m,i,j-1,k)
-                  u_(1,m) = u(m,i,j,k)
-                  u_(2,m) = u(m,i,j+1,k)
-               enddo  
-			   
-               tmp1 = 1.0d+00 / u_(1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               t1 = 1.0d+00 / u_(0,1)
-               t2 = t1 * t1
-               t3 = t1 * t2
-               tm1 = 1.0d+00 / u_(2,1)
-               tm2 = tm1 * tm1
-               tm3 = tm1 * tm2
-               tmp11 = dt * ty1
-               tmp22 = dt * ty2
-               lhs_(1,1,1) = (-(tmp11)) * dy1
-               lhs_(1,2,1) = 0.
-               lhs_(1,3,1) = (-(tmp22))
-               lhs_(1,4,1) = 0.
-               lhs_(1,5,1) = 0.
-               lhs_(2,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,3))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,2))
-               lhs_(2,2,1) = (-(tmp22)) * u_(0,3) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dy2
-               lhs_(2,3,1) = (-(tmp22)) * u_(0,2) * t1
-               lhs_(2,4,1) = 0.
-               lhs_(2,5,1) = 0.
-               lhs_(3,1,1) = (-(tmp22)) * ((-(u_(0,3) * u_(0,3) * t2)) +
-     & 0.50d+00 * c2 * ((u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4)
-     & * u_(0,4)) * t2)) - tmp11 * ((-(con43)) * c3c4 * t2 * u_(0,3))
-               lhs_(3,2,1) = (-(tmp22)) * ((-(c2)) * u_(0,2) * t1)
-               lhs_(3,3,1) = (-(tmp22)) * ((2.0d+00 - c2) * u_(0,3) * t1
-     &) - tmp11 * con43 * c3c4 * t1 - tmp11 * dy3
-               lhs_(3,4,1) = (-(tmp22)) * ((-(c2)) * u_(0,4) * t1)
-               lhs_(3,5,1) = (-(tmp22)) * c2
-               lhs_(4,1,1) = (-(tmp22)) * ((-(u_(0,3) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,4))
-               lhs_(4,2,1) = 0.
-               lhs_(4,3,1) = (-(tmp22)) * u_(0,4) * t1
-               lhs_(4,4,1) = (-(tmp22)) * u_(0,3) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dy4
-               lhs_(4,5,1) = 0.
-               lhs_(5,1,1) = (-(tmp22)) * ((c2 * (u_(0,2) * u_(0,2) + u_
-     &(0,3) * u_(0,3) + u_(0,4) * u_(0,4)) * t2 - c1 * u_(0,5) * t1) * u
-     &_(0,3) * t1) - tmp11 * ((-(c3c4 - c1345)) * t3 * u_(0,2)** 2 - (co
-     &n43 * c3c4 - c1345) * t3 * u_(0,3)** 2 - (c3c4 - c1345) * t3 * u_(
-     &0,4)** 2 - c1345 * t2 * u_(0,5))
-               lhs_(5,2,1) = (-(tmp22)) * ((-(c2)) * u_(0,2) * u_(0,3) *
-     & t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,2)
-               lhs_(5,3,1) = (-(tmp22)) * (c1 * u_(0,5) * t1 - 0.50d+00 
-     &* c2 * ((u_(0,2) * u_(0,2) + 3.0d+00 * u_(0,3) * u_(0,3) + u_(0,4)
-     & * u_(0,4)) * t2)) - tmp11 * (con43 * c3c4 - c1345) * t2 * u_(0,3)
-               lhs_(5,4,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * u_(0,4))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,4)
-               lhs_(5,5,1) = (-(tmp22)) * c1 * u_(0,3) * t1 - tmp11 * c1
-     &345 * t1 - tmp11 * dy5
-               lhs_(1,1,2) = 1.0d+00 + tmp11 * 2.0d+00 * dy1
-               lhs_(1,2,2) = 0.
-               lhs_(1,3,2) = 0.
-               lhs_(1,4,2) = 0.
-               lhs_(1,5,2) = 0.
-               lhs_(2,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &2))
-               lhs_(2,2,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dy2
-               lhs_(2,3,2) = 0.
-               lhs_(2,4,2) = 0.
-               lhs_(2,5,2) = 0.
-               lhs_(3,1,2) = tmp11 * 2.0d+00 * ((-(con43)) * c3c4 * tmp2
-     & * u_(1,3))
-               lhs_(3,2,2) = 0.
-               lhs_(3,3,2) = 1.0d+00 + tmp11 * 2.0d+00 * con43 * c3c4 * 
-     &tmp1 + tmp11 * 2.0d+00 * dy3
-               lhs_(3,4,2) = 0.
-               lhs_(3,5,2) = 0.
-               lhs_(4,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &4))
-               lhs_(4,2,2) = 0.
-               lhs_(4,3,2) = 0.
-               lhs_(4,4,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dy4
-               lhs_(4,5,2) = 0.
-               lhs_(5,1,2) = tmp11 * 2.0d+00 * ((-(c3c4 - c1345)) * tmp3
-     & * u_(1,2)** 2 - (con43 * c3c4 - c1345) * tmp3 * u_(1,3)** 2 - (c3
-     &c4 - c1345) * tmp3 * u_(1,4)** 2 - c1345 * tmp2 * u_(1,5))
-               lhs_(5,2,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,2)
-               lhs_(5,3,2) = tmp11 * 2.0d+00 * (con43 * c3c4 - c1345) * 
-     &tmp2 * u_(1,3)
-               lhs_(5,4,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,4)
-               lhs_(5,5,2) = 1.0d+00 + tmp11 * 2.0d+00 * c1345 * tmp1 + 
-     &tmp11 * 2.0d+00 * dy5
-               if (j .ne. 1) then
-                  do  j__1 = 1,5
-                     lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs
-     &_(1,j__1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,
-     &j__1,3) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs
-     &_(1,j__1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,
-     &j__1,3) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs
-     &_(1,j__1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,
-     &j__1,3) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs
-     &_(1,j__1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,
-     &j__1,3) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs
-     &_(1,j__1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,
-     &j__1,3) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1
-     &,3)
-                  enddo  
-               endif  
-               lhs_(1,1,3) = (-(tmp11)) * dy1
-               lhs_(1,2,3) = 0.
-               lhs_(1,3,3) = tmp22
-               lhs_(1,4,3) = 0.
-               lhs_(1,5,3) = 0.
-               lhs_(2,1,3) = tmp22 * ((-(u_(2,2) * u_(2,3))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,2))
-               lhs_(2,2,3) = tmp22 * u_(2,3) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dy2
-               lhs_(2,3,3) = tmp22 * u_(2,2) * tm1
-               lhs_(2,4,3) = 0.
-               lhs_(2,5,3) = 0.
-               lhs_(3,1,3) = tmp22 * ((-(u_(2,3) * u_(2,3) * tm2)) + 0.5
-     &0d+00 * c2 * ((u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u
-     &_(2,4)) * tm2)) - tmp11 * ((-(con43)) * c3c4 * tm2 * u_(2,3))
-               lhs_(3,2,3) = tmp22 * ((-(c2)) * u_(2,2) * tm1)
-               lhs_(3,3,3) = tmp22 * ((2.0d+00 - c2) * u_(2,3) * tm1) - 
-     &tmp11 * con43 * c3c4 * tm1 - tmp11 * dy3
-               lhs_(3,4,3) = tmp22 * ((-(c2)) * u_(2,4) * tm1)
-               lhs_(3,5,3) = tmp22 * c2
-               lhs_(4,1,3) = tmp22 * ((-(u_(2,3) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,4))
-               lhs_(4,2,3) = 0.
-               lhs_(4,3,3) = tmp22 * u_(2,4) * tm1
-               lhs_(4,4,3) = tmp22 * u_(2,3) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dy4
-               lhs_(4,5,3) = 0.
-               lhs_(5,1,3) = tmp22 * ((c2 * (u_(2,2) * u_(2,2) + u_(2,3)
-     & * u_(2,3) + u_(2,4) * u_(2,4)) * tm2 - c1 * u_(2,5) * tm1) * u_(2
-     &,3) * tm1) - tmp11 * ((-(c3c4 - c1345)) * tm3 * u_(2,2)** 2 - (con
-     &43 * c3c4 - c1345) * tm3 * u_(2,3)** 2 - (c3c4 - c1345) * tm3 * u_
-     &(2,4)** 2 - c1345 * tm2 * u_(2,5))
-               lhs_(5,2,3) = tmp22 * ((-(c2)) * u_(2,2) * u_(2,3) * tm2)
-     & - tmp11 * (c3c4 - c1345) * tm2 * u_(2,2)
-               lhs_(5,3,3) = tmp22 * (c1 * u_(2,5) * tm1 - 0.50d+00 * c2
-     & * ((u_(2,2) * u_(2,2) + 3.0d+00 * u_(2,3) * u_(2,3) + u_(2,4) * u
-     &_(2,4)) * tm2)) - tmp11 * (con43 * c3c4 - c1345) * tm2 * u_(2,3)
-               lhs_(5,4,3) = tmp22 * ((-(c2)) * (u_(2,3) * u_(2,4)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,4)
-               lhs_(5,5,3) = tmp22 * c1 * u_(2,3) * tm1 - tmp11 * c1345 
-     &* tm1 - tmp11 * dy5
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  i__0 = 1,5
-                  rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,j -
-     & 1,k) - lhs_(i__0,2,1) * rhs(2,i,j - 1,k) - lhs_(i__0,3,1) * rhs(3
-     &,i,j - 1,k) - lhs_(i__0,4,1) * rhs(4,i,j - 1,k) - lhs_(i__0,5,1) *
-     & rhs(5,i,j - 1,k)
-               enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-               pivot = 1.00d0 / lhs_(1,1,2)
-               lhs_(1,2,2) = lhs_(1,2,2) * pivot
-               lhs_(1,3,2) = lhs_(1,3,2) * pivot
-               lhs_(1,4,2) = lhs_(1,4,2) * pivot
-               lhs_(1,5,2) = lhs_(1,5,2) * pivot
-               lhs_(1,1,3) = lhs_(1,1,3) * pivot
-               lhs_(1,2,3) = lhs_(1,2,3) * pivot
-               lhs_(1,3,3) = lhs_(1,3,3) * pivot
-               lhs_(1,4,3) = lhs_(1,4,3) * pivot
-               lhs_(1,5,3) = lhs_(1,5,3) * pivot
-               rhs_(1) = rhs_(1) * pivot
-               coeff = lhs_(2,1,2)
-               lhs_(2,2,2) = lhs_(2,2,2) - coeff * lhs_(1,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) - coeff * lhs_(1,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(1,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(1,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(1,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(1,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(1,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(1,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(1,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(1)
-               coeff = lhs_(3,1,2)
-               lhs_(3,2,2) = lhs_(3,2,2) - coeff * lhs_(1,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(1,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(1,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(1,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(1,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(1,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(1,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(1,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(1,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(1)
-               coeff = lhs_(4,1,2)
-               lhs_(4,2,2) = lhs_(4,2,2) - coeff * lhs_(1,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(1,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(1,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(1,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(1,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(1,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(1,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(1,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(1,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(1)
-               coeff = lhs_(5,1,2)
-               lhs_(5,2,2) = lhs_(5,2,2) - coeff * lhs_(1,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(1,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(1,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(1,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(1,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(1,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(1,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(1,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(1,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(1)
-               pivot = 1.00d0 / lhs_(2,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) * pivot
-               lhs_(2,4,2) = lhs_(2,4,2) * pivot
-               lhs_(2,5,2) = lhs_(2,5,2) * pivot
-               lhs_(2,1,3) = lhs_(2,1,3) * pivot
-               lhs_(2,2,3) = lhs_(2,2,3) * pivot
-               lhs_(2,3,3) = lhs_(2,3,3) * pivot
-               lhs_(2,4,3) = lhs_(2,4,3) * pivot
-               lhs_(2,5,3) = lhs_(2,5,3) * pivot
-               rhs_(2) = rhs_(2) * pivot
-               coeff = lhs_(1,2,2)
-               lhs_(1,3,2) = lhs_(1,3,2) - coeff * lhs_(2,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(2,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(2,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(2,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(2,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(2,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(2,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(2,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(2)
-               coeff = lhs_(3,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(2,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(2,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(2,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(2,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(2,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(2,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(2,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(2,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(2)
-               coeff = lhs_(4,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(2,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(2,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(2,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(2,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(2,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(2,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(2,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(2,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(2)
-               coeff = lhs_(5,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(2,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(2,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(2,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(2,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(2,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(2,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(2,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(2,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(2)
-               pivot = 1.00d0 / lhs_(3,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) * pivot
-               lhs_(3,5,2) = lhs_(3,5,2) * pivot
-               lhs_(3,1,3) = lhs_(3,1,3) * pivot
-               lhs_(3,2,3) = lhs_(3,2,3) * pivot
-               lhs_(3,3,3) = lhs_(3,3,3) * pivot
-               lhs_(3,4,3) = lhs_(3,4,3) * pivot
-               lhs_(3,5,3) = lhs_(3,5,3) * pivot
-               rhs_(3) = rhs_(3) * pivot
-               coeff = lhs_(1,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(3,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(3,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(3,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(3,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(3,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(3,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(3,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(3)
-               coeff = lhs_(2,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(3,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(3,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(3,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(3,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(3,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(3,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(3,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(3)
-               coeff = lhs_(4,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(3,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(3,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(3,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(3,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(3,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(3,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(3,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(3)
-               coeff = lhs_(5,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(3,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(3,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(3,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(3,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(3,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(3,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(3,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(3)
-               pivot = 1.00d0 / lhs_(4,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) * pivot
-               lhs_(4,1,3) = lhs_(4,1,3) * pivot
-               lhs_(4,2,3) = lhs_(4,2,3) * pivot
-               lhs_(4,3,3) = lhs_(4,3,3) * pivot
-               lhs_(4,4,3) = lhs_(4,4,3) * pivot
-               lhs_(4,5,3) = lhs_(4,5,3) * pivot
-               rhs_(4) = rhs_(4) * pivot
-               coeff = lhs_(1,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(4,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(4,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(4,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(4,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(4,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(4,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(4)
-               coeff = lhs_(2,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(4,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(4,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(4,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(4,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(4,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(4,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(4)
-               coeff = lhs_(3,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(4,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(4,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(4,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(4,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(4,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(4,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(4)
-               coeff = lhs_(5,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(4,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(4,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(4,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(4,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(4,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(4,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(4)
-               pivot = 1.00d0 / lhs_(5,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) * pivot
-               lhs_(5,2,3) = lhs_(5,2,3) * pivot
-               lhs_(5,3,3) = lhs_(5,3,3) * pivot
-               lhs_(5,4,3) = lhs_(5,4,3) * pivot
-               lhs_(5,5,3) = lhs_(5,5,3) * pivot
-               rhs_(5) = rhs_(5) * pivot
-               coeff = lhs_(1,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(5,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(5,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(5,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(5,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(5,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(5)
-               coeff = lhs_(2,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(5,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(5,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(5,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(5,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(5,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(5)
-               coeff = lhs_(3,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(5,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(5,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(5,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(5,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(5,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(5)
-               coeff = lhs_(4,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(5,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(5,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(5,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(5,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(5,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(5)
-               do  i__0 = 1,5
-                  lhs__(i__0,1,i,j,k) = lhs_(i__0,1,3)
-                  lhs__(i__0,2,i,j,k) = lhs_(i__0,2,3)
-                  lhs__(i__0,3,i,j,k) = lhs_(i__0,3,3)
-                  lhs__(i__0,4,i,j,k) = lhs_(i__0,4,3)
-                  lhs__(i__0,5,i,j,k) = lhs_(i__0,5,3)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-               enddo  
-!            enddo  
-
-			   else	 ! ******************* else case *************************
-            do  n = 1,5
-               lhs_(1,n,1) = 0.0d0
-               lhs_(1,n,2) = 0.0d0
-               lhs_(1,n,3) = 0.0d0
-               lhs_(2,n,1) = 0.0d0
-               lhs_(2,n,2) = 0.0d0
-               lhs_(2,n,3) = 0.0d0
-               lhs_(3,n,1) = 0.0d0
-               lhs_(3,n,2) = 0.0d0
-               lhs_(3,n,3) = 0.0d0
-               lhs_(4,n,1) = 0.0d0
-               lhs_(4,n,2) = 0.0d0
-               lhs_(4,n,3) = 0.0d0
-               lhs_(5,n,1) = 0.0d0
-               lhs_(5,n,2) = 0.0d0
-               lhs_(5,n,3) = 0.0d0
-            enddo  
-            do  m = 1,5
-               lhs_(m,m,2) = 1.0d0
-            enddo  
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-            enddo  
-            do  i__0 = 1,5
-               rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,jsize 
-     &- 1,k) - lhs_(i__0,2,1) * rhs(2,i,jsize - 1,k) - lhs_(i__0,3,1) * 
-     &rhs(3,i,jsize - 1,k) - lhs_(i__0,4,1) * rhs(4,i,jsize - 1,k) - lhs
-     &_(i__0,5,1) * rhs(5,i,jsize - 1,k)
-            enddo  
-            do  j__1 = 1,5
-               lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,j__1,3
-     &) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1,3)
-               lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,j__1,3
-     &) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1,3)
-               lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,j__1,3
-     &) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1,3)
-               lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,j__1,3
-     &) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1,3)
-               lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,j__1,3
-     &) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1,3)
-            enddo  
-            pivot__3 = 1.00d0 / lhs_(1,1,2)
-            lhs_(1,2,2) = lhs_(1,2,2) * pivot__3
-            lhs_(1,3,2) = lhs_(1,3,2) * pivot__3
-            lhs_(1,4,2) = lhs_(1,4,2) * pivot__3
-            lhs_(1,5,2) = lhs_(1,5,2) * pivot__3
-            rhs_(1) = rhs_(1) * pivot__3
-            coeff__2 = lhs_(2,1,2)
-            lhs_(2,2,2) = lhs_(2,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(3,1,2)
-            lhs_(3,2,2) = lhs_(3,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(4,1,2)
-            lhs_(4,2,2) = lhs_(4,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(5,1,2)
-            lhs_(5,2,2) = lhs_(5,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(1)
-            pivot__3 = 1.00d0 / lhs_(2,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) * pivot__3
-            lhs_(2,4,2) = lhs_(2,4,2) * pivot__3
-            lhs_(2,5,2) = lhs_(2,5,2) * pivot__3
-            rhs_(2) = rhs_(2) * pivot__3
-            coeff__2 = lhs_(1,2,2)
-            lhs_(1,3,2) = lhs_(1,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(3,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(4,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(5,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(2)
-            pivot__3 = 1.00d0 / lhs_(3,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) * pivot__3
-            lhs_(3,5,2) = lhs_(3,5,2) * pivot__3
-            rhs_(3) = rhs_(3) * pivot__3
-            coeff__2 = lhs_(1,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(2,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(4,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(5,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(3)
-            pivot__3 = 1.00d0 / lhs_(4,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) * pivot__3
-            rhs_(4) = rhs_(4) * pivot__3
-            coeff__2 = lhs_(1,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(2,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(3,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(5,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(4)
-            pivot__3 = 1.00d0 / lhs_(5,5,2)
-            rhs_(5) = rhs_(5) * pivot__3
-            coeff__2 = lhs_(1,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(2,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(3,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(4,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(5)
-
-			   endif
-            do  m = 1,5
-               rhs(m,i,j,k) = rhs_(m)
-            enddo  
-
-            enddo  
-         enddo  
-      enddo 
-	  
-
-!DVM$ PARALLEL (k,j,i) ON  rhs(*,i,j,k), private(m, rhs_,rhsp_)
-!DVM$& ,ACROSS(rhs(0:0,0:0,0:1,0:0)),stage(stage_n)
-      do  k = 1,problem_size - 2
-         do  j = problem_size - 2,0,(-(1))
-           do  i = 1,problem_size - 2	  
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-				  rhsp_(m) = rhs(m,i,j+1,k)
-               enddo  
-               do  m = 1,5
-                rhs_(m) = rhs_(m) - lhs__(m,1,i,j,k) * rhsp_(1)
-                rhs_(m) = rhs_(m) - lhs__(m,2,i,j,k) * rhsp_(2)
-                rhs_(m) = rhs_(m) - lhs__(m,3,i,j,k) * rhsp_(3)
-                rhs_(m) = rhs_(m) - lhs__(m,4,i,j,k) * rhsp_(4)
-                rhs_(m) = rhs_(m) - lhs__(m,5,i,j,k) * rhsp_(5)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-
-!DVM$ end region
-      return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve.fdv
deleted file mode 100644
index d967666..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve.fdv
+++ /dev/null
@@ -1,623 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     performs guaussian elimination on this cell.
-!     
-!     assumes that unpacking routines for non-first cells 
-!     preload C' and rhs' from previous cell.
-!     
-!     assumed send happens outside this routine, but that
-!     c'(KMAX) and rhs'(KMAX) will be sent to next cell.
-!---------------------------------------------------------------------
-      subroutine z_solve ()
-
-      include 'header3d.h'
-      double precision  coeff
-      double precision  pivot
-      integer  i__0
-      integer  j__1,m,n
-      double precision  coeff__2
-      double precision  pivot__3
-      double precision  lhs_(5,5,3),rhs_(5),rhsp_(5),u_(0:3,5)
-      integer  i,j,k,ksize, k1
-      ksize = problem_size - 1
-
-!DVM$ region local(lhs__)
-!DVM$ PARALLEL (j,i) ON  rhs(*,i,j,*), private(k,u_,rhs_,pivot,
-!DVM$& coeff, tmp1, tmp2, tmp3, t1, t2, t3, tm1, tm2, tm3,rhsp_,
-!DVM$& tmp11, tmp22, i__0, j__1,lhs_,n,m,pivot__3,coeff__2)
-        do  j = 1,problem_size - 2
-          do  i = 1,problem_size - 2
-            do  m = 1,5
-               u_(0,m) = u(m,i,j,0)
-               u_(1,m) = u(m,i,j,1)
-            enddo  
-            do  k = 1,ksize - 1
-               do  m = 1,5
-                  u_(2,m) = u(m,i,j,k + 1)
-               enddo  
-               tmp1 = 1.0d+00 / u_(1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               t1 = 1.0d+00 / u_(0,1)
-               t2 = t1 * t1
-               t3 = t1 * t2
-               tm1 = 1.0d+00 / u_(2,1)
-               tm2 = tm1 * tm1
-               tm3 = tm1 * tm2
-               tmp11 = dt * tz1
-               tmp22 = dt * tz2
-               lhs_(1,1,1) = (-(tmp11)) * dz1
-               lhs_(1,2,1) = 0.
-               lhs_(1,3,1) = 0.
-               lhs_(1,4,1) = (-(tmp22))
-               lhs_(1,5,1) = 0.
-               lhs_(2,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,2))
-               lhs_(2,2,1) = (-(tmp22)) * u_(0,4) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dz2
-               lhs_(2,3,1) = 0.
-               lhs_(2,4,1) = (-(tmp22)) * u_(0,2) * t1
-               lhs_(2,5,1) = 0.
-               lhs_(3,1,1) = (-(tmp22)) * ((-(u_(0,3) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,3))
-               lhs_(3,2,1) = 0.
-               lhs_(3,3,1) = (-(tmp22)) * u_(0,4) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dz3
-               lhs_(3,4,1) = (-(tmp22)) * u_(0,3) * t1
-               lhs_(3,5,1) = 0.
-               lhs_(4,1,1) = (-(tmp22)) * ((-(u_(0,4) * u_(0,4) * t2)) +
-     & 0.50d+00 * c2 * ((u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4)
-     & * u_(0,4)) * t2)) - tmp11 * ((-(con43)) * c3c4 * t2 * u_(0,4))
-               lhs_(4,2,1) = (-(tmp22)) * ((-(c2)) * u_(0,2) * t1)
-               lhs_(4,3,1) = (-(tmp22)) * ((-(c2)) * u_(0,3) * t1)
-               lhs_(4,4,1) = (-(tmp22)) * (2.0d+00 - c2) * u_(0,4) * t1 
-     &- tmp11 * con43 * c3 * c4 * t1 - tmp11 * dz4
-               lhs_(4,5,1) = (-(tmp22)) * c2
-               lhs_(5,1,1) = (-(tmp22)) * ((c2 * (u_(0,2) * u_(0,2) + u_
-     &(0,3) * u_(0,3) + u_(0,4) * u_(0,4)) * t2 - c1 * (u_(0,5) * t1)) *
-     & (u_(0,4) * t1)) - tmp11 * ((-(c3c4 - c1345)) * t3 * u_(0,2)** 2 -
-     & (c3c4 - c1345) * t3 * u_(0,3)** 2 - (con43 * c3c4 - c1345) * t3 *
-     & u_(0,4)** 2 - c1345 * t2 * u_(0,5))
-               lhs_(5,2,1) = (-(tmp22)) * ((-(c2)) * (u_(0,2) * u_(0,4))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,2)
-               lhs_(5,3,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * u_(0,4))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,3)
-               lhs_(5,4,1) = (-(tmp22)) * (c1 * (u_(0,5) * t1) - 0.50d+0
-     &0 * c2 * ((u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + 3.0d+00 * u_(0,
-     &4) * u_(0,4)) * t2)) - tmp11 * (con43 * c3c4 - c1345) * t2 * u_(0,
-     &4)
-               lhs_(5,5,1) = (-(tmp22)) * c1 * u_(0,4) * t1 - tmp11 * c1
-     &345 * t1 - tmp11 * dz5
-               lhs_(1,1,2) = 1.0d+00 + tmp11 * 2.0d+00 * dz1
-               lhs_(1,2,2) = 0.
-               lhs_(1,3,2) = 0.
-               lhs_(1,4,2) = 0.
-               lhs_(1,5,2) = 0.
-               lhs_(2,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &2))
-               lhs_(2,2,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dz2
-               lhs_(2,3,2) = 0.
-               lhs_(2,4,2) = 0.
-               lhs_(2,5,2) = 0.
-               lhs_(3,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &3))
-               lhs_(3,2,2) = 0.
-               lhs_(3,3,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dz3
-               lhs_(3,4,2) = 0.
-               lhs_(3,5,2) = 0.
-               lhs_(4,1,2) = tmp11 * 2.0d+00 * ((-(con43)) * c3c4 * tmp2
-     & * u_(1,4))
-               lhs_(4,2,2) = 0.
-               lhs_(4,3,2) = 0.
-               lhs_(4,4,2) = 1.0d+00 + tmp11 * 2.0d+00 * con43 * c3 * c4
-     & * tmp1 + tmp11 * 2.0d+00 * dz4
-               lhs_(4,5,2) = 0.
-               lhs_(5,1,2) = tmp11 * 2.0d+00 * ((-(c3c4 - c1345)) * tmp3
-     & * u_(1,2)** 2 - (c3c4 - c1345) * tmp3 * u_(1,3)** 2 - (con43 * c3
-     &c4 - c1345) * tmp3 * u_(1,4)** 2 - c1345 * tmp2 * u_(1,5))
-               lhs_(5,2,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,2)
-               lhs_(5,3,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,3)
-               lhs_(5,4,2) = tmp11 * 2.0d+00 * (con43 * c3c4 - c1345) * 
-     &tmp2 * u_(1,4)
-               lhs_(5,5,2) = 1.0d+00 + tmp11 * 2.0d+00 * c1345 * tmp1 + 
-     &tmp11 * 2.0d+00 * dz5
-               if (k .ne. 1) then
-                  do  j__1 = 1,5
-                     lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs
-     &_(1,j__1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,
-     &j__1,3) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs
-     &_(1,j__1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,
-     &j__1,3) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs
-     &_(1,j__1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,
-     &j__1,3) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs
-     &_(1,j__1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,
-     &j__1,3) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs
-     &_(1,j__1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,
-     &j__1,3) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1
-     &,3)
-                  enddo  
-               endif  
-               lhs_(1,1,3) = (-(tmp11)) * dz1
-               lhs_(1,2,3) = 0.
-               lhs_(1,3,3) = 0.
-               lhs_(1,4,3) = tmp22
-               lhs_(1,5,3) = 0.
-               lhs_(2,1,3) = tmp22 * ((-(u_(2,2) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,2))
-               lhs_(2,2,3) = tmp22 * u_(2,4) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dz2
-               lhs_(2,3,3) = 0.
-               lhs_(2,4,3) = tmp22 * u_(2,2) * tm1
-               lhs_(2,5,3) = 0.
-               lhs_(3,1,3) = tmp22 * ((-(u_(2,3) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,3))
-               lhs_(3,2,3) = 0.
-               lhs_(3,3,3) = tmp22 * u_(2,4) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dz3
-               lhs_(3,4,3) = tmp22 * u_(2,3) * tm1
-               lhs_(3,5,3) = 0.
-               lhs_(4,1,3) = tmp22 * ((-(u_(2,4) * u_(2,4) * tm2)) + 0.5
-     &0d+00 * c2 * ((u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u
-     &_(2,4)) * tm2)) - tmp11 * ((-(con43)) * c3c4 * tm2 * u_(2,4))
-               lhs_(4,2,3) = tmp22 * ((-(c2)) * u_(2,2) * tm1)
-               lhs_(4,3,3) = tmp22 * ((-(c2)) * u_(2,3) * tm1)
-               lhs_(4,4,3) = tmp22 * (2.0d+00 - c2) * u_(2,4) * tm1 - tm
-     &p11 * con43 * c3 * c4 * tm1 - tmp11 * dz4
-               lhs_(4,5,3) = tmp22 * c2
-               lhs_(5,1,3) = tmp22 * ((c2 * (u_(2,2) * u_(2,2) + u_(2,3)
-     & * u_(2,3) + u_(2,4) * u_(2,4)) * tm2 - c1 * (u_(2,5) * tm1)) * (u
-     &_(2,4) * tm1)) - tmp11 * ((-(c3c4 - c1345)) * tm3 * u_(2,2)** 2 - 
-     &(c3c4 - c1345) * tm3 * u_(2,3)** 2 - (con43 * c3c4 - c1345) * tm3 
-     &* u_(2,4)** 2 - c1345 * tm2 * u_(2,5))
-               lhs_(5,2,3) = tmp22 * ((-(c2)) * (u_(2,2) * u_(2,4)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,2)
-               lhs_(5,3,3) = tmp22 * ((-(c2)) * (u_(2,3) * u_(2,4)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,3)
-               lhs_(5,4,3) = tmp22 * (c1 * (u_(2,5) * tm1) - 0.50d+00 * 
-     &c2 * ((u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + 3.0d+00 * u_(2,4) *
-     & u_(2,4)) * tm2)) - tmp11 * (con43 * c3c4 - c1345) * tm2 * u_(2,4)
-               lhs_(5,5,3) = tmp22 * c1 * u_(2,4) * tm1 - tmp11 * c1345 
-     &* tm1 - tmp11 * dz5
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  i__0 = 1,5
-                  rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,j,k
-     & - 1) - lhs_(i__0,2,1) * rhs(2,i,j,k - 1) - lhs_(i__0,3,1) * rhs(3
-     &,i,j,k - 1) - lhs_(i__0,4,1) * rhs(4,i,j,k - 1) - lhs_(i__0,5,1) *
-     & rhs(5,i,j,k - 1)
-               enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-               pivot = 1.00d0 / lhs_(1,1,2)
-               lhs_(1,2,2) = lhs_(1,2,2) * pivot
-               lhs_(1,3,2) = lhs_(1,3,2) * pivot
-               lhs_(1,4,2) = lhs_(1,4,2) * pivot
-               lhs_(1,5,2) = lhs_(1,5,2) * pivot
-               lhs_(1,1,3) = lhs_(1,1,3) * pivot
-               lhs_(1,2,3) = lhs_(1,2,3) * pivot
-               lhs_(1,3,3) = lhs_(1,3,3) * pivot
-               lhs_(1,4,3) = lhs_(1,4,3) * pivot
-               lhs_(1,5,3) = lhs_(1,5,3) * pivot
-               rhs_(1) = rhs_(1) * pivot
-               coeff = lhs_(2,1,2)
-               lhs_(2,2,2) = lhs_(2,2,2) - coeff * lhs_(1,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) - coeff * lhs_(1,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(1,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(1,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(1,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(1,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(1,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(1,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(1,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(1)
-               coeff = lhs_(3,1,2)
-               lhs_(3,2,2) = lhs_(3,2,2) - coeff * lhs_(1,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(1,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(1,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(1,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(1,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(1,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(1,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(1,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(1,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(1)
-               coeff = lhs_(4,1,2)
-               lhs_(4,2,2) = lhs_(4,2,2) - coeff * lhs_(1,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(1,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(1,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(1,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(1,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(1,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(1,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(1,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(1,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(1)
-               coeff = lhs_(5,1,2)
-               lhs_(5,2,2) = lhs_(5,2,2) - coeff * lhs_(1,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(1,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(1,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(1,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(1,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(1,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(1,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(1,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(1,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(1)
-               pivot = 1.00d0 / lhs_(2,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) * pivot
-               lhs_(2,4,2) = lhs_(2,4,2) * pivot
-               lhs_(2,5,2) = lhs_(2,5,2) * pivot
-               lhs_(2,1,3) = lhs_(2,1,3) * pivot
-               lhs_(2,2,3) = lhs_(2,2,3) * pivot
-               lhs_(2,3,3) = lhs_(2,3,3) * pivot
-               lhs_(2,4,3) = lhs_(2,4,3) * pivot
-               lhs_(2,5,3) = lhs_(2,5,3) * pivot
-               rhs_(2) = rhs_(2) * pivot
-               coeff = lhs_(1,2,2)
-               lhs_(1,3,2) = lhs_(1,3,2) - coeff * lhs_(2,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(2,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(2,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(2,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(2,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(2,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(2,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(2,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(2)
-               coeff = lhs_(3,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(2,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(2,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(2,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(2,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(2,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(2,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(2,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(2,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(2)
-               coeff = lhs_(4,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(2,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(2,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(2,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(2,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(2,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(2,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(2,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(2,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(2)
-               coeff = lhs_(5,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(2,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(2,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(2,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(2,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(2,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(2,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(2,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(2,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(2)
-               pivot = 1.00d0 / lhs_(3,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) * pivot
-               lhs_(3,5,2) = lhs_(3,5,2) * pivot
-               lhs_(3,1,3) = lhs_(3,1,3) * pivot
-               lhs_(3,2,3) = lhs_(3,2,3) * pivot
-               lhs_(3,3,3) = lhs_(3,3,3) * pivot
-               lhs_(3,4,3) = lhs_(3,4,3) * pivot
-               lhs_(3,5,3) = lhs_(3,5,3) * pivot
-               rhs_(3) = rhs_(3) * pivot
-               coeff = lhs_(1,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(3,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(3,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(3,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(3,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(3,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(3,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(3,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(3)
-               coeff = lhs_(2,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(3,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(3,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(3,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(3,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(3,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(3,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(3,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(3)
-               coeff = lhs_(4,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(3,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(3,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(3,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(3,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(3,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(3,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(3,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(3)
-               coeff = lhs_(5,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(3,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(3,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(3,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(3,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(3,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(3,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(3,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(3)
-               pivot = 1.00d0 / lhs_(4,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) * pivot
-               lhs_(4,1,3) = lhs_(4,1,3) * pivot
-               lhs_(4,2,3) = lhs_(4,2,3) * pivot
-               lhs_(4,3,3) = lhs_(4,3,3) * pivot
-               lhs_(4,4,3) = lhs_(4,4,3) * pivot
-               lhs_(4,5,3) = lhs_(4,5,3) * pivot
-               rhs_(4) = rhs_(4) * pivot
-               coeff = lhs_(1,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(4,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(4,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(4,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(4,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(4,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(4,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(4)
-               coeff = lhs_(2,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(4,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(4,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(4,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(4,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(4,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(4,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(4)
-               coeff = lhs_(3,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(4,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(4,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(4,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(4,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(4,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(4,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(4)
-               coeff = lhs_(5,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(4,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(4,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(4,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(4,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(4,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(4,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(4)
-               pivot = 1.00d0 / lhs_(5,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) * pivot
-               lhs_(5,2,3) = lhs_(5,2,3) * pivot
-               lhs_(5,3,3) = lhs_(5,3,3) * pivot
-               lhs_(5,4,3) = lhs_(5,4,3) * pivot
-               lhs_(5,5,3) = lhs_(5,5,3) * pivot
-               rhs_(5) = rhs_(5) * pivot
-               coeff = lhs_(1,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(5,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(5,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(5,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(5,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(5,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(5)
-               coeff = lhs_(2,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(5,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(5,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(5,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(5,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(5,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(5)
-               coeff = lhs_(3,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(5,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(5,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(5,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(5,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(5,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(5)
-               coeff = lhs_(4,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(5,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(5,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(5,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(5,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(5,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(5)
-               do  i__0 = 1,5
-                  lhs__(i__0,1,i,j,k) = lhs_(i__0,1,3)
-                  lhs__(i__0,2,i,j,k) = lhs_(i__0,2,3)
-                  lhs__(i__0,3,i,j,k) = lhs_(i__0,3,3)
-                  lhs__(i__0,4,i,j,k) = lhs_(i__0,4,3)
-                  lhs__(i__0,5,i,j,k) = lhs_(i__0,5,3)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-                  u_(0,m) = u_(1,m)
-                  u_(1,m) = u_(2,m)
-               enddo  
-            enddo  
-            do  n = 1,5
-               lhs_(1,n,1) = 0.0d0
-               lhs_(1,n,2) = 0.0d0
-               lhs_(1,n,3) = 0.0d0
-               lhs_(2,n,1) = 0.0d0
-               lhs_(2,n,2) = 0.0d0
-               lhs_(2,n,3) = 0.0d0
-               lhs_(3,n,1) = 0.0d0
-               lhs_(3,n,2) = 0.0d0
-               lhs_(3,n,3) = 0.0d0
-               lhs_(4,n,1) = 0.0d0
-               lhs_(4,n,2) = 0.0d0
-               lhs_(4,n,3) = 0.0d0
-               lhs_(5,n,1) = 0.0d0
-               lhs_(5,n,2) = 0.0d0
-               lhs_(5,n,3) = 0.0d0
-            enddo  
-            do  m = 1,5
-               lhs_(m,m,2) = 1.0d0
-            enddo  
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-            enddo  
-            do  i__0 = 1,5
-               rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,j,ksiz
-     &e - 1) - lhs_(i__0,2,1) * rhs(2,i,j,ksize - 1) - lhs_(i__0,3,1) * 
-     &rhs(3,i,j,ksize - 1) - lhs_(i__0,4,1) * rhs(4,i,j,ksize - 1) - lhs
-     &_(i__0,5,1) * rhs(5,i,j,ksize - 1)
-            enddo  
-            do  j__1 = 1,5
-               lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,j__1,3
-     &) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1,3)
-               lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,j__1,3
-     &) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1,3)
-               lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,j__1,3
-     &) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1,3)
-               lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,j__1,3
-     &) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1,3)
-               lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,j__1,3
-     &) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1,3)
-            enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-            pivot__3 = 1.00d0 / lhs_(1,1,2)
-            lhs_(1,2,2) = lhs_(1,2,2) * pivot__3
-            lhs_(1,3,2) = lhs_(1,3,2) * pivot__3
-            lhs_(1,4,2) = lhs_(1,4,2) * pivot__3
-            lhs_(1,5,2) = lhs_(1,5,2) * pivot__3
-            rhs_(1) = rhs_(1) * pivot__3
-            coeff__2 = lhs_(2,1,2)
-            lhs_(2,2,2) = lhs_(2,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(3,1,2)
-            lhs_(3,2,2) = lhs_(3,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(4,1,2)
-            lhs_(4,2,2) = lhs_(4,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(5,1,2)
-            lhs_(5,2,2) = lhs_(5,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(1)
-            pivot__3 = 1.00d0 / lhs_(2,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) * pivot__3
-            lhs_(2,4,2) = lhs_(2,4,2) * pivot__3
-            lhs_(2,5,2) = lhs_(2,5,2) * pivot__3
-            rhs_(2) = rhs_(2) * pivot__3
-            coeff__2 = lhs_(1,2,2)
-            lhs_(1,3,2) = lhs_(1,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(3,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(4,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(5,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(2)
-            pivot__3 = 1.00d0 / lhs_(3,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) * pivot__3
-            lhs_(3,5,2) = lhs_(3,5,2) * pivot__3
-            rhs_(3) = rhs_(3) * pivot__3
-            coeff__2 = lhs_(1,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(2,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(4,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(5,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(3)
-            pivot__3 = 1.00d0 / lhs_(4,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) * pivot__3
-            rhs_(4) = rhs_(4) * pivot__3
-            coeff__2 = lhs_(1,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(2,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(3,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(5,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(4)
-            pivot__3 = 1.00d0 / lhs_(5,5,2)
-            rhs_(5) = rhs_(5) * pivot__3
-            coeff__2 = lhs_(1,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(2,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(3,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(4,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(5)
-            do  m = 1,5
-               rhs(m,i,j,k) = rhs_(m)
-            enddo  
-			
-            k = ksize-1
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-			   rhsp_(m) = rhs(m,i,j,k + 1)
-            enddo  
-            do  k = ksize-1, 1, (-(1))
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  m = 1,5
-                  rhs_(m) = rhs_(m) - lhs__(m,1,i,j,k) * rhsp_(1)
-                  rhs_(m) = rhs_(m) - lhs__(m,2,i,j,k) * rhsp_(2)
-                  rhs_(m) = rhs_(m) - lhs__(m,3,i,j,k) * rhsp_(3)
-                  rhs_(m) = rhs_(m) - lhs__(m,4,i,j,k) * rhsp_(4)
-                  rhs_(m) = rhs_(m) - lhs__(m,5,i,j,k) * rhsp_(5)
-               enddo  
-               do  m = 1,5
-                 rhsp_(m) = rhs_(m)
-                 u(m,i,j,k) = u(m,i,j,k) + rhs_(m)
-               enddo  
-            enddo
-          enddo
-        enddo
-!DVM$ end region  
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_block.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_block.fdv
deleted file mode 100644
index ac97c19..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_block.fdv
+++ /dev/null
@@ -1,636 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     performs guaussian elimination on this cell.
-!     
-!     assumes that unpacking routines for non-first cells 
-!     preload C' and rhs' from previous cell.
-!     
-!     assumed send happens outside this routine, but that
-!     c'(KMAX) and rhs'(KMAX) will be sent to next cell.
-!---------------------------------------------------------------------
-      subroutine z_solve ()
-
-      include 'header3d.h'
-      double precision  coeff
-      double precision  pivot
-      integer  i__0
-      integer  j__1,m,n
-      double precision  coeff__2
-      double precision  pivot__3
-      double precision  lhs_(5,5,3),rhs_(5),rhsp_(5),u_(0:3,5)
-      integer  i,j,k,ksize,j1,maxblJ,low_j,high_j
-      ksize = problem_size - 1	  
-      if(mod((problem_size - 2), BL) .eq. 0) then
-	      maxBlJ = (problem_size - 2) / BL
-      else
-	      maxblJ = (problem_size - 2) / BL + 1
-      endif
-!DVM$ region local(lhs__)
-!DVM$ PARALLEL (j1,i) ON  rhs(*,i,j1,*), private(k,u_,rhs_,pivot,
-!DVM$& coeff, tmp1, tmp2, tmp3, t1, t2, t3, tm1, tm2, tm3,rhsp_,
-!DVM$& tmp11, tmp22, i__0, j__1,lhs_,n,m,pivot__3,
-!DVM$& coeff__2,j,low_j,high_j),cuda_block(32)
-        do  j1 = 1, maxBlJ
-          do  i = 1, problem_size - 2
-             low_j = (j1 - 1) * BL + 1
-             high_j = j1 * BL
-             if(high_j .gt. problem_size - 2) then
-			     high_j = problem_size - 2
-		     endif
-          do j = low_j, high_j
-            do  m = 1,5
-               u_(0,m) = u(m,i,j,0)
-               u_(1,m) = u(m,i,j,1)
-            enddo  
-            do  k = 1,ksize - 1
-               do  m = 1,5
-                  u_(2,m) = u(m,i,j,k + 1)
-               enddo  
-               tmp1 = 1.0d+00 / u_(1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               t1 = 1.0d+00 / u_(0,1)
-               t2 = t1 * t1
-               t3 = t1 * t2
-               tm1 = 1.0d+00 / u_(2,1)
-               tm2 = tm1 * tm1
-               tm3 = tm1 * tm2
-               tmp11 = dt * tz1
-               tmp22 = dt * tz2
-               lhs_(1,1,1) = (-(tmp11)) * dz1
-               lhs_(1,2,1) = 0.
-               lhs_(1,3,1) = 0.
-               lhs_(1,4,1) = (-(tmp22))
-               lhs_(1,5,1) = 0.
-               lhs_(2,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,2))
-               lhs_(2,2,1) = (-(tmp22)) * u_(0,4) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dz2
-               lhs_(2,3,1) = 0.
-               lhs_(2,4,1) = (-(tmp22)) * u_(0,2) * t1
-               lhs_(2,5,1) = 0.
-               lhs_(3,1,1) = (-(tmp22)) * ((-(u_(0,3) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,3))
-               lhs_(3,2,1) = 0.
-               lhs_(3,3,1) = (-(tmp22)) * u_(0,4) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dz3
-               lhs_(3,4,1) = (-(tmp22)) * u_(0,3) * t1
-               lhs_(3,5,1) = 0.
-               lhs_(4,1,1) = (-(tmp22)) * ((-(u_(0,4) * u_(0,4) * t2)) +
-     & 0.50d+00 * c2 * ((u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4)
-     & * u_(0,4)) * t2)) - tmp11 * ((-(con43)) * c3c4 * t2 * u_(0,4))
-               lhs_(4,2,1) = (-(tmp22)) * ((-(c2)) * u_(0,2) * t1)
-               lhs_(4,3,1) = (-(tmp22)) * ((-(c2)) * u_(0,3) * t1)
-               lhs_(4,4,1) = (-(tmp22)) * (2.0d+00 - c2) * u_(0,4) * t1 
-     &- tmp11 * con43 * c3 * c4 * t1 - tmp11 * dz4
-               lhs_(4,5,1) = (-(tmp22)) * c2
-               lhs_(5,1,1) = (-(tmp22)) * ((c2 * (u_(0,2) * u_(0,2) + u_
-     &(0,3) * u_(0,3) + u_(0,4) * u_(0,4)) * t2 - c1 * (u_(0,5) * t1)) *
-     & (u_(0,4) * t1)) - tmp11 * ((-(c3c4 - c1345)) * t3 * u_(0,2)** 2 -
-     & (c3c4 - c1345) * t3 * u_(0,3)** 2 - (con43 * c3c4 - c1345) * t3 *
-     & u_(0,4)** 2 - c1345 * t2 * u_(0,5))
-               lhs_(5,2,1) = (-(tmp22)) * ((-(c2)) * (u_(0,2) * u_(0,4))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,2)
-               lhs_(5,3,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * u_(0,4))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,3)
-               lhs_(5,4,1) = (-(tmp22)) * (c1 * (u_(0,5) * t1) - 0.50d+0
-     &0 * c2 * ((u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + 3.0d+00 * u_(0,
-     &4) * u_(0,4)) * t2)) - tmp11 * (con43 * c3c4 - c1345) * t2 * u_(0,
-     &4)
-               lhs_(5,5,1) = (-(tmp22)) * c1 * u_(0,4) * t1 - tmp11 * c1
-     &345 * t1 - tmp11 * dz5
-               lhs_(1,1,2) = 1.0d+00 + tmp11 * 2.0d+00 * dz1
-               lhs_(1,2,2) = 0.
-               lhs_(1,3,2) = 0.
-               lhs_(1,4,2) = 0.
-               lhs_(1,5,2) = 0.
-               lhs_(2,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &2))
-               lhs_(2,2,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dz2
-               lhs_(2,3,2) = 0.
-               lhs_(2,4,2) = 0.
-               lhs_(2,5,2) = 0.
-               lhs_(3,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &3))
-               lhs_(3,2,2) = 0.
-               lhs_(3,3,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dz3
-               lhs_(3,4,2) = 0.
-               lhs_(3,5,2) = 0.
-               lhs_(4,1,2) = tmp11 * 2.0d+00 * ((-(con43)) * c3c4 * tmp2
-     & * u_(1,4))
-               lhs_(4,2,2) = 0.
-               lhs_(4,3,2) = 0.
-               lhs_(4,4,2) = 1.0d+00 + tmp11 * 2.0d+00 * con43 * c3 * c4
-     & * tmp1 + tmp11 * 2.0d+00 * dz4
-               lhs_(4,5,2) = 0.
-               lhs_(5,1,2) = tmp11 * 2.0d+00 * ((-(c3c4 - c1345)) * tmp3
-     & * u_(1,2)** 2 - (c3c4 - c1345) * tmp3 * u_(1,3)** 2 - (con43 * c3
-     &c4 - c1345) * tmp3 * u_(1,4)** 2 - c1345 * tmp2 * u_(1,5))
-               lhs_(5,2,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,2)
-               lhs_(5,3,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,3)
-               lhs_(5,4,2) = tmp11 * 2.0d+00 * (con43 * c3c4 - c1345) * 
-     &tmp2 * u_(1,4)
-               lhs_(5,5,2) = 1.0d+00 + tmp11 * 2.0d+00 * c1345 * tmp1 + 
-     &tmp11 * 2.0d+00 * dz5
-               if (k .ne. 1) then
-                  do  j__1 = 1,5
-                     lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs
-     &_(1,j__1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,
-     &j__1,3) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs
-     &_(1,j__1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,
-     &j__1,3) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs
-     &_(1,j__1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,
-     &j__1,3) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs
-     &_(1,j__1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,
-     &j__1,3) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs
-     &_(1,j__1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,
-     &j__1,3) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1
-     &,3)
-                  enddo  
-               endif  
-               lhs_(1,1,3) = (-(tmp11)) * dz1
-               lhs_(1,2,3) = 0.
-               lhs_(1,3,3) = 0.
-               lhs_(1,4,3) = tmp22
-               lhs_(1,5,3) = 0.
-               lhs_(2,1,3) = tmp22 * ((-(u_(2,2) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,2))
-               lhs_(2,2,3) = tmp22 * u_(2,4) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dz2
-               lhs_(2,3,3) = 0.
-               lhs_(2,4,3) = tmp22 * u_(2,2) * tm1
-               lhs_(2,5,3) = 0.
-               lhs_(3,1,3) = tmp22 * ((-(u_(2,3) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,3))
-               lhs_(3,2,3) = 0.
-               lhs_(3,3,3) = tmp22 * u_(2,4) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dz3
-               lhs_(3,4,3) = tmp22 * u_(2,3) * tm1
-               lhs_(3,5,3) = 0.
-               lhs_(4,1,3) = tmp22 * ((-(u_(2,4) * u_(2,4) * tm2)) + 0.5
-     &0d+00 * c2 * ((u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u
-     &_(2,4)) * tm2)) - tmp11 * ((-(con43)) * c3c4 * tm2 * u_(2,4))
-               lhs_(4,2,3) = tmp22 * ((-(c2)) * u_(2,2) * tm1)
-               lhs_(4,3,3) = tmp22 * ((-(c2)) * u_(2,3) * tm1)
-               lhs_(4,4,3) = tmp22 * (2.0d+00 - c2) * u_(2,4) * tm1 - tm
-     &p11 * con43 * c3 * c4 * tm1 - tmp11 * dz4
-               lhs_(4,5,3) = tmp22 * c2
-               lhs_(5,1,3) = tmp22 * ((c2 * (u_(2,2) * u_(2,2) + u_(2,3)
-     & * u_(2,3) + u_(2,4) * u_(2,4)) * tm2 - c1 * (u_(2,5) * tm1)) * (u
-     &_(2,4) * tm1)) - tmp11 * ((-(c3c4 - c1345)) * tm3 * u_(2,2)** 2 - 
-     &(c3c4 - c1345) * tm3 * u_(2,3)** 2 - (con43 * c3c4 - c1345) * tm3 
-     &* u_(2,4)** 2 - c1345 * tm2 * u_(2,5))
-               lhs_(5,2,3) = tmp22 * ((-(c2)) * (u_(2,2) * u_(2,4)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,2)
-               lhs_(5,3,3) = tmp22 * ((-(c2)) * (u_(2,3) * u_(2,4)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,3)
-               lhs_(5,4,3) = tmp22 * (c1 * (u_(2,5) * tm1) - 0.50d+00 * 
-     &c2 * ((u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + 3.0d+00 * u_(2,4) *
-     & u_(2,4)) * tm2)) - tmp11 * (con43 * c3c4 - c1345) * tm2 * u_(2,4)
-               lhs_(5,5,3) = tmp22 * c1 * u_(2,4) * tm1 - tmp11 * c1345 
-     &* tm1 - tmp11 * dz5
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  i__0 = 1,5
-                  rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,j,k
-     & - 1) - lhs_(i__0,2,1) * rhs(2,i,j,k - 1) - lhs_(i__0,3,1) * rhs(3
-     &,i,j,k - 1) - lhs_(i__0,4,1) * rhs(4,i,j,k - 1) - lhs_(i__0,5,1) *
-     & rhs(5,i,j,k - 1)
-               enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-               pivot = 1.00d0 / lhs_(1,1,2)
-               lhs_(1,2,2) = lhs_(1,2,2) * pivot
-               lhs_(1,3,2) = lhs_(1,3,2) * pivot
-               lhs_(1,4,2) = lhs_(1,4,2) * pivot
-               lhs_(1,5,2) = lhs_(1,5,2) * pivot
-               lhs_(1,1,3) = lhs_(1,1,3) * pivot
-               lhs_(1,2,3) = lhs_(1,2,3) * pivot
-               lhs_(1,3,3) = lhs_(1,3,3) * pivot
-               lhs_(1,4,3) = lhs_(1,4,3) * pivot
-               lhs_(1,5,3) = lhs_(1,5,3) * pivot
-               rhs_(1) = rhs_(1) * pivot
-               coeff = lhs_(2,1,2)
-               lhs_(2,2,2) = lhs_(2,2,2) - coeff * lhs_(1,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) - coeff * lhs_(1,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(1,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(1,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(1,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(1,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(1,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(1,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(1,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(1)
-               coeff = lhs_(3,1,2)
-               lhs_(3,2,2) = lhs_(3,2,2) - coeff * lhs_(1,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(1,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(1,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(1,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(1,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(1,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(1,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(1,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(1,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(1)
-               coeff = lhs_(4,1,2)
-               lhs_(4,2,2) = lhs_(4,2,2) - coeff * lhs_(1,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(1,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(1,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(1,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(1,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(1,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(1,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(1,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(1,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(1)
-               coeff = lhs_(5,1,2)
-               lhs_(5,2,2) = lhs_(5,2,2) - coeff * lhs_(1,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(1,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(1,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(1,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(1,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(1,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(1,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(1,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(1,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(1)
-               pivot = 1.00d0 / lhs_(2,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) * pivot
-               lhs_(2,4,2) = lhs_(2,4,2) * pivot
-               lhs_(2,5,2) = lhs_(2,5,2) * pivot
-               lhs_(2,1,3) = lhs_(2,1,3) * pivot
-               lhs_(2,2,3) = lhs_(2,2,3) * pivot
-               lhs_(2,3,3) = lhs_(2,3,3) * pivot
-               lhs_(2,4,3) = lhs_(2,4,3) * pivot
-               lhs_(2,5,3) = lhs_(2,5,3) * pivot
-               rhs_(2) = rhs_(2) * pivot
-               coeff = lhs_(1,2,2)
-               lhs_(1,3,2) = lhs_(1,3,2) - coeff * lhs_(2,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(2,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(2,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(2,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(2,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(2,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(2,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(2,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(2)
-               coeff = lhs_(3,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(2,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(2,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(2,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(2,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(2,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(2,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(2,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(2,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(2)
-               coeff = lhs_(4,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(2,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(2,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(2,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(2,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(2,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(2,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(2,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(2,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(2)
-               coeff = lhs_(5,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(2,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(2,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(2,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(2,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(2,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(2,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(2,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(2,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(2)
-               pivot = 1.00d0 / lhs_(3,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) * pivot
-               lhs_(3,5,2) = lhs_(3,5,2) * pivot
-               lhs_(3,1,3) = lhs_(3,1,3) * pivot
-               lhs_(3,2,3) = lhs_(3,2,3) * pivot
-               lhs_(3,3,3) = lhs_(3,3,3) * pivot
-               lhs_(3,4,3) = lhs_(3,4,3) * pivot
-               lhs_(3,5,3) = lhs_(3,5,3) * pivot
-               rhs_(3) = rhs_(3) * pivot
-               coeff = lhs_(1,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(3,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(3,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(3,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(3,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(3,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(3,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(3,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(3)
-               coeff = lhs_(2,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(3,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(3,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(3,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(3,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(3,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(3,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(3,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(3)
-               coeff = lhs_(4,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(3,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(3,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(3,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(3,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(3,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(3,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(3,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(3)
-               coeff = lhs_(5,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(3,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(3,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(3,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(3,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(3,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(3,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(3,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(3)
-               pivot = 1.00d0 / lhs_(4,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) * pivot
-               lhs_(4,1,3) = lhs_(4,1,3) * pivot
-               lhs_(4,2,3) = lhs_(4,2,3) * pivot
-               lhs_(4,3,3) = lhs_(4,3,3) * pivot
-               lhs_(4,4,3) = lhs_(4,4,3) * pivot
-               lhs_(4,5,3) = lhs_(4,5,3) * pivot
-               rhs_(4) = rhs_(4) * pivot
-               coeff = lhs_(1,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(4,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(4,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(4,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(4,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(4,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(4,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(4)
-               coeff = lhs_(2,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(4,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(4,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(4,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(4,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(4,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(4,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(4)
-               coeff = lhs_(3,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(4,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(4,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(4,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(4,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(4,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(4,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(4)
-               coeff = lhs_(5,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(4,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(4,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(4,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(4,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(4,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(4,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(4)
-               pivot = 1.00d0 / lhs_(5,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) * pivot
-               lhs_(5,2,3) = lhs_(5,2,3) * pivot
-               lhs_(5,3,3) = lhs_(5,3,3) * pivot
-               lhs_(5,4,3) = lhs_(5,4,3) * pivot
-               lhs_(5,5,3) = lhs_(5,5,3) * pivot
-               rhs_(5) = rhs_(5) * pivot
-               coeff = lhs_(1,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(5,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(5,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(5,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(5,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(5,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(5)
-               coeff = lhs_(2,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(5,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(5,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(5,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(5,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(5,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(5)
-               coeff = lhs_(3,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(5,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(5,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(5,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(5,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(5,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(5)
-               coeff = lhs_(4,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(5,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(5,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(5,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(5,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(5,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(5)
-               do  i__0 = 1,5
-                  lhs__(i__0,1,i,k,j1) = lhs_(i__0,1,3)
-                  lhs__(i__0,2,i,k,j1) = lhs_(i__0,2,3)
-                  lhs__(i__0,3,i,k,j1) = lhs_(i__0,3,3)
-                  lhs__(i__0,4,i,k,j1) = lhs_(i__0,4,3)
-                  lhs__(i__0,5,i,k,j1) = lhs_(i__0,5,3)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-                  u_(0,m) = u_(1,m)
-                  u_(1,m) = u_(2,m)
-               enddo  
-            enddo  
-            do  n = 1,5
-               lhs_(1,n,1) = 0.0d0
-               lhs_(1,n,2) = 0.0d0
-               lhs_(1,n,3) = 0.0d0
-               lhs_(2,n,1) = 0.0d0
-               lhs_(2,n,2) = 0.0d0
-               lhs_(2,n,3) = 0.0d0
-               lhs_(3,n,1) = 0.0d0
-               lhs_(3,n,2) = 0.0d0
-               lhs_(3,n,3) = 0.0d0
-               lhs_(4,n,1) = 0.0d0
-               lhs_(4,n,2) = 0.0d0
-               lhs_(4,n,3) = 0.0d0
-               lhs_(5,n,1) = 0.0d0
-               lhs_(5,n,2) = 0.0d0
-               lhs_(5,n,3) = 0.0d0
-            enddo  
-            do  m = 1,5
-               lhs_(m,m,2) = 1.0d0
-            enddo  
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-            enddo  
-            do  i__0 = 1,5
-               rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,j,ksiz
-     &e - 1) - lhs_(i__0,2,1) * rhs(2,i,j,ksize - 1) - lhs_(i__0,3,1) * 
-     &rhs(3,i,j,ksize - 1) - lhs_(i__0,4,1) * rhs(4,i,j,ksize - 1) - lhs
-     &_(i__0,5,1) * rhs(5,i,j,ksize - 1)
-            enddo  
-            do  j__1 = 1,5
-               lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,j__1,3
-     &) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1,3)
-               lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,j__1,3
-     &) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1,3)
-               lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,j__1,3
-     &) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1,3)
-               lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,j__1,3
-     &) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1,3)
-               lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,j__1,3
-     &) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1,3)
-            enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-            pivot__3 = 1.00d0 / lhs_(1,1,2)
-            lhs_(1,2,2) = lhs_(1,2,2) * pivot__3
-            lhs_(1,3,2) = lhs_(1,3,2) * pivot__3
-            lhs_(1,4,2) = lhs_(1,4,2) * pivot__3
-            lhs_(1,5,2) = lhs_(1,5,2) * pivot__3
-            rhs_(1) = rhs_(1) * pivot__3
-            coeff__2 = lhs_(2,1,2)
-            lhs_(2,2,2) = lhs_(2,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(3,1,2)
-            lhs_(3,2,2) = lhs_(3,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(4,1,2)
-            lhs_(4,2,2) = lhs_(4,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(5,1,2)
-            lhs_(5,2,2) = lhs_(5,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(1)
-            pivot__3 = 1.00d0 / lhs_(2,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) * pivot__3
-            lhs_(2,4,2) = lhs_(2,4,2) * pivot__3
-            lhs_(2,5,2) = lhs_(2,5,2) * pivot__3
-            rhs_(2) = rhs_(2) * pivot__3
-            coeff__2 = lhs_(1,2,2)
-            lhs_(1,3,2) = lhs_(1,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(3,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(4,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(5,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(2)
-            pivot__3 = 1.00d0 / lhs_(3,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) * pivot__3
-            lhs_(3,5,2) = lhs_(3,5,2) * pivot__3
-            rhs_(3) = rhs_(3) * pivot__3
-            coeff__2 = lhs_(1,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(2,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(4,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(5,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(3)
-            pivot__3 = 1.00d0 / lhs_(4,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) * pivot__3
-            rhs_(4) = rhs_(4) * pivot__3
-            coeff__2 = lhs_(1,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(2,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(3,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(5,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(4)
-            pivot__3 = 1.00d0 / lhs_(5,5,2)
-            rhs_(5) = rhs_(5) * pivot__3
-            coeff__2 = lhs_(1,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(2,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(3,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(4,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(5)
-            do  m = 1,5
-               rhs(m,i,j,k) = rhs_(m)
-            enddo  
-			
-            k = ksize-1
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-			   rhsp_(m) = rhs(m,i,j,k + 1)
-            enddo  
-            do  k = ksize-1, 1, (-(1))
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  m = 1,5
-                  rhs_(m) = rhs_(m) - lhs__(m,1,i,k,j1) * rhsp_(1)
-                  rhs_(m) = rhs_(m) - lhs__(m,2,i,k,j1) * rhsp_(2)
-                  rhs_(m) = rhs_(m) - lhs__(m,3,i,k,j1) * rhsp_(3)
-                  rhs_(m) = rhs_(m) - lhs__(m,4,i,k,j1) * rhsp_(4)
-                  rhs_(m) = rhs_(m) - lhs__(m,5,i,k,j1) * rhsp_(5)
-               enddo  
-               do  m = 1,5
-                 rhsp_(m) = rhs_(m)
-                 u(m,i,j,k) = u(m,i,j,k) + rhs_(m)
-               enddo  
-            enddo
-			
-            enddo			
-          enddo
-        enddo
-!DVM$ end region  
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_mpi.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_mpi.fdv
deleted file mode 100644
index 20f8f35..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/BT/z_solve_mpi.fdv
+++ /dev/null
@@ -1,640 +0,0 @@
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     performs guaussian elimination on this cell.
-!     
-!     assumes that unpacking routines for non-first cells 
-!     preload C' and rhs' from previous cell.
-!     
-!     assumed send happens outside this routine, but that
-!     c'(KMAX) and rhs'(KMAX) will be sent to next cell.
-!---------------------------------------------------------------------
-      subroutine z_solve ()
-
-      include 'header3d.h'
-      double precision  coeff
-      double precision  pivot
-      integer  i__0
-      integer  j__1,m,n,zst
-      double precision  coeff__2
-      double precision  pivot__3
-      double precision  lhs_(5,5,3),rhs_(5),rhsp_(5),u_(0:3,5)
-      integer  i,j,k,ksize, k1
-      ksize = problem_size - 1
-      zst = ksize
-!DVM$ region local(lhs__)
- 
-!DVM$ PARALLEL (k,j,i) ON  rhs(*,i,j,k), private(u_,rhs_,pivot,
-!DVM$& coeff, tmp1, tmp2, tmp3, t1, t2, t3, tm1, tm2, tm3,
-!DVM$& tmp11, tmp22, i__0, j__1,lhs_,n,m,pivot__3,coeff__2),
-!DVM$& stage(stage_n)
-!DVM$& ,ACROSS(rhs(0:0,0:0,0:0,1:0),lhs__(0:0,0:0,0:0,0:0,1:0))
-       do  k = 1, problem_size - 1  
-         do  j = 1,problem_size - 2
-           do  i = 1,problem_size - 2   
-		   
-               if( k .ne. problem_size - 1) then
-               do  m = 1,5
-                  lhs_(m,1,3) = lhs__(m,1,i,j,k-1)
-                  lhs_(m,2,3) = lhs__(m,2,i,j,k-1)
-                  lhs_(m,3,3) = lhs__(m,3,i,j,k-1)
-                  lhs_(m,4,3) = lhs__(m,4,i,j,k-1)
-                  lhs_(m,5,3) = lhs__(m,5,i,j,k-1)
-               
-			      u_(0,m) = u(m,i,j,k - 1)
-                  u_(1,m) = u(m,i,j,k)
-                  u_(2,m) = u(m,i,j,k + 1)
-               enddo  
-               tmp1 = 1.0d+00 / u_(1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               t1 = 1.0d+00 / u_(0,1)
-               t2 = t1 * t1
-               t3 = t1 * t2
-               tm1 = 1.0d+00 / u_(2,1)
-               tm2 = tm1 * tm1
-               tm3 = tm1 * tm2
-               tmp11 = dt * tz1
-               tmp22 = dt * tz2
-               lhs_(1,1,1) = (-(tmp11)) * dz1
-               lhs_(1,2,1) = 0.
-               lhs_(1,3,1) = 0.
-               lhs_(1,4,1) = (-(tmp22))
-               lhs_(1,5,1) = 0.
-               lhs_(2,1,1) = (-(tmp22)) * ((-(u_(0,2) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,2))
-               lhs_(2,2,1) = (-(tmp22)) * u_(0,4) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dz2
-               lhs_(2,3,1) = 0.
-               lhs_(2,4,1) = (-(tmp22)) * u_(0,2) * t1
-               lhs_(2,5,1) = 0.
-               lhs_(3,1,1) = (-(tmp22)) * ((-(u_(0,3) * u_(0,4))) * t2) 
-     &- tmp11 * ((-(c3c4)) * t2 * u_(0,3))
-               lhs_(3,2,1) = 0.
-               lhs_(3,3,1) = (-(tmp22)) * u_(0,4) * t1 - tmp11 * c3c4 * 
-     &t1 - tmp11 * dz3
-               lhs_(3,4,1) = (-(tmp22)) * u_(0,3) * t1
-               lhs_(3,5,1) = 0.
-               lhs_(4,1,1) = (-(tmp22)) * ((-(u_(0,4) * u_(0,4) * t2)) +
-     & 0.50d+00 * c2 * ((u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + u_(0,4)
-     & * u_(0,4)) * t2)) - tmp11 * ((-(con43)) * c3c4 * t2 * u_(0,4))
-               lhs_(4,2,1) = (-(tmp22)) * ((-(c2)) * u_(0,2) * t1)
-               lhs_(4,3,1) = (-(tmp22)) * ((-(c2)) * u_(0,3) * t1)
-               lhs_(4,4,1) = (-(tmp22)) * (2.0d+00 - c2) * u_(0,4) * t1 
-     &- tmp11 * con43 * c3 * c4 * t1 - tmp11 * dz4
-               lhs_(4,5,1) = (-(tmp22)) * c2
-               lhs_(5,1,1) = (-(tmp22)) * ((c2 * (u_(0,2) * u_(0,2) + u_
-     &(0,3) * u_(0,3) + u_(0,4) * u_(0,4)) * t2 - c1 * (u_(0,5) * t1)) *
-     & (u_(0,4) * t1)) - tmp11 * ((-(c3c4 - c1345)) * t3 * u_(0,2)** 2 -
-     & (c3c4 - c1345) * t3 * u_(0,3)** 2 - (con43 * c3c4 - c1345) * t3 *
-     & u_(0,4)** 2 - c1345 * t2 * u_(0,5))
-               lhs_(5,2,1) = (-(tmp22)) * ((-(c2)) * (u_(0,2) * u_(0,4))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,2)
-               lhs_(5,3,1) = (-(tmp22)) * ((-(c2)) * (u_(0,3) * u_(0,4))
-     & * t2) - tmp11 * (c3c4 - c1345) * t2 * u_(0,3)
-               lhs_(5,4,1) = (-(tmp22)) * (c1 * (u_(0,5) * t1) - 0.50d+0
-     &0 * c2 * ((u_(0,2) * u_(0,2) + u_(0,3) * u_(0,3) + 3.0d+00 * u_(0,
-     &4) * u_(0,4)) * t2)) - tmp11 * (con43 * c3c4 - c1345) * t2 * u_(0,
-     &4)
-               lhs_(5,5,1) = (-(tmp22)) * c1 * u_(0,4) * t1 - tmp11 * c1
-     &345 * t1 - tmp11 * dz5
-               lhs_(1,1,2) = 1.0d+00 + tmp11 * 2.0d+00 * dz1
-               lhs_(1,2,2) = 0.
-               lhs_(1,3,2) = 0.
-               lhs_(1,4,2) = 0.
-               lhs_(1,5,2) = 0.
-               lhs_(2,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &2))
-               lhs_(2,2,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dz2
-               lhs_(2,3,2) = 0.
-               lhs_(2,4,2) = 0.
-               lhs_(2,5,2) = 0.
-               lhs_(3,1,2) = tmp11 * 2.0d+00 * ((-(c3c4)) * tmp2 * u_(1,
-     &3))
-               lhs_(3,2,2) = 0.
-               lhs_(3,3,2) = 1.0d+00 + tmp11 * 2.0d+00 * c3c4 * tmp1 + t
-     &mp11 * 2.0d+00 * dz3
-               lhs_(3,4,2) = 0.
-               lhs_(3,5,2) = 0.
-               lhs_(4,1,2) = tmp11 * 2.0d+00 * ((-(con43)) * c3c4 * tmp2
-     & * u_(1,4))
-               lhs_(4,2,2) = 0.
-               lhs_(4,3,2) = 0.
-               lhs_(4,4,2) = 1.0d+00 + tmp11 * 2.0d+00 * con43 * c3 * c4
-     & * tmp1 + tmp11 * 2.0d+00 * dz4
-               lhs_(4,5,2) = 0.
-               lhs_(5,1,2) = tmp11 * 2.0d+00 * ((-(c3c4 - c1345)) * tmp3
-     & * u_(1,2)** 2 - (c3c4 - c1345) * tmp3 * u_(1,3)** 2 - (con43 * c3
-     &c4 - c1345) * tmp3 * u_(1,4)** 2 - c1345 * tmp2 * u_(1,5))
-               lhs_(5,2,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,2)
-               lhs_(5,3,2) = tmp11 * 2.0d+00 * (c3c4 - c1345) * tmp2 * u
-     &_(1,3)
-               lhs_(5,4,2) = tmp11 * 2.0d+00 * (con43 * c3c4 - c1345) * 
-     &tmp2 * u_(1,4)
-               lhs_(5,5,2) = 1.0d+00 + tmp11 * 2.0d+00 * c1345 * tmp1 + 
-     &tmp11 * 2.0d+00 * dz5
-               if (k .ne. 1) then
-                  do  j__1 = 1,5
-                     lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs
-     &_(1,j__1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,
-     &j__1,3) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs
-     &_(1,j__1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,
-     &j__1,3) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs
-     &_(1,j__1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,
-     &j__1,3) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs
-     &_(1,j__1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,
-     &j__1,3) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1
-     &,3)
-                     lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs
-     &_(1,j__1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,
-     &j__1,3) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1
-     &,3)
-                  enddo  
-               endif  
-               lhs_(1,1,3) = (-(tmp11)) * dz1
-               lhs_(1,2,3) = 0.
-               lhs_(1,3,3) = 0.
-               lhs_(1,4,3) = tmp22
-               lhs_(1,5,3) = 0.
-               lhs_(2,1,3) = tmp22 * ((-(u_(2,2) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,2))
-               lhs_(2,2,3) = tmp22 * u_(2,4) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dz2
-               lhs_(2,3,3) = 0.
-               lhs_(2,4,3) = tmp22 * u_(2,2) * tm1
-               lhs_(2,5,3) = 0.
-               lhs_(3,1,3) = tmp22 * ((-(u_(2,3) * u_(2,4))) * tm2) - tm
-     &p11 * ((-(c3c4)) * tm2 * u_(2,3))
-               lhs_(3,2,3) = 0.
-               lhs_(3,3,3) = tmp22 * u_(2,4) * tm1 - tmp11 * c3c4 * tm1 
-     &- tmp11 * dz3
-               lhs_(3,4,3) = tmp22 * u_(2,3) * tm1
-               lhs_(3,5,3) = 0.
-               lhs_(4,1,3) = tmp22 * ((-(u_(2,4) * u_(2,4) * tm2)) + 0.5
-     &0d+00 * c2 * ((u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + u_(2,4) * u
-     &_(2,4)) * tm2)) - tmp11 * ((-(con43)) * c3c4 * tm2 * u_(2,4))
-               lhs_(4,2,3) = tmp22 * ((-(c2)) * u_(2,2) * tm1)
-               lhs_(4,3,3) = tmp22 * ((-(c2)) * u_(2,3) * tm1)
-               lhs_(4,4,3) = tmp22 * (2.0d+00 - c2) * u_(2,4) * tm1 - tm
-     &p11 * con43 * c3 * c4 * tm1 - tmp11 * dz4
-               lhs_(4,5,3) = tmp22 * c2
-               lhs_(5,1,3) = tmp22 * ((c2 * (u_(2,2) * u_(2,2) + u_(2,3)
-     & * u_(2,3) + u_(2,4) * u_(2,4)) * tm2 - c1 * (u_(2,5) * tm1)) * (u
-     &_(2,4) * tm1)) - tmp11 * ((-(c3c4 - c1345)) * tm3 * u_(2,2)** 2 - 
-     &(c3c4 - c1345) * tm3 * u_(2,3)** 2 - (con43 * c3c4 - c1345) * tm3 
-     &* u_(2,4)** 2 - c1345 * tm2 * u_(2,5))
-               lhs_(5,2,3) = tmp22 * ((-(c2)) * (u_(2,2) * u_(2,4)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,2)
-               lhs_(5,3,3) = tmp22 * ((-(c2)) * (u_(2,3) * u_(2,4)) * tm
-     &2) - tmp11 * (c3c4 - c1345) * tm2 * u_(2,3)
-               lhs_(5,4,3) = tmp22 * (c1 * (u_(2,5) * tm1) - 0.50d+00 * 
-     &c2 * ((u_(2,2) * u_(2,2) + u_(2,3) * u_(2,3) + 3.0d+00 * u_(2,4) *
-     & u_(2,4)) * tm2)) - tmp11 * (con43 * c3c4 - c1345) * tm2 * u_(2,4)
-               lhs_(5,5,3) = tmp22 * c1 * u_(2,4) * tm1 - tmp11 * c1345 
-     &* tm1 - tmp11 * dz5
-               do  m = 1,5
-                  rhs_(m) = rhs(m,i,j,k)
-               enddo  
-               do  i__0 = 1,5
-                  rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,j,k
-     & - 1) - lhs_(i__0,2,1) * rhs(2,i,j,k - 1) - lhs_(i__0,3,1) * rhs(3
-     &,i,j,k - 1) - lhs_(i__0,4,1) * rhs(4,i,j,k - 1) - lhs_(i__0,5,1) *
-     & rhs(5,i,j,k - 1)
-               enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-               pivot = 1.00d0 / lhs_(1,1,2)
-               lhs_(1,2,2) = lhs_(1,2,2) * pivot
-               lhs_(1,3,2) = lhs_(1,3,2) * pivot
-               lhs_(1,4,2) = lhs_(1,4,2) * pivot
-               lhs_(1,5,2) = lhs_(1,5,2) * pivot
-               lhs_(1,1,3) = lhs_(1,1,3) * pivot
-               lhs_(1,2,3) = lhs_(1,2,3) * pivot
-               lhs_(1,3,3) = lhs_(1,3,3) * pivot
-               lhs_(1,4,3) = lhs_(1,4,3) * pivot
-               lhs_(1,5,3) = lhs_(1,5,3) * pivot
-               rhs_(1) = rhs_(1) * pivot
-               coeff = lhs_(2,1,2)
-               lhs_(2,2,2) = lhs_(2,2,2) - coeff * lhs_(1,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) - coeff * lhs_(1,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(1,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(1,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(1,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(1,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(1,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(1,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(1,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(1)
-               coeff = lhs_(3,1,2)
-               lhs_(3,2,2) = lhs_(3,2,2) - coeff * lhs_(1,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(1,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(1,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(1,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(1,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(1,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(1,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(1,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(1,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(1)
-               coeff = lhs_(4,1,2)
-               lhs_(4,2,2) = lhs_(4,2,2) - coeff * lhs_(1,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(1,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(1,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(1,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(1,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(1,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(1,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(1,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(1,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(1)
-               coeff = lhs_(5,1,2)
-               lhs_(5,2,2) = lhs_(5,2,2) - coeff * lhs_(1,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(1,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(1,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(1,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(1,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(1,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(1,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(1,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(1,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(1)
-               pivot = 1.00d0 / lhs_(2,2,2)
-               lhs_(2,3,2) = lhs_(2,3,2) * pivot
-               lhs_(2,4,2) = lhs_(2,4,2) * pivot
-               lhs_(2,5,2) = lhs_(2,5,2) * pivot
-               lhs_(2,1,3) = lhs_(2,1,3) * pivot
-               lhs_(2,2,3) = lhs_(2,2,3) * pivot
-               lhs_(2,3,3) = lhs_(2,3,3) * pivot
-               lhs_(2,4,3) = lhs_(2,4,3) * pivot
-               lhs_(2,5,3) = lhs_(2,5,3) * pivot
-               rhs_(2) = rhs_(2) * pivot
-               coeff = lhs_(1,2,2)
-               lhs_(1,3,2) = lhs_(1,3,2) - coeff * lhs_(2,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(2,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(2,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(2,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(2,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(2,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(2,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(2,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(2)
-               coeff = lhs_(3,2,2)
-               lhs_(3,3,2) = lhs_(3,3,2) - coeff * lhs_(2,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) - coeff * lhs_(2,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(2,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(2,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(2,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(2,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(2,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(2,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(2)
-               coeff = lhs_(4,2,2)
-               lhs_(4,3,2) = lhs_(4,3,2) - coeff * lhs_(2,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(2,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(2,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(2,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(2,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(2,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(2,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(2,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(2)
-               coeff = lhs_(5,2,2)
-               lhs_(5,3,2) = lhs_(5,3,2) - coeff * lhs_(2,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(2,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(2,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(2,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(2,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(2,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(2,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(2,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(2)
-               pivot = 1.00d0 / lhs_(3,3,2)
-               lhs_(3,4,2) = lhs_(3,4,2) * pivot
-               lhs_(3,5,2) = lhs_(3,5,2) * pivot
-               lhs_(3,1,3) = lhs_(3,1,3) * pivot
-               lhs_(3,2,3) = lhs_(3,2,3) * pivot
-               lhs_(3,3,3) = lhs_(3,3,3) * pivot
-               lhs_(3,4,3) = lhs_(3,4,3) * pivot
-               lhs_(3,5,3) = lhs_(3,5,3) * pivot
-               rhs_(3) = rhs_(3) * pivot
-               coeff = lhs_(1,3,2)
-               lhs_(1,4,2) = lhs_(1,4,2) - coeff * lhs_(3,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(3,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(3,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(3,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(3,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(3,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(3,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(3)
-               coeff = lhs_(2,3,2)
-               lhs_(2,4,2) = lhs_(2,4,2) - coeff * lhs_(3,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(3,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(3,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(3,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(3,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(3,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(3,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(3)
-               coeff = lhs_(4,3,2)
-               lhs_(4,4,2) = lhs_(4,4,2) - coeff * lhs_(3,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) - coeff * lhs_(3,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(3,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(3,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(3,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(3,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(3,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(3)
-               coeff = lhs_(5,3,2)
-               lhs_(5,4,2) = lhs_(5,4,2) - coeff * lhs_(3,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(3,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(3,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(3,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(3,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(3,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(3,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(3)
-               pivot = 1.00d0 / lhs_(4,4,2)
-               lhs_(4,5,2) = lhs_(4,5,2) * pivot
-               lhs_(4,1,3) = lhs_(4,1,3) * pivot
-               lhs_(4,2,3) = lhs_(4,2,3) * pivot
-               lhs_(4,3,3) = lhs_(4,3,3) * pivot
-               lhs_(4,4,3) = lhs_(4,4,3) * pivot
-               lhs_(4,5,3) = lhs_(4,5,3) * pivot
-               rhs_(4) = rhs_(4) * pivot
-               coeff = lhs_(1,4,2)
-               lhs_(1,5,2) = lhs_(1,5,2) - coeff * lhs_(4,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(4,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(4,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(4,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(4,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(4,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(4)
-               coeff = lhs_(2,4,2)
-               lhs_(2,5,2) = lhs_(2,5,2) - coeff * lhs_(4,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(4,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(4,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(4,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(4,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(4,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(4)
-               coeff = lhs_(3,4,2)
-               lhs_(3,5,2) = lhs_(3,5,2) - coeff * lhs_(4,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(4,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(4,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(4,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(4,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(4,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(4)
-               coeff = lhs_(5,4,2)
-               lhs_(5,5,2) = lhs_(5,5,2) - coeff * lhs_(4,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) - coeff * lhs_(4,1,3)
-               lhs_(5,2,3) = lhs_(5,2,3) - coeff * lhs_(4,2,3)
-               lhs_(5,3,3) = lhs_(5,3,3) - coeff * lhs_(4,3,3)
-               lhs_(5,4,3) = lhs_(5,4,3) - coeff * lhs_(4,4,3)
-               lhs_(5,5,3) = lhs_(5,5,3) - coeff * lhs_(4,5,3)
-               rhs_(5) = rhs_(5) - coeff * rhs_(4)
-               pivot = 1.00d0 / lhs_(5,5,2)
-               lhs_(5,1,3) = lhs_(5,1,3) * pivot
-               lhs_(5,2,3) = lhs_(5,2,3) * pivot
-               lhs_(5,3,3) = lhs_(5,3,3) * pivot
-               lhs_(5,4,3) = lhs_(5,4,3) * pivot
-               lhs_(5,5,3) = lhs_(5,5,3) * pivot
-               rhs_(5) = rhs_(5) * pivot
-               coeff = lhs_(1,5,2)
-               lhs_(1,1,3) = lhs_(1,1,3) - coeff * lhs_(5,1,3)
-               lhs_(1,2,3) = lhs_(1,2,3) - coeff * lhs_(5,2,3)
-               lhs_(1,3,3) = lhs_(1,3,3) - coeff * lhs_(5,3,3)
-               lhs_(1,4,3) = lhs_(1,4,3) - coeff * lhs_(5,4,3)
-               lhs_(1,5,3) = lhs_(1,5,3) - coeff * lhs_(5,5,3)
-               rhs_(1) = rhs_(1) - coeff * rhs_(5)
-               coeff = lhs_(2,5,2)
-               lhs_(2,1,3) = lhs_(2,1,3) - coeff * lhs_(5,1,3)
-               lhs_(2,2,3) = lhs_(2,2,3) - coeff * lhs_(5,2,3)
-               lhs_(2,3,3) = lhs_(2,3,3) - coeff * lhs_(5,3,3)
-               lhs_(2,4,3) = lhs_(2,4,3) - coeff * lhs_(5,4,3)
-               lhs_(2,5,3) = lhs_(2,5,3) - coeff * lhs_(5,5,3)
-               rhs_(2) = rhs_(2) - coeff * rhs_(5)
-               coeff = lhs_(3,5,2)
-               lhs_(3,1,3) = lhs_(3,1,3) - coeff * lhs_(5,1,3)
-               lhs_(3,2,3) = lhs_(3,2,3) - coeff * lhs_(5,2,3)
-               lhs_(3,3,3) = lhs_(3,3,3) - coeff * lhs_(5,3,3)
-               lhs_(3,4,3) = lhs_(3,4,3) - coeff * lhs_(5,4,3)
-               lhs_(3,5,3) = lhs_(3,5,3) - coeff * lhs_(5,5,3)
-               rhs_(3) = rhs_(3) - coeff * rhs_(5)
-               coeff = lhs_(4,5,2)
-               lhs_(4,1,3) = lhs_(4,1,3) - coeff * lhs_(5,1,3)
-               lhs_(4,2,3) = lhs_(4,2,3) - coeff * lhs_(5,2,3)
-               lhs_(4,3,3) = lhs_(4,3,3) - coeff * lhs_(5,3,3)
-               lhs_(4,4,3) = lhs_(4,4,3) - coeff * lhs_(5,4,3)
-               lhs_(4,5,3) = lhs_(4,5,3) - coeff * lhs_(5,5,3)
-               rhs_(4) = rhs_(4) - coeff * rhs_(5)
-               do  i__0 = 1,5
-                  lhs__(i__0,1,i,j,k) = lhs_(i__0,1,3)
-                  lhs__(i__0,2,i,j,k) = lhs_(i__0,2,3)
-                  lhs__(i__0,3,i,j,k) = lhs_(i__0,3,3)
-                  lhs__(i__0,4,i,j,k) = lhs_(i__0,4,3)
-                  lhs__(i__0,5,i,j,k) = lhs_(i__0,5,3)
-               enddo  
-               do  m = 1,5
-                  rhs(m,i,j,k) = rhs_(m)
-               enddo  
-
-
-            else !! of big IF(k .ne. lastIter)
-			
-            do  n = 1,5
-               lhs_(1,n,1) = 0.0d0
-               lhs_(1,n,2) = 0.0d0
-               lhs_(1,n,3) = 0.0d0
-               lhs_(2,n,1) = 0.0d0
-               lhs_(2,n,2) = 0.0d0
-               lhs_(2,n,3) = 0.0d0
-               lhs_(3,n,1) = 0.0d0
-               lhs_(3,n,2) = 0.0d0
-               lhs_(3,n,3) = 0.0d0
-               lhs_(4,n,1) = 0.0d0
-               lhs_(4,n,2) = 0.0d0
-               lhs_(4,n,3) = 0.0d0
-               lhs_(5,n,1) = 0.0d0
-               lhs_(5,n,2) = 0.0d0
-               lhs_(5,n,3) = 0.0d0
-            enddo  
-            do  m = 1,5
-               lhs_(m,m,2) = 1.0d0
-            enddo  
-            do  m = 1,5
-               rhs_(m) = rhs(m,i,j,k)
-            enddo  
-            do  i__0 = 1,5
-               rhs_(i__0) = rhs_(i__0) - lhs_(i__0,1,1) * rhs(1,i,j,ksiz
-     &e - 1) - lhs_(i__0,2,1) * rhs(2,i,j,ksize - 1) - lhs_(i__0,3,1) * 
-     &rhs(3,i,j,ksize - 1) - lhs_(i__0,4,1) * rhs(4,i,j,ksize - 1) - lhs
-     &_(i__0,5,1) * rhs(5,i,j,ksize - 1)
-            enddo  
-            do  j__1 = 1,5
-               lhs_(1,j__1,2) = lhs_(1,j__1,2) - lhs_(1,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(1,2,1) * lhs_(2,j__1,3) - lhs_(1,3,1) * lhs_(3,j__1,3
-     &) - lhs_(1,4,1) * lhs_(4,j__1,3) - lhs_(1,5,1) * lhs_(5,j__1,3)
-               lhs_(2,j__1,2) = lhs_(2,j__1,2) - lhs_(2,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(2,2,1) * lhs_(2,j__1,3) - lhs_(2,3,1) * lhs_(3,j__1,3
-     &) - lhs_(2,4,1) * lhs_(4,j__1,3) - lhs_(2,5,1) * lhs_(5,j__1,3)
-               lhs_(3,j__1,2) = lhs_(3,j__1,2) - lhs_(3,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(3,2,1) * lhs_(2,j__1,3) - lhs_(3,3,1) * lhs_(3,j__1,3
-     &) - lhs_(3,4,1) * lhs_(4,j__1,3) - lhs_(3,5,1) * lhs_(5,j__1,3)
-               lhs_(4,j__1,2) = lhs_(4,j__1,2) - lhs_(4,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(4,2,1) * lhs_(2,j__1,3) - lhs_(4,3,1) * lhs_(3,j__1,3
-     &) - lhs_(4,4,1) * lhs_(4,j__1,3) - lhs_(4,5,1) * lhs_(5,j__1,3)
-               lhs_(5,j__1,2) = lhs_(5,j__1,2) - lhs_(5,1,1) * lhs_(1,j_
-     &_1,3) - lhs_(5,2,1) * lhs_(2,j__1,3) - lhs_(5,3,1) * lhs_(3,j__1,3
-     &) - lhs_(5,4,1) * lhs_(4,j__1,3) - lhs_(5,5,1) * lhs_(5,j__1,3)
-            enddo  
-
-!---------------------------------------------------------------------
-!     
-!---------------------------------------------------------------------
-            pivot__3 = 1.00d0 / lhs_(1,1,2)
-            lhs_(1,2,2) = lhs_(1,2,2) * pivot__3
-            lhs_(1,3,2) = lhs_(1,3,2) * pivot__3
-            lhs_(1,4,2) = lhs_(1,4,2) * pivot__3
-            lhs_(1,5,2) = lhs_(1,5,2) * pivot__3
-            rhs_(1) = rhs_(1) * pivot__3
-            coeff__2 = lhs_(2,1,2)
-            lhs_(2,2,2) = lhs_(2,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(3,1,2)
-            lhs_(3,2,2) = lhs_(3,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(4,1,2)
-            lhs_(4,2,2) = lhs_(4,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(1)
-            coeff__2 = lhs_(5,1,2)
-            lhs_(5,2,2) = lhs_(5,2,2) - coeff__2 * lhs_(1,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(1,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(1,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(1,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(1)
-            pivot__3 = 1.00d0 / lhs_(2,2,2)
-            lhs_(2,3,2) = lhs_(2,3,2) * pivot__3
-            lhs_(2,4,2) = lhs_(2,4,2) * pivot__3
-            lhs_(2,5,2) = lhs_(2,5,2) * pivot__3
-            rhs_(2) = rhs_(2) * pivot__3
-            coeff__2 = lhs_(1,2,2)
-            lhs_(1,3,2) = lhs_(1,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(3,2,2)
-            lhs_(3,3,2) = lhs_(3,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(4,2,2)
-            lhs_(4,3,2) = lhs_(4,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(2)
-            coeff__2 = lhs_(5,2,2)
-            lhs_(5,3,2) = lhs_(5,3,2) - coeff__2 * lhs_(2,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(2,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(2,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(2)
-            pivot__3 = 1.00d0 / lhs_(3,3,2)
-            lhs_(3,4,2) = lhs_(3,4,2) * pivot__3
-            lhs_(3,5,2) = lhs_(3,5,2) * pivot__3
-            rhs_(3) = rhs_(3) * pivot__3
-            coeff__2 = lhs_(1,3,2)
-            lhs_(1,4,2) = lhs_(1,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(2,3,2)
-            lhs_(2,4,2) = lhs_(2,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(4,3,2)
-            lhs_(4,4,2) = lhs_(4,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(3)
-            coeff__2 = lhs_(5,3,2)
-            lhs_(5,4,2) = lhs_(5,4,2) - coeff__2 * lhs_(3,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(3,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(3)
-            pivot__3 = 1.00d0 / lhs_(4,4,2)
-            lhs_(4,5,2) = lhs_(4,5,2) * pivot__3
-            rhs_(4) = rhs_(4) * pivot__3
-            coeff__2 = lhs_(1,4,2)
-            lhs_(1,5,2) = lhs_(1,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(2,4,2)
-            lhs_(2,5,2) = lhs_(2,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(3,4,2)
-            lhs_(3,5,2) = lhs_(3,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(4)
-            coeff__2 = lhs_(5,4,2)
-            lhs_(5,5,2) = lhs_(5,5,2) - coeff__2 * lhs_(4,5,2)
-            rhs_(5) = rhs_(5) - coeff__2 * rhs_(4)
-            pivot__3 = 1.00d0 / lhs_(5,5,2)
-            rhs_(5) = rhs_(5) * pivot__3
-            coeff__2 = lhs_(1,5,2)
-            rhs_(1) = rhs_(1) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(2,5,2)
-            rhs_(2) = rhs_(2) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(3,5,2)
-            rhs_(3) = rhs_(3) - coeff__2 * rhs_(5)
-            coeff__2 = lhs_(4,5,2)
-            rhs_(4) = rhs_(4) - coeff__2 * rhs_(5)
-            do  m = 1,5
-               rhs(m,i,j,k) = rhs_(m)
-            enddo  
-          endif
-		  
-            enddo 
-          enddo  			
-        enddo 
-		
-!DVM$ PARALLEL (k,j,i) ON  rhs(*,i,j,k), private(rhs_,rhsp_,m)
-!DVM$& ,ACROSS(rhs(0:0,0:0,0:0,0:1)),stage(stage_n)
-      do  k = problem_size-2, 1, (-(1))
-        do  j = 1,problem_size - 2
-          do  i = 1,problem_size - 2
-            do  m = 1,5
-              rhs_(m) = rhs(m,i,j,k)
-	          rhsp_(m) = rhs(m,i,j,k + 1)
-            enddo  
-			
-            do  m = 1,5
-               rhs_(m) = rhs_(m) - lhs__(m,1,i,j,k) * rhsp_(1)
-               rhs_(m) = rhs_(m) - lhs__(m,2,i,j,k) * rhsp_(2)
-               rhs_(m) = rhs_(m) - lhs__(m,3,i,j,k) * rhsp_(3)
-               rhs_(m) = rhs_(m) - lhs__(m,4,i,j,k) * rhsp_(4)
-               rhs_(m) = rhs_(m) - lhs__(m,5,i,j,k) * rhsp_(5)
-            enddo  
-			
-            do  m = 1,5
-              rhs(m,i,j,k) = rhs_(m)
-              u(m,i,j,k) = u(m,i,j,k) + rhs_(m)
-           enddo  
-          enddo  
-        enddo  			
-      enddo  
-!DVM$ end region  
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile
deleted file mode 100644
index d76580f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=cg
-BENCHMARKU=CG
-
-include ../config/make.def
-include ../sys/make.common
-
-SOURCES = cg.fdv
-
-OBJS = ${SOURCES:.fdv=.o}
-
-${PROGRAM}: config $(OBJS)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
-
-cg.o: cg.fdv npbparams.h globals.h
-	${F77} fdv ${FFLAGS} -dvmIrregAnalysis cg.fdv
-	cp cg.DVMH_cuda.cu_opt cg.DVMH_cuda.cu
-	${F77} fc cg.fdv -c -o cg.o
-	
-clean:
-	rm -f npbparams.h
-	rm -f *.o *~
-	rm -f *.cu *.cuf *.c
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
deleted file mode 100644
index 1e80d19..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.DVMH_cuda.cu_opt
+++ /dev/null
@@ -1,2286 +0,0 @@
-
-#include <dvmhlib_cuda.h>
-#define dcmplx2 Complex<double>
-#define cmplx2 Complex<float>
-typedef int __indexTypeInt; 
-typedef long long __indexTypeLLong;
-
-
-
-
-
-//--------------------- Kernel for loop on line 229 ---------------------
-
-      __global__ void   loop_cg_229_cuda_kernel_int(double _x[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _i;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_i <= end_1) 
-         {
-
-// Loop body
-            _x[_i] = 1.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 229 ---------------------
-
-      __global__ void   loop_cg_229_cuda_kernel_llong(double _x[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _i;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_i <= end_1) 
-         {
-
-// Loop body
-            _x[_i] = 1.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 233 ---------------------
-
-      __global__ void   loop_cg_233_cuda_kernel_int(double _p[], double _r[], double _z[], double _q[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _q[_j] = 0.0e0;
-            _z[_j] = 0.0e0;
-            _r[_j] = 0.0e0;
-            _p[_j] = 0.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 233 ---------------------
-
-      __global__ void   loop_cg_233_cuda_kernel_llong(double _p[], double _r[], double _z[], double _q[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _q[_j] = 0.0e0;
-            _z[_j] = 0.0e0;
-            _r[_j] = 0.0e0;
-            _p[_j] = 0.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 272 ---------------------
-
-      __global__ void   loop_cg_272_cuda_kernel_int(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
-            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
-         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
-         if (_j % warpSize == 0) 
-         {
-            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
-            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 272 ---------------------
-
-      __global__ void   loop_cg_272_cuda_kernel_llong(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
-            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
-         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
-         if (_j % warpSize == 0) 
-         {
-            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
-            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 285 ---------------------
-
-      __global__ void   loop_cg_285_cuda_kernel_int(double _x[], double _z[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _norm_temp2)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _x[_j] = _z[_j] * _norm_temp2;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 285 ---------------------
-
-      __global__ void   loop_cg_285_cuda_kernel_llong(double _x[], double _z[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _norm_temp2)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _x[_j] = _z[_j] * _norm_temp2;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 301 ---------------------
-
-      __global__ void   loop_cg_301_cuda_kernel_int(double _x[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _i;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_i <= end_1) 
-         {
-
-// Loop body
-            _x[_i] = 1.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 301 ---------------------
-
-      __global__ void   loop_cg_301_cuda_kernel_llong(double _x[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _i;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_i <= end_1) 
-         {
-
-// Loop body
-            _x[_i] = 1.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 347 ---------------------
-
-      __global__ void   loop_cg_347_cuda_kernel_int(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
-            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
-         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
-         if (_j % warpSize == 0) 
-         {
-            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
-            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 347 ---------------------
-
-      __global__ void   loop_cg_347_cuda_kernel_llong(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
-            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
-         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
-         if (_j % warpSize == 0) 
-         {
-            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
-            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 367 ---------------------
-
-      __global__ void   loop_cg_367_cuda_kernel_int(double _x[], double _z[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _norm_temp2)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _x[_j] = _z[_j] * _norm_temp2;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 367 ---------------------
-
-      __global__ void   loop_cg_367_cuda_kernel_llong(double _x[], double _z[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _norm_temp2)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _x[_j] = _z[_j] * _norm_temp2;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 522 ---------------------
-
-      __global__ void   loop_cg_522_cuda_kernel_int(double _p[], double _r[], double _x[], double _z[], double _q[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _q[_j] = 0.0e0;
-            _z[_j] = 0.0e0;
-            _d = _x[_j];
-            _r[_j] = _d;
-            _p[_j] = _d;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 522 ---------------------
-
-      __global__ void   loop_cg_522_cuda_kernel_llong(double _p[], double _r[], double _x[], double _z[], double _q[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _q[_j] = 0.0e0;
-            _z[_j] = 0.0e0;
-            _d = _x[_j];
-            _r[_j] = _d;
-            _p[_j] = _d;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 537 ---------------------
-
-      __global__ void   loop_cg_537_cuda_kernel_int(double _r[], double _rho, double rho_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _rho = _r[_j] * _r[_j] + _rho;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _rho = __dvmh_blockReduceSum(_rho);
-         if (_j % warpSize == 0) 
-         {
-            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 537 ---------------------
-
-      __global__ void   loop_cg_537_cuda_kernel_llong(double _r[], double _rho, double rho_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _rho = _r[_j] * _r[_j] + _rho;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _rho = __dvmh_blockReduceSum(_rho);
-         if (_j % warpSize == 0) 
-         {
-            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 558 ---------------------
-
-      __global__ void   loop_cg_558_cuda_kernel_int(double _q[], double _p[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Private variables
-         int _k;
-         double _sum;
-         int cond_0;
-         int __k;
-         int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / 32;
-         int lid = gid % 32;
-         
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _sum = 0.e0;
-            for (_k = _rowstr[_j] + lid, 
-                    (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
-                        cond_0 = (-1) : 
-                        cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1),
-                    __k = 0 + lid ; 
-                 __k < cond_0 ; 
-                 _k = _k + warpSize, __k = __k + warpSize)
-            {
-               _sum = _p[_colidx[_k]] * _a[_k] + _sum;
-            }
-            _sum = __dvmh_warpReduceSum(_sum);
-            if (lid == 0) {
-                _q[_j] = _sum;
-            }
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 558 ---------------------
-
-      __global__ void   loop_cg_558_cuda_kernel_llong(double _q[], double _p[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Private variables
-         int _k;
-         double _sum;
-         int cond_0;
-         int __k;
-         int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / 32;
-         int lid = gid % 32;
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _sum = 0.e0;
-            for (_k = _rowstr[_j] + lid, 
-                    (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
-                        cond_0 = (-1) : 
-                        cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1),
-                    __k = 0 + lid ; 
-                 __k < cond_0 ; 
-                 _k = _k + warpSize, __k = __k + warpSize)
-            {
-               _sum = _p[_colidx[_k]] * _a[_k] + _sum;
-            }
-            _sum = __dvmh_warpReduceSum(_sum);
-            if (lid == 0) {
-                _q[_j] = _sum;
-            }
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 567 ---------------------
-
-      __global__ void   loop_cg_567_cuda_kernel_int(double _q[], double _p[], double _d, double d_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = _q[_j] * _p[_j] + _d;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _d = __dvmh_blockReduceSum(_d);
-         if (_j % warpSize == 0) 
-         {
-            d_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _d;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 567 ---------------------
-
-      __global__ void   loop_cg_567_cuda_kernel_llong(double _q[], double _p[], double _d, double d_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = _q[_j] * _p[_j] + _d;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _d = __dvmh_blockReduceSum(_d);
-         if (_j % warpSize == 0) 
-         {
-            d_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _d;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 577 ---------------------
-
-      __global__ void   loop_cg_577_cuda_kernel_int(double _q[], double _r[], double _p[], double _z[], double _rho, double rho_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _alpha)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _z[_j] = _p[_j] * _alpha + _z[_j];
-            _d = (-(_alpha * _q[_j])) + _r[_j];
-            _r[_j] = _d;
-            _rho = _d * _d + _rho;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _rho = __dvmh_blockReduceSum(_rho);
-         if (_j % warpSize == 0) 
-         {
-            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 577 ---------------------
-
-      __global__ void   loop_cg_577_cuda_kernel_llong(double _q[], double _r[], double _p[], double _z[], double _rho, double rho_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _alpha)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _z[_j] = _p[_j] * _alpha + _z[_j];
-            _d = (-(_alpha * _q[_j])) + _r[_j];
-            _r[_j] = _d;
-            _rho = _d * _d + _rho;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _rho = __dvmh_blockReduceSum(_rho);
-         if (_j % warpSize == 0) 
-         {
-            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 588 ---------------------
-
-      __global__ void   loop_cg_588_cuda_kernel_int(double _p[], double _r[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _beta)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _p[_j] = _p[_j] * _beta + _r[_j];
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 588 ---------------------
-
-      __global__ void   loop_cg_588_cuda_kernel_llong(double _p[], double _r[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _beta)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _p[_j] = _p[_j] * _beta + _r[_j];
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 605 ---------------------
-
-      __global__ void   loop_cg_605_cuda_kernel_int(double _r[], double _z[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Private variables
-         int _k;
-         double _d;
-         int cond_0;
-         int __k;
-         int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / 32;
-         int lid = gid % 32;
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = 0.e0;
-            for (_k = _rowstr[_j] + lid, 
-                 (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
-                    cond_0 = (-1) :
-                    cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1), 
-                    __k = 0  + lid;
-                  __k < cond_0 ; 
-                  _k = _k + warpSize, __k = __k + warpSize)
-            {
-               _d = _z[_colidx[_k]] * _a[_k] + _d;
-            }
-            _d = __dvmh_warpReduceSum(_d);
-            if (lid == 0) {
-                _r[_j] = _d;
-            }
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 605 ---------------------
-
-      __global__ void   loop_cg_605_cuda_kernel_llong(double _r[], double _z[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Private variables
-         int _k;
-         double _d;
-         int cond_0;
-         int __k;
-         int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / 32;
-         int lid = gid % 32;
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = 0.e0;
-            for (_k = _rowstr[_j] + lid, 
-                 (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
-                    cond_0 = (-1) :
-                    cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1), 
-                    __k = 0  + lid;
-                  __k < cond_0 ; 
-                  _k = _k + warpSize, __k = __k + warpSize)
-            {
-               _d = _z[_colidx[_k]] * _a[_k] + _d;
-            }
-            _d = __dvmh_warpReduceSum(_d);
-            if (lid == 0) {
-                _r[_j] = _d;
-            }
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 618 ---------------------
-
-      __global__ void   loop_cg_618_cuda_kernel_int(double _r[], double _x[], double _sum, double sum_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = (-_r[_j]) + _x[_j];
-            _sum = _d * _d + _sum;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _sum = __dvmh_blockReduceSum(_sum);
-         if (_j % warpSize == 0) 
-         {
-            sum_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _sum;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 618 ---------------------
-
-      __global__ void   loop_cg_618_cuda_kernel_llong(double _r[], double _x[], double _sum, double sum_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = (-_r[_j]) + _x[_j];
-            _sum = _d * _d + _sum;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _sum = __dvmh_blockReduceSum(_sum);
-         if (_j % warpSize == 0) 
-         {
-            sum_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _sum;
-         }
-      }
-
-
-
-#ifdef _MS_F_
-#define loop_cg_229_cuda_ loop_cg_229_cuda
-#define loop_cg_233_cuda_ loop_cg_233_cuda
-#define loop_cg_272_cuda_ loop_cg_272_cuda
-#define loop_cg_285_cuda_ loop_cg_285_cuda
-#define loop_cg_301_cuda_ loop_cg_301_cuda
-#define loop_cg_347_cuda_ loop_cg_347_cuda
-#define loop_cg_367_cuda_ loop_cg_367_cuda
-#define loop_cg_522_cuda_ loop_cg_522_cuda
-#define loop_cg_537_cuda_ loop_cg_537_cuda
-#define loop_cg_558_cuda_ loop_cg_558_cuda
-#define loop_cg_567_cuda_ loop_cg_567_cuda
-#define loop_cg_577_cuda_ loop_cg_577_cuda
-#define loop_cg_588_cuda_ loop_cg_588_cuda
-#define loop_cg_605_cuda_ loop_cg_605_cuda
-#define loop_cg_618_cuda_ loop_cg_618_cuda
-#endif
-
-extern "C" {
-      extern  DvmType loop_cg_618_cuda_kernel_llong_regs, loop_cg_618_cuda_kernel_int_regs, loop_cg_605_cuda_kernel_llong_regs, loop_cg_605_cuda_kernel_int_regs, loop_cg_588_cuda_kernel_llong_regs, loop_cg_588_cuda_kernel_int_regs, loop_cg_577_cuda_kernel_llong_regs, loop_cg_577_cuda_kernel_int_regs, loop_cg_567_cuda_kernel_llong_regs, loop_cg_567_cuda_kernel_int_regs, loop_cg_558_cuda_kernel_llong_regs, loop_cg_558_cuda_kernel_int_regs, loop_cg_537_cuda_kernel_llong_regs, loop_cg_537_cuda_kernel_int_regs, loop_cg_522_cuda_kernel_llong_regs, loop_cg_522_cuda_kernel_int_regs, loop_cg_367_cuda_kernel_llong_regs, loop_cg_367_cuda_kernel_int_regs, loop_cg_347_cuda_kernel_llong_regs, loop_cg_347_cuda_kernel_int_regs, loop_cg_301_cuda_kernel_llong_regs, loop_cg_301_cuda_kernel_int_regs, loop_cg_285_cuda_kernel_llong_regs, loop_cg_285_cuda_kernel_int_regs, loop_cg_272_cuda_kernel_llong_regs, loop_cg_272_cuda_kernel_int_regs, loop_cg_233_cuda_kernel_llong_regs, loop_cg_233_cuda_kernel_int_regs, loop_cg_229_cuda_kernel_llong_regs, loop_cg_229_cuda_kernel_int_regs;
-
-
-//    CUDA handler for loop on line 229 
-
-      void   loop_cg_229_cuda_(DvmType *loop_ref, DvmType _x[])
-      {
-         void   *x_base;
-         DvmType d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_229_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_229_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_229_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_229_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 233 
-
-      void   loop_cg_233_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], DvmType _z[], DvmType _q[])
-      {
-         void   *p_base, *r_base, *z_base, *q_base;
-         DvmType d_p[4], d_r[4], d_z[4], d_q[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         p_base = dvmh_get_natural_base(&device_num, _p);
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-         q_base = dvmh_get_natural_base(&device_num, _q);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_233_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_233_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_233_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_233_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 272 
-
-      void   loop_cg_272_cuda_(DvmType *loop_ref, DvmType _z[], DvmType _x[])
-      {
-         void   *z_base, *x_base;
-         DvmType d_z[4], d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *norm_temp2_grid;
-         double _norm_temp2;
-         void   *norm_temp1_grid;
-         double _norm_temp1;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &norm_temp1_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_norm_temp1, 0);
-         red_num = 2;
-         loop_cuda_register_red(loop_ref, red_num, &norm_temp2_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_norm_temp2, 0);
-
-// Get 'natural' bases
-         z_base = dvmh_get_natural_base(&device_num, _z);
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_272_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_272_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         red_num = 2;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_272_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_272_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-         red_num = 2;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 285 
-
-      void   loop_cg_285_cuda_(DvmType *loop_ref, DvmType _x[], DvmType _z[], double *_norm_temp2)
-      {
-         void   *x_base, *z_base;
-         DvmType d_x[4], d_z[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         x_base = dvmh_get_natural_base(&device_num, _x);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_285_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_285_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_285_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
-            }
-            else 
-            {
-               loop_cg_285_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 301 
-
-      void   loop_cg_301_cuda_(DvmType *loop_ref, DvmType _x[])
-      {
-         void   *x_base;
-         DvmType d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_301_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_301_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_301_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_301_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 347 
-
-      void   loop_cg_347_cuda_(DvmType *loop_ref, DvmType _z[], DvmType _x[])
-      {
-         void   *z_base, *x_base;
-         DvmType d_z[4], d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *norm_temp2_grid;
-         double _norm_temp2;
-         void   *norm_temp1_grid;
-         double _norm_temp1;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &norm_temp1_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_norm_temp1, 0);
-         red_num = 2;
-         loop_cuda_register_red(loop_ref, red_num, &norm_temp2_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_norm_temp2, 0);
-
-// Get 'natural' bases
-         z_base = dvmh_get_natural_base(&device_num, _z);
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_347_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_347_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         red_num = 2;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_347_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_347_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-         red_num = 2;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 367 
-
-      void   loop_cg_367_cuda_(DvmType *loop_ref, DvmType _x[], DvmType _z[], double *_norm_temp2)
-      {
-         void   *x_base, *z_base;
-         DvmType d_x[4], d_z[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         x_base = dvmh_get_natural_base(&device_num, _x);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_367_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_367_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_367_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
-            }
-            else 
-            {
-               loop_cg_367_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 522 
-
-      void   loop_cg_522_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], DvmType _x[], DvmType _z[], DvmType _q[])
-      {
-         void   *p_base, *r_base, *x_base, *z_base, *q_base;
-         DvmType d_p[4], d_r[4], d_x[4], d_z[4], d_q[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         p_base = dvmh_get_natural_base(&device_num, _p);
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         x_base = dvmh_get_natural_base(&device_num, _x);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-         q_base = dvmh_get_natural_base(&device_num, _q);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_522_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_522_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_522_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)x_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_522_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)x_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 537 
-
-      void   loop_cg_537_cuda_(DvmType *loop_ref, DvmType _r[])
-      {
-         void   *r_base;
-         DvmType d_r[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *rho_grid;
-         double _rho;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &rho_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_rho, 0);
-
-// Get 'natural' bases
-         r_base = dvmh_get_natural_base(&device_num, _r);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_537_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_537_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_537_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)r_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_537_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)r_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 558 
-
-      void   loop_cg_558_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _p[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
-      {
-        
-        void   *q_base, *p_base, *colidx_base, *a_base, *rowstr_base;
-         DvmType d_q[4], d_p[4], d_colidx[4], d_a[4], d_rowstr[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         q_base = dvmh_get_natural_base(&device_num, _q);
-         p_base = dvmh_get_natural_base(&device_num, _p);
-         colidx_base = dvmh_get_natural_base(&device_num, _colidx);
-         a_base = dvmh_get_natural_base(&device_num, _a);
-         rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-         dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
-         dvmh_fill_header_(&device_num, a_base, _a, d_a);
-         dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_558_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_558_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0]* dvmh_get_warp_size(loop_ref);;
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-         maxBlocks = maxBlocks / dvmh_get_warp_size(loop_ref) * dvmh_get_warp_size(loop_ref);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_558_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)q_base, (double *)p_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_558_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)q_base, (double *)p_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 567 
-
-      void   loop_cg_567_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _p[])
-      {
-         void   *q_base, *p_base;
-         DvmType d_q[4], d_p[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *d_grid;
-         double _d;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &d_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_d, 0);
-
-// Get 'natural' bases
-         q_base = dvmh_get_natural_base(&device_num, _q);
-         p_base = dvmh_get_natural_base(&device_num, _p);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_567_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_567_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_567_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)p_base, _d, (double *)d_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_567_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)p_base, _d, (double *)d_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 577 
-
-      void   loop_cg_577_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _r[], DvmType _p[], DvmType _z[], double *_alpha)
-      {
-         void   *q_base, *r_base, *p_base, *z_base;
-         DvmType d_q[4], d_r[4], d_p[4], d_z[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *rho_grid;
-         double _rho;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &rho_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_rho, 0);
-
-// Get 'natural' bases
-         q_base = dvmh_get_natural_base(&device_num, _q);
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         p_base = dvmh_get_natural_base(&device_num, _p);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_577_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_577_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_577_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)r_base, (double *)p_base, (double *)z_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks, *_alpha);
-            }
-            else 
-            {
-               loop_cg_577_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)r_base, (double *)p_base, (double *)z_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks, *_alpha);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 588 
-
-      void   loop_cg_588_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], double *_beta)
-      {
-         void   *p_base, *r_base;
-         DvmType d_p[4], d_r[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         p_base = dvmh_get_natural_base(&device_num, _p);
-         r_base = dvmh_get_natural_base(&device_num, _r);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_588_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_588_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_588_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, idxL[0], idxH[0], addBlocks, *_beta);
-            }
-            else 
-            {
-               loop_cg_588_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, idxL[0], idxH[0], addBlocks, *_beta);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 605 
-
-      void   loop_cg_605_cuda_(DvmType *loop_ref, DvmType _r[], DvmType _z[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
-      {
-         void   *r_base, *z_base, *colidx_base, *a_base, *rowstr_base;
-         DvmType d_r[4], d_z[4], d_colidx[4], d_a[4], d_rowstr[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-         colidx_base = dvmh_get_natural_base(&device_num, _colidx);
-         a_base = dvmh_get_natural_base(&device_num, _a);
-         rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-         dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
-         dvmh_fill_header_(&device_num, a_base, _a, d_a);
-         dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_605_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_605_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks * dvmh_get_warp_size(loop_ref);
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-         maxBlocks = maxBlocks / dvmh_get_warp_size(loop_ref) * dvmh_get_warp_size(loop_ref);
-         
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_605_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)r_base, (double *)z_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_605_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)r_base, (double *)z_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }         
-      }
-
-
-//    CUDA handler for loop on line 618 
-
-      void   loop_cg_618_cuda_(DvmType *loop_ref, DvmType _r[], DvmType _x[])
-      {
-         void   *r_base, *x_base;
-         DvmType d_r[4], d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *sum_grid;
-         double _sum;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &sum_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_sum, 0);
-
-// Get 'natural' bases
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_618_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_618_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_618_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)r_base, (double *)x_base, _sum, (double *)sum_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_618_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)r_base, (double *)x_base, _sum, (double *)sum_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv
deleted file mode 100644
index 1f6e535..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cg.fdv
+++ /dev/null
@@ -1,1008 +0,0 @@
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         !
-!                                                                         !
-!                      S E R I A L     V E R S I O N                      !
-!                                                                         !
-!                                   C G                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!                                                                         !
-!    This benchmark is a serial version of the NPB CG code.               !
-!    Refer to NAS Technical Reports 95-020 for details.                   !
-!                                                                         !
-!    Permission to use, copy, distribute and modify this software         !
-!    for any purpose with or without fee is hereby granted.  We           !
-!    request, however, that all derived work reference the NAS            !
-!    Parallel Benchmarks 3.3. This software is provided "as is"           !
-!    without express or implied warranty.                                 !
-!                                                                         !
-!    Information on NPB 3.3, including the technical report, the          !
-!    original specifications, source code, results and information        !
-!    on how to submit new results, is available at:                       !
-!                                                                         !
-!           http://www.nas.nasa.gov/Software/NPB/                         !
-!                                                                         !
-!    Send comments or suggestions to  npb@nas.nasa.gov                    !
-!                                                                         !
-!          NAS Parallel Benchmarks Group                                  !
-!          NASA Ames Research Center                                      !
-!          Mail Stop: T27A-1                                              !
-!          Moffett Field, CA   94035-1000                                 !
-!                                                                         !
-!          E-mail:  npb@nas.nasa.gov                                      !
-!          Fax:     (650) 604-3957                                        !
-!                                                                         !
-!-------------------------------------------------------------------------!
-
-
-c---------------------------------------------------------------------
-c      NPB CG serial version      
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c
-c Authors: M. Yarrow
-c          C. Kuszmaul
-c          A.S. Kolganov
-c
-c---------------------------------------------------------------------
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      program cg
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-
-      implicit none
-
-      include 'globals.h'
-
-
-      common / main_int_mem /  colidx,     rowstr,
-     >                         iv,         arow,     acol
-      integer                  colidx(nz), rowstr(na+1),
-     >                         iv(na),  arow(na), acol(naz),
-     >                         bl_low, bl_high, blGen,gBL(2)
-
-
-      common / main_flt_mem /  aelt,     a,
-     >                         x,
-     >                         z,
-     >                         p,
-     >                         q,
-     >                         r
-      double precision         aelt(naz), a(nz),
-     >                         x(na+1),
-     >                         z(na+1),
-     >                         p(na+1),
-     >                         q(na+1),
-     >                         r(na+1)
-
-
-
- 
-CDVM$ TEMPLATE ttt(na+2)        
-CDVM$ DISTRIBUTE ttt(BLOCK)   
-CDVM$ ALIGN  z(I) WITH ttt(I) 
-
-CDVM$ ALIGN  x(I) WITH z(I)
-CDVM$ ALIGN  r(I) WITH z(I)
-CDVM$ ALIGN  p(I) WITH z(I)
-CDVM$ ALIGN  q(I) WITH z(I)
-
-
-      integer            i, j, k, it, sumL
-
-      double precision   zeta, randlc
-      external           randlc
-      double precision   rnorm
-      double precision   norm_temp1,norm_temp2
-
-      double precision   t, mflops, tmax
-      character          class
-      logical            verified
-      double precision   zeta_verify_value, epsilon, err
-
-      integer   fstatus
-      character t_names(t_last)*8
-
-      do i = 1, T_last
-         call timer_clear( i )
-      end do
-
-      open(unit=2, file='timer.flag', status='old', iostat=fstatus)
-      if (fstatus .eq. 0) then
-         timeron = .true.
-         t_names(t_init) = 'init'
-         t_names(t_bench) = 'benchmk'
-         t_names(t_conj_grad) = 'conjgd'
-         close(2)
-      else
-         timeron = .false.
-      endif
-
-      call timer_start( T_init )
-
-      firstrow = 1
-      lastrow  = na
-      firstcol = 1
-      lastcol  = na
-
-
-      if( na .eq. 1400 .and. 
-     &    nonzer .eq. 7 .and. 
-     &    niter .eq. 15 .and.
-     &    shift .eq. 10.d0 ) then
-         class = 'S'
-         zeta_verify_value = 8.5971775078648d0
-      else if( na .eq. 7000 .and. 
-     &         nonzer .eq. 8 .and. 
-     &         niter .eq. 15 .and.
-     &         shift .eq. 12.d0 ) then
-         class = 'W'
-         zeta_verify_value = 10.362595087124d0
-      else if( na .eq. 14000 .and. 
-     &         nonzer .eq. 11 .and. 
-     &         niter .eq. 15 .and.
-     &         shift .eq. 20.d0 ) then
-         class = 'A'
-         zeta_verify_value = 17.130235054029d0
-      else if( na .eq. 75000 .and. 
-     &         nonzer .eq. 13 .and. 
-     &         niter .eq. 75 .and.
-     &         shift .eq. 60.d0 ) then
-         class = 'B'
-         zeta_verify_value = 22.712745482631d0
-      else if( na .eq. 150000 .and. 
-     &         nonzer .eq. 15 .and. 
-     &         niter .eq. 75 .and.
-     &         shift .eq. 110.d0 ) then
-         class = 'C'
-         zeta_verify_value = 28.973605592845d0
-      else if( na .eq. 1500000 .and. 
-     &         nonzer .eq. 21 .and. 
-     &         niter .eq. 100 .and.
-     &         shift .eq. 500.d0 ) then
-         class = 'D'
-         zeta_verify_value = 52.514532105794d0
-      else if( na .eq. 9000000 .and. 
-     &         nonzer .eq. 26 .and. 
-     &         niter .eq. 100 .and.
-     &         shift .eq. 1.5d3 ) then
-         class = 'E'
-         zeta_verify_value = 77.522164599383d0
-      else
-         class = 'U'
-      endif
-
-      write( *,1000 ) 
-      write( *,1001 ) na
-      write( *,1002 ) niter
-      write( *,* )
- 1000 format(//,' NAS Parallel Benchmarks (NPB3.3-DVMH)',
-     >          ' - CG Benchmark', /)
- 1001 format(' Size: ', i11 )
- 1002 format(' Iterations: ', i5 )
-
-      naa = na
-      nzz = nz
-
-
-c---------------------------------------------------------------------
-c  Inialize random number generator
-c---------------------------------------------------------------------
-      tran    = 314159265.0D0
-      amult   = 1220703125.0D0
-      zeta    = randlc( tran, amult )
-
-c---------------------------------------------------------------------
-c  
-c---------------------------------------------------------------------
-      call makea(naa, nzz, a, colidx, rowstr, 
-     >           firstrow, lastrow, firstcol, lastcol, 
-     >           arow, acol, aelt, iv)
-
-
-          
-c---------------------------------------------------------------------
-c  Note: as a result of the above call to makea:
-c        values of j used in indexing rowstr go from 1 --> lastrow-firstrow+1
-c        values of colidx which are col indexes go from firstcol --> lastcol
-c        So:
-c        Shift the col index vals from actual (firstcol --> lastcol ) 
-c        to local, i.e., (1 --> lastcol-firstcol+1)
-c---------------------------------------------------------------------
-      do j=1,lastrow-firstrow+1
-         do k=rowstr(j),rowstr(j+1)-1
-            colidx(k) = colidx(k) - firstcol + 1
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c  set starting vector to (1, 1, .... 1)
-c---------------------------------------------------------------------
-CDVM$ region
-CDVM$ parallel (i) on x(i)
-      do i = 1, na+1
-         x(i) = 1.0D0
-      enddo
-CDVM$ parallel (j) on x(j)
-      do j=1, lastcol-firstcol+1
-         q(j) = 0.0d0
-         z(j) = 0.0d0
-         r(j) = 0.0d0
-         p(j) = 0.0d0
-      enddo
-CDVM$ end region
-      zeta  = 0.0d0
-      
-c---------------------------------------------------------------------
-c---->
-c  Do one iteration untimed to init all code and data page tables
-c---->                    (then reinit, start timing, to niter its)
-c---------------------------------------------------------------------
-      do it = 1, 1
-
-c---------------------------------------------------------------------
-c  The call to the conjugate gradient routine:
-c---------------------------------------------------------------------
-         call conj_grad ( colidx,
-     >                    rowstr,
-     >                    x,
-     >                    z,
-     >                    a,
-     >                    p,
-     >                    q,
-     >                    r,
-     >                    rnorm )
-
-c---------------------------------------------------------------------
-c  zeta = shift + 1/(x.z)
-c  So, first: (x.z)
-c  Also, find norm of z
-c  So, first: (z.z)
-c---------------------------------------------------------------------
-         norm_temp1 = 0.0d0
-         norm_temp2 = 0.0d0
-CDVM$ region
-CDVM$ parallel (j) on x(j),reduction(SUM(norm_temp1),SUM(norm_temp2))
-         do j=1, lastcol-firstcol+1
-            norm_temp1 = norm_temp1 + x(j)*z(j)
-            norm_temp2 = norm_temp2 + z(j)*z(j)
-         enddo
-CDVM$ end region
-         norm_temp2 = 1.0d0 / sqrt( norm_temp2 )
-
-
-c---------------------------------------------------------------------
-c  Normalize z to obtain x
-c---------------------------------------------------------------------
-CDVM$ region
-CDVM$ parallel (j) on x(j)
-         do j=1, lastcol-firstcol+1      
-            x(j) = norm_temp2*z(j)    
-         enddo                           
-CDVM$ end region
-
-      enddo                              ! end of do one iteration untimed
-
-
-c---------------------------------------------------------------------
-c  set starting vector to (1, 1, .... 1)
-c---------------------------------------------------------------------
-c
-c  
-c
-CDVM$ region
-CDVM$ parallel (i) on x(i)
-      do i = 1, na+1
-         x(i) = 1.0D0
-      enddo
-CDVM$ end region
-      zeta  = 0.0d0
-
-      call timer_stop( T_init )
-
-      write (*, 2000) timer_read(T_init)
- 2000 format(' Initialization time = ',f15.3,' seconds')
-
-      call timer_start( T_bench )
-
-c---------------------------------------------------------------------
-c---->
-c  Main Iteration for inverse power method
-c---->
-c---------------------------------------------------------------------
-      do it = 1, niter
-
-c---------------------------------------------------------------------
-c  The call to the conjugate gradient routine:
-c---------------------------------------------------------------------
-         if ( timeron ) call timer_start( T_conj_grad )
-         call conj_grad ( colidx,
-     >                    rowstr,
-     >                    x,
-     >                    z,
-     >                    a,
-     >                    p,
-     >                    q,
-     >                    r,
-     >                    rnorm )
-         if ( timeron ) call timer_stop( T_conj_grad )
-
-
-c---------------------------------------------------------------------
-c  zeta = shift + 1/(x.z)
-c  So, first: (x.z)
-c  Also, find norm of z
-c  So, first: (z.z)
-c---------------------------------------------------------------------
-         norm_temp1 = 0.0d0
-         norm_temp2 = 0.0d0
-CDVM$ region
-CDVM$ parallel (j) on x(j),reduction(SUM(norm_temp1),SUM(norm_temp2))
-         do j=1, lastcol-firstcol+1
-            norm_temp1 = norm_temp1 + x(j)*z(j)
-            norm_temp2 = norm_temp2 + z(j)*z(j)
-         enddo
-CDVM$ end region
-         norm_temp2 = 1.0d0 / sqrt( norm_temp2 )
-
-
-         zeta = shift + 1.0d0 / norm_temp1
-         if( it .eq. 1 ) write( *,9000 )
-         write( *,9001 ) it, rnorm, zeta
-
- 9000    format( /,'   iteration           ||r||                 zeta' )
- 9001    format( 4x, i5, 7x, e20.14, f20.13 )
-
-c---------------------------------------------------------------------
-c  Normalize z to obtain x
-c---------------------------------------------------------------------
-CDVM$ region
-CDVM$ parallel (j) on x(j)
-         do j=1, lastcol-firstcol+1      
-            x(j) = norm_temp2*z(j)    
-         enddo                           
-CDVM$ end region
-
-      enddo                              ! end of main iter inv pow meth
-
-      call timer_stop( T_bench )
-
-c---------------------------------------------------------------------
-c  End of timed section
-c---------------------------------------------------------------------
-
-      t = timer_read( T_bench )
-
-
-      write(*,100)
- 100  format(' Benchmark completed ')
-
-      epsilon = 1.d-10
-      if (class .ne. 'U') then
-
-c         err = abs( zeta - zeta_verify_value)
-         err = abs( zeta - zeta_verify_value )/zeta_verify_value
-         if( err .le. epsilon .and. ( .not. isnan(err))) then
-            verified = .TRUE.
-            write(*, 200)
-            write(*, 201) zeta
-            write(*, 202) err
- 200        format(' VERIFICATION SUCCESSFUL ')
- 201        format(' Zeta is    ', E20.13)
- 202        format(' Error is   ', E20.13)
-         else
-            verified = .FALSE.
-            write(*, 300) 
-            write(*, 301) zeta
-            write(*, 302) zeta_verify_value
- 300        format(' VERIFICATION FAILED')
- 301        format(' Zeta                ', E20.13)
- 302        format(' The correct zeta is ', E20.13)
-         endif
-      else
-         verified = .FALSE.
-         write (*, 400)
-         write (*, 401)
-         write (*, 201) zeta
- 400     format(' Problem size unknown')
- 401     format(' NO VERIFICATION PERFORMED')
-      endif
-
-
-      if( t .ne. 0. ) then
-         mflops = float( 2*niter*na )
-     &               * ( 3.+float( nonzer*(nonzer+1) )
-     &                 + 25.*(5.+float( nonzer*(nonzer+1) ))
-     &                 + 3. ) / t / 1000000.0
-      else
-         mflops = 0.0
-      endif
-
-
-         call print_results('CG', class, na, 0, 0,
-     >                      niter, t,
-     >                      mflops, '          floating point', 
-     >                      verified, npbversion, compiletime,
-     >                      cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-
-
-
- 600  format( i4, 2e19.12)
-
-
-c---------------------------------------------------------------------
-c      More timers
-c---------------------------------------------------------------------
-      if (.not.timeron) goto 999
-
-      tmax = timer_read(T_bench)
-      if (tmax .eq. 0.0) tmax = 1.0
-
-      write(*,800)
- 800  format('  SECTION   Time (secs)')
-      do i=1, t_last
-         t = timer_read(i)
-         if (i.eq.t_init) then
-            write(*,810) t_names(i), t
-         else
-            write(*,810) t_names(i), t, t*100./tmax
-            if (i.eq.t_conj_grad) then
-               t = tmax - t
-               write(*,820) 'rest', t, t*100./tmax
-            endif
-         endif
- 810     format(2x,a8,':',f9.3:'  (',f6.2,'%)')
- 820     format('    --> ',a8,':',f9.3,'  (',f6.2,'%)')
-      end do
-
- 999  continue
-
-
-      end                              ! end main
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine conj_grad ( colidx,
-     >                       rowstr,
-     >                       x,
-     >                       z,
-     >                       a,
-     >                       p,
-     >                       q,
-     >                       r,
-     >                       rnorm )
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c  Floaging point arrays here are named as in NPB1 spec discussion of 
-c  CG algorithm
-c---------------------------------------------------------------------
- 
-      implicit none
-
-
-      include 'globals.h'
-
-
-      double precision   x(*),
-     >                   z(*),
-     >                   a(nzz)
-      integer            colidx(nzz), rowstr(naa+1)
-
-      double precision   p(*),
-     >                   q(*),
-     >                   r(*)
-
-
-      integer   j, k
-      integer   cgit, cgitmax, mlen,idx, idxl
-
-      double precision   d, sum, rho, rho0, alpha, beta, rnorm
-
-      data      cgitmax / 25 /
-CDVM$ INHERIT x, z, r, p, q
-
-      rho = 0.0d0
-
-c---------------------------------------------------------------------
-c  Initialize the CG algorithm:
-c---------------------------------------------------------------------
-
-CDVM$ region
-CDVM$ parallel (j) on q(j), private(d)
-      do j=1,naa+1
-         q(j) = 0.0d0
-         z(j) = 0.0d0
-         d = x(j)
-         r(j) = d
-         p(j) = d
-      enddo
-
-
-c---------------------------------------------------------------------
-c  rho = r.r
-c  Now, obtain the norm of r: First, sum squares of r elements locally...
-c---------------------------------------------------------------------
-
-CDVM$ parallel(j) on r(j), reduction(SUM(rho))
-      do j=1, lastcol-firstcol+1
-         rho = rho + r(j)*r(j)
-      enddo
-!        mlen = 128	  
-! DVM$ parallel(j) on r(j), reduction(MAX(mlen))	 
-!      do j=1,lastrow-firstrow+1
-!          mlen = max(mlen, rowstr(j+1) - rowstr(j))
-!      enddo
-CDVM$ end region
-!      write(*,*) 'maxlen = ', mlen
-c---------------------------------------------------------------------
-c---->
-c  The conj grad iteration loop
-c---->
-c---------------------------------------------------------------------
-      do cgit = 1, cgitmax
-         d = 0.0d0
-! DVM$ interval 11
-CDVM$ region
-!WANR for many process, remote_access(p(:)) is needed
-CDVM$ parallel (j) on p(j), private(sum,k)
-         do j=1,lastrow-firstrow+1
-            sum = 0.d0
-            do k=rowstr(j),rowstr(j+1)-1              
-              sum = sum + a(k)*p(colidx(k))              
-            enddo
-            q(j) = sum
-         enddo
-
-CDVM$ parallel (j) on q(j), reduction(SUM(d)) 
-         do j=1, lastcol-firstcol+1
-            d = d + p(j)*q(j)
-         enddo
-CDVM$ end region
-         alpha = rho / d
-         rho0 = rho
-! DVM$ end interval 
-         rho = 0.0d0
-CDVM$ region		 
-CDVM$ parallel (j) on r(j), private(d), reduction(SUM(rho))
-         do j=1, lastcol-firstcol+1
-            z(j) = z(j) + alpha*p(j)
-            d = r(j) - alpha*q(j)		
-            r(j) = d
-            rho = rho + d*d
-         enddo
-CDVM$ end region
-         beta = rho / rho0
-
-CDVM$ region
-CDVM$ parallel (j) on r(j)
-         do j=1, lastcol-firstcol+1
-            p(j) = r(j) + beta*p(j)
-         enddo
-CDVM$ end region
-
-      enddo                             ! end of do cgit=1,cgitmax
-
-
-c---------------------------------------------------------------------
-c  Compute residual norm explicitly:  ||r|| = ||x - A.z||
-c  First, form A.z
-c  The partition submatrix-vector multiply
-c---------------------------------------------------------------------
-!WANR for many process, remote_access(z(:)) is needed
-      sum = 0.0d0
-CDVM$ region
-CDVM$ parallel (j) on r(j), private(d,k)	  
-      do j=1,lastrow-firstrow+1
-         d = 0.d0
-         do k=rowstr(j),rowstr(j+1)-1
-            d = d + a(k)*z(colidx(k))
-         enddo
-         r(j) = d
-      enddo
-
-
-c---------------------------------------------------------------------
-c  At this point, r contains A.z
-c---------------------------------------------------------------------
-CDVM$ parallel (j) on r(j), private(d), reduction(SUM(sum))
-      do j=1, lastcol-firstcol+1
-         d   = x(j) - r(j)         
-         sum = sum + d*d
-      enddo
-CDVM$ end region
-      rnorm = sqrt( sum )
-
-
-
-      return
-      end                               ! end of routine conj_grad
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine makea( n, nz, a, colidx, rowstr, 
-     >                  firstrow, lastrow, firstcol, lastcol,
-     >                  arow, acol, aelt, iv )
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit            none
-      include             'npbparams.h'
-      integer             n, nz
-      integer             firstrow, lastrow, firstcol, lastcol
-      integer             colidx(nz), rowstr(n+1)
-      integer             iv(n), arow(n), acol(nonzer+1,n)
-      double precision    aelt(nonzer+1,n)
-      double precision    a(nz)
-
-c---------------------------------------------------------------------
-c       generate the test problem for benchmark 6
-c       makea generates a sparse matrix with a
-c       prescribed sparsity distribution
-c
-c       parameter    type        usage
-c
-c       input
-c
-c       n            i           number of cols/rows of matrix
-c       nz           i           nonzeros as declared array size
-c       rcond        r*8         condition number
-c       shift        r*8         main diagonal shift
-c
-c       output
-c
-c       a            r*8         array for nonzeros
-c       colidx       i           col indices
-c       rowstr       i           row pointers
-c
-c       workspace
-c
-c       iv, arow, acol i
-c       aelt           r*8
-c---------------------------------------------------------------------
-
-      integer          i, iouter, ivelt, nzv, nn1
-      integer          ivc(nonzer+1)
-      double precision vc(nonzer+1)
-
-c---------------------------------------------------------------------
-c      nonzer is approximately  (int(sqrt(nnza /n)));
-c---------------------------------------------------------------------
-
-      external          sparse, sprnvc, vecset
-
-c---------------------------------------------------------------------
-c    nn1 is the smallest power of two not less than n
-c---------------------------------------------------------------------
-
-      nn1 = 1
- 50   continue
-        nn1 = 2 * nn1
-        if (nn1 .lt. n) goto 50
-
-c---------------------------------------------------------------------
-c  Generate nonzero positions and save for the use in sparse.
-c---------------------------------------------------------------------
-
-      do iouter = 1, n
-         nzv = nonzer
-         call sprnvc( n, nzv, nn1, vc, ivc )
-         call vecset( n, vc, ivc, nzv, iouter, .5D0 )
-         arow(iouter) = nzv
-         do ivelt = 1, nzv
-            acol(ivelt, iouter) = ivc(ivelt)
-            aelt(ivelt, iouter) = vc(ivelt)
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c       ... make the sparse matrix from list of elements with duplicates
-c           (iv is used as  workspace)
-c---------------------------------------------------------------------
-      call sparse( a, colidx, rowstr, n, nz, nonzer, arow, acol, 
-     >             aelt, firstrow, lastrow,
-     >             iv, rcond, shift )
-      return
-
-      end
-c-------end   of makea------------------------------
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine sparse( a, colidx, rowstr, n, nz, nonzer, arow, acol, 
-     >                   aelt, firstrow, lastrow,
-     >                   nzloc, rcond, shift )
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit           none
-      integer            colidx(*), rowstr(*)
-      integer            firstrow, lastrow
-      integer            n, nz, nonzer, arow(*), acol(nonzer+1,*)
-      double precision   a(*), aelt(nonzer+1,*), rcond, shift
-
-c---------------------------------------------------------------------
-c       rows range from firstrow to lastrow
-c       the rowstr pointers are defined for nrows = lastrow-firstrow+1 values
-c---------------------------------------------------------------------
-      integer            nzloc(n), nrows
-
-c---------------------------------------------------
-c       generate a sparse matrix from a list of
-c       [col, row, element] tri
-c---------------------------------------------------
-
-      integer            i, j, j1, j2, nza, k, kk, nzrow, jcol
-      double precision   xi, size, scale, ratio, va
-
-c---------------------------------------------------------------------
-c    how many rows of result
-c---------------------------------------------------------------------
-      nrows = lastrow - firstrow + 1
-
-c---------------------------------------------------------------------
-c     ...count the number of triples in each row
-c---------------------------------------------------------------------
-      do j = 1, nrows+1
-         rowstr(j) = 0
-      enddo
-
-      do i = 1, n
-         do nza = 1, arow(i)
-            j = acol(nza, i) + 1
-            rowstr(j) = rowstr(j) + arow(i)
-         end do
-      end do
-
-      rowstr(1) = 1
-      do j = 2, nrows+1
-         rowstr(j) = rowstr(j) + rowstr(j-1)
-      enddo
-      nza = rowstr(nrows+1) - 1
-
-c---------------------------------------------------------------------
-c     ... rowstr(j) now is the location of the first nonzero
-c           of row j of a
-c---------------------------------------------------------------------
-
-      if (nza .gt. nz) then
-         write(*,*) 'Space for matrix elements exceeded in sparse'
-         write(*,*) 'nza, nzmax = ',nza, nz
-         stop
-      endif
-
-
-c---------------------------------------------------------------------
-c     ... preload data pages
-c---------------------------------------------------------------------
-      do j = 1, nrows
-         do k = rowstr(j), rowstr(j+1)-1
-             a(k) = 0.d0
-             colidx(k) = 0
-         enddo
-         nzloc(j) = 0
-      enddo
-
-c---------------------------------------------------------------------
-c     ... generate actual values by summing duplicates
-c---------------------------------------------------------------------
-
-      size = 1.0D0
-      ratio = rcond ** (1.0D0 / dfloat(n))
-
-      do i = 1, n
-         do nza = 1, arow(i)
-            j = acol(nza, i)
-
-            scale = size * aelt(nza, i)
-            do nzrow = 1, arow(i)
-               jcol = acol(nzrow, i)
-               va = aelt(nzrow, i) * scale
-
-c---------------------------------------------------------------------
-c       ... add the identity * rcond to the generated matrix to bound
-c           the smallest eigenvalue from below by rcond
-c---------------------------------------------------------------------
-               if (jcol .eq. j .and. j .eq. i) then
-                  va = va + rcond - shift
-               endif
-
-               do k = rowstr(j), rowstr(j+1)-1
-                  if (colidx(k) .gt. jcol) then
-c---------------------------------------------------------------------
-c       ... insert colidx here orderly
-c---------------------------------------------------------------------
-                     do kk = rowstr(j+1)-2, k, -1
-                        if (colidx(kk) .gt. 0) then
-                           a(kk+1)  = a(kk)
-                           colidx(kk+1) = colidx(kk)
-                        endif
-                     enddo
-                     colidx(k) = jcol
-                     a(k)  = 0.d0
-                     goto 40
-                  else if (colidx(k) .eq. 0) then
-                     colidx(k) = jcol
-                     goto 40
-                  else if (colidx(k) .eq. jcol) then
-c---------------------------------------------------------------------
-c       ... mark the duplicated entry
-c---------------------------------------------------------------------
-                     nzloc(j) = nzloc(j) + 1
-                     goto 40
-                  endif
-               enddo
-               print *,'internal error in sparse: i=',i
-               stop
-   40          continue
-               a(k) = a(k) + va
-            enddo
-   60       continue
-         enddo
-         size = size * ratio
-      enddo
-
-
-c---------------------------------------------------------------------
-c       ... remove empty entries and generate final results
-c---------------------------------------------------------------------
-      do j = 2, nrows
-         nzloc(j) = nzloc(j) + nzloc(j-1)
-      enddo
-
-      do j = 1, nrows
-         if (j .gt. 1) then
-            j1 = rowstr(j) - nzloc(j-1)
-         else
-            j1 = 1
-         endif
-         j2 = rowstr(j+1) - nzloc(j) - 1
-         nza = rowstr(j)
-         do k = j1, j2
-            a(k) = a(nza)
-            colidx(k) = colidx(nza)
-            nza = nza + 1
-         enddo
-      enddo
-      do j = 2, nrows+1
-         rowstr(j) = rowstr(j) - nzloc(j-1)
-      enddo
-      nza = rowstr(nrows+1) - 1
-
-
-CC       write (*, 11000) nza
-      return
-11000   format ( //,'final nonzero count in sparse ',
-     1            /,'number of nonzeros       = ', i16 )
-      end
-c-------end   of sparse-----------------------------
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine sprnvc( n, nz, nn1, v, iv )
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit           none
-      double precision   v(*)
-      integer            n, nz, nn1, iv(*)
-      common /urando/    amult, tran
-      double precision   amult, tran
-
-
-c---------------------------------------------------------------------
-c       generate a sparse n-vector (v, iv)
-c       having nzv nonzeros
-c
-c       mark(i) is set to 1 if position i is nonzero.
-c       mark is all zero on entry and is reset to all zero before exit
-c       this corrects a performance bug found by John G. Lewis, caused by
-c       reinitialization of mark on every one of the n calls to sprnvc
-c---------------------------------------------------------------------
-
-        integer            nzv, ii, i, icnvrt
-
-        external           randlc, icnvrt
-        double precision   randlc, vecelt, vecloc
-
-
-        nzv = 0
-
-100     continue
-        if (nzv .ge. nz) goto 110
-
-         vecelt = randlc( tran, amult )
-
-c---------------------------------------------------------------------
-c   generate an integer between 1 and n in a portable manner
-c---------------------------------------------------------------------
-         vecloc = randlc(tran, amult)
-         i = icnvrt(vecloc, nn1) + 1
-         if (i .gt. n) goto 100
-
-c---------------------------------------------------------------------
-c  was this integer generated already?
-c---------------------------------------------------------------------
-         do ii = 1, nzv
-            if (iv(ii) .eq. i) goto 100
-         enddo
-         nzv = nzv + 1
-         v(nzv) = vecelt
-         iv(nzv) = i
-         goto 100
-110     continue
-
-      return
-      end
-c-------end   of sprnvc-----------------------------
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      function icnvrt(x, ipwr2)
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit           none
-      double precision   x
-      integer            ipwr2, icnvrt
-
-c---------------------------------------------------------------------
-c    scale a double precision number x in (0,1) by a power of 2 and chop it
-c---------------------------------------------------------------------
-      icnvrt = int(ipwr2 * x)
-
-      return
-      end
-c-------end   of icnvrt-----------------------------
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine vecset(n, v, iv, nzv, i, val)
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit           none
-      integer            n, iv(*), nzv, i, k
-      double precision   v(*), val
-
-c---------------------------------------------------------------------
-c       set ith element of sparse vector (v, iv) with
-c       nzv nonzeros to val
-c---------------------------------------------------------------------
-
-      logical set
-
-      set = .false.
-      do k = 1, nzv
-         if (iv(k) .eq. i) then
-            v(k) = val
-            set  = .true.
-         endif
-      enddo
-      if (.not. set) then
-         nzv     = nzv + 1
-         v(nzv)  = val
-         iv(nzv) = i
-      endif
-      return
-      end
-c-------end   of vecset-----------------------------
-
-      include 'print_results.f'
-      include 'timers.f'
-      include 'randdp.f'
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt
deleted file mode 100644
index 90ed1a4..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.DVMH_cuda.cu_opt
+++ /dev/null
@@ -1,2285 +0,0 @@
-
-#include <dvmhlib_cuda.h>
-#define dcmplx2 Complex<double>
-#define cmplx2 Complex<float>
-typedef int __indexTypeInt; 
-typedef long long __indexTypeLLong;
-
-
-
-
-
-//--------------------- Kernel for loop on line 229 ---------------------
-
-      __global__ void   loop_cg_229_cuda_kernel_int(double _x[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _i;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_i <= end_1) 
-         {
-
-// Loop body
-            _x[_i] = 1.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 229 ---------------------
-
-      __global__ void   loop_cg_229_cuda_kernel_llong(double _x[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _i;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_i <= end_1) 
-         {
-
-// Loop body
-            _x[_i] = 1.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 233 ---------------------
-
-      __global__ void   loop_cg_233_cuda_kernel_int(double _p[], double _r[], double _z[], double _q[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _q[_j] = 0.0e0;
-            _z[_j] = 0.0e0;
-            _r[_j] = 0.0e0;
-            _p[_j] = 0.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 233 ---------------------
-
-      __global__ void   loop_cg_233_cuda_kernel_llong(double _p[], double _r[], double _z[], double _q[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _q[_j] = 0.0e0;
-            _z[_j] = 0.0e0;
-            _r[_j] = 0.0e0;
-            _p[_j] = 0.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 272 ---------------------
-
-      __global__ void   loop_cg_272_cuda_kernel_int(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
-            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
-         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
-         if (_j % warpSize == 0) 
-         {
-            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
-            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 272 ---------------------
-
-      __global__ void   loop_cg_272_cuda_kernel_llong(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
-            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
-         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
-         if (_j % warpSize == 0) 
-         {
-            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
-            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 285 ---------------------
-
-      __global__ void   loop_cg_285_cuda_kernel_int(double _x[], double _z[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _norm_temp2)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _x[_j] = _z[_j] * _norm_temp2;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 285 ---------------------
-
-      __global__ void   loop_cg_285_cuda_kernel_llong(double _x[], double _z[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _norm_temp2)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _x[_j] = _z[_j] * _norm_temp2;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 301 ---------------------
-
-      __global__ void   loop_cg_301_cuda_kernel_int(double _x[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _i;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_i <= end_1) 
-         {
-
-// Loop body
-            _x[_i] = 1.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 301 ---------------------
-
-      __global__ void   loop_cg_301_cuda_kernel_llong(double _x[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _i;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _i = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_i <= end_1) 
-         {
-
-// Loop body
-            _x[_i] = 1.0e0;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 347 ---------------------
-
-      __global__ void   loop_cg_347_cuda_kernel_int(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
-            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
-         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
-         if (_j % warpSize == 0) 
-         {
-            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
-            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 347 ---------------------
-
-      __global__ void   loop_cg_347_cuda_kernel_llong(double _z[], double _x[], double _norm_temp1, double norm_temp1_grid[], double _norm_temp2, double norm_temp2_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _norm_temp1 = _z[_j] * _x[_j] + _norm_temp1;
-            _norm_temp2 = _z[_j] * _z[_j] + _norm_temp2;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _norm_temp1 = __dvmh_blockReduceSum(_norm_temp1);
-         _norm_temp2 = __dvmh_blockReduceSum(_norm_temp2);
-         if (_j % warpSize == 0) 
-         {
-            norm_temp2_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp2;
-            norm_temp1_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _norm_temp1;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 367 ---------------------
-
-      __global__ void   loop_cg_367_cuda_kernel_int(double _x[], double _z[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _norm_temp2)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _x[_j] = _z[_j] * _norm_temp2;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 367 ---------------------
-
-      __global__ void   loop_cg_367_cuda_kernel_llong(double _x[], double _z[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _norm_temp2)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _x[_j] = _z[_j] * _norm_temp2;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 522 ---------------------
-
-      __global__ void   loop_cg_522_cuda_kernel_int(double _p[], double _r[], double _x[], double _z[], double _q[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _q[_j] = 0.0e0;
-            _z[_j] = 0.0e0;
-            _d = _x[_j];
-            _r[_j] = _d;
-            _p[_j] = _d;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 522 ---------------------
-
-      __global__ void   loop_cg_522_cuda_kernel_llong(double _p[], double _r[], double _x[], double _z[], double _q[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _q[_j] = 0.0e0;
-            _z[_j] = 0.0e0;
-            _d = _x[_j];
-            _r[_j] = _d;
-            _p[_j] = _d;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 537 ---------------------
-
-      __global__ void   loop_cg_537_cuda_kernel_int(double _r[], double _rho, double rho_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _rho = _r[_j] * _r[_j] + _rho;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _rho = __dvmh_blockReduceSum(_rho);
-         if (_j % warpSize == 0) 
-         {
-            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 537 ---------------------
-
-      __global__ void   loop_cg_537_cuda_kernel_llong(double _r[], double _rho, double rho_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _rho = _r[_j] * _r[_j] + _rho;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _rho = __dvmh_blockReduceSum(_rho);
-         if (_j % warpSize == 0) 
-         {
-            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 558 ---------------------
-
-      __global__ void   loop_cg_558_cuda_kernel_int(double _p_rma[], double _q[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Private variables
-         int _k;
-         double _sum;
-         int cond_0;
-         int __k;
-         int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / warpSize;
-         int lid = gid % warpSize;
-         
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _sum = 0.e0;
-            for (_k = _rowstr[_j] + lid, 
-                    (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
-                        cond_0 = (-1) : 
-                        cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1),
-                    __k = 0 + lid ; 
-                 __k < cond_0 ; 
-                 _k = _k + warpSize, __k = __k + warpSize)
-            {
-               _sum = _p_rma[_colidx[_k]] * _a[_k] + _sum;
-            }
-            _sum = __dvmh_warpReduceSum(_sum);
-            if (lid == 0) {
-                _q[_j] = _sum;
-            }
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 558 ---------------------
-
-      __global__ void   loop_cg_558_cuda_kernel_llong(double _p_rma[], double _q[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Private variables
-         int _k;
-         double _sum;
-         int cond_0;
-         int __k;
-         int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / warpSize;
-         int lid = gid % warpSize;
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _sum = 0.e0;
-            for (_k = _rowstr[_j] + lid, 
-                    (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
-                        cond_0 = (-1) : 
-                        cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1),
-                    __k = 0 + lid ; 
-                 __k < cond_0 ; 
-                 _k = _k + warpSize, __k = __k + warpSize)
-            {
-               _sum = _p_rma[_colidx[_k]] * _a[_k] + _sum;
-            }
-            _sum = __dvmh_warpReduceSum(_sum);
-            if (lid == 0) {
-                _q[_j] = _sum;
-            }
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 567 ---------------------
-
-      __global__ void   loop_cg_567_cuda_kernel_int(double _q[], double _p[], double _d, double d_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = _q[_j] * _p[_j] + _d;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _d = __dvmh_blockReduceSum(_d);
-         if (_j % warpSize == 0) 
-         {
-            d_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _d;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 567 ---------------------
-
-      __global__ void   loop_cg_567_cuda_kernel_llong(double _q[], double _p[], double _d, double d_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = _q[_j] * _p[_j] + _d;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _d = __dvmh_blockReduceSum(_d);
-         if (_j % warpSize == 0) 
-         {
-            d_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _d;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 577 ---------------------
-
-      __global__ void   loop_cg_577_cuda_kernel_int(double _q[], double _r[], double _p[], double _z[], double _rho, double rho_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _alpha)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _z[_j] = _p[_j] * _alpha + _z[_j];
-            _d = (-(_alpha * _q[_j])) + _r[_j];
-            _r[_j] = _d;
-            _rho = _d * _d + _rho;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _rho = __dvmh_blockReduceSum(_rho);
-         if (_j % warpSize == 0) 
-         {
-            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 577 ---------------------
-
-      __global__ void   loop_cg_577_cuda_kernel_llong(double _q[], double _r[], double _p[], double _z[], double _rho, double rho_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _alpha)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _z[_j] = _p[_j] * _alpha + _z[_j];
-            _d = (-(_alpha * _q[_j])) + _r[_j];
-            _r[_j] = _d;
-            _rho = _d * _d + _rho;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _rho = __dvmh_blockReduceSum(_rho);
-         if (_j % warpSize == 0) 
-         {
-            rho_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _rho;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 588 ---------------------
-
-      __global__ void   loop_cg_588_cuda_kernel_int(double _p[], double _r[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks, double _beta)
-      {
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _p[_j] = _p[_j] * _beta + _r[_j];
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 588 ---------------------
-
-      __global__ void   loop_cg_588_cuda_kernel_llong(double _p[], double _r[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks, double _beta)
-      {
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _p[_j] = _p[_j] * _beta + _r[_j];
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 605 ---------------------
-
-      __global__ void   loop_cg_605_cuda_kernel_int(double _z_rma[], double _r[], int _colidx[], double _a[], int _rowstr[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Private variables
-         int _k;
-         double _d;
-         int cond_0;
-         int __k;
-         int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / warpSize;
-         int lid = gid % warpSize;
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = 0.e0;
-            for (_k = _rowstr[_j] + lid, 
-                 (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
-                    cond_0 = (-1) :
-                    cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1), 
-                    __k = 0  + lid;
-                  __k < cond_0 ; 
-                  _k = _k + warpSize, __k = __k + warpSize)
-            {
-               _d = _z_rma[_colidx[_k]] * _a[_k] + _d;
-            }
-            _d = __dvmh_warpReduceSum(_d);
-            if (lid == 0) {
-                _r[_j] = _d;
-            }
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 605 ---------------------
-
-      __global__ void   loop_cg_605_cuda_kernel_llong(double _z_rma[], double _r[], int _colidx[], double _a[], int _rowstr[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Private variables
-         int _k;
-         double _d;
-         int cond_0;
-         int __k;
-         int gid = blockIdx.x * blockDim.x + threadIdx.x;
-         int tid = gid / warpSize;
-         int lid = gid % warpSize;
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x) / warpSize;
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = 0.e0;
-            for (_k = _rowstr[_j] + lid, 
-                 (_rowstr[_j] > _rowstr[_j + 1] - 1 && 1 > 0 || _rowstr[_j] < _rowstr[_j + 1] - 1 && 1 < 0) ? 
-                    cond_0 = (-1) :
-                    cond_0 = abs(_rowstr[_j] - (_rowstr[_j + 1] - 1)) + abs(1), 
-                    __k = 0  + lid;
-                  __k < cond_0 ; 
-                  _k = _k + warpSize, __k = __k + warpSize)
-            {
-               _d = _z_rma[_colidx[_k]] * _a[_k] + _d;
-            }
-            _d = __dvmh_warpReduceSum(_d);
-            if (lid == 0) {
-                _r[_j] = _d;
-            }
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 618 ---------------------
-
-      __global__ void   loop_cg_618_cuda_kernel_int(double _r[], double _x[], double _sum, double sum_grid[], __indexTypeInt begin_1, __indexTypeInt end_1, __indexTypeInt add_blocks)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeInt _j;
-         __indexTypeInt rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = (-_r[_j]) + _x[_j];
-            _sum = _d * _d + _sum;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _sum = __dvmh_blockReduceSum(_sum);
-         if (_j % warpSize == 0) 
-         {
-            sum_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _sum;
-         }
-      }
-
-
-//--------------------- Kernel for loop on line 618 ---------------------
-
-      __global__ void   loop_cg_618_cuda_kernel_llong(double _r[], double _x[], double _sum, double sum_grid[], __indexTypeLLong begin_1, __indexTypeLLong end_1, __indexTypeLLong add_blocks)
-      {
-
-// Private variables
-         double _d;
-
-// Local needs
-         __indexTypeLLong _j;
-         __indexTypeLLong rest_blocks, cur_blocks;
-
-// Calculate each thread's loop variables' values
-         rest_blocks = add_blocks + blockIdx.x;
-         cur_blocks = rest_blocks;
-         _j = begin_1 + (cur_blocks * blockDim.x + threadIdx.x);
-         if (_j <= end_1) 
-         {
-
-// Loop body
-            _d = (-_r[_j]) + _x[_j];
-            _sum = _d * _d + _sum;
-         }
-
-// Reduction
-         _j = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-         _sum = __dvmh_blockReduceSum(_sum);
-         if (_j % warpSize == 0) 
-         {
-            sum_grid[(add_blocks + blockIdx.x) * (blockDim.x * blockDim.y * blockDim.z / warpSize) + _j / warpSize] = _sum;
-         }
-      }
-
-
-
-#ifdef _MS_F_
-#define loop_cg_229_cuda_ loop_cg_229_cuda
-#define loop_cg_233_cuda_ loop_cg_233_cuda
-#define loop_cg_272_cuda_ loop_cg_272_cuda
-#define loop_cg_285_cuda_ loop_cg_285_cuda
-#define loop_cg_301_cuda_ loop_cg_301_cuda
-#define loop_cg_347_cuda_ loop_cg_347_cuda
-#define loop_cg_367_cuda_ loop_cg_367_cuda
-#define loop_cg_522_cuda_ loop_cg_522_cuda
-#define loop_cg_537_cuda_ loop_cg_537_cuda
-#define loop_cg_558_cuda_ loop_cg_558_cuda
-#define loop_cg_567_cuda_ loop_cg_567_cuda
-#define loop_cg_577_cuda_ loop_cg_577_cuda
-#define loop_cg_588_cuda_ loop_cg_588_cuda
-#define loop_cg_605_cuda_ loop_cg_605_cuda
-#define loop_cg_618_cuda_ loop_cg_618_cuda
-#endif
-
-extern "C" {
-      extern  DvmType loop_cg_618_cuda_kernel_llong_regs, loop_cg_618_cuda_kernel_int_regs, loop_cg_605_cuda_kernel_llong_regs, loop_cg_605_cuda_kernel_int_regs, loop_cg_588_cuda_kernel_llong_regs, loop_cg_588_cuda_kernel_int_regs, loop_cg_577_cuda_kernel_llong_regs, loop_cg_577_cuda_kernel_int_regs, loop_cg_567_cuda_kernel_llong_regs, loop_cg_567_cuda_kernel_int_regs, loop_cg_558_cuda_kernel_llong_regs, loop_cg_558_cuda_kernel_int_regs, loop_cg_537_cuda_kernel_llong_regs, loop_cg_537_cuda_kernel_int_regs, loop_cg_522_cuda_kernel_llong_regs, loop_cg_522_cuda_kernel_int_regs, loop_cg_367_cuda_kernel_llong_regs, loop_cg_367_cuda_kernel_int_regs, loop_cg_347_cuda_kernel_llong_regs, loop_cg_347_cuda_kernel_int_regs, loop_cg_301_cuda_kernel_llong_regs, loop_cg_301_cuda_kernel_int_regs, loop_cg_285_cuda_kernel_llong_regs, loop_cg_285_cuda_kernel_int_regs, loop_cg_272_cuda_kernel_llong_regs, loop_cg_272_cuda_kernel_int_regs, loop_cg_233_cuda_kernel_llong_regs, loop_cg_233_cuda_kernel_int_regs, loop_cg_229_cuda_kernel_llong_regs, loop_cg_229_cuda_kernel_int_regs;
-
-
-//    CUDA handler for loop on line 229 
-
-      void   loop_cg_229_cuda_(DvmType *loop_ref, DvmType _x[])
-      {
-         void   *x_base;
-         DvmType d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_229_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_229_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_229_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_229_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 233 
-
-      void   loop_cg_233_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], DvmType _z[], DvmType _q[])
-      {
-         void   *p_base, *r_base, *z_base, *q_base;
-         DvmType d_p[4], d_r[4], d_z[4], d_q[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         p_base = dvmh_get_natural_base(&device_num, _p);
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-         q_base = dvmh_get_natural_base(&device_num, _q);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_233_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_233_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_233_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_233_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 272 
-
-      void   loop_cg_272_cuda_(DvmType *loop_ref, DvmType _z[], DvmType _x[])
-      {
-         void   *z_base, *x_base;
-         DvmType d_z[4], d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *norm_temp2_grid;
-         double _norm_temp2;
-         void   *norm_temp1_grid;
-         double _norm_temp1;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &norm_temp1_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_norm_temp1, 0);
-         red_num = 2;
-         loop_cuda_register_red(loop_ref, red_num, &norm_temp2_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_norm_temp2, 0);
-
-// Get 'natural' bases
-         z_base = dvmh_get_natural_base(&device_num, _z);
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_272_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_272_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         red_num = 2;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_272_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_272_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-         red_num = 2;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 285 
-
-      void   loop_cg_285_cuda_(DvmType *loop_ref, DvmType _x[], DvmType _z[], double *_norm_temp2)
-      {
-         void   *x_base, *z_base;
-         DvmType d_x[4], d_z[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         x_base = dvmh_get_natural_base(&device_num, _x);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_285_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_285_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_285_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
-            }
-            else 
-            {
-               loop_cg_285_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 301 
-
-      void   loop_cg_301_cuda_(DvmType *loop_ref, DvmType _x[])
-      {
-         void   *x_base;
-         DvmType d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_301_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_301_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_301_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_301_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 347 
-
-      void   loop_cg_347_cuda_(DvmType *loop_ref, DvmType _z[], DvmType _x[])
-      {
-         void   *z_base, *x_base;
-         DvmType d_z[4], d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *norm_temp2_grid;
-         double _norm_temp2;
-         void   *norm_temp1_grid;
-         double _norm_temp1;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &norm_temp1_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_norm_temp1, 0);
-         red_num = 2;
-         loop_cuda_register_red(loop_ref, red_num, &norm_temp2_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_norm_temp2, 0);
-
-// Get 'natural' bases
-         z_base = dvmh_get_natural_base(&device_num, _z);
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_347_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_347_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         red_num = 2;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_347_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_347_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)z_base, (double *)x_base, _norm_temp1, (double *)norm_temp1_grid, _norm_temp2, (double *)norm_temp2_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-         red_num = 2;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 367 
-
-      void   loop_cg_367_cuda_(DvmType *loop_ref, DvmType _x[], DvmType _z[], double *_norm_temp2)
-      {
-         void   *x_base, *z_base;
-         DvmType d_x[4], d_z[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         x_base = dvmh_get_natural_base(&device_num, _x);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_367_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_367_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_367_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
-            }
-            else 
-            {
-               loop_cg_367_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)x_base, (double *)z_base, idxL[0], idxH[0], addBlocks, *_norm_temp2);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 522 
-
-      void   loop_cg_522_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], DvmType _x[], DvmType _z[], DvmType _q[])
-      {
-         void   *p_base, *r_base, *x_base, *z_base, *q_base;
-         DvmType d_p[4], d_r[4], d_x[4], d_z[4], d_q[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         p_base = dvmh_get_natural_base(&device_num, _p);
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         x_base = dvmh_get_natural_base(&device_num, _x);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-         q_base = dvmh_get_natural_base(&device_num, _q);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_522_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_522_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_522_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)x_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_522_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, (double *)x_base, (double *)z_base, (double *)q_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 537 
-
-      void   loop_cg_537_cuda_(DvmType *loop_ref, DvmType _r[])
-      {
-         void   *r_base;
-         DvmType d_r[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *rho_grid;
-         double _rho;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &rho_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_rho, 0);
-
-// Get 'natural' bases
-         r_base = dvmh_get_natural_base(&device_num, _r);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_537_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_537_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_537_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)r_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_537_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)r_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 558 
-
-      void   loop_cg_558_cuda_(DvmType *loop_ref, DvmType _p_rma[], DvmType _q[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
-      {
-         void   *p_rma_base, *q_base, *colidx_base, *a_base, *rowstr_base;
-         DvmType d_p_rma[4], d_q[4], d_colidx[4], d_a[4], d_rowstr[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         p_rma_base = dvmh_get_natural_base(&device_num, _p_rma);
-         q_base = dvmh_get_natural_base(&device_num, _q);
-         colidx_base = dvmh_get_natural_base(&device_num, _colidx);
-         a_base = dvmh_get_natural_base(&device_num, _a);
-         rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, p_rma_base, _p_rma, d_p_rma);
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-         dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
-         dvmh_fill_header_(&device_num, a_base, _a, d_a);
-         dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_558_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_558_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks * dvmh_get_warp_size(loop_ref);
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-         maxBlocks = maxBlocks / dvmh_get_warp_size(loop_ref) * dvmh_get_warp_size(loop_ref);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_558_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_rma_base, (double *)q_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_558_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_rma_base, (double *)q_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 567 
-
-      void   loop_cg_567_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _p[])
-      {
-         void   *q_base, *p_base;
-         DvmType d_q[4], d_p[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *d_grid;
-         double _d;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &d_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_d, 0);
-
-// Get 'natural' bases
-         q_base = dvmh_get_natural_base(&device_num, _q);
-         p_base = dvmh_get_natural_base(&device_num, _p);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_567_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_567_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_567_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)p_base, _d, (double *)d_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_567_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)p_base, _d, (double *)d_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 577 
-
-      void   loop_cg_577_cuda_(DvmType *loop_ref, DvmType _q[], DvmType _r[], DvmType _p[], DvmType _z[], double *_alpha)
-      {
-         void   *q_base, *r_base, *p_base, *z_base;
-         DvmType d_q[4], d_r[4], d_p[4], d_z[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *rho_grid;
-         double _rho;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &rho_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_rho, 0);
-
-// Get 'natural' bases
-         q_base = dvmh_get_natural_base(&device_num, _q);
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         p_base = dvmh_get_natural_base(&device_num, _p);
-         z_base = dvmh_get_natural_base(&device_num, _z);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, q_base, _q, d_q);
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-         dvmh_fill_header_(&device_num, z_base, _z, d_z);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_577_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_577_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_577_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)r_base, (double *)p_base, (double *)z_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks, *_alpha);
-            }
-            else 
-            {
-               loop_cg_577_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)q_base, (double *)r_base, (double *)p_base, (double *)z_base, _rho, (double *)rho_grid, idxL[0], idxH[0], addBlocks, *_alpha);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-
-//    CUDA handler for loop on line 588 
-
-      void   loop_cg_588_cuda_(DvmType *loop_ref, DvmType _p[], DvmType _r[], double *_beta)
-      {
-         void   *p_base, *r_base;
-         DvmType d_p[4], d_r[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         p_base = dvmh_get_natural_base(&device_num, _p);
-         r_base = dvmh_get_natural_base(&device_num, _r);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, p_base, _p, d_p);
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_588_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_588_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_588_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, idxL[0], idxH[0], addBlocks, *_beta);
-            }
-            else 
-            {
-               loop_cg_588_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)p_base, (double *)r_base, idxL[0], idxH[0], addBlocks, *_beta);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 605 
-
-      void   loop_cg_605_cuda_(DvmType *loop_ref, DvmType _z_rma[], DvmType _r[], DvmType _colidx[], DvmType _a[], DvmType _rowstr[])
-      {
-         void   *z_rma_base, *r_base, *colidx_base, *a_base, *rowstr_base;
-         DvmType d_z_rma[4], d_r[4], d_colidx[4], d_a[4], d_rowstr[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Get 'natural' bases
-         z_rma_base = dvmh_get_natural_base(&device_num, _z_rma);
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         colidx_base = dvmh_get_natural_base(&device_num, _colidx);
-         a_base = dvmh_get_natural_base(&device_num, _a);
-         rowstr_base = dvmh_get_natural_base(&device_num, _rowstr);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, z_rma_base, _z_rma, d_z_rma);
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, colidx_base, _colidx, d_colidx);
-         dvmh_fill_header_(&device_num, a_base, _a, d_a);
-         dvmh_fill_header_(&device_num, rowstr_base, _rowstr, d_rowstr);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_605_cuda_kernel_int_regs, &threads, &stream, 0);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, 0, loop_cg_605_cuda_kernel_llong_regs, &threads, &stream, 0);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks * dvmh_get_warp_size(loop_ref);
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-         maxBlocks = maxBlocks / dvmh_get_warp_size(loop_ref) * dvmh_get_warp_size(loop_ref);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_605_cuda_kernel_int<<<blocks, threads, 0, stream>>>((double *)z_rma_base, (double *)r_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_605_cuda_kernel_llong<<<blocks, threads, 0, stream>>>((double *)z_rma_base, (double *)r_base, (int *)colidx_base, (double *)a_base, (int *)rowstr_base, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-      }
-
-
-//    CUDA handler for loop on line 618 
-
-      void   loop_cg_618_cuda_(DvmType *loop_ref, DvmType _r[], DvmType _x[])
-      {
-         void   *r_base, *x_base;
-         DvmType d_r[4], d_x[4];
-         DvmType idxTypeInKernel;
-         dim3 blocks, threads;
-         cudaStream_t stream;
-         DvmType idxL[1], idxH[1], loopSteps[1];
-         DvmType blocksS[1], restBlocks, maxBlocks, addBlocks, overallBlocks;
-         void   *sum_grid;
-         double _sum;
-         DvmType red_num, num_of_red_blocks, fill_flag;
-         DvmType shared_mem;
-         DvmType device_num;
-
-// Get device number
-         device_num = loop_get_device_num_(loop_ref);
-
-// Register reduction for CUDA-execution
-         red_num = 1;
-         loop_cuda_register_red(loop_ref, red_num, &sum_grid, 0);
-         loop_red_init_(loop_ref, &red_num, &_sum, 0);
-
-// Get 'natural' bases
-         r_base = dvmh_get_natural_base(&device_num, _r);
-         x_base = dvmh_get_natural_base(&device_num, _x);
-
-// Fill 'device' headers
-         dvmh_fill_header_(&device_num, r_base, _r, d_r);
-         dvmh_fill_header_(&device_num, x_base, _x, d_x);
-
-// Guess index type in CUDA kernel
-         idxTypeInKernel = loop_guess_index_type_(loop_ref);
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(int)) 
-         {
-            idxTypeInKernel = rt_INT;
-         }
-         if (idxTypeInKernel == rt_LONG && sizeof(long) == sizeof(long long)) 
-         {
-            idxTypeInKernel = rt_LLONG;
-         }
-
-// Get CUDA configuration parameters
-         threads = dim3(0, 0, 0);
-#ifdef CUDA_FERMI_ARCH
-         shared_mem = 8;
-#else
-         shared_mem = 0;
-#endif
-         if (idxTypeInKernel == rt_INT) 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_618_cuda_kernel_int_regs, &threads, &stream, &shared_mem);
-         }
-         else 
-         {
-            loop_cuda_get_config(loop_ref, shared_mem, loop_cg_618_cuda_kernel_llong_regs, &threads, &stream, &shared_mem);
-         }
-         loop_fill_bounds_(loop_ref, idxL, idxH, loopSteps);
-         blocksS[0] = (idxH[0] - idxL[0] + threads.x) / threads.x;
-         overallBlocks = blocksS[0];
-         restBlocks = overallBlocks;
-         addBlocks = 0;
-         blocks = dim3(1, 1, 1);
-
-// Prepare reduction
-         num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / dvmh_get_warp_size(loop_ref));
-         fill_flag = 0;
-         red_num = 1;
-         loop_cuda_red_prepare(loop_ref, red_num, num_of_red_blocks, fill_flag);
-         maxBlocks = loop_cuda_get_device_prop(loop_ref, CUDA_MAX_GRID_X);
-
-// GPU execution
-         while (restBlocks > 0)
-         {
-            if (restBlocks <= maxBlocks) 
-            {
-               blocks = restBlocks;
-            }
-            else 
-            {
-               blocks = maxBlocks;
-            }
-            if (idxTypeInKernel == rt_INT) 
-            {
-               loop_cg_618_cuda_kernel_int<<<blocks, threads, shared_mem, stream>>>((double *)r_base, (double *)x_base, _sum, (double *)sum_grid, idxL[0], idxH[0], addBlocks);
-            }
-            else 
-            {
-               loop_cg_618_cuda_kernel_llong<<<blocks, threads, shared_mem, stream>>>((double *)r_base, (double *)x_base, _sum, (double *)sum_grid, idxL[0], idxH[0], addBlocks);
-            }
-            addBlocks += blocks.x;
-            restBlocks -= blocks.x;
-         }
-
-// Finish reduction
-         red_num = 1;
-         loop_red_finish(loop_ref, red_num);
-      }
-
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv
deleted file mode 100644
index f077345..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/cluster/cg.fdv
+++ /dev/null
@@ -1,1008 +0,0 @@
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         !
-!                                                                         !
-!                      S E R I A L     V E R S I O N                      !
-!                                                                         !
-!                                   C G                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!                                                                         !
-!    This benchmark is a serial version of the NPB CG code.               !
-!    Refer to NAS Technical Reports 95-020 for details.                   !
-!                                                                         !
-!    Permission to use, copy, distribute and modify this software         !
-!    for any purpose with or without fee is hereby granted.  We           !
-!    request, however, that all derived work reference the NAS            !
-!    Parallel Benchmarks 3.3. This software is provided "as is"           !
-!    without express or implied warranty.                                 !
-!                                                                         !
-!    Information on NPB 3.3, including the technical report, the          !
-!    original specifications, source code, results and information        !
-!    on how to submit new results, is available at:                       !
-!                                                                         !
-!           http://www.nas.nasa.gov/Software/NPB/                         !
-!                                                                         !
-!    Send comments or suggestions to  npb@nas.nasa.gov                    !
-!                                                                         !
-!          NAS Parallel Benchmarks Group                                  !
-!          NASA Ames Research Center                                      !
-!          Mail Stop: T27A-1                                              !
-!          Moffett Field, CA   94035-1000                                 !
-!                                                                         !
-!          E-mail:  npb@nas.nasa.gov                                      !
-!          Fax:     (650) 604-3957                                        !
-!                                                                         !
-!-------------------------------------------------------------------------!
-
-
-c---------------------------------------------------------------------
-c      NPB CG serial version      
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c
-c Authors: M. Yarrow
-c          C. Kuszmaul
-c          A.S. Kolganov
-c
-c---------------------------------------------------------------------
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      program cg
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-
-      implicit none
-
-      include 'globals.h'
-
-
-      common / main_int_mem /  colidx,     rowstr,
-     >                         iv,         arow,     acol
-      integer                  colidx(nz), rowstr(na+1),
-     >                         iv(na),  arow(na), acol(naz),
-     >                         bl_low, bl_high, blGen,gBL(2)
-
-
-      common / main_flt_mem /  aelt,     a,
-     >                         x,
-     >                         z,
-     >                         p,
-     >                         q,
-     >                         r
-      double precision         aelt(naz), a(nz),
-     >                         x(na+1),
-     >                         z(na+1),
-     >                         p(na+1),
-     >                         q(na+1),
-     >                         r(na+1)
-
-
-
- 
-CDVM$ TEMPLATE ttt(na+2)        
-CDVM$ DISTRIBUTE ttt(BLOCK)   
-CDVM$ ALIGN  z(I) WITH ttt(I) 
-
-CDVM$ ALIGN  x(I) WITH z(I)
-CDVM$ ALIGN  r(I) WITH z(I)
-CDVM$ ALIGN  p(I) WITH z(I)
-CDVM$ ALIGN  q(I) WITH z(I)
-
-
-      integer            i, j, k, it, sumL
-
-      double precision   zeta, randlc
-      external           randlc
-      double precision   rnorm
-      double precision   norm_temp1,norm_temp2
-
-      double precision   t, mflops, tmax
-      character          class
-      logical            verified
-      double precision   zeta_verify_value, epsilon, err
-
-      integer   fstatus
-      character t_names(t_last)*8
-
-      do i = 1, T_last
-         call timer_clear( i )
-      end do
-
-      open(unit=2, file='timer.flag', status='old', iostat=fstatus)
-      if (fstatus .eq. 0) then
-         timeron = .true.
-         t_names(t_init) = 'init'
-         t_names(t_bench) = 'benchmk'
-         t_names(t_conj_grad) = 'conjgd'
-         close(2)
-      else
-         timeron = .false.
-      endif
-
-      call timer_start( T_init )
-
-      firstrow = 1
-      lastrow  = na
-      firstcol = 1
-      lastcol  = na
-
-
-      if( na .eq. 1400 .and. 
-     &    nonzer .eq. 7 .and. 
-     &    niter .eq. 15 .and.
-     &    shift .eq. 10.d0 ) then
-         class = 'S'
-         zeta_verify_value = 8.5971775078648d0
-      else if( na .eq. 7000 .and. 
-     &         nonzer .eq. 8 .and. 
-     &         niter .eq. 15 .and.
-     &         shift .eq. 12.d0 ) then
-         class = 'W'
-         zeta_verify_value = 10.362595087124d0
-      else if( na .eq. 14000 .and. 
-     &         nonzer .eq. 11 .and. 
-     &         niter .eq. 15 .and.
-     &         shift .eq. 20.d0 ) then
-         class = 'A'
-         zeta_verify_value = 17.130235054029d0
-      else if( na .eq. 75000 .and. 
-     &         nonzer .eq. 13 .and. 
-     &         niter .eq. 75 .and.
-     &         shift .eq. 60.d0 ) then
-         class = 'B'
-         zeta_verify_value = 22.712745482631d0
-      else if( na .eq. 150000 .and. 
-     &         nonzer .eq. 15 .and. 
-     &         niter .eq. 75 .and.
-     &         shift .eq. 110.d0 ) then
-         class = 'C'
-         zeta_verify_value = 28.973605592845d0
-      else if( na .eq. 1500000 .and. 
-     &         nonzer .eq. 21 .and. 
-     &         niter .eq. 100 .and.
-     &         shift .eq. 500.d0 ) then
-         class = 'D'
-         zeta_verify_value = 52.514532105794d0
-      else if( na .eq. 9000000 .and. 
-     &         nonzer .eq. 26 .and. 
-     &         niter .eq. 100 .and.
-     &         shift .eq. 1.5d3 ) then
-         class = 'E'
-         zeta_verify_value = 77.522164599383d0
-      else
-         class = 'U'
-      endif
-
-      write( *,1000 ) 
-      write( *,1001 ) na
-      write( *,1002 ) niter
-      write( *,* )
- 1000 format(//,' NAS Parallel Benchmarks (NPB3.3-DVMH)',
-     >          ' - CG Benchmark', /)
- 1001 format(' Size: ', i11 )
- 1002 format(' Iterations: ', i5 )
-
-      naa = na
-      nzz = nz
-
-
-c---------------------------------------------------------------------
-c  Inialize random number generator
-c---------------------------------------------------------------------
-      tran    = 314159265.0D0
-      amult   = 1220703125.0D0
-      zeta    = randlc( tran, amult )
-
-c---------------------------------------------------------------------
-c  
-c---------------------------------------------------------------------
-      call makea(naa, nzz, a, colidx, rowstr, 
-     >           firstrow, lastrow, firstcol, lastcol, 
-     >           arow, acol, aelt, iv)
-
-
-          
-c---------------------------------------------------------------------
-c  Note: as a result of the above call to makea:
-c        values of j used in indexing rowstr go from 1 --> lastrow-firstrow+1
-c        values of colidx which are col indexes go from firstcol --> lastcol
-c        So:
-c        Shift the col index vals from actual (firstcol --> lastcol ) 
-c        to local, i.e., (1 --> lastcol-firstcol+1)
-c---------------------------------------------------------------------
-      do j=1,lastrow-firstrow+1
-         do k=rowstr(j),rowstr(j+1)-1
-            colidx(k) = colidx(k) - firstcol + 1
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c  set starting vector to (1, 1, .... 1)
-c---------------------------------------------------------------------
-CDVM$ region
-CDVM$ parallel (i) on x(i)
-      do i = 1, na+1
-         x(i) = 1.0D0
-      enddo
-CDVM$ parallel (j) on x(j)
-      do j=1, lastcol-firstcol+1
-         q(j) = 0.0d0
-         z(j) = 0.0d0
-         r(j) = 0.0d0
-         p(j) = 0.0d0
-      enddo
-CDVM$ end region
-      zeta  = 0.0d0
-      
-c---------------------------------------------------------------------
-c---->
-c  Do one iteration untimed to init all code and data page tables
-c---->                    (then reinit, start timing, to niter its)
-c---------------------------------------------------------------------
-      do it = 1, 1
-
-c---------------------------------------------------------------------
-c  The call to the conjugate gradient routine:
-c---------------------------------------------------------------------
-         call conj_grad ( colidx,
-     >                    rowstr,
-     >                    x,
-     >                    z,
-     >                    a,
-     >                    p,
-     >                    q,
-     >                    r,
-     >                    rnorm )
-
-c---------------------------------------------------------------------
-c  zeta = shift + 1/(x.z)
-c  So, first: (x.z)
-c  Also, find norm of z
-c  So, first: (z.z)
-c---------------------------------------------------------------------
-         norm_temp1 = 0.0d0
-         norm_temp2 = 0.0d0
-CDVM$ region
-CDVM$ parallel (j) on x(j),reduction(SUM(norm_temp1),SUM(norm_temp2))
-         do j=1, lastcol-firstcol+1
-            norm_temp1 = norm_temp1 + x(j)*z(j)
-            norm_temp2 = norm_temp2 + z(j)*z(j)
-         enddo
-CDVM$ end region
-         norm_temp2 = 1.0d0 / sqrt( norm_temp2 )
-
-
-c---------------------------------------------------------------------
-c  Normalize z to obtain x
-c---------------------------------------------------------------------
-CDVM$ region
-CDVM$ parallel (j) on x(j)
-         do j=1, lastcol-firstcol+1      
-            x(j) = norm_temp2*z(j)    
-         enddo                           
-CDVM$ end region
-
-      enddo                              ! end of do one iteration untimed
-
-
-c---------------------------------------------------------------------
-c  set starting vector to (1, 1, .... 1)
-c---------------------------------------------------------------------
-c
-c  
-c
-CDVM$ region
-CDVM$ parallel (i) on x(i)
-      do i = 1, na+1
-         x(i) = 1.0D0
-      enddo
-CDVM$ end region
-      zeta  = 0.0d0
-
-      call timer_stop( T_init )
-
-      write (*, 2000) timer_read(T_init)
- 2000 format(' Initialization time = ',f15.3,' seconds')
-
-      call timer_start( T_bench )
-
-c---------------------------------------------------------------------
-c---->
-c  Main Iteration for inverse power method
-c---->
-c---------------------------------------------------------------------
-      do it = 1, niter
-
-c---------------------------------------------------------------------
-c  The call to the conjugate gradient routine:
-c---------------------------------------------------------------------
-         if ( timeron ) call timer_start( T_conj_grad )
-         call conj_grad ( colidx,
-     >                    rowstr,
-     >                    x,
-     >                    z,
-     >                    a,
-     >                    p,
-     >                    q,
-     >                    r,
-     >                    rnorm )
-         if ( timeron ) call timer_stop( T_conj_grad )
-
-
-c---------------------------------------------------------------------
-c  zeta = shift + 1/(x.z)
-c  So, first: (x.z)
-c  Also, find norm of z
-c  So, first: (z.z)
-c---------------------------------------------------------------------
-         norm_temp1 = 0.0d0
-         norm_temp2 = 0.0d0
-CDVM$ region
-CDVM$ parallel (j) on x(j),reduction(SUM(norm_temp1),SUM(norm_temp2))
-         do j=1, lastcol-firstcol+1
-            norm_temp1 = norm_temp1 + x(j)*z(j)
-            norm_temp2 = norm_temp2 + z(j)*z(j)
-         enddo
-CDVM$ end region
-         norm_temp2 = 1.0d0 / sqrt( norm_temp2 )
-
-
-         zeta = shift + 1.0d0 / norm_temp1
-         if( it .eq. 1 ) write( *,9000 )
-         write( *,9001 ) it, rnorm, zeta
-
- 9000    format( /,'   iteration           ||r||                 zeta' )
- 9001    format( 4x, i5, 7x, e20.14, f20.13 )
-
-c---------------------------------------------------------------------
-c  Normalize z to obtain x
-c---------------------------------------------------------------------
-CDVM$ region
-CDVM$ parallel (j) on x(j)
-         do j=1, lastcol-firstcol+1      
-            x(j) = norm_temp2*z(j)    
-         enddo                           
-CDVM$ end region
-
-      enddo                              ! end of main iter inv pow meth
-
-      call timer_stop( T_bench )
-
-c---------------------------------------------------------------------
-c  End of timed section
-c---------------------------------------------------------------------
-
-      t = timer_read( T_bench )
-
-
-      write(*,100)
- 100  format(' Benchmark completed ')
-
-      epsilon = 1.d-10
-      if (class .ne. 'U') then
-
-c         err = abs( zeta - zeta_verify_value)
-         err = abs( zeta - zeta_verify_value )/zeta_verify_value
-         if( err .le. epsilon .and. ( .not. isnan(err))) then
-            verified = .TRUE.
-            write(*, 200)
-            write(*, 201) zeta
-            write(*, 202) err
- 200        format(' VERIFICATION SUCCESSFUL ')
- 201        format(' Zeta is    ', E20.13)
- 202        format(' Error is   ', E20.13)
-         else
-            verified = .FALSE.
-            write(*, 300) 
-            write(*, 301) zeta
-            write(*, 302) zeta_verify_value
- 300        format(' VERIFICATION FAILED')
- 301        format(' Zeta                ', E20.13)
- 302        format(' The correct zeta is ', E20.13)
-         endif
-      else
-         verified = .FALSE.
-         write (*, 400)
-         write (*, 401)
-         write (*, 201) zeta
- 400     format(' Problem size unknown')
- 401     format(' NO VERIFICATION PERFORMED')
-      endif
-
-
-      if( t .ne. 0. ) then
-         mflops = float( 2*niter*na )
-     &               * ( 3.+float( nonzer*(nonzer+1) )
-     &                 + 25.*(5.+float( nonzer*(nonzer+1) ))
-     &                 + 3. ) / t / 1000000.0
-      else
-         mflops = 0.0
-      endif
-
-
-         call print_results('CG', class, na, 0, 0,
-     >                      niter, t,
-     >                      mflops, '          floating point', 
-     >                      verified, npbversion, compiletime,
-     >                      cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-
-
-
- 600  format( i4, 2e19.12)
-
-
-c---------------------------------------------------------------------
-c      More timers
-c---------------------------------------------------------------------
-      if (.not.timeron) goto 999
-
-      tmax = timer_read(T_bench)
-      if (tmax .eq. 0.0) tmax = 1.0
-
-      write(*,800)
- 800  format('  SECTION   Time (secs)')
-      do i=1, t_last
-         t = timer_read(i)
-         if (i.eq.t_init) then
-            write(*,810) t_names(i), t
-         else
-            write(*,810) t_names(i), t, t*100./tmax
-            if (i.eq.t_conj_grad) then
-               t = tmax - t
-               write(*,820) 'rest', t, t*100./tmax
-            endif
-         endif
- 810     format(2x,a8,':',f9.3:'  (',f6.2,'%)')
- 820     format('    --> ',a8,':',f9.3,'  (',f6.2,'%)')
-      end do
-
- 999  continue
-
-
-      end                              ! end main
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine conj_grad ( colidx,
-     >                       rowstr,
-     >                       x,
-     >                       z,
-     >                       a,
-     >                       p,
-     >                       q,
-     >                       r,
-     >                       rnorm )
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c  Floaging point arrays here are named as in NPB1 spec discussion of 
-c  CG algorithm
-c---------------------------------------------------------------------
- 
-      implicit none
-
-
-      include 'globals.h'
-
-
-      double precision   x(*),
-     >                   z(*),
-     >                   a(nzz)
-      integer            colidx(nzz), rowstr(naa+1)
-
-      double precision   p(*),
-     >                   q(*),
-     >                   r(*)
-
-
-      integer   j, k
-      integer   cgit, cgitmax, mlen,idx, idxl
-
-      double precision   d, sum, rho, rho0, alpha, beta, rnorm
-
-      data      cgitmax / 25 /
-CDVM$ INHERIT x, z, r, p, q
-
-      rho = 0.0d0
-
-c---------------------------------------------------------------------
-c  Initialize the CG algorithm:
-c---------------------------------------------------------------------
-
-CDVM$ region
-CDVM$ parallel (j) on q(j), private(d)
-      do j=1,naa+1
-         q(j) = 0.0d0
-         z(j) = 0.0d0
-         d = x(j)
-         r(j) = d
-         p(j) = d
-      enddo
-
-
-c---------------------------------------------------------------------
-c  rho = r.r
-c  Now, obtain the norm of r: First, sum squares of r elements locally...
-c---------------------------------------------------------------------
-
-CDVM$ parallel(j) on r(j), reduction(SUM(rho))
-      do j=1, lastcol-firstcol+1
-         rho = rho + r(j)*r(j)
-      enddo
-!        mlen = 128	  
-! DVM$ parallel(j) on r(j), reduction(MAX(mlen))	 
-!      do j=1,lastrow-firstrow+1
-!          mlen = max(mlen, rowstr(j+1) - rowstr(j))
-!      enddo
-CDVM$ end region
-!      write(*,*) 'maxlen = ', mlen
-c---------------------------------------------------------------------
-c---->
-c  The conj grad iteration loop
-c---->
-c---------------------------------------------------------------------
-      do cgit = 1, cgitmax
-
-         d = 0.0d0
-CDVM$ region
-	 
-CDVM$ parallel (j) on p(j), private(sum,k), remote_access(p(:))
-         do j=1,lastrow-firstrow+1
-            sum = 0.d0
-            do k=rowstr(j),rowstr(j+1)-1              
-              sum = sum + a(k)*p(colidx(k))              
-            enddo
-            q(j) = sum
-         enddo
-
-CDVM$ parallel (j) on q(j), reduction(SUM(d)) 
-         do j=1, lastcol-firstcol+1
-            d = d + p(j)*q(j)
-         enddo
-CDVM$ end region
-         alpha = rho / d
-         rho0 = rho
-
-         rho = 0.0d0
-CDVM$ region		 
-CDVM$ parallel (j) on r(j), private(d), reduction(SUM(rho))
-         do j=1, lastcol-firstcol+1
-            z(j) = z(j) + alpha*p(j)
-            d = r(j) - alpha*q(j)		
-            r(j) = d
-            rho = rho + d*d
-         enddo
-CDVM$ end region
-         beta = rho / rho0
-
-CDVM$ region
-CDVM$ parallel (j) on r(j)
-         do j=1, lastcol-firstcol+1
-            p(j) = r(j) + beta*p(j)
-         enddo
-CDVM$ end region
-
-      enddo                             ! end of do cgit=1,cgitmax
-
-
-c---------------------------------------------------------------------
-c  Compute residual norm explicitly:  ||r|| = ||x - A.z||
-c  First, form A.z
-c  The partition submatrix-vector multiply
-c---------------------------------------------------------------------
-
-      sum = 0.0d0
-CDVM$ region
-CDVM$ parallel (j) on r(j), private(d,k),remote_access(z(:))	  
-      do j=1,lastrow-firstrow+1
-         d = 0.d0
-         do k=rowstr(j),rowstr(j+1)-1
-            d = d + a(k)*z(colidx(k))
-         enddo
-         r(j) = d
-      enddo
-
-
-c---------------------------------------------------------------------
-c  At this point, r contains A.z
-c---------------------------------------------------------------------
-CDVM$ parallel (j) on r(j), private(d), reduction(SUM(sum))
-      do j=1, lastcol-firstcol+1
-         d   = x(j) - r(j)         
-         sum = sum + d*d
-      enddo
-CDVM$ end region
-      rnorm = sqrt( sum )
-
-
-
-      return
-      end                               ! end of routine conj_grad
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine makea( n, nz, a, colidx, rowstr, 
-     >                  firstrow, lastrow, firstcol, lastcol,
-     >                  arow, acol, aelt, iv )
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit            none
-      include             'npbparams.h'
-      integer             n, nz
-      integer             firstrow, lastrow, firstcol, lastcol
-      integer             colidx(nz), rowstr(n+1)
-      integer             iv(n), arow(n), acol(nonzer+1,n)
-      double precision    aelt(nonzer+1,n)
-      double precision    a(nz)
-
-c---------------------------------------------------------------------
-c       generate the test problem for benchmark 6
-c       makea generates a sparse matrix with a
-c       prescribed sparsity distribution
-c
-c       parameter    type        usage
-c
-c       input
-c
-c       n            i           number of cols/rows of matrix
-c       nz           i           nonzeros as declared array size
-c       rcond        r*8         condition number
-c       shift        r*8         main diagonal shift
-c
-c       output
-c
-c       a            r*8         array for nonzeros
-c       colidx       i           col indices
-c       rowstr       i           row pointers
-c
-c       workspace
-c
-c       iv, arow, acol i
-c       aelt           r*8
-c---------------------------------------------------------------------
-
-      integer          i, iouter, ivelt, nzv, nn1
-      integer          ivc(nonzer+1)
-      double precision vc(nonzer+1)
-
-c---------------------------------------------------------------------
-c      nonzer is approximately  (int(sqrt(nnza /n)));
-c---------------------------------------------------------------------
-
-      external          sparse, sprnvc, vecset
-
-c---------------------------------------------------------------------
-c    nn1 is the smallest power of two not less than n
-c---------------------------------------------------------------------
-
-      nn1 = 1
- 50   continue
-        nn1 = 2 * nn1
-        if (nn1 .lt. n) goto 50
-
-c---------------------------------------------------------------------
-c  Generate nonzero positions and save for the use in sparse.
-c---------------------------------------------------------------------
-
-      do iouter = 1, n
-         nzv = nonzer
-         call sprnvc( n, nzv, nn1, vc, ivc )
-         call vecset( n, vc, ivc, nzv, iouter, .5D0 )
-         arow(iouter) = nzv
-         do ivelt = 1, nzv
-            acol(ivelt, iouter) = ivc(ivelt)
-            aelt(ivelt, iouter) = vc(ivelt)
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c       ... make the sparse matrix from list of elements with duplicates
-c           (iv is used as  workspace)
-c---------------------------------------------------------------------
-      call sparse( a, colidx, rowstr, n, nz, nonzer, arow, acol, 
-     >             aelt, firstrow, lastrow,
-     >             iv, rcond, shift )
-      return
-
-      end
-c-------end   of makea------------------------------
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine sparse( a, colidx, rowstr, n, nz, nonzer, arow, acol, 
-     >                   aelt, firstrow, lastrow,
-     >                   nzloc, rcond, shift )
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit           none
-      integer            colidx(*), rowstr(*)
-      integer            firstrow, lastrow
-      integer            n, nz, nonzer, arow(*), acol(nonzer+1,*)
-      double precision   a(*), aelt(nonzer+1,*), rcond, shift
-
-c---------------------------------------------------------------------
-c       rows range from firstrow to lastrow
-c       the rowstr pointers are defined for nrows = lastrow-firstrow+1 values
-c---------------------------------------------------------------------
-      integer            nzloc(n), nrows
-
-c---------------------------------------------------
-c       generate a sparse matrix from a list of
-c       [col, row, element] tri
-c---------------------------------------------------
-
-      integer            i, j, j1, j2, nza, k, kk, nzrow, jcol
-      double precision   xi, size, scale, ratio, va
-
-c---------------------------------------------------------------------
-c    how many rows of result
-c---------------------------------------------------------------------
-      nrows = lastrow - firstrow + 1
-
-c---------------------------------------------------------------------
-c     ...count the number of triples in each row
-c---------------------------------------------------------------------
-      do j = 1, nrows+1
-         rowstr(j) = 0
-      enddo
-
-      do i = 1, n
-         do nza = 1, arow(i)
-            j = acol(nza, i) + 1
-            rowstr(j) = rowstr(j) + arow(i)
-         end do
-      end do
-
-      rowstr(1) = 1
-      do j = 2, nrows+1
-         rowstr(j) = rowstr(j) + rowstr(j-1)
-      enddo
-      nza = rowstr(nrows+1) - 1
-
-c---------------------------------------------------------------------
-c     ... rowstr(j) now is the location of the first nonzero
-c           of row j of a
-c---------------------------------------------------------------------
-
-      if (nza .gt. nz) then
-         write(*,*) 'Space for matrix elements exceeded in sparse'
-         write(*,*) 'nza, nzmax = ',nza, nz
-         stop
-      endif
-
-
-c---------------------------------------------------------------------
-c     ... preload data pages
-c---------------------------------------------------------------------
-      do j = 1, nrows
-         do k = rowstr(j), rowstr(j+1)-1
-             a(k) = 0.d0
-             colidx(k) = 0
-         enddo
-         nzloc(j) = 0
-      enddo
-
-c---------------------------------------------------------------------
-c     ... generate actual values by summing duplicates
-c---------------------------------------------------------------------
-
-      size = 1.0D0
-      ratio = rcond ** (1.0D0 / dfloat(n))
-
-      do i = 1, n
-         do nza = 1, arow(i)
-            j = acol(nza, i)
-
-            scale = size * aelt(nza, i)
-            do nzrow = 1, arow(i)
-               jcol = acol(nzrow, i)
-               va = aelt(nzrow, i) * scale
-
-c---------------------------------------------------------------------
-c       ... add the identity * rcond to the generated matrix to bound
-c           the smallest eigenvalue from below by rcond
-c---------------------------------------------------------------------
-               if (jcol .eq. j .and. j .eq. i) then
-                  va = va + rcond - shift
-               endif
-
-               do k = rowstr(j), rowstr(j+1)-1
-                  if (colidx(k) .gt. jcol) then
-c---------------------------------------------------------------------
-c       ... insert colidx here orderly
-c---------------------------------------------------------------------
-                     do kk = rowstr(j+1)-2, k, -1
-                        if (colidx(kk) .gt. 0) then
-                           a(kk+1)  = a(kk)
-                           colidx(kk+1) = colidx(kk)
-                        endif
-                     enddo
-                     colidx(k) = jcol
-                     a(k)  = 0.d0
-                     goto 40
-                  else if (colidx(k) .eq. 0) then
-                     colidx(k) = jcol
-                     goto 40
-                  else if (colidx(k) .eq. jcol) then
-c---------------------------------------------------------------------
-c       ... mark the duplicated entry
-c---------------------------------------------------------------------
-                     nzloc(j) = nzloc(j) + 1
-                     goto 40
-                  endif
-               enddo
-               print *,'internal error in sparse: i=',i
-               stop
-   40          continue
-               a(k) = a(k) + va
-            enddo
-   60       continue
-         enddo
-         size = size * ratio
-      enddo
-
-
-c---------------------------------------------------------------------
-c       ... remove empty entries and generate final results
-c---------------------------------------------------------------------
-      do j = 2, nrows
-         nzloc(j) = nzloc(j) + nzloc(j-1)
-      enddo
-
-      do j = 1, nrows
-         if (j .gt. 1) then
-            j1 = rowstr(j) - nzloc(j-1)
-         else
-            j1 = 1
-         endif
-         j2 = rowstr(j+1) - nzloc(j) - 1
-         nza = rowstr(j)
-         do k = j1, j2
-            a(k) = a(nza)
-            colidx(k) = colidx(nza)
-            nza = nza + 1
-         enddo
-      enddo
-      do j = 2, nrows+1
-         rowstr(j) = rowstr(j) - nzloc(j-1)
-      enddo
-      nza = rowstr(nrows+1) - 1
-
-
-CC       write (*, 11000) nza
-      return
-11000   format ( //,'final nonzero count in sparse ',
-     1            /,'number of nonzeros       = ', i16 )
-      end
-c-------end   of sparse-----------------------------
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine sprnvc( n, nz, nn1, v, iv )
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit           none
-      double precision   v(*)
-      integer            n, nz, nn1, iv(*)
-      common /urando/    amult, tran
-      double precision   amult, tran
-
-
-c---------------------------------------------------------------------
-c       generate a sparse n-vector (v, iv)
-c       having nzv nonzeros
-c
-c       mark(i) is set to 1 if position i is nonzero.
-c       mark is all zero on entry and is reset to all zero before exit
-c       this corrects a performance bug found by John G. Lewis, caused by
-c       reinitialization of mark on every one of the n calls to sprnvc
-c---------------------------------------------------------------------
-
-        integer            nzv, ii, i, icnvrt
-
-        external           randlc, icnvrt
-        double precision   randlc, vecelt, vecloc
-
-
-        nzv = 0
-
-100     continue
-        if (nzv .ge. nz) goto 110
-
-         vecelt = randlc( tran, amult )
-
-c---------------------------------------------------------------------
-c   generate an integer between 1 and n in a portable manner
-c---------------------------------------------------------------------
-         vecloc = randlc(tran, amult)
-         i = icnvrt(vecloc, nn1) + 1
-         if (i .gt. n) goto 100
-
-c---------------------------------------------------------------------
-c  was this integer generated already?
-c---------------------------------------------------------------------
-         do ii = 1, nzv
-            if (iv(ii) .eq. i) goto 100
-         enddo
-         nzv = nzv + 1
-         v(nzv) = vecelt
-         iv(nzv) = i
-         goto 100
-110     continue
-
-      return
-      end
-c-------end   of sprnvc-----------------------------
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      function icnvrt(x, ipwr2)
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit           none
-      double precision   x
-      integer            ipwr2, icnvrt
-
-c---------------------------------------------------------------------
-c    scale a double precision number x in (0,1) by a power of 2 and chop it
-c---------------------------------------------------------------------
-      icnvrt = int(ipwr2 * x)
-
-      return
-      end
-c-------end   of icnvrt-----------------------------
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine vecset(n, v, iv, nzv, i, val)
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit           none
-      integer            n, iv(*), nzv, i, k
-      double precision   v(*), val
-
-c---------------------------------------------------------------------
-c       set ith element of sparse vector (v, iv) with
-c       nzv nonzeros to val
-c---------------------------------------------------------------------
-
-      logical set
-
-      set = .false.
-      do k = 1, nzv
-         if (iv(k) .eq. i) then
-            v(k) = val
-            set  = .true.
-         endif
-      enddo
-      if (.not. set) then
-         nzv     = nzv + 1
-         v(nzv)  = val
-         iv(nzv) = i
-      endif
-      return
-      end
-c-------end   of vecset-----------------------------
-
-      include 'print_results.f'
-      include 'timers.f'
-      include 'randdp.f'
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/globals.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/globals.h
deleted file mode 100644
index 469ed32..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/globals.h
+++ /dev/null
@@ -1,105 +0,0 @@
-      include 'npbparams.h'
-
-c---------------------------------------------------------------------
-c  Note: please observe that in the routine conj_grad three 
-c  implementations of the sparse matrix-vector multiply have
-c  been supplied.  The default matrix-vector multiply is not
-c  loop unrolled.  The alternate implementations are unrolled
-c  to a depth of 2 and unrolled to a depth of 8.  Please
-c  experiment with these to find the fastest for your particular
-c  architecture.  If reporting timing results, any of these three may
-c  be used without penalty.
-c---------------------------------------------------------------------
-
-
-c---------------------------------------------------------------------
-c  Class specific parameters: 
-c  It appears here for reference only.
-c  These are their values, however, this info is imported in the npbparams.h
-c  include file, which is written by the sys/setparams.c program.
-c---------------------------------------------------------------------
-
-C----------
-C  Class S:
-C----------
-CC       parameter( na=1400, 
-CC      >           nonzer=7, 
-CC      >           shift=10., 
-CC      >           niter=15,
-CC      >           rcond=1.0d-1 )
-C----------
-C  Class W:
-C----------
-CC       parameter( na=7000,
-CC      >           nonzer=8, 
-CC      >           shift=12., 
-CC      >           niter=15,
-CC      >           rcond=1.0d-1 )
-C----------
-C  Class A:
-C----------
-CC       parameter( na=14000,
-CC      >           nonzer=11, 
-CC      >           shift=20., 
-CC      >           niter=15,
-CC      >           rcond=1.0d-1 )
-C----------
-C  Class B:
-C----------
-CC       parameter( na=75000, 
-CC      >           nonzer=13, 
-CC      >           shift=60., 
-CC      >           niter=75,
-CC      >           rcond=1.0d-1 )
-C----------
-C  Class C:
-C----------
-CC       parameter( na=150000, 
-CC      >           nonzer=15, 
-CC      >           shift=110., 
-CC      >           niter=75,
-CC      >           rcond=1.0d-1 )
-C----------
-C  Class D:
-C----------
-CC       parameter( na=1500000, 
-CC      >           nonzer=21, 
-CC      >           shift=500., 
-CC      >           niter=100,
-CC      >           rcond=1.0d-1 )
-C----------
-C  Class E:
-C----------
-CC       parameter( na=9000000, 
-CC      >           nonzer=26, 
-CC      >           shift=1500., 
-CC      >           niter=100,
-CC      >           rcond=1.0d-1 )
-
-
-      integer    nz, naz
-      parameter( nz = na*(nonzer+1)*(nonzer+1) )
-      parameter( naz = na*(nonzer+1) )
-
-			      	
-      common / partit_size  / 	 naa, nzz, 
-     >                        	 firstrow, 
-     >                           lastrow, 
-     >                           firstcol, 
-     >                           lastcol
-      integer                 	 naa, nzz, 
-     >                        	 firstrow, 
-     >                           lastrow, 
-     >                           firstcol, 
-     >                           lastcol
-			      	
-      common /urando/         	 amult, tran
-      double precision           amult, tran
-
-      external         timer_read
-      double precision timer_read
-
-      integer T_init, T_bench, T_conj_grad, T_last
-      parameter (T_init=1, T_bench=2, T_conj_grad=3, T_last=3)
-      logical timeron
-      common /timers/ timeron
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/make.bat
deleted file mode 100644
index dcc4b71..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/make.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-set CLASS=%1
-set OPT=%2
-
-CALL ..\sys\setparams CG %CLASS%
-CALL %F77% %OPT% cg 1>out_%CLASS%.txt 2>err_%CLASS%.txt
-if exist cg.exe ( 
-  copy cg.exe %BIN%\cg.%CLASS%.x.exe
-  del cg.exe 
-)
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/print_results.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/print_results.f
deleted file mode 100644
index d2fe91e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/print_results.f
+++ /dev/null
@@ -1,111 +0,0 @@
-
-      subroutine print_results(name, class, n1, n2, n3, niter, 
-     >               t, mops, optype, verified, npbversion, 
-     >               compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-      
-      implicit none
-      character name*(*)
-      character class*1
-      integer   n1, n2, n3, niter, j
-      double precision t, mops
-      character optype*24, size*15
-      logical   verified
-      character*(*) npbversion, compiletime, 
-     >              cs1, cs2, cs3, cs4, cs5, cs6, cs7
-
-         write (*, 2) name 
- 2       format(//, ' ', A, ' Benchmark Completed.')
-
-         write (*, 3) Class
- 3       format(' Class           = ', 12x, a12)
-
-c   If this is not a grid-based problem (EP, FT, CG), then
-c   we only print n1, which contains some measure of the
-c   problem size. In that case, n2 and n3 are both zero.
-c   Otherwise, we print the grid size n1xn2xn3
-
-         if ((n2 .eq. 0) .and. (n3 .eq. 0)) then
-            if (name(1:2) .eq. 'EP') then
-               write(size, '(f15.0)' ) 2.d0**n1
-               j = 15
-               if (size(j:j) .eq. '.') then
-                  size(j:j) = ' '
-                  j = j - 1
-               endif
-               write (*,42) size(1:j)
- 42            format(' Size            = ',9x, a15)
-            else
-               write (*,44) n1
- 44            format(' Size            = ',12x, i12)
-            endif
-         else
-            write (*, 4) n1,n2,n3
- 4          format(' Size            =  ',9x, i4,'x',i4,'x',i4)
-         endif
-
-         write (*, 5) niter
- 5       format(' Iterations      = ', 12x, i12)
-         
-         write (*, 6) t
- 6       format(' Time in seconds = ',12x, f12.2)
-         
-         write (*,9) mops
- 9       format(' Mop/s total     = ',12x, f12.2)
-
-         write(*, 11) optype
- 11      format(' Operation type  = ', a24)
-
-         if (verified) then 
-            write(*,12) '  SUCCESSFUL'
-         else
-            write(*,12) 'UNSUCCESSFUL'
-         endif
- 12      format(' Verification    = ', 12x, a)
-
-         write(*,13) npbversion
- 13      format(' Version         = ', 12x, a12)
-
-         write(*,14) compiletime
- 14      format(' Compile date    = ', 12x, a12)
-
-
-         write (*,121) cs1
- 121     format(/, ' Compile options:', /, 
-     >          '    F77          = ', A)
-
-         write (*,122) cs2
- 122     format('    FLINK        = ', A)
-
-         write (*,123) cs3
- 123     format('    F_LIB        = ', A)
-
-         write (*,124) cs4
- 124     format('    F_INC        = ', A)
-
-         write (*,125) cs5
- 125     format('    FFLAGS       = ', A)
-
-         write (*,126) cs6
- 126     format('    FLINKFLAGS   = ', A)
-
-         write(*, 127) cs7
- 127     format('    RAND         = ', A)
-        
-         write (*,130)
- 130     format(//' Please send all errors/feedbacks to:'//
-     >            ' NPB Development Team'/
-     >            ' npb@nas.nasa.gov'//)
-c 130     format(//' Please send the results of this run to:'//
-c     >            ' NPB Development Team '/
-c     >            ' Internet: npb@nas.nasa.gov'/
-c     >            ' '/
-c     >            ' If email is not available, send this to:'//
-c     >            ' MS T27A-1'/
-c     >            ' NASA Ames Research Center'/
-c     >            ' Moffett Field, CA  94035-1000'//
-c     >            ' Fax: 650-604-3957'//)
-
-
-         return
-         end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/randdp.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/randdp.f
deleted file mode 100644
index 64860d9..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/randdp.f
+++ /dev/null
@@ -1,137 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function randlc (x, a)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c
-c   This routine returns a uniform pseudorandom double precision number in the
-c   range (0, 1) by using the linear congruential generator
-c
-c   x_{k+1} = a x_k  (mod 2^46)
-c
-c   where 0 < x_k < 2^46 and 0 < a < 2^46.  This scheme generates 2^44 numbers
-c   before repeating.  The argument A is the same as 'a' in the above formula,
-c   and X is the same as x_0.  A and X must be odd double precision integers
-c   in the range (1, 2^46).  The returned value RANDLC is normalized to be
-c   between 0 and 1, i.e. RANDLC = 2^(-46) * x_1.  X is updated to contain
-c   the new seed x_1, so that subsequent calls to RANDLC using the same
-c   arguments will generate a continuous sequence.
-c
-c   This routine should produce the same results on any computer with at least
-c   48 mantissa bits in double precision floating point data.  On 64 bit
-c   systems, double precision should be disabled.
-c
-c   David H. Bailey     October 26, 1990
-c
-c---------------------------------------------------------------------
-
-      implicit none
-
-      double precision r23,r46,t23,t46,a,x,t1,t2,t3,t4,a1,a2,x1,x2,z
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-c---------------------------------------------------------------------
-c   Break A into two parts such that A = 2^23 * A1 + A2.
-c---------------------------------------------------------------------
-      t1 = r23 * a
-      a1 = int (t1)
-      a2 = a - t23 * a1
-
-c---------------------------------------------------------------------
-c   Break X into two parts such that X = 2^23 * X1 + X2, compute
-c   Z = A1 * X2 + A2 * X1  (mod 2^23), and then
-c   X = 2^23 * Z + A2 * X2  (mod 2^46).
-c---------------------------------------------------------------------
-      t1 = r23 * x
-      x1 = int (t1)
-      x2 = x - t23 * x1
-      t1 = a1 * x2 + a2 * x1
-      t2 = int (r23 * t1)
-      z = t1 - t23 * t2
-      t3 = t23 * z + a2 * x2
-      t4 = int (r46 * t3)
-      x = t3 - t46 * t4
-      randlc = r46 * x
-
-      return
-      end
-
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine vranlc (n, x, a, y)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c
-c   This routine generates N uniform pseudorandom double precision numbers in
-c   the range (0, 1) by using the linear congruential generator
-c
-c   x_{k+1} = a x_k  (mod 2^46)
-c
-c   where 0 < x_k < 2^46 and 0 < a < 2^46.  This scheme generates 2^44 numbers
-c   before repeating.  The argument A is the same as 'a' in the above formula,
-c   and X is the same as x_0.  A and X must be odd double precision integers
-c   in the range (1, 2^46).  The N results are placed in Y and are normalized
-c   to be between 0 and 1.  X is updated to contain the new seed, so that
-c   subsequent calls to VRANLC using the same arguments will generate a
-c   continuous sequence.  If N is zero, only initialization is performed, and
-c   the variables X, A and Y are ignored.
-c
-c   This routine is the standard version designed for scalar or RISC systems.
-c   However, it should produce the same results on any single processor
-c   computer with at least 48 mantissa bits in double precision floating point
-c   data.  On 64 bit systems, double precision should be disabled.
-c
-c---------------------------------------------------------------------
-
-      implicit none
-
-      integer i,n
-      double precision y,r23,r46,t23,t46,a,x,t1,t2,t3,t4,a1,a2,x1,x2,z
-      dimension y(*)
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-
-c---------------------------------------------------------------------
-c   Break A into two parts such that A = 2^23 * A1 + A2.
-c---------------------------------------------------------------------
-      t1 = r23 * a
-      a1 = int (t1)
-      a2 = a - t23 * a1
-
-c---------------------------------------------------------------------
-c   Generate N results.   This loop is not vectorizable.
-c---------------------------------------------------------------------
-      do i = 1, n
-
-c---------------------------------------------------------------------
-c   Break X into two parts such that X = 2^23 * X1 + X2, compute
-c   Z = A1 * X2 + A2 * X1  (mod 2^23), and then
-c   X = 2^23 * Z + A2 * X2  (mod 2^46).
-c---------------------------------------------------------------------
-        t1 = r23 * x
-        x1 = int (t1)
-        x2 = x - t23 * x1
-        t1 = a1 * x2 + a2 * x1
-        t2 = int (r23 * t1)
-        z = t1 - t23 * t2
-        t3 = t23 * z + a2 * x2
-        t4 = int (r46 * t3)
-        x = t3 - t46 * t4
-        y(i) = r46 * x
-      enddo
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/timers.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/timers.f
deleted file mode 100644
index 83c1a7f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/CG/timers.f
+++ /dev/null
@@ -1,108 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine timer_clear(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      elapsed(n) = 0.0
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_start(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      start(n) = elapsed_time()
-
-      return
-      end
-      
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_stop(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-      double precision t, now
-      now = elapsed_time()
-      t = now - start(n)
-      elapsed(n) = elapsed(n) + t
-
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function timer_read(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-      
-      timer_read = elapsed(n)
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function elapsed_time()
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-
-      double precision dvtime
-
-c This function must measure wall clock time, not CPU time. 
-c Since there is no portable timer in Fortran (77)
-c we call a routine compiled in C (though the C source may have
-c to be tweaked). 
-!      call wtime(t)
-c The following is not ok for "official" results because it reports
-c CPU time not wall clock time. It may be useful for developing/testing
-c on timeshared Crays, though. 
-c     call second(t)
-
-      elapsed_time = dvtime()
-
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile
deleted file mode 100644
index a52a4a4..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=ep
-BENCHMARKU=EP
-
-include ../config/make.def
-include ../sys/make.common
-
-SOURCES = ep.fdv
-
-OBJS = ${SOURCES:.fdv=.o}
-
-${PROGRAM}: config  $(OBJS)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
-
-%.o: %.fdv npbparams.h
-	${F77} f ${FFLAGS} -c -o $@ $<
-	
-clean:
-	rm -f npbparams.h
-	rm -f *.o *~
-	rm -f *.cu *.cuf *.c *.f
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/ep.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/ep.fdv
deleted file mode 100644
index a10a417..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/ep.fdv
+++ /dev/null
@@ -1,565 +0,0 @@
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  2.3         !
-!                                                                         !
-!                        D V M        V E R S I O N S                     !
-!                                                                         !
-!                                   E P                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!                                                                         !
-!    This benchmark is DVM version of the NPB EP code.                    !
-!                                                                         !
-!    Permission to use, copy, distribute and modify this software         !
-!    for any purpose with or without fee is hereby granted.  We           !
-!    request, however, that all derived work reference the NAS            !
-!    Parallel Benchmarks 2.3. This software is provided "as is"           !
-!    without express or implied warranty.                                 !
-!                                                                         !
-!    Information on NPB 2.3, including the technical report, the          !
-!    original specifications, source code, results and information        !
-!    on how to submit new results, is available at:                       !
-!                                                                         !
-!           http://www.nas.nasa.gov/NAS/NPB/                              !
-!                                                                         !
-!    Send comments or suggestions to  npb@nas.nasa.gov                    !
-!    Send bug reports to              npb-bugs@nas.nasa.gov               !
-!                                                                         !
-!          NAS Parallel Benchmarks Group                                  !
-!          NASA Ames Research Center                                      !
-!          Mail Stop: T27A-1                                              !
-!          Moffett Field, CA   94035-1000                                 !
-!                                                                         !
-!          E-mail:  npb@nas.nasa.gov                                      !
-!          Fax:     (415) 604-3957                                        !
-!                                                                         !
-!-------------------------------------------------------------------------!
-
-
-c---------------------------------------------------------------------
-c
-c Author: P. O. Frederickson 
-c         D. H. Bailey
-c         A. C. Woo
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-      program epdv
-c---------------------------------------------------------------------
-C
-c   This is the serial version of the APP Benchmark 1,
-c   the "embarassingly parallel" benchmark.
-c
-c
-c   M is the Log_2 of the number of complex pairs of uniform (0, 1) random
-c   numbers.  MK is the Log_2 of the size of each batch of uniform random
-c   numbers.  MK can be set for convenience on a given system, since it does
-c   not affect the results.
-
-      implicit none
-
-      include 'npbparams.h'
-      
-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
-
-      double precision y,r23,r46,t23,t46,a1,a2,z,ah
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc
-
-      double precision Mops, epsilon, a, s, t1, t2, t3, t4, x, x1, 
-     >                 x2, q, sx, sy, tm, an, tt, gc, dum(3),
-     >                 timer_read
-      integer          mk, mm, nn, nk, nq, np, ierr, node, no_nodes, 
-     >                 i, ik, kk, l, k, nit, ierrcode, no_large_nodes,
-     >                 np_add, k_offset, j
-      logical          verified, timers_enabled
-      parameter       (timers_enabled = .false.)
-      external         timer_read
-      double precision qq, t1h, t2h, y1, y2, xh
-      character*13     size
-
-      parameter (mk = 16, mm = m - mk, nn = 2 ** mm,
-     >           nk = 2 ** mk, nq = 10, epsilon=1.d-8,
-     >           a = 1220703125.d0, s = 271828183.d0)
-
-c      common/storage/ x(2*nk), q(0:nq-1), qq(10000)
-      common/storage/ x(2*nk), q(0:9), qq(10000)
-
-!DVM$ TEMPLATE TEM(nn)
-!DVM$ DISTRIBUTE TEM (BLOCK)
-      data             dum /1.d0, 1.d0, 1.d0/
-
-
-c   Because the size of the problem is too large to store in a 32-bit
-c   integer for some classes, we put it into a string (for printing).
-c   Have to strip off the decimal point put in there by the floating
-c   point print statement (internal file)
-
-      write(*, 1000)
-      write(size, '(f12.0)' ) 2.d0**(m+1)
-      do j =13,1,-1
-         if (size(j:j) .eq. '.') size(j:j) = ' '
-      end do
-      write (*,1001) size
-
- 1000 format(//,' NAS Parallel Benchmarks 3.3 - DVMH version',
-     >          ' - EP Benchmark', /)
- 1001 format(' Number of random numbers generated: ', a14)
- 1003 format(' Number of active processes:         ', i12, /)
-
-      verified = .false.
-
-c   Compute the number of "batches" of random number pairs generated 
-c   per processor. Adjust if the number of processors does not evenly 
-c   divide the total number
-
-      np = nn 
-
-
-c   Call the random number generator functions and initialize
-c   the x-array to reduce the effects of paging on the timings.
-c   Also, call all mathematical functions that are used. Make
-c   sure these initializations cannot be eliminated as dead code.
-
-      call vranlc(0, dum(1), dum(2), dum(3))
-      call randlc(dum(2), dum(3), dum(1))
-      do 5    i = 1, 2*nk
-         x(i) = -1.d99
- 5    continue
-      Mops = log(sqrt(abs(max(1.d0,1.d0))))
-
-      
-      call timer_clear(1)
-      call timer_clear(2)
-      call timer_clear(3)
-      call timer_start(1)
-!DVM$ INTERVAL 1
-      call vranlc(0, t1, a, x)
-
-c   Compute AN = A ^ (2 * NK) (mod 2^46).
-
-      t1 = a
-
-      do 100 i = 1, mk + 1
-         call randlc(t1, t1, t2)
- 100  continue
-
-      an = t1
-      tt = s
-      gc = 0.d0
-      sx = 0.d0
-      sy = 0.d0
-
-      do 110 i = 0, nq - 1
-         q(i) = 0.d0
- 110  continue
-
-c   Each instance of this loop may be performed independently. We compute
-c   the k offsets separately to take into account the fact that some nodes
-c   have more numbers to generate than others
-
-      k_offset = -1
-      
-!DVM$ region 
-!DVM$ PARALLEL (k) ON TEM(k),REDUCTION(SUM(q),SUM(sx),SUM(sy))
-!DVM$*,private(xh,i,kk,ik,t1,t2,y1,y2,a1,a2,x1,x2
-!DVM$*,l,t3,t4),cuda_block(256)
-      do k = 1, np
-         kk = k_offset + k 
-         t1 = s
-         t2 = an
-
-c        Find starting seed t1 for this kk.
-         do i = 1, 100
-            ik = kk / 2
-            if (2 * ik .ne. kk) then
-               call randlc(t1, t2, t3)
-            endif
-            if (ik .eq. 0) exit
-            call randlc(t2, t2, t3)
-            kk = ik
-         enddo
-
-
-         xh = t1
-         a1 = int (r23 * a)
-         a2 = a - t23 * a1
-
-         do i = 1, nk
-            call randNext (xh, y1, a1, a2)
-            call randNext (xh, y2, a1, a2)
-
-            x1 = 2.d0 * y1 - 1.d0
-            x2 = 2.d0 * y2 - 1.d0
-            t1 = x1 * x1 + x2 * x2
-            if (t1 .le. 1.d0) then
-               t2   = sqrt(-2.d0 * log(t1) / t1)
-               t3   = (x1 * t2)
-               t4   = (x2 * t2)
-               l    = max(abs(t3), abs(t4))
-               q(l) = q(l) + 1.d0
-               sx   = sx + t3
-               sy   = sy + t4
-            endif
-         enddo
-      enddo
-!DVM$ end region
-
-      do 160 i = 0, nq - 1
-        gc = gc + q(i)
- 160  continue
-!DVM$ END INTERVAL
-      call timer_stop(1)
-      tm  = timer_read(1)
-
-      nit=0
-      if (m.eq.24) then
-         if((abs((sx- (-3.247834652034740D3))/sx).le.epsilon).and.
-     >      (abs((sy- (-6.958407078382297D3))/sy).le.epsilon))
-     >      verified = .TRUE.
-      elseif (m.eq.25) then
-         if ((abs((sx- (-2.863319731645753D+03))/sx).le.epsilon).and.
-     >       (abs((sy- (-6.320053679109499D+03))/sy).le.epsilon))
-     >      verified = .TRUE.
-      elseif (m.eq.28) then
-         if ((abs((sx- (-4.295875165629892D3))/sx).le.epsilon).and.
-     >       (abs((sy- (-1.580732573678431D4))/sy).le.epsilon))
-     >      verified = .TRUE.
-      elseif (m.eq.30) then
-         if ((abs((sx- (4.033815542441498D4))/sx).le.epsilon).and.
-     >       (abs((sy- (-2.660669192809235D4))/sy).le.epsilon))
-     >      verified = .true.
-      elseif (m.eq.32) then
-         if ((abs((sx- (4.764367927995374D+4))/sx).le.epsilon).and.
-     >       (abs((sy- (-8.084072988043731D+4))/sy).le.epsilon))
-     >      verified = .true.
-      elseif (m.eq.36) then
-         if ((abs((sx- (1.982481200946593D+5))/sx).le.epsilon).and.
-     >       (abs((sy- (-1.020596636361769D+5))/sy).le.epsilon))
-     >      verified = .true.
-      elseif (m.eq.40) then
-         if ((abs((sx- (-5.319717441530D+05))/sx).le.epsilon).and.
-     >       (abs((sy- (-3.688834557731D+05))/sy).le.epsilon))
-     >      verified = .true.
-      else
-         verified = .false.
-      endif
-      Mops = 2.d0**(m+1)/tm/1000000.d0
-
-      write (6,11) tm, m, gc, sx, sy, (i, q(i), i = 0, nq - 1)
- 11   format (' EP Benchmark Results:'//' CPU Time =',f10.4/' N = 2^',
-     >        i5/' No. Gaussian Pairs =',f15.0/' Sums = ',1p,2d25.15/
-     >        ' Counts:'/(i3,0p,f15.0))
-
-      call print_results('EP', class, m+1, 0, 0, nit,
-     >                   tm, Mops, 
-     >                   'Random numbers generated', 
-     >                   verified, npbversion)
-
-
-      if (timers_enabled) then
-          print *, 'Total time:     ', timer_read(1)
-          print *, 'Gaussian pairs: ', timer_read(2)
-          print *, 'Random numbers: ', timer_read(3)
-      endif
-
-
-      end
-
-      subroutine print_results(name, class, n1, n2, n3, niter, 
-     >               t, mops, optype, verified, npbversion) 
-      
-      implicit none
-      character*2 name
-      character*1 class
-      integer n1, n2, n3, niter, j
-      double precision t, mops
-      character optype*24, size*13
-      logical verified
-      character*(*) npbversion
-
-         write (*, 2) name 
- 2       format(//, ' ', A2, ' Benchmark Completed.')
-
-         write (*, 3) Class
- 3       format(' Class           = ', 12x, a12)
-
-c   If this is not a grid-based problem (EP, FT, CG), then
-c   we only print n1, which contains some measure of the
-c   problem size. In that case, n2 and n3 are both zero.
-c   Otherwise, we print the grid size n1xn2xn3
-
-         if ((n2 .eq. 0) .and. (n3 .eq. 0)) then
-            if (name(1:2) .eq. 'EP') then
-               write(size, '(f12.0)' ) 2.d0**n1
-               do j =13,1,-1
-                  if (size(j:j) .eq. '.') size(j:j) = ' '
-               end do
-               write (*,42) size
- 42            format(' Size            = ',12x, a14)
-            else
-               write (*,44) n1
- 44            format(' Size            = ',12x, i12)
-            endif
-         else
-            write (*, 4) n1,n2,n3
- 4          format(' Size            =  ',12x, i3,'x',i3,'x',i3)
-         endif
-
-         write (*, 5) niter
- 5       format(' Iterations      = ', 12x, i12)
-         
-         write (*, 6) t
- 6       format(' Time in seconds = ',12x, f12.2)
-         
-         write (*,9) mops
- 9       format(' Mop/s total     = ',12x, f12.2)
-
-         write(*, 11) optype
- 11      format(' Operation type  = ', a24)
-
-         if (verified) then 
-            write(*,12) '  SUCCESSFUL'
-         else
-            write(*,12) 'UNSUCCESSFUL'
-         endif
- 12      format(' Verification    = ', 12x, a)
-
-         write(*,13) npbversion
- 13      format(' Version         = ', 12x, a12)
-
-         write (*,130)
- 130     format(//' Please send the results of this run to:'//
-     >            ' NPB Development Team '/
-     >            ' Internet: npb@nas.nasa.gov'/
-     >            ' '/
-     >            ' If email is not available, send this to:'//
-     >            ' MS T27A-1'/
-     >            ' NASA Ames Research Center'/
-     >            ' Moffett Field, CA  94035-1000'//
-     >            ' Fax: 415-604-3957'//)
-
-
-         return
-         end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      pure subroutine randlc (x, a, ret)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      implicit none
-      intent(in)::a
-      intent(inout)::x
-      intent(out)::ret
-      double precision r23,r46,t23,t46,a,x,t1,t2,t3,t4,a1,a2,x1,x2,z
-     > ,ret
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-c---------------------------------------------------------------------
-c   Break A into two parts such that A = 2^23 * A1 + A2.
-c---------------------------------------------------------------------
-      t1 = r23 * a
-      a1 = int (t1)
-      a2 = a - t23 * a1
-
-c---------------------------------------------------------------------
-c   Break X into two parts such that X = 2^23 * X1 + X2, compute
-c   Z = A1 * X2 + A2 * X1  (mod 2^23), and then
-c   X = 2^23 * Z + A2 * X2  (mod 2^46).
-c---------------------------------------------------------------------
-      t1 = r23 * x
-      x1 = int (t1)
-      x2 = x - t23 * x1
-      t1 = a1 * x2 + a2 * x1
-      t2 = int (r23 * t1)
-      z = t1 - t23 * t2
-      t3 = t23 * z + a2 * x2
-      t4 = int (r46 * t3)
-      x = t3 - t46 * t4
-      ret = r46 * x
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      pure subroutine randNext (x, ret, a1, a2)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      implicit none
-      intent(inout)::x
-      intent(in)::a1, a2
-      intent(out)::ret
-      double precision r23,r46,t23,t46,x,t1,t2,t3,t4,a1,a2,x1,x2,z
-     > ,ret
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-c---------------------------------------------------------------------
-c   Break X into two parts such that X = 2^23 * X1 + X2, compute
-c   Z = A1 * X2 + A2 * X1  (mod 2^23), and then
-c   X = 2^23 * Z + A2 * X2  (mod 2^46).
-c---------------------------------------------------------------------
-      t1 = r23 * x
-      x1 = int (t1)
-      x2 = x - t23 * x1
-      t1 = a1 * x2 + a2 * x1
-      t2 = int (r23 * t1)
-      z = t1 - t23 * t2
-      t3 = t23 * z + a2 * x2
-      t4 = int (r46 * t3)
-      x = t3 - t46 * t4
-      ret = r46 * x
-			
-      return
-      end
-	  
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine vranlc (n, x, a, y)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-
-      integer i,n
-      double precision y,r23,r46,t23,t46,a,x,t1,t2,t3,t4,a1,a2,x1,x2,z
-      dimension y(*)
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-
-c---------------------------------------------------------------------
-c   Break A into two parts such that A = 2^23 * A1 + A2.
-c---------------------------------------------------------------------
-      t1 = r23 * a
-      a1 = int (t1)
-      a2 = a - t23 * a1
-
-c---------------------------------------------------------------------
-c   Generate N results.   This loop is not vectorizable.
-c---------------------------------------------------------------------
-      do i = 1, n
-
-c---------------------------------------------------------------------
-c   Break X into two parts such that X = 2^23 * X1 + X2, compute
-c   Z = A1 * X2 + A2 * X1  (mod 2^23), and then
-c   X = 2^23 * Z + A2 * X2  (mod 2^46).
-c---------------------------------------------------------------------
-        t1 = r23 * x
-        x1 = int (t1)
-        x2 = x - t23 * x1
-        t1 = a1 * x2 + a2 * x1
-        t2 = int (r23 * t1)
-        z = t1 - t23 * t2
-        t3 = t23 * z + a2 * x2
-        t4 = int (r46 * t3)
-        x = t3 - t46 * t4
-        y(i) = r46 * x
-      enddo
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine timer_clear(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      elapsed(n) = 0.0
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_start(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-!DVM$ BARRIER
-      start(n) = elapsed_time()
-
-      return
-      end
-      
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_stop(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-      double precision t, now
-      now = elapsed_time()
-      t = now - start(n)
-      elapsed(n) = elapsed(n) + t
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function timer_read(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-      
-      timer_read = elapsed(n)
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function elapsed_time()
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      implicit none
-      double precision t
-      double precision dvtime
-      data t/0.d0/ 
-      elapsed_time = dvtime()
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/make.bat
deleted file mode 100644
index 768cdf6..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/EP/make.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-set CLASS=%1
-set OPT=%2
-
-CALL ..\sys\setparams EP %CLASS%
-CALL %F77% %OPT% ep 1>out_%CLASS%.txt 2>err_%CLASS%.txt
-if exist ep.exe ( 
-  copy ep.exe %BIN%\ep.%CLASS%.x.exe 
-  del ep.exe 
-)
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile
deleted file mode 100644
index 1afbae6..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=ft
-BENCHMARKU=FT
-
-include ../config/make.def
-include ../sys/make.common
-
-SOURCES = ft.fdv
-
-OBJS = ${SOURCES:.fdv=.o}
-
-${PROGRAM}: config $(OBJS)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
-
-%.o: %.fdv npbparams.h global.h
-	${F77} f ${FFLAGS} -f90 -c -o $@ $<
-
-clean:
-	rm -f npbparams.h
-	rm -f *.o *~
-	rm -f *.cu *.cuf *.c *.f
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/dtime.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/dtime.h
deleted file mode 100644
index 74fee83..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/dtime.h
+++ /dev/null
@@ -1,3 +0,0 @@
-       integer dvm_debug
-       parameter (dvm_debug=0) 
-                                                                            
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv
deleted file mode 100644
index 49fd41a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/ft.fdv
+++ /dev/null
@@ -1,1838 +0,0 @@
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         !
-!                                                                         !
-!              O p e n M P ->DVMH    V E R S I O N             !
-!                                                                         !
-!                                   F T                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!                                                                         !
-!    This benchmark is an OpenMP version of the NPB FT code.              !
-!    It is described in NAS Technical Report 99-011.                      !
-!                                                                         !
-!    Permission to use, copy, distribute and modify this software         !
-!    for any purpose with or without fee is hereby granted.  We           !
-!    request, however, that all derived work reference the NAS            !
-!    Parallel Benchmarks 3.3. This software is provided "as is"           !
-!    without express or implied warranty.                                 !
-!                                                                         !
-!    Information on NPB 3.3, including the technical report, the          !
-!    original specifications, source code, results and information        !
-!    on how to submit new results, is available at:                       !
-!                                                                         !
-!           http://www.nas.nasa.gov/Software/NPB/                         !
-!                                                                         !
-!    Send comments or suggestions to  npb@nas.nasa.gov                    !
-!                                                                         !
-!          NAS Parallel Benchmarks Group                                  !
-!          NASA Ames Research Center                                      !
-!          Mail Stop: T27A-1                                              !
-!          Moffett Field, CA   94035-1000                                 !
-!                                                                         !
-!          E-mail:  npb@nas.nasa.gov                                      !
-!          Fax:     (650) 604-3957                                        !
-!                                                                         !
-!-------------------------------------------------------------------------!
-
-!---------------------------------------------------------------------
-!
-! Authors: D. Bailey
-!          W. Saphir
-!          H. Jin
-!
-!---------------------------------------------------------------------
-! OpenMP ->DVMH version Mihail Kuznetsov
-!---------------------------------------------------------------------
-
-
-
-
-program ft
-	implicit none
-	include 'global.h'
-	
-    integer i, iter, niter
-	
-	double precision total_time, mflops
-	logical verified
-	character class
-	
-	
-	double complex sums(niter_default)
-	
-	call info(niter)	  	
-	
-	do i = 1, t_max
-		call timer_clear(i)
-	end do
-	       
-    if(more_memory) then 
-	  call init_ui	
-	else
-	  call init_ui_1
-	endif
-
-	
-	if (timers_enabled) call timer_start(T_total)
-	
- 
-	if (timers_enabled) call timer_start(T_setup) 
-	
-
-	call setup
-
-	if(more_memory) call init_twiddle
-	call init_scratch
-
-	
-	
-	if (timers_enabled) call timer_stop(T_setup)
-	
-
-!	if (timers_enabled) call timer_start(T_fft)	
-	call fft_p
-!	if (timers_enabled) call timer_stop(T_fft)
-	
-
-
-!----------------------------------------------------------------------->
-	 do iter = 1, niter
-		 		 
-		 call timer_start(T_fft)
-         if (more_memory) then
-		   call evolve_and_fft_n
-         else
-		   call evolve_and_fft_n_1
-         endif
-		 call timer_stop(T_fft)         
-		 
-		 if (timers_enabled) call timer_start(T_checksum)
-		 call checksum(iter,sums)
-		 if (timers_enabled) call timer_stop(T_checksum)
-		 
-	 end do
-!----------------------------------------------------------------------------------->
-	
-
-	
-
-	call verify(niter, verified, class,sums)
-
-	call timer_stop(t_total)
-	total_time = timer_read(T_fft)
-
-	if( total_time .ne. 0. ) then
-		mflops = 1.0d-6*float(ntotal)* (14.8157+7.19641*log(float(ntotal))+(5.23518+7.21113*log(float(ntotal)))*niter)/total_time
-	else
-		mflops = 0.0
-	endif
-	  
-    call print_results('FT', class, nx, ny, nz, niter,total_time, mflops, '          floating point', verified, npbversion, compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-	if (timers_enabled) call print_timers()
-
-end
-
-!-------------------------------------------------------------------------------------------------->
-subroutine timer_clear(n)
-	implicit none
-	integer n
-      
-	double precision start(64), elapsed(64)
-	common /tt/ start, elapsed
-	elapsed(n) = 0.0
-	return
-end
-
-
-subroutine timer_start(n)
-
-	implicit none	
-	external elapsed_time
-	double precision elapsed_time
-	integer n
-    double precision start(64), elapsed(64)
-    common /tt/ start, elapsed
-
-    start(n) = elapsed_time()
-
-	return
-end
-      
-subroutine timer_stop(n)
-
-
-	implicit none
-    external elapsed_time
-    double precision elapsed_time
-    integer n
-    double precision start(64), elapsed(64)
-    common /tt/ start, elapsed
-    double precision t, now
-    now = elapsed_time()
-    t = now - start(n)
-    elapsed(n) = elapsed(n) + t
-
-	return
-end
-
-double precision function timer_read(n)
-
-    implicit none
-    integer n
-    double precision start(64), elapsed(64)
-    common /tt/ start, elapsed
-
-      
-    timer_read = elapsed(n)
-    return
-end
-
-
-double precision function elapsed_time()
-    implicit none	  
-    double precision t
-    double precision dvtime    
-	
-    include 'dtime.h'                                   
-    data t/0.d0/
-    if(dvm_debug.ne.0) then                               
-        t=t+1.D0                                           
-        elapsed_time = t                                   
-    else                                                 
-		elapsed_time = dvtime()
-    end if
-    return
-end
-
-
-!------------------------------------------------------------------------------------->
-
-
-
-
-
-subroutine init_twiddle
-	implicit none
-	include 'global.h'
-
-	integer i, j, k, kk, kk2, jj, kj2, ii
-	double precision ap
-	
-	ap = - 4.d0 * alpha * pi *pi
-
-
-
-!dvm$  region
-!dvm$  parallel  (k,j,i)  on  twiddle(i,j,k), private(kk, kk2, jj, kj2, ii)
-	do k = 1, nz				
-		do j = 1, ny				
-			do i = 1, nx
-			
-				kk =  mod(k-1+nz/2, nz) - nz/2
-				kk2 = kk*kk		
-			
-				jj = mod(j-1+ny/2, ny) - ny/2
-				kj2 = jj*jj+kk2
-			
-				ii = mod(i-1+nx/2, nx) - nx/2			  
-				twiddle(i,j,k) = dexp(ap*dble(ii*ii+kj2))
-			end do
-		end do	
-	enddo	
-
-!dvm$  end region 
-! dvm$ get_actual(twiddle)
-
-
-
-end 
-	 
-
-subroutine init_scratch
-
-	implicit none
-	include 'global.h'
-	
-	integer i, j,m,ku,ln
-	double precision t, ti	 
-
-	m = ilog2(nx)
-	
-
-	u(1) = m	
-
-
-	ku = 2
-	ln = 1
-
-
-	do j = 1, m
-		t = pi / ln   
-	 
-!dvm$  region
-!dvm$  parallel  (i)  on  u(i+ku),  private (ti), cuda_block(256)
-
-		do i = 0, ln - 1
-			ti = i * t
-			u(i+ku) = dcmplx (cos (ti), sin(ti))
-		enddo    
-
-!dvm$  end region 
-! dvm$ get_actual(u) 
-		ku = ku + ln
-		ln = 2 * ln
-	enddo 
-
-
-
-end	 
-	 
-	 
-!------------------------------------------------------------------------------------->	
-	
-subroutine init_ui
-
-	implicit none
- 
-	include 'global.h'
-	
-    integer i, j, k
-	
-
-	do k = 1, nz  
-		do j = 1, ny
-			do i = 1, nxp
-				u0(i,j,k) = 0.d0
-				u1(i,j,k) = 0.d0
-				twiddle(i,j,k) = 0.d0
-			end do
-		end do
-	end do
-
-
-	return
-end
-
-!------------------------------------------------------------------------------------->	
-	
-subroutine init_ui_1
-
-	implicit none
- 
-	include 'global.h'
-	
-    integer i, j, k
-	
-
-	do k = 1, nz  
-		do j = 1, ny
-			do i = 1, nxp
-				u0(i,j,k) = 0.d0
-				u1(i,j,k) = 0.d0
-			end do
-		end do
-	end do
-
-
-	return
-end
-
-
-     
-subroutine  setup 
-	implicit none
-	include 'global.h'
-	
-	
-	integer j, k
-	double precision start, an, dummy 
-	 
-	double precision starts_k
-
-	start = seed
-	
-	call ipow46(a, 0, an)
-	dummy = randlc(start, an)
-	call ipow46(a, 2*nx*ny, an)
-	
-
-	do k = 1, nz	
-	
-		starts_k = start
-		if (k .ge.2 ) dummy = randlc(start, an)
-		starts_k = start				
-
-		do j = 1, ny 			
-			call vranlc(2*nx, starts_k, a, u1(1, j, k))
-		end do	 
-	
-		
-	end do
-
-
-	return  
-end 
-!----------------------------------------------------------->	 
-  
-	 
-
-
-
-
-
-subroutine ipow46(a, exponent, result)
-!---------------------------------------------------------------------
-! compute a^exponent mod 2^46
-!---------------------------------------------------------------------
-
-	implicit none
-	double precision a, result, dummy, q, r
-	integer exponent, n, n2
-	external randlc
-	double precision randlc
-!---------------------------------------------------------------------
-!   Use
-!   a^n = a^(n/2)*a^(n/2) if n even else
-!   a^n = a*a^(n-1)       if n odd
-!---------------------------------------------------------------------
-	result = 1
-	if (exponent .eq. 0) return
-	q = a
-	r = 1
-	n = exponent
-
-	do while (n .gt. 1)
-		n2 = n/2
-		if (n2 * 2 .eq. n) then
-			dummy = randlc(q, q) 
-			n = n2
-		else
-			dummy = randlc(r, q)
-			n = n-1
-		endif
-	end do
-	dummy = randlc(r, q)
-	result = r
-	return
-end
-
-
-
-
-subroutine info(niter)
-	implicit none
-	include 'global.h'
-	
-	integer niter
-	
-	write(*, 1000)
-	niter = niter_default
-	write(*, 1001) nx, ny, nz
-	write(*, 1002) niter
-	write(*, *)
-
-1000 format(//,' NAS Parallel Benchmarks 3.3- DVMH version - FT Benchmark', /)
-1001 format(' Size                : ', i4, 'x', i4, 'x', i4)
-1002 format(' Iterations                  :', i7)
-
-  
-	return
-end
-
-subroutine print_timers()
-
-	implicit none	
-	include 'global.h'
-	
-	integer i
-	double precision t, t_m
-	character*25 tstrings(T_max)
-	data tstrings / 'total ', 'setup' , 'evolve+fft', 'checksum ', 'all' /
-
-	t_m = timer_read(T_total)
-	if (t_m .le. 0.0d0) t_m = 1.0d0
-	do i = 1, T_max
-		t = timer_read(i)
-		write(*, 100) i, tstrings(i), t, t*100.0/t_m
-	end do
-100 format(' timer ', i2, '(', A16,  ') :', F9.4, ' (',F6.2,'%)')
-	return
-end
-
-
-! fast fourier transform (positive direction)
-subroutine fft_p
-	implicit none
-	include 'global.h'
-		
-	
-!-------cffts1 variables------------------------------------------------------------------
-	double complex uu1,x11,x21	
-	integer logd1
-	integer i, j, k, jj, ic,jc ,kc,l,n1,n2,n3,li,lj,lk,ku,i11,i12,i21,i22
-!-------cffts2 variables------------------------------------------------------------------	
-	integer ii
-	integer logd2		
-!------cffts3 variables-------------------------------------------------------------------
-	integer logd3		
-!--------------------------------------------------------------------------
-!if0
-	logd1 = ilog2(nx)
-	logd2 = ilog2(ny)
-	logd3 = ilog2(nz)
-	
-	n1 = nx / 2
-	n2 = ny / 2
-	n3 = nz / 2
-
-
-
-	
-!dvm$ region 
-
-!dvm$ parallel (k,j) on u1(*,j,k), private (y1,y2,i,jj,kc,l,li,lj,lk,ku,i11,i12,i21,i22,uu1,x11,x21), cuda_block(32,1)
-
-
-! fftx
-	do k = 1, nz		
-		do j = 1, ny			
-!-------------------------------------------------------------------------------->	
-			
-			do i = 1, nx
-				y1(i) = u1(i,j,k)
-			enddo	
-			
-						
-			do l = 1, logd1, 2
-				
-				lk = 2 ** (l - 1)
-				li = 2 ** (logd1 - l)
-				lj = 2 * lk
-				ku = li + 1
-
-			
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n1
-					i21 = i * lj + 1
-					i22 = i21 + lk
-					
-					uu1 = u(ku+i)					
-
-					
-					do kc = 0, lk - 1
-						
-							x11 = y1(i11+kc)
-							x21 = y1(i12+kc)							
-
-							y2(i21+kc) = x11 + x21
-							y2(i22+kc) = uu1 * (x11 - x21)
-						
-					enddo
-					
-				enddo
-		
-				if (l .eq. logd1) then
-				  
-					do jj = 1, nx
-						y1(jj) = y2(jj)						
-					enddo
-					
-				else
-				
-					lk = 2 ** (l)
-					li = 2 ** (logd1 - l-1)
-					lj = 2 * lk
-					ku = li + 1
-					
-					
-					do i = 0, li - 1
-						i11 = i * lk + 1
-						i12 = i11 + n1
-						i21 = i * lj + 1
-						i22 = i21 + lk
-						
-						uu1 = u(ku+i)
-
-						
-						do kc = 0, lk - 1		
-
-							x11 = y2(i11+kc)
-							x21 = y2(i12+kc)
-
-							y1(i21+kc) = x11 + x21
-							y1(i22+kc) = uu1 * (x11 - x21)							
-						enddo
-						
-					enddo
-					
-				endif
-	
-			enddo	
-			
-			
-			do i = 1, nx
-				u1(i,j,k) = y1(i)
-			enddo
-!--------------------------------------------------------------------------->
-			
-			
-		enddo			
-	enddo
-
-	
-! ffty
-
-!dvm$ parallel (k,ii) on u1(ii,*,k), private (y1,y2,i,j,kc,l,li,lj,lk,ku,i11,i12,i21,i22,uu1,x11,x21), cuda_block(32,1)
-	do k = 1, nz
-		do ii = 1, nx 
-!------------------------------------------------------------------------------->		
-			
-			do j = 1, ny				
-				y1(j) = u1(ii,j,k)				
-			enddo
-
-			
-			do l = 1, logd2, 2				
-				lk = 2 ** (l - 1)
-				li = 2 ** (logd2 - l)
-				lj = 2 * lk
-				ku = li + 1
-				
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n2
-					i21 = i * lj + 1
-					i22 = i21 + lk
-				
-					uu1 = u(ku+i)	
-
-					
-					
-					do kc = 0, lk - 1
-						x11 = y1(i11+kc)
-						x21 = y1(i12+kc)						
-
-						y2(i21+kc) = x11 + x21
-						y2(i22+kc) = uu1 * (x11 - x21)
-						
-					enddo
-			enddo
-		
-			if (l .eq. logd2) then
-				
-				do j = 1, ny					
-					y1(j) = y2(j)					
-				enddo
-
-			else	
-				
-				lk = 2 ** (l)
-				li = 2 ** (logd2 - l-1)
-				lj = 2 * lk
-				ku = li + 1		
-				
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n2
-					i21 = i * lj + 1
-					i22 = i21 + lk
-					
-					uu1 = u(ku+i)			
-				
-					
-					do kc = 0, lk - 1
-						x11 = y2(i11+kc)
-						x21 = y2(i12+kc)
-
-						y1(i21+kc) = x11 + x21
-						y1(i22+kc) = uu1 * (x11 - x21)						
-					enddo
-
-					
-				enddo
-				
-
-			endif
-	
-		enddo   
-		
-		
-		do j = 1, ny				
-			u1(ii,j,k) = y1(j)				
-		enddo
-	
-!------------------------------------------------------------------------------->			
-		enddo	
-	enddo
-
-	
-	
-! fftz
-
-!dvm$ parallel (j,ii) on u1(ii,j,*),  private (y1,y2,i,k,kc,l,li,lj,lk,ku,i11,i12,i21,i22,uu1,x11,x21),  cuda_block(32,1)
-
-	do j = 1, ny
-		do ii = 1, nx
-!---------------------------------------------------------------------------------->		
-
-			
-			do k = 1, nz
-				y1(k) = u1(ii,j,k)				
-			enddo
-
-			
-			
-			do l = 1, logd3, 2
-			
-				lk = 2 ** (l - 1)
-				li = 2 ** (logd3 - l)
-				lj = 2 * lk
-				ku = li + 1
-				
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n3
-					i21 = i * lj + 1
-					i22 = i21 + lk
-			
-					uu1 = u(ku+i)
-
-					
-					do kc = 0, lk - 1
-						x11 = y1(i11+kc)
-						x21 = y1(i12+kc)
-					
-						y2(i21+kc) = x11 + x21
-						y2(i22+kc) = uu1 * (x11 - x21)
-					
-					enddo
-				enddo
-		
-		
-				if (l .eq. logd3) then
-					
-					do k = 1, nz
-						y1(k) = y2(k)					
-					enddo
-				else
-	
-				
-					lk = 2 ** (l)
-					li = 2 ** (logd3 - l-1)
-					lj = 2 * lk
-					ku = li + 1
-					
-					
-					do i = 0, li - 1
-						i11 = i * lk + 1
-						i12 = i11 + n3
-						i21 = i * lj + 1
-						i22 = i21 + lk
-				
-						uu1 = u(ku+i)	
-						
-						
-						do kc = 0, lk - 1
-							x11 = y2(i11+kc)
-							x21 = y2(i12+kc)
-						
-							y1(i21+kc) = x11 + x21
-							y1(i22+kc) = uu1 * (x11 - x21)
-						
-						enddo
-					enddo
-				endif
-	
-			enddo
-			
-			
-			do k = 1, nz
-				u0(ii,j,k) = y1(k)				
-			enddo
-			
-!---------------------------------------------------------------------------------->				
-		enddo
-	enddo
-	
-!dvm$  end region 
-! dvm$ get_actual(u0) 
-
-
-	return
-end
-
-
-!----------------------------------------------------------------->
-
-
-
-! evolde and fast fourier transform (negative direction)
-subroutine evolve_and_fft_n
-	implicit none
-	include 'global.h'		
-	
-!------cfft s1 variables--------------------------------------------------------------
-	double complex uu1,x11,x21	
-	integer logd1
-	integer i, j, k, jj, ic,jc ,kc,l,n1,n2,n3,li,lj,lk,ku,i11,i12,i21,i22
-    integer CB_x, CB_y
-!-------------------------------------------------------------------------------------		
-	
-!------cfft2 variables------------------------------------------------------------------------------	
-	integer ii
-	integer  logd2	   
-!-------------cfft3 variables-----------------	
-	integer  logd3
-!-cfft3---------------------------------	
-	n1 = nz / 2
-	n2 = ny / 2
-	n3 = nx / 2
-	
-	logd1 = ilog2(nx)	
-	logd2 = ilog2(ny)
-	logd3 = ilog2(nz)
-    CB_x = 256
-    CB_y = 1
-!dvm$  region
-
-	!evolve	
-!dvm$ parallel (k,j,i) on u0(i,j,k),cuda_block(256)
-	do k = 1, nz
-		do j = 1, ny
-			do i = 1, nx
-				u0(i,j,k) = u0(i,j,k) * twiddle(i,j,k)
-				u1(i,j,k) = u0(i,j,k)
-			end do			
-		end do	
-	end do
-
-! fftz
-	
-
-!dvm$ parallel (j,ii) on u1(ii,j,*), private (y1,y2,i,k,kc,l,li,lj,lk,ku,i11,i12,i21,i22,uu1,x11,x21), cuda_block(CB_x, CB_y)
-
-	do j = 1, ny
-		do ii = 1, nx
-		
-!------------------------------------------------------------------->	
-		
-			do k = 1, nz
-				y1(k) = u1(ii,j,k)				
-			enddo
-	
-			
-			do l = 1, logd3, 2
-
-			
-				lk = 2 ** (l - 1)
-				li = 2 ** (logd3 - l)
-				lj = 2 * lk
-				ku = li + 1
-
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n1
-					i21 = i * lj + 1
-					i22 = i21 + lk
-				
-					uu1 = dconjg (u(ku+i))
-
-					
-				
-					do kc = 0, lk - 1
-						x11 = y1(i11+kc)
-						x21 = y1(i12+kc)
-
-						y2(i21+kc) = x11 + x21
-						y2(i22+kc) = uu1 * (x11 - x21)					
-					enddo
-				enddo
-	
-		
-				if (l .eq. logd3) then
-					do k = 1, nz					
-						y1(k) = y2(k)					
-					enddo
-				else
-				
-					lk = 2 ** (l)
-					li = 2 ** (logd3 - l-1)
-					lj = 2 * lk
-					ku = li + 1
-
-					
-					do i = 0, li - 1
-						i11 = i * lk + 1
-						i12 = i11 + n1
-						i21 = i * lj + 1
-						i22 = i21 + lk
-					
-						uu1 = dconjg (u(ku+i))
-						
-						
-						do k = 0, lk - 1
-							x11 = y2(i11+k)
-							x21 = y2(i12+k)
-						
-							y1(i21+k) = x11 + x21
-							y1(i22+k) = uu1 * (x11 - x21)
-						
-						enddo
-					enddo
-				endif
-	
-			enddo
-		
-			do k = 1, nz
-				u1(ii,j,k) = y1(k)				
-			enddo
-			
-!------------------------------------------------------------------->	
-			
-		enddo
-	enddo
-
-! ffty
-
-!dvm$ parallel (k,ii) on u1(ii,*,k), private (y1,y2,i,j,kc,l,li,lj,lk,ku,i11,i12,i21,i22,uu1,x11,x21), cuda_block(CB_x, CB_y)
-
-	do k = 1, nz
-		do ii = 1, nx
-!------------------------------------------------------------------------->		
-
-			
-			do j = 1, ny
-				y1(j) = u1(ii,j,k)				
-			enddo
-
-			
-			do l = 1, logd2, 2
-				
-				lk = 2 ** (l - 1)
-				li = 2 ** (logd2 - l)
-				lj = 2 * lk
-				ku = li + 1
-				
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n2
-					i21 = i * lj + 1
-					i22 = i21 + lk		
-					
-					uu1 = dconjg (u(ku+i))	
-
-					
-				
-					do kc = 0, lk - 1
-						x11 = y1(i11+kc)
-						x21 = y1(i12+kc)						
-
-						y2(i21+kc) = x11 + x21
-						y2(i22+kc) = uu1 * (x11 - x21)						
-					enddo
-			enddo
-	
-		
-			if (l .eq. logd2) then	
-				
-			
-				do j = 1, ny					
-						y1(j) = y2(j)					
-				enddo
-
-			else		
-				
-				lk = 2 ** (l)
-				li = 2 ** (logd2 - l-1)
-				lj = 2 * lk
-				ku = li + 1
-				
-
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n2
-					i21 = i * lj + 1
-					i22 = i21 + lk
-					
-					uu1 = dconjg (u(ku+i))	
-						
-					
-					
-					do kc = 0, lk - 1
-						x11 = y2(i11+kc)
-						x21 = y2(i12+kc)
-							
-						y1(i21+kc) = x11 + x21
-						y1(i22+kc) = uu1 * (x11 - x21)						
-					enddo
-
-					
-				enddo
-				
-
-			endif
-	
-		enddo
-
-		
-			do j = 1, ny
-				u1(ii,j,k) = y1(j)				
-			enddo
-	
-!------------------------------------------------------------------->			
-		enddo	
-	enddo
-
-
-
-! fftx
-
-
-
-!dvm$ parallel (k,j) on u1(*,j,k),private (y1,y2,i,jj,kc,l,li,lj,lk,ku,i11,i12,i21,i22,uu1,x11,x21),  cuda_block(CB_x, CB_y)
-
-	  
-	do k = 1, nz	
-		do j = 1, ny 
-!----------------------------------------------------->		
-		
-		
-			do i = 1, nx
-				y1(i) = u1(i,j,k)				
-			enddo
-		
-				
-			do l = 1, logd1, 2
-
-				
-				lk = 2 ** (l - 1)
-				li = 2 ** (logd1 - l)
-				lj = 2 * lk
-				ku = li + 1
-				
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n3
-					i21 = i * lj + 1
-					i22 = i21 + lk
-					uu1 = dconjg (u(ku+i))
-					
-					
-				
-					do kc = 0, lk - 1	
-						x11 = y1(i11+kc)
-						x21 = y1(i12+kc)
-							
-						y2(i21+kc) = x11 + x21
-						y2(i22+kc) = uu1 * (x11 - x21)						
-					enddo
-					
-				enddo
-	
-				if (l .eq. logd1) then
-				
-				
-					do jj = 1, nx
-						y1(jj) = y2(jj)						
-					enddo
-				else		
-					
-					lk = 2 ** (l)
-					li = 2 ** (logd1 - l-1)
-					lj = 2 * lk
-					ku = li + 1
-
-				
-					do i = 0, li - 1
-						i11 = i * lk + 1
-						i12 = i11 + n3
-						i21 = i * lj + 1
-						i22 = i21 + lk
-						
-						uu1 = dconjg (u(ku+i))
-						
-					
-						do kc = 0, lk - 1							
-
-								x11 = y2(i11+kc)
-								x21 = y2(i12+kc)
-								
-								y1(i21+kc) = x11 + x21
-								y1(i22+kc) = uu1 * (x11 - x21)
-							
-						enddo
-					enddo
-					
-				endif
-	
-			enddo			
-
-			
-			do i = 1, nx
-				u1(i,j,k) = y1(i)
-			enddo
-				
-!-------------------------------------------------------------->			
-		enddo			
-	enddo
-
-!dvm$  end region 
-! dvm$ get_actual(u1)
-
-	return
-end
-
-
-! evolde and fast fourier transform (negative direction)
-subroutine evolve_and_fft_n_1
-	implicit none
-	include 'global.h'		
-	
-!------cfft s1 variables--------------------------------------------------------------
-	double complex uu1,x11,x21
-    double precision ap	
-	integer logd1
-	integer i, j, k, jj, ic,jc ,kc,l,n1,n2,n3,li,lj,lk,ku,i11,i12,i21,i22, kk, kk2, kj2
-    integer CB_x, CB_y
-!-------------------------------------------------------------------------------------		
-	
-!------cfft2 variables------------------------------------------------------------------------------	
-	integer ii
-	integer  logd2	   
-!-------------cfft3 variables-----------------	
-	integer  logd3
-!-cfft3---------------------------------	
-	n1 = nz / 2
-	n2 = ny / 2
-	n3 = nx / 2
-	
-	logd1 = ilog2(nx)	
-	logd2 = ilog2(ny)
-	logd3 = ilog2(nz)
-    CB_x = 256
-    CB_y = 1
-	ap = - 4.d0 * alpha * pi *pi
-!dvm$  region
-
-	!evolve	
-!dvm$ parallel (k,j,i) on u0(i,j,k),private(kk, jj, ii, kk2, kj2), cuda_block(256)
-	do k = 1, nz
-		do j = 1, ny
-			do i = 1, nx
-			
-				kk =  mod(k-1+nz/2, nz) - nz/2
-				kk2 = kk*kk		
-			
-				jj = mod(j-1+ny/2, ny) - ny/2
-				kj2 = jj*jj+kk2
-			
-				ii = mod(i-1+nx/2, nx) - nx/2
-				
-				u0(i,j,k) = u0(i,j,k) * dexp(ap*dble(ii*ii+kj2))
-				u1(i,j,k) = u0(i,j,k)
-			end do			
-		end do	
-	end do
-
-! fftz
-	
-
-!dvm$ parallel (j,ii) on u1(ii,j,*), private (y1,y2,i,k,kc,l,li,lj,lk,ku,i11,i12,i21,i22,uu1,x11,x21), cuda_block(CB_x, CB_y)
-
-	do j = 1, ny
-		do ii = 1, nx
-		
-!------------------------------------------------------------------->	
-		
-			do k = 1, nz
-				y1(k) = u1(ii,j,k)				
-			enddo
-	
-			
-			do l = 1, logd3, 2
-
-			
-				lk = 2 ** (l - 1)
-				li = 2 ** (logd3 - l)
-				lj = 2 * lk
-				ku = li + 1
-
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n1
-					i21 = i * lj + 1
-					i22 = i21 + lk
-				
-					uu1 = dconjg (u(ku+i))
-
-					
-				
-					do kc = 0, lk - 1
-						x11 = y1(i11+kc)
-						x21 = y1(i12+kc)
-
-						y2(i21+kc) = x11 + x21
-						y2(i22+kc) = uu1 * (x11 - x21)					
-					enddo
-				enddo
-	
-		
-				if (l .eq. logd3) then
-				
-					
-					do k = 1, nz					
-						y1(k) = y2(k)					
-					enddo
-				else
-				
-					lk = 2 ** (l)
-					li = 2 ** (logd3 - l-1)
-					lj = 2 * lk
-					ku = li + 1
-
-					
-					do i = 0, li - 1
-						i11 = i * lk + 1
-						i12 = i11 + n1
-						i21 = i * lj + 1
-						i22 = i21 + lk
-					
-						uu1 = dconjg (u(ku+i))
-						
-						
-						do k = 0, lk - 1
-							x11 = y2(i11+k)
-							x21 = y2(i12+k)
-						
-							y1(i21+k) = x11 + x21
-							y1(i22+k) = uu1 * (x11 - x21)
-						
-						enddo
-					enddo
-				endif
-	
-			enddo
-		
-			do k = 1, nz
-				u1(ii,j,k) = y1(k)				
-			enddo
-			
-!------------------------------------------------------------------->	
-			
-		enddo
-	enddo
-
-! ffty
-
-!dvm$ parallel (k,ii) on u1(ii,*,k), private (y1,y2,i,j,kc,l,li,lj,lk,ku,i11,i12,i21,i22,uu1,x11,x21), cuda_block(CB_x, CB_y)
-
-	do k = 1, nz
-		do ii = 1, nx
-!------------------------------------------------------------------------->		
-
-			
-			do j = 1, ny
-				y1(j) = u1(ii,j,k)				
-			enddo
-
-			
-			do l = 1, logd2, 2
-				
-				lk = 2 ** (l - 1)
-				li = 2 ** (logd2 - l)
-				lj = 2 * lk
-				ku = li + 1
-				
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n2
-					i21 = i * lj + 1
-					i22 = i21 + lk		
-					
-					uu1 = dconjg (u(ku+i))	
-
-					
-				
-					do kc = 0, lk - 1
-						x11 = y1(i11+kc)
-						x21 = y1(i12+kc)						
-
-						y2(i21+kc) = x11 + x21
-						y2(i22+kc) = uu1 * (x11 - x21)						
-					enddo
-			enddo
-	
-		
-			if (l .eq. logd2) then	
-				
-			
-				do j = 1, ny					
-						y1(j) = y2(j)					
-				enddo
-
-			else		
-				
-				lk = 2 ** (l)
-				li = 2 ** (logd2 - l-1)
-				lj = 2 * lk
-				ku = li + 1
-				
-
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n2
-					i21 = i * lj + 1
-					i22 = i21 + lk
-					
-					uu1 = dconjg (u(ku+i))	
-						
-					
-					
-					do kc = 0, lk - 1
-						x11 = y2(i11+kc)
-						x21 = y2(i12+kc)
-							
-						y1(i21+kc) = x11 + x21
-						y1(i22+kc) = uu1 * (x11 - x21)						
-					enddo
-
-					
-				enddo
-				
-
-			endif
-	
-		enddo
-
-		
-			do j = 1, ny
-				u1(ii,j,k) = y1(j)				
-			enddo
-	
-!------------------------------------------------------------------->			
-		enddo	
-	enddo
-
-
-
-! fftx
-
-
-
-!dvm$ parallel (k,j) on u1(*,j,k),private (y1,y2,i,jj,kc,l,li,lj,lk,ku,i11,i12,i21,i22,uu1,x11,x21),  cuda_block(CB_x, CB_y)
-
-	  
-	do k = 1, nz	
-		do j = 1, ny 
-!----------------------------------------------------->		
-		
-		
-			do i = 1, nx
-				y1(i) = u1(i,j,k)				
-			enddo
-		
-				
-			do l = 1, logd1, 2
-
-				
-				lk = 2 ** (l - 1)
-				li = 2 ** (logd1 - l)
-				lj = 2 * lk
-				ku = li + 1
-				
-				
-				do i = 0, li - 1
-					i11 = i * lk + 1
-					i12 = i11 + n3
-					i21 = i * lj + 1
-					i22 = i21 + lk
-					uu1 = dconjg (u(ku+i))
-					
-					
-				
-					do kc = 0, lk - 1	
-						x11 = y1(i11+kc)
-						x21 = y1(i12+kc)
-							
-						y2(i21+kc) = x11 + x21
-						y2(i22+kc) = uu1 * (x11 - x21)						
-					enddo
-					
-				enddo
-	
-				if (l .eq. logd1) then
-				
-				
-					do jj = 1, nx
-						y1(jj) = y2(jj)						
-					enddo
-				else		
-					
-					lk = 2 ** (l)
-					li = 2 ** (logd1 - l-1)
-					lj = 2 * lk
-					ku = li + 1
-
-				
-					do i = 0, li - 1
-						i11 = i * lk + 1
-						i12 = i11 + n3
-						i21 = i * lj + 1
-						i22 = i21 + lk
-						
-						uu1 = dconjg (u(ku+i))
-						
-					
-						do kc = 0, lk - 1							
-
-								x11 = y2(i11+kc)
-								x21 = y2(i12+kc)
-								
-								y1(i21+kc) = x11 + x21
-								y1(i22+kc) = uu1 * (x11 - x21)
-							
-						enddo
-					enddo
-					
-				endif
-	
-			enddo			
-
-			
-			do i = 1, nx
-				u1(i,j,k) = y1(i)
-			enddo
-				
-!-------------------------------------------------------------->			
-		enddo			
-	enddo
-
-!dvm$  end region 
-! dvm$ get_actual(u1)
-
-	return
-end
-
-integer function ilog2(n)
-	implicit none
-	integer n, nn, lg
-	if (n .eq. 1) then
-		ilog2=0
-		return
-	endif
-	
-	lg = 1
-	nn = 2
-	do while (nn .lt. n)
-		nn = nn*2
-		lg = lg+1
-	end do
-	ilog2 = lg
-	return
-end
-
-subroutine checksum(i,sums)
-	implicit none
-	include 'global.h'
-	
-	
-
-	double complex sums(niter_default)
-	
-	integer i,j, q,r,s
-	double complex chk
-	chk = (0.0,0.0)
-
-	
-
-
-!dvm$  region
-
-!dvm$ parallel (s) ON u1(s,*,*), reduction (sum(chk)),private(q,j,r)
-
-
-	do s = 1, nz
-	
-	
-		do j=1,1024 
-			if ( s .eq. mod(5*j,nz)+1 ) then
-				q = mod(j, nx)+1
-				r = mod(3*j,ny)+1
-				
-		
-				chk=chk+u1(q,r,s)
-			endif
-		end do
-	enddo
-
-
-!dvm$  end region 
-
-
-
-	chk = chk/dble(ntotal)
-      
-	write (*, 30) i, chk
-30	format (' T =',I5,5X,'Checksum =',1P2D22.12)
-	sums(i) = chk
-	return
-end
-
-
-subroutine verify (nt, verified, class,sums)
-	implicit none
-	include 'global.h'
-	integer  nt
-	character class
-	logical verified
-	integer i
-	double precision err, epsilon
-	
-	double complex sums(niter_default)
-!---------------------------------------------------------------------
-!   Reference checksums
-!---------------------------------------------------------------------
-	double complex csum_ref(25)
-	class = 'U'
-	epsilon = 1.0d-12
-	verified = .FALSE.
-
-	if (nx .eq. 64 .and. ny .eq. 64 .and. nz .eq. 64 .and. nt .eq. 6) then
-!---------------------------------------------------------------------
-!   Sample size reference checksums
-!---------------------------------------------------------------------
-		class = 'S'
-		csum_ref(1) = dcmplx(5.546087004964D+02, 4.845363331978D+02)
-		csum_ref(2) = dcmplx(5.546385409189D+02, 4.865304269511D+02)
-		csum_ref(3) = dcmplx(5.546148406171D+02, 4.883910722336D+02)
-		csum_ref(4) = dcmplx(5.545423607415D+02, 4.901273169046D+02)
-		csum_ref(5) = dcmplx(5.544255039624D+02, 4.917475857993D+02)
-		csum_ref(6) = dcmplx(5.542683411902D+02, 4.932597244941D+02)
-	else if (nx .eq. 128 .and. ny .eq. 128 .and. nz .eq. 32 .and. nt .eq. 6) then
-!---------------------------------------------------------------------
-!   Class W size reference checksums
-!---------------------------------------------------------------------
-		class = 'W'
-		csum_ref(1) = dcmplx(5.673612178944D+02, 5.293246849175D+02)
-		csum_ref(2) = dcmplx(5.631436885271D+02, 5.282149986629D+02)
-		csum_ref(3) = dcmplx(5.594024089970D+02, 5.270996558037D+02)
-		csum_ref(4) = dcmplx(5.560698047020D+02, 5.260027904925D+02)
-		csum_ref(5) = dcmplx(5.530898991250D+02, 5.249400845633D+02)
-        csum_ref(6) = dcmplx(5.504159734538D+02, 5.239212247086D+02)
-	else if (nx .eq. 256 .and. ny .eq. 256 .and. nz .eq. 128 .and. nt .eq. 6) then
-!---------------------------------------------------------------------
-!   Class A size reference checksums
-!---------------------------------------------------------------------
-		class = 'A'
-		csum_ref(1) = dcmplx(5.046735008193D+02, 5.114047905510D+02)
-		csum_ref(2) = dcmplx(5.059412319734D+02, 5.098809666433D+02)
-		csum_ref(3) = dcmplx(5.069376896287D+02, 5.098144042213D+02)
-		csum_ref(4) = dcmplx(5.077892868474D+02, 5.101336130759D+02)
-		csum_ref(5) = dcmplx(5.085233095391D+02, 5.104914655194D+02)
-		csum_ref(6) = dcmplx(5.091487099959D+02, 5.107917842803D+02)
-      
-	else if (nx .eq. 512 .and. ny .eq. 256 .and. nz .eq. 256 .and. nt .eq. 20) then
-!---------------------------------------------------------------------
-!   Class B size reference checksums
-!---------------------------------------------------------------------
-		class = 'B'
-		csum_ref(1)  = dcmplx(5.177643571579D+02, 5.077803458597D+02)
-		csum_ref(2)  = dcmplx(5.154521291263D+02, 5.088249431599D+02)
-		csum_ref(3)  = dcmplx(5.146409228649D+02, 5.096208912659D+02)
-		csum_ref(4)  = dcmplx(5.142378756213D+02, 5.101023387619D+02)
-		csum_ref(5)  = dcmplx(5.139626667737D+02, 5.103976610617D+02)
-		csum_ref(6)  = dcmplx(5.137423460082D+02, 5.105948019802D+02)
-		csum_ref(7)  = dcmplx(5.135547056878D+02, 5.107404165783D+02)
-		csum_ref(8)  = dcmplx(5.133910925466D+02, 5.108576573661D+02)
-		csum_ref(9)  = dcmplx(5.132470705390D+02, 5.109577278523D+02)
-		csum_ref(10) = dcmplx(5.131197729984D+02, 5.110460304483D+02)
-		csum_ref(11) = dcmplx(5.130070319283D+02, 5.111252433800D+02)
-		csum_ref(12) = dcmplx(5.129070537032D+02, 5.111968077718D+02)
-		csum_ref(13) = dcmplx(5.128182883502D+02, 5.112616233064D+02)
-		csum_ref(14) = dcmplx(5.127393733383D+02, 5.113203605551D+02)
-		csum_ref(15) = dcmplx(5.126691062020D+02, 5.113735928093D+02)
-		csum_ref(16) = dcmplx(5.126064276004D+02, 5.114218460548D+02)
-		csum_ref(17) = dcmplx(5.125504076570D+02, 5.114656139760D+02)
-		csum_ref(18) = dcmplx(5.125002331720D+02, 5.115053595966D+02)
-		csum_ref(19) = dcmplx(5.124551951846D+02, 5.115415130407D+02)
-		csum_ref(20) = dcmplx(5.124146770029D+02, 5.115744692211D+02)
-
-	else if (nx .eq. 512 .and. ny .eq. 512 .and. nz .eq. 512 .and. nt .eq. 20) then
-!---------------------------------------------------------------------
-!   Class C size reference checksums
-!---------------------------------------------------------------------
-		class = 'C'
-		csum_ref(1)  = dcmplx(5.195078707457D+02, 5.149019699238D+02)
-		csum_ref(2)  = dcmplx(5.155422171134D+02, 5.127578201997D+02)
-		csum_ref(3)  = dcmplx(5.144678022222D+02, 5.122251847514D+02)
-		csum_ref(4)  = dcmplx(5.140150594328D+02, 5.121090289018D+02)
-		csum_ref(5)  = dcmplx(5.137550426810D+02, 5.121143685824D+02)
-		csum_ref(6)  = dcmplx(5.135811056728D+02, 5.121496764568D+02)
-		csum_ref(7)  = dcmplx(5.134569343165D+02, 5.121870921893D+02)
-		csum_ref(8)  = dcmplx(5.133651975661D+02, 5.122193250322D+02)
-		csum_ref(9)  = dcmplx(5.132955192805D+02, 5.122454735794D+02)
-		csum_ref(10) = dcmplx(5.132410471738D+02, 5.122663649603D+02)
-		csum_ref(11) = dcmplx(5.131971141679D+02, 5.122830879827D+02)
-		csum_ref(12) = dcmplx(5.131605205716D+02, 5.122965869718D+02)
-		csum_ref(13) = dcmplx(5.131290734194D+02, 5.123075927445D+02)
-		csum_ref(14) = dcmplx(5.131012720314D+02, 5.123166486553D+02)
-		csum_ref(15) = dcmplx(5.130760908195D+02, 5.123241541685D+02)
-		csum_ref(16) = dcmplx(5.130528295923D+02, 5.123304037599D+02)
-		csum_ref(17) = dcmplx(5.130310107773D+02, 5.123356167976D+02)
-		csum_ref(18) = dcmplx(5.130103090133D+02, 5.123399592211D+02)
-		csum_ref(19) = dcmplx(5.129905029333D+02, 5.123435588985D+02)
-		csum_ref(20) = dcmplx(5.129714421109D+02, 5.123465164008D+02)
-
-	else if (nx .eq. 2048 .and. ny .eq. 1024 .and. nz .eq. 1024 .and.  nt .eq. 25) then
-!---------------------------------------------------------------------
-!   Class D size reference checksums
-!---------------------------------------------------------------------
-		class = 'D'
-		csum_ref(1)  = dcmplx(5.122230065252D+02, 5.118534037109D+02)
-		csum_ref(2)  = dcmplx(5.120463975765D+02, 5.117061181082D+02)		
-		csum_ref(3)  = dcmplx(5.119865766760D+02, 5.117096364601D+02)		
-		csum_ref(4)  = dcmplx(5.119518799488D+02, 5.117373863950D+02)
-		csum_ref(5)  = dcmplx(5.119269088223D+02, 5.117680347632D+02)
-		csum_ref(6)  = dcmplx(5.119082416858D+02, 5.117967875532D+02)
-		csum_ref(7)  = dcmplx(5.118943814638D+02, 5.118225281841D+02)
-		csum_ref(8)  = dcmplx(5.118842385057D+02, 5.118451629348D+02)
-		csum_ref(9)  = dcmplx(5.118769435632D+02, 5.118649119387D+02)
-		csum_ref(10) = dcmplx(5.118718203448D+02, 5.118820803844D+02)
-		csum_ref(11) = dcmplx(5.118683569061D+02, 5.118969781011D+02)
-		csum_ref(12) = dcmplx(5.118661708593D+02, 5.119098918835D+02)
-		csum_ref(13) = dcmplx(5.118649768950D+02, 5.119210777066D+02)
-		csum_ref(14) = dcmplx(5.118645605626D+02, 5.119307604484D+02)
-		csum_ref(15) = dcmplx(5.118647586618D+02, 5.119391362671D+02)
-		csum_ref(16) = dcmplx(5.118654451572D+02, 5.119463757241D+02)
-		csum_ref(17) = dcmplx(5.118665212451D+02, 5.119526269238D+02)
-		csum_ref(18) = dcmplx(5.118679083821D+02, 5.119580184108D+02)
-		csum_ref(19) = dcmplx(5.118695433664D+02, 5.119626617538D+02)
-		csum_ref(20) = dcmplx(5.118713748264D+02, 5.119666538138D+02)
-		csum_ref(21) = dcmplx(5.118733606701D+02, 5.119700787219D+02)
-		csum_ref(22) = dcmplx(5.118754661974D+02, 5.119730095953D+02)
-		csum_ref(23) = dcmplx(5.118776626738D+02, 5.119755100241D+02)
-		csum_ref(24) = dcmplx(5.118799262314D+02, 5.119776353561D+02)
-		csum_ref(25) = dcmplx(5.118822370068D+02, 5.119794338060D+02)
-	else if (nx .eq. 4096 .and. ny .eq. 2048 .and. nz .eq. 2048 .and. nt .eq. 25) then
-!---------------------------------------------------------------------
-!   Class E size reference checksums
-!---------------------------------------------------------------------
-		class = 'E'
-		csum_ref(1)  = dcmplx(5.121601045346D+02, 5.117395998266D+02)
-		csum_ref(2)  = dcmplx(5.120905403678D+02, 5.118614716182D+02)
-		csum_ref(3)  = dcmplx(5.120623229306D+02, 5.119074203747D+02)
-		csum_ref(4)  = dcmplx(5.120438418997D+02, 5.119345900733D+02)
-		csum_ref(5)  = dcmplx(5.120311521872D+02, 5.119551325550D+02)
-		csum_ref(6)  = dcmplx(5.120226088809D+02, 5.119720179919D+02)
-		csum_ref(7)  = dcmplx(5.120169296534D+02, 5.119861371665D+02)
-		csum_ref(8)  = dcmplx(5.120131225172D+02, 5.119979364402D+02)	
-		csum_ref(9)  = dcmplx(5.120104767108D+02, 5.120077674092D+02)
-		csum_ref(10) = dcmplx(5.120085127969D+02, 5.120159443121D+02)
-		csum_ref(11) = dcmplx(5.120069224127D+02, 5.120227453670D+02)
-		csum_ref(12) = dcmplx(5.120055158164D+02, 5.120284096041D+02)
-		csum_ref(13) = dcmplx(5.120041820159D+02, 5.120331373793D+02)
-		csum_ref(14) = dcmplx(5.120028605402D+02, 5.120370938679D+02)
-		csum_ref(15) = dcmplx(5.120015223011D+02, 5.120404138831D+02)
-		csum_ref(16) = dcmplx(5.120001570022D+02, 5.120432068837D+02)
-		csum_ref(17) = dcmplx(5.119987650555D+02, 5.120455615860D+02)
-		csum_ref(18) = dcmplx(5.119973525091D+02, 5.120475499442D+02)
-		csum_ref(19) = dcmplx(5.119959279472D+02, 5.120492304629D+02)
-		csum_ref(20) = dcmplx(5.119945006558D+02, 5.120506508902D+02)
-		csum_ref(21) = dcmplx(5.119930795911D+02, 5.120518503782D+02)
-		csum_ref(22) = dcmplx(5.119916728462D+02, 5.120528612016D+02)
-		csum_ref(23) = dcmplx(5.119902874185D+02, 5.120537101195D+02)
-		csum_ref(24) = dcmplx(5.119889291565D+02, 5.120544194514D+02)
-		csum_ref(25) = dcmplx(5.119876028049D+02, 5.120550079284D+02)
-	endif
-
-	if (class .ne. 'U') then
-		do i = 1, nt
-			err = abs( (sums(i) - csum_ref(i)) / csum_ref(i) )
-			if (.not.(err .le. epsilon) .or. isnan(err)) goto 100
-		end do
-		verified = .TRUE.
-100		continue
-
-	endif
-
-         
-	if (class .ne. 'U') then
-		if (verified) then
-			write(*,2000)
-2000		format(' Result verification successful')
-		else
-			write(*,2001)
-2001		format(' Result verification failed')
-		endif
-	endif
-	print *, 'class = ', class
-
-	return
-end
-
-
-subroutine print_results(name, class, n1, n2, n3, niter, t, mops, optype, verified, npbversion, compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-      
-      implicit none
-      character name*(*)
-      character class*1
-      integer   n1, n2, n3, niter, j
-      double precision t, mops
-      character optype*24, size*15
-      logical   verified
-      character*(*) npbversion, compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7
-      integer   num_threads, max_threads, i
-
-      max_threads = 1
-      num_threads = 1
-
-         write (*, 2) name
- 2       format(//, ' ', A, ' Benchmark Completed.')
-
-         write (*, 3) Class
- 3       format(' Class           = ', 12x, a12)
-
-!   If this is not a grid-based problem (EP, FT, CG), then
-!   we only print n1, which contains some measure of the
-!   problem size. In that case, n2 and n3 are both zero.
-!   Otherwise, we print the grid size n1xn2xn3
-
-         if ((n2 .eq. 0) .and. (n3 .eq. 0)) then
-            if (name(1:2) .eq. 'EP') then
-               write(size, '(f15.0)' ) 2.d0**n1
-               j = 15
-               if (size(j:j) .eq. '.') j = j - 1
-               write (*,42) size(1:j)
- 42            format(' Size            = ',9x, a15)
-            else
-               write (*,44) n1
- 44            format(' Size            = ',12x, i12)
-            endif
-         else
-            write (*, 4) n1,n2,n3
- 4          format(' Size            =  ',9x, i4,'x',i4,'x',i4)
-         endif
-
-         write (*, 5) niter
- 5       format(' Iterations      = ', 12x, i12)
-         
-         write (*, 6) t
- 6       format(' Time in seconds = ',12x, f12.2)
-
-
-
-         write (*,9) mops
- 9       format(' Mop/s total     = ',12x, f12.2)
-
-
-         write(*, 11) optype
- 11      format(' Operation type  = ', a24)
-
-         if (verified) then 
-            write(*,12) '  SUCCESSFUL'
-         else
-            write(*,12) 'UNSUCCESSFUL'
-         endif
- 12      format(' Verification    = ', 12x, a)
-
-         write(*,13) npbversion
- 13      format(' Version         = ', 12x, a12)
-
-         write(*,14) compiletime
- 14      format(' Compile date    = ', 12x, a12)
-
-
-         write (*,121) cs1
- 121     format(/, ' Compile options:', /,  '    F77          = ', A)
-
-         write (*,122) cs2
- 122     format('    FLINK        = ', A)
-
-         write (*,123) cs3
- 123     format('    F_LIB        = ', A)
-
-         write (*,124) cs4
- 124     format('    F_INC        = ', A)
-
-         write (*,125) cs5
- 125     format('    FFLAGS       = ', A)
-
-         write (*,126) cs6
- 126     format('    FLINKFLAGS   = ', A)
-
-         write(*, 127) cs7
- 127     format('    RAND         = ', A)
-        
-         write (*,130)
- 130     format(//' Please send all errors/feedbacks to:'// ' NPB Development Team'/  ' npb@nas.nasa.gov'//)
-
-
-
-         return
-         end
-
-		 
-		 
- double precision function randlc(x, a)
-
-
-    implicit none
-    double precision x, a
-    integer*8 i246m1, Lx, La
-    double precision d2m46
-
-    parameter(d2m46=0.5d0**46)
-
-    save i246m1
-    data i246m1/Z'00003FFFFFFFFFFF'/
-
-    Lx = X
-    La = A
-
-    Lx   = iand(Lx*La,i246m1)
-    randlc = d2m46*dble(Lx)
-    x    = dble(Lx)
-    return
-end
-
-
-subroutine vranlc (N, X, A, Y)
-
-    implicit none
-    integer n, i
-    double precision x, a, y(*)
-    integer*8 i246m1, Lx, La
-    double precision d2m46
-
-
-    parameter(d2m46=0.5d0**46)
-    save i246m1
-    data i246m1/Z'00003FFFFFFFFFFF'/
-
-      Lx = X
-      La = A
-      do i = 1, N
-         Lx   = iand(Lx*La,i246m1)
-         y(i) = d2m46*dble(Lx)
-      end do
-      x    = dble(Lx)
-
-      return
-      end
-
-
-		 
-		 
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/global.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/global.h
deleted file mode 100644
index f94133f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/global.h
+++ /dev/null
@@ -1,80 +0,0 @@
-include 'npbparams.h'
-	
-
-! If processor array is 1x1 -> 0D grid decomposition
-
-
-! Cache blocking params. These values are good for most
-! RISC processors.  
-! FFT parameters:
-!  fftblock controls how many ffts are done at a time. 
-!  The default is appropriate for most cache-based machines
-!  On vector machines, the FFT can be vectorized with vector
-!  length equal to the block size, so the block size should
-!  be as large as possible. This is the size of the smallest
-!  dimension of the problem: 128 for class A, 256 for class B and
-!  512 for class C.
-     
-
-! we need a bunch of logic to keep track of how
-! arrays are laid out. 
-
-
-! Note: this serial version is the derived from the parallel 0D case
-! of the ft NPB.
-! The computation proceeds logically as
-
-! set up initial conditions
-! fftx(1)
-! transpose (1->2)
-! ffty(2)
-! transpose (2->3)
-! fftz(3)
-! time evolution
-! fftz(3)
-! transpose (3->2)
-! ffty(2)
-! transpose (2->1)
-! fftx(1)
-! compute residual(1)
-
-! for the 0D, 1D, 2D strategies, the layouts look like xxx
-!        
-!            0D        1D        2D
-! 1:        xyz       xyz       xyz
-
-
-
-integer T_total, T_setup, T_fft, T_evolve, T_checksum, T_fftx, T_ffty, T_fftz, T_max
-parameter (T_total = 1, T_setup = 2, T_fft = 3, T_evolve = 4, T_checksum = 5, T_max = 5)
-
-logical timers_enabled
-parameter (timers_enabled = .FALSE.)
-logical more_memory
-parameter (more_memory = .FALSE.)
-
-external timer_read
-double precision timer_read
-external ilog2
-integer ilog2
-
-external randlc
-double precision randlc
-
-
-
-double precision seed, a, pi, alpha
-parameter (seed = 314159265.d0, a = 1220703125.d0, pi = 3.141592653589793238d0, alpha=1.0d-6)
-
-double complex   u0(nxp,ny,nz), u1(nxp,ny,nz)   
-double precision twiddle(nxp,ny,nz)
-double complex u(nxp)
-double complex y1(maxdim),y2(maxdim)
-common /arrays/ u,u0,u1,twiddle,y1,y2
-
-!dvm$ distribute (*,*,*) :: twiddle
-!dvm$ distribute (*,*,*) :: u0
-!dvm$ distribute (*,*,*) :: u1
-!dvm$ distribute (*) :: u
-
-	  
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/make.bat
deleted file mode 100644
index 2bb2118..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/FT/make.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-set CLASS=%1
-set OPT=%2
-
-CALL ..\sys\setparams FT %CLASS%
-CALL %F77% %OPT% ft 1>out_%CLASS%.txt 2>err_%CLASS%.txt
-if exist ft.exe ( 
-  copy ft.exe %BIN%\ft.%CLASS%.x.exe 
-  del ft.exe 
-)
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile
deleted file mode 100644
index 2ebe13d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=lu
-BENCHMARKU=LU
-
-include ../config/make.def
-include ../sys/make.common
-
-OBJS = lu.o read_input.o \
-       domain.o setcoeff.o setbv.o exact.o setiv.o \
-       erhs.o ssor.o rhs.o l2norm.o error.o \
-       pintgr.o verify.o print_results.o timers.o
-
-
-
-${PROGRAM}: config
-	${MAKE} exec
-
-exec: $(OBJS)
-	${FLINK} flink -shared-dvm  ${FLINKFLAGS} -o ${PROGRAM} ${OBJS} ${F_LIB}
-
-.f.o :
-	${F77} f ${FFLAGS} -c -o $@ $<
-
-lu.o:	lu.f applu.incl npbparams.h
-erhs.o:	erhs.f applu.incl npbparams.h
-error.o:	error.f applu.incl npbparams.h
-exact.o:	exact.f applu.incl npbparams.h
-l2norm.o:	l2norm.f
-pintgr.o:	pintgr.f applu.incl npbparams.h
-read_input.o:	read_input.f applu.incl npbparams.h
-rhs.o:	rhs.f applu.incl npbparams.h
-setbv.o:	setbv.f applu.incl npbparams.h
-setiv.o:	setiv.f applu.incl npbparams.h
-setcoeff.o:	setcoeff.f applu.incl npbparams.h
-ssor.o:	ssor.f applu.incl npbparams.h
-domain.o:	domain.f applu.incl npbparams.h
-verify.o:	verify.f applu.incl npbparams.h
-print_results.o:	print_results.f
-timers.o:	timers.f 
-
-clean:
-	- /bin/rm -f npbparams.h
-	- /bin/rm -f *.o *DVMH* *~
-	- /bin/rm -f *.cu *.cuf 
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/applu.incl b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/applu.incl
deleted file mode 100644
index d07a663..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/applu.incl
+++ /dev/null
@@ -1,185 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-c---  applu.incl   
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c   npbparams.h defines parameters that depend on the class and 
-c   number of nodes
-c---------------------------------------------------------------------
-
-      include 'npbparams.h'
-
-c---------------------------------------------------------------------
-c   parameters which can be overridden in runtime config file
-c   isiz1,isiz2,isiz3 give the maximum size
-c   ipr = 1 to print out verbose information
-c   omega = 2.0 is correct for all classes
-c   tolrsd is tolerance levels for steady state residuals
-c---------------------------------------------------------------------
-      integer ipr_default,iS,jS,kS
-      parameter (ipr_default = 1)
-      double precision omega_default
-      parameter (omega_default = 1.2d0)
-      double precision tolrsd1_def, tolrsd2_def, tolrsd3_def, 
-     >                 tolrsd4_def, tolrsd5_def
-      parameter (tolrsd1_def=1.0e-08, 
-     >          tolrsd2_def=1.0e-08, tolrsd3_def=1.0e-08, 
-     >          tolrsd4_def=1.0e-08, tolrsd5_def=1.0e-08)
-
-      double precision c1, c2, c3, c4, c5
-      parameter( c1 = 1.40d+00, c2 = 0.40d+00,
-     >           c3 = 1.00d-01, c4 = 1.00d+00,
-     >           c5 = 1.40d+00,
-     >  iS =isiz1/2*2+1,jS=	isiz2/2*2+1, kS=isiz3 )
-
-c---------------------------------------------------------------------
-c   grid
-c---------------------------------------------------------------------
-      integer nx, ny, nz
-      integer nx0, ny0, nz0
-      integer ist, iend
-      integer jst, jend
-      integer ii1, ii2
-      integer ji1, ji2
-      integer ki1, ki2
-      double precision  dxi, deta, dzeta
-      double precision  tx1, tx2, tx3
-      double precision  ty1, ty2, ty3
-      double precision  tz1, tz2, tz3
-
-      common/cgcon/ dxi, deta, dzeta,
-     >              tx1, tx2, tx3,
-     >              ty1, ty2, ty3,
-     >              tz1, tz2, tz3,
-     >              nx, ny, nz, 
-     >              nx0, ny0, nz0,
-     >              ist, iend,
-     >              jst, jend,
-     >              ii1, ii2, 
-     >              ji1, ji2, 
-     >              ki1, ki2
-
-c---------------------------------------------------------------------
-c   dissipation
-c---------------------------------------------------------------------
-      double precision dx1, dx2, dx3, dx4, dx5
-      double precision dy1, dy2, dy3, dy4, dy5
-      double precision dz1, dz2, dz3, dz4, dz5
-      double precision dssp
-
-      common/disp/ dx1,dx2,dx3,dx4,dx5,
-     >             dy1,dy2,dy3,dy4,dy5,
-     >             dz1,dz2,dz3,dz4,dz5,
-     >             dssp
-
-c---------------------------------------------------------------------
-c   field variables and residuals
-c   to improve cache performance, second two dimensions padded by 1 
-c   for even number sizes only.
-c   note: corresponding array (called "v") in routines blts, buts, 
-c   and l2norm are similarly padded
-c---------------------------------------------------------------------
-!DVM$ ALIGN frct(iEX1,iEX2,iEX3,iEX4) WITH dvmh_temp0(iEX1,iEX2,iEX3,iE
-!DVM$&X4)
-!DVM$ ALIGN qs(iEX1,iEX2,iEX3) WITH dvmh_temp0(*,iEX1,iEX2,iEX3)
-!DVM$ ALIGN rho_i(iEX1,iEX2,iEX3) WITH dvmh_temp0(*,iEX1,iEX2,iEX3)
-!DVM$ ALIGN rsd(iEX1,iEX2,iEX3,iEX4) WITH dvmh_temp0(iEX1,iEX2,iEX3,iEX
-!DVM$&4)
-!DVM$ ALIGN u(iEX1,iEX2,iEX3,iEX4) WITH dvmh_temp0(iEX1,iEX2,iEX3,iEX4)
-!DVM$ DYNAMIC u,rsd,frct,qs,rho_i
-!DVM$ SHADOW qs(1:1,1:1,1:1)
-!DVM$ SHADOW rho_i(1:1,1:1,1:1)
-!DVM$ SHADOW rsd(0:0,2:2,2:2,2:2)
-!DVM$ SHADOW frct(0:0,2:2,2:2,2:2)
-!DVM$ SHADOW u(0:0,2:2,2:2,2:2)
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0(1:6,0:iS+1,0:jS+1,0:kS+1)
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0_r1(1:6,0:iS+1,0:jS+1,0:kS+1)
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0_r2(1:6,0:iS+1,0:jS+1,0:kS+1)
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0_r3(1:6,0:iS+1,0:jS+1,0:kS+1)
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0_r0(1:6,0:iS+1,0:jS+1,0:kS+1)
-!DVM$ DISTRIBUTE dvmh_temp0(*,BLOCK,BLOCK,BLOCK)
-!DVM$ DISTRIBUTE dvmh_temp0_r1(*,BLOCK,BLOCK,*)
-!DVM$ DISTRIBUTE dvmh_temp0_r2(*,BLOCK,*,BLOCK)
-!DVM$ DISTRIBUTE dvmh_temp0_r3(*,*,BLOCK,BLOCK)
-!DVM$ DISTRIBUTE dvmh_temp0_r0(*,*,*,BLOCK)
-
-!DVM$ DYNAMIC dvmh_temp0, dvmh_temp0_r1, dvmh_temp0_r2, dvmh_temp0_r3, 
-!DVM$&dvmh_temp0_r0
-      double precision u(5,isiz1/2*2+1,
-     >                     isiz2/2*2+1,
-     >                     isiz3),
-     >                 rsd(5,isiz1/2*2+1,
-     >                       isiz2/2*2+1,
-     >                       isiz3),
-     >                 frct(5,isiz1/2*2+1,
-     >                        isiz2/2*2+1,
-     >                        isiz3),
-     >                 flux(5,isiz1),
-     >                 qs(isiz1,isiz2,isiz3),
-     >                 rho_i(isiz1/2*2+1,isiz2/2*2+1,isiz3)
-
-      common/cvar/ u, rsd, frct, flux,
-     >             qs, rho_i
-
-
-c---------------------------------------------------------------------
-c   output control parameters
-c---------------------------------------------------------------------
-      integer ipr, inorm
-
-      common/cprcon/ ipr, inorm
-
-c---------------------------------------------------------------------
-c   newton-raphson iteration control parameters
-c---------------------------------------------------------------------
-      integer itmax, invert
-      double precision  dt, omega, tolrsd(5),
-     >        rsdnm(5), errnm(5), frc, ttotal
-
-      common/ctscon/ dt, omega, tolrsd,
-     >               rsdnm, errnm, frc, ttotal,
-     >               itmax, invert
-
-      double precision a(5,5,isiz1/2*2+1,isiz2),
-     >                 b(5,5,isiz1/2*2+1,isiz2),
-     >                 c(5,5,isiz1/2*2+1,isiz2),
-     >                 d(5,5,isiz1/2*2+1,isiz2)
-
-      common/cjac/ a, b, c, d
-
-c---------------------------------------------------------------------
-c   coefficients of the exact solution
-c---------------------------------------------------------------------
-       double precision ce(5,13)
-
-      common/cexact/ ce
-
-c---------------------------------------------------------------------
-c   timers
-c---------------------------------------------------------------------
-      integer t_rhsx,t_rhsy,t_rhsz,t_rhs,t_jacld,t_blts,
-     >        t_jacu,t_buts,t_add,t_l2norm,t_last,t_total
-      parameter (t_total = 1)
-      parameter (t_rhsx = 2)
-      parameter (t_rhsy = 3)
-      parameter (t_rhsz = 4)
-      parameter (t_rhs = 5)
-      parameter (t_jacld = 6)
-      parameter (t_blts = 7)
-      parameter (t_jacu = 8)
-      parameter (t_buts = 9)
-      parameter (t_add = 10)
-      parameter (t_l2norm = 11)
-      parameter (t_last = 11)
-      logical timeron
-      double precision maxtime
-
-      common/timer/maxtime,timeron
-
-
-c---------------------------------------------------------------------
-c   end of include file
-c---------------------------------------------------------------------
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/domain.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/domain.f
deleted file mode 100644
index 7e38f64..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/domain.f
+++ /dev/null
@@ -1,79 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine domain ()
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  local variables
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      nx = nx0
-      ny = ny0
-      nz = nz0
-
-!---------------------------------------------------------------------
-!   check the sub-domain size
-!---------------------------------------------------------------------
-      if (nx .lt. 4 .or. ny .lt. 4 .or. nz .lt. 4) then
-         write (unit = *,fmt = 2001) nx,ny,nz
-2001           format (5x,'SUBDOMAIN SIZE IS TOO SMALL - ',        /5x,'
-     &ADJUST PROBLEM SIZE OR NUMBER OF PROCESSORS',        /5x,'SO THAT 
-     &NX, NY AND NZ ARE GREATER THAN OR EQUAL',        /5x,'TO 4 THEY AR
-     &E CURRENTLY', 3I3)
-         stop
-      endif  
-      if (nx .gt. isiz1 .or. ny .gt. isiz2 .or. nz .gt. isiz3) then
-         write (unit = *,fmt = 2002) nx,ny,nz
-2002           format (5x,'SUBDOMAIN SIZE IS TOO LARGE - ',        /5x,'
-     &ADJUST PROBLEM SIZE OR NUMBER OF PROCESSORS',        /5x,'SO THAT 
-     &NX, NY AND NZ ARE LESS THAN OR EQUAL TO ',        /5x,'ISIZ1, ISIZ
-     &2 AND ISIZ3 RESPECTIVELY.  THEY ARE',        /5x,'CURRENTLY', 3I4)
-         stop
-      endif  
-
-!---------------------------------------------------------------------
-!   set up the start and end in i and j extents for all processors
-!---------------------------------------------------------------------
-      ist = 2
-      iend = nx - 1
-      jst = 2
-      jend = ny - 1
-      ii1 = 2
-      ii2 = nx0 - 1
-      ji1 = 2
-      ji2 = ny0 - 2
-      ki1 = 3
-      ki2 = nz0 - 1
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/erhs.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/erhs.f
deleted file mode 100644
index d69a102..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/erhs.f
+++ /dev/null
@@ -1,369 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine erhs ()
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     
-!   compute the right hand side based on exact solution
-!     
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  local variables
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      integer  i,j,k,m
-      double precision  xi,eta,zeta
-      double precision  q
-      double precision  u21,u31,u41
-      double precision  tmp
-      double precision  u21i,u31i,u41i,u51i
-      double precision  u21j,u31j,u41j,u51j
-      double precision  u21k,u31k,u41k,u51k
-      double precision  u21im1,u31im1,u41im1,u51im1
-      double precision  u21jm1,u31jm1,u41jm1,u51jm1
-      double precision  u21km1,u31km1,u41km1,u51km1
-!DVM$ PARALLEL (k,j,i,m) ON frct(m,i,j,k), PRIVATE (m,i,j,k)
-      do  k = 1,nz
-         do  j = 1,ny
-            do  i = 1,nx
-               do  m = 1,5
-                  frct(m,i,j,k) = 0.0d+00
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,j,i) ON rsd(*,i,j,k), PRIVATE (m,i,j,k,xi,zeta,eta)
-      do  k = 1,nz
-         do  j = 1,ny
-            do  i = 1,nx
-               zeta = dble (k - 1) / (nz - 1)
-               eta = dble (j - 1) / (ny0 - 1)
-               xi = dble (i - 1) / (nx0 - 1)
-               do  m = 1,5
-                  rsd(m,i,j,k) = ce(m,1) + (ce(m,2) + (ce(m,5) + (ce(m,8
-     &) + ce(m,11) * xi) * xi) * xi) * xi + (ce(m,3) + (ce(m,6) + (ce(m,
-     &9) + ce(m,12) * eta) * eta) * eta) * eta + (ce(m,4) + (ce(m,7) + (
-     &ce(m,10) + ce(m,13) * zeta) * zeta) * zeta) * zeta
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!   xi-direction flux differences
-!---------------------------------------------------------------------
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r3(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: rsd
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r3(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: frct
-!DVM$ PARALLEL (k,j) ON frct(*,*,j,k), PRIVATE (m,i,j,q,tmp,k,flux,u31i,
-!DVM$&u41i,u51i,u21i,u21,u31im1,u41im1,u21im1,u51im1)
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  i = 1,nx
-               flux(1,i) = rsd(2,i,j,k)
-               u21 = rsd(2,i,j,k) / rsd(1,i,j,k)
-               q = 0.50d+00 * (rsd(2,i,j,k) * rsd(2,i,j,k) + rsd(3,i,j,k
-     &) * rsd(3,i,j,k) + rsd(4,i,j,k) * rsd(4,i,j,k)) / rsd(1,i,j,k)
-               flux(2,i) = rsd(2,i,j,k) * u21 + c2 * (rsd(5,i,j,k) - q)
-               flux(3,i) = rsd(3,i,j,k) * u21
-               flux(4,i) = rsd(4,i,j,k) * u21
-               flux(5,i) = (c1 * rsd(5,i,j,k) - c2 * q) * u21
-            enddo  
-            do  i = ist,iend
-               do  m = 1,5
-                  frct(m,i,j,k) = frct(m,i,j,k) - tx2 * (flux(m,i + 1) -
-     & flux(m,i - 1))
-               enddo  
-            enddo  
-            do  i = ist,nx
-               tmp = 1.0d+00 / rsd(1,i,j,k)
-               u21i = tmp * rsd(2,i,j,k)
-               u31i = tmp * rsd(3,i,j,k)
-               u41i = tmp * rsd(4,i,j,k)
-               u51i = tmp * rsd(5,i,j,k)
-               tmp = 1.0d+00 / rsd(1,i - 1,j,k)
-               u21im1 = tmp * rsd(2,i - 1,j,k)
-               u31im1 = tmp * rsd(3,i - 1,j,k)
-               u41im1 = tmp * rsd(4,i - 1,j,k)
-               u51im1 = tmp * rsd(5,i - 1,j,k)
-               flux(2,i) = 4.0d+00 / 3.0d+00 * tx3 * (u21i - u21im1)
-               flux(3,i) = tx3 * (u31i - u31im1)
-               flux(4,i) = tx3 * (u41i - u41im1)
-               flux(5,i) = 0.50d+00 * (1.0d+00 - c1 * c5) * tx3 * (u21i*
-     &* 2 + u31i** 2 + u41i** 2 - (u21im1** 2 + u31im1** 2 + u41im1** 2)
-     &) + 1.0d+00 / 6.0d+00 * tx3 * (u21i** 2 - u21im1** 2) + c1 * c5 * 
-     &tx3 * (u51i - u51im1)
-            enddo  
-            do  i = ist,iend
-               frct(1,i,j,k) = frct(1,i,j,k) + dx1 * tx1 * (rsd(1,i - 1,
-     &j,k) - 2.0d+00 * rsd(1,i,j,k) + rsd(1,i + 1,j,k))
-               frct(2,i,j,k) = frct(2,i,j,k) + tx3 * c3 * c4 * (flux(2,i
-     & + 1) - flux(2,i)) + dx2 * tx1 * (rsd(2,i - 1,j,k) - 2.0d+00 * rsd
-     &(2,i,j,k) + rsd(2,i + 1,j,k))
-               frct(3,i,j,k) = frct(3,i,j,k) + tx3 * c3 * c4 * (flux(3,i
-     & + 1) - flux(3,i)) + dx3 * tx1 * (rsd(3,i - 1,j,k) - 2.0d+00 * rsd
-     &(3,i,j,k) + rsd(3,i + 1,j,k))
-               frct(4,i,j,k) = frct(4,i,j,k) + tx3 * c3 * c4 * (flux(4,i
-     & + 1) - flux(4,i)) + dx4 * tx1 * (rsd(4,i - 1,j,k) - 2.0d+00 * rsd
-     &(4,i,j,k) + rsd(4,i + 1,j,k))
-               frct(5,i,j,k) = frct(5,i,j,k) + tx3 * c3 * c4 * (flux(5,i
-     & + 1) - flux(5,i)) + dx5 * tx1 * (rsd(5,i - 1,j,k) - 2.0d+00 * rsd
-     &(5,i,j,k) + rsd(5,i + 1,j,k))
-            enddo  
-
-!---------------------------------------------------------------------
-!   Fourth-order dissipation
-!---------------------------------------------------------------------
-            do  m = 1,5
-               frct(m,2,j,k) = frct(m,2,j,k) - dssp * ((+(5.0d+00)) * rs
-     &d(m,2,j,k) - 4.0d+00 * rsd(m,3,j,k) + rsd(m,4,j,k))
-               frct(m,3,j,k) = frct(m,3,j,k) - dssp * ((-(4.0d+00)) * rs
-     &d(m,2,j,k) + 6.0d+00 * rsd(m,3,j,k) - 4.0d+00 * rsd(m,4,j,k) + rsd
-     &(m,5,j,k))
-            enddo  
-            do  i = 4,nx - 3
-               do  m = 1,5
-                  frct(m,i,j,k) = frct(m,i,j,k) - dssp * (rsd(m,i - 2,j,
-     &k) - 4.0d+00 * rsd(m,i - 1,j,k) + 6.0d+00 * rsd(m,i,j,k) - 4.0d+00
-     & * rsd(m,i + 1,j,k) + rsd(m,i + 2,j,k))
-               enddo  
-            enddo  
-            do  m = 1,5
-               frct(m,nx - 2,j,k) = frct(m,nx - 2,j,k) - dssp * (rsd(m,n
-     &x - 4,j,k) - 4.0d+00 * rsd(m,nx - 3,j,k) + 6.0d+00 * rsd(m,nx - 2,
-     &j,k) - 4.0d+00 * rsd(m,nx - 1,j,k))
-               frct(m,nx - 1,j,k) = frct(m,nx - 1,j,k) - dssp * (rsd(m,n
-     &x - 3,j,k) - 4.0d+00 * rsd(m,nx - 2,j,k) + 5.0d+00 * rsd(m,nx - 1,
-     &j,k))
-            enddo  
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!   eta-direction flux differences
-!---------------------------------------------------------------------
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: rsd
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: frct
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r2(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: rsd
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r2(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: frct
-!DVM$ PARALLEL (k,i) ON frct(*,i,*,k), PRIVATE (m,i,u31,j,q,tmp,u31j,u41
-!DVM$&j,u41jm1,u51jm1,u21j,u31jm1,k,u21jm1,u51j,flux)
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  j = 1,ny
-               flux(1,j) = rsd(3,i,j,k)
-               u31 = rsd(3,i,j,k) / rsd(1,i,j,k)
-               q = 0.50d+00 * (rsd(2,i,j,k) * rsd(2,i,j,k) + rsd(3,i,j,k
-     &) * rsd(3,i,j,k) + rsd(4,i,j,k) * rsd(4,i,j,k)) / rsd(1,i,j,k)
-               flux(2,j) = rsd(2,i,j,k) * u31
-               flux(3,j) = rsd(3,i,j,k) * u31 + c2 * (rsd(5,i,j,k) - q)
-               flux(4,j) = rsd(4,i,j,k) * u31
-               flux(5,j) = (c1 * rsd(5,i,j,k) - c2 * q) * u31
-            enddo  
-            do  j = jst,jend
-               do  m = 1,5
-                  frct(m,i,j,k) = frct(m,i,j,k) - ty2 * (flux(m,j + 1) -
-     & flux(m,j - 1))
-               enddo  
-            enddo  
-            do  j = jst,ny
-               tmp = 1.0d+00 / rsd(1,i,j,k)
-               u21j = tmp * rsd(2,i,j,k)
-               u31j = tmp * rsd(3,i,j,k)
-               u41j = tmp * rsd(4,i,j,k)
-               u51j = tmp * rsd(5,i,j,k)
-               tmp = 1.0d+00 / rsd(1,i,j - 1,k)
-               u21jm1 = tmp * rsd(2,i,j - 1,k)
-               u31jm1 = tmp * rsd(3,i,j - 1,k)
-               u41jm1 = tmp * rsd(4,i,j - 1,k)
-               u51jm1 = tmp * rsd(5,i,j - 1,k)
-               flux(2,j) = ty3 * (u21j - u21jm1)
-               flux(3,j) = 4.0d+00 / 3.0d+00 * ty3 * (u31j - u31jm1)
-               flux(4,j) = ty3 * (u41j - u41jm1)
-               flux(5,j) = 0.50d+00 * (1.0d+00 - c1 * c5) * ty3 * (u21j*
-     &* 2 + u31j** 2 + u41j** 2 - (u21jm1** 2 + u31jm1** 2 + u41jm1** 2)
-     &) + 1.0d+00 / 6.0d+00 * ty3 * (u31j** 2 - u31jm1** 2) + c1 * c5 * 
-     &ty3 * (u51j - u51jm1)
-            enddo  
-            do  j = jst,jend
-               frct(1,i,j,k) = frct(1,i,j,k) + dy1 * ty1 * (rsd(1,i,j - 
-     &1,k) - 2.0d+00 * rsd(1,i,j,k) + rsd(1,i,j + 1,k))
-               frct(2,i,j,k) = frct(2,i,j,k) + ty3 * c3 * c4 * (flux(2,j
-     & + 1) - flux(2,j)) + dy2 * ty1 * (rsd(2,i,j - 1,k) - 2.0d+00 * rsd
-     &(2,i,j,k) + rsd(2,i,j + 1,k))
-               frct(3,i,j,k) = frct(3,i,j,k) + ty3 * c3 * c4 * (flux(3,j
-     & + 1) - flux(3,j)) + dy3 * ty1 * (rsd(3,i,j - 1,k) - 2.0d+00 * rsd
-     &(3,i,j,k) + rsd(3,i,j + 1,k))
-               frct(4,i,j,k) = frct(4,i,j,k) + ty3 * c3 * c4 * (flux(4,j
-     & + 1) - flux(4,j)) + dy4 * ty1 * (rsd(4,i,j - 1,k) - 2.0d+00 * rsd
-     &(4,i,j,k) + rsd(4,i,j + 1,k))
-               frct(5,i,j,k) = frct(5,i,j,k) + ty3 * c3 * c4 * (flux(5,j
-     & + 1) - flux(5,j)) + dy5 * ty1 * (rsd(5,i,j - 1,k) - 2.0d+00 * rsd
-     &(5,i,j,k) + rsd(5,i,j + 1,k))
-            enddo  
-
-!---------------------------------------------------------------------
-!   fourth-order dissipation
-!---------------------------------------------------------------------
-            do  m = 1,5
-               frct(m,i,2,k) = frct(m,i,2,k) - dssp * ((+(5.0d+00)) * rs
-     &d(m,i,2,k) - 4.0d+00 * rsd(m,i,3,k) + rsd(m,i,4,k))
-               frct(m,i,3,k) = frct(m,i,3,k) - dssp * ((-(4.0d+00)) * rs
-     &d(m,i,2,k) + 6.0d+00 * rsd(m,i,3,k) - 4.0d+00 * rsd(m,i,4,k) + rsd
-     &(m,i,5,k))
-            enddo  
-            do  j = 4,ny - 3
-               do  m = 1,5
-                  frct(m,i,j,k) = frct(m,i,j,k) - dssp * (rsd(m,i,j - 2,
-     &k) - 4.0d+00 * rsd(m,i,j - 1,k) + 6.0d+00 * rsd(m,i,j,k) - 4.0d+00
-     & * rsd(m,i,j + 1,k) + rsd(m,i,j + 2,k))
-               enddo  
-            enddo  
-            do  m = 1,5
-               frct(m,i,ny - 2,k) = frct(m,i,ny - 2,k) - dssp * (rsd(m,i
-     &,ny - 4,k) - 4.0d+00 * rsd(m,i,ny - 3,k) + 6.0d+00 * rsd(m,i,ny - 
-     &2,k) - 4.0d+00 * rsd(m,i,ny - 1,k))
-               frct(m,i,ny - 1,k) = frct(m,i,ny - 1,k) - dssp * (rsd(m,i
-     &,ny - 3,k) - 4.0d+00 * rsd(m,i,ny - 2,k) + 5.0d+00 * rsd(m,i,ny - 
-     &1,k))
-            enddo  
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!   zeta-direction flux differences
-!---------------------------------------------------------------------
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: rsd
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: frct
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r1(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: rsd
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r1(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: frct
-!DVM$ PARALLEL (j,i) ON frct(*,i,j,*), PRIVATE (m,i,j,q,tmp,u41,k,u51k,u
-!DVM$&31km1,u21k,u21km1,u41k,u31k,u51km1,u41km1,flux)
-      do  j = jst,jend
-         do  i = ist,iend
-            do  k = 1,nz
-               flux(1,k) = rsd(4,i,j,k)
-               u41 = rsd(4,i,j,k) / rsd(1,i,j,k)
-               q = 0.50d+00 * (rsd(2,i,j,k) * rsd(2,i,j,k) + rsd(3,i,j,k
-     &) * rsd(3,i,j,k) + rsd(4,i,j,k) * rsd(4,i,j,k)) / rsd(1,i,j,k)
-               flux(2,k) = rsd(2,i,j,k) * u41
-               flux(3,k) = rsd(3,i,j,k) * u41
-               flux(4,k) = rsd(4,i,j,k) * u41 + c2 * (rsd(5,i,j,k) - q)
-               flux(5,k) = (c1 * rsd(5,i,j,k) - c2 * q) * u41
-            enddo  
-            do  k = 2,nz - 1
-               do  m = 1,5
-                  frct(m,i,j,k) = frct(m,i,j,k) - tz2 * (flux(m,k + 1) -
-     & flux(m,k - 1))
-               enddo  
-            enddo  
-            do  k = 2,nz
-               tmp = 1.0d+00 / rsd(1,i,j,k)
-               u21k = tmp * rsd(2,i,j,k)
-               u31k = tmp * rsd(3,i,j,k)
-               u41k = tmp * rsd(4,i,j,k)
-               u51k = tmp * rsd(5,i,j,k)
-               tmp = 1.0d+00 / rsd(1,i,j,k - 1)
-               u21km1 = tmp * rsd(2,i,j,k - 1)
-               u31km1 = tmp * rsd(3,i,j,k - 1)
-               u41km1 = tmp * rsd(4,i,j,k - 1)
-               u51km1 = tmp * rsd(5,i,j,k - 1)
-               flux(2,k) = tz3 * (u21k - u21km1)
-               flux(3,k) = tz3 * (u31k - u31km1)
-               flux(4,k) = 4.0d+00 / 3.0d+00 * tz3 * (u41k - u41km1)
-               flux(5,k) = 0.50d+00 * (1.0d+00 - c1 * c5) * tz3 * (u21k*
-     &* 2 + u31k** 2 + u41k** 2 - (u21km1** 2 + u31km1** 2 + u41km1** 2)
-     &) + 1.0d+00 / 6.0d+00 * tz3 * (u41k** 2 - u41km1** 2) + c1 * c5 * 
-     &tz3 * (u51k - u51km1)
-            enddo  
-            do  k = 2,nz - 1
-               frct(1,i,j,k) = frct(1,i,j,k) + dz1 * tz1 * (rsd(1,i,j,k 
-     &+ 1) - 2.0d+00 * rsd(1,i,j,k) + rsd(1,i,j,k - 1))
-               frct(2,i,j,k) = frct(2,i,j,k) + tz3 * c3 * c4 * (flux(2,k
-     & + 1) - flux(2,k)) + dz2 * tz1 * (rsd(2,i,j,k + 1) - 2.0d+00 * rsd
-     &(2,i,j,k) + rsd(2,i,j,k - 1))
-               frct(3,i,j,k) = frct(3,i,j,k) + tz3 * c3 * c4 * (flux(3,k
-     & + 1) - flux(3,k)) + dz3 * tz1 * (rsd(3,i,j,k + 1) - 2.0d+00 * rsd
-     &(3,i,j,k) + rsd(3,i,j,k - 1))
-               frct(4,i,j,k) = frct(4,i,j,k) + tz3 * c3 * c4 * (flux(4,k
-     & + 1) - flux(4,k)) + dz4 * tz1 * (rsd(4,i,j,k + 1) - 2.0d+00 * rsd
-     &(4,i,j,k) + rsd(4,i,j,k - 1))
-               frct(5,i,j,k) = frct(5,i,j,k) + tz3 * c3 * c4 * (flux(5,k
-     & + 1) - flux(5,k)) + dz5 * tz1 * (rsd(5,i,j,k + 1) - 2.0d+00 * rsd
-     &(5,i,j,k) + rsd(5,i,j,k - 1))
-            enddo  
-
-!---------------------------------------------------------------------
-!   fourth-order dissipation
-!---------------------------------------------------------------------
-            do  m = 1,5
-               frct(m,i,j,2) = frct(m,i,j,2) - dssp * ((+(5.0d+00)) * rs
-     &d(m,i,j,2) - 4.0d+00 * rsd(m,i,j,3) + rsd(m,i,j,4))
-               frct(m,i,j,3) = frct(m,i,j,3) - dssp * ((-(4.0d+00)) * rs
-     &d(m,i,j,2) + 6.0d+00 * rsd(m,i,j,3) - 4.0d+00 * rsd(m,i,j,4) + rsd
-     &(m,i,j,5))
-            enddo  
-            do  k = 4,nz - 3
-               do  m = 1,5
-                  frct(m,i,j,k) = frct(m,i,j,k) - dssp * (rsd(m,i,j,k - 
-     &2) - 4.0d+00 * rsd(m,i,j,k - 1) + 6.0d+00 * rsd(m,i,j,k) - 4.0d+00
-     & * rsd(m,i,j,k + 1) + rsd(m,i,j,k + 2))
-               enddo  
-            enddo  
-            do  m = 1,5
-               frct(m,i,j,nz - 2) = frct(m,i,j,nz - 2) - dssp * (rsd(m,i
-     &,j,nz - 4) - 4.0d+00 * rsd(m,i,j,nz - 3) + 6.0d+00 * rsd(m,i,j,nz 
-     &- 2) - 4.0d+00 * rsd(m,i,j,nz - 1))
-               frct(m,i,j,nz - 1) = frct(m,i,j,nz - 1) - dssp * (rsd(m,i
-     &,j,nz - 3) - 4.0d+00 * rsd(m,i,j,nz - 2) + 5.0d+00 * rsd(m,i,j,nz 
-     &- 1))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: rsd
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: frct
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/error.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/error.f
deleted file mode 100644
index 98a427a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/error.f
+++ /dev/null
@@ -1,77 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine error ()
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     
-!   compute the solution error
-!     
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  local variables
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      integer  i,j,k,m
-      double precision  tmp
-      double precision  u000ijk(5)
-      do  m = 1,5
-         errnm(m) = 0.0d+00
-      enddo  
-!DVM$ PARALLEL (k,j,i) ON u(*,i,j,k), PRIVATE (tmp,m,k,u000ijk,i,j),REDU
-!DVM$&CTION (sum (errnm))
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  i = ist,iend
-               call exact(i,j,k,u000ijk)
-               do  m = 1,5
-                  tmp = u000ijk(m) - u(m,i,j,k)
-                  errnm(m) = errnm(m) + tmp** 2
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-      do  m = 1,5
-         errnm(m) = sqrt (errnm(m) / ((nx0 - 2) * (ny0 - 2) * (nz0 - 2))
-     &)
-      enddo  
-
-!        write (*,1002) ( errnm(m), m = 1, 5 )
-1002  format (1x/1x,'RMS-norm of error in soln. to ', 'first pde  = ',1p
-     &e12.5/, 1x,'RMS-norm of error in soln. to ', 'second pde = ',1pe12
-     &.5/, 1x,'RMS-norm of error in soln. to ', 'third pde  = ',1pe12.5/
-     &, 1x,'RMS-norm of error in soln. to ', 'fourth pde = ',1pe12.5/, 1
-     &x,'RMS-norm of error in soln. to ', 'fifth pde  = ',1pe12.5)
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/exact.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/exact.f
deleted file mode 100644
index 6270604..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/exact.f
+++ /dev/null
@@ -1,64 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine exact (i, j, k, u000ijk)
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     
-!   compute the exact solution at (i,j,k)
-!     
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  input parameters
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      integer  i,j,k
-      double precision  u000ijk(*)
-
-!---------------------------------------------------------------------
-!  local variables
-!---------------------------------------------------------------------
-      integer  m
-      double precision  xi,eta,zeta
-      xi = dble (i - 1) / (nx0 - 1)
-      eta = dble (j - 1) / (ny0 - 1)
-      zeta = dble (k - 1) / (nz - 1)
-      do  m = 1,5
-         u000ijk(m) = ce(m,1) + (ce(m,2) + (ce(m,5) + (ce(m,8) + ce(m,11
-     &) * xi) * xi) * xi) * xi + (ce(m,3) + (ce(m,6) + (ce(m,9) + ce(m,1
-     &2) * eta) * eta) * eta) * eta + (ce(m,4) + (ce(m,7) + (ce(m,10) + 
-     &ce(m,13) * zeta) * zeta) * zeta) * zeta
-      enddo  
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/l2norm.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/l2norm.f
deleted file mode 100644
index 83a380f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/l2norm.f
+++ /dev/null
@@ -1,69 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine l2norm (ldx, ldy, ldz, nx0, ny0, nz0, ist, iend, jst, j
-     &end, v, sum)
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   to compute the l2-norm of vector v.
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!  input parameters
-!---------------------------------------------------------------------
-      integer  ldx,ldy,ldz
-      integer  nx0,ny0,nz0
-      integer  ist,iend
-      integer  jst,jend
-!DVM$ INHERIT v
-!DVM$ DYNAMIC v
-
-!---------------------------------------------------------------------
-!   To improve cache performance, second two dimensions padded by 1 
-!   for even number sizes only.  Only needed in v.
-!---------------------------------------------------------------------
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0(1:6,0:163,0:163,-1:163)
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0_r1(1:6,0:163,0:163,-1:163)
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0_r2(1:6,0:163,0:163,-1:163)
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0_r3(1:6,0:163,0:163,-1:163)
-!DVM$ TEMPLATE, COMMON :: dvmh_temp0_r0(1:6,0:163,0:163,-1:163)
-!DVM$ DISTRIBUTE dvmh_temp0(*,BLOCK,BLOCK,BLOCK)
-!DVM$ DISTRIBUTE dvmh_temp0_r1(*,BLOCK,BLOCK,*)
-!DVM$ DISTRIBUTE dvmh_temp0_r2(*,BLOCK,*,BLOCK)
-!DVM$ DISTRIBUTE dvmh_temp0_r3(*,*,BLOCK,BLOCK)
-!DVM$ DISTRIBUTE dvmh_temp0_r0(*,*,*,BLOCK)
-!DVM$ DYNAMIC dvmh_temp0, dvmh_temp0_r1, dvmh_temp0_r2, dvmh_temp0_r3, 
-!DVM$&dvmh_temp0_r0
-      double precision  v(5,ldx / 2 * 2 + 1,ldy / 2 * 2 + 1,*),sum(5)
-
-!---------------------------------------------------------------------
-!  local variables
-!---------------------------------------------------------------------
-      integer  i,j,k,m
-      do  m = 1,5
-         sum(m) = 0.0d+00
-      enddo  
-!DVM$ region      
-!DVM$ PARALLEL (k,j,i,m) ON v(m,i,j,k), PRIVATE (m,j,i,k),REDUCTION (sum
-!DVM$& (sum))
-      do  k = 2,nz0 - 1
-         do  j = jst,jend
-            do  i = ist,iend
-               do  m = 1,5
-                  sum(m) = sum(m) + v(m,i,j,k) * v(m,i,j,k)
-               enddo  
-            enddo  
-         enddo  
-      enddo 
-!DVM$ end region      
-      do  m = 1,5
-         sum(m) = sqrt (sum(m) / ((nx0 - 2) * (ny0 - 2) * (nz0 - 2)))
-      enddo  
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/lu.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/lu.f
deleted file mode 100644
index 6050948..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/lu.f
+++ /dev/null
@@ -1,212 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         !
-!                                                                         !
-!                      S E R I A L     V E R S I O N                      !
-!                                                                         !
-!                                   L U                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!                                                                         !
-!    This benchmark is a serial version of the NPB LU code.               !
-!    Refer to NAS Technical Reports 95-020 for details.                   !
-!                                                                         !
-!    Permission to use, copy, distribute and modify this software         !
-!    for any purpose with or without fee is hereby granted.  We           !
-!    request, however, that all derived work reference the NAS            !
-!    Parallel Benchmarks 3.3. This software is provided "as is"           !
-!    without express or implied warranty.                                 !
-!                                                                         !
-!    Information on NPB 3.3, including the technical report, the          !
-!    original specifications, source code, results and information        !
-!    on how to submit new results, is available at:                       !
-!                                                                         !
-!           http://www.nas.nasa.gov/Software/NPB/                         !
-!                                                                         !
-!    Send comments or suggestions to  npb@nas.nasa.gov                    !
-!                                                                         !
-!          NAS Parallel Benchmarks Group                                  !
-!          NASA Ames Research Center                                      !
-!          Mail Stop: T27A-1                                              !
-!          Moffett Field, CA   94035-1000                                 !
-!                                                                         !
-!          E-mail:  npb@nas.nasa.gov                                      !
-!          Fax:     (650) 604-3957                                        !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!---------------------------------------------------------------------
-!     
-! Authors: S. Weeratunga
-!          V. Venkatakrishnan
-!          E. Barszcz
-!          M. Yarrow
-!     
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      program applu
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     
-!   driver for the performance evaluation of the solver for
-!   five coupled parabolic/elliptic partial differential equations.
-!     
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      character  class
-      logical  verified
-      double precision  mflops
-      double precision  t,tmax,timer_read,trecs(t_last)
-      external timer_read
-      integer  i,fstatus
-      character  t_names(t_last)*8
-
-!---------------------------------------------------------------------
-!     Setup info for timers
-!---------------------------------------------------------------------
-      open (unit = 2,file = 'timer.flag',status = 'old',iostat = fstatus
-     &)
-      if (fstatus .eq. 0) then
-         timeron = .TRUE.
-         t_names(t_total) = 'total'
-         t_names(t_rhsx) = 'rhsx'
-         t_names(t_rhsy) = 'rhsy'
-         t_names(t_rhsz) = 'rhsz'
-         t_names(t_rhs) = 'rhs'
-         t_names(t_jacld) = 'jacld'
-         t_names(t_blts) = 'blts'
-         t_names(t_jacu) = 'jacu'
-         t_names(t_buts) = 'buts'
-         t_names(t_add) = 'add'
-         t_names(t_l2norm) = 'l2norm'
-         close (unit = 2)
-      else  
-         timeron = .FALSE.
-      endif  
-
-!---------------------------------------------------------------------
-!   read input data
-!---------------------------------------------------------------------
-      call read_input()
-
-!---------------------------------------------------------------------
-!   set up domain sizes
-!---------------------------------------------------------------------
-      call domain()
-
-!---------------------------------------------------------------------
-!   set up coefficients
-!---------------------------------------------------------------------
-      call setcoeff()
-
-!---------------------------------------------------------------------
-!   set the boundary values for dependent variables
-!---------------------------------------------------------------------
-      call setbv()
-
-!---------------------------------------------------------------------
-!   set the initial values for dependent variables
-!---------------------------------------------------------------------
-      call setiv()
-
-!---------------------------------------------------------------------
-!   compute the forcing term based on prescribed exact solution
-!---------------------------------------------------------------------
-      call erhs()
-
-!---------------------------------------------------------------------
-!   perform one SSOR iteration to touch all pages
-!---------------------------------------------------------------------
-!DVM$ actual()
-      call ssor(1)
-!DVM$ get_actual()
-!---------------------------------------------------------------------
-!   reset the boundary and initial values
-!---------------------------------------------------------------------
-      call setbv()
-      call setiv()
-
-!---------------------------------------------------------------------
-!   perform the SSOR iterations
-!--------------------------------------------------------------------
-!DVM$ interval 1
-!DVM$ actual()
-      call ssor(itmax)
-!DVM$ get_actual()      
-!DVM$ end interval
-!---------------------------------------------------------------------
-!   compute the solution error
-!---------------------------------------------------------------------
-      call error()
-
-!---------------------------------------------------------------------
-!   compute the surface integral
-!---------------------------------------------------------------------
-      call pintgr()
-
-!---------------------------------------------------------------------
-!   verification test
-!---------------------------------------------------------------------
-      call verify(rsdnm,errnm,frc,class,verified)
-      mflops = float (itmax) * (1984.77 * float (nx0) * float (ny0) * fl
-     &oat (nz0) - 10923.3 * (float (nx0 + ny0 + nz0) / 3.)** 2 + 27770.9
-     & * float (nx0 + ny0 + nz0) / 3. - 144010.) / (maxtime * 1000000.)
-      call print_results('LU',class,nx0,ny0,nz0,itmax,maxtime,mflops,'  
-     &        floating point',verified,npbversion,compiletime,cs1,cs2,cs
-     &3,cs4,cs5,cs6,'(none)')
-
-!---------------------------------------------------------------------
-!      More timers
-!---------------------------------------------------------------------
-      if (.not.(timeron))  goto 999
-      do  i = 1,t_last
-         trecs(i) = timer_read (i)
-      enddo  
-      tmax = maxtime
-      if (tmax .eq. 0.)  tmax = 1.0
-      write (unit = *,fmt = 800) 
-800   format('  SECTION     Time (secs)')
-      do  i = 1,t_last
-         write (unit = *,fmt = 810) t_names(i),trecs(i),trecs(i) * 100. 
-     &/ tmax
-         if (i .eq. t_rhs) then
-            t = trecs(t_rhsx) + trecs(t_rhsy) + trecs(t_rhsz)
-            write (unit = *,fmt = 820) 'sub-rhs',t,t * 100. / tmax
-            t = trecs(i) - t
-            write (unit = *,fmt = 820) 'rest-rhs',t,t * 100. / tmax
-         endif  
-810            format(2x,a8,':',f9.3,'  (',f6.2,'%)')
-820            format(5x,'--> ',a8,':',f9.3,'  (',f6.2,'%)')
-      enddo  
-999   continue
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/makeTODO.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/makeTODO.bat
deleted file mode 100644
index 5e7171a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/makeTODO.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-set CLASS=%1
-set OPT=%2
-
-CALL ..\sys\setparams LU %CLASS%
-CALL %F77% %OPT% -f90 lu 1>out_%CLASS%.txt 2>err_%CLASS%.txt
-if exist lu.exe ( 
-  copy lu.exe %BIN%\lu.%CLASS%.x.exe 
-  del lu.exe 
-)
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/old/lu.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/old/lu.fdv
deleted file mode 100644
index 24b00cc..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/old/lu.fdv
+++ /dev/null
@@ -1,2993 +0,0 @@
-
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         !
-!                                                                         !
-!                          D V M H    V E R S I O N S                     !
-!                                                                         !
-!                                   L U                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!-------------------------------------------------------------------------!
-!-------------------------------------------------------------------------!
-!     
-! Authors:
-!     Original:
-!          S. Weeratunga
-!          V. Venkatakrishnan
-!          E. Barszcz
-!          M. Yarrow
-!     Optimize for DVMH:
-!          Kolganov A.S.
-!     
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      program ludv2
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-      include 'npbparams.h'
-      integer  ipr_default
-      parameter (ipr_default = 1)
-      double precision  omega_default
-      parameter (omega_default = 1.2d0)
-      double precision  tolrsd1_def,tolrsd2_def,tolrsd3_def,tolrsd4_def,tolrsd5_def
-      parameter (tolrsd1_def = 1.0e-08,tolrsd2_def = 1.0e-08,tolrsd3_def = 1.0e-08,tolrsd4_def = 1.0e-08,tolrsd5_def = 1.0e-08)
-      double precision  c1,c2,c3,c4,c5
-      parameter (c1 = 1.40d+00,c2 = 0.40d+00,c3 = 1.00d-01,c4 = 1.00d+00,c5 = 1.40d+00)
-
-!---------------------------------------------------------------------
-!   grid
-!---------------------------------------------------------------------
-      integer  nx,ny,nz
-      integer  nx0,ny0,nz0
-      integer  ist,iend
-      integer  jst,jend
-      integer  ii1,ii2
-      integer  ji1,ji2
-      integer  ki1,ki2
-      integer  stage_n
-      double precision  dxi,deta,dzeta
-      double precision  tx1,tx2,tx3
-      double precision  ty1,ty2,ty3
-      double precision  tz1,tz2,tz3
-      common /cgcon/dxi,deta,dzeta,tx1,tx2,tx3,ty1,ty2,ty3,tz1,tz2,tz3,nx,ny,nz,nx0,ny0,nz0,ist,iend,jst,jend,ii1,ii2,ji1,ji2,ki1,ki&
-     &2
-
-!---------------------------------------------------------------------
-!   dissipation
-!---------------------------------------------------------------------
-      double precision  dx1,dx2,dx3,dx4,dx5
-      double precision  dy1,dy2,dy3,dy4,dy5
-      double precision  dz1,dz2,dz3,dz4,dz5
-      double precision  dssp
-      common /disp/dx1,dx2,dx3,dx4,dx5,dy1,dy2,dy3,dy4,dy5,dz1,dz2,dz3,dz4,dz5,dssp
-
-!---------------------------------------------------------------------
-!   field variables and residuals
-!   to improve cache performance, second two dimensions padded by 1 
-!   for even number sizes only.
-!   Note: corresponding array (called "v") in routines blts, buts, 
-!   and l2norm are similarly padded
-!---------------------------------------------------------------------
-      double precision  u(isiz1 / 2 * 2 + 1,isiz2 / 2 * 2 + 1,isiz3,5),rsd(isiz1 / 2 * 2 + 1,isiz2 / 2 * 2 + 1,isiz3,5),frct(isiz1 /&
-     & 2 * 2 + 1,isiz2 / 2 * 2 + 1,isiz3,5)
-      common /cvar/u,rsd,frct
-
-!---------------------------------------------------------------------
-!   output control parameters
-!---------------------------------------------------------------------
-      integer  ipr,inorm
-      common /cprcon/ipr,inorm
-
-!---------------------------------------------------------------------
-!   newton-raphson iteration control parameters
-!---------------------------------------------------------------------
-      integer  itmax,invert
-      double precision  dt,omega,tolrsd(5),rsdnm(5),errnm(5),frc,ttotal
-      common /ctscon/dt,omega,tolrsd,rsdnm,errnm,frc,ttotal,itmax,invert
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   coefficients of the exact solution
-!---------------------------------------------------------------------
-      double precision  ce(5,13)
-      common /cexact/ce
-
-!---------------------------------------------------------------------
-!   multi-processor common blocks
-!---------------------------------------------------------------------
-      integer  id,ndim,num,xdim,ydim,row,col
-      common /dim/id,ndim,num,xdim,ydim,row,col
-      integer  north,south,east,west
-      common /neigh/north,south,east,west
-      integer  from_s,from_n,from_e,from_w
-      parameter (from_s = 1,from_n = 2,from_e = 3,from_w = 4)
-      integer  npmax
-      parameter (npmax = isiz1 + isiz2)
-      logical  icommn(npmax + 1),icomms(npmax + 1),icomme(npmax + 1),icommw(npmax + 1)
-
-!      double precision  buf(5,2*isiz2*isiz3),
-!     >                  buf1(5,2*isiz2*isiz3)
-      common /comm/icommn,icomms,icomme,icommw
-      double precision  maxtime
-      common /timer/maxtime
-
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-      character  class
-      logical  verified
-      double precision  mflops
-      character*24  print_results_142_arg9_7
-      character*2  print_results_142_arg1_6
-      real  float_141_5
-      real  float_141_4
-      real  float_141_3
-      real  float_141_2
-      real  float_141_1
-      real  float_141_0
-      integer  fstatus
-      double precision  max_486_8
-      double precision  dvtime
-      integer  m
-      integer  k
-      integer  j
-      double precision  rsd_(5)
-      integer  i
-      integer  jglob
-      integer  iglob
-      integer  k__9
-      integer  j__10
-      integer  i__11
-      double precision  dble_739_14
-      double precision  dble_739_13
-      double precision  dble_739_12
-      double precision  zeta
-      double precision  eta
-      double precision  xi
-      integer  m__15
-      double precision  r1,r2,r3,r4,r5
-      double precision  dble_739_18,flux_(10),flux__(15)
-      double precision  dble_739_17
-      double precision  dble_739_16
-      double precision  ue_ijnz(5)
-      double precision  ue_ij1(5)
-      double precision  ue_iny0k(5)
-      double precision  ue_i1k(5)
-      double precision  ue_nx0jk(5)
-      double precision  ue_1jk(5)
-      double precision  pzeta
-      double precision  peta
-      double precision  pxi
-      double precision  zeta__19
-      double precision  eta__20
-      double precision  xi__21
-      integer  jglob__22
-      integer  iglob__23
-      integer  m__24
-      integer  k__25
-      integer  j__26
-      integer  i__27
-      double precision  dble_739_30
-      double precision  dble_739_29
-      double precision  dble_739_28
-      double precision  u51km1
-      double precision  u41km1
-      double precision  u31km1
-      double precision  u21km1
-      double precision  u51jm1
-      double precision  u41jm1
-      double precision  u31jm1
-      double precision  u21jm1
-      double precision  u51im1
-      double precision  u41im1
-      double precision  u31im1
-      double precision  u21im1
-      double precision  u51k
-      double precision  u41k
-      double precision  u31k
-      double precision  u21k
-      double precision  u51j
-      double precision  u41j
-      double precision  u31j
-      double precision  u21j
-      double precision  u51i
-      double precision  u41i
-      double precision  u31i
-      double precision  u21i
-      double precision  tmp
-      double precision  u41
-      double precision  u31
-      double precision  u21
-      double precision  q
-      double precision  zeta__31
-      double precision  eta__32
-      double precision  xi__33
-      double precision  dsspm
-      integer  jend1
-      integer  jst1
-      integer  iend1
-      integer  ist1
-      integer  l2
-      integer  l1
-      integer  jglob__34
-      integer  iglob__35
-      integer  m__36
-      integer  k__37
-      integer  j__38
-      integer  i__39
-      integer  mod_1150_42
-      integer  mod_1150_41
-      integer  mod_1150_40
-      double precision  delunm(5)
-      double precision  tmp__43
-      integer  istep
-      integer  l
-      integer  m__44
-      integer  k__45
-      integer  j__46
-      integer  i__47
-      double precision  u51km1__48
-      double precision  u41km1__49
-      double precision  u31km1__50
-      double precision  u21km1__51
-      double precision  u51jm1__52
-      double precision  u41jm1__53
-      double precision  u31jm1__54
-      double precision  u21jm1__55
-      double precision  u51im1__56
-      double precision  u41im1__57
-      double precision  u31im1__58
-      double precision  u21im1__59
-      double precision  u51k__60
-      double precision  u41k__61
-      double precision  u31k__62
-      double precision  u21k__63
-      double precision  u51j__64
-      double precision  u41j__65
-      double precision  u31j__66
-      double precision  u21j__67
-      double precision  u51i__68
-      double precision  u41i__69
-      double precision  u31i__70
-      double precision  u21i__71
-      double precision  tmp__72
-      double precision  u41__73
-      double precision  u31__74
-      double precision  u21__75
-      double precision  q__76
-      integer  jend1__77
-      integer  jst1__78
-      integer  iend1__79
-      integer  ist1__80
-      integer  l2__81
-      integer  l1__82
-      integer  m__83
-      integer  k__84
-      integer  j__85
-      integer  i__86
-      integer  v_1573_88
-      integer  v_1573_87
-      integer  m__89
-      integer  k__90
-      integer  j__91
-      integer  i__92
-      double precision  start(64)
-      double precision  elapsed(64)
-      common /tt/start,elapsed
-      double precision  t
-      real  tarray(2)
-      double precision  tmat(5,5)
-      double precision  tv(5)
-      double precision  tmp__93
-      integer  m__94
-      integer  j__95
-      integer  i__96
-      double precision  tmp3
-      double precision  tmp2
-      double precision  tmp1
-      double precision  tmp_3
-      double precision  tmp_2
-      double precision  tmp_1
-      double precision  c34
-      double precision  c1345
-      double precision  r43
-      integer  k__97
-      double precision  tmat__98(5,5)
-      double precision  tmp__99
-      integer  m__100
-      integer  j__101
-      integer  i__102
-      double precision  tmp3__103
-      double precision  tmp2__104
-      double precision  tmp1__105
-      double precision  c34__106
-      double precision  c1345__107
-      double precision  r43__108
-      integer  k__109
-      double precision  now
-      double precision  t__110
-      double precision  u000ijk(5)
-      double precision  tmp__111
-      integer  jglob__112
-      integer  iglob__113
-      integer  m__114
-      integer  k__115
-      integer  j__116
-      integer  i__117
-      double precision  s2
-      double precision  s1
-      double precision  frc3
-      double precision  frc2
-      double precision  frc1
-      integer  ind2
-      integer  ind1
-      integer  jglob2
-      integer  jglob1
-      integer  jglob__118
-      integer  iglob2
-      integer  iglob1
-      integer  iglob__119
-      integer  jfin1
-      integer  jfin
-      integer  jbeg
-      integer  ifin1
-      integer  ifin
-      integer  ibeg
-      integer  k__120
-      integer  j__121
-      integer  i__122
-      double precision  dabs_1966_123
-      integer  m__124
-      double precision  dtref
-      double precision  epsilon
-      double precision  xcidif
-      double precision  xcedif(5)
-      double precision  xcrdif(5)
-      double precision  xciref
-      double precision  xceref(5)
-      double precision  xcrref(5)
-      character*13  size
-      integer  j__125
-      integer  touch
-130   format(//' Please send the results of this run to:'//            ' NPB Development Team '/            ' Internet: npb@nas.nasa&
-     &.gov'/            ' '/            ' If email is not available, send this to:'//            ' MS T27A-1'/            ' NASA Ame&
-     &s Research Center'/            ' Moffett Field, CA  94035-1000'//            ' Fax: 415-604-3957'//)
-13    format(' Version         = ', 12x, a12)
-12    format(' Verification    = ', 12x, a)
-11    format(' Operation type  = ', a24)
-9     format(' Mop/s total     = ',12x, f12.2)
-6     format(' Time in seconds = ',12x, f12.2)
-5     format(' Iterations      = ', 12x, i12)
-4     format(' Size            =  ',12x, i3,'x',i3,'x',i3)
-44    format(' Size            = ',12x, i12)
-42    format(' Size            = ',12x, a14)
-3     format(' Class           = ', 12x, a12)
-2     format(//, ' ', A2, ' Benchmark Completed.')
-2021  format(' Verification failed')
-2020  format(' Verification Successful')
-2023  format(' No verification performed')
-2022  format(' No reference values provided')
-2032  format('          ', 4x, E20.13, E20.13, E20.13)
-2031  format(' FAILURE: ', 4x, E20.13, E20.13, E20.13)
-2030  format('          ', 4x, E20.13)
-2026  format(' Surface integral')
-2025  format(' Comparison of surface integral')
-2015  format('          ', i2, 2x, E20.13)
-2011  format('          ', i2, 2x, E20.13, E20.13, E20.13)
-2010  format(' FAILURE: ', i2, 2x, E20.13, E20.13, E20.13)
-2006  format(' RMS-norms of solution error')
-2062  format(' Comparison of RMS-norms of solution error')
-2005  format(' RMS-norms of residual')
-2061  format(' Comparison of RMS-norms of residual')
-1995  format(' Unknown class')
-2060  format(' DT does not match the reference value of ',                  E15.8)
-2000  format(' Accuracy setting for epsilon = ', E20.13)
-1990  format(/, ' Verification being performed for class ', a)
-
-!      write (*,1001) frc
-2058  format (//5x,'surface integral = ',1pe12.5//)
-
-!        write (*,1002) ( errnm(m), m = 1, 5 )
-2056  format (1x/1x,'RMS-norm of error in soln. to ', 'first pde  = ',1pe12.5/, 1x,'RMS-norm of error in soln. to ', 'second pde = '&
-     &,1pe12.5/, 1x,'RMS-norm of error in soln. to ', 'third pde  = ',1pe12.5/, 1x,'RMS-norm of error in soln. to ', 'fourth pde = '&
-     &,1pe12.5/, 1x,'RMS-norm of error in soln. to ', 'fifth pde  = ',1pe12.5)
-1007  format (1x/1x,'RMS-norm of steady-state residual for ', 'first pde  = ',1pe12.5/, 1x,'RMS-norm of steady-state residual for ',&
-     & 'second pde = ',1pe12.5/, 1x,'RMS-norm of steady-state residual for ', 'third pde  = ',1pe12.5/, 1x,'RMS-norm of steady-state&
-     & residual for ', 'fourth pde = ',1pe12.5/, 1x,'RMS-norm of steady-state residual for ', 'fifth pde  = ',1pe12.5)
-1006  format (1x/1x,'RMS-norm of SSOR-iteration correction ', 'for first pde  = ',1pe12.5/, 1x,'RMS-norm of SSOR-iteration correctio&
-     &n ', 'for second pde = ',1pe12.5/, 1x,'RMS-norm of SSOR-iteration correction ', 'for third pde  = ',1pe12.5/, 1x,'RMS-norm of &
-     &SSOR-iteration correction ', 'for fourth pde = ',1pe12.5/, 1x,'RMS-norm of SSOR-iteration correction ', 'for fifth pde  = ',1p&
-     &e12.5)
-1004  format (1x/1x,'convergence was achieved after ',i4,   ' pseudo-time steps' )
-2044  format (1x/5x,'pseudo-time SSOR iteration no.=',i4/)
-200   format(' Time step ', i4)
-201   format(' stage step ', E20.13, '  stage = ', i4)
-2036  format (5x,'SUBDOMAIN SIZE IS TOO LARGE - ',        /5x,'ADJUST PROBLEM SIZE OR NUMBER OF PROCESSORS',        /5x,'SO THAT NX,&
-     & NY AND NZ ARE LESS THAN OR EQUAL TO ',        /5x,'ISIZ1, ISIZ2 AND ISIZ3 RESPECTIVELY.  THEY ARE',        /5x,'CURRENTLY', 3&
-     &I4)
-2035  format (5x,'SUBDOMAIN SIZE IS TOO SMALL - ',        /5x,'ADJUST PROBLEM SIZE OR NUMBER OF PROCESSORS',        /5x,'SO THAT NX,&
-     & NY AND NZ ARE GREATER THAN OR EQUAL',        /5x,'TO 4 THEY ARE CURRENTLY', 3I3)
-1003  format(' Number of processes: ', i5, /)
-1002  format(' Iterations: ', i3)
-1001  format(' Size: ', i3, 'x', i3, 'x', i3)
-1000  format(//,' NAS Parallel Benchmarks 3.3- DVMH version',          ' - LU Benchmark', /)
-2002  format (5x,'PROBLEM SIZE IS TOO LARGE - ',           /5x,'NX, NY AND NZ SHOULD BE EQUAL TO ',           /5x,'ISIZ1, ISIZ2 AND &
-     &ISIZ3 RESPECTIVELY')
-2001  format (5x,'PROBLEM SIZE IS TOO SMALL - ',           /5x,'SET EACH OF NX, NY AND NZ AT LEAST EQUAL TO 5')
-!DVM$ DISTRIBUTE  ( BLOCK  , BLOCK  , BLOCK  ,*):: rsd
-!DVM$ ALIGN (i__96,j__95,k__97,m__36) WITH rsd(i__96,j__95,k__97,m__36) :: frct
-!DVM$ ALIGN (i__96,j__95,k__97,m__83) WITH rsd(i__96,j__95,k__97,m__83) :: u
-!DVM$ SHADOW rsd( 2:2,2:2,2:2,1:1 )
-!DVM$ SHADOW frct( 2:2,2:2,2:2,1:1 )
-!DVM$ SHADOW u( 2:2,2:2,2:2,1:1 )
-      write (unit = *,fmt = 1000) 
-      open (unit = 3,file = 'inputlu.data',status = 'old',access = 'sequential',form = 'formatted',iostat = fstatus)
-      if (fstatus .eq. 0) then
-         write (unit = *,fmt = *) ' Reading from input file inputlu.data'
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) ipr,inorm
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) itmax
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) dt
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) omega
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) tolrsd(1),tolrsd(2),tolrsd(3),tolrsd(4),tolrsd(5)
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) nx0,ny0,nz0
-         close (unit = 3)
-      else  
-         ipr = ipr_default
-         inorm = inorm_default
-         itmax = itmax_default
-         dt = dt_default
-         omega = omega_default
-         tolrsd(1) = tolrsd1_def
-         tolrsd(2) = tolrsd2_def
-         tolrsd(3) = tolrsd3_def
-         tolrsd(4) = tolrsd4_def
-         tolrsd(5) = tolrsd5_def
-         nx0 = isiz1
-         ny0 = isiz2
-         nz0 = isiz3
-      endif  
-      if (nx0 .lt. 4 .or. ny0 .lt. 4 .or. nz0 .lt. 4) then
-         write (unit = *,fmt = 2001) 
-         stop
-      endif  
-      if (nx0 .gt. isiz1 .or. ny0 .gt. isiz2 .or. nz0 .gt. isiz3) then
-         write (unit = *,fmt = 2002) 
-         stop
-      endif  
-      write (unit = *,fmt = 1001) nx0,ny0,nz0
-      write (unit = *,fmt = 1002) itmax
-      nx = nx0
-      ny = ny0
-      nz = nz0
-      if (nx .lt. 4 .or. ny .lt. 4 .or. nz .lt. 4) then
-         write (unit = *,fmt = 2035) nx,ny,nz
-         stop
-      endif  
-      if (nx .gt. isiz1 .or. ny .gt. isiz2 .or. nz .gt. isiz3) then
-         write (unit = *,fmt = 2036) nx,ny,nz
-         stop
-      endif  
-      touch = 1
-      ist = 2
-      iend = nx - 1
-      jst = 2
-      jend = ny - 1
-      dxi = 1.0d+00 / (nx0 - 1)
-      deta = 1.0d+00 / (ny0 - 1)
-      dzeta = 1.0d+00 / (nz0 - 1)
-      tx1 = 1.0d+00 / (dxi * dxi)
-      tx2 = 1.0d+00 / (2.0d+00 * dxi)
-      tx3 = 1.0d+00 / dxi
-      ty1 = 1.0d+00 / (deta * deta)
-      ty2 = 1.0d+00 / (2.0d+00 * deta)
-      ty3 = 1.0d+00 / deta
-      tz1 = 1.0d+00 / (dzeta * dzeta)
-      tz2 = 1.0d+00 / (2.0d+00 * dzeta)
-      tz3 = 1.0d+00 / dzeta
-      ii1 = 2
-      ii2 = nx0 - 1
-      ji1 = 2
-      ji2 = ny0 - 2
-      ki1 = 3
-      ki2 = nz0 - 1
-      dx1 = 0.75d+00
-      dx2 = dx1
-      dx3 = dx1
-      dx4 = dx1
-      dx5 = dx1
-      dy1 = 0.75d+00
-      dy2 = dy1
-      dy3 = dy1
-      dy4 = dy1
-      dy5 = dy1
-      dz1 = 1.00d+00
-      dz2 = dz1
-      dz3 = dz1
-      dz4 = dz1
-      dz5 = dz1
-      max_486_8 = max (dx1,dy1,dz1)
-      dssp = max_486_8 / 4.0d+00
-10001 ce(1,1) = 2.0d+00
-      ce(1,2) = 0.0d+00
-      ce(1,3) = 0.0d+00
-      ce(1,4) = 4.0d+00
-      ce(1,5) = 5.0d+00
-      ce(1,6) = 3.0d+00
-      ce(1,7) = 5.0d-01
-      ce(1,8) = 2.0d-02
-      ce(1,9) = 1.0d-02
-      ce(1,10) = 3.0d-02
-      ce(1,11) = 5.0d-01
-      ce(1,12) = 4.0d-01
-      ce(1,13) = 3.0d-01
-      ce(2,1) = 1.0d+00
-      ce(2,2) = 0.0d+00
-      ce(2,3) = 0.0d+00
-      ce(2,4) = 0.0d+00
-      ce(2,5) = 1.0d+00
-      ce(2,6) = 2.0d+00
-      ce(2,7) = 3.0d+00
-      ce(2,8) = 1.0d-02
-      ce(2,9) = 3.0d-02
-      ce(2,10) = 2.0d-02
-      ce(2,11) = 4.0d-01
-      ce(2,12) = 3.0d-01
-      ce(2,13) = 5.0d-01
-      ce(3,1) = 2.0d+00
-      ce(3,2) = 2.0d+00
-      ce(3,3) = 0.0d+00
-      ce(3,4) = 0.0d+00
-      ce(3,5) = 0.0d+00
-      ce(3,6) = 2.0d+00
-      ce(3,7) = 3.0d+00
-      ce(3,8) = 4.0d-02
-      ce(3,9) = 3.0d-02
-      ce(3,10) = 5.0d-02
-      ce(3,11) = 3.0d-01
-      ce(3,12) = 5.0d-01
-      ce(3,13) = 4.0d-01
-      ce(4,1) = 2.0d+00
-      ce(4,2) = 2.0d+00
-      ce(4,3) = 0.0d+00
-      ce(4,4) = 0.0d+00
-      ce(4,5) = 0.0d+00
-      ce(4,6) = 2.0d+00
-      ce(4,7) = 3.0d+00
-      ce(4,8) = 3.0d-02
-      ce(4,9) = 5.0d-02
-      ce(4,10) = 4.0d-02
-      ce(4,11) = 2.0d-01
-      ce(4,12) = 1.0d-01
-      ce(4,13) = 3.0d-01
-      ce(5,1) = 5.0d+00
-      ce(5,2) = 4.0d+00
-      ce(5,3) = 3.0d+00
-      ce(5,4) = 2.0d+00
-      ce(5,5) = 1.0d-01
-      ce(5,6) = 4.0d-01
-      ce(5,7) = 3.0d-01
-      ce(5,8) = 5.0d-02
-      ce(5,9) = 4.0d-02
-      ce(5,10) = 3.0d-02
-      ce(5,11) = 1.0d-01
-      ce(5,12) = 3.0d-01
-      ce(5,13) = 2.0d-01
-!DVM$ REGION 
-!DVM$ PARALLEL (k,j,i) ON u(i,j,k,*),PRIVATE (m)
-      do  k = 1,isiz3
-         do  j = 1,isiz2 / 2 * 2 + 1
-            do  i = 1,isiz1 / 2 * 2 + 1
-               do  m = 1,5
-                  u(i,j,k,m) = 0.d0
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__9,j__10,i__11) ON u(i__11,j__10,k__9,*),PRIVATE (m__15,jglob,iglob,dble_739_12,dble_739_13,dble_739_14,xi,eta,zet&
-!DVM$&a)
-      do  k__9 = 1,1
-         do  j__10 = 1,ny
-            do  i__11 = 1,nx
-               jglob = j__10
-               iglob = i__11
-               dble_739_12 = dble (iglob - 1)
-               xi = dble_739_12 / (nx0 - 1)
-               dble_739_13 = dble (jglob - 1)
-               eta = dble_739_13 / (ny0 - 1)
-               dble_739_14 = dble (1 - 1)
-               zeta = dble_739_14 / (nz - 1)
-               do  m__15 = 1,5
-                  u(i__11,j__10,k__9,m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) &
-     &* xi * xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta +&
-     & ce(m__15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * &
-     &zeta * zeta * zeta * zeta
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__9,j__10,i__11) ON u(i__11,j__10,k__9,*),PRIVATE (m__15,jglob,iglob,dble_739_12,dble_739_13,dble_739_14,xi,eta,zet&
-!DVM$&a)
-      do  k__9 = nz,nz
-         do  j__10 = 1,ny
-            do  i__11 = 1,nx
-               jglob = j__10
-               iglob = i__11
-               dble_739_12 = dble (iglob - 1)
-               xi = dble_739_12 / (nx0 - 1)
-               dble_739_13 = dble (jglob - 1)
-               eta = dble_739_13 / (ny0 - 1)
-               dble_739_14 = dble (nz - 1)
-               zeta = dble_739_14 / (nz - 1)
-               do  m__15 = 1,5
-                  u(i__11,j__10,k__9,m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) &
-     &* xi * xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta +&
-     & ce(m__15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * &
-     &zeta * zeta * zeta * zeta
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__9,j__10,i__11) ON u(i__11,j__10,k__9,*),PRIVATE (m__15,iglob,dble_739_12,dble_739_13,dble_739_14,xi,eta,zeta)
-      do  k__9 = 1,nz
-         do  j__10 = 1,1
-            do  i__11 = 1,nx
-               iglob = i__11
-               dble_739_12 = dble (iglob - 1)
-               xi = dble_739_12 / (nx0 - 1)
-               dble_739_13 = dble (1 - 1)
-               eta = dble_739_13 / (ny0 - 1)
-               dble_739_14 = dble (k__9 - 1)
-               zeta = dble_739_14 / (nz - 1)
-               do  m__15 = 1,5
-                  u(i__11,j__10,k__9,m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) &
-     &* xi * xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta +&
-     & ce(m__15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * &
-     &zeta * zeta * zeta * zeta
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__9,j__10,i__11) ON u(i__11,j__10,k__9,*),PRIVATE (m__15,iglob,dble_739_12,dble_739_13,dble_739_14,xi,eta,zeta)
-      do  k__9 = 1,nz
-         do  j__10 = ny,ny
-            do  i__11 = 1,nx
-               iglob = i__11
-               dble_739_12 = dble (iglob - 1)
-               xi = dble_739_12 / (nx0 - 1)
-               dble_739_13 = dble (ny0 - 1)
-               eta = dble_739_13 / (ny0 - 1)
-               dble_739_14 = dble (k__9 - 1)
-               zeta = dble_739_14 / (nz - 1)
-               do  m__15 = 1,5
-                  u(i__11,j__10,k__9,m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) &
-     &* xi * xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta +&
-     & ce(m__15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * &
-     &zeta * zeta * zeta * zeta
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__9,j__10,i__11) ON u(i__11,j__10,k__9,*),PRIVATE (m__15,jglob,dble_739_12,dble_739_13,dble_739_14,xi,eta,zeta)
-      do  k__9 = 1,nz
-         do  j__10 = 1,ny
-            do  i__11 = 1,1
-               jglob = j__10
-               dble_739_12 = dble (1 - 1)
-               xi = dble_739_12 / (nx0 - 1)
-               dble_739_13 = dble (jglob - 1)
-               eta = dble_739_13 / (ny0 - 1)
-               dble_739_14 = dble (k__9 - 1)
-               zeta = dble_739_14 / (nz - 1)
-               do  m__15 = 1,5
-                  u(i__11,j__10,k__9,m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) &
-     &* xi * xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta +&
-     & ce(m__15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * &
-     &zeta * zeta * zeta * zeta
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__9,j__10,i__11) ON u(i__11,j__10,k__9,*),PRIVATE (m__15,jglob,dble_739_12,dble_739_13,dble_739_14,xi,eta,zeta)
-      do  k__9 = 1,nz
-         do  j__10 = 1,ny
-            do  i__11 = nx,nx
-               jglob = j__10
-               dble_739_12 = dble (nx0 - 1)
-               xi = dble_739_12 / (nx0 - 1)
-               dble_739_13 = dble (jglob - 1)
-               eta = dble_739_13 / (ny0 - 1)
-               dble_739_14 = dble (k__9 - 1)
-               zeta = dble_739_14 / (nz - 1)
-               do  m__15 = 1,5
-                  u(i__11,j__10,k__9,m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) &
-     &* xi * xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta +&
-     & ce(m__15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * &
-     &zeta * zeta * zeta * zeta
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__25,j__26,i__27) ON u(i__27,j__26,k__25,*),PRIVATE (m__24,m__15,ue_ij1,ue_iny0k,ue_i1k,ue_nx0jk,ue_1jk,ue_ijnz,eta&
-!DVM$&__20,pxi,peta,pzeta,xi__21,zeta__19,iglob__23,jglob__22,dble_739_16,dble_739_17,dble_739_18,dble_739_12,dble_739_13,dble_739_1&
-!DVM$&4,xi,eta,zeta)
-      do  k__25 = 2,nz - 1
-         do  j__26 = 1,ny
-            do  i__27 = 1,nx
-               jglob__22 = j__26
-               dble_739_16 = dble (k__25 - 1)
-               zeta__19 = dble_739_16 / (nz - 1)
-               if (jglob__22 .ne. 1 .and. jglob__22 .ne. ny0) then
-                  dble_739_17 = dble (jglob__22 - 1)
-                  eta__20 = dble_739_17 / (ny0 - 1)
-                  iglob__23 = i__27
-                  if (iglob__23 .ne. 1 .and. iglob__23 .ne. nx0) then
-                     dble_739_18 = dble (iglob__23 - 1)
-                     xi__21 = dble_739_18 / (nx0 - 1)
-                     dble_739_12 = dble (1 - 1)
-                     xi = dble_739_12 / (nx0 - 1)
-                     dble_739_13 = dble (jglob__22 - 1)
-                     eta = dble_739_13 / (ny0 - 1)
-                     dble_739_14 = dble (k__25 - 1)
-                     zeta = dble_739_14 / (nz - 1)
-                     do  m__15 = 1,5
-                        ue_1jk(m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) * xi *&
-     & xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta + ce(m_&
-     &_15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * zeta *&
-     & zeta * zeta * zeta
-                     enddo  
-                     dble_739_12 = dble (nx0 - 1)
-                     xi = dble_739_12 / (nx0 - 1)
-                     dble_739_13 = dble (jglob__22 - 1)
-                     eta = dble_739_13 / (ny0 - 1)
-                     dble_739_14 = dble (k__25 - 1)
-                     zeta = dble_739_14 / (nz - 1)
-                     do  m__15 = 1,5
-                        ue_nx0jk(m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) * xi&
-     & * xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta + ce(&
-     &m__15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * zeta&
-     & * zeta * zeta * zeta
-                     enddo  
-                     dble_739_12 = dble (iglob__23 - 1)
-                     xi = dble_739_12 / (nx0 - 1)
-                     dble_739_13 = dble (1 - 1)
-                     eta = dble_739_13 / (ny0 - 1)
-                     dble_739_14 = dble (k__25 - 1)
-                     zeta = dble_739_14 / (nz - 1)
-                     do  m__15 = 1,5
-                        ue_i1k(m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) * xi *&
-     & xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta + ce(m_&
-     &_15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * zeta *&
-     & zeta * zeta * zeta
-                     enddo  
-                     dble_739_12 = dble (iglob__23 - 1)
-                     xi = dble_739_12 / (nx0 - 1)
-                     dble_739_13 = dble (ny0 - 1)
-                     eta = dble_739_13 / (ny0 - 1)
-                     dble_739_14 = dble (k__25 - 1)
-                     zeta = dble_739_14 / (nz - 1)
-                     do  m__15 = 1,5
-                        ue_iny0k(m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) * xi&
-     & * xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta + ce(&
-     &m__15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * zeta&
-     & * zeta * zeta * zeta
-                     enddo  
-                     dble_739_12 = dble (iglob__23 - 1)
-                     xi = dble_739_12 / (nx0 - 1)
-                     dble_739_13 = dble (jglob__22 - 1)
-                     eta = dble_739_13 / (ny0 - 1)
-                     dble_739_14 = dble (1 - 1)
-                     zeta = dble_739_14 / (nz - 1)
-                     do  m__15 = 1,5
-                        ue_ij1(m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) * xi *&
-     & xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta + ce(m_&
-     &_15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * zeta *&
-     & zeta * zeta * zeta
-                     enddo  
-                     dble_739_12 = dble (iglob__23 - 1)
-                     xi = dble_739_12 / (nx0 - 1)
-                     dble_739_13 = dble (jglob__22 - 1)
-                     eta = dble_739_13 / (ny0 - 1)
-                     dble_739_14 = dble (nz - 1)
-                     zeta = dble_739_14 / (nz - 1)
-                     do  m__15 = 1,5
-                        ue_ijnz(m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) * xi &
-     &* xi + ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta + ce(m&
-     &__15,10) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * zeta &
-     &* zeta * zeta * zeta
-                     enddo  
-                     do  m__24 = 1,5
-                        pxi = (1.0d+00 - xi__21) * ue_1jk(m__24) + xi__21 * ue_nx0jk(m__24)
-                        peta = (1.0d+00 - eta__20) * ue_i1k(m__24) + eta__20 * ue_iny0k(m__24)
-                        pzeta = (1.0d+00 - zeta__19) * ue_ij1(m__24) + zeta__19 * ue_ijnz(m__24)
-                        u(i__27,j__26,k__25,m__24) = pxi + peta + pzeta - pxi * peta - peta * pzeta - pzeta * pxi + pxi * peta * pze&
-     &ta
-                     enddo  
-                  endif  
-               endif  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      dsspm = dssp
-!DVM$ REGION 
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-      do  k__37 = 1,nz
-         do  j__38 = 1,ny
-            do  i__39 = 1,nx
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = 0.0d+00
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON rsd(i__39,j__38,k__37,*),PRIVATE (jglob__34,iglob__35,dble_739_28,dble_739_29,dble_739_30,eta_&
-!DVM$&_32,zeta__31,xi__33,m__36)
-      do  k__37 = 1,nz
-         do  j__38 = 1,ny
-            do  i__39 = 1,nx
-               jglob__34 = j__38
-               dble_739_28 = dble (jglob__34 - 1)
-               eta__32 = dble_739_28 / (ny0 - 1)
-               dble_739_29 = dble (k__37 - 1)
-               zeta__31 = dble_739_29 / (nz - 1)
-               iglob__35 = i__39
-               dble_739_30 = dble (iglob__35 - 1)
-               xi__33 = dble_739_30 / (nx0 - 1)
-               do  m__36 = 1,5
-                  rsd(i__39,j__38,k__37,m__36) = ce(m__36,1) + ce(m__36,2) * xi__33 + ce(m__36,3) * eta__32 + ce(m__36,4) * zeta__31&
-     & + ce(m__36,5) * xi__33 * xi__33 + ce(m__36,6) * eta__32 * eta__32 + ce(m__36,7) * zeta__31 * zeta__31 + ce(m__36,8) * xi__33 &
-     &* xi__33 * xi__33 + ce(m__36,9) * eta__32 * eta__32 * eta__32 + ce(m__36,10) * zeta__31 * zeta__31 * zeta__31 + ce(m__36,11) *&
-     & xi__33 * xi__33 * xi__33 * xi__33 + ce(m__36,12) * eta__32 * eta__32 * eta__32 * eta__32 + ce(m__36,13) * zeta__31 * zeta__31&
-     & * zeta__31 * zeta__31
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      l1 = 1
-      l2 = nx
-!DVM$ REGION 
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36,flux_,u21,q),SHADOW_RENEW (rsd(1:1,0:0,0:0,0:0))
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               flux_(1) = rsd(i__39 + 1,j__38,k__37,2)
-               u21 = rsd(i__39 + 1,j__38,k__37,2) / rsd(i__39 + 1,j__38,k__37,1)
-               q = 0.50d+00 * (rsd(i__39 + 1,j__38,k__37,2) * rsd(i__39 + 1,j__38,k__37,2) + rsd(i__39 + 1,j__38,k__37,3) * rsd(i__3&
-     &9 + 1,j__38,k__37,3) + rsd(i__39 + 1,j__38,k__37,4) * rsd(i__39 + 1,j__38,k__37,4)) / rsd(i__39 + 1,j__38,k__37,1)
-               flux_(2) = rsd(i__39 + 1,j__38,k__37,2) * u21 + c2 * (rsd(i__39 + 1,j__38,k__37,5) - q)
-               flux_(3) = rsd(i__39 + 1,j__38,k__37,3) * u21
-               flux_(4) = rsd(i__39 + 1,j__38,k__37,4) * u21
-               flux_(5) = (c1 * rsd(i__39 + 1,j__38,k__37,5) - c2 * q) * u21
-               flux_(6) = rsd(i__39 - 1,j__38,k__37,2)
-               u21 = rsd(i__39 - 1,j__38,k__37,2) / rsd(i__39 - 1,j__38,k__37,1)
-               q = 0.50d+00 * (rsd(i__39 - 1,j__38,k__37,2) * rsd(i__39 - 1,j__38,k__37,2) + rsd(i__39 - 1,j__38,k__37,3) * rsd(i__3&
-     &9 - 1,j__38,k__37,3) + rsd(i__39 - 1,j__38,k__37,4) * rsd(i__39 - 1,j__38,k__37,4)) / rsd(i__39 - 1,j__38,k__37,1)
-               flux_(7) = rsd(i__39 - 1,j__38,k__37,2) * u21 + c2 * (rsd(i__39 - 1,j__38,k__37,5) - q)
-               flux_(8) = rsd(i__39 - 1,j__38,k__37,3) * u21
-               flux_(9) = rsd(i__39 - 1,j__38,k__37,4) * u21
-               flux_(10) = (c1 * rsd(i__39 - 1,j__38,k__37,5) - c2 * q) * u21
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - tx2 * (flux_(m__36) - flux_(m__36 + 5))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (tmp,u21i,u31i,u41i,u51i,u21im1,u31im1,u41im1,u51im1,flux_),&
-!DVM$&SHADOW_RENEW (rsd(2:2,0:0,0:0,0:0))
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               tmp = 1.0d+00 / rsd(i__39,j__38,k__37,1)
-               u21i = tmp * rsd(i__39,j__38,k__37,2)
-               u31i = tmp * rsd(i__39,j__38,k__37,3)
-               u41i = tmp * rsd(i__39,j__38,k__37,4)
-               u51i = tmp * rsd(i__39,j__38,k__37,5)
-               tmp = 1.0d+00 / rsd(i__39 - 1,j__38,k__37,1)
-               u21im1 = tmp * rsd(i__39 - 1,j__38,k__37,2)
-               u31im1 = tmp * rsd(i__39 - 1,j__38,k__37,3)
-               u41im1 = tmp * rsd(i__39 - 1,j__38,k__37,4)
-               u51im1 = tmp * rsd(i__39 - 1,j__38,k__37,5)
-               flux_(2) = 4.0d+00 / 3.0d+00 * tx3 * (u21i - u21im1)
-               flux_(3) = tx3 * (u31i - u31im1)
-               flux_(4) = tx3 * (u41i - u41im1)
-               flux_(5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tx3 * (u21i** 2 + u31i** 2 + u41i** 2 - (u21im1** 2 + u31im1** 2 + u41im1&
-     &** 2)) + 1.0d+00 / 6.0d+00 * tx3 * (u21i** 2 - u21im1** 2) + c1 * c5 * tx3 * (u51i - u51im1)
-               tmp = 1.0d+00 / rsd(i__39 + 1,j__38,k__37,1)
-               u21i = tmp * rsd(i__39 + 1,j__38,k__37,2)
-               u31i = tmp * rsd(i__39 + 1,j__38,k__37,3)
-               u41i = tmp * rsd(i__39 + 1,j__38,k__37,4)
-               u51i = tmp * rsd(i__39 + 1,j__38,k__37,5)
-               tmp = 1.0d+00 / rsd(i__39,j__38,k__37,1)
-               u21im1 = tmp * rsd(i__39,j__38,k__37,2)
-               u31im1 = tmp * rsd(i__39,j__38,k__37,3)
-               u41im1 = tmp * rsd(i__39,j__38,k__37,4)
-               u51im1 = tmp * rsd(i__39,j__38,k__37,5)
-               flux_(5 + 2) = 4.0d+00 / 3.0d+00 * tx3 * (u21i - u21im1)
-               flux_(5 + 3) = tx3 * (u31i - u31im1)
-               flux_(5 + 4) = tx3 * (u41i - u41im1)
-               flux_(5 + 5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tx3 * (u21i** 2 + u31i** 2 + u41i** 2 - (u21im1** 2 + u31im1** 2 + u4&
-     &1im1** 2)) + 1.0d+00 / 6.0d+00 * tx3 * (u21i** 2 - u21im1** 2) + c1 * c5 * tx3 * (u51i - u51im1)
-               frct(i__39,j__38,k__37,1) = frct(i__39,j__38,k__37,1) + dx1 * tx1 * (rsd(i__39 - 1,j__38,k__37,1) - 2.0d+00 * rsd(i__&
-     &39,j__38,k__37,1) + rsd(i__39 + 1,j__38,k__37,1))
-               frct(i__39,j__38,k__37,2) = frct(i__39,j__38,k__37,2) + tx3 * c3 * c4 * (flux_(5 + 2) - flux_(2)) + dx2 * tx1 * (rsd(&
-     &i__39 - 1,j__38,k__37,2) - 2.0d+00 * rsd(i__39,j__38,k__37,2) + rsd(i__39 + 1,j__38,k__37,2))
-               frct(i__39,j__38,k__37,3) = frct(i__39,j__38,k__37,3) + tx3 * c3 * c4 * (flux_(5 + 3) - flux_(3)) + dx3 * tx1 * (rsd(&
-     &i__39 - 1,j__38,k__37,3) - 2.0d+00 * rsd(i__39,j__38,k__37,3) + rsd(i__39 + 1,j__38,k__37,3))
-               frct(i__39,j__38,k__37,4) = frct(i__39,j__38,k__37,4) + tx3 * c3 * c4 * (flux_(5 + 4) - flux_(4)) + dx4 * tx1 * (rsd(&
-     &i__39 - 1,j__38,k__37,4) - 2.0d+00 * rsd(i__39,j__38,k__37,4) + rsd(i__39 + 1,j__38,k__37,4))
-               frct(i__39,j__38,k__37,5) = frct(i__39,j__38,k__37,5) + tx3 * c3 * c4 * (flux_(5 + 5) - flux_(5)) + dx5 * tx1 * (rsd(&
-     &i__39 - 1,j__38,k__37,5) - 2.0d+00 * rsd(i__39,j__38,k__37,5) + rsd(i__39 + 1,j__38,k__37,5))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = 2,2
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * ((+(5.0d+00)) * rsd(i__39,j__38,k__37,m__3&
-     &6) - 4.0d+00 * rsd(i__39 + 1,j__38,k__37,m__36) + rsd(i__39 + 2,j__38,k__37,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = 3,3
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * ((-(4.0d+00)) * rsd(i__39 - 1,j__38,k__37,&
-     &m__36) + 6.0d+00 * rsd(i__39,j__38,k__37,m__36) - 4.0d+00 * rsd(i__39 + 1,j__38,k__37,m__36) + rsd(i__39 + 2,j__38,k__37,m__36&
-     &))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      ist1 = 4
-      iend1 = nx - 3
-!DVM$ REGION 
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = ist1,iend1
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * (rsd(i__39 - 2,j__38,k__37,m__36) - 4.0d+0&
-     &0 * rsd(i__39 - 1,j__38,k__37,m__36) + 6.0d+00 * rsd(i__39,j__38,k__37,m__36) - 4.0d+00 * rsd(i__39 + 1,j__38,k__37,m__36) + r&
-     &sd(i__39 + 2,j__38,k__37,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = nx - 2,nx - 2
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * (rsd(i__39 - 2,j__38,k__37,m__36) - 4.0d+0&
-     &0 * rsd(i__39 - 1,j__38,k__37,m__36) + 6.0d+00 * rsd(i__39,j__38,k__37,m__36) - 4.0d+00 * rsd(i__39 + 1,j__38,k__37,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = nx - 1,nx - 1
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * (rsd(i__39 - 2,j__38,k__37,m__36) - 4.0d+0&
-     &0 * rsd(i__39 - 1,j__38,k__37,m__36) + 5.0d+00 * rsd(i__39,j__38,k__37,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      l1 = 1
-      l2 = ny
-!DVM$ REGION 
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),SHADOW_RENEW (rsd(0:0,1:1,0:0,0:0)),PRIVATE (m__36,u31,q,flux_)
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               flux_(1) = rsd(i__39,j__38 + 1,k__37,3)
-               u31 = rsd(i__39,j__38 + 1,k__37,3) / rsd(i__39,j__38 + 1,k__37,1)
-               q = 0.50d+00 * (rsd(i__39,j__38 + 1,k__37,2) * rsd(i__39,j__38 + 1,k__37,2) + rsd(i__39,j__38 + 1,k__37,3) * rsd(i__3&
-     &9,j__38 + 1,k__37,3) + rsd(i__39,j__38 + 1,k__37,4) * rsd(i__39,j__38 + 1,k__37,4)) / rsd(i__39,j__38 + 1,k__37,1)
-               flux_(2) = rsd(i__39,j__38 + 1,k__37,2) * u31
-               flux_(3) = rsd(i__39,j__38 + 1,k__37,3) * u31 + c2 * (rsd(i__39,j__38 + 1,k__37,5) - q)
-               flux_(4) = rsd(i__39,j__38 + 1,k__37,4) * u31
-               flux_(5) = (c1 * rsd(i__39,j__38 + 1,k__37,5) - c2 * q) * u31
-               flux_(6) = rsd(i__39,j__38 - 1,k__37,3)
-               u31 = rsd(i__39,j__38 - 1,k__37,3) / rsd(i__39,j__38 - 1,k__37,1)
-               q = 0.50d+00 * (rsd(i__39,j__38 - 1,k__37,2) * rsd(i__39,j__38 - 1,k__37,2) + rsd(i__39,j__38 - 1,k__37,3) * rsd(i__3&
-     &9,j__38 - 1,k__37,3) + rsd(i__39,j__38 - 1,k__37,4) * rsd(i__39,j__38 - 1,k__37,4)) / rsd(i__39,j__38 - 1,k__37,1)
-               flux_(7) = rsd(i__39,j__38 - 1,k__37,2) * u31
-               flux_(8) = rsd(i__39,j__38 - 1,k__37,3) * u31 + c2 * (rsd(i__39,j__38 - 1,k__37,5) - q)
-               flux_(9) = rsd(i__39,j__38 - 1,k__37,4) * u31
-               flux_(10) = (c1 * rsd(i__39,j__38 - 1,k__37,5) - c2 * q) * u31
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - ty2 * (flux_(m__36) - flux_(5 + m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-
-!shadow renew all dimentions of rsd   
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (tmp,u21j,u31j,u41j,u51j,u21jm1,u31jm1,u41jm1,u51jm1,flux_),&
-!DVM$&SHADOW_RENEW (rsd(0:0,2:2,2:2,0:0))
-
-!SHADOW_RENEW (rsd(0:0,1:1,0:0,0:0)
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               tmp = 1.0d+00 / rsd(i__39,j__38,k__37,1)
-               u21j = tmp * rsd(i__39,j__38,k__37,2)
-               u31j = tmp * rsd(i__39,j__38,k__37,3)
-               u41j = tmp * rsd(i__39,j__38,k__37,4)
-               u51j = tmp * rsd(i__39,j__38,k__37,5)
-               tmp = 1.0d+00 / rsd(i__39,j__38 - 1,k__37,1)
-               u21jm1 = tmp * rsd(i__39,j__38 - 1,k__37,2)
-               u31jm1 = tmp * rsd(i__39,j__38 - 1,k__37,3)
-               u41jm1 = tmp * rsd(i__39,j__38 - 1,k__37,4)
-               u51jm1 = tmp * rsd(i__39,j__38 - 1,k__37,5)
-               flux_(2) = ty3 * (u21j - u21jm1)
-               flux_(3) = 4.0d+00 / 3.0d+00 * ty3 * (u31j - u31jm1)
-               flux_(4) = ty3 * (u41j - u41jm1)
-               flux_(5) = 0.50d+00 * (1.0d+00 - c1 * c5) * ty3 * (u21j** 2 + u31j** 2 + u41j** 2 - (u21jm1** 2 + u31jm1** 2 + u41jm1&
-     &** 2)) + 1.0d+00 / 6.0d+00 * ty3 * (u31j** 2 - u31jm1** 2) + c1 * c5 * ty3 * (u51j - u51jm1)
-               tmp = 1.0d+00 / rsd(i__39,j__38 + 1,k__37,1)
-               u21j = tmp * rsd(i__39,j__38 + 1,k__37,2)
-               u31j = tmp * rsd(i__39,j__38 + 1,k__37,3)
-               u41j = tmp * rsd(i__39,j__38 + 1,k__37,4)
-               u51j = tmp * rsd(i__39,j__38 + 1,k__37,5)
-               tmp = 1.0d+00 / rsd(i__39,j__38,k__37,1)
-               u21jm1 = tmp * rsd(i__39,j__38,k__37,2)
-               u31jm1 = tmp * rsd(i__39,j__38,k__37,3)
-               u41jm1 = tmp * rsd(i__39,j__38,k__37,4)
-               u51jm1 = tmp * rsd(i__39,j__38,k__37,5)
-               flux_(5 + 2) = ty3 * (u21j - u21jm1)
-               flux_(5 + 3) = 4.0d+00 / 3.0d+00 * ty3 * (u31j - u31jm1)
-               flux_(5 + 4) = ty3 * (u41j - u41jm1)
-               flux_(5 + 5) = 0.50d+00 * (1.0d+00 - c1 * c5) * ty3 * (u21j** 2 + u31j** 2 + u41j** 2 - (u21jm1** 2 + u31jm1** 2 + u4&
-     &1jm1** 2)) + 1.0d+00 / 6.0d+00 * ty3 * (u31j** 2 - u31jm1** 2) + c1 * c5 * ty3 * (u51j - u51jm1)
-               frct(i__39,j__38,k__37,1) = frct(i__39,j__38,k__37,1) + dy1 * ty1 * (rsd(i__39,j__38 - 1,k__37,1) - 2.0d+00 * rsd(i__&
-     &39,j__38,k__37,1) + rsd(i__39,j__38 + 1,k__37,1))
-               frct(i__39,j__38,k__37,2) = frct(i__39,j__38,k__37,2) + ty3 * c3 * c4 * (flux_(5 + 2) - flux_(2)) + dy2 * ty1 * (rsd(&
-     &i__39,j__38 - 1,k__37,2) - 2.0d+00 * rsd(i__39,j__38,k__37,2) + rsd(i__39,j__38 + 1,k__37,2))
-               frct(i__39,j__38,k__37,3) = frct(i__39,j__38,k__37,3) + ty3 * c3 * c4 * (flux_(5 + 3) - flux_(3)) + dy3 * ty1 * (rsd(&
-     &i__39,j__38 - 1,k__37,3) - 2.0d+00 * rsd(i__39,j__38,k__37,3) + rsd(i__39,j__38 + 1,k__37,3))
-               frct(i__39,j__38,k__37,4) = frct(i__39,j__38,k__37,4) + ty3 * c3 * c4 * (flux_(5 + 4) - flux_(4)) + dy4 * ty1 * (rsd(&
-     &i__39,j__38 - 1,k__37,4) - 2.0d+00 * rsd(i__39,j__38,k__37,4) + rsd(i__39,j__38 + 1,k__37,4))
-               frct(i__39,j__38,k__37,5) = frct(i__39,j__38,k__37,5) + ty3 * c3 * c4 * (flux_(5 + 5) - flux_(5)) + dy5 * ty1 * (rsd(&
-     &i__39,j__38 - 1,k__37,5) - 2.0d+00 * rsd(i__39,j__38,k__37,5) + rsd(i__39,j__38 + 1,k__37,5))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!SHADOW_RENEW (rsd(0:0,0:2,0:0,0:0))
-      do  k__37 = 2,nz - 1
-         do  j__38 = 2,2
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * ((+(5.0d+00)) * rsd(i__39,j__38,k__37,m__3&
-     &6) - 4.0d+00 * rsd(i__39,j__38 + 1,k__37,m__36) + rsd(i__39,j__38 + 2,k__37,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!SHADOW_RENEW (rsd(0:0,1:2,0:0,0:0)),
-      do  k__37 = 2,nz - 1
-         do  j__38 = 3,3
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * ((-(4.0d+00)) * rsd(i__39,j__38 - 1,k__37,&
-     &m__36) + 6.0d+00 * rsd(i__39,j__38,k__37,m__36) - 4.0d+00 * rsd(i__39,j__38 + 1,k__37,m__36) + rsd(i__39,j__38 + 2,k__37,m__36&
-     &))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      jst1 = 4
-      jend1 = ny - 3
-!DVM$ REGION 
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!SHADOW_RENEW (rsd(0:0,2:2,0:0,0:0))
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst1,jend1
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * (rsd(i__39,j__38 - 2,k__37,m__36) - 4.0d+0&
-     &0 * rsd(i__39,j__38 - 1,k__37,m__36) + 6.0d+00 * rsd(i__39,j__38,k__37,m__36) - 4.0d+00 * rsd(i__39,j__38 + 1,k__37,m__36) + r&
-     &sd(i__39,j__38 + 2,k__37,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!SHADOW_RENEW (rsd(0:0,2:1,0:0,0:0))
-      do  k__37 = 2,nz - 1
-         do  j__38 = ny - 2,ny - 2
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * (rsd(i__39,j__38 - 2,k__37,m__36) - 4.0d+0&
-     &0 * rsd(i__39,j__38 - 1,k__37,m__36) + 6.0d+00 * rsd(i__39,j__38,k__37,m__36) - 4.0d+00 * rsd(i__39,j__38 + 1,k__37,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!SHADOW_RENEW (rsd(0:0,2:0,0:0,0:0))
-      do  k__37 = 2,nz - 1
-         do  j__38 = ny - 1,ny - 1
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * (rsd(i__39,j__38 - 2,k__37,m__36) - 4.0d+0&
-     &0 * rsd(i__39,j__38 - 1,k__37,m__36) + 5.0d+00 * rsd(i__39,j__38,k__37,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36,u41,q,flux_)
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               flux_(1) = rsd(i__39,j__38,k__37 + 1,4)
-               u41 = rsd(i__39,j__38,k__37 + 1,4) / rsd(i__39,j__38,k__37 + 1,1)
-               q = 0.50d+00 * (rsd(i__39,j__38,k__37 + 1,2) * rsd(i__39,j__38,k__37 + 1,2) + rsd(i__39,j__38,k__37 + 1,3) * rsd(i__3&
-     &9,j__38,k__37 + 1,3) + rsd(i__39,j__38,k__37 + 1,4) * rsd(i__39,j__38,k__37 + 1,4)) / rsd(i__39,j__38,k__37 + 1,1)
-               flux_(2) = rsd(i__39,j__38,k__37 + 1,2) * u41
-               flux_(3) = rsd(i__39,j__38,k__37 + 1,3) * u41
-               flux_(4) = rsd(i__39,j__38,k__37 + 1,4) * u41 + c2 * (rsd(i__39,j__38,k__37 + 1,5) - q)
-               flux_(5) = (c1 * rsd(i__39,j__38,k__37 + 1,5) - c2 * q) * u41
-               flux_(6) = rsd(i__39,j__38,k__37 - 1,4)
-               u41 = rsd(i__39,j__38,k__37 - 1,4) / rsd(i__39,j__38,k__37 - 1,1)
-               q = 0.50d+00 * (rsd(i__39,j__38,k__37 - 1,2) * rsd(i__39,j__38,k__37 - 1,2) + rsd(i__39,j__38,k__37 - 1,3) * rsd(i__3&
-     &9,j__38,k__37 - 1,3) + rsd(i__39,j__38,k__37 - 1,4) * rsd(i__39,j__38,k__37 - 1,4)) / rsd(i__39,j__38,k__37 - 1,1)
-               flux_(7) = rsd(i__39,j__38,k__37 - 1,2) * u41
-               flux_(8) = rsd(i__39,j__38,k__37 - 1,3) * u41
-               flux_(9) = rsd(i__39,j__38,k__37 - 1,4) * u41 + c2 * (rsd(i__39,j__38,k__37 - 1,5) - q)
-               flux_(10) = (c1 * rsd(i__39,j__38,k__37 - 1,5) - c2 * q) * u41
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - tz2 * (flux_(m__36) - flux_(5 + m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (tmp,u21k,u31k,u41k,u51k,u21km1,u31km1,u41km1,u51km1,flux_)
-
-!SHADOW_RENEW (rsd(0:0,0:0,1:1,0:0))
-      do  k__37 = 2,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               tmp = 1.0d+00 / rsd(i__39,j__38,k__37,1)
-               u21k = tmp * rsd(i__39,j__38,k__37,2)
-               u31k = tmp * rsd(i__39,j__38,k__37,3)
-               u41k = tmp * rsd(i__39,j__38,k__37,4)
-               u51k = tmp * rsd(i__39,j__38,k__37,5)
-               tmp = 1.0d+00 / rsd(i__39,j__38,k__37 - 1,1)
-               u21km1 = tmp * rsd(i__39,j__38,k__37 - 1,2)
-               u31km1 = tmp * rsd(i__39,j__38,k__37 - 1,3)
-               u41km1 = tmp * rsd(i__39,j__38,k__37 - 1,4)
-               u51km1 = tmp * rsd(i__39,j__38,k__37 - 1,5)
-               flux_(2) = tz3 * (u21k - u21km1)
-               flux_(3) = tz3 * (u31k - u31km1)
-               flux_(4) = 4.0d+00 / 3.0d+00 * tz3 * (u41k - u41km1)
-               flux_(5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tz3 * (u21k** 2 + u31k** 2 + u41k** 2 - (u21km1** 2 + u31km1** 2 + u41km1&
-     &** 2)) + 1.0d+00 / 6.0d+00 * tz3 * (u41k** 2 - u41km1** 2) + c1 * c5 * tz3 * (u51k - u51km1)
-               tmp = 1.0d+00 / rsd(i__39,j__38,k__37 + 1,1)
-               u21k = tmp * rsd(i__39,j__38,k__37 + 1,2)
-               u31k = tmp * rsd(i__39,j__38,k__37 + 1,3)
-               u41k = tmp * rsd(i__39,j__38,k__37 + 1,4)
-               u51k = tmp * rsd(i__39,j__38,k__37 + 1,5)
-               tmp = 1.0d+00 / rsd(i__39,j__38,k__37,1)
-               u21km1 = tmp * rsd(i__39,j__38,k__37,2)
-               u31km1 = tmp * rsd(i__39,j__38,k__37,3)
-               u41km1 = tmp * rsd(i__39,j__38,k__37,4)
-               u51km1 = tmp * rsd(i__39,j__38,k__37,5)
-               flux_(5 + 2) = tz3 * (u21k - u21km1)
-               flux_(5 + 3) = tz3 * (u31k - u31km1)
-               flux_(5 + 4) = 4.0d+00 / 3.0d+00 * tz3 * (u41k - u41km1)
-               flux_(5 + 5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tz3 * (u21k** 2 + u31k** 2 + u41k** 2 - (u21km1** 2 + u31km1** 2 + u4&
-     &1km1** 2)) + 1.0d+00 / 6.0d+00 * tz3 * (u41k** 2 - u41km1** 2) + c1 * c5 * tz3 * (u51k - u51km1)
-               frct(i__39,j__38,k__37,1) = frct(i__39,j__38,k__37,1) + dz1 * tz1 * (rsd(i__39,j__38,k__37 + 1,1) - 2.0d+00 * rsd(i__&
-     &39,j__38,k__37,1) + rsd(i__39,j__38,k__37 - 1,1))
-               frct(i__39,j__38,k__37,2) = frct(i__39,j__38,k__37,2) + tz3 * c3 * c4 * (flux_(5 + 2) - flux_(2)) + dz2 * tz1 * (rsd(&
-     &i__39,j__38,k__37 + 1,2) - 2.0d+00 * rsd(i__39,j__38,k__37,2) + rsd(i__39,j__38,k__37 - 1,2))
-               frct(i__39,j__38,k__37,3) = frct(i__39,j__38,k__37,3) + tz3 * c3 * c4 * (flux_(5 + 3) - flux_(3)) + dz3 * tz1 * (rsd(&
-     &i__39,j__38,k__37 + 1,3) - 2.0d+00 * rsd(i__39,j__38,k__37,3) + rsd(i__39,j__38,k__37 - 1,3))
-               frct(i__39,j__38,k__37,4) = frct(i__39,j__38,k__37,4) + tz3 * c3 * c4 * (flux_(5 + 4) - flux_(4)) + dz4 * tz1 * (rsd(&
-     &i__39,j__38,k__37 + 1,4) - 2.0d+00 * rsd(i__39,j__38,k__37,4) + rsd(i__39,j__38,k__37 - 1,4))
-               frct(i__39,j__38,k__37,5) = frct(i__39,j__38,k__37,5) + tz3 * c3 * c4 * (flux_(5 + 5) - flux_(5)) + dz5 * tz1 * (rsd(&
-     &i__39,j__38,k__37 + 1,5) - 2.0d+00 * rsd(i__39,j__38,k__37,5) + rsd(i__39,j__38,k__37 - 1,5))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!, SHADOW_RENEW (rsd(0:0,0:0,0:2,0:0))
-      do  k__37 = 2,2
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * ((+(5.0d+00)) * rsd(i__39,j__38,k__37,m__3&
-     &6) - 4.0d+00 * rsd(i__39,j__38,k__37 + 1,m__36) + rsd(i__39,j__38,k__37 + 2,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!, SHADOW_RENEW (rsd(0:0,0:0,1:2,0:0))
-      do  k__37 = 3,3
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * ((-(4.0d+00)) * rsd(i__39,j__38,k__37 - 1,&
-     &m__36) + 6.0d+00 * rsd(i__39,j__38,k__37,m__36) - 4.0d+00 * rsd(i__39,j__38,k__37 + 1,m__36) + rsd(i__39,j__38,k__37 + 2,m__36&
-     &))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!, SHADOW_RENEW (rsd(0:0,0:0,2:2,0:0))
-      do  k__37 = 4,nz - 3
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * (rsd(i__39,j__38,k__37 - 2,m__36) - 4.0d+0&
-     &0 * rsd(i__39,j__38,k__37 - 1,m__36) + 6.0d+00 * rsd(i__39,j__38,k__37,m__36) - 4.0d+00 * rsd(i__39,j__38,k__37 + 1,m__36) + r&
-     &sd(i__39,j__38,k__37 + 2,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!, SHADOW_RENEW (rsd(0:0,0:0,2:1,0:0))    
-      do  k__37 = nz - 2,nz - 2
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * (rsd(i__39,j__38,k__37 - 2,m__36) - 4.0d+0&
-     &0 * rsd(i__39,j__38,k__37 - 1,m__36) + 6.0d+00 * rsd(i__39,j__38,k__37,m__36) - 4.0d+00 * rsd(i__39,j__38,k__37 + 1,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__37,j__38,i__39) ON frct(i__39,j__38,k__37,*),PRIVATE (m__36)
-
-!, SHADOW_RENEW (rsd(0:0,0:0,2:0,0:0))
-      do  k__37 = nz - 1,nz - 1
-         do  j__38 = jst,jend
-            do  i__39 = ist,iend
-               do  m__36 = 1,5
-                  frct(i__39,j__38,k__37,m__36) = frct(i__39,j__38,k__37,m__36) - dsspm * (rsd(i__39,j__38,k__37 - 2,m__36) - 4.0d+0&
-     &0 * rsd(i__39,j__38,k__37 - 1,m__36) + 5.0d+00 * rsd(i__39,j__38,k__37,m__36))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      tmp__43 = 1.0d+00 / (omega * (2.0d+00 - omega))
-!DVM$ REGION 
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-      do  k__84 = 1,nz
-         do  j__85 = 1,ny
-            do  i__86 = 1,nx
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = (-(frct(i__86,j__85,k__84,m__83)))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      l1__82 = 1
-      l2__81 = nx
-!DVM$ REGION 
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83,u21__75,q__76,flux_),SHADOW_RENEW (u(1:1,0:0,0:0,0:0))
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               flux_(1) = u(i__86 + 1,j__85,k__84,2)
-               u21__75 = u(i__86 + 1,j__85,k__84,2) / u(i__86 + 1,j__85,k__84,1)
-               q__76 = 0.50d+00 * (u(i__86 + 1,j__85,k__84,2) * u(i__86 + 1,j__85,k__84,2) + u(i__86 + 1,j__85,k__84,3) * u(i__86 + &
-     &1,j__85,k__84,3) + u(i__86 + 1,j__85,k__84,4) * u(i__86 + 1,j__85,k__84,4)) / u(i__86 + 1,j__85,k__84,1)
-               flux_(2) = u(i__86 + 1,j__85,k__84,2) * u21__75 + c2 * (u(i__86 + 1,j__85,k__84,5) - q__76)
-               flux_(3) = u(i__86 + 1,j__85,k__84,3) * u21__75
-               flux_(4) = u(i__86 + 1,j__85,k__84,4) * u21__75
-               flux_(5) = (c1 * u(i__86 + 1,j__85,k__84,5) - c2 * q__76) * u21__75
-               flux_(6) = u(i__86 - 1,j__85,k__84,2)
-               u21__75 = u(i__86 - 1,j__85,k__84,2) / u(i__86 - 1,j__85,k__84,1)
-               q__76 = 0.50d+00 * (u(i__86 - 1,j__85,k__84,2) * u(i__86 - 1,j__85,k__84,2) + u(i__86 - 1,j__85,k__84,3) * u(i__86 - &
-     &1,j__85,k__84,3) + u(i__86 - 1,j__85,k__84,4) * u(i__86 - 1,j__85,k__84,4)) / u(i__86 - 1,j__85,k__84,1)
-               flux_(7) = u(i__86 - 1,j__85,k__84,2) * u21__75 + c2 * (u(i__86 - 1,j__85,k__84,5) - q__76)
-               flux_(8) = u(i__86 - 1,j__85,k__84,3) * u21__75
-               flux_(9) = u(i__86 - 1,j__85,k__84,4) * u21__75
-               flux_(10) = (c1 * u(i__86 - 1,j__85,k__84,5) - c2 * q__76) * u21__75
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - tx2 * (flux_(m__83) - flux_(5 + m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (u21i__71,u31i__70,u41i__69,u51i__68,tmp__72,u21im1__59,u31im&
-!DVM$&1__58,u41im1__57,u51im1__56,flux_),SHADOW_RENEW (u(2:2,0:0,0:0,0:0))
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21i__71 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31i__70 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41i__69 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51i__68 = tmp__72 * u(i__86,j__85,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86 - 1,j__85,k__84,1)
-               u21im1__59 = tmp__72 * u(i__86 - 1,j__85,k__84,2)
-               u31im1__58 = tmp__72 * u(i__86 - 1,j__85,k__84,3)
-               u41im1__57 = tmp__72 * u(i__86 - 1,j__85,k__84,4)
-               u51im1__56 = tmp__72 * u(i__86 - 1,j__85,k__84,5)
-               flux_(2) = 4.0d+00 / 3.0d+00 * tx3 * (u21i__71 - u21im1__59)
-               flux_(3) = tx3 * (u31i__70 - u31im1__58)
-               flux_(4) = tx3 * (u41i__69 - u41im1__57)
-               flux_(5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tx3 * (u21i__71** 2 + u31i__70** 2 + u41i__69** 2 - (u21im1__59** 2 + u31&
-     &im1__58** 2 + u41im1__57** 2)) + 1.0d+00 / 6.0d+00 * tx3 * (u21i__71** 2 - u21im1__59** 2) + c1 * c5 * tx3 * (u51i__68 - u51im&
-     &1__56)
-               tmp__72 = 1.0d+00 / u(i__86 + 1,j__85,k__84,1)
-               u21i__71 = tmp__72 * u(i__86 + 1,j__85,k__84,2)
-               u31i__70 = tmp__72 * u(i__86 + 1,j__85,k__84,3)
-               u41i__69 = tmp__72 * u(i__86 + 1,j__85,k__84,4)
-               u51i__68 = tmp__72 * u(i__86 + 1,j__85,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21im1__59 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31im1__58 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41im1__57 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51im1__56 = tmp__72 * u(i__86,j__85,k__84,5)
-               flux_(5 + 2) = 4.0d+00 / 3.0d+00 * tx3 * (u21i__71 - u21im1__59)
-               flux_(5 + 3) = tx3 * (u31i__70 - u31im1__58)
-               flux_(5 + 4) = tx3 * (u41i__69 - u41im1__57)
-               flux_(5 + 5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tx3 * (u21i__71** 2 + u31i__70** 2 + u41i__69** 2 - (u21im1__59** 2 +&
-     & u31im1__58** 2 + u41im1__57** 2)) + 1.0d+00 / 6.0d+00 * tx3 * (u21i__71** 2 - u21im1__59** 2) + c1 * c5 * tx3 * (u51i__68 - u&
-     &51im1__56)
-               rsd(i__86,j__85,k__84,1) = rsd(i__86,j__85,k__84,1) + dx1 * tx1 * (u(i__86 - 1,j__85,k__84,1) - 2.0d+00 * u(i__86,j__&
-     &85,k__84,1) + u(i__86 + 1,j__85,k__84,1))
-               rsd(i__86,j__85,k__84,2) = rsd(i__86,j__85,k__84,2) + tx3 * c3 * c4 * (flux_(5 + 2) - flux_(2)) + dx2 * tx1 * (u(i__8&
-     &6 - 1,j__85,k__84,2) - 2.0d+00 * u(i__86,j__85,k__84,2) + u(i__86 + 1,j__85,k__84,2))
-               rsd(i__86,j__85,k__84,3) = rsd(i__86,j__85,k__84,3) + tx3 * c3 * c4 * (flux_(5 + 3) - flux_(3)) + dx3 * tx1 * (u(i__8&
-     &6 - 1,j__85,k__84,3) - 2.0d+00 * u(i__86,j__85,k__84,3) + u(i__86 + 1,j__85,k__84,3))
-               rsd(i__86,j__85,k__84,4) = rsd(i__86,j__85,k__84,4) + tx3 * c3 * c4 * (flux_(5 + 4) - flux_(4)) + dx4 * tx1 * (u(i__8&
-     &6 - 1,j__85,k__84,4) - 2.0d+00 * u(i__86,j__85,k__84,4) + u(i__86 + 1,j__85,k__84,4))
-               rsd(i__86,j__85,k__84,5) = rsd(i__86,j__85,k__84,5) + tx3 * c3 * c4 * (flux_(5 + 5) - flux_(5)) + dx5 * tx1 * (u(i__8&
-     &6 - 1,j__85,k__84,5) - 2.0d+00 * u(i__86,j__85,k__84,5) + u(i__86 + 1,j__85,k__84,5))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = 2,2
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * ((+(5.0d+00)) * u(i__86,j__85,k__84,m__83) - &
-     &4.0d+00 * u(i__86 + 1,j__85,k__84,m__83) + u(i__86 + 2,j__85,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = 3,3
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * ((-(4.0d+00)) * u(i__86 - 1,j__85,k__84,m__83&
-     &) + 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86 + 1,j__85,k__84,m__83) + u(i__86 + 2,j__85,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      ist1__80 = 4
-      iend1__79 = nx - 3
-!DVM$ REGION 
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = ist1__80,iend1__79
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * (u(i__86 - 2,j__85,k__84,m__83) - 4.0d+00 * u&
-     &(i__86 - 1,j__85,k__84,m__83) + 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86 + 1,j__85,k__84,m__83) + u(i__86 + 2,&
-     &j__85,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = nx - 2,nx - 2
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * (u(i__86 - 2,j__85,k__84,m__83) - 4.0d+00 * u&
-     &(i__86 - 1,j__85,k__84,m__83) + 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86 + 1,j__85,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = nx - 1,nx - 1
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * (u(i__86 - 2,j__85,k__84,m__83) - 4.0d+00 * u&
-     &(i__86 - 1,j__85,k__84,m__83) + 5.0d+00 * u(i__86,j__85,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      l1__82 = 1
-      l2__81 = ny
-!DVM$ REGION 
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83,u31__74,q__76,flux_),SHADOW_RENEW (u(0:0,1:1,0:0,0:0))
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               flux_(1) = u(i__86,j__85 + 1,k__84,3)
-               u31__74 = u(i__86,j__85 + 1,k__84,3) / u(i__86,j__85 + 1,k__84,1)
-               q__76 = 0.50d+00 * (u(i__86,j__85 + 1,k__84,2) * u(i__86,j__85 + 1,k__84,2) + u(i__86,j__85 + 1,k__84,3) * u(i__86,j_&
-     &_85 + 1,k__84,3) + u(i__86,j__85 + 1,k__84,4) * u(i__86,j__85 + 1,k__84,4)) / u(i__86,j__85 + 1,k__84,1)
-               flux_(2) = u(i__86,j__85 + 1,k__84,2) * u31__74
-               flux_(3) = u(i__86,j__85 + 1,k__84,3) * u31__74 + c2 * (u(i__86,j__85 + 1,k__84,5) - q__76)
-               flux_(4) = u(i__86,j__85 + 1,k__84,4) * u31__74
-               flux_(5) = (c1 * u(i__86,j__85 + 1,k__84,5) - c2 * q__76) * u31__74
-               flux_(6) = u(i__86,j__85 - 1,k__84,3)
-               u31__74 = u(i__86,j__85 - 1,k__84,3) / u(i__86,j__85 - 1,k__84,1)
-               q__76 = 0.50d+00 * (u(i__86,j__85 - 1,k__84,2) * u(i__86,j__85 - 1,k__84,2) + u(i__86,j__85 - 1,k__84,3) * u(i__86,j_&
-     &_85 - 1,k__84,3) + u(i__86,j__85 - 1,k__84,4) * u(i__86,j__85 - 1,k__84,4)) / u(i__86,j__85 - 1,k__84,1)
-               flux_(7) = u(i__86,j__85 - 1,k__84,2) * u31__74
-               flux_(8) = u(i__86,j__85 - 1,k__84,3) * u31__74 + c2 * (u(i__86,j__85 - 1,k__84,5) - q__76)
-               flux_(9) = u(i__86,j__85 - 1,k__84,4) * u31__74
-               flux_(10) = (c1 * u(i__86,j__85 - 1,k__84,5) - c2 * q__76) * u31__74
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - ty2 * (flux_(m__83) - flux_(5 + m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (tmp__72,u21j__67,u31j__66,u41j__65,u51j__64,u21jm1__55,u31jm&
-!DVM$&1__54,u41jm1__53,u51jm1__52,flux_),SHADOW_RENEW (u(0:0,2:2,2:2,0:0))
-
-!SHADOW_RENEW (u(0:0,1:1,0:0,0:0)
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21j__67 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31j__66 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41j__65 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51j__64 = tmp__72 * u(i__86,j__85,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85 - 1,k__84,1)
-               u21jm1__55 = tmp__72 * u(i__86,j__85 - 1,k__84,2)
-               u31jm1__54 = tmp__72 * u(i__86,j__85 - 1,k__84,3)
-               u41jm1__53 = tmp__72 * u(i__86,j__85 - 1,k__84,4)
-               u51jm1__52 = tmp__72 * u(i__86,j__85 - 1,k__84,5)
-               flux_(2) = ty3 * (u21j__67 - u21jm1__55)
-               flux_(3) = 4.0d+00 / 3.0d+00 * ty3 * (u31j__66 - u31jm1__54)
-               flux_(4) = ty3 * (u41j__65 - u41jm1__53)
-               flux_(5) = 0.50d+00 * (1.0d+00 - c1 * c5) * ty3 * (u21j__67** 2 + u31j__66** 2 + u41j__65** 2 - (u21jm1__55** 2 + u31&
-     &jm1__54** 2 + u41jm1__53** 2)) + 1.0d+00 / 6.0d+00 * ty3 * (u31j__66** 2 - u31jm1__54** 2) + c1 * c5 * ty3 * (u51j__64 - u51jm&
-     &1__52)
-               tmp__72 = 1.0d+00 / u(i__86,j__85 + 1,k__84,1)
-               u21j__67 = tmp__72 * u(i__86,j__85 + 1,k__84,2)
-               u31j__66 = tmp__72 * u(i__86,j__85 + 1,k__84,3)
-               u41j__65 = tmp__72 * u(i__86,j__85 + 1,k__84,4)
-               u51j__64 = tmp__72 * u(i__86,j__85 + 1,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21jm1__55 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31jm1__54 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41jm1__53 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51jm1__52 = tmp__72 * u(i__86,j__85,k__84,5)
-               flux_(5 + 2) = ty3 * (u21j__67 - u21jm1__55)
-               flux_(5 + 3) = 4.0d+00 / 3.0d+00 * ty3 * (u31j__66 - u31jm1__54)
-               flux_(5 + 4) = ty3 * (u41j__65 - u41jm1__53)
-               flux_(5 + 5) = 0.50d+00 * (1.0d+00 - c1 * c5) * ty3 * (u21j__67** 2 + u31j__66** 2 + u41j__65** 2 - (u21jm1__55** 2 +&
-     & u31jm1__54** 2 + u41jm1__53** 2)) + 1.0d+00 / 6.0d+00 * ty3 * (u31j__66** 2 - u31jm1__54** 2) + c1 * c5 * ty3 * (u51j__64 - u&
-     &51jm1__52)
-               rsd(i__86,j__85,k__84,1) = rsd(i__86,j__85,k__84,1) + dy1 * ty1 * (u(i__86,j__85 - 1,k__84,1) - 2.0d+00 * u(i__86,j__&
-     &85,k__84,1) + u(i__86,j__85 + 1,k__84,1))
-               rsd(i__86,j__85,k__84,2) = rsd(i__86,j__85,k__84,2) + ty3 * c3 * c4 * (flux_(5 + 2) - flux_(2)) + dy2 * ty1 * (u(i__8&
-     &6,j__85 - 1,k__84,2) - 2.0d+00 * u(i__86,j__85,k__84,2) + u(i__86,j__85 + 1,k__84,2))
-               rsd(i__86,j__85,k__84,3) = rsd(i__86,j__85,k__84,3) + ty3 * c3 * c4 * (flux_(5 + 3) - flux_(3)) + dy3 * ty1 * (u(i__8&
-     &6,j__85 - 1,k__84,3) - 2.0d+00 * u(i__86,j__85,k__84,3) + u(i__86,j__85 + 1,k__84,3))
-               rsd(i__86,j__85,k__84,4) = rsd(i__86,j__85,k__84,4) + ty3 * c3 * c4 * (flux_(5 + 4) - flux_(4)) + dy4 * ty1 * (u(i__8&
-     &6,j__85 - 1,k__84,4) - 2.0d+00 * u(i__86,j__85,k__84,4) + u(i__86,j__85 + 1,k__84,4))
-               rsd(i__86,j__85,k__84,5) = rsd(i__86,j__85,k__84,5) + ty3 * c3 * c4 * (flux_(5 + 5) - flux_(5)) + dy5 * ty1 * (u(i__8&
-     &6,j__85 - 1,k__84,5) - 2.0d+00 * u(i__86,j__85,k__84,5) + u(i__86,j__85 + 1,k__84,5))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!SHADOW_RENEW (u(0:0,0:2,0:0,0:0))
-      do  k__84 = 2,nz - 1
-         do  j__85 = 2,2
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * ((+(5.0d+00)) * u(i__86,j__85,k__84,m__83) - &
-     &4.0d+00 * u(i__86,j__85 + 1,k__84,m__83) + u(i__86,j__85 + 2,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!SHADOW_RENEW (u(0:0,1:2,0:0,0:0))
-      do  k__84 = 2,nz - 1
-         do  j__85 = 3,3
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * ((-(4.0d+00)) * u(i__86,j__85 - 1,k__84,m__83&
-     &) + 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85 + 1,k__84,m__83) + u(i__86,j__85 + 2,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      jst1__78 = 4
-      jend1__77 = ny - 3
-!DVM$ REGION 
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!SHADOW_RENEW (u(0:0,2:2,0:0,0:0))
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst1__78,jend1__77
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * (u(i__86,j__85 - 2,k__84,m__83) - 4.0d+00 * u&
-     &(i__86,j__85 - 1,k__84,m__83) + 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85 + 1,k__84,m__83) + u(i__86,j__8&
-     &5 + 2,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!SHADOW_RENEW (u(0:0,2:1,0:0,0:0))
-      do  k__84 = 2,nz - 1
-         do  j__85 = ny - 2,ny - 2
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * (u(i__86,j__85 - 2,k__84,m__83) - 4.0d+00 * u&
-     &(i__86,j__85 - 1,k__84,m__83) + 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85 + 1,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!SHADOW_RENEW (u(0:0,2:0,0:0,0:0))
-      do  k__84 = 2,nz - 1
-         do  j__85 = ny - 1,ny - 1
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * (u(i__86,j__85 - 2,k__84,m__83) - 4.0d+00 * u&
-     &(i__86,j__85 - 1,k__84,m__83) + 5.0d+00 * u(i__86,j__85,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83,u41__73,q__76,flux_),SHADOW_RENEW (u(0:0,0:0,1:1,0:0))
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               flux_(1) = u(i__86,j__85,k__84 + 1,4)
-               u41__73 = u(i__86,j__85,k__84 + 1,4) / u(i__86,j__85,k__84 + 1,1)
-               q__76 = 0.50d+00 * (u(i__86,j__85,k__84 + 1,2) * u(i__86,j__85,k__84 + 1,2) + u(i__86,j__85,k__84 + 1,3) * u(i__86,j_&
-     &_85,k__84 + 1,3) + u(i__86,j__85,k__84 + 1,4) * u(i__86,j__85,k__84 + 1,4)) / u(i__86,j__85,k__84 + 1,1)
-               flux_(2) = u(i__86,j__85,k__84 + 1,2) * u41__73
-               flux_(3) = u(i__86,j__85,k__84 + 1,3) * u41__73
-               flux_(4) = u(i__86,j__85,k__84 + 1,4) * u41__73 + c2 * (u(i__86,j__85,k__84 + 1,5) - q__76)
-               flux_(5) = (c1 * u(i__86,j__85,k__84 + 1,5) - c2 * q__76) * u41__73
-               flux_(6) = u(i__86,j__85,k__84 - 1,4)
-               u41__73 = u(i__86,j__85,k__84 - 1,4) / u(i__86,j__85,k__84 - 1,1)
-               q__76 = 0.50d+00 * (u(i__86,j__85,k__84 - 1,2) * u(i__86,j__85,k__84 - 1,2) + u(i__86,j__85,k__84 - 1,3) * u(i__86,j_&
-     &_85,k__84 - 1,3) + u(i__86,j__85,k__84 - 1,4) * u(i__86,j__85,k__84 - 1,4)) / u(i__86,j__85,k__84 - 1,1)
-               flux_(7) = u(i__86,j__85,k__84 - 1,2) * u41__73
-               flux_(8) = u(i__86,j__85,k__84 - 1,3) * u41__73
-               flux_(9) = u(i__86,j__85,k__84 - 1,4) * u41__73 + c2 * (u(i__86,j__85,k__84 - 1,5) - q__76)
-               flux_(10) = (c1 * u(i__86,j__85,k__84 - 1,5) - c2 * q__76) * u41__73
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - tz2 * (flux_(m__83) - flux_(5 + m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (tmp__72,u21k__63,u31k__62,u41k__61,u51k__60,u21km1__51,u31km&
-!DVM$&1__50,u41km1__49,u51km1__48,flux_)
-
-!SHADOW_RENEW (u(0:0,0:0,1:1,0:0)  
-      do  k__84 = 2,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21k__63 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31k__62 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41k__61 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51k__60 = tmp__72 * u(i__86,j__85,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84 - 1,1)
-               u21km1__51 = tmp__72 * u(i__86,j__85,k__84 - 1,2)
-               u31km1__50 = tmp__72 * u(i__86,j__85,k__84 - 1,3)
-               u41km1__49 = tmp__72 * u(i__86,j__85,k__84 - 1,4)
-               u51km1__48 = tmp__72 * u(i__86,j__85,k__84 - 1,5)
-               flux_(2) = tz3 * (u21k__63 - u21km1__51)
-               flux_(3) = tz3 * (u31k__62 - u31km1__50)
-               flux_(4) = 4.0d+00 / 3.0d+00 * tz3 * (u41k__61 - u41km1__49)
-               flux_(5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tz3 * (u21k__63** 2 + u31k__62** 2 + u41k__61** 2 - (u21km1__51** 2 + u31&
-     &km1__50** 2 + u41km1__49** 2)) + 1.0d+00 / 6.0d+00 * tz3 * (u41k__61** 2 - u41km1__49** 2) + c1 * c5 * tz3 * (u51k__60 - u51km&
-     &1__48)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84 + 1,1)
-               u21k__63 = tmp__72 * u(i__86,j__85,k__84 + 1,2)
-               u31k__62 = tmp__72 * u(i__86,j__85,k__84 + 1,3)
-               u41k__61 = tmp__72 * u(i__86,j__85,k__84 + 1,4)
-               u51k__60 = tmp__72 * u(i__86,j__85,k__84 + 1,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21km1__51 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31km1__50 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41km1__49 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51km1__48 = tmp__72 * u(i__86,j__85,k__84,5)
-               flux_(5 + 2) = tz3 * (u21k__63 - u21km1__51)
-               flux_(5 + 3) = tz3 * (u31k__62 - u31km1__50)
-               flux_(5 + 4) = 4.0d+00 / 3.0d+00 * tz3 * (u41k__61 - u41km1__49)
-               flux_(5 + 5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tz3 * (u21k__63** 2 + u31k__62** 2 + u41k__61** 2 - (u21km1__51** 2 +&
-     & u31km1__50** 2 + u41km1__49** 2)) + 1.0d+00 / 6.0d+00 * tz3 * (u41k__61** 2 - u41km1__49** 2) + c1 * c5 * tz3 * (u51k__60 - u&
-     &51km1__48)
-               rsd(i__86,j__85,k__84,1) = rsd(i__86,j__85,k__84,1) + dz1 * tz1 * (u(i__86,j__85,k__84 - 1,1) - 2.0d+00 * u(i__86,j__&
-     &85,k__84,1) + u(i__86,j__85,k__84 + 1,1))
-               rsd(i__86,j__85,k__84,2) = rsd(i__86,j__85,k__84,2) + tz3 * c3 * c4 * (flux_(5 + 2) - flux_(2)) + dz2 * tz1 * (u(i__8&
-     &6,j__85,k__84 - 1,2) - 2.0d+00 * u(i__86,j__85,k__84,2) + u(i__86,j__85,k__84 + 1,2))
-               rsd(i__86,j__85,k__84,3) = rsd(i__86,j__85,k__84,3) + tz3 * c3 * c4 * (flux_(5 + 3) - flux_(3)) + dz3 * tz1 * (u(i__8&
-     &6,j__85,k__84 - 1,3) - 2.0d+00 * u(i__86,j__85,k__84,3) + u(i__86,j__85,k__84 + 1,3))
-               rsd(i__86,j__85,k__84,4) = rsd(i__86,j__85,k__84,4) + tz3 * c3 * c4 * (flux_(5 + 4) - flux_(4)) + dz4 * tz1 * (u(i__8&
-     &6,j__85,k__84 - 1,4) - 2.0d+00 * u(i__86,j__85,k__84,4) + u(i__86,j__85,k__84 + 1,4))
-               rsd(i__86,j__85,k__84,5) = rsd(i__86,j__85,k__84,5) + tz3 * c3 * c4 * (flux_(5 + 5) - flux_(5)) + dz5 * tz1 * (u(i__8&
-     &6,j__85,k__84 - 1,5) - 2.0d+00 * u(i__86,j__85,k__84,5) + u(i__86,j__85,k__84 + 1,5))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!, SHADOW_RENEW (u(0:0,0:0,0:2,0:0))      
-      do  k__84 = 2,2
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * ((+(5.0d+00)) * u(i__86,j__85,k__84,m__83) - &
-     &4.0d+00 * u(i__86,j__85,k__84 + 1,m__83) + u(i__86,j__85,k__84 + 2,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!, SHADOW_RENEW (u(0:0,0:0,1:2,0:0))      
-      do  k__84 = 3,3
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * ((-(4.0d+00)) * u(i__86,j__85,k__84 - 1,m__83&
-     &) + 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85,k__84 + 1,m__83) + u(i__86,j__85,k__84 + 2,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!, SHADOW_RENEW (u(0:0,0:0,2:2,0:0))      
-      do  k__84 = 4,nz - 3
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * (u(i__86,j__85,k__84 - 2,m__83) - 4.0d+00 * u&
-     &(i__86,j__85,k__84 - 1,m__83) + 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85,k__84 + 1,m__83) + u(i__86,j__8&
-     &5,k__84 + 2,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!, SHADOW_RENEW (u(0:0,0:0,2:1,0:0))      
-      do  k__84 = nz - 2,nz - 2
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * (u(i__86,j__85,k__84 - 2,m__83) - 4.0d+00 * u&
-     &(i__86,j__85,k__84 - 1,m__83) + 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85,k__84 + 1,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83)
-
-!, SHADOW_RENEW (u(0:0,0:0,2:0,0:0))      
-      do  k__84 = nz - 1,nz - 1
-         do  j__85 = jst,jend
-            do  i__86 = ist,iend
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd(i__86,j__85,k__84,m__83) - dssp * (u(i__86,j__85,k__84 - 2,m__83) - 4.0d+00 * u&
-     &(i__86,j__85,k__84 - 1,m__83) + 5.0d+00 * u(i__86,j__85,k__84,m__83))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      v_1573_88 = isiz1 / 2 * 2 + 1
-      v_1573_87 = isiz2 / 2 * 2 + 1
-      do  m__89 = 1,5
-         rsdnm(m__89) = 0.0d+00
-      enddo  
-      r1 = 0.0d0
-      r2 = 0.0d0
-      r3 = 0.0d0
-      r4 = 0.0d0
-      r5 = 0.0d0
-!DVM$ REGION 
-!DVM$ PARALLEL (k__90,j__91,i__92) ON rsd(i__92,j__91,k__90,*),REDUCTION (sum(r1),sum(r2),sum(r3),sum(r4),sum(r5)),CUDA_BLOCK (32,4)
-      do  k__90 = 2,nz0 - 1
-         do  j__91 = jst,jend
-            do  i__92 = ist,iend
-               r1 = r1 + rsd(i__92,j__91,k__90,1) * rsd(i__92,j__91,k__90,1)
-               r2 = r2 + rsd(i__92,j__91,k__90,2) * rsd(i__92,j__91,k__90,2)
-               r3 = r3 + rsd(i__92,j__91,k__90,3) * rsd(i__92,j__91,k__90,3)
-               r4 = r4 + rsd(i__92,j__91,k__90,4) * rsd(i__92,j__91,k__90,4)
-               r5 = r5 + rsd(i__92,j__91,k__90,5) * rsd(i__92,j__91,k__90,5)
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      rsdnm(1) = r1
-      rsdnm(2) = r2
-      rsdnm(3) = r3
-      rsdnm(4) = r4
-      rsdnm(5) = r5
-      do  m__89 = 1,5
-         rsdnm(m__89) = sqrt (rsdnm(m__89) / ((nx0 - 2) * (ny0 - 2) * (nz0 - 2)))
-      enddo  
-      elapsed(1) = 0.0
-
-!      call etime(tarray)
-      t = dvtime ()
-      start(1) = t
-      if (touch .eq. 1) then
-         istep = 2
-      else  
-         istep = 1
-      endif  
-2045  mod_1150_40 = mod (istep,20)
-      if (mod_1150_40 .eq. 0 .or. istep .eq. itmax .or. istep .eq. 1) then
-         write (unit = *,fmt = 200) istep
-      endif  
-      r43 = 4.0d+00 / 3.0d+00
-      c1345 = c1 * c3 * c4 * c5
-      c34 = c3 * c4
-!DVM$ REGION 
-!DVM$ PARALLEL (k__97,j__95,i__96) ON rsd(i__96,j__95,k__97,*),PRIVATE (rsd_,tmat,tmp1,tmp__93,tmp2,tmp3,tmp_1,tmp_2,tmp_3),ACROSS (&
-!DVM$&rsd(1:0,1:0,1:0,0:0)),CUDA_BLOCK (16,16)
-      do  k__97 = 2,nz - 1
-         do  j__95 = jst,jend
-            do  i__96 = ist,iend
-               tmp1 = 1.0d+00 / u(i__96,j__95,k__97 - 1,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               tmp_1 = 1.0d+00 / u(i__96 - 1,j__95,k__97,1)
-               tmp_2 = tmp_1 * tmp_1
-               tmp_3 = tmp_1 * tmp_2
-               rsd_(1) = rsd(i__96,j__95,k__97,1) * dt
-               rsd_(2) = rsd(i__96,j__95,k__97,2) * dt
-               rsd_(3) = rsd(i__96,j__95,k__97,3) * dt
-               rsd_(4) = rsd(i__96,j__95,k__97,4) * dt
-               rsd_(5) = rsd(i__96,j__95,k__97,5) * dt
-               rsd_(1) = rsd_(1) - omega * ((-(dt)) * tz1 * dz1 * rsd(i__96,j__95,k__97 - 1,1) + (-(dt)) * tz2 * rsd(i__96,j__95,k__&
-     &97 - 1,4))
-               rsd_(2) = rsd_(2) - omega * (((-(dt)) * tz2 * ((-(u(i__96,j__95,k__97 - 1,2) * u(i__96,j__95,k__97 - 1,4))) * tmp2) -&
-     & dt * tz1 * ((-(c34)) * tmp2 * u(i__96,j__95,k__97 - 1,2))) * rsd(i__96,j__95,k__97 - 1,1) + ((-(dt)) * tz2 * (u(i__96,j__95,k&
-     &__97 - 1,4) * tmp1) - dt * tz1 * c34 * tmp1 - dt * tz1 * dz2) * rsd(i__96,j__95,k__97 - 1,2) + (-(dt)) * tz2 * (u(i__96,j__95,&
-     &k__97 - 1,2) * tmp1) * rsd(i__96,j__95,k__97 - 1,4))
-               rsd_(3) = rsd_(3) - omega * (((-(dt)) * tz2 * ((-(u(i__96,j__95,k__97 - 1,3) * u(i__96,j__95,k__97 - 1,4))) * tmp2) -&
-     & dt * tz1 * ((-(c34)) * tmp2 * u(i__96,j__95,k__97 - 1,3))) * rsd(i__96,j__95,k__97 - 1,1) + ((-(dt)) * tz2 * (u(i__96,j__95,k&
-     &__97 - 1,4) * tmp1) - dt * tz1 * (c34 * tmp1) - dt * tz1 * dz3) * rsd(i__96,j__95,k__97 - 1,3) + (-(dt)) * tz2 * (u(i__96,j__9&
-     &5,k__97 - 1,3) * tmp1) * rsd(i__96,j__95,k__97 - 1,4))
-               rsd_(4) = rsd_(4) - omega * (((-(dt)) * tz2 * ((-((u(i__96,j__95,k__97 - 1,4) * tmp1)** 2)) + 0.50d+00 * c2 * ((u(i__&
-     &96,j__95,k__97 - 1,2) * u(i__96,j__95,k__97 - 1,2) + u(i__96,j__95,k__97 - 1,3) * u(i__96,j__95,k__97 - 1,3) + u(i__96,j__95,k&
-     &__97 - 1,4) * u(i__96,j__95,k__97 - 1,4)) * tmp2)) - dt * tz1 * ((-(r43)) * c34 * tmp2 * u(i__96,j__95,k__97 - 1,4))) * rsd(i_&
-     &_96,j__95,k__97 - 1,1) + (-(dt)) * tz2 * ((-(c2)) * (u(i__96,j__95,k__97 - 1,2) * tmp1)) * rsd(i__96,j__95,k__97 - 1,2) + (-(d&
-     &t)) * tz2 * ((-(c2)) * (u(i__96,j__95,k__97 - 1,3) * tmp1)) * rsd(i__96,j__95,k__97 - 1,3) + ((-(dt)) * tz2 * (2.0d+00 - c2) *&
-     & (u(i__96,j__95,k__97 - 1,4) * tmp1) - dt * tz1 * (r43 * c34 * tmp1) - dt * tz1 * dz4) * rsd(i__96,j__95,k__97 - 1,4) + (-(dt)&
-     &) * tz2 * c2 * rsd(i__96,j__95,k__97 - 1,5))
-               rsd_(5) = rsd_(5) - omega * (((-(dt)) * tz2 * ((c2 * (u(i__96,j__95,k__97 - 1,2) * u(i__96,j__95,k__97 - 1,2) + u(i__&
-     &96,j__95,k__97 - 1,3) * u(i__96,j__95,k__97 - 1,3) + u(i__96,j__95,k__97 - 1,4) * u(i__96,j__95,k__97 - 1,4)) * tmp2 - c1 * (u&
-     &(i__96,j__95,k__97 - 1,5) * tmp1)) * (u(i__96,j__95,k__97 - 1,4) * tmp1)) - dt * tz1 * ((-(c34 - c1345)) * tmp3 * u(i__96,j__9&
-     &5,k__97 - 1,2)** 2 - (c34 - c1345) * tmp3 * u(i__96,j__95,k__97 - 1,3)** 2 - (r43 * c34 - c1345) * tmp3 * u(i__96,j__95,k__97 &
-     &- 1,4)** 2 - c1345 * tmp2 * u(i__96,j__95,k__97 - 1,5))) * rsd(i__96,j__95,k__97 - 1,1) + ((-(dt)) * tz2 * ((-(c2)) * (u(i__96&
-     &,j__95,k__97 - 1,2) * u(i__96,j__95,k__97 - 1,4)) * tmp2) - dt * tz1 * (c34 - c1345) * tmp2 * u(i__96,j__95,k__97 - 1,2)) * rs&
-     &d(i__96,j__95,k__97 - 1,2) + ((-(dt)) * tz2 * ((-(c2)) * (u(i__96,j__95,k__97 - 1,3) * u(i__96,j__95,k__97 - 1,4)) * tmp2) - d&
-     &t * tz1 * (c34 - c1345) * tmp2 * u(i__96,j__95,k__97 - 1,3)) * rsd(i__96,j__95,k__97 - 1,3) + ((-(dt)) * tz2 * (c1 * (u(i__96,&
-     &j__95,k__97 - 1,5) * tmp1) - 0.50d+00 * c2 * ((u(i__96,j__95,k__97 - 1,2) * u(i__96,j__95,k__97 - 1,2) + u(i__96,j__95,k__97 -&
-     & 1,3) * u(i__96,j__95,k__97 - 1,3) + 3.0d+00 * u(i__96,j__95,k__97 - 1,4) * u(i__96,j__95,k__97 - 1,4)) * tmp2)) - dt * tz1 * &
-     &(r43 * c34 - c1345) * tmp2 * u(i__96,j__95,k__97 - 1,4)) * rsd(i__96,j__95,k__97 - 1,4) + ((-(dt)) * tz2 * (c1 * (u(i__96,j__9&
-     &5,k__97 - 1,4) * tmp1)) - dt * tz1 * c1345 * tmp1 - dt * tz1 * dz5) * rsd(i__96,j__95,k__97 - 1,5))
-               tmp1 = 1.0d+00 / u(i__96,j__95 - 1,k__97,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               rsd_(1) = rsd_(1) - omega * ((-(dt)) * ty1 * dy1 * rsd(i__96,j__95 - 1,k__97,1) + (-(dt)) * tx1 * dx1 * rsd(i__96 - 1&
-     &,j__95,k__97,1) + (-(dt)) * tx2 * rsd(i__96 - 1,j__95,k__97,2) + (-(dt)) * ty2 * rsd(i__96,j__95 - 1,k__97,3))
-               rsd_(2) = rsd_(2) - omega * (((-(dt)) * ty2 * ((-(u(i__96,j__95 - 1,k__97,2) * u(i__96,j__95 - 1,k__97,3))) * tmp2) -&
-     & dt * ty1 * ((-(c34)) * tmp2 * u(i__96,j__95 - 1,k__97,2))) * rsd(i__96,j__95 - 1,k__97,1) + ((-(dt)) * tx2 * ((-((u(i__96 - 1&
-     &,j__95,k__97,2) * tmp_1)** 2)) + c2 * 0.50d+00 * (u(i__96 - 1,j__95,k__97,2) * u(i__96 - 1,j__95,k__97,2) + u(i__96 - 1,j__95,&
-     &k__97,3) * u(i__96 - 1,j__95,k__97,3) + u(i__96 - 1,j__95,k__97,4) * u(i__96 - 1,j__95,k__97,4)) * tmp_2) - dt * tx1 * ((-(r43&
-     &)) * c34 * tmp_2 * u(i__96 - 1,j__95,k__97,2))) * rsd(i__96 - 1,j__95,k__97,1) + ((-(dt)) * ty2 * (u(i__96,j__95 - 1,k__97,3) &
-     &* tmp1) - dt * ty1 * (c34 * tmp1) - dt * ty1 * dy2) * rsd(i__96,j__95 - 1,k__97,2) + ((-(dt)) * tx2 * ((2.0d+00 - c2) * (u(i__&
-     &96 - 1,j__95,k__97,2) * tmp_1)) - dt * tx1 * (r43 * c34 * tmp_1) - dt * tx1 * dx2) * rsd(i__96 - 1,j__95,k__97,2) + (-(dt)) * &
-     &ty2 * (u(i__96,j__95 - 1,k__97,2) * tmp1) * rsd(i__96,j__95 - 1,k__97,3) + (-(dt)) * tx2 * ((-(c2)) * (u(i__96 - 1,j__95,k__97&
-     &,3) * tmp_1)) * rsd(i__96 - 1,j__95,k__97,3) + (-(dt)) * tx2 * ((-(c2)) * (u(i__96 - 1,j__95,k__97,4) * tmp_1)) * rsd(i__96 - &
-     &1,j__95,k__97,4) + (-(dt)) * tx2 * c2 * rsd(i__96 - 1,j__95,k__97,5))
-               rsd_(3) = rsd_(3) - omega * (((-(dt)) * ty2 * ((-((u(i__96,j__95 - 1,k__97,3) * tmp1)** 2)) + 0.50d+00 * c2 * ((u(i__&
-     &96,j__95 - 1,k__97,2) * u(i__96,j__95 - 1,k__97,2) + u(i__96,j__95 - 1,k__97,3) * u(i__96,j__95 - 1,k__97,3) + u(i__96,j__95 -&
-     & 1,k__97,4) * u(i__96,j__95 - 1,k__97,4)) * tmp2)) - dt * ty1 * ((-(r43)) * c34 * tmp2 * u(i__96,j__95 - 1,k__97,3))) * rsd(i_&
-     &_96,j__95 - 1,k__97,1) + ((-(dt)) * tx2 * ((-(u(i__96 - 1,j__95,k__97,2) * u(i__96 - 1,j__95,k__97,3))) * tmp_2) - dt * tx1 * &
-     &((-(c34)) * tmp_2 * u(i__96 - 1,j__95,k__97,3))) * rsd(i__96 - 1,j__95,k__97,1) + (-(dt)) * ty2 * ((-(c2)) * (u(i__96,j__95 - &
-     &1,k__97,2) * tmp1)) * rsd(i__96,j__95 - 1,k__97,2) + (-(dt)) * tx2 * (u(i__96 - 1,j__95,k__97,3) * tmp_1) * rsd(i__96 - 1,j__9&
-     &5,k__97,2) + ((-(dt)) * ty2 * ((2.0d+00 - c2) * (u(i__96,j__95 - 1,k__97,3) * tmp1)) - dt * ty1 * (r43 * c34 * tmp1) - dt * ty&
-     &1 * dy3) * rsd(i__96,j__95 - 1,k__97,3) + ((-(dt)) * tx2 * (u(i__96 - 1,j__95,k__97,2) * tmp_1) - dt * tx1 * (c34 * tmp_1) - d&
-     &t * tx1 * dx3) * rsd(i__96 - 1,j__95,k__97,3) + (-(dt)) * ty2 * ((-(c2)) * (u(i__96,j__95 - 1,k__97,4) * tmp1)) * rsd(i__96,j_&
-     &_95 - 1,k__97,4) + (-(dt)) * ty2 * c2 * rsd(i__96,j__95 - 1,k__97,5))
-               rsd_(4) = rsd_(4) - omega * (((-(dt)) * ty2 * ((-(u(i__96,j__95 - 1,k__97,3) * u(i__96,j__95 - 1,k__97,4))) * tmp2) -&
-     & dt * ty1 * ((-(c34)) * tmp2 * u(i__96,j__95 - 1,k__97,4))) * rsd(i__96,j__95 - 1,k__97,1) + ((-(dt)) * tx2 * ((-(u(i__96 - 1,&
-     &j__95,k__97,2) * u(i__96 - 1,j__95,k__97,4))) * tmp_2) - dt * tx1 * ((-(c34)) * tmp_2 * u(i__96 - 1,j__95,k__97,4))) * rsd(i__&
-     &96 - 1,j__95,k__97,1) + (-(dt)) * tx2 * (u(i__96 - 1,j__95,k__97,4) * tmp_1) * rsd(i__96 - 1,j__95,k__97,2) + (-(dt)) * ty2 * &
-     &(u(i__96,j__95 - 1,k__97,4) * tmp1) * rsd(i__96,j__95 - 1,k__97,3) + ((-(dt)) * ty2 * (u(i__96,j__95 - 1,k__97,3) * tmp1) - dt&
-     & * ty1 * (c34 * tmp1) - dt * ty1 * dy4) * rsd(i__96,j__95 - 1,k__97,4) + ((-(dt)) * tx2 * (u(i__96 - 1,j__95,k__97,2) * tmp_1)&
-     & - dt * tx1 * (c34 * tmp_1) - dt * tx1 * dx4) * rsd(i__96 - 1,j__95,k__97,4))
-               rsd_(5) = rsd_(5) - omega * (((-(dt)) * ty2 * ((c2 * (u(i__96,j__95 - 1,k__97,2) * u(i__96,j__95 - 1,k__97,2) + u(i__&
-     &96,j__95 - 1,k__97,3) * u(i__96,j__95 - 1,k__97,3) + u(i__96,j__95 - 1,k__97,4) * u(i__96,j__95 - 1,k__97,4)) * tmp2 - c1 * (u&
-     &(i__96,j__95 - 1,k__97,5) * tmp1)) * (u(i__96,j__95 - 1,k__97,3) * tmp1)) - dt * ty1 * ((-(c34 - c1345)) * tmp3 * u(i__96,j__9&
-     &5 - 1,k__97,2)** 2 - (r43 * c34 - c1345) * tmp3 * u(i__96,j__95 - 1,k__97,3)** 2 - (c34 - c1345) * tmp3 * u(i__96,j__95 - 1,k_&
-     &_97,4)** 2 - c1345 * tmp2 * u(i__96,j__95 - 1,k__97,5))) * rsd(i__96,j__95 - 1,k__97,1) + ((-(dt)) * tx2 * ((c2 * (u(i__96 - 1&
-     &,j__95,k__97,2) * u(i__96 - 1,j__95,k__97,2) + u(i__96 - 1,j__95,k__97,3) * u(i__96 - 1,j__95,k__97,3) + u(i__96 - 1,j__95,k__&
-     &97,4) * u(i__96 - 1,j__95,k__97,4)) * tmp_2 - c1 * (u(i__96 - 1,j__95,k__97,5) * tmp_1)) * (u(i__96 - 1,j__95,k__97,2) * tmp_1&
-     &)) - dt * tx1 * ((-(r43 * c34 - c1345)) * tmp_3 * u(i__96 - 1,j__95,k__97,2)** 2 - (c34 - c1345) * tmp_3 * u(i__96 - 1,j__95,k&
-     &__97,3)** 2 - (c34 - c1345) * tmp_3 * u(i__96 - 1,j__95,k__97,4)** 2 - c1345 * tmp_2 * u(i__96 - 1,j__95,k__97,5))) * rsd(i__9&
-     &6 - 1,j__95,k__97,1) + ((-(dt)) * ty2 * ((-(c2)) * (u(i__96,j__95 - 1,k__97,2) * u(i__96,j__95 - 1,k__97,3)) * tmp2) - dt * ty&
-     &1 * (c34 - c1345) * tmp2 * u(i__96,j__95 - 1,k__97,2)) * rsd(i__96,j__95 - 1,k__97,2) + ((-(dt)) * tx2 * (c1 * (u(i__96 - 1,j_&
-     &_95,k__97,5) * tmp_1) - 0.50d+00 * c2 * ((3.0d+00 * u(i__96 - 1,j__95,k__97,2) * u(i__96 - 1,j__95,k__97,2) + u(i__96 - 1,j__9&
-     &5,k__97,3) * u(i__96 - 1,j__95,k__97,3) + u(i__96 - 1,j__95,k__97,4) * u(i__96 - 1,j__95,k__97,4)) * tmp_2)) - dt * tx1 * (r43&
-     & * c34 - c1345) * tmp_2 * u(i__96 - 1,j__95,k__97,2)) * rsd(i__96 - 1,j__95,k__97,2) + ((-(dt)) * ty2 * (c1 * (u(i__96,j__95 -&
-     & 1,k__97,5) * tmp1) - 0.50d+00 * c2 * ((u(i__96,j__95 - 1,k__97,2) * u(i__96,j__95 - 1,k__97,2) + 3.0d+00 * u(i__96,j__95 - 1,&
-     &k__97,3) * u(i__96,j__95 - 1,k__97,3) + u(i__96,j__95 - 1,k__97,4) * u(i__96,j__95 - 1,k__97,4)) * tmp2)) - dt * ty1 * (r43 * &
-     &c34 - c1345) * tmp2 * u(i__96,j__95 - 1,k__97,3)) * rsd(i__96,j__95 - 1,k__97,3) + ((-(dt)) * tx2 * ((-(c2)) * (u(i__96 - 1,j_&
-     &_95,k__97,3) * u(i__96 - 1,j__95,k__97,2)) * tmp_2) - dt * tx1 * (c34 - c1345) * tmp_2 * u(i__96 - 1,j__95,k__97,3)) * rsd(i__&
-     &96 - 1,j__95,k__97,3) + ((-(dt)) * ty2 * ((-(c2)) * (u(i__96,j__95 - 1,k__97,3) * u(i__96,j__95 - 1,k__97,4)) * tmp2) - dt * t&
-     &y1 * (c34 - c1345) * tmp2 * u(i__96,j__95 - 1,k__97,4)) * rsd(i__96,j__95 - 1,k__97,4) + ((-(dt)) * tx2 * ((-(c2)) * (u(i__96 &
-     &- 1,j__95,k__97,4) * u(i__96 - 1,j__95,k__97,2)) * tmp_2) - dt * tx1 * (c34 - c1345) * tmp_2 * u(i__96 - 1,j__95,k__97,4)) * r&
-     &sd(i__96 - 1,j__95,k__97,4) + ((-(dt)) * ty2 * (c1 * (u(i__96,j__95 - 1,k__97,3) * tmp1)) - dt * ty1 * c1345 * tmp1 - dt * ty1&
-     & * dy5) * rsd(i__96,j__95 - 1,k__97,5) + ((-(dt)) * tx2 * (c1 * (u(i__96 - 1,j__95,k__97,2) * tmp_1)) - dt * tx1 * c1345 * tmp&
-     &_1 - dt * tx1 * dx5) * rsd(i__96 - 1,j__95,k__97,5))
-               tmp1 = 1.0d+00 / u(i__96,j__95,k__97,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               tmat(1,1) = 1.0d+00 + dt * 2.0d+00 * (tx1 * dx1 + ty1 * dy1 + tz1 * dz1)
-               tmat(1,2) = 0.0d+00
-               tmat(1,3) = 0.0d+00
-               tmat(1,4) = 0.0d+00
-               tmat(1,5) = 0.0d+00
-               tmat(2,1) = dt * 2.0d+00 * (tx1 * ((-(r43)) * c34 * tmp2 * u(i__96,j__95,k__97,2)) + ty1 * ((-(c34)) * tmp2 * u(i__96&
-     &,j__95,k__97,2)) + tz1 * ((-(c34)) * tmp2 * u(i__96,j__95,k__97,2)))
-               tmat(2,2) = 1.0d+00 + dt * 2.0d+00 * (tx1 * r43 * c34 * tmp1 + ty1 * c34 * tmp1 + tz1 * c34 * tmp1) + dt * 2.0d+00 * &
-     &(tx1 * dx2 + ty1 * dy2 + tz1 * dz2)
-               tmat(2,3) = 0.0d+00
-               tmat(2,4) = 0.0d+00
-               tmat(2,5) = 0.0d+00
-               tmat(3,1) = dt * 2.0d+00 * (tx1 * ((-(c34)) * tmp2 * u(i__96,j__95,k__97,3)) + ty1 * ((-(r43)) * c34 * tmp2 * u(i__96&
-     &,j__95,k__97,3)) + tz1 * ((-(c34)) * tmp2 * u(i__96,j__95,k__97,3)))
-               tmat(3,2) = 0.0d+00
-               tmat(3,3) = 1.0d+00 + dt * 2.0d+00 * (tx1 * c34 * tmp1 + ty1 * r43 * c34 * tmp1 + tz1 * c34 * tmp1) + dt * 2.0d+00 * &
-     &(tx1 * dx3 + ty1 * dy3 + tz1 * dz3)
-               tmat(3,4) = 0.0d+00
-               tmat(3,5) = 0.0d+00
-               tmat(4,1) = dt * 2.0d+00 * (tx1 * ((-(c34)) * tmp2 * u(i__96,j__95,k__97,4)) + ty1 * ((-(c34)) * tmp2 * u(i__96,j__95&
-     &,k__97,4)) + tz1 * ((-(r43)) * c34 * tmp2 * u(i__96,j__95,k__97,4)))
-               tmat(4,2) = 0.0d+00
-               tmat(4,3) = 0.0d+00
-               tmat(4,4) = 1.0d+00 + dt * 2.0d+00 * (tx1 * c34 * tmp1 + ty1 * c34 * tmp1 + tz1 * r43 * c34 * tmp1) + dt * 2.0d+00 * &
-     &(tx1 * dx4 + ty1 * dy4 + tz1 * dz4)
-               tmat(4,5) = 0.0d+00
-               tmat(5,1) = dt * 2.0d+00 * (tx1 * ((-(r43 * c34 - c1345)) * tmp3 * u(i__96,j__95,k__97,2)** 2 - (c34 - c1345) * tmp3 &
-     &* u(i__96,j__95,k__97,3)** 2 - (c34 - c1345) * tmp3 * u(i__96,j__95,k__97,4)** 2 - c1345 * tmp2 * u(i__96,j__95,k__97,5)) + ty&
-     &1 * ((-(c34 - c1345)) * tmp3 * u(i__96,j__95,k__97,2)** 2 - (r43 * c34 - c1345) * tmp3 * u(i__96,j__95,k__97,3)** 2 - (c34 - c&
-     &1345) * tmp3 * u(i__96,j__95,k__97,4)** 2 - c1345 * tmp2 * u(i__96,j__95,k__97,5)) + tz1 * ((-(c34 - c1345)) * tmp3 * u(i__96,&
-     &j__95,k__97,2)** 2 - (c34 - c1345) * tmp3 * u(i__96,j__95,k__97,3)** 2 - (r43 * c34 - c1345) * tmp3 * u(i__96,j__95,k__97,4)**&
-     & 2 - c1345 * tmp2 * u(i__96,j__95,k__97,5)))
-               tmat(5,2) = dt * 2.0d+00 * (tx1 * (r43 * c34 - c1345) * tmp2 * u(i__96,j__95,k__97,2) + ty1 * (c34 - c1345) * tmp2 * &
-     &u(i__96,j__95,k__97,2) + tz1 * (c34 - c1345) * tmp2 * u(i__96,j__95,k__97,2))
-               tmat(5,3) = dt * 2.0d+00 * (tx1 * (c34 - c1345) * tmp2 * u(i__96,j__95,k__97,3) + ty1 * (r43 * c34 - c1345) * tmp2 * &
-     &u(i__96,j__95,k__97,3) + tz1 * (c34 - c1345) * tmp2 * u(i__96,j__95,k__97,3))
-               tmat(5,4) = dt * 2.0d+00 * (tx1 * (c34 - c1345) * tmp2 * u(i__96,j__95,k__97,4) + ty1 * (c34 - c1345) * tmp2 * u(i__9&
-     &6,j__95,k__97,4) + tz1 * (r43 * c34 - c1345) * tmp2 * u(i__96,j__95,k__97,4))
-               tmat(5,5) = 1.0d+00 + dt * 2.0d+00 * (tx1 * c1345 * tmp1 + ty1 * c1345 * tmp1 + tz1 * c1345 * tmp1) + dt * 2.0d+00 * &
-     &(tx1 * dx5 + ty1 * dy5 + tz1 * dz5)
-               tmp1 = 1.0d+00 / tmat(1,1)
-               tmp__93 = tmp1 * tmat(2,1)
-               tmat(2,2) = tmat(2,2) - tmp__93 * tmat(1,2)
-               tmat(2,3) = tmat(2,3) - tmp__93 * tmat(1,3)
-               tmat(2,4) = tmat(2,4) - tmp__93 * tmat(1,4)
-               tmat(2,5) = tmat(2,5) - tmp__93 * tmat(1,5)
-               rsd_(2) = rsd_(2) - rsd_(1) * tmp__93
-               tmp__93 = tmp1 * tmat(3,1)
-               tmat(3,2) = tmat(3,2) - tmp__93 * tmat(1,2)
-               tmat(3,3) = tmat(3,3) - tmp__93 * tmat(1,3)
-               tmat(3,4) = tmat(3,4) - tmp__93 * tmat(1,4)
-               tmat(3,5) = tmat(3,5) - tmp__93 * tmat(1,5)
-               rsd_(3) = rsd_(3) - rsd_(1) * tmp__93
-               tmp__93 = tmp1 * tmat(4,1)
-               tmat(4,2) = tmat(4,2) - tmp__93 * tmat(1,2)
-               tmat(4,3) = tmat(4,3) - tmp__93 * tmat(1,3)
-               tmat(4,4) = tmat(4,4) - tmp__93 * tmat(1,4)
-               tmat(4,5) = tmat(4,5) - tmp__93 * tmat(1,5)
-               rsd_(4) = rsd_(4) - rsd_(1) * tmp__93
-               tmp__93 = tmp1 * tmat(5,1)
-               tmat(5,2) = tmat(5,2) - tmp__93 * tmat(1,2)
-               tmat(5,3) = tmat(5,3) - tmp__93 * tmat(1,3)
-               tmat(5,4) = tmat(5,4) - tmp__93 * tmat(1,4)
-               tmat(5,5) = tmat(5,5) - tmp__93 * tmat(1,5)
-               rsd_(5) = rsd_(5) - rsd_(1) * tmp__93
-               tmp1 = 1.0d+00 / tmat(2,2)
-               tmp__93 = tmp1 * tmat(3,2)
-               tmat(3,3) = tmat(3,3) - tmp__93 * tmat(2,3)
-               tmat(3,4) = tmat(3,4) - tmp__93 * tmat(2,4)
-               tmat(3,5) = tmat(3,5) - tmp__93 * tmat(2,5)
-               rsd_(3) = rsd_(3) - rsd_(2) * tmp__93
-               tmp__93 = tmp1 * tmat(4,2)
-               tmat(4,3) = tmat(4,3) - tmp__93 * tmat(2,3)
-               tmat(4,4) = tmat(4,4) - tmp__93 * tmat(2,4)
-               tmat(4,5) = tmat(4,5) - tmp__93 * tmat(2,5)
-               rsd_(4) = rsd_(4) - rsd_(2) * tmp__93
-               tmp__93 = tmp1 * tmat(5,2)
-               tmat(5,3) = tmat(5,3) - tmp__93 * tmat(2,3)
-               tmat(5,4) = tmat(5,4) - tmp__93 * tmat(2,4)
-               tmat(5,5) = tmat(5,5) - tmp__93 * tmat(2,5)
-               rsd_(5) = rsd_(5) - rsd_(2) * tmp__93
-               tmp1 = 1.0d+00 / tmat(3,3)
-               tmp__93 = tmp1 * tmat(4,3)
-               tmat(4,4) = tmat(4,4) - tmp__93 * tmat(3,4)
-               tmat(4,5) = tmat(4,5) - tmp__93 * tmat(3,5)
-               rsd_(4) = rsd_(4) - rsd_(3) * tmp__93
-               tmp__93 = tmp1 * tmat(5,3)
-               tmat(5,4) = tmat(5,4) - tmp__93 * tmat(3,4)
-               tmat(5,5) = tmat(5,5) - tmp__93 * tmat(3,5)
-               rsd_(5) = rsd_(5) - rsd_(3) * tmp__93
-               tmp1 = 1.0d+00 / tmat(4,4)
-               tmp__93 = tmp1 * tmat(5,4)
-               tmat(5,5) = tmat(5,5) - tmp__93 * tmat(4,5)
-               rsd_(5) = rsd_(5) - rsd_(4) * tmp__93
-               rsd_(5) = rsd_(5) / tmat(5,5)
-               rsd_(4) = rsd_(4) - tmat(4,5) * rsd_(5)
-               rsd_(4) = rsd_(4) / tmat(4,4)
-               rsd_(3) = rsd_(3) - tmat(3,4) * rsd_(4) - tmat(3,5) * rsd_(5)
-               rsd_(3) = rsd_(3) / tmat(3,3)
-               rsd_(2) = rsd_(2) - tmat(2,3) * rsd_(3) - tmat(2,4) * rsd_(4) - tmat(2,5) * rsd_(5)
-               rsd_(2) = rsd_(2) / tmat(2,2)
-               rsd_(1) = rsd_(1) - tmat(1,2) * rsd_(2) - tmat(1,3) * rsd_(3) - tmat(1,4) * rsd_(4) - tmat(1,5) * rsd_(5)
-               rsd_(1) = rsd_(1) / tmat(1,1)
-               rsd(i__96,j__95,k__97,1) = rsd_(1)
-               rsd(i__96,j__95,k__97,2) = rsd_(2)
-               rsd(i__96,j__95,k__97,3) = rsd_(3)
-               rsd(i__96,j__95,k__97,4) = rsd_(4)
-               rsd(i__96,j__95,k__97,5) = rsd_(5)
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      r43__108 = 4.0d+00 / 3.0d+00
-      c1345__107 = c1 * c3 * c4 * c5
-      c34__106 = c3 * c4
-!DVM$ REGION 
-!DVM$ PARALLEL (k__109,j__101,i__102) ON rsd(i__102,j__101,k__109,*),PRIVATE (tmat__98,tmp1__105,tmp__99,tmp2__104,tmp3__103,tmp1,tm&
-!DVM$&p2,tmp3,tv),ACROSS (rsd(0:1,0:1,0:1,0:0)),CUDA_BLOCK (16,16)
-      do  k__109 = nz - 1,2,(-(1))
-         do  j__101 = jend,jst,(-(1))
-            do  i__102 = iend,ist,(-(1))
-               tmp1__105 = 1.0d+00 / u(i__102,j__101,k__109 + 1,1)
-               tmp2__104 = tmp1__105 * tmp1__105
-               tmp3__103 = tmp1__105 * tmp2__104
-               tv(1) = omega * ((-(dt)) * tz1 * dz1 * rsd(i__102,j__101,k__109 + 1,1) + dt * tz2 * rsd(i__102,j__101,k__109 + 1,4))
-               tv(2) = omega * ((dt * tz2 * ((-(u(i__102,j__101,k__109 + 1,2) * u(i__102,j__101,k__109 + 1,4))) * tmp2__104) - dt * &
-     &tz1 * ((-(c34__106)) * tmp2__104 * u(i__102,j__101,k__109 + 1,2))) * rsd(i__102,j__101,k__109 + 1,1) + (dt * tz2 * (u(i__102,j&
-     &__101,k__109 + 1,4) * tmp1__105) - dt * tz1 * c34__106 * tmp1__105 - dt * tz1 * dz2) * rsd(i__102,j__101,k__109 + 1,2) + dt * &
-     &tz2 * (u(i__102,j__101,k__109 + 1,2) * tmp1__105) * rsd(i__102,j__101,k__109 + 1,4))
-               tv(3) = omega * ((dt * tz2 * ((-(u(i__102,j__101,k__109 + 1,3) * u(i__102,j__101,k__109 + 1,4))) * tmp2__104) - dt * &
-     &tz1 * ((-(c34__106)) * tmp2__104 * u(i__102,j__101,k__109 + 1,3))) * rsd(i__102,j__101,k__109 + 1,1) + (dt * tz2 * (u(i__102,j&
-     &__101,k__109 + 1,4) * tmp1__105) - dt * tz1 * (c34__106 * tmp1__105) - dt * tz1 * dz3) * rsd(i__102,j__101,k__109 + 1,3) + dt &
-     &* tz2 * (u(i__102,j__101,k__109 + 1,3) * tmp1__105) * rsd(i__102,j__101,k__109 + 1,4))
-               tv(4) = omega * ((dt * tz2 * ((-((u(i__102,j__101,k__109 + 1,4) * tmp1__105)** 2)) + 0.50d+00 * c2 * ((u(i__102,j__10&
-     &1,k__109 + 1,2) * u(i__102,j__101,k__109 + 1,2) + u(i__102,j__101,k__109 + 1,3) * u(i__102,j__101,k__109 + 1,3) + u(i__102,j__&
-     &101,k__109 + 1,4) * u(i__102,j__101,k__109 + 1,4)) * tmp2__104)) - dt * tz1 * ((-(r43__108)) * c34__106 * tmp2__104 * u(i__102&
-     &,j__101,k__109 + 1,4))) * rsd(i__102,j__101,k__109 + 1,1) + dt * tz2 * ((-(c2)) * (u(i__102,j__101,k__109 + 1,2) * tmp1__105))&
-     & * rsd(i__102,j__101,k__109 + 1,2) + dt * tz2 * ((-(c2)) * (u(i__102,j__101,k__109 + 1,3) * tmp1__105)) * rsd(i__102,j__101,k_&
-     &_109 + 1,3) + (dt * tz2 * (2.0d+00 - c2) * (u(i__102,j__101,k__109 + 1,4) * tmp1__105) - dt * tz1 * (r43__108 * c34__106 * tmp&
-     &1__105) - dt * tz1 * dz4) * rsd(i__102,j__101,k__109 + 1,4) + dt * tz2 * c2 * rsd(i__102,j__101,k__109 + 1,5))
-               tv(5) = omega * ((dt * tz2 * ((c2 * (u(i__102,j__101,k__109 + 1,2) * u(i__102,j__101,k__109 + 1,2) + u(i__102,j__101,&
-     &k__109 + 1,3) * u(i__102,j__101,k__109 + 1,3) + u(i__102,j__101,k__109 + 1,4) * u(i__102,j__101,k__109 + 1,4)) * tmp2__104 - c&
-     &1 * (u(i__102,j__101,k__109 + 1,5) * tmp1__105)) * (u(i__102,j__101,k__109 + 1,4) * tmp1__105)) - dt * tz1 * ((-(c34__106 - c1&
-     &345__107)) * tmp3__103 * u(i__102,j__101,k__109 + 1,2)** 2 - (c34__106 - c1345__107) * tmp3__103 * u(i__102,j__101,k__109 + 1,&
-     &3)** 2 - (r43__108 * c34__106 - c1345__107) * tmp3__103 * u(i__102,j__101,k__109 + 1,4)** 2 - c1345__107 * tmp2__104 * u(i__10&
-     &2,j__101,k__109 + 1,5))) * rsd(i__102,j__101,k__109 + 1,1) + (dt * tz2 * ((-(c2)) * (u(i__102,j__101,k__109 + 1,2) * u(i__102,&
-     &j__101,k__109 + 1,4)) * tmp2__104) - dt * tz1 * (c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101,k__109 + 1,2)) * rsd(i__&
-     &102,j__101,k__109 + 1,2) + (dt * tz2 * ((-(c2)) * (u(i__102,j__101,k__109 + 1,3) * u(i__102,j__101,k__109 + 1,4)) * tmp2__104)&
-     & - dt * tz1 * (c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101,k__109 + 1,3)) * rsd(i__102,j__101,k__109 + 1,3) + (dt * t&
-     &z2 * (c1 * (u(i__102,j__101,k__109 + 1,5) * tmp1__105) - 0.50d+00 * c2 * ((u(i__102,j__101,k__109 + 1,2) * u(i__102,j__101,k__&
-     &109 + 1,2) + u(i__102,j__101,k__109 + 1,3) * u(i__102,j__101,k__109 + 1,3) + 3.0d+00 * u(i__102,j__101,k__109 + 1,4) * u(i__10&
-     &2,j__101,k__109 + 1,4)) * tmp2__104)) - dt * tz1 * (r43__108 * c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101,k__109 + 1&
-     &,4)) * rsd(i__102,j__101,k__109 + 1,4) + (dt * tz2 * (c1 * (u(i__102,j__101,k__109 + 1,4) * tmp1__105)) - dt * tz1 * c1345__10&
-     &7 * tmp1__105 - dt * tz1 * dz5) * rsd(i__102,j__101,k__109 + 1,5))
-               tmp1 = 1.0d+00 / u(i__102 + 1,j__101,k__109,1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-               tmp1__105 = 1.0d+00 / u(i__102,j__101 + 1,k__109,1)
-               tmp2__104 = tmp1__105 * tmp1__105
-               tmp3__103 = tmp1__105 * tmp2__104
-               tv(1) = tv(1) + omega * ((-(dt)) * ty1 * dy1 * rsd(i__102,j__101 + 1,k__109,1) + (-(dt)) * tx1 * dx1 * rsd(i__102 + 1&
-     &,j__101,k__109,1) + dt * tx2 * rsd(i__102 + 1,j__101,k__109,2) + dt * ty2 * rsd(i__102,j__101 + 1,k__109,3))
-               tv(2) = tv(2) + omega * ((dt * ty2 * ((-(u(i__102,j__101 + 1,k__109,2) * u(i__102,j__101 + 1,k__109,3))) * tmp2__104)&
-     & - dt * ty1 * ((-(c34__106)) * tmp2__104 * u(i__102,j__101 + 1,k__109,2))) * rsd(i__102,j__101 + 1,k__109,1) + (dt * tx2 * ((-&
-     &((u(i__102 + 1,j__101,k__109,2) * tmp1)** 2)) + c2 * 0.50d+00 * (u(i__102 + 1,j__101,k__109,2) * u(i__102 + 1,j__101,k__109,2)&
-     & + u(i__102 + 1,j__101,k__109,3) * u(i__102 + 1,j__101,k__109,3) + u(i__102 + 1,j__101,k__109,4) * u(i__102 + 1,j__101,k__109,&
-     &4)) * tmp2) - dt * tx1 * ((-(r43__108)) * c34__106 * tmp2 * u(i__102 + 1,j__101,k__109,2))) * rsd(i__102 + 1,j__101,k__109,1) &
-     &+ (dt * ty2 * (u(i__102,j__101 + 1,k__109,3) * tmp1__105) - dt * ty1 * (c34__106 * tmp1__105) - dt * ty1 * dy2) * rsd(i__102,j&
-     &__101 + 1,k__109,2) + (dt * tx2 * ((2.0d+00 - c2) * (u(i__102 + 1,j__101,k__109,2) * tmp1)) - dt * tx1 * (r43__108 * c34__106 &
-     &* tmp1) - dt * tx1 * dx2) * rsd(i__102 + 1,j__101,k__109,2) + dt * ty2 * (u(i__102,j__101 + 1,k__109,2) * tmp1__105) * rsd(i__&
-     &102,j__101 + 1,k__109,3) + dt * tx2 * ((-(c2)) * (u(i__102 + 1,j__101,k__109,3) * tmp1)) * rsd(i__102 + 1,j__101,k__109,3) + d&
-     &t * tx2 * ((-(c2)) * (u(i__102 + 1,j__101,k__109,4) * tmp1)) * rsd(i__102 + 1,j__101,k__109,4) + dt * tx2 * c2 * rsd(i__102 + &
-     &1,j__101,k__109,5))
-               tv(3) = tv(3) + omega * ((dt * ty2 * ((-((u(i__102,j__101 + 1,k__109,3) * tmp1__105)** 2)) + 0.50d+00 * c2 * ((u(i__1&
-     &02,j__101 + 1,k__109,2) * u(i__102,j__101 + 1,k__109,2) + u(i__102,j__101 + 1,k__109,3) * u(i__102,j__101 + 1,k__109,3) + u(i_&
-     &_102,j__101 + 1,k__109,4) * u(i__102,j__101 + 1,k__109,4)) * tmp2__104)) - dt * ty1 * ((-(r43__108)) * c34__106 * tmp2__104 * &
-     &u(i__102,j__101 + 1,k__109,3))) * rsd(i__102,j__101 + 1,k__109,1) + (dt * tx2 * ((-(u(i__102 + 1,j__101,k__109,2) * u(i__102 +&
-     & 1,j__101,k__109,3))) * tmp2) - dt * tx1 * ((-(c34__106)) * tmp2 * u(i__102 + 1,j__101,k__109,3))) * rsd(i__102 + 1,j__101,k__&
-     &109,1) + dt * ty2 * ((-(c2)) * (u(i__102,j__101 + 1,k__109,2) * tmp1__105)) * rsd(i__102,j__101 + 1,k__109,2) + dt * tx2 * (u(&
-     &i__102 + 1,j__101,k__109,3) * tmp1) * rsd(i__102 + 1,j__101,k__109,2) + (dt * ty2 * ((2.0d+00 - c2) * (u(i__102,j__101 + 1,k__&
-     &109,3) * tmp1__105)) - dt * ty1 * (r43__108 * c34__106 * tmp1__105) - dt * ty1 * dy3) * rsd(i__102,j__101 + 1,k__109,3) + (dt &
-     &* tx2 * (u(i__102 + 1,j__101,k__109,2) * tmp1) - dt * tx1 * (c34__106 * tmp1) - dt * tx1 * dx3) * rsd(i__102 + 1,j__101,k__109&
-     &,3) + dt * ty2 * ((-(c2)) * (u(i__102,j__101 + 1,k__109,4) * tmp1__105)) * rsd(i__102,j__101 + 1,k__109,4) + dt * ty2 * c2 * r&
-     &sd(i__102,j__101 + 1,k__109,5))
-               tv(4) = tv(4) + omega * ((dt * ty2 * ((-(u(i__102,j__101 + 1,k__109,3) * u(i__102,j__101 + 1,k__109,4))) * tmp2__104)&
-     & - dt * ty1 * ((-(c34__106)) * tmp2__104 * u(i__102,j__101 + 1,k__109,4))) * rsd(i__102,j__101 + 1,k__109,1) + (dt * tx2 * ((-&
-     &(u(i__102 + 1,j__101,k__109,2) * u(i__102 + 1,j__101,k__109,4))) * tmp2) - dt * tx1 * ((-(c34__106)) * tmp2 * u(i__102 + 1,j__&
-     &101,k__109,4))) * rsd(i__102 + 1,j__101,k__109,1) + dt * tx2 * (u(i__102 + 1,j__101,k__109,4) * tmp1) * rsd(i__102 + 1,j__101,&
-     &k__109,2) + dt * ty2 * (u(i__102,j__101 + 1,k__109,4) * tmp1__105) * rsd(i__102,j__101 + 1,k__109,3) + (dt * ty2 * (u(i__102,j&
-     &__101 + 1,k__109,3) * tmp1__105) - dt * ty1 * (c34__106 * tmp1__105) - dt * ty1 * dy4) * rsd(i__102,j__101 + 1,k__109,4) + (dt&
-     & * tx2 * (u(i__102 + 1,j__101,k__109,2) * tmp1) - dt * tx1 * (c34__106 * tmp1) - dt * tx1 * dx4) * rsd(i__102 + 1,j__101,k__10&
-     &9,4))
-               tv(5) = tv(5) + omega * ((dt * ty2 * ((c2 * (u(i__102,j__101 + 1,k__109,2) * u(i__102,j__101 + 1,k__109,2) + u(i__102&
-     &,j__101 + 1,k__109,3) * u(i__102,j__101 + 1,k__109,3) + u(i__102,j__101 + 1,k__109,4) * u(i__102,j__101 + 1,k__109,4)) * tmp2_&
-     &_104 - c1 * (u(i__102,j__101 + 1,k__109,5) * tmp1__105)) * (u(i__102,j__101 + 1,k__109,3) * tmp1__105)) - dt * ty1 * ((-(c34__&
-     &106 - c1345__107)) * tmp3__103 * u(i__102,j__101 + 1,k__109,2)** 2 - (r43__108 * c34__106 - c1345__107) * tmp3__103 * u(i__102&
-     &,j__101 + 1,k__109,3)** 2 - (c34__106 - c1345__107) * tmp3__103 * u(i__102,j__101 + 1,k__109,4)** 2 - c1345__107 * tmp2__104 *&
-     & u(i__102,j__101 + 1,k__109,5))) * rsd(i__102,j__101 + 1,k__109,1) + (dt * tx2 * ((c2 * (u(i__102 + 1,j__101,k__109,2) * u(i__&
-     &102 + 1,j__101,k__109,2) + u(i__102 + 1,j__101,k__109,3) * u(i__102 + 1,j__101,k__109,3) + u(i__102 + 1,j__101,k__109,4) * u(i&
-     &__102 + 1,j__101,k__109,4)) * tmp2 - c1 * (u(i__102 + 1,j__101,k__109,5) * tmp1)) * (u(i__102 + 1,j__101,k__109,2) * tmp1)) - &
-     &dt * tx1 * ((-(r43__108 * c34__106 - c1345__107)) * tmp3 * u(i__102 + 1,j__101,k__109,2)** 2 - (c34__106 - c1345__107) * tmp3 &
-     &* u(i__102 + 1,j__101,k__109,3)** 2 - (c34__106 - c1345__107) * tmp3 * u(i__102 + 1,j__101,k__109,4)** 2 - c1345__107 * tmp2 *&
-     & u(i__102 + 1,j__101,k__109,5))) * rsd(i__102 + 1,j__101,k__109,1) + (dt * ty2 * ((-(c2)) * (u(i__102,j__101 + 1,k__109,2) * u&
-     &(i__102,j__101 + 1,k__109,3)) * tmp2__104) - dt * ty1 * (c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101 + 1,k__109,2)) *&
-     & rsd(i__102,j__101 + 1,k__109,2) + (dt * tx2 * (c1 * (u(i__102 + 1,j__101,k__109,5) * tmp1) - 0.50d+00 * c2 * ((3.0d+00 * u(i_&
-     &_102 + 1,j__101,k__109,2) * u(i__102 + 1,j__101,k__109,2) + u(i__102 + 1,j__101,k__109,3) * u(i__102 + 1,j__101,k__109,3) + u(&
-     &i__102 + 1,j__101,k__109,4) * u(i__102 + 1,j__101,k__109,4)) * tmp2)) - dt * tx1 * (r43__108 * c34__106 - c1345__107) * tmp2 *&
-     & u(i__102 + 1,j__101,k__109,2)) * rsd(i__102 + 1,j__101,k__109,2) + (dt * ty2 * (c1 * (u(i__102,j__101 + 1,k__109,5) * tmp1__1&
-     &05) - 0.50d+00 * c2 * ((u(i__102,j__101 + 1,k__109,2) * u(i__102,j__101 + 1,k__109,2) + 3.0d+00 * u(i__102,j__101 + 1,k__109,3&
-     &) * u(i__102,j__101 + 1,k__109,3) + u(i__102,j__101 + 1,k__109,4) * u(i__102,j__101 + 1,k__109,4)) * tmp2__104)) - dt * ty1 * &
-     &(r43__108 * c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101 + 1,k__109,3)) * rsd(i__102,j__101 + 1,k__109,3) + (dt * tx2 &
-     &* ((-(c2)) * (u(i__102 + 1,j__101,k__109,3) * u(i__102 + 1,j__101,k__109,2)) * tmp2) - dt * tx1 * (c34__106 - c1345__107) * tm&
-     &p2 * u(i__102 + 1,j__101,k__109,3)) * rsd(i__102 + 1,j__101,k__109,3) + (dt * ty2 * ((-(c2)) * (u(i__102,j__101 + 1,k__109,3) &
-     &* u(i__102,j__101 + 1,k__109,4)) * tmp2__104) - dt * ty1 * (c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101 + 1,k__109,4)&
-     &) * rsd(i__102,j__101 + 1,k__109,4) + (dt * tx2 * ((-(c2)) * (u(i__102 + 1,j__101,k__109,4) * u(i__102 + 1,j__101,k__109,2)) *&
-     & tmp2) - dt * tx1 * (c34__106 - c1345__107) * tmp2 * u(i__102 + 1,j__101,k__109,4)) * rsd(i__102 + 1,j__101,k__109,4) + (dt * &
-     &ty2 * (c1 * (u(i__102,j__101 + 1,k__109,3) * tmp1__105)) - dt * ty1 * c1345__107 * tmp1__105 - dt * ty1 * dy5) * rsd(i__102,j_&
-     &_101 + 1,k__109,5) + (dt * tx2 * (c1 * (u(i__102 + 1,j__101,k__109,2) * tmp1)) - dt * tx1 * c1345__107 * tmp1 - dt * tx1 * dx5&
-     &) * rsd(i__102 + 1,j__101,k__109,5))
-               tmp1__105 = 1.0d+00 / u(i__102,j__101,k__109,1)
-               tmp2__104 = tmp1__105 * tmp1__105
-               tmp3__103 = tmp1__105 * tmp2__104
-               tmat__98(1,1) = 1.0d+00 + dt * 2.0d+00 * (tx1 * dx1 + ty1 * dy1 + tz1 * dz1)
-               tmat__98(1,2) = 0.0d+00
-               tmat__98(1,3) = 0.0d+00
-               tmat__98(1,4) = 0.0d+00
-               tmat__98(1,5) = 0.0d+00
-               tmat__98(2,1) = dt * 2.0d+00 * (tx1 * ((-(r43__108)) * c34__106 * tmp2__104 * u(i__102,j__101,k__109,2)) + ty1 * ((-(&
-     &c34__106)) * tmp2__104 * u(i__102,j__101,k__109,2)) + tz1 * ((-(c34__106)) * tmp2__104 * u(i__102,j__101,k__109,2)))
-               tmat__98(2,2) = 1.0d+00 + dt * 2.0d+00 * (tx1 * r43__108 * c34__106 * tmp1__105 + ty1 * c34__106 * tmp1__105 + tz1 * &
-     &c34__106 * tmp1__105) + dt * 2.0d+00 * (tx1 * dx2 + ty1 * dy2 + tz1 * dz2)
-               tmat__98(2,3) = 0.0d+00
-               tmat__98(2,4) = 0.0d+00
-               tmat__98(2,5) = 0.0d+00
-               tmat__98(3,1) = dt * 2.0d+00 * (tx1 * ((-(c34__106)) * tmp2__104 * u(i__102,j__101,k__109,3)) + ty1 * ((-(r43__108)) &
-     &* c34__106 * tmp2__104 * u(i__102,j__101,k__109,3)) + tz1 * ((-(c34__106)) * tmp2__104 * u(i__102,j__101,k__109,3)))
-               tmat__98(3,2) = 0.0d+00
-               tmat__98(3,3) = 1.0d+00 + dt * 2.0d+00 * (tx1 * c34__106 * tmp1__105 + ty1 * r43__108 * c34__106 * tmp1__105 + tz1 * &
-     &c34__106 * tmp1__105) + dt * 2.0d+00 * (tx1 * dx3 + ty1 * dy3 + tz1 * dz3)
-               tmat__98(3,4) = 0.0d+00
-               tmat__98(3,5) = 0.0d+00
-               tmat__98(4,1) = dt * 2.0d+00 * (tx1 * ((-(c34__106)) * tmp2__104 * u(i__102,j__101,k__109,4)) + ty1 * ((-(c34__106)) &
-     &* tmp2__104 * u(i__102,j__101,k__109,4)) + tz1 * ((-(r43__108)) * c34__106 * tmp2__104 * u(i__102,j__101,k__109,4)))
-               tmat__98(4,2) = 0.0d+00
-               tmat__98(4,3) = 0.0d+00
-               tmat__98(4,4) = 1.0d+00 + dt * 2.0d+00 * (tx1 * c34__106 * tmp1__105 + ty1 * c34__106 * tmp1__105 + tz1 * r43__108 * &
-     &c34__106 * tmp1__105) + dt * 2.0d+00 * (tx1 * dx4 + ty1 * dy4 + tz1 * dz4)
-               tmat__98(4,5) = 0.0d+00
-               tmat__98(5,1) = dt * 2.0d+00 * (tx1 * ((-(r43__108 * c34__106 - c1345__107)) * tmp3__103 * u(i__102,j__101,k__109,2)*&
-     &* 2 - (c34__106 - c1345__107) * tmp3__103 * u(i__102,j__101,k__109,3)** 2 - (c34__106 - c1345__107) * tmp3__103 * u(i__102,j__&
-     &101,k__109,4)** 2 - c1345__107 * tmp2__104 * u(i__102,j__101,k__109,5)) + ty1 * ((-(c34__106 - c1345__107)) * tmp3__103 * u(i_&
-     &_102,j__101,k__109,2)** 2 - (r43__108 * c34__106 - c1345__107) * tmp3__103 * u(i__102,j__101,k__109,3)** 2 - (c34__106 - c1345&
-     &__107) * tmp3__103 * u(i__102,j__101,k__109,4)** 2 - c1345__107 * tmp2__104 * u(i__102,j__101,k__109,5)) + tz1 * ((-(c34__106 &
-     &- c1345__107)) * tmp3__103 * u(i__102,j__101,k__109,2)** 2 - (c34__106 - c1345__107) * tmp3__103 * u(i__102,j__101,k__109,3)**&
-     & 2 - (r43__108 * c34__106 - c1345__107) * tmp3__103 * u(i__102,j__101,k__109,4)** 2 - c1345__107 * tmp2__104 * u(i__102,j__101&
-     &,k__109,5)))
-               tmat__98(5,2) = dt * 2.0d+00 * (tx1 * (r43__108 * c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101,k__109,2) + ty&
-     &1 * (c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101,k__109,2) + tz1 * (c34__106 - c1345__107) * tmp2__104 * u(i__102,j__&
-     &101,k__109,2))
-               tmat__98(5,3) = dt * 2.0d+00 * (tx1 * (c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101,k__109,3) + ty1 * (r43__1&
-     &08 * c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101,k__109,3) + tz1 * (c34__106 - c1345__107) * tmp2__104 * u(i__102,j__&
-     &101,k__109,3))
-               tmat__98(5,4) = dt * 2.0d+00 * (tx1 * (c34__106 - c1345__107) * tmp2__104 * u(i__102,j__101,k__109,4) + ty1 * (c34__1&
-     &06 - c1345__107) * tmp2__104 * u(i__102,j__101,k__109,4) + tz1 * (r43__108 * c34__106 - c1345__107) * tmp2__104 * u(i__102,j__&
-     &101,k__109,4))
-               tmat__98(5,5) = 1.0d+00 + dt * 2.0d+00 * (tx1 * c1345__107 * tmp1__105 + ty1 * c1345__107 * tmp1__105 + tz1 * c1345__&
-     &107 * tmp1__105) + dt * 2.0d+00 * (tx1 * dx5 + ty1 * dy5 + tz1 * dz5)
-               tmp1__105 = 1.0d+00 / tmat__98(1,1)
-               tmp__99 = tmp1__105 * tmat__98(2,1)
-               tmat__98(2,2) = tmat__98(2,2) - tmp__99 * tmat__98(1,2)
-               tmat__98(2,3) = tmat__98(2,3) - tmp__99 * tmat__98(1,3)
-               tmat__98(2,4) = tmat__98(2,4) - tmp__99 * tmat__98(1,4)
-               tmat__98(2,5) = tmat__98(2,5) - tmp__99 * tmat__98(1,5)
-               tv(2) = tv(2) - tv(1) * tmp__99
-               tmp__99 = tmp1__105 * tmat__98(3,1)
-               tmat__98(3,2) = tmat__98(3,2) - tmp__99 * tmat__98(1,2)
-               tmat__98(3,3) = tmat__98(3,3) - tmp__99 * tmat__98(1,3)
-               tmat__98(3,4) = tmat__98(3,4) - tmp__99 * tmat__98(1,4)
-               tmat__98(3,5) = tmat__98(3,5) - tmp__99 * tmat__98(1,5)
-               tv(3) = tv(3) - tv(1) * tmp__99
-               tmp__99 = tmp1__105 * tmat__98(4,1)
-               tmat__98(4,2) = tmat__98(4,2) - tmp__99 * tmat__98(1,2)
-               tmat__98(4,3) = tmat__98(4,3) - tmp__99 * tmat__98(1,3)
-               tmat__98(4,4) = tmat__98(4,4) - tmp__99 * tmat__98(1,4)
-               tmat__98(4,5) = tmat__98(4,5) - tmp__99 * tmat__98(1,5)
-               tv(4) = tv(4) - tv(1) * tmp__99
-               tmp__99 = tmp1__105 * tmat__98(5,1)
-               tmat__98(5,2) = tmat__98(5,2) - tmp__99 * tmat__98(1,2)
-               tmat__98(5,3) = tmat__98(5,3) - tmp__99 * tmat__98(1,3)
-               tmat__98(5,4) = tmat__98(5,4) - tmp__99 * tmat__98(1,4)
-               tmat__98(5,5) = tmat__98(5,5) - tmp__99 * tmat__98(1,5)
-               tv(5) = tv(5) - tv(1) * tmp__99
-               tmp1__105 = 1.0d+00 / tmat__98(2,2)
-               tmp__99 = tmp1__105 * tmat__98(3,2)
-               tmat__98(3,3) = tmat__98(3,3) - tmp__99 * tmat__98(2,3)
-               tmat__98(3,4) = tmat__98(3,4) - tmp__99 * tmat__98(2,4)
-               tmat__98(3,5) = tmat__98(3,5) - tmp__99 * tmat__98(2,5)
-               tv(3) = tv(3) - tv(2) * tmp__99
-               tmp__99 = tmp1__105 * tmat__98(4,2)
-               tmat__98(4,3) = tmat__98(4,3) - tmp__99 * tmat__98(2,3)
-               tmat__98(4,4) = tmat__98(4,4) - tmp__99 * tmat__98(2,4)
-               tmat__98(4,5) = tmat__98(4,5) - tmp__99 * tmat__98(2,5)
-               tv(4) = tv(4) - tv(2) * tmp__99
-               tmp__99 = tmp1__105 * tmat__98(5,2)
-               tmat__98(5,3) = tmat__98(5,3) - tmp__99 * tmat__98(2,3)
-               tmat__98(5,4) = tmat__98(5,4) - tmp__99 * tmat__98(2,4)
-               tmat__98(5,5) = tmat__98(5,5) - tmp__99 * tmat__98(2,5)
-               tv(5) = tv(5) - tv(2) * tmp__99
-               tmp1__105 = 1.0d+00 / tmat__98(3,3)
-               tmp__99 = tmp1__105 * tmat__98(4,3)
-               tmat__98(4,4) = tmat__98(4,4) - tmp__99 * tmat__98(3,4)
-               tmat__98(4,5) = tmat__98(4,5) - tmp__99 * tmat__98(3,5)
-               tv(4) = tv(4) - tv(3) * tmp__99
-               tmp__99 = tmp1__105 * tmat__98(5,3)
-               tmat__98(5,4) = tmat__98(5,4) - tmp__99 * tmat__98(3,4)
-               tmat__98(5,5) = tmat__98(5,5) - tmp__99 * tmat__98(3,5)
-               tv(5) = tv(5) - tv(3) * tmp__99
-               tmp1__105 = 1.0d+00 / tmat__98(4,4)
-               tmp__99 = tmp1__105 * tmat__98(5,4)
-               tmat__98(5,5) = tmat__98(5,5) - tmp__99 * tmat__98(4,5)
-               tv(5) = tv(5) - tv(4) * tmp__99
-               tv(5) = tv(5) / tmat__98(5,5)
-               tv(4) = tv(4) - tmat__98(4,5) * tv(5)
-               tv(4) = tv(4) / tmat__98(4,4)
-               tv(3) = tv(3) - tmat__98(3,4) * tv(4) - tmat__98(3,5) * tv(5)
-               tv(3) = tv(3) / tmat__98(3,3)
-               tv(2) = tv(2) - tmat__98(2,3) * tv(3) - tmat__98(2,4) * tv(4) - tmat__98(2,5) * tv(5)
-               tv(2) = tv(2) / tmat__98(2,2)
-               tv(1) = tv(1) - tmat__98(1,2) * tv(2) - tmat__98(1,3) * tv(3) - tmat__98(1,4) * tv(4) - tmat__98(1,5) * tv(5)
-               tv(1) = tv(1) / tmat__98(1,1)
-               rsd(i__102,j__101,k__109,1) = rsd(i__102,j__101,k__109,1) - tv(1)
-               rsd(i__102,j__101,k__109,2) = rsd(i__102,j__101,k__109,2) - tv(2)
-               rsd(i__102,j__101,k__109,3) = rsd(i__102,j__101,k__109,3) - tv(3)
-               rsd(i__102,j__101,k__109,4) = rsd(i__102,j__101,k__109,4) - tv(4)
-               rsd(i__102,j__101,k__109,5) = rsd(i__102,j__101,k__109,5) - tv(5)
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-!DVM$ REGION 
-!DVM$ PARALLEL (k__45,j__46,i__47) ON u(i__47,j__46,k__45,*),PRIVATE (m__44)
-      do  k__45 = 2,nz - 1
-         do  j__46 = jst,jend
-            do  i__47 = ist,iend
-               do  m__44 = 1,5
-                  u(i__47,j__46,k__45,m__44) = u(i__47,j__46,k__45,m__44) + tmp__43 * rsd(i__47,j__46,k__45,m__44)
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-!DVM$ REGION 
-!DVM$ PARALLEL (k__84,j__85,i__86) ON rsd(i__86,j__85,k__84,*),PRIVATE (m__83,rsd_,flux_,u21__75,q__76,tmp__72,u21i__71,u31i__70,u41&
-!DVM$&i__69,u51i__68,u21im1__59,u31im1__58,u41im1__57,u51im1__56,u31__74,u21j__67,u31j__66,u41j__65,u51j__64,u21jm1__55,u31jm1__54,u&
-!DVM$&41jm1__53,u51jm1__52,u41__73,u21k__63,u31k__62,u41k__61,u51k__60,u21km1__51,u31km1__50,u41km1__49,u51km1__48),SHADOW_RENEW (u)
-      do  k__84 = 2,nz - 1
-         do  j__85 = 2,ny - 1
-            do  i__86 = 2,nx - 1
-               flux_(1) = u(i__86 - 1,j__85,k__84,2)
-               u21__75 = u(i__86 - 1,j__85,k__84,2) / u(i__86 - 1,j__85,k__84,1)
-               q__76 = 0.50d+00 * (u(i__86 - 1,j__85,k__84,2) * u(i__86 - 1,j__85,k__84,2) + u(i__86 - 1,j__85,k__84,3) * u(i__86 - &
-     &1,j__85,k__84,3) + u(i__86 - 1,j__85,k__84,4) * u(i__86 - 1,j__85,k__84,4)) / u(i__86 - 1,j__85,k__84,1)
-               flux_(2) = u(i__86 - 1,j__85,k__84,2) * u21__75 + c2 * (u(i__86 - 1,j__85,k__84,5) - q__76)
-               flux_(3) = u(i__86 - 1,j__85,k__84,3) * u21__75
-               flux_(4) = u(i__86 - 1,j__85,k__84,4) * u21__75
-               flux_(5) = (c1 * u(i__86 - 1,j__85,k__84,5) - c2 * q__76) * u21__75
-               flux_(6) = u(i__86 + 1,j__85,k__84,2)
-               u21__75 = u(i__86 + 1,j__85,k__84,2) / u(i__86 + 1,j__85,k__84,1)
-               q__76 = 0.50d+00 * (u(i__86 + 1,j__85,k__84,2) * u(i__86 + 1,j__85,k__84,2) + u(i__86 + 1,j__85,k__84,3) * u(i__86 + &
-     &1,j__85,k__84,3) + u(i__86 + 1,j__85,k__84,4) * u(i__86 + 1,j__85,k__84,4)) / u(i__86 + 1,j__85,k__84,1)
-               flux_(7) = u(i__86 + 1,j__85,k__84,2) * u21__75 + c2 * (u(i__86 + 1,j__85,k__84,5) - q__76)
-               flux_(8) = u(i__86 + 1,j__85,k__84,3) * u21__75
-               flux_(9) = u(i__86 + 1,j__85,k__84,4) * u21__75
-               flux_(10) = (c1 * u(i__86 + 1,j__85,k__84,5) - c2 * q__76) * u21__75
-               do  m__83 = 1,5
-                  rsd_(m__83) = (-(frct(i__86,j__85,k__84,m__83))) - tx2 * (flux_(m__83 + 5) - flux_(m__83))
-               enddo  
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21i__71 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31i__70 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41i__69 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51i__68 = tmp__72 * u(i__86,j__85,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86 - 1,j__85,k__84,1)
-               u21im1__59 = tmp__72 * u(i__86 - 1,j__85,k__84,2)
-               u31im1__58 = tmp__72 * u(i__86 - 1,j__85,k__84,3)
-               u41im1__57 = tmp__72 * u(i__86 - 1,j__85,k__84,4)
-               u51im1__56 = tmp__72 * u(i__86 - 1,j__85,k__84,5)
-               flux_(2) = 4.0d+00 / 3.0d+00 * tx3 * (u21i__71 - u21im1__59)
-               flux_(3) = tx3 * (u31i__70 - u31im1__58)
-               flux_(4) = tx3 * (u41i__69 - u41im1__57)
-               flux_(5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tx3 * (u21i__71** 2 + u31i__70** 2 + u41i__69** 2 - (u21im1__59** 2 + u31&
-     &im1__58** 2 + u41im1__57** 2)) + 1.0d+00 / 6.0d+00 * tx3 * (u21i__71** 2 - u21im1__59** 2) + c1 * c5 * tx3 * (u51i__68 - u51im&
-     &1__56)
-               tmp__72 = 1.0d+00 / u(i__86 + 1,j__85,k__84,1)
-               u21i__71 = tmp__72 * u(i__86 + 1,j__85,k__84,2)
-               u31i__70 = tmp__72 * u(i__86 + 1,j__85,k__84,3)
-               u41i__69 = tmp__72 * u(i__86 + 1,j__85,k__84,4)
-               u51i__68 = tmp__72 * u(i__86 + 1,j__85,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21im1__59 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31im1__58 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41im1__57 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51im1__56 = tmp__72 * u(i__86,j__85,k__84,5)
-               flux_(7) = 4.0d+00 / 3.0d+00 * tx3 * (u21i__71 - u21im1__59)
-               flux_(8) = tx3 * (u31i__70 - u31im1__58)
-               flux_(9) = tx3 * (u41i__69 - u41im1__57)
-               flux_(10) = 0.50d+00 * (1.0d+00 - c1 * c5) * tx3 * (u21i__71** 2 + u31i__70** 2 + u41i__69** 2 - (u21im1__59** 2 + u3&
-     &1im1__58** 2 + u41im1__57** 2)) + 1.0d+00 / 6.0d+00 * tx3 * (u21i__71** 2 - u21im1__59** 2) + c1 * c5 * tx3 * (u51i__68 - u51i&
-     &m1__56)
-               rsd_(1) = rsd_(1) + dx1 * tx1 * (u(i__86 - 1,j__85,k__84,1) - 2.0d+00 * u(i__86,j__85,k__84,1) + u(i__86 + 1,j__85,k_&
-     &_84,1))
-               rsd_(2) = rsd_(2) + tx3 * c3 * c4 * (flux_(2 + 5) - flux_(2)) + dx2 * tx1 * (u(i__86 - 1,j__85,k__84,2) - 2.0d+00 * u&
-     &(i__86,j__85,k__84,2) + u(i__86 + 1,j__85,k__84,2))
-               rsd_(3) = rsd_(3) + tx3 * c3 * c4 * (flux_(3 + 5) - flux_(3)) + dx3 * tx1 * (u(i__86 - 1,j__85,k__84,3) - 2.0d+00 * u&
-     &(i__86,j__85,k__84,3) + u(i__86 + 1,j__85,k__84,3))
-               rsd_(4) = rsd_(4) + tx3 * c3 * c4 * (flux_(4 + 5) - flux_(4)) + dx4 * tx1 * (u(i__86 - 1,j__85,k__84,4) - 2.0d+00 * u&
-     &(i__86,j__85,k__84,4) + u(i__86 + 1,j__85,k__84,4))
-               rsd_(5) = rsd_(5) + tx3 * c3 * c4 * (flux_(5 + 5) - flux_(5)) + dx5 * tx1 * (u(i__86 - 1,j__85,k__84,5) - 2.0d+00 * u&
-     &(i__86,j__85,k__84,5) + u(i__86 + 1,j__85,k__84,5))
-               if (i__86 .eq. 2) then
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * ((+(5.0d+00)) * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86 + 1,j__85,k__&
-     &84,m__83) + u(i__86 + 2,j__85,k__84,m__83))
-                  enddo  
-               else if (i__86 .eq. 3) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * ((-(4.0d+00)) * u(i__86 - 1,j__85,k__84,m__83) + 6.0d+00 * u(i__86,j__85,k__&
-     &84,m__83) - 4.0d+00 * u(i__86 + 1,j__85,k__84,m__83) + u(i__86 + 2,j__85,k__84,m__83))
-                  enddo  
-               else if (i__86 .ge. 4 .and. i__86 .le. nx - 3) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * (u(i__86 - 2,j__85,k__84,m__83) - 4.0d+00 * u(i__86 - 1,j__85,k__84,m__83) +&
-     & 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86 + 1,j__85,k__84,m__83) + u(i__86 + 2,j__85,k__84,m__83))
-                  enddo  
-               else if (i__86 .eq. nx - 2) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * (u(i__86 - 2,j__85,k__84,m__83) - 4.0d+00 * u(i__86 - 1,j__85,k__84,m__83) +&
-     & 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86 + 1,j__85,k__84,m__83))
-                  enddo  
-               else if (i__86 .eq. nx - 1) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * (u(i__86 - 2,j__85,k__84,m__83) - 4.0d+00 * u(i__86 - 1,j__85,k__84,m__83) +&
-     & 5.0d+00 * u(i__86,j__85,k__84,m__83))
-                  enddo  
-               endif  
-               flux_(1) = u(i__86,j__85 - 1,k__84,3)
-               u31__74 = u(i__86,j__85 - 1,k__84,3) / u(i__86,j__85 - 1,k__84,1)
-               q__76 = 0.50d+00 * (u(i__86,j__85 - 1,k__84,2) * u(i__86,j__85 - 1,k__84,2) + u(i__86,j__85 - 1,k__84,3) * u(i__86,j_&
-     &_85 - 1,k__84,3) + u(i__86,j__85 - 1,k__84,4) * u(i__86,j__85 - 1,k__84,4)) / u(i__86,j__85 - 1,k__84,1)
-               flux_(2) = u(i__86,j__85 - 1,k__84,2) * u31__74
-               flux_(3) = u(i__86,j__85 - 1,k__84,3) * u31__74 + c2 * (u(i__86,j__85 - 1,k__84,5) - q__76)
-               flux_(4) = u(i__86,j__85 - 1,k__84,4) * u31__74
-               flux_(5) = (c1 * u(i__86,j__85 - 1,k__84,5) - c2 * q__76) * u31__74
-               flux_(6) = u(i__86,j__85 + 1,k__84,3)
-               u31__74 = u(i__86,j__85 + 1,k__84,3) / u(i__86,j__85 + 1,k__84,1)
-               q__76 = 0.50d+00 * (u(i__86,j__85 + 1,k__84,2) * u(i__86,j__85 + 1,k__84,2) + u(i__86,j__85 + 1,k__84,3) * u(i__86,j_&
-     &_85 + 1,k__84,3) + u(i__86,j__85 + 1,k__84,4) * u(i__86,j__85 + 1,k__84,4)) / u(i__86,j__85 + 1,k__84,1)
-               flux_(7) = u(i__86,j__85 + 1,k__84,2) * u31__74
-               flux_(8) = u(i__86,j__85 + 1,k__84,3) * u31__74 + c2 * (u(i__86,j__85 + 1,k__84,5) - q__76)
-               flux_(9) = u(i__86,j__85 + 1,k__84,4) * u31__74
-               flux_(10) = (c1 * u(i__86,j__85 + 1,k__84,5) - c2 * q__76) * u31__74
-               do  m__83 = 1,5
-                  rsd_(m__83) = rsd_(m__83) - ty2 * (flux_(m__83 + 5) - flux_(m__83))
-               enddo  
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21j__67 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31j__66 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41j__65 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51j__64 = tmp__72 * u(i__86,j__85,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85 - 1,k__84,1)
-               u21jm1__55 = tmp__72 * u(i__86,j__85 - 1,k__84,2)
-               u31jm1__54 = tmp__72 * u(i__86,j__85 - 1,k__84,3)
-               u41jm1__53 = tmp__72 * u(i__86,j__85 - 1,k__84,4)
-               u51jm1__52 = tmp__72 * u(i__86,j__85 - 1,k__84,5)
-               flux_(2) = ty3 * (u21j__67 - u21jm1__55)
-               flux_(3) = 4.0d+00 / 3.0d+00 * ty3 * (u31j__66 - u31jm1__54)
-               flux_(4) = ty3 * (u41j__65 - u41jm1__53)
-               flux_(5) = 0.50d+00 * (1.0d+00 - c1 * c5) * ty3 * (u21j__67** 2 + u31j__66** 2 + u41j__65** 2 - (u21jm1__55** 2 + u31&
-     &jm1__54** 2 + u41jm1__53** 2)) + 1.0d+00 / 6.0d+00 * ty3 * (u31j__66** 2 - u31jm1__54** 2) + c1 * c5 * ty3 * (u51j__64 - u51jm&
-     &1__52)
-               tmp__72 = 1.0d+00 / u(i__86,j__85 + 1,k__84,1)
-               u21j__67 = tmp__72 * u(i__86,j__85 + 1,k__84,2)
-               u31j__66 = tmp__72 * u(i__86,j__85 + 1,k__84,3)
-               u41j__65 = tmp__72 * u(i__86,j__85 + 1,k__84,4)
-               u51j__64 = tmp__72 * u(i__86,j__85 + 1,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21jm1__55 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31jm1__54 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41jm1__53 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51jm1__52 = tmp__72 * u(i__86,j__85,k__84,5)
-               flux_(7) = ty3 * (u21j__67 - u21jm1__55)
-               flux_(8) = 4.0d+00 / 3.0d+00 * ty3 * (u31j__66 - u31jm1__54)
-               flux_(9) = ty3 * (u41j__65 - u41jm1__53)
-               flux_(10) = 0.50d+00 * (1.0d+00 - c1 * c5) * ty3 * (u21j__67** 2 + u31j__66** 2 + u41j__65** 2 - (u21jm1__55** 2 + u3&
-     &1jm1__54** 2 + u41jm1__53** 2)) + 1.0d+00 / 6.0d+00 * ty3 * (u31j__66** 2 - u31jm1__54** 2) + c1 * c5 * ty3 * (u51j__64 - u51j&
-     &m1__52)
-               rsd_(1) = rsd_(1) + dy1 * ty1 * (u(i__86,j__85 - 1,k__84,1) - 2.0d+00 * u(i__86,j__85,k__84,1) + u(i__86,j__85 + 1,k_&
-     &_84,1))
-               rsd_(2) = rsd_(2) + ty3 * c3 * c4 * (flux_(7) - flux_(2)) + dy2 * ty1 * (u(i__86,j__85 - 1,k__84,2) - 2.0d+00 * u(i__&
-     &86,j__85,k__84,2) + u(i__86,j__85 + 1,k__84,2))
-               rsd_(3) = rsd_(3) + ty3 * c3 * c4 * (flux_(8) - flux_(3)) + dy3 * ty1 * (u(i__86,j__85 - 1,k__84,3) - 2.0d+00 * u(i__&
-     &86,j__85,k__84,3) + u(i__86,j__85 + 1,k__84,3))
-               rsd_(4) = rsd_(4) + ty3 * c3 * c4 * (flux_(9) - flux_(4)) + dy4 * ty1 * (u(i__86,j__85 - 1,k__84,4) - 2.0d+00 * u(i__&
-     &86,j__85,k__84,4) + u(i__86,j__85 + 1,k__84,4))
-               rsd_(5) = rsd_(5) + ty3 * c3 * c4 * (flux_(10) - flux_(5)) + dy5 * ty1 * (u(i__86,j__85 - 1,k__84,5) - 2.0d+00 * u(i_&
-     &_86,j__85,k__84,5) + u(i__86,j__85 + 1,k__84,5))
-               if (j__85 .eq. 2) then
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * ((+(5.0d+00)) * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85 + 1,k__&
-     &84,m__83) + u(i__86,j__85 + 2,k__84,m__83))
-                  enddo  
-               else if (j__85 .eq. 3) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * ((-(4.0d+00)) * u(i__86,j__85 - 1,k__84,m__83) + 6.0d+00 * u(i__86,j__85,k__&
-     &84,m__83) - 4.0d+00 * u(i__86,j__85 + 1,k__84,m__83) + u(i__86,j__85 + 2,k__84,m__83))
-                  enddo  
-               else if (j__85 .ge. 4 .and. j__85 .le. ny - 3) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * (u(i__86,j__85 - 2,k__84,m__83) - 4.0d+00 * u(i__86,j__85 - 1,k__84,m__83) +&
-     & 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85 + 1,k__84,m__83) + u(i__86,j__85 + 2,k__84,m__83))
-                  enddo  
-               else if (j__85 .eq. ny - 2) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * (u(i__86,j__85 - 2,k__84,m__83) - 4.0d+00 * u(i__86,j__85 - 1,k__84,m__83) +&
-     & 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85 + 1,k__84,m__83))
-                  enddo  
-               else if (j__85 .eq. ny - 1) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * (u(i__86,j__85 - 2,k__84,m__83) - 4.0d+00 * u(i__86,j__85 - 1,k__84,m__83) +&
-     & 5.0d+00 * u(i__86,j__85,k__84,m__83))
-                  enddo  
-               endif  
-               flux_(1) = u(i__86,j__85,k__84 - 1,4)
-               u41__73 = u(i__86,j__85,k__84 - 1,4) / u(i__86,j__85,k__84 - 1,1)
-               q__76 = 0.50d+00 * (u(i__86,j__85,k__84 - 1,2) * u(i__86,j__85,k__84 - 1,2) + u(i__86,j__85,k__84 - 1,3) * u(i__86,j_&
-     &_85,k__84 - 1,3) + u(i__86,j__85,k__84 - 1,4) * u(i__86,j__85,k__84 - 1,4)) / u(i__86,j__85,k__84 - 1,1)
-               flux_(2) = u(i__86,j__85,k__84 - 1,2) * u41__73
-               flux_(3) = u(i__86,j__85,k__84 - 1,3) * u41__73
-               flux_(4) = u(i__86,j__85,k__84 - 1,4) * u41__73 + c2 * (u(i__86,j__85,k__84 - 1,5) - q__76)
-               flux_(5) = (c1 * u(i__86,j__85,k__84 - 1,5) - c2 * q__76) * u41__73
-               flux_(6) = u(i__86,j__85,k__84 + 1,4)
-               u41__73 = u(i__86,j__85,k__84 + 1,4) / u(i__86,j__85,k__84 + 1,1)
-               q__76 = 0.50d+00 * (u(i__86,j__85,k__84 + 1,2) * u(i__86,j__85,k__84 + 1,2) + u(i__86,j__85,k__84 + 1,3) * u(i__86,j_&
-     &_85,k__84 + 1,3) + u(i__86,j__85,k__84 + 1,4) * u(i__86,j__85,k__84 + 1,4)) / u(i__86,j__85,k__84 + 1,1)
-               flux_(7) = u(i__86,j__85,k__84 + 1,2) * u41__73
-               flux_(8) = u(i__86,j__85,k__84 + 1,3) * u41__73
-               flux_(9) = u(i__86,j__85,k__84 + 1,4) * u41__73 + c2 * (u(i__86,j__85,k__84 + 1,5) - q__76)
-               flux_(10) = (c1 * u(i__86,j__85,k__84 + 1,5) - c2 * q__76) * u41__73
-               do  m__83 = 1,5
-                  rsd_(m__83) = rsd_(m__83) - tz2 * (flux_(m__83 + 5) - flux_(m__83))
-               enddo  
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21k__63 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31k__62 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41k__61 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51k__60 = tmp__72 * u(i__86,j__85,k__84,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84 - 1,1)
-               u21km1__51 = tmp__72 * u(i__86,j__85,k__84 - 1,2)
-               u31km1__50 = tmp__72 * u(i__86,j__85,k__84 - 1,3)
-               u41km1__49 = tmp__72 * u(i__86,j__85,k__84 - 1,4)
-               u51km1__48 = tmp__72 * u(i__86,j__85,k__84 - 1,5)
-               flux_(2) = tz3 * (u21k__63 - u21km1__51)
-               flux_(3) = tz3 * (u31k__62 - u31km1__50)
-               flux_(4) = 4.0d+00 / 3.0d+00 * tz3 * (u41k__61 - u41km1__49)
-               flux_(5) = 0.50d+00 * (1.0d+00 - c1 * c5) * tz3 * (u21k__63** 2 + u31k__62** 2 + u41k__61** 2 - (u21km1__51** 2 + u31&
-     &km1__50** 2 + u41km1__49** 2)) + 1.0d+00 / 6.0d+00 * tz3 * (u41k__61** 2 - u41km1__49** 2) + c1 * c5 * tz3 * (u51k__60 - u51km&
-     &1__48)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84 + 1,1)
-               u21k__63 = tmp__72 * u(i__86,j__85,k__84 + 1,2)
-               u31k__62 = tmp__72 * u(i__86,j__85,k__84 + 1,3)
-               u41k__61 = tmp__72 * u(i__86,j__85,k__84 + 1,4)
-               u51k__60 = tmp__72 * u(i__86,j__85,k__84 + 1,5)
-               tmp__72 = 1.0d+00 / u(i__86,j__85,k__84,1)
-               u21km1__51 = tmp__72 * u(i__86,j__85,k__84,2)
-               u31km1__50 = tmp__72 * u(i__86,j__85,k__84,3)
-               u41km1__49 = tmp__72 * u(i__86,j__85,k__84,4)
-               u51km1__48 = tmp__72 * u(i__86,j__85,k__84,5)
-               flux_(7) = tz3 * (u21k__63 - u21km1__51)
-               flux_(8) = tz3 * (u31k__62 - u31km1__50)
-               flux_(9) = 4.0d+00 / 3.0d+00 * tz3 * (u41k__61 - u41km1__49)
-               flux_(10) = 0.50d+00 * (1.0d+00 - c1 * c5) * tz3 * (u21k__63** 2 + u31k__62** 2 + u41k__61** 2 - (u21km1__51** 2 + u3&
-     &1km1__50** 2 + u41km1__49** 2)) + 1.0d+00 / 6.0d+00 * tz3 * (u41k__61** 2 - u41km1__49** 2) + c1 * c5 * tz3 * (u51k__60 - u51k&
-     &m1__48)
-               rsd_(1) = rsd_(1) + dz1 * tz1 * (u(i__86,j__85,k__84 - 1,1) - 2.0d+00 * u(i__86,j__85,k__84,1) + u(i__86,j__85,k__84 &
-     &+ 1,1))
-               rsd_(2) = rsd_(2) + tz3 * c3 * c4 * (flux_(7) - flux_(2)) + dz2 * tz1 * (u(i__86,j__85,k__84 - 1,2) - 2.0d+00 * u(i__&
-     &86,j__85,k__84,2) + u(i__86,j__85,k__84 + 1,2))
-               rsd_(3) = rsd_(3) + tz3 * c3 * c4 * (flux_(8) - flux_(3)) + dz3 * tz1 * (u(i__86,j__85,k__84 - 1,3) - 2.0d+00 * u(i__&
-     &86,j__85,k__84,3) + u(i__86,j__85,k__84 + 1,3))
-               rsd_(4) = rsd_(4) + tz3 * c3 * c4 * (flux_(9) - flux_(4)) + dz4 * tz1 * (u(i__86,j__85,k__84 - 1,4) - 2.0d+00 * u(i__&
-     &86,j__85,k__84,4) + u(i__86,j__85,k__84 + 1,4))
-               rsd_(5) = rsd_(5) + tz3 * c3 * c4 * (flux_(10) - flux_(5)) + dz5 * tz1 * (u(i__86,j__85,k__84 - 1,5) - 2.0d+00 * u(i_&
-     &_86,j__85,k__84,5) + u(i__86,j__85,k__84 + 1,5))
-               if (k__84 .eq. 2) then
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * ((+(5.0d+00)) * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85,k__84 +&
-     & 1,m__83) + u(i__86,j__85,k__84 + 2,m__83))
-                  enddo  
-               else if (k__84 .eq. 3) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * ((-(4.0d+00)) * u(i__86,j__85,k__84 - 1,m__83) + 6.0d+00 * u(i__86,j__85,k__&
-     &84,m__83) - 4.0d+00 * u(i__86,j__85,k__84 + 1,m__83) + u(i__86,j__85,k__84 + 2,m__83))
-                  enddo  
-               else if (k__84 .ge. 4 .and. k__84 .le. nz - 3) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * (u(i__86,j__85,k__84 - 2,m__83) - 4.0d+00 * u(i__86,j__85,k__84 - 1,m__83) +&
-     & 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85,k__84 + 1,m__83) + u(i__86,j__85,k__84 + 2,m__83))
-                  enddo  
-               else if (k__84 .eq. nz - 2) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * (u(i__86,j__85,k__84 - 2,m__83) - 4.0d+00 * u(i__86,j__85,k__84 - 1,m__83) +&
-     & 6.0d+00 * u(i__86,j__85,k__84,m__83) - 4.0d+00 * u(i__86,j__85,k__84 + 1,m__83))
-                  enddo  
-               else if (k__84 .eq. nz - 1) then  
-                  do  m__83 = 1,5
-                     rsd_(m__83) = rsd_(m__83) - dssp * (u(i__86,j__85,k__84 - 2,m__83) - 4.0d+00 * u(i__86,j__85,k__84 - 1,m__83) +&
-     & 5.0d+00 * u(i__86,j__85,k__84,m__83))
-                  enddo  
-               endif  
-               do  m__83 = 1,5
-                  rsd(i__86,j__85,k__84,m__83) = rsd_(m__83)
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ END REGION
-      mod_1150_42 = mod (istep,inorm)
-      if (mod_1150_42 .eq. 0 .or. istep .eq. itmax) then
-         v_1573_88 = isiz1 / 2 * 2 + 1
-         v_1573_87 = isiz2 / 2 * 2 + 1
-         do  m__89 = 1,5
-            rsdnm(m__89) = 0.0d+00
-         enddo  
-         r1 = 0.0d0
-         r2 = 0.0d0
-         r3 = 0.0d0
-         r4 = 0.0d0
-         r5 = 0.0d0
-!DVM$    REGION 
-!DVM$    PARALLEL (k__90,j__91,i__92) ON rsd(i__92,j__91,k__90,*),REDUCTION (sum(r1),sum(r2),sum(r3),sum(r4),sum(r5)),CUDA_BLOCK (32&
-!DVM$&,4)
-         do  k__90 = 2,nz0 - 1
-            do  j__91 = jst,jend
-               do  i__92 = ist,iend
-                  r1 = r1 + rsd(i__92,j__91,k__90,1) * rsd(i__92,j__91,k__90,1)
-                  r2 = r2 + rsd(i__92,j__91,k__90,2) * rsd(i__92,j__91,k__90,2)
-                  r3 = r3 + rsd(i__92,j__91,k__90,3) * rsd(i__92,j__91,k__90,3)
-                  r4 = r4 + rsd(i__92,j__91,k__90,4) * rsd(i__92,j__91,k__90,4)
-                  r5 = r5 + rsd(i__92,j__91,k__90,5) * rsd(i__92,j__91,k__90,5)
-               enddo  
-            enddo  
-         enddo  
-!DVM$    END REGION
-         rsdnm(1) = r1
-         rsdnm(2) = r2
-         rsdnm(3) = r3
-         rsdnm(4) = r4
-         rsdnm(5) = r5
-         do  m__89 = 1,5
-            rsdnm(m__89) = sqrt (rsdnm(m__89) / ((nx0 - 2) * (ny0 - 2) * (nz0 - 2)))
-         enddo  
-      endif  
-      if (rsdnm(1) .lt. tolrsd(1) .and. rsdnm(2) .lt. tolrsd(2) .and. rsdnm(3) .lt. tolrsd(3) .and. rsdnm(4) .lt. tolrsd(4) .and. rs&
-     &dnm(5) .lt. tolrsd(5)) then
-         goto 2047
-      endif  
-      istep = istep + 1
-      if (touch .eq. 1) then
-         touch = 0
-         goto 10001
-      endif  
-      if (istep .gt. itmax)       goto 2046
-      goto 2045
-2046  t = dvtime ()
-
-!call etime(tarray)
-!      t = tarray(1)
-      now = t
-      t__110 = now - start(1)
-      elapsed(1) = elapsed(1) + t__110
-      maxtime = elapsed(1)
-2047  continue
-      do  m__114 = 1,5
-         errnm(m__114) = 0.0d+00
-      enddo  
-!DVM$ GET_ACTUAL (u)
-!DVM$ PARALLEL (k__115,j__116,i__117) ON u(i__117,j__116,k__115,*),REDUCTION (sum(errnm)),PRIVATE (jglob__112,iglob__113,dble_739_12&
-!DVM$&,xi,dble_739_13,eta,dble_739_14,zeta,m__15,m__114,tmp__111,u000ijk)
-      do  k__115 = 2,nz - 1
-         do  j__116 = jst,jend
-            do  i__117 = ist,iend
-               jglob__112 = j__116
-               iglob__113 = i__117
-               dble_739_12 = dble (iglob__113 - 1)
-               xi = dble_739_12 / (nx0 - 1)
-               dble_739_13 = dble (jglob__112 - 1)
-               eta = dble_739_13 / (ny0 - 1)
-               dble_739_14 = dble (k__115 - 1)
-               zeta = dble_739_14 / (nz - 1)
-               do  m__15 = 1,5
-                  u000ijk(m__15) = ce(m__15,1) + ce(m__15,2) * xi + ce(m__15,3) * eta + ce(m__15,4) * zeta + ce(m__15,5) * xi * xi +&
-     & ce(m__15,6) * eta * eta + ce(m__15,7) * zeta * zeta + ce(m__15,8) * xi * xi * xi + ce(m__15,9) * eta * eta * eta + ce(m__15,1&
-     &0) * zeta * zeta * zeta + ce(m__15,11) * xi * xi * xi * xi + ce(m__15,12) * eta * eta * eta * eta + ce(m__15,13) * zeta * zeta&
-     & * zeta * zeta
-               enddo  
-               do  m__114 = 1,5
-                  tmp__111 = u000ijk(m__114) - u(i__117,j__116,k__115,m__114)
-                  errnm(m__114) = errnm(m__114) + tmp__111** 2
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-      do  m__114 = 1,5
-         errnm(m__114) = sqrt (errnm(m__114) / ((nx0 - 2) * (ny0 - 2) * (nz0 - 2)))
-      enddo  
-      ibeg = nx + 1
-      ifin = 0
-      iglob1 = 1
-      iglob2 = nx
-      if (iglob1 .ge. ii1 .and. iglob2 .lt. ii2 + nx)       ibeg = 1
-      if (iglob1 .gt. ii1 - nx .and. iglob2 .le. ii2)       ifin = nx
-      if (ii1 .ge. iglob1 .and. ii1 .le. iglob2)       ibeg = ii1
-      if (ii2 .ge. iglob1 .and. ii2 .le. iglob2)       ifin = ii2
-      jbeg = ny + 1
-      jfin = 0
-      jglob1 = 1
-      jglob2 = ny
-      if (jglob1 .ge. ji1 .and. jglob2 .lt. ji2 + ny)       jbeg = 1
-      if (jglob1 .gt. ji1 - ny .and. jglob2 .le. ji2)       jfin = ny
-      if (ji1 .ge. jglob1 .and. ji1 .le. jglob2)       jbeg = ji1
-      if (ji2 .ge. jglob1 .and. ji2 .le. jglob2)       jfin = ji2
-      ifin1 = ifin
-      jfin1 = jfin
-      if (ifin1 .eq. ii2)       ifin1 = ifin - 1
-      if (jfin1 .eq. ji2)       jfin1 = jfin - 1
-      s1 = 0.
-      s2 = 0.
-!DVM$ PARALLEL (k__120,j__121,i__122) ON u(i__122,j__121,k__120,*),REDUCTION (sum(s1)),SHADOW_RENEW (u(0:1,0:1,0:0,0:0)(corner)),PRI&
-!DVM$&VATE (jglob__118,iglob__119)
-      do  k__120 = ki1,ki1
-         do  j__121 = jbeg,jfin1
-            do  i__122 = ibeg,ifin1
-               jglob__118 = j__121
-               iglob__119 = i__122
-               s1 = s1 + c2 * (u(i__122,j__121,k__120,5) - 0.50d+00 * (u(i__122,j__121,k__120,2)** 2 + u(i__122,j__121,k__120,3)** 2&
-     & + u(i__122,j__121,k__120,4)** 2) / u(i__122,j__121,k__120,1)) + c2 * (u(i__122 + 1,j__121,k__120,5) - 0.50d+00 * (u(i__122 + &
-     &1,j__121,k__120,2)** 2 + u(i__122 + 1,j__121,k__120,3)** 2 + u(i__122 + 1,j__121,k__120,4)** 2) / u(i__122 + 1,j__121,k__120,1&
-     &))
-               s1 = s1 + c2 * (u(i__122,j__121 + 1,k__120,5) - 0.50d+00 * (u(i__122,j__121 + 1,k__120,2)** 2 + u(i__122,j__121 + 1,k&
-     &__120,3)** 2 + u(i__122,j__121 + 1,k__120,4)** 2) / u(i__122,j__121 + 1,k__120,1)) + c2 * (u(i__122 + 1,j__121 + 1,k__120,5) -&
-     & 0.50d+00 * (u(i__122 + 1,j__121 + 1,k__120,2)** 2 + u(i__122 + 1,j__121 + 1,k__120,3)** 2 + u(i__122 + 1,j__121 + 1,k__120,4)&
-     &** 2) / u(i__122 + 1,j__121 + 1,k__120,1))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k__120,j__121,i__122) ON u(i__122,j__121,k__120,*),REDUCTION (sum(s2)),SHADOW_RENEW (u(0:1,0:1,0:0,0:0)(corner)),PRI&
-!DVM$&VATE (jglob__118,iglob__119)
-      do  k__120 = ki2,ki2
-         do  j__121 = jbeg,jfin1
-            do  i__122 = ibeg,ifin1
-               jglob__118 = j__121
-               iglob__119 = i__122
-               s2 = s2 + c2 * (u(i__122,j__121,k__120,5) - 0.50d+00 * (u(i__122,j__121,k__120,2)** 2 + u(i__122,j__121,k__120,3)** 2&
-     & + u(i__122,j__121,k__120,4)** 2) / u(i__122,j__121,k__120,1)) + c2 * (u(i__122 + 1,j__121,k__120,5) - 0.50d+00 * (u(i__122 + &
-     &1,j__121,k__120,2)** 2 + u(i__122 + 1,j__121,k__120,3)** 2 + u(i__122 + 1,j__121,k__120,4)** 2) / u(i__122 + 1,j__121,k__120,1&
-     &))
-               s2 = s2 + c2 * (u(i__122,j__121 + 1,k__120,5) - 0.50d+00 * (u(i__122,j__121 + 1,k__120,2)** 2 + u(i__122,j__121 + 1,k&
-     &__120,3)** 2 + u(i__122,j__121 + 1,k__120,4)** 2) / u(i__122,j__121 + 1,k__120,1)) + c2 * (u(i__122 + 1,j__121 + 1,k__120,5) -&
-     & 0.50d+00 * (u(i__122 + 1,j__121 + 1,k__120,2)** 2 + u(i__122 + 1,j__121 + 1,k__120,3)** 2 + u(i__122 + 1,j__121 + 1,k__120,4)&
-     &** 2) / u(i__122 + 1,j__121 + 1,k__120,1))
-            enddo  
-         enddo  
-      enddo  
-      frc1 = dxi * deta * (s1 + s2)
-      s1 = 0.
-      jglob__118 = jbeg
-      ind1 = 0
-      if (jglob__118 .eq. ji1) then
-         ind1 = 1
-!DVM$    PARALLEL (k__120,j__121,i__122) ON u(i__122,j__121,k__120,*),REDUCTION (sum(s1)),SHADOW_RENEW (u(0:1,0:0,0:1,0:0)(corner)),&
-!DVM$&PRIVATE (iglob__119)
-         do  k__120 = ki1,ki2 - 1
-            do  j__121 = jbeg,jbeg
-               do  i__122 = ibeg,ifin1
-                  iglob__119 = i__122
-                  s1 = s1 + c2 * (u(i__122,j__121,k__120,5) - 0.50d+00 * (u(i__122,j__121,k__120,2)** 2 + u(i__122,j__121,k__120,3)*&
-     &* 2 + u(i__122,j__121,k__120,4)** 2) / u(i__122,j__121,k__120,1)) + c2 * (u(i__122 + 1,j__121,k__120,5) - 0.50d+00 * (u(i__122&
-     & + 1,j__121,k__120,2)** 2 + u(i__122 + 1,j__121,k__120,3)** 2 + u(i__122 + 1,j__121,k__120,4)** 2) / u(i__122 + 1,j__121,k__12&
-     &0,1))
-                  s1 = s1 + c2 * (u(i__122,j__121,k__120 + 1,5) - 0.50d+00 * (u(i__122,j__121,k__120 + 1,2)** 2 + u(i__122,j__121,k_&
-     &_120 + 1,3)** 2 + u(i__122,j__121,k__120 + 1,4)** 2) / u(i__122,j__121,k__120 + 1,1)) + c2 * (u(i__122 + 1,j__121,k__120 + 1,5&
-     &) - 0.50d+00 * (u(i__122 + 1,j__121,k__120 + 1,2)** 2 + u(i__122 + 1,j__121,k__120 + 1,3)** 2 + u(i__122 + 1,j__121,k__120 + 1&
-     &,4)** 2) / u(i__122 + 1,j__121,k__120 + 1,1))
-               enddo  
-            enddo  
-         enddo  
-      endif  
-      s2 = 0.
-      jglob__118 = jfin
-      ind2 = 0
-      if (jglob__118 .eq. ji2) then
-         ind2 = 1
-!DVM$    PARALLEL (k__120,j__121,i__122) ON u(i__122,j__121,k__120,*),REDUCTION (sum(s2)),SHADOW_RENEW (u(0:1,0:0,0:1,0:0)(corner)),&
-!DVM$&PRIVATE (iglob__119)
-         do  k__120 = ki1,ki2 - 1
-            do  j__121 = jfin,jfin
-               do  i__122 = ibeg,ifin1
-                  iglob__119 = i__122
-                  s2 = s2 + c2 * (u(i__122,j__121,k__120,5) - 0.50d+00 * (u(i__122,j__121,k__120,2)** 2 + u(i__122,j__121,k__120,3)*&
-     &* 2 + u(i__122,j__121,k__120,4)** 2) / u(i__122,j__121,k__120,1)) + c2 * (u(i__122 + 1,j__121,k__120,5) - 0.50d+00 * (u(i__122&
-     & + 1,j__121,k__120,2)** 2 + u(i__122 + 1,j__121,k__120,3)** 2 + u(i__122 + 1,j__121,k__120,4)** 2) / u(i__122 + 1,j__121,k__12&
-     &0,1))
-                  s2 = s2 + c2 * (u(i__122,j__121,k__120 + 1,5) - 0.50d+00 * (u(i__122,j__121,k__120 + 1,2)** 2 + u(i__122,j__121,k_&
-     &_120 + 1,3)** 2 + u(i__122,j__121,k__120 + 1,4)** 2) / u(i__122,j__121,k__120 + 1,1)) + c2 * (u(i__122 + 1,j__121,k__120 + 1,5&
-     &) - 0.50d+00 * (u(i__122 + 1,j__121,k__120 + 1,2)** 2 + u(i__122 + 1,j__121,k__120 + 1,3)** 2 + u(i__122 + 1,j__121,k__120 + 1&
-     &,4)** 2) / u(i__122 + 1,j__121,k__120 + 1,1))
-               enddo  
-            enddo  
-         enddo  
-      endif  
-      frc2 = dxi * dzeta * (s1 + s2)
-      s1 = 0.
-      s2 = 0.
-      iglob__119 = ibeg
-      ind1 = 0
-      if (iglob__119 .eq. ii1) then
-         ind1 = 1
-!DVM$    PARALLEL (k__120,j__121,i__122) ON u(i__122,j__121,k__120,*),REDUCTION (sum(s1)),SHADOW_RENEW (u(0:0,0:1,0:1,0:0)(corner)),&
-!DVM$&PRIVATE (jglob__118)
-         do  k__120 = ki1,ki2 - 1
-            do  j__121 = jbeg,jfin1
-               do  i__122 = ibeg,ibeg
-                  jglob__118 = j__121
-                  s1 = s1 + c2 * (u(i__122,j__121,k__120,5) - 0.50d+00 * (u(i__122,j__121,k__120,2)** 2 + u(i__122,j__121,k__120,3)*&
-     &* 2 + u(i__122,j__121,k__120,4)** 2) / u(i__122,j__121,k__120,1)) + c2 * (u(i__122,j__121 + 1,k__120,5) - 0.50d+00 * (u(i__122&
-     &,j__121 + 1,k__120,2)** 2 + u(i__122,j__121 + 1,k__120,3)** 2 + u(i__122,j__121 + 1,k__120,4)** 2) / u(i__122,j__121 + 1,k__12&
-     &0,1))
-                  s1 = s1 + c2 * (u(i__122,j__121,k__120 + 1,5) - 0.50d+00 * (u(i__122,j__121,k__120 + 1,2)** 2 + u(i__122,j__121,k_&
-     &_120 + 1,3)** 2 + u(i__122,j__121,k__120 + 1,4)** 2) / u(i__122,j__121,k__120 + 1,1)) + c2 * (u(i__122,j__121 + 1,k__120 + 1,5&
-     &) - 0.50d+00 * (u(i__122,j__121 + 1,k__120 + 1,2)** 2 + u(i__122,j__121 + 1,k__120 + 1,3)** 2 + u(i__122,j__121 + 1,k__120 + 1&
-     &,4)** 2) / u(i__122,j__121 + 1,k__120 + 1,1))
-               enddo  
-            enddo  
-         enddo  
-      endif  
-      iglob__119 = ifin
-      ind2 = 0
-      if (iglob__119 .eq. ii2) then
-         ind2 = 1
-!DVM$    PARALLEL (k__120,j__121,i__122) ON u(i__122,j__121,k__120,*),REDUCTION (sum(s2)),SHADOW_RENEW (u(0:0,0:1,0:1,0:0)(corner)),&
-!DVM$&PRIVATE (jglob__118)
-         do  k__120 = ki1,ki2 - 1
-            do  j__121 = jbeg,jfin1
-               do  i__122 = ifin,ifin
-                  jglob__118 = j__121
-                  s2 = s2 + c2 * (u(i__122,j__121,k__120,5) - 0.50d+00 * (u(i__122,j__121,k__120,2)** 2 + u(i__122,j__121,k__120,3)*&
-     &* 2 + u(i__122,j__121,k__120,4)** 2) / u(i__122,j__121,k__120,1)) + c2 * (u(i__122,j__121 + 1,k__120,5) - 0.50d+00 * (u(i__122&
-     &,j__121 + 1,k__120,2)** 2 + u(i__122,j__121 + 1,k__120,3)** 2 + u(i__122,j__121 + 1,k__120,4)** 2) / u(i__122,j__121 + 1,k__12&
-     &0,1))
-                  s2 = s2 + c2 * (u(i__122,j__121,k__120 + 1,5) - 0.50d+00 * (u(i__122,j__121,k__120 + 1,2)** 2 + u(i__122,j__121,k_&
-     &_120 + 1,3)** 2 + u(i__122,j__121,k__120 + 1,4)** 2) / u(i__122,j__121,k__120 + 1,1)) + c2 * (u(i__122,j__121 + 1,k__120 + 1,5&
-     &) - 0.50d+00 * (u(i__122,j__121 + 1,k__120 + 1,2)** 2 + u(i__122,j__121 + 1,k__120 + 1,3)** 2 + u(i__122,j__121 + 1,k__120 + 1&
-     &,4)** 2) / u(i__122,j__121 + 1,k__120 + 1,1))
-               enddo  
-            enddo  
-         enddo  
-      endif  
-      frc3 = deta * dzeta * (s1 + s2)
-      frc = 0.25d+00 * (frc1 + frc2 + frc3)
-      epsilon = 1.0d-08
-      class = 'U'
-      verified = .TRUE.
-      do  m__124 = 1,5
-         xcrref(m__124) = 1.0
-         xceref(m__124) = 1.0
-      enddo  
-      xciref = 1.0
-      if (nx0 .eq. 12 .and. ny0 .eq. 12 .and. nz0 .eq. 12 .and. itmax .eq. 50) then
-         class = 'S'
-         dtref = 5.0d-1
-         xcrref(1) = 1.6196343210976702d-02
-         xcrref(2) = 2.1976745164821318d-03
-         xcrref(3) = 1.5179927653399185d-03
-         xcrref(4) = 1.5029584435994323d-03
-         xcrref(5) = 3.4264073155896461d-02
-         xceref(1) = 6.4223319957960924d-04
-         xceref(2) = 8.4144342047347926d-05
-         xceref(3) = 5.8588269616485186d-05
-         xceref(4) = 5.8474222595157350d-05
-         xceref(5) = 1.3103347914111294d-03
-         xciref = 7.8418928865937083d+00
-      else if (nx0 .eq. 33 .and. ny0 .eq. 33 .and. nz0 .eq. 33 .and. itmax .eq. 300) then  
-         class = 'W'
-         dtref = 1.5d-3
-         xcrref(1) = 0.1236511638192d+02
-         xcrref(2) = 0.1317228477799d+01
-         xcrref(3) = 0.2550120713095d+01
-         xcrref(4) = 0.2326187750252d+01
-         xcrref(5) = 0.2826799444189d+02
-         xceref(1) = 0.4867877144216d+00
-         xceref(2) = 0.5064652880982d-01
-         xceref(3) = 0.9281818101960d-01
-         xceref(4) = 0.8570126542733d-01
-         xceref(5) = 0.1084277417792d+01
-         xciref = 0.1161399311023d+02
-      else if (nx0 .eq. 64 .and. ny0 .eq. 64 .and. nz0 .eq. 64 .and. itmax .eq. 250) then  
-         class = 'A'
-         dtref = 2.0d+0
-         xcrref(1) = 7.7902107606689367d+02
-         xcrref(2) = 6.3402765259692870d+01
-         xcrref(3) = 1.9499249727292479d+02
-         xcrref(4) = 1.7845301160418537d+02
-         xcrref(5) = 1.8384760349464247d+03
-         xceref(1) = 2.9964085685471943d+01
-         xceref(2) = 2.8194576365003349d+00
-         xceref(3) = 7.3473412698774742d+00
-         xceref(4) = 6.7139225687777051d+00
-         xceref(5) = 7.0715315688392578d+01
-         xciref = 2.6030925604886277d+01
-      else if (nx0 .eq. 102 .and. ny0 .eq. 102 .and. nz0 .eq. 102 .and. itmax .eq. 250) then  
-         class = 'B'
-         dtref = 2.0d+0
-         xcrref(1) = 3.5532672969982736d+03
-         xcrref(2) = 2.6214750795310692d+02
-         xcrref(3) = 8.8333721850952190d+02
-         xcrref(4) = 7.7812774739425265d+02
-         xcrref(5) = 7.3087969592545314d+03
-         xceref(1) = 1.1401176380212709d+02
-         xceref(2) = 8.1098963655421574d+00
-         xceref(3) = 2.8480597317698308d+01
-         xceref(4) = 2.5905394567832939d+01
-         xceref(5) = 2.6054907504857413d+02
-         xciref = 4.7887162703308227d+01
-      else if (nx0 .eq. 162 .and. ny0 .eq. 162 .and. nz0 .eq. 162 .and. itmax .eq. 250) then  
-         class = 'C'
-         dtref = 2.0d+0
-         xcrref(1) = 1.03766980323537846d+04
-         xcrref(2) = 8.92212458801008552d+02
-         xcrref(3) = 2.56238814582660871d+03
-         xcrref(4) = 2.19194343857831427d+03
-         xcrref(5) = 1.78078057261061185d+04
-         xceref(1) = 2.15986399716949279d+02
-         xceref(2) = 1.55789559239863600d+01
-         xceref(3) = 5.41318863077207766d+01
-         xceref(4) = 4.82262643154045421d+01
-         xceref(5) = 4.55902910043250358d+02
-         xciref = 6.66404553572181300d+01
-      else if (nx0 .eq. 408 .and. ny0 .eq. 408 .and. nz0 .eq. 408 .and. itmax .eq. 300) then  
-         class = 'D'
-         dtref = 1.0d+0
-         xcrref(1) = 0.4868417937025d+05
-         xcrref(2) = 0.4696371050071d+04
-         xcrref(3) = 0.1218114549776d+05
-         xcrref(4) = 0.1033801493461d+05
-         xcrref(5) = 0.7142398413817d+05
-         xceref(1) = 0.3752393004482d+03
-         xceref(2) = 0.3084128893659d+02
-         xceref(3) = 0.9434276905469d+02
-         xceref(4) = 0.8230686681928d+02
-         xceref(5) = 0.7002620636210d+03
-         xciref = 0.8334101392503d+02
-      else if (nx0 .eq. 1020 .and. ny0 .eq. 1020 .and. nz0 .eq. 1020 .and. itmax .eq. 300) then  
-         class = 'E'
-         dtref = 0.5d+0
-         xcrref(1) = 0.2099641687874d+06
-         xcrref(2) = 0.2130403143165d+05
-         xcrref(3) = 0.5319228789371d+05
-         xcrref(4) = 0.4509761639833d+05
-         xcrref(5) = 0.2932360006590d+06
-         xceref(1) = 0.4800572578333d+03
-         xceref(2) = 0.4221993400184d+02
-         xceref(3) = 0.1210851906824d+03
-         xceref(4) = 0.1047888986770d+03
-         xceref(5) = 0.8363028257389d+03
-         xciref = 0.9512163272273d+02
-      else  
-         verified = .FALSE.
-      endif  
-      do  m__124 = 1,5
-         xcrdif(m__124) = dabs ((rsdnm(m__124) - xcrref(m__124)) / xcrref(m__124))
-         xcedif(m__124) = dabs ((errnm(m__124) - xceref(m__124)) / xceref(m__124))
-      enddo  
-      xcidif = dabs ((frc - xciref) / xciref)
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 1990) class
-         write (unit = *,fmt = 2000) epsilon
-         dabs_1966_123 = dabs (dt - dtref)
-         if (dabs_1966_123 .gt. epsilon) then
-            verified = .FALSE.
-            class = 'U'
-            write (unit = *,fmt = 2060) dtref
-         endif  
-      else  
-         write (unit = *,fmt = 1995) 
-      endif  
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 2061) 
-      else  
-         write (unit = *,fmt = 2005) 
-      endif  
-      do  m__124 = 1,5
-         if (class .eq. 'U') then
-            write (unit = *,fmt = 2015) m__124,rsdnm(m__124)
-         else if (xcrdif(m__124) .gt. epsilon .or. isnan (xcrdif(m__124))) then  
-            verified = .FALSE.
-            write (unit = *,fmt = 2010) m__124,rsdnm(m__124),xcrref(m__124),xcrdif(m__124)
-         else  
-            write (unit = *,fmt = 2011) m__124,rsdnm(m__124),xcrref(m__124),xcrdif(m__124)
-         endif  
-      enddo  
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 2062) 
-      else  
-         write (unit = *,fmt = 2006) 
-      endif  
-      do  m__124 = 1,5
-         if (class .eq. 'U') then
-            write (unit = *,fmt = 2015) m__124,errnm(m__124)
-         else if (xcedif(m__124) .gt. epsilon .or. isnan (xcedif(m__124))) then  
-            verified = .FALSE.
-            write (unit = *,fmt = 2010) m__124,errnm(m__124),xceref(m__124),xcedif(m__124)
-         else  
-            write (unit = *,fmt = 2011) m__124,errnm(m__124),xceref(m__124),xcedif(m__124)
-         endif  
-      enddo  
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 2025) 
-      else  
-         write (unit = *,fmt = 2026) 
-      endif  
-      if (class .eq. 'U') then
-         write (unit = *,fmt = 2030) frc
-      else if (xcidif .gt. epsilon .or. isnan (xcidif)) then  
-         verified = .FALSE.
-         write (unit = *,fmt = 2031) frc,xciref,xcidif
-      else  
-         write (unit = *,fmt = 2032) frc,xciref,xcidif
-      endif  
-      if (class .eq. 'U') then
-         write (unit = *,fmt = 2022) 
-         write (unit = *,fmt = 2023) 
-      else if (verified) then  
-         write (unit = *,fmt = 2020) 
-      else  
-         write (unit = *,fmt = 2021) 
-      endif  
-      float_141_0 = float (itmax)
-      float_141_1 = float (nx0)
-      float_141_2 = float (ny0)
-      float_141_3 = float (nz0)
-      float_141_4 = float (nx0 + ny0 + nz0)
-      float_141_5 = float (nx0 + ny0 + nz0)
-      mflops = float_141_0 * (1984.77 * float_141_1 * float_141_2 * float_141_3 - 10923.3 * (float_141_4 / 3.)** 2 + 27770.9 * float&
-     &_141_5 / 3. - 144010.) / (maxtime * 1000000.)
-      print_results_142_arg1_6 = 'LU'
-      print_results_142_arg9_7 = '          floating point'
-      write (unit = *,fmt = 2) print_results_142_arg1_6
-      write (unit = *,fmt = 3) class
-      if (ny0 .eq. 0 .and. nz0 .eq. 0) then
-         if (print_results_142_arg1_6(1:2) .eq. 'EP') then
-            write (unit = size,fmt = '(f12.0)') 2.d0** nx0
-            do  j__125 = 13,1,(-(1))
-               if (size(j__125:j__125) .eq. '.')                size(j__125:j__125) = ' '
-            enddo  
-            write (unit = *,fmt = 42) size
-         else  
-            write (unit = *,fmt = 44) nx0
-         endif  
-      else  
-         write (unit = *,fmt = 4) nx0,ny0,nz0
-      endif  
-      write (unit = *,fmt = 5) itmax
-      write (unit = *,fmt = 6) maxtime
-      write (unit = *,fmt = 9) mflops
-      write (unit = *,fmt = 11) print_results_142_arg9_7
-      if (verified) then
-         write (unit = *,fmt = 12) '  SUCCESSFUL'
-      else  
-         write (unit = *,fmt = 12) 'UNSUCCESSFUL'
-      endif  
-      write (unit = *,fmt = 13) npbversion
-      write (unit = *,fmt = 130) 
-
-!       , compiletime, cs1, cs2, cs3, cs4, cs5, cs6, '(none)')
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/pintgr.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/pintgr.f
deleted file mode 100644
index ea12392..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/pintgr.f
+++ /dev/null
@@ -1,187 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine pintgr ()
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  local variables
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      integer  i,j,k
-      integer  ibeg,ifin,ifin1
-      integer  jbeg,jfin,jfin1
-
-!DVM$ ALIGN phi1(iEX1,iEX2) WITH dvmh_temp0(*,iEX1,*,iEX2)
-!DVM$ ALIGN phi2(iEX1,iEX2) WITH dvmh_temp0(*,iEX1,*,iEX2)
-!DVM$ DYNAMIC phi1,phi2
-      double precision  phi1(0:isiz2 + 1,0:isiz3 + 1),phi2(0:isiz2 + 1,0
-     &:isiz3 + 1)
-!DVM$ SHADOW phi2( 0:1,0:1 )
-!DVM$ SHADOW phi1( 0:1,0:1 )
-      double precision  frc1,frc2,frc3
-
-!---------------------------------------------------------------------
-!   set up the sub-domains for integeration in each processor
-!---------------------------------------------------------------------
-      ibeg = ii1
-      ifin = ii2
-      jbeg = ji1
-      jfin = ji2
-      ifin1 = ifin - 1
-      jfin1 = jfin - 1
-
-!---------------------------------------------------------------------
-!   initialize
-!---------------------------------------------------------------------
-!DVM$ PARALLEL (i,k) ON phi1(i,k), PRIVATE (k,i)
-      do  i = 0,isiz2 + 1
-         do  k = 0,isiz3 + 1
-            phi1(i,k) = 0.
-            phi2(i,k) = 0.
-         enddo  
-      enddo  
-!DVM$ PARALLEL (j,i) ON phi1(i,j), REMOTE_ACCESS (u(:,:,:,:)),PRIVATE (k
-!DVM$&,j,i)
-      do  j = jbeg,jfin
-         do  i = ibeg,ifin
-            k = ki1
-            phi1(i,j) = c2 * (u(5,i,j,k) - 0.50d+00 * (u(2,i,j,k)** 2 + 
-     &u(3,i,j,k)** 2 + u(4,i,j,k)** 2) / u(1,i,j,k))
-            k = ki2
-            phi2(i,j) = c2 * (u(5,i,j,k) - 0.50d+00 * (u(2,i,j,k)** 2 + 
-     &u(3,i,j,k)** 2 + u(4,i,j,k)** 2) / u(1,i,j,k))
-         enddo  
-      enddo  
-      frc1 = 0.0d+00
-!DVM$ PARALLEL (j,i) ON phi1(i,j), PRIVATE (j,i),SHADOW_RENEW (phi1(CORN
-!DVM$&ER),phi2(CORNER)),REDUCTION (sum (frc1))
-      do  j = jbeg,jfin1
-         do  i = ibeg,ifin1
-            frc1 = frc1 + (phi1(i,j) + phi1(i + 1,j) + phi1(i,j + 1) + p
-     &hi1(i + 1,j + 1) + phi2(i,j) + phi2(i + 1,j) + phi2(i,j + 1) + phi
-     &2(i + 1,j + 1))
-         enddo  
-      enddo  
-      frc1 = dxi * deta * frc1
-
-!---------------------------------------------------------------------
-!   initialize
-!---------------------------------------------------------------------
-!DVM$ PARALLEL (i,k) ON phi1(i,k), PRIVATE (k,i)
-      do  i = 0,isiz2 + 1
-         do  k = 0,isiz3 + 1
-            phi1(i,k) = 0.
-            phi2(i,k) = 0.
-         enddo  
-      enddo  
-      if (jbeg .eq. ji1) then
-!DVM$    PARALLEL (k,i) ON phi1(i,k), REMOTE_ACCESS (u(:,:,:,:)),PRIVATE
-!DVM$& (k,i)
-         do  k = ki1,ki2
-            do  i = ibeg,ifin
-               phi1(i,k) = c2 * (u(5,i,jbeg,k) - 0.50d+00 * (u(2,i,jbeg,
-     &k)** 2 + u(3,i,jbeg,k)** 2 + u(4,i,jbeg,k)** 2) / u(1,i,jbeg,k))
-            enddo  
-         enddo  
-      endif  
-      if (jfin .eq. ji2) then
-!DVM$    PARALLEL (k,i) ON phi2(i,k), REMOTE_ACCESS (u(:,:,:,:)),PRIVATE
-!DVM$& (k,i)
-         do  k = ki1,ki2
-            do  i = ibeg,ifin
-               phi2(i,k) = c2 * (u(5,i,jfin,k) - 0.50d+00 * (u(2,i,jfin,
-     &k)** 2 + u(3,i,jfin,k)** 2 + u(4,i,jfin,k)** 2) / u(1,i,jfin,k))
-            enddo  
-         enddo  
-      endif  
-      frc2 = 0.0d+00
-!DVM$ PARALLEL (k,i) ON phi1(i,k), PRIVATE (k,i),SHADOW_RENEW (phi1(CORN
-!DVM$&ER),phi2(CORNER)),REDUCTION (sum (frc2))
-      do  k = ki1,ki2 - 1
-         do  i = ibeg,ifin1
-            frc2 = frc2 + (phi1(i,k) + phi1(i + 1,k) + phi1(i,k + 1) + p
-     &hi1(i + 1,k + 1) + phi2(i,k) + phi2(i + 1,k) + phi2(i,k + 1) + phi
-     &2(i + 1,k + 1))
-         enddo  
-      enddo  
-      frc2 = dxi * dzeta * frc2
-
-!---------------------------------------------------------------------
-!   initialize
-!---------------------------------------------------------------------
-!DVM$ PARALLEL (i,k) ON phi1(i,k), PRIVATE (k,i)
-      do  i = 0,isiz2 + 1
-         do  k = 0,isiz3 + 1
-            phi1(i,k) = 0.
-            phi2(i,k) = 0.
-         enddo  
-      enddo  
-      if (ibeg .eq. ii1) then
-!DVM$    PARALLEL (k,j) ON phi1(j,k), REMOTE_ACCESS (u(:,:,:,:)),PRIVATE
-!DVM$& (k,j)
-         do  k = ki1,ki2
-            do  j = jbeg,jfin
-               phi1(j,k) = c2 * (u(5,ibeg,j,k) - 0.50d+00 * (u(2,ibeg,j,
-     &k)** 2 + u(3,ibeg,j,k)** 2 + u(4,ibeg,j,k)** 2) / u(1,ibeg,j,k))
-            enddo  
-         enddo  
-      endif  
-      if (ifin .eq. ii2) then
-!DVM$    PARALLEL (k,j) ON phi2(j,k), REMOTE_ACCESS (u(:,:,:,:)),PRIVATE
-!DVM$& (k,j)
-         do  k = ki1,ki2
-            do  j = jbeg,jfin
-               phi2(j,k) = c2 * (u(5,ifin,j,k) - 0.50d+00 * (u(2,ifin,j,
-     &k)** 2 + u(3,ifin,j,k)** 2 + u(4,ifin,j,k)** 2) / u(1,ifin,j,k))
-            enddo  
-         enddo  
-      endif  
-      frc3 = 0.0d+00
-!DVM$ PARALLEL (k,j) ON phi1(j,k), PRIVATE (k,j),SHADOW_RENEW (phi1(CORN
-!DVM$&ER),phi2(CORNER)),REDUCTION (sum (frc3))
-      do  k = ki1,ki2 - 1
-         do  j = jbeg,jfin1
-            frc3 = frc3 + (phi1(j,k) + phi1(j + 1,k) + phi1(j,k + 1) + p
-     &hi1(j + 1,k + 1) + phi2(j,k) + phi2(j + 1,k) + phi2(j,k + 1) + phi
-     &2(j + 1,k + 1))
-         enddo  
-      enddo  
-      frc3 = deta * dzeta * frc3
-      frc = 0.25d+00 * (frc1 + frc2 + frc3)
-
-!      write (*,1001) frc
-      return 
-
-! 1001 format (//5x,'surface integral = ',1pe12.5//)
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/print_results.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/print_results.f
deleted file mode 100644
index d2fe91e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/print_results.f
+++ /dev/null
@@ -1,111 +0,0 @@
-
-      subroutine print_results(name, class, n1, n2, n3, niter, 
-     >               t, mops, optype, verified, npbversion, 
-     >               compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-      
-      implicit none
-      character name*(*)
-      character class*1
-      integer   n1, n2, n3, niter, j
-      double precision t, mops
-      character optype*24, size*15
-      logical   verified
-      character*(*) npbversion, compiletime, 
-     >              cs1, cs2, cs3, cs4, cs5, cs6, cs7
-
-         write (*, 2) name 
- 2       format(//, ' ', A, ' Benchmark Completed.')
-
-         write (*, 3) Class
- 3       format(' Class           = ', 12x, a12)
-
-c   If this is not a grid-based problem (EP, FT, CG), then
-c   we only print n1, which contains some measure of the
-c   problem size. In that case, n2 and n3 are both zero.
-c   Otherwise, we print the grid size n1xn2xn3
-
-         if ((n2 .eq. 0) .and. (n3 .eq. 0)) then
-            if (name(1:2) .eq. 'EP') then
-               write(size, '(f15.0)' ) 2.d0**n1
-               j = 15
-               if (size(j:j) .eq. '.') then
-                  size(j:j) = ' '
-                  j = j - 1
-               endif
-               write (*,42) size(1:j)
- 42            format(' Size            = ',9x, a15)
-            else
-               write (*,44) n1
- 44            format(' Size            = ',12x, i12)
-            endif
-         else
-            write (*, 4) n1,n2,n3
- 4          format(' Size            =  ',9x, i4,'x',i4,'x',i4)
-         endif
-
-         write (*, 5) niter
- 5       format(' Iterations      = ', 12x, i12)
-         
-         write (*, 6) t
- 6       format(' Time in seconds = ',12x, f12.2)
-         
-         write (*,9) mops
- 9       format(' Mop/s total     = ',12x, f12.2)
-
-         write(*, 11) optype
- 11      format(' Operation type  = ', a24)
-
-         if (verified) then 
-            write(*,12) '  SUCCESSFUL'
-         else
-            write(*,12) 'UNSUCCESSFUL'
-         endif
- 12      format(' Verification    = ', 12x, a)
-
-         write(*,13) npbversion
- 13      format(' Version         = ', 12x, a12)
-
-         write(*,14) compiletime
- 14      format(' Compile date    = ', 12x, a12)
-
-
-         write (*,121) cs1
- 121     format(/, ' Compile options:', /, 
-     >          '    F77          = ', A)
-
-         write (*,122) cs2
- 122     format('    FLINK        = ', A)
-
-         write (*,123) cs3
- 123     format('    F_LIB        = ', A)
-
-         write (*,124) cs4
- 124     format('    F_INC        = ', A)
-
-         write (*,125) cs5
- 125     format('    FFLAGS       = ', A)
-
-         write (*,126) cs6
- 126     format('    FLINKFLAGS   = ', A)
-
-         write(*, 127) cs7
- 127     format('    RAND         = ', A)
-        
-         write (*,130)
- 130     format(//' Please send all errors/feedbacks to:'//
-     >            ' NPB Development Team'/
-     >            ' npb@nas.nasa.gov'//)
-c 130     format(//' Please send the results of this run to:'//
-c     >            ' NPB Development Team '/
-c     >            ' Internet: npb@nas.nasa.gov'/
-c     >            ' '/
-c     >            ' If email is not available, send this to:'//
-c     >            ' MS T27A-1'/
-c     >            ' NASA Ames Research Center'/
-c     >            ' Moffett Field, CA  94035-1000'//
-c     >            ' Fax: 650-604-3957'//)
-
-
-         return
-         end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/read_input.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/read_input.f
deleted file mode 100644
index c1716d0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/read_input.f
+++ /dev/null
@@ -1,115 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine read_input ()
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      integer  fstatus
-
-!---------------------------------------------------------------------
-!    if input file does not exist, it uses defaults
-!       ipr = 1 for detailed progress output
-!       inorm = how often the norm is printed (once every inorm iterations)
-!       itmax = number of pseudo time steps
-!       dt = time step
-!       omega 1 over-relaxation factor for SSOR
-!       tolrsd = steady state residual tolerance levels
-!       nx, ny, nz = number of grid points in x, y, z directions
-!---------------------------------------------------------------------
-      write (unit = *,fmt = 1000) 
-      open (unit = 3,file = 'inputlu.data',status = 'old',access = 'sequ
-     &ential',form = 'formatted',iostat = fstatus)
-      if (fstatus .eq. 0) then
-         write (unit = *,fmt = *) 'Reading from input file inputlu.data'
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) ipr,inorm
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) itmax
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) dt
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) omega
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) tolrsd(1),tolrsd(2),tolrsd(3),tolrsd(4)
-     &,tolrsd(5)
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) 
-         read (unit = 3,fmt = *) nx0,ny0,nz0
-         close (unit = 3)
-      else  
-         ipr = ipr_default
-         inorm = inorm_default
-         itmax = itmax_default
-         dt = dt_default
-         omega = omega_default
-         tolrsd(1) = tolrsd1_def
-         tolrsd(2) = tolrsd2_def
-         tolrsd(3) = tolrsd3_def
-         tolrsd(4) = tolrsd4_def
-         tolrsd(5) = tolrsd5_def
-         nx0 = isiz1
-         ny0 = isiz2
-         nz0 = isiz3
-      endif  
-
-!---------------------------------------------------------------------
-!   check problem size
-!---------------------------------------------------------------------
-      if (nx0 .lt. 4 .or. ny0 .lt. 4 .or. nz0 .lt. 4) then
-         write (unit = *,fmt = 2001) 
-2001              format (5x,'PROBLEM SIZE IS TOO SMALL - ',           /
-     &5x,'SET EACH OF NX, NY AND NZ AT LEAST EQUAL TO 5')
-         stop
-      endif  
-      if (nx0 .gt. isiz1 .or. ny0 .gt. isiz2 .or. nz0 .gt. isiz3) then
-         write (unit = *,fmt = 2002) 
-2002              format (5x,'PROBLEM SIZE IS TOO LARGE - ',           /
-     &5x,'NX, NY AND NZ SHOULD BE EQUAL TO ',           /5x,'ISIZ1, ISIZ
-     &2 AND ISIZ3 RESPECTIVELY')
-         stop
-      endif  
-      write (unit = *,fmt = 1001) nx0,ny0,nz0
-      write (unit = *,fmt = 1002) itmax
-      write (unit = *,fmt = *) 
-1000  format(//,' NAS Parallel Benchmarks (NPB3.3-SER)',          ' - LU
-     & Benchmark', /)
-1001     format(' Size: ', i4, 'x', i4, 'x', i4)
-1002     format(' Iterations: ', i4)
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f
deleted file mode 100644
index 23ff003..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f
+++ /dev/null
@@ -1,420 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine rhs
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c   compute the right hand sides
-c---------------------------------------------------------------------
-
-      implicit none
-
-      include 'applu.incl'
-
-c---------------------------------------------------------------------
-c  local variables
-c---------------------------------------------------------------------
-      integer i, j, k, m, p
-      double precision  q
-      double precision  tmp, utmp(6,isiz3), rtmp(5,isiz3)
-      double precision  u21, u31, u41
-      double precision  u21i, u31i, u41i, u51i
-      double precision  u21j, u31j, u41j, u51j
-      double precision  u21k, u31k, u41k, u51k
-      double precision  u21im1, u31im1, u41im1, u51im1
-      double precision  u21jm1, u31jm1, u41jm1, u51jm1
-      double precision  u21km1, u31km1, u41km1, u51km1
-      double precision flu(5,-1:1)
-
-
-      if (timeron) call timer_start(t_rhs)
-!DVM$ region
-!DVM$ PARALLEL (k,j,i) ON qs(i,j,k), PRIVATE (j,i,tmp,k,m)
-!DVM$&,SHADOW_COMPUTE,SHADOW_RENEW (u)
-      do k = 1, nz
-         do j = 1, ny
-            do i = 1, nx
-               do m = 1, 5
-                  rsd(m,i,j,k) = - frct(m,i,j,k)
-               end do
-               tmp = 1.0d+00 / u(1,i,j,k)               
-               qs(i,j,k) = 0.50d+00 * (  u(2,i,j,k) * u(2,i,j,k)
-     >                         + u(3,i,j,k) * u(3,i,j,k)
-     >                         + u(4,i,j,k) * u(4,i,j,k) )
-     >                      * tmp
-            end do
-         end do
-      end do
-
-!      if (timeron) call timer_start(t_rhsx)
-!DVM$ PARALLEL (k,j,i) on rsd(*,i,j,k),
-!DVM$&PRIVATE(p, u21, q, m, tmp, u21i, u31i, u41i, u51i, u21im1,
-!DVM$&u31im1, u41im1, u51im1, u31, u21j, u31j, u41j, u51j, u21jm1,
-!DVM$&u41jm1, u51jm1, u41, u21k, u31k, u41k, u51k, u21km1, u31km1,
-!DVM$&u51km1, u31jm1,u41km1,flu), cuda_block (32,4)
-      do k = 2, nz - 1
-         do j = jst, jend
-            do i = ist, iend
-			   do p = -1, 1, 2
-                flu(1,p) = u(2,i+p,j,k)
-                u21 = u(2,i+p,j,k) / u(1,i+p,j,k)
-
-                q = qs(i+p,j,k)
-
-                flu(2,p) = u(2,i+p,j,k) * u21 + c2 * 
-     >                        ( u(5,i+p,j,k) - q )
-                flu(3,p) = u(3,i+p,j,k) * u21
-                flu(4,p) = u(4,i+p,j,k) * u21
-                flu(5,p) = ( c1 * u(5,i+p,j,k) - c2 * q ) * u21
-               end do			
-               do m = 1, 5
-                  rsd(m,i,j,k) =  rsd(m,i,j,k)
-     >                 - tx2 * ( flu(m,1) - flu(m,-1) )
-               end do
-
-			   do p = 0, 1
-				   tmp = 1.0d+00/ u(1,i+p,j,k)
-
-				   u21i = tmp * u(2,i+p,j,k)
-				   u31i = tmp * u(3,i+p,j,k)
-				   u41i = tmp * u(4,i+p,j,k)
-				   u51i = tmp * u(5,i+p,j,k)
-
-				   tmp = 1.0d+00/ u(1,i-1+p,j,k)
-
-				   u21im1 = tmp * u(2,i-1+p,j,k)
-				   u31im1 = tmp * u(3,i-1+p,j,k)
-				   u41im1 = tmp * u(4,i-1+p,j,k)
-				   u51im1 = tmp * u(5,i-1+p,j,k)
-
-				   flu(2,p) = (4.0d+00/3.0d+00) * tx3 * (u21i-u21im1)
-				   flu(3,p) = tx3 * ( u31i - u31im1 )
-				   flu(4,p) = tx3 * ( u41i - u41im1 )
-				   flu(5,p) = 0.50d+00 * ( 1.0d+00 - c1*c5)
-     >              * tx3 * ( ( u21i  **2 + u31i  **2+u41i  **2)
-     >                      - ( u21im1**2 + u31im1**2+u41im1**2))
-     >              + (1.0d+00/6.0d+00)
-     >              * tx3 * ( u21i**2 - u21im1**2 )
-     >              + c1 * c5 * tx3 * ( u51i - u51im1 )			   
-			   enddo
-			   
-               rsd(1,i,j,k) = rsd(1,i,j,k)
-     >              + dx1 * tx1 * (            u(1,i-1,j,k)
-     >                             - 2.0d+00 * u(1,i,j,k)
-     >                             +           u(1,i+1,j,k) )
-               rsd(2,i,j,k) = rsd(2,i,j,k)
-     >          + tx3 * c3 * c4 * ( flu(2,1) - flu(2,0) )
-     >              + dx2 * tx1 * (            u(2,i-1,j,k)
-     >                             - 2.0d+00 * u(2,i,j,k)
-     >                             +           u(2,i+1,j,k) )
-               rsd(3,i,j,k) = rsd(3,i,j,k)
-     >          + tx3 * c3 * c4 * ( flu(3,1) - flu(3,0) )
-     >              + dx3 * tx1 * (            u(3,i-1,j,k)
-     >                             - 2.0d+00 * u(3,i,j,k)
-     >                             +           u(3,i+1,j,k) )
-               rsd(4,i,j,k) = rsd(4,i,j,k)
-     >          + tx3 * c3 * c4 * ( flu(4,1) - flu(4,0) )
-     >              + dx4 * tx1 * (            u(4,i-1,j,k)
-     >                             - 2.0d+00 * u(4,i,j,k)
-     >                             +           u(4,i+1,j,k) )
-               rsd(5,i,j,k) = rsd(5,i,j,k)
-     >          + tx3 * c3 * c4 * ( flu(5,1) - flu(5,0) )
-     >              + dx5 * tx1 * (            u(5,i-1,j,k)
-     >                             - 2.0d+00 * u(5,i,j,k)
-     >                             +           u(5,i+1,j,k) )
-
-           
-		    if (i .eq. 2)then
-             do m = 1, 5
-               rsd(m,2,j,k) = rsd(m,2,j,k)
-     >           - dssp * ( + 5.0d+00 * u(m,2,j,k)
-     >                      - 4.0d+00 * u(m,3,j,k)
-     >                      +           u(m,4,j,k) )
-	         enddo
-			else if (i .eq. 3)then
-             do m = 1, 5			
-               rsd(m,3,j,k) = rsd(m,3,j,k)
-     >           - dssp * ( - 4.0d+00 * u(m,2,j,k)
-     >                      + 6.0d+00 * u(m,3,j,k)
-     >                      - 4.0d+00 * u(m,4,j,k)
-     >                      +           u(m,5,j,k) )
-	         enddo
-			else if (i .eq. nx-2)then
-             do m = 1, 5			
-               rsd(m,nx-2,j,k) = rsd(m,nx-2,j,k)
-     >           - dssp * (             u(m,nx-4,j,k)
-     >                      - 4.0d+00 * u(m,nx-3,j,k)
-     >                      + 6.0d+00 * u(m,nx-2,j,k)
-     >                      - 4.0d+00 * u(m,nx-1,j,k)  )
-	         enddo
-			else if (i .eq. nx-1)then	 
-             do m = 1, 5						
-               rsd(m,nx-1,j,k) = rsd(m,nx-1,j,k)
-     >           - dssp * (             u(m,nx-3,j,k)
-     >                      - 4.0d+00 * u(m,nx-2,j,k)
-     >                      + 5.0d+00 * u(m,nx-1,j,k) )				 
-	         enddo
-			else
-               do m = 1, 5
-                  rsd(m,i,j,k) = rsd(m,i,j,k)
-     >              - dssp * (            u(m,i-2,j,k)
-     >                        - 4.0d+00 * u(m,i-1,j,k)
-     >                        + 6.0d+00 * u(m,i,j,k)
-     >                        - 4.0d+00 * u(m,i+1,j,k)
-     >                        +           u(m,i+2,j,k) )
-               end do
-            endif
- !           end do			
- !        end do
-!      end do
-!      if (timeron) call timer_stop(t_rhsx)
-
-!      if (timeron) call timer_start(t_rhsy)
-!      do k = 2, nz - 1
- !        do j = jst, jend	  
- !          do i = ist, iend
-			   do p = -1, 1, 2
-                flu(1,p) = u(3,i,j+p,k)
-                u31 = u(3,i,j+p,k) / u(1,i,j+p,k)
-
-                q = qs(i,j+p,k)
-
-                flu(2,p) = u(2,i,j+p,k) * u31 
-                flu(3,p) = u(3,i,j+p,k) * u31 + c2 * (u(5,i,j+p,k)-q)
-                flu(4,p) = u(4,i,j+p,k) * u31
-                flu(5,p) = ( c1 * u(5,i,j+p,k) - c2 * q ) * u31
-               end do				
-               do m = 1, 5
-                  rsd(m,i,j,k) =  rsd(m,i,j,k)
-     >                   - ty2 * ( flu(m,1) - flu(m,-1) )
-               end do
-
-			   do p = 0, 1
-               tmp = 1.0d+00/ u(1,i,j+p,k)
-
-               u21j = tmp * u(2,i,j+p,k)
-               u31j = tmp * u(3,i,j+p,k)
-               u41j = tmp * u(4,i,j+p,k)
-               u51j = tmp * u(5,i,j+p,k)
-
-               tmp = 1.0d+00/ u(1,i,j-1+p,k)
-               u21jm1 = tmp * u(2,i,j-1+p,k)
-               u31jm1 = tmp * u(3,i,j-1+p,k)
-               u41jm1 = tmp * u(4,i,j-1+p,k)
-               u51jm1 = tmp * u(5,i,j-1+p,k)
-
-               flu(2,p) = ty3 * ( u21j - u21jm1 )
-               flu(3,p) = (4.0d+00/3.0d+00) * ty3 * (u31j-u31jm1)
-               flu(4,p) = ty3 * ( u41j - u41jm1 )
-               flu(5,p) = 0.50d+00 * ( 1.0d+00 - c1*c5 )
-     >              * ty3 * ( ( u21j  **2 + u31j  **2 + u41j  **2 )
-     >                      - ( u21jm1**2 + u31jm1**2 + u41jm1**2 ) )
-     >              + (1.0d+00/6.0d+00)
-     >              * ty3 * ( u31j**2 - u31jm1**2 )
-     >              + c1 * c5 * ty3 * ( u51j - u51jm1 )			   
-			   enddo
-			   
-               rsd(1,i,j,k) = rsd(1,i,j,k)
-     >              + dy1 * ty1 * (            u(1,i,j-1,k)
-     >                             - 2.0d+00 * u(1,i,j,k)
-     >                             +           u(1,i,j+1,k) )
-
-               rsd(2,i,j,k) = rsd(2,i,j,k)
-     >          + ty3 * c3 * c4 * ( flu(2,1) - flu(2,0) )
-     >              + dy2 * ty1 * (            u(2,i,j-1,k)
-     >                             - 2.0d+00 * u(2,i,j,k)
-     >                             +           u(2,i,j+1,k) )
-
-               rsd(3,i,j,k) = rsd(3,i,j,k)
-     >          + ty3 * c3 * c4 * ( flu(3,1) - flu(3,0) )
-     >              + dy3 * ty1 * (            u(3,i,j-1,k)
-     >                             - 2.0d+00 * u(3,i,j,k)
-     >                             +           u(3,i,j+1,k) )
-
-               rsd(4,i,j,k) = rsd(4,i,j,k)
-     >          + ty3 * c3 * c4 * ( flu(4,1) - flu(4,0) )
-     >              + dy4 * ty1 * (            u(4,i,j-1,k)
-     >                             - 2.0d+00 * u(4,i,j,k)
-     >                             +           u(4,i,j+1,k) )
-
-               rsd(5,i,j,k) = rsd(5,i,j,k)
-     >          + ty3 * c3 * c4 * ( flu(5,1) - flu(5,0) )
-     >              + dy5 * ty1 * (            u(5,i,j-1,k)
-     >                             - 2.0d+00 * u(5,i,j,k)
-     >                             +           u(5,i,j+1,k) )
-
-
-
-         if (j .eq. 2) then
-            do m = 1, 5
-               rsd(m,i,2,k) = rsd(m,i,2,k)
-     >           - dssp * ( + 5.0d+00 * u(m,i,2,k)
-     >                      - 4.0d+00 * u(m,i,3,k)
-     >                      +           u(m,i,4,k) )
-           enddo	 
-         elseif (j .eq. 3) then	
-            do m = 1, 5		 
-		                rsd(m,i,3,k) = rsd(m,i,3,k)
-     >           - dssp * ( - 4.0d+00 * u(m,i,2,k)
-     >                      + 6.0d+00 * u(m,i,3,k)
-     >                      - 4.0d+00 * u(m,i,4,k)
-     >                      +           u(m,i,5,k) )
-            end do
-         elseif (j .eq. ny-2) then	
-             do m = 1, 5
-               rsd(m,i,ny-2,k) = rsd(m,i,ny-2,k)
-     >           - dssp * (             u(m,i,ny-4,k)
-     >                      - 4.0d+00 * u(m,i,ny-3,k)
-     >                      + 6.0d+00 * u(m,i,ny-2,k)
-     >                      - 4.0d+00 * u(m,i,ny-1,k)  )
-	          enddo
-         elseif (j .eq. ny-1) then	
-		    do m = 1, 5
-		     rsd(m,i,ny-1,k) = rsd(m,i,ny-1,k)
-     >           - dssp * (             u(m,i,ny-3,k)
-     >                      - 4.0d+00 * u(m,i,ny-2,k)
-     >                      + 5.0d+00 * u(m,i,ny-1,k) )
-            end do
-		 else		 
-               do m = 1, 5
-                  rsd(m,i,j,k) = rsd(m,i,j,k)
-     >              - dssp * (            u(m,i,j-2,k)
-     >                        - 4.0d+00 * u(m,i,j-1,k)
-     >                        + 6.0d+00 * u(m,i,j,k)
-     >                        - 4.0d+00 * u(m,i,j+1,k)
-     >                        +           u(m,i,j+2,k) )
-               end do		 
-		 endif
-
-!            end do
-!         end do
-!      end do
-	  
-!      if (timeron) call timer_stop(t_rhsy)
-
-!      if (timeron) call timer_start(t_rhsz)
-!      do k = 2, nz - 1	  
-!        do j = jst, jend
-!           do i = ist, iend
-			  do p=-1,1,2
-               flu(1,p) = u(4,i,j,k+p)
-               u41 = u(4,i,j,k+p) / u(1,i,j,k+p)
-
-               q = qs(i,j,k+p)
-
-               flu(2,p) = u(2,i,j,k+p) * u41 
-               flu(3,p) = u(3,i,j,k+p) * u41 
-               flu(4,p) = u(4,i,j,k+p) * u41 + c2 * (u(5,i,j,k+p)-q)
-               flu(5,p) = ( c1 * u(5,i,j,k+p) - c2 * q ) * u41			  
-			  enddo
-			  
-               do m = 1, 5
-                  rsd(m,i,j,k) =  rsd(m,i,j,k)
-     >                - tz2 * ( flu(m,1) - flu(m,-1) )
-               end do
-
-			  do p=0,1
-               tmp = 1.0d+00/ u(1,i,j,k+p)
-
-               u21k = tmp * u(2,i,j,k+p)
-               u31k = tmp * u(3,i,j,k+p)
-               u41k = tmp * u(4,i,j,k+p)
-               u51k = tmp * u(5,i,j,k+p)
-
-               tmp = 1.0d+00/ u(1,i,j,k-1+p)
-
-               u21km1 = tmp * u(2,i,j,k-1+p)
-               u31km1 = tmp * u(3,i,j,k-1+p)
-               u41km1 = tmp * u(4,i,j,k-1+p)
-               u51km1 = tmp * u(5,i,j,k-1+p)
-
-               flu(2,p) = tz3 * ( u21k - u21km1 )
-               flu(3,p) = tz3 * ( u31k - u31km1 )
-               flu(4,p) = (4.0d+00/3.0d+00) * tz3 * (u41k-u41km1)
-               flu(5,p) = 0.50d+00 * ( 1.0d+00 - c1*c5 )
-     >              * tz3 * ( ( u21k  **2 + u31k  **2 + u41k  **2 )
-     >                      - ( u21km1**2 + u31km1**2 + u41km1**2 ) )
-     >              + (1.0d+00/6.0d+00)
-     >              * tz3 * ( u41k**2 - u41km1**2 )
-     >              + c1 * c5 * tz3 * ( u51k - u51km1 )			  
-			  enddo
-               rsd(1,i,j,k) = rsd(1,i,j,k)
-     >              + dz1 * tz1 * (            u(1,i,j,k-1)
-     >                             - 2.0d+00 * u(1,i,j,k)
-     >                             +           u(1,i,j,k+1) )
-               rsd(2,i,j,k) = rsd(2,i,j,k)
-     >          + tz3 * c3 * c4 * ( flu(2,1) - flu(2,0) )
-     >              + dz2 * tz1 * (            u(2,i,j,k-1)
-     >                             - 2.0d+00 * u(2,i,j,k)
-     >                             +           u(2,i,j,k+1) )
-               rsd(3,i,j,k) = rsd(3,i,j,k)
-     >          + tz3 * c3 * c4 * ( flu(3,1) - flu(3,0) )
-     >              + dz3 * tz1 * (            u(3,i,j,k-1)
-     >                             - 2.0d+00 * u(3,i,j,k)
-     >                             +           u(3,i,j,k+1) )
-               rsd(4,i,j,k) = rsd(4,i,j,k)
-     >          + tz3 * c3 * c4 * ( flu(4,1) - flu(4,0) )
-     >              + dz4 * tz1 * (            u(4,i,j,k-1)
-     >                             - 2.0d+00 * u(4,i,j,k)
-     >                             +           u(4,i,j,k+1) )
-               rsd(5,i,j,k) = rsd(5,i,j,k)
-     >          + tz3 * c3 * c4 * ( flu(5,1) - flu(5,0) )
-     >              + dz5 * tz1 * (            u(5,i,j,k-1)
-     >                             - 2.0d+00 * u(5,i,j,k)
-     >                             +           u(5,i,j,k+1) )
-
-
-            if (k .eq. 2) then
-            do m = 1, 5
-               rsd(m,i,j,2) = rsd(m,i,j,2)
-     >           - dssp * ( + 5.0d+00 * u(m,i,j,2)
-     >                      - 4.0d+00 * u(m,i,j,3)
-     >                      +           u(m,i,j,4) )
-            end do			
-            elseif (k .eq. 3) then			
-            do m = 1, 5
-               rsd(m,i,j,3) = rsd(m,i,j,3)
-     >           - dssp * ( - 4.0d+00 * u(m,i,j,2)
-     >                      + 6.0d+00 * u(m,i,j,3)
-     >                      - 4.0d+00 * u(m,i,j,4)
-     >                      +           u(m,i,j,5) )
-            end do			
-            elseif (k .eq. nz-2) then	
-			            do m = 1, 5
-               rsd(m,i,j,nz-2) = rsd(m,i,j,nz-2)
-     >           - dssp * (             u(m,i,j,nz-4)
-     >                      - 4.0d+00 * u(m,i,j,nz-3)
-     >                      + 6.0d+00 * u(m,i,j,nz-2)
-     >                      - 4.0d+00 * u(m,i,j,nz-1)  )
-            end do			
-            elseif (k .eq. nz-1) then						
-            do m = 1, 5
-               rsd(m,i,j,nz-1) = rsd(m,i,j,nz-1)
-     >           - dssp * (             u(m,i,j,nz-3)
-     >                      - 4.0d+00 * u(m,i,j,nz-2)
-     >                      + 5.0d+00 * u(m,i,j,nz-1) )
-            end do			
-            else
-               do m = 1, 5
-                  rsd(m,i,j,k) = rsd(m,i,j,k)
-     >              - dssp * (            u(m,i,j,k-2)
-     >                        - 4.0d+00 * u(m,i,j,k-1)
-     >                        + 6.0d+00 * u(m,i,j,k)
-     >                        - 4.0d+00 * u(m,i,j,k+1)
-     >                        +           u(m,i,j,k+2) )
-               end do			
-		    endif			
-			
-            end do
-         end do
-      end do
-!DVM$ end region      
-!      if (timeron) call timer_stop(t_rhsz)
-      if (timeron) call timer_stop(t_rhs)
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f1 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f1
deleted file mode 100644
index 02b1dc0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f1
+++ /dev/null
@@ -1,536 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine rhs ()
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   compute the right hand sides
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  local variables
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      integer  i,j,k,m
-
-!DVM$ ALIGN flux_br3(iEX1,iEX2,iEX3,iEX4) WITH dvmh_temp0(iEX1,iEX3,iEX
-!DVM$&4,iEX2)
-!DVM$ DYNAMIC flux_br3
-      double precision ,allocatable:: flux_br3(:,:,:,:)
-!DVM$ SHADOW flux_br3( 0:0,1:1,0:0,0:0 )
-
-!DVM$ ALIGN flux_br2(iEX1,iEX2,iEX3,iEX4) WITH dvmh_temp0(iEX1,iEX3,iEX
-!DVM$&2,iEX4)
-!DVM$ DYNAMIC flux_br2
-      double precision ,allocatable:: flux_br2(:,:,:,:)
-!DVM$ SHADOW flux_br2( 0:0,1:1,0:0,0:0 )
-
-!DVM$ ALIGN flux_br1(iEX1,iEX2,iEX3,iEX4) WITH dvmh_temp0(iEX1,iEX2
-!DVM$&,iEX3,iEX4)
-!DVM$ DYNAMIC flux_br1
-      double precision ,allocatable:: flux_br1(:,:,:,:)
-!DVM$ SHADOW flux_br1( 0:0,1:1,0:0,0:0 )
-      double precision  q
-      double precision  tmp,utmp(6,isiz3),rtmp(5,isiz3)
-
-!DVM$ ALIGN rtmp_br1(iEX1,iEX2,iEX3,iEX4) WITH dvmh_temp0(iEX1,iEX3,iEX
-!DVM$&4,iEX2)
-!DVM$ DYNAMIC rtmp_br1
-      double precision ,allocatable:: rtmp_br1(:,:,:,:)
-
-!DVM$ ALIGN utmp_br1(iEX1,iEX2,iEX3,iEX4) WITH dvmh_temp0(iEX1,iEX3,iEX
-!DVM$&4,iEX2)
-!DVM$ DYNAMIC utmp_br1
-      double precision ,allocatable:: utmp_br1(:,:,:,:)
-!DVM$ SHADOW utmp_br1( 0:0,2:2,0:0,0:0 )
-      double precision  u21,u31,u41
-      double precision  u21i,u31i,u41i,u51i
-      double precision  u21j,u31j,u41j,u51j
-      double precision  u21k,u31k,u41k,u51k
-      double precision  u21im1,u31im1,u41im1,u51im1
-      double precision  u21jm1,u31jm1,u41jm1,u51jm1
-      double precision  u21km1,u31km1,u41km1,u51km1
-
-!DVM$ interval 11
-      if (timeron)  call timer_start(t_rhs)
-!DVM$ region      
-!DVM$ PARALLEL (k,j,i) ON qs(i,j,k), PRIVATE (j,i,tmp,k,m)
-!DVM$&,SHADOW_COMPUTE,SHADOW_RENEW (u)
-      do  k = 1,nz
-         do  j = 1,ny
-            do  i = 1,nx
-               tmp = 1.0d+00 / u(1,i,j,k)
-               qs(i,j,k) = 0.50d+00 * (u(2,i,j,k) * u(2,i,j,k) + u(3,i,j
-     &,k) * u(3,i,j,k) + u(4,i,j,k) * u(4,i,j,k)) * tmp
-               tmp = 1.0d+00 / u(1,i,j,k)
-               rho_i(i,j,k) = tmp	 
-               do  m = 1,5
-                  rsd(m,i,j,k) = (-(frct(m,i,j,k)))
-               enddo  			   
-            enddo  
-         enddo  
-      enddo  
-!DVM$ end region
-      allocate(flux_br1(5,isiz1,2:isiz2 - 1,2:isiz3 - 1))
-
-!---------------------------------------------------------------------
-!   xi-direction flux differences
-!---------------------------------------------------------------------
-!DVM$ region
-!DVM$ PARALLEL (k,j,i) ON flux_br1(*,i,j,k), PRIVATE (j,i,k,q,u21),
-!DVM$&SHADOW_COMPUTE
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  i = 1,nx
-               flux_br1(1,i,j,k) = u(2,i,j,k)
-               u21 = u(2,i,j,k) * rho_i(i,j,k)
-               q = qs(i,j,k)
-               flux_br1(2,i,j,k) = u(2,i,j,k) * u21 + c2 * (u(5,i,j,k) -
-     & q)
-               flux_br1(3,i,j,k) = u(3,i,j,k) * u21
-               flux_br1(4,i,j,k) = u(4,i,j,k) * u21
-               flux_br1(5,i,j,k) = (c1 * u(5,i,j,k) - c2 * q) * u21
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,j,i,m) ON rsd(m,i,j,k), PRIVATE (j,i,k,m)
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  i = ist,iend
-               do  m = 1,5
-                  rsd(m,i,j,k) = rsd(m,i,j,k) - tx2 * (flux_br1(m,i + 1,
-     &j,k) - flux_br1(m,i - 1,j,k))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,j,i) ON flux_br1(*,i,j,k), PRIVATE (j,i,tmp,k,u21i,u31
-!DVM$&i,u41im1,u51im1,u51i,u41i,u21im1,u31im1),SHADOW_COMPUTE
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  i = ist,nx
-               tmp = rho_i(i,j,k)
-               u21i = tmp * u(2,i,j,k)
-               u31i = tmp * u(3,i,j,k)
-               u41i = tmp * u(4,i,j,k)
-               u51i = tmp * u(5,i,j,k)
-               tmp = rho_i(i - 1,j,k)
-               u21im1 = tmp * u(2,i - 1,j,k)
-               u31im1 = tmp * u(3,i - 1,j,k)
-               u41im1 = tmp * u(4,i - 1,j,k)
-               u51im1 = tmp * u(5,i - 1,j,k)
-               flux_br1(2,i,j,k) = 4.0d+00 / 3.0d+00 * tx3 * (u21i - u21
-     &im1)
-               flux_br1(3,i,j,k) = tx3 * (u31i - u31im1)
-               flux_br1(4,i,j,k) = tx3 * (u41i - u41im1)
-               flux_br1(5,i,j,k) = 0.50d+00 * (1.0d+00 - c1 * c5) * tx3 
-     &* (u21i** 2 + u31i** 2 + u41i** 2 - (u21im1** 2 + u31im1** 2 + u41
-     &im1** 2)) + 1.0d+00 / 6.0d+00 * tx3 * (u21i** 2 - u21im1** 2) + c1
-     & * c5 * tx3 * (u51i - u51im1)
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,j,i) ON rsd(*,i,j,k), PRIVATE (j,i,k)
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  i = ist,iend
-               rsd(1,i,j,k) = rsd(1,i,j,k) + dx1 * tx1 * (u(1,i - 1,j,k)
-     & - 2.0d+00 * u(1,i,j,k) + u(1,i + 1,j,k))
-               rsd(2,i,j,k) = rsd(2,i,j,k) + tx3 * c3 * c4 * (flux_br1(2
-     &,i + 1,j,k) - flux_br1(2,i,j,k)) + dx2 * tx1 * (u(2,i - 1,j,k) - 2
-     &.0d+00 * u(2,i,j,k) + u(2,i + 1,j,k))
-               rsd(3,i,j,k) = rsd(3,i,j,k) + tx3 * c3 * c4 * (flux_br1(3
-     &,i + 1,j,k) - flux_br1(3,i,j,k)) + dx3 * tx1 * (u(3,i - 1,j,k) - 2
-     &.0d+00 * u(3,i,j,k) + u(3,i + 1,j,k))
-               rsd(4,i,j,k) = rsd(4,i,j,k) + tx3 * c3 * c4 * (flux_br1(4
-     &,i + 1,j,k) - flux_br1(4,i,j,k)) + dx4 * tx1 * (u(4,i - 1,j,k) - 2
-     &.0d+00 * u(4,i,j,k) + u(4,i + 1,j,k))
-               rsd(5,i,j,k) = rsd(5,i,j,k) + tx3 * c3 * c4 * (flux_br1(5
-     &,i + 1,j,k) - flux_br1(5,i,j,k)) + dx5 * tx1 * (u(5,i - 1,j,k) - 2
-     &.0d+00 * u(5,i,j,k) + u(5,i + 1,j,k))
-            enddo  
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!   Fourth-order dissipation
-!---------------------------------------------------------------------
-!DVM$ PARALLEL (k,j,m) ON rsd(m,2,j,k), PRIVATE (j,k,m)
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  m = 1,5
-               rsd(m,2,j,k) = rsd(m,2,j,k) - dssp * ((+(5.0d+00)) * u(m,
-     &2,j,k) - 4.0d+00 * u(m,3,j,k) + u(m,4,j,k))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,j,m) ON rsd(m,3,j,k), PRIVATE (j,k,m)
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  m = 1,5
-               rsd(m,3,j,k) = rsd(m,3,j,k) - dssp * ((-(4.0d+00)) * u(m,
-     &2,j,k) + 6.0d+00 * u(m,3,j,k) - 4.0d+00 * u(m,4,j,k) + u(m,5,j,k))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,j,i,m) ON rsd(m,i,j,k), PRIVATE (j,i,k,m)
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  i = 4,nx - 3
-               do  m = 1,5
-                  rsd(m,i,j,k) = rsd(m,i,j,k) - dssp * (u(m,i - 2,j,k) -
-     & 4.0d+00 * u(m,i - 1,j,k) + 6.0d+00 * u(m,i,j,k) - 4.0d+00 * u(m,i
-     & + 1,j,k) + u(m,i + 2,j,k))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,j,m) ON rsd(m,nx + -2,j,k), PRIVATE (j,k,m)
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  m = 1,5
-               rsd(m,nx - 2,j,k) = rsd(m,nx - 2,j,k) - dssp * (u(m,nx - 
-     &4,j,k) - 4.0d+00 * u(m,nx - 3,j,k) + 6.0d+00 * u(m,nx - 2,j,k) - 4
-     &.0d+00 * u(m,nx - 1,j,k))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,j,m) ON rsd(m,nx + -1,j,k), PRIVATE (j,k,m)
-      do  k = 2,nz - 1
-         do  j = jst,jend
-            do  m = 1,5
-               rsd(m,nx - 1,j,k) = rsd(m,nx - 1,j,k) - dssp * (u(m,nx - 
-     &3,j,k) - 4.0d+00 * u(m,nx - 2,j,k) + 5.0d+00 * u(m,nx - 1,j,k))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ end region      
-      deallocate(flux_br1)
-      allocate(flux_br2(5,isiz1,2:isiz1 - 1,2:isiz3 - 1))
-
-!---------------------------------------------------------------------
-!   eta-direction flux differences
-!---------------------------------------------------------------------
-!DVM$ region
-!DVM$ PARALLEL (k,i,j) ON flux_br2(*,j,i,k), PRIVATE (j,i,k,q,u31),
-!DVM$& SHADOW_COMPUTE
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  j = 1,ny
-               flux_br2(1,j,i,k) = u(3,i,j,k)
-               u31 = u(3,i,j,k) * rho_i(i,j,k)
-               q = qs(i,j,k)
-               flux_br2(2,j,i,k) = u(2,i,j,k) * u31
-               flux_br2(3,j,i,k) = u(3,i,j,k) * u31 + c2 * (u(5,i,j,k) -
-     & q)
-               flux_br2(4,j,i,k) = u(4,i,j,k) * u31
-               flux_br2(5,j,i,k) = (c1 * u(5,i,j,k) - c2 * q) * u31
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,i,j,m) ON rsd(m,i,j,k), PRIVATE (j,i,k,m)
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  j = jst,jend
-               do  m = 1,5
-                  rsd(m,i,j,k) = rsd(m,i,j,k) - ty2 * (flux_br2(m,j + 1,
-     &i,k) - flux_br2(m,j - 1,i,k))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,i,j) ON flux_br2(*,j,i,k), PRIVATE (u51j,j,u31j,u41j,u
-!DVM$&51jm1,u21j,i,tmp,u41jm1,u21jm1,u31jm1,k),SHADOW_COMPUTE
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  j = jst,ny
-               tmp = rho_i(i,j,k)
-               u21j = tmp * u(2,i,j,k)
-               u31j = tmp * u(3,i,j,k)
-               u41j = tmp * u(4,i,j,k)
-               u51j = tmp * u(5,i,j,k)
-               tmp = rho_i(i,j - 1,k)
-               u21jm1 = tmp * u(2,i,j - 1,k)
-               u31jm1 = tmp * u(3,i,j - 1,k)
-               u41jm1 = tmp * u(4,i,j - 1,k)
-               u51jm1 = tmp * u(5,i,j - 1,k)
-               flux_br2(2,j,i,k) = ty3 * (u21j - u21jm1)
-               flux_br2(3,j,i,k) = 4.0d+00 / 3.0d+00 * ty3 * (u31j - u31
-     &jm1)
-               flux_br2(4,j,i,k) = ty3 * (u41j - u41jm1)
-               flux_br2(5,j,i,k) = 0.50d+00 * (1.0d+00 - c1 * c5) * ty3 
-     &* (u21j** 2 + u31j** 2 + u41j** 2 - (u21jm1** 2 + u31jm1** 2 + u41
-     &jm1** 2)) + 1.0d+00 / 6.0d+00 * ty3 * (u31j** 2 - u31jm1** 2) + c1
-     & * c5 * ty3 * (u51j - u51jm1)
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,i,j) ON rsd(*,i,j,k), PRIVATE (j,i,k)
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  j = jst,jend
-               rsd(1,i,j,k) = rsd(1,i,j,k) + dy1 * ty1 * (u(1,i,j - 1,k)
-     & - 2.0d+00 * u(1,i,j,k) + u(1,i,j + 1,k))
-               rsd(2,i,j,k) = rsd(2,i,j,k) + ty3 * c3 * c4 * (flux_br2(2
-     &,j + 1,i,k) - flux_br2(2,j,i,k)) + dy2 * ty1 * (u(2,i,j - 1,k) - 2
-     &.0d+00 * u(2,i,j,k) + u(2,i,j + 1,k))
-               rsd(3,i,j,k) = rsd(3,i,j,k) + ty3 * c3 * c4 * (flux_br2(3
-     &,j + 1,i,k) - flux_br2(3,j,i,k)) + dy3 * ty1 * (u(3,i,j - 1,k) - 2
-     &.0d+00 * u(3,i,j,k) + u(3,i,j + 1,k))
-               rsd(4,i,j,k) = rsd(4,i,j,k) + ty3 * c3 * c4 * (flux_br2(4
-     &,j + 1,i,k) - flux_br2(4,j,i,k)) + dy4 * ty1 * (u(4,i,j - 1,k) - 2
-     &.0d+00 * u(4,i,j,k) + u(4,i,j + 1,k))
-               rsd(5,i,j,k) = rsd(5,i,j,k) + ty3 * c3 * c4 * (flux_br2(5
-     &,j + 1,i,k) - flux_br2(5,j,i,k)) + dy5 * ty1 * (u(5,i,j - 1,k) - 2
-     &.0d+00 * u(5,i,j,k) + u(5,i,j + 1,k))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,i,m) ON rsd(m,i,2,k), PRIVATE (i,k,m)
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  m = 1,5
-               rsd(m,i,2,k) = rsd(m,i,2,k) - dssp * ((+(5.0d+00)) * u(m,
-     &i,2,k) - 4.0d+00 * u(m,i,3,k) + u(m,i,4,k))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,i,m) ON rsd(m,i,3,k), PRIVATE (i,k,m)
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  m = 1,5
-               rsd(m,i,3,k) = rsd(m,i,3,k) - dssp * ((-(4.0d+00)) * u(m,
-     &i,2,k) + 6.0d+00 * u(m,i,3,k) - 4.0d+00 * u(m,i,4,k) + u(m,i,5,k))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,i,j,m) ON rsd(m,i,j,k), PRIVATE (j,i,k,m)
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  j = 4,ny - 3
-               do  m = 1,5
-                  rsd(m,i,j,k) = rsd(m,i,j,k) - dssp * (u(m,i,j - 2,k) -
-     & 4.0d+00 * u(m,i,j - 1,k) + 6.0d+00 * u(m,i,j,k) - 4.0d+00 * u(m,i
-     &,j + 1,k) + u(m,i,j + 2,k))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,i,m) ON rsd(m,i,ny + -2,k), PRIVATE (i,k,m)
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  m = 1,5
-               rsd(m,i,ny - 2,k) = rsd(m,i,ny - 2,k) - dssp * (u(m,i,ny 
-     &- 4,k) - 4.0d+00 * u(m,i,ny - 3,k) + 6.0d+00 * u(m,i,ny - 2,k) - 4
-     &.0d+00 * u(m,i,ny - 1,k))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (k,i,m) ON rsd(m,i,ny + -1,k), PRIVATE (i,k,m)
-      do  k = 2,nz - 1
-         do  i = ist,iend
-            do  m = 1,5
-               rsd(m,i,ny - 1,k) = rsd(m,i,ny - 1,k) - dssp * (u(m,i,ny 
-     &- 3,k) - 4.0d+00 * u(m,i,ny - 2,k) + 5.0d+00 * u(m,i,ny - 1,k))
-            enddo  
-         enddo  
-      enddo 
-!DVM$ end region      
-      deallocate(flux_br2)
-      allocate(utmp_br1(6,isiz3,2:isiz1 - 1,2:isiz2 - 1))
-      allocate(rtmp_br1(5,isiz3,2:isiz1 - 1,2:isiz2 - 1))
-      allocate(flux_br3(5,isiz1,2:isiz1 - 1,2:isiz2 - 1))
-
-!---------------------------------------------------------------------
-!   zeta-direction flux differences
-!---------------------------------------------------------------------
-!DVM$ region
-!DVM$ PARALLEL (j,i,k) ON utmp_br1(*,k,i,j), PRIVATE (j,i,k),
-!DVM$& SHADOW_COMPUTE
-      do  j = jst,jend
-         do  i = ist,iend
-            do  k = 1,nz
-               utmp_br1(1,k,i,j) = u(1,i,j,k)
-               utmp_br1(2,k,i,j) = u(2,i,j,k)
-               utmp_br1(3,k,i,j) = u(3,i,j,k)
-               utmp_br1(4,k,i,j) = u(4,i,j,k)
-               utmp_br1(5,k,i,j) = u(5,i,j,k)
-               utmp_br1(6,k,i,j) = rho_i(i,j,k)
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (j,i,k) ON flux_br3(*,k,i,j), PRIVATE (j,i,k,q,u41),
-!DVM$& SHADOW_COMPUTE
-      do  j = jst,jend
-         do  i = ist,iend
-            do  k = 1,nz
-               flux_br3(1,k,i,j) = utmp_br1(4,k,i,j)
-               u41 = utmp_br1(4,k,i,j) * utmp_br1(6,k,i,j)
-               q = qs(i,j,k)
-               flux_br3(2,k,i,j) = utmp_br1(2,k,i,j) * u41
-               flux_br3(3,k,i,j) = utmp_br1(3,k,i,j) * u41
-               flux_br3(4,k,i,j) = utmp_br1(4,k,i,j) * u41 + c2 * (utmp_
-     &br1(5,k,i,j) - q)
-               flux_br3(5,k,i,j) = (c1 * utmp_br1(5,k,i,j) - c2 * q) * u
-     &41
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (j,i,k,m) ON rtmp_br1(m,k,i,j), PRIVATE (j,i,k,m)
-      do  j = jst,jend
-         do  i = ist,iend
-            do  k = 2,nz - 1
-               do  m = 1,5
-                  rtmp_br1(m,k,i,j) = rsd(m,i,j,k) - tz2 * (flux_br3(m,k
-     & + 1,i,j) - flux_br3(m,k - 1,i,j))
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (j,i,k) ON flux_br3(*,k,i,j), PRIVATE (j,i,tmp,k,u21km1,u
-!DVM$&41km1,u51k,u51km1,u31km1,u31k,u41k,u21k),SHADOW_COMPUTE
-      do  j = jst,jend
-         do  i = ist,iend
-            do  k = 2,nz
-               tmp = utmp_br1(6,k,i,j)
-               u21k = tmp * utmp_br1(2,k,i,j)
-               u31k = tmp * utmp_br1(3,k,i,j)
-               u41k = tmp * utmp_br1(4,k,i,j)
-               u51k = tmp * utmp_br1(5,k,i,j)
-               tmp = utmp_br1(6,k - 1,i,j)
-               u21km1 = tmp * utmp_br1(2,k - 1,i,j)
-               u31km1 = tmp * utmp_br1(3,k - 1,i,j)
-               u41km1 = tmp * utmp_br1(4,k - 1,i,j)
-               u51km1 = tmp * utmp_br1(5,k - 1,i,j)
-               flux_br3(2,k,i,j) = tz3 * (u21k - u21km1)
-               flux_br3(3,k,i,j) = tz3 * (u31k - u31km1)
-               flux_br3(4,k,i,j) = 4.0d+00 / 3.0d+00 * tz3 * (u41k - u41
-     &km1)
-               flux_br3(5,k,i,j) = 0.50d+00 * (1.0d+00 - c1 * c5) * tz3 
-     &* (u21k** 2 + u31k** 2 + u41k** 2 - (u21km1** 2 + u31km1** 2 + u41
-     &km1** 2)) + 1.0d+00 / 6.0d+00 * tz3 * (u41k** 2 - u41km1** 2) + c1
-     & * c5 * tz3 * (u51k - u51km1)
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (j,i,k) ON rtmp_br1(*,k,i,j), PRIVATE (j,i,k)
-      do  j = jst,jend
-         do  i = ist,iend
-            do  k = 2,nz - 1
-               rtmp_br1(1,k,i,j) = rtmp_br1(1,k,i,j) + dz1 * tz1 * (utmp
-     &_br1(1,k - 1,i,j) - 2.0d+00 * utmp_br1(1,k,i,j) + utmp_br1(1,k + 1
-     &,i,j))
-               rtmp_br1(2,k,i,j) = rtmp_br1(2,k,i,j) + tz3 * c3 * c4 * (
-     &flux_br3(2,k + 1,i,j) - flux_br3(2,k,i,j)) + dz2 * tz1 * (utmp_br1
-     &(2,k - 1,i,j) - 2.0d+00 * utmp_br1(2,k,i,j) + utmp_br1(2,k + 1,i,j
-     &))
-               rtmp_br1(3,k,i,j) = rtmp_br1(3,k,i,j) + tz3 * c3 * c4 * (
-     &flux_br3(3,k + 1,i,j) - flux_br3(3,k,i,j)) + dz3 * tz1 * (utmp_br1
-     &(3,k - 1,i,j) - 2.0d+00 * utmp_br1(3,k,i,j) + utmp_br1(3,k + 1,i,j
-     &))
-               rtmp_br1(4,k,i,j) = rtmp_br1(4,k,i,j) + tz3 * c3 * c4 * (
-     &flux_br3(4,k + 1,i,j) - flux_br3(4,k,i,j)) + dz4 * tz1 * (utmp_br1
-     &(4,k - 1,i,j) - 2.0d+00 * utmp_br1(4,k,i,j) + utmp_br1(4,k + 1,i,j
-     &))
-               rtmp_br1(5,k,i,j) = rtmp_br1(5,k,i,j) + tz3 * c3 * c4 * (
-     &flux_br3(5,k + 1,i,j) - flux_br3(5,k,i,j)) + dz5 * tz1 * (utmp_br1
-     &(5,k - 1,i,j) - 2.0d+00 * utmp_br1(5,k,i,j) + utmp_br1(5,k + 1,i,j
-     &))
-            enddo  
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!   fourth-order dissipation
-!---------------------------------------------------------------------
-!DVM$ PARALLEL (j,i,m) ON rsd(m,i,j,2), PRIVATE (j,i,m)
-      do  j = jst,jend
-         do  i = ist,iend
-            do  m = 1,5
-               rsd(m,i,j,2) = rtmp_br1(m,2,i,j) - dssp * ((+(5.0d+00)) *
-     & utmp_br1(m,2,i,j) - 4.0d+00 * utmp_br1(m,3,i,j) + utmp_br1(m,4,i,
-     &j))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (j,i,m) ON rsd(m,i,j,3), PRIVATE (j,i,m)
-      do  j = jst,jend
-         do  i = ist,iend
-            do  m = 1,5
-               rsd(m,i,j,3) = rtmp_br1(m,3,i,j) - dssp * ((-(4.0d+00)) *
-     & utmp_br1(m,2,i,j) + 6.0d+00 * utmp_br1(m,3,i,j) - 4.0d+00 * utmp_
-     &br1(m,4,i,j) + utmp_br1(m,5,i,j))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (j,i,k,m) ON rsd(m,i,j,k), PRIVATE (j,i,k,m)
-      do  j = jst,jend
-         do  i = ist,iend
-            do  k = 4,nz - 3
-               do  m = 1,5
-                  rsd(m,i,j,k) = rtmp_br1(m,k,i,j) - dssp * (utmp_br1(m,
-     &k - 2,i,j) - 4.0d+00 * utmp_br1(m,k - 1,i,j) + 6.0d+00 * utmp_br1(
-     &m,k,i,j) - 4.0d+00 * utmp_br1(m,k + 1,i,j) + utmp_br1(m,k + 2,i,j)
-     &)
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (j,i,m) ON rsd(m,i,j,nz + -2), PRIVATE (j,i,m)
-      do  j = jst,jend
-         do  i = ist,iend
-            do  m = 1,5
-               rsd(m,i,j,nz - 2) = rtmp_br1(m,nz - 2,i,j) - dssp * (utmp
-     &_br1(m,nz - 4,i,j) - 4.0d+00 * utmp_br1(m,nz - 3,i,j) + 6.0d+00 * 
-     &utmp_br1(m,nz - 2,i,j) - 4.0d+00 * utmp_br1(m,nz - 1,i,j))
-            enddo  
-         enddo  
-      enddo  
-!DVM$ PARALLEL (j,i,m) ON rsd(m,i,j,nz + -1), PRIVATE (j,i,m)
-      do  j = jst,jend
-         do  i = ist,iend
-            do  m = 1,5
-               rsd(m,i,j,nz - 1) = rtmp_br1(m,nz - 1,i,j) - dssp * (utmp
-     &_br1(m,nz - 3,i,j) - 4.0d+00 * utmp_br1(m,nz - 2,i,j) + 5.0d+00 * 
-     &utmp_br1(m,nz - 1,i,j))
-            enddo  
-         enddo  
-      enddo 
-!DVM$ end region      
-      deallocate(flux_br3)
-      deallocate(rtmp_br1)
-      deallocate(utmp_br1)
-      if (timeron)  call timer_stop(t_rhs)
-!DVM$ end interval
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f2 b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f2
deleted file mode 100644
index b55561d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/rhs.f2
+++ /dev/null
@@ -1,415 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine rhs
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c   compute the right hand sides
-c---------------------------------------------------------------------
-
-      implicit none
-
-      include 'applu.incl'
-
-c---------------------------------------------------------------------
-c  local variables
-c---------------------------------------------------------------------
-      integer i, j, k, m, p
-      double precision  q
-      double precision  tmp, utmp(6,isiz3), rtmp(5,isiz3)
-      double precision  u21, u31, u41
-      double precision  u21i, u31i, u41i, u51i
-      double precision  u21j, u31j, u41j, u51j
-      double precision  u21k, u31k, u41k, u51k
-      double precision  u21im1, u31im1, u41im1, u51im1
-      double precision  u21jm1, u31jm1, u41jm1, u51jm1
-      double precision  u21km1, u31km1, u41km1, u51km1
-      double precision flu(5,-1:1)
-
-
-      if (timeron) call timer_start(t_rhs)
-!DVM$ PARALLEL (k,j,i) ON qs(i,j,k), PRIVATE (j,i,tmp,k,m)
-!DVM$&,SHADOW_COMPUTE,SHADOW_RENEW (u)
-      do k = 1, nz
-         do j = 1, ny
-            do i = 1, nx
-               do m = 1, 5
-                  rsd(m,i,j,k) = - frct(m,i,j,k)
-               end do
-               tmp = 1.0d+00 / u(1,i,j,k)
-               rho_i(i,j,k) = tmp
-               qs(i,j,k) = 0.50d+00 * (  u(2,i,j,k) * u(2,i,j,k)
-     >                         + u(3,i,j,k) * u(3,i,j,k)
-     >                         + u(4,i,j,k) * u(4,i,j,k) )
-     >                      * tmp
-            end do
-         end do
-      end do
-
-!      if (timeron) call timer_start(t_rhsx)
-!DVM$ PARALLEL (k,j,i) on rsd(*,i,j,k)
-      do k = 2, nz - 1
-         do j = jst, jend
-            do i = ist, iend
-			   do p = -1, 1, 2
-                flu(1,p) = u(2,i+p,j,k)
-                u21 = u(2,i+p,j,k) * rho_i(i+p,j,k)
-
-                q = qs(i+p,j,k)
-
-                flu(2,p) = u(2,i+p,j,k) * u21 + c2 * 
-     >                        ( u(5,i+p,j,k) - q )
-                flu(3,p) = u(3,i+p,j,k) * u21
-                flu(4,p) = u(4,i+p,j,k) * u21
-                flu(5,p) = ( c1 * u(5,i+p,j,k) - c2 * q ) * u21
-               end do			
-               do m = 1, 5
-                  rsd(m,i,j,k) =  rsd(m,i,j,k)
-     >                 - tx2 * ( flu(m,1) - flu(m,-1) )
-               end do
-
-			   do p = 0, 1
-				   tmp = rho_i(i+p,j,k)
-
-				   u21i = tmp * u(2,i+p,j,k)
-				   u31i = tmp * u(3,i+p,j,k)
-				   u41i = tmp * u(4,i+p,j,k)
-				   u51i = tmp * u(5,i+p,j,k)
-
-				   tmp = rho_i(i-1+p,j,k)
-
-				   u21im1 = tmp * u(2,i-1+p,j,k)
-				   u31im1 = tmp * u(3,i-1+p,j,k)
-				   u41im1 = tmp * u(4,i-1+p,j,k)
-				   u51im1 = tmp * u(5,i-1+p,j,k)
-
-				   flu(2,p) = (4.0d+00/3.0d+00) * tx3 * (u21i-u21im1)
-				   flu(3,p) = tx3 * ( u31i - u31im1 )
-				   flu(4,p) = tx3 * ( u41i - u41im1 )
-				   flu(5,p) = 0.50d+00 * ( 1.0d+00 - c1*c5)
-     >              * tx3 * ( ( u21i  **2 + u31i  **2+u41i  **2)
-     >                      - ( u21im1**2 + u31im1**2+u41im1**2))
-     >              + (1.0d+00/6.0d+00)
-     >              * tx3 * ( u21i**2 - u21im1**2 )
-     >              + c1 * c5 * tx3 * ( u51i - u51im1 )			   
-			   enddo
-			   
-               rsd(1,i,j,k) = rsd(1,i,j,k)
-     >              + dx1 * tx1 * (            u(1,i-1,j,k)
-     >                             - 2.0d+00 * u(1,i,j,k)
-     >                             +           u(1,i+1,j,k) )
-               rsd(2,i,j,k) = rsd(2,i,j,k)
-     >          + tx3 * c3 * c4 * ( flu(2,1) - flu(2,0) )
-     >              + dx2 * tx1 * (            u(2,i-1,j,k)
-     >                             - 2.0d+00 * u(2,i,j,k)
-     >                             +           u(2,i+1,j,k) )
-               rsd(3,i,j,k) = rsd(3,i,j,k)
-     >          + tx3 * c3 * c4 * ( flu(3,1) - flu(3,0) )
-     >              + dx3 * tx1 * (            u(3,i-1,j,k)
-     >                             - 2.0d+00 * u(3,i,j,k)
-     >                             +           u(3,i+1,j,k) )
-               rsd(4,i,j,k) = rsd(4,i,j,k)
-     >          + tx3 * c3 * c4 * ( flu(4,1) - flu(4,0) )
-     >              + dx4 * tx1 * (            u(4,i-1,j,k)
-     >                             - 2.0d+00 * u(4,i,j,k)
-     >                             +           u(4,i+1,j,k) )
-               rsd(5,i,j,k) = rsd(5,i,j,k)
-     >          + tx3 * c3 * c4 * ( flu(5,1) - flu(5,0) )
-     >              + dx5 * tx1 * (            u(5,i-1,j,k)
-     >                             - 2.0d+00 * u(5,i,j,k)
-     >                             +           u(5,i+1,j,k) )
-
-           
-		    if (i .eq. 2)then
-             do m = 1, 5
-               rsd(m,2,j,k) = rsd(m,2,j,k)
-     >           - dssp * ( + 5.0d+00 * u(m,2,j,k)
-     >                      - 4.0d+00 * u(m,3,j,k)
-     >                      +           u(m,4,j,k) )
-	         enddo
-			else if (i .eq. 3)then
-             do m = 1, 5			
-               rsd(m,3,j,k) = rsd(m,3,j,k)
-     >           - dssp * ( - 4.0d+00 * u(m,2,j,k)
-     >                      + 6.0d+00 * u(m,3,j,k)
-     >                      - 4.0d+00 * u(m,4,j,k)
-     >                      +           u(m,5,j,k) )
-	         enddo
-			else if (i .eq. nx-2)then
-             do m = 1, 5			
-               rsd(m,nx-2,j,k) = rsd(m,nx-2,j,k)
-     >           - dssp * (             u(m,nx-4,j,k)
-     >                      - 4.0d+00 * u(m,nx-3,j,k)
-     >                      + 6.0d+00 * u(m,nx-2,j,k)
-     >                      - 4.0d+00 * u(m,nx-1,j,k)  )
-	         enddo
-			else if (i .eq. nx-1)then	 
-             do m = 1, 5						
-               rsd(m,nx-1,j,k) = rsd(m,nx-1,j,k)
-     >           - dssp * (             u(m,nx-3,j,k)
-     >                      - 4.0d+00 * u(m,nx-2,j,k)
-     >                      + 5.0d+00 * u(m,nx-1,j,k) )				 
-	         enddo
-			else
-               do m = 1, 5
-                  rsd(m,i,j,k) = rsd(m,i,j,k)
-     >              - dssp * (            u(m,i-2,j,k)
-     >                        - 4.0d+00 * u(m,i-1,j,k)
-     >                        + 6.0d+00 * u(m,i,j,k)
-     >                        - 4.0d+00 * u(m,i+1,j,k)
-     >                        +           u(m,i+2,j,k) )
-               end do
-            endif
- !           end do			
- !        end do
-!      end do
-!      if (timeron) call timer_stop(t_rhsx)
-
-!      if (timeron) call timer_start(t_rhsy)
-!      do k = 2, nz - 1
- !        do j = jst, jend	  
- !          do i = ist, iend
-			   do p = -1, 1, 2
-                flu(1,p) = u(3,i,j+p,k)
-                u31 = u(3,i,j+p,k) * rho_i(i,j+p,k)
-
-                q = qs(i,j+p,k)
-
-                flu(2,p) = u(2,i,j+p,k) * u31 
-                flu(3,p) = u(3,i,j+p,k) * u31 + c2 * (u(5,i,j+p,k)-q)
-                flu(4,p) = u(4,i,j+p,k) * u31
-                flu(5,p) = ( c1 * u(5,i,j+p,k) - c2 * q ) * u31
-               end do				
-               do m = 1, 5
-                  rsd(m,i,j,k) =  rsd(m,i,j,k)
-     >                   - ty2 * ( flu(m,1) - flu(m,-1) )
-               end do
-
-			   do p = 0, 1
-               tmp = rho_i(i,j+p,k)
-
-               u21j = tmp * u(2,i,j+p,k)
-               u31j = tmp * u(3,i,j+p,k)
-               u41j = tmp * u(4,i,j+p,k)
-               u51j = tmp * u(5,i,j+p,k)
-
-               tmp = rho_i(i,j-1+p,k)
-               u21jm1 = tmp * u(2,i,j-1+p,k)
-               u31jm1 = tmp * u(3,i,j-1+p,k)
-               u41jm1 = tmp * u(4,i,j-1+p,k)
-               u51jm1 = tmp * u(5,i,j-1+p,k)
-
-               flu(2,p) = ty3 * ( u21j - u21jm1 )
-               flu(3,p) = (4.0d+00/3.0d+00) * ty3 * (u31j-u31jm1)
-               flu(4,p) = ty3 * ( u41j - u41jm1 )
-               flu(5,p) = 0.50d+00 * ( 1.0d+00 - c1*c5 )
-     >              * ty3 * ( ( u21j  **2 + u31j  **2 + u41j  **2 )
-     >                      - ( u21jm1**2 + u31jm1**2 + u41jm1**2 ) )
-     >              + (1.0d+00/6.0d+00)
-     >              * ty3 * ( u31j**2 - u31jm1**2 )
-     >              + c1 * c5 * ty3 * ( u51j - u51jm1 )			   
-			   enddo
-			   
-               rsd(1,i,j,k) = rsd(1,i,j,k)
-     >              + dy1 * ty1 * (            u(1,i,j-1,k)
-     >                             - 2.0d+00 * u(1,i,j,k)
-     >                             +           u(1,i,j+1,k) )
-
-               rsd(2,i,j,k) = rsd(2,i,j,k)
-     >          + ty3 * c3 * c4 * ( flu(2,1) - flu(2,0) )
-     >              + dy2 * ty1 * (            u(2,i,j-1,k)
-     >                             - 2.0d+00 * u(2,i,j,k)
-     >                             +           u(2,i,j+1,k) )
-
-               rsd(3,i,j,k) = rsd(3,i,j,k)
-     >          + ty3 * c3 * c4 * ( flu(3,1) - flu(3,0) )
-     >              + dy3 * ty1 * (            u(3,i,j-1,k)
-     >                             - 2.0d+00 * u(3,i,j,k)
-     >                             +           u(3,i,j+1,k) )
-
-               rsd(4,i,j,k) = rsd(4,i,j,k)
-     >          + ty3 * c3 * c4 * ( flu(4,1) - flu(4,0) )
-     >              + dy4 * ty1 * (            u(4,i,j-1,k)
-     >                             - 2.0d+00 * u(4,i,j,k)
-     >                             +           u(4,i,j+1,k) )
-
-               rsd(5,i,j,k) = rsd(5,i,j,k)
-     >          + ty3 * c3 * c4 * ( flu(5,1) - flu(5,0) )
-     >              + dy5 * ty1 * (            u(5,i,j-1,k)
-     >                             - 2.0d+00 * u(5,i,j,k)
-     >                             +           u(5,i,j+1,k) )
-
-
-
-         if (j .eq. 2) then
-            do m = 1, 5
-               rsd(m,i,2,k) = rsd(m,i,2,k)
-     >           - dssp * ( + 5.0d+00 * u(m,i,2,k)
-     >                      - 4.0d+00 * u(m,i,3,k)
-     >                      +           u(m,i,4,k) )
-           enddo	 
-         elseif (j .eq. 3) then	
-            do m = 1, 5		 
-		                rsd(m,i,3,k) = rsd(m,i,3,k)
-     >           - dssp * ( - 4.0d+00 * u(m,i,2,k)
-     >                      + 6.0d+00 * u(m,i,3,k)
-     >                      - 4.0d+00 * u(m,i,4,k)
-     >                      +           u(m,i,5,k) )
-            end do
-         elseif (j .eq. ny-2) then	
-             do m = 1, 5
-               rsd(m,i,ny-2,k) = rsd(m,i,ny-2,k)
-     >           - dssp * (             u(m,i,ny-4,k)
-     >                      - 4.0d+00 * u(m,i,ny-3,k)
-     >                      + 6.0d+00 * u(m,i,ny-2,k)
-     >                      - 4.0d+00 * u(m,i,ny-1,k)  )
-	          enddo
-         elseif (j .eq. ny-1) then	
-		    do m = 1, 5
-		     rsd(m,i,ny-1,k) = rsd(m,i,ny-1,k)
-     >           - dssp * (             u(m,i,ny-3,k)
-     >                      - 4.0d+00 * u(m,i,ny-2,k)
-     >                      + 5.0d+00 * u(m,i,ny-1,k) )
-            end do
-		 else		 
-               do m = 1, 5
-                  rsd(m,i,j,k) = rsd(m,i,j,k)
-     >              - dssp * (            u(m,i,j-2,k)
-     >                        - 4.0d+00 * u(m,i,j-1,k)
-     >                        + 6.0d+00 * u(m,i,j,k)
-     >                        - 4.0d+00 * u(m,i,j+1,k)
-     >                        +           u(m,i,j+2,k) )
-               end do		 
-		 endif
-
-!            end do
-!         end do
-!      end do
-	  
-!      if (timeron) call timer_stop(t_rhsy)
-
-!      if (timeron) call timer_start(t_rhsz)
-!      do k = 2, nz - 1	  
-!        do j = jst, jend
-!           do i = ist, iend
-			  do p=-1,1,2
-               flu(1,p) = u(4,i,j,k+p)
-               u41 = u(4,i,j,k+p) * rho_i(i,j,k+p)
-
-               q = qs(i,j,k+p)
-
-               flu(2,p) = u(2,i,j,k+p) * u41 
-               flu(3,p) = u(3,i,j,k+p) * u41 
-               flu(4,p) = u(4,i,j,k+p) * u41 + c2 * (u(5,i,j,k+p)-q)
-               flu(5,p) = ( c1 * u(5,i,j,k+p) - c2 * q ) * u41			  
-			  enddo
-			  
-               do m = 1, 5
-                  rsd(m,i,j,k) =  rsd(m,i,j,k)
-     >                - tz2 * ( flu(m,1) - flu(m,-1) )
-               end do
-
-			  do p=0,1
-               tmp = rho_i(i,j,k+p)
-
-               u21k = tmp * u(2,i,j,k+p)
-               u31k = tmp * u(3,i,j,k+p)
-               u41k = tmp * u(4,i,j,k+p)
-               u51k = tmp * u(5,i,j,k+p)
-
-               tmp = rho_i(i,j,k-1+p)
-
-               u21km1 = tmp * u(2,i,j,k-1+p)
-               u31km1 = tmp * u(3,i,j,k-1+p)
-               u41km1 = tmp * u(4,i,j,k-1+p)
-               u51km1 = tmp * u(5,i,j,k-1+p)
-
-               flu(2,p) = tz3 * ( u21k - u21km1 )
-               flu(3,p) = tz3 * ( u31k - u31km1 )
-               flu(4,p) = (4.0d+00/3.0d+00) * tz3 * (u41k-u41km1)
-               flu(5,p) = 0.50d+00 * ( 1.0d+00 - c1*c5 )
-     >              * tz3 * ( ( u21k  **2 + u31k  **2 + u41k  **2 )
-     >                      - ( u21km1**2 + u31km1**2 + u41km1**2 ) )
-     >              + (1.0d+00/6.0d+00)
-     >              * tz3 * ( u41k**2 - u41km1**2 )
-     >              + c1 * c5 * tz3 * ( u51k - u51km1 )			  
-			  enddo
-               rsd(1,i,j,k) = rsd(1,i,j,k)
-     >              + dz1 * tz1 * (            u(1,i,j,k-1)
-     >                             - 2.0d+00 * u(1,i,j,k)
-     >                             +           u(1,i,j,k+1) )
-               rsd(2,i,j,k) = rsd(2,i,j,k)
-     >          + tz3 * c3 * c4 * ( flu(2,1) - flu(2,0) )
-     >              + dz2 * tz1 * (            u(2,i,j,k-1)
-     >                             - 2.0d+00 * u(2,i,j,k)
-     >                             +           u(2,i,j,k+1) )
-               rsd(3,i,j,k) = rsd(3,i,j,k)
-     >          + tz3 * c3 * c4 * ( flu(3,1) - flu(3,0) )
-     >              + dz3 * tz1 * (            u(3,i,j,k-1)
-     >                             - 2.0d+00 * u(3,i,j,k)
-     >                             +           u(3,i,j,k+1) )
-               rsd(4,i,j,k) = rsd(4,i,j,k)
-     >          + tz3 * c3 * c4 * ( flu(4,1) - flu(4,0) )
-     >              + dz4 * tz1 * (            u(4,i,j,k-1)
-     >                             - 2.0d+00 * u(4,i,j,k)
-     >                             +           u(4,i,j,k+1) )
-               rsd(5,i,j,k) = rsd(5,i,j,k)
-     >          + tz3 * c3 * c4 * ( flu(5,1) - flu(5,0) )
-     >              + dz5 * tz1 * (            u(5,i,j,k-1)
-     >                             - 2.0d+00 * u(5,i,j,k)
-     >                             +           u(5,i,j,k+1) )
-
-
-            if (k .eq. 2) then
-            do m = 1, 5
-               rsd(m,i,j,2) = rsd(m,i,j,2)
-     >           - dssp * ( + 5.0d+00 * u(m,i,j,2)
-     >                      - 4.0d+00 * u(m,i,j,3)
-     >                      +           u(m,i,j,4) )
-            end do			
-            elseif (k .eq. 3) then			
-            do m = 1, 5
-               rsd(m,i,j,3) = rsd(m,i,j,3)
-     >           - dssp * ( - 4.0d+00 * u(m,i,j,2)
-     >                      + 6.0d+00 * u(m,i,j,3)
-     >                      - 4.0d+00 * u(m,i,j,4)
-     >                      +           u(m,i,j,5) )
-            end do			
-            elseif (k .eq. nz-2) then	
-			            do m = 1, 5
-               rsd(m,i,j,nz-2) = rsd(m,i,j,nz-2)
-     >           - dssp * (             u(m,i,j,nz-4)
-     >                      - 4.0d+00 * u(m,i,j,nz-3)
-     >                      + 6.0d+00 * u(m,i,j,nz-2)
-     >                      - 4.0d+00 * u(m,i,j,nz-1)  )
-            end do			
-            elseif (k .eq. nz-1) then						
-            do m = 1, 5
-               rsd(m,i,j,nz-1) = rsd(m,i,j,nz-1)
-     >           - dssp * (             u(m,i,j,nz-3)
-     >                      - 4.0d+00 * u(m,i,j,nz-2)
-     >                      + 5.0d+00 * u(m,i,j,nz-1) )
-            end do			
-            else
-               do m = 1, 5
-                  rsd(m,i,j,k) = rsd(m,i,j,k)
-     >              - dssp * (            u(m,i,j,k-2)
-     >                        - 4.0d+00 * u(m,i,j,k-1)
-     >                        + 6.0d+00 * u(m,i,j,k)
-     >                        - 4.0d+00 * u(m,i,j,k+1)
-     >                        +           u(m,i,j,k+2) )
-               end do			
-		    endif			
-			
-            end do
-         end do
-      end do
-!      if (timeron) call timer_stop(t_rhsz)
-      if (timeron) call timer_stop(t_rhs)
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setbv.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setbv.f
deleted file mode 100644
index 67e62a5..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setbv.f
+++ /dev/null
@@ -1,104 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine setbv ()
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   set the boundary values of dependent variables
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   local variables
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      integer  i,j,k,m
-      double precision  temp1(5),temp2(5)
-
-!---------------------------------------------------------------------
-!   set the dependent variable values along the top and bottom faces
-!---------------------------------------------------------------------
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r1(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: u
-!DVM$ PARALLEL (j,i) ON u(*,i,j,*), PRIVATE (m,i,j,temp2,temp1)
-      do  j = 1,ny
-         do  i = 1,nx
-            call exact(i,j,1,temp1)
-            call exact(i,j,nz,temp2)
-            do  m = 1,5
-               u(m,i,j,1) = temp1(m)
-               u(m,i,j,nz) = temp2(m)
-            enddo  
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!   set the dependent variable values along north and south faces
-!---------------------------------------------------------------------
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: u
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r2(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: u
-!DVM$ PARALLEL (k,i) ON u(*,i,*,k), PRIVATE (m,i,temp2,k,temp1)
-      do  k = 1,nz
-         do  i = 1,nx
-            call exact(i,1,k,temp1)
-            call exact(i,ny,k,temp2)
-            do  m = 1,5
-               u(m,i,1,k) = temp1(m)
-               u(m,i,ny,k) = temp2(m)
-            enddo  
-         enddo  
-      enddo  
-
-!---------------------------------------------------------------------
-!   set the dependent variable values along east and west faces
-!---------------------------------------------------------------------
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: u
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r3(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: u
-!DVM$ PARALLEL (k,j) ON u(*,*,j,k), PRIVATE (m,j,temp2,k,temp1)
-      do  k = 1,nz
-         do  j = 1,ny
-            call exact(1,j,k,temp1)
-            call exact(nx,j,k,temp2)
-            do  m = 1,5
-               u(m,1,j,k) = temp1(m)
-               u(m,nx,j,k) = temp2(m)
-            enddo  
-         enddo  
-      enddo  
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: u
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setcoeff.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setcoeff.f
deleted file mode 100644
index 19c3778..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setcoeff.f
+++ /dev/null
@@ -1,166 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine setcoeff ()
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  local variables
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   set up coefficients
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      dxi = 1.0d+00 / (nx0 - 1)
-      deta = 1.0d+00 / (ny0 - 1)
-      dzeta = 1.0d+00 / (nz0 - 1)
-      tx1 = 1.0d+00 / (dxi * dxi)
-      tx2 = 1.0d+00 / (2.0d+00 * dxi)
-      tx3 = 1.0d+00 / dxi
-      ty1 = 1.0d+00 / (deta * deta)
-      ty2 = 1.0d+00 / (2.0d+00 * deta)
-      ty3 = 1.0d+00 / deta
-      tz1 = 1.0d+00 / (dzeta * dzeta)
-      tz2 = 1.0d+00 / (2.0d+00 * dzeta)
-      tz3 = 1.0d+00 / dzeta
-
-!---------------------------------------------------------------------
-!   diffusion coefficients
-!---------------------------------------------------------------------
-      dx1 = 0.75d+00
-      dx2 = dx1
-      dx3 = dx1
-      dx4 = dx1
-      dx5 = dx1
-      dy1 = 0.75d+00
-      dy2 = dy1
-      dy3 = dy1
-      dy4 = dy1
-      dy5 = dy1
-      dz1 = 1.00d+00
-      dz2 = dz1
-      dz3 = dz1
-      dz4 = dz1
-      dz5 = dz1
-
-!---------------------------------------------------------------------
-!   fourth difference dissipation
-!---------------------------------------------------------------------
-      dssp = max (dx1,dy1,dz1) / 4.0d+00
-
-!---------------------------------------------------------------------
-!   coefficients of the exact solution to the first pde
-!---------------------------------------------------------------------
-      ce(1,1) = 2.0d+00
-      ce(1,2) = 0.0d+00
-      ce(1,3) = 0.0d+00
-      ce(1,4) = 4.0d+00
-      ce(1,5) = 5.0d+00
-      ce(1,6) = 3.0d+00
-      ce(1,7) = 5.0d-01
-      ce(1,8) = 2.0d-02
-      ce(1,9) = 1.0d-02
-      ce(1,10) = 3.0d-02
-      ce(1,11) = 5.0d-01
-      ce(1,12) = 4.0d-01
-      ce(1,13) = 3.0d-01
-
-!---------------------------------------------------------------------
-!   coefficients of the exact solution to the second pde
-!---------------------------------------------------------------------
-      ce(2,1) = 1.0d+00
-      ce(2,2) = 0.0d+00
-      ce(2,3) = 0.0d+00
-      ce(2,4) = 0.0d+00
-      ce(2,5) = 1.0d+00
-      ce(2,6) = 2.0d+00
-      ce(2,7) = 3.0d+00
-      ce(2,8) = 1.0d-02
-      ce(2,9) = 3.0d-02
-      ce(2,10) = 2.0d-02
-      ce(2,11) = 4.0d-01
-      ce(2,12) = 3.0d-01
-      ce(2,13) = 5.0d-01
-
-!---------------------------------------------------------------------
-!   coefficients of the exact solution to the third pde
-!---------------------------------------------------------------------
-      ce(3,1) = 2.0d+00
-      ce(3,2) = 2.0d+00
-      ce(3,3) = 0.0d+00
-      ce(3,4) = 0.0d+00
-      ce(3,5) = 0.0d+00
-      ce(3,6) = 2.0d+00
-      ce(3,7) = 3.0d+00
-      ce(3,8) = 4.0d-02
-      ce(3,9) = 3.0d-02
-      ce(3,10) = 5.0d-02
-      ce(3,11) = 3.0d-01
-      ce(3,12) = 5.0d-01
-      ce(3,13) = 4.0d-01
-
-!---------------------------------------------------------------------
-!   coefficients of the exact solution to the fourth pde
-!---------------------------------------------------------------------
-      ce(4,1) = 2.0d+00
-      ce(4,2) = 2.0d+00
-      ce(4,3) = 0.0d+00
-      ce(4,4) = 0.0d+00
-      ce(4,5) = 0.0d+00
-      ce(4,6) = 2.0d+00
-      ce(4,7) = 3.0d+00
-      ce(4,8) = 3.0d-02
-      ce(4,9) = 5.0d-02
-      ce(4,10) = 4.0d-02
-      ce(4,11) = 2.0d-01
-      ce(4,12) = 1.0d-01
-      ce(4,13) = 3.0d-01
-
-!---------------------------------------------------------------------
-!   coefficients of the exact solution to the fifth pde
-!---------------------------------------------------------------------
-      ce(5,1) = 5.0d+00
-      ce(5,2) = 4.0d+00
-      ce(5,3) = 3.0d+00
-      ce(5,4) = 2.0d+00
-      ce(5,5) = 1.0d-01
-      ce(5,6) = 4.0d-01
-      ce(5,7) = 3.0d-01
-      ce(5,8) = 5.0d-02
-      ce(5,9) = 4.0d-02
-      ce(5,10) = 3.0d-02
-      ce(5,11) = 1.0d-01
-      ce(5,12) = 3.0d-01
-      ce(5,13) = 2.0d-01
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setiv.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setiv.f
deleted file mode 100644
index 047066d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/setiv.f
+++ /dev/null
@@ -1,82 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine setiv ()
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!     
-!   set the initial values of independent variables based on tri-linear
-!   interpolation of boundary values in the computational space.
-!     
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  local variables
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-      include 'applu.incl'
-!---------------------------------------------------------------------
-      integer  i,j,k,m
-      double precision  xi,eta,zeta
-      double precision  pxi,peta,pzeta
-      double precision  ue_1jk(5),ue_nx0jk(5),ue_i1k(5),ue_iny0k(5),ue_i
-     &j1(5),ue_ijnz(5)
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0_r0(iEX0,iEX1,iEX2,iE
-!DVM$&X3) :: u
-!DVM$ PARALLEL (k) ON u(*,*,*,k), PRIVATE (xi,m,peta,pxi,pzeta,i,j,eta,u
-!DVM$&e_ij1,zeta,ue_i1k,ue_iny0k,k,ue_1jk,ue_nx0jk,ue_ijnz)
-      do  k = 2,nz - 1
-         zeta = dble (k - 1) / (nz - 1)
-         do  j = 2,ny - 1
-            eta = dble (j - 1) / (ny0 - 1)
-            do  i = 2,nx - 1
-               xi = dble (i - 1) / (nx0 - 1)
-               call exact(1,j,k,ue_1jk)
-               call exact(nx0,j,k,ue_nx0jk)
-               call exact(i,1,k,ue_i1k)
-               call exact(i,ny0,k,ue_iny0k)
-               call exact(i,j,1,ue_ij1)
-               call exact(i,j,nz,ue_ijnz)
-               do  m = 1,5
-                  pxi = (1.0d+00 - xi) * ue_1jk(m) + xi * ue_nx0jk(m)
-                  peta = (1.0d+00 - eta) * ue_i1k(m) + eta * ue_iny0k(m)
-                  pzeta = (1.0d+00 - zeta) * ue_ij1(m) + zeta * ue_ijnz(
-     &m)
-                  u(m,i,j,k) = pxi + peta + pzeta - pxi * peta - peta * 
-     &pzeta - pzeta * pxi + pxi * peta * pzeta
-               enddo  
-            enddo  
-         enddo  
-      enddo  
-!DVM$ REALIGN (iEX0,iEX1,iEX2,iEX3) WITH dvmh_temp0(iEX0,iEX1,iEX2,iEX3)
-!DVM$& :: u
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/ssor.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/ssor.f
deleted file mode 100644
index c2aea5f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/ssor.f
+++ /dev/null
@@ -1,765 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine ssor (niter)
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   to perform pseudo-time stepping SSOR iterations
-!   for five nonlinear pde's.
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      integer ::  niter
-
-!---------------------------------------------------------------------
-!   end of include file
-      INCLUDE 'applu.incl'
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      integer ::  i,j,k,m,n
-      integer ::  istep
-      double precision ::  tmp,tv(5),d_(5,5),a_(5,5),b_(5,5),c_(5,5)
-      double precision ::  delunm(5),rs(5)
-      external timer_read
-      double precision ::  timer_read
-      integer ::  mod_522_2
-      integer ::  mod_522_1
-      integer ::  mod_522_0
-      double precision ::  tmp3
-      double precision ::  tmp2
-      double precision ::  tmp1
-      double precision ::  c34
-      double precision ::  c1345
-      double precision ::  r43
-      integer ::  j__3
-      integer ::  i__4
-      integer ::  d_15_14
-      integer ::  d_15_13
-      integer ::  ldx_14_12
-      integer ::  ldx_14_11
-      integer ::  ldy_13_10
-      integer ::  ldy_13_9
-      integer ::  ldz_12_8
-      integer ::  ldz_12_7
-      integer ::  v_11_6
-      integer ::  v_11_5
-      double precision ::  tv__15(5)
-      double precision ::  tmat(5,5)
-      double precision ::  tmp1__16
-      double precision ::  tmp__17
-      integer ::  m__18
-      integer ::  j__19
-      integer ::  i__20
-      double precision ::  tmp3__21
-      double precision ::  tmp2__22
-      double precision ::  tmp1__23
-      double precision ::  c34__24
-      double precision ::  c1345__25
-      double precision ::  r43__26
-      integer ::  j__27
-      integer ::  i__28
-      integer ::  udz_43_38
-      integer ::  udz_43_37
-      integer ::  udy_42_36
-      integer ::  udy_42_35
-      integer ::  udx_41_34
-      integer ::  udx_41_33
-      integer ::  d_40_32
-      integer ::  d_40_31
-      integer ::  v_38_30
-      integer ::  v_38_29
-      double precision ::  tmat__39(5,5)
-      double precision ::  tmp1__40
-      double precision ::  tmp__41
-      integer ::  m__42
-      integer ::  j__43
-      integer ::  i__44
-
-!---------------------------------------------------------------------
-!   begin pseudo-time stepping iterations
-!---------------------------------------------------------------------
-      tmp = 1.0d+00 / (omega * (2.0d+00 - omega))
-      do  i = 1,11
-         call timer_clear(i)
-      enddo  
-
-!---------------------------------------------------------------------
-!   compute the steady-state residuals
-!---------------------------------------------------------------------
-      call rhs()
-
-!---------------------------------------------------------------------
-!   compute the L2 norms of newton iteration residuals
-!---------------------------------------------------------------------
-      call l2norm(isiz1,isiz2,isiz3,nx0,ny0,nz0,ist,iend,jst,jend,rsd,rs
-     &dnm)
-
-!      if ( ipr .eq. 1 ) then
-!         write (*,*) '          Initial residual norms'
-!         write (*,*)
-!         write (*,1007) ( rsdnm(m), m = 1, 5 )
-!         write (*,'(/a)') 'Iteration RMS-residual of 5th PDE'
-!      end if
-      do  i = 1,11
-         call timer_clear(i)
-      enddo  
-      call timer_start(1)
-
-!---------------------------------------------------------------------
-!   the timestep loop
-!---------------------------------------------------------------------
-      do  istep = 1,niter
-         mod_522_0 = mod (istep,20)
-
-!         if ( ( mod ( istep, inorm ) .eq. 0 ) .and.
-!     >          ipr .eq. 1 ) then
-!             write ( *, 1001 ) istep
-!         end if
-         if (mod_522_0 .eq. 0 .or. istep .eq. itmax .or. istep .eq. 1) t
-     &hen
-            if (niter .gt. 1)  write (unit = *,fmt = 200) istep
-200         FORMAT(' Time step ', I4)
-         endif  
-
-!---------------------------------------------------------------------
-!   perform SSOR iteration
-!---------------------------------------------------------------------
-         if (timeron) then
-            call timer_start(5)
-         endif  
-!DVM$    INTERVAL 22
-         if (timeron) then
-            call timer_stop(5)
-         endif  
-         r43 = 4.0d+00 / 3.0d+00
-         c1345 = c1 * c3 * c4 * c5
-         c34 = c3 * c4
-         r43__26 = 4.0d+00 / 3.0d+00
-         c1345__25 = c1 * c3 * c4 * c5
-         c34__24 = c3 * c4
-!DVM$    REGION 
-!DVM$    PARALLEL (k,j,i) ON rsd(*,i,j,k), PRIVATE (tmp3,tmp1,tmp2,tmat,
-!DVM$&k,tv,rs,rmk,rmj,rmi,ro),ACROSS (rsd(0:0,1:0,1:0,1:0)),CUDA_BLOCK (
-!DVM$&16,16)
-         do  k = 2,nz - 1
-            do  j = jst,jend
-               do  i = ist,iend
-                  rmk = 1.0d+00 / u(1,i,j,k - 1)
-                  rmj = 1.0d+00 / u(1,i,j - 1,k)
-                  rmi = 1.0d+00 / u(1,i - 1,j,k)
-                  ro = 1.0d+00 / u(1,i,j,k)
-                  rs(1) = dt * rsd(1,i,j,k)
-                  rs(2) = dt * rsd(2,i,j,k)
-                  rs(3) = dt * rsd(3,i,j,k)
-                  rs(4) = dt * rsd(4,i,j,k)
-                  rs(5) = dt * rsd(5,i,j,k)
-                  rs(1) = rs(1) - omega * ((-(dt)) * tz1 * dz1 * rsd(1,i
-     &,j,k - 1) + (-(dt)) * tz2 * rsd(4,i,j,k - 1))
-                  tv(1) = rs(1) - omega * ((-(dt)) * ty1 * dy1 * rsd(1,i
-     &,j - 1,k) + (-(dt)) * tx1 * dx1 * rsd(1,i - 1,j,k) + (-(dt)) * tx2
-     & * rsd(2,i - 1,j,k) + (-(dt)) * ty2 * rsd(3,i,j - 1,k) + 0.0d+00 *
-     & rsd(3,i - 1,j,k) + 0.0d+00 * rsd(4,i - 1,j,k) + 0.0d+00 * rsd(5,i
-     & - 1,j,k))
-                  tmat(1,1) = 1.0d+00 + dt * 2.0d+00 * (tx1 * dx1 + ty1 
-     &* dy1 + tz1 * dz1)
-                  tmat(1,2) = 0
-                  tmat(1,3) = 0
-                  tmat(1,4) = 0
-                  tmat(1,5) = 0
-                  rs(2) = rs(2) - omega * (((-(dt)) * tz2 * ((-(u(2,i,j,
-     &k - 1) * u(4,i,j,k - 1))) * rmk * rmk) - dt * tz1 * ((-(c34)) * rm
-     &k * rmk * u(2,i,j,k - 1))) * rsd(1,i,j,k - 1) + ((-(dt)) * tz2 * (
-     &u(4,i,j,k - 1) * rmk) - dt * tz1 * c34 * rmk - dt * tz1 * dz2) * r
-     &sd(2,i,j,k - 1) + (-(dt)) * tz2 * (u(2,i,j,k - 1) * rmk) * rsd(4,i
-     &,j,k - 1))
-                  tv(2) = rs(2) - omega * (((-(dt)) * ty2 * ((-(u(2,i,j 
-     &- 1,k) * u(3,i,j - 1,k))) * rmj * rmj) - dt * ty1 * ((-(c34)) * rm
-     &j * rmj * u(2,i,j - 1,k))) * rsd(1,i,j - 1,k) + ((-(dt)) * tx2 * (
-     &(-((u(2,i - 1,j,k) * rmi)** 2)) + c2 * qs(i - 1,j,k) * rmi) - dt *
-     & tx1 * ((-(r43)) * c34 * rmi * rmi * u(2,i - 1,j,k))) * rsd(1,i - 
-     &1,j,k) + ((-(dt)) * ty2 * (u(3,i,j - 1,k) * rmj) - dt * ty1 * (c34
-     & * rmj) - dt * ty1 * dy2) * rsd(2,i,j - 1,k) + ((-(dt)) * tx2 * ((
-     &2.0d+00 - c2) * (u(2,i - 1,j,k) * rmi)) - dt * tx1 * (r43 * c34 * 
-     &rmi) - dt * tx1 * dx2) * rsd(2,i - 1,j,k) + (-(dt)) * ty2 * (u(2,i
-     &,j - 1,k) * rmj) * rsd(3,i,j - 1,k) + (-(dt)) * tx2 * ((-(c2)) * (
-     &u(3,i - 1,j,k) * rmi)) * rsd(3,i - 1,j,k) + 0.0d+00 * rsd(4,i,j - 
-     &1,k) + (-(dt)) * tx2 * ((-(c2)) * (u(4,i - 1,j,k) * rmi)) * rsd(4,
-     &i - 1,j,k) + 0.0d+00 * rsd(5,i,j - 1,k) + (-(dt)) * tx2 * c2 * rsd
-     &(5,i - 1,j,k))
-                  tmat(2,1) = (-(dt)) * 2.0d+00 * (tx1 * r43 + ty1 + tz1
-     &) * c34 * ro * ro * u(2,i,j,k)
-                  tmat(2,2) = 1.0d+00 + dt * 2.0d+00 * c34 * ro * (tx1 *
-     & r43 + ty1 + tz1) + dt * 2.0d+00 * (tx1 * dx2 + ty1 * dy2 + tz1 * 
-     &dz2)
-                  tmat(2,3) = 0
-                  tmat(2,4) = 0
-                  tmat(2,5) = 0
-                  rs(3) = rs(3) - omega * (((-(dt)) * tz2 * ((-(u(3,i,j,
-     &k - 1) * u(4,i,j,k - 1))) * rmk * rmk) - dt * tz1 * ((-(c34)) * rm
-     &k * rmk * u(3,i,j,k - 1))) * rsd(1,i,j,k - 1) + ((-(dt)) * tz2 * (
-     &u(4,i,j,k - 1) * rmk) - dt * tz1 * (c34 * rmk) - dt * tz1 * dz3) *
-     & rsd(3,i,j,k - 1) + (-(dt)) * tz2 * (u(3,i,j,k - 1) * rmk) * rsd(4
-     &,i,j,k - 1))
-                  tv(3) = rs(3) - omega * (((-(dt)) * ty2 * ((-((u(3,i,j
-     & - 1,k) * rmj)** 2)) + c2 * (qs(i,j - 1,k) * rmj)) - dt * ty1 * ((
-     &-(r43)) * c34 * rmj * rmj * u(3,i,j - 1,k))) * rsd(1,i,j - 1,k) + 
-     &((-(dt)) * tx2 * ((-(u(2,i - 1,j,k) * u(3,i - 1,j,k))) * rmi * rmi
-     &) - dt * tx1 * ((-(c34)) * rmi * rmi * u(3,i - 1,j,k))) * rsd(1,i 
-     &- 1,j,k) + (-(dt)) * ty2 * ((-(c2)) * (u(2,i,j - 1,k) * rmj)) * rs
-     &d(2,i,j - 1,k) + (-(dt)) * tx2 * (u(3,i - 1,j,k) * rmi) * rsd(2,i 
-     &- 1,j,k) + ((-(dt)) * ty2 * ((2.0d+00 - c2) * (u(3,i,j - 1,k) * rm
-     &j)) - dt * ty1 * (r43 * c34 * rmj) - dt * ty1 * dy3) * rsd(3,i,j -
-     & 1,k) + ((-(dt)) * tx2 * (u(2,i - 1,j,k) * rmi) - dt * tx1 * (c34 
-     &* rmi) - dt * tx1 * dx3) * rsd(3,i - 1,j,k) + (-(dt)) * ty2 * ((-(
-     &c2)) * (u(4,i,j - 1,k) * rmj)) * rsd(4,i,j - 1,k) + 0.0d+00 * rsd(
-     &4,i - 1,j,k) + (-(dt)) * ty2 * c2 * rsd(5,i,j - 1,k) + 0.0d+00 * r
-     &sd(5,i - 1,j,k))
-                  tmat(3,1) = (-(dt)) * 2.0d+00 * (tx1 + ty1 * r43 + tz1
-     &) * c34 * ro * ro * u(3,i,j,k)
-                  tmat(3,2) = 0
-                  tmat(3,3) = 1.0d+00 + dt * 2.0d+00 * c34 * ro * (tx1 +
-     & ty1 * r43 + tz1) + dt * 2.0d+00 * (tx1 * dx3 + ty1 * dy3 + tz1 * 
-     &dz3)
-                  tmat(3,4) = 0
-                  tmat(3,5) = 0
-                  rs(4) = rs(4) - omega * (((-(dt)) * tz2 * ((-((u(4,i,j
-     &,k - 1) * rmk)** 2)) + c2 * qs(i,j,k - 1) * rmk) - dt * tz1 * ((-(
-     &r43)) * c34 * rmk * rmk * u(4,i,j,k - 1))) * rsd(1,i,j,k - 1) + (-
-     &(dt)) * tz2 * ((-(c2)) * (u(2,i,j,k - 1) * rmk)) * rsd(2,i,j,k - 1
-     &) + (-(dt)) * tz2 * ((-(c2)) * (u(3,i,j,k - 1) * rmk)) * rsd(3,i,j
-     &,k - 1) + ((-(dt)) * tz2 * (2.0d+00 - c2) * (u(4,i,j,k - 1) * rmk)
-     & - dt * tz1 * (r43 * c34 * rmk) - dt * tz1 * dz4) * rsd(4,i,j,k - 
-     &1) + (-(dt)) * tz2 * c2 * rsd(5,i,j,k - 1))
-                  tv(4) = rs(4) - omega * (((-(dt)) * ty2 * ((-(u(3,i,j 
-     &- 1,k) * u(4,i,j - 1,k))) * rmj * rmj) - dt * ty1 * ((-(c34)) * rm
-     &j * rmj * u(4,i,j - 1,k))) * rsd(1,i,j - 1,k) + ((-(dt)) * tx2 * (
-     &(-(u(2,i - 1,j,k) * u(4,i - 1,j,k))) * rmi * rmi) - dt * tx1 * ((-
-     &(c34)) * rmi * rmi * u(4,i - 1,j,k))) * rsd(1,i - 1,j,k) + 0.0d+00
-     & * rsd(2,i,j - 1,k) + (-(dt)) * tx2 * (u(4,i - 1,j,k) * rmi) * rsd
-     &(2,i - 1,j,k) + (-(dt)) * ty2 * (u(4,i,j - 1,k) * rmj) * rsd(3,i,j
-     & - 1,k) + 0.0d+00 * rsd(3,i - 1,j,k) + ((-(dt)) * ty2 * (u(3,i,j -
-     & 1,k) * rmj) - dt * ty1 * (c34 * rmj) - dt * ty1 * dy4) * rsd(4,i,
-     &j - 1,k) + ((-(dt)) * tx2 * (u(2,i - 1,j,k) * rmi) - dt * tx1 * (c
-     &34 * rmi) - dt * tx1 * dx4) * rsd(4,i - 1,j,k) + 0.0d+00 * rsd(5,i
-     &,j - 1,k) + 0.0d+00 * rsd(5,i - 1,j,k))
-                  tmat(4,1) = (-(dt)) * 2.0d+00 * (tx1 + ty1 + tz1 * r43
-     &) * c34 * ro * ro * u(4,i,j,k)
-                  tmat(4,2) = 0
-                  tmat(4,3) = 0
-                  tmat(4,4) = 1.0d+00 + dt * 2.0d+00 * c34 * ro * (tx1 +
-     & ty1 + tz1 * r43) + dt * 2.0d+00 * (tx1 * dx4 + ty1 * dy4 + tz1 * 
-     &dz4)
-                  tmat(4,5) = 0
-                  rs(5) = rs(5) - omega * (((-(dt)) * tz2 * ((c2 * 2.0d0
-     & * qs(i,j,k - 1) - c1 * u(5,i,j,k - 1)) * u(4,i,j,k - 1) * rmk * r
-     &mk) - dt * tz1 * ((-(c34 - c1345)) * rmk * rmk * rmk * u(2,i,j,k -
-     & 1)** 2 - (c34 - c1345) * rmk * rmk * rmk * u(3,i,j,k - 1)** 2 - (
-     &r43 * c34 - c1345) * rmk * rmk * rmk * u(4,i,j,k - 1)** 2 - c1345 
-     &* rmk * rmk * u(5,i,j,k - 1))) * rsd(1,i,j,k - 1) + ((-(dt)) * tz2
-     & * ((-(c2)) * (u(2,i,j,k - 1) * u(4,i,j,k - 1)) * rmk * rmk) - dt 
-     &* tz1 * (c34 - c1345) * rmk * rmk * u(2,i,j,k - 1)) * rsd(2,i,j,k 
-     &- 1) + ((-(dt)) * tz2 * ((-(c2)) * (u(3,i,j,k - 1) * u(4,i,j,k - 1
-     &)) * rmk * rmk) - dt * tz1 * (c34 - c1345) * rmk * rmk * u(3,i,j,k
-     & - 1)) * rsd(3,i,j,k - 1) + ((-(dt)) * tz2 * (c1 * (u(5,i,j,k - 1)
-     & * rmk) - c2 * (qs(i,j,k - 1) * rmk + u(4,i,j,k - 1) * u(4,i,j,k -
-     & 1) * rmk * rmk)) - dt * tz1 * (r43 * c34 - c1345) * rmk * rmk * u
-     &(4,i,j,k - 1)) * rsd(4,i,j,k - 1) + ((-(dt)) * tz2 * (c1 * (u(4,i,
-     &j,k - 1) * rmk)) - dt * tz1 * c1345 * rmk - dt * tz1 * dz5) * rsd(
-     &5,i,j,k - 1))
-                  tv(5) = rs(5) - omega * (((-(dt)) * ty2 * ((c2 * 2.0d0
-     & * qs(i,j - 1,k) - c1 * u(5,i,j - 1,k)) * (u(3,i,j - 1,k) * rmj * 
-     &rmj)) - dt * ty1 * ((-(c34 - c1345)) * rmj * rmj * rmj * u(2,i,j -
-     & 1,k)** 2 - (r43 * c34 - c1345) * rmj * rmj * rmj * u(3,i,j - 1,k)
-     &** 2 - (c34 - c1345) * rmj * rmj * rmj * u(4,i,j - 1,k)** 2 - c134
-     &5 * rmj * rmj * u(5,i,j - 1,k))) * rsd(1,i,j - 1,k) + ((-(dt)) * t
-     &x2 * ((c2 * 2.0d0 * qs(i - 1,j,k) - c1 * u(5,i - 1,j,k)) * u(2,i -
-     & 1,j,k) * rmi * rmi) - dt * tx1 * ((-(r43 * c34 - c1345)) * rmi * 
-     &rmi * rmi * u(2,i - 1,j,k)** 2 - (c34 - c1345) * rmi * rmi * rmi *
-     & u(3,i - 1,j,k)** 2 - (c34 - c1345) * rmi * rmi * rmi * u(4,i - 1,
-     &j,k)** 2 - c1345 * rmi * rmi * u(5,i - 1,j,k))) * rsd(1,i - 1,j,k)
-     & + ((-(dt)) * ty2 * ((-(c2)) * (u(2,i,j - 1,k) * u(3,i,j - 1,k)) *
-     & rmj * rmj) - dt * ty1 * (c34 - c1345) * rmj * rmj * u(2,i,j - 1,k
-     &)) * rsd(2,i,j - 1,k) + ((-(dt)) * tx2 * (c1 * (u(5,i - 1,j,k) * r
-     &mi) - c2 * (u(2,i - 1,j,k) * u(2,i - 1,j,k) * rmi * rmi + qs(i - 1
-     &,j,k) * rmi)) - dt * tx1 * (r43 * c34 - c1345) * rmi * rmi * u(2,i
-     & - 1,j,k)) * rsd(2,i - 1,j,k) + ((-(dt)) * ty2 * (c1 * (u(5,i,j - 
-     &1,k) * rmj) - c2 * (qs(i,j - 1,k) * rmj + u(3,i,j - 1,k) * u(3,i,j
-     & - 1,k) * rmj * rmj)) - dt * ty1 * (r43 * c34 - c1345) * rmj * rmj
-     & * u(3,i,j - 1,k)) * rsd(3,i,j - 1,k) + ((-(dt)) * tx2 * ((-(c2)) 
-     &* (u(3,i - 1,j,k) * u(2,i - 1,j,k)) * rmi * rmi) - dt * tx1 * (c34
-     & - c1345) * rmi * rmi * u(3,i - 1,j,k)) * rsd(3,i - 1,j,k) + ((-(d
-     &t)) * ty2 * ((-(c2)) * (u(3,i,j - 1,k) * u(4,i,j - 1,k)) * rmj * r
-     &mj) - dt * ty1 * (c34 - c1345) * rmj * rmj * u(4,i,j - 1,k)) * rsd
-     &(4,i,j - 1,k) + ((-(dt)) * tx2 * ((-(c2)) * (u(4,i - 1,j,k) * u(2,
-     &i - 1,j,k)) * rmi * rmi) - dt * tx1 * (c34 - c1345) * rmi * rmi * 
-     &u(4,i - 1,j,k)) * rsd(4,i - 1,j,k) + ((-(dt)) * ty2 * (c1 * (u(3,i
-     &,j - 1,k) * rmj)) - dt * ty1 * c1345 * rmj - dt * ty1 * dy5) * rsd
-     &(5,i,j - 1,k) + ((-(dt)) * tx2 * (c1 * (u(2,i - 1,j,k) * rmi)) - d
-     &t * tx1 * c1345 * rmi - dt * tx1 * dx5) * rsd(5,i - 1,j,k))
-                  tmat(5,1) = (-(dt)) * 2.0d+00 * (((tx1 * (r43 * c34 - 
-     &c1345) + ty1 * (c34 - c1345) + tz1 * (c34 - c1345)) * u(2,i,j,k)**
-     & 2 + (tx1 * (c34 - c1345) + ty1 * (r43 * c34 - c1345) + tz1 * (c34
-     & - c1345)) * u(3,i,j,k)** 2 + (tx1 * (c34 - c1345) + ty1 * (c34 - 
-     &c1345) + tz1 * (r43 * c34 - c1345)) * u(4,i,j,k)** 2) * ro * ro * 
-     &ro + (tx1 + ty1 + tz1) * c1345 * ro * ro * u(5,i,j,k))
-                  tmat(5,2) = dt * 2.0d+00 * ro * ro * u(2,i,j,k) * (tx1
-     & * (r43 * c34 - c1345) + ty1 * (c34 - c1345) + tz1 * (c34 - c1345)
-     &)
-                  tmat(5,3) = dt * 2.0d+00 * ro * ro * u(3,i,j,k) * (tx1
-     & * (c34 - c1345) + ty1 * (r43 * c34 - c1345) + tz1 * (c34 - c1345)
-     &)
-                  tmat(5,4) = dt * 2.0d+00 * ro * ro * u(4,i,j,k) * (tx1
-     & * (c34 - c1345) + ty1 * (c34 - c1345) + tz1 * (r43 * c34 - c1345)
-     &)
-                  tmat(5,5) = 1.0d+00 + dt * 2.0d+00 * (tx1 + ty1 + tz1)
-     & * c1345 * ro + dt * 2.0d+00 * (tx1 * dx5 + ty1 * dy5 + tz1 * dz5)
-                  tmp1 = 1.0d+00 / tmat(1,1)
-                  tmp2 = tmp1 * tmat(2,1)
-                  tmat(2,2) = tmat(2,2) - tmp2 * tmat(1,2)
-                  tmat(2,3) = tmat(2,3) - tmp2 * tmat(1,3)
-                  tmat(2,4) = tmat(2,4) - tmp2 * tmat(1,4)
-                  tmat(2,5) = tmat(2,5) - tmp2 * tmat(1,5)
-                  tv(2) = tv(2) - tv(1) * tmp2
-                  tmp2 = tmp1 * tmat(3,1)
-                  tmat(3,2) = tmat(3,2) - tmp2 * tmat(1,2)
-                  tmat(3,3) = tmat(3,3) - tmp2 * tmat(1,3)
-                  tmat(3,4) = tmat(3,4) - tmp2 * tmat(1,4)
-                  tmat(3,5) = tmat(3,5) - tmp2 * tmat(1,5)
-                  tv(3) = tv(3) - tv(1) * tmp2
-                  tmp2 = tmp1 * tmat(4,1)
-                  tmat(4,2) = tmat(4,2) - tmp2 * tmat(1,2)
-                  tmat(4,3) = tmat(4,3) - tmp2 * tmat(1,3)
-                  tmat(4,4) = tmat(4,4) - tmp2 * tmat(1,4)
-                  tmat(4,5) = tmat(4,5) - tmp2 * tmat(1,5)
-                  tv(4) = tv(4) - tv(1) * tmp2
-                  tmp2 = tmp1 * tmat(5,1)
-                  tmat(5,2) = tmat(5,2) - tmp2 * tmat(1,2)
-                  tmat(5,3) = tmat(5,3) - tmp2 * tmat(1,3)
-                  tmat(5,4) = tmat(5,4) - tmp2 * tmat(1,4)
-                  tmat(5,5) = tmat(5,5) - tmp2 * tmat(1,5)
-                  tv(5) = tv(5) - tv(1) * tmp2
-                  tmp1 = 1.0d+00 / tmat(2,2)
-                  tmp2 = tmp1 * tmat(3,2)
-                  tmat(3,3) = tmat(3,3) - tmp2 * tmat(2,3)
-                  tmat(3,4) = tmat(3,4) - tmp2 * tmat(2,4)
-                  tmat(3,5) = tmat(3,5) - tmp2 * tmat(2,5)
-                  tv(3) = tv(3) - tv(2) * tmp2
-                  tmp2 = tmp1 * tmat(4,2)
-                  tmat(4,3) = tmat(4,3) - tmp2 * tmat(2,3)
-                  tmat(4,4) = tmat(4,4) - tmp2 * tmat(2,4)
-                  tmat(4,5) = tmat(4,5) - tmp2 * tmat(2,5)
-                  tv(4) = tv(4) - tv(2) * tmp2
-                  tmp2 = tmp1 * tmat(5,2)
-                  tmat(5,3) = tmat(5,3) - tmp2 * tmat(2,3)
-                  tmat(5,4) = tmat(5,4) - tmp2 * tmat(2,4)
-                  tmat(5,5) = tmat(5,5) - tmp2 * tmat(2,5)
-                  tv(5) = tv(5) - tv(2) * tmp2
-                  tmp1 = 1.0d+00 / tmat(3,3)
-                  tmp2 = tmp1 * tmat(4,3)
-                  tmat(4,4) = tmat(4,4) - tmp2 * tmat(3,4)
-                  tmat(4,5) = tmat(4,5) - tmp2 * tmat(3,5)
-                  tv(4) = tv(4) - tv(3) * tmp2
-                  tmp2 = tmp1 * tmat(5,3)
-                  tmat(5,4) = tmat(5,4) - tmp2 * tmat(3,4)
-                  tmat(5,5) = tmat(5,5) - tmp2 * tmat(3,5)
-                  tv(5) = tv(5) - tv(3) * tmp2
-                  tmp1 = 1.0d+00 / tmat(4,4)
-                  tmp2 = tmp1 * tmat(5,4)
-                  tmat(5,5) = tmat(5,5) - tmp2 * tmat(4,5)
-                  tv(5) = tv(5) - tv(4) * tmp2
-                  rs(5) = tv(5) / tmat(5,5)
-                  tv(4) = tv(4) - tmat(4,5) * rs(5)
-                  rs(4) = tv(4) / tmat(4,4)
-                  tv(3) = tv(3) - tmat(3,4) * rs(4) - tmat(3,5) * rs(5)
-                  rs(3) = tv(3) / tmat(3,3)
-                  tv(2) = tv(2) - tmat(2,3) * rs(3) - tmat(2,4) * rs(4) 
-     &- tmat(2,5) * rs(5)
-                  rs(2) = tv(2) / tmat(2,2)
-                  tv(1) = tv(1) - tmat(1,2) * rs(2) - tmat(1,3) * rs(3) 
-     &- tmat(1,4) * rs(4) - tmat(1,5) * rs(5)
-                  rs(1) = tv(1) / tmat(1,1)
-                  rsd(1,i,j,k) = rs(1)
-                  rsd(2,i,j,k) = rs(2)
-                  rsd(3,i,j,k) = rs(3)
-                  rsd(4,i,j,k) = rs(4)
-                  rsd(5,i,j,k) = rs(5)
-               enddo  
-            enddo  
-         enddo  
-!DVM$    PARALLEL (k,j,i) ON rsd(*,i,j,k), PRIVATE (tv,tmat,tmp2,tmp1,rm
-!DVM$&k,rmj,rmi,ro),ACROSS (rsd(0:0,0:1,0:1,0:1)),CUDA_BLOCK (16,16)
-         do  k = nz - 1,2,(-(1))
-            do  j = jend,jst,(-(1))
-               do  i = iend,ist,(-(1))
-                  rmk = 1.0d+00 / u(1,i,j,k + 1)
-                  rmj = 1.0d+00 / u(1,i,j + 1,k)
-                  rmi = 1.0d+00 / u(1,i + 1,j,k)
-                  ro = 1.0d+00 / u(1,i,j,k)
-                  tv(1) = omega * ((-(dt)) * tz1 * dz1 * rsd(1,i,j,k + 1
-     &) + 0.0d+00 * rsd(2,i,j,k + 1) + 0.0d+00 * rsd(3,i,j,k + 1) + dt *
-     & tz2 * rsd(4,i,j,k + 1) + 0.0d+00 * rsd(5,i,j,k + 1))
-                  tv(1) = tv(1) + omega * ((-(dt)) * ty1 * dy1 * rsd(1,i
-     &,j + 1,k) + (-(dt)) * tx1 * dx1 * rsd(1,i + 1,j,k) + 0.0d+00 * rsd
-     &(2,i,j + 1,k) + dt * tx2 * rsd(2,i + 1,j,k) + dt * ty2 * rsd(3,i,j
-     & + 1,k) + 0.0d+00 * rsd(3,i + 1,j,k) + 0.0d+00 * rsd(4,i,j + 1,k) 
-     &+ 0.0d+00 * rsd(4,i + 1,j,k) + 0.0d+00 * rsd(5,i,j + 1,k) + 0.0d+0
-     &0 * rsd(5,i + 1,j,k))
-                  tmat(1,1) = 1.0d+00 + dt * 2.0d+00 * (tx1 * dx1 + ty1 
-     &* dy1 + tz1 * dz1)
-                  tmat(1,2) = 0.0d+00
-                  tmat(1,3) = 0.0d+00
-                  tmat(1,4) = 0.0d+00
-                  tmat(1,5) = 0.0d+00
-                  tv(2) = omega * ((dt * tz2 * ((-(u(2,i,j,k + 1) * u(4,
-     &i,j,k + 1))) * rmk * rmk) - dt * tz1 * ((-(c34__24)) * rmk * rmk *
-     & u(2,i,j,k + 1))) * rsd(1,i,j,k + 1) + (dt * tz2 * (u(4,i,j,k + 1)
-     & * rmk) - dt * tz1 * c34__24 * rmk - dt * tz1 * dz2) * rsd(2,i,j,k
-     & + 1) + 0.0d+00 * rsd(3,i,j,k + 1) + dt * tz2 * (u(2,i,j,k + 1) * 
-     &rmk) * rsd(4,i,j,k + 1) + 0.0d+00 * rsd(5,i,j,k + 1))
-                  tv(2) = tv(2) + omega * ((dt * ty2 * ((-(u(2,i,j + 1,k
-     &) * u(3,i,j + 1,k))) * rmj * rmj) - dt * ty1 * ((-(c34__24)) * rmj
-     & * rmj * u(2,i,j + 1,k))) * rsd(1,i,j + 1,k) + (dt * tx2 * ((-((u(
-     &2,i + 1,j,k) * rmi)** 2)) + c2 * qs(i + 1,j,k) * rmi) - dt * tx1 *
-     & ((-(r43__26)) * c34__24 * rmi * rmi * u(2,i + 1,j,k))) * rsd(1,i 
-     &+ 1,j,k) + (dt * ty2 * (u(3,i,j + 1,k) * rmj) - dt * ty1 * (c34__2
-     &4 * rmj) - dt * ty1 * dy2) * rsd(2,i,j + 1,k) + (dt * tx2 * ((2.0d
-     &+00 - c2) * (u(2,i + 1,j,k) * rmi)) - dt * tx1 * (r43__26 * c34__2
-     &4 * rmi) - dt * tx1 * dx2) * rsd(2,i + 1,j,k) + dt * ty2 * (u(2,i,
-     &j + 1,k) * rmj) * rsd(3,i,j + 1,k) + dt * tx2 * ((-(c2)) * (u(3,i 
-     &+ 1,j,k) * rmi)) * rsd(3,i + 1,j,k) + 0.0d+00 * rsd(4,i,j + 1,k) +
-     & dt * tx2 * ((-(c2)) * (u(4,i + 1,j,k) * rmi)) * rsd(4,i + 1,j,k) 
-     &+ 0.0d+00 * rsd(5,i,j + 1,k) + dt * tx2 * c2 * rsd(5,i + 1,j,k))
-                  tmat(2,1) = dt * 2.0d+00 * ((-(tx1)) * r43__26 - ty1 -
-     & tz1) * (c34__24 * ro * ro * u(2,i,j,k))
-                  tmat(2,2) = 1.0d+00 + dt * 2.0d+00 * c34__24 * ro * (t
-     &x1 * r43__26 + ty1 + tz1) + dt * 2.0d+00 * (tx1 * dx2 + ty1 * dy2 
-     &+ tz1 * dz2)
-                  tmat(2,3) = 0.0d+00
-                  tmat(2,4) = 0.0d+00
-                  tmat(2,5) = 0.0d+00
-                  tv(3) = omega * ((dt * tz2 * ((-(u(3,i,j,k + 1) * u(4,
-     &i,j,k + 1))) * rmk * rmk) - dt * tz1 * ((-(c34__24)) * rmk * rmk *
-     & u(3,i,j,k + 1))) * rsd(1,i,j,k + 1) + 0.0d+00 * rsd(2,i,j,k + 1) 
-     &+ (dt * tz2 * (u(4,i,j,k + 1) * rmk) - dt * tz1 * (c34__24 * rmk) 
-     &- dt * tz1 * dz3) * rsd(3,i,j,k + 1) + dt * tz2 * (u(3,i,j,k + 1) 
-     &* rmk) * rsd(4,i,j,k + 1) + 0.0d+00 * rsd(5,i,j,k + 1))
-                  tv(3) = tv(3) + omega * ((dt * ty2 * ((-((u(3,i,j + 1,
-     &k) * rmj)** 2)) + c2 * (qs(i,j + 1,k) * rmj)) - dt * ty1 * ((-(r43
-     &__26)) * c34__24 * rmj * rmj * u(3,i,j + 1,k))) * rsd(1,i,j + 1,k)
-     & + (dt * tx2 * ((-(u(2,i + 1,j,k) * u(3,i + 1,j,k))) * rmi * rmi) 
-     &- dt * tx1 * ((-(c34__24)) * rmi * rmi * u(3,i + 1,j,k))) * rsd(1,
-     &i + 1,j,k) + dt * ty2 * ((-(c2)) * (u(2,i,j + 1,k) * rmj)) * rsd(2
-     &,i,j + 1,k) + dt * tx2 * (u(3,i + 1,j,k) * rmi) * rsd(2,i + 1,j,k)
-     & + (dt * ty2 * ((2.0d+00 - c2) * (u(3,i,j + 1,k) * rmj)) - dt * ty
-     &1 * (r43__26 * c34__24 * rmj) - dt * ty1 * dy3) * rsd(3,i,j + 1,k)
-     & + (dt * tx2 * (u(2,i + 1,j,k) * rmi) - dt * tx1 * (c34__24 * rmi)
-     & - dt * tx1 * dx3) * rsd(3,i + 1,j,k) + dt * ty2 * ((-(c2)) * (u(4
-     &,i,j + 1,k) * rmj)) * rsd(4,i,j + 1,k) + 0.0d+00 * rsd(4,i + 1,j,k
-     &) + dt * ty2 * c2 * rsd(5,i,j + 1,k) + 0.0d+00 * rsd(5,i + 1,j,k))
-                  tmat(3,1) = dt * 2.0d+00 * ((-(tx1)) - ty1 * r43__26 -
-     & tz1) * (c34__24 * ro * ro * u(3,i,j,k))
-                  tmat(3,2) = 0.0d+00
-                  tmat(3,3) = 1.0d+00 + dt * 2.0d+00 * c34__24 * ro * (t
-     &x1 + ty1 * r43__26 + tz1) + dt * 2.0d+00 * (tx1 * dx3 + ty1 * dy3 
-     &+ tz1 * dz3)
-                  tmat(3,4) = 0.0d+00
-                  tmat(3,5) = 0.0d+00
-                  tv(4) = omega * ((dt * tz2 * ((-((u(4,i,j,k + 1) * rmk
-     &)** 2)) + c2 * (qs(i,j,k + 1) * rmk)) - dt * tz1 * ((-(r43__26)) *
-     & c34__24 * rmk * rmk * u(4,i,j,k + 1))) * rsd(1,i,j,k + 1) + dt * 
-     &tz2 * ((-(c2)) * (u(2,i,j,k + 1) * rmk)) * rsd(2,i,j,k + 1) + dt *
-     & tz2 * ((-(c2)) * (u(3,i,j,k + 1) * rmk)) * rsd(3,i,j,k + 1) + (dt
-     & * tz2 * (2.0d+00 - c2) * (u(4,i,j,k + 1) * rmk) - dt * tz1 * (r43
-     &__26 * c34__24 * rmk) - dt * tz1 * dz4) * rsd(4,i,j,k + 1) + dt * 
-     &tz2 * c2 * rsd(5,i,j,k + 1))
-                  tv(4) = tv(4) + omega * ((dt * ty2 * ((-(u(3,i,j + 1,k
-     &) * u(4,i,j + 1,k))) * rmj * rmj) - dt * ty1 * ((-(c34__24)) * rmj
-     & * rmj * u(4,i,j + 1,k))) * rsd(1,i,j + 1,k) + (dt * tx2 * ((-(u(2
-     &,i + 1,j,k) * u(4,i + 1,j,k))) * rmi * rmi) - dt * tx1 * ((-(c34__
-     &24)) * rmi * rmi * u(4,i + 1,j,k))) * rsd(1,i + 1,j,k) + 0.0d+00 *
-     & rsd(2,i,j + 1,k) + dt * tx2 * (u(4,i + 1,j,k) * rmi) * rsd(2,i + 
-     &1,j,k) + dt * ty2 * (u(4,i,j + 1,k) * rmj) * rsd(3,i,j + 1,k) + 0.
-     &0d+00 * rsd(3,i + 1,j,k) + (dt * ty2 * (u(3,i,j + 1,k) * rmj) - dt
-     & * ty1 * (c34__24 * rmj) - dt * ty1 * dy4) * rsd(4,i,j + 1,k) + (d
-     &t * tx2 * (u(2,i + 1,j,k) * rmi) - dt * tx1 * (c34__24 * rmi) - dt
-     & * tx1 * dx4) * rsd(4,i + 1,j,k) + 0.0d+00 * rsd(5,i,j + 1,k) + 0.
-     &0d+00 * rsd(5,i + 1,j,k))
-                  tmat(4,1) = dt * 2.0d+00 * ((-(tx1)) - ty1 - tz1 * r43
-     &__26) * (c34__24 * ro * ro * u(4,i,j,k))
-                  tmat(4,2) = 0.0d+00
-                  tmat(4,3) = 0.0d+00
-                  tmat(4,4) = 1.0d+00 + dt * 2.0d+00 * c34__24 * ro * (t
-     &x1 + ty1 + tz1 * r43__26) + dt * 2.0d+00 * (tx1 * dx4 + ty1 * dy4 
-     &+ tz1 * dz4)
-                  tmat(4,5) = 0.0d+00
-                  tv(5) = omega * ((dt * tz2 * ((c2 * 2.0d0 * qs(i,j,k +
-     & 1) - c1 * u(5,i,j,k + 1)) * (u(4,i,j,k + 1) * rmk * rmk)) - dt * 
-     &tz1 * ((-(c34__24 - c1345__25)) * rmk * rmk * rmk * u(2,i,j,k + 1)
-     &** 2 - (c34__24 - c1345__25) * rmk * rmk * rmk * u(3,i,j,k + 1)** 
-     &2 - (r43__26 * c34__24 - c1345__25) * rmk * rmk * rmk * u(4,i,j,k 
-     &+ 1)** 2 - c1345__25 * rmk * rmk * u(5,i,j,k + 1))) * rsd(1,i,j,k 
-     &+ 1) + (dt * tz2 * ((-(c2)) * (u(2,i,j,k + 1) * u(4,i,j,k + 1)) * 
-     &rmk * rmk) - dt * tz1 * (c34__24 - c1345__25) * rmk * rmk * u(2,i,
-     &j,k + 1)) * rsd(2,i,j,k + 1) + (dt * tz2 * ((-(c2)) * (u(3,i,j,k +
-     & 1) * u(4,i,j,k + 1)) * rmk * rmk) - dt * tz1 * (c34__24 - c1345__
-     &25) * rmk * rmk * u(3,i,j,k + 1)) * rsd(3,i,j,k + 1) + (dt * tz2 *
-     & (c1 * (u(5,i,j,k + 1) * rmk) - c2 * (qs(i,j,k + 1) * rmk + u(4,i,
-     &j,k + 1) * u(4,i,j,k + 1) * rmk * rmk)) - dt * tz1 * (r43__26 * c3
-     &4__24 - c1345__25) * rmk * rmk * u(4,i,j,k + 1)) * rsd(4,i,j,k + 1
-     &) + (dt * tz2 * (c1 * (u(4,i,j,k + 1) * rmk)) - dt * tz1 * c1345__
-     &25 * rmk - dt * tz1 * dz5) * rsd(5,i,j,k + 1))
-                  tv(5) = tv(5) + omega * ((dt * ty2 * ((c2 * 2.0d0 * qs
-     &(i,j + 1,k) - c1 * u(5,i,j + 1,k)) * (u(3,i,j + 1,k) * rmj * rmj))
-     & - dt * ty1 * ((-(c34__24 - c1345__25)) * rmj * rmj * rmj * u(2,i,
-     &j + 1,k)** 2 - (r43__26 * c34__24 - c1345__25) * rmj * rmj * rmj *
-     & u(3,i,j + 1,k)** 2 - (c34__24 - c1345__25) * rmj * rmj * rmj * u(
-     &4,i,j + 1,k)** 2 - c1345__25 * rmj * rmj * u(5,i,j + 1,k))) * rsd(
-     &1,i,j + 1,k) + (dt * tx2 * ((c2 * 2.0d0 * qs(i + 1,j,k) - c1 * u(5
-     &,i + 1,j,k)) * (u(2,i + 1,j,k) * rmi * rmi)) - dt * tx1 * ((-(r43_
-     &_26 * c34__24 - c1345__25)) * rmi * rmi * rmi * u(2,i + 1,j,k)** 2
-     & - (c34__24 - c1345__25) * rmi * rmi * rmi * u(3,i + 1,j,k)** 2 - 
-     &(c34__24 - c1345__25) * rmi * rmi * rmi * u(4,i + 1,j,k)** 2 - c13
-     &45__25 * rmi * rmi * u(5,i + 1,j,k))) * rsd(1,i + 1,j,k) + (dt * t
-     &y2 * ((-(c2)) * (u(2,i,j + 1,k) * u(3,i,j + 1,k)) * rmj * rmj) - d
-     &t * ty1 * (c34__24 - c1345__25) * rmj * rmj * u(2,i,j + 1,k)) * rs
-     &d(2,i,j + 1,k) + (dt * tx2 * (c1 * (u(5,i + 1,j,k) * rmi) - c2 * (
-     &u(2,i + 1,j,k) * u(2,i + 1,j,k) * rmi * rmi + qs(i + 1,j,k) * rmi)
-     &) - dt * tx1 * (r43__26 * c34__24 - c1345__25) * rmi * rmi * u(2,i
-     & + 1,j,k)) * rsd(2,i + 1,j,k) + (dt * ty2 * (c1 * (u(5,i,j + 1,k) 
-     &* rmj) - c2 * (qs(i,j + 1,k) * rmj + u(3,i,j + 1,k) * u(3,i,j + 1,
-     &k) * rmj * rmj)) - dt * ty1 * (r43__26 * c34__24 - c1345__25) * rm
-     &j * rmj * u(3,i,j + 1,k)) * rsd(3,i,j + 1,k) + (dt * tx2 * ((-(c2)
-     &) * (u(3,i + 1,j,k) * u(2,i + 1,j,k)) * rmi * rmi) - dt * tx1 * (c
-     &34__24 - c1345__25) * rmi * rmi * u(3,i + 1,j,k)) * rsd(3,i + 1,j,
-     &k) + (dt * ty2 * ((-(c2)) * (u(3,i,j + 1,k) * u(4,i,j + 1,k)) * rm
-     &j * rmj) - dt * ty1 * (c34__24 - c1345__25) * rmj * rmj * u(4,i,j 
-     &+ 1,k)) * rsd(4,i,j + 1,k) + (dt * tx2 * ((-(c2)) * (u(4,i + 1,j,k
-     &) * u(2,i + 1,j,k)) * rmi * rmi) - dt * tx1 * (c34__24 - c1345__25
-     &) * rmi * rmi * u(4,i + 1,j,k)) * rsd(4,i + 1,j,k) + (dt * ty2 * (
-     &c1 * (u(3,i,j + 1,k) * rmj)) - dt * ty1 * c1345__25 * rmj - dt * t
-     &y1 * dy5) * rsd(5,i,j + 1,k) + (dt * tx2 * (c1 * (u(2,i + 1,j,k) *
-     & rmi)) - dt * tx1 * c1345__25 * rmi - dt * tx1 * dx5) * rsd(5,i + 
-     &1,j,k))
-                  tmat(5,1) = (-(dt)) * 2.0d+00 * (((tx1 * (r43__26 * c3
-     &4__24 - c1345__25) + ty1 * (c34__24 - c1345__25) + tz1 * (c34__24 
-     &- c1345__25)) * u(2,i,j,k)** 2 + (tx1 * (c34__24 - c1345__25) + ty
-     &1 * (r43__26 * c34__24 - c1345__25) + tz1 * (c34__24 - c1345__25))
-     & * u(3,i,j,k)** 2 + (tx1 * (c34__24 - c1345__25) + ty1 * (c34__24 
-     &- c1345__25) + tz1 * (r43__26 * c34__24 - c1345__25)) * u(4,i,j,k)
-     &** 2) * ro * ro * ro + (tx1 + ty1 + tz1) * c1345__25 * ro * ro * u
-     &(5,i,j,k))
-                  tmat(5,2) = dt * 2.0d+00 * (tx1 * (r43__26 * c34__24 -
-     & c1345__25) + ty1 * (c34__24 - c1345__25) + tz1 * (c34__24 - c1345
-     &__25)) * ro * ro * u(2,i,j,k)
-                  tmat(5,3) = dt * 2.0d+00 * (tx1 * (c34__24 - c1345__25
-     &) + ty1 * (r43__26 * c34__24 - c1345__25) + tz1 * (c34__24 - c1345
-     &__25)) * ro * ro * u(3,i,j,k)
-                  tmat(5,4) = dt * 2.0d+00 * (tx1 * (c34__24 - c1345__25
-     &) + ty1 * (c34__24 - c1345__25) + tz1 * (r43__26 * c34__24 - c1345
-     &__25)) * ro * ro * u(4,i,j,k)
-                  tmat(5,5) = 1.0d+00 + dt * 2.0d+00 * (tx1 + ty1 + tz1)
-     & * c1345__25 * ro + dt * 2.0d+00 * (tx1 * dx5 + ty1 * dy5 + tz1 * 
-     &dz5)
-                  tmp1 = 1.0d+00 / tmat(1,1)
-                  tmp2 = tmp1 * tmat(2,1)
-                  tmat(2,2) = tmat(2,2) - tmp2 * tmat(1,2)
-                  tmat(2,3) = tmat(2,3) - tmp2 * tmat(1,3)
-                  tmat(2,4) = tmat(2,4) - tmp2 * tmat(1,4)
-                  tmat(2,5) = tmat(2,5) - tmp2 * tmat(1,5)
-                  tv(2) = tv(2) - tv(1) * tmp2
-                  tmp2 = tmp1 * tmat(3,1)
-                  tmat(3,2) = tmat(3,2) - tmp2 * tmat(1,2)
-                  tmat(3,3) = tmat(3,3) - tmp2 * tmat(1,3)
-                  tmat(3,4) = tmat(3,4) - tmp2 * tmat(1,4)
-                  tmat(3,5) = tmat(3,5) - tmp2 * tmat(1,5)
-                  tv(3) = tv(3) - tv(1) * tmp2
-                  tmp2 = tmp1 * tmat(4,1)
-                  tmat(4,2) = tmat(4,2) - tmp2 * tmat(1,2)
-                  tmat(4,3) = tmat(4,3) - tmp2 * tmat(1,3)
-                  tmat(4,4) = tmat(4,4) - tmp2 * tmat(1,4)
-                  tmat(4,5) = tmat(4,5) - tmp2 * tmat(1,5)
-                  tv(4) = tv(4) - tv(1) * tmp2
-                  tmp2 = tmp1 * tmat(5,1)
-                  tmat(5,2) = tmat(5,2) - tmp2 * tmat(1,2)
-                  tmat(5,3) = tmat(5,3) - tmp2 * tmat(1,3)
-                  tmat(5,4) = tmat(5,4) - tmp2 * tmat(1,4)
-                  tmat(5,5) = tmat(5,5) - tmp2 * tmat(1,5)
-                  tv(5) = tv(5) - tv(1) * tmp2
-                  tmp1 = 1.0d+00 / tmat(2,2)
-                  tmp2 = tmp1 * tmat(3,2)
-                  tmat(3,3) = tmat(3,3) - tmp2 * tmat(2,3)
-                  tmat(3,4) = tmat(3,4) - tmp2 * tmat(2,4)
-                  tmat(3,5) = tmat(3,5) - tmp2 * tmat(2,5)
-                  tv(3) = tv(3) - tv(2) * tmp2
-                  tmp2 = tmp1 * tmat(4,2)
-                  tmat(4,3) = tmat(4,3) - tmp2 * tmat(2,3)
-                  tmat(4,4) = tmat(4,4) - tmp2 * tmat(2,4)
-                  tmat(4,5) = tmat(4,5) - tmp2 * tmat(2,5)
-                  tv(4) = tv(4) - tv(2) * tmp2
-                  tmp2 = tmp1 * tmat(5,2)
-                  tmat(5,3) = tmat(5,3) - tmp2 * tmat(2,3)
-                  tmat(5,4) = tmat(5,4) - tmp2 * tmat(2,4)
-                  tmat(5,5) = tmat(5,5) - tmp2 * tmat(2,5)
-                  tv(5) = tv(5) - tv(2) * tmp2
-                  tmp1 = 1.0d+00 / tmat(3,3)
-                  tmp2 = tmp1 * tmat(4,3)
-                  tmat(4,4) = tmat(4,4) - tmp2 * tmat(3,4)
-                  tmat(4,5) = tmat(4,5) - tmp2 * tmat(3,5)
-                  tv(4) = tv(4) - tv(3) * tmp2
-                  tmp2 = tmp1 * tmat(5,3)
-                  tmat(5,4) = tmat(5,4) - tmp2 * tmat(3,4)
-                  tmat(5,5) = tmat(5,5) - tmp2 * tmat(3,5)
-                  tv(5) = tv(5) - tv(3) * tmp2
-                  tmp1 = 1.0d+00 / tmat(4,4)
-                  tmp2 = tmp1 * tmat(5,4)
-                  tmat(5,5) = tmat(5,5) - tmp2 * tmat(4,5)
-                  tv(5) = tv(5) - tv(4) * tmp2
-                  tv(5) = tv(5) / tmat(5,5)
-                  tv(4) = tv(4) - tmat(4,5) * tv(5)
-                  tv(4) = tv(4) / tmat(4,4)
-                  tv(3) = tv(3) - tmat(3,4) * tv(4) - tmat(3,5) * tv(5)
-                  tv(3) = tv(3) / tmat(3,3)
-                  tv(2) = tv(2) - tmat(2,3) * tv(3) - tmat(2,4) * tv(4) 
-     &- tmat(2,5) * tv(5)
-                  tv(2) = tv(2) / tmat(2,2)
-                  tv(1) = tv(1) - tmat(1,2) * tv(2) - tmat(1,3) * tv(3) 
-     &- tmat(1,4) * tv(4) - tmat(1,5) * tv(5)
-                  tv(1) = tv(1) / tmat(1,1)
-                  rsd(1,i,j,k) = rsd(1,i,j,k) - tv(1)
-                  rsd(2,i,j,k) = rsd(2,i,j,k) - tv(2)
-                  rsd(3,i,j,k) = rsd(3,i,j,k) - tv(3)
-                  rsd(4,i,j,k) = rsd(4,i,j,k) - tv(4)
-                  rsd(5,i,j,k) = rsd(5,i,j,k) - tv(5)
-               enddo  
-            enddo  
-         enddo  
-
-!---------------------------------------------------------------------
-!   update the variables
-!---------------------------------------------------------------------
-!         if (timeron) then
-!            call timer_start(10)
-!         endif  
-!DVM$    PARALLEL (k,j,i,m) ON u(m,i,j,k), PRIVATE (j,m,i,k)
-         do  k = 1,nz
-            do  j = jst,jend
-               do  i = ist,iend
-                  do  m = 1,5
-                     u(m,i,j,k) = u(m,i,j,k) + tmp * rsd(m,i,j,k)
-                  enddo  
-               enddo  
-            enddo  
-         enddo  
-!DVM$    END REGION
-
-!         if (timeron) then
-!            call timer_stop(10)
-!         endif  
-!---------------------------------------------------------------------
-!   compute the steady-state residuals
-!---------------------------------------------------------------------
-!DVM$    END INTERVAL
-         call rhs()
-         mod_522_2 = mod (istep,inorm)
-
-!---------------------------------------------------------------------
-!   compute the max-norms of newton iteration residuals
-!---------------------------------------------------------------------
-         if (mod_522_2 .eq. 0 .or. istep .eq. itmax) then
-            if (timeron) then
-               call timer_start(11)
-            endif  
-            call l2norm(isiz1,isiz2,isiz3,nx0,ny0,nz0,ist,iend,jst,jend,
-     &rsd,rsdnm)
-            if (timeron) then
-               call timer_stop(11)
-            endif  
-
-!            if ( ipr .eq. 1 ) then
-!                write (*,1007) ( rsdnm(m), m = 1, 5 )
-!            end if
-         endif  
-
-!---------------------------------------------------------------------
-!   check the newton-iteration residuals against the tolerance levels
-!---------------------------------------------------------------------
-         if (rsdnm(1) .lt. tolrsd(1) .and. rsdnm(2) .lt. tolrsd(2) .and.
-     & rsdnm(3) .lt. tolrsd(3) .and. rsdnm(4) .lt. tolrsd(4) .and. rsdnm
-     &(5) .lt. tolrsd(5)) then
-
-!            if (ipr .eq. 1 ) then
-            write (unit = *,fmt = 1004) istep
-
-!            end if
-            goto 900
-         endif  
-      enddo  
-900   continue
-      call timer_stop(1)
-      maxtime = timer_read (1)
-      return 
-1001  FORMAT (1X/5X,'pseudo-time SSOR iteration no.=',I4/)
-1004  FORMAT (1X/1X,'convergence was achieved after ',I4,   ' pseudo-tim
-     &e steps' )
-1006  FORMAT (1X/1X,'RMS-norm of SSOR-iteration correction ', 'for first
-     & pde  = ',1PE12.5/, 1X,'RMS-norm of SSOR-iteration correction ', '
-     &for second pde = ',1PE12.5/, 1X,'RMS-norm of SSOR-iteration correc
-     &tion ', 'for third pde  = ',1PE12.5/, 1X,'RMS-norm of SSOR-iterati
-     &on correction ', 'for fourth pde = ',1PE12.5/, 1X,'RMS-norm of SSO
-     &R-iteration correction ', 'for fifth pde  = ',1PE12.5)
-1007  FORMAT (1X/1X,'RMS-norm of steady-state residual for ', 'first pde
-     &  = ',1PE12.5/, 1X,'RMS-norm of steady-state residual for ', 'seco
-     &nd pde = ',1PE12.5/, 1X,'RMS-norm of steady-state residual for ', 
-     &'third pde  = ',1PE12.5/, 1X,'RMS-norm of steady-state residual fo
-     &r ', 'fourth pde = ',1PE12.5/, 1X,'RMS-norm of steady-state residu
-     &al for ', 'fifth pde  = ',1PE12.5)
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/timers.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/timers.f
deleted file mode 100644
index 480c728..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/timers.f
+++ /dev/null
@@ -1,97 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine timer_clear(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      elapsed(n) = 0.0
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_start(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      start(n) = elapsed_time()
-
-      return
-      end
-      
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_stop(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-      double precision t, now
-      now = elapsed_time()
-      t = now - start(n)
-      elapsed(n) = elapsed(n) + t
-
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function timer_read(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-      
-      timer_read = elapsed(n)
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function elapsed_time()
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-
-      double precision dvtime
-      elapsed_time = dvtime()
-
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/verify.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/verify.f
deleted file mode 100644
index 14e4b80..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/LU/verify.f
+++ /dev/null
@@ -1,382 +0,0 @@
-
-! *** generated by SAPFOR with version 1124 and build date: Apr 18 2019 20:56:38
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-      subroutine verify (xcr, xce, xci, class, verified)
-
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!  verification routine                         
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---  applu.incl   
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!   npbparams.h defines parameters that depend on the class and 
-!   number of nodes
-!---------------------------------------------------------------------
-      implicit none
-
-!---------------------------------------------------------------------
-!   end of include file
-!---------------------------------------------------------------------
-
-!---------------------------------------------------------------------
-!   end of include file
-        include 'applu.incl'
-!---------------------------------------------------------------------
-      double precision  xcr(5),xce(5),xci
-      double precision  xcrref(5),xceref(5),xciref,xcrdif(5),xcedif(5),x
-     &cidif,epsilon,dtref
-      integer  m
-      character  class
-      logical  verified
-
-!---------------------------------------------------------------------
-!   tolerance level
-!---------------------------------------------------------------------
-      epsilon = 1.0d-08
-      class = 'U'
-      verified = .TRUE.
-      do  m = 1,5
-         xcrref(m) = 1.0
-         xceref(m) = 1.0
-      enddo  
-      xciref = 1.0
-      if (nx0 .eq. 12 .and. ny0 .eq. 12 .and. nz0 .eq. 12 .and. itmax .e
-     &q. 50) then
-         class = 'S'
-         dtref = 5.0d-1
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of residual, for the (12X12X12) grid,
-!   after 50 time steps, with  DT = 5.0d-01
-!---------------------------------------------------------------------
-         xcrref(1) = 1.6196343210976702d-02
-         xcrref(2) = 2.1976745164821318d-03
-         xcrref(3) = 1.5179927653399185d-03
-         xcrref(4) = 1.5029584435994323d-03
-         xcrref(5) = 3.4264073155896461d-02
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of solution error, for the (12X12X12) grid,
-!   after 50 time steps, with  DT = 5.0d-01
-!---------------------------------------------------------------------
-         xceref(1) = 6.4223319957960924d-04
-         xceref(2) = 8.4144342047347926d-05
-         xceref(3) = 5.8588269616485186d-05
-         xceref(4) = 5.8474222595157350d-05
-         xceref(5) = 1.3103347914111294d-03
-
-!---------------------------------------------------------------------
-!   Reference value of surface integral, for the (12X12X12) grid,
-!   after 50 time steps, with DT = 5.0d-01
-!---------------------------------------------------------------------
-         xciref = 7.8418928865937083d+00
-      else if (nx0 .eq. 33 .and. ny0 .eq. 33 .and. nz0 .eq. 33 .and. itm
-     &ax .eq. 300) then  
-
-!SPEC95fp size
-         class = 'W'
-         dtref = 1.5d-3
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of residual, for the (33x33x33) grid,
-!   after 300 time steps, with  DT = 1.5d-3
-!---------------------------------------------------------------------
-         xcrref(1) = 0.1236511638192d+02
-         xcrref(2) = 0.1317228477799d+01
-         xcrref(3) = 0.2550120713095d+01
-         xcrref(4) = 0.2326187750252d+01
-         xcrref(5) = 0.2826799444189d+02
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of solution error, for the (33X33X33) grid,
-!---------------------------------------------------------------------
-         xceref(1) = 0.4867877144216d+00
-         xceref(2) = 0.5064652880982d-01
-         xceref(3) = 0.9281818101960d-01
-         xceref(4) = 0.8570126542733d-01
-         xceref(5) = 0.1084277417792d+01
-
-!---------------------------------------------------------------------
-!   Reference value of surface integral, for the (33X33X33) grid,
-!   after 300 time steps, with  DT = 1.5d-3
-!---------------------------------------------------------------------
-         xciref = 0.1161399311023d+02
-      else if (nx0 .eq. 64 .and. ny0 .eq. 64 .and. nz0 .eq. 64 .and. itm
-     &ax .eq. 250) then  
-         class = 'A'
-         dtref = 2.0d+0
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of residual, for the (64X64X64) grid,
-!   after 250 time steps, with  DT = 2.0d+00
-!---------------------------------------------------------------------
-         xcrref(1) = 7.7902107606689367d+02
-         xcrref(2) = 6.3402765259692870d+01
-         xcrref(3) = 1.9499249727292479d+02
-         xcrref(4) = 1.7845301160418537d+02
-         xcrref(5) = 1.8384760349464247d+03
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of solution error, for the (64X64X64) grid,
-!   after 250 time steps, with  DT = 2.0d+00
-!---------------------------------------------------------------------
-         xceref(1) = 2.9964085685471943d+01
-         xceref(2) = 2.8194576365003349d+00
-         xceref(3) = 7.3473412698774742d+00
-         xceref(4) = 6.7139225687777051d+00
-         xceref(5) = 7.0715315688392578d+01
-
-!---------------------------------------------------------------------
-!   Reference value of surface integral, for the (64X64X64) grid,
-!   after 250 time steps, with DT = 2.0d+00
-!---------------------------------------------------------------------
-         xciref = 2.6030925604886277d+01
-      else if (nx0 .eq. 102 .and. ny0 .eq. 102 .and. nz0 .eq. 102 .and. 
-     &itmax .eq. 250) then  
-         class = 'B'
-         dtref = 2.0d+0
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of residual, for the (102X102X102) grid,
-!   after 250 time steps, with  DT = 2.0d+00
-!---------------------------------------------------------------------
-         xcrref(1) = 3.5532672969982736d+03
-         xcrref(2) = 2.6214750795310692d+02
-         xcrref(3) = 8.8333721850952190d+02
-         xcrref(4) = 7.7812774739425265d+02
-         xcrref(5) = 7.3087969592545314d+03
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of solution error, for the (102X102X102) 
-!   grid, after 250 time steps, with  DT = 2.0d+00
-!---------------------------------------------------------------------
-         xceref(1) = 1.1401176380212709d+02
-         xceref(2) = 8.1098963655421574d+00
-         xceref(3) = 2.8480597317698308d+01
-         xceref(4) = 2.5905394567832939d+01
-         xceref(5) = 2.6054907504857413d+02
-
-!---------------------------------------------------------------------
-!   Reference value of surface integral, for the (102X102X102) grid,
-!   after 250 time steps, with DT = 2.0d+00
-!---------------------------------------------------------------------
-         xciref = 4.7887162703308227d+01
-      else if (nx0 .eq. 162 .and. ny0 .eq. 162 .and. nz0 .eq. 162 .and. 
-     &itmax .eq. 250) then  
-         class = 'C'
-         dtref = 2.0d+0
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of residual, for the (162X162X162) grid,
-!   after 250 time steps, with  DT = 2.0d+00
-!---------------------------------------------------------------------
-         xcrref(1) = 1.03766980323537846d+04
-         xcrref(2) = 8.92212458801008552d+02
-         xcrref(3) = 2.56238814582660871d+03
-         xcrref(4) = 2.19194343857831427d+03
-         xcrref(5) = 1.78078057261061185d+04
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of solution error, for the (162X162X162) 
-!   grid, after 250 time steps, with  DT = 2.0d+00
-!---------------------------------------------------------------------
-         xceref(1) = 2.15986399716949279d+02
-         xceref(2) = 1.55789559239863600d+01
-         xceref(3) = 5.41318863077207766d+01
-         xceref(4) = 4.82262643154045421d+01
-         xceref(5) = 4.55902910043250358d+02
-
-!---------------------------------------------------------------------
-!   Reference value of surface integral, for the (162X162X162) grid,
-!   after 250 time steps, with DT = 2.0d+00
-!---------------------------------------------------------------------
-         xciref = 6.66404553572181300d+01
-
-!---------------------------------------------------------------------
-!   Reference value of surface integral, for the (162X162X162) grid,
-!   after 250 time steps, with DT = 2.0d+00
-!---------------------------------------------------------------------
-         xciref = 6.66404553572181300d+01
-      else if (nx0 .eq. 408 .and. ny0 .eq. 408 .and. nz0 .eq. 408 .and. 
-     &itmax .eq. 300) then  
-         class = 'D'
-         dtref = 1.0d+0
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of residual, for the (408X408X408) grid,
-!   after 300 time steps, with  DT = 1.0d+00
-!---------------------------------------------------------------------
-         xcrref(1) = 0.4868417937025d+05
-         xcrref(2) = 0.4696371050071d+04
-         xcrref(3) = 0.1218114549776d+05
-         xcrref(4) = 0.1033801493461d+05
-         xcrref(5) = 0.7142398413817d+05
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of solution error, for the (408X408X408) 
-!   grid, after 300 time steps, with  DT = 1.0d+00
-!---------------------------------------------------------------------
-         xceref(1) = 0.3752393004482d+03
-         xceref(2) = 0.3084128893659d+02
-         xceref(3) = 0.9434276905469d+02
-         xceref(4) = 0.8230686681928d+02
-         xceref(5) = 0.7002620636210d+03
-
-!---------------------------------------------------------------------
-!   Reference value of surface integral, for the (408X408X408) grid,
-!   after 300 time steps, with DT = 1.0d+00
-!---------------------------------------------------------------------
-         xciref = 0.8334101392503d+02
-      else if (nx0 .eq. 1020 .and. ny0 .eq. 1020 .and. nz0 .eq. 1020 .an
-     &d. itmax .eq. 300) then  
-         class = 'E'
-         dtref = 0.5d+0
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of residual, for the (1020X1020X1020) grid,
-!   after 300 time steps, with  DT = 0.5d+00
-!---------------------------------------------------------------------
-         xcrref(1) = 0.2099641687874d+06
-         xcrref(2) = 0.2130403143165d+05
-         xcrref(3) = 0.5319228789371d+05
-         xcrref(4) = 0.4509761639833d+05
-         xcrref(5) = 0.2932360006590d+06
-
-!---------------------------------------------------------------------
-!   Reference values of RMS-norms of solution error, for the (1020X1020X1020) 
-!   grid, after 300 time steps, with  DT = 0.5d+00
-!---------------------------------------------------------------------
-         xceref(1) = 0.4800572578333d+03
-         xceref(2) = 0.4221993400184d+02
-         xceref(3) = 0.1210851906824d+03
-         xceref(4) = 0.1047888986770d+03
-         xceref(5) = 0.8363028257389d+03
-
-!---------------------------------------------------------------------
-!   Reference value of surface integral, for the (1020X1020X1020) grid,
-!   after 300 time steps, with DT = 0.5d+00
-!---------------------------------------------------------------------
-         xciref = 0.9512163272273d+02
-      else  
-         verified = .FALSE.
-      endif  
-
-!---------------------------------------------------------------------
-!    verification test for residuals if gridsize is one of 
-!    the defined grid sizes above (class .ne. 'U')
-!---------------------------------------------------------------------
-!---------------------------------------------------------------------
-!    Compute the difference of solution values and the known reference values.
-!---------------------------------------------------------------------
-      do  m = 1,5
-         xcrdif(m) = dabs ((xcr(m) - xcrref(m)) / xcrref(m))
-         xcedif(m) = dabs ((xce(m) - xceref(m)) / xceref(m))
-      enddo  
-      xcidif = dabs ((xci - xciref) / xciref)
-
-!---------------------------------------------------------------------
-!    Output the comparison of computed results to known cases.
-!---------------------------------------------------------------------
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 1990) class
-1990             format(/, ' Verification being performed for class ', a
-     &)
-         write (unit = *,fmt = 2000) epsilon
-2000             format(' Accuracy setting for epsilon = ', E20.13)
-         verified = dabs (dt - dtref) .le. epsilon
-         if (.not.(verified)) then
-            class = 'U'
-            write (unit = *,fmt = 1000) dtref
-1000                      format(' DT does not match the reference value
-     & of ',                  E15.8)
-         endif  
-      else  
-         write (unit = *,fmt = 1995) 
-1995             format(' Unknown class')
-      endif  
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 2001) 
-      else  
-         write (unit = *,fmt = 2005) 
-      endif  
-2001    format(' Comparison of RMS-norms of residual')
-2005    format(' RMS-norms of residual')
-      do  m = 1,5
-         if (class .eq. 'U') then
-            write (unit = *,fmt = 2015) m,xcr(m)
-         else if (xcrdif(m) .le. epsilon) then  
-            write (unit = *,fmt = 2011) m,xcr(m),xcrref(m),xcrdif(m)
-         else  
-            verified = .FALSE.
-            write (unit = *,fmt = 2010) m,xcr(m),xcrref(m),xcrdif(m)
-         endif  
-      enddo  
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 2002) 
-      else  
-         write (unit = *,fmt = 2006) 
-      endif  
-2002    format(' Comparison of RMS-norms of solution error')
-2006    format(' RMS-norms of solution error')
-      do  m = 1,5
-         if (class .eq. 'U') then
-            write (unit = *,fmt = 2015) m,xce(m)
-         else if (xcedif(m) .le. epsilon) then  
-            write (unit = *,fmt = 2011) m,xce(m),xceref(m),xcedif(m)
-         else  
-            verified = .FALSE.
-            write (unit = *,fmt = 2010) m,xce(m),xceref(m),xcedif(m)
-         endif  
-      enddo  
-2010    format(' FAILURE: ', i2, 2x, E20.13, E20.13, E20.13)
-2011    format('          ', i2, 2x, E20.13, E20.13, E20.13)
-2015    format('          ', i2, 2x, E20.13)
-      if (class .ne. 'U') then
-         write (unit = *,fmt = 2025) 
-      else  
-         write (unit = *,fmt = 2026) 
-      endif  
-2025    format(' Comparison of surface integral')
-2026    format(' Surface integral')
-      if (class .eq. 'U') then
-         write (unit = *,fmt = 2030) xci
-      else if (xcidif .le. epsilon) then  
-         write (unit = *,fmt = 2032) xci,xciref,xcidif
-      else  
-         verified = .FALSE.
-         write (unit = *,fmt = 2031) xci,xciref,xcidif
-      endif  
-2030    format('          ', 4x, E20.13)
-2031    format(' FAILURE: ', 4x, E20.13, E20.13, E20.13)
-2032    format('          ', 4x, E20.13, E20.13, E20.13)
-      if (class .eq. 'U') then
-         write (unit = *,fmt = 2022) 
-         write (unit = *,fmt = 2023) 
-2022             format(' No reference values provided')
-2023             format(' No verification performed')
-      else if (verified) then  
-         write (unit = *,fmt = 2020) 
-2020             format(' Verification Successful')
-      else  
-         write (unit = *,fmt = 2021) 
-2021             format(' Verification failed')
-      endif  
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile
deleted file mode 100644
index 9e72961..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=mg
-BENCHMARKU=MG
-
-include ../config/make.def
-include ../sys/make.common
-
-SOURCES = mg.fdv \
-	mg3p.fdv \
-	comm3.fdv \
-	interp.fdv \
-	norm2u3.fdv \
-	psinv.fdv \
-	resid.fdv \
-	rjrp3.fdv \
-	setupDVM.fdv \
-	utilities.fdv \
-	zran3.fdv 
-
-OBJS = ${SOURCES:.fdv=.o}
-
-${PROGRAM}: config $(OBJS)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS}
-	
-%.o: %.fdv npbparams.h globals.h dvmvars.h
-	${F77} f ${FFLAGS} -c -o $@ $<
-
-clean:
-	rm -f npbparams.h
-	rm -f *.o *~
-	rm -f *.cu *.cuf *.c *.f
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/TODO_make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/TODO_make.bat
deleted file mode 100644
index a764763..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/TODO_make.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-set CLASS=%1
-set OPT=%2
-
-CALL ..\sys\setparams MG %CLASS%
-CALL %F77% %OPT% mg 1>out_%CLASS%.txt 2>err_%CLASS%.txt
-if exist mg.exe ( 
-  copy mg.exe %BIN%\mg.%CLASS%.x.exe 
-  del mg.exe 
-)
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/comm3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/comm3.fdv
deleted file mode 100644
index 8869c07..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/comm3.fdv
+++ /dev/null
@@ -1,88 +0,0 @@
-c---------------------------------------------------------------------
-c ���������� ��������� ���������. 
-c �������� ������� ����� ���� �� �� ������� ���� �������.
-c---------------------------------------------------------------------
-c @param double precission :: u(n1 ,n2 ,n3) - ��������� �������
-c @param integer :: kk - ��������� ��������
-c---------------------------------------------------------------------
-      subroutine comm3(u,n1,n2,n3,kk)
-c---------------------------------------------------------------------
-!DVM$ INHERIT u
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     comm3 organizes the communication on all borders 
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-
-      integer n1, n2, n3, kk, i1, i2, i3
-      integer blockX, blockY
-      double precision u(n1,n2,n3)
-!DVM$ interval 5
-!DVM$ REGION 
-!, REMOTE_ACCESS (u(n1-1,:,:))
-!DVM$ PARALLEL (i3,i2)  ON  u(1,i2,i3)
-CDVM$& ,cuda_block(128)
-      do i3=2,n3-1
-        do i2=2,n2-1
-            u(1,i2,i3) = u(n1-1,i2,i3)
-        enddo
-      enddo
-	  
-!, REMOTE_ACCESS (u(2,:,:))      
-!DVM$ PARALLEL (i3,i2) ON  u(n1,i2,i3 )
-CDVM$& ,cuda_block(128)
-      do i3=2,n3-1
-        do i2=2,n2-1
-            u(n1,i2,i3) = u(2,i2,i3)
-        enddo
-      enddo
-     
-c----------------------------------
-!, REMOTE_ACCESS (u(:,n2-1,:))
-      
-!DVM$ PARALLEL (i3,i1)  ON  u(i1,1,i3)
-CDVM$& ,cuda_block(128)
-      do i3=2,n3-1
-        do i1=1,n1
-            u(i1,1,i3) = u(i1,n2-1,i3)
-        enddo
-      enddo
-	  
-! , REMOTE_ACCESS (u(:,2,:))      
-!DVM$ PARALLEL (i3,i1) ON  u(i1,n2,i3)
-CDVM$& ,cuda_block(128)
-      do i3=2,n3-1
-        do i1=1,n1
-            u(i1,n2,i3) = u(i1,2,i3)
-        enddo
-      enddo      
-   
-c----------------------------------
-   
-!, REMOTE_ACCESS (u(:,:,n3-1))
-!DVM$ PARALLEL (i2,i1)  ON  u(i1,i2,1)
-CDVM$& ,cuda_block(128)
-       do i2=1,n2 
-        do i1=1,n1
-            u(i1,i2,1) = u(i1,i2,n3-1)
-        enddo
-      enddo
-      
-!, REMOTE_ACCESS (u(:,:,2))
-!DVM$ PARALLEL (i2,i1) ON  u(i1,i2,n3)
-CDVM$& ,cuda_block(128)
-       do i2=1,n2 
-        do i1=1,n1
-            u(i1,i2,n3) = u(i1,i2,2)
-        enddo
-      enddo      
-!DVM$ END REGION    
-!DVM$ end interval       
-      if (timeron) call timer_stop(T_comm3)
-
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/dvmvars.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/dvmvars.h
deleted file mode 100644
index cf36571..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/dvmvars.h
+++ /dev/null
@@ -1,57 +0,0 @@
-c---------------------------------------------------------------------
-c     FDVM specifications
-c---------------------------------------------------------------------
-      integer p_u_ir(maxlevel)  !p_u_ir(k)  ≡ u(ir(k))
-      integer p_r_ir(maxlevel)  !p_u_ir(k)  ≡ r(ir(k))
-      integer pu                !pu ≡ u(lt) ≡ p_u_ir(lt)
-      integer pr                !pr ≡ r(lt) ≡ p_r_ir(lt)
-      integer pv                !pv ≡ v
-      
-      integer p_curr_u_k        !p_curr_u_k ≡ u(k)
-      integer p_curr_u_j        !p_curr_u_j ≡ u(j)      
-      
-      integer p_curr_r_k        !p_curr_r_k ≡ r(k)
-      integer p_curr_r_j        !p_curr_r_j ≡ r(j)
-      
-      common /pointers/ p_u_ir, p_r_ir
-      common /pointers/ pu, pr, pv
-      common /pointers/ p_curr_r_j, p_curr_r_k
-      common /pointers/ p_curr_u_j, p_curr_u_k
-      
-CDVM$  DOUBLE PRECISION, POINTER(:,:,:) :: p_u_ir, p_r_ir,
-CDVM$& pu, pr, pv,
-CDVM$& p_curr_r_j, p_curr_r_k,
-CDVM$& p_curr_u_j, p_curr_u_k
-
-CDVM$ ALIGN :: pu, pr, pv,
-CDVM$& p_u_ir, p_r_ir,
-CDVM$& p_curr_r_k, p_curr_r_j, 
-CDVM$& p_curr_u_k, p_curr_u_j
-
-CDVM$ DYNAMIC p_u_ir, p_r_ir, 
-CDVM$& pu, pr, pv,
-CDVM$& p_curr_r_j, p_curr_r_k, 
-CDVM$& p_curr_u_j, p_curr_u_k    	 
-
-CDVM$ SHADOW pu(1:1,1:1,1:1) 
-CDVM$ SHADOW pr(1:1,1:1,1:1)     
-
-CDVM$ SHADOW p_curr_r_k(1:1,1:1,1:1) 	
-CDVM$ SHADOW p_curr_u_k(1:1,1:1,1:1) 
-CDVM$ SHADOW p_curr_u_j(1:1,1:1,1:1) 
-     
-CDVM$ TEMPLATE EXT (nv1, nv2, nv3)       
-CDVM$ DISTRIBUTE EXT (BLOCK, BLOCK, BLOCK)
-      
-c---------------------------------------------------------------------
-c  Distribution from programm
-c---------------------------------------------------------------------      
-      double precision u(nr), r(nr)
-      double precision v(nv)  
-      
-      common /noautom/ u,r,v
-CDVM$ HEAP u, r, v    
-
-      double precision a(0:3), c(0:3)
-      common /coefficients/ a,c
-CDVM$ DISTRIBUTE (*) :: a, c      
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/globals.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/globals.h
deleted file mode 100644
index 89e0af6..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/globals.h
+++ /dev/null
@@ -1,68 +0,0 @@
-c---------------------------------------------------------------------
-c  Parameter lm (declared and set in "npbparams.h") is the log-base2 of 
-c  the edge size max for the partition on a given node, so must be changed 
-c  either to save space (if running a small case) or made bigger for larger 
-c  cases, for example, 512^3. Thus lm=7 means that the largest dimension 
-c  of a partition that can be solved on a node is 2^7 = 128. lm is set 
-c  automatically in npbparams.h
-c  Parameters ndim1, ndim2, ndim3 are the local problem dimensions. 
-c---------------------------------------------------------------------
-
-      include 'npbparams.h'
-
-      integer nm      ! actual dimension including ghost cells for communications
-c  ***  type of nv, nr and ir is set in npbparams.h
-c     >      , nv      ! size of rhs array
-c     >      , nr      ! size of residual array
-     >      , nm2     ! size of communication buffer
-     >      , maxlevel! maximum number of levels
-
-      integer nv1, nv2, nv3
-      parameter( nv1=one*(2+2**ndim1) )
-      parameter( nv2=one*(2+2**ndim2) )
-      parameter( nv3=one*(2+2**ndim3) )
-     
-      parameter( nm=2+2**lm, maxlevel=(lt_default+1) )
-      parameter( nm2=2*nm*nm)      
-      parameter( nv=nv1*nv2*nv3/one/one )
-      parameter( nr = ((nv+nm**2+5*nm+7*lm+6)/7)*8 )
-c---------------------------------------------------------------------
-      integer nbr(3,-1:1,maxlevel), msg_type(3,-1:1)
-      integer  msg_id(3,-1:1,2),nx(maxlevel),ny(maxlevel),nz(maxlevel)
-      common /mg3/ nbr,msg_type,msg_id,nx,ny,nz
-
-      character class
-      common /ClassType/class
-
-      integer debug_vec(0:7)
-      common /my_debug/ debug_vec
-
-      integer m1(maxlevel), m2(maxlevel), m3(maxlevel)
-      integer lt, lb
-      common /fap/ ir(maxlevel),m1,m2,m3,lt,lb
-	  
-      logical ver 
-	  ! FALSE for GPU and TRUE for CPU
-      parameter (ver = .false. )
-      logical dead(maxlevel), give_ex(3,maxlevel), take_ex(3,maxlevel)
-      common /comm_ex/ dead, give_ex, take_ex 
-      
-c---------------------------------------------------------------------
-c  Set at m=1024, can handle cases up to 1024^3 case
-c---------------------------------------------------------------------
-      integer m
-c      parameter( m=1037 )
-      parameter( m=nm+1 )
-
-      double precision buff(nm2,4)
-      common /buffer/ buff      
-      
-      logical timeron
-      common /timers/ timeron
-      integer T_init, T_bench, T_psinv, T_resid, T_rprj3, T_interp,
-     >        T_norm2, T_mg3P, T_resid2, T_comm3, T_last
-      parameter (T_init=1, T_bench=2, T_mg3P=3,
-     >        T_psinv=4, T_resid=5, T_resid2=6, T_rprj3=7,
-     >        T_interp=8, T_norm2=9, T_comm3=10, T_last=10)
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/interp.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/interp.fdv
deleted file mode 100644
index 0fa268f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/interp.fdv
+++ /dev/null
@@ -1,169 +0,0 @@
-
-c---------------------------------------------------------------------
-c ����������� ������������� ������� ������� �� ��������� �����
-c---------------------------------------------------------------------
-c u(h) = u(h) + Q u(H)
-c ��� H = 2h - ��� ��������� �����, 
-c     Q      - �������� �������� ����������� �������������
-c     u      - ������� �������� ������� �������
-c---------------------------------------------------------------------
-c ������������ ��� ���������� ��������� ����� �������� ������� �������,
-c ��� ����������� �� V-�����
-c---------------------------------------------------------------------
-c @param double precission :: z(mm1,mm2,mm3) ? u(H) - ������ �����
-c @param double precission :: u(n1 ,n2 ,n3 ) ? u(h) - ��������� �����
-c @param integer :: k - ������� ��� ���������� ��������� �������������� �����
-c---------------------------------------------------------------------
-      subroutine interp( z,mm1,mm2,mm3,u,n1,n2,n3,k )
-c---------------------------------------------------------------------
-!DVM$ INHERIT z,u
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     interp adds the trilinear interpolation of the correction
-c     from the coarser grid to the current approximation:  u = u + Qu'
-c     
-c     Observe that this  implementation costs  16A + 4M, where
-c     A and M denote the costs of Addition and Multiplication.  
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  Vector machines may get slightly better 
-c     performance however, with 8 separate "do i1" loops, rather than 4.
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-
-      integer mm1, mm2, mm3, n1, n2, n3,k
-      double precision z(mm1,mm2,mm3),u(n1,n2,n3),z1,z1_p1,z2,z2_p1
-      double precision z3,z3_p1,z4,z4_p1	  
-      integer i3, i2, i1, d1, d2, d3, t1, t2, t3
-!DVM$ interval 1
-      if( n1 .ne. 3 .and. n2 .ne. 3 .and. n3 .ne. 3 ) then	  
-         if ( ver ) then
-	 
-!DVM$ REGION      
-!DVM$ PARALLEL (i3,i2) ON u(*, 2*i2, 2*i3),
-!DVM$& SHADOW_RENEW(z(CORNER)), cuda_block(32,6)
-!DVM$& ,private(i1,z1,z1_p1, z2,z2_p1, z3,z3_p1, z4,z4_p1)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1		 
-               z1 = z(1,i2,i3)
-               z2 = z(1,i2+1,i3+1)
-               z3 = z(1,i2,i3+1)	
-               z4 = z(1,i2+1,i3)		   
-               do  i1=1, mm1-1	 
-                  z1_p1 = z(i1+1,i2,i3)
-                  z2_p1 = z(i1+1,i2+1,i3+1)
-                  z3_p1 = z(i1+1,i2,i3+1)
-                  z4_p1 = z(i1+1,i2+1,i3)				 
-                  u(2*i1-1,2*i2-1,2*i3-1) = u(2*i1-1,2*i2-1,2*i3-1) + z1
-                  u(2*i1,2*i2-1,2*i3-1)   = u(2*i1,2*i2-1,2*i3-1) + 
-     &                 0.5d0 * ( z1_p1 + z1 )
-                  u(2*i1-1,2*i2,2*i3-1)   = u(2*i1-1,2*i2,2*i3-1) +
-     &                 0.5d0 * ( z4 + z1 )
-                  u(2*i1,2*i2,2*i3-1)     = u(2*i1,2*i2,2*i3-1) +
-     &                 0.25d0*( z4 + z1 + z4_p1 + z1_p1)
-                  u(2*i1-1,2*i2-1,2*i3)   = u(2*i1-1,2*i2-1,2*i3) +
-     &                 +0.5d0 * ( z3 + z1 )
-                  u(2*i1,2*i2-1,2*i3)     = u(2*i1,2*i2-1,2*i3) +
-     &                 0.25d0*( z3 + z1 + z3_p1 + z1_p1)
-                  u(2*i1-1,2*i2,2*i3)     = u(2*i1-1,2*i2,2*i3) +
-     &                 0.25d0* (z2 + z3 + z4 + z1 )
-                  u(2*i1,2*i2,2*i3)       = u(2*i1,2*i2,2*i3) +
-     &                 0.125d0*( z2 + z3 + z4 + z1 +  z2_p1 + z3_p1
-     & 	               + z4_p1 + z1_p1 )
-	             z1 = z1_p1
-                 z2 = z2_p1
-                 z3 = z3_p1
-                 z4 = z4_p1				 
-               enddo
-            enddo
-         enddo
-!DVM$ END REGION	
-
-         else
-!DVM$ REGION      
-!DVM$ PARALLEL (i3,i1) ON u(2*i1, *, 2*i3),
-!DVM$& SHADOW_RENEW(z(CORNER)), cuda_block(32,6)
-!DVM$& ,private(i2,z1,z1_p1, z2,z2_p1, z3,z3_p1, z4,z4_p1)
-         do  i3=1,mm3-1
-            do  i1=1, mm1-1	 
-               z1 = z(i1,1,i3)
-               z2 = z(i1+1,1,i3)
-               z3 = z(i1,1,i3+1)	
-               z4 = z(i1+1,1,i3+1)				   
-			   do  i2=1,mm2-1
-                 z1_p1 = z(i1,i2+1,i3)
-                 z2_p1 = z(i1+1,i2+1,i3)
-                 z3_p1 = z(i1,i2+1,i3+1)
-                 z4_p1 = z(i1+1,i2+1,i3+1)				 
-                  u(2*i1-1,2*i2-1,2*i3-1) = u(2*i1-1,2*i2-1,2*i3-1) + z1
-                  u(2*i1,2*i2-1,2*i3-1)   = u(2*i1,2*i2-1,2*i3-1) + 
-     &                 0.5d0 * ( z2 + z1 )
-                  u(2*i1-1,2*i2,2*i3-1)   = u(2*i1-1,2*i2,2*i3-1) +
-     &                 0.5d0 * ( z1_p1 + z1 )
-                  u(2*i1,2*i2,2*i3-1)     = u(2*i1,2*i2,2*i3-1) +
-     &                 0.25d0*( z1_p1 + z1 + z2_p1 + z2)
-                  u(2*i1-1,2*i2-1,2*i3)   = u(2*i1-1,2*i2-1,2*i3) +
-     &                 +0.5d0 * ( z3 + z1 )
-                  u(2*i1,2*i2-1,2*i3)     = u(2*i1,2*i2-1,2*i3) +
-     &                 0.25d0*( z3 + z1 + z4 + z2)
-                  u(2*i1-1,2*i2,2*i3)     = u(2*i1-1,2*i2,2*i3) +
-     &                 0.25d0* (z3_p1 + z3 + z1_p1 + z1 )
-                  u(2*i1,2*i2,2*i3)       = u(2*i1,2*i2,2*i3) +
-     &                 0.125d0*( z3_p1 + z3 + z1_p1 + z1 +  
-     &                           z4_p1 + z4 + z2_p1 + z2 )
-	             z1 = z1_p1
-                 z2 = z2_p1
-                 z3 = z3_p1
-                 z4 = z4_p1				 
-               enddo
-            enddo
-         enddo
-!DVM$ END REGION
-         endif
-		 
-      else
-
-         if(n1.eq.3) then; d1 = 2; t1 = 1; else; d1 = 1; t1 = 0; endif
-         if(n2.eq.3) then; d2 = 2; t2 = 1; else; d2 = 1; t2 = 0; endif
-         if(n3.eq.3) then; d3 = 2; t3 = 1; else; d3 = 1; t3 = 0; endif
-!DVM$ REGION         
-!DVM$ PARALLEL (i3,i2,i1) ON u(2*i1-d1,2*i2-d2,2*i3-d3),    
-!DVM$& SHADOW_RENEW(z(CORNER)), PRIVATE(i3,i2,i1)  
-!DVM$& ,cuda_block(32,6,1)   
-         do  i3=d3,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=d1,mm1-1
-                  u(2*i1-d1,2*i2-d2,2*i3-d3)=u(2*i1-d1,2*i2-d2,2*i3-d3)
-     &                 +z(i1,i2,i3)
-                  u(2*i1-t1,2*i2-d2,2*i3-d3)=u(2*i1-t1,2*i2-d2,2*i3-d3)
-     &                 +0.5D0*(z(i1+1,i2,i3)+z(i1,i2,i3))
-                  u(2*i1-d1,2*i2-t2,2*i3-d3)=u(2*i1-d1,2*i2-t2,2*i3-d3)
-     &                 +0.5D0*(z(i1,i2+1,i3)+z(i1,i2,i3)) 
-                  u(2*i1-t1,2*i2-t2,2*i3-d3)=u(2*i1-t1,2*i2-t2,2*i3-d3)
-     &                 +0.25D0*(z(i1+1,i2+1,i3)+z(i1+1,i2,i3)
-     &                 +z(i1,  i2+1,i3)+z(i1,  i2,i3))
-                  u(2*i1-d1,2*i2-d2,2*i3-t3)=u(2*i1-d1,2*i2-d2,2*i3-t3)
-     &                 +0.5D0*(z(i1,i2,i3+1)+z(i1,i2,i3))
-                  u(2*i1-t1,2*i2-d2,2*i3-t3)=u(2*i1-t1,2*i2-d2,2*i3-t3)
-     &                 +0.25D0*(z(i1+1,i2,i3+1)+z(i1,i2,i3+1)
-     &                 +z(i1+1,i2,i3  )+z(i1,i2,i3  ))
-                  u(2*i1-d1,2*i2-t2,2*i3-t3)=u(2*i1-d1,2*i2-t2,2*i3-t3)
-     &                 +0.25D0*(z(i1,i2+1,i3+1)+z(i1,i2,i3+1)
-     &                 +z(i1,i2+1,i3  )+z(i1,i2,i3  ))
-                  u(2*i1-t1,2*i2-t2,2*i3-t3)=u(2*i1-t1,2*i2-t2,2*i3-t3)
-     &                 +0.125D0*(z(i1+1,i2+1,i3+1)+z(i1+1,i2,i3+1)
-     &                 +z(i1  ,i2+1,i3+1)+z(i1  ,i2,i3+1)
-     &                 +z(i1+1,i2+1,i3  )+z(i1+1,i2,i3  )
-     &                 +z(i1  ,i2+1,i3  )+z(i1  ,i2,i3  ))
-               enddo              
-            enddo
-         enddo      
-
-!DVM$ END REGION
-      endif     
-!DVM$ end interval
-
-      return 
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg.fdv
deleted file mode 100644
index 45c42f6..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg.fdv
+++ /dev/null
@@ -1,369 +0,0 @@
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         !
-!                                                                         !
-!                       D V M     V E R S I O N                           !
-!                                                                         !
-!                                   M G                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!                                                                         !
-!    This benchmark is an OpenMP version of the NPB MG code.              !
-!    It is described in NAS Technical Report 99-011.                      !
-!                                                                         !
-!    Permission to use, copy, distribute and modify this software         !
-!    for any purpose with or without fee is hereby granted.  We           !
-!    request, however, that all derived work reference the NAS            !
-!    Parallel Benchmarks 3.3. This software is provided "as is"           !
-!    without express or implied warranty.                                 !
-!                                                                         !
-!    Information on NPB 3.3, including the technical report, the          !
-!    original specifications, source code, results and information        !
-!    on how to submit new results, is available at:                       !
-!                                                                         !
-!           http://www.nas.nasa.gov/Software/NPB/                         !
-!                                                                         !
-!    Send comments or suggestions to  npb@nas.nasa.gov                    !
-!                                                                         !
-!          NAS Parallel Benchmarks Group                                  !
-!          NASA Ames Research Center                                      !
-!          Mail Stop: T27A-1                                              !
-!          Moffett Field, CA   94035-1000                                 !
-!                                                                         !
-!          E-mail:  npb@nas.nasa.gov                                      !
-!          Fax:     (650) 604-3957                                        !
-!                                                                         !
-!-------------------------------------------------------------------------!
-
-
-c---------------------------------------------------------------------
-c
-c Authors: 
-c      Original:
-c          E. Barszcz
-c          P. Frederickson
-c          A. Woo
-c          M. Yarrow
-c          H. Jin
-c      DVM/DVMH vesion:  
-c          A. Shubert
-c      Optimized for DVM/DVMH:
-c          A. Kolganov
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c Программа решающая уравнение Пуасона многосеточным методом (V-цикл)
-c---------------------------------------------------------------------
-      program mg	  
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-      include 'dvmvars.h'   
-      
-c---------------------------------------------------------------------------c
-c k is the current level. It is passed down through subroutine args
-c and is NOT global. it is the current iteration
-c---------------------------------------------------------------------------c
-
-      integer k, it, pdim, pi
-      
-      external timer_read
-      double precision t, tinit, mflops, timer_read
-
-c---------------------------------------------------------------------------c
-c These arrays are in common because they are quite large
-c and probably shouldn't be allocated on the stack. They
-c are always passed as subroutine args. 
-c---------------------------------------------------------------------------c      
-
-      double precision rnm2, rnmu, epsilon
-      integer n1, n2, n3, nit
-      double precision nn, verify_value, err, t_1,t_2
-      logical verified
-
-      integer i, fstatus
-      character t_names(t_last)*8
-      double precision tmax, elapsed_time
-	  
-      do i = T_init, T_last
-         call timer_clear(i)
-      end do
-
-c---------------------------------------------------------------------
-c Read in and broadcast input data
-c---------------------------------------------------------------------
-
-      open(unit=7,file='timer.flag', status='old', iostat=fstatus)
-      if (fstatus .eq. 0) then
-         timeron = .true.
-         t_names(t_init) = 'init'
-         t_names(t_bench) = 'benchmk'
-         t_names(t_mg3P) = 'mg3P'
-         t_names(t_psinv) = 'psinv'
-         t_names(t_resid) = 'resid'
-         t_names(t_rprj3) = 'rprj3'
-         t_names(t_interp) = 'interp'
-         t_names(t_norm2) = 'norm2'
-         t_names(t_comm3) = 'comm3'
-         close(7)
-      else
-         timeron = .false.
-      endif
-
-      write (*, 1000) 
-
-      open(unit=7,file="mg.input", status="old", iostat=fstatus)
-      if (fstatus .eq. 0) then
-         write(*,50) 
- 50      format(' Reading from input file mg.input')
-         read(7,*) lt
-         read(7,*) nx(lt), ny(lt), nz(lt)
-         read(7,*) nit
-         read(7,*) (debug_vec(i),i=0,7)
-      else
-         write(*,51) 
- 51      format(' No input file. Using compiled defaults ')
-         lt = lt_default
-         nit = nit_default
-         nx(lt) = nx_default
-         ny(lt) = ny_default
-         nz(lt) = nz_default
-         do i = 0,7
-            debug_vec(i) = debug_default
-         end do
-      endif
-
-
-      if ( (nx(lt) .ne. ny(lt)) .or. (nx(lt) .ne. nz(lt)) ) then
-         Class = 'U' 
-      else if( nx(lt) .eq. 32 .and. nit .eq. 4 ) then
-         Class = 'S'
-      else if( nx(lt) .eq. 128 .and. nit .eq. 4 ) then
-         Class = 'W'
-      else if( nx(lt) .eq. 256 .and. nit .eq. 4 ) then  
-         Class = 'A'
-      else if( nx(lt) .eq. 256 .and. nit .eq. 20 ) then
-         Class = 'B'
-      else if( nx(lt) .eq. 512 .and. nit .eq. 20 ) then  
-         Class = 'C'
-      else if( nx(lt) .eq. 1024 .and. nit .eq. 50 ) then  
-         Class = 'D'
-      else if( nx(lt) .eq. 2048 .and. nit .eq. 50 ) then  
-         Class = 'E'
-      else
-         Class = 'U'
-      endif
-
-c---------------------------------------------------------------------
-c  Use these for debug info:
-c---------------------------------------------------------------------
-c     debug_vec(0) = 1 !=> report all norms
-c     debug_vec(1) = 1 !=> some setup information
-c     debug_vec(1) = 2 !=> more setup information
-c     debug_vec(2) = k => at level k or below, show result of resid
-c     debug_vec(3) = k => at level k or below, show result of psinv
-c     debug_vec(4) = k => at level k or below, show result of rprj
-c     debug_vec(5) = k => at level k or below, show result of interp
-c     debug_vec(6) = 1 => (unused)
-c     debug_vec(7) = 1 => (unused)
-c---------------------------------------------------------------------
-      a(0) = -8.0D0/3.0D0 
-      a(1) =  0.0D0 
-      a(2) =  1.0D0/6.0D0 
-      a(3) =  1.0D0/12.0D0
-      
-      if(Class .eq. 'A' .or. Class .eq. 'S'.or. Class .eq.'W') then
-c---------------------------------------------------------------------
-c     Coefficients for the S(a) smoother
-c---------------------------------------------------------------------
-         c(0) =  -3.0D0/8.0D0
-         c(1) =  +1.0D0/32.0D0
-         c(2) =  -1.0D0/64.0D0
-         c(3) =   0.0D0
-      else
-c---------------------------------------------------------------------
-c     Coefficients for the S(b) smoother
-c---------------------------------------------------------------------
-         c(0) =  -3.0D0/17.0D0
-         c(1) =  +1.0D0/33.0D0
-         c(2) =  -1.0D0/61.0D0
-         c(3) =   0.0D0
-      endif
-      lb = 1
-      k  = lt
-      
-c**********************************************************************
-c**********************************************************************
-c********************* START HERE *************************************
-c**********************************************************************
-c**********************************************************************
-       
-      call setup(n1,n2,n3,k)
-      call setupDVM(0)
-
-      call timer_start(T_init)
-
-      call zero3(u(pu),n1,n2,n3)
-      call zran3(v(pv),n1,n2,n3,nx(lt),ny(lt),k,class)    
-
-      write (*, 1001) nx(lt),ny(lt),nz(lt), Class
-      write (*, 1002) nit
-      write (*, *)
-
-      pdim = PROCESSORS_RANK()
-      write (*, 310) pdim
-      do pi=1, pdim
-          write (*, 311) pi, PROCESSORS_SIZE(pi)
-      enddo           
-      write (*, *)  ' '
-      
- 310  format(' Processors grid rank: ', i4)
- 311  format(' Grid dimension [', i4, '] size: ', i4)
- 
- 1000 format(//,' NAS Parallel Benchmarks (NPB3.3-DVMH)',
-     >          ' - MG Benchmark', /)
- 1001 format(' Size: ', i4, 'x', i4, 'x', i4, '  (class ', A, ')' )
- 1002 format(' Iterations:                  ', i5)
-
-      call resid(u(pu),v(pv),r(pr),n1,n2,n3,a,k)
-      
-c---------------------------------------------------------------------
-c     One iteration for startup
-c---------------------------------------------------------------------
-      call mg3P(n1,n2,n3,k)      
-      call resid(u(pu),v(pv),r(pr),n1,n2,n3,a,k)
-      call norm2u3(r(pr),n1,n2,n3,rnm2,rnmu,nx(lt),ny(lt),nz(lt))         
-      call setup(n1,n2,n3,k)            
-      
-      call zero3(u(pu),n1,n2,n3)
-      call zran3(v(pv),n1,n2,n3,nx(lt),ny(lt),k,class)
-      
-      call timer_stop(T_init)
-      tinit = timer_read(T_init)
-
-      write( *,'(A,F15.3,A/)' ) 
-     >     ' Initialization time: ',tinit, ' seconds'
-
-      do i = T_bench, T_last
-         call timer_clear(i)
-      end do
-
-      call timer_start(T_bench)      
-      call resid(u(pu),v(pv),r(pr),n1,n2,n3,a,k)      
-      call norm2u3(r(pr),n1,n2,n3,rnm2,rnmu,nx(lt),ny(lt),nz(lt))      
-   
-! временный вызов
-!      call timer_start(T_bench)  
-c*****************************************************************
-c********************MAIN LOOP ***********************************
-c*****************************************************************
-
-      do  it = 1, nit
-         if (it.eq.1 .or. it.eq.nit .or. mod(it,5).eq.0) then
-            write(*,80) it
-   80       format('  iter ',i3)
-         endif
-         call mg3P(n1,n2,n3,k)
-         call resid(u(pu),v(pv),r(pr),n1,n2,n3,a,k)
-      enddo
-
-      call norm2u3(r(pr),n1,n2,n3,rnm2,rnmu,nx(lt),ny(lt),nz(lt))   
-      
-      call timer_stop(T_bench)
-
-      t = timer_read(T_bench)
-
-      verified = .FALSE.
-      verify_value = 0.0
-
-      write(*,100)
- 100  format(/' Benchmark completed ')
-
-      epsilon = 1.d-8
-      if (Class .ne. 'U') then
-         if(Class.eq.'S') then
-            verify_value = 0.5307707005734d-04
-         elseif(Class.eq.'W') then
-            verify_value = 0.6467329375339d-05
-         elseif(Class.eq.'A') then
-            verify_value = 0.2433365309069d-05
-         elseif(Class.eq.'B') then
-            verify_value = 0.1800564401355d-05
-         elseif(Class.eq.'C') then
-            verify_value = 0.5706732285740d-06
-         elseif(Class.eq.'D') then
-            verify_value = 0.1583275060440d-09
-         elseif(Class.eq.'E') then
-            verify_value = 0.5630442584711d-10
-         endif
-
-         err = abs( rnm2 - verify_value ) / verify_value
-         if( err .le. epsilon ) then
-            verified = .TRUE.
-            write(*, 200)
-            write(*, 201) rnm2
-            write(*, 202) err
- 200        format(' VERIFICATION SUCCESSFUL ')
- 201        format(' L2 Norm is ', E20.13)
- 202        format(' Error is   ', E20.13)
-         else
-            verified = .FALSE.
-            write(*, 300) 
-            write(*, 301) rnm2
-            write(*, 302) verify_value
- 300        format(' VERIFICATION FAILED')
- 301        format(' L2 Norm is             ', E20.13)
- 302        format(' The correct L2 Norm is ', E20.13)
-         endif
-      else
-         verified = .FALSE.
-         write (*, 400)
-         write (*, 401)
-         write (*, 201) rnm2
- 400     format(' Problem size unknown')
- 401     format(' NO VERIFICATION PERFORMED')
-      endif
-
-      nn = 1.0d0*nx(lt)*ny(lt)*nz(lt)
-
-      if( t .ne. 0. ) then
-         mflops = 58.*nit*nn*1.0D-6 /t
-      else
-         mflops = 0.0
-      endif
-
-      call print_results('MG', class, nx(lt), ny(lt), nz(lt), 
-     >                   nit, t,
-     >                   mflops, '          floating point', 
-     >                   verified, npbversion, compiletime,
-     >                   cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-
-
- 600  format( i4, 2e19.12)
-
-c---------------------------------------------------------------------
-c      More timers
-c---------------------------------------------------------------------
-      if (.not.timeron) goto 999
-
-      tmax = timer_read(t_bench)
-      if (tmax .eq. 0.0) tmax = 1.0
-
-      write(*,800)
- 800  format('  SECTION   Time (secs)')
-      do i=t_bench, t_last
-         t = timer_read(i)
-         if (i.eq.t_resid2) then
-            t = timer_read(T_resid) - t
-            write(*,820) 'mg-resid', t, t*100./tmax
-         else
-            write(*,810) t_names(i), t, t*100./tmax
-         endif
- 810     format(2x,a8,':',f9.3,'  (',f6.2,'%)')
- 820     format('    --> ',a8,':',f9.3,'  (',f6.2,'%)')
-      end do
-
- 999  continue
-
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg3p.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg3p.fdv
deleted file mode 100644
index da735d3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/mg3p.fdv
+++ /dev/null
@@ -1,167 +0,0 @@
-c---------------------------------------------------------------------
-c �������� ������ �� V-�����
-c---------------------------------------------------------------------
-c @param integer d1, d2, d3 - �������� �� ������� �������
-c @param integer k - ����� �����
-c---------------------------------------------------------------------
-      subroutine VDownIteration(d1, d2, d3, k) 
-      
-      implicit none
-
-      include 'globals.h'
-      include 'dvmvars.h'
-      
-      integer k      
-      integer d1, d2, d3           
-
-! !DVM$ GET_ACTUAL(p_curr_r_k)
-      !write (*,*) 'R(',k,') down: '
-      !call printMatrix(r(p_curr_r_k), m1(k),m2(k),m3(k));
-      !stop
-      
-      call rprj3(
-     >       r(p_curr_r_k),m1(k),m2(k),m3(k),
-     >       r(p_curr_r_j),m1(k-1),m2(k-1),m3(k-1),
-     >       k, d1, d2, d3
-     >     )    
-
-! !DVM$ GET_ACTUAL(p_curr_r_j)     
-      !write (*,*) 'R(',k-1,') down: '
-      !call printMatrix(r(p_curr_r_j), m1(k-1),m2(k-1),m3(k-1));
-      !stop
-     
-      return
-      end 
-     
-c---------------------------------------------------------------------
-c �������� ������� �� V-�����
-c---------------------------------------------------------------------
-c @param integer k - ����� �����
-c---------------------------------------------------------------------     
-      subroutine VUpIteration(k)
-
-      implicit none
-
-      include 'globals.h'
-      include 'dvmvars.h'
-
-      integer k
-      integer m1k, m2k, m3k       
-                   
-c---------------------------------------------------------------------
-c        prolongate from level k-1  to k
-c---------------------------------------------------------------------
-      call zero3(u(p_curr_u_k),m1(k),m2(k),m3(k))                     
-           
-      call interp(
-     >            u(p_curr_u_j),m1(k-1),m2(k-1),m3(k-1),
-     >            u(p_curr_u_k),m1(k),m2(k),m3(k),
-     >            k
-     >        )      
-      
-c---------------------------------------------------------------------
-c        compute residual for level k
-c---------------------------------------------------------------------
-      call resid(
-     >           u(p_curr_u_k),
-     >           r(p_curr_r_k),
-     >           r(p_curr_r_k),
-     >           m1(k),m2(k),m3(k),
-     >           a,k
-     >        )
-     
-    
-c---------------------------------------------------------------------
-c        apply smoother
-c---------------------------------------------------------------------
-      call psinv(r(p_curr_r_k),u(p_curr_u_k),m1(k),m2(k),m3(k),c,k)         
-      
-      return
-      end
-     
-c---------------------------------------------------------------------
-c ������������� �������� ��������� �������
-c---------------------------------------------------------------------
-      subroutine mg3P(n1,n2,n3,k)
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     multigrid V-cycle routine
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-      include 'dvmvars.h'
-
-      integer n1, n2, n3, k 
-      
-      integer j, d1, d2, d3
-                
-c---------------------------------------------------------------------
-c     down cycle.
-c     restrict the residual from the find grid to the coarse
-c---------------------------------------------------------------------                   
-!!DVM$ INTERVAL 1    
-      p_curr_r_j = pr
-
-      do  k= lt, lb+1 , -1
-        j = k-1                 
-
-        p_curr_r_k = p_curr_r_j
-        p_curr_r_j = p_r_ir(j)                     
-         		 	 
-        if(m1(k).eq.3)then; d1 = 2; else; d1 = 1; endif
-        if(m2(k).eq.3)then; d2 = 2; else; d2 = 1; endif
-        if(m3(k).eq.3)then; d3 = 2; else; d3 = 1; endif
-         
-        call VDownIteration(d1,d2,d3,k)           
-      enddo           
-!!DVM$ END INTERVAL
-      
-c---------------------------------------------------------------------
-c     compute an approximate solution on the coarsest grid
-c---------------------------------------------------------------------
-!!DVM$ INTERVAL 5      
-      k = lb
-      
-      p_curr_u_k =  p_u_ir(k)
-      p_curr_r_k =  p_r_ir(k)
-            
-      call zero3(u(p_curr_u_k),m1(k),m2(k),m3(k))
-      call psinv(r(p_curr_r_k),u(p_curr_u_k),m1(k),m2(k),m3(k),c,k)                
-!!DVM$ END INTERVAL      
-
-c---------------------------------------------------------------------
-c     up cycle.
-c---------------------------------------------------------------------      
-!!DVM$ INTERVAL 6  
-      do  k = lb+1, lt-1     
-          j = k-1
-          
-          p_curr_u_j = p_curr_u_k
-          p_curr_u_k = p_u_ir(k)      
-          p_curr_r_k = p_r_ir(k)
-      
-          call VUpIteration(k)       
-      enddo
-!!DVM$ END INTERVAL      
-
- 200  continue
- 
-      j = lt - 1
-      k = lt
-
-      p_curr_u_j = p_u_ir(j)      
-      
-      call interp(u(p_curr_u_j),m1(j) ,m2(j) ,m3(j),
-     >            u(pu),m1(k),m2(k),m3(k),
-     >            k
-     >     )
-              
-      call resid (u(pu),v(pv),r(pr),m1(k),m2(k),m3(k),a,k)
-      
-      call psinv (r(pr),u(pu),m1(k),m2(k),m3(k),c,k)
-      
-      return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv
deleted file mode 100644
index a98f21f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/norm2u3.fdv
+++ /dev/null
@@ -1,51 +0,0 @@
-c---------------------------------------------------------------------
-c ������ �����
-c---------------------------------------------------------------------
-      subroutine norm2u3(r,n1,n2,n3,rnm2,rnmu,nx,ny,nz)
-c---------------------------------------------------------------------
-!DVM$ INHERIT r
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     norm2u3 evaluates approximations to the L2 norm and the
-c     uniform (or L-infinity or Chebyshev) norm, under the
-c     assumption that the boundaries are periodic or zero.  Add the
-c     boundaries in with half weight (quarter weight on the edges
-c     and eighth weight at the corners) for inhomogeneous boundaries.
-c---------------------------------------------------------------------
-      implicit none
-
-      integer n1, n2, n3, nx, ny, nz
-      double precision rnm2, rnmu, r(n1,n2,n3)
-      double precision s, a
-      integer i3, i2, i1
-
-      double precision dn
-
-      integer T_norm2
-      parameter (T_norm2=9)
-
-      dn = 1.0d0*nx*ny*nz
-      s=0.0D0
-      rnmu = 0.0D0
-
-
-!DVM$ REGION
-!DVM$ PARALLEL (i3,i2,i1) ON r(i1,i2,i3),  
-!DVM$& REDUCTION(SUM(s), MAX(rnmu)), PRIVATE(a)  
-!DVM$& ,cuda_block(32,4,1)
-      do  i3=2,n3-1
-         do  i2=2,n2-1
-            do  i1=2,n1-1
-               s=s+r(i1,i2,i3)**2
-               a=abs(r(i1,i2,i3))
-               rnmu=dmax1(rnmu,a)
-            enddo
-         enddo
-      enddo     
-!DVM$ END REGION
-!!DVM$ END INTERVAL
-      rnm2=sqrt( s / dn )    
-      
-      return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/psinv.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/psinv.fdv
deleted file mode 100644
index 97d0723..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/psinv.fdv
+++ /dev/null
@@ -1,167 +0,0 @@
-c---------------------------------------------------------------------
-c ������������ ������� �� ������ �������
-c---------------------------------------------------------------------
-c u(h) = u(h) + C r(h)
-c ��� C - ������-������� ����������� �����������,
-c     r - �������
-c     h - ��� ���������
-c---------------------------------------------------------------------
-c ������������:
-c  - ������� ������ �� ������ ����� �� ��� V-�����;
-c  - ����������� ��������������� ��������� ��� ����������� �� V-�����
-c---------------------------------------------------------------------
-c @param double precission :: r(n1,n2,n3) ? r(h) - �������
-c @param double precission :: u(n1,n2,n3) ? u(H) - ������ �����
-c @param double precission :: �(3) ? � - ���������� �����������
-c @param integer :: k - ������� ��� ���������� ��������� �������������� �����
-c---------------------------------------------------------------------
-      subroutine psinv( r,u,n1,n2,n3,c,k)
-c---------------------------------------------------------------------
-!DVM$ INHERIT r,u,c
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     psinv applies an approximate inverse as smoother:  u = u + Cr
-c
-c     This  implementation costs  15A + 4M per result, where
-c     A and M denote the costs of Addition and Multiplication.  
-c     Presuming coefficient c(3) is zero (the NPB assumes this,
-c     but it is thus not a general case), 2A + 1M may be eliminated,
-c     resulting in 13A + 3M.
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'      
-      
-      integer n1,n2,n3,k
-      double precision u(n1,n2,n3),r(n1,n2,n3),c(0:3)
-      double precision c_0,c_1,c_2, r1,r1_m1,r1_p1, r2,r2_m1,r2_p1
-      double precision r3,r3_m1,r3_p1, r4,r4_m1,r4_p1, r5,r5_m1,r5_p1
-      integer i3, i2, i1
-      
-      if(Class .eq. 'A' .or. Class .eq. 'S'.or. Class .eq.'W') then
-         c_0 =  -3.0D0/8.0D0
-         c_1 =  +1.0D0/32.0D0
-         c_2 =  -1.0D0/64.0D0
-      else
-         c_0 =  -3.0D0/17.0D0
-         c_1 =  +1.0D0/33.0D0
-         c_2 =  -1.0D0/61.0D0
-      endif
-	  
-!DVM$ interval 2
-      if( ver ) then 
-!DVM$ REGION 
-!DVM$ PARALLEL (i3,i2) ON u(*,i2,i3),cuda_block(32,6),
-!DVM$& SHADOW_RENEW(r(CORNER)),
-!DVM$& private(i1,r1,r1_m1,r1_p1,r2,r2_m1,r2_p1,r3,r3_m1,r3_p1,
-!DVM$& r4,r4_m1,r4_p1, r5,r5_m1,r5_p1)
-      do i3=2,n3-1
-         do i2=2,n2-1
-            r1_m1=r(1,i2,i3)
-	        r1=r(2,i2,i3)			
-            r2_m1=r(1,i2-1,i3)
-	        r2=r(2,i2-1,i3)
-            r3_m1=r(1,i2+1,i3)
-	        r3=r(2,i2+1,i3)
-            r4_m1=r(1,i2,i3+1)
-	        r4=r(2,i2,i3+1)		
-            r5_m1=r(1,i2,i3-1)
-	        r5=r(2,i2,i3-1)				
-            do i1=2,n1-1
-               r1_p1=r(i1+1,i2,i3)
-               r2_p1=r(i1+1,i2-1,i3)
-               r3_p1=r(i1+1,i2+1,i3)
-               r4_p1=r(i1+1,i2,i3+1)
-               r5_p1=r(i1+1,i2,i3-1)			   
-               u(i1,i2,i3) = u(i1,i2,i3)
-     &                     + c_0 * r1
-     &                     + c_1 * ( r1_m1 + r1_p1 + r2 + r3 + r5 + r4)
-     &                     + c_2 * ( r(i1,i2-1,i3-1) + r(i1,i2+1,i3-1)
-     &                     + r(i1,i2-1,i3+1) + r(i1,i2+1,i3+1)
-     &                + r2_m1+r3_m1+r5_m1+r4_m1+r2_p1+r3_p1+r5_p1+r4_p1)
-               r1_m1 = r1
-			   r1 = r1_p1	
-			   r2_m1 = r2
-			   r2 = r2_p1
-			   r3_m1 = r3
-			   r3 = r3_p1
-			   r4_m1 = r4
-			   r4 = r4_p1	
-			   r5_m1 = r5
-			   r5 = r5_p1				   
-            enddo
-         enddo
-      enddo
-!DVM$ END REGION
-       else
-!DVM$ REGION
-!DVM$ PARALLEL (i3,i1) ON u(i1,*,i3),cuda_block(32,6)
-!DVM$& ,private(i2,r1,r1_m1,r1_p1, r2,r2_m1,r2_p1, r3,r3_m1,r3_p1,
-!DVM$& r4,r4_m1,r4_p1, r5,r5_m1,r5_p1), SHADOW_RENEW(r(CORNER))
-      do i3=2,n3-1
-        do i1=2,n1-1
-          r1_m1 = r(i1,1,i3)
-          r1 = r(i1,2,i3)
-		  
-          r2_m1 = r(i1-1,1,i3)		  
-          r2 = r(i1-1,2,i3)  
-		  
-          r3_m1 = r(i1+1,1,i3)
-          r3 = r(i1+1,2,i3) 
-
-          r4_m1 = r(i1,1,i3+1)		  
-          r4 = r(i1,2,i3+1)   
-
-          r5_m1 = r(i1,1,i3-1)		  
-          r5 = r(i1,2,i3-1)   	
-		  
-          do i2=2,n2-1
-               r1_p1 = r(i1,i2+1,i3)		  
-               r2_p1 = r(i1-1,i2+1,i3)
-               r3_p1 = r(i1+1,i2+1,i3)		
-               r4_p1 = r(i1,i2+1,i3+1)
-               r5_p1 = r(i1,i2+1,i3-1)					   
-               u(i1,i2,i3) = u(i1,i2,i3)
-     &                     + c_0 * r1
-     &                     + c_1 * (   r2 + r3
-     &                               + r1_m1 + r1_p1
-     &                               + r4 + r5
-     &                     )
-     &                     + c_2 * ( 
-     &                                 r4_m1 + r4_p1
-     &                               + r5_m1 + r5_p1
-     &                               + r2_m1 + r2_p1
-     &                               + r(i1-1,i2,i3-1) + r(i1-1,i2,i3+1)
-     &                               + r3_m1 + r3_p1
-     &                               + r(i1+1,i2,i3-1) + r(i1+1,i2,i3+1)
-     &                     )
-               r1_m1 = r1
-			   r1 = r1_p1
-			   
-			   r2_m1 = r2
-			   r2 = r2_p1
-			   
-			   r3_m1 = r3
-			   r3 = r3_p1	
-
-			   r4_m1 = r4
-			   r4 = r4_p1	
-
-			   r5_m1 = r5
-			   r5 = r5_p1				   
-            enddo
-         enddo
-      enddo
-!DVM$ END REGION
-         endif
-!DVM$ end interval 
-c---------------------------------------------------------------------
-c     exchange boundary points
-c---------------------------------------------------------------------
-      call comm3(u,n1,n2,n3,k)
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/resid.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/resid.fdv
deleted file mode 100644
index 27c57e8..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/resid.fdv
+++ /dev/null
@@ -1,196 +0,0 @@
-c---------------------------------------------------------------------
-c  ��������� �������   
-c---------------------------------------------------------------------
-c r(h) = v - A u(h)
-c ��� A - ������-������� �����������,
-c     v - ����������� (�� ���������� ����� V-�����, ������������ ��������)
-c     h - ��� ���������
-c---------------------------------------------------------------------
-c ������������ ��� ��������� �������, ��� ����������� �� V-�����
-c---------------------------------------------------------------------
-c @param double precission :: r(n1,n2,n3) ? r(h) - �������
-c @param double precission :: v(n1,n2,n3) ? v - �����������
-c @param double precission :: a(3) ? A - �����������
-c @param integer :: k - ������� ��� ���������� ��������� �������������� �����
-c---------------------------------------------------------------------
-      subroutine resid( u,v,r,n1,n2,n3,a,k )
-c---------------------------------------------------------------------
-!DVM$ INHERIT r, u, a, v
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     resid computes the residual:  r = v - Au
-c
-c     This  implementation costs  15A + 4M per result, where
-c     A and M denote the costs of Addition (or Subtraction) and 
-c     Multiplication, respectively. 
-c     Presuming coefficient a(1) is zero (the NPB assumes this,
-c     but it is thus not a general case), 3A + 1M may be eliminated,
-c     resulting in 12A + 3M.
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  
-c---------------------------------------------------------------------
-      implicit none
-    
-      include 'globals.h'
-
-      integer n1,n2,n3,k
-      double precision u(n1,n2,n3),v(n1,n2,n3),r(n1,n2,n3),a(0:3)
-      integer i3, i2, i1
-      double precision u1_m1,u1,u1_p1, u2_m1,u2,u2_p1, u3_m1,u3,u3_p1
-      double precision u4_m1,u4,u4_p1, u5_m1,u5,u5_p1, u6_m1,u6,u6_p1	
-      double precision u7_m1,u7,u7_p1, u8_m1,u8,u8_p1
-	  
-!DVM$ interval 3
-       if ( ver ) then	 
-   
-!DVM$ REGION
-!DVM$ PARALLEL (i3,i2) ON r(*,i2,i3), cuda_block(32,6)
-!DVM$& ,private(i1, u1_m1,u1,u1_p1, u2_m1,u2,u2_p1, u3_m1,u3,u3_p1,
-!DVM$& u4_m1,u4,u4_p1, u5_m1,u5,u5_p1, u6_m1,u6,u6_p1,
-!DVM$& u7_m1,u7,u7_p1, u8_m1,u8,u8_p1),SHADOW_RENEW(u(CORNER))	
-      do i3=2,n3-1
-         do i2=2,n2-1
-            u1_m1 = u(1,i2-1,i3-1)
-            u1 = u(2,i2-1,i3-1)
-            u2_m1 = u(1,i2+1,i3+1)
-            u2 = u(2,i2+1,i3+1)
-            u3_m1 = u(1,i2-1,i3+1)
-            u3 = u(2,i2-1,i3+1)
-            u4_m1 = u(1,i2+1,i3-1)
-            u4 = u(2,i2+1,i3-1)			
-            u5_m1 = u(1,i2+1,i3)
-            u5 = u(2,i2+1,i3)			
-            u6_m1 = u(1,i2-1,i3)
-            u6 = u(2,i2-1,i3)		
-            u7_m1 = u(1,i2,i3-1)
-            u7 = u(2,i2,i3-1)			
-            u8_m1 = u(1,i2,i3+1)
-            u8 = u(2,i2,i3+1)			
-            do i1=2,n1-1
-              u1_p1 = u(i1+1,i2-1,i3-1)	
-              u2_p1 = u(i1+1,i2+1,i3+1)			  
-              u3_p1 = u(i1+1,i2-1,i3+1)			  
-              u4_p1 = u(i1+1,i2+1,i3-1)			  
-              u5_p1 = u(i1+1,i2+1,i3)			  
-              u6_p1 = u(i1+1,i2-1,i3)			  			  
-              u7_p1 = u(i1+1,i2,i3-1)			  
-              u8_p1 = u(i1+1,i2,i3+1)			  			  
-              r(i1,i2,i3) = v(i1,i2,i3)
-     &                  + 8.0D0/3.0D0 * u(i1,i2,i3) - 1.0D0/6.0D0 *
-     &   (u1+u4+u3+u2+u6_m1+u5_m1+u7_m1+u8_m1+u6_p1+u5_p1+u7_p1+u8_p1)                     
-     & -1.0D0/12.0D0*(u1_m1+u4_m1+u3_m1+u2_m1+u1_p1+u4_p1+u3_p1+u2_p1)
-              u1_m1 = u1
-              u1 = u1_p1			
-              u2_m1 = u2
-              u2 = u2_p1
-              u3_m1 = u3
-              u3 = u3_p1
-              u4_m1 = u4
-              u4 = u4_p1
-              u5_m1 = u5
-              u5 = u5_p1
-              u6_m1 = u6
-              u6 = u6_p1
-              u7_m1 = u7
-              u7 = u7_p1	
-              u8_m1 = u8
-              u8 = u8_p1	 
-            enddo
-         enddo
-      enddo
-!DVM$ END REGION
-
-        else
-!DVM$ REGION
-!DVM$ PARALLEL (i3,i1) ON r(i1,*,i3), cuda_block(32,6)
-!DVM$& ,private(i2, u1_m1,u1,u1_p1, u2_m1,u2,u2_p1, u3_m1,u3,u3_p1,
-!DVM$& u4_m1,u4,u4_p1, u5_m1,u5,u5_p1, u6_m1,u6,u6_p1,
-!DVM$& u7_m1,u7,u7_p1, u8_m1,u8,u8_p1),SHADOW_RENEW(u(CORNER))
-      do i3=2,n3-1       
-        do i1=2,n1-1
-          u1_m1 = u(i1,1,i3-1)
-          u1 = u(i1,2,i3-1)		
-
-          u2_m1 = u(i1,1,i3+1)
-          u2 = u(i1,2,i3+1)
-		  
-          u3_m1 = u(i1-1,1,i3)
-          u3 = u(i1-1,2,i3)
-		  
-          u4_m1 = u(i1-1,1,i3-1)
-          u4 = u(i1-1,2,i3-1)
-		  
-          u5_m1 = u(i1-1,1,i3+1)
-          u5 = u(i1-1,2,i3+1)
-		  
-          u6_m1 = u(i1+1,1,i3)
-          u6 = u(i1+1,2,i3)
-
-          u7_m1 = u(i1+1,1,i3-1)
-          u7 = u(i1+1,2,i3-1)
-
-          u8_m1 = u(i1+1,1,i3+1)
-          u8 = u(i1+1,2,i3+1)		  
-          do i2=2,n2-1
-            u1_p1 = u(i1,i2+1,i3-1)			
-            u2_p1 = u(i1,i2+1,i3+1)	
-            u3_p1 = u(i1-1,i2+1,i3)				
-            u4_p1 = u(i1-1,i2+1,i3-1)				
-            u5_p1 = u(i1-1,i2+1,i3+1)
-            u6_p1 = u(i1+1,i2+1,i3)
-            u7_p1 = u(i1+1,i2+1,i3-1)						
-            u8_p1 = u(i1+1,i2+1,i3+1)						
-			
-               r(i1,i2,i3) = v(i1,i2,i3)
-     &            + 8.0D0/3.0D0 * u(i1,i2,i3)
-     &            - 1.0D0/6.0D0  * ( 
-     &                  u1_m1 + u1_p1
-     &                + u2_m1 + u2_p1
-     &                + u3_m1 + u3_p1
-     &                + u4 + u5
-     &                + u6_m1 + u6_p1
-     &                + u7 + u8
-     &            )
-     &            - 1.0D0/12.0D0 * ( 
-     &                  u4_m1 + u4_p1
-     &                + u5_m1 + u5_p1
-     &                + u7_m1 + u7_p1
-     &                + u8_m1 + u8_p1	 
-     &            )
-            u1_m1 = u1
-            u1 = u1_p1
-			
-            u2_m1 = u2
-            u2 = u2_p1
-
-            u3_m1 = u3
-            u3 = u3_p1
-
-            u4_m1 = u4
-            u4 = u4_p1	
-
-            u5_m1 = u5
-            u5 = u5_p1		
-
-            u6_m1 = u6
-            u6 = u6_p1		
-
-            u7_m1 = u7
-            u7 = u7_p1	
-
-            u8_m1 = u8
-            u8 = u8_p1				
-            enddo
-         enddo
-      enddo
-!DVM$ END REGION
-       endif
-!DVM$ end interval 	   
-c---------------------------------------------------------------------
-c     exchange boundary data
-c---------------------------------------------------------------------
-      call comm3(r,n1,n2,n3,k)
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv
deleted file mode 100644
index 6b8170e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/rjrp3.fdv
+++ /dev/null
@@ -1,169 +0,0 @@
-c---------------------------------------------------------------------
-c ����������� �������� (�����������) ������� �� ������ �����
-c---------------------------------------------------------------------
-c r(H) = P r(h)
-c ��� H = 2h - ��� ��������� �����, 
-c     P      - �������� �������� ����������� ��������,
-c     r      - �������
-c---------------------------------------------------------------------
-c ������������ ��� ���������� ������ ����� �������, ��� ����������� �� V-�����
-c---------------------------------------------------------------------
-c @param double precission :: r(m1k,m2k,m3k) ? r(h) - ��������� �����
-c @param double precission :: s(m1j,m2j,m3j) ? r(H) - ������ �����
-c @param double precission :: d1, d2, d3 - �������� �� ������� �������
-c @param integer :: k - ������� ��� ���������� ��������� �������������� �����
-c---------------------------------------------------------------------
-      subroutine rprj3( r,m1k,m2k,m3k,s,m1j,m2j,m3j,k, d1,d2,d3)
-c---------------------------------------------------------------------
-!DVM$ INHERIT r,s
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     rprj3 projects onto the next coarser grid, 
-c     using a trilinear Finite Element projection:  s = r' = P r
-c     
-c     This  implementation costs  20A + 4M per result, where
-c     A and M denote the costs of Addition and Multiplication.  
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-
-      integer m1k, m2k, m3k, m1j, m2j, m3j,k
-      double precision r(m1k,m2k,m3k), s(m1j,m2j,m3j)
-      integer j3, j2, j1, i3, i2, i1, d1, d2, d3, j
-      double precision r1_m1,r1_p1, r2_m1,r2_p1, r3_m1,r3_p1
-      double precision r4_m1,r4_p1, r5_m1,r5_p1, r6_m1,r6_p1
-      double precision r7_m1,r7_p1, r8_m1,r8_p1, r9_m1,r9_p1,y2,x2
-	  
-!DVM$ interval 4
-      if( ver ) then
-  
-!DVM$ REGION
-!DVM$ PARALLEL (j3,j2) ON s(*,j2,j3), SHADOW_RENEW(r(CORNER)),
-!DVM$& cuda_block(32,6), PRIVATE(i1, i2, i3, j1,
-!DVM$& r1_m1,r1_p1, r2_m1,r2_p1, r3_m1,r3_p1, r4_m1,r4_p1, r5_m1,r5_p1
-!DVM$&,r6_m1,r6_p1, r7_m1,r7_p1, r8_m1,r8_p1, r9_m1,r9_p1,y2,x2)	  
-      do  j3=2,m3j-1
-         do  j2=2,m2j-1            
-            i3 = 2*j3-d3		 
-            i2 = 2*j2-d2
-			
-            r1_m1 = r(2*2-d1-1,i2+1,i3)			
-            r2_m1 = r(2*2-d1-1,i2,i3+1)		
-            r3_m1 = r(2*2-d1-1,i2+1,i3+1)		
-            r4_m1 = r(2*2-d1-1,i2-1,i3)
-            r5_m1 = r(2*2-d1-1,i2,i3-1)
-            r6_m1 = r(2*2-d1-1,i2-1,i3-1)
-            r7_m1 = r(2*2-d1-1,i2,i3)
-            r8_m1 = r(2*2-d1-1,i2-1,i3+1)
-            r9_m1 = r(2*2-d1-1,i2+1,i3-1)			
-
-            do  j1=2,m1j-1
-              i1 = 2*j1-d1
-              r1_p1 = r(i1+1,i2+1,i3)			  
-              r2_p1 = r(i1+1,i2,i3+1)
-              r3_p1 = r(i1+1,i2+1,i3+1)
-              r4_p1 = r(i1+1,i2-1,i3)
-              r5_p1 = r(i1+1,i2,i3-1)
-              r6_p1 = r(i1+1,i2-1,i3-1)
-              r7_p1 = r(i1+1,i2,i3)
-              r8_p1 = r(i1+1,i2-1,i3+1)
-              r9_p1 = r(i1+1,i2+1,i3-1)			  
-			  
-              y2 = r(i1,  i2-1,i3-1) + r(i1,  i2-1,i3+1)
-     &           + r(i1,  i2+1,i3-1) + r(i1,  i2+1,i3+1)
-              x2 = r(i1,  i2-1,i3  ) + r(i1,  i2+1,i3  )
-     &           + r(i1,  i2,  i3-1) + r(i1,  i2,  i3+1)
-              s(j1,j2,j3) =
-     &               0.5D0 * r(i1,i2,i3)
-     &             + 0.25D0 * ( r7_m1 + r7_p1 + x2)
-     &             + 0.125D0 * ( r4_m1 + r1_m1 + r5_m1 + r2_m1 + 
-     &             r4_p1 + r1_p1 + r5_p1 + r2_p1 + y2)
-     &             + 0.0625D0 * ( r6_m1 + r8_m1
-     &             + r9_m1 + r3_m1 + r6_p1 + r8_p1 + r9_p1 + r3_p1)
-               r1_m1 = r1_p1				   
-			   r2_m1 = r2_p1
-			   r3_m1 = r3_p1
-			   r4_m1 = r4_p1
-			   r5_m1 = r5_p1
-			   r6_m1 = r6_p1
-			   r7_m1 = r7_p1
-			   r8_m1 = r8_p1
-			   r9_m1 = r9_p1	 
-            enddo
-         enddo
-      enddo
-!DVM$ END REGION  
-
-      else 
-!DVM$ REGION
-!DVM$ PARALLEL (j3,j1) ON s(j1,*,j3), SHADOW_RENEW(r(CORNER)),
-!DVM$& cuda_block(32,6), PRIVATE(i1, i2, i3, j2,
-!DVM$& r1_m1,r1_p1, r2_m1,r2_p1, r3_m1,r3_p1, r4_m1,r4_p1, r5_m1,r5_p1
-!DVM$&,r6_m1,r6_p1, r7_m1,r7_p1, r8_m1,r8_p1, r9_m1,r9_p1)
-      do  j3=2,m3j-1                  
-         do  j1=2,m1j-1
-           i3 = 2*j3-d3
-           i1 = 2*j1-d1          
-
-          r1_m1 = r(i1,2*2-d2-1,i3)		  
-          r2_m1 = r(i1-1,2*2-d2-1,i3)		  
-          r3_m1 = r(i1+1,2*2-d2-1,i3)
-          r4_m1 = r(i1,2*2-d2-1,i3+1)		  
-          r5_m1 = r(i1,2*2-d2-1,i3-1)		  
-          r6_m1 = r(i1+1,2*2-d2-1,i3+1)		  
-          r7_m1 = r(i1+1,2*2-d2-1,i3-1)
-          r8_m1 = r(i1-1,2*2-d2-1,i3-1)		  
-          r9_m1 = r(i1-1,2*2-d2-1,i3+1) 
-           do  j2=2,m2j-1			
-              i2 = 2*j2-d2
-               r1_p1 = r(i1,i2+1,i3)
-               r2_p1 = r(i1-1,i2+1,i3)
-               r3_p1 = r(i1+1,i2+1,i3)
-               r4_p1 = r(i1,i2+1,i3+1)
-               r5_p1 = r(i1,i2+1,i3-1)		
-               r6_p1 = r(i1+1,i2+1,i3+1)
-               r7_p1 = r(i1+1,i2+1,i3-1)
-               r8_p1 = r(i1-1,i2+1,i3-1)
-               r9_p1 = r(i1-1,i2+1,i3+1) 
-              s(j1,j2,j3) =
-     &             0.5D0    * r(i1,i2,i3)
-     &           + 0.25D0   * ( r1_m1 + r1_p1 +
-     &                 r(i1-1,i2,i3) + r(i1+1,i2,i3)              
-     &               + r(i1,i2,i3-1) + r(i1,i2,i3+1))
-     &           + 0.125D0  * ( 
-     &                r2_m1 + r2_p1 + r3_m1 + r3_p1
-     &              + r5_m1 + r4_m1
-     &              + r5_p1 + r4_p1	 
-     &              + r(i1-1,i2,  i3-1) + r(i1-1,i2,  i3+1)              
-     &              + r(i1+1,i2,  i3-1) + r(i1+1,i2,  i3+1))
-     &           + 0.0625D0 * ( 
-     &                r8_m1 + r9_m1
-     &              + r8_p1 + r9_p1
-     &              + r7_m1 + r6_m1
-     &              + r7_p1 + r6_p1)
-	 
-               r1_m1 = r1_p1
-			   r2_m1 = r2_p1
-			   r3_m1 = r3_p1
-			   r4_m1 = r4_p1
-			   r5_m1 = r5_p1
-			   r6_m1 = r6_p1
-			   r7_m1 = r7_p1
-			   r8_m1 = r8_p1
-			   r9_m1 = r9_p1
-            enddo
-
-         enddo
-      enddo
-!DVM$ END REGION   
-       endif  
-!DVM$ end interval	   
-      j = k-1
-      call comm3(s,m1j,m2j,m3j,j)
-      
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv
deleted file mode 100644
index 2b3a49c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/setupDVM.fdv
+++ /dev/null
@@ -1,226 +0,0 @@
-
-c---------------------------------------------------------------------
-c ������������ �������� ��� ������ �� V-�����
-c @param integer d1, d2, d3 - �������� �� ������� �������
-c @param integer k - ����� �����
-c---------------------------------------------------------------------                  
-      subroutine dvmAlignDownCycle(d1, d2, d3, k)
-      
-      implicit none
-
-      include 'globals.h'
-      include 'dvmvars.h'
-      
-      integer k      
-      integer d1, d2, d3       
-      
-      integer t1, t2, t3  
-     
-!DVM$ TEMPLATE EXT_V_DOWN (m1(k)+1, m2(k)+1, m3(k)+1)   
-!DVM$ DISTRIBUTE EXT_V_DOWN (BLOCK, BLOCK, BLOCK)     
-      
-       t1 = d1 - 1; t2 = d2 - 1; t3 = d3 - 1;
-       
-!DVM$ REALIGN p_curr_r_j(i,j,k) WITH EXT_V_DOWN(2*i-1, 2*j-1, 2*k-1)       
-!DVM$ REALIGN p_curr_r_k(i,j,k) WITH EXT_V_DOWN(i+t1, j+t2, k+t3)           
-      
-      return
-      end
-
-c---------------------------------------------------------------------
-c ������������ �������� ��� ������� �� V-�����
-c @param integer d1, d2, d3 - �������� �� ������� �������
-c @param integer k - ����� �����
-c---------------------------------------------------------------------                        
-      subroutine dvmAlignUpCycle(k)           
-
-      implicit none
-
-      include 'globals.h'
-      include 'dvmvars.h'
-
-      integer k
-      
-!!DVM$ SHADOW p_curr_u_k(1:1,1:1,1:1) 
-!!DVM$ SHADOW p_curr_u_j(1:1,1:1,1:1)
-      
-!DVM$ TEMPLATE EXT_V_UP (m1(k)+1, m2(k)+1, m3(k)+1)   
-!DVM$ DISTRIBUTE EXT_V_UP (BLOCK, BLOCK, BLOCK)  
-           
-!DVM$ REALIGN p_curr_u_j(i,j,k) WITH EXT_V_UP(2*i-1, 2*j-1, 2*k-1)       
-!DVM$ REALIGN p_curr_u_k(i,j,k) WITH EXT_V_UP(i, j, k)   
-!DVM$ REALIGN p_curr_r_k(i,j,k) WITH EXT_V_UP(i, j, k) 
-
-       return
-       end
-    
-c---------------------------------------------------------------------
-c ������������� ���������� DVM
-c @param integer isSecond - 1 ��� ��������� ������
-c---------------------------------------------------------------------            
-      subroutine setupDVM(isSecond)    
-         implicit none      
-                                
-         include 'globals.h'         
-         include 'dvmvars.h' 
-         
-         integer allocate, k, j, isSecond
-         integer pdim(3) 
-         integer d1, d2, d3 
-         
-!DVM$ TEMPLATE EXT_BOTTOM (m1(lb), m2(lb), m3(lb))
-!DVM$ DISTRIBUTE EXT_BOTTOM (BLOCK, BLOCK, BLOCK)         
-  
-!DVM$ TEMPLATE EXT_LAST (m1(lt)+1, m2(lt)+1, m3(lt)+1)   
-!DVM$ DISTRIBUTE EXT_LAST (BLOCK, BLOCK, BLOCK)    
-        
-        if (isSecond .eq. 0) then
-             ! �������� ������ ����������        
-             do k = lt, 1, -1
-                 pdim =(/ m1(k), m2(k), m3(k) /)
-                 p_u_ir(k) = allocate(pdim, ir(k))             
-                 p_r_ir(k) = allocate(pdim, ir(k))             
-             enddo      
-             
-             ! �������� ������ � ���� ��� �������
-             pdim =(/ m1(lt), m2(lt), m3(lt) /)         
-             pv = allocate(pdim, 1) 
-             
-             ! ��������� ����������
-             pu = p_u_ir(lt)
-             pr = p_r_ir(lt)         
-        endif
-                   
-         ! ����������� �� �����
-         p_curr_r_j = pr
-         do  k= lt, lb+1 , -1
-             j = k-1                 
-             p_curr_r_k = p_curr_r_j
-             p_curr_r_j = p_r_ir(j)                     
-         		 	 
-             if(m1(k).eq.3)then; d1 = 2; else; d1 = 1; endif
-             if(m2(k).eq.3)then; d2 = 2; else; d2 = 1; endif
-             if(m3(k).eq.3)then; d3 = 2; else; d3 = 1; endif
-         
-             call dvmAlignDownCycle(d1, d2, d3, k)         
-         enddo 
-         
-         ! ����������� ���
-         k = lb      
-         p_curr_u_k =  p_u_ir(k)
-         p_curr_r_k =  p_r_ir(k)   
-!DVM$ REALIGN (i, j, k) WITH EXT_BOTTOM(i,j,k) :: p_curr_u_k
-!DVM$ REALIGN (i, j, k) WITH EXT_BOTTOM(i,j,k) :: p_curr_r_k   
-         
-         ! ����������� ������
-         do  k = lb+1, lt-1     
-             j = k-1
-          
-             p_curr_u_j = p_curr_u_k
-             p_curr_u_k = p_u_ir(k)      
-             p_curr_r_k = p_r_ir(k)
-      
-             call dvmAlignUpCycle(k)       
-         enddo
-     	   
-         ! ����������� ��������� �������� 
-         j = lt - 1
-         k = lt
-
-         p_curr_u_j = p_u_ir(j)
-      
-!DVM$ REALIGN p_curr_u_j(i,j,k) WITH EXT_LAST(2*i-1, 2*j-1, 2*k-1)       
-!DVM$ REALIGN pu(i,j,k) WITH EXT_LAST(i, j, k)   
-!DVM$ REALIGN pr(i,j,k) WITH EXT_LAST(i, j, k)    
-!DVM$ REALIGN pv(i,j,k) WITH EXT_LAST(i, j, k)   
-        
-      end subroutine setupDVM
-          
-      
-c---------------------------------------------------------------------      
-c �������� ��� DVM
-c---------------------------------------------------------------------            
-      function allocate(dims, disp) 
-         integer allocate
-         allocate = disp
-         return
-      end function allocate
-
-c---------------------------------------------------------------------
-c ������������� ���������� ���������
-c---------------------------------------------------------------------
-      subroutine setup(n1,n2,n3,k)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-
-      include 'globals.h'
-
-      integer  is1, is2, is3, ie1, ie2, ie3
-      common /grid/ is1,is2,is3,ie1,ie2,ie3
-
-      integer n1,n2,n3,k
-      integer j
-
-      integer ax, mi(3,maxlevel)
-      integer ng(3,maxlevel)      
-      
-      ng(1,lt) = nx(lt)
-      ng(2,lt) = ny(lt)
-      ng(3,lt) = nz(lt)
-      do  ax=1,3
-         do  k=lt-1,1,-1
-            ng(ax,k) = ng(ax,k+1)/2
-         enddo
-      enddo
- 61   format(10i4)
-      do  k=lt,1,-1
-         nx(k) = ng(1,k)
-         ny(k) = ng(2,k)
-         nz(k) = ng(3,k)
-      enddo
-
-      do  k = lt,1,-1
-         do  ax = 1,3
-            mi(ax,k) = 2 + ng(ax,k) 
-         enddo
-
-         m1(k) = mi(1,k)
-         m2(k) = mi(2,k)
-         m3(k) = mi(3,k)
-
-      enddo
-     
-      k = lt
-      is1 = 2 + ng(1,k) - ng(1,lt)
-      ie1 = 1 + ng(1,k)
-      n1 = 3 + ie1 - is1
-      is2 = 2 + ng(2,k) - ng(2,lt)
-      ie2 = 1 + ng(2,k) 
-      n2 = 3 + ie2 - is2
-      is3 = 2 + ng(3,k) - ng(3,lt)
-      ie3 = 1 + ng(3,k) 
-      n3 = 3 + ie3 - is3
-
-
-      ir(lt)=1
-      do  j = lt-1, 1, -1
-         ir(j)=ir(j+1)+one*m1(j+1)*m2(j+1)*m3(j+1)
-      enddo
-
-      if( debug_vec(1) .ge. 1 )then
-         write(*,*)' in setup, '
-         write(*,*)' k  lt  nx  ny  nz ',
-     &        ' n1  n2  n3 is1 is2 is3 ie1 ie2 ie3'
-         write(*,9) k,lt,ng(1,k),ng(2,k),ng(3,k),
-     &              n1,n2,n3,is1,is2,is3,ie1,ie2,ie3
- 9       format(15i4)
-      endif
-
-      k = lt
-
-      return
-      end
-      
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/utilities.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/utilities.fdv
deleted file mode 100644
index 25056c7..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/utilities.fdv
+++ /dev/null
@@ -1,415 +0,0 @@
-c---------------------------------------------------------------------
-c ���������� ���������� ������� ������
-c---------------------------------------------------------------------
-c @param double precission :: z(n1 ,n2 ,n3) - ��������� �������
-c---------------------------------------------------------------------	 
-      subroutine zero3(z,n1,n2,n3)
-c---------------------------------------------------------------------
-!DVM$ INHERIT z
-c---------------------------------------------------------------------
-
-      implicit none      
-
-      integer n1, n2, n3
-      double precision z(n1,n2,n3)
-      integer i1, i2, i3
-      
-!!DVM$ INTERVAL 3   
-!DVM$ REGION  
-!DVM$ PARALLEL (i3,i2,i1) ON z(i1,i2,i3), PRIVATE(i3,i2,i1)
-!DVM$&, cuda_block(32,6)    
-      do  i3=1,n3      
-         do  i2=1,n2
-            do  i1=1,n1
-               z(i1,i2,i3)=0.0D0
-            enddo
-         enddo
-      enddo
-!DVM$ END REGION      
-!!DVM$ END INTERVAL
-      
-      return
-      end
-
-
-c----- end of program ------------------------------------------------
-
-c -- DEBUG --------------------------------------------------------      
-
-      subroutine printMatrix(a,n1,n2,n3)
-c---------------------------------------------------------------------
-!DVM$ INHERIT a
-      integer n1,n2,n3,i1,i2,i3
-      double precision a(n1,n2,n3), z(n2)
-      integer m1, m2, m3
-
-      write(*,*) 'MATRIX ------------------'
-      write(*,*) a
-      write(*,*) ' '
-!      m1 = min(n1,18)
-!      m2 = min(n2,14)
-!      m3 = min(n3,18)
-
-!      write(*,*)'  '
-!      do  i3=1,m3
-!         do  i1=1,m1
-!            do i2=1,m2
-!               z(i2) = a(i1,i2,i3)
-!            enddo
-!            write(*,6)(z(i2),i2=1,m2)
-!         enddo
-!         write(*,*)' - - - - - - - '
-!      enddo
-!      write(*,*)'  '
-! 6    format(15f6.3)
-
-      return 
-      end 
-      
-      subroutine printMatrixNN(a,n1,n2,n3)
-c---------------------------------------------------------------------
-!DVM$ INHERIT a
-      integer n1, n2, n3
-      double precision a(n1,n2,n3), z
-
-      do  i3=1,n3
-         do  i2=1,n2
-            do  i1=1,n1
-               z = a(i1,i2,i3)
-               if (z.ne.0) then
-                write(*,*) '(',i1,',',i2,',',i3,')=',z
-               endif  
-            enddo
-         enddo
-      enddo
- 
-      end  
-      
-
-c -- EXTERNAL --------------------------------------------------------      
-      
-      subroutine timer_clear(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      elapsed(n) = 0.0
-      return
-      end
-
-      subroutine timer_start(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      start(n) = elapsed_time()
-      return
-      end
-     
-      subroutine timer_stop(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-      double precision t, now
-
-      now = elapsed_time()
-      t = now - start(n)
-      elapsed(n) = elapsed(n) + t
-      return
-      end
-      
-      
-      double precision function timer_read(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-    
-      timer_read = elapsed(n)
-      return
-      end
-
-      double precision function elapsed_time()
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      implicit none
-
-        double precision t
-        double precision dvtime
-
-        data t/0.d0/ 
-c This function must measure wall clock time, not CPU time. 
-c Since there is no portable timer in Fortran (77)
-c we call a routine compiled in C (though the C source may have
-c to be tweaked). 
-      t = dvtime()
-c The following is not ok for "official" results because it reports
-c CPU time not wall clock time. It may be useful for developing/testing
-c on timeshared Crays, though. 
-c     call second(t)
-
-      elapsed_time = t
-
-      return
-      end
-
-      subroutine print_results(name, class, n1, n2, n3, niter, 
-     >               t, mops, optype, verified, npbversion) 
-c               ,compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-      
-      implicit none
-      character*2 name
-      character*1 class
-      integer n1, n2, n3, niter, j
-      double precision t, mops
-      character optype*24, size*13
-      logical verified
-      character*5 npbversion
-c     >          , compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7
-
-         write (*, 2) name 
- 2       format(//, ' ', A2, ' Benchmark Completed.')
-
-         write (*, 3) Class
- 3       format(' Class           = ', 12x, a12)
-
-c   If this is not a grid-based problem (EP, FT, CG), then
-c   we only print n1, which contains some measure of the
-c   problem size. In that case, n2 and n3 are both zero.
-c   Otherwise, we print the grid size n1xn2xn3
-
-         if ((n2 .eq. 0) .and. (n3 .eq. 0)) then
-            if (name(1:2) .eq. 'EP') then
-               write(size, '(f12.0)' ) 2.d0**n1
-               do j =13,1,-1
-                  if (size(j:j) .eq. '.') size(j:j) = ' '
-               end do
-               write (*,42) size
- 42            format(' Size            = ',12x, a14)
-            else
-               write (*,44) n1
- 44            format(' Size            = ',12x, i12)
-            endif
-         else
-            write (*, 4) n1,n2,n3
- 4          format(' Size            =  ',12x, i3,'x',i3,'x',i3)
-         endif
-
-         write (*, 5) niter
- 5       format(' Iterations      = ', 12x, i12)
-         
-         write (*, 6) t
- 6       format(' Time in seconds = ',12x, f12.2)
-         
-         write (*,9) mops
- 9       format(' Mop/s total     = ',12x, f12.2)
-
-         write(*, 11) optype
- 11      format(' Operation type  = ', a24)
-
-         if (verified) then 
-            write(*,12) '  SUCCESSFUL'
-         else
-            write(*,12) 'UNSUCCESSFUL'
-         endif
- 12      format(' Verification    = ', 12x, a)
-
-         write(*,13) npbversion
- 13      format(' Version         = ', 12x, a12)
-
-c         write(*,14) compiletime
-c 14      format(' Compile date    = ', 12x, a12)
-
-
-c         write (*,121) cs1
-c 121     format(/, ' Compile options:', /, 
-c     >          '    F77          = ', A)
-
-c         write (*,122) cs2
-c 122     format('    FLINK        = ', A)
-
-c         write (*,123) cs3
-c 123     format('    F_LIB        = ', A)
-c
-c         write (*,124) cs4
-c 124     format('    F_INC        = ', A)
-c
-c         write (*,125) cs5
-c 125     format('    FFLAGS       = ', A)
-c
-c         write (*,126) cs6
-c 126     format('    FLINKFLAGS   = ', A)
-c
-c         write(*, 127) cs7
-c 127     format('    RAND         = ', A)
-        
-         write (*,130)
- 130     format(//' Please send the results of this run to:'//
-     >            ' NPB Development Team '/
-     >            ' Internet: npb@nas.nasa.gov'/
-     >            ' '/
-     >            ' If email is not available, send this to:'//
-     >            ' MS T27A-1'/
-     >            ' NASA Ames Research Center'/
-     >            ' Moffett Field, CA  94035-1000'//
-     >            ' Fax: 415-604-3957'//)
-
-
-         return
-         end
-
-   
-      double precision function randlc (x, a)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c
-c   This routine returns a uniform pseudorandom double precision number in the
-c   range (0, 1) by using the linear congruential generator
-c
-c   x_{k+1} = a x_k  (mod 2^46)
-c
-c   where 0 < x_k < 2^46 and 0 < a < 2^46.  This scheme generates 2^44 numbers
-c   before repeating.  The argument A is the same as 'a' in the above formula,
-c   and X is the same as x_0.  A and X must be odd double precision integers
-c   in the range (1, 2^46).  The returned value RANDLC is normalized to be
-c   between 0 and 1, i.e. RANDLC = 2^(-46) * x_1.  X is updated to contain
-c   the new seed x_1, so that subsequent calls to RANDLC using the same
-c   arguments will generate a continuous sequence.
-c
-c   This routine should produce the same results on any computer with at least
-c   48 mantissa bits in double precision floating point data.  On 64 bit
-c   systems, double precision should be disabled.
-c
-c   David H. Bailey     October 26, 1990
-c
-c---------------------------------------------------------------------
-
-      implicit none
-
-      double precision r23,r46,t23,t46,a,x,t1,t2,t3,t4,a1,a2,x1,x2,z
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-c---------------------------------------------------------------------
-c   Break A into two parts such that A = 2^23 * A1 + A2.
-c---------------------------------------------------------------------
-
-      t1 = r23 * a
-      a1 = int (t1)
-      a2 = a - t23 * a1
-
-c---------------------------------------------------------------------
-c   Break X into two parts such that X = 2^23 * X1 + X2, compute
-c   Z = A1 * X2 + A2 * X1  (mod 2^23), and then
-c   X = 2^23 * Z + A2 * X2  (mod 2^46).
-c---------------------------------------------------------------------
-      t1 = r23 * x
-      x1 = int (t1)
-      x2 = x - t23 * x1
-      t1 = a1 * x2 + a2 * x1
-      t2 = int (r23 * t1)
-      z = t1 - t23 * t2
-      t3 = t23 * z + a2 * x2
-      t4 = int (r46 * t3)
-      x = t3 - t46 * t4
-      randlc = r46 * x
-
-      return
-      end
-
-      subroutine vranlc (n, x, a, y)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c
-c   This routine generates N uniform pseudorandom double precision numbers in
-c   the range (0, 1) by using the linear congruential generator
-c
-c   x_{k+1} = a x_k  (mod 2^46)
-c
-c   where 0 < x_k < 2^46 and 0 < a < 2^46.  This scheme generates 2^44 numbers
-c   before repeating.  The argument A is the same as 'a' in the above formula,
-c   and X is the same as x_0.  A and X must be odd double precision integers
-c   in the range (1, 2^46).  The N results are placed in Y and are normalized
-c   to be between 0 and 1.  X is updated to contain the new seed, so that
-c   subsequent calls to VRANLC using the same arguments will generate a
-c   continuous sequence.  If N is zero, only initialization is performed, and
-c   the variables X, A and Y are ignored.
-c
-c   This routine is the standard version designed for scalar or RISC systems.
-c   However, it should produce the same results on any single processor
-c   computer with at least 48 mantissa bits in double precision floating point
-c   data.  On 64 bit systems, double precision should be disabled.
-c
-c---------------------------------------------------------------------
-
-      implicit none
-
-      integer i,n
-      double precision y,r23,r46,t23,t46,a,x,t1,t2,t3,t4,a1,a2,x1,x2,z
-      dimension y(*)
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-
-c---------------------------------------------------------------------
-c   Break A into two parts such that A = 2^23 * A1 + A2.
-c---------------------------------------------------------------------
-      t1 = r23 * a
-      a1 = int (t1)
-      a2 = a - t23 * a1
-
-c---------------------------------------------------------------------
-c   Generate N results.   This loop is not vectorizable.
-c---------------------------------------------------------------------
-      do i = 1, n
-
-c---------------------------------------------------------------------
-c   Break X into two parts such that X = 2^23 * X1 + X2, compute
-c   Z = A1 * X2 + A2 * X1  (mod 2^23), and then
-c   X = 2^23 * Z + A2 * X2  (mod 2^46).
-c---------------------------------------------------------------------
-        t1 = r23 * x
-        x1 = int (t1)
-        x2 = x - t23 * x1
-        t1 = a1 * x2 + a2 * x1
-        t2 = int (r23 * t1)
-        z = t1 - t23 * t2
-        t3 = t23 * z + a2 * x2
-        t4 = int (r46 * t3)
-        x = t3 - t46 * t4
-        y(i) = r46 * x
-      enddo
-      return
-      end
-c---------------------------------------------------------------------      
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/zran3.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/zran3.fdv
deleted file mode 100644
index 8311672..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG/zran3.fdv
+++ /dev/null
@@ -1,431 +0,0 @@
-  
-c---------------------------------------------------------------------
-c ���������� ���������� ������� ������-���������� �������
-c---------------------------------------------------------------------
-c @param double precission :: z(n1 ,n2 ,n3) - ��������� �������
-c @param integer :: k - ��������� ��������
-c---------------------------------------------------------------------	 
-      subroutine zran3(z,n1,n2,n3,nx,ny,k,class)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     zran3  loads +1 at ten randomly chosen points,
-c     loads -1 at a different ten random points,
-c     and zero elsewhere.
-c---------------------------------------------------------------------
-      implicit none
-      include 'npbparams.h'
-!DVM$ INHERIT z
-!DVM$ DYNAMIC z
-      integer  is1, is2, is3, ie1, ie2, ie3,i3b,i3e,i2b,i1b
-      common /grid/ is1,is2,is3,ie1,ie2,ie3
-
-      integer n1, n2, n3, k, nx, ny, ierr, i0, m0, m1
-      double precision z(n1,n2,n3),zz(2+2**ndim1)
-
-      character*1 class
-      integer mm, i1, i2, i3, d1, e1, e2, e3,ii2,ii1
-      double precision x, a, max_val, min_val
-      double precision xx, x0, x1, a1, a2, ai
-      parameter( mm = 10,  a = 5.D0 ** 13, x = 314159265.D0)
-      double precision ten( mm, 0:1 ), temp, best
-      integer i, j1( mm, 0:1 ), j2( mm, 0:1 ), j3( mm, 0:1 )
-      integer jg( 0:3, mm, 0:1 ), jg_temp(4)
-      integer id1,id2,id3,idx1,idx2,idx3,nj,x22
-	  
-      call zero3(z,n1,n2,n3)
-
-      if(Class .eq. 'S') then
-      j1(  10,1)=   9
-      j1(  10,0)=   2
-      j2(  10,1)=   3
-      j2(  10,0)=  13
-      j3(  10,1)=  22
-      j3(  10,0)=   4
-      ten(  10,1)=    0.9999958165E+00
-      ten(  10,0)=    0.1621806298E-04
-      j1(   9,1)=  21
-      j1(   9,0)=  15
-      j2(   9,1)=  31
-      j2(   9,0)=  10
-      j3(   9,1)=  33
-      j3(   9,0)=  19
-      ten(   9,1)=    0.9999389618E+00
-      ten(   9,0)=    0.7495597642E-04
-      j1(   8,1)=   4
-      j1(   8,0)=   7
-      j2(   8,1)=   2
-      j2(   8,0)=  16
-      j3(   8,1)=   5
-      j3(   8,0)=   2
-      ten(   8,1)=    0.9999174510E+00
-      ten(   8,0)=    0.1889568795E-03
-      j1(   7,1)=   6
-      j1(   7,0)=   6
-      j2(   7,1)=  24
-      j2(   7,0)=  30
-      j3(   7,1)=   5
-      j3(   7,0)=  17
-      ten(   7,1)=    0.9998666211E+00
-      ten(   7,0)=    0.1958622020E-03
-      j1(   6,1)=   3
-      j1(   6,0)=  14
-      j2(   6,1)=  18
-      j2(   6,0)=   4
-      j3(   6,1)=  23
-      j3(   6,0)=   3
-      ten(   6,1)=    0.9998273669E+00
-      ten(   6,0)=    0.2522906835E-03
-      j1(   5,1)=  23
-      j1(   5,0)=   7
-      j2(   5,1)=  33
-      j2(   5,0)=  19
-      j3(   5,1)=   8
-      j3(   5,0)=  10
-      ten(   5,1)=    0.9997817402E+00
-      ten(   5,0)=    0.2966875037E-03
-      j1(   4,1)=  14
-      j1(   4,0)=  22
-      j2(   4,1)=  17
-      j2(   4,0)=  21
-      j3(   4,1)=  14
-      j3(   4,0)=  13
-      ten(   4,1)=    0.9997789044E+00
-      ten(   4,0)=    0.3082809722E-03
-      j1(   3,1)=  32
-      j1(   3,0)=  28
-      j2(   3,1)=   6
-      j2(   3,0)=  17
-      j3(   3,1)=  27
-      j3(   3,0)=  33
-      ten(   3,1)=    0.9997405518E+00
-      ten(   3,0)=    0.3944731504E-03
-      j1(   2,1)=  30
-      j1(   2,0)=  10
-      j2(   2,1)=   2
-      j2(   2,0)=  27
-      j3(   2,1)=  30
-      j3(   2,0)=  24
-      ten(   2,1)=    0.9997394292E+00
-      ten(   2,0)=    0.4423527428E-03
-      j1(   1,1)=  19
-      j1(   1,0)=   9
-      j2(   1,1)=  28
-      j2(   1,0)=  16
-      j3(   1,1)=  19
-      j3(   1,0)=  28
-      ten(   1,1)=    0.9996874580E+00
-      ten(   1,0)=    0.4726676489E-03
-      else if(class .eq. 'W') then
-      j1(  10,1)= 115
-      j1(  10,0)=  17
-      j2(  10,1)=  87
-      j2(  10,0)=  24
-      j3(  10,1)=  52
-      j3(  10,0)= 125
-      ten(  10,1)=    0.9999999670E+00
-      ten(  10,0)=    0.4097578454E-06
-      j1(   9,1)= 129
-      j1(   9,0)= 104
-      j2(   9,1)=  47
-      j2(   9,0)= 119
-      j3(   9,1)=  34
-      j3(   9,0)=  61
-      ten(   9,1)=    0.9999996061E+00
-      ten(   9,0)=    0.9408003763E-06
-      j1(   8,1)=  16
-      j1(   8,0)=  16
-      j2(   8,1)= 112
-      j2(   8,0)= 123
-      j3(   8,1)= 120
-      j3(   8,0)=  77
-      ten(   8,1)=    0.9999987379E+00
-      ten(   8,0)=    0.1220169409E-05
-      j1(   7,1)=  36
-      j1(   7,0)= 111
-      j2(   7,1)=  23
-      j2(   7,0)=  89
-      j3(   7,1)= 102
-      j3(   7,0)= 123
-      ten(   7,1)=    0.9999973226E+00
-      ten(   7,0)=    0.1432884929E-05
-      j1(   6,1)=  31
-      j1(   6,0)=  11
-      j2(   6,1)=  19
-      j2(   6,0)=   3
-      j3(   6,1)= 111
-      j3(   6,0)=  23
-      ten(   6,1)=    0.9999970764E+00
-      ten(   6,0)=    0.1917141063E-05
-      j1(   5,1)=  29
-      j1(   5,0)=  97
-      j2(   5,1)=  50
-      j2(   5,0)=  36
-      j3(   5,1)=  13
-      j3(   5,0)=  56
-      ten(   5,1)=    0.9999968171E+00
-      ten(   5,0)=    0.2780729588E-05
-      j1(   4,1)=  82
-      j1(   4,0)=  40
-      j2(   4,1)=  92
-      j2(   4,0)= 128
-      j3(   4,1)=  22
-      j3(   4,0)=  14
-      ten(   4,1)=    0.9999964096E+00
-      ten(   4,0)=    0.3077687282E-05
-      j1(   3,1)=  28
-      j1(   3,0)=  94
-      j2(   3,1)=  86
-      j2(   3,0)=  85
-      j3(   3,1)=  75
-      j3(   3,0)=  37
-      ten(   3,1)=    0.9999960890E+00
-      ten(   3,0)=    0.3419091698E-05
-      j1(   2,1)=  41
-      j1(   2,0)=  72
-      j2(   2,1)=  34
-      j2(   2,0)=   4
-      j3(   2,1)=   3
-      j3(   2,0)=  66
-      ten(   2,1)=    0.9999958165E+00
-      ten(   2,0)=    0.3899679498E-05
-      j1(   1,1)= 117
-      j1(   1,0)= 116
-      j2(   1,1)=  88
-      j2(   1,0)= 105
-      j3(   1,1)=  22
-      j3(   1,0)=   7
-      ten(   1,1)=    0.9999953932E+00
-      ten(   1,0)=    0.4564590384E-05
-      else if(class .eq. 'A' .or. class .eq. 'B') then
-      j1(  10,1)=  54
-      j1(  10,0)= 223
-      j2(  10,1)= 209
-      j2(  10,0)=  42
-      j3(  10,1)=  40
-      j3(  10,0)= 240
-      ten(  10,1)=    0.9999999811E+00
-      ten(  10,0)=    0.1058528198E-07
-      j1(   9,1)= 243
-      j1(   9,0)= 154
-      j2(   9,1)= 172
-      j2(   9,0)= 162
-      j3(   9,1)=  14
-      j3(   9,0)=  36
-      ten(   9,1)=    0.9999999670E+00
-      ten(   9,0)=    0.6491002580E-07
-      j1(   8,1)= 203
-      j1(   8,0)=  82
-      j2(   8,1)=  18
-      j2(   8,0)= 184
-      j3(   8,1)= 198
-      j3(   8,0)= 255
-      ten(   8,1)=    0.9999999092E+00
-      ten(   8,0)=    0.1261776816E-06
-      j1(   7,1)= 202
-      j1(   7,0)= 250
-      j2(   7,1)=  83
-      j2(   7,0)= 170
-      j3(   7,1)= 209
-      j3(   7,0)= 157
-      ten(   7,1)=    0.9999999006E+00
-      ten(   7,0)=    0.2087648028E-06
-      j1(   6,1)= 115
-      j1(   6,0)= 199
-      j2(   6,1)= 123
-      j2(   6,0)=   7
-      j3(   6,1)= 207
-      j3(   6,0)= 203
-      ten(   6,1)=    0.9999998605E+00
-      ten(   6,0)=    0.3218575699E-06
-      j1(   5,1)= 212
-      j1(   5,0)=  92
-      j2(   5,1)=   7
-      j2(   5,0)=  63
-      j3(   5,1)= 248
-      j3(   5,0)= 205
-      ten(   5,1)=    0.9999998070E+00
-      ten(   5,0)=    0.3231413785E-06
-      j1(   4,1)=  45
-      j1(   4,0)=  17
-      j2(   4,1)= 194
-      j2(   4,0)= 205
-      j3(   4,1)= 234
-      j3(   4,0)=  32
-      ten(   4,1)=    0.9999997641E+00
-      ten(   4,0)=    0.4097578454E-06
-      j1(   3,1)= 176
-      j1(   3,0)= 101
-      j2(   3,1)= 246
-      j2(   3,0)= 156
-      j3(   3,1)= 164
-      j3(   3,0)=  59
-      ten(   3,1)=    0.9999997464E+00
-      ten(   3,0)=    0.4272763050E-06
-      j1(   2,1)=   5
-      j1(   2,0)= 102
-      j2(   2,1)= 118
-      j2(   2,0)= 138
-      j3(   2,1)= 175
-      j3(   2,0)= 112
-      ten(   2,1)=    0.9999997340E+00
-      ten(   2,0)=    0.4331109977E-06
-      j1(   1,1)=  57
-      j1(   1,0)= 211
-      j2(   1,1)= 120
-      j2(   1,0)= 154
-      j3(   1,1)= 167
-      j3(   1,0)=  98
-      ten(   1,1)=    0.9999996868E+00
-      ten(   1,0)=    0.4353645551E-06     
-      else if(class .eq. 'C') then
-      j1(  10,1)= 310
-      j1(  10,0)= 399
-      j2(  10,1)= 361
-      j2(  10,0)= 312
-      j3(  10,1)=  11
-      j3(  10,0)= 200
-      ten(  10,1)=    0.9999999811E+00
-      ten(  10,0)=    0.6358860105E-08
-      j1(   9,1)=  11
-      j1(   9,0)=  96
-      j2(   9,1)= 493
-      j2(   9,0)= 401
-      j3(   9,1)= 118
-      j3(   9,0)= 238
-      ten(   9,1)=    0.9999999808E+00
-      ten(   9,0)=    0.7946667324E-08
-      j1(   8,1)= 451
-      j1(   8,0)= 223
-      j2(   8,1)= 270
-      j2(   8,0)= 278
-      j3(   8,1)= 443
-      j3(   8,0)=  61
-      ten(   8,1)=    0.9999999778E+00
-      ten(   8,0)=    0.1058528198E-07
-      j1(   7,1)= 149
-      j1(   7,0)= 344
-      j2(   7,1)= 117
-      j2(   7,0)= 139
-      j3(   7,1)= 199
-      j3(   7,0)= 168
-      ten(   7,1)=    0.9999999700E+00
-      ten(   7,0)=    0.2456904724E-07
-      j1(   6,1)= 243
-      j1(   6,0)= 383
-      j2(   6,1)=  87
-      j2(   6,0)=  74
-      j3(   6,1)=   5
-      j3(   6,0)= 283
-      ten(   6,1)=    0.9999999670E+00
-      ten(   6,0)=    0.2954460854E-07
-      j1(   5,1)= 509
-      j1(   5,0)= 352
-      j2(   5,1)=  43
-      j2(   5,0)= 194
-      j3(   5,1)= 127
-      j3(   5,0)= 418
-      ten(   5,1)=    0.9999999666E+00
-      ten(   5,0)=    0.4643648310E-07
-      j1(   4,1)= 163
-      j1(   4,0)=  18
-      j2(   4,1)= 280
-      j2(   4,0)=  21
-      j3(   4,1)=  75
-      j3(   4,0)= 457
-      ten(   4,1)=    0.9999999358E+00
-      ten(   4,0)=    0.4987107616E-07
-      j1(   3,1)= 146
-      j1(   3,0)= 154
-      j2(   3,1)=  93
-      j2(   3,0)= 338
-      j3(   3,1)= 312
-      j3(   3,0)=  10
-      ten(   3,1)=    0.9999999149E+00
-      ten(   3,0)=    0.6491002580E-07
-      j1(   2,1)= 203
-      j1(   2,0)= 402
-      j2(   2,1)=  10
-      j2(   2,0)= 504
-      j3(   2,1)=  51
-      j3(   2,0)= 449
-      ten(   2,1)=    0.9999999092E+00
-      ten(   2,0)=    0.6990178747E-07
-      j1(   1,1)= 151
-      j1(   1,0)=  74
-      j2(   1,1)= 401
-      j2(   1,0)=   2
-      j3(   1,1)= 331
-      j3(   1,0)= 107
-      ten(   1,1)=    0.9999999069E+00
-      ten(   1,0)=    0.8774652827E-07
-      endif
-	  
-      i1 = mm
-      i0 = mm
-      do  i=mm,1,-1
-
-         best = 0.d0
-         if(best .lt. ten( i1, 1 ))then
-            jg( 0, i, 1) = 0
-            jg( 1, i, 1) = is1 - 2 + j1( i1, 1 ) 
-            jg( 2, i, 1) = is2 - 2 + j2( i1, 1 ) 
-            jg( 3, i, 1) = is3 - 2 + j3( i1, 1 ) 
-            i1 = i1-1
-         else
-            jg( 0, i, 1) = 0
-            jg( 1, i, 1) = 0
-            jg( 2, i, 1) = 0
-            jg( 3, i, 1) = 0
-         endif
-
-         best = 1.d0
-         if(best .gt. ten( i0, 0 ))then
-            jg( 0, i, 0) = 0
-            jg( 1, i, 0) = is1 - 2 + j1( i0, 0 ) 
-            jg( 2, i, 0) = is2 - 2 + j2( i0, 0 ) 
-            jg( 3, i, 0) = is3 - 2 + j3( i0, 0 ) 
-            i0 = i0-1
-         else
-            jg( 0, i, 0) = 0
-            jg( 1, i, 0) = 0
-            jg( 2, i, 0) = 0
-            jg( 3, i, 0) = 0
-         endif
-
-      enddo
-
-!DVM$ region
-!DVM$ PARALLEL (i3,i2,i1) ON z(i1,i2,i3), private(i),cuda_block(32,6)
-      do  i3=1,n3
-         do  i2=1,n2
-            do  i1=1,n1
-               z(i1,i2,i3) = 0.0D0
-               do  i = mm,1,-1
-			    if(i1 .eq. jg(1,i,0) .and. i2 .eq. jg(2,i,0)
-     &                 .and. i3 .eq. jg(3,i,0)) then
-                  z(i1,i2,i3) = -1.0D0
-                endif
-			    if(i1 .eq. jg(1,i,1) .and. i2 .eq. jg(2,i,1)
-     &                 .and. i3 .eq. jg(3,i,1)) then
-                  z(i1,i2,i3) = 1.0D0
-                endif
-               enddo			   
-            enddo
-         enddo
-      enddo
-
-!DVM$ end region
-
-     
-      call comm3(z,n1,n2,n3,k)
-      
-c---------------------------------------------------------------------
-c          call showall(z,n1,n2,n3)
-c---------------------------------------------------------------------
-
-      return 
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h
deleted file mode 100644
index eabcb83..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dtime.h
+++ /dev/null
@@ -1,4 +0,0 @@
-       integer dvm_debug
-C      dvm_debug = 0 - standard mode, dvm_debug > 0 - debugging mode
-       parameter (dvm_debug=0) 
-                                                                            
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h
deleted file mode 100644
index 77d0fbe..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/dvmvar.h
+++ /dev/null
@@ -1,21 +0,0 @@
-c---------------------------------------------------------------------
-c     FDVM specifications
-c---------------------------------------------------------------------
-!!      integer pv,pv1,pu1,pr1,pu(maxlevel),pr(maxlevel),pus,pus1
-      integer psize(3),pdim
-      common /pointers/ pv,pu1,pr1,pu,pr,pv1,pus,pus1
-      common/processors/ psize,pdim 
-      DOUBLE PRECISION,POINTER,DIMENSION(:,:,:) ::
-     &                                  pv,pu1,pr1,pv1,pus,pus1
-!!      DOUBLE PRECISION,POINTER,DIMENSION(:,:,:) ::
-!!     &                                 pu(maxlevel),pr(maxlevel)
-CDVM$ TEMPLATE tmp (1+2**(lt+1),1+2**(lt+1),1+2**(lt+1))
-CDVM$ DISTRIBUTE tmp (*,*,BLOCK)
-CDVM$ ALIGN :: pr1,pv,pu1,pus,pus1
-CDVM$ DYNAMIC  pv,tmp,pus,pus1,pu1,pr1
-      TYPE P
-      DOUBLE PRECISION,POINTER,DIMENSION(:,:,:) :: p
-CDVM$ ALIGN :: p
-CDVM$ DYNAMIC p
-      END TYPE
-      TYPE(P)  pu(maxlevel),pr(maxlevel)       
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/globals.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/globals.h
deleted file mode 100644
index 1816894..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/globals.h
+++ /dev/null
@@ -1,52 +0,0 @@
-c---------------------------------------------------------------------
-c  Parameter lm (declared and set in "npbparams.h") is the log-base2 of 
-c  the edge size max for the partition on a given node, so must be changed 
-c  either to save space (if running a small case) or made bigger for larger 
-c  cases, for example, 512^3. Thus lm=7 means that the largest dimension 
-c  of a partition that can be solved on a node is 2^7 = 128. lm is set 
-c  automatically in npbparams.h
-c  Parameters ndim1, ndim2, ndim3 are the local problem dimensions. 
-c---------------------------------------------------------------------
-
-      include 'npbparams.h'
-!      nm      - actual dimension including ghost cells for communications
-!      nv      - size of rhs array
-!      nr      - size of residual array
-!      nm2     - size of communication buffer
-!      maxlevel- maximum number of levels
-      integer nm     
-     >      , nv     
-     >      , nr     
-     >      , nm2    
-     >      , maxlevel
-
-      parameter( nm=2+2**lm, nv=(2+2**ndim1)*(2+2**ndim2)*(2+2**ndim3) )
-      parameter( nm2=2*nm*nm, maxlevel=11 )
-      parameter( nr = (8*(nv+nm**2+5*nm+7*lm))/7 )  
-c---------------------------------------------------------------------
-      integer  nx(maxlevel),ny(maxlevel),nz(maxlevel)
-      common /mg3/ nx,ny,nz
-
-      character class
-      common /ClassType/class
-
-      integer debug_vec(0:7)
-      common /my_debug/ debug_vec
-
-      integer ir(maxlevel), m1(maxlevel), m2(maxlevel), m3(maxlevel)
-      integer lt, lb, mi(3,maxlevel),nreq,lbdvm
-      common /fap/ ir,m1,m2,m3,lt,lb,mi,nreq,lbdvm
-      logical proc1
-      parameter (proc1 = .TRUE.)
-c---------------------------------------------------------------------
-c  Set at m=1024, can handle cases up to 1024^3 case
-c---------------------------------------------------------------------
-      integer m
-      parameter( m=1037 )
-
-      double precision buff(nm2,4)
-      common /buffer/ buff
-
-
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv
deleted file mode 100644
index 33ae884..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/MG_DVM/mgdv3al.fdv
+++ /dev/null
@@ -1,2564 +0,0 @@
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  2.3         !
-!                                                                         !
-!                     D V M    V E R S I O N S                            !
-!                                                                         !
-!                                   M G                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!                                                                         !
-!    This benchmark is DVM  version of the NPB MG code.                   !
-!                                                                         !
-!    Permission to use, copy, distribute and modify this software         !
-!    for any purpose with or without fee is hereby granted.  We           !
-!    request, however, that all derived work reference the NAS            !
-!    Parallel Benchmarks 2.3. This software is provided "as is"           !
-!    without express or implied warranty.                                 !
-!                                                                         !
-!    Information on NPB 2.3, including the technical report, the          !
-!    original specifications, source code, results and information        !
-!    on how to submit new results, is available at:                       !
-!                                                                         !
-!           http://www.nas.nasa.gov/NAS/NPB/                              !
-!                                                                         !
-!    Send comments or suggestions to  npb@nas.nasa.gov                    !
-!    Send bug reports to              npb-bugs@nas.nasa.gov               !
-!                                                                         !
-!          NAS Parallel Benchmarks Group                                  !
-!          NASA Ames Research Center                                      !
-!          Mail Stop: T27A-1                                              !
-!          Moffett Field, CA   94035-1000                                 !
-!                                                                         !
-!          E-mail:  npb@nas.nasa.gov                                      !
-!          Fax:     (415) 604-3957                                        !
-!                                                                         !
-!-------------------------------------------------------------------------!
-
-
-c---------------------------------------------------------------------
-c
-c Authors: E. Barszcz
-c          P. Frederickson
-c          A. Woo
-c          M. Yarrow
-c
-c---------------------------------------------------------------------
-
-
-c---------------------------------------------------------------------
-      program mgdv3
-c---------------------------------------------------------------------
-
-      implicit none
-
-      include 'globals.h'
-
-c---------------------------------------------------------------------------c
-c k is the current level. It is passed down through subroutine args
-c and is NOT global. it is the current iteration
-c---------------------------------------------------------------------------c
-
-      integer k, it
-      
-      external timer_read
-      double precision t, tinit, mflops, timer_read
-
-c---------------------------------------------------------------------------c
-c These arrays are in common because they are quite large
-c and probably shouldn't be allocated on the stack. They
-c are always passed as subroutine args. 
-c---------------------------------------------------------------------------c
-
-!!      double precision u(nr),v(nv),r(nr)
-        double precision a(0:3),c(0:3)
-!!      common /noautom/ u,v,r   
-!!CDVM$ HEAP u,v,r
-      double precision rnm2, rnmu, old2, oldu, epsilon
-      integer n1, n2, n3, nn, nit
-      double precision verify_value
-      logical verified
-
-      integer ierr,i, fstatus
-      integer T_bench, T_init
-      parameter (T_bench=1, T_init=2)
-c---------------------------------------------------------------------------c
-      include 'dvmvar.h'
-c---------------------------------------------------------------------------c
-
-      call timer_clear(T_bench)
-      call timer_clear(T_init)
-
-
-      call timer_start(T_init)
-      
-
-c---------------------------------------------------------------------
-c Read in and broadcast input data
-c---------------------------------------------------------------------
-
-      write (*, 1000) 
-
-      open(unit=7,file='mg.input', status='old', iostat=fstatus)
-      if (fstatus .eq. 0) then
-         write(*,50) 
- 50      format(' Reading from input file mg.input')
-         read(7,*) lt
-         read(7,*) nx(lt), ny(lt), nz(lt)
-         read(7,*) nit
-         read(7,*) (debug_vec(i),i=0,7)
-      else
-         write(*,51) 
- 51      format(' No input file. Using compiled defaults ')
-         lt = lt_default
-         nit = nit_default
-         nx(lt) = nx_default
-         ny(lt) = ny_default
-         nz(lt) = nz_default
-         do i = 0,7
-            debug_vec(i) = debug_default
-         end do
-      endif
-
-
-      if ( (nx(lt) .ne. ny(lt)) .or. (nx(lt) .ne. nz(lt)) ) then
-         Class = 'U' 
-      else if( nx(lt) .eq. 32 .and. nit .eq. 4 ) then
-         Class = 'S'
-      else if( nx(lt) .eq. 64 .and. nit .eq. 40 ) then
-         Class = 'W'
-      else if( nx(lt) .eq. 256 .and. nit .eq. 20 ) then
-         Class = 'B'
-      else if( nx(lt) .eq. 512 .and. nit .eq. 20 ) then  
-         Class = 'C'
-      else if( nx(lt) .eq. 256 .and. nit .eq. 4 ) then  
-         Class = 'A'
-      else
-         Class = 'U'
-      endif
-
-c---------------------------------------------------------------------
-c  Use these for debug info:
-c---------------------------------------------------------------------
-c     debug_vec(0) = 1 !=> report all norms
-c     debug_vec(1) = 1 !=> some setup information
-c     debug_vec(1) = 2 !=> more setup information
-c     debug_vec(2) = k => at level k or below, show result of resid
-c     debug_vec(3) = k => at level k or below, show result of psinv
-c     debug_vec(4) = k => at level k or below, show result of rprj
-c     debug_vec(5) = k => at level k or below, show result of interp
-c     debug_vec(6) = 1 => (unused)
-c     debug_vec(7) = 1 => (unused)
-c---------------------------------------------------------------------
-      a(0) = -8.0D0/3.0D0 
-      a(1) =  0.0D0 
-      a(2) =  1.0D0/6.0D0 
-      a(3) =  1.0D0/12.0D0
-      
-      if(Class .eq. 'A' .or. Class .eq. 'S'.or. Class .eq.'W') then
-c---------------------------------------------------------------------
-c     Coefficients for the S(a) smoother
-c---------------------------------------------------------------------
-         c(0) =  -3.0D0/8.0D0
-         c(1) =  +1.0D0/32.0D0
-         c(2) =  -1.0D0/64.0D0
-         c(3) =   0.0D0
-      else
-c---------------------------------------------------------------------
-c     Coefficients for the S(b) smoother
-c---------------------------------------------------------------------
-         c(0) =  -3.0D0/17.0D0
-         c(1) =  +1.0D0/33.0D0
-         c(2) =  -1.0D0/61.0D0
-         c(3) =   0.0D0
-      endif
-      lb = 1
-      k  = lt
-
-      call setup(n1,n2,n3,k)
-      call setdvm()
-
-      call zero3(pu(lt)%p,n1,n2,n3)
-   
-      call zran3(pv,n1,n2,n3,nx(lt),ny(lt),k)
-
-      call norm2u3(pv,n1,n2,n3,rnm2,rnmu,nx(lt),ny(lt),nz(lt))
-c      write(*,*)
-c      write(*,*)' norms of random v are'
-c      write(*,600) 0, rnm2, rnmu
-c      write(*,*)' about to evaluate resid, k=',k
-
-      write (*, 1001) nx(lt),ny(lt),nz(lt), Class
-      write (*, 1002) nit
-
- 1000 format(//,' NAS Parallel Benchmarks 2.3- DVM version',
-     >          ' - MG Benchmark', /)
- 1001 format(' Size: ', i3, 'x', i3, 'x', i3, '  (class ', A, ')' )
- 1002 format(' Iterations: ', i3)
-
-
-      if(psize(1).ne.1) then
-        call resid(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-      else
-        call residd2(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-      endif
-      call norm2u3(pr(lt)%p,n1,n2,n3,rnm2,rnmu,nx(lt),ny(lt),nz(lt))
-      old2 = rnm2
-      oldu = rnmu
-
-c---------------------------------------------------------------------
-c     One iteration for startup
-c---------------------------------------------------------------------
-      call mg3P(a,c,n1,n2,n3,k)
-      
-      if(psize(1).ne.1) then
-        call resid(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-      else
-        call residd2(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-      endif
-
-
-C      call setup(n1,n2,n3,k)
-      call zero3(pu(lt)%p,n1,n2,n3)
-
-      call zran3(pv,n1,n2,n3,nx(lt),ny(lt),k)
-
-      call timer_stop(T_init)
-      call timer_start(T_bench)
-
-CDVM$ INTERVAL 1
-
-      if(psize(1).ne.1) then
-        call resid(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-      else
-        call residd2(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-      endif
-      call norm2u3(pr(lt)%p,n1,n2,n3,rnm2,rnmu,nx(lt),ny(lt),nz(lt))
-      old2 = rnm2
-      oldu = rnmu
-
-      do  it=1,nit
-         call mg3P(a,c,n1,n2,n3,k)
-         
-         if(psize(1).ne.1) then
-           call resid(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-         else
-           call residd2(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-         endif
-       
-      enddo
-      call norm2u3(pr(lt)%p,n1,n2,n3,rnm2,rnmu,nx(lt),ny(lt),nz(lt))
-CDVM$ END INTERVAL
-      call timer_stop(T_bench)
-      t = timer_read(T_bench)
-      tinit = timer_read(T_init)
-      verified = .FALSE.
-      verify_value = 0.0
-
-      write( *,'(/A,F15.3,A/)' ) 
-     >     ' Initialization time: ',tinit, ' seconds'
-      write(*,100)
- 100  format(' Benchmark completed ')
-
-      epsilon = 1.d-8
-      if (Class .ne. 'U') then
-         if(Class.eq.'S') then
-            verify_value = 0.530770700573d-04
-         elseif(Class.eq.'W') then
-            verify_value = 0.250391406439E-17 ! 40 iterations
-!				0.183103168997d-044 iterations
-         elseif(Class.eq.'A') then
-            verify_value = 0.2433365309d-5
-         elseif(Class.eq.'B') then
-            verify_value = 0.180056440132d-5
-         elseif(Class.eq.'C') then
-            verify_value = 0.570674826298d-06
-         endif
-
-         if( abs( rnm2 - verify_value ) .le. epsilon ) then
-            verified = .TRUE.
-            write(*, 200)
-            write(*, 201) rnm2
-            write(*, 202) rnm2 - verify_value
- 200        format(' VERIFICATION SUCCESSFUL ')
- 201        format(' L2 Norm is ', E20.12)
- 202        format(' Error is   ', E20.12)
-         else
-            verified = .FALSE.
-            write(*, 300) 
-            write(*, 301) rnm2
-            write(*, 302) verify_value
- 300        format(' VERIFICATION FAILED')
- 301        format(' L2 Norm is             ', E20.12)
- 302        format(' The correct L2 Norm is ', E20.12)
-         endif
-      else
-         verified = .FALSE.
-         write (*, 400)
-         write (*, 401)
- 400     format(' Problem size unknown')
- 401     format(' NO VERIFICATION PERFORMED')
-      endif
-
-      nn = nx(lt)*ny(lt)*nz(lt)
-
-      if( t .ne. 0. ) then
-         mflops = 58.*nit*nn*1.0D-6 /t
-      else
-         mflops = 0.0
-      endif
-
-      call print_results('MG', class, nx(lt), ny(lt), nz(lt), 
-     >                   nit, t,
-     >                   mflops, '          floating point', 
-     >                   verified, npbversion)
-c               , compiletime,  cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-
-
- 600  format( i4, 2e19.12)
-
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine setup(n1,n2,n3,k)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      implicit none  
-
-      include 'globals.h'
-
-      integer  is1, is2, is3, ie1, ie2, ie3
-      common /grid/ is1,is2,is3,ie1,ie2,ie3
-
-      integer n1,n2,n3,k
-      integer d, i, j
-      integer ax
-      integer ng(3,10)
-      integer s, dir,ierr
-
-
-      ng(1,lt) = nx(lt)
-      ng(2,lt) = ny(lt)
-      ng(3,lt) = nz(lt)
-      do  ax=1,3
-         do  k=lt-1,1,-1
-            ng(ax,k) = ng(ax,k+1)/2
-         enddo
-      enddo
- 61   format(10i4)
-      do  k=lt,1,-1
-         nx(k) = ng(1,k)
-         ny(k) = ng(2,k)
-         nz(k) = ng(3,k)
-      enddo
-
-      do  k = lt,1,-1
-         do  ax = 1,3
-            mi(ax,k) = 2 + ng(ax,k) 
-         enddo
-
-         m1(k) = mi(1,k)
-         m2(k) = mi(2,k)
-         m3(k) = mi(3,k)
-
-      enddo
-
-       
-      k = lt
-      is1 = 2 + ng(1,k) - ng(1,lt)
-      ie1 = 1 + ng(1,k)
-      n1 = 3 + ie1 - is1
-      is2 = 2 + ng(2,k) - ng(2,lt)
-      ie2 = 1 + ng(2,k) 
-      n2 = 3 + ie2 - is2
-      is3 = 2 + ng(3,k) - ng(3,lt)
-      ie3 = 1 + ng(3,k) 
-      n3 = 3 + ie3 - is3
-
-
-
-c--------------------------------------------------------------------- 
-      ir(lt)=1 
-
-      do  j = lt-1, 1, -1
-         ir(j)=ir(j+1)+m1(j+1)*m2(j+1)*m3(j+1)
-      enddo
-c---------------------------------------------------------------------
-
-      if( debug_vec(1) .ge. 1 )then
-         write(*,*)' in setup, '
-         write(*,*)' k  lt  nx  ny  nz ',
-     >        ' n1  n2  n3 is1 is2 is3 ie1 ie2 ie3'
-         write(*,9) k,lt,ng(1,k),ng(2,k),ng(3,k),
-     >              n1,n2,n3,is1,is2,is3,ie1,ie2,ie3
- 9       format(15i4)
-      endif
-
-      k = lt
-
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-       subroutine setdvm()
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      implicit none  
-
-      include 'globals.h'
-      include 'dvmvar.h'
-      integer kg1,kg2,j,i,k
-!!      double precision u(nr),v(nv),r(nr)
-!!      common /noautom/ u,v,r   
-!!CDVM$ HEAP u,v,r
-      integer PROCESSORS_SIZE,PROCESSORS_RANK
-      integer np,nsp,np1,lbdv(3)
-c      integer pdim,psize(3)
-      integer ngb(64,3),ngb1(64), ngb2(64), ngb3(64)
-      PROCESSORS_RANK() = 3
-      PROCESSORS_SIZE(i) = 1
-CDVM$ DEBUG 1 (D=0)
-      pdim = PROCESSORS_RANK()
-      if(pdim.ne.3) then
-        print *, 'PROCESSORS_RANK must be equal to 3'
-        stop
-      endif
-      do i=1,pdim
-         psize(i)=PROCESSORS_SIZE(i)
-      enddo
-      print *, 'pdim=',pdim,':',(psize(i),i=1,pdim)
-
-C     Must satisfy
-C     2**(lbdvm-1) >= NUMBER_OF_PROCESSORS()
-C     lb <= lbdvm < lt
-      do k=1,pdim
-        np=psize(k)
-        np1=psize(k)      
-        do i=1,10
-          np1=np1/2
-          if(np1.le.1) go to 100
-        enddo
-        print *,'You must decrease the number of processors'
-        stop 
-100   lbdv(k)=i+1
-      if(lbdv(k).lt.lb)  lbdv(k)=lb
-      if(lbdv(k).ge.lt) then
-      print *,'You must decrease the number of processors or 
-     > increase size of problem'
-      stop
-      endif
-c      print *, 'lbdvm=',lbdvm
-      if(np.eq.1) then
-        ngb(1,k)= 2**(lt+1)+1
-      else
-        nsp = (2**lt)/np
-        ngb(1,k) = nsp+1
-        do i=2,np-1
-          ngb(i,k)=nsp
-        enddo
-        ngb(np,k) = 2**(lt+1)-nsp*(np-1)
-      endif
-      enddo
-      lbdvm=1
-      do k=1,pdim
-         if(lbdvm .lt. lbdv(k)) lbdvm=lbdv(k)
-      enddo
-      do i=1,psize(1)
-        ngb1(i) = ngb(i,1)
-      enddo
-      if(pdim .gt.1) then
-        do i=1,psize(2)
-          ngb2(i) = ngb(i,2)
-        enddo
-      endif
-      if(pdim .gt.2) then
-        do i=1,psize(3)
-          ngb3(i) = ngb(i,3)
-        enddo
-      endif
-CDVM$ ENDDEBUG 1
-
-c      print *, (ngb1(i),i=1,psize(1)) 
-c      print *, (ngb2(i),i=1,psize(2))  
-c      print *, (ngb3(i),i=1,psize(3))  
-      
-      if(pdim .eq.1) then
-CDVM$ REDISTRIBUTE tmp(*,*,GEN_BLOCK(ngb1))
-      else if(pdim .eq.2) then
-CDVM$ REDISTRIBUTE tmp(*,GEN_BLOCK(ngb1),GEN_BLOCK(ngb2))
-      else
-CDVM$ REDISTRIBUTE tmp(GEN_BLOCK(ngb1),GEN_BLOCK(ngb2),GEN_BLOCK(ngb3))
-      endif 
-      ALLOCATE(pv(mi(1,lt),mi(2,lt),mi(3,lt)))
-      ALLOCATE(pr(lt)%p(mi(1,lt),mi(2,lt),mi(3,lt)))
-      ALLOCATE(pu(lt)%p(mi(1,lt),mi(2,lt),mi(3,lt)))
-!!      pv1 => pu1
-!      pr(lt)%p=>pr1
-!      pu(lt)%p=>pu1
-      do  j = lt-1, 1, -1
-         ALLOCATE(pr(j)%p(mi(1,j),mi(2,j),mi(3,j))) 
-                      ! pr(j) = ALLOCATE(pr(j)   mi(1,j),r,ir(j))
-         ALLOCATE(pu(j)%p(mi(1,j),mi(2,j),mi(3,j))) 
-                      !pu(j) = ALLOCATE(mi(1,j),u,ir(j))         
-         if(j.eq.lbdvm) then
-          ALLOCATE(pus1(mi(1,j),mi(2,j),mi(3,j)))  !pus1 = ALLOCATE(mi(1,j),u,ir(j))
-         endif
-         if(j.eq.lbdvm-1) then
-           ALLOCATE(pus(mi(1,j),mi(2,j),mi(3,j))) !pus = ALLOCATE(mi(1,j),u,ir(j))
-         endif
-      enddo      
-
-      kg1=1
-      kg2=0       
-      do  j = lt, 1, -1         
-         pu1 => pu(j)%p
-         if(j.ge.lbdvm) then
-CDVM$ REALIGN (i,j,k) WITH tmp(kg1*i-kg2,kg1*j-kg2,kg1*k-kg2)::pu1
-         else
-           if(proc1) then
-CDVM$ REALIGN (*,*,*) WITH tmp(2**(lt-1)+1,2**(lt-1)+1,2**(lt-1)+1)
-CDVM$*                                :: pu1
-           else
-CDVM$ REALIGN (*,*,*) WITH tmp(*,*,*) :: pu1
-           endif
-         endif
-         pu(j)%p => pu1
-         kg1 = kg1*2
-         kg2 = kg1-1
-      enddo
-
-CDVM$ REALIGN (i,j,k) WITH tmp(i,j,k):: pv
-
-      kg1=1
-      kg2=0       
-      do  j = lt, 1, -1         
-         pr1 => pr(j)%p
-         if(j.ge.lbdvm) then
-CDVM$ REALIGN (i,j,k) WITH tmp(kg1*i-kg2,kg1*j-kg2,kg1*k-kg2)::pr1
-         else
-           if(proc1) then
-CDVM$ REALIGN (*,*,*) WITH tmp(2**(lt-1)+1,2**(lt-1)+1,2**(lt-1)+1)
-CDVM$*                                :: pr1
-           else
-CDVM$ REALIGN (*,*,*) WITH tmp(*,*,*) :: pr1
-           endif
-         endif
-         pr(j)%p => pr1
-         kg1 = kg1*2
-         kg2 = kg1-1
-      enddo
-
-      kg1=2
-      kg2=1       
-      do  j = lt-1, 1, -1
-         if(j.eq.lbdvm) then
-CDVM$ REALIGN (i,j,k) WITH tmp(kg1*i-kg2,kg1*j-kg2,kg1*k-kg2)::pus1 
-         endif         
-         if(j.eq.lbdvm-1) then
-CDVM$ REALIGN (i,j,k) WITH tmp(kg1*i-kg2,kg1*j-kg2,kg1*k-kg2)::pus
-         endif
-         kg1 = kg1*2
-         kg2 = kg1-1
-      enddo
-      
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine mg3P(a,c,n1,n2,n3,k)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     multigrid V-cycle routine
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-      include 'dvmvar.h'
-      integer n1, n2, n3, k
-!!      double precision u(nr),v(nv),r(nr)
-      double precision a(0:3),c(0:3)
-!!      common /noautom/ u,v,r   
-!!CDVM$ HEAP u,v,r
-      integer j
-
-c---------------------------------------------------------------------
-c     down cycle.
-c     restrict the residual from the find grid to the coarse
-c---------------------------------------------------------------------
-
-      do  k= lt, lb+1 , -1
-         j = k-1        
-         if(psize(1).ne.1) then
-           call rprj3(pr(k)%p,m1(k),m2(k),m3(k),
-     >        pr(j)%p,m1(j),m2(j),m3(j),k,pus,pu(lb)%p,
-     >        mi(1,lb),mi(2,lb),mi(3,lb))
-         else
-           call rprj3d2(pr(k)%p,m1(k),m2(k),m3(k),
-     >        pr(j)%p,m1(j),m2(j),m3(j),k,pus,pu(lb)%p,
-     >        mi(1,lb),mi(2,lb),mi(3,lb))
-         endif
-      enddo
-
-      k = lb
-c---------------------------------------------------------------------
-c     compute an approximate solution on the coarsest grid
-c---------------------------------------------------------------------
-      call zero3(pu(k)%p,m1(k),m2(k),m3(k))
-     
-      if(psize(1).ne.1) then
-        call psinv(pr(k)%p,pu(k)%p,m1(k),m2(k),m3(k),c,k)
-      else
-        call psinvd2(pr(k)%p,pu(k)%p,m1(k),m2(k),m3(k),c,k)
-      endif
-      do  k = lb+1, lt-1     
-          j = k-1
-   
-c---------------------------------------------------------------------
-c        prolongate from level k-1  to k
-c---------------------------------------------------------------------
-         if(k.ne.lbdvm .or..not.proc1)
-     >     call zero3(pu(k)%p,m1(k),m2(k),m3(k))
-   
-         if(psize(1).ne.1) then
-           call interp(pu(j)%p,m1(j),m2(j),m3(j),
-     >               pu(k)%p,m1(k),m2(k),m3(k),k,pus1,pu(lb)%p,
-     >                                  mi(1,lb),mi(2,lb),mi(3,lb))
-
-c---------------------------------------------------------------------
-c          compute residual for level k
-c---------------------------------------------------------------------
-           call resid(pu(k)%p,pr(k)%p,pr(k)%p,m1(k),m2(k),m3(k),a,k)
-c---------------------------------------------------------------------
-c          apply smoother
-c---------------------------------------------------------------------
-           call psinv(pr(k)%p,pu(k)%p,m1(k),m2(k),m3(k),c,k)
-         else
-           call interpd2(pu(j)%p,m1(j),m2(j),m3(j),
-     >               pu(k)%p,m1(k),m2(k),m3(k),k,pus1,pu(lb)%p,
-     >                                  mi(1,lb),mi(2,lb),mi(3,lb))
-           call residd2(pu(k)%p,pr(k)%p,pr(k)%p,m1(k),m2(k),m3(k),
-     >                                  a,k)
-           call psinvd2(pr(k)%p,pu(k)%p,m1(k),m2(k),m3(k),c,k)
-         endif
-
-      enddo
- 200  continue
-      j = lt - 1
-      k = lt
-      if(psize(1).ne.1) then
-        call interp(pu(j)%p,m1(j),m2(j),m3(j),pu(lt)%p,n1,n2,n3,k,
-     >            pus1,pu(lb)%p,mi(1,lb),mi(2,lb),mi(3,lb))
-        call resid(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-        call psinv(pr(lt)%p,pu(lt)%p,n1,n2,n3,c,k)
-      else
-        call interpd2(pu(j)%p,m1(j),m2(j),m3(j),pu(lt)%p,n1,n2,n3,k,
-     >            pus1,pu(lb)%p,mi(1,lb),mi(2,lb),mi(3,lb))
-      
-        call residd2(pu(lt)%p,pv,pr(lt)%p,n1,n2,n3,a,k)
-        call psinvd2(pr(lt)%p,pu(lt)%p,n1,n2,n3,c,k)
-      endif
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine psinv( r,u,n1,n2,n3,c,k)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     psinv applies an approximate inverse as smoother:  u = u + Cr
-c
-c     This  implementation costs  15A + 4M per result, where
-c     A and M denote the costs of Addition and Multiplication.  
-c     Presuming coefficient c(3) is zero (the NPB assumes this,
-c     but it is thus not a general case), 2A + 1M may be eliminated,
-c     resulting in 13A + 3M.
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-
-      integer n1,n2,n3,k
-      double precision u(n1,n2,n3),r(n1,n2,n3),c(0:3)
-      integer i3, i2, i1
-CDVM$ INHERIT r,u
-      double precision r1(m), r2(m)
-CDVM$ SHADOW_GROUP gr(r(CORNER))
-CDVM$ SHADOW_START gr   
-CDVM$ PARALLEL (i3,i2,i1) ON u(i1,i2,i3), SHADOW_WAIT gr        
-      do i3=2,n3-1
-         do i2=2,n2-1
-            do i1=2,n1-1
-               u(i1,i2,i3) = u(i1,i2,i3)
-     >                     + c(0) * r(i1,i2,i3)
-     >                     + c(1) * ( r(i1-1,i2,i3) + r(i1+1,i2,i3)
-     >                     + r(i1,i2-1,i3) + r(i1,i2+1,i3)
-     >                + r(i1,i2,i3-1) + r(i1,i2,i3+1) )
-     >                     + c(2) * (r(i1,i2-1,i3-1) + r(i1,i2+1,i3-1)
-     >                + r(i1,i2-1,i3+1) + r(i1,i2+1,i3+1)  
-     >                + r(i1-1,i2-1,i3) + r(i1-1,i2+1,i3)
-     >                + r(i1-1,i2,i3-1) + r(i1-1,i2,i3+1) 
-     >                + r(i1+1,i2-1,i3) + r(i1+1,i2+1,i3)
-     >                + r(i1+1,i2,i3-1) + r(i1+1,i2,i3+1) )
-c---------------------------------------------------------------------
-c  Assume c(3) = 0    (Enable line below if c(3) not= 0)
-c---------------------------------------------------------------------
-c    >                     + c(3) * ( r2(i1-1) + r2(i1+1) )
-c---------------------------------------------------------------------
-            enddo
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c     exchange boundary points
-c---------------------------------------------------------------------
-      call comm3(u,n1,n2,n3,k)
-
-      if( debug_vec(0) .ge. 1 )then
-         call rep_nrm(u,n1,n2,n3,'   psinv',k)
-      endif
-
-      if( debug_vec(3) .ge. k )then
-         call showall(u,n1,n2,n3)
-      endif
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine psinvd2( r,u,n1,n2,n3,c,k)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     psinv applies an approximate inverse as smoother:  u = u + Cr
-c
-c     This  implementation costs  15A + 4M per result, where
-c     A and M denote the costs of Addition and Multiplication.  
-c     Presuming coefficient c(3) is zero (the NPB assumes this,
-c     but it is thus not a general case), 2A + 1M may be eliminated,
-c     resulting in 13A + 3M.
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-
-      integer n1,n2,n3,k
-      double precision u(n1,n2,n3),r(n1,n2,n3),c(0:3)
-      integer i3, i2, i1
-CDVM$ INHERIT r,u
-      double precision r1(m), r2(m)
-CDVM$ SHADOW_GROUP gr(r(CORNER))
-CDVM$ SHADOW_START gr   
-CDVM$ PARALLEL (i3,i2) ON u(*,i2,i3), SHADOW_WAIT gr        
-      do i3=2,n3-1
-         do i2=2,n2-1
-            do i1=1,n1
-               r1(i1) = r(i1,i2-1,i3) + r(i1,i2+1,i3)
-     >                + r(i1,i2,i3-1) + r(i1,i2,i3+1)
-               r2(i1) = r(i1,i2-1,i3-1) + r(i1,i2+1,i3-1)
-     >                + r(i1,i2-1,i3+1) + r(i1,i2+1,i3+1)
-            enddo
-            do i1=2,n1-1
-               u(i1,i2,i3) = u(i1,i2,i3)
-     >                     + c(0) * r(i1,i2,i3)
-     >                     + c(1) * ( r(i1-1,i2,i3) + r(i1+1,i2,i3)
-     >                              + r1(i1) )
-     >                     + c(2) * ( r2(i1) + r1(i1-1) + r1(i1+1) )
-c---------------------------------------------------------------------
-c  Assume c(3) = 0    (Enable line below if c(3) not= 0)
-c---------------------------------------------------------------------
-c    >                     + c(3) * ( r2(i1-1) + r2(i1+1) )
-c---------------------------------------------------------------------
-            enddo
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c     exchange boundary points
-c---------------------------------------------------------------------
-      call comm3(u,n1,n2,n3,k)
-
-      if( debug_vec(0) .ge. 1 )then
-         call rep_nrm(u,n1,n2,n3,'   psinv',k)
-      endif
-
-      if( debug_vec(3) .ge. k )then
-         call showall(u,n1,n2,n3)
-      endif
-
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine resid( u,v,r,n1,n2,n3,a,k )
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     resid computes the residual:  r = v - Au
-c
-c     This  implementation costs  15A + 4M per result, where
-c     A and M denote the costs of Addition (or Subtraction) and 
-c     Multiplication, respectively. 
-c     Presuming coefficient a(1) is zero (the NPB assumes this,
-c     but it is thus not a general case), 3A + 1M may be eliminated,
-c     resulting in 12A + 3M.
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-CDVM$ INHERIT u,v,r     
-      integer n1,n2,n3,k
-      double precision u(n1,n2,n3),v(n1,n2,n3),r(n1,n2,n3),a(0:3)
-      integer i3, i2, i1
-      double precision u1(m), u2(m)
-CDVM$ SHADOW_GROUP gu(u(CORNER))
-CDVM$ SHADOW_START gu
-C DVM$ SHADOW_WAIT gu  
-CDVM$ PARALLEL (i3,i2,i1) ON r(i1,i2,i3), SHADOW_WAIT gu   
-      do i3=2,n3-1
-         do i2=2,n2-1
-            do i1=2,n1-1
-               r(i1,i2,i3) = v(i1,i2,i3)
-     >                     - a(0) * u(i1,i2,i3)
-c---------------------------------------------------------------------
-c  Assume a(1) = 0      (Enable 2 lines below if a(1) not= 0)
-c---------------------------------------------------------------------
-c    >                     - a(1) * ( u(i1-1,i2,i3) + u(i1+1,i2,i3)
-c    >                              + u1(i1) )
-c---------------------------------------------------------------------
-     >                     - a(2) * (u(i1,i2-1,i3-1) + u(i1,i2+1,i3-1)
-     >                     + u(i1,i2-1,i3+1) + u(i1,i2+1,i3+1) 
-     >                     + u(i1-1,i2-1,i3) + u(i1-1,i2+1,i3)
-     >                     + u(i1-1,i2,i3-1) + u(i1-1,i2,i3+1) 
-     >                     + u(i1+1,i2-1,i3) + u(i1+1,i2+1,i3)
-     >                     + u(i1+1,i2,i3-1) + u(i1+1,i2,i3+1) )
-     >                     - a(3) * (u(i1-1,i2-1,i3-1) 
-     >                     + u(i1-1,i2+1,i3-1)
-     >                     + u(i1-1,i2-1,i3+1) + u(i1-1,i2+1,i3+1) 
-     >                     + u(i1+1,i2-1,i3-1) + u(i1+1,i2+1,i3-1)
-     >                     + u(i1+1,i2-1,i3+1) + u(i1+1,i2+1,i3+1) )
-            enddo
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c     exchange boundary data
-c---------------------------------------------------------------------
-      call comm3(r,n1,n2,n3,k)
-
-      if( debug_vec(0) .ge. 1 )then
-         call rep_nrm(r,n1,n2,n3,'   resid',k)
-      endif
-
-      if( debug_vec(2) .ge. k )then
-         call showall(r,n1,n2,n3)
-      endif
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine residd2( u,v,r,n1,n2,n3,a,k )
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     resid computes the residual:  r = v - Au
-c
-c     This  implementation costs  15A + 4M per result, where
-c     A and M denote the costs of Addition (or Subtraction) and 
-c     Multiplication, respectively. 
-c     Presuming coefficient a(1) is zero (the NPB assumes this,
-c     but it is thus not a general case), 3A + 1M may be eliminated,
-c     resulting in 12A + 3M.
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-CDVM$ INHERIT u,v,r     
-      integer n1,n2,n3,k
-      double precision u(n1,n2,n3),v(n1,n2,n3),r(n1,n2,n3),a(0:3)
-      integer i3, i2, i1
-      double precision u1(m), u2(m)
-CDVM$ SHADOW_GROUP gu(u(CORNER))
-CDVM$ SHADOW_START gu
-C DVM$ SHADOW_WAIT gu  
-CDVM$ PARALLEL (i3,i2) ON r(*,i2,i3), SHADOW_WAIT gu   
-      do i3=2,n3-1
-         do i2=2,n2-1
-            do i1=1,n1
-               u1(i1) = u(i1,i2-1,i3) + u(i1,i2+1,i3)
-     >                + u(i1,i2,i3-1) + u(i1,i2,i3+1)
-               u2(i1) = u(i1,i2-1,i3-1) + u(i1,i2+1,i3-1)
-     >                + u(i1,i2-1,i3+1) + u(i1,i2+1,i3+1)
-            enddo
-            do i1=2,n1-1
-               r(i1,i2,i3) = v(i1,i2,i3)
-     >                     - a(0) * u(i1,i2,i3)
-c---------------------------------------------------------------------
-c  Assume a(1) = 0      (Enable 2 lines below if a(1) not= 0)
-c---------------------------------------------------------------------
-c    >                     - a(1) * ( u(i1-1,i2,i3) + u(i1+1,i2,i3)
-c    >                              + u1(i1) )
-c---------------------------------------------------------------------
-     >                     - a(2) * ( u2(i1) + u1(i1-1) + u1(i1+1) )
-     >                     - a(3) * ( u2(i1-1) + u2(i1+1) )
-            enddo
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c     exchange boundary data
-c---------------------------------------------------------------------
-      call comm3(r,n1,n2,n3,k)
-
-      if( debug_vec(0) .ge. 1 )then
-         call rep_nrm(r,n1,n2,n3,'   resid',k)
-      endif
-
-      if( debug_vec(2) .ge. k )then
-         call showall(r,n1,n2,n3)
-      endif
-
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine rprj3( r,m1k,m2k,m3k,s,m1j,m2j,m3j,k,r1,r2,
-     >                                              m1i,m2i,m3i )
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     rprj3 projects onto the next coarser grid, 
-c     using a trilinear Finite Element projection:  s = r' = P r
-c     
-c     This  implementation costs  20A + 4M per result, where
-c     A and M denote the costs of Addition and Multiplication.  
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-CDVM$ INHERIT r,s,r1,r2
-CDVM$ DYNAMIC s
-      integer m1k, m2k, m3k, m1j, m2j, m3j,k,m1i,m2i,m3i
-      double precision r(m1k,m2k,m3k), s(m1j,m2j,m3j),r1(m1j,m2j,m3j)
-      double precision r2(m1i,m2i,m3i) 
-      integer j3, j2, j1, i3, i2, i1, d1, d2, d3, j
-
-      double precision x1(m), y1(m), x2,y2
-      
-      if(k.eq.lbdvm) then
-CDVM$ NEW_VALUE
-CDVM$ REALIGN s(i,j,k) WITH r1(i,j,k)
-      endif
-      if(m1k.eq.3)then
-        d1 = 2
-      else
-        d1 = 1
-      endif
-
-      if(m2k.eq.3)then
-        d2 = 2
-      else
-        d2 = 1
-      endif
-
-      if(m3k.eq.3)then
-        d3 = 2
-      else
-        d3 = 1
-      endif
- 
-CDVM$ SHADOW_GROUP gr(r(CORNER))
-CDVM$ SHADOW_START gr               
-CDVM$ PARALLEL (j3,j2,j1) ON s(j1,j2,j3), SHADOW_WAIT gr   
-      do  j3=2,m3j-1
-         do  j2=2,m2j-1
-            do  j1=2,m1j-1
-              i3 = 2*j3-d3
-              i2 = 2*j2-d2
-
-              i1 = 2*j1-d1
-
-              y2 = r(i1,  i2-1,i3-1) + r(i1,  i2-1,i3+1)
-     >           + r(i1,  i2+1,i3-1) + r(i1,  i2+1,i3+1)
-              x2 = r(i1,  i2-1,i3  ) + r(i1,  i2+1,i3  )
-     >           + r(i1,  i2,  i3-1) + r(i1,  i2,  i3+1)
-              s(j1,j2,j3) =
-     >               0.5D0 * r(i1,i2,i3)
-     >             + 0.25D0 * ( r(i1-1,i2,i3) + r(i1+1,i2,i3) + x2)
-     >             + 0.125D0 * ( r(i1-1,i2-1,i3  ) + r(i1-1,i2+1,i3 )
-     >             + r(i1-1,i2,  i3-1) + r(i1-1,i2,  i3+1) 
-     >             + r(i1+1,i2-1,i3  ) + r(i1+1,i2+1,i3  )
-     >             + r(i1+1,i2,  i3-1) + r(i1+1,i2,  i3+1) + y2)
-     >             + 0.0625D0 * (r(i1-1,i2-1,i3-1) + r(i1-1,i2-1,i3+1)
-     >             + r(i1-1,i2+1,i3-1) + r(i1-1,i2+1,i3+1)
-     >             + r(i1+1,i2-1,i3-1) + r(i1+1,i2-1,i3+1)
-     >             + r(i1+1,i2+1,i3-1) + r(i1+1,i2+1,i3+1) )
-            enddo
-
-         enddo
-      enddo
-
-
-      j = k-1
-
-      call comm3(s,m1j,m2j,m3j,j)
-
-      if(k.eq.lbdvm) then
-      if(proc1) then
-CDVM$ REALIGN s(*,*,*) WITH r2(*,*,*)
-      else
-CDVM$ REALIGN s(*,*,*) WITH r1(*,*,*)
-      endif
-      endif
-
-      if( debug_vec(0) .ge. 1 )then
-         call rep_nrm(s,m1j,m2j,m3j,'   rprj3',k-1)
-      endif
-      if( debug_vec(4) .ge. k )then
-         call showall(s,m1j,m2j,m3j)
-      endif
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine rprj3d2( r,m1k,m2k,m3k,s,m1j,m2j,m3j,k,r1,r2,
-     >                                              m1i,m2i,m3i )
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     rprj3 projects onto the next coarser grid, 
-c     using a trilinear Finite Element projection:  s = r' = P r
-c     
-c     This  implementation costs  20A + 4M per result, where
-c     A and M denote the costs of Addition and Multiplication.  
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-CDVM$ INHERIT r,s,r1,r2
-CDVM$ DYNAMIC s
-      integer m1k, m2k, m3k, m1j, m2j, m3j,k,m1i,m2i,m3i
-      double precision r(m1k,m2k,m3k), s(m1j,m2j,m3j),r1(m1j,m2j,m3j)
-      double precision r2(m1i,m2i,m3i) 
-      integer j3, j2, j1, i3, i2, i1, d1, d2, d3, j
-
-      double precision x1(m), y1(m), x2,y2
-      
-      if(k.eq.lbdvm) then
-CDVM$ NEW_VALUE
-CDVM$ REALIGN s(i,j,k) WITH r1(i,j,k)
-      endif
-      if(m1k.eq.3)then
-        d1 = 2
-      else
-        d1 = 1
-      endif
-
-      if(m2k.eq.3)then
-        d2 = 2
-      else
-        d2 = 1
-      endif
-
-      if(m3k.eq.3)then
-        d3 = 2
-      else
-        d3 = 1
-      endif
- 
-CDVM$ SHADOW_GROUP gr(r(CORNER))
-CDVM$ SHADOW_START gr               
-CDVM$ PARALLEL (j3,j2) ON s(*,j2,j3), SHADOW_WAIT gr   
-      do  j3=2,m3j-1
-         do  j2=2,m2j-1
-            i3 = 2*j3-d3
-            i2 = 2*j2-d2
-
-            do j1=2,m1j
-              i1 = 2*j1-d1
-              x1(i1-1) = r(i1-1,i2-1,i3  ) + r(i1-1,i2+1,i3  )
-     >                 + r(i1-1,i2,  i3-1) + r(i1-1,i2,  i3+1)
-              y1(i1-1) = r(i1-1,i2-1,i3-1) + r(i1-1,i2-1,i3+1)
-     >                 + r(i1-1,i2+1,i3-1) + r(i1-1,i2+1,i3+1)
-            enddo
-
-            do  j1=2,m1j-1
-              i1 = 2*j1-d1
-              y2 = r(i1,  i2-1,i3-1) + r(i1,  i2-1,i3+1)
-     >           + r(i1,  i2+1,i3-1) + r(i1,  i2+1,i3+1)
-              x2 = r(i1,  i2-1,i3  ) + r(i1,  i2+1,i3  )
-     >           + r(i1,  i2,  i3-1) + r(i1,  i2,  i3+1)
-              s(j1,j2,j3) =
-     >               0.5D0 * r(i1,i2,i3)
-     >             + 0.25D0 * ( r(i1-1,i2,i3) + r(i1+1,i2,i3) + x2)
-     >             + 0.125D0 * ( x1(i1-1) + x1(i1+1) + y2)
-     >             + 0.0625D0 * ( y1(i1-1) + y1(i1+1) )
-            enddo
-
-         enddo
-      enddo
-
-
-      j = k-1
-
-      call comm3(s,m1j,m2j,m3j,j)
-
-      if(k.eq.lbdvm) then
-      if(proc1) then
-CDVM$ REALIGN s(*,*,*) WITH r2(*,*,*)
-      else
-CDVM$ REALIGN s(*,*,*) WITH r1(*,*,*)
-      endif
-      endif
-
-      if( debug_vec(0) .ge. 1 )then
-         call rep_nrm(s,m1j,m2j,m3j,'   rprj3',k-1)
-      endif
-      if( debug_vec(4) .ge. k )then
-         call showall(s,m1j,m2j,m3j)
-      endif
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine interp( z,mm1,mm2,mm3,u,n1,n2,n3,k,u1,u2,
-     >                                              m1i,m2i,m3i)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     interp adds the trilinear interpolation of the correction
-c     from the coarser grid to the current approximation:  u = u + Qu'
-c     
-c     Observe that this  implementation costs  16A + 4M, where
-c     A and M denote the costs of Addition and Multiplication.  
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  Vector machines may get slightly better 
-c     performance however, with 8 separate "do i1" loops, rather than 4.
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-
-      integer mm1, mm2, mm3, n1, n2, n3,k,m1i,m2i,m3i
-      double precision z(mm1,mm2,mm3),u(n1,n2,n3),u1(n1,n2,n3)
-      double precision u2(m1i,m2i,m3i)
-      integer i3, i2, i1, d1, d2, d3, t1, t2, t3
-
-c note that m = 1037 in globals.h but for this only need to be
-c 535 to handle up to 1024^3
-c      integer m
-c      parameter( m=535 )
-      double precision z1(m),z2(m),z3(m)
-CDVM$ INHERIT z,u,u1,u2
-CDVM$ DYNAMIC u
-      
-      if(k.eq.lbdvm .and. proc1) then
-CDVM$ NEW_VALUE
-CDVM$ REALIGN u(*,*,*) WITH u2(*,*,*)
-      call zero3(u,n1,n2,n3)    
-      endif
-
-      if( n1 .ne. 3 .and. n2 .ne. 3 .and. n3 .ne. 3 ) then
-CDVM$ SHADOW_GROUP gz(z(CORNER))
-CDVM$ SHADOW_START gz
-CDVM$ SHADOW_WAIT gz
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-1,2*i2-1,2*i3-1)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do  i1=1,mm1-1
-
-                  u(2*i1-1,2*i2-1,2*i3-1)=u(2*i1-1,2*i2-1,2*i3-1)
-     >                 +z(i1,i2,i3)
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1,2*i2-1,2*i3-1)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do  i1=1,mm1-1
-                  u(2*i1,2*i2-1,2*i3-1)=u(2*i1,2*i2-1,2*i3-1)
-     >                 +0.5d0*(z(i1+1,i2,i3)+z(i1,i2,i3))
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-1,2*i2,2*i3-1)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do i1=1,mm1-1
-                  u(2*i1-1,2*i2,2*i3-1)=u(2*i1-1,2*i2,2*i3-1)
-     >                 +0.5d0 * ( z(i1,i2+1,i3) + z(i1,i2,i3) )
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1,2*i2,2*i3-1)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do i1=1,mm1-1
-                  u(2*i1,2*i2,2*i3-1)=u(2*i1,2*i2,2*i3-1)
-     >                 +0.25d0*( z(i1,i2+1,i3) + z(i1,i2,i3) 
-     >            + z(i1+1,i2+1,i3) + z(i1+1,i2,i3) )
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-1,2*i2-1,2*i3)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do i1=1,mm1-1
-                  u(2*i1-1,2*i2-1,2*i3)=u(2*i1-1,2*i2-1,2*i3)
-     >                 +0.5d0 * ( z(i1,i2,i3+1) + z(i1,i2,i3) )
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1,2*i2-1,2*i3)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do i1=1,mm1-1
-                  u(2*i1,2*i2-1,2*i3)=u(2*i1,2*i2-1,2*i3)
-     >                 +0.25d0*( z(i1,i2,i3+1) + z(i1,i2,i3) 
-     >            + z(i1+1,i2,i3+1) + z(i1+1,i2,i3) )
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-1,2*i2,2*i3)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do i1=1,mm1-1
-                  u(2*i1-1,2*i2,2*i3)=u(2*i1-1,2*i2,2*i3)
-     >                 +0.25d0* (z(i1,i2+1,i3+1) + z(i1,i2,i3+1) 
-     >                 + z(i1,i2+1,i3) + z(i1,i2,i3)  )
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1,2*i2,2*i3)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do i1=1,mm1-1
-                  u(2*i1,2*i2,2*i3)=u(2*i1,2*i2,2*i3)
-     >                 +0.125d0*(z(i1,i2+1,i3+1) + z(i1,i2,i3+1) 
-     >                 + z(i1,i2+1,i3) + z(i1,i2,i3)   
-     >                 + z(i1+1,i2+1,i3+1) + z(i1+1,i2,i3+1) 
-     >                 + z(i1+1,i2+1,i3) + z(i1+1,i2,i3)  )
-               enddo
-            enddo
-         enddo
-
-      else
-
-         if(n1.eq.3)then
-            d1 = 2
-            t1 = 1
-         else
-            d1 = 1
-            t1 = 0
-         endif
-         
-         if(n2.eq.3)then
-            d2 = 2
-            t2 = 1
-         else
-            d2 = 1
-            t2 = 0
-         endif
-         
-         if(n3.eq.3)then
-            d3 = 2
-            t3 = 1
-         else
-            d3 = 1
-            t3 = 0
-         endif
-
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-d1,2*i2-d2,2*i3-d3)         
-         do  i3=d3,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=d1,mm1-1
-                  u(2*i1-d1,2*i2-d2,2*i3-d3)=u(2*i1-d1,2*i2-d2,2*i3-d3)
-     >                 +z(i1,i2,i3)
-               enddo
-            enddo
-         enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-t1,2*i2-d2,2*i3-d3)         
-         do  i3=d3,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=1,mm1-1
-                  u(2*i1-t1,2*i2-d2,2*i3-d3)=u(2*i1-t1,2*i2-d2,2*i3-d3)
-     >                 +0.5D0*(z(i1+1,i2,i3)+z(i1,i2,i3))
-               enddo
-            enddo
-         enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-d1,2*i2-t2,2*i3-d3)         
-         do  i3=d3,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=d1,mm1-1
-                  u(2*i1-d1,2*i2-t2,2*i3-d3)=u(2*i1-d1,2*i2-t2,2*i3-d3)
-     >                 +0.5D0*(z(i1,i2+1,i3)+z(i1,i2,i3))
-               enddo
-            enddo
-         enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-t1,2*i2-t2,2*i3-d3)         
-         do  i3=d3,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=1,mm1-1
-                  u(2*i1-t1,2*i2-t2,2*i3-d3)=u(2*i1-t1,2*i2-t2,2*i3-d3)
-     >                 +0.25D0*(z(i1+1,i2+1,i3)+z(i1+1,i2,i3)
-     >                 +z(i1,  i2+1,i3)+z(i1,  i2,i3))
-               enddo
-            enddo
-         enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-d1,2*i2-d2,2*i3-t3)
-         do  i3=1,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=d1,mm1-1
-                  u(2*i1-d1,2*i2-d2,2*i3-t3)=u(2*i1-d1,2*i2-d2,2*i3-t3)
-     >                 +0.5D0*(z(i1,i2,i3+1)+z(i1,i2,i3))
-               enddo
-            enddo
-         enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-t1,2*i2-d2,2*i3-t3)
-         do  i3=1,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=1,mm1-1
-                  u(2*i1-t1,2*i2-d2,2*i3-t3)=u(2*i1-t1,2*i2-d2,2*i3-t3)
-     >                 +0.25D0*(z(i1+1,i2,i3+1)+z(i1,i2,i3+1)
-     >                 +z(i1+1,i2,i3  )+z(i1,i2,i3  ))
-               enddo
-            enddo
-         enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-d1,2*i2-t2,2*i3-t3)
-         do  i3=1,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=d1,mm1-1
-                  u(2*i1-d1,2*i2-t2,2*i3-t3)=u(2*i1-d1,2*i2-t2,2*i3-t3)
-     >                 +0.25D0*(z(i1,i2+1,i3+1)+z(i1,i2,i3+1)
-     >                 +z(i1,i2+1,i3  )+z(i1,i2,i3  ))
-               enddo
-            enddo
-         enddo
-CDVM$ PARALLEL (i3,i2,i1) ON u(2*i1-t1,2*i2-t2,2*i3-t3)
-         do  i3=1,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=1,mm1-1
-                  u(2*i1-t1,2*i2-t2,2*i3-t3)=u(2*i1-t1,2*i2-t2,2*i3-t3)
-     >                 +0.125D0*(z(i1+1,i2+1,i3+1)+z(i1+1,i2,i3+1)
-     >                 +z(i1  ,i2+1,i3+1)+z(i1  ,i2,i3+1)
-     >                 +z(i1+1,i2+1,i3  )+z(i1+1,i2,i3  )
-     >                 +z(i1  ,i2+1,i3  )+z(i1  ,i2,i3  ))
-               enddo
-            enddo
-         enddo
-
-
-
-      endif
-
-      if(k.eq.lbdvm) then
-      if(proc1)  then
-CDVM$ REALIGN u(i,j,k) WITH u1(i,j,k)
-      endif
-      endif
-
-      if( debug_vec(0) .ge. 1 )then
-         call rep_nrm(z,mm1,mm2,mm3,'z: inter',k-1)
-         call rep_nrm(u,n1,n2,n3,'u: inter',k)
-      endif
-
-      if( debug_vec(5) .ge. k )then
-         call showall(z,mm1,mm2,mm3)
-         call showall(u,n1,n2,n3)
-      endif
-
-      return 
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine interpd2( z,mm1,mm2,mm3,u,n1,n2,n3,k,u1,u2,
-     >                                              m1i,m2i,m3i)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     interp adds the trilinear interpolation of the correction
-c     from the coarser grid to the current approximation:  u = u + Qu'
-c     
-c     Observe that this  implementation costs  16A + 4M, where
-c     A and M denote the costs of Addition and Multiplication.  
-c     Note that this vectorizes, and is also fine for cache 
-c     based machines.  Vector machines may get slightly better 
-c     performance however, with 8 separate "do i1" loops, rather than 4.
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-
-      integer mm1, mm2, mm3, n1, n2, n3,k,m1i,m2i,m3i
-      double precision z(mm1,mm2,mm3),u(n1,n2,n3),u1(n1,n2,n3)
-      double precision u2(m1i,m2i,m3i)
-      integer i3, i2, i1, d1, d2, d3, t1, t2, t3
-
-c note that m = 1037 in globals.h but for this only need to be
-c 535 to handle up to 1024^3
-c      integer m
-c      parameter( m=535 )
-      double precision z1(m),z2(m),z3(m)
-CDVM$ INHERIT z,u,u1,u2
-CDVM$ DYNAMIC u
-     
-      if(k.eq.lbdvm .and. proc1) then
-CDVM$ NEW_VALUE
-CDVM$ REALIGN u(*,*,*) WITH u2(*,*,*)
-      call zero3(u,n1,n2,n3)    
-      endif
-
-      if( n1 .ne. 3 .and. n2 .ne. 3 .and. n3 .ne. 3 ) then
-CDVM$ SHADOW_GROUP gz(z(CORNER))
-CDVM$ SHADOW_START gz
-CDVM$ SHADOW_WAIT gz
-CDVM$ PARALLEL (i3,i2) ON u(*,2*i2-1,2*i3-1)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-
-CDVM$ DEBUG 3(D=0)
-               do i1=1,mm1
-                  z1(i1) = z(i1,i2+1,i3) + z(i1,i2,i3)  
-                  z2(i1) = z(i1,i2,i3+1) + z(i1,i2,i3)
-                  z3(i1) = z(i1,i2+1,i3+1) + z(i1,i2,i3+1) + z1(i1)
-               enddo
-CDVM$ END DEBUG 3
-               do  i1=1,mm1-1
-                  u(2*i1-1,2*i2-1,2*i3-1)=u(2*i1-1,2*i2-1,2*i3-1)
-     >                 +z(i1,i2,i3)
-                  u(2*i1,2*i2-1,2*i3-1)=u(2*i1,2*i2-1,2*i3-1)
-     >                 +0.5d0*(z(i1+1,i2,i3)+z(i1,i2,i3))
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2) ON u(*,2*i2,2*i3-1)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do i1=1,mm1
-                  z1(i1) = z(i1,i2+1,i3) + z(i1,i2,i3)
-               enddo
-               do i1=1,mm1-1
-                  u(2*i1-1,2*i2,2*i3-1)=u(2*i1-1,2*i2,2*i3-1)
-     >                 +0.5d0 * z1(i1)
-                  u(2*i1,2*i2,2*i3-1)=u(2*i1,2*i2,2*i3-1)
-     >                 +0.25d0*( z1(i1) + z1(i1+1) )
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2) ON u(*,2*i2-1,2*i3)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do i1=1,mm1
-                  z2(i1) = z(i1,i2,i3+1) + z(i1,i2,i3)
-               enddo
-               do i1=1,mm1-1
-                  u(2*i1-1,2*i2-1,2*i3)=u(2*i1-1,2*i2-1,2*i3)
-     >                 +0.5d0 * z2(i1)
-                  u(2*i1,2*i2-1,2*i3)=u(2*i1,2*i2-1,2*i3)
-     >                 +0.25d0*( z2(i1) + z2(i1+1) )
-               enddo
-               enddo
-               enddo
-CDVM$ PARALLEL (i3,i2) ON u(*,2*i2,2*i3)
-         do  i3=1,mm3-1
-            do  i2=1,mm2-1
-               do i1=1,mm1
-                  z1(i1) = z(i1,i2+1,i3) + z(i1,i2,i3)  
-                  z3(i1) = z(i1,i2+1,i3+1) + z(i1,i2,i3+1) + z1(i1)
-               enddo
-
-               do i1=1,mm1-1
-                  u(2*i1-1,2*i2,2*i3)=u(2*i1-1,2*i2,2*i3)
-     >                 +0.25d0* z3(i1)
-                  u(2*i1,2*i2,2*i3)=u(2*i1,2*i2,2*i3)
-     >                 +0.125d0*( z3(i1) + z3(i1+1) )
-               enddo
-            enddo
-         enddo
-
-      else
-
-         if(n1.eq.3)then
-            d1 = 2
-            t1 = 1
-         else
-            d1 = 1
-            t1 = 0
-         endif
-         
-         if(n2.eq.3)then
-            d2 = 2
-            t2 = 1
-         else
-            d2 = 1
-            t2 = 0
-         endif
-         
-         if(n3.eq.3)then
-            d3 = 2
-            t3 = 1
-         else
-            d3 = 1
-            t3 = 0
-         endif
-CDVM$ PARALLEL (i3,i2) ON u(*,2*i2-d2,2*i3-d3)         
-         do  i3=d3,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=d1,mm1-1
-                  u(2*i1-d1,2*i2-d2,2*i3-d3)=u(2*i1-d1,2*i2-d2,2*i3-d3)
-     >                 +z(i1,i2,i3)
-               enddo
-               do  i1=1,mm1-1
-                  u(2*i1-t1,2*i2-d2,2*i3-d3)=u(2*i1-t1,2*i2-d2,2*i3-d3)
-     >                 +0.5D0*(z(i1+1,i2,i3)+z(i1,i2,i3))
-               enddo
-
-               do  i1=d1,mm1-1
-                  u(2*i1-d1,2*i2-t2,2*i3-d3)=u(2*i1-d1,2*i2-t2,2*i3-d3)
-     >                 +0.5D0*(z(i1,i2+1,i3)+z(i1,i2,i3))
-               enddo
-               do  i1=1,mm1-1
-                  u(2*i1-t1,2*i2-t2,2*i3-d3)=u(2*i1-t1,2*i2-t2,2*i3-d3)
-     >                 +0.25D0*(z(i1+1,i2+1,i3)+z(i1+1,i2,i3)
-     >                 +z(i1,  i2+1,i3)+z(i1,  i2,i3))
-               enddo
-            enddo
-         enddo
-CDVM$ PARALLEL (i3,i2) ON u(*,2*i2-d2,2*i3-t3)
-         do  i3=1,mm3-1
-            do  i2=d2,mm2-1
-               do  i1=d1,mm1-1
-                  u(2*i1-d1,2*i2-d2,2*i3-t3)=u(2*i1-d1,2*i2-d2,2*i3-t3)
-     >                 +0.5D0*(z(i1,i2,i3+1)+z(i1,i2,i3))
-               enddo
-               do  i1=1,mm1-1
-                  u(2*i1-t1,2*i2-d2,2*i3-t3)=u(2*i1-t1,2*i2-d2,2*i3-t3)
-     >                 +0.25D0*(z(i1+1,i2,i3+1)+z(i1,i2,i3+1)
-     >                 +z(i1+1,i2,i3  )+z(i1,i2,i3  ))
-               enddo
-
-               do  i1=d1,mm1-1
-                  u(2*i1-d1,2*i2-t2,2*i3-t3)=u(2*i1-d1,2*i2-t2,2*i3-t3)
-     >                 +0.25D0*(z(i1,i2+1,i3+1)+z(i1,i2,i3+1)
-     >                 +z(i1,i2+1,i3  )+z(i1,i2,i3  ))
-               enddo
-               do  i1=1,mm1-1
-                  u(2*i1-t1,2*i2-t2,2*i3-t3)=u(2*i1-t1,2*i2-t2,2*i3-t3)
-     >                 +0.125D0*(z(i1+1,i2+1,i3+1)+z(i1+1,i2,i3+1)
-     >                 +z(i1  ,i2+1,i3+1)+z(i1  ,i2,i3+1)
-     >                 +z(i1+1,i2+1,i3  )+z(i1+1,i2,i3  )
-     >                 +z(i1  ,i2+1,i3  )+z(i1  ,i2,i3  ))
-               enddo
-            enddo
-         enddo
-
-      endif
-
-      if(k.eq.lbdvm) then
-      if(proc1)  then
-CDVM$ REALIGN u(i,j,k) WITH u1(i,j,k)
-      endif
-      endif
-
-      if( debug_vec(0) .ge. 1 )then
-         call rep_nrm(z,mm1,mm2,mm3,'z: inter',k-1)
-         call rep_nrm(u,n1,n2,n3,'u: inter',k)
-      endif
-
-      if( debug_vec(5) .ge. k )then
-         call showall(z,mm1,mm2,mm3)
-         call showall(u,n1,n2,n3)
-      endif
-
-      return 
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine norm2u3(r,n1,n2,n3,rnm2,rnmu,nx,ny,nz)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     norm2u3 evaluates approximations to the L2 norm and the
-c     uniform (or L-infinity or Chebyshev) norm, under the
-c     assumption that the boundaries are periodic or zero.  Add the
-c     boundaries in with half weight (quarter weight on the edges
-c     and eighth weight at the corners) for inhomogeneous boundaries.
-c---------------------------------------------------------------------
-      implicit none
-
-
-      integer n1, n2, n3, nx, ny, nz
-      double precision rnm2, rnmu, r(n1,n2,n3)
-      double precision s, a, ss
-      integer i3, i2, i1, ierr
-CDVM$ INHERIT r
-      integer n
-
-      n = nx*ny*nz
-
-      s=0.0D0
-      rnmu = 0.0D0
-CDVM$ PARALLEL (i3,i2,i1) ON r(i1,i2,i3),REDUCTION (SUM(s),MAX(rnmu))
-      do  i3=2,n3-1
-         do  i2=2,n2-1
-            do  i1=2,n1-1
-               s=s+r(i1,i2,i3)**2
-               a=abs(r(i1,i2,i3))
-               if(a.gt.rnmu)rnmu=a
-            enddo
-         enddo
-      enddo
-
-      rnm2=sqrt( s / float( n ))
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine rep_nrm(u,n1,n2,n3,title,kk)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     report on norm
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-
-      integer n1, n2, n3, kk
-      double precision u(n1,n2,n3)
-      character*8 title
-CDVM$ INHERIT u
-      double precision rnm2, rnmu
-
-
-      call norm2u3(u,n1,n2,n3,rnm2,rnmu,nx(kk),ny(kk),nz(kk))
-      write(*,7)kk,title,rnm2,rnmu
- 7    format(' Level',i2,' in ',a8,': norms =',D21.14,D21.14)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine comm3(u,n1,n2,n3,kk)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     comm3 organizes the communication on all borders 
-c---------------------------------------------------------------------
-      implicit none
-
-      include 'globals.h'
-CDVM$ INHERIT u
-      integer n1, n2, n3, kk
-      double precision u(n1,n2,n3)
-      integer axis
-
-      do  axis = 1, 3
-         call comm1p( axis, u, n1, n2, n3, kk )
-      enddo
-
-      return
-      end
-
-c--------------------------------------------------------------------
-
-c--------------------------------------------------------------------
-
-
-      subroutine comm1p( axis, u, n1, n2, n3, kk )
-
-c--------------------------------------------------------------------
-
-c--------------------------------------------------------------------
-
-
-      implicit none
-
-      include 'globals.h'
-CDVM$ INHERIT u
-CDVM$ ASYNCID W
-      integer axis, dir, n1, n2, n3
-      double precision u( n1, n2, n3 )
-
-      integer i3, i2, i1, buff_len,buff_id
-      integer i, kk, indx
-
-      if( axis .eq.  1 )then
-CDVM$ ASYNCHRONOUS  W 
-CDVM$ F90 u(n1,2:n2-1,2:n3-1) = u(2,2:n2-1,2:n3-1)
-CDVM$ F90 u(1,2:n2-1,2:n3-1) = u(n1-1,2:n2-1,2:n3-1)
-         do  i3=2,n3-1
-            do  i2=2,n2-1
-               u(n1,i2,i3) = u(2,i2,i3) 
-               u(1,i2,i3)  = u(n1-1,i2,i3) 
-            enddo
-         enddo
-CDVM$ END ASYNCHRONOUS 
-      endif
-
-      if( axis .eq.  2 )then
-CDVM$ ASYNCHRONOUS  W 
-CDVM$ F90 u(1:n1,n2,2:n3-1) = u(1:n1,2,2:n3-1)
-CDVM$ F90 u(1:n1,1,2:n3-1) = u(1:n1,n2-1,2:n3-1)
-         do  i3=2,n3-1
-            do  i1=1,n1
-               u(i1,n2,i3) = u(i1,2,i3)   
-               u(i1,1,i3)  = u(i1,n2-1,i3) 
-            enddo
-         enddo
-CDVM$ END ASYNCHRONOUS 
-      endif
-
-      if( axis .eq.  3 )then
-CDVM$ ASYNCHRONOUS  W  
-CDVM$ F90 u(1:n1,1:n2,n3) = u(1:n1,1:n2,2)
-CDVM$ F90 u(1:n1,1:n2,1) = u(1:n1,1:n2,n3-1)
-            do  i2=1,n2
-               do  i1=1,n1
-               u(i1,i2,n3)  = u(i1,i2,2)   
-               u(i1,i2,1)  = u(i1,i2,n3-1)  
-               enddo
-            enddo
-CDVM$ END ASYNCHRONOUS 
-         endif
-CDVM$ ASYNCWAIT W
-      return
-      end
-     
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine zran3(z,n1,n2,n3,nx,ny,k)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     zran3  loads +1 at ten randomly chosen points,
-c     loads -1 at a different ten random points,
-c     and zero elsewhere.
-c---------------------------------------------------------------------
-      implicit none
-      include 'npbparams.h'
-CDVM$ INHERIT z
-CDVM$ DYNAMIC z
-      integer  is1, is2, is3, ie1, ie2, ie3,i3b,i3e,i2b,i1b
-      common /grid/ is1,is2,is3,ie1,ie2,ie3
-
-      integer n1, n2, n3, k, nx, ny, ierr, i0, m0, m1
-      double precision z(n1,n2,n3),zz(2+2**ndim1)
-
-      integer mm, i1, i2, i3, d1, e1, e2, e3,ii2,ii1
-      double precision x, a
-      double precision xx, x0, x1, a1, a2, ai, power
-      parameter( mm = 10,  a = 5.D0 ** 13, x = 314159265.D0)
-      double precision ten( mm, 0:1 ), temp, best
-      integer i, j1( mm, 0:1 ), j2( mm, 0:1 ), j3( mm, 0:1 )
-      integer jg( 0:3, mm, 0:1 ), jg_temp(4)
-      external randlc
-      double precision randlc, rdummy
-
-CDVM$ DEBUG 8 (D=1)   
-      a1 = power( a, nx )
-      a2 = power( a, nx*ny )
-      call zero3(z,n1,n2,n3)
-
-      i = is1-2+nx*(is2-2+ny*(is3-2))
-
-
-      d1 = ie1 - is1 + 1
-      e1 = ie1 - is1 + 2
-      e2 = ie2 - is2 + 2
-      e3 = ie3 - is3 + 2
-      x0 = x
-c      i0=0
-      i3b=2
-      i3e=e3
-      i2b=2
-      i1b=2
-CDVM$ PARALLEL (i3,i2,i1) ON z(i1,i2,i3),NEW(i3b,i3e,i2b,i1b)
-
-      do  i3 = i3b, i3e
-        do  i2 = i2b, e2
-          do i1=i1b,e1          
-          if(i1.eq.i1b) then 
-          if(i3 .eq.i3b .and. i2 .eq. i2b) then 
-            i = is1-2+nx*(i2b-2+ny*(i3b-2))
-            ai = power( a, i )
-            x0 = x
-            rdummy = randlc( x0, ai )
-            x1 = x0
-          endif
-
-         if(i2 .eq.i2b .and.i3.ne.i3b ) then
-            rdummy = randlc( x0, a2 )
-            x1 = x0
-         endif
-            xx = x1
-            call vranlc( d1, xx, a, zz( 2))    
-c            call vranlc( d1, xx, a, z( 2, i2, i3 ))    
-            rdummy = randlc( x1, a1 )
-         endif
-         z(i1,i2,i3) = zz(i1)
-         enddo
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c       call comm3(z,n1,n2,n3)
-c       call showall(z,n1,n2,n3)
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     each processor looks for twenty candidates
-c---------------------------------------------------------------------
-  
-      do  i=1,mm
-         ten( i, 1 ) = 0.0D0
-         j1( i, 1 ) = 0
-         j2( i, 1 ) = 0
-         j3( i, 1 ) = 0
-         ten( i, 0 ) = 1.0D0
-         j1( i, 0 ) = 0
-         j2( i, 0 ) = 0
-         j3( i, 0 ) = 0
-      enddo
-CDVM$ PARALLEL (i3,i2,i1) ON z(i1,i2,i3)
-
-      do  i3=2,n3-1
-         do  i2=2,n2-1
-            do  i1=2,n1-1
-               if( z(i1,i2,i3) .gt. ten( 1, 1 ) )then
-                  ten(1,1) = z(i1,i2,i3) 
-                  j1(1,1) = i1
-                  j2(1,1) = i2
-                  j3(1,1) = i3
-                  call bubble( ten, j1, j2, j3, mm, 1 )
-               endif
-               if( z(i1,i2,i3) .lt. ten( 1, 0 ) )then
-                  ten(1,0) = z(i1,i2,i3) 
-                  j1(1,0) = i1
-                  j2(1,0) = i2
-                  j3(1,0) = i3
-                  call bubble( ten, j1, j2, j3, mm, 0 )
-               endif
-            enddo
-         enddo
-      enddo
-
-
-c---------------------------------------------------------------------
-c     Now which of these are globally best?
-c---------------------------------------------------------------------
-      i1 = mm
-      i0 = mm
-      do  i=mm,1,-1
-
-      best=0.
-CDVM$ PARALLEL (i3,ii2,ii1) ON z(ii1,ii2,i3),REDUCTION(MAX(best))
-        do i3=2,n3-1
-          do ii2=2,n2-1
-            do ii1=2,n1-1
-          if(best.eq.0.) best= z( j1(i1,1), j2(i1,1), j3(i1,1) )
-        enddo
-        enddo
-        enddo
-          
-         if(best.eq.z(j1(i1,1),j2(i1,1),j3(i1,1)))then
-            jg( 0, i, 1) = 0
-            jg( 1, i, 1) = is1 - 2 + j1( i1, 1 ) 
-            jg( 2, i, 1) = is2 - 2 + j2( i1, 1 ) 
-            jg( 3, i, 1) = is3 - 2 + j3( i1, 1 ) 
-            i1 = i1-1
-         else
-            jg( 0, i, 1) = 0
-            jg( 1, i, 1) = 0
-            jg( 2, i, 1) = 0
-            jg( 3, i, 1) = 0
-         endif
-         ten( i, 1 ) = best
-
-      best=0.
-CDVM$ PARALLEL (i3,ii2,ii1) ON z(ii1,ii2,i3),REDUCTION(MIN(best))
-        do i3=2,n3-1
-          do ii2=2,n2-1
-            do ii1=2,n1-1
-          if(best.eq.0.) best= z( j1(i0,0),j2(i0,0),j3(i0,0) )
-        enddo
-        enddo
-        enddo
-         if(best.eq.z(j1(i0,0),j2(i0,0),j3(i0,0)))then
-            jg( 0, i, 0) = 0
-            jg( 1, i, 0) = is1 - 2 + j1( i0, 0 ) 
-            jg( 2, i, 0) = is2 - 2 + j2( i0, 0 ) 
-            jg( 3, i, 0) = is3 - 2 + j3( i0, 0 ) 
-            i0 = i0-1
-         else
-            jg( 0, i, 0) = 0
-            jg( 1, i, 0) = 0
-            jg( 2, i, 0) = 0
-            jg( 3, i, 0) = 0
-         endif
-         ten( i, 0 ) = best
-
-      enddo
-      m1 = i1+1
-      m0 = i0+1
-
-c     write(*,*)' '
-c     write(*,*)' negative charges at'
-c     write(*,9)(jg(1,i,0),jg(2,i,0),jg(3,i,0),i=1,mm)
-c     write(*,*)' positive charges at'
-c     write(*,9)(jg(1,i,1),jg(2,i,1),jg(3,i,1),i=1,mm)
-c     write(*,*)' small random numbers were'
-c     write(*,8)(ten( i,0),i=mm,1,-1)
-c     write(*,*)' and they were found on processor number'
-c     write(*,7)(jg(0,i,0),i=mm,1,-1)
-c     write(*,*)' large random numbers were'
-c     write(*,8)(ten( i,1),i=mm,1,-1)
-c     write(*,*)' and they were found on processor number'
-c     write(*,7)(jg(0,i,1),i=mm,1,-1)
-c 9    format(5(' (',i3,2(',',i3),')'))
-c 8    format(5D15.8)
-c 7    format(10i4)
-CDVM$ PARALLEL (i3,i2,i1) ON z(i1,i2,i3)
-      do  i3=1,n3
-         do  i2=1,n2
-            do  i1=1,n1
-               z(i1,i2,i3) = 0.0D0
-            enddo
-         enddo
-      enddo
-      do  i=mm,m0,-1
-         z( j1(i,0), j2(i,0), j3(i,0) ) = -1.0D0
-      enddo
-      do  i=mm,m1,-1
-         z( j1(i,1), j2(i,1), j3(i,1) ) = +1.0D0
-      enddo
-      call comm3(z,n1,n2,n3,k)
-
-c---------------------------------------------------------------------
-c          call showall(z,n1,n2,n3)
-c---------------------------------------------------------------------
-CDVM$ END DEBUG 8
-      return 
-      end
-
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine showall(z,n1,n2,n3)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-
-CDVM$ INHERIT z
-      integer n1,n2,n3,i1,i2,i3,i,ierr
-      double precision z(n1,n2,n3)
-      integer m1, m2, m3
-
-      m1 = min(n1,18)
-      m2 = min(n2,14)
-      m3 = min(n3,18)
-
-      write(*,*)'  '
-C      do  i3=1,m3
-C         do  i1=1,m1
-C            write(*,6)(z(i1,i2,i3),i2=1,m2)
-C         enddo
-      
-C         write(*,*)' - - - - - - - '
-C      enddo
-
-      write (*,*) z
-
-      write(*,*)'  '
- 6    format(15f6.3)
-
-      return 
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function power( a, n )
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     power  raises an integer, disguised as a double
-c     precision real, to an integer power
-c---------------------------------------------------------------------
-      implicit none
-
-      double precision a, aj
-      integer n, nj
-      external randlc
-      double precision randlc, rdummy
-  
-      power = 1.0D0
-      nj = n
-      aj = a
- 100  continue
-
-      if( nj .eq. 0 ) goto 200
-      if( mod(nj,2) .eq. 1 ) rdummy =  randlc( power, aj )
-      rdummy = randlc( aj, aj )
-      nj = nj/2
-      go to 100
-
- 200  continue
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine bubble( ten, j1, j2, j3, m, ind )
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     bubble        does a bubble sort in direction dir
-c---------------------------------------------------------------------
-      implicit none
-
-
-      integer m, ind, j1( m, 0:1 ), j2( m, 0:1 ), j3( m, 0:1 )
-      double precision ten( m, 0:1 )
-      double precision temp
-      integer i, j_temp
-   
-      if( ind .eq. 1 )then
-
-         do  i=1,m-1
-            if( ten(i,ind) .gt. ten(i+1,ind) )then
-
-               temp = ten( i+1, ind )
-               ten( i+1, ind ) = ten( i, ind )
-               ten( i, ind ) = temp
-
-               j_temp           = j1( i+1, ind )
-               j1( i+1, ind ) = j1( i,   ind )
-               j1( i,   ind ) = j_temp
-
-               j_temp           = j2( i+1, ind )
-               j2( i+1, ind ) = j2( i,   ind )
-               j2( i,   ind ) = j_temp
-
-               j_temp           = j3( i+1, ind )
-               j3( i+1, ind ) = j3( i,   ind )
-               j3( i,   ind ) = j_temp
-
-            else 
-               go to 5
-            endif
-         enddo
-  5      return
-      else
-
-         do  i=1,m-1
-            if( ten(i,ind) .lt. ten(i+1,ind) )then
-
-               temp = ten( i+1, ind )
-               ten( i+1, ind ) = ten( i, ind )
-               ten( i, ind ) = temp
-
-               j_temp           = j1( i+1, ind )
-               j1( i+1, ind ) = j1( i,   ind )
-               j1( i,   ind ) = j_temp
-
-               j_temp           = j2( i+1, ind )
-               j2( i+1, ind ) = j2( i,   ind )
-               j2( i,   ind ) = j_temp
-
-               j_temp           = j3( i+1, ind )
-               j3( i+1, ind ) = j3( i,   ind )
-               j3( i,   ind ) = j_temp
-
-            else 
-               go to 6
-            endif
-         enddo
-6     return
-      endif
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine zero3(z,n1,n2,n3)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-
-CDVM$ INHERIT z
-      integer n1, n2, n3
-      double precision z(n1,n2,n3)
-      integer i1, i2, i3
-
-CDVM$ PARALLEL (i3,i2,i1) ON z(i1,i2,i3)
-      do  i3=1,n3
-         do  i2=1,n2
-            do  i1=1,n1
-               z(i1,i2,i3)=0.0D0
-            enddo
-         enddo
-      enddo
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-!      function ALLOCATE(size,ar,adp)
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-!      integer size(3),adp,ALLOCATE
-!      double precision ar(1)
-!CDVM$ DEBUG 2 (D=0)
-!      ALLOCATE = adp
-!CDVM$ ENDDEBUG 2
-!      return
-!      end
-
-c----- end of program ------------------------------------------------
-      subroutine print_results(name, class, n1, n2, n3, niter, 
-     >               t, mops, optype, verified, npbversion) 
-c               ,compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-      
-      implicit none
-      character*2 name
-      character*1 class
-      integer n1, n2, n3, niter, j
-      double precision t, mops
-      character optype*24, size*13
-      logical verified
-      character*(*) npbversion
-c     >          , compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7
-
-         write (*, 2) name 
- 2       format(//, ' ', A2, ' Benchmark Completed.')
-
-         write (*, 3) Class
- 3       format(' Class           = ', 12x, a12)
-
-c   If this is not a grid-based problem (EP, FT, CG), then
-c   we only print n1, which contains some measure of the
-c   problem size. In that case, n2 and n3 are both zero.
-c   Otherwise, we print the grid size n1xn2xn3
-
-         if ((n2 .eq. 0) .and. (n3 .eq. 0)) then
-            if (name(1:2) .eq. 'EP') then
-               write(size, '(f12.0)' ) 2.d0**n1
-               do j =13,1,-1
-                  if (size(j:j) .eq. '.') size(j:j) = ' '
-               end do
-               write (*,42) size
- 42            format(' Size            = ',12x, a14)
-            else
-               write (*,44) n1
- 44            format(' Size            = ',12x, i12)
-            endif
-         else
-            write (*, 4) n1,n2,n3
- 4          format(' Size            =  ',12x, i3,'x',i3,'x',i3)
-         endif
-
-         write (*, 5) niter
- 5       format(' Iterations      = ', 12x, i12)
-         
-         write (*, 6) t
- 6       format(' Time in seconds = ',12x, f12.2)
-         
-         write (*,9) mops
- 9       format(' Mop/s total     = ',12x, f12.2)
-
-         write(*, 11) optype
- 11      format(' Operation type  = ', a24)
-
-         if (verified) then 
-            write(*,12) '  SUCCESSFUL'
-         else
-            write(*,12) 'UNSUCCESSFUL'
-         endif
- 12      format(' Verification    = ', 12x, a)
-
-         write(*,13) npbversion
- 13      format(' Version         = ', 12x, a12)
-
-c         write(*,14) compiletime
-c 14      format(' Compile date    = ', 12x, a12)
-
-
-c         write (*,121) cs1
-c 121     format(/, ' Compile options:', /, 
-c     >          '    F77          = ', A)
-
-c         write (*,122) cs2
-c 122     format('    FLINK        = ', A)
-
-c         write (*,123) cs3
-c 123     format('    F_LIB        = ', A)
-c
-c         write (*,124) cs4
-c 124     format('    F_INC        = ', A)
-c
-c         write (*,125) cs5
-c 125     format('    FFLAGS       = ', A)
-c
-c         write (*,126) cs6
-c 126     format('    FLINKFLAGS   = ', A)
-c
-c         write(*, 127) cs7
-c 127     format('    RAND         = ', A)
-        
-         write (*,130)
- 130     format(//' Please send the results of this run to:'//
-     >            ' NPB Development Team '/
-     >            ' Internet: npb@nas.nasa.gov'/
-     >            ' '/
-     >            ' If email is not available, send this to:'//
-     >            ' MS T27A-1'/
-     >            ' NASA Ames Research Center'/
-     >            ' Moffett Field, CA  94035-1000'//
-     >            ' Fax: 415-604-3957'//)
-
-
-         return
-         end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function randlc (x, a)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c
-c   This routine returns a uniform pseudorandom double precision number in the
-c   range (0, 1) by using the linear congruential generator
-c
-c   x_{k+1} = a x_k  (mod 2^46)
-c
-c   where 0 < x_k < 2^46 and 0 < a < 2^46.  This scheme generates 2^44 numbers
-c   before repeating.  The argument A is the same as 'a' in the above formula,
-c   and X is the same as x_0.  A and X must be odd double precision integers
-c   in the range (1, 2^46).  The returned value RANDLC is normalized to be
-c   between 0 and 1, i.e. RANDLC = 2^(-46) * x_1.  X is updated to contain
-c   the new seed x_1, so that subsequent calls to RANDLC using the same
-c   arguments will generate a continuous sequence.
-c
-c   This routine should produce the same results on any computer with at least
-c   48 mantissa bits in double precision floating point data.  On 64 bit
-c   systems, double precision should be disabled.
-c
-c   David H. Bailey     October 26, 1990
-c
-c---------------------------------------------------------------------
-
-      implicit none
-
-      double precision r23,r46,t23,t46,a,x,t1,t2,t3,t4,a1,a2,x1,x2,z
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-c---------------------------------------------------------------------
-c   Break A into two parts such that A = 2^23 * A1 + A2.
-c---------------------------------------------------------------------
-
-      t1 = r23 * a
-      a1 = int (t1)
-      a2 = a - t23 * a1
-
-c---------------------------------------------------------------------
-c   Break X into two parts such that X = 2^23 * X1 + X2, compute
-c   Z = A1 * X2 + A2 * X1  (mod 2^23), and then
-c   X = 2^23 * Z + A2 * X2  (mod 2^46).
-c---------------------------------------------------------------------
-      t1 = r23 * x
-      x1 = int (t1)
-      x2 = x - t23 * x1
-      t1 = a1 * x2 + a2 * x1
-      t2 = int (r23 * t1)
-      z = t1 - t23 * t2
-      t3 = t23 * z + a2 * x2
-      t4 = int (r46 * t3)
-      x = t3 - t46 * t4
-      randlc = r46 * x
-
-      return
-      end
-
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine vranlc (n, x, a, y)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c
-c   This routine generates N uniform pseudorandom double precision numbers in
-c   the range (0, 1) by using the linear congruential generator
-c
-c   x_{k+1} = a x_k  (mod 2^46)
-c
-c   where 0 < x_k < 2^46 and 0 < a < 2^46.  This scheme generates 2^44 numbers
-c   before repeating.  The argument A is the same as 'a' in the above formula,
-c   and X is the same as x_0.  A and X must be odd double precision integers
-c   in the range (1, 2^46).  The N results are placed in Y and are normalized
-c   to be between 0 and 1.  X is updated to contain the new seed, so that
-c   subsequent calls to VRANLC using the same arguments will generate a
-c   continuous sequence.  If N is zero, only initialization is performed, and
-c   the variables X, A and Y are ignored.
-c
-c   This routine is the standard version designed for scalar or RISC systems.
-c   However, it should produce the same results on any single processor
-c   computer with at least 48 mantissa bits in double precision floating point
-c   data.  On 64 bit systems, double precision should be disabled.
-c
-c---------------------------------------------------------------------
-
-      implicit none
-
-      integer i,n
-      double precision y,r23,r46,t23,t46,a,x,t1,t2,t3,t4,a1,a2,x1,x2,z
-      dimension y(*)
-      parameter (r23 = 0.5d0 ** 23, r46 = r23 ** 2, t23 = 2.d0 ** 23,
-     >  t46 = t23 ** 2)
-
-
-c---------------------------------------------------------------------
-c   Break A into two parts such that A = 2^23 * A1 + A2.
-c---------------------------------------------------------------------
-      t1 = r23 * a
-      a1 = int (t1)
-      a2 = a - t23 * a1
-
-c---------------------------------------------------------------------
-c   Generate N results.   This loop is not vectorizable.
-c---------------------------------------------------------------------
-      do i = 1, n
-
-c---------------------------------------------------------------------
-c   Break X into two parts such that X = 2^23 * X1 + X2, compute
-c   Z = A1 * X2 + A2 * X1  (mod 2^23), and then
-c   X = 2^23 * Z + A2 * X2  (mod 2^46).
-c---------------------------------------------------------------------
-        t1 = r23 * x
-        x1 = int (t1)
-        x2 = x - t23 * x1
-        t1 = a1 * x2 + a2 * x1
-        t2 = int (r23 * t1)
-        z = t1 - t23 * t2
-        t3 = t23 * z + a2 * x2
-        t4 = int (r46 * t3)
-        x = t3 - t46 * t4
-        y(i) = r46 * x
-      enddo
-      return
-      end
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine timer_clear(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      elapsed(n) = 0.0
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_start(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      start(n) = elapsed_time()
-      return
-      end
-      
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_stop(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-      double precision t, now
-
-      now = elapsed_time()
-      t = now - start(n)
-      elapsed(n) = elapsed(n) + t
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function timer_read(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-    
-      timer_read = elapsed(n)
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function elapsed_time()
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      implicit none
-CC       external         wtime
-CC       double precision wtime
-
-        double precision t
-        double precision dvtime
-        include 'dtime.h'
-        data t/0.d0/ 
-c This function must measure wall clock time, not CPU time. 
-c Since there is no portable timer in Fortran (77)
-c we call a routine compiled in C (though the C source may have
-c to be tweaked). 
-c      call wtime(t)
-c The following is not ok for "official" results because it reports
-c CPU time not wall clock time. It may be useful for developing/testing
-c on timeshared Crays, though. 
-c     call second(t)
-
-      if(dvm_debug.ne.0) then
-         t=t+1.D0
-         elapsed_time = t
-      else
-        elapsed_time = dvtime()
-      end if
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile
deleted file mode 100644
index 8497efb..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=sp
-BENCHMARKU=SP
-
-include ../config/make.def
-include ../sys/make.common
-
-SOURCES = sp.for \
-	set_constants.for \
-	initialize.for \
-	exact_rhs.for \
-	compute_rhs.for \
-	verify.for \
-	compute_errors.for \
-	timers.for \
-	print_result.for
-
-SOURCES_SINGLE = z_solve.for x_solve.for y_solve.for
-SOURCES_MPI = x_solve_mpi.for y_solve_mpi.for z_solve_mpi.for
-
-OBJS = ${SOURCES:.for=.o}
-OBJS_SINGLE = ${SOURCES_SINGLE:.for=.o}
-OBJS_MPI = ${SOURCES_MPI:.for=.o}
-
-${PROGRAM}: config
-	@if [ $(VERSION) = MPI ] ; then	\
-		${MAKE} MPI_VER;		\
-	else				   	\
-		${MAKE} SINGLE_VER;		\
-	fi
-
-MPI_VER: $(OBJS) $(OBJS_MPI)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_MPI)
-
-SINGLE_VER: $(OBJS) $(OBJS_SINGLE)
-	${FLINK} flink -shared-dvm -o ${PROGRAM} ${OBJS} $(OBJS_SINGLE)
-
-%.o: %.for npbparams.h header.h
-	${F77} f ${FFLAGS} -c -o $@ $<
-	
-clean:
-	rm -f npbparams.h
-	rm -f *.o *~
-	rm -f *.cu *.cuf *.c *.f
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/TODO_make.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/TODO_make.bat
deleted file mode 100644
index fabc282..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/TODO_make.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-set CLASS=%1
-set OPT=%2
-
-CALL ..\sys\setparams SP %CLASS%
-CALL %F77% %OPT% sp 1>out_%CLASS%.txt 2>err_%CLASS%.txt
-if exist sp.exe ( 
-  copy sp.exe %BIN%\sp.%CLASS%.x.exe 
-  del sp.exe 
-)
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_errors.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_errors.for
deleted file mode 100644
index 8741a0c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_errors.for
+++ /dev/null
@@ -1,116 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine error_norm(rms)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c this function computes the norm of the difference between the
-c computed solution and the exact solution
-c---------------------------------------------------------------------
-
-       include 'header.h'
-
-       integer i, j, k, m, d
-       double precision xi, eta, zeta, u_exact(5), rms(5), add
-       double precision r1,r2,r3,r4,r5
-       do m = 1, 5
-          rms(m) = 0.0d0
-       enddo
-       r1 = 0.0d0	   
-       r2 = 0.0d0	   
-       r3 = 0.0d0	   
-       r4 = 0.0d0	   
-       r5 = 0.0d0	 	   
-!DVM$ region
-!DVM$ parallel (k,j,i) on u(*,i,j,k),private(zeta,eta,xi,add,u_exact,m)
-!DVM$& ,reduction(SUM(r1),SUM(r2),SUM(r3),SUM(r4),SUM(r5))
-! DVM$& ,shadow_renew(u, rhs)
-       do   k = 0, problem_size-1
-          do   j = 0, problem_size-1
-             do   i = 0, problem_size-1
-                zeta = dble(k) * dnzm1
-                eta = dble(j) * dnym1
-                xi = dble(i) * dnxm1
-        do  m = 1, 5
-          u_exact(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-        end do
-		
-		    add = u(1,i,j,k)-u_exact(1)
-            r1 = r1 + add*add
-		    add = u(2,i,j,k)-u_exact(2)
-            r2 = r2 + add*add
-		    add = u(3,i,j,k)-u_exact(3)
-            r3 = r3 + add*add
-		    add = u(4,i,j,k)-u_exact(4)
-            r4 = r4 + add*add
-		    add = u(5,i,j,k)-u_exact(5)
-            r5 = r5 + add*add			
-             end do
-          end do
-       end do
-!DVM$ end region
-	   
-       rms(1) = r1
-       rms(2) = r2
-       rms(3) = r3
-       rms(4) = r4
-       rms(5) = r5	
-       do    m = 1, 5
-          do    d = 1, 3
-             rms(m) = rms(m) / dble(grid_points(d)-2)
-          end do
-          rms(m) = dsqrt(rms(m))
-       end do
-
-       return
-       end
-
-
-
-       subroutine rhs_norm(rms)
-
-       include 'header.h'
-
-       integer i, j, k, d, m
-       double precision rms(5), add
-
-       do m = 1, 5
-          rms(m) = 0.0d0
-       enddo	   	   
-	   
-!DVM$ region
-!DVM$ parallel (k,j,i) on u(*,i,j,k),private(add)
-!DVM$& ,reduction(SUM(rms))
-       do k = 1, nz2
-          do j = 1, ny2
-             do i = 1, nx2
-               add = rhs(1,i,j,k)
-               rms(1) = rms(1) + add*add
-               add = rhs(2,i,j,k)
-               rms(2) = rms(2) + add*add
-               add = rhs(3,i,j,k)
-               rms(3) = rms(3) + add*add
-               add = rhs(4,i,j,k)
-               rms(4) = rms(4) + add*add
-               add = rhs(5,i,j,k)
-               rms(5) = rms(5) + add*add			   
-             end do 
-          end do 
-       end do 
-!DVM$ end region   
-       do   m = 1, 5
-          do   d = 1, 3
-             rms(m) = rms(m) / dble(grid_points(d)-2)
-          end do
-          rms(m) = dsqrt(rms(m))
-       end do
-
-       return
-       end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_rhs.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_rhs.for
deleted file mode 100644
index 9fb1ed0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/compute_rhs.for
+++ /dev/null
@@ -1,339 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine compute_rhs(aditional_comp)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       include 'header.h'
-
-       integer i, j, k, m
-       double precision aux, rho_inv, uijk, up1, um1, vijk, vp1, vm1,
-     >                  wijk, wp1, wm1,rhs_(5)
-       double precision t1, t2, t3, ac, ru1, uu, vv, ww,ac2inv
-       integer aditional_comp
-
-       if (timeron) call timer_start(t_rhs)
-
-!DVM$ region out(us,vs,ws,qs,rho_i,speed,square)
-
-!DVM$ parallel (k,j,i) on u(*,i,j,k),private(rho_inv,aux,m)
-!DVM$& ,shadow_renew(u(0:0,2:3,2:3,2:3)),SHADOW_COMPUTE
-       do    k = 0, problem_size-1
-          do    j = 0, problem_size-1
-             do    i = 0, problem_size-1
-                rho_inv = 1.0d0/u(1,i,j,k)
-                rho_i(i,j,k) = rho_inv
-                us(i,j,k) = u(2,i,j,k) * rho_inv
-                vs(i,j,k) = u(3,i,j,k) * rho_inv
-                ws(i,j,k) = u(4,i,j,k) * rho_inv
-                square(i,j,k)     = 0.5d0* (
-     >                        u(2,i,j,k)*u(2,i,j,k) + 
-     >                        u(3,i,j,k)*u(3,i,j,k) +
-     >                        u(4,i,j,k)*u(4,i,j,k) ) * rho_inv
-                qs(i,j,k) = square(i,j,k) * rho_inv
-c---------------------------------------------------------------------
-c               (don't need speed and ainx until the lhs computation)
-c---------------------------------------------------------------------
-                aux = c1c2*rho_inv* (u(5,i,j,k) - square(i,j,k))
-                speed(i,j,k) = dsqrt(aux)
-                do    m = 1, 5
-                   rhs(m,i,j,k) = forcing(m,i,j,k)
-                end do				
-             end do
-          end do
-       end do
-
-!DVM$ parallel (k,j,i) on rhs(*,i,j,k),private(uijk,up1,um1,m
-!DVM$& ,vijk,vp1,vm1,wijk,wp1,wm1,rhs_,
-!DVM$& t1, t2, t3, ac, ru1, uu, vv, ww,ac2inv), CUDA_BLOCK(32,4)
-       do    k = 1, nz2
-          do    j = 1, ny2
-             do    i = 1, nx2
-                uijk = us(i,j,k)
-                up1  = us(i+1,j,k)
-                um1  = us(i-1,j,k)
-                
-                rhs_(1) = rhs(1,i,j,k)
-                rhs_(2) = rhs(2,i,j,k)
-                rhs_(3) = rhs(3,i,j,k)
-                rhs_(4) = rhs(4,i,j,k)                
-                rhs_(5) = rhs(5,i,j,k)
-                  
-                rhs_(1) = rhs_(1) + dx1tx1 * 
-     >                    (u(1,i+1,j,k) - 2.0d0*u(1,i,j,k) + 
-     >                     u(1,i-1,j,k)) -
-     >                    tx2 * (u(2,i+1,j,k) - u(2,i-1,j,k))
-
-                rhs_(2) = rhs_(2) + dx2tx1 * 
-     >                    (u(2,i+1,j,k) - 2.0d0*u(2,i,j,k) + 
-     >                     u(2,i-1,j,k)) +
-     >                    xxcon2*con43 * (up1 - 2.0d0*uijk + um1) -
-     >                    tx2 * (u(2,i+1,j,k)*up1 - 
-     >                           u(2,i-1,j,k)*um1 +
-     >                           (u(5,i+1,j,k)- square(i+1,j,k)-
-     >                            u(5,i-1,j,k)+ square(i-1,j,k))*
-     >                            c2)
-
-                rhs_(3) = rhs_(3) + dx3tx1 * 
-     >                    (u(3,i+1,j,k) - 2.0d0*u(3,i,j,k) +
-     >                     u(3,i-1,j,k)) +
-     >                    xxcon2 * (vs(i+1,j,k) - 2.0d0*vs(i,j,k) +
-     >                              vs(i-1,j,k)) -
-     >                    tx2 * (u(3,i+1,j,k)*up1 - 
-     >                           u(3,i-1,j,k)*um1)
-
-                rhs_(4) = rhs_(4) + dx4tx1 * 
-     >                    (u(4,i+1,j,k) - 2.0d0*u(4,i,j,k) +
-     >                     u(4,i-1,j,k)) +
-     >                    xxcon2 * (ws(i+1,j,k) - 2.0d0*ws(i,j,k) +
-     >                              ws(i-1,j,k)) -
-     >                    tx2 * (u(4,i+1,j,k)*up1 - 
-     >                           u(4,i-1,j,k)*um1)
-
-                rhs_(5) = rhs_(5) + dx5tx1 * 
-     >                    (u(5,i+1,j,k) - 2.0d0*u(5,i,j,k) +
-     >                     u(5,i-1,j,k)) +
-     >                    xxcon3 * (qs(i+1,j,k) - 2.0d0*qs(i,j,k) +
-     >                              qs(i-1,j,k)) +
-     >                    xxcon4 * (up1*up1 -       2.0d0*uijk*uijk + 
-     >                              um1*um1) +
-     >                    xxcon5 * (u(5,i+1,j,k)*rho_i(i+1,j,k) - 
-     >                              2.0d0*u(5,i,j,k)*rho_i(i,j,k) +
-     >                              u(5,i-1,j,k)*rho_i(i-1,j,k)) -
-     >                    tx2 * ( (c1*u(5,i+1,j,k) - 
-     >                             c2*square(i+1,j,k))*up1 -
-     >                            (c1*u(5,i-1,j,k) - 
-     >                             c2*square(i-1,j,k))*um1 )
-
-             if(i .eq. 1) then
-             do    m = 1, 5
-                rhs_(m) = rhs_(m)- dssp * 
-     >                    ( 5.0d0*u(m,i,j,k) - 4.0d0*u(m,i+1,j,k) +
-     >                            u(m,i+2,j,k))
-             end do
-             elseif(i .eq. 2) then
-             do    m = 1, 5
-                rhs_(m) = rhs_(m) - dssp * 
-     >                    (-4.0d0*u(m,i-1,j,k) + 6.0d0*u(m,i,j,k) -
-     >                      4.0d0*u(m,i+1,j,k) + u(m,i+2,j,k))
-             end do
-             elseif(i .ge. 3 .and. i .le. nx2-2) then
-                do     m = 1, 5
-                   rhs_(m) = rhs_(m) - dssp * 
-     >                    (  u(m,i-2,j,k) - 4.0d0*u(m,i-1,j,k) + 
-     >                     6.0*u(m,i,j,k) - 4.0d0*u(m,i+1,j,k) + 
-     >                         u(m,i+2,j,k) )
-                end do
-             elseif(i .eq. nx2-1) then
-             do     m = 1, 5
-                rhs_(m) = rhs_(m) - dssp *
-     >                    ( u(m,i-2,j,k) - 4.0d0*u(m,i-1,j,k) + 
-     >                      6.0d0*u(m,i,j,k) - 4.0d0*u(m,i+1,j,k) )
-             end do
-             elseif( i .eq. nx2) then
-             do     m = 1, 5
-                rhs_(m) = rhs_(m) - dssp *
-     >                    ( u(m,i-2,j,k) - 4.d0*u(m,i-1,j,k) +
-     >                      5.d0*u(m,i,j,k) )
-             end do
-             endif
-
-                vijk = vs(i,j,k)
-                vp1  = vs(i,j+1,k)
-                vm1  = vs(i,j-1,k)
-                rhs_(1) = rhs_(1) + dy1ty1 * 
-     >                   (u(1,i,j+1,k) - 2.0d0*u(1,i,j,k) + 
-     >                    u(1,i,j-1,k)) -
-     >                   ty2 * (u(3,i,j+1,k) - u(3,i,j-1,k))
-                rhs_(2) = rhs_(2) + dy2ty1 * 
-     >                   (u(2,i,j+1,k) - 2.0d0*u(2,i,j,k) + 
-     >                    u(2,i,j-1,k)) +
-     >                   yycon2 * (us(i,j+1,k) - 2.0d0*us(i,j,k) + 
-     >                             us(i,j-1,k)) -
-     >                   ty2 * (u(2,i,j+1,k)*vp1 - 
-     >                          u(2,i,j-1,k)*vm1)
-                rhs_(3) = rhs_(3) + dy3ty1 * 
-     >                   (u(3,i,j+1,k) - 2.0d0*u(3,i,j,k) + 
-     >                    u(3,i,j-1,k)) +
-     >                   yycon2*con43 * (vp1 - 2.0d0*vijk + vm1) -
-     >                   ty2 * (u(3,i,j+1,k)*vp1 - 
-     >                          u(3,i,j-1,k)*vm1 +
-     >                          (u(5,i,j+1,k) - square(i,j+1,k) - 
-     >                           u(5,i,j-1,k) + square(i,j-1,k))
-     >                          *c2)
-                rhs_(4) = rhs_(4) + dy4ty1 * 
-     >                   (u(4,i,j+1,k) - 2.0d0*u(4,i,j,k) + 
-     >                    u(4,i,j-1,k)) +
-     >                   yycon2 * (ws(i,j+1,k) - 2.0d0*ws(i,j,k) + 
-     >                             ws(i,j-1,k)) -
-     >                   ty2 * (u(4,i,j+1,k)*vp1 - 
-     >                          u(4,i,j-1,k)*vm1)
-                rhs_(5) = rhs_(5) + dy5ty1 * 
-     >                   (u(5,i,j+1,k) - 2.0d0*u(5,i,j,k) + 
-     >                    u(5,i,j-1,k)) +
-     >                   yycon3 * (qs(i,j+1,k) - 2.0d0*qs(i,j,k) + 
-     >                             qs(i,j-1,k)) +
-     >                   yycon4 * (vp1*vp1       - 2.0d0*vijk*vijk + 
-     >                             vm1*vm1) +
-     >                   yycon5 * (u(5,i,j+1,k)*rho_i(i,j+1,k) - 
-     >                             2.0d0*u(5,i,j,k)*rho_i(i,j,k) +
-     >                             u(5,i,j-1,k)*rho_i(i,j-1,k)) -
-     >                   ty2 * ((c1*u(5,i,j+1,k) - 
-     >                           c2*square(i,j+1,k)) * vp1 -
-     >                          (c1*u(5,i,j-1,k) - 
-     >                           c2*square(i,j-1,k)) * vm1)
-
-          if(j .eq. 1) then
-             do     m = 1, 5
-                rhs_(m) = rhs_(m)- dssp * 
-     >                    ( 5.0d0*u(m,i,j,k) - 4.0d0*u(m,i,j+1,k) +
-     >                            u(m,i,j+2,k))
-             end do
-          elseif(j .eq. 2) then
-             do     m = 1, 5
-                rhs_(m) = rhs_(m) - dssp * 
-     >                    (-4.0d0*u(m,i,j-1,k) + 6.0d0*u(m,i,j,k) -
-     >                      4.0d0*u(m,i,j+1,k) + u(m,i,j+2,k))
-             end do
-          elseif(j .ge. 3 .and. j .le. ny2-2) then
-                do     m = 1, 5
-                   rhs_(m) = rhs_(m) - dssp * 
-     >                    (  u(m,i,j-2,k) - 4.0d0*u(m,i,j-1,k) + 
-     >                     6.0*u(m,i,j,k) - 4.0d0*u(m,i,j+1,k) + 
-     >                         u(m,i,j+2,k) )
-                end do
-          elseif(j .eq. ny2-1) then
-             do     m = 1, 5
-                rhs_(m) = rhs_(m) - dssp *
-     >                    ( u(m,i,j-2,k) - 4.0d0*u(m,i,j-1,k) + 
-     >                      6.0d0*u(m,i,j,k) - 4.0d0*u(m,i,j+1,k) )
-             end do
-          elseif(j .eq. ny2) then
-             do     m = 1, 5
-                rhs_(m) = rhs_(m) - dssp *
-     >                    ( u(m,i,j-2,k) - 4.d0*u(m,i,j-1,k) +
-     >                      5.d0*u(m,i,j,k) )
-             end do
-          endif
-
-                wijk = ws(i,j,k)
-                wp1  = ws(i,j,k+1)
-                wm1  = ws(i,j,k-1)
-
-                rhs_(1) = rhs_(1) + dz1tz1 * 
-     >                   (u(1,i,j,k+1) - 2.0d0*u(1,i,j,k) + 
-     >                    u(1,i,j,k-1)) -
-     >                   tz2 * (u(4,i,j,k+1) - u(4,i,j,k-1))
-                rhs_(2) = rhs_(2) + dz2tz1 * 
-     >                   (u(2,i,j,k+1) - 2.0d0*u(2,i,j,k) + 
-     >                    u(2,i,j,k-1)) +
-     >                   zzcon2 * (us(i,j,k+1) - 2.0d0*us(i,j,k) + 
-     >                             us(i,j,k-1)) -
-     >                   tz2 * (u(2,i,j,k+1)*wp1 - 
-     >                          u(2,i,j,k-1)*wm1)
-                rhs_(3) = rhs_(3) + dz3tz1 * 
-     >                   (u(3,i,j,k+1) - 2.0d0*u(3,i,j,k) + 
-     >                    u(3,i,j,k-1)) +
-     >                   zzcon2 * (vs(i,j,k+1) - 2.0d0*vs(i,j,k) + 
-     >                             vs(i,j,k-1)) -
-     >                   tz2 * (u(3,i,j,k+1)*wp1 - 
-     >                          u(3,i,j,k-1)*wm1)
-                rhs_(4) = rhs_(4) + dz4tz1 * 
-     >                   (u(4,i,j,k+1) - 2.0d0*u(4,i,j,k) + 
-     >                    u(4,i,j,k-1)) +
-     >                   zzcon2*con43 * (wp1 - 2.0d0*wijk + wm1) -
-     >                   tz2 * (u(4,i,j,k+1)*wp1 - 
-     >                          u(4,i,j,k-1)*wm1 +
-     >                          (u(5,i,j,k+1) - square(i,j,k+1) - 
-     >                           u(5,i,j,k-1) + square(i,j,k-1))
-     >                          *c2)
-                rhs_(5) = rhs_(5) + dz5tz1 * 
-     >                   (u(5,i,j,k+1) - 2.0d0*u(5,i,j,k) + 
-     >                    u(5,i,j,k-1)) +
-     >                   zzcon3 * (qs(i,j,k+1) - 2.0d0*qs(i,j,k) + 
-     >                             qs(i,j,k-1)) +
-     >                   zzcon4 * (wp1*wp1 - 2.0d0*wijk*wijk + 
-     >                             wm1*wm1) +
-     >                   zzcon5 * (u(5,i,j,k+1)*rho_i(i,j,k+1) - 
-     >                             2.0d0*u(5,i,j,k)*rho_i(i,j,k) +
-     >                             u(5,i,j,k-1)*rho_i(i,j,k-1)) -
-     >                   tz2 * ( (c1*u(5,i,j,k+1) - 
-     >                            c2*square(i,j,k+1))*wp1 -
-     >                           (c1*u(5,i,j,k-1) - 
-     >                            c2*square(i,j,k-1))*wm1)
-     
-             if(k .eq. 1) then
-              do     m = 1, 5
-                rhs_(m) = rhs_(m)- dssp * 
-     >                    ( 5.0d0*u(m,i,j,k) - 4.0d0*u(m,i,j,k+1) +
-     >                            u(m,i,j,k+2))
-             end do
-             elseif(k .eq. 2) then
-              do     m = 1, 5
-                rhs_(m) = rhs_(m) - dssp * 
-     >                    (-4.0d0*u(m,i,j,k-1) + 6.0d0*u(m,i,j,k) -
-     >                      4.0d0*u(m,i,j,k+1) + u(m,i,j,k+2))
-              end do
-             elseif(k .ge. 3 .and. k .le. nz2-2) then
-                do     m = 1, 5
-                   rhs_(m) = rhs_(m) - dssp * 
-     >                    (  u(m,i,j,k-2) - 4.0d0*u(m,i,j,k-1) + 
-     >                     6.0*u(m,i,j,k) - 4.0d0*u(m,i,j,k+1) + 
-     >                         u(m,i,j,k+2) )
-                end do
-             elseif(k .eq. nz2-1) then
-             do     m = 1, 5
-                rhs_(m) = rhs_(m) - dssp *
-     >                    ( u(m,i,j,k-2) - 4.0d0*u(m,i,j,k-1) + 
-     >                      6.0d0*u(m,i,j,k) - 4.0d0*u(m,i,j,k+1) )
-             end do
-             else
-             do     m = 1, 5
-                rhs_(m) = rhs_(m) - dssp *
-     >                    ( u(m,i,j,k-2) - 4.d0*u(m,i,j,k-1) +
-     >                      5.d0*u(m,i,j,k) )
-             end do
-             endif           
-
-            rhs_(1) = rhs_(1) * dt
-            rhs_(2) = rhs_(2) * dt
-            rhs_(3) = rhs_(3) * dt
-            rhs_(4) = rhs_(4) * dt
-            rhs_(5) = rhs_(5) * dt        
-
-            rhs(1,i,j,k) = rhs_(1)
-            rhs(2,i,j,k) = rhs_(2)
-            rhs(3,i,j,k) = rhs_(3)
-            rhs(4,i,j,k) = rhs_(4)
-            rhs(5,i,j,k) = rhs_(5)
-
-            if(aditional_comp .eq. 1) then
-             ru1 = rho_i(i,j,k)
-             uu = us(i,j,k)
-             vv = vs(i,j,k)
-             ww = ws(i,j,k)
-             ac = speed(i,j,k)
-             ac2inv = ac*ac
-
-             t1 = c2 / ac2inv * ( qs(i,j,k)*rhs_(1)-uu*rhs_(2)- 
-     >                vv*rhs_(3)- ww*rhs_(4) + rhs_(5) )
-             t2 = bt * ru1 * ( uu * rhs_(1) - rhs_(2) )
-             t3 = ( bt * ru1 * ac ) * t1
-
-             rhs(1,i,j,k) = rhs_(1) - t1
-             rhs(2,i,j,k) = - ru1 * ( ww*rhs_(1) - rhs_(4))
-             rhs(3,i,j,k) =   ru1 * ( vv*rhs_(1) - rhs_(3))
-             rhs(4,i,j,k) = - t2 + t3
-             rhs(5,i,j,k) =   t2 + t3			
-            endif
-             end do
-          end do
-       end do
-
-!DVM$ end region   
-        if (timeron) call timer_stop(t_rhs)
-
-       return
-       end	   
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/exact_rhs.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/exact_rhs.for
deleted file mode 100644
index 862aabd..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/exact_rhs.for
+++ /dev/null
@@ -1,307 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine exact_rhs
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-
-       include 'header.h'
-
-       double precision dtemp(5), xi, eta, zeta, dtpp
-       integer          m, i, j, k, ip1, im1, jp1, p, p1,
-     >                  jm1, km1, kp1,z
-       double precision ue_(-2:2, 5), buf_(-2:2, 5),cuf_(-2:2),q_(-2:2)   
-
-
-!DVM$ region
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(m)
-       do   k= 0, problem_size-1
-          do   j = 0, problem_size-1
-             do   i = 0, problem_size-1
-                do   m = 1, 5
-                   forcing(m,i,j,k) = 0.0d0
-                end do
-             end do
-          end do
-       end do
-
-c---------------------------------------------------------------------
-c      xi-direction flux differences                      
-c---------------------------------------------------------------------
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(zeta,eta,xi,m,dtemp
-!DVM$& ,buf_,cuf_,q_,dtpp,z,ue_)
-       do k = 1, problem_size-2
-          do j = 1, problem_size-2
-             do  i = 1, problem_size-2
-                zeta = dble(k) * dnzm1
-                eta = dble(j) * dnym1			 
-			    do z = -2, 2 
-                  xi = dble(i + z) * dnxm1
-       do  m = 1, 5
-          dtemp(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-       end do
-                  do  m = 1, 5
-                     ue_(z,m) = dtemp(m)
-                  end do
-                  dtpp = 1.0d0 / dtemp(1)
-                  do  m = 2, 5
-                     buf_(z, m) = dtpp * dtemp(m)
-                  end do
-
-                  cuf_(z) = buf_(z,2) * buf_(z,2)
-                  buf_(z,1) = cuf_(z) + buf_(z,3) * buf_(z,3) + 
-     >                     buf_(z,4) * buf_(z,4) 
-                  q_(z) = 0.5d0*(buf_(z,2)*ue_(z,2) + buf_(z,3)*
-     >                       ue_(z,3) + buf_(z,4)*ue_(z,4))
-                enddo	 
-
-                forcing(1,i,j,k) = forcing(1,i,j,k) -
-     >                 tx2*( ue_(1,2)-ue_(-1,2) )+
-     >                 dx1tx1*(ue_(1,1)-2.0d0*ue_(0,1)+ue_(-1,1))
-
-                forcing(2,i,j,k) = forcing(2,i,j,k) - tx2 * (
-     >                (ue_(1,2)*buf_(1,2)+c2*(ue_(1,5)-q_(1)))-
-     >                (ue_(-1,2)*buf_(-1,2)+c2*(ue_(-1,5)-q_(-1))))+
-     >                 xxcon1*(buf_(1,2)-2.0d0*buf_(0,2)+buf_(-1,2))+
-     >                 dx2tx1*( ue_(1,2)-2.0d0* ue_(0,2)+ue_(-1,2))
-
-                forcing(3,i,j,k) = forcing(3,i,j,k) - tx2 * (
-     >                 ue_(1,3)*buf_(1,2)-ue_(-1,3)*buf_(-1,2))+
-     >                 xxcon2*(buf_(1,3)-2.0d0*buf_(0,3)+buf_(-1,3))+
-     >                 dx3tx1*( ue_(1,3)-2.0d0*ue_(0,3) +ue_(-1,3))
-                  
-                forcing(4,i,j,k) = forcing(4,i,j,k) - tx2*(
-     >                 ue_(1,4)*buf_(1,2)-ue_(-1,4)*buf_(-1,2))+
-     >                 xxcon2*(buf_(1,4)-2.0d0*buf_(0,4)+buf_(-1,4))+
-     >                 dx4tx1*( ue_(1,4)-2.0d0* ue_(0,4)+ ue_(-1,4))
-
-                forcing(5,i,j,k) = forcing(5,i,j,k) - tx2*(
-     >                 buf_(1,2)*(c1*ue_(1,5)-c2*q_(1))-
-     >                 buf_(-1,2)*(c1*ue_(-1,5)-c2*q_(-1)))+
-     >                 0.5d0*xxcon3*(buf_(1,1)-2.0d0*buf_(0,1)+
-     >                               buf_(-1,1))+
-     >                 xxcon4*(cuf_(1)-2.0d0*cuf_(0)+cuf_(-1))+
-     >                 xxcon5*(buf_(1,5)-2.0d0*buf_(0,5)+buf_(-1,5))+
-     >                 dx5tx1*( ue_(1,5)-2.0d0* ue_(0,5)+ ue_(-1,5))
-               do   m = 1, 5
-                if(i .eq. 1) then
-                  forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                    (5.0d0*ue_(0,m) - 4.0d0*ue_(1,m) +ue_(2,m))
-	            else if(i .eq. 2) then
-                  forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (-4.0d0*ue_(-1,m) + 6.0d0*ue_(0,m) -
-     >                     4.0d0*ue_(1,m) + ue_(2,m))
-	            else if(i .eq. problem_size-3) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m))
-                else if(i .eq. problem_size-2) then	 
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) + 5.0d0*ue_(0,m))				
-                else
-                  forcing(m,i,j,k) = forcing(m,i,j,k) - dssp*
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m) + ue_(2,m))
-                endif				  
-               end do
-            end do
-          end do
-       end do
-
-c---------------------------------------------------------------------
-c  eta-direction flux differences             
-c---------------------------------------------------------------------
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(zeta,eta,xi,m,dtemp
-!DVM$& ,buf_,cuf_,q_,dtpp,z,ue_)
-       do  k = 1, problem_size- 2
-         do  j = 1, problem_size-2	   
-           do i = 1, problem_size- 2
-                zeta = dble(k) * dnzm1
-                xi = dble(i) * dnxm1			 
-                do z = -2, 2 
-                  eta = dble(j + z) * dnym1
-       do  m = 1, 5
-          dtemp(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-       end do
-                  do  m = 1, 5
-                     ue_(z,m) = dtemp(m)
-                  end do
-                  dtpp = 1.0d0 / dtemp(1)
-                  do  m = 2, 5
-                     buf_(z, m) = dtpp * dtemp(m)
-                  end do
-
-                  cuf_(z)   = buf_(z,3) * buf_(z,3)
-                  buf_(z,1) = cuf_(z) + buf_(z,2) * buf_(z,2) + 
-     >                     buf_(z,4) * buf_(z,4)
-                  q_(z) = 0.5d0*(buf_(z,2)*ue_(z,2) + buf_(z,3)
-     >                        *ue_(z,3) + buf_(z,4) * ue_(z,4))
-                enddo	
-                  
-                forcing(1,i,j,k) = forcing(1,i,j,k) -
-     >                ty2*( ue_(1,3)-ue_(-1,3) )+
-     >                dy1ty1*(ue_(1,1)-2.0d0*ue_(0,1)+ue_(-1,1))
-
-                forcing(2,i,j,k) = forcing(2,i,j,k) - ty2*(
-     >                ue_(1,2)*buf_(1,3)-ue_(-1,2)*buf_(-1,3))+
-     >                yycon2*(buf_(1,2)-2.0d0*buf_(0,2)+buf_(-1,2))+
-     >                dy2ty1*( ue_(1,2)-2.0* ue_(0,2)+ ue_(-1,2))
-
-                forcing(3,i,j,k) = forcing(3,i,j,k) - ty2*(
-     >                (ue_(1,3)*buf_(1,3)+c2*(ue_(1,5)-q_(1)))-
-     >                (ue_(-1,3)*buf_(-1,3)+c2*(ue_(-1,5)-q_(-1))))+
-     >                yycon1*(buf_(1,3)-2.0d0*buf_(0,3)+buf_(-1,3))+
-     >                dy3ty1*( ue_(1,3)-2.0d0*ue_(0,3) +ue_(-1,3))
-
-                forcing(4,i,j,k) = forcing(4,i,j,k) - ty2*(
-     >                ue_(1,4)*buf_(1,3)-ue_(-1,4)*buf_(-1,3))+
-     >                yycon2*(buf_(1,4)-2.0d0*buf_(0,4)+buf_(-1,4))+
-     >                dy4ty1*( ue_(1,4)-2.0d0*ue_(0,4)+ ue_(-1,4))
-
-                forcing(5,i,j,k) = forcing(5,i,j,k) - ty2*(
-     >                buf_(1,3)*(c1*ue_(1,5)-c2*q_(1))-
-     >                buf_(-1,3)*(c1*ue_(-1,5)-c2*q_(-1)))+
-     >                0.5d0*yycon3*(buf_(1,1)-2.0d0*buf_(0,1)+
-     >                              buf_(-1,1))+
-     >                yycon4*(cuf_(1)-2.0d0*cuf_(0)+cuf_(-1))+
-     >                yycon5*(buf_(1,5)-2.0d0*buf_(0,5)+buf_(-1,5))+
-     >                dy5ty1*(ue_(1,5)-2.0d0*ue_(0,5)+ue_(-1,5))
-               do   m = 1, 5	 
-                 if(j .eq. 1) then	
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                    (5.0d0*ue_(0,m) - 4.0d0*ue_(1,m) +ue_(2,m))
-                 else if(j .eq. 2) then	
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (-4.0d0*ue_(-1,m) + 6.0d0*ue_(0,m) -
-     >                     4.0d0*ue_(1,m) +  ue_(2,m))	
-	             else if(j .eq. problem_size-3) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m))
-	 	         else if(j .eq. problem_size-2) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) + 5.0d0*ue_(0,m))	
-                 else
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp*
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m) + ue_(2,m))	
-                 endif	 
-	           end do
-             end do
-          end do
-       end do
-	   
-c---------------------------------------------------------------------
-c      zeta-direction flux differences                      
-c---------------------------------------------------------------------
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(zeta,eta,xi,m
-!DVM$& ,buf_,cuf_,q_,ue_,dtpp,dtemp,z)
-      do k = 1, problem_size-2
-        do  j = 1, problem_size-2
-          do i = 1, problem_size-2                  
-                xi = dble(i) * dnxm1                
-                eta = dble(j) * dnym1		  
-                do z = -2, 2 
-                  zeta = dble(k + z) * dnzm1
-       do  m = 1, 5
-          dtemp(m) =  ce(m,1) +
-     >    xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >    eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >    zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >    zeta*ce(m,13))))
-       end do
-                  do  m = 1, 5
-                     ue_(z,m) = dtemp(m)
-                  end do
-                  dtpp = 1.0d0 / dtemp(1)
-                  do  m = 2, 5
-                     buf_(z, m) = dtpp * dtemp(m)
-                  end do
-
-                  cuf_(z)   = buf_(z,4) * buf_(z,4)
-                  buf_(z,1) = cuf_(z) + buf_(z,2) * buf_(z,2) +
-     >                     buf_(z,3) * buf_(z,3)
-                  q_(z) = 0.5d0*(buf_(z,2)*ue_(z,2) + buf_(z,3)*
-     >                        ue_(z,3) + buf_(z,4)*ue_(z,4))
-                enddo	
-
-                forcing(1,i,j,k) = forcing(1,i,j,k) -
-     >                 tz2*( ue_(1,4)-ue_(-1,4) )+
-     >                 dz1tz1*(ue_(1,1)-2.0d0*ue_(0,1)+ue_(-1,1))
-
-                forcing(2,i,j,k) = forcing(2,i,j,k) - tz2 * (
-     >                 ue_(1,2)*buf_(1,4)-ue_(-1,2)*buf_(-1,4))+
-     >                 zzcon2*(buf_(1,2)-2.0d0*buf_(0,2)+buf_(-1,2))+
-     >                 dz2tz1*( ue_(1,2)-2.0d0* ue_(0,2)+ ue_(-1,2))
-
-                forcing(3,i,j,k) = forcing(3,i,j,k) - tz2 * (
-     >                 ue_(1,3)*buf_(1,4)-ue_(-1,3)*buf_(-1,4))+
-     >                 zzcon2*(buf_(1,3)-2.0d0*buf_(0,3)+buf_(-1,3))+
-     >                 dz3tz1*(ue_(1,3)-2.0d0*ue_(0,3)+ue_(-1,3))
-
-                forcing(4,i,j,k) = forcing(4,i,j,k) - tz2 * (
-     >                (ue_(1,4)*buf_(1,4)+c2*(ue_(1,5)-q_(1)))-
-     >                (ue_(-1,4)*buf_(-1,4)+c2*(ue_(-1,5)-q_(-1))))+
-     >                zzcon1*(buf_(1,4)-2.0d0*buf_(0,4)+buf_(-1,4))+
-     >                dz4tz1*( ue_(1,4)-2.0d0*ue_(0,4) +ue_(-1,4))
-
-                forcing(5,i,j,k) = forcing(5,i,j,k) - tz2 * (
-     >                 buf_(1,4)*(c1*ue_(1,5)-c2*q_(1))-
-     >                 buf_(-1,4)*(c1*ue_(-1,5)-c2*q_(-1)))+
-     >                 0.5d0*zzcon3*(buf_(1,1)-2.0d0*buf_(0,1)
-     >                              +buf_(-1,1))+
-     >                 zzcon4*(cuf_(1)-2.0d0*cuf_(0)+cuf_(-1))+
-     >                 zzcon5*(buf_(1,5)-2.0d0*buf_(0,5)+buf_(-1,5))+
-     >                 dz5tz1*( ue_(1,5)-2.0d0*ue_(0,5)+ ue_(-1,5))
-               do   m = 1, 5
-                 if(k .eq. 1) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                    (5.0d0*ue_(0,m) - 4.0d0*ue_(1,m) +ue_(2,m))
-	             else if(k .eq. 2) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (-4.0d0*ue_(-1,m) + 6.0d0*ue_(0,m) -
-     >                     4.0d0*ue_(1,m) + ue_(2,m))
-                 else if(k .eq. problem_size-3) then
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m))
-	             else if(k .eq. problem_size-2) then	
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp *
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) + 5.0d0*ue_(0,m))		
-                 else
-                   forcing(m,i,j,k) = forcing(m,i,j,k) - dssp*
-     >                   (ue_(-2,m) - 4.0d0*ue_(-1,m) +
-     >                    6.0d0*ue_(0,m) - 4.0d0*ue_(1,m) + ue_(2,m))				 
-	             endif
-               end do              	 
-             end do
-          end do
-       end do
-
-c---------------------------------------------------------------------
-c now change the sign of the forcing function, 
-c---------------------------------------------------------------------
-!DVM$ parallel (k,j,i) on forcing(*,i,j,k),private(m)
-       do   k = 1, problem_size-2
-          do   j = 1, problem_size-2
-             do   i = 1, problem_size-2
-                do   m = 1, 5
-                   forcing(m,i,j,k) = -1.d0 * forcing(m,i,j,k)
-                end do
-             end do
-          end do
-       end do
-!DVM$ end region
-
-       return
-       end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/header.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/header.h
deleted file mode 100644
index d8fa07c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/header.h
+++ /dev/null
@@ -1,120 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-
-c---------------------------------------------------------------------
-c The following include file is generated automatically by the
-c "setparams" utility. It defines 
-c      problem_size:  12, 64, 102, 162 (for class T, A, B, C)
-c      dt_default:    default time step for this problem size if no
-c                     config file
-c      niter_default: default number of iterations for this problem size
-c---------------------------------------------------------------------
-
-      include 'npbparams.h'
-
-      integer           grid_points(3), nx2, ny2, nz2,stage_n
-      common /global/   grid_points, nx2, ny2, nz2, timeron
-
-      double precision  tx1, tx2, tx3, ty1, ty2, ty3, tz1, tz2, tz3, 
-     &                  dx1, dx2, dx3, dx4, dx5, dy1, dy2, dy3, dy4, 
-     &                  dy5, dz1, dz2, dz3, dz4, dz5, dssp, dt, 
-     &                  ce(5,13), dxmax, dymax, dzmax, xxcon1, xxcon2, 
-     &                  xxcon3, xxcon4, xxcon5, dx1tx1, dx2tx1, dx3tx1,
-     &                  dx4tx1, dx5tx1, yycon1, yycon2, yycon3, yycon4,
-     &                  yycon5, dy1ty1, dy2ty1, dy3ty1, dy4ty1, dy5ty1,
-     &                  zzcon1, zzcon2, zzcon3, zzcon4, zzcon5, dz1tz1, 
-     &                  dz2tz1, dz3tz1, dz4tz1, dz5tz1, dnxm1, dnym1, 
-     &                  dnzm1, c1c2, c1c5, c3c4, c1345, conz1, c1, c2, 
-     &                  c3, c4, c5, c4dssp, c5dssp, dtdssp, dttx1, bt,
-     &                  dttx2, dtty1, dtty2, dttz1, dttz2, c2dttx1, 
-     &                  c2dtty1, c2dttz1, comz1, comz4, comz5, comz6, 
-     &                  c3c4tx3, c3c4ty3, c3c4tz3, c2iv, con43, con16
-
-      common /constants/ tx1, tx2, tx3, ty1, ty2, ty3, tz1, tz2, tz3,
-     &                  dx1, dx2, dx3, dx4, dx5, dy1, dy2, dy3, dy4, 
-     &                  dy5, dz1, dz2, dz3, dz4, dz5, dssp, dt, 
-     &                  ce, dxmax, dymax, dzmax, xxcon1, xxcon2, 
-     &                  xxcon3, xxcon4, xxcon5, dx1tx1, dx2tx1, dx3tx1,
-     &                  dx4tx1, dx5tx1, yycon1, yycon2, yycon3, yycon4,
-     &                  yycon5, dy1ty1, dy2ty1, dy3ty1, dy4ty1, dy5ty1,
-     &                  zzcon1, zzcon2, zzcon3, zzcon4, zzcon5, dz1tz1, 
-     &                  dz2tz1, dz3tz1, dz4tz1, dz5tz1, dnxm1, dnym1, 
-     &                  dnzm1, c1c2, c1c5, c3c4, c1345, conz1, c1, c2, 
-     &                  c3, c4, c5, c4dssp, c5dssp, dtdssp, dttx1, bt,
-     &                  dttx2, dtty1, dtty2, dttz1, dttz2, c2dttx1, 
-     &                  c2dtty1, c2dttz1, comz1, comz4, comz5, comz6, 
-     &                  c3c4tx3, c3c4ty3, c3c4tz3, c2iv, con43, con16,
-     &                  stage_n
-
-
-      integer IMAX, JMAX, KMAX, IMAXP, JMAXP
-
-      parameter (IMAX=problem_size,JMAX=problem_size,KMAX=problem_size)
-      parameter (IMAXP=IMAX/2*2,JMAXP=JMAX/2*2)
-
-c---------------------------------------------------------------------
-c   To improve cache performance, first two dimensions padded by 1 
-c   for even number sizes only
-c---------------------------------------------------------------------
-      double precision 
-     &   u       (5, 0:IMAXP, 0:JMAXP, 0:KMAX),
-     &   us      (   0:IMAXP, 0:JMAXP, 0:KMAX),
-     &   vs      (   0:IMAXP, 0:JMAXP, 0:KMAX),
-     &   ws      (   0:IMAXP, 0:JMAXP, 0:KMAX),
-     &   qs      (   0:IMAXP, 0:JMAXP, 0:KMAX),
-     &   rho_i   (   0:IMAXP, 0:JMAXP, 0:KMAX),
-     &   speed   (   0:IMAXP, 0:JMAXP, 0:KMAX),
-     &   square  (   0:IMAXP, 0:JMAXP, 0:KMAX),
-     &   rhs     (5, 0:IMAXP, 0:JMAXP, 0:KMAX),
-     &   forcing (5, 0:IMAXP, 0:JMAXP, 0:KMAX)
-
-      common /fields/  u, us, vs, ws, qs, rho_i, speed, square, 
-     &                 rhs, forcing
-
-      double precision cv(0:problem_size-1),   rhon(0:problem_size-1),
-     &                 rhos(0:problem_size-1), rhoq(0:problem_size-1),
-     &                 cuf(0:problem_size-1),  q(0:problem_size-1),
-     &                 ue(0:problem_size-1,5), buf(0:problem_size-1,5),
-     &                 rhon_(0:problem_size-1,0:problem_size-1),
-     &                 cv_(0:problem_size-1,0:problem_size-1)
-      common /work_1d/ cv,rhon,rhos,rhoq, cuf, q, ue, buf,rhon_,cv_
-
-      double precision
-     &   lhs(0:2,1:5,0:IMAXP, 0:JMAXP, 0:KMAX)
-      common /work_lhs/ lhs
-
-c-----------------------------------------------------------------------
-c   Timer constants
-c-----------------------------------------------------------------------
-      integer t_rhsx,t_rhsy,t_rhsz,t_xsolve,t_ysolve,t_zsolve,
-     &        t_rdis1,t_rdis2,t_tzetar,t_ninvr,t_pinvr,t_add,
-     &        t_rhs,t_txinvr,t_last,t_total
-      logical timeron
-      parameter (t_total = 1)
-      parameter (t_rhsx = 2)
-      parameter (t_rhsy = 3)
-      parameter (t_rhsz = 4)
-      parameter (t_rhs = 5)
-      parameter (t_xsolve = 6)
-      parameter (t_ysolve = 7)
-      parameter (t_zsolve = 8)
-      parameter (t_rdis1 = 9)
-      parameter (t_rdis2 = 10)
-      parameter (t_txinvr = 11)
-      parameter (t_pinvr = 12)
-      parameter (t_ninvr = 13)
-      parameter (t_tzetar = 14)
-      parameter (t_add = 15)
-      parameter (t_last = 15)
-	  
-!DVM$ SHADOW lhs(0:0,0:0,2:2,2:2,2:2)
-!DVM$ SHADOW (0:0,2:3,2:3,2:3) :: rhs,forcing,u
-!DVM$ SHADOW (2:3,2:3,2:3) :: qs,us,ws,vs,speed,square,rho_i
-
-!DVM$ DISTRIBUTE u(*,BLOCK,BLOCK,BLOCK)
-!DVM$ ALIGN (*,i,j,k) WITH u(*,i,j,k) :: forcing,rhs
-!DVM$ ALIGN (*,*,i,j,k) WITH u(*,i,j,k) :: lhs
-!DVM$ ALIGN (i,j,k) WITH u(*,i,j,k) :: square,speed,rho_i,qs,ws,vs,us
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/initialize.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/initialize.for
deleted file mode 100644
index 0a4a1e7..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/initialize.for
+++ /dev/null
@@ -1,189 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine  initialize
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c This subroutine initializes the field variable u using 
-c tri-linear transfinite interpolation of the boundary values     
-c---------------------------------------------------------------------
-
-       include 'header.h'
-  
-       integer i, j, k, m, ix, iy, iz
-       double precision  xi, eta, zeta, Pface(5,3,2), Pxi, Peta, 
-     >                   Pzeta, temp(5)
-
-!DVM$ region
-!DVM$ parallel (k,j,i) on u(*,i,j,k), private(zeta, eta, xi, ix, pxi, m,
-!DVM$& pface, iy, peta, iz, pzeta, temp)
-      do k = 0, problem_size-1
-         do j = 0, problem_size-1
-            do i = 0, problem_size-1
-               u(1,i,j,k) = 1.0
-               u(2,i,j,k) = 0.0
-               u(3,i,j,k) = 0.0
-               u(4,i,j,k) = 0.0
-               u(5,i,j,k) = 1.0
-			   
-               zeta = dble(k) * dnzm1
-               eta = dble(j) * dnym1
-               xi = dble(i) * dnxm1		
-			   
-               do ix = 1, 2
-                 Pxi = dble(ix-1)
-
-                 do  m = 1, 5
-                   Pface(m,1,ix) =  ce(m,1) +
-     >             Pxi*(ce(m,2)+Pxi*(ce(m,5) +Pxi*(ce(m,8) +
-     >             Pxi*ce(m,11))))+eta*(ce(m,3) + eta*(ce(m,6)
-     >             + eta*(ce(m,9) + eta*ce(m,12))))+
-     >             zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >             zeta*ce(m,13))))
-                 end do
-              end do
-
-              do iy = 1, 2
-                 Peta = dble(iy-1)
-                 do  m = 1, 5
-                   Pface(m,2,iy) =  ce(m,1) +
-     >             xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + 
-     >             xi*ce(m,11)))) +
-     >             Peta*(ce(m,3) +Peta*(ce(m,6) +Peta*(ce(m,9)+
-     >             Peta*ce(m,12))))+
-     >             zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >             zeta*ce(m,13))))
-                end do
-              end do
-
-              do iz = 1, 2
-                Pzeta = dble(iz-1)
-                do  m = 1, 5
-                 Pface(m,3,iz) =  ce(m,1) +
-     >           xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + 
-     >           xi*ce(m,11)))) +
-     >           eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9)+
-     >           eta*ce(m,12))))+
-     >           Pzeta*(ce(m,4) + Pzeta*(ce(m,7) + Pzeta*(ce(m,10) + 
-     >           Pzeta*ce(m,13))))
-                end do
-             end do
-
-             do   m = 1, 5
-                Pxi   = xi   * Pface(m,1,2) + 
-     >            (1.0d0-xi)   * Pface(m,1,1)
-                Peta  = eta  * Pface(m,2,2) + 
-     >            (1.0d0-eta)  * Pface(m,2,1)
-                Pzeta = zeta * Pface(m,3,2) + 
-     >            (1.0d0-zeta) * Pface(m,3,1)
- 
-                u(m,i,j,k) = Pxi + Peta + Pzeta - 
-     >             Pxi*Peta - Pxi*Pzeta - Peta*Pzeta + 
-     >             Pxi*Peta*Pzeta	
-             end do	 
-			 
-             zeta = dble(k) * dnzm1
-             eta = dble(j) * dnym1
-             xi = 0.0d0			 
-             if( i .eq. 0) then
-!             call exact_solution(xi, eta, zeta, temp)
-              do  m = 1, 5
-               temp(m) =  ce(m,1) +
-     >         xi*(ce(m,2)+xi*(ce(m,5)+xi*(ce(m,8)+xi*ce(m,11))))+
-     >         eta*(ce(m,3)+eta*(ce(m,6)+eta*(ce(m,9)+eta*ce(m,12))))+
-     >         zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >         zeta*ce(m,13))))
-              end do
-              do  m = 1, 5
-                u(m,i,j,k) = temp(m)
-              end do
-	         endif
-			 
-             xi = 1.0d0	
-             if( i .eq. problem_size-1) then
-!             call exact_solution(xi, eta, zeta, temp)
-              do  m = 1, 5
-               temp(m) =  ce(m,1) +
-     >         xi*(ce(m,2)+xi*(ce(m,5)+xi*(ce(m,8)+xi*ce(m,11))))+
-     >         eta*(ce(m,3)+eta*(ce(m,6)+eta*(ce(m,9)+eta*ce(m,12))))+
-     >         zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >         zeta*ce(m,13))))
-              end do
-              do  m = 1, 5
-                u(m,i,j,k) = temp(m)
-              end do
-	         endif			 
-
-             zeta = dble(k) * dnzm1
-             eta = 0.0d0
-             xi = dble(i) * dnxm1
-	         if( j .eq. 0) then
-!             call exact_solution(xi, eta, zeta, temp)
-               do  m = 1, 5
-                 temp(m) =  ce(m,1) +
-     >           xi*(ce(m,2)+xi*(ce(m,5)+xi*(ce(m,8)+xi*ce(m,11))))+
-     >           eta*(ce(m,3)+eta*(ce(m,6)+eta*(ce(m,9)+eta*ce(m,12))))
-     >           +zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >           zeta*ce(m,13))))
-               end do
-               do  m = 1, 5
-                 u(m,i,j,k) = temp(m)
-               end do
-             endif
-			 
-             eta = 1.0d0			 
-	         if( j .eq. problem_size-1) then
-!             call exact_solution(xi, eta, zeta, temp)
-               do  m = 1, 5
-                 temp(m) =  ce(m,1) +
-     >           xi*(ce(m,2)+xi*(ce(m,5)+xi*(ce(m,8)+xi*ce(m,11))))+
-     >           eta*(ce(m,3)+eta*(ce(m,6)+eta*(ce(m,9)+eta*ce(m,12))))
-     >           +zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >           zeta*ce(m,13))))
-               end do
-               do  m = 1, 5
-                 u(m,i,j,k) = temp(m)
-               end do
-             endif	
-			 
-             zeta = 0.0d0
-             eta = dble(j) * dnym1
-             xi = dble(i) *dnxm1			 
-	         if( k .eq. 0) then
-!             call exact_solution(xi, eta, zeta, temp)
-               do  m = 1, 5
-                 temp(m) =  ce(m,1) +
-     >           xi*(ce(m,2)+xi*(ce(m,5)+xi*(ce(m,8)+xi*ce(m,11))))+
-     >           eta*(ce(m,3)+eta*(ce(m,6)+eta*(ce(m,9)+eta*ce(m,12))))
-     >           +zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >           zeta*ce(m,13))))
-               end do
-               do  m = 1, 5
-                 u(m,i,j,k) = temp(m)
-               end do
-             endif	
-			 
-             zeta = 1.0d0	
-	         if( k .eq. problem_size-1) then
-!             call exact_solution(xi, eta, zeta, temp)
-               do  m = 1, 5
-                 temp(m) =  ce(m,1) +
-     >           xi*(ce(m,2)+xi*(ce(m,5)+xi*(ce(m,8)+xi*ce(m,11))))+
-     >           eta*(ce(m,3)+eta*(ce(m,6)+eta*(ce(m,9)+eta*ce(m,12))))
-     >           +zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >           zeta*ce(m,13))))
-               end do
-               do  m = 1, 5
-                 u(m,i,j,k) = temp(m)
-               end do
-             endif	
-           end do
-        end do
-      end do
-!DVM$ end region
-
-       return
-       end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/print_result.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/print_result.for
deleted file mode 100644
index 7123b64..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/print_result.for
+++ /dev/null
@@ -1,121 +0,0 @@
-      subroutine print_results(name, class, n1, n2, n3, niter, 
-     >               t, mops, optype, verified, npbversion, 
-     >               compiletime, cs1, cs2, cs3, cs4, cs5, cs6, cs7)
-      
-      implicit none
-      character name*(*)
-      character class*1
-      integer   n1, n2, n3, niter, j
-      double precision t, mops
-      character optype*24, size*15
-      logical   verified
-      character*(*) npbversion, compiletime, 
-     >              cs1, cs2, cs3, cs4, cs5, cs6, cs7
-      integer   num_threads, max_threads, i
-      max_threads = 1
-      num_threads = 1
-
-         write (*, 2) name
- 2       format(//, ' ', A, ' Benchmark Completed.')
-
-         write (*, 3) Class
- 3       format(' Class           = ', 12x, a12)
-
-c   If this is not a grid-based problem (EP, FT, CG), then
-c   we only print n1, which contains some measure of the
-c   problem size. In that case, n2 and n3 are both zero.
-c   Otherwise, we print the grid size n1xn2xn3
-
-         if ((n2 .eq. 0) .and. (n3 .eq. 0)) then
-            if (name(1:2) .eq. 'EP') then
-               write(size, '(f15.0)' ) 2.d0**n1
-               j = 15
-               if (size(j:j) .eq. '.') j = j - 1
-               write (*,42) size(1:j)
- 42            format(' Size            = ',9x, a15)
-            else
-               write (*,44) n1
- 44            format(' Size            = ',12x, i12)
-            endif
-         else
-            write (*, 4) n1,n2,n3
- 4          format(' Size            =  ',9x, i4,'x',i4,'x',i4)
-         endif
-
-         write (*, 5) niter
- 5       format(' Iterations      = ', 12x, i12)
-         
-         write (*, 6) t
- 6       format(' Time in seconds = ',12x, f12.2)
-
-         write (*,7) num_threads
- 7       format(' Total threads   = ', 12x, i12)
-         
-         write (*,8) max_threads
- 8       format(' Avail threads   = ', 12x, i12)
-
-         if (num_threads .ne. max_threads) write (*,88) 
- 88      format(' Warning: Threads used differ from threads available')
-
-         write (*,9) mops
- 9       format(' Mop/s total     = ',12x, f12.2)
-
-         write (*,10) mops/float( num_threads )
- 10      format(' Mop/s/thread    = ', 12x, f12.2)        
-
-         write(*, 11) optype
- 11      format(' Operation type  = ', a24)
-
-         if (verified) then 
-            write(*,12) '  SUCCESSFUL'
-         else
-            write(*,12) 'UNSUCCESSFUL'
-         endif
- 12      format(' Verification    = ', 12x, a)
-
-         write(*,13) npbversion
- 13      format(' Version         = ', 12x, a12)
-
-         write(*,14) compiletime
- 14      format(' Compile date    = ', 12x, a12)
-
-
-         write (*,121) cs1
- 121     format(/, ' Compile options:', /, 
-     >          '    F77          = ', A)
-
-         write (*,122) cs2
- 122     format('    FLINK        = ', A)
-
-         write (*,123) cs3
- 123     format('    F_LIB        = ', A)
-
-         write (*,124) cs4
- 124     format('    F_INC        = ', A)
-
-         write (*,125) cs5
- 125     format('    FFLAGS       = ', A)
-
-         write (*,126) cs6
- 126     format('    FLINKFLAGS   = ', A)
-
-         write(*, 127) cs7
- 127     format('    RAND         = ', A)
-        
-         write (*,130)
- 130     format(//' Please send all errors/feedbacks to:'//
-     >            ' NPB Development Team'/
-     >            ' npb@nas.nasa.gov'//)
-c 130     format(//' Please send the results of this run to:'//
-c     >            ' NPB Development Team '/
-c     >            ' Internet: npb@nas.nasa.gov'/
-c     >            ' '/
-c     >            ' If email is not available, send this to:'//
-c     >            ' MS T27A-1'/
-c     >            ' NASA Ames Research Center'/
-c     >            ' Moffett Field, CA  94035-1000'//
-c     >            ' Fax: 650-604-3957'//)
-
-
-         return
-         end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/set_constants.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/set_constants.for
deleted file mode 100644
index f1b8a87..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/set_constants.for
+++ /dev/null
@@ -1,202 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine  set_constants
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       include 'header.h'
-  
-       ce(1,1)  = 2.0d0
-       ce(1,2)  = 0.0d0
-       ce(1,3)  = 0.0d0
-       ce(1,4)  = 4.0d0
-       ce(1,5)  = 5.0d0
-       ce(1,6)  = 3.0d0
-       ce(1,7)  = 0.5d0
-       ce(1,8)  = 0.02d0
-       ce(1,9)  = 0.01d0
-       ce(1,10) = 0.03d0
-       ce(1,11) = 0.5d0
-       ce(1,12) = 0.4d0
-       ce(1,13) = 0.3d0
- 
-       ce(2,1)  = 1.0d0
-       ce(2,2)  = 0.0d0
-       ce(2,3)  = 0.0d0
-       ce(2,4)  = 0.0d0
-       ce(2,5)  = 1.0d0
-       ce(2,6)  = 2.0d0
-       ce(2,7)  = 3.0d0
-       ce(2,8)  = 0.01d0
-       ce(2,9)  = 0.03d0
-       ce(2,10) = 0.02d0
-       ce(2,11) = 0.4d0
-       ce(2,12) = 0.3d0
-       ce(2,13) = 0.5d0
-
-       ce(3,1)  = 2.0d0
-       ce(3,2)  = 2.0d0
-       ce(3,3)  = 0.0d0
-       ce(3,4)  = 0.0d0
-       ce(3,5)  = 0.0d0
-       ce(3,6)  = 2.0d0
-       ce(3,7)  = 3.0d0
-       ce(3,8)  = 0.04d0
-       ce(3,9)  = 0.03d0
-       ce(3,10) = 0.05d0
-       ce(3,11) = 0.3d0
-       ce(3,12) = 0.5d0
-       ce(3,13) = 0.4d0
-
-       ce(4,1)  = 2.0d0
-       ce(4,2)  = 2.0d0
-       ce(4,3)  = 0.0d0
-       ce(4,4)  = 0.0d0
-       ce(4,5)  = 0.0d0
-       ce(4,6)  = 2.0d0
-       ce(4,7)  = 3.0d0
-       ce(4,8)  = 0.03d0
-       ce(4,9)  = 0.05d0
-       ce(4,10) = 0.04d0
-       ce(4,11) = 0.2d0
-       ce(4,12) = 0.1d0
-       ce(4,13) = 0.3d0
-
-       ce(5,1)  = 5.0d0
-       ce(5,2)  = 4.0d0
-       ce(5,3)  = 3.0d0
-       ce(5,4)  = 2.0d0
-       ce(5,5)  = 0.1d0
-       ce(5,6)  = 0.4d0
-       ce(5,7)  = 0.3d0
-       ce(5,8)  = 0.05d0
-       ce(5,9)  = 0.04d0
-       ce(5,10) = 0.03d0
-       ce(5,11) = 0.1d0
-       ce(5,12) = 0.3d0
-       ce(5,13) = 0.2d0
-
-       c1 = 1.4d0
-       c2 = 0.4d0
-       c3 = 0.1d0
-       c4 = 1.0d0
-       c5 = 1.4d0
-
-       bt = dsqrt(0.5d0)
-
-       dnxm1 = 1.0d0 / dble(problem_size-1)
-       dnym1 = 1.0d0 / dble(problem_size-1)
-       dnzm1 = 1.0d0 / dble(problem_size-1)
-
-       c1c2 = c1 * c2
-       c1c5 = c1 * c5
-       c3c4 = c3 * c4
-       c1345 = c1c5 * c3c4
-
-       conz1 = (1.0d0-c1c5)
-
-       tx1 = 1.0d0 / (dnxm1 * dnxm1)
-       tx2 = 1.0d0 / (2.0d0 * dnxm1)
-       tx3 = 1.0d0 / dnxm1
-
-       ty1 = 1.0d0 / (dnym1 * dnym1)
-       ty2 = 1.0d0 / (2.0d0 * dnym1)
-       ty3 = 1.0d0 / dnym1
- 
-       tz1 = 1.0d0 / (dnzm1 * dnzm1)
-       tz2 = 1.0d0 / (2.0d0 * dnzm1)
-       tz3 = 1.0d0 / dnzm1
-
-       dx1 = 0.75d0
-       dx2 = 0.75d0
-       dx3 = 0.75d0
-       dx4 = 0.75d0
-       dx5 = 0.75d0
-
-       dy1 = 0.75d0
-       dy2 = 0.75d0
-       dy3 = 0.75d0
-       dy4 = 0.75d0
-       dy5 = 0.75d0
-
-       dz1 = 1.0d0
-       dz2 = 1.0d0
-       dz3 = 1.0d0
-       dz4 = 1.0d0
-       dz5 = 1.0d0
-
-       dxmax = dmax1(dx3, dx4)
-       dymax = dmax1(dy2, dy4)
-       dzmax = dmax1(dz2, dz3)
-
-       dssp = 0.25d0 * dmax1(dx1, dmax1(dy1, dz1) )
-
-       c4dssp = 4.0d0 * dssp
-       c5dssp = 5.0d0 * dssp
-
-       dttx1 = dt*tx1
-       dttx2 = dt*tx2
-       dtty1 = dt*ty1
-       dtty2 = dt*ty2
-       dttz1 = dt*tz1
-       dttz2 = dt*tz2
-
-       c2dttx1 = 2.0d0*dttx1
-       c2dtty1 = 2.0d0*dtty1
-       c2dttz1 = 2.0d0*dttz1
-
-       dtdssp = dt*dssp
-
-       comz1  = dtdssp
-       comz4  = 4.0d0*dtdssp
-       comz5  = 5.0d0*dtdssp
-       comz6  = 6.0d0*dtdssp
-
-       c3c4tx3 = c3c4*tx3
-       c3c4ty3 = c3c4*ty3
-       c3c4tz3 = c3c4*tz3
-
-       dx1tx1 = dx1*tx1
-       dx2tx1 = dx2*tx1
-       dx3tx1 = dx3*tx1
-       dx4tx1 = dx4*tx1
-       dx5tx1 = dx5*tx1
-        
-       dy1ty1 = dy1*ty1
-       dy2ty1 = dy2*ty1
-       dy3ty1 = dy3*ty1
-       dy4ty1 = dy4*ty1
-       dy5ty1 = dy5*ty1
-        
-       dz1tz1 = dz1*tz1
-       dz2tz1 = dz2*tz1
-       dz3tz1 = dz3*tz1
-       dz4tz1 = dz4*tz1
-       dz5tz1 = dz5*tz1
-
-       c2iv  = 2.5d0
-       con43 = 4.0d0/3.0d0
-       con16 = 1.0d0/6.0d0
-        
-       xxcon1 = c3c4tx3*con43*tx3
-       xxcon2 = c3c4tx3*tx3
-       xxcon3 = c3c4tx3*conz1*tx3
-       xxcon4 = c3c4tx3*con16*tx3
-       xxcon5 = c3c4tx3*c1c5*tx3
-
-       yycon1 = c3c4ty3*con43*ty3
-       yycon2 = c3c4ty3*ty3
-       yycon3 = c3c4ty3*conz1*ty3
-       yycon4 = c3c4ty3*con16*ty3
-       yycon5 = c3c4ty3*c1c5*ty3
-
-       zzcon1 = c3c4tz3*con43*tz3
-       zzcon2 = c3c4tz3*tz3
-       zzcon3 = c3c4tz3*conz1*tz3
-       zzcon4 = c3c4tz3*con16*tz3
-       zzcon5 = c3c4tz3*c1c5*tz3
-
-       return
-       end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/sp.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/sp.for
deleted file mode 100644
index fb9c2cf..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/sp.for
+++ /dev/null
@@ -1,231 +0,0 @@
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3.1       !
-!                                                                         !
-!                       D V M H     V E R S I O N                         !
-!                                                                         !
-!                                   S P                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!-------------------------------------------------------------------------!
-
-c---------------------------------------------------------------------
-c
-c Authors:
-c      Original:
-c          R. Van der Wijngaart
-c          W. Saphir
-c          H. Jin
-c      Optimize for DVMH:
-c          Kolganov A.S.
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-       program SP
-c---------------------------------------------------------------------
-
-       include  'header.h'
-      
-       integer          i, niter, step, fstatus, n3
-       external         timer_read
-       double precision mflops, t, tmax, timer_read, trecs(t_last)
-       logical          verified
-       character        class
-       character        t_names(t_last)*8
-
-c---------------------------------------------------------------------
-c      Read input file (if it exists), else take
-c      defaults from parameters
-c---------------------------------------------------------------------
-          
-       open (unit=2,file='timer.flag',status='old', iostat=fstatus)
-       if (fstatus .eq. 0) then
-         timeron = .true.
-         t_names(t_total) = 'total'
-         t_names(t_rhsx) = 'rhsx'
-         t_names(t_rhsy) = 'rhsy'
-         t_names(t_rhsz) = 'rhsz'
-         t_names(t_rhs) = 'rhs'
-         t_names(t_xsolve) = 'xsolve'
-         t_names(t_ysolve) = 'ysolve'
-         t_names(t_zsolve) = 'zsolve'
-         t_names(t_rdis1) = 'redist1'
-         t_names(t_rdis2) = 'redist2'
-         t_names(t_tzetar) = 'tzetar'
-         t_names(t_ninvr) = 'ninvr'
-         t_names(t_pinvr) = 'pinvr'
-         t_names(t_txinvr) = 'txinvr'
-         t_names(t_add) = 'add'
-         close(2)
-       else
-         timeron = .false.
-       endif
-
-       write(*, 1000)
-       open (unit=2,file='inputsp.data',status='old', iostat=fstatus)
-
-       if (fstatus .eq. 0) then
-         write(*,233) 
- 233     format(' Reading from input file inputsp.data')
-         read (2,*) niter
-         read (2,*) dt
-         read (2,*) grid_points(1), grid_points(2), grid_points(3)
-         close(2)
-       else
-         write(*,234) 
-         niter = niter_default
-         dt    = dt_default
-         grid_points(1) = problem_size
-         grid_points(2) = problem_size
-         grid_points(3) = problem_size
-       endif
- 234   format(' No input file inputsp.data. Using compiled defaults')
-       open (unit = 2,file = 'inputStage',status = 'old',iostat = fstat
-     &us)	
-      if (fstatus .eq. 0) then
-         read (unit = 2,fmt = *) stage_n
-         close (unit = 2)
-      else  
-         stage_n = 0
-      endif 
-      write(*,*) 'stage = ', stage_n
-	  
-       write(*, 1001) problem_size, problem_size, problem_size
-       write(*, 1002) niter, dt
-       write(*, *)
-
- 1000  format(//, ' NAS Parallel Benchmarks (NPB3.3.1-DVMH)',
-     >            ' - SP Benchmark', /)
- 1001  format(' Size: ', i4, 'x', i4, 'x', i4)
- 1002  format(' Iterations: ', i4, '    dt:  ', F11.7)
- 1003  format(' Number of available threads: ', i5)
-
-       if ( (problem_size .gt. IMAX) .or.
-     >      (problem_size .gt. JMAX) .or.
-     >      (problem_size .gt. KMAX) ) then
-             print *, (grid_points(i),i=1,3)
-             print *,' Problem size too big for compiled array sizes'
-             goto 999
-       endif
-       nx2 = problem_size - 2
-       ny2 = problem_size - 2
-       nz2 = problem_size - 2
-
-       call set_constants
-       call exact_rhs
-
-       call initialize
-       call adi_first
-       call adi_first
-       call initialize	   
-	   
-       do i = 1, t_last
-          call timer_clear(i)
-       end do
-       call timer_start(1)
-!DVM$ BARRIER
-       do  step = 1, niter
-
-          if (mod(step, 20) .eq. 0 .or. step .eq. 1) then
-             write(*, 200) step
- 200         format(' Time step ', i4)
-          endif
-
-          call adi
-
-       end do
-       call timer_stop(1)
-       tmax = timer_read(1)
-
-       call verify(niter, class, verified)
-
-       if( tmax .ne. 0. ) then
-          n3 = problem_size*problem_size*problem_size
-          t = (problem_size+problem_size+problem_size)/3.0
-          mflops = (881.174 * float( n3 )
-     >             -4683.91 * t**2
-     >             +11484.5 * t
-     >             -19272.4) * float( niter ) / (tmax*1000000.0d0)
-       else
-          mflops = 0.0
-       endif
-
-      call print_results('SP', class, problem_size, 
-     >     problem_size, problem_size, niter, 
-     >     tmax, mflops, '          floating point', 
-     >     verified, npbversion,compiletime, cs1, cs2, cs3, cs4, cs5, 
-     >     cs6, '(none)')
-
-c---------------------------------------------------------------------
-c      More timers
-c---------------------------------------------------------------------
-       if (.not.timeron) goto 999
-
-       do i=1, t_last
-          trecs(i) = timer_read(i)
-       end do
-       if (tmax .eq. 0.0) tmax = 1.0
-
-       write(*,800)
- 800   format('  SECTION   Time (secs)')
-
-       do i=1, t_last
-          write(*,810) t_names(i), trecs(i), trecs(i)*100./tmax
-          if (i.eq.t_rhs) then
-             t = trecs(t_rhsx) + trecs(t_rhsy) + trecs(t_rhsz)
-             write(*,820) 'sub-rhs', t, t*100./tmax
-             t = trecs(t_rhs) - t
-             write(*,820) 'rest-rhs', t, t*100./tmax
-          elseif (i.eq.t_zsolve) then
-             t = trecs(t_zsolve) - trecs(t_rdis1) - trecs(t_rdis2)
-             write(*,820) 'sub-zsol', t, t*100./tmax
-          elseif (i.eq.t_rdis2) then
-             t = trecs(t_rdis1) + trecs(t_rdis2)
-             write(*,820) 'redist', t, t*100./tmax
-          endif
- 810      format(2x,a8,':',f9.3,'  (',f6.2,'%)')
- 820      format('    --> ',a8,':',f9.3,'  (',f6.2,'%)')
-       end do
-
- 999   continue
-
-       end
-	   
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine  adi_first
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       call compute_rhs(1)
-       call x_solve
-       call y_solve
-       call z_solve
-
-       return
-       end
-	   
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine  adi
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-!DVM$ interval 1
-       call compute_rhs(1)
-!DVM$ end interval	   
-!DVM$ interval 12	   
-       call x_solve
-!DVM$ end interval	   
-!DVM$ interval 13	   
-       call y_solve
-!DVM$ end interval	   	   
-!DVM$ interval 14	   
-       call z_solve
-!DVM$ end interval	   
-
-       return
-       end	   
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/timers.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/timers.for
deleted file mode 100644
index f60983a..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/timers.for
+++ /dev/null
@@ -1,99 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine timer_clear(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      elapsed(n) = 0.0
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_start(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      start(n) = elapsed_time()
-
-      return
-      end
-      
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine timer_stop(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      external         elapsed_time
-      double precision elapsed_time
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-
-      double precision t, now
-      now = elapsed_time()
-      t = now - start(n)
-      elapsed(n) = elapsed(n) + t
-
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function timer_read(n)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-      integer n
-      double precision start(64), elapsed(64)
-      common /tt/ start, elapsed
-      
-      timer_read = elapsed(n)
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision function elapsed_time()
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      implicit none
-
-      double precision t,dvtime
-      t = dvtime()
-      elapsed_time = t
-
-      return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/verify.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/verify.for
deleted file mode 100644
index 1201002..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/verify.for
+++ /dev/null
@@ -1,356 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-        subroutine verify(no_time_steps, class, verified)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c  verification routine                         
-c---------------------------------------------------------------------
-
-        include 'header.h'
-
-        double precision xcrref(5),xceref(5),xcrdif(5),xcedif(5), 
-     >                   epsilon, xce(5), xcr(5), dtref
-        integer m, no_time_steps
-        character class
-        logical verified
-
-c---------------------------------------------------------------------
-c   tolerance level
-c---------------------------------------------------------------------
-        epsilon = 1.0d-08
-
-c---------------------------------------------------------------------
-c   compute the error norm and the residual norm, and exit if not printing
-c---------------------------------------------------------------------
-
-        call error_norm(xce)
-        call compute_rhs(0)
-        call rhs_norm(xcr)
-
-        do m = 1, 5
-           xcr(m) = xcr(m) / dt
-        enddo
-
-        class = 'U'
-        verified = .true.
-
-        do m = 1,5
-           xcrref(m) = 1.0
-           xceref(m) = 1.0
-        end do
-
-c---------------------------------------------------------------------
-c    reference data for 12X12X12 grids after 100 time steps, with DT = 1.50d-02
-c---------------------------------------------------------------------
-        if ( (problem_size  .eq. 12     ) .and. 
-     >       (problem_size  .eq. 12     ) .and.
-     >       (problem_size  .eq. 12     ) .and.
-     >       (no_time_steps   .eq. 100    ))  then
-
-           class = 'S'
-           dtref = 1.5d-2
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-           xcrref(1) = 2.7470315451339479d-02
-           xcrref(2) = 1.0360746705285417d-02
-           xcrref(3) = 1.6235745065095532d-02
-           xcrref(4) = 1.5840557224455615d-02
-           xcrref(5) = 3.4849040609362460d-02
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-           xceref(1) = 2.7289258557377227d-05
-           xceref(2) = 1.0364446640837285d-05
-           xceref(3) = 1.6154798287166471d-05
-           xceref(4) = 1.5750704994480102d-05
-           xceref(5) = 3.4177666183390531d-05
-
-
-c---------------------------------------------------------------------
-c    reference data for 36X36X36 grids after 400 time steps, with DT = 1.5d-03
-c---------------------------------------------------------------------
-        elseif ( (problem_size .eq. 36) .and. 
-     >           (problem_size .eq. 36) .and.
-     >           (problem_size .eq. 36) .and.
-     >           (no_time_steps . eq. 400) ) then
-
-           class = 'W'
-           dtref = 1.5d-3
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-           xcrref(1) = 0.1893253733584d-02
-           xcrref(2) = 0.1717075447775d-03
-           xcrref(3) = 0.2778153350936d-03
-           xcrref(4) = 0.2887475409984d-03
-           xcrref(5) = 0.3143611161242d-02
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-           xceref(1) = 0.7542088599534d-04
-           xceref(2) = 0.6512852253086d-05
-           xceref(3) = 0.1049092285688d-04
-           xceref(4) = 0.1128838671535d-04
-           xceref(5) = 0.1212845639773d-03
-
-c---------------------------------------------------------------------
-c    reference data for 64X64X64 grids after 400 time steps, with DT = 1.5d-03
-c---------------------------------------------------------------------
-        elseif ( (problem_size .eq. 64) .and. 
-     >           (problem_size .eq. 64) .and.
-     >           (problem_size .eq. 64) .and.
-     >           (no_time_steps . eq. 400) ) then
-
-           class = 'A'
-           dtref = 1.5d-3
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-           xcrref(1) = 2.4799822399300195d0
-           xcrref(2) = 1.1276337964368832d0
-           xcrref(3) = 1.5028977888770491d0
-           xcrref(4) = 1.4217816211695179d0
-           xcrref(5) = 2.1292113035138280d0
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-           xceref(1) = 1.0900140297820550d-04
-           xceref(2) = 3.7343951769282091d-05
-           xceref(3) = 5.0092785406541633d-05
-           xceref(4) = 4.7671093939528255d-05
-           xceref(5) = 1.3621613399213001d-04
-
-c---------------------------------------------------------------------
-c    reference data for 102X102X102 grids after 400 time steps,
-c    with DT = 1.0d-03
-c---------------------------------------------------------------------
-        elseif ( (problem_size .eq. 102) .and. 
-     >           (problem_size .eq. 102) .and.
-     >           (problem_size .eq. 102) .and.
-     >           (no_time_steps . eq. 400) ) then
-
-           class = 'B'
-           dtref = 1.0d-3
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-           xcrref(1) = 0.6903293579998d+02
-           xcrref(2) = 0.3095134488084d+02
-           xcrref(3) = 0.4103336647017d+02
-           xcrref(4) = 0.3864769009604d+02
-           xcrref(5) = 0.5643482272596d+02
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-           xceref(1) = 0.9810006190188d-02
-           xceref(2) = 0.1022827905670d-02
-           xceref(3) = 0.1720597911692d-02
-           xceref(4) = 0.1694479428231d-02
-           xceref(5) = 0.1847456263981d-01
-
-c---------------------------------------------------------------------
-c    reference data for 162X162X162 grids after 400 time steps,
-c    with DT = 0.67d-03
-c---------------------------------------------------------------------
-        elseif ( (problem_size .eq. 162) .and. 
-     >           (problem_size .eq. 162) .and.
-     >           (problem_size .eq. 162) .and.
-     >           (no_time_steps . eq. 400) ) then
-
-           class = 'C'
-           dtref = 0.67d-3
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-           xcrref(1) = 0.5881691581829d+03
-           xcrref(2) = 0.2454417603569d+03
-           xcrref(3) = 0.3293829191851d+03
-           xcrref(4) = 0.3081924971891d+03
-           xcrref(5) = 0.4597223799176d+03
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-           xceref(1) = 0.2598120500183d+00
-           xceref(2) = 0.2590888922315d-01
-           xceref(3) = 0.5132886416320d-01
-           xceref(4) = 0.4806073419454d-01
-           xceref(5) = 0.5483377491301d+00
-
-c---------------------------------------------------------------------
-c    reference data for 408X408X408 grids after 500 time steps,
-c    with DT = 0.3d-03
-c---------------------------------------------------------------------
-        elseif ( (problem_size .eq. 408) .and. 
-     >           (problem_size .eq. 408) .and.
-     >           (problem_size .eq. 408) .and.
-     >           (no_time_steps . eq. 500) ) then
-
-           class = 'D'
-           dtref = 0.30d-3
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-           xcrref(1) = 0.1044696216887d+05
-           xcrref(2) = 0.3204427762578d+04
-           xcrref(3) = 0.4648680733032d+04
-           xcrref(4) = 0.4238923283697d+04
-           xcrref(5) = 0.7588412036136d+04
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-           xceref(1) = 0.5089471423669d+01
-           xceref(2) = 0.5323514855894d+00
-           xceref(3) = 0.1187051008971d+01
-           xceref(4) = 0.1083734951938d+01
-           xceref(5) = 0.1164108338568d+02
-
-c---------------------------------------------------------------------
-c    reference data for 1020X1020X1020 grids after 500 time steps,
-c    with DT = 0.1d-03
-c---------------------------------------------------------------------
-        elseif ( (problem_size .eq. 1020) .and. 
-     >           (problem_size .eq. 1020) .and.
-     >           (problem_size .eq. 1020) .and.
-     >           (no_time_steps . eq. 500) ) then
-
-           class = 'E'
-           dtref = 0.10d-3
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-           xcrref(1) = 0.6255387422609d+05
-           xcrref(2) = 0.1495317020012d+05
-           xcrref(3) = 0.2347595750586d+05
-           xcrref(4) = 0.2091099783534d+05
-           xcrref(5) = 0.4770412841218d+05
-
-c---------------------------------------------------------------------
-c    Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-           xceref(1) = 0.6742735164909d+02
-           xceref(2) = 0.5390656036938d+01
-           xceref(3) = 0.1680647196477d+02
-           xceref(4) = 0.1536963126457d+02
-           xceref(5) = 0.1575330146156d+03
-
-
-        else
-           verified = .false.
-        endif
-
-c---------------------------------------------------------------------
-c    verification test for residuals if gridsize is one of 
-c    the defined grid sizes above (class .ne. 'U')
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c    Compute the difference of solution values and the known reference values.
-c---------------------------------------------------------------------
-        do m = 1, 5
-           
-           xcrdif(m) = dabs((xcr(m)-xcrref(m))/xcrref(m)) 
-           xcedif(m) = dabs((xce(m)-xceref(m))/xceref(m))
-           
-        enddo
-
-c---------------------------------------------------------------------
-c    Output the comparison of computed results to known cases.
-c---------------------------------------------------------------------
-
-        if (class .ne. 'U') then
-           write(*, 1990) class
- 1990      format(' Verification being performed for class ', a)
-           write (*,2000) epsilon
- 2000      format(' accuracy setting for epsilon = ', E20.13)
-           verified = (dabs(dt-dtref) .le. epsilon)
-           if (.not.verified) then  
-              class = 'U'
-              write (*,1000) dtref
- 1000         format(' DT does not match the reference value of ', 
-     >                 E15.8)
-           endif
-        else 
-           write(*, 1995)
- 1995      format(' Unknown class')
-        endif
-
-
-        if (class .ne. 'U') then
-           write (*, 2001) 
-        else
-           write (*, 2005)
-        endif
-
- 2001   format(' Comparison of RMS-norms of residual')
- 2005   format(' RMS-norms of residual')
-        do m = 1, 5
-           if (class .eq. 'U') then
-              write(*, 2015) m, xcr(m)
-           else if (xcrdif(m) .le. epsilon .and. 
-     &              (.not. isnan(xcrdif(m)))) then
-              write (*,2011) m,xcr(m),xcrref(m),xcrdif(m)
-           else 
-              verified = .false.
-              write (*,2010) m,xcr(m),xcrref(m),xcrdif(m)
-           endif
-        enddo
-
-        if (class .ne. 'U') then
-           write (*,2002)
-        else
-           write (*,2006)
-        endif
- 2002   format(' Comparison of RMS-norms of solution error')
- 2006   format(' RMS-norms of solution error')
-        
-        do m = 1, 5
-           if (class .eq. 'U') then
-              write(*, 2015) m, xce(m)
-           else if (xcedif(m) .le. epsilon .and. 
-     &              (.not. isnan(xcedif(m)))) then
-              write (*,2011) m,xce(m),xceref(m),xcedif(m)
-           else
-              verified = .false.
-              write (*,2010) m,xce(m),xceref(m),xcedif(m)
-           endif
-        enddo
-        
- 2010   format(' FAILURE: ', i2, E20.13, E20.13, E20.13)
- 2011   format('          ', i2, E20.13, E20.13, E20.13)
- 2015   format('          ', i2, E20.13)
-        
-        if (class .eq. 'U') then
-           write(*, 2022)
-           write(*, 2023)
- 2022      format(' No reference values provided')
- 2023      format(' No verification performed')
-        else if (verified) then
-           write(*, 2020)
- 2020      format(' Verification Successful')
-        else
-           write(*, 2021)
- 2021      format(' Verification failed')
-        endif
-
-        return
-
-
-        end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve.for
deleted file mode 100644
index 21088b0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve.for
+++ /dev/null
@@ -1,392 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine x_solve
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c this function performs the solution of the approximate factorization
-c step in the x-direction for all five matrix components
-c simultaneously. The Thomas algorithm is employed to solve the
-c systems for the x-lines. Boundary conditions are non-periodic
-c---------------------------------------------------------------------
-
-       include 'header.h'
-
-       integer i, j, k, i1, i2, m, m1
-       double precision  ru1, fac1, fac2, rhs__(5,0:2),t1,t2
-       double precision lhs__(5,0:2), lhsm__(5,0:2), lhsp__(5,0:2)
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       if (timeron) call timer_start(t_xsolve)
-
-!DVM$ region local(lhs)
-!DVM$ parallel (k,j) on u(*,*,j,k)
-!DVM$& , CUDA_BLOCK(32,4)
-!DVM$& ,private(m,i,ru1,i1,i2,fac1,fac2,lhs__, lhsp__, lhsm__, rhs__,
-!DVM$& t1,t2)
-       do  k = 1, nz2
-         do  j = 1, ny2
-           do  i = 0, problem_size-1       
-            
-             if(i .eq. 0) then
-               lhs__(1,0) = 0.0d0
-               lhsp__(1,0) = 0.0d0
-               lhsm__(1,0) = 0.0d0 
-
-               lhs__(2,0) = 0.0d0
-               lhsp__(2,0) = 0.0d0
-               lhsm__(2,0) = 0.0d0 
-
-               lhs__(3,0) = 1.0d0
-               lhsp__(3,0) = 1.0d0
-               lhsm__(3,0) = 1.0d0 
-
-               lhs__(4,0) = 0.0d0
-               lhsp__(4,0) = 0.0d0
-               lhsm__(4,0) = 0.0d0 
-
-               lhs__(5,0) = 0.0d0
-               lhsp__(5,0) = 0.0d0
-               lhsm__(5,0) = 0.0d0             
-
-                lhs__(1,1) =   0.0d0                
-                ru1 = c3c4*1.0d0/u(1,1-1,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(2,1) = - dttx2 * us(1-1,j,k) - dttx1 * ru1
-                ru1 = c3c4*1.0d0/u(1,1,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(3,1) =   1.0d0 + c2dttx1 * ru1
-                ru1 = c3c4*1.0d0/u(1,1+1,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(4,1) =   dttx2 * us(1+1,j,k) - dttx1 * ru1
-                lhs__(5,1) =   0.0d0
-         
-                lhs__(3,1) = lhs__(3,1) + comz5
-                lhs__(4,1) = lhs__(4,1) - comz4
-                lhs__(5,1) = lhs__(5,1) + comz1
-
-                lhsp__(1,1) = lhs__(1,1)
-                lhsp__(2,1) = lhs__(2,1) - dttx2 * speed(1-1,j,k)
-                lhsp__(3,1) = lhs__(3,1)
-                lhsp__(4,1) = lhs__(4,1) + dttx2 * speed(1+1,j,k)
-                lhsp__(5,1) = lhs__(5,1)
-                lhsm__(1,1) = lhs__(1,1)
-                lhsm__(2,1) = lhs__(2,1) + dttx2 * speed(1-1,j,k)
-                lhsm__(3,1) = lhs__(3,1)
-                lhsm__(4,1) = lhs__(4,1) - dttx2 * speed(1+1,j,k)
-                lhsm__(5,1) = lhs__(5,1)
-             endif
-             
-             if(i + 2 .lt. problem_size-1) then
-                m = i + 2
-                lhs__(1,2) =   0.0d0
-                
-                ru1 = c3c4*1.0d0/u(1,m-1,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(2,2) = - dttx2 * us(m-1,j,k) - dttx1 * ru1
-                ru1 = c3c4*1.0d0/u(1,m,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(3,2) =   1.0d0 + c2dttx1 * ru1
-                ru1 = c3c4*1.0d0/u(1,m+1,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(4,2) =   dttx2 * us(m+1,j,k) - dttx1 * ru1
-                lhs__(5,2) =   0.0d0
-         
-               if(m .eq. 1) then
-                lhs__(3,2) = lhs__(3,2) + comz5
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. 2) then
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1 
-               else if(m .ge. 3 .and. m .le. nx2-2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. nx2-1) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-               else if(m .eq. nx2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz5
-               endif
-
-                lhsp__(1,2) = lhs__(1,2)
-                lhsp__(2,2) = lhs__(2,2) - dttx2 * speed(m-1,j,k)
-                lhsp__(3,2) = lhs__(3,2)
-                lhsp__(4,2) = lhs__(4,2) + dttx2 * speed(m+1,j,k)
-                lhsp__(5,2) = lhs__(5,2)
-                lhsm__(1,2) = lhs__(1,2)
-                lhsm__(2,2) = lhs__(2,2) + dttx2 * speed(m-1,j,k)
-                lhsm__(3,2) = lhs__(3,2)
-                lhsm__(4,2) = lhs__(4,2) - dttx2 * speed(m+1,j,k)
-                lhsm__(5,2) = lhs__(5,2)
-              else if(i + 2 .eq. nx2+1) then
-               lhs__(1,2) = 0.0d0
-               lhsp__(1,2) = 0.0d0
-               lhsm__(1,2) = 0.0d0 
-
-               lhs__(2,2) = 0.0d0
-               lhsp__(2,2) = 0.0d0
-               lhsm__(2,2) = 0.0d0 
-
-               lhs__(3,2) = 1.0d0
-               lhsp__(3,2) = 1.0d0
-               lhsm__(3,2) = 1.0d0 
-
-               lhs__(4,2) = 0.0d0
-               lhsp__(4,2) = 0.0d0
-               lhsm__(4,2) = 0.0d0 
-
-               lhs__(5,2) = 0.0d0
-               lhsp__(5,2) = 0.0d0
-               lhsm__(5,2) = 0.0d0  
-              endif           
-!********************************** end of init
-
-                i1 = i + 1
-                i2 = i + 2
-                fac1 = 1.d0/lhs__(3,0)
-                lhs__(4,0)  = fac1*lhs__(4,0)
-                lhs__(5,0)  = fac1*lhs__(5,0)
-                do    m = 1, 3
-                   rhs(m,i,j,k) = fac1*rhs(m,i,j,k)
-                end do
-                
-             if(i .le. nx2-1) then
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)               
-              lhs__(2,2)=lhs__(2,2)-lhs__(1,2)*lhs__(4,0)
-              lhs__(3,2)=lhs__(3,2)-lhs__(1,2)*lhs__(5,0)
-               do    m = 1, 3
-                rhs(m,i1,j,k)=rhs(m,i1,j,k)-lhs__(2,1)*rhs(m,i,j,k)
-                rhs(m,i2,j,k)=rhs(m,i2,j,k)-lhs__(1,2)*rhs(m,i,j,k)
-               end do
-               
-             else 
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)
-               fac2  = 1.d0/lhs__(3,1)
-               do  m = 1, 3
-               rhs(m,i1,j,k) = rhs(m,i1,j,k)-lhs__(2,1)*rhs(m,i,j,k)
-               rhs(m,i1,j,k) = fac2*rhs(m,i1,j,k)
-               end do
-             endif
-
-                m = 4
-                fac1  = 1.d0/lhsp__(3,0)
-                lhsp__(4,0)  = fac1*lhsp__(4,0)
-                lhsp__(5,0)  = fac1*lhsp__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsp__(3,1)=lhsp__(3,1)-lhsp__(2,1)*lhsp__(4,0)
-          lhsp__(4,1)=lhsp__(4,1)-lhsp__(2,1)*lhsp__(5,0)               
-          rhs(m,i1,j,k) = rhs(m,i1,j,k)-lhsp__(2,1)*rhs(m,i,j,k)
-              if(i .lt. nx2) then
-          lhsp__(2,2)=lhsp__(2,2)-lhsp__(1,2)*lhsp__(4,0)
-          lhsp__(3,2)=lhsp__(3,2)-lhsp__(1,2)*lhsp__(5,0)
-                rhs(m,i2,j,k)=rhs(m,i2,j,k)-lhsp__(1,2)*rhs(m,i,j,k)
-              endif
-                m = 5
-                fac1 = 1.d0/lhsm__(3,0)
-                lhsm__(4,0)  = fac1*lhsm__(4,0)
-                lhsm__(5,0)  = fac1*lhsm__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsm__(3,1)=lhsm__(3,1)-lhsm__(2,1)*lhsm__(4,0)
-          lhsm__(4,1)=lhsm__(4,1)-lhsm__(2,1)*lhsm__(5,0)
-          rhs(m,i1,j,k)=rhs(m,i1,j,k) -lhsm__(2,1)*rhs(m,i,j,k)
-              if(i .lt. nx2) then
-          lhsm__(2,2)=lhsm__(2,2)-lhsm__(1,2)*lhsm__(4,0)
-          lhsm__(3,2)=lhsm__(3,2)-lhsm__(1,2)*lhsm__(5,0)
-          rhs(m,i2,j,k)=rhs(m,i2,j,k) -lhsm__(1,2)*rhs(m,i,j,k)
-              endif
-              
-              if(i .eq. nx2) then
-               rhs(4,i1,j,k) = rhs(4,i1,j,k)/lhsp__(3,1)
-               rhs(5,i1,j,k) = rhs(5,i1,j,k)/lhsm__(3,1)              
-               do   m = 1, 3
-                rhs(m,i,j,k) = rhs(m,i,j,k)-lhs__(4,0)*rhs(m,i1,j,k)
-               end do
-               rhs(4,i,j,k) = rhs(4,i,j,k)-lhsp__(4,0)*rhs(4,i1,j,k)
-               rhs(5,i,j,k) = rhs(5,i,j,k)-lhsm__(4,0)*rhs(5,i1,j,k)
-              endif
-              
-             
-               lhs(0,4,i,j,k) = lhs__(4,0)
-               lhs(1,4,i,j,k) = lhsp__(4,0)
-               lhs(2,4,i,j,k) = lhsm__(4,0)
-               
-               lhs(0,5,i,j,k) = lhs__(5,0)
-               lhs(1,5,i,j,k) = lhsp__(5,0)
-               lhs(2,5,i,j,k) = lhsm__(5,0)
-             
-                 lhs__(1,0) = lhs__(1,1)
-                 lhsp__(1,0) = lhsp__(1,1)
-                 lhsm__(1,0) = lhsm__(1,1)               
-                 lhs__(1,1) = lhs__(1,2)
-                 lhsp__(1,1) = lhsp__(1,2)
-                 lhsm__(1,1) = lhsm__(1,2)
-                 
-                 lhs__(2,0) = lhs__(2,1)
-                 lhsp__(2,0) = lhsp__(2,1)
-                 lhsm__(2,0) = lhsm__(2,1)               
-                 lhs__(2,1) = lhs__(2,2)
-                 lhsp__(2,1) = lhsp__(2,2)
-                 lhsm__(2,1) = lhsm__(2,2)
-
-                 lhs__(3,0) = lhs__(3,1)
-                 lhsp__(3,0) = lhsp__(3,1)
-                 lhsm__(3,0) = lhsm__(3,1)               
-                 lhs__(3,1) = lhs__(3,2)
-                 lhsp__(3,1) = lhsp__(3,2)
-                 lhsm__(3,1) = lhsm__(3,2)
-
-                 lhs__(4,0) = lhs__(4,1)
-                 lhsp__(4,0) = lhsp__(4,1)
-                 lhsm__(4,0) = lhsm__(4,1)               
-                 lhs__(4,1) = lhs__(4,2)
-                 lhsp__(4,1) = lhsp__(4,2)
-                 lhsm__(4,1) = lhsm__(4,2)
-
-                 lhs__(5,0) = lhs__(5,1)
-                 lhsp__(5,0) = lhsp__(5,1)
-                 lhsm__(5,0) = lhsm__(5,1)               
-                 lhs__(5,1) = lhs__(5,2)
-                 lhsp__(5,1) = lhsp__(5,2)
-                 lhsm__(5,1) = lhsm__(5,2)   
-             enddo
-         
-             i = problem_size-3
-             rhs__(1,2) = rhs(1,i+2,j,k)
-             rhs__(2,2) = rhs(2,i+2,j,k)
-             rhs__(3,2) = rhs(3,i+2,j,k)
-             rhs__(4,2) = rhs(4,i+2,j,k)
-             rhs__(5,2) = rhs(5,i+2,j,k)
-
-             rhs__(1,1) = rhs(1,i+1,j,k)
-             rhs__(2,1) = rhs(2,i+1,j,k)
-             rhs__(3,1) = rhs(3,i+1,j,k)
-             rhs__(4,1) = rhs(4,i+1,j,k)
-             rhs__(5,1) = rhs(5,i+1,j,k)
-
-             rhs__(1,0) = rhs(1,i,j,k)
-             rhs__(2,0) = rhs(2,i,j,k)
-             rhs__(3,0) = rhs(3,i,j,k)
-             rhs__(4,0) = rhs(4,i,j,k)
-             rhs__(5,0) = rhs(5,i,j,k)
-
-             rhs__(1,0) = rhs__(1,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(1,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(1,2)
-             rhs__(2,0) = rhs__(2,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(2,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(2,2)     
-             rhs__(3,0) = rhs__(3,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(3,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(3,2)
-
-             rhs__(4,0) = rhs__(4,0) - 
-     >                          lhs(1,4,i,j,k)*rhs__(4,1) -
-     >                          lhs(1,5,i,j,k)*rhs__(4,2)
-             rhs__(5,0) = rhs__(5,0) - 
-     >                          lhs(2,4,i,j,k)*rhs__(5,1) -
-     >                          lhs(2,5,i,j,k)*rhs__(5,2)
-     
-             rhs__(1,2) = rhs__(1,1)
-             rhs__(2,2) = rhs__(2,1)
-             rhs__(3,2) = rhs__(3,1)
-             rhs__(4,2) = rhs__(4,1)
-             rhs__(5,2) = rhs__(5,1)
-
-             rhs__(1,1) = rhs__(1,0)
-             rhs__(2,1) = rhs__(2,0)
-             rhs__(3,1) = rhs__(3,0)
-             rhs__(4,1) = rhs__(4,0)
-             rhs__(5,1) = rhs__(5,0)
-             
-             do i = problem_size-4, 0, -1
-             rhs__(1,0) = rhs(1,i,j,k)
-             rhs__(2,0) = rhs(2,i,j,k)
-             rhs__(3,0) = rhs(3,i,j,k)
-             rhs__(4,0) = rhs(4,i,j,k)
-             rhs__(5,0) = rhs(5,i,j,k)
-
-             rhs__(1,0) = rhs__(1,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(1,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(1,2)
-             rhs__(2,0) = rhs__(2,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(2,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(2,2)     
-             rhs__(3,0) = rhs__(3,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(3,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(3,2)
-
-             rhs__(4,0) = rhs__(4,0) - 
-     >                          lhs(1,4,i,j,k)*rhs__(4,1) -
-     >                          lhs(1,5,i,j,k)*rhs__(4,2)
-             rhs__(5,0) = rhs__(5,0) - 
-     >                          lhs(2,4,i,j,k)*rhs__(5,1) -
-     >                          lhs(2,5,i,j,k)*rhs__(5,2)
-     
-             t1 = bt * rhs__(3,2)
-             t2 = 0.5d0 * ( rhs__(4,2)+rhs__(5,2))
-             rhs(1,i+2,j,k) = -rhs__(2,2)
-             rhs(2,i+2,j,k) =  rhs__(1,2)
-             rhs(3,i+2,j,k) = bt * (rhs__(4,2)-rhs__(5,2))
-             rhs(4,i+2,j,k) = -t1 + t2
-             rhs(5,i+2,j,k) =  t1 + t2
-
-             rhs__(1,2) = rhs__(1,1)
-             rhs__(2,2) = rhs__(2,1)
-             rhs__(3,2) = rhs__(3,1)
-             rhs__(4,2) = rhs__(4,1)
-             rhs__(5,2) = rhs__(5,1)
-
-             rhs__(1,1) = rhs__(1,0)
-             rhs__(2,1) = rhs__(2,0)
-             rhs__(3,1) = rhs__(3,0)
-             rhs__(4,1) = rhs__(4,0)
-             rhs__(5,1) = rhs__(5,0)
-             end do
-             t1 = bt * rhs__(3,2)
-             t2 = 0.5d0 * ( rhs__(4,2)+rhs__(5,2))
-             rhs(1,1,j,k) = -rhs__(2,2)
-             rhs(2,1,j,k) =  rhs__(1,2)
-             rhs(3,1,j,k) = bt * (rhs__(4,2)-rhs__(5,2))
-             rhs(4,1,j,k) = -t1 + t2
-             rhs(5,1,j,k) =  t1 + t2
-          enddo
-       enddo
-
-!DVM$ end region
-       if (timeron) call timer_stop(t_xsolve)
-       return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve_mpi.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve_mpi.for
deleted file mode 100644
index e91802e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/x_solve_mpi.for
+++ /dev/null
@@ -1,321 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine x_solve
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c this function performs the solution of the approximate factorization
-c step in the x-direction for all five matrix components
-c simultaneously. The Thomas algorithm is employed to solve the
-c systems for the x-lines. Boundary conditions are non-periodic
-c---------------------------------------------------------------------
-
-       include 'header.h'
-
-       integer i, j, k, i1, i2, m
-       double precision  ru1, fac1, fac2, t1,t2,t3
-       double precision lhs__(5,0:2), lhsm__(5,0:2), lhsp__(5,0:2)
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       if (timeron) call timer_start(t_xsolve)
-
-!DVM$ region local(lhs)
-
-!DVM$ parallel (k,j,i) on rhs(*,i,j,k)
-!DVM$& ,private(m,ru1,i1,i2,fac1,fac2,lhs__, lhsp__, lhsm__)
-!DVM$& ,ACROSS(OUT:rhs(0:0,0:2,0:0,0:0), lhs(0:0,0:0,0:2,0:0,0:0))
-!DVM$& ,stage(stage_n)
-       do  k = 1, nz2
-         do  j = 1, ny2
-           do  i = 0, problem_size-1       
-            
-             if(i .eq. 0) then
-               lhs__(1,0) = 0.0d0
-               lhsp__(1,0) = 0.0d0
-               lhsm__(1,0) = 0.0d0 
-
-               lhs__(2,0) = 0.0d0
-               lhsp__(2,0) = 0.0d0
-               lhsm__(2,0) = 0.0d0 
-
-               lhs__(3,0) = 1.0d0
-               lhsp__(3,0) = 1.0d0
-               lhsm__(3,0) = 1.0d0 
-
-               lhs__(4,0) = 0.0d0
-               lhsp__(4,0) = 0.0d0
-               lhsm__(4,0) = 0.0d0 
-
-               lhs__(5,0) = 0.0d0
-               lhsp__(5,0) = 0.0d0
-               lhsm__(5,0) = 0.0d0             
-
-                lhs__(1,1) =   0.0d0                
-                ru1 = c3c4*1.0d0/u(1,i,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(2,1) = - dttx2 * us(i,j,k) - dttx1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i+1,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(3,1) =   1.0d0 + c2dttx1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i+2,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(4,1) =   dttx2 * us(i+2,j,k) - dttx1 * ru1
-                lhs__(5,1) =   0.0d0
-         
-                lhs__(3,1) = lhs__(3,1) + comz5
-                lhs__(4,1) = lhs__(4,1) - comz4
-                lhs__(5,1) = lhs__(5,1) + comz1
-
-                lhsp__(1,1) = lhs__(1,1)
-                lhsp__(2,1) = lhs__(2,1) - dttx2 * speed(i,j,k)
-                lhsp__(3,1) = lhs__(3,1)
-                lhsp__(4,1) = lhs__(4,1) + dttx2 * speed(i+2,j,k)
-                lhsp__(5,1) = lhs__(5,1)
-                lhsm__(1,1) = lhs__(1,1)
-                lhsm__(2,1) = lhs__(2,1) + dttx2 * speed(i,j,k)
-                lhsm__(3,1) = lhs__(3,1)
-                lhsm__(4,1) = lhs__(4,1) - dttx2 * speed(i+2,j,k)
-                lhsm__(5,1) = lhs__(5,1)
-             else
-               do   m = 1, 5
-                 lhs__(m,0) = lhs(0,m,i,j,k)
-                 lhsp__(m,0) = lhs(1,m,i,j,k)
-                 lhsm__(m,0) = lhs(2,m,i,j,k)
-               
-                 lhs__(m,1) = lhs(0,m,i+1,j,k)
-                 lhsp__(m,1) = lhs(1,m,i+1,j,k)
-                 lhsm__(m,1) = lhs(2,m,i+1,j,k)        
-               enddo             
-             endif
-             
-             if(i + 2 .lt. problem_size-1) then
-                m = i + 2
-                lhs__(1,2) =   0.0d0
-                
-                ru1 = c3c4*1.0d0/u(1,m-1,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(2,2) = - dttx2 * us(m-1,j,k) - dttx1 * ru1
-                ru1 = c3c4*1.0d0/u(1,m,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(3,2) =   1.0d0 + c2dttx1 * ru1
-                ru1 = c3c4*1.0d0/u(1,m+1,j,k)
-                ru1 = dmax1(dx2+con43*ru1, 
-     >                          dx5+c1c5*ru1,
-     >                          dxmax+ru1,
-     >                          dx1)
-                lhs__(4,2) =   dttx2 * us(m+1,j,k) - dttx1 * ru1
-                lhs__(5,2) =   0.0d0
-         
-               if(m .eq. 1) then
-                lhs__(3,2) = lhs__(3,2) + comz5
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. 2) then
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1 
-               else if(m .ge. 3 .and. m .le. nx2-2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. nx2-1) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-               else if(m .eq. nx2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz5
-               endif
-
-                lhsp__(1,2) = lhs__(1,2)
-                lhsp__(2,2) = lhs__(2,2) - dttx2 * speed(m-1,j,k)
-                lhsp__(3,2) = lhs__(3,2)
-                lhsp__(4,2) = lhs__(4,2) + dttx2 * speed(m+1,j,k)
-                lhsp__(5,2) = lhs__(5,2)
-                lhsm__(1,2) = lhs__(1,2)
-                lhsm__(2,2) = lhs__(2,2) + dttx2 * speed(m-1,j,k)
-                lhsm__(3,2) = lhs__(3,2)
-                lhsm__(4,2) = lhs__(4,2) - dttx2 * speed(m+1,j,k)
-                lhsm__(5,2) = lhs__(5,2)
-              else if(i + 2 .eq. nx2+1) then
-               lhs__(1,2) = 0.0d0
-               lhsp__(1,2) = 0.0d0
-               lhsm__(1,2) = 0.0d0 
-
-               lhs__(2,2) = 0.0d0
-               lhsp__(2,2) = 0.0d0
-               lhsm__(2,2) = 0.0d0 
-
-               lhs__(3,2) = 1.0d0
-               lhsp__(3,2) = 1.0d0
-               lhsm__(3,2) = 1.0d0 
-
-               lhs__(4,2) = 0.0d0
-               lhsp__(4,2) = 0.0d0
-               lhsm__(4,2) = 0.0d0 
-
-               lhs__(5,2) = 0.0d0
-               lhsp__(5,2) = 0.0d0
-               lhsm__(5,2) = 0.0d0  
-              endif           
-!********************************** end of init
-
-                i1 = i + 1
-                i2 = i + 2
-                fac1 = 1.d0/lhs__(3,0)
-                lhs__(4,0)  = fac1*lhs__(4,0)
-                lhs__(5,0)  = fac1*lhs__(5,0)
-                do    m = 1, 3
-                   rhs(m,i,j,k) = fac1*rhs(m,i,j,k)
-                end do
-                
-             if(i .le. nx2-1) then
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)               
-              lhs__(2,2)=lhs__(2,2)-lhs__(1,2)*lhs__(4,0)
-              lhs__(3,2)=lhs__(3,2)-lhs__(1,2)*lhs__(5,0)
-               do    m = 1, 3
-                rhs(m,i1,j,k)=rhs(m,i1,j,k)-lhs__(2,1)*rhs(m,i,j,k)
-                rhs(m,i2,j,k)=rhs(m,i2,j,k)-lhs__(1,2)*rhs(m,i,j,k)
-               end do
-               
-             else 
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)
-			   if (lhs__(3,1) .ne. 0) then
-				  fac2  = 1.d0/lhs__(3,1)
-			   else
-			      fac2 = 0
-			   endif
-               do  m = 1, 3
-               rhs(m,i1,j,k) = rhs(m,i1,j,k)-lhs__(2,1)*rhs(m,i,j,k)
-               rhs(m,i1,j,k) = fac2*rhs(m,i1,j,k)
-               end do
-             endif
-
-                m = 4
-                fac1  = 1.d0/lhsp__(3,0)
-                lhsp__(4,0)  = fac1*lhsp__(4,0)
-                lhsp__(5,0)  = fac1*lhsp__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsp__(3,1)=lhsp__(3,1)-lhsp__(2,1)*lhsp__(4,0)
-          lhsp__(4,1)=lhsp__(4,1)-lhsp__(2,1)*lhsp__(5,0)               
-          rhs(m,i1,j,k) = rhs(m,i1,j,k)-lhsp__(2,1)*rhs(m,i,j,k)
-              if(i .lt. nx2) then
-          lhsp__(2,2)=lhsp__(2,2)-lhsp__(1,2)*lhsp__(4,0)
-          lhsp__(3,2)=lhsp__(3,2)-lhsp__(1,2)*lhsp__(5,0)
-                rhs(m,i2,j,k)=rhs(m,i2,j,k)-lhsp__(1,2)*rhs(m,i,j,k)
-              endif
-                m = 5
-                fac1 = 1.d0/lhsm__(3,0)
-                lhsm__(4,0)  = fac1*lhsm__(4,0)
-                lhsm__(5,0)  = fac1*lhsm__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsm__(3,1)=lhsm__(3,1)-lhsm__(2,1)*lhsm__(4,0)
-          lhsm__(4,1)=lhsm__(4,1)-lhsm__(2,1)*lhsm__(5,0)
-          rhs(m,i1,j,k)=rhs(m,i1,j,k) -lhsm__(2,1)*rhs(m,i,j,k)
-              if(i .lt. nx2) then
-          lhsm__(2,2)=lhsm__(2,2)-lhsm__(1,2)*lhsm__(4,0)
-          lhsm__(3,2)=lhsm__(3,2)-lhsm__(1,2)*lhsm__(5,0)
-          rhs(m,i2,j,k)=rhs(m,i2,j,k) -lhsm__(1,2)*rhs(m,i,j,k)
-              endif
-              
-              if(i .eq. nx2) then
-               rhs(4,i1,j,k) = rhs(4,i1,j,k)/lhsp__(3,1)
-               rhs(5,i1,j,k) = rhs(5,i1,j,k)/lhsm__(3,1)              
-               do   m = 1, 3
-                rhs(m,i,j,k) = rhs(m,i,j,k)-lhs__(4,0)*rhs(m,i1,j,k)
-               end do
-               rhs(4,i,j,k) = rhs(4,i,j,k)-lhsp__(4,0)*rhs(4,i1,j,k)
-               rhs(5,i,j,k) = rhs(5,i,j,k)-lhsm__(4,0)*rhs(5,i1,j,k)
-              endif
-
-               do m = 1, 5
-                 lhs(0,m,i,j,k) = lhs__(m,0)
-                 lhs(1,m,i,j,k) = lhsp__(m,0)
-                 lhs(2,m,i,j,k) = lhsm__(m,0)
-               
-                 lhs(0,m,i+1,j,k) = lhs__(m,1)
-                 lhs(1,m,i+1,j,k) = lhsp__(m,1)
-                 lhs(2,m,i+1,j,k) = lhsm__(m,1)
-                 
-                 if (i .lt. nx2) then 
-                   lhs(0,m,i+2,j,k) = lhs__(m,2)
-                   lhs(1,m,i+2,j,k) = lhsp__(m,2)
-                   lhs(2,m,i+2,j,k) = lhsm__(m,2) 
-                 endif
-               enddo  
-             enddo
-          enddo
-       enddo
-
-!DVM$ PARALLEL (k,j,i) on rhs(*,i,j,k),ACROSS(rhs(0:0,0:2,0:0,0:0))
-!DVM$& ,stage(stage_n)
-       do  k = 1, nz2
-          do  j = 1, ny2       
-             do i = problem_size-3, 0, -1
-             
-                 rhs(1,i,j,k) = rhs(1,i,j,k) - 
-     &                          lhs(0,4,i,j,k)*rhs(1,i+1,j,k) -
-     &                          lhs(0,5,i,j,k)*rhs(1,i+2,j,k)
-                 rhs(2,i,j,k) = rhs(2,i,j,k) - 
-     &                          lhs(0,4,i,j,k)*rhs(2,i+1,j,k) -
-     &                          lhs(0,5,i,j,k)*rhs(2,i+2,j,k)     
-                 rhs(3,i,j,k) = rhs(3,i,j,k) - 
-     &                          lhs(0,4,i,j,k)*rhs(3,i+1,j,k) -
-     &                          lhs(0,5,i,j,k)*rhs(3,i+2,j,k)
-
-                 rhs(4,i,j,k) = rhs(4,i,j,k) - 
-     &                          lhs(1,4,i,j,k)*rhs(4,i+1,j,k) -
-     &                          lhs(1,5,i,j,k)*rhs(4,i+2,j,k)
-                 rhs(5,i,j,k) = rhs(5,i,j,k) - 
-     &                          lhs(2,4,i,j,k)*rhs(5,i+1,j,k) -
-     &                          lhs(2,5,i,j,k)*rhs(5,i+2,j,k)                     
-             end do
-          enddo
-       enddo    
-
-!DVM$ PARALLEL (k,j,i) on rhs(*,i,j,k),PRIVATE(t1,t2,t3)
-       do  k = 1, nz2
-          do  j = 1, ny2       
-             do i = 1, nx2
-                 t1 = bt * rhs(3,i,j,k)
-                 t2 = 0.5d0 * (rhs(4,i,j,k)+rhs(5,i,j,k))
-                 t3 = rhs(1,i,j,k)
-             
-                 rhs(1,i,j,k) = -rhs(2,i,j,k)
-                 rhs(2,i,j,k) =  t3
-                 rhs(3,i,j,k) = bt * (rhs(4,i,j,k)-rhs(5,i,j,k))
-                 rhs(4,i,j,k) = -t1 + t2
-                 rhs(5,i,j,k) =  t1 + t2                 
-             end do
-          enddo
-       enddo       
-!DVM$ end region
-       if (timeron) call timer_stop(t_xsolve)
-       return
-      end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve.for
deleted file mode 100644
index 83575ef..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve.for
+++ /dev/null
@@ -1,396 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine y_solve
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c this function performs the solution of the approximate factorization
-c step in the y-direction for all five matrix components
-c simultaneously. The Thomas algorithm is employed to solve the
-c systems for the y-lines. Boundary conditions are non-periodic
-c---------------------------------------------------------------------
-
-       include 'header.h'
-
-       integer i, j, k, j1, j2, m, m1
-       double precision ru1, fac1, fac2, rhs__(5,0:2),t1,t2
-       double precision lhs__(5,0:2), lhsm__(5,0:2), lhsp__(5,0:2)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       if (timeron) call timer_start(t_ysolve)
-       
-!DVM$ region local(lhs)
-!DVM$ parallel (k,i) on u(*,i,*,k)
-!DVM$& , CUDA_BLOCK(32,4)
-!DVM$& ,private(m,j1,j2,fac1,fac2,ru1,lhs__,lhsp__,lhsm__,j,rhs__,
-!DVM$& t1,t2)
-       do  k = 1, nz2
-         do  i = 1, nx2
-         
-               lhs__(1,0) = 0.0d0
-               lhsp__(1,0) = 0.0d0
-               lhsm__(1,0) = 0.0d0             
-               
-               lhs__(2,0) = 0.0d0
-               lhsp__(2,0) = 0.0d0
-               lhsm__(2,0) = 0.0d0
-
-               lhs__(3,0) = 1.0d0
-               lhsp__(3,0) = 1.0d0
-               lhsm__(3,0) = 1.0d0
-
-               lhs__(4,0) = 0.0d0
-               lhsp__(4,0) = 0.0d0
-               lhsm__(4,0) = 0.0d0
-
-               lhs__(5,0) = 0.0d0
-               lhsp__(5,0) = 0.0d0
-               lhsm__(5,0) = 0.0d0             
-      
-                lhs__(1,1) =   0.0d0
-                
-                ru1 = c3c4*1.0d0/u(1,i,1-1,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(2,1) = - dtty2 * vs(i,1-1,k) - dtty1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,1,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(3,1) =   1.0d0 + c2dtty1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,1+1,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(4,1) =   dtty2 * vs(i,1+1,k) - dtty1 * ru1
-                lhs__(5,1) =   0.0d0
-         
-                lhs__(3,1) = lhs__(3,1) + comz5
-                lhs__(4,1) = lhs__(4,1) - comz4
-                lhs__(5,1) = lhs__(5,1) + comz1
-
-                lhsp__(1,1) = lhs__(1,1)
-                lhsp__(2,1) = lhs__(2,1) - dtty2 * speed(i,1-1,k)
-                lhsp__(3,1) = lhs__(3,1)
-                lhsp__(4,1) = lhs__(4,1) + dtty2 * speed(i,1+1,k)
-                lhsp__(5,1) = lhs__(5,1)
-                lhsm__(1,1) = lhs__(1,1)
-                lhsm__(2,1) = lhs__(2,1) + dtty2 * speed(i,1-1,k)
-                lhsm__(3,1) = lhs__(3,1)
-                lhsm__(4,1) = lhs__(4,1) - dtty2 * speed(i,1+1,k)
-                lhsm__(5,1) = lhs__(5,1)
-      
-           do  j = 0, ny2+1 
-              if(j + 2 .lt. ny2 + 1) then
-                m = j + 2
-                lhs__(1,2) =   0.0d0
-                
-                ru1 = c3c4*1.0d0/u(1,i,m-1,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(2,2) = - dtty2 * vs(i,m-1,k) - dtty1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,m,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(3,2) =   1.0d0 + c2dtty1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,m+1,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(4,2) =   dtty2 * vs(i,m+1,k) - dtty1 * ru1
-                lhs__(5,2) =   0.0d0
-         
-               if(m .eq. 1) then
-                lhs__(3,2) = lhs__(3,2) + comz5
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. 2) then
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1 
-               else if(m .ge. 3 .and. m .le. ny2-2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. ny2-1) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-               else if(m .eq. ny2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz5
-               endif
-
-                lhsp__(1,2) = lhs__(1,2)
-                lhsp__(2,2) = lhs__(2,2) - dtty2 * speed(i,m-1,k)
-                lhsp__(3,2) = lhs__(3,2)
-                lhsp__(4,2) = lhs__(4,2) + dtty2 * speed(i,m+1,k)
-                lhsp__(5,2) = lhs__(5,2)
-                lhsm__(1,2) = lhs__(1,2)
-                lhsm__(2,2) = lhs__(2,2) + dtty2 * speed(i,m-1,k)
-                lhsm__(3,2) = lhs__(3,2)
-                lhsm__(4,2) = lhs__(4,2) - dtty2 * speed(i,m+1,k)
-                lhsm__(5,2) = lhs__(5,2)
-              else if(j + 2 .eq. ny2+1) then
-  
-               lhs__(1,2) = 0.0d0
-               lhsp__(1,2) = 0.0d0
-               lhsm__(1,2) = 0.0d0
-               
-               lhs__(2,2) = 0.0d0
-               lhsp__(2,2) = 0.0d0
-               lhsm__(2,2) = 0.0d0
-
-               lhs__(3,2) = 1.0d0
-               lhsp__(3,2) = 1.0d0
-               lhsm__(3,2) = 1.0d0
-
-               lhs__(4,2) = 0.0d0
-               lhsp__(4,2) = 0.0d0
-               lhsm__(4,2) = 0.0d0
-
-               lhs__(5,2) = 0.0d0
-               lhsp__(5,2) = 0.0d0
-               lhsm__(5,2) = 0.0d0             
-
-              endif           
-!********************************** end of init
-
-                j1 = j + 1
-                j2 = j + 2
-                fac1 = 1.d0/lhs__(3,0)
-                lhs__(4,0)  = fac1*lhs__(4,0)
-                lhs__(5,0)  = fac1*lhs__(5,0)
-                do    m = 1, 3
-                   rhs(m,i,j,k) = fac1*rhs(m,i,j,k)
-                end do
-                
-             if(j .le. ny2-1) then
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)               
-              lhs__(2,2)=lhs__(2,2)-lhs__(1,2)*lhs__(4,0)
-              lhs__(3,2)=lhs__(3,2)-lhs__(1,2)*lhs__(5,0)
-              do    m = 1, 3
-                rhs(m,i,j1,k)=rhs(m,i,j1,k)-lhs__(2,1)*rhs(m,i,j,k)
-                rhs(m,i,j2,k)=rhs(m,i,j2,k)-lhs__(1,2)*rhs(m,i,j,k)
-              end do
-               
-             else 
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)
-               fac2  = 1.d0/lhs__(3,1)
-               do  m = 1, 3
-               rhs(m,i,j1,k) = rhs(m,i,j1,k)-lhs__(2,1)*rhs(m,i,j,k)
-               rhs(m,i,j1,k) = fac2*rhs(m,i,j1,k)
-               end do
-             endif
-
-                m = 4
-                fac1  = 1.d0/lhsp__(3,0)
-                lhsp__(4,0)  = fac1*lhsp__(4,0)
-                lhsp__(5,0)  = fac1*lhsp__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsp__(3,1)=lhsp__(3,1)-lhsp__(2,1)*lhsp__(4,0)
-          lhsp__(4,1)=lhsp__(4,1)-lhsp__(2,1)*lhsp__(5,0)               
-          rhs(m,i,j1,k) = rhs(m,i,j1,k)-lhsp__(2,1)*rhs(m,i,j,k)
-              if(j .lt. ny2) then
-          lhsp__(2,2)=lhsp__(2,2)-lhsp__(1,2)*lhsp__(4,0)
-          lhsp__(3,2)=lhsp__(3,2)-lhsp__(1,2)*lhsp__(5,0)
-                rhs(m,i,j2,k)=rhs(m,i,j2,k)-lhsp__(1,2)*rhs(m,i,j,k)
-              endif
-                m = 5
-                fac1 = 1.d0/lhsm__(3,0)
-                lhsm__(4,0)  = fac1*lhsm__(4,0)
-                lhsm__(5,0)  = fac1*lhsm__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsm__(3,1)=lhsm__(3,1)-lhsm__(2,1)*lhsm__(4,0)
-          lhsm__(4,1)=lhsm__(4,1)-lhsm__(2,1)*lhsm__(5,0)
-          rhs(m,i,j1,k)=rhs(m,i,j1,k) -lhsm__(2,1)*rhs(m,i,j,k)
-              if(j .lt. ny2) then
-          lhsm__(2,2)=lhsm__(2,2)-lhsm__(1,2)*lhsm__(4,0)
-          lhsm__(3,2)=lhsm__(3,2)-lhsm__(1,2)*lhsm__(5,0)
-          rhs(m,i,j2,k)=rhs(m,i,j2,k) -lhsm__(1,2)*rhs(m,i,j,k)
-              endif
-              
-              if(j .eq. ny2) then
-               rhs(4,i,j1,k) = rhs(4,i,j1,k)/lhsp__(3,1)
-               rhs(5,i,j1,k) = rhs(5,i,j1,k)/lhsm__(3,1)              
-               do   m = 1, 3
-                rhs(m,i,j,k) = rhs(m,i,j,k)-lhs__(4,0)*rhs(m,i,j1,k)
-               end do
-               rhs(4,i,j,k) = rhs(4,i,j,k)-lhsp__(4,0)*rhs(4,i,j1,k)
-               rhs(5,i,j,k) = rhs(5,i,j,k)-lhsm__(4,0)*rhs(5,i,j1,k)
-              endif
-               lhs(0,4,i,j,k) = lhs__(4,0)
-               lhs(1,4,i,j,k) = lhsp__(4,0)
-               lhs(2,4,i,j,k) = lhsm__(4,0)
-               
-               lhs(0,5,i,j,k) = lhs__(5,0)
-               lhs(1,5,i,j,k) = lhsp__(5,0)
-               lhs(2,5,i,j,k) = lhsm__(5,0)
-             
-                 lhs__(1,0) = lhs__(1,1)
-                 lhsp__(1,0) = lhsp__(1,1)
-                 lhsm__(1,0) = lhsm__(1,1)               
-                 lhs__(1,1) = lhs__(1,2)
-                 lhsp__(1,1) = lhsp__(1,2)
-                 lhsm__(1,1) = lhsm__(1,2)
-                 
-                 lhs__(2,0) = lhs__(2,1)
-                 lhsp__(2,0) = lhsp__(2,1)
-                 lhsm__(2,0) = lhsm__(2,1)               
-                 lhs__(2,1) = lhs__(2,2)
-                 lhsp__(2,1) = lhsp__(2,2)
-                 lhsm__(2,1) = lhsm__(2,2)
-
-                 lhs__(3,0) = lhs__(3,1)
-                 lhsp__(3,0) = lhsp__(3,1)
-                 lhsm__(3,0) = lhsm__(3,1)               
-                 lhs__(3,1) = lhs__(3,2)
-                 lhsp__(3,1) = lhsp__(3,2)
-                 lhsm__(3,1) = lhsm__(3,2)
-
-                 lhs__(4,0) = lhs__(4,1)
-                 lhsp__(4,0) = lhsp__(4,1)
-                 lhsm__(4,0) = lhsm__(4,1)               
-                 lhs__(4,1) = lhs__(4,2)
-                 lhsp__(4,1) = lhsp__(4,2)
-                 lhsm__(4,1) = lhsm__(4,2)
-
-                 lhs__(5,0) = lhs__(5,1)
-                 lhsp__(5,0) = lhsp__(5,1)
-                 lhsm__(5,0) = lhsm__(5,1)               
-                 lhs__(5,1) = lhs__(5,2)
-                 lhsp__(5,1) = lhsp__(5,2)
-                 lhsm__(5,1) = lhsm__(5,2)                
-             enddo
-
-             j = problem_size-3
-             rhs__(1,2) = rhs(1,i,j+2,k)
-             rhs__(2,2) = rhs(2,i,j+2,k)
-             rhs__(3,2) = rhs(3,i,j+2,k)
-             rhs__(4,2) = rhs(4,i,j+2,k)
-             rhs__(5,2) = rhs(5,i,j+2,k)
-
-             rhs__(1,1) = rhs(1,i,j+1,k)
-             rhs__(2,1) = rhs(2,i,j+1,k)
-             rhs__(3,1) = rhs(3,i,j+1,k)
-             rhs__(4,1) = rhs(4,i,j+1,k)
-             rhs__(5,1) = rhs(5,i,j+1,k)
-
-             rhs__(1,0) = rhs(1,i,j,k)
-             rhs__(2,0) = rhs(2,i,j,k)
-             rhs__(3,0) = rhs(3,i,j,k)
-             rhs__(4,0) = rhs(4,i,j,k)
-             rhs__(5,0) = rhs(5,i,j,k)
-
-             rhs__(1,0) = rhs__(1,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(1,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(1,2)
-             rhs__(2,0) = rhs__(2,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(2,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(2,2)     
-             rhs__(3,0) = rhs__(3,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(3,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(3,2)
-
-             rhs__(4,0) = rhs__(4,0) - 
-     >                          lhs(1,4,i,j,k)*rhs__(4,1) -
-     >                          lhs(1,5,i,j,k)*rhs__(4,2)
-             rhs__(5,0) = rhs__(5,0) - 
-     >                          lhs(2,4,i,j,k)*rhs__(5,1) -
-     >                          lhs(2,5,i,j,k)*rhs__(5,2)
-     
-             rhs__(1,2) = rhs__(1,1)
-             rhs__(2,2) = rhs__(2,1)
-             rhs__(3,2) = rhs__(3,1)
-             rhs__(4,2) = rhs__(4,1)
-             rhs__(5,2) = rhs__(5,1)
-
-             rhs__(1,1) = rhs__(1,0)
-             rhs__(2,1) = rhs__(2,0)
-             rhs__(3,1) = rhs__(3,0)
-             rhs__(4,1) = rhs__(4,0)
-             rhs__(5,1) = rhs__(5,0)
-             
-          do  j = problem_size-4, 0, -1
-             rhs__(1,0) = rhs(1,i,j,k)
-             rhs__(2,0) = rhs(2,i,j,k)
-             rhs__(3,0) = rhs(3,i,j,k)
-             rhs__(4,0) = rhs(4,i,j,k)
-             rhs__(5,0) = rhs(5,i,j,k)
-
-             rhs__(1,0) = rhs__(1,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(1,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(1,2)
-             rhs__(2,0) = rhs__(2,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(2,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(2,2)     
-             rhs__(3,0) = rhs__(3,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(3,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(3,2)
-
-             rhs__(4,0) = rhs__(4,0) - 
-     >                          lhs(1,4,i,j,k)*rhs__(4,1) -
-     >                          lhs(1,5,i,j,k)*rhs__(4,2)
-             rhs__(5,0) = rhs__(5,0) - 
-     >                          lhs(2,4,i,j,k)*rhs__(5,1) -
-     >                          lhs(2,5,i,j,k)*rhs__(5,2)
-	 
-              t1 = bt * rhs__(1,2)
-              t2 = 0.5d0 * (rhs__(4,2) + rhs__(5,2))
-              rhs(1,i,j+2,k) =  bt * (rhs__(4,2) - rhs__(5,2))
-              rhs(2,i,j+2,k) = -rhs__(3,2)
-              rhs(3,i,j+2,k) =  rhs__(2,2)
-              rhs(4,i,j+2,k) = -t1 + t2
-              rhs(5,i,j+2,k) =  t1 + t2
-             
-             rhs__(1,2) = rhs__(1,1)
-             rhs__(2,2) = rhs__(2,1)
-             rhs__(3,2) = rhs__(3,1)
-             rhs__(4,2) = rhs__(4,1)
-             rhs__(5,2) = rhs__(5,1)
-
-             rhs__(1,1) = rhs__(1,0)
-             rhs__(2,1) = rhs__(2,0)
-             rhs__(3,1) = rhs__(3,0)
-             rhs__(4,1) = rhs__(4,0)
-             rhs__(5,1) = rhs__(5,0)             
-          enddo
-            t1 = bt * rhs__(1,2)
-            t2 = 0.5d0 * (rhs__(4,2) + rhs__(5,2))
-            rhs(1,i,j+2,k) =  bt * (rhs__(4,2) - rhs__(5,2))
-            rhs(2,i,j+2,k) = -rhs__(3,2)
-            rhs(3,i,j+2,k) =  rhs__(2,2)
-            rhs(4,i,j+2,k) = -t1 + t2
-            rhs(5,i,j+2,k) =  t1 + t2      
-          enddo
-       enddo
-
-!DVM$ end region
-       if (timeron) call timer_stop(t_ysolve)
-       return
-       end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve_mpi.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve_mpi.for
deleted file mode 100644
index 3972a68..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/y_solve_mpi.for
+++ /dev/null
@@ -1,330 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine y_solve
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c this function performs the solution of the approximate factorization
-c step in the y-direction for all five matrix components
-c simultaneously. The Thomas algorithm is employed to solve the
-c systems for the y-lines. Boundary conditions are non-periodic
-c---------------------------------------------------------------------
-
-       include 'header.h'
-
-       integer i, j, k, j1, j2, m, m1
-       double precision ru1, fac1, fac2, t1,t2,t3
-       double precision lhs__(5,0:2), lhsm__(5,0:2), lhsp__(5,0:2)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       if (timeron) call timer_start(t_ysolve)
-       
-!DVM$ region local(lhs)
-!DVM$ parallel (k,j,i) on rhs(*,i,j,k)
-!DVM$& ,private(m,j1,j2,fac1,fac2,ru1,lhs__,lhsp__,lhsm__)
-!DVM$& ,ACROSS(OUT:rhs(0:0,0:0,0:2,0:0), lhs(0:0,0:0,0:0,0:2,0:0))
-!DVM$& ,stage(stage_n)
-       do  k = 1, nz2
-         do  j = 0, problem_size-1     
-           do  i = 1, nx2
-              if (j .eq. 0) then            
-               lhs__(1,0) = 0.0d0
-               lhsp__(1,0) = 0.0d0
-               lhsm__(1,0) = 0.0d0             
-               
-               lhs__(2,0) = 0.0d0
-               lhsp__(2,0) = 0.0d0
-               lhsm__(2,0) = 0.0d0
-
-               lhs__(3,0) = 1.0d0
-               lhsp__(3,0) = 1.0d0
-               lhsm__(3,0) = 1.0d0
-
-               lhs__(4,0) = 0.0d0
-               lhsp__(4,0) = 0.0d0
-               lhsm__(4,0) = 0.0d0
-
-               lhs__(5,0) = 0.0d0
-               lhsp__(5,0) = 0.0d0
-               lhsm__(5,0) = 0.0d0             
-      
-                lhs__(1,1) =   0.0d0
-                
-                ru1 = c3c4*1.0d0/u(1,i,j,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(2,1) = - dtty2 * 
-     >         u(3,i,0,k) * (1.0d0/u(1,i,j,k))- dtty1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j+1,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(3,1) =   1.0d0 + c2dtty1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j+2,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(4,1) =   dtty2 * 
-     >                u(3,i,2,k) * (1.0d0/u(1,i,j+2,k)) - dtty1 * ru1
-                lhs__(5,1) =   0.0d0
-         
-                lhs__(3,1) = lhs__(3,1) + comz5
-                lhs__(4,1) = lhs__(4,1) - comz4
-                lhs__(5,1) = lhs__(5,1) + comz1
-
-                lhsp__(1,1) = lhs__(1,1)
-                lhsp__(2,1) = lhs__(2,1) - dtty2 * speed(i,j,k)
-                lhsp__(3,1) = lhs__(3,1)
-                lhsp__(4,1) = lhs__(4,1) + dtty2 * speed(i,j+2,k)
-                lhsp__(5,1) = lhs__(5,1)
-                lhsm__(1,1) = lhs__(1,1)
-                lhsm__(2,1) = lhs__(2,1) + dtty2 * speed(i,j,k)
-                lhsm__(3,1) = lhs__(3,1)
-                lhsm__(4,1) = lhs__(4,1) - dtty2 * speed(i,j+2,k)
-                lhsm__(5,1) = lhs__(5,1)
-             else
-               do   m = 1, 5
-                 lhs__(m,0) = lhs(0,m,i,j,k)
-                 lhsp__(m,0) = lhs(1,m,i,j,k)
-                 lhsm__(m,0) = lhs(2,m,i,j,k)
-               
-                 lhs__(m,1) = lhs(0,m,i,j+1,k)
-                 lhsp__(m,1) = lhs(1,m,i,j+1,k)
-                 lhsm__(m,1) = lhs(2,m,i,j+1,k)        
-               enddo             
-             endif
-
-              if(j + 2 .lt. ny2 + 1) then
-                m = j + 2
-                lhs__(1,2) =   0.0d0
-                
-                ru1 = c3c4*1.0d0/u(1,i,m-1,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(2,2) = - dtty2 * 
-     >             u(3,i,m-1,k) * (1.0d0/u(1,i,m-1,k)) - dtty1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,m,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(3,2) =   1.0d0 + c2dtty1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,m+1,k)
-                ru1 = dmax1( dy3 + con43 * ru1,
-     >                           dy5 + c1c5*ru1,
-     >                           dymax + ru1,
-     >                           dy1)
-                lhs__(4,2) =   dtty2 * 
-     >              u(3,i,m+1,k) * (1.0d0/u(1,i,m+1,k)) - dtty1 * ru1
-                lhs__(5,2) =   0.0d0
-         
-               if(m .eq. 1) then
-                lhs__(3,2) = lhs__(3,2) + comz5
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. 2) then
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1 
-               else if(m .ge. 3 .and. m .le. ny2-2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. ny2-1) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-               else if(m .eq. ny2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz5
-               endif
-
-                lhsp__(1,2) = lhs__(1,2)
-                lhsp__(2,2) = lhs__(2,2) - dtty2 * speed(i,m-1,k)
-                lhsp__(3,2) = lhs__(3,2)
-                lhsp__(4,2) = lhs__(4,2) + dtty2 * speed(i,m+1,k)
-                lhsp__(5,2) = lhs__(5,2)
-                lhsm__(1,2) = lhs__(1,2)
-                lhsm__(2,2) = lhs__(2,2) + dtty2 * speed(i,m-1,k)
-                lhsm__(3,2) = lhs__(3,2)
-                lhsm__(4,2) = lhs__(4,2) - dtty2 * speed(i,m+1,k)
-                lhsm__(5,2) = lhs__(5,2)
-              else if(j + 2 .eq. ny2+1) then
-  
-               lhs__(1,2) = 0.0d0
-               lhsp__(1,2) = 0.0d0
-               lhsm__(1,2) = 0.0d0
-               
-               lhs__(2,2) = 0.0d0
-               lhsp__(2,2) = 0.0d0
-               lhsm__(2,2) = 0.0d0
-
-               lhs__(3,2) = 1.0d0
-               lhsp__(3,2) = 1.0d0
-               lhsm__(3,2) = 1.0d0
-
-               lhs__(4,2) = 0.0d0
-               lhsp__(4,2) = 0.0d0
-               lhsm__(4,2) = 0.0d0
-
-               lhs__(5,2) = 0.0d0
-               lhsp__(5,2) = 0.0d0
-               lhsm__(5,2) = 0.0d0             
-
-              endif           
-!********************************** end of init
-
-                j1 = j + 1
-                j2 = j + 2
-                fac1 = 1.d0/lhs__(3,0)
-                lhs__(4,0)  = fac1*lhs__(4,0)
-                lhs__(5,0)  = fac1*lhs__(5,0)
-                do    m = 1, 3
-                   rhs(m,i,j,k) = fac1*rhs(m,i,j,k)
-                end do
-                
-             if(j .le. ny2-1) then
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)               
-              lhs__(2,2)=lhs__(2,2)-lhs__(1,2)*lhs__(4,0)
-              lhs__(3,2)=lhs__(3,2)-lhs__(1,2)*lhs__(5,0)
-              do    m = 1, 3
-                rhs(m,i,j1,k)=rhs(m,i,j1,k)-lhs__(2,1)*rhs(m,i,j,k)
-                rhs(m,i,j2,k)=rhs(m,i,j2,k)-lhs__(1,2)*rhs(m,i,j,k)
-              end do
-               
-             else 
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)
-			   if (lhs__(3,1) .ne. 0) then
-				  fac2  = 1.d0/lhs__(3,1)
-			   else
-			      fac2 = 0
-			   endif
-               do  m = 1, 3
-               rhs(m,i,j1,k) = rhs(m,i,j1,k)-lhs__(2,1)*rhs(m,i,j,k)
-               rhs(m,i,j1,k) = fac2*rhs(m,i,j1,k)
-               end do
-             endif
-
-                m = 4
-                fac1  = 1.d0/lhsp__(3,0)
-                lhsp__(4,0)  = fac1*lhsp__(4,0)
-                lhsp__(5,0)  = fac1*lhsp__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsp__(3,1)=lhsp__(3,1)-lhsp__(2,1)*lhsp__(4,0)
-          lhsp__(4,1)=lhsp__(4,1)-lhsp__(2,1)*lhsp__(5,0)               
-          rhs(m,i,j1,k) = rhs(m,i,j1,k)-lhsp__(2,1)*rhs(m,i,j,k)
-              if(j .lt. ny2) then
-          lhsp__(2,2)=lhsp__(2,2)-lhsp__(1,2)*lhsp__(4,0)
-          lhsp__(3,2)=lhsp__(3,2)-lhsp__(1,2)*lhsp__(5,0)
-                rhs(m,i,j2,k)=rhs(m,i,j2,k)-lhsp__(1,2)*rhs(m,i,j,k)
-              endif
-                m = 5
-                fac1 = 1.d0/lhsm__(3,0)
-                lhsm__(4,0)  = fac1*lhsm__(4,0)
-                lhsm__(5,0)  = fac1*lhsm__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsm__(3,1)=lhsm__(3,1)-lhsm__(2,1)*lhsm__(4,0)
-          lhsm__(4,1)=lhsm__(4,1)-lhsm__(2,1)*lhsm__(5,0)
-          rhs(m,i,j1,k)=rhs(m,i,j1,k) -lhsm__(2,1)*rhs(m,i,j,k)
-              if(j .lt. ny2) then
-          lhsm__(2,2)=lhsm__(2,2)-lhsm__(1,2)*lhsm__(4,0)
-          lhsm__(3,2)=lhsm__(3,2)-lhsm__(1,2)*lhsm__(5,0)
-          rhs(m,i,j2,k)=rhs(m,i,j2,k) -lhsm__(1,2)*rhs(m,i,j,k)
-              endif
-              
-              if(j .eq. ny2) then
-               rhs(4,i,j1,k) = rhs(4,i,j1,k)/lhsp__(3,1)
-               rhs(5,i,j1,k) = rhs(5,i,j1,k)/lhsm__(3,1)              
-               do   m = 1, 3
-                rhs(m,i,j,k) = rhs(m,i,j,k)-lhs__(4,0)*rhs(m,i,j1,k)
-               end do
-               rhs(4,i,j,k) = rhs(4,i,j,k)-lhsp__(4,0)*rhs(4,i,j1,k)
-               rhs(5,i,j,k) = rhs(5,i,j,k)-lhsm__(4,0)*rhs(5,i,j1,k)
-              endif
-               
-               do m = 1,5              
-                 lhs(0,m,i,j,k) = lhs__(m,0)
-                 lhs(1,m,i,j,k) = lhsp__(m,0)
-                 lhs(2,m,i,j,k) = lhsm__(m,0)
-               
-                 lhs(0,m,i,j+1,k) = lhs__(m,1)
-                 lhs(1,m,i,j+1,k) = lhsp__(m,1)
-                 lhs(2,m,i,j+1,k) = lhsm__(m,1)
-                 if (j .lt. ny2) then 
-                   lhs(0,m,i,j+2,k) = lhs__(m,2)
-                   lhs(1,m,i,j+2,k) = lhsp__(m,2)
-                   lhs(2,m,i,j+2,k) = lhsm__(m,2)              
-                 endif               
-               enddo            
-             enddo
-          enddo
-       enddo
-
-!DVM$ parallel (k,j,i) on rhs(*,i,j,k),ACROSS(rhs(0:0,0:0,0:2,0:0))
-!DVM$& ,stage(stage_n)
-       do  k = 1, nz2
-          do  j = problem_size-3, 0, -1    
-            do  i = 1, nx2
-               rhs(1,i,j,k) = rhs(1,i,j,k) - 
-     &                          lhs(0,4,i,j,k)*rhs(1,i,j+1,k) -
-     &                          lhs(0,5,i,j,k)*rhs(1,i,j+2,k)
-               rhs(2,i,j,k) = rhs(2,i,j,k) - 
-     &                          lhs(0,4,i,j,k)*rhs(2,i,j+1,k) -
-     &                          lhs(0,5,i,j,k)*rhs(2,i,j+2,k)
-               rhs(3,i,j,k) = rhs(3,i,j,k) - 
-     &                          lhs(0,4,i,j,k)*rhs(3,i,j+1,k) -
-     &                          lhs(0,5,i,j,k)*rhs(3,i,j+2,k)
-
-               rhs(4,i,j,k) = rhs(4,i,j,k) - 
-     &                          lhs(1,4,i,j,k)*rhs(4,i,j+1,k) -
-     &                          lhs(1,5,i,j,k)*rhs(4,i,j+2,k)
-               rhs(5,i,j,k) = rhs(5,i,j,k) - 
-     &                          lhs(2,4,i,j,k)*rhs(5,i,j+1,k) -
-     &                          lhs(2,5,i,j,k)*rhs(5,i,j+2,k)
-            enddo
-          enddo
-       enddo
-
-!DVM$ parallel (k,j,i) on rhs(*,i,j,k),PRIVATE(t1,t2,t3)
-       do  k = 1, nz2
-          do  j = 1, ny2
-            do  i = 1, nx2
-              t1 = bt * rhs(1,i,j,k)
-              t2 = 0.5d0 * (rhs(4,i,j,k) + rhs(5,i,j,k))
-              t3 = rhs(2,i,j,k)
-              
-              rhs(1,i,j,k) =  bt * (rhs(4,i,j,k) - rhs(5,i,j,k))
-              rhs(2,i,j,k) = -rhs(3,i,j,k)
-              rhs(3,i,j,k) =  t3
-              rhs(4,i,j,k) = -t1 + t2
-              rhs(5,i,j,k) =  t1 + t2  
-            enddo
-          enddo
-       enddo
-       
-!DVM$ end region
-       if (timeron) call timer_stop(t_ysolve)
-       return
-       end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve.for
deleted file mode 100644
index d4df857..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve.for
+++ /dev/null
@@ -1,433 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine z_solve
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c this function performs the solution of the approximate factorization
-c step in the z-direction for all five matrix components
-c simultaneously. The Thomas algorithm is employed to solve the
-c systems for the z-lines. Boundary conditions are non-periodic
-c---------------------------------------------------------------------
-
-       include 'header.h'
-      
-       integer i, j, k, k1, k2, m, m1
-       double precision ru1, fac1, fac2, rhs__(5,0:2)
-       double precision lhs__(5,0:2), lhsm__(5,0:2), lhsp__(5,0:2)
-       double precision t1,t2,t3,ac,xvel,yvel,zvel,btuz,ac2u,uzik1
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c Prepare for z-solve, array redistribution   
-c---------------------------------------------------------------------
-
-       if (timeron) call timer_start(t_zsolve)
-
-!DVM$ region local(lhs)
-!DVM$ parallel (j,i) on u(*,i,j,*)
-!DVM$& , CUDA_BLOCK(32,4)
-!DVM$& ,private(m,k1,k2,ru1,fac1,fac2,k,lhs__,lhsp__,lhsm__,rhs__,
-!DVM$& t1,t2,t3,ac,xvel,yvel,zvel,btuz,ac2u,uzik1)
-      do  j = 1, ny2 
-         do  i = 1, nx2     
-            
-               lhs__(1,0) = 0.0d0
-               lhsp__(1,0) = 0.0d0
-               lhsm__(1,0) = 0.0d0             
-               
-               lhs__(2,0) = 0.0d0
-               lhsp__(2,0) = 0.0d0
-               lhsm__(2,0) = 0.0d0 
-
-               lhs__(3,0) = 1.0d0
-               lhsp__(3,0) = 1.0d0
-               lhsm__(3,0) = 1.0d0 
-
-               lhs__(4,0) = 0.0d0
-               lhsp__(4,0) = 0.0d0
-               lhsm__(4,0) = 0.0d0 
-
-               lhs__(5,0) = 0.0d0
-               lhsp__(5,0) = 0.0d0
-               lhsm__(5,0) = 0.0d0             
-
-
-                lhs__(1,1) =   0.0d0                
-                ru1 = c3c4*1.0d0/u(1,i,j,0)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(2,1) = - dttz2 * ws(i,j,0) - dttz1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j,1)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(3,1) =   1.0d0 + c2dttz1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j,2)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(4,1) =   dttz2 * ws(i,j,2) - dttz1 * ru1
-                lhs__(5,1) =   0.0d0
-         
-                lhs__(3,1) = lhs__(3,1) + comz5
-                lhs__(4,1) = lhs__(4,1) - comz4
-                lhs__(5,1) = lhs__(5,1) + comz1
-
-                lhsp__(1,1) = lhs__(1,1)
-                lhsp__(2,1) = lhs__(2,1) - dttz2 * speed(i,j,1-1)
-                lhsp__(3,1) = lhs__(3,1)
-                lhsp__(4,1) = lhs__(4,1) + dttz2 * speed(i,j,1+1)
-                lhsp__(5,1) = lhs__(5,1)
-                lhsm__(1,1) = lhs__(1,1)
-                lhsm__(2,1) = lhs__(2,1) + dttz2 * speed(i,j,1-1)
-                lhsm__(3,1) = lhs__(3,1)
-                lhsm__(4,1) = lhs__(4,1) - dttz2 * speed(i,j,1+1)
-                lhsm__(5,1) = lhs__(5,1)
-              
-          do  k = 0, nz2+1
-              if(k + 2 .lt. nz2 + 1) then
-                m = k + 2
-                lhs__(1,2) =   0.0d0
-                
-                ru1 = c3c4*1.0d0/u(1,i,j,m-1)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(2,2) = - dttz2 * ws(i,j,m-1) - dttz1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j,m)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(3,2) =   1.0d0 + c2dttz1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j,m+1)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(4,2) =   dttz2 * ws(i,j,m+1) - dttz1 * ru1
-                lhs__(5,2) =   0.0d0
-         
-               if(m .eq. 1) then
-                lhs__(3,2) = lhs__(3,2) + comz5
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. 2) then
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1 
-               else if(m .ge. 3 .and. m .le. nz2-2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. nz2-1) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-               else if(m .eq. nz2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz5
-               endif
-
-                lhsp__(1,2) = lhs__(1,2)
-                lhsp__(2,2) = lhs__(2,2) - dttz2 * speed(i,j,m-1)
-                lhsp__(3,2) = lhs__(3,2)
-                lhsp__(4,2) = lhs__(4,2) + dttz2 * speed(i,j,m+1)
-                lhsp__(5,2) = lhs__(5,2)
-                lhsm__(1,2) = lhs__(1,2)
-                lhsm__(2,2) = lhs__(2,2) + dttz2 * speed(i,j,m-1)
-                lhsm__(3,2) = lhs__(3,2)
-                lhsm__(4,2) = lhs__(4,2) - dttz2 * speed(i,j,m+1)
-                lhsm__(5,2) = lhs__(5,2)
-              else if(k + 2 .eq. nz2+1) then
-
-               lhs__(1,2) = 0.0d0
-               lhsp__(1,2) = 0.0d0
-               lhsm__(1,2) = 0.0d0
-               
-               lhs__(2,2) = 0.0d0
-               lhsp__(2,2) = 0.0d0
-               lhsm__(2,2) = 0.0d0
-
-               lhs__(3,2) = 1.0d0
-               lhsp__(3,2) = 1.0d0
-               lhsm__(3,2) = 1.0d0
-
-               lhs__(4,2) = 0.0d0
-               lhsp__(4,2) = 0.0d0
-               lhsm__(4,2) = 0.0d0
-
-               lhs__(5,2) = 0.0d0
-               lhsp__(5,2) = 0.0d0
-               lhsm__(5,2) = 0.0d0             
-
-              endif           
-!********************************** end of init
-
-                k1 = k + 1
-                k2 = k + 2
-                fac1 = 1.d0/lhs__(3,0)
-                lhs__(4,0)  = fac1*lhs__(4,0)
-                lhs__(5,0)  = fac1*lhs__(5,0)
-                do    m = 1, 3
-                   rhs(m,i,j,k) = fac1*rhs(m,i,j,k)
-                end do
-                
-             if(k .le. nz2-1) then
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)               
-              lhs__(2,2)=lhs__(2,2)-lhs__(1,2)*lhs__(4,0)
-              lhs__(3,2)=lhs__(3,2)-lhs__(1,2)*lhs__(5,0)
-              do    m = 1, 3
-                rhs(m,i,j,k1)=rhs(m,i,j,k1)-lhs__(2,1)*rhs(m,i,j,k)
-                rhs(m,i,j,k2)=rhs(m,i,j,k2)-lhs__(1,2)*rhs(m,i,j,k)
-              end do
-               
-             else 
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)
-               fac2  = 1.d0/lhs__(3,1)
-               do  m = 1, 3
-               rhs(m,i,j,k1) = rhs(m,i,j,k1)-lhs__(2,1)*rhs(m,i,j,k)
-               rhs(m,i,j,k1) = fac2*rhs(m,i,j,k1)
-               end do
-             endif
-
-                m = 4
-                fac1  = 1.d0/lhsp__(3,0)
-                lhsp__(4,0)  = fac1*lhsp__(4,0)
-                lhsp__(5,0)  = fac1*lhsp__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsp__(3,1)=lhsp__(3,1)-lhsp__(2,1)*lhsp__(4,0)
-          lhsp__(4,1)=lhsp__(4,1)-lhsp__(2,1)*lhsp__(5,0)               
-          rhs(m,i,j,k1) = rhs(m,i,j,k1)-lhsp__(2,1)*rhs(m,i,j,k)
-              if(k .lt. nz2) then
-          lhsp__(2,2)=lhsp__(2,2)-lhsp__(1,2)*lhsp__(4,0)
-          lhsp__(3,2)=lhsp__(3,2)-lhsp__(1,2)*lhsp__(5,0)
-                rhs(m,i,j,k2)=rhs(m,i,j,k2)-lhsp__(1,2)*rhs(m,i,j,k)
-              endif
-                m = 5
-                fac1 = 1.d0/lhsm__(3,0)
-                lhsm__(4,0)  = fac1*lhsm__(4,0)
-                lhsm__(5,0)  = fac1*lhsm__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsm__(3,1)=lhsm__(3,1)-lhsm__(2,1)*lhsm__(4,0)
-          lhsm__(4,1)=lhsm__(4,1)-lhsm__(2,1)*lhsm__(5,0)
-          rhs(m,i,j,k1)=rhs(m,i,j,k1) -lhsm__(2,1)*rhs(m,i,j,k)
-              if(k .lt. nz2) then
-          lhsm__(2,2)=lhsm__(2,2)-lhsm__(1,2)*lhsm__(4,0)
-          lhsm__(3,2)=lhsm__(3,2)-lhsm__(1,2)*lhsm__(5,0)
-          rhs(m,i,j,k2)=rhs(m,i,j,k2) -lhsm__(1,2)*rhs(m,i,j,k)
-              endif
-              
-              if(k .eq. nz2) then
-               rhs(4,i,j,k1) = rhs(4,i,j,k1)/lhsp__(3,1)
-               rhs(5,i,j,k1) = rhs(5,i,j,k1)/lhsm__(3,1)              
-               do   m = 1, 3
-                rhs(m,i,j,k) = rhs(m,i,j,k)-lhs__(4,0)*rhs(m,i,j,k1)
-               end do
-               rhs(4,i,j,k) = rhs(4,i,j,k)-lhsp__(4,0)*rhs(4,i,j,k1)
-               rhs(5,i,j,k) = rhs(5,i,j,k)-lhsm__(4,0)*rhs(5,i,j,k1)
-              endif
-               lhs(0,4,i,j,k) = lhs__(4,0)
-               lhs(1,4,i,j,k) = lhsp__(4,0)
-               lhs(2,4,i,j,k) = lhsm__(4,0)
-               
-               lhs(0,5,i,j,k) = lhs__(5,0)
-               lhs(1,5,i,j,k) = lhsp__(5,0)
-               lhs(2,5,i,j,k) = lhsm__(5,0)
-             
-                 lhs__(1,0) = lhs__(1,1)
-                 lhsp__(1,0) = lhsp__(1,1)
-                 lhsm__(1,0) = lhsm__(1,1)               
-                 lhs__(1,1) = lhs__(1,2)
-                 lhsp__(1,1) = lhsp__(1,2)
-                 lhsm__(1,1) = lhsm__(1,2)
-                 
-                 lhs__(2,0) = lhs__(2,1)
-                 lhsp__(2,0) = lhsp__(2,1)
-                 lhsm__(2,0) = lhsm__(2,1)               
-                 lhs__(2,1) = lhs__(2,2)
-                 lhsp__(2,1) = lhsp__(2,2)
-                 lhsm__(2,1) = lhsm__(2,2)
-
-                 lhs__(3,0) = lhs__(3,1)
-                 lhsp__(3,0) = lhsp__(3,1)
-                 lhsm__(3,0) = lhsm__(3,1)               
-                 lhs__(3,1) = lhs__(3,2)
-                 lhsp__(3,1) = lhsp__(3,2)
-                 lhsm__(3,1) = lhsm__(3,2)
-
-                 lhs__(4,0) = lhs__(4,1)
-                 lhsp__(4,0) = lhsp__(4,1)
-                 lhsm__(4,0) = lhsm__(4,1)               
-                 lhs__(4,1) = lhs__(4,2)
-                 lhsp__(4,1) = lhsp__(4,2)
-                 lhsm__(4,1) = lhsm__(4,2)
-
-                 lhs__(5,0) = lhs__(5,1)
-                 lhsp__(5,0) = lhsp__(5,1)
-                 lhsm__(5,0) = lhsm__(5,1)               
-                 lhs__(5,1) = lhs__(5,2)
-                 lhsp__(5,1) = lhsp__(5,2)
-                 lhsm__(5,1) = lhsm__(5,2)                
-             enddo
-             
-
-             k = problem_size-3
-             rhs__(1,2) = rhs(1,i,j,k+2)
-             rhs__(2,2) = rhs(2,i,j,k+2)
-             rhs__(3,2) = rhs(3,i,j,k+2)
-             rhs__(4,2) = rhs(4,i,j,k+2)
-             rhs__(5,2) = rhs(5,i,j,k+2)
-
-             rhs__(1,1) = rhs(1,i,j,k+1)
-             rhs__(2,1) = rhs(2,i,j,k+1)
-             rhs__(3,1) = rhs(3,i,j,k+1)
-             rhs__(4,1) = rhs(4,i,j,k+1)
-             rhs__(5,1) = rhs(5,i,j,k+1)
-
-             rhs__(1,0) = rhs(1,i,j,k)
-             rhs__(2,0) = rhs(2,i,j,k)
-             rhs__(3,0) = rhs(3,i,j,k)
-             rhs__(4,0) = rhs(4,i,j,k)
-             rhs__(5,0) = rhs(5,i,j,k)
-
-             rhs__(1,0) = rhs__(1,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(1,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(1,2)
-             rhs__(2,0) = rhs__(2,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(2,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(2,2)     
-             rhs__(3,0) = rhs__(3,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(3,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(3,2)
-
-             rhs__(4,0) = rhs__(4,0) - 
-     >                          lhs(1,4,i,j,k)*rhs__(4,1) -
-     >                          lhs(1,5,i,j,k)*rhs__(4,2)
-             rhs__(5,0) = rhs__(5,0) - 
-     >                          lhs(2,4,i,j,k)*rhs__(5,1) -
-     >                          lhs(2,5,i,j,k)*rhs__(5,2)
-             
-             rhs__(1,2) = rhs__(1,1)
-             rhs__(2,2) = rhs__(2,1)
-             rhs__(3,2) = rhs__(3,1)
-             rhs__(4,2) = rhs__(4,1)
-             rhs__(5,2) = rhs__(5,1)
-
-             rhs__(1,1) = rhs__(1,0)
-             rhs__(2,1) = rhs__(2,0)
-             rhs__(3,1) = rhs__(3,0)
-             rhs__(4,1) = rhs__(4,0)
-             rhs__(5,1) = rhs__(5,0)
-             
-          do  k = problem_size-4, 0, -1
-             rhs__(1,0) = rhs(1,i,j,k)
-             rhs__(2,0) = rhs(2,i,j,k)
-             rhs__(3,0) = rhs(3,i,j,k)
-             rhs__(4,0) = rhs(4,i,j,k)
-             rhs__(5,0) = rhs(5,i,j,k)
-
-             rhs__(1,0) = rhs__(1,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(1,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(1,2)
-             rhs__(2,0) = rhs__(2,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(2,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(2,2)     
-             rhs__(3,0) = rhs__(3,0) - 
-     >                          lhs(0,4,i,j,k)*rhs__(3,1) -
-     >                          lhs(0,5,i,j,k)*rhs__(3,2)
-
-             rhs__(4,0) = rhs__(4,0) - 
-     >                          lhs(1,4,i,j,k)*rhs__(4,1) -
-     >                          lhs(1,5,i,j,k)*rhs__(4,2)
-             rhs__(5,0) = rhs__(5,0) - 
-     >                          lhs(2,4,i,j,k)*rhs__(5,1) -
-     >                          lhs(2,5,i,j,k)*rhs__(5,2)
-             
-             xvel = us(i,j,k+2)
-             yvel = vs(i,j,k+2)
-             zvel = ws(i,j,k+2)
-             ac   = speed(i,j,k+2)
-             ac2u = ac*ac    
-             uzik1 = u(1,i,j,k+2)
-             btuz  = bt * uzik1          
-             t1 = btuz/ac * (rhs__(4,2) + rhs__(5,2))
-             t2 = rhs__(3,2) + t1
-             t3 = btuz * (rhs__(4,2) - rhs__(5,2))           
-
-             rhs__(3,2) = uzik1*rhs__(1,2) + yvel*t2
-             rhs__(4,2) = zvel*t2 + t3
-             rhs__(5,2) = uzik1*(-xvel*rhs__(2,2) + 
-     >         yvel*rhs__(1,2)) + qs(i,j,k+2)*t2 + 
-     >         c2iv*ac2u*t1 + zvel*t3            
-             rhs__(1,2) = t2
-             rhs__(2,2) = -uzik1*rhs__(2,2) + xvel*t2
-			  
-             u(1,i,j,k+2) = u(1,i,j,k+2) + rhs__(1,2)
-             u(2,i,j,k+2) = u(2,i,j,k+2) + rhs__(2,2)
-             u(3,i,j,k+2) = u(3,i,j,k+2) + rhs__(3,2)
-             u(4,i,j,k+2) = u(4,i,j,k+2) + rhs__(4,2)
-             u(5,i,j,k+2) = u(5,i,j,k+2) + rhs__(5,2)
-			 
-             rhs__(1,2) = rhs__(1,1)
-             rhs__(2,2) = rhs__(2,1)
-             rhs__(3,2) = rhs__(3,1)
-             rhs__(4,2) = rhs__(4,1)
-             rhs__(5,2) = rhs__(5,1)
-
-             rhs__(1,1) = rhs__(1,0)
-             rhs__(2,1) = rhs__(2,0)
-             rhs__(3,1) = rhs__(3,0)
-             rhs__(4,1) = rhs__(4,0)
-             rhs__(5,1) = rhs__(5,0)             
-          end do 
-             xvel = us(i,j,k+2)
-             yvel = vs(i,j,k+2)
-             zvel = ws(i,j,k+2)
-             ac   = speed(i,j,k+2)
-             ac2u = ac*ac    
-             uzik1 = u(1,i,j,k+2)
-             btuz  = bt * uzik1          
-             t1 = btuz/ac * (rhs__(4,2) + rhs__(5,2))
-             t2 = rhs__(3,2) + t1
-             t3 = btuz * (rhs__(4,2) - rhs__(5,2))           
-			 
-             rhs__(3,2) = uzik1*rhs__(1,2) + yvel*t2
-             rhs__(4,2) = zvel*t2 + t3
-             rhs__(5,2) = uzik1*(-xvel*rhs__(2,2) + 
-     >         yvel*rhs__(1,2)) + qs(i,j,k+2)*t2 + 
-     >         c2iv*ac2u*t1 + zvel*t3            
-             rhs__(1,2) = t2
-             rhs__(2,2) = -uzik1*rhs__(2,2) + xvel*t2
-             
-             u(1,i,j,k+2) = u(1,i,j,k+2) + rhs__(1,2)
-             u(2,i,j,k+2) = u(2,i,j,k+2) + rhs__(2,2)
-             u(3,i,j,k+2) = u(3,i,j,k+2) + rhs__(3,2)
-             u(4,i,j,k+2) = u(4,i,j,k+2) + rhs__(4,2)
-             u(5,i,j,k+2) = u(5,i,j,k+2) + rhs__(5,2)       
-          enddo
-       enddo   
-
-!DVM$ end region
-       if (timeron) call timer_stop(t_zsolve)
-
-       return
-       end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve_mpi.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve_mpi.for
deleted file mode 100644
index 7d45b66..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/SP/z_solve_mpi.for
+++ /dev/null
@@ -1,338 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-       subroutine z_solve
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c this function performs the solution of the approximate factorization
-c step in the z-direction for all five matrix components
-c simultaneously. The Thomas algorithm is employed to solve the
-c systems for the z-lines. Boundary conditions are non-periodic
-c---------------------------------------------------------------------
-
-       include 'header.h'
-      
-       integer i, j, k, k1, k2, m
-       double precision ru1, fac1, fac2
-       double precision lhs__(5,0:2), lhsm__(5,0:2), lhsp__(5,0:2)
-       double precision t1,t2,t3,ac,xvel,yvel,zvel,btuz,ac2u,uzik1
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c Prepare for z-solve, array redistribution   
-c---------------------------------------------------------------------
-
-       if (timeron) call timer_start(t_zsolve)
-
-!DVM$ region local(lhs)
-
-!DVM$ parallel (k,j,i) on rhs(*,i,j,k)
-!DVM$& ,private(m,k1,k2,ru1,fac1,fac2,k,lhs__,lhsp__,lhsm__)
-!DVM$& ,ACROSS(OUT:rhs(0:0,0:0,0:0,0:2), lhs(0:0,0:0,0:0,0:0,0:2))
-!DVM$& ,stage(stage_n)
-      do  k = 0, problem_size-1
-        do  j = 1, ny2 
-           do  i = 1, nx2     
-             if (k .eq. 0) then           
-               lhs__(1,0) = 0.0d0
-               lhsp__(1,0) = 0.0d0
-               lhsm__(1,0) = 0.0d0             
-               
-               lhs__(2,0) = 0.0d0
-               lhsp__(2,0) = 0.0d0
-               lhsm__(2,0) = 0.0d0 
-
-               lhs__(3,0) = 1.0d0
-               lhsp__(3,0) = 1.0d0
-               lhsm__(3,0) = 1.0d0 
-
-               lhs__(4,0) = 0.0d0
-               lhsp__(4,0) = 0.0d0
-               lhsm__(4,0) = 0.0d0 
-
-               lhs__(5,0) = 0.0d0
-               lhsp__(5,0) = 0.0d0
-               lhsm__(5,0) = 0.0d0             
-
-
-                lhs__(1,1) =   0.0d0                
-                ru1 = c3c4*1.0d0/u(1,i,j,k)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(2,1) = - dttz2 * ws(i,j,k) - dttz1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j,k+1)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(3,1) =   1.0d0 + c2dttz1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j,k+2)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(4,1) =   dttz2 * ws(i,j,k+2) - dttz1 * ru1
-                lhs__(5,1) =   0.0d0
-         
-                lhs__(3,1) = lhs__(3,1) + comz5
-                lhs__(4,1) = lhs__(4,1) - comz4
-                lhs__(5,1) = lhs__(5,1) + comz1
-
-                lhsp__(1,1) = lhs__(1,1)
-                lhsp__(2,1) = lhs__(2,1) - dttz2 * speed(i,j,k)
-                lhsp__(3,1) = lhs__(3,1)
-                lhsp__(4,1) = lhs__(4,1) + dttz2 * speed(i,j,k+2)
-                lhsp__(5,1) = lhs__(5,1)
-                lhsm__(1,1) = lhs__(1,1)
-                lhsm__(2,1) = lhs__(2,1) + dttz2 * speed(i,j,k)
-                lhsm__(3,1) = lhs__(3,1)
-                lhsm__(4,1) = lhs__(4,1) - dttz2 * speed(i,j,k+2)
-                lhsm__(5,1) = lhs__(5,1)
-             else
-               do   m = 1, 5
-                 lhs__(m,0) = lhs(0,m,i,j,k)
-                 lhsp__(m,0) = lhs(1,m,i,j,k)
-                 lhsm__(m,0) = lhs(2,m,i,j,k)
-               
-                 lhs__(m,1) = lhs(0,m,i,j,k+1)
-                 lhsp__(m,1) = lhs(1,m,i,j,k+1)
-                 lhsm__(m,1) = lhs(2,m,i,j,k+1)        
-               enddo             
-             endif           
-
-              if(k + 2 .lt. nz2 + 1) then
-                m = k + 2
-                lhs__(1,2) =   0.0d0
-                
-                ru1 = c3c4*1.0d0/u(1,i,j,m-1)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(2,2) = - dttz2 * ws(i,j,m-1) - dttz1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j,m)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(3,2) =   1.0d0 + c2dttz1 * ru1
-                ru1 = c3c4*1.0d0/u(1,i,j,m+1)
-                ru1 = dmax1(dz4 + con43 * ru1,
-     >                          dz5 + c1c5 * ru1,
-     >                          dzmax + ru1,
-     >                          dz1)
-                lhs__(4,2) =   dttz2 * ws(i,j,m+1) - dttz1 * ru1
-                lhs__(5,2) =   0.0d0
-         
-               if(m .eq. 1) then
-                lhs__(3,2) = lhs__(3,2) + comz5
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. 2) then
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1 
-               else if(m .ge. 3 .and. m .le. nz2-2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-                lhs__(5,2) = lhs__(5,2) + comz1
-               else if(m .eq. nz2-1) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz6
-                lhs__(4,2) = lhs__(4,2) - comz4
-               else if(m .eq. nz2) then
-                lhs__(1,2) = lhs__(1,2) + comz1
-                lhs__(2,2) = lhs__(2,2) - comz4
-                lhs__(3,2) = lhs__(3,2) + comz5
-               endif
-
-                lhsp__(1,2) = lhs__(1,2)
-                lhsp__(2,2) = lhs__(2,2) - dttz2 * speed(i,j,m-1)
-                lhsp__(3,2) = lhs__(3,2)
-                lhsp__(4,2) = lhs__(4,2) + dttz2 * speed(i,j,m+1)
-                lhsp__(5,2) = lhs__(5,2)
-                lhsm__(1,2) = lhs__(1,2)
-                lhsm__(2,2) = lhs__(2,2) + dttz2 * speed(i,j,m-1)
-                lhsm__(3,2) = lhs__(3,2)
-                lhsm__(4,2) = lhs__(4,2) - dttz2 * speed(i,j,m+1)
-                lhsm__(5,2) = lhs__(5,2)
-              else if(k + 2 .eq. nz2+1) then
-
-               lhs__(1,2) = 0.0d0
-               lhsp__(1,2) = 0.0d0
-               lhsm__(1,2) = 0.0d0
-               
-               lhs__(2,2) = 0.0d0
-               lhsp__(2,2) = 0.0d0
-               lhsm__(2,2) = 0.0d0
-
-               lhs__(3,2) = 1.0d0
-               lhsp__(3,2) = 1.0d0
-               lhsm__(3,2) = 1.0d0
-
-               lhs__(4,2) = 0.0d0
-               lhsp__(4,2) = 0.0d0
-               lhsm__(4,2) = 0.0d0
-
-               lhs__(5,2) = 0.0d0
-               lhsp__(5,2) = 0.0d0
-               lhsm__(5,2) = 0.0d0             
-
-              endif           
-!********************************** end of init
-
-                k1 = k + 1
-                k2 = k + 2
-                fac1 = 1.d0/lhs__(3,0)
-                lhs__(4,0)  = fac1*lhs__(4,0)
-                lhs__(5,0)  = fac1*lhs__(5,0)
-                do    m = 1, 3
-                   rhs(m,i,j,k) = fac1*rhs(m,i,j,k)
-                end do
-                
-             if(k .le. nz2-1) then
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)               
-              lhs__(2,2)=lhs__(2,2)-lhs__(1,2)*lhs__(4,0)
-              lhs__(3,2)=lhs__(3,2)-lhs__(1,2)*lhs__(5,0)
-              do    m = 1, 3
-                rhs(m,i,j,k1)=rhs(m,i,j,k1)-lhs__(2,1)*rhs(m,i,j,k)
-                rhs(m,i,j,k2)=rhs(m,i,j,k2)-lhs__(1,2)*rhs(m,i,j,k)
-              end do
-               
-             else 
-              lhs__(3,1)=lhs__(3,1)-lhs__(2,1)*lhs__(4,0)
-              lhs__(4,1)=lhs__(4,1)-lhs__(2,1)*lhs__(5,0)
-			   if (lhs__(3,1) .ne. 0) then
-				  fac2  = 1.d0/lhs__(3,1)
-			   else
-			      fac2 = 0
-			   endif
-               do  m = 1, 3
-               rhs(m,i,j,k1) = rhs(m,i,j,k1)-lhs__(2,1)*rhs(m,i,j,k)
-               rhs(m,i,j,k1) = fac2*rhs(m,i,j,k1)
-               end do
-             endif
-
-                m = 4
-                fac1  = 1.d0/lhsp__(3,0)
-                lhsp__(4,0)  = fac1*lhsp__(4,0)
-                lhsp__(5,0)  = fac1*lhsp__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsp__(3,1)=lhsp__(3,1)-lhsp__(2,1)*lhsp__(4,0)
-          lhsp__(4,1)=lhsp__(4,1)-lhsp__(2,1)*lhsp__(5,0)               
-          rhs(m,i,j,k1) = rhs(m,i,j,k1)-lhsp__(2,1)*rhs(m,i,j,k)
-              if(k .lt. nz2) then
-          lhsp__(2,2)=lhsp__(2,2)-lhsp__(1,2)*lhsp__(4,0)
-          lhsp__(3,2)=lhsp__(3,2)-lhsp__(1,2)*lhsp__(5,0)
-                rhs(m,i,j,k2)=rhs(m,i,j,k2)-lhsp__(1,2)*rhs(m,i,j,k)
-              endif
-                m = 5
-                fac1 = 1.d0/lhsm__(3,0)
-                lhsm__(4,0)  = fac1*lhsm__(4,0)
-                lhsm__(5,0)  = fac1*lhsm__(5,0)
-                rhs(m,i,j,k) = fac1*rhs(m,i,j,k)                
-          lhsm__(3,1)=lhsm__(3,1)-lhsm__(2,1)*lhsm__(4,0)
-          lhsm__(4,1)=lhsm__(4,1)-lhsm__(2,1)*lhsm__(5,0)
-          rhs(m,i,j,k1)=rhs(m,i,j,k1) -lhsm__(2,1)*rhs(m,i,j,k)
-              if(k .lt. nz2) then
-          lhsm__(2,2)=lhsm__(2,2)-lhsm__(1,2)*lhsm__(4,0)
-          lhsm__(3,2)=lhsm__(3,2)-lhsm__(1,2)*lhsm__(5,0)
-          rhs(m,i,j,k2)=rhs(m,i,j,k2) -lhsm__(1,2)*rhs(m,i,j,k)
-              endif
-              
-              if(k .eq. nz2) then
-               rhs(4,i,j,k1) = rhs(4,i,j,k1)/lhsp__(3,1)
-               rhs(5,i,j,k1) = rhs(5,i,j,k1)/lhsm__(3,1)              
-               do   m = 1, 3
-                rhs(m,i,j,k) = rhs(m,i,j,k)-lhs__(4,0)*rhs(m,i,j,k1)
-               end do
-               rhs(4,i,j,k) = rhs(4,i,j,k)-lhsp__(4,0)*rhs(4,i,j,k1)
-               rhs(5,i,j,k) = rhs(5,i,j,k)-lhsm__(4,0)*rhs(5,i,j,k1)
-              endif
-              
-               do m = 1,5              
-                 lhs(0,m,i,j,k) = lhs__(m,0)
-                 lhs(1,m,i,j,k) = lhsp__(m,0)
-                 lhs(2,m,i,j,k) = lhsm__(m,0)
-               
-                 lhs(0,m,i,j,k+1) = lhs__(m,1)
-                 lhs(1,m,i,j,k+1) = lhsp__(m,1)
-                 lhs(2,m,i,j,k+1) = lhsm__(m,1)
-                 if (k .lt. nz2) then 
-                   lhs(0,m,i,j,k+2) = lhs__(m,2)
-                   lhs(1,m,i,j,k+2) = lhsp__(m,2)
-                   lhs(2,m,i,j,k+2) = lhsm__(m,2)              
-                 endif               
-               enddo              
-             enddo
-          enddo
-       enddo   
-
-!DVM$ parallel (k,j,i) on rhs(*,i,j,k),ACROSS(rhs(0:0,0:0,0:0,0:2))
-!DVM$& ,stage(stage_n)
-      do k = problem_size-3, 0, -1
-         do  j = 1, ny2 
-            do  i = 1, nx2  
-              rhs(1,i,j,k) = rhs(1,i,j,k) - 
-     &                          lhs(0,4,i,j,k)*rhs(1,i,j,k+1) -
-     &                          lhs(0,5,i,j,k)*rhs(1,i,j,k+2)
-              rhs(2,i,j,k) = rhs(2,i,j,k) - 
-     &                          lhs(0,4,i,j,k)*rhs(2,i,j,k+1) -
-     &                          lhs(0,5,i,j,k)*rhs(2,i,j,k+2)     
-              rhs(3,i,j,k) = rhs(3,i,j,k) - 
-     &                          lhs(0,4,i,j,k)*rhs(3,i,j,k+1) -
-     &                          lhs(0,5,i,j,k)*rhs(3,i,j,k+2)
-
-              rhs(4,i,j,k) = rhs(4,i,j,k) -  
-     &                          lhs(1,4,i,j,k)*rhs(4,i,j,k+1) -
-     &                          lhs(1,5,i,j,k)*rhs(4,i,j,k+2)
-              rhs(5,i,j,k) = rhs(5,i,j,k) - 
-     &                          lhs(2,4,i,j,k)*rhs(5,i,j,k+1) -
-     &                          lhs(2,5,i,j,k)*rhs(5,i,j,k+2)           
-            enddo
-         enddo          
-      enddo 
-      
-!DVM$ parallel (k,j,i) on u(*,i,j,k)
-!DVM$& ,private(t1,t2,t3,ac,xvel,yvel,zvel,btuz,ac2u,uzik1)
-      do k = 1, nz2
-         do  j = 1, ny2 
-            do  i = 1, nx2  
-             xvel = us(i,j,k)
-             yvel = vs(i,j,k)
-             zvel = ws(i,j,k)
-             ac   = speed(i,j,k)
-             ac2u = ac*ac    
-             uzik1 = u(1,i,j,k)
-             btuz  = bt * uzik1          
-             t1 = btuz/ac * (rhs(4,i,j,k) + rhs(5,i,j,k))
-             t2 = rhs(3,i,j,k) + t1
-             t3 = btuz * (rhs(4,i,j,k) - rhs(5,i,j,k))
-          
-             u(1,i,j,k) = u(1,i,j,k) + t2             
-             u(2,i,j,k) = u(2,i,j,k)-uzik1*rhs(2,i,j,k)+xvel*t2
-             u(3,i,j,k) = u(3,i,j,k)+uzik1*rhs(1,i,j,k)+yvel*t2
-             u(4,i,j,k) = u(4,i,j,k)+ zvel*t2 + t3
-             u(5,i,j,k) = u(5,i,j,k)+ uzik1*(-xvel*rhs(2,i,j,k) + 
-     &                      yvel*rhs(1,i,j,k)) + qs(i,j,k)*t2 + 
-     &                      c2iv*ac2u*t1 + zvel*t3          
-            enddo
-         enddo          
-      enddo      
-!DVM$ end region
-       if (timeron) call timer_stop(t_zsolve)
-
-       return
-       end
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/clear.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/clear.bat
deleted file mode 100644
index 13594b8..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/clear.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-
-@set TESTS=bt sp lu mg ep cg ft
-@set CLASSES=A B C
-
-if exist err.txt del err.txt
-if exist bin rmdir /S /Q bin
-
-@for %%T in (%TESTS%) do (
-   cd %%T
-   if exist comp.err del comp.err
-   if exist dvm.err del dvm.err
-   if exist *.f del *.f
-   if exist *.cu del *.cu
-   if exist *info.c del *info.c
-   @for %%C in (%CLASSES%) do (
-      if exist err_%%C.txt del err_%%C.txt 
-      if exist out_%%C.txt del out_%%C.txt       
-   )
-   cd ../
-)
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.bat
deleted file mode 100644
index 65c6572..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-
-@set TESTS=BT SP LU MG EP CG FT
-
-@CALL config\make.def.bat 
-
-if not exist bin mkdir bin
-cd sys
-if not exist setparams.exe CALL %DVM% cc setparams
-cd ../
-@for %%T in (%TESTS%) do (
-    START compileTest.bat %%T 
-)
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.sh
deleted file mode 100644
index 4434f82..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compile.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-TESTS="BT SP LU MG EP CG FT"
-CLASSES="A B C"
-
-compile_one() {
-    cd $1
-    make CLASS=$2
-    cd ..
-}
-
-mkdir -p bin
-
-export FOPT="$*"
-for tn in $TESTS; do
-    for cn in $CLASSES; do
-        compile_one $tn $cn
-    done
-done
-
-exit 0
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compileTest.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compileTest.bat
deleted file mode 100644
index 5db07de..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/compileTest.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-@echo off
-@set CLASSES=A B C
-@set Test=%1
-  @for %%C in (%CLASSES%) do (
-     cd %Test%
-     echo  ### compiling test %Test%, class %%C.
-	 CALL make.bat %%C 
-	 cd ../
-   )
-exit
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def
deleted file mode 100644
index 9fddcc1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def
+++ /dev/null
@@ -1,8 +0,0 @@
-F77 = dvm
-FLINK = dvm
-
-FFLAGS = ${FOPT}
-
-UCC = cc
-
-BINDIR = ../bin
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def.bat
deleted file mode 100644
index 15c8592..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/config/make.def.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-rem @echo off
-rem ### SET DVM PATH###
-set DVMDIR=
-
-set DVM=%DVMDIR%\dvm
-set F77=%DVMDIR%\dvm f
-set RUN=%DVMDIR%\dvm run
-set BIN=..\bin
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.bat
deleted file mode 100644
index 137802c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-@set TESTS=bt sp lu mg ep cg ft
-@set CLASSES=A B C
-
-@CALL config\make.def.bat
-
-if exist res.txt del res.txt
-cd bin
-@for %%T in (%TESTS%) do (
-   @for %%C in (%CLASSES%) do (
-      CALL %RUN% %%T.%%C.x.exe	1>>..\res.txt 2>>..\err.txt
-   )
-)
-cd ../
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.sh
deleted file mode 100644
index e820404..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/run.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-TESTS="bt sp lu mg ep cg ft"
-CLASSES="A B C"
-
-ALL_OK=1
-
-run_one() {
-    if [ -f "$1" ]; then
-        dvm run $PROC_GRID $1
-        ALL_OK=$(( ALL_OK && $? == 0 ))
-    else
-        ALL_OK=0
-    fi
-}
-
-cd bin
-
-for tn in $TESTS; do
-    for cn in $CLASSES; do
-        run_one $tn.$cn.x
-    done
-done
-
-if [ $ALL_OK -ne 0 ]; then
-    echo " END OF NPB Benchmarks"
-fi
-
-exit 0
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/Makefile
deleted file mode 100644
index 9fd8e5f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-include ../config/make.def
-
-all: setparams
-
-# setparams creates an npbparam.h file for each benchmark 
-# configuration. npbparams.h also contains info about how a benchmark
-# was compiled and linked
-
-setparams: setparams.c ../config/make.def
-	$(UCC) -o setparams setparams.c
-
-clean: 
-	-rm -f setparams setparams.h npbparams.h
-	-rm -f *~ *.o
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/make.common b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/make.common
deleted file mode 100644
index 959951d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/make.common
+++ /dev/null
@@ -1,31 +0,0 @@
-PROGRAM  = $(BINDIR)/$(BENCHMARK).$(CLASS).x
-
-# Class "U" is used internally by the setparams program to mean
-# "unknown". This means that if you don't specify CLASS=
-# on the command line, you'll get an error. It would be nice
-# to be able to avoid this, but we'd have to get information
-# from the setparams back to the make program, which isn't easy. 
-CLASS=U
-
-default:: ${PROGRAM}
-
-# This makes sure the configuration utility setparams 
-# is up to date. 
-# Note that this must be run every time, which is why the
-# target does not exist and is not created. 
-# If you create a file called "config" you will break things. 
-config:
-	@cd ../sys; ${MAKE} all
-	../sys/setparams ${BENCHMARK} ${CLASS}
-
-# Normally setparams updates npbparams.h only if the settings (CLASS)
-# have changed. However, we also want to update if the compile options
-# may have changed (set in ../config/make.def).
-npbparams.h: ../config/make.def
-	@ echo make.def modified. Rebuilding npbparams.h just in case
-	rm -f npbparams.h
-	../sys/setparams ${BENCHMARK} ${CLASS}
-
-# So that "make benchmark-name" works
-${BENCHMARK}:  default
-${BENCHMARKU}: default
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/setparams.c b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/setparams.c
deleted file mode 100644
index 258b845..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/FDVMH.fdv/sys/setparams.c
+++ /dev/null
@@ -1,1053 +0,0 @@
-/* 
- * This utility configures a NPB to be built for a specific class. 
- * It creates a file "npbparams.h" 
- * in the source directory. This file keeps state information about 
- * which size of benchmark is currently being built (so that nothing
- * if unnecessarily rebuilt) and defines (through PARAMETER statements)
- * the number of nodes and class for which a benchmark is being built. 
-
- * The utility takes 3 arguments: 
- *       setparams benchmark-name class
- *    benchmark-name is "sp", "bt", etc
- *    class is the size of the benchmark
- * These parameters are checked for the current benchmark. If they
- * are invalid, this program prints a message and aborts. 
- * If the parameters are ok, the current npbsize.h (actually just
- * the first line) is read in. If the new parameters are the same as 
- * the old, nothing is done, but an exit code is returned to force the
- * user to specify (otherwise the make procedure succeeds but builds a
- * binary of the wrong name).  Otherwise the file is rewritten. 
- * Errors write a message (to stdout) and abort. 
- * 
- * This program makes use of two extra benchmark "classes"
- * class "X" means an invalid specification. It is returned if
- * there is an error parsing the config file. 
- * class "U" is an external specification meaning "unknown class"
- * 
- * Unfortunately everything has to be case sensitive. This is
- * because we can always convert lower to upper or v.v. but
- * can't feed this information back to the makefile, so typing
- * make CLASS=a and make CLASS=A will produce different binaries.
- *
- * 
- */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <time.h>
-
-/*
- * This is the master version number for this set of 
- * NPB benchmarks. It is in an obscure place so people
- * won't accidentally change it. 
- */
-
-#define VERSION "3.3.1"
-
-/* controls verbose output from setparams */
-/* #define VERBOSE */
-
-#define FILENAME "npbparams.h"
-#define DESC_LINE "! CLASS = %c\n"
-#define DEF_CLASS_LINE     "#define CLASS '%c'\n"
-#define FINDENT  "        "
-#define CONTINUE "     > "
-
-void get_info(char *argv[], int *typep, char *classp);
-void check_info(int type, char class);
-void read_info(int type, char *classp);
-void write_info(int type, char class);
-void write_sp_info(FILE *fp, char class);
-void write_bt_info(FILE *fp, char class);
-void write_lu_info(FILE *fp, char class);
-void write_mg_info(FILE *fp, char class);
-void write_cg_info(FILE *fp, char class);
-void write_ft_info(FILE *fp, char class);
-void write_ep_info(FILE *fp, char class);
-void write_dc_info(FILE *fp, char class);
-void write_is_info(FILE *fp, char class);
-void write_ua_info(FILE *fp, char class);
-void write_compiler_info(int type, FILE *fp);
-void write_convertdouble_info(int type, FILE *fp);
-void check_line(char *line, char *label, char *val);
-int  check_include_line(char *line, char *filename);
-void put_string(FILE *fp, char *name, char *val);
-void put_def_string(FILE *fp, char *name, char *val);
-void put_def_variable(FILE *fp, char *name, char *val);
-int ilog2(int i);
-double power(double base, int i);
-
-enum benchmark_types {SP, BT, LU, MG, FT, IS, EP, CG, UA, DC};
-
-int main(int argc, char *argv[])
-{
-  int type;
-  char class, class_old;
-  
-  if (argc != 3) {
-    printf("Usage: %s benchmark-name class\n", argv[0]);
-    exit(1);
-  }
-
-  /* Get command line arguments. Make sure they're ok. */
-  get_info(argv, &type, &class);
-  if (class != 'U') {
-#ifdef VERBOSE
-    printf("setparams: For benchmark %s: class = %c\n", 
-	   argv[1], class); 
-#endif
-    check_info(type, class);
-  }
-
-  /* Get old information. */
-  read_info(type, &class_old);
-  if (class != 'U') {
-    if (class_old != 'X') {
-#ifdef VERBOSE
-      printf("setparams:     old settings: class = %c\n", 
-	     class_old); 
-#endif
-    }
-  } else {
-    printf("setparams:\n\
-  *********************************************************************\n\
-  * You must specify CLASS to build this benchmark                    *\n\
-  * For example, to build a class A benchmark, type                   *\n\
-  *       make {benchmark-name} CLASS=A                               *\n\
-  *********************************************************************\n\n"); 
-
-    if (class_old != 'X') {
-#ifdef VERBOSE
-      printf("setparams: Previous settings were CLASS=%c \n", class_old); 
-#endif
-    }
-    exit(1); /* exit on class==U */
-  }
-
-  /* Write out new information if it's different. */
-  if (class != class_old) {
-#ifdef VERBOSE
-    printf("setparams: Writing %s\n", FILENAME); 
-#endif
-    write_info(type, class);
-  } else {
-#ifdef VERBOSE
-    printf("setparams: Settings unchanged. %s unmodified\n", FILENAME); 
-#endif
-  }
-
-  return 0;
-}
-
-
-/*
- *  get_info(): Get parameters from command line 
- */
-
-void get_info(char *argv[], int *typep, char *classp) 
-{
-
-  *classp = *argv[2];
-
-  if      (!strcmp(argv[1], "sp") || !strcmp(argv[1], "SP")) *typep = SP;
-  else if (!strcmp(argv[1], "bt") || !strcmp(argv[1], "BT")) *typep = BT;
-  else if (!strcmp(argv[1], "ft") || !strcmp(argv[1], "FT")) *typep = FT;
-  else if (!strcmp(argv[1], "lu") || !strcmp(argv[1], "LU")) *typep = LU;
-  else if (!strcmp(argv[1], "mg") || !strcmp(argv[1], "MG")) *typep = MG;
-  else if (!strcmp(argv[1], "is") || !strcmp(argv[1], "IS")) *typep = IS;
-  else if (!strcmp(argv[1], "ep") || !strcmp(argv[1], "EP")) *typep = EP;
-  else if (!strcmp(argv[1], "cg") || !strcmp(argv[1], "CG")) *typep = CG;
-  else if (!strcmp(argv[1], "ua") || !strcmp(argv[1], "UA")) *typep = UA;
-  else if (!strcmp(argv[1], "dc") || !strcmp(argv[1], "DC")) *typep = DC;
-  else {
-    printf("setparams: Error: unknown benchmark type %s\n", argv[1]);
-    exit(1);
-  }
-}
-
-/*
- *  check_info(): Make sure command line data is ok for this benchmark 
- */
-
-void check_info(int type, char class) 
-{
-
-  /* check class */
-  if (class != 'S' && 
-      class != 'W' && 
-      class != 'A' && 
-      class != 'B' && 
-      class != 'C' && 
-      class != 'D' && 
-      class != 'E') {
-    printf("setparams: Unknown benchmark class %c\n", class); 
-    printf("setparams: Allowed classes are \"S\", \"W\", and \"A\" through \"E\"\n");
-    exit(1);
-  }
-
-  if (class == 'E' && (type == IS || type == UA || type == DC)) {
-    printf("setparams: Benchmark class %c not defined for IS, UA, or DC\n", class);
-    exit(1);
-  }
-  if ((class == 'C' || class == 'D') && type == DC) {
-    printf("setparams: Benchmark class %c not defined for DC\n", class);
-    exit(1);
-  }
-
-}
-
-
-/* 
- * read_info(): Read previous information from file. 
- *              Not an error if file doesn't exist, because this
- *              may be the first time we're running. 
- *              Assumes the first line of the file is in a special
- *              format that we understand (since we wrote it). 
- */
-
-void read_info(int type, char *classp)
-{
-  int nread;
-  FILE *fp;
-  fp = fopen(FILENAME, "r");
-  if (fp == NULL) {
-#ifdef VERBOSE
-    printf("setparams: INFO: configuration file %s does not exist (yet)\n", FILENAME); 
-#endif
-    goto abort;
-  }
-  
-  /* first line of file contains info (fortran), first two lines (C) */
-
-  switch(type) {
-      case SP:
-      case BT:
-      case FT:
-      case MG:
-      case LU:
-      case EP:
-      case CG:
-      case UA:
-          nread = fscanf(fp, DESC_LINE, classp);
-          if (nread != 1) {
-            printf("setparams: Error parsing config file %s. Ignoring previous settings\n", FILENAME);
-            goto abort;
-          }
-          break;
-      case IS:
-      case DC:
-          nread = fscanf(fp, DEF_CLASS_LINE, classp);
-          if (nread != 1) {
-            printf("setparams: Error parsing config file %s. Ignoring previous settings\n", FILENAME);
-            goto abort;
-          }
-          break;
-      default:
-        /* never should have gotten this far with a bad name */
-        printf("setparams: (Internal Error) Benchmark type %d unknown to this program\n", type); 
-        exit(1);
-  }
-
-  fclose(fp);
-
-
-  return;
-
- abort:
-  *classp = 'X';
-  return;
-}
-
-
-/* 
- * write_info(): Write new information to config file. 
- *               First line is in a special format so we can read
- *               it in again. Then comes a warning. The rest is all
- *               specific to a particular benchmark. 
- */
-
-void write_info(int type, char class) 
-{
-  FILE *fp;
-  fp = fopen(FILENAME, "w");
-  if (fp == NULL) {
-    printf("setparams: Can't open file %s for writing\n", FILENAME);
-    exit(1);
-  }
-
-  switch(type) {
-      case SP:
-      case BT:
-      case FT:
-      case MG:
-      case LU:
-      case EP:
-      case CG:
-      case UA:
-          /* Write out the header */
-          fprintf(fp, DESC_LINE, class);
-          /* Print out a warning so bozos don't mess with the file */
-          fprintf(fp, "\
-!  \n\
-!  \n\
-!  This file is generated automatically by the setparams utility.\n\
-!  It sets the number of processors and the class of the NPB\n\
-!  in this directory. Do not modify it by hand.\n\
-!  \n");
-          break;
-      case IS:
-          fprintf(fp, DEF_CLASS_LINE, class);
-          fprintf(fp, "\
-/*\n\
-   This file is generated automatically by the setparams utility.\n\
-   It sets the number of processors and the class of the NPB\n\
-   in this directory. Do not modify it by hand.   */\n\
-   \n");
-          break;
-      case DC:
-          fprintf(fp, DEF_CLASS_LINE, class);
-          fprintf(fp, "\
-/*\n\
-   This file is generated automatically by the setparams utility.\n\
-   It sets the number of processors and the class of the NPB\n\
-   in this directory. Do not modify it by hand.\n\
-   This file provided for backward compatibility.\n\
-   It is not used in DC benchmark.   */\n\
-   \n");
-          break;
-      default:
-          printf("setparams: (Internal error): Unknown benchmark type %d\n", 
-                                                                         type);
-          exit(1);
-  }
-
-  /* Now do benchmark-specific stuff */
-  switch(type) {
-  case SP:
-    write_sp_info(fp, class);
-    break;	      
-  case BT:	      
-    write_bt_info(fp, class);
-    break;	      
-  case DC:	      
-    write_dc_info(fp, class);
-    break;	      
-  case LU:	      
-    write_lu_info(fp, class);
-    break;	      
-  case MG:	      
-    write_mg_info(fp, class);
-    break;	      
-  case IS:	      
-    write_is_info(fp, class);  
-    break;	      
-  case FT:	      
-    write_ft_info(fp, class);
-    break;	      
-  case EP:	      
-    write_ep_info(fp, class);
-    break;	      
-  case CG:	      
-    write_cg_info(fp, class);
-    break;
-  case UA:	      
-    write_ua_info(fp, class);
-    break;
-  default:
-    printf("setparams: (Internal error): Unknown benchmark type %d\n", type);
-    exit(1);
-  }
-  write_convertdouble_info(type, fp);
-  write_compiler_info(type, fp);
-  fclose(fp);
-  return;
-}
-
-
-/* 
- * write_sp_info(): Write SP specific info to config file
- */
-
-void write_sp_info(FILE *fp, char class) 
-{
-  int problem_size, niter;
-  char *dt;
-  if      (class == 'S') { problem_size = 12;  dt = "0.015d0";   niter = 100; }
-  else if (class == 'W') { problem_size = 36;  dt = "0.0015d0";  niter = 400; }
-  else if (class == 'A') { problem_size = 64;  dt = "0.0015d0";  niter = 400; }
-  else if (class == 'B') { problem_size = 102; dt = "0.001d0";   niter = 400; }
-  else if (class == 'C') { problem_size = 162; dt = "0.00067d0"; niter = 400; }
-  else if (class == 'D') { problem_size = 408; dt = "0.00030d0"; niter = 500; }
-  else if (class == 'E') { problem_size = 1020; dt = "0.0001d0"; niter = 500; }
-  else {
-    printf("setparams: Internal error: invalid class %c\n", class);
-    exit(1);
-  }
-  fprintf(fp, "%sinteger problem_size, niter_default\n", FINDENT);
-  fprintf(fp, "%sparameter (problem_size=%d, niter_default=%d)\n", 
-	       FINDENT, problem_size, niter);
-  fprintf(fp, "%sdouble precision dt_default\n", FINDENT);
-  fprintf(fp, "%sparameter (dt_default = %s)\n", FINDENT, dt);
-}
-  
-/* 
- * write_bt_info(): Write BT specific info to config file
- */
-
-void write_bt_info(FILE *fp, char class) 
-{
-  int problem_size, niter;
-  char *dt;
-  if      (class == 'S') { problem_size = 12;  dt = "0.010d0";   niter = 60; }
-  else if (class == 'W') { problem_size = 24;  dt = "0.0008d0";  niter = 200; }
-  else if (class == 'A') { problem_size = 64;  dt = "0.0008d0";  niter = 200; }
-  else if (class == 'B') { problem_size = 102; dt = "0.0003d0";  niter = 200; }
-  else if (class == 'C') { problem_size = 162; dt = "0.0001d0";  niter = 200; }
-  else if (class == 'D') { problem_size = 408; dt = "0.00002d0";  niter = 250; }
-  else if (class == 'E') { problem_size = 1020; dt = "0.4d-5";    niter = 250; }
-  else {
-    printf("setparams: Internal error: invalid class %c\n", class);
-    exit(1);
-  }
-  fprintf(fp, "%sinteger problem_size, niter_default\n", FINDENT);
-  fprintf(fp, "%sparameter (problem_size=%d, niter_default=%d)\n", 
-	       FINDENT, problem_size, niter);
-  fprintf(fp, "%sdouble precision dt_default\n", FINDENT);
-  fprintf(fp, "%sparameter (dt_default = %s)\n", FINDENT, dt);
-}
-  
-/* 
- * write_dc_info(): Write DC specific info to config file
- */
-
-
-void write_dc_info(FILE *fp, char class) 
-{
-  long int input_tuples, attrnum;
-  if      (class == 'S') { input_tuples = 1000;     attrnum = 5; }
-  else if (class == 'W') { input_tuples = 100000;   attrnum = 10; }
-  else if (class == 'A') { input_tuples = 1000000;  attrnum = 15; }
-  else if (class == 'B') { input_tuples = 10000000; attrnum = 20; }
-  else {
-    printf("setparams: Internal error: invalid class %c\n", class);
-    exit(1);
-  }
-  fprintf(fp, "long long int input_tuples=%ld, attrnum=%ld;\n",
-              input_tuples, attrnum);
-}
-
-/* 
- * write_lu_info(): Write LU specific info to config file
- */
-
-void write_lu_info(FILE *fp, char class) 
-{
-  int isiz1, isiz2, itmax, inorm, problem_size;
-  char *dt_default;
-
-  if      (class == 'S') { problem_size = 12;  dt_default = "0.5d0"; itmax = 50; }
-  else if (class == 'W') { problem_size = 33;  dt_default = "1.5d-3"; itmax = 300; }
-  else if (class == 'A') { problem_size = 64;  dt_default = "2.0d0"; itmax = 250; }
-  else if (class == 'B') { problem_size = 102; dt_default = "2.0d0"; itmax = 250; }
-  else if (class == 'C') { problem_size = 162; dt_default = "2.0d0"; itmax = 250; }
-  else if (class == 'D') { problem_size = 408; dt_default = "1.0d0"; itmax = 300; }
-  else if (class == 'E') { problem_size = 1020; dt_default = "0.5d0"; itmax = 300; }
-  else {
-    printf("setparams: Internal error: invalid class %c\n", class);
-    exit(1);
-  }
-  inorm = itmax;
-  isiz1 = problem_size;
-  isiz2 = problem_size;
-  
-
-  fprintf(fp, "\n! full problem size\n");
-  fprintf(fp, "%sinteger isiz1, isiz2, isiz3\n", FINDENT);
-  fprintf(fp, "%sparameter (isiz1=%d, isiz2=%d, isiz3=%d)\n", 
-	       FINDENT, isiz1, isiz2, problem_size );
-
-  fprintf(fp, "\n! number of iterations and how often to print the norm\n");
-  fprintf(fp, "%sinteger itmax_default, inorm_default\n", FINDENT);
-  fprintf(fp, "%sparameter (itmax_default=%d, inorm_default=%d)\n", 
-	  FINDENT, itmax, inorm);
-
-  fprintf(fp, "%sdouble precision dt_default\n", FINDENT);
-  fprintf(fp, "%sparameter (dt_default = %s)\n", FINDENT, dt_default);
-  
-}
-
-/* 
- * write_mg_info(): Write MG specific info to config file
- */
-
-void write_mg_info(FILE *fp, char class) 
-{
-  int problem_size, nit, log2_size, lt_default, lm;
-  int ndim1, ndim2, ndim3;
-  if      (class == 'S') { problem_size = 32; nit = 4; }
-/*  else if (class == 'W') { problem_size = 64; nit = 40; }*/
-  else if (class == 'W') { problem_size = 128; nit = 4; }
-  else if (class == 'A') { problem_size = 256; nit = 4; }
-  else if (class == 'B') { problem_size = 256; nit = 20; }
-  else if (class == 'C') { problem_size = 512; nit = 20; }
-  else if (class == 'D') { problem_size = 1024; nit = 50; }
-  else if (class == 'E') { problem_size = 2048; nit = 50; }
-  else {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-  log2_size = ilog2(problem_size);
-  /* lt is log of largest total dimension */
-  lt_default = log2_size;
-  /* log of log of maximum dimension on a node */
-  lm = log2_size;
-  ndim1 = lm;
-  ndim3 = log2_size;
-  ndim2 = log2_size;
-
-  fprintf(fp, "%sinteger nx_default, ny_default, nz_default\n", FINDENT);
-  fprintf(fp, "%sparameter (nx_default=%d, ny_default=%d, nz_default=%d)\n", 
-	  FINDENT, problem_size, problem_size, problem_size);
-  fprintf(fp, "%sinteger nit_default, lm, lt_default\n", FINDENT);
-  fprintf(fp, "%sparameter (nit_default=%d, lm = %d, lt_default=%d)\n", 
-	  FINDENT, nit, lm, lt_default);
-  fprintf(fp, "%sinteger debug_default\n", FINDENT);
-  fprintf(fp, "%sparameter (debug_default=%d)\n", FINDENT, 0);
-  fprintf(fp, "%sinteger ndim1, ndim2, ndim3\n", FINDENT);
-  fprintf(fp, "%sparameter (ndim1 = %d, ndim2 = %d, ndim3 = %d)\n", 
-	  FINDENT, ndim1, ndim2, ndim3);
-  fprintf(fp, "%sinteger%s one, nv, nr, ir\n", 
-          FINDENT, (problem_size > 1024)? "*8" : "");
-  fprintf(fp, "%sparameter (one=1)\n", FINDENT);
-}
-
-
-/* 
- * write_is_info(): Write IS specific info to config file
- */
-
-void write_is_info(FILE *fp, char class) 
-{
-  if( class != 'S' &&
-      class != 'W' &&
-      class != 'A' &&
-      class != 'B' &&
-      class != 'C' &&
-      class != 'D')
-  {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-}
-
-
-/* 
- * write_cg_info(): Write CG specific info to config file
- */
-
-void write_cg_info(FILE *fp, char class) 
-{
-  int na,nonzer,niter;
-  char *shift,*rcond="1.0d-1";
-  char *shiftS="10.",
-       *shiftW="12.",
-       *shiftA="20.",
-       *shiftB="60.",
-       *shiftC="110.",
-       *shiftD="500.",
-       *shiftE="1.5d3";
-
-
-  if( class == 'S' )
-  { na=1400; nonzer=7; niter=15; shift=shiftS; }
-  else if( class == 'W' )
-  { na=7000; nonzer=8; niter=15; shift=shiftW; }
-  else if( class == 'A' )
-  { na=14000; nonzer=11; niter=15; shift=shiftA; }
-  else if( class == 'B' )
-  { na=75000; nonzer=13; niter=75; shift=shiftB; }
-  else if( class == 'C' )
-  { na=150000; nonzer=15; niter=75; shift=shiftC; }
-  else if( class == 'D' )
-  { na=1500000; nonzer=21; niter=100; shift=shiftD; }
-  else if( class == 'E' )
-  { na=9000000; nonzer=26; niter=100; shift=shiftE; }
-  else
-  {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-  fprintf( fp, "%sinteger            na, nonzer, niter\n", FINDENT );
-  fprintf( fp, "%sdouble precision   shift, rcond\n", FINDENT );
-  fprintf( fp, "%sparameter(  na=%d,\n", FINDENT, na );
-  fprintf( fp, "%s             nonzer=%d,\n", CONTINUE, nonzer );
-  fprintf( fp, "%s             niter=%d,\n", CONTINUE, niter );
-  fprintf( fp, "%s             shift=%s,\n", CONTINUE, shift );
-  fprintf( fp, "%s             rcond=%s )\n", CONTINUE, rcond );
-  
-}
-
-/* 
- * write_ua_info(): Write UA specific info to config file
- */
-
-void write_ua_info(FILE *fp, char class) 
-{
-  int lelt, lmor,refine_max, niter, nmxh, fre;
-  char *alpha;
-
-  fre = 5;
-  if( class == 'S' )
-  { lelt=250;lmor=11600;       refine_max=4;  niter=50;  nmxh=10; alpha="0.040d0"; }
-  else if( class == 'W' )
-  { lelt=700;lmor=26700;       refine_max=5;  niter=100; nmxh=10; alpha="0.060d0"; }
-  else if( class == 'A' )
-  { lelt=2400;lmor=92700;      refine_max=6;  niter=200; nmxh=10; alpha="0.076d0"; }
-  else if( class == 'B' )
-  { lelt=8800;  lmor=334600;   refine_max=7;  niter=200; nmxh=10; alpha="0.076d0"; }
-  else if( class == 'C' )
-  { lelt=33500; lmor=1262100;  refine_max=8;  niter=200; nmxh=10; alpha="0.067d0"; }
-  else if( class == 'D' )
-  { lelt=515000;lmor=19500000; refine_max=10; niter=250; nmxh=10; alpha="0.046d0"; }
-  else
-  {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-  
-  fprintf( fp, "%sinteger          lelt, lmor, refine_max, fre_default\n", FINDENT );
-  fprintf( fp, "%sinteger          niter_default, nmxh_default\n", FINDENT );
-  fprintf( fp, "%scharacter        class_default\n", FINDENT );
-  fprintf( fp, "%sdouble precision alpha_default\n", FINDENT );
-  fprintf( fp, "%sparameter(  lelt=%d,\n", FINDENT, lelt );
-  fprintf( fp, "%s            lmor=%d,\n", CONTINUE, lmor );
-  fprintf( fp, "%s             refine_max=%d,\n", CONTINUE, refine_max );
-  fprintf( fp, "%s             fre_default=%d,\n", CONTINUE, fre );
-  fprintf( fp, "%s             niter_default=%d,\n", CONTINUE, niter );
-  fprintf( fp, "%s             nmxh_default=%d,\n", CONTINUE, nmxh );
-  fprintf( fp, "%s             class_default=\"%c\",\n", CONTINUE, class );
-  fprintf( fp, "%s             alpha_default=%s )\n", CONTINUE, alpha );
-  
-}
-
-/* 
- * write_ft_info(): Write FT specific info to config file
- */
-
-void write_ft_info(FILE *fp, char class) 
-{
-  /* easiest way (given the way the benchmark is written)
-   * is to specify log of number of grid points in each
-   * direction m1, m2, m3. nt is the number of iterations
-   */
-  int nx, ny, nz, maxdim, niter;
-  if      (class == 'S') { nx = 64; ny = 64; nz = 64; niter = 6;}
-  else if (class == 'W') { nx = 128; ny = 128; nz = 32; niter = 6;}
-  else if (class == 'A') { nx = 256; ny = 256; nz = 128; niter = 6;}
-  else if (class == 'B') { nx = 512; ny = 256; nz = 256; niter =20;}
-  else if (class == 'C') { nx = 512; ny = 512; nz = 512; niter =20;}
-  else if (class == 'D') { nx = 2048; ny = 1024; nz = 1024; niter =25;}
-  else if (class == 'E') { nx = 4096; ny = 2048; nz = 2048; niter =25;}
-  else {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-  maxdim = nx;
-  if (ny > maxdim) maxdim = ny;
-  if (nz > maxdim) maxdim = nz;
-  fprintf(fp, "%sinteger nx, ny, nz, maxdim, niter_default\n", FINDENT);
-  fprintf(fp, "%sinteger%s ntotal, nxp, nyp, ntotalp\n", FINDENT,
-          (nx > 1024)? "*8" : "");
-  fprintf(fp, "%sparameter (nx=%d, ny=%d, nz=%d, maxdim=%d)\n", 
-          FINDENT, nx, ny, nz, maxdim);
-  fprintf(fp, "%sparameter (niter_default=%d)\n", FINDENT, niter);
-  fprintf(fp, "%sparameter (nxp=nx+1, nyp=ny)\n", FINDENT);
-  fprintf(fp, "%sparameter (ntotal=nx*nyp*nz)\n", FINDENT);
-  fprintf(fp, "%sparameter (ntotalp=nxp*nyp*nz)\n", FINDENT);
-
-}
-
-/*
- * write_ep_info(): Write EP specific info to config file
- */
-
-void write_ep_info(FILE *fp, char class)
-{
-  /* easiest way (given the way the benchmark is written)
-   * is to specify log of number of grid points in each
-   * direction m1, m2, m3. nt is the number of iterations
-   */
-  int m;
-  if      (class == 'S') { m = 24; }
-  else if (class == 'W') { m = 25; }
-  else if (class == 'A') { m = 28; }
-  else if (class == 'B') { m = 30; }
-  else if (class == 'C') { m = 32; }
-  else if (class == 'D') { m = 36; }
-  else if (class == 'E') { m = 40; }
-  else {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-
-  fprintf(fp, "%scharacter class\n",FINDENT);
-  fprintf(fp, "%sparameter (class =\'%c\')\n",
-                  FINDENT, class);
-  fprintf(fp, "%sinteger m\n", FINDENT);
-  fprintf(fp, "%sparameter (m=%d)\n", FINDENT, m);
-}
-
-
-/* 
- * This is a gross hack to allow the benchmarks to 
- * print out how they were compiled. Various other ways
- * of doing this have been tried and they all fail on
- * some machine - due to a broken "make" program, or
- * F77 limitations, of whatever. Hopefully this will
- * always work because it uses very portable C. Unfortunately
- * it relies on parsing the make.def file - YUK. 
- * If your machine doesn't have <string.h> or <ctype.h>, happy hacking!
- * 
- */
-
-#define VERBOSE
-#define LL 400
-#include <stdio.h>
-#define DEFFILE "../config/make.def"
-#define DEFAULT_MESSAGE "(none)"
-FILE *deffile;
-void write_compiler_info(int type, FILE *fp)
-{
-  char line[LL];
-  char f77[LL], flink[LL], f_lib[LL], f_inc[LL], fflags[LL], flinkflags[LL];
-  char compiletime[LL], randfile[LL];
-  char cc[LL], cflags[LL], clink[LL], clinkflags[LL],
-       c_lib[LL], c_inc[LL];
-  struct tm *tmp;
-  time_t t;
-  deffile = fopen(DEFFILE, "r");
-  if (deffile == NULL) {
-    printf("\n\
-setparams: File %s doesn't exist. To build the NAS benchmarks\n\
-           you need to create it according to the instructions\n\
-           in the README in the main directory and comments in \n\
-           the file config/make.def.template\n", DEFFILE);
-    exit(1);
-  }
-  strcpy(f77, DEFAULT_MESSAGE);
-  strcpy(flink, DEFAULT_MESSAGE);
-  strcpy(f_lib, DEFAULT_MESSAGE);
-  strcpy(f_inc, DEFAULT_MESSAGE);
-  strcpy(fflags, DEFAULT_MESSAGE);
-  strcpy(flinkflags, DEFAULT_MESSAGE);
-  strcpy(randfile, DEFAULT_MESSAGE);
-  strcpy(cc, DEFAULT_MESSAGE);
-  strcpy(cflags, DEFAULT_MESSAGE);
-  strcpy(clink, DEFAULT_MESSAGE);
-  strcpy(clinkflags, DEFAULT_MESSAGE);
-  strcpy(c_lib, DEFAULT_MESSAGE);
-  strcpy(c_inc, DEFAULT_MESSAGE);
-
-  while (fgets(line, LL, deffile) != NULL) {
-    if (*line == '#') continue;
-    /* yes, this is inefficient. but it's simple! */
-    check_line(line, "F77", f77);
-    check_line(line, "FLINK", flink);
-    check_line(line, "F_LIB", f_lib);
-    check_line(line, "F_INC", f_inc);
-    check_line(line, "FFLAGS", fflags);
-    check_line(line, "FLINKFLAGS", flinkflags);
-    check_line(line, "RAND", randfile);
-    check_line(line, "CC", cc);
-    check_line(line, "CFLAGS", cflags);
-    check_line(line, "CLINK", clink);
-    check_line(line, "CLINKFLAGS", clinkflags);
-    check_line(line, "C_LIB", c_lib);
-    check_line(line, "C_INC", c_inc);
-  }
-
-  
-  (void) time(&t);
-  tmp = localtime(&t);
-  (void) strftime(compiletime, (size_t)LL, "%d %b %Y", tmp);
-
-
-  switch(type) {
-      case FT:
-      case SP:
-      case BT:
-      case MG:
-      case LU:
-      case EP:
-      case CG:
-      case UA:
-          put_string(fp, "compiletime", compiletime);
-          put_string(fp, "npbversion", VERSION);
-          put_string(fp, "cs1", f77);
-          put_string(fp, "cs2", flink);
-          put_string(fp, "cs3", f_lib);
-          put_string(fp, "cs4", f_inc);
-          put_string(fp, "cs5", fflags);
-          put_string(fp, "cs6", flinkflags);
-	  put_string(fp, "cs7", randfile);
-          break;
-      case IS:
-      case DC:
-          put_def_string(fp, "COMPILETIME", compiletime);
-          put_def_string(fp, "NPBVERSION", VERSION);
-          put_def_string(fp, "CC", cc);
-          put_def_string(fp, "CFLAGS", cflags);
-          put_def_string(fp, "CLINK", clink);
-          put_def_string(fp, "CLINKFLAGS", clinkflags);
-          put_def_string(fp, "C_LIB", c_lib);
-          put_def_string(fp, "C_INC", c_inc);
-          break;
-      default:
-          printf("setparams: (Internal error): Unknown benchmark type %d\n", 
-                                                                         type);
-          exit(1);
-  }
-
-}
-
-void check_line(char *line, char *label, char *val)
-{
-  char *original_line;
-  int n;
-  original_line = line;
-  /* compare beginning of line and label */
-  while (*label != '\0' && *line == *label) {
-    line++; label++; 
-  }
-  /* if *label is not EOS, we must have had a mismatch */
-  if (*label != '\0') return;
-  /* if *line is not a space, actual label is longer than test label */
-  if (!isspace(*line) && *line != '=') return ; 
-  /* skip over white space */
-  while (isspace(*line)) line++;
-  /* next char should be '=' */
-  if (*line != '=') return;
-  /* skip over white space */
-  while (isspace(*++line));
-  /* if EOS, nothing was specified */
-  if (*line == '\0') return;
-  /* finally we've come to the value */
-  strcpy(val, line);
-  /* chop off the newline at the end */
-  n = strlen(val)-1;
-  if (n >= 0 && val[n] == '\n')
-    val[n--] = '\0';
-  if (n >= 0 && val[n] == '\r')
-    val[n--] = '\0';
-  /* treat continuation */
-  while (val[n] == '\\' && fgets(original_line, LL, deffile)) {
-     line = original_line;
-     while (isspace(*line)) line++;
-     if (isspace(*original_line)) val[n++] = ' ';
-     while (*line && *line != '\n' && *line != '\r' && n < LL-1)
-       val[n++] = *line++;
-     val[n] = '\0';
-     n--;
-  }
-/*  if (val[n] == '\\') {
-    printf("\n\
-setparams: Error in file make.def. Because of the way in which\n\
-           command line arguments are incorporated into the\n\
-           executable benchmark, you can't have any continued\n\
-           lines in the file make.def, that is, lines ending\n\
-           with the character \"\\\". Although it may be ugly, \n\
-           you should be able to reformat without continuation\n\
-           lines. The offending line is\n\
-  %s\n", original_line);
-    exit(1);
-  } */
-}
-
-int check_include_line(char *line, char *filename)
-{
-  char *include_string = "include";
-  /* compare beginning of line and "include" */
-  while (*include_string != '\0' && *line == *include_string) {
-    line++; include_string++; 
-  }
-  /* if *include_string is not EOS, we must have had a mismatch */
-  if (*include_string != '\0') return(0);
-  /* if *line is not a space, first word is not "include" */
-  if (!isspace(*line)) return(0); 
-  /* skip over white space */
-  while (isspace(*++line));
-  /* if EOS, nothing was specified */
-  if (*line == '\0') return(0);
-  /* next keyword should be name of include file in *filename */
-  while (*filename != '\0' && *line == *filename) {
-    line++; filename++; 
-  }  
-  if (*filename != '\0' || 
-      (*line != ' ' && *line != '\0' && *line !='\n')) return(0);
-  else return(1);
-}
-
-
-#define MAXL 46
-void put_string(FILE *fp, char *name, char *val)
-{
-  int len;
-  len = strlen(val);
-  if (len > MAXL) {
-    val[MAXL] = '\0';
-    val[MAXL-1] = '.';
-    val[MAXL-2] = '.';
-    val[MAXL-3] = '.';
-    len = MAXL;
-  }
-  fprintf(fp, "%scharacter %s*%d\n", FINDENT, name, len);
-  fprintf(fp, "%sparameter (%s=\'%s\')\n", FINDENT, name, val);
-}
-
-/* need to escape quote (") in val */
-int fix_string_quote(char *val, char *newval, int maxl)
-{
-  int len;
-  int i, j;
-  len = strlen(val);
-  i = j = 0;
-  while (i < len && j < maxl) {
-    if (val[i] == '"')
-      newval[j++] = '\\';
-    if (j < maxl)
-      newval[j++] = val[i++];
-  }
-  newval[j] = '\0';
-  return j;
-}
-
-/* NOTE: is the ... stuff necessary in C? */
-void put_def_string(FILE *fp, char *name, char *val0)
-{
-  int len;
-  char val[MAXL+3];
-  len = fix_string_quote(val0, val, MAXL+2);
-  if (len > MAXL) {
-    val[MAXL] = '\0';
-    val[MAXL-1] = '.';
-    val[MAXL-2] = '.';
-    val[MAXL-3] = '.';
-    len = MAXL;
-  }
-  fprintf(fp, "#define %s \"%s\"\n", name, val);
-}
-
-void put_def_variable(FILE *fp, char *name, char *val)
-{
-  int len;
-  len = strlen(val);
-  if (len > MAXL) {
-    val[MAXL] = '\0';
-    val[MAXL-1] = '.';
-    val[MAXL-2] = '.';
-    val[MAXL-3] = '.';
-    len = MAXL;
-  }
-  fprintf(fp, "#define %s %s\n", name, val);
-}
-
-
-
-#if 0
-
-/* this version allows arbitrarily long lines but 
- * some compilers don't like that and they're rarely
- * useful 
- */
-
-#define LINELEN 65
-void put_string(FILE *fp, char *name, char *val)
-{
-  int len, nlines, pos, i;
-  char line[100];
-  len = strlen(val);
-  nlines = len/LINELEN;
-  if (nlines*LINELEN < len) nlines++;
-  fprintf(fp, "%scharacter*%d %s\n", FINDENT, nlines*LINELEN, name);
-  fprintf(fp, "%sparameter (%s = \n", FINDENT, name);
-  for (i = 0; i < nlines; i++) {
-    pos = i*LINELEN;
-    if (i == 0) fprintf(fp, "%s\'", CONTINUE);
-    else        fprintf(fp, "%s", CONTINUE);
-    /* number should be same as LINELEN */
-    fprintf(fp, "%.65s", val+pos);
-    if (i == nlines-1) fprintf(fp, "\')\n");
-    else             fprintf(fp, "\n");
-  }
-}
-
-#endif
-
-
-/* integer log base two. Return error is argument isn't
- * a power of two or is less than or equal to zero 
- */
-
-int ilog2(int i)
-{
-  int log2;
-  int exp2 = 1;
-  if (i <= 0) return(-1);
-
-  for (log2 = 0; log2 < 30; log2++) {
-    if (exp2 == i) return(log2);
-    if (exp2 > i) break;
-    exp2 *= 2;
-  }
-  return(-1);
-}
-
-
-
-/* Power function. We could use pow from the math library, but then
- * we would have to insist on always linking with the math library, just
- * for this function. Since we only need pow with integer exponents,
- * we'll code it ourselves here.
- */
-
-double power(double base, int i)
-{
-  double x;
-
-  if (i==0) return (1.0);
-  else if (i<0) {
-    base = 1.0/base;
-    i = -i;
-  }
-  x = 1.0;
-  while (i>0) {
-    x *=base;
-    i--;
-  }
-  return (x);
-}
-    
-
-void write_convertdouble_info(int type, FILE *fp)
-{
-  switch(type) {
-  case SP:
-  case BT:
-  case LU:
-  case FT:
-  case MG:
-  case EP:
-  case CG:
-  case UA:
-    fprintf(fp, "%slogical  convertdouble\n", FINDENT);
-#ifdef CONVERTDOUBLE
-    fprintf(fp, "%sparameter (convertdouble = .true.)\n", FINDENT);
-#else
-    fprintf(fp, "%sparameter (convertdouble = .false.)\n", FINDENT);
-#endif
-    break;
-  }
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile
deleted file mode 100644
index fd9b39d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=bt
-BENCHMARKU=BT
-VEC=
-
-include ../config/make_dvmh.def
-
-
-OBJS = bt.o make_set.o initialize.o exact_solution.o exact_rhs.o \
-       set_constants.o adi.o define.o copy_faces.o rhs.o \
-       x_solve$(VEC).o  add.o error.o \
-       verify.o setup_mpi.o \
-       ${COMMON}/print_results.o ${COMMON}/timers.o
-#y_solve$(VEC).o z_solve$(VEC).o  solve_subs.o
-include ../sys/make.common
-
-# npbparams.h is included by header.h
-# The following rule should do the trick but many make programs (not gmake)
-# will do the wrong thing and rebuild the world every time (because the
-# mod time on header.h is not changed. One solution would be to 
-# touch header.h but this might cause confusion if someone has
-# accidentally deleted it. Instead, make the dependency on npbparams.h
-# explicit in all the lines below (even though dependence is indirect). 
-
-# header.h: npbparams.h
-
-${PROGRAM}: config
-	@if [ x$(VERSION) = xvec ] ; then	\
-		${MAKE} VEC=_vec exec;		\
-	elif [ x$(VERSION) = xVEC ] ; then	\
-		${MAKE} VEC=_vec exec;		\
-	else					\
-		${MAKE} exec;			\
-	fi
-
-exec: $(OBJS)
-	@if [ x$(SUBTYPE) = xfull ] ; then	\
-		${MAKE} bt-full;		\
-	elif [ x$(SUBTYPE) = xFULL ] ; then	\
-		${MAKE} bt-full;		\
-	elif [ x$(SUBTYPE) = xsimple ] ; then	\
-		${MAKE} bt-simple;		\
-	elif [ x$(SUBTYPE) = xSIMPLE ] ; then	\
-		${MAKE} bt-simple;		\
-	elif [ x$(SUBTYPE) = xfortran ] ; then	\
-		${MAKE} bt-fortran;		\
-	elif [ x$(SUBTYPE) = xFORTRAN ] ; then	\
-		${MAKE} bt-fortran;		\
-	elif [ x$(SUBTYPE) = xepio ] ; then	\
-		${MAKE} bt-epio;		\
-	elif [ x$(SUBTYPE) = xEPIO ] ; then	\
-		${MAKE} bt-epio;		\
-	else					\
-		${MAKE} bt-bt;			\
-	fi
-
-bt-bt: ${OBJS} btio.o
-	${FLINK} ${FLINKFLAGS} -o ${PROGRAM}_dvmh ${OBJS} btio.o ${FMPI_LIB}
-
-bt-full: ${OBJS} full_mpiio.o btio_common.o
-	${FLINK} ${FLINKFLAGS} -o ${PROGRAM}.mpi_io_full ${OBJS} btio_common.o full_mpiio.o ${FMPI_LIB}
-
-bt-simple: ${OBJS} simple_mpiio.o btio_common.o
-	${FLINK} ${FLINKFLAGS} -o ${PROGRAM}.mpi_io_simple ${OBJS} btio_common.o simple_mpiio.o ${FMPI_LIB}
-
-bt-fortran: ${OBJS} fortran_io.o btio_common.o
-	${FLINK} ${FLINKFLAGS} -o ${PROGRAM}.fortran_io ${OBJS} btio_common.o fortran_io.o ${FMPI_LIB}
-
-bt-epio: ${OBJS} epio.o btio_common.o
-	${FLINK} ${FLINKFLAGS} -o ${PROGRAM}.ep_io ${OBJS} btio_common.o epio.o ${FMPI_LIB}
-
-.f.o:
-	${FCOMPILE} $<
-
-.c.o:
-	${CCOMPILE} $<
-
-
-bt.o:             bt.f  header.h npbparams.h  mpinpb.h
-make_set.o:       make_set.f  header.h npbparams.h  mpinpb.h
-initialize.o:     initialize.f  header.h npbparams.h
-exact_solution.o: exact_solution.f  header.h npbparams.h
-exact_rhs.o:      exact_rhs.f  header.h npbparams.h
-set_constants.o:  set_constants.f  header.h npbparams.h
-adi.o:            adi.f  header.h npbparams.h
-define.o:         define.f  header.h npbparams.h
-copy_faces.o:     copy_faces.f  header.h npbparams.h  mpinpb.h
-rhs.o:            rhs.f  header.h npbparams.h
-x_solve$(VEC).o:  x_solve$(VEC).f  header.h work_lhs$(VEC).h npbparams.h  mpinpb.h
-#y_solve$(VEC).o:  y_solve$(VEC).f  header.h work_lhs$(VEC).h npbparams.h  mpinpb.h
-#z_solve$(VEC).o:  z_solve$(VEC).f  header.h work_lhs$(VEC).h npbparams.h  mpinpb.h
-#solve_subs.o:     solve_subs.f  npbparams.h
-add.o:            add.f  header.h npbparams.h
-error.o:          error.f  header.h npbparams.h  mpinpb.h
-verify.o:         verify.f  header.h npbparams.h  mpinpb.h
-setup_mpi.o:      setup_mpi.f mpinpb.h npbparams.h 
-btio.o:           btio.f  header.h npbparams.h
-btio_common.o:    btio_common.f mpinpb.h npbparams.h 
-fortran_io.o:     fortran_io.f mpinpb.h npbparams.h 
-simple_mpiio.o:   simple_mpiio.f mpinpb.h npbparams.h 
-full_mpiio.o:     full_mpiio.f mpinpb.h npbparams.h 
-epio.o:           epio.f mpinpb.h npbparams.h 
-
-clean:
-	- rm -f *.o *~ mputil*
-	- rm -f  npbparams.h core *DVMH*
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/add.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/add.f
deleted file mode 100644
index 995a667..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/add.f
+++ /dev/null
@@ -1,38 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine  add
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     addition of update to the vector u
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer  c, i, j, k, m
-
-      do     c = 1, ncells
-
-! $omp parallel do private(k,j,i,m) collapse(2)	  
-
-!DVM$ region	  
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,j,i,m),
-!DVM$& TIE(rhs(*,i,j,k,*),u(*,i,j,k,*))
-         do     k = start(3,c), cell_size(3,c)-end(3,c)-1
-            do     j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do     i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do    m = 1, 5
-                     u(m,i,j,k,c) = u(m,i,j,k,c) + rhs(m,i,j,k,c)
-                  enddo
-               enddo
-            enddo
-         enddo
-!DVM$ end region		 
-
-      enddo
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f
deleted file mode 100644
index 310ab84..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/adi.f
+++ /dev/null
@@ -1,25 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine  adi
-      include 'header.h'
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-!DVM$ interval 1
-      call copy_faces
-!DVM$ end interval
-!DVM$ interval 2
-      call x_solve
-!DVM$ end interval
-!DVM$ interval 3
-      call y_solve
-!DVM$ end interval
-!DVM$ interval 4
-      call z_solve
-!DVM$ end interval
-!DVM$ interval 5
-      call add
-!DVM$ end interval
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f
deleted file mode 100644
index 490e9e0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/bt.f
+++ /dev/null
@@ -1,330 +0,0 @@
-!-------------------------------------------------------------------------!
-!                                                                         !
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         !
-!                                                                         !
-!                                   B T                                   !
-!                                                                         !
-!-------------------------------------------------------------------------!
-!                                                                         !
-!    This benchmark is part of the NAS Parallel Benchmark 3.3 suite.      !
-!    It is described in NAS Technical Reports 95-020 and 02-007.          !
-!                                                                         !
-!    Permission to use, copy, distribute and modify this software         !
-!    for any purpose with or without fee is hereby granted.  We           !
-!    request, however, that all derived work reference the NAS            !
-!    Parallel Benchmarks 3.3. This software is provided "as is"           !
-!    without express or implied warranty.                                 !
-!                                                                         !
-!    Information on NPB 3.3, including the technical report, the          !
-!    original specifications, source code, results and information        !
-!    on how to submit new results, is available at:                       !
-!                                                                         !
-!           http://www.nas.nasa.gov/Software/NPB/                         !
-!                                                                         !
-!    Send comments or suggestions to  npb@nas.nasa.gov                    !
-!                                                                         !
-!          NAS Parallel Benchmarks Group                                  !
-!          NASA Ames Research Center                                      !
-!          Mail Stop: T27A-1                                              !
-!          Moffett Field, CA   94035-1000                                 !
-!                                                                         !
-!          E-mail:  npb@nas.nasa.gov                                      !
-!          Fax:     (650) 604-3957                                        !
-!                                                                         !
-!-------------------------------------------------------------------------!
-
-c---------------------------------------------------------------------
-c
-c Authors: R. F. Van der Wijngaart
-c          T. Harris
-c          M. Yarrow
-c
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-       program MPBT
-c---------------------------------------------------------------------
-
-       include  'header.h'
-       include  'mpinpb.h'
-      
-       integer i, niter, step, c, error, fstatus
-       double precision navg, mflops, mbytes, n3
-
-       external timer_read
-       double precision t, tmax, tiominv, tpc, timer_read
-       logical verified
-       character class, cbuff*40
-       double precision t1(t_last+2), tsum(t_last+2), 
-     >                  tming(t_last+2), tmaxg(t_last+2)
-       character        t_recs(t_last+2)*8
-
-       integer wr_interval
-
-       data t_recs/'total', 'i/o', 'rhs', 'xsolve', 'ysolve', 'zsolve', 
-     >             'bpack', 'exch', 'xcomm', 'ycomm', 'zcomm',
-     >             ' totcomp', ' totcomm'/
-
-       call setup_mpi
-       if (.not. active) goto 999
-
-c---------------------------------------------------------------------
-c      Root node reads input file (if it exists) else takes
-c      defaults from parameters
-c---------------------------------------------------------------------
-       if (node .eq. root) then
-          
-          write(*, 1000)
-
-          open (unit=2,file='timer.flag',status='old',iostat=fstatus)
-          timeron = .false.
-          if (fstatus .eq. 0) then
-             timeron = .true.
-             close(2)
-          endif
-
-          open (unit=2,file='inputbt.data',status='old', iostat=fstatus)
-c
-          rd_interval = 0
-          if (fstatus .eq. 0) then
-            write(*,233) 
- 233        format(' Reading from input file inputbt.data')
-            read (2,*) niter
-            read (2,*) dt
-            read (2,*) grid_points(1), grid_points(2), grid_points(3)
-            if (iotype .ne. 0) then
-                read (2,'(A)') cbuff
-                read (cbuff,*,iostat=i) wr_interval, rd_interval
-                if (i .ne. 0) rd_interval = 0
-                if (wr_interval .le. 0) wr_interval = wr_default
-            endif
-            if (iotype .eq. 1) then
-                read (2,*) collbuf_nodes, collbuf_size
-                write(*,*) 'collbuf_nodes ', collbuf_nodes
-                write(*,*) 'collbuf_size  ', collbuf_size
-            endif
-            close(2)
-          else
-            write(*,234) 
-            niter = niter_default
-            dt    = dt_default
-            grid_points(1) = problem_size
-            grid_points(2) = problem_size
-            grid_points(3) = problem_size
-            wr_interval = wr_default
-            if (iotype .eq. 1) then
-c             set number of nodes involved in collective buffering to 4,
-c             unless total number of nodes is smaller than that.
-c             set buffer size for collective buffering to 1MB per node
-c             collbuf_nodes = min(4,no_nodes)
-c             set default to No-File-Hints with a value of 0
-              collbuf_nodes = 0
-              collbuf_size = 1000000
-            endif
-          endif
- 234      format(' No input file inputbt.data. Using compiled defaults')
-
-          write(*, 1001) grid_points(1), grid_points(2), grid_points(3)
-          write(*, 1002) niter, dt
-          if (no_nodes .ne. total_nodes) write(*, 1004) total_nodes
-          if (no_nodes .ne. maxcells*maxcells) 
-     >        write(*, 1005) maxcells*maxcells
-          write(*, 1003) no_nodes
-
-          if (iotype .eq. 1) write(*, 1006) 'FULL MPI-IO', wr_interval
-          if (iotype .eq. 2) write(*, 1006) 'SIMPLE MPI-IO', wr_interval
-          if (iotype .eq. 3) write(*, 1006) 'EPIO', wr_interval
-          if (iotype .eq. 4) write(*, 1006) 'FORTRAN IO', wr_interval
-
- 1000 format(//, ' NAS Parallel Benchmarks 3.3 -- BT Benchmark ',/)
- 1001     format(' Size: ', i4, 'x', i4, 'x', i4)
- 1002     format(' Iterations: ', i4, '    dt: ', F11.7)
- 1004     format(' Total number of processes: ', i5)
- 1005     format(' WARNING: compiled for ', i5, ' processes ')
- 1003     format(' Number of active processes: ', i5, /)
- 1006     format(' BTIO -- ', A, ' write interval: ', i3 /)
-
-       endif
-
-       call mpi_bcast(niter, 1, MPI_INTEGER,
-     >                root, comm_setup, error)
-
-       call mpi_bcast(dt, 1, dp_type, 
-     >                root, comm_setup, error)
-
-       call mpi_bcast(grid_points(1), 3, MPI_INTEGER, 
-     >                root, comm_setup, error)
-
-       call mpi_bcast(wr_interval, 1, MPI_INTEGER,
-     >                root, comm_setup, error)
-
-       call mpi_bcast(rd_interval, 1, MPI_INTEGER,
-     >                root, comm_setup, error)
-
-       call mpi_bcast(timeron, 1, MPI_LOGICAL, 
-     >                root, comm_setup, error)
-
-       call make_set
-
-       do  c = 1, maxcells
-          if ( (cell_size(1,c) .gt. IMAX) .or.
-     >         (cell_size(2,c) .gt. JMAX) .or.
-     >         (cell_size(3,c) .gt. KMAX) ) then
-             print *,node, c, (cell_size(i,c),i=1,3)
-             print *,' Problem size too big for compiled array sizes'
-             goto 999
-          endif
-       end do
-
-       do  i = 1, t_last
-          call timer_clear(i)
-       end do
-
-       call set_constants
-
-       call initialize
-
-       call setup_btio
-       idump = 0
-
-       call lhsinit
-
-       call exact_rhs
-
-       call compute_buffer_size(5)
-
-c---------------------------------------------------------------------
-c      do one time step to touch all code, and reinitialize
-c---------------------------------------------------------------------
-!DVM$ actual(forcing,u)
-       call adi
-       call initialize
-
-c---------------------------------------------------------------------
-c      Synchronize before placing time stamp
-c---------------------------------------------------------------------
-       do  i = 1, t_last
-          call timer_clear(i)
-       end do
-       call mpi_barrier(comm_setup, error)
-
-       call timer_start(1)
-
-!DVM$ actual(forcing,u)
-       do  step = 1, niter
-
-          if (node .eq. root) then
-             if (mod(step, 20) .eq. 0 .or. step .eq. niter .or.
-     >           step .eq. 1) then
-                write(*, 200) step
- 200            format(' Time step ', i4)
-             endif
-          endif
-
-          call adi
-
-          if (iotype .ne. 0) then
-              if (mod(step, wr_interval).eq.0 .or. step .eq. niter) then
-                  if (node .eq. root) then
-                      print *, 'Writing data set, time step', step
-                  endif
-                  if (step .eq. niter .and. rd_interval .gt. 1) then
-                      rd_interval = 1
-                  endif
-                  call timer_start(2)
-                  call output_timestep
-                  call timer_stop(2)
-                  idump = idump + 1
-              endif
-          endif
-       end do
-
-       call timer_start(2)
-       call btio_cleanup
-       call timer_stop(2)
-
-       call timer_stop(1)
-       t = timer_read(1)
-
-       call verify(niter, class, verified)
-
-       call mpi_reduce(t, tmax, 1, 
-     >                 dp_type, MPI_MAX, 
-     >                 root, comm_setup, error)
-
-       if (iotype .ne. 0) then
-          t = timer_read(2)
-          if (t .ne. 0.d0) t = 1.0d0 / t
-          call mpi_reduce(t, tiominv, 1, 
-     >                    dp_type, MPI_SUM, 
-     >                    root, comm_setup, error)
-       endif
-
-       if( node .eq. root ) then
-          n3 = 1.0d0*grid_points(1)*grid_points(2)*grid_points(3)
-          navg = (grid_points(1)+grid_points(2)+grid_points(3))/3.0
-          if( tmax .ne. 0. ) then
-             mflops = 1.0e-6*float(niter)*
-     >     (3478.8*n3-17655.7*navg**2+28023.7*navg)
-     >     / tmax
-          else
-             mflops = 0.0
-          endif
-
-          if (iotype .ne. 0) then
-             mbytes = n3 * 40.0 * idump * 1.0d-6
-             tiominv = tiominv / no_nodes
-             t = 0.0
-             if (tiominv .ne. 0.) t = 1.d0 / tiominv
-             tpc = 0.0
-             if (tmax .ne. 0.) tpc = t * 100.0 / tmax
-             write(*,1100) t, tpc, mbytes, mbytes*tiominv
- 1100        format(/' BTIO -- statistics:'/
-     >               '   I/O timing in seconds   : ', f14.2/
-     >               '   I/O timing percentage   : ', f14.2/
-     >               '   Total data written (MB) : ', f14.2/
-     >               '   I/O data rate  (MB/sec) : ', f14.2)
-          endif
-
-         call print_results('BT', class, grid_points(1), 
-     >     grid_points(2), grid_points(3), niter, maxcells*maxcells, 
-     >     total_nodes, tmax, mflops, '          floating point', 
-     >     verified, npbversion,compiletime, cs1, cs2, cs3, cs4, cs5, 
-     >     cs6, '(none)')
-       endif
-
-       if (.not.timeron) goto 999
-
-       do i = 1, t_last
-          t1(i) = timer_read(i)
-       end do
-       t1(t_xsolve) = t1(t_xsolve) - t1(t_xcomm)
-       t1(t_ysolve) = t1(t_ysolve) - t1(t_ycomm)
-       t1(t_zsolve) = t1(t_zsolve) - t1(t_zcomm)
-       t1(t_last+2) = t1(t_xcomm)+t1(t_ycomm)+t1(t_zcomm)+t1(t_exch)
-       t1(t_last+1) = t1(t_total)  - t1(t_last+2)
-
-       call MPI_Reduce(t1, tsum,  t_last+2, dp_type, MPI_SUM, 
-     >                 0, comm_setup, error)
-       call MPI_Reduce(t1, tming, t_last+2, dp_type, MPI_MIN, 
-     >                 0, comm_setup, error)
-       call MPI_Reduce(t1, tmaxg, t_last+2, dp_type, MPI_MAX, 
-     >                 0, comm_setup, error)
-
-       if (node .eq. 0) then
-          write(*, 800) total_nodes
-          do i = 1, t_last+2
-             tsum(i) = tsum(i) / total_nodes
-             write(*, 810) i, t_recs(i), tming(i), tmaxg(i), tsum(i)
-          end do
-       endif
- 800   format(' nprocs =', i6, 11x, 'minimum', 5x, 'maximum', 
-     >        5x, 'average')
- 810   format(' timer ', i2, '(', A8, ') :', 3(2x,f10.4))
-
- 999   continue
-       call mpi_barrier(MPI_COMM_WORLD, error)
-       call mpi_finalize(error)
-
-       end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f
deleted file mode 100644
index 1fb730b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio.f
+++ /dev/null
@@ -1,72 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine setup_btio
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine output_timestep
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine btio_cleanup
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine btio_verify(verified)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      logical verified
-
-      verified = .true.
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine accumulate_norms(xce_acc)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision xce_acc(5)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine checksum_timestep
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f
deleted file mode 100644
index 9227a12..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/btio_common.f
+++ /dev/null
@@ -1,30 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine clear_timestep
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer cio, kio, jio, ix
-
-      do cio=1,ncells
-          do kio=0, cell_size(3,cio)-1
-              do jio=0, cell_size(2,cio)-1
-                  do ix=0,cell_size(1,cio)-1
-                            u(1,ix, jio,kio,cio) = 0
-                            u(2,ix, jio,kio,cio) = 0
-                            u(3,ix, jio,kio,cio) = 0
-                            u(4,ix, jio,kio,cio) = 0
-                            u(5,ix, jio,kio,cio) = 0
-                  enddo
-              enddo
-          enddo
-      enddo
-
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f
deleted file mode 100644
index 0c4c013..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/copy_faces.f
+++ /dev/null
@@ -1,408 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine copy_faces
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     
-c This function copies the face values of a variable defined on a set 
-c of cells to the overlap locations of the adjacent sets of cells. 
-c Because a set of cells interfaces in each direction with exactly one 
-c other set, we only need to fill six different buffers. We could try to 
-c overlap communication with computation, by computing
-c some internal values while communicating boundary values, but this
-c adds so much overhead that it's not clearly useful. 
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer i, j, k, c, m, requests(0:11), p0, p1, pp,ks,ke,is,ie,je,
-     >     p2, p3, p4, p5, b_size(0:5), ss(0:5), js, add,
-     >     sr(0:5), error, statuses(MPI_STATUS_SIZE, 0:11)
-
-c---------------------------------------------------------------------
-c     exit immediately if there are no faces to be copied           
-c---------------------------------------------------------------------
-      if (no_nodes .eq. 1) then
-         call compute_rhs
-         return
-      endif
-
-      ss(0) = start_send_east
-      ss(1) = start_send_west
-      ss(2) = start_send_north
-      ss(3) = start_send_south
-      ss(4) = start_send_top
-      ss(5) = start_send_bottom
-
-      sr(0) = start_recv_east
-      sr(1) = start_recv_west
-      sr(2) = start_recv_north
-      sr(3) = start_recv_south
-      sr(4) = start_recv_top
-      sr(5) = start_recv_bottom
-
-      b_size(0) = east_size   
-      b_size(1) = west_size   
-      b_size(2) = north_size  
-      b_size(3) = south_size  
-      b_size(4) = top_size    
-      b_size(5) = bottom_size 
-
-c---------------------------------------------------------------------
-c     because the difference stencil for the diagonalized scheme is 
-c     orthogonal, we do not have to perform the staged copying of faces, 
-c     but can send all face information simultaneously to the neighboring 
-c     cells in all directions          
-c---------------------------------------------------------------------
-      if (timeron) call timer_start(t_bpack)
-      p0 = 0
-      p1 = 0
-      p2 = 0
-      p3 = 0
-      p4 = 0
-      p5 = 0
-
-      do  c = 1, ncells
-
-c---------------------------------------------------------------------
-c     fill the buffer to be sent to eastern neighbors (i-dir)
-c---------------------------------------------------------------------
-         if (cell_coord(1,c) .ne. ncells) then
-		    ke=cell_size(3,c)-1
-			je=cell_size(2,c)-1
-			is=cell_size(1,c)-2
-			ie=cell_size(1,c)-1
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))
-            do   k = 0, ke
-               do   j = 0, je
-                  do   i = is, ie
-				     pp = p0+k*(je+1)*2*5+j*2*5+(i-is)*5
-                     do   m = 1, 5
-                        out_buffer(ss(0)+pp+(m-1)) = u(m,i,j,k,c)                        
-                     end do					 
-                  end do                  
-               end do
-            end do
-!DVM$ end region						
-            p0 = p0+(ke+1)*(je+1)*(ie-is+1)*5
-         endif
-
-c---------------------------------------------------------------------
-c     fill the buffer to be sent to western neighbors 
-c---------------------------------------------------------------------
-         if (cell_coord(1,c) .ne. 1) then
-		    ke=cell_size(3,c)-1
-			je=cell_size(2,c)-1
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))
-            do   k = 0, ke
-               do   j = 0,je
-                  do   i = 0,1
-				     pp = p1+k*(je+1)*2*5+j*2*5+(i-0)*5				  
-                     do   m = 1, 5
-                        out_buffer(ss(1)+pp+m-1) = u(m,i,j,k,c)
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region			
-			p1=p1+(ke+1)*(je+1)*2*5
-         endif
-
-c---------------------------------------------------------------------
-c     fill the buffer to be sent to northern neighbors (j_dir)
-c---------------------------------------------------------------------
-         if (cell_coord(2,c) .ne. ncells) then
-		    ke=cell_size(3,c)-1						
-			ie=cell_size(1,c)-1
-			js=cell_size(2,c)-2
-			je=cell_size(2,c)-1
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))			
-            do   k = 0,ke
-               do   j = js,je
-                  do   i = 0,ie
-		             pp = p2+k*(ie+1)*2*5+(j-js)*(ie+1)*5+i*5
-                     do   m = 1, 5
-                        out_buffer(ss(2)+pp+(m-1)) = u(m,i,j,k,c)
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region
-			p2=p2+(ke+1)*(je-js+1)*(ie+1)*5
-         endif
-
-c---------------------------------------------------------------------
-c     fill the buffer to be sent to southern neighbors 
-c---------------------------------------------------------------------
-         if (cell_coord(2,c).ne. 1) then
-		    ke=cell_size(3,c)-1						
-			ie=cell_size(1,c)-1			
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))						
-            do   k = 0, ke
-               do   j = 0, 1
-                  do   i = 0, ie
-		             pp = p3+k*(ie+1)*2*5+(j-0)*(ie+1)*5 + i*5
-                     do   m = 1, 5
-                        out_buffer(ss(3)+pp+(m-1)) = u(m,i,j,k,c)
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region	
-            p3=p3+(ke+1)*2*(ie+1)*5
-         endif
-
-c---------------------------------------------------------------------
-c     fill the buffer to be sent to top neighbors (k-dir)
-c---------------------------------------------------------------------
-         if (cell_coord(3,c) .ne. ncells) then
-		    ks=cell_size(3,c)-2
-		    ke=cell_size(3,c)-1						
-			je=cell_size(2,c)-1		 
-			ie=cell_size(1,c)-1		
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))									
-            do   k = ks, ke
-               do   j = 0, je
-                  do   i = 0, ie
-				     pp = p4+(k-ks)*(je+1)*(ie+1)*5+j*(ie+1)*5+i*5				  
-                     do   m = 1, 5
-                        out_buffer(ss(4)+pp+(m-1)) = u(m,i,j,k,c)
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region
-            p4=p4+(ke-ks+1)*(je+1)*(ie+1)*5
-         endif
-
-c---------------------------------------------------------------------
-c     fill the buffer to be sent to bottom neighbors
-c---------------------------------------------------------------------
-         if (cell_coord(3,c).ne. 1) then
-			je=cell_size(2,c)-1		 
-			ie=cell_size(1,c)-1		
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))
-            do    k=0,1
-               do   j = 0, je
-                  do   i = 0, ie
-				     pp = p5+(k-0)*(je+1)*(ie+1)*5+j*(ie+1)*5+i*5					  
-                     do   m = 1, 5
-                        out_buffer(ss(5)+pp+(m-1)) = u(m,i,j,k,c)
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region	
-            p5=p5+2*(je+1)*(ie+1)*5
-         endif
-
-c---------------------------------------------------------------------
-c     cell loop
-c---------------------------------------------------------------------
-      end do
-      if (timeron) call timer_stop(t_bpack)
-
-      if (timeron) call timer_start(t_exch)
-!DVM$ get_actual(out_buffer)
-	  
-      call mpi_irecv(in_buffer(sr(0)), b_size(0), 
-     >     dp_type, successor(1), WEST,  
-     >     comm_rhs, requests(0), error)
-      call mpi_irecv(in_buffer(sr(1)), b_size(1), 
-     >     dp_type, predecessor(1), EAST,  
-     >     comm_rhs, requests(1), error)
-      call mpi_irecv(in_buffer(sr(2)), b_size(2), 
-     >     dp_type, successor(2), SOUTH, 
-     >     comm_rhs, requests(2), error)
-      call mpi_irecv(in_buffer(sr(3)), b_size(3), 
-     >     dp_type, predecessor(2), NORTH, 
-     >     comm_rhs, requests(3), error)
-      call mpi_irecv(in_buffer(sr(4)), b_size(4), 
-     >     dp_type, successor(3), BOTTOM,
-     >     comm_rhs, requests(4), error)
-      call mpi_irecv(in_buffer(sr(5)), b_size(5), 
-     >     dp_type, predecessor(3), TOP,   
-     >     comm_rhs, requests(5), error)
-
-      call mpi_isend(out_buffer(ss(0)), b_size(0), 
-     >     dp_type, successor(1),   EAST, 
-     >     comm_rhs, requests(6), error)
-      call mpi_isend(out_buffer(ss(1)), b_size(1), 
-     >     dp_type, predecessor(1), WEST, 
-     >     comm_rhs, requests(7), error)
-      call mpi_isend(out_buffer(ss(2)), b_size(2), 
-     >     dp_type,successor(2),   NORTH, 
-     >     comm_rhs, requests(8), error)
-      call mpi_isend(out_buffer(ss(3)), b_size(3), 
-     >     dp_type,predecessor(2), SOUTH, 
-     >     comm_rhs, requests(9), error)
-      call mpi_isend(out_buffer(ss(4)), b_size(4), 
-     >     dp_type,successor(3),   TOP, 
-     >     comm_rhs,   requests(10), error)
-      call mpi_isend(out_buffer(ss(5)), b_size(5), 
-     >     dp_type,predecessor(3), BOTTOM, 
-     >     comm_rhs,requests(11), error)
-
-
-      call mpi_waitall(12, requests, statuses, error)
-      if (timeron) call timer_stop(t_exch)
-
-c---------------------------------------------------------------------
-c     unpack the data that has just been received;             
-c---------------------------------------------------------------------
-      if (timeron) call timer_start(t_bpack)
-      p0 = 0
-      p1 = 0
-      p2 = 0
-      p3 = 0
-      p4 = 0
-      p5 = 0
-!DVM$ actual(in_buffer)
-
-      do   c = 1, ncells
-
-         if (cell_coord(1,c) .ne. 1) then
-		    ke=cell_size(3,c)-1
-			je=cell_size(2,c)-1
-			
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))					 
-            do   k = 0, ke
-               do   j = 0, je
-                  do   i = -2, -1
-				     pp = p0+k*(je+1)*2*5+j*2*5+(i+2)*5
-                     do   m = 1, 5
-                        u(m,i,j,k,c) = in_buffer(sr(1)+pp+(m-1))
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region
-            p0=p0+(ke+1)*(je+1)*2*5
-         endif
-
-         if (cell_coord(1,c) .ne. ncells) then
-		    ke=cell_size(3,c)-1
-			je=cell_size(2,c)-1
-			ie=cell_size(1,c)+1
-			is=cell_size(1,c)
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))					 
-            do  k = 0, ke
-               do  j = 0, je
-                  do  i = is, ie
-				     pp = p1+k*(je+1)*2*5+j*2*5+(i-is)*5
-                     do   m = 1, 5
-                        u(m,i,j,k,c) = in_buffer(sr(0)+pp+(m-1))
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region	
-            p1=p1+(ke+1)*(je+1)*2*5
-         end if
-            
-         if (cell_coord(2,c) .ne. 1) then
-		    ke=cell_size(3,c)-1						
-			ie=cell_size(1,c)-1
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))									
-            do  k = 0, ke
-               do   j = -2, -1
-                  do  i = 0, ie
-		             pp = p2+k*(ie+1)*2*5+(j+2)*(ie+1)*5+i*5
-                     do   m = 1, 5
-                        u(m,i,j,k,c) = in_buffer(sr(3)+pp+(m-1))
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region
-            p2=p2+(ke+1)*2*(ie+1)*5
-         endif
-            
-         if (cell_coord(2,c) .ne. ncells) then
-		    ke=cell_size(3,c)-1						
-			ie=cell_size(1,c)-1			
-			js=cell_size(2,c)
-			je=cell_size(2,c)+1
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))
-            do  k = 0, ke
-               do   j = js, je
-                  do  i = 0, ie
-		             pp = p3+k*(ie+1)*2*5+(j-js)*(ie+1)*5+i*5
-                     do   m = 1, 5
-                        u(m,i,j,k,c) = in_buffer(sr(2)+pp+(m-1))
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region	
-            p3=p3+(ke+1)*2*(ie+1)*5
-         endif
-
-         if (cell_coord(3,c) .ne. 1) then
-			je=cell_size(2,c)-1		 
-			ie=cell_size(1,c)-1	
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))				
-            do  k = -2, -1
-               do  j = 0, je
-                  do  i = 0, ie
-					pp = p4+(k+2)*(je+1)*(ie+1)*5+j*(ie+1)*5+i*5	
-                     do   m = 1, 5
-                        u(m,i,j,k,c) = in_buffer(sr(5)+pp+(m-1))
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region	
-            p4=p4+2*(je+1)*(ie+1)*5
-         endif
-
-         if (cell_coord(3,c) .ne. ncells) then
-			je=cell_size(2,c)-1		 
-			ie=cell_size(1,c)-1	
-            ks=cell_size(3,c)
-			ke=cell_size(3,c)+1
-!DVM$ region			
-!DVM$ PARALLEL(k,j,i), PRIVATE(pp,m), TIE(u(*,i,j,k,*))			
-            do  k = ks, ke
-               do  j = 0, je
-                  do  i = 0, ie
-				     pp=p5+(k-ks)*(je+1)*(ie+1)*5+j*(ie+1)*5+i*5					  
-                     do   m = 1, 5
-                        u(m,i,j,k,c) = in_buffer(sr(4)+pp+(m-1))
-                     end do
-                  end do
-               end do
-            end do
-!DVM$ end region
-            p5=p5+2*(je+1)*(ie+1)*5
-         endif
-
-c---------------------------------------------------------------------
-c     cells loop
-c---------------------------------------------------------------------
-      end do
-      if (timeron) call timer_stop(t_bpack)
-
-c---------------------------------------------------------------------
-c     do the rest of the rhs that uses the copied face values          
-c---------------------------------------------------------------------
-      call compute_rhs
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/define.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/define.f
deleted file mode 100644
index 03c4c6e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/define.f
+++ /dev/null
@@ -1,64 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine compute_buffer_size(dim)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer  c, dim, face_size
-
-      if (ncells .eq. 1) return
-
-c---------------------------------------------------------------------
-c     compute the actual sizes of the buffers; note that there is 
-c     always one cell face that doesn't need buffer space, because it 
-c     is at the boundary of the grid
-c---------------------------------------------------------------------
-      west_size = 0
-      east_size = 0
-
-      do   c = 1, ncells
-         face_size = cell_size(2,c) * cell_size(3,c) * dim * 2
-         if (cell_coord(1,c).ne.1) west_size = west_size + face_size
-         if (cell_coord(1,c).ne.ncells) east_size = east_size + 
-     >        face_size 
-      end do
-
-      north_size = 0
-      south_size = 0
-      do   c = 1, ncells
-         face_size = cell_size(1,c)*cell_size(3,c) * dim * 2
-         if (cell_coord(2,c).ne.1) south_size = south_size + face_size
-         if (cell_coord(2,c).ne.ncells) north_size = north_size + 
-     >        face_size 
-      end do
-
-      top_size = 0
-      bottom_size = 0
-      do   c = 1, ncells
-         face_size = cell_size(1,c) * cell_size(2,c) * dim * 2
-         if (cell_coord(3,c).ne.1) bottom_size = bottom_size + 
-     >        face_size
-         if (cell_coord(3,c).ne.ncells) top_size = top_size +
-     >        face_size     
-      end do
-
-      start_send_west   = 1
-      start_send_east   = start_send_west   + west_size
-      start_send_south  = start_send_east   + east_size
-      start_send_north  = start_send_south  + south_size
-      start_send_bottom = start_send_north  + north_size
-      start_send_top    = start_send_bottom + bottom_size
-      start_recv_west   = 1
-      start_recv_east   = start_recv_west   + west_size
-      start_recv_south  = start_recv_east   + east_size
-      start_recv_north  = start_recv_south  + south_size
-      start_recv_bottom = start_recv_north  + north_size
-      start_recv_top    = start_recv_bottom + bottom_size
-
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f
deleted file mode 100644
index 52b6309..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/epio.f
+++ /dev/null
@@ -1,165 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine setup_btio
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      character*(128) newfilenm
-      integer m
-
-      if (node .lt. 10000) then
-          write (newfilenm, 996) filenm,node
-      else
-          print *, 'error generating file names (> 10000 nodes)'
-          stop
-      endif
-
-996   format (a,'.',i4.4)
-
-      open (unit=99, file=newfilenm, form='unformatted',
-     $       status='unknown')
-
-      do m = 1, 5
-         xce_sub(m) = 0.d0
-      end do
-
-      idump_sub = 0
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine output_timestep
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer ix, iio, jio, kio, cio, aio
-
-      do cio=1,ncells
-          write(99)
-     $         ((((u(aio,ix, jio,kio,cio),aio=1,5),
-     $             ix=0, cell_size(1,cio)-1),
-     $             jio=0, cell_size(2,cio)-1),
-     $             kio=0, cell_size(3,cio)-1)
-      enddo
-
-      idump_sub = idump_sub + 1
-      if (rd_interval .gt. 0) then
-         if (idump_sub .ge. rd_interval) then
-
-            rewind(99)
-            call acc_sub_norms(idump+1)
-
-            rewind(99)
-            idump_sub = 0
-         endif
-      endif
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine acc_sub_norms(idump_cur)
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer idump_cur
-
-      integer ix, jio, kio, cio, ii, m, ichunk
-      double precision xce_single(5)
-
-      ichunk = idump_cur - idump_sub + 1
-      do ii=0, idump_sub-1
-        do cio=1,ncells
-          read(99)
-     $         ((((u(m,ix, jio,kio,cio),m=1,5),
-     $             ix=0, cell_size(1,cio)-1),
-     $             jio=0, cell_size(2,cio)-1),
-     $             kio=0, cell_size(3,cio)-1)
-        enddo
-
-        if (node .eq. root) print *, 'Reading data set ', ii+ichunk
-
-        call error_norm(xce_single)
-        do m = 1, 5
-           xce_sub(m) = xce_sub(m) + xce_single(m)
-        end do
-      enddo
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine btio_cleanup
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      close(unit=99)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine accumulate_norms(xce_acc)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      double precision xce_acc(5)
-
-      character*(128) newfilenm
-      integer m
-
-      if (rd_interval .gt. 0) goto 20
-
-      if (node .lt. 10000) then
-          write (newfilenm, 996) filenm,node
-      else
-          print *, 'error generating file names (> 10000 nodes)'
-          stop
-      endif
-
-996   format (a,'.',i4.4)
-
-      open (unit=99, file=newfilenm,
-     $      form='unformatted')
-
-c     clear the last time step
-
-      call clear_timestep
-
-c     read back the time steps and accumulate norms
-
-      call acc_sub_norms(idump)
-
-      close(unit=99)
-
- 20   continue
-      do m = 1, 5
-         xce_acc(m) = xce_sub(m) / dble(idump)
-      end do
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/error.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/error.f
deleted file mode 100644
index 7993bf1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/error.f
+++ /dev/null
@@ -1,107 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine error_norm(rms)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     this function computes the norm of the difference between the
-c     computed solution and the exact solution
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer c, i, j, k, m, ii, jj, kk, d, error
-      double precision xi, eta, zeta, u_exact(5), rms(5), rms_work(5),
-     >     add
-
-      do m = 1, 5 
-         rms_work(m) = 0.0d0
-      enddo
-
-!DVM$ get_actual(u)	 
-      do c = 1, ncells
-         kk = 0
-         do k = cell_low(3,c), cell_high(3,c)
-            zeta = dble(k) * dnzm1
-            jj = 0
-            do j = cell_low(2,c), cell_high(2,c)
-               eta = dble(j) * dnym1
-               ii = 0
-               do i = cell_low(1,c), cell_high(1,c)
-                  xi = dble(i) * dnxm1
-                  call exact_solution(xi, eta, zeta, u_exact)
-
-                  do m = 1, 5
-                     add = u(m,ii,jj,kk,c)-u_exact(m)
-                     rms_work(m) = rms_work(m) + add*add
-                  enddo
-                  ii = ii + 1
-               enddo
-               jj = jj + 1
-            enddo
-            kk = kk + 1
-         enddo
-      enddo
-
-      call mpi_allreduce(rms_work, rms, 5, dp_type, 
-     >     MPI_SUM, comm_setup, error)
-
-      do m = 1, 5
-         do d = 1, 3
-            rms(m) = rms(m) / dble(grid_points(d)-2)
-         enddo
-         rms(m) = dsqrt(rms(m))
-      enddo
-
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine rhs_norm(rms)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer c, i, j, k, d, m, error
-      double precision rms(5), rms_work(5), add
-
-      do m = 1, 5
-         rms_work(m) = 0.0d0
-      enddo 
-!DVM$ get_actual(rhs)	 
-      do c = 1, ncells
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     add = rhs(m,i,j,k,c)
-                     rms_work(m) = rms_work(m) + add*add
-                  enddo 
-               enddo 
-            enddo 
-         enddo 
-      enddo 
-
-      call mpi_allreduce(rms_work, rms, 5, dp_type, 
-     >     MPI_SUM, comm_setup, error)
-
-      do m = 1, 5
-         do d = 1, 3
-            rms(m) = rms(m) / dble(grid_points(d)-2)
-         enddo 
-         rms(m) = dsqrt(rms(m))
-      enddo 
-
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f
deleted file mode 100644
index 26a2871..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_rhs.f
+++ /dev/null
@@ -1,360 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine exact_rhs
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     compute the right hand side based on exact solution
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      double precision dtemp(5), xi, eta, zeta, dtpp
-      integer          c, m, i, j, k, ip1, im1, jp1, 
-     >     jm1, km1, kp1
-
-
-c---------------------------------------------------------------------
-c     loop over all cells owned by this node                   
-c---------------------------------------------------------------------
-      do c = 1, ncells
-
-c---------------------------------------------------------------------
-c     initialize                                  
-c---------------------------------------------------------------------
-         do k= 0, cell_size(3,c)-1
-            do j = 0, cell_size(2,c)-1
-               do i = 0, cell_size(1,c)-1
-                  do m = 1, 5
-                     forcing(m,i,j,k,c) = 0.0d0
-                  enddo
-               enddo
-            enddo
-         enddo
-
-c---------------------------------------------------------------------
-c     xi-direction flux differences                      
-c---------------------------------------------------------------------
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1
-            zeta = dble(k+cell_low(3,c)) * dnzm1
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               eta = dble(j+cell_low(2,c)) * dnym1
-
-               do i=-2*(1-start(1,c)), cell_size(1,c)+1-2*end(1,c)
-                  xi = dble(i+cell_low(1,c)) * dnxm1
-
-                  call exact_solution(xi, eta, zeta, dtemp)
-                  do m = 1, 5
-                     ue(i,m) = dtemp(m)
-                  enddo
-
-                  dtpp = 1.0d0 / dtemp(1)
-
-                  do m = 2, 5
-                     buf(i,m) = dtpp * dtemp(m)
-                  enddo
-
-                  cuf(i)   = buf(i,2) * buf(i,2)
-                  buf(i,1) = cuf(i) + buf(i,3) * buf(i,3) + 
-     >                 buf(i,4) * buf(i,4) 
-                  q(i) = 0.5d0*(buf(i,2)*ue(i,2) + buf(i,3)*ue(i,3) +
-     >                 buf(i,4)*ue(i,4))
-
-               enddo
-               
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  im1 = i-1
-                  ip1 = i+1
-
-                  forcing(1,i,j,k,c) = forcing(1,i,j,k,c) -
-     >                 tx2*( ue(ip1,2)-ue(im1,2) )+
-     >                 dx1tx1*(ue(ip1,1)-2.0d0*ue(i,1)+ue(im1,1))
-
-                  forcing(2,i,j,k,c) = forcing(2,i,j,k,c) - tx2 * (
-     >                 (ue(ip1,2)*buf(ip1,2)+c2*(ue(ip1,5)-q(ip1)))-
-     >                 (ue(im1,2)*buf(im1,2)+c2*(ue(im1,5)-q(im1))))+
-     >                 xxcon1*(buf(ip1,2)-2.0d0*buf(i,2)+buf(im1,2))+
-     >                 dx2tx1*( ue(ip1,2)-2.0d0* ue(i,2)+ue(im1,2))
-
-                  forcing(3,i,j,k,c) = forcing(3,i,j,k,c) - tx2 * (
-     >                 ue(ip1,3)*buf(ip1,2)-ue(im1,3)*buf(im1,2))+
-     >                 xxcon2*(buf(ip1,3)-2.0d0*buf(i,3)+buf(im1,3))+
-     >                 dx3tx1*( ue(ip1,3)-2.0d0*ue(i,3) +ue(im1,3))
-                  
-                  forcing(4,i,j,k,c) = forcing(4,i,j,k,c) - tx2*(
-     >                 ue(ip1,4)*buf(ip1,2)-ue(im1,4)*buf(im1,2))+
-     >                 xxcon2*(buf(ip1,4)-2.0d0*buf(i,4)+buf(im1,4))+
-     >                 dx4tx1*( ue(ip1,4)-2.0d0* ue(i,4)+ ue(im1,4))
-
-                  forcing(5,i,j,k,c) = forcing(5,i,j,k,c) - tx2*(
-     >                 buf(ip1,2)*(c1*ue(ip1,5)-c2*q(ip1))-
-     >                 buf(im1,2)*(c1*ue(im1,5)-c2*q(im1)))+
-     >                 0.5d0*xxcon3*(buf(ip1,1)-2.0d0*buf(i,1)+
-     >                 buf(im1,1))+
-     >                 xxcon4*(cuf(ip1)-2.0d0*cuf(i)+cuf(im1))+
-     >                 xxcon5*(buf(ip1,5)-2.0d0*buf(i,5)+buf(im1,5))+
-     >                 dx5tx1*( ue(ip1,5)-2.0d0* ue(i,5)+ ue(im1,5))
-               enddo
-
-c---------------------------------------------------------------------
-c     Fourth-order dissipation                         
-c---------------------------------------------------------------------
-               if (start(1,c) .gt. 0) then
-                  do m = 1, 5
-                     i = 1
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (5.0d0*ue(i,m) - 4.0d0*ue(i+1,m) +ue(i+2,m))
-                     i = 2
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (-4.0d0*ue(i-1,m) + 6.0d0*ue(i,m) -
-     >                    4.0d0*ue(i+1,m) +       ue(i+2,m))
-                  enddo
-               endif
-
-               do i = start(1,c)*3, cell_size(1,c)-3*end(1,c)-1
-                  do m = 1, 5
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp*
-     >                    (ue(i-2,m) - 4.0d0*ue(i-1,m) +
-     >                    6.0d0*ue(i,m) - 4.0d0*ue(i+1,m) + ue(i+2,m))
-                  enddo
-               enddo
-
-               if (end(1,c) .gt. 0) then
-                  do m = 1, 5
-                     i = cell_size(1,c)-3
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (ue(i-2,m) - 4.0d0*ue(i-1,m) +
-     >                    6.0d0*ue(i,m) - 4.0d0*ue(i+1,m))
-                     i = cell_size(1,c)-2
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (ue(i-2,m) - 4.0d0*ue(i-1,m) + 5.0d0*ue(i,m))
-                  enddo
-               endif
-
-            enddo
-         enddo
-
-c---------------------------------------------------------------------
-c     eta-direction flux differences             
-c---------------------------------------------------------------------
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1          
-            zeta = dble(k+cell_low(3,c)) * dnzm1
-            do i=start(1,c), cell_size(1,c)-end(1,c)-1
-               xi = dble(i+cell_low(1,c)) * dnxm1
-
-               do j=-2*(1-start(2,c)), cell_size(2,c)+1-2*end(2,c)
-                  eta = dble(j+cell_low(2,c)) * dnym1
-
-                  call exact_solution(xi, eta, zeta, dtemp)
-                  do m = 1, 5 
-                     ue(j,m) = dtemp(m)
-                  enddo
-                  
-                  dtpp = 1.0d0/dtemp(1)
-
-                  do m = 2, 5
-                     buf(j,m) = dtpp * dtemp(m)
-                  enddo
-
-                  cuf(j)   = buf(j,3) * buf(j,3)
-                  buf(j,1) = cuf(j) + buf(j,2) * buf(j,2) + 
-     >                 buf(j,4) * buf(j,4)
-                  q(j) = 0.5d0*(buf(j,2)*ue(j,2) + buf(j,3)*ue(j,3) +
-     >                 buf(j,4)*ue(j,4))
-               enddo
-
-               do j = start(2,c), cell_size(2,c)-end(2,c)-1
-                  jm1 = j-1
-                  jp1 = j+1
-                  
-                  forcing(1,i,j,k,c) = forcing(1,i,j,k,c) -
-     >                 ty2*( ue(jp1,3)-ue(jm1,3) )+
-     >                 dy1ty1*(ue(jp1,1)-2.0d0*ue(j,1)+ue(jm1,1))
-
-                  forcing(2,i,j,k,c) = forcing(2,i,j,k,c) - ty2*(
-     >                 ue(jp1,2)*buf(jp1,3)-ue(jm1,2)*buf(jm1,3))+
-     >                 yycon2*(buf(jp1,2)-2.0d0*buf(j,2)+buf(jm1,2))+
-     >                 dy2ty1*( ue(jp1,2)-2.0* ue(j,2)+ ue(jm1,2))
-
-                  forcing(3,i,j,k,c) = forcing(3,i,j,k,c) - ty2*(
-     >                 (ue(jp1,3)*buf(jp1,3)+c2*(ue(jp1,5)-q(jp1)))-
-     >                 (ue(jm1,3)*buf(jm1,3)+c2*(ue(jm1,5)-q(jm1))))+
-     >                 yycon1*(buf(jp1,3)-2.0d0*buf(j,3)+buf(jm1,3))+
-     >                 dy3ty1*( ue(jp1,3)-2.0d0*ue(j,3) +ue(jm1,3))
-
-                  forcing(4,i,j,k,c) = forcing(4,i,j,k,c) - ty2*(
-     >                 ue(jp1,4)*buf(jp1,3)-ue(jm1,4)*buf(jm1,3))+
-     >                 yycon2*(buf(jp1,4)-2.0d0*buf(j,4)+buf(jm1,4))+
-     >                 dy4ty1*( ue(jp1,4)-2.0d0*ue(j,4)+ ue(jm1,4))
-
-                  forcing(5,i,j,k,c) = forcing(5,i,j,k,c) - ty2*(
-     >                 buf(jp1,3)*(c1*ue(jp1,5)-c2*q(jp1))-
-     >                 buf(jm1,3)*(c1*ue(jm1,5)-c2*q(jm1)))+
-     >                 0.5d0*yycon3*(buf(jp1,1)-2.0d0*buf(j,1)+
-     >                 buf(jm1,1))+
-     >                 yycon4*(cuf(jp1)-2.0d0*cuf(j)+cuf(jm1))+
-     >                 yycon5*(buf(jp1,5)-2.0d0*buf(j,5)+buf(jm1,5))+
-     >                 dy5ty1*(ue(jp1,5)-2.0d0*ue(j,5)+ue(jm1,5))
-               enddo
-
-c---------------------------------------------------------------------
-c     Fourth-order dissipation                      
-c---------------------------------------------------------------------
-               if (start(2,c) .gt. 0) then
-                  do m = 1, 5
-                     j = 1
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (5.0d0*ue(j,m) - 4.0d0*ue(j+1,m) +ue(j+2,m))
-                     j = 2
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (-4.0d0*ue(j-1,m) + 6.0d0*ue(j,m) -
-     >                    4.0d0*ue(j+1,m) +       ue(j+2,m))
-                  enddo
-               endif
-
-               do j = start(2,c)*3, cell_size(2,c)-3*end(2,c)-1
-                  do m = 1, 5
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp*
-     >                    (ue(j-2,m) - 4.0d0*ue(j-1,m) +
-     >                    6.0d0*ue(j,m) - 4.0d0*ue(j+1,m) + ue(j+2,m))
-                  enddo
-               enddo
-
-               if (end(2,c) .gt. 0) then
-                  do m = 1, 5
-                     j = cell_size(2,c)-3
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (ue(j-2,m) - 4.0d0*ue(j-1,m) +
-     >                    6.0d0*ue(j,m) - 4.0d0*ue(j+1,m))
-                     j = cell_size(2,c)-2
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (ue(j-2,m) - 4.0d0*ue(j-1,m) + 5.0d0*ue(j,m))
-
-                  enddo
-               endif
-
-            enddo
-         enddo
-
-c---------------------------------------------------------------------
-c     zeta-direction flux differences                      
-c---------------------------------------------------------------------
-         do j=start(2,c), cell_size(2,c)-end(2,c)-1
-            eta = dble(j+cell_low(2,c)) * dnym1
-            do i = start(1,c), cell_size(1,c)-end(1,c)-1
-               xi = dble(i+cell_low(1,c)) * dnxm1
-
-               do k=-2*(1-start(3,c)), cell_size(3,c)+1-2*end(3,c)
-                  zeta = dble(k+cell_low(3,c)) * dnzm1
-
-                  call exact_solution(xi, eta, zeta, dtemp)
-                  do m = 1, 5
-                     ue(k,m) = dtemp(m)
-                  enddo
-
-                  dtpp = 1.0d0/dtemp(1)
-
-                  do m = 2, 5
-                     buf(k,m) = dtpp * dtemp(m)
-                  enddo
-
-                  cuf(k)   = buf(k,4) * buf(k,4)
-                  buf(k,1) = cuf(k) + buf(k,2) * buf(k,2) + 
-     >                 buf(k,3) * buf(k,3)
-                  q(k) = 0.5d0*(buf(k,2)*ue(k,2) + buf(k,3)*ue(k,3) +
-     >                 buf(k,4)*ue(k,4))
-               enddo
-
-               do k=start(3,c), cell_size(3,c)-end(3,c)-1
-                  km1 = k-1
-                  kp1 = k+1
-                  
-                  forcing(1,i,j,k,c) = forcing(1,i,j,k,c) -
-     >                 tz2*( ue(kp1,4)-ue(km1,4) )+
-     >                 dz1tz1*(ue(kp1,1)-2.0d0*ue(k,1)+ue(km1,1))
-
-                  forcing(2,i,j,k,c) = forcing(2,i,j,k,c) - tz2 * (
-     >                 ue(kp1,2)*buf(kp1,4)-ue(km1,2)*buf(km1,4))+
-     >                 zzcon2*(buf(kp1,2)-2.0d0*buf(k,2)+buf(km1,2))+
-     >                 dz2tz1*( ue(kp1,2)-2.0d0* ue(k,2)+ ue(km1,2))
-
-                  forcing(3,i,j,k,c) = forcing(3,i,j,k,c) - tz2 * (
-     >                 ue(kp1,3)*buf(kp1,4)-ue(km1,3)*buf(km1,4))+
-     >                 zzcon2*(buf(kp1,3)-2.0d0*buf(k,3)+buf(km1,3))+
-     >                 dz3tz1*(ue(kp1,3)-2.0d0*ue(k,3)+ue(km1,3))
-
-                  forcing(4,i,j,k,c) = forcing(4,i,j,k,c) - tz2 * (
-     >                 (ue(kp1,4)*buf(kp1,4)+c2*(ue(kp1,5)-q(kp1)))-
-     >                 (ue(km1,4)*buf(km1,4)+c2*(ue(km1,5)-q(km1))))+
-     >                 zzcon1*(buf(kp1,4)-2.0d0*buf(k,4)+buf(km1,4))+
-     >                 dz4tz1*( ue(kp1,4)-2.0d0*ue(k,4) +ue(km1,4))
-
-                  forcing(5,i,j,k,c) = forcing(5,i,j,k,c) - tz2 * (
-     >                 buf(kp1,4)*(c1*ue(kp1,5)-c2*q(kp1))-
-     >                 buf(km1,4)*(c1*ue(km1,5)-c2*q(km1)))+
-     >                 0.5d0*zzcon3*(buf(kp1,1)-2.0d0*buf(k,1)
-     >                 +buf(km1,1))+
-     >                 zzcon4*(cuf(kp1)-2.0d0*cuf(k)+cuf(km1))+
-     >                 zzcon5*(buf(kp1,5)-2.0d0*buf(k,5)+buf(km1,5))+
-     >                 dz5tz1*( ue(kp1,5)-2.0d0*ue(k,5)+ ue(km1,5))
-               enddo
-
-c---------------------------------------------------------------------
-c     Fourth-order dissipation                        
-c---------------------------------------------------------------------
-               if (start(3,c) .gt. 0) then
-                  do m = 1, 5
-                     k = 1
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (5.0d0*ue(k,m) - 4.0d0*ue(k+1,m) +ue(k+2,m))
-                     k = 2
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (-4.0d0*ue(k-1,m) + 6.0d0*ue(k,m) -
-     >                    4.0d0*ue(k+1,m) +       ue(k+2,m))
-                  enddo
-               endif
-
-               do k = start(3,c)*3, cell_size(3,c)-3*end(3,c)-1
-                  do m = 1, 5
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp*
-     >                    (ue(k-2,m) - 4.0d0*ue(k-1,m) +
-     >                    6.0d0*ue(k,m) - 4.0d0*ue(k+1,m) + ue(k+2,m))
-                  enddo
-               enddo
-
-               if (end(3,c) .gt. 0) then
-                  do m = 1, 5
-                     k = cell_size(3,c)-3
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (ue(k-2,m) - 4.0d0*ue(k-1,m) +
-     >                    6.0d0*ue(k,m) - 4.0d0*ue(k+1,m))
-                     k = cell_size(3,c)-2
-                     forcing(m,i,j,k,c) = forcing(m,i,j,k,c) - dssp *
-     >                    (ue(k-2,m) - 4.0d0*ue(k-1,m) + 5.0d0*ue(k,m))
-                  enddo
-               endif
-
-            enddo
-         enddo
-
-c---------------------------------------------------------------------
-c     now change the sign of the forcing function, 
-c---------------------------------------------------------------------
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     forcing(m,i,j,k,c) = -1.d0 * forcing(m,i,j,k,c)
-                  enddo
-               enddo
-            enddo
-         enddo
-
-      enddo
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_solution.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_solution.f
deleted file mode 100644
index b093b46..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/exact_solution.f
+++ /dev/null
@@ -1,29 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine exact_solution(xi,eta,zeta,dtemp)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     this function returns the exact solution at point xi, eta, zeta  
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      double precision  xi, eta, zeta, dtemp(5)
-      integer m
-
-      do m = 1, 5
-         dtemp(m) =  ce(m,1) +
-     >     xi*(ce(m,2) + xi*(ce(m,5) + xi*(ce(m,8) + xi*ce(m,11)))) +
-     >     eta*(ce(m,3) + eta*(ce(m,6) + eta*(ce(m,9) + eta*ce(m,12))))+
-     >     zeta*(ce(m,4) + zeta*(ce(m,7) + zeta*(ce(m,10) + 
-     >     zeta*ce(m,13))))
-      enddo
-
-      return
-      end
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f
deleted file mode 100644
index d3085a0..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/fortran_io.f
+++ /dev/null
@@ -1,174 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine setup_btio
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      character*(128) newfilenm
-      integer m, ierr
-
-      if (node.eq.root) record_length = 40/fortran_rec_sz
-      call mpi_bcast(record_length, 1, MPI_INTEGER,
-     >                root, comm_setup, ierr)
-
-      open (unit=99, file=filenm,
-     $      form='unformatted', access='direct',
-     $      recl=record_length)
-
-      do m = 1, 5
-         xce_sub(m) = 0.d0
-      end do
-
-      idump_sub = 0
-
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine output_timestep
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer ix, jio, kio, cio
-
-      do cio=1,ncells
-          do kio=0, cell_size(3,cio)-1
-              do jio=0, cell_size(2,cio)-1
-                  iseek=(cell_low(1,cio) +
-     $                   PROBLEM_SIZE*((cell_low(2,cio)+jio) +
-     $                   PROBLEM_SIZE*((cell_low(3,cio)+kio) +
-     $                   PROBLEM_SIZE*idump_sub)))
-
-                  do ix=0,cell_size(1,cio)-1
-                      write(99, rec=iseek+ix+1)
-     $                      u(1,ix, jio,kio,cio),
-     $                      u(2,ix, jio,kio,cio),
-     $                      u(3,ix, jio,kio,cio),
-     $                      u(4,ix, jio,kio,cio),
-     $                      u(5,ix, jio,kio,cio)
-                  enddo
-              enddo
-          enddo
-      enddo
-
-      idump_sub = idump_sub + 1
-      if (rd_interval .gt. 0) then
-         if (idump_sub .ge. rd_interval) then
-
-            call acc_sub_norms(idump+1)
-
-            idump_sub = 0
-         endif
-      endif
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine acc_sub_norms(idump_cur)
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer idump_cur
-
-      integer ix, jio, kio, cio, ii, m, ichunk
-      double precision xce_single(5)
-
-      ichunk = idump_cur - idump_sub + 1
-      do ii=0, idump_sub-1
-        do cio=1,ncells
-          do kio=0, cell_size(3,cio)-1
-              do jio=0, cell_size(2,cio)-1
-                  iseek=(cell_low(1,cio) +
-     $                   PROBLEM_SIZE*((cell_low(2,cio)+jio) +
-     $                   PROBLEM_SIZE*((cell_low(3,cio)+kio) +
-     $                   PROBLEM_SIZE*ii)))
-
-
-                  do ix=0,cell_size(1,cio)-1
-                      read(99, rec=iseek+ix+1)
-     $                      u(1,ix, jio,kio,cio),
-     $                      u(2,ix, jio,kio,cio),
-     $                      u(3,ix, jio,kio,cio),
-     $                      u(4,ix, jio,kio,cio),
-     $                      u(5,ix, jio,kio,cio)
-                  enddo
-              enddo
-          enddo
-        enddo
-
-        if (node .eq. root) print *, 'Reading data set ', ii+ichunk
-
-        call error_norm(xce_single)
-        do m = 1, 5
-           xce_sub(m) = xce_sub(m) + xce_single(m)
-        end do
-      enddo
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine btio_cleanup
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      close(unit=99)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine accumulate_norms(xce_acc)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      include 'header.h'
-      include 'mpinpb.h'
-
-      double precision xce_acc(5)
-      integer m
-
-      if (rd_interval .gt. 0) goto 20
-
-      open (unit=99, file=filenm,
-     $      form='unformatted', access='direct',
-     $      recl=record_length)
-
-c     clear the last time step
-
-      call clear_timestep
-
-c     read back the time steps and accumulate norms
-
-      call acc_sub_norms(idump)
-
-      close(unit=99)
-
- 20   continue
-      do m = 1, 5
-         xce_acc(m) = xce_sub(m) / dble(idump)
-      end do
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f
deleted file mode 100644
index ecfd41c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/full_mpiio.f
+++ /dev/null
@@ -1,307 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine setup_btio
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer ierr
-      integer mstatus(MPI_STATUS_SIZE)
-      integer sizes(4), starts(4), subsizes(4)
-      integer cell_btype(maxcells), cell_ftype(maxcells)
-      integer cell_blength(maxcells)
-      integer info
-      character*20 cb_nodes, cb_size
-      integer c, m
-      integer cell_disp(maxcells)
-
-       call mpi_bcast(collbuf_nodes, 1, MPI_INTEGER,
-     >                root, comm_setup, ierr)
-
-       call mpi_bcast(collbuf_size, 1, MPI_INTEGER,
-     >                root, comm_setup, ierr)
-
-       if (collbuf_nodes .eq. 0) then
-          info = MPI_INFO_NULL
-       else
-          write (cb_nodes,*) collbuf_nodes
-          write (cb_size,*) collbuf_size
-          call MPI_Info_create(info, ierr)
-          call MPI_Info_set(info, 'cb_nodes', cb_nodes, ierr)
-          call MPI_Info_set(info, 'cb_buffer_size', cb_size, ierr)
-          call MPI_Info_set(info, 'collective_buffering', 'true', ierr)
-       endif
-
-       call MPI_Type_contiguous(5, MPI_DOUBLE_PRECISION,
-     $                          element, ierr)
-       call MPI_Type_commit(element, ierr)
-       call MPI_Type_extent(element, eltext, ierr)
-
-       do  c = 1, ncells
-c
-c Outer array dimensions ar same for every cell
-c
-           sizes(1) = IMAX+4
-           sizes(2) = JMAX+4
-           sizes(3) = KMAX+4
-c
-c 4th dimension is cell number, total of maxcells cells
-c
-           sizes(4) = maxcells
-c
-c Internal dimensions of cells can differ slightly between cells
-c
-           subsizes(1) = cell_size(1, c)
-           subsizes(2) = cell_size(2, c)
-           subsizes(3) = cell_size(3, c)
-c
-c Cell is 4th dimension, 1 cell per cell type to handle varying 
-c cell sub-array sizes
-c
-           subsizes(4) = 1
-
-c
-c type constructors use 0-based start addresses
-c
-           starts(1) = 2 
-           starts(2) = 2
-           starts(3) = 2
-           starts(4) = c-1
-
-c 
-c Create buftype for a cell
-c
-           call MPI_Type_create_subarray(4, sizes, subsizes, 
-     $          starts, MPI_ORDER_FORTRAN, element, 
-     $          cell_btype(c), ierr)
-c
-c block length and displacement for joining cells - 
-c 1 cell buftype per block, cell buftypes have own displacment
-c generated from cell number (4th array dimension)
-c
-           cell_blength(c) = 1
-           cell_disp(c) = 0
-
-       enddo
-c
-c Create combined buftype for all cells
-c
-       call MPI_Type_struct(ncells, cell_blength, cell_disp,
-     $            cell_btype, combined_btype, ierr)
-       call MPI_Type_commit(combined_btype, ierr)
-
-       do  c = 1, ncells
-c
-c Entire array size
-c
-           sizes(1) = PROBLEM_SIZE
-           sizes(2) = PROBLEM_SIZE
-           sizes(3) = PROBLEM_SIZE
-
-c
-c Size of c'th cell
-c
-           subsizes(1) = cell_size(1, c)
-           subsizes(2) = cell_size(2, c)
-           subsizes(3) = cell_size(3, c)
-
-c
-c Starting point in full array of c'th cell
-c
-           starts(1) = cell_low(1,c)
-           starts(2) = cell_low(2,c)
-           starts(3) = cell_low(3,c)
-
-           call MPI_Type_create_subarray(3, sizes, subsizes,
-     $          starts, MPI_ORDER_FORTRAN,
-     $          element, cell_ftype(c), ierr)
-           cell_blength(c) = 1
-           cell_disp(c) = 0
-       enddo
-
-       call MPI_Type_struct(ncells, cell_blength, cell_disp,
-     $            cell_ftype, combined_ftype, ierr)
-       call MPI_Type_commit(combined_ftype, ierr)
-
-       iseek=0
-       if (node .eq. root) then
-          call MPI_File_delete(filenm, MPI_INFO_NULL, ierr)
-       endif
-
-
-      call MPI_Barrier(comm_solve, ierr)
-
-       call MPI_File_open(comm_solve,
-     $          filenm,
-     $          MPI_MODE_RDWR+MPI_MODE_CREATE,
-     $          MPI_INFO_NULL, fp, ierr)
-
-       if (ierr .ne. MPI_SUCCESS) then
-                print *, 'Error opening file'
-                stop
-       endif
-
-        call MPI_File_set_view(fp, iseek, element, 
-     $          combined_ftype, 'native', info, ierr)
-
-       if (ierr .ne. MPI_SUCCESS) then
-                print *, 'Error setting file view'
-                stop
-       endif
-
-      do m = 1, 5
-         xce_sub(m) = 0.d0
-      end do
-
-      idump_sub = 0
-
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine output_timestep
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer mstatus(MPI_STATUS_SIZE)
-      integer ierr
-
-      call MPI_File_write_at_all(fp, iseek, u,
-     $                           1, combined_btype, mstatus, ierr)
-      if (ierr .ne. MPI_SUCCESS) then
-          print *, 'Error writing to file'
-          stop
-      endif
-
-      call MPI_Type_size(combined_btype, iosize, ierr)
-      iseek = iseek + iosize/eltext
-
-      idump_sub = idump_sub + 1
-      if (rd_interval .gt. 0) then
-         if (idump_sub .ge. rd_interval) then
-
-            iseek = 0
-            call acc_sub_norms(idump+1)
-
-            iseek = 0
-            idump_sub = 0
-         endif
-      endif
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine acc_sub_norms(idump_cur)
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer idump_cur
-
-      integer ii, m, ichunk
-      integer ierr
-      integer mstatus(MPI_STATUS_SIZE)
-      double precision xce_single(5)
-
-      ichunk = idump_cur - idump_sub + 1
-      do ii=0, idump_sub-1
-
-        call MPI_File_read_at_all(fp, iseek, u,
-     $                           1, combined_btype, mstatus, ierr)
-        if (ierr .ne. MPI_SUCCESS) then
-           print *, 'Error reading back file'
-           call MPI_File_close(fp, ierr)
-           stop
-        endif
-
-        call MPI_Type_size(combined_btype, iosize, ierr)
-        iseek = iseek + iosize/eltext
-
-        if (node .eq. root) print *, 'Reading data set ', ii+ichunk
-
-        call error_norm(xce_single)
-        do m = 1, 5
-           xce_sub(m) = xce_sub(m) + xce_single(m)
-        end do
-      enddo
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine btio_cleanup
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer ierr
-
-      call MPI_File_close(fp, ierr)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-
-      subroutine accumulate_norms(xce_acc)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      double precision xce_acc(5)
-      integer m, ierr
-
-      if (rd_interval .gt. 0) goto 20
-
-      call MPI_File_open(comm_solve,
-     $          filenm,
-     $          MPI_MODE_RDONLY,
-     $          MPI_INFO_NULL,
-     $          fp,
-     $          ierr)
-
-      iseek = 0
-      call MPI_File_set_view(fp, iseek, element, combined_ftype,
-     $          'native', MPI_INFO_NULL, ierr)
-
-c     clear the last time step
-
-      call clear_timestep
-
-c     read back the time steps and accumulate norms
-
-      call acc_sub_norms(idump)
-
-      call MPI_File_close(fp, ierr)
-
- 20   continue
-      do m = 1, 5
-         xce_acc(m) = xce_sub(m) / dble(idump)
-      end do
-
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/header.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/header.h
deleted file mode 100644
index cb815eb..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/header.h
+++ /dev/null
@@ -1,146 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-c
-c  header.h
-c
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
- 
-      implicit none
-
-c---------------------------------------------------------------------
-c The following include file is generated automatically by the
-c "setparams" utility. It defines 
-c      maxcells:      the square root of the maximum number of processors
-c      problem_size:  12, 64, 102, 162 (for class T, A, B, C)
-c      dt_default:    default time step for this problem size if no
-c                     config file
-c      niter_default: default number of iterations for this problem size
-c---------------------------------------------------------------------
-
-      include 'npbparams.h'
-
-      integer           aa, bb, cc, BLOCK_SIZE
-      parameter (aa=1, bb=2, cc=3, BLOCK_SIZE=5)
-
-      integer           ncells, grid_points(3)
-      double precision  elapsed_time
-      common /global/   elapsed_time, ncells, grid_points
-
-      double precision  tx1, tx2, tx3, ty1, ty2, ty3, tz1, tz2, tz3, 
-     >                  dx1, dx2, dx3, dx4, dx5, dy1, dy2, dy3, dy4, 
-     >                  dy5, dz1, dz2, dz3, dz4, dz5, dssp, dt, 
-     >                  ce(5,13), dxmax, dymax, dzmax, xxcon1, xxcon2, 
-     >                  xxcon3, xxcon4, xxcon5, dx1tx1, dx2tx1, dx3tx1,
-     >                  dx4tx1, dx5tx1, yycon1, yycon2, yycon3, yycon4,
-     >                  yycon5, dy1ty1, dy2ty1, dy3ty1, dy4ty1, dy5ty1,
-     >                  zzcon1, zzcon2, zzcon3, zzcon4, zzcon5, dz1tz1, 
-     >                  dz2tz1, dz3tz1, dz4tz1, dz5tz1, dnxm1, dnym1, 
-     >                  dnzm1, c1c2, c1c5, c3c4, c1345, conz1, c1, c2, 
-     >                  c3, c4, c5, c4dssp, c5dssp, dtdssp, dttx1, bt,
-     >                  dttx2, dtty1, dtty2, dttz1, dttz2, c2dttx1, 
-     >                  c2dtty1, c2dttz1, comz1, comz4, comz5, comz6, 
-     >                  c3c4tx3, c3c4ty3, c3c4tz3, c2iv, con43, con16
-
-      common /constants/ tx1, tx2, tx3, ty1, ty2, ty3, tz1, tz2, tz3,
-     >                  dx1, dx2, dx3, dx4, dx5, dy1, dy2, dy3, dy4, 
-     >                  dy5, dz1, dz2, dz3, dz4, dz5, dssp, dt, 
-     >                  ce, dxmax, dymax, dzmax, xxcon1, xxcon2, 
-     >                  xxcon3, xxcon4, xxcon5, dx1tx1, dx2tx1, dx3tx1,
-     >                  dx4tx1, dx5tx1, yycon1, yycon2, yycon3, yycon4,
-     >                  yycon5, dy1ty1, dy2ty1, dy3ty1, dy4ty1, dy5ty1,
-     >                  zzcon1, zzcon2, zzcon3, zzcon4, zzcon5, dz1tz1, 
-     >                  dz2tz1, dz3tz1, dz4tz1, dz5tz1, dnxm1, dnym1, 
-     >                  dnzm1, c1c2, c1c5, c3c4, c1345, conz1, c1, c2, 
-     >                  c3, c4, c5, c4dssp, c5dssp, dtdssp, dttx1, bt,
-     >                  dttx2, dtty1, dtty2, dttz1, dttz2, c2dttx1, 
-     >                  c2dtty1, c2dttz1, comz1, comz4, comz5, comz6, 
-     >                  c3c4tx3, c3c4ty3, c3c4tz3, c2iv, con43, con16
-
-      integer           EAST, WEST, NORTH, SOUTH, 
-     >                  BOTTOM, TOP
-
-      parameter (EAST=2000, WEST=3000,      NORTH=4000, SOUTH=5000,
-     >           BOTTOM=6000, TOP=7000)
-
-      integer cell_coord (3,maxcells), cell_low (3,maxcells), 
-     >        cell_high  (3,maxcells), cell_size(3,maxcells),
-     >        predecessor(3),          slice    (3,maxcells),
-     >        grid_size  (3),          successor(3)         ,
-     >        start      (3,maxcells), end      (3,maxcells)
-      common /partition/ cell_coord, cell_low, cell_high, cell_size,
-     >                   grid_size, successor, predecessor, slice,
-     >                   start, end
-
-      integer IMAX, JMAX, KMAX, MAX_CELL_DIM, BUF_SIZE
-
-      parameter (MAX_CELL_DIM = (problem_size/maxcells)+1)
-
-      parameter (IMAX=MAX_CELL_DIM,JMAX=MAX_CELL_DIM,KMAX=MAX_CELL_DIM)
-
-      parameter (BUF_SIZE=MAX_CELL_DIM*MAX_CELL_DIM*(maxcells-1)*60+1)
-
-      double precision 
-     >   us      (    -1:IMAX,  -1:JMAX,  -1:KMAX,   maxcells),
-     >   vs      (    -1:IMAX,  -1:JMAX,  -1:KMAX,   maxcells),
-     >   ws      (    -1:IMAX,  -1:JMAX,  -1:KMAX,   maxcells),
-     >   qs      (    -1:IMAX,  -1:JMAX,  -1:KMAX,   maxcells),
-     >   rho_i   (    -1:IMAX,  -1:JMAX,  -1:KMAX,   maxcells),
-     >   square  (    -1:IMAX,  -1:JMAX,  -1:KMAX,   maxcells),
-     >   forcing (5,   0:IMAX-1, 0:JMAX-1, 0:KMAX-1, maxcells),
-     >   u       (5,  -2:IMAX+1,-2:JMAX+1,-2:KMAX+1, maxcells),
-     >   rhs     (5,  -1:IMAX-1,-1:JMAX-1,-1:KMAX-1, maxcells),
-     >   lhsc    (5,5,-1:IMAX-1,-1:JMAX-1,-1:KMAX-1, maxcells),
-     >   backsub_info (5, 0:MAX_CELL_DIM, 0:MAX_CELL_DIM, maxcells),
-     >   in_buffer(BUF_SIZE), out_buffer(BUF_SIZE)
-      common /fields/  u, us, vs, ws, qs, rho_i, square, 
-     >                 rhs, forcing, lhsc, in_buffer, out_buffer,
-     >                 backsub_info
-
-      double precision cv(-2:MAX_CELL_DIM+1),   rhon(-2:MAX_CELL_DIM+1),
-     >                 rhos(-2:MAX_CELL_DIM+1), rhoq(-2:MAX_CELL_DIM+1),
-     >                 cuf(-2:MAX_CELL_DIM+1),  q(-2:MAX_CELL_DIM+1),
-     >                 ue(-2:MAX_CELL_DIM+1,5), buf(-2:MAX_CELL_DIM+1,5)
-      common /work_1d/ cv, rhon, rhos, rhoq, cuf, q, ue, buf
-
-      integer  west_size, east_size, bottom_size, top_size,
-     >         north_size, south_size, start_send_west, 
-     >         start_send_east, start_send_south, start_send_north,
-     >         start_send_bottom, start_send_top, start_recv_west,
-     >         start_recv_east, start_recv_south, start_recv_north,
-     >         start_recv_bottom, start_recv_top
-      common /box/ west_size, east_size, bottom_size,
-     >             top_size, north_size, south_size, 
-     >             start_send_west, start_send_east, start_send_south,
-     >             start_send_north, start_send_bottom, start_send_top,
-     >             start_recv_west, start_recv_east, start_recv_south,
-     >             start_recv_north, start_recv_bottom, start_recv_top
-
-      double precision  tmp_block(5,5), b_inverse(5,5), tmp_vec(5)
-      common /work_solve/ tmp_block, b_inverse, tmp_vec
-
-c
-c     These are used by btio
-c
-      integer collbuf_nodes, collbuf_size, iosize, eltext,
-     $        combined_btype, fp, idump, record_length, element,
-     $        combined_ftype, idump_sub, rd_interval
-      common /btio/ collbuf_nodes, collbuf_size, iosize, eltext,
-     $              combined_btype, fp, idump, record_length,
-     $              idump_sub, rd_interval
-      double precision sum(niter_default), xce_sub(5)
-      common /btio/ sum, xce_sub
-      integer*8 iseek
-      common /btio/ iseek, element, combined_ftype
-
-
-      integer t_total, t_io, t_rhs, t_xsolve, t_ysolve, t_zsolve, 
-     >        t_bpack, t_exch, t_xcomm, t_ycomm, t_zcomm, t_last
-      parameter (t_total=1, t_io=2, t_rhs=3, t_xsolve=4, t_ysolve=5, 
-     >        t_zsolve=6, t_bpack=7, t_exch=8, t_xcomm=9, 
-     >        t_ycomm=10, t_zcomm=11, t_last=11)
-      logical timeron
-      common /tflags/ timeron
-
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f
deleted file mode 100644
index f18f662..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/initialize.f
+++ /dev/null
@@ -1,283 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine  initialize
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     This subroutine initializes the field variable u using 
-c     tri-linear transfinite interpolation of the boundary values     
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      
-      integer c, i, j, k, m, ii, jj, kk, ix, iy, iz
-      double precision  xi, eta, zeta, Pface(5,3,2), Pxi, Peta, 
-     >     Pzeta, temp(5)
-
-c---------------------------------------------------------------------
-c  Later (in compute_rhs) we compute 1/u for every element. A few of 
-c  the corner elements are not used, but it convenient (and faster) 
-c  to compute the whole thing with a simple loop. Make sure those 
-c  values are nonzero by initializing the whole thing here. 
-c---------------------------------------------------------------------
-      do c = 1, ncells
-         do kk = -1, KMAX
-            do jj = -1, JMAX
-               do ii = -1, IMAX
-                  do m = 1, 5
-                     u(m, ii, jj, kk, c) = 1.0
-                  end do
-               end do
-            end do
-         end do
-      end do
-c---------------------------------------------------------------------
-
-
-
-c---------------------------------------------------------------------
-c     first store the "interpolated" values everywhere on the grid    
-c---------------------------------------------------------------------
-      do c=1, ncells
-         kk = 0
-         do k = cell_low(3,c), cell_high(3,c)
-            zeta = dble(k) * dnzm1
-            jj = 0
-            do j = cell_low(2,c), cell_high(2,c)
-               eta = dble(j) * dnym1
-               ii = 0
-               do i = cell_low(1,c), cell_high(1,c)
-                  xi = dble(i) * dnxm1
-                  
-                  do ix = 1, 2
-                     call exact_solution(dble(ix-1), eta, zeta, 
-     >                    Pface(1,1,ix))
-                  enddo
-
-                  do iy = 1, 2
-                     call exact_solution(xi, dble(iy-1) , zeta, 
-     >                    Pface(1,2,iy))
-                  enddo
-
-                  do iz = 1, 2
-                     call exact_solution(xi, eta, dble(iz-1),   
-     >                    Pface(1,3,iz))
-                  enddo
-
-                  do m = 1, 5
-                     Pxi   = xi   * Pface(m,1,2) + 
-     >                    (1.0d0-xi)   * Pface(m,1,1)
-                     Peta  = eta  * Pface(m,2,2) + 
-     >                    (1.0d0-eta)  * Pface(m,2,1)
-                     Pzeta = zeta * Pface(m,3,2) + 
-     >                    (1.0d0-zeta) * Pface(m,3,1)
-                     
-                     u(m,ii,jj,kk,c) = Pxi + Peta + Pzeta - 
-     >                    Pxi*Peta - Pxi*Pzeta - Peta*Pzeta + 
-     >                    Pxi*Peta*Pzeta
-
-                  enddo
-                  ii = ii + 1
-               enddo
-               jj = jj + 1
-            enddo
-            kk = kk+1
-         enddo
-      enddo
-
-c---------------------------------------------------------------------
-c     now store the exact values on the boundaries        
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     west face                                                  
-c---------------------------------------------------------------------
-      c = slice(1,1)
-      ii = 0
-      xi = 0.0d0
-      kk = 0
-      do k = cell_low(3,c), cell_high(3,c)
-         zeta = dble(k) * dnzm1
-         jj = 0
-         do j = cell_low(2,c), cell_high(2,c)
-            eta = dble(j) * dnym1
-            call exact_solution(xi, eta, zeta, temp)
-            do m = 1, 5
-               u(m,ii,jj,kk,c) = temp(m)
-            enddo
-            jj = jj + 1
-         enddo
-         kk = kk + 1
-      enddo
-
-c---------------------------------------------------------------------
-c     east face                                                      
-c---------------------------------------------------------------------
-      c  = slice(1,ncells)
-      ii = cell_size(1,c)-1
-      xi = 1.0d0
-      kk = 0
-      do k = cell_low(3,c), cell_high(3,c)
-         zeta = dble(k) * dnzm1
-         jj = 0
-         do j = cell_low(2,c), cell_high(2,c)
-            eta = dble(j) * dnym1
-            call exact_solution(xi, eta, zeta, temp)
-            do m = 1, 5
-               u(m,ii,jj,kk,c) = temp(m)
-            enddo
-            jj = jj + 1
-         enddo
-         kk = kk + 1
-      enddo
-
-c---------------------------------------------------------------------
-c     south face                                                 
-c---------------------------------------------------------------------
-      c = slice(2,1)
-      jj = 0
-      eta = 0.0d0
-      kk = 0
-      do k = cell_low(3,c), cell_high(3,c)
-         zeta = dble(k) * dnzm1
-         ii = 0
-         do i = cell_low(1,c), cell_high(1,c)
-            xi = dble(i) * dnxm1
-            call exact_solution(xi, eta, zeta, temp)
-            do m = 1, 5
-               u(m,ii,jj,kk,c) = temp(m)
-            enddo
-            ii = ii + 1
-         enddo
-         kk = kk + 1
-      enddo
-
-
-c---------------------------------------------------------------------
-c     north face                                    
-c---------------------------------------------------------------------
-      c = slice(2,ncells)
-      jj = cell_size(2,c)-1
-      eta = 1.0d0
-      kk = 0
-      do k = cell_low(3,c), cell_high(3,c)
-         zeta = dble(k) * dnzm1
-         ii = 0
-         do i = cell_low(1,c), cell_high(1,c)
-            xi = dble(i) * dnxm1
-            call exact_solution(xi, eta, zeta, temp)
-            do m = 1, 5
-               u(m,ii,jj,kk,c) = temp(m)
-            enddo
-            ii = ii + 1
-         enddo
-         kk = kk + 1
-      enddo
-
-c---------------------------------------------------------------------
-c     bottom face                                       
-c---------------------------------------------------------------------
-      c = slice(3,1)
-      kk = 0
-      zeta = 0.0d0
-      jj = 0
-      do j = cell_low(2,c), cell_high(2,c)
-         eta = dble(j) * dnym1
-         ii = 0
-         do i =cell_low(1,c), cell_high(1,c)
-            xi = dble(i) *dnxm1
-            call exact_solution(xi, eta, zeta, temp)
-            do m = 1, 5
-               u(m,ii,jj,kk,c) = temp(m)
-            enddo
-            ii = ii + 1
-         enddo
-         jj = jj + 1
-      enddo
-
-c---------------------------------------------------------------------
-c     top face     
-c---------------------------------------------------------------------
-      c = slice(3,ncells)
-      kk = cell_size(3,c)-1
-      zeta = 1.0d0
-      jj = 0
-      do j = cell_low(2,c), cell_high(2,c)
-         eta = dble(j) * dnym1
-         ii = 0
-         do i =cell_low(1,c), cell_high(1,c)
-            xi = dble(i) * dnxm1
-            call exact_solution(xi, eta, zeta, temp)
-            do m = 1, 5
-               u(m,ii,jj,kk,c) = temp(m)
-            enddo
-            ii = ii + 1
-         enddo
-         jj = jj + 1
-      enddo
-
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine lhsinit
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      
-      integer i, j, k, d, c, m, n
-
-c---------------------------------------------------------------------
-c     loop over all cells                                       
-c---------------------------------------------------------------------
-      do c = 1, ncells
-
-c---------------------------------------------------------------------
-c     first, initialize the start and end arrays
-c---------------------------------------------------------------------
-         do d = 1, 3
-            if (cell_coord(d,c) .eq. 1) then
-               start(d,c) = 1
-            else 
-               start(d,c) = 0
-            endif
-            if (cell_coord(d,c) .eq. ncells) then
-               end(d,c) = 1
-            else
-               end(d,c) = 0
-            endif
-         enddo
-
-c---------------------------------------------------------------------
-c     zero the whole left hand side for starters
-c---------------------------------------------------------------------
-         do k = 0, cell_size(3,c)-1
-            do j = 0, cell_size(2,c)-1
-               do i = 0, cell_size(1,c)-1
-                  do m = 1,5
-                     do n = 1, 5
-                        lhsc(m,n,i,j,k,c) = 0.0d0
-                     enddo
-                  enddo
-               enddo
-            enddo
-         enddo
-
-      enddo
-
-      return
-      end
-
-
-
-
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f
deleted file mode 100644
index ffab37c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/make_set.f
+++ /dev/null
@@ -1,125 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine make_set
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     This function allocates space for a set of cells and fills the set     
-c     such that communication between cells on different nodes is only
-c     nearest neighbor                                                   
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-
-      integer p, i, j, c, dir, size, excess, ierr,ierrcode
-
-c---------------------------------------------------------------------
-c     compute square root; add small number to allow for roundoff
-c     (note: this is computed in setup_mpi.f also, but prefer to do
-c     it twice because of some include file problems).
-c---------------------------------------------------------------------
-      ncells = dint(dsqrt(dble(no_nodes) + 0.00001d0))
-
-c---------------------------------------------------------------------
-c     this makes coding easier
-c---------------------------------------------------------------------
-      p = ncells
-      
-c---------------------------------------------------------------------
-c     determine the location of the cell at the bottom of the 3D 
-c     array of cells
-c---------------------------------------------------------------------
-      cell_coord(1,1) = mod(node,p) 
-      cell_coord(2,1) = node/p 
-      cell_coord(3,1) = 0
-
-c---------------------------------------------------------------------
-c     set the cell_coords for cells in the rest of the z-layers; 
-c     this comes down to a simple linear numbering in the z-direct-
-c     ion, and to the doubly-cyclic numbering in the other dirs     
-c---------------------------------------------------------------------
-      do c=2, p
-         cell_coord(1,c) = mod(cell_coord(1,c-1)+1,p) 
-         cell_coord(2,c) = mod(cell_coord(2,c-1)-1+p,p) 
-         cell_coord(3,c) = c-1
-      end do
-
-c---------------------------------------------------------------------
-c     offset all the coordinates by 1 to adjust for Fortran arrays
-c---------------------------------------------------------------------
-      do dir = 1, 3
-         do c = 1, p
-            cell_coord(dir,c) = cell_coord(dir,c) + 1
-         end do
-      end do
-      
-c---------------------------------------------------------------------
-c     slice(dir,n) contains the sequence number of the cell that is in
-c     coordinate plane n in the dir direction
-c---------------------------------------------------------------------
-      do dir = 1, 3
-         do c = 1, p
-            slice(dir,cell_coord(dir,c)) = c
-         end do
-      end do
-
-
-c---------------------------------------------------------------------
-c     fill the predecessor and successor entries, using the indices 
-c     of the bottom cells (they are the same at each level of k 
-c     anyway) acting as if full periodicity pertains; note that p is
-c     added to those arguments to the mod functions that might
-c     otherwise return wrong values when using the modulo function
-c---------------------------------------------------------------------
-      i = cell_coord(1,1)-1
-      j = cell_coord(2,1)-1
-
-      predecessor(1) = mod(i-1+p,p) + p*j
-      predecessor(2) = i + p*mod(j-1+p,p)
-      predecessor(3) = mod(i+1,p) + p*mod(j-1+p,p)
-      successor(1)   = mod(i+1,p) + p*j
-      successor(2)   = i + p*mod(j+1,p)
-      successor(3)   = mod(i-1+p,p) + p*mod(j+1,p)
-
-c---------------------------------------------------------------------
-c     now compute the sizes of the cells                                    
-c---------------------------------------------------------------------
-      do dir= 1, 3
-c---------------------------------------------------------------------
-c     set cell_coord range for each direction                            
-c---------------------------------------------------------------------
-         size   = grid_points(dir)/p
-         excess = mod(grid_points(dir),p)
-         do c=1, ncells
-            if (cell_coord(dir,c) .le. excess) then
-               cell_size(dir,c) = size+1
-               cell_low(dir,c) = (cell_coord(dir,c)-1)*(size+1)
-               cell_high(dir,c) = cell_low(dir,c)+size
-            else 
-               cell_size(dir,c) = size
-               cell_low(dir,c)  = excess*(size+1)+
-     >              (cell_coord(dir,c)-excess-1)*size
-               cell_high(dir,c) = cell_low(dir,c)+size-1
-            endif
-            if (cell_size(dir, c) .le. 2) then
-               write(*,50)
- 50            format(' Error: Cell size too small. Min size is 3')
-               ierrcode = 1
-               call MPI_Abort(mpi_comm_world,ierrcode,ierr)
-               stop
-            endif
-         end do
-      end do
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h
deleted file mode 100644
index f621f08..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/mpinpb.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'mpif.h'
-
-      integer           node, no_nodes, total_nodes, root, comm_setup, 
-     >                  comm_solve, comm_rhs, dp_type
-      logical           active
-      common /mpistuff/ node, no_nodes, total_nodes, root, comm_setup, 
-     >                  comm_solve, comm_rhs, dp_type, active
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f
deleted file mode 100644
index e4a43a8..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/rhs.f
+++ /dev/null
@@ -1,542 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine compute_rhs
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer c, i, j, k, m
-      double precision rho_inv, uijk, up1, um1, vijk, vp1, vm1,
-     >     wijk, wp1, wm1
-
-
-      if (timeron) call timer_start(t_rhs)
-c---------------------------------------------------------------------
-c     loop over all cells owned by this node                           
-c---------------------------------------------------------------------
-
-      do c = 1, ncells
-
-c---------------------------------------------------------------------
-c     compute the reciprocal of density, and the kinetic energy, 
-c     and the speed of sound.
-c---------------------------------------------------------------------
-!1$omp parallel do private(k,j,i,rho_inv) collapse(2)
-
-!DVM$ region out (rho_i,us,vs,ws,square,qs)
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,j,i,rho_inv),
-!DVM$& TIE(u(*,i,j,k,*),vs(i,j,k,*),ws(i,j,k,*),
-!DVM$& qs(i,j,k,*),square(i,j,k,*),rho_i(i,j,k,*),us(i,j,k,*))
-         do k = -1, cell_size(3,c)
-            do j = -1, cell_size(2,c)
-               do i = -1, cell_size(1,c)
-                  rho_inv = 1.0d0/u(1,i,j,k,c)
-                  rho_i(i,j,k,c) = rho_inv
-                  us(i,j,k,c) = u(2,i,j,k,c) * rho_inv
-                  vs(i,j,k,c) = u(3,i,j,k,c) * rho_inv
-                  ws(i,j,k,c) = u(4,i,j,k,c) * rho_inv
-                  square(i,j,k,c)     = 0.5d0* (
-     >                 u(2,i,j,k,c)*u(2,i,j,k,c) + 
-     >                 u(3,i,j,k,c)*u(3,i,j,k,c) +
-     >                 u(4,i,j,k,c)*u(4,i,j,k,c) ) * rho_inv
-                  qs(i,j,k,c) = square(i,j,k,c) * rho_inv
-               enddo
-            enddo
-         enddo
-!DVM$ end region
-c---------------------------------------------------------------------
-c copy the exact forcing term to the right hand side;  because 
-c this forcing term is known, we can store it on the whole of every 
-c cell,  including the boundary                   
-c---------------------------------------------------------------------
-!1$omp parallel do private(k,j,i) collapse(2)
-
-!DVM$ region out (rhs)
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,j,i,m),
-!DVM$& TIE(rhs(*,i,j,k,*),forcing(*,i,j,k,*))
-         do k = 0, cell_size(3,c)-1
-            do j = 0, cell_size(2,c)-1
-               do i = 0, cell_size(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = forcing(m,i,j,k,c)
-                  enddo
-               enddo
-            enddo
-         enddo
-!DVM$ end region
-
-c---------------------------------------------------------------------
-c     compute xi-direction fluxes 
-c---------------------------------------------------------------------
-!1$omp parallel do private(k,j,i,uijk,up1,um1) collapse(2)
-
-!DVM$ region
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,j,i,uijk,up1,um1),
-!DVM$& TIE(rhs(*,i,j,k,*),u(*,i,j,k,*),vs(i,j,k,*),ws(i,j,k,*),
-!DVM$& qs(i,j,k,*),square(i,j,k,*),rho_i(i,j,k,*),us(i,j,k,*))
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  uijk = us(i,j,k,c)
-                  up1  = us(i+1,j,k,c)
-                  um1  = us(i-1,j,k,c)
-
-                  rhs(1,i,j,k,c) = rhs(1,i,j,k,c) + dx1tx1 * 
-     >                 (u(1,i+1,j,k,c) - 2.0d0*u(1,i,j,k,c) + 
-     >                 u(1,i-1,j,k,c)) -
-     >                 tx2 * (u(2,i+1,j,k,c) - u(2,i-1,j,k,c))
-
-                  rhs(2,i,j,k,c) = rhs(2,i,j,k,c) + dx2tx1 * 
-     >                 (u(2,i+1,j,k,c) - 2.0d0*u(2,i,j,k,c) + 
-     >                 u(2,i-1,j,k,c)) +
-     >                 xxcon2*con43 * (up1 - 2.0d0*uijk + um1) -
-     >                 tx2 * (u(2,i+1,j,k,c)*up1 - 
-     >                 u(2,i-1,j,k,c)*um1 +
-     >                 (u(5,i+1,j,k,c)- square(i+1,j,k,c)-
-     >                 u(5,i-1,j,k,c)+ square(i-1,j,k,c))*
-     >                 c2)
-
-                  rhs(3,i,j,k,c) = rhs(3,i,j,k,c) + dx3tx1 * 
-     >                 (u(3,i+1,j,k,c) - 2.0d0*u(3,i,j,k,c) +
-     >                 u(3,i-1,j,k,c)) +
-     >                 xxcon2 * (vs(i+1,j,k,c) - 2.0d0*vs(i,j,k,c) +
-     >                 vs(i-1,j,k,c)) -
-     >                 tx2 * (u(3,i+1,j,k,c)*up1 - 
-     >                 u(3,i-1,j,k,c)*um1)
-
-                  rhs(4,i,j,k,c) = rhs(4,i,j,k,c) + dx4tx1 * 
-     >                 (u(4,i+1,j,k,c) - 2.0d0*u(4,i,j,k,c) +
-     >                 u(4,i-1,j,k,c)) +
-     >                 xxcon2 * (ws(i+1,j,k,c) - 2.0d0*ws(i,j,k,c) +
-     >                 ws(i-1,j,k,c)) -
-     >                 tx2 * (u(4,i+1,j,k,c)*up1 - 
-     >                 u(4,i-1,j,k,c)*um1)
-
-                  rhs(5,i,j,k,c) = rhs(5,i,j,k,c) + dx5tx1 * 
-     >                 (u(5,i+1,j,k,c) - 2.0d0*u(5,i,j,k,c) +
-     >                 u(5,i-1,j,k,c)) +
-     >                 xxcon3 * (qs(i+1,j,k,c) - 2.0d0*qs(i,j,k,c) +
-     >                 qs(i-1,j,k,c)) +
-     >                 xxcon4 * (up1*up1 -       2.0d0*uijk*uijk + 
-     >                 um1*um1) +
-     >                 xxcon5 * (u(5,i+1,j,k,c)*rho_i(i+1,j,k,c) - 
-     >                 2.0d0*u(5,i,j,k,c)*rho_i(i,j,k,c) +
-     >                 u(5,i-1,j,k,c)*rho_i(i-1,j,k,c)) -
-     >                 tx2 * ( (c1*u(5,i+1,j,k,c) - 
-     >                 c2*square(i+1,j,k,c))*up1 -
-     >                 (c1*u(5,i-1,j,k,c) - 
-     >                 c2*square(i-1,j,k,c))*um1 )
-               enddo
-            enddo
-         enddo
-!DVM$ end region
-c---------------------------------------------------------------------
-c     add fourth order xi-direction dissipation               
-c---------------------------------------------------------------------
-         if (start(1,c) .gt. 0) then
-		    i = 1
-!DVM$ region			
-!1$omp parallel do private(k,j,m) collapse(2)
-!DVM$ PARALLEL(k,j), PRIVATE(k,j,m)
-            do k = start(3,c), cell_size(3,c)-end(3,c)-1
-               do j = start(2,c), cell_size(2,c)-end(2,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c)- dssp * 
-     >                    ( 5.0d0*u(m,i,j,k,c) - 4.0d0*u(m,i+1,j,k,c) +
-     >                    u(m,i+2,j,k,c))
-                  enddo
-               enddo
-            enddo
-!DVM$ end region			
-            i = 2
-!DVM$ region			
-!1$omp parallel do private(k,j,m) collapse(2)			
-!DVM$ PARALLEL(k,j), PRIVATE(k,j,m)
-			do k = start(3,c), cell_size(3,c)-end(3,c)-1
-               do j = start(2,c), cell_size(2,c)-end(2,c)-1				  
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp * 
-     >                    (-4.0d0*u(m,i-1,j,k,c) + 6.0d0*u(m,i,j,k,c) -
-     >                    4.0d0*u(m,i+1,j,k,c) + u(m,i+2,j,k,c))
-                  enddo
-               enddo
-            enddo
-!DVM$ end region			
-         endif
-
-!1$omp parallel do private(k,j,i,m) collapse(2)			
-
-!DVM$ region
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,j,i,m),
-!DVM$& TIE(rhs(*,i,j,k,*),u(*,i,j,k,*))
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = 3*start(1,c),cell_size(1,c)-3*end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp * 
-     >                    (  u(m,i-2,j,k,c) - 4.0d0*u(m,i-1,j,k,c) + 
-     >                    6.0*u(m,i,j,k,c) - 4.0d0*u(m,i+1,j,k,c) + 
-     >                    u(m,i+2,j,k,c) )
-                  enddo
-               enddo
-            enddo
-         enddo
-!DVM$ end region         
-
-         if (end(1,c) .gt. 0) then
-            i = cell_size(1,c)-3	
-!1$omp parallel do private(k,j,m) collapse(2)	
-
-!DVM$ region			
-!DVM$ PARALLEL(k,j), PRIVATE(k,j,m)					
-            do k = start(3,c), cell_size(3,c)-end(3,c)-1
-               do j = start(2,c), cell_size(2,c)-end(2,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp *
-     >                    ( u(m,i-2,j,k,c) - 4.0d0*u(m,i-1,j,k,c) + 
-     >                    6.0d0*u(m,i,j,k,c) - 4.0d0*u(m,i+1,j,k,c) )
-                  enddo
-               enddo
-            enddo
-!DVM$ end region			
-            i = cell_size(1,c)-2
-
-!1$omp parallel do private(k,j,m) collapse(2)						
-
-!DVM$ region			
-!DVM$ PARALLEL(k,j), PRIVATE(k,j,m)
-            do k = start(3,c), cell_size(3,c)-end(3,c)-1
-               do j = start(2,c), cell_size(2,c)-end(2,c)-1				  
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp *
-     >                    ( u(m,i-2,j,k,c) - 4.d0*u(m,i-1,j,k,c) +
-     >                    5.d0*u(m,i,j,k,c) )
-                  enddo
-               enddo
-            enddo
-!DVM$ end region			
-         endif
-
-c---------------------------------------------------------------------
-c     compute eta-direction fluxes 
-c---------------------------------------------------------------------
-!1$omp parallel do private(k,j,i,vijk,vp1,vm1) collapse(2)
-
-!DVM$ region
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,j,i,vijk,vp1,vm1),
-!DVM$& TIE(rhs(*,i,j,k,*),u(*,i,j,k,*),vs(i,j,k,*),ws(i,j,k,*),
-!DVM$& qs(i,j,k,*),square(i,j,k,*),rho_i(i,j,k,*),us(i,j,k,*))
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  vijk = vs(i,j,k,c)
-                  vp1  = vs(i,j+1,k,c)
-                  vm1  = vs(i,j-1,k,c)
-                  rhs(1,i,j,k,c) = rhs(1,i,j,k,c) + dy1ty1 * 
-     >                 (u(1,i,j+1,k,c) - 2.0d0*u(1,i,j,k,c) + 
-     >                 u(1,i,j-1,k,c)) -
-     >                 ty2 * (u(3,i,j+1,k,c) - u(3,i,j-1,k,c))
-                  rhs(2,i,j,k,c) = rhs(2,i,j,k,c) + dy2ty1 * 
-     >                 (u(2,i,j+1,k,c) - 2.0d0*u(2,i,j,k,c) + 
-     >                 u(2,i,j-1,k,c)) +
-     >                 yycon2 * (us(i,j+1,k,c) - 2.0d0*us(i,j,k,c) + 
-     >                 us(i,j-1,k,c)) -
-     >                 ty2 * (u(2,i,j+1,k,c)*vp1 - 
-     >                 u(2,i,j-1,k,c)*vm1)
-                  rhs(3,i,j,k,c) = rhs(3,i,j,k,c) + dy3ty1 * 
-     >                 (u(3,i,j+1,k,c) - 2.0d0*u(3,i,j,k,c) + 
-     >                 u(3,i,j-1,k,c)) +
-     >                 yycon2*con43 * (vp1 - 2.0d0*vijk + vm1) -
-     >                 ty2 * (u(3,i,j+1,k,c)*vp1 - 
-     >                 u(3,i,j-1,k,c)*vm1 +
-     >                 (u(5,i,j+1,k,c) - square(i,j+1,k,c) - 
-     >                 u(5,i,j-1,k,c) + square(i,j-1,k,c))
-     >                 *c2)
-                  rhs(4,i,j,k,c) = rhs(4,i,j,k,c) + dy4ty1 * 
-     >                 (u(4,i,j+1,k,c) - 2.0d0*u(4,i,j,k,c) + 
-     >                 u(4,i,j-1,k,c)) +
-     >                 yycon2 * (ws(i,j+1,k,c) - 2.0d0*ws(i,j,k,c) + 
-     >                 ws(i,j-1,k,c)) -
-     >                 ty2 * (u(4,i,j+1,k,c)*vp1 - 
-     >                 u(4,i,j-1,k,c)*vm1)
-                  rhs(5,i,j,k,c) = rhs(5,i,j,k,c) + dy5ty1 * 
-     >                 (u(5,i,j+1,k,c) - 2.0d0*u(5,i,j,k,c) + 
-     >                 u(5,i,j-1,k,c)) +
-     >                 yycon3 * (qs(i,j+1,k,c) - 2.0d0*qs(i,j,k,c) + 
-     >                 qs(i,j-1,k,c)) +
-     >                 yycon4 * (vp1*vp1       - 2.0d0*vijk*vijk + 
-     >                 vm1*vm1) +
-     >                 yycon5 * (u(5,i,j+1,k,c)*rho_i(i,j+1,k,c) - 
-     >                 2.0d0*u(5,i,j,k,c)*rho_i(i,j,k,c) +
-     >                 u(5,i,j-1,k,c)*rho_i(i,j-1,k,c)) -
-     >                 ty2 * ((c1*u(5,i,j+1,k,c) - 
-     >                 c2*square(i,j+1,k,c)) * vp1 -
-     >                 (c1*u(5,i,j-1,k,c) - 
-     >                 c2*square(i,j-1,k,c)) * vm1)
-               enddo
-            enddo
-         enddo
-!DVM$ end region
-c---------------------------------------------------------------------
-c     add fourth order eta-direction dissipation         
-c---------------------------------------------------------------------
-         if (start(2,c) .gt. 0) then
-            j = 1		 
-!1$omp parallel do private(k,i,m) collapse(2)			
-
-!DVM$ region			
-!DVM$ PARALLEL(k,i), PRIVATE(k,i,m)				
-            do k = start(3,c), cell_size(3,c)-end(3,c)-1               
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c)- dssp * 
-     >                    ( 5.0d0*u(m,i,j,k,c) - 4.0d0*u(m,i,j+1,k,c) +
-     >                    u(m,i,j+2,k,c))
-                  enddo
-               enddo
-            enddo
-!DVM$ end region			
-			j = 2
-!1$omp parallel do private(k,i,m) collapse(2)				
-
-!DVM$ region			
-!DVM$ PARALLEL(k,i), PRIVATE(k,i,m)				
-			do k = start(3,c), cell_size(3,c)-end(3,c)-1                           
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp * 
-     >                    (-4.0d0*u(m,i,j-1,k,c) + 6.0d0*u(m,i,j,k,c) -
-     >                    4.0d0*u(m,i,j+1,k,c) + u(m,i,j+2,k,c))
-                  enddo
-               enddo
-            enddo
-!DVM$ end region			
-         endif
-
-!1$omp parallel do private(k,j,i,m) collapse(2)	
-
-!DVM$ region
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,i,j,m),
-!DVM$& TIE(rhs(*,i,j,k,*),u(*,i,j,k,*))
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1
-            do j = 3*start(2,c), cell_size(2,c)-3*end(2,c)-1
-               do i = start(1,c),cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp * 
-     >                    (  u(m,i,j-2,k,c) - 4.0d0*u(m,i,j-1,k,c) + 
-     >                    6.0*u(m,i,j,k,c) - 4.0d0*u(m,i,j+1,k,c) + 
-     >                    u(m,i,j+2,k,c) )
-                  enddo
-               enddo
-            enddo
-         enddo
-!DVM$ end region         
-         if (end(2,c) .gt. 0) then
-		 
-            j = cell_size(2,c)-3		 
-!1$omp parallel do private(k,i,m) collapse(2)						 
-
-!DVM$ region			
-!DVM$ PARALLEL(k,i), PRIVATE(k,i,m)				
-            do k = start(3,c), cell_size(3,c)-end(3,c)-1            
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp *
-     >                    ( u(m,i,j-2,k,c) - 4.0d0*u(m,i,j-1,k,c) + 
-     >                    6.0d0*u(m,i,j,k,c) - 4.0d0*u(m,i,j+1,k,c) )
-                  enddo
-               enddo
-            enddo
-!DVM$ end region			
-            j = cell_size(2,c)-2
-!1$omp parallel do private(k,i,m) collapse(2)
-!DVM$ region			
-!DVM$ PARALLEL(k,i), PRIVATE(k,i,m)				
-			do k = start(3,c), cell_size(3,c)-end(3,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp *
-     >                    ( u(m,i,j-2,k,c) - 4.d0*u(m,i,j-1,k,c) +
-     >                    5.d0*u(m,i,j,k,c) )
-                  enddo
-               enddo
-            enddo
-!DVM$ end region			
-         endif
-
-c---------------------------------------------------------------------
-c     compute zeta-direction fluxes 
-c---------------------------------------------------------------------
-
-!1$omp parallel do private(k,j,i,wijk,wp1,wm1) collapse(2)
-
-!DVM$ region
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,j,i,wijk,wp1,wm1),
-!DVM$& TIE(rhs(*,i,j,k,*),u(*,i,j,k,*),vs(i,j,k,*),ws(i,j,k,*),
-!DVM$& qs(i,j,k,*),square(i,j,k,*),rho_i(i,j,k,*),us(i,j,k,*))
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  wijk = ws(i,j,k,c)
-                  wp1  = ws(i,j,k+1,c)
-                  wm1  = ws(i,j,k-1,c)
-
-                  rhs(1,i,j,k,c) = rhs(1,i,j,k,c) + dz1tz1 * 
-     >                 (u(1,i,j,k+1,c) - 2.0d0*u(1,i,j,k,c) + 
-     >                 u(1,i,j,k-1,c)) -
-     >                 tz2 * (u(4,i,j,k+1,c) - u(4,i,j,k-1,c))
-                  rhs(2,i,j,k,c) = rhs(2,i,j,k,c) + dz2tz1 * 
-     >                 (u(2,i,j,k+1,c) - 2.0d0*u(2,i,j,k,c) + 
-     >                 u(2,i,j,k-1,c)) +
-     >                 zzcon2 * (us(i,j,k+1,c) - 2.0d0*us(i,j,k,c) + 
-     >                 us(i,j,k-1,c)) -
-     >                 tz2 * (u(2,i,j,k+1,c)*wp1 - 
-     >                 u(2,i,j,k-1,c)*wm1)
-                  rhs(3,i,j,k,c) = rhs(3,i,j,k,c) + dz3tz1 * 
-     >                 (u(3,i,j,k+1,c) - 2.0d0*u(3,i,j,k,c) + 
-     >                 u(3,i,j,k-1,c)) +
-     >                 zzcon2 * (vs(i,j,k+1,c) - 2.0d0*vs(i,j,k,c) + 
-     >                 vs(i,j,k-1,c)) -
-     >                 tz2 * (u(3,i,j,k+1,c)*wp1 - 
-     >                 u(3,i,j,k-1,c)*wm1)
-                  rhs(4,i,j,k,c) = rhs(4,i,j,k,c) + dz4tz1 * 
-     >                 (u(4,i,j,k+1,c) - 2.0d0*u(4,i,j,k,c) + 
-     >                 u(4,i,j,k-1,c)) +
-     >                 zzcon2*con43 * (wp1 - 2.0d0*wijk + wm1) -
-     >                 tz2 * (u(4,i,j,k+1,c)*wp1 - 
-     >                 u(4,i,j,k-1,c)*wm1 +
-     >                 (u(5,i,j,k+1,c) - square(i,j,k+1,c) - 
-     >                 u(5,i,j,k-1,c) + square(i,j,k-1,c))
-     >                 *c2)
-                  rhs(5,i,j,k,c) = rhs(5,i,j,k,c) + dz5tz1 * 
-     >                 (u(5,i,j,k+1,c) - 2.0d0*u(5,i,j,k,c) + 
-     >                 u(5,i,j,k-1,c)) +
-     >                 zzcon3 * (qs(i,j,k+1,c) - 2.0d0*qs(i,j,k,c) + 
-     >                 qs(i,j,k-1,c)) +
-     >                 zzcon4 * (wp1*wp1 - 2.0d0*wijk*wijk + 
-     >                 wm1*wm1) +
-     >                 zzcon5 * (u(5,i,j,k+1,c)*rho_i(i,j,k+1,c) - 
-     >                 2.0d0*u(5,i,j,k,c)*rho_i(i,j,k,c) +
-     >                 u(5,i,j,k-1,c)*rho_i(i,j,k-1,c)) -
-     >                 tz2 * ( (c1*u(5,i,j,k+1,c) - 
-     >                 c2*square(i,j,k+1,c))*wp1 -
-     >                 (c1*u(5,i,j,k-1,c) - 
-     >                 c2*square(i,j,k-1,c))*wm1)
-               enddo
-            enddo
-         enddo
-!DVM$ end region
-c---------------------------------------------------------------------
-c     add fourth order zeta-direction dissipation                
-c---------------------------------------------------------------------
-         if (start(3,c) .gt. 0) then
-            k = 1
-!1$omp parallel do private(j,i,m) collapse(2)		
-
-!DVM$ region			
-!DVM$ PARALLEL(j,i), PRIVATE(i,j,m)									
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c)- dssp * 
-     >                    ( 5.0d0*u(m,i,j,k,c) - 4.0d0*u(m,i,j,k+1,c) +
-     >                    u(m,i,j,k+2,c))
-                  enddo
-               enddo
-            enddo
-!DVM$ end region
-            k = 2
-!1$omp parallel do private(j,i,m) collapse(2)						
-
-!DVM$ region			
-!DVM$ PARALLEL(j,i), PRIVATE(i,j,m)									
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp * 
-     >                    (-4.0d0*u(m,i,j,k-1,c) + 6.0d0*u(m,i,j,k,c) -
-     >                    4.0d0*u(m,i,j,k+1,c) + u(m,i,j,k+2,c))
-                  enddo
-               enddo
-            enddo
-!DVM$ end region
-         endif
-
-!1$omp parallel do private(k,j,i,m) collapse(2)			
-
-!DVM$ region
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,i,j,m),
-!DVM$& TIE(rhs(*,i,j,k,*),u(*,i,j,k,*))
-         do k = 3*start(3,c), cell_size(3,c)-3*end(3,c)-1
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c),cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp * 
-     >                    (  u(m,i,j,k-2,c) - 4.0d0*u(m,i,j,k-1,c) + 
-     >                    6.0*u(m,i,j,k,c) - 4.0d0*u(m,i,j,k+1,c) + 
-     >                    u(m,i,j,k+2,c) )
-                  enddo
-               enddo
-            enddo
-         enddo
-!DVM$ end region         
-         if (end(3,c) .gt. 0) then
-            k = cell_size(3,c)-3
-
-!1$omp parallel do private(j,i,m) collapse(2)	
-!DVM$ region			
-!DVM$ PARALLEL(j,i), PRIVATE(i,j,m)									
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp *
-     >                    ( u(m,i,j,k-2,c) - 4.0d0*u(m,i,j,k-1,c) + 
-     >                    6.0d0*u(m,i,j,k,c) - 4.0d0*u(m,i,j,k+1,c) )
-                  enddo
-               enddo
-            enddo
-!DVM$ end region
-            k = cell_size(3,c)-2
-!1$omp parallel do private(j,i,m) collapse(2)			
-!DVM$ region			
-!DVM$ PARALLEL(j,i), PRIVATE(i,j,m)
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) - dssp *
-     >                    ( u(m,i,j,k-2,c) - 4.d0*u(m,i,j,k-1,c) +
-     >                    5.d0*u(m,i,j,k,c) )
-                  enddo
-               enddo
-            enddo
-!DVM$ end region			
-         endif
-
-!1$omp parallel do private(k,j,i,m) collapse(2)
-
-!DVM$ region
-!DVM$ PARALLEL(k,j,i), PRIVATE(k,i,j,m),
-!DVM$& TIE(rhs(*,i,j,k,*))								
-         do k = start(3,c), cell_size(3,c)-end(3,c)-1
-            do j = start(2,c), cell_size(2,c)-end(2,c)-1
-               do i = start(1,c), cell_size(1,c)-end(1,c)-1
-                  do m = 1, 5
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) * dt
-                  enddo
-               enddo
-            enddo
-         enddo
-!DVM$ end region
-      enddo
-
-      if (timeron) call timer_stop(t_rhs)
-     
-      return
-      end
-
-
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f
deleted file mode 100644
index 81397d4..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/set_constants.f
+++ /dev/null
@@ -1,202 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine  set_constants
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      
-      ce(1,1)  = 2.0d0
-      ce(1,2)  = 0.0d0
-      ce(1,3)  = 0.0d0
-      ce(1,4)  = 4.0d0
-      ce(1,5)  = 5.0d0
-      ce(1,6)  = 3.0d0
-      ce(1,7)  = 0.5d0
-      ce(1,8)  = 0.02d0
-      ce(1,9)  = 0.01d0
-      ce(1,10) = 0.03d0
-      ce(1,11) = 0.5d0
-      ce(1,12) = 0.4d0
-      ce(1,13) = 0.3d0
-      
-      ce(2,1)  = 1.0d0
-      ce(2,2)  = 0.0d0
-      ce(2,3)  = 0.0d0
-      ce(2,4)  = 0.0d0
-      ce(2,5)  = 1.0d0
-      ce(2,6)  = 2.0d0
-      ce(2,7)  = 3.0d0
-      ce(2,8)  = 0.01d0
-      ce(2,9)  = 0.03d0
-      ce(2,10) = 0.02d0
-      ce(2,11) = 0.4d0
-      ce(2,12) = 0.3d0
-      ce(2,13) = 0.5d0
-
-      ce(3,1)  = 2.0d0
-      ce(3,2)  = 2.0d0
-      ce(3,3)  = 0.0d0
-      ce(3,4)  = 0.0d0
-      ce(3,5)  = 0.0d0
-      ce(3,6)  = 2.0d0
-      ce(3,7)  = 3.0d0
-      ce(3,8)  = 0.04d0
-      ce(3,9)  = 0.03d0
-      ce(3,10) = 0.05d0
-      ce(3,11) = 0.3d0
-      ce(3,12) = 0.5d0
-      ce(3,13) = 0.4d0
-
-      ce(4,1)  = 2.0d0
-      ce(4,2)  = 2.0d0
-      ce(4,3)  = 0.0d0
-      ce(4,4)  = 0.0d0
-      ce(4,5)  = 0.0d0
-      ce(4,6)  = 2.0d0
-      ce(4,7)  = 3.0d0
-      ce(4,8)  = 0.03d0
-      ce(4,9)  = 0.05d0
-      ce(4,10) = 0.04d0
-      ce(4,11) = 0.2d0
-      ce(4,12) = 0.1d0
-      ce(4,13) = 0.3d0
-
-      ce(5,1)  = 5.0d0
-      ce(5,2)  = 4.0d0
-      ce(5,3)  = 3.0d0
-      ce(5,4)  = 2.0d0
-      ce(5,5)  = 0.1d0
-      ce(5,6)  = 0.4d0
-      ce(5,7)  = 0.3d0
-      ce(5,8)  = 0.05d0
-      ce(5,9)  = 0.04d0
-      ce(5,10) = 0.03d0
-      ce(5,11) = 0.1d0
-      ce(5,12) = 0.3d0
-      ce(5,13) = 0.2d0
-
-      c1 = 1.4d0
-      c2 = 0.4d0
-      c3 = 0.1d0
-      c4 = 1.0d0
-      c5 = 1.4d0
-
-      bt = dsqrt(0.5d0)
-
-      dnxm1 = 1.0d0 / dble(grid_points(1)-1)
-      dnym1 = 1.0d0 / dble(grid_points(2)-1)
-      dnzm1 = 1.0d0 / dble(grid_points(3)-1)
-
-      c1c2 = c1 * c2
-      c1c5 = c1 * c5
-      c3c4 = c3 * c4
-      c1345 = c1c5 * c3c4
-
-      conz1 = (1.0d0-c1c5)
-
-      tx1 = 1.0d0 / (dnxm1 * dnxm1)
-      tx2 = 1.0d0 / (2.0d0 * dnxm1)
-      tx3 = 1.0d0 / dnxm1
-
-      ty1 = 1.0d0 / (dnym1 * dnym1)
-      ty2 = 1.0d0 / (2.0d0 * dnym1)
-      ty3 = 1.0d0 / dnym1
-      
-      tz1 = 1.0d0 / (dnzm1 * dnzm1)
-      tz2 = 1.0d0 / (2.0d0 * dnzm1)
-      tz3 = 1.0d0 / dnzm1
-
-      dx1 = 0.75d0
-      dx2 = 0.75d0
-      dx3 = 0.75d0
-      dx4 = 0.75d0
-      dx5 = 0.75d0
-
-      dy1 = 0.75d0
-      dy2 = 0.75d0
-      dy3 = 0.75d0
-      dy4 = 0.75d0
-      dy5 = 0.75d0
-
-      dz1 = 1.0d0
-      dz2 = 1.0d0
-      dz3 = 1.0d0
-      dz4 = 1.0d0
-      dz5 = 1.0d0
-
-      dxmax = dmax1(dx3, dx4)
-      dymax = dmax1(dy2, dy4)
-      dzmax = dmax1(dz2, dz3)
-
-      dssp = 0.25d0 * dmax1(dx1, dmax1(dy1, dz1) )
-
-      c4dssp = 4.0d0 * dssp
-      c5dssp = 5.0d0 * dssp
-
-      dttx1 = dt*tx1
-      dttx2 = dt*tx2
-      dtty1 = dt*ty1
-      dtty2 = dt*ty2
-      dttz1 = dt*tz1
-      dttz2 = dt*tz2
-
-      c2dttx1 = 2.0d0*dttx1
-      c2dtty1 = 2.0d0*dtty1
-      c2dttz1 = 2.0d0*dttz1
-
-      dtdssp = dt*dssp
-
-      comz1  = dtdssp
-      comz4  = 4.0d0*dtdssp
-      comz5  = 5.0d0*dtdssp
-      comz6  = 6.0d0*dtdssp
-
-      c3c4tx3 = c3c4*tx3
-      c3c4ty3 = c3c4*ty3
-      c3c4tz3 = c3c4*tz3
-
-      dx1tx1 = dx1*tx1
-      dx2tx1 = dx2*tx1
-      dx3tx1 = dx3*tx1
-      dx4tx1 = dx4*tx1
-      dx5tx1 = dx5*tx1
-      
-      dy1ty1 = dy1*ty1
-      dy2ty1 = dy2*ty1
-      dy3ty1 = dy3*ty1
-      dy4ty1 = dy4*ty1
-      dy5ty1 = dy5*ty1
-      
-      dz1tz1 = dz1*tz1
-      dz2tz1 = dz2*tz1
-      dz3tz1 = dz3*tz1
-      dz4tz1 = dz4*tz1
-      dz5tz1 = dz5*tz1
-
-      c2iv  = 2.5d0
-      con43 = 4.0d0/3.0d0
-      con16 = 1.0d0/6.0d0
-      
-      xxcon1 = c3c4tx3*con43*tx3
-      xxcon2 = c3c4tx3*tx3
-      xxcon3 = c3c4tx3*conz1*tx3
-      xxcon4 = c3c4tx3*con16*tx3
-      xxcon5 = c3c4tx3*c1c5*tx3
-
-      yycon1 = c3c4ty3*con43*ty3
-      yycon2 = c3c4ty3*ty3
-      yycon3 = c3c4ty3*conz1*ty3
-      yycon4 = c3c4ty3*con16*ty3
-      yycon5 = c3c4ty3*c1c5*ty3
-
-      zzcon1 = c3c4tz3*con43*tz3
-      zzcon2 = c3c4tz3*tz3
-      zzcon3 = c3c4tz3*conz1*tz3
-      zzcon4 = c3c4tz3*con16*tz3
-      zzcon5 = c3c4tz3*c1c5*tz3
-
-      return
-      end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f
deleted file mode 100644
index 987c6bf..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/setup_mpi.f
+++ /dev/null
@@ -1,64 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine setup_mpi
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c set up MPI stuff
-c---------------------------------------------------------------------
-
-      implicit none
-      include 'mpinpb.h'
-      include 'npbparams.h'
-      integer error, color, nc
-
-      call mpi_init(error)
-      
-      call mpi_comm_size(MPI_COMM_WORLD, total_nodes, error)
-      call mpi_comm_rank(MPI_COMM_WORLD, node, error)
-
-      if (.not. convertdouble) then
-         dp_type = MPI_DOUBLE_PRECISION
-      else
-         dp_type = MPI_REAL
-      endif
-
-c---------------------------------------------------------------------
-c     compute square root; add small number to allow for roundoff
-c---------------------------------------------------------------------
-      nc = dint(dsqrt(dble(total_nodes) + 0.00001d0))
-
-c---------------------------------------------------------------------
-c We handle a non-square number of nodes by making the excess nodes
-c inactive. However, we can never handle more cells than were compiled
-c in. 
-c---------------------------------------------------------------------
-
-      if (nc .gt. maxcells) nc = maxcells
-      if (node .ge. nc*nc) then
-         active = .false.
-         color = 1
-      else
-         active = .true.
-         color = 0
-      end if
-      
-      call mpi_comm_split(MPI_COMM_WORLD,color,node,comm_setup,error)
-      if (.not. active) return
-
-      call mpi_comm_size(comm_setup, no_nodes, error)
-      call mpi_comm_dup(comm_setup, comm_solve, error)
-      call mpi_comm_dup(comm_setup, comm_rhs, error)
-      
-c---------------------------------------------------------------------
-c     let node 0 be the root for the group (there is only one)
-c---------------------------------------------------------------------
-      root = 0
-
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f
deleted file mode 100644
index 02e2700..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/simple_mpiio.f
+++ /dev/null
@@ -1,213 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine setup_btio
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer m, ierr
-
-      iseek=0
-
-      if (node .eq. root) then
-          call MPI_File_delete(filenm, MPI_INFO_NULL, ierr)
-      endif
-
-      call MPI_Barrier(comm_solve, ierr)
-
-      call MPI_File_open(comm_solve,
-     $          filenm,
-     $          MPI_MODE_RDWR + MPI_MODE_CREATE,
-     $          MPI_INFO_NULL,
-     $          fp,
-     $          ierr)
-
-      call MPI_File_set_view(fp,
-     $          iseek, MPI_DOUBLE_PRECISION, MPI_DOUBLE_PRECISION,
-     $          'native', MPI_INFO_NULL, ierr)
-
-      if (ierr .ne. MPI_SUCCESS) then
-          print *, 'Error opening file'
-          stop
-      endif
-
-      do m = 1, 5
-         xce_sub(m) = 0.d0
-      end do
-
-      idump_sub = 0
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine output_timestep
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer count, jio, kio, cio, aio
-      integer ierr
-      integer mstatus(MPI_STATUS_SIZE)
-
-      do cio=1,ncells
-          do kio=0, cell_size(3,cio)-1
-              do jio=0, cell_size(2,cio)-1
-                  iseek=5*(cell_low(1,cio) +
-     $                   PROBLEM_SIZE*((cell_low(2,cio)+jio) +
-     $                   PROBLEM_SIZE*((cell_low(3,cio)+kio) +
-     $                   PROBLEM_SIZE*idump_sub)))
-
-                  count=5*cell_size(1,cio)
-
-                  call MPI_File_write_at(fp, iseek,
-     $                  u(1,0,jio,kio,cio),
-     $                  count, MPI_DOUBLE_PRECISION,
-     $                  mstatus, ierr)
-
-                  if (ierr .ne. MPI_SUCCESS) then
-                      print *, 'Error writing to file'
-                      stop
-                  endif
-              enddo
-          enddo
-      enddo
-
-      idump_sub = idump_sub + 1
-      if (rd_interval .gt. 0) then
-         if (idump_sub .ge. rd_interval) then
-
-            call acc_sub_norms(idump+1)
-
-            idump_sub = 0
-         endif
-      endif
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine acc_sub_norms(idump_cur)
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer idump_cur
-
-      integer count, jio, kio, cio, ii, m, ichunk
-      integer ierr
-      integer mstatus(MPI_STATUS_SIZE)
-      double precision xce_single(5)
-
-      ichunk = idump_cur - idump_sub + 1
-      do ii=0, idump_sub-1
-        do cio=1,ncells
-          do kio=0, cell_size(3,cio)-1
-              do jio=0, cell_size(2,cio)-1
-                  iseek=5*(cell_low(1,cio) +
-     $                   PROBLEM_SIZE*((cell_low(2,cio)+jio) +
-     $                   PROBLEM_SIZE*((cell_low(3,cio)+kio) +
-     $                   PROBLEM_SIZE*ii)))
-
-                  count=5*cell_size(1,cio)
-
-                  call MPI_File_read_at(fp, iseek,
-     $                  u(1,0,jio,kio,cio),
-     $                  count, MPI_DOUBLE_PRECISION,
-     $                  mstatus, ierr)
-
-                  if (ierr .ne. MPI_SUCCESS) then
-                      print *, 'Error reading back file'
-                      call MPI_File_close(fp, ierr)
-                      stop
-                  endif
-              enddo
-          enddo
-        enddo
-
-        if (node .eq. root) print *, 'Reading data set ', ii+ichunk
-
-        call error_norm(xce_single)
-        do m = 1, 5
-           xce_sub(m) = xce_sub(m) + xce_single(m)
-        end do
-      enddo
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine btio_cleanup
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer ierr
-
-      call MPI_File_close(fp, ierr)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine accumulate_norms(xce_acc)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      double precision xce_acc(5)
-      integer m, ierr
-
-      if (rd_interval .gt. 0) goto 20
-
-      call MPI_File_open(comm_solve,
-     $          filenm,
-     $          MPI_MODE_RDONLY,
-     $          MPI_INFO_NULL,
-     $          fp,
-     $          ierr)
-
-      iseek = 0
-      call MPI_File_set_view(fp,
-     $          iseek, MPI_DOUBLE_PRECISION, MPI_DOUBLE_PRECISION,
-     $          'native', MPI_INFO_NULL, ierr)
-
-c     clear the last time step
-
-      call clear_timestep
-
-c     read back the time steps and accumulate norms
-
-      call acc_sub_norms(idump)
-
-      call MPI_File_close(fp, ierr)
-
- 20   continue
-      do m = 1, 5
-         xce_acc(m) = xce_sub(m) / dble(idump)
-      end do
-
-      return
-      end
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f
deleted file mode 100644
index d1863f2..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/verify.f
+++ /dev/null
@@ -1,434 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-        subroutine verify(no_time_steps, class, verified)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c  verification routine                         
-c---------------------------------------------------------------------
-
-        include 'header.h'
-        include 'mpinpb.h'
-
-        double precision xcrref(5),xceref(5),xcrdif(5),xcedif(5), 
-     >                   epsilon, xce(5), xcr(5), dtref
-        integer m, no_time_steps
-        character class
-        logical verified
-
-c---------------------------------------------------------------------
-c   tolerance level
-c---------------------------------------------------------------------
-        epsilon = 1.0d-08
-        verified = .true.
-
-c---------------------------------------------------------------------
-c   compute the error norm and the residual norm, and exit if not printing
-c---------------------------------------------------------------------
-
-        if (iotype .ne. 0) then
-           call accumulate_norms(xce)
-        else
-           call error_norm(xce)
-        endif
-
-        call copy_faces
-
-        call rhs_norm(xcr)
-
-        do m = 1, 5
-           xcr(m) = xcr(m) / dt
-        enddo
-
-        if (node .ne. 0) return
-
-        class = 'U'
-
-        do m = 1,5
-           xcrref(m) = 1.0
-           xceref(m) = 1.0
-        end do
-
-c---------------------------------------------------------------------
-c    reference data for 12X12X12 grids after 60 time steps, with DT = 1.0d-02
-c---------------------------------------------------------------------
-        if ( (grid_points(1)  .eq. 12     ) .and. 
-     >       (grid_points(2)  .eq. 12     ) .and.
-     >       (grid_points(3)  .eq. 12     ) .and.
-     >       (no_time_steps   .eq. 60    ))  then
-
-           class = 'S'
-           dtref = 1.0d-2
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-         xcrref(1) = 1.7034283709541311d-01
-         xcrref(2) = 1.2975252070034097d-02
-         xcrref(3) = 3.2527926989486055d-02
-         xcrref(4) = 2.6436421275166801d-02
-         xcrref(5) = 1.9211784131744430d-01
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-
-         if (iotype .eq. 0) then
-           xceref(1) = 4.9976913345811579d-04
-           xceref(2) = 4.5195666782961927d-05
-           xceref(3) = 7.3973765172921357d-05
-           xceref(4) = 7.3821238632439731d-05
-           xceref(5) = 8.9269630987491446d-04
-         else
-           xceref(1) = 0.1149036328945d+02
-           xceref(2) = 0.9156788904727d+00
-           xceref(3) = 0.2857899428614d+01
-           xceref(4) = 0.2598273346734d+01
-           xceref(5) = 0.2652795397547d+02
-         endif
-
-c---------------------------------------------------------------------
-c    reference data for 24X24X24 grids after 200 time steps, with DT = 0.8d-3
-c---------------------------------------------------------------------
-        elseif ( (grid_points(1) .eq. 24) .and. 
-     >           (grid_points(2) .eq. 24) .and.
-     >           (grid_points(3) .eq. 24) .and.
-     >           (no_time_steps . eq. 200) ) then
-
-           class = 'W'
-           dtref = 0.8d-3
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-           xcrref(1) = 0.1125590409344d+03
-           xcrref(2) = 0.1180007595731d+02
-           xcrref(3) = 0.2710329767846d+02
-           xcrref(4) = 0.2469174937669d+02
-           xcrref(5) = 0.2638427874317d+03
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-
-         if (iotype .eq. 0) then
-           xceref(1) = 0.4419655736008d+01
-           xceref(2) = 0.4638531260002d+00
-           xceref(3) = 0.1011551749967d+01
-           xceref(4) = 0.9235878729944d+00
-           xceref(5) = 0.1018045837718d+02
-         else
-           xceref(1) = 0.6729594398612d+02
-           xceref(2) = 0.5264523081690d+01
-           xceref(3) = 0.1677107142637d+02
-           xceref(4) = 0.1508721463436d+02
-           xceref(5) = 0.1477018363393d+03
-         endif
-
-
-c---------------------------------------------------------------------
-c    reference data for 64X64X64 grids after 200 time steps, with DT = 0.8d-3
-c---------------------------------------------------------------------
-        elseif ( (grid_points(1) .eq. 64) .and. 
-     >           (grid_points(2) .eq. 64) .and.
-     >           (grid_points(3) .eq. 64) .and.
-     >           (no_time_steps . eq. 200) ) then
-
-           class = 'A'
-           dtref = 0.8d-3
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-         xcrref(1) = 1.0806346714637264d+02
-         xcrref(2) = 1.1319730901220813d+01
-         xcrref(3) = 2.5974354511582465d+01
-         xcrref(4) = 2.3665622544678910d+01
-         xcrref(5) = 2.5278963211748344d+02
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-
-         if (iotype .eq. 0) then
-           xceref(1) = 4.2348416040525025d+00
-           xceref(2) = 4.4390282496995698d-01
-           xceref(3) = 9.6692480136345650d-01
-           xceref(4) = 8.8302063039765474d-01
-           xceref(5) = 9.7379901770829278d+00
-         else
-           xceref(1) = 0.6482218724961d+02
-           xceref(2) = 0.5066461714527d+01
-           xceref(3) = 0.1613931961359d+02
-           xceref(4) = 0.1452010201481d+02
-           xceref(5) = 0.1420099377681d+03
-         endif
-
-c---------------------------------------------------------------------
-c    reference data for 102X102X102 grids after 200 time steps,
-c    with DT = 3.0d-04
-c---------------------------------------------------------------------
-        elseif ( (grid_points(1) .eq. 102) .and. 
-     >           (grid_points(2) .eq. 102) .and.
-     >           (grid_points(3) .eq. 102) .and.
-     >           (no_time_steps . eq. 200) ) then
-
-           class = 'B'
-           dtref = 3.0d-4
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-         xcrref(1) = 1.4233597229287254d+03
-         xcrref(2) = 9.9330522590150238d+01
-         xcrref(3) = 3.5646025644535285d+02
-         xcrref(4) = 3.2485447959084092d+02
-         xcrref(5) = 3.2707541254659363d+03
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-
-         if (iotype .eq. 0) then
-           xceref(1) = 5.2969847140936856d+01
-           xceref(2) = 4.4632896115670668d+00
-           xceref(3) = 1.3122573342210174d+01
-           xceref(4) = 1.2006925323559144d+01
-           xceref(5) = 1.2459576151035986d+02
-         else
-           xceref(1) = 0.1477545106464d+03
-           xceref(2) = 0.1108895555053d+02
-           xceref(3) = 0.3698065590331d+02
-           xceref(4) = 0.3310505581440d+02
-           xceref(5) = 0.3157928282563d+03
-         endif
-
-c---------------------------------------------------------------------
-c    reference data for 162X162X162 grids after 200 time steps,
-c    with DT = 1.0d-04
-c---------------------------------------------------------------------
-        elseif ( (grid_points(1) .eq. 162) .and. 
-     >           (grid_points(2) .eq. 162) .and.
-     >           (grid_points(3) .eq. 162) .and.
-     >           (no_time_steps . eq. 200) ) then
-
-           class = 'C'
-           dtref = 1.0d-4
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-         xcrref(1) = 0.62398116551764615d+04
-         xcrref(2) = 0.50793239190423964d+03
-         xcrref(3) = 0.15423530093013596d+04
-         xcrref(4) = 0.13302387929291190d+04
-         xcrref(5) = 0.11604087428436455d+05
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-
-         if (iotype .eq. 0) then
-           xceref(1) = 0.16462008369091265d+03
-           xceref(2) = 0.11497107903824313d+02
-           xceref(3) = 0.41207446207461508d+02
-           xceref(4) = 0.37087651059694167d+02
-           xceref(5) = 0.36211053051841265d+03
-         else
-           xceref(1) = 0.2597156483475d+03
-           xceref(2) = 0.1985384289495d+02
-           xceref(3) = 0.6517950485788d+02
-           xceref(4) = 0.5757235541520d+02
-           xceref(5) = 0.5215668188726d+03
-         endif 
-
-
-c---------------------------------------------------------------------
-c    reference data for 408x408x408 grids after 250 time steps,
-c    with DT = 0.2d-04
-c---------------------------------------------------------------------
-        elseif ( (grid_points(1) .eq. 408) .and. 
-     >           (grid_points(2) .eq. 408) .and.
-     >           (grid_points(3) .eq. 408) .and.
-     >           (no_time_steps . eq. 250) ) then
-
-           class = 'D'
-           dtref = 0.2d-4
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-         xcrref(1) = 0.2533188551738d+05
-         xcrref(2) = 0.2346393716980d+04
-         xcrref(3) = 0.6294554366904d+04
-         xcrref(4) = 0.5352565376030d+04
-         xcrref(5) = 0.3905864038618d+05
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-
-         if (iotype .eq. 0) then
-           xceref(1) = 0.3100009377557d+03
-           xceref(2) = 0.2424086324913d+02
-           xceref(3) = 0.7782212022645d+02
-           xceref(4) = 0.6835623860116d+02
-           xceref(5) = 0.6065737200368d+03
-         else
-           xceref(1) = 0.3813781566713d+03
-           xceref(2) = 0.3160872966198d+02
-           xceref(3) = 0.9593576357290d+02
-           xceref(4) = 0.8363391989815d+02
-           xceref(5) = 0.7063466087423d+03
-         endif
-
-
-c---------------------------------------------------------------------
-c    reference data for 1020x1020x1020 grids after 250 time steps,
-c    with DT = 0.4d-05
-c---------------------------------------------------------------------
-        elseif ( (grid_points(1) .eq. 1020) .and. 
-     >           (grid_points(2) .eq. 1020) .and.
-     >           (grid_points(3) .eq. 1020) .and.
-     >           (no_time_steps . eq. 250) ) then
-
-           class = 'E'
-           dtref = 0.4d-5
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of residual.
-c---------------------------------------------------------------------
-         xcrref(1) = 0.9795372484517d+05
-         xcrref(2) = 0.9739814511521d+04
-         xcrref(3) = 0.2467606342965d+05
-         xcrref(4) = 0.2092419572860d+05
-         xcrref(5) = 0.1392138856939d+06
-
-c---------------------------------------------------------------------
-c  Reference values of RMS-norms of solution error.
-c---------------------------------------------------------------------
-
-         if (iotype .eq. 0) then
-           xceref(1) = 0.4327562208414d+03
-           xceref(2) = 0.3699051964887d+02
-           xceref(3) = 0.1089845040954d+03
-           xceref(4) = 0.9462517622043d+02
-           xceref(5) = 0.7765512765309d+03
-         else
-c  wr_interval = 5
-           xceref(1) = 0.4729898413058d+03
-           xceref(2) = 0.4145899331704d+02
-           xceref(3) = 0.1192850917138d+03
-           xceref(4) = 0.1032746026932d+03
-           xceref(5) = 0.8270322177634d+03
-c  wr_interval = 10
-c          xceref(1) = 0.4718135916251d+03
-c          xceref(2) = 0.4132620259096d+02
-c          xceref(3) = 0.1189831133503d+03
-c          xceref(4) = 0.1030212798803d+03
-c          xceref(5) = 0.8255924078458d+03
-        endif
-
-        else
-           verified = .false.
-        endif
-
-c---------------------------------------------------------------------
-c    verification test for residuals if gridsize is one of 
-c    the defined grid sizes above (class .ne. 'U')
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c    Compute the difference of solution values and the known reference 
-c    values.
-c---------------------------------------------------------------------
-        do m = 1, 5
-           
-           xcrdif(m) = dabs((xcr(m)-xcrref(m))/xcrref(m)) 
-           xcedif(m) = dabs((xce(m)-xceref(m))/xceref(m))
-           
-        enddo
-
-c---------------------------------------------------------------------
-c    Output the comparison of computed results to known cases.
-c---------------------------------------------------------------------
-
-        if (class .ne. 'U') then
-           write(*, 1990) class
- 1990      format(' Verification being performed for class ', a)
-           write (*,2000) epsilon
- 2000      format(' accuracy setting for epsilon = ', E20.13)
-           verified = (dabs(dt-dtref) .le. epsilon)
-           if (.not.verified) then  
-              class = 'U'
-              write (*,1000) dtref
- 1000         format(' DT does not match the reference value of ', 
-     >                 E15.8)
-           endif
-        else 
-           write(*, 1995)
- 1995      format(' Unknown class')
-        endif
-
-
-        if (class .ne. 'U') then
-           write (*,2001) 
-        else
-           write (*, 2005)
-        endif
-
- 2001   format(' Comparison of RMS-norms of residual')
- 2005   format(' RMS-norms of residual')
-        do m = 1, 5
-           if (class .eq. 'U') then
-              write(*, 2015) m, xcr(m)
-           else if (xcrdif(m) .le. epsilon) then
-              write (*,2011) m,xcr(m),xcrref(m),xcrdif(m)
-           else 
-              verified = .false.
-              write (*,2010) m,xcr(m),xcrref(m),xcrdif(m)
-           endif
-        enddo
-
-        if (class .ne. 'U') then
-           write (*,2002)
-        else
-           write (*,2006)
-        endif
- 2002   format(' Comparison of RMS-norms of solution error')
- 2006   format(' RMS-norms of solution error')
-        
-        do m = 1, 5
-           if (class .eq. 'U') then
-              write(*, 2015) m, xce(m)
-           else if (xcedif(m) .le. epsilon) then
-              write (*,2011) m,xce(m),xceref(m),xcedif(m)
-           else
-              verified = .false.
-              write (*,2010) m,xce(m),xceref(m),xcedif(m)
-           endif
-        enddo
-        
- 2010   format(' FAILURE: ', i2, E20.13, E20.13, E20.13)
- 2011   format('          ', i2, E20.13, E20.13, E20.13)
- 2015   format('          ', i2, E20.13)
-        
-        if (class .eq. 'U') then
-           write(*, 2022)
-           write(*, 2023)
- 2022      format(' No reference values provided')
- 2023      format(' No verification performed')
-        else if (verified) then
-           write(*, 2020)
- 2020      format(' Verification Successful')
-        else
-           write(*, 2021)
- 2021      format(' Verification failed')
-        endif
-
-        return
-
-
-        end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h
deleted file mode 100644
index d9bc9e4..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/work_lhs.h
+++ /dev/null
@@ -1,14 +0,0 @@
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-c
-c  work_lhs.h
-c
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      double precision fjac(5, 5, -2:MAX_CELL_DIM+1),
-     >                 njac(5, 5, -2:MAX_CELL_DIM+1),
-     >                 lhsa(5, 5, -1:MAX_CELL_DIM),
-     >                 lhsb(5, 5, -1:MAX_CELL_DIM),
-     >                 tmp1, tmp2, tmp3
-      common /work_lhs/ fjac, njac, lhsa, lhsb, tmp1, tmp2, tmp3
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f
deleted file mode 100644
index e0daab3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/BT_dvmh/x_solve.f
+++ /dev/null
@@ -1,3547 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      pure subroutine lhsabinit(lhsa, lhsb, size)
-      implicit none
-	  intent (out)::lhsa, lhsb
-	  intent (in)::size
-      integer size
-      double precision lhsa(5, 5, -1:size), lhsb(5, 5, -1:size)
-
-      integer i, m, n
-
-c---------------------------------------------------------------------
-c     next, set all diagonal values to 1. This is overkill, but convenient
-c---------------------------------------------------------------------
-      do i = 0, size
-         do m = 1, 5
-            do n = 1, 5
-               lhsa(m,n,i) = 0.0d0
-               lhsb(m,n,i) = 0.0d0
-            enddo
-            lhsb(m,m,i) = 1.0d0
-         enddo
-      enddo
-
-      return
-      end
-	  
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      pure subroutine matvec_sub(ablock,avec,bvec)
-!DVM$ routine
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     subtracts bvec=bvec - ablock*avec
-c---------------------------------------------------------------------
-
-      implicit none
-      intent (inout)::ablock,avec,bvec
-      double precision ablock,avec,bvec
-      dimension ablock(5,5),avec(5),bvec(5)
-
-c---------------------------------------------------------------------
-c            rhs(i,ic,jc,kc,ccell) = rhs(i,ic,jc,kc,ccell) 
-c     $           - lhs(i,1,ablock,ia,ja,ka,acell)*
-c---------------------------------------------------------------------
-         bvec(1) = bvec(1) - ablock(1,1)*avec(1)
-     >                     - ablock(1,2)*avec(2)
-     >                     - ablock(1,3)*avec(3)
-     >                     - ablock(1,4)*avec(4)
-     >                     - ablock(1,5)*avec(5)
-         bvec(2) = bvec(2) - ablock(2,1)*avec(1)
-     >                     - ablock(2,2)*avec(2)
-     >                     - ablock(2,3)*avec(3)
-     >                     - ablock(2,4)*avec(4)
-     >                     - ablock(2,5)*avec(5)
-         bvec(3) = bvec(3) - ablock(3,1)*avec(1)
-     >                     - ablock(3,2)*avec(2)
-     >                     - ablock(3,3)*avec(3)
-     >                     - ablock(3,4)*avec(4)
-     >                     - ablock(3,5)*avec(5)
-         bvec(4) = bvec(4) - ablock(4,1)*avec(1)
-     >                     - ablock(4,2)*avec(2)
-     >                     - ablock(4,3)*avec(3)
-     >                     - ablock(4,4)*avec(4)
-     >                     - ablock(4,5)*avec(5)
-         bvec(5) = bvec(5) - ablock(5,1)*avec(1)
-     >                     - ablock(5,2)*avec(2)
-     >                     - ablock(5,3)*avec(3)
-     >                     - ablock(5,4)*avec(4)
-     >                     - ablock(5,5)*avec(5)
-
-
-      return
-      end
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      pure  subroutine matmul_sub(ablock, bblock, cblock)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     subtracts a(i,j,k) X b(i,j,k) from c(i,j,k)
-c---------------------------------------------------------------------
-
-      implicit none
-      intent (inout)::cblock
-	  intent (in)::ablock, bblock
-      double precision ablock, bblock, cblock
-      dimension ablock(5,5), bblock(5,5), cblock(5,5)
-
-
-         cblock(1,1) = cblock(1,1) - ablock(1,1)*bblock(1,1)
-     >                             - ablock(1,2)*bblock(2,1)
-     >                             - ablock(1,3)*bblock(3,1)
-     >                             - ablock(1,4)*bblock(4,1)
-     >                             - ablock(1,5)*bblock(5,1)
-         cblock(2,1) = cblock(2,1) - ablock(2,1)*bblock(1,1)
-     >                             - ablock(2,2)*bblock(2,1)
-     >                             - ablock(2,3)*bblock(3,1)
-     >                             - ablock(2,4)*bblock(4,1)
-     >                             - ablock(2,5)*bblock(5,1)
-         cblock(3,1) = cblock(3,1) - ablock(3,1)*bblock(1,1)
-     >                             - ablock(3,2)*bblock(2,1)
-     >                             - ablock(3,3)*bblock(3,1)
-     >                             - ablock(3,4)*bblock(4,1)
-     >                             - ablock(3,5)*bblock(5,1)
-         cblock(4,1) = cblock(4,1) - ablock(4,1)*bblock(1,1)
-     >                             - ablock(4,2)*bblock(2,1)
-     >                             - ablock(4,3)*bblock(3,1)
-     >                             - ablock(4,4)*bblock(4,1)
-     >                             - ablock(4,5)*bblock(5,1)
-         cblock(5,1) = cblock(5,1) - ablock(5,1)*bblock(1,1)
-     >                             - ablock(5,2)*bblock(2,1)
-     >                             - ablock(5,3)*bblock(3,1)
-     >                             - ablock(5,4)*bblock(4,1)
-     >                             - ablock(5,5)*bblock(5,1)
-         cblock(1,2) = cblock(1,2) - ablock(1,1)*bblock(1,2)
-     >                             - ablock(1,2)*bblock(2,2)
-     >                             - ablock(1,3)*bblock(3,2)
-     >                             - ablock(1,4)*bblock(4,2)
-     >                             - ablock(1,5)*bblock(5,2)
-         cblock(2,2) = cblock(2,2) - ablock(2,1)*bblock(1,2)
-     >                             - ablock(2,2)*bblock(2,2)
-     >                             - ablock(2,3)*bblock(3,2)
-     >                             - ablock(2,4)*bblock(4,2)
-     >                             - ablock(2,5)*bblock(5,2)
-         cblock(3,2) = cblock(3,2) - ablock(3,1)*bblock(1,2)
-     >                             - ablock(3,2)*bblock(2,2)
-     >                             - ablock(3,3)*bblock(3,2)
-     >                             - ablock(3,4)*bblock(4,2)
-     >                             - ablock(3,5)*bblock(5,2)
-         cblock(4,2) = cblock(4,2) - ablock(4,1)*bblock(1,2)
-     >                             - ablock(4,2)*bblock(2,2)
-     >                             - ablock(4,3)*bblock(3,2)
-     >                             - ablock(4,4)*bblock(4,2)
-     >                             - ablock(4,5)*bblock(5,2)
-         cblock(5,2) = cblock(5,2) - ablock(5,1)*bblock(1,2)
-     >                             - ablock(5,2)*bblock(2,2)
-     >                             - ablock(5,3)*bblock(3,2)
-     >                             - ablock(5,4)*bblock(4,2)
-     >                             - ablock(5,5)*bblock(5,2)
-         cblock(1,3) = cblock(1,3) - ablock(1,1)*bblock(1,3)
-     >                             - ablock(1,2)*bblock(2,3)
-     >                             - ablock(1,3)*bblock(3,3)
-     >                             - ablock(1,4)*bblock(4,3)
-     >                             - ablock(1,5)*bblock(5,3)
-         cblock(2,3) = cblock(2,3) - ablock(2,1)*bblock(1,3)
-     >                             - ablock(2,2)*bblock(2,3)
-     >                             - ablock(2,3)*bblock(3,3)
-     >                             - ablock(2,4)*bblock(4,3)
-     >                             - ablock(2,5)*bblock(5,3)
-         cblock(3,3) = cblock(3,3) - ablock(3,1)*bblock(1,3)
-     >                             - ablock(3,2)*bblock(2,3)
-     >                             - ablock(3,3)*bblock(3,3)
-     >                             - ablock(3,4)*bblock(4,3)
-     >                             - ablock(3,5)*bblock(5,3)
-         cblock(4,3) = cblock(4,3) - ablock(4,1)*bblock(1,3)
-     >                             - ablock(4,2)*bblock(2,3)
-     >                             - ablock(4,3)*bblock(3,3)
-     >                             - ablock(4,4)*bblock(4,3)
-     >                             - ablock(4,5)*bblock(5,3)
-         cblock(5,3) = cblock(5,3) - ablock(5,1)*bblock(1,3)
-     >                             - ablock(5,2)*bblock(2,3)
-     >                             - ablock(5,3)*bblock(3,3)
-     >                             - ablock(5,4)*bblock(4,3)
-     >                             - ablock(5,5)*bblock(5,3)
-         cblock(1,4) = cblock(1,4) - ablock(1,1)*bblock(1,4)
-     >                             - ablock(1,2)*bblock(2,4)
-     >                             - ablock(1,3)*bblock(3,4)
-     >                             - ablock(1,4)*bblock(4,4)
-     >                             - ablock(1,5)*bblock(5,4)
-         cblock(2,4) = cblock(2,4) - ablock(2,1)*bblock(1,4)
-     >                             - ablock(2,2)*bblock(2,4)
-     >                             - ablock(2,3)*bblock(3,4)
-     >                             - ablock(2,4)*bblock(4,4)
-     >                             - ablock(2,5)*bblock(5,4)
-         cblock(3,4) = cblock(3,4) - ablock(3,1)*bblock(1,4)
-     >                             - ablock(3,2)*bblock(2,4)
-     >                             - ablock(3,3)*bblock(3,4)
-     >                             - ablock(3,4)*bblock(4,4)
-     >                             - ablock(3,5)*bblock(5,4)
-         cblock(4,4) = cblock(4,4) - ablock(4,1)*bblock(1,4)
-     >                             - ablock(4,2)*bblock(2,4)
-     >                             - ablock(4,3)*bblock(3,4)
-     >                             - ablock(4,4)*bblock(4,4)
-     >                             - ablock(4,5)*bblock(5,4)
-         cblock(5,4) = cblock(5,4) - ablock(5,1)*bblock(1,4)
-     >                             - ablock(5,2)*bblock(2,4)
-     >                             - ablock(5,3)*bblock(3,4)
-     >                             - ablock(5,4)*bblock(4,4)
-     >                             - ablock(5,5)*bblock(5,4)
-         cblock(1,5) = cblock(1,5) - ablock(1,1)*bblock(1,5)
-     >                             - ablock(1,2)*bblock(2,5)
-     >                             - ablock(1,3)*bblock(3,5)
-     >                             - ablock(1,4)*bblock(4,5)
-     >                             - ablock(1,5)*bblock(5,5)
-         cblock(2,5) = cblock(2,5) - ablock(2,1)*bblock(1,5)
-     >                             - ablock(2,2)*bblock(2,5)
-     >                             - ablock(2,3)*bblock(3,5)
-     >                             - ablock(2,4)*bblock(4,5)
-     >                             - ablock(2,5)*bblock(5,5)
-         cblock(3,5) = cblock(3,5) - ablock(3,1)*bblock(1,5)
-     >                             - ablock(3,2)*bblock(2,5)
-     >                             - ablock(3,3)*bblock(3,5)
-     >                             - ablock(3,4)*bblock(4,5)
-     >                             - ablock(3,5)*bblock(5,5)
-         cblock(4,5) = cblock(4,5) - ablock(4,1)*bblock(1,5)
-     >                             - ablock(4,2)*bblock(2,5)
-     >                             - ablock(4,3)*bblock(3,5)
-     >                             - ablock(4,4)*bblock(4,5)
-     >                             - ablock(4,5)*bblock(5,5)
-         cblock(5,5) = cblock(5,5) - ablock(5,1)*bblock(1,5)
-     >                             - ablock(5,2)*bblock(2,5)
-     >                             - ablock(5,3)*bblock(3,5)
-     >                             - ablock(5,4)*bblock(4,5)
-     >                             - ablock(5,5)*bblock(5,5)
-
-              
-      return
-      end
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      pure  subroutine binvcrhs( lhs,c,r )
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     
-c---------------------------------------------------------------------
-
-      implicit none
-      intent (inout)::lhs,c,r
-      double precision pivot, coeff, lhs
-      dimension lhs(5,5)
-      double precision c(5,5), r(5)
-
-c---------------------------------------------------------------------
-c     
-c---------------------------------------------------------------------
-
-      pivot = 1.00d0/lhs(1,1)
-      lhs(1,2) = lhs(1,2)*pivot
-      lhs(1,3) = lhs(1,3)*pivot
-      lhs(1,4) = lhs(1,4)*pivot
-      lhs(1,5) = lhs(1,5)*pivot
-      c(1,1) = c(1,1)*pivot
-      c(1,2) = c(1,2)*pivot
-      c(1,3) = c(1,3)*pivot
-      c(1,4) = c(1,4)*pivot
-      c(1,5) = c(1,5)*pivot
-      r(1)   = r(1)  *pivot
-
-      coeff = lhs(2,1)
-      lhs(2,2)= lhs(2,2) - coeff*lhs(1,2)
-      lhs(2,3)= lhs(2,3) - coeff*lhs(1,3)
-      lhs(2,4)= lhs(2,4) - coeff*lhs(1,4)
-      lhs(2,5)= lhs(2,5) - coeff*lhs(1,5)
-      c(2,1) = c(2,1) - coeff*c(1,1)
-      c(2,2) = c(2,2) - coeff*c(1,2)
-      c(2,3) = c(2,3) - coeff*c(1,3)
-      c(2,4) = c(2,4) - coeff*c(1,4)
-      c(2,5) = c(2,5) - coeff*c(1,5)
-      r(2)   = r(2)   - coeff*r(1)
-
-      coeff = lhs(3,1)
-      lhs(3,2)= lhs(3,2) - coeff*lhs(1,2)
-      lhs(3,3)= lhs(3,3) - coeff*lhs(1,3)
-      lhs(3,4)= lhs(3,4) - coeff*lhs(1,4)
-      lhs(3,5)= lhs(3,5) - coeff*lhs(1,5)
-      c(3,1) = c(3,1) - coeff*c(1,1)
-      c(3,2) = c(3,2) - coeff*c(1,2)
-      c(3,3) = c(3,3) - coeff*c(1,3)
-      c(3,4) = c(3,4) - coeff*c(1,4)
-      c(3,5) = c(3,5) - coeff*c(1,5)
-      r(3)   = r(3)   - coeff*r(1)
-
-      coeff = lhs(4,1)
-      lhs(4,2)= lhs(4,2) - coeff*lhs(1,2)
-      lhs(4,3)= lhs(4,3) - coeff*lhs(1,3)
-      lhs(4,4)= lhs(4,4) - coeff*lhs(1,4)
-      lhs(4,5)= lhs(4,5) - coeff*lhs(1,5)
-      c(4,1) = c(4,1) - coeff*c(1,1)
-      c(4,2) = c(4,2) - coeff*c(1,2)
-      c(4,3) = c(4,3) - coeff*c(1,3)
-      c(4,4) = c(4,4) - coeff*c(1,4)
-      c(4,5) = c(4,5) - coeff*c(1,5)
-      r(4)   = r(4)   - coeff*r(1)
-
-      coeff = lhs(5,1)
-      lhs(5,2)= lhs(5,2) - coeff*lhs(1,2)
-      lhs(5,3)= lhs(5,3) - coeff*lhs(1,3)
-      lhs(5,4)= lhs(5,4) - coeff*lhs(1,4)
-      lhs(5,5)= lhs(5,5) - coeff*lhs(1,5)
-      c(5,1) = c(5,1) - coeff*c(1,1)
-      c(5,2) = c(5,2) - coeff*c(1,2)
-      c(5,3) = c(5,3) - coeff*c(1,3)
-      c(5,4) = c(5,4) - coeff*c(1,4)
-      c(5,5) = c(5,5) - coeff*c(1,5)
-      r(5)   = r(5)   - coeff*r(1)
-
-
-      pivot = 1.00d0/lhs(2,2)
-      lhs(2,3) = lhs(2,3)*pivot
-      lhs(2,4) = lhs(2,4)*pivot
-      lhs(2,5) = lhs(2,5)*pivot
-      c(2,1) = c(2,1)*pivot
-      c(2,2) = c(2,2)*pivot
-      c(2,3) = c(2,3)*pivot
-      c(2,4) = c(2,4)*pivot
-      c(2,5) = c(2,5)*pivot
-      r(2)   = r(2)  *pivot
-
-      coeff = lhs(1,2)
-      lhs(1,3)= lhs(1,3) - coeff*lhs(2,3)
-      lhs(1,4)= lhs(1,4) - coeff*lhs(2,4)
-      lhs(1,5)= lhs(1,5) - coeff*lhs(2,5)
-      c(1,1) = c(1,1) - coeff*c(2,1)
-      c(1,2) = c(1,2) - coeff*c(2,2)
-      c(1,3) = c(1,3) - coeff*c(2,3)
-      c(1,4) = c(1,4) - coeff*c(2,4)
-      c(1,5) = c(1,5) - coeff*c(2,5)
-      r(1)   = r(1)   - coeff*r(2)
-
-      coeff = lhs(3,2)
-      lhs(3,3)= lhs(3,3) - coeff*lhs(2,3)
-      lhs(3,4)= lhs(3,4) - coeff*lhs(2,4)
-      lhs(3,5)= lhs(3,5) - coeff*lhs(2,5)
-      c(3,1) = c(3,1) - coeff*c(2,1)
-      c(3,2) = c(3,2) - coeff*c(2,2)
-      c(3,3) = c(3,3) - coeff*c(2,3)
-      c(3,4) = c(3,4) - coeff*c(2,4)
-      c(3,5) = c(3,5) - coeff*c(2,5)
-      r(3)   = r(3)   - coeff*r(2)
-
-      coeff = lhs(4,2)
-      lhs(4,3)= lhs(4,3) - coeff*lhs(2,3)
-      lhs(4,4)= lhs(4,4) - coeff*lhs(2,4)
-      lhs(4,5)= lhs(4,5) - coeff*lhs(2,5)
-      c(4,1) = c(4,1) - coeff*c(2,1)
-      c(4,2) = c(4,2) - coeff*c(2,2)
-      c(4,3) = c(4,3) - coeff*c(2,3)
-      c(4,4) = c(4,4) - coeff*c(2,4)
-      c(4,5) = c(4,5) - coeff*c(2,5)
-      r(4)   = r(4)   - coeff*r(2)
-
-      coeff = lhs(5,2)
-      lhs(5,3)= lhs(5,3) - coeff*lhs(2,3)
-      lhs(5,4)= lhs(5,4) - coeff*lhs(2,4)
-      lhs(5,5)= lhs(5,5) - coeff*lhs(2,5)
-      c(5,1) = c(5,1) - coeff*c(2,1)
-      c(5,2) = c(5,2) - coeff*c(2,2)
-      c(5,3) = c(5,3) - coeff*c(2,3)
-      c(5,4) = c(5,4) - coeff*c(2,4)
-      c(5,5) = c(5,5) - coeff*c(2,5)
-      r(5)   = r(5)   - coeff*r(2)
-
-
-      pivot = 1.00d0/lhs(3,3)
-      lhs(3,4) = lhs(3,4)*pivot
-      lhs(3,5) = lhs(3,5)*pivot
-      c(3,1) = c(3,1)*pivot
-      c(3,2) = c(3,2)*pivot
-      c(3,3) = c(3,3)*pivot
-      c(3,4) = c(3,4)*pivot
-      c(3,5) = c(3,5)*pivot
-      r(3)   = r(3)  *pivot
-
-      coeff = lhs(1,3)
-      lhs(1,4)= lhs(1,4) - coeff*lhs(3,4)
-      lhs(1,5)= lhs(1,5) - coeff*lhs(3,5)
-      c(1,1) = c(1,1) - coeff*c(3,1)
-      c(1,2) = c(1,2) - coeff*c(3,2)
-      c(1,3) = c(1,3) - coeff*c(3,3)
-      c(1,4) = c(1,4) - coeff*c(3,4)
-      c(1,5) = c(1,5) - coeff*c(3,5)
-      r(1)   = r(1)   - coeff*r(3)
-
-      coeff = lhs(2,3)
-      lhs(2,4)= lhs(2,4) - coeff*lhs(3,4)
-      lhs(2,5)= lhs(2,5) - coeff*lhs(3,5)
-      c(2,1) = c(2,1) - coeff*c(3,1)
-      c(2,2) = c(2,2) - coeff*c(3,2)
-      c(2,3) = c(2,3) - coeff*c(3,3)
-      c(2,4) = c(2,4) - coeff*c(3,4)
-      c(2,5) = c(2,5) - coeff*c(3,5)
-      r(2)   = r(2)   - coeff*r(3)
-
-      coeff = lhs(4,3)
-      lhs(4,4)= lhs(4,4) - coeff*lhs(3,4)
-      lhs(4,5)= lhs(4,5) - coeff*lhs(3,5)
-      c(4,1) = c(4,1) - coeff*c(3,1)
-      c(4,2) = c(4,2) - coeff*c(3,2)
-      c(4,3) = c(4,3) - coeff*c(3,3)
-      c(4,4) = c(4,4) - coeff*c(3,4)
-      c(4,5) = c(4,5) - coeff*c(3,5)
-      r(4)   = r(4)   - coeff*r(3)
-
-      coeff = lhs(5,3)
-      lhs(5,4)= lhs(5,4) - coeff*lhs(3,4)
-      lhs(5,5)= lhs(5,5) - coeff*lhs(3,5)
-      c(5,1) = c(5,1) - coeff*c(3,1)
-      c(5,2) = c(5,2) - coeff*c(3,2)
-      c(5,3) = c(5,3) - coeff*c(3,3)
-      c(5,4) = c(5,4) - coeff*c(3,4)
-      c(5,5) = c(5,5) - coeff*c(3,5)
-      r(5)   = r(5)   - coeff*r(3)
-
-
-      pivot = 1.00d0/lhs(4,4)
-      lhs(4,5) = lhs(4,5)*pivot
-      c(4,1) = c(4,1)*pivot
-      c(4,2) = c(4,2)*pivot
-      c(4,3) = c(4,3)*pivot
-      c(4,4) = c(4,4)*pivot
-      c(4,5) = c(4,5)*pivot
-      r(4)   = r(4)  *pivot
-
-      coeff = lhs(1,4)
-      lhs(1,5)= lhs(1,5) - coeff*lhs(4,5)
-      c(1,1) = c(1,1) - coeff*c(4,1)
-      c(1,2) = c(1,2) - coeff*c(4,2)
-      c(1,3) = c(1,3) - coeff*c(4,3)
-      c(1,4) = c(1,4) - coeff*c(4,4)
-      c(1,5) = c(1,5) - coeff*c(4,5)
-      r(1)   = r(1)   - coeff*r(4)
-
-      coeff = lhs(2,4)
-      lhs(2,5)= lhs(2,5) - coeff*lhs(4,5)
-      c(2,1) = c(2,1) - coeff*c(4,1)
-      c(2,2) = c(2,2) - coeff*c(4,2)
-      c(2,3) = c(2,3) - coeff*c(4,3)
-      c(2,4) = c(2,4) - coeff*c(4,4)
-      c(2,5) = c(2,5) - coeff*c(4,5)
-      r(2)   = r(2)   - coeff*r(4)
-
-      coeff = lhs(3,4)
-      lhs(3,5)= lhs(3,5) - coeff*lhs(4,5)
-      c(3,1) = c(3,1) - coeff*c(4,1)
-      c(3,2) = c(3,2) - coeff*c(4,2)
-      c(3,3) = c(3,3) - coeff*c(4,3)
-      c(3,4) = c(3,4) - coeff*c(4,4)
-      c(3,5) = c(3,5) - coeff*c(4,5)
-      r(3)   = r(3)   - coeff*r(4)
-
-      coeff = lhs(5,4)
-      lhs(5,5)= lhs(5,5) - coeff*lhs(4,5)
-      c(5,1) = c(5,1) - coeff*c(4,1)
-      c(5,2) = c(5,2) - coeff*c(4,2)
-      c(5,3) = c(5,3) - coeff*c(4,3)
-      c(5,4) = c(5,4) - coeff*c(4,4)
-      c(5,5) = c(5,5) - coeff*c(4,5)
-      r(5)   = r(5)   - coeff*r(4)
-
-
-      pivot = 1.00d0/lhs(5,5)
-      c(5,1) = c(5,1)*pivot
-      c(5,2) = c(5,2)*pivot
-      c(5,3) = c(5,3)*pivot
-      c(5,4) = c(5,4)*pivot
-      c(5,5) = c(5,5)*pivot
-      r(5)   = r(5)  *pivot
-
-      coeff = lhs(1,5)
-      c(1,1) = c(1,1) - coeff*c(5,1)
-      c(1,2) = c(1,2) - coeff*c(5,2)
-      c(1,3) = c(1,3) - coeff*c(5,3)
-      c(1,4) = c(1,4) - coeff*c(5,4)
-      c(1,5) = c(1,5) - coeff*c(5,5)
-      r(1)   = r(1)   - coeff*r(5)
-
-      coeff = lhs(2,5)
-      c(2,1) = c(2,1) - coeff*c(5,1)
-      c(2,2) = c(2,2) - coeff*c(5,2)
-      c(2,3) = c(2,3) - coeff*c(5,3)
-      c(2,4) = c(2,4) - coeff*c(5,4)
-      c(2,5) = c(2,5) - coeff*c(5,5)
-      r(2)   = r(2)   - coeff*r(5)
-
-      coeff = lhs(3,5)
-      c(3,1) = c(3,1) - coeff*c(5,1)
-      c(3,2) = c(3,2) - coeff*c(5,2)
-      c(3,3) = c(3,3) - coeff*c(5,3)
-      c(3,4) = c(3,4) - coeff*c(5,4)
-      c(3,5) = c(3,5) - coeff*c(5,5)
-      r(3)   = r(3)   - coeff*r(5)
-
-      coeff = lhs(4,5)
-      c(4,1) = c(4,1) - coeff*c(5,1)
-      c(4,2) = c(4,2) - coeff*c(5,2)
-      c(4,3) = c(4,3) - coeff*c(5,3)
-      c(4,4) = c(4,4) - coeff*c(5,4)
-      c(4,5) = c(4,5) - coeff*c(5,5)
-      r(4)   = r(4)   - coeff*r(5)
-
-
-      return
-      end
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      pure subroutine binvrhs( lhs,r )
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     
-c---------------------------------------------------------------------
-
-      implicit none
-      intent (inout)::lhs,r
-      double precision pivot, coeff, lhs
-      dimension lhs(5,5)
-      double precision r(5)
-
-c---------------------------------------------------------------------
-c     
-c---------------------------------------------------------------------
-
-
-      pivot = 1.00d0/lhs(1,1)
-      lhs(1,2) = lhs(1,2)*pivot
-      lhs(1,3) = lhs(1,3)*pivot
-      lhs(1,4) = lhs(1,4)*pivot
-      lhs(1,5) = lhs(1,5)*pivot
-      r(1)   = r(1)  *pivot
-
-      coeff = lhs(2,1)
-      lhs(2,2)= lhs(2,2) - coeff*lhs(1,2)
-      lhs(2,3)= lhs(2,3) - coeff*lhs(1,3)
-      lhs(2,4)= lhs(2,4) - coeff*lhs(1,4)
-      lhs(2,5)= lhs(2,5) - coeff*lhs(1,5)
-      r(2)   = r(2)   - coeff*r(1)
-
-      coeff = lhs(3,1)
-      lhs(3,2)= lhs(3,2) - coeff*lhs(1,2)
-      lhs(3,3)= lhs(3,3) - coeff*lhs(1,3)
-      lhs(3,4)= lhs(3,4) - coeff*lhs(1,4)
-      lhs(3,5)= lhs(3,5) - coeff*lhs(1,5)
-      r(3)   = r(3)   - coeff*r(1)
-
-      coeff = lhs(4,1)
-      lhs(4,2)= lhs(4,2) - coeff*lhs(1,2)
-      lhs(4,3)= lhs(4,3) - coeff*lhs(1,3)
-      lhs(4,4)= lhs(4,4) - coeff*lhs(1,4)
-      lhs(4,5)= lhs(4,5) - coeff*lhs(1,5)
-      r(4)   = r(4)   - coeff*r(1)
-
-      coeff = lhs(5,1)
-      lhs(5,2)= lhs(5,2) - coeff*lhs(1,2)
-      lhs(5,3)= lhs(5,3) - coeff*lhs(1,3)
-      lhs(5,4)= lhs(5,4) - coeff*lhs(1,4)
-      lhs(5,5)= lhs(5,5) - coeff*lhs(1,5)
-      r(5)   = r(5)   - coeff*r(1)
-
-
-      pivot = 1.00d0/lhs(2,2)
-      lhs(2,3) = lhs(2,3)*pivot
-      lhs(2,4) = lhs(2,4)*pivot
-      lhs(2,5) = lhs(2,5)*pivot
-      r(2)   = r(2)  *pivot
-
-      coeff = lhs(1,2)
-      lhs(1,3)= lhs(1,3) - coeff*lhs(2,3)
-      lhs(1,4)= lhs(1,4) - coeff*lhs(2,4)
-      lhs(1,5)= lhs(1,5) - coeff*lhs(2,5)
-      r(1)   = r(1)   - coeff*r(2)
-
-      coeff = lhs(3,2)
-      lhs(3,3)= lhs(3,3) - coeff*lhs(2,3)
-      lhs(3,4)= lhs(3,4) - coeff*lhs(2,4)
-      lhs(3,5)= lhs(3,5) - coeff*lhs(2,5)
-      r(3)   = r(3)   - coeff*r(2)
-
-      coeff = lhs(4,2)
-      lhs(4,3)= lhs(4,3) - coeff*lhs(2,3)
-      lhs(4,4)= lhs(4,4) - coeff*lhs(2,4)
-      lhs(4,5)= lhs(4,5) - coeff*lhs(2,5)
-      r(4)   = r(4)   - coeff*r(2)
-
-      coeff = lhs(5,2)
-      lhs(5,3)= lhs(5,3) - coeff*lhs(2,3)
-      lhs(5,4)= lhs(5,4) - coeff*lhs(2,4)
-      lhs(5,5)= lhs(5,5) - coeff*lhs(2,5)
-      r(5)   = r(5)   - coeff*r(2)
-
-
-      pivot = 1.00d0/lhs(3,3)
-      lhs(3,4) = lhs(3,4)*pivot
-      lhs(3,5) = lhs(3,5)*pivot
-      r(3)   = r(3)  *pivot
-
-      coeff = lhs(1,3)
-      lhs(1,4)= lhs(1,4) - coeff*lhs(3,4)
-      lhs(1,5)= lhs(1,5) - coeff*lhs(3,5)
-      r(1)   = r(1)   - coeff*r(3)
-
-      coeff = lhs(2,3)
-      lhs(2,4)= lhs(2,4) - coeff*lhs(3,4)
-      lhs(2,5)= lhs(2,5) - coeff*lhs(3,5)
-      r(2)   = r(2)   - coeff*r(3)
-
-      coeff = lhs(4,3)
-      lhs(4,4)= lhs(4,4) - coeff*lhs(3,4)
-      lhs(4,5)= lhs(4,5) - coeff*lhs(3,5)
-      r(4)   = r(4)   - coeff*r(3)
-
-      coeff = lhs(5,3)
-      lhs(5,4)= lhs(5,4) - coeff*lhs(3,4)
-      lhs(5,5)= lhs(5,5) - coeff*lhs(3,5)
-      r(5)   = r(5)   - coeff*r(3)
-
-
-      pivot = 1.00d0/lhs(4,4)
-      lhs(4,5) = lhs(4,5)*pivot
-      r(4)   = r(4)  *pivot
-
-      coeff = lhs(1,4)
-      lhs(1,5)= lhs(1,5) - coeff*lhs(4,5)
-      r(1)   = r(1)   - coeff*r(4)
-
-      coeff = lhs(2,4)
-      lhs(2,5)= lhs(2,5) - coeff*lhs(4,5)
-      r(2)   = r(2)   - coeff*r(4)
-
-      coeff = lhs(3,4)
-      lhs(3,5)= lhs(3,5) - coeff*lhs(4,5)
-      r(3)   = r(3)   - coeff*r(4)
-
-      coeff = lhs(5,4)
-      lhs(5,5)= lhs(5,5) - coeff*lhs(4,5)
-      r(5)   = r(5)   - coeff*r(4)
-
-
-      pivot = 1.00d0/lhs(5,5)
-      r(5)   = r(5)  *pivot
-
-      coeff = lhs(1,5)
-      r(1)   = r(1)   - coeff*r(5)
-
-      coeff = lhs(2,5)
-      r(2)   = r(2)   - coeff*r(5)
-
-      coeff = lhs(3,5)
-      r(3)   = r(3)   - coeff*r(5)
-
-      coeff = lhs(4,5)
-      r(4)   = r(4)   - coeff*r(5)
-
-
-      return
-      end
-
-
-
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine x_solve
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     
-c     Performs line solves in X direction by first factoring
-c     the block-tridiagonal matrix into an upper triangular matrix, 
-c     and then performing back substitution to solve for the unknow
-c     vectors of each line.  
-c     
-c     Make sure we treat elements zero to cell_size in the direction
-c     of the sweep.
-c     
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer  c, istart, stage,
-     >     first, last, recv_id, error, r_status(MPI_STATUS_SIZE),
-     >     isize,jsize,ksize,send_id,k,j,i
-
-      istart = 0
-
-      if (timeron) call timer_start(t_xsolve)
-c---------------------------------------------------------------------
-c     in our terminology stage is the number of the cell in the x-direction
-c     i.e. stage = 1 means the start of the line stage=ncells means end
-c---------------------------------------------------------------------
-      call x_first()
-      do stage = 1,ncells
-         c = slice(1,stage)
-         isize = cell_size(1,c) - 1
-         jsize = cell_size(2,c) - 1
-         ksize = cell_size(3,c) - 1
-         
-c---------------------------------------------------------------------
-c     set last-cell flag
-c---------------------------------------------------------------------
-         if (stage .eq. ncells) then
-            last = 1
-         else
-            last = 0
-         endif
-
-         if (stage .eq. 1) then
-c---------------------------------------------------------------------
-c     This is the first cell, so solve without receiving data
-c---------------------------------------------------------------------
-            first = 1
-c            call lhsx(c)
-            call x_solve_cell(first,last,c)
-         else
-c---------------------------------------------------------------------
-c     Not the first cell of this line, so receive info from
-c     processor working on preceeding cell
-c---------------------------------------------------------------------
-            first = 0
-            if (timeron) call timer_start(t_xcomm)
-            call x_receive_solve_info(recv_id,c)
-c---------------------------------------------------------------------
-c     overlap computations and communications
-c---------------------------------------------------------------------
-c            call lhsx(c)
-c---------------------------------------------------------------------
-c     wait for completion
-c---------------------------------------------------------------------
-            call mpi_wait(send_id,r_status,error)
-            call mpi_wait(recv_id,r_status,error)
-            if (timeron) call timer_stop(t_xcomm)
-c---------------------------------------------------------------------
-c     install C'(istart) and rhs'(istart) to be used in this cell
-c---------------------------------------------------------------------
-            call x_unpack_solve_info(c)
-            call x_solve_cell(first,last,c)
-         endif
-
-         if (last .eq. 0) call x_send_solve_info(send_id,c)
-      enddo
-c---------------------------------------------------------------------
-c     now perform backsubstitution in reverse direction
-c---------------------------------------------------------------------
-      do stage = ncells, 1, -1
-         c = slice(1,stage)
-         first = 0
-         last = 0
-         if (stage .eq. 1) first = 1
-         if (stage .eq. ncells) then
-            last = 1
-c---------------------------------------------------------------------
-c     last cell, so perform back substitute without waiting
-c---------------------------------------------------------------------
-            call x_backsubstitute(first, last,c)
-         else
-            if (timeron) call timer_start(t_xcomm)
-            call x_receive_backsub_info(recv_id,c)
-            call mpi_wait(send_id,r_status,error)
-            call mpi_wait(recv_id,r_status,error)
-            if (timeron) call timer_stop(t_xcomm)
-            call x_unpack_backsub_info(c)
-            call x_backsubstitute(first,last,c)
-         endif
-         if (first .eq. 0) call x_send_backsub_info(send_id,c)
-      enddo
-      if (timeron) call timer_stop(t_xsolve)
-
-      return
-      end
-      
-      
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine x_unpack_solve_info(c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     unpack C'(-1) and rhs'(-1) for
-c     all j and k
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      integer j,k,m,n,ptr,c,istart
-
-      istart = 0
-      ptr = 0
-!DVM$ actual(out_buffer)
-!DVM$ region
-!DVM$ PARALLEL(k,j), PRIVATE(ptr,m,n), 
-!DVM$& TIE(lhsc(*,*,*,j,k,*), rhs(*,*,j,k,c))
-      do k=0,KMAX-1
-       do j=0,JMAX-1
-        ptr = (k * JMAX + J) * (BLOCK_SIZE +BLOCK_SIZE*BLOCK_SIZE)
-        do m=1,BLOCK_SIZE
-          do n=1,BLOCK_SIZE
-           lhsc(m,n,istart-1,j,k,c) = out_buffer(ptr+n+(m-1)*BLOCK_SIZE)
-          enddo               
-        enddo
-		
-        do n=1,BLOCK_SIZE
-         rhs(n,istart-1,j,k,c) = out_buffer(ptr+n+BLOCK_SIZE*BLOCK_SIZE)
-        enddo
-       enddo
-      enddo
-!DVM$ end region
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine x_send_solve_info(send_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     pack up and send C'(iend) and rhs'(iend) for
-c     all j and k
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer j,k,m,n,isize,ptr,c,jp,kp
-      integer error,send_id,buffer_size 
-
-      isize = cell_size(1,c)-1
-      jp = cell_coord(2,c) - 1
-      kp = cell_coord(3,c) - 1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*
-     >     (BLOCK_SIZE*BLOCK_SIZE + BLOCK_SIZE)
-
-c---------------------------------------------------------------------
-c     pack up buffer
-c---------------------------------------------------------------------
-      ptr = 0
-!DVM$ region out(in_buffer)  
-!DVM$ PARALLEL(k,j), PRIVATE(ptr,m,n), 
-!DVM$& TIE(lhsc(*,*,*,j,k,*), rhs(*,*,j,k,c))	  
-      do k=0,KMAX-1
-       do j=0,JMAX-1
-        ptr = (k * JMAX + J) * (BLOCK_SIZE +BLOCK_SIZE*BLOCK_SIZE)	   
-        do m=1,BLOCK_SIZE
-         do n=1,BLOCK_SIZE
-          in_buffer(ptr+n+(m-1)*BLOCK_SIZE) = lhsc(m,n,isize,j,k,c)
-         enddo
-!               ptr = ptr+BLOCK_SIZE
-         enddo
-         do n=1,BLOCK_SIZE
-          in_buffer(ptr+n+BLOCK_SIZE*BLOCK_SIZE) = rhs(n,isize,j,k,c)
-         enddo
-!          ptr = ptr+BLOCK_SIZE
-       enddo
-      enddo
-!DVM$ end region
-!DVM$ get_actual(in_buffer)	  
-c---------------------------------------------------------------------
-c     send buffer 
-c---------------------------------------------------------------------
-      if (timeron) call timer_start(t_xcomm)
-      call mpi_isend(in_buffer, buffer_size,
-     >     dp_type, successor(1),
-     >     WEST+jp+kp*NCELLS, comm_solve,
-     >     send_id,error)
-      if (timeron) call timer_stop(t_xcomm)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine x_send_backsub_info(send_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     pack up and send U(istart) for all j and k
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer j,k,n,ptr,c,istart,jp,kp
-      integer error,send_id,buffer_size
-
-c---------------------------------------------------------------------
-c     Send element 0 to previous processor
-c---------------------------------------------------------------------
-      istart = 0
-      jp = cell_coord(2,c)-1
-      kp = cell_coord(3,c)-1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*BLOCK_SIZE
-      ptr = 0
-	  
-!DVM$ region out(in_buffer)
-!DVM$ PARALLEL(k,j), PRIVATE(n,ptr),
-!DVM$& TIE(rhs(*,*,j,k,*))
-      do k=0,KMAX-1
-         do j=0,JMAX-1
-		    ptr = (k * JMAX + j) * BLOCK_SIZE		 
-            do n=1,BLOCK_SIZE
-               in_buffer(ptr+n) = rhs(n,istart,j,k,c)
-            enddo
-         enddo
-      enddo
-!DVM$ end region
-!DVM$ get_actual(in_buffer)
-
-      if (timeron) call timer_start(t_xcomm)
-      call mpi_isend(in_buffer, buffer_size,
-     >     dp_type, predecessor(1), 
-     >     EAST+jp+kp*NCELLS, comm_solve, 
-     >     send_id,error)
-      if (timeron) call timer_stop(t_xcomm)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine x_unpack_backsub_info(c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     unpack U(isize) for all j and k
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      integer j,k,n,ptr,c
-
-      ptr = 0
-	  
-!DVM$ actual(out_buffer)
-	  
-!DVM$ region out(backsub_info)	  
-!DVM$ PARALLEL(k,j), PRIVATE(n,ptr),
-!DVM$& TIE(backsub_info(*,j,k,*))
-      do k=0,KMAX-1
-         do j=0,JMAX-1
-		    ptr = (k * JMAX + j) * BLOCK_SIZE
-            do n=1,BLOCK_SIZE
-               backsub_info(n,j,k,c) = out_buffer(ptr+n)
-            enddo
-         enddo
-      enddo
-!DVM$ end region
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine x_receive_backsub_info(recv_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     post mpi receives
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer error,recv_id,jp,kp,c,buffer_size
-      jp = cell_coord(2,c) - 1
-      kp = cell_coord(3,c) - 1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*BLOCK_SIZE
-      call mpi_irecv(out_buffer, buffer_size,
-     >     dp_type, successor(1), 
-     >     EAST+jp+kp*NCELLS, comm_solve, 
-     >     recv_id, error)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine x_receive_solve_info(recv_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     post mpi receives 
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer jp,kp,recv_id,error,c,buffer_size
-      jp = cell_coord(2,c) - 1
-      kp = cell_coord(3,c) - 1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*
-     >     (BLOCK_SIZE*BLOCK_SIZE + BLOCK_SIZE)
-      call mpi_irecv(out_buffer, buffer_size,
-     >     dp_type, predecessor(1), 
-     >     WEST+jp+kp*NCELLS,  comm_solve, 
-     >     recv_id, error)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine x_backsubstitute(first, last, c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     back solve: if last cell, then generate U(isize)=rhs(isize)
-c     else assume U(isize) is loaded in un pack backsub_info
-c     so just use it
-c     after call u(istart) will be sent to next cell
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer first, last, c, i, j, k
-      integer m,n,isize,jsize,ksize,istart
-      
-      istart = 0
-      isize = cell_size(1,c)-1
-      jsize = cell_size(2,c)-end(2,c)-1      
-      ksize = cell_size(3,c)-end(3,c)-1
-      if (last .eq. 0) then
-
-!1$omp parallel do private(k,j,m,n) collapse(2)	  
-
-!DVM$ region	  
-!DVM$ PARALLEL(k,j), PRIVATE(k,j,m,n),
-!DVM$& TIE(lhsc(*,*,*,j,k,*), rhs(*,*,j,k,*),backsub_info(*,j,k,*))
-         do k=start(3,c),ksize
-            do j=start(2,c),jsize
-c---------------------------------------------------------------------
-c     U(isize) uses info from previous cell if not last cell
-c---------------------------------------------------------------------
-               do m=1,BLOCK_SIZE
-                  do n=1,BLOCK_SIZE
-                     rhs(m,isize,j,k,c) = rhs(m,isize,j,k,c) 
-     >                    - lhsc(m,n,isize,j,k,c)*
-     >                    backsub_info(n,j,k,c)
-c---------------------------------------------------------------------
-c     rhs(m,isize,j,k,c) = rhs(m,isize,j,k,c) 
-c     $                    - lhsc(m,n,isize,j,k,c)*rhs(n,isize+1,j,k,c)
-c---------------------------------------------------------------------
-                  enddo
-               enddo
-            enddo
-         enddo
-!DVM$ end region		 
-      endif
-
-!1$omp parallel do private(k,j,i,m,n) collapse(2)
-
-!DVM$ region	  
-!DVM$ PARALLEL(k,j), PRIVATE(k,j,i,m,n),
-!DVM$& TIE(lhsc(*,*,*,j,k,*), rhs(*,*,j,k,*))
-      do k=start(3,c),ksize
-         do j=start(2,c),jsize
-            do i=isize-1,istart,-1
-               do m=1,BLOCK_SIZE
-                  do n=1,BLOCK_SIZE
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) 
-     >                    - lhsc(m,n,i,j,k,c)*rhs(n,i+1,j,k,c)
-                  enddo
-               enddo
-            enddo
-         enddo
-      enddo
-!DVM$ end region
-      return
-      end
-
-      pure subroutine fjac_x_solve(fjac,u_,rho_i_,qs_,c1,c2)
-	  implicit none
-	  INTENT (out) :: fjac
-	  INTENT (in) :: u_,rho_i_,qs_,c1,c2
-	  double precision fjac(5,5),tmp1,tmp2,u_(5),rho_i_,qs_
-	  double precision c1,c2
-	           tmp1 = rho_i_
-               tmp2 = tmp1 * tmp1
-			   
-               fjac(1,1) = 0.0d+00
-               fjac(1,2) = 1.0d+00
-               fjac(1,3) = 0.0d+00
-               fjac(1,4) = 0.0d+00
-               fjac(1,5) = 0.0d+00
-
-               fjac(2,1) = -(u_(2) * tmp2 * u_(2)) + c2 * qs_
-               fjac(2,2) = ( 2.0d+00 - c2 ) * ( u_(2) * tmp1 )
-               fjac(2,3) = - c2 * ( u_(3) * tmp1 )
-               fjac(2,4) = - c2 * ( u_(4) * tmp1 )
-               fjac(2,5) = c2
-
-               fjac(3,1) = - (u_(2)*u_(3)) * tmp2
-               fjac(3,2) = u_(3) * tmp1
-               fjac(3,3) = u_(2) * tmp1
-               fjac(3,4) = 0.0d+00
-               fjac(3,5) = 0.0d+00
-
-               fjac(4,1) = - ( u_(2)*u_(4) ) * tmp2
-               fjac(4,2) = u_(4) * tmp1
-               fjac(4,3) = 0.0d+00
-               fjac(4,4) = u_(2) * tmp1
-               fjac(4,5) = 0.0d+00
-
-               fjac(5,1) = ( c2 * 2.0d0 * qs_
-     >              - c1 * ( u_(5) * tmp1)) * (u_(2) * tmp1)
-               fjac(5,2) = c1 *  u_(5) * tmp1 - c2
-     >              * ( u_(2)*u_(2) * tmp2 + qs_ )
-               fjac(5,3) = - c2 * ( u_(3)*u_(2) )* tmp2
-               fjac(5,4) = - c2 * ( u_(4)*u_(2) )* tmp2
-               fjac(5,5) = c1 * ( u_(2) * tmp1 )	  
-	  end
-	  
-      pure subroutine njac_x_solve(njac,u,rho_i,con43,c3c4,c1345)
-	  implicit none
-	  INTENT (out) :: njac
-	  INTENT (in) :: u,rho_i,con43,c3c4,c1345
-	  double precision njac(5,5),tmp1,tmp2,tmp3,rho_i,u(5)
-	  double precision con43,c3c4,c1345
-      	  
-	           tmp1 = rho_i
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2 
-			   
-               njac(1,1) = 0.0d+00
-               njac(1,2) = 0.0d+00
-               njac(1,3) = 0.0d+00
-               njac(1,4) = 0.0d+00
-               njac(1,5) = 0.0d+00
-
-               njac(2,1) = - con43 * c3c4 * tmp2 * u(2)
-               njac(2,2) =   con43 * c3c4 * tmp1
-               njac(2,3) =   0.0d+00
-               njac(2,4) =   0.0d+00
-               njac(2,5) =   0.0d+00
-
-               njac(3,1) = - c3c4 * tmp2 * u(3)
-               njac(3,2) =   0.0d+00
-               njac(3,3) =   c3c4 * tmp1
-               njac(3,4) =   0.0d+00
-               njac(3,5) =   0.0d+00
-
-               njac(4,1) = - c3c4 * tmp2 * u(4)
-               njac(4,2) =   0.0d+00 
-               njac(4,3) =   0.0d+00
-               njac(4,4) =   c3c4 * tmp1
-               njac(4,5) =   0.0d+00
-
-               njac(5,1) = - ( con43 * c3c4
-     >              - c1345 ) * tmp3 * (u(2)**2)
-     >              - ( c3c4 - c1345 ) * tmp3 * (u(3)**2)
-     >              - ( c3c4 - c1345 ) * tmp3 * (u(4)**2)
-     >              - c1345 * tmp2 * u(5)
-
-               njac(5,2) = ( con43 * c3c4
-     >              - c1345 ) * tmp2 * u(2)
-               njac(5,3) = ( c3c4 - c1345 ) * tmp2 * u(3)
-               njac(5,4) = ( c3c4 - c1345 ) * tmp2 * u(4)
-               njac(5,5) = ( c1345 ) * tmp1 
-	  end	 
-
-      pure subroutine lhsa_x_solve(lhsa,u_,rho_i_,qs_,
-     >dt,dx1,dx2,dx3,dx4,dx5,c1,c2,con43,c3c4,c1345,tx1,tx2)
-	  implicit none
-	  
-	 INTENT (out) :: lhsa
-	 INTENT (in) :: u_,rho_i_,qs_
-	 INTENT(in)::dt,dx1,dx2,dx3,dx4,dx5,c1,c2,con43,c3c4,c1345,tx1,tx2
-	  
-	  double precision lhsa(5,5),tmp1,tmp2,rho_i_,qs_
-	  double precision fjac_(5,5,1),njac_(5,5,1),u_(5),tx1,tx2
-	  double precision dt,dx1,dx2,dx3,dx4,dx5,c1,c2,con43,c3c4,c1345
-	  interface 
-	    pure subroutine fjac_x_solve(fjac,u_,rho_i_,qs_,c1,c2)
-		INTENT (out) :: fjac
-		INTENT (in) :: rho_i_,qs_,u_,c1,c2
-		double precision fjac(5,5),tmp1,tmp2,tmp3,u_(5)
-		double precision rho_i_,qs_,c1,c2
-		end subroutine
-		  
-	    pure subroutine njac_x_solve(njac,u_,rho_i_,con43,c3c4,c1345)		 
-		INTENT (out) :: njac
-		INTENT (in) :: u_,rho_i_,con43,c3c4,c1345
-		double precision njac(5,5),tmp1,tmp2,tmp3
-		double precision u_(5),rho_i_,con43,c3c4,c1345
-		end subroutine		  
-	  end interface
-	  
-               tmp1 = dt * tx1
-               tmp2 = dt * tx2
-			   
-           call fjac_x_solve(fjac_(1,1,1),u_,rho_i_,qs_,c1,c2)
-	       call njac_x_solve(njac_(1,1,1),u_,rho_i_,con43,c3c4,c1345)
-			   
-               lhsa(1,1) = - tmp2 * fjac_(1,1,1)
-     >              - tmp1 * njac_(1,1,1)
-     >              - tmp1 * dx1 
-               lhsa(1,2) = - tmp2 * fjac_(1,2,1)
-     >              - tmp1 * njac_(1,2,1)
-               lhsa(1,3) = - tmp2 * fjac_(1,3,1)
-     >              - tmp1 * njac_(1,3,1)
-               lhsa(1,4) = - tmp2 * fjac_(1,4,1)
-     >              - tmp1 * njac_(1,4,1)
-               lhsa(1,5) = - tmp2 * fjac_(1,5,1)
-     >              - tmp1 * njac_(1,5,1)
-
-               lhsa(2,1) = - tmp2 * fjac_(2,1,1)
-     >              - tmp1 * njac_(2,1,1)
-               lhsa(2,2) = - tmp2 * fjac_(2,2,1)
-     >              - tmp1 * njac_(2,2,1)
-     >              - tmp1 * dx2
-               lhsa(2,3) = - tmp2 * fjac_(2,3,1)
-     >              - tmp1 * njac_(2,3,1)
-               lhsa(2,4) = - tmp2 * fjac_(2,4,1)
-     >              - tmp1 * njac_(2,4,1)
-               lhsa(2,5) = - tmp2 * fjac_(2,5,1)
-     >              - tmp1 * njac_(2,5,1)
-
-               lhsa(3,1) = - tmp2 * fjac_(3,1,1)
-     >              - tmp1 * njac_(3,1,1)
-               lhsa(3,2) = - tmp2 * fjac_(3,2,1)
-     >              - tmp1 * njac_(3,2,1)
-               lhsa(3,3) = - tmp2 * fjac_(3,3,1)
-     >              - tmp1 * njac_(3,3,1)
-     >              - tmp1 * dx3 
-               lhsa(3,4) = - tmp2 * fjac_(3,4,1)
-     >              - tmp1 * njac_(3,4,1)
-               lhsa(3,5) = - tmp2 * fjac_(3,5,1)
-     >              - tmp1 * njac_(3,5,1)
-
-               lhsa(4,1) = - tmp2 * fjac_(4,1,1)
-     >              - tmp1 * njac_(4,1,1)
-               lhsa(4,2) = - tmp2 * fjac_(4,2,1)
-     >              - tmp1 * njac_(4,2,1)
-               lhsa(4,3) = - tmp2 * fjac_(4,3,1)
-     >              - tmp1 * njac_(4,3,1)
-               lhsa(4,4) = - tmp2 * fjac_(4,4,1)
-     >              - tmp1 * njac_(4,4,1)
-     >              - tmp1 * dx4
-               lhsa(4,5) = - tmp2 * fjac_(4,5,1)
-     >              - tmp1 * njac_(4,5,1)
-
-               lhsa(5,1) = - tmp2 * fjac_(5,1,1)
-     >              - tmp1 * njac_(5,1,1)
-               lhsa(5,2) = - tmp2 * fjac_(5,2,1)
-     >              - tmp1 * njac_(5,2,1)
-               lhsa(5,3) = - tmp2 * fjac_(5,3,1)
-     >              - tmp1 * njac_(5,3,1)
-               lhsa(5,4) = - tmp2 * fjac_(5,4,1)
-     >              - tmp1 * njac_(5,4,1)
-               lhsa(5,5) = - tmp2 * fjac_(5,5,1)
-     >              - tmp1 * njac_(5,5,1)
-     >              - tmp1 * dx5
-	  end	  
-	  
-      pure subroutine lhsb_x_solve(lhsb,u_,rho_i_,
-     >dt,tx1,dx1,dx2,dx3,dx4,dx5,con43,c3c4,c1345)
-      implicit none
-	  INTENT (out) :: lhsb
-	  INTENT (in) :: u_,rho_i_
-	  INTENT (in)::dt,tx1,dx1,dx2,dx3,dx4,dx5,con43,c3c4,c1345
-	  double precision lhsb(5,5),tmp1,njac_(5,5,2:2)
-	  double precision u_(5),rho_i_
-	  double precision dt,tx1,dx1,dx2,dx3,dx4,dx5,con43,c3c4,c1345
-	  interface 	      
-	    pure subroutine njac_x_solve(njac,u_,rho_i_,con43,c3c4,c1345)		 
-		INTENT (out) :: njac
-		INTENT (in) :: u_,rho_i_,con43,c3c4,c1345
-		double precision njac(5,5),tmp1,tmp2,tmp3
-		double precision u_(5),rho_i_,con43,c3c4,c1345
-		end subroutine			  
-	  end interface
-	  
-               tmp1 = dt * tx1
-
-			call njac_x_solve(njac_(1,1,2),u_,rho_i_,con43,c3c4,c1345)
-			   
-               lhsb(1,1) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(1,1,2)
-     >              + tmp1 * 2.0d+00 * dx1
-               lhsb(1,2) = tmp1 * 2.0d+00 * njac_(1,2,2)
-               lhsb(1,3) = tmp1 * 2.0d+00 * njac_(1,3,2)
-               lhsb(1,4) = tmp1 * 2.0d+00 * njac_(1,4,2)
-               lhsb(1,5) = tmp1 * 2.0d+00 * njac_(1,5,2)
-
-               lhsb(2,1) = tmp1 * 2.0d+00 * njac_(2,1,2)
-               lhsb(2,2) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(2,2,2)
-     >              + tmp1 * 2.0d+00 * dx2
-               lhsb(2,3) = tmp1 * 2.0d+00 * njac_(2,3,2)
-               lhsb(2,4) = tmp1 * 2.0d+00 * njac_(2,4,2)
-               lhsb(2,5) = tmp1 * 2.0d+00 * njac_(2,5,2)
-
-               lhsb(3,1) = tmp1 * 2.0d+00 * njac_(3,1,2)
-               lhsb(3,2) = tmp1 * 2.0d+00 * njac_(3,2,2)
-               lhsb(3,3) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(3,3,2)
-     >              + tmp1 * 2.0d+00 * dx3
-               lhsb(3,4) = tmp1 * 2.0d+00 * njac_(3,4,2)
-               lhsb(3,5) = tmp1 * 2.0d+00 * njac_(3,5,2)
-
-               lhsb(4,1) = tmp1 * 2.0d+00 * njac_(4,1,2)
-               lhsb(4,2) = tmp1 * 2.0d+00 * njac_(4,2,2)
-               lhsb(4,3) = tmp1 * 2.0d+00 * njac_(4,3,2)
-               lhsb(4,4) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(4,4,2)
-     >              + tmp1 * 2.0d+00 * dx4
-               lhsb(4,5) = tmp1 * 2.0d+00 * njac_(4,5,2)
-
-               lhsb(5,1) = tmp1 * 2.0d+00 * njac_(5,1,2)
-               lhsb(5,2) = tmp1 * 2.0d+00 * njac_(5,2,2)
-               lhsb(5,3) = tmp1 * 2.0d+00 * njac_(5,3,2)
-               lhsb(5,4) = tmp1 * 2.0d+00 * njac_(5,4,2)
-               lhsb(5,5) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(5,5,2)
-     >              + tmp1 * 2.0d+00 * dx5
-	  end	 
-
-      pure subroutine lhsc_x_solve(lhsc,u_,rho_i_,qs_,
-     >dt,dx1,dx2,dx3,dx4,dx5,c1,c2,con43,c3c4,c1345,tx1,tx2)
-	  implicit none
-	  
-	 INTENT (out) :: lhsc
-	 INTENT (in) :: u_,rho_i_,qs_
-	 INTENT(in)::dt,dx1,dx2,dx3,dx4,dx5,c1,c2,con43,c3c4,c1345,tx1,tx2
-	  
-	  double precision lhsc(5,5),tmp1,tmp2,rho_i_,qs_
-	  double precision fjac_(5,5,2:2),njac_(5,5,3:3),u_(5),tx1,tx2
-	  double precision dt,dx1,dx2,dx3,dx4,dx5,c1,c2,con43,c3c4,c1345
-	  interface 
-	    pure subroutine fjac_x_solve(fjac,u_,rho_i_,qs_,c1,c2)
-		INTENT (out) :: fjac
-		INTENT (in) :: rho_i_,qs_,u_,c1,c2
-		double precision fjac(5,5),tmp1,tmp2,tmp3,u_(5)
-		double precision rho_i_,qs_,c1,c2
-		end subroutine
-		  
-	    pure subroutine njac_x_solve(njac,u_,rho_i_,con43,c3c4,c1345)		 
-		INTENT (out) :: njac
-		INTENT (in) :: u_,rho_i_,con43,c3c4,c1345
-		double precision njac(5,5),tmp1,tmp2,tmp3
-		double precision u_(5),rho_i_,con43,c3c4,c1345
-		end subroutine		  
-	  end interface
-	  
-               tmp1 = dt * tx1
-               tmp2 = dt * tx2
-
-           call fjac_x_solve(fjac_(1,1,2),u_,rho_i_,qs_,c1,c2)
-	       call njac_x_solve(njac_(1,1,3),u_,rho_i_,con43,c3c4,c1345)
-		   
-               lhsc(1,1) =  tmp2 * fjac_(1,1,2)
-     >              - tmp1 * njac_(1,1,3)
-     >              - tmp1 * dx1
-               lhsc(1,2) =  tmp2 * fjac_(1,2,2)
-     >              - tmp1 * njac_(1,2,3)
-               lhsc(1,3) =  tmp2 * fjac_(1,3,2)
-     >              - tmp1 * njac_(1,3,3)
-               lhsc(1,4) =  tmp2 * fjac_(1,4,2)
-     >              - tmp1 * njac_(1,4,3)
-               lhsc(1,5) =  tmp2 * fjac_(1,5,2)
-     >              - tmp1 * njac_(1,5,3)
-
-               lhsc(2,1) =  tmp2 * fjac_(2,1,2)
-     >              - tmp1 * njac_(2,1,3)
-               lhsc(2,2) =  tmp2 * fjac_(2,2,2)
-     >              - tmp1 * njac_(2,2,3)
-     >              - tmp1 * dx2
-               lhsc(2,3) =  tmp2 * fjac_(2,3,2)
-     >              - tmp1 * njac_(2,3,3)
-               lhsc(2,4) =  tmp2 * fjac_(2,4,2)
-     >              - tmp1 * njac_(2,4,3)
-               lhsc(2,5) =  tmp2 * fjac_(2,5,2)
-     >              - tmp1 * njac_(2,5,3)
-
-               lhsc(3,1) =  tmp2 * fjac_(3,1,2)
-     >              - tmp1 * njac_(3,1,3)
-               lhsc(3,2) =  tmp2 * fjac_(3,2,2)
-     >              - tmp1 * njac_(3,2,3)
-               lhsc(3,3) =  tmp2 * fjac_(3,3,2)
-     >              - tmp1 * njac_(3,3,3)
-     >              - tmp1 * dx3
-               lhsc(3,4) =  tmp2 * fjac_(3,4,2)
-     >              - tmp1 * njac_(3,4,3)
-               lhsc(3,5) =  tmp2 * fjac_(3,5,2)
-     >              - tmp1 * njac_(3,5,3)
-
-               lhsc(4,1) =  tmp2 * fjac_(4,1,2)
-     >              - tmp1 * njac_(4,1,3)
-               lhsc(4,2) =  tmp2 * fjac_(4,2,2)
-     >              - tmp1 * njac_(4,2,3)
-               lhsc(4,3) =  tmp2 * fjac_(4,3,2)
-     >              - tmp1 * njac_(4,3,3)
-               lhsc(4,4) =  tmp2 * fjac_(4,4,2)
-     >              - tmp1 * njac_(4,4,3)
-     >              - tmp1 * dx4
-               lhsc(4,5) =  tmp2 * fjac_(4,5,2)
-     >              - tmp1 * njac_(4,5,3)
-
-               lhsc(5,1) =  tmp2 * fjac_(5,1,2)
-     >              - tmp1 * njac_(5,1,3)
-               lhsc(5,2) =  tmp2 * fjac_(5,2,2)
-     >              - tmp1 * njac_(5,2,3)
-               lhsc(5,3) =  tmp2 * fjac_(5,3,2)
-     >              - tmp1 * njac_(5,3,3)
-               lhsc(5,4) =  tmp2 * fjac_(5,4,2)
-     >              - tmp1 * njac_(5,4,3)
-               lhsc(5,5) =  tmp2 * fjac_(5,5,2)
-     >              - tmp1 * njac_(5,5,3)
-     >              - tmp1 * dx5
-	  end	  
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine x_first()
-
-      include 'header.h'
-      include 'work_lhs.h'	  
-	  
-	  integer j,k
-	  
-!DVM$ region out(lhsc)
-!DVM$ PARALLEL(k,j), TIE(lhsc(*,*,*,j,k,*))
-      do k=0,1
-         do j=0,1
-		    if (j .eq. 2) lhsc(1,1,1,j,k,1) = 0
-		 enddo
-	  enddo
-!DVM$ end region	  
-	  end
-	  
-      subroutine x_solve_cell(first,last,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     performs guaussian elimination on this cell.
-c     
-c     assumes that unpacking routines for non-first cells 
-c     preload C' and rhs' from previous cell.
-c     
-c     assumed send happens outside this routine, but that
-c     c'(IMAX) and rhs'(IMAX) will be sent to next cell
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'work_lhs.h'
-
-      integer first,last,c,m,n
-      integer i,j,k,isize,ksize,jsize,istart
-      double precision fjac_(5,5,2:2),njac_(5,5,3:3),lhscP_(5,5)
-	  double precision diff(5,5),lhsa_(5,5),lhsb_(5,5),lhsc_(5,5)
-      double precision rhs_(5), rhsP_(5),qs_(0:3),u_(5),uP_(5),uM_(5)
-
-      interface 
-        pure subroutine matvec_sub(ablock,avec,bvec)      
-!DVM$ routine		
-         intent (inout)::ablock,avec,bvec
-         double precision ablock(5,5),avec(5),bvec(5)
-	    end 
-	  end interface
-	  
-      istart = 0
-      isize = cell_size(1,c)-1
-      jsize = cell_size(2,c)-end(2,c)-1
-      ksize = cell_size(3,c)-end(3,c)-1
-!      call lhsabinit(lhsa, lhsb, isize)
-
-!1$omp parallel do private(k,j),private(fjac_,njac_,lhsa_,lhsb_,
-!1$omp& tmp1,tmp2,tmp3,i) collapse(2)
-	  
-!DVM$ region
- 
-!DVM$ PARALLEL(k,j),PRIVATE(i,lhsa_,lhsb_,lhsc_,lhscP_,n,m,rhs_,rhsP_,
-!DVM$& qs_,u_,uP_,uM_)
-!DVM$& ,TIE(lhsc(*,*,*,j,k,*),u(*,*,j,k,*),qs(*,j,k,*)
-!DVM$& ,rhs(*,*,j,k,*))
-      do k=start(3,c),ksize 
-         do j=start(2,c),jsize             
-            do i=istart,isize
-			
-	         if (i.eq.istart) then 
-	   		   do m = 1, 5
- 				 do n = 1, 5
-				   lhscP_(m,n) = lhsc(m,n,i-1,j,k,c)				   
-				 enddo		
- 				 rhsP_(m) = rhs(m,i-1,j,k,c) 	
-				 uM_(m) = u(m,i-1,j,k,c)
-				 u_(m) = u(m,i,j,k,c)
-			   enddo			 
-               qs_(0) = qs(i-1,j,k,c)
-			   qs_(1) = qs(i,j,k,c)			   
-			 endif
-			 do m = 1, 5	
- 			   rhs_(m) = rhs(m,i,j,k,c) 			   
-			   uP_(m) = u(m,i+1,j,k,c)
-			 enddo			 
-			 qs_(2) = qs(i+1,j,k,c)
-			   if (i .eq. istart .and. first .eq. 1) then
-				 do m = 1, 5
-					do n = 1, 5
-					   lhsb_(m,n) = 0.0d0
-				       lhsc_(m,n) = 0.0d0					   
-					enddo
-					lhsb_(m,m) = 1.0d0
-				 enddo					   
-			     call binvcrhs(lhsb_,lhsc_,rhs_)
-	             
-			   else if (i .eq. isize .and. last .eq. 1) then           
-				 do m = 1, 5
-					do n = 1, 5
-					   lhsa_(m,n) = 0.0d0
-					   lhsb_(m,n) = 0.0d0
-					enddo
-					lhsb_(m,m) = 1.0d0
-				 enddo				
-				 
-                call matvec_sub(lhsa_,rhsP_,rhs_)
-                call matmul_sub(lhsa_,lhscP_,lhsb_)
-                call binvrhs(lhsb_,rhs_)
-	 
-			   else
-			   
-          call lhsa_x_solve(lhsa_,uM_,1.0d0/uM_(1),
-     >                          qs_(0),dt,dx1,dx2,dx3,
-     >                         dx4,dx5,c1,c2,con43,c3c4,c1345,tx1,tx2)
-	      call lhsb_x_solve(lhsb_,u_,1.0d0/u_(1),
-     >                   dt,tx1,dx1,dx2,dx3,dx4,dx5,con43,c3c4,c1345)	 
-          call lhsc_x_solve(lhsc_,uP_,1.0d0/uP_(1),
-     >                          qs_(2),dt,dx1,dx2,dx3,
-     >                         dx4,dx5,c1,c2,con43,c3c4,c1345,tx1,tx2)	
-	 
-                call matvec_sub(lhsa_,rhsP_,rhs_)
-                call matmul_sub(lhsa_,lhscP_,lhsb_)
-                call binvcrhs(lhsb_,lhsc_,rhs_)
-				
-	           endif
-			   
-	   		   do m = 1, 5
- 				 do n = 1, 5
-				   lhscP_(m,n) = lhsc_(m,n)
-				 enddo	
-				 rhs(m,i-1,j,k,c) = rhsP_(m)
-                 rhsP_(m) = rhs_(m)			
-			     uM_(m)=u_(m)
-				 u_(m)=uP_(m)				 
-			   enddo
-			   
-              if (.not. (i .eq. isize .and. last .eq. 1)) then
-	   		   do m = 1, 5
- 				 do n = 1, 5
-				   lhsc(m,n,i,j,k,c) = lhsc_(m,n)
-				 enddo				 
-			   enddo
-			  endif
-			  qs_(0) = qs_(1)
-			  qs_(1) = qs_(2)
-			  if (i.eq.isize) then 
-	   		   do m = 1, 5
-			     rhs(m,i,j,k,c) = rhs_(m)	                 
-			   enddo			
-              endif				  
-            enddo			
-         enddo
-      enddo
-!DVM$ end region
-      return
-      end
-      
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine z_solve
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     Performs line solves in Z direction by first factoring
-c     the block-tridiagonal matrix into an upper triangular matrix, 
-c     and then performing back substitution to solve for the unknow
-c     vectors of each line.  
-c     
-c     Make sure we treat elements zero to cell_size in the direction
-c     of the sweep.
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer c, kstart, stage,
-     >     first, last, recv_id, error, r_status(MPI_STATUS_SIZE),
-     >     isize,jsize,ksize,send_id
-
-      kstart = 0
-
-      if (timeron) call timer_start(t_zsolve)
-c---------------------------------------------------------------------
-c     in our terminology stage is the number of the cell in the y-direction
-c     i.e. stage = 1 means the start of the line stage=ncells means end
-c---------------------------------------------------------------------
-      call z_first()
-      do stage = 1,ncells
-         c = slice(3,stage)
-         isize = cell_size(1,c) - 1
-         jsize = cell_size(2,c) - 1
-         ksize = cell_size(3,c) - 1
-c---------------------------------------------------------------------
-c     set last-cell flag
-c---------------------------------------------------------------------
-         if (stage .eq. ncells) then
-            last = 1
-         else
-            last = 0
-         endif
-
-         if (stage .eq. 1) then
-c---------------------------------------------------------------------
-c     This is the first cell, so solve without receiving data
-c---------------------------------------------------------------------
-            first = 1
-c            call lhsz(c)
-            call z_solve_cell(first,last,c)
-         else
-c---------------------------------------------------------------------
-c     Not the first cell of this line, so receive info from
-c     processor working on preceeding cell
-c---------------------------------------------------------------------
-            first = 0
-            if (timeron) call timer_start(t_zcomm)
-            call z_receive_solve_info(recv_id,c)
-c---------------------------------------------------------------------
-c     overlap computations and communications
-c---------------------------------------------------------------------
-c            call lhsz(c)
-c---------------------------------------------------------------------
-c     wait for completion
-c---------------------------------------------------------------------
-            call mpi_wait(send_id,r_status,error)
-            call mpi_wait(recv_id,r_status,error)
-            if (timeron) call timer_stop(t_zcomm)
-c---------------------------------------------------------------------
-c     install C'(kstart+1) and rhs'(kstart+1) to be used in this cell
-c---------------------------------------------------------------------
-            call z_unpack_solve_info(c)
-            call z_solve_cell(first,last,c)
-         endif
-
-         if (last .eq. 0) call z_send_solve_info(send_id,c)
-      enddo
-
-c---------------------------------------------------------------------
-c     now perform backsubstitution in reverse direction
-c---------------------------------------------------------------------
-      do stage = ncells, 1, -1
-         c = slice(3,stage)
-         first = 0
-         last = 0
-         if (stage .eq. 1) first = 1
-         if (stage .eq. ncells) then
-            last = 1
-c---------------------------------------------------------------------
-c     last cell, so perform back substitute without waiting
-c---------------------------------------------------------------------
-            call z_backsubstitute(first, last,c)
-         else
-            if (timeron) call timer_start(t_zcomm)
-            call z_receive_backsub_info(recv_id,c)
-            call mpi_wait(send_id,r_status,error)
-            call mpi_wait(recv_id,r_status,error)
-            if (timeron) call timer_stop(t_zcomm)
-            call z_unpack_backsub_info(c)
-            call z_backsubstitute(first,last,c)
-         endif
-         if (first .eq. 0) call z_send_backsub_info(send_id,c)
-      enddo
-
-      if (timeron) call timer_stop(t_zsolve)
-
-      return
-      end
-      
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine z_unpack_solve_info(c)
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     unpack C'(-1) and rhs'(-1) for
-c     all i and j
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer i,j,m,n,ptr,c,kstart 
-
-      kstart = 0
-      ptr = 0
-!DVM$ actual(out_buffer)
-	  
-!DVM$ region 
-!DVM$ PARALLEL(j,i), PRIVATE(ptr,m,n), 
-!DVM$& TIE(rhs(*,i,j,*,*),lhsc(*,*,i,j,*,*))	  	  
-      do j=0,JMAX-1
-         do i=0,IMAX-1
-            ptr = (j * IMAX + I) * (BLOCK_SIZE+BLOCK_SIZE*BLOCK_SIZE)	   		 		 
-            do m=1,BLOCK_SIZE
-               do n=1,BLOCK_SIZE
-         lhsc(m,n,i,j,kstart-1,c) = out_buffer(ptr+n+(m-1)*BLOCK_SIZE)
-               enddo               
-            enddo
-            do n=1,BLOCK_SIZE
-        rhs(n,i,j,kstart-1,c) = out_buffer(ptr+n+BLOCK_SIZE*BLOCK_SIZE)
-            enddo
-         enddo
-      enddo
-!DVM$ end region
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine z_send_solve_info(send_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     pack up and send C'(kend) and rhs'(kend) for
-c     all i and j
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer i,j,m,n,ksize,ptr,c,ip,jp
-      integer error,send_id,buffer_size
-
-      ksize = cell_size(3,c)-1
-      ip = cell_coord(1,c) - 1
-      jp = cell_coord(2,c) - 1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*
-     >     (BLOCK_SIZE*BLOCK_SIZE + BLOCK_SIZE)
-
-c---------------------------------------------------------------------
-c     pack up buffer
-c---------------------------------------------------------------------
- 	  
-      ptr = 0
-!DVM$ region out(in_buffer)	  
-!DVM$ PARALLEL(j,i), PRIVATE(ptr,m,n), 
-!DVM$& TIE(rhs(*,i,j,*,*),lhsc(*,*,i,j,*,*))	  
-      do j=0,JMAX-1
-         do i=0,IMAX-1
-            ptr = (j * IMAX + I) * (BLOCK_SIZE+BLOCK_SIZE*BLOCK_SIZE)	   		 
-            do m=1,BLOCK_SIZE
-               do n=1,BLOCK_SIZE
-              in_buffer(ptr+n+(m-1)*BLOCK_SIZE) = lhsc(m,n,i,j,ksize,c)
-               enddo
-!               ptr = ptr+BLOCK_SIZE
-            enddo
-            do n=1,BLOCK_SIZE
-            in_buffer(ptr+n+BLOCK_SIZE*BLOCK_SIZE) = rhs(n,i,j,ksize,c)
-            enddo
-!            ptr = ptr+BLOCK_SIZE
-         enddo
-      enddo
-!DVM$ end region
-
-!DVM$ get_actual(in_buffer)
-c---------------------------------------------------------------------
-c     send buffer 
-c---------------------------------------------------------------------
-      if (timeron) call timer_start(t_zcomm)
-      call mpi_isend(in_buffer, buffer_size,
-     >     dp_type, successor(3),
-     >     BOTTOM+ip+jp*NCELLS, comm_solve,
-     >     send_id,error)
-      if (timeron) call timer_stop(t_zcomm)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine z_send_backsub_info(send_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     pack up and send U(jstart) for all i and j
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer i,j,n,ptr,c,kstart,ip,jp
-      integer error,send_id,buffer_size
-
-c---------------------------------------------------------------------
-c     Send element 0 to previous processor
-c---------------------------------------------------------------------
-      kstart = 0
-      ip = cell_coord(1,c)-1
-      jp = cell_coord(2,c)-1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*BLOCK_SIZE
-      ptr = 0
-
-!DVM$ region out(in_buffer)
-!DVM$ PARALLEL(j,i), PRIVATE(n,ptr),TIE(rhs(*,i,j,*,*))
-      do j=0,JMAX-1
-         do i=0,IMAX-1
-		    ptr=(j*IMAX+i)*BLOCK_SIZE		 
-            do n=1,BLOCK_SIZE
-               in_buffer(ptr+n) = rhs(n,i,j,kstart,c)
-            enddo
-         enddo
-      enddo
-!DVM$ end region
-
-!DVM$ get_actual(in_buffer)
-      if (timeron) call timer_start(t_zcomm)
-      call mpi_isend(in_buffer, buffer_size,
-     >     dp_type, predecessor(3), 
-     >     TOP+ip+jp*NCELLS, comm_solve, 
-     >     send_id,error)
-      if (timeron) call timer_stop(t_zcomm)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine z_unpack_backsub_info(c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     unpack U(ksize) for all i and j
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer i,j,n,ptr,c
-
-      ptr = 0
-!DVM$ actual(out_buffer)
-
-!DVM$ region out(backsub_info)
-!DVM$ PARALLEL(j,i), PRIVATE(ptr,n),TIE(backsub_info(*,i,j,*))	  
-      do j=0,JMAX-1
-         do i=0,IMAX-1
-		    ptr=(j*IMAX+i)*BLOCK_SIZE
-            do n=1,BLOCK_SIZE
-               backsub_info(n,i,j,c) = out_buffer(ptr+n)
-            enddo
-         enddo
-      enddo
-!DVM$ end region
-      return
-      end
-
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine z_receive_backsub_info(recv_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     post mpi receives
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer error,recv_id,ip,jp,c,buffer_size
-      ip = cell_coord(1,c) - 1
-      jp = cell_coord(2,c) - 1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*BLOCK_SIZE
-      call mpi_irecv(out_buffer, buffer_size,
-     >     dp_type, successor(3), 
-     >     TOP+ip+jp*NCELLS, comm_solve, 
-     >     recv_id, error)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine z_receive_solve_info(recv_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     post mpi receives 
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer ip,jp,recv_id,error,c,buffer_size
-      ip = cell_coord(1,c) - 1
-      jp = cell_coord(2,c) - 1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*
-     >     (BLOCK_SIZE*BLOCK_SIZE + BLOCK_SIZE)
-      call mpi_irecv(out_buffer, buffer_size,
-     >     dp_type, predecessor(3), 
-     >     BOTTOM+ip+jp*NCELLS, comm_solve,
-     >     recv_id, error)
-
-      return
-      end
-      
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine z_backsubstitute(first, last, c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     back solve: if last cell, then generate U(ksize)=rhs(ksize)
-c     else assume U(ksize) is loaded in un pack backsub_info
-c     so just use it
-c     after call u(kstart) will be sent to next cell
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer first, last, c, i, k
-      integer m,n,j,jsize,isize,ksize,kstart
-      
-      kstart = 0
-      isize = cell_size(1,c)-end(1,c)-1      
-      jsize = cell_size(2,c)-end(2,c)-1
-      ksize = cell_size(3,c)-1
-      if (last .eq. 0) then
-
-!1$omp parallel do private(k,j,i,m,n) collapse(2)
-
-!DVM$ region	  
-!DVM$ PARALLEL(j,i), PRIVATE(j,i,m,n),
-!DVM$& TIE(rhs(*,i,j,*,*),lhsc(*,*,i,j,*,*),backsub_info(*,i,j,*))
-         do j=start(2,c),jsize
-            do i=start(1,c),isize
-c---------------------------------------------------------------------
-c     U(jsize) uses info from previous cell if not last cell
-c---------------------------------------------------------------------
-               do m=1,BLOCK_SIZE
-                  do n=1,BLOCK_SIZE
-                     rhs(m,i,j,ksize,c) = rhs(m,i,j,ksize,c) 
-     >                    - lhsc(m,n,i,j,ksize,c)*
-     >                    backsub_info(n,i,j,c)
-                  enddo
-               enddo
-            enddo
-         enddo
-!DVM$ end region		 
-      endif
-
-! $omp parallel do private(k,j,i,m,n) collapse(2)
-
-!DVM$ region
-!DVM$ PARALLEL(j,i), PRIVATE(k,j,i,m,n),
-!DVM$& TIE(rhs(*,i,j,*,*),lhsc(*,*,i,j,*,*))
-       do j=start(2,c),jsize
-          do i=start(1,c),isize
-         do k=ksize-1,kstart,-1			
-               do m=1,BLOCK_SIZE
-                  do n=1,BLOCK_SIZE
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) 
-     >                    - lhsc(m,n,i,j,k,c)*rhs(n,i,j,k+1,c)
-                  enddo
-               enddo
-            enddo
-         enddo
-      enddo
-!DVM$ end region
-      return
-      end
-
-      pure subroutine fjac_z_solve(fjac,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2) 
-      implicit none
-      double precision utmp(6),tmp1,tmp2
-      double precision u1_,u2_,u3_,u4_,u5_,qs_,fjac(5,5),c1,c2
-      INTENT(in) :: u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-      INTENT(out) :: fjac	  
-               utmp(1) = 1.0d0 / u1_
-               utmp(2) = u2_
-               utmp(3) = u3_
-               utmp(4) = u4_
-               utmp(5) = u5_
-               utmp(6) = qs_
-			   
-               tmp1 = utmp(1)
-               tmp2 = tmp1 * tmp1
-			   
-               fjac(1,1) = 0.0d+00
-               fjac(1,2) = 0.0d+00
-               fjac(1,3) = 0.0d+00
-               fjac(1,4) = 1.0d+00
-               fjac(1,5) = 0.0d+00
-
-               fjac(2,1) = - ( utmp(2)*utmp(4) ) 
-     >              * tmp2 
-               fjac(2,2) = utmp(4) * tmp1
-               fjac(2,3) = 0.0d+00
-               fjac(2,4) = utmp(2) * tmp1
-               fjac(2,5) = 0.0d+00
-
-               fjac(3,1) = - ( utmp(3)*utmp(4) )
-     >              * tmp2 
-               fjac(3,2) = 0.0d+00
-               fjac(3,3) = utmp(4) * tmp1
-               fjac(3,4) = utmp(3) * tmp1
-               fjac(3,5) = 0.0d+00
-
-               fjac(4,1) = - (utmp(4)*utmp(4) * tmp2 ) 
-     >              + c2 * utmp(6)
-               fjac(4,2) = - c2 *  utmp(2) * tmp1 
-               fjac(4,3) = - c2 *  utmp(3) * tmp1
-               fjac(4,4) = ( 2.0d+00 - c2 )
-     >              *  utmp(4) * tmp1 
-               fjac(4,5) = c2
-
-               fjac(5,1) = ( c2 * 2.0d0 * utmp(6)
-     >              - c1 * ( utmp(5) * tmp1 ) )
-     >              * ( utmp(4) * tmp1 )
-               fjac(5,2) = - c2 * ( utmp(2)*utmp(4) )
-     >              * tmp2 
-               fjac(5,3) = - c2 * ( utmp(3)*utmp(4) )
-     >              * tmp2
-               fjac(5,4) = c1 * ( utmp(5) * tmp1 )
-     >              - c2 * ( utmp(6)
-     >              + utmp(4)*utmp(4) * tmp2 )
-               fjac(5,5) = c1 * utmp(4) * tmp1	  
-	  
-      end
-	  
-      pure subroutine njac_z_solve(njac,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345,c3,c4) 
-      implicit none
-      double precision utmp(6),tmp1,tmp2,tmp3,c1345,c3,c4
-      double precision u1_,u2_,u3_,u4_,u5_,qs_,njac(5,5),c3c4,con43
-      INTENT(in) :: u1_,u2_,u3_,u4_,u5_,qs_,c3c4,con43,c1345,c3,c4
-      INTENT(out) :: njac
-
-               utmp(1) = 1.0d0 / u1_
-               utmp(2) = u2_
-               utmp(3) = u3_
-               utmp(4) = u4_
-               utmp(5) = u5_
-               utmp(6) = qs_
-			   
-               tmp1 = utmp(1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2
-
-               njac(1,1) = 0.0d+00
-               njac(1,2) = 0.0d+00
-               njac(1,3) = 0.0d+00
-               njac(1,4) = 0.0d+00
-               njac(1,5) = 0.0d+00
-
-               njac(2,1) = - c3c4 * tmp2 * utmp(2)
-               njac(2,2) =   c3c4 * tmp1
-               njac(2,3) =   0.0d+00
-               njac(2,4) =   0.0d+00
-               njac(2,5) =   0.0d+00
-
-               njac(3,1) = - c3c4 * tmp2 * utmp(3)
-               njac(3,2) =   0.0d+00
-               njac(3,3) =   c3c4 * tmp1
-               njac(3,4) =   0.0d+00
-               njac(3,5) =   0.0d+00
-
-               njac(4,1) = - con43 * c3c4 * tmp2 * utmp(4)
-               njac(4,2) =   0.0d+00
-               njac(4,3) =   0.0d+00
-               njac(4,4) =   con43 * c3 * c4 * tmp1
-               njac(4,5) =   0.0d+00
-
-               njac(5,1) = - (  c3c4
-     >              - c1345 ) * tmp3 * (utmp(2)**2)
-     >              - ( c3c4 - c1345 ) * tmp3 * (utmp(3)**2)
-     >              - ( con43 * c3c4
-     >              - c1345 ) * tmp3 * (utmp(4)**2)
-     >              - c1345 * tmp2 * utmp(5)
-
-               njac(5,2) = (  c3c4 - c1345 ) * tmp2 * utmp(2)
-               njac(5,3) = (  c3c4 - c1345 ) * tmp2 * utmp(3)
-               njac(5,4) = ( con43 * c3c4
-     >              - c1345 ) * tmp2 * utmp(4)
-               njac(5,5) = ( c1345 )* tmp1
-			   
-      end
-	  
-      pure subroutine lhsa_z_solve(lhsa,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2,
-     & c3c4,con43,c1345,tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt,c3,c4)
-            implicit none            
-      double precision u1_,u2_,u3_,u4_,u5_,qs_,c1,c2, c3c4,con43,c1345
-      INTENT(IN)::u1_,u2_,u3_,u4_,u5_,qs_,c1,c2,c3c4,con43,c1345
-      double precision lhsa(5,5),c3,c4
-      INTENT(out)::lhsa
-	  
-      double precision tmp1, tmp2,fjac_(5,5),njac_(5,5)
-      double precision tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt
-      INTENT(IN):: tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt,c3,c4
-
-      interface 
-	  pure subroutine fjac_z_solve(fjac,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2)
-		INTENT (out) :: fjac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-		double precision fjac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-      end subroutine
-		  
-	  pure subroutine njac_z_solve(njac,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345,c3,c4)		 
-		INTENT (out) :: njac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c3c4,con43,c1345,c3,c4
-        double precision njac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c3c4,c3,c4
-     & ,con43,c1345
-		end subroutine		  
-      end interface
-
-      call fjac_z_solve(fjac_,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2) 	 
-      call njac_z_solve(njac_,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345,c3,c4)
-	 
-               tmp1 = dt * tz1
-               tmp2 = dt * tz2
-
-               lhsa(1,1) = - tmp2 * fjac_(1,1)
-     >              - tmp1 * njac_(1,1)
-     >              - tmp1 * dz1 
-               lhsa(1,2) = - tmp2 * fjac_(1,2)
-     >              - tmp1 * njac_(1,2)
-               lhsa(1,3) = - tmp2 * fjac_(1,3)
-     >              - tmp1 * njac_(1,3)
-               lhsa(1,4) = - tmp2 * fjac_(1,4)
-     >              - tmp1 * njac_(1,4)
-               lhsa(1,5) = - tmp2 * fjac_(1,5)
-     >              - tmp1 * njac_(1,5)
-
-               lhsa(2,1) = - tmp2 * fjac_(2,1)
-     >              - tmp1 * njac_(2,1)
-               lhsa(2,2) = - tmp2 * fjac_(2,2)
-     >              - tmp1 * njac_(2,2)
-     >              - tmp1 * dz2
-               lhsa(2,3) = - tmp2 * fjac_(2,3)
-     >              - tmp1 * njac_(2,3)
-               lhsa(2,4) = - tmp2 * fjac_(2,4)
-     >              - tmp1 * njac_(2,4)
-               lhsa(2,5) = - tmp2 * fjac_(2,5)
-     >              - tmp1 * njac_(2,5)
-
-               lhsa(3,1) = - tmp2 * fjac_(3,1)
-     >              - tmp1 * njac_(3,1)
-               lhsa(3,2) = - tmp2 * fjac_(3,2)
-     >              - tmp1 * njac_(3,2)
-               lhsa(3,3) = - tmp2 * fjac_(3,3)
-     >              - tmp1 * njac_(3,3)
-     >              - tmp1 * dz3 
-               lhsa(3,4) = - tmp2 * fjac_(3,4)
-     >              - tmp1 * njac_(3,4)
-               lhsa(3,5) = - tmp2 * fjac_(3,5)
-     >              - tmp1 * njac_(3,5)
-
-               lhsa(4,1) = - tmp2 * fjac_(4,1)
-     >              - tmp1 * njac_(4,1)
-               lhsa(4,2) = - tmp2 * fjac_(4,2)
-     >              - tmp1 * njac_(4,2)
-               lhsa(4,3) = - tmp2 * fjac_(4,3)
-     >              - tmp1 * njac_(4,3)
-               lhsa(4,4) = - tmp2 * fjac_(4,4)
-     >              - tmp1 * njac_(4,4)
-     >              - tmp1 * dz4
-               lhsa(4,5) = - tmp2 * fjac_(4,5)
-     >              - tmp1 * njac_(4,5)
-
-               lhsa(5,1) = - tmp2 * fjac_(5,1)
-     >              - tmp1 * njac_(5,1)
-               lhsa(5,2) = - tmp2 * fjac_(5,2)
-     >              - tmp1 * njac_(5,2)
-               lhsa(5,3) = - tmp2 * fjac_(5,3)
-     >              - tmp1 * njac_(5,3)
-               lhsa(5,4) = - tmp2 * fjac_(5,4)
-     >              - tmp1 * njac_(5,4)
-               lhsa(5,5) = - tmp2 * fjac_(5,5)
-     >              - tmp1 * njac_(5,5)
-     >              - tmp1 * dz5	  
-      end
-	  
-      pure subroutine lhsb_z_solve(lhsb,u1_,u2_,u3_,u4_,u5_,qs_,
-     & c3c4,con43,c1345,tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt,c3,c4)	  
-	   implicit none
-      double precision u1_,u2_,u3_,u4_,u5_,qs_, c3c4,con43,c1345
-      INTENT(IN)::u1_,u2_,u3_,u4_,u5_,qs_,c3c4,con43,c1345,c3,c4
-      double precision lhsb(5,5)
-      INTENT(out)::lhsb
-	  
-      double precision tmp1, njac_(5,5),c3,c4
-      double precision tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt
-      INTENT(IN)::tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt
-
-      interface 	  
-	  pure subroutine njac_z_solve(njac,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345,c3,c4)		 
-		INTENT (out) :: njac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c3c4,con43,c1345,c3,c4
-		double precision njac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c3c4,c3,c4
-     & ,con43,c1345
-		end subroutine		  
-      end interface
-	  
-      call njac_z_solve(njac_,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345,c3,c4)
-	 
-               tmp1 = dt * tz1
-			   
-              lhsb(1,1) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(1,1)
-     >              + tmp1 * 2.0d+00 * dz1
-               lhsb(1,2) = tmp1 * 2.0d+00 * njac_(1,2)
-               lhsb(1,3) = tmp1 * 2.0d+00 * njac_(1,3)
-               lhsb(1,4) = tmp1 * 2.0d+00 * njac_(1,4)
-               lhsb(1,5) = tmp1 * 2.0d+00 * njac_(1,5)
-
-               lhsb(2,1) = tmp1 * 2.0d+00 * njac_(2,1)
-               lhsb(2,2) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(2,2)
-     >              + tmp1 * 2.0d+00 * dz2
-               lhsb(2,3) = tmp1 * 2.0d+00 * njac_(2,3)
-               lhsb(2,4) = tmp1 * 2.0d+00 * njac_(2,4)
-               lhsb(2,5) = tmp1 * 2.0d+00 * njac_(2,5)
-
-               lhsb(3,1) = tmp1 * 2.0d+00 * njac_(3,1)
-               lhsb(3,2) = tmp1 * 2.0d+00 * njac_(3,2)
-               lhsb(3,3) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(3,3)
-     >              + tmp1 * 2.0d+00 * dz3
-               lhsb(3,4) = tmp1 * 2.0d+00 * njac_(3,4)
-               lhsb(3,5) = tmp1 * 2.0d+00 * njac_(3,5)
-
-               lhsb(4,1) = tmp1 * 2.0d+00 * njac_(4,1)
-               lhsb(4,2) = tmp1 * 2.0d+00 * njac_(4,2)
-               lhsb(4,3) = tmp1 * 2.0d+00 * njac_(4,3)
-               lhsb(4,4) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(4,4)
-     >              + tmp1 * 2.0d+00 * dz4
-               lhsb(4,5) = tmp1 * 2.0d+00 * njac_(4,5)
-
-               lhsb(5,1) = tmp1 * 2.0d+00 * njac_(5,1)
-               lhsb(5,2) = tmp1 * 2.0d+00 * njac_(5,2)
-               lhsb(5,3) = tmp1 * 2.0d+00 * njac_(5,3)
-               lhsb(5,4) = tmp1 * 2.0d+00 * njac_(5,4)
-               lhsb(5,5) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(5,5) 
-     >              + tmp1 * 2.0d+00 * dz5
-	 
-      end
-	  
-      pure subroutine lhsc_z_solve(lhsc,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2,
-     & c3c4,con43,c1345,tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt,c3,c4)
-            implicit none            
-      double precision u1_,u2_,u3_,u4_,u5_,qs_,c1,c2, c3c4,con43,c1345
-      INTENT(IN)::u1_,u2_,u3_,u4_,u5_,qs_,c1,c2,c3c4,con43,c1345
-      double precision lhsc(5,5),c3,c4
-      INTENT(out)::lhsc
-	  
-      double precision tmp1, tmp2,fjac_(5,5),njac_(5,5)
-      double precision tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt
-      INTENT(IN):: tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt,c3,c4
-
-      interface 
-	  pure subroutine fjac_z_solve(fjac,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2)
-		INTENT (out) :: fjac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-		double precision fjac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-      end subroutine
-		  
-	  pure subroutine njac_z_solve(njac,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345,c3,c4)		 
-		INTENT (out) :: njac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c3c4,con43,c1345,c3,c4
-        double precision njac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c3c4,c3,c4
-     & ,con43,c1345
-		end subroutine		  
-      end interface
-
-      call fjac_z_solve(fjac_,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2) 	 
-      call njac_z_solve(njac_,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345,c3,c4)
-	 
-               tmp1 = dt * tz1
-               tmp2 = dt * tz2
-			   
-               lhsc(1,1) =  tmp2 * fjac_(1,1)
-     >              - tmp1 * njac_(1,1)
-     >              - tmp1 * dz1
-               lhsc(1,2) =  tmp2 * fjac_(1,2)
-     >              - tmp1 * njac_(1,2)
-               lhsc(1,3) =  tmp2 * fjac_(1,3)
-     >              - tmp1 * njac_(1,3)
-               lhsc(1,4) =  tmp2 * fjac_(1,4)
-     >              - tmp1 * njac_(1,4)
-               lhsc(1,5) =  tmp2 * fjac_(1,5)
-     >              - tmp1 * njac_(1,5)
-
-               lhsc(2,1) =  tmp2 * fjac_(2,1)
-     >              - tmp1 * njac_(2,1)
-               lhsc(2,2) =  tmp2 * fjac_(2,2)
-     >              - tmp1 * njac_(2,2)
-     >              - tmp1 * dz2
-               lhsc(2,3) =  tmp2 * fjac_(2,3)
-     >              - tmp1 * njac_(2,3)
-               lhsc(2,4) =  tmp2 * fjac_(2,4)
-     >              - tmp1 * njac_(2,4)
-               lhsc(2,5) =  tmp2 * fjac_(2,5)
-     >              - tmp1 * njac_(2,5)
-
-               lhsc(3,1) =  tmp2 * fjac_(3,1)
-     >              - tmp1 * njac_(3,1)
-               lhsc(3,2) =  tmp2 * fjac_(3,2)
-     >              - tmp1 * njac_(3,2)
-               lhsc(3,3) =  tmp2 * fjac_(3,3)
-     >              - tmp1 * njac_(3,3)
-     >              - tmp1 * dz3
-               lhsc(3,4) =  tmp2 * fjac_(3,4)
-     >              - tmp1 * njac_(3,4)
-               lhsc(3,5) =  tmp2 * fjac_(3,5)
-     >              - tmp1 * njac_(3,5)
-
-               lhsc(4,1) =  tmp2 * fjac_(4,1)
-     >              - tmp1 * njac_(4,1)
-               lhsc(4,2) =  tmp2 * fjac_(4,2)
-     >              - tmp1 * njac_(4,2)
-               lhsc(4,3) =  tmp2 * fjac_(4,3)
-     >              - tmp1 * njac_(4,3)
-               lhsc(4,4) =  tmp2 * fjac_(4,4)
-     >              - tmp1 * njac_(4,4)
-     >              - tmp1 * dz4
-               lhsc(4,5) =  tmp2 * fjac_(4,5)
-     >              - tmp1 * njac_(4,5)
-
-               lhsc(5,1) =  tmp2 * fjac_(5,1)
-     >              - tmp1 * njac_(5,1)
-               lhsc(5,2) =  tmp2 * fjac_(5,2)
-     >              - tmp1 * njac_(5,2)
-               lhsc(5,3) =  tmp2 * fjac_(5,3)
-     >              - tmp1 * njac_(5,3)
-               lhsc(5,4) =  tmp2 * fjac_(5,4)
-     >              - tmp1 * njac_(5,4)
-               lhsc(5,5) =  tmp2 * fjac_(5,5)
-     >              - tmp1 * njac_(5,5)
-     >              - tmp1 * dz5
-      end	  
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      subroutine z_first()
-
-      include 'header.h'
-      include 'work_lhs.h'	  
-	  
-	  integer i,j,k
-	  
-!DVM$ region out(lhsc)
-!DVM$ PARALLEL(j,i), TIE(lhsc(*,*,i,j,*,*))
-      do j=0,1
-         do i=0,1
-		    if (i .eq. 2) lhsc(1,1,i,j,1,1) = 0
-		 enddo
-	  enddo
-!DVM$ end region	  
-	  end
-	  
-      subroutine z_solve_cell(first,last,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     performs guaussian elimination on this cell.
-c     
-c     assumes that unpacking routines for non-first cells 
-c     preload C' and rhs' from previous cell.
-c     
-c     assumed send happens outside this routine, but that
-c     c'(KMAX) and rhs'(KMAX) will be sent to next cell.
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'work_lhs.h'
-
-      integer first,last,c,j_start,m,n,js,is,ks,ke
-      integer i,j,k,isize,ksize,jsize,kstart
-      double precision utmp(6,-2:KMAX+1),lhsa_(5,5),lhsb_(5,5)
-      double precision fjac_(5,5), njac_(5,5),lhsc_(5,5),lhscP_(5,5)
-      double precision rhs_(5), rhsP_(5),qs_(0:3),u_(5),uP_(5),uM_(5)
-
-      interface 
-        pure subroutine matvec_sub(ablock,avec,bvec)      
-!DVM$ routine		
-         intent (inout)::ablock,avec,bvec
-         double precision ablock(5,5),avec(5),bvec(5)
-	    end 
-	  end interface
-	  
-      kstart = 0
-      isize = cell_size(1,c)-end(1,c)-1
-      jsize = cell_size(2,c)-end(2,c)-1
-      ksize = cell_size(3,c)-1
-      js = start(2,c)
-	  is = start(1,c)
-	  ks = start(3,c)
-	  ke = ksize-end(3,c)
-!1$omp parallel do private(k,i),private(fjac,njac,lhsa,lhsb,tmp1,tmp2
-!1$omp& ,tmp3,utmp,j) collapse(2)
-
-!DVM$ interval 12
-!DVM$ region
-!DVM$ PARALLEL(j,i),PRIVATE(k,m,n,lhsa_,lhsb_,lhsc_,lhscP_,rhs_,rhsP_,
-!DVM$& qs_,u_,uP_,uM_)
-!DVM$& ,TIE(rhs(*,i,j,*,*),lhsc(*,*,i,j,*,*),u(*,i,j,*,*),qs(i,j,*,*))
-      do j=js,jsize 
-         do i=is,isize	
-			
-            do k=kstart,ksize	 
-	         if (k.eq.kstart) then 
-	   		   do m = 1, 5
- 				 do n = 1, 5
-				   lhscP_(m,n) = lhsc(m,n,i,j,k-1,c)
-				 enddo	                 				 
-			   enddo			 
-	   		  do m = 1, 5
-			    rhsP_(m) = rhs(m,i,j,k-1,c)
-				uM_(m)=u(m,i,j,k-1,c)
-				u_(m)=u(m,i,j,k,c)
-			  enddo		
-			  qs_(0)=qs(i,j,k-1,c)
-			  qs_(1)=qs(i,j,k,c)
-			 endif
-		     qs_(2)=qs(i,j,k+1,c)
-             do m = 1, 5			 
-			   rhs_(m) = rhs(m,i,j,k,c)
-			   uP_(m)=u(m,i,j,k+1,c)
-			 enddo
-			 
-             if (k.eq.kstart .and. first.eq.1) then
-			   do m = 1, 5
-				 do n = 1, 5
-				   lhsb_(m,n) = 0.0d0
-				   lhsc_(m,n) = 0.0d0
-				 enddo
-				 lhsb_(m,m) = 1.0d0
-			   enddo					
-				 
-               call binvcrhs( lhsb_, lhsc_, rhs_)
-             else if (k.eq.ksize .and. last.eq.1) then
-			   do m = 1, 5
-				  do n = 1, 5
-				   lhsa_(m,n) = 0.0d0
-				   lhsb_(m,n) = 0.0d0
-			     enddo
-				 lhsb_(m,m) = 1.0d0
-			   enddo					
-				 
-               call matvec_sub(lhsa_,rhsP_,rhs_)
-               call matmul_sub(lhsa_,lhscP_,lhsb_)
-               call binvrhs( lhsb_,rhs_)
-             else
-	 
-      call lhsa_z_solve(lhsa_,uM_(1),uM_(2)
-     &,uM_(3),uM_(4),uM_(5),qs_(0),
-     & c1,c2,c3c4,con43,c1345,tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt,c3,c4)	 
-	 
-      call lhsb_z_solve(lhsb_,u_(1),u_(2)
-     &,u_(3),u_(4),u_(5),qs_(1),
-     & c3c4,con43,c1345,tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt,c3,c4)
-
-      call lhsc_z_solve(lhsc_,uP_(1),uP_(2)
-     &,uP_(3),uP_(4),uP_(5),qs_(2),
-     & c1,c2,c3c4,con43,c1345,tz1,tz2,dz1,dz2,dz3,dz4,dz5,dt,c3,c4)
-	 
-               call matvec_sub(lhsa_,rhsP_,rhs_)	 
-               call matmul_sub(lhsa_,lhscP_,lhsb_)
-               call binvcrhs( lhsb_,lhsc_,rhs_)
-              endif
-
-	   		   do m = 1, 5
- 				 do n = 1, 5
-				   lhscP_(m,n) = lhsc_(m,n)
-				 enddo	
-				 rhs(m,i,j,k-1,c) = rhsP_(m)
-                 rhsP_(m) = rhs_(m)
-				 uM_(m) = u_(m)
-				 u_(m) = uP_(m)
-			   enddo 
-			   qs_(0) = qs_(1)
-			   qs_(1) = qs_(2)
-			   
-              if (.not. (k.eq.ksize .and. last.eq.1)) then
-	   		   do m = 1, 5
- 				 do n = 1, 5
-				   lhsc(m,n,i,j,k,c) = lhsc_(m,n)
-				 enddo
-			   enddo
-			  endif
-			  
-			  if (k.eq.ksize) then 
-	   		   do m = 1, 5
-			     rhs(m,i,j,k,c) = rhs_(m)				 
-			   enddo			
-              endif			
-            enddo
-         enddo
-      enddo
-!DVM$ end region
-!DVM$ end interval 
-      return
-      end
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine y_solve
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     Performs line solves in Y direction by first factoring
-c     the block-tridiagonal matrix into an upper triangular matrix, 
-c     and then performing back substitution to solve for the unknow
-c     vectors of each line.  
-c     
-c     Make sure we treat elements zero to cell_size in the direction
-c     of the sweep.
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer 
-     >     c, jstart, stage,
-     >     first, last, recv_id, error, r_status(MPI_STATUS_SIZE),
-     >     isize,jsize,ksize,send_id
-
-      jstart = 0
-
-      if (timeron) call timer_start(t_ysolve)
-c---------------------------------------------------------------------
-c     in our terminology stage is the number of the cell in the y-direction
-c     i.e. stage = 1 means the start of the line stage=ncells means end
-c---------------------------------------------------------------------
-      call y_first()
-      do stage = 1,ncells
-         c = slice(2,stage)
-         isize = cell_size(1,c) - 1
-         jsize = cell_size(2,c) - 1
-         ksize = cell_size(3,c) - 1
-
-c---------------------------------------------------------------------
-c     set last-cell flag
-c---------------------------------------------------------------------
-         if (stage .eq. ncells) then
-            last = 1
-         else
-            last = 0
-         endif
-
-         if (stage .eq. 1) then
-c---------------------------------------------------------------------
-c     This is the first cell, so solve without receiving data
-c---------------------------------------------------------------------
-            first = 1
-c            call lhsy(c)
-            call y_solve_cell(first,last,c)
-         else
-c---------------------------------------------------------------------
-c     Not the first cell of this line, so receive info from
-c     processor working on preceeding cell
-c---------------------------------------------------------------------
-            first = 0
-            if (timeron) call timer_start(t_ycomm)
-            call y_receive_solve_info(recv_id,c)
-c---------------------------------------------------------------------
-c     overlap computations and communications
-c---------------------------------------------------------------------
-c            call lhsy(c)
-c---------------------------------------------------------------------
-c     wait for completion
-c---------------------------------------------------------------------
-            call mpi_wait(send_id,r_status,error)
-            call mpi_wait(recv_id,r_status,error)
-            if (timeron) call timer_stop(t_ycomm)
-c---------------------------------------------------------------------
-c     install C'(jstart+1) and rhs'(jstart+1) to be used in this cell
-c---------------------------------------------------------------------
-            call y_unpack_solve_info(c)
-            call y_solve_cell(first,last,c)
-         endif
-
-         if (last .eq. 0) call y_send_solve_info(send_id,c)
-      enddo
-
-c---------------------------------------------------------------------
-c     now perform backsubstitution in reverse direction
-c---------------------------------------------------------------------
-      do stage = ncells, 1, -1
-         c = slice(2,stage)
-         first = 0
-         last = 0
-         if (stage .eq. 1) first = 1
-         if (stage .eq. ncells) then
-            last = 1
-c---------------------------------------------------------------------
-c     last cell, so perform back substitute without waiting
-c---------------------------------------------------------------------
-            call y_backsubstitute(first, last,c)
-         else
-            if (timeron) call timer_start(t_ycomm)
-            call y_receive_backsub_info(recv_id,c)
-            call mpi_wait(send_id,r_status,error)
-            call mpi_wait(recv_id,r_status,error)
-            if (timeron) call timer_stop(t_ycomm)
-            call y_unpack_backsub_info(c)
-            call y_backsubstitute(first,last,c)
-         endif
-         if (first .eq. 0) call y_send_backsub_info(send_id,c)
-      enddo
-
-      if (timeron) call timer_stop(t_ysolve)
-
-      return
-      end
-      
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine y_unpack_solve_info(c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     unpack C'(-1) and rhs'(-1) for
-c     all i and k
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer i,k,m,n,ptr,c,jstart 
-
-      jstart = 0
-      ptr = 0
-!DVM$ actual(out_buffer)
-	  
-!DVM$ region 
-!DVM$ PARALLEL(k,i),PRIVATE(m,n,ptr),
-!DVM$& TIE(lhsc(*,*,i,*,k,*),rhs(*,i,*,k,*))		  
-      do k=0,KMAX-1
-         do i=0,IMAX-1
-           ptr=(k*IMAX+I)*(BLOCK_SIZE+BLOCK_SIZE*BLOCK_SIZE)		 
-            do m=1,BLOCK_SIZE
-               do n=1,BLOCK_SIZE
-           lhsc(m,n,i,jstart-1,k,c) = out_buffer(ptr+n+(m-1)*BLOCK_SIZE)           
-               enddo
-!               ptr = ptr+BLOCK_SIZE
-            enddo
-            do n=1,BLOCK_SIZE
-         rhs(n,i,jstart-1,k,c) = out_buffer(ptr+n+BLOCK_SIZE*BLOCK_SIZE)
-            enddo
-!            ptr = ptr+BLOCK_SIZE
-         enddo
-      enddo
-!DVM$ end region
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-      
-      subroutine y_send_solve_info(send_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     pack up and send C'(jend) and rhs'(jend) for
-c     all i and k
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer i,k,m,n,jsize,ptr,c,ip,kp
-      integer error,send_id,buffer_size 
-
-      jsize = cell_size(2,c)-1
-      ip = cell_coord(1,c) - 1
-      kp = cell_coord(3,c) - 1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*
-     >     (BLOCK_SIZE*BLOCK_SIZE + BLOCK_SIZE)
-
-c---------------------------------------------------------------------
-c     pack up buffer
-c---------------------------------------------------------------------
-      ptr = 0
-	  
-!DVM$ region out(in_buffer)	  
-!DVM$ PARALLEL(k,i),PRIVATE(m,n,ptr),
-!DVM$& TIE(lhsc(*,*,i,*,k,*),rhs(*,i,*,k,*))	  
-      do k=0,KMAX-1
-         do i=0,IMAX-1
-           ptr=(k*IMAX+I)*(BLOCK_SIZE+BLOCK_SIZE*BLOCK_SIZE)		 
-            do m=1,BLOCK_SIZE
-               do n=1,BLOCK_SIZE
-             in_buffer(ptr+n+(m-1)*BLOCK_SIZE) = lhsc(m,n,i,jsize,k,c)
-               enddo
-!               ptr = ptr+BLOCK_SIZE
-            enddo
-            do n=1,BLOCK_SIZE
-           in_buffer(ptr+n+BLOCK_SIZE*BLOCK_SIZE) = rhs(n,i,jsize,k,c)
-            enddo
-!            ptr = ptr+BLOCK_SIZE
-         enddo
-      enddo
-!DVM$ end region
-!DVM$ get_actual(in_buffer)
-c---------------------------------------------------------------------
-c     send buffer 
-c---------------------------------------------------------------------
-      if (timeron) call timer_start(t_ycomm)
-      call mpi_isend(in_buffer, buffer_size,
-     >     dp_type, successor(2),
-     >     SOUTH+ip+kp*NCELLS, comm_solve,
-     >     send_id,error)
-      if (timeron) call timer_stop(t_ycomm)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine y_send_backsub_info(send_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     pack up and send U(jstart) for all i and k
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer i,k,n,ptr,c,jstart,ip,kp
-      integer error,send_id,buffer_size
-
-c---------------------------------------------------------------------
-c     Send element 0 to previous processor
-c---------------------------------------------------------------------
-      jstart = 0
-      ip = cell_coord(1,c)-1
-      kp = cell_coord(3,c)-1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*BLOCK_SIZE
-      ptr = 0
-
-!DVM$ region out(in_buffer)
-!DVM$ PARALLEL(k,i), PRIVATE(ptr,n),TIE(rhs(*,i,*,k,*))
-      do k=0,KMAX-1
-         do i=0,IMAX-1
-		    ptr = (k*IMAX+i) * BLOCK_SIZE		 
-            do n=1,BLOCK_SIZE
-               in_buffer(ptr+n) = rhs(n,i,jstart,k,c)
-            enddo
-!            ptr = ptr+BLOCK_SIZE
-         enddo
-      enddo
-!DVM$ end region
-!DVM$ get_actual(in_buffer)
-      if (timeron) call timer_start(t_ycomm)
-      call mpi_isend(in_buffer, buffer_size,
-     >     dp_type, predecessor(2), 
-     >     NORTH+ip+kp*NCELLS, comm_solve, 
-     >     send_id,error)
-      if (timeron) call timer_stop(t_ycomm)
-
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine y_unpack_backsub_info(c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     unpack U(jsize) for all i and k
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer i,k,n,ptr,c 
-
-      ptr = 0
-!DVM$ actual(out_buffer)
-	  
-!DVM$ region out(backsub_info)
-!DVM$ PARALLEL(k,i), PRIVATE(ptr,n),TIE(backsub_info(*,i,k,*))	  
-      do k=0,KMAX-1
-         do i=0,IMAX-1
-		    ptr = (k*IMAX+i) * BLOCK_SIZE
-            do n=1,BLOCK_SIZE
-               backsub_info(n,i,k,c) = out_buffer(ptr+n)
-            enddo
-!            ptr = ptr+BLOCK_SIZE
-         enddo
-      enddo
-!DVM$ end region
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine y_receive_backsub_info(recv_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     post mpi receives
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer error,recv_id,ip,kp,c,buffer_size
-      ip = cell_coord(1,c) - 1
-      kp = cell_coord(3,c) - 1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*BLOCK_SIZE
-      call mpi_irecv(out_buffer, buffer_size,
-     >     dp_type, successor(2), 
-     >     NORTH+ip+kp*NCELLS, comm_solve, 
-     >     recv_id, error)
-      return
-      end
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine y_receive_solve_info(recv_id,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     post mpi receives 
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'mpinpb.h'
-
-      integer ip,kp,recv_id,error,c,buffer_size
-      ip = cell_coord(1,c) - 1
-      kp = cell_coord(3,c) - 1
-      buffer_size=MAX_CELL_DIM*MAX_CELL_DIM*
-     >     (BLOCK_SIZE*BLOCK_SIZE + BLOCK_SIZE)
-      call mpi_irecv(out_buffer, buffer_size, 
-     >     dp_type, predecessor(2), 
-     >     SOUTH+ip+kp*NCELLS,  comm_solve, 
-     >     recv_id, error)
-
-      return
-      end
-      
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      subroutine y_backsubstitute(first, last, c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     back solve: if last cell, then generate U(jsize)=rhs(jsize)
-c     else assume U(jsize) is loaded in un pack backsub_info
-c     so just use it
-c     after call u(jstart) will be sent to next cell
-c---------------------------------------------------------------------
-
-      include 'header.h'
-
-      integer first, last, c, i, k
-      integer m,n,j,jsize,isize,ksize,jstart
-      
-      jstart = 0
-      isize = cell_size(1,c)-end(1,c)-1      
-      jsize = cell_size(2,c)-1
-      ksize = cell_size(3,c)-end(3,c)-1
-      if (last .eq. 0) then
-
-!1$omp parallel do private(k,i,m,n) collapse(2)	  	  
-
-!DVM$ region	  
-!DVM$ PARALLEL(k,i), PRIVATE(k,i,m,n),
-!DVM$& TIE(rhs(*,i,*,k,*),lhsc(*,*,i,*,k,*),backsub_info(*,i,k,*))
-         do k=start(3,c),ksize
-            do i=start(1,c),isize
-c---------------------------------------------------------------------
-c     U(jsize) uses info from previous cell if not last cell
-c---------------------------------------------------------------------
-               do m=1,BLOCK_SIZE
-                  do n=1,BLOCK_SIZE
-                     rhs(m,i,jsize,k,c) = rhs(m,i,jsize,k,c) 
-     >                    - lhsc(m,n,i,jsize,k,c)*
-     >                    backsub_info(n,i,k,c)
-                  enddo
-               enddo
-            enddo
-         enddo
-!DVM$ end region		 
-      endif
-
-!1$omp parallel do private(k,j,i,m,n) collapse(2)	
-
-!DVM$ region	  
-!DVM$ PARALLEL(k,i), PRIVATE(k,j,i,m,n),
-!DVM$& TIE(rhs(*,i,*,k,*),lhsc(*,*,i,*,k,*))
-      do k=start(3,c),ksize
-        do i=start(1,c),isize
-	      do j=jsize-1,jstart,-1
-               do m=1,BLOCK_SIZE
-                  do n=1,BLOCK_SIZE
-                     rhs(m,i,j,k,c) = rhs(m,i,j,k,c) 
-     >                    - lhsc(m,n,i,j,k,c)*rhs(n,i,j+1,k,c)
-                  enddo
-               enddo
-            enddo
-         enddo
-      enddo
-!DVM$ end region
-      return
-      end
-
-      pure subroutine fjac_y_solve(fjac,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2) 
-      implicit none
-      double precision utmp(6),tmp1,tmp2
-      double precision u1_,u2_,u3_,u4_,u5_,qs_,fjac(5,5),c1,c2
-      INTENT(in) :: u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-      INTENT(out) :: fjac
-	  
-               utmp(1) = 1.0d0 / u1_
-               utmp(2) = u2_
-               utmp(3) = u3_
-               utmp(4) = u4_
-               utmp(5) = u5_
-               utmp(6) = qs_
-			   
-               tmp1 = utmp(1)
-               tmp2 = tmp1 * tmp1
-
-               fjac(1,1) = 0.0d+00
-               fjac(1,2) = 0.0d+00
-               fjac(1,3) = 1.0d+00
-               fjac(1,4) = 0.0d+00
-               fjac(1,5) = 0.0d+00
-
-               fjac(2,1) = - ( utmp(2)*utmp(3) )
-     >              * tmp2
-               fjac(2,2) = utmp(3) * tmp1
-               fjac(2,3) = utmp(2) * tmp1
-               fjac(2,4) = 0.0d+00
-               fjac(2,5) = 0.0d+00
-
-               fjac(3,1) = - ( utmp(3)*utmp(3)*tmp2)
-     >              + c2 * utmp(6)
-               fjac(3,2) = - c2 *  utmp(2) * tmp1
-               fjac(3,3) = ( 2.0d+00 - c2 )
-     >              *  utmp(3) * tmp1 
-               fjac(3,4) = - c2 * utmp(4) * tmp1 
-               fjac(3,5) = c2
-
-               fjac(4,1) = - ( utmp(3)*utmp(4) )
-     >              * tmp2
-               fjac(4,2) = 0.0d+00
-               fjac(4,3) = utmp(4) * tmp1
-               fjac(4,4) = utmp(3) * tmp1
-               fjac(4,5) = 0.0d+00
-
-               fjac(5,1) = ( c2 * 2.0d0 * utmp(6)
-     >              - c1 * utmp(5) * tmp1 ) 
-     >              * utmp(3) * tmp1 
-               fjac(5,2) = - c2 * utmp(2)*utmp(3) 
-     >              * tmp2
-               fjac(5,3) = c1 * utmp(5) * tmp1 
-     >              - c2 * ( utmp(6)
-     >              + utmp(3)*utmp(3) * tmp2 )
-               fjac(5,4) = - c2 * ( utmp(3)*utmp(4) )
-     >              * tmp2
-               fjac(5,5) = c1 * utmp(3) * tmp1 	   
-      end 
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      pure subroutine njac_y_solve(njac,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345) 
-      implicit none
-      double precision utmp(6),tmp1,tmp2,tmp3,c1345
-      double precision u1_,u2_,u3_,u4_,u5_,qs_,njac(5,5),c3c4,con43
-      INTENT(in) :: u1_,u2_,u3_,u4_,u5_,qs_,c3c4,con43,c1345
-      INTENT(out) :: njac 
-               utmp(1) = 1.0d0 / u1_
-               utmp(2) = u2_
-               utmp(3) = u3_
-               utmp(4) = u4_
-               utmp(5) = u5_
-               utmp(6) = qs_
-			   
-               tmp1 = utmp(1)
-               tmp2 = tmp1 * tmp1
-               tmp3 = tmp1 * tmp2	  
-
-               njac(1,1) = 0.0d+00
-               njac(1,2) = 0.0d+00
-               njac(1,3) = 0.0d+00
-               njac(1,4) = 0.0d+00
-               njac(1,5) = 0.0d+00
-
-               njac(2,1) = - c3c4 * tmp2 * utmp(2)
-               njac(2,2) =   c3c4 * tmp1
-               njac(2,3) =   0.0d+00
-               njac(2,4) =   0.0d+00
-               njac(2,5) =   0.0d+00
-
-               njac(3,1) = - con43 * c3c4 * tmp2 * utmp(3)
-               njac(3,2) =   0.0d+00
-               njac(3,3) =   con43 * c3c4 * tmp1
-               njac(3,4) =   0.0d+00
-               njac(3,5) =   0.0d+00
-
-               njac(4,1) = - c3c4 * tmp2 * utmp(4)
-               njac(4,2) =   0.0d+00
-               njac(4,3) =   0.0d+00
-               njac(4,4) =   c3c4 * tmp1
-               njac(4,5) =   0.0d+00
-
-               njac(5,1) = - (  c3c4
-     >              - c1345 ) * tmp3 * (utmp(2)**2)
-     >              - ( con43 * c3c4
-     >              - c1345 ) * tmp3 * (utmp(3)**2)
-     >              - ( c3c4 - c1345 ) * tmp3 * (utmp(4)**2)
-     >              - c1345 * tmp2 * utmp(5)
-
-               njac(5,2) = (  c3c4 - c1345 ) * tmp2 * utmp(2)
-               njac(5,3) = ( con43 * c3c4
-     >              - c1345 ) * tmp2 * utmp(3)
-               njac(5,4) = ( c3c4 - c1345 ) * tmp2 * utmp(4)
-               njac(5,5) = ( c1345 ) * tmp1	  
-      end
-	  
-      pure subroutine lhsa_y_solve(lhsa,u,qs_,c1,c2,
-     & c3c4,con43,c1345,ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt)
-            implicit none            
-      double precision u1_,u2_,u3_,u4_,u5_,qs_,c1,c2, c3c4,con43,c1345
-      INTENT(IN)::u,qs_,c1,c2,c3c4,con43,c1345
-      double precision lhsa(5,5),u(5)
-      INTENT(out)::lhsa
-	  
-      double precision tmp1, tmp2,fjac_(5,5),njac_(5,5)
-      double precision ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt
-      INTENT(IN)::ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt
-
-      interface 
-	  pure subroutine fjac_y_solve(fjac,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2)
-		INTENT (out) :: fjac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-		double precision fjac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-      end subroutine
-		  
-	  pure subroutine njac_y_solve(njac,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345)		 
-		INTENT (out) :: njac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c3c4,con43,c1345
-		double precision njac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345
-		end subroutine		  
-      end interface
-	         u1_=u(1)
-			 u2_=u(2)
-			 u3_=u(3)
-			 u4_=u(4)
-			 u5_=u(5)
-			 
-             call fjac_y_solve(fjac_,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2)
-             call njac_y_solve(njac_,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345)
-               tmp1 = dt * ty1
-               tmp2 = dt * ty2
-
-               lhsa(1,1) = - tmp2 * fjac_(1,1)
-     >              - tmp1 * njac_(1,1)
-     >              - tmp1 * dy1 
-               lhsa(1,2) = - tmp2 * fjac_(1,2)
-     >              - tmp1 * njac_(1,2)
-               lhsa(1,3) = - tmp2 * fjac_(1,3)
-     >              - tmp1 * njac_(1,3)
-               lhsa(1,4) = - tmp2 * fjac_(1,4)
-     >              - tmp1 * njac_(1,4)
-               lhsa(1,5) = - tmp2 * fjac_(1,5)
-     >              - tmp1 * njac_(1,5)
-
-               lhsa(2,1) = - tmp2 * fjac_(2,1)
-     >              - tmp1 * njac_(2,1)
-               lhsa(2,2) = - tmp2 * fjac_(2,2)
-     >              - tmp1 * njac_(2,2)
-     >              - tmp1 * dy2
-               lhsa(2,3) = - tmp2 * fjac_(2,3)
-     >              - tmp1 * njac_(2,3)
-               lhsa(2,4) = - tmp2 * fjac_(2,4)
-     >              - tmp1 * njac_(2,4)
-               lhsa(2,5) = - tmp2 * fjac_(2,5)
-     >              - tmp1 * njac_(2,5)
-
-               lhsa(3,1) = - tmp2 * fjac_(3,1)
-     >              - tmp1 * njac_(3,1)
-               lhsa(3,2) = - tmp2 * fjac_(3,2)
-     >              - tmp1 * njac_(3,2)
-               lhsa(3,3) = - tmp2 * fjac_(3,3)
-     >              - tmp1 * njac_(3,3)
-     >              - tmp1 * dy3 
-               lhsa(3,4) = - tmp2 * fjac_(3,4)
-     >              - tmp1 * njac_(3,4)
-               lhsa(3,5) = - tmp2 * fjac_(3,5)
-     >              - tmp1 * njac_(3,5)
-
-               lhsa(4,1) = - tmp2 * fjac_(4,1)
-     >              - tmp1 * njac_(4,1)
-               lhsa(4,2) = - tmp2 * fjac_(4,2)
-     >              - tmp1 * njac_(4,2)
-               lhsa(4,3) = - tmp2 * fjac_(4,3)
-     >              - tmp1 * njac_(4,3)
-               lhsa(4,4) = - tmp2 * fjac_(4,4)
-     >              - tmp1 * njac_(4,4)
-     >              - tmp1 * dy4
-               lhsa(4,5) = - tmp2 * fjac_(4,5)
-     >              - tmp1 * njac_(4,5)
-
-               lhsa(5,1) = - tmp2 * fjac_(5,1)
-     >              - tmp1 * njac_(5,1)
-               lhsa(5,2) = - tmp2 * fjac_(5,2)
-     >              - tmp1 * njac_(5,2)
-               lhsa(5,3) = - tmp2 * fjac_(5,3)
-     >              - tmp1 * njac_(5,3)
-               lhsa(5,4) = - tmp2 * fjac_(5,4)
-     >              - tmp1 * njac_(5,4)
-               lhsa(5,5) = - tmp2 * fjac_(5,5)
-     >              - tmp1 * njac_(5,5)
-     >              - tmp1 * dy5	  
-      end
-	  
-       pure subroutine lhsb_y_solve(lhsb,u,qs_,
-     & c3c4,con43,c1345,ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt)	  
-	   implicit none
-      double precision u1_,u2_,u3_,u4_,u5_,qs_, c3c4,con43,c1345
-      INTENT(IN)::u,qs_,c3c4,con43,c1345
-      double precision lhsb(5,5),u(5)
-      INTENT(out)::lhsb
-	  
-      double precision tmp1, njac_(5,5)
-      double precision ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt
-      INTENT(IN)::ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt
-
-      interface 	  
-	  pure subroutine njac_y_solve(njac,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345)		 
-		INTENT (out) :: njac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c3c4,con43,c1345
-		double precision njac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345
-		end subroutine		  
-      end interface
-	         u1_=u(1)
-			 u2_=u(2)
-			 u3_=u(3)
-			 u4_=u(4)
-			 u5_=u(5)
-               tmp1 = dt * ty1
-
-            call njac_y_solve(njac_,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345)
-               lhsb(1,1) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(1,1)
-     >              + tmp1 * 2.0d+00 * dy1
-               lhsb(1,2) = tmp1 * 2.0d+00 * njac_(1,2)
-               lhsb(1,3) = tmp1 * 2.0d+00 * njac_(1,3)
-               lhsb(1,4) = tmp1 * 2.0d+00 * njac_(1,4)
-               lhsb(1,5) = tmp1 * 2.0d+00 * njac_(1,5)
-
-               lhsb(2,1) = tmp1 * 2.0d+00 * njac_(2,1)
-               lhsb(2,2) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(2,2)
-     >              + tmp1 * 2.0d+00 * dy2
-               lhsb(2,3) = tmp1 * 2.0d+00 * njac_(2,3)
-               lhsb(2,4) = tmp1 * 2.0d+00 * njac_(2,4)
-               lhsb(2,5) = tmp1 * 2.0d+00 * njac_(2,5)
-
-               lhsb(3,1) = tmp1 * 2.0d+00 * njac_(3,1)
-               lhsb(3,2) = tmp1 * 2.0d+00 * njac_(3,2)
-               lhsb(3,3) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(3,3)
-     >              + tmp1 * 2.0d+00 * dy3
-               lhsb(3,4) = tmp1 * 2.0d+00 * njac_(3,4)
-               lhsb(3,5) = tmp1 * 2.0d+00 * njac_(3,5)
-
-               lhsb(4,1) = tmp1 * 2.0d+00 * njac_(4,1)
-               lhsb(4,2) = tmp1 * 2.0d+00 * njac_(4,2)
-               lhsb(4,3) = tmp1 * 2.0d+00 * njac_(4,3)
-               lhsb(4,4) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(4,4)
-     >              + tmp1 * 2.0d+00 * dy4
-               lhsb(4,5) = tmp1 * 2.0d+00 * njac_(4,5)
-
-               lhsb(5,1) = tmp1 * 2.0d+00 * njac_(5,1)
-               lhsb(5,2) = tmp1 * 2.0d+00 * njac_(5,2)
-               lhsb(5,3) = tmp1 * 2.0d+00 * njac_(5,3)
-               lhsb(5,4) = tmp1 * 2.0d+00 * njac_(5,4)
-               lhsb(5,5) = 1.0d+00
-     >              + tmp1 * 2.0d+00 * njac_(5,5) 
-     >              + tmp1 * 2.0d+00 * dy5	   
-	 
-       end 
-     
-      pure subroutine lhsc_y_solve(lhsc,u,qs_,c1,c2,
-     & c3c4,con43,c1345,ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt)
-            implicit none            
-      double precision u1_,u2_,u3_,u4_,u5_,qs_,c1,c2, c3c4,con43,c1345
-      INTENT(IN)::u,qs_,c1,c2,c3c4,con43,c1345
-      double precision lhsc(5,5),u(5)
-      INTENT(out)::lhsc
-	  
-      double precision tmp1, tmp2,fjac_(5,5),njac_(5,5)
-      double precision ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt
-      INTENT(IN)::ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt
-
-      interface 
-	  pure subroutine fjac_y_solve(fjac,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2)
-		INTENT (out) :: fjac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-		double precision fjac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c1,c2
-      end subroutine
-		  
-	  pure subroutine njac_y_solve(njac,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345)		 
-		INTENT (out) :: njac
-		INTENT (in) :: u1_,u2_,u3_,u4_,u5_,qs_,c3c4,con43,c1345
-		double precision njac(5,5),u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345
-		end subroutine		  
-      end interface
-	         u1_=u(1)
-			 u2_=u(2)
-			 u3_=u(3)
-			 u4_=u(4)
-			 u5_=u(5)
-			 
-             call fjac_y_solve(fjac_,u1_,u2_,u3_,u4_,u5_,qs_,c1,c2)
-             call njac_y_solve(njac_,u1_,u2_,u3_,u4_,u5_,qs_,c3c4
-     & ,con43,c1345)
-               tmp1 = dt * ty1
-               tmp2 = dt * ty2
-
-               lhsc(1,1) =  tmp2 * fjac_(1,1)
-     >              - tmp1 * njac_(1,1)
-     >              - tmp1 * dy1
-               lhsc(1,2) =  tmp2 * fjac_(1,2)
-     >              - tmp1 * njac_(1,2)
-               lhsc(1,3) =  tmp2 * fjac_(1,3)
-     >              - tmp1 * njac_(1,3)
-               lhsc(1,4) =  tmp2 * fjac_(1,4)
-     >              - tmp1 * njac_(1,4)
-               lhsc(1,5) =  tmp2 * fjac_(1,5)
-     >              - tmp1 * njac_(1,5)
-
-               lhsc(2,1) =  tmp2 * fjac_(2,1)
-     >              - tmp1 * njac_(2,1)
-               lhsc(2,2) =  tmp2 * fjac_(2,2)
-     >              - tmp1 * njac_(2,2)
-     >              - tmp1 * dy2
-               lhsc(2,3) =  tmp2 * fjac_(2,3)
-     >              - tmp1 * njac_(2,3)
-               lhsc(2,4) =  tmp2 * fjac_(2,4)
-     >              - tmp1 * njac_(2,4)
-               lhsc(2,5) =  tmp2 * fjac_(2,5)
-     >              - tmp1 * njac_(2,5)
-
-               lhsc(3,1) =  tmp2 * fjac_(3,1)
-     >              - tmp1 * njac_(3,1)
-               lhsc(3,2) =  tmp2 * fjac_(3,2)
-     >              - tmp1 * njac_(3,2)
-               lhsc(3,3) =  tmp2 * fjac_(3,3)
-     >              - tmp1 * njac_(3,3)
-     >              - tmp1 * dy3
-               lhsc(3,4) =  tmp2 * fjac_(3,4)
-     >              - tmp1 * njac_(3,4)
-               lhsc(3,5) =  tmp2 * fjac_(3,5)
-     >              - tmp1 * njac_(3,5)
-
-               lhsc(4,1) =  tmp2 * fjac_(4,1)
-     >              - tmp1 * njac_(4,1)
-               lhsc(4,2) =  tmp2 * fjac_(4,2)
-     >              - tmp1 * njac_(4,2)
-               lhsc(4,3) =  tmp2 * fjac_(4,3)
-     >              - tmp1 * njac_(4,3)
-               lhsc(4,4) =  tmp2 * fjac_(4,4)
-     >              - tmp1 * njac_(4,4)
-     >              - tmp1 * dy4
-               lhsc(4,5) =  tmp2 * fjac_(4,5)
-     >              - tmp1 * njac_(4,5)
-
-               lhsc(5,1) =  tmp2 * fjac_(5,1)
-     >              - tmp1 * njac_(5,1)
-               lhsc(5,2) =  tmp2 * fjac_(5,2)
-     >              - tmp1 * njac_(5,2)
-               lhsc(5,3) =  tmp2 * fjac_(5,3)
-     >              - tmp1 * njac_(5,3)
-               lhsc(5,4) =  tmp2 * fjac_(5,4)
-     >              - tmp1 * njac_(5,4)
-               lhsc(5,5) =  tmp2 * fjac_(5,5)
-     >              - tmp1 * njac_(5,5)
-     >              - tmp1 * dy5
-      end
-	  
-      subroutine y_first()
-
-      include 'header.h'
-      include 'work_lhs.h'	  
-	  
-	  integer i,j,k
-	  
-!DVM$ region out(lhsc)
-!DVM$ PARALLEL(k,i), TIE(lhsc(*,*,i,*,k,*))
-      do k=0,1
-         do i=0,1
-		    if (i .eq. 2) lhsc(1,1,i,1,k,1) = 0
-		 enddo
-	  enddo
-!DVM$ end region	  
-	  end
-	  
-      subroutine y_solve_cell(first,last,c)
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-c---------------------------------------------------------------------
-c     performs guaussian elimination on this cell.
-c     
-c     assumes that unpacking routines for non-first cells 
-c     preload C' and rhs' from previous cell.
-c     
-c     assumed send happens outside this routine, but that
-c     c'(JMAX) and rhs'(JMAX) will be sent to next cell
-c---------------------------------------------------------------------
-
-      include 'header.h'
-      include 'work_lhs.h'
-
-      integer first,last,c,m1,m2
-      integer i,j,k,isize,ksize,jsize,jstart,m,n
-      double precision fjac_(5,5),njac_(5,5), lhscP_(5,5)
-      double precision lhsb_(5,5), lhsa_(5,5), lhsc_(5,5)
-      double precision rhs_(5), rhsP_(5),uM_(5),u_(5),uP_(5),qs_(0:3)	  
-
-      interface 
-        pure subroutine matvec_sub(ablock,avec,bvec)
-!DVM$ routine		
-         intent (inout)::ablock,avec,bvec
-         double precision ablock(5,5),avec(5),bvec(5)
-	    end 
-	  end interface
-
-      jstart = 0
-      isize = cell_size(1,c)-end(1,c)-1
-      jsize = cell_size(2,c)-1
-      ksize = cell_size(3,c)-end(3,c)-1
-
-!1$omp parallel do private(k,i),private(fjac,njac,lhsa,lhsb,tmp1,tmp2
-!1$omp& ,tmp3,utmp,j) collapse(2)
-	  
-!DVM$ region
-
-!DVM$ PARALLEL(k,i),PRIVATE(j,m,n,lhsa_,lhsb_,lhsc_,lhscP_,rhs_,rhsP_
-!DVM$& ,uM_,u_,uP_,qs_)
-!DVM$& ,TIE(rhs(*,i,*,k,*),lhsc(*,*,i,*,k,*),u(*,i,*,k,*),qs(i,*,k,*))
-      do k=start(3,c),ksize 
-         do i=start(1,c),isize
-            do j=jstart,jsize
-			
-	         if (j.eq.jstart) then 
-	   		   do m = 1, 5
- 				 do n = 1, 5
-				   lhscP_(m,n) = lhsc(m,n,i,j-1,k,c)
-				 enddo	
- 				 rhsP_(m) = rhs(m,i,j-1,k,c) 
-				 uM_(m) = u(m,i,j-1,k,c)
-				 u_(m) = u(m,i,j,k,c)				 
-			   enddo			 
-			   qs_(0) = qs(i,j-1,k,c)
-			   qs_(1) = qs(i,j,k,c)
-			 endif
-			 do m = 1, 5	
- 			   rhs_(m) = rhs(m,i,j,k,c) 
-			   uP_(m) = u(m,i,j+1,k,c)
-			 enddo
-			 qs_(2) = qs(i,j+1,k,c)
-
-            if (first .eq. 1 .and. jstart .eq. j) then 
-				 do m = 1, 5
-					do n = 1, 5
-					   lhsb_(m,n) = 0.0d0
-				       lhsc_(m,n) = 0.0d0					   
-					enddo
-					lhsb_(m,m) = 1.0d0
-				 enddo				
-				 
-               call binvcrhs( lhsb_,lhsc_,rhs_)
-
-            else if (last .eq. 1 .and. j .eq. jsize) then
-				 do m = 1, 5
-					do n = 1, 5
-					   lhsa_(m,n) = 0.0d0
-					   lhsb_(m,n) = 0.0d0
-					enddo
-					lhsb_(m,m) = 1.0d0
-				 enddo						
-				 
-               call matvec_sub(lhsa_,rhsP_,rhs_)
-               call matmul_sub(lhsa_,lhscP_,lhsb_)
-               call binvrhs(lhsb_,rhs_)
-
-            else 
-
-        call lhsa_y_solve(lhsa_,uM_,qs_(0),c1,c2,
-     > c3c4,con43,c1345,ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt)
-	 
-	    call lhsb_y_solve(lhsb_,u_,qs_(1),c3c4
-     > ,con43,c1345,ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt)
-	 
-        call lhsc_y_solve(lhsc_,uP_,qs_(2),c1,c2,
-     > c3c4,con43,c1345,ty1,ty2,dy1,dy2,dy3,dy4,dy5,dt)
-	 
-               call matvec_sub(lhsa_,rhsP_,rhs_)
-               call matmul_sub(lhsa_,lhscP_,lhsb_)
-               call binvcrhs( lhsb_,lhsc_,rhs_)
-			   
-             endif
-			 
-	   		   do m = 1, 5
- 				 do n = 1, 5
-				   lhscP_(m,n) = lhsc_(m,n)
-				 enddo
-				 rhs(m,i,j-1,k,c) = rhsP_(m)
-                 rhsP_(m) = rhs_(m)	
-                 uM_(m) = u_(m)
-                 u_(m) = uP_(m)
-			   enddo
-			   qs_(0) = qs_(1)
-			   qs_(1) = qs_(2)
-			   
-              if (.not. (last .eq. 1 .and. j .eq. jsize)) then
-	   		   do m = 1, 5
- 				 do n = 1, 5
-				   lhsc(m,n,i,j,k,c) = lhsc_(m,n)
-				 enddo				 
-			   enddo
-			  endif
-			  
-			  if (j.eq.jsize) then 
-	   		   do m = 1, 5
-			     rhs(m,i,j,k,c) = rhs_(m)				 
-			   enddo			
-              endif				  
-            enddo			
-         enddo
-      enddo
-!DVM$ end region
-      return
-      end
-      
-
-
-      
-
-
-
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile
deleted file mode 100644
index eae547f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=cg
-BENCHMARKU=CG
-
-include ../config/make_dvmh.def
-
-OBJS = cg.o ${COMMON}/print_results.o  \
-       ${COMMON}/${RAND}.o ${COMMON}/timers.o
-
-include ../sys/make.common
-
-${PROGRAM}: config ${OBJS}
-	${FLINK} ${FLINKFLAGS} -o ${PROGRAM}_dvmh ${OBJS} ${FMPI_LIB}
-
-cg.o:		cg.f  mpinpb.h npbparams.h timing.h
-	${FCOMPILE} -dvmIrregAnalysis cg.f
-
-clean:
-	- rm -f *.o *~ 
-	- rm -f npbparams.h core
-
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f
deleted file mode 100644
index 7ac2642..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/cg.f
+++ /dev/null
@@ -1,1623 +0,0 @@
-
-! *** generated by SAPFOR with version 1757 and build date: Mar 26 2021 10:17:52
-
-! *** generated by SAPFOR with version 1651 and build date: Oct  5 2020 10:15:03 
-!-------------------------------------------------------------------------! 
-!                                                                         ! 
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         ! 
-!                                                                         ! 
-!                                   C G                                   ! 
-!                                                                         ! 
-!-------------------------------------------------------------------------! 
-!                                                                         ! 
-!    This benchmark is part of the NAS Parallel Benchmark 3.3 suite.      ! 
-!    It is described in NAS Technical Reports 95-020 and 02-007           ! 
-!                                                                         ! 
-!    Permission to use, copy, distribute and modify this software         ! 
-!    for any purpose with or without fee is hereby granted.  We           ! 
-!    request, however, that all derived work reference the NAS            ! 
-!    Parallel Benchmarks 3.3. This software is provided "as is"           ! 
-!    without express or implied warranty.                                 ! 
-!                                                                         ! 
-!    Information on NPB 3.3, including the technical report, the          ! 
-!    original specifications, source code, results and information        ! 
-!    on how to submit new results, is available at:                       ! 
-!                                                                         ! 
-!           http://www.nas.nasa.gov/Software/NPB/                         ! 
-!                                                                         ! 
-!    Send comments or suggestions to  npb@nas.nasa.gov                    ! 
-!                                                                         ! 
-!          NAS Parallel Benchmarks Group                                  ! 
-!          NASA Ames Research Center                                      ! 
-!          Mail Stop: T27A-1                                              ! 
-!          Moffett Field, CA   94035-1000                                 ! 
-!                                                                         ! 
-!          E-mail:  npb@nas.nasa.gov                                      ! 
-!          Fax:     (650) 604-3957                                        ! 
-!                                                                         ! 
-!-------------------------------------------------------------------------! 
-!--------------------------------------------------------------------- 
-!      
-! Authors: M. Yarrow 
-!          C. Kuszmaul 
-!          R. F. Van der Wijngaart 
-!          H. Jin 
-!      
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         PROGRAM CG
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-
-      INCLUDE 'mpinpb.h' 
-      INCLUDE 'timing.h' 
-         INTEGER ::  STATUS(MPI_STATUS_SIZE),REQUEST,IERR
-
-      INCLUDE 'npbparams.h' 
-         INTEGER ::  NUM_PROCS
-         PARAMETER (NUM_PROCS = NUM_PROC_COLS * NUM_PROC_ROWS)
-
-!--------------------------------------------------------------------- 
-!  Class specific parameters:  
-!  It appears here for reference only. 
-!  These are their values, however, this info is imported in the npbparams.h 
-!  include file, which is written by the sys/setparams.c program. 
-!--------------------------------------------------------------------- 
-!---------- 
-!  Class S: 
-!---------- 
-!C       parameter( na=1400,  
-!C      >           nonzer=7,  
-!C      >           shift=10.,  
-!C      >           niter=15, 
-!C      >           rcond=1.0d-1 ) 
-!---------- 
-!  Class W: 
-!---------- 
-!C       parameter( na=7000, 
-!C      >           nonzer=8,  
-!C      >           shift=12.,  
-!C      >           niter=15, 
-!C      >           rcond=1.0d-1 ) 
-!---------- 
-!  Class A: 
-!---------- 
-!C       parameter( na=14000, 
-!C      >           nonzer=11,  
-!C      >           shift=20.,  
-!C      >           niter=15, 
-!C      >           rcond=1.0d-1 ) 
-!---------- 
-!  Class B: 
-!---------- 
-!C       parameter( na=75000,  
-!C      >           nonzer=13,  
-!C      >           shift=60.,  
-!C      >           niter=75, 
-!C      >           rcond=1.0d-1 ) 
-!---------- 
-!  Class C: 
-!---------- 
-!C       parameter( na=150000,  
-!C      >           nonzer=15,  
-!C      >           shift=110.,  
-!C      >           niter=75, 
-!C      >           rcond=1.0d-1 ) 
-!---------- 
-!  Class D: 
-!---------- 
-!C       parameter( na=1500000,  
-!C      >           nonzer=21,  
-!C      >           shift=500.,  
-!C      >           niter=100, 
-!C      >           rcond=1.0d-1 ) 
-!---------- 
-!  Class E: 
-!---------- 
-!C       parameter( na=9000000,  
-!C      >           nonzer=26,  
-!C      >           shift=1500.,  
-!C      >           niter=100, 
-!C      >           rcond=1.0d-1 ) 
-         INTEGER ::  NZ
-         PARAMETER (NZ = NA * (NONZER + 1) / NUM_PROCS * (NONZER + 1) + 
-     &NONZER + NA * (NONZER + 2 + NUM_PROCS / 256) / NUM_PROC_COLS)
-         COMMON /PARTIT_SIZE/NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,FIR
-     &STROW,LASTROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_STA
-     &RT,SEND_LEN
-         INTEGER ::  NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,FIRSTROW,LA
-     &STROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_START,SEND_
-     &LEN
-         COMMON /MAIN_INT_MEM/COLIDX,ROWSTR,IV,AROW,ACOL
-         INTEGER ::  COLIDX(NZ),ROWSTR(NA + 1),IV(2 * NA + 1),AROW(NZ),A
-     &COL(NZ)
-         COMMON /MAIN_FLT_MEM/V,AELT,A,X,Z,P,Q,R,W
-         DOUBLE PRECISION ::  V(NA + 1),AELT(NZ),A(NZ),X(NA / NUM_PROC_R
-     &OWS + 2),Z(NA / NUM_PROC_ROWS + 2),P(NA / NUM_PROC_ROWS + 2),Q(NA 
-     &/ NUM_PROC_ROWS + 2),R(NA / NUM_PROC_ROWS + 2),W(NA / NUM_PROC_ROW
-     &S + 2)
-         COMMON /URANDO/AMULT,TRAN
-         DOUBLE PRECISION ::  AMULT,TRAN
-         INTEGER ::  L2NPCOLS
-         INTEGER ::  REDUCE_EXCH_PROC(NUM_PROC_COLS)
-         INTEGER ::  REDUCE_SEND_STARTS(NUM_PROC_COLS)
-         INTEGER ::  REDUCE_SEND_LENGTHS(NUM_PROC_COLS)
-         INTEGER ::  REDUCE_RECV_STARTS(NUM_PROC_COLS)
-         INTEGER ::  REDUCE_RECV_LENGTHS(NUM_PROC_COLS)
-         INTEGER ::  I,J,K,IT
-         DOUBLE PRECISION ::  ZETA,RANDLC
-         EXTERNAL RANDLC
-         DOUBLE PRECISION ::  RNORM
-         DOUBLE PRECISION ::  NORM_TEMP1(2),NORM_TEMP2(2)
-         DOUBLE PRECISION ::  T,TMAX,MFLOPS
-         EXTERNAL TIMER_READ
-         DOUBLE PRECISION ::  TIMER_READ
-         CHARACTER ::  CLASS
-         LOGICAL ::  VERIFIED
-         DOUBLE PRECISION ::  ZETA_VERIFY_VALUE,EPSILON,ERR
-         DOUBLE PRECISION ::  TSUM(T_LAST + 2),T1(T_LAST + 2),TMING(T_LA
-     &ST + 2),TMAXG(T_LAST + 2)
-         CHARACTER ::  T_RECS(T_LAST + 2)*8
-         DATA T_RECS/'total', 'conjg', 'rcomm', 'ncomm',            ' to
-     &tcomp', ' totcomm'/ 
-         INTERFACE 
-            SUBROUTINE CONJ_GRAD (COLIDX, ROWSTR, X, Z, A, P, Q, R, W, R
-     &NORM, L2NPCOLS, REDUCE_EXCH_PROC, REDUCE_SEND_STARTS, REDUCE_SEND_
-     &LENGTHS, REDUCE_RECV_STARTS, REDUCE_RECV_LENGTHS)
-            IMPLICIT NONE
-            COMMON /PARTIT_SIZE/NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,
-     &FIRSTROW,LASTROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_
-     &START,SEND_LEN
-            INTEGER ::  NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,FIRSTROW
-     &,LASTROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_START,SE
-     &ND_LEN
-            DOUBLE PRECISION ::  X(:),Z(:),P(:),Q(:),R(:),W(:)
-            DOUBLE PRECISION ::  A(NZZ)
-            INTEGER ::  COLIDX(NZZ),ROWSTR(NAA + 1)
-            INTEGER ::  L2NPCOLS
-            INTEGER ::  REDUCE_EXCH_PROC(L2NPCOLS)
-            INTEGER ::  REDUCE_SEND_STARTS(L2NPCOLS)
-            INTEGER ::  REDUCE_SEND_LENGTHS(L2NPCOLS)
-            INTEGER ::  REDUCE_RECV_STARTS(L2NPCOLS)
-            INTEGER ::  REDUCE_RECV_LENGTHS(L2NPCOLS)
-            DOUBLE PRECISION ::  D,SUM,RHO,RHO0,ALPHA,BETA,RNORM
-            END SUBROUTINE  
-         END INTERFACE
-
-!--------------------------------------------------------------------- 
-!  Set up mpi initialization and number of proc testing 
-!--------------------------------------------------------------------- 
-         CALL INITIALIZE_MPI()
-         IF (NA .EQ. 1400 .AND. NONZER .EQ. 7 .AND. NITER .EQ. 15 .AND. 
-     &SHIFT .EQ. 10.D0) THEN
-            CLASS = 'S'
-            ZETA_VERIFY_VALUE = 8.5971775078648D0
-         ELSE IF (NA .EQ. 7000 .AND. NONZER .EQ. 8 .AND. NITER .EQ. 15 .
-     &AND. SHIFT .EQ. 12.D0) THEN  
-            CLASS = 'W'
-            ZETA_VERIFY_VALUE = 10.362595087124D0
-         ELSE IF (NA .EQ. 14000 .AND. NONZER .EQ. 11 .AND. NITER .EQ. 15
-     & .AND. SHIFT .EQ. 20.D0) THEN  
-            CLASS = 'A'
-            ZETA_VERIFY_VALUE = 17.130235054029D0
-         ELSE IF (NA .EQ. 75000 .AND. NONZER .EQ. 13 .AND. NITER .EQ. 75
-     & .AND. SHIFT .EQ. 60.D0) THEN  
-            CLASS = 'B'
-            ZETA_VERIFY_VALUE = 22.712745482631D0
-         ELSE IF (NA .EQ. 150000 .AND. NONZER .EQ. 15 .AND. NITER .EQ. 7
-     &5 .AND. SHIFT .EQ. 110.D0) THEN  
-            CLASS = 'C'
-            ZETA_VERIFY_VALUE = 28.973605592845D0
-         ELSE IF (NA .EQ. 1500000 .AND. NONZER .EQ. 21 .AND. NITER .EQ. 
-     &100 .AND. SHIFT .EQ. 500.D0) THEN  
-            CLASS = 'D'
-            ZETA_VERIFY_VALUE = 52.514532105794D0
-         ELSE IF (NA .EQ. 9000000 .AND. NONZER .EQ. 26 .AND. NITER .EQ. 
-     &100 .AND. SHIFT .EQ. 1.5D3) THEN  
-            CLASS = 'E'
-            ZETA_VERIFY_VALUE = 77.522164599383D0
-         ELSE  
-            CLASS = 'U'
-         ENDIF  
-         IF (ME .EQ. ROOT) THEN
-            WRITE (UNIT = *,FMT = 1000) 
-            WRITE (UNIT = *,FMT = 1001) NA
-            WRITE (UNIT = *,FMT = 1002) NITER
-            WRITE (UNIT = *,FMT = 1003) NPROCS
-            WRITE (UNIT = *,FMT = 1004) NONZER
-            WRITE (UNIT = *,FMT = 1005) SHIFT
-1000              FORMAT(//,' NAS Parallel Benchmarks 3.3 -- CG Benchmar
-     &k', /)
-1001              FORMAT(' Size: ', I10 ) 
-1002              FORMAT(' Iterations: ', I5 ) 
-1003              FORMAT(' Number of active processes: ', I5 ) 
-1004              FORMAT(' Number of nonzeroes per row: ', I8) 
-1005              FORMAT(' Eigenvalue shift: ', E8.3) 
-         ENDIF  
-         IF (.NOT.(CONVERTDOUBLE)) THEN
-            DP_TYPE = MPI_DOUBLE_PRECISION
-         ELSE  
-            DP_TYPE = MPI_REAL
-         ENDIF  
-         NAA = NA
-         NZZ = NZ
-
-!--------------------------------------------------------------------- 
-!  Set up processor info, such as whether sq num of procs, etc 
-!--------------------------------------------------------------------- 
-         CALL SETUP_PROC_INFO(NUM_PROCS,NUM_PROC_ROWS,NUM_PROC_COLS)
-
-!--------------------------------------------------------------------- 
-!  Set up partition's submatrix info: firstcol, lastcol, firstrow, lastrow 
-!--------------------------------------------------------------------- 
-         CALL SETUP_SUBMATRIX_INFO(L2NPCOLS,REDUCE_EXCH_PROC,REDUCE_SEND
-     &_STARTS,REDUCE_SEND_LENGTHS,REDUCE_RECV_STARTS,REDUCE_RECV_LENGTHS
-     &)
-         DO  I = 1,T_LAST
-            CALL TIMER_CLEAR(I)
-         ENDDO  
-
-!--------------------------------------------------------------------- 
-!  Inialize random number generator 
-!--------------------------------------------------------------------- 
-         TRAN = 314159265.0D0
-         AMULT = 1220703125.0D0
-         ZETA = RANDLC (TRAN,AMULT)
-
-!--------------------------------------------------------------------- 
-!  Set up partition's sparse random matrix for given class size 
-!--------------------------------------------------------------------- 
-         CALL MAKEA(NAA,NZZ,A,COLIDX,ROWSTR,NONZER,FIRSTROW,LASTROW,FIRS
-     &TCOL,LASTCOL,RCOND,AROW,ACOL,AELT,V,IV,SHIFT)
-
-!--------------------------------------------------------------------- 
-!  Note: as a result of the above call to makea: 
-!        values of j used in indexing rowstr go from 1 --> lastrow-firstrow+1 
-!        values of colidx which are col indexes go from firstcol --> lastcol 
-!        So: 
-!        Shift the col index vals from actual (firstcol --> lastcol )  
-!        to local, i.e., (1 --> lastcol-firstcol+1) 
-!--------------------------------------------------------------------- 
-!DVM$    GET_ACTUAL (COLIDX,ROWSTR)
-         DO  J = 1,LASTROW - FIRSTROW + 1
-            DO  K = ROWSTR(J),ROWSTR(J + 1) - 1
-               COLIDX(K) = COLIDX(K) - FIRSTCOL + 1
-            ENDDO  
-         ENDDO  
-!DVM$    ACTUAL (COLIDX)
-
-!--------------------------------------------------------------------- 
-!  set starting vector to (1, 1, .... 1) 
-!--------------------------------------------------------------------- 
-!DVM$    REGION 
-!DVM$    PARALLEL (I), PRIVATE (I),TIE (X(I))
-         DO  I = 1,NA / NUM_PROC_ROWS + 1
-            X(I) = 1.0D0
-         ENDDO  
-!DVM$    END REGION
-         ZETA = 0.0D0
-
-!--------------------------------------------------------------------- 
-!----> 
-!  Do one iteration untimed to init all code and data page tables 
-!---->                    (then reinit, start timing, to niter its) 
-!--------------------------------------------------------------------- 
-         DO  IT = 1,1
-
-!--------------------------------------------------------------------- 
-!  The call to the conjugate gradient routine: 
-!--------------------------------------------------------------------- 
-            CALL CONJ_GRAD(COLIDX,ROWSTR,X,Z,A,P,Q,R,W,RNORM,L2NPCOLS,RE
-     &DUCE_EXCH_PROC,REDUCE_SEND_STARTS,REDUCE_SEND_LENGTHS,REDUCE_RECV_
-     &STARTS,REDUCE_RECV_LENGTHS)
-
-!--------------------------------------------------------------------- 
-!  zeta = shift + 1/(x.z) 
-!  So, first: (x.z) 
-!  Also, find norm of z 
-!  So, first: (z.z) 
-!--------------------------------------------------------------------- 
-            NORM_TEMP1(1) = 0.0D0
-            NORM_TEMP1(2) = 0.0D0
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (X(J),Z(J)),REDUCTION (SUM (NO
-!DVM$&RM_TEMP1))
-            DO  J = 1,LASTCOL - FIRSTCOL + 1
-               NORM_TEMP1(1) = NORM_TEMP1(1) + X(J) * Z(J)
-               NORM_TEMP1(2) = NORM_TEMP1(2) + Z(J) * Z(J)
-            ENDDO  
-!DVM$       END REGION
-            DO  I = 1,L2NPCOLS
-               IF (TIMERON)  CALL TIMER_START(T_NCOMM)
-               CALL MPI_IRECV(NORM_TEMP2,2,DP_TYPE,REDUCE_EXCH_PROC(I),I
-     &,MPI_COMM_WORLD,REQUEST,IERR)
-               CALL MPI_SEND(NORM_TEMP1,2,DP_TYPE,REDUCE_EXCH_PROC(I),I,
-     &MPI_COMM_WORLD,IERR)
-               CALL MPI_WAIT(REQUEST,STATUS,IERR)
-               IF (TIMERON)  CALL TIMER_STOP(T_NCOMM)
-               NORM_TEMP1(1) = NORM_TEMP1(1) + NORM_TEMP2(1)
-               NORM_TEMP1(2) = NORM_TEMP1(2) + NORM_TEMP2(2)
-            ENDDO  
-!DVM$       GET_ACTUAL (NORM_TEMP1)
-            NORM_TEMP1(2) = 1.0D0 / SQRT (NORM_TEMP1(2))
-!DVM$       ACTUAL (NORM_TEMP1(2))
-
-!--------------------------------------------------------------------- 
-!  Normalize z to obtain x 
-!--------------------------------------------------------------------- 
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (X(J),Z(J))
-            DO  J = 1,LASTCOL - FIRSTCOL + 1
-               X(J) = NORM_TEMP1(2) * Z(J)
-            ENDDO  
-!DVM$       END REGION
-
-! end of do one iteration untimed 
-         ENDDO  
-
-!--------------------------------------------------------------------- 
-!  set starting vector to (1, 1, .... 1) 
-!--------------------------------------------------------------------- 
-!      
-!  NOTE: a questionable limit on size:  should this be na/num_proc_cols+1 ? 
-!      
-!DVM$    REGION 
-!DVM$    PARALLEL (I), PRIVATE (I),TIE (X(I))
-         DO  I = 1,NA / NUM_PROC_ROWS + 1
-            X(I) = 1.0D0
-         ENDDO  
-!DVM$    END REGION
-         ZETA = 0.0D0
-
-!--------------------------------------------------------------------- 
-!  Synchronize and start timing 
-!--------------------------------------------------------------------- 
-         DO  I = 1,T_LAST
-            CALL TIMER_CLEAR(I)
-         ENDDO  
-         CALL MPI_BARRIER(MPI_COMM_WORLD,IERR)
-         CALL TIMER_CLEAR(1)
-         CALL TIMER_START(1)
-
-!--------------------------------------------------------------------- 
-!----> 
-!  Main Iteration for inverse power method 
-!----> 
-!--------------------------------------------------------------------- 
-         DO  IT = 1,NITER
-
-!--------------------------------------------------------------------- 
-!  The call to the conjugate gradient routine: 
-!--------------------------------------------------------------------- 
-            CALL CONJ_GRAD(COLIDX,ROWSTR,X,Z,A,P,Q,R,W,RNORM,L2NPCOLS,RE
-     &DUCE_EXCH_PROC,REDUCE_SEND_STARTS,REDUCE_SEND_LENGTHS,REDUCE_RECV_
-     &STARTS,REDUCE_RECV_LENGTHS)
-
-!--------------------------------------------------------------------- 
-!  zeta = shift + 1/(x.z) 
-!  So, first: (x.z) 
-!  Also, find norm of z 
-!  So, first: (z.z) 
-!--------------------------------------------------------------------- 
-            NORM_TEMP1(1) = 0.0D0
-            NORM_TEMP1(2) = 0.0D0
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (X(J),Z(J)),REDUCTION (SUM (NO
-!DVM$&RM_TEMP1))
-            DO  J = 1,LASTCOL - FIRSTCOL + 1
-               NORM_TEMP1(1) = NORM_TEMP1(1) + X(J) * Z(J)
-               NORM_TEMP1(2) = NORM_TEMP1(2) + Z(J) * Z(J)
-            ENDDO  
-!DVM$       END REGION
-            DO  I = 1,L2NPCOLS
-               IF (TIMERON)  CALL TIMER_START(T_NCOMM)
-               CALL MPI_IRECV(NORM_TEMP2,2,DP_TYPE,REDUCE_EXCH_PROC(I),I
-     &,MPI_COMM_WORLD,REQUEST,IERR)
-               CALL MPI_SEND(NORM_TEMP1,2,DP_TYPE,REDUCE_EXCH_PROC(I),I,
-     &MPI_COMM_WORLD,IERR)
-               CALL MPI_WAIT(REQUEST,STATUS,IERR)
-               IF (TIMERON)  CALL TIMER_STOP(T_NCOMM)
-               NORM_TEMP1(1) = NORM_TEMP1(1) + NORM_TEMP2(1)
-               NORM_TEMP1(2) = NORM_TEMP1(2) + NORM_TEMP2(2)
-            ENDDO  
-!DVM$       GET_ACTUAL (NORM_TEMP1)
-            NORM_TEMP1(2) = 1.0D0 / SQRT (NORM_TEMP1(2))
-!DVM$       ACTUAL (NORM_TEMP1(2))
-            IF (ME .EQ. ROOT) THEN
-               ZETA = SHIFT + 1.0D0 / NORM_TEMP1(1)
-               IF (IT .EQ. 1)  WRITE (UNIT = *,FMT = 9000) 
-               WRITE (UNIT = *,FMT = 9001) IT,RNORM,ZETA
-            ENDIF  
-9000              FORMAT( /,'   iteration           ||r||               
-     &  zeta' ) 
-9001              FORMAT( 4X, I5, 7X, E20.14, F20.13 ) 
-
-!--------------------------------------------------------------------- 
-!  Normalize z to obtain x 
-!--------------------------------------------------------------------- 
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (X(J),Z(J))
-            DO  J = 1,LASTCOL - FIRSTCOL + 1
-               X(J) = NORM_TEMP1(2) * Z(J)
-            ENDDO  
-!DVM$       END REGION
-
-! end of main iter inv pow meth 
-         ENDDO  
-         CALL TIMER_STOP(1)
-
-!--------------------------------------------------------------------- 
-!  End of timed section 
-!--------------------------------------------------------------------- 
-         T = TIMER_READ (1)
-         CALL MPI_REDUCE(T,TMAX,1,DP_TYPE,MPI_MAX,ROOT,MPI_COMM_WORLD,IE
-     &RR)
-         IF (ME .EQ. ROOT) THEN
-            WRITE (UNIT = *,FMT = 100) 
-100                  FORMAT(' Benchmark completed ') 
-            EPSILON = 1.D-10
-            IF (CLASS .NE. 'U') THEN
-               ERR = ABS (ZETA - ZETA_VERIFY_VALUE) / ZETA_VERIFY_VALUE
-               IF (ERR .LE. EPSILON) THEN
-                  VERIFIED = .TRUE.
-                  WRITE (UNIT = *,FMT = 200) 
-                  WRITE (UNIT = *,FMT = 201) ZETA
-                  WRITE (UNIT = *,FMT = 202) ERR
-200                                          FORMAT(' VERIFICATION SUCCE
-     &SSFUL ') 
-201                                          FORMAT(' Zeta is    ', E20.
-     &13) 
-202                                          FORMAT(' Error is   ', E20.
-     &13) 
-               ELSE  
-                  VERIFIED = .FALSE.
-                  WRITE (UNIT = *,FMT = 300) 
-                  WRITE (UNIT = *,FMT = 301) ZETA
-                  WRITE (UNIT = *,FMT = 302) ZETA_VERIFY_VALUE
-300                                          FORMAT(' VERIFICATION FAILE
-     &D') 
-301                                          FORMAT(' Zeta              
-     &  ', E20.13)
-302                                          FORMAT(' The correct zeta i
-     &s ', E20.13)
-               ENDIF  
-            ELSE  
-               VERIFIED = .FALSE.
-               WRITE (UNIT = *,FMT = 400) 
-               WRITE (UNIT = *,FMT = 401) 
-               WRITE (UNIT = *,FMT = 201) ZETA
-400                              FORMAT(' Problem size unknown') 
-401                              FORMAT(' NO VERIFICATION PERFORMED') 
-            ENDIF  
-            IF (TMAX .NE. 0.) THEN
-               MFLOPS = FLOAT (2 * 75 * 150000) * (3. + FLOAT (15 * (15 
-     &+ 1)) + 25. * (5. + FLOAT (15 * (15 + 1))) + 3.) / TMAX / 1000000.
-     &0
-            ELSE  
-               MFLOPS = 0.0
-            ENDIF  
-            CALL PRINT_RESULTS('CG',CLASS,NA,0,0,NITER,NNODES_COMPILED,N
-     &PROCS,TMAX,MFLOPS,'          floating point',VERIFIED,NPBVERSION,C
-     &OMPILETIME,CS1,CS2,CS3,CS4,CS5,CS6,CS7)
-         ENDIF  
-         IF (.NOT.(TIMERON))  GOTO 999
-!DVM$    GET_ACTUAL (T1)
-         DO  I = 1,T_LAST
-            T1(I) = TIMER_READ (I)
-         ENDDO  
-!DVM$    ACTUAL (T1)
-         T1(T_CONJG) = T1(T_CONJG) - T1(T_RCOMM)
-!DVM$    ACTUAL (T1(T_CONJG))
-         T1(T_LAST + 2) = T1(T_RCOMM) + T1(T_NCOMM)
-!DVM$    ACTUAL (T1(T_LAST + 2))
-         T1(T_LAST + 1) = T1(T_TOTAL) - T1(T_LAST + 2)
-!DVM$    ACTUAL (T1(T_LAST + 1))
-         CALL MPI_REDUCE(T1,TSUM,4 + 2,DP_TYPE,MPI_SUM,0,MPI_COMM_WORLD,
-     &IERR)
-!DVM$    GET_ACTUAL (T1)
-         CALL MPI_REDUCE(T1,TMING,4 + 2,DP_TYPE,MPI_MIN,0,MPI_COMM_WORLD
-     &,IERR)
-!DVM$    GET_ACTUAL (T1)
-         CALL MPI_REDUCE(T1,TMAXG,4 + 2,DP_TYPE,MPI_MAX,0,MPI_COMM_WORLD
-     &,IERR)
-         IF (ME .EQ. 0) THEN
-            WRITE (UNIT = *,FMT = 800) NPROCS
-!DVM$       GET_ACTUAL (T_RECS,TMAXG,TMING,TSUM)
-            DO  I = 1,T_LAST + 2
-               TSUM(I) = TSUM(I) / NPROCS
-               WRITE (UNIT = *,FMT = 810) I,T_RECS(I),TMING(I),TMAXG(I),
-     &TSUM(I)
-            ENDDO  
-!DVM$       ACTUAL (TSUM)
-         ENDIF  
-800      FORMAT(' nprocs =', I6, 11X, 'minimum', 5X, 'maximum',        5
-     &X, 'average') 
-810      FORMAT(' timer ', I2, '(', A8, ') :', 3(2X,F10.4)) 
-999      CONTINUE
-         CALL MPI_FINALIZE(IERR)
-
-! end main 
-         END
-
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         SUBROUTINE INITIALIZE_MPI ()
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-
-      INCLUDE 'mpinpb.h' 
-      INCLUDE 'timing.h' 
-         INTEGER ::  IERR,FSTATUS
-         CALL MPI_INIT(IERR)
-         CALL MPI_COMM_RANK(MPI_COMM_WORLD,ME,IERR)
-         CALL MPI_COMM_SIZE(MPI_COMM_WORLD,NPROCS,IERR)
-         ROOT = 0
-         IF (ME .EQ. ROOT) THEN
-            OPEN (UNIT = 2,FILE = 'timer.flag',STATUS = 'old',IOSTAT = F
-     &STATUS)
-            TIMERON = .FALSE.
-            IF (FSTATUS .EQ. 0) THEN
-               TIMERON = .TRUE.
-               CLOSE (UNIT = 2)
-            ENDIF  
-         ENDIF  
-         CALL MPI_BCAST(TIMERON,1,MPI_LOGICAL,0,MPI_COMM_WORLD,IERR)
-         RETURN 
-         END
-
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         SUBROUTINE SETUP_PROC_INFO (NUM_PROCS, NUM_PROC_ROWS, NUM_PROC_
-     &COLS)
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-
-      INCLUDE 'mpinpb.h' 
-         COMMON /PARTIT_SIZE/NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,FIR
-     &STROW,LASTROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_STA
-     &RT,SEND_LEN
-         INTEGER ::  NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,FIRSTROW,LA
-     &STROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_START,SEND_
-     &LEN
-         INTEGER ::  NUM_PROCS,NUM_PROC_COLS,NUM_PROC_ROWS
-         INTEGER ::  I,IERR
-         INTEGER ::  LOG2NPROCS
-         INTENT(IN) NUM_PROC_COLS,NUM_PROC_ROWS,NUM_PROCS
-
-!--------------------------------------------------------------------- 
-!  num_procs must be a power of 2, and num_procs=num_proc_cols*num_proc_rows 
-!  When num_procs is not square, then num_proc_cols = 2*num_proc_rows 
-!--------------------------------------------------------------------- 
-!  First, number of procs must be power of two.  
-!--------------------------------------------------------------------- 
-         IF (NPROCS .NE. NUM_PROCS) THEN
-            IF (ME .EQ. ROOT)  WRITE (UNIT = *,FMT = 9000) NPROCS,NUM_PR
-     &OCS
-9000                  FORMAT(      /,'Error: ',/,'num of procs allocated
-     &   (',                  I4, ' )',                 /,'is not equal 
-     &to',/,                 'compiled number of procs (',              
-     &   I4, ' )',/   ) 
-            CALL MPI_FINALIZE(IERR)
-            STOP
-         ENDIF  
-         I = NUM_PROC_COLS
-100      CONTINUE
-         IF (I .NE. 1 .AND. I / 2 * 2 .NE. I) THEN
-            IF (ME .EQ. ROOT) THEN
-               WRITE (UNIT = *,FMT = *) 'Error: num_proc_cols is ',NUM_P
-     &ROC_COLS,' which is not a power of two'
-            ENDIF  
-            CALL MPI_FINALIZE(IERR)
-            STOP
-         ENDIF  
-         I = I / 2
-         IF (I .NE. 0) THEN
-            GOTO 100
-         ENDIF  
-         I = NUM_PROC_ROWS
-200      CONTINUE
-         IF (I .NE. 1 .AND. I / 2 * 2 .NE. I) THEN
-            IF (ME .EQ. ROOT) THEN
-               WRITE (UNIT = *,FMT = *) 'Error: num_proc_rows is ',NUM_P
-     &ROC_ROWS,' which is not a power of two'
-            ENDIF  
-            CALL MPI_FINALIZE(IERR)
-            STOP
-         ENDIF  
-         I = I / 2
-         IF (I .NE. 0) THEN
-            GOTO 200
-         ENDIF  
-         LOG2NPROCS = 0
-         I = NPROCS
-300      CONTINUE
-         IF (I .NE. 1 .AND. I / 2 * 2 .NE. I) THEN
-            WRITE (UNIT = *,FMT = *) 'Error: nprocs is ',NPROCS,' which 
-     &is not a power of two'
-            CALL MPI_FINALIZE(IERR)
-            STOP
-         ENDIF  
-         I = I / 2
-         IF (I .NE. 0) THEN
-            LOG2NPROCS = LOG2NPROCS + 1
-            GOTO 300
-         ENDIF  
-
-!C       write( *,* ) 'nprocs, log2nprocs: ',nprocs,log2nprocs 
-         NPCOLS = NUM_PROC_COLS
-         NPROWS = NUM_PROC_ROWS
-         RETURN 
-         END
-
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         SUBROUTINE SETUP_SUBMATRIX_INFO (L2NPCOLS, REDUCE_EXCH_PROC, RE
-     &DUCE_SEND_STARTS, REDUCE_SEND_LENGTHS, REDUCE_RECV_STARTS, REDUCE_
-     &RECV_LENGTHS)
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-
-      INCLUDE 'mpinpb.h' 
-      INCLUDE 'npbparams.h' 
-         INTEGER ::  COL_SIZE,ROW_SIZE
-         COMMON /PARTIT_SIZE/NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,FIR
-     &STROW,LASTROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_STA
-     &RT,SEND_LEN
-         INTEGER ::  NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,FIRSTROW,LA
-     &STROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_START,SEND_
-     &LEN
-         INTEGER ::  REDUCE_EXCH_PROC(NUM_PROC_COLS)
-         INTEGER ::  REDUCE_SEND_STARTS(NUM_PROC_COLS)
-         INTEGER ::  REDUCE_SEND_LENGTHS(NUM_PROC_COLS)
-         INTEGER ::  REDUCE_RECV_STARTS(NUM_PROC_COLS)
-         INTEGER ::  REDUCE_RECV_LENGTHS(NUM_PROC_COLS)
-         INTEGER ::  I,J
-         INTEGER ::  DIV_FACTOR
-         INTEGER ::  L2NPCOLS
-         INTENT(INOUT) L2NPCOLS
-         INTENT(OUT) REDUCE_RECV_LENGTHS,REDUCE_RECV_STARTS,REDUCE_SEND_
-     &LENGTHS,REDUCE_SEND_STARTS,REDUCE_EXCH_PROC
-         PROC_ROW = ME / NPCOLS
-         PROC_COL = ME - PROC_ROW * NPCOLS
-
-!--------------------------------------------------------------------- 
-!  If naa evenly divisible by npcols, then it is evenly divisible  
-!  by nprows  
-!--------------------------------------------------------------------- 
-         IF (NAA / NPCOLS * NPCOLS .EQ. NAA) THEN
-            COL_SIZE = NAA / NPCOLS
-            FIRSTCOL = PROC_COL * COL_SIZE + 1
-            LASTCOL = FIRSTCOL - 1 + COL_SIZE
-            ROW_SIZE = NAA / NPROWS
-            FIRSTROW = PROC_ROW * ROW_SIZE + 1
-            LASTROW = FIRSTROW - 1 + ROW_SIZE
-
-!--------------------------------------------------------------------- 
-!  If naa not evenly divisible by npcols, then first subdivide for nprows 
-!  and then, if npcols not equal to nprows (i.e., not a sq number of procs),  
-!  get col subdivisions by dividing by 2 each row subdivision. 
-!--------------------------------------------------------------------- 
-         ELSE  
-            IF (PROC_ROW .LT. NAA - NAA / NPROWS * NPROWS) THEN
-               ROW_SIZE = NAA / NPROWS + 1
-               FIRSTROW = PROC_ROW * ROW_SIZE + 1
-               LASTROW = FIRSTROW - 1 + ROW_SIZE
-            ELSE  
-               ROW_SIZE = NAA / NPROWS
-               FIRSTROW = (NAA - NAA / NPROWS * NPROWS) * (ROW_SIZE + 1)
-     & + (PROC_ROW - (NAA - NAA / NPROWS * NPROWS)) * ROW_SIZE + 1
-               LASTROW = FIRSTROW - 1 + ROW_SIZE
-            ENDIF  
-            IF (NPCOLS .EQ. NPROWS) THEN
-               IF (PROC_COL .LT. NAA - NAA / NPCOLS * NPCOLS) THEN
-                  COL_SIZE = NAA / NPCOLS + 1
-                  FIRSTCOL = PROC_COL * COL_SIZE + 1
-                  LASTCOL = FIRSTCOL - 1 + COL_SIZE
-               ELSE  
-                  COL_SIZE = NAA / NPCOLS
-                  FIRSTCOL = (NAA - NAA / NPCOLS * NPCOLS) * (COL_SIZE +
-     & 1) + (PROC_COL - (NAA - NAA / NPCOLS * NPCOLS)) * COL_SIZE + 1
-                  LASTCOL = FIRSTCOL - 1 + COL_SIZE
-               ENDIF  
-            ELSE  
-               IF (PROC_COL / 2 .LT. NAA - NAA / (NPCOLS / 2) * (NPCOLS 
-     &/ 2)) THEN
-                  COL_SIZE = NAA / (NPCOLS / 2) + 1
-                  FIRSTCOL = PROC_COL / 2 * COL_SIZE + 1
-                  LASTCOL = FIRSTCOL - 1 + COL_SIZE
-               ELSE  
-                  COL_SIZE = NAA / (NPCOLS / 2)
-                  FIRSTCOL = (NAA - NAA / (NPCOLS / 2) * (NPCOLS / 2)) *
-     & (COL_SIZE + 1) + (PROC_COL / 2 - (NAA - NAA / (NPCOLS / 2) * (NPC
-     &OLS / 2))) * COL_SIZE + 1
-                  LASTCOL = FIRSTCOL - 1 + COL_SIZE
-               ENDIF  
-
-!C               write( *,* ) col_size,firstcol,lastcol 
-               IF (MOD (ME,2) .EQ. 0) THEN
-                  LASTCOL = FIRSTCOL - 1 + (COL_SIZE - 1) / 2 + 1
-               ELSE  
-                  FIRSTCOL = FIRSTCOL + (COL_SIZE - 1) / 2 + 1
-                  LASTCOL = FIRSTCOL - 1 + COL_SIZE / 2
-
-!C                   write( *,* ) firstcol,lastcol 
-               ENDIF  
-            ENDIF  
-         ENDIF  
-         IF (NPCOLS .EQ. NPROWS) THEN
-            SEND_START = 1
-            SEND_LEN = LASTROW - FIRSTROW + 1
-         ELSE  
-            IF (MOD (ME,2) .EQ. 0) THEN
-               SEND_START = 1
-               SEND_LEN = (1 + LASTROW - FIRSTROW + 1) / 2
-            ELSE  
-               SEND_START = (1 + LASTROW - FIRSTROW + 1) / 2 + 1
-               SEND_LEN = (LASTROW - FIRSTROW + 1) / 2
-            ENDIF  
-         ENDIF  
-
-!--------------------------------------------------------------------- 
-!  Transpose exchange processor 
-!--------------------------------------------------------------------- 
-         IF (NPCOLS .EQ. NPROWS) THEN
-            EXCH_PROC = MOD (ME,NPROWS) * NPROWS + ME / NPROWS
-         ELSE  
-            EXCH_PROC = 2 * (MOD (ME / 2,NPROWS) * NPROWS + ME / 2 / NPR
-     &OWS) + MOD (ME,2)
-         ENDIF  
-         I = NPCOLS / 2
-         L2NPCOLS = 0
-         DO WHILE (I .GT. 0)
-            L2NPCOLS = L2NPCOLS + 1
-            I = I / 2
-         ENDDO  
-
-!--------------------------------------------------------------------- 
-!  Set up the reduce phase schedules... 
-!--------------------------------------------------------------------- 
-         DIV_FACTOR = NPCOLS
-!DVM$    GET_ACTUAL (REDUCE_EXCH_PROC)
-         DO  I = 1,L2NPCOLS
-            J = MOD (PROC_COL + DIV_FACTOR / 2,DIV_FACTOR) + PROC_COL / 
-     &DIV_FACTOR * DIV_FACTOR
-            REDUCE_EXCH_PROC(I) = PROC_ROW * NPCOLS + J
-            DIV_FACTOR = DIV_FACTOR / 2
-         ENDDO  
-!DVM$    ACTUAL (REDUCE_EXCH_PROC)
-!DVM$    GET_ACTUAL (REDUCE_RECV_LENGTHS,REDUCE_RECV_STARTS,REDUCE_SEND_
-!DVM$&LENGTHS,REDUCE_SEND_STARTS)
-         DO  I = L2NPCOLS,1,(-(1))
-            IF (NPROWS .EQ. NPCOLS) THEN
-               REDUCE_SEND_STARTS(I) = SEND_START
-               REDUCE_SEND_LENGTHS(I) = SEND_LEN
-               REDUCE_RECV_LENGTHS(I) = LASTROW - FIRSTROW + 1
-            ELSE  
-               REDUCE_RECV_LENGTHS(I) = SEND_LEN
-               IF (I .EQ. L2NPCOLS) THEN
-                  REDUCE_SEND_LENGTHS(I) = LASTROW - FIRSTROW + 1 - SEND
-     &_LEN
-                  IF (ME / 2 * 2 .EQ. ME) THEN
-                     REDUCE_SEND_STARTS(I) = SEND_START + SEND_LEN
-                  ELSE  
-                     REDUCE_SEND_STARTS(I) = 1
-                  ENDIF  
-               ELSE  
-                  REDUCE_SEND_LENGTHS(I) = SEND_LEN
-                  REDUCE_SEND_STARTS(I) = SEND_START
-               ENDIF  
-            ENDIF  
-            REDUCE_RECV_STARTS(I) = SEND_START
-         ENDDO  
-!DVM$    ACTUAL (REDUCE_RECV_LENGTHS,REDUCE_RECV_STARTS,REDUCE_SEND_LENG
-!DVM$&THS,REDUCE_SEND_STARTS)
-         EXCH_RECV_LENGTH = LASTCOL - FIRSTCOL + 1
-         RETURN 
-         END
-
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         SUBROUTINE CONJ_GRAD (COLIDX, ROWSTR, X, Z, A, P, Q, R, W, RNOR
-     &M, L2NPCOLS, REDUCE_EXCH_PROC, REDUCE_SEND_STARTS, REDUCE_SEND_LEN
-     &GTHS, REDUCE_RECV_STARTS, REDUCE_RECV_LENGTHS)
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!  Floaging point arrays here are named as in NPB1 spec discussion of  
-!  CG algorithm 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-
-      INCLUDE 'mpinpb.h' 
-      INCLUDE 'timing.h' 
-         INTEGER ::  STATUS(MPI_STATUS_SIZE),REQUEST
-         COMMON /PARTIT_SIZE/NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,FIR
-     &STROW,LASTROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_STA
-     &RT,SEND_LEN
-         INTEGER ::  NAA,NZZ,NPCOLS,NPROWS,PROC_COL,PROC_ROW,FIRSTROW,LA
-     &STROW,FIRSTCOL,LASTCOL,EXCH_PROC,EXCH_RECV_LENGTH,SEND_START,SEND_
-     &LEN
-         DOUBLE PRECISION ::  X(:),Z(:),A(NZZ)
-         INTEGER ::  COLIDX(NZZ),ROWSTR(NAA + 1)
-
-! used as work temporary 
-         DOUBLE PRECISION ::  P(:),Q(:),R(:),W(:)
-         INTEGER ::  L2NPCOLS
-         INTEGER ::  REDUCE_EXCH_PROC(L2NPCOLS)
-         INTEGER ::  REDUCE_SEND_STARTS(L2NPCOLS)
-         INTEGER ::  REDUCE_SEND_LENGTHS(L2NPCOLS)
-         INTEGER ::  REDUCE_RECV_STARTS(L2NPCOLS)
-         INTEGER ::  REDUCE_RECV_LENGTHS(L2NPCOLS)
-         INTEGER ::  I,J,K,IERR
-         INTEGER ::  CGIT,CGITMAX
-         DOUBLE PRECISION ::  D,SUM,RHO,RHO0,ALPHA,BETA,RNORM
-         EXTERNAL TIMER_READ
-         DOUBLE PRECISION ::  TIMER_READ
-         DATA      CGITMAX / 25 / 
-         INTENT(INOUT) W,R,Q,P,Z
-         INTENT(IN) REDUCE_RECV_LENGTHS,REDUCE_RECV_STARTS,REDUCE_SEND_L
-     &ENGTHS,REDUCE_SEND_STARTS,REDUCE_EXCH_PROC,L2NPCOLS,A,X,ROWSTR,COL
-     &IDX
-         INTENT(OUT) RNORM
-         IF (TIMERON)  CALL TIMER_START(T_CONJG)
-
-!--------------------------------------------------------------------- 
-!  Initialize the CG algorithm: 
-!--------------------------------------------------------------------- 
-!DVM$    REGION 
-!DVM$    PARALLEL (J), PRIVATE (J),TIE (P(J),Q(J),R(J),W(J),X(J),Z(J))
-         DO  J = 1,NAA / NPROWS + 1
-            Q(J) = 0.0D0
-            Z(J) = 0.0D0
-            R(J) = X(J)
-            P(J) = R(J)
-            W(J) = 0.0D0
-         ENDDO  
-!DVM$    END REGION
-
-!--------------------------------------------------------------------- 
-!  rho = r.r 
-!  Now, obtain the norm of r: First, sum squares of r elements locally... 
-!--------------------------------------------------------------------- 
-         SUM = 0.0D0
-!DVM$    REGION 
-!DVM$    PARALLEL (J), PRIVATE (J),TIE (R(J)),REDUCTION (SUM (SUM))
-         DO  J = 1,LASTCOL - FIRSTCOL + 1
-            SUM = SUM + R(J) * R(J)
-         ENDDO  
-!DVM$    END REGION
-
-!--------------------------------------------------------------------- 
-!  Exchange and sum with procs identified in reduce_exch_proc 
-!  (This is equivalent to mpi_allreduce.) 
-!  Sum the partial sums of rho, leaving rho on all processors 
-!--------------------------------------------------------------------- 
-         DO  I = 1,L2NPCOLS
-            IF (TIMERON)  CALL TIMER_START(T_RCOMM)
-            CALL MPI_IRECV(RHO,1,DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COMM_
-     &WORLD,REQUEST,IERR)
-            CALL MPI_SEND(SUM,1,DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COMM_W
-     &ORLD,IERR)
-            CALL MPI_WAIT(REQUEST,STATUS,IERR)
-            IF (TIMERON)  CALL TIMER_STOP(T_RCOMM)
-            SUM = SUM + RHO
-         ENDDO  
-         RHO = SUM
-
-!--------------------------------------------------------------------- 
-!----> 
-!  The conj grad iteration loop 
-!----> 
-!--------------------------------------------------------------------- 
-         DO  CGIT = 1,CGITMAX
-
-!--------------------------------------------------------------------- 
-!  q = A.p 
-!  The partition submatrix-vector multiply: use workspace w 
-!--------------------------------------------------------------------- 
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J,K,SUM),TIE (W(J))
-            DO  J = 1,LASTROW - FIRSTROW + 1
-               SUM = 0.D0
-               DO  K = ROWSTR(J),ROWSTR(J + 1) - 1
-                  SUM = SUM + A(K) * P(COLIDX(K))
-               ENDDO  
-               W(J) = SUM
-            ENDDO  
-!DVM$       END REGION
-
-!--------------------------------------------------------------------- 
-!  Sum the partition submatrix-vec A.p's across rows 
-!  Exchange and sum piece of w with procs identified in reduce_exch_proc 
-!--------------------------------------------------------------------- 
-            DO  I = L2NPCOLS,1,(-(1))
-               IF (TIMERON)  CALL TIMER_START(T_RCOMM)
-
-               CALL MPI_IRECV(Q(REDUCE_RECV_STARTS(I)),REDUCE_RECV_LENGT
-     &HS(I),DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COMM_WORLD,REQUEST,IERR)
-!DVM$          ACTUAL (Q(REDUCE_RECV_STARTS(I):REDUCE_RECV_STARTS(I)+
-!DVM$& REDUCE_RECV_LENGTHS(I)))
-!DVM$          GET_ACTUAL (W(REDUCE_SEND_STARTS(I):REDUCE_SEND_STARTS(I)
-!DVM$& +REDUCE_SEND_LENGTHS(I)))
-               CALL MPI_SEND(W(REDUCE_SEND_STARTS(I)),REDUCE_SEND_LENGTH
-     &S(I),DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COMM_WORLD,IERR)
-               CALL MPI_WAIT(REQUEST,STATUS,IERR)
-               IF (TIMERON)  CALL TIMER_STOP(T_RCOMM)
-!DVM$          REGION 
-!DVM$          PARALLEL (J), PRIVATE (J),TIE (Q(J),W(J))
-               DO  J = SEND_START,SEND_START + REDUCE_RECV_LENGTHS(I) - 
-     &1
-                  W(J) = W(J) + Q(J)
-               ENDDO  
-!DVM$          END REGION
-            ENDDO  
-
-!--------------------------------------------------------------------- 
-!  Exchange piece of q with transpose processor: 
-!--------------------------------------------------------------------- 
-            IF (L2NPCOLS .NE. 0) THEN
-               IF (TIMERON)  CALL TIMER_START(T_RCOMM)
-
-               CALL MPI_IRECV(Q,EXCH_RECV_LENGTH,DP_TYPE,EXCH_PROC,1,MPI
-     &_COMM_WORLD,REQUEST,IERR)
-!DVM$          ACTUAL (Q(1:EXCH_RECV_LENGTH))
-!DVM$          GET_ACTUAL (W(SEND_START:SEND_START+SEND_LEN))
-               CALL MPI_SEND(W(SEND_START),SEND_LEN,DP_TYPE,EXCH_PROC,1,
-     &MPI_COMM_WORLD,IERR)
-               CALL MPI_WAIT(REQUEST,STATUS,IERR)
-               IF (TIMERON)  CALL TIMER_STOP(T_RCOMM)
-            ELSE  
-!DVM$          REGION 
-!DVM$          PARALLEL (J), PRIVATE (J),TIE (Q(J),W(J))
-               DO  J = 1,EXCH_RECV_LENGTH
-                  Q(J) = W(J)
-               ENDDO  
-!DVM$          END REGION
-            ENDIF  
-
-!--------------------------------------------------------------------- 
-!  Clear w for reuse... 
-!--------------------------------------------------------------------- 
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (W(J))
-            DO  J = 1,MAX (LASTROW - FIRSTROW + 1,LASTCOL - FIRSTCOL + 1
-     &)
-               W(J) = 0.0D0
-            ENDDO  
-!DVM$       END REGION
-
-!--------------------------------------------------------------------- 
-!  Obtain p.q 
-!--------------------------------------------------------------------- 
-            SUM = 0.0D0
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (P(J),Q(J)),REDUCTION (SUM (SU
-!DVM$&M))
-            DO  J = 1,LASTCOL - FIRSTCOL + 1
-               SUM = SUM + P(J) * Q(J)
-            ENDDO  
-!DVM$       END REGION
-
-!--------------------------------------------------------------------- 
-!  Obtain d with a sum-reduce 
-!--------------------------------------------------------------------- 
-            DO  I = 1,L2NPCOLS
-               IF (TIMERON)  CALL TIMER_START(T_RCOMM)
-               CALL MPI_IRECV(D,1,DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COMM
-     &_WORLD,REQUEST,IERR)
-               CALL MPI_SEND(SUM,1,DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COM
-     &M_WORLD,IERR)
-               CALL MPI_WAIT(REQUEST,STATUS,IERR)
-               IF (TIMERON)  CALL TIMER_STOP(T_RCOMM)
-               SUM = SUM + D
-            ENDDO  
-            D = SUM
-
-!--------------------------------------------------------------------- 
-!  Obtain alpha = rho / (p.q) 
-!--------------------------------------------------------------------- 
-            ALPHA = RHO / D
-
-!--------------------------------------------------------------------- 
-!  Save a temporary of rho 
-!--------------------------------------------------------------------- 
-            RHO0 = RHO
-
-!--------------------------------------------------------------------- 
-!  Obtain z = z + alpha*p 
-!  and    r = r - alpha*q 
-!--------------------------------------------------------------------- 
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (P(J),Q(J),R(J),Z(J))
-            DO  J = 1,LASTCOL - FIRSTCOL + 1
-               Z(J) = Z(J) + ALPHA * P(J)
-               R(J) = R(J) - ALPHA * Q(J)
-            ENDDO  
-!DVM$       END REGION
-
-!--------------------------------------------------------------------- 
-!  rho = r.r 
-!  Now, obtain the norm of r: First, sum squares of r elements locally... 
-!--------------------------------------------------------------------- 
-            SUM = 0.0D0
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (R(J)),REDUCTION (SUM (SUM))
-            DO  J = 1,LASTCOL - FIRSTCOL + 1
-               SUM = SUM + R(J) * R(J)
-            ENDDO  
-!DVM$       END REGION
-
-!--------------------------------------------------------------------- 
-!  Obtain rho with a sum-reduce 
-!--------------------------------------------------------------------- 
-            DO  I = 1,L2NPCOLS
-               IF (TIMERON)  CALL TIMER_START(T_RCOMM)
-               CALL MPI_IRECV(RHO,1,DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_CO
-     &MM_WORLD,REQUEST,IERR)
-               CALL MPI_SEND(SUM,1,DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COM
-     &M_WORLD,IERR)
-               CALL MPI_WAIT(REQUEST,STATUS,IERR)
-               IF (TIMERON)  CALL TIMER_STOP(T_RCOMM)
-               SUM = SUM + RHO
-            ENDDO  
-            RHO = SUM
-
-!--------------------------------------------------------------------- 
-!  Obtain beta: 
-!--------------------------------------------------------------------- 
-            BETA = RHO / RHO0
-
-!--------------------------------------------------------------------- 
-!  p = r + beta*p 
-!--------------------------------------------------------------------- 
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (P(J),R(J))
-            DO  J = 1,LASTCOL - FIRSTCOL + 1
-               P(J) = R(J) + BETA * P(J)
-            ENDDO  
-!DVM$       END REGION
-
-! end of do cgit=1,cgitmax 
-         ENDDO  
-
-!--------------------------------------------------------------------- 
-!  Compute residual norm explicitly:  ||r|| = ||x - A.z|| 
-!  First, form A.z 
-!  The partition submatrix-vector multiply 
-!--------------------------------------------------------------------- 
-!DVM$    REGION 
-!DVM$    PARALLEL (J), PRIVATE (J,K,SUM),TIE (W(J))
-         DO  J = 1,LASTROW - FIRSTROW + 1
-            SUM = 0.D0
-            DO  K = ROWSTR(J),ROWSTR(J + 1) - 1
-               SUM = SUM + A(K) * Z(COLIDX(K))
-            ENDDO  
-            W(J) = SUM
-         ENDDO  
-!DVM$    END REGION
-
-!--------------------------------------------------------------------- 
-!  Sum the partition submatrix-vec A.z's across rows 
-!--------------------------------------------------------------------- 
-         DO  I = L2NPCOLS,1,(-(1))
-            IF (TIMERON)  CALL TIMER_START(T_RCOMM)
-
-            CALL MPI_IRECV(R(REDUCE_RECV_STARTS(I)),REDUCE_RECV_LENGTHS(
-     &I),DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COMM_WORLD,REQUEST,IERR)
-!DVM$       ACTUAL (R(REDUCE_RECV_STARTS(I):REDUCE_RECV_STARTS(I)+
-!DVM$& REDUCE_RECV_LENGTHS(I)))
-
-!DVM$       GET_ACTUAL (W(REDUCE_SEND_STARTS(I):REDUCE_SEND_STARTS(I)+
-!DVM$& REDUCE_SEND_LENGTHS(I)))
-            CALL MPI_SEND(W(REDUCE_SEND_STARTS(I)),REDUCE_SEND_LENGTHS(I
-     &),DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COMM_WORLD,IERR)
-            CALL MPI_WAIT(REQUEST,STATUS,IERR)
-            IF (TIMERON)  CALL TIMER_STOP(T_RCOMM)
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (R(J),W(J))
-            DO  J = SEND_START,SEND_START + REDUCE_RECV_LENGTHS(I) - 1
-               W(J) = W(J) + R(J)
-            ENDDO  
-!DVM$       END REGION
-         ENDDO  
-
-!--------------------------------------------------------------------- 
-!  Exchange piece of q with transpose processor: 
-!--------------------------------------------------------------------- 
-         IF (L2NPCOLS .NE. 0) THEN
-            IF (TIMERON)  CALL TIMER_START(T_RCOMM)
-
-            CALL MPI_IRECV(R,EXCH_RECV_LENGTH,DP_TYPE,EXCH_PROC,1,MPI_CO
-     &MM_WORLD,REQUEST,IERR)
-!DVM$       ACTUAL (R(1:EXCH_RECV_LENGTH))
-!DVM$       GET_ACTUAL (W(SEND_START:SEND_START+SEND_LEN))
-            CALL MPI_SEND(W(SEND_START),SEND_LEN,DP_TYPE,EXCH_PROC,1,MPI
-     &_COMM_WORLD,IERR)
-            CALL MPI_WAIT(REQUEST,STATUS,IERR)
-            IF (TIMERON)  CALL TIMER_STOP(T_RCOMM)
-         ELSE  
-!DVM$       REGION 
-!DVM$       PARALLEL (J), PRIVATE (J),TIE (R(J),W(J))
-            DO  J = 1,EXCH_RECV_LENGTH
-               R(J) = W(J)
-            ENDDO  
-!DVM$       END REGION
-         ENDIF  
-
-!--------------------------------------------------------------------- 
-!  At this point, r contains A.z 
-!--------------------------------------------------------------------- 
-         SUM = 0.0D0
-!DVM$    REGION 
-!DVM$    PARALLEL (J), PRIVATE (D,J),TIE (R(J),X(J)),REDUCTION (SUM (SUM
-!DVM$&))
-         DO  J = 1,LASTCOL - FIRSTCOL + 1
-            D = X(J) - R(J)
-            SUM = SUM + D * D
-         ENDDO  
-!DVM$    END REGION
-
-!--------------------------------------------------------------------- 
-!  Obtain d with a sum-reduce 
-!--------------------------------------------------------------------- 
-         DO  I = 1,L2NPCOLS
-            IF (TIMERON)  CALL TIMER_START(T_RCOMM)
-            CALL MPI_IRECV(D,1,DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COMM_WO
-     &RLD,REQUEST,IERR)
-            CALL MPI_SEND(SUM,1,DP_TYPE,REDUCE_EXCH_PROC(I),I,MPI_COMM_W
-     &ORLD,IERR)
-            CALL MPI_WAIT(REQUEST,STATUS,IERR)
-            IF (TIMERON)  CALL TIMER_STOP(T_RCOMM)
-            SUM = SUM + D
-         ENDDO  
-         D = SUM
-         IF (ME .EQ. ROOT)  RNORM = SQRT (D)
-         IF (TIMERON)  CALL TIMER_STOP(T_CONJG)
-         RETURN 
-
-! end of routine conj_grad 
-         END
-
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         SUBROUTINE MAKEA (N, NZ, A, COLIDX, ROWSTR, NONZER, FIRSTROW, L
-     &ASTROW, FIRSTCOL, LASTCOL, RCOND, AROW, ACOL, AELT, V, IV, SHIFT)
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-         INTEGER ::  N,NZ,NONZER
-         INTEGER ::  FIRSTROW,LASTROW,FIRSTCOL,LASTCOL
-         INTEGER ::  COLIDX(NZ),ROWSTR(N + 1)
-         INTEGER ::  IV(2 * N + 1),AROW(NZ),ACOL(NZ)
-         DOUBLE PRECISION ::  V(N + 1),AELT(NZ)
-         DOUBLE PRECISION ::  RCOND,A(NZ),SHIFT
-
-!--------------------------------------------------------------------- 
-!       generate the test problem for benchmark 6 
-!       makea generates a sparse matrix with a 
-!       prescribed sparsity distribution 
-!      
-!       parameter    type        usage 
-!      
-!       input 
-!      
-!       n            i           number of cols/rows of matrix 
-!       nz           i           nonzeros as declared array size 
-!       rcond        r*8         condition number 
-!       shift        r*8         main diagonal shift 
-!      
-!       output 
-!      
-!       a            r*8         array for nonzeros 
-!       colidx       i           col indices 
-!       rowstr       i           row pointers 
-!      
-!       workspace 
-!      
-!       iv, arow, acol i 
-!       v, aelt        r*8 
-!--------------------------------------------------------------------- 
-         INTEGER ::  I,NNZA,IOUTER,IVELT,IVELT1,IROW,NZV,JCOL
-
-!--------------------------------------------------------------------- 
-!      nonzer is approximately  (int(sqrt(nnza /n))); 
-!--------------------------------------------------------------------- 
-         DOUBLE PRECISION ::  SIZE,RATIO,SCALE
-         EXTERNAL SPARSE,SPRNVC,VECSET
-         INTENT(INOUT) IV,V,AELT,ACOL,AROW,ROWSTR,COLIDX,A
-         INTENT(IN) SHIFT,RCOND,LASTCOL,FIRSTCOL,LASTROW,FIRSTROW,NONZER
-     &,NZ,N
-         SIZE = 1.0D0
-         RATIO = RCOND** (1.0D0 / DFLOAT (N))
-         NNZA = 0
-
-!--------------------------------------------------------------------- 
-!  Initialize iv(n+1 .. 2n) to zero. 
-!  Used by sprnvc to mark nonzero positions 
-!--------------------------------------------------------------------- 
-!DVM$    GET_ACTUAL (IV)
-         DO  I = 1,N
-            IV(N + I) = 0
-         ENDDO  
-!DVM$    ACTUAL (IV)
-         DO  IOUTER = 1,N
-            NZV = NONZER
-!DVM$       GET_ACTUAL (IV)
-            CALL SPRNVC(N,NZV,V,COLIDX,IV(1),IV(N + 1))
-!DVM$       ACTUAL (IV)
-            CALL VECSET(N,V,COLIDX,NZV,IOUTER,.5D0)
-!DVM$       GET_ACTUAL (ACOL,AELT,AROW,COLIDX,V)
-            DO  IVELT = 1,NZV
-               JCOL = COLIDX(IVELT)
-               IF (JCOL .GE. FIRSTCOL .AND. JCOL .LE. LASTCOL) THEN
-                  SCALE = SIZE * V(IVELT)
-                  DO  IVELT1 = 1,NZV
-                     IROW = COLIDX(IVELT1)
-                     IF (IROW .GE. FIRSTROW .AND. IROW .LE. LASTROW) THE
-     &N
-                        NNZA = NNZA + 1
-                        IF (NNZA .GT. NZ)  GOTO 9999
-                        ACOL(NNZA) = JCOL
-                        AROW(NNZA) = IROW
-                        AELT(NNZA) = V(IVELT1) * SCALE
-                     ENDIF  
-                  ENDDO  
-               ENDIF  
-            ENDDO  
-!DVM$       ACTUAL (ACOL,AELT,AROW)
-            SIZE = SIZE * RATIO
-         ENDDO  
-
-!--------------------------------------------------------------------- 
-!       ... add the identity * rcond to the generated matrix to bound 
-!           the smallest eigenvalue from below by rcond 
-!--------------------------------------------------------------------- 
-!DVM$    GET_ACTUAL (ACOL,AELT,AROW)
-         DO  I = FIRSTROW,LASTROW
-            IF (I .GE. FIRSTCOL .AND. I .LE. LASTCOL) THEN
-               IOUTER = N + I
-               NNZA = NNZA + 1
-               IF (NNZA .GT. NZ)  GOTO 9999
-               ACOL(NNZA) = I
-               AROW(NNZA) = I
-               AELT(NNZA) = RCOND - SHIFT
-            ENDIF  
-         ENDDO  
-!DVM$    ACTUAL (ACOL,AELT,AROW)
-
-!--------------------------------------------------------------------- 
-!       ... make the sparse matrix from list of elements with duplicates 
-!           (v and iv are used as  workspace) 
-!--------------------------------------------------------------------- 
-!DVM$    GET_ACTUAL (IV)
-         CALL SPARSE(A,COLIDX,ROWSTR,N,AROW,ACOL,AELT,FIRSTROW,LASTROW,V
-     &,IV(1),IV(N + 1),NNZA)
-!DVM$    ACTUAL (IV)
-         RETURN 
-9999     CONTINUE
-         WRITE (UNIT = *,FMT = *) 'Space for matrix elements exceeded in
-     & makea'
-         WRITE (UNIT = *,FMT = *) 'nnza, nzmax = ',NNZA,NZ
-         WRITE (UNIT = *,FMT = *) ' iouter = ',IOUTER
-         STOP
-         END
-
-
-!-------end   of makea------------------------------ 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         SUBROUTINE SPARSE (A, COLIDX, ROWSTR, N, AROW, ACOL, AELT, FIRS
-     &TROW, LASTROW, X, MARK, NZLOC, NNZA)
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-
-      INCLUDE 'npbparams.h' 
-         INTEGER ::  COLIDX(*),ROWSTR(NA + 1)
-         INTEGER ::  FIRSTROW,LASTROW
-         INTEGER ::  N,AROW(*),ACOL(*),NNZA
-         DOUBLE PRECISION ::  A(*),AELT(*)
-
-!--------------------------------------------------------------------- 
-!       rows range from firstrow to lastrow 
-!       the rowstr pointers are defined for nrows = lastrow-firstrow+1 values 
-!--------------------------------------------------------------------- 
-         INTEGER ::  NZLOC(N),NROWS
-         DOUBLE PRECISION ::  X(N)
-         LOGICAL ::  MARK(N)
-
-!--------------------------------------------------- 
-!       generate a sparse matrix from a list of 
-!       [col, row, element] tri 
-!--------------------------------------------------- 
-         INTEGER ::  I,J,JAJP1,NZA,K,NZROW
-         DOUBLE PRECISION ::  XI
-         INTENT(INOUT) NZLOC,MARK,X,ROWSTR,COLIDX,A
-         INTENT(IN) NNZA,LASTROW,FIRSTROW,AELT,ACOL,AROW,N
-
-!--------------------------------------------------------------------- 
-!    how many rows of result 
-!--------------------------------------------------------------------- 
-         NROWS = LASTROW - FIRSTROW + 1
-
-!--------------------------------------------------------------------- 
-!     ...count the number of triples in each row 
-!--------------------------------------------------------------------- 
-!DVM$    REGION 
-!DVM$    PARALLEL (J), PRIVATE (J),TIE (ROWSTR(J))
-         DO  J = 1,N
-            ROWSTR(J) = 0
-            MARK(J) = .FALSE.
-         ENDDO  
-!DVM$    END REGION
-         ROWSTR(N + 1) = 0
-!DVM$    ACTUAL (ROWSTR(N + 1))
-!DVM$    GET_ACTUAL (AROW,ROWSTR)
-         DO  NZA = 1,NNZA
-            J = AROW(NZA) - FIRSTROW + 1 + 1
-            ROWSTR(J) = ROWSTR(J) + 1
-         ENDDO  
-!DVM$    ACTUAL (ROWSTR)
-         ROWSTR(1) = 1
-!DVM$    ACTUAL (ROWSTR(1))
-!DVM$    REGION 
-!DVM$    PARALLEL (J), PRIVATE (J),TIE (ROWSTR(J)),ACROSS (ROWSTR(1:0))
-         DO  J = 2,NROWS + 1
-            ROWSTR(J) = ROWSTR(J) + ROWSTR(J - 1)
-         ENDDO  
-!DVM$    END REGION
-
-!--------------------------------------------------------------------- 
-!     ... rowstr(j) now is the location of the first nonzero 
-!           of row j of a 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!     ... do a bucket sort of the triples on the row index 
-!--------------------------------------------------------------------- 
-!DVM$    GET_ACTUAL (A,ACOL,AELT,AROW,COLIDX,ROWSTR)
-         DO  NZA = 1,NNZA
-            J = AROW(NZA) - FIRSTROW + 1
-            K = ROWSTR(J)
-            A(K) = AELT(NZA)
-            COLIDX(K) = ACOL(NZA)
-            ROWSTR(J) = ROWSTR(J) + 1
-         ENDDO  
-!DVM$    ACTUAL (A,COLIDX,ROWSTR)
-
-!--------------------------------------------------------------------- 
-!       ... rowstr(j) now points to the first element of row j+1 
-!--------------------------------------------------------------------- 
-!DVM$    REGION 
-!DVM$    PARALLEL (J), PRIVATE (J),TIE (ROWSTR(J)),ACROSS (ROWSTR(1:0))
-         DO  J = NROWS,1,(-(1))
-            ROWSTR(J + 1) = ROWSTR(J)
-         ENDDO  
-!DVM$    END REGION
-         ROWSTR(1) = 1
-!DVM$    ACTUAL (ROWSTR(1))
-
-!--------------------------------------------------------------------- 
-!       ... generate the actual output rows by adding elements 
-!--------------------------------------------------------------------- 
-         NZA = 0
-!DVM$    GET_ACTUAL (MARK,X)
-         DO  I = 1,N
-            X(I) = 0.0
-            MARK(I) = .FALSE.
-         ENDDO  
-!DVM$    ACTUAL (MARK,X)
-!DVM$    GET_ACTUAL (ROWSTR)
-         JAJP1 = ROWSTR(1)
-!DVM$    GET_ACTUAL (A,COLIDX,MARK,NZLOC,ROWSTR,X)
-         DO  J = 1,NROWS
-            NZROW = 0
-
-!--------------------------------------------------------------------- 
-!          ...loop over the jth row of a 
-!--------------------------------------------------------------------- 
-            DO  K = JAJP1,ROWSTR(J + 1) - 1
-               I = COLIDX(K)
-               X(I) = X(I) + A(K)
-               IF (.NOT.(MARK(I)) .AND. X(I) .NE. 0.D0) THEN
-                  MARK(I) = .TRUE.
-                  NZROW = NZROW + 1
-                  NZLOC(NZROW) = I
-               ENDIF  
-            ENDDO  
-
-!--------------------------------------------------------------------- 
-!          ... extract the nonzeros of this row 
-!--------------------------------------------------------------------- 
-            DO  K = 1,NZROW
-               I = NZLOC(K)
-               MARK(I) = .FALSE.
-               XI = X(I)
-               X(I) = 0.D0
-               IF (XI .NE. 0.D0) THEN
-                  NZA = NZA + 1
-                  A(NZA) = XI
-                  COLIDX(NZA) = I
-               ENDIF  
-            ENDDO  
-            JAJP1 = ROWSTR(J + 1)
-            ROWSTR(J + 1) = NZA + ROWSTR(1)
-         ENDDO  
-!DVM$    ACTUAL (A,COLIDX,MARK,NZLOC,ROWSTR,X)
-
-!C       write (*, 11000) nza 
-         RETURN 
-11000      FORMAT ( //,'final nonzero count in sparse ',            /,'n
-     &umber of nonzeros       = ', I16 ) 
-         END
-
-
-!-------end   of sparse----------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         SUBROUTINE SPRNVC (N, NZ, V, IV, NZLOC, MARK)
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-         DOUBLE PRECISION ::  V(*)
-         INTEGER ::  N,NZ,IV(*),NZLOC(N),NN1
-         INTEGER ::  MARK(N)
-         COMMON /URANDO/AMULT,TRAN
-         DOUBLE PRECISION ::  AMULT,TRAN
-
-!--------------------------------------------------------------------- 
-!       generate a sparse n-vector (v, iv) 
-!       having nzv nonzeros 
-!      
-!       mark(i) is set to 1 if position i is nonzero. 
-!       mark is all zero on entry and is reset to all zero before exit 
-!       this corrects a performance bug found by John G. Lewis, caused by 
-!       reinitialization of mark on every one of the n calls to sprnvc 
-!--------------------------------------------------------------------- 
-         INTEGER ::  NZROW,NZV,II,I,ICNVRT
-         EXTERNAL RANDLC,ICNVRT
-         DOUBLE PRECISION ::  RANDLC,VECELT,VECLOC
-         INTENT(INOUT) MARK,NZLOC
-         INTENT(IN) NZ,N
-         INTENT(OUT) IV,V
-         NZV = 0
-         NZROW = 0
-         NN1 = 1
-50       CONTINUE
-         NN1 = 2 * NN1
-         IF (NN1 .LT. N)  GOTO 50
-
-!--------------------------------------------------------------------- 
-!    nn1 is the smallest power of two not less than n 
-!--------------------------------------------------------------------- 
-100      CONTINUE
-         IF (NZV .GE. NZ)  GOTO 110
-         VECELT = RANDLC (TRAN,AMULT)
-
-!--------------------------------------------------------------------- 
-!   generate an integer between 1 and n in a portable manner 
-!--------------------------------------------------------------------- 
-         VECLOC = RANDLC (TRAN,AMULT)
-         I = ICNVRT (VECLOC,NN1) + 1
-         IF (I .GT. N)  GOTO 100
-
-!--------------------------------------------------------------------- 
-!  was this integer generated already? 
-!--------------------------------------------------------------------- 
-         IF (MARK(I) .EQ. 0) THEN
-            MARK(I) = 1
-!DVM$       ACTUAL (MARK(I))
-            NZROW = NZROW + 1
-            NZLOC(NZROW) = I
-!DVM$       ACTUAL (NZLOC(NZROW))
-            NZV = NZV + 1
-            V(NZV) = VECELT
-            IV(NZV) = I
-         ENDIF  
-         GOTO 100
-110      CONTINUE
-!DVM$    GET_ACTUAL (MARK,NZLOC)
-         DO  II = 1,NZROW
-            I = NZLOC(II)
-            MARK(I) = 0
-         ENDDO  
-!DVM$    ACTUAL (MARK)
-         RETURN 
-         END
-
-
-!-------end   of sprnvc----------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         FUNCTION ICNVRT (X, IPWR2) 
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-         DOUBLE PRECISION ::  X
-         INTEGER ::  IPWR2,ICNVRT
-         INTENT(IN) IPWR2,X
-
-!--------------------------------------------------------------------- 
-!    scale a double precision number x in (0,1) by a power of 2 and chop it 
-!--------------------------------------------------------------------- 
-         ICNVRT = INT (IPWR2 * X)
-         RETURN 
-         END
-
-
-!-------end   of icnvrt----------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         SUBROUTINE VECSET (N, V, IV, NZV, I, VAL)
-
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-         IMPLICIT NONE
-         INTEGER ::  N,IV(*),NZV,I,K
-         DOUBLE PRECISION ::  V(*),VAL
-
-!--------------------------------------------------------------------- 
-!       set ith element of sparse vector (v, iv) with 
-!       nzv nonzeros to val 
-!--------------------------------------------------------------------- 
-         LOGICAL ::  SET
-         INTENT(INOUT) NZV,IV
-         INTENT(IN) VAL,I
-         INTENT(OUT) V
-         SET = .FALSE.
-!DVM$    GET_ACTUAL (IV,V)
-         DO  K = 1,NZV
-            IF (IV(K) .EQ. I) THEN
-               V(K) = VAL
-               SET = .TRUE.
-            ENDIF  
-         ENDDO  
-!DVM$    ACTUAL (V)
-         IF (.NOT.(SET)) THEN
-            NZV = NZV + 1
-            V(NZV) = VAL
-            IV(NZV) = I
-         ENDIF  
-         RETURN 
-
-!-------end   of vecset----------------------------- 
-         END
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h
deleted file mode 100644
index 1f0368c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/mpinpb.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include           'mpif.h'
-
-      integer           me, nprocs, root, dp_type
-      common /mpistuff/ me, nprocs, root, dp_type
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h
deleted file mode 100644
index bfac73d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/npbparams.h
+++ /dev/null
@@ -1,40 +0,0 @@
-c NPROCS = 4 CLASS = D
-c  
-c  
-c  This file is generated automatically by the setparams utility.
-c  It sets the number of processors and the class of the NPB
-c  in this directory. Do not modify it by hand.
-c  
-        integer            na, nonzer, niter
-        double precision   shift, rcond
-        parameter(  na=1500000,
-     >              nonzer=21,
-     >              niter=100,
-     >              shift=500.,
-     >              rcond=1.0d-1 )
-
-c number of nodes for which this version is compiled
-        integer    nnodes_compiled
-        parameter( nnodes_compiled = 4)
-        integer    num_proc_cols, num_proc_rows
-        parameter( num_proc_cols=2, num_proc_rows=2 )
-        logical  convertdouble
-        parameter (convertdouble = .false.)
-        character*11 compiletime
-        parameter (compiletime='23 Nov 2022')
-        character*5 npbversion
-        parameter (npbversion='3.3.1')
-        character*36 cs1
-        parameter (cs1='mpiifort -qopenmp -O3 -mcmodel=large')
-        character*37 cs2
-        parameter (cs2='mpiifort -qopenmp  -O3 -mcmodel=large')
-        character*6 cs3
-        parameter (cs3='(none)')
-        character*6 cs4
-        parameter (cs4='(none)')
-        character*6 cs5
-        parameter (cs5='(none)')
-        character*6 cs6
-        parameter (cs6='(none)')
-        character*6 cs7
-        parameter (cs7='randdp')
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h
deleted file mode 100644
index 2000af1..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/CG_dvmh/timing.h
+++ /dev/null
@@ -1,5 +0,0 @@
-      integer t_total, t_conjg, t_rcomm, t_ncomm, t_last
-      parameter (t_total=1, t_conjg=2, t_rcomm=3, t_ncomm=4, t_last=4)
-
-      logical timeron
-      common /timers/ timeron
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile
deleted file mode 100644
index fd0bd56..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-SHELL=/bin/sh
-BENCHMARK=ep
-BENCHMARKU=EP
-
-include ../config/make_dvmh.def
-
-OBJS = ep.o ${COMMON}/print_results.o ${COMMON}/${RAND}.o ${COMMON}/timers.o
-
-include ../sys/make.common
-
-${PROGRAM}: config ${OBJS}
-	${FLINK} ${FLINKFLAGS} -o ${PROGRAM}_dvmh ${OBJS} ${FMPI_LIB}
-
-
-ep.o:		ep.for  mpinpb.h npbparams.h
-	${FCOMPILE} ep.for
-
-clean:
-	- rm -f *.o *~ 
-	- rm -f npbparams.h core
-
-
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/README b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/README
deleted file mode 100644
index 6eb3657..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/README
+++ /dev/null
@@ -1,6 +0,0 @@
-This code implements the random-number generator described in the
-NAS Parallel Benchmark document RNR Technical Report RNR-94-007.
-The code is "embarrassingly" parallel in that no communication is
-required for the generation of the random numbers itself. There is
-no special requirement on the number of processors used for running
-the benchmark.
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for
deleted file mode 100644
index 9c76689..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/ep.for
+++ /dev/null
@@ -1,405 +0,0 @@
- 
-! *** generated by SAPFOR with version 1756 and build date: Mar 23 2021 12:41:48 
- 
-!-------------------------------------------------------------------------!   
-!                                                                         !   
-!        N  A  S     P A R A L L E L     B E N C H M A R K S  3.3         !   
-!                                                                         !   
-!                                   E P                                   !   
-!                                                                         !   
-!-------------------------------------------------------------------------!   
-!                                                                         !   
-!    This benchmark is part of the NAS Parallel Benchmark 3.3 suite.      !   
-!    It is described in NAS Technical Reports 95-020 and 02-007           !   
-!                                                                         !   
-!    Permission to use, copy, distribute and modify this software         !   
-!    for any purpose with or without fee is hereby granted.  We           !   
-!    request, however, that all derived work reference the NAS            !   
-!    Parallel Benchmarks 3.3. This software is provided "as is"           !   
-!    without express or implied warranty.                                 !   
-!                                                                         !   
-!    Information on NPB 3.3, including the technical report, the          !   
-!    original specifications, source code, results and information        !   
-!    on how to submit new results, is available at:                       !   
-!                                                                         !   
-!           http://www.nas.nasa.gov/Software/NPB/                         !   
-!                                                                         !   
-!    Send comments or suggestions to  npb@nas.nasa.gov                    !   
-!                                                                         !   
-!          NAS Parallel Benchmarks Group                                  !   
-!          NASA Ames Research Center                                      !   
-!          Mail Stop: T27A-1                                              !   
-!          Moffett Field, CA   94035-1000                                 !   
-!                                                                         !   
-!          E-mail:  npb@nas.nasa.gov                                      !   
-!          Fax:     (650) 604-3957                                        !   
-!                                                                         !   
-!-------------------------------------------------------------------------!   
-!---------------------------------------------------------------------   
-!        
-! Authors: P. O. Frederickson    
-!          D. H. Bailey   
-!          A. C. Woo   
-!          R. F. Van der Wijngaart   
-!---------------------------------------------------------------------   
-!---------------------------------------------------------------------   
-      program embar 
- 
-!---------------------------------------------------------------------   
-!        
-!   This is the MPI version of the APP Benchmark 1,   
-!   the "embarassingly parallel" benchmark.   
-!        
-!        
-!   M is the Log_2 of the number of complex pairs of uniform (0, 1) random   
-!   numbers.  MK is the Log_2 of the size of each batch of uniform random   
-!   numbers.  MK can be set for convenience on a given system, since it does   
-!   not affect the results.   
-!---------------------------------------------------------------------  
-!---------------------------------------------------------------------  
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-!--------------------------------------------------------------------- 
-      implicit none 
- 
-      include 'mpinpb.h'   
-      include 'npbparams.h'   
-      double precision ::  mops,epsilon,a,s,t1,t2,t3,t4,x,x1,x2,q,sx,sy, 
-     &tm,an,tt,gc,dum(3),timer_read 
-      double precision ::  sx_verify_value,sy_verify_value,sx_err,sy_err 
-      integer ::  mk,mm,nn,nk,nq,np,ierr,node,no_nodes,i,ik,kk,l,k,nit,i 
-     &errcode,no_large_nodes,np_add,k_offset,j 
-      logical ::  verified,timers_enabled 
-      external randlc,timer_read 
-      double precision ::  randlc,qq 
-      character*15 ::  size 
-      integer ::  fstatus 
-      integer ::  t_total,t_gpairs,t_randn,t_rcomm,t_last 
-      parameter (t_total = 1,t_gpairs = 2,t_randn = 3,t_rcomm = 4,t_last 
-     & = 4) 
-      double precision ::  tsum(t_last + 2),t1m(t_last + 2),tming(t_last 
-     & + 2),tmaxg(t_last + 2) 
-      character ::  t_recs(t_last + 2)*8 
-      parameter (mk = 16,mm = m - mk,nn = 2** mm,nk = 2** mk,nq = 10,eps 
-     &ilon = 1.d-8,a = 1220703125.d0,s = 271828183.d0) 
-      common /storage/x(2 * nk),q(0:nq - 1),qq(10000) 
-      data             dum /1.d0, 1.d0, 1.d0/   
-      data t_recs/'total', 'gpairs', 'randn', 'rcomm',            ' totc 
-     &omp', ' totcomm'/   
-      double precision ::  r23_0,r23_1,r46_0,r46_1,t23_0,t23_1,t46_0,t46 
-     &_1 
-      parameter (r23_0 = 0.5d0** 23,t23_0 = 2.d0** 23,t23_1 = 2.d0** 23, 
-     &r23_1 = 0.5d0** 23,r46_0 = r23_0** 2,t46_0 = t23_0** 2,t46_1 = t23 
-     &_1** 2,r46_1 = r23_1** 2) 
-      double precision ::  a1_0,a1_2,a2_0,a2_2,randlc_0,t1_0,t1_2,t2_0,t 
-     &2_2,t3_0,t3_2,t4_0,t4_2,x1_0,x1_2,x2_0,x2_2,z_0,z_2,arg0 
-      integer ::  arg_0,i_0 
-	  intrinsic int
-      call mpi_init(ierr) 
-      call mpi_comm_rank(mpi_comm_world,node,ierr) 
-      call mpi_comm_size(mpi_comm_world,no_nodes,ierr) 
-      root = 0 
-      if (.not.(convertdouble)) then 
-         dp_type = mpi_double_precision 
-      else   
-         dp_type = mpi_real 
-      endif   
-      if (node .eq. root) then 
- 
-!   Because the size of the problem is too large to store in a 32-bit   
-!   integer for some classes, we put it into a string (for printing).   
-!   Have to strip off the decimal point put in there by the floating   
-!   point print statement (internal file)   
-         write (unit = *,fmt = 1000)  
-         write (unit = size,fmt = '(f15.0)') 2.d0** (m + 1) 
-         j = 15 
-         if (size(j:j) .eq. '.')  j = j - 1 
-         write (unit = *,fmt = 1001) size(1:j) 
-         write (unit = *,fmt = 1003) no_nodes 
-1000              format(/,' NAS Parallel Benchmarks 3.3 -- EP Benchmark 
-     &',/)   
-1001                  format(' Number of random numbers generated: ', a1 
-     &5)   
-1003                  format(' Number of active processes:         ', 2x 
-     &, i13, /)  
-         open (unit = 2,file = 'timer.flag',status = 'old',iostat = fsta 
-     &tus) 
-         timers_enabled = .FALSE. 
-         if (fstatus .eq. 0) then 
-            timers_enabled = .TRUE. 
-            close (unit = 2) 
-         endif   
-      endif   
-      call mpi_bcast(timers_enabled,1,mpi_logical,root,mpi_comm_world,ie 
-     &rr) 
-      verified = .FALSE. 
- 
-!   Compute the number of "batches" of random number pairs generated    
-!   per processor. Adjust if the number of processors does not evenly    
-!   divide the total number   
-      np = nn / no_nodes 
-      no_large_nodes = mod (nn,no_nodes) 
-      if (node .lt. no_large_nodes) then 
-         np_add = 1 
-      else   
-         np_add = 0 
-      endif   
-      np = np + np_add 
-      if (np .eq. 0) then 
-         write (unit = 6,fmt = 1) no_nodes,nn 
-1                    format ('Too many nodes:',2i6)   
-         ierrcode = 1 
-         call mpi_abort(mpi_comm_world,ierrcode,ierr) 
-         stop 
-      endif   
- 
-!   Call the random number generator functions and initialize   
-!   the x-array to reduce the effects of paging on the timings.   
-!   Also, call all mathematical functions that are used. Make   
-!   sure these initializations cannot be eliminated as dead code.   
-!DVM$ GET_ACTUAL (dum) 
-      call vranlc(0,dum(1),dum(2),dum(3)) 
-!DVM$ ACTUAL (dum) 
-      dum(1) = randlc (dum(2),dum(3)) 
-!DVM$ ACTUAL (dum) 
-!DVM$ REGION  
-!DVM$ PARALLEL (i), PRIVATE (i),TIE (x(i)) 
-      do  i = 1,2 * nk 
-         x(i) = (-(1.d99)) 
-      enddo   
-!DVM$ END REGION 
-      mops = log (sqrt (abs (max (1.d0,1.d0)))) 
- 
-!---------------------------------------------------------------------   
-!      Synchronize before placing time stamp   
-!---------------------------------------------------------------------   
-      do  i = 1,t_last 
-         call timer_clear(i) 
-      enddo   
-      call mpi_barrier(mpi_comm_world,ierr) 
-      call timer_start(1) 
-      t1 = a 
-      call vranlc(0,t1,a,x) 
- 
-!   Compute AN = A ^ (2 * NK) (mod 2^46).   
-      t1 = a 
-      do  i = 1,mk + 1 
-         t2 = randlc (t1,t1) 
-      enddo   
-      an = t1 
-      tt = s 
-      gc = 0.d0 
-      sx = 0.d0 
-      sy = 0.d0 
-      do  i = 0,nq - 1 
-         q(i) = 0.d0 
-      enddo   
- 
-!   Each instance of this loop may be performed independently. We compute   
-!   the k offsets separately to take into account the fact that some nodes   
-!   have more numbers to generate than others   
-      if (np_add .eq. 1) then 
-         k_offset = node * np - 1 
-      else   
-         k_offset = no_large_nodes * (np + 1) + (node - no_large_nodes)  
-     &* np - 1 
-      endif   
-!DVM$ REGION	  
-!DVM$ PARALLEL(k),private( kk, t1, t2, i, ik, t1_0,a1_0,a2_0,x1_0,x2_0,
-!DVM$& t2_0, z_0, t3_0, t4_0, randlc_0, t3, arg_0, t1_2, a1_2, a2_2, 
-!DVM$& i_0, x1_2, x2_2, t2_2, z_2, t3_2, t4_2,x1,x2,arg0,t4,l),
-!DVM$& reduction (sum(q),sum(sy),sum(sx))
-      do  k = 1,np 
-         kk = k_offset + k 
-         t1 = s 
-         t2 = an 
- 
-!        Find starting seed t1 for this kk.   
-         do  i = 1,100 
-            ik = kk / 2 
-            if (2 * ik .ne. kk) then 
-               t1_0 = r23_0 * t2 
-               a1_0 = int (t1_0) 
-               a2_0 = t2 - t23_0 * a1_0 
-               t1_0 = r23_0 * t1 
-               x1_0 = int (t1_0) 
-               x2_0 = t1 - t23_0 * x1_0 
-               t1_0 = a1_0 * x2_0 + a2_0 * x1_0 
-               t2_0 = int (r23_0 * t1_0) 
-               z_0 = t1_0 - t23_0 * t2_0 
-               t3_0 = t23_0 * z_0 + a2_0 * x2_0 
-               t4_0 = int (r46_0 * t3_0) 
-               t1 = t3_0 - t46_0 * t4_0 
-               randlc_0 = r46_0 * t1 
-               t3 = randlc_0 
-            endif   
-            if (ik .eq. 0)  goto 130 
-            t1_0 = r23_0 * t2 
-            a1_0 = int (t1_0) 
-            a2_0 = t2 - t23_0 * a1_0 
-            t1_0 = r23_0 * t2 
-            x1_0 = int (t1_0) 
-            x2_0 = t2 - t23_0 * x1_0 
-            t1_0 = a1_0 * x2_0 + a2_0 * x1_0 
-            t2_0 = int (r23_0 * t1_0) 
-            z_0 = t1_0 - t23_0 * t2_0 
-            t3_0 = t23_0 * z_0 + a2_0 * x2_0 
-            t4_0 = int (r46_0 * t3_0) 
-            t2 = t3_0 - t46_0 * t4_0 
-            randlc_0 = r46_0 * t2 
-            t3 = randlc_0 
-            kk = ik 
-         enddo   
- 
-!        Compute uniform pseudorandom numbers.   
-130      continue 
-         arg_0 = 2 * nk 
-         t1_2 = r23_1 * a 
-         a1_2 = int (t1_2) 
-         a2_2 = a - t23_1 * a1_2 
-         do  i_0 = 1,nk 
-            t1_2 = r23_1 * t1 
-            x1_2 = int (t1_2) 
-            x2_2 = t1 - t23_1 * x1_2 
-            t1_2 = a1_2 * x2_2 + a2_2 * x1_2 
-            t2_2 = int (r23_1 * t1_2) 
-            z_2 = t1_2 - t23_1 * t2_2 
-            t3_2 = t23_1 * z_2 + a2_2 * x2_2 
-            t4_2 = int (r46_1 * t3_2) 
-            t1 = t3_2 - t46_1 * t4_2 
-            x1 = r46_1 * t1 
-            t1_2 = r23_1 * t1 
-            x1_2 = int (t1_2) 
-            x2_2 = t1 - t23_1 * x1_2 
-            t1_2 = a1_2 * x2_2 + a2_2 * x1_2 
-            t2_2 = int (r23_1 * t1_2) 
-            z_2 = t1_2 - t23_1 * t2_2 
-            t3_2 = t23_1 * z_2 + a2_2 * x2_2 
-            t4_2 = int (r46_1 * t3_2) 
-            t1 = t3_2 - t46_1 * t4_2 
-            x2 = r46_1 * t1 
- 
-!            x1 = 2.d0 * x(2 * i_0 - 1) - 1.d0 
-!            x2 = 2.d0 * x(2 * i_0) - 1.d0 
-            x1 = 2.d0 * x1 - 1.d0 
-            x2 = 2.d0 * x2 - 1.d0 
-            arg0 = x1** 2 + x2** 2 
-            if (arg0 .le. 1.d0) then 
-               t2 = sqrt ((-(2.d0)) * log (arg0) / arg0) 
-               t3 = x1 * t2 
-               t4 = x2 * t2 
-               l = max (abs (t3),abs (t4)) 
-               q(l) = q(l) + 1.d0 
-               sx = sx + t3 
-               sy = sy + t4 
-            endif   
-         enddo   
- 
-!         if (timers_enabled)  call timer_stop(t_gpairs)   
-      enddo   
-!DVM$ END REGION	  
-      if (timers_enabled)  call timer_start(t_rcomm) 
-!DVM$ GET_ACTUAL (x) 
-      call mpi_allreduce(sx,x,1,dp_type,mpi_sum,mpi_comm_world,ierr) 
-!DVM$ ACTUAL (x) 
-      sx = x(1) 
-!DVM$ GET_ACTUAL (x) 
-      call mpi_allreduce(sy,x,1,dp_type,mpi_sum,mpi_comm_world,ierr) 
-!DVM$ ACTUAL (x) 
-      sy = x(1) 
-!DVM$ GET_ACTUAL (x) 
-      call mpi_allreduce(q,x,nq,dp_type,mpi_sum,mpi_comm_world,ierr) 
-!DVM$ ACTUAL (x) 
-      if (timers_enabled)  call timer_stop(t_rcomm) 
-!DVM$ REGION  
-!DVM$ PARALLEL (i), PRIVATE (i),TIE (x(i)) 
-      do  i = 1,nq 
-         q(i - 1) = x(i) 
-      enddo   
-!DVM$ END REGION 
-      do  i = 0,nq - 1 
-         gc = gc + q(i) 
-      enddo   
-      call timer_stop(1) 
-      tm = timer_read (1) 
-!DVM$ GET_ACTUAL (x) 
-      call mpi_allreduce(tm,x,1,dp_type,mpi_max,mpi_comm_world,ierr) 
-!DVM$ ACTUAL (x) 
-      tm = x(1) 
-      if (node .eq. root) then 
-         nit = 0 
-         verified = .TRUE. 
-         if (m .eq. 24) then 
-            sx_verify_value = (-(3.247834652034740d+3)) 
-            sy_verify_value = (-(6.958407078382297d+3)) 
-         else if (m .eq. 25) then   
-            sx_verify_value = (-(2.863319731645753d+3)) 
-            sy_verify_value = (-(6.320053679109499d+3)) 
-         else if (m .eq. 28) then   
-            sx_verify_value = (-(4.295875165629892d+3)) 
-            sy_verify_value = (-(1.580732573678431d+4)) 
-         else if (m .eq. 30) then   
-            sx_verify_value = 4.033815542441498d+4 
-            sy_verify_value = (-(2.660669192809235d+4)) 
-         else if (m .eq. 32) then   
-            sx_verify_value = 4.764367927995374d+4 
-            sy_verify_value = (-(8.084072988043731d+4)) 
-         else if (m .eq. 36) then   
-            sx_verify_value = 1.982481200946593d+5 
-            sy_verify_value = (-(1.020596636361769d+5)) 
-         else if (m .eq. 40) then   
-            sx_verify_value = (-(5.319717441530d+05)) 
-            sy_verify_value = (-(3.688834557731d+05)) 
-         else   
-            verified = .FALSE. 
-         endif   
-         if (verified) then 
-            sx_err = abs ((sx - sx_verify_value) / sx_verify_value) 
-            sy_err = abs ((sy - sy_verify_value) / sy_verify_value) 
-            verified = sx_err .le. epsilon .and. sy_err .le. epsilon 
-         endif   
-         mops = 2.d0** (m + 1) / tm / 1000000.d0 
-         write (unit = 6,fmt = 11) tm,m,gc,sx,sy,(i,q(i), i = 0,nq - 1) 
-11                   format ('EP Benchmark Results:'//'CPU Time =',f10.4 
-     &/'N = 2^',           i5/'No. Gaussian Pairs =',f15.0/'Sums = ',1p, 
-     &2d25.15/           'Counts:'/(i3,0p,f15.0))   
-         call print_results('EP',class,32 + 1,0,0,nit,npm,no_nodes,tm,mo 
-     &ps,'Random numbers generated',verified,npbversion,compiletime,cs1, 
-     &cs2,cs3,cs4,cs5,cs6,cs7) 
-      endif   
-      if (.not.(timers_enabled))  goto 999 
-!DVM$ GET_ACTUAL (t1m) 
-      do  i = 1,t_last 
-         t1m(i) = timer_read (i) 
-      enddo   
-!DVM$ ACTUAL (t1m) 
-      t1m(t_last + 2) = t1m(t_rcomm) 
-!DVM$ ACTUAL (t1m(t_last + 2)) 
-      t1m(t_last + 1) = t1m(t_total) - t1m(t_last + 2) 
-!DVM$ ACTUAL (t1m(t_last + 1)) 
-      call mpi_reduce(t1m,tsum,4 + 2,dp_type,mpi_sum,0,mpi_comm_world,ie 
-     &rr) 
-!DVM$ GET_ACTUAL (t1m) 
-      call mpi_reduce(t1m,tming,4 + 2,dp_type,mpi_min,0,mpi_comm_world,i 
-     &err) 
-!DVM$ GET_ACTUAL (t1m) 
-      call mpi_reduce(t1m,tmaxg,4 + 2,dp_type,mpi_max,0,mpi_comm_world,i 
-     &err) 
-      if (node .eq. 0) then 
-         write (unit = *,fmt = 800) no_nodes 
-!DVM$    GET_ACTUAL (t_recs,tmaxg,tming,tsum) 
-         do  i = 1,t_last + 2 
-            tsum(i) = tsum(i) / no_nodes 
-            write (unit = *,fmt = 810) i,t_recs(i),tming(i),tmaxg(i),tsu 
-     &m(i) 
-         enddo   
-!DVM$    ACTUAL (tsum) 
-      endif   
-800   format(' nprocs =', i6, 11x, 'minimum', 5x, 'maximum',        5x,  
-     &'average')   
-810   format(' timer ', i2, '(', A8, ') :', 3(2x,f10.4))   
-999   continue 
-      call mpi_finalize(ierr) 
-      end 
- 
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h
deleted file mode 100644
index 1f13637..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/mpinpb.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-c---------------------------------------------------------------------
-c---------------------------------------------------------------------
-
-      include 'mpif.h'
-
-      integer           me, nprocs, root, dp_type
-      common /mpistuff/ me, nprocs, root, dp_type
-
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h
deleted file mode 100644
index 9770fe3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/EP_dvmh/npbparams.h
+++ /dev/null
@@ -1,31 +0,0 @@
-c NPROCS = 4 CLASS = D
-c  
-c  
-c  This file is generated automatically by the setparams utility.
-c  It sets the number of processors and the class of the NPB
-c  in this directory. Do not modify it by hand.
-c  
-        character class
-        parameter (class ='D')
-        integer m, npm
-        parameter (m=36, npm=4)
-        logical  convertdouble
-        parameter (convertdouble = .false.)
-        character*11 compiletime
-        parameter (compiletime='23 Nov 2022')
-        character*5 npbversion
-        parameter (npbversion='3.3.1')
-        character*36 cs1
-        parameter (cs1='mpiifort -qopenmp -O3 -mcmodel=large')
-        character*37 cs2
-        parameter (cs2='mpiifort -qopenmp  -O3 -mcmodel=large')
-        character*6 cs3
-        parameter (cs3='(none)')
-        character*6 cs4
-        parameter (cs4='(none)')
-        character*6 cs5
-        parameter (cs5='(none)')
-        character*6 cs6
-        parameter (cs6='(none)')
-        character*6 cs7
-        parameter (cs7='randdp')
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/clear.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/clear.bat
deleted file mode 100644
index 13594b8..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/clear.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-@echo off
-
-@set TESTS=bt sp lu mg ep cg ft
-@set CLASSES=A B C
-
-if exist err.txt del err.txt
-if exist bin rmdir /S /Q bin
-
-@for %%T in (%TESTS%) do (
-   cd %%T
-   if exist comp.err del comp.err
-   if exist dvm.err del dvm.err
-   if exist *.f del *.f
-   if exist *.cu del *.cu
-   if exist *info.c del *info.c
-   @for %%C in (%CLASSES%) do (
-      if exist err_%%C.txt del err_%%C.txt 
-      if exist out_%%C.txt del out_%%C.txt       
-   )
-   cd ../
-)
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.bat
deleted file mode 100644
index 65c6572..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.bat
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-
-@set TESTS=BT SP LU MG EP CG FT
-
-@CALL config\make.def.bat 
-
-if not exist bin mkdir bin
-cd sys
-if not exist setparams.exe CALL %DVM% cc setparams
-cd ../
-@for %%T in (%TESTS%) do (
-    START compileTest.bat %%T 
-)
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.sh
deleted file mode 100644
index 4434f82..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compile.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-TESTS="BT SP LU MG EP CG FT"
-CLASSES="A B C"
-
-compile_one() {
-    cd $1
-    make CLASS=$2
-    cd ..
-}
-
-mkdir -p bin
-
-export FOPT="$*"
-for tn in $TESTS; do
-    for cn in $CLASSES; do
-        compile_one $tn $cn
-    done
-done
-
-exit 0
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compileTest.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compileTest.bat
deleted file mode 100644
index 5db07de..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/compileTest.bat
+++ /dev/null
@@ -1,10 +0,0 @@
-@echo off
-@set CLASSES=A B C
-@set Test=%1
-  @for %%C in (%CLASSES%) do (
-     cd %Test%
-     echo  ### compiling test %Test%, class %%C.
-	 CALL make.bat %%C 
-	 cd ../
-   )
-exit
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def
deleted file mode 100644
index 905457b..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def
+++ /dev/null
@@ -1,8 +0,0 @@
-F77 = dvm f -shared-dvm
-FLINK = dvm flink -shared-dvm
-
-FFLAGS = ${FOPT}
-
-UCC = cc
-
-BINDIR = ../bin
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def.bat
deleted file mode 100644
index 15c8592..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/config/make_dvmh.def.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-rem @echo off
-rem ### SET DVM PATH###
-set DVMDIR=
-
-set DVM=%DVMDIR%\dvm
-set F77=%DVMDIR%\dvm f
-set RUN=%DVMDIR%\dvm run
-set BIN=..\bin
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.bat b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.bat
deleted file mode 100644
index 137802c..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.bat
+++ /dev/null
@@ -1,15 +0,0 @@
-@echo off
-
-@set TESTS=bt sp lu mg ep cg ft
-@set CLASSES=A B C
-
-@CALL config\make.def.bat
-
-if exist res.txt del res.txt
-cd bin
-@for %%T in (%TESTS%) do (
-   @for %%C in (%CLASSES%) do (
-      CALL %RUN% %%T.%%C.x.exe	1>>..\res.txt 2>>..\err.txt
-   )
-)
-cd ../
\ No newline at end of file
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.sh
deleted file mode 100644
index e820404..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/run.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-TESTS="bt sp lu mg ep cg ft"
-CLASSES="A B C"
-
-ALL_OK=1
-
-run_one() {
-    if [ -f "$1" ]; then
-        dvm run $PROC_GRID $1
-        ALL_OK=$(( ALL_OK && $? == 0 ))
-    else
-        ALL_OK=0
-    fi
-}
-
-cd bin
-
-for tn in $TESTS; do
-    for cn in $CLASSES; do
-        run_one $tn.$cn.x
-    done
-done
-
-if [ $ALL_OK -ne 0 ]; then
-    echo " END OF NPB Benchmarks"
-fi
-
-exit 0
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/Makefile b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/Makefile
deleted file mode 100644
index 9fd8e5f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-include ../config/make.def
-
-all: setparams
-
-# setparams creates an npbparam.h file for each benchmark 
-# configuration. npbparams.h also contains info about how a benchmark
-# was compiled and linked
-
-setparams: setparams.c ../config/make.def
-	$(UCC) -o setparams setparams.c
-
-clean: 
-	-rm -f setparams setparams.h npbparams.h
-	-rm -f *~ *.o
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/make.common b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/make.common
deleted file mode 100644
index 959951d..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/make.common
+++ /dev/null
@@ -1,31 +0,0 @@
-PROGRAM  = $(BINDIR)/$(BENCHMARK).$(CLASS).x
-
-# Class "U" is used internally by the setparams program to mean
-# "unknown". This means that if you don't specify CLASS=
-# on the command line, you'll get an error. It would be nice
-# to be able to avoid this, but we'd have to get information
-# from the setparams back to the make program, which isn't easy. 
-CLASS=U
-
-default:: ${PROGRAM}
-
-# This makes sure the configuration utility setparams 
-# is up to date. 
-# Note that this must be run every time, which is why the
-# target does not exist and is not created. 
-# If you create a file called "config" you will break things. 
-config:
-	@cd ../sys; ${MAKE} all
-	../sys/setparams ${BENCHMARK} ${CLASS}
-
-# Normally setparams updates npbparams.h only if the settings (CLASS)
-# have changed. However, we also want to update if the compile options
-# may have changed (set in ../config/make.def).
-npbparams.h: ../config/make.def
-	@ echo make.def modified. Rebuilding npbparams.h just in case
-	rm -f npbparams.h
-	../sys/setparams ${BENCHMARK} ${CLASS}
-
-# So that "make benchmark-name" works
-${BENCHMARK}:  default
-${BENCHMARKU}: default
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/setparams.c b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/setparams.c
deleted file mode 100644
index 63d2442..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/MPI+FDVMH.fdv/sys/setparams.c
+++ /dev/null
@@ -1,1224 +0,0 @@
-/* 
- * This utility configures a NPB to be built for a specific number
- * of nodes and a specific class. It creates a file "npbparams.h" 
- * in the source directory. This file keeps state information about 
- * which size of benchmark is currently being built (so that nothing
- * if unnecessarily rebuilt) and defines (through PARAMETER statements)
- * the number of nodes and class for which a benchmark is being built. 
-
- * The utility takes 3 arguments: 
- *       setparams benchmark-name nprocs class
- *    benchmark-name is "sp", "bt", etc
- *    nprocs is the number of processors to run on
- *    class is the size of the benchmark
- * These parameters are checked for the current benchmark. If they
- * are invalid, this program prints a message and aborts. 
- * If the parameters are ok, the current npbsize.h (actually just
- * the first line) is read in. If the new parameters are the same as 
- * the old, nothing is done, but an exit code is returned to force the
- * user to specify (otherwise the make procedure succeeds but builds a
- * binary of the wrong name).  Otherwise the file is rewritten. 
- * Errors write a message (to stdout) and abort. 
- * 
- * This program makes use of two extra benchmark "classes"
- * class "X" means an invalid specification. It is returned if
- * there is an error parsing the config file. 
- * class "U" is an external specification meaning "unknown class"
- * 
- * Unfortunately everything has to be case sensitive. This is
- * because we can always convert lower to upper or v.v. but
- * can't feed this information back to the makefile, so typing
- * make CLASS=a and make CLASS=A will produce different binaries.
- *
- * 
- */
-
-#include <sys/types.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <string.h>
-#include <time.h>
-
-/*
- * This is the master version number for this set of 
- * NPB benchmarks. It is in an obscure place so people
- * won't accidentally change it. 
- */
-
-#define VERSION "3.3.1"
-
-/* controls verbose output from setparams */
-/* #define VERBOSE */
-
-#define FILENAME "npbparams.h"
-#define DESC_LINE "c NPROCS = %d CLASS = %c\n"
-#define BT_DESC_LINE "c NPROCS = %d CLASS = %c SUBTYPE = %s\n"
-#define DEF_CLASS_LINE     "#define CLASS '%c'\n"
-#define DEF_NUM_PROCS_LINE "#define NUM_PROCS %d\n"
-#define FINDENT  "        "
-#define CONTINUE "     > "
-
-#ifdef FORTRAN_REC_SIZE
-int fortran_rec_size = FORTRAN_REC_SIZE;
-#else
-int fortran_rec_size = 4;
-#endif
-
-void get_info(int argc, char *argv[], int *typep, int *nprocsp, char *classp,
-	      int* subtypep);
-void check_info(int type, int nprocs, char class);
-void read_info(int type, int *nprocsp, char *classp, int *subtypep);
-void write_info(int type, int nprocs, char class, int subtype);
-void write_sp_info(FILE *fp, int nprocs, char class);
-void write_bt_info(FILE *fp, int nprocs, char class, int io);
-void write_lu_info(FILE *fp, int nprocs, char class);
-void write_mg_info(FILE *fp, int nprocs, char class);
-void write_cg_info(FILE *fp, int nprocs, char class);
-void write_ft_info(FILE *fp, int nprocs, char class);
-void write_ep_info(FILE *fp, int nprocs, char class);
-void write_is_info(FILE *fp, int nprocs, char class);
-void write_dt_info(FILE *fp, int nprocs, char class);
-void write_compiler_info(int type, FILE *fp);
-void write_convertdouble_info(int type, FILE *fp);
-void check_line(char *line, char *label, char *val);
-int  check_include_line(char *line, char *filename);
-void put_string(FILE *fp, char *name, char *val);
-void put_def_string(FILE *fp, char *name, char *val);
-void put_def_variable(FILE *fp, char *name, char *val);
-int isqrt(int i);
-int ilog2(int i);
-int ipow2(int i);
-int isqrt2(int i);
-
-enum benchmark_types {SP, BT, LU, MG, FT, IS, DT, EP, CG};
-enum iotypes { NONE = 0, FULL, SIMPLE, EPIO, FORTRAN};
-
-int main(int argc, char *argv[])
-{
-  int nprocs, nprocs_old, type;
-  char class, class_old;
-  int subtype = -1, old_subtype = -1;
-  
-  /* Get command line arguments. Make sure they're ok. */
-  get_info(argc, argv, &type, &nprocs, &class, &subtype);
-  if (class != 'U') {
-#ifdef VERBOSE
-    printf("setparams: For benchmark %s: number of processors = %d class = %c\n", 
-	   argv[1], nprocs, class); 
-#endif
-    check_info(type, nprocs, class);
-  }
-
-  /* Get old information. */
-  read_info(type, &nprocs_old, &class_old, &old_subtype);
-  if (class != 'U') {
-    if (class_old != 'X') {
-#ifdef VERBOSE
-      printf("setparams:     old settings: number of processors = %d class = %c\n", 
-	     nprocs_old, class_old); 
-#endif
-    }
-  } else {
-    printf("setparams:\n\
-  *********************************************************************\n\
-  * You must specify NPROCS and CLASS to build this benchmark         *\n\
-  * For example, to build a class A benchmark for 4 processors, type  *\n\
-  *       make {benchmark-name} NPROCS=4 CLASS=A                      *\n\
-  *********************************************************************\n\n"); 
-
-    if (class_old != 'X') {
-#ifdef VERBOSE
-      printf("setparams: Previous settings were CLASS=%c NPROCS=%d\n", 
-	     class_old, nprocs_old); 
-#endif
-    }
-    exit(1); /* exit on class==U */
-  }
-
-  /* Write out new information if it's different. */
-  if (nprocs != nprocs_old || class != class_old || subtype != old_subtype) {
-#ifdef VERBOSE
-    printf("setparams: Writing %s\n", FILENAME); 
-#endif
-    write_info(type, nprocs, class, subtype);
-  } else {
-#ifdef VERBOSE
-    printf("setparams: Settings unchanged. %s unmodified\n", FILENAME); 
-#endif
-  }
-
-  return 0;
-}
-
-
-/*
- *  get_info(): Get parameters from command line 
- */
-
-void get_info(int argc, char *argv[], int *typep, int *nprocsp, char *classp,
-	      int *subtypep) 
-{
-
-  if (argc < 4) {
-    printf("Usage: %s (%d) benchmark-name nprocs class\n", argv[0], argc);
-    exit(1);
-  }
-
-  *nprocsp = atoi(argv[2]);
-
-  *classp = *argv[3];
-
-  if      (!strcmp(argv[1], "sp") || !strcmp(argv[1], "SP")) *typep = SP;
-  else if (!strcmp(argv[1], "ft") || !strcmp(argv[1], "FT")) *typep = FT;
-  else if (!strcmp(argv[1], "lu") || !strcmp(argv[1], "LU")) *typep = LU;
-  else if (!strcmp(argv[1], "mg") || !strcmp(argv[1], "MG")) *typep = MG;
-  else if (!strcmp(argv[1], "is") || !strcmp(argv[1], "IS")) *typep = IS;
-  else if (!strcmp(argv[1], "dt") || !strcmp(argv[1], "DT")) *typep = DT;
-  else if (!strcmp(argv[1], "ep") || !strcmp(argv[1], "EP")) *typep = EP;
-  else if (!strcmp(argv[1], "cg") || !strcmp(argv[1], "CG")) *typep = CG;
-  else if (!strcmp(argv[1], "bt") || !strcmp(argv[1], "BT")) {
-    *typep = BT;
-    if (argc != 5) {
-      /* printf("Usage: %s (%d) benchmark-name nprocs class\n", argv[0], argc); */
-      /* exit(1); */
-      *subtypep = NONE;
-    } else {
-      if (!strcmp(argv[4], "full") || !strcmp(argv[4], "FULL")) {
-        *subtypep = FULL;
-      } else if (!strcmp(argv[4], "simple") || !strcmp(argv[4], "SIMPLE")) {
-        *subtypep = SIMPLE;
-      } else if (!strcmp(argv[4], "epio") || !strcmp(argv[4], "EPIO")) {
-        *subtypep = EPIO;
-      } else if (!strcmp(argv[4], "fortran") || !strcmp(argv[4], "FORTRAN")) {
-        *subtypep = FORTRAN;
-      } else if (!strcmp(argv[4], "none") || !strcmp(argv[4], "NONE")) {
-        *subtypep = NONE;
-      } else {
-        printf("setparams: Error: unknown btio type %s\n", argv[4]);
-        exit(1);
-      }
-    }
-  } else {
-    printf("setparams: Error: unknown benchmark type %s\n", argv[1]);
-    exit(1);
-  }
-}
-
-/*
- *  check_info(): Make sure command line data is ok for this benchmark 
- */
-
-void check_info(int type, int nprocs, char class) 
-{
-  int rootprocs, logprocs; 
-
-  /* check number of processors */
-  if (nprocs <= 0) {
-    printf("setparams: Number of processors must be greater than zero\n");
-    exit(1);
-  }
-  switch(type) {
-
-  case SP:
-  case BT:
-    rootprocs = isqrt(nprocs);
-    if (rootprocs < 0) {
-      printf("setparams: Number of processors %d must be a square (1,4,9,...) for this benchmark", 
-              nprocs);
-      exit(1);
-    }
-    if (class == 'S' && nprocs > 16) {
-      printf("setparams: BT and SP sample sizes cannot be run on more\n");
-      printf("           than 16 processors because the cell size would be too small.\n");
-      exit(1);
-    }
-    break;
-
-  case LU:
-    rootprocs = isqrt2(nprocs);
-    if (rootprocs < 0) {
-      printf("setparams: Failed to determine proc_grid for nprocs=%d\n", 
-              nprocs);
-      exit(1);
-    }
-    break;
-
-  case CG:
-  case FT:
-  case MG:
-  case IS:
-    logprocs = ilog2(nprocs);
-    if (logprocs < 0) {
-      printf("setparams: Number of processors must be a power of two (1,2,4,...) for this benchmark\n");
-      exit(1);
-    }
-
-    break;
-
-  case EP:
-  case DT:
-    break;
-
-  default:
-    /* never should have gotten this far with a bad name */
-    printf("setparams: (Internal Error) Benchmark type %d unknown to this program\n", type); 
-    exit(1);
-  }
-
-  /* check class */
-  if (class != 'S' && 
-      class != 'W' && 
-      class != 'A' && 
-      class != 'B' && 
-      class != 'C' && 
-      class != 'D' && 
-      class != 'E') {
-    printf("setparams: Unknown benchmark class %c\n", class); 
-    printf("setparams: Allowed classes are \"S\", \"W\", and \"A\" through \"E\"\n");
-    exit(1);
-  }
-
-  if (class == 'E' && (type == IS || type == DT)) {
-    printf("setparams: Benchmark class %c not defined for IS or DT\n", class);
-    exit(1);
-  }
-
-  if (class == 'D' && type == IS && nprocs < 4) {
-    printf("setparams: IS class D size cannot be run on less than 4 processors\n");
-    exit(1);
-  }
-}
-
-
-/* 
- * read_info(): Read previous information from file. 
- *              Not an error if file doesn't exist, because this
- *              may be the first time we're running. 
- *              Assumes the first line of the file is in a special
- *              format that we understand (since we wrote it). 
- */
-
-void read_info(int type, int *nprocsp, char *classp, int *subtypep)
-{
-  int nread = 0;
-  FILE *fp;
-  fp = fopen(FILENAME, "r");
-  if (fp == NULL) {
-#ifdef VERBOSE
-    printf("setparams: INFO: configuration file %s does not exist (yet)\n", FILENAME); 
-#endif
-    goto abort;
-  }
-  
-  /* first line of file contains info (fortran), first two lines (C) */
-
-  switch(type) {
-      case BT: {
-	  char subtype_str[100];
-          nread = fscanf(fp, BT_DESC_LINE, nprocsp, classp, subtype_str);
-          if (nread != 3) {
-            if (nread != 2) {
-              printf("setparams: Error parsing config file %s. Ignoring previous settings\n", FILENAME);
-              goto abort;
-	    }
-	    *subtypep = 0;
-	    break;
-          }
-          if (!strcmp(subtype_str, "full") || !strcmp(subtype_str, "FULL")) {
-		*subtypep = FULL;
-          } else if (!strcmp(subtype_str, "simple") ||
-		     !strcmp(subtype_str, "SIMPLE")) {
-		*subtypep = SIMPLE;
-          } else if (!strcmp(subtype_str, "epio") || !strcmp(subtype_str, "EPIO")) {
-		*subtypep = EPIO;
-          } else if (!strcmp(subtype_str, "fortran") ||
-		     !strcmp(subtype_str, "FORTRAN")) {
-		*subtypep = FORTRAN;
-          } else {
-		*subtypep = -1;
-	  }
-          break;
-      }
-
-      case SP:
-      case FT:
-      case MG:
-      case LU:
-      case EP:
-      case CG:
-          nread = fscanf(fp, DESC_LINE, nprocsp, classp);
-          if (nread != 2) {
-            printf("setparams: Error parsing config file %s. Ignoring previous settings\n", FILENAME);
-            goto abort;
-          }
-          break;
-      case IS:
-      case DT:
-          nread = fscanf(fp, DEF_CLASS_LINE, classp);
-          nread += fscanf(fp, DEF_NUM_PROCS_LINE, nprocsp);
-          if (nread != 2) {
-            printf("setparams: Error parsing config file %s. Ignoring previous settings\n", FILENAME);
-            goto abort;
-          }
-          break;
-      default:
-        /* never should have gotten this far with a bad name */
-        printf("setparams: (Internal Error) Benchmark type %d unknown to this program\n", type); 
-        exit(1);
-  }
-
-  fclose(fp);
-
-
-  return;
-
- abort:
-  *nprocsp = -1;
-  *classp = 'X';
-  *subtypep = -1;
-  return;
-}
-
-
-/* 
- * write_info(): Write new information to config file. 
- *               First line is in a special format so we can read
- *               it in again. Then comes a warning. The rest is all
- *               specific to a particular benchmark. 
- */
-
-void write_info(int type, int nprocs, char class, int subtype) 
-{
-  FILE *fp;
-  char *BT_TYPES[] = {"NONE", "FULL", "SIMPLE", "EPIO", "FORTRAN"};
-
-  fp = fopen(FILENAME, "w");
-  if (fp == NULL) {
-    printf("setparams: Can't open file %s for writing\n", FILENAME);
-    exit(1);
-  }
-
-  switch(type) {
-      case BT:
-          /* Write out the header */
-	  if (subtype == -1 || subtype == 0) {
-            fprintf(fp, DESC_LINE, nprocs, class);
-	  } else {
-            fprintf(fp, BT_DESC_LINE, nprocs, class, BT_TYPES[subtype]);
-	  }
-          /* Print out a warning so bozos don't mess with the file */
-          fprintf(fp, "\
-c  \n\
-c  \n\
-c  This file is generated automatically by the setparams utility.\n\
-c  It sets the number of processors and the class of the NPB\n\
-c  in this directory. Do not modify it by hand.\n\
-c  \n");
-
-          break;
-	
-      case SP:
-      case FT:
-      case MG:
-      case LU:
-      case EP:
-      case CG:
-          /* Write out the header */
-          fprintf(fp, DESC_LINE, nprocs, class);
-          /* Print out a warning so bozos don't mess with the file */
-          fprintf(fp, "\
-c  \n\
-c  \n\
-c  This file is generated automatically by the setparams utility.\n\
-c  It sets the number of processors and the class of the NPB\n\
-c  in this directory. Do not modify it by hand.\n\
-c  \n");
-
-          break;
-      case IS:
-      case DT:
-          fprintf(fp, DEF_CLASS_LINE, class);
-          fprintf(fp, DEF_NUM_PROCS_LINE, nprocs);
-          fprintf(fp, "\
-/*\n\
-   This file is generated automatically by the setparams utility.\n\
-   It sets the number of processors and the class of the NPB\n\
-   in this directory. Do not modify it by hand.   */\n\
-   \n");
-          break;
-      default:
-          printf("setparams: (Internal error): Unknown benchmark type %d\n", 
-                                                                         type);
-          exit(1);
-  }
-
-  /* Now do benchmark-specific stuff */
-  switch(type) {
-  case SP:
-    write_sp_info(fp, nprocs, class);
-    break;
-  case LU:
-    write_lu_info(fp, nprocs, class);
-    break;
-  case MG:
-    write_mg_info(fp, nprocs, class);
-    break;
-  case IS:
-    write_is_info(fp, nprocs, class);  
-    break;
-  case DT:
-    write_dt_info(fp, nprocs, class);  
-    break;
-  case FT:
-    write_ft_info(fp, nprocs, class);
-    break;
-  case EP:
-    write_ep_info(fp, nprocs, class);
-    break;
-  case CG:
-    write_cg_info(fp, nprocs, class);
-    break;
-  case BT:
-    write_bt_info(fp, nprocs, class, subtype);
-    break;
-  default:
-    printf("setparams: (Internal error): Unknown benchmark type %d\n", type);
-    exit(1);
-  }
-  write_convertdouble_info(type, fp);
-  write_compiler_info(type, fp);
-  fclose(fp);
-  return;
-}
-
-
-/* 
- * write_sp_info(): Write SP specific info to config file
- */
-
-void write_sp_info(FILE *fp, int nprocs, char class) 
-{
-  int maxcells, problem_size, niter;
-  char *dt;
-  maxcells = isqrt(nprocs);
-  if      (class == 'S') { problem_size = 12;  dt = "0.015d0";   niter = 100; }
-  else if (class == 'W') { problem_size = 36;  dt = "0.0015d0";  niter = 400; }
-  else if (class == 'A') { problem_size = 64;  dt = "0.0015d0";  niter = 400; }
-  else if (class == 'B') { problem_size = 102; dt = "0.001d0";   niter = 400; }
-  else if (class == 'C') { problem_size = 162; dt = "0.00067d0"; niter = 400; }
-  else if (class == 'D') { problem_size = 408; dt = "0.00030d0"; niter = 500; }
-  else if (class == 'E') { problem_size = 1020; dt = "0.0001d0"; niter = 500; }
-  else {
-    printf("setparams: Internal error: invalid class %c\n", class);
-    exit(1);
-  }
-  fprintf(fp, "%sinteger maxcells, problem_size, niter_default\n", FINDENT);
-  fprintf(fp, "%sparameter (maxcells=%d, problem_size=%d, niter_default=%d)\n", 
-	       FINDENT, maxcells, problem_size, niter);
-  fprintf(fp, "%sdouble precision dt_default\n", FINDENT);
-  fprintf(fp, "%sparameter (dt_default = %s)\n", FINDENT, dt);
-}
-  
-/* 
- * write_bt_info(): Write BT specific info to config file
- */
-
-void write_bt_info(FILE *fp, int nprocs, char class, int io) 
-{
-  int maxcells, problem_size, niter, wr_interval;
-  char *dt;
-  maxcells = isqrt(nprocs);
-  if      (class == 'S') { problem_size = 12;  dt = "0.010d0";    niter = 60;  }
-  else if (class == 'W') { problem_size = 24;  dt = "0.0008d0";   niter = 200; }
-  else if (class == 'A') { problem_size = 64;  dt = "0.0008d0";   niter = 200; }
-  else if (class == 'B') { problem_size = 102; dt = "0.0003d0";   niter = 200; }
-  else if (class == 'C') { problem_size = 162; dt = "0.0001d0";   niter = 200; }
-  else if (class == 'D') { problem_size = 408; dt = "0.00002d0";  niter = 250; }
-  else if (class == 'E') { problem_size = 1020; dt = "0.4d-5";    niter = 250; }
-  else {
-    printf("setparams: Internal error: invalid class %c\n", class);
-    exit(1);
-  }
-  wr_interval = 5;
-  fprintf(fp, "%sinteger maxcells, problem_size, niter_default\n", FINDENT);
-  fprintf(fp, "%sparameter (maxcells=%d, problem_size=%d, niter_default=%d)\n", 
-	       FINDENT, maxcells, problem_size, niter);
-  fprintf(fp, "%sdouble precision dt_default\n", FINDENT);
-  fprintf(fp, "%sparameter (dt_default = %s)\n", FINDENT, dt);
-  fprintf(fp, "%sinteger wr_default\n", FINDENT);
-  fprintf(fp, "%sparameter (wr_default = %d)\n", FINDENT, wr_interval);
-  fprintf(fp, "%sinteger iotype\n", FINDENT);
-  fprintf(fp, "%sparameter (iotype = %d)\n", FINDENT, io);
-  if (io) {
-    fprintf(fp, "%scharacter*(*) filenm\n", FINDENT);
-    switch (io) {
-	case FULL:
-	    fprintf(fp, "%sparameter (filenm = 'btio.full.out')\n", FINDENT);
-	    break;
-	case SIMPLE:
-	    fprintf(fp, "%sparameter (filenm = 'btio.simple.out')\n", FINDENT);
-	    break;
-	case EPIO:
-	    fprintf(fp, "%sparameter (filenm = 'btio.epio.out')\n", FINDENT);
-	    break;
-	case FORTRAN:
-	    fprintf(fp, "%sparameter (filenm = 'btio.fortran.out')\n", FINDENT);
-	    fprintf(fp, "%sinteger fortran_rec_sz\n", FINDENT);
-	    fprintf(fp, "%sparameter (fortran_rec_sz = %d)\n",
-		    FINDENT, fortran_rec_size);
-	    break;
-	default:
-	    break;
-    }
-  }
-}
-  
-
-
-/* 
- * write_lu_info(): Write SP specific info to config file
- */
-
-void write_lu_info(FILE *fp, int nprocs, char class) 
-{
-  int isiz1, isiz2, itmax, inorm, problem_size;
-  int xdiv, ydiv; /* number of cells in x and y direction */
-  char *dt_default;
-
-  if      (class == 'S') { problem_size = 12;  dt_default = "0.5d0";  itmax = 50; }
-  else if (class == 'W') { problem_size = 33;  dt_default = "1.5d-3"; itmax = 300; }
-  else if (class == 'A') { problem_size = 64;  dt_default = "2.0d0";  itmax = 250; }
-  else if (class == 'B') { problem_size = 102; dt_default = "2.0d0";  itmax = 250; }
-  else if (class == 'C') { problem_size = 162; dt_default = "2.0d0";  itmax = 250; }
-  else if (class == 'D') { problem_size = 408; dt_default = "1.0d0";  itmax = 300; }
-  else if (class == 'E') { problem_size = 1020; dt_default = "0.5d0"; itmax = 300; }
-  else {
-    printf("setparams: Internal error: invalid class %c\n", class);
-    exit(1);
-  }
-  inorm = itmax;
-  xdiv = isqrt2(nprocs);
-  ydiv = nprocs/xdiv;
-  isiz1 = problem_size/xdiv; if (isiz1*xdiv < problem_size) isiz1++;
-  isiz2 = problem_size/ydiv; if (isiz2*ydiv < problem_size) isiz2++;
-  
-
-  fprintf(fp, "\nc number of nodes for which this version is compiled\n");
-  fprintf(fp, "%sinteger nnodes_compiled, nnodes_xdim\n", FINDENT);
-  fprintf(fp, "%sparameter (nnodes_compiled=%d, nnodes_xdim=%d)\n",
-          FINDENT, nprocs, xdiv);
-
-  fprintf(fp, "\nc full problem size\n");
-  fprintf(fp, "%sinteger isiz01, isiz02, isiz03\n", FINDENT);
-  fprintf(fp, "%sparameter (isiz01=%d, isiz02=%d, isiz03=%d)\n", 
-	  FINDENT, problem_size, problem_size, problem_size);
-
-  fprintf(fp, "\nc sub-domain array size\n");
-  fprintf(fp, "%sinteger isiz1, isiz2, isiz3\n", FINDENT);
-  fprintf(fp, "%sparameter (isiz1=%d, isiz2=%d, isiz3=isiz03)\n", 
-	       FINDENT, isiz1, isiz2);
-
-  fprintf(fp, "\nc number of iterations and how often to print the norm\n");
-  fprintf(fp, "%sinteger itmax_default, inorm_default\n", FINDENT);
-  fprintf(fp, "%sparameter (itmax_default=%d, inorm_default=%d)\n", 
-	  FINDENT, itmax, inorm);
-
-  fprintf(fp, "%sdouble precision dt_default\n", FINDENT);
-  fprintf(fp, "%sparameter (dt_default = %s)\n", FINDENT, dt_default);
-  
-}
-
-/* 
- * write_mg_info(): Write MG specific info to config file
- */
-
-void write_mg_info(FILE *fp, int nprocs, char class) 
-{
-  int problem_size, nit, log2_size, log2_nprocs, lt_default, lm;
-  int ndim1, ndim2, ndim3;
-  if      (class == 'S') { problem_size = 32;   nit = 4; }
-  else if (class == 'W') { problem_size = 128;  nit = 4; }
-  else if (class == 'A') { problem_size = 256;  nit = 4; }
-  else if (class == 'B') { problem_size = 256;  nit = 20; }
-  else if (class == 'C') { problem_size = 512;  nit = 20; }
-  else if (class == 'D') { problem_size = 1024; nit = 50; }
-  else if (class == 'E') { problem_size = 2048; nit = 50; }
-  else {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-  log2_size = ilog2(problem_size);
-  log2_nprocs = ilog2(nprocs);
-  /* lt is log of largest total dimension */
-  lt_default = log2_size;
-  /* log of log of maximum dimension on a node */
-  lm = log2_size - log2_nprocs/3;
-  ndim1 = lm;
-  ndim3 = log2_size - (log2_nprocs+2)/3;
-  ndim2 = log2_size - (log2_nprocs+1)/3;
-
-  fprintf(fp, "%sinteger nprocs_compiled\n", FINDENT);
-  fprintf(fp, "%sparameter (nprocs_compiled = %d)\n", FINDENT, nprocs);
-  fprintf(fp, "%sinteger nx_default, ny_default, nz_default\n", FINDENT);
-  fprintf(fp, "%sparameter (nx_default=%d, ny_default=%d, nz_default=%d)\n", 
-	  FINDENT, problem_size, problem_size, problem_size);
-  fprintf(fp, "%sinteger nit_default, lm, lt_default\n", FINDENT);
-  fprintf(fp, "%sparameter (nit_default=%d, lm = %d, lt_default=%d)\n", 
-	  FINDENT, nit, lm, lt_default);
-  fprintf(fp, "%sinteger debug_default\n", FINDENT);
-  fprintf(fp, "%sparameter (debug_default=%d)\n", FINDENT, 0);
-  fprintf(fp, "%sinteger ndim1, ndim2, ndim3\n", FINDENT);
-  fprintf(fp, "%sparameter (ndim1 = %d, ndim2 = %d, ndim3 = %d)\n", 
-	  FINDENT, ndim1, ndim2, ndim3);
-}
-
-
-/* 
- * write_dt_info(): Write DT specific info to config file
- */
-
-void write_dt_info(FILE *fp, int nprocs, char class) 
-{
-  int num_samples,deviation,num_sources;
-  if      (class == 'S') { num_samples=1728; deviation=128; num_sources=4; }
-  else if (class == 'W') { num_samples=1728*8; deviation=128*2; num_sources=4*2; }
-  else if (class == 'A') { num_samples=1728*64; deviation=128*4; num_sources=4*4; }
-  else if (class == 'B') { num_samples=1728*512; deviation=128*8; num_sources=4*8; }
-  else if (class == 'C') { num_samples=1728*4096; deviation=128*16; num_sources=4*16; }
-  else if (class == 'D') { num_samples=1728*4096*8; deviation=128*32; num_sources=4*32; }
-  else {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-  fprintf(fp, "#define NUM_SAMPLES %d\n", num_samples);
-  fprintf(fp, "#define STD_DEVIATION %d\n", deviation);
-  fprintf(fp, "#define NUM_SOURCES %d\n", num_sources);
-}
-
-/* 
- * write_is_info(): Write IS specific info to config file
- */
-
-void write_is_info(FILE *fp, int nprocs, char class) 
-{
-  if( class != 'S' &&
-      class != 'W' &&
-      class != 'A' &&
-      class != 'B' &&
-      class != 'C' &&
-      class != 'D' )
-  {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-}
-
-/* 
- * write_cg_info(): Write CG specific info to config file
- */
-
-void write_cg_info(FILE *fp, int nprocs, char class) 
-{
-  int na,nonzer,niter;
-  char *shift,*rcond="1.0d-1";
-  char *shiftS="10.",
-       *shiftW="12.",
-       *shiftA="20.",
-       *shiftB="60.",
-       *shiftC="110.",
-       *shiftD="500.",
-       *shiftE="1.5d3";
-
-  int num_proc_cols, num_proc_rows;
-
-
-  if( class == 'S' )
-  { na=1400;    nonzer=7;  niter=15;  shift=shiftS; }
-  else if( class == 'W' )
-  { na=7000;    nonzer=8;  niter=15;  shift=shiftW; }
-  else if( class == 'A' )
-  { na=14000;   nonzer=11; niter=15;  shift=shiftA; }
-  else if( class == 'B' )
-  { na=75000;   nonzer=13; niter=75;  shift=shiftB; }
-  else if( class == 'C' )
-  { na=150000;  nonzer=15; niter=75;  shift=shiftC; }
-  else if( class == 'D' )
-  { na=1500000; nonzer=21; niter=100; shift=shiftD; }
-  else if( class == 'E' )
-  { na=9000000; nonzer=26; niter=100; shift=shiftE; }
-  else
-  {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-  fprintf( fp, "%sinteger            na, nonzer, niter\n", FINDENT );
-  fprintf( fp, "%sdouble precision   shift, rcond\n", FINDENT );
-  fprintf( fp, "%sparameter(  na=%d,\n", FINDENT, na );
-  fprintf( fp, "%s             nonzer=%d,\n", CONTINUE, nonzer );
-  fprintf( fp, "%s             niter=%d,\n", CONTINUE, niter );
-  fprintf( fp, "%s             shift=%s,\n", CONTINUE, shift );
-  fprintf( fp, "%s             rcond=%s )\n", CONTINUE, rcond );
-
-
-  num_proc_cols = num_proc_rows = ilog2(nprocs)/2;
-  if (num_proc_cols+num_proc_rows != ilog2(nprocs)) num_proc_cols += 1;
-  num_proc_cols = ipow2(num_proc_cols); num_proc_rows = ipow2(num_proc_rows);
-  
-  fprintf( fp, "\nc number of nodes for which this version is compiled\n" );
-  fprintf( fp, "%sinteger    nnodes_compiled\n", FINDENT );
-  fprintf( fp, "%sparameter( nnodes_compiled = %d)\n", FINDENT, nprocs );
-  fprintf( fp, "%sinteger    num_proc_cols, num_proc_rows\n", FINDENT );
-  fprintf( fp, "%sparameter( num_proc_cols=%d, num_proc_rows=%d )\n", 
-                                                          FINDENT,
-                                                          num_proc_cols,
-                                                          num_proc_rows );
-}
-
-
-/* 
- * write_ft_info(): Write FT specific info to config file
- */
-
-void write_ft_info(FILE *fp, int nprocs, char class) 
-{
-  /* easiest way (given the way the benchmark is written)
-   * is to specify log of number of grid points in each
-   * direction m1, m2, m3. nt is the number of iterations
-   */
-  int nx, ny, nz, maxdim, niter;
-  if      (class == 'S') { nx = 64;   ny = 64;   nz = 64;   niter = 6;}
-  else if (class == 'W') { nx = 128;  ny = 128;  nz = 32;   niter = 6;}
-  else if (class == 'A') { nx = 256;  ny = 256;  nz = 128;  niter = 6;}
-  else if (class == 'B') { nx = 512;  ny = 256;  nz = 256;  niter =20;}
-  else if (class == 'C') { nx = 512;  ny = 512;  nz = 512;  niter =20;}
-  else if (class == 'D') { nx = 2048; ny = 1024; nz = 1024; niter =25;}
-  else if (class == 'E') { nx = 4096; ny = 2048; nz = 2048; niter =25;}
-  else {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-  maxdim = nx;
-  if (ny > maxdim) maxdim = ny;
-  if (nz > maxdim) maxdim = nz;
-  fprintf(fp, "%sinteger nx, ny, nz, maxdim, niter_default, ntdivnp, np_min\n", FINDENT);
-  fprintf(fp, "%sparameter (nx=%d, ny=%d, nz=%d, maxdim=%d)\n", 
-          FINDENT, nx, ny, nz, maxdim);
-  fprintf(fp, "%sparameter (niter_default=%d)\n", FINDENT, niter);
-  fprintf(fp, "%sparameter (np_min = %d)\n", FINDENT, nprocs);
-  fprintf(fp, "%sparameter (ntdivnp=((nx*ny)/np_min)*nz)\n", FINDENT);
-  fprintf(fp, "%sdouble precision ntotal_f\n", FINDENT);
-  fprintf(fp, "%sparameter (ntotal_f=1.d0*nx*ny*nz)\n", FINDENT);
-}
-
-/*
- * write_ep_info(): Write EP specific info to config file
- */
-
-void write_ep_info(FILE *fp, int nprocs, char class)
-{
-  /* easiest way (given the way the benchmark is written)
-   * is to specify log of number of grid points in each
-   * direction m1, m2, m3. nt is the number of iterations
-   */
-  int m;
-  if      (class == 'S') { m = 24; }
-  else if (class == 'W') { m = 25; }
-  else if (class == 'A') { m = 28; }
-  else if (class == 'B') { m = 30; }
-  else if (class == 'C') { m = 32; }
-  else if (class == 'D') { m = 36; }
-  else if (class == 'E') { m = 40; }
-  else {
-    printf("setparams: Internal error: invalid class type %c\n", class);
-    exit(1);
-  }
-  /* number of processors given by "npm" */
-
-
-  fprintf(fp, "%scharacter class\n",FINDENT);
-  fprintf(fp, "%sparameter (class =\'%c\')\n",
-                  FINDENT, class);
-  fprintf(fp, "%sinteger m, npm\n", FINDENT);
-  fprintf(fp, "%sparameter (m=%d, npm=%d)\n",
-          FINDENT, m, nprocs);
-}
-
-
-/* 
- * This is a gross hack to allow the benchmarks to 
- * print out how they were compiled. Various other ways
- * of doing this have been tried and they all fail on
- * some machine - due to a broken "make" program, or
- * F77 limitations, of whatever. Hopefully this will
- * always work because it uses very portable C. Unfortunately
- * it relies on parsing the make.def file - YUK. 
- * If your machine doesn't have <string.h> or <ctype.h>, happy hacking!
- * 
- */
-
-#define VERBOSE
-#define LL 400
-#include <stdio.h>
-#define DEFFILE "../config/make.def"
-#define DEFAULT_MESSAGE "(none)"
-FILE *deffile;
-void write_compiler_info(int type, FILE *fp)
-{
-  char line[LL];
-  char mpif77[LL], flink[LL], fmpi_lib[LL], fmpi_inc[LL], fflags[LL], flinkflags[LL];
-  char compiletime[LL], randfile[LL];
-  char mpicc[LL], cflags[LL], clink[LL], clinkflags[LL],
-       cmpi_lib[LL], cmpi_inc[LL];
-  struct tm *tmp;
-  time_t t;
-  deffile = fopen(DEFFILE, "r");
-  if (deffile == NULL) {
-    printf("\n\
-setparams: File %s doesn't exist. To build the NAS benchmarks\n\
-           you need to create is according to the instructions\n\
-           in the README in the main directory and comments in \n\
-           the file config/make.def.template\n", DEFFILE);
-    exit(1);
-  }
-  strcpy(mpif77, DEFAULT_MESSAGE);
-  strcpy(flink, DEFAULT_MESSAGE);
-  strcpy(fmpi_lib, DEFAULT_MESSAGE);
-  strcpy(fmpi_inc, DEFAULT_MESSAGE);
-  strcpy(fflags, DEFAULT_MESSAGE);
-  strcpy(flinkflags, DEFAULT_MESSAGE);
-  strcpy(randfile, DEFAULT_MESSAGE);
-  strcpy(mpicc, DEFAULT_MESSAGE);
-  strcpy(cflags, DEFAULT_MESSAGE);
-  strcpy(clink, DEFAULT_MESSAGE);
-  strcpy(clinkflags, DEFAULT_MESSAGE);
-  strcpy(cmpi_lib, DEFAULT_MESSAGE);
-  strcpy(cmpi_inc, DEFAULT_MESSAGE);
-
-  while (fgets(line, LL, deffile) != NULL) {
-    if (*line == '#') continue;
-    /* yes, this is inefficient. but it's simple! */
-    check_line(line, "MPIF77", mpif77);
-    check_line(line, "FLINK", flink);
-    check_line(line, "FMPI_LIB", fmpi_lib);
-    check_line(line, "FMPI_INC", fmpi_inc);
-    check_line(line, "FFLAGS", fflags);
-    check_line(line, "FLINKFLAGS", flinkflags);
-    check_line(line, "RAND", randfile);
-    check_line(line, "MPICC", mpicc);
-    check_line(line, "CFLAGS", cflags);
-    check_line(line, "CLINK", clink);
-    check_line(line, "CLINKFLAGS", clinkflags);
-    check_line(line, "CMPI_LIB", cmpi_lib);
-    check_line(line, "CMPI_INC", cmpi_inc);
-    /* if the dummy library is used by including make.dummy, we set the
-       Fortran and C paths to libraries and headers accordingly     */
-    if(check_include_line(line, "../config/make.dummy")) {
-       strcpy(fmpi_lib, "-L../MPI_dummy -lmpi");
-       strcpy(fmpi_inc, "-I../MPI_dummy");
-       strcpy(cmpi_lib, "-L../MPI_dummy -lmpi");
-       strcpy(cmpi_inc, "-I../MPI_dummy");
-    }
-  }
-
-  
-  (void) time(&t);
-  tmp = localtime(&t);
-  (void) strftime(compiletime, (size_t)LL, "%d %b %Y", tmp);
-
-
-  switch(type) {
-      case FT:
-      case SP:
-      case BT:
-      case MG:
-      case LU:
-      case EP:
-      case CG:
-          put_string(fp, "compiletime", compiletime);
-          put_string(fp, "npbversion", VERSION);
-          put_string(fp, "cs1", mpif77);
-          put_string(fp, "cs2", flink);
-          put_string(fp, "cs3", fmpi_lib);
-          put_string(fp, "cs4", fmpi_inc);
-          put_string(fp, "cs5", fflags);
-          put_string(fp, "cs6", flinkflags);
-	  put_string(fp, "cs7", randfile);
-          break;
-      case IS:
-      case DT:
-          put_def_string(fp, "COMPILETIME", compiletime);
-          put_def_string(fp, "NPBVERSION", VERSION);
-          put_def_string(fp, "MPICC", mpicc);
-          put_def_string(fp, "CFLAGS", cflags);
-          put_def_string(fp, "CLINK", clink);
-          put_def_string(fp, "CLINKFLAGS", clinkflags);
-          put_def_string(fp, "CMPI_LIB", cmpi_lib);
-          put_def_string(fp, "CMPI_INC", cmpi_inc);
-          break;
-      default:
-          printf("setparams: (Internal error): Unknown benchmark type %d\n", 
-                                                                         type);
-          exit(1);
-  }
-
-}
-
-void check_line(char *line, char *label, char *val)
-{
-  char *original_line;
-  int n;
-  original_line = line;
-  /* compare beginning of line and label */
-  while (*label != '\0' && *line == *label) {
-    line++; label++; 
-  }
-  /* if *label is not EOS, we must have had a mismatch */
-  if (*label != '\0') return;
-  /* if *line is not a space, actual label is longer than test label */
-  if (!isspace(*line) && *line != '=') return ; 
-  /* skip over white space */
-  while (isspace(*line)) line++;
-  /* next char should be '=' */
-  if (*line != '=') return;
-  /* skip over white space */
-  while (isspace(*++line));
-  /* if EOS, nothing was specified */
-  if (*line == '\0') return;
-  /* finally we've come to the value */
-  strcpy(val, line);
-  /* chop off the newline at the end */
-  n = strlen(val)-1;
-  if (n >= 0 && val[n] == '\n')
-    val[n--] = '\0';
-  if (n >= 0 && val[n] == '\r')
-    val[n--] = '\0';
-  /* treat continuation */
-  while (val[n] == '\\' && fgets(original_line, LL, deffile)) {
-     line = original_line;
-     while (isspace(*line)) line++;
-     if (isspace(*original_line)) val[n++] = ' ';
-     while (*line && *line != '\n' && *line != '\r' && n < LL-1)
-       val[n++] = *line++;
-     val[n] = '\0';
-     n--;
-  }
-/*  if (val[strlen(val) - 1] == '\\') {
-    printf("\n\
-setparams: Error in file make.def. Because of the way in which\n\
-           command line arguments are incorporated into the\n\
-           executable benchmark, you can't have any continued\n\
-           lines in the file make.def, that is, lines ending\n\
-           with the character \"\\\". Although it may be ugly, \n\
-           you should be able to reformat without continuation\n\
-           lines. The offending line is\n\
-  %s\n", original_line);
-    exit(1);
-  } */
-}
-
-int check_include_line(char *line, char *filename)
-{
-  char *include_string = "include";
-  /* compare beginning of line and "include" */
-  while (*include_string != '\0' && *line == *include_string) {
-    line++; include_string++; 
-  }
-  /* if *include_string is not EOS, we must have had a mismatch */
-  if (*include_string != '\0') return(0);
-  /* if *line is not a space, first word is not "include" */
-  if (!isspace(*line)) return(0); 
-  /* skip over white space */
-  while (isspace(*++line));
-  /* if EOS, nothing was specified */
-  if (*line == '\0') return(0);
-  /* next keyword should be name of include file in *filename */
-  while (*filename != '\0' && *line == *filename) {
-    line++; filename++; 
-  }  
-  if (*filename != '\0' || 
-      (*line != ' ' && *line != '\0' && *line !='\n')) return(0);
-  else return(1);
-}
-
-
-#define MAXL 46
-void put_string(FILE *fp, char *name, char *val)
-{
-  int len;
-  len = strlen(val);
-  if (len > MAXL) {
-    val[MAXL] = '\0';
-    val[MAXL-1] = '.';
-    val[MAXL-2] = '.';
-    val[MAXL-3] = '.';
-    len = MAXL;
-  }
-  fprintf(fp, "%scharacter*%d %s\n", FINDENT, len, name);
-  fprintf(fp, "%sparameter (%s=\'%s\')\n", FINDENT, name, val);
-}
-
-/* need to escape quote (") in val */
-int fix_string_quote(char *val, char *newval, int maxl)
-{
-  int len;
-  int i, j;
-  len = strlen(val);
-  i = j = 0;
-  while (i < len && j < maxl) {
-    if (val[i] == '"')
-      newval[j++] = '\\';
-    if (j < maxl)
-      newval[j++] = val[i++];
-  }
-  newval[j] = '\0';
-  return j;
-}
-
-/* NOTE: is the ... stuff necessary in C? */
-void put_def_string(FILE *fp, char *name, char *val0)
-{
-  int len;
-  char val[MAXL+3];
-  len = fix_string_quote(val0, val, MAXL+2);
-  if (len > MAXL) {
-    val[MAXL] = '\0';
-    val[MAXL-1] = '.';
-    val[MAXL-2] = '.';
-    val[MAXL-3] = '.';
-    len = MAXL;
-  }
-  fprintf(fp, "#define %s \"%s\"\n", name, val);
-}
-
-void put_def_variable(FILE *fp, char *name, char *val)
-{
-  int len;
-  len = strlen(val);
-  if (len > MAXL) {
-    val[MAXL] = '\0';
-    val[MAXL-1] = '.';
-    val[MAXL-2] = '.';
-    val[MAXL-3] = '.';
-    len = MAXL;
-  }
-  fprintf(fp, "#define %s %s\n", name, val);
-}
-
-
-
-#if 0
-
-/* this version allows arbitrarily long lines but 
- * some compilers don't like that and they're rarely
- * useful 
- */
-
-#define LINELEN 65
-void put_string(FILE *fp, char *name, char *val)
-{
-  int len, nlines, pos, i;
-  char line[100];
-  len = strlen(val);
-  nlines = len/LINELEN;
-  if (nlines*LINELEN < len) nlines++;
-  fprintf(fp, "%scharacter*%d %s\n", FINDENT, nlines*LINELEN, name);
-  fprintf(fp, "%sparameter (%s = \n", FINDENT, name);
-  for (i = 0; i < nlines; i++) {
-    pos = i*LINELEN;
-    if (i == 0) fprintf(fp, "%s\'", CONTINUE);
-    else        fprintf(fp, "%s", CONTINUE);
-    /* number should be same as LINELEN */
-    fprintf(fp, "%.65s", val+pos);
-    if (i == nlines-1) fprintf(fp, "\')\n");
-    else             fprintf(fp, "\n");
-  }
-}
-
-#endif
-
-
-/* integer square root. Return error if argument isn't
- * a perfect square or is less than or equal to zero 
- */
-
-int isqrt(int i)
-{
-  int root, square;
-  if (i <= 0) return(-1);
-  square = 0;
-  for (root = 1; square <= i; root++) {
-    square = root*root;
-    if (square == i) return(root);
-  }
-  return(-1);
-}
-
-int isqrt2(int i)
-{
-  int xdim, ydim, square;
-  if (i <= 0) return(-1);
-  square = 0;
-  for (xdim = 1; square <= i; xdim++) {
-    square = xdim*xdim;
-    if (square == i) return(xdim);
-  }
-  ydim = i / (--xdim);
-  while (xdim*ydim != i && 2*ydim >= xdim) {
-    xdim++;
-    ydim = i / xdim;
-  }
-  if (xdim*ydim == i && 2*ydim >= xdim)
-    return(xdim);
-  return(-1);
-}
-  
-
-/* integer log base two. Return error is argument isn't
- * a power of two or is less than or equal to zero 
- */
-
-int ilog2(int i)
-{
-  int log2;
-  int exp2 = 1;
-  if (i <= 0) return(-1);
-
-  for (log2 = 0; log2 < 30; log2++) {
-    if (exp2 == i) return(log2);
-    if (exp2 > i) break;
-    exp2 *= 2;
-  }
-  return(-1);
-}
-
-int ipow2(int i)
-{
-  int pow2 = 1;
-  if (i < 0) return(-1);
-  if (i == 0) return(1);
-  while(i--) pow2 *= 2;
-  return(pow2);
-}
- 
-
-
-void write_convertdouble_info(int type, FILE *fp)
-{
-  switch(type) {
-  case SP:
-  case BT:
-  case LU:
-  case FT:
-  case MG:
-  case EP:
-  case CG:
-    fprintf(fp, "%slogical  convertdouble\n", FINDENT);
-#ifdef CONVERTDOUBLE
-    fprintf(fp, "%sparameter (convertdouble = .true.)\n", FINDENT);
-#else
-    fprintf(fp, "%sparameter (convertdouble = .false.)\n", FINDENT);
-#endif
-    break;
-  }
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/settings
deleted file mode 100644
index 67727d3..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/NPB/settings
+++ /dev/null
@@ -1,4 +0,0 @@
-DIMENSION_COUNT=3
-MAX_PROC_COUNT=1
-GPU_ONLY=1
-MAX_TIME=600 # In seconds
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.cdv
deleted file mode 100644
index 50748f2..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.cdv
+++ /dev/null
@@ -1,100 +0,0 @@
-/* ADI program */
-
-#include <math.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#define Max(a, b) ((a) > (b) ? (a) : (b))
-
-#define nx 384
-#define ny 384
-#define nz 384
-
-#pragma dvm inherit(a)
-void init(double (*a)[ny][nz]);
-
-int main(int argc, char *argv[])
-{
-    double maxeps, eps;
-    #pragma dvm array distribute[block][block][block]
-    double (*a)[ny][nz];
-    int it, itmax, i, j, k;
-    double startt, endt;
-    maxeps = 0.01;
-    itmax = 100;
-    a = (double (*)[ny][nz])malloc(nx * ny * nz * sizeof(double));
-    init(a);
-
-#ifdef _DVMH
-    dvmh_barrier();
-    startt = dvmh_wtime();
-#else
-    startt = 0;
-#endif
-    for (it = 1; it <= itmax; it++)
-    {
-        eps = 0;
-        #pragma dvm actual(eps)
-        #pragma dvm region
-        {
-        #pragma dvm parallel([i][j][k] on a[i][j][k]) across(a[1:1][0:0][0:0])
-        for (i = 1; i < nx - 1; i++)
-            for (j = 1; j < ny - 1; j++)
-                for (k = 1; k < nz - 1; k++)
-                    a[i][j][k] = (a[i-1][j][k] + a[i+1][j][k]) / 2;
-        #pragma dvm parallel([i][j][k] on a[i][j][k]) across(a[0:0][1:1][0:0])
-        for (i = 1; i < nx - 1; i++)
-            for (j = 1; j < ny - 1; j++)
-                for (k = 1; k < nz - 1; k++)
-                    a[i][j][k] = (a[i][j-1][k] + a[i][j+1][k]) / 2;
-        #pragma dvm parallel([i][j][k] on a[i][j][k]) across(a[0:0][0:0][1:1]), reduction(max(eps))
-        for (i = 1; i < nx - 1; i++)
-            for (j = 1; j < ny - 1; j++)
-                for (k = 1; k < nz - 1; k++)
-                {
-                    double tmp1 = (a[i][j][k-1] + a[i][j][k+1]) / 2;
-                    double tmp2 = fabs(a[i][j][k] - tmp1);
-                    eps = Max(eps, tmp2);
-                    a[i][j][k] = tmp1;
-                }
-        }
-        #pragma dvm get_actual(eps)
-        printf(" IT = %4i   EPS = %14.7E\n", it, eps);
-        if (eps < maxeps)
-            break;
-    }
-#ifdef _DVMH
-    dvmh_barrier();
-    endt = dvmh_wtime();
-#else
-    endt = 0;
-#endif
-    free(a);
-
-    printf(" ADI Benchmark Completed.\n");
-    printf(" Size            = %4d x %4d x %4d\n", nx, ny, nz);
-    printf(" Iterations      =       %12d\n", itmax);
-    printf(" Time in seconds =       %12.2lf\n", endt - startt);
-    printf(" Operation type  =   double precision\n");
-    printf(" Verification    =       %12s\n", (fabs(eps - 0.07249074) < 1e-6 ? "SUCCESSFUL" : "UNSUCCESSFUL"));
-
-    printf(" END OF ADI Benchmark\n");
-    return 0;
-}
-
-#pragma dvm inherit(a)
-void init(double (*a)[ny][nz])
-{
-    int i, j, k;
-    #pragma dvm region out(a)
-    {
-    #pragma dvm parallel([i][j][k] on a[i][j][k])
-    for (i = 0; i < nx; i++)
-        for (j = 0; j < ny; j++)
-            for (k = 0; k < nz; k++)
-                if (k == 0 || k == nz - 1 || j == 0 || j == ny - 1 || i == 0 || i == nx - 1)
-                    a[i][j][k] = 10.0 * i / (nx - 1) + 10.0 * j / (ny - 1) + 10.0 * k / (nz - 1);
-                else
-                    a[i][j][k] = 0;
-    }
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.fdv
deleted file mode 100644
index 2d0d87f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/adi3d.fdv
+++ /dev/null
@@ -1,88 +0,0 @@
-       program adi
-       integer nx, ny, nz, itmax
-       double precision eps, relax, maxeps
-       double precision startt, endt, dvtime
-       parameter(nx=384, ny=384, nz=384, maxeps=0.01, itmax=100)
-       double precision a(nx, ny, nz)
-!DVM$  DISTRIBUTE(BLOCK, BLOCK, BLOCK) :: a
-       call init(a, nx, ny, nz)
-!DVM$  BARRIER
-       startt = dvtime()
-       do it = 1, itmax
-         eps=0.D0
-!DVM$    ACTUAL(eps)
-!DVM$    REGION
-!DVM$    PARALLEL(k, j, i) ON a(i, j, k), ACROSS(a(1:1, 0:0, 0:0))
-         do k = 2, nz - 1
-           do j = 2, ny - 1
-             do i = 2, nx - 1
-               a(i, j, k) = (a(i-1, j, k) + a(i+1, j, k)) / 2
-             enddo
-           enddo
-         enddo
-!DVM$    PARALLEL(k, j, i) ON a(i, j, k), ACROSS(a(0:0, 1:1, 0:0))
-         do k = 2, nz - 1
-           do j = 2, ny - 1
-             do i = 2, nx - 1
-               a(i, j, k) = (a(i, j-1, k) + a(i, j+1, k)) / 2
-             enddo
-           enddo
-         enddo
-!DVM$    PARALLEL(k, j, i) ON a(i, j, k), ACROSS(a(0:0, 0:0, 1:1))
-!DVM$>, REDUCTION(MAX(eps))
-         do k = 2, nz - 1
-           do j = 2, ny - 1
-             do i = 2, nx - 1
-               eps = max(eps, abs(a(i, j, k) -
-     >                  (a(i,j,k-1) + a(i,j,k+1)) / 2))
-               a(i, j, k) = (a(i, j, k-1) + a(i, j, k+1)) / 2
-             enddo
-           enddo
-         enddo
-!DVM$    END REGION
-!DVM$    GET_ACTUAL(eps)
-         print 200, it, eps
-200      format (' IT = ', i4, '   EPS = ', e14.7)
-         if (eps .lt. maxeps) exit
-       enddo
-!DVM$  BARRIER
-       endt = dvtime()
-
-       print *, 'ADI Benchmark Completed.'
-       print 201, nx, ny, nz
-201    format (' Size            = ', i4, ' x ', i4, ' x ', i4)
-       print 202, itmax
-202    format (' Iterations      =       ', i12)
-       print 203, endt - startt
-203    format (' Time in seconds =       ', f12.2)
-       print *, 'Operation type  =   double precision'
-       if (abs(eps - 0.07249074) .lt. 1.0e-6) then
-         print *, 'Verification    =         SUCCESSFUL'
-       else
-         print *, 'Verification    =       UNSUCCESSFUL'
-       endif
-
-       print *, 'END OF ADI Benchmark'
-       end
-
-       subroutine init(a, nx, ny, nz)
-       double precision a(nx, ny, nz)
-!DVM$  INHERIT a
-       integer nx, ny, nz
-!DVM$  REGION OUT(a)
-!DVM$  PARALLEL(k, j, i) ON a(i, j, k)
-       do k = 1, nz
-         do j = 1, ny
-           do i = 1, nx
-             if(k.eq.1 .or. k.eq.nz .or. j.eq.1 .or. j.eq.ny .or.
-     >          i.eq.1 .or. i.eq.nx) then
-               a(i, j, k) = 10.*(i-1)/(nx-1) + 10.*(j-1)/(ny-1)
-     >                      + 10.*(k-1)/(nz-1)
-             else
-               a(i, j, k) = 0.D0
-             endif
-           enddo
-         enddo
-       enddo
-!DVM$  END REGION
-       end
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor2d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor2d.fdv
deleted file mode 100644
index fdeda52..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor2d.fdv
+++ /dev/null
@@ -1,65 +0,0 @@
-        PROGRAM SOR2D_double
-        PARAMETER (L=8000, ITMAX=100)
-        DOUBLE PRECISION EPS, MAXEPS, A(L, L), W, S
-        DOUBLE PRECISION STARTT, ENDT, dvtime
-!DVM$   DISTRIBUTE(BLOCK, BLOCK) :: A
-
-        MAXEPS = 0.5
-        W = 0.5
-!DVM$   REGION
-!DVM$   PARALLEL(J, I) ON A(I, J), CUDA_BLOCK(32, 8)
-!        nest of two parallel loops, iteration (i, j) will be executed on
-!        processor, which is owner of element A(i, j)
-          DO J = 1, L
-            DO I = 1, L
-              IF (I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.L .OR. J.EQ.L ) THEN
-                A(I, J) = 0.
-              ELSE
-                A(I, J) = (1. + I + J)
-              ENDIF
-            ENDDO
-          ENDDO
-!DVM$   END REGION
-!DVM$   BARRIER
-        STARTT = dvtime()
-        DO IT = 1, ITMAX
-          EPS = 0.
-!DVM$     ACTUAL(EPS)
-!DVM$     REGION
-
-!DVM$ PARALLEL (J, I) ON A(I, J), ACROSS(A(1:1,1:1)),
-!DVM$& REDUCTION(MAX(EPS)), PRIVATE(S)
-            DO J = 2, L - 1
-              DO I = 2, L - 1
-                S = A(I, J)
-                A(I, J) = (W / 6. ) * 
-     >            (A(I, J-1) + A(I-1, J) + A(I+1, J) + A(I, J+1))
-     >          + (1 - W) * A(I, J)
-                EPS = MAX(EPS, ABS(S - A(I, J)))
-              ENDDO
-            ENDDO
-!DVM$     END REGION
-!DVM$     GET_ACTUAL(EPS)
-          PRINT 200, IT, EPS
-200       FORMAT (' IT = ', I4, '   EPS = ', E23.16)
-          IF (EPS .LT. MAXEPS) EXIT
-        ENDDO
-!DVM$   BARRIER
-        ENDT = dvtime()
-
-        PRINT *, 'SOR2D_double Benchmark Completed.'
-        PRINT 201, L, L
-201     FORMAT (' Size            =    ', I6, ' x ', I6)
-        PRINT 202, ITMAX
-202     FORMAT (' Iterations      =       ', I12)
-        PRINT 203, ENDT - STARTT
-203     FORMAT (' Time in seconds =       ', F12.2)
-        PRINT *, 'Operation type  =     floating point'
-        IF (ABS(EPS - 0.424766850334810d0) .LT. 1.0E-7) THEN
-          PRINT *, 'Verification    =         SUCCESSFUL'
-        ELSE
-          PRINT *, 'Verification    =       UNSUCCESSFUL'
-        ENDIF
-
-        PRINT *, 'END OF SOR2D_double Benchmark'
-        END
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor3d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor3d.fdv
deleted file mode 100644
index 8ae7646..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/d_sor3d.fdv
+++ /dev/null
@@ -1,71 +0,0 @@
-        PROGRAM SOR3D_double
-        PARAMETER (L=384, ITMAX=100)
-        DOUBLE PRECISION EPS, MAXEPS, A(L, L, L), W, S
-        DOUBLE PRECISION STARTT, ENDT, dvtime
-!DVM$   DISTRIBUTE(BLOCK, BLOCK, BLOCK) :: A
-
-        MAXEPS = 0.5
-        W = 0.5
-!DVM$   REGION
-!DVM$   PARALLEL(K, J, I) ON A(I, J, K), CUDA_BLOCK(32, 8)
-!        nest of two parallel loops, iteration (i, j) will be executed on
-!        processor, which is owner of element A(i, j)
-        DO K = 1, L
-          DO J = 1, L
-            DO I = 1, L
-              IF (I.EQ.1 .OR. J.EQ.1 .OR. K.EQ.1
-     >.OR. I.EQ.L .OR. J.EQ.L .OR. K.EQ.L) THEN
-                A(I, J, K) = 0.
-              ELSE
-                A(I, J, K) = (1. + I + J + K)
-              ENDIF
-            ENDDO
-          ENDDO
-        ENDDO
-!DVM$   END REGION
-!DVM$   BARRIER
-        STARTT = dvtime()
-        DO IT = 1, ITMAX
-          EPS = 0.
-!DVM$     ACTUAL(EPS)
-!DVM$     REGION
-
-!DVM$ PARALLEL (K, J, I) ON A(I, J, K), ACROSS(A(1:1,1:1,1:1)),
-!DVM$& REDUCTION(MAX(EPS)), PRIVATE(S)
-          DO K = 2, L - 1
-            DO J = 2, L - 1
-              DO I = 2, L - 1
-                S = A(I, J, K)
-                A(I, J, K) = (W / 6. ) * (A(I, J, K-1) + A(I, J-1, K) + 
-     >                                   A(I-1, J, K) + A(I+1, J, K) + 
-     >                                   A(I, J+1, K) + A(I, J, K+1))+
-     >                        + (1 - W) * A(I, J, K)
-                EPS = MAX(EPS, ABS(S - A(I, J, K)))
-              ENDDO
-            ENDDO
-          ENDDO
-!DVM$     END REGION
-!DVM$     GET_ACTUAL(EPS)
-          PRINT 200, IT, EPS
-200       FORMAT (' IT = ', I4, '   EPS = ', E23.16)
-          IF (EPS .LT. MAXEPS) EXIT
-        ENDDO
-!DVM$   BARRIER
-        ENDT = dvtime()
-
-        PRINT *, 'SOR3D_double Benchmark Completed.'
-        PRINT 201, L, L, L
-201     FORMAT (' Size            = ', I4, ' x ', I4, ' x ', I4)
-        PRINT 202, ITMAX
-202     FORMAT (' Iterations      =       ', I12)
-        PRINT 203, ENDT - STARTT
-203     FORMAT (' Time in seconds =       ', F12.2)
-        PRINT *, 'Operation type  =     floating point'
-        IF (ABS(EPS - 5.134125088529458d0) .LT. 1.0d-7) THEN
-          PRINT *, 'Verification    =         SUCCESSFUL'
-        ELSE
-          PRINT *, 'Verification    =       UNSUCCESSFUL'
-        ENDIF
-
-        PRINT *, 'END OF SOR3D_double Benchmark'
-        END
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor2d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor2d.fdv
deleted file mode 100644
index 179dace..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor2d.fdv
+++ /dev/null
@@ -1,65 +0,0 @@
-        PROGRAM SOR2D_float
-        PARAMETER (L=8000, ITMAX=100)
-        REAL EPS, MAXEPS, A(L, L), W, S
-        DOUBLE PRECISION STARTT, ENDT, dvtime
-!DVM$   DISTRIBUTE(BLOCK, BLOCK) :: A
-
-        MAXEPS = 0.5
-        W = 0.5
-!DVM$   REGION
-!DVM$   PARALLEL(J, I) ON A(I, J), CUDA_BLOCK(32, 8)
-!        nest of two parallel loops, iteration (i, j) will be executed on
-!        processor, which is owner of element A(i, j)
-          DO J = 1, L
-            DO I = 1, L
-              IF (I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.L .OR. J.EQ.L ) THEN
-                A(I, J) = 0.
-              ELSE
-                A(I, J) = (1. + I + J)
-              ENDIF
-            ENDDO
-          ENDDO
-!DVM$   END REGION
-!DVM$   BARRIER
-        STARTT = dvtime()
-        DO IT = 1, ITMAX
-          EPS = 0.
-!DVM$     ACTUAL(EPS)
-!DVM$     REGION
-
-!DVM$ PARALLEL (J, I) ON A(I, J), ACROSS(A(1:1,1:1)),
-!DVM$& REDUCTION(MAX(EPS)), PRIVATE(S)
-            DO J = 2, L - 1
-              DO I = 2, L - 1
-                S = A(I, J)
-                A(I, J) = (W / 6. ) * 
-     >            (A(I, J-1) + A(I-1, J) + A(I+1, J) + A(I, J+1))
-     >          + (1 - W) * A(I, J)
-                EPS = MAX(EPS, ABS(S - A(I, J)))
-              ENDDO
-            ENDDO
-!DVM$     END REGION
-!DVM$     GET_ACTUAL(EPS)
-          PRINT 200, IT, EPS
-200       FORMAT (' IT = ', I4, '   EPS = ', E14.7)
-          IF (EPS .LT. MAXEPS) EXIT
-        ENDDO
-!DVM$   BARRIER
-        ENDT = dvtime()
-
-        PRINT *, 'SOR2D_float Benchmark Completed.'
-        PRINT 201, L, L
-201     FORMAT (' Size            =    ', I6, ' x ', I6)
-        PRINT 202, ITMAX
-202     FORMAT (' Iterations      =       ', I12)
-        PRINT 203, ENDT - STARTT
-203     FORMAT (' Time in seconds =       ', F12.2)
-        PRINT *, 'Operation type  =     floating point'
-        IF (ABS(EPS - 0.4247670) .LT. 1.0E-4) THEN
-          PRINT *, 'Verification    =         SUCCESSFUL'
-        ELSE
-          PRINT *, 'Verification    =       UNSUCCESSFUL'
-        ENDIF
-
-        PRINT *, 'END OF SOR2D_float Benchmark'
-        END
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor3d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor3d.fdv
deleted file mode 100644
index 56efb63..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/f_sor3d.fdv
+++ /dev/null
@@ -1,71 +0,0 @@
-        PROGRAM SOR3D_float
-        PARAMETER (L=384, ITMAX=100)
-        REAL EPS, MAXEPS, A(L, L, L), W, S
-        DOUBLE PRECISION STARTT, ENDT, dvtime
-!DVM$   DISTRIBUTE(BLOCK, BLOCK, BLOCK) :: A
-
-        MAXEPS = 0.5
-        W = 0.5
-!DVM$   REGION
-!DVM$   PARALLEL(K, J, I) ON A(I, J, K), CUDA_BLOCK(32, 8)
-!        nest of two parallel loops, iteration (i, j) will be executed on
-!        processor, which is owner of element A(i, j)
-        DO K = 1, L
-          DO J = 1, L
-            DO I = 1, L
-              IF (I.EQ.1 .OR. J.EQ.1 .OR. K.EQ.1
-     >.OR. I.EQ.L .OR. J.EQ.L .OR. K.EQ.L) THEN
-                A(I, J, K) = 0.
-              ELSE
-                A(I, J, K) = (1. + I + J + K)
-              ENDIF
-            ENDDO
-          ENDDO
-        ENDDO
-!DVM$   END REGION
-!DVM$   BARRIER
-        STARTT = dvtime()
-        DO IT = 1, ITMAX
-          EPS = 0.
-!DVM$     ACTUAL(EPS)
-!DVM$     REGION
-
-!DVM$ PARALLEL (K, J, I) ON A(I, J, K), ACROSS(A(1:1,1:1,1:1)),
-!DVM$& REDUCTION(MAX(EPS)), PRIVATE(S)
-          DO K = 2, L - 1
-            DO J = 2, L - 1
-              DO I = 2, L - 1
-                S = A(I, J, K)
-                A(I, J, K) = (W / 6. ) * (A(I, J, K-1) + A(I, J-1, K) + 
-     >                                   A(I-1, J, K) + A(I+1, J, K) + 
-     >                                   A(I, J+1, K) + A(I, J, K+1))+
-     >                        + (1 - W) * A(I, J, K)
-                EPS = MAX(EPS, ABS(S - A(I, J, K)))
-              ENDDO
-            ENDDO
-          ENDDO
-!DVM$     END REGION
-!DVM$     GET_ACTUAL(EPS)
-          PRINT 200, IT, EPS
-200       FORMAT (' IT = ', I4, '   EPS = ', E14.7)
-          IF (EPS .LT. MAXEPS) EXIT
-        ENDDO
-!DVM$   BARRIER
-        ENDT = dvtime()
-
-        PRINT *, 'SOR3D_float Benchmark Completed.'
-        PRINT 201, L, L, L
-201     FORMAT (' Size            = ', I4, ' x ', I4, ' x ', I4)
-        PRINT 202, ITMAX
-202     FORMAT (' Iterations      =       ', I12)
-        PRINT 203, ENDT - STARTT
-203     FORMAT (' Time in seconds =       ', F12.2)
-        PRINT *, 'Operation type  =     floating point'
-        IF (ABS(EPS - 5.134155) .LT. 1.0E-4) THEN
-          PRINT *, 'Verification    =         SUCCESSFUL'
-        ELSE
-          PRINT *, 'Verification    =       UNSUCCESSFUL'
-        ENDIF
-
-        PRINT *, 'END OF SOR3D_float Benchmark'
-        END
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.cdv
deleted file mode 100644
index f95e48f..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.cdv
+++ /dev/null
@@ -1,93 +0,0 @@
-/* Jacobi-2 program */
-
-#include <math.h>
-#include <stdio.h>
-
-#define Max(a, b) ((a) > (b) ? (a) : (b))
-
-#define L 8000
-#define ITMAX 100
-
-int i, j, it;
-float eps;
-float MAXEPS = 0.5f;
-
-/* 2D arrays block distributed along 2 dimensions */
-#pragma dvm array distribute[block][block]
-float A[L][L];
-#pragma dvm array align([i][j] with A[i][j])
-float B[L][L];
-
-int main(int an, char **as)
-{
-    double startt, endt;
-    #pragma dvm region
-    {
-    /* 2D parallel loop with base array A */
-    #pragma dvm parallel([i][j] on A[i][j]) cuda_block(256)
-    for (i = 0; i < L; i++)
-        for (j = 0; j < L; j++)
-        {
-            A[i][j] = 0;
-            if (i == 0 || j == 0 || i == L - 1 || j == L - 1)
-                B[i][j] = 0;
-            else
-                B[i][j] = 3 + i + j;
-        }
-    }
-
-#ifdef _DVMH
-    dvmh_barrier();
-    startt = dvmh_wtime();
-#else
-    startt = 0;
-#endif
-    /* iteration loop */
-    for (it = 1; it <= ITMAX; it++)
-    {
-        eps = 0;
-        #pragma dvm actual(eps)
-
-        #pragma dvm region
-        {
-        /* Parallel loop with base array A */
-        /* calculating maximum in variable eps */
-        #pragma dvm parallel([i][j] on A[i][j]) reduction(max(eps)), cuda_block(256)
-        for (i = 1; i < L - 1; i++)
-            for (j = 1; j < L - 1; j++)
-            {
-                float tmp = fabs(B[i][j] - A[i][j]);
-                eps = Max(tmp, eps);
-                A[i][j] = B[i][j];
-            }
-
-        /* Parallel loop with base array B and */
-        /* with prior updating shadow elements of array A */
-        #pragma dvm parallel([i][j] on B[i][j]) shadow_renew(A), cuda_block(256)
-        for (i = 1; i < L - 1; i++)
-            for (j = 1; j < L - 1; j++)
-                B[i][j] = (A[i - 1][j] + A[i][j - 1] + A[i][j + 1] + A[i + 1][j]) / 4.0f;
-        }
-
-        #pragma dvm get_actual(eps)
-        printf(" IT = %4i   EPS = %14.7E\n", it, eps);
-        if (eps < MAXEPS)
-            break;
-    }
-#ifdef _DVMH
-    dvmh_barrier();
-    endt = dvmh_wtime();
-#else
-    endt = 0;
-#endif
-
-    printf(" Jacobi2D Benchmark Completed.\n");
-    printf(" Size            =    %6d x %6d\n", L, L);
-    printf(" Iterations      =       %12d\n", ITMAX);
-    printf(" Time in seconds =       %12.2lf\n", endt - startt);
-    printf(" Operation type  =     floating point\n");
-    printf(" Verification    =       %12s\n", (fabs(eps - 58.37598) < 1e-3 ? "SUCCESSFUL" : "UNSUCCESSFUL"));
-
-    printf(" END OF Jacobi2D Benchmark\n");
-    return 0;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.fdv
deleted file mode 100644
index dae88b4..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac2d.fdv
+++ /dev/null
@@ -1,71 +0,0 @@
-        PROGRAM JAC2D
-        PARAMETER (L=8000, ITMAX=100)
-        REAL A(L, L), EPS, MAXEPS, B(L, L)
-        DOUBLE PRECISION STARTT, ENDT, dvtime
-!DVM$   DISTRIBUTE(BLOCK, BLOCK) :: A
-!DVM$   ALIGN B(I, J) WITH A(I, J)
-!        arrays A and B  with block distribution 
-
-        MAXEPS = 0.5
-!DVM$   REGION
-!DVM$   PARALLEL(J, I) ON A(I, J), CUDA_BLOCK(256)
-!        nest of two parallel loops, iteration (i, j) will be executed on
-!        processor, which is owner of element A(i, j)
-        DO J = 1, L
-          DO I = 1, L
-            A(I, J) = 0.
-            IF (I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.L .OR. J.EQ.L) THEN
-              B(I, J) = 0.
-            ELSE
-              B(I, J) = (1. + I + J)
-            ENDIF
-          ENDDO
-        ENDDO
-!DVM$   END REGION
-!DVM$   BARRIER
-        STARTT = dvtime()
-        DO IT = 1, ITMAX
-          EPS = 0.
-!DVM$     ACTUAL(EPS)
-!DVM$     REGION
-!DVM$    PARALLEL(J, I) ON A(I, J), REDUCTION(MAX(EPS)), CUDA_BLOCK(256)
-!          variable EPS is used for calculation of maximum value
-          DO J = 2, L - 1
-            DO I = 2, L - 1
-              EPS = MAX(EPS, ABS(B(I, J) - A(I, J)))
-              A(I, J) = B(I, J)
-            ENDDO
-          ENDDO
-!DVM$     PARALLEL(J, I) ON B(I, J), SHADOW_RENEW(A), CUDA_BLOCK(256)
-!          Copying shadow elements of array A from
-!          neighbouring processors before loop execution
-          DO J = 2, L - 1
-            DO I = 2, L - 1
-          B(I, J) = (A(I, J-1) + A(I-1, J) + A(I+1, J) + A(I, J+1)) / 4.
-            ENDDO
-          ENDDO
-!DVM$     END REGION
-!DVM$     GET_ACTUAL(EPS)
-          PRINT 200, IT, EPS
-200       FORMAT (' IT = ', I4, '   EPS = ', E14.7)
-          IF (EPS .LT. MAXEPS) EXIT
-        ENDDO
-!DVM$   BARRIER
-        ENDT = dvtime()
-
-        PRINT *, 'Jacobi2D Benchmark Completed.'
-        PRINT 201, L, L
-201     FORMAT (' Size            =    ', I6, ' x ', I6)
-        PRINT 202, ITMAX
-202     FORMAT (' Iterations      =       ', I12)
-        PRINT 203, ENDT - STARTT
-203     FORMAT (' Time in seconds =       ', F12.2)
-        PRINT *, 'Operation type  =     floating point'
-        IF (ABS(EPS - 58.37598) .LT. 1.0E-3) THEN
-          PRINT *, 'Verification    =         SUCCESSFUL'
-        ELSE
-          PRINT *, 'Verification    =       UNSUCCESSFUL'
-        ENDIF
-
-        PRINT *, 'END OF Jacobi2D Benchmark'
-        END
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.cdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.cdv
deleted file mode 100644
index c4ac766..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.cdv
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Jacobi-3 program */
-
-#include <math.h>
-#include <stdio.h>
-
-#define Max(a, b) ((a) > (b) ? (a) : (b))
-
-#define L 384
-#define ITMAX 100
-
-int i, j, k, it;
-float eps;
-float MAXEPS = 0.5f;
-
-/* 3D arrays block distributed along 3 dimensions */
-#pragma dvm array distribute[block][block][block]
-float A[L][L][L];
-#pragma dvm array align([i][j][k] with A[i][j][k])
-float B[L][L][L];
-
-int main(int an, char **as)
-{
-    double startt, endt;
-    #pragma dvm region
-    {
-    /* 3D parallel loop with base array A */
-    #pragma dvm parallel([i][j][k] on A[i][j][k]) cuda_block(32, 8)
-    for (i = 0; i < L; i++)
-        for (j = 0; j < L; j++)
-            for (k = 0; k < L; k++)
-            {
-                A[i][j][k] = 0;
-                if (i == 0 || j == 0 || k == 0 || i == L - 1 || j == L - 1 || k == L - 1)
-                    B[i][j][k] = 0;
-                else
-                    B[i][j][k] = 4 + i + j + k;
-            }
-    }
-
-#ifdef _DVMH
-    dvmh_barrier();
-    startt = dvmh_wtime();
-#else
-    startt = 0;
-#endif
-    /* iteration loop */
-    for (it = 1; it <= ITMAX; it++)
-    {
-        eps = 0;
-        #pragma dvm actual(eps)
-
-        #pragma dvm region
-        {
-        /* Parallel loop with base array A */
-        /* calculating maximum in variable eps */
-        #pragma dvm parallel([i][j][k] on A[i][j][k]) reduction(max(eps)), cuda_block(32, 8)
-        for (i = 1; i < L - 1; i++)
-            for (j = 1; j < L - 1; j++)
-                for (k = 1; k < L - 1; k++)
-                {
-                    float tmp = fabs(B[i][j][k] - A[i][j][k]);
-                    eps = Max(tmp, eps);
-                    A[i][j][k] = B[i][j][k];
-                }
-
-        /* Parallel loop with base array B and */
-        /* with prior updating shadow elements of array A */
-        #pragma dvm parallel([i][j][k] on B[i][j][k]) shadow_renew(A), cuda_block(32, 8)
-        for (i = 1; i < L - 1; i++)
-            for (j = 1; j < L - 1; j++)
-                for (k = 1; k < L - 1; k++)
-                    B[i][j][k] = (A[i - 1][j][k] + A[i][j - 1][k] + A[i][j][k - 1] + A[i][j][k + 1] + A[i][j + 1][k] + A[i + 1][j][k]) / 6.0f;
-        }
-
-        #pragma dvm get_actual(eps)
-        printf(" IT = %4i   EPS = %14.7E\n", it, eps);
-        if (eps < MAXEPS)
-            break;
-    }
-#ifdef _DVMH
-    dvmh_barrier();
-    endt = dvmh_wtime();
-#else
-    endt = 0;
-#endif
-
-    printf(" Jacobi3D Benchmark Completed.\n");
-    printf(" Size            = %4d x %4d x %4d\n", L, L, L);
-    printf(" Iterations      =       %12d\n", ITMAX);
-    printf(" Time in seconds =       %12.2lf\n", endt - startt);
-    printf(" Operation type  =     floating point\n");
-    printf(" Verification    =       %12s\n", (fabs(eps - 5.058044) < 1e-4 ? "SUCCESSFUL" : "UNSUCCESSFUL"));
-
-    printf(" END OF Jacobi3D Benchmark\n");
-    return 0;
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.fdv b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.fdv
deleted file mode 100644
index ddd7add..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/jac3d.fdv
+++ /dev/null
@@ -1,81 +0,0 @@
-        PROGRAM JAC3D
-        PARAMETER (L=384, ITMAX=100)
-        REAL A(L, L, L), EPS, MAXEPS, B(L, L, L)
-        DOUBLE PRECISION STARTT, ENDT, dvtime
-!DVM$   DISTRIBUTE(BLOCK, BLOCK, BLOCK) :: A
-!DVM$   ALIGN B(I, J, K) WITH A(I, J, K)
-!        arrays A and B  with block distribution 
-
-        MAXEPS = 0.5
-!DVM$   REGION
-!DVM$   PARALLEL(K, J, I) ON A(I, J, K), CUDA_BLOCK(32, 8)
-!        nest of two parallel loops, iteration (i, j) will be executed on
-!        processor, which is owner of element A(i, j)
-        DO K = 1, L
-          DO J = 1, L
-            DO I = 1, L
-              A(I, J, K) = 0.
-              IF (I.EQ.1 .OR. J.EQ.1 .OR. K.EQ.1
-     >.OR. I.EQ.L .OR. J.EQ.L .OR. K.EQ.L) THEN
-                B(I, J, K) = 0.
-              ELSE
-                B(I, J, K) = (1. + I + J + K)
-              ENDIF
-            ENDDO
-          ENDDO
-        ENDDO
-!DVM$   END REGION
-!DVM$   BARRIER
-        STARTT = dvtime()
-        DO IT = 1, ITMAX
-          EPS = 0.
-!DVM$     ACTUAL(EPS)
-!DVM$     REGION
-!DVM$     PARALLEL(K, J, I) ON A(I, J, K), REDUCTION(MAX(EPS))
-!DVM$>, CUDA_BLOCK(32, 8)
-!          variable EPS is used for calculation of maximum value
-          DO K = 2, L - 1
-            DO J = 2, L - 1
-              DO I = 2, L - 1
-                EPS = MAX(EPS, ABS(B(I, J, K) - A(I, J, K)))
-                A(I, J, K) = B(I, J, K)
-              ENDDO
-            ENDDO
-          ENDDO
-!DVM$     PARALLEL(K, J, I) ON B(I, J, K), SHADOW_RENEW(A)
-!DVM$>, CUDA_BLOCK(32, 8)
-!          Copying shadow elements of array A from
-!          neighbouring processors before loop execution
-          DO K = 2, L - 1
-            DO J = 2, L - 1
-              DO I = 2, L - 1
-                B(I, J, K) = (A(I, J, K-1) + A(I, J-1, K) + A(I-1, J, K)
-     >+ A(I+1, J, K) + A(I, J+1, K) + A(I, J, K+1)) / 6.
-              ENDDO
-            ENDDO
-          ENDDO
-!DVM$     END REGION
-!DVM$     GET_ACTUAL(EPS)
-          PRINT 200, IT, EPS
-200       FORMAT (' IT = ', I4, '   EPS = ', E14.7)
-          IF (EPS .LT. MAXEPS) EXIT
-        ENDDO
-!DVM$   BARRIER
-        ENDT = dvtime()
-
-        PRINT *, 'Jacobi3D Benchmark Completed.'
-        PRINT 201, L, L, L
-201     FORMAT (' Size            = ', I4, ' x ', I4, ' x ', I4)
-        PRINT 202, ITMAX
-202     FORMAT (' Iterations      =       ', I12)
-        PRINT 203, ENDT - STARTT
-203     FORMAT (' Time in seconds =       ', F12.2)
-        PRINT *, 'Operation type  =     floating point'
-        IF (ABS(EPS - 5.058044) .LT. 1.0E-4) THEN
-          PRINT *, 'Verification    =         SUCCESSFUL'
-        ELSE
-          PRINT *, 'Verification    =       UNSUCCESSFUL'
-        ENDIF
-
-        PRINT *, 'END OF Jacobi3D Benchmark'
-        END
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/settings
deleted file mode 100644
index 5c9ddf9..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/settings
+++ /dev/null
@@ -1,3 +0,0 @@
-MAX_PROC_COUNT=4
-MAX_DIM_PROC_COUNT=4
-MAX_TIME=60 # In seconds
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/test-analyzer.sh b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/test-analyzer.sh
deleted file mode 100644
index d72fd3e..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/Performance/test-analyzer.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/sh
-
-# This is analyzer of output of NPB-style formed tests
-# Requires variables: LAUNCH_EXIT_CODE, STDOUT_FN, STDERR_FN
-# Produces variables: SUBTEST_COUNT, TEST_PASSED, RESULT_COMMENT, ERROR_LEVEL, TASK_CALC_TIME
-# Produces functions: analyze_subtest
-
-SUBTEST_COUNT=`grep 'Completed.' <"$STDOUT_FN" | wc -l`
-
-if [ `grep -E 'Assertion' <"$STDERR_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Assertion failed"
-    ERROR_LEVEL=5
-elif [ `grep -E 'RTS fatal' <"$STDERR_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="RTS fatal"
-    ERROR_LEVEL=4
-elif [ `grep -E 'RTS err' <"$STDERR_FN" | wc -l` -gt 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="RTS err"
-    ERROR_LEVEL=3
-elif [ `grep "END OF" <"$STDOUT_FN" | wc -l` -eq 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Crash"
-    ERROR_LEVEL=2
-elif [ $LAUNCH_EXIT_CODE -ne 0 ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Launch failure"
-    ERROR_LEVEL=6
-elif [ `grep ' SUCCESSFUL' <"$STDOUT_FN" | wc -l` -lt $SUBTEST_COUNT ]; then
-    TEST_PASSED=0
-    RESULT_COMMENT="Has failed subtests"
-    ERROR_LEVEL=1
-else
-    TEST_PASSED=1
-    RESULT_COMMENT="OK"
-    ERROR_LEVEL=0
-fi
-
-if [ $SUBTEST_COUNT -eq 1 ]; then
-    TASK_CALC_TIME=`grep 'Time in seconds' <"$STDOUT_FN" | awk '{ print $5 }'`
-fi
-
-analyze_subtest() {
-    # Produces variables: SUBTEST_NAME, TEST_PASSED, RESULT_COMMENT, ERROR_LEVEL, TASK_CALC_TIME
-    local SUBTEST_RES_START=`grep -n 'Completed.' <"$STDOUT_FN" | head -n $1 | tail -n 1 | sed 's/:.*//g'`
-    local SUBTEST_RES_END=
-    if [ $1 -lt $SUBTEST_COUNT ]; then
-        SUBTEST_RES_END=`grep -n 'Completed.' <"$STDOUT_FN" | head -n $(( $1 + 1 )) | tail -n 1 | sed 's/:.*//g'`
-        SUBTEST_RES_END=$(( SUBTEST_RES_END - 1))
-    else
-        SUBTEST_RES_END=`cat "$STDOUT_FN" | wc -l`
-    fi
-    local linecount=$(( SUBTEST_RES_END - SUBTEST_RES_START + 1 ))
-    local tmp=`mktemp`
-    cat "$STDOUT_FN" | head -n $SUBTEST_RES_END | tail -n $linecount >$tmp
-    SUBTEST_NAME=`grep "Completed." <$tmp | head -n 1 | awk '{ print $1 }'`
-    local CLASS_NAME=`grep "Class" <$tmp | head -n 1 | awk '{ print $3 }'`
-    if [ -n "$CLASS_NAME" ]; then
-        SUBTEST_NAME="$SUBTEST_NAME ($CLASS_NAME)"
-    fi
-    TEST_PASSED=`grep "Verification" <$tmp | head -n 1 | awk '{ print $3 }'`
-    if [ "$TEST_PASSED" = "SUCCESSFUL" ]; then
-        TEST_PASSED=1
-        RESULT_COMMENT="OK"
-        ERROR_LEVEL=0
-    else
-        TEST_PASSED=0
-        RESULT_COMMENT="Subtest failed"
-        ERROR_LEVEL=1
-    fi
-    TASK_CALC_TIME=`grep 'Time in seconds' <$tmp | awk '{ print $5 }'`
-    rm $tmp
-}
diff --git a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/settings b/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/settings
deleted file mode 100644
index 2d65b60..0000000
--- a/Sapfor/_projects/dvm/tools/tester/trunk/test-suite/settings
+++ /dev/null
@@ -1,7 +0,0 @@
-MAX_PROC_COUNT=1
-MAX_DIM_PROC_COUNT=0
-SHARE_RESOURCES=0
-ALLOW_MULTIDEV=1
-DVM_ONLY=0
-GPU_ONLY=0
-MAX_TIME=300 # In seconds

From 18f561925bfd190c069ff479b4451a3c1abfdfb2 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Wed, 12 Mar 2025 14:22:11 +0300
Subject: [PATCH 27/44] fixed paths

---
 Sapfor/CMakeLists.txt                         |  466 +-
 .../FDVM/CMakeLists.txt                       |    0
 .../Parser/CMakeLists.txt                     |    0
 .../SageLib/CMakeLists.txt                    |    0
 .../SageNewSrc/CMakeLists.txt                 |    0
 .../SageOldSrc/CMakeLists.txt                 |    0
 .../{_projects => projects}/Sapc++/Sapc++.sln |    0
 .../dvm/fdvm/CMakeLists.txt                   |    0
 .../dvm/fdvm/trunk/CMakeLists.txt             |    0
 .../fdvm/trunk/InlineExpansion/CMakeLists.txt |    0
 .../dvm/fdvm/trunk/InlineExpansion/dvm_tag.h  |    0
 .../dvm/fdvm/trunk/InlineExpansion/hlp.cpp    |    0
 .../fdvm/trunk/InlineExpansion/inl_exp.cpp    |    0
 .../dvm/fdvm/trunk/InlineExpansion/inline.h   |    0
 .../fdvm/trunk/InlineExpansion/inliner.cpp    |    0
 .../fdvm/trunk/InlineExpansion/intrinsic.h    |    0
 .../fdvm/trunk/InlineExpansion/makefile.uni   |    0
 .../fdvm/trunk/InlineExpansion/makefile.win   |    0
 .../dvm/fdvm/trunk/Makefile                   |    0
 .../dvm/fdvm/trunk/Sage/CMakeLists.txt        |    0
 .../dvm/fdvm/trunk/Sage/LICENSE               |    0
 .../dvm/fdvm/trunk/Sage/Makefile              |    0
 .../dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt |    0
 .../dvm/fdvm/trunk/Sage/Sage++/Makefile       |    0
 .../dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp  |    0
 .../dvm/fdvm/trunk/Sage/Sage++/makefile.uni   |    0
 .../dvm/fdvm/trunk/Sage/Sage++/makefile.win   |    0
 .../dvm/fdvm/trunk/Sage/h/Makefile            |    0
 .../dvm/fdvm/trunk/Sage/h/bif.h               |    0
 .../dvm/fdvm/trunk/Sage/h/compatible.h        |    0
 .../dvm/fdvm/trunk/Sage/h/db.h                |    0
 .../dvm/fdvm/trunk/Sage/h/db.new.h            |    0
 .../dvm/fdvm/trunk/Sage/h/defines.h           |    0
 .../dvm/fdvm/trunk/Sage/h/defs.h              |    0
 .../dvm/fdvm/trunk/Sage/h/dep.h               |    0
 .../dvm/fdvm/trunk/Sage/h/dep_str.h           |    0
 .../dvm/fdvm/trunk/Sage/h/dep_struct.h        |    0
 .../dvm/fdvm/trunk/Sage/h/elist.h             |    0
 .../dvm/fdvm/trunk/Sage/h/f90.h               |    0
 .../dvm/fdvm/trunk/Sage/h/fixcray.h           |    0
 .../dvm/fdvm/trunk/Sage/h/fm.h                |    0
 .../dvm/fdvm/trunk/Sage/h/head                |    0
 .../dvm/fdvm/trunk/Sage/h/leak_detector.h     |    0
 .../dvm/fdvm/trunk/Sage/h/list.h              |    0
 .../dvm/fdvm/trunk/Sage/h/ll.h                |    0
 .../dvm/fdvm/trunk/Sage/h/prop.h              |    0
 .../dvm/fdvm/trunk/Sage/h/sage.h              |    0
 .../dvm/fdvm/trunk/Sage/h/sagearch.h          |    0
 .../dvm/fdvm/trunk/Sage/h/sageroot.h          |    0
 .../dvm/fdvm/trunk/Sage/h/sets.h              |    0
 .../dvm/fdvm/trunk/Sage/h/symb.h              |    0
 .../dvm/fdvm/trunk/Sage/h/symblob.h           |    0
 .../dvm/fdvm/trunk/Sage/h/tag                 |    0
 .../dvm/fdvm/trunk/Sage/h/tag.doc             |    0
 .../dvm/fdvm/trunk/Sage/h/tag.h               |    0
 .../dvm/fdvm/trunk/Sage/h/tag_make            |    0
 .../dvm/fdvm/trunk/Sage/h/version.h           |    0
 .../dvm/fdvm/trunk/Sage/h/vextern.h           |    0
 .../dvm/fdvm/trunk/Sage/h/vparse.h            |    0
 .../dvm/fdvm/trunk/Sage/h/vpc.h               |    0
 .../dvm/fdvm/trunk/Sage/h/window.h            |    0
 .../dvm/fdvm/trunk/Sage/lib/CMakeLists.txt    |    0
 .../dvm/fdvm/trunk/Sage/lib/Makefile          |    0
 .../fdvm/trunk/Sage/lib/include/attributes.h  |    0
 .../fdvm/trunk/Sage/lib/include/baseClasses.h |    0
 .../fdvm/trunk/Sage/lib/include/bif_node.def  |    0
 .../fdvm/trunk/Sage/lib/include/dependence.h  |    0
 .../dvm/fdvm/trunk/Sage/lib/include/ext_ann.h |    0
 .../fdvm/trunk/Sage/lib/include/ext_high.h    |    0
 .../dvm/fdvm/trunk/Sage/lib/include/ext_lib.h |    0
 .../dvm/fdvm/trunk/Sage/lib/include/ext_low.h |    0
 .../dvm/fdvm/trunk/Sage/lib/include/ext_mid.h |    0
 .../fdvm/trunk/Sage/lib/include/extcxx_low.h  |    0
 .../fdvm/trunk/Sage/lib/include/libSage++.h   |    0
 .../dvm/fdvm/trunk/Sage/lib/include/macro.h   |    0
 .../trunk/Sage/lib/include/sage++callgraph.h  |    0
 .../Sage/lib/include/sage++classhierarchy.h   |    0
 .../trunk/Sage/lib/include/sage++extern.h     |    0
 .../fdvm/trunk/Sage/lib/include/sage++proto.h |    0
 .../fdvm/trunk/Sage/lib/include/sage++user.h  |    0
 .../dvm/fdvm/trunk/Sage/lib/include/symb.def  |    0
 .../dvm/fdvm/trunk/Sage/lib/include/type.def  |    0
 .../fdvm/trunk/Sage/lib/include/unparse.def   |    0
 .../trunk/Sage/lib/include/unparseC++.def     |    0
 .../trunk/Sage/lib/include/unparseDVM.def     |    0
 .../dvm/fdvm/trunk/Sage/lib/makefile.uni      |    0
 .../dvm/fdvm/trunk/Sage/lib/makefile.win      |    0
 .../fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt |    0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/Makefile   |    0
 .../fdvm/trunk/Sage/lib/newsrc/annotate.tab.c |    0
 .../fdvm/trunk/Sage/lib/newsrc/annotate.tab.h |    0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y |    0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/comments.c |    0
 .../fdvm/trunk/Sage/lib/newsrc/low_level.c    |    0
 .../fdvm/trunk/Sage/lib/newsrc/makefile.uni   |    0
 .../fdvm/trunk/Sage/lib/newsrc/makefile.win   |    0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c |    0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c  |    0
 .../fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile   |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/db.c       |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c   |    0
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c  |    0
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c   |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c  |    0
 .../fdvm/trunk/Sage/lib/oldsrc/garb_coll.c    |    0
 .../fdvm/trunk/Sage/lib/oldsrc/glob_anal.c    |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c  |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/list.c     |    0
 .../fdvm/trunk/Sage/lib/oldsrc/make_nodes.c   |    0
 .../fdvm/trunk/Sage/lib/oldsrc/makefile.uni   |    0
 .../fdvm/trunk/Sage/lib/oldsrc/makefile.win   |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c  |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c    |    0
 .../fdvm/trunk/Sage/lib/oldsrc/readnodes.c    |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c     |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c |    0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c |    0
 .../fdvm/trunk/Sage/lib/oldsrc/writenodes.c   |    0
 .../dvm/fdvm/trunk/Sage/makefile.uni          |    0
 .../dvm/fdvm/trunk/Sage/makefile.win          |    0
 .../CodeTransformer/CodeTransformer.vcxproj   |    0
 .../CodeTransformer.vcxproj.filters           |    0
 .../FDVM/FDVM.sln                             |    0
 .../FDVM/FDVM/FDVM.vcxproj                    |    0
 .../FDVM/FDVM/FDVM.vcxproj.filters            |    0
 .../FDVM/NEWsrc/NEWsrc.vcxproj                |    0
 .../FDVM/NEWsrc/NEWsrc.vcxproj.filters        |    0
 .../FDVM/OLDsrc/OLDsrc.vcxproj                |    0
 .../FDVM/OLDsrc/OLDsrc.vcxproj.filters        |    0
 .../FDVM/Parser/Parser.vcxproj                |    0
 .../FDVM/Parser/Parser.vcxproj.filters        |    0
 .../FDVM/SageLib++/SageLib++.vcxproj          |    0
 .../FDVM/SageLib++/SageLib++.vcxproj.filters  |    0
 .../FDVM/inlineExp/inlineExp.vcxproj          |    0
 .../FDVM/inlineExp/inlineExp.vcxproj.filters  |    0
 .../dvm/fdvm/trunk/acrossDebugging/across.cpp |    0
 .../dvm/fdvm/trunk/examples/gausf.fdv         |    0
 .../dvm/fdvm/trunk/examples/gausgb.fdv        |    0
 .../dvm/fdvm/trunk/examples/gaush.hpf         |    0
 .../dvm/fdvm/trunk/examples/gauswh.fdv        |    0
 .../dvm/fdvm/trunk/examples/jac.fdv           |    0
 .../dvm/fdvm/trunk/examples/jacas.fdv         |    0
 .../dvm/fdvm/trunk/examples/jach.hpf          |    0
 .../dvm/fdvm/trunk/examples/redbf.fdv         |    0
 .../dvm/fdvm/trunk/examples/redbh.hpf         |    0
 .../dvm/fdvm/trunk/examples/sor.fdv           |    0
 .../dvm/fdvm/trunk/examples/task2j.fdv        |    0
 .../dvm/fdvm/trunk/examples/tasks.fdv         |    0
 .../dvm/fdvm/trunk/examples/taskst.fdv        |    0
 .../dvm/fdvm/trunk/fdvm/CMakeLists.txt        |    0
 .../dvm/fdvm/trunk/fdvm/Makefile              |    0
 .../dvm/fdvm/trunk/fdvm/acc.cpp               |    0
 .../dvm/fdvm/trunk/fdvm/acc_across.cpp        |    0
 .../fdvm/trunk/fdvm/acc_across_analyzer.cpp   |    0
 .../dvm/fdvm/trunk/fdvm/acc_analyzer.cpp      | 8650 ++++++++---------
 .../dvm/fdvm/trunk/fdvm/acc_data.cpp          |    0
 .../dvm/fdvm/trunk/fdvm/acc_f2c.cpp           |    0
 .../dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp  |    0
 .../fdvm/trunk/fdvm/acc_index_analyzer.cpp    |    0
 .../dvm/fdvm/trunk/fdvm/acc_rtc.cpp           |    0
 .../dvm/fdvm/trunk/fdvm/acc_unused_code.cpp   |    0
 .../dvm/fdvm/trunk/fdvm/acc_utilities.cpp     |    0
 .../dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp  |    0
 .../dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp |    0
 .../dvm/fdvm/trunk/fdvm/aks_structs.cpp       |    0
 .../dvm/fdvm/trunk/fdvm/calls.cpp             |    0
 .../dvm/fdvm/trunk/fdvm/checkpoint.cpp        |    0
 .../dvm/fdvm/trunk/fdvm/debug.cpp             |    0
 .../dvm/fdvm/trunk/fdvm/dvm.cpp               |    0
 .../dvm/fdvm/trunk/fdvm/funcall.cpp           |    0
 .../dvm/fdvm/trunk/fdvm/help.cpp              |    0
 .../dvm/fdvm/trunk/fdvm/hpf.cpp               |    0
 .../dvm/fdvm/trunk/fdvm/io.cpp                |    0
 .../dvm/fdvm/trunk/fdvm/makefile.uni          |    0
 .../dvm/fdvm/trunk/fdvm/makefile.win          |    0
 .../dvm/fdvm/trunk/fdvm/omp.cpp               |    0
 .../dvm/fdvm/trunk/fdvm/ompdebug.cpp          |    0
 .../dvm/fdvm/trunk/fdvm/parloop.cpp           |    0
 .../dvm/fdvm/trunk/fdvm/stmt.cpp              |    0
 .../fdvm/trunk/include/acc_across_analyzer.h  |    0
 .../dvm/fdvm/trunk/include/acc_analyzer.h     |    0
 .../dvm/fdvm/trunk/include/acc_data.h         |    0
 .../fdvm/trunk/include/aks_loopStructure.h    |    0
 .../dvm/fdvm/trunk/include/aks_structs.h      |    0
 .../dvm/fdvm/trunk/include/calls.h            |    0
 .../dvm/fdvm/trunk/include/dvm.h              |    0
 .../dvm/fdvm/trunk/include/dvm_tag.h          |    0
 .../dvm/fdvm/trunk/include/extern.h           |    0
 .../dvm/fdvm/trunk/include/fdvm.h             |    0
 .../dvm/fdvm/trunk/include/fdvm_version.h     |    0
 .../dvm/fdvm/trunk/include/inc.h              |    0
 .../dvm/fdvm/trunk/include/leak_detector.h    |    0
 .../dvm/fdvm/trunk/include/libSageOMP.h       |    0
 .../dvm/fdvm/trunk/include/libdvm.h           |    0
 .../dvm/fdvm/trunk/include/libnum.h           |    0
 .../dvm/fdvm/trunk/include/unparse.hpf        |    0
 .../dvm/fdvm/trunk/include/unparse1.hpf       |    0
 .../dvm/fdvm/trunk/include/user.h             |    0
 .../dvm/fdvm/trunk/makefile.uni               |    0
 .../dvm/fdvm/trunk/makefile.win               |    0
 .../dvm/fdvm/trunk/parser/CMakeLists.txt      |    0
 .../dvm/fdvm/trunk/parser/Makefile            |    0
 .../dvm/fdvm/trunk/parser/cftn.c              |    0
 .../dvm/fdvm/trunk/parser/errors.c            |    0
 .../dvm/fdvm/trunk/parser/facc.gram           |    0
 .../dvm/fdvm/trunk/parser/fdvm.gram           |    0
 .../dvm/fdvm/trunk/parser/fomp.gram           |    0
 .../dvm/fdvm/trunk/parser/fspf.gram           |    0
 .../dvm/fdvm/trunk/parser/ftn.gram            |    0
 .../dvm/fdvm/trunk/parser/gram1.tab.c         |    0
 .../dvm/fdvm/trunk/parser/gram1.tab.h         |    0
 .../dvm/fdvm/trunk/parser/gram1.y             |    0
 .../dvm/fdvm/trunk/parser/hash.c              |    0
 .../dvm/fdvm/trunk/parser/head                |    0
 .../dvm/fdvm/trunk/parser/init.c              |    0
 .../dvm/fdvm/trunk/parser/lexfdvm.c           |    0
 .../dvm/fdvm/trunk/parser/lists.c             |    0
 .../dvm/fdvm/trunk/parser/low_hpf.c           |    0
 .../dvm/fdvm/trunk/parser/makefile.uni        |    0
 .../dvm/fdvm/trunk/parser/makefile.win        |    0
 .../dvm/fdvm/trunk/parser/misc.c              |    0
 .../dvm/fdvm/trunk/parser/stat.c              |    0
 .../dvm/fdvm/trunk/parser/sym.c               |    0
 .../dvm/fdvm/trunk/parser/tag                 |    0
 .../dvm/fdvm/trunk/parser/tag.h               |    0
 .../dvm/fdvm/trunk/parser/tokdefs.h           |    0
 .../dvm/fdvm/trunk/parser/tokens              |    0
 .../dvm/fdvm/trunk/parser/types.c             |    0
 .../dvm/fdvm/trunk/parser/unparse_hpf.c       |    0
 .../dvm/fdvm/trunk/sageExample/SwapFors.cpp   |    0
 .../dvm/fdvm/trunk/sageExample/makefile.uni   |    0
 .../dvm/fdvm/trunk/sageExample/makefile.win   |    0
 .../dvm/tools/Zlib/CMakeLists.txt             |    0
 .../dvm/tools/Zlib/include/deflate.h          |    0
 .../dvm/tools/Zlib/include/infblock.h         |    0
 .../dvm/tools/Zlib/include/infcodes.h         |    0
 .../dvm/tools/Zlib/include/inffast.h          |    0
 .../dvm/tools/Zlib/include/inffixed.h         |    0
 .../dvm/tools/Zlib/include/inftrees.h         |    0
 .../dvm/tools/Zlib/include/infutil.h          |    0
 .../dvm/tools/Zlib/include/trees.h            |    0
 .../dvm/tools/Zlib/include/zconf.h            |    0
 .../dvm/tools/Zlib/include/zlib.h             |    0
 .../dvm/tools/Zlib/include/zutil.h            |    0
 .../dvm/tools/Zlib/makefile.uni               |    0
 .../dvm/tools/Zlib/makefile.win               |    0
 .../dvm/tools/Zlib/src/CMakeLists.txt         |    0
 .../dvm/tools/Zlib/src/adler32.c              |    0
 .../dvm/tools/Zlib/src/compress.c             |    0
 .../dvm/tools/Zlib/src/crc32.c                |    0
 .../dvm/tools/Zlib/src/deflate.c              |    0
 .../dvm/tools/Zlib/src/example.c              |    0
 .../dvm/tools/Zlib/src/gzio.c                 |    0
 .../dvm/tools/Zlib/src/infblock.c             |    0
 .../dvm/tools/Zlib/src/infcodes.c             |    0
 .../dvm/tools/Zlib/src/inffast.c              |    0
 .../dvm/tools/Zlib/src/inflate.c              |    0
 .../dvm/tools/Zlib/src/inftrees.c             |    0
 .../dvm/tools/Zlib/src/infutil.c              |    0
 .../dvm/tools/Zlib/src/maketree.c             |    0
 .../dvm/tools/Zlib/src/minigzip.c             |    0
 .../dvm/tools/Zlib/src/trees.c                |    0
 .../dvm/tools/Zlib/src/uncompr.c              |    0
 .../dvm/tools/Zlib/src/zutil.c                |    0
 .../tools/pppa/branches/dvm4.07/makefile.uni  |    0
 .../tools/pppa/branches/dvm4.07/makefile.win  |    0
 .../tools/pppa/branches/dvm4.07/src/bool.h    |    0
 .../tools/pppa/branches/dvm4.07/src/dvmvers.h |    0
 .../tools/pppa/branches/dvm4.07/src/inter.cpp |    0
 .../tools/pppa/branches/dvm4.07/src/inter.h   |    0
 .../pppa/branches/dvm4.07/src/makefile.uni    |    0
 .../pppa/branches/dvm4.07/src/makefile.win    |    0
 .../pppa/branches/dvm4.07/src/potensyn.cpp    |    0
 .../pppa/branches/dvm4.07/src/potensyn.h      |    0
 .../pppa/branches/dvm4.07/src/statfile.cpp    |    0
 .../tools/pppa/branches/dvm4.07/src/statist.h |    0
 .../pppa/branches/dvm4.07/src/statprintf.cpp  |    0
 .../pppa/branches/dvm4.07/src/statprintf.h    |    0
 .../pppa/branches/dvm4.07/src/statread.cpp    |    0
 .../pppa/branches/dvm4.07/src/statread.h      |    0
 .../tools/pppa/branches/dvm4.07/src/strall.h  |    0
 .../tools/pppa/branches/dvm4.07/src/sysstat.h |    0
 .../pppa/branches/dvm4.07/src/treeinter.cpp   |    0
 .../pppa/branches/dvm4.07/src/treeinter.h     |    0
 .../dvm/tools/pppa/branches/dvm4.07/src/ver.h |    0
 .../pppa/stuff/Zlib_1.1.3/Include/deflate.h   |    0
 .../pppa/stuff/Zlib_1.1.3/Include/infblock.h  |    0
 .../pppa/stuff/Zlib_1.1.3/Include/infcodes.h  |    0
 .../pppa/stuff/Zlib_1.1.3/Include/inffast.h   |    0
 .../pppa/stuff/Zlib_1.1.3/Include/inffixed.h  |    0
 .../pppa/stuff/Zlib_1.1.3/Include/inftrees.h  |    0
 .../pppa/stuff/Zlib_1.1.3/Include/infutil.h   |    0
 .../pppa/stuff/Zlib_1.1.3/Include/trees.h     |    0
 .../pppa/stuff/Zlib_1.1.3/Include/zconf.h     |    0
 .../pppa/stuff/Zlib_1.1.3/Include/zlib.h      |    0
 .../pppa/stuff/Zlib_1.1.3/Include/zutil.h     |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/Makefile  |    0
 .../pppa/stuff/Zlib_1.1.3/Src/Makefile.1      |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c |    0
 .../pppa/stuff/Zlib_1.1.3/Src/compress.c      |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c   |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/example.c |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c    |    0
 .../pppa/stuff/Zlib_1.1.3/Src/infblock.c      |    0
 .../pppa/stuff/Zlib_1.1.3/Src/infcodes.c      |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c |    0
 .../pppa/stuff/Zlib_1.1.3/Src/inftrees.c      |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c |    0
 .../pppa/stuff/Zlib_1.1.3/Src/makefile.uni    |    0
 .../pppa/stuff/Zlib_1.1.3/Src/maketree.c      |    0
 .../pppa/stuff/Zlib_1.1.3/Src/minigzip.c      |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/trees.c   |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c |    0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c   |    0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak  |    0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/readme    |    0
 .../dvm/tools/pppa/trunk/CMakeLists.txt       |    0
 .../dvm/tools/pppa/trunk/makefile.uni         |    0
 .../dvm/tools/pppa/trunk/makefile.win         |    0
 .../dvm/tools/pppa/trunk/src/CMakeLists.txt   |    0
 .../tools/pppa/trunk/src/LibraryImport.cpp    |    0
 .../dvm/tools/pppa/trunk/src/LibraryImport.h  |    0
 .../dvm/tools/pppa/trunk/src/PPPA/PPPA.sln    |    0
 .../pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj     |    0
 .../trunk/src/PPPA/PPPA/PPPA.vcxproj.filters  |    0
 .../dvm/tools/pppa/trunk/src/bool.h           |    0
 .../dvm/tools/pppa/trunk/src/dvmh_stat.h      |    0
 .../dvm/tools/pppa/trunk/src/dvmvers.h.in     |    0
 .../dvm/tools/pppa/trunk/src/inter.cpp        |    0
 .../dvm/tools/pppa/trunk/src/inter.h          |    0
 .../dvm/tools/pppa/trunk/src/json.hpp         |    0
 .../dvm/tools/pppa/trunk/src/makefile.uni     |    0
 .../dvm/tools/pppa/trunk/src/makefile.win     |    0
 .../dvm/tools/pppa/trunk/src/makefileJnilib   |    0
 .../dvm/tools/pppa/trunk/src/potensyn.cpp     |    0
 .../dvm/tools/pppa/trunk/src/potensyn.h       |    0
 .../dvm/tools/pppa/trunk/src/stat.cpp         |    0
 .../dvm/tools/pppa/trunk/src/statfile.cpp     |    0
 .../dvm/tools/pppa/trunk/src/statinter.cpp    |    0
 .../dvm/tools/pppa/trunk/src/statinter.h      |    0
 .../dvm/tools/pppa/trunk/src/statist.h        |    0
 .../dvm/tools/pppa/trunk/src/statlist.cpp     |    0
 .../dvm/tools/pppa/trunk/src/statlist.h       |    0
 .../dvm/tools/pppa/trunk/src/statprintf.cpp   |    0
 .../dvm/tools/pppa/trunk/src/statprintf.h     |    0
 .../dvm/tools/pppa/trunk/src/statread.cpp     |    0
 .../dvm/tools/pppa/trunk/src/statread.h       |    0
 .../dvm/tools/pppa/trunk/src/strall.h         |    0
 .../dvm/tools/pppa/trunk/src/sysstat.h        |    0
 .../dvm/tools/pppa/trunk/src/treeinter.cpp    |    0
 .../dvm/tools/pppa/trunk/src/treeinter.h      |    0
 .../dvm/tools/pppa/trunk/src/ver.h            |    0
 .../{_projects => projects}/paths.default.txt |    0
 Sapfor/{_src => src}/CFGraph/CFGraph.cpp      |    0
 Sapfor/{_src => src}/CFGraph/CFGraph.h        |    0
 .../CFGraph/DataFlow/backward_data_flow.h     |    0
 .../DataFlow/backward_data_flow_impl.h        |    0
 .../CFGraph/DataFlow/data_flow.h              |    0
 .../CFGraph/DataFlow/data_flow_impl.h         |    0
 Sapfor/{_src => src}/CFGraph/IR.cpp           |    0
 Sapfor/{_src => src}/CFGraph/IR.h             |    0
 Sapfor/{_src => src}/CFGraph/RD_subst.cpp     |    0
 Sapfor/{_src => src}/CFGraph/RD_subst.h       |    0
 .../CFGraph/live_variable_analysis.cpp        |    0
 .../CFGraph/live_variable_analysis.h          |    0
 .../CFGraph/private_variables_analysis.cpp    |    0
 .../CFGraph/private_variables_analysis.h      |    0
 .../CreateInterTree/CreateInterTree.cpp       |    0
 .../CreateInterTree/CreateInterTree.h         |    0
 .../directive_analyzer.cpp                    |    0
 .../DirectiveProcessing/directive_analyzer.h  |    0
 .../DirectiveProcessing/directive_creator.cpp |    0
 .../DirectiveProcessing/directive_creator.h   |    0
 .../directive_creator_base.cpp                |    0
 .../directive_omp_parser.cpp                  |    0
 .../directive_omp_parser.h                    |    0
 .../DirectiveProcessing/directive_parser.cpp  |    0
 .../DirectiveProcessing/directive_parser.h    |    0
 .../DirectiveProcessing/insert_directive.cpp  |    0
 .../DirectiveProcessing/insert_directive.h    |    0
 .../DirectiveProcessing/remote_access.cpp     |    0
 .../DirectiveProcessing/remote_access.h       |    0
 .../remote_access_base.cpp                    |    0
 .../DirectiveProcessing/shadow.cpp            |    0
 .../DirectiveProcessing/shadow.h              |    0
 .../spf_directive_preproc.cpp                 |    0
 Sapfor/{_src => src}/Distribution/Array.cpp   |    0
 Sapfor/{_src => src}/Distribution/Array.h     |    0
 .../Distribution/ArrayAnalysis.cpp            |    0
 Sapfor/{_src => src}/Distribution/Arrays.h    |    0
 .../Distribution/CreateDistributionDirs.cpp   |    0
 .../Distribution/CreateDistributionDirs.h     |    0
 Sapfor/{_src => src}/Distribution/Cycle.cpp   |    0
 Sapfor/{_src => src}/Distribution/Cycle.h     |    0
 .../Distribution/Distribution.cpp             |    0
 .../{_src => src}/Distribution/Distribution.h |    0
 .../Distribution/DvmhDirective.cpp            |    0
 .../Distribution/DvmhDirective.h              |    0
 .../Distribution/DvmhDirectiveBase.cpp        |    0
 .../Distribution/DvmhDirectiveBase.h          |    0
 .../Distribution/DvmhDirective_func.h         |    0
 .../{_src => src}/Distribution/GraphCSR.cpp   |    0
 Sapfor/{_src => src}/Distribution/GraphCSR.h  |    0
 .../{_src => src}/DvmhRegions/DvmhRegion.cpp  |    0
 Sapfor/{_src => src}/DvmhRegions/DvmhRegion.h |    0
 .../DvmhRegions/DvmhRegionInserter.cpp        |    0
 .../DvmhRegions/DvmhRegionInserter.h          |    0
 .../{_src => src}/DvmhRegions/LoopChecker.cpp |    0
 .../{_src => src}/DvmhRegions/LoopChecker.h   |    0
 .../DvmhRegions/ReadWriteAnalyzer.cpp         |    0
 .../DvmhRegions/ReadWriteAnalyzer.h           |    0
 .../DvmhRegions/RegionsMerger.cpp             |    0
 .../{_src => src}/DvmhRegions/RegionsMerger.h |    0
 .../{_src => src}/DvmhRegions/TypedSymbol.cpp |    0
 .../{_src => src}/DvmhRegions/TypedSymbol.h   |    0
 .../{_src => src}/DvmhRegions/VarUsages.cpp   |    0
 Sapfor/{_src => src}/DvmhRegions/VarUsages.h  |    0
 .../DynamicAnalysis/createParallelRegions.cpp |    0
 .../DynamicAnalysis/createParallelRegions.h   |    0
 .../DynamicAnalysis/gCov_parser.cpp           |    0
 .../DynamicAnalysis/gCov_parser_func.h        |    0
 .../DynamicAnalysis/gcov_info.cpp             |    0
 .../{_src => src}/DynamicAnalysis/gcov_info.h |    0
 .../control_flow_graph_part.cpp               |    0
 .../ExpressionTransform/expr_transform.cpp    |    0
 .../ExpressionTransform/expr_transform.h      |    0
 .../{_src => src}/GraphCall/graph_calls.cpp   |    0
 Sapfor/{_src => src}/GraphCall/graph_calls.h  |    0
 .../GraphCall/graph_calls_base.cpp            |    0
 .../GraphCall/graph_calls_func.h              |    0
 .../{_src => src}/GraphLoop/graph_loops.cpp   |    0
 Sapfor/{_src => src}/GraphLoop/graph_loops.h  |    0
 .../GraphLoop/graph_loops_base.cpp            |    0
 .../GraphLoop/graph_loops_func.h              |    0
 Sapfor/{_src => src}/Inliner/inliner.cpp      |    0
 Sapfor/{_src => src}/Inliner/inliner.h        |    0
 .../LoopAnalyzer/allocations_prepoc.cpp       |    0
 .../LoopAnalyzer/dep_analyzer.cpp             |    0
 .../LoopAnalyzer/loop_analyzer.cpp            |    0
 .../LoopAnalyzer/loop_analyzer.h              |    0
 .../ParallelizationRegions/ParRegions.cpp     |    0
 .../ParallelizationRegions/ParRegions.h       |    0
 .../ParallelizationRegions/ParRegions_func.h  |    0
 .../expand_extract_reg.cpp                    |    0
 .../expand_extract_reg.h                      |    0
 .../resolve_par_reg_conflicts.cpp             |    0
 .../resolve_par_reg_conflicts.h               |    0
 Sapfor/{_src => src}/Predictor/Lib/AMView.cpp |    0
 Sapfor/{_src => src}/Predictor/Lib/AMView.h   |    0
 .../{_src => src}/Predictor/Lib/AlignAxis.cpp |    0
 .../{_src => src}/Predictor/Lib/AlignAxis.h   |    0
 Sapfor/{_src => src}/Predictor/Lib/BGroup.cpp |    0
 Sapfor/{_src => src}/Predictor/Lib/BGroup.h   |    0
 Sapfor/{_src => src}/Predictor/Lib/Block.cpp  |    0
 Sapfor/{_src => src}/Predictor/Lib/Block.h    |    0
 .../Predictor/Lib/CallInfoStructs.h           |    0
 .../Predictor/Lib/CallParams.cpp              |    0
 .../{_src => src}/Predictor/Lib/CommCost.cpp  |    0
 Sapfor/{_src => src}/Predictor/Lib/CommCost.h |    0
 Sapfor/{_src => src}/Predictor/Lib/DArray.cpp |    0
 Sapfor/{_src => src}/Predictor/Lib/DArray.h   |    0
 .../{_src => src}/Predictor/Lib/DimBound.cpp  |    0
 Sapfor/{_src => src}/Predictor/Lib/DimBound.h |    0
 .../{_src => src}/Predictor/Lib/DistAxis.cpp  |    0
 Sapfor/{_src => src}/Predictor/Lib/DistAxis.h |    0
 Sapfor/{_src => src}/Predictor/Lib/Event.cpp  |    0
 Sapfor/{_src => src}/Predictor/Lib/Event.h    |    0
 .../{_src => src}/Predictor/Lib/FuncCall.cpp  |    0
 Sapfor/{_src => src}/Predictor/Lib/FuncCall.h |    0
 .../{_src => src}/Predictor/Lib/Interval.cpp  |    0
 Sapfor/{_src => src}/Predictor/Lib/Interval.h |    0
 .../Predictor/Lib/IntervalTemplate.cpp        |    0
 .../{_src => src}/Predictor/Lib/LoopBlock.cpp |    0
 .../{_src => src}/Predictor/Lib/LoopBlock.h   |    0
 Sapfor/{_src => src}/Predictor/Lib/LoopLS.cpp |    0
 Sapfor/{_src => src}/Predictor/Lib/LoopLS.h   |    0
 Sapfor/{_src => src}/Predictor/Lib/Ls.cpp     |    0
 Sapfor/{_src => src}/Predictor/Lib/Ls.h       |    0
 .../Predictor/Lib/ModelDArray.cpp             |    0
 .../{_src => src}/Predictor/Lib/ModelIO.cpp   |    0
 .../Predictor/Lib/ModelInterval.cpp           |    0
 .../Predictor/Lib/ModelMPS_AM.cpp             |    0
 .../Predictor/Lib/ModelParLoop.cpp            |    0
 .../Predictor/Lib/ModelReduct.cpp             |    0
 .../Predictor/Lib/ModelRegular.cpp            |    0
 .../Predictor/Lib/ModelRemAccess.cpp          |    0
 .../Predictor/Lib/ModelShadow.cpp             |    0
 .../Predictor/Lib/ModelStructs.h              |    0
 .../{_src => src}/Predictor/Lib/ParLoop.cpp   |    0
 Sapfor/{_src => src}/Predictor/Lib/ParLoop.h  |    0
 .../Predictor/Lib/ParseString.cpp             |    0
 .../{_src => src}/Predictor/Lib/ParseString.h |    0
 .../{_src => src}/Predictor/Lib/Processor.cpp |    0
 .../{_src => src}/Predictor/Lib/Processor.h   |    0
 Sapfor/{_src => src}/Predictor/Lib/Ps.cpp     |    0
 Sapfor/{_src => src}/Predictor/Lib/Ps.h       |    0
 .../{_src => src}/Predictor/Lib/RedGroup.cpp  |    0
 Sapfor/{_src => src}/Predictor/Lib/RedGroup.h |    0
 Sapfor/{_src => src}/Predictor/Lib/RedVar.cpp |    0
 Sapfor/{_src => src}/Predictor/Lib/RedVar.h   |    0
 .../Predictor/Lib/RemAccessBuf.cpp            |    0
 .../Predictor/Lib/RemAccessBuf.h              |    0
 Sapfor/{_src => src}/Predictor/Lib/Space.cpp  |    0
 Sapfor/{_src => src}/Predictor/Lib/Space.h    |    0
 Sapfor/{_src => src}/Predictor/Lib/StdAfx.h   |    0
 .../{_src => src}/Predictor/Lib/TraceLine.cpp |    0
 .../{_src => src}/Predictor/Lib/TraceLine.h   |    0
 Sapfor/{_src => src}/Predictor/Lib/Ver.h      |    0
 Sapfor/{_src => src}/Predictor/Lib/Vm.cpp     |    0
 Sapfor/{_src => src}/Predictor/Lib/Vm.h       |    0
 Sapfor/{_src => src}/Predictor/Lib/adler32.c  |    0
 Sapfor/{_src => src}/Predictor/Lib/compress.c |    0
 Sapfor/{_src => src}/Predictor/Lib/crc32.c    |    0
 Sapfor/{_src => src}/Predictor/Lib/deflate.c  |    0
 Sapfor/{_src => src}/Predictor/Lib/deflate.h  |    0
 Sapfor/{_src => src}/Predictor/Lib/gzio.c     |    0
 Sapfor/{_src => src}/Predictor/Lib/infblock.c |    0
 Sapfor/{_src => src}/Predictor/Lib/infblock.h |    0
 Sapfor/{_src => src}/Predictor/Lib/infcodes.c |    0
 Sapfor/{_src => src}/Predictor/Lib/infcodes.h |    0
 Sapfor/{_src => src}/Predictor/Lib/inffast.c  |    0
 Sapfor/{_src => src}/Predictor/Lib/inffast.h  |    0
 Sapfor/{_src => src}/Predictor/Lib/inffixed.h |    0
 Sapfor/{_src => src}/Predictor/Lib/inflate.c  |    0
 Sapfor/{_src => src}/Predictor/Lib/inftrees.c |    0
 Sapfor/{_src => src}/Predictor/Lib/inftrees.h |    0
 Sapfor/{_src => src}/Predictor/Lib/infutil.c  |    0
 Sapfor/{_src => src}/Predictor/Lib/infutil.h  |    0
 .../Predictor/Lib/intersection.cpp            |    0
 .../{_src => src}/Predictor/Lib/predictor.cpp |    0
 Sapfor/{_src => src}/Predictor/Lib/trees.c    |    0
 Sapfor/{_src => src}/Predictor/Lib/trees.h    |    0
 Sapfor/{_src => src}/Predictor/Lib/uncompr.c  |    0
 Sapfor/{_src => src}/Predictor/Lib/zconf.h    |    0
 Sapfor/{_src => src}/Predictor/Lib/zlib.h     |    0
 Sapfor/{_src => src}/Predictor/Lib/zutil.c    |    0
 Sapfor/{_src => src}/Predictor/Lib/zutil.h    |    0
 .../{_src => src}/Predictor/PredictScheme.cpp |    0
 .../{_src => src}/Predictor/PredictScheme.h   |    0
 .../Predictor/PredictorInterface.h            |    0
 .../Predictor/PredictorModel.cpp              |    0
 .../{_src => src}/Predictor/PredictorModel.h  |    0
 .../PrivateAnalyzer/private_analyzer.cpp      |    0
 .../PrivateAnalyzer/private_analyzer.h        |    0
 .../ProjectManipulation/ConvertFiles.cpp      |    0
 .../ProjectManipulation/ConvertFiles.h        |    0
 .../ProjectManipulation/FileInfo.cpp          |    0
 .../ProjectManipulation/FileInfo.h            |    0
 .../ProjectManipulation/ParseFiles.cpp        |    0
 .../ProjectManipulation/ParseFiles.h          |    0
 .../ProjectManipulation/PerfAnalyzer.cpp      |    0
 .../ProjectManipulation/PerfAnalyzer.h        |    0
 .../ProjectManipulation/StdCapture.h          |    0
 .../ProjectParameters/projectParameters.cpp   |    0
 .../ProjectParameters/projectParameters.h     |    0
 .../RenameSymbols/rename_symbols.cpp          |    0
 .../RenameSymbols/rename_symbols.h            |    0
 .../{_src => src}/SageAnalysisTool/Makefile   |    0
 .../SageAnalysisTool/OmegaForSage/Makefile    |    0
 .../SageAnalysisTool/OmegaForSage/README      |    0
 .../OmegaForSage/add-assert.cpp               |    0
 .../SageAnalysisTool/OmegaForSage/affine.cpp  |    0
 .../SageAnalysisTool/OmegaForSage/cover.cpp   |    0
 .../OmegaForSage/ddomega-build.cpp            |    0
 .../OmegaForSage/ddomega-use.cpp              |    0
 .../SageAnalysisTool/OmegaForSage/ddomega.cpp |    0
 .../SageAnalysisTool/OmegaForSage/debug.cpp   |    0
 .../OmegaForSage/include/Exit.h               |    0
 .../OmegaForSage/include/add-assert.h         |    0
 .../OmegaForSage/include/affine.h             |    0
 .../OmegaForSage/include/cover.h              |    0
 .../OmegaForSage/include/dddir.h              |    0
 .../OmegaForSage/include/ddomega-build.h      |    0
 .../OmegaForSage/include/ddomega-use.h        |    0
 .../OmegaForSage/include/ddomega.h            |    0
 .../OmegaForSage/include/debug.h              |    0
 .../OmegaForSage/include/flags.h              |    0
 .../OmegaForSage/include/ip.h                 |    0
 .../OmegaForSage/include/kill.h               |    0
 .../OmegaForSage/include/lang-interf.generic  |    0
 .../OmegaForSage/include/lang-interf.h        |    0
 .../OmegaForSage/include/missing.h            |    0
 .../OmegaForSage/include/omega2flags.h        |    0
 .../OmegaForSage/include/portable.h           |    0
 .../OmegaForSage/include/portable.h.origine   |    0
 .../OmegaForSage/include/range.h              |    0
 .../OmegaForSage/include/refine.h             |    0
 .../OmegaForSage/include/screen.h             |    0
 .../OmegaForSage/include/timeTrials.h         |    0
 .../SageAnalysisTool/OmegaForSage/ip.cpp      |    0
 .../SageAnalysisTool/OmegaForSage/kill.cpp    |    0
 .../SageAnalysisTool/OmegaForSage/refine.cpp  |    0
 .../OmegaForSage/sagedriver.cpp               |    0
 Sapfor/{_src => src}/SageAnalysisTool/README  |    0
 .../SageAnalysisTool/annotationDriver.cpp     |    0
 .../SageAnalysisTool/annotationDriver.h       |    0
 .../SageAnalysisTool/arrayRef.cpp             |    0
 .../{_src => src}/SageAnalysisTool/arrayRef.h |    0
 .../SageAnalysisTool/computeInducVar.cpp      |    0
 .../SageAnalysisTool/constanteProp.cpp        |    0
 .../SageAnalysisTool/constanteSet.h           |    0
 .../SageAnalysisTool/controlFlow.cpp          |    0
 .../{_src => src}/SageAnalysisTool/defUse.cpp |    0
 .../SageAnalysisTool/definesValues.h          |    0
 .../SageAnalysisTool/definitionSet.h          |    0
 .../SageAnalysisTool/depGraph.cpp             |    0
 .../{_src => src}/SageAnalysisTool/depGraph.h |    0
 .../SageAnalysisTool/depInterface.cpp         |    0
 .../SageAnalysisTool/depInterface.h           |    0
 .../SageAnalysisTool/depInterfaceExt.h        |    0
 .../SageAnalysisTool/dependence.cpp           |    0
 .../SageAnalysisTool/dependence.h             |    0
 .../SageAnalysisTool/flowAnalysis.cpp         |    0
 .../{_src => src}/SageAnalysisTool/inducVar.h |    0
 .../SageAnalysisTool/intrinsic.cpp            |    0
 .../SageAnalysisTool/intrinsic.h              |    0
 .../SageAnalysisTool/invariant.cpp            |    0
 .../SageAnalysisTool/loopTransform.cpp        |    0
 .../SageAnalysisTool/reductionCode.h          |    0
 Sapfor/{_src => src}/SageAnalysisTool/set.cpp |    0
 Sapfor/{_src => src}/SageAnalysisTool/set.h   |    0
 Sapfor/{_src => src}/Sapfor.cpp               |    0
 Sapfor/{_src => src}/Sapfor.h                 |    0
 Sapfor/{_src => src}/SapforData.h             |    0
 Sapfor/{_src => src}/Server/checkUniq.cpp     |    0
 Sapfor/{_src => src}/Server/server.cpp        |    0
 Sapfor/{_src => src}/Server/spf_icon.ico      |  Bin
 .../Transformations/array_assign_to_loop.cpp  |    0
 .../Transformations/array_assign_to_loop.h    |    0
 .../Transformations/checkpoints.cpp           |    0
 .../Transformations/checkpoints.h             |    0
 .../Transformations/convert_to_c.cpp          |    0
 .../Transformations/convert_to_c.h            |    0
 .../Transformations/dead_code.cpp             |    0
 .../{_src => src}/Transformations/dead_code.h |    0
 .../Transformations/enddo_loop_converter.cpp  |    0
 .../Transformations/enddo_loop_converter.h    |    0
 .../Transformations/fix_common_blocks.cpp     |    0
 .../Transformations/fix_common_blocks.h       |    0
 .../Transformations/function_purifying.cpp    |    0
 .../Transformations/function_purifying.h      |    0
 .../Transformations/loop_transform.cpp        |    0
 .../Transformations/loop_transform.h          |    0
 .../Transformations/loops_combiner.cpp        |    0
 .../Transformations/loops_combiner.h          |    0
 .../Transformations/loops_splitter.cpp        |    0
 .../Transformations/loops_splitter.h          |    0
 .../Transformations/loops_unrolling.cpp       |    0
 .../Transformations/loops_unrolling.h         |    0
 .../private_arrays_resizing.cpp               |    0
 .../Transformations/private_arrays_resizing.h |    0
 .../Transformations/private_removing.cpp      |    0
 .../Transformations/private_removing.h        |    0
 .../replace_dist_arrays_in_io.cpp             |    0
 .../replace_dist_arrays_in_io.h               |    0
 .../Transformations/set_implicit_none.cpp     |    0
 .../Transformations/set_implicit_none.h       |    0
 .../Transformations/swap_array_dims.cpp       |    0
 .../Transformations/swap_array_dims.h         |    0
 .../Transformations/uniq_call_chain_dup.cpp   |    0
 .../Transformations/uniq_call_chain_dup.h     |    0
 Sapfor/{_src => src}/Utils/AstWrapper.h       |    0
 .../{_src => src}/Utils/BoostStackTrace.cpp   |    0
 Sapfor/{_src => src}/Utils/CommonBlock.h      |    0
 Sapfor/{_src => src}/Utils/DefUseList.h       |    0
 Sapfor/{_src => src}/Utils/PassManager.h      |    0
 Sapfor/{_src => src}/Utils/RationalNum.cpp    |    0
 Sapfor/{_src => src}/Utils/RationalNum.h      |    0
 Sapfor/{_src => src}/Utils/SgUtils.cpp        |    0
 Sapfor/{_src => src}/Utils/SgUtils.h          |    0
 Sapfor/{_src => src}/Utils/errors.h           |    0
 Sapfor/{_src => src}/Utils/leak_detector.h    |    0
 Sapfor/{_src => src}/Utils/module_utils.cpp   |    0
 Sapfor/{_src => src}/Utils/module_utils.h     |    0
 .../Utils/russian_errors_text.txt             |    0
 Sapfor/{_src => src}/Utils/types.h            |    0
 Sapfor/{_src => src}/Utils/utils.cpp          |    0
 Sapfor/{_src => src}/Utils/utils.h            |    0
 Sapfor/{_src => src}/Utils/version.h          |    0
 .../VerificationCode/CorrectVarDecl.cpp       |    0
 .../VerificationCode/IncludeChecker.cpp       |    0
 .../VerificationCode/StructureChecker.cpp     |    0
 .../VerificationCode/VerifySageStructures.cpp |    0
 .../VerificationCode/verifications.h          |    0
 .../VisualizerCalls/BuildGraph.cpp            |    0
 .../VisualizerCalls/BuildGraph.h              |    0
 .../VisualizerCalls/SendMessage.cpp           |    0
 .../VisualizerCalls/SendMessage.h             |    0
 .../VisualizerCalls/get_information.cpp       |    0
 .../VisualizerCalls/get_information.h         |    0
 .../VisualizerCalls/graphLayout/algebra.cpp   |    0
 .../VisualizerCalls/graphLayout/algebra.hpp   |    0
 .../graphLayout/fruchterman_reingold.cpp      |    0
 .../graphLayout/fruchterman_reingold.hpp      |    0
 .../graphLayout/kamada_kawai.cpp              |    0
 .../graphLayout/kamada_kawai.hpp              |    0
 .../VisualizerCalls/graphLayout/layout.cpp    |    0
 .../VisualizerCalls/graphLayout/layout.hpp    |    0
 .../VisualizerCalls/graphLayout/nodesoup.cpp  |    0
 .../VisualizerCalls/graphLayout/nodesoup.hpp  |    0
 Sapfor/{_test => tests}/inliner/alex.f        |    0
 Sapfor/{_test => tests}/inliner/array_sum.f   |    0
 .../inliner/inlineFunctionWithAllocatable.f90 |    0
 Sapfor/{_test => tests}/inliner/sub.f         |    0
 Sapfor/{_test => tests}/inliner/test.f        |    0
 .../PRINT_PAR_REGIONS_ERRORS/entry_err1.f     |    0
 .../PRINT_PAR_REGIONS_ERRORS/entry_err2.f     |    0
 .../PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f      |    0
 .../PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f      |    0
 .../PRINT_PAR_REGIONS_ERRORS/goto_err1.f      |    0
 .../PRINT_PAR_REGIONS_ERRORS/goto_ok1.f       |    0
 .../check_args_decl/arg_decl_test_err1.f      |    0
 .../check_args_decl/arg_decl_test_err2.f      |    0
 .../check_args_decl/arg_decl_test_err3.f      |    0
 .../check_args_decl/arg_decl_test_ok1.f       |    0
 .../check_args_decl/arg_decl_test_ok2.f       |    0
 .../check_args_decl/arg_decl_test_ok3.f       |    0
 .../check_args_decl/arg_decl_test_wr1.f       |    0
 .../check_args_decl/arg_decl_test_wr3.f       |    0
 .../sapfor/checkpoint/checkpoint.f90          |    0
 .../sapfor/checkpoint/checkpoint2.f90         |    0
 .../anyArguments_fromLittleToBig.f90          |    0
 .../assign_with_sections.f                    |    0
 .../convert_assign_to_loop/simple_assign.f    |    0
 .../two_dimensional_assign.f                  |    0
 .../convert_expr_to_loop/expr_with_sections.f |    0
 .../sapfor/convert_expr_to_loop/simple_expr.f |    0
 .../two_dimensional_expr.f                    |    0
 .../sapfor/convert_sum_to_loop/simple_sum.f   |    0
 .../convert_sum_to_loop/sum_with_sections.f   |    0
 .../convert_sum_to_loop/two_dimensional_sum.f |    0
 .../convert_where_to_loop/simple_where.f      |    0
 .../two_dimensional_where.f                   |    0
 .../where_with_sections.f                     |    0
 .../create_nested_loops/program.expected.f90  |    0
 .../sapfor/create_nested_loops/program.f90    |    0
 .../sapfor/create_nested_loops/test.bat       |    0
 .../sapfor/create_nested_loops/test.sh        |    0
 .../fission_priv_exp.f90                      |    0
 .../sapfor/loops_combiner/test_1.for          |    0
 .../sapfor/loops_combiner/test_2.for          |    0
 .../sapfor/loops_combiner/test_3.for          |    0
 .../sapfor/loops_combiner/test_4.for          |    0
 .../sapfor/loops_combiner/test_5.for          |    0
 .../merge_regions/array_read_before_write.in  |    0
 .../merge_regions/array_read_before_write.out |    0
 .../sapfor/merge_regions/read_before_read.in  |    0
 .../sapfor/merge_regions/read_before_read.out |    0
 .../merge_regions/read_in_loop_header.in      |    0
 .../merge_regions/read_in_loop_header.out     |    0
 .../merge_regions/var_modified_in_fun.in      |    0
 .../merge_regions/var_modified_in_fun.out     |    0
 .../merge_regions/var_read_before_write.in    |    0
 .../merge_regions/var_read_before_write.out   |    0
 .../sapfor/merge_regions/write_before_read.in |    0
 .../merge_regions/write_before_read.out       |    0
 .../merge_regions/write_before_write.in       |    0
 .../merge_regions/write_before_write.out      |    0
 .../sapfor/parameter/magnit_3d.for            |    0
 .../sapfor/parameter/mycom.for                |    0
 .../sapfor/parameter/parameter.f90            |    0
 .../sapfor/private_removing/test.f            |    0
 .../private_removing/test_cannot_remove.f     |    0
 .../sapfor/private_removing/test_cascade.f    |    0
 Sapfor/{_test => tests}/sapfor/shrink/error.f |    0
 .../{_test => tests}/sapfor/shrink/error2.f   |    0
 .../{_test => tests}/sapfor/shrink/error3.f   |    0
 .../{_test => tests}/sapfor/shrink/shrink.f   |    0
 .../{_test => tests}/sapfor/shrink/shrink2.f  |    0
 .../{_test => tests}/sapfor/shrink/shrink3.f  |    0
 774 files changed, 4558 insertions(+), 4558 deletions(-)
 rename Sapfor/{_projects => projects}/FDVM/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/Parser/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/SageLib/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/SageNewSrc/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/SageOldSrc/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/Sapc++/Sapc++.sln (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/InlineExpansion/hlp.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/InlineExpansion/inline.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/InlineExpansion/inliner.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/InlineExpansion/intrinsic.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/InlineExpansion/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/InlineExpansion/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/LICENSE (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/Sage++/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/Sage++/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/Sage++/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/bif.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/compatible.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/db.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/db.new.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/defines.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/defs.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/dep.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/dep_str.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/dep_struct.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/elist.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/f90.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/fixcray.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/fm.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/head (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/leak_detector.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/list.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/ll.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/prop.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/sage.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/sagearch.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/sageroot.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/sets.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/symb.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/symblob.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/tag (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/tag.doc (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/tag.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/tag_make (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/version.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/vextern.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/vparse.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/vpc.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/h/window.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/attributes.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/bif_node.def (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/dependence.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_high.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_low.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/libSage++.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/macro.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++user.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/symb.def (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/type.def (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/unparse.def (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/Sage/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/acrossDebugging/across.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/gausf.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/gausgb.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/gaush.hpf (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/gauswh.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/jac.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/jacas.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/jach.hpf (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/redbf.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/redbh.hpf (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/sor.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/task2j.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/tasks.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/examples/taskst.fdv (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_across.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp (96%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_data.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_f2c.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_rtc.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/acc_utilities.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/aks_structs.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/calls.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/checkpoint.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/debug.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/dvm.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/funcall.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/help.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/hpf.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/io.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/omp.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/ompdebug.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/parloop.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/fdvm/stmt.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/acc_across_analyzer.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/acc_analyzer.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/acc_data.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/aks_loopStructure.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/aks_structs.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/calls.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/dvm.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/dvm_tag.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/extern.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/fdvm.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/fdvm_version.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/inc.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/leak_detector.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/libSageOMP.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/libdvm.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/libnum.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/unparse.hpf (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/unparse1.hpf (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/include/user.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/cftn.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/errors.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/facc.gram (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/fdvm.gram (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/fomp.gram (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/fspf.gram (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/ftn.gram (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/gram1.tab.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/gram1.tab.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/gram1.y (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/hash.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/head (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/init.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/lexfdvm.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/lists.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/low_hpf.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/misc.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/stat.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/sym.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/tag (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/tag.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/tokdefs.h (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/tokens (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/types.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/parser/unparse_hpf.c (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/sageExample/SwapFors.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/sageExample/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/fdvm/trunk/sageExample/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/deflate.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/infblock.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/infcodes.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/inffast.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/inffixed.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/inftrees.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/infutil.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/trees.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/zconf.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/zlib.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/include/zutil.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/adler32.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/compress.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/crc32.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/deflate.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/example.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/gzio.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/infblock.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/infcodes.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/inffast.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/inflate.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/inftrees.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/infutil.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/maketree.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/minigzip.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/trees.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/uncompr.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/Zlib/src/zutil.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/bool.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/inter.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statist.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statread.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/strall.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/ver.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1 (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/readme (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/CMakeLists.txt (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/LibraryImport.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/LibraryImport.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/bool.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/dvmh_stat.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/dvmvers.h.in (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/inter.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/inter.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/json.hpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/makefile.uni (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/makefile.win (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/makefileJnilib (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/potensyn.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/potensyn.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/stat.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statfile.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statinter.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statinter.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statist.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statlist.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statlist.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statprintf.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statprintf.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statread.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/statread.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/strall.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/sysstat.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/treeinter.cpp (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/treeinter.h (100%)
 rename Sapfor/{_projects => projects}/dvm/tools/pppa/trunk/src/ver.h (100%)
 rename Sapfor/{_projects => projects}/paths.default.txt (100%)
 rename Sapfor/{_src => src}/CFGraph/CFGraph.cpp (100%)
 rename Sapfor/{_src => src}/CFGraph/CFGraph.h (100%)
 rename Sapfor/{_src => src}/CFGraph/DataFlow/backward_data_flow.h (100%)
 rename Sapfor/{_src => src}/CFGraph/DataFlow/backward_data_flow_impl.h (100%)
 rename Sapfor/{_src => src}/CFGraph/DataFlow/data_flow.h (100%)
 rename Sapfor/{_src => src}/CFGraph/DataFlow/data_flow_impl.h (100%)
 rename Sapfor/{_src => src}/CFGraph/IR.cpp (100%)
 rename Sapfor/{_src => src}/CFGraph/IR.h (100%)
 rename Sapfor/{_src => src}/CFGraph/RD_subst.cpp (100%)
 rename Sapfor/{_src => src}/CFGraph/RD_subst.h (100%)
 rename Sapfor/{_src => src}/CFGraph/live_variable_analysis.cpp (100%)
 rename Sapfor/{_src => src}/CFGraph/live_variable_analysis.h (100%)
 rename Sapfor/{_src => src}/CFGraph/private_variables_analysis.cpp (100%)
 rename Sapfor/{_src => src}/CFGraph/private_variables_analysis.h (100%)
 rename Sapfor/{_src => src}/CreateInterTree/CreateInterTree.cpp (100%)
 rename Sapfor/{_src => src}/CreateInterTree/CreateInterTree.h (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/directive_analyzer.cpp (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/directive_analyzer.h (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/directive_creator.cpp (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/directive_creator.h (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/directive_creator_base.cpp (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/directive_omp_parser.cpp (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/directive_omp_parser.h (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/directive_parser.cpp (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/directive_parser.h (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/insert_directive.cpp (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/insert_directive.h (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/remote_access.cpp (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/remote_access.h (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/remote_access_base.cpp (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/shadow.cpp (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/shadow.h (100%)
 rename Sapfor/{_src => src}/DirectiveProcessing/spf_directive_preproc.cpp (100%)
 rename Sapfor/{_src => src}/Distribution/Array.cpp (100%)
 rename Sapfor/{_src => src}/Distribution/Array.h (100%)
 rename Sapfor/{_src => src}/Distribution/ArrayAnalysis.cpp (100%)
 rename Sapfor/{_src => src}/Distribution/Arrays.h (100%)
 rename Sapfor/{_src => src}/Distribution/CreateDistributionDirs.cpp (100%)
 rename Sapfor/{_src => src}/Distribution/CreateDistributionDirs.h (100%)
 rename Sapfor/{_src => src}/Distribution/Cycle.cpp (100%)
 rename Sapfor/{_src => src}/Distribution/Cycle.h (100%)
 rename Sapfor/{_src => src}/Distribution/Distribution.cpp (100%)
 rename Sapfor/{_src => src}/Distribution/Distribution.h (100%)
 rename Sapfor/{_src => src}/Distribution/DvmhDirective.cpp (100%)
 rename Sapfor/{_src => src}/Distribution/DvmhDirective.h (100%)
 rename Sapfor/{_src => src}/Distribution/DvmhDirectiveBase.cpp (100%)
 rename Sapfor/{_src => src}/Distribution/DvmhDirectiveBase.h (100%)
 rename Sapfor/{_src => src}/Distribution/DvmhDirective_func.h (100%)
 rename Sapfor/{_src => src}/Distribution/GraphCSR.cpp (100%)
 rename Sapfor/{_src => src}/Distribution/GraphCSR.h (100%)
 rename Sapfor/{_src => src}/DvmhRegions/DvmhRegion.cpp (100%)
 rename Sapfor/{_src => src}/DvmhRegions/DvmhRegion.h (100%)
 rename Sapfor/{_src => src}/DvmhRegions/DvmhRegionInserter.cpp (100%)
 rename Sapfor/{_src => src}/DvmhRegions/DvmhRegionInserter.h (100%)
 rename Sapfor/{_src => src}/DvmhRegions/LoopChecker.cpp (100%)
 rename Sapfor/{_src => src}/DvmhRegions/LoopChecker.h (100%)
 rename Sapfor/{_src => src}/DvmhRegions/ReadWriteAnalyzer.cpp (100%)
 rename Sapfor/{_src => src}/DvmhRegions/ReadWriteAnalyzer.h (100%)
 rename Sapfor/{_src => src}/DvmhRegions/RegionsMerger.cpp (100%)
 rename Sapfor/{_src => src}/DvmhRegions/RegionsMerger.h (100%)
 rename Sapfor/{_src => src}/DvmhRegions/TypedSymbol.cpp (100%)
 rename Sapfor/{_src => src}/DvmhRegions/TypedSymbol.h (100%)
 rename Sapfor/{_src => src}/DvmhRegions/VarUsages.cpp (100%)
 rename Sapfor/{_src => src}/DvmhRegions/VarUsages.h (100%)
 rename Sapfor/{_src => src}/DynamicAnalysis/createParallelRegions.cpp (100%)
 rename Sapfor/{_src => src}/DynamicAnalysis/createParallelRegions.h (100%)
 rename Sapfor/{_src => src}/DynamicAnalysis/gCov_parser.cpp (100%)
 rename Sapfor/{_src => src}/DynamicAnalysis/gCov_parser_func.h (100%)
 rename Sapfor/{_src => src}/DynamicAnalysis/gcov_info.cpp (100%)
 rename Sapfor/{_src => src}/DynamicAnalysis/gcov_info.h (100%)
 rename Sapfor/{_src => src}/ExpressionTransform/control_flow_graph_part.cpp (100%)
 rename Sapfor/{_src => src}/ExpressionTransform/expr_transform.cpp (100%)
 rename Sapfor/{_src => src}/ExpressionTransform/expr_transform.h (100%)
 rename Sapfor/{_src => src}/GraphCall/graph_calls.cpp (100%)
 rename Sapfor/{_src => src}/GraphCall/graph_calls.h (100%)
 rename Sapfor/{_src => src}/GraphCall/graph_calls_base.cpp (100%)
 rename Sapfor/{_src => src}/GraphCall/graph_calls_func.h (100%)
 rename Sapfor/{_src => src}/GraphLoop/graph_loops.cpp (100%)
 rename Sapfor/{_src => src}/GraphLoop/graph_loops.h (100%)
 rename Sapfor/{_src => src}/GraphLoop/graph_loops_base.cpp (100%)
 rename Sapfor/{_src => src}/GraphLoop/graph_loops_func.h (100%)
 rename Sapfor/{_src => src}/Inliner/inliner.cpp (100%)
 rename Sapfor/{_src => src}/Inliner/inliner.h (100%)
 rename Sapfor/{_src => src}/LoopAnalyzer/allocations_prepoc.cpp (100%)
 rename Sapfor/{_src => src}/LoopAnalyzer/dep_analyzer.cpp (100%)
 rename Sapfor/{_src => src}/LoopAnalyzer/loop_analyzer.cpp (100%)
 rename Sapfor/{_src => src}/LoopAnalyzer/loop_analyzer.h (100%)
 rename Sapfor/{_src => src}/ParallelizationRegions/ParRegions.cpp (100%)
 rename Sapfor/{_src => src}/ParallelizationRegions/ParRegions.h (100%)
 rename Sapfor/{_src => src}/ParallelizationRegions/ParRegions_func.h (100%)
 rename Sapfor/{_src => src}/ParallelizationRegions/expand_extract_reg.cpp (100%)
 rename Sapfor/{_src => src}/ParallelizationRegions/expand_extract_reg.h (100%)
 rename Sapfor/{_src => src}/ParallelizationRegions/resolve_par_reg_conflicts.cpp (100%)
 rename Sapfor/{_src => src}/ParallelizationRegions/resolve_par_reg_conflicts.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/AMView.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/AMView.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/AlignAxis.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/AlignAxis.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/BGroup.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/BGroup.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Block.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Block.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/CallInfoStructs.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/CallParams.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/CommCost.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/CommCost.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/DArray.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/DArray.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/DimBound.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/DimBound.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/DistAxis.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/DistAxis.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Event.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Event.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/FuncCall.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/FuncCall.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Interval.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Interval.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/IntervalTemplate.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/LoopBlock.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/LoopBlock.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/LoopLS.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/LoopLS.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Ls.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Ls.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelDArray.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelIO.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelInterval.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelMPS_AM.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelParLoop.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelReduct.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelRegular.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelRemAccess.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelShadow.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ModelStructs.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ParLoop.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ParLoop.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ParseString.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/ParseString.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Processor.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Processor.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Ps.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Ps.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/RedGroup.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/RedGroup.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/RedVar.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/RedVar.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/RemAccessBuf.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/RemAccessBuf.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Space.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Space.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/StdAfx.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/TraceLine.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/TraceLine.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Ver.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Vm.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/Vm.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/adler32.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/compress.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/crc32.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/deflate.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/deflate.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/gzio.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/infblock.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/infblock.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/infcodes.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/infcodes.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/inffast.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/inffast.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/inffixed.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/inflate.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/inftrees.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/inftrees.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/infutil.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/infutil.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/intersection.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/predictor.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/trees.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/trees.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/uncompr.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/zconf.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/zlib.h (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/zutil.c (100%)
 rename Sapfor/{_src => src}/Predictor/Lib/zutil.h (100%)
 rename Sapfor/{_src => src}/Predictor/PredictScheme.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/PredictScheme.h (100%)
 rename Sapfor/{_src => src}/Predictor/PredictorInterface.h (100%)
 rename Sapfor/{_src => src}/Predictor/PredictorModel.cpp (100%)
 rename Sapfor/{_src => src}/Predictor/PredictorModel.h (100%)
 rename Sapfor/{_src => src}/PrivateAnalyzer/private_analyzer.cpp (100%)
 rename Sapfor/{_src => src}/PrivateAnalyzer/private_analyzer.h (100%)
 rename Sapfor/{_src => src}/ProjectManipulation/ConvertFiles.cpp (100%)
 rename Sapfor/{_src => src}/ProjectManipulation/ConvertFiles.h (100%)
 rename Sapfor/{_src => src}/ProjectManipulation/FileInfo.cpp (100%)
 rename Sapfor/{_src => src}/ProjectManipulation/FileInfo.h (100%)
 rename Sapfor/{_src => src}/ProjectManipulation/ParseFiles.cpp (100%)
 rename Sapfor/{_src => src}/ProjectManipulation/ParseFiles.h (100%)
 rename Sapfor/{_src => src}/ProjectManipulation/PerfAnalyzer.cpp (100%)
 rename Sapfor/{_src => src}/ProjectManipulation/PerfAnalyzer.h (100%)
 rename Sapfor/{_src => src}/ProjectManipulation/StdCapture.h (100%)
 rename Sapfor/{_src => src}/ProjectParameters/projectParameters.cpp (100%)
 rename Sapfor/{_src => src}/ProjectParameters/projectParameters.h (100%)
 rename Sapfor/{_src => src}/RenameSymbols/rename_symbols.cpp (100%)
 rename Sapfor/{_src => src}/RenameSymbols/rename_symbols.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/Makefile (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/Makefile (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/README (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/add-assert.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/affine.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/cover.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/ddomega-build.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/ddomega-use.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/ddomega.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/debug.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/Exit.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/add-assert.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/affine.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/cover.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/dddir.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/ddomega-build.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/ddomega-use.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/ddomega.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/debug.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/flags.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/ip.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/kill.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/lang-interf.generic (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/lang-interf.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/missing.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/omega2flags.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/portable.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/portable.h.origine (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/range.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/refine.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/screen.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/include/timeTrials.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/ip.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/kill.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/refine.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/OmegaForSage/sagedriver.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/README (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/annotationDriver.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/annotationDriver.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/arrayRef.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/arrayRef.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/computeInducVar.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/constanteProp.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/constanteSet.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/controlFlow.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/defUse.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/definesValues.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/definitionSet.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/depGraph.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/depGraph.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/depInterface.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/depInterface.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/depInterfaceExt.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/dependence.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/dependence.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/flowAnalysis.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/inducVar.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/intrinsic.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/intrinsic.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/invariant.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/loopTransform.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/reductionCode.h (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/set.cpp (100%)
 rename Sapfor/{_src => src}/SageAnalysisTool/set.h (100%)
 rename Sapfor/{_src => src}/Sapfor.cpp (100%)
 rename Sapfor/{_src => src}/Sapfor.h (100%)
 rename Sapfor/{_src => src}/SapforData.h (100%)
 rename Sapfor/{_src => src}/Server/checkUniq.cpp (100%)
 rename Sapfor/{_src => src}/Server/server.cpp (100%)
 rename Sapfor/{_src => src}/Server/spf_icon.ico (100%)
 rename Sapfor/{_src => src}/Transformations/array_assign_to_loop.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/array_assign_to_loop.h (100%)
 rename Sapfor/{_src => src}/Transformations/checkpoints.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/checkpoints.h (100%)
 rename Sapfor/{_src => src}/Transformations/convert_to_c.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/convert_to_c.h (100%)
 rename Sapfor/{_src => src}/Transformations/dead_code.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/dead_code.h (100%)
 rename Sapfor/{_src => src}/Transformations/enddo_loop_converter.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/enddo_loop_converter.h (100%)
 rename Sapfor/{_src => src}/Transformations/fix_common_blocks.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/fix_common_blocks.h (100%)
 rename Sapfor/{_src => src}/Transformations/function_purifying.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/function_purifying.h (100%)
 rename Sapfor/{_src => src}/Transformations/loop_transform.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/loop_transform.h (100%)
 rename Sapfor/{_src => src}/Transformations/loops_combiner.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/loops_combiner.h (100%)
 rename Sapfor/{_src => src}/Transformations/loops_splitter.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/loops_splitter.h (100%)
 rename Sapfor/{_src => src}/Transformations/loops_unrolling.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/loops_unrolling.h (100%)
 rename Sapfor/{_src => src}/Transformations/private_arrays_resizing.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/private_arrays_resizing.h (100%)
 rename Sapfor/{_src => src}/Transformations/private_removing.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/private_removing.h (100%)
 rename Sapfor/{_src => src}/Transformations/replace_dist_arrays_in_io.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/replace_dist_arrays_in_io.h (100%)
 rename Sapfor/{_src => src}/Transformations/set_implicit_none.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/set_implicit_none.h (100%)
 rename Sapfor/{_src => src}/Transformations/swap_array_dims.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/swap_array_dims.h (100%)
 rename Sapfor/{_src => src}/Transformations/uniq_call_chain_dup.cpp (100%)
 rename Sapfor/{_src => src}/Transformations/uniq_call_chain_dup.h (100%)
 rename Sapfor/{_src => src}/Utils/AstWrapper.h (100%)
 rename Sapfor/{_src => src}/Utils/BoostStackTrace.cpp (100%)
 rename Sapfor/{_src => src}/Utils/CommonBlock.h (100%)
 rename Sapfor/{_src => src}/Utils/DefUseList.h (100%)
 rename Sapfor/{_src => src}/Utils/PassManager.h (100%)
 rename Sapfor/{_src => src}/Utils/RationalNum.cpp (100%)
 rename Sapfor/{_src => src}/Utils/RationalNum.h (100%)
 rename Sapfor/{_src => src}/Utils/SgUtils.cpp (100%)
 rename Sapfor/{_src => src}/Utils/SgUtils.h (100%)
 rename Sapfor/{_src => src}/Utils/errors.h (100%)
 rename Sapfor/{_src => src}/Utils/leak_detector.h (100%)
 rename Sapfor/{_src => src}/Utils/module_utils.cpp (100%)
 rename Sapfor/{_src => src}/Utils/module_utils.h (100%)
 rename Sapfor/{_src => src}/Utils/russian_errors_text.txt (100%)
 rename Sapfor/{_src => src}/Utils/types.h (100%)
 rename Sapfor/{_src => src}/Utils/utils.cpp (100%)
 rename Sapfor/{_src => src}/Utils/utils.h (100%)
 rename Sapfor/{_src => src}/Utils/version.h (100%)
 rename Sapfor/{_src => src}/VerificationCode/CorrectVarDecl.cpp (100%)
 rename Sapfor/{_src => src}/VerificationCode/IncludeChecker.cpp (100%)
 rename Sapfor/{_src => src}/VerificationCode/StructureChecker.cpp (100%)
 rename Sapfor/{_src => src}/VerificationCode/VerifySageStructures.cpp (100%)
 rename Sapfor/{_src => src}/VerificationCode/verifications.h (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/BuildGraph.cpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/BuildGraph.h (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/SendMessage.cpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/SendMessage.h (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/get_information.cpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/get_information.h (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/algebra.cpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/algebra.hpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/fruchterman_reingold.cpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/fruchterman_reingold.hpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/kamada_kawai.cpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/kamada_kawai.hpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/layout.cpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/layout.hpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/nodesoup.cpp (100%)
 rename Sapfor/{_src => src}/VisualizerCalls/graphLayout/nodesoup.hpp (100%)
 rename Sapfor/{_test => tests}/inliner/alex.f (100%)
 rename Sapfor/{_test => tests}/inliner/array_sum.f (100%)
 rename Sapfor/{_test => tests}/inliner/inlineFunctionWithAllocatable.f90 (100%)
 rename Sapfor/{_test => tests}/inliner/sub.f (100%)
 rename Sapfor/{_test => tests}/inliner/test.f (100%)
 rename Sapfor/{_test => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f (100%)
 rename Sapfor/{_test => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f (100%)
 rename Sapfor/{_test => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f (100%)
 rename Sapfor/{_test => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f (100%)
 rename Sapfor/{_test => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f (100%)
 rename Sapfor/{_test => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f (100%)
 rename Sapfor/{_test => tests}/sapfor/check_args_decl/arg_decl_test_err1.f (100%)
 rename Sapfor/{_test => tests}/sapfor/check_args_decl/arg_decl_test_err2.f (100%)
 rename Sapfor/{_test => tests}/sapfor/check_args_decl/arg_decl_test_err3.f (100%)
 rename Sapfor/{_test => tests}/sapfor/check_args_decl/arg_decl_test_ok1.f (100%)
 rename Sapfor/{_test => tests}/sapfor/check_args_decl/arg_decl_test_ok2.f (100%)
 rename Sapfor/{_test => tests}/sapfor/check_args_decl/arg_decl_test_ok3.f (100%)
 rename Sapfor/{_test => tests}/sapfor/check_args_decl/arg_decl_test_wr1.f (100%)
 rename Sapfor/{_test => tests}/sapfor/check_args_decl/arg_decl_test_wr3.f (100%)
 rename Sapfor/{_test => tests}/sapfor/checkpoint/checkpoint.f90 (100%)
 rename Sapfor/{_test => tests}/sapfor/checkpoint/checkpoint2.f90 (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90 (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_assign_to_loop/assign_with_sections.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_assign_to_loop/simple_assign.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_assign_to_loop/two_dimensional_assign.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_expr_to_loop/expr_with_sections.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_expr_to_loop/simple_expr.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_expr_to_loop/two_dimensional_expr.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_sum_to_loop/simple_sum.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_sum_to_loop/sum_with_sections.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_sum_to_loop/two_dimensional_sum.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_where_to_loop/simple_where.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_where_to_loop/two_dimensional_where.f (100%)
 rename Sapfor/{_test => tests}/sapfor/convert_where_to_loop/where_with_sections.f (100%)
 rename Sapfor/{_test => tests}/sapfor/create_nested_loops/program.expected.f90 (100%)
 rename Sapfor/{_test => tests}/sapfor/create_nested_loops/program.f90 (100%)
 rename Sapfor/{_test => tests}/sapfor/create_nested_loops/test.bat (100%)
 rename Sapfor/{_test => tests}/sapfor/create_nested_loops/test.sh (100%)
 rename Sapfor/{_test => tests}/sapfor/fission_and_private_exp/fission_priv_exp.f90 (100%)
 rename Sapfor/{_test => tests}/sapfor/loops_combiner/test_1.for (100%)
 rename Sapfor/{_test => tests}/sapfor/loops_combiner/test_2.for (100%)
 rename Sapfor/{_test => tests}/sapfor/loops_combiner/test_3.for (100%)
 rename Sapfor/{_test => tests}/sapfor/loops_combiner/test_4.for (100%)
 rename Sapfor/{_test => tests}/sapfor/loops_combiner/test_5.for (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/array_read_before_write.in (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/array_read_before_write.out (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/read_before_read.in (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/read_before_read.out (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/read_in_loop_header.in (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/read_in_loop_header.out (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/var_modified_in_fun.in (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/var_modified_in_fun.out (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/var_read_before_write.in (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/var_read_before_write.out (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/write_before_read.in (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/write_before_read.out (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/write_before_write.in (100%)
 rename Sapfor/{_test => tests}/sapfor/merge_regions/write_before_write.out (100%)
 rename Sapfor/{_test => tests}/sapfor/parameter/magnit_3d.for (100%)
 rename Sapfor/{_test => tests}/sapfor/parameter/mycom.for (100%)
 rename Sapfor/{_test => tests}/sapfor/parameter/parameter.f90 (100%)
 rename Sapfor/{_test => tests}/sapfor/private_removing/test.f (100%)
 rename Sapfor/{_test => tests}/sapfor/private_removing/test_cannot_remove.f (100%)
 rename Sapfor/{_test => tests}/sapfor/private_removing/test_cascade.f (100%)
 rename Sapfor/{_test => tests}/sapfor/shrink/error.f (100%)
 rename Sapfor/{_test => tests}/sapfor/shrink/error2.f (100%)
 rename Sapfor/{_test => tests}/sapfor/shrink/error3.f (100%)
 rename Sapfor/{_test => tests}/sapfor/shrink/shrink.f (100%)
 rename Sapfor/{_test => tests}/sapfor/shrink/shrink2.f (100%)
 rename Sapfor/{_test => tests}/sapfor/shrink/shrink3.f (100%)

diff --git a/Sapfor/CMakeLists.txt b/Sapfor/CMakeLists.txt
index 90da4c5..86e51fd 100644
--- a/Sapfor/CMakeLists.txt
+++ b/Sapfor/CMakeLists.txt
@@ -13,24 +13,24 @@ add_definitions("-D YYDEBUG")
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(fdvm_include _projects/dvm/fdvm/trunk/include)
-set(fdvm_sources _projects//dvm/fdvm/trunk/fdvm/)
-set(sage_include_1 _projects/dvm/fdvm/trunk/Sage/lib/include)
-set(sage_include_2 _projects/dvm/fdvm/trunk/Sage/h/)
-set(libdb_sources _projects/dvm/fdvm/trunk/Sage/lib/oldsrc)
-set(sage_sources _projects/dvm/fdvm/trunk/Sage/lib/newsrc)
-set(sagepp_sources _projects/dvm/fdvm/trunk/Sage/Sage++)
-set(parser_sources _projects/dvm/fdvm/trunk/parser)
-set(pppa_sources _projects/dvm/tools/pppa/trunk/src)
-set(zlib_sources _projects/dvm/tools/Zlib)
+set(fdvm_include projects/dvm/fdvm/trunk/include)
+set(fdvm_sources projects//dvm/fdvm/trunk/fdvm/)
+set(sage_include_1 projects/dvm/fdvm/trunk/Sage/lib/include)
+set(sage_include_2 projects/dvm/fdvm/trunk/Sage/h/)
+set(libdb_sources projects/dvm/fdvm/trunk/Sage/lib/oldsrc)
+set(sage_sources projects/dvm/fdvm/trunk/Sage/lib/newsrc)
+set(sagepp_sources projects/dvm/fdvm/trunk/Sage/Sage++)
+set(parser_sources projects/dvm/fdvm/trunk/parser)
+set(pppa_sources projects/dvm/tools/pppa/trunk/src)
+set(zlib_sources projects/dvm/tools/Zlib)
 
 # Read pathes to external sapfor directories
-#if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/_projects/paths.txt")
+#if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/projects/paths.txt")
 #    message("Found paths.txt, using custom paths.")
-#    FILE(STRINGS ./_projects/paths.txt SAPFOR_PATHS)
+#    FILE(STRINGS ./projects/paths.txt SAPFOR_PATHS)
 #else ()
 #    message("Not found paths.txt, using default paths.")
-#    FILE(STRINGS ./_projects/paths.default.txt SAPFOR_PATHS)
+#    FILE(STRINGS ./projects/paths.default.txt SAPFOR_PATHS)
 #endif ()
   
 foreach (NameAndValue ${SAPFOR_PATHS})
@@ -45,7 +45,7 @@ foreach (NameAndValue ${SAPFOR_PATHS})
     message("Using ${Name} ${${Name}}")
 endforeach ()
 
-include_directories(_src)
+include_directories(src)
 #Sage lib includes
 include_directories(${fdvm_include})
 include_directories(${sage_include_1})
@@ -55,81 +55,81 @@ include_directories(${zlib_sources}/include)
 #PPPA includes
 include_directories(${pppa_sources})
 
-set(PR_PARAM _src/ProjectParameters/projectParameters.cpp
-             _src/ProjectParameters/projectParameters.h)
+set(PR_PARAM src/ProjectParameters/projectParameters.cpp
+             src/ProjectParameters/projectParameters.h)
 
-set(GR_LAYOUT _src/VisualizerCalls/graphLayout/algebra.cpp
-        _src/VisualizerCalls/graphLayout/algebra.hpp
-        _src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
-        _src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
-        _src/VisualizerCalls/graphLayout/kamada_kawai.cpp
-        _src/VisualizerCalls/graphLayout/kamada_kawai.hpp
-        _src/VisualizerCalls/graphLayout/layout.cpp
-        _src/VisualizerCalls/graphLayout/layout.hpp
-        _src/VisualizerCalls/graphLayout/nodesoup.cpp
-        _src/VisualizerCalls/graphLayout/nodesoup.hpp)
+set(GR_LAYOUT src/VisualizerCalls/graphLayout/algebra.cpp
+        src/VisualizerCalls/graphLayout/algebra.hpp
+        src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
+        src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
+        src/VisualizerCalls/graphLayout/kamada_kawai.cpp
+        src/VisualizerCalls/graphLayout/kamada_kawai.hpp
+        src/VisualizerCalls/graphLayout/layout.cpp
+        src/VisualizerCalls/graphLayout/layout.hpp
+        src/VisualizerCalls/graphLayout/nodesoup.cpp
+        src/VisualizerCalls/graphLayout/nodesoup.hpp)
     
-set(VS_CALLS _src/VisualizerCalls/get_information.cpp
-        _src/VisualizerCalls/get_information.h
-        _src/VisualizerCalls/SendMessage.cpp
-        _src/VisualizerCalls/SendMessage.h
-        _src/VisualizerCalls/BuildGraph.cpp
-        _src/VisualizerCalls/BuildGraph.h)
+set(VS_CALLS src/VisualizerCalls/get_information.cpp
+        src/VisualizerCalls/get_information.h
+        src/VisualizerCalls/SendMessage.cpp
+        src/VisualizerCalls/SendMessage.h
+        src/VisualizerCalls/BuildGraph.cpp
+        src/VisualizerCalls/BuildGraph.h)
     
-set(VERIF _src/VerificationCode/CorrectVarDecl.cpp
-        _src/VerificationCode/IncludeChecker.cpp
-        _src/VerificationCode/StructureChecker.cpp
-        _src/VerificationCode/VerifySageStructures.cpp
-        _src/VerificationCode/verifications.h)
+set(VERIF src/VerificationCode/CorrectVarDecl.cpp
+        src/VerificationCode/IncludeChecker.cpp
+        src/VerificationCode/StructureChecker.cpp
+        src/VerificationCode/VerifySageStructures.cpp
+        src/VerificationCode/verifications.h)
 
-set(UTILS _src/Utils/AstWrapper.h
-        _src/Utils/BoostStackTrace.cpp
-        _src/Utils/CommonBlock.h
-        _src/Utils/DefUseList.h
-        _src/Utils/errors.h
-        _src/Utils/leak_detector.h
-        _src/Utils/RationalNum.cpp
-        _src/Utils/RationalNum.h
-        _src/Utils/SgUtils.cpp
-        _src/Utils/SgUtils.h
-        _src/Utils/types.h
-        _src/Utils/utils.cpp
-        _src/Utils/utils.h
-        _src/Utils/version.h
-        _src/Utils/module_utils.h
-        _src/Utils/module_utils.cpp)
+set(UTILS src/Utils/AstWrapper.h
+        src/Utils/BoostStackTrace.cpp
+        src/Utils/CommonBlock.h
+        src/Utils/DefUseList.h
+        src/Utils/errors.h
+        src/Utils/leak_detector.h
+        src/Utils/RationalNum.cpp
+        src/Utils/RationalNum.h
+        src/Utils/SgUtils.cpp
+        src/Utils/SgUtils.h
+        src/Utils/types.h
+        src/Utils/utils.cpp
+        src/Utils/utils.h
+        src/Utils/version.h
+        src/Utils/module_utils.h
+        src/Utils/module_utils.cpp)
         
-set(OMEGA _src/SageAnalysisTool/OmegaForSage/add-assert.cpp
-        _src/SageAnalysisTool/OmegaForSage/affine.cpp
-        _src/SageAnalysisTool/OmegaForSage/cover.cpp
-        _src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
-        _src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
-        _src/SageAnalysisTool/OmegaForSage/ddomega.cpp
-        _src/SageAnalysisTool/OmegaForSage/debug.cpp
-        _src/SageAnalysisTool/OmegaForSage/ip.cpp
-        _src/SageAnalysisTool/OmegaForSage/kill.cpp
-        _src/SageAnalysisTool/OmegaForSage/refine.cpp
-        _src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
-        _src/SageAnalysisTool/annotationDriver.cpp
-        _src/SageAnalysisTool/arrayRef.cpp
-        _src/SageAnalysisTool/computeInducVar.cpp
-        _src/SageAnalysisTool/constanteProp.cpp
-        _src/SageAnalysisTool/constanteSet.h
-        _src/SageAnalysisTool/controlFlow.cpp
-        _src/SageAnalysisTool/defUse.cpp
-        _src/SageAnalysisTool/dependence.cpp
-        _src/SageAnalysisTool/depGraph.cpp
-        _src/SageAnalysisTool/depInterface.cpp
-        _src/SageAnalysisTool/depInterfaceExt.h
-        _src/SageAnalysisTool/flowAnalysis.cpp
-        _src/SageAnalysisTool/inducVar.h
-        _src/SageAnalysisTool/intrinsic.cpp
-        _src/SageAnalysisTool/invariant.cpp
-        _src/SageAnalysisTool/loopTransform.cpp
-        _src/SageAnalysisTool/set.cpp)
+set(OMEGA src/SageAnalysisTool/OmegaForSage/add-assert.cpp
+        src/SageAnalysisTool/OmegaForSage/affine.cpp
+        src/SageAnalysisTool/OmegaForSage/cover.cpp
+        src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
+        src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
+        src/SageAnalysisTool/OmegaForSage/ddomega.cpp
+        src/SageAnalysisTool/OmegaForSage/debug.cpp
+        src/SageAnalysisTool/OmegaForSage/ip.cpp
+        src/SageAnalysisTool/OmegaForSage/kill.cpp
+        src/SageAnalysisTool/OmegaForSage/refine.cpp
+        src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
+        src/SageAnalysisTool/annotationDriver.cpp
+        src/SageAnalysisTool/arrayRef.cpp
+        src/SageAnalysisTool/computeInducVar.cpp
+        src/SageAnalysisTool/constanteProp.cpp
+        src/SageAnalysisTool/constanteSet.h
+        src/SageAnalysisTool/controlFlow.cpp
+        src/SageAnalysisTool/defUse.cpp
+        src/SageAnalysisTool/dependence.cpp
+        src/SageAnalysisTool/depGraph.cpp
+        src/SageAnalysisTool/depInterface.cpp
+        src/SageAnalysisTool/depInterfaceExt.h
+        src/SageAnalysisTool/flowAnalysis.cpp
+        src/SageAnalysisTool/inducVar.h
+        src/SageAnalysisTool/intrinsic.cpp
+        src/SageAnalysisTool/invariant.cpp
+        src/SageAnalysisTool/loopTransform.cpp
+        src/SageAnalysisTool/set.cpp)
 
-set(PRIV _src/PrivateAnalyzer/private_analyzer.cpp
-        _src/PrivateAnalyzer/private_analyzer.h)
+set(PRIV src/PrivateAnalyzer/private_analyzer.cpp
+        src/PrivateAnalyzer/private_analyzer.h)
 
 set(FDVM ${fdvm_sources}/acc.cpp
          ${fdvm_sources}/acc_across.cpp
@@ -156,48 +156,48 @@ set(FDVM ${fdvm_sources}/acc.cpp
          ${fdvm_sources}/parloop.cpp
          ${fdvm_sources}/stmt.cpp)
         
-set(PARALLEL_REG _src/ParallelizationRegions/ParRegions.cpp
-        _src/ParallelizationRegions/ParRegions.h
-        _src/ParallelizationRegions/ParRegions_func.h
-        _src/ParallelizationRegions/expand_extract_reg.cpp
-        _src/ParallelizationRegions/expand_extract_reg.h
-        _src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
-        _src/ParallelizationRegions/resolve_par_reg_conflicts.h)
+set(PARALLEL_REG src/ParallelizationRegions/ParRegions.cpp
+        src/ParallelizationRegions/ParRegions.h
+        src/ParallelizationRegions/ParRegions_func.h
+        src/ParallelizationRegions/expand_extract_reg.cpp
+        src/ParallelizationRegions/expand_extract_reg.h
+        src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
+        src/ParallelizationRegions/resolve_par_reg_conflicts.h)
 
-set(TR_DEAD_CODE _src/Transformations/dead_code.cpp
-        _src/Transformations/dead_code.h)
-set(TR_CP _src/Transformations/checkpoints.cpp
-        _src/Transformations/checkpoints.h)
-set(TR_VECTOR _src/Transformations/array_assign_to_loop.cpp
-        _src/Transformations/array_assign_to_loop.h)
-set(TR_ENDDO_LOOP _src/Transformations/enddo_loop_converter.cpp
-        _src/Transformations/enddo_loop_converter.h)
-set(TR_LOOP_NEST _src/Transformations/loop_transform.cpp
-        _src/Transformations/loop_transform.h)
-set(TR_LOOP_COMB _src/Transformations/loops_combiner.cpp
-        _src/Transformations/loops_combiner.h)
-set(TR_LOOP_SPLIT _src/Transformations/loops_splitter.cpp
-        _src/Transformations/loops_splitter.h)
-set(TR_LOOP_UNROLL _src/Transformations/loops_unrolling.cpp
-        _src/Transformations/loops_unrolling.h)     
-set(TR_PRIV_BR _src/Transformations/private_arrays_resizing.cpp
-        _src/Transformations/private_arrays_resizing.h)
-set(TR_PRIV_DEL _src/Transformations/private_removing.cpp
-        _src/Transformations/private_removing.h)
-set(TR_SWAP_ARR_DIMS _src/Transformations/swap_array_dims.cpp
-        _src/Transformations/swap_array_dims.h)
-set(TR_FUNC_DUP _src/Transformations/uniq_call_chain_dup.cpp
-        _src/Transformations/uniq_call_chain_dup.h)
-set(TR_FUNC_PURE _src/Transformations/function_purifying.cpp
-        _src/Transformations/function_purifying.h)  
-set(TR_GV _src/Transformations/fix_common_blocks.cpp
-        _src/Transformations/fix_common_blocks.h)
-set(TR_CONV _src/Transformations/convert_to_c.cpp
-        _src/Transformations/convert_to_c.h)
-set(TR_IMPLICIT_NONE _src/Transformations/set_implicit_none.cpp
-        _src/Transformations/set_implicit_none.h)
-set(TR_REPLACE_ARRAYS_IN_IO _src/Transformations/replace_dist_arrays_in_io.cpp
-        _src/Transformations/replace_dist_arrays_in_io.h)
+set(TR_DEAD_CODE src/Transformations/dead_code.cpp
+        src/Transformations/dead_code.h)
+set(TR_CP src/Transformations/checkpoints.cpp
+        src/Transformations/checkpoints.h)
+set(TR_VECTOR src/Transformations/array_assign_to_loop.cpp
+        src/Transformations/array_assign_to_loop.h)
+set(TR_ENDDO_LOOP src/Transformations/enddo_loop_converter.cpp
+        src/Transformations/enddo_loop_converter.h)
+set(TR_LOOP_NEST src/Transformations/loop_transform.cpp
+        src/Transformations/loop_transform.h)
+set(TR_LOOP_COMB src/Transformations/loops_combiner.cpp
+        src/Transformations/loops_combiner.h)
+set(TR_LOOP_SPLIT src/Transformations/loops_splitter.cpp
+        src/Transformations/loops_splitter.h)
+set(TR_LOOP_UNROLL src/Transformations/loops_unrolling.cpp
+        src/Transformations/loops_unrolling.h)     
+set(TR_PRIV_BR src/Transformations/private_arrays_resizing.cpp
+        src/Transformations/private_arrays_resizing.h)
+set(TR_PRIV_DEL src/Transformations/private_removing.cpp
+        src/Transformations/private_removing.h)
+set(TR_SWAP_ARR_DIMS src/Transformations/swap_array_dims.cpp
+        src/Transformations/swap_array_dims.h)
+set(TR_FUNC_DUP src/Transformations/uniq_call_chain_dup.cpp
+        src/Transformations/uniq_call_chain_dup.h)
+set(TR_FUNC_PURE src/Transformations/function_purifying.cpp
+        src/Transformations/function_purifying.h)  
+set(TR_GV src/Transformations/fix_common_blocks.cpp
+        src/Transformations/fix_common_blocks.h)
+set(TR_CONV src/Transformations/convert_to_c.cpp
+        src/Transformations/convert_to_c.h)
+set(TR_IMPLICIT_NONE src/Transformations/set_implicit_none.cpp
+        src/Transformations/set_implicit_none.h)
+set(TR_REPLACE_ARRAYS_IN_IO src/Transformations/replace_dist_arrays_in_io.cpp
+        src/Transformations/replace_dist_arrays_in_io.h)
 
 set(TRANSFORMS 
         ${TR_DEAD_CODE}
@@ -219,129 +219,129 @@ set(TRANSFORMS
         ${TR_IMPLICIT_NONE}
         ${TR_REPLACE_ARRAYS_IN_IO})
         
-set(CFG _src/CFGraph/IR.cpp
-        _src/CFGraph/IR.h
-        _src/CFGraph/CFGraph.cpp
-        _src/CFGraph/CFGraph.h
-        _src/CFGraph/RD_subst.cpp
-        _src/CFGraph/RD_subst.h
-        _src/CFGraph/live_variable_analysis.cpp
-        _src/CFGraph/live_variable_analysis.h
-        _src/CFGraph/private_variables_analysis.cpp
-        _src/CFGraph/private_variables_analysis.h
+set(CFG src/CFGraph/IR.cpp
+        src/CFGraph/IR.h
+        src/CFGraph/CFGraph.cpp
+        src/CFGraph/CFGraph.h
+        src/CFGraph/RD_subst.cpp
+        src/CFGraph/RD_subst.h
+        src/CFGraph/live_variable_analysis.cpp
+        src/CFGraph/live_variable_analysis.h
+        src/CFGraph/private_variables_analysis.cpp
+        src/CFGraph/private_variables_analysis.h
         )
         
 set(DATA_FLOW
-        _src/CFGraph/DataFlow/data_flow.h
-        _src/CFGraph/DataFlow/data_flow_impl.h
-        _src/CFGraph/DataFlow/backward_data_flow.h
-        _src/CFGraph/DataFlow/backward_data_flow_impl.h
+        src/CFGraph/DataFlow/data_flow.h
+        src/CFGraph/DataFlow/data_flow_impl.h
+        src/CFGraph/DataFlow/backward_data_flow.h
+        src/CFGraph/DataFlow/backward_data_flow_impl.h
         )
 
-set(CREATE_INTER_T  _src/CreateInterTree/CreateInterTree.cpp
-        _src/CreateInterTree/CreateInterTree.h)
+set(CREATE_INTER_T  src/CreateInterTree/CreateInterTree.cpp
+        src/CreateInterTree/CreateInterTree.h)
 
-set(DIRA  _src/DirectiveProcessing/directive_analyzer.cpp
-        _src/DirectiveProcessing/directive_analyzer.h
-        _src/DirectiveProcessing/directive_creator.cpp
-        _src/DirectiveProcessing/directive_creator_base.cpp
-        _src/DirectiveProcessing/directive_creator.h
-        _src/DirectiveProcessing/directive_parser.cpp
-        _src/DirectiveProcessing/directive_parser.h
-        _src/DirectiveProcessing/directive_omp_parser.cpp
-        _src/DirectiveProcessing/directive_omp_parser.h
-        _src/DirectiveProcessing/insert_directive.cpp
-        _src/DirectiveProcessing/insert_directive.h
-        _src/DirectiveProcessing/remote_access.cpp
-        _src/DirectiveProcessing/remote_access_base.cpp
-        _src/DirectiveProcessing/remote_access.h
-        _src/DirectiveProcessing/shadow.cpp
-        _src/DirectiveProcessing/shadow.h
-        _src/DirectiveProcessing/spf_directive_preproc.cpp)
+set(DIRA  src/DirectiveProcessing/directive_analyzer.cpp
+        src/DirectiveProcessing/directive_analyzer.h
+        src/DirectiveProcessing/directive_creator.cpp
+        src/DirectiveProcessing/directive_creator_base.cpp
+        src/DirectiveProcessing/directive_creator.h
+        src/DirectiveProcessing/directive_parser.cpp
+        src/DirectiveProcessing/directive_parser.h
+        src/DirectiveProcessing/directive_omp_parser.cpp
+        src/DirectiveProcessing/directive_omp_parser.h
+        src/DirectiveProcessing/insert_directive.cpp
+        src/DirectiveProcessing/insert_directive.h
+        src/DirectiveProcessing/remote_access.cpp
+        src/DirectiveProcessing/remote_access_base.cpp
+        src/DirectiveProcessing/remote_access.h
+        src/DirectiveProcessing/shadow.cpp
+        src/DirectiveProcessing/shadow.h
+        src/DirectiveProcessing/spf_directive_preproc.cpp)
         
-set(DISTR _src/Distribution/Array.cpp
-        _src/Distribution/ArrayAnalysis.cpp
-        _src/Distribution/Array.h
-        _src/Distribution/Arrays.h
-        _src/Distribution/CreateDistributionDirs.cpp
-        _src/Distribution/CreateDistributionDirs.h
-        _src/Distribution/Cycle.cpp
-        _src/Distribution/Cycle.h
-        _src/Distribution/Distribution.cpp
-        _src/Distribution/Distribution.h
-        _src/Distribution/DvmhDirective.cpp
-        _src/Distribution/DvmhDirective.h
-        _src/Distribution/DvmhDirective_func.h
-        _src/Distribution/DvmhDirectiveBase.cpp
-        _src/Distribution/DvmhDirectiveBase.h
-        _src/Distribution/GraphCSR.cpp
-        _src/Distribution/GraphCSR.h)
+set(DISTR src/Distribution/Array.cpp
+        src/Distribution/ArrayAnalysis.cpp
+        src/Distribution/Array.h
+        src/Distribution/Arrays.h
+        src/Distribution/CreateDistributionDirs.cpp
+        src/Distribution/CreateDistributionDirs.h
+        src/Distribution/Cycle.cpp
+        src/Distribution/Cycle.h
+        src/Distribution/Distribution.cpp
+        src/Distribution/Distribution.h
+        src/Distribution/DvmhDirective.cpp
+        src/Distribution/DvmhDirective.h
+        src/Distribution/DvmhDirective_func.h
+        src/Distribution/DvmhDirectiveBase.cpp
+        src/Distribution/DvmhDirectiveBase.h
+        src/Distribution/GraphCSR.cpp
+        src/Distribution/GraphCSR.h)
         
-set(DVMH_REG _src/DvmhRegions/DvmhRegionInserter.cpp
-        _src/DvmhRegions/DvmhRegionInserter.h
-        _src/DvmhRegions/RegionsMerger.cpp
-        _src/DvmhRegions/RegionsMerger.h
-        _src/DvmhRegions/ReadWriteAnalyzer.cpp
-        _src/DvmhRegions/ReadWriteAnalyzer.h
-        _src/DvmhRegions/LoopChecker.cpp
-        _src/DvmhRegions/LoopChecker.h
-        _src/DvmhRegions/DvmhRegion.cpp
-        _src/DvmhRegions/DvmhRegion.h
-        _src/DvmhRegions/VarUsages.cpp
-        _src/DvmhRegions/VarUsages.h
-        _src/DvmhRegions/TypedSymbol.cpp
-        _src/DvmhRegions/TypedSymbol.h)
+set(DVMH_REG src/DvmhRegions/DvmhRegionInserter.cpp
+        src/DvmhRegions/DvmhRegionInserter.h
+        src/DvmhRegions/RegionsMerger.cpp
+        src/DvmhRegions/RegionsMerger.h
+        src/DvmhRegions/ReadWriteAnalyzer.cpp
+        src/DvmhRegions/ReadWriteAnalyzer.h
+        src/DvmhRegions/LoopChecker.cpp
+        src/DvmhRegions/LoopChecker.h
+        src/DvmhRegions/DvmhRegion.cpp
+        src/DvmhRegions/DvmhRegion.h
+        src/DvmhRegions/VarUsages.cpp
+        src/DvmhRegions/VarUsages.h
+        src/DvmhRegions/TypedSymbol.cpp
+        src/DvmhRegions/TypedSymbol.h)
         
-set(DYNA _src/DynamicAnalysis/createParallelRegions.cpp
-        _src/DynamicAnalysis/createParallelRegions.h
-        _src/DynamicAnalysis/gcov_info.cpp
-        _src/DynamicAnalysis/gcov_info.h
-        _src/DynamicAnalysis/gCov_parser.cpp
-        _src/DynamicAnalysis/gCov_parser_func.h)
+set(DYNA src/DynamicAnalysis/createParallelRegions.cpp
+        src/DynamicAnalysis/createParallelRegions.h
+        src/DynamicAnalysis/gcov_info.cpp
+        src/DynamicAnalysis/gcov_info.h
+        src/DynamicAnalysis/gCov_parser.cpp
+        src/DynamicAnalysis/gCov_parser_func.h)
 
-set(EXPR_TRANSFORM _src/ExpressionTransform/control_flow_graph_part.cpp
-        _src/ExpressionTransform/expr_transform.cpp
-        _src/ExpressionTransform/expr_transform.h)
+set(EXPR_TRANSFORM src/ExpressionTransform/control_flow_graph_part.cpp
+        src/ExpressionTransform/expr_transform.cpp
+        src/ExpressionTransform/expr_transform.h)
         
-set(GR_CALL _src/GraphCall/graph_calls.cpp
-        _src/GraphCall/graph_calls.h
-        _src/GraphCall/graph_calls_base.cpp
-        _src/GraphCall/graph_calls_func.h)
+set(GR_CALL src/GraphCall/graph_calls.cpp
+        src/GraphCall/graph_calls.h
+        src/GraphCall/graph_calls_base.cpp
+        src/GraphCall/graph_calls_func.h)
         
-set(GR_LOOP _src/GraphLoop/graph_loops_base.cpp
-        _src/GraphLoop/graph_loops.cpp
-        _src/GraphLoop/graph_loops.h
-        _src/GraphLoop/graph_loops_func.h)
+set(GR_LOOP src/GraphLoop/graph_loops_base.cpp
+        src/GraphLoop/graph_loops.cpp
+        src/GraphLoop/graph_loops.h
+        src/GraphLoop/graph_loops_func.h)
         
-set(INLINER _src/Inliner/inliner.cpp
-        _src/Inliner/inliner.h)
+set(INLINER src/Inliner/inliner.cpp
+        src/Inliner/inliner.h)
         
-set(LOOP_ANALYZER  _src/LoopAnalyzer/allocations_prepoc.cpp
-        _src/LoopAnalyzer/dep_analyzer.cpp        
-        _src/LoopAnalyzer/loop_analyzer.cpp
-        _src/LoopAnalyzer/loop_analyzer.h)
+set(LOOP_ANALYZER  src/LoopAnalyzer/allocations_prepoc.cpp
+        src/LoopAnalyzer/dep_analyzer.cpp        
+        src/LoopAnalyzer/loop_analyzer.cpp
+        src/LoopAnalyzer/loop_analyzer.h)
 
-set(RENAME_SYMBOLS  _src/RenameSymbols/rename_symbols.cpp
-                    _src/RenameSymbols/rename_symbols.h)
+set(RENAME_SYMBOLS  src/RenameSymbols/rename_symbols.cpp
+                    src/RenameSymbols/rename_symbols.h)
 
 
-set(MAIN _src/Sapfor.cpp
-        _src/Sapfor.h
-        _src/SapforData.h
-        _src/Utils/PassManager.h)
+set(MAIN src/Sapfor.cpp
+        src/Sapfor.h
+        src/SapforData.h
+        src/Utils/PassManager.h)
 
-set(PREDICTOR _src/Predictor/PredictScheme.cpp
-              _src/Predictor/PredictScheme.h)
+set(PREDICTOR src/Predictor/PredictScheme.cpp
+              src/Predictor/PredictScheme.h)
 
-set(PROJ_MAN _src/ProjectManipulation/ParseFiles.cpp
-             _src/ProjectManipulation/ParseFiles.h
-             _src/ProjectManipulation/StdCapture.h
-             _src/ProjectManipulation/PerfAnalyzer.cpp
-             _src/ProjectManipulation/PerfAnalyzer.h
-             _src/ProjectManipulation/FileInfo.cpp
-             _src/ProjectManipulation/FileInfo.h
-             _src/ProjectManipulation/ConvertFiles.cpp
-             _src/ProjectManipulation/ConvertFiles.h)
+set(PROJ_MAN src/ProjectManipulation/ParseFiles.cpp
+             src/ProjectManipulation/ParseFiles.h
+             src/ProjectManipulation/StdCapture.h
+             src/ProjectManipulation/PerfAnalyzer.cpp
+             src/ProjectManipulation/PerfAnalyzer.h
+             src/ProjectManipulation/FileInfo.cpp
+             src/ProjectManipulation/FileInfo.h
+             src/ProjectManipulation/ConvertFiles.cpp
+             src/ProjectManipulation/ConvertFiles.h)
 
 set(PARSER  ${parser_sources}/cftn.c
             ${parser_sources}/errors.c
@@ -491,16 +491,16 @@ else()
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
 endif()
 
-add_subdirectory(_projects/FDVM)
+add_subdirectory(projects/FDVM)
 
 add_definitions("-D __SPF")
 add_definitions("-D _CRT_SECURE_NO_WARNINGS")
 add_definitions("-D _CRT_NON_CONFORMING_SWPRINTFS")
 
-add_subdirectory(_projects/SageOldSrc)
-add_subdirectory(_projects/SageNewSrc)
-add_subdirectory(_projects/SageLib)
-add_subdirectory(_projects/Parser)
+add_subdirectory(projects/SageOldSrc)
+add_subdirectory(projects/SageNewSrc)
+add_subdirectory(projects/SageLib)
+add_subdirectory(projects/Parser)
 
 add_definitions("-D __SPF_BUILT_IN_FDVM")
 add_definitions("-D __SPF_BUILT_IN_PARSER")
diff --git a/Sapfor/_projects/FDVM/CMakeLists.txt b/Sapfor/projects/FDVM/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/FDVM/CMakeLists.txt
rename to Sapfor/projects/FDVM/CMakeLists.txt
diff --git a/Sapfor/_projects/Parser/CMakeLists.txt b/Sapfor/projects/Parser/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/Parser/CMakeLists.txt
rename to Sapfor/projects/Parser/CMakeLists.txt
diff --git a/Sapfor/_projects/SageLib/CMakeLists.txt b/Sapfor/projects/SageLib/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/SageLib/CMakeLists.txt
rename to Sapfor/projects/SageLib/CMakeLists.txt
diff --git a/Sapfor/_projects/SageNewSrc/CMakeLists.txt b/Sapfor/projects/SageNewSrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/SageNewSrc/CMakeLists.txt
rename to Sapfor/projects/SageNewSrc/CMakeLists.txt
diff --git a/Sapfor/_projects/SageOldSrc/CMakeLists.txt b/Sapfor/projects/SageOldSrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/SageOldSrc/CMakeLists.txt
rename to Sapfor/projects/SageOldSrc/CMakeLists.txt
diff --git a/Sapfor/_projects/Sapc++/Sapc++.sln b/Sapfor/projects/Sapc++/Sapc++.sln
similarity index 100%
rename from Sapfor/_projects/Sapc++/Sapc++.sln
rename to Sapfor/projects/Sapc++/Sapc++.sln
diff --git a/Sapfor/_projects/dvm/fdvm/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/trunk/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/trunk/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h b/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
rename to Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp b/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp b/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inline.h b/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inline.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inline.h
rename to Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inline.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp b/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h b/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h
rename to Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/InlineExpansion/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/makefile.win
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Makefile b/Sapfor/projects/dvm/fdvm/trunk/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Makefile
rename to Sapfor/projects/dvm/fdvm/trunk/Makefile
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/trunk/Sage/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/LICENSE b/Sapfor/projects/dvm/fdvm/trunk/Sage/LICENSE
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/LICENSE
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/LICENSE
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/Makefile b/Sapfor/projects/dvm/fdvm/trunk/Sage/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/Makefile
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/Makefile
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/Makefile b/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/Makefile
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/Makefile
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp b/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/Makefile b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/Makefile
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/Makefile
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/bif.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/bif.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/bif.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/bif.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/compatible.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/compatible.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/compatible.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/compatible.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/db.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/db.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/db.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/db.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/db.new.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/db.new.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/db.new.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/db.new.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/defines.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/defines.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/defines.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/defines.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/defs.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/defs.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/defs.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/defs.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep_str.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep_str.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep_str.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep_str.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep_struct.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep_struct.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/dep_struct.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep_struct.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/elist.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/elist.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/elist.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/elist.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/f90.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/f90.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/f90.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/f90.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/fixcray.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/fixcray.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/fixcray.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/fixcray.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/fm.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/fm.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/fm.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/fm.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/head b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/head
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/head
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/head
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/leak_detector.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/leak_detector.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/leak_detector.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/leak_detector.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/list.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/list.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/list.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/list.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/ll.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/ll.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/ll.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/ll.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/prop.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/prop.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/prop.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/prop.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sage.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/sage.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sage.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/sage.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sagearch.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/sagearch.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sagearch.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/sagearch.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sageroot.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/sageroot.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sageroot.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/sageroot.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sets.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/sets.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/sets.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/sets.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/symb.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/symb.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/symb.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/symb.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/symblob.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/symblob.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/symblob.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/symblob.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag.doc b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag.doc
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag.doc
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag.doc
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag_make b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag_make
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/tag_make
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag_make
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/version.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/version.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/version.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/version.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vextern.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/vextern.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vextern.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/vextern.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vparse.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/vparse.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vparse.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/vparse.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vpc.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/vpc.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/vpc.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/vpc.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/h/window.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/h/window.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/h/window.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/h/window.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/Makefile b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/Makefile
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/Makefile
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/macro.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/macro.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/macro.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/macro.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/symb.def b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/symb.def
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/symb.def
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/symb.def
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/type.def b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/type.def
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/type.def
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/type.def
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/makefile.win
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c b/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/Sage/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/Sage/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/Sage/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/Sage/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/Sage/makefile.win
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters b/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
rename to Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/acrossDebugging/across.cpp b/Sapfor/projects/dvm/fdvm/trunk/acrossDebugging/across.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/acrossDebugging/across.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/acrossDebugging/across.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/gausf.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/gausf.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/gausf.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/gausf.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/gausgb.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/gausgb.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/gausgb.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/gausgb.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/gaush.hpf b/Sapfor/projects/dvm/fdvm/trunk/examples/gaush.hpf
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/gaush.hpf
rename to Sapfor/projects/dvm/fdvm/trunk/examples/gaush.hpf
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/gauswh.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/gauswh.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/gauswh.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/gauswh.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/jac.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/jac.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/jac.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/jac.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/jacas.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/jacas.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/jacas.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/jacas.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/jach.hpf b/Sapfor/projects/dvm/fdvm/trunk/examples/jach.hpf
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/jach.hpf
rename to Sapfor/projects/dvm/fdvm/trunk/examples/jach.hpf
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/redbf.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/redbf.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/redbf.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/redbf.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/redbh.hpf b/Sapfor/projects/dvm/fdvm/trunk/examples/redbh.hpf
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/redbh.hpf
rename to Sapfor/projects/dvm/fdvm/trunk/examples/redbh.hpf
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/sor.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/sor.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/sor.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/sor.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/task2j.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/task2j.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/task2j.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/task2j.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/tasks.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/tasks.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/tasks.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/tasks.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/examples/taskst.fdv b/Sapfor/projects/dvm/fdvm/trunk/examples/taskst.fdv
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/examples/taskst.fdv
rename to Sapfor/projects/dvm/fdvm/trunk/examples/taskst.fdv
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/Makefile b/Sapfor/projects/dvm/fdvm/trunk/fdvm/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/Makefile
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/Makefile
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_across.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_across.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_across.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_across.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
similarity index 96%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
index 428c0c9..57e9a36 100644
--- a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
+++ b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
@@ -1,4325 +1,4325 @@
-#include "leak_detector.h"
-
-#include "dvm.h"
-#include "acc_analyzer.h"
-#include "calls.h"
-#include <fstream>
-#include <stdint.h>
-
-using std::string;
-using std::vector;
-using std::map;
-using std::list;
-using std::make_pair;
-using std::set;
-using std::pair;
-
-#if __SPF
-using std::wstring;
-#include "../_src/Utils/AstWrapper.h"
-#include "../_src/Utils/utils.h"
-#include "../_src/Utils/errors.h"
-
-static pair<wstring, string> getText(const char *s, const wchar_t *s1, const char *t, int num, SgStatement *stmt, int &line)
-{
-    pair<wstring, string> ret;
-
-    wchar_t bufW[1024];
-#if _WIN32
-    swprintf(bufW, s1, to_wstring(t).c_str());
-#else
-    swprintf(bufW, 1024, s1, to_wstring(t).c_str());
-#endif
-    ret.first = bufW;
-
-    char buf[1024];
-    sprintf(buf, s, t);
-    ret.second = buf;
-
-    line = stmt->lineNumber();
-    if (line == 0)
-    {
-        line = 1;
-        if (stmt->variant() == DVM_PARALLEL_ON_DIR)
-        {
-            line = stmt->lexNext()->lineNumber();
-            ret.first += RR158_1;
-            ret.second += " for this loop";
-        }
-    }
-
-    if (stmt->variant() == SPF_ANALYSIS_DIR)
-    {
-        ret.first += RR158_1;
-        ret.second += " for this loop";
-    }
-
-    return ret;
-}
-
-static inline bool ifVarIsLoopSymb(SgStatement *stmt, const string symb)
-{    
-    bool ret = false;
-    if (stmt == NULL)
-        return ret;
-
-    int var = stmt->variant();    
-    if (var == SPF_ANALYSIS_DIR || var == SPF_PARALLEL_DIR || var == SPF_TRANSFORM_DIR || var == SPF_PARALLEL_REG_DIR || var == SPF_END_PARALLEL_REG_DIR)
-        stmt = stmt->lexNext();
-        
-    SgForStmt *forS = isSgForStmt(stmt);
-    if (forS)
-    {
-        SgStatement *end = forS->lastNodeOfStmt();
-        for (; stmt != end && !ret; stmt = stmt->lexNext())
-            if (stmt->variant() == FOR_NODE)
-                if (isSgForStmt(stmt)->symbol()->identifier() == symb)
-                    ret = true;
-    }
-
-    return ret;
-}
-
-
-template<typename fillType> void fillPrivatesFromComment(Statement *st, std::set<fillType> &privates, int type = -1);
-
-inline void Warning(const char *s, const wchar_t *s1, const char *t, int num, SgStatement *stmt)
-{
-    //TODO: is it correct?
-    if (stmt == NULL)
-        return;
-
-    if (num == PRIVATE_ANALYSIS_REMOVE_VAR)
-    {
-        SgStatement *found = SgStatement::getStatementByFileAndLine(string(stmt->fileName()), stmt->lineNumber());
-        if (found != NULL)
-        {
-            if (ifVarIsLoopSymb(found, t))
-                return;
-        }
-
-        set<string> privates;
-        fillPrivatesFromComment(new Statement(stmt), privates);
-        if (privates.find(t) != privates.end())
-            return;
-    }
-
-    
-    int line;
-    auto retVal = getText(s, s1, t, num, stmt, line);
-    printLowLevelWarnings(stmt->fileName(), line, retVal.first.c_str(), retVal.second.c_str(), 1029);
-}
-
-inline void Note(const char *s, const wchar_t *s1, const char *t, int num, SgStatement *stmt)
-{    
-    int line;
-    auto retVal = getText(s, s1, t, num, stmt, line);
-    printLowLevelNote(stmt->fileName(), line, retVal.first.c_str(), retVal.second.c_str(), 1030);
-}
-#endif
-
-// local functions
-static ControlFlowItem* getControlFlowList(SgStatement*, SgStatement*, ControlFlowItem**, SgStatement**, doLoops*, CallData*, CommonData*);
-static ControlFlowItem* processOneStatement(SgStatement** stmt, ControlFlowItem** pred, ControlFlowItem **list, ControlFlowItem* oldcur, doLoops*, CallData*, CommonData*);
-static ControlFlowItem* switchItem(SgStatement* stmt, ControlFlowItem* empty, SgStatement** lastAnStmt, doLoops* loops, CallData* calls, CommonData*);
-static ControlFlowItem* ifItem(SgStatement*, ControlFlowItem*, SgStatement** lastAnStmt, doLoops* loops, bool ins, CallData*, CommonData*);
-static void setLeaders(ControlFlowItem*);
-static void clearList(ControlFlowItem*);
-static void fillLabelJumps(ControlFlowItem*);
-static SgExpression* GetProcedureArgument(bool isF, void* f, int i);
-static int GetNumberOfArguments(bool isF, void* f);
-#if ACCAN_DEBUG
-static void printControlFlowList(ControlFlowItem*, ControlFlowItem* last = NULL);
-#endif
-
-//static ControlFlowGraph* GetControlFlowGraphWithCalls(bool, SgStatement*, CallData*, CommonData*);
-//static void FillCFGSets(ControlFlowGraph*);
-static void FillPrivates(ControlFlowGraph*);
-static ControlFlowItem* AddFunctionCalls(SgStatement*, CallData*, ControlFlowItem**, CommonData*);
-
-const char* is_correct = NULL;
-const char* failed_proc_name = NULL;
-static PrivateDelayedItem* privateDelayedList = NULL;
-static AnalysedCallsList* currentProcedure = NULL;
-static AnalysedCallsList* mainProcedure = NULL;
-static DoLoopDataList* doLoopList = NULL;
-static CommonData* pCommons;
-static CallData* pCalls;
-
-int total_privates = 0;
-int total_pl = 0;
-
-static const IntrinsicSubroutineData intrinsicData[] = {
-    {"date_and_time", 4, { {-1, "date", INTRINSIC_OUT}, {-1, "time", INTRINSIC_OUT }, {-1, "zone", INTRINSIC_OUT }, {-1, "values", INTRINSIC_OUT } } },
-    {"mod", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"dvtime", 0, {}},
-    {"abs", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"max", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"min", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"wtime", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"dble", 1, { {1, NULL, INTRINSIC_IN } } },
-    {"dabs", 1, { {1, NULL, INTRINSIC_IN } } },
-    {"dmax1", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN } } },
-    {"dmin1", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN } } },
-    {"dsqrt", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"dcos", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"datan2", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"dsign", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"dlog", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"dexp", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"omp_get_wtime", 0, {}},
-    {"sqrt", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"int", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"iabs", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"fnpr", 4, { {1, NULL, INTRINSIC_IN},{ 2, NULL, INTRINSIC_IN },{ 3, NULL, INTRINSIC_IN },{ 4, NULL, INTRINSIC_IN } } },
-    {"isnan", 1, { {1, NULL, INTRINSIC_IN } } }
-};
-
-//TODO: it does not work
-//static map<SgStatement*, tuple<ControlFlowGraph*, CallData*, CommonData*>> CFG_cache;
-
-
-static bool isIntrinsicFunctionNameACC(char* name)
-{
-#if USE_INTRINSIC_DVM_LIST
-    return isIntrinsicFunctionName(name);
-#else
-    return false;
-#endif
-}
-
-int SwitchFile(int file_id)
-{
-    if (file_id == current_file_id || file_id == -1)
-        return file_id;
-    int stored_file_id = current_file_id;
-    current_file_id = file_id;
-    current_file = &(CurrentProject->file(current_file_id));
-    return stored_file_id;
-}
-
-SgStatement * lastStmtOfDoACC(SgStatement *stdo)
-{
-    // is a copied function
-    SgStatement *st;
-    // second version  (change 04.03.08) 
-    st = stdo;
-RE: st = st->lastNodeOfStmt();
-    if ((st->variant() == FOR_NODE) || (st->variant() == WHILE_NODE))
-        goto RE;
-
-    else if (st->variant() == LOGIF_NODE)
-        return(st->lexNext());
-
-    else
-        return(st);
-
-}
-
-#ifdef __SPF
-bool IsPureProcedureACC(SgSymbol* s)
-#else
-static bool IsPureProcedureACC(SgSymbol* s)
-#endif
-{
-    // is a copied function
-    SgSymbol *shedr = NULL;
-
-    shedr = GetProcedureHeaderSymbol(s);
-    if (shedr)
-        return(shedr->attributes() & PURE_BIT);
-    else
-        return 0;
-}
-
-static bool IsUserFunctionACC(SgSymbol* s)
-{
-    // is a copied function
-    return(s->attributes() & USER_PROCEDURE_BIT);
-}
-
-static const IntrinsicSubroutineData* IsAnIntrinsicSubroutine(const char* name)
-{
-    for (int i = 0; i < sizeof(intrinsicData) / sizeof(intrinsicData[0]); i++)
-        if (strcmp(name, intrinsicData[i].name) == 0)
-            return &(intrinsicData[i]);
-    return NULL;
-}
-
-static SgExpression* CheckIntrinsicParameterFlag(const char* name, int arg, SgExpression* p, unsigned char flag)
-{
-    const IntrinsicSubroutineData* info = IsAnIntrinsicSubroutine(name);
-    if (!info)
-        return NULL; //better avoid this
-    for (int i = 0; i < info->args; i++) 
-    {
-        const IntrinsicParameterData* pd = &(info->parameters[i]);
-        if (pd->index == arg + 1)
-            return (pd->status & flag) != 0 ? p : NULL;
-
-        SgKeywordArgExp* kw = isSgKeywordArgExp(p);
-        if (kw) 
-        {
-            SgExpression* a = kw->arg();
-            SgExpression* val = kw->value();
-            if (pd->name && strcmp(a->unparse(), pd->name) == 0)
-                return (pd->status & flag) != 0 ? val : NULL;
-        }
-    }
-    return NULL;
-}
-/*
-//For parameters replacements in expressions
-//#ifdef __SPF
-
-VarsKeeper varsKeeper;
-
-SgExpression* GetValueOfVar(SgExpression* var)
-{
-    return varsKeeper.GetValueOfVar(var);
-}
-
-void VarsKeeper::GatherVars(SgStatement* start)
-{
-    pCommons = &(data->commons);
-    pCalls = &(data->calls);
-    currentProcedure = data->calls.AddHeader(start, false, start->symbol());
-    mainProcedure = currentProcedure;
-    //stage 1: preparing graph data
-    data->graph = GetControlFlowGraphWithCalls(true, start, &(data->calls), &(data->commons));
-    data->calls.AssociateGraphWithHeader(start, data->graph);
-    data->commons.MarkEndOfCommon(currentProcedure);
-    //calls.printControlFlows();
-    //stage 2: data flow analysis
-    FillCFGSets(data->graph);
-    //stage 3: fulfilling loop data
-    FillPrivates(data->graph);
-
-    if (privateDelayedList)
-            delete privateDelayedList;
-        privateDelayedList = NULL;
-}
-
-SgExpression* VarsKeeper::GetValueOfVar(SgExpression* var)
-{
-    FuncData* curData = data;
-}
-
-//#endif
-*/
-
-
-
-void SetUpVars(CommonData* commons, CallData* calls, AnalysedCallsList* m, DoLoopDataList* list)
-{
-    pCommons = commons;
-    pCalls = calls;
-    currentProcedure = m;
-    mainProcedure = currentProcedure;
-    doLoopList = list;
-}
-
-AnalysedCallsList* GetCurrentProcedure()
-{
-    return currentProcedure;
-}
-//interprocedural analysis, called for main procedure
-void Private_Vars_Analyzer(SgStatement* start)
-{
-#ifndef __SPF 
-    if (!options.isOn(PRIVATE_ANALYSIS)) {
-        return;
-    }
-#endif
-    CallData calls;
-    CommonData commons;
-    DoLoopDataList doloopList;
-    SetUpVars(&commons, &calls, calls.AddHeader(start, false, start->symbol(), current_file_id), &doloopList);
-
-    //stage 1: preparing graph data
-    ControlFlowGraph* CGraph = GetControlFlowGraphWithCalls(true, start, &calls, &commons);
-    calls.AssociateGraphWithHeader(start, CGraph);
-    commons.MarkEndOfCommon(currentProcedure);
-        
-    currentProcedure->graph->getPrivate();
-#if ACCAN_DEBUG
-    calls.printControlFlows();
-#endif
-    //stage 2: data flow analysis
-    FillCFGSets(CGraph);
-    //stage 3: fulfilling loop data
-    FillPrivates(CGraph);
-
-    //test: graphvis
-    /*std::fstream fs;
-    fs.open("graph_old.txt", std::fstream::out);
-    fs << CGraph->GetVisualGraph(&calls);
-    fs.close();*/
-
-#if !__SPF
-    delete CGraph;
-#endif
-
-    if (privateDelayedList)
-        delete privateDelayedList;
-    privateDelayedList = NULL;
-}
-
-CallData::~CallData()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    /*
-    for (AnalysedCallsList* l = calls_list; l != NULL;) 
-    {
-        if (!l->isIntrinsic && l->graph)
-        {
-            if (l->graph->RemoveRef() && !l->graph->IsMain())
-            {
-                delete l->graph;
-                l->graph = NULL;
-            }
-        }
-        AnalysedCallsList *temp = l;
-        l = l->next;
-        delete temp;
-        temp = NULL;
-    }*/
-}
-
-CommonData::~CommonData()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    for (CommonDataItem* i = list; i != NULL;) {
-        for (CommonVarInfo* info = i->info; info != NULL;) {
-            CommonVarInfo* t = info;
-            info = info->next;
-            delete t;
-        }
-        CommonDataItem* tp = i;
-        i = i->next;
-        delete tp;
-    }
-}
-
-ControlFlowGraph::~ControlFlowGraph()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    while (common_def != NULL) 
-    {
-        CommonVarSet* t = common_def;
-        common_def = common_def->next;
-        delete t;
-    }
-    while (common_use != NULL) 
-    {
-        CommonVarSet* t = common_use;
-        common_use = common_use->next;
-        delete t;
-    }
-
-    if (def)
-        delete def;    
-
-    if (use)
-        delete use;   
-
-    if (!temp && pri)
-        delete pri;    
-
-    for (CBasicBlock *bb = first; bb != NULL;) 
-    {
-        CBasicBlock *tmp = bb;
-        bb = bb->getLexNext();
-            
-        delete tmp;
-        tmp = NULL;
-    }
-}
-
-CBasicBlock::~CBasicBlock()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif    
-
-    CommonVarSet* d = getCommonDef();
-    while (d != NULL) 
-    {
-        CommonVarSet* t = d;
-        d = d->next;
-        delete t;
-    }
-
-    d = getCommonUse();
-    while (d != NULL) 
-    {
-        CommonVarSet* t = d;
-        d = d->next;
-        delete t;
-    }
-
-    for (BasicBlockItem* bbi = prev; bbi != NULL;)
-    {
-        BasicBlockItem *tmp = bbi;
-        bbi = bbi->next;
-        delete tmp;
-        tmp = NULL;
-    }
-
-    for (BasicBlockItem *bbi = succ; bbi != NULL;)
-    {
-        BasicBlockItem *tmp = bbi;
-        bbi = bbi->next;
-        delete tmp;
-        tmp = NULL;
-    }
-
-    if (def)
-        delete def;    
-
-    if (use)
-        delete use;    
-
-    if (old_mrd_out)
-        delete old_mrd_out;
-    
-    if (old_mrd_in)
-        delete old_mrd_in;
-    
-    if (mrd_in)
-        delete mrd_in;
-    
-    if (mrd_out)
-        delete mrd_out;
-    
-    if (old_lv_out)
-        delete old_lv_out;
-    
-    if (old_lv_in)
-        delete old_lv_in;
-    
-    if (lv_in)
-        delete lv_in;
-    
-    if (lv_out)
-        delete lv_out;
-}
-
-doLoops::~doLoops()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    for (doLoopItem *it = first; it != NULL; ) 
-    {
-        doLoopItem *tmp = it;
-        it = it->getNext();
-        delete tmp;
-    }
-}
-
-PrivateDelayedItem::~PrivateDelayedItem()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    if (delay)
-        delete delay;
-    if (next)
-        delete next;    
-}
-
-VarSet::~VarSet()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-    for (VarItem* it = list; it != NULL;) 
-    {
-        VarItem* tmp = it;
-        it = it->next;
-        if (tmp->var)
-            if (tmp->var->RemoveReference())
-                delete tmp->var;
-        delete tmp;
-    }
-}
-
-CommonVarSet::CommonVarSet(const CommonVarSet& c)
-{    
-    cvd = c.cvd;
-    if (c.next)
-        next = new CommonVarSet(*c.next);
-    else
-        next = NULL;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 22);
-#endif
-}
-
-std::string ControlFlowGraph::GetVisualGraph(CallData* calls)
-{
-    std::string result;
-    result += "digraph ";
-    char tmp[512];
-    AnalysedCallsList* cd = calls->GetDataForGraph(this);
-    //if (cd == NULL || cd->header == NULL)
-        sprintf(tmp, "g_%llx", (uintptr_t)this);
-    //else
-    //    sprintf(tmp, "g_%500s", cd->header->symbol());
-    result += tmp;
-    result += "{ \n";
-    for (CBasicBlock* b = this->first; b != NULL; b = b->getLexNext()) {
-        if (!b->IsEmptyBlock()) {
-            result += '\t' + b->GetGraphVisDescription() + "[shape=box,label=\"";
-            result += b->GetGraphVisData() + "\"];\n";
-        }
-    }
-    for (CBasicBlock* b = first; b != NULL; b = b->getLexNext()) {
-        if (!b->IsEmptyBlock())
-            result += b->GetEdgesForBlock(b->GetGraphVisDescription(), true, "");
-    }
-    result += '}';
-    ResetDrawnStatusForAllItems();
-    return result;
-}
-
-void ControlFlowGraph::ResetDrawnStatusForAllItems() {
-    for (CBasicBlock* b = first; b != NULL; b = b->getLexNext()) {
-        for (ControlFlowItem* it = b->getStart(); it != NULL && (it->isLeader() == false || it == b->getStart()); it = it->getNext()) {
-            it->ResetDrawnStatus();
-        }
-    }
-}
-
-std::string GetConditionWithLineNumber(ControlFlowItem* eit)
-{
-    std::string res;
-    if (eit->getOriginalStatement()) {
-        char tmp[16];
-        sprintf(tmp, "%d: ", eit->getOriginalStatement()->lineNumber());
-        res = tmp;
-    }
-    return res + eit->getExpression()->unparse();
-}
-
-std::string GetActualCondition(ControlFlowItem** pItem) {
-    std::string res = "";
-    ControlFlowItem* eit = *pItem;
-    while (true) 
-    {
-        if (eit == NULL || eit->getJump() != NULL || eit->getStatement() != NULL) 
-        {
-            if (eit && eit->getJump() != NULL) 
-            {
-                if (eit->getExpression() != NULL) 
-                {
-                    *pItem = eit;
-                    return GetConditionWithLineNumber(eit);
-                }
-                else 
-                {
-                    *pItem = NULL;
-                    return res;
-                }
-                break;
-            }
-            *pItem = NULL;
-            return res;
-        }
-        eit = eit->GetPrev();
-    }
-    return res;
-}
-
-std::string CBasicBlock::GetEdgesForBlock(std::string name, bool original, std::string modifier)
-{
-    std::string result;
-    for (BasicBlockItem* it = getSucc(); it != NULL; it = it->next) {
-        if (it->drawn)
-            continue;
-        it->drawn = true;
-        char lo = original;
-        std::string cond;
-        ControlFlowItem* eit = NULL;
-        bool pf = false;
-        if (it->jmp != NULL) {
-            if (it->jmp->getExpression() != NULL) {
-                eit = it->jmp;
-                cond = GetConditionWithLineNumber(eit);
-            }
-            else {
-                pf = true;
-                eit = it->jmp->GetPrev();
-                cond = GetActualCondition(&eit);
-            }
-        }
-        if (eit && eit->GetFriend()) {
-            lo = false;
-            eit = eit->GetFriend();
-        }
-        if (!it->block->IsEmptyBlock() || cond.length() != 0) {
-            if (cond.length() != 0 && eit && !pf){
-                char tmp[32];
-                sprintf(tmp, "c_%llx", (uintptr_t)eit);
-                if (!eit->IsDrawn()) {
-                    result += '\t';
-                    result += tmp;
-                    result += "[shape=diamond,label=\"";
-                    result += cond;
-                    result += "\"];\n";
-                }
-                if (it->cond_value && !pf) {
-                    result += '\t' + name + "->";
-                    result += tmp;
-                    result += modifier;
-                    result += '\n';
-                }
-                eit->SetIsDrawn();
-            }
-            if (cond.length() != 0) {
-                if (lo) {
-                    char tmp[32];
-                    sprintf(tmp, "c_%llx", (uintptr_t)eit);
-                    if (!it->block->IsEmptyBlock()) {
-                        result += '\t';
-                        result += tmp;
-                        result += "->" + it->block->GetGraphVisDescription();
-                        result += "[label=";
-                        result += (!pf && it->cond_value) ? "T]" : "F]";
-                        result += ";\n";
-                    }
-                    else {
-                        std::string n = tmp;
-                        std::string label;
-                        label += "[label=";
-                        label += (!pf && it->cond_value) ? "T]" : "F]";
-                        result += it->block->GetEdgesForBlock(n, original, label);
-                    }
-                }
-            }
-            else {
-                result += '\t' + name + " -> " + it->block->GetGraphVisDescription();
-                result += modifier;
-                result += ";\n";
-            }
-            
-        }
-        else {
-            result += it->block->GetEdgesForBlock(name, original, "");
-        }
-    }
-    return result;
-}
-
-std::string CBasicBlock::GetGraphVisDescription()
-{
-    if (visname.length() != 0)
-        return visname;
-    char tmp[16];
-    sprintf(tmp, "%d", num);
-    visname = tmp;
-    return visname;
-}
-
-std::string CBasicBlock::GetGraphVisData()
-{
-    if (visunparse.length() != 0)
-        return visunparse;
-    std::string result;
-    for (ControlFlowItem* it = start; it != NULL && (it->isLeader() == false || it == start); it = it->getNext()) {
-        if (it->getStatement() != NULL) {
-            int ln = it->GetLineNumber();
-            char tmp[16];
-            sprintf(tmp, "%d: ", ln);
-            result += tmp;
-            result += it->getStatement()->unparse();
-        }
-    }
-    visunparse = result;
-    return result;
-}
-
-int ControlFlowItem::GetLineNumber()
-{
-    if (getStatement() == NULL)
-        return 0;
-    if (getStatement()->lineNumber() == 0){
-        if (getOriginalStatement() == NULL)
-            return 0;
-        return getOriginalStatement()->lineNumber();
-    }
-    return getStatement()->lineNumber();
-}
-
-bool CBasicBlock::IsEmptyBlock()
-{
-    for (ControlFlowItem* it = start; it != NULL && (it->isLeader() == false || it == start); it = it->getNext()) {        
-        if (!it->IsEmptyCFI())
-            return false;
-    }
-    return true;
-}
-
-AnalysedCallsList* CallData::GetDataForGraph(ControlFlowGraph* s)
-{
-    for (AnalysedCallsList* it = calls_list; it != NULL; it = it->next) {
-        if (it->graph == s)
-            return it;
-    }
-    return NULL;
-}
-
-ControlFlowGraph* GetControlFlowGraphWithCalls(bool main, SgStatement* start, CallData* calls, CommonData* commons)
-{
-    if (start == NULL) 
-    {
-        //is_correct = "no body for call found";
-        return NULL;
-    }
-
-    ControlFlowGraph *cfgRet = NULL;
-    /*
-#if __SPF
-    auto itF = CFG_cache.find(start);
-    if (itF != CFG_cache.end())
-    {
-        calls = std::get<1>(itF->second);
-        commons = std::get<2>(itF->second);
-        return std::get<0>(itF->second);
-    }
-#endif*/
-    doLoops l;
-    ControlFlowItem *funcGraph = getControlFlowList(start, start->lastNodeOfStmt(), NULL, NULL, &l, calls, commons);
-    fillLabelJumps(funcGraph);
-    setLeaders(funcGraph);
-
-    
-    cfgRet = new ControlFlowGraph(false, main, funcGraph, NULL);
-    //CFG_cache[start] = std::make_tuple(cfgRet, calls, commons);
-    return cfgRet;
-}
-
-void FillCFGSets(ControlFlowGraph* graph)
-{
-    graph->privateAnalyzer();
-}
-
-static void ClearMemoryAfterDelay(ActualDelayedData* d)
-{
-    while (d != NULL) {
-        CommonVarSet* cd = d->commons;
-        while (cd != NULL) {
-            CommonVarSet* t = cd;
-            cd = cd->next;
-            delete t;
-        }
-        delete d->buse;
-        ActualDelayedData* tmp = d;
-        d = d->next;
-        delete tmp;
-    }
-}
-
-static void FillPrivates(ControlFlowGraph* graph)
-{
-    ActualDelayedData* d = graph->ProcessDelayedPrivates(pCommons, mainProcedure, NULL, NULL, false, -1);
-    ClearMemoryAfterDelay(d);
-    if (privateDelayedList)
-        privateDelayedList->PrintWarnings();
-}
-
-ActualDelayedData* CBasicBlock::GetDelayedDataForCall(CallAnalysisLog* log)
-{
-    for (ControlFlowItem* it = start; it != NULL && (!it->isLeader() || it == start); it = it->getNext())
-    {
-        AnalysedCallsList* c = it->getCall();
-        void* cf = it->getFunctionCall();
-        bool isFun = true;
-        if (!cf) {
-            cf = it->getStatement();
-            isFun = false;
-        }
-        if (c != NULL && c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c->graph != NULL)
-            return c->graph->ProcessDelayedPrivates(pCommons, c, log, cf, isFun, it->getProc()->file_id);
-    }
-    return NULL;
-}
-
-void PrivateDelayedItem::MoveFromPrivateToLastPrivate(CVarEntryInfo* var)
-{
-    VarItem* el = detected->belongs(var);
-    if (el) {
-        eVariableType storedType = el->var->GetVarType();
-        detected->remove(el->var);
-        lp->addToSet(var, NULL);
-    }
-}
-
-void ActualDelayedData::RemoveVarFromCommonList(CommonVarSet* c)
-{
-    if (commons == NULL || c == NULL)
-        return;
-    if (c == commons) 
-    {
-        commons = commons->next;
-        delete c;
-        return;
-    }
-    CommonVarSet* prev = c;
-    for (CommonVarSet* cur = c->next; cur != NULL; cur = cur->next) 
-    {
-        if (cur == c) 
-        {
-            prev->next = c->next;
-            delete c;
-            return;
-        }
-        else 
-            prev = cur;        
-    }
-}
-
-void ActualDelayedData::MoveVarFromPrivateToLastPrivate(CVarEntryInfo* var, CommonVarSet* c, VarSet* vs)
-{
-    original->MoveFromPrivateToLastPrivate(var);
-    RemoveVarFromCommonList(c);
-    if (vs) 
-    {
-        if (vs->belongs(var))
-            vs->remove(var);
-    }
-}
-
-int IsThisVariableAParameterOfSubroutine(AnalysedCallsList* lst, SgSymbol* s)
-{
-    if (!lst->header)
-        return -1;
-    int stored = SwitchFile(lst->file_id);
-    SgProcHedrStmt* h = isSgProcHedrStmt(lst->header);
-    if (!h)
-        return -1;
-    for (int i = 0; i < h->numberOfParameters(); i++) {
-        SgSymbol* par = h->parameter(i);
-        if (par == s) {
-            SwitchFile(stored);
-            return i;
-        }
-    }
-    SwitchFile(stored);
-    return -1;
-}
-
-ActualDelayedData* ControlFlowGraph::ProcessDelayedPrivates(CommonData* commons, AnalysedCallsList* call, CallAnalysisLog* log, void* c, bool isFun, int file_id)
-{
-    for (CallAnalysisLog* i = log; i != NULL; i = i->prev) {
-        if (i->el == call) 
-        {
-            //TODO: add name of common
-#if __SPF
-            const wchar_t* rus = R158;
-            Warning("Recursion is not analyzed for privates in common blocks '%s'", rus, "TODO!", PRIVATE_ANALYSIS_NO_RECURSION_ANALYSIS, call->header);
-#else
-            Warning("Recursion is not analyzed for privates in common blocks '%s'", "TODO!", PRIVATE_ANALYSIS_NO_RECURSION_ANALYSIS, call->header);
-#endif
-            return NULL;
-        }
-    }
-    CallAnalysisLog* nl = new CallAnalysisLog();
-    nl->el = call;
-    nl->prev = log;
-    if (log == NULL)
-        nl->depth = 0;
-    else
-        nl->depth = log->depth + 1;
-    log = nl;
-    ActualDelayedData* my = NULL;
-    for (CBasicBlock* bb = first; bb != NULL; bb = bb->getLexNext()) {
-        if (bb->containsParloopStart()) {
-            if (bb->GetDelayedData()) {
-                ActualDelayedData* data = new ActualDelayedData();
-                data->original = bb->GetDelayedData();
-                data->commons = commons->GetCommonsForVarSet(data->original->getDetected(), call);
-                VarSet* bu = new VarSet();
-                bu->unite(data->original->getDelayed(), false);
-                VarSet* tbu = new VarSet();
-                while (!bu->isEmpty()) {
-                    if (IS_BY_USE(bu->getFirst()->var->GetSymbol()))
-                        tbu->addToSet(bu->getFirst()->var, NULL);
-                    else {
-                        CVarEntryInfo* old = bu->getFirst()->var;
-                        int arg_id = IsThisVariableAParameterOfSubroutine(call, bu->getFirst()->var->GetSymbol());
-                        if (arg_id != -1 && c != NULL) {
-                            int stored = SwitchFile(file_id);
-                            SgExpression* exp = GetProcedureArgument(isFun, c, arg_id);
-                            if (isSgVarRefExp(exp) || isSgArrayRefExp(exp)) {
-                                SgSymbol* sym = exp->symbol();
-                                CVarEntryInfo* v;
-                                if (isSgVarRefExp(exp)) {
-                                    v = new CScalarVarEntryInfo(sym);
-                                }
-                                else {
-                                    v = old->Clone(sym);
-                                }
-                                tbu->addToSet(v, NULL, old);
-                            }
-                            SwitchFile(stored);
-                            
-                        }
-                    }
-                    bu->remove(bu->getFirst()->var);
-                }
-                data->buse = tbu;
-                delete bu;
-                data->next = my;
-                data->call = call;
-                my = data;
-            }
-        }
-        ActualDelayedData* calldata = bb->GetDelayedDataForCall(log);
-        while (calldata != NULL) {
-            CommonVarSet* nxt = NULL;
-            for (CommonVarSet* t = calldata->commons; t != NULL; t = nxt) {
-                nxt = t->next;
-                CommonVarInfo* cvd = t->cvd;
-                CommonDataItem* d = commons->IsThisCommonUsedInProcedure(cvd->parent, call);
-                if (!d || commons->CanHaveNonScalarVars(d))
-                    continue;
-                CommonVarInfo* j = cvd->parent->info;
-                CommonVarInfo* i = d->info;
-                while (j != cvd) {
-                    j = j->next;
-                    if (i)
-                        i = i->next;
-                }
-                if (!i)
-                    continue;
-                CVarEntryInfo* var = i->var;
-                if (bb->getLexNext()->getLiveIn()->belongs(var->GetSymbol()) && calldata->original->getDelayed()->belongs(cvd->var)) {
-                    calldata->MoveVarFromPrivateToLastPrivate(cvd->var, t, NULL);
-                }
-                if (bb->IsVarDefinedAfterThisBlock(var, false)) {
-                    calldata->RemoveVarFromCommonList(t);
-                }
-                
-            }
-            if (log->el->header == calldata->call->header) {
-                VarSet* pr = new VarSet();
-                pr->unite(calldata->original->getDelayed(), false);
-                pr->intersect(bb->getLexNext()->getLiveIn(), false, true);
-                for (VarItem* exp = pr->getFirst(); exp != NULL; pr->getFirst()) {
-                    calldata->MoveVarFromPrivateToLastPrivate(exp->var, NULL, NULL);
-                    pr->remove(exp->var);
-                }
-                delete pr;
-            }
-            VarSet* tmp_use = new VarSet();
-            tmp_use->unite(calldata->buse, false);
-            while (!tmp_use->isEmpty()) {
-                VarItem* v = tmp_use->getFirst();
-                CVarEntryInfo* tmp = v->var->Clone(OriginalSymbol(v->var->GetSymbol()));
-                if (bb->getLexNext()->getLiveIn()->belongs(tmp->GetSymbol(), true)) {
-                    calldata->MoveVarFromPrivateToLastPrivate(v->ov ? v->ov : v->var, NULL, calldata->buse);
-                }
-                if (bb->IsVarDefinedAfterThisBlock(v->var, true)) {
-                    calldata->buse->remove(v->ov ? v->ov : v->var);
-                }
-                delete tmp;
-                tmp_use->remove(v->var);
-            }
-            delete tmp_use;
-            ActualDelayedData* tmp = calldata->next;
-            calldata->next = my;
-            my = calldata;
-            calldata = tmp;
-        }
-    }
-    nl = log;
-    log = log->prev;
-
-    delete nl;
-    return my;
-}
-
-extern graph_node* node_list;
-void Private_Vars_Function_Analyzer(SgStatement* start);
-
-void Private_Vars_Project_Analyzer()
-{
-    graph_node* node = node_list;
-    while (node) {
-        if (node->st_header) {
-            int stored_file_id = SwitchFile(node->file_id);
-            Private_Vars_Function_Analyzer(node->st_header);
-            SwitchFile(stored_file_id);
-        }
-        node = node->next;
-    }
-}
-
-// CALL function for PRIVATE analyzing
-void Private_Vars_Function_Analyzer(SgStatement* start)
-{
-    //temporary state
-#ifndef __SPF 
-    if (!options.isOn(PRIVATE_ANALYSIS)){
-        return;
-    }
-#endif
-
-    if (start->variant() == PROG_HEDR) {
-        Private_Vars_Analyzer(start);
-    }
-    /*
-    ControlFlowItem* funcGraph = getControlFlowList(start, start->lastNodeOfStmt(), NULL, NULL, new doLoops());
-    fillLabelJumps(funcGraph);
-    setLeaders(funcGraph);
-#if ACCAN_DEBUG
-    printControlFlowList(funcGraph);
-#endif
-    ControlFlowItem* p = funcGraph;
-    ControlFlowItem* pl_start = NULL;
-    ControlFlowItem* pl_end = NULL;
-    ControlFlowGraph* graph = new ControlFlowGraph(funcGraph, NULL);
-    graph->privateAnalyzer();
-    */
-}
-/*
-// CALL function for PRIVATE analyzing
-void Private_Vars_Analyzer(SgStatement *firstSt, SgStatement *lastSt)
-{
-    // temporary state
-    //return;
-    SgExpression* par_des = firstSt->expr(2);
-    SgSymbol* l;
-    SgForStmt* chk;
-    int correct = 1;
-    firstSt = firstSt->lexNext();
-    while (correct && (par_des != NULL) && (par_des->lhs() != NULL) && ((l = par_des->lhs()->symbol()) != NULL)){
-        if (firstSt->variant() == FOR_NODE){
-            chk = isSgForStmt(firstSt);
-            if (chk->symbol() != l)
-                correct = 0;
-            firstSt = firstSt->lexNext();
-            par_des = par_des->rhs();
-        }
-        else{
-            correct = 0;
-        }
-    }
-    if (correct){
-        doLoops* loops = new doLoops();
-        ControlFlowItem* cfList = getControlFlowList(firstSt, lastSt, NULL, NULL, loops);
-        fillLabelJumps(cfList);
-        setLeaders(cfList);
-#if ACCAN_DEBUG
-        printControlFlowList(cfList);
-#endif
-        VarSet* priv = ControlFlowGraph(cfList, NULL).getPrivate();
-#if ACCAN_DEBUG
-        priv->print();
-#endif
-        clearList(cfList);
-    }
-}
-*/
-
-static void fillLabelJumps(ControlFlowItem* cfList)
-{
-    if (cfList != NULL){
-        ControlFlowItem* temp = cfList;
-        ControlFlowItem* temp2;
-        unsigned int label_no = 0;
-        while (temp != NULL){
-            if (temp->getLabel() != NULL)
-                label_no++;
-            temp = temp->getNext();
-        }
-        LabelCFI* table = new LabelCFI[label_no + 1];
-        unsigned int li = 0;
-        for (temp = cfList; temp != NULL; temp = temp->getNext()){
-            SgLabel* label;
-            if ((label = temp->getLabel()) != NULL){
-                table[li].item = temp;
-                table[li++].l = label->id();
-            }
-            temp2 = temp;
-        }
-        temp = new ControlFlowItem(currentProcedure);
-        temp2->AddNextItem(temp);
-        table[label_no].item = temp2;
-        table[label_no].l = -1;
-        for (temp = cfList; temp != NULL; temp = temp->getNext()){
-            SgLabel* jump = temp->getLabelJump();
-            int l;
-            if (jump != NULL){
-                l = jump->id();
-                for (unsigned int i = 0; i < label_no + 1; i++){
-                    if (table[i].l == l || i == label_no){
-                        temp->initJump(table[i].item);
-                        break;
-                    }
-                }
-            }
-        }
-        delete[] table;
-    }
-}
-
-static void setLeaders(ControlFlowItem* cfList)
-{
-    if (cfList != NULL)
-        cfList->setLeader();
-    while (cfList != NULL)
-    {
-        if (cfList->getJump() != NULL)
-        {
-            cfList->getJump()->setLeader();
-            if (cfList->getNext() != NULL)
-                cfList->getNext()->setLeader();
-        }
-        if (cfList->getCall() != NULL)
-        {
-            if (cfList->getNext() != NULL)
-                cfList->getNext()->setLeader();
-        }
-        cfList = cfList->getNext();
-    }
-}
-
-static void clearList(ControlFlowItem *list)
-{
-    if (list != NULL)
-    {
-        if (list->getNext() != NULL)
-            clearList(list->getNext());
-
-        delete list;
-    }
-}
-
-static ControlFlowItem* ifItem(SgStatement* stmt, ControlFlowItem* empty, SgStatement** lastAnStmt, doLoops* loops, bool ins, CallData* calls, CommonData* commons)
-{
-    if (stmt == NULL)
-        return empty;
-    SgIfStmt* cond;
-    if (stmt->variant() == ELSEIF_NODE)
-        cond = (SgIfStmt*)stmt;
-    if (stmt->variant() == ELSEIF_NODE || (!ins && (cond = isSgIfStmt(stmt)) != NULL))
-    {
-        SgExpression* c = &(SgNotOp((cond->conditional()->copy())));
-        ControlFlowItem *n, *j;
-        ControlFlowItem* last;
-        if ((n = getControlFlowList(cond->trueBody(), NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
-            return NULL;
-        j = ifItem(cond->falseBody(), empty, lastAnStmt, loops, cond->falseBody() != NULL ? cond->falseBody()->variant() == IF_NODE : false, calls, commons);
-        ControlFlowItem* gotoEmpty = new ControlFlowItem(NULL, empty, j, NULL, currentProcedure);
-        if (last != NULL)
-            last->AddNextItem(gotoEmpty);
-        else
-            n = gotoEmpty;
-        ControlFlowItem* tn = new ControlFlowItem(c, j, n, stmt->label(), currentProcedure);
-        tn->setOriginalStatement(stmt);
-        return tn;
-    }
-    else
-    {
-        ControlFlowItem* last;
-        ControlFlowItem* ret;
-        if ((ret = getControlFlowList(stmt, NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
-            return NULL;
-        last->AddNextItem(empty);
-        return ret;
-    }
-}
-
-static ControlFlowItem* switchItem(SgStatement* stmt, ControlFlowItem* empty, SgStatement** lastAnStmt, doLoops* loops, CallData* calls, CommonData* commons)
-{
-    SgSwitchStmt* sw = isSgSwitchStmt(stmt);
-    SgExpression* sw_cond = (sw->selector());
-    stmt = stmt->lexNext();
-    *lastAnStmt = stmt;
-    ControlFlowItem* last_sw = NULL;
-    ControlFlowItem* first = NULL;
-    bool is_def_last = false;
-    SgStatement* not_def_last;
-    while (stmt->variant() == CASE_NODE || stmt->variant() == DEFAULT_NODE)
-    {
-        if (stmt->variant() == DEFAULT_NODE){
-            while (stmt->variant() != CONTROL_END && stmt->variant() != CASE_NODE)
-                stmt = stmt->lexNext();
-            if (stmt->variant() == CONTROL_END)
-                stmt = stmt->lexNext();
-            is_def_last = true;
-            continue;
-        }
-        SgExpression* c = ((SgCaseOptionStmt*)stmt)->caseRange(0);
-        SgExpression *lhs = NULL;
-        SgExpression *rhs = NULL;
-        if (c->variant() == DDOT){
-            lhs = c->lhs();
-            rhs = c->rhs();
-            if (rhs == NULL)
-                c = &(*lhs <= *sw_cond);
-            else if (lhs == NULL)
-                c = &(*sw_cond <= *rhs);
-            else
-                c = &(*lhs <= *sw_cond && *sw_cond <= *rhs);
-        }
-        else
-            c = &SgNeqOp(*sw_cond, *c);
-        ControlFlowItem *n, *j;
-        ControlFlowItem* last;
-        if ((n = getControlFlowList(stmt->lexNext(), NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
-            return NULL;
-        j = new ControlFlowItem(currentProcedure);
-        ControlFlowItem* gotoEmpty = new ControlFlowItem(NULL, empty, j, NULL, currentProcedure);
-        if (last != NULL)
-            last->AddNextItem(gotoEmpty);
-        else
-            n = gotoEmpty;
-        ControlFlowItem* cond = new ControlFlowItem(c, j, n, stmt->label(), currentProcedure);
-        cond->setOriginalStatement(stmt);
-        if (last_sw == NULL)
-            first = cond;
-        else
-            last_sw->AddNextItem(cond);
-        last_sw = j;
-        is_def_last = false;
-        not_def_last = *lastAnStmt;
-        stmt = *lastAnStmt;
-    }
-    SgStatement* def = sw->defOption();
-    if (def != NULL){
-        ControlFlowItem* last;
-        ControlFlowItem* n;
-        if ((n = getControlFlowList(def->lexNext(), NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
-            return NULL;
-        if (last != NULL)
-            last->AddNextItem(empty);
-        if (last_sw == NULL)
-            first = n;
-        else
-            last_sw->AddNextItem(n);
-        last_sw = last;
-    }
-    last_sw->AddNextItem(empty);
-    if (!is_def_last)
-        *lastAnStmt = not_def_last;
-    return first;
-}
-
-static ControlFlowItem* getControlFlowList(SgStatement *firstSt, SgStatement *lastSt, ControlFlowItem **last, SgStatement **lastAnStmt, doLoops* loops, CallData* calls, CommonData* commons)
-{
-    ControlFlowItem *list = new ControlFlowItem(currentProcedure);
-    ControlFlowItem *cur = list;
-    ControlFlowItem *pred = list;
-    SgStatement *stmt;
-    for (stmt = firstSt; (
-        stmt != lastSt
-        && stmt->variant() != CONTAINS_STMT
-        && (lastSt != NULL || stmt->variant() != ELSEIF_NODE)
-        && (lastSt != NULL || stmt->variant() != CASE_NODE)
-        && (lastSt != NULL || stmt->variant() != DEFAULT_NODE));
-        stmt = stmt->lexNext())
-    {
-        if (stmt->variant() == CONTROL_END)
-        {
-            if (isSgExecutableStatement(stmt))
-                break;
-        }
-
-        cur = processOneStatement(&stmt, &pred, &list, cur, loops, calls, commons);
-        if (cur == NULL)
-        {
-            clearList(list);
-            return NULL;
-        }
-    }
-    if (cur == NULL){
-        cur = list = new ControlFlowItem(currentProcedure);
-    }
-    if (last != NULL)
-        *last = cur;
-    if (lastAnStmt != NULL)
-        *lastAnStmt = stmt;
-    return list;
-}
-
-AnalysedCallsList* CallData::IsHeaderInList(SgStatement* header)
-{
-    if (header == NULL)
-        return NULL;
-    AnalysedCallsList* p = calls_list;
-    while (p != NULL) {
-        if (p->header == header)
-            return p;
-        p = p->next;
-    }
-    return NULL;
-}
-
-void CallData::AssociateGraphWithHeader(SgStatement* st, ControlFlowGraph* gr)
-{
-    AnalysedCallsList* l = calls_list;
-    while (l != NULL) {
-        if (l->header == st) {
-            if (gr == l->graph && gr != NULL)
-                gr->AddRef();
-            l->graph = gr;
-            return;
-        }
-        l = l->next;
-    }
-    delete gr;
-}
-
-AnalysedCallsList* CallData::AddHeader(SgStatement* st, bool isFun, SgSymbol* name, int fid)
-{
-    //test
-    bool add_intr = IsAnIntrinsicSubroutine(name->identifier()) != NULL;
-    AnalysedCallsList* l = new AnalysedCallsList(st, (isIntrinsicFunctionNameACC(name->identifier()) || add_intr) && !IsUserFunctionACC(name), IsPureProcedureACC(name), isFun, name->identifier(), fid);
-    l->next = calls_list;
-    calls_list = l;
-    return l;
-}
-
-extern int isStatementFunction(SgSymbol *s);
-
-AnalysedCallsList* CallData::getLinkToCall(SgExpression* e, SgStatement* s, CommonData* commons)
-{
-    SgStatement* header = NULL;
-    SgSymbol* name;
-    bool isFun;
-    graph_node* g = NULL;
-    if (e == NULL) {
-        //s - procedure call
-        SgCallStmt* f = isSgCallStmt(s);
-        SgSymbol* fdaf = f->name();
-        if (ATTR_NODE(f->name()) != NULL)
-            g = GRAPHNODE(f->name());
-        if (g == NULL) {
-            
-            is_correct = "no header for procedure";
-            failed_proc_name = f->name()->identifier();
-            return (AnalysedCallsList*)(-1);
-            
-        }
-        if (g)
-            header = isSgProcHedrStmt(g->st_header);
-        name = f->name();
-        isFun = false;
-        //intr = isIntrinsicFunctionNameACC(f->name()->identifier()) && !IsUserFunctionACC(f->name());
-        //IsPureProcedureACC(f->name());
-    }
-    else {
-        //e - function call
-        SgFunctionCallExp* f = isSgFunctionCallExp(e);
-        if (isStatementFunction(f->funName()))
-            return (AnalysedCallsList*)(-2);
-        if (ATTR_NODE(f->funName()) != NULL)
-            g = GRAPHNODE(f->funName());
-        if (g == NULL) {
-            is_correct = "no header for function";
-            failed_proc_name = f->funName()->identifier();
-            return (AnalysedCallsList*)(-1);
-        }
-        header = isSgFuncHedrStmt(g->st_header);
-        name = f->funName();
-        isFun = true;
-    }
-    AnalysedCallsList* p;
-    if ((p = IsHeaderInList(header))) {
-        recursion_flag = recursion_flag || p->graph != NULL;
-        return p;
-    }
-    AnalysedCallsList* prev = currentProcedure;
-    currentProcedure = p = AddHeader(header, isFun, name, g->file_id);
-    if (!p->isIntrinsic) {
-        int stored = SwitchFile(g->file_id);
-        
-        ControlFlowGraph* graph = GetControlFlowGraphWithCalls(false, header, this, commons);
-        //if (graph == NULL)
-            //failed_proc_name = name->identifier();
-        
-        SwitchFile(stored);
-        
-        AssociateGraphWithHeader(header, graph);
-        commons->MarkEndOfCommon(p);
-    }
-    currentProcedure = prev;
-    return p;
-}
-
-static ControlFlowItem* GetFuncCallsForExpr(SgExpression* e, CallData* calls, ControlFlowItem** last, CommonData* commons, SgStatement* os)
-{
-    if (e == NULL) {
-        *last = NULL;
-        return NULL;
-    }
-    SgFunctionCallExp* f = isSgFunctionCallExp(e);
-    if (f) {
-        ControlFlowItem* head = new ControlFlowItem(NULL, NULL, currentProcedure, calls->getLinkToCall(e, NULL, commons));
-        head->setOriginalStatement(os);
-        ControlFlowItem* curl = head;
-        head->setFunctionCall(f);
-        ControlFlowItem* l1, *l2;
-        ControlFlowItem* tail1 = GetFuncCallsForExpr(e->lhs(), calls, &l1, commons, os);
-        ControlFlowItem* tail2 = GetFuncCallsForExpr(e->rhs(), calls, &l2, commons, os);
-        *last = head;
-        if (tail2 != NULL) {
-            l2->AddNextItem(head);
-            head = tail2;
-        }
-        if (tail1 != NULL) {
-            l1->AddNextItem(head);
-            head = tail1;
-        }
-
-        return head;
-    }
-    f = isSgFunctionCallExp(e->lhs());
-    if (f) {
-        ControlFlowItem* head = new ControlFlowItem(NULL, NULL, currentProcedure, calls->getLinkToCall(e->lhs(), NULL, commons));
-        head->setOriginalStatement(os);
-        head->setFunctionCall(f);
-        ControlFlowItem* l1, *l2, *l3;
-        ControlFlowItem* tail1 = GetFuncCallsForExpr(e->lhs()->lhs(), calls, &l1, commons, os);
-        ControlFlowItem* tail2 = GetFuncCallsForExpr(e->lhs()->rhs(), calls, &l2, commons, os);
-        ControlFlowItem* tail3 = GetFuncCallsForExpr(e->rhs(), calls, &l3, commons, os);
-        *last = head;
-        if (tail2 != NULL) {
-            l2->AddNextItem(head);
-            head = tail2;
-        }
-        if (tail1 != NULL) {
-            l1->AddNextItem(head);
-            head = tail1;
-        }
-        if (tail3 != NULL) {
-            (*last)->AddNextItem(tail3);
-            *last = l3;
-        }
-        return head;
-    }
-    return GetFuncCallsForExpr(e->rhs(), calls, last, commons, os);
-}
-
-static ControlFlowItem* AddFunctionCalls(SgStatement* st, CallData* calls, ControlFlowItem** last, CommonData* commons)
-{
-    ControlFlowItem* retv = GetFuncCallsForExpr(st->expr(0), calls, last, commons, st);
-    ControlFlowItem* l2 = NULL;
-    ControlFlowItem* second = GetFuncCallsForExpr(st->expr(1), calls, &l2, commons, st);
-    if (retv == NULL) {
-        retv = second;
-        *last = l2;
-    }
-    else if (second != NULL) {
-        (*last)->AddNextItem(second);
-        *last = l2;
-    }
-    ControlFlowItem* l3 = NULL;
-    ControlFlowItem* third = GetFuncCallsForExpr(st->expr(2), calls, &l3, commons, st);
-    if (retv == NULL) {
-        retv = third;
-        *last = l3;
-    }
-    else if (third != NULL) {
-        (*last)->AddNextItem(third);
-        *last = l3;
-    }
-    return retv;
-}
-
-void DoLoopDataList::AddLoop(int file_id, SgStatement* st, SgExpression* l, SgExpression* r, SgExpression* step, SgSymbol* lv)
-{
-    DoLoopDataItem* nt = new DoLoopDataItem();
-    nt->file_id = file_id;
-    nt->statement = st;
-    nt->l = l;
-    nt->r = r;
-    nt->st = step;
-    nt->loop_var = lv;
-    nt->next = list;
-    list = nt;
-}
-
-DoLoopDataList::~DoLoopDataList()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    while (list != NULL) {
-        DoLoopDataItem* t = list->next;
-        delete list;
-        list = t;
-    }
-}
-
-static ControlFlowItem* processOneStatement(SgStatement** stmt, ControlFlowItem** pred, ControlFlowItem **list, ControlFlowItem* oldcur, doLoops* loops, CallData* calls, CommonData* commons)
-{
-    ControlFlowItem* lastf;
-    ControlFlowItem* funcs = AddFunctionCalls(*stmt, calls, &lastf, commons);
-    if (funcs != NULL) {
-        if (*pred != NULL)
-            (*pred)->AddNextItem(funcs);
-        else
-            *list = funcs;
-        *pred = lastf;
-    }
-
-    switch ((*stmt)->variant())
-    {
-        case IF_NODE:
-        {
-            ControlFlowItem* emptyAfterIf = new ControlFlowItem(currentProcedure); //empty item to avoid second pass
-            /*
-            if ((*stmt)->hasLabel()){
-                ControlFlowItem* emptyBeforeIf = new ControlFlowItem();
-                emptyBeforeIf->setLabel((*stmt)->label());
-                if (*pred != NULL)
-                    (*pred)->AddNextItem(emptyBeforeIf);
-                else
-                    *list = emptyBeforeIf;
-                *pred = emptyBeforeIf;
-            }
-            */
-            ControlFlowItem* cur = ifItem(*stmt, emptyAfterIf, stmt, loops, false, calls, commons);
-            emptyAfterIf->setLabel((*stmt)->label());
-            if (*pred != NULL)
-                (*pred)->AddNextItem(cur);
-            else
-                *list = cur;
-            return (*pred = emptyAfterIf);
-        }
-        case ASSIGN_STAT:
-        case POINTER_ASSIGN_STAT:
-        case PROC_STAT:
-        case PRINT_STAT:
-        case READ_STAT:
-        case WRITE_STAT:
-        case ALLOCATE_STMT:
-        case DEALLOCATE_STMT:
-        {
-            ControlFlowItem* cur = new ControlFlowItem(*stmt, NULL, currentProcedure, (*stmt)->variant() == PROC_STAT ? calls->getLinkToCall(NULL, *stmt, commons) : NULL);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(cur);
-            else
-                *list = cur;
-            return (*pred = loops->checkStatementForLoopEnding(cur->getLabel() ? cur->getLabel()->id() : -1, cur));
-        }
-        case LOGIF_NODE:
-        {
-            ControlFlowItem* emptyAfterIf = new ControlFlowItem(currentProcedure); //empty item to avoid second pass
-            SgLogIfStmt* cond = isSgLogIfStmt(*stmt);
-            SgLabel* lbl = (*stmt)->label();
-            SgExpression* c = &(SgNotOp((cond->conditional()->copy())));
-            ControlFlowItem* cur = new ControlFlowItem(c, emptyAfterIf, NULL, (*stmt)->label(), currentProcedure);
-            cur->setOriginalStatement(*stmt);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(cur);
-            else
-                *list = cur;
-            *stmt = (*stmt)->lexNext();
-            ControlFlowItem* body;
-            if ((body = processOneStatement(stmt, &cur, list, cur, loops, calls, commons)) == NULL){
-                return NULL;
-            }
-            body->AddNextItem(emptyAfterIf);
-            return (*pred = loops->checkStatementForLoopEnding(lbl ? lbl->id() : -1, emptyAfterIf));
-        }
-        case WHILE_NODE:
-        {
-            SgWhileStmt* cond = isSgWhileStmt(*stmt);
-            bool isEndDo = (*stmt)->lastNodeOfStmt()->variant() == CONTROL_END;
-            SgExpression* c;
-            if (cond->conditional())
-                c = &(SgNotOp((cond->conditional()->copy())));
-            else
-                c = new SgValueExp(1);
-            ControlFlowItem* emptyAfterWhile = new ControlFlowItem(currentProcedure);
-            ControlFlowItem* emptyBeforeBody = new ControlFlowItem(currentProcedure);
-            ControlFlowItem* cur = new ControlFlowItem(c, emptyAfterWhile, emptyBeforeBody, (*stmt)->label(), currentProcedure);
-            cur->setOriginalStatement(cond);
-            ControlFlowItem* gotoStart = new ControlFlowItem(NULL, cur, emptyAfterWhile, NULL, currentProcedure);
-            ControlFlowItem* emptyBefore = new ControlFlowItem(NULL, (ControlFlowItem*)NULL, cur, cond->label(), currentProcedure);
-            SgVarRefExp* doName = (isSgVarRefExp((*stmt)->expr(2)));
-            int lbl = -1;
-            if (!isEndDo){
-                SgStatement* end = lastStmtOfDoACC(cond);
-                if (end->controlParent() && end->controlParent()->variant() == LOGIF_NODE)
-                    lbl = end->controlParent()->label()->id();
-                else
-                    lbl = end->label()->id();
-            }
-            loops->addLoop(lbl, doName ? doName->symbol() : NULL, gotoStart, emptyAfterWhile);
-            ControlFlowItem* n, *last;
-            if (isEndDo){
-                if ((n = getControlFlowList((*stmt)->lexNext(), NULL, &last, stmt, loops, calls, commons)) == NULL)
-                    return NULL;
-                emptyBeforeBody->AddNextItem(n);
-                loops->endLoop(last);
-            }
-            if (*pred != NULL)
-                (*pred)->AddNextItem(emptyBefore);
-            else
-                *list = emptyBefore;
-            if (isEndDo)
-                return (*pred = emptyAfterWhile);
-            return (*pred = emptyBeforeBody);
-        }
-        case FOR_NODE:
-        {
-            SgForStmt* fst = isSgForStmt(*stmt);
-#if __SPF
-            SgStatement *p = NULL;
-            for (int i = 0; i < fst->numberOfAttributes(); ++i)
-            {
-                if (fst->attributeType(i) == SPF_ANALYSIS_DIR)
-                {
-                    p = (SgStatement *)(fst->getAttribute(i)->getAttributeData());
-                    break;
-                }
-            }
-            bool isParLoop = (p && p->variant() == SPF_ANALYSIS_DIR);
-#else
-            SgStatement* p = (*stmt)->lexPrev();
-            bool isParLoop = (p && p->variant() == DVM_PARALLEL_ON_DIR);
-#endif
-            SgExpression* pl = NULL;
-            SgExpression* pPl = NULL;
-            bool pl_flag = true;
-            if (isParLoop){
-#if __SPF
-                SgExpression* el = p->expr(0);
-#else
-                SgExpression* el = p->expr(1);
-#endif
-                pPl = el;
-                while (el != NULL) {
-                    SgExpression* e = el->lhs();
-                    if (e->variant() == ACC_PRIVATE_OP) {
-                        pl = e;
-                        break;
-                    }
-                    pPl = el;
-                    pl_flag = false;
-                    el = el->rhs();
-                }
-                //pl->unparsestdout();
-            }
-            bool isEndDo = fst->isEnddoLoop();
-            SgExpression* lh = new SgVarRefExp(fst->symbol());
-            SgStatement* fa = new SgAssignStmt(*lh, *fst->start());
-            bool needs_goto = true;
-#if !__SPF
-            // create goto edge if can not calculate count of loop's iterations
-            if (fst->start()->variant() == INT_VAL && fst->end()->variant() == INT_VAL && fst->start()->valueInteger() < fst->end()->valueInteger())
-                needs_goto = false;
-#endif
-            //fa->setLabel(*(*stmt)->label());
-            ControlFlowItem* last;
-            ControlFlowItem* emptyAfterDo = new ControlFlowItem(currentProcedure);
-            ControlFlowItem* emptyBeforeDo = new ControlFlowItem(currentProcedure);
-            ControlFlowItem* gotoEndInitial = NULL;
-            if (needs_goto) {
-                SgExpression* sendc = new SgExpression(GT_OP, new SgVarRefExp(fst->symbol()), fst->end(), NULL);
-                gotoEndInitial = new ControlFlowItem(sendc, emptyAfterDo, emptyBeforeDo, NULL, currentProcedure, true);
-                gotoEndInitial->setOriginalStatement(fst);
-            }
-            ControlFlowItem* stcf = new ControlFlowItem(fa, needs_goto ? gotoEndInitial : emptyBeforeDo, currentProcedure);
-            stcf->setOriginalStatement(fst);
-            stcf->setLabel((*stmt)->label());
-            SgExpression* rh = new SgExpression(ADD_OP, new SgVarRefExp(fst->symbol()), new SgValueExp(1), NULL);
-            SgStatement* add = new SgAssignStmt(*lh, *rh);
-            SgExpression* endc = new SgExpression(GT_OP, new SgVarRefExp(fst->symbol()), fst->end(), NULL);
-            ControlFlowItem* gotoStart = new ControlFlowItem(NULL, emptyBeforeDo, emptyAfterDo, NULL, currentProcedure);
-            ControlFlowItem* gotoEnd = new ControlFlowItem(endc, emptyAfterDo, gotoStart, NULL, currentProcedure);
-            gotoEnd->setOriginalStatement(fst);
-            if (needs_goto) {
-                gotoEnd->SetConditionFriend(gotoEndInitial);
-            }
-            ControlFlowItem* loop_d = new ControlFlowItem(add, gotoEnd, currentProcedure);
-            loop_d->setOriginalStatement(fst);
-            ControlFlowItem* loop_emp = new ControlFlowItem(NULL, loop_d, currentProcedure);
-            SgVarRefExp* doName = (isSgVarRefExp((*stmt)->expr(2)));
-            int lbl = -1;
-            if (!isEndDo){
-                SgStatement* end = lastStmtOfDoACC(fst);
-                if (end->variant() == LOGIF_NODE)
-                    lbl = end->controlParent()->label()->id();
-                else
-                    lbl = end->label()->id();
-            }
-            loops->addLoop(lbl, doName ? doName->symbol() : NULL, loop_emp, emptyAfterDo);
-            doLoopList->AddLoop(current_file_id, *stmt, fst->start(), fst->end(), fst->step(), fst->symbol());
-            if (isParLoop) {
-#if __SPF
-                // all loop has depth == 1 ? is it correct?
-                int k = 1;
-#else
-                SgExpression* par_des = p->expr(2);
-                int k = 0;
-                while (par_des != NULL && par_des->lhs() != NULL) {
-                    k++;
-                    par_des = par_des->rhs();
-                }
-#endif
-                loops->setParallelDepth(k, pl, p, pPl, pl_flag);
-            }
-
-            if (loops->isLastParallel()) {
-                SgExpression* ex = loops->getPrivateList();
-                emptyBeforeDo->MakeParloopStart();
-                bool f;
-                SgExpression* e = loops->getExpressionToModifyPrivateList(&f);
-                emptyBeforeDo->setPrivateList(ex, loops->GetParallelStatement(), e, f);
-                loop_d->MakeParloopEnd();
-            }
-            if (isEndDo){
-                ControlFlowItem* body;
-                if ((body = getControlFlowList(fst->body(), NULL, &last, stmt, loops, calls, commons)) == NULL)
-                    return NULL;
-                emptyBeforeDo->AddNextItem(body);
-                loops->endLoop(last);
-            }
-            if (*pred != NULL)
-                (*pred)->AddNextItem(stcf);
-            else
-                *list = stcf;
-            if (isEndDo)
-                return (*pred = emptyAfterDo);
-            return (*pred = emptyBeforeDo);
-        }
-        case GOTO_NODE:
-        {
-            SgGotoStmt* gst = isSgGotoStmt(*stmt);
-            ControlFlowItem* gt = new ControlFlowItem(NULL, gst->branchLabel(), NULL, gst->label(), currentProcedure);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(gt);
-            else
-                *list = gt;
-            return (*pred = gt);
-        }
-        case ARITHIF_NODE:
-        {
-            SgArithIfStmt* arif = (SgArithIfStmt*)(*stmt);
-            ControlFlowItem* gt3 = new ControlFlowItem(NULL, ((SgLabelRefExp*)(*stmt)->expr(1)->rhs()->rhs()->lhs())->label(), NULL, NULL, currentProcedure);
-            ControlFlowItem* gt2 = new ControlFlowItem(&SgEqOp(*(arif->conditional()), *new SgValueExp(0)), ((SgLabelRefExp*)(*stmt)->expr(1)->rhs()->lhs())->label(), gt3, NULL, currentProcedure);
-            gt2->setOriginalStatement(arif);
-            ControlFlowItem* gt1 = new ControlFlowItem(&(*arif->conditional() < *new SgValueExp(0)), ((SgLabelRefExp*)(*stmt)->expr(1)->lhs())->label(), gt2, (*stmt)->label(), currentProcedure);
-            gt1->setOriginalStatement(arif);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(gt1);
-            else
-                *list = gt1;
-            return (*pred = gt3);
-        }
-        case COMGOTO_NODE:
-        {
-            SgComputedGotoStmt* cgt = (SgComputedGotoStmt*)(*stmt);
-            SgExpression* label = cgt->labelList();
-            int i = 0;
-            SgLabel* lbl = ((SgLabelRefExp *)(label->lhs()))->label();
-            ControlFlowItem* gt = new ControlFlowItem(&SgEqOp(*(cgt->exp()), *new SgValueExp(++i)), lbl, NULL, cgt->label(), currentProcedure);
-            gt->setOriginalStatement(cgt);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(gt);
-            else
-                *list = gt;
-            ControlFlowItem* old = gt;
-            while ((label = label->rhs()))
-            {
-                lbl = ((SgLabelRefExp *)(label->lhs()))->label();
-                gt = new ControlFlowItem(&SgEqOp(*(cgt->exp()), *new SgValueExp(++i)), lbl, NULL, NULL, currentProcedure);
-                gt->setOriginalStatement(cgt);
-                old->AddNextItem(gt);
-                old = gt;
-            }
-            return (*pred = gt);
-        }
-        case SWITCH_NODE:
-        {
-             ControlFlowItem* emptyAfterSwitch = new ControlFlowItem(currentProcedure);
-             ControlFlowItem* cur = switchItem(*stmt, emptyAfterSwitch, stmt, loops, calls, commons);
-             emptyAfterSwitch->setLabel((*stmt)->label());
-             if (*pred != NULL)
-                 (*pred)->AddNextItem(cur);
-             else
-                 *list = cur;
-             return (*pred = emptyAfterSwitch);
-        }
-        case CONT_STAT:
-        {
-             ControlFlowItem* cur = new ControlFlowItem(NULL, (ControlFlowItem*)NULL, NULL, (*stmt)->label(), currentProcedure);
-             if (*pred != NULL)
-                 (*pred)->AddNextItem(cur);
-             else
-                 *list = cur;
-             return (*pred = loops->checkStatementForLoopEnding(cur->getLabel() ? cur->getLabel()->id() : -1, cur));
-        }
-        case CYCLE_STMT:
-        {
-             SgSymbol* ref = (*stmt)->symbol();
-             ControlFlowItem* cur = new ControlFlowItem(NULL, loops->getSourceForCycle(ref), NULL, (*stmt)->label(), currentProcedure);
-             if (*pred != NULL)
-                 (*pred)->AddNextItem(cur);
-             else
-                 *list = cur;
-             return (*pred = cur);
-        }
-        case EXIT_STMT:
-        {
-             SgSymbol* ref = (*stmt)->symbol();
-             ControlFlowItem* cur = new ControlFlowItem(NULL, loops->getSourceForExit(ref), NULL, (*stmt)->label(), currentProcedure);
-             if (*pred != NULL)
-                 (*pred)->AddNextItem(cur);
-             else
-                 *list = cur;
-             return (*pred = cur);
-        }
-        case COMMENT_STAT:
-            return *pred;
-        case COMM_STAT:
-        {
-            commons->RegisterCommonBlock(*stmt, currentProcedure);
-            return *pred;
-        }
-        default:
-            return *pred;
-            //return NULL;
-    }
-}
-
-ControlFlowGraph::ControlFlowGraph(bool t, bool m, ControlFlowItem* list, ControlFlowItem* end) : temp(t), main(m), refs(1), def(NULL), use(NULL), pri(NULL), common_def(NULL), common_use(NULL), hasBeenAnalyzed(false)
-#ifdef __SPF
-, pointers(set<SymbolKey>())
-#endif
-{
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 30);
-#endif
-    int n = 0;
-    ControlFlowItem* orig = list;
-    CBasicBlock* prev = NULL;
-    CBasicBlock* start = NULL;
-    int stmtNo = 0;
-    bool ns = list->isEnumerated();
-    if (list != NULL && !ns){
-        while (list != NULL && list != end)
-        {
-            list->setStmtNo(++stmtNo);
-            list = list->getNext();
-        }
-    }
-    ControlFlowItem* last_prev = NULL;
-    list = orig;
-    while (list != NULL && list != end)
-    {
-        CBasicBlock* bb = new CBasicBlock(t, list, ++n, this, list->getProc());
-        last = bb;
-        bb->setPrev(prev);
-        if (prev != NULL){
-            prev->setNext(bb);
-            if (!last_prev->isUnconditionalJump()){
-                bb->addToPrev(prev, last_prev->IsForJumpFlagSet(), false, last_prev);
-                prev->addToSucc(bb, last_prev->IsForJumpFlagSet(), false, last_prev);
-            }
-        }
-        if (start == NULL)
-            start = bb;
-        prev = bb;
-        while (list->getNext() != NULL && list->getNext() != end && !list->getNext()->isLeader()){
-            list->setBBno(n);
-            list = list->getNext();
-        }
-        list->setBBno(n);
-        last_prev = list;
-        list = list->getNext();
-    }
-    list = orig;
-    while (list != NULL && list != end)
-    {
-        ControlFlowItem* target;
-        if ((target = list->getJump()) != NULL)
-        {
-//            //no back edges
-//            if (target->getBBno() > list->getBBno())
-//            { 
-                CBasicBlock* tmp1 = start;
-                CBasicBlock* tmp2 = start;
-                for (int i = 1; i < target->getBBno() || i < list->getBBno(); i++)
-                {
-                    if (i < list->getBBno()) {
-                        tmp2 = tmp2->getLexNext();
-                        if (!tmp2)
-                            break;
-                    }
-                    if (i < target->getBBno()) {
-                        tmp1 = tmp1->getLexNext();
-                        if (!tmp1)
-                            break;
-                    }
-                }
-                if (tmp1 && tmp2) {
-                    tmp1->addToPrev(tmp2, list->IsForJumpFlagSet(), true, list);
-                    tmp2->addToSucc(tmp1, list->IsForJumpFlagSet(), true, list);
-                }
-//            }
-        }
-        list = list->getNext();
-    }
-    start->markAsReached();
-    first = start;
-    common_use = NULL;
-    cuf = false;
-    common_def = NULL;
-    cdf = false;
-}
-
-CommonDataItem* CommonData::IsThisCommonVar(VarItem* item, AnalysedCallsList* call)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->proc == call) {
-            for (CommonVarInfo* inf = it->info; inf != NULL; inf = inf->next) {
-                if (inf->var && item->var && *inf->var == *item->var)
-                    return it;
-            }
-        }
-    }
-    return NULL;
-}
-
-CommonDataItem* CommonData::GetItemForName(const string &name, AnalysedCallsList *call)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->name == name && it->proc == call)
-            return it;
-    }
-    return NULL;
-}
-
-void CommonData::RegisterCommonBlock(SgStatement *st, AnalysedCallsList *cur)
-{
-    //TODO: multiple common blocks in one procedure with same name
-    for (SgExpression *common = st->expr(0); common; common = common->rhs())
-    {
-        bool newBlock = false;
-        SgExprListExp* vars = (SgExprListExp*)common->lhs();
-        if (vars == NULL)
-            continue;
-
-        const string currCommonName = (common->symbol()) ? common->symbol()->identifier() : "spf_unnamed";
-
-        CommonDataItem* it = GetItemForName(currCommonName, cur);
-        if (!it) {
-            it = new CommonDataItem();
-            it->cb = st;
-            it->name = currCommonName;
-            it->isUsable = true;
-            it->proc = cur;
-            it->first = cur;
-            it->onlyScalars = true;
-            newBlock = true;
-
-            for (CommonDataItem *i = list; i != NULL; i = i->next)
-                if (i->name == currCommonName && i->isUsable)
-                    it->first = i->first;
-        }
-        it->commonRefs.push_back(common);
-
-        for (int i = 0; i < vars->length(); ++i)
-        {
-            SgVarRefExp *e = isSgVarRefExp(vars->elem(i));
-            if (e && !IS_ARRAY(e->symbol()))
-            {
-                CommonVarInfo* c = new CommonVarInfo();
-                c->var = new CScalarVarEntryInfo(e->symbol());
-                c->isPendingLastPrivate = false;
-                c->isInUse = false;
-                c->parent = it;
-                c->next = it->info;
-                it->info = c;
-            }
-            else if (isSgArrayRefExp(vars->elem(i))) {
-                it->onlyScalars = false;
-            }
-            else {
-                CommonVarInfo* c = new CommonVarInfo();
-                c->var = new CArrayVarEntryInfo(vars->elem(i)->symbol(), isSgArrayRefExp(vars->elem(i)));
-                c->isPendingLastPrivate = false;
-                c->isInUse = false;
-                c->parent = it;
-                c->next = it->info;
-                it->info = c;
-                it->onlyScalars = false;
-            }
-        }
-
-        if (newBlock)
-        {
-            it->next = list;
-            list = it;
-        }
-    }
-}
-
-void CommonData::MarkEndOfCommon(AnalysedCallsList* cur)
-{
-    for (CommonDataItem* i = list; i != NULL; i = i->next)
-    {
-        if (i->first == cur)
-            i->isUsable = false;
-    }
-}
-
-void CBasicBlock::markAsReached()
-{
-    prev_status = 1;
-    BasicBlockItem* s = succ;
-    while (s != NULL){
-        CBasicBlock* b = s->block;
-        if (b->prev_status == -1)
-            b->markAsReached();
-        s = s->next;
-    }
-}
-
-bool ControlFlowGraph::ProcessOneParallelLoop(ControlFlowItem* lstart, CBasicBlock* of, CBasicBlock*& p, bool first)
-{
-    int stored_fid = SwitchFile(lstart->getProc()->file_id);
-    ControlFlowItem* lend;
-    if (is_correct != NULL)
-    {
-        const char* expanded_log;
-        char* tmp = NULL;
-        if (failed_proc_name)
-        {
-            tmp = new char[strlen(is_correct) + 2 + strlen(failed_proc_name) + 1];
-            strcpy(tmp, is_correct);
-            strcat(tmp, ": ");
-            strcat(tmp, failed_proc_name);
-            expanded_log = tmp;
-        }
-        else
-            expanded_log = is_correct;
-#if __SPF
-        const wchar_t* rus = R159;
-        Warning("Private analysis is not conducted for loop: '%s'", rus, expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
-#else
-        Warning("Private analysis is not conducted for loop: '%s'", expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
-#endif
-        if (tmp)
-            delete[] tmp;
-
-    }
-    else
-    {
-        while ((lend = p->containsParloopEnd()) == NULL)
-        {
-            p->PrivateAnalysisForAllCalls();
-            p = p->getLexNext();
-            ControlFlowItem* mstart;
-            if ((mstart = p->containsParloopStart()) != NULL)
-            {
-                CBasicBlock* mp = p;
-                if (first) {
-                    if (!ProcessOneParallelLoop(mstart, of, mp, false)) {
-                        SwitchFile(stored_fid);
-                        return false;
-                    }
-                }
-            }
-        }
-        CBasicBlock* afterParLoop = p->getLexNext()->getLexNext();
-        VarSet* l_pri = ControlFlowGraph(true, false, lstart, lend).getPrivate();
-        if (is_correct != NULL)
-        {
-            const char* expanded_log;
-            char* tmp = NULL;
-            if (failed_proc_name)
-            {
-                tmp = new char[strlen(is_correct) + 2 + strlen(failed_proc_name) + 1];
-                strcpy(tmp, is_correct);
-                strcat(tmp, ": ");
-                strcat(tmp, failed_proc_name);
-                expanded_log = tmp;
-            }
-            else
-                expanded_log = is_correct;
-
-#if __SPF
-            const wchar_t* rus = R159;
-            Warning("Private analysis is not conducted for loop: '%s'", rus, expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
-#else
-            Warning("Private analysis is not conducted for loop: '%s'", expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
-#endif
-            if (tmp)
-                delete[] tmp;
-            SwitchFile(stored_fid);
-            return false;
-        }
-        VarSet* p_pri = new VarSet();
-        SgExpression* ex_p = lstart->getPrivateList();
-        if (ex_p != NULL)
-            ex_p = ex_p->lhs();
-        for (; ex_p != NULL; ex_p = ex_p->rhs())
-        {
-            SgVarRefExp* pr;
-            if (pr = isSgVarRefExp(ex_p->lhs()))
-            {
-                CScalarVarEntryInfo* tmp = new CScalarVarEntryInfo(pr->symbol());
-                p_pri->addToSet(tmp, NULL);
-                delete tmp;
-            }
-            SgArrayRefExp* ar;
-            if (ar = isSgArrayRefExp(ex_p->lhs()))
-            {
-                CArrayVarEntryInfo* tmp = new CArrayVarEntryInfo(ar->symbol(), ar);
-                p_pri->addToSet(tmp, NULL);
-                delete tmp;
-            }
-        }
-
-        VarSet* live = afterParLoop->getLiveIn();
-        VarSet* adef = afterParLoop->getDef();
-        VarSet* pri = new VarSet();
-        VarSet* tmp = new VarSet();
-        VarSet* delay = new VarSet();
-        tmp->unite(l_pri, false);
-
-        for (VarItem* exp = tmp->getFirst(); exp != NULL; exp = tmp->getFirst())
-        {
-            if (!afterParLoop->IsVarDefinedAfterThisBlock(exp->var, false))
-                delay->addToSet(exp->var, NULL);
-            tmp->remove(exp->var);
-        }
-        delete tmp;
-        pri->unite(l_pri, false);
-        pri->minus(live, true);
-        privateDelayedList = new PrivateDelayedItem(pri, p_pri, l_pri, lstart, privateDelayedList, this, delay, current_file_id);
-        of->SetDelayedData(privateDelayedList);
-    }
-    SwitchFile(stored_fid);
-    return true;
-}
-
-void ControlFlowGraph::privateAnalyzer()
-{
-    if (hasBeenAnalyzed)
-        return;
-    CBasicBlock* p = first;
-    /*
-    printf("GRAPH:\n");
-    while (p != NULL){
-        printf("block %d: ", p->getNum());
-        if (p->containsParloopStart())
-            printf("start");
-        if (p->containsParloopEnd())
-            printf("end");
-        p->print();
-        p = p->getLexNext();
-    }
-    */
-    p = first;
-    liveAnalysis();
-    while (1) 
-    {
-        ControlFlowItem* lstart;
-        CBasicBlock* of = p;
-        p->PrivateAnalysisForAllCalls();
-        if ((lstart = p->containsParloopStart()) != NULL) 
-        {
-            if (!ProcessOneParallelLoop(lstart, of, p, true))
-                break;
-        }
-        if (p == last)
-            break;
-        p = p->getLexNext();
-    }
-    hasBeenAnalyzed = true;
-}
-
-/*#ifdef __SPF
-void PrivateDelayedItem::PrintWarnings()
-{
-    if (next)
-        next->PrintWarnings();
-    lp->minus(detected);
-    while (!detected->isEmpty()) {
-        SgVarRefExp* var = detected->getFirst();
-        detected->remove(var);
-        Warning("Variable '%s' detected as private", var->unparse(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-    }
-    while (!lp->isEmpty()) {
-        SgVarRefExp* var = lp->getFirst();
-        lp->remove(var);
-        Warning("Variable '%s' detected as last private", var->unparse(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-    }
-    if (detected)
-        delete detected;
-    if (original)
-        delete original;
-    if (lp)
-        delete lp;
-}
-#else*/
-
-bool CArrayVarEntryInfo::HasActiveElements() const
-{
-    bool result = false;
-    if (disabled)
-        return false;
-    if (subscripts == 0)
-        return true;
-    for (int i = 0; i < subscripts; i++) 
-    {
-        if (!data[i].defined)
-            return false;
-        if (data[i].left_bound != data[i].right_bound)
-            result = true;
-        if (data[i].left_bound == data[i].right_bound && data[i].bound_modifiers[0] <= data[i].bound_modifiers[1])
-            result = true;
-    }
-    return result;
-}
-
-void CArrayVarEntryInfo::MakeInactive()
-{
-    disabled = true;
-    for (int i = 0; i < subscripts; i++) 
-    {
-        data[i].left_bound = data[i].right_bound = NULL;
-        data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = 0;
-    }
-}
-
-void PrivateDelayedItem::PrintWarnings()
-{
-    if (next)
-        next->PrintWarnings();
-    int stored_fid = SwitchFile(file_id);
-    total_privates += detected->count();
-    total_pl++;
-    lp->minus(detected);
-    detected->LeaveOnlyRecords();
-    detected->RemoveDoubtfulCommonVars(lstart->getProc());
-    VarSet* test1 = new VarSet();
-    test1->unite(detected, false);
-    VarSet* test2 = new VarSet();
-    test2->unite(original, false);
-    test2->minus(detected);
-    test1->minus(original);
-    int extra = 0, missing = 0;
-    SgExpression* prl = lstart->getPrivateList();
-    SgStatement* prs = lstart->getPrivateListStatement();
-    if (prl == NULL && !test1->isEmpty()) 
-    {
-        SgExpression* lst = new SgExprListExp();
-        prl = new SgExpression(ACC_PRIVATE_OP);
-        lst->setLhs(prl);
-        lst->setRhs(NULL);
-#if __SPF
-        SgExpression* clauses = prs->expr(0);
-#else
-        SgExpression* clauses = prs->expr(1);
-#endif
-        if (clauses) {
-            while (clauses->rhs() != NULL)
-                clauses = clauses->rhs();
-            clauses->setRhs(lst);
-        }
-        else {
-#if __SPF
-            prs->setExpression(0, *lst);
-#else
-            prs->setExpression(1, *lst);
-#endif
-        }
-    }
-    SgExpression* op = prl;
-
-    while (!test2->isEmpty()) {
-        //printf("EXTRA IN PRIVATE LIST: ");
-        //test2->print();
-        extra = 1;
-        VarItem* var = test2->getFirst();
-        CVarEntryInfo* syb = var->var->Clone();
-        int change_fid = var->file_id;
-        test2->remove(var->var);
-        int stored_fid = SwitchFile(change_fid);
-        if (syb->GetVarType() != VAR_REF_ARRAY_EXP)
-        {
-#if __SPF
-            const wchar_t* rus = R160;
-            Warning("var '%s' from private list wasn't classified as private", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
-#else
-            Warning("var '%s' from private list wasn't classified as private", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
-#endif
-        }
-        else 
-        {
-            CArrayVarEntryInfo* tt = (CArrayVarEntryInfo*)syb;
-            if (tt->HasActiveElements())
-            {
-#if __SPF
-                const wchar_t* rus = R161;
-                Warning("array '%s' from private list wasn't classified as private", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
-#else
-                Warning("array '%s' from private list wasn't classified as private", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
-#endif
-            }
-        }
-        delete(syb);
-        SwitchFile(stored_fid);
-    }
-    while (!test1->isEmpty()) {
-        //printf("MISSING IN PRIVATE LIST: ");
-        //test1->print();
-        missing = 1;
-        VarItem* var = test1->getFirst();
-        CVarEntryInfo* syb = var->var->Clone();
-        int change_fid = var->file_id;
-        test1->remove(var->var);
-        int stored_fid = SwitchFile(change_fid);
-        if (syb->GetVarType() != VAR_REF_ARRAY_EXP) {
-#if __SPF
-            const wchar_t* rus = R162;
-            Note("add private scalar '%s'", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-#else
-            Warning("var '%s' was added to private list", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-#endif
-            SgExprListExp* nls = new SgExprListExp();
-            SgVarRefExp* nvr = new SgVarRefExp(syb->GetSymbol());
-            nls->setLhs(nvr);
-            nls->setRhs(prl->lhs());
-            prl->setLhs(nls);
-        }
-        else 
-        {
-            CArrayVarEntryInfo* tt = (CArrayVarEntryInfo*)syb;
-            if (tt->HasActiveElements()) 
-            {
-#if __SPF
-                const wchar_t* rus = R163;
-                Note("add private array '%s'", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-#else
-                Warning("var '%s' was added to private list", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-#endif
-
-// TODO: need to check all situation before commit it to release 
-#if !__SPF
-                SgExprListExp *nls = new SgExprListExp();
-                SgArrayRefExp *nvr = new SgArrayRefExp(*syb->GetSymbol());
-                nls->setLhs(nvr);
-                nls->setRhs(prl->lhs());
-                prl->setLhs(nls);
-#endif
-            }
-        }
-        delete(syb);
-        SwitchFile(stored_fid);
-        
-        /*printf("modified parallel stmt:\n");
-        prs->unparsestdout();
-        printf("\n");*/
-    }
-    if (extra == 0 && missing == 0) {
-#if ACCAN_DEBUG
-        Warning("Correct", "", 0, lstart->getPrivateListStatement());
-#endif
-    }
-    //printf("PRIVATE VARS: ");
-    //detected->print();
-    //printf("DECLARATION: ");
-    //p_pri->print();
-    //printf("LAST PRIVATE VARS: ");
-    //lp->print();
-    if (test1)
-        delete test1;
-    
-
-    if (test2)
-        delete test2;
-    
-    if (detected)
-        delete detected;
-    
-    if (original)
-        delete original;
-    
-    if (lp)
-        delete lp;
-    
-    SwitchFile(stored_fid);
-}
-//#endif
-
-ControlFlowItem* doLoops::checkStatementForLoopEnding(int label, ControlFlowItem* last)
-{
-
-    if (current == NULL || label == -1 || label != current->getLabel())
-        return last;
-    return checkStatementForLoopEnding(label, endLoop(last));
-}
-
-doLoopItem* doLoops::findLoop(SgSymbol* s)
-{
-    doLoopItem* l = first;
-    while (l != NULL){
-        if (l->getName() == s)
-            return l;
-        l = l->getNext();
-    }
-    return NULL;
-}
-
-void doLoops::addLoop(int l, SgSymbol* s, ControlFlowItem* i, ControlFlowItem* e)
-{
-    doLoopItem* nl = new doLoopItem(l, s, i, e);
-    if (first == NULL)
-        first = current = nl;
-    else{
-        current->setNext(nl);
-        nl->HandleNewItem(current);
-        current = nl;
-    }
-}
-
-ControlFlowItem* doLoops::endLoop(ControlFlowItem* last)
-{
-    doLoopItem* removed = current;
-    if (first == current)
-        first = current = NULL;
-    else{
-        doLoopItem* prev = first;
-        while (prev->getNext() != current)
-            prev = prev->getNext();
-        prev->setNext(NULL);
-        current = prev;
-    }
-    last->AddNextItem(removed->getSourceForCycle());
-    ControlFlowItem* empty = removed->getSourceForExit();
-    delete removed;
-    return empty;
-}
-
-VarSet* ControlFlowGraph::getPrivate()
-{
-    //printControlFlowList(first->getStart(), last->getStart());
-    if (pri == NULL)
-    {
-        bool same = false;
-        int it = 0;
-        CBasicBlock* p = first;
-        /*
-        printf("GRAPH:\n");
-        while (p != NULL){
-            printf("block %d: ", p->getNum());
-            p->print();
-            p = p->getLexNext();
-        }
-        */
-        p = first;
-        while (!same){
-            p = first;
-            same = true;
-            while (p != NULL){
-                same = p->stepMrdIn(false) && same;
-                same = p->stepMrdOut(false) && same;
-                p = p->getLexNext();
-            }
-            it++;
-            //printf("iters: %d\n", it);
-        }
-        p = first;
-        while (p != NULL) {
-            p->stepMrdIn(true);
-            p->stepMrdOut(true);
-            //p->getMrdIn(false)->print();
-            p = p->getLexNext();
-        }
-        
-        p = first;
-        VarSet* res = new VarSet();
-        VarSet* loc = new VarSet();
-        bool il = false;
-        while (p != NULL)
-        {
-            res->unite(p->getUse(), false);
-            loc->unite(p->getDef(), false);
-            p = p->getLexNext();
-        }
-        //printf("USE: ");
-        //res->print();
-        //printf("LOC: ");
-        //loc->print();
-        res->unite(loc, false);
-        //printf("GETUSE: ");
-        //getUse()->print();
-
-        //res->minus(getUse()); //test!
-        res->minusFinalize(getUse(), true);
-        pri = res;
-    }
-    return pri;
-}
-
-void ControlFlowGraph::liveAnalysis()
-{
-    bool same = false;
-    int it = 0;
-    CBasicBlock* p = first;
-    p = first;
-    while (!same){
-        p = last;
-        same = true;
-        while (p != NULL){
-            same = p->stepLVOut() && same;
-            same = p->stepLVIn() && same;
-            p = p->getLexPrev();
-        }
-        it++;
-        //printf("iters: %d\n", it);
-    }
-}
-
-VarSet* ControlFlowGraph::getUse()
-{
-    if (use == NULL)
-    {
-        CBasicBlock* p = first;
-        VarSet* res = new VarSet();
-        while (p != NULL)
-        {
-            VarSet* tmp = new VarSet();
-            tmp->unite(p->getUse(), false);
-            tmp->minus(p->getMrdIn(false));
-            //printf("BLOCK %d INSTR %d USE: ", p->getNum(), p->getStart()->getStmtNo());
-            //tmp->print();
-            res->unite(tmp, false);
-            delete tmp;
-            p = p->getLexNext();
-        }
-        use = res;
-
-    }
-    if (!cuf)
-    {
-        AnalysedCallsList* call = first->getStart()->getProc();
-        cuf = true;
-        if (call) {
-            CommonVarSet* s = pCommons->GetCommonsForVarSet(use, call);
-            common_use = s;
-            for (CBasicBlock* i = first; i != NULL; i = i->getLexNext()){
-                for (CommonVarSet* c = i->getCommonUse(); c != NULL; c = c->next) {
-                    /*
-                    CommonVarSet* n = new CommonVarSet();
-                    n->cvd = c->cvd;
-                    n->cvd->refs++;
-                    */
-                    CommonVarSet* n = new CommonVarSet(*c);
-                    CommonVarSet* t;
-                    for (t = n; t->next != NULL; t = t->next);
-                    t->next = common_use;
-                    common_use = n;
-                }
-            }
-        }
-    }
-    return use;
-}
-
-VarSet* ControlFlowGraph::getDef()
-{
-    if (def == NULL) {
-        def = new VarSet();
-        def->unite(last->getMrdOut(false), true);
-    }
-    if (!cdf)
-    {
-        AnalysedCallsList* call = first->getStart()->getProc();
-        if (call) {
-            cdf = true;
-            CommonVarSet* s = pCommons->GetCommonsForVarSet(def, call);
-            common_def = s;
-            for (CBasicBlock* i = first; i != NULL; i = i->getLexNext()) {
-                for (CommonVarSet* c = i->getCommonDef(); c != NULL; c = c->next) {
-                    /*
-                    CommonVarSet* n = new CommonVarSet();
-                    n->cvd = c->cvd;
-                    n->cvd->refs++;
-                    */
-                    CommonVarSet *n = new CommonVarSet(*c);
-                    CommonVarSet* t;
-                    for (t = n; t->next != NULL; t = t->next);
-                    t->next = common_def;
-                    common_def = n;
-                }
-            }
-        }
-    }
-    return def;
-}
-
-CommonVarSet* CommonData::GetCommonsForVarSet(VarSet* set, AnalysedCallsList* call)
-{
-    CommonVarSet* res = NULL;
-    for (CommonDataItem* i = list; i != NULL; i = i->next) {
-        if (i->proc == call) {
-            for (CommonVarInfo* v = i->info; v != NULL; v = v->next) {
-                if (set->belongs(v->var)) {
-                    CommonVarSet* n = new CommonVarSet();
-                    n->cvd = v;
-                    n->next = res;
-                    res = n;
-                }
-            }
-        }
-    }
-    return res;
-}
-
-void CBasicBlock::PrivateAnalysisForAllCalls()
-{
-    ControlFlowItem* p = start;
-    while (p != NULL && (p == start || !p->isLeader())) {
-        AnalysedCallsList* c = p->getCall();
-        const char* oic = is_correct;
-        const char* fpn = failed_proc_name;
-        is_correct = NULL;
-        failed_proc_name = NULL;
-        if (c != NULL && c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c->header != NULL && !c->hasBeenAnalysed) {
-            c->hasBeenAnalysed = true;
-            
-            int stored_fid = SwitchFile(c->file_id);
-            
-            c->graph->privateAnalyzer();
-            
-            SwitchFile(stored_fid);
-            
-        }
-        is_correct = oic;
-        failed_proc_name = fpn;
-        p = p->getNext();
-    }
-    return;
-}
-
-ControlFlowItem* CBasicBlock::containsParloopEnd()
-{
-    ControlFlowItem* p = start;
-    while (p != NULL && (p == start || !p->isLeader())){
-        if (p->IsParloopEnd())
-            return p;
-        p = p->getNext();
-    }
-    return NULL;
-}
-
-ControlFlowItem* CBasicBlock::containsParloopStart()
-{
-    ControlFlowItem* p = start;
-    while (p != NULL && (p == start || !p->isLeader())){
-        if (p->IsParloopStart())
-            return p;
-        p = p->getNext();
-    }
-    return NULL;
-}
-
-void CBasicBlock::print()
-{
-    printf("block %d: prev: ", num);
-    BasicBlockItem* p = prev;
-    while (p != NULL){
-        printf("%d ", p->block->num);
-        p = p->next;
-    }
-    printf("\n");
-}
-
-ControlFlowItem* CBasicBlock::getStart()
-{
-    return start;
-}
-
-ControlFlowItem* CBasicBlock::getEnd()
-{
-    ControlFlowItem* p = start;
-    ControlFlowItem* end = p;
-    while (p != NULL && (p == start || !p->isLeader())){
-        end = p;
-        p = p->getNext();
-    }
-    return end;
-}
-
-VarSet* CBasicBlock::getLVOut()
-{
-    if (lv_out == NULL)
-    {
-        VarSet* res = new VarSet();
-        BasicBlockItem* p = succ;
-        bool first = true;
-        while (p != NULL)
-        {
-            CBasicBlock* b = p->block;
-            if (b != NULL && !b->lv_undef)
-            {
-                res->unite(b->getLVIn(), false);
-            }
-            p = p->next;
-        }
-        lv_out = res;
-    }
-    return lv_out;
-}
-
-VarSet* CBasicBlock::getLVIn()
-{
-    if (lv_in == NULL)
-    {
-        VarSet* res = new VarSet();
-        res->unite(getLVOut(), false);
-        res->minus(getDef());
-        res->unite(getUse(), false);
-        lv_in = res;
-    }
-    return lv_in;
-}
-
-bool CBasicBlock::IsVarDefinedAfterThisBlock(CVarEntryInfo* var, bool os)
-{
-    findentity = var;
-    if (def->belongs(var, os)) {
-        findentity = NULL;
-        return true;
-    }
-    BasicBlockItem* p = succ;
-    while (p != NULL)
-    {
-        CBasicBlock* b = p->block;
-        if (b->ShouldThisBlockBeCheckedAgain(var) && b->IsVarDefinedAfterThisBlock(var, os)) {
-            findentity = NULL;
-            return true;
-        }
-        p = p->next;
-    }
-    findentity = NULL;
-    return false;
-}
-
-bool CBasicBlock::stepLVOut()
-{
-    if (old_lv_out)
-        delete old_lv_out;
-    
-    old_lv_out = lv_out;
-    lv_out = NULL;
-    getLVOut();
-    lv_undef = false;
-    //printf("block %d\n", num);
-    //old_mrd_out->print();
-    //mrd_out->print();
-    return (lv_out->equal(old_lv_out));
-    //return true;
-}
-
-bool CBasicBlock::stepLVIn()
-{
-    if (old_lv_in)
-        delete old_lv_in;
-
-    old_lv_in = lv_in;
-    lv_in = NULL;
-    getLVIn();
-    return (lv_in->equal(old_lv_in));
-    //return true;
-}
-
-VarSet* CBasicBlock::getMrdIn(bool la)
-{
-    if (mrd_in == NULL)
-    {
-        VarSet* res = new VarSet();
-        BasicBlockItem* p = prev;
-        bool first = true;
-
-        while (p != NULL)
-        {
-            CBasicBlock* b = p->block;
-            if (b != NULL && !b->undef && b->hasPrev())
-            {
-                if (first) {
-                    res->unite(b->getMrdOut(la), la);
-                    first = false;
-                }
-                else
-                    res->intersect(b->getMrdOut(la), la, true);
-            }
-            p = p->next;
-        }
-        mrd_in = res;
-    }
-    return mrd_in;
-}
-
-bool CBasicBlock::hasPrev()
-{
-    return prev_status == 1;
-}
-
-VarSet* CBasicBlock::getMrdOut(bool la)
-{
-    if (mrd_out == NULL)
-    {
-        VarSet* res = new VarSet();
-        res->unite(getMrdIn(la), la);
-        res->unite(getDef(), la);
-        mrd_out = res;
-        //printf("BLOCK %d INSTR %d MRDOUT: ", num, start->getStmtNo());
-        //mrd_out->print();
-        //print();
-    }
-    return mrd_out;
-}
-
-bool CBasicBlock::stepMrdOut(bool la)
-{
-    if (old_mrd_out)
-        delete old_mrd_out;
-    
-    old_mrd_out = mrd_out;
-    mrd_out = NULL;
-    getMrdOut(la);
-    undef = false;
-    //printf("block %d\n", num);
-    //old_mrd_out->print();
-    //mrd_out->print();
-    return (mrd_out->equal(old_mrd_out));
-    //return true;
-}
-
-bool CBasicBlock::stepMrdIn(bool la)
-{
-    if (old_mrd_in)
-        delete old_mrd_in;
-    
-    old_mrd_in = mrd_in;
-    mrd_in = NULL;
-    getMrdIn(la);
-    return (mrd_in->equal(old_mrd_in));
-    //return true;
-}
-
-bool IsPresentInExprList(SgExpression* ex, CExprList* lst)
-{
-    while (lst != NULL) {
-        if (lst->entry == ex)
-            return true;
-        lst = lst->next;
-    }
-    return false;
-}
-
-CRecordVarEntryInfo* AddRecordVarRef(SgRecordRefExp* ref)
-{
-    if (isSgRecordRefExp(ref->lhs())) {
-        CVarEntryInfo* parent = AddRecordVarRef(isSgRecordRefExp(ref->lhs()));
-        if (parent)
-            return new CRecordVarEntryInfo(ref->rhs()->symbol(), parent);
-        return NULL;
-    }
-    if (isSgVarRefExp(ref->lhs())) {
-        CVarEntryInfo* parent = new CScalarVarEntryInfo(isSgVarRefExp(ref->lhs())->symbol());
-        return new CRecordVarEntryInfo(ref->rhs()->symbol(), parent);
-    }
-    if (isSgArrayRefExp(ref->lhs())) {
-        CVarEntryInfo* parent = new CArrayVarEntryInfo(isSgArrayRefExp(ref->lhs())->symbol(), isSgArrayRefExp(ref->lhs()));
-        return new CRecordVarEntryInfo(ref->rhs()->symbol(), parent);
-    }
-    return NULL;
-}
-
-void CBasicBlock::AddOneExpressionToUse(SgExpression* ex, SgStatement* st, CArrayVarEntryInfo* v)
-{
-    CVarEntryInfo* var = NULL;
-    SgVarRefExp* r;
-    if ((r = isSgVarRefExp(ex)))
-        var = new CScalarVarEntryInfo(r->symbol());
-    SgArrayRefExp* ar;
-    if ((ar = isSgArrayRefExp(ex))) {
-        if (!v)
-            var = new CArrayVarEntryInfo(ar->symbol(), ar);
-        else {
-            var = v->Clone();
-            var->SwitchSymbol(ar->symbol());
-        }
-    }
-    SgRecordRefExp* rr;
-    if ((rr = isSgRecordRefExp(ex)))
-        var = AddRecordVarRef(rr);
-    if (var) {
-        var->RegisterUsage(def, use, st);
-        delete var;
-    }
-}
-
-void CBasicBlock::AddOneExpressionToDef(SgExpression* ex, SgStatement* st, CArrayVarEntryInfo* v)
-{
-    CVarEntryInfo* var = NULL;
-    SgVarRefExp* r;
-    if ((r = isSgVarRefExp(ex)))
-        var = new CScalarVarEntryInfo(r->symbol());
-    SgRecordRefExp* rr;
-    if ((rr = isSgRecordRefExp(ex)))
-        var = AddRecordVarRef(rr);
-    SgArrayRefExp* ar;
-    if ((ar = isSgArrayRefExp(ex))) {
-        if (!v)
-            var = new CArrayVarEntryInfo(ar->symbol(), ar);
-        else {
-            var = v->Clone();
-            var->SwitchSymbol(ar->symbol());
-        }
-    }
-    if (var) {
-        var->RegisterDefinition(def, use, st);
-        delete var;
-    }
-}
-
-void CBasicBlock::addExprToUse(SgExpression* ex, CArrayVarEntryInfo* v = NULL, CExprList* lst = NULL)
-{
-    if (ex != NULL)
-    {
-        CExprList* cur = new CExprList();
-        cur->entry = ex;
-        cur->next = lst;
-        SgFunctionCallExp* f = isSgFunctionCallExp(ex);
-        if (!f) {
-            if (!IsPresentInExprList(ex->lhs(), cur))
-                addExprToUse(ex->lhs(), v, cur);
-            if (!isSgUnaryExp(ex))
-                if (!IsPresentInExprList(ex->rhs(), cur))
-                    addExprToUse(ex->rhs(), v, cur);
-            AddOneExpressionToUse(ex, NULL, v);
-        }
-        delete cur;
-        /*
-        SgVarRefExp* r;
-        //printf(" %s\n", f->funName()->identifier());
-        bool intr = isIntrinsicFunctionNameACC(f->funName()->identifier()) && !IsUserFunctionACC(f->funName());
-        bool pure = IsPureProcedureACC(f->funName());
-        if (!intr && !pure){
-            printf("function not intristic or pure: %s\n", f->funName()->identifier());
-            is_correct = false;
-            return;
-        }
-        if (intr) {
-            ProcessIntristicProcedure(true, f->numberOfArgs(), f);
-            return;
-        }
-        ProcessProcedureHeader(true, isSgProcHedrStmt(GRAPHNODE(f->funName())->st_header), f);
-        */
-    }
-}
-
-void CBasicBlock::ProcessIntrinsicProcedure(bool isF, int narg, void* f, const char* name)
-{
-    for (int i = 0; i < narg; i++) {
-        SgExpression* ar = GetProcedureArgument(isF, f, i);
-        if (IsAnIntrinsicSubroutine(name)) 
-        {
-            SgExpression* v = CheckIntrinsicParameterFlag(name, i, ar, INTRINSIC_IN);
-            if (v)
-                addExprToUse(v);            
-        }
-        else
-            addExprToUse(ar);
-        
-        AddOneExpressionToDef(CheckIntrinsicParameterFlag(name, i, ar, INTRINSIC_OUT), NULL, NULL);
-    }
-}
-
-void CBasicBlock::ProcessProcedureWithoutBody(bool isF, void* f, bool out)
-{
-    for (int i = 0; i < GetNumberOfArguments(isF, f); i++){
-        addExprToUse(GetProcedureArgument(isF, f, i));
-        if (out)
-            AddOneExpressionToDef(GetProcedureArgument(isF, f, i), NULL, NULL);
-    }
-}
-
-SgSymbol* CBasicBlock::GetProcedureName(bool isFunc, void* f)
-{
-    if (isFunc) {
-        SgFunctionCallExp* fc = (SgFunctionCallExp*)f;
-        return fc->funName();
-    }
-    SgCallStmt* pc = (SgCallStmt*)f;
-    return pc->name();
-}
-
-int GetNumberOfArguments(bool isF, void* f)
-{
-    if (isF) {
-        SgFunctionCallExp* fc = (SgFunctionCallExp*)f;
-        return fc->numberOfArgs();
-    }
-    SgCallStmt* pc = (SgCallStmt*)f;
-    return pc->numberOfArgs();
-}
-
-SgExpression* GetProcedureArgument(bool isF, void *f, const int i)
-{
-    SgExpression *arg = NULL;
-    if (isF)
-    {
-        SgFunctionCallExp* fc = (SgFunctionCallExp*)f;
-        arg = fc->arg(i);
-    }
-    else
-    {
-        SgCallStmt *pc = (SgCallStmt*)f;
-        arg = pc->arg(i);
-    }
-    return arg;
-}
-
-void CBasicBlock::ProcessProcedureHeader(bool isF, SgProcHedrStmt *header, void *f, const char* name)
-{   
-    if (!header) 
-    {
-        is_correct = "no header found";
-        failed_proc_name = name;
-        return;
-    }
-    
-    for (int i = 0; i < header->numberOfParameters(); ++i) 
-    {
-        int stored = SwitchFile(header->getFileId());
-        SgSymbol *arg = header->parameter(i);
-        SwitchFile(stored);
-
-        if (arg->attributes() & (IN_BIT)) 
-        {
-            SgExpression *ar = GetProcedureArgument(isF, f, i);
-            addExprToUse(ar);
-        }        
-        else if (arg->attributes() & (INOUT_BIT)) 
-        {
-            addExprToUse(GetProcedureArgument(isF, f, i));
-            AddOneExpressionToDef(GetProcedureArgument(isF, f, i), NULL, NULL);
-        }
-        else if (arg->attributes() & (OUT_BIT))
-            AddOneExpressionToDef(GetProcedureArgument(isF, f, i), NULL, NULL);
-        else 
-        {
-            is_correct = "no bitflag set for pure procedure";
-            break;
-        }
-    }    
-}
-
-bool AnalysedCallsList::isArgIn(int i, CArrayVarEntryInfo** p)
-{
-    int stored = SwitchFile(this->file_id);
-    SgProcHedrStmt* h = isSgProcHedrStmt(header);
-    VarSet* use = graph->getUse();
-    SgSymbol* par = h->parameter(i);
-    /*
-    CScalarVarEntryInfo* var = new CScalarVarEntryInfo(par);
-    bool result = false;
-    if (use->belongs(var))
-        result = true;
-    delete var;
-    */
-    VarItem* result = use->belongs(par);
-    if (result && result->var->GetVarType() == VAR_REF_ARRAY_EXP && p) 
-        *p = (CArrayVarEntryInfo*)result->var;
-    SwitchFile(stored);
-
-    return result;
-}
-
-bool AnalysedCallsList::isArgOut(int i, CArrayVarEntryInfo** p)
-{
-    int stored = SwitchFile(this->file_id);
-    SgProcHedrStmt* h = isSgProcHedrStmt(header);
-    graph->privateAnalyzer();
-    VarSet* def = graph->getDef();
-    SgSymbol* par = h->parameter(i);
-    /*
-    CScalarVarEntryInfo* var = new CScalarVarEntryInfo(par);
-    bool result = false;
-    if (def->belongs(var))
-        result = true;
-    delete var;
-    */
-    VarItem* result = def->belongs(par);
-    if (result && result->var->GetVarType() == VAR_REF_ARRAY_EXP && p) 
-        *p = (CArrayVarEntryInfo*)result->var;
-    SwitchFile(stored);
-
-    return result;
-}
-
-void CommonData::MarkAsUsed(VarSet* use, AnalysedCallsList* lst)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->proc == lst) {
-            for (CommonVarInfo* v = it->info; v != NULL; v = v->next) {
-                CVarEntryInfo* r = v->var;
-                if (use->belongs(r))
-                    v->isInUse = true;
-            }
-        }
-    }
-}
-
-void CBasicBlock::ProcessUserProcedure(bool isFun, void* call, AnalysedCallsList* c)
-{
-    /*
-    if (c == NULL || c->graph == NULL) {
-        is_correct = "no body found for procedure";
-        if (c != NULL)
-            failed_proc_name = c->funName;
-        else
-            failed_proc_name = NULL;
-        return;
-    }
-    */
-    if (c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c != NULL && c->graph != NULL) 
-    {
-        int stored_file_id = SwitchFile(c->file_id);
-        c->graph->getPrivate(); //all sets actually
-        SgStatement *cp = c->header->controlParent();
-        SwitchFile(stored_file_id);
-
-        if (proc && proc->header->variant() == PROC_HEDR && cp == proc->header) {
-            VarSet* use_c = new VarSet();
-            use_c->unite(c->graph->getUse(), false);
-            for (VarItem* exp = use_c->getFirst(); exp != NULL; exp = use_c->getFirst()) {
-                if (exp->var->GetSymbol()->scope() == proc->header) {
-                    addExprToUse(new SgVarRefExp(exp->var->GetSymbol())); // TESTING
-                }
-                use_c->remove(exp->var);
-            }
-            delete use_c;
-            VarSet* def_c = new VarSet();
-            def_c->unite(c->graph->getDef(), true);
-            for (VarItem* exp = def_c->getFirst(); exp != NULL; exp = def_c->getFirst()) {
-                if (exp->var->GetSymbol()->scope() == proc->header) {
-                    def->addToSet(exp->var, NULL);
-                }
-                def_c->remove(exp->var);
-            }
-            delete def_c;
-        }
-
-        pCommons->MarkAsUsed(c->graph->getUse(), c);
-        SgProcHedrStmt* header = isSgProcHedrStmt(c->header);
-        if (!header) {
-            is_correct = "no header for procedure";
-            failed_proc_name = c->funName;
-            return;
-        }
-    }
-
-    for (int i = 0; i < GetNumberOfArguments(isFun, call); i++) 
-    {
-        SgExpression* ar = GetProcedureArgument(isFun, call, i);
-        CArrayVarEntryInfo* tp = NULL;
-        if (c == (AnalysedCallsList*)(-1) || c == (AnalysedCallsList*)(-2) || c == NULL || c->graph == NULL || c->isArgIn(i, &tp))
-            addExprToUse(ar, tp);
-        tp = NULL;
-        if (c == (AnalysedCallsList*)(-1) || c == NULL || c->graph == NULL || c->isArgOut(i, &tp))
-            AddOneExpressionToDef(GetProcedureArgument(isFun, call, i), NULL, tp);
-    }
-
-    if (c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c != NULL && c->graph != NULL) {
-        for (CommonVarSet* cu = c->graph->getCommonUse(); cu != NULL; cu = cu->next) {
-            CommonVarInfo* v = cu->cvd;
-            AnalysedCallsList* tp = start->getProc();
-            CommonDataItem* p = v->parent;
-            if (CommonDataItem* it = pCommons->IsThisCommonUsedInProcedure(p, tp)) {
-                if (pCommons->CanHaveNonScalarVars(it))
-                    continue;
-                CommonVarInfo* i = it->info;
-                CommonVarInfo* j = p->info;
-                while (j != v) {
-                    j = j->next;
-                    if (i)
-                        i = i->next;
-                    else
-                        continue;
-                }
-                if (!i)
-                    continue;
-                SgVarRefExp* var = new SgVarRefExp(i->var->GetSymbol());
-                addExprToUse(var);
-            }
-            else {
-                common_use = new CommonVarSet(*cu);
-            }
-        }
-        for (CommonVarSet* cd = c->graph->getCommonDef(); cd != NULL; cd = cd->next) {
-            CommonVarInfo* v = cd->cvd;
-            AnalysedCallsList* tp = start->getProc();
-            CommonDataItem* p = v->parent;
-            if (CommonDataItem* it = pCommons->IsThisCommonUsedInProcedure(p, tp)) {
-                if (pCommons->CanHaveNonScalarVars(it))
-                    continue;
-                CommonVarInfo* i = it->info;
-                CommonVarInfo* j = p->info;
-                while (j != v) {
-                    j = j->next;
-                    if (i)
-                        i = i->next;
-                }
-                if (!i)
-                    continue;
-                def->addToSet(i->var, NULL);
-            }
-            else {
-                common_def = new CommonVarSet(*cd);
-            }
-        }
-    }
-
-}
-
-bool CommonData::CanHaveNonScalarVars(CommonDataItem* item)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->name == item->name && it->first == item->first && !it->onlyScalars)
-            return true;
-    }
-    bool res = !item->onlyScalars;
-    //printf("CommonData::CanHaveNonScalarVars: %d\n", res);
-    return res;
-}
-
-CommonDataItem* CommonData::IsThisCommonUsedInProcedure(CommonDataItem* item, AnalysedCallsList* p)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->proc == p) {
-            if (it->name == item->name)
-                return it;
-        }
-    }
-    return NULL;
-}
-
-void CBasicBlock::setDefAndUse()
-{
-    ControlFlowItem* p = start;
-    while (p != NULL && (p == start || !p->isLeader()))
-    {
-        if (p->getJump() == NULL)
-        {
-            SgStatement* st = p->getStatement();
-            SgFunctionCallExp* f = p->getFunctionCall();
-            
-            if (f != NULL)
-            {
-                bool add_intr = IsAnIntrinsicSubroutine(f->funName()->identifier()) != NULL; // strcmp(f->funName()->identifier(), "date_and_time") == 0;
-                bool intr = (isIntrinsicFunctionNameACC(f->funName()->identifier()) || add_intr) && !IsUserFunctionACC(f->funName());
-                bool pure = IsPureProcedureACC(f->funName());
-                AnalysedCallsList* c = p->getCall();
-                if (!intr && !pure && c && c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && !(c->IsIntrinsic())) {
-
-                    if (c->header == NULL) {
-                        is_correct = "no header for procedure";
-                        failed_proc_name = c->funName;
-                    }
-                    else {
-                        //graph_node* oldgn = currentGraphNode;
-                        //graph_node* newgn = GRAPHNODE(f->funName())->file_id;
-                        //currentGraphNode = newgn;
-                        ProcessUserProcedure(true, f, c);
-                        //currentGraphNode = oldgn;
-
-                    }
-                }
-                else if (c == (AnalysedCallsList*)(-1) || c == (AnalysedCallsList*)(-2))
-                    ProcessProcedureWithoutBody(true, f, c == (AnalysedCallsList*)(-1));
-                else if (intr || (c && c->IsIntrinsic())) {
-                    ProcessIntrinsicProcedure(true, f->numberOfArgs(), f, f->funName()->identifier());
-                }else
-                    ProcessProcedureHeader(true, isSgProcHedrStmt(GRAPHNODE(f->funName())->st_header), f, f->funName()->identifier());
-            }
-
-
-            if (st != NULL)
-            {
-                switch (st->variant())
-                {
-                case ASSIGN_STAT:
-                    {
-                        SgAssignStmt* s = isSgAssignStmt(st);
-                        SgExpression* l = s->lhs();
-                        SgExpression* r = s->rhs();
-                        addExprToUse(r);
-                        AddOneExpressionToDef(l, st, NULL);
-                        break;
-                    }
-                case PRINT_STAT:
-                case WRITE_STAT:
-                case READ_STAT:
-                    {
-                        SgInputOutputStmt* s = isSgInputOutputStmt(st);
-                        if (s) {
-                            SgExpression* ex = s->itemList();
-                            while (ex && ex->lhs()) {
-                                if (st->variant() == READ_STAT) {
-                                    AddOneExpressionToDef(ex->lhs(), st, NULL);
-                                }
-                                else {
-                                    addExprToUse(ex->lhs());
-                                }
-                                ex = ex->rhs();
-                            }
-                        }
-                        break;
-                    }
-                case PROC_STAT:
-                {
-                    SgCallStmt* f = isSgCallStmt(st);
-                    bool add_intr = IsAnIntrinsicSubroutine(f->name()->identifier()) != NULL;
-                    bool intr = (isIntrinsicFunctionNameACC(f->name()->identifier()) || add_intr) && !IsUserFunctionACC(f->name());
-                    bool pure = IsPureProcedureACC(f->name());
-                    if (!intr && !pure) {
-                        AnalysedCallsList* c = p->getCall();
-                        //graph_node* oldgn = currentGraphNode;
-                        //graph_node* newgn = GRAPHNODE(f->name());
-                        //currentGraphNode = newgn;
-                        ProcessUserProcedure(false, f, c);
-                        //currentGraphNode = oldgn;
-                        break;
-                    }
-                    if (intr) {
-                        ProcessIntrinsicProcedure(false, f->numberOfArgs(), f, f->name()->identifier());
-                        break;
-                    }
-                    ProcessProcedureHeader(false, isSgProcHedrStmt(GRAPHNODE(f->name())->st_header), f, f->name()->identifier());
-                }
-                default:
-                    break;
-                }
-            }
-        }
-        else
-            addExprToUse(p->getExpression());
-            p = p->getNext();
-    }
-}
-
-VarSet* CBasicBlock::getDef()
-{
-    if (def == NULL)
-    {
-        def = new VarSet();
-        use = new VarSet();
-        setDefAndUse();
-    }
-    return def;
-}
-
-VarSet* CBasicBlock::getUse()
-{
-    if (use == NULL)
-    {
-        use = new VarSet();
-        def = new VarSet();
-        setDefAndUse();
-    }
-    return use;
-}
-
-#ifdef __SPF
-template<typename IN_TYPE, typename OUT_TYPE>
-const vector<OUT_TYPE> getAttributes(IN_TYPE st, const set<int> dataType);
-#endif
-
-DoLoopDataItem* DoLoopDataList::FindLoop(SgStatement* st)
-{
-    DoLoopDataItem* it = list;
-    while (it != NULL) {
-        if (it->statement == st)
-            return it;
-        it = it->next;
-    }
-    return NULL;
-}
-
-bool GetExpressionAndCoefficientOfBound(SgExpression* exp, SgExpression** end, int* coef)
-{
-    if (exp->variant() == SUBT_OP) {
-        if (exp->rhs() && exp->rhs()->variant() == INT_VAL) {
-            *end = exp->lhs();
-            *coef = -exp->rhs()->valueInteger();
-            return true;
-        }
-    }
-    if (exp->variant() == ADD_OP) {
-        if (exp->lhs() && exp->lhs()->variant() == INT_VAL) {
-            *end = exp->rhs();
-            *coef = exp->lhs()->valueInteger();
-            return true;
-        }
-        if (exp->rhs() && exp->rhs()->variant() == INT_VAL) {
-            *end = exp->lhs();
-            *coef = exp->lhs()->valueInteger();
-            return true;
-        }
-    }
-    return false;
-}
-
-CArrayVarEntryInfo::CArrayVarEntryInfo(SgSymbol* s, SgArrayRefExp* r) : CVarEntryInfo(s)
-{
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 16);
-#endif
-    // TODO: need to check all alhorithm!!
-    disabled = true;
-
-    if (!r)
-        subscripts = 0;
-    else
-        subscripts = r->numberOfSubscripts();
-    if (subscripts)
-        data.resize(subscripts);    
-
-    for (int i = 0; i < subscripts; i++) 
-    {
-        data[i].defined = false;
-        data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = 0;
-        data[i].step = 1;
-        data[i].left_bound = data[i].right_bound = NULL;
-        data[i].coefs[0] = data[i].coefs[1] = 0;
-        data[i].loop = NULL;
-#if __SPF
-        const vector<int*> coefs = getAttributes<SgExpression*, int*>(r->subscript(i), set<int>{ INT_VAL });
-        const vector<SgStatement*> fs = getAttributes<SgExpression*, SgStatement*>(r->subscript(i), set<int>{ FOR_NODE });
-        if (fs.size() == 1) 
-        {
-            if (data[i].loop != NULL) 
-            {
-                if (coefs.size() == 1) 
-                {
-                    data[i].defined = true;
-                    data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = coefs[0][1];
-                    data[i].coefs[0] = coefs[0][0];
-                    data[i].coefs[1] = coefs[0][1];
-                    data[i].step = coefs[0][0];
-                    int tmp;
-
-                    SgExpression *et;
-                    if (GetExpressionAndCoefficientOfBound(data[i].loop->l, &et, &tmp)) 
-                    {
-                        data[i].left_bound = et;
-                        data[i].bound_modifiers[0] += tmp;
-                    }
-                    else 
-                        data[i].left_bound = data[i].loop->l;
-                    
-                    if (GetExpressionAndCoefficientOfBound(data[i].loop->r, &et, &tmp)) 
-                    {
-                        data[i].right_bound = et;
-                        data[i].bound_modifiers[1] += tmp;
-                    }
-                    else 
-                        data[i].right_bound = data[i].loop->r;                    
-                }
-            }
-        }
-#endif
-        if (!data[i].defined) 
-        {
-            SgExpression* ex = r->subscript(i);
-            if (ex->variant() == INT_VAL) 
-            {
-                data[i].bound_modifiers[0] = ex->valueInteger();
-                data[i].bound_modifiers[1] = ex->valueInteger();
-                data[i].defined = true;
-            }
-            else 
-            {
-                data[i].bound_modifiers[0] = 0;
-                data[i].bound_modifiers[1] = 0;
-                data[i].left_bound = data[i].right_bound = ex;
-                data[i].defined = true;
-            }
-        }
-    }
-}
-
-CArrayVarEntryInfo::CArrayVarEntryInfo(SgSymbol *s, int sub, int ds, const vector<ArraySubscriptData> &d) 
-                                       : CVarEntryInfo(s), subscripts(sub), disabled(ds)
-{ 
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 16);
-#endif
-    if (sub > 0) 
-        data = d;
-}
-
-VarItem* VarSet::GetArrayRef(CArrayVarEntryInfo* info)
-{
-    VarItem* it = list;
-    while (it != NULL) {
-        CVarEntryInfo* v = it->var;
-        if (v->GetVarType() == VAR_REF_ARRAY_EXP) {
-            if (OriginalSymbol(info->GetSymbol()) == OriginalSymbol(v->GetSymbol()))
-                return it;
-        }
-        it = it->next;
-    }
-    return NULL;
-}
-
-void CArrayVarEntryInfo::RegisterUsage(VarSet *def, VarSet *use, SgStatement *st)
-{
-    VarItem *it = def->GetArrayRef(this);
-    CArrayVarEntryInfo *add = this;
-    if (it != NULL) 
-        add = *this - *(CArrayVarEntryInfo*)(it->var);
-    
-    if (use != NULL && add != NULL && add->HasActiveElements()) 
-        use->addToSet(add, st);
-    
-    if (add != this)
-        delete add;
-}
-
-CArrayVarEntryInfo& CArrayVarEntryInfo::operator-=(const CArrayVarEntryInfo& b)
-{
-    if (subscripts == 0)
-    {
-        if (b.HasActiveElements()) 
-            disabled = true;        
-        return *this;
-    }
-
-    if (b.subscripts == 0) 
-    {
-        if (HasActiveElements()) 
-            MakeInactive();        
-        return *this;
-    }
-
-    if (subscripts != b.subscripts || !data.size() || !b.data.size() || !(data[0].defined) || !(b.data[0].defined)) 
-        return *this;
-    
-    for (int i = 0; i < subscripts; i++) 
-    {
-        if (b.data[i].left_bound == NULL) 
-        {
-            if (data[i].left_bound && data[i].left_bound->variant() == INT_VAL) 
-            {
-                if (data[i].left_bound->valueInteger() + data[i].bound_modifiers[0] == b.data[i].bound_modifiers[0]) 
-                {
-                    data[i].bound_modifiers[0]++;
-                    continue;
-                }
-            }
-        }
-
-        if (data[i].left_bound == NULL && b.data[i].left_bound == NULL &&
-            data[i].right_bound == NULL && b.data[i].right_bound == NULL) 
-        {
-            if (data[i].bound_modifiers[0] < b.data[i].bound_modifiers[0]) 
-            {
-                data[i].bound_modifiers[1] = b.data[i].bound_modifiers[0] - 1;
-                continue;
-            }
-
-            if (data[i].bound_modifiers[1] > b.data[i].bound_modifiers[1]) 
-            {
-                data[i].bound_modifiers[0] = b.data[i].bound_modifiers[1] + 1;
-                continue;
-            }
-            data[i].defined = false;
-        }
-
-        if (data[i].left_bound == b.data[i].left_bound && data[i].bound_modifiers[0] < b.data[i].bound_modifiers[0]) 
-        {
-            data[i].bound_modifiers[0] = data[i].bound_modifiers[0];
-            data[i].bound_modifiers[1] = b.data[i].bound_modifiers[0] - 1;
-            data[i].right_bound = data[i].left_bound;
-        }
-
-        if (data[i].right_bound == b.data[i].right_bound && data[i].bound_modifiers[1] > b.data[i].bound_modifiers[1]) 
-        {
-            data[i].bound_modifiers[0] = b.data[i].bound_modifiers[1] + 1;
-            data[i].bound_modifiers[1] = data[i].bound_modifiers[1];
-            data[i].left_bound = data[i].right_bound;
-        }
-
-        if (b.data[i].left_bound == NULL && b.data[i].right_bound == NULL && 
-            (data[i].left_bound != NULL || data[i].right_bound != NULL))
-            continue;        
-        else 
-        {
-            data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = 0;
-            data[i].left_bound = NULL;
-            data[i].right_bound = NULL;
-            data[i].defined = false;
-            //empty set
-        }
-    }
-    return *this;
-}
-
-CArrayVarEntryInfo* operator-(const CArrayVarEntryInfo& a, const CArrayVarEntryInfo& b)
-{
-    //return NULL;
-    CArrayVarEntryInfo* nv = (CArrayVarEntryInfo*)a.Clone();
-    *nv -= b;
-    return nv;
-}
-
-CArrayVarEntryInfo* operator+(const CArrayVarEntryInfo& a, const CArrayVarEntryInfo& b)
-{
-    CArrayVarEntryInfo* nv = (CArrayVarEntryInfo*)a.Clone();
-    *nv += b;
-    return nv;
-}
-
-void CArrayVarEntryInfo::RegisterDefinition(VarSet* def, VarSet* use, SgStatement* st)
-{
-    def->addToSet(this, st);
-    use->PossiblyAffectArrayEntry(this);
-}
-
-void VarSet::PossiblyAffectArrayEntry(CArrayVarEntryInfo* var)
-{
-    VarItem* it = GetArrayRef(var);
-    if (!it)
-        return;
-    ((CArrayVarEntryInfo*)(it->var))->ProcessChangesToUsedEntry(var);
-}
-
-void CArrayVarEntryInfo::ProcessChangesToUsedEntry(CArrayVarEntryInfo* var)
-{
-    if (disabled || var->disabled || subscripts != var->subscripts)
-        return;
-    for (int i = 0; i < subscripts; i++) 
-    {
-        if (!data[i].defined)
-            continue;
-
-        if (data[i].loop == var->data[i].loop && data[i].loop != NULL) 
-        {
-            if (data[i].coefs[0] == var->data[i].coefs[0])
-            {
-                if (data[i].coefs[1] < var->data[i].coefs[1]) 
-                {
-                    if (data[i].left_bound && data[i].left_bound->variant() == INT_VAL) 
-                    {
-                        data[i].bound_modifiers[0] = data[i].left_bound->valueInteger() + data[i].bound_modifiers[0];
-                        data[i].bound_modifiers[1] = data[i].left_bound->valueInteger() + var->data[i].coefs[1] - 1;
-                        data[i].left_bound = data[i].right_bound = NULL;
-                    }
-                    else 
-                    {
-                        //maybe add something, not sure
-                    }
-                }
-            }
-        }
-    }
-}
-
-CArrayVarEntryInfo& CArrayVarEntryInfo::operator*=(const CArrayVarEntryInfo& b)
-{
-    if (subscripts == 0)
-    {
-        if (b.HasActiveElements())
-            disabled = true;
-        return *this;
-    }
-
-    if (b.subscripts == 0)
-    {
-        if (HasActiveElements())
-            MakeInactive();
-        return *this;
-    }
-
-    //return *this;
-    if (subscripts != b.subscripts || subscripts == 0 || b.subscripts == 0 || !data.size() || !b.data.size() || !(data[0].defined) || !(b.data[0].defined)) 
-        return *this;
-    
-    for (int i = 0; i < subscripts; i++) 
-    {
-        if (b.disabled) 
-            data[i].left_bound = data[i].right_bound = NULL;
-        
-        if (data[i].left_bound == b.data[i].left_bound) 
-            data[i].bound_modifiers[0] = std::max(data[i].bound_modifiers[0], b.data[i].bound_modifiers[0]);
-        
-        if (data[i].right_bound == b.data[i].right_bound) 
-            data[i].bound_modifiers[1] = std::min(data[i].bound_modifiers[1], b.data[i].bound_modifiers[1]);        
-    }
-    return *this;
-}
-
-CArrayVarEntryInfo& CArrayVarEntryInfo::operator+=(const CArrayVarEntryInfo& b)
-{
-    if (subscripts == 0)
-    {
-        if (b.HasActiveElements())
-            disabled = true;
-        return *this;
-    }
-
-    if (b.subscripts == 0)
-    {
-        if (HasActiveElements())
-            MakeInactive();
-        return *this;
-    }
-
-    //return *this;
-    if (disabled && !b.disabled && b.data.size()) 
-    {
-        for (int i = 0; i < subscripts; i++)
-            data[i] = b.data[i];
-        disabled = false;
-        return *this;
-    }
-
-    if (subscripts != b.subscripts || subscripts == 0 || b.subscripts == 0 || !data.size() || !b.data.size() || disabled || b.disabled) 
-        return *this;
-    
-    for (int i = 0; i < subscripts; i++) 
-    {
-
-        if (data[i].left_bound == b.data[i].left_bound) 
-            data[i].bound_modifiers[0] = std::min(data[i].bound_modifiers[0], b.data[i].bound_modifiers[0]);
-        
-        if (data[i].right_bound == b.data[i].right_bound) 
-            data[i].bound_modifiers[1] = std::max(data[i].bound_modifiers[1], b.data[i].bound_modifiers[1]);
-        
-        if (data[i].left_bound == NULL && data[i].right_bound == NULL && (b.data[i].left_bound != NULL || b.data[i].right_bound != NULL)) 
-        {
-            const ArraySubscriptData &tmp = data[i];
-            data[i] = b.data[i];
-            if (data[i].left_bound && data[i].left_bound->variant() == INT_VAL) 
-            {
-                if (tmp.bound_modifiers[1] == data[i].left_bound->valueInteger() + data[i].bound_modifiers[0] - 1) 
-                    data[i].bound_modifiers[0] -= (1 + tmp.bound_modifiers[1] - tmp.bound_modifiers[0]);
-                
-            }
-
-            if (data[i].right_bound && data[i].right_bound->variant() == INT_VAL) 
-            {
-                if (tmp.bound_modifiers[0] == data[i].left_bound->valueInteger() + data[i].bound_modifiers[1] + 1) 
-                    data[i].bound_modifiers[1] += (1 + tmp.bound_modifiers[1] - tmp.bound_modifiers[0]);                
-            }
-        }
-    }
-    return *this;
-}
-
-void VarSet::RemoveDoubtfulCommonVars(AnalysedCallsList* call)
-{
-    VarItem* it = list;
-    VarItem* prev = NULL;
-    while (it != NULL) {
-        CommonDataItem* d = pCommons->IsThisCommonVar(it, call);
-        if (d && pCommons->CanHaveNonScalarVars(d)) {
-            if (prev == NULL) {
-                it = it->next;
-                delete list;
-                list = it;
-            }
-            else {
-                prev->next = it->next;
-                delete it;
-                it = prev->next;
-            }
-            continue;
-        }
-        prev = it;
-        it = it->next;
-    }
-}
-
-int VarSet::count()
-{
-    VarItem* it = list;
-    int t = 0;
-    while (it != NULL) {
-        it = it->next;
-        t++;
-    }
-    return t;
-}
-
-void VarSet::LeaveOnlyRecords()
-{
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL) {
-        if (p->var->GetVarType() == VAR_REF_RECORD_EXP) {
-            CVarEntryInfo* rrec = p->var->GetLeftmostParent();
-            CVarEntryInfo* old = p->var;
-            if (old->RemoveReference())
-                delete old;
-            if (!belongs(rrec)) {
-                p->var = rrec;
-                prev = p;
-            }
-            else {
-                if (prev == NULL)
-                    list = list->next;
-                else
-                {
-                    prev->next = p->next;
-                    delete(p);
-                    p = prev;
-                }
-            }
-        }
-        else {
-            prev = p;
-        }
-        p = p->next;
-    }
-}
-
-VarItem* VarSet::belongs(const CVarEntryInfo* var, bool os)
-{
-    VarItem* l = list;
-    while (l != NULL)
-    {
-        if ((*l->var == *var))
-            return l;
-        if (os && OriginalSymbol(l->var->GetSymbol()) == OriginalSymbol(var->GetSymbol()))
-            return l;
-        l = l->next;
-    }
-    return NULL;
-}
-
-VarItem* VarSet::belongs(SgSymbol* s, bool os)
-{
-    VarItem* l = list;
-    while (l != NULL)
-    {
-        if ((l->var->GetSymbol() == s))
-            if (l->var->GetVarType() == VAR_REF_ARRAY_EXP)
-                return ((CArrayVarEntryInfo*)(l->var))->HasActiveElements() ? l : NULL;
-            return l;
-        if (os && OriginalSymbol(l->var->GetSymbol()) == OriginalSymbol(s))
-            return l;
-        l = l->next;
-    }
-    return NULL;
-}
-
-/*
-VarItem* VarSet::belongs(SgVarRefExp* var, bool os)
-{
-    return belongs(var->symbol(), os);
-}
-*/
-
-bool VarSet::equal(VarSet* p2)
-{
-    if (p2 == NULL)
-        return false;
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {
-        if (!p2->belongs(p->var) && (p->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(p->var))->HasActiveElements()))
-            return false;
-        p = p->next;
-    }
-    p = p2->list;
-    while (p != NULL) {
-        if (!belongs(p->var) && (p->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(p->var))->HasActiveElements()))
-            return false;
-        p = p->next;
-    }
-    return true;
-}
-
-void VarSet::print()
-{
-    VarItem* l = list;
-    while (l != NULL)
-    {
-        if (l->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(l->var))->HasActiveElements())
-            printf("%s ", l->var->GetSymbol()->identifier());
-#if PRIVATE_GET_LAST_ASSIGN
-        printf("last assignments: %d\n", l->lastAssignments.size());
-        for (list<SgStatement*>::iterator it = l->lastAssignments.begin(); it != l->lastAssignments.end(); it++){
-            if (*it)
-                printf("%s", (*it)->unparse());
-        }
-#endif
-        l = l->next;
-    }
-    putchar('\n');
-}
-
-void VarSet::addToSet(CVarEntryInfo* var, SgStatement* source, CVarEntryInfo* ov)
-{
-    bool add = false;
-    if (var->GetVarType() != VAR_REF_ARRAY_EXP) {
-        VarItem* p = belongs(var, false);
-        add = p == NULL;
-#if PRIVATE_GET_LAST_ASSIGN
-        p->lastAssignments.clear();
-        p->lastAssignments.push_back(source);
-#endif
-        //delete p->lastAssignments;
-        //p->lastAssignments = new CLAStatementItem();
-        //p->lastAssignments->stmt = source;
-        //p->lastAssignments->next = NULL;
-    }
-    else {
-        CArrayVarEntryInfo* av = (CArrayVarEntryInfo*)var;
-        VarItem* p = GetArrayRef(av);
-        if (p == NULL)
-            add = true;
-        else {
-            CArrayVarEntryInfo* fv = (CArrayVarEntryInfo*)p->var;
-            *fv += *av;
-        }
-    }
-    if (add) {
-        VarItem* p = new VarItem();
-        p->var = var->Clone();
-        p->ov = ov;
-        p->next = list;
-        p->file_id = current_file_id;
-        list = p;
-    }
-}
-
-void VarSet::intersect(VarSet* set, bool la, bool array_mode = false)
-{
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {        
-        VarItem* n = set->belongs(p->var);
-        if (!n)
-        {
-            if (!array_mode || p->var->GetVarType() == VAR_REF_VAR_EXP) {
-                if (prev == NULL)
-                    list = list->next;
-                else
-                {
-                    prev->next = p->next;
-                    delete(p);
-                    p = prev;
-                }
-            }
-        }
-        else {
-#if PRIVATE_GET_LAST_ASSIGN
-            if (la)
-                p->lastAssignments.insert(p->lastAssignments.end(), n->lastAssignments.begin(), n->lastAssignments.end());
-#endif
-            if (p->var->GetVarType() == VAR_REF_ARRAY_EXP) {
-                if (!array_mode)
-                    *(CArrayVarEntryInfo*)(p->var) *= *(CArrayVarEntryInfo*)(n->var);
-                else
-                    *(CArrayVarEntryInfo*)(p->var) += *(CArrayVarEntryInfo*)(n->var);
-            }
-            prev = p;
-        }
-        p = p->next;
-    }
-    
-}
-
-VarItem* VarSet::getFirst()
-{
-    return list;
-}
-
-void VarSet::remove(const CVarEntryInfo* var)
-{
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {
-        if (var == (p->var))
-        {
-            if (prev == NULL) {
-                VarItem* t = list;
-                list = list->next;
-                delete(t);
-                p = list;
-
-            }
-            else
-            {
-                prev->next = p->next;
-                delete(p);
-                p = prev->next;
-            }
-        }
-        else {
-            prev = p;
-            p = p->next;
-        }
-    }
-}
-
-void VarSet::minus(VarSet* set, bool complete)
-{
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {
-        VarItem* d = set->belongs(p->var);
-        if (d && (p->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(d->var))->HasActiveElements()))
-        {
-            if (p->var->GetVarType() == VAR_REF_ARRAY_EXP && !complete) {
-                *(CArrayVarEntryInfo*)(p->var) -= *(CArrayVarEntryInfo*)(d->var);
-                prev = p;
-            }
-            else if (prev == NULL)
-                list = list->next;
-            else
-            {
-                prev->next = p->next;
-                delete(p);
-                p = prev;
-            }
-        }
-        else
-            prev = p;
-
-        p = p->next;
-    }
-}
-
-bool VarSet::RecordBelong(CVarEntryInfo* rec) 
-{
-    if (rec->GetVarType() != VAR_REF_RECORD_EXP)
-        return false;
-    CRecordVarEntryInfo* rrec = static_cast<CRecordVarEntryInfo*>(rec);
-    CVarEntryInfo* lm = rrec->GetLeftmostParent();
-    VarItem* p = list;
-    while (p != NULL) {
-        if (*lm == *(p->var->GetLeftmostParent()))
-            return true;
-        p = p->next;
-    }
-    return false;
-}
-
-void VarSet::minusFinalize(VarSet* set, bool complete)
-{
-    minus(set, complete);
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {
-        if (set->RecordBelong(p->var)) {
-            {
-                if (prev == NULL)
-                    list = list->next;
-                else
-                {
-                    prev->next = p->next;
-                    delete(p);
-                    p = prev;
-                }
-            }
-        }
-        else
-            prev = p;
-
-        p = p->next;
-    }
-}
-
-unsigned int counter = 0;
-
-CLAStatementItem::~CLAStatementItem()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-    if (next)
-        delete next;
-}
-
-CLAStatementItem* CLAStatementItem::GetLast()
-{
-    if (next == NULL)
-        return this;
-    return next->GetLast();
-}
-
-void VarSet::unite(VarSet* set, bool la)
-{
-    VarItem* arg2 = set->list;
-    while (arg2 != NULL)
-    {
-        VarItem* n = belongs(arg2->var);
-        if (!n)
-        {
-            n = new VarItem();
-            if (arg2->var->GetVarType() == VAR_REF_ARRAY_EXP)
-                n->var = arg2->var->Clone();
-            else {
-                n->var = arg2->var;
-                n->var->AddReference();
-            }
-            n->ov = arg2->ov;
-            n->next = list;
-            n->file_id = arg2->file_id;
-#if PRIVATE_GET_LAST_ASSIGN
-            if (la)
-                n->lastAssignments = arg2->lastAssignments;
-#endif
-            list = n;
-        }
-        else {
-#if PRIVATE_GET_LAST_ASSIGN
-            if (la) {
-                //n->lastAssignments.insert(n->lastAssignments.end(), arg2->lastAssignments.begin(), arg2->lastAssignments.end());
-                //n->lastAssignments.splice(n->lastAssignments.end(), arg2->lastAssignments);
-                //n->lastAssignments->GetLast()->next = arg2->lastAssignments;
-                n->lastAssignments = arg2->lastAssignments;
-            }
-#endif
-            //counter++;
-            //if (counter % 100 == 0)
-                //printf("%d!\n", counter);
-            if (n->var->GetVarType() == VAR_REF_ARRAY_EXP) {
-                *(CArrayVarEntryInfo*)(n->var) += *(CArrayVarEntryInfo*)(arg2->var);
-            }
-        }
-        arg2 = arg2->next;
-    }
-}
-
-
-
-void CBasicBlock::addToPrev(CBasicBlock* bb, bool for_jump_flag, bool c, ControlFlowItem* check)
-{
-    BasicBlockItem* n = new BasicBlockItem();
-    n->block = bb;
-    n->next = prev;
-    n->for_jump_flag = for_jump_flag;
-    n->cond_value = c;
-    n->jmp = check;
-    prev = n;
-}
-
-void CBasicBlock::addToSucc(CBasicBlock* bb, bool for_jump_flag, bool c, ControlFlowItem* check)
-{
-    BasicBlockItem* n = new BasicBlockItem();
-    n->block = bb;
-    n->for_jump_flag = for_jump_flag;
-    n->next = succ;
-    n->cond_value = c;
-    n->jmp = check;
-    succ = n;
-}
-
-#if ACCAN_DEBUG
-
-void ControlFlowItem::printDebugInfo()
-{
-    if (jmp == NULL && stmt == NULL && func != NULL)
-        printf("FUNCTION CALL: %s\n", func->unparse());
-    if (jmp == NULL)
-        if (stmt != NULL)
-            if (label != NULL)
-                printf("%d: %s %s %s lab %4d %s", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id(), stmt->unparse());
-            else
-                printf("%d: %s %s %s          %s", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", stmt->unparse());
-        else
-            if (label != NULL)
-                printf("%d: %s %s %s lab %4d \n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id());
-            else
-                printf("%d: %s %s %s         \n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ");
-    else
-        if (expr == NULL)
-            if (label != NULL)
-                printf("%d: %s %s %s lab %4d       goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id(), jmp->getStmtNo());
-            else
-                printf("%d: %s %s %s                goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", jmp->getStmtNo());
-        else
-            if (label != NULL)
-                printf("%d: %s %s %s lab %4d       if %s goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id(), expr->unparse(), jmp->getStmtNo());
-            else
-                printf("%d: %s %s %s                if %s goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", expr->unparse(), jmp->getStmtNo());
-}
-
-static void printControlFlowList(ControlFlowItem* list, ControlFlowItem* last)
-{
-
-    printf("DEBUG PRINT START\n");
-    unsigned int stmtNo = 0;
-    ControlFlowItem* list_copy = list;
-    while (list != NULL )
-    {
-        list->setStmtNo(++stmtNo);
-        if (list == last)
-            break;
-        list = list->getNext();
-    }
-
-    list = list_copy;
-    while (list != NULL)
-    {
-        list->printDebugInfo();
-        if (list == last)
-            break;
-        list = list->getNext();
-    }
-    printf("DEBUG PRINT END\n\n");
-}
-#endif
-
-void CallData::printControlFlows()
-{
-#if ACCAN_DEBUG
-    AnalysedCallsList* l = calls_list;
-    while (l != NULL) {
-        if (!l->isIntrinsic && l->graph != NULL && l->header != NULL) {
-            ControlFlowGraph* g = l->graph;
-            SgStatement* h = l->header;
-            printf("CFI for %s\n\n" ,h->symbol()->identifier());
-            if (g != NULL) {
-                printControlFlowList(g->getCFI());
-            }
-            else
-                printf("ERROR: DOES NOT HAVE CFI\n");
-        }
-        l = l->next;
-    }
-#endif
-}
+#include "leak_detector.h"
+
+#include "dvm.h"
+#include "acc_analyzer.h"
+#include "calls.h"
+#include <fstream>
+#include <stdint.h>
+
+using std::string;
+using std::vector;
+using std::map;
+using std::list;
+using std::make_pair;
+using std::set;
+using std::pair;
+
+#if __SPF
+using std::wstring;
+#include "Utils/AstWrapper.h"
+#include "Utils/utils.h"
+#include "Utils/errors.h"
+
+static pair<wstring, string> getText(const char *s, const wchar_t *s1, const char *t, int num, SgStatement *stmt, int &line)
+{
+    pair<wstring, string> ret;
+
+    wchar_t bufW[1024];
+#if _WIN32
+    swprintf(bufW, s1, to_wstring(t).c_str());
+#else
+    swprintf(bufW, 1024, s1, to_wstring(t).c_str());
+#endif
+    ret.first = bufW;
+
+    char buf[1024];
+    sprintf(buf, s, t);
+    ret.second = buf;
+
+    line = stmt->lineNumber();
+    if (line == 0)
+    {
+        line = 1;
+        if (stmt->variant() == DVM_PARALLEL_ON_DIR)
+        {
+            line = stmt->lexNext()->lineNumber();
+            ret.first += RR158_1;
+            ret.second += " for this loop";
+        }
+    }
+
+    if (stmt->variant() == SPF_ANALYSIS_DIR)
+    {
+        ret.first += RR158_1;
+        ret.second += " for this loop";
+    }
+
+    return ret;
+}
+
+static inline bool ifVarIsLoopSymb(SgStatement *stmt, const string symb)
+{    
+    bool ret = false;
+    if (stmt == NULL)
+        return ret;
+
+    int var = stmt->variant();    
+    if (var == SPF_ANALYSIS_DIR || var == SPF_PARALLEL_DIR || var == SPF_TRANSFORM_DIR || var == SPF_PARALLEL_REG_DIR || var == SPF_END_PARALLEL_REG_DIR)
+        stmt = stmt->lexNext();
+        
+    SgForStmt *forS = isSgForStmt(stmt);
+    if (forS)
+    {
+        SgStatement *end = forS->lastNodeOfStmt();
+        for (; stmt != end && !ret; stmt = stmt->lexNext())
+            if (stmt->variant() == FOR_NODE)
+                if (isSgForStmt(stmt)->symbol()->identifier() == symb)
+                    ret = true;
+    }
+
+    return ret;
+}
+
+
+template<typename fillType> void fillPrivatesFromComment(Statement *st, std::set<fillType> &privates, int type = -1);
+
+inline void Warning(const char *s, const wchar_t *s1, const char *t, int num, SgStatement *stmt)
+{
+    //TODO: is it correct?
+    if (stmt == NULL)
+        return;
+
+    if (num == PRIVATE_ANALYSIS_REMOVE_VAR)
+    {
+        SgStatement *found = SgStatement::getStatementByFileAndLine(string(stmt->fileName()), stmt->lineNumber());
+        if (found != NULL)
+        {
+            if (ifVarIsLoopSymb(found, t))
+                return;
+        }
+
+        set<string> privates;
+        fillPrivatesFromComment(new Statement(stmt), privates);
+        if (privates.find(t) != privates.end())
+            return;
+    }
+
+    
+    int line;
+    auto retVal = getText(s, s1, t, num, stmt, line);
+    printLowLevelWarnings(stmt->fileName(), line, retVal.first.c_str(), retVal.second.c_str(), 1029);
+}
+
+inline void Note(const char *s, const wchar_t *s1, const char *t, int num, SgStatement *stmt)
+{    
+    int line;
+    auto retVal = getText(s, s1, t, num, stmt, line);
+    printLowLevelNote(stmt->fileName(), line, retVal.first.c_str(), retVal.second.c_str(), 1030);
+}
+#endif
+
+// local functions
+static ControlFlowItem* getControlFlowList(SgStatement*, SgStatement*, ControlFlowItem**, SgStatement**, doLoops*, CallData*, CommonData*);
+static ControlFlowItem* processOneStatement(SgStatement** stmt, ControlFlowItem** pred, ControlFlowItem **list, ControlFlowItem* oldcur, doLoops*, CallData*, CommonData*);
+static ControlFlowItem* switchItem(SgStatement* stmt, ControlFlowItem* empty, SgStatement** lastAnStmt, doLoops* loops, CallData* calls, CommonData*);
+static ControlFlowItem* ifItem(SgStatement*, ControlFlowItem*, SgStatement** lastAnStmt, doLoops* loops, bool ins, CallData*, CommonData*);
+static void setLeaders(ControlFlowItem*);
+static void clearList(ControlFlowItem*);
+static void fillLabelJumps(ControlFlowItem*);
+static SgExpression* GetProcedureArgument(bool isF, void* f, int i);
+static int GetNumberOfArguments(bool isF, void* f);
+#if ACCAN_DEBUG
+static void printControlFlowList(ControlFlowItem*, ControlFlowItem* last = NULL);
+#endif
+
+//static ControlFlowGraph* GetControlFlowGraphWithCalls(bool, SgStatement*, CallData*, CommonData*);
+//static void FillCFGSets(ControlFlowGraph*);
+static void FillPrivates(ControlFlowGraph*);
+static ControlFlowItem* AddFunctionCalls(SgStatement*, CallData*, ControlFlowItem**, CommonData*);
+
+const char* is_correct = NULL;
+const char* failed_proc_name = NULL;
+static PrivateDelayedItem* privateDelayedList = NULL;
+static AnalysedCallsList* currentProcedure = NULL;
+static AnalysedCallsList* mainProcedure = NULL;
+static DoLoopDataList* doLoopList = NULL;
+static CommonData* pCommons;
+static CallData* pCalls;
+
+int total_privates = 0;
+int total_pl = 0;
+
+static const IntrinsicSubroutineData intrinsicData[] = {
+    {"date_and_time", 4, { {-1, "date", INTRINSIC_OUT}, {-1, "time", INTRINSIC_OUT }, {-1, "zone", INTRINSIC_OUT }, {-1, "values", INTRINSIC_OUT } } },
+    {"mod", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
+    {"dvtime", 0, {}},
+    {"abs", 1, { {1, NULL, INTRINSIC_IN} } },
+    {"max", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
+    {"min", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
+    {"wtime", 1, { {1, NULL, INTRINSIC_IN} } },
+    {"dble", 1, { {1, NULL, INTRINSIC_IN } } },
+    {"dabs", 1, { {1, NULL, INTRINSIC_IN } } },
+    {"dmax1", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN } } },
+    {"dmin1", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN } } },
+    {"dsqrt", 1, { {1, NULL, INTRINSIC_IN} } },
+    {"dcos", 1, { {1, NULL, INTRINSIC_IN} } },
+    {"datan2", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
+    {"dsign", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
+    {"dlog", 1, { {1, NULL, INTRINSIC_IN} } },
+    {"dexp", 1, { {1, NULL, INTRINSIC_IN} } },
+    {"omp_get_wtime", 0, {}},
+    {"sqrt", 1, { {1, NULL, INTRINSIC_IN} } },
+    {"int", 1, { {1, NULL, INTRINSIC_IN} } },
+    {"iabs", 1, { {1, NULL, INTRINSIC_IN} } },
+    {"fnpr", 4, { {1, NULL, INTRINSIC_IN},{ 2, NULL, INTRINSIC_IN },{ 3, NULL, INTRINSIC_IN },{ 4, NULL, INTRINSIC_IN } } },
+    {"isnan", 1, { {1, NULL, INTRINSIC_IN } } }
+};
+
+//TODO: it does not work
+//static map<SgStatement*, tuple<ControlFlowGraph*, CallData*, CommonData*>> CFG_cache;
+
+
+static bool isIntrinsicFunctionNameACC(char* name)
+{
+#if USE_INTRINSIC_DVM_LIST
+    return isIntrinsicFunctionName(name);
+#else
+    return false;
+#endif
+}
+
+int SwitchFile(int file_id)
+{
+    if (file_id == current_file_id || file_id == -1)
+        return file_id;
+    int stored_file_id = current_file_id;
+    current_file_id = file_id;
+    current_file = &(CurrentProject->file(current_file_id));
+    return stored_file_id;
+}
+
+SgStatement * lastStmtOfDoACC(SgStatement *stdo)
+{
+    // is a copied function
+    SgStatement *st;
+    // second version  (change 04.03.08) 
+    st = stdo;
+RE: st = st->lastNodeOfStmt();
+    if ((st->variant() == FOR_NODE) || (st->variant() == WHILE_NODE))
+        goto RE;
+
+    else if (st->variant() == LOGIF_NODE)
+        return(st->lexNext());
+
+    else
+        return(st);
+
+}
+
+#ifdef __SPF
+bool IsPureProcedureACC(SgSymbol* s)
+#else
+static bool IsPureProcedureACC(SgSymbol* s)
+#endif
+{
+    // is a copied function
+    SgSymbol *shedr = NULL;
+
+    shedr = GetProcedureHeaderSymbol(s);
+    if (shedr)
+        return(shedr->attributes() & PURE_BIT);
+    else
+        return 0;
+}
+
+static bool IsUserFunctionACC(SgSymbol* s)
+{
+    // is a copied function
+    return(s->attributes() & USER_PROCEDURE_BIT);
+}
+
+static const IntrinsicSubroutineData* IsAnIntrinsicSubroutine(const char* name)
+{
+    for (int i = 0; i < sizeof(intrinsicData) / sizeof(intrinsicData[0]); i++)
+        if (strcmp(name, intrinsicData[i].name) == 0)
+            return &(intrinsicData[i]);
+    return NULL;
+}
+
+static SgExpression* CheckIntrinsicParameterFlag(const char* name, int arg, SgExpression* p, unsigned char flag)
+{
+    const IntrinsicSubroutineData* info = IsAnIntrinsicSubroutine(name);
+    if (!info)
+        return NULL; //better avoid this
+    for (int i = 0; i < info->args; i++) 
+    {
+        const IntrinsicParameterData* pd = &(info->parameters[i]);
+        if (pd->index == arg + 1)
+            return (pd->status & flag) != 0 ? p : NULL;
+
+        SgKeywordArgExp* kw = isSgKeywordArgExp(p);
+        if (kw) 
+        {
+            SgExpression* a = kw->arg();
+            SgExpression* val = kw->value();
+            if (pd->name && strcmp(a->unparse(), pd->name) == 0)
+                return (pd->status & flag) != 0 ? val : NULL;
+        }
+    }
+    return NULL;
+}
+/*
+//For parameters replacements in expressions
+//#ifdef __SPF
+
+VarsKeeper varsKeeper;
+
+SgExpression* GetValueOfVar(SgExpression* var)
+{
+    return varsKeeper.GetValueOfVar(var);
+}
+
+void VarsKeeper::GatherVars(SgStatement* start)
+{
+    pCommons = &(data->commons);
+    pCalls = &(data->calls);
+    currentProcedure = data->calls.AddHeader(start, false, start->symbol());
+    mainProcedure = currentProcedure;
+    //stage 1: preparing graph data
+    data->graph = GetControlFlowGraphWithCalls(true, start, &(data->calls), &(data->commons));
+    data->calls.AssociateGraphWithHeader(start, data->graph);
+    data->commons.MarkEndOfCommon(currentProcedure);
+    //calls.printControlFlows();
+    //stage 2: data flow analysis
+    FillCFGSets(data->graph);
+    //stage 3: fulfilling loop data
+    FillPrivates(data->graph);
+
+    if (privateDelayedList)
+            delete privateDelayedList;
+        privateDelayedList = NULL;
+}
+
+SgExpression* VarsKeeper::GetValueOfVar(SgExpression* var)
+{
+    FuncData* curData = data;
+}
+
+//#endif
+*/
+
+
+
+void SetUpVars(CommonData* commons, CallData* calls, AnalysedCallsList* m, DoLoopDataList* list)
+{
+    pCommons = commons;
+    pCalls = calls;
+    currentProcedure = m;
+    mainProcedure = currentProcedure;
+    doLoopList = list;
+}
+
+AnalysedCallsList* GetCurrentProcedure()
+{
+    return currentProcedure;
+}
+//interprocedural analysis, called for main procedure
+void Private_Vars_Analyzer(SgStatement* start)
+{
+#ifndef __SPF 
+    if (!options.isOn(PRIVATE_ANALYSIS)) {
+        return;
+    }
+#endif
+    CallData calls;
+    CommonData commons;
+    DoLoopDataList doloopList;
+    SetUpVars(&commons, &calls, calls.AddHeader(start, false, start->symbol(), current_file_id), &doloopList);
+
+    //stage 1: preparing graph data
+    ControlFlowGraph* CGraph = GetControlFlowGraphWithCalls(true, start, &calls, &commons);
+    calls.AssociateGraphWithHeader(start, CGraph);
+    commons.MarkEndOfCommon(currentProcedure);
+        
+    currentProcedure->graph->getPrivate();
+#if ACCAN_DEBUG
+    calls.printControlFlows();
+#endif
+    //stage 2: data flow analysis
+    FillCFGSets(CGraph);
+    //stage 3: fulfilling loop data
+    FillPrivates(CGraph);
+
+    //test: graphvis
+    /*std::fstream fs;
+    fs.open("graph_old.txt", std::fstream::out);
+    fs << CGraph->GetVisualGraph(&calls);
+    fs.close();*/
+
+#if !__SPF
+    delete CGraph;
+#endif
+
+    if (privateDelayedList)
+        delete privateDelayedList;
+    privateDelayedList = NULL;
+}
+
+CallData::~CallData()
+{
+#if __SPF
+    removeFromCollection(this);
+    return;
+#endif
+    /*
+    for (AnalysedCallsList* l = calls_list; l != NULL;) 
+    {
+        if (!l->isIntrinsic && l->graph)
+        {
+            if (l->graph->RemoveRef() && !l->graph->IsMain())
+            {
+                delete l->graph;
+                l->graph = NULL;
+            }
+        }
+        AnalysedCallsList *temp = l;
+        l = l->next;
+        delete temp;
+        temp = NULL;
+    }*/
+}
+
+CommonData::~CommonData()
+{
+#if __SPF
+    removeFromCollection(this);
+    return;
+#endif
+    for (CommonDataItem* i = list; i != NULL;) {
+        for (CommonVarInfo* info = i->info; info != NULL;) {
+            CommonVarInfo* t = info;
+            info = info->next;
+            delete t;
+        }
+        CommonDataItem* tp = i;
+        i = i->next;
+        delete tp;
+    }
+}
+
+ControlFlowGraph::~ControlFlowGraph()
+{
+#if __SPF
+    removeFromCollection(this);
+    return;
+#endif
+    while (common_def != NULL) 
+    {
+        CommonVarSet* t = common_def;
+        common_def = common_def->next;
+        delete t;
+    }
+    while (common_use != NULL) 
+    {
+        CommonVarSet* t = common_use;
+        common_use = common_use->next;
+        delete t;
+    }
+
+    if (def)
+        delete def;    
+
+    if (use)
+        delete use;   
+
+    if (!temp && pri)
+        delete pri;    
+
+    for (CBasicBlock *bb = first; bb != NULL;) 
+    {
+        CBasicBlock *tmp = bb;
+        bb = bb->getLexNext();
+            
+        delete tmp;
+        tmp = NULL;
+    }
+}
+
+CBasicBlock::~CBasicBlock()
+{
+#if __SPF
+    removeFromCollection(this);
+    return;
+#endif    
+
+    CommonVarSet* d = getCommonDef();
+    while (d != NULL) 
+    {
+        CommonVarSet* t = d;
+        d = d->next;
+        delete t;
+    }
+
+    d = getCommonUse();
+    while (d != NULL) 
+    {
+        CommonVarSet* t = d;
+        d = d->next;
+        delete t;
+    }
+
+    for (BasicBlockItem* bbi = prev; bbi != NULL;)
+    {
+        BasicBlockItem *tmp = bbi;
+        bbi = bbi->next;
+        delete tmp;
+        tmp = NULL;
+    }
+
+    for (BasicBlockItem *bbi = succ; bbi != NULL;)
+    {
+        BasicBlockItem *tmp = bbi;
+        bbi = bbi->next;
+        delete tmp;
+        tmp = NULL;
+    }
+
+    if (def)
+        delete def;    
+
+    if (use)
+        delete use;    
+
+    if (old_mrd_out)
+        delete old_mrd_out;
+    
+    if (old_mrd_in)
+        delete old_mrd_in;
+    
+    if (mrd_in)
+        delete mrd_in;
+    
+    if (mrd_out)
+        delete mrd_out;
+    
+    if (old_lv_out)
+        delete old_lv_out;
+    
+    if (old_lv_in)
+        delete old_lv_in;
+    
+    if (lv_in)
+        delete lv_in;
+    
+    if (lv_out)
+        delete lv_out;
+}
+
+doLoops::~doLoops()
+{
+#if __SPF
+    removeFromCollection(this);
+    return;
+#endif
+    for (doLoopItem *it = first; it != NULL; ) 
+    {
+        doLoopItem *tmp = it;
+        it = it->getNext();
+        delete tmp;
+    }
+}
+
+PrivateDelayedItem::~PrivateDelayedItem()
+{
+#if __SPF
+    removeFromCollection(this);
+    return;
+#endif
+    if (delay)
+        delete delay;
+    if (next)
+        delete next;    
+}
+
+VarSet::~VarSet()
+{
+#if __SPF
+    removeFromCollection(this);
+#endif
+    for (VarItem* it = list; it != NULL;) 
+    {
+        VarItem* tmp = it;
+        it = it->next;
+        if (tmp->var)
+            if (tmp->var->RemoveReference())
+                delete tmp->var;
+        delete tmp;
+    }
+}
+
+CommonVarSet::CommonVarSet(const CommonVarSet& c)
+{    
+    cvd = c.cvd;
+    if (c.next)
+        next = new CommonVarSet(*c.next);
+    else
+        next = NULL;
+
+#if __SPF
+    addToCollection(__LINE__, __FILE__, this, 22);
+#endif
+}
+
+std::string ControlFlowGraph::GetVisualGraph(CallData* calls)
+{
+    std::string result;
+    result += "digraph ";
+    char tmp[512];
+    AnalysedCallsList* cd = calls->GetDataForGraph(this);
+    //if (cd == NULL || cd->header == NULL)
+        sprintf(tmp, "g_%llx", (uintptr_t)this);
+    //else
+    //    sprintf(tmp, "g_%500s", cd->header->symbol());
+    result += tmp;
+    result += "{ \n";
+    for (CBasicBlock* b = this->first; b != NULL; b = b->getLexNext()) {
+        if (!b->IsEmptyBlock()) {
+            result += '\t' + b->GetGraphVisDescription() + "[shape=box,label=\"";
+            result += b->GetGraphVisData() + "\"];\n";
+        }
+    }
+    for (CBasicBlock* b = first; b != NULL; b = b->getLexNext()) {
+        if (!b->IsEmptyBlock())
+            result += b->GetEdgesForBlock(b->GetGraphVisDescription(), true, "");
+    }
+    result += '}';
+    ResetDrawnStatusForAllItems();
+    return result;
+}
+
+void ControlFlowGraph::ResetDrawnStatusForAllItems() {
+    for (CBasicBlock* b = first; b != NULL; b = b->getLexNext()) {
+        for (ControlFlowItem* it = b->getStart(); it != NULL && (it->isLeader() == false || it == b->getStart()); it = it->getNext()) {
+            it->ResetDrawnStatus();
+        }
+    }
+}
+
+std::string GetConditionWithLineNumber(ControlFlowItem* eit)
+{
+    std::string res;
+    if (eit->getOriginalStatement()) {
+        char tmp[16];
+        sprintf(tmp, "%d: ", eit->getOriginalStatement()->lineNumber());
+        res = tmp;
+    }
+    return res + eit->getExpression()->unparse();
+}
+
+std::string GetActualCondition(ControlFlowItem** pItem) {
+    std::string res = "";
+    ControlFlowItem* eit = *pItem;
+    while (true) 
+    {
+        if (eit == NULL || eit->getJump() != NULL || eit->getStatement() != NULL) 
+        {
+            if (eit && eit->getJump() != NULL) 
+            {
+                if (eit->getExpression() != NULL) 
+                {
+                    *pItem = eit;
+                    return GetConditionWithLineNumber(eit);
+                }
+                else 
+                {
+                    *pItem = NULL;
+                    return res;
+                }
+                break;
+            }
+            *pItem = NULL;
+            return res;
+        }
+        eit = eit->GetPrev();
+    }
+    return res;
+}
+
+std::string CBasicBlock::GetEdgesForBlock(std::string name, bool original, std::string modifier)
+{
+    std::string result;
+    for (BasicBlockItem* it = getSucc(); it != NULL; it = it->next) {
+        if (it->drawn)
+            continue;
+        it->drawn = true;
+        char lo = original;
+        std::string cond;
+        ControlFlowItem* eit = NULL;
+        bool pf = false;
+        if (it->jmp != NULL) {
+            if (it->jmp->getExpression() != NULL) {
+                eit = it->jmp;
+                cond = GetConditionWithLineNumber(eit);
+            }
+            else {
+                pf = true;
+                eit = it->jmp->GetPrev();
+                cond = GetActualCondition(&eit);
+            }
+        }
+        if (eit && eit->GetFriend()) {
+            lo = false;
+            eit = eit->GetFriend();
+        }
+        if (!it->block->IsEmptyBlock() || cond.length() != 0) {
+            if (cond.length() != 0 && eit && !pf){
+                char tmp[32];
+                sprintf(tmp, "c_%llx", (uintptr_t)eit);
+                if (!eit->IsDrawn()) {
+                    result += '\t';
+                    result += tmp;
+                    result += "[shape=diamond,label=\"";
+                    result += cond;
+                    result += "\"];\n";
+                }
+                if (it->cond_value && !pf) {
+                    result += '\t' + name + "->";
+                    result += tmp;
+                    result += modifier;
+                    result += '\n';
+                }
+                eit->SetIsDrawn();
+            }
+            if (cond.length() != 0) {
+                if (lo) {
+                    char tmp[32];
+                    sprintf(tmp, "c_%llx", (uintptr_t)eit);
+                    if (!it->block->IsEmptyBlock()) {
+                        result += '\t';
+                        result += tmp;
+                        result += "->" + it->block->GetGraphVisDescription();
+                        result += "[label=";
+                        result += (!pf && it->cond_value) ? "T]" : "F]";
+                        result += ";\n";
+                    }
+                    else {
+                        std::string n = tmp;
+                        std::string label;
+                        label += "[label=";
+                        label += (!pf && it->cond_value) ? "T]" : "F]";
+                        result += it->block->GetEdgesForBlock(n, original, label);
+                    }
+                }
+            }
+            else {
+                result += '\t' + name + " -> " + it->block->GetGraphVisDescription();
+                result += modifier;
+                result += ";\n";
+            }
+            
+        }
+        else {
+            result += it->block->GetEdgesForBlock(name, original, "");
+        }
+    }
+    return result;
+}
+
+std::string CBasicBlock::GetGraphVisDescription()
+{
+    if (visname.length() != 0)
+        return visname;
+    char tmp[16];
+    sprintf(tmp, "%d", num);
+    visname = tmp;
+    return visname;
+}
+
+std::string CBasicBlock::GetGraphVisData()
+{
+    if (visunparse.length() != 0)
+        return visunparse;
+    std::string result;
+    for (ControlFlowItem* it = start; it != NULL && (it->isLeader() == false || it == start); it = it->getNext()) {
+        if (it->getStatement() != NULL) {
+            int ln = it->GetLineNumber();
+            char tmp[16];
+            sprintf(tmp, "%d: ", ln);
+            result += tmp;
+            result += it->getStatement()->unparse();
+        }
+    }
+    visunparse = result;
+    return result;
+}
+
+int ControlFlowItem::GetLineNumber()
+{
+    if (getStatement() == NULL)
+        return 0;
+    if (getStatement()->lineNumber() == 0){
+        if (getOriginalStatement() == NULL)
+            return 0;
+        return getOriginalStatement()->lineNumber();
+    }
+    return getStatement()->lineNumber();
+}
+
+bool CBasicBlock::IsEmptyBlock()
+{
+    for (ControlFlowItem* it = start; it != NULL && (it->isLeader() == false || it == start); it = it->getNext()) {        
+        if (!it->IsEmptyCFI())
+            return false;
+    }
+    return true;
+}
+
+AnalysedCallsList* CallData::GetDataForGraph(ControlFlowGraph* s)
+{
+    for (AnalysedCallsList* it = calls_list; it != NULL; it = it->next) {
+        if (it->graph == s)
+            return it;
+    }
+    return NULL;
+}
+
+ControlFlowGraph* GetControlFlowGraphWithCalls(bool main, SgStatement* start, CallData* calls, CommonData* commons)
+{
+    if (start == NULL) 
+    {
+        //is_correct = "no body for call found";
+        return NULL;
+    }
+
+    ControlFlowGraph *cfgRet = NULL;
+    /*
+#if __SPF
+    auto itF = CFG_cache.find(start);
+    if (itF != CFG_cache.end())
+    {
+        calls = std::get<1>(itF->second);
+        commons = std::get<2>(itF->second);
+        return std::get<0>(itF->second);
+    }
+#endif*/
+    doLoops l;
+    ControlFlowItem *funcGraph = getControlFlowList(start, start->lastNodeOfStmt(), NULL, NULL, &l, calls, commons);
+    fillLabelJumps(funcGraph);
+    setLeaders(funcGraph);
+
+    
+    cfgRet = new ControlFlowGraph(false, main, funcGraph, NULL);
+    //CFG_cache[start] = std::make_tuple(cfgRet, calls, commons);
+    return cfgRet;
+}
+
+void FillCFGSets(ControlFlowGraph* graph)
+{
+    graph->privateAnalyzer();
+}
+
+static void ClearMemoryAfterDelay(ActualDelayedData* d)
+{
+    while (d != NULL) {
+        CommonVarSet* cd = d->commons;
+        while (cd != NULL) {
+            CommonVarSet* t = cd;
+            cd = cd->next;
+            delete t;
+        }
+        delete d->buse;
+        ActualDelayedData* tmp = d;
+        d = d->next;
+        delete tmp;
+    }
+}
+
+static void FillPrivates(ControlFlowGraph* graph)
+{
+    ActualDelayedData* d = graph->ProcessDelayedPrivates(pCommons, mainProcedure, NULL, NULL, false, -1);
+    ClearMemoryAfterDelay(d);
+    if (privateDelayedList)
+        privateDelayedList->PrintWarnings();
+}
+
+ActualDelayedData* CBasicBlock::GetDelayedDataForCall(CallAnalysisLog* log)
+{
+    for (ControlFlowItem* it = start; it != NULL && (!it->isLeader() || it == start); it = it->getNext())
+    {
+        AnalysedCallsList* c = it->getCall();
+        void* cf = it->getFunctionCall();
+        bool isFun = true;
+        if (!cf) {
+            cf = it->getStatement();
+            isFun = false;
+        }
+        if (c != NULL && c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c->graph != NULL)
+            return c->graph->ProcessDelayedPrivates(pCommons, c, log, cf, isFun, it->getProc()->file_id);
+    }
+    return NULL;
+}
+
+void PrivateDelayedItem::MoveFromPrivateToLastPrivate(CVarEntryInfo* var)
+{
+    VarItem* el = detected->belongs(var);
+    if (el) {
+        eVariableType storedType = el->var->GetVarType();
+        detected->remove(el->var);
+        lp->addToSet(var, NULL);
+    }
+}
+
+void ActualDelayedData::RemoveVarFromCommonList(CommonVarSet* c)
+{
+    if (commons == NULL || c == NULL)
+        return;
+    if (c == commons) 
+    {
+        commons = commons->next;
+        delete c;
+        return;
+    }
+    CommonVarSet* prev = c;
+    for (CommonVarSet* cur = c->next; cur != NULL; cur = cur->next) 
+    {
+        if (cur == c) 
+        {
+            prev->next = c->next;
+            delete c;
+            return;
+        }
+        else 
+            prev = cur;        
+    }
+}
+
+void ActualDelayedData::MoveVarFromPrivateToLastPrivate(CVarEntryInfo* var, CommonVarSet* c, VarSet* vs)
+{
+    original->MoveFromPrivateToLastPrivate(var);
+    RemoveVarFromCommonList(c);
+    if (vs) 
+    {
+        if (vs->belongs(var))
+            vs->remove(var);
+    }
+}
+
+int IsThisVariableAParameterOfSubroutine(AnalysedCallsList* lst, SgSymbol* s)
+{
+    if (!lst->header)
+        return -1;
+    int stored = SwitchFile(lst->file_id);
+    SgProcHedrStmt* h = isSgProcHedrStmt(lst->header);
+    if (!h)
+        return -1;
+    for (int i = 0; i < h->numberOfParameters(); i++) {
+        SgSymbol* par = h->parameter(i);
+        if (par == s) {
+            SwitchFile(stored);
+            return i;
+        }
+    }
+    SwitchFile(stored);
+    return -1;
+}
+
+ActualDelayedData* ControlFlowGraph::ProcessDelayedPrivates(CommonData* commons, AnalysedCallsList* call, CallAnalysisLog* log, void* c, bool isFun, int file_id)
+{
+    for (CallAnalysisLog* i = log; i != NULL; i = i->prev) {
+        if (i->el == call) 
+        {
+            //TODO: add name of common
+#if __SPF
+            const wchar_t* rus = R158;
+            Warning("Recursion is not analyzed for privates in common blocks '%s'", rus, "TODO!", PRIVATE_ANALYSIS_NO_RECURSION_ANALYSIS, call->header);
+#else
+            Warning("Recursion is not analyzed for privates in common blocks '%s'", "TODO!", PRIVATE_ANALYSIS_NO_RECURSION_ANALYSIS, call->header);
+#endif
+            return NULL;
+        }
+    }
+    CallAnalysisLog* nl = new CallAnalysisLog();
+    nl->el = call;
+    nl->prev = log;
+    if (log == NULL)
+        nl->depth = 0;
+    else
+        nl->depth = log->depth + 1;
+    log = nl;
+    ActualDelayedData* my = NULL;
+    for (CBasicBlock* bb = first; bb != NULL; bb = bb->getLexNext()) {
+        if (bb->containsParloopStart()) {
+            if (bb->GetDelayedData()) {
+                ActualDelayedData* data = new ActualDelayedData();
+                data->original = bb->GetDelayedData();
+                data->commons = commons->GetCommonsForVarSet(data->original->getDetected(), call);
+                VarSet* bu = new VarSet();
+                bu->unite(data->original->getDelayed(), false);
+                VarSet* tbu = new VarSet();
+                while (!bu->isEmpty()) {
+                    if (IS_BY_USE(bu->getFirst()->var->GetSymbol()))
+                        tbu->addToSet(bu->getFirst()->var, NULL);
+                    else {
+                        CVarEntryInfo* old = bu->getFirst()->var;
+                        int arg_id = IsThisVariableAParameterOfSubroutine(call, bu->getFirst()->var->GetSymbol());
+                        if (arg_id != -1 && c != NULL) {
+                            int stored = SwitchFile(file_id);
+                            SgExpression* exp = GetProcedureArgument(isFun, c, arg_id);
+                            if (isSgVarRefExp(exp) || isSgArrayRefExp(exp)) {
+                                SgSymbol* sym = exp->symbol();
+                                CVarEntryInfo* v;
+                                if (isSgVarRefExp(exp)) {
+                                    v = new CScalarVarEntryInfo(sym);
+                                }
+                                else {
+                                    v = old->Clone(sym);
+                                }
+                                tbu->addToSet(v, NULL, old);
+                            }
+                            SwitchFile(stored);
+                            
+                        }
+                    }
+                    bu->remove(bu->getFirst()->var);
+                }
+                data->buse = tbu;
+                delete bu;
+                data->next = my;
+                data->call = call;
+                my = data;
+            }
+        }
+        ActualDelayedData* calldata = bb->GetDelayedDataForCall(log);
+        while (calldata != NULL) {
+            CommonVarSet* nxt = NULL;
+            for (CommonVarSet* t = calldata->commons; t != NULL; t = nxt) {
+                nxt = t->next;
+                CommonVarInfo* cvd = t->cvd;
+                CommonDataItem* d = commons->IsThisCommonUsedInProcedure(cvd->parent, call);
+                if (!d || commons->CanHaveNonScalarVars(d))
+                    continue;
+                CommonVarInfo* j = cvd->parent->info;
+                CommonVarInfo* i = d->info;
+                while (j != cvd) {
+                    j = j->next;
+                    if (i)
+                        i = i->next;
+                }
+                if (!i)
+                    continue;
+                CVarEntryInfo* var = i->var;
+                if (bb->getLexNext()->getLiveIn()->belongs(var->GetSymbol()) && calldata->original->getDelayed()->belongs(cvd->var)) {
+                    calldata->MoveVarFromPrivateToLastPrivate(cvd->var, t, NULL);
+                }
+                if (bb->IsVarDefinedAfterThisBlock(var, false)) {
+                    calldata->RemoveVarFromCommonList(t);
+                }
+                
+            }
+            if (log->el->header == calldata->call->header) {
+                VarSet* pr = new VarSet();
+                pr->unite(calldata->original->getDelayed(), false);
+                pr->intersect(bb->getLexNext()->getLiveIn(), false, true);
+                for (VarItem* exp = pr->getFirst(); exp != NULL; pr->getFirst()) {
+                    calldata->MoveVarFromPrivateToLastPrivate(exp->var, NULL, NULL);
+                    pr->remove(exp->var);
+                }
+                delete pr;
+            }
+            VarSet* tmp_use = new VarSet();
+            tmp_use->unite(calldata->buse, false);
+            while (!tmp_use->isEmpty()) {
+                VarItem* v = tmp_use->getFirst();
+                CVarEntryInfo* tmp = v->var->Clone(OriginalSymbol(v->var->GetSymbol()));
+                if (bb->getLexNext()->getLiveIn()->belongs(tmp->GetSymbol(), true)) {
+                    calldata->MoveVarFromPrivateToLastPrivate(v->ov ? v->ov : v->var, NULL, calldata->buse);
+                }
+                if (bb->IsVarDefinedAfterThisBlock(v->var, true)) {
+                    calldata->buse->remove(v->ov ? v->ov : v->var);
+                }
+                delete tmp;
+                tmp_use->remove(v->var);
+            }
+            delete tmp_use;
+            ActualDelayedData* tmp = calldata->next;
+            calldata->next = my;
+            my = calldata;
+            calldata = tmp;
+        }
+    }
+    nl = log;
+    log = log->prev;
+
+    delete nl;
+    return my;
+}
+
+extern graph_node* node_list;
+void Private_Vars_Function_Analyzer(SgStatement* start);
+
+void Private_Vars_Project_Analyzer()
+{
+    graph_node* node = node_list;
+    while (node) {
+        if (node->st_header) {
+            int stored_file_id = SwitchFile(node->file_id);
+            Private_Vars_Function_Analyzer(node->st_header);
+            SwitchFile(stored_file_id);
+        }
+        node = node->next;
+    }
+}
+
+// CALL function for PRIVATE analyzing
+void Private_Vars_Function_Analyzer(SgStatement* start)
+{
+    //temporary state
+#ifndef __SPF 
+    if (!options.isOn(PRIVATE_ANALYSIS)){
+        return;
+    }
+#endif
+
+    if (start->variant() == PROG_HEDR) {
+        Private_Vars_Analyzer(start);
+    }
+    /*
+    ControlFlowItem* funcGraph = getControlFlowList(start, start->lastNodeOfStmt(), NULL, NULL, new doLoops());
+    fillLabelJumps(funcGraph);
+    setLeaders(funcGraph);
+#if ACCAN_DEBUG
+    printControlFlowList(funcGraph);
+#endif
+    ControlFlowItem* p = funcGraph;
+    ControlFlowItem* pl_start = NULL;
+    ControlFlowItem* pl_end = NULL;
+    ControlFlowGraph* graph = new ControlFlowGraph(funcGraph, NULL);
+    graph->privateAnalyzer();
+    */
+}
+/*
+// CALL function for PRIVATE analyzing
+void Private_Vars_Analyzer(SgStatement *firstSt, SgStatement *lastSt)
+{
+    // temporary state
+    //return;
+    SgExpression* par_des = firstSt->expr(2);
+    SgSymbol* l;
+    SgForStmt* chk;
+    int correct = 1;
+    firstSt = firstSt->lexNext();
+    while (correct && (par_des != NULL) && (par_des->lhs() != NULL) && ((l = par_des->lhs()->symbol()) != NULL)){
+        if (firstSt->variant() == FOR_NODE){
+            chk = isSgForStmt(firstSt);
+            if (chk->symbol() != l)
+                correct = 0;
+            firstSt = firstSt->lexNext();
+            par_des = par_des->rhs();
+        }
+        else{
+            correct = 0;
+        }
+    }
+    if (correct){
+        doLoops* loops = new doLoops();
+        ControlFlowItem* cfList = getControlFlowList(firstSt, lastSt, NULL, NULL, loops);
+        fillLabelJumps(cfList);
+        setLeaders(cfList);
+#if ACCAN_DEBUG
+        printControlFlowList(cfList);
+#endif
+        VarSet* priv = ControlFlowGraph(cfList, NULL).getPrivate();
+#if ACCAN_DEBUG
+        priv->print();
+#endif
+        clearList(cfList);
+    }
+}
+*/
+
+static void fillLabelJumps(ControlFlowItem* cfList)
+{
+    if (cfList != NULL){
+        ControlFlowItem* temp = cfList;
+        ControlFlowItem* temp2;
+        unsigned int label_no = 0;
+        while (temp != NULL){
+            if (temp->getLabel() != NULL)
+                label_no++;
+            temp = temp->getNext();
+        }
+        LabelCFI* table = new LabelCFI[label_no + 1];
+        unsigned int li = 0;
+        for (temp = cfList; temp != NULL; temp = temp->getNext()){
+            SgLabel* label;
+            if ((label = temp->getLabel()) != NULL){
+                table[li].item = temp;
+                table[li++].l = label->id();
+            }
+            temp2 = temp;
+        }
+        temp = new ControlFlowItem(currentProcedure);
+        temp2->AddNextItem(temp);
+        table[label_no].item = temp2;
+        table[label_no].l = -1;
+        for (temp = cfList; temp != NULL; temp = temp->getNext()){
+            SgLabel* jump = temp->getLabelJump();
+            int l;
+            if (jump != NULL){
+                l = jump->id();
+                for (unsigned int i = 0; i < label_no + 1; i++){
+                    if (table[i].l == l || i == label_no){
+                        temp->initJump(table[i].item);
+                        break;
+                    }
+                }
+            }
+        }
+        delete[] table;
+    }
+}
+
+static void setLeaders(ControlFlowItem* cfList)
+{
+    if (cfList != NULL)
+        cfList->setLeader();
+    while (cfList != NULL)
+    {
+        if (cfList->getJump() != NULL)
+        {
+            cfList->getJump()->setLeader();
+            if (cfList->getNext() != NULL)
+                cfList->getNext()->setLeader();
+        }
+        if (cfList->getCall() != NULL)
+        {
+            if (cfList->getNext() != NULL)
+                cfList->getNext()->setLeader();
+        }
+        cfList = cfList->getNext();
+    }
+}
+
+static void clearList(ControlFlowItem *list)
+{
+    if (list != NULL)
+    {
+        if (list->getNext() != NULL)
+            clearList(list->getNext());
+
+        delete list;
+    }
+}
+
+static ControlFlowItem* ifItem(SgStatement* stmt, ControlFlowItem* empty, SgStatement** lastAnStmt, doLoops* loops, bool ins, CallData* calls, CommonData* commons)
+{
+    if (stmt == NULL)
+        return empty;
+    SgIfStmt* cond;
+    if (stmt->variant() == ELSEIF_NODE)
+        cond = (SgIfStmt*)stmt;
+    if (stmt->variant() == ELSEIF_NODE || (!ins && (cond = isSgIfStmt(stmt)) != NULL))
+    {
+        SgExpression* c = &(SgNotOp((cond->conditional()->copy())));
+        ControlFlowItem *n, *j;
+        ControlFlowItem* last;
+        if ((n = getControlFlowList(cond->trueBody(), NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
+            return NULL;
+        j = ifItem(cond->falseBody(), empty, lastAnStmt, loops, cond->falseBody() != NULL ? cond->falseBody()->variant() == IF_NODE : false, calls, commons);
+        ControlFlowItem* gotoEmpty = new ControlFlowItem(NULL, empty, j, NULL, currentProcedure);
+        if (last != NULL)
+            last->AddNextItem(gotoEmpty);
+        else
+            n = gotoEmpty;
+        ControlFlowItem* tn = new ControlFlowItem(c, j, n, stmt->label(), currentProcedure);
+        tn->setOriginalStatement(stmt);
+        return tn;
+    }
+    else
+    {
+        ControlFlowItem* last;
+        ControlFlowItem* ret;
+        if ((ret = getControlFlowList(stmt, NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
+            return NULL;
+        last->AddNextItem(empty);
+        return ret;
+    }
+}
+
+static ControlFlowItem* switchItem(SgStatement* stmt, ControlFlowItem* empty, SgStatement** lastAnStmt, doLoops* loops, CallData* calls, CommonData* commons)
+{
+    SgSwitchStmt* sw = isSgSwitchStmt(stmt);
+    SgExpression* sw_cond = (sw->selector());
+    stmt = stmt->lexNext();
+    *lastAnStmt = stmt;
+    ControlFlowItem* last_sw = NULL;
+    ControlFlowItem* first = NULL;
+    bool is_def_last = false;
+    SgStatement* not_def_last;
+    while (stmt->variant() == CASE_NODE || stmt->variant() == DEFAULT_NODE)
+    {
+        if (stmt->variant() == DEFAULT_NODE){
+            while (stmt->variant() != CONTROL_END && stmt->variant() != CASE_NODE)
+                stmt = stmt->lexNext();
+            if (stmt->variant() == CONTROL_END)
+                stmt = stmt->lexNext();
+            is_def_last = true;
+            continue;
+        }
+        SgExpression* c = ((SgCaseOptionStmt*)stmt)->caseRange(0);
+        SgExpression *lhs = NULL;
+        SgExpression *rhs = NULL;
+        if (c->variant() == DDOT){
+            lhs = c->lhs();
+            rhs = c->rhs();
+            if (rhs == NULL)
+                c = &(*lhs <= *sw_cond);
+            else if (lhs == NULL)
+                c = &(*sw_cond <= *rhs);
+            else
+                c = &(*lhs <= *sw_cond && *sw_cond <= *rhs);
+        }
+        else
+            c = &SgNeqOp(*sw_cond, *c);
+        ControlFlowItem *n, *j;
+        ControlFlowItem* last;
+        if ((n = getControlFlowList(stmt->lexNext(), NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
+            return NULL;
+        j = new ControlFlowItem(currentProcedure);
+        ControlFlowItem* gotoEmpty = new ControlFlowItem(NULL, empty, j, NULL, currentProcedure);
+        if (last != NULL)
+            last->AddNextItem(gotoEmpty);
+        else
+            n = gotoEmpty;
+        ControlFlowItem* cond = new ControlFlowItem(c, j, n, stmt->label(), currentProcedure);
+        cond->setOriginalStatement(stmt);
+        if (last_sw == NULL)
+            first = cond;
+        else
+            last_sw->AddNextItem(cond);
+        last_sw = j;
+        is_def_last = false;
+        not_def_last = *lastAnStmt;
+        stmt = *lastAnStmt;
+    }
+    SgStatement* def = sw->defOption();
+    if (def != NULL){
+        ControlFlowItem* last;
+        ControlFlowItem* n;
+        if ((n = getControlFlowList(def->lexNext(), NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
+            return NULL;
+        if (last != NULL)
+            last->AddNextItem(empty);
+        if (last_sw == NULL)
+            first = n;
+        else
+            last_sw->AddNextItem(n);
+        last_sw = last;
+    }
+    last_sw->AddNextItem(empty);
+    if (!is_def_last)
+        *lastAnStmt = not_def_last;
+    return first;
+}
+
+static ControlFlowItem* getControlFlowList(SgStatement *firstSt, SgStatement *lastSt, ControlFlowItem **last, SgStatement **lastAnStmt, doLoops* loops, CallData* calls, CommonData* commons)
+{
+    ControlFlowItem *list = new ControlFlowItem(currentProcedure);
+    ControlFlowItem *cur = list;
+    ControlFlowItem *pred = list;
+    SgStatement *stmt;
+    for (stmt = firstSt; (
+        stmt != lastSt
+        && stmt->variant() != CONTAINS_STMT
+        && (lastSt != NULL || stmt->variant() != ELSEIF_NODE)
+        && (lastSt != NULL || stmt->variant() != CASE_NODE)
+        && (lastSt != NULL || stmt->variant() != DEFAULT_NODE));
+        stmt = stmt->lexNext())
+    {
+        if (stmt->variant() == CONTROL_END)
+        {
+            if (isSgExecutableStatement(stmt))
+                break;
+        }
+
+        cur = processOneStatement(&stmt, &pred, &list, cur, loops, calls, commons);
+        if (cur == NULL)
+        {
+            clearList(list);
+            return NULL;
+        }
+    }
+    if (cur == NULL){
+        cur = list = new ControlFlowItem(currentProcedure);
+    }
+    if (last != NULL)
+        *last = cur;
+    if (lastAnStmt != NULL)
+        *lastAnStmt = stmt;
+    return list;
+}
+
+AnalysedCallsList* CallData::IsHeaderInList(SgStatement* header)
+{
+    if (header == NULL)
+        return NULL;
+    AnalysedCallsList* p = calls_list;
+    while (p != NULL) {
+        if (p->header == header)
+            return p;
+        p = p->next;
+    }
+    return NULL;
+}
+
+void CallData::AssociateGraphWithHeader(SgStatement* st, ControlFlowGraph* gr)
+{
+    AnalysedCallsList* l = calls_list;
+    while (l != NULL) {
+        if (l->header == st) {
+            if (gr == l->graph && gr != NULL)
+                gr->AddRef();
+            l->graph = gr;
+            return;
+        }
+        l = l->next;
+    }
+    delete gr;
+}
+
+AnalysedCallsList* CallData::AddHeader(SgStatement* st, bool isFun, SgSymbol* name, int fid)
+{
+    //test
+    bool add_intr = IsAnIntrinsicSubroutine(name->identifier()) != NULL;
+    AnalysedCallsList* l = new AnalysedCallsList(st, (isIntrinsicFunctionNameACC(name->identifier()) || add_intr) && !IsUserFunctionACC(name), IsPureProcedureACC(name), isFun, name->identifier(), fid);
+    l->next = calls_list;
+    calls_list = l;
+    return l;
+}
+
+extern int isStatementFunction(SgSymbol *s);
+
+AnalysedCallsList* CallData::getLinkToCall(SgExpression* e, SgStatement* s, CommonData* commons)
+{
+    SgStatement* header = NULL;
+    SgSymbol* name;
+    bool isFun;
+    graph_node* g = NULL;
+    if (e == NULL) {
+        //s - procedure call
+        SgCallStmt* f = isSgCallStmt(s);
+        SgSymbol* fdaf = f->name();
+        if (ATTR_NODE(f->name()) != NULL)
+            g = GRAPHNODE(f->name());
+        if (g == NULL) {
+            
+            is_correct = "no header for procedure";
+            failed_proc_name = f->name()->identifier();
+            return (AnalysedCallsList*)(-1);
+            
+        }
+        if (g)
+            header = isSgProcHedrStmt(g->st_header);
+        name = f->name();
+        isFun = false;
+        //intr = isIntrinsicFunctionNameACC(f->name()->identifier()) && !IsUserFunctionACC(f->name());
+        //IsPureProcedureACC(f->name());
+    }
+    else {
+        //e - function call
+        SgFunctionCallExp* f = isSgFunctionCallExp(e);
+        if (isStatementFunction(f->funName()))
+            return (AnalysedCallsList*)(-2);
+        if (ATTR_NODE(f->funName()) != NULL)
+            g = GRAPHNODE(f->funName());
+        if (g == NULL) {
+            is_correct = "no header for function";
+            failed_proc_name = f->funName()->identifier();
+            return (AnalysedCallsList*)(-1);
+        }
+        header = isSgFuncHedrStmt(g->st_header);
+        name = f->funName();
+        isFun = true;
+    }
+    AnalysedCallsList* p;
+    if ((p = IsHeaderInList(header))) {
+        recursion_flag = recursion_flag || p->graph != NULL;
+        return p;
+    }
+    AnalysedCallsList* prev = currentProcedure;
+    currentProcedure = p = AddHeader(header, isFun, name, g->file_id);
+    if (!p->isIntrinsic) {
+        int stored = SwitchFile(g->file_id);
+        
+        ControlFlowGraph* graph = GetControlFlowGraphWithCalls(false, header, this, commons);
+        //if (graph == NULL)
+            //failed_proc_name = name->identifier();
+        
+        SwitchFile(stored);
+        
+        AssociateGraphWithHeader(header, graph);
+        commons->MarkEndOfCommon(p);
+    }
+    currentProcedure = prev;
+    return p;
+}
+
+static ControlFlowItem* GetFuncCallsForExpr(SgExpression* e, CallData* calls, ControlFlowItem** last, CommonData* commons, SgStatement* os)
+{
+    if (e == NULL) {
+        *last = NULL;
+        return NULL;
+    }
+    SgFunctionCallExp* f = isSgFunctionCallExp(e);
+    if (f) {
+        ControlFlowItem* head = new ControlFlowItem(NULL, NULL, currentProcedure, calls->getLinkToCall(e, NULL, commons));
+        head->setOriginalStatement(os);
+        ControlFlowItem* curl = head;
+        head->setFunctionCall(f);
+        ControlFlowItem* l1, *l2;
+        ControlFlowItem* tail1 = GetFuncCallsForExpr(e->lhs(), calls, &l1, commons, os);
+        ControlFlowItem* tail2 = GetFuncCallsForExpr(e->rhs(), calls, &l2, commons, os);
+        *last = head;
+        if (tail2 != NULL) {
+            l2->AddNextItem(head);
+            head = tail2;
+        }
+        if (tail1 != NULL) {
+            l1->AddNextItem(head);
+            head = tail1;
+        }
+
+        return head;
+    }
+    f = isSgFunctionCallExp(e->lhs());
+    if (f) {
+        ControlFlowItem* head = new ControlFlowItem(NULL, NULL, currentProcedure, calls->getLinkToCall(e->lhs(), NULL, commons));
+        head->setOriginalStatement(os);
+        head->setFunctionCall(f);
+        ControlFlowItem* l1, *l2, *l3;
+        ControlFlowItem* tail1 = GetFuncCallsForExpr(e->lhs()->lhs(), calls, &l1, commons, os);
+        ControlFlowItem* tail2 = GetFuncCallsForExpr(e->lhs()->rhs(), calls, &l2, commons, os);
+        ControlFlowItem* tail3 = GetFuncCallsForExpr(e->rhs(), calls, &l3, commons, os);
+        *last = head;
+        if (tail2 != NULL) {
+            l2->AddNextItem(head);
+            head = tail2;
+        }
+        if (tail1 != NULL) {
+            l1->AddNextItem(head);
+            head = tail1;
+        }
+        if (tail3 != NULL) {
+            (*last)->AddNextItem(tail3);
+            *last = l3;
+        }
+        return head;
+    }
+    return GetFuncCallsForExpr(e->rhs(), calls, last, commons, os);
+}
+
+static ControlFlowItem* AddFunctionCalls(SgStatement* st, CallData* calls, ControlFlowItem** last, CommonData* commons)
+{
+    ControlFlowItem* retv = GetFuncCallsForExpr(st->expr(0), calls, last, commons, st);
+    ControlFlowItem* l2 = NULL;
+    ControlFlowItem* second = GetFuncCallsForExpr(st->expr(1), calls, &l2, commons, st);
+    if (retv == NULL) {
+        retv = second;
+        *last = l2;
+    }
+    else if (second != NULL) {
+        (*last)->AddNextItem(second);
+        *last = l2;
+    }
+    ControlFlowItem* l3 = NULL;
+    ControlFlowItem* third = GetFuncCallsForExpr(st->expr(2), calls, &l3, commons, st);
+    if (retv == NULL) {
+        retv = third;
+        *last = l3;
+    }
+    else if (third != NULL) {
+        (*last)->AddNextItem(third);
+        *last = l3;
+    }
+    return retv;
+}
+
+void DoLoopDataList::AddLoop(int file_id, SgStatement* st, SgExpression* l, SgExpression* r, SgExpression* step, SgSymbol* lv)
+{
+    DoLoopDataItem* nt = new DoLoopDataItem();
+    nt->file_id = file_id;
+    nt->statement = st;
+    nt->l = l;
+    nt->r = r;
+    nt->st = step;
+    nt->loop_var = lv;
+    nt->next = list;
+    list = nt;
+}
+
+DoLoopDataList::~DoLoopDataList()
+{
+#if __SPF
+    removeFromCollection(this);
+    return;
+#endif
+    while (list != NULL) {
+        DoLoopDataItem* t = list->next;
+        delete list;
+        list = t;
+    }
+}
+
+static ControlFlowItem* processOneStatement(SgStatement** stmt, ControlFlowItem** pred, ControlFlowItem **list, ControlFlowItem* oldcur, doLoops* loops, CallData* calls, CommonData* commons)
+{
+    ControlFlowItem* lastf;
+    ControlFlowItem* funcs = AddFunctionCalls(*stmt, calls, &lastf, commons);
+    if (funcs != NULL) {
+        if (*pred != NULL)
+            (*pred)->AddNextItem(funcs);
+        else
+            *list = funcs;
+        *pred = lastf;
+    }
+
+    switch ((*stmt)->variant())
+    {
+        case IF_NODE:
+        {
+            ControlFlowItem* emptyAfterIf = new ControlFlowItem(currentProcedure); //empty item to avoid second pass
+            /*
+            if ((*stmt)->hasLabel()){
+                ControlFlowItem* emptyBeforeIf = new ControlFlowItem();
+                emptyBeforeIf->setLabel((*stmt)->label());
+                if (*pred != NULL)
+                    (*pred)->AddNextItem(emptyBeforeIf);
+                else
+                    *list = emptyBeforeIf;
+                *pred = emptyBeforeIf;
+            }
+            */
+            ControlFlowItem* cur = ifItem(*stmt, emptyAfterIf, stmt, loops, false, calls, commons);
+            emptyAfterIf->setLabel((*stmt)->label());
+            if (*pred != NULL)
+                (*pred)->AddNextItem(cur);
+            else
+                *list = cur;
+            return (*pred = emptyAfterIf);
+        }
+        case ASSIGN_STAT:
+        case POINTER_ASSIGN_STAT:
+        case PROC_STAT:
+        case PRINT_STAT:
+        case READ_STAT:
+        case WRITE_STAT:
+        case ALLOCATE_STMT:
+        case DEALLOCATE_STMT:
+        {
+            ControlFlowItem* cur = new ControlFlowItem(*stmt, NULL, currentProcedure, (*stmt)->variant() == PROC_STAT ? calls->getLinkToCall(NULL, *stmt, commons) : NULL);
+            if (*pred != NULL)
+                (*pred)->AddNextItem(cur);
+            else
+                *list = cur;
+            return (*pred = loops->checkStatementForLoopEnding(cur->getLabel() ? cur->getLabel()->id() : -1, cur));
+        }
+        case LOGIF_NODE:
+        {
+            ControlFlowItem* emptyAfterIf = new ControlFlowItem(currentProcedure); //empty item to avoid second pass
+            SgLogIfStmt* cond = isSgLogIfStmt(*stmt);
+            SgLabel* lbl = (*stmt)->label();
+            SgExpression* c = &(SgNotOp((cond->conditional()->copy())));
+            ControlFlowItem* cur = new ControlFlowItem(c, emptyAfterIf, NULL, (*stmt)->label(), currentProcedure);
+            cur->setOriginalStatement(*stmt);
+            if (*pred != NULL)
+                (*pred)->AddNextItem(cur);
+            else
+                *list = cur;
+            *stmt = (*stmt)->lexNext();
+            ControlFlowItem* body;
+            if ((body = processOneStatement(stmt, &cur, list, cur, loops, calls, commons)) == NULL){
+                return NULL;
+            }
+            body->AddNextItem(emptyAfterIf);
+            return (*pred = loops->checkStatementForLoopEnding(lbl ? lbl->id() : -1, emptyAfterIf));
+        }
+        case WHILE_NODE:
+        {
+            SgWhileStmt* cond = isSgWhileStmt(*stmt);
+            bool isEndDo = (*stmt)->lastNodeOfStmt()->variant() == CONTROL_END;
+            SgExpression* c;
+            if (cond->conditional())
+                c = &(SgNotOp((cond->conditional()->copy())));
+            else
+                c = new SgValueExp(1);
+            ControlFlowItem* emptyAfterWhile = new ControlFlowItem(currentProcedure);
+            ControlFlowItem* emptyBeforeBody = new ControlFlowItem(currentProcedure);
+            ControlFlowItem* cur = new ControlFlowItem(c, emptyAfterWhile, emptyBeforeBody, (*stmt)->label(), currentProcedure);
+            cur->setOriginalStatement(cond);
+            ControlFlowItem* gotoStart = new ControlFlowItem(NULL, cur, emptyAfterWhile, NULL, currentProcedure);
+            ControlFlowItem* emptyBefore = new ControlFlowItem(NULL, (ControlFlowItem*)NULL, cur, cond->label(), currentProcedure);
+            SgVarRefExp* doName = (isSgVarRefExp((*stmt)->expr(2)));
+            int lbl = -1;
+            if (!isEndDo){
+                SgStatement* end = lastStmtOfDoACC(cond);
+                if (end->controlParent() && end->controlParent()->variant() == LOGIF_NODE)
+                    lbl = end->controlParent()->label()->id();
+                else
+                    lbl = end->label()->id();
+            }
+            loops->addLoop(lbl, doName ? doName->symbol() : NULL, gotoStart, emptyAfterWhile);
+            ControlFlowItem* n, *last;
+            if (isEndDo){
+                if ((n = getControlFlowList((*stmt)->lexNext(), NULL, &last, stmt, loops, calls, commons)) == NULL)
+                    return NULL;
+                emptyBeforeBody->AddNextItem(n);
+                loops->endLoop(last);
+            }
+            if (*pred != NULL)
+                (*pred)->AddNextItem(emptyBefore);
+            else
+                *list = emptyBefore;
+            if (isEndDo)
+                return (*pred = emptyAfterWhile);
+            return (*pred = emptyBeforeBody);
+        }
+        case FOR_NODE:
+        {
+            SgForStmt* fst = isSgForStmt(*stmt);
+#if __SPF
+            SgStatement *p = NULL;
+            for (int i = 0; i < fst->numberOfAttributes(); ++i)
+            {
+                if (fst->attributeType(i) == SPF_ANALYSIS_DIR)
+                {
+                    p = (SgStatement *)(fst->getAttribute(i)->getAttributeData());
+                    break;
+                }
+            }
+            bool isParLoop = (p && p->variant() == SPF_ANALYSIS_DIR);
+#else
+            SgStatement* p = (*stmt)->lexPrev();
+            bool isParLoop = (p && p->variant() == DVM_PARALLEL_ON_DIR);
+#endif
+            SgExpression* pl = NULL;
+            SgExpression* pPl = NULL;
+            bool pl_flag = true;
+            if (isParLoop){
+#if __SPF
+                SgExpression* el = p->expr(0);
+#else
+                SgExpression* el = p->expr(1);
+#endif
+                pPl = el;
+                while (el != NULL) {
+                    SgExpression* e = el->lhs();
+                    if (e->variant() == ACC_PRIVATE_OP) {
+                        pl = e;
+                        break;
+                    }
+                    pPl = el;
+                    pl_flag = false;
+                    el = el->rhs();
+                }
+                //pl->unparsestdout();
+            }
+            bool isEndDo = fst->isEnddoLoop();
+            SgExpression* lh = new SgVarRefExp(fst->symbol());
+            SgStatement* fa = new SgAssignStmt(*lh, *fst->start());
+            bool needs_goto = true;
+#if !__SPF
+            // create goto edge if can not calculate count of loop's iterations
+            if (fst->start()->variant() == INT_VAL && fst->end()->variant() == INT_VAL && fst->start()->valueInteger() < fst->end()->valueInteger())
+                needs_goto = false;
+#endif
+            //fa->setLabel(*(*stmt)->label());
+            ControlFlowItem* last;
+            ControlFlowItem* emptyAfterDo = new ControlFlowItem(currentProcedure);
+            ControlFlowItem* emptyBeforeDo = new ControlFlowItem(currentProcedure);
+            ControlFlowItem* gotoEndInitial = NULL;
+            if (needs_goto) {
+                SgExpression* sendc = new SgExpression(GT_OP, new SgVarRefExp(fst->symbol()), fst->end(), NULL);
+                gotoEndInitial = new ControlFlowItem(sendc, emptyAfterDo, emptyBeforeDo, NULL, currentProcedure, true);
+                gotoEndInitial->setOriginalStatement(fst);
+            }
+            ControlFlowItem* stcf = new ControlFlowItem(fa, needs_goto ? gotoEndInitial : emptyBeforeDo, currentProcedure);
+            stcf->setOriginalStatement(fst);
+            stcf->setLabel((*stmt)->label());
+            SgExpression* rh = new SgExpression(ADD_OP, new SgVarRefExp(fst->symbol()), new SgValueExp(1), NULL);
+            SgStatement* add = new SgAssignStmt(*lh, *rh);
+            SgExpression* endc = new SgExpression(GT_OP, new SgVarRefExp(fst->symbol()), fst->end(), NULL);
+            ControlFlowItem* gotoStart = new ControlFlowItem(NULL, emptyBeforeDo, emptyAfterDo, NULL, currentProcedure);
+            ControlFlowItem* gotoEnd = new ControlFlowItem(endc, emptyAfterDo, gotoStart, NULL, currentProcedure);
+            gotoEnd->setOriginalStatement(fst);
+            if (needs_goto) {
+                gotoEnd->SetConditionFriend(gotoEndInitial);
+            }
+            ControlFlowItem* loop_d = new ControlFlowItem(add, gotoEnd, currentProcedure);
+            loop_d->setOriginalStatement(fst);
+            ControlFlowItem* loop_emp = new ControlFlowItem(NULL, loop_d, currentProcedure);
+            SgVarRefExp* doName = (isSgVarRefExp((*stmt)->expr(2)));
+            int lbl = -1;
+            if (!isEndDo){
+                SgStatement* end = lastStmtOfDoACC(fst);
+                if (end->variant() == LOGIF_NODE)
+                    lbl = end->controlParent()->label()->id();
+                else
+                    lbl = end->label()->id();
+            }
+            loops->addLoop(lbl, doName ? doName->symbol() : NULL, loop_emp, emptyAfterDo);
+            doLoopList->AddLoop(current_file_id, *stmt, fst->start(), fst->end(), fst->step(), fst->symbol());
+            if (isParLoop) {
+#if __SPF
+                // all loop has depth == 1 ? is it correct?
+                int k = 1;
+#else
+                SgExpression* par_des = p->expr(2);
+                int k = 0;
+                while (par_des != NULL && par_des->lhs() != NULL) {
+                    k++;
+                    par_des = par_des->rhs();
+                }
+#endif
+                loops->setParallelDepth(k, pl, p, pPl, pl_flag);
+            }
+
+            if (loops->isLastParallel()) {
+                SgExpression* ex = loops->getPrivateList();
+                emptyBeforeDo->MakeParloopStart();
+                bool f;
+                SgExpression* e = loops->getExpressionToModifyPrivateList(&f);
+                emptyBeforeDo->setPrivateList(ex, loops->GetParallelStatement(), e, f);
+                loop_d->MakeParloopEnd();
+            }
+            if (isEndDo){
+                ControlFlowItem* body;
+                if ((body = getControlFlowList(fst->body(), NULL, &last, stmt, loops, calls, commons)) == NULL)
+                    return NULL;
+                emptyBeforeDo->AddNextItem(body);
+                loops->endLoop(last);
+            }
+            if (*pred != NULL)
+                (*pred)->AddNextItem(stcf);
+            else
+                *list = stcf;
+            if (isEndDo)
+                return (*pred = emptyAfterDo);
+            return (*pred = emptyBeforeDo);
+        }
+        case GOTO_NODE:
+        {
+            SgGotoStmt* gst = isSgGotoStmt(*stmt);
+            ControlFlowItem* gt = new ControlFlowItem(NULL, gst->branchLabel(), NULL, gst->label(), currentProcedure);
+            if (*pred != NULL)
+                (*pred)->AddNextItem(gt);
+            else
+                *list = gt;
+            return (*pred = gt);
+        }
+        case ARITHIF_NODE:
+        {
+            SgArithIfStmt* arif = (SgArithIfStmt*)(*stmt);
+            ControlFlowItem* gt3 = new ControlFlowItem(NULL, ((SgLabelRefExp*)(*stmt)->expr(1)->rhs()->rhs()->lhs())->label(), NULL, NULL, currentProcedure);
+            ControlFlowItem* gt2 = new ControlFlowItem(&SgEqOp(*(arif->conditional()), *new SgValueExp(0)), ((SgLabelRefExp*)(*stmt)->expr(1)->rhs()->lhs())->label(), gt3, NULL, currentProcedure);
+            gt2->setOriginalStatement(arif);
+            ControlFlowItem* gt1 = new ControlFlowItem(&(*arif->conditional() < *new SgValueExp(0)), ((SgLabelRefExp*)(*stmt)->expr(1)->lhs())->label(), gt2, (*stmt)->label(), currentProcedure);
+            gt1->setOriginalStatement(arif);
+            if (*pred != NULL)
+                (*pred)->AddNextItem(gt1);
+            else
+                *list = gt1;
+            return (*pred = gt3);
+        }
+        case COMGOTO_NODE:
+        {
+            SgComputedGotoStmt* cgt = (SgComputedGotoStmt*)(*stmt);
+            SgExpression* label = cgt->labelList();
+            int i = 0;
+            SgLabel* lbl = ((SgLabelRefExp *)(label->lhs()))->label();
+            ControlFlowItem* gt = new ControlFlowItem(&SgEqOp(*(cgt->exp()), *new SgValueExp(++i)), lbl, NULL, cgt->label(), currentProcedure);
+            gt->setOriginalStatement(cgt);
+            if (*pred != NULL)
+                (*pred)->AddNextItem(gt);
+            else
+                *list = gt;
+            ControlFlowItem* old = gt;
+            while ((label = label->rhs()))
+            {
+                lbl = ((SgLabelRefExp *)(label->lhs()))->label();
+                gt = new ControlFlowItem(&SgEqOp(*(cgt->exp()), *new SgValueExp(++i)), lbl, NULL, NULL, currentProcedure);
+                gt->setOriginalStatement(cgt);
+                old->AddNextItem(gt);
+                old = gt;
+            }
+            return (*pred = gt);
+        }
+        case SWITCH_NODE:
+        {
+             ControlFlowItem* emptyAfterSwitch = new ControlFlowItem(currentProcedure);
+             ControlFlowItem* cur = switchItem(*stmt, emptyAfterSwitch, stmt, loops, calls, commons);
+             emptyAfterSwitch->setLabel((*stmt)->label());
+             if (*pred != NULL)
+                 (*pred)->AddNextItem(cur);
+             else
+                 *list = cur;
+             return (*pred = emptyAfterSwitch);
+        }
+        case CONT_STAT:
+        {
+             ControlFlowItem* cur = new ControlFlowItem(NULL, (ControlFlowItem*)NULL, NULL, (*stmt)->label(), currentProcedure);
+             if (*pred != NULL)
+                 (*pred)->AddNextItem(cur);
+             else
+                 *list = cur;
+             return (*pred = loops->checkStatementForLoopEnding(cur->getLabel() ? cur->getLabel()->id() : -1, cur));
+        }
+        case CYCLE_STMT:
+        {
+             SgSymbol* ref = (*stmt)->symbol();
+             ControlFlowItem* cur = new ControlFlowItem(NULL, loops->getSourceForCycle(ref), NULL, (*stmt)->label(), currentProcedure);
+             if (*pred != NULL)
+                 (*pred)->AddNextItem(cur);
+             else
+                 *list = cur;
+             return (*pred = cur);
+        }
+        case EXIT_STMT:
+        {
+             SgSymbol* ref = (*stmt)->symbol();
+             ControlFlowItem* cur = new ControlFlowItem(NULL, loops->getSourceForExit(ref), NULL, (*stmt)->label(), currentProcedure);
+             if (*pred != NULL)
+                 (*pred)->AddNextItem(cur);
+             else
+                 *list = cur;
+             return (*pred = cur);
+        }
+        case COMMENT_STAT:
+            return *pred;
+        case COMM_STAT:
+        {
+            commons->RegisterCommonBlock(*stmt, currentProcedure);
+            return *pred;
+        }
+        default:
+            return *pred;
+            //return NULL;
+    }
+}
+
+ControlFlowGraph::ControlFlowGraph(bool t, bool m, ControlFlowItem* list, ControlFlowItem* end) : temp(t), main(m), refs(1), def(NULL), use(NULL), pri(NULL), common_def(NULL), common_use(NULL), hasBeenAnalyzed(false)
+#ifdef __SPF
+, pointers(set<SymbolKey>())
+#endif
+{
+#if __SPF
+    addToCollection(__LINE__, __FILE__, this, 30);
+#endif
+    int n = 0;
+    ControlFlowItem* orig = list;
+    CBasicBlock* prev = NULL;
+    CBasicBlock* start = NULL;
+    int stmtNo = 0;
+    bool ns = list->isEnumerated();
+    if (list != NULL && !ns){
+        while (list != NULL && list != end)
+        {
+            list->setStmtNo(++stmtNo);
+            list = list->getNext();
+        }
+    }
+    ControlFlowItem* last_prev = NULL;
+    list = orig;
+    while (list != NULL && list != end)
+    {
+        CBasicBlock* bb = new CBasicBlock(t, list, ++n, this, list->getProc());
+        last = bb;
+        bb->setPrev(prev);
+        if (prev != NULL){
+            prev->setNext(bb);
+            if (!last_prev->isUnconditionalJump()){
+                bb->addToPrev(prev, last_prev->IsForJumpFlagSet(), false, last_prev);
+                prev->addToSucc(bb, last_prev->IsForJumpFlagSet(), false, last_prev);
+            }
+        }
+        if (start == NULL)
+            start = bb;
+        prev = bb;
+        while (list->getNext() != NULL && list->getNext() != end && !list->getNext()->isLeader()){
+            list->setBBno(n);
+            list = list->getNext();
+        }
+        list->setBBno(n);
+        last_prev = list;
+        list = list->getNext();
+    }
+    list = orig;
+    while (list != NULL && list != end)
+    {
+        ControlFlowItem* target;
+        if ((target = list->getJump()) != NULL)
+        {
+//            //no back edges
+//            if (target->getBBno() > list->getBBno())
+//            { 
+                CBasicBlock* tmp1 = start;
+                CBasicBlock* tmp2 = start;
+                for (int i = 1; i < target->getBBno() || i < list->getBBno(); i++)
+                {
+                    if (i < list->getBBno()) {
+                        tmp2 = tmp2->getLexNext();
+                        if (!tmp2)
+                            break;
+                    }
+                    if (i < target->getBBno()) {
+                        tmp1 = tmp1->getLexNext();
+                        if (!tmp1)
+                            break;
+                    }
+                }
+                if (tmp1 && tmp2) {
+                    tmp1->addToPrev(tmp2, list->IsForJumpFlagSet(), true, list);
+                    tmp2->addToSucc(tmp1, list->IsForJumpFlagSet(), true, list);
+                }
+//            }
+        }
+        list = list->getNext();
+    }
+    start->markAsReached();
+    first = start;
+    common_use = NULL;
+    cuf = false;
+    common_def = NULL;
+    cdf = false;
+}
+
+CommonDataItem* CommonData::IsThisCommonVar(VarItem* item, AnalysedCallsList* call)
+{
+    for (CommonDataItem* it = list; it != NULL; it = it->next) {
+        if (it->proc == call) {
+            for (CommonVarInfo* inf = it->info; inf != NULL; inf = inf->next) {
+                if (inf->var && item->var && *inf->var == *item->var)
+                    return it;
+            }
+        }
+    }
+    return NULL;
+}
+
+CommonDataItem* CommonData::GetItemForName(const string &name, AnalysedCallsList *call)
+{
+    for (CommonDataItem* it = list; it != NULL; it = it->next) {
+        if (it->name == name && it->proc == call)
+            return it;
+    }
+    return NULL;
+}
+
+void CommonData::RegisterCommonBlock(SgStatement *st, AnalysedCallsList *cur)
+{
+    //TODO: multiple common blocks in one procedure with same name
+    for (SgExpression *common = st->expr(0); common; common = common->rhs())
+    {
+        bool newBlock = false;
+        SgExprListExp* vars = (SgExprListExp*)common->lhs();
+        if (vars == NULL)
+            continue;
+
+        const string currCommonName = (common->symbol()) ? common->symbol()->identifier() : "spf_unnamed";
+
+        CommonDataItem* it = GetItemForName(currCommonName, cur);
+        if (!it) {
+            it = new CommonDataItem();
+            it->cb = st;
+            it->name = currCommonName;
+            it->isUsable = true;
+            it->proc = cur;
+            it->first = cur;
+            it->onlyScalars = true;
+            newBlock = true;
+
+            for (CommonDataItem *i = list; i != NULL; i = i->next)
+                if (i->name == currCommonName && i->isUsable)
+                    it->first = i->first;
+        }
+        it->commonRefs.push_back(common);
+
+        for (int i = 0; i < vars->length(); ++i)
+        {
+            SgVarRefExp *e = isSgVarRefExp(vars->elem(i));
+            if (e && !IS_ARRAY(e->symbol()))
+            {
+                CommonVarInfo* c = new CommonVarInfo();
+                c->var = new CScalarVarEntryInfo(e->symbol());
+                c->isPendingLastPrivate = false;
+                c->isInUse = false;
+                c->parent = it;
+                c->next = it->info;
+                it->info = c;
+            }
+            else if (isSgArrayRefExp(vars->elem(i))) {
+                it->onlyScalars = false;
+            }
+            else {
+                CommonVarInfo* c = new CommonVarInfo();
+                c->var = new CArrayVarEntryInfo(vars->elem(i)->symbol(), isSgArrayRefExp(vars->elem(i)));
+                c->isPendingLastPrivate = false;
+                c->isInUse = false;
+                c->parent = it;
+                c->next = it->info;
+                it->info = c;
+                it->onlyScalars = false;
+            }
+        }
+
+        if (newBlock)
+        {
+            it->next = list;
+            list = it;
+        }
+    }
+}
+
+void CommonData::MarkEndOfCommon(AnalysedCallsList* cur)
+{
+    for (CommonDataItem* i = list; i != NULL; i = i->next)
+    {
+        if (i->first == cur)
+            i->isUsable = false;
+    }
+}
+
+void CBasicBlock::markAsReached()
+{
+    prev_status = 1;
+    BasicBlockItem* s = succ;
+    while (s != NULL){
+        CBasicBlock* b = s->block;
+        if (b->prev_status == -1)
+            b->markAsReached();
+        s = s->next;
+    }
+}
+
+bool ControlFlowGraph::ProcessOneParallelLoop(ControlFlowItem* lstart, CBasicBlock* of, CBasicBlock*& p, bool first)
+{
+    int stored_fid = SwitchFile(lstart->getProc()->file_id);
+    ControlFlowItem* lend;
+    if (is_correct != NULL)
+    {
+        const char* expanded_log;
+        char* tmp = NULL;
+        if (failed_proc_name)
+        {
+            tmp = new char[strlen(is_correct) + 2 + strlen(failed_proc_name) + 1];
+            strcpy(tmp, is_correct);
+            strcat(tmp, ": ");
+            strcat(tmp, failed_proc_name);
+            expanded_log = tmp;
+        }
+        else
+            expanded_log = is_correct;
+#if __SPF
+        const wchar_t* rus = R159;
+        Warning("Private analysis is not conducted for loop: '%s'", rus, expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
+#else
+        Warning("Private analysis is not conducted for loop: '%s'", expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
+#endif
+        if (tmp)
+            delete[] tmp;
+
+    }
+    else
+    {
+        while ((lend = p->containsParloopEnd()) == NULL)
+        {
+            p->PrivateAnalysisForAllCalls();
+            p = p->getLexNext();
+            ControlFlowItem* mstart;
+            if ((mstart = p->containsParloopStart()) != NULL)
+            {
+                CBasicBlock* mp = p;
+                if (first) {
+                    if (!ProcessOneParallelLoop(mstart, of, mp, false)) {
+                        SwitchFile(stored_fid);
+                        return false;
+                    }
+                }
+            }
+        }
+        CBasicBlock* afterParLoop = p->getLexNext()->getLexNext();
+        VarSet* l_pri = ControlFlowGraph(true, false, lstart, lend).getPrivate();
+        if (is_correct != NULL)
+        {
+            const char* expanded_log;
+            char* tmp = NULL;
+            if (failed_proc_name)
+            {
+                tmp = new char[strlen(is_correct) + 2 + strlen(failed_proc_name) + 1];
+                strcpy(tmp, is_correct);
+                strcat(tmp, ": ");
+                strcat(tmp, failed_proc_name);
+                expanded_log = tmp;
+            }
+            else
+                expanded_log = is_correct;
+
+#if __SPF
+            const wchar_t* rus = R159;
+            Warning("Private analysis is not conducted for loop: '%s'", rus, expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
+#else
+            Warning("Private analysis is not conducted for loop: '%s'", expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
+#endif
+            if (tmp)
+                delete[] tmp;
+            SwitchFile(stored_fid);
+            return false;
+        }
+        VarSet* p_pri = new VarSet();
+        SgExpression* ex_p = lstart->getPrivateList();
+        if (ex_p != NULL)
+            ex_p = ex_p->lhs();
+        for (; ex_p != NULL; ex_p = ex_p->rhs())
+        {
+            SgVarRefExp* pr;
+            if (pr = isSgVarRefExp(ex_p->lhs()))
+            {
+                CScalarVarEntryInfo* tmp = new CScalarVarEntryInfo(pr->symbol());
+                p_pri->addToSet(tmp, NULL);
+                delete tmp;
+            }
+            SgArrayRefExp* ar;
+            if (ar = isSgArrayRefExp(ex_p->lhs()))
+            {
+                CArrayVarEntryInfo* tmp = new CArrayVarEntryInfo(ar->symbol(), ar);
+                p_pri->addToSet(tmp, NULL);
+                delete tmp;
+            }
+        }
+
+        VarSet* live = afterParLoop->getLiveIn();
+        VarSet* adef = afterParLoop->getDef();
+        VarSet* pri = new VarSet();
+        VarSet* tmp = new VarSet();
+        VarSet* delay = new VarSet();
+        tmp->unite(l_pri, false);
+
+        for (VarItem* exp = tmp->getFirst(); exp != NULL; exp = tmp->getFirst())
+        {
+            if (!afterParLoop->IsVarDefinedAfterThisBlock(exp->var, false))
+                delay->addToSet(exp->var, NULL);
+            tmp->remove(exp->var);
+        }
+        delete tmp;
+        pri->unite(l_pri, false);
+        pri->minus(live, true);
+        privateDelayedList = new PrivateDelayedItem(pri, p_pri, l_pri, lstart, privateDelayedList, this, delay, current_file_id);
+        of->SetDelayedData(privateDelayedList);
+    }
+    SwitchFile(stored_fid);
+    return true;
+}
+
+void ControlFlowGraph::privateAnalyzer()
+{
+    if (hasBeenAnalyzed)
+        return;
+    CBasicBlock* p = first;
+    /*
+    printf("GRAPH:\n");
+    while (p != NULL){
+        printf("block %d: ", p->getNum());
+        if (p->containsParloopStart())
+            printf("start");
+        if (p->containsParloopEnd())
+            printf("end");
+        p->print();
+        p = p->getLexNext();
+    }
+    */
+    p = first;
+    liveAnalysis();
+    while (1) 
+    {
+        ControlFlowItem* lstart;
+        CBasicBlock* of = p;
+        p->PrivateAnalysisForAllCalls();
+        if ((lstart = p->containsParloopStart()) != NULL) 
+        {
+            if (!ProcessOneParallelLoop(lstart, of, p, true))
+                break;
+        }
+        if (p == last)
+            break;
+        p = p->getLexNext();
+    }
+    hasBeenAnalyzed = true;
+}
+
+/*#ifdef __SPF
+void PrivateDelayedItem::PrintWarnings()
+{
+    if (next)
+        next->PrintWarnings();
+    lp->minus(detected);
+    while (!detected->isEmpty()) {
+        SgVarRefExp* var = detected->getFirst();
+        detected->remove(var);
+        Warning("Variable '%s' detected as private", var->unparse(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
+    }
+    while (!lp->isEmpty()) {
+        SgVarRefExp* var = lp->getFirst();
+        lp->remove(var);
+        Warning("Variable '%s' detected as last private", var->unparse(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
+    }
+    if (detected)
+        delete detected;
+    if (original)
+        delete original;
+    if (lp)
+        delete lp;
+}
+#else*/
+
+bool CArrayVarEntryInfo::HasActiveElements() const
+{
+    bool result = false;
+    if (disabled)
+        return false;
+    if (subscripts == 0)
+        return true;
+    for (int i = 0; i < subscripts; i++) 
+    {
+        if (!data[i].defined)
+            return false;
+        if (data[i].left_bound != data[i].right_bound)
+            result = true;
+        if (data[i].left_bound == data[i].right_bound && data[i].bound_modifiers[0] <= data[i].bound_modifiers[1])
+            result = true;
+    }
+    return result;
+}
+
+void CArrayVarEntryInfo::MakeInactive()
+{
+    disabled = true;
+    for (int i = 0; i < subscripts; i++) 
+    {
+        data[i].left_bound = data[i].right_bound = NULL;
+        data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = 0;
+    }
+}
+
+void PrivateDelayedItem::PrintWarnings()
+{
+    if (next)
+        next->PrintWarnings();
+    int stored_fid = SwitchFile(file_id);
+    total_privates += detected->count();
+    total_pl++;
+    lp->minus(detected);
+    detected->LeaveOnlyRecords();
+    detected->RemoveDoubtfulCommonVars(lstart->getProc());
+    VarSet* test1 = new VarSet();
+    test1->unite(detected, false);
+    VarSet* test2 = new VarSet();
+    test2->unite(original, false);
+    test2->minus(detected);
+    test1->minus(original);
+    int extra = 0, missing = 0;
+    SgExpression* prl = lstart->getPrivateList();
+    SgStatement* prs = lstart->getPrivateListStatement();
+    if (prl == NULL && !test1->isEmpty()) 
+    {
+        SgExpression* lst = new SgExprListExp();
+        prl = new SgExpression(ACC_PRIVATE_OP);
+        lst->setLhs(prl);
+        lst->setRhs(NULL);
+#if __SPF
+        SgExpression* clauses = prs->expr(0);
+#else
+        SgExpression* clauses = prs->expr(1);
+#endif
+        if (clauses) {
+            while (clauses->rhs() != NULL)
+                clauses = clauses->rhs();
+            clauses->setRhs(lst);
+        }
+        else {
+#if __SPF
+            prs->setExpression(0, *lst);
+#else
+            prs->setExpression(1, *lst);
+#endif
+        }
+    }
+    SgExpression* op = prl;
+
+    while (!test2->isEmpty()) {
+        //printf("EXTRA IN PRIVATE LIST: ");
+        //test2->print();
+        extra = 1;
+        VarItem* var = test2->getFirst();
+        CVarEntryInfo* syb = var->var->Clone();
+        int change_fid = var->file_id;
+        test2->remove(var->var);
+        int stored_fid = SwitchFile(change_fid);
+        if (syb->GetVarType() != VAR_REF_ARRAY_EXP)
+        {
+#if __SPF
+            const wchar_t* rus = R160;
+            Warning("var '%s' from private list wasn't classified as private", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
+#else
+            Warning("var '%s' from private list wasn't classified as private", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
+#endif
+        }
+        else 
+        {
+            CArrayVarEntryInfo* tt = (CArrayVarEntryInfo*)syb;
+            if (tt->HasActiveElements())
+            {
+#if __SPF
+                const wchar_t* rus = R161;
+                Warning("array '%s' from private list wasn't classified as private", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
+#else
+                Warning("array '%s' from private list wasn't classified as private", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
+#endif
+            }
+        }
+        delete(syb);
+        SwitchFile(stored_fid);
+    }
+    while (!test1->isEmpty()) {
+        //printf("MISSING IN PRIVATE LIST: ");
+        //test1->print();
+        missing = 1;
+        VarItem* var = test1->getFirst();
+        CVarEntryInfo* syb = var->var->Clone();
+        int change_fid = var->file_id;
+        test1->remove(var->var);
+        int stored_fid = SwitchFile(change_fid);
+        if (syb->GetVarType() != VAR_REF_ARRAY_EXP) {
+#if __SPF
+            const wchar_t* rus = R162;
+            Note("add private scalar '%s'", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
+#else
+            Warning("var '%s' was added to private list", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
+#endif
+            SgExprListExp* nls = new SgExprListExp();
+            SgVarRefExp* nvr = new SgVarRefExp(syb->GetSymbol());
+            nls->setLhs(nvr);
+            nls->setRhs(prl->lhs());
+            prl->setLhs(nls);
+        }
+        else 
+        {
+            CArrayVarEntryInfo* tt = (CArrayVarEntryInfo*)syb;
+            if (tt->HasActiveElements()) 
+            {
+#if __SPF
+                const wchar_t* rus = R163;
+                Note("add private array '%s'", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
+#else
+                Warning("var '%s' was added to private list", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
+#endif
+
+// TODO: need to check all situation before commit it to release 
+#if !__SPF
+                SgExprListExp *nls = new SgExprListExp();
+                SgArrayRefExp *nvr = new SgArrayRefExp(*syb->GetSymbol());
+                nls->setLhs(nvr);
+                nls->setRhs(prl->lhs());
+                prl->setLhs(nls);
+#endif
+            }
+        }
+        delete(syb);
+        SwitchFile(stored_fid);
+        
+        /*printf("modified parallel stmt:\n");
+        prs->unparsestdout();
+        printf("\n");*/
+    }
+    if (extra == 0 && missing == 0) {
+#if ACCAN_DEBUG
+        Warning("Correct", "", 0, lstart->getPrivateListStatement());
+#endif
+    }
+    //printf("PRIVATE VARS: ");
+    //detected->print();
+    //printf("DECLARATION: ");
+    //p_pri->print();
+    //printf("LAST PRIVATE VARS: ");
+    //lp->print();
+    if (test1)
+        delete test1;
+    
+
+    if (test2)
+        delete test2;
+    
+    if (detected)
+        delete detected;
+    
+    if (original)
+        delete original;
+    
+    if (lp)
+        delete lp;
+    
+    SwitchFile(stored_fid);
+}
+//#endif
+
+ControlFlowItem* doLoops::checkStatementForLoopEnding(int label, ControlFlowItem* last)
+{
+
+    if (current == NULL || label == -1 || label != current->getLabel())
+        return last;
+    return checkStatementForLoopEnding(label, endLoop(last));
+}
+
+doLoopItem* doLoops::findLoop(SgSymbol* s)
+{
+    doLoopItem* l = first;
+    while (l != NULL){
+        if (l->getName() == s)
+            return l;
+        l = l->getNext();
+    }
+    return NULL;
+}
+
+void doLoops::addLoop(int l, SgSymbol* s, ControlFlowItem* i, ControlFlowItem* e)
+{
+    doLoopItem* nl = new doLoopItem(l, s, i, e);
+    if (first == NULL)
+        first = current = nl;
+    else{
+        current->setNext(nl);
+        nl->HandleNewItem(current);
+        current = nl;
+    }
+}
+
+ControlFlowItem* doLoops::endLoop(ControlFlowItem* last)
+{
+    doLoopItem* removed = current;
+    if (first == current)
+        first = current = NULL;
+    else{
+        doLoopItem* prev = first;
+        while (prev->getNext() != current)
+            prev = prev->getNext();
+        prev->setNext(NULL);
+        current = prev;
+    }
+    last->AddNextItem(removed->getSourceForCycle());
+    ControlFlowItem* empty = removed->getSourceForExit();
+    delete removed;
+    return empty;
+}
+
+VarSet* ControlFlowGraph::getPrivate()
+{
+    //printControlFlowList(first->getStart(), last->getStart());
+    if (pri == NULL)
+    {
+        bool same = false;
+        int it = 0;
+        CBasicBlock* p = first;
+        /*
+        printf("GRAPH:\n");
+        while (p != NULL){
+            printf("block %d: ", p->getNum());
+            p->print();
+            p = p->getLexNext();
+        }
+        */
+        p = first;
+        while (!same){
+            p = first;
+            same = true;
+            while (p != NULL){
+                same = p->stepMrdIn(false) && same;
+                same = p->stepMrdOut(false) && same;
+                p = p->getLexNext();
+            }
+            it++;
+            //printf("iters: %d\n", it);
+        }
+        p = first;
+        while (p != NULL) {
+            p->stepMrdIn(true);
+            p->stepMrdOut(true);
+            //p->getMrdIn(false)->print();
+            p = p->getLexNext();
+        }
+        
+        p = first;
+        VarSet* res = new VarSet();
+        VarSet* loc = new VarSet();
+        bool il = false;
+        while (p != NULL)
+        {
+            res->unite(p->getUse(), false);
+            loc->unite(p->getDef(), false);
+            p = p->getLexNext();
+        }
+        //printf("USE: ");
+        //res->print();
+        //printf("LOC: ");
+        //loc->print();
+        res->unite(loc, false);
+        //printf("GETUSE: ");
+        //getUse()->print();
+
+        //res->minus(getUse()); //test!
+        res->minusFinalize(getUse(), true);
+        pri = res;
+    }
+    return pri;
+}
+
+void ControlFlowGraph::liveAnalysis()
+{
+    bool same = false;
+    int it = 0;
+    CBasicBlock* p = first;
+    p = first;
+    while (!same){
+        p = last;
+        same = true;
+        while (p != NULL){
+            same = p->stepLVOut() && same;
+            same = p->stepLVIn() && same;
+            p = p->getLexPrev();
+        }
+        it++;
+        //printf("iters: %d\n", it);
+    }
+}
+
+VarSet* ControlFlowGraph::getUse()
+{
+    if (use == NULL)
+    {
+        CBasicBlock* p = first;
+        VarSet* res = new VarSet();
+        while (p != NULL)
+        {
+            VarSet* tmp = new VarSet();
+            tmp->unite(p->getUse(), false);
+            tmp->minus(p->getMrdIn(false));
+            //printf("BLOCK %d INSTR %d USE: ", p->getNum(), p->getStart()->getStmtNo());
+            //tmp->print();
+            res->unite(tmp, false);
+            delete tmp;
+            p = p->getLexNext();
+        }
+        use = res;
+
+    }
+    if (!cuf)
+    {
+        AnalysedCallsList* call = first->getStart()->getProc();
+        cuf = true;
+        if (call) {
+            CommonVarSet* s = pCommons->GetCommonsForVarSet(use, call);
+            common_use = s;
+            for (CBasicBlock* i = first; i != NULL; i = i->getLexNext()){
+                for (CommonVarSet* c = i->getCommonUse(); c != NULL; c = c->next) {
+                    /*
+                    CommonVarSet* n = new CommonVarSet();
+                    n->cvd = c->cvd;
+                    n->cvd->refs++;
+                    */
+                    CommonVarSet* n = new CommonVarSet(*c);
+                    CommonVarSet* t;
+                    for (t = n; t->next != NULL; t = t->next);
+                    t->next = common_use;
+                    common_use = n;
+                }
+            }
+        }
+    }
+    return use;
+}
+
+VarSet* ControlFlowGraph::getDef()
+{
+    if (def == NULL) {
+        def = new VarSet();
+        def->unite(last->getMrdOut(false), true);
+    }
+    if (!cdf)
+    {
+        AnalysedCallsList* call = first->getStart()->getProc();
+        if (call) {
+            cdf = true;
+            CommonVarSet* s = pCommons->GetCommonsForVarSet(def, call);
+            common_def = s;
+            for (CBasicBlock* i = first; i != NULL; i = i->getLexNext()) {
+                for (CommonVarSet* c = i->getCommonDef(); c != NULL; c = c->next) {
+                    /*
+                    CommonVarSet* n = new CommonVarSet();
+                    n->cvd = c->cvd;
+                    n->cvd->refs++;
+                    */
+                    CommonVarSet *n = new CommonVarSet(*c);
+                    CommonVarSet* t;
+                    for (t = n; t->next != NULL; t = t->next);
+                    t->next = common_def;
+                    common_def = n;
+                }
+            }
+        }
+    }
+    return def;
+}
+
+CommonVarSet* CommonData::GetCommonsForVarSet(VarSet* set, AnalysedCallsList* call)
+{
+    CommonVarSet* res = NULL;
+    for (CommonDataItem* i = list; i != NULL; i = i->next) {
+        if (i->proc == call) {
+            for (CommonVarInfo* v = i->info; v != NULL; v = v->next) {
+                if (set->belongs(v->var)) {
+                    CommonVarSet* n = new CommonVarSet();
+                    n->cvd = v;
+                    n->next = res;
+                    res = n;
+                }
+            }
+        }
+    }
+    return res;
+}
+
+void CBasicBlock::PrivateAnalysisForAllCalls()
+{
+    ControlFlowItem* p = start;
+    while (p != NULL && (p == start || !p->isLeader())) {
+        AnalysedCallsList* c = p->getCall();
+        const char* oic = is_correct;
+        const char* fpn = failed_proc_name;
+        is_correct = NULL;
+        failed_proc_name = NULL;
+        if (c != NULL && c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c->header != NULL && !c->hasBeenAnalysed) {
+            c->hasBeenAnalysed = true;
+            
+            int stored_fid = SwitchFile(c->file_id);
+            
+            c->graph->privateAnalyzer();
+            
+            SwitchFile(stored_fid);
+            
+        }
+        is_correct = oic;
+        failed_proc_name = fpn;
+        p = p->getNext();
+    }
+    return;
+}
+
+ControlFlowItem* CBasicBlock::containsParloopEnd()
+{
+    ControlFlowItem* p = start;
+    while (p != NULL && (p == start || !p->isLeader())){
+        if (p->IsParloopEnd())
+            return p;
+        p = p->getNext();
+    }
+    return NULL;
+}
+
+ControlFlowItem* CBasicBlock::containsParloopStart()
+{
+    ControlFlowItem* p = start;
+    while (p != NULL && (p == start || !p->isLeader())){
+        if (p->IsParloopStart())
+            return p;
+        p = p->getNext();
+    }
+    return NULL;
+}
+
+void CBasicBlock::print()
+{
+    printf("block %d: prev: ", num);
+    BasicBlockItem* p = prev;
+    while (p != NULL){
+        printf("%d ", p->block->num);
+        p = p->next;
+    }
+    printf("\n");
+}
+
+ControlFlowItem* CBasicBlock::getStart()
+{
+    return start;
+}
+
+ControlFlowItem* CBasicBlock::getEnd()
+{
+    ControlFlowItem* p = start;
+    ControlFlowItem* end = p;
+    while (p != NULL && (p == start || !p->isLeader())){
+        end = p;
+        p = p->getNext();
+    }
+    return end;
+}
+
+VarSet* CBasicBlock::getLVOut()
+{
+    if (lv_out == NULL)
+    {
+        VarSet* res = new VarSet();
+        BasicBlockItem* p = succ;
+        bool first = true;
+        while (p != NULL)
+        {
+            CBasicBlock* b = p->block;
+            if (b != NULL && !b->lv_undef)
+            {
+                res->unite(b->getLVIn(), false);
+            }
+            p = p->next;
+        }
+        lv_out = res;
+    }
+    return lv_out;
+}
+
+VarSet* CBasicBlock::getLVIn()
+{
+    if (lv_in == NULL)
+    {
+        VarSet* res = new VarSet();
+        res->unite(getLVOut(), false);
+        res->minus(getDef());
+        res->unite(getUse(), false);
+        lv_in = res;
+    }
+    return lv_in;
+}
+
+bool CBasicBlock::IsVarDefinedAfterThisBlock(CVarEntryInfo* var, bool os)
+{
+    findentity = var;
+    if (def->belongs(var, os)) {
+        findentity = NULL;
+        return true;
+    }
+    BasicBlockItem* p = succ;
+    while (p != NULL)
+    {
+        CBasicBlock* b = p->block;
+        if (b->ShouldThisBlockBeCheckedAgain(var) && b->IsVarDefinedAfterThisBlock(var, os)) {
+            findentity = NULL;
+            return true;
+        }
+        p = p->next;
+    }
+    findentity = NULL;
+    return false;
+}
+
+bool CBasicBlock::stepLVOut()
+{
+    if (old_lv_out)
+        delete old_lv_out;
+    
+    old_lv_out = lv_out;
+    lv_out = NULL;
+    getLVOut();
+    lv_undef = false;
+    //printf("block %d\n", num);
+    //old_mrd_out->print();
+    //mrd_out->print();
+    return (lv_out->equal(old_lv_out));
+    //return true;
+}
+
+bool CBasicBlock::stepLVIn()
+{
+    if (old_lv_in)
+        delete old_lv_in;
+
+    old_lv_in = lv_in;
+    lv_in = NULL;
+    getLVIn();
+    return (lv_in->equal(old_lv_in));
+    //return true;
+}
+
+VarSet* CBasicBlock::getMrdIn(bool la)
+{
+    if (mrd_in == NULL)
+    {
+        VarSet* res = new VarSet();
+        BasicBlockItem* p = prev;
+        bool first = true;
+
+        while (p != NULL)
+        {
+            CBasicBlock* b = p->block;
+            if (b != NULL && !b->undef && b->hasPrev())
+            {
+                if (first) {
+                    res->unite(b->getMrdOut(la), la);
+                    first = false;
+                }
+                else
+                    res->intersect(b->getMrdOut(la), la, true);
+            }
+            p = p->next;
+        }
+        mrd_in = res;
+    }
+    return mrd_in;
+}
+
+bool CBasicBlock::hasPrev()
+{
+    return prev_status == 1;
+}
+
+VarSet* CBasicBlock::getMrdOut(bool la)
+{
+    if (mrd_out == NULL)
+    {
+        VarSet* res = new VarSet();
+        res->unite(getMrdIn(la), la);
+        res->unite(getDef(), la);
+        mrd_out = res;
+        //printf("BLOCK %d INSTR %d MRDOUT: ", num, start->getStmtNo());
+        //mrd_out->print();
+        //print();
+    }
+    return mrd_out;
+}
+
+bool CBasicBlock::stepMrdOut(bool la)
+{
+    if (old_mrd_out)
+        delete old_mrd_out;
+    
+    old_mrd_out = mrd_out;
+    mrd_out = NULL;
+    getMrdOut(la);
+    undef = false;
+    //printf("block %d\n", num);
+    //old_mrd_out->print();
+    //mrd_out->print();
+    return (mrd_out->equal(old_mrd_out));
+    //return true;
+}
+
+bool CBasicBlock::stepMrdIn(bool la)
+{
+    if (old_mrd_in)
+        delete old_mrd_in;
+    
+    old_mrd_in = mrd_in;
+    mrd_in = NULL;
+    getMrdIn(la);
+    return (mrd_in->equal(old_mrd_in));
+    //return true;
+}
+
+bool IsPresentInExprList(SgExpression* ex, CExprList* lst)
+{
+    while (lst != NULL) {
+        if (lst->entry == ex)
+            return true;
+        lst = lst->next;
+    }
+    return false;
+}
+
+CRecordVarEntryInfo* AddRecordVarRef(SgRecordRefExp* ref)
+{
+    if (isSgRecordRefExp(ref->lhs())) {
+        CVarEntryInfo* parent = AddRecordVarRef(isSgRecordRefExp(ref->lhs()));
+        if (parent)
+            return new CRecordVarEntryInfo(ref->rhs()->symbol(), parent);
+        return NULL;
+    }
+    if (isSgVarRefExp(ref->lhs())) {
+        CVarEntryInfo* parent = new CScalarVarEntryInfo(isSgVarRefExp(ref->lhs())->symbol());
+        return new CRecordVarEntryInfo(ref->rhs()->symbol(), parent);
+    }
+    if (isSgArrayRefExp(ref->lhs())) {
+        CVarEntryInfo* parent = new CArrayVarEntryInfo(isSgArrayRefExp(ref->lhs())->symbol(), isSgArrayRefExp(ref->lhs()));
+        return new CRecordVarEntryInfo(ref->rhs()->symbol(), parent);
+    }
+    return NULL;
+}
+
+void CBasicBlock::AddOneExpressionToUse(SgExpression* ex, SgStatement* st, CArrayVarEntryInfo* v)
+{
+    CVarEntryInfo* var = NULL;
+    SgVarRefExp* r;
+    if ((r = isSgVarRefExp(ex)))
+        var = new CScalarVarEntryInfo(r->symbol());
+    SgArrayRefExp* ar;
+    if ((ar = isSgArrayRefExp(ex))) {
+        if (!v)
+            var = new CArrayVarEntryInfo(ar->symbol(), ar);
+        else {
+            var = v->Clone();
+            var->SwitchSymbol(ar->symbol());
+        }
+    }
+    SgRecordRefExp* rr;
+    if ((rr = isSgRecordRefExp(ex)))
+        var = AddRecordVarRef(rr);
+    if (var) {
+        var->RegisterUsage(def, use, st);
+        delete var;
+    }
+}
+
+void CBasicBlock::AddOneExpressionToDef(SgExpression* ex, SgStatement* st, CArrayVarEntryInfo* v)
+{
+    CVarEntryInfo* var = NULL;
+    SgVarRefExp* r;
+    if ((r = isSgVarRefExp(ex)))
+        var = new CScalarVarEntryInfo(r->symbol());
+    SgRecordRefExp* rr;
+    if ((rr = isSgRecordRefExp(ex)))
+        var = AddRecordVarRef(rr);
+    SgArrayRefExp* ar;
+    if ((ar = isSgArrayRefExp(ex))) {
+        if (!v)
+            var = new CArrayVarEntryInfo(ar->symbol(), ar);
+        else {
+            var = v->Clone();
+            var->SwitchSymbol(ar->symbol());
+        }
+    }
+    if (var) {
+        var->RegisterDefinition(def, use, st);
+        delete var;
+    }
+}
+
+void CBasicBlock::addExprToUse(SgExpression* ex, CArrayVarEntryInfo* v = NULL, CExprList* lst = NULL)
+{
+    if (ex != NULL)
+    {
+        CExprList* cur = new CExprList();
+        cur->entry = ex;
+        cur->next = lst;
+        SgFunctionCallExp* f = isSgFunctionCallExp(ex);
+        if (!f) {
+            if (!IsPresentInExprList(ex->lhs(), cur))
+                addExprToUse(ex->lhs(), v, cur);
+            if (!isSgUnaryExp(ex))
+                if (!IsPresentInExprList(ex->rhs(), cur))
+                    addExprToUse(ex->rhs(), v, cur);
+            AddOneExpressionToUse(ex, NULL, v);
+        }
+        delete cur;
+        /*
+        SgVarRefExp* r;
+        //printf(" %s\n", f->funName()->identifier());
+        bool intr = isIntrinsicFunctionNameACC(f->funName()->identifier()) && !IsUserFunctionACC(f->funName());
+        bool pure = IsPureProcedureACC(f->funName());
+        if (!intr && !pure){
+            printf("function not intristic or pure: %s\n", f->funName()->identifier());
+            is_correct = false;
+            return;
+        }
+        if (intr) {
+            ProcessIntristicProcedure(true, f->numberOfArgs(), f);
+            return;
+        }
+        ProcessProcedureHeader(true, isSgProcHedrStmt(GRAPHNODE(f->funName())->st_header), f);
+        */
+    }
+}
+
+void CBasicBlock::ProcessIntrinsicProcedure(bool isF, int narg, void* f, const char* name)
+{
+    for (int i = 0; i < narg; i++) {
+        SgExpression* ar = GetProcedureArgument(isF, f, i);
+        if (IsAnIntrinsicSubroutine(name)) 
+        {
+            SgExpression* v = CheckIntrinsicParameterFlag(name, i, ar, INTRINSIC_IN);
+            if (v)
+                addExprToUse(v);            
+        }
+        else
+            addExprToUse(ar);
+        
+        AddOneExpressionToDef(CheckIntrinsicParameterFlag(name, i, ar, INTRINSIC_OUT), NULL, NULL);
+    }
+}
+
+void CBasicBlock::ProcessProcedureWithoutBody(bool isF, void* f, bool out)
+{
+    for (int i = 0; i < GetNumberOfArguments(isF, f); i++){
+        addExprToUse(GetProcedureArgument(isF, f, i));
+        if (out)
+            AddOneExpressionToDef(GetProcedureArgument(isF, f, i), NULL, NULL);
+    }
+}
+
+SgSymbol* CBasicBlock::GetProcedureName(bool isFunc, void* f)
+{
+    if (isFunc) {
+        SgFunctionCallExp* fc = (SgFunctionCallExp*)f;
+        return fc->funName();
+    }
+    SgCallStmt* pc = (SgCallStmt*)f;
+    return pc->name();
+}
+
+int GetNumberOfArguments(bool isF, void* f)
+{
+    if (isF) {
+        SgFunctionCallExp* fc = (SgFunctionCallExp*)f;
+        return fc->numberOfArgs();
+    }
+    SgCallStmt* pc = (SgCallStmt*)f;
+    return pc->numberOfArgs();
+}
+
+SgExpression* GetProcedureArgument(bool isF, void *f, const int i)
+{
+    SgExpression *arg = NULL;
+    if (isF)
+    {
+        SgFunctionCallExp* fc = (SgFunctionCallExp*)f;
+        arg = fc->arg(i);
+    }
+    else
+    {
+        SgCallStmt *pc = (SgCallStmt*)f;
+        arg = pc->arg(i);
+    }
+    return arg;
+}
+
+void CBasicBlock::ProcessProcedureHeader(bool isF, SgProcHedrStmt *header, void *f, const char* name)
+{   
+    if (!header) 
+    {
+        is_correct = "no header found";
+        failed_proc_name = name;
+        return;
+    }
+    
+    for (int i = 0; i < header->numberOfParameters(); ++i) 
+    {
+        int stored = SwitchFile(header->getFileId());
+        SgSymbol *arg = header->parameter(i);
+        SwitchFile(stored);
+
+        if (arg->attributes() & (IN_BIT)) 
+        {
+            SgExpression *ar = GetProcedureArgument(isF, f, i);
+            addExprToUse(ar);
+        }        
+        else if (arg->attributes() & (INOUT_BIT)) 
+        {
+            addExprToUse(GetProcedureArgument(isF, f, i));
+            AddOneExpressionToDef(GetProcedureArgument(isF, f, i), NULL, NULL);
+        }
+        else if (arg->attributes() & (OUT_BIT))
+            AddOneExpressionToDef(GetProcedureArgument(isF, f, i), NULL, NULL);
+        else 
+        {
+            is_correct = "no bitflag set for pure procedure";
+            break;
+        }
+    }    
+}
+
+bool AnalysedCallsList::isArgIn(int i, CArrayVarEntryInfo** p)
+{
+    int stored = SwitchFile(this->file_id);
+    SgProcHedrStmt* h = isSgProcHedrStmt(header);
+    VarSet* use = graph->getUse();
+    SgSymbol* par = h->parameter(i);
+    /*
+    CScalarVarEntryInfo* var = new CScalarVarEntryInfo(par);
+    bool result = false;
+    if (use->belongs(var))
+        result = true;
+    delete var;
+    */
+    VarItem* result = use->belongs(par);
+    if (result && result->var->GetVarType() == VAR_REF_ARRAY_EXP && p) 
+        *p = (CArrayVarEntryInfo*)result->var;
+    SwitchFile(stored);
+
+    return result;
+}
+
+bool AnalysedCallsList::isArgOut(int i, CArrayVarEntryInfo** p)
+{
+    int stored = SwitchFile(this->file_id);
+    SgProcHedrStmt* h = isSgProcHedrStmt(header);
+    graph->privateAnalyzer();
+    VarSet* def = graph->getDef();
+    SgSymbol* par = h->parameter(i);
+    /*
+    CScalarVarEntryInfo* var = new CScalarVarEntryInfo(par);
+    bool result = false;
+    if (def->belongs(var))
+        result = true;
+    delete var;
+    */
+    VarItem* result = def->belongs(par);
+    if (result && result->var->GetVarType() == VAR_REF_ARRAY_EXP && p) 
+        *p = (CArrayVarEntryInfo*)result->var;
+    SwitchFile(stored);
+
+    return result;
+}
+
+void CommonData::MarkAsUsed(VarSet* use, AnalysedCallsList* lst)
+{
+    for (CommonDataItem* it = list; it != NULL; it = it->next) {
+        if (it->proc == lst) {
+            for (CommonVarInfo* v = it->info; v != NULL; v = v->next) {
+                CVarEntryInfo* r = v->var;
+                if (use->belongs(r))
+                    v->isInUse = true;
+            }
+        }
+    }
+}
+
+void CBasicBlock::ProcessUserProcedure(bool isFun, void* call, AnalysedCallsList* c)
+{
+    /*
+    if (c == NULL || c->graph == NULL) {
+        is_correct = "no body found for procedure";
+        if (c != NULL)
+            failed_proc_name = c->funName;
+        else
+            failed_proc_name = NULL;
+        return;
+    }
+    */
+    if (c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c != NULL && c->graph != NULL) 
+    {
+        int stored_file_id = SwitchFile(c->file_id);
+        c->graph->getPrivate(); //all sets actually
+        SgStatement *cp = c->header->controlParent();
+        SwitchFile(stored_file_id);
+
+        if (proc && proc->header->variant() == PROC_HEDR && cp == proc->header) {
+            VarSet* use_c = new VarSet();
+            use_c->unite(c->graph->getUse(), false);
+            for (VarItem* exp = use_c->getFirst(); exp != NULL; exp = use_c->getFirst()) {
+                if (exp->var->GetSymbol()->scope() == proc->header) {
+                    addExprToUse(new SgVarRefExp(exp->var->GetSymbol())); // TESTING
+                }
+                use_c->remove(exp->var);
+            }
+            delete use_c;
+            VarSet* def_c = new VarSet();
+            def_c->unite(c->graph->getDef(), true);
+            for (VarItem* exp = def_c->getFirst(); exp != NULL; exp = def_c->getFirst()) {
+                if (exp->var->GetSymbol()->scope() == proc->header) {
+                    def->addToSet(exp->var, NULL);
+                }
+                def_c->remove(exp->var);
+            }
+            delete def_c;
+        }
+
+        pCommons->MarkAsUsed(c->graph->getUse(), c);
+        SgProcHedrStmt* header = isSgProcHedrStmt(c->header);
+        if (!header) {
+            is_correct = "no header for procedure";
+            failed_proc_name = c->funName;
+            return;
+        }
+    }
+
+    for (int i = 0; i < GetNumberOfArguments(isFun, call); i++) 
+    {
+        SgExpression* ar = GetProcedureArgument(isFun, call, i);
+        CArrayVarEntryInfo* tp = NULL;
+        if (c == (AnalysedCallsList*)(-1) || c == (AnalysedCallsList*)(-2) || c == NULL || c->graph == NULL || c->isArgIn(i, &tp))
+            addExprToUse(ar, tp);
+        tp = NULL;
+        if (c == (AnalysedCallsList*)(-1) || c == NULL || c->graph == NULL || c->isArgOut(i, &tp))
+            AddOneExpressionToDef(GetProcedureArgument(isFun, call, i), NULL, tp);
+    }
+
+    if (c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c != NULL && c->graph != NULL) {
+        for (CommonVarSet* cu = c->graph->getCommonUse(); cu != NULL; cu = cu->next) {
+            CommonVarInfo* v = cu->cvd;
+            AnalysedCallsList* tp = start->getProc();
+            CommonDataItem* p = v->parent;
+            if (CommonDataItem* it = pCommons->IsThisCommonUsedInProcedure(p, tp)) {
+                if (pCommons->CanHaveNonScalarVars(it))
+                    continue;
+                CommonVarInfo* i = it->info;
+                CommonVarInfo* j = p->info;
+                while (j != v) {
+                    j = j->next;
+                    if (i)
+                        i = i->next;
+                    else
+                        continue;
+                }
+                if (!i)
+                    continue;
+                SgVarRefExp* var = new SgVarRefExp(i->var->GetSymbol());
+                addExprToUse(var);
+            }
+            else {
+                common_use = new CommonVarSet(*cu);
+            }
+        }
+        for (CommonVarSet* cd = c->graph->getCommonDef(); cd != NULL; cd = cd->next) {
+            CommonVarInfo* v = cd->cvd;
+            AnalysedCallsList* tp = start->getProc();
+            CommonDataItem* p = v->parent;
+            if (CommonDataItem* it = pCommons->IsThisCommonUsedInProcedure(p, tp)) {
+                if (pCommons->CanHaveNonScalarVars(it))
+                    continue;
+                CommonVarInfo* i = it->info;
+                CommonVarInfo* j = p->info;
+                while (j != v) {
+                    j = j->next;
+                    if (i)
+                        i = i->next;
+                }
+                if (!i)
+                    continue;
+                def->addToSet(i->var, NULL);
+            }
+            else {
+                common_def = new CommonVarSet(*cd);
+            }
+        }
+    }
+
+}
+
+bool CommonData::CanHaveNonScalarVars(CommonDataItem* item)
+{
+    for (CommonDataItem* it = list; it != NULL; it = it->next) {
+        if (it->name == item->name && it->first == item->first && !it->onlyScalars)
+            return true;
+    }
+    bool res = !item->onlyScalars;
+    //printf("CommonData::CanHaveNonScalarVars: %d\n", res);
+    return res;
+}
+
+CommonDataItem* CommonData::IsThisCommonUsedInProcedure(CommonDataItem* item, AnalysedCallsList* p)
+{
+    for (CommonDataItem* it = list; it != NULL; it = it->next) {
+        if (it->proc == p) {
+            if (it->name == item->name)
+                return it;
+        }
+    }
+    return NULL;
+}
+
+void CBasicBlock::setDefAndUse()
+{
+    ControlFlowItem* p = start;
+    while (p != NULL && (p == start || !p->isLeader()))
+    {
+        if (p->getJump() == NULL)
+        {
+            SgStatement* st = p->getStatement();
+            SgFunctionCallExp* f = p->getFunctionCall();
+            
+            if (f != NULL)
+            {
+                bool add_intr = IsAnIntrinsicSubroutine(f->funName()->identifier()) != NULL; // strcmp(f->funName()->identifier(), "date_and_time") == 0;
+                bool intr = (isIntrinsicFunctionNameACC(f->funName()->identifier()) || add_intr) && !IsUserFunctionACC(f->funName());
+                bool pure = IsPureProcedureACC(f->funName());
+                AnalysedCallsList* c = p->getCall();
+                if (!intr && !pure && c && c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && !(c->IsIntrinsic())) {
+
+                    if (c->header == NULL) {
+                        is_correct = "no header for procedure";
+                        failed_proc_name = c->funName;
+                    }
+                    else {
+                        //graph_node* oldgn = currentGraphNode;
+                        //graph_node* newgn = GRAPHNODE(f->funName())->file_id;
+                        //currentGraphNode = newgn;
+                        ProcessUserProcedure(true, f, c);
+                        //currentGraphNode = oldgn;
+
+                    }
+                }
+                else if (c == (AnalysedCallsList*)(-1) || c == (AnalysedCallsList*)(-2))
+                    ProcessProcedureWithoutBody(true, f, c == (AnalysedCallsList*)(-1));
+                else if (intr || (c && c->IsIntrinsic())) {
+                    ProcessIntrinsicProcedure(true, f->numberOfArgs(), f, f->funName()->identifier());
+                }else
+                    ProcessProcedureHeader(true, isSgProcHedrStmt(GRAPHNODE(f->funName())->st_header), f, f->funName()->identifier());
+            }
+
+
+            if (st != NULL)
+            {
+                switch (st->variant())
+                {
+                case ASSIGN_STAT:
+                    {
+                        SgAssignStmt* s = isSgAssignStmt(st);
+                        SgExpression* l = s->lhs();
+                        SgExpression* r = s->rhs();
+                        addExprToUse(r);
+                        AddOneExpressionToDef(l, st, NULL);
+                        break;
+                    }
+                case PRINT_STAT:
+                case WRITE_STAT:
+                case READ_STAT:
+                    {
+                        SgInputOutputStmt* s = isSgInputOutputStmt(st);
+                        if (s) {
+                            SgExpression* ex = s->itemList();
+                            while (ex && ex->lhs()) {
+                                if (st->variant() == READ_STAT) {
+                                    AddOneExpressionToDef(ex->lhs(), st, NULL);
+                                }
+                                else {
+                                    addExprToUse(ex->lhs());
+                                }
+                                ex = ex->rhs();
+                            }
+                        }
+                        break;
+                    }
+                case PROC_STAT:
+                {
+                    SgCallStmt* f = isSgCallStmt(st);
+                    bool add_intr = IsAnIntrinsicSubroutine(f->name()->identifier()) != NULL;
+                    bool intr = (isIntrinsicFunctionNameACC(f->name()->identifier()) || add_intr) && !IsUserFunctionACC(f->name());
+                    bool pure = IsPureProcedureACC(f->name());
+                    if (!intr && !pure) {
+                        AnalysedCallsList* c = p->getCall();
+                        //graph_node* oldgn = currentGraphNode;
+                        //graph_node* newgn = GRAPHNODE(f->name());
+                        //currentGraphNode = newgn;
+                        ProcessUserProcedure(false, f, c);
+                        //currentGraphNode = oldgn;
+                        break;
+                    }
+                    if (intr) {
+                        ProcessIntrinsicProcedure(false, f->numberOfArgs(), f, f->name()->identifier());
+                        break;
+                    }
+                    ProcessProcedureHeader(false, isSgProcHedrStmt(GRAPHNODE(f->name())->st_header), f, f->name()->identifier());
+                }
+                default:
+                    break;
+                }
+            }
+        }
+        else
+            addExprToUse(p->getExpression());
+            p = p->getNext();
+    }
+}
+
+VarSet* CBasicBlock::getDef()
+{
+    if (def == NULL)
+    {
+        def = new VarSet();
+        use = new VarSet();
+        setDefAndUse();
+    }
+    return def;
+}
+
+VarSet* CBasicBlock::getUse()
+{
+    if (use == NULL)
+    {
+        use = new VarSet();
+        def = new VarSet();
+        setDefAndUse();
+    }
+    return use;
+}
+
+#ifdef __SPF
+template<typename IN_TYPE, typename OUT_TYPE>
+const vector<OUT_TYPE> getAttributes(IN_TYPE st, const set<int> dataType);
+#endif
+
+DoLoopDataItem* DoLoopDataList::FindLoop(SgStatement* st)
+{
+    DoLoopDataItem* it = list;
+    while (it != NULL) {
+        if (it->statement == st)
+            return it;
+        it = it->next;
+    }
+    return NULL;
+}
+
+bool GetExpressionAndCoefficientOfBound(SgExpression* exp, SgExpression** end, int* coef)
+{
+    if (exp->variant() == SUBT_OP) {
+        if (exp->rhs() && exp->rhs()->variant() == INT_VAL) {
+            *end = exp->lhs();
+            *coef = -exp->rhs()->valueInteger();
+            return true;
+        }
+    }
+    if (exp->variant() == ADD_OP) {
+        if (exp->lhs() && exp->lhs()->variant() == INT_VAL) {
+            *end = exp->rhs();
+            *coef = exp->lhs()->valueInteger();
+            return true;
+        }
+        if (exp->rhs() && exp->rhs()->variant() == INT_VAL) {
+            *end = exp->lhs();
+            *coef = exp->lhs()->valueInteger();
+            return true;
+        }
+    }
+    return false;
+}
+
+CArrayVarEntryInfo::CArrayVarEntryInfo(SgSymbol* s, SgArrayRefExp* r) : CVarEntryInfo(s)
+{
+#if __SPF
+    addToCollection(__LINE__, __FILE__, this, 16);
+#endif
+    // TODO: need to check all alhorithm!!
+    disabled = true;
+
+    if (!r)
+        subscripts = 0;
+    else
+        subscripts = r->numberOfSubscripts();
+    if (subscripts)
+        data.resize(subscripts);    
+
+    for (int i = 0; i < subscripts; i++) 
+    {
+        data[i].defined = false;
+        data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = 0;
+        data[i].step = 1;
+        data[i].left_bound = data[i].right_bound = NULL;
+        data[i].coefs[0] = data[i].coefs[1] = 0;
+        data[i].loop = NULL;
+#if __SPF
+        const vector<int*> coefs = getAttributes<SgExpression*, int*>(r->subscript(i), set<int>{ INT_VAL });
+        const vector<SgStatement*> fs = getAttributes<SgExpression*, SgStatement*>(r->subscript(i), set<int>{ FOR_NODE });
+        if (fs.size() == 1) 
+        {
+            if (data[i].loop != NULL) 
+            {
+                if (coefs.size() == 1) 
+                {
+                    data[i].defined = true;
+                    data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = coefs[0][1];
+                    data[i].coefs[0] = coefs[0][0];
+                    data[i].coefs[1] = coefs[0][1];
+                    data[i].step = coefs[0][0];
+                    int tmp;
+
+                    SgExpression *et;
+                    if (GetExpressionAndCoefficientOfBound(data[i].loop->l, &et, &tmp)) 
+                    {
+                        data[i].left_bound = et;
+                        data[i].bound_modifiers[0] += tmp;
+                    }
+                    else 
+                        data[i].left_bound = data[i].loop->l;
+                    
+                    if (GetExpressionAndCoefficientOfBound(data[i].loop->r, &et, &tmp)) 
+                    {
+                        data[i].right_bound = et;
+                        data[i].bound_modifiers[1] += tmp;
+                    }
+                    else 
+                        data[i].right_bound = data[i].loop->r;                    
+                }
+            }
+        }
+#endif
+        if (!data[i].defined) 
+        {
+            SgExpression* ex = r->subscript(i);
+            if (ex->variant() == INT_VAL) 
+            {
+                data[i].bound_modifiers[0] = ex->valueInteger();
+                data[i].bound_modifiers[1] = ex->valueInteger();
+                data[i].defined = true;
+            }
+            else 
+            {
+                data[i].bound_modifiers[0] = 0;
+                data[i].bound_modifiers[1] = 0;
+                data[i].left_bound = data[i].right_bound = ex;
+                data[i].defined = true;
+            }
+        }
+    }
+}
+
+CArrayVarEntryInfo::CArrayVarEntryInfo(SgSymbol *s, int sub, int ds, const vector<ArraySubscriptData> &d) 
+                                       : CVarEntryInfo(s), subscripts(sub), disabled(ds)
+{ 
+#if __SPF
+    addToCollection(__LINE__, __FILE__, this, 16);
+#endif
+    if (sub > 0) 
+        data = d;
+}
+
+VarItem* VarSet::GetArrayRef(CArrayVarEntryInfo* info)
+{
+    VarItem* it = list;
+    while (it != NULL) {
+        CVarEntryInfo* v = it->var;
+        if (v->GetVarType() == VAR_REF_ARRAY_EXP) {
+            if (OriginalSymbol(info->GetSymbol()) == OriginalSymbol(v->GetSymbol()))
+                return it;
+        }
+        it = it->next;
+    }
+    return NULL;
+}
+
+void CArrayVarEntryInfo::RegisterUsage(VarSet *def, VarSet *use, SgStatement *st)
+{
+    VarItem *it = def->GetArrayRef(this);
+    CArrayVarEntryInfo *add = this;
+    if (it != NULL) 
+        add = *this - *(CArrayVarEntryInfo*)(it->var);
+    
+    if (use != NULL && add != NULL && add->HasActiveElements()) 
+        use->addToSet(add, st);
+    
+    if (add != this)
+        delete add;
+}
+
+CArrayVarEntryInfo& CArrayVarEntryInfo::operator-=(const CArrayVarEntryInfo& b)
+{
+    if (subscripts == 0)
+    {
+        if (b.HasActiveElements()) 
+            disabled = true;        
+        return *this;
+    }
+
+    if (b.subscripts == 0) 
+    {
+        if (HasActiveElements()) 
+            MakeInactive();        
+        return *this;
+    }
+
+    if (subscripts != b.subscripts || !data.size() || !b.data.size() || !(data[0].defined) || !(b.data[0].defined)) 
+        return *this;
+    
+    for (int i = 0; i < subscripts; i++) 
+    {
+        if (b.data[i].left_bound == NULL) 
+        {
+            if (data[i].left_bound && data[i].left_bound->variant() == INT_VAL) 
+            {
+                if (data[i].left_bound->valueInteger() + data[i].bound_modifiers[0] == b.data[i].bound_modifiers[0]) 
+                {
+                    data[i].bound_modifiers[0]++;
+                    continue;
+                }
+            }
+        }
+
+        if (data[i].left_bound == NULL && b.data[i].left_bound == NULL &&
+            data[i].right_bound == NULL && b.data[i].right_bound == NULL) 
+        {
+            if (data[i].bound_modifiers[0] < b.data[i].bound_modifiers[0]) 
+            {
+                data[i].bound_modifiers[1] = b.data[i].bound_modifiers[0] - 1;
+                continue;
+            }
+
+            if (data[i].bound_modifiers[1] > b.data[i].bound_modifiers[1]) 
+            {
+                data[i].bound_modifiers[0] = b.data[i].bound_modifiers[1] + 1;
+                continue;
+            }
+            data[i].defined = false;
+        }
+
+        if (data[i].left_bound == b.data[i].left_bound && data[i].bound_modifiers[0] < b.data[i].bound_modifiers[0]) 
+        {
+            data[i].bound_modifiers[0] = data[i].bound_modifiers[0];
+            data[i].bound_modifiers[1] = b.data[i].bound_modifiers[0] - 1;
+            data[i].right_bound = data[i].left_bound;
+        }
+
+        if (data[i].right_bound == b.data[i].right_bound && data[i].bound_modifiers[1] > b.data[i].bound_modifiers[1]) 
+        {
+            data[i].bound_modifiers[0] = b.data[i].bound_modifiers[1] + 1;
+            data[i].bound_modifiers[1] = data[i].bound_modifiers[1];
+            data[i].left_bound = data[i].right_bound;
+        }
+
+        if (b.data[i].left_bound == NULL && b.data[i].right_bound == NULL && 
+            (data[i].left_bound != NULL || data[i].right_bound != NULL))
+            continue;        
+        else 
+        {
+            data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = 0;
+            data[i].left_bound = NULL;
+            data[i].right_bound = NULL;
+            data[i].defined = false;
+            //empty set
+        }
+    }
+    return *this;
+}
+
+CArrayVarEntryInfo* operator-(const CArrayVarEntryInfo& a, const CArrayVarEntryInfo& b)
+{
+    //return NULL;
+    CArrayVarEntryInfo* nv = (CArrayVarEntryInfo*)a.Clone();
+    *nv -= b;
+    return nv;
+}
+
+CArrayVarEntryInfo* operator+(const CArrayVarEntryInfo& a, const CArrayVarEntryInfo& b)
+{
+    CArrayVarEntryInfo* nv = (CArrayVarEntryInfo*)a.Clone();
+    *nv += b;
+    return nv;
+}
+
+void CArrayVarEntryInfo::RegisterDefinition(VarSet* def, VarSet* use, SgStatement* st)
+{
+    def->addToSet(this, st);
+    use->PossiblyAffectArrayEntry(this);
+}
+
+void VarSet::PossiblyAffectArrayEntry(CArrayVarEntryInfo* var)
+{
+    VarItem* it = GetArrayRef(var);
+    if (!it)
+        return;
+    ((CArrayVarEntryInfo*)(it->var))->ProcessChangesToUsedEntry(var);
+}
+
+void CArrayVarEntryInfo::ProcessChangesToUsedEntry(CArrayVarEntryInfo* var)
+{
+    if (disabled || var->disabled || subscripts != var->subscripts)
+        return;
+    for (int i = 0; i < subscripts; i++) 
+    {
+        if (!data[i].defined)
+            continue;
+
+        if (data[i].loop == var->data[i].loop && data[i].loop != NULL) 
+        {
+            if (data[i].coefs[0] == var->data[i].coefs[0])
+            {
+                if (data[i].coefs[1] < var->data[i].coefs[1]) 
+                {
+                    if (data[i].left_bound && data[i].left_bound->variant() == INT_VAL) 
+                    {
+                        data[i].bound_modifiers[0] = data[i].left_bound->valueInteger() + data[i].bound_modifiers[0];
+                        data[i].bound_modifiers[1] = data[i].left_bound->valueInteger() + var->data[i].coefs[1] - 1;
+                        data[i].left_bound = data[i].right_bound = NULL;
+                    }
+                    else 
+                    {
+                        //maybe add something, not sure
+                    }
+                }
+            }
+        }
+    }
+}
+
+CArrayVarEntryInfo& CArrayVarEntryInfo::operator*=(const CArrayVarEntryInfo& b)
+{
+    if (subscripts == 0)
+    {
+        if (b.HasActiveElements())
+            disabled = true;
+        return *this;
+    }
+
+    if (b.subscripts == 0)
+    {
+        if (HasActiveElements())
+            MakeInactive();
+        return *this;
+    }
+
+    //return *this;
+    if (subscripts != b.subscripts || subscripts == 0 || b.subscripts == 0 || !data.size() || !b.data.size() || !(data[0].defined) || !(b.data[0].defined)) 
+        return *this;
+    
+    for (int i = 0; i < subscripts; i++) 
+    {
+        if (b.disabled) 
+            data[i].left_bound = data[i].right_bound = NULL;
+        
+        if (data[i].left_bound == b.data[i].left_bound) 
+            data[i].bound_modifiers[0] = std::max(data[i].bound_modifiers[0], b.data[i].bound_modifiers[0]);
+        
+        if (data[i].right_bound == b.data[i].right_bound) 
+            data[i].bound_modifiers[1] = std::min(data[i].bound_modifiers[1], b.data[i].bound_modifiers[1]);        
+    }
+    return *this;
+}
+
+CArrayVarEntryInfo& CArrayVarEntryInfo::operator+=(const CArrayVarEntryInfo& b)
+{
+    if (subscripts == 0)
+    {
+        if (b.HasActiveElements())
+            disabled = true;
+        return *this;
+    }
+
+    if (b.subscripts == 0)
+    {
+        if (HasActiveElements())
+            MakeInactive();
+        return *this;
+    }
+
+    //return *this;
+    if (disabled && !b.disabled && b.data.size()) 
+    {
+        for (int i = 0; i < subscripts; i++)
+            data[i] = b.data[i];
+        disabled = false;
+        return *this;
+    }
+
+    if (subscripts != b.subscripts || subscripts == 0 || b.subscripts == 0 || !data.size() || !b.data.size() || disabled || b.disabled) 
+        return *this;
+    
+    for (int i = 0; i < subscripts; i++) 
+    {
+
+        if (data[i].left_bound == b.data[i].left_bound) 
+            data[i].bound_modifiers[0] = std::min(data[i].bound_modifiers[0], b.data[i].bound_modifiers[0]);
+        
+        if (data[i].right_bound == b.data[i].right_bound) 
+            data[i].bound_modifiers[1] = std::max(data[i].bound_modifiers[1], b.data[i].bound_modifiers[1]);
+        
+        if (data[i].left_bound == NULL && data[i].right_bound == NULL && (b.data[i].left_bound != NULL || b.data[i].right_bound != NULL)) 
+        {
+            const ArraySubscriptData &tmp = data[i];
+            data[i] = b.data[i];
+            if (data[i].left_bound && data[i].left_bound->variant() == INT_VAL) 
+            {
+                if (tmp.bound_modifiers[1] == data[i].left_bound->valueInteger() + data[i].bound_modifiers[0] - 1) 
+                    data[i].bound_modifiers[0] -= (1 + tmp.bound_modifiers[1] - tmp.bound_modifiers[0]);
+                
+            }
+
+            if (data[i].right_bound && data[i].right_bound->variant() == INT_VAL) 
+            {
+                if (tmp.bound_modifiers[0] == data[i].left_bound->valueInteger() + data[i].bound_modifiers[1] + 1) 
+                    data[i].bound_modifiers[1] += (1 + tmp.bound_modifiers[1] - tmp.bound_modifiers[0]);                
+            }
+        }
+    }
+    return *this;
+}
+
+void VarSet::RemoveDoubtfulCommonVars(AnalysedCallsList* call)
+{
+    VarItem* it = list;
+    VarItem* prev = NULL;
+    while (it != NULL) {
+        CommonDataItem* d = pCommons->IsThisCommonVar(it, call);
+        if (d && pCommons->CanHaveNonScalarVars(d)) {
+            if (prev == NULL) {
+                it = it->next;
+                delete list;
+                list = it;
+            }
+            else {
+                prev->next = it->next;
+                delete it;
+                it = prev->next;
+            }
+            continue;
+        }
+        prev = it;
+        it = it->next;
+    }
+}
+
+int VarSet::count()
+{
+    VarItem* it = list;
+    int t = 0;
+    while (it != NULL) {
+        it = it->next;
+        t++;
+    }
+    return t;
+}
+
+void VarSet::LeaveOnlyRecords()
+{
+    VarItem* p = list;
+    VarItem* prev = NULL;
+    while (p != NULL) {
+        if (p->var->GetVarType() == VAR_REF_RECORD_EXP) {
+            CVarEntryInfo* rrec = p->var->GetLeftmostParent();
+            CVarEntryInfo* old = p->var;
+            if (old->RemoveReference())
+                delete old;
+            if (!belongs(rrec)) {
+                p->var = rrec;
+                prev = p;
+            }
+            else {
+                if (prev == NULL)
+                    list = list->next;
+                else
+                {
+                    prev->next = p->next;
+                    delete(p);
+                    p = prev;
+                }
+            }
+        }
+        else {
+            prev = p;
+        }
+        p = p->next;
+    }
+}
+
+VarItem* VarSet::belongs(const CVarEntryInfo* var, bool os)
+{
+    VarItem* l = list;
+    while (l != NULL)
+    {
+        if ((*l->var == *var))
+            return l;
+        if (os && OriginalSymbol(l->var->GetSymbol()) == OriginalSymbol(var->GetSymbol()))
+            return l;
+        l = l->next;
+    }
+    return NULL;
+}
+
+VarItem* VarSet::belongs(SgSymbol* s, bool os)
+{
+    VarItem* l = list;
+    while (l != NULL)
+    {
+        if ((l->var->GetSymbol() == s))
+            if (l->var->GetVarType() == VAR_REF_ARRAY_EXP)
+                return ((CArrayVarEntryInfo*)(l->var))->HasActiveElements() ? l : NULL;
+            return l;
+        if (os && OriginalSymbol(l->var->GetSymbol()) == OriginalSymbol(s))
+            return l;
+        l = l->next;
+    }
+    return NULL;
+}
+
+/*
+VarItem* VarSet::belongs(SgVarRefExp* var, bool os)
+{
+    return belongs(var->symbol(), os);
+}
+*/
+
+bool VarSet::equal(VarSet* p2)
+{
+    if (p2 == NULL)
+        return false;
+    VarItem* p = list;
+    VarItem* prev = NULL;
+    while (p != NULL)
+    {
+        if (!p2->belongs(p->var) && (p->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(p->var))->HasActiveElements()))
+            return false;
+        p = p->next;
+    }
+    p = p2->list;
+    while (p != NULL) {
+        if (!belongs(p->var) && (p->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(p->var))->HasActiveElements()))
+            return false;
+        p = p->next;
+    }
+    return true;
+}
+
+void VarSet::print()
+{
+    VarItem* l = list;
+    while (l != NULL)
+    {
+        if (l->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(l->var))->HasActiveElements())
+            printf("%s ", l->var->GetSymbol()->identifier());
+#if PRIVATE_GET_LAST_ASSIGN
+        printf("last assignments: %d\n", l->lastAssignments.size());
+        for (list<SgStatement*>::iterator it = l->lastAssignments.begin(); it != l->lastAssignments.end(); it++){
+            if (*it)
+                printf("%s", (*it)->unparse());
+        }
+#endif
+        l = l->next;
+    }
+    putchar('\n');
+}
+
+void VarSet::addToSet(CVarEntryInfo* var, SgStatement* source, CVarEntryInfo* ov)
+{
+    bool add = false;
+    if (var->GetVarType() != VAR_REF_ARRAY_EXP) {
+        VarItem* p = belongs(var, false);
+        add = p == NULL;
+#if PRIVATE_GET_LAST_ASSIGN
+        p->lastAssignments.clear();
+        p->lastAssignments.push_back(source);
+#endif
+        //delete p->lastAssignments;
+        //p->lastAssignments = new CLAStatementItem();
+        //p->lastAssignments->stmt = source;
+        //p->lastAssignments->next = NULL;
+    }
+    else {
+        CArrayVarEntryInfo* av = (CArrayVarEntryInfo*)var;
+        VarItem* p = GetArrayRef(av);
+        if (p == NULL)
+            add = true;
+        else {
+            CArrayVarEntryInfo* fv = (CArrayVarEntryInfo*)p->var;
+            *fv += *av;
+        }
+    }
+    if (add) {
+        VarItem* p = new VarItem();
+        p->var = var->Clone();
+        p->ov = ov;
+        p->next = list;
+        p->file_id = current_file_id;
+        list = p;
+    }
+}
+
+void VarSet::intersect(VarSet* set, bool la, bool array_mode = false)
+{
+    VarItem* p = list;
+    VarItem* prev = NULL;
+    while (p != NULL)
+    {        
+        VarItem* n = set->belongs(p->var);
+        if (!n)
+        {
+            if (!array_mode || p->var->GetVarType() == VAR_REF_VAR_EXP) {
+                if (prev == NULL)
+                    list = list->next;
+                else
+                {
+                    prev->next = p->next;
+                    delete(p);
+                    p = prev;
+                }
+            }
+        }
+        else {
+#if PRIVATE_GET_LAST_ASSIGN
+            if (la)
+                p->lastAssignments.insert(p->lastAssignments.end(), n->lastAssignments.begin(), n->lastAssignments.end());
+#endif
+            if (p->var->GetVarType() == VAR_REF_ARRAY_EXP) {
+                if (!array_mode)
+                    *(CArrayVarEntryInfo*)(p->var) *= *(CArrayVarEntryInfo*)(n->var);
+                else
+                    *(CArrayVarEntryInfo*)(p->var) += *(CArrayVarEntryInfo*)(n->var);
+            }
+            prev = p;
+        }
+        p = p->next;
+    }
+    
+}
+
+VarItem* VarSet::getFirst()
+{
+    return list;
+}
+
+void VarSet::remove(const CVarEntryInfo* var)
+{
+    VarItem* p = list;
+    VarItem* prev = NULL;
+    while (p != NULL)
+    {
+        if (var == (p->var))
+        {
+            if (prev == NULL) {
+                VarItem* t = list;
+                list = list->next;
+                delete(t);
+                p = list;
+
+            }
+            else
+            {
+                prev->next = p->next;
+                delete(p);
+                p = prev->next;
+            }
+        }
+        else {
+            prev = p;
+            p = p->next;
+        }
+    }
+}
+
+void VarSet::minus(VarSet* set, bool complete)
+{
+    VarItem* p = list;
+    VarItem* prev = NULL;
+    while (p != NULL)
+    {
+        VarItem* d = set->belongs(p->var);
+        if (d && (p->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(d->var))->HasActiveElements()))
+        {
+            if (p->var->GetVarType() == VAR_REF_ARRAY_EXP && !complete) {
+                *(CArrayVarEntryInfo*)(p->var) -= *(CArrayVarEntryInfo*)(d->var);
+                prev = p;
+            }
+            else if (prev == NULL)
+                list = list->next;
+            else
+            {
+                prev->next = p->next;
+                delete(p);
+                p = prev;
+            }
+        }
+        else
+            prev = p;
+
+        p = p->next;
+    }
+}
+
+bool VarSet::RecordBelong(CVarEntryInfo* rec) 
+{
+    if (rec->GetVarType() != VAR_REF_RECORD_EXP)
+        return false;
+    CRecordVarEntryInfo* rrec = static_cast<CRecordVarEntryInfo*>(rec);
+    CVarEntryInfo* lm = rrec->GetLeftmostParent();
+    VarItem* p = list;
+    while (p != NULL) {
+        if (*lm == *(p->var->GetLeftmostParent()))
+            return true;
+        p = p->next;
+    }
+    return false;
+}
+
+void VarSet::minusFinalize(VarSet* set, bool complete)
+{
+    minus(set, complete);
+    VarItem* p = list;
+    VarItem* prev = NULL;
+    while (p != NULL)
+    {
+        if (set->RecordBelong(p->var)) {
+            {
+                if (prev == NULL)
+                    list = list->next;
+                else
+                {
+                    prev->next = p->next;
+                    delete(p);
+                    p = prev;
+                }
+            }
+        }
+        else
+            prev = p;
+
+        p = p->next;
+    }
+}
+
+unsigned int counter = 0;
+
+CLAStatementItem::~CLAStatementItem()
+{
+#if __SPF
+    removeFromCollection(this);
+#endif
+    if (next)
+        delete next;
+}
+
+CLAStatementItem* CLAStatementItem::GetLast()
+{
+    if (next == NULL)
+        return this;
+    return next->GetLast();
+}
+
+void VarSet::unite(VarSet* set, bool la)
+{
+    VarItem* arg2 = set->list;
+    while (arg2 != NULL)
+    {
+        VarItem* n = belongs(arg2->var);
+        if (!n)
+        {
+            n = new VarItem();
+            if (arg2->var->GetVarType() == VAR_REF_ARRAY_EXP)
+                n->var = arg2->var->Clone();
+            else {
+                n->var = arg2->var;
+                n->var->AddReference();
+            }
+            n->ov = arg2->ov;
+            n->next = list;
+            n->file_id = arg2->file_id;
+#if PRIVATE_GET_LAST_ASSIGN
+            if (la)
+                n->lastAssignments = arg2->lastAssignments;
+#endif
+            list = n;
+        }
+        else {
+#if PRIVATE_GET_LAST_ASSIGN
+            if (la) {
+                //n->lastAssignments.insert(n->lastAssignments.end(), arg2->lastAssignments.begin(), arg2->lastAssignments.end());
+                //n->lastAssignments.splice(n->lastAssignments.end(), arg2->lastAssignments);
+                //n->lastAssignments->GetLast()->next = arg2->lastAssignments;
+                n->lastAssignments = arg2->lastAssignments;
+            }
+#endif
+            //counter++;
+            //if (counter % 100 == 0)
+                //printf("%d!\n", counter);
+            if (n->var->GetVarType() == VAR_REF_ARRAY_EXP) {
+                *(CArrayVarEntryInfo*)(n->var) += *(CArrayVarEntryInfo*)(arg2->var);
+            }
+        }
+        arg2 = arg2->next;
+    }
+}
+
+
+
+void CBasicBlock::addToPrev(CBasicBlock* bb, bool for_jump_flag, bool c, ControlFlowItem* check)
+{
+    BasicBlockItem* n = new BasicBlockItem();
+    n->block = bb;
+    n->next = prev;
+    n->for_jump_flag = for_jump_flag;
+    n->cond_value = c;
+    n->jmp = check;
+    prev = n;
+}
+
+void CBasicBlock::addToSucc(CBasicBlock* bb, bool for_jump_flag, bool c, ControlFlowItem* check)
+{
+    BasicBlockItem* n = new BasicBlockItem();
+    n->block = bb;
+    n->for_jump_flag = for_jump_flag;
+    n->next = succ;
+    n->cond_value = c;
+    n->jmp = check;
+    succ = n;
+}
+
+#if ACCAN_DEBUG
+
+void ControlFlowItem::printDebugInfo()
+{
+    if (jmp == NULL && stmt == NULL && func != NULL)
+        printf("FUNCTION CALL: %s\n", func->unparse());
+    if (jmp == NULL)
+        if (stmt != NULL)
+            if (label != NULL)
+                printf("%d: %s %s %s lab %4d %s", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id(), stmt->unparse());
+            else
+                printf("%d: %s %s %s          %s", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", stmt->unparse());
+        else
+            if (label != NULL)
+                printf("%d: %s %s %s lab %4d \n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id());
+            else
+                printf("%d: %s %s %s         \n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ");
+    else
+        if (expr == NULL)
+            if (label != NULL)
+                printf("%d: %s %s %s lab %4d       goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id(), jmp->getStmtNo());
+            else
+                printf("%d: %s %s %s                goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", jmp->getStmtNo());
+        else
+            if (label != NULL)
+                printf("%d: %s %s %s lab %4d       if %s goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id(), expr->unparse(), jmp->getStmtNo());
+            else
+                printf("%d: %s %s %s                if %s goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", expr->unparse(), jmp->getStmtNo());
+}
+
+static void printControlFlowList(ControlFlowItem* list, ControlFlowItem* last)
+{
+
+    printf("DEBUG PRINT START\n");
+    unsigned int stmtNo = 0;
+    ControlFlowItem* list_copy = list;
+    while (list != NULL )
+    {
+        list->setStmtNo(++stmtNo);
+        if (list == last)
+            break;
+        list = list->getNext();
+    }
+
+    list = list_copy;
+    while (list != NULL)
+    {
+        list->printDebugInfo();
+        if (list == last)
+            break;
+        list = list->getNext();
+    }
+    printf("DEBUG PRINT END\n\n");
+}
+#endif
+
+void CallData::printControlFlows()
+{
+#if ACCAN_DEBUG
+    AnalysedCallsList* l = calls_list;
+    while (l != NULL) {
+        if (!l->isIntrinsic && l->graph != NULL && l->header != NULL) {
+            ControlFlowGraph* g = l->graph;
+            SgStatement* h = l->header;
+            printf("CFI for %s\n\n" ,h->symbol()->identifier());
+            if (g != NULL) {
+                printControlFlowList(g->getCFI());
+            }
+            else
+                printf("ERROR: DOES NOT HAVE CFI\n");
+        }
+        l = l->next;
+    }
+#endif
+}
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_data.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_data.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_data.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_data.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/calls.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/calls.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/calls.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/calls.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/debug.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/debug.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/debug.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/debug.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/dvm.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/dvm.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/dvm.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/dvm.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/funcall.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/funcall.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/funcall.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/funcall.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/help.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/help.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/help.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/help.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/hpf.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/hpf.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/hpf.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/hpf.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/io.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/io.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/io.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/io.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/fdvm/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/fdvm/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/makefile.win
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/omp.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/omp.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/omp.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/omp.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/parloop.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/parloop.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/parloop.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/parloop.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/fdvm/stmt.cpp b/Sapfor/projects/dvm/fdvm/trunk/fdvm/stmt.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/fdvm/stmt.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/fdvm/stmt.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/acc_across_analyzer.h b/Sapfor/projects/dvm/fdvm/trunk/include/acc_across_analyzer.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/acc_across_analyzer.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/acc_across_analyzer.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/acc_analyzer.h b/Sapfor/projects/dvm/fdvm/trunk/include/acc_analyzer.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/acc_analyzer.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/acc_analyzer.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/acc_data.h b/Sapfor/projects/dvm/fdvm/trunk/include/acc_data.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/acc_data.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/acc_data.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/aks_loopStructure.h b/Sapfor/projects/dvm/fdvm/trunk/include/aks_loopStructure.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/aks_loopStructure.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/aks_loopStructure.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/aks_structs.h b/Sapfor/projects/dvm/fdvm/trunk/include/aks_structs.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/aks_structs.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/aks_structs.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/calls.h b/Sapfor/projects/dvm/fdvm/trunk/include/calls.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/calls.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/calls.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/dvm.h b/Sapfor/projects/dvm/fdvm/trunk/include/dvm.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/dvm.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/dvm.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/dvm_tag.h b/Sapfor/projects/dvm/fdvm/trunk/include/dvm_tag.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/dvm_tag.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/dvm_tag.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/extern.h b/Sapfor/projects/dvm/fdvm/trunk/include/extern.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/extern.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/extern.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/fdvm.h b/Sapfor/projects/dvm/fdvm/trunk/include/fdvm.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/fdvm.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/fdvm.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/fdvm_version.h b/Sapfor/projects/dvm/fdvm/trunk/include/fdvm_version.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/fdvm_version.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/fdvm_version.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/inc.h b/Sapfor/projects/dvm/fdvm/trunk/include/inc.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/inc.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/inc.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/leak_detector.h b/Sapfor/projects/dvm/fdvm/trunk/include/leak_detector.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/leak_detector.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/leak_detector.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/libSageOMP.h b/Sapfor/projects/dvm/fdvm/trunk/include/libSageOMP.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/libSageOMP.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/libSageOMP.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/libdvm.h b/Sapfor/projects/dvm/fdvm/trunk/include/libdvm.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/libdvm.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/libdvm.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/libnum.h b/Sapfor/projects/dvm/fdvm/trunk/include/libnum.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/libnum.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/libnum.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/unparse.hpf b/Sapfor/projects/dvm/fdvm/trunk/include/unparse.hpf
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/unparse.hpf
rename to Sapfor/projects/dvm/fdvm/trunk/include/unparse.hpf
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/unparse1.hpf b/Sapfor/projects/dvm/fdvm/trunk/include/unparse1.hpf
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/unparse1.hpf
rename to Sapfor/projects/dvm/fdvm/trunk/include/unparse1.hpf
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/include/user.h b/Sapfor/projects/dvm/fdvm/trunk/include/user.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/include/user.h
rename to Sapfor/projects/dvm/fdvm/trunk/include/user.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/makefile.win
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/CMakeLists.txt b/Sapfor/projects/dvm/fdvm/trunk/parser/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/CMakeLists.txt
rename to Sapfor/projects/dvm/fdvm/trunk/parser/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/Makefile b/Sapfor/projects/dvm/fdvm/trunk/parser/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/Makefile
rename to Sapfor/projects/dvm/fdvm/trunk/parser/Makefile
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/cftn.c b/Sapfor/projects/dvm/fdvm/trunk/parser/cftn.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/cftn.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/cftn.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/errors.c b/Sapfor/projects/dvm/fdvm/trunk/parser/errors.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/errors.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/errors.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/facc.gram b/Sapfor/projects/dvm/fdvm/trunk/parser/facc.gram
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/facc.gram
rename to Sapfor/projects/dvm/fdvm/trunk/parser/facc.gram
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/fdvm.gram b/Sapfor/projects/dvm/fdvm/trunk/parser/fdvm.gram
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/fdvm.gram
rename to Sapfor/projects/dvm/fdvm/trunk/parser/fdvm.gram
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/fomp.gram b/Sapfor/projects/dvm/fdvm/trunk/parser/fomp.gram
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/fomp.gram
rename to Sapfor/projects/dvm/fdvm/trunk/parser/fomp.gram
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/fspf.gram b/Sapfor/projects/dvm/fdvm/trunk/parser/fspf.gram
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/fspf.gram
rename to Sapfor/projects/dvm/fdvm/trunk/parser/fspf.gram
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/ftn.gram b/Sapfor/projects/dvm/fdvm/trunk/parser/ftn.gram
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/ftn.gram
rename to Sapfor/projects/dvm/fdvm/trunk/parser/ftn.gram
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.tab.c b/Sapfor/projects/dvm/fdvm/trunk/parser/gram1.tab.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.tab.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/gram1.tab.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.tab.h b/Sapfor/projects/dvm/fdvm/trunk/parser/gram1.tab.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.tab.h
rename to Sapfor/projects/dvm/fdvm/trunk/parser/gram1.tab.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.y b/Sapfor/projects/dvm/fdvm/trunk/parser/gram1.y
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/gram1.y
rename to Sapfor/projects/dvm/fdvm/trunk/parser/gram1.y
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/hash.c b/Sapfor/projects/dvm/fdvm/trunk/parser/hash.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/hash.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/hash.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/head b/Sapfor/projects/dvm/fdvm/trunk/parser/head
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/head
rename to Sapfor/projects/dvm/fdvm/trunk/parser/head
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/init.c b/Sapfor/projects/dvm/fdvm/trunk/parser/init.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/init.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/init.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/lexfdvm.c b/Sapfor/projects/dvm/fdvm/trunk/parser/lexfdvm.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/lexfdvm.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/lexfdvm.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/lists.c b/Sapfor/projects/dvm/fdvm/trunk/parser/lists.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/lists.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/lists.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/low_hpf.c b/Sapfor/projects/dvm/fdvm/trunk/parser/low_hpf.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/low_hpf.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/low_hpf.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/parser/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/parser/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/parser/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/parser/makefile.win
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/misc.c b/Sapfor/projects/dvm/fdvm/trunk/parser/misc.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/misc.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/misc.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/stat.c b/Sapfor/projects/dvm/fdvm/trunk/parser/stat.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/stat.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/stat.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/sym.c b/Sapfor/projects/dvm/fdvm/trunk/parser/sym.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/sym.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/sym.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/tag b/Sapfor/projects/dvm/fdvm/trunk/parser/tag
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/tag
rename to Sapfor/projects/dvm/fdvm/trunk/parser/tag
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/tag.h b/Sapfor/projects/dvm/fdvm/trunk/parser/tag.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/tag.h
rename to Sapfor/projects/dvm/fdvm/trunk/parser/tag.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/tokdefs.h b/Sapfor/projects/dvm/fdvm/trunk/parser/tokdefs.h
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/tokdefs.h
rename to Sapfor/projects/dvm/fdvm/trunk/parser/tokdefs.h
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/tokens b/Sapfor/projects/dvm/fdvm/trunk/parser/tokens
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/tokens
rename to Sapfor/projects/dvm/fdvm/trunk/parser/tokens
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/types.c b/Sapfor/projects/dvm/fdvm/trunk/parser/types.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/types.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/types.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/parser/unparse_hpf.c b/Sapfor/projects/dvm/fdvm/trunk/parser/unparse_hpf.c
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/parser/unparse_hpf.c
rename to Sapfor/projects/dvm/fdvm/trunk/parser/unparse_hpf.c
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp b/Sapfor/projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp
rename to Sapfor/projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/sageExample/makefile.uni b/Sapfor/projects/dvm/fdvm/trunk/sageExample/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/sageExample/makefile.uni
rename to Sapfor/projects/dvm/fdvm/trunk/sageExample/makefile.uni
diff --git a/Sapfor/_projects/dvm/fdvm/trunk/sageExample/makefile.win b/Sapfor/projects/dvm/fdvm/trunk/sageExample/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/fdvm/trunk/sageExample/makefile.win
rename to Sapfor/projects/dvm/fdvm/trunk/sageExample/makefile.win
diff --git a/Sapfor/_projects/dvm/tools/Zlib/CMakeLists.txt b/Sapfor/projects/dvm/tools/Zlib/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/CMakeLists.txt
rename to Sapfor/projects/dvm/tools/Zlib/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/deflate.h b/Sapfor/projects/dvm/tools/Zlib/include/deflate.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/deflate.h
rename to Sapfor/projects/dvm/tools/Zlib/include/deflate.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/infblock.h b/Sapfor/projects/dvm/tools/Zlib/include/infblock.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/infblock.h
rename to Sapfor/projects/dvm/tools/Zlib/include/infblock.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/infcodes.h b/Sapfor/projects/dvm/tools/Zlib/include/infcodes.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/infcodes.h
rename to Sapfor/projects/dvm/tools/Zlib/include/infcodes.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/inffast.h b/Sapfor/projects/dvm/tools/Zlib/include/inffast.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/inffast.h
rename to Sapfor/projects/dvm/tools/Zlib/include/inffast.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/inffixed.h b/Sapfor/projects/dvm/tools/Zlib/include/inffixed.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/inffixed.h
rename to Sapfor/projects/dvm/tools/Zlib/include/inffixed.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/inftrees.h b/Sapfor/projects/dvm/tools/Zlib/include/inftrees.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/inftrees.h
rename to Sapfor/projects/dvm/tools/Zlib/include/inftrees.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/infutil.h b/Sapfor/projects/dvm/tools/Zlib/include/infutil.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/infutil.h
rename to Sapfor/projects/dvm/tools/Zlib/include/infutil.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/trees.h b/Sapfor/projects/dvm/tools/Zlib/include/trees.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/trees.h
rename to Sapfor/projects/dvm/tools/Zlib/include/trees.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/zconf.h b/Sapfor/projects/dvm/tools/Zlib/include/zconf.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/zconf.h
rename to Sapfor/projects/dvm/tools/Zlib/include/zconf.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/zlib.h b/Sapfor/projects/dvm/tools/Zlib/include/zlib.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/zlib.h
rename to Sapfor/projects/dvm/tools/Zlib/include/zlib.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/include/zutil.h b/Sapfor/projects/dvm/tools/Zlib/include/zutil.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/include/zutil.h
rename to Sapfor/projects/dvm/tools/Zlib/include/zutil.h
diff --git a/Sapfor/_projects/dvm/tools/Zlib/makefile.uni b/Sapfor/projects/dvm/tools/Zlib/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/makefile.uni
rename to Sapfor/projects/dvm/tools/Zlib/makefile.uni
diff --git a/Sapfor/_projects/dvm/tools/Zlib/makefile.win b/Sapfor/projects/dvm/tools/Zlib/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/makefile.win
rename to Sapfor/projects/dvm/tools/Zlib/makefile.win
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/CMakeLists.txt b/Sapfor/projects/dvm/tools/Zlib/src/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/CMakeLists.txt
rename to Sapfor/projects/dvm/tools/Zlib/src/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/adler32.c b/Sapfor/projects/dvm/tools/Zlib/src/adler32.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/adler32.c
rename to Sapfor/projects/dvm/tools/Zlib/src/adler32.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/compress.c b/Sapfor/projects/dvm/tools/Zlib/src/compress.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/compress.c
rename to Sapfor/projects/dvm/tools/Zlib/src/compress.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/crc32.c b/Sapfor/projects/dvm/tools/Zlib/src/crc32.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/crc32.c
rename to Sapfor/projects/dvm/tools/Zlib/src/crc32.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/deflate.c b/Sapfor/projects/dvm/tools/Zlib/src/deflate.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/deflate.c
rename to Sapfor/projects/dvm/tools/Zlib/src/deflate.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/example.c b/Sapfor/projects/dvm/tools/Zlib/src/example.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/example.c
rename to Sapfor/projects/dvm/tools/Zlib/src/example.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/gzio.c b/Sapfor/projects/dvm/tools/Zlib/src/gzio.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/gzio.c
rename to Sapfor/projects/dvm/tools/Zlib/src/gzio.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/infblock.c b/Sapfor/projects/dvm/tools/Zlib/src/infblock.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/infblock.c
rename to Sapfor/projects/dvm/tools/Zlib/src/infblock.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/infcodes.c b/Sapfor/projects/dvm/tools/Zlib/src/infcodes.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/infcodes.c
rename to Sapfor/projects/dvm/tools/Zlib/src/infcodes.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/inffast.c b/Sapfor/projects/dvm/tools/Zlib/src/inffast.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/inffast.c
rename to Sapfor/projects/dvm/tools/Zlib/src/inffast.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/inflate.c b/Sapfor/projects/dvm/tools/Zlib/src/inflate.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/inflate.c
rename to Sapfor/projects/dvm/tools/Zlib/src/inflate.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/inftrees.c b/Sapfor/projects/dvm/tools/Zlib/src/inftrees.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/inftrees.c
rename to Sapfor/projects/dvm/tools/Zlib/src/inftrees.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/infutil.c b/Sapfor/projects/dvm/tools/Zlib/src/infutil.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/infutil.c
rename to Sapfor/projects/dvm/tools/Zlib/src/infutil.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/maketree.c b/Sapfor/projects/dvm/tools/Zlib/src/maketree.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/maketree.c
rename to Sapfor/projects/dvm/tools/Zlib/src/maketree.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/minigzip.c b/Sapfor/projects/dvm/tools/Zlib/src/minigzip.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/minigzip.c
rename to Sapfor/projects/dvm/tools/Zlib/src/minigzip.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/trees.c b/Sapfor/projects/dvm/tools/Zlib/src/trees.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/trees.c
rename to Sapfor/projects/dvm/tools/Zlib/src/trees.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/uncompr.c b/Sapfor/projects/dvm/tools/Zlib/src/uncompr.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/uncompr.c
rename to Sapfor/projects/dvm/tools/Zlib/src/uncompr.c
diff --git a/Sapfor/_projects/dvm/tools/Zlib/src/zutil.c b/Sapfor/projects/dvm/tools/Zlib/src/zutil.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/Zlib/src/zutil.c
rename to Sapfor/projects/dvm/tools/Zlib/src/zutil.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/makefile.win b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/makefile.win
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/makefile.win
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h b/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h
rename to Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1 b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
diff --git a/Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme b/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme
rename to Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/CMakeLists.txt b/Sapfor/projects/dvm/tools/pppa/trunk/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/CMakeLists.txt
rename to Sapfor/projects/dvm/tools/pppa/trunk/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/makefile.uni b/Sapfor/projects/dvm/tools/pppa/trunk/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/makefile.uni
rename to Sapfor/projects/dvm/tools/pppa/trunk/makefile.uni
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/makefile.win b/Sapfor/projects/dvm/tools/pppa/trunk/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/makefile.win
rename to Sapfor/projects/dvm/tools/pppa/trunk/makefile.win
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/CMakeLists.txt b/Sapfor/projects/dvm/tools/pppa/trunk/src/CMakeLists.txt
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/CMakeLists.txt
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/CMakeLists.txt
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/LibraryImport.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/LibraryImport.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/LibraryImport.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/LibraryImport.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln b/Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj b/Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters b/Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/bool.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/bool.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/bool.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/bool.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/dvmh_stat.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/dvmh_stat.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/dvmh_stat.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/dvmh_stat.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/dvmvers.h.in b/Sapfor/projects/dvm/tools/pppa/trunk/src/dvmvers.h.in
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/dvmvers.h.in
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/dvmvers.h.in
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/inter.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/inter.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/inter.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/inter.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/inter.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/inter.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/inter.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/inter.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/json.hpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/json.hpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/json.hpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/json.hpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/makefile.uni b/Sapfor/projects/dvm/tools/pppa/trunk/src/makefile.uni
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/makefile.uni
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/makefile.uni
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/makefile.win b/Sapfor/projects/dvm/tools/pppa/trunk/src/makefile.win
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/makefile.win
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/makefile.win
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/makefileJnilib b/Sapfor/projects/dvm/tools/pppa/trunk/src/makefileJnilib
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/makefileJnilib
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/makefileJnilib
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/potensyn.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/potensyn.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/potensyn.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/potensyn.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/potensyn.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/potensyn.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/potensyn.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/potensyn.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/stat.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/stat.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/stat.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/stat.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statfile.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/statfile.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statfile.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statfile.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statinter.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/statinter.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statinter.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statinter.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statinter.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/statinter.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statinter.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statinter.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statist.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/statist.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statist.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statist.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statlist.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/statlist.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statlist.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statlist.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statlist.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/statlist.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statlist.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statlist.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statprintf.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/statprintf.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statprintf.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statprintf.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statprintf.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/statprintf.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statprintf.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statprintf.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statread.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/statread.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statread.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statread.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/statread.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/statread.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/statread.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/statread.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/strall.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/strall.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/strall.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/strall.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/sysstat.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/sysstat.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/sysstat.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/sysstat.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/treeinter.cpp b/Sapfor/projects/dvm/tools/pppa/trunk/src/treeinter.cpp
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/treeinter.cpp
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/treeinter.cpp
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/treeinter.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/treeinter.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/treeinter.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/treeinter.h
diff --git a/Sapfor/_projects/dvm/tools/pppa/trunk/src/ver.h b/Sapfor/projects/dvm/tools/pppa/trunk/src/ver.h
similarity index 100%
rename from Sapfor/_projects/dvm/tools/pppa/trunk/src/ver.h
rename to Sapfor/projects/dvm/tools/pppa/trunk/src/ver.h
diff --git a/Sapfor/_projects/paths.default.txt b/Sapfor/projects/paths.default.txt
similarity index 100%
rename from Sapfor/_projects/paths.default.txt
rename to Sapfor/projects/paths.default.txt
diff --git a/Sapfor/_src/CFGraph/CFGraph.cpp b/Sapfor/src/CFGraph/CFGraph.cpp
similarity index 100%
rename from Sapfor/_src/CFGraph/CFGraph.cpp
rename to Sapfor/src/CFGraph/CFGraph.cpp
diff --git a/Sapfor/_src/CFGraph/CFGraph.h b/Sapfor/src/CFGraph/CFGraph.h
similarity index 100%
rename from Sapfor/_src/CFGraph/CFGraph.h
rename to Sapfor/src/CFGraph/CFGraph.h
diff --git a/Sapfor/_src/CFGraph/DataFlow/backward_data_flow.h b/Sapfor/src/CFGraph/DataFlow/backward_data_flow.h
similarity index 100%
rename from Sapfor/_src/CFGraph/DataFlow/backward_data_flow.h
rename to Sapfor/src/CFGraph/DataFlow/backward_data_flow.h
diff --git a/Sapfor/_src/CFGraph/DataFlow/backward_data_flow_impl.h b/Sapfor/src/CFGraph/DataFlow/backward_data_flow_impl.h
similarity index 100%
rename from Sapfor/_src/CFGraph/DataFlow/backward_data_flow_impl.h
rename to Sapfor/src/CFGraph/DataFlow/backward_data_flow_impl.h
diff --git a/Sapfor/_src/CFGraph/DataFlow/data_flow.h b/Sapfor/src/CFGraph/DataFlow/data_flow.h
similarity index 100%
rename from Sapfor/_src/CFGraph/DataFlow/data_flow.h
rename to Sapfor/src/CFGraph/DataFlow/data_flow.h
diff --git a/Sapfor/_src/CFGraph/DataFlow/data_flow_impl.h b/Sapfor/src/CFGraph/DataFlow/data_flow_impl.h
similarity index 100%
rename from Sapfor/_src/CFGraph/DataFlow/data_flow_impl.h
rename to Sapfor/src/CFGraph/DataFlow/data_flow_impl.h
diff --git a/Sapfor/_src/CFGraph/IR.cpp b/Sapfor/src/CFGraph/IR.cpp
similarity index 100%
rename from Sapfor/_src/CFGraph/IR.cpp
rename to Sapfor/src/CFGraph/IR.cpp
diff --git a/Sapfor/_src/CFGraph/IR.h b/Sapfor/src/CFGraph/IR.h
similarity index 100%
rename from Sapfor/_src/CFGraph/IR.h
rename to Sapfor/src/CFGraph/IR.h
diff --git a/Sapfor/_src/CFGraph/RD_subst.cpp b/Sapfor/src/CFGraph/RD_subst.cpp
similarity index 100%
rename from Sapfor/_src/CFGraph/RD_subst.cpp
rename to Sapfor/src/CFGraph/RD_subst.cpp
diff --git a/Sapfor/_src/CFGraph/RD_subst.h b/Sapfor/src/CFGraph/RD_subst.h
similarity index 100%
rename from Sapfor/_src/CFGraph/RD_subst.h
rename to Sapfor/src/CFGraph/RD_subst.h
diff --git a/Sapfor/_src/CFGraph/live_variable_analysis.cpp b/Sapfor/src/CFGraph/live_variable_analysis.cpp
similarity index 100%
rename from Sapfor/_src/CFGraph/live_variable_analysis.cpp
rename to Sapfor/src/CFGraph/live_variable_analysis.cpp
diff --git a/Sapfor/_src/CFGraph/live_variable_analysis.h b/Sapfor/src/CFGraph/live_variable_analysis.h
similarity index 100%
rename from Sapfor/_src/CFGraph/live_variable_analysis.h
rename to Sapfor/src/CFGraph/live_variable_analysis.h
diff --git a/Sapfor/_src/CFGraph/private_variables_analysis.cpp b/Sapfor/src/CFGraph/private_variables_analysis.cpp
similarity index 100%
rename from Sapfor/_src/CFGraph/private_variables_analysis.cpp
rename to Sapfor/src/CFGraph/private_variables_analysis.cpp
diff --git a/Sapfor/_src/CFGraph/private_variables_analysis.h b/Sapfor/src/CFGraph/private_variables_analysis.h
similarity index 100%
rename from Sapfor/_src/CFGraph/private_variables_analysis.h
rename to Sapfor/src/CFGraph/private_variables_analysis.h
diff --git a/Sapfor/_src/CreateInterTree/CreateInterTree.cpp b/Sapfor/src/CreateInterTree/CreateInterTree.cpp
similarity index 100%
rename from Sapfor/_src/CreateInterTree/CreateInterTree.cpp
rename to Sapfor/src/CreateInterTree/CreateInterTree.cpp
diff --git a/Sapfor/_src/CreateInterTree/CreateInterTree.h b/Sapfor/src/CreateInterTree/CreateInterTree.h
similarity index 100%
rename from Sapfor/_src/CreateInterTree/CreateInterTree.h
rename to Sapfor/src/CreateInterTree/CreateInterTree.h
diff --git a/Sapfor/_src/DirectiveProcessing/directive_analyzer.cpp b/Sapfor/src/DirectiveProcessing/directive_analyzer.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/directive_analyzer.cpp
rename to Sapfor/src/DirectiveProcessing/directive_analyzer.cpp
diff --git a/Sapfor/_src/DirectiveProcessing/directive_analyzer.h b/Sapfor/src/DirectiveProcessing/directive_analyzer.h
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/directive_analyzer.h
rename to Sapfor/src/DirectiveProcessing/directive_analyzer.h
diff --git a/Sapfor/_src/DirectiveProcessing/directive_creator.cpp b/Sapfor/src/DirectiveProcessing/directive_creator.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/directive_creator.cpp
rename to Sapfor/src/DirectiveProcessing/directive_creator.cpp
diff --git a/Sapfor/_src/DirectiveProcessing/directive_creator.h b/Sapfor/src/DirectiveProcessing/directive_creator.h
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/directive_creator.h
rename to Sapfor/src/DirectiveProcessing/directive_creator.h
diff --git a/Sapfor/_src/DirectiveProcessing/directive_creator_base.cpp b/Sapfor/src/DirectiveProcessing/directive_creator_base.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/directive_creator_base.cpp
rename to Sapfor/src/DirectiveProcessing/directive_creator_base.cpp
diff --git a/Sapfor/_src/DirectiveProcessing/directive_omp_parser.cpp b/Sapfor/src/DirectiveProcessing/directive_omp_parser.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/directive_omp_parser.cpp
rename to Sapfor/src/DirectiveProcessing/directive_omp_parser.cpp
diff --git a/Sapfor/_src/DirectiveProcessing/directive_omp_parser.h b/Sapfor/src/DirectiveProcessing/directive_omp_parser.h
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/directive_omp_parser.h
rename to Sapfor/src/DirectiveProcessing/directive_omp_parser.h
diff --git a/Sapfor/_src/DirectiveProcessing/directive_parser.cpp b/Sapfor/src/DirectiveProcessing/directive_parser.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/directive_parser.cpp
rename to Sapfor/src/DirectiveProcessing/directive_parser.cpp
diff --git a/Sapfor/_src/DirectiveProcessing/directive_parser.h b/Sapfor/src/DirectiveProcessing/directive_parser.h
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/directive_parser.h
rename to Sapfor/src/DirectiveProcessing/directive_parser.h
diff --git a/Sapfor/_src/DirectiveProcessing/insert_directive.cpp b/Sapfor/src/DirectiveProcessing/insert_directive.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/insert_directive.cpp
rename to Sapfor/src/DirectiveProcessing/insert_directive.cpp
diff --git a/Sapfor/_src/DirectiveProcessing/insert_directive.h b/Sapfor/src/DirectiveProcessing/insert_directive.h
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/insert_directive.h
rename to Sapfor/src/DirectiveProcessing/insert_directive.h
diff --git a/Sapfor/_src/DirectiveProcessing/remote_access.cpp b/Sapfor/src/DirectiveProcessing/remote_access.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/remote_access.cpp
rename to Sapfor/src/DirectiveProcessing/remote_access.cpp
diff --git a/Sapfor/_src/DirectiveProcessing/remote_access.h b/Sapfor/src/DirectiveProcessing/remote_access.h
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/remote_access.h
rename to Sapfor/src/DirectiveProcessing/remote_access.h
diff --git a/Sapfor/_src/DirectiveProcessing/remote_access_base.cpp b/Sapfor/src/DirectiveProcessing/remote_access_base.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/remote_access_base.cpp
rename to Sapfor/src/DirectiveProcessing/remote_access_base.cpp
diff --git a/Sapfor/_src/DirectiveProcessing/shadow.cpp b/Sapfor/src/DirectiveProcessing/shadow.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/shadow.cpp
rename to Sapfor/src/DirectiveProcessing/shadow.cpp
diff --git a/Sapfor/_src/DirectiveProcessing/shadow.h b/Sapfor/src/DirectiveProcessing/shadow.h
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/shadow.h
rename to Sapfor/src/DirectiveProcessing/shadow.h
diff --git a/Sapfor/_src/DirectiveProcessing/spf_directive_preproc.cpp b/Sapfor/src/DirectiveProcessing/spf_directive_preproc.cpp
similarity index 100%
rename from Sapfor/_src/DirectiveProcessing/spf_directive_preproc.cpp
rename to Sapfor/src/DirectiveProcessing/spf_directive_preproc.cpp
diff --git a/Sapfor/_src/Distribution/Array.cpp b/Sapfor/src/Distribution/Array.cpp
similarity index 100%
rename from Sapfor/_src/Distribution/Array.cpp
rename to Sapfor/src/Distribution/Array.cpp
diff --git a/Sapfor/_src/Distribution/Array.h b/Sapfor/src/Distribution/Array.h
similarity index 100%
rename from Sapfor/_src/Distribution/Array.h
rename to Sapfor/src/Distribution/Array.h
diff --git a/Sapfor/_src/Distribution/ArrayAnalysis.cpp b/Sapfor/src/Distribution/ArrayAnalysis.cpp
similarity index 100%
rename from Sapfor/_src/Distribution/ArrayAnalysis.cpp
rename to Sapfor/src/Distribution/ArrayAnalysis.cpp
diff --git a/Sapfor/_src/Distribution/Arrays.h b/Sapfor/src/Distribution/Arrays.h
similarity index 100%
rename from Sapfor/_src/Distribution/Arrays.h
rename to Sapfor/src/Distribution/Arrays.h
diff --git a/Sapfor/_src/Distribution/CreateDistributionDirs.cpp b/Sapfor/src/Distribution/CreateDistributionDirs.cpp
similarity index 100%
rename from Sapfor/_src/Distribution/CreateDistributionDirs.cpp
rename to Sapfor/src/Distribution/CreateDistributionDirs.cpp
diff --git a/Sapfor/_src/Distribution/CreateDistributionDirs.h b/Sapfor/src/Distribution/CreateDistributionDirs.h
similarity index 100%
rename from Sapfor/_src/Distribution/CreateDistributionDirs.h
rename to Sapfor/src/Distribution/CreateDistributionDirs.h
diff --git a/Sapfor/_src/Distribution/Cycle.cpp b/Sapfor/src/Distribution/Cycle.cpp
similarity index 100%
rename from Sapfor/_src/Distribution/Cycle.cpp
rename to Sapfor/src/Distribution/Cycle.cpp
diff --git a/Sapfor/_src/Distribution/Cycle.h b/Sapfor/src/Distribution/Cycle.h
similarity index 100%
rename from Sapfor/_src/Distribution/Cycle.h
rename to Sapfor/src/Distribution/Cycle.h
diff --git a/Sapfor/_src/Distribution/Distribution.cpp b/Sapfor/src/Distribution/Distribution.cpp
similarity index 100%
rename from Sapfor/_src/Distribution/Distribution.cpp
rename to Sapfor/src/Distribution/Distribution.cpp
diff --git a/Sapfor/_src/Distribution/Distribution.h b/Sapfor/src/Distribution/Distribution.h
similarity index 100%
rename from Sapfor/_src/Distribution/Distribution.h
rename to Sapfor/src/Distribution/Distribution.h
diff --git a/Sapfor/_src/Distribution/DvmhDirective.cpp b/Sapfor/src/Distribution/DvmhDirective.cpp
similarity index 100%
rename from Sapfor/_src/Distribution/DvmhDirective.cpp
rename to Sapfor/src/Distribution/DvmhDirective.cpp
diff --git a/Sapfor/_src/Distribution/DvmhDirective.h b/Sapfor/src/Distribution/DvmhDirective.h
similarity index 100%
rename from Sapfor/_src/Distribution/DvmhDirective.h
rename to Sapfor/src/Distribution/DvmhDirective.h
diff --git a/Sapfor/_src/Distribution/DvmhDirectiveBase.cpp b/Sapfor/src/Distribution/DvmhDirectiveBase.cpp
similarity index 100%
rename from Sapfor/_src/Distribution/DvmhDirectiveBase.cpp
rename to Sapfor/src/Distribution/DvmhDirectiveBase.cpp
diff --git a/Sapfor/_src/Distribution/DvmhDirectiveBase.h b/Sapfor/src/Distribution/DvmhDirectiveBase.h
similarity index 100%
rename from Sapfor/_src/Distribution/DvmhDirectiveBase.h
rename to Sapfor/src/Distribution/DvmhDirectiveBase.h
diff --git a/Sapfor/_src/Distribution/DvmhDirective_func.h b/Sapfor/src/Distribution/DvmhDirective_func.h
similarity index 100%
rename from Sapfor/_src/Distribution/DvmhDirective_func.h
rename to Sapfor/src/Distribution/DvmhDirective_func.h
diff --git a/Sapfor/_src/Distribution/GraphCSR.cpp b/Sapfor/src/Distribution/GraphCSR.cpp
similarity index 100%
rename from Sapfor/_src/Distribution/GraphCSR.cpp
rename to Sapfor/src/Distribution/GraphCSR.cpp
diff --git a/Sapfor/_src/Distribution/GraphCSR.h b/Sapfor/src/Distribution/GraphCSR.h
similarity index 100%
rename from Sapfor/_src/Distribution/GraphCSR.h
rename to Sapfor/src/Distribution/GraphCSR.h
diff --git a/Sapfor/_src/DvmhRegions/DvmhRegion.cpp b/Sapfor/src/DvmhRegions/DvmhRegion.cpp
similarity index 100%
rename from Sapfor/_src/DvmhRegions/DvmhRegion.cpp
rename to Sapfor/src/DvmhRegions/DvmhRegion.cpp
diff --git a/Sapfor/_src/DvmhRegions/DvmhRegion.h b/Sapfor/src/DvmhRegions/DvmhRegion.h
similarity index 100%
rename from Sapfor/_src/DvmhRegions/DvmhRegion.h
rename to Sapfor/src/DvmhRegions/DvmhRegion.h
diff --git a/Sapfor/_src/DvmhRegions/DvmhRegionInserter.cpp b/Sapfor/src/DvmhRegions/DvmhRegionInserter.cpp
similarity index 100%
rename from Sapfor/_src/DvmhRegions/DvmhRegionInserter.cpp
rename to Sapfor/src/DvmhRegions/DvmhRegionInserter.cpp
diff --git a/Sapfor/_src/DvmhRegions/DvmhRegionInserter.h b/Sapfor/src/DvmhRegions/DvmhRegionInserter.h
similarity index 100%
rename from Sapfor/_src/DvmhRegions/DvmhRegionInserter.h
rename to Sapfor/src/DvmhRegions/DvmhRegionInserter.h
diff --git a/Sapfor/_src/DvmhRegions/LoopChecker.cpp b/Sapfor/src/DvmhRegions/LoopChecker.cpp
similarity index 100%
rename from Sapfor/_src/DvmhRegions/LoopChecker.cpp
rename to Sapfor/src/DvmhRegions/LoopChecker.cpp
diff --git a/Sapfor/_src/DvmhRegions/LoopChecker.h b/Sapfor/src/DvmhRegions/LoopChecker.h
similarity index 100%
rename from Sapfor/_src/DvmhRegions/LoopChecker.h
rename to Sapfor/src/DvmhRegions/LoopChecker.h
diff --git a/Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.cpp b/Sapfor/src/DvmhRegions/ReadWriteAnalyzer.cpp
similarity index 100%
rename from Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.cpp
rename to Sapfor/src/DvmhRegions/ReadWriteAnalyzer.cpp
diff --git a/Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.h b/Sapfor/src/DvmhRegions/ReadWriteAnalyzer.h
similarity index 100%
rename from Sapfor/_src/DvmhRegions/ReadWriteAnalyzer.h
rename to Sapfor/src/DvmhRegions/ReadWriteAnalyzer.h
diff --git a/Sapfor/_src/DvmhRegions/RegionsMerger.cpp b/Sapfor/src/DvmhRegions/RegionsMerger.cpp
similarity index 100%
rename from Sapfor/_src/DvmhRegions/RegionsMerger.cpp
rename to Sapfor/src/DvmhRegions/RegionsMerger.cpp
diff --git a/Sapfor/_src/DvmhRegions/RegionsMerger.h b/Sapfor/src/DvmhRegions/RegionsMerger.h
similarity index 100%
rename from Sapfor/_src/DvmhRegions/RegionsMerger.h
rename to Sapfor/src/DvmhRegions/RegionsMerger.h
diff --git a/Sapfor/_src/DvmhRegions/TypedSymbol.cpp b/Sapfor/src/DvmhRegions/TypedSymbol.cpp
similarity index 100%
rename from Sapfor/_src/DvmhRegions/TypedSymbol.cpp
rename to Sapfor/src/DvmhRegions/TypedSymbol.cpp
diff --git a/Sapfor/_src/DvmhRegions/TypedSymbol.h b/Sapfor/src/DvmhRegions/TypedSymbol.h
similarity index 100%
rename from Sapfor/_src/DvmhRegions/TypedSymbol.h
rename to Sapfor/src/DvmhRegions/TypedSymbol.h
diff --git a/Sapfor/_src/DvmhRegions/VarUsages.cpp b/Sapfor/src/DvmhRegions/VarUsages.cpp
similarity index 100%
rename from Sapfor/_src/DvmhRegions/VarUsages.cpp
rename to Sapfor/src/DvmhRegions/VarUsages.cpp
diff --git a/Sapfor/_src/DvmhRegions/VarUsages.h b/Sapfor/src/DvmhRegions/VarUsages.h
similarity index 100%
rename from Sapfor/_src/DvmhRegions/VarUsages.h
rename to Sapfor/src/DvmhRegions/VarUsages.h
diff --git a/Sapfor/_src/DynamicAnalysis/createParallelRegions.cpp b/Sapfor/src/DynamicAnalysis/createParallelRegions.cpp
similarity index 100%
rename from Sapfor/_src/DynamicAnalysis/createParallelRegions.cpp
rename to Sapfor/src/DynamicAnalysis/createParallelRegions.cpp
diff --git a/Sapfor/_src/DynamicAnalysis/createParallelRegions.h b/Sapfor/src/DynamicAnalysis/createParallelRegions.h
similarity index 100%
rename from Sapfor/_src/DynamicAnalysis/createParallelRegions.h
rename to Sapfor/src/DynamicAnalysis/createParallelRegions.h
diff --git a/Sapfor/_src/DynamicAnalysis/gCov_parser.cpp b/Sapfor/src/DynamicAnalysis/gCov_parser.cpp
similarity index 100%
rename from Sapfor/_src/DynamicAnalysis/gCov_parser.cpp
rename to Sapfor/src/DynamicAnalysis/gCov_parser.cpp
diff --git a/Sapfor/_src/DynamicAnalysis/gCov_parser_func.h b/Sapfor/src/DynamicAnalysis/gCov_parser_func.h
similarity index 100%
rename from Sapfor/_src/DynamicAnalysis/gCov_parser_func.h
rename to Sapfor/src/DynamicAnalysis/gCov_parser_func.h
diff --git a/Sapfor/_src/DynamicAnalysis/gcov_info.cpp b/Sapfor/src/DynamicAnalysis/gcov_info.cpp
similarity index 100%
rename from Sapfor/_src/DynamicAnalysis/gcov_info.cpp
rename to Sapfor/src/DynamicAnalysis/gcov_info.cpp
diff --git a/Sapfor/_src/DynamicAnalysis/gcov_info.h b/Sapfor/src/DynamicAnalysis/gcov_info.h
similarity index 100%
rename from Sapfor/_src/DynamicAnalysis/gcov_info.h
rename to Sapfor/src/DynamicAnalysis/gcov_info.h
diff --git a/Sapfor/_src/ExpressionTransform/control_flow_graph_part.cpp b/Sapfor/src/ExpressionTransform/control_flow_graph_part.cpp
similarity index 100%
rename from Sapfor/_src/ExpressionTransform/control_flow_graph_part.cpp
rename to Sapfor/src/ExpressionTransform/control_flow_graph_part.cpp
diff --git a/Sapfor/_src/ExpressionTransform/expr_transform.cpp b/Sapfor/src/ExpressionTransform/expr_transform.cpp
similarity index 100%
rename from Sapfor/_src/ExpressionTransform/expr_transform.cpp
rename to Sapfor/src/ExpressionTransform/expr_transform.cpp
diff --git a/Sapfor/_src/ExpressionTransform/expr_transform.h b/Sapfor/src/ExpressionTransform/expr_transform.h
similarity index 100%
rename from Sapfor/_src/ExpressionTransform/expr_transform.h
rename to Sapfor/src/ExpressionTransform/expr_transform.h
diff --git a/Sapfor/_src/GraphCall/graph_calls.cpp b/Sapfor/src/GraphCall/graph_calls.cpp
similarity index 100%
rename from Sapfor/_src/GraphCall/graph_calls.cpp
rename to Sapfor/src/GraphCall/graph_calls.cpp
diff --git a/Sapfor/_src/GraphCall/graph_calls.h b/Sapfor/src/GraphCall/graph_calls.h
similarity index 100%
rename from Sapfor/_src/GraphCall/graph_calls.h
rename to Sapfor/src/GraphCall/graph_calls.h
diff --git a/Sapfor/_src/GraphCall/graph_calls_base.cpp b/Sapfor/src/GraphCall/graph_calls_base.cpp
similarity index 100%
rename from Sapfor/_src/GraphCall/graph_calls_base.cpp
rename to Sapfor/src/GraphCall/graph_calls_base.cpp
diff --git a/Sapfor/_src/GraphCall/graph_calls_func.h b/Sapfor/src/GraphCall/graph_calls_func.h
similarity index 100%
rename from Sapfor/_src/GraphCall/graph_calls_func.h
rename to Sapfor/src/GraphCall/graph_calls_func.h
diff --git a/Sapfor/_src/GraphLoop/graph_loops.cpp b/Sapfor/src/GraphLoop/graph_loops.cpp
similarity index 100%
rename from Sapfor/_src/GraphLoop/graph_loops.cpp
rename to Sapfor/src/GraphLoop/graph_loops.cpp
diff --git a/Sapfor/_src/GraphLoop/graph_loops.h b/Sapfor/src/GraphLoop/graph_loops.h
similarity index 100%
rename from Sapfor/_src/GraphLoop/graph_loops.h
rename to Sapfor/src/GraphLoop/graph_loops.h
diff --git a/Sapfor/_src/GraphLoop/graph_loops_base.cpp b/Sapfor/src/GraphLoop/graph_loops_base.cpp
similarity index 100%
rename from Sapfor/_src/GraphLoop/graph_loops_base.cpp
rename to Sapfor/src/GraphLoop/graph_loops_base.cpp
diff --git a/Sapfor/_src/GraphLoop/graph_loops_func.h b/Sapfor/src/GraphLoop/graph_loops_func.h
similarity index 100%
rename from Sapfor/_src/GraphLoop/graph_loops_func.h
rename to Sapfor/src/GraphLoop/graph_loops_func.h
diff --git a/Sapfor/_src/Inliner/inliner.cpp b/Sapfor/src/Inliner/inliner.cpp
similarity index 100%
rename from Sapfor/_src/Inliner/inliner.cpp
rename to Sapfor/src/Inliner/inliner.cpp
diff --git a/Sapfor/_src/Inliner/inliner.h b/Sapfor/src/Inliner/inliner.h
similarity index 100%
rename from Sapfor/_src/Inliner/inliner.h
rename to Sapfor/src/Inliner/inliner.h
diff --git a/Sapfor/_src/LoopAnalyzer/allocations_prepoc.cpp b/Sapfor/src/LoopAnalyzer/allocations_prepoc.cpp
similarity index 100%
rename from Sapfor/_src/LoopAnalyzer/allocations_prepoc.cpp
rename to Sapfor/src/LoopAnalyzer/allocations_prepoc.cpp
diff --git a/Sapfor/_src/LoopAnalyzer/dep_analyzer.cpp b/Sapfor/src/LoopAnalyzer/dep_analyzer.cpp
similarity index 100%
rename from Sapfor/_src/LoopAnalyzer/dep_analyzer.cpp
rename to Sapfor/src/LoopAnalyzer/dep_analyzer.cpp
diff --git a/Sapfor/_src/LoopAnalyzer/loop_analyzer.cpp b/Sapfor/src/LoopAnalyzer/loop_analyzer.cpp
similarity index 100%
rename from Sapfor/_src/LoopAnalyzer/loop_analyzer.cpp
rename to Sapfor/src/LoopAnalyzer/loop_analyzer.cpp
diff --git a/Sapfor/_src/LoopAnalyzer/loop_analyzer.h b/Sapfor/src/LoopAnalyzer/loop_analyzer.h
similarity index 100%
rename from Sapfor/_src/LoopAnalyzer/loop_analyzer.h
rename to Sapfor/src/LoopAnalyzer/loop_analyzer.h
diff --git a/Sapfor/_src/ParallelizationRegions/ParRegions.cpp b/Sapfor/src/ParallelizationRegions/ParRegions.cpp
similarity index 100%
rename from Sapfor/_src/ParallelizationRegions/ParRegions.cpp
rename to Sapfor/src/ParallelizationRegions/ParRegions.cpp
diff --git a/Sapfor/_src/ParallelizationRegions/ParRegions.h b/Sapfor/src/ParallelizationRegions/ParRegions.h
similarity index 100%
rename from Sapfor/_src/ParallelizationRegions/ParRegions.h
rename to Sapfor/src/ParallelizationRegions/ParRegions.h
diff --git a/Sapfor/_src/ParallelizationRegions/ParRegions_func.h b/Sapfor/src/ParallelizationRegions/ParRegions_func.h
similarity index 100%
rename from Sapfor/_src/ParallelizationRegions/ParRegions_func.h
rename to Sapfor/src/ParallelizationRegions/ParRegions_func.h
diff --git a/Sapfor/_src/ParallelizationRegions/expand_extract_reg.cpp b/Sapfor/src/ParallelizationRegions/expand_extract_reg.cpp
similarity index 100%
rename from Sapfor/_src/ParallelizationRegions/expand_extract_reg.cpp
rename to Sapfor/src/ParallelizationRegions/expand_extract_reg.cpp
diff --git a/Sapfor/_src/ParallelizationRegions/expand_extract_reg.h b/Sapfor/src/ParallelizationRegions/expand_extract_reg.h
similarity index 100%
rename from Sapfor/_src/ParallelizationRegions/expand_extract_reg.h
rename to Sapfor/src/ParallelizationRegions/expand_extract_reg.h
diff --git a/Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp b/Sapfor/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
similarity index 100%
rename from Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
rename to Sapfor/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
diff --git a/Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.h b/Sapfor/src/ParallelizationRegions/resolve_par_reg_conflicts.h
similarity index 100%
rename from Sapfor/_src/ParallelizationRegions/resolve_par_reg_conflicts.h
rename to Sapfor/src/ParallelizationRegions/resolve_par_reg_conflicts.h
diff --git a/Sapfor/_src/Predictor/Lib/AMView.cpp b/Sapfor/src/Predictor/Lib/AMView.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/AMView.cpp
rename to Sapfor/src/Predictor/Lib/AMView.cpp
diff --git a/Sapfor/_src/Predictor/Lib/AMView.h b/Sapfor/src/Predictor/Lib/AMView.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/AMView.h
rename to Sapfor/src/Predictor/Lib/AMView.h
diff --git a/Sapfor/_src/Predictor/Lib/AlignAxis.cpp b/Sapfor/src/Predictor/Lib/AlignAxis.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/AlignAxis.cpp
rename to Sapfor/src/Predictor/Lib/AlignAxis.cpp
diff --git a/Sapfor/_src/Predictor/Lib/AlignAxis.h b/Sapfor/src/Predictor/Lib/AlignAxis.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/AlignAxis.h
rename to Sapfor/src/Predictor/Lib/AlignAxis.h
diff --git a/Sapfor/_src/Predictor/Lib/BGroup.cpp b/Sapfor/src/Predictor/Lib/BGroup.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/BGroup.cpp
rename to Sapfor/src/Predictor/Lib/BGroup.cpp
diff --git a/Sapfor/_src/Predictor/Lib/BGroup.h b/Sapfor/src/Predictor/Lib/BGroup.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/BGroup.h
rename to Sapfor/src/Predictor/Lib/BGroup.h
diff --git a/Sapfor/_src/Predictor/Lib/Block.cpp b/Sapfor/src/Predictor/Lib/Block.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Block.cpp
rename to Sapfor/src/Predictor/Lib/Block.cpp
diff --git a/Sapfor/_src/Predictor/Lib/Block.h b/Sapfor/src/Predictor/Lib/Block.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Block.h
rename to Sapfor/src/Predictor/Lib/Block.h
diff --git a/Sapfor/_src/Predictor/Lib/CallInfoStructs.h b/Sapfor/src/Predictor/Lib/CallInfoStructs.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/CallInfoStructs.h
rename to Sapfor/src/Predictor/Lib/CallInfoStructs.h
diff --git a/Sapfor/_src/Predictor/Lib/CallParams.cpp b/Sapfor/src/Predictor/Lib/CallParams.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/CallParams.cpp
rename to Sapfor/src/Predictor/Lib/CallParams.cpp
diff --git a/Sapfor/_src/Predictor/Lib/CommCost.cpp b/Sapfor/src/Predictor/Lib/CommCost.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/CommCost.cpp
rename to Sapfor/src/Predictor/Lib/CommCost.cpp
diff --git a/Sapfor/_src/Predictor/Lib/CommCost.h b/Sapfor/src/Predictor/Lib/CommCost.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/CommCost.h
rename to Sapfor/src/Predictor/Lib/CommCost.h
diff --git a/Sapfor/_src/Predictor/Lib/DArray.cpp b/Sapfor/src/Predictor/Lib/DArray.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/DArray.cpp
rename to Sapfor/src/Predictor/Lib/DArray.cpp
diff --git a/Sapfor/_src/Predictor/Lib/DArray.h b/Sapfor/src/Predictor/Lib/DArray.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/DArray.h
rename to Sapfor/src/Predictor/Lib/DArray.h
diff --git a/Sapfor/_src/Predictor/Lib/DimBound.cpp b/Sapfor/src/Predictor/Lib/DimBound.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/DimBound.cpp
rename to Sapfor/src/Predictor/Lib/DimBound.cpp
diff --git a/Sapfor/_src/Predictor/Lib/DimBound.h b/Sapfor/src/Predictor/Lib/DimBound.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/DimBound.h
rename to Sapfor/src/Predictor/Lib/DimBound.h
diff --git a/Sapfor/_src/Predictor/Lib/DistAxis.cpp b/Sapfor/src/Predictor/Lib/DistAxis.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/DistAxis.cpp
rename to Sapfor/src/Predictor/Lib/DistAxis.cpp
diff --git a/Sapfor/_src/Predictor/Lib/DistAxis.h b/Sapfor/src/Predictor/Lib/DistAxis.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/DistAxis.h
rename to Sapfor/src/Predictor/Lib/DistAxis.h
diff --git a/Sapfor/_src/Predictor/Lib/Event.cpp b/Sapfor/src/Predictor/Lib/Event.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Event.cpp
rename to Sapfor/src/Predictor/Lib/Event.cpp
diff --git a/Sapfor/_src/Predictor/Lib/Event.h b/Sapfor/src/Predictor/Lib/Event.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Event.h
rename to Sapfor/src/Predictor/Lib/Event.h
diff --git a/Sapfor/_src/Predictor/Lib/FuncCall.cpp b/Sapfor/src/Predictor/Lib/FuncCall.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/FuncCall.cpp
rename to Sapfor/src/Predictor/Lib/FuncCall.cpp
diff --git a/Sapfor/_src/Predictor/Lib/FuncCall.h b/Sapfor/src/Predictor/Lib/FuncCall.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/FuncCall.h
rename to Sapfor/src/Predictor/Lib/FuncCall.h
diff --git a/Sapfor/_src/Predictor/Lib/Interval.cpp b/Sapfor/src/Predictor/Lib/Interval.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Interval.cpp
rename to Sapfor/src/Predictor/Lib/Interval.cpp
diff --git a/Sapfor/_src/Predictor/Lib/Interval.h b/Sapfor/src/Predictor/Lib/Interval.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Interval.h
rename to Sapfor/src/Predictor/Lib/Interval.h
diff --git a/Sapfor/_src/Predictor/Lib/IntervalTemplate.cpp b/Sapfor/src/Predictor/Lib/IntervalTemplate.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/IntervalTemplate.cpp
rename to Sapfor/src/Predictor/Lib/IntervalTemplate.cpp
diff --git a/Sapfor/_src/Predictor/Lib/LoopBlock.cpp b/Sapfor/src/Predictor/Lib/LoopBlock.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/LoopBlock.cpp
rename to Sapfor/src/Predictor/Lib/LoopBlock.cpp
diff --git a/Sapfor/_src/Predictor/Lib/LoopBlock.h b/Sapfor/src/Predictor/Lib/LoopBlock.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/LoopBlock.h
rename to Sapfor/src/Predictor/Lib/LoopBlock.h
diff --git a/Sapfor/_src/Predictor/Lib/LoopLS.cpp b/Sapfor/src/Predictor/Lib/LoopLS.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/LoopLS.cpp
rename to Sapfor/src/Predictor/Lib/LoopLS.cpp
diff --git a/Sapfor/_src/Predictor/Lib/LoopLS.h b/Sapfor/src/Predictor/Lib/LoopLS.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/LoopLS.h
rename to Sapfor/src/Predictor/Lib/LoopLS.h
diff --git a/Sapfor/_src/Predictor/Lib/Ls.cpp b/Sapfor/src/Predictor/Lib/Ls.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Ls.cpp
rename to Sapfor/src/Predictor/Lib/Ls.cpp
diff --git a/Sapfor/_src/Predictor/Lib/Ls.h b/Sapfor/src/Predictor/Lib/Ls.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Ls.h
rename to Sapfor/src/Predictor/Lib/Ls.h
diff --git a/Sapfor/_src/Predictor/Lib/ModelDArray.cpp b/Sapfor/src/Predictor/Lib/ModelDArray.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelDArray.cpp
rename to Sapfor/src/Predictor/Lib/ModelDArray.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ModelIO.cpp b/Sapfor/src/Predictor/Lib/ModelIO.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelIO.cpp
rename to Sapfor/src/Predictor/Lib/ModelIO.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ModelInterval.cpp b/Sapfor/src/Predictor/Lib/ModelInterval.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelInterval.cpp
rename to Sapfor/src/Predictor/Lib/ModelInterval.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ModelMPS_AM.cpp b/Sapfor/src/Predictor/Lib/ModelMPS_AM.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelMPS_AM.cpp
rename to Sapfor/src/Predictor/Lib/ModelMPS_AM.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ModelParLoop.cpp b/Sapfor/src/Predictor/Lib/ModelParLoop.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelParLoop.cpp
rename to Sapfor/src/Predictor/Lib/ModelParLoop.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ModelReduct.cpp b/Sapfor/src/Predictor/Lib/ModelReduct.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelReduct.cpp
rename to Sapfor/src/Predictor/Lib/ModelReduct.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ModelRegular.cpp b/Sapfor/src/Predictor/Lib/ModelRegular.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelRegular.cpp
rename to Sapfor/src/Predictor/Lib/ModelRegular.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ModelRemAccess.cpp b/Sapfor/src/Predictor/Lib/ModelRemAccess.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelRemAccess.cpp
rename to Sapfor/src/Predictor/Lib/ModelRemAccess.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ModelShadow.cpp b/Sapfor/src/Predictor/Lib/ModelShadow.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelShadow.cpp
rename to Sapfor/src/Predictor/Lib/ModelShadow.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ModelStructs.h b/Sapfor/src/Predictor/Lib/ModelStructs.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ModelStructs.h
rename to Sapfor/src/Predictor/Lib/ModelStructs.h
diff --git a/Sapfor/_src/Predictor/Lib/ParLoop.cpp b/Sapfor/src/Predictor/Lib/ParLoop.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ParLoop.cpp
rename to Sapfor/src/Predictor/Lib/ParLoop.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ParLoop.h b/Sapfor/src/Predictor/Lib/ParLoop.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ParLoop.h
rename to Sapfor/src/Predictor/Lib/ParLoop.h
diff --git a/Sapfor/_src/Predictor/Lib/ParseString.cpp b/Sapfor/src/Predictor/Lib/ParseString.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ParseString.cpp
rename to Sapfor/src/Predictor/Lib/ParseString.cpp
diff --git a/Sapfor/_src/Predictor/Lib/ParseString.h b/Sapfor/src/Predictor/Lib/ParseString.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/ParseString.h
rename to Sapfor/src/Predictor/Lib/ParseString.h
diff --git a/Sapfor/_src/Predictor/Lib/Processor.cpp b/Sapfor/src/Predictor/Lib/Processor.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Processor.cpp
rename to Sapfor/src/Predictor/Lib/Processor.cpp
diff --git a/Sapfor/_src/Predictor/Lib/Processor.h b/Sapfor/src/Predictor/Lib/Processor.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Processor.h
rename to Sapfor/src/Predictor/Lib/Processor.h
diff --git a/Sapfor/_src/Predictor/Lib/Ps.cpp b/Sapfor/src/Predictor/Lib/Ps.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Ps.cpp
rename to Sapfor/src/Predictor/Lib/Ps.cpp
diff --git a/Sapfor/_src/Predictor/Lib/Ps.h b/Sapfor/src/Predictor/Lib/Ps.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Ps.h
rename to Sapfor/src/Predictor/Lib/Ps.h
diff --git a/Sapfor/_src/Predictor/Lib/RedGroup.cpp b/Sapfor/src/Predictor/Lib/RedGroup.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/RedGroup.cpp
rename to Sapfor/src/Predictor/Lib/RedGroup.cpp
diff --git a/Sapfor/_src/Predictor/Lib/RedGroup.h b/Sapfor/src/Predictor/Lib/RedGroup.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/RedGroup.h
rename to Sapfor/src/Predictor/Lib/RedGroup.h
diff --git a/Sapfor/_src/Predictor/Lib/RedVar.cpp b/Sapfor/src/Predictor/Lib/RedVar.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/RedVar.cpp
rename to Sapfor/src/Predictor/Lib/RedVar.cpp
diff --git a/Sapfor/_src/Predictor/Lib/RedVar.h b/Sapfor/src/Predictor/Lib/RedVar.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/RedVar.h
rename to Sapfor/src/Predictor/Lib/RedVar.h
diff --git a/Sapfor/_src/Predictor/Lib/RemAccessBuf.cpp b/Sapfor/src/Predictor/Lib/RemAccessBuf.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/RemAccessBuf.cpp
rename to Sapfor/src/Predictor/Lib/RemAccessBuf.cpp
diff --git a/Sapfor/_src/Predictor/Lib/RemAccessBuf.h b/Sapfor/src/Predictor/Lib/RemAccessBuf.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/RemAccessBuf.h
rename to Sapfor/src/Predictor/Lib/RemAccessBuf.h
diff --git a/Sapfor/_src/Predictor/Lib/Space.cpp b/Sapfor/src/Predictor/Lib/Space.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Space.cpp
rename to Sapfor/src/Predictor/Lib/Space.cpp
diff --git a/Sapfor/_src/Predictor/Lib/Space.h b/Sapfor/src/Predictor/Lib/Space.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Space.h
rename to Sapfor/src/Predictor/Lib/Space.h
diff --git a/Sapfor/_src/Predictor/Lib/StdAfx.h b/Sapfor/src/Predictor/Lib/StdAfx.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/StdAfx.h
rename to Sapfor/src/Predictor/Lib/StdAfx.h
diff --git a/Sapfor/_src/Predictor/Lib/TraceLine.cpp b/Sapfor/src/Predictor/Lib/TraceLine.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/TraceLine.cpp
rename to Sapfor/src/Predictor/Lib/TraceLine.cpp
diff --git a/Sapfor/_src/Predictor/Lib/TraceLine.h b/Sapfor/src/Predictor/Lib/TraceLine.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/TraceLine.h
rename to Sapfor/src/Predictor/Lib/TraceLine.h
diff --git a/Sapfor/_src/Predictor/Lib/Ver.h b/Sapfor/src/Predictor/Lib/Ver.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Ver.h
rename to Sapfor/src/Predictor/Lib/Ver.h
diff --git a/Sapfor/_src/Predictor/Lib/Vm.cpp b/Sapfor/src/Predictor/Lib/Vm.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Vm.cpp
rename to Sapfor/src/Predictor/Lib/Vm.cpp
diff --git a/Sapfor/_src/Predictor/Lib/Vm.h b/Sapfor/src/Predictor/Lib/Vm.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/Vm.h
rename to Sapfor/src/Predictor/Lib/Vm.h
diff --git a/Sapfor/_src/Predictor/Lib/adler32.c b/Sapfor/src/Predictor/Lib/adler32.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/adler32.c
rename to Sapfor/src/Predictor/Lib/adler32.c
diff --git a/Sapfor/_src/Predictor/Lib/compress.c b/Sapfor/src/Predictor/Lib/compress.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/compress.c
rename to Sapfor/src/Predictor/Lib/compress.c
diff --git a/Sapfor/_src/Predictor/Lib/crc32.c b/Sapfor/src/Predictor/Lib/crc32.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/crc32.c
rename to Sapfor/src/Predictor/Lib/crc32.c
diff --git a/Sapfor/_src/Predictor/Lib/deflate.c b/Sapfor/src/Predictor/Lib/deflate.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/deflate.c
rename to Sapfor/src/Predictor/Lib/deflate.c
diff --git a/Sapfor/_src/Predictor/Lib/deflate.h b/Sapfor/src/Predictor/Lib/deflate.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/deflate.h
rename to Sapfor/src/Predictor/Lib/deflate.h
diff --git a/Sapfor/_src/Predictor/Lib/gzio.c b/Sapfor/src/Predictor/Lib/gzio.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/gzio.c
rename to Sapfor/src/Predictor/Lib/gzio.c
diff --git a/Sapfor/_src/Predictor/Lib/infblock.c b/Sapfor/src/Predictor/Lib/infblock.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/infblock.c
rename to Sapfor/src/Predictor/Lib/infblock.c
diff --git a/Sapfor/_src/Predictor/Lib/infblock.h b/Sapfor/src/Predictor/Lib/infblock.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/infblock.h
rename to Sapfor/src/Predictor/Lib/infblock.h
diff --git a/Sapfor/_src/Predictor/Lib/infcodes.c b/Sapfor/src/Predictor/Lib/infcodes.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/infcodes.c
rename to Sapfor/src/Predictor/Lib/infcodes.c
diff --git a/Sapfor/_src/Predictor/Lib/infcodes.h b/Sapfor/src/Predictor/Lib/infcodes.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/infcodes.h
rename to Sapfor/src/Predictor/Lib/infcodes.h
diff --git a/Sapfor/_src/Predictor/Lib/inffast.c b/Sapfor/src/Predictor/Lib/inffast.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/inffast.c
rename to Sapfor/src/Predictor/Lib/inffast.c
diff --git a/Sapfor/_src/Predictor/Lib/inffast.h b/Sapfor/src/Predictor/Lib/inffast.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/inffast.h
rename to Sapfor/src/Predictor/Lib/inffast.h
diff --git a/Sapfor/_src/Predictor/Lib/inffixed.h b/Sapfor/src/Predictor/Lib/inffixed.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/inffixed.h
rename to Sapfor/src/Predictor/Lib/inffixed.h
diff --git a/Sapfor/_src/Predictor/Lib/inflate.c b/Sapfor/src/Predictor/Lib/inflate.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/inflate.c
rename to Sapfor/src/Predictor/Lib/inflate.c
diff --git a/Sapfor/_src/Predictor/Lib/inftrees.c b/Sapfor/src/Predictor/Lib/inftrees.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/inftrees.c
rename to Sapfor/src/Predictor/Lib/inftrees.c
diff --git a/Sapfor/_src/Predictor/Lib/inftrees.h b/Sapfor/src/Predictor/Lib/inftrees.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/inftrees.h
rename to Sapfor/src/Predictor/Lib/inftrees.h
diff --git a/Sapfor/_src/Predictor/Lib/infutil.c b/Sapfor/src/Predictor/Lib/infutil.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/infutil.c
rename to Sapfor/src/Predictor/Lib/infutil.c
diff --git a/Sapfor/_src/Predictor/Lib/infutil.h b/Sapfor/src/Predictor/Lib/infutil.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/infutil.h
rename to Sapfor/src/Predictor/Lib/infutil.h
diff --git a/Sapfor/_src/Predictor/Lib/intersection.cpp b/Sapfor/src/Predictor/Lib/intersection.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/intersection.cpp
rename to Sapfor/src/Predictor/Lib/intersection.cpp
diff --git a/Sapfor/_src/Predictor/Lib/predictor.cpp b/Sapfor/src/Predictor/Lib/predictor.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/predictor.cpp
rename to Sapfor/src/Predictor/Lib/predictor.cpp
diff --git a/Sapfor/_src/Predictor/Lib/trees.c b/Sapfor/src/Predictor/Lib/trees.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/trees.c
rename to Sapfor/src/Predictor/Lib/trees.c
diff --git a/Sapfor/_src/Predictor/Lib/trees.h b/Sapfor/src/Predictor/Lib/trees.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/trees.h
rename to Sapfor/src/Predictor/Lib/trees.h
diff --git a/Sapfor/_src/Predictor/Lib/uncompr.c b/Sapfor/src/Predictor/Lib/uncompr.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/uncompr.c
rename to Sapfor/src/Predictor/Lib/uncompr.c
diff --git a/Sapfor/_src/Predictor/Lib/zconf.h b/Sapfor/src/Predictor/Lib/zconf.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/zconf.h
rename to Sapfor/src/Predictor/Lib/zconf.h
diff --git a/Sapfor/_src/Predictor/Lib/zlib.h b/Sapfor/src/Predictor/Lib/zlib.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/zlib.h
rename to Sapfor/src/Predictor/Lib/zlib.h
diff --git a/Sapfor/_src/Predictor/Lib/zutil.c b/Sapfor/src/Predictor/Lib/zutil.c
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/zutil.c
rename to Sapfor/src/Predictor/Lib/zutil.c
diff --git a/Sapfor/_src/Predictor/Lib/zutil.h b/Sapfor/src/Predictor/Lib/zutil.h
similarity index 100%
rename from Sapfor/_src/Predictor/Lib/zutil.h
rename to Sapfor/src/Predictor/Lib/zutil.h
diff --git a/Sapfor/_src/Predictor/PredictScheme.cpp b/Sapfor/src/Predictor/PredictScheme.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/PredictScheme.cpp
rename to Sapfor/src/Predictor/PredictScheme.cpp
diff --git a/Sapfor/_src/Predictor/PredictScheme.h b/Sapfor/src/Predictor/PredictScheme.h
similarity index 100%
rename from Sapfor/_src/Predictor/PredictScheme.h
rename to Sapfor/src/Predictor/PredictScheme.h
diff --git a/Sapfor/_src/Predictor/PredictorInterface.h b/Sapfor/src/Predictor/PredictorInterface.h
similarity index 100%
rename from Sapfor/_src/Predictor/PredictorInterface.h
rename to Sapfor/src/Predictor/PredictorInterface.h
diff --git a/Sapfor/_src/Predictor/PredictorModel.cpp b/Sapfor/src/Predictor/PredictorModel.cpp
similarity index 100%
rename from Sapfor/_src/Predictor/PredictorModel.cpp
rename to Sapfor/src/Predictor/PredictorModel.cpp
diff --git a/Sapfor/_src/Predictor/PredictorModel.h b/Sapfor/src/Predictor/PredictorModel.h
similarity index 100%
rename from Sapfor/_src/Predictor/PredictorModel.h
rename to Sapfor/src/Predictor/PredictorModel.h
diff --git a/Sapfor/_src/PrivateAnalyzer/private_analyzer.cpp b/Sapfor/src/PrivateAnalyzer/private_analyzer.cpp
similarity index 100%
rename from Sapfor/_src/PrivateAnalyzer/private_analyzer.cpp
rename to Sapfor/src/PrivateAnalyzer/private_analyzer.cpp
diff --git a/Sapfor/_src/PrivateAnalyzer/private_analyzer.h b/Sapfor/src/PrivateAnalyzer/private_analyzer.h
similarity index 100%
rename from Sapfor/_src/PrivateAnalyzer/private_analyzer.h
rename to Sapfor/src/PrivateAnalyzer/private_analyzer.h
diff --git a/Sapfor/_src/ProjectManipulation/ConvertFiles.cpp b/Sapfor/src/ProjectManipulation/ConvertFiles.cpp
similarity index 100%
rename from Sapfor/_src/ProjectManipulation/ConvertFiles.cpp
rename to Sapfor/src/ProjectManipulation/ConvertFiles.cpp
diff --git a/Sapfor/_src/ProjectManipulation/ConvertFiles.h b/Sapfor/src/ProjectManipulation/ConvertFiles.h
similarity index 100%
rename from Sapfor/_src/ProjectManipulation/ConvertFiles.h
rename to Sapfor/src/ProjectManipulation/ConvertFiles.h
diff --git a/Sapfor/_src/ProjectManipulation/FileInfo.cpp b/Sapfor/src/ProjectManipulation/FileInfo.cpp
similarity index 100%
rename from Sapfor/_src/ProjectManipulation/FileInfo.cpp
rename to Sapfor/src/ProjectManipulation/FileInfo.cpp
diff --git a/Sapfor/_src/ProjectManipulation/FileInfo.h b/Sapfor/src/ProjectManipulation/FileInfo.h
similarity index 100%
rename from Sapfor/_src/ProjectManipulation/FileInfo.h
rename to Sapfor/src/ProjectManipulation/FileInfo.h
diff --git a/Sapfor/_src/ProjectManipulation/ParseFiles.cpp b/Sapfor/src/ProjectManipulation/ParseFiles.cpp
similarity index 100%
rename from Sapfor/_src/ProjectManipulation/ParseFiles.cpp
rename to Sapfor/src/ProjectManipulation/ParseFiles.cpp
diff --git a/Sapfor/_src/ProjectManipulation/ParseFiles.h b/Sapfor/src/ProjectManipulation/ParseFiles.h
similarity index 100%
rename from Sapfor/_src/ProjectManipulation/ParseFiles.h
rename to Sapfor/src/ProjectManipulation/ParseFiles.h
diff --git a/Sapfor/_src/ProjectManipulation/PerfAnalyzer.cpp b/Sapfor/src/ProjectManipulation/PerfAnalyzer.cpp
similarity index 100%
rename from Sapfor/_src/ProjectManipulation/PerfAnalyzer.cpp
rename to Sapfor/src/ProjectManipulation/PerfAnalyzer.cpp
diff --git a/Sapfor/_src/ProjectManipulation/PerfAnalyzer.h b/Sapfor/src/ProjectManipulation/PerfAnalyzer.h
similarity index 100%
rename from Sapfor/_src/ProjectManipulation/PerfAnalyzer.h
rename to Sapfor/src/ProjectManipulation/PerfAnalyzer.h
diff --git a/Sapfor/_src/ProjectManipulation/StdCapture.h b/Sapfor/src/ProjectManipulation/StdCapture.h
similarity index 100%
rename from Sapfor/_src/ProjectManipulation/StdCapture.h
rename to Sapfor/src/ProjectManipulation/StdCapture.h
diff --git a/Sapfor/_src/ProjectParameters/projectParameters.cpp b/Sapfor/src/ProjectParameters/projectParameters.cpp
similarity index 100%
rename from Sapfor/_src/ProjectParameters/projectParameters.cpp
rename to Sapfor/src/ProjectParameters/projectParameters.cpp
diff --git a/Sapfor/_src/ProjectParameters/projectParameters.h b/Sapfor/src/ProjectParameters/projectParameters.h
similarity index 100%
rename from Sapfor/_src/ProjectParameters/projectParameters.h
rename to Sapfor/src/ProjectParameters/projectParameters.h
diff --git a/Sapfor/_src/RenameSymbols/rename_symbols.cpp b/Sapfor/src/RenameSymbols/rename_symbols.cpp
similarity index 100%
rename from Sapfor/_src/RenameSymbols/rename_symbols.cpp
rename to Sapfor/src/RenameSymbols/rename_symbols.cpp
diff --git a/Sapfor/_src/RenameSymbols/rename_symbols.h b/Sapfor/src/RenameSymbols/rename_symbols.h
similarity index 100%
rename from Sapfor/_src/RenameSymbols/rename_symbols.h
rename to Sapfor/src/RenameSymbols/rename_symbols.h
diff --git a/Sapfor/_src/SageAnalysisTool/Makefile b/Sapfor/src/SageAnalysisTool/Makefile
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/Makefile
rename to Sapfor/src/SageAnalysisTool/Makefile
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/Makefile b/Sapfor/src/SageAnalysisTool/OmegaForSage/Makefile
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/Makefile
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/Makefile
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/README b/Sapfor/src/SageAnalysisTool/OmegaForSage/README
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/README
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/README
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/add-assert.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/add-assert.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/add-assert.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/affine.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/affine.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/affine.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/affine.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/cover.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/cover.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/cover.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/cover.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/ddomega.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/debug.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/debug.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/debug.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/debug.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/Exit.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/Exit.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/Exit.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/Exit.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/add-assert.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/add-assert.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/add-assert.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/affine.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/affine.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/affine.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/affine.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/cover.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/cover.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/cover.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/cover.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/dddir.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/dddir.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/dddir.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/dddir.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ddomega.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/debug.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/debug.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/debug.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/debug.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/flags.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/flags.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/flags.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/flags.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ip.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/ip.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/ip.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/ip.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/kill.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/kill.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/kill.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/kill.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/missing.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/missing.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/missing.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/missing.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/portable.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/portable.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/range.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/range.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/range.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/range.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/refine.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/refine.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/refine.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/refine.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/screen.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/screen.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/screen.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/screen.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h b/Sapfor/src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/ip.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/ip.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/ip.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/ip.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/kill.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/kill.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/kill.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/kill.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/refine.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/refine.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/refine.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/refine.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp b/Sapfor/src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
rename to Sapfor/src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/README b/Sapfor/src/SageAnalysisTool/README
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/README
rename to Sapfor/src/SageAnalysisTool/README
diff --git a/Sapfor/_src/SageAnalysisTool/annotationDriver.cpp b/Sapfor/src/SageAnalysisTool/annotationDriver.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/annotationDriver.cpp
rename to Sapfor/src/SageAnalysisTool/annotationDriver.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/annotationDriver.h b/Sapfor/src/SageAnalysisTool/annotationDriver.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/annotationDriver.h
rename to Sapfor/src/SageAnalysisTool/annotationDriver.h
diff --git a/Sapfor/_src/SageAnalysisTool/arrayRef.cpp b/Sapfor/src/SageAnalysisTool/arrayRef.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/arrayRef.cpp
rename to Sapfor/src/SageAnalysisTool/arrayRef.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/arrayRef.h b/Sapfor/src/SageAnalysisTool/arrayRef.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/arrayRef.h
rename to Sapfor/src/SageAnalysisTool/arrayRef.h
diff --git a/Sapfor/_src/SageAnalysisTool/computeInducVar.cpp b/Sapfor/src/SageAnalysisTool/computeInducVar.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/computeInducVar.cpp
rename to Sapfor/src/SageAnalysisTool/computeInducVar.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/constanteProp.cpp b/Sapfor/src/SageAnalysisTool/constanteProp.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/constanteProp.cpp
rename to Sapfor/src/SageAnalysisTool/constanteProp.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/constanteSet.h b/Sapfor/src/SageAnalysisTool/constanteSet.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/constanteSet.h
rename to Sapfor/src/SageAnalysisTool/constanteSet.h
diff --git a/Sapfor/_src/SageAnalysisTool/controlFlow.cpp b/Sapfor/src/SageAnalysisTool/controlFlow.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/controlFlow.cpp
rename to Sapfor/src/SageAnalysisTool/controlFlow.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/defUse.cpp b/Sapfor/src/SageAnalysisTool/defUse.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/defUse.cpp
rename to Sapfor/src/SageAnalysisTool/defUse.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/definesValues.h b/Sapfor/src/SageAnalysisTool/definesValues.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/definesValues.h
rename to Sapfor/src/SageAnalysisTool/definesValues.h
diff --git a/Sapfor/_src/SageAnalysisTool/definitionSet.h b/Sapfor/src/SageAnalysisTool/definitionSet.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/definitionSet.h
rename to Sapfor/src/SageAnalysisTool/definitionSet.h
diff --git a/Sapfor/_src/SageAnalysisTool/depGraph.cpp b/Sapfor/src/SageAnalysisTool/depGraph.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/depGraph.cpp
rename to Sapfor/src/SageAnalysisTool/depGraph.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/depGraph.h b/Sapfor/src/SageAnalysisTool/depGraph.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/depGraph.h
rename to Sapfor/src/SageAnalysisTool/depGraph.h
diff --git a/Sapfor/_src/SageAnalysisTool/depInterface.cpp b/Sapfor/src/SageAnalysisTool/depInterface.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/depInterface.cpp
rename to Sapfor/src/SageAnalysisTool/depInterface.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/depInterface.h b/Sapfor/src/SageAnalysisTool/depInterface.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/depInterface.h
rename to Sapfor/src/SageAnalysisTool/depInterface.h
diff --git a/Sapfor/_src/SageAnalysisTool/depInterfaceExt.h b/Sapfor/src/SageAnalysisTool/depInterfaceExt.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/depInterfaceExt.h
rename to Sapfor/src/SageAnalysisTool/depInterfaceExt.h
diff --git a/Sapfor/_src/SageAnalysisTool/dependence.cpp b/Sapfor/src/SageAnalysisTool/dependence.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/dependence.cpp
rename to Sapfor/src/SageAnalysisTool/dependence.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/dependence.h b/Sapfor/src/SageAnalysisTool/dependence.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/dependence.h
rename to Sapfor/src/SageAnalysisTool/dependence.h
diff --git a/Sapfor/_src/SageAnalysisTool/flowAnalysis.cpp b/Sapfor/src/SageAnalysisTool/flowAnalysis.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/flowAnalysis.cpp
rename to Sapfor/src/SageAnalysisTool/flowAnalysis.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/inducVar.h b/Sapfor/src/SageAnalysisTool/inducVar.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/inducVar.h
rename to Sapfor/src/SageAnalysisTool/inducVar.h
diff --git a/Sapfor/_src/SageAnalysisTool/intrinsic.cpp b/Sapfor/src/SageAnalysisTool/intrinsic.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/intrinsic.cpp
rename to Sapfor/src/SageAnalysisTool/intrinsic.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/intrinsic.h b/Sapfor/src/SageAnalysisTool/intrinsic.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/intrinsic.h
rename to Sapfor/src/SageAnalysisTool/intrinsic.h
diff --git a/Sapfor/_src/SageAnalysisTool/invariant.cpp b/Sapfor/src/SageAnalysisTool/invariant.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/invariant.cpp
rename to Sapfor/src/SageAnalysisTool/invariant.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/loopTransform.cpp b/Sapfor/src/SageAnalysisTool/loopTransform.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/loopTransform.cpp
rename to Sapfor/src/SageAnalysisTool/loopTransform.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/reductionCode.h b/Sapfor/src/SageAnalysisTool/reductionCode.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/reductionCode.h
rename to Sapfor/src/SageAnalysisTool/reductionCode.h
diff --git a/Sapfor/_src/SageAnalysisTool/set.cpp b/Sapfor/src/SageAnalysisTool/set.cpp
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/set.cpp
rename to Sapfor/src/SageAnalysisTool/set.cpp
diff --git a/Sapfor/_src/SageAnalysisTool/set.h b/Sapfor/src/SageAnalysisTool/set.h
similarity index 100%
rename from Sapfor/_src/SageAnalysisTool/set.h
rename to Sapfor/src/SageAnalysisTool/set.h
diff --git a/Sapfor/_src/Sapfor.cpp b/Sapfor/src/Sapfor.cpp
similarity index 100%
rename from Sapfor/_src/Sapfor.cpp
rename to Sapfor/src/Sapfor.cpp
diff --git a/Sapfor/_src/Sapfor.h b/Sapfor/src/Sapfor.h
similarity index 100%
rename from Sapfor/_src/Sapfor.h
rename to Sapfor/src/Sapfor.h
diff --git a/Sapfor/_src/SapforData.h b/Sapfor/src/SapforData.h
similarity index 100%
rename from Sapfor/_src/SapforData.h
rename to Sapfor/src/SapforData.h
diff --git a/Sapfor/_src/Server/checkUniq.cpp b/Sapfor/src/Server/checkUniq.cpp
similarity index 100%
rename from Sapfor/_src/Server/checkUniq.cpp
rename to Sapfor/src/Server/checkUniq.cpp
diff --git a/Sapfor/_src/Server/server.cpp b/Sapfor/src/Server/server.cpp
similarity index 100%
rename from Sapfor/_src/Server/server.cpp
rename to Sapfor/src/Server/server.cpp
diff --git a/Sapfor/_src/Server/spf_icon.ico b/Sapfor/src/Server/spf_icon.ico
similarity index 100%
rename from Sapfor/_src/Server/spf_icon.ico
rename to Sapfor/src/Server/spf_icon.ico
diff --git a/Sapfor/_src/Transformations/array_assign_to_loop.cpp b/Sapfor/src/Transformations/array_assign_to_loop.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/array_assign_to_loop.cpp
rename to Sapfor/src/Transformations/array_assign_to_loop.cpp
diff --git a/Sapfor/_src/Transformations/array_assign_to_loop.h b/Sapfor/src/Transformations/array_assign_to_loop.h
similarity index 100%
rename from Sapfor/_src/Transformations/array_assign_to_loop.h
rename to Sapfor/src/Transformations/array_assign_to_loop.h
diff --git a/Sapfor/_src/Transformations/checkpoints.cpp b/Sapfor/src/Transformations/checkpoints.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/checkpoints.cpp
rename to Sapfor/src/Transformations/checkpoints.cpp
diff --git a/Sapfor/_src/Transformations/checkpoints.h b/Sapfor/src/Transformations/checkpoints.h
similarity index 100%
rename from Sapfor/_src/Transformations/checkpoints.h
rename to Sapfor/src/Transformations/checkpoints.h
diff --git a/Sapfor/_src/Transformations/convert_to_c.cpp b/Sapfor/src/Transformations/convert_to_c.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/convert_to_c.cpp
rename to Sapfor/src/Transformations/convert_to_c.cpp
diff --git a/Sapfor/_src/Transformations/convert_to_c.h b/Sapfor/src/Transformations/convert_to_c.h
similarity index 100%
rename from Sapfor/_src/Transformations/convert_to_c.h
rename to Sapfor/src/Transformations/convert_to_c.h
diff --git a/Sapfor/_src/Transformations/dead_code.cpp b/Sapfor/src/Transformations/dead_code.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/dead_code.cpp
rename to Sapfor/src/Transformations/dead_code.cpp
diff --git a/Sapfor/_src/Transformations/dead_code.h b/Sapfor/src/Transformations/dead_code.h
similarity index 100%
rename from Sapfor/_src/Transformations/dead_code.h
rename to Sapfor/src/Transformations/dead_code.h
diff --git a/Sapfor/_src/Transformations/enddo_loop_converter.cpp b/Sapfor/src/Transformations/enddo_loop_converter.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/enddo_loop_converter.cpp
rename to Sapfor/src/Transformations/enddo_loop_converter.cpp
diff --git a/Sapfor/_src/Transformations/enddo_loop_converter.h b/Sapfor/src/Transformations/enddo_loop_converter.h
similarity index 100%
rename from Sapfor/_src/Transformations/enddo_loop_converter.h
rename to Sapfor/src/Transformations/enddo_loop_converter.h
diff --git a/Sapfor/_src/Transformations/fix_common_blocks.cpp b/Sapfor/src/Transformations/fix_common_blocks.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/fix_common_blocks.cpp
rename to Sapfor/src/Transformations/fix_common_blocks.cpp
diff --git a/Sapfor/_src/Transformations/fix_common_blocks.h b/Sapfor/src/Transformations/fix_common_blocks.h
similarity index 100%
rename from Sapfor/_src/Transformations/fix_common_blocks.h
rename to Sapfor/src/Transformations/fix_common_blocks.h
diff --git a/Sapfor/_src/Transformations/function_purifying.cpp b/Sapfor/src/Transformations/function_purifying.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/function_purifying.cpp
rename to Sapfor/src/Transformations/function_purifying.cpp
diff --git a/Sapfor/_src/Transformations/function_purifying.h b/Sapfor/src/Transformations/function_purifying.h
similarity index 100%
rename from Sapfor/_src/Transformations/function_purifying.h
rename to Sapfor/src/Transformations/function_purifying.h
diff --git a/Sapfor/_src/Transformations/loop_transform.cpp b/Sapfor/src/Transformations/loop_transform.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/loop_transform.cpp
rename to Sapfor/src/Transformations/loop_transform.cpp
diff --git a/Sapfor/_src/Transformations/loop_transform.h b/Sapfor/src/Transformations/loop_transform.h
similarity index 100%
rename from Sapfor/_src/Transformations/loop_transform.h
rename to Sapfor/src/Transformations/loop_transform.h
diff --git a/Sapfor/_src/Transformations/loops_combiner.cpp b/Sapfor/src/Transformations/loops_combiner.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/loops_combiner.cpp
rename to Sapfor/src/Transformations/loops_combiner.cpp
diff --git a/Sapfor/_src/Transformations/loops_combiner.h b/Sapfor/src/Transformations/loops_combiner.h
similarity index 100%
rename from Sapfor/_src/Transformations/loops_combiner.h
rename to Sapfor/src/Transformations/loops_combiner.h
diff --git a/Sapfor/_src/Transformations/loops_splitter.cpp b/Sapfor/src/Transformations/loops_splitter.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/loops_splitter.cpp
rename to Sapfor/src/Transformations/loops_splitter.cpp
diff --git a/Sapfor/_src/Transformations/loops_splitter.h b/Sapfor/src/Transformations/loops_splitter.h
similarity index 100%
rename from Sapfor/_src/Transformations/loops_splitter.h
rename to Sapfor/src/Transformations/loops_splitter.h
diff --git a/Sapfor/_src/Transformations/loops_unrolling.cpp b/Sapfor/src/Transformations/loops_unrolling.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/loops_unrolling.cpp
rename to Sapfor/src/Transformations/loops_unrolling.cpp
diff --git a/Sapfor/_src/Transformations/loops_unrolling.h b/Sapfor/src/Transformations/loops_unrolling.h
similarity index 100%
rename from Sapfor/_src/Transformations/loops_unrolling.h
rename to Sapfor/src/Transformations/loops_unrolling.h
diff --git a/Sapfor/_src/Transformations/private_arrays_resizing.cpp b/Sapfor/src/Transformations/private_arrays_resizing.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/private_arrays_resizing.cpp
rename to Sapfor/src/Transformations/private_arrays_resizing.cpp
diff --git a/Sapfor/_src/Transformations/private_arrays_resizing.h b/Sapfor/src/Transformations/private_arrays_resizing.h
similarity index 100%
rename from Sapfor/_src/Transformations/private_arrays_resizing.h
rename to Sapfor/src/Transformations/private_arrays_resizing.h
diff --git a/Sapfor/_src/Transformations/private_removing.cpp b/Sapfor/src/Transformations/private_removing.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/private_removing.cpp
rename to Sapfor/src/Transformations/private_removing.cpp
diff --git a/Sapfor/_src/Transformations/private_removing.h b/Sapfor/src/Transformations/private_removing.h
similarity index 100%
rename from Sapfor/_src/Transformations/private_removing.h
rename to Sapfor/src/Transformations/private_removing.h
diff --git a/Sapfor/_src/Transformations/replace_dist_arrays_in_io.cpp b/Sapfor/src/Transformations/replace_dist_arrays_in_io.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/replace_dist_arrays_in_io.cpp
rename to Sapfor/src/Transformations/replace_dist_arrays_in_io.cpp
diff --git a/Sapfor/_src/Transformations/replace_dist_arrays_in_io.h b/Sapfor/src/Transformations/replace_dist_arrays_in_io.h
similarity index 100%
rename from Sapfor/_src/Transformations/replace_dist_arrays_in_io.h
rename to Sapfor/src/Transformations/replace_dist_arrays_in_io.h
diff --git a/Sapfor/_src/Transformations/set_implicit_none.cpp b/Sapfor/src/Transformations/set_implicit_none.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/set_implicit_none.cpp
rename to Sapfor/src/Transformations/set_implicit_none.cpp
diff --git a/Sapfor/_src/Transformations/set_implicit_none.h b/Sapfor/src/Transformations/set_implicit_none.h
similarity index 100%
rename from Sapfor/_src/Transformations/set_implicit_none.h
rename to Sapfor/src/Transformations/set_implicit_none.h
diff --git a/Sapfor/_src/Transformations/swap_array_dims.cpp b/Sapfor/src/Transformations/swap_array_dims.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/swap_array_dims.cpp
rename to Sapfor/src/Transformations/swap_array_dims.cpp
diff --git a/Sapfor/_src/Transformations/swap_array_dims.h b/Sapfor/src/Transformations/swap_array_dims.h
similarity index 100%
rename from Sapfor/_src/Transformations/swap_array_dims.h
rename to Sapfor/src/Transformations/swap_array_dims.h
diff --git a/Sapfor/_src/Transformations/uniq_call_chain_dup.cpp b/Sapfor/src/Transformations/uniq_call_chain_dup.cpp
similarity index 100%
rename from Sapfor/_src/Transformations/uniq_call_chain_dup.cpp
rename to Sapfor/src/Transformations/uniq_call_chain_dup.cpp
diff --git a/Sapfor/_src/Transformations/uniq_call_chain_dup.h b/Sapfor/src/Transformations/uniq_call_chain_dup.h
similarity index 100%
rename from Sapfor/_src/Transformations/uniq_call_chain_dup.h
rename to Sapfor/src/Transformations/uniq_call_chain_dup.h
diff --git a/Sapfor/_src/Utils/AstWrapper.h b/Sapfor/src/Utils/AstWrapper.h
similarity index 100%
rename from Sapfor/_src/Utils/AstWrapper.h
rename to Sapfor/src/Utils/AstWrapper.h
diff --git a/Sapfor/_src/Utils/BoostStackTrace.cpp b/Sapfor/src/Utils/BoostStackTrace.cpp
similarity index 100%
rename from Sapfor/_src/Utils/BoostStackTrace.cpp
rename to Sapfor/src/Utils/BoostStackTrace.cpp
diff --git a/Sapfor/_src/Utils/CommonBlock.h b/Sapfor/src/Utils/CommonBlock.h
similarity index 100%
rename from Sapfor/_src/Utils/CommonBlock.h
rename to Sapfor/src/Utils/CommonBlock.h
diff --git a/Sapfor/_src/Utils/DefUseList.h b/Sapfor/src/Utils/DefUseList.h
similarity index 100%
rename from Sapfor/_src/Utils/DefUseList.h
rename to Sapfor/src/Utils/DefUseList.h
diff --git a/Sapfor/_src/Utils/PassManager.h b/Sapfor/src/Utils/PassManager.h
similarity index 100%
rename from Sapfor/_src/Utils/PassManager.h
rename to Sapfor/src/Utils/PassManager.h
diff --git a/Sapfor/_src/Utils/RationalNum.cpp b/Sapfor/src/Utils/RationalNum.cpp
similarity index 100%
rename from Sapfor/_src/Utils/RationalNum.cpp
rename to Sapfor/src/Utils/RationalNum.cpp
diff --git a/Sapfor/_src/Utils/RationalNum.h b/Sapfor/src/Utils/RationalNum.h
similarity index 100%
rename from Sapfor/_src/Utils/RationalNum.h
rename to Sapfor/src/Utils/RationalNum.h
diff --git a/Sapfor/_src/Utils/SgUtils.cpp b/Sapfor/src/Utils/SgUtils.cpp
similarity index 100%
rename from Sapfor/_src/Utils/SgUtils.cpp
rename to Sapfor/src/Utils/SgUtils.cpp
diff --git a/Sapfor/_src/Utils/SgUtils.h b/Sapfor/src/Utils/SgUtils.h
similarity index 100%
rename from Sapfor/_src/Utils/SgUtils.h
rename to Sapfor/src/Utils/SgUtils.h
diff --git a/Sapfor/_src/Utils/errors.h b/Sapfor/src/Utils/errors.h
similarity index 100%
rename from Sapfor/_src/Utils/errors.h
rename to Sapfor/src/Utils/errors.h
diff --git a/Sapfor/_src/Utils/leak_detector.h b/Sapfor/src/Utils/leak_detector.h
similarity index 100%
rename from Sapfor/_src/Utils/leak_detector.h
rename to Sapfor/src/Utils/leak_detector.h
diff --git a/Sapfor/_src/Utils/module_utils.cpp b/Sapfor/src/Utils/module_utils.cpp
similarity index 100%
rename from Sapfor/_src/Utils/module_utils.cpp
rename to Sapfor/src/Utils/module_utils.cpp
diff --git a/Sapfor/_src/Utils/module_utils.h b/Sapfor/src/Utils/module_utils.h
similarity index 100%
rename from Sapfor/_src/Utils/module_utils.h
rename to Sapfor/src/Utils/module_utils.h
diff --git a/Sapfor/_src/Utils/russian_errors_text.txt b/Sapfor/src/Utils/russian_errors_text.txt
similarity index 100%
rename from Sapfor/_src/Utils/russian_errors_text.txt
rename to Sapfor/src/Utils/russian_errors_text.txt
diff --git a/Sapfor/_src/Utils/types.h b/Sapfor/src/Utils/types.h
similarity index 100%
rename from Sapfor/_src/Utils/types.h
rename to Sapfor/src/Utils/types.h
diff --git a/Sapfor/_src/Utils/utils.cpp b/Sapfor/src/Utils/utils.cpp
similarity index 100%
rename from Sapfor/_src/Utils/utils.cpp
rename to Sapfor/src/Utils/utils.cpp
diff --git a/Sapfor/_src/Utils/utils.h b/Sapfor/src/Utils/utils.h
similarity index 100%
rename from Sapfor/_src/Utils/utils.h
rename to Sapfor/src/Utils/utils.h
diff --git a/Sapfor/_src/Utils/version.h b/Sapfor/src/Utils/version.h
similarity index 100%
rename from Sapfor/_src/Utils/version.h
rename to Sapfor/src/Utils/version.h
diff --git a/Sapfor/_src/VerificationCode/CorrectVarDecl.cpp b/Sapfor/src/VerificationCode/CorrectVarDecl.cpp
similarity index 100%
rename from Sapfor/_src/VerificationCode/CorrectVarDecl.cpp
rename to Sapfor/src/VerificationCode/CorrectVarDecl.cpp
diff --git a/Sapfor/_src/VerificationCode/IncludeChecker.cpp b/Sapfor/src/VerificationCode/IncludeChecker.cpp
similarity index 100%
rename from Sapfor/_src/VerificationCode/IncludeChecker.cpp
rename to Sapfor/src/VerificationCode/IncludeChecker.cpp
diff --git a/Sapfor/_src/VerificationCode/StructureChecker.cpp b/Sapfor/src/VerificationCode/StructureChecker.cpp
similarity index 100%
rename from Sapfor/_src/VerificationCode/StructureChecker.cpp
rename to Sapfor/src/VerificationCode/StructureChecker.cpp
diff --git a/Sapfor/_src/VerificationCode/VerifySageStructures.cpp b/Sapfor/src/VerificationCode/VerifySageStructures.cpp
similarity index 100%
rename from Sapfor/_src/VerificationCode/VerifySageStructures.cpp
rename to Sapfor/src/VerificationCode/VerifySageStructures.cpp
diff --git a/Sapfor/_src/VerificationCode/verifications.h b/Sapfor/src/VerificationCode/verifications.h
similarity index 100%
rename from Sapfor/_src/VerificationCode/verifications.h
rename to Sapfor/src/VerificationCode/verifications.h
diff --git a/Sapfor/_src/VisualizerCalls/BuildGraph.cpp b/Sapfor/src/VisualizerCalls/BuildGraph.cpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/BuildGraph.cpp
rename to Sapfor/src/VisualizerCalls/BuildGraph.cpp
diff --git a/Sapfor/_src/VisualizerCalls/BuildGraph.h b/Sapfor/src/VisualizerCalls/BuildGraph.h
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/BuildGraph.h
rename to Sapfor/src/VisualizerCalls/BuildGraph.h
diff --git a/Sapfor/_src/VisualizerCalls/SendMessage.cpp b/Sapfor/src/VisualizerCalls/SendMessage.cpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/SendMessage.cpp
rename to Sapfor/src/VisualizerCalls/SendMessage.cpp
diff --git a/Sapfor/_src/VisualizerCalls/SendMessage.h b/Sapfor/src/VisualizerCalls/SendMessage.h
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/SendMessage.h
rename to Sapfor/src/VisualizerCalls/SendMessage.h
diff --git a/Sapfor/_src/VisualizerCalls/get_information.cpp b/Sapfor/src/VisualizerCalls/get_information.cpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/get_information.cpp
rename to Sapfor/src/VisualizerCalls/get_information.cpp
diff --git a/Sapfor/_src/VisualizerCalls/get_information.h b/Sapfor/src/VisualizerCalls/get_information.h
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/get_information.h
rename to Sapfor/src/VisualizerCalls/get_information.h
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/algebra.cpp b/Sapfor/src/VisualizerCalls/graphLayout/algebra.cpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/algebra.cpp
rename to Sapfor/src/VisualizerCalls/graphLayout/algebra.cpp
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/algebra.hpp b/Sapfor/src/VisualizerCalls/graphLayout/algebra.hpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/algebra.hpp
rename to Sapfor/src/VisualizerCalls/graphLayout/algebra.hpp
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp b/Sapfor/src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
rename to Sapfor/src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp b/Sapfor/src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
rename to Sapfor/src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp b/Sapfor/src/VisualizerCalls/graphLayout/kamada_kawai.cpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.cpp
rename to Sapfor/src/VisualizerCalls/graphLayout/kamada_kawai.cpp
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp b/Sapfor/src/VisualizerCalls/graphLayout/kamada_kawai.hpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/kamada_kawai.hpp
rename to Sapfor/src/VisualizerCalls/graphLayout/kamada_kawai.hpp
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/layout.cpp b/Sapfor/src/VisualizerCalls/graphLayout/layout.cpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/layout.cpp
rename to Sapfor/src/VisualizerCalls/graphLayout/layout.cpp
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/layout.hpp b/Sapfor/src/VisualizerCalls/graphLayout/layout.hpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/layout.hpp
rename to Sapfor/src/VisualizerCalls/graphLayout/layout.hpp
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.cpp b/Sapfor/src/VisualizerCalls/graphLayout/nodesoup.cpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.cpp
rename to Sapfor/src/VisualizerCalls/graphLayout/nodesoup.cpp
diff --git a/Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.hpp b/Sapfor/src/VisualizerCalls/graphLayout/nodesoup.hpp
similarity index 100%
rename from Sapfor/_src/VisualizerCalls/graphLayout/nodesoup.hpp
rename to Sapfor/src/VisualizerCalls/graphLayout/nodesoup.hpp
diff --git a/Sapfor/_test/inliner/alex.f b/Sapfor/tests/inliner/alex.f
similarity index 100%
rename from Sapfor/_test/inliner/alex.f
rename to Sapfor/tests/inliner/alex.f
diff --git a/Sapfor/_test/inliner/array_sum.f b/Sapfor/tests/inliner/array_sum.f
similarity index 100%
rename from Sapfor/_test/inliner/array_sum.f
rename to Sapfor/tests/inliner/array_sum.f
diff --git a/Sapfor/_test/inliner/inlineFunctionWithAllocatable.f90 b/Sapfor/tests/inliner/inlineFunctionWithAllocatable.f90
similarity index 100%
rename from Sapfor/_test/inliner/inlineFunctionWithAllocatable.f90
rename to Sapfor/tests/inliner/inlineFunctionWithAllocatable.f90
diff --git a/Sapfor/_test/inliner/sub.f b/Sapfor/tests/inliner/sub.f
similarity index 100%
rename from Sapfor/_test/inliner/sub.f
rename to Sapfor/tests/inliner/sub.f
diff --git a/Sapfor/_test/inliner/test.f b/Sapfor/tests/inliner/test.f
similarity index 100%
rename from Sapfor/_test/inliner/test.f
rename to Sapfor/tests/inliner/test.f
diff --git a/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f b/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
similarity index 100%
rename from Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
rename to Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
diff --git a/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f b/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
similarity index 100%
rename from Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
rename to Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
diff --git a/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f b/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
similarity index 100%
rename from Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
rename to Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
diff --git a/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f b/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
similarity index 100%
rename from Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
rename to Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
diff --git a/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f b/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
similarity index 100%
rename from Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
rename to Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
diff --git a/Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f b/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
similarity index 100%
rename from Sapfor/_test/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
rename to Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
diff --git a/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err1.f b/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err1.f
similarity index 100%
rename from Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err1.f
rename to Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err1.f
diff --git a/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err2.f b/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err2.f
similarity index 100%
rename from Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err2.f
rename to Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err2.f
diff --git a/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err3.f b/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err3.f
similarity index 100%
rename from Sapfor/_test/sapfor/check_args_decl/arg_decl_test_err3.f
rename to Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err3.f
diff --git a/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok1.f b/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok1.f
similarity index 100%
rename from Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok1.f
rename to Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok1.f
diff --git a/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok2.f b/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok2.f
similarity index 100%
rename from Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok2.f
rename to Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok2.f
diff --git a/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok3.f b/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok3.f
similarity index 100%
rename from Sapfor/_test/sapfor/check_args_decl/arg_decl_test_ok3.f
rename to Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok3.f
diff --git a/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr1.f b/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_wr1.f
similarity index 100%
rename from Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr1.f
rename to Sapfor/tests/sapfor/check_args_decl/arg_decl_test_wr1.f
diff --git a/Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr3.f b/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_wr3.f
similarity index 100%
rename from Sapfor/_test/sapfor/check_args_decl/arg_decl_test_wr3.f
rename to Sapfor/tests/sapfor/check_args_decl/arg_decl_test_wr3.f
diff --git a/Sapfor/_test/sapfor/checkpoint/checkpoint.f90 b/Sapfor/tests/sapfor/checkpoint/checkpoint.f90
similarity index 100%
rename from Sapfor/_test/sapfor/checkpoint/checkpoint.f90
rename to Sapfor/tests/sapfor/checkpoint/checkpoint.f90
diff --git a/Sapfor/_test/sapfor/checkpoint/checkpoint2.f90 b/Sapfor/tests/sapfor/checkpoint/checkpoint2.f90
similarity index 100%
rename from Sapfor/_test/sapfor/checkpoint/checkpoint2.f90
rename to Sapfor/tests/sapfor/checkpoint/checkpoint2.f90
diff --git a/Sapfor/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90 b/Sapfor/tests/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
similarity index 100%
rename from Sapfor/_test/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
rename to Sapfor/tests/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
diff --git a/Sapfor/_test/sapfor/convert_assign_to_loop/assign_with_sections.f b/Sapfor/tests/sapfor/convert_assign_to_loop/assign_with_sections.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_assign_to_loop/assign_with_sections.f
rename to Sapfor/tests/sapfor/convert_assign_to_loop/assign_with_sections.f
diff --git a/Sapfor/_test/sapfor/convert_assign_to_loop/simple_assign.f b/Sapfor/tests/sapfor/convert_assign_to_loop/simple_assign.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_assign_to_loop/simple_assign.f
rename to Sapfor/tests/sapfor/convert_assign_to_loop/simple_assign.f
diff --git a/Sapfor/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f b/Sapfor/tests/sapfor/convert_assign_to_loop/two_dimensional_assign.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_assign_to_loop/two_dimensional_assign.f
rename to Sapfor/tests/sapfor/convert_assign_to_loop/two_dimensional_assign.f
diff --git a/Sapfor/_test/sapfor/convert_expr_to_loop/expr_with_sections.f b/Sapfor/tests/sapfor/convert_expr_to_loop/expr_with_sections.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_expr_to_loop/expr_with_sections.f
rename to Sapfor/tests/sapfor/convert_expr_to_loop/expr_with_sections.f
diff --git a/Sapfor/_test/sapfor/convert_expr_to_loop/simple_expr.f b/Sapfor/tests/sapfor/convert_expr_to_loop/simple_expr.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_expr_to_loop/simple_expr.f
rename to Sapfor/tests/sapfor/convert_expr_to_loop/simple_expr.f
diff --git a/Sapfor/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f b/Sapfor/tests/sapfor/convert_expr_to_loop/two_dimensional_expr.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_expr_to_loop/two_dimensional_expr.f
rename to Sapfor/tests/sapfor/convert_expr_to_loop/two_dimensional_expr.f
diff --git a/Sapfor/_test/sapfor/convert_sum_to_loop/simple_sum.f b/Sapfor/tests/sapfor/convert_sum_to_loop/simple_sum.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_sum_to_loop/simple_sum.f
rename to Sapfor/tests/sapfor/convert_sum_to_loop/simple_sum.f
diff --git a/Sapfor/_test/sapfor/convert_sum_to_loop/sum_with_sections.f b/Sapfor/tests/sapfor/convert_sum_to_loop/sum_with_sections.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_sum_to_loop/sum_with_sections.f
rename to Sapfor/tests/sapfor/convert_sum_to_loop/sum_with_sections.f
diff --git a/Sapfor/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f b/Sapfor/tests/sapfor/convert_sum_to_loop/two_dimensional_sum.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_sum_to_loop/two_dimensional_sum.f
rename to Sapfor/tests/sapfor/convert_sum_to_loop/two_dimensional_sum.f
diff --git a/Sapfor/_test/sapfor/convert_where_to_loop/simple_where.f b/Sapfor/tests/sapfor/convert_where_to_loop/simple_where.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_where_to_loop/simple_where.f
rename to Sapfor/tests/sapfor/convert_where_to_loop/simple_where.f
diff --git a/Sapfor/_test/sapfor/convert_where_to_loop/two_dimensional_where.f b/Sapfor/tests/sapfor/convert_where_to_loop/two_dimensional_where.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_where_to_loop/two_dimensional_where.f
rename to Sapfor/tests/sapfor/convert_where_to_loop/two_dimensional_where.f
diff --git a/Sapfor/_test/sapfor/convert_where_to_loop/where_with_sections.f b/Sapfor/tests/sapfor/convert_where_to_loop/where_with_sections.f
similarity index 100%
rename from Sapfor/_test/sapfor/convert_where_to_loop/where_with_sections.f
rename to Sapfor/tests/sapfor/convert_where_to_loop/where_with_sections.f
diff --git a/Sapfor/_test/sapfor/create_nested_loops/program.expected.f90 b/Sapfor/tests/sapfor/create_nested_loops/program.expected.f90
similarity index 100%
rename from Sapfor/_test/sapfor/create_nested_loops/program.expected.f90
rename to Sapfor/tests/sapfor/create_nested_loops/program.expected.f90
diff --git a/Sapfor/_test/sapfor/create_nested_loops/program.f90 b/Sapfor/tests/sapfor/create_nested_loops/program.f90
similarity index 100%
rename from Sapfor/_test/sapfor/create_nested_loops/program.f90
rename to Sapfor/tests/sapfor/create_nested_loops/program.f90
diff --git a/Sapfor/_test/sapfor/create_nested_loops/test.bat b/Sapfor/tests/sapfor/create_nested_loops/test.bat
similarity index 100%
rename from Sapfor/_test/sapfor/create_nested_loops/test.bat
rename to Sapfor/tests/sapfor/create_nested_loops/test.bat
diff --git a/Sapfor/_test/sapfor/create_nested_loops/test.sh b/Sapfor/tests/sapfor/create_nested_loops/test.sh
similarity index 100%
rename from Sapfor/_test/sapfor/create_nested_loops/test.sh
rename to Sapfor/tests/sapfor/create_nested_loops/test.sh
diff --git a/Sapfor/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90 b/Sapfor/tests/sapfor/fission_and_private_exp/fission_priv_exp.f90
similarity index 100%
rename from Sapfor/_test/sapfor/fission_and_private_exp/fission_priv_exp.f90
rename to Sapfor/tests/sapfor/fission_and_private_exp/fission_priv_exp.f90
diff --git a/Sapfor/_test/sapfor/loops_combiner/test_1.for b/Sapfor/tests/sapfor/loops_combiner/test_1.for
similarity index 100%
rename from Sapfor/_test/sapfor/loops_combiner/test_1.for
rename to Sapfor/tests/sapfor/loops_combiner/test_1.for
diff --git a/Sapfor/_test/sapfor/loops_combiner/test_2.for b/Sapfor/tests/sapfor/loops_combiner/test_2.for
similarity index 100%
rename from Sapfor/_test/sapfor/loops_combiner/test_2.for
rename to Sapfor/tests/sapfor/loops_combiner/test_2.for
diff --git a/Sapfor/_test/sapfor/loops_combiner/test_3.for b/Sapfor/tests/sapfor/loops_combiner/test_3.for
similarity index 100%
rename from Sapfor/_test/sapfor/loops_combiner/test_3.for
rename to Sapfor/tests/sapfor/loops_combiner/test_3.for
diff --git a/Sapfor/_test/sapfor/loops_combiner/test_4.for b/Sapfor/tests/sapfor/loops_combiner/test_4.for
similarity index 100%
rename from Sapfor/_test/sapfor/loops_combiner/test_4.for
rename to Sapfor/tests/sapfor/loops_combiner/test_4.for
diff --git a/Sapfor/_test/sapfor/loops_combiner/test_5.for b/Sapfor/tests/sapfor/loops_combiner/test_5.for
similarity index 100%
rename from Sapfor/_test/sapfor/loops_combiner/test_5.for
rename to Sapfor/tests/sapfor/loops_combiner/test_5.for
diff --git a/Sapfor/_test/sapfor/merge_regions/array_read_before_write.in b/Sapfor/tests/sapfor/merge_regions/array_read_before_write.in
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/array_read_before_write.in
rename to Sapfor/tests/sapfor/merge_regions/array_read_before_write.in
diff --git a/Sapfor/_test/sapfor/merge_regions/array_read_before_write.out b/Sapfor/tests/sapfor/merge_regions/array_read_before_write.out
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/array_read_before_write.out
rename to Sapfor/tests/sapfor/merge_regions/array_read_before_write.out
diff --git a/Sapfor/_test/sapfor/merge_regions/read_before_read.in b/Sapfor/tests/sapfor/merge_regions/read_before_read.in
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/read_before_read.in
rename to Sapfor/tests/sapfor/merge_regions/read_before_read.in
diff --git a/Sapfor/_test/sapfor/merge_regions/read_before_read.out b/Sapfor/tests/sapfor/merge_regions/read_before_read.out
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/read_before_read.out
rename to Sapfor/tests/sapfor/merge_regions/read_before_read.out
diff --git a/Sapfor/_test/sapfor/merge_regions/read_in_loop_header.in b/Sapfor/tests/sapfor/merge_regions/read_in_loop_header.in
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/read_in_loop_header.in
rename to Sapfor/tests/sapfor/merge_regions/read_in_loop_header.in
diff --git a/Sapfor/_test/sapfor/merge_regions/read_in_loop_header.out b/Sapfor/tests/sapfor/merge_regions/read_in_loop_header.out
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/read_in_loop_header.out
rename to Sapfor/tests/sapfor/merge_regions/read_in_loop_header.out
diff --git a/Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.in b/Sapfor/tests/sapfor/merge_regions/var_modified_in_fun.in
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.in
rename to Sapfor/tests/sapfor/merge_regions/var_modified_in_fun.in
diff --git a/Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.out b/Sapfor/tests/sapfor/merge_regions/var_modified_in_fun.out
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/var_modified_in_fun.out
rename to Sapfor/tests/sapfor/merge_regions/var_modified_in_fun.out
diff --git a/Sapfor/_test/sapfor/merge_regions/var_read_before_write.in b/Sapfor/tests/sapfor/merge_regions/var_read_before_write.in
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/var_read_before_write.in
rename to Sapfor/tests/sapfor/merge_regions/var_read_before_write.in
diff --git a/Sapfor/_test/sapfor/merge_regions/var_read_before_write.out b/Sapfor/tests/sapfor/merge_regions/var_read_before_write.out
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/var_read_before_write.out
rename to Sapfor/tests/sapfor/merge_regions/var_read_before_write.out
diff --git a/Sapfor/_test/sapfor/merge_regions/write_before_read.in b/Sapfor/tests/sapfor/merge_regions/write_before_read.in
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/write_before_read.in
rename to Sapfor/tests/sapfor/merge_regions/write_before_read.in
diff --git a/Sapfor/_test/sapfor/merge_regions/write_before_read.out b/Sapfor/tests/sapfor/merge_regions/write_before_read.out
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/write_before_read.out
rename to Sapfor/tests/sapfor/merge_regions/write_before_read.out
diff --git a/Sapfor/_test/sapfor/merge_regions/write_before_write.in b/Sapfor/tests/sapfor/merge_regions/write_before_write.in
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/write_before_write.in
rename to Sapfor/tests/sapfor/merge_regions/write_before_write.in
diff --git a/Sapfor/_test/sapfor/merge_regions/write_before_write.out b/Sapfor/tests/sapfor/merge_regions/write_before_write.out
similarity index 100%
rename from Sapfor/_test/sapfor/merge_regions/write_before_write.out
rename to Sapfor/tests/sapfor/merge_regions/write_before_write.out
diff --git a/Sapfor/_test/sapfor/parameter/magnit_3d.for b/Sapfor/tests/sapfor/parameter/magnit_3d.for
similarity index 100%
rename from Sapfor/_test/sapfor/parameter/magnit_3d.for
rename to Sapfor/tests/sapfor/parameter/magnit_3d.for
diff --git a/Sapfor/_test/sapfor/parameter/mycom.for b/Sapfor/tests/sapfor/parameter/mycom.for
similarity index 100%
rename from Sapfor/_test/sapfor/parameter/mycom.for
rename to Sapfor/tests/sapfor/parameter/mycom.for
diff --git a/Sapfor/_test/sapfor/parameter/parameter.f90 b/Sapfor/tests/sapfor/parameter/parameter.f90
similarity index 100%
rename from Sapfor/_test/sapfor/parameter/parameter.f90
rename to Sapfor/tests/sapfor/parameter/parameter.f90
diff --git a/Sapfor/_test/sapfor/private_removing/test.f b/Sapfor/tests/sapfor/private_removing/test.f
similarity index 100%
rename from Sapfor/_test/sapfor/private_removing/test.f
rename to Sapfor/tests/sapfor/private_removing/test.f
diff --git a/Sapfor/_test/sapfor/private_removing/test_cannot_remove.f b/Sapfor/tests/sapfor/private_removing/test_cannot_remove.f
similarity index 100%
rename from Sapfor/_test/sapfor/private_removing/test_cannot_remove.f
rename to Sapfor/tests/sapfor/private_removing/test_cannot_remove.f
diff --git a/Sapfor/_test/sapfor/private_removing/test_cascade.f b/Sapfor/tests/sapfor/private_removing/test_cascade.f
similarity index 100%
rename from Sapfor/_test/sapfor/private_removing/test_cascade.f
rename to Sapfor/tests/sapfor/private_removing/test_cascade.f
diff --git a/Sapfor/_test/sapfor/shrink/error.f b/Sapfor/tests/sapfor/shrink/error.f
similarity index 100%
rename from Sapfor/_test/sapfor/shrink/error.f
rename to Sapfor/tests/sapfor/shrink/error.f
diff --git a/Sapfor/_test/sapfor/shrink/error2.f b/Sapfor/tests/sapfor/shrink/error2.f
similarity index 100%
rename from Sapfor/_test/sapfor/shrink/error2.f
rename to Sapfor/tests/sapfor/shrink/error2.f
diff --git a/Sapfor/_test/sapfor/shrink/error3.f b/Sapfor/tests/sapfor/shrink/error3.f
similarity index 100%
rename from Sapfor/_test/sapfor/shrink/error3.f
rename to Sapfor/tests/sapfor/shrink/error3.f
diff --git a/Sapfor/_test/sapfor/shrink/shrink.f b/Sapfor/tests/sapfor/shrink/shrink.f
similarity index 100%
rename from Sapfor/_test/sapfor/shrink/shrink.f
rename to Sapfor/tests/sapfor/shrink/shrink.f
diff --git a/Sapfor/_test/sapfor/shrink/shrink2.f b/Sapfor/tests/sapfor/shrink/shrink2.f
similarity index 100%
rename from Sapfor/_test/sapfor/shrink/shrink2.f
rename to Sapfor/tests/sapfor/shrink/shrink2.f
diff --git a/Sapfor/_test/sapfor/shrink/shrink3.f b/Sapfor/tests/sapfor/shrink/shrink3.f
similarity index 100%
rename from Sapfor/_test/sapfor/shrink/shrink3.f
rename to Sapfor/tests/sapfor/shrink/shrink3.f

From f8400063981b2cd36608ae328bc6a01bb06052b3 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Wed, 12 Mar 2025 14:24:50 +0300
Subject: [PATCH 28/44] fixed paths

---
 Sapfor/CMakeLists.txt                         | 2 +-
 Sapfor/projects/{FDVM => Fdvm}/CMakeLists.txt | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename Sapfor/projects/{FDVM => Fdvm}/CMakeLists.txt (100%)

diff --git a/Sapfor/CMakeLists.txt b/Sapfor/CMakeLists.txt
index 86e51fd..5bdf791 100644
--- a/Sapfor/CMakeLists.txt
+++ b/Sapfor/CMakeLists.txt
@@ -491,7 +491,7 @@ else()
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2")
 endif()
 
-add_subdirectory(projects/FDVM)
+add_subdirectory(projects/Fdvm)
 
 add_definitions("-D __SPF")
 add_definitions("-D _CRT_SECURE_NO_WARNINGS")
diff --git a/Sapfor/projects/FDVM/CMakeLists.txt b/Sapfor/projects/Fdvm/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/FDVM/CMakeLists.txt
rename to Sapfor/projects/Fdvm/CMakeLists.txt

From 033bbce2201323f4b642b4271edd5b1bbdf2e899 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Wed, 12 Mar 2025 14:28:04 +0300
Subject: [PATCH 29/44] finalyze moving

---
 Sapfor/CMakeLists.txt => CMakeLists.txt             |   0
 {Sapfor/projects => projects}/Fdvm/CMakeLists.txt   |   0
 {Sapfor/projects => projects}/Parser/CMakeLists.txt |   0
 .../projects => projects}/SageLib/CMakeLists.txt    |   0
 .../projects => projects}/SageNewSrc/CMakeLists.txt |   0
 .../projects => projects}/SageOldSrc/CMakeLists.txt |   0
 {Sapfor/projects => projects}/Sapc++/Sapc++.sln     |   0
 .../projects => projects}/dvm/fdvm/CMakeLists.txt   |   0
 .../dvm/fdvm/trunk/CMakeLists.txt                   |   0
 .../dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt   |   0
 .../dvm/fdvm/trunk/InlineExpansion/dvm_tag.h        |   0
 .../dvm/fdvm/trunk/InlineExpansion/hlp.cpp          |   0
 .../dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp      |   0
 .../dvm/fdvm/trunk/InlineExpansion/inline.h         |   0
 .../dvm/fdvm/trunk/InlineExpansion/inliner.cpp      |   0
 .../dvm/fdvm/trunk/InlineExpansion/intrinsic.h      |   0
 .../dvm/fdvm/trunk/InlineExpansion/makefile.uni     |   0
 .../dvm/fdvm/trunk/InlineExpansion/makefile.win     |   0
 .../projects => projects}/dvm/fdvm/trunk/Makefile   |   0
 .../dvm/fdvm/trunk/Sage/CMakeLists.txt              |   0
 .../dvm/fdvm/trunk/Sage/LICENSE                     |   0
 .../dvm/fdvm/trunk/Sage/Makefile                    |   0
 .../dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt       |   0
 .../dvm/fdvm/trunk/Sage/Sage++/Makefile             |   0
 .../dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp        |   0
 .../dvm/fdvm/trunk/Sage/Sage++/makefile.uni         |   0
 .../dvm/fdvm/trunk/Sage/Sage++/makefile.win         |   0
 .../dvm/fdvm/trunk/Sage/h/Makefile                  |   0
 .../dvm/fdvm/trunk/Sage/h/bif.h                     |   0
 .../dvm/fdvm/trunk/Sage/h/compatible.h              |   0
 .../dvm/fdvm/trunk/Sage/h/db.h                      |   0
 .../dvm/fdvm/trunk/Sage/h/db.new.h                  |   0
 .../dvm/fdvm/trunk/Sage/h/defines.h                 |   0
 .../dvm/fdvm/trunk/Sage/h/defs.h                    |   0
 .../dvm/fdvm/trunk/Sage/h/dep.h                     |   0
 .../dvm/fdvm/trunk/Sage/h/dep_str.h                 |   0
 .../dvm/fdvm/trunk/Sage/h/dep_struct.h              |   0
 .../dvm/fdvm/trunk/Sage/h/elist.h                   |   0
 .../dvm/fdvm/trunk/Sage/h/f90.h                     |   0
 .../dvm/fdvm/trunk/Sage/h/fixcray.h                 |   0
 .../dvm/fdvm/trunk/Sage/h/fm.h                      |   0
 .../dvm/fdvm/trunk/Sage/h/head                      |   0
 .../dvm/fdvm/trunk/Sage/h/leak_detector.h           |   0
 .../dvm/fdvm/trunk/Sage/h/list.h                    |   0
 .../dvm/fdvm/trunk/Sage/h/ll.h                      |   0
 .../dvm/fdvm/trunk/Sage/h/prop.h                    |   0
 .../dvm/fdvm/trunk/Sage/h/sage.h                    |   0
 .../dvm/fdvm/trunk/Sage/h/sagearch.h                |   0
 .../dvm/fdvm/trunk/Sage/h/sageroot.h                |   0
 .../dvm/fdvm/trunk/Sage/h/sets.h                    |   0
 .../dvm/fdvm/trunk/Sage/h/symb.h                    |   0
 .../dvm/fdvm/trunk/Sage/h/symblob.h                 |   0
 .../projects => projects}/dvm/fdvm/trunk/Sage/h/tag |   0
 .../dvm/fdvm/trunk/Sage/h/tag.doc                   |   0
 .../dvm/fdvm/trunk/Sage/h/tag.h                     |   0
 .../dvm/fdvm/trunk/Sage/h/tag_make                  |   0
 .../dvm/fdvm/trunk/Sage/h/version.h                 |   0
 .../dvm/fdvm/trunk/Sage/h/vextern.h                 |   0
 .../dvm/fdvm/trunk/Sage/h/vparse.h                  |   0
 .../dvm/fdvm/trunk/Sage/h/vpc.h                     |   0
 .../dvm/fdvm/trunk/Sage/h/window.h                  |   0
 .../dvm/fdvm/trunk/Sage/lib/CMakeLists.txt          |   0
 .../dvm/fdvm/trunk/Sage/lib/Makefile                |   0
 .../dvm/fdvm/trunk/Sage/lib/include/attributes.h    |   0
 .../dvm/fdvm/trunk/Sage/lib/include/baseClasses.h   |   0
 .../dvm/fdvm/trunk/Sage/lib/include/bif_node.def    |   0
 .../dvm/fdvm/trunk/Sage/lib/include/dependence.h    |   0
 .../dvm/fdvm/trunk/Sage/lib/include/ext_ann.h       |   0
 .../dvm/fdvm/trunk/Sage/lib/include/ext_high.h      |   0
 .../dvm/fdvm/trunk/Sage/lib/include/ext_lib.h       |   0
 .../dvm/fdvm/trunk/Sage/lib/include/ext_low.h       |   0
 .../dvm/fdvm/trunk/Sage/lib/include/ext_mid.h       |   0
 .../dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h    |   0
 .../dvm/fdvm/trunk/Sage/lib/include/libSage++.h     |   0
 .../dvm/fdvm/trunk/Sage/lib/include/macro.h         |   0
 .../fdvm/trunk/Sage/lib/include/sage++callgraph.h   |   0
 .../trunk/Sage/lib/include/sage++classhierarchy.h   |   0
 .../dvm/fdvm/trunk/Sage/lib/include/sage++extern.h  |   0
 .../dvm/fdvm/trunk/Sage/lib/include/sage++proto.h   |   0
 .../dvm/fdvm/trunk/Sage/lib/include/sage++user.h    |   0
 .../dvm/fdvm/trunk/Sage/lib/include/symb.def        |   0
 .../dvm/fdvm/trunk/Sage/lib/include/type.def        |   0
 .../dvm/fdvm/trunk/Sage/lib/include/unparse.def     |   0
 .../dvm/fdvm/trunk/Sage/lib/include/unparseC++.def  |   0
 .../dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def  |   0
 .../dvm/fdvm/trunk/Sage/lib/makefile.uni            |   0
 .../dvm/fdvm/trunk/Sage/lib/makefile.win            |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt   |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/Makefile         |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c   |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h   |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y       |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/comments.c       |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c      |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni     |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win     |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c       |   0
 .../dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c        |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt   |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile         |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c       |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/db.c             |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c         |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c    |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c     |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c        |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c      |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c      |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c        |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/list.c           |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c     |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni     |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win     |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c        |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c          |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c      |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c           |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c       |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c       |   0
 .../dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c     |   0
 .../dvm/fdvm/trunk/Sage/makefile.uni                |   0
 .../dvm/fdvm/trunk/Sage/makefile.win                |   0
 .../FDVM/CodeTransformer/CodeTransformer.vcxproj    |   0
 .../CodeTransformer/CodeTransformer.vcxproj.filters |   0
 .../FDVM/FDVM.sln                                   |   0
 .../FDVM/FDVM/FDVM.vcxproj                          |   0
 .../FDVM/FDVM/FDVM.vcxproj.filters                  |   0
 .../FDVM/NEWsrc/NEWsrc.vcxproj                      |   0
 .../FDVM/NEWsrc/NEWsrc.vcxproj.filters              |   0
 .../FDVM/OLDsrc/OLDsrc.vcxproj                      |   0
 .../FDVM/OLDsrc/OLDsrc.vcxproj.filters              |   0
 .../FDVM/Parser/Parser.vcxproj                      |   0
 .../FDVM/Parser/Parser.vcxproj.filters              |   0
 .../FDVM/SageLib++/SageLib++.vcxproj                |   0
 .../FDVM/SageLib++/SageLib++.vcxproj.filters        |   0
 .../FDVM/inlineExp/inlineExp.vcxproj                |   0
 .../FDVM/inlineExp/inlineExp.vcxproj.filters        |   0
 .../dvm/fdvm/trunk/acrossDebugging/across.cpp       |   0
 .../dvm/fdvm/trunk/examples/gausf.fdv               |   0
 .../dvm/fdvm/trunk/examples/gausgb.fdv              |   0
 .../dvm/fdvm/trunk/examples/gaush.hpf               |   0
 .../dvm/fdvm/trunk/examples/gauswh.fdv              |   0
 .../dvm/fdvm/trunk/examples/jac.fdv                 |   0
 .../dvm/fdvm/trunk/examples/jacas.fdv               |   0
 .../dvm/fdvm/trunk/examples/jach.hpf                |   0
 .../dvm/fdvm/trunk/examples/redbf.fdv               |   0
 .../dvm/fdvm/trunk/examples/redbh.hpf               |   0
 .../dvm/fdvm/trunk/examples/sor.fdv                 |   0
 .../dvm/fdvm/trunk/examples/task2j.fdv              |   0
 .../dvm/fdvm/trunk/examples/tasks.fdv               |   0
 .../dvm/fdvm/trunk/examples/taskst.fdv              |   0
 .../dvm/fdvm/trunk/fdvm/CMakeLists.txt              |   0
 .../dvm/fdvm/trunk/fdvm/Makefile                    |   0
 .../dvm/fdvm/trunk/fdvm/acc.cpp                     |   0
 .../dvm/fdvm/trunk/fdvm/acc_across.cpp              |   0
 .../dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp     |   0
 .../dvm/fdvm/trunk/fdvm/acc_analyzer.cpp            |   0
 .../dvm/fdvm/trunk/fdvm/acc_data.cpp                |   0
 .../dvm/fdvm/trunk/fdvm/acc_f2c.cpp                 |   0
 .../dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp        |   0
 .../dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp      |   0
 .../dvm/fdvm/trunk/fdvm/acc_rtc.cpp                 |   0
 .../dvm/fdvm/trunk/fdvm/acc_unused_code.cpp         |   0
 .../dvm/fdvm/trunk/fdvm/acc_utilities.cpp           |   0
 .../dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp        |   0
 .../dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp       |   0
 .../dvm/fdvm/trunk/fdvm/aks_structs.cpp             |   0
 .../dvm/fdvm/trunk/fdvm/calls.cpp                   |   0
 .../dvm/fdvm/trunk/fdvm/checkpoint.cpp              |   0
 .../dvm/fdvm/trunk/fdvm/debug.cpp                   |   0
 .../dvm/fdvm/trunk/fdvm/dvm.cpp                     |   0
 .../dvm/fdvm/trunk/fdvm/funcall.cpp                 |   0
 .../dvm/fdvm/trunk/fdvm/help.cpp                    |   0
 .../dvm/fdvm/trunk/fdvm/hpf.cpp                     |   0
 .../dvm/fdvm/trunk/fdvm/io.cpp                      |   0
 .../dvm/fdvm/trunk/fdvm/makefile.uni                |   0
 .../dvm/fdvm/trunk/fdvm/makefile.win                |   0
 .../dvm/fdvm/trunk/fdvm/omp.cpp                     |   0
 .../dvm/fdvm/trunk/fdvm/ompdebug.cpp                |   0
 .../dvm/fdvm/trunk/fdvm/parloop.cpp                 |   0
 .../dvm/fdvm/trunk/fdvm/stmt.cpp                    |   0
 .../dvm/fdvm/trunk/include/acc_across_analyzer.h    |   0
 .../dvm/fdvm/trunk/include/acc_analyzer.h           |   0
 .../dvm/fdvm/trunk/include/acc_data.h               |   0
 .../dvm/fdvm/trunk/include/aks_loopStructure.h      |   0
 .../dvm/fdvm/trunk/include/aks_structs.h            |   0
 .../dvm/fdvm/trunk/include/calls.h                  |   0
 .../dvm/fdvm/trunk/include/dvm.h                    |   0
 .../dvm/fdvm/trunk/include/dvm_tag.h                |   0
 .../dvm/fdvm/trunk/include/extern.h                 |   0
 .../dvm/fdvm/trunk/include/fdvm.h                   |   0
 .../dvm/fdvm/trunk/include/fdvm_version.h           |   0
 .../dvm/fdvm/trunk/include/inc.h                    |   0
 .../dvm/fdvm/trunk/include/leak_detector.h          |   0
 .../dvm/fdvm/trunk/include/libSageOMP.h             |   0
 .../dvm/fdvm/trunk/include/libdvm.h                 |   0
 .../dvm/fdvm/trunk/include/libnum.h                 |   0
 .../dvm/fdvm/trunk/include/unparse.hpf              |   0
 .../dvm/fdvm/trunk/include/unparse1.hpf             |   0
 .../dvm/fdvm/trunk/include/user.h                   |   0
 .../dvm/fdvm/trunk/makefile.uni                     |   0
 .../dvm/fdvm/trunk/makefile.win                     |   0
 .../dvm/fdvm/trunk/parser/CMakeLists.txt            |   0
 .../dvm/fdvm/trunk/parser/Makefile                  |   0
 .../dvm/fdvm/trunk/parser/cftn.c                    |   0
 .../dvm/fdvm/trunk/parser/errors.c                  |   0
 .../dvm/fdvm/trunk/parser/facc.gram                 |   0
 .../dvm/fdvm/trunk/parser/fdvm.gram                 |   0
 .../dvm/fdvm/trunk/parser/fomp.gram                 |   0
 .../dvm/fdvm/trunk/parser/fspf.gram                 |   0
 .../dvm/fdvm/trunk/parser/ftn.gram                  |   0
 .../dvm/fdvm/trunk/parser/gram1.tab.c               |   0
 .../dvm/fdvm/trunk/parser/gram1.tab.h               |   0
 .../dvm/fdvm/trunk/parser/gram1.y                   |   0
 .../dvm/fdvm/trunk/parser/hash.c                    |   0
 .../dvm/fdvm/trunk/parser/head                      |   0
 .../dvm/fdvm/trunk/parser/init.c                    |   0
 .../dvm/fdvm/trunk/parser/lexfdvm.c                 |   0
 .../dvm/fdvm/trunk/parser/lists.c                   |   0
 .../dvm/fdvm/trunk/parser/low_hpf.c                 |   0
 .../dvm/fdvm/trunk/parser/makefile.uni              |   0
 .../dvm/fdvm/trunk/parser/makefile.win              |   0
 .../dvm/fdvm/trunk/parser/misc.c                    |   0
 .../dvm/fdvm/trunk/parser/stat.c                    |   0
 .../dvm/fdvm/trunk/parser/sym.c                     |   0
 .../projects => projects}/dvm/fdvm/trunk/parser/tag |   0
 .../dvm/fdvm/trunk/parser/tag.h                     |   0
 .../dvm/fdvm/trunk/parser/tokdefs.h                 |   0
 .../dvm/fdvm/trunk/parser/tokens                    |   0
 .../dvm/fdvm/trunk/parser/types.c                   |   0
 .../dvm/fdvm/trunk/parser/unparse_hpf.c             |   0
 .../dvm/fdvm/trunk/sageExample/SwapFors.cpp         |   0
 .../dvm/fdvm/trunk/sageExample/makefile.uni         |   0
 .../dvm/fdvm/trunk/sageExample/makefile.win         |   0
 .../dvm/tools/Zlib/CMakeLists.txt                   |   0
 .../dvm/tools/Zlib/include/deflate.h                |   0
 .../dvm/tools/Zlib/include/infblock.h               |   0
 .../dvm/tools/Zlib/include/infcodes.h               |   0
 .../dvm/tools/Zlib/include/inffast.h                |   0
 .../dvm/tools/Zlib/include/inffixed.h               |   0
 .../dvm/tools/Zlib/include/inftrees.h               |   0
 .../dvm/tools/Zlib/include/infutil.h                |   0
 .../dvm/tools/Zlib/include/trees.h                  |   0
 .../dvm/tools/Zlib/include/zconf.h                  |   0
 .../dvm/tools/Zlib/include/zlib.h                   |   0
 .../dvm/tools/Zlib/include/zutil.h                  |   0
 .../dvm/tools/Zlib/makefile.uni                     |   0
 .../dvm/tools/Zlib/makefile.win                     |   0
 .../dvm/tools/Zlib/src/CMakeLists.txt               |   0
 .../dvm/tools/Zlib/src/adler32.c                    |   0
 .../dvm/tools/Zlib/src/compress.c                   |   0
 .../dvm/tools/Zlib/src/crc32.c                      |   0
 .../dvm/tools/Zlib/src/deflate.c                    |   0
 .../dvm/tools/Zlib/src/example.c                    |   0
 .../projects => projects}/dvm/tools/Zlib/src/gzio.c |   0
 .../dvm/tools/Zlib/src/infblock.c                   |   0
 .../dvm/tools/Zlib/src/infcodes.c                   |   0
 .../dvm/tools/Zlib/src/inffast.c                    |   0
 .../dvm/tools/Zlib/src/inflate.c                    |   0
 .../dvm/tools/Zlib/src/inftrees.c                   |   0
 .../dvm/tools/Zlib/src/infutil.c                    |   0
 .../dvm/tools/Zlib/src/maketree.c                   |   0
 .../dvm/tools/Zlib/src/minigzip.c                   |   0
 .../dvm/tools/Zlib/src/trees.c                      |   0
 .../dvm/tools/Zlib/src/uncompr.c                    |   0
 .../dvm/tools/Zlib/src/zutil.c                      |   0
 .../dvm/tools/pppa/branches/dvm4.07/makefile.uni    |   0
 .../dvm/tools/pppa/branches/dvm4.07/makefile.win    |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/bool.h      |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h   |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/inter.cpp   |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/inter.h     |   0
 .../tools/pppa/branches/dvm4.07/src/makefile.uni    |   0
 .../tools/pppa/branches/dvm4.07/src/makefile.win    |   0
 .../tools/pppa/branches/dvm4.07/src/potensyn.cpp    |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/potensyn.h  |   0
 .../tools/pppa/branches/dvm4.07/src/statfile.cpp    |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/statist.h   |   0
 .../tools/pppa/branches/dvm4.07/src/statprintf.cpp  |   0
 .../tools/pppa/branches/dvm4.07/src/statprintf.h    |   0
 .../tools/pppa/branches/dvm4.07/src/statread.cpp    |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/statread.h  |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/strall.h    |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/sysstat.h   |   0
 .../tools/pppa/branches/dvm4.07/src/treeinter.cpp   |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/treeinter.h |   0
 .../dvm/tools/pppa/branches/dvm4.07/src/ver.h       |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h   |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h  |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h  |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h   |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h  |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h  |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h   |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h  |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile    |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1  |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c   |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c  |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c     |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c   |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c   |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c      |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c  |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c  |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c   |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c   |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c  |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c   |   0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni    |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c  |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c  |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c     |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c   |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c     |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak        |   0
 .../dvm/tools/pppa/stuff/Zlib_1.1.3/readme          |   0
 .../dvm/tools/pppa/trunk/CMakeLists.txt             |   0
 .../dvm/tools/pppa/trunk/makefile.uni               |   0
 .../dvm/tools/pppa/trunk/makefile.win               |   0
 .../dvm/tools/pppa/trunk/src/CMakeLists.txt         |   0
 .../dvm/tools/pppa/trunk/src/LibraryImport.cpp      |   0
 .../dvm/tools/pppa/trunk/src/LibraryImport.h        |   0
 .../dvm/tools/pppa/trunk/src/PPPA/PPPA.sln          |   0
 .../dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj |   0
 .../pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters   |   0
 .../dvm/tools/pppa/trunk/src/bool.h                 |   0
 .../dvm/tools/pppa/trunk/src/dvmh_stat.h            |   0
 .../dvm/tools/pppa/trunk/src/dvmvers.h.in           |   0
 .../dvm/tools/pppa/trunk/src/inter.cpp              |   0
 .../dvm/tools/pppa/trunk/src/inter.h                |   0
 .../dvm/tools/pppa/trunk/src/json.hpp               |   0
 .../dvm/tools/pppa/trunk/src/makefile.uni           |   0
 .../dvm/tools/pppa/trunk/src/makefile.win           |   0
 .../dvm/tools/pppa/trunk/src/makefileJnilib         |   0
 .../dvm/tools/pppa/trunk/src/potensyn.cpp           |   0
 .../dvm/tools/pppa/trunk/src/potensyn.h             |   0
 .../dvm/tools/pppa/trunk/src/stat.cpp               |   0
 .../dvm/tools/pppa/trunk/src/statfile.cpp           |   0
 .../dvm/tools/pppa/trunk/src/statinter.cpp          |   0
 .../dvm/tools/pppa/trunk/src/statinter.h            |   0
 .../dvm/tools/pppa/trunk/src/statist.h              |   0
 .../dvm/tools/pppa/trunk/src/statlist.cpp           |   0
 .../dvm/tools/pppa/trunk/src/statlist.h             |   0
 .../dvm/tools/pppa/trunk/src/statprintf.cpp         |   0
 .../dvm/tools/pppa/trunk/src/statprintf.h           |   0
 .../dvm/tools/pppa/trunk/src/statread.cpp           |   0
 .../dvm/tools/pppa/trunk/src/statread.h             |   0
 .../dvm/tools/pppa/trunk/src/strall.h               |   0
 .../dvm/tools/pppa/trunk/src/sysstat.h              |   0
 .../dvm/tools/pppa/trunk/src/treeinter.cpp          |   0
 .../dvm/tools/pppa/trunk/src/treeinter.h            |   0
 .../dvm/tools/pppa/trunk/src/ver.h                  |   0
 {Sapfor/projects => projects}/paths.default.txt     |   0
 {Sapfor/src => src}/CFGraph/CFGraph.cpp             |   0
 {Sapfor/src => src}/CFGraph/CFGraph.h               |   0
 .../CFGraph/DataFlow/backward_data_flow.h           |   0
 .../CFGraph/DataFlow/backward_data_flow_impl.h      |   0
 {Sapfor/src => src}/CFGraph/DataFlow/data_flow.h    |   0
 .../src => src}/CFGraph/DataFlow/data_flow_impl.h   |   0
 {Sapfor/src => src}/CFGraph/IR.cpp                  |   0
 {Sapfor/src => src}/CFGraph/IR.h                    |   0
 {Sapfor/src => src}/CFGraph/RD_subst.cpp            |   0
 {Sapfor/src => src}/CFGraph/RD_subst.h              |   0
 .../src => src}/CFGraph/live_variable_analysis.cpp  |   0
 .../src => src}/CFGraph/live_variable_analysis.h    |   0
 .../CFGraph/private_variables_analysis.cpp          |   0
 .../CFGraph/private_variables_analysis.h            |   0
 .../src => src}/CreateInterTree/CreateInterTree.cpp |   0
 .../src => src}/CreateInterTree/CreateInterTree.h   |   0
 .../DirectiveProcessing/directive_analyzer.cpp      |   0
 .../DirectiveProcessing/directive_analyzer.h        |   0
 .../DirectiveProcessing/directive_creator.cpp       |   0
 .../DirectiveProcessing/directive_creator.h         |   0
 .../DirectiveProcessing/directive_creator_base.cpp  |   0
 .../DirectiveProcessing/directive_omp_parser.cpp    |   0
 .../DirectiveProcessing/directive_omp_parser.h      |   0
 .../DirectiveProcessing/directive_parser.cpp        |   0
 .../DirectiveProcessing/directive_parser.h          |   0
 .../DirectiveProcessing/insert_directive.cpp        |   0
 .../DirectiveProcessing/insert_directive.h          |   0
 .../DirectiveProcessing/remote_access.cpp           |   0
 .../src => src}/DirectiveProcessing/remote_access.h |   0
 .../DirectiveProcessing/remote_access_base.cpp      |   0
 {Sapfor/src => src}/DirectiveProcessing/shadow.cpp  |   0
 {Sapfor/src => src}/DirectiveProcessing/shadow.h    |   0
 .../DirectiveProcessing/spf_directive_preproc.cpp   |   0
 {Sapfor/src => src}/Distribution/Array.cpp          |   0
 {Sapfor/src => src}/Distribution/Array.h            |   0
 {Sapfor/src => src}/Distribution/ArrayAnalysis.cpp  |   0
 {Sapfor/src => src}/Distribution/Arrays.h           |   0
 .../Distribution/CreateDistributionDirs.cpp         |   0
 .../Distribution/CreateDistributionDirs.h           |   0
 {Sapfor/src => src}/Distribution/Cycle.cpp          |   0
 {Sapfor/src => src}/Distribution/Cycle.h            |   0
 {Sapfor/src => src}/Distribution/Distribution.cpp   |   0
 {Sapfor/src => src}/Distribution/Distribution.h     |   0
 {Sapfor/src => src}/Distribution/DvmhDirective.cpp  |   0
 {Sapfor/src => src}/Distribution/DvmhDirective.h    |   0
 .../src => src}/Distribution/DvmhDirectiveBase.cpp  |   0
 .../src => src}/Distribution/DvmhDirectiveBase.h    |   0
 .../src => src}/Distribution/DvmhDirective_func.h   |   0
 {Sapfor/src => src}/Distribution/GraphCSR.cpp       |   0
 {Sapfor/src => src}/Distribution/GraphCSR.h         |   0
 {Sapfor/src => src}/DvmhRegions/DvmhRegion.cpp      |   0
 {Sapfor/src => src}/DvmhRegions/DvmhRegion.h        |   0
 .../src => src}/DvmhRegions/DvmhRegionInserter.cpp  |   0
 .../src => src}/DvmhRegions/DvmhRegionInserter.h    |   0
 {Sapfor/src => src}/DvmhRegions/LoopChecker.cpp     |   0
 {Sapfor/src => src}/DvmhRegions/LoopChecker.h       |   0
 .../src => src}/DvmhRegions/ReadWriteAnalyzer.cpp   |   0
 {Sapfor/src => src}/DvmhRegions/ReadWriteAnalyzer.h |   0
 {Sapfor/src => src}/DvmhRegions/RegionsMerger.cpp   |   0
 {Sapfor/src => src}/DvmhRegions/RegionsMerger.h     |   0
 {Sapfor/src => src}/DvmhRegions/TypedSymbol.cpp     |   0
 {Sapfor/src => src}/DvmhRegions/TypedSymbol.h       |   0
 {Sapfor/src => src}/DvmhRegions/VarUsages.cpp       |   0
 {Sapfor/src => src}/DvmhRegions/VarUsages.h         |   0
 .../DynamicAnalysis/createParallelRegions.cpp       |   0
 .../DynamicAnalysis/createParallelRegions.h         |   0
 {Sapfor/src => src}/DynamicAnalysis/gCov_parser.cpp |   0
 .../src => src}/DynamicAnalysis/gCov_parser_func.h  |   0
 {Sapfor/src => src}/DynamicAnalysis/gcov_info.cpp   |   0
 {Sapfor/src => src}/DynamicAnalysis/gcov_info.h     |   0
 .../ExpressionTransform/control_flow_graph_part.cpp |   0
 .../ExpressionTransform/expr_transform.cpp          |   0
 .../ExpressionTransform/expr_transform.h            |   0
 {Sapfor/src => src}/GraphCall/graph_calls.cpp       |   0
 {Sapfor/src => src}/GraphCall/graph_calls.h         |   0
 {Sapfor/src => src}/GraphCall/graph_calls_base.cpp  |   0
 {Sapfor/src => src}/GraphCall/graph_calls_func.h    |   0
 {Sapfor/src => src}/GraphLoop/graph_loops.cpp       |   0
 {Sapfor/src => src}/GraphLoop/graph_loops.h         |   0
 {Sapfor/src => src}/GraphLoop/graph_loops_base.cpp  |   0
 {Sapfor/src => src}/GraphLoop/graph_loops_func.h    |   0
 {Sapfor/src => src}/Inliner/inliner.cpp             |   0
 {Sapfor/src => src}/Inliner/inliner.h               |   0
 .../src => src}/LoopAnalyzer/allocations_prepoc.cpp |   0
 {Sapfor/src => src}/LoopAnalyzer/dep_analyzer.cpp   |   0
 {Sapfor/src => src}/LoopAnalyzer/loop_analyzer.cpp  |   0
 {Sapfor/src => src}/LoopAnalyzer/loop_analyzer.h    |   0
 .../ParallelizationRegions/ParRegions.cpp           |   0
 .../src => src}/ParallelizationRegions/ParRegions.h |   0
 .../ParallelizationRegions/ParRegions_func.h        |   0
 .../ParallelizationRegions/expand_extract_reg.cpp   |   0
 .../ParallelizationRegions/expand_extract_reg.h     |   0
 .../resolve_par_reg_conflicts.cpp                   |   0
 .../resolve_par_reg_conflicts.h                     |   0
 {Sapfor/src => src}/Predictor/Lib/AMView.cpp        |   0
 {Sapfor/src => src}/Predictor/Lib/AMView.h          |   0
 {Sapfor/src => src}/Predictor/Lib/AlignAxis.cpp     |   0
 {Sapfor/src => src}/Predictor/Lib/AlignAxis.h       |   0
 {Sapfor/src => src}/Predictor/Lib/BGroup.cpp        |   0
 {Sapfor/src => src}/Predictor/Lib/BGroup.h          |   0
 {Sapfor/src => src}/Predictor/Lib/Block.cpp         |   0
 {Sapfor/src => src}/Predictor/Lib/Block.h           |   0
 {Sapfor/src => src}/Predictor/Lib/CallInfoStructs.h |   0
 {Sapfor/src => src}/Predictor/Lib/CallParams.cpp    |   0
 {Sapfor/src => src}/Predictor/Lib/CommCost.cpp      |   0
 {Sapfor/src => src}/Predictor/Lib/CommCost.h        |   0
 {Sapfor/src => src}/Predictor/Lib/DArray.cpp        |   0
 {Sapfor/src => src}/Predictor/Lib/DArray.h          |   0
 {Sapfor/src => src}/Predictor/Lib/DimBound.cpp      |   0
 {Sapfor/src => src}/Predictor/Lib/DimBound.h        |   0
 {Sapfor/src => src}/Predictor/Lib/DistAxis.cpp      |   0
 {Sapfor/src => src}/Predictor/Lib/DistAxis.h        |   0
 {Sapfor/src => src}/Predictor/Lib/Event.cpp         |   0
 {Sapfor/src => src}/Predictor/Lib/Event.h           |   0
 {Sapfor/src => src}/Predictor/Lib/FuncCall.cpp      |   0
 {Sapfor/src => src}/Predictor/Lib/FuncCall.h        |   0
 {Sapfor/src => src}/Predictor/Lib/Interval.cpp      |   0
 {Sapfor/src => src}/Predictor/Lib/Interval.h        |   0
 .../src => src}/Predictor/Lib/IntervalTemplate.cpp  |   0
 {Sapfor/src => src}/Predictor/Lib/LoopBlock.cpp     |   0
 {Sapfor/src => src}/Predictor/Lib/LoopBlock.h       |   0
 {Sapfor/src => src}/Predictor/Lib/LoopLS.cpp        |   0
 {Sapfor/src => src}/Predictor/Lib/LoopLS.h          |   0
 {Sapfor/src => src}/Predictor/Lib/Ls.cpp            |   0
 {Sapfor/src => src}/Predictor/Lib/Ls.h              |   0
 {Sapfor/src => src}/Predictor/Lib/ModelDArray.cpp   |   0
 {Sapfor/src => src}/Predictor/Lib/ModelIO.cpp       |   0
 {Sapfor/src => src}/Predictor/Lib/ModelInterval.cpp |   0
 {Sapfor/src => src}/Predictor/Lib/ModelMPS_AM.cpp   |   0
 {Sapfor/src => src}/Predictor/Lib/ModelParLoop.cpp  |   0
 {Sapfor/src => src}/Predictor/Lib/ModelReduct.cpp   |   0
 {Sapfor/src => src}/Predictor/Lib/ModelRegular.cpp  |   0
 .../src => src}/Predictor/Lib/ModelRemAccess.cpp    |   0
 {Sapfor/src => src}/Predictor/Lib/ModelShadow.cpp   |   0
 {Sapfor/src => src}/Predictor/Lib/ModelStructs.h    |   0
 {Sapfor/src => src}/Predictor/Lib/ParLoop.cpp       |   0
 {Sapfor/src => src}/Predictor/Lib/ParLoop.h         |   0
 {Sapfor/src => src}/Predictor/Lib/ParseString.cpp   |   0
 {Sapfor/src => src}/Predictor/Lib/ParseString.h     |   0
 {Sapfor/src => src}/Predictor/Lib/Processor.cpp     |   0
 {Sapfor/src => src}/Predictor/Lib/Processor.h       |   0
 {Sapfor/src => src}/Predictor/Lib/Ps.cpp            |   0
 {Sapfor/src => src}/Predictor/Lib/Ps.h              |   0
 {Sapfor/src => src}/Predictor/Lib/RedGroup.cpp      |   0
 {Sapfor/src => src}/Predictor/Lib/RedGroup.h        |   0
 {Sapfor/src => src}/Predictor/Lib/RedVar.cpp        |   0
 {Sapfor/src => src}/Predictor/Lib/RedVar.h          |   0
 {Sapfor/src => src}/Predictor/Lib/RemAccessBuf.cpp  |   0
 {Sapfor/src => src}/Predictor/Lib/RemAccessBuf.h    |   0
 {Sapfor/src => src}/Predictor/Lib/Space.cpp         |   0
 {Sapfor/src => src}/Predictor/Lib/Space.h           |   0
 {Sapfor/src => src}/Predictor/Lib/StdAfx.h          |   0
 {Sapfor/src => src}/Predictor/Lib/TraceLine.cpp     |   0
 {Sapfor/src => src}/Predictor/Lib/TraceLine.h       |   0
 {Sapfor/src => src}/Predictor/Lib/Ver.h             |   0
 {Sapfor/src => src}/Predictor/Lib/Vm.cpp            |   0
 {Sapfor/src => src}/Predictor/Lib/Vm.h              |   0
 {Sapfor/src => src}/Predictor/Lib/adler32.c         |   0
 {Sapfor/src => src}/Predictor/Lib/compress.c        |   0
 {Sapfor/src => src}/Predictor/Lib/crc32.c           |   0
 {Sapfor/src => src}/Predictor/Lib/deflate.c         |   0
 {Sapfor/src => src}/Predictor/Lib/deflate.h         |   0
 {Sapfor/src => src}/Predictor/Lib/gzio.c            |   0
 {Sapfor/src => src}/Predictor/Lib/infblock.c        |   0
 {Sapfor/src => src}/Predictor/Lib/infblock.h        |   0
 {Sapfor/src => src}/Predictor/Lib/infcodes.c        |   0
 {Sapfor/src => src}/Predictor/Lib/infcodes.h        |   0
 {Sapfor/src => src}/Predictor/Lib/inffast.c         |   0
 {Sapfor/src => src}/Predictor/Lib/inffast.h         |   0
 {Sapfor/src => src}/Predictor/Lib/inffixed.h        |   0
 {Sapfor/src => src}/Predictor/Lib/inflate.c         |   0
 {Sapfor/src => src}/Predictor/Lib/inftrees.c        |   0
 {Sapfor/src => src}/Predictor/Lib/inftrees.h        |   0
 {Sapfor/src => src}/Predictor/Lib/infutil.c         |   0
 {Sapfor/src => src}/Predictor/Lib/infutil.h         |   0
 {Sapfor/src => src}/Predictor/Lib/intersection.cpp  |   0
 {Sapfor/src => src}/Predictor/Lib/predictor.cpp     |   0
 {Sapfor/src => src}/Predictor/Lib/trees.c           |   0
 {Sapfor/src => src}/Predictor/Lib/trees.h           |   0
 {Sapfor/src => src}/Predictor/Lib/uncompr.c         |   0
 {Sapfor/src => src}/Predictor/Lib/zconf.h           |   0
 {Sapfor/src => src}/Predictor/Lib/zlib.h            |   0
 {Sapfor/src => src}/Predictor/Lib/zutil.c           |   0
 {Sapfor/src => src}/Predictor/Lib/zutil.h           |   0
 {Sapfor/src => src}/Predictor/PredictScheme.cpp     |   0
 {Sapfor/src => src}/Predictor/PredictScheme.h       |   0
 {Sapfor/src => src}/Predictor/PredictorInterface.h  |   0
 {Sapfor/src => src}/Predictor/PredictorModel.cpp    |   0
 {Sapfor/src => src}/Predictor/PredictorModel.h      |   0
 .../PrivateAnalyzer/private_analyzer.cpp            |   0
 .../src => src}/PrivateAnalyzer/private_analyzer.h  |   0
 .../ProjectManipulation/ConvertFiles.cpp            |   0
 .../src => src}/ProjectManipulation/ConvertFiles.h  |   0
 .../src => src}/ProjectManipulation/FileInfo.cpp    |   0
 {Sapfor/src => src}/ProjectManipulation/FileInfo.h  |   0
 .../src => src}/ProjectManipulation/ParseFiles.cpp  |   0
 .../src => src}/ProjectManipulation/ParseFiles.h    |   0
 .../ProjectManipulation/PerfAnalyzer.cpp            |   0
 .../src => src}/ProjectManipulation/PerfAnalyzer.h  |   0
 .../src => src}/ProjectManipulation/StdCapture.h    |   0
 .../ProjectParameters/projectParameters.cpp         |   0
 .../ProjectParameters/projectParameters.h           |   0
 .../src => src}/RenameSymbols/rename_symbols.cpp    |   0
 {Sapfor/src => src}/RenameSymbols/rename_symbols.h  |   0
 {Sapfor/src => src}/SageAnalysisTool/Makefile       |   0
 .../SageAnalysisTool/OmegaForSage/Makefile          |   0
 .../SageAnalysisTool/OmegaForSage/README            |   0
 .../SageAnalysisTool/OmegaForSage/add-assert.cpp    |   0
 .../SageAnalysisTool/OmegaForSage/affine.cpp        |   0
 .../SageAnalysisTool/OmegaForSage/cover.cpp         |   0
 .../SageAnalysisTool/OmegaForSage/ddomega-build.cpp |   0
 .../SageAnalysisTool/OmegaForSage/ddomega-use.cpp   |   0
 .../SageAnalysisTool/OmegaForSage/ddomega.cpp       |   0
 .../SageAnalysisTool/OmegaForSage/debug.cpp         |   0
 .../SageAnalysisTool/OmegaForSage/include/Exit.h    |   0
 .../OmegaForSage/include/add-assert.h               |   0
 .../SageAnalysisTool/OmegaForSage/include/affine.h  |   0
 .../SageAnalysisTool/OmegaForSage/include/cover.h   |   0
 .../SageAnalysisTool/OmegaForSage/include/dddir.h   |   0
 .../OmegaForSage/include/ddomega-build.h            |   0
 .../OmegaForSage/include/ddomega-use.h              |   0
 .../SageAnalysisTool/OmegaForSage/include/ddomega.h |   0
 .../SageAnalysisTool/OmegaForSage/include/debug.h   |   0
 .../SageAnalysisTool/OmegaForSage/include/flags.h   |   0
 .../SageAnalysisTool/OmegaForSage/include/ip.h      |   0
 .../SageAnalysisTool/OmegaForSage/include/kill.h    |   0
 .../OmegaForSage/include/lang-interf.generic        |   0
 .../OmegaForSage/include/lang-interf.h              |   0
 .../SageAnalysisTool/OmegaForSage/include/missing.h |   0
 .../OmegaForSage/include/omega2flags.h              |   0
 .../OmegaForSage/include/portable.h                 |   0
 .../OmegaForSage/include/portable.h.origine         |   0
 .../SageAnalysisTool/OmegaForSage/include/range.h   |   0
 .../SageAnalysisTool/OmegaForSage/include/refine.h  |   0
 .../SageAnalysisTool/OmegaForSage/include/screen.h  |   0
 .../OmegaForSage/include/timeTrials.h               |   0
 .../SageAnalysisTool/OmegaForSage/ip.cpp            |   0
 .../SageAnalysisTool/OmegaForSage/kill.cpp          |   0
 .../SageAnalysisTool/OmegaForSage/refine.cpp        |   0
 .../SageAnalysisTool/OmegaForSage/sagedriver.cpp    |   0
 {Sapfor/src => src}/SageAnalysisTool/README         |   0
 .../SageAnalysisTool/annotationDriver.cpp           |   0
 .../src => src}/SageAnalysisTool/annotationDriver.h |   0
 {Sapfor/src => src}/SageAnalysisTool/arrayRef.cpp   |   0
 {Sapfor/src => src}/SageAnalysisTool/arrayRef.h     |   0
 .../SageAnalysisTool/computeInducVar.cpp            |   0
 .../src => src}/SageAnalysisTool/constanteProp.cpp  |   0
 {Sapfor/src => src}/SageAnalysisTool/constanteSet.h |   0
 .../src => src}/SageAnalysisTool/controlFlow.cpp    |   0
 {Sapfor/src => src}/SageAnalysisTool/defUse.cpp     |   0
 .../src => src}/SageAnalysisTool/definesValues.h    |   0
 .../src => src}/SageAnalysisTool/definitionSet.h    |   0
 {Sapfor/src => src}/SageAnalysisTool/depGraph.cpp   |   0
 {Sapfor/src => src}/SageAnalysisTool/depGraph.h     |   0
 .../src => src}/SageAnalysisTool/depInterface.cpp   |   0
 {Sapfor/src => src}/SageAnalysisTool/depInterface.h |   0
 .../src => src}/SageAnalysisTool/depInterfaceExt.h  |   0
 {Sapfor/src => src}/SageAnalysisTool/dependence.cpp |   0
 {Sapfor/src => src}/SageAnalysisTool/dependence.h   |   0
 .../src => src}/SageAnalysisTool/flowAnalysis.cpp   |   0
 {Sapfor/src => src}/SageAnalysisTool/inducVar.h     |   0
 {Sapfor/src => src}/SageAnalysisTool/intrinsic.cpp  |   0
 {Sapfor/src => src}/SageAnalysisTool/intrinsic.h    |   0
 {Sapfor/src => src}/SageAnalysisTool/invariant.cpp  |   0
 .../src => src}/SageAnalysisTool/loopTransform.cpp  |   0
 .../src => src}/SageAnalysisTool/reductionCode.h    |   0
 {Sapfor/src => src}/SageAnalysisTool/set.cpp        |   0
 {Sapfor/src => src}/SageAnalysisTool/set.h          |   0
 {Sapfor/src => src}/Sapfor.cpp                      |   0
 {Sapfor/src => src}/Sapfor.h                        |   0
 {Sapfor/src => src}/SapforData.h                    |   0
 {Sapfor/src => src}/Server/checkUniq.cpp            |   0
 {Sapfor/src => src}/Server/server.cpp               |   0
 {Sapfor/src => src}/Server/spf_icon.ico             | Bin
 .../Transformations/array_assign_to_loop.cpp        |   0
 .../Transformations/array_assign_to_loop.h          |   0
 {Sapfor/src => src}/Transformations/checkpoints.cpp |   0
 {Sapfor/src => src}/Transformations/checkpoints.h   |   0
 .../src => src}/Transformations/convert_to_c.cpp    |   0
 {Sapfor/src => src}/Transformations/convert_to_c.h  |   0
 {Sapfor/src => src}/Transformations/dead_code.cpp   |   0
 {Sapfor/src => src}/Transformations/dead_code.h     |   0
 .../Transformations/enddo_loop_converter.cpp        |   0
 .../Transformations/enddo_loop_converter.h          |   0
 .../Transformations/fix_common_blocks.cpp           |   0
 .../src => src}/Transformations/fix_common_blocks.h |   0
 .../Transformations/function_purifying.cpp          |   0
 .../Transformations/function_purifying.h            |   0
 .../src => src}/Transformations/loop_transform.cpp  |   0
 .../src => src}/Transformations/loop_transform.h    |   0
 .../src => src}/Transformations/loops_combiner.cpp  |   0
 .../src => src}/Transformations/loops_combiner.h    |   0
 .../src => src}/Transformations/loops_splitter.cpp  |   0
 .../src => src}/Transformations/loops_splitter.h    |   0
 .../src => src}/Transformations/loops_unrolling.cpp |   0
 .../src => src}/Transformations/loops_unrolling.h   |   0
 .../Transformations/private_arrays_resizing.cpp     |   0
 .../Transformations/private_arrays_resizing.h       |   0
 .../Transformations/private_removing.cpp            |   0
 .../src => src}/Transformations/private_removing.h  |   0
 .../Transformations/replace_dist_arrays_in_io.cpp   |   0
 .../Transformations/replace_dist_arrays_in_io.h     |   0
 .../Transformations/set_implicit_none.cpp           |   0
 .../src => src}/Transformations/set_implicit_none.h |   0
 .../src => src}/Transformations/swap_array_dims.cpp |   0
 .../src => src}/Transformations/swap_array_dims.h   |   0
 .../Transformations/uniq_call_chain_dup.cpp         |   0
 .../Transformations/uniq_call_chain_dup.h           |   0
 {Sapfor/src => src}/Utils/AstWrapper.h              |   0
 {Sapfor/src => src}/Utils/BoostStackTrace.cpp       |   0
 {Sapfor/src => src}/Utils/CommonBlock.h             |   0
 {Sapfor/src => src}/Utils/DefUseList.h              |   0
 {Sapfor/src => src}/Utils/PassManager.h             |   0
 {Sapfor/src => src}/Utils/RationalNum.cpp           |   0
 {Sapfor/src => src}/Utils/RationalNum.h             |   0
 {Sapfor/src => src}/Utils/SgUtils.cpp               |   0
 {Sapfor/src => src}/Utils/SgUtils.h                 |   0
 {Sapfor/src => src}/Utils/errors.h                  |   0
 {Sapfor/src => src}/Utils/leak_detector.h           |   0
 {Sapfor/src => src}/Utils/module_utils.cpp          |   0
 {Sapfor/src => src}/Utils/module_utils.h            |   0
 {Sapfor/src => src}/Utils/russian_errors_text.txt   |   0
 {Sapfor/src => src}/Utils/types.h                   |   0
 {Sapfor/src => src}/Utils/utils.cpp                 |   0
 {Sapfor/src => src}/Utils/utils.h                   |   0
 {Sapfor/src => src}/Utils/version.h                 |   0
 .../src => src}/VerificationCode/CorrectVarDecl.cpp |   0
 .../src => src}/VerificationCode/IncludeChecker.cpp |   0
 .../VerificationCode/StructureChecker.cpp           |   0
 .../VerificationCode/VerifySageStructures.cpp       |   0
 .../src => src}/VerificationCode/verifications.h    |   0
 {Sapfor/src => src}/VisualizerCalls/BuildGraph.cpp  |   0
 {Sapfor/src => src}/VisualizerCalls/BuildGraph.h    |   0
 {Sapfor/src => src}/VisualizerCalls/SendMessage.cpp |   0
 {Sapfor/src => src}/VisualizerCalls/SendMessage.h   |   0
 .../src => src}/VisualizerCalls/get_information.cpp |   0
 .../src => src}/VisualizerCalls/get_information.h   |   0
 .../VisualizerCalls/graphLayout/algebra.cpp         |   0
 .../VisualizerCalls/graphLayout/algebra.hpp         |   0
 .../graphLayout/fruchterman_reingold.cpp            |   0
 .../graphLayout/fruchterman_reingold.hpp            |   0
 .../VisualizerCalls/graphLayout/kamada_kawai.cpp    |   0
 .../VisualizerCalls/graphLayout/kamada_kawai.hpp    |   0
 .../VisualizerCalls/graphLayout/layout.cpp          |   0
 .../VisualizerCalls/graphLayout/layout.hpp          |   0
 .../VisualizerCalls/graphLayout/nodesoup.cpp        |   0
 .../VisualizerCalls/graphLayout/nodesoup.hpp        |   0
 {Sapfor/tests => tests}/inliner/alex.f              |   0
 {Sapfor/tests => tests}/inliner/array_sum.f         |   0
 .../inliner/inlineFunctionWithAllocatable.f90       |   0
 {Sapfor/tests => tests}/inliner/sub.f               |   0
 {Sapfor/tests => tests}/inliner/test.f              |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f    |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f    |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f     |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f     |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f     |   0
 .../sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_err1.f     |   0
 .../sapfor/check_args_decl/arg_decl_test_err2.f     |   0
 .../sapfor/check_args_decl/arg_decl_test_err3.f     |   0
 .../sapfor/check_args_decl/arg_decl_test_ok1.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_ok2.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_ok3.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_wr1.f      |   0
 .../sapfor/check_args_decl/arg_decl_test_wr3.f      |   0
 .../sapfor/checkpoint/checkpoint.f90                |   0
 .../sapfor/checkpoint/checkpoint2.f90               |   0
 .../anyArguments_fromLittleToBig.f90                |   0
 .../convert_assign_to_loop/assign_with_sections.f   |   0
 .../sapfor/convert_assign_to_loop/simple_assign.f   |   0
 .../convert_assign_to_loop/two_dimensional_assign.f |   0
 .../convert_expr_to_loop/expr_with_sections.f       |   0
 .../sapfor/convert_expr_to_loop/simple_expr.f       |   0
 .../convert_expr_to_loop/two_dimensional_expr.f     |   0
 .../sapfor/convert_sum_to_loop/simple_sum.f         |   0
 .../sapfor/convert_sum_to_loop/sum_with_sections.f  |   0
 .../convert_sum_to_loop/two_dimensional_sum.f       |   0
 .../sapfor/convert_where_to_loop/simple_where.f     |   0
 .../convert_where_to_loop/two_dimensional_where.f   |   0
 .../convert_where_to_loop/where_with_sections.f     |   0
 .../sapfor/create_nested_loops/program.expected.f90 |   0
 .../sapfor/create_nested_loops/program.f90          |   0
 .../sapfor/create_nested_loops/test.bat             |   0
 .../sapfor/create_nested_loops/test.sh              |   0
 .../fission_and_private_exp/fission_priv_exp.f90    |   0
 .../sapfor/loops_combiner/test_1.for                |   0
 .../sapfor/loops_combiner/test_2.for                |   0
 .../sapfor/loops_combiner/test_3.for                |   0
 .../sapfor/loops_combiner/test_4.for                |   0
 .../sapfor/loops_combiner/test_5.for                |   0
 .../sapfor/merge_regions/array_read_before_write.in |   0
 .../merge_regions/array_read_before_write.out       |   0
 .../sapfor/merge_regions/read_before_read.in        |   0
 .../sapfor/merge_regions/read_before_read.out       |   0
 .../sapfor/merge_regions/read_in_loop_header.in     |   0
 .../sapfor/merge_regions/read_in_loop_header.out    |   0
 .../sapfor/merge_regions/var_modified_in_fun.in     |   0
 .../sapfor/merge_regions/var_modified_in_fun.out    |   0
 .../sapfor/merge_regions/var_read_before_write.in   |   0
 .../sapfor/merge_regions/var_read_before_write.out  |   0
 .../sapfor/merge_regions/write_before_read.in       |   0
 .../sapfor/merge_regions/write_before_read.out      |   0
 .../sapfor/merge_regions/write_before_write.in      |   0
 .../sapfor/merge_regions/write_before_write.out     |   0
 .../tests => tests}/sapfor/parameter/magnit_3d.for  |   0
 {Sapfor/tests => tests}/sapfor/parameter/mycom.for  |   0
 .../tests => tests}/sapfor/parameter/parameter.f90  |   0
 .../tests => tests}/sapfor/private_removing/test.f  |   0
 .../sapfor/private_removing/test_cannot_remove.f    |   0
 .../sapfor/private_removing/test_cascade.f          |   0
 {Sapfor/tests => tests}/sapfor/shrink/error.f       |   0
 {Sapfor/tests => tests}/sapfor/shrink/error2.f      |   0
 {Sapfor/tests => tests}/sapfor/shrink/error3.f      |   0
 {Sapfor/tests => tests}/sapfor/shrink/shrink.f      |   0
 {Sapfor/tests => tests}/sapfor/shrink/shrink2.f     |   0
 {Sapfor/tests => tests}/sapfor/shrink/shrink3.f     |   0
 774 files changed, 0 insertions(+), 0 deletions(-)
 rename Sapfor/CMakeLists.txt => CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/Fdvm/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/Parser/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/SageLib/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/SageNewSrc/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/SageOldSrc/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/Sapc++/Sapc++.sln (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/InlineExpansion/hlp.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/InlineExpansion/inline.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/InlineExpansion/inliner.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/InlineExpansion/intrinsic.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/InlineExpansion/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/InlineExpansion/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/LICENSE (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/Sage++/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/Sage++/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/Sage++/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/bif.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/compatible.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/db.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/db.new.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/defines.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/defs.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/dep.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/dep_str.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/dep_struct.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/elist.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/f90.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/fixcray.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/fm.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/head (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/leak_detector.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/list.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/ll.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/prop.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/sage.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/sagearch.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/sageroot.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/sets.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/symb.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/symblob.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/tag (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/tag.doc (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/tag.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/tag_make (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/version.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/vextern.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/vparse.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/vpc.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/h/window.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/attributes.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/bif_node.def (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/dependence.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_high.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_low.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/libSage++.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/macro.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/sage++user.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/symb.def (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/type.def (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/unparse.def (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/Sage/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/acrossDebugging/across.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/gausf.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/gausgb.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/gaush.hpf (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/gauswh.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/jac.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/jacas.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/jach.hpf (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/redbf.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/redbh.hpf (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/sor.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/task2j.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/tasks.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/examples/taskst.fdv (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_across.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_data.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_f2c.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_rtc.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/acc_utilities.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/aks_structs.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/calls.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/checkpoint.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/debug.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/dvm.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/funcall.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/help.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/hpf.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/io.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/omp.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/ompdebug.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/parloop.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/fdvm/stmt.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/acc_across_analyzer.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/acc_analyzer.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/acc_data.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/aks_loopStructure.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/aks_structs.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/calls.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/dvm.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/dvm_tag.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/extern.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/fdvm.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/fdvm_version.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/inc.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/leak_detector.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/libSageOMP.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/libdvm.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/libnum.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/unparse.hpf (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/unparse1.hpf (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/include/user.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/cftn.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/errors.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/facc.gram (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/fdvm.gram (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/fomp.gram (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/fspf.gram (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/ftn.gram (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/gram1.tab.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/gram1.tab.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/gram1.y (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/hash.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/head (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/init.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/lexfdvm.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/lists.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/low_hpf.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/misc.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/stat.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/sym.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/tag (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/tag.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/tokdefs.h (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/tokens (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/types.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/parser/unparse_hpf.c (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/sageExample/SwapFors.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/sageExample/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/fdvm/trunk/sageExample/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/deflate.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/infblock.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/infcodes.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/inffast.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/inffixed.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/inftrees.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/infutil.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/trees.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/zconf.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/zlib.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/include/zutil.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/adler32.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/compress.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/crc32.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/deflate.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/example.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/gzio.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/infblock.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/infcodes.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/inffast.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/inflate.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/inftrees.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/infutil.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/maketree.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/minigzip.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/trees.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/uncompr.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/Zlib/src/zutil.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/bool.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/inter.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statist.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/statread.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/strall.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/branches/dvm4.07/src/ver.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1 (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/stuff/Zlib_1.1.3/readme (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/CMakeLists.txt (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/LibraryImport.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/LibraryImport.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/bool.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/dvmh_stat.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/dvmvers.h.in (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/inter.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/inter.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/json.hpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/makefile.uni (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/makefile.win (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/makefileJnilib (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/potensyn.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/potensyn.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/stat.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statfile.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statinter.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statinter.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statist.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statlist.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statlist.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statprintf.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statprintf.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statread.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/statread.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/strall.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/sysstat.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/treeinter.cpp (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/treeinter.h (100%)
 rename {Sapfor/projects => projects}/dvm/tools/pppa/trunk/src/ver.h (100%)
 rename {Sapfor/projects => projects}/paths.default.txt (100%)
 rename {Sapfor/src => src}/CFGraph/CFGraph.cpp (100%)
 rename {Sapfor/src => src}/CFGraph/CFGraph.h (100%)
 rename {Sapfor/src => src}/CFGraph/DataFlow/backward_data_flow.h (100%)
 rename {Sapfor/src => src}/CFGraph/DataFlow/backward_data_flow_impl.h (100%)
 rename {Sapfor/src => src}/CFGraph/DataFlow/data_flow.h (100%)
 rename {Sapfor/src => src}/CFGraph/DataFlow/data_flow_impl.h (100%)
 rename {Sapfor/src => src}/CFGraph/IR.cpp (100%)
 rename {Sapfor/src => src}/CFGraph/IR.h (100%)
 rename {Sapfor/src => src}/CFGraph/RD_subst.cpp (100%)
 rename {Sapfor/src => src}/CFGraph/RD_subst.h (100%)
 rename {Sapfor/src => src}/CFGraph/live_variable_analysis.cpp (100%)
 rename {Sapfor/src => src}/CFGraph/live_variable_analysis.h (100%)
 rename {Sapfor/src => src}/CFGraph/private_variables_analysis.cpp (100%)
 rename {Sapfor/src => src}/CFGraph/private_variables_analysis.h (100%)
 rename {Sapfor/src => src}/CreateInterTree/CreateInterTree.cpp (100%)
 rename {Sapfor/src => src}/CreateInterTree/CreateInterTree.h (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/directive_analyzer.cpp (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/directive_analyzer.h (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/directive_creator.cpp (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/directive_creator.h (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/directive_creator_base.cpp (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/directive_omp_parser.cpp (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/directive_omp_parser.h (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/directive_parser.cpp (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/directive_parser.h (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/insert_directive.cpp (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/insert_directive.h (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/remote_access.cpp (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/remote_access.h (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/remote_access_base.cpp (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/shadow.cpp (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/shadow.h (100%)
 rename {Sapfor/src => src}/DirectiveProcessing/spf_directive_preproc.cpp (100%)
 rename {Sapfor/src => src}/Distribution/Array.cpp (100%)
 rename {Sapfor/src => src}/Distribution/Array.h (100%)
 rename {Sapfor/src => src}/Distribution/ArrayAnalysis.cpp (100%)
 rename {Sapfor/src => src}/Distribution/Arrays.h (100%)
 rename {Sapfor/src => src}/Distribution/CreateDistributionDirs.cpp (100%)
 rename {Sapfor/src => src}/Distribution/CreateDistributionDirs.h (100%)
 rename {Sapfor/src => src}/Distribution/Cycle.cpp (100%)
 rename {Sapfor/src => src}/Distribution/Cycle.h (100%)
 rename {Sapfor/src => src}/Distribution/Distribution.cpp (100%)
 rename {Sapfor/src => src}/Distribution/Distribution.h (100%)
 rename {Sapfor/src => src}/Distribution/DvmhDirective.cpp (100%)
 rename {Sapfor/src => src}/Distribution/DvmhDirective.h (100%)
 rename {Sapfor/src => src}/Distribution/DvmhDirectiveBase.cpp (100%)
 rename {Sapfor/src => src}/Distribution/DvmhDirectiveBase.h (100%)
 rename {Sapfor/src => src}/Distribution/DvmhDirective_func.h (100%)
 rename {Sapfor/src => src}/Distribution/GraphCSR.cpp (100%)
 rename {Sapfor/src => src}/Distribution/GraphCSR.h (100%)
 rename {Sapfor/src => src}/DvmhRegions/DvmhRegion.cpp (100%)
 rename {Sapfor/src => src}/DvmhRegions/DvmhRegion.h (100%)
 rename {Sapfor/src => src}/DvmhRegions/DvmhRegionInserter.cpp (100%)
 rename {Sapfor/src => src}/DvmhRegions/DvmhRegionInserter.h (100%)
 rename {Sapfor/src => src}/DvmhRegions/LoopChecker.cpp (100%)
 rename {Sapfor/src => src}/DvmhRegions/LoopChecker.h (100%)
 rename {Sapfor/src => src}/DvmhRegions/ReadWriteAnalyzer.cpp (100%)
 rename {Sapfor/src => src}/DvmhRegions/ReadWriteAnalyzer.h (100%)
 rename {Sapfor/src => src}/DvmhRegions/RegionsMerger.cpp (100%)
 rename {Sapfor/src => src}/DvmhRegions/RegionsMerger.h (100%)
 rename {Sapfor/src => src}/DvmhRegions/TypedSymbol.cpp (100%)
 rename {Sapfor/src => src}/DvmhRegions/TypedSymbol.h (100%)
 rename {Sapfor/src => src}/DvmhRegions/VarUsages.cpp (100%)
 rename {Sapfor/src => src}/DvmhRegions/VarUsages.h (100%)
 rename {Sapfor/src => src}/DynamicAnalysis/createParallelRegions.cpp (100%)
 rename {Sapfor/src => src}/DynamicAnalysis/createParallelRegions.h (100%)
 rename {Sapfor/src => src}/DynamicAnalysis/gCov_parser.cpp (100%)
 rename {Sapfor/src => src}/DynamicAnalysis/gCov_parser_func.h (100%)
 rename {Sapfor/src => src}/DynamicAnalysis/gcov_info.cpp (100%)
 rename {Sapfor/src => src}/DynamicAnalysis/gcov_info.h (100%)
 rename {Sapfor/src => src}/ExpressionTransform/control_flow_graph_part.cpp (100%)
 rename {Sapfor/src => src}/ExpressionTransform/expr_transform.cpp (100%)
 rename {Sapfor/src => src}/ExpressionTransform/expr_transform.h (100%)
 rename {Sapfor/src => src}/GraphCall/graph_calls.cpp (100%)
 rename {Sapfor/src => src}/GraphCall/graph_calls.h (100%)
 rename {Sapfor/src => src}/GraphCall/graph_calls_base.cpp (100%)
 rename {Sapfor/src => src}/GraphCall/graph_calls_func.h (100%)
 rename {Sapfor/src => src}/GraphLoop/graph_loops.cpp (100%)
 rename {Sapfor/src => src}/GraphLoop/graph_loops.h (100%)
 rename {Sapfor/src => src}/GraphLoop/graph_loops_base.cpp (100%)
 rename {Sapfor/src => src}/GraphLoop/graph_loops_func.h (100%)
 rename {Sapfor/src => src}/Inliner/inliner.cpp (100%)
 rename {Sapfor/src => src}/Inliner/inliner.h (100%)
 rename {Sapfor/src => src}/LoopAnalyzer/allocations_prepoc.cpp (100%)
 rename {Sapfor/src => src}/LoopAnalyzer/dep_analyzer.cpp (100%)
 rename {Sapfor/src => src}/LoopAnalyzer/loop_analyzer.cpp (100%)
 rename {Sapfor/src => src}/LoopAnalyzer/loop_analyzer.h (100%)
 rename {Sapfor/src => src}/ParallelizationRegions/ParRegions.cpp (100%)
 rename {Sapfor/src => src}/ParallelizationRegions/ParRegions.h (100%)
 rename {Sapfor/src => src}/ParallelizationRegions/ParRegions_func.h (100%)
 rename {Sapfor/src => src}/ParallelizationRegions/expand_extract_reg.cpp (100%)
 rename {Sapfor/src => src}/ParallelizationRegions/expand_extract_reg.h (100%)
 rename {Sapfor/src => src}/ParallelizationRegions/resolve_par_reg_conflicts.cpp (100%)
 rename {Sapfor/src => src}/ParallelizationRegions/resolve_par_reg_conflicts.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/AMView.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/AMView.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/AlignAxis.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/AlignAxis.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/BGroup.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/BGroup.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Block.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Block.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/CallInfoStructs.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/CallParams.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/CommCost.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/CommCost.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/DArray.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/DArray.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/DimBound.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/DimBound.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/DistAxis.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/DistAxis.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Event.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Event.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/FuncCall.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/FuncCall.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Interval.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Interval.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/IntervalTemplate.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/LoopBlock.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/LoopBlock.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/LoopLS.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/LoopLS.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Ls.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Ls.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelDArray.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelIO.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelInterval.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelMPS_AM.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelParLoop.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelReduct.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelRegular.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelRemAccess.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelShadow.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ModelStructs.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ParLoop.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ParLoop.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ParseString.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/ParseString.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Processor.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Processor.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Ps.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Ps.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/RedGroup.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/RedGroup.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/RedVar.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/RedVar.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/RemAccessBuf.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/RemAccessBuf.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Space.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Space.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/StdAfx.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/TraceLine.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/TraceLine.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Ver.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Vm.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/Vm.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/adler32.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/compress.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/crc32.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/deflate.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/deflate.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/gzio.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/infblock.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/infblock.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/infcodes.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/infcodes.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/inffast.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/inffast.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/inffixed.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/inflate.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/inftrees.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/inftrees.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/infutil.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/infutil.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/intersection.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/predictor.cpp (100%)
 rename {Sapfor/src => src}/Predictor/Lib/trees.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/trees.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/uncompr.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/zconf.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/zlib.h (100%)
 rename {Sapfor/src => src}/Predictor/Lib/zutil.c (100%)
 rename {Sapfor/src => src}/Predictor/Lib/zutil.h (100%)
 rename {Sapfor/src => src}/Predictor/PredictScheme.cpp (100%)
 rename {Sapfor/src => src}/Predictor/PredictScheme.h (100%)
 rename {Sapfor/src => src}/Predictor/PredictorInterface.h (100%)
 rename {Sapfor/src => src}/Predictor/PredictorModel.cpp (100%)
 rename {Sapfor/src => src}/Predictor/PredictorModel.h (100%)
 rename {Sapfor/src => src}/PrivateAnalyzer/private_analyzer.cpp (100%)
 rename {Sapfor/src => src}/PrivateAnalyzer/private_analyzer.h (100%)
 rename {Sapfor/src => src}/ProjectManipulation/ConvertFiles.cpp (100%)
 rename {Sapfor/src => src}/ProjectManipulation/ConvertFiles.h (100%)
 rename {Sapfor/src => src}/ProjectManipulation/FileInfo.cpp (100%)
 rename {Sapfor/src => src}/ProjectManipulation/FileInfo.h (100%)
 rename {Sapfor/src => src}/ProjectManipulation/ParseFiles.cpp (100%)
 rename {Sapfor/src => src}/ProjectManipulation/ParseFiles.h (100%)
 rename {Sapfor/src => src}/ProjectManipulation/PerfAnalyzer.cpp (100%)
 rename {Sapfor/src => src}/ProjectManipulation/PerfAnalyzer.h (100%)
 rename {Sapfor/src => src}/ProjectManipulation/StdCapture.h (100%)
 rename {Sapfor/src => src}/ProjectParameters/projectParameters.cpp (100%)
 rename {Sapfor/src => src}/ProjectParameters/projectParameters.h (100%)
 rename {Sapfor/src => src}/RenameSymbols/rename_symbols.cpp (100%)
 rename {Sapfor/src => src}/RenameSymbols/rename_symbols.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/Makefile (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/Makefile (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/README (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/add-assert.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/affine.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/cover.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/ddomega-build.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/ddomega-use.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/ddomega.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/debug.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/Exit.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/add-assert.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/affine.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/cover.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/dddir.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/ddomega-build.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/ddomega-use.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/ddomega.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/debug.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/flags.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/ip.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/kill.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/lang-interf.generic (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/lang-interf.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/missing.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/omega2flags.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/portable.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/portable.h.origine (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/range.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/refine.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/screen.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/include/timeTrials.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/ip.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/kill.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/refine.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/OmegaForSage/sagedriver.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/README (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/annotationDriver.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/annotationDriver.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/arrayRef.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/arrayRef.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/computeInducVar.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/constanteProp.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/constanteSet.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/controlFlow.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/defUse.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/definesValues.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/definitionSet.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/depGraph.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/depGraph.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/depInterface.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/depInterface.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/depInterfaceExt.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/dependence.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/dependence.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/flowAnalysis.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/inducVar.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/intrinsic.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/intrinsic.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/invariant.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/loopTransform.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/reductionCode.h (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/set.cpp (100%)
 rename {Sapfor/src => src}/SageAnalysisTool/set.h (100%)
 rename {Sapfor/src => src}/Sapfor.cpp (100%)
 rename {Sapfor/src => src}/Sapfor.h (100%)
 rename {Sapfor/src => src}/SapforData.h (100%)
 rename {Sapfor/src => src}/Server/checkUniq.cpp (100%)
 rename {Sapfor/src => src}/Server/server.cpp (100%)
 rename {Sapfor/src => src}/Server/spf_icon.ico (100%)
 rename {Sapfor/src => src}/Transformations/array_assign_to_loop.cpp (100%)
 rename {Sapfor/src => src}/Transformations/array_assign_to_loop.h (100%)
 rename {Sapfor/src => src}/Transformations/checkpoints.cpp (100%)
 rename {Sapfor/src => src}/Transformations/checkpoints.h (100%)
 rename {Sapfor/src => src}/Transformations/convert_to_c.cpp (100%)
 rename {Sapfor/src => src}/Transformations/convert_to_c.h (100%)
 rename {Sapfor/src => src}/Transformations/dead_code.cpp (100%)
 rename {Sapfor/src => src}/Transformations/dead_code.h (100%)
 rename {Sapfor/src => src}/Transformations/enddo_loop_converter.cpp (100%)
 rename {Sapfor/src => src}/Transformations/enddo_loop_converter.h (100%)
 rename {Sapfor/src => src}/Transformations/fix_common_blocks.cpp (100%)
 rename {Sapfor/src => src}/Transformations/fix_common_blocks.h (100%)
 rename {Sapfor/src => src}/Transformations/function_purifying.cpp (100%)
 rename {Sapfor/src => src}/Transformations/function_purifying.h (100%)
 rename {Sapfor/src => src}/Transformations/loop_transform.cpp (100%)
 rename {Sapfor/src => src}/Transformations/loop_transform.h (100%)
 rename {Sapfor/src => src}/Transformations/loops_combiner.cpp (100%)
 rename {Sapfor/src => src}/Transformations/loops_combiner.h (100%)
 rename {Sapfor/src => src}/Transformations/loops_splitter.cpp (100%)
 rename {Sapfor/src => src}/Transformations/loops_splitter.h (100%)
 rename {Sapfor/src => src}/Transformations/loops_unrolling.cpp (100%)
 rename {Sapfor/src => src}/Transformations/loops_unrolling.h (100%)
 rename {Sapfor/src => src}/Transformations/private_arrays_resizing.cpp (100%)
 rename {Sapfor/src => src}/Transformations/private_arrays_resizing.h (100%)
 rename {Sapfor/src => src}/Transformations/private_removing.cpp (100%)
 rename {Sapfor/src => src}/Transformations/private_removing.h (100%)
 rename {Sapfor/src => src}/Transformations/replace_dist_arrays_in_io.cpp (100%)
 rename {Sapfor/src => src}/Transformations/replace_dist_arrays_in_io.h (100%)
 rename {Sapfor/src => src}/Transformations/set_implicit_none.cpp (100%)
 rename {Sapfor/src => src}/Transformations/set_implicit_none.h (100%)
 rename {Sapfor/src => src}/Transformations/swap_array_dims.cpp (100%)
 rename {Sapfor/src => src}/Transformations/swap_array_dims.h (100%)
 rename {Sapfor/src => src}/Transformations/uniq_call_chain_dup.cpp (100%)
 rename {Sapfor/src => src}/Transformations/uniq_call_chain_dup.h (100%)
 rename {Sapfor/src => src}/Utils/AstWrapper.h (100%)
 rename {Sapfor/src => src}/Utils/BoostStackTrace.cpp (100%)
 rename {Sapfor/src => src}/Utils/CommonBlock.h (100%)
 rename {Sapfor/src => src}/Utils/DefUseList.h (100%)
 rename {Sapfor/src => src}/Utils/PassManager.h (100%)
 rename {Sapfor/src => src}/Utils/RationalNum.cpp (100%)
 rename {Sapfor/src => src}/Utils/RationalNum.h (100%)
 rename {Sapfor/src => src}/Utils/SgUtils.cpp (100%)
 rename {Sapfor/src => src}/Utils/SgUtils.h (100%)
 rename {Sapfor/src => src}/Utils/errors.h (100%)
 rename {Sapfor/src => src}/Utils/leak_detector.h (100%)
 rename {Sapfor/src => src}/Utils/module_utils.cpp (100%)
 rename {Sapfor/src => src}/Utils/module_utils.h (100%)
 rename {Sapfor/src => src}/Utils/russian_errors_text.txt (100%)
 rename {Sapfor/src => src}/Utils/types.h (100%)
 rename {Sapfor/src => src}/Utils/utils.cpp (100%)
 rename {Sapfor/src => src}/Utils/utils.h (100%)
 rename {Sapfor/src => src}/Utils/version.h (100%)
 rename {Sapfor/src => src}/VerificationCode/CorrectVarDecl.cpp (100%)
 rename {Sapfor/src => src}/VerificationCode/IncludeChecker.cpp (100%)
 rename {Sapfor/src => src}/VerificationCode/StructureChecker.cpp (100%)
 rename {Sapfor/src => src}/VerificationCode/VerifySageStructures.cpp (100%)
 rename {Sapfor/src => src}/VerificationCode/verifications.h (100%)
 rename {Sapfor/src => src}/VisualizerCalls/BuildGraph.cpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/BuildGraph.h (100%)
 rename {Sapfor/src => src}/VisualizerCalls/SendMessage.cpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/SendMessage.h (100%)
 rename {Sapfor/src => src}/VisualizerCalls/get_information.cpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/get_information.h (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/algebra.cpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/algebra.hpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/fruchterman_reingold.cpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/fruchterman_reingold.hpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/kamada_kawai.cpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/kamada_kawai.hpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/layout.cpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/layout.hpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/nodesoup.cpp (100%)
 rename {Sapfor/src => src}/VisualizerCalls/graphLayout/nodesoup.hpp (100%)
 rename {Sapfor/tests => tests}/inliner/alex.f (100%)
 rename {Sapfor/tests => tests}/inliner/array_sum.f (100%)
 rename {Sapfor/tests => tests}/inliner/inlineFunctionWithAllocatable.f90 (100%)
 rename {Sapfor/tests => tests}/inliner/sub.f (100%)
 rename {Sapfor/tests => tests}/inliner/test.f (100%)
 rename {Sapfor/tests => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f (100%)
 rename {Sapfor/tests => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f (100%)
 rename {Sapfor/tests => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f (100%)
 rename {Sapfor/tests => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f (100%)
 rename {Sapfor/tests => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f (100%)
 rename {Sapfor/tests => tests}/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f (100%)
 rename {Sapfor/tests => tests}/sapfor/check_args_decl/arg_decl_test_err1.f (100%)
 rename {Sapfor/tests => tests}/sapfor/check_args_decl/arg_decl_test_err2.f (100%)
 rename {Sapfor/tests => tests}/sapfor/check_args_decl/arg_decl_test_err3.f (100%)
 rename {Sapfor/tests => tests}/sapfor/check_args_decl/arg_decl_test_ok1.f (100%)
 rename {Sapfor/tests => tests}/sapfor/check_args_decl/arg_decl_test_ok2.f (100%)
 rename {Sapfor/tests => tests}/sapfor/check_args_decl/arg_decl_test_ok3.f (100%)
 rename {Sapfor/tests => tests}/sapfor/check_args_decl/arg_decl_test_wr1.f (100%)
 rename {Sapfor/tests => tests}/sapfor/check_args_decl/arg_decl_test_wr3.f (100%)
 rename {Sapfor/tests => tests}/sapfor/checkpoint/checkpoint.f90 (100%)
 rename {Sapfor/tests => tests}/sapfor/checkpoint/checkpoint2.f90 (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90 (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_assign_to_loop/assign_with_sections.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_assign_to_loop/simple_assign.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_assign_to_loop/two_dimensional_assign.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_expr_to_loop/expr_with_sections.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_expr_to_loop/simple_expr.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_expr_to_loop/two_dimensional_expr.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_sum_to_loop/simple_sum.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_sum_to_loop/sum_with_sections.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_sum_to_loop/two_dimensional_sum.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_where_to_loop/simple_where.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_where_to_loop/two_dimensional_where.f (100%)
 rename {Sapfor/tests => tests}/sapfor/convert_where_to_loop/where_with_sections.f (100%)
 rename {Sapfor/tests => tests}/sapfor/create_nested_loops/program.expected.f90 (100%)
 rename {Sapfor/tests => tests}/sapfor/create_nested_loops/program.f90 (100%)
 rename {Sapfor/tests => tests}/sapfor/create_nested_loops/test.bat (100%)
 rename {Sapfor/tests => tests}/sapfor/create_nested_loops/test.sh (100%)
 rename {Sapfor/tests => tests}/sapfor/fission_and_private_exp/fission_priv_exp.f90 (100%)
 rename {Sapfor/tests => tests}/sapfor/loops_combiner/test_1.for (100%)
 rename {Sapfor/tests => tests}/sapfor/loops_combiner/test_2.for (100%)
 rename {Sapfor/tests => tests}/sapfor/loops_combiner/test_3.for (100%)
 rename {Sapfor/tests => tests}/sapfor/loops_combiner/test_4.for (100%)
 rename {Sapfor/tests => tests}/sapfor/loops_combiner/test_5.for (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/array_read_before_write.in (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/array_read_before_write.out (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/read_before_read.in (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/read_before_read.out (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/read_in_loop_header.in (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/read_in_loop_header.out (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/var_modified_in_fun.in (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/var_modified_in_fun.out (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/var_read_before_write.in (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/var_read_before_write.out (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/write_before_read.in (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/write_before_read.out (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/write_before_write.in (100%)
 rename {Sapfor/tests => tests}/sapfor/merge_regions/write_before_write.out (100%)
 rename {Sapfor/tests => tests}/sapfor/parameter/magnit_3d.for (100%)
 rename {Sapfor/tests => tests}/sapfor/parameter/mycom.for (100%)
 rename {Sapfor/tests => tests}/sapfor/parameter/parameter.f90 (100%)
 rename {Sapfor/tests => tests}/sapfor/private_removing/test.f (100%)
 rename {Sapfor/tests => tests}/sapfor/private_removing/test_cannot_remove.f (100%)
 rename {Sapfor/tests => tests}/sapfor/private_removing/test_cascade.f (100%)
 rename {Sapfor/tests => tests}/sapfor/shrink/error.f (100%)
 rename {Sapfor/tests => tests}/sapfor/shrink/error2.f (100%)
 rename {Sapfor/tests => tests}/sapfor/shrink/error3.f (100%)
 rename {Sapfor/tests => tests}/sapfor/shrink/shrink.f (100%)
 rename {Sapfor/tests => tests}/sapfor/shrink/shrink2.f (100%)
 rename {Sapfor/tests => tests}/sapfor/shrink/shrink3.f (100%)

diff --git a/Sapfor/CMakeLists.txt b/CMakeLists.txt
similarity index 100%
rename from Sapfor/CMakeLists.txt
rename to CMakeLists.txt
diff --git a/Sapfor/projects/Fdvm/CMakeLists.txt b/projects/Fdvm/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/Fdvm/CMakeLists.txt
rename to projects/Fdvm/CMakeLists.txt
diff --git a/Sapfor/projects/Parser/CMakeLists.txt b/projects/Parser/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/Parser/CMakeLists.txt
rename to projects/Parser/CMakeLists.txt
diff --git a/Sapfor/projects/SageLib/CMakeLists.txt b/projects/SageLib/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/SageLib/CMakeLists.txt
rename to projects/SageLib/CMakeLists.txt
diff --git a/Sapfor/projects/SageNewSrc/CMakeLists.txt b/projects/SageNewSrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/SageNewSrc/CMakeLists.txt
rename to projects/SageNewSrc/CMakeLists.txt
diff --git a/Sapfor/projects/SageOldSrc/CMakeLists.txt b/projects/SageOldSrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/SageOldSrc/CMakeLists.txt
rename to projects/SageOldSrc/CMakeLists.txt
diff --git a/Sapfor/projects/Sapc++/Sapc++.sln b/projects/Sapc++/Sapc++.sln
similarity index 100%
rename from Sapfor/projects/Sapc++/Sapc++.sln
rename to projects/Sapc++/Sapc++.sln
diff --git a/Sapfor/projects/dvm/fdvm/CMakeLists.txt b/projects/dvm/fdvm/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/CMakeLists.txt
rename to projects/dvm/fdvm/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/CMakeLists.txt b/projects/dvm/fdvm/trunk/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/CMakeLists.txt
rename to projects/dvm/fdvm/trunk/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt b/projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
rename to projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h b/projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
rename to projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp b/projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp
rename to projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp b/projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
rename to projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inline.h b/projects/dvm/fdvm/trunk/InlineExpansion/inline.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inline.h
rename to projects/dvm/fdvm/trunk/InlineExpansion/inline.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp b/projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp
rename to projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h b/projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h
rename to projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni b/projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni
rename to projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/makefile.win b/projects/dvm/fdvm/trunk/InlineExpansion/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/InlineExpansion/makefile.win
rename to projects/dvm/fdvm/trunk/InlineExpansion/makefile.win
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Makefile b/projects/dvm/fdvm/trunk/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Makefile
rename to projects/dvm/fdvm/trunk/Makefile
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/CMakeLists.txt b/projects/dvm/fdvm/trunk/Sage/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/CMakeLists.txt
rename to projects/dvm/fdvm/trunk/Sage/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/LICENSE b/projects/dvm/fdvm/trunk/Sage/LICENSE
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/LICENSE
rename to projects/dvm/fdvm/trunk/Sage/LICENSE
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/Makefile b/projects/dvm/fdvm/trunk/Sage/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/Makefile
rename to projects/dvm/fdvm/trunk/Sage/Makefile
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt b/projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
rename to projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/Makefile b/projects/dvm/fdvm/trunk/Sage/Sage++/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/Makefile
rename to projects/dvm/fdvm/trunk/Sage/Sage++/Makefile
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp b/projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
rename to projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni b/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni
rename to projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win b/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win
rename to projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/Makefile b/projects/dvm/fdvm/trunk/Sage/h/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/Makefile
rename to projects/dvm/fdvm/trunk/Sage/h/Makefile
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/bif.h b/projects/dvm/fdvm/trunk/Sage/h/bif.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/bif.h
rename to projects/dvm/fdvm/trunk/Sage/h/bif.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/compatible.h b/projects/dvm/fdvm/trunk/Sage/h/compatible.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/compatible.h
rename to projects/dvm/fdvm/trunk/Sage/h/compatible.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/db.h b/projects/dvm/fdvm/trunk/Sage/h/db.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/db.h
rename to projects/dvm/fdvm/trunk/Sage/h/db.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/db.new.h b/projects/dvm/fdvm/trunk/Sage/h/db.new.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/db.new.h
rename to projects/dvm/fdvm/trunk/Sage/h/db.new.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/defines.h b/projects/dvm/fdvm/trunk/Sage/h/defines.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/defines.h
rename to projects/dvm/fdvm/trunk/Sage/h/defines.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/defs.h b/projects/dvm/fdvm/trunk/Sage/h/defs.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/defs.h
rename to projects/dvm/fdvm/trunk/Sage/h/defs.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep.h b/projects/dvm/fdvm/trunk/Sage/h/dep.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep.h
rename to projects/dvm/fdvm/trunk/Sage/h/dep.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep_str.h b/projects/dvm/fdvm/trunk/Sage/h/dep_str.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep_str.h
rename to projects/dvm/fdvm/trunk/Sage/h/dep_str.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep_struct.h b/projects/dvm/fdvm/trunk/Sage/h/dep_struct.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/dep_struct.h
rename to projects/dvm/fdvm/trunk/Sage/h/dep_struct.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/elist.h b/projects/dvm/fdvm/trunk/Sage/h/elist.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/elist.h
rename to projects/dvm/fdvm/trunk/Sage/h/elist.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/f90.h b/projects/dvm/fdvm/trunk/Sage/h/f90.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/f90.h
rename to projects/dvm/fdvm/trunk/Sage/h/f90.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/fixcray.h b/projects/dvm/fdvm/trunk/Sage/h/fixcray.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/fixcray.h
rename to projects/dvm/fdvm/trunk/Sage/h/fixcray.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/fm.h b/projects/dvm/fdvm/trunk/Sage/h/fm.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/fm.h
rename to projects/dvm/fdvm/trunk/Sage/h/fm.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/head b/projects/dvm/fdvm/trunk/Sage/h/head
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/head
rename to projects/dvm/fdvm/trunk/Sage/h/head
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/leak_detector.h b/projects/dvm/fdvm/trunk/Sage/h/leak_detector.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/leak_detector.h
rename to projects/dvm/fdvm/trunk/Sage/h/leak_detector.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/list.h b/projects/dvm/fdvm/trunk/Sage/h/list.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/list.h
rename to projects/dvm/fdvm/trunk/Sage/h/list.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/ll.h b/projects/dvm/fdvm/trunk/Sage/h/ll.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/ll.h
rename to projects/dvm/fdvm/trunk/Sage/h/ll.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/prop.h b/projects/dvm/fdvm/trunk/Sage/h/prop.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/prop.h
rename to projects/dvm/fdvm/trunk/Sage/h/prop.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/sage.h b/projects/dvm/fdvm/trunk/Sage/h/sage.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/sage.h
rename to projects/dvm/fdvm/trunk/Sage/h/sage.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/sagearch.h b/projects/dvm/fdvm/trunk/Sage/h/sagearch.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/sagearch.h
rename to projects/dvm/fdvm/trunk/Sage/h/sagearch.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/sageroot.h b/projects/dvm/fdvm/trunk/Sage/h/sageroot.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/sageroot.h
rename to projects/dvm/fdvm/trunk/Sage/h/sageroot.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/sets.h b/projects/dvm/fdvm/trunk/Sage/h/sets.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/sets.h
rename to projects/dvm/fdvm/trunk/Sage/h/sets.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/symb.h b/projects/dvm/fdvm/trunk/Sage/h/symb.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/symb.h
rename to projects/dvm/fdvm/trunk/Sage/h/symb.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/symblob.h b/projects/dvm/fdvm/trunk/Sage/h/symblob.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/symblob.h
rename to projects/dvm/fdvm/trunk/Sage/h/symblob.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag b/projects/dvm/fdvm/trunk/Sage/h/tag
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag
rename to projects/dvm/fdvm/trunk/Sage/h/tag
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag.doc b/projects/dvm/fdvm/trunk/Sage/h/tag.doc
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag.doc
rename to projects/dvm/fdvm/trunk/Sage/h/tag.doc
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag.h b/projects/dvm/fdvm/trunk/Sage/h/tag.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag.h
rename to projects/dvm/fdvm/trunk/Sage/h/tag.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag_make b/projects/dvm/fdvm/trunk/Sage/h/tag_make
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/tag_make
rename to projects/dvm/fdvm/trunk/Sage/h/tag_make
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/version.h b/projects/dvm/fdvm/trunk/Sage/h/version.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/version.h
rename to projects/dvm/fdvm/trunk/Sage/h/version.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/vextern.h b/projects/dvm/fdvm/trunk/Sage/h/vextern.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/vextern.h
rename to projects/dvm/fdvm/trunk/Sage/h/vextern.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/vparse.h b/projects/dvm/fdvm/trunk/Sage/h/vparse.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/vparse.h
rename to projects/dvm/fdvm/trunk/Sage/h/vparse.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/vpc.h b/projects/dvm/fdvm/trunk/Sage/h/vpc.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/vpc.h
rename to projects/dvm/fdvm/trunk/Sage/h/vpc.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/h/window.h b/projects/dvm/fdvm/trunk/Sage/h/window.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/h/window.h
rename to projects/dvm/fdvm/trunk/Sage/h/window.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt b/projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
rename to projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/Makefile b/projects/dvm/fdvm/trunk/Sage/lib/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/Makefile
rename to projects/dvm/fdvm/trunk/Sage/lib/Makefile
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h b/projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h b/projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def b/projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
rename to projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h b/projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h b/projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h b/projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h b/projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h b/projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h b/projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h b/projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h b/projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/macro.h b/projects/dvm/fdvm/trunk/Sage/lib/include/macro.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/macro.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/macro.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h b/projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h b/projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h b/projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h b/projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h b/projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h
rename to projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/symb.def b/projects/dvm/fdvm/trunk/Sage/lib/include/symb.def
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/symb.def
rename to projects/dvm/fdvm/trunk/Sage/lib/include/symb.def
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/type.def b/projects/dvm/fdvm/trunk/Sage/lib/include/type.def
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/type.def
rename to projects/dvm/fdvm/trunk/Sage/lib/include/type.def
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def b/projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def
rename to projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def b/projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
rename to projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def b/projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
rename to projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/makefile.uni b/projects/dvm/fdvm/trunk/Sage/lib/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/makefile.uni
rename to projects/dvm/fdvm/trunk/Sage/lib/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/makefile.win b/projects/dvm/fdvm/trunk/Sage/lib/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/makefile.win
rename to projects/dvm/fdvm/trunk/Sage/lib/makefile.win
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c b/projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
rename to projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c b/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
rename to projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/makefile.uni b/projects/dvm/fdvm/trunk/Sage/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/makefile.uni
rename to projects/dvm/fdvm/trunk/Sage/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/Sage/makefile.win b/projects/dvm/fdvm/trunk/Sage/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/Sage/makefile.win
rename to projects/dvm/fdvm/trunk/Sage/makefile.win
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
diff --git a/Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters b/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
rename to projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
diff --git a/Sapfor/projects/dvm/fdvm/trunk/acrossDebugging/across.cpp b/projects/dvm/fdvm/trunk/acrossDebugging/across.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/acrossDebugging/across.cpp
rename to projects/dvm/fdvm/trunk/acrossDebugging/across.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/gausf.fdv b/projects/dvm/fdvm/trunk/examples/gausf.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/gausf.fdv
rename to projects/dvm/fdvm/trunk/examples/gausf.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/gausgb.fdv b/projects/dvm/fdvm/trunk/examples/gausgb.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/gausgb.fdv
rename to projects/dvm/fdvm/trunk/examples/gausgb.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/gaush.hpf b/projects/dvm/fdvm/trunk/examples/gaush.hpf
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/gaush.hpf
rename to projects/dvm/fdvm/trunk/examples/gaush.hpf
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/gauswh.fdv b/projects/dvm/fdvm/trunk/examples/gauswh.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/gauswh.fdv
rename to projects/dvm/fdvm/trunk/examples/gauswh.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/jac.fdv b/projects/dvm/fdvm/trunk/examples/jac.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/jac.fdv
rename to projects/dvm/fdvm/trunk/examples/jac.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/jacas.fdv b/projects/dvm/fdvm/trunk/examples/jacas.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/jacas.fdv
rename to projects/dvm/fdvm/trunk/examples/jacas.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/jach.hpf b/projects/dvm/fdvm/trunk/examples/jach.hpf
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/jach.hpf
rename to projects/dvm/fdvm/trunk/examples/jach.hpf
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/redbf.fdv b/projects/dvm/fdvm/trunk/examples/redbf.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/redbf.fdv
rename to projects/dvm/fdvm/trunk/examples/redbf.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/redbh.hpf b/projects/dvm/fdvm/trunk/examples/redbh.hpf
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/redbh.hpf
rename to projects/dvm/fdvm/trunk/examples/redbh.hpf
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/sor.fdv b/projects/dvm/fdvm/trunk/examples/sor.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/sor.fdv
rename to projects/dvm/fdvm/trunk/examples/sor.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/task2j.fdv b/projects/dvm/fdvm/trunk/examples/task2j.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/task2j.fdv
rename to projects/dvm/fdvm/trunk/examples/task2j.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/tasks.fdv b/projects/dvm/fdvm/trunk/examples/tasks.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/tasks.fdv
rename to projects/dvm/fdvm/trunk/examples/tasks.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/examples/taskst.fdv b/projects/dvm/fdvm/trunk/examples/taskst.fdv
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/examples/taskst.fdv
rename to projects/dvm/fdvm/trunk/examples/taskst.fdv
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt b/projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt
rename to projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/Makefile b/projects/dvm/fdvm/trunk/fdvm/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/Makefile
rename to projects/dvm/fdvm/trunk/fdvm/Makefile
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc.cpp b/projects/dvm/fdvm/trunk/fdvm/acc.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_across.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_across.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_across.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_across.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_data.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_data.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_data.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_data.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp b/projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp
rename to projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp b/projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
rename to projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp b/projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
rename to projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp b/projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp
rename to projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/calls.cpp b/projects/dvm/fdvm/trunk/fdvm/calls.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/calls.cpp
rename to projects/dvm/fdvm/trunk/fdvm/calls.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp b/projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp
rename to projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/debug.cpp b/projects/dvm/fdvm/trunk/fdvm/debug.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/debug.cpp
rename to projects/dvm/fdvm/trunk/fdvm/debug.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/dvm.cpp b/projects/dvm/fdvm/trunk/fdvm/dvm.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/dvm.cpp
rename to projects/dvm/fdvm/trunk/fdvm/dvm.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/funcall.cpp b/projects/dvm/fdvm/trunk/fdvm/funcall.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/funcall.cpp
rename to projects/dvm/fdvm/trunk/fdvm/funcall.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/help.cpp b/projects/dvm/fdvm/trunk/fdvm/help.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/help.cpp
rename to projects/dvm/fdvm/trunk/fdvm/help.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/hpf.cpp b/projects/dvm/fdvm/trunk/fdvm/hpf.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/hpf.cpp
rename to projects/dvm/fdvm/trunk/fdvm/hpf.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/io.cpp b/projects/dvm/fdvm/trunk/fdvm/io.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/io.cpp
rename to projects/dvm/fdvm/trunk/fdvm/io.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/makefile.uni b/projects/dvm/fdvm/trunk/fdvm/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/makefile.uni
rename to projects/dvm/fdvm/trunk/fdvm/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/makefile.win b/projects/dvm/fdvm/trunk/fdvm/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/makefile.win
rename to projects/dvm/fdvm/trunk/fdvm/makefile.win
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/omp.cpp b/projects/dvm/fdvm/trunk/fdvm/omp.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/omp.cpp
rename to projects/dvm/fdvm/trunk/fdvm/omp.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp b/projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp
rename to projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/parloop.cpp b/projects/dvm/fdvm/trunk/fdvm/parloop.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/parloop.cpp
rename to projects/dvm/fdvm/trunk/fdvm/parloop.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/fdvm/stmt.cpp b/projects/dvm/fdvm/trunk/fdvm/stmt.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/fdvm/stmt.cpp
rename to projects/dvm/fdvm/trunk/fdvm/stmt.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/acc_across_analyzer.h b/projects/dvm/fdvm/trunk/include/acc_across_analyzer.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/acc_across_analyzer.h
rename to projects/dvm/fdvm/trunk/include/acc_across_analyzer.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/acc_analyzer.h b/projects/dvm/fdvm/trunk/include/acc_analyzer.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/acc_analyzer.h
rename to projects/dvm/fdvm/trunk/include/acc_analyzer.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/acc_data.h b/projects/dvm/fdvm/trunk/include/acc_data.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/acc_data.h
rename to projects/dvm/fdvm/trunk/include/acc_data.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/aks_loopStructure.h b/projects/dvm/fdvm/trunk/include/aks_loopStructure.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/aks_loopStructure.h
rename to projects/dvm/fdvm/trunk/include/aks_loopStructure.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/aks_structs.h b/projects/dvm/fdvm/trunk/include/aks_structs.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/aks_structs.h
rename to projects/dvm/fdvm/trunk/include/aks_structs.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/calls.h b/projects/dvm/fdvm/trunk/include/calls.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/calls.h
rename to projects/dvm/fdvm/trunk/include/calls.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/dvm.h b/projects/dvm/fdvm/trunk/include/dvm.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/dvm.h
rename to projects/dvm/fdvm/trunk/include/dvm.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/dvm_tag.h b/projects/dvm/fdvm/trunk/include/dvm_tag.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/dvm_tag.h
rename to projects/dvm/fdvm/trunk/include/dvm_tag.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/extern.h b/projects/dvm/fdvm/trunk/include/extern.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/extern.h
rename to projects/dvm/fdvm/trunk/include/extern.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/fdvm.h b/projects/dvm/fdvm/trunk/include/fdvm.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/fdvm.h
rename to projects/dvm/fdvm/trunk/include/fdvm.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/fdvm_version.h b/projects/dvm/fdvm/trunk/include/fdvm_version.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/fdvm_version.h
rename to projects/dvm/fdvm/trunk/include/fdvm_version.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/inc.h b/projects/dvm/fdvm/trunk/include/inc.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/inc.h
rename to projects/dvm/fdvm/trunk/include/inc.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/leak_detector.h b/projects/dvm/fdvm/trunk/include/leak_detector.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/leak_detector.h
rename to projects/dvm/fdvm/trunk/include/leak_detector.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/libSageOMP.h b/projects/dvm/fdvm/trunk/include/libSageOMP.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/libSageOMP.h
rename to projects/dvm/fdvm/trunk/include/libSageOMP.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/libdvm.h b/projects/dvm/fdvm/trunk/include/libdvm.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/libdvm.h
rename to projects/dvm/fdvm/trunk/include/libdvm.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/libnum.h b/projects/dvm/fdvm/trunk/include/libnum.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/libnum.h
rename to projects/dvm/fdvm/trunk/include/libnum.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/unparse.hpf b/projects/dvm/fdvm/trunk/include/unparse.hpf
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/unparse.hpf
rename to projects/dvm/fdvm/trunk/include/unparse.hpf
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/unparse1.hpf b/projects/dvm/fdvm/trunk/include/unparse1.hpf
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/unparse1.hpf
rename to projects/dvm/fdvm/trunk/include/unparse1.hpf
diff --git a/Sapfor/projects/dvm/fdvm/trunk/include/user.h b/projects/dvm/fdvm/trunk/include/user.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/include/user.h
rename to projects/dvm/fdvm/trunk/include/user.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/makefile.uni b/projects/dvm/fdvm/trunk/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/makefile.uni
rename to projects/dvm/fdvm/trunk/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/makefile.win b/projects/dvm/fdvm/trunk/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/makefile.win
rename to projects/dvm/fdvm/trunk/makefile.win
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/CMakeLists.txt b/projects/dvm/fdvm/trunk/parser/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/CMakeLists.txt
rename to projects/dvm/fdvm/trunk/parser/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/Makefile b/projects/dvm/fdvm/trunk/parser/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/Makefile
rename to projects/dvm/fdvm/trunk/parser/Makefile
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/cftn.c b/projects/dvm/fdvm/trunk/parser/cftn.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/cftn.c
rename to projects/dvm/fdvm/trunk/parser/cftn.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/errors.c b/projects/dvm/fdvm/trunk/parser/errors.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/errors.c
rename to projects/dvm/fdvm/trunk/parser/errors.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/facc.gram b/projects/dvm/fdvm/trunk/parser/facc.gram
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/facc.gram
rename to projects/dvm/fdvm/trunk/parser/facc.gram
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/fdvm.gram b/projects/dvm/fdvm/trunk/parser/fdvm.gram
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/fdvm.gram
rename to projects/dvm/fdvm/trunk/parser/fdvm.gram
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/fomp.gram b/projects/dvm/fdvm/trunk/parser/fomp.gram
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/fomp.gram
rename to projects/dvm/fdvm/trunk/parser/fomp.gram
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/fspf.gram b/projects/dvm/fdvm/trunk/parser/fspf.gram
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/fspf.gram
rename to projects/dvm/fdvm/trunk/parser/fspf.gram
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/ftn.gram b/projects/dvm/fdvm/trunk/parser/ftn.gram
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/ftn.gram
rename to projects/dvm/fdvm/trunk/parser/ftn.gram
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/gram1.tab.c b/projects/dvm/fdvm/trunk/parser/gram1.tab.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/gram1.tab.c
rename to projects/dvm/fdvm/trunk/parser/gram1.tab.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/gram1.tab.h b/projects/dvm/fdvm/trunk/parser/gram1.tab.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/gram1.tab.h
rename to projects/dvm/fdvm/trunk/parser/gram1.tab.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/gram1.y b/projects/dvm/fdvm/trunk/parser/gram1.y
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/gram1.y
rename to projects/dvm/fdvm/trunk/parser/gram1.y
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/hash.c b/projects/dvm/fdvm/trunk/parser/hash.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/hash.c
rename to projects/dvm/fdvm/trunk/parser/hash.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/head b/projects/dvm/fdvm/trunk/parser/head
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/head
rename to projects/dvm/fdvm/trunk/parser/head
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/init.c b/projects/dvm/fdvm/trunk/parser/init.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/init.c
rename to projects/dvm/fdvm/trunk/parser/init.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/lexfdvm.c b/projects/dvm/fdvm/trunk/parser/lexfdvm.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/lexfdvm.c
rename to projects/dvm/fdvm/trunk/parser/lexfdvm.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/lists.c b/projects/dvm/fdvm/trunk/parser/lists.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/lists.c
rename to projects/dvm/fdvm/trunk/parser/lists.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/low_hpf.c b/projects/dvm/fdvm/trunk/parser/low_hpf.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/low_hpf.c
rename to projects/dvm/fdvm/trunk/parser/low_hpf.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/makefile.uni b/projects/dvm/fdvm/trunk/parser/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/makefile.uni
rename to projects/dvm/fdvm/trunk/parser/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/makefile.win b/projects/dvm/fdvm/trunk/parser/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/makefile.win
rename to projects/dvm/fdvm/trunk/parser/makefile.win
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/misc.c b/projects/dvm/fdvm/trunk/parser/misc.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/misc.c
rename to projects/dvm/fdvm/trunk/parser/misc.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/stat.c b/projects/dvm/fdvm/trunk/parser/stat.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/stat.c
rename to projects/dvm/fdvm/trunk/parser/stat.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/sym.c b/projects/dvm/fdvm/trunk/parser/sym.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/sym.c
rename to projects/dvm/fdvm/trunk/parser/sym.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/tag b/projects/dvm/fdvm/trunk/parser/tag
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/tag
rename to projects/dvm/fdvm/trunk/parser/tag
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/tag.h b/projects/dvm/fdvm/trunk/parser/tag.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/tag.h
rename to projects/dvm/fdvm/trunk/parser/tag.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/tokdefs.h b/projects/dvm/fdvm/trunk/parser/tokdefs.h
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/tokdefs.h
rename to projects/dvm/fdvm/trunk/parser/tokdefs.h
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/tokens b/projects/dvm/fdvm/trunk/parser/tokens
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/tokens
rename to projects/dvm/fdvm/trunk/parser/tokens
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/types.c b/projects/dvm/fdvm/trunk/parser/types.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/types.c
rename to projects/dvm/fdvm/trunk/parser/types.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/parser/unparse_hpf.c b/projects/dvm/fdvm/trunk/parser/unparse_hpf.c
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/parser/unparse_hpf.c
rename to projects/dvm/fdvm/trunk/parser/unparse_hpf.c
diff --git a/Sapfor/projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp b/projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp
rename to projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp
diff --git a/Sapfor/projects/dvm/fdvm/trunk/sageExample/makefile.uni b/projects/dvm/fdvm/trunk/sageExample/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/sageExample/makefile.uni
rename to projects/dvm/fdvm/trunk/sageExample/makefile.uni
diff --git a/Sapfor/projects/dvm/fdvm/trunk/sageExample/makefile.win b/projects/dvm/fdvm/trunk/sageExample/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/fdvm/trunk/sageExample/makefile.win
rename to projects/dvm/fdvm/trunk/sageExample/makefile.win
diff --git a/Sapfor/projects/dvm/tools/Zlib/CMakeLists.txt b/projects/dvm/tools/Zlib/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/CMakeLists.txt
rename to projects/dvm/tools/Zlib/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/deflate.h b/projects/dvm/tools/Zlib/include/deflate.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/deflate.h
rename to projects/dvm/tools/Zlib/include/deflate.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/infblock.h b/projects/dvm/tools/Zlib/include/infblock.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/infblock.h
rename to projects/dvm/tools/Zlib/include/infblock.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/infcodes.h b/projects/dvm/tools/Zlib/include/infcodes.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/infcodes.h
rename to projects/dvm/tools/Zlib/include/infcodes.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/inffast.h b/projects/dvm/tools/Zlib/include/inffast.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/inffast.h
rename to projects/dvm/tools/Zlib/include/inffast.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/inffixed.h b/projects/dvm/tools/Zlib/include/inffixed.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/inffixed.h
rename to projects/dvm/tools/Zlib/include/inffixed.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/inftrees.h b/projects/dvm/tools/Zlib/include/inftrees.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/inftrees.h
rename to projects/dvm/tools/Zlib/include/inftrees.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/infutil.h b/projects/dvm/tools/Zlib/include/infutil.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/infutil.h
rename to projects/dvm/tools/Zlib/include/infutil.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/trees.h b/projects/dvm/tools/Zlib/include/trees.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/trees.h
rename to projects/dvm/tools/Zlib/include/trees.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/zconf.h b/projects/dvm/tools/Zlib/include/zconf.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/zconf.h
rename to projects/dvm/tools/Zlib/include/zconf.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/zlib.h b/projects/dvm/tools/Zlib/include/zlib.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/zlib.h
rename to projects/dvm/tools/Zlib/include/zlib.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/include/zutil.h b/projects/dvm/tools/Zlib/include/zutil.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/include/zutil.h
rename to projects/dvm/tools/Zlib/include/zutil.h
diff --git a/Sapfor/projects/dvm/tools/Zlib/makefile.uni b/projects/dvm/tools/Zlib/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/makefile.uni
rename to projects/dvm/tools/Zlib/makefile.uni
diff --git a/Sapfor/projects/dvm/tools/Zlib/makefile.win b/projects/dvm/tools/Zlib/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/makefile.win
rename to projects/dvm/tools/Zlib/makefile.win
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/CMakeLists.txt b/projects/dvm/tools/Zlib/src/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/CMakeLists.txt
rename to projects/dvm/tools/Zlib/src/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/adler32.c b/projects/dvm/tools/Zlib/src/adler32.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/adler32.c
rename to projects/dvm/tools/Zlib/src/adler32.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/compress.c b/projects/dvm/tools/Zlib/src/compress.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/compress.c
rename to projects/dvm/tools/Zlib/src/compress.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/crc32.c b/projects/dvm/tools/Zlib/src/crc32.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/crc32.c
rename to projects/dvm/tools/Zlib/src/crc32.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/deflate.c b/projects/dvm/tools/Zlib/src/deflate.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/deflate.c
rename to projects/dvm/tools/Zlib/src/deflate.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/example.c b/projects/dvm/tools/Zlib/src/example.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/example.c
rename to projects/dvm/tools/Zlib/src/example.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/gzio.c b/projects/dvm/tools/Zlib/src/gzio.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/gzio.c
rename to projects/dvm/tools/Zlib/src/gzio.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/infblock.c b/projects/dvm/tools/Zlib/src/infblock.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/infblock.c
rename to projects/dvm/tools/Zlib/src/infblock.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/infcodes.c b/projects/dvm/tools/Zlib/src/infcodes.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/infcodes.c
rename to projects/dvm/tools/Zlib/src/infcodes.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/inffast.c b/projects/dvm/tools/Zlib/src/inffast.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/inffast.c
rename to projects/dvm/tools/Zlib/src/inffast.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/inflate.c b/projects/dvm/tools/Zlib/src/inflate.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/inflate.c
rename to projects/dvm/tools/Zlib/src/inflate.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/inftrees.c b/projects/dvm/tools/Zlib/src/inftrees.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/inftrees.c
rename to projects/dvm/tools/Zlib/src/inftrees.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/infutil.c b/projects/dvm/tools/Zlib/src/infutil.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/infutil.c
rename to projects/dvm/tools/Zlib/src/infutil.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/maketree.c b/projects/dvm/tools/Zlib/src/maketree.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/maketree.c
rename to projects/dvm/tools/Zlib/src/maketree.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/minigzip.c b/projects/dvm/tools/Zlib/src/minigzip.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/minigzip.c
rename to projects/dvm/tools/Zlib/src/minigzip.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/trees.c b/projects/dvm/tools/Zlib/src/trees.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/trees.c
rename to projects/dvm/tools/Zlib/src/trees.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/uncompr.c b/projects/dvm/tools/Zlib/src/uncompr.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/uncompr.c
rename to projects/dvm/tools/Zlib/src/uncompr.c
diff --git a/Sapfor/projects/dvm/tools/Zlib/src/zutil.c b/projects/dvm/tools/Zlib/src/zutil.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/Zlib/src/zutil.c
rename to projects/dvm/tools/Zlib/src/zutil.c
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni b/projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni
rename to projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/makefile.win b/projects/dvm/tools/pppa/branches/dvm4.07/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/makefile.win
rename to projects/dvm/tools/pppa/branches/dvm4.07/makefile.win
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp b/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni b/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win b/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp b/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp b/projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp b/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp b/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp b/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
diff --git a/Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h b/projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h
rename to projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1 b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
diff --git a/Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme b/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme
rename to projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/CMakeLists.txt b/projects/dvm/tools/pppa/trunk/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/CMakeLists.txt
rename to projects/dvm/tools/pppa/trunk/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/makefile.uni b/projects/dvm/tools/pppa/trunk/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/makefile.uni
rename to projects/dvm/tools/pppa/trunk/makefile.uni
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/makefile.win b/projects/dvm/tools/pppa/trunk/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/makefile.win
rename to projects/dvm/tools/pppa/trunk/makefile.win
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/CMakeLists.txt b/projects/dvm/tools/pppa/trunk/src/CMakeLists.txt
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/CMakeLists.txt
rename to projects/dvm/tools/pppa/trunk/src/CMakeLists.txt
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp b/projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp
rename to projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/LibraryImport.h b/projects/dvm/tools/pppa/trunk/src/LibraryImport.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/LibraryImport.h
rename to projects/dvm/tools/pppa/trunk/src/LibraryImport.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln b/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
rename to projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj b/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
rename to projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters b/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
rename to projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/bool.h b/projects/dvm/tools/pppa/trunk/src/bool.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/bool.h
rename to projects/dvm/tools/pppa/trunk/src/bool.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/dvmh_stat.h b/projects/dvm/tools/pppa/trunk/src/dvmh_stat.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/dvmh_stat.h
rename to projects/dvm/tools/pppa/trunk/src/dvmh_stat.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/dvmvers.h.in b/projects/dvm/tools/pppa/trunk/src/dvmvers.h.in
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/dvmvers.h.in
rename to projects/dvm/tools/pppa/trunk/src/dvmvers.h.in
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/inter.cpp b/projects/dvm/tools/pppa/trunk/src/inter.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/inter.cpp
rename to projects/dvm/tools/pppa/trunk/src/inter.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/inter.h b/projects/dvm/tools/pppa/trunk/src/inter.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/inter.h
rename to projects/dvm/tools/pppa/trunk/src/inter.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/json.hpp b/projects/dvm/tools/pppa/trunk/src/json.hpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/json.hpp
rename to projects/dvm/tools/pppa/trunk/src/json.hpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/makefile.uni b/projects/dvm/tools/pppa/trunk/src/makefile.uni
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/makefile.uni
rename to projects/dvm/tools/pppa/trunk/src/makefile.uni
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/makefile.win b/projects/dvm/tools/pppa/trunk/src/makefile.win
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/makefile.win
rename to projects/dvm/tools/pppa/trunk/src/makefile.win
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/makefileJnilib b/projects/dvm/tools/pppa/trunk/src/makefileJnilib
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/makefileJnilib
rename to projects/dvm/tools/pppa/trunk/src/makefileJnilib
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/potensyn.cpp b/projects/dvm/tools/pppa/trunk/src/potensyn.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/potensyn.cpp
rename to projects/dvm/tools/pppa/trunk/src/potensyn.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/potensyn.h b/projects/dvm/tools/pppa/trunk/src/potensyn.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/potensyn.h
rename to projects/dvm/tools/pppa/trunk/src/potensyn.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/stat.cpp b/projects/dvm/tools/pppa/trunk/src/stat.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/stat.cpp
rename to projects/dvm/tools/pppa/trunk/src/stat.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statfile.cpp b/projects/dvm/tools/pppa/trunk/src/statfile.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statfile.cpp
rename to projects/dvm/tools/pppa/trunk/src/statfile.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statinter.cpp b/projects/dvm/tools/pppa/trunk/src/statinter.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statinter.cpp
rename to projects/dvm/tools/pppa/trunk/src/statinter.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statinter.h b/projects/dvm/tools/pppa/trunk/src/statinter.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statinter.h
rename to projects/dvm/tools/pppa/trunk/src/statinter.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statist.h b/projects/dvm/tools/pppa/trunk/src/statist.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statist.h
rename to projects/dvm/tools/pppa/trunk/src/statist.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statlist.cpp b/projects/dvm/tools/pppa/trunk/src/statlist.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statlist.cpp
rename to projects/dvm/tools/pppa/trunk/src/statlist.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statlist.h b/projects/dvm/tools/pppa/trunk/src/statlist.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statlist.h
rename to projects/dvm/tools/pppa/trunk/src/statlist.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statprintf.cpp b/projects/dvm/tools/pppa/trunk/src/statprintf.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statprintf.cpp
rename to projects/dvm/tools/pppa/trunk/src/statprintf.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statprintf.h b/projects/dvm/tools/pppa/trunk/src/statprintf.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statprintf.h
rename to projects/dvm/tools/pppa/trunk/src/statprintf.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statread.cpp b/projects/dvm/tools/pppa/trunk/src/statread.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statread.cpp
rename to projects/dvm/tools/pppa/trunk/src/statread.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/statread.h b/projects/dvm/tools/pppa/trunk/src/statread.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/statread.h
rename to projects/dvm/tools/pppa/trunk/src/statread.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/strall.h b/projects/dvm/tools/pppa/trunk/src/strall.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/strall.h
rename to projects/dvm/tools/pppa/trunk/src/strall.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/sysstat.h b/projects/dvm/tools/pppa/trunk/src/sysstat.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/sysstat.h
rename to projects/dvm/tools/pppa/trunk/src/sysstat.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/treeinter.cpp b/projects/dvm/tools/pppa/trunk/src/treeinter.cpp
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/treeinter.cpp
rename to projects/dvm/tools/pppa/trunk/src/treeinter.cpp
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/treeinter.h b/projects/dvm/tools/pppa/trunk/src/treeinter.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/treeinter.h
rename to projects/dvm/tools/pppa/trunk/src/treeinter.h
diff --git a/Sapfor/projects/dvm/tools/pppa/trunk/src/ver.h b/projects/dvm/tools/pppa/trunk/src/ver.h
similarity index 100%
rename from Sapfor/projects/dvm/tools/pppa/trunk/src/ver.h
rename to projects/dvm/tools/pppa/trunk/src/ver.h
diff --git a/Sapfor/projects/paths.default.txt b/projects/paths.default.txt
similarity index 100%
rename from Sapfor/projects/paths.default.txt
rename to projects/paths.default.txt
diff --git a/Sapfor/src/CFGraph/CFGraph.cpp b/src/CFGraph/CFGraph.cpp
similarity index 100%
rename from Sapfor/src/CFGraph/CFGraph.cpp
rename to src/CFGraph/CFGraph.cpp
diff --git a/Sapfor/src/CFGraph/CFGraph.h b/src/CFGraph/CFGraph.h
similarity index 100%
rename from Sapfor/src/CFGraph/CFGraph.h
rename to src/CFGraph/CFGraph.h
diff --git a/Sapfor/src/CFGraph/DataFlow/backward_data_flow.h b/src/CFGraph/DataFlow/backward_data_flow.h
similarity index 100%
rename from Sapfor/src/CFGraph/DataFlow/backward_data_flow.h
rename to src/CFGraph/DataFlow/backward_data_flow.h
diff --git a/Sapfor/src/CFGraph/DataFlow/backward_data_flow_impl.h b/src/CFGraph/DataFlow/backward_data_flow_impl.h
similarity index 100%
rename from Sapfor/src/CFGraph/DataFlow/backward_data_flow_impl.h
rename to src/CFGraph/DataFlow/backward_data_flow_impl.h
diff --git a/Sapfor/src/CFGraph/DataFlow/data_flow.h b/src/CFGraph/DataFlow/data_flow.h
similarity index 100%
rename from Sapfor/src/CFGraph/DataFlow/data_flow.h
rename to src/CFGraph/DataFlow/data_flow.h
diff --git a/Sapfor/src/CFGraph/DataFlow/data_flow_impl.h b/src/CFGraph/DataFlow/data_flow_impl.h
similarity index 100%
rename from Sapfor/src/CFGraph/DataFlow/data_flow_impl.h
rename to src/CFGraph/DataFlow/data_flow_impl.h
diff --git a/Sapfor/src/CFGraph/IR.cpp b/src/CFGraph/IR.cpp
similarity index 100%
rename from Sapfor/src/CFGraph/IR.cpp
rename to src/CFGraph/IR.cpp
diff --git a/Sapfor/src/CFGraph/IR.h b/src/CFGraph/IR.h
similarity index 100%
rename from Sapfor/src/CFGraph/IR.h
rename to src/CFGraph/IR.h
diff --git a/Sapfor/src/CFGraph/RD_subst.cpp b/src/CFGraph/RD_subst.cpp
similarity index 100%
rename from Sapfor/src/CFGraph/RD_subst.cpp
rename to src/CFGraph/RD_subst.cpp
diff --git a/Sapfor/src/CFGraph/RD_subst.h b/src/CFGraph/RD_subst.h
similarity index 100%
rename from Sapfor/src/CFGraph/RD_subst.h
rename to src/CFGraph/RD_subst.h
diff --git a/Sapfor/src/CFGraph/live_variable_analysis.cpp b/src/CFGraph/live_variable_analysis.cpp
similarity index 100%
rename from Sapfor/src/CFGraph/live_variable_analysis.cpp
rename to src/CFGraph/live_variable_analysis.cpp
diff --git a/Sapfor/src/CFGraph/live_variable_analysis.h b/src/CFGraph/live_variable_analysis.h
similarity index 100%
rename from Sapfor/src/CFGraph/live_variable_analysis.h
rename to src/CFGraph/live_variable_analysis.h
diff --git a/Sapfor/src/CFGraph/private_variables_analysis.cpp b/src/CFGraph/private_variables_analysis.cpp
similarity index 100%
rename from Sapfor/src/CFGraph/private_variables_analysis.cpp
rename to src/CFGraph/private_variables_analysis.cpp
diff --git a/Sapfor/src/CFGraph/private_variables_analysis.h b/src/CFGraph/private_variables_analysis.h
similarity index 100%
rename from Sapfor/src/CFGraph/private_variables_analysis.h
rename to src/CFGraph/private_variables_analysis.h
diff --git a/Sapfor/src/CreateInterTree/CreateInterTree.cpp b/src/CreateInterTree/CreateInterTree.cpp
similarity index 100%
rename from Sapfor/src/CreateInterTree/CreateInterTree.cpp
rename to src/CreateInterTree/CreateInterTree.cpp
diff --git a/Sapfor/src/CreateInterTree/CreateInterTree.h b/src/CreateInterTree/CreateInterTree.h
similarity index 100%
rename from Sapfor/src/CreateInterTree/CreateInterTree.h
rename to src/CreateInterTree/CreateInterTree.h
diff --git a/Sapfor/src/DirectiveProcessing/directive_analyzer.cpp b/src/DirectiveProcessing/directive_analyzer.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/directive_analyzer.cpp
rename to src/DirectiveProcessing/directive_analyzer.cpp
diff --git a/Sapfor/src/DirectiveProcessing/directive_analyzer.h b/src/DirectiveProcessing/directive_analyzer.h
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/directive_analyzer.h
rename to src/DirectiveProcessing/directive_analyzer.h
diff --git a/Sapfor/src/DirectiveProcessing/directive_creator.cpp b/src/DirectiveProcessing/directive_creator.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/directive_creator.cpp
rename to src/DirectiveProcessing/directive_creator.cpp
diff --git a/Sapfor/src/DirectiveProcessing/directive_creator.h b/src/DirectiveProcessing/directive_creator.h
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/directive_creator.h
rename to src/DirectiveProcessing/directive_creator.h
diff --git a/Sapfor/src/DirectiveProcessing/directive_creator_base.cpp b/src/DirectiveProcessing/directive_creator_base.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/directive_creator_base.cpp
rename to src/DirectiveProcessing/directive_creator_base.cpp
diff --git a/Sapfor/src/DirectiveProcessing/directive_omp_parser.cpp b/src/DirectiveProcessing/directive_omp_parser.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/directive_omp_parser.cpp
rename to src/DirectiveProcessing/directive_omp_parser.cpp
diff --git a/Sapfor/src/DirectiveProcessing/directive_omp_parser.h b/src/DirectiveProcessing/directive_omp_parser.h
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/directive_omp_parser.h
rename to src/DirectiveProcessing/directive_omp_parser.h
diff --git a/Sapfor/src/DirectiveProcessing/directive_parser.cpp b/src/DirectiveProcessing/directive_parser.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/directive_parser.cpp
rename to src/DirectiveProcessing/directive_parser.cpp
diff --git a/Sapfor/src/DirectiveProcessing/directive_parser.h b/src/DirectiveProcessing/directive_parser.h
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/directive_parser.h
rename to src/DirectiveProcessing/directive_parser.h
diff --git a/Sapfor/src/DirectiveProcessing/insert_directive.cpp b/src/DirectiveProcessing/insert_directive.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/insert_directive.cpp
rename to src/DirectiveProcessing/insert_directive.cpp
diff --git a/Sapfor/src/DirectiveProcessing/insert_directive.h b/src/DirectiveProcessing/insert_directive.h
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/insert_directive.h
rename to src/DirectiveProcessing/insert_directive.h
diff --git a/Sapfor/src/DirectiveProcessing/remote_access.cpp b/src/DirectiveProcessing/remote_access.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/remote_access.cpp
rename to src/DirectiveProcessing/remote_access.cpp
diff --git a/Sapfor/src/DirectiveProcessing/remote_access.h b/src/DirectiveProcessing/remote_access.h
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/remote_access.h
rename to src/DirectiveProcessing/remote_access.h
diff --git a/Sapfor/src/DirectiveProcessing/remote_access_base.cpp b/src/DirectiveProcessing/remote_access_base.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/remote_access_base.cpp
rename to src/DirectiveProcessing/remote_access_base.cpp
diff --git a/Sapfor/src/DirectiveProcessing/shadow.cpp b/src/DirectiveProcessing/shadow.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/shadow.cpp
rename to src/DirectiveProcessing/shadow.cpp
diff --git a/Sapfor/src/DirectiveProcessing/shadow.h b/src/DirectiveProcessing/shadow.h
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/shadow.h
rename to src/DirectiveProcessing/shadow.h
diff --git a/Sapfor/src/DirectiveProcessing/spf_directive_preproc.cpp b/src/DirectiveProcessing/spf_directive_preproc.cpp
similarity index 100%
rename from Sapfor/src/DirectiveProcessing/spf_directive_preproc.cpp
rename to src/DirectiveProcessing/spf_directive_preproc.cpp
diff --git a/Sapfor/src/Distribution/Array.cpp b/src/Distribution/Array.cpp
similarity index 100%
rename from Sapfor/src/Distribution/Array.cpp
rename to src/Distribution/Array.cpp
diff --git a/Sapfor/src/Distribution/Array.h b/src/Distribution/Array.h
similarity index 100%
rename from Sapfor/src/Distribution/Array.h
rename to src/Distribution/Array.h
diff --git a/Sapfor/src/Distribution/ArrayAnalysis.cpp b/src/Distribution/ArrayAnalysis.cpp
similarity index 100%
rename from Sapfor/src/Distribution/ArrayAnalysis.cpp
rename to src/Distribution/ArrayAnalysis.cpp
diff --git a/Sapfor/src/Distribution/Arrays.h b/src/Distribution/Arrays.h
similarity index 100%
rename from Sapfor/src/Distribution/Arrays.h
rename to src/Distribution/Arrays.h
diff --git a/Sapfor/src/Distribution/CreateDistributionDirs.cpp b/src/Distribution/CreateDistributionDirs.cpp
similarity index 100%
rename from Sapfor/src/Distribution/CreateDistributionDirs.cpp
rename to src/Distribution/CreateDistributionDirs.cpp
diff --git a/Sapfor/src/Distribution/CreateDistributionDirs.h b/src/Distribution/CreateDistributionDirs.h
similarity index 100%
rename from Sapfor/src/Distribution/CreateDistributionDirs.h
rename to src/Distribution/CreateDistributionDirs.h
diff --git a/Sapfor/src/Distribution/Cycle.cpp b/src/Distribution/Cycle.cpp
similarity index 100%
rename from Sapfor/src/Distribution/Cycle.cpp
rename to src/Distribution/Cycle.cpp
diff --git a/Sapfor/src/Distribution/Cycle.h b/src/Distribution/Cycle.h
similarity index 100%
rename from Sapfor/src/Distribution/Cycle.h
rename to src/Distribution/Cycle.h
diff --git a/Sapfor/src/Distribution/Distribution.cpp b/src/Distribution/Distribution.cpp
similarity index 100%
rename from Sapfor/src/Distribution/Distribution.cpp
rename to src/Distribution/Distribution.cpp
diff --git a/Sapfor/src/Distribution/Distribution.h b/src/Distribution/Distribution.h
similarity index 100%
rename from Sapfor/src/Distribution/Distribution.h
rename to src/Distribution/Distribution.h
diff --git a/Sapfor/src/Distribution/DvmhDirective.cpp b/src/Distribution/DvmhDirective.cpp
similarity index 100%
rename from Sapfor/src/Distribution/DvmhDirective.cpp
rename to src/Distribution/DvmhDirective.cpp
diff --git a/Sapfor/src/Distribution/DvmhDirective.h b/src/Distribution/DvmhDirective.h
similarity index 100%
rename from Sapfor/src/Distribution/DvmhDirective.h
rename to src/Distribution/DvmhDirective.h
diff --git a/Sapfor/src/Distribution/DvmhDirectiveBase.cpp b/src/Distribution/DvmhDirectiveBase.cpp
similarity index 100%
rename from Sapfor/src/Distribution/DvmhDirectiveBase.cpp
rename to src/Distribution/DvmhDirectiveBase.cpp
diff --git a/Sapfor/src/Distribution/DvmhDirectiveBase.h b/src/Distribution/DvmhDirectiveBase.h
similarity index 100%
rename from Sapfor/src/Distribution/DvmhDirectiveBase.h
rename to src/Distribution/DvmhDirectiveBase.h
diff --git a/Sapfor/src/Distribution/DvmhDirective_func.h b/src/Distribution/DvmhDirective_func.h
similarity index 100%
rename from Sapfor/src/Distribution/DvmhDirective_func.h
rename to src/Distribution/DvmhDirective_func.h
diff --git a/Sapfor/src/Distribution/GraphCSR.cpp b/src/Distribution/GraphCSR.cpp
similarity index 100%
rename from Sapfor/src/Distribution/GraphCSR.cpp
rename to src/Distribution/GraphCSR.cpp
diff --git a/Sapfor/src/Distribution/GraphCSR.h b/src/Distribution/GraphCSR.h
similarity index 100%
rename from Sapfor/src/Distribution/GraphCSR.h
rename to src/Distribution/GraphCSR.h
diff --git a/Sapfor/src/DvmhRegions/DvmhRegion.cpp b/src/DvmhRegions/DvmhRegion.cpp
similarity index 100%
rename from Sapfor/src/DvmhRegions/DvmhRegion.cpp
rename to src/DvmhRegions/DvmhRegion.cpp
diff --git a/Sapfor/src/DvmhRegions/DvmhRegion.h b/src/DvmhRegions/DvmhRegion.h
similarity index 100%
rename from Sapfor/src/DvmhRegions/DvmhRegion.h
rename to src/DvmhRegions/DvmhRegion.h
diff --git a/Sapfor/src/DvmhRegions/DvmhRegionInserter.cpp b/src/DvmhRegions/DvmhRegionInserter.cpp
similarity index 100%
rename from Sapfor/src/DvmhRegions/DvmhRegionInserter.cpp
rename to src/DvmhRegions/DvmhRegionInserter.cpp
diff --git a/Sapfor/src/DvmhRegions/DvmhRegionInserter.h b/src/DvmhRegions/DvmhRegionInserter.h
similarity index 100%
rename from Sapfor/src/DvmhRegions/DvmhRegionInserter.h
rename to src/DvmhRegions/DvmhRegionInserter.h
diff --git a/Sapfor/src/DvmhRegions/LoopChecker.cpp b/src/DvmhRegions/LoopChecker.cpp
similarity index 100%
rename from Sapfor/src/DvmhRegions/LoopChecker.cpp
rename to src/DvmhRegions/LoopChecker.cpp
diff --git a/Sapfor/src/DvmhRegions/LoopChecker.h b/src/DvmhRegions/LoopChecker.h
similarity index 100%
rename from Sapfor/src/DvmhRegions/LoopChecker.h
rename to src/DvmhRegions/LoopChecker.h
diff --git a/Sapfor/src/DvmhRegions/ReadWriteAnalyzer.cpp b/src/DvmhRegions/ReadWriteAnalyzer.cpp
similarity index 100%
rename from Sapfor/src/DvmhRegions/ReadWriteAnalyzer.cpp
rename to src/DvmhRegions/ReadWriteAnalyzer.cpp
diff --git a/Sapfor/src/DvmhRegions/ReadWriteAnalyzer.h b/src/DvmhRegions/ReadWriteAnalyzer.h
similarity index 100%
rename from Sapfor/src/DvmhRegions/ReadWriteAnalyzer.h
rename to src/DvmhRegions/ReadWriteAnalyzer.h
diff --git a/Sapfor/src/DvmhRegions/RegionsMerger.cpp b/src/DvmhRegions/RegionsMerger.cpp
similarity index 100%
rename from Sapfor/src/DvmhRegions/RegionsMerger.cpp
rename to src/DvmhRegions/RegionsMerger.cpp
diff --git a/Sapfor/src/DvmhRegions/RegionsMerger.h b/src/DvmhRegions/RegionsMerger.h
similarity index 100%
rename from Sapfor/src/DvmhRegions/RegionsMerger.h
rename to src/DvmhRegions/RegionsMerger.h
diff --git a/Sapfor/src/DvmhRegions/TypedSymbol.cpp b/src/DvmhRegions/TypedSymbol.cpp
similarity index 100%
rename from Sapfor/src/DvmhRegions/TypedSymbol.cpp
rename to src/DvmhRegions/TypedSymbol.cpp
diff --git a/Sapfor/src/DvmhRegions/TypedSymbol.h b/src/DvmhRegions/TypedSymbol.h
similarity index 100%
rename from Sapfor/src/DvmhRegions/TypedSymbol.h
rename to src/DvmhRegions/TypedSymbol.h
diff --git a/Sapfor/src/DvmhRegions/VarUsages.cpp b/src/DvmhRegions/VarUsages.cpp
similarity index 100%
rename from Sapfor/src/DvmhRegions/VarUsages.cpp
rename to src/DvmhRegions/VarUsages.cpp
diff --git a/Sapfor/src/DvmhRegions/VarUsages.h b/src/DvmhRegions/VarUsages.h
similarity index 100%
rename from Sapfor/src/DvmhRegions/VarUsages.h
rename to src/DvmhRegions/VarUsages.h
diff --git a/Sapfor/src/DynamicAnalysis/createParallelRegions.cpp b/src/DynamicAnalysis/createParallelRegions.cpp
similarity index 100%
rename from Sapfor/src/DynamicAnalysis/createParallelRegions.cpp
rename to src/DynamicAnalysis/createParallelRegions.cpp
diff --git a/Sapfor/src/DynamicAnalysis/createParallelRegions.h b/src/DynamicAnalysis/createParallelRegions.h
similarity index 100%
rename from Sapfor/src/DynamicAnalysis/createParallelRegions.h
rename to src/DynamicAnalysis/createParallelRegions.h
diff --git a/Sapfor/src/DynamicAnalysis/gCov_parser.cpp b/src/DynamicAnalysis/gCov_parser.cpp
similarity index 100%
rename from Sapfor/src/DynamicAnalysis/gCov_parser.cpp
rename to src/DynamicAnalysis/gCov_parser.cpp
diff --git a/Sapfor/src/DynamicAnalysis/gCov_parser_func.h b/src/DynamicAnalysis/gCov_parser_func.h
similarity index 100%
rename from Sapfor/src/DynamicAnalysis/gCov_parser_func.h
rename to src/DynamicAnalysis/gCov_parser_func.h
diff --git a/Sapfor/src/DynamicAnalysis/gcov_info.cpp b/src/DynamicAnalysis/gcov_info.cpp
similarity index 100%
rename from Sapfor/src/DynamicAnalysis/gcov_info.cpp
rename to src/DynamicAnalysis/gcov_info.cpp
diff --git a/Sapfor/src/DynamicAnalysis/gcov_info.h b/src/DynamicAnalysis/gcov_info.h
similarity index 100%
rename from Sapfor/src/DynamicAnalysis/gcov_info.h
rename to src/DynamicAnalysis/gcov_info.h
diff --git a/Sapfor/src/ExpressionTransform/control_flow_graph_part.cpp b/src/ExpressionTransform/control_flow_graph_part.cpp
similarity index 100%
rename from Sapfor/src/ExpressionTransform/control_flow_graph_part.cpp
rename to src/ExpressionTransform/control_flow_graph_part.cpp
diff --git a/Sapfor/src/ExpressionTransform/expr_transform.cpp b/src/ExpressionTransform/expr_transform.cpp
similarity index 100%
rename from Sapfor/src/ExpressionTransform/expr_transform.cpp
rename to src/ExpressionTransform/expr_transform.cpp
diff --git a/Sapfor/src/ExpressionTransform/expr_transform.h b/src/ExpressionTransform/expr_transform.h
similarity index 100%
rename from Sapfor/src/ExpressionTransform/expr_transform.h
rename to src/ExpressionTransform/expr_transform.h
diff --git a/Sapfor/src/GraphCall/graph_calls.cpp b/src/GraphCall/graph_calls.cpp
similarity index 100%
rename from Sapfor/src/GraphCall/graph_calls.cpp
rename to src/GraphCall/graph_calls.cpp
diff --git a/Sapfor/src/GraphCall/graph_calls.h b/src/GraphCall/graph_calls.h
similarity index 100%
rename from Sapfor/src/GraphCall/graph_calls.h
rename to src/GraphCall/graph_calls.h
diff --git a/Sapfor/src/GraphCall/graph_calls_base.cpp b/src/GraphCall/graph_calls_base.cpp
similarity index 100%
rename from Sapfor/src/GraphCall/graph_calls_base.cpp
rename to src/GraphCall/graph_calls_base.cpp
diff --git a/Sapfor/src/GraphCall/graph_calls_func.h b/src/GraphCall/graph_calls_func.h
similarity index 100%
rename from Sapfor/src/GraphCall/graph_calls_func.h
rename to src/GraphCall/graph_calls_func.h
diff --git a/Sapfor/src/GraphLoop/graph_loops.cpp b/src/GraphLoop/graph_loops.cpp
similarity index 100%
rename from Sapfor/src/GraphLoop/graph_loops.cpp
rename to src/GraphLoop/graph_loops.cpp
diff --git a/Sapfor/src/GraphLoop/graph_loops.h b/src/GraphLoop/graph_loops.h
similarity index 100%
rename from Sapfor/src/GraphLoop/graph_loops.h
rename to src/GraphLoop/graph_loops.h
diff --git a/Sapfor/src/GraphLoop/graph_loops_base.cpp b/src/GraphLoop/graph_loops_base.cpp
similarity index 100%
rename from Sapfor/src/GraphLoop/graph_loops_base.cpp
rename to src/GraphLoop/graph_loops_base.cpp
diff --git a/Sapfor/src/GraphLoop/graph_loops_func.h b/src/GraphLoop/graph_loops_func.h
similarity index 100%
rename from Sapfor/src/GraphLoop/graph_loops_func.h
rename to src/GraphLoop/graph_loops_func.h
diff --git a/Sapfor/src/Inliner/inliner.cpp b/src/Inliner/inliner.cpp
similarity index 100%
rename from Sapfor/src/Inliner/inliner.cpp
rename to src/Inliner/inliner.cpp
diff --git a/Sapfor/src/Inliner/inliner.h b/src/Inliner/inliner.h
similarity index 100%
rename from Sapfor/src/Inliner/inliner.h
rename to src/Inliner/inliner.h
diff --git a/Sapfor/src/LoopAnalyzer/allocations_prepoc.cpp b/src/LoopAnalyzer/allocations_prepoc.cpp
similarity index 100%
rename from Sapfor/src/LoopAnalyzer/allocations_prepoc.cpp
rename to src/LoopAnalyzer/allocations_prepoc.cpp
diff --git a/Sapfor/src/LoopAnalyzer/dep_analyzer.cpp b/src/LoopAnalyzer/dep_analyzer.cpp
similarity index 100%
rename from Sapfor/src/LoopAnalyzer/dep_analyzer.cpp
rename to src/LoopAnalyzer/dep_analyzer.cpp
diff --git a/Sapfor/src/LoopAnalyzer/loop_analyzer.cpp b/src/LoopAnalyzer/loop_analyzer.cpp
similarity index 100%
rename from Sapfor/src/LoopAnalyzer/loop_analyzer.cpp
rename to src/LoopAnalyzer/loop_analyzer.cpp
diff --git a/Sapfor/src/LoopAnalyzer/loop_analyzer.h b/src/LoopAnalyzer/loop_analyzer.h
similarity index 100%
rename from Sapfor/src/LoopAnalyzer/loop_analyzer.h
rename to src/LoopAnalyzer/loop_analyzer.h
diff --git a/Sapfor/src/ParallelizationRegions/ParRegions.cpp b/src/ParallelizationRegions/ParRegions.cpp
similarity index 100%
rename from Sapfor/src/ParallelizationRegions/ParRegions.cpp
rename to src/ParallelizationRegions/ParRegions.cpp
diff --git a/Sapfor/src/ParallelizationRegions/ParRegions.h b/src/ParallelizationRegions/ParRegions.h
similarity index 100%
rename from Sapfor/src/ParallelizationRegions/ParRegions.h
rename to src/ParallelizationRegions/ParRegions.h
diff --git a/Sapfor/src/ParallelizationRegions/ParRegions_func.h b/src/ParallelizationRegions/ParRegions_func.h
similarity index 100%
rename from Sapfor/src/ParallelizationRegions/ParRegions_func.h
rename to src/ParallelizationRegions/ParRegions_func.h
diff --git a/Sapfor/src/ParallelizationRegions/expand_extract_reg.cpp b/src/ParallelizationRegions/expand_extract_reg.cpp
similarity index 100%
rename from Sapfor/src/ParallelizationRegions/expand_extract_reg.cpp
rename to src/ParallelizationRegions/expand_extract_reg.cpp
diff --git a/Sapfor/src/ParallelizationRegions/expand_extract_reg.h b/src/ParallelizationRegions/expand_extract_reg.h
similarity index 100%
rename from Sapfor/src/ParallelizationRegions/expand_extract_reg.h
rename to src/ParallelizationRegions/expand_extract_reg.h
diff --git a/Sapfor/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp b/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
similarity index 100%
rename from Sapfor/src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
rename to src/ParallelizationRegions/resolve_par_reg_conflicts.cpp
diff --git a/Sapfor/src/ParallelizationRegions/resolve_par_reg_conflicts.h b/src/ParallelizationRegions/resolve_par_reg_conflicts.h
similarity index 100%
rename from Sapfor/src/ParallelizationRegions/resolve_par_reg_conflicts.h
rename to src/ParallelizationRegions/resolve_par_reg_conflicts.h
diff --git a/Sapfor/src/Predictor/Lib/AMView.cpp b/src/Predictor/Lib/AMView.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/AMView.cpp
rename to src/Predictor/Lib/AMView.cpp
diff --git a/Sapfor/src/Predictor/Lib/AMView.h b/src/Predictor/Lib/AMView.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/AMView.h
rename to src/Predictor/Lib/AMView.h
diff --git a/Sapfor/src/Predictor/Lib/AlignAxis.cpp b/src/Predictor/Lib/AlignAxis.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/AlignAxis.cpp
rename to src/Predictor/Lib/AlignAxis.cpp
diff --git a/Sapfor/src/Predictor/Lib/AlignAxis.h b/src/Predictor/Lib/AlignAxis.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/AlignAxis.h
rename to src/Predictor/Lib/AlignAxis.h
diff --git a/Sapfor/src/Predictor/Lib/BGroup.cpp b/src/Predictor/Lib/BGroup.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/BGroup.cpp
rename to src/Predictor/Lib/BGroup.cpp
diff --git a/Sapfor/src/Predictor/Lib/BGroup.h b/src/Predictor/Lib/BGroup.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/BGroup.h
rename to src/Predictor/Lib/BGroup.h
diff --git a/Sapfor/src/Predictor/Lib/Block.cpp b/src/Predictor/Lib/Block.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Block.cpp
rename to src/Predictor/Lib/Block.cpp
diff --git a/Sapfor/src/Predictor/Lib/Block.h b/src/Predictor/Lib/Block.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Block.h
rename to src/Predictor/Lib/Block.h
diff --git a/Sapfor/src/Predictor/Lib/CallInfoStructs.h b/src/Predictor/Lib/CallInfoStructs.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/CallInfoStructs.h
rename to src/Predictor/Lib/CallInfoStructs.h
diff --git a/Sapfor/src/Predictor/Lib/CallParams.cpp b/src/Predictor/Lib/CallParams.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/CallParams.cpp
rename to src/Predictor/Lib/CallParams.cpp
diff --git a/Sapfor/src/Predictor/Lib/CommCost.cpp b/src/Predictor/Lib/CommCost.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/CommCost.cpp
rename to src/Predictor/Lib/CommCost.cpp
diff --git a/Sapfor/src/Predictor/Lib/CommCost.h b/src/Predictor/Lib/CommCost.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/CommCost.h
rename to src/Predictor/Lib/CommCost.h
diff --git a/Sapfor/src/Predictor/Lib/DArray.cpp b/src/Predictor/Lib/DArray.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/DArray.cpp
rename to src/Predictor/Lib/DArray.cpp
diff --git a/Sapfor/src/Predictor/Lib/DArray.h b/src/Predictor/Lib/DArray.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/DArray.h
rename to src/Predictor/Lib/DArray.h
diff --git a/Sapfor/src/Predictor/Lib/DimBound.cpp b/src/Predictor/Lib/DimBound.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/DimBound.cpp
rename to src/Predictor/Lib/DimBound.cpp
diff --git a/Sapfor/src/Predictor/Lib/DimBound.h b/src/Predictor/Lib/DimBound.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/DimBound.h
rename to src/Predictor/Lib/DimBound.h
diff --git a/Sapfor/src/Predictor/Lib/DistAxis.cpp b/src/Predictor/Lib/DistAxis.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/DistAxis.cpp
rename to src/Predictor/Lib/DistAxis.cpp
diff --git a/Sapfor/src/Predictor/Lib/DistAxis.h b/src/Predictor/Lib/DistAxis.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/DistAxis.h
rename to src/Predictor/Lib/DistAxis.h
diff --git a/Sapfor/src/Predictor/Lib/Event.cpp b/src/Predictor/Lib/Event.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Event.cpp
rename to src/Predictor/Lib/Event.cpp
diff --git a/Sapfor/src/Predictor/Lib/Event.h b/src/Predictor/Lib/Event.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Event.h
rename to src/Predictor/Lib/Event.h
diff --git a/Sapfor/src/Predictor/Lib/FuncCall.cpp b/src/Predictor/Lib/FuncCall.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/FuncCall.cpp
rename to src/Predictor/Lib/FuncCall.cpp
diff --git a/Sapfor/src/Predictor/Lib/FuncCall.h b/src/Predictor/Lib/FuncCall.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/FuncCall.h
rename to src/Predictor/Lib/FuncCall.h
diff --git a/Sapfor/src/Predictor/Lib/Interval.cpp b/src/Predictor/Lib/Interval.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Interval.cpp
rename to src/Predictor/Lib/Interval.cpp
diff --git a/Sapfor/src/Predictor/Lib/Interval.h b/src/Predictor/Lib/Interval.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Interval.h
rename to src/Predictor/Lib/Interval.h
diff --git a/Sapfor/src/Predictor/Lib/IntervalTemplate.cpp b/src/Predictor/Lib/IntervalTemplate.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/IntervalTemplate.cpp
rename to src/Predictor/Lib/IntervalTemplate.cpp
diff --git a/Sapfor/src/Predictor/Lib/LoopBlock.cpp b/src/Predictor/Lib/LoopBlock.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/LoopBlock.cpp
rename to src/Predictor/Lib/LoopBlock.cpp
diff --git a/Sapfor/src/Predictor/Lib/LoopBlock.h b/src/Predictor/Lib/LoopBlock.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/LoopBlock.h
rename to src/Predictor/Lib/LoopBlock.h
diff --git a/Sapfor/src/Predictor/Lib/LoopLS.cpp b/src/Predictor/Lib/LoopLS.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/LoopLS.cpp
rename to src/Predictor/Lib/LoopLS.cpp
diff --git a/Sapfor/src/Predictor/Lib/LoopLS.h b/src/Predictor/Lib/LoopLS.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/LoopLS.h
rename to src/Predictor/Lib/LoopLS.h
diff --git a/Sapfor/src/Predictor/Lib/Ls.cpp b/src/Predictor/Lib/Ls.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Ls.cpp
rename to src/Predictor/Lib/Ls.cpp
diff --git a/Sapfor/src/Predictor/Lib/Ls.h b/src/Predictor/Lib/Ls.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Ls.h
rename to src/Predictor/Lib/Ls.h
diff --git a/Sapfor/src/Predictor/Lib/ModelDArray.cpp b/src/Predictor/Lib/ModelDArray.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelDArray.cpp
rename to src/Predictor/Lib/ModelDArray.cpp
diff --git a/Sapfor/src/Predictor/Lib/ModelIO.cpp b/src/Predictor/Lib/ModelIO.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelIO.cpp
rename to src/Predictor/Lib/ModelIO.cpp
diff --git a/Sapfor/src/Predictor/Lib/ModelInterval.cpp b/src/Predictor/Lib/ModelInterval.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelInterval.cpp
rename to src/Predictor/Lib/ModelInterval.cpp
diff --git a/Sapfor/src/Predictor/Lib/ModelMPS_AM.cpp b/src/Predictor/Lib/ModelMPS_AM.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelMPS_AM.cpp
rename to src/Predictor/Lib/ModelMPS_AM.cpp
diff --git a/Sapfor/src/Predictor/Lib/ModelParLoop.cpp b/src/Predictor/Lib/ModelParLoop.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelParLoop.cpp
rename to src/Predictor/Lib/ModelParLoop.cpp
diff --git a/Sapfor/src/Predictor/Lib/ModelReduct.cpp b/src/Predictor/Lib/ModelReduct.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelReduct.cpp
rename to src/Predictor/Lib/ModelReduct.cpp
diff --git a/Sapfor/src/Predictor/Lib/ModelRegular.cpp b/src/Predictor/Lib/ModelRegular.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelRegular.cpp
rename to src/Predictor/Lib/ModelRegular.cpp
diff --git a/Sapfor/src/Predictor/Lib/ModelRemAccess.cpp b/src/Predictor/Lib/ModelRemAccess.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelRemAccess.cpp
rename to src/Predictor/Lib/ModelRemAccess.cpp
diff --git a/Sapfor/src/Predictor/Lib/ModelShadow.cpp b/src/Predictor/Lib/ModelShadow.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelShadow.cpp
rename to src/Predictor/Lib/ModelShadow.cpp
diff --git a/Sapfor/src/Predictor/Lib/ModelStructs.h b/src/Predictor/Lib/ModelStructs.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ModelStructs.h
rename to src/Predictor/Lib/ModelStructs.h
diff --git a/Sapfor/src/Predictor/Lib/ParLoop.cpp b/src/Predictor/Lib/ParLoop.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ParLoop.cpp
rename to src/Predictor/Lib/ParLoop.cpp
diff --git a/Sapfor/src/Predictor/Lib/ParLoop.h b/src/Predictor/Lib/ParLoop.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ParLoop.h
rename to src/Predictor/Lib/ParLoop.h
diff --git a/Sapfor/src/Predictor/Lib/ParseString.cpp b/src/Predictor/Lib/ParseString.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ParseString.cpp
rename to src/Predictor/Lib/ParseString.cpp
diff --git a/Sapfor/src/Predictor/Lib/ParseString.h b/src/Predictor/Lib/ParseString.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/ParseString.h
rename to src/Predictor/Lib/ParseString.h
diff --git a/Sapfor/src/Predictor/Lib/Processor.cpp b/src/Predictor/Lib/Processor.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Processor.cpp
rename to src/Predictor/Lib/Processor.cpp
diff --git a/Sapfor/src/Predictor/Lib/Processor.h b/src/Predictor/Lib/Processor.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Processor.h
rename to src/Predictor/Lib/Processor.h
diff --git a/Sapfor/src/Predictor/Lib/Ps.cpp b/src/Predictor/Lib/Ps.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Ps.cpp
rename to src/Predictor/Lib/Ps.cpp
diff --git a/Sapfor/src/Predictor/Lib/Ps.h b/src/Predictor/Lib/Ps.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Ps.h
rename to src/Predictor/Lib/Ps.h
diff --git a/Sapfor/src/Predictor/Lib/RedGroup.cpp b/src/Predictor/Lib/RedGroup.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/RedGroup.cpp
rename to src/Predictor/Lib/RedGroup.cpp
diff --git a/Sapfor/src/Predictor/Lib/RedGroup.h b/src/Predictor/Lib/RedGroup.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/RedGroup.h
rename to src/Predictor/Lib/RedGroup.h
diff --git a/Sapfor/src/Predictor/Lib/RedVar.cpp b/src/Predictor/Lib/RedVar.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/RedVar.cpp
rename to src/Predictor/Lib/RedVar.cpp
diff --git a/Sapfor/src/Predictor/Lib/RedVar.h b/src/Predictor/Lib/RedVar.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/RedVar.h
rename to src/Predictor/Lib/RedVar.h
diff --git a/Sapfor/src/Predictor/Lib/RemAccessBuf.cpp b/src/Predictor/Lib/RemAccessBuf.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/RemAccessBuf.cpp
rename to src/Predictor/Lib/RemAccessBuf.cpp
diff --git a/Sapfor/src/Predictor/Lib/RemAccessBuf.h b/src/Predictor/Lib/RemAccessBuf.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/RemAccessBuf.h
rename to src/Predictor/Lib/RemAccessBuf.h
diff --git a/Sapfor/src/Predictor/Lib/Space.cpp b/src/Predictor/Lib/Space.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Space.cpp
rename to src/Predictor/Lib/Space.cpp
diff --git a/Sapfor/src/Predictor/Lib/Space.h b/src/Predictor/Lib/Space.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Space.h
rename to src/Predictor/Lib/Space.h
diff --git a/Sapfor/src/Predictor/Lib/StdAfx.h b/src/Predictor/Lib/StdAfx.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/StdAfx.h
rename to src/Predictor/Lib/StdAfx.h
diff --git a/Sapfor/src/Predictor/Lib/TraceLine.cpp b/src/Predictor/Lib/TraceLine.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/TraceLine.cpp
rename to src/Predictor/Lib/TraceLine.cpp
diff --git a/Sapfor/src/Predictor/Lib/TraceLine.h b/src/Predictor/Lib/TraceLine.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/TraceLine.h
rename to src/Predictor/Lib/TraceLine.h
diff --git a/Sapfor/src/Predictor/Lib/Ver.h b/src/Predictor/Lib/Ver.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Ver.h
rename to src/Predictor/Lib/Ver.h
diff --git a/Sapfor/src/Predictor/Lib/Vm.cpp b/src/Predictor/Lib/Vm.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Vm.cpp
rename to src/Predictor/Lib/Vm.cpp
diff --git a/Sapfor/src/Predictor/Lib/Vm.h b/src/Predictor/Lib/Vm.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/Vm.h
rename to src/Predictor/Lib/Vm.h
diff --git a/Sapfor/src/Predictor/Lib/adler32.c b/src/Predictor/Lib/adler32.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/adler32.c
rename to src/Predictor/Lib/adler32.c
diff --git a/Sapfor/src/Predictor/Lib/compress.c b/src/Predictor/Lib/compress.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/compress.c
rename to src/Predictor/Lib/compress.c
diff --git a/Sapfor/src/Predictor/Lib/crc32.c b/src/Predictor/Lib/crc32.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/crc32.c
rename to src/Predictor/Lib/crc32.c
diff --git a/Sapfor/src/Predictor/Lib/deflate.c b/src/Predictor/Lib/deflate.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/deflate.c
rename to src/Predictor/Lib/deflate.c
diff --git a/Sapfor/src/Predictor/Lib/deflate.h b/src/Predictor/Lib/deflate.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/deflate.h
rename to src/Predictor/Lib/deflate.h
diff --git a/Sapfor/src/Predictor/Lib/gzio.c b/src/Predictor/Lib/gzio.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/gzio.c
rename to src/Predictor/Lib/gzio.c
diff --git a/Sapfor/src/Predictor/Lib/infblock.c b/src/Predictor/Lib/infblock.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/infblock.c
rename to src/Predictor/Lib/infblock.c
diff --git a/Sapfor/src/Predictor/Lib/infblock.h b/src/Predictor/Lib/infblock.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/infblock.h
rename to src/Predictor/Lib/infblock.h
diff --git a/Sapfor/src/Predictor/Lib/infcodes.c b/src/Predictor/Lib/infcodes.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/infcodes.c
rename to src/Predictor/Lib/infcodes.c
diff --git a/Sapfor/src/Predictor/Lib/infcodes.h b/src/Predictor/Lib/infcodes.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/infcodes.h
rename to src/Predictor/Lib/infcodes.h
diff --git a/Sapfor/src/Predictor/Lib/inffast.c b/src/Predictor/Lib/inffast.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/inffast.c
rename to src/Predictor/Lib/inffast.c
diff --git a/Sapfor/src/Predictor/Lib/inffast.h b/src/Predictor/Lib/inffast.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/inffast.h
rename to src/Predictor/Lib/inffast.h
diff --git a/Sapfor/src/Predictor/Lib/inffixed.h b/src/Predictor/Lib/inffixed.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/inffixed.h
rename to src/Predictor/Lib/inffixed.h
diff --git a/Sapfor/src/Predictor/Lib/inflate.c b/src/Predictor/Lib/inflate.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/inflate.c
rename to src/Predictor/Lib/inflate.c
diff --git a/Sapfor/src/Predictor/Lib/inftrees.c b/src/Predictor/Lib/inftrees.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/inftrees.c
rename to src/Predictor/Lib/inftrees.c
diff --git a/Sapfor/src/Predictor/Lib/inftrees.h b/src/Predictor/Lib/inftrees.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/inftrees.h
rename to src/Predictor/Lib/inftrees.h
diff --git a/Sapfor/src/Predictor/Lib/infutil.c b/src/Predictor/Lib/infutil.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/infutil.c
rename to src/Predictor/Lib/infutil.c
diff --git a/Sapfor/src/Predictor/Lib/infutil.h b/src/Predictor/Lib/infutil.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/infutil.h
rename to src/Predictor/Lib/infutil.h
diff --git a/Sapfor/src/Predictor/Lib/intersection.cpp b/src/Predictor/Lib/intersection.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/intersection.cpp
rename to src/Predictor/Lib/intersection.cpp
diff --git a/Sapfor/src/Predictor/Lib/predictor.cpp b/src/Predictor/Lib/predictor.cpp
similarity index 100%
rename from Sapfor/src/Predictor/Lib/predictor.cpp
rename to src/Predictor/Lib/predictor.cpp
diff --git a/Sapfor/src/Predictor/Lib/trees.c b/src/Predictor/Lib/trees.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/trees.c
rename to src/Predictor/Lib/trees.c
diff --git a/Sapfor/src/Predictor/Lib/trees.h b/src/Predictor/Lib/trees.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/trees.h
rename to src/Predictor/Lib/trees.h
diff --git a/Sapfor/src/Predictor/Lib/uncompr.c b/src/Predictor/Lib/uncompr.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/uncompr.c
rename to src/Predictor/Lib/uncompr.c
diff --git a/Sapfor/src/Predictor/Lib/zconf.h b/src/Predictor/Lib/zconf.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/zconf.h
rename to src/Predictor/Lib/zconf.h
diff --git a/Sapfor/src/Predictor/Lib/zlib.h b/src/Predictor/Lib/zlib.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/zlib.h
rename to src/Predictor/Lib/zlib.h
diff --git a/Sapfor/src/Predictor/Lib/zutil.c b/src/Predictor/Lib/zutil.c
similarity index 100%
rename from Sapfor/src/Predictor/Lib/zutil.c
rename to src/Predictor/Lib/zutil.c
diff --git a/Sapfor/src/Predictor/Lib/zutil.h b/src/Predictor/Lib/zutil.h
similarity index 100%
rename from Sapfor/src/Predictor/Lib/zutil.h
rename to src/Predictor/Lib/zutil.h
diff --git a/Sapfor/src/Predictor/PredictScheme.cpp b/src/Predictor/PredictScheme.cpp
similarity index 100%
rename from Sapfor/src/Predictor/PredictScheme.cpp
rename to src/Predictor/PredictScheme.cpp
diff --git a/Sapfor/src/Predictor/PredictScheme.h b/src/Predictor/PredictScheme.h
similarity index 100%
rename from Sapfor/src/Predictor/PredictScheme.h
rename to src/Predictor/PredictScheme.h
diff --git a/Sapfor/src/Predictor/PredictorInterface.h b/src/Predictor/PredictorInterface.h
similarity index 100%
rename from Sapfor/src/Predictor/PredictorInterface.h
rename to src/Predictor/PredictorInterface.h
diff --git a/Sapfor/src/Predictor/PredictorModel.cpp b/src/Predictor/PredictorModel.cpp
similarity index 100%
rename from Sapfor/src/Predictor/PredictorModel.cpp
rename to src/Predictor/PredictorModel.cpp
diff --git a/Sapfor/src/Predictor/PredictorModel.h b/src/Predictor/PredictorModel.h
similarity index 100%
rename from Sapfor/src/Predictor/PredictorModel.h
rename to src/Predictor/PredictorModel.h
diff --git a/Sapfor/src/PrivateAnalyzer/private_analyzer.cpp b/src/PrivateAnalyzer/private_analyzer.cpp
similarity index 100%
rename from Sapfor/src/PrivateAnalyzer/private_analyzer.cpp
rename to src/PrivateAnalyzer/private_analyzer.cpp
diff --git a/Sapfor/src/PrivateAnalyzer/private_analyzer.h b/src/PrivateAnalyzer/private_analyzer.h
similarity index 100%
rename from Sapfor/src/PrivateAnalyzer/private_analyzer.h
rename to src/PrivateAnalyzer/private_analyzer.h
diff --git a/Sapfor/src/ProjectManipulation/ConvertFiles.cpp b/src/ProjectManipulation/ConvertFiles.cpp
similarity index 100%
rename from Sapfor/src/ProjectManipulation/ConvertFiles.cpp
rename to src/ProjectManipulation/ConvertFiles.cpp
diff --git a/Sapfor/src/ProjectManipulation/ConvertFiles.h b/src/ProjectManipulation/ConvertFiles.h
similarity index 100%
rename from Sapfor/src/ProjectManipulation/ConvertFiles.h
rename to src/ProjectManipulation/ConvertFiles.h
diff --git a/Sapfor/src/ProjectManipulation/FileInfo.cpp b/src/ProjectManipulation/FileInfo.cpp
similarity index 100%
rename from Sapfor/src/ProjectManipulation/FileInfo.cpp
rename to src/ProjectManipulation/FileInfo.cpp
diff --git a/Sapfor/src/ProjectManipulation/FileInfo.h b/src/ProjectManipulation/FileInfo.h
similarity index 100%
rename from Sapfor/src/ProjectManipulation/FileInfo.h
rename to src/ProjectManipulation/FileInfo.h
diff --git a/Sapfor/src/ProjectManipulation/ParseFiles.cpp b/src/ProjectManipulation/ParseFiles.cpp
similarity index 100%
rename from Sapfor/src/ProjectManipulation/ParseFiles.cpp
rename to src/ProjectManipulation/ParseFiles.cpp
diff --git a/Sapfor/src/ProjectManipulation/ParseFiles.h b/src/ProjectManipulation/ParseFiles.h
similarity index 100%
rename from Sapfor/src/ProjectManipulation/ParseFiles.h
rename to src/ProjectManipulation/ParseFiles.h
diff --git a/Sapfor/src/ProjectManipulation/PerfAnalyzer.cpp b/src/ProjectManipulation/PerfAnalyzer.cpp
similarity index 100%
rename from Sapfor/src/ProjectManipulation/PerfAnalyzer.cpp
rename to src/ProjectManipulation/PerfAnalyzer.cpp
diff --git a/Sapfor/src/ProjectManipulation/PerfAnalyzer.h b/src/ProjectManipulation/PerfAnalyzer.h
similarity index 100%
rename from Sapfor/src/ProjectManipulation/PerfAnalyzer.h
rename to src/ProjectManipulation/PerfAnalyzer.h
diff --git a/Sapfor/src/ProjectManipulation/StdCapture.h b/src/ProjectManipulation/StdCapture.h
similarity index 100%
rename from Sapfor/src/ProjectManipulation/StdCapture.h
rename to src/ProjectManipulation/StdCapture.h
diff --git a/Sapfor/src/ProjectParameters/projectParameters.cpp b/src/ProjectParameters/projectParameters.cpp
similarity index 100%
rename from Sapfor/src/ProjectParameters/projectParameters.cpp
rename to src/ProjectParameters/projectParameters.cpp
diff --git a/Sapfor/src/ProjectParameters/projectParameters.h b/src/ProjectParameters/projectParameters.h
similarity index 100%
rename from Sapfor/src/ProjectParameters/projectParameters.h
rename to src/ProjectParameters/projectParameters.h
diff --git a/Sapfor/src/RenameSymbols/rename_symbols.cpp b/src/RenameSymbols/rename_symbols.cpp
similarity index 100%
rename from Sapfor/src/RenameSymbols/rename_symbols.cpp
rename to src/RenameSymbols/rename_symbols.cpp
diff --git a/Sapfor/src/RenameSymbols/rename_symbols.h b/src/RenameSymbols/rename_symbols.h
similarity index 100%
rename from Sapfor/src/RenameSymbols/rename_symbols.h
rename to src/RenameSymbols/rename_symbols.h
diff --git a/Sapfor/src/SageAnalysisTool/Makefile b/src/SageAnalysisTool/Makefile
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/Makefile
rename to src/SageAnalysisTool/Makefile
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/Makefile b/src/SageAnalysisTool/OmegaForSage/Makefile
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/Makefile
rename to src/SageAnalysisTool/OmegaForSage/Makefile
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/README b/src/SageAnalysisTool/OmegaForSage/README
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/README
rename to src/SageAnalysisTool/OmegaForSage/README
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/add-assert.cpp b/src/SageAnalysisTool/OmegaForSage/add-assert.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/add-assert.cpp
rename to src/SageAnalysisTool/OmegaForSage/add-assert.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/affine.cpp b/src/SageAnalysisTool/OmegaForSage/affine.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/affine.cpp
rename to src/SageAnalysisTool/OmegaForSage/affine.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/cover.cpp b/src/SageAnalysisTool/OmegaForSage/cover.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/cover.cpp
rename to src/SageAnalysisTool/OmegaForSage/cover.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp b/src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
rename to src/SageAnalysisTool/OmegaForSage/ddomega-build.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp b/src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
rename to src/SageAnalysisTool/OmegaForSage/ddomega-use.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega.cpp b/src/SageAnalysisTool/OmegaForSage/ddomega.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/ddomega.cpp
rename to src/SageAnalysisTool/OmegaForSage/ddomega.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/debug.cpp b/src/SageAnalysisTool/OmegaForSage/debug.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/debug.cpp
rename to src/SageAnalysisTool/OmegaForSage/debug.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/Exit.h b/src/SageAnalysisTool/OmegaForSage/include/Exit.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/Exit.h
rename to src/SageAnalysisTool/OmegaForSage/include/Exit.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/add-assert.h b/src/SageAnalysisTool/OmegaForSage/include/add-assert.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/add-assert.h
rename to src/SageAnalysisTool/OmegaForSage/include/add-assert.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/affine.h b/src/SageAnalysisTool/OmegaForSage/include/affine.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/affine.h
rename to src/SageAnalysisTool/OmegaForSage/include/affine.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/cover.h b/src/SageAnalysisTool/OmegaForSage/include/cover.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/cover.h
rename to src/SageAnalysisTool/OmegaForSage/include/cover.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/dddir.h b/src/SageAnalysisTool/OmegaForSage/include/dddir.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/dddir.h
rename to src/SageAnalysisTool/OmegaForSage/include/dddir.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h b/src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
rename to src/SageAnalysisTool/OmegaForSage/include/ddomega-build.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h b/src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
rename to src/SageAnalysisTool/OmegaForSage/include/ddomega-use.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega.h b/src/SageAnalysisTool/OmegaForSage/include/ddomega.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/ddomega.h
rename to src/SageAnalysisTool/OmegaForSage/include/ddomega.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/debug.h b/src/SageAnalysisTool/OmegaForSage/include/debug.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/debug.h
rename to src/SageAnalysisTool/OmegaForSage/include/debug.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/flags.h b/src/SageAnalysisTool/OmegaForSage/include/flags.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/flags.h
rename to src/SageAnalysisTool/OmegaForSage/include/flags.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/ip.h b/src/SageAnalysisTool/OmegaForSage/include/ip.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/ip.h
rename to src/SageAnalysisTool/OmegaForSage/include/ip.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/kill.h b/src/SageAnalysisTool/OmegaForSage/include/kill.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/kill.h
rename to src/SageAnalysisTool/OmegaForSage/include/kill.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic b/src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
rename to src/SageAnalysisTool/OmegaForSage/include/lang-interf.generic
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/lang-interf.h b/src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
rename to src/SageAnalysisTool/OmegaForSage/include/lang-interf.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/missing.h b/src/SageAnalysisTool/OmegaForSage/include/missing.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/missing.h
rename to src/SageAnalysisTool/OmegaForSage/include/missing.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/omega2flags.h b/src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
rename to src/SageAnalysisTool/OmegaForSage/include/omega2flags.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/portable.h b/src/SageAnalysisTool/OmegaForSage/include/portable.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/portable.h
rename to src/SageAnalysisTool/OmegaForSage/include/portable.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/portable.h.origine b/src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
rename to src/SageAnalysisTool/OmegaForSage/include/portable.h.origine
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/range.h b/src/SageAnalysisTool/OmegaForSage/include/range.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/range.h
rename to src/SageAnalysisTool/OmegaForSage/include/range.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/refine.h b/src/SageAnalysisTool/OmegaForSage/include/refine.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/refine.h
rename to src/SageAnalysisTool/OmegaForSage/include/refine.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/screen.h b/src/SageAnalysisTool/OmegaForSage/include/screen.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/screen.h
rename to src/SageAnalysisTool/OmegaForSage/include/screen.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/include/timeTrials.h b/src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
rename to src/SageAnalysisTool/OmegaForSage/include/timeTrials.h
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/ip.cpp b/src/SageAnalysisTool/OmegaForSage/ip.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/ip.cpp
rename to src/SageAnalysisTool/OmegaForSage/ip.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/kill.cpp b/src/SageAnalysisTool/OmegaForSage/kill.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/kill.cpp
rename to src/SageAnalysisTool/OmegaForSage/kill.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/refine.cpp b/src/SageAnalysisTool/OmegaForSage/refine.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/refine.cpp
rename to src/SageAnalysisTool/OmegaForSage/refine.cpp
diff --git a/Sapfor/src/SageAnalysisTool/OmegaForSage/sagedriver.cpp b/src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
rename to src/SageAnalysisTool/OmegaForSage/sagedriver.cpp
diff --git a/Sapfor/src/SageAnalysisTool/README b/src/SageAnalysisTool/README
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/README
rename to src/SageAnalysisTool/README
diff --git a/Sapfor/src/SageAnalysisTool/annotationDriver.cpp b/src/SageAnalysisTool/annotationDriver.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/annotationDriver.cpp
rename to src/SageAnalysisTool/annotationDriver.cpp
diff --git a/Sapfor/src/SageAnalysisTool/annotationDriver.h b/src/SageAnalysisTool/annotationDriver.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/annotationDriver.h
rename to src/SageAnalysisTool/annotationDriver.h
diff --git a/Sapfor/src/SageAnalysisTool/arrayRef.cpp b/src/SageAnalysisTool/arrayRef.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/arrayRef.cpp
rename to src/SageAnalysisTool/arrayRef.cpp
diff --git a/Sapfor/src/SageAnalysisTool/arrayRef.h b/src/SageAnalysisTool/arrayRef.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/arrayRef.h
rename to src/SageAnalysisTool/arrayRef.h
diff --git a/Sapfor/src/SageAnalysisTool/computeInducVar.cpp b/src/SageAnalysisTool/computeInducVar.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/computeInducVar.cpp
rename to src/SageAnalysisTool/computeInducVar.cpp
diff --git a/Sapfor/src/SageAnalysisTool/constanteProp.cpp b/src/SageAnalysisTool/constanteProp.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/constanteProp.cpp
rename to src/SageAnalysisTool/constanteProp.cpp
diff --git a/Sapfor/src/SageAnalysisTool/constanteSet.h b/src/SageAnalysisTool/constanteSet.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/constanteSet.h
rename to src/SageAnalysisTool/constanteSet.h
diff --git a/Sapfor/src/SageAnalysisTool/controlFlow.cpp b/src/SageAnalysisTool/controlFlow.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/controlFlow.cpp
rename to src/SageAnalysisTool/controlFlow.cpp
diff --git a/Sapfor/src/SageAnalysisTool/defUse.cpp b/src/SageAnalysisTool/defUse.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/defUse.cpp
rename to src/SageAnalysisTool/defUse.cpp
diff --git a/Sapfor/src/SageAnalysisTool/definesValues.h b/src/SageAnalysisTool/definesValues.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/definesValues.h
rename to src/SageAnalysisTool/definesValues.h
diff --git a/Sapfor/src/SageAnalysisTool/definitionSet.h b/src/SageAnalysisTool/definitionSet.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/definitionSet.h
rename to src/SageAnalysisTool/definitionSet.h
diff --git a/Sapfor/src/SageAnalysisTool/depGraph.cpp b/src/SageAnalysisTool/depGraph.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/depGraph.cpp
rename to src/SageAnalysisTool/depGraph.cpp
diff --git a/Sapfor/src/SageAnalysisTool/depGraph.h b/src/SageAnalysisTool/depGraph.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/depGraph.h
rename to src/SageAnalysisTool/depGraph.h
diff --git a/Sapfor/src/SageAnalysisTool/depInterface.cpp b/src/SageAnalysisTool/depInterface.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/depInterface.cpp
rename to src/SageAnalysisTool/depInterface.cpp
diff --git a/Sapfor/src/SageAnalysisTool/depInterface.h b/src/SageAnalysisTool/depInterface.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/depInterface.h
rename to src/SageAnalysisTool/depInterface.h
diff --git a/Sapfor/src/SageAnalysisTool/depInterfaceExt.h b/src/SageAnalysisTool/depInterfaceExt.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/depInterfaceExt.h
rename to src/SageAnalysisTool/depInterfaceExt.h
diff --git a/Sapfor/src/SageAnalysisTool/dependence.cpp b/src/SageAnalysisTool/dependence.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/dependence.cpp
rename to src/SageAnalysisTool/dependence.cpp
diff --git a/Sapfor/src/SageAnalysisTool/dependence.h b/src/SageAnalysisTool/dependence.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/dependence.h
rename to src/SageAnalysisTool/dependence.h
diff --git a/Sapfor/src/SageAnalysisTool/flowAnalysis.cpp b/src/SageAnalysisTool/flowAnalysis.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/flowAnalysis.cpp
rename to src/SageAnalysisTool/flowAnalysis.cpp
diff --git a/Sapfor/src/SageAnalysisTool/inducVar.h b/src/SageAnalysisTool/inducVar.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/inducVar.h
rename to src/SageAnalysisTool/inducVar.h
diff --git a/Sapfor/src/SageAnalysisTool/intrinsic.cpp b/src/SageAnalysisTool/intrinsic.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/intrinsic.cpp
rename to src/SageAnalysisTool/intrinsic.cpp
diff --git a/Sapfor/src/SageAnalysisTool/intrinsic.h b/src/SageAnalysisTool/intrinsic.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/intrinsic.h
rename to src/SageAnalysisTool/intrinsic.h
diff --git a/Sapfor/src/SageAnalysisTool/invariant.cpp b/src/SageAnalysisTool/invariant.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/invariant.cpp
rename to src/SageAnalysisTool/invariant.cpp
diff --git a/Sapfor/src/SageAnalysisTool/loopTransform.cpp b/src/SageAnalysisTool/loopTransform.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/loopTransform.cpp
rename to src/SageAnalysisTool/loopTransform.cpp
diff --git a/Sapfor/src/SageAnalysisTool/reductionCode.h b/src/SageAnalysisTool/reductionCode.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/reductionCode.h
rename to src/SageAnalysisTool/reductionCode.h
diff --git a/Sapfor/src/SageAnalysisTool/set.cpp b/src/SageAnalysisTool/set.cpp
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/set.cpp
rename to src/SageAnalysisTool/set.cpp
diff --git a/Sapfor/src/SageAnalysisTool/set.h b/src/SageAnalysisTool/set.h
similarity index 100%
rename from Sapfor/src/SageAnalysisTool/set.h
rename to src/SageAnalysisTool/set.h
diff --git a/Sapfor/src/Sapfor.cpp b/src/Sapfor.cpp
similarity index 100%
rename from Sapfor/src/Sapfor.cpp
rename to src/Sapfor.cpp
diff --git a/Sapfor/src/Sapfor.h b/src/Sapfor.h
similarity index 100%
rename from Sapfor/src/Sapfor.h
rename to src/Sapfor.h
diff --git a/Sapfor/src/SapforData.h b/src/SapforData.h
similarity index 100%
rename from Sapfor/src/SapforData.h
rename to src/SapforData.h
diff --git a/Sapfor/src/Server/checkUniq.cpp b/src/Server/checkUniq.cpp
similarity index 100%
rename from Sapfor/src/Server/checkUniq.cpp
rename to src/Server/checkUniq.cpp
diff --git a/Sapfor/src/Server/server.cpp b/src/Server/server.cpp
similarity index 100%
rename from Sapfor/src/Server/server.cpp
rename to src/Server/server.cpp
diff --git a/Sapfor/src/Server/spf_icon.ico b/src/Server/spf_icon.ico
similarity index 100%
rename from Sapfor/src/Server/spf_icon.ico
rename to src/Server/spf_icon.ico
diff --git a/Sapfor/src/Transformations/array_assign_to_loop.cpp b/src/Transformations/array_assign_to_loop.cpp
similarity index 100%
rename from Sapfor/src/Transformations/array_assign_to_loop.cpp
rename to src/Transformations/array_assign_to_loop.cpp
diff --git a/Sapfor/src/Transformations/array_assign_to_loop.h b/src/Transformations/array_assign_to_loop.h
similarity index 100%
rename from Sapfor/src/Transformations/array_assign_to_loop.h
rename to src/Transformations/array_assign_to_loop.h
diff --git a/Sapfor/src/Transformations/checkpoints.cpp b/src/Transformations/checkpoints.cpp
similarity index 100%
rename from Sapfor/src/Transformations/checkpoints.cpp
rename to src/Transformations/checkpoints.cpp
diff --git a/Sapfor/src/Transformations/checkpoints.h b/src/Transformations/checkpoints.h
similarity index 100%
rename from Sapfor/src/Transformations/checkpoints.h
rename to src/Transformations/checkpoints.h
diff --git a/Sapfor/src/Transformations/convert_to_c.cpp b/src/Transformations/convert_to_c.cpp
similarity index 100%
rename from Sapfor/src/Transformations/convert_to_c.cpp
rename to src/Transformations/convert_to_c.cpp
diff --git a/Sapfor/src/Transformations/convert_to_c.h b/src/Transformations/convert_to_c.h
similarity index 100%
rename from Sapfor/src/Transformations/convert_to_c.h
rename to src/Transformations/convert_to_c.h
diff --git a/Sapfor/src/Transformations/dead_code.cpp b/src/Transformations/dead_code.cpp
similarity index 100%
rename from Sapfor/src/Transformations/dead_code.cpp
rename to src/Transformations/dead_code.cpp
diff --git a/Sapfor/src/Transformations/dead_code.h b/src/Transformations/dead_code.h
similarity index 100%
rename from Sapfor/src/Transformations/dead_code.h
rename to src/Transformations/dead_code.h
diff --git a/Sapfor/src/Transformations/enddo_loop_converter.cpp b/src/Transformations/enddo_loop_converter.cpp
similarity index 100%
rename from Sapfor/src/Transformations/enddo_loop_converter.cpp
rename to src/Transformations/enddo_loop_converter.cpp
diff --git a/Sapfor/src/Transformations/enddo_loop_converter.h b/src/Transformations/enddo_loop_converter.h
similarity index 100%
rename from Sapfor/src/Transformations/enddo_loop_converter.h
rename to src/Transformations/enddo_loop_converter.h
diff --git a/Sapfor/src/Transformations/fix_common_blocks.cpp b/src/Transformations/fix_common_blocks.cpp
similarity index 100%
rename from Sapfor/src/Transformations/fix_common_blocks.cpp
rename to src/Transformations/fix_common_blocks.cpp
diff --git a/Sapfor/src/Transformations/fix_common_blocks.h b/src/Transformations/fix_common_blocks.h
similarity index 100%
rename from Sapfor/src/Transformations/fix_common_blocks.h
rename to src/Transformations/fix_common_blocks.h
diff --git a/Sapfor/src/Transformations/function_purifying.cpp b/src/Transformations/function_purifying.cpp
similarity index 100%
rename from Sapfor/src/Transformations/function_purifying.cpp
rename to src/Transformations/function_purifying.cpp
diff --git a/Sapfor/src/Transformations/function_purifying.h b/src/Transformations/function_purifying.h
similarity index 100%
rename from Sapfor/src/Transformations/function_purifying.h
rename to src/Transformations/function_purifying.h
diff --git a/Sapfor/src/Transformations/loop_transform.cpp b/src/Transformations/loop_transform.cpp
similarity index 100%
rename from Sapfor/src/Transformations/loop_transform.cpp
rename to src/Transformations/loop_transform.cpp
diff --git a/Sapfor/src/Transformations/loop_transform.h b/src/Transformations/loop_transform.h
similarity index 100%
rename from Sapfor/src/Transformations/loop_transform.h
rename to src/Transformations/loop_transform.h
diff --git a/Sapfor/src/Transformations/loops_combiner.cpp b/src/Transformations/loops_combiner.cpp
similarity index 100%
rename from Sapfor/src/Transformations/loops_combiner.cpp
rename to src/Transformations/loops_combiner.cpp
diff --git a/Sapfor/src/Transformations/loops_combiner.h b/src/Transformations/loops_combiner.h
similarity index 100%
rename from Sapfor/src/Transformations/loops_combiner.h
rename to src/Transformations/loops_combiner.h
diff --git a/Sapfor/src/Transformations/loops_splitter.cpp b/src/Transformations/loops_splitter.cpp
similarity index 100%
rename from Sapfor/src/Transformations/loops_splitter.cpp
rename to src/Transformations/loops_splitter.cpp
diff --git a/Sapfor/src/Transformations/loops_splitter.h b/src/Transformations/loops_splitter.h
similarity index 100%
rename from Sapfor/src/Transformations/loops_splitter.h
rename to src/Transformations/loops_splitter.h
diff --git a/Sapfor/src/Transformations/loops_unrolling.cpp b/src/Transformations/loops_unrolling.cpp
similarity index 100%
rename from Sapfor/src/Transformations/loops_unrolling.cpp
rename to src/Transformations/loops_unrolling.cpp
diff --git a/Sapfor/src/Transformations/loops_unrolling.h b/src/Transformations/loops_unrolling.h
similarity index 100%
rename from Sapfor/src/Transformations/loops_unrolling.h
rename to src/Transformations/loops_unrolling.h
diff --git a/Sapfor/src/Transformations/private_arrays_resizing.cpp b/src/Transformations/private_arrays_resizing.cpp
similarity index 100%
rename from Sapfor/src/Transformations/private_arrays_resizing.cpp
rename to src/Transformations/private_arrays_resizing.cpp
diff --git a/Sapfor/src/Transformations/private_arrays_resizing.h b/src/Transformations/private_arrays_resizing.h
similarity index 100%
rename from Sapfor/src/Transformations/private_arrays_resizing.h
rename to src/Transformations/private_arrays_resizing.h
diff --git a/Sapfor/src/Transformations/private_removing.cpp b/src/Transformations/private_removing.cpp
similarity index 100%
rename from Sapfor/src/Transformations/private_removing.cpp
rename to src/Transformations/private_removing.cpp
diff --git a/Sapfor/src/Transformations/private_removing.h b/src/Transformations/private_removing.h
similarity index 100%
rename from Sapfor/src/Transformations/private_removing.h
rename to src/Transformations/private_removing.h
diff --git a/Sapfor/src/Transformations/replace_dist_arrays_in_io.cpp b/src/Transformations/replace_dist_arrays_in_io.cpp
similarity index 100%
rename from Sapfor/src/Transformations/replace_dist_arrays_in_io.cpp
rename to src/Transformations/replace_dist_arrays_in_io.cpp
diff --git a/Sapfor/src/Transformations/replace_dist_arrays_in_io.h b/src/Transformations/replace_dist_arrays_in_io.h
similarity index 100%
rename from Sapfor/src/Transformations/replace_dist_arrays_in_io.h
rename to src/Transformations/replace_dist_arrays_in_io.h
diff --git a/Sapfor/src/Transformations/set_implicit_none.cpp b/src/Transformations/set_implicit_none.cpp
similarity index 100%
rename from Sapfor/src/Transformations/set_implicit_none.cpp
rename to src/Transformations/set_implicit_none.cpp
diff --git a/Sapfor/src/Transformations/set_implicit_none.h b/src/Transformations/set_implicit_none.h
similarity index 100%
rename from Sapfor/src/Transformations/set_implicit_none.h
rename to src/Transformations/set_implicit_none.h
diff --git a/Sapfor/src/Transformations/swap_array_dims.cpp b/src/Transformations/swap_array_dims.cpp
similarity index 100%
rename from Sapfor/src/Transformations/swap_array_dims.cpp
rename to src/Transformations/swap_array_dims.cpp
diff --git a/Sapfor/src/Transformations/swap_array_dims.h b/src/Transformations/swap_array_dims.h
similarity index 100%
rename from Sapfor/src/Transformations/swap_array_dims.h
rename to src/Transformations/swap_array_dims.h
diff --git a/Sapfor/src/Transformations/uniq_call_chain_dup.cpp b/src/Transformations/uniq_call_chain_dup.cpp
similarity index 100%
rename from Sapfor/src/Transformations/uniq_call_chain_dup.cpp
rename to src/Transformations/uniq_call_chain_dup.cpp
diff --git a/Sapfor/src/Transformations/uniq_call_chain_dup.h b/src/Transformations/uniq_call_chain_dup.h
similarity index 100%
rename from Sapfor/src/Transformations/uniq_call_chain_dup.h
rename to src/Transformations/uniq_call_chain_dup.h
diff --git a/Sapfor/src/Utils/AstWrapper.h b/src/Utils/AstWrapper.h
similarity index 100%
rename from Sapfor/src/Utils/AstWrapper.h
rename to src/Utils/AstWrapper.h
diff --git a/Sapfor/src/Utils/BoostStackTrace.cpp b/src/Utils/BoostStackTrace.cpp
similarity index 100%
rename from Sapfor/src/Utils/BoostStackTrace.cpp
rename to src/Utils/BoostStackTrace.cpp
diff --git a/Sapfor/src/Utils/CommonBlock.h b/src/Utils/CommonBlock.h
similarity index 100%
rename from Sapfor/src/Utils/CommonBlock.h
rename to src/Utils/CommonBlock.h
diff --git a/Sapfor/src/Utils/DefUseList.h b/src/Utils/DefUseList.h
similarity index 100%
rename from Sapfor/src/Utils/DefUseList.h
rename to src/Utils/DefUseList.h
diff --git a/Sapfor/src/Utils/PassManager.h b/src/Utils/PassManager.h
similarity index 100%
rename from Sapfor/src/Utils/PassManager.h
rename to src/Utils/PassManager.h
diff --git a/Sapfor/src/Utils/RationalNum.cpp b/src/Utils/RationalNum.cpp
similarity index 100%
rename from Sapfor/src/Utils/RationalNum.cpp
rename to src/Utils/RationalNum.cpp
diff --git a/Sapfor/src/Utils/RationalNum.h b/src/Utils/RationalNum.h
similarity index 100%
rename from Sapfor/src/Utils/RationalNum.h
rename to src/Utils/RationalNum.h
diff --git a/Sapfor/src/Utils/SgUtils.cpp b/src/Utils/SgUtils.cpp
similarity index 100%
rename from Sapfor/src/Utils/SgUtils.cpp
rename to src/Utils/SgUtils.cpp
diff --git a/Sapfor/src/Utils/SgUtils.h b/src/Utils/SgUtils.h
similarity index 100%
rename from Sapfor/src/Utils/SgUtils.h
rename to src/Utils/SgUtils.h
diff --git a/Sapfor/src/Utils/errors.h b/src/Utils/errors.h
similarity index 100%
rename from Sapfor/src/Utils/errors.h
rename to src/Utils/errors.h
diff --git a/Sapfor/src/Utils/leak_detector.h b/src/Utils/leak_detector.h
similarity index 100%
rename from Sapfor/src/Utils/leak_detector.h
rename to src/Utils/leak_detector.h
diff --git a/Sapfor/src/Utils/module_utils.cpp b/src/Utils/module_utils.cpp
similarity index 100%
rename from Sapfor/src/Utils/module_utils.cpp
rename to src/Utils/module_utils.cpp
diff --git a/Sapfor/src/Utils/module_utils.h b/src/Utils/module_utils.h
similarity index 100%
rename from Sapfor/src/Utils/module_utils.h
rename to src/Utils/module_utils.h
diff --git a/Sapfor/src/Utils/russian_errors_text.txt b/src/Utils/russian_errors_text.txt
similarity index 100%
rename from Sapfor/src/Utils/russian_errors_text.txt
rename to src/Utils/russian_errors_text.txt
diff --git a/Sapfor/src/Utils/types.h b/src/Utils/types.h
similarity index 100%
rename from Sapfor/src/Utils/types.h
rename to src/Utils/types.h
diff --git a/Sapfor/src/Utils/utils.cpp b/src/Utils/utils.cpp
similarity index 100%
rename from Sapfor/src/Utils/utils.cpp
rename to src/Utils/utils.cpp
diff --git a/Sapfor/src/Utils/utils.h b/src/Utils/utils.h
similarity index 100%
rename from Sapfor/src/Utils/utils.h
rename to src/Utils/utils.h
diff --git a/Sapfor/src/Utils/version.h b/src/Utils/version.h
similarity index 100%
rename from Sapfor/src/Utils/version.h
rename to src/Utils/version.h
diff --git a/Sapfor/src/VerificationCode/CorrectVarDecl.cpp b/src/VerificationCode/CorrectVarDecl.cpp
similarity index 100%
rename from Sapfor/src/VerificationCode/CorrectVarDecl.cpp
rename to src/VerificationCode/CorrectVarDecl.cpp
diff --git a/Sapfor/src/VerificationCode/IncludeChecker.cpp b/src/VerificationCode/IncludeChecker.cpp
similarity index 100%
rename from Sapfor/src/VerificationCode/IncludeChecker.cpp
rename to src/VerificationCode/IncludeChecker.cpp
diff --git a/Sapfor/src/VerificationCode/StructureChecker.cpp b/src/VerificationCode/StructureChecker.cpp
similarity index 100%
rename from Sapfor/src/VerificationCode/StructureChecker.cpp
rename to src/VerificationCode/StructureChecker.cpp
diff --git a/Sapfor/src/VerificationCode/VerifySageStructures.cpp b/src/VerificationCode/VerifySageStructures.cpp
similarity index 100%
rename from Sapfor/src/VerificationCode/VerifySageStructures.cpp
rename to src/VerificationCode/VerifySageStructures.cpp
diff --git a/Sapfor/src/VerificationCode/verifications.h b/src/VerificationCode/verifications.h
similarity index 100%
rename from Sapfor/src/VerificationCode/verifications.h
rename to src/VerificationCode/verifications.h
diff --git a/Sapfor/src/VisualizerCalls/BuildGraph.cpp b/src/VisualizerCalls/BuildGraph.cpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/BuildGraph.cpp
rename to src/VisualizerCalls/BuildGraph.cpp
diff --git a/Sapfor/src/VisualizerCalls/BuildGraph.h b/src/VisualizerCalls/BuildGraph.h
similarity index 100%
rename from Sapfor/src/VisualizerCalls/BuildGraph.h
rename to src/VisualizerCalls/BuildGraph.h
diff --git a/Sapfor/src/VisualizerCalls/SendMessage.cpp b/src/VisualizerCalls/SendMessage.cpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/SendMessage.cpp
rename to src/VisualizerCalls/SendMessage.cpp
diff --git a/Sapfor/src/VisualizerCalls/SendMessage.h b/src/VisualizerCalls/SendMessage.h
similarity index 100%
rename from Sapfor/src/VisualizerCalls/SendMessage.h
rename to src/VisualizerCalls/SendMessage.h
diff --git a/Sapfor/src/VisualizerCalls/get_information.cpp b/src/VisualizerCalls/get_information.cpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/get_information.cpp
rename to src/VisualizerCalls/get_information.cpp
diff --git a/Sapfor/src/VisualizerCalls/get_information.h b/src/VisualizerCalls/get_information.h
similarity index 100%
rename from Sapfor/src/VisualizerCalls/get_information.h
rename to src/VisualizerCalls/get_information.h
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/algebra.cpp b/src/VisualizerCalls/graphLayout/algebra.cpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/algebra.cpp
rename to src/VisualizerCalls/graphLayout/algebra.cpp
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/algebra.hpp b/src/VisualizerCalls/graphLayout/algebra.hpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/algebra.hpp
rename to src/VisualizerCalls/graphLayout/algebra.hpp
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp b/src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
rename to src/VisualizerCalls/graphLayout/fruchterman_reingold.cpp
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp b/src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
rename to src/VisualizerCalls/graphLayout/fruchterman_reingold.hpp
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/kamada_kawai.cpp b/src/VisualizerCalls/graphLayout/kamada_kawai.cpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/kamada_kawai.cpp
rename to src/VisualizerCalls/graphLayout/kamada_kawai.cpp
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/kamada_kawai.hpp b/src/VisualizerCalls/graphLayout/kamada_kawai.hpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/kamada_kawai.hpp
rename to src/VisualizerCalls/graphLayout/kamada_kawai.hpp
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/layout.cpp b/src/VisualizerCalls/graphLayout/layout.cpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/layout.cpp
rename to src/VisualizerCalls/graphLayout/layout.cpp
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/layout.hpp b/src/VisualizerCalls/graphLayout/layout.hpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/layout.hpp
rename to src/VisualizerCalls/graphLayout/layout.hpp
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/nodesoup.cpp b/src/VisualizerCalls/graphLayout/nodesoup.cpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/nodesoup.cpp
rename to src/VisualizerCalls/graphLayout/nodesoup.cpp
diff --git a/Sapfor/src/VisualizerCalls/graphLayout/nodesoup.hpp b/src/VisualizerCalls/graphLayout/nodesoup.hpp
similarity index 100%
rename from Sapfor/src/VisualizerCalls/graphLayout/nodesoup.hpp
rename to src/VisualizerCalls/graphLayout/nodesoup.hpp
diff --git a/Sapfor/tests/inliner/alex.f b/tests/inliner/alex.f
similarity index 100%
rename from Sapfor/tests/inliner/alex.f
rename to tests/inliner/alex.f
diff --git a/Sapfor/tests/inliner/array_sum.f b/tests/inliner/array_sum.f
similarity index 100%
rename from Sapfor/tests/inliner/array_sum.f
rename to tests/inliner/array_sum.f
diff --git a/Sapfor/tests/inliner/inlineFunctionWithAllocatable.f90 b/tests/inliner/inlineFunctionWithAllocatable.f90
similarity index 100%
rename from Sapfor/tests/inliner/inlineFunctionWithAllocatable.f90
rename to tests/inliner/inlineFunctionWithAllocatable.f90
diff --git a/Sapfor/tests/inliner/sub.f b/tests/inliner/sub.f
similarity index 100%
rename from Sapfor/tests/inliner/sub.f
rename to tests/inliner/sub.f
diff --git a/Sapfor/tests/inliner/test.f b/tests/inliner/test.f
similarity index 100%
rename from Sapfor/tests/inliner/test.f
rename to tests/inliner/test.f
diff --git a/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f b/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
similarity index 100%
rename from Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
rename to tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err1.f
diff --git a/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f b/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
similarity index 100%
rename from Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
rename to tests/sapfor/PRINT_PAR_REGIONS_ERRORS/entry_err2.f
diff --git a/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f b/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
similarity index 100%
rename from Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
rename to tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok1.f
diff --git a/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f b/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
similarity index 100%
rename from Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
rename to tests/sapfor/PRINT_PAR_REGIONS_ERRORS/etnry_ok2.f
diff --git a/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f b/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
similarity index 100%
rename from Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
rename to tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_err1.f
diff --git a/Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f b/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
similarity index 100%
rename from Sapfor/tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
rename to tests/sapfor/PRINT_PAR_REGIONS_ERRORS/goto_ok1.f
diff --git a/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err1.f b/tests/sapfor/check_args_decl/arg_decl_test_err1.f
similarity index 100%
rename from Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err1.f
rename to tests/sapfor/check_args_decl/arg_decl_test_err1.f
diff --git a/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err2.f b/tests/sapfor/check_args_decl/arg_decl_test_err2.f
similarity index 100%
rename from Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err2.f
rename to tests/sapfor/check_args_decl/arg_decl_test_err2.f
diff --git a/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err3.f b/tests/sapfor/check_args_decl/arg_decl_test_err3.f
similarity index 100%
rename from Sapfor/tests/sapfor/check_args_decl/arg_decl_test_err3.f
rename to tests/sapfor/check_args_decl/arg_decl_test_err3.f
diff --git a/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok1.f b/tests/sapfor/check_args_decl/arg_decl_test_ok1.f
similarity index 100%
rename from Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok1.f
rename to tests/sapfor/check_args_decl/arg_decl_test_ok1.f
diff --git a/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok2.f b/tests/sapfor/check_args_decl/arg_decl_test_ok2.f
similarity index 100%
rename from Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok2.f
rename to tests/sapfor/check_args_decl/arg_decl_test_ok2.f
diff --git a/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok3.f b/tests/sapfor/check_args_decl/arg_decl_test_ok3.f
similarity index 100%
rename from Sapfor/tests/sapfor/check_args_decl/arg_decl_test_ok3.f
rename to tests/sapfor/check_args_decl/arg_decl_test_ok3.f
diff --git a/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_wr1.f b/tests/sapfor/check_args_decl/arg_decl_test_wr1.f
similarity index 100%
rename from Sapfor/tests/sapfor/check_args_decl/arg_decl_test_wr1.f
rename to tests/sapfor/check_args_decl/arg_decl_test_wr1.f
diff --git a/Sapfor/tests/sapfor/check_args_decl/arg_decl_test_wr3.f b/tests/sapfor/check_args_decl/arg_decl_test_wr3.f
similarity index 100%
rename from Sapfor/tests/sapfor/check_args_decl/arg_decl_test_wr3.f
rename to tests/sapfor/check_args_decl/arg_decl_test_wr3.f
diff --git a/Sapfor/tests/sapfor/checkpoint/checkpoint.f90 b/tests/sapfor/checkpoint/checkpoint.f90
similarity index 100%
rename from Sapfor/tests/sapfor/checkpoint/checkpoint.f90
rename to tests/sapfor/checkpoint/checkpoint.f90
diff --git a/Sapfor/tests/sapfor/checkpoint/checkpoint2.f90 b/tests/sapfor/checkpoint/checkpoint2.f90
similarity index 100%
rename from Sapfor/tests/sapfor/checkpoint/checkpoint2.f90
rename to tests/sapfor/checkpoint/checkpoint2.f90
diff --git a/Sapfor/tests/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90 b/tests/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
similarity index 100%
rename from Sapfor/tests/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
rename to tests/sapfor/convert_assign_to_loop/anyArguments_fromLittleToBig.f90
diff --git a/Sapfor/tests/sapfor/convert_assign_to_loop/assign_with_sections.f b/tests/sapfor/convert_assign_to_loop/assign_with_sections.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_assign_to_loop/assign_with_sections.f
rename to tests/sapfor/convert_assign_to_loop/assign_with_sections.f
diff --git a/Sapfor/tests/sapfor/convert_assign_to_loop/simple_assign.f b/tests/sapfor/convert_assign_to_loop/simple_assign.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_assign_to_loop/simple_assign.f
rename to tests/sapfor/convert_assign_to_loop/simple_assign.f
diff --git a/Sapfor/tests/sapfor/convert_assign_to_loop/two_dimensional_assign.f b/tests/sapfor/convert_assign_to_loop/two_dimensional_assign.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_assign_to_loop/two_dimensional_assign.f
rename to tests/sapfor/convert_assign_to_loop/two_dimensional_assign.f
diff --git a/Sapfor/tests/sapfor/convert_expr_to_loop/expr_with_sections.f b/tests/sapfor/convert_expr_to_loop/expr_with_sections.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_expr_to_loop/expr_with_sections.f
rename to tests/sapfor/convert_expr_to_loop/expr_with_sections.f
diff --git a/Sapfor/tests/sapfor/convert_expr_to_loop/simple_expr.f b/tests/sapfor/convert_expr_to_loop/simple_expr.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_expr_to_loop/simple_expr.f
rename to tests/sapfor/convert_expr_to_loop/simple_expr.f
diff --git a/Sapfor/tests/sapfor/convert_expr_to_loop/two_dimensional_expr.f b/tests/sapfor/convert_expr_to_loop/two_dimensional_expr.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_expr_to_loop/two_dimensional_expr.f
rename to tests/sapfor/convert_expr_to_loop/two_dimensional_expr.f
diff --git a/Sapfor/tests/sapfor/convert_sum_to_loop/simple_sum.f b/tests/sapfor/convert_sum_to_loop/simple_sum.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_sum_to_loop/simple_sum.f
rename to tests/sapfor/convert_sum_to_loop/simple_sum.f
diff --git a/Sapfor/tests/sapfor/convert_sum_to_loop/sum_with_sections.f b/tests/sapfor/convert_sum_to_loop/sum_with_sections.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_sum_to_loop/sum_with_sections.f
rename to tests/sapfor/convert_sum_to_loop/sum_with_sections.f
diff --git a/Sapfor/tests/sapfor/convert_sum_to_loop/two_dimensional_sum.f b/tests/sapfor/convert_sum_to_loop/two_dimensional_sum.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_sum_to_loop/two_dimensional_sum.f
rename to tests/sapfor/convert_sum_to_loop/two_dimensional_sum.f
diff --git a/Sapfor/tests/sapfor/convert_where_to_loop/simple_where.f b/tests/sapfor/convert_where_to_loop/simple_where.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_where_to_loop/simple_where.f
rename to tests/sapfor/convert_where_to_loop/simple_where.f
diff --git a/Sapfor/tests/sapfor/convert_where_to_loop/two_dimensional_where.f b/tests/sapfor/convert_where_to_loop/two_dimensional_where.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_where_to_loop/two_dimensional_where.f
rename to tests/sapfor/convert_where_to_loop/two_dimensional_where.f
diff --git a/Sapfor/tests/sapfor/convert_where_to_loop/where_with_sections.f b/tests/sapfor/convert_where_to_loop/where_with_sections.f
similarity index 100%
rename from Sapfor/tests/sapfor/convert_where_to_loop/where_with_sections.f
rename to tests/sapfor/convert_where_to_loop/where_with_sections.f
diff --git a/Sapfor/tests/sapfor/create_nested_loops/program.expected.f90 b/tests/sapfor/create_nested_loops/program.expected.f90
similarity index 100%
rename from Sapfor/tests/sapfor/create_nested_loops/program.expected.f90
rename to tests/sapfor/create_nested_loops/program.expected.f90
diff --git a/Sapfor/tests/sapfor/create_nested_loops/program.f90 b/tests/sapfor/create_nested_loops/program.f90
similarity index 100%
rename from Sapfor/tests/sapfor/create_nested_loops/program.f90
rename to tests/sapfor/create_nested_loops/program.f90
diff --git a/Sapfor/tests/sapfor/create_nested_loops/test.bat b/tests/sapfor/create_nested_loops/test.bat
similarity index 100%
rename from Sapfor/tests/sapfor/create_nested_loops/test.bat
rename to tests/sapfor/create_nested_loops/test.bat
diff --git a/Sapfor/tests/sapfor/create_nested_loops/test.sh b/tests/sapfor/create_nested_loops/test.sh
similarity index 100%
rename from Sapfor/tests/sapfor/create_nested_loops/test.sh
rename to tests/sapfor/create_nested_loops/test.sh
diff --git a/Sapfor/tests/sapfor/fission_and_private_exp/fission_priv_exp.f90 b/tests/sapfor/fission_and_private_exp/fission_priv_exp.f90
similarity index 100%
rename from Sapfor/tests/sapfor/fission_and_private_exp/fission_priv_exp.f90
rename to tests/sapfor/fission_and_private_exp/fission_priv_exp.f90
diff --git a/Sapfor/tests/sapfor/loops_combiner/test_1.for b/tests/sapfor/loops_combiner/test_1.for
similarity index 100%
rename from Sapfor/tests/sapfor/loops_combiner/test_1.for
rename to tests/sapfor/loops_combiner/test_1.for
diff --git a/Sapfor/tests/sapfor/loops_combiner/test_2.for b/tests/sapfor/loops_combiner/test_2.for
similarity index 100%
rename from Sapfor/tests/sapfor/loops_combiner/test_2.for
rename to tests/sapfor/loops_combiner/test_2.for
diff --git a/Sapfor/tests/sapfor/loops_combiner/test_3.for b/tests/sapfor/loops_combiner/test_3.for
similarity index 100%
rename from Sapfor/tests/sapfor/loops_combiner/test_3.for
rename to tests/sapfor/loops_combiner/test_3.for
diff --git a/Sapfor/tests/sapfor/loops_combiner/test_4.for b/tests/sapfor/loops_combiner/test_4.for
similarity index 100%
rename from Sapfor/tests/sapfor/loops_combiner/test_4.for
rename to tests/sapfor/loops_combiner/test_4.for
diff --git a/Sapfor/tests/sapfor/loops_combiner/test_5.for b/tests/sapfor/loops_combiner/test_5.for
similarity index 100%
rename from Sapfor/tests/sapfor/loops_combiner/test_5.for
rename to tests/sapfor/loops_combiner/test_5.for
diff --git a/Sapfor/tests/sapfor/merge_regions/array_read_before_write.in b/tests/sapfor/merge_regions/array_read_before_write.in
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/array_read_before_write.in
rename to tests/sapfor/merge_regions/array_read_before_write.in
diff --git a/Sapfor/tests/sapfor/merge_regions/array_read_before_write.out b/tests/sapfor/merge_regions/array_read_before_write.out
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/array_read_before_write.out
rename to tests/sapfor/merge_regions/array_read_before_write.out
diff --git a/Sapfor/tests/sapfor/merge_regions/read_before_read.in b/tests/sapfor/merge_regions/read_before_read.in
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/read_before_read.in
rename to tests/sapfor/merge_regions/read_before_read.in
diff --git a/Sapfor/tests/sapfor/merge_regions/read_before_read.out b/tests/sapfor/merge_regions/read_before_read.out
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/read_before_read.out
rename to tests/sapfor/merge_regions/read_before_read.out
diff --git a/Sapfor/tests/sapfor/merge_regions/read_in_loop_header.in b/tests/sapfor/merge_regions/read_in_loop_header.in
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/read_in_loop_header.in
rename to tests/sapfor/merge_regions/read_in_loop_header.in
diff --git a/Sapfor/tests/sapfor/merge_regions/read_in_loop_header.out b/tests/sapfor/merge_regions/read_in_loop_header.out
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/read_in_loop_header.out
rename to tests/sapfor/merge_regions/read_in_loop_header.out
diff --git a/Sapfor/tests/sapfor/merge_regions/var_modified_in_fun.in b/tests/sapfor/merge_regions/var_modified_in_fun.in
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/var_modified_in_fun.in
rename to tests/sapfor/merge_regions/var_modified_in_fun.in
diff --git a/Sapfor/tests/sapfor/merge_regions/var_modified_in_fun.out b/tests/sapfor/merge_regions/var_modified_in_fun.out
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/var_modified_in_fun.out
rename to tests/sapfor/merge_regions/var_modified_in_fun.out
diff --git a/Sapfor/tests/sapfor/merge_regions/var_read_before_write.in b/tests/sapfor/merge_regions/var_read_before_write.in
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/var_read_before_write.in
rename to tests/sapfor/merge_regions/var_read_before_write.in
diff --git a/Sapfor/tests/sapfor/merge_regions/var_read_before_write.out b/tests/sapfor/merge_regions/var_read_before_write.out
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/var_read_before_write.out
rename to tests/sapfor/merge_regions/var_read_before_write.out
diff --git a/Sapfor/tests/sapfor/merge_regions/write_before_read.in b/tests/sapfor/merge_regions/write_before_read.in
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/write_before_read.in
rename to tests/sapfor/merge_regions/write_before_read.in
diff --git a/Sapfor/tests/sapfor/merge_regions/write_before_read.out b/tests/sapfor/merge_regions/write_before_read.out
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/write_before_read.out
rename to tests/sapfor/merge_regions/write_before_read.out
diff --git a/Sapfor/tests/sapfor/merge_regions/write_before_write.in b/tests/sapfor/merge_regions/write_before_write.in
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/write_before_write.in
rename to tests/sapfor/merge_regions/write_before_write.in
diff --git a/Sapfor/tests/sapfor/merge_regions/write_before_write.out b/tests/sapfor/merge_regions/write_before_write.out
similarity index 100%
rename from Sapfor/tests/sapfor/merge_regions/write_before_write.out
rename to tests/sapfor/merge_regions/write_before_write.out
diff --git a/Sapfor/tests/sapfor/parameter/magnit_3d.for b/tests/sapfor/parameter/magnit_3d.for
similarity index 100%
rename from Sapfor/tests/sapfor/parameter/magnit_3d.for
rename to tests/sapfor/parameter/magnit_3d.for
diff --git a/Sapfor/tests/sapfor/parameter/mycom.for b/tests/sapfor/parameter/mycom.for
similarity index 100%
rename from Sapfor/tests/sapfor/parameter/mycom.for
rename to tests/sapfor/parameter/mycom.for
diff --git a/Sapfor/tests/sapfor/parameter/parameter.f90 b/tests/sapfor/parameter/parameter.f90
similarity index 100%
rename from Sapfor/tests/sapfor/parameter/parameter.f90
rename to tests/sapfor/parameter/parameter.f90
diff --git a/Sapfor/tests/sapfor/private_removing/test.f b/tests/sapfor/private_removing/test.f
similarity index 100%
rename from Sapfor/tests/sapfor/private_removing/test.f
rename to tests/sapfor/private_removing/test.f
diff --git a/Sapfor/tests/sapfor/private_removing/test_cannot_remove.f b/tests/sapfor/private_removing/test_cannot_remove.f
similarity index 100%
rename from Sapfor/tests/sapfor/private_removing/test_cannot_remove.f
rename to tests/sapfor/private_removing/test_cannot_remove.f
diff --git a/Sapfor/tests/sapfor/private_removing/test_cascade.f b/tests/sapfor/private_removing/test_cascade.f
similarity index 100%
rename from Sapfor/tests/sapfor/private_removing/test_cascade.f
rename to tests/sapfor/private_removing/test_cascade.f
diff --git a/Sapfor/tests/sapfor/shrink/error.f b/tests/sapfor/shrink/error.f
similarity index 100%
rename from Sapfor/tests/sapfor/shrink/error.f
rename to tests/sapfor/shrink/error.f
diff --git a/Sapfor/tests/sapfor/shrink/error2.f b/tests/sapfor/shrink/error2.f
similarity index 100%
rename from Sapfor/tests/sapfor/shrink/error2.f
rename to tests/sapfor/shrink/error2.f
diff --git a/Sapfor/tests/sapfor/shrink/error3.f b/tests/sapfor/shrink/error3.f
similarity index 100%
rename from Sapfor/tests/sapfor/shrink/error3.f
rename to tests/sapfor/shrink/error3.f
diff --git a/Sapfor/tests/sapfor/shrink/shrink.f b/tests/sapfor/shrink/shrink.f
similarity index 100%
rename from Sapfor/tests/sapfor/shrink/shrink.f
rename to tests/sapfor/shrink/shrink.f
diff --git a/Sapfor/tests/sapfor/shrink/shrink2.f b/tests/sapfor/shrink/shrink2.f
similarity index 100%
rename from Sapfor/tests/sapfor/shrink/shrink2.f
rename to tests/sapfor/shrink/shrink2.f
diff --git a/Sapfor/tests/sapfor/shrink/shrink3.f b/tests/sapfor/shrink/shrink3.f
similarity index 100%
rename from Sapfor/tests/sapfor/shrink/shrink3.f
rename to tests/sapfor/shrink/shrink3.f

From 7a51067b7a3340840f100f858871eed600b684d5 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Thu, 13 Mar 2025 09:28:27 +0300
Subject: [PATCH 30/44] moved to dvm_svn

---
 CMakeLists.txt                                | 41 +++++--------------
 projects/{dvm => dvm_svn}/fdvm/CMakeLists.txt |  0
 .../fdvm/trunk/CMakeLists.txt                 |  0
 .../fdvm/trunk/InlineExpansion/CMakeLists.txt |  0
 .../fdvm/trunk/InlineExpansion/dvm_tag.h      |  0
 .../fdvm/trunk/InlineExpansion/hlp.cpp        |  0
 .../fdvm/trunk/InlineExpansion/inl_exp.cpp    |  0
 .../fdvm/trunk/InlineExpansion/inline.h       |  0
 .../fdvm/trunk/InlineExpansion/inliner.cpp    |  0
 .../fdvm/trunk/InlineExpansion/intrinsic.h    |  0
 .../fdvm/trunk/InlineExpansion/makefile.uni   |  0
 .../fdvm/trunk/InlineExpansion/makefile.win   |  0
 projects/{dvm => dvm_svn}/fdvm/trunk/Makefile |  0
 .../fdvm/trunk/Sage/CMakeLists.txt            |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/LICENSE  |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/Makefile |  0
 .../fdvm/trunk/Sage/Sage++/CMakeLists.txt     |  0
 .../fdvm/trunk/Sage/Sage++/Makefile           |  0
 .../fdvm/trunk/Sage/Sage++/libSage++.cpp      |  0
 .../fdvm/trunk/Sage/Sage++/makefile.uni       |  0
 .../fdvm/trunk/Sage/Sage++/makefile.win       |  0
 .../fdvm/trunk/Sage/h/Makefile                |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/bif.h  |  0
 .../fdvm/trunk/Sage/h/compatible.h            |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/db.h   |  0
 .../fdvm/trunk/Sage/h/db.new.h                |  0
 .../fdvm/trunk/Sage/h/defines.h               |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/defs.h |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/dep.h  |  0
 .../fdvm/trunk/Sage/h/dep_str.h               |  0
 .../fdvm/trunk/Sage/h/dep_struct.h            |  0
 .../fdvm/trunk/Sage/h/elist.h                 |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/f90.h  |  0
 .../fdvm/trunk/Sage/h/fixcray.h               |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/fm.h   |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/head   |  0
 .../fdvm/trunk/Sage/h/leak_detector.h         |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/list.h |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/ll.h   |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/prop.h |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/sage.h |  0
 .../fdvm/trunk/Sage/h/sagearch.h              |  0
 .../fdvm/trunk/Sage/h/sageroot.h              |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/sets.h |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/symb.h |  0
 .../fdvm/trunk/Sage/h/symblob.h               |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/tag    |  0
 .../fdvm/trunk/Sage/h/tag.doc                 |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/tag.h  |  0
 .../fdvm/trunk/Sage/h/tag_make                |  0
 .../fdvm/trunk/Sage/h/version.h               |  0
 .../fdvm/trunk/Sage/h/vextern.h               |  0
 .../fdvm/trunk/Sage/h/vparse.h                |  0
 .../{dvm => dvm_svn}/fdvm/trunk/Sage/h/vpc.h  |  0
 .../fdvm/trunk/Sage/h/window.h                |  0
 .../fdvm/trunk/Sage/lib/CMakeLists.txt        |  0
 .../fdvm/trunk/Sage/lib/Makefile              |  0
 .../fdvm/trunk/Sage/lib/include/attributes.h  |  0
 .../fdvm/trunk/Sage/lib/include/baseClasses.h |  0
 .../fdvm/trunk/Sage/lib/include/bif_node.def  |  0
 .../fdvm/trunk/Sage/lib/include/dependence.h  |  0
 .../fdvm/trunk/Sage/lib/include/ext_ann.h     |  0
 .../fdvm/trunk/Sage/lib/include/ext_high.h    |  0
 .../fdvm/trunk/Sage/lib/include/ext_lib.h     |  0
 .../fdvm/trunk/Sage/lib/include/ext_low.h     |  0
 .../fdvm/trunk/Sage/lib/include/ext_mid.h     |  0
 .../fdvm/trunk/Sage/lib/include/extcxx_low.h  |  0
 .../fdvm/trunk/Sage/lib/include/libSage++.h   |  0
 .../fdvm/trunk/Sage/lib/include/macro.h       |  0
 .../trunk/Sage/lib/include/sage++callgraph.h  |  0
 .../Sage/lib/include/sage++classhierarchy.h   |  0
 .../trunk/Sage/lib/include/sage++extern.h     |  0
 .../fdvm/trunk/Sage/lib/include/sage++proto.h |  0
 .../fdvm/trunk/Sage/lib/include/sage++user.h  |  0
 .../fdvm/trunk/Sage/lib/include/symb.def      |  0
 .../fdvm/trunk/Sage/lib/include/type.def      |  0
 .../fdvm/trunk/Sage/lib/include/unparse.def   |  0
 .../trunk/Sage/lib/include/unparseC++.def     |  0
 .../trunk/Sage/lib/include/unparseDVM.def     |  0
 .../fdvm/trunk/Sage/lib/makefile.uni          |  0
 .../fdvm/trunk/Sage/lib/makefile.win          |  0
 .../fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt |  0
 .../fdvm/trunk/Sage/lib/newsrc/Makefile       |  0
 .../fdvm/trunk/Sage/lib/newsrc/annotate.tab.c |  0
 .../fdvm/trunk/Sage/lib/newsrc/annotate.tab.h |  0
 .../fdvm/trunk/Sage/lib/newsrc/annotate.y     |  0
 .../fdvm/trunk/Sage/lib/newsrc/comments.c     |  0
 .../fdvm/trunk/Sage/lib/newsrc/low_level.c    |  0
 .../fdvm/trunk/Sage/lib/newsrc/makefile.uni   |  0
 .../fdvm/trunk/Sage/lib/newsrc/makefile.win   |  0
 .../fdvm/trunk/Sage/lib/newsrc/toolsann.c     |  0
 .../fdvm/trunk/Sage/lib/newsrc/unparse.c      |  0
 .../fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt |  0
 .../fdvm/trunk/Sage/lib/oldsrc/Makefile       |  0
 .../fdvm/trunk/Sage/lib/oldsrc/anal_ind.c     |  0
 .../fdvm/trunk/Sage/lib/oldsrc/db.c           |  0
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp.c       |  0
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c  |  0
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c   |  0
 .../fdvm/trunk/Sage/lib/oldsrc/dbutils.c      |  0
 .../fdvm/trunk/Sage/lib/oldsrc/garb_coll.c    |  0
 .../fdvm/trunk/Sage/lib/oldsrc/glob_anal.c    |  0
 .../fdvm/trunk/Sage/lib/oldsrc/ker_fun.c      |  0
 .../fdvm/trunk/Sage/lib/oldsrc/list.c         |  0
 .../fdvm/trunk/Sage/lib/oldsrc/make_nodes.c   |  0
 .../fdvm/trunk/Sage/lib/oldsrc/makefile.uni   |  0
 .../fdvm/trunk/Sage/lib/oldsrc/makefile.win   |  0
 .../fdvm/trunk/Sage/lib/oldsrc/mod_ref.c      |  0
 .../fdvm/trunk/Sage/lib/oldsrc/ndeps.c        |  0
 .../fdvm/trunk/Sage/lib/oldsrc/readnodes.c    |  0
 .../fdvm/trunk/Sage/lib/oldsrc/sets.c         |  0
 .../fdvm/trunk/Sage/lib/oldsrc/setutils.c     |  0
 .../fdvm/trunk/Sage/lib/oldsrc/symb_alg.c     |  0
 .../fdvm/trunk/Sage/lib/oldsrc/writenodes.c   |  0
 .../fdvm/trunk/Sage/makefile.uni              |  0
 .../fdvm/trunk/Sage/makefile.win              |  0
 .../CodeTransformer/CodeTransformer.vcxproj   |  0
 .../CodeTransformer.vcxproj.filters           |  0
 .../FDVM/FDVM.sln                             |  0
 .../FDVM/FDVM/FDVM.vcxproj                    |  0
 .../FDVM/FDVM/FDVM.vcxproj.filters            |  0
 .../FDVM/NEWsrc/NEWsrc.vcxproj                |  0
 .../FDVM/NEWsrc/NEWsrc.vcxproj.filters        |  0
 .../FDVM/OLDsrc/OLDsrc.vcxproj                |  0
 .../FDVM/OLDsrc/OLDsrc.vcxproj.filters        |  0
 .../FDVM/Parser/Parser.vcxproj                |  0
 .../FDVM/Parser/Parser.vcxproj.filters        |  0
 .../FDVM/SageLib++/SageLib++.vcxproj          |  0
 .../FDVM/SageLib++/SageLib++.vcxproj.filters  |  0
 .../FDVM/inlineExp/inlineExp.vcxproj          |  0
 .../FDVM/inlineExp/inlineExp.vcxproj.filters  |  0
 .../fdvm/trunk/acrossDebugging/across.cpp     |  0
 .../fdvm/trunk/examples/gausf.fdv             |  0
 .../fdvm/trunk/examples/gausgb.fdv            |  0
 .../fdvm/trunk/examples/gaush.hpf             |  0
 .../fdvm/trunk/examples/gauswh.fdv            |  0
 .../fdvm/trunk/examples/jac.fdv               |  0
 .../fdvm/trunk/examples/jacas.fdv             |  0
 .../fdvm/trunk/examples/jach.hpf              |  0
 .../fdvm/trunk/examples/redbf.fdv             |  0
 .../fdvm/trunk/examples/redbh.hpf             |  0
 .../fdvm/trunk/examples/sor.fdv               |  0
 .../fdvm/trunk/examples/task2j.fdv            |  0
 .../fdvm/trunk/examples/tasks.fdv             |  0
 .../fdvm/trunk/examples/taskst.fdv            |  0
 .../fdvm/trunk/fdvm/CMakeLists.txt            |  0
 .../{dvm => dvm_svn}/fdvm/trunk/fdvm/Makefile |  0
 .../{dvm => dvm_svn}/fdvm/trunk/fdvm/acc.cpp  |  0
 .../fdvm/trunk/fdvm/acc_across.cpp            |  0
 .../fdvm/trunk/fdvm/acc_across_analyzer.cpp   |  0
 .../fdvm/trunk/fdvm/acc_analyzer.cpp          |  0
 .../fdvm/trunk/fdvm/acc_data.cpp              |  0
 .../fdvm/trunk/fdvm/acc_f2c.cpp               |  0
 .../fdvm/trunk/fdvm/acc_f2c_handlers.cpp      |  0
 .../fdvm/trunk/fdvm/acc_index_analyzer.cpp    |  0
 .../fdvm/trunk/fdvm/acc_rtc.cpp               |  0
 .../fdvm/trunk/fdvm/acc_unused_code.cpp       |  0
 .../fdvm/trunk/fdvm/acc_utilities.cpp         |  0
 .../fdvm/trunk/fdvm/aks_analyzeLoops.cpp      |  0
 .../fdvm/trunk/fdvm/aks_loopStructure.cpp     |  0
 .../fdvm/trunk/fdvm/aks_structs.cpp           |  0
 .../fdvm/trunk/fdvm/calls.cpp                 |  0
 .../fdvm/trunk/fdvm/checkpoint.cpp            |  0
 .../fdvm/trunk/fdvm/debug.cpp                 |  0
 .../{dvm => dvm_svn}/fdvm/trunk/fdvm/dvm.cpp  |  0
 .../fdvm/trunk/fdvm/funcall.cpp               |  0
 .../{dvm => dvm_svn}/fdvm/trunk/fdvm/help.cpp |  0
 .../{dvm => dvm_svn}/fdvm/trunk/fdvm/hpf.cpp  |  0
 .../{dvm => dvm_svn}/fdvm/trunk/fdvm/io.cpp   |  0
 .../fdvm/trunk/fdvm/makefile.uni              |  0
 .../fdvm/trunk/fdvm/makefile.win              |  0
 .../{dvm => dvm_svn}/fdvm/trunk/fdvm/omp.cpp  |  0
 .../fdvm/trunk/fdvm/ompdebug.cpp              |  0
 .../fdvm/trunk/fdvm/parloop.cpp               |  0
 .../{dvm => dvm_svn}/fdvm/trunk/fdvm/stmt.cpp |  0
 .../fdvm/trunk/include/acc_across_analyzer.h  |  0
 .../fdvm/trunk/include/acc_analyzer.h         |  0
 .../fdvm/trunk/include/acc_data.h             |  0
 .../fdvm/trunk/include/aks_loopStructure.h    |  0
 .../fdvm/trunk/include/aks_structs.h          |  0
 .../fdvm/trunk/include/calls.h                |  0
 .../{dvm => dvm_svn}/fdvm/trunk/include/dvm.h |  0
 .../fdvm/trunk/include/dvm_tag.h              |  0
 .../fdvm/trunk/include/extern.h               |  0
 .../fdvm/trunk/include/fdvm.h                 |  0
 .../fdvm/trunk/include/fdvm_version.h         |  0
 .../{dvm => dvm_svn}/fdvm/trunk/include/inc.h |  0
 .../fdvm/trunk/include/leak_detector.h        |  0
 .../fdvm/trunk/include/libSageOMP.h           |  0
 .../fdvm/trunk/include/libdvm.h               |  0
 .../fdvm/trunk/include/libnum.h               |  0
 .../fdvm/trunk/include/unparse.hpf            |  0
 .../fdvm/trunk/include/unparse1.hpf           |  0
 .../fdvm/trunk/include/user.h                 |  0
 .../{dvm => dvm_svn}/fdvm/trunk/makefile.uni  |  0
 .../{dvm => dvm_svn}/fdvm/trunk/makefile.win  |  0
 .../fdvm/trunk/parser/CMakeLists.txt          |  0
 .../fdvm/trunk/parser/Makefile                |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/cftn.c |  0
 .../fdvm/trunk/parser/errors.c                |  0
 .../fdvm/trunk/parser/facc.gram               |  0
 .../fdvm/trunk/parser/fdvm.gram               |  0
 .../fdvm/trunk/parser/fomp.gram               |  0
 .../fdvm/trunk/parser/fspf.gram               |  0
 .../fdvm/trunk/parser/ftn.gram                |  0
 .../fdvm/trunk/parser/gram1.tab.c             |  0
 .../fdvm/trunk/parser/gram1.tab.h             |  0
 .../fdvm/trunk/parser/gram1.y                 |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/hash.c |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/head   |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/init.c |  0
 .../fdvm/trunk/parser/lexfdvm.c               |  0
 .../fdvm/trunk/parser/lists.c                 |  0
 .../fdvm/trunk/parser/low_hpf.c               |  0
 .../fdvm/trunk/parser/makefile.uni            |  0
 .../fdvm/trunk/parser/makefile.win            |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/misc.c |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/stat.c |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/sym.c  |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/tag    |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/tag.h  |  0
 .../fdvm/trunk/parser/tokdefs.h               |  0
 .../{dvm => dvm_svn}/fdvm/trunk/parser/tokens |  0
 .../fdvm/trunk/parser/types.c                 |  0
 .../fdvm/trunk/parser/unparse_hpf.c           |  0
 .../fdvm/trunk/sageExample/SwapFors.cpp       |  0
 .../fdvm/trunk/sageExample/makefile.uni       |  0
 .../fdvm/trunk/sageExample/makefile.win       |  0
 .../tools/Zlib/CMakeLists.txt                 |  0
 .../tools/Zlib/include/deflate.h              |  0
 .../tools/Zlib/include/infblock.h             |  0
 .../tools/Zlib/include/infcodes.h             |  0
 .../tools/Zlib/include/inffast.h              |  0
 .../tools/Zlib/include/inffixed.h             |  0
 .../tools/Zlib/include/inftrees.h             |  0
 .../tools/Zlib/include/infutil.h              |  0
 .../tools/Zlib/include/trees.h                |  0
 .../tools/Zlib/include/zconf.h                |  0
 .../tools/Zlib/include/zlib.h                 |  0
 .../tools/Zlib/include/zutil.h                |  0
 .../{dvm => dvm_svn}/tools/Zlib/makefile.uni  |  0
 .../{dvm => dvm_svn}/tools/Zlib/makefile.win  |  0
 .../tools/Zlib/src/CMakeLists.txt             |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/adler32.c |  0
 .../tools/Zlib/src/compress.c                 |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/crc32.c   |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/deflate.c |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/example.c |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/gzio.c    |  0
 .../tools/Zlib/src/infblock.c                 |  0
 .../tools/Zlib/src/infcodes.c                 |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/inffast.c |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/inflate.c |  0
 .../tools/Zlib/src/inftrees.c                 |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/infutil.c |  0
 .../tools/Zlib/src/maketree.c                 |  0
 .../tools/Zlib/src/minigzip.c                 |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/trees.c   |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/uncompr.c |  0
 .../{dvm => dvm_svn}/tools/Zlib/src/zutil.c   |  0
 .../tools/pppa/branches/dvm4.07/makefile.uni  |  0
 .../tools/pppa/branches/dvm4.07/makefile.win  |  0
 .../tools/pppa/branches/dvm4.07/src/bool.h    |  0
 .../tools/pppa/branches/dvm4.07/src/dvmvers.h |  0
 .../tools/pppa/branches/dvm4.07/src/inter.cpp |  0
 .../tools/pppa/branches/dvm4.07/src/inter.h   |  0
 .../pppa/branches/dvm4.07/src/makefile.uni    |  0
 .../pppa/branches/dvm4.07/src/makefile.win    |  0
 .../pppa/branches/dvm4.07/src/potensyn.cpp    |  0
 .../pppa/branches/dvm4.07/src/potensyn.h      |  0
 .../pppa/branches/dvm4.07/src/statfile.cpp    |  0
 .../tools/pppa/branches/dvm4.07/src/statist.h |  0
 .../pppa/branches/dvm4.07/src/statprintf.cpp  |  0
 .../pppa/branches/dvm4.07/src/statprintf.h    |  0
 .../pppa/branches/dvm4.07/src/statread.cpp    |  0
 .../pppa/branches/dvm4.07/src/statread.h      |  0
 .../tools/pppa/branches/dvm4.07/src/strall.h  |  0
 .../tools/pppa/branches/dvm4.07/src/sysstat.h |  0
 .../pppa/branches/dvm4.07/src/treeinter.cpp   |  0
 .../pppa/branches/dvm4.07/src/treeinter.h     |  0
 .../tools/pppa/branches/dvm4.07/src/ver.h     |  0
 .../pppa/stuff/Zlib_1.1.3/Include/deflate.h   |  0
 .../pppa/stuff/Zlib_1.1.3/Include/infblock.h  |  0
 .../pppa/stuff/Zlib_1.1.3/Include/infcodes.h  |  0
 .../pppa/stuff/Zlib_1.1.3/Include/inffast.h   |  0
 .../pppa/stuff/Zlib_1.1.3/Include/inffixed.h  |  0
 .../pppa/stuff/Zlib_1.1.3/Include/inftrees.h  |  0
 .../pppa/stuff/Zlib_1.1.3/Include/infutil.h   |  0
 .../pppa/stuff/Zlib_1.1.3/Include/trees.h     |  0
 .../pppa/stuff/Zlib_1.1.3/Include/zconf.h     |  0
 .../pppa/stuff/Zlib_1.1.3/Include/zlib.h      |  0
 .../pppa/stuff/Zlib_1.1.3/Include/zutil.h     |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/Makefile  |  0
 .../pppa/stuff/Zlib_1.1.3/Src/Makefile.1      |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c |  0
 .../pppa/stuff/Zlib_1.1.3/Src/compress.c      |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c   |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/example.c |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c    |  0
 .../pppa/stuff/Zlib_1.1.3/Src/infblock.c      |  0
 .../pppa/stuff/Zlib_1.1.3/Src/infcodes.c      |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c |  0
 .../pppa/stuff/Zlib_1.1.3/Src/inftrees.c      |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c |  0
 .../pppa/stuff/Zlib_1.1.3/Src/makefile.uni    |  0
 .../pppa/stuff/Zlib_1.1.3/Src/maketree.c      |  0
 .../pppa/stuff/Zlib_1.1.3/Src/minigzip.c      |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/trees.c   |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c   |  0
 .../tools/pppa/stuff/Zlib_1.1.3/Zlib.mak      |  0
 .../tools/pppa/stuff/Zlib_1.1.3/readme        |  0
 .../tools/pppa/trunk/CMakeLists.txt           |  0
 .../tools/pppa/trunk/makefile.uni             |  0
 .../tools/pppa/trunk/makefile.win             |  0
 .../tools/pppa/trunk/src/CMakeLists.txt       |  0
 .../tools/pppa/trunk/src/LibraryImport.cpp    |  0
 .../tools/pppa/trunk/src/LibraryImport.h      |  0
 .../tools/pppa/trunk/src/PPPA/PPPA.sln        |  0
 .../pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj     |  0
 .../trunk/src/PPPA/PPPA/PPPA.vcxproj.filters  |  0
 .../tools/pppa/trunk/src/bool.h               |  0
 .../tools/pppa/trunk/src/dvmh_stat.h          |  0
 .../tools/pppa/trunk/src/dvmvers.h.in         |  0
 .../tools/pppa/trunk/src/inter.cpp            |  0
 .../tools/pppa/trunk/src/inter.h              |  0
 .../tools/pppa/trunk/src/json.hpp             |  0
 .../tools/pppa/trunk/src/makefile.uni         |  0
 .../tools/pppa/trunk/src/makefile.win         |  0
 .../tools/pppa/trunk/src/makefileJnilib       |  0
 .../tools/pppa/trunk/src/potensyn.cpp         |  0
 .../tools/pppa/trunk/src/potensyn.h           |  0
 .../tools/pppa/trunk/src/stat.cpp             |  0
 .../tools/pppa/trunk/src/statfile.cpp         |  0
 .../tools/pppa/trunk/src/statinter.cpp        |  0
 .../tools/pppa/trunk/src/statinter.h          |  0
 .../tools/pppa/trunk/src/statist.h            |  0
 .../tools/pppa/trunk/src/statlist.cpp         |  0
 .../tools/pppa/trunk/src/statlist.h           |  0
 .../tools/pppa/trunk/src/statprintf.cpp       |  0
 .../tools/pppa/trunk/src/statprintf.h         |  0
 .../tools/pppa/trunk/src/statread.cpp         |  0
 .../tools/pppa/trunk/src/statread.h           |  0
 .../tools/pppa/trunk/src/strall.h             |  0
 .../tools/pppa/trunk/src/sysstat.h            |  0
 .../tools/pppa/trunk/src/treeinter.cpp        |  0
 .../tools/pppa/trunk/src/treeinter.h          |  0
 .../tools/pppa/trunk/src/ver.h                |  0
 projects/paths.default.txt                    | 20 ++++-----
 351 files changed, 20 insertions(+), 41 deletions(-)
 rename projects/{dvm => dvm_svn}/fdvm/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/InlineExpansion/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/InlineExpansion/dvm_tag.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/InlineExpansion/hlp.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/InlineExpansion/inl_exp.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/InlineExpansion/inline.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/InlineExpansion/inliner.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/InlineExpansion/intrinsic.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/InlineExpansion/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/InlineExpansion/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Makefile (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/LICENSE (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/Makefile (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/Sage++/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/Sage++/Makefile (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/Sage++/libSage++.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/Sage++/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/Sage++/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/Makefile (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/bif.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/compatible.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/db.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/db.new.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/defines.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/defs.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/dep.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/dep_str.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/dep_struct.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/elist.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/f90.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/fixcray.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/fm.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/head (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/leak_detector.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/list.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/ll.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/prop.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/sage.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/sagearch.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/sageroot.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/sets.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/symb.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/symblob.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/tag (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/tag.doc (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/tag.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/tag_make (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/version.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/vextern.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/vparse.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/vpc.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/h/window.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/Makefile (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/attributes.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/baseClasses.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/bif_node.def (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/dependence.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/ext_ann.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/ext_high.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/ext_lib.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/ext_low.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/ext_mid.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/extcxx_low.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/libSage++.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/macro.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/sage++callgraph.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/sage++extern.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/sage++proto.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/sage++user.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/symb.def (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/type.def (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/unparse.def (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/unparseC++.def (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/include/unparseDVM.def (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/Makefile (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/annotate.y (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/comments.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/low_level.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/toolsann.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/newsrc/unparse.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/Makefile (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/db.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/db_unp.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/dbutils.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/list.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/ndeps.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/readnodes.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/sets.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/setutils.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/lib/oldsrc/writenodes.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/Sage/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/acrossDebugging/across.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/gausf.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/gausgb.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/gaush.hpf (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/gauswh.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/jac.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/jacas.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/jach.hpf (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/redbf.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/redbh.hpf (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/sor.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/task2j.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/tasks.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/examples/taskst.fdv (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/Makefile (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_across.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_across_analyzer.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_analyzer.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_data.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_f2c.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_f2c_handlers.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_index_analyzer.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_rtc.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_unused_code.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/acc_utilities.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/aks_analyzeLoops.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/aks_loopStructure.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/aks_structs.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/calls.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/checkpoint.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/debug.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/dvm.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/funcall.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/help.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/hpf.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/io.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/omp.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/ompdebug.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/parloop.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/fdvm/stmt.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/acc_across_analyzer.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/acc_analyzer.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/acc_data.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/aks_loopStructure.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/aks_structs.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/calls.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/dvm.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/dvm_tag.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/extern.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/fdvm.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/fdvm_version.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/inc.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/leak_detector.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/libSageOMP.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/libdvm.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/libnum.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/unparse.hpf (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/unparse1.hpf (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/include/user.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/Makefile (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/cftn.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/errors.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/facc.gram (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/fdvm.gram (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/fomp.gram (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/fspf.gram (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/ftn.gram (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/gram1.tab.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/gram1.tab.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/gram1.y (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/hash.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/head (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/init.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/lexfdvm.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/lists.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/low_hpf.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/misc.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/stat.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/sym.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/tag (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/tag.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/tokdefs.h (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/tokens (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/types.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/parser/unparse_hpf.c (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/sageExample/SwapFors.cpp (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/sageExample/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/fdvm/trunk/sageExample/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/deflate.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/infblock.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/infcodes.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/inffast.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/inffixed.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/inftrees.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/infutil.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/trees.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/zconf.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/zlib.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/include/zutil.h (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/adler32.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/compress.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/crc32.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/deflate.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/example.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/gzio.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/infblock.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/infcodes.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/inffast.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/inflate.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/inftrees.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/infutil.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/maketree.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/minigzip.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/trees.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/uncompr.c (100%)
 rename projects/{dvm => dvm_svn}/tools/Zlib/src/zutil.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/bool.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/dvmvers.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/inter.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/inter.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/potensyn.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/potensyn.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/statfile.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/statist.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/statprintf.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/statprintf.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/statread.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/statread.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/strall.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/sysstat.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/treeinter.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/treeinter.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/branches/dvm4.07/src/ver.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1 (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/example.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/stuff/Zlib_1.1.3/readme (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/CMakeLists.txt (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/LibraryImport.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/LibraryImport.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/PPPA/PPPA.sln (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/bool.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/dvmh_stat.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/dvmvers.h.in (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/inter.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/inter.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/json.hpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/makefile.uni (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/makefile.win (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/makefileJnilib (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/potensyn.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/potensyn.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/stat.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statfile.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statinter.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statinter.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statist.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statlist.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statlist.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statprintf.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statprintf.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statread.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/statread.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/strall.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/sysstat.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/treeinter.cpp (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/treeinter.h (100%)
 rename projects/{dvm => dvm_svn}/tools/pppa/trunk/src/ver.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bdf791..3b345d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,37 +13,16 @@ add_definitions("-D YYDEBUG")
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(fdvm_include projects/dvm/fdvm/trunk/include)
-set(fdvm_sources projects//dvm/fdvm/trunk/fdvm/)
-set(sage_include_1 projects/dvm/fdvm/trunk/Sage/lib/include)
-set(sage_include_2 projects/dvm/fdvm/trunk/Sage/h/)
-set(libdb_sources projects/dvm/fdvm/trunk/Sage/lib/oldsrc)
-set(sage_sources projects/dvm/fdvm/trunk/Sage/lib/newsrc)
-set(sagepp_sources projects/dvm/fdvm/trunk/Sage/Sage++)
-set(parser_sources projects/dvm/fdvm/trunk/parser)
-set(pppa_sources projects/dvm/tools/pppa/trunk/src)
-set(zlib_sources projects/dvm/tools/Zlib)
-
-# Read pathes to external sapfor directories
-#if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/projects/paths.txt")
-#    message("Found paths.txt, using custom paths.")
-#    FILE(STRINGS ./projects/paths.txt SAPFOR_PATHS)
-#else ()
-#    message("Not found paths.txt, using default paths.")
-#    FILE(STRINGS ./projects/paths.default.txt SAPFOR_PATHS)
-#endif ()
-  
-foreach (NameAndValue ${SAPFOR_PATHS})
-    # Strip leading spaces
-    string(REGEX REPLACE "^[ ]+" "" NameAndValue ${NameAndValue})
-    # Find variable name
-    string(REGEX MATCH "^[^=]+" Name ${NameAndValue})
-    # Find the value
-    string(REPLACE "${Name}=" "" Value ${NameAndValue})
-    # Set the variable, note the ../ because we are deeper than the file
-    set(${Name} "${Value}")
-    message("Using ${Name} ${${Name}}")
-endforeach ()
+set(fdvm_include   projects/dvm_svn/fdvm/trunk/include)
+set(fdvm_sources   projects/dvm_svn/fdvm/trunk/fdvm/)
+set(sage_include_1 projects/dvm_svn/fdvm/trunk/Sage/lib/include)
+set(sage_include_2 projects/dvm_svn/fdvm/trunk/Sage/h/)
+set(libdb_sources  projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc)
+set(sage_sources   projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc)
+set(sagepp_sources projects/dvm_svn/fdvm/trunk/Sage/Sage++)
+set(parser_sources projects/dvm_svn/fdvm/trunk/parser)
+set(pppa_sources   projects/dvm_svn/tools/pppa/trunk/src)
+set(zlib_sources   projects/dvm_svn/tools/Zlib)
 
 include_directories(src)
 #Sage lib includes
diff --git a/projects/dvm/fdvm/CMakeLists.txt b/projects/dvm_svn/fdvm/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/CMakeLists.txt
rename to projects/dvm_svn/fdvm/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/trunk/CMakeLists.txt
rename to projects/dvm_svn/fdvm/trunk/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/InlineExpansion/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/trunk/InlineExpansion/CMakeLists.txt
rename to projects/dvm_svn/fdvm/trunk/InlineExpansion/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h b/projects/dvm_svn/fdvm/trunk/InlineExpansion/dvm_tag.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/InlineExpansion/dvm_tag.h
rename to projects/dvm_svn/fdvm/trunk/InlineExpansion/dvm_tag.h
diff --git a/projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp b/projects/dvm_svn/fdvm/trunk/InlineExpansion/hlp.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/InlineExpansion/hlp.cpp
rename to projects/dvm_svn/fdvm/trunk/InlineExpansion/hlp.cpp
diff --git a/projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp b/projects/dvm_svn/fdvm/trunk/InlineExpansion/inl_exp.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/InlineExpansion/inl_exp.cpp
rename to projects/dvm_svn/fdvm/trunk/InlineExpansion/inl_exp.cpp
diff --git a/projects/dvm/fdvm/trunk/InlineExpansion/inline.h b/projects/dvm_svn/fdvm/trunk/InlineExpansion/inline.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/InlineExpansion/inline.h
rename to projects/dvm_svn/fdvm/trunk/InlineExpansion/inline.h
diff --git a/projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp b/projects/dvm_svn/fdvm/trunk/InlineExpansion/inliner.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/InlineExpansion/inliner.cpp
rename to projects/dvm_svn/fdvm/trunk/InlineExpansion/inliner.cpp
diff --git a/projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h b/projects/dvm_svn/fdvm/trunk/InlineExpansion/intrinsic.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/InlineExpansion/intrinsic.h
rename to projects/dvm_svn/fdvm/trunk/InlineExpansion/intrinsic.h
diff --git a/projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni b/projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/InlineExpansion/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/InlineExpansion/makefile.win b/projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/InlineExpansion/makefile.win
rename to projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.win
diff --git a/projects/dvm/fdvm/trunk/Makefile b/projects/dvm_svn/fdvm/trunk/Makefile
similarity index 100%
rename from projects/dvm/fdvm/trunk/Makefile
rename to projects/dvm_svn/fdvm/trunk/Makefile
diff --git a/projects/dvm/fdvm/trunk/Sage/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/CMakeLists.txt
rename to projects/dvm_svn/fdvm/trunk/Sage/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/Sage/LICENSE b/projects/dvm_svn/fdvm/trunk/Sage/LICENSE
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/LICENSE
rename to projects/dvm_svn/fdvm/trunk/Sage/LICENSE
diff --git a/projects/dvm/fdvm/trunk/Sage/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/Makefile
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/Makefile
rename to projects/dvm_svn/fdvm/trunk/Sage/Makefile
diff --git a/projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/Sage++/CMakeLists.txt
rename to projects/dvm_svn/fdvm/trunk/Sage/Sage++/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/Sage/Sage++/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/Makefile
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/Sage++/Makefile
rename to projects/dvm_svn/fdvm/trunk/Sage/Sage++/Makefile
diff --git a/projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/libSage++.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/Sage++/libSage++.cpp
rename to projects/dvm_svn/fdvm/trunk/Sage/Sage++/libSage++.cpp
diff --git a/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/Sage++/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/Sage++/makefile.win
rename to projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.win
diff --git a/projects/dvm/fdvm/trunk/Sage/h/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/h/Makefile
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/Makefile
rename to projects/dvm_svn/fdvm/trunk/Sage/h/Makefile
diff --git a/projects/dvm/fdvm/trunk/Sage/h/bif.h b/projects/dvm_svn/fdvm/trunk/Sage/h/bif.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/bif.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/bif.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/compatible.h b/projects/dvm_svn/fdvm/trunk/Sage/h/compatible.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/compatible.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/compatible.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/db.h b/projects/dvm_svn/fdvm/trunk/Sage/h/db.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/db.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/db.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/db.new.h b/projects/dvm_svn/fdvm/trunk/Sage/h/db.new.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/db.new.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/db.new.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/defines.h b/projects/dvm_svn/fdvm/trunk/Sage/h/defines.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/defines.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/defines.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/defs.h b/projects/dvm_svn/fdvm/trunk/Sage/h/defs.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/defs.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/defs.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/dep.h b/projects/dvm_svn/fdvm/trunk/Sage/h/dep.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/dep.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/dep.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/dep_str.h b/projects/dvm_svn/fdvm/trunk/Sage/h/dep_str.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/dep_str.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/dep_str.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/dep_struct.h b/projects/dvm_svn/fdvm/trunk/Sage/h/dep_struct.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/dep_struct.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/dep_struct.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/elist.h b/projects/dvm_svn/fdvm/trunk/Sage/h/elist.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/elist.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/elist.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/f90.h b/projects/dvm_svn/fdvm/trunk/Sage/h/f90.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/f90.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/f90.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/fixcray.h b/projects/dvm_svn/fdvm/trunk/Sage/h/fixcray.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/fixcray.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/fixcray.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/fm.h b/projects/dvm_svn/fdvm/trunk/Sage/h/fm.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/fm.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/fm.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/head b/projects/dvm_svn/fdvm/trunk/Sage/h/head
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/head
rename to projects/dvm_svn/fdvm/trunk/Sage/h/head
diff --git a/projects/dvm/fdvm/trunk/Sage/h/leak_detector.h b/projects/dvm_svn/fdvm/trunk/Sage/h/leak_detector.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/leak_detector.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/leak_detector.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/list.h b/projects/dvm_svn/fdvm/trunk/Sage/h/list.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/list.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/list.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/ll.h b/projects/dvm_svn/fdvm/trunk/Sage/h/ll.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/ll.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/ll.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/prop.h b/projects/dvm_svn/fdvm/trunk/Sage/h/prop.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/prop.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/prop.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/sage.h b/projects/dvm_svn/fdvm/trunk/Sage/h/sage.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/sage.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/sage.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/sagearch.h b/projects/dvm_svn/fdvm/trunk/Sage/h/sagearch.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/sagearch.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/sagearch.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/sageroot.h b/projects/dvm_svn/fdvm/trunk/Sage/h/sageroot.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/sageroot.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/sageroot.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/sets.h b/projects/dvm_svn/fdvm/trunk/Sage/h/sets.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/sets.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/sets.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/symb.h b/projects/dvm_svn/fdvm/trunk/Sage/h/symb.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/symb.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/symb.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/symblob.h b/projects/dvm_svn/fdvm/trunk/Sage/h/symblob.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/symblob.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/symblob.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/tag b/projects/dvm_svn/fdvm/trunk/Sage/h/tag
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/tag
rename to projects/dvm_svn/fdvm/trunk/Sage/h/tag
diff --git a/projects/dvm/fdvm/trunk/Sage/h/tag.doc b/projects/dvm_svn/fdvm/trunk/Sage/h/tag.doc
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/tag.doc
rename to projects/dvm_svn/fdvm/trunk/Sage/h/tag.doc
diff --git a/projects/dvm/fdvm/trunk/Sage/h/tag.h b/projects/dvm_svn/fdvm/trunk/Sage/h/tag.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/tag.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/tag.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/tag_make b/projects/dvm_svn/fdvm/trunk/Sage/h/tag_make
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/tag_make
rename to projects/dvm_svn/fdvm/trunk/Sage/h/tag_make
diff --git a/projects/dvm/fdvm/trunk/Sage/h/version.h b/projects/dvm_svn/fdvm/trunk/Sage/h/version.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/version.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/version.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/vextern.h b/projects/dvm_svn/fdvm/trunk/Sage/h/vextern.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/vextern.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/vextern.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/vparse.h b/projects/dvm_svn/fdvm/trunk/Sage/h/vparse.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/vparse.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/vparse.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/vpc.h b/projects/dvm_svn/fdvm/trunk/Sage/h/vpc.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/vpc.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/vpc.h
diff --git a/projects/dvm/fdvm/trunk/Sage/h/window.h b/projects/dvm_svn/fdvm/trunk/Sage/h/window.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/h/window.h
rename to projects/dvm_svn/fdvm/trunk/Sage/h/window.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/lib/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/CMakeLists.txt
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/lib/Makefile
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/Makefile
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/Makefile
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/attributes.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/attributes.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/attributes.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/baseClasses.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/baseClasses.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/baseClasses.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/bif_node.def
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/bif_node.def
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/bif_node.def
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/dependence.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/dependence.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/dependence.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_ann.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/ext_ann.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_ann.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_high.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/ext_high.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_high.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_lib.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/ext_lib.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_lib.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_low.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/ext_low.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_low.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_mid.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/ext_mid.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_mid.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/extcxx_low.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/extcxx_low.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/extcxx_low.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/libSage++.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/libSage++.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/libSage++.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/macro.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/macro.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/macro.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/macro.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++callgraph.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/sage++callgraph.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++callgraph.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++extern.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/sage++extern.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++extern.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++proto.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/sage++proto.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++proto.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++user.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/sage++user.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++user.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/symb.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/symb.def
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/symb.def
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/symb.def
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/type.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/type.def
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/type.def
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/type.def
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparse.def
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/unparse.def
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparse.def
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseC++.def
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/unparseC++.def
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseC++.def
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseDVM.def
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/include/unparseDVM.def
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseDVM.def
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/makefile.win
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.win
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/Makefile
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/Makefile
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/Makefile
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.y
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/annotate.y
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.y
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/comments.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/comments.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/comments.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/low_level.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/low_level.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/low_level.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/makefile.win
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.win
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/toolsann.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/toolsann.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/toolsann.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/unparse.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/newsrc/unparse.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/unparse.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/Makefile
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/Makefile
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/Makefile
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/list.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/list.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/list.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/makefile.win
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.win
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/sets.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/sets.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/sets.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/setutils.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/setutils.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/setutils.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
diff --git a/projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
rename to projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
diff --git a/projects/dvm/fdvm/trunk/Sage/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/Sage/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/Sage/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/Sage/makefile.win
rename to projects/dvm_svn/fdvm/trunk/Sage/makefile.win
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
diff --git a/projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
similarity index 100%
rename from projects/dvm/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
rename to projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
diff --git a/projects/dvm/fdvm/trunk/acrossDebugging/across.cpp b/projects/dvm_svn/fdvm/trunk/acrossDebugging/across.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/acrossDebugging/across.cpp
rename to projects/dvm_svn/fdvm/trunk/acrossDebugging/across.cpp
diff --git a/projects/dvm/fdvm/trunk/examples/gausf.fdv b/projects/dvm_svn/fdvm/trunk/examples/gausf.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/gausf.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/gausf.fdv
diff --git a/projects/dvm/fdvm/trunk/examples/gausgb.fdv b/projects/dvm_svn/fdvm/trunk/examples/gausgb.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/gausgb.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/gausgb.fdv
diff --git a/projects/dvm/fdvm/trunk/examples/gaush.hpf b/projects/dvm_svn/fdvm/trunk/examples/gaush.hpf
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/gaush.hpf
rename to projects/dvm_svn/fdvm/trunk/examples/gaush.hpf
diff --git a/projects/dvm/fdvm/trunk/examples/gauswh.fdv b/projects/dvm_svn/fdvm/trunk/examples/gauswh.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/gauswh.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/gauswh.fdv
diff --git a/projects/dvm/fdvm/trunk/examples/jac.fdv b/projects/dvm_svn/fdvm/trunk/examples/jac.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/jac.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/jac.fdv
diff --git a/projects/dvm/fdvm/trunk/examples/jacas.fdv b/projects/dvm_svn/fdvm/trunk/examples/jacas.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/jacas.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/jacas.fdv
diff --git a/projects/dvm/fdvm/trunk/examples/jach.hpf b/projects/dvm_svn/fdvm/trunk/examples/jach.hpf
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/jach.hpf
rename to projects/dvm_svn/fdvm/trunk/examples/jach.hpf
diff --git a/projects/dvm/fdvm/trunk/examples/redbf.fdv b/projects/dvm_svn/fdvm/trunk/examples/redbf.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/redbf.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/redbf.fdv
diff --git a/projects/dvm/fdvm/trunk/examples/redbh.hpf b/projects/dvm_svn/fdvm/trunk/examples/redbh.hpf
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/redbh.hpf
rename to projects/dvm_svn/fdvm/trunk/examples/redbh.hpf
diff --git a/projects/dvm/fdvm/trunk/examples/sor.fdv b/projects/dvm_svn/fdvm/trunk/examples/sor.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/sor.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/sor.fdv
diff --git a/projects/dvm/fdvm/trunk/examples/task2j.fdv b/projects/dvm_svn/fdvm/trunk/examples/task2j.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/task2j.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/task2j.fdv
diff --git a/projects/dvm/fdvm/trunk/examples/tasks.fdv b/projects/dvm_svn/fdvm/trunk/examples/tasks.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/tasks.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/tasks.fdv
diff --git a/projects/dvm/fdvm/trunk/examples/taskst.fdv b/projects/dvm_svn/fdvm/trunk/examples/taskst.fdv
similarity index 100%
rename from projects/dvm/fdvm/trunk/examples/taskst.fdv
rename to projects/dvm_svn/fdvm/trunk/examples/taskst.fdv
diff --git a/projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/fdvm/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/CMakeLists.txt
rename to projects/dvm_svn/fdvm/trunk/fdvm/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/fdvm/Makefile b/projects/dvm_svn/fdvm/trunk/fdvm/Makefile
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/Makefile
rename to projects/dvm_svn/fdvm/trunk/fdvm/Makefile
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_across.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_across.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_across.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_across.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_across_analyzer.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_across_analyzer.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_across_analyzer.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_analyzer.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_analyzer.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_analyzer.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_data.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_data.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_data.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_data.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_f2c.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_index_analyzer.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_index_analyzer.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_index_analyzer.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_rtc.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_rtc.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_rtc.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_unused_code.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_unused_code.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_unused_code.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_utilities.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/acc_utilities.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/acc_utilities.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/aks_loopStructure.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/aks_loopStructure.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/aks_loopStructure.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/aks_structs.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/aks_structs.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/aks_structs.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/calls.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/calls.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/calls.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/calls.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/checkpoint.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/checkpoint.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/checkpoint.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/debug.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/debug.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/debug.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/debug.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/dvm.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/dvm.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/dvm.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/dvm.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/funcall.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/funcall.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/funcall.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/funcall.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/help.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/help.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/help.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/help.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/hpf.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/hpf.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/hpf.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/hpf.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/io.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/io.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/io.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/io.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/makefile.uni b/projects/dvm_svn/fdvm/trunk/fdvm/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/fdvm/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/fdvm/makefile.win b/projects/dvm_svn/fdvm/trunk/fdvm/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/makefile.win
rename to projects/dvm_svn/fdvm/trunk/fdvm/makefile.win
diff --git a/projects/dvm/fdvm/trunk/fdvm/omp.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/omp.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/omp.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/omp.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/ompdebug.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/ompdebug.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/ompdebug.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/parloop.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/parloop.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/parloop.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/parloop.cpp
diff --git a/projects/dvm/fdvm/trunk/fdvm/stmt.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/stmt.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/fdvm/stmt.cpp
rename to projects/dvm_svn/fdvm/trunk/fdvm/stmt.cpp
diff --git a/projects/dvm/fdvm/trunk/include/acc_across_analyzer.h b/projects/dvm_svn/fdvm/trunk/include/acc_across_analyzer.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/acc_across_analyzer.h
rename to projects/dvm_svn/fdvm/trunk/include/acc_across_analyzer.h
diff --git a/projects/dvm/fdvm/trunk/include/acc_analyzer.h b/projects/dvm_svn/fdvm/trunk/include/acc_analyzer.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/acc_analyzer.h
rename to projects/dvm_svn/fdvm/trunk/include/acc_analyzer.h
diff --git a/projects/dvm/fdvm/trunk/include/acc_data.h b/projects/dvm_svn/fdvm/trunk/include/acc_data.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/acc_data.h
rename to projects/dvm_svn/fdvm/trunk/include/acc_data.h
diff --git a/projects/dvm/fdvm/trunk/include/aks_loopStructure.h b/projects/dvm_svn/fdvm/trunk/include/aks_loopStructure.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/aks_loopStructure.h
rename to projects/dvm_svn/fdvm/trunk/include/aks_loopStructure.h
diff --git a/projects/dvm/fdvm/trunk/include/aks_structs.h b/projects/dvm_svn/fdvm/trunk/include/aks_structs.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/aks_structs.h
rename to projects/dvm_svn/fdvm/trunk/include/aks_structs.h
diff --git a/projects/dvm/fdvm/trunk/include/calls.h b/projects/dvm_svn/fdvm/trunk/include/calls.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/calls.h
rename to projects/dvm_svn/fdvm/trunk/include/calls.h
diff --git a/projects/dvm/fdvm/trunk/include/dvm.h b/projects/dvm_svn/fdvm/trunk/include/dvm.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/dvm.h
rename to projects/dvm_svn/fdvm/trunk/include/dvm.h
diff --git a/projects/dvm/fdvm/trunk/include/dvm_tag.h b/projects/dvm_svn/fdvm/trunk/include/dvm_tag.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/dvm_tag.h
rename to projects/dvm_svn/fdvm/trunk/include/dvm_tag.h
diff --git a/projects/dvm/fdvm/trunk/include/extern.h b/projects/dvm_svn/fdvm/trunk/include/extern.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/extern.h
rename to projects/dvm_svn/fdvm/trunk/include/extern.h
diff --git a/projects/dvm/fdvm/trunk/include/fdvm.h b/projects/dvm_svn/fdvm/trunk/include/fdvm.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/fdvm.h
rename to projects/dvm_svn/fdvm/trunk/include/fdvm.h
diff --git a/projects/dvm/fdvm/trunk/include/fdvm_version.h b/projects/dvm_svn/fdvm/trunk/include/fdvm_version.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/fdvm_version.h
rename to projects/dvm_svn/fdvm/trunk/include/fdvm_version.h
diff --git a/projects/dvm/fdvm/trunk/include/inc.h b/projects/dvm_svn/fdvm/trunk/include/inc.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/inc.h
rename to projects/dvm_svn/fdvm/trunk/include/inc.h
diff --git a/projects/dvm/fdvm/trunk/include/leak_detector.h b/projects/dvm_svn/fdvm/trunk/include/leak_detector.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/leak_detector.h
rename to projects/dvm_svn/fdvm/trunk/include/leak_detector.h
diff --git a/projects/dvm/fdvm/trunk/include/libSageOMP.h b/projects/dvm_svn/fdvm/trunk/include/libSageOMP.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/libSageOMP.h
rename to projects/dvm_svn/fdvm/trunk/include/libSageOMP.h
diff --git a/projects/dvm/fdvm/trunk/include/libdvm.h b/projects/dvm_svn/fdvm/trunk/include/libdvm.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/libdvm.h
rename to projects/dvm_svn/fdvm/trunk/include/libdvm.h
diff --git a/projects/dvm/fdvm/trunk/include/libnum.h b/projects/dvm_svn/fdvm/trunk/include/libnum.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/libnum.h
rename to projects/dvm_svn/fdvm/trunk/include/libnum.h
diff --git a/projects/dvm/fdvm/trunk/include/unparse.hpf b/projects/dvm_svn/fdvm/trunk/include/unparse.hpf
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/unparse.hpf
rename to projects/dvm_svn/fdvm/trunk/include/unparse.hpf
diff --git a/projects/dvm/fdvm/trunk/include/unparse1.hpf b/projects/dvm_svn/fdvm/trunk/include/unparse1.hpf
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/unparse1.hpf
rename to projects/dvm_svn/fdvm/trunk/include/unparse1.hpf
diff --git a/projects/dvm/fdvm/trunk/include/user.h b/projects/dvm_svn/fdvm/trunk/include/user.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/include/user.h
rename to projects/dvm_svn/fdvm/trunk/include/user.h
diff --git a/projects/dvm/fdvm/trunk/makefile.uni b/projects/dvm_svn/fdvm/trunk/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/makefile.win b/projects/dvm_svn/fdvm/trunk/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/makefile.win
rename to projects/dvm_svn/fdvm/trunk/makefile.win
diff --git a/projects/dvm/fdvm/trunk/parser/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/parser/CMakeLists.txt
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/CMakeLists.txt
rename to projects/dvm_svn/fdvm/trunk/parser/CMakeLists.txt
diff --git a/projects/dvm/fdvm/trunk/parser/Makefile b/projects/dvm_svn/fdvm/trunk/parser/Makefile
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/Makefile
rename to projects/dvm_svn/fdvm/trunk/parser/Makefile
diff --git a/projects/dvm/fdvm/trunk/parser/cftn.c b/projects/dvm_svn/fdvm/trunk/parser/cftn.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/cftn.c
rename to projects/dvm_svn/fdvm/trunk/parser/cftn.c
diff --git a/projects/dvm/fdvm/trunk/parser/errors.c b/projects/dvm_svn/fdvm/trunk/parser/errors.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/errors.c
rename to projects/dvm_svn/fdvm/trunk/parser/errors.c
diff --git a/projects/dvm/fdvm/trunk/parser/facc.gram b/projects/dvm_svn/fdvm/trunk/parser/facc.gram
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/facc.gram
rename to projects/dvm_svn/fdvm/trunk/parser/facc.gram
diff --git a/projects/dvm/fdvm/trunk/parser/fdvm.gram b/projects/dvm_svn/fdvm/trunk/parser/fdvm.gram
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/fdvm.gram
rename to projects/dvm_svn/fdvm/trunk/parser/fdvm.gram
diff --git a/projects/dvm/fdvm/trunk/parser/fomp.gram b/projects/dvm_svn/fdvm/trunk/parser/fomp.gram
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/fomp.gram
rename to projects/dvm_svn/fdvm/trunk/parser/fomp.gram
diff --git a/projects/dvm/fdvm/trunk/parser/fspf.gram b/projects/dvm_svn/fdvm/trunk/parser/fspf.gram
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/fspf.gram
rename to projects/dvm_svn/fdvm/trunk/parser/fspf.gram
diff --git a/projects/dvm/fdvm/trunk/parser/ftn.gram b/projects/dvm_svn/fdvm/trunk/parser/ftn.gram
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/ftn.gram
rename to projects/dvm_svn/fdvm/trunk/parser/ftn.gram
diff --git a/projects/dvm/fdvm/trunk/parser/gram1.tab.c b/projects/dvm_svn/fdvm/trunk/parser/gram1.tab.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/gram1.tab.c
rename to projects/dvm_svn/fdvm/trunk/parser/gram1.tab.c
diff --git a/projects/dvm/fdvm/trunk/parser/gram1.tab.h b/projects/dvm_svn/fdvm/trunk/parser/gram1.tab.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/gram1.tab.h
rename to projects/dvm_svn/fdvm/trunk/parser/gram1.tab.h
diff --git a/projects/dvm/fdvm/trunk/parser/gram1.y b/projects/dvm_svn/fdvm/trunk/parser/gram1.y
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/gram1.y
rename to projects/dvm_svn/fdvm/trunk/parser/gram1.y
diff --git a/projects/dvm/fdvm/trunk/parser/hash.c b/projects/dvm_svn/fdvm/trunk/parser/hash.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/hash.c
rename to projects/dvm_svn/fdvm/trunk/parser/hash.c
diff --git a/projects/dvm/fdvm/trunk/parser/head b/projects/dvm_svn/fdvm/trunk/parser/head
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/head
rename to projects/dvm_svn/fdvm/trunk/parser/head
diff --git a/projects/dvm/fdvm/trunk/parser/init.c b/projects/dvm_svn/fdvm/trunk/parser/init.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/init.c
rename to projects/dvm_svn/fdvm/trunk/parser/init.c
diff --git a/projects/dvm/fdvm/trunk/parser/lexfdvm.c b/projects/dvm_svn/fdvm/trunk/parser/lexfdvm.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/lexfdvm.c
rename to projects/dvm_svn/fdvm/trunk/parser/lexfdvm.c
diff --git a/projects/dvm/fdvm/trunk/parser/lists.c b/projects/dvm_svn/fdvm/trunk/parser/lists.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/lists.c
rename to projects/dvm_svn/fdvm/trunk/parser/lists.c
diff --git a/projects/dvm/fdvm/trunk/parser/low_hpf.c b/projects/dvm_svn/fdvm/trunk/parser/low_hpf.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/low_hpf.c
rename to projects/dvm_svn/fdvm/trunk/parser/low_hpf.c
diff --git a/projects/dvm/fdvm/trunk/parser/makefile.uni b/projects/dvm_svn/fdvm/trunk/parser/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/parser/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/parser/makefile.win b/projects/dvm_svn/fdvm/trunk/parser/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/makefile.win
rename to projects/dvm_svn/fdvm/trunk/parser/makefile.win
diff --git a/projects/dvm/fdvm/trunk/parser/misc.c b/projects/dvm_svn/fdvm/trunk/parser/misc.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/misc.c
rename to projects/dvm_svn/fdvm/trunk/parser/misc.c
diff --git a/projects/dvm/fdvm/trunk/parser/stat.c b/projects/dvm_svn/fdvm/trunk/parser/stat.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/stat.c
rename to projects/dvm_svn/fdvm/trunk/parser/stat.c
diff --git a/projects/dvm/fdvm/trunk/parser/sym.c b/projects/dvm_svn/fdvm/trunk/parser/sym.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/sym.c
rename to projects/dvm_svn/fdvm/trunk/parser/sym.c
diff --git a/projects/dvm/fdvm/trunk/parser/tag b/projects/dvm_svn/fdvm/trunk/parser/tag
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/tag
rename to projects/dvm_svn/fdvm/trunk/parser/tag
diff --git a/projects/dvm/fdvm/trunk/parser/tag.h b/projects/dvm_svn/fdvm/trunk/parser/tag.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/tag.h
rename to projects/dvm_svn/fdvm/trunk/parser/tag.h
diff --git a/projects/dvm/fdvm/trunk/parser/tokdefs.h b/projects/dvm_svn/fdvm/trunk/parser/tokdefs.h
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/tokdefs.h
rename to projects/dvm_svn/fdvm/trunk/parser/tokdefs.h
diff --git a/projects/dvm/fdvm/trunk/parser/tokens b/projects/dvm_svn/fdvm/trunk/parser/tokens
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/tokens
rename to projects/dvm_svn/fdvm/trunk/parser/tokens
diff --git a/projects/dvm/fdvm/trunk/parser/types.c b/projects/dvm_svn/fdvm/trunk/parser/types.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/types.c
rename to projects/dvm_svn/fdvm/trunk/parser/types.c
diff --git a/projects/dvm/fdvm/trunk/parser/unparse_hpf.c b/projects/dvm_svn/fdvm/trunk/parser/unparse_hpf.c
similarity index 100%
rename from projects/dvm/fdvm/trunk/parser/unparse_hpf.c
rename to projects/dvm_svn/fdvm/trunk/parser/unparse_hpf.c
diff --git a/projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp b/projects/dvm_svn/fdvm/trunk/sageExample/SwapFors.cpp
similarity index 100%
rename from projects/dvm/fdvm/trunk/sageExample/SwapFors.cpp
rename to projects/dvm_svn/fdvm/trunk/sageExample/SwapFors.cpp
diff --git a/projects/dvm/fdvm/trunk/sageExample/makefile.uni b/projects/dvm_svn/fdvm/trunk/sageExample/makefile.uni
similarity index 100%
rename from projects/dvm/fdvm/trunk/sageExample/makefile.uni
rename to projects/dvm_svn/fdvm/trunk/sageExample/makefile.uni
diff --git a/projects/dvm/fdvm/trunk/sageExample/makefile.win b/projects/dvm_svn/fdvm/trunk/sageExample/makefile.win
similarity index 100%
rename from projects/dvm/fdvm/trunk/sageExample/makefile.win
rename to projects/dvm_svn/fdvm/trunk/sageExample/makefile.win
diff --git a/projects/dvm/tools/Zlib/CMakeLists.txt b/projects/dvm_svn/tools/Zlib/CMakeLists.txt
similarity index 100%
rename from projects/dvm/tools/Zlib/CMakeLists.txt
rename to projects/dvm_svn/tools/Zlib/CMakeLists.txt
diff --git a/projects/dvm/tools/Zlib/include/deflate.h b/projects/dvm_svn/tools/Zlib/include/deflate.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/deflate.h
rename to projects/dvm_svn/tools/Zlib/include/deflate.h
diff --git a/projects/dvm/tools/Zlib/include/infblock.h b/projects/dvm_svn/tools/Zlib/include/infblock.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/infblock.h
rename to projects/dvm_svn/tools/Zlib/include/infblock.h
diff --git a/projects/dvm/tools/Zlib/include/infcodes.h b/projects/dvm_svn/tools/Zlib/include/infcodes.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/infcodes.h
rename to projects/dvm_svn/tools/Zlib/include/infcodes.h
diff --git a/projects/dvm/tools/Zlib/include/inffast.h b/projects/dvm_svn/tools/Zlib/include/inffast.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/inffast.h
rename to projects/dvm_svn/tools/Zlib/include/inffast.h
diff --git a/projects/dvm/tools/Zlib/include/inffixed.h b/projects/dvm_svn/tools/Zlib/include/inffixed.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/inffixed.h
rename to projects/dvm_svn/tools/Zlib/include/inffixed.h
diff --git a/projects/dvm/tools/Zlib/include/inftrees.h b/projects/dvm_svn/tools/Zlib/include/inftrees.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/inftrees.h
rename to projects/dvm_svn/tools/Zlib/include/inftrees.h
diff --git a/projects/dvm/tools/Zlib/include/infutil.h b/projects/dvm_svn/tools/Zlib/include/infutil.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/infutil.h
rename to projects/dvm_svn/tools/Zlib/include/infutil.h
diff --git a/projects/dvm/tools/Zlib/include/trees.h b/projects/dvm_svn/tools/Zlib/include/trees.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/trees.h
rename to projects/dvm_svn/tools/Zlib/include/trees.h
diff --git a/projects/dvm/tools/Zlib/include/zconf.h b/projects/dvm_svn/tools/Zlib/include/zconf.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/zconf.h
rename to projects/dvm_svn/tools/Zlib/include/zconf.h
diff --git a/projects/dvm/tools/Zlib/include/zlib.h b/projects/dvm_svn/tools/Zlib/include/zlib.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/zlib.h
rename to projects/dvm_svn/tools/Zlib/include/zlib.h
diff --git a/projects/dvm/tools/Zlib/include/zutil.h b/projects/dvm_svn/tools/Zlib/include/zutil.h
similarity index 100%
rename from projects/dvm/tools/Zlib/include/zutil.h
rename to projects/dvm_svn/tools/Zlib/include/zutil.h
diff --git a/projects/dvm/tools/Zlib/makefile.uni b/projects/dvm_svn/tools/Zlib/makefile.uni
similarity index 100%
rename from projects/dvm/tools/Zlib/makefile.uni
rename to projects/dvm_svn/tools/Zlib/makefile.uni
diff --git a/projects/dvm/tools/Zlib/makefile.win b/projects/dvm_svn/tools/Zlib/makefile.win
similarity index 100%
rename from projects/dvm/tools/Zlib/makefile.win
rename to projects/dvm_svn/tools/Zlib/makefile.win
diff --git a/projects/dvm/tools/Zlib/src/CMakeLists.txt b/projects/dvm_svn/tools/Zlib/src/CMakeLists.txt
similarity index 100%
rename from projects/dvm/tools/Zlib/src/CMakeLists.txt
rename to projects/dvm_svn/tools/Zlib/src/CMakeLists.txt
diff --git a/projects/dvm/tools/Zlib/src/adler32.c b/projects/dvm_svn/tools/Zlib/src/adler32.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/adler32.c
rename to projects/dvm_svn/tools/Zlib/src/adler32.c
diff --git a/projects/dvm/tools/Zlib/src/compress.c b/projects/dvm_svn/tools/Zlib/src/compress.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/compress.c
rename to projects/dvm_svn/tools/Zlib/src/compress.c
diff --git a/projects/dvm/tools/Zlib/src/crc32.c b/projects/dvm_svn/tools/Zlib/src/crc32.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/crc32.c
rename to projects/dvm_svn/tools/Zlib/src/crc32.c
diff --git a/projects/dvm/tools/Zlib/src/deflate.c b/projects/dvm_svn/tools/Zlib/src/deflate.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/deflate.c
rename to projects/dvm_svn/tools/Zlib/src/deflate.c
diff --git a/projects/dvm/tools/Zlib/src/example.c b/projects/dvm_svn/tools/Zlib/src/example.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/example.c
rename to projects/dvm_svn/tools/Zlib/src/example.c
diff --git a/projects/dvm/tools/Zlib/src/gzio.c b/projects/dvm_svn/tools/Zlib/src/gzio.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/gzio.c
rename to projects/dvm_svn/tools/Zlib/src/gzio.c
diff --git a/projects/dvm/tools/Zlib/src/infblock.c b/projects/dvm_svn/tools/Zlib/src/infblock.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/infblock.c
rename to projects/dvm_svn/tools/Zlib/src/infblock.c
diff --git a/projects/dvm/tools/Zlib/src/infcodes.c b/projects/dvm_svn/tools/Zlib/src/infcodes.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/infcodes.c
rename to projects/dvm_svn/tools/Zlib/src/infcodes.c
diff --git a/projects/dvm/tools/Zlib/src/inffast.c b/projects/dvm_svn/tools/Zlib/src/inffast.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/inffast.c
rename to projects/dvm_svn/tools/Zlib/src/inffast.c
diff --git a/projects/dvm/tools/Zlib/src/inflate.c b/projects/dvm_svn/tools/Zlib/src/inflate.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/inflate.c
rename to projects/dvm_svn/tools/Zlib/src/inflate.c
diff --git a/projects/dvm/tools/Zlib/src/inftrees.c b/projects/dvm_svn/tools/Zlib/src/inftrees.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/inftrees.c
rename to projects/dvm_svn/tools/Zlib/src/inftrees.c
diff --git a/projects/dvm/tools/Zlib/src/infutil.c b/projects/dvm_svn/tools/Zlib/src/infutil.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/infutil.c
rename to projects/dvm_svn/tools/Zlib/src/infutil.c
diff --git a/projects/dvm/tools/Zlib/src/maketree.c b/projects/dvm_svn/tools/Zlib/src/maketree.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/maketree.c
rename to projects/dvm_svn/tools/Zlib/src/maketree.c
diff --git a/projects/dvm/tools/Zlib/src/minigzip.c b/projects/dvm_svn/tools/Zlib/src/minigzip.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/minigzip.c
rename to projects/dvm_svn/tools/Zlib/src/minigzip.c
diff --git a/projects/dvm/tools/Zlib/src/trees.c b/projects/dvm_svn/tools/Zlib/src/trees.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/trees.c
rename to projects/dvm_svn/tools/Zlib/src/trees.c
diff --git a/projects/dvm/tools/Zlib/src/uncompr.c b/projects/dvm_svn/tools/Zlib/src/uncompr.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/uncompr.c
rename to projects/dvm_svn/tools/Zlib/src/uncompr.c
diff --git a/projects/dvm/tools/Zlib/src/zutil.c b/projects/dvm_svn/tools/Zlib/src/zutil.c
similarity index 100%
rename from projects/dvm/tools/Zlib/src/zutil.c
rename to projects/dvm_svn/tools/Zlib/src/zutil.c
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni b/projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.uni
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/makefile.uni
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.uni
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/makefile.win b/projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.win
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/makefile.win
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.win
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/bool.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/bool.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/bool.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/dvmvers.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/dvmvers.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/dvmvers.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/inter.cpp
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.cpp
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/inter.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.uni
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.uni
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.uni
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.win
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/makefile.win
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.win
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.cpp
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.cpp
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/potensyn.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statfile.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/statfile.cpp
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statfile.cpp
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statist.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/statist.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statist.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.cpp
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.cpp
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/statprintf.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/statread.cpp
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.cpp
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/statread.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/strall.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/strall.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/strall.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/sysstat.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/sysstat.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/sysstat.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.cpp
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.cpp
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/treeinter.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.h
diff --git a/projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/ver.h
similarity index 100%
rename from projects/dvm/tools/pppa/branches/dvm4.07/src/ver.h
rename to projects/dvm_svn/tools/pppa/branches/dvm4.07/src/ver.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1 b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
diff --git a/projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/readme
similarity index 100%
rename from projects/dvm/tools/pppa/stuff/Zlib_1.1.3/readme
rename to projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/readme
diff --git a/projects/dvm/tools/pppa/trunk/CMakeLists.txt b/projects/dvm_svn/tools/pppa/trunk/CMakeLists.txt
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/CMakeLists.txt
rename to projects/dvm_svn/tools/pppa/trunk/CMakeLists.txt
diff --git a/projects/dvm/tools/pppa/trunk/makefile.uni b/projects/dvm_svn/tools/pppa/trunk/makefile.uni
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/makefile.uni
rename to projects/dvm_svn/tools/pppa/trunk/makefile.uni
diff --git a/projects/dvm/tools/pppa/trunk/makefile.win b/projects/dvm_svn/tools/pppa/trunk/makefile.win
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/makefile.win
rename to projects/dvm_svn/tools/pppa/trunk/makefile.win
diff --git a/projects/dvm/tools/pppa/trunk/src/CMakeLists.txt b/projects/dvm_svn/tools/pppa/trunk/src/CMakeLists.txt
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/CMakeLists.txt
rename to projects/dvm_svn/tools/pppa/trunk/src/CMakeLists.txt
diff --git a/projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp b/projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/LibraryImport.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/LibraryImport.h b/projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/LibraryImport.h
rename to projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.h
diff --git a/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln b/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA.sln
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/PPPA/PPPA.sln
rename to projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA.sln
diff --git a/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj b/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
rename to projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
diff --git a/projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters b/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
rename to projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
diff --git a/projects/dvm/tools/pppa/trunk/src/bool.h b/projects/dvm_svn/tools/pppa/trunk/src/bool.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/bool.h
rename to projects/dvm_svn/tools/pppa/trunk/src/bool.h
diff --git a/projects/dvm/tools/pppa/trunk/src/dvmh_stat.h b/projects/dvm_svn/tools/pppa/trunk/src/dvmh_stat.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/dvmh_stat.h
rename to projects/dvm_svn/tools/pppa/trunk/src/dvmh_stat.h
diff --git a/projects/dvm/tools/pppa/trunk/src/dvmvers.h.in b/projects/dvm_svn/tools/pppa/trunk/src/dvmvers.h.in
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/dvmvers.h.in
rename to projects/dvm_svn/tools/pppa/trunk/src/dvmvers.h.in
diff --git a/projects/dvm/tools/pppa/trunk/src/inter.cpp b/projects/dvm_svn/tools/pppa/trunk/src/inter.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/inter.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/inter.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/inter.h b/projects/dvm_svn/tools/pppa/trunk/src/inter.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/inter.h
rename to projects/dvm_svn/tools/pppa/trunk/src/inter.h
diff --git a/projects/dvm/tools/pppa/trunk/src/json.hpp b/projects/dvm_svn/tools/pppa/trunk/src/json.hpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/json.hpp
rename to projects/dvm_svn/tools/pppa/trunk/src/json.hpp
diff --git a/projects/dvm/tools/pppa/trunk/src/makefile.uni b/projects/dvm_svn/tools/pppa/trunk/src/makefile.uni
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/makefile.uni
rename to projects/dvm_svn/tools/pppa/trunk/src/makefile.uni
diff --git a/projects/dvm/tools/pppa/trunk/src/makefile.win b/projects/dvm_svn/tools/pppa/trunk/src/makefile.win
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/makefile.win
rename to projects/dvm_svn/tools/pppa/trunk/src/makefile.win
diff --git a/projects/dvm/tools/pppa/trunk/src/makefileJnilib b/projects/dvm_svn/tools/pppa/trunk/src/makefileJnilib
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/makefileJnilib
rename to projects/dvm_svn/tools/pppa/trunk/src/makefileJnilib
diff --git a/projects/dvm/tools/pppa/trunk/src/potensyn.cpp b/projects/dvm_svn/tools/pppa/trunk/src/potensyn.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/potensyn.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/potensyn.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/potensyn.h b/projects/dvm_svn/tools/pppa/trunk/src/potensyn.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/potensyn.h
rename to projects/dvm_svn/tools/pppa/trunk/src/potensyn.h
diff --git a/projects/dvm/tools/pppa/trunk/src/stat.cpp b/projects/dvm_svn/tools/pppa/trunk/src/stat.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/stat.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/stat.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/statfile.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statfile.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statfile.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/statfile.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/statinter.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statinter.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statinter.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/statinter.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/statinter.h b/projects/dvm_svn/tools/pppa/trunk/src/statinter.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statinter.h
rename to projects/dvm_svn/tools/pppa/trunk/src/statinter.h
diff --git a/projects/dvm/tools/pppa/trunk/src/statist.h b/projects/dvm_svn/tools/pppa/trunk/src/statist.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statist.h
rename to projects/dvm_svn/tools/pppa/trunk/src/statist.h
diff --git a/projects/dvm/tools/pppa/trunk/src/statlist.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statlist.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statlist.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/statlist.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/statlist.h b/projects/dvm_svn/tools/pppa/trunk/src/statlist.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statlist.h
rename to projects/dvm_svn/tools/pppa/trunk/src/statlist.h
diff --git a/projects/dvm/tools/pppa/trunk/src/statprintf.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statprintf.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statprintf.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/statprintf.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/statprintf.h b/projects/dvm_svn/tools/pppa/trunk/src/statprintf.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statprintf.h
rename to projects/dvm_svn/tools/pppa/trunk/src/statprintf.h
diff --git a/projects/dvm/tools/pppa/trunk/src/statread.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statread.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statread.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/statread.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/statread.h b/projects/dvm_svn/tools/pppa/trunk/src/statread.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/statread.h
rename to projects/dvm_svn/tools/pppa/trunk/src/statread.h
diff --git a/projects/dvm/tools/pppa/trunk/src/strall.h b/projects/dvm_svn/tools/pppa/trunk/src/strall.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/strall.h
rename to projects/dvm_svn/tools/pppa/trunk/src/strall.h
diff --git a/projects/dvm/tools/pppa/trunk/src/sysstat.h b/projects/dvm_svn/tools/pppa/trunk/src/sysstat.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/sysstat.h
rename to projects/dvm_svn/tools/pppa/trunk/src/sysstat.h
diff --git a/projects/dvm/tools/pppa/trunk/src/treeinter.cpp b/projects/dvm_svn/tools/pppa/trunk/src/treeinter.cpp
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/treeinter.cpp
rename to projects/dvm_svn/tools/pppa/trunk/src/treeinter.cpp
diff --git a/projects/dvm/tools/pppa/trunk/src/treeinter.h b/projects/dvm_svn/tools/pppa/trunk/src/treeinter.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/treeinter.h
rename to projects/dvm_svn/tools/pppa/trunk/src/treeinter.h
diff --git a/projects/dvm/tools/pppa/trunk/src/ver.h b/projects/dvm_svn/tools/pppa/trunk/src/ver.h
similarity index 100%
rename from projects/dvm/tools/pppa/trunk/src/ver.h
rename to projects/dvm_svn/tools/pppa/trunk/src/ver.h
diff --git a/projects/paths.default.txt b/projects/paths.default.txt
index 29884d1..468ae99 100644
--- a/projects/paths.default.txt
+++ b/projects/paths.default.txt
@@ -1,10 +1,10 @@
-fdvm_include=./dvm/fdvm/trunk/include/
-sage_include_1=./dvm/fdvm/trunk/Sage/lib/include/
-sage_include_2=./dvm/fdvm/trunk/Sage/h/
-fdvm_sources=./dvm/fdvm/trunk/fdvm/
-libdb_sources=./dvm/fdvm/trunk/Sage/lib/oldsrc/
-sage_sources=./dvm/fdvm/trunk/Sage/lib/newsrc/
-sagepp_sources=./dvm/fdvm/trunk/Sage/Sage++/
-parser_sources=./dvm/fdvm/trunk/parser/
-pppa_sources=./dvm/tools/pppa/trunk/src/
-zlib_sources=./dvm/tools/Zlib/
\ No newline at end of file
+fdvm_include=./dvm_svn/fdvm/trunk/include/
+sage_include_1=./dvm_svn/fdvm/trunk/Sage/lib/include/
+sage_include_2=./dvm_svn/fdvm/trunk/Sage/h/
+fdvm_sources=./dvm_svn/fdvm/trunk/fdvm/
+libdb_sources=./dvm_svn/fdvm/trunk/Sage/lib/oldsrc/
+sage_sources=./dvm_svn/fdvm/trunk/Sage/lib/newsrc/
+sagepp_sources=./dvm_svn/fdvm/trunk/Sage/Sage++/
+parser_sources=./dvm_svn/fdvm/trunk/parser/
+pppa_sources=./dvm_svn/tools/pppa/trunk/src/
+zlib_sources=./dvm_svn/tools/Zlib/
\ No newline at end of file

From eb39eb4b199bb60b425cc1761146e79751985700 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Thu, 13 Mar 2025 09:52:03 +0300
Subject: [PATCH 31/44] fixed cmakes

---
 projects/Fdvm/CMakeLists.txt       |  8 +++++---
 projects/Parser/CMakeLists.txt     |  8 +++++---
 projects/SageLib/CMakeLists.txt    |  4 ++--
 projects/SageNewSrc/CMakeLists.txt | 10 +++++++---
 projects/SageOldSrc/CMakeLists.txt | 10 +++++++---
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/projects/Fdvm/CMakeLists.txt b/projects/Fdvm/CMakeLists.txt
index 63e1b81..28bff03 100644
--- a/projects/Fdvm/CMakeLists.txt
+++ b/projects/Fdvm/CMakeLists.txt
@@ -31,9 +31,10 @@ endforeach ()
 set(SOURCE_LIB
         ${sagepp_sources}/libSage++.cpp
         ${sage_include_1}/libSage++.h)
-
 		
-# if not default ${sagepp_sources} must be set in ../paths.txt
+# if not default ${sagepp_sources} must be set in ../paths.tx
+file(GLOB FDVM_HEADERS ${fdvm_include}/*.h)
+
 set(SOURCE_EXE
         ${fdvm_sources}/acc.cpp
 		 ${fdvm_sources}/acc_across.cpp
@@ -58,7 +59,8 @@ set(SOURCE_EXE
 		 ${fdvm_sources}/omp.cpp
 		 ${fdvm_sources}/ompdebug.cpp
 		 ${fdvm_sources}/parloop.cpp
-		 ${fdvm_sources}/stmt.cpp)
+		 ${fdvm_sources}/stmt.cpp
+         ${FDVM_HEADERS})
 
 source_group (SageLib FILES ${SOURCE_LIB})
 
diff --git a/projects/Parser/CMakeLists.txt b/projects/Parser/CMakeLists.txt
index a670757..1638e23 100644
--- a/projects/Parser/CMakeLists.txt
+++ b/projects/Parser/CMakeLists.txt
@@ -29,6 +29,8 @@ foreach (NameAndValue ${SAPFOR_PATHS})
 endforeach ()
 
 # if not default ${sagepp_sources} must be set in ../paths.txt
+file(GLOB PARSER_HEADERS ${parser_sources}/*.h)
+
 set(SOURCE_EXE
         ${parser_sources}/cftn.c
         ${parser_sources}/errors.c
@@ -43,10 +45,10 @@ set(SOURCE_EXE
         ${parser_sources}/sym.c
         ${parser_sources}/types.c
         ${parser_sources}/unparse_hpf.c
-        )
+        ${PARSER_HEADERS})
 
-# if not default ${fdvm_include}, ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
-include_directories(${fdvm_include} ${sage_include_1} ${sage_include_2})
+# if not default ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
+include_directories(${sage_include_1} ${sage_include_2})
 add_executable(Parser ${SOURCE_EXE})
 
 if (MSVC_IDE)
diff --git a/projects/SageLib/CMakeLists.txt b/projects/SageLib/CMakeLists.txt
index 6861cfb..e072b03 100644
--- a/projects/SageLib/CMakeLists.txt
+++ b/projects/SageLib/CMakeLists.txt
@@ -33,8 +33,8 @@ set(SOURCE_LIB
         ${sage_include_1}/libSage++.h 
         )
 
-# if not default ${fdvm_include}, ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
-include_directories(${fdvm_include} ${sage_include_1} ${sage_include_2})
+# if not default ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
+include_directories(${sage_include_1} ${sage_include_2})
 add_library(SageLib STATIC ${SOURCE_LIB})
 
 add_subdirectory(../SageOldSrc ${CMAKE_CURRENT_BINARY_DIR}/SageOldSrc)
diff --git a/projects/SageNewSrc/CMakeLists.txt b/projects/SageNewSrc/CMakeLists.txt
index 460202e..1b822d5 100644
--- a/projects/SageNewSrc/CMakeLists.txt
+++ b/projects/SageNewSrc/CMakeLists.txt
@@ -29,16 +29,20 @@ foreach (NameAndValue ${SAPFOR_PATHS})
 endforeach ()
 
 # if not default ${sage_sources} must be set in ../paths.txt
+file(GLOB SAGE_HEADERS1 ${sage_include_1}/*.h)
+file(GLOB SAGE_HEADERS2 ${sage_include_2}/*.h)
+
 set(SOURCE_LIB
         ${sage_sources}/annotate.tab.c
         ${sage_sources}/comments.c
         ${sage_sources}/low_level.c
         ${sage_sources}/toolsann.c
         ${sage_sources}/unparse.c
-        )
+        ${SAGE_HEADERS1}
+        ${SAGE_HEADERS2})
 
-# if not default ${fdvm_include}, ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
-include_directories(${fdvm_include} ${sage_include_1} ${sage_include_2})
+# if not default ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
+include_directories(${sage_include_1} ${sage_include_2})
 add_library(SageNewSrc STATIC ${SOURCE_LIB})
 
 add_subdirectory(../SageOldSrc ${CMAKE_CURRENT_BINARY_DIR}/SageOldSrc)
diff --git a/projects/SageOldSrc/CMakeLists.txt b/projects/SageOldSrc/CMakeLists.txt
index 3223957..7b1dcc2 100644
--- a/projects/SageOldSrc/CMakeLists.txt
+++ b/projects/SageOldSrc/CMakeLists.txt
@@ -28,6 +28,9 @@ foreach (NameAndValue ${SAPFOR_PATHS})
     set(${Name} "../${Value}")
 endforeach ()
 
+file(GLOB SAGE_HEADERS1 ${sage_include_1}/*.h)
+file(GLOB SAGE_HEADERS2 ${sage_include_2}/*.h)
+
 # if not default ${libdb_sources} must be set in ../paths.txt
 set(SOURCE_LIB
         ${libdb_sources}/anal_ind.c
@@ -48,10 +51,11 @@ set(SOURCE_LIB
         ${libdb_sources}/setutils.c
         ${libdb_sources}/symb_alg.c
         ${libdb_sources}/writenodes.c
-        )
+        ${SAGE_HEADERS1}
+        ${SAGE_HEADERS2})
 
-# if not default ${fdvm_include}, ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
-include_directories(${fdvm_include} ${sage_include_1} ${sage_include_2})
+# if not default ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
+include_directories(${sage_include_1} ${sage_include_2})
 add_library(SageOldSrc STATIC ${SOURCE_LIB})
 
 if (MSVC_IDE)

From d0c7d0ba34afc346a72d952008864e3b4d478a11 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Thu, 13 Mar 2025 10:07:58 +0300
Subject: [PATCH 32/44] added Server project

---
 projects/Server/server.sln                    |  31 ++++
 projects/Server/server/icon3.ico              | Bin 0 -> 119849 bytes
 projects/Server/server/resource.h             |  19 +++
 projects/Server/server/server.rc              |  72 +++++++++
 projects/Server/server/server.vcxproj         | 152 ++++++++++++++++++
 projects/Server/server/server.vcxproj.filters |  40 +++++
 6 files changed, 314 insertions(+)
 create mode 100644 projects/Server/server.sln
 create mode 100644 projects/Server/server/icon3.ico
 create mode 100644 projects/Server/server/resource.h
 create mode 100644 projects/Server/server/server.rc
 create mode 100644 projects/Server/server/server.vcxproj
 create mode 100644 projects/Server/server/server.vcxproj.filters

diff --git a/projects/Server/server.sln b/projects/Server/server.sln
new file mode 100644
index 0000000..a2016c1
--- /dev/null
+++ b/projects/Server/server.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29411.108
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server\server.vcxproj", "{1D412171-922E-430B-B11C-38E29A98EC62}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{1D412171-922E-430B-B11C-38E29A98EC62}.Debug|x64.ActiveCfg = Debug|x64
+		{1D412171-922E-430B-B11C-38E29A98EC62}.Debug|x64.Build.0 = Debug|x64
+		{1D412171-922E-430B-B11C-38E29A98EC62}.Debug|x86.ActiveCfg = Debug|Win32
+		{1D412171-922E-430B-B11C-38E29A98EC62}.Debug|x86.Build.0 = Debug|Win32
+		{1D412171-922E-430B-B11C-38E29A98EC62}.Release|x64.ActiveCfg = Release|x64
+		{1D412171-922E-430B-B11C-38E29A98EC62}.Release|x64.Build.0 = Release|x64
+		{1D412171-922E-430B-B11C-38E29A98EC62}.Release|x86.ActiveCfg = Release|Win32
+		{1D412171-922E-430B-B11C-38E29A98EC62}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {480AF568-6C59-432A-95B1-CBE56AF6FD27}
+	EndGlobalSection
+EndGlobal
diff --git a/projects/Server/server/icon3.ico b/projects/Server/server/icon3.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b3c524c25ece8c42bc60a5d65631d7b94c4b56fa
GIT binary patch
literal 119849
zcmeEP2V9NaAHSuPl#=XGnb{%Pl~815g~%QyGbBZl5t2P#qa~Y`N<<}z2n`h4gfx`V
zAUyx`eeV0{cHLX|-p1Sef1S_g>FGY>Jm;L>@BGeh9~MiDRhOlpz#?ZAmZ=1bwTQ)H
zsi?4jpC{KJlWXegfB){lVp%q3v2=9UztwbEtTuyKEIYfue@lz8^fr<TNI`u!#<5t-
zw~4XT$Zt{=xx&6qPAnFww?h;5LH{OyN=izoq@*M&Ha3=e_39P%^XE_M^XJd>wYP8I
z(!Z&{%lr55>FarUdCVp1$&)A4{{8!@hYuf8E-o(AojZ4^oSYnL>C&at?c2A@ydNGO
zPOV(Il0v;qNls3tGBPsgpK)<<)V6KgD70z)`t?*=S{m~heSZ1!CADSC7P?Nfle3`B
zj*gCW8-D!wL0MW_QV$+Hpt7>EsIOnY{(67YrcD&ufA8Ks>f5((^mTl9&6+jTUw{2Y
zefjc*`u_bpWnp1Kd3t(MSFT*4jvP5cef;>5?)&1!izy!;AG*(|7h|?!#R}^F{reQY
zi*|kcRzg`>mA2o>$%(pp^(vK;l0w<r+tdBSnB)789zCKQ931F&q@|@&&z?P@;^OkC
z$&=0L?_Ic%N-bZ$kqQsLO(iBKQfNQM=fj5&R76AsRa{(5x99NTv(&0pd&ro_QUL++
z)b#1AsY{nGP!lKap_VK;L8YgEq{6~(QFeBARA68rb^iQ$>ej7Wq^_Ujxi^%pZ4Bk*
zl}^6@iF*IOkh*c>9rgP4Co&E(<hdLI*IX(!^%EJJ68f9yJNoPAmr0#GnMM^Be&+-S
zY2P<0C@6~>Ir1*$>-&!Wje6433d%g^<dj74g$<uFH^>jvF=4`eGXALquIY3=uCD3S
zn>R(j9zAvH6=_FVTwrdZFEeI5B=}rH;QF0<{5YS&_i!);egFQQ_xpzqrI7JXU>>E<
zckbknHboLxvipHPzI#_(<{A8W@!~Tzdh|UiIy#?jUv~CaDmXZcz~cdR^k^y>-z+ko
z1q45f>FcNiu=x7*2boKG)YPd_)Uji!biL1?f2I~LjHU(+x=l@)@_;&gIEC7}^~JA#
zyn9zf;F&?~-1(B=N*pz9S`>BmYzAE)DnPxcpE)uziU@2A$viBg7&;*88FWU496ICx
z{h<pXJlu4K?#Ms<2Xiw!JDZA%ilVMxzfK=9F);*p3xBl?&wxH*u7dtxo@Qod{<_co
z4`>N!7@lR`Vdx6?vv^KhTbsae3U%<{L4pTIDN|EZYX1EB6lfa?<`ifJo@w8{J)t93
zRA^{u89K^YFK8EN9iE*rV+M8R%o*y_r%#-Z{QBS5*O#sr^qDE>J7}Gup<$W#4j(>D
zsi>$Bx{=O2%J=-@#S5xUn>IAP<ogi0f&K;r1pM|0V9>5zJDMglH;)}VMs@1csob$=
zp2fK0{cG2*F_(Cr-@JK4(|7Kh2?+^wUxR{ze%-2$@BgZt>z}=Q_foA|wW6LrefsN8
zWxt=Ano6(fzbfSM57x{B2M$n8nlz#D4C@|Kjvqfxk16mA_>Ti?Blo(C=Xs4k*3J_r
zPB7J#Iirrq$Vh7J*s)ZzX3gj|3F|9o!MjRIO4Pb_>*zHPYwWC9v*`67Yc6NO_kpW(
z=gy^e?b=1{*s+72XIQtnOF=;ap_@)r%a$#v;lqd1YanO8nddS79Xoa;bn-Q!pIAS>
zkhSp{-3GkJ@GN*9-&a*trRQ{XbTqxDV@?9!IScBswzj6nd;9k7G#|owpYwly@Mp#v
zJQq`#Yn=EG-U~3`ENH*7vNGLHUU1}mmizlyLkQStS~+;|V0x^X=Xre}{6SGs={k*P
zL37)-ZA<ep%)2;)hTgn+lcs(6otare*0J4`np)}nkBt04_?GuHjq2OCFU@n|SrlI1
zXWyY{9uV^$1@o(G*RC{=%G}2}BqW5!f99H{<x7G;o2V{bI*~Q=9eo+=eAlial#Puu
zfweN>ZAxhc)(G?qd=+N_u7S4VJ__(`=gytfm@#7sujNJ7p$BB`zd;!o=u><4IML6P
zl>8uc+>26IpGfduk>*JQ0{p2B8;(#?QWL30jd~J(ZX4kf*t{$7@X(<{RD%W$Xx<w1
z)z8n5^7r>AJi=CL_Uzd-zeZP1{$Oni3kxN4WEZ)&mKrf)IpH<7kTvHS;gc}`e-Ix0
z5;bYkRx*E&5#H`3<>ux>tzNyCl9Ss&uHC2h?Mo(W5_=87nBp1m&Y&5P0dP1wJJa|d
z78b^Q`qw!+`V%#8UM!`ld7JRL4@uu%P<!_#Q|HcQkoEa1;Xl7pn>QyC-nx{px_L93
zl9vx8IFv>6bKv2wU3*XC<gbba_y_!6*RH|TqD9eU{PW82t>3=={KYfH#eF1W^pZ+Q
zV6UY<KJTdd_5H~A-_u|D__2h@0LhfM_glXFCwFsh-_D_W_6()K!(u*FR9?RPOyq^<
zWGvGOOkPmZ(pL!HvA>UZzkDenuuq{bT*%<d!!qB<&;Le^A0J8Ztd#d<?v;1`^r?iF
z4~7g0rz9kN34KkZ`EQ122H(GTZxZ1<UY9!#7$<x`FOQA4<$aUay=BYdsCxDMXx<j}
zELs#pUA*{)mL0&`Z`_zb|K{~BuB}@2gsgSR{BD<f{oA)6WRBh={K!p04~ht07E-5A
zzozEQc}(#40p;QGistu?jUN*EtCY9mtaR3_M`YgdzQ_3-um8cPw`+HUmM72_rT||d
zU)b6vP;1vdB{b|AHEvua1z2;JdGj9A&vIWE<Tqp$DXA-DPCn=PIOH$LRx4LNp&B>7
zN@Qj>&E$L-a>;`SrFsL-dlmg}Vey2({tBVf+2uY8nM_$Zh%z^i{cS#AuKM}?-mY>h
zBsY_jzYy9UMD_0<Rw3@XxxJ#t3HXUQ30aOQSig4fP85n>VO-a*e@2Om`_S{8sf+uJ
z=OBl-X>*-w(ISu@XW%Cetl22V#Xo3z2D&C_0nJlT@TUe23?plDDJ{nP_$KfSG!%2I
zQKPGbr@BVd0o(^&ShwyOS=Y1hlP-|Qw`_UNSKeoy!x`^k+?zJNO3TX3J<v_`3o>q>
zKDWr4;7?>&FR~^F5k1OF`aR&u{revXpOZ}MA25HI5*nIK<1u7vW^9;yIOpbmrQd7T
zERcLVkjT-cW5_&*d91A+PW9^-MhzHnn~cwGN>}#|rLTXN@RSks0lml2p?4?^ja!61
zyk=gd&zJ|RS3f1|UOY`Ze0<*0<F<Z%JpDY@8N7?O@@gZl6%>4@=|9#09MExaAE33+
zt?;6`(5--GLqF2HcPLF?K;NKmad&?u5RA%ns)8SE#lS!J7kUb!Qf18{$1goa``W3e
zs9-4nGq<6eh>wq_d2M%hccKqFMx8o!issiDzMOk7pbv!}hS9|^dKvKGoO%!L_c(v!
zyO1d=QwQ`W6DCZcWj!@DHNs<0B|5x?G(X<2Uq7l>uU<6Y4jG)YpuOhi=9HF}7A>nm
zUenRhq2Gi4Mvwws67))t)1a3@9Yco>rDfO4moE!a1+9aUl9HnJMbM8hGBV^w$Wt~p
zHnhyKeEIU<^k;wpWFc8uSxQk+k<hVFS{8)-D@cJ3jHyFTPL9ywrqtcLcj@m4S_kw1
zJ$v@#tG|LAgfWtqmL`1T#owBRJ~wXMSYRF0ZxxUW(AT5wfHkMhgx9m2*U*3H@*pdg
zS71+(k&&Tc#K4Dn9_@$z1oAF)o}v_{{hFGZWpslT)dkqWPQ$6s;`I(w|G<F*Y5fZ4
zGyi1!(GK7l;80$Hu17&Zf$#tW$l6<W9{<zrFR$IqJ?P2Ea!BJ3_q?j^_G4^eJLIRU
zX4=T_4EoZ#b!)<JOA%iC!f%gNcl)8Q1bv6@T9|_VLg(6|MGJcDVNc|=KQMJM?Z?`I
zwJSeApQa(8BhW=wgqx^`nP0r-FKirGAArMx6wnvgc1MpMO-V{h(zJc`>eYl_&gJ<!
z+7G=l)__r?MiJS6JdvRd2%oG=uV*u7&Ln)MJFQpdSpm6-_Cr4m-5T^sXV0D`JnI?y
zylmMrdJLhTuBgCnZEI^w({nK~F~VbO(E2yVF3jtFv>)^zb`|KVv8DoFu@0df&_$zv
z{rmSPw%KrARnYBk-n==HjT#Yq>~#7a6B84fw)g4NhpxY(_QS4@F+;mS&!Io&w4d|*
zFuBO!4?p@3`~fe3wgJbW8|E$y{y^W#=;s-|F=#v1wes*Ex<Ba9L1VOu-3xkFLGTvs
zsHpvT25nipb}d~$>}1@9X+JOghy7e%U!O1jW4>YB(RRREkTK`{z98+#^UwnWwpc@$
zF=py1ul?X(U?=3q(?b6b-T-|Uw(a;nzxG4!=hR(dKHxi;C*0pDul-CP`JLU|+~~0f
zjp0|oXW;vwhnxk=c4%k})v#fs-}oQM!?3GERz?X94yNkXtxNUj(c`zV6tw-I$#|BT
z8>kol6~G<v$@~iFI&4XtHdg3WckD=_^z<$g-s1Q6L+1iN0O$^2uG_nJ5B;4vbLRZw
z(V6cF+J4AYuv2gryo>b}?c=vbySlp4^pBIbg?~rewl|55;wqutO{mVDJJUWmOx@7c
z4jg!g=<@=IzR;Jzr!&n%0S?@SX+P)>zcyeV7#SJSK02K50~WCJ!7c(B1!D{z2kRKl
zj~_p#=@;zYoV?HT=bwno6hLGHSJEyydi{Z~5a>ltPB!)Yc`DVn?@2P|Cgf;A<c9|2
zJA2EFJ!l+o6ZSaBFUmyz0v%`9kwfDd<}LVg&|u6Re1p5deui~VU0t1CvnEcQNc3Jt
z#D`=&88<bu{xv1Gm_21)d-g1m*pf$+c6TG|Q)7CK!uX9CF@mONefw&XF=<D1iXDi}
ze;ye-ccRmOLF_`M_6W><tk1oB_omkztaDg1feV}m<Wkr@A<vfQBk}%yCh=7YC-csY
z;MpFs7VaeY;ZEe6TV(#dA#|gdj34{^#l?k0Hx@v6g>%FY>Ip4FV2y--T3lQ#(d$K%
zcAX<*e}?D+(#aTpqZTiYp>?Z_z7@PU-ob%&3I|gM>ft<a9eBnqKXDFfUS0|L)*G^3
z+^3p1zd_dRAcEJSWKD}8w!BDc!GdVo29lo6_9ID6EhK!>ePRpvoi_sh4;mCs+V4Z_
z+3+3c9AV#puMxK&6=yp{`5*e(5hEg~I(2-AjXa2q{}WoDinhYGgZ4l_2z@AQ8%%+{
z)5s`_tOI4`8rZ!wHN!~zy??bI??9gjou-XVJXyyClk=Hx@jFBR*`dP?g0KF>$K@H}
zgW-R`@9DDF@f_?B&=bS&3~K@k^w?@@!N0X1_pl~dT0W)i7`$|*ct+6j<jF^ZBR6TC
zJoM-cehd0O^Bi=|6DQuM#})Ps*dtoEzRt7#cn9!=od$CvD~q>Z9aA^IGsXemgzo+7
zRsOzD{NCrj4qr3qwxKhhKK&t~iT;G=@u79=+|S}SY!$E*U|zu<ENp@8MON02&_>~G
zo#lN8@O$(qpKd?ejsre<ckkxXb`Wm7EGqgz+dp6<6s8Y&Z|vAeBAeZ&=Tv!Z66GFj
z?Be3SM25RU=D|(cX4ALtE#m+Bl(w&N&RyUE`Z#}nw7_#ZCMKW8&*R6-`tFL-R$lLH
z-~N)ueb~D2EzA$tnbg%o30=NQ+hbr8XY5rt>*?L4X%q0OqT=S3PTN8f6U*|H6}>0O
zec;IK*^fy3y+}L5X!^^%2fh^k46tjrZ-0Zf$zTj&=ZT2OCA9ncFMm+x9bRYH!C{N4
z>U9L)0!;+2p#89CbK^XofqVcu1>XtSz6=fT(>6k^JLtocCv1NTJj<&94^2!S@w!#%
zYp|8WPKmV(J}ea#_!+~`7B;=5OJiyO51g5`gxC9M|J=EcdEKh?wIfGTNZWmA`WYTB
zm@fff1lv4(6JWy!ZZUicuLgncV*Gi*me=!wUISf&Zvt?qPoGf20}Dsj;k(?UM+l)?
zzO)}0zwg3c3mYcG3-WtT*z2(0Gq?jDLD&KqG-(n@;~wS&d`Nf|@C|x;5ww3culu50
z!<+=(0`Flj7uF92u)|u6_Z1ZbXg(GE#mkq!(@4-*;7?WX4NPCd!*l;0J1?3qDJmj@
zuYd*5V$Fc>6mSn?i**g_AZ*{9JTFrv{CP}GW6J0`n0vyWb92AZemfXD@FarzpkV$X
zK48g`*uUHEP2|06bgTf{0GL8vm_I-Imo9^88{`T2C2{&*F!zKx!`BFFEBsH;{`vDC
z)4UnKI?!gw6tS@%X}Sr20x>af`d$1FKL^f&*a!GII65YBUZ($tpB?5gzj^Z83tSf<
z&%#F#z7%M?x_St~*Rrw<UIF~UFTytmybk<1l$5U0{2kttmk*%nIp!~L8|x|#Mh6CZ
z13#5}_db+q0mcIUW`GZ9moNo79{6-IZ3n*}9L(E>hq^&efZHsV=ig`i&mMQoSM*6s
zE1cFFL3adSKE$Sg9%F5*TNiNw4`^P4vz_QK)^WtFfX}T+h5^2SR{{SDUqQ49@*DV?
z@(N^6$eQr6L%TQ+T!SwSd~3K5v>kp~IM63vYa-x;7$MvTZ-w~>84BwU<_Y*i_(Z{{
z2(k&A#(UB2$G5@rS5yFNtT*VtFbCd&yasxNw%~t$1!Dx>qFc8R+SjQ|mtdj;3MTsX
zn>0;k<|t^);KAXv&uC?3Sbl90^*U%4`08WF(rDjF;39mFz$ap?L2LZ|GwHDq^&6Fa
zkLYawlz(sp;HRZS4m)!E^3x(0YGXWEWpVA#`+r8Dszv}d2l!<nruWjNOSJ7{)22;?
zN8Cho(|c(<Bkb4Z*}Tyf*eE#t-r$eM9I2_P^gVvInDY7p{W@Z)PzO^VbH+6su+dc1
zK3?B|-4Q->uw%m?q<;PSwA~rDPuS<-2L{_Y?D?}vJPhK(`PrcncLrMr>SBE7aE1>8
zZ1(U~;uXWlt6iMeFs|_Fg3TN@6VAF}BZG}*%$PCs*l@ll$p7$#LBC-~hEE6LzTh7T
zI|yu}@X>(p2JG1N>eZwDCg4ZO%jSW0!v1sa+&S9zMaVGi?}4~+;16sih-(tIV7vi;
z*jr%Jty8BC;SX7~?F;er@bd%?aN6Po{RaGLP}j(jBg@3)ala3n9BhK{`D@s)A#FeB
zeunuC+Z$|Vs28w;KWJ4I_*%fGhPsz5SyJh07c5vn_lK7ak-KvE8o^$QZ^OTVpZ^Z#
zA^dgl9Oe(d=eX+^<Tre2;1`3sk?)~01%4WsufT0VaR+|1m@mKs&X`Hgc5wDzSpQAV
zdU*ZM*?;)pRi<D*cIeQ7#G!c$Tn*+o{8BOgh}+{;{w@87&kW)n;o~J}5oG-TE&Ug?
z&z#R8ZwUM%0RKIE%K8s5&;395f5V0ibl<TC@$wzT7}SRTW1R)v<@76J;3Mi8YXsIa
zz#epi-?~;C`VSv46B85Kmqyh7GVg)^fInjQ?%jXE9{Ga!mD<pM;OUSdLx{eSx2=F*
z+qth}jf4!q_#6ZF)22-;Hzt9z|5*PaTL2%yPcjGE#fyjJ{yz6_LFg~ufp2tW`j57S
zhKAC9p72>lzp?I{nVFUAuY_-N_8&gXkR!lb4;nOxmI3e^|4*7UiTGP=rg4kg4-xh7
zDxCd?-yPOt#!rbk!!HauLA15CMS?$gZRE6K_)PR2zPRuw6QrG-{Rh3kIsrdH@C%4b
zfgdttDc}YpbAkVcA0I#2iWv*e{v&>(HSsg#Jdm3MKBZ_g;+BNLf503$yC6?N9zq>h
z>lQ6q#M8%_X%qLEv;X|~KhR~+XUKzkdV2J?z*oVqy}U8t>_2#SjM<GFH+~)9Ns-e5
zbqNE1$mNK;LCh8UjsC+o54eQ>2vY><KWBZQ5AgHHchPQMc^{bPIs4C#|Hb%$rx$eo
z!v_^($;@+%0pv{1JT1)k1vv}bf7FRM0cO6zAD5pzB1r#HAAE-e=|Augxjq<~8hMid
zb5UqBzKbGC|3O!PufPHLyfS%D*fo~^6}10Y|FH%@ZZEGO9}p8~0No0|c#QJu;JznH
z|4|2Wd7=N%vtVBHDuVVObWadk4SgT*9`l`7&LduJsOXv?{fGUEpkA4RI1Kb(LPCPC
zOe$#q%T!#>59Ck8H=*MzFCK-d0<;CX$MW=;MMYnUK8a1w_|bpF^~0x#vmoy!+5+7I
zXgaSVO8+s((O$rXyI}6)n}X(R!<sd0*f5^558w%ZSu?Xo#J;FQ*UPW}$TtGJGLs7t
z^ORWwz`GzX9Iqlu{~@O!Ul=bP7vizR#l;1Rr$T!`r=bf5pTJ#^qXK@?+S>5%)-SjJ
z$fW}t_n0yFh_7u4?c>krwctOG*aTihl>Q^`4SX1{F$MjD4jDMGd-rZ$pDc3?as_xI
z=)t+mi4$q09&eIMCYFr%Xu3{*`ak4sf<Ky=m>=;$xJqz}%>!W`R(Ad8Y!}usj3?GY
ze)JIh5@;@XN67TN<_YSA?gMKR^!ebCxy!+WsiaSS#P1=Fz<)5^e}4MkJ$qh|`_5$D
zT}|+>EB$Q4h6;ptJ6P`83mgXD3wXh9QIUL)HUqDa1CL+9+=Dy|-V3}l@(q9wg>DRZ
zjyN;qo<-mBUBqti(&HaGbc6I~5wXipCH_im9vrkB@tdIS$j1k{0{o4-`cTsEW(5A?
z1fOIHe)c22CXQrWfA<T6J{>#>@Dp%E8*l(ukQafe8})M@SWiLMu(o-4c<}2!eI0Zi
zV~ck{vs$%kN%*nGWK3`<k@mGDu?u~O{(BNxn>=}r`-v0I#J^IV&<72gMl$g(kV7zL
z%rSJR4$+?sCSx_6v~3RIH7}64nN4)&_lYk})Gz;IrophQAU`4AM_o+4pu<d^{LawR
zLl=*jB|!@2%coEI#8&f?<j#m7dDw!;_+BA0TQHI1Vo46SWO6;5_TPh#4`)GMIWw~;
z;%9P=_+EV^^Qf54-2nJ;9^b!zCHR&=U<f~>D<t<0+lLGOTJYsT{#wQd8}$Rnfuo#t
z2=hPQEl;N6>;wEvo;~|aa)Lc4@D3;P&@}=lKLV#Kghu$$K0e4*1fTKg)1&Cz!tdXg
z@|f}QpGfY%V3G$Yg|ph<{zu+3#?K15hnNC?fA|){rzJUAcv~4$k0@vK1HNOeT3sV;
z^CI)po6Pwj+9wnKXo%~9zZ3jS;im_`vLi=QfAbZDe<Xa3koTEi;n#mWkJuB80etTf
zw^I}4>C;bitP^|=;SYsed+_syzgI=RYutP+o`>Hkay!ANjaPxMJumn(&*tZs&~aVx
z$3m<^br#f*d{}@v{1=fokTdU<DBp$;CGw`hM+>>4xP7V_pJI#wC;oGO3%+ejm&VaC
zWALG@jskyn`1hgj-Mfd-@og2sThMmEe-M4gTtF-j#u@Yl_yT{y^5D;W17m==xL&<N
zDa5o@Wr2S)+c(>bv@w|QbY=ZetLj_ugB(BpKJ9ymTz;4n!-ho&)PJ-AxP!PfjAK=f
z0rGjmx0~%7UA1G&J$8U2a{OVQ!Iz)yp9|k;A3{URUn`g~u(Nwkc=g~a83XutBBl;F
z$jgVCyZu%58|xcrKjJdccN~a0!ae|4JGprZ&hNr^8u$Z$@LRVk2QT=F!gm>dq{775
zakfX)|Itt62Sneo*2v2G(`Vqts8RQ5-*eDAUa<=Bkq0e-Z#420idvB865mID*qScj
z8^B8e_uw;q`SKe&M<sl<6&2YrRt*~>j{6?rH`9nrP}YV8-VkxgSX&@-3tIqhCU2pr
zF#^JVlk<7DoXn1k0I$gKkAOG$E6hh7ojZTWx_Z;Gmbk__4!{p(<?A#Z6?U!09ue^E
zM?B$=vMfAjGpp_Y)vKS-um}7Bb6#^E{_KbwfSw3rgqQ%#d+dLKIe>y3oe~m0bk0_8
z{-V6bBeom(Cu&aL^6IYW9%vYFms$H)tcWZ374QncchE=hf-*9G^t?dK2>kw`L&F+|
zI21t(;!Y4pjhyH;T_DpS{ucd595nJ-3tA9g4A}xX1R#SU#uf3ppkv^*nR!%Eec;JJ
zU&@nDDyl=&`^aTow=Uwzd}!LotpgUMUeK@IyOZeofcb+sBdjBWj^#huf2`jO?gNgZ
z#+hJVfUiXS5_>$oX}tk>?urWLKja*K`L-*1U)1|d94ga)<h-tIK`at*AMy)wMsVs)
z_|*;i51tpeSd#@biot!*-@w4i=Z8R?HF#o-DQF|&FDoh-qn<rOD%8<bRF5$C5eLhT
zwPVNDA#SNE_)hF?#g3O_^O2Afk=wq!0{Ip(-PIAR&F{O&17FJXd(%1h`8_M>b;N@~
zW@qM;j!rnyS!dEbJ=O-u+WZP~HDIg|M_Szl{0cjMoeg{NZKCk4ob3e9hZt9O-`Tw6
z_U&w&8GFBx;BxT*@xh3R2k%|o1+ajug*6ZDUAZ!j)`5unU3Q%NU7CMj>V#a)nVSH4
z+K{6J_DFsOvG}7#-Tf^Fn&0!HTt~k4cI|?G;V5#=Lw71l0j~b_7rS4aaEHy2JH{9E
zX3m^PG@ZkKa=Z#+ni1P92+id6enr<nn<2+AZ3Ufz>@R4+8V|h*bhF^|`t}X`o7S=C
z5p=c4DZ)=D1UVb=)zBsLi;o4KK(AEQI#%eg**ZS9jss%=`p;{B4U7k96~+tgK>Rx7
z9K`P<mk;y;OpGq@9eguj4qbgkvLAG-$lU?F;Z-1WB3}XcNM892c)e56HOQ&3;h>$I
z^OGMQqCTuikjI)gzee*2?04C4X4k>g<wK8$nOQ8YH$%UmKVuHS6EqEZv%u$}POLk~
zUBWAdAK%704A>y{yfV3afUl5QA(JsUk2B;}L1YcchHSkI)9;GTh}GwHl#W&DIC{}B
z(){Fo?CS`aVNJx?@si0gR{RQZ7d8*TkF)RKbHHy3T7ZLqE#@rv6HyQ37(yO0#Q8(s
z2279}pgfxz^3Y*TKp(KSV((GRFJ3YQ@D;o_<Z$HD01ZK&Ja*r`>Gcjg7Oy-f6^#Yz
z1};^$pdP>x2XaB7e--ITkb?ku4xk%`jsSZHfp>wP0=gI+$km6O53rFz_GI#Opzj!i
z-o0<pvN>q?zqNo)LtX(MKv&C#Ew8!eO|MCf8?$w{phv>y?5NFS1U>@%7WQ>P4hiJ*
zU~+6=uOi6v&}Tvy&2NpZZT%y@BY(<&cm$9q!Vdix<H!?1e*DQ3QQKzfpZ5G2fj=Yg
zX9WI?z@HKLGXj4`;LiyB8G(Pt2*8gXKI+IXg*Z~q1N&Vd#zat`^nXW>|GTY3tR>>I
z5MzQk8N^5-Ul-!K5l@RfT9~6<yLKctt}7jrfjAh%|07@4^XJd`#{3F8vWOW&ToRKT
zP1G~+v!b{nLEBW(bC?5&{}#2a%zMcHhB%L!Di~|*1%v!y$i0Rf1Wf!m(JT->u;2$`
zq!1^ze*Jpl)AC4UJV2Zy_T52SP#+FuW#tMF=2@H(D`sqLOw*^D7)!+7W1b-Pj%kOm
zZAO1F&!VEDYNE;XH?T(<zKhsVUa&@93*^W_j27Y#abUh9F9F6EIY5v{j`MxQsbTyP
zlglr+PI(=~To^E50MW_I(+Bn@<JC6qYlwYBOd;Mw>@9Mf@QZ;g@B5<MLk_OVlP42j
zxJLB%k$;i9eY}2Se3>@m47?X4ep{3_@_Gk3P58A7djle_9yEzp{t?ht#PlJC7CGz?
zPYT#G_2GZ)+l9P~!W4#<VqZ=ih?zu=8GdvLu*Ujx^X5%@><}XeyhHBCnkpCz&;aDF
zL7S0-6nPt%9AnIwFlXTOym|BJyeUjS0e9rAtW3@dVf%|XQ>IPK88is7#DJ}!1u#SY
zO5}3Hes4@&ID=0>9)Qa5iCD{#dz7<Y{13W=yiT>TU~NVI74A0UH(+00?uDA@4`?Iu
z32?TrOP4MJ$Jp{}BX}3Y=`%TCn7XkZ1O)~0dPU%CD_5>8(^k}tSa0NHt*r&LkDCS{
zF9!B4{ih3P4dBhd2>T2p4{c=&=-0u62T44T?611<4eS-oE8bqv?}5fMZDr2jO?c%n
z5VX$feh#>a_<p9nID=oRNgj`1AMfA4Pq&3>8}epVmAnMn0zQ$c8)xuDCr_T_*PIHk
z^MXJ4QeM1Cg_YIN1H9mmyxQFR1lLe=%6tZLK9esC@;uh>sw|*=$T7o-1K<U~--}Xs
z!5{hdYKq4frOmwHk1@!~$`YlzDt!n0#{)Lt(~;Y}s^&h^NWcX$A}9QzBS7ADQOY0q
zi!y4w-+{b}+?{|8a-u?RsgB~};!;L8fbStUjVQSG2mVzDA?Wd;%LP1;2e-OtDEJ)k
zJDfBCdw7c?<Nkqv)xjV73CQV?pDW5KRhh5yTK}LkL_TI=%OCg)J7WBwM_y9!`^aeq
zIiR`<FZe^|6ovo!1OKXr66Epfv^VjBzo`80ANW^2{Hwc0$bhiNaIXJ<=6~&w|Ee4I
zs2{n_Ibo0g|E&N24frEZ?dZ|${JESs06VEDwxB=szb0mE)qMm0K-@L}-~sG7qLlwS
z{Gl^}%@DcED`Q6yW$cB02exqJ_~o4U_#ZOo_3PJ#t&V>FzYc%sXiQB_X`3DL{nyq4
z+}yZvBZ(dU-ERlE@u7PZrTo|7k8#7^tC&aFW1%({_>3T*J8azCb05A@mGJ@iufsnz
zHI?=)tc~!;+5|g1)^^x<xM7dqzzcr+0SSW3|8@9dPipvT);9Qqm&g9g*jJFTCv(Fe
zx&E<7M`g-?9scmGXZA0wE%YBgMA%=QX%{!#@w;2MZanu{5f&Hz>+r|^#_$)e4f7we
zJ@%N<($f0PzRTbMY)ja;1A7fsMd1a1_}jx59s7#F--zFV``G^w{PV6|yGTyCi?p9E
zWGPW>(Sr7;s`TGEIXNV^li{y*^`D&o*l*j!#Dw<eVqndE#ySB1`>OPF;st;1?+W@G
zJPQ2sutz5L@q~YJb;#7b;154}te2P<*sG_a<NW#aBnR8{GJMrP0e|c-?&Rb|@-6l#
z<LA#g=I|wgeFu9S0cWeS@Pa@5jNt=@y@9w7>?H)hHtdH8z6pCm@#9V5qYGQ;i4!M;
z@_VnSf4tz2xdFWxbRmKqyy6~e68_-X5hn!MogaS(9DvM+J-5K8R7c?jf5coN&I7*o
z(2p<&eq)US&xr%}?vRiW3j5??9YCB7;)OVI7yo0dv7S^_A9%r^`<tTtt||C~zr%V7
z-*A5I1WsV@J?y(#oiPo(;4g~*C*+mv>};BU0lsqksG^^cW%%t~DhzJ(f<Iy*5MPVf
zE6`JZ2kzrJ#N2_Fani1ufIs%!!#;JK-{r;u#9ttW2)c>t<fAa=RRw=e_<^=TCj}XW
zyKmS}H#9Vq^Kqg7=LLUJ{2wq6!D};ZtWNkN-XH5A_!Q=Q+-J~9>@SEo7Ex?@LJuT)
zp*rBtv;%$$fD3m&;j2)Yc+9GTKiY{HZ6?05y5JAH4gA8Hz2~{d1HU2bBR&wkeRa=y
z20l1fC;U-AWB^|49QNiE#a|V5RweuqC(5i<)d7FxewZ?43g0+etn(vAjG%czQO5&g
zB5J8__=Aq&8{9lDWCu}cKvlxOI`zL;zoDz)HQ#X!YXM|BQT#SVg*W$m)eV1q53&N{
zv$)3rd-IA?{tfVl|0m+Mx%<rghK>X={xwPKd5v{Vz#nuC{z**VnX{&*rbzmXs)Rpe
z7Raq=6KrW!Ra{+NdHU&q2Y|lx*|TR=^{GnLQxot<1ECLO;Le<(uR(qZVM|rQAM+IJ
z{<v}D$bN^;!ZwBH^U!%>O=tSaoWW;;@2O3(wKWBQ<S*csc`+WM#K}}8{6T-AUxCb8
zRkRqnpP-Lm;Le<ZV~{y(Q>iKVLl)%aw+NpmVM|rQU)XO8@;q`hF)(M&(0xH)TH8uZ
z!5_KHxN|mOY(()}t<CU<t{n56fje_X&YId-Dhq$?9a7Q0A?P<`Azr$#|2Oy}rxIuW
z7r-Aro5=Z98%t&3kNvl>zfwhe0>K{3owEmH13kB}r8duh#DK#-%FKJ5VNb2<TmX<C
z9zJ|X+f^&Wx7gYJp8rP}`w#Z3!+yKFb|n&>^-sQ_gwCHke;@ci$VtMMnuI_2LfAb8
z)y;9{0AO%HMMZ^zo~fz|;0>P~*ty|@1KWZy1vEP(B%9dCQi%VHMHyU0n}vZt_9RzO
z2p~Bc11K*q{(HtEcNH@p%o(=rfPesDnod7kQ}Bnc1@aAIJdPbZCQv(h!5_LWT(7DE
ze{kqdFpltH5fnG^ee83G{m-z+ZnI|B3H(?61{Y!ApOo~4_<^wZ>@IKLVC3dw;Le<3
z8$y0xVM|THAHEHY%mVxsq(GMB*7?Hzk&uue$m;?<0~<1v{{wmzK@0YH)7QUC;K1HH
z(8%Z!$t!I88(f5eKlWY6K7LG{z=3Pm%I+Nx7;9)~{PrF2#G<TSH3fg<Uj?oL2ZZrk
zfK1EaIL@GRo}Qk9f~msi_V3^StA1Ns+X|m&9sr-l><29_?n`n?z9Bhg?SIw9v{`ic
zv-dc}K9QXJ*dkt;GnX;G1D*(YEJ~>f_+uV3v3AJaDh&O;d-v{d`XA^RMZtCM@j<%)
zAB-W!)XmL}`w^bMu}|gX$q&eTnEO8TzJ)Jd6q0-;mE-@)&VRt4jRT+w*snGqz@N?=
z&EOVu#=0uZy2aV4nt(s-!i?P-@z%odSl}07^JV&qGkmI{1FLL-zdFN5gDzo>5~N_i
z&Hnwv{)WFd$v=LB%FO&me4&1aKjKOR)lu_?KlbzXCB7fW3G7wMj0463zN2w*ae_3P
z=QA|{e;XT{U+vzxb0^Psly}kB*OyXMRQy#3`i*gg9z@gvy8`@a8N7lGT~M7OH~fbV
zy+iai6xolWw4Y49@X->K-j#*_71B0eLYFR(HP4*rJ=k$oOuab6*8)2K%FsgS61m3~
zWAWm}3sHx*%zKClWq3HO-B+$$DRW<tACMbiPeT5ArvH$4k*5QG>bNgV0nfi?&6+Yk
zM9AkaXwENg_zxR)m&CkdEz$qgKBk?ZdxFkSHvB<XE)w425P`cffqO6F@9}%AYV+pJ
z$X>DTmG*5reE9Hh{v=hUV}su__S#@#f*`vKI>)%-2^fPvW9T(AzR-h%9{?U#w64HD
z2|fvND%?KnMn*;g;}LuPk0fxqKp%q!`BVG$9r`Vg5ZVa70yb*oFhg7le3&>7=$;_A
zBd_(5BPS?j<!J=weaO+2yesw_KH*w}2I^$rdS5c{e{c^|xxYatFh*F9;78}><wftE
z!Hgy688R{Stnf4EY;Q&XqmRg`h&>S?PcyJb-P+pPmD=+FZAYvLFZl;HLhy3SmoKL*
zEG%fhWawj8ty)F@#&zr;!=3k?=`-+D&;lPLEv=bk-gF~y>Oo|h_B?&{nYw`kpk44w
z<UZh^j4^^ew@w}L-{6fp#Kc$x=5l2Gh7r9#bPUc^zkcCm<bsOYj`a@t^ssKiR~tSv
zymZJ+n{fuc#<+5~xuV}#PtYIGXwLdX^-<#P8)yh%jD0mY>*xHR``euNIR6K&!y4`H
z@6Y`izP~Xi7=D(suB!MS^BedgAyJRuR&yG^R8(eBzP>kzZT%zB2jq|#`ykS9FIrc?
zDI4-_Fu8#^!k#^Q@*S_LXnRF<ROLPxkayto2%LuegE#>2Ezsov_qY$xd*pXeCi^tu
zS?GG#u3by-35I;%!tfATS?@{ykWC~%tua|gCXo3%f#`x3lKR%r`)NQIBg(OC*(w5C
zQ&OiTf%{g{hZ6)|=ZU{xF!lcZ*I(cb417=e0X?DMIDq*N|47h7QQB77cQ9WOqg5RR
z>l*k>?5Ts8MaXr&zCM(npD&r$zVzA4%bTphQDhBHCTkyjRDO{4vvRH3zCDr9I5wYd
zW+u7}#<YUX|J^2VMV;(=p#$jD=_Y}HG4mLGhF-8+w_u@gpiBk-=RZDu`a$BSKT|F)
z8H7e8kr<^I!uLgy;{lQT?i0U)NcxyC;XY+$^^7`xJdFwu&mlfV#YC4P7-GDATSWGc
z3Z-EH9YAvOmr9LlS^2M2|HBLZ_)vWOCz2x__#!wRs8j=M`ODDB`}t*33l>BZKh#j#
zmL@LF)}b*v^|EI#dhBow&(*K*M`-O$lK&lhdc7fXdr^fn!p$w6(0|NTZ-Qr)iz^it
z{s2cp!slN&(6eU<Z7--SU906_{;hf0*<Z=NE!dOqHf@V5g)uXSm^0f}!@yfc#*c<M
z;En^orKSA{AMQgR?c3iV`%XNk=QY1E{q(7XGBS#y@d#`3qepqawNKCsqQD<@bK*dG
zc0)ni@o#w!dKg#NbRr9d5nc&;Qno&xtv4@)xtN$Yk#+n@3~(^nPb`wA_a{!Ikv;Ho
zh&~{<%yIW_E|GiRP&;?NByfE|(*x9B9-sZ<#b*+0$X*9v69hhrQbdJ6zEu_n0tpYq
z-+w@qw$-+Go;>+TV)>&8pUkGc+%N|&U_K8X98PllzN7%x%*<lqe<HZf1bhJafqVBp
z5c#Qmn8F97S+hXG4|<c>hu8{zxOk0cW#EtcfCD2&M9^($-u(X;2jCmiwk>2}?)lE9
z@6DTEBRauY5)Y9@c>Qm@hPqm=VGWX&zCzZZD>VH8eG;aC-{{ccCRe|_dGi1K>dnf+
zzGjc<I+`{Or1tMm7RaZRUwyUdI{YG?oRWwR?<&_Av3Weeec7@&!uRJ3%)?h@|B8x!
zP}{e^B=(d5vL5*my+jPLDF}{#@c+WQ+_a1z|Ie@Oxw+qH8~`l>E;=~8{MX|E{GzvR
zeL?r9?7a6TzI%T3Si?pxsO-jX>?(U5ew!CAWDuW#t3;;oCi|#9CNZ0Z0##d8@W;pg
zpKzco>>0j}J?FurpFaJ%*5UWXi*IPZ5a23gQSf818<kgrg5Livzm)Bxu=Ah!25?~R
z+{ZLO06GBLRFQ8v^KNZAySStiUJiU->A2Lb>r3|Tdq`qGKh>tD{%Q;4#j95{iOxNQ
zwA+j5BK(Pe{xhO~<gX+0@OV|GkL>;mxBmZXz~BFXZ^fF3@dIyyHAz(YguCvV_#F_C
zN%Pg5G+$EEm)P&0lKffUYoZC2`Uc=VapHYizl1(uE+0CSLdzoD6;}uR@eRm4h$#RL
zfG039c|>Bx%a>=k+xAcVPERl7@P}p3eFpaMyZ^To%t7!j;KxA=pkLC|45M`ykV%<h
zZ~vU!|6QgLmHspJ;>?Ky_(pBVfx^P?L=VfBV;H*sZ-hMq1Mr2nZ|9I4koSnr0=g>T
zfiK|=Zc&boiS)Vvy+L)spBo2iI~@T31fGR~J;r6qln2DlC!9>pjDKx8LthNtW0x+$
zG%W@m02XcA-XOl5&}o$NIL!JF9D!}4DoQCG@T;|J0dyETI^i61!JGKogbOT3RmC_}
zcO9@5!nV+^-HpHTfUUdY1^-Et9+VpoC~RAS1JDV84vC5R)Vj3*IxDu_jy)F|HVh!S
z&;I%S$b}u}ik^pzfS51f0pwW3k??{)Yzxq3LY^xxF0`WWao&e+a{l~i8veBj2cU0f
z+fqvTpcO0PDwLf$`}S}A|KY<t;?u)Rr_G)Nuunpd0Qn92?>BFXDvb+_egJc=w&1|I
za~Z_{iJ1r9B+qRKm6lfUZv?4OZGQgzGtp~9KHy&eIe)X)2-v*frvTj!bR&>4LDNMk
z;47w2hyB|7AIAac$6#}1cwpe<o;|fM&x<JIT+utA@32?$f<I!yp}S#^3qu##xPZBf
zm|^G`4jxST8yCvgGjg{D_`~)iV&j0N<x`RIiMwuLej}cmiGN04d-MpQeQ<=S<KO!1
z*|V?d`Ns`^_%$3mmP+CS-jaFxkX|DoH}b*-=oK)2@JE3S0{&@&@(Zv%K+k}B5zqcl
z*o>T=(>VA(Z^9Q<U7UAq$BT^{6aI!NC%yL}d7iG)_Dr-N^f5WPfI4;R6|MUQzfg(`
z%zK<`L@=!<h5v#e>w}-)JK`hFwyi?;1|MEi1-vlUGd5oP&}$*=xc`NMIXYv;!(V+b
zr2%YxF?eF`!ifvei!^Q=_)Evk`98)IFohiwJ}~9s0onmy8OE0i{wy`+M+AK|+n1J&
zztEEv75#g3yxi~+<~L+9X8kRN9p<w)iD|l9p=}d3J@}_#zGB=OH)i}J7+!&07w`ac
ztUNq`zs#61_x{F3ZxWAio%qy$5T-jKJ&X3UX%Cx@)g<i^sliqF5@>oU-^0*xHq4eR
zi52Qg@IiU>D4*K2DS`Hj<i$5KcmSD`mtQO3jXYFrTI@}9ad(IxoN#%OglaT-7<7ic
zmif?r+i2T=r9ig@o~!KKXTyK@?nIG?0rLHoEAMFio{CBk*ZSa1;^(f@{#3l|!N4EL
zUrd{pFOMT@hj4O*Fb#KeV{G5vB-cSOPy47a_5GWk1+8Ponez-eA3g+?E%1qgo)I?4
zjva6Q4OjL$3z<P%`wq#;lU;^4fb77jhm(`@uU1|FF*pppL2Qm7c`z$GF16wP@_0Y^
zGs3sLstRa*N=gCke}GsCww{fR2hg!Y&&uhmcHjV~9^RX_#luInI?CF$Pk+IG<;o}3
z@rhblC*u0paeSP-8k_b5M%88S1i$U<oKEMlVfcO6A^Y~dMaM&6umEesOt9xATSx5V
zB>H+(9so+=??cDpmG|ub(>=rs{qFP2hCloPs=HwAhi?%4&e`j|H_eN}Mh#vPx<Cg0
zICt!LgN{3_>UMF$ANq~|O5wNm!xmUm<A8M`HMM}muRs0Ux895Py#UV#KMcf9mGULt
zbo^9R!{@&UfAG_s_Kwmq_Mv6?@?y@adi+rz_(a4&BZdfkA^g_|3<xVDmxBg?FXSaN
zRHjY;MfjJsca+Ln7~|?(`zwMIc!O=*O8pf%@e=>TPIdiy*}S9`)mhQ~|04VmXUgWi
zIALFNYkzq#fm{MwFnl;@0b`G6+UZTN73IAz?7j8t8Trqr#@0Py+gO#)Lx0c2>2c35
z$YrqK)rJD!WyU|Cw4L50pX(j6AAQy7=fUeR`X<OF|L^7H%hFumrQ^z;`|t&W?|W@2
zoO6@iR&Uz>q$+j7(El=W=<3x^YfIOwtsRFCr~JZqZurAS1NvJV3haf@$Cb)}>@`4E
z*1t-9GU0!~w*Pq1@$<Ez@72`?_<-x`-uZ1zfd`lawT1Sh|A?=Hoq!wuXe)F@RVAZ<
zmUQk6{}V6T7G7KMzdCRLeir=fJ%|f<{krzhe&~kE(kJ%(XLLnXg#(a1*|M+~?em$H
z^}EkQb-<#g>x9fdd-fxq^9ggz!lL%*zSGhQ|Bhe%T{n$*735BX&KUXWtAY+}-pr1F
zgT4tq3jdD<G8J!qZ}rI4qK+Zt6X^eV(S2Nlj|gZsBg6FR6H4!c#LJ&R&^91G4t7S=
z4`0^*w*p?Oyt$7Ur>ctcs_fW-A1|x-Wn_Q0i~^Ye1@a+-1IRrFKUGl+e2<{_0uL~A
z=A&A}1B==p?)Tv50Xr+N^%SvKi2tq)1+*7-9^P}`hwcM>N|^#blbJK&zvxBBv%&vJ
z)WY_IMPBk7#Qs=&_#jdH!@LLF*3*mNGp6kL#@aCV;roSrcl=<F>&T(UoqGZHBPJIq
zctYeN6QwX~0CH*~2j~AwfgcxdT`zJ?`qH@o{>i?A|3>cA^5#A07WO7Yt~*`@bc4xD
zJ!#T?N)#R*cr|)7{7=1T-&e@W|Mr4hh3wdFZa$j5mcrkS)9<FH`-?H(w=el`zLZxR
z*=s*+f}qd96@CSAEQnPEoq$ifF!|4zIx+9D9>RCk(^GVQf~oJHJcFhqPbEKkin+gc
z?>`gc23{SpUuI^pf9Is&<ng%w_on5&iq<Ij?JZgqP4^e{4t}J<=A1(O|BxYw|NnQ>
z0LV}_Ht`%WO}~#RXkAU_sKi`g;EuVBJerK%g%@ASz6N<OQeeFld`%Iz3!FzB5prY;
zTYP+=BV*^R`nS>m<R)g*LT<RTe?#95zuTHBzr!80o<F_EJ=h`<UnHzf681bMH!tD}
zh2;lfTQoLi=hg1h=T@b2>(|s6Gv9ge-~*+i!dq{SIfXd~+ECqkZp2VwK0=-cooCPY
zir^0X^rn5m;4?0Y59*gMB@}o-Hhy{2x?N%GiHgemHHMHcQRly*z-CgqKP0cY&zARi
z#r0LDf8fiYkAW=>IU=mB<7r<m*l(D*SpIxx!yUXA;>g0naw>(Nh-qhZNT4I&F@-Jg
zLzR;9rRfmzWK~ALDD1aIdH(6sieZo3+!z~C3t)_#7?>aa{+V=+1gzzV`$h~U;{P~(
z`zwYy8}4`qvOn@z3p-bN^#y!iDeudUB}AKrDOd+gO=Eu1qpJ2h6Q(T{JzFvCeaK#M
zeq^uc*A-R8_de$MmMt%6A8q7?0L);6Vd$)2ur5oJuoi(|L%av%Q0S@Q`;8oY6&-l4
zyg3P7fxJAU^YkYB@7yQ*m<dP6K_}sd26+JaRBK~wU{FvNou8+?@dq6P>?#}EgqRW7
z2|=g%^Xz3|T;6l=HHY0<S2u!=_0-l5Coy4y9m9r2P>4~5&kowedEgpi7!XI!d>=AB
z{2qlZkW<-uNj45Vcpw}d5%zn6K99KqUbl5?CSI2JxMPmNPQtA>74$pY&tYC-tSgq?
zc(;dvN9mcHhE(Nm&Ng_{dT?QB0Q!&pTG;zOc+vVa_{o%~i{c)$s{Rd`2(fC6zN>UB
zIs41@=|R5Ls`i-&9l(Aw<<T5|ZTcs#L${B-RiYHg%j}%m-gHiFTib*hx0yn(gScw=
zJybORpu<3ZzpCJ;c#YTN$N7YIv-9?Vj@OO@_+K9V@FIL_2%W=@SDz}nhL~9RAA=u&
zP8#tlkX1m7tFr*^h}Q!@DlgCWQ{X?3*t##s&y`*8E9w(?V&rYXx>_5K^XD^Yy)SaK
zBd&uv5KD+WG=LrWhRVo5$e)UQSd5$lpBng9+_{r0w7$8b@r4Y6F~+`v>>S>}?Xon!
z>~D779`FUi>b@&#%fJ0T)@#TN&`VWzzJiC?xigW@kp)@+ngcw5i~$)7dN1%v!WPVP
z_%y&*3pxkT7sfBCES$M<z?<gD;TH!T%%4*IBLIAYj5%u5y<fBdcmTQpy%*$0=)r&w
z;2ofc#=fbX2d+V;M64_1vuV?!Xju+E?xnIdH>^2-BX1&Gzk$4YqVTrWKT`kSUx1yN
z$!EZ<37k9#_%y^VB2OBx1G*IOPMq(QKi2_&HjjfGS;$`kJo-_+EXe;i5UZefh+T#L
z68iVwb6;`J*~<LyP4k`b>A>DP(EF9A1FM2={i#C85da=wk96eAMm!z%^=0O3=~)mQ
zD3xQ7YZtn8*h7)83Os0a+wX+z_MgYOMgY7V^fd6j#r|i=lZ?H0z#Bj>Eh%}0=YjYf
z<X?hb6!CBHcLooEJqG{q^jw4dFZu~t9QHHhTZjA!e>LQs=R9x?_Hy{`AqUbQcvmlg
zS%1o(5%@C#e@5WX2>cm=KO^v;8-bmM<MicZTF8)&%Z(a2d?Je_M*bCJN!KN(nHJ|4
zu~_5mM-3l3+3IDk^E#`^&*JZ<u0DHis_sbD&8$(<`xOn;?Y^`%xgc&o+1pM-+i>40
zHT$$@mx{WKTyaX=-cDktMrU^^MPq5zdha(*?0C$wu;|{tzj}{a)UnU%j`zO~i5~nQ
z<K(g6qLT$5t`-_AscyB~vc+T6?Zr1(Z*}%N%Z(V<K&_4Zr-x%syAG~*YI0VQ>Q<eM
zw{-*4!-syfa#NF;Coi9W`SNqGHc}2@hEB^Q+#W{jn=R=g^C4CLaq6ZmuRf{-ualRI
zjde3^vD-j$;ZQNz3!0DK4KrOVWvHa{WaawYzB`Wh-QpRlJ@Z?kWW?*Ri&MJB=&B|@
zx)tW$NNyHu@`w@phS+R>wK#g;s<*NWqFvijcjeAEmN{==pmBJ^*WQ{LZyY-*+4tOU
z*TgYBF0f~DeEdpTxoxYbHM{)dyUs_erTrR7IT*FL%u>2{uie*MVi~hSb|*!SRF{#Q
zeCABYK9(k(n@VnG=`LREZ}nQvYRq4(#9KPj&dx8EYc|+pprIzVuS0vC7LB+0d+6_P
z*?i}z#nG(obDyPU+s9~F>8iFGxYmBYsalf$o~<S;)g|`qS=!WTi^p7PyKcQ2-Y+S7
z9gz~Owr8)D$3!!kXv?rKb}ZJ|Eu9o@`P!`WKRKXL165TYIoSm_Ok0g@7S))gt1{X^
z_tWM&R=$hnWn8r+rOgcWX3u}dGE|Z@pFO*H)3?q^vo^IBx3RhE7!fPsJ6P=el44)q
z<MvlfdNdkZPhzEv+_vbX>n9af{?*!1(e6OTf}788OkEM)bB0wNjUipfcdI-0NzA!<
zN-VuI_69wAQi0cpJFwgasHV*kb5vjjjM;v2^wIn^PdYAe*7oi^t$V`J=7S%--n?R=
zr0<PECuePJ?4}kYE|zp}_vZ7{`zUOW4OTU6u}!{>N_NtKN0hepR{Km-I|VgI$Dy;v
zX^-hFBf;vfbo+w7eDOo)`bDuG1N7T9IC%RaOJV!woUf|~&-4{<o}O;lxbZX7ISU<4
zbq5WSc0QR#px3_pj8k9p(-ry;ynS)uXs0cE_U~J~NY`b**qO<@{8Me~OfueeGjgQT
z-MhL|CZ9GNJSm{QhHi}IR}24HL5Et(t^7;2P{K~(=JQbHy$PPfR&5xp);&Tk`~6qN
zdM9lPx311hG1ZzULBO=n%4W+cGruO&UG{Ij?I6FuVVgY%?hIexsx7~MR+}9Y%@ljN
zZPo3+Hg8YiiGJbklR6oSZ=RkV6<a)a1j}I3r2YBf@;j)XHfmS=E;W}IW9_oP6JF<$
z{%*U`u3Dy=3wDes*t+DH?3vD;Bc<gr2ikp()^<N+Al7W%0v*<l6MctW+EzckC`{_)
ziCzv9dR-!eGIZ6<R&BngQmVPdAC2Ww=YO}divCM1(T?S~?#z^<hg6EPrnFz0yesL_
z)CtG;i=CR-e5|xI%jIz6n`g%i&E8gjZeqxg#3^r0+y6C%HL*eK+gsj5O*n8;cJg$$
zcC7X;F8L?b#ZsP}3%{GHtQ0!8wbA6L1^dpOYxgF9Zu{I6r&FEA>+H_F5XoAZ`MjZL
z({6U}4s}j4wev{%Yb;&ak8Sl;qaR#cps+CbL|)Q$(*dhHE`1qbzH<9)x$Q$oS@b@z
z>07-~Hid4P_YW?yU#zw;_f4pE-|t7dnJHz9cesDwaMYQ7{!8nHILReO_>MF<aKNog
zx2NXrgUFanXw`ITh>_l`HfAddQf%IMWiD!H_i}ft`{<_rCLygJ>F<%~u6Qh9!q^7k
zZtXir-j|YZyZrN_$bif1n#pwEe{0jD7RB97Ub;z6I<n91#EOueudem)U-Ut4m17g@
zWvQBtEqcz@Gh1?TmbhD&9@~QqlIn+Us~?-5?H#3k@3go|bfiwscDa#SRz3$lHewCl
zFCCH>EaiHA_1q^{J+CJ|xlCa4IKt5?$gENC+u;KmTGb<%r+;Z`JJJHXeFhCoS{=UN
zEpPBbY0#H1X3r%h4~MR}a!$|X@V1iA@5sQW8*J;ux_mP@z2w6U(_pJrud@pRbYe9K
zh1)h(hjpMRcNqD&VaA(hGo=4Ipg8zvMk95L0mhF{*7J3cN}Td6ILBf@8}Atoi)U|=
zyP31)xz>Z^=O3GChaC7=r(+ATNWUv9so7MQem{FRV>R%;Y5#c8y4xX>I(ZEIprN$G
z*eR*&)cgfMtQR;BF+VAPMy>z0?WdkRcJ?t#*pu5OYq-&HiRHUnUpkgx@mH&zN1IxI
z|ES+rOg*TRQ`=7Zmp(pe+c3#NZrD4M8*@^xuRf?@%W|_COh(nIhfUF`A4g}~uUIjg
zn%h$~^15~7b&DUybn9>2e|^8@D%N4*Y6D*PtFPp`*DhM?(xUHn^(0gZ^5>pzGsO6Q
zac6f0+o&V%iTm3fcX6$A>g}Ug>-&mpiocmZmy$}DA)&?^kl;1_ru6xRy$6?kGasp}
z{dRlFB0JW~tQU<QImjn`TjwF8^T2(WmA}QpGu?X{s0}}{Fe>K5>%BuABbEj_j2IfL
zar4}G{i6Bz(q0C7#|~Fn^l{#KN5>alv-&>m-Mr1l@4Y5&`WjI@MBc&3R7+WF_1mY-
zHa{>mXLWXHkp9zN^6=H52Tq#`vO4-cpQ?-nW=Y}F1+#BTf9m~ezk7^gz3&NL&$?YP
z-r;Iz+%eqa*`>aYwoCdZMqH@da*%@32tpwjUOU%y#AY=m!%$h<OP=F;1lxF&e0;6Y
zzrQIZJzrWU>_^Ep%{6KU6DLJEx!MlMd1q~#JYm6NEDl!wmfa_B+g8w`?Gwd%;_+T1
zy4F_^dmn6L^)q?h$d`Wl)CSo_cCS8a+|cM5=<(={gQ4Xblgw8WLmHiu-)*o>|B{jF
z>n~=W(J~zr+&+Iu&ObT$`rYXBMVfQS`rF2HmQ$R}-DsAn)*7{!Ud9p4L)%E3%#6wU
zQA8FCt7{eugNM5<b&SzelU^Ra-Ph<`Qq<8^>k5}D-8}hu#;cpI>at|6rhR&8o`15p
zq+-vWey$pQw-N%hf79o)@tPf2grHvj9Qe-D<c6iEyQHDPnQQ%4w29l(`jUTiUjBow
znfcGA5-RJLtS8rC*V%LhMe)tftu1=YuIpjgtcSQkhh45(+a{T+4S#g}Sa6Two_g`K
zH>nmqXq>-QS2`!>mfscoi~jz1?{r&QZ|mSrQq!CEP<ef)p3{sgN1I9%7P@s?6Szz5
zu+^vgod_OI$#x$|=DgLL8+mhH=grQ3*Gx-NMPlcmb+3MY|2oHDbX4kD&&x3d?_AAi
zuFZ&%J7x6xEA?|~-hP%?+Vg;}19OuutZf;YQ81@jWS`y|!#3@*zv!dT{M@*qQ)bHU
zI=g@Md&OPz=8GM#D?QX~QOBn}KMy)IcU+@x^#{*?a*>eVaogU_SP}LhA>oyt#Pz9O
zY2Pwq4Hqn)TGBG&U3lIWc?BQajm~d0r?F&|weAGC4^tg&@NIEQPeu1!eP#DYpWY;$
za&4%xq_4{+YDgQ~;<=u&2eRzN(grMV6_k^>cvYxlZ*Aoz$Hu&FdRskm*A5*s>w#q0
zMig$Ve>{D?Meo04%%$EcY&FnTUnsL7)n<I3se!B=2HVaLSiSF>`O)~4)B)XOhuBgk
z=aL%Lt*3L}u_++b`)9Go_uwn*HwDh#BpLnkc&_FWjb@`IO!rG~p1omnykiqzlMc>g
z)ZDvt+iKiHKi+i{S!uW4%ud+9>0N`2=FJJwIy~DvtG|=dUa7#aE$Mw$xO6ON8P%!D
zYVTPQ1rt0j7W|a3yS9Gynv#O4{kLs<|7CjJdbh&&YUvV!clhm(J*uk5=Pq(+a9MNQ
z{H^DojV%6YGq^Z^*!kIa+dVDm!+Ks<LM0<@=<{_sk(P&LbxkIU>-Et8={ZAfkK-_c
zA?}$U=SPwiq??*r=;O)jRn{xkyV-HP-U)f_t!pnCUAFR5JS;O|^}DvK-aTGYa9Tp#
z|7$3<g?bq<P`SaA8LVAxwC@I}4l_LYS8;UA>~4BT>qy1S%bDiaZ{(!S>as4&pW8WH
zGJ0m-C9UtOwgdB0maUp3Hq7woAv?9hk-?U7WGRd6zg{u!yjrB9qQ;QG&LM}+&P~49
zSUj{?{Lyw<vDAki$w}r33Ii<KA2PPy^v-2S?2kM32wSt}=ip#Vv8NFc*NQ&ehzwrk
zao}T#_w+h>@1JznS~GRn_ET!pzJ5EU(nThsUcI_Ql9cRTbsDd-#&Y}oq7O@_UPvKK
z7XePZt?kOpq~;&y-#hhnN5hq}^~Cl^^);8$lYLZ|r6RE_Y36BV?FI`iHBZ_UX`cA2
zi-kqL=^KNL)SxNdy|$YeDhynnER!AYSztbFV~@wXcjzn{KKzV(=%i`Q2;S^nyZGQ)
zyE{?!TL&)NGB)vQT^r8}hYbc(=~5Y~A&)HA?ruOhxwFe=SOx#k4Ep)4t8RnV_KEvc
z-6H0BSbv=m(`xa!;*a`C&HB_GaJ0v<Gq#;WzuP};r+=|ti}5Nt*+r=i!;bd&7I@67
z>BWV;+b>N#JKeW?$vod?T7HYStS~n}Qa6o7`1F`XFM5-CFKd0iGfQ%BoAei<l$@UX
zoErl>Zdtrcu4sZsOm6;MCk5FyOV_BXbZOlC=ePRn7CqD<D|AQC@n*&?4p`=#f2$qF
z%0H<oH|xpS=3lM{)nloSO!BSsqG^xG**}uEH|T2?G2r48i??I^Q~mF!eeEQt^7?6K
zA`CpVoHAzIb%j;~?Dx6a_6|~rVeNYTdeuAUbz?e;Z=IWO^{7Qga)`;0)3a8p8~2=P
zy3%f%vxHmb`$>aKibAiaq)v1*vl@G1`=Tv%n}1j7`ss5+zopGH-oIa(aJO6jWzTdi
z>op5i_l?}$Rzm4#!_7+@?a;~c4qejv+moK*SuZ4|T7G{qu%6C`XP4A$f8Mmt(_XM6
zwriAo%fUM(T8I2>v7A)8Mq5(Hn$mJvo|1I_ocNT^jqJVj_h61(lWQZ}Ox0!HG3nut
zPMS?_s5W-g(4-^X4Kv;vS-TQZD0E5Vn~NWwPk5KmnMJtK3!&d9UT+vNulV6{$q;Af
z*e(y;wG~&aSX2DA<w)bJ8s|H;ThjM{Wv*_DQ_H1OBXaU*%M6W-*7kVw<-LmaqJ!~u
zCEYS#^cfyXX&F3;%QDfst!{P2cF3oTZHm)B#w?1EDegXdR$fHWKuML)Inx)IohVry
z96Dmo6R*}UJ&h$@hMy`5R$`4<-a~O+&iRZbiH8)PCwlxiJ63v{UtO}ac<j&_x<+GO
zg15s(`_%_jPq!Ml^^of(FU`DlIWHR%L}|J3ou`qQVbiAV=4Qtmh)F%L*;N0*lZ4am
zYLM67r3A~RG#;tFN_>5Sx1UL)cp^NUO3r$gd2Mai_OoW4U#G#^9`;$;_Lk$u64{?S
z4xDa(XH&_t4oBbhew|nRdapvD>D)s>30+v%_wSF4jVtN*+Io|t{R;E?sp~(hSXgRi
z+7bcS!h7c28!axsCd+tGPO@W@cKS=kb&9WZTYX33&F1U(@3&5!ap2HaP~Mi!r@u%}
zkvKQd+;d^!_0@(`a(;|xTm0~(*@WrV12nGfZ6lX=tdCrq+h<!1TySW;`LKI$0uo}(
z5_(vTb(WbZKYNpm&IDa?#jDGn^t{tjbw}bA$>xh6Pws7d!ZJ6;>|O&8<@a6_ScGGU
z^m>(k$M5RfQ{Rl$J)8E_RJ*1oIrh2N({P6uUiKqY)>!DqOr0IJ`0bc{^Brf-)z`4|
zZ`5hu`nS8sB{bST^!8ruwr0^T2A^$RhKrMKj<JaG(i4je-PkftM(du0-LR3;cRqa3
z>nY)|N}=D12Cf5E%UZ~&ZdEaRH*UF7zM}iVM)p+6>^0wi+Qb+c)!nqG?Vy&vE&Ihc
zyXM!{On*;Wn3S?k=fg)r^+&gto)*}EFxHC?SjVfejuDA(%8oC?#E7K&=IYOGCl?KK
zXtAct!IqMf9h%6bYi{U2_}<=r#hE<`uEn++>2YdF@VLV716($ibU!31NwxB~G5hY>
zw0rLt(_4CqyB#vvzq(+_nWAD#OH-{ShepYS%^gg51Jl4IjqkX)SdW*KRvr1$cMGZ9
zZpHj9Zr&mG2~RK7-L!r1pc_WB>rdAe|M2+uwv(Zhm&Pm0+{C76Wt>vJv7}qt&mRV{
zdi7ZQFLm8o@R$6mzvL4ObJKgxwNEKp<-y98Zq+(AJ(b#SPW`Og^Ge9`;2D>E9w;iV
zT=#a&0_Q<f@23#PXgC@C%~SWjcj#f-*zQZ}CWoNg`L2YWeOBKnB&1_^S%;6N1LkiZ
zx~IED%x>|ClK?W+l@|7?WZ;rcZ5!%%d7<-?5&q4!>o|Qp(KXh*ubAQ6H>!cVCP~Yg
z>Z+{LXtp#l(BWS3N9)w7Z|@rw%zeW;PKZI?g-LQU>blYw{9B)YRJ=YuKEGAJ2F{i_
z>NAeKTOw|#)N+PdLFnZ<OFJG-Q<oj4FD4tVQV^K>@QCU;)mSovuiY#>J~X?l*}Xkt
zTXhP*ukZW%TnEKs?^#a!wn$~~ezRiC#d<6c!^tuOb=-CiZ>JFxwR_7D+18RQouAHw
zk~DPci%UuQn_Q1`yPz}5xW%qluU4*$zr5tGvX5nV<DSz`tyUjDf5KQ++@3a`np9w3
zQgb6Mtwr6NIjqWe(Q0jEy+>S)H9}rl*Se@jVnpD`nNqTL@9yj*{X2eg_xX!=S1dd;
zD&v9u$2wCa><C|a@x0d92|nKXx5OG)`pQYGtI78FFlzVpoa^zN&S6398kYu4j2Zs)
zambnrS3Z)}HZ;O<dM{hIT`Z*`w!2TtNJ?l-&?jr<qBAR76*#>5m^NUcjFq*u)I?VA
zajtLm#QM%@sW8W|eH+ia(ereY4a9FnzA<e6mz90E#j2LQB_7Y6YaKm(%Ga+Q<t<+r
zx)*OCE5O-6A91SLCi5ds%IDj%9@vZ9&G@=(O@3}pn%S+w#$x-{{@idT!@Cs~vowFs
zbIVM(qdsv)M$%Sh-;XF5gdSj>ZaqMJ%C=jst(>Ipd6}qwER475rJk2HMd{8RACnD^
z!{@A!Pq6**CFtBEDP^~U109;o{jSqkjBqEDZFD5AUhTL}KSO=U)y<pp)#to1o^EJ&
zd582>#}&s656!ywx^o-(JwvR0uBM%HGOlB<z}n;PemUdtJN4d5lJ8~(-)ibu5ags_
zpA&U-?ZC$`l^Q-z+~PfK@ZBqJZLW%mEp2*T@s0ScLq~M?ADlF#@S4u8H{Z?M_b<wl
zBoyh3Yu%Y4yNUkbd5@40uaYh`T`DfVX33;gpWp7Yvhp#>FgR3Shv;A|dd$)=^IF@$
zl2qL?BhHh|+>iH^mo`mpJK^nHU6YxY6C=8vZshG~A*Lc*=aiA3Nt*_ZUJqE-;_{c7
zvh8EqJ4{$z|IT5uyoLSv`gy{aj8V?5J4xPJR=m>jI911bk<?q$;%Na(FRWWSKt|`o
z;jTpAw)jSI6R`=G_FH5sv~`fz|8`;0z~o`E{v%w@zmag;8Fp}_tW5S}(xt+j=7|xD
zo9Y@KKVX0Uh2N^Y<aPU%8%ypBx;Ih6Zfr^6%FLICb6ZT_(#Wpkj>CKRrX1UL_{^Ee
z@1MtCb$r}n_=VwF>ERIU4p`=G@2x%CyP!8fw<Lad?h^JplcHUG3Jadu^mFU4)#l=D
zT>_C=53GM&U%hJG<5nX*Jl19vbk%*LaXj>A(1;IbSBb|+G#oe}Y+1(0;1BMsjO1&v
zr{_r!y+E98iQH5vdA&H7A%;^j3+id~h+n(@OGB3C=FKau3#MGX<k5H>>$uuu?+}^I
zPENCmh#0Mu6dG+AJ62v*ZPd8CKZ;Vqo!6xd4cj7h_;I8Ht1v7q^U4b4rQd&Kw;DB|
zAg7+YWBtT{IGIkYu}Tg-OjOpaeP-UmtxNY2USiijv`{3><(*|IyUn*qwOduR{QT)S
zgVh@iRP5#_cxB$S>1XQOEMmNCd{7ge&sHmQQ&ZbIP%KhWlMv_Dtp=`(&u$~56BcZ9
zxOaj^6C#UWY1>wzuX&R;8;VtB+Gt61DUMJu-JQDPzT%huYh?;s4{F=B?Wu{MPF_5;
z@JU?Jt$hQ0yLn4A@FNgQOFAb%ac`^GuWe-PGzPZVb@HU%K@}sDiS|Tl-S4xkWpC=c
z-{3yuBW5}4G-BOZ@o}EjI2T!$fWC(&ngt{so8ta;ga64PiSryNy9Vu8Q|79^6N?|Y
zs->pvymjk-oE4kc`IDE){2Q5i?(I9*lb?F|R)O#Q{T9XQlN-lb9ENH&E4B`yq&iVA
z{K9OmZ#=&Kn}*DX6wg(~<5^_tFEY&0Sv@gZ+D?3*O>PUBHiPXvBnS3d`BdJxz4(`t
zCoX1KJj%Z&)^7Be;h(~`K)Fk(BP$^2xN0NQQ$PKUeOS3hp7w6KM%_O3o^{ID{rm*h
za4)a?3o6Zy7&uR2>0Nl*GjxFdmZ2G0GGw~$`~GD7z|>)4kv~dSsD1vVvU1IW8#2}t
z?&lMQ@!V#fb;r03xc+X){JJkaXHI{#qrUPG`!A23jcqm&9y(1y@wVmR?9(6mlCO`-
z{h`?bf`#Xd?2WU@EG2q&IX#wvVxy0`j_Kyv1!h{xkB3;Rr1?dsDK)9P%S&tYxR(L-
zuViGjh!~df%Kk{7#l}ft%F7NV>^Y_8d9U#^gAQ?fl^5SQ*{b91wYON(1=C_YSn3@*
zG)e7DQ25GYmk8$zlUA*bR2Xc0U2)rZ7goTRZwH!mPYYbrIf&R52oo33V$;wuvJ-8;
zp1GTM=Ie&yn<YJRZmgMmqu!cRGf!RKura+=lkNToJ6-Cl5I$C{MR%j_Gwc^HJd+Ub
zGPqyU>5HRp6Q%l9$Jug3V1&vw-9ee~JF<s*ddxJ>{ut#(i1c`8nb0$%`!=-6Jf3j(
zAmMdKbq@}mKT_Jb`?NW|dQn-YX0oh|j1>B=@S6Vp{PX@X65G4&a@s~DqNPWVhDYug
zGC1vJsP=)vyoBtPjvdy@Y@JJ1g~(uwGY8TW7JXsqsL8~4pV2n$b9C&6;+6T!mYM%>
z39{Y<W=V6!_Q+?4b34X1ckbBvQ%=s=b<(GI>eQD|2)aI{(a)gB!5dq6HtDf7=Kjur
zD}5{meDa#DPYBsa?e&V1y?PlJeY~X0+L4@`UJySc-=$X_Lgm-m9-Y`_M9w=`5C82c
zuCG4FE=kwzzb5;xu}w4G4q|SS;<>|GZWAA|S2^5$^F#CgU&61N49YLw5Nv5<(5FwB
zn$p{z-3VnEHT3be`Xja1$~52f-TnSzvCIX<N@K$d2tWFEi~N^ej{69e?mKX7L(@Ga
z-yWYxn6v%o!pVxPA~H4nZPo=y`*b;@NR;?Q>GY!Q>*K4Q%D>avsNxgoK=g=3C!Q`*
zx41t2fqt{PS*O~L%u5;Zm~?2s8fi)SHczh|pPfteie}T+Ti;&&X+d%K>EiBf!q=?V
ztE(8etd7URR9BWyc8pl-z~$Q_A3f@pJ9kW%dUm&7OusZ=T2AHNZAqnwh_JI`TV9QN
zICp`Xma>1F^xK_T5YJ`h9f$#>W7nfW{z|(pcRT%~u;r|rM2A<!R%#ZjqoUlr(``b3
zXkJdd`Yb4DcFR>WuBv3;mh?=$N65>d6)q`r<GXD$5La2A(n@n#V%yn{2Zx#I)g^@C
zwS-&4d2e2CSyZR4%Btu#&Iw}Ds&9s^n18BA_ib(aG&;68y6wAHBNogK+IryWWQ8*m
zJ9$XWYN0hE>_K8nmxCRfFD+*6v&?BmgsZrp!5U6im2IV6U-&ttG<bXJ3hUa9a7}fE
z^~Mr9o|D@WQ;OBNWAhA$SxoDpG<M74`5r~OZZAjH58pj=Pu!O^3q}lAc^B7#SSj|#
z?cV*V?{@3vwkI^}Do1o5J9fnPz*JoqXV0~nd97N=<TdXzZG8T8<%_xE{R?t-9@-)`
z^kVyZXT(SigtfaqG-ZCPBTlzcX62n!Fbk#j5UtP9IcekU2p=D@Y89mB=I6!_b8$8a
z@p8KqTjy@S@4a7z{%A7&-D9)9w&!9D*Cd6sRvaH~y-_N0awC?*IA@)m!&QtY4!z%}
z5A<c7SWXH>z2+-W$?FW?_qseaYQeLCyMl;X%!7!{r>UQVEPBk;2@7{HY|=!0Yv#f)
ztOw(J83!yin;b5sYUR7GCy{<G#TF0BORCp$6ZLK5UP;5Ttjop$_9hMuB5$nn2-0_(
zxbsfyK`|RLM#50nV~|5b_lSAH>#Y8Yn@C7v*5Ev^$ooSlEbSJzxAm~cZ=%$8?1{I^
zd={R$-pI)3<L51jK6Ak%5|xUcW6-28Upf<2yVQu~%LA@_T(&eV)OxLlx~+~Q3sy<8
z$l;SOBb4ljnTXgc?$y(2w}sfm$h1B*MR(3K2}zy8SCV8|o8!4~?zCe^9d7II-Dmr~
zzlHa#5kHe}7#==!sN_}lpk%eY+#y5eCc4)#4*A@Gu(zz#yLZn!EH{{SQ|C)b-Y~*%
z2lW1Q`LaU(`*SN>tKYJci|%ba!z<#s??|Gb_uSKF*UiE0b6-k2>{D=bT7B1D+sM;6
z?96y&CA0PU<{qa;`w((4cZ_V@_>*9PAjx&PeltZcx{*x!m#j<q8?w9iFUS<j)?B91
zpr2mhs0l}pv?V(71zR1=`~8g88g}XH=azRmYn#LxH@cBF=lR+!DEuzzj}+Ty`9+PG
zCCv688`od<-ae^8pC2~w@3751|Kt4j%To6cb+G$HHCat-o!1`Gjil!^Z6!+xdF;{{
zmHvg9b6=`2*s8KVRcpb?0Z$g}Rz5$JwY5i&m02$v6FJ>H_<}~)`a1_%-U^v?PA@@a
zY>QoSQFA)8UL5VAYH>&U(AhKZbB;|td}Ydp<7ZXZtldVW9aF6h{afkkYUr)VTDExm
z&{vP0cTB%3d-15ljt4{+C2@K7UZeU=G#)hUIbuhlMyKfw8}4YODZ6{(g#tYy$pyI%
zjMye)KK!(6|IH^}-#r!)5%@53z3%_Y`0i*d|NsBnzU`50LK3nvB72h}D|<_}C}i)E
z&ASw`C1mftS5!v!$d;YG#qW84&iB9HInMiiPTgIu>v}z3&*x*kZl<lEpam+Lh(8@+
zvfyb?XE0WrC$ntNgs*i)ekUe-#+eOD*V_4a9@jK-`@E3}pXoP$3BnwI$Gu*O(3a=<
z*(U>vcd~=5Bl#d(oV#Zr1@Z|i0y7!IN+A7ztdX1s4|am-cqWEj{Oic2CDIzpNbRLJ
z>!bK>bH3Boz!l^X!K$jezN_@h#&sG?KW$q6VVC4<ay{544f7?DDnYi@`?7M8NCEzb
zH@hHWilA$73+enGdDOvQ9*jBji5~}x_?E5Ul`42ZQv<Q1e96iB4UQ-ncf2e0NI7Dx
ztM%89Ct{~9*Rm%!?&^wD_M6cGyeM@X#rt(}La5(}aYafx`#Af}`Y=v^NfS1(4AbpZ
z9DTOu4ao?B?puJ?_^!_j>i56{Qk||5@?65%AVFNrn^w9XsEA$sp)K;`c}#U?fA9hf
zYMX3B78?$*Ueuj-(xg`>zegFHT3~>AEqt<$VJ9hx(yYQ`iQPR@1O#x(R|iN1z1+6D
z=j4c*Mr)C}p#mIu@f~4yKq{~0bk?2sKhNfW5uQ*4{W%4nGOpD1UOBg6UNv4ZibY%B
zcjGj~Aq)iDz0=W=f>tPy|Eh0<9brl($D<c$HRr8qN9O{{#o$6g38w@pdKk6^l|;tb
zwy6DN;Mn62rA9d->d!3~#@@4|0Db?diN=XBzDo9r=uYbc#*A((X1rwU{CvgOa-&-@
zB4AWAEiFHqNfW>ox~n2H)%#A3*80*?Ao$rU5W<}25#<Bvt5GfJA`aD4SUB0+5jU&)
ziK%nQo{kmC9(P6BkB7_Re_dSkBk)_4%ck;`4fsFhTfd3sbD+s%O(9>Y*u#00gKQDY
zP!)q7ktW{pJBj}xX(<a*dauIjtzIQks5^F?%GcRBdh=nZJ;n=@M&0ZVs%fw(+leLT
z+rn;XN7x%VUW&R2=q=$Kk{|-Ivsow2xU&8ENKrnCnqWKKJ|W>VX|y!&ecWOqn&8e<
z(YE*Rt;Oe5GalXe1FrRp&$+AGMnDok{hus$6hw9~E?n$<k8Uaan-JB4YkxEvYJBy9
zVX3FX>(7%B3iK>a|Fs}c-Zw0@DTofTKJ=pco}+4_e^0tkD9qdp<@p%Cj+*^_nS*f?
zMU>dSy{29pOOtcrR(wbG_SfS}xU3Ejy!xz<#5`PNZ6{49ag@~Imw9=~Z?LGaaSdwF
z5mPT`CKxHgY4Cw$EKUl|F*;wk<*n@7hP~!UD>z9Mz@6oPVNK_9>K*yJe)!|7C6h9l
zhCLxPV(4Yl;d9(<$P({sab}2Th}|oAakMJeS_tgud1%<u(AQ^d?uSYR3&ZGWbPX;6
zU|%Fh313}}MmLADlo5u&rJ5Umjj>u?PTgPomJn2oOJWky3dVZfh&k)$wcZ=33_}g8
z3d)5=3aoAxiHR@N*i*}NbPV|}DX5S=;R<!6B|-E!{*LlxZKZSSE|J8hU&=o9K5f3>
z<{L=K->Woz$RqEMPVy}pGfEXaj#_>n5g-qFz7*+MrYj5T5+mbNOF98Bt$L<<8_%Ui
zHvB|r`%hiF=VixbC@EcL>TkvvHH`f>0PEuA?})G&rB-WrHk5cO%Kzd$tsgZe;tqMc
zT_5?Om{;`}L(BbE>XwC(O~w|7i{rJ**LNM8jwtXpM5McU-J2a~wYs{JIlmfasRyYm
z=eSo};+qRO7Jev+`Jgm^2@@nql=3GwA^Kc@%=TjPd&o+#{GA9u?XuoeYDDpjwn^%U
z=zn40H0b~Q6t<T0xXrrvjv8(i%_FZ9W(Y5wav5L`JbFj-55v~}^P3%J&mrbz1%*H@
zUSD*ntv{g|KR*q5FMnelDt<<M{JsinV2pz6u1ersxn;`Uc!0XhnfpL8Dmld9w~tGe
zR5)hGj*xeDuB|ae17UV33R^~I!Z8dx0Q$$9Igi{a3eHS6fz7#FAdH4i4`v=QYzPHo
z7zw6sEa@5CHvKK4LLkYl@hp|<&MplX2}(`bHL1X^On8<$u8GLdVs@UBm`M}4Ik`IU
ziEGqFRvtvDzx|2oy{EVcvx*nHCUs<~Cx1f#MJOb#dPUJ%4SD>v6TEsVxe{eU97W*~
zPk|it+%u0xDzS+8c`PjT)IzI5nb69^!;_B0k#eZ(X|12(`oF-y$vP-DvaWHYN9nB>
z63s<iZ1_gJ%TaT+RDy@Lb;v@af(oP>g8c04E!Yjt4!fqEeg}jQL78-<jLiITn)57b
z&SzQ4WwwbHOkBYv`=2R$w70S)A3l?pq6{O$Luhd*?aV12mRo{QVf~I0?6jVP>nqBd
z+$Te}m#Dqb$)#Uv^rWJVy2Xa~(YQ1|ruDz83*=<WEpX~Yyb_#cG6K}uP_ZC69s_N5
zb1t-b33It&{;OcjZII=Tp8g{0KP7B`ZlS2p5_mCDhLQy6WMwj*lC3Mtl)9`-%EW!>
zcJoRK0l>DqTrnV}{8)OyvQ_2oT}+3mV4Z3Q{<^(`?JY(pC({OMgmvuf<H6ct*Q9s#
z7U(nqfr(UNhRt+<JEi~aXO7{ZgB5N%-Yibn@J2DR%);!X@1BCuX*v04b@f_tR}MUL
z^S<fuoq7NHm(2kn_P*Hr1ExlCEKSIvX70vi5fTv=Lr?0q{@>8=Mms*=Tn6#^mKTJE
z=SLNZyi0^PE0l7fe(M<?2CmNegssl`#X=KndOavz6nc2&19DA#r5)u~VBjElNW!6^
z?cBnNzn2OvY4itncxvA~T^cuOg9<_M?1vuZlN*Xd0tNVy!DexdFK;bY+Xo1U)R*st
zg=QT<6l3qis>nMUw<0>#-TeOL2d<z^e>C?-PeHzcv{5esDKrGi<l4{9Vl=8Hfn?gm
zn+;6JP?@c47Cd5GpU?1ktCEoGZzeTj`~FLA_WYF(MB6$XzQuWld@x^rC3bOausqkG
zV`KaW!cOQy_SPaDhN05GP<W}nQlp-`|5PPtGM(chhJNViqY26Nc8wA^c;u2^+G)?U
zZ}oLT=r8(5g;o4b(##}Qmo)@LceYGCuu$kAO$jqs#{`Qj-am`&XPkO^+WWXyckjp>
zGXQ4|gJ2iHD>UG7c(=sSnJ@#={bGRaSgU;k1pwR~#r@f)mF}mAiK>^e^Ve53>Z-1l
z(!xtZqJ=K^Ds>53h$W;VotNSo{UnXSV`0V!LFDoA)p}7P;{Kh?y}kY`3b8=@pg<IH
z77@+vqJ8O45q?EoJ$~Ls{@%kwN&FS&#xIS$hzPaAT_$9QR$u6_eJetMR(Np!Sm|p0
zZl~jnF1vZrw=OIPo#Nom@844-3GJM^2Z#z|?iG1^54w$VxHlhB{6|bTh?Mpgd#mr@
zlv4Ng<UStO{>}{h^_%lserrdQ&n&a-pQXLDi-gVFZuQp?vM~-$=LMIagaF&&Q{|NZ
zk~MMD{mQQ9c=`Q<bN9;^oaW{>E1L#-$m1PFNK0u62A7O|Joi@U3X5MnV5+PMdz~&p
z)3Gy(FGerUP?ZVc$sfOR;<`JvXwHRhNzg%Vi#FSai=mwt+zgESx4aQKTKYdvMYktl
z%i@+H(bzir#wk%xbP`1!H`@>vTx1aMb;LpL;bCeVgZHDV-(>7SQ;Y#nCfF_^Fy@@R
z{<$hOHnj=0hu0l~D+G>}&CpX*t1#_@)rvHcX}Xc;m+#e(s|@11eZ-R1=t+>OizI_2
zs=V~p0vZIAQoN32;7RyY)8uTF@jx&S1@>X1tzE@Ce)P!7=x7ezzyQqL`N8}fDJEWo
z(3qqbSFoC+qldogIbBPb3)$yAIDA7dfb4Jb`jlTbnazr_8Y(YNElz(VVPsbDPj}fL
z>ZT#II8%za>@m;<Ja9*CEA`6IBU0#qvScrJ;Xl9J!+EQWMH2WciXd+jPbmuvMCbWO
zEE#9swM|zd!TtTE4s#4Kzv~0QV@__R31)O2=O)+2oo6qt3K=NWJ4)6Tz_jJ}y%w|^
zgeX#^M9fTLsWn<2vTI3tr17EL&rcoIK3*g_WDb(&N)_h=yx%0=sJ?z7MT|ockv0FT
z#H7xyXmE)1JvD>a`o9aMe@ElWJAw(b>HNOmv)YhS&)5PGSucL}U2mU_8Q4=kx(ni(
z`_<fa7R#L+jh&~`H(JZ@pIqH}^ay1i@*MA!I9}R~XB{nerR;s8hU{im7BdSgD>~x6
z@*UN5iRd3co}>n8@)893`y&p)L<%O^1wGSt6b~KWGY<p`+5I%}yp3!&w>OFh3muc(
z#t*xV?YTVm&{0{4+hUEs%(<;Dx7w2tpFe+Q<mbPEh)YR{ssPzST%2B~*f2mj2X-qK
z7FOIQHOG&sDVnjdF~(pi=J<@4bIqmY<uXc2$iTqB)}=l8nO|DMz~N7If7kom{rr#}
z$>i?4jQkIw#;kre7p_mZ>W>iX`+-?fO7cQD{h4U+eEt(`2LA}OSq^UP4b654rON$G
z(saDE95gRek4`tE>g?*utgTJ_eQZG*E*JQ~Vah)@o3>F;6+@dvQ1GT=3|$)_Qc_x4
z{7^GB4UMdt%*{wCMnw8Rm=vSG5{t}uvC&YrA~6Aj7}eF)RVlw2`R}zg>nH|s8V?T-
z##eRP7`Y)b(JhkG-PdFc9U1fpgDM&Vd1<*}q&l1FPhKajf`!9ZdkKNvO&6mysu&+w
zzz09J-|lX4q`#!#c`#KUX~+%SbIEycQ9hM0<9?=g!BCNb5S_Ru`2&%^x=9Y0ammRM
z7CkX$*H`~)U$4gW5;k)v=a9kA9iBIMSEozFa&mI>lGkU%^={h{_bs|jkGCdS&m2R|
z7!#D^KYr9XkjLIKO-wGt)8t`DkA3YeVVxXWBZn?jMN=&h&CN$0c<N2^#j`U^KiY3w
zKbyvnnlFjq7i&tg@!U{sFP2o1_EKvA#wp01BsXt9bM*h<FOw<d=Jo*Uh7expqj#+9
zg()h5c-f>?8sS+Vt!|ntE0bXO53JsnVU+rG=#p}=b~}nnoTja<&FS^)g2_{p;^Pa5
zRl2AOCzB>U!44e~zl`biMUz2lXlU$imb5HFa8uFEt-AkY-(5_Jg$x<ezQ4dHukOB*
zpp&7-w!6E~p**fhj#Z^kSZ7EC|FsN}6|8@?JtYVwo#k_Jtnd;aI6WDj;3~4xL6gk<
zzN}xWyPo#wWA)m5@0dKNA8gIm5F6FIw7svH4P4z@V#6aYIrLBJI1Q0uI`x(qu@$_q
zW9Q7!$j{I&aBZGtu|wd6pobCP>i)oGKtfM%)SRb7%N&o~o~}{+$Za%O?`n4l{_Z6n
zF)kBkT3VV~zLwI{rzO?=t-J(qtwnGuuP!|do4u*`_Vz>~0}2Z6^{0x4Wn?f~2;nF%
zzcT#Ya_izFr!)meNofI^7-@LiosZdh4EX-&0f^({W6zKS)?g`)1R9n^L1}ezOmwtH
zM6I5I#aqLe7(QyYaLnx|_Ll@5^S$rxe*5;VHHqIU4i<fufn1)6l@*&9%mOWr(eFxM
znd6myh-h$fbB7kj1dCcuOieA0oA`Cjw*|S@&#s}z#m5IE+|yYc$=6gGXX<Z((l<3_
zWK~Uh>%7$6Ha=c6YiUY_9m^oz4%@|fzBORKsB5aUrl#lb?}q!Hht?Jk6d%@6a?el2
zF{$b3U8rG@3?v2=`u;1udiQj9Ym&by)XB}w&3!3aXt3P!apTqbCdsBVhdS%Kh2`FN
zamqOf!Asy2yp4_tRW1tE${bATV3d35oaHWdIyG$}&|%tFZn;+J{jhbhR1%uX(=@TR
z^P^2tY6#3{F*p6KDJyG>W0D=LuzGs9Gk2>pDT_5#(vQK}*_knTen9eC&feZWx&=#R
zShvBA3#6?a11qVhxB5k_b3P~Z&=)L4<*S;}(b2zsQTe3g?JZ_T)txBM&NHyna;+Ll
zM6VnyW0tz2S7{wT^j)pH$?sp}C3c*}GvgLCmh*onxU$GPI458;log`tpmR(kXiFZi
zoTI>Hr~HcV46KTBV>Xr>+gsm0xw)|n4#iJIbYYU`=$x@7vyN3)KOakZxZM5o6YE*(
z(H$<X=qITn32L4rT|GTv_EVMN%PT8o`p4ft^1Orfy<um!N%MWG=A{YqyIz-bv2487
zOxZ9OPyah)xJkm!%ysU2S$Z_vU6GW}+k<iC7)eT55kjm_7!|9Kt?K?We%C%SNT!gG
zkma93b0cS&E-o%Cim?oWzGl>+hPUnq(qVktK|Cai6Ze+Tv$T{)r>75p7fqOniQd!+
zXpD@UTn<)^=Ur8q#7v7{dT?;?n&B0ckdak3pWxZq+4G?+`OdyRWjno&_I4#--)7Zx
z%lG%AlylniHFHZXzf*i3Bkh<QAEzwPDd~O#2zd6zzSqg&VdtNppZ1`=w0CvobZ^3T
zv7P%`fKyLrSzT5pt*c8FETT|fRZ$_EtD5>mW41gu+~dpyCjrmMlCO}Bvy(Zr&83Vg
zTaH;bvP&dH_jWK8G|uUG%T>tRx5#(z^=`pnAt58n8s<&vSu*Q<OB$#9_EU9JllWM%
zQDoig)pq5_-2Je*7onU)d_JgS&QFwCB#OS_cARb0TM{If&xHKx>EDK(Qu8i6;ZJ9I
zxw*M_#|rg=NN+2Qxc^KQebd);W72$gzRh~Ju}*cIjKBERN8G?B<q+7Nvv7mYL(t#J
zGrJ25uT_>RBHP~GeOl_iXMTA!Zt~(@!vnU6_B{3MN*c9iP@yhYDnI0tkWuua)l+kL
z`1r2AF`Hb7y1KfFW*<@Lj<!wxU0qnTLXMrKW*xe=d_U29;c3kvF});cf48f$y!_W>
z<j=0IuB}zNJ_Rfegn4M2Q$G1l-^!Ym6%M7SXli?SPiLnoEL35ne^phLYRj8X4;*$k
z3QEfLwH+oVCo{cH{*KP-a3lzW)IyFYpPH`z5)DaA+*4&YZrh~5LS}Y(x<|!piirG~
zV+Kt?@G4PWUcM^E{0SNs<Mpuv+pAZH%{3-1zPr1-ymlV<G#+puKlJkQ@DRTnwN-LS
zY3_ty|L^>$Ft*kuU|>~NYhf$&&cgCCrXAN%J{}&POMS~My3@{VlSm6EFE7dCkKCjB
zYOj};mxFDFzu5fl;bLQJ{daMqvfm^~pOFb!3lH=hG&|z@;+u&y*vU<My%3K7Y#@}n
z)8KKys+ua&<+evFfPq6KC&cBD78mE=6MJji!><XG@xcQM=-pqBXzty+2hx8Z+r>q<
zIXn=OkZ^RCk#%bNW<woFhTr~v&b}Hnzdu#17gU_?8^P0jif+*zHI(1;zW4d*<-vgS
z<``FX!Jw(Lt7{juPBViQMr|30{xlQBo6urQZrfJTOjkQ}MAHhv;tdUv1_T7y*J$2J
zNlDr57u~ToLex7iVV9SeM_r}<wdnTOk&XSyMjp30FJKw2B{r&vj|n%_RWs*XP^I$~
zj|meR+S{n8=M6N3$pIKR+6JGs*vN%F_F1$zo)w+Ya3ZLwsfB&cT~dwh#Njx~M=aKw
zwTZIZjZIAjP1lF(n&cD|H2*F@Bqtdu#mbLUj=zGKgi!eGh|AZ3jt&fbO70O4pG7$8
z&<4Y8vRE~!3&5I$gv99V$8o2_MrLe$DO+3H)YpDxx`2Q@bvtKTI2@*{<$EBN-Skxb
z{UbMY;IH%d9Sx)X21L9lzNXL}lcj9n-XXJz@>|y^QuKs=6CHnBabx5I48w^QzZPTe
zLAvYtwY9ua!86#oZ^Og$kBoz`=4a|&yNdjqn3&M*>}wf|7#5hSb}(?DRmssv+LE?E
z+3SJqzNTGuW>&2*xrFZzTWw<_CRAiR7z{eWzt;z6-cLR~P_Y}(x*2LlLQQS+U%rlJ
zrr-6IQ^|j_d|X^b{SO4!Y`%a0-Z2UBzeaPIlePLRjCF>_tBt*C0PlB`_;JL_YLk&{
z2M6)BJ`K{DKYu>b>rT_TI*~+fAoIrn6gI-)3lSejEiLkz+iJx6RkqKzSqfw_TW|SY
zs&5LkGNP%mkt?aH79WU&%b5>lCiTro-_y|7k60Z@|Fk9gyC+5-bqr#A(|{}31EPFv
zDvyWnRo1b`Sv}9tinRF1RCnIk*yu8)$Iiti@9ti!9?L3(s+_M}jbBG?8{PNXPtg%;
zf9{XNtwc^;6+}cws|bEvUR*SPSFC*C-~f>_bdU>Cwl4S=@1wKffIvJX3pR)SvnF&Q
z_@gzICLo}mtIIjo`<r6$6idu~*MGEL=s7wDMuA7&i|5ZrJUQn+Kh=jpk;>g}4@r_x
zLRxK=A1;K=ro7}>pQ;^5;Ybnlaw}RT=*JKyl?IX*h(pZjNTZf6mztTGxjVj>c6fLw
zQj_q|mQ_H2ytueHVYcDT4g;#qH}-rUqK4Y%<iO5&0M7;BUrL=^Oiaww!Xk)*OJ9oh
z-TKUHYP`8I3Wz1Q`)ujLT4eV9lsA9Hm&dL-;rQVd5&?FS%T!rMhFofOb+xrNQ@~?~
z_a8ni?yr1L<hLT49(9DIkh|$pceMNNy!2URWY3b#@4ws~pV3XfatT^2?(D>>e0mVj
zv-H2(aCQ!;sCb>@^!$(1{5&Ec2%`{mU)&Fm5RkMT+W7s3u>Y5xrDX`Tenv5|#x@=r
z0}*eDTL8{SJ!ML}y`JbXhMGND)UtTu?c-AhUA{Wf%$Y={wWeC3H8(wL1!&<pr_ZHS
z-zz!YjfGF$p>1}E`V{$rfq|az8+Rv)Z-=G9rz^^&QJ)?S#Cky=Z`j~Q2%yWn0XLZd
z8`ocoagaR&r-N7N(W8ZGHyWxZkKj;85&ze{P0w#%f#rA^|9C5nKEJ&D`L$^*Z0AH5
zlhlrHB<Ka&Mf3btF+));uUGr6N53ZYj~krVt6Q|sv-_*DjXWAXI5^<)ycd^^$5X>*
zbGyGyTwMI;hqno`k^~g~#!a5<<adioOG$8u83eqzrHH;S09I2{RyJ>-qSNQqMNC!N
z1R>~aLfbn!Tw^r)hEDSm@zOfV;csABD;1cB6l`rdUJRr~2jLKx8<`MM3<?<~J<O&T
za@|<LyPUEsdG=a-1iORxZFKYsx}?)ccu7ggq-?j4<;EQZ0|Ud_aBgh>_*|pM4SWjD
z)+Vo$iDIF!BtUkscSTI*GG%d^+z5m>6q_)Cc65x7>#W{x2_`|kI_SL>r~K%2-9Q1U
zR{K+zX8ezUqhi9)VofI+^~!z&h+v}0OK5Rv$+g*PuGz=Q*}3iV>;Q)9%livO52Io=
z@<+axDW-3AM<)RqWT50WYy}3=2DJ*?fq+_rYvZX;{)zKE5xt1%N?(FCpuqkUXtayp
zd0IOC(J)ZR$5CMLZJpaTO`4cT)^HWDU)IM1vx7>HA9ujI^S+!F`;jJ23s-M8)?_!z
zKSBEUEG=x;%qh6I2sB^(6;1810h<?MqZjbb1NDo#f8{*pVm)IH+hb#68+`Z}l4RQj
zAyu{!Br<*fUT~<QJy~F~dGF6C#y}iN!6l=sn>c&&XLWTclBc;9I81FuTy)&lmVMsn
zhDb>^8y;Yo>Te|be^}Ysd+j}LL{pIFS$_YJDD*N-x^5#PGP2BhN#RMF7&TDgrABO8
z+*fsUxsb?O*Dup8d`-329iyD{%VR{#B#MU2ex}y>bgN>3KtGR-gQNZIV0G`$r<dk%
zPR6yHf3?)xCH%1ow$P;&PBtDwWjIm9l>-Pl=F_K7n+~?}M{PfU`C<;wk_eul+uxad
z%?Jyk@3I^Ti#@meM%X<obve7IU$*=tyw+=7la{tg?(Ph~0aOGnitgdB`9b~h5|bX-
z_hqJS=&3sK4>`j$b5++<w(klHCmQ^-!hIL)xo~i{_PasI+uIu&P0TGx$GF={KxN&w
zCISHXn8ET<-8aXa-tNl87#bRyC^f@?$9Jv20=ygyuy4Ann(BuKMf>NnG#IISqY!|G
zkq($bQB^f&HXW$D^S^Uf@53R*x3RH`09^rl)+RbrC_6fGH(#CGiTPgE_TwaFu~phn
zl9e={bHD}JxD9Ll8ym$cyg&BxtDT;nnnKM^RNCBt)=$t+PJZJ?5V6E5B3mK49m=wf
zO_o9luBKgV7!EjSbD5Z#9Iwn}UE^?T^4)fp0RgN{e0;n}Y}!Vop2py=yBJJCLKJre
zV(nPkkgJg|r>u<Uwlf=zg-^jKA(193V#~Dr=a2d5*JrQ~YE<!SWHL#hU3S#!^RWua
zYiMesl!*$T^vPFhduQG*n`4C2H7|P_cA5=JKGSj};92#jw81*;rC(p>_H%a8eaZQ8
z`eu77<kzoXA|;e~AyksSV$GNPk8A7d${=XE_#=rQ3ZH-aBuN}21h}xo`Pyxi)MQX?
z-xf*9<FZd)5CNRw=O-cOomp|iMt9PK)d59oYqnKYdj%v@t?MR*@96^0<srn>s3lc~
zse~NqP}fhD=@Y!;I8z${fF#M`l(>`;ftX)h3<Qi1XR6aCDy)cO;0(sdh*nVO0T6n?
zEFGf-IzuHUl0T9K@qNw@%hn1z38`g}eEj^VXJ)x`X8{UN&d@MLwLuKk=ewh9z-H4f
zh)+)^uF`j?WWTF2tn}mwCvlvtI=S!lzc({YUgL$X7F;+9QjAj2Zb<3qqRcu%%@*22
z+>f`Cq_aWg;N#=l9eygw#K%Xr({#cx>$zEkeH5oBk^{-lpFd&F3m<P!hkX)yxiO=u
zPL6f=?%gP=`{?O@S9L?NmC4Dl^UO!`)D>Jczp&wH<dfs#;;syc(QfJ$-pyQs@*Xd_
z<$HBzwKdmr%j<Yc8g!Jl^pnf8*Z-@^sHo0HkAp!VkWJ!b4+WN2S8sE36X`&d#L$qg
zA7Vej!I<PXZ?0cbgZ2P&mu{IkmO>02E-fu>b%CXtXkvra1Ij{tM23fwh}#y@&(9B7
z;Jn}U#jRq)I&&v->JXWLjxb^<AKKIX?>u|wn<bkG>BVK5T3T8T=}`DUXBW06D*zWk
z_l7P8Lm3T-4Z%4V2rmjzQ~>~#H*P+R=<wDJM!aXDh`jH-D2IuSZGN;dTI+SfZQST?
zwmZni&W?+Ecl~MNk@ArgZPU{Rxoq8pA>Y0!d4m=0Ne%0=(&RZ>@ds2g8ylMyQg611
zUk%&r5rNUsgfN?j@-^=knzW=H>{mR0i`C9cz|O(JeDe4AZ6F+Xh=_=Sv)Is8x^0_G
z#28`)Ue2aGN#qRxKpM8aF{*5C&b)VYG@5UGWOKu!g)M@ao0}U&x0eC_vj_=&B&VdT
z_?=SqYW>$8a|?^?;e(FV1Kiji{@%wQkAZUC`N(7Pz>`*Y1erk)k!9-O5IsL{T4+#1
z^t<6r4>V_|rEbC?1q|Q~>+tRKXRGN<<am3~e_Drz;<s(bXl19`6XCqR6?~n5-8j+g
z>@2E@dcwW0eKByDs%(P>7|l=;_r(U94HXP4DNj!kxDP^o%o0lbg3@AW&_Pg8S+m(_
z;c_wx(KPbR%*+$T|7jmmqa|K+E$zKkV`J&>@BjQXUE=v-XZSM6GoLdu`~g&z|90`r
z-b7{qhKE0CWwBJ_NPuA)48JL{@!#?E3^Icir9nbty3NdtZsNU%1>%sETA}}c|B=y2
z`qIHAyXsvxd94Q-foql-i3eq{_2n6829qE$1C=9PK|I?%ISJD*QgCwOg=Zp+R|<}c
zBLNK%<Y?}Qr{ePmXYgY^UQGXiQ!lW#R#;9!A=!at&=eDa*xK6Sb=%Udd^yMP=I=}!
zAXSnZH!KF#KwIrel<*OOjm8Cv3NA=$_Bu~rLWza}ubR%ge}aWB?LmMOYBvApPiSka
z6oRI0L3>|C5$*woQ!ogeNnA;`L1g}Xa40>@ZF{P1c=!gYTjf0d7?+-2@{t6Da{%2?
z*Ek>xrhD%{3VLj|y}B9(TffYRfavzGDmxtldJ%Gi8b`tJCxX_*NdT$L0BnHNfMe{j
zax;i5>f6dI`?+R%yRkxPGc%^?XN%U0NH||;J=AXBZ%3$)K(vmHQDiH|c9*nVMX+mr
zp*p0#bLY-P&CB#jnftGuM!G=>7%J4`ukh9hN<r5O$znS_J2Tr`>_W}q5J<PYdzU>f
zqwMP|foiz$N<q<1+~#l=Ff%kXB#6n$=OOgPREq~y5_KD-q@;=WEkcbis)I?yJP(m5
zB7Sdx2}e=(i#jeMBZ<sqZ4eE$z@V3XsrgR=J|cO2$v-_hKhKLFt%~Rav9J5<vjP$d
ziZ40{^-!}?uM@`<(Km2F+{r01Md2Rw=7og-fO6*NhwGl<Qug+oFon^Qo^-q26i#Lg
zCaI|N5VA$fu%R(FHr8$N6_@yTsM&OU*3r@7yfMOFUC=s&X){(xE%N5C{f8af5p=cC
z$VmKIpA(}e$pVj7<E3CoRznhJX2!5Oa$u;lw4x%YrKLr$x!@5JfdE=L4?VaGgl*U6
zyG%@IHIBc{8`kJl;=XDkG*$3vLT>pN3yX^0=Hw)R`NmG{sZI;j8Z|>ak2bpGY5(xv
zYi@2{gGqQciJz%v{hzFziZVP?w9srT$c<5Xd2FfVM<DY8P!C8?zcnqtYAu5TdHh!W
zg@<WUjJ)S30!i#r)V{vHx)m=70VccD1JP!HUToPgL8n3xAccrm(ptBSI6zZTMIbUj
zQ*qy}8h5GJ&euwoRK~{%OS1kC-PF!564bQ~@~mW%EX{6OqL@&ncjO4EC6>>2zU?sf
z${74&gF46s^w3~uDZ*pA)F1aH-1EHCF+Xq327g@oKanj_T3Sw6m<C@(8-5l1vlN7r
zfK75G!pTX%6)?C){`*g~ubl);5BD*jQ(;4A0>xI?>zMQE>f&YNUN>zbsE^Y}^RW7e
zR4gg(k4s^29B#JBD?TYHys(fHiu-VLJa${e$;pZ8Z9h6A2{P`(hfpAb+EX_M`ufZp
zh*-l8(B`cR*BY?_SIfxC7NkaqdL7$mo8YVg%Fll6-rI(@R)>TocnavL{FfK#2em#I
z52lZJ*^Bh6_zbeJiHKfjjcam|;}skQL)V9o#!82aOtNxuspK|#8cK-8bVtno)*t2X
z4JLtZjsu^uAD8DrG6}nGXr%^7vPUeYgb34cdE)w~rqYA#tItJ$2zni=C0B1|QG(%v
z67~;7baZswJv_>c42g)|Wqd?^eF`ygtZg=;&M*c({vgky0;Q7!g4t~B9~gMLDl1Dz
zM@ZO|i-39$Eh%}KbAn_#1<TnPC~5U(_KjeY%j4;n-v$Osjzl7|cwuj0e|(S<B&%~s
zfq?m6v{1Q!aIgn_A_KbZw#eus;01tQjaRRl0YHskycVz}AoGWAWAkqs#z>jpwQu#N
z);%x<pupY1d`KN9q7x=DGc&WNObY6FPE}dwU}slw^bdT$6cN|HEQ__S&d&L@p={R=
zWv-iJsIA|x9s~u!4ClI`56=AlU3Im+&=Dp=STgBvMzu9lSJ8hs7ZVeM!pP?*I|FX<
zb~&FvcQQ}cm1Syi&~}cDk-#lMH=UTCw);0docnYSX4w*4!hXDnjG)65+$>?2HMP`!
z$slaPug=L9kHE%aymKdH+g!jC2A1<m-%X&;WCUagiF9HeopG9LhMPA-0JWk7Ui)$4
zR>|(`A;nuvw{K^U+0oO}-*?>@!Cts9QBy-CD0jKtrxE8%ilRl+>YSXU2HIJ?w*xa3
z#olyGe6Z>a``zgGPWLRlug+FQjy}LW$fQg7OmOqzgz52~20u2kiGaEQ5%lUH{kqgm
z6&{*S!kY>xb>ZvL^ei?MCiy#4C$fUidlLZnx9{JF*QYKoy<s4gYmbG(0fFnH;fh{f
z0&bJ$LQRQYY@GXXpyJ;U5)wks82bqIm2}?%yUt~uEdKjSsBh{l$T@+W`ju}5U;^~>
zMRb|-S#%S;TJ5KA=Z%`|)4iFXEDw^1mX*i7W(saYB`uDdc9xEL<mBXWu<q+K{orRY
zv9q(=Q%<i@aUyzqdpn`>a=Wu_l4~0p-T|yiZX~U!sOU`-_fl%{{RdONu)>}>{_W+a
z$u%=b%r9PgJ2=pgkU%}3o}d2*ovp&?5W5G)D3J2#{%uZ*$lk;C;YTlCuujVhabV-O
z0$5i<9r^au1^Z!rwn=mnRBCt{g-r+QP$rIq2s%->DAcxxZc7r8<#MjR`Xj01>mEOW
ztn%Z>y)cu$0b~jX^{GIGJ%Sknn}89P2TI_MT#<H#Hs#|mGpc=9qH?!w{igKa<^8Bp
z!E*a{P~NDmwqj&=AaiGF^fEMf==ivPS7*7iC-rr8nJ{Fjgq;}c-|WNyvH}LQdv<Ai
zm(VWIj0%N5p(z20ZU;97CEbE!IOf44uU=YJ)%BiTv()#Wr?7|!%`Z$5StPjDGEbfm
z02}zesWdDAdS@_L+KZrkfX_C_E+PF4jMPt`Xki2q0E0!LbeYW3|6&obJ+eS9KtUjm
z$f9wG!bniY%Fzf%HM<Bc`C)-#<E99J^VEQb1l=WgNRWfz_rlpgbJ$BL^<Zr7$G`wF
zAiE5ksjQ%0SWQH!<8P5d$l{gqd|?A91XPNNjSUI(9-vkjxP3X;D+gyJcp(7DRwQZU
z)oWj^;5p7UM_-)m$Z~&_%~V@kCSUsdHwH9g^W|^xsP_YK>B;Oj(34N$yN2NF4CsM-
zYujRgotmRzBM`>G5S!~7pv^*-3F=my5(~<><Fy;(d^bKl!$ywheYw|z!sF)V<{VsK
zG{~QE6Ln{Bs$!}PkNS#2fB|GRsMdMtaXrw2CLNQL^9Obp1~X+l!Pn9?FxV7N`E~Sv
zU{j2t#5nyn3G!`Ai{wMk!@S8bJ#}^UPAK8$4xe}I&h}Scyu^5|rmwGzYBZh~ADXO_
zS%I!wHt5;Pmoy@tQS-kbfJKOExxS(Wblna97i`G@fMnUY@AZowoZ6$wtHb1x0!Hq6
zxE25&c?Os|3im!WTb7Y?=5t0jIeySi`#SO%5iG-m(y{>eneH$5f_96#nDf!bGsAip
zTyW05_4V;t8ylF=(b3JXuZRC1Gygi|I!T90Ojr*EKD!R&8?kkb4y&WV02sY{cv$&X
zkSHSStNc*4z(y6e+6^dhxQq<A1SmTVy59SS`49A_>}+hj?w_U9wQ@W@W@q0nEGl9m
z3-25D#lgnT0>lmO(!<kB&vnBl*kUk-Y7&D)LGc8f^`e1FA&eyO@X#f4SAwf!a&j^Y
zYn%mLjZ_8+;%c9GF__R`Gl9ypyWD#NHpJ)L+$CV)B7{e{Okl}(WJm|~Q8u)<x5Fdh
z{*RM5>_77%is=pn`=1gbBK!OME`OQMyd?mpaQgaowVAC0J%cw|8noic2LDf_Q$+|1
zC-VYqa1t;RMgwfo?u6djHWa*o=^vDh+kuO~QM?g)13?tSN^loJ2VY0_|Nnza$zi7f
VMk(EHLWlw(9?7f970Z|g{y(4W6f6J$

literal 0
HcmV?d00001

diff --git a/projects/Server/server/resource.h b/projects/Server/server/resource.h
new file mode 100644
index 0000000..2466d6d
--- /dev/null
+++ b/projects/Server/server/resource.h
@@ -0,0 +1,19 @@
+//{{NO_DEPENDENCIES}}
+// ���������� ����, ��������� � Microsoft Visual C++.
+// ������������ server.rc
+//
+#define IDI_ICON1                       101
+#define IDI_ICON2                       102
+#define IDI_ICON3                       103
+#define IDB_PNG1                        104
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        105
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif
diff --git a/projects/Server/server/server.rc b/projects/Server/server/server.rc
new file mode 100644
index 0000000..c74f85e
--- /dev/null
+++ b/projects/Server/server/server.rc
@@ -0,0 +1,72 @@
+// Microsoft Visual C++ generated resource script.
+//
+#pragma code_page(65001)
+
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "winres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Русский (Россия) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""winres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON3               ICON                    "icon3.ico"
+
+#endif    // Русский (Россия) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/projects/Server/server/server.vcxproj b/projects/Server/server/server.vcxproj
new file mode 100644
index 0000000..8a0f5ff
--- /dev/null
+++ b/projects/Server/server/server.vcxproj
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <ProjectGuid>{1D412171-922E-430B-B11C-38E29A98EC62}</ProjectGuid>
+    <RootNamespace>server</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <TargetName>Visualizer_2</TargetName>
+    <IncludePath>C:\local\boost_1_74_0;$(IncludePath)</IncludePath>
+    <LibraryPath>C:\local\boost_1_74_0\lib64-msvc-14.2;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetName>Visualizer_2</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>false</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
+      <WholeProgramOptimization>false</WholeProgramOptimization>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="server.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="icon3.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\Server\checkUniq.cpp" />
+    <ClCompile Include="..\..\..\src\Server\server.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/Server/server/server.vcxproj.filters b/projects/Server/server/server.vcxproj.filters
new file mode 100644
index 0000000..c274e3c
--- /dev/null
+++ b/projects/Server/server/server.vcxproj.filters
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Исходные файлы">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Файлы заголовков">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Файлы ресурсов">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="resource.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="server.rc">
+      <Filter>Файлы ресурсов</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="icon3.ico">
+      <Filter>Файлы ресурсов</Filter>
+    </Image>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\src\Server\checkUniq.cpp">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\src\Server\server.cpp">
+      <Filter>Исходные файлы</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
\ No newline at end of file

From d0488339d0a3781ff63b943508b93702cd951f97 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Thu, 13 Mar 2025 12:17:20 +0300
Subject: [PATCH 33/44] added dvm as submodule

---
 .gitmodules  | 3 +++
 projects/dvm | 1 +
 2 files changed, 4 insertions(+)
 create mode 100644 .gitmodules
 create mode 160000 projects/dvm

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..c698cc3
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "projects/dvm"]
+	path = projects/dvm
+	url = https://dvmguest:dvmguest@dvm.keldysh.ru/dvm-system/dvm
diff --git a/projects/dvm b/projects/dvm
new file mode 160000
index 0000000..c00e381
--- /dev/null
+++ b/projects/dvm
@@ -0,0 +1 @@
+Subproject commit c00e3818124823325d022b963db9e0437a5427f6

From ca05420451fe5f98d32c0039a9d3fec7c2b566f1 Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Thu, 13 Mar 2025 12:48:07 +0300
Subject: [PATCH 34/44] moved dvm to submodule

---
 CMakeLists.txt                                |    20 +-
 projects/Fdvm/CMakeLists.txt                  |     7 +-
 projects/Parser/CMakeLists.txt                |     8 +-
 projects/SageLib/CMakeLists.txt               |     4 +-
 projects/SageNewSrc/CMakeLists.txt            |     4 +-
 projects/SageOldSrc/CMakeLists.txt            |     4 +-
 projects/dvm_svn/fdvm/CMakeLists.txt          |     1 -
 projects/dvm_svn/fdvm/trunk/CMakeLists.txt    |     7 -
 .../fdvm/trunk/InlineExpansion/CMakeLists.txt |    23 -
 .../fdvm/trunk/InlineExpansion/dvm_tag.h      |    85 -
 .../fdvm/trunk/InlineExpansion/hlp.cpp        |   622 -
 .../fdvm/trunk/InlineExpansion/inl_exp.cpp    |  1750 --
 .../fdvm/trunk/InlineExpansion/inline.h       |   643 -
 .../fdvm/trunk/InlineExpansion/inliner.cpp    |  2993 --
 .../fdvm/trunk/InlineExpansion/intrinsic.h    |   196 -
 .../fdvm/trunk/InlineExpansion/makefile.uni   |    46 -
 .../fdvm/trunk/InlineExpansion/makefile.win   |    61 -
 projects/dvm_svn/fdvm/trunk/Makefile          |    17 -
 .../dvm_svn/fdvm/trunk/Sage/CMakeLists.txt    |     4 -
 projects/dvm_svn/fdvm/trunk/Sage/LICENSE      |    67 -
 projects/dvm_svn/fdvm/trunk/Sage/Makefile     |   106 -
 .../fdvm/trunk/Sage/Sage++/CMakeLists.txt     |    14 -
 .../dvm_svn/fdvm/trunk/Sage/Sage++/Makefile   |    97 -
 .../fdvm/trunk/Sage/Sage++/libSage++.cpp      |  9158 -------
 .../fdvm/trunk/Sage/Sage++/makefile.uni       |    40 -
 .../fdvm/trunk/Sage/Sage++/makefile.win       |    49 -
 projects/dvm_svn/fdvm/trunk/Sage/h/Makefile   |    20 -
 projects/dvm_svn/fdvm/trunk/Sage/h/bif.h      |   453 -
 .../dvm_svn/fdvm/trunk/Sage/h/compatible.h    |    77 -
 projects/dvm_svn/fdvm/trunk/Sage/h/db.h       |   187 -
 projects/dvm_svn/fdvm/trunk/Sage/h/db.new.h   |   190 -
 projects/dvm_svn/fdvm/trunk/Sage/h/defines.h  |    56 -
 projects/dvm_svn/fdvm/trunk/Sage/h/defs.h     |   131 -
 projects/dvm_svn/fdvm/trunk/Sage/h/dep.h      |    39 -
 projects/dvm_svn/fdvm/trunk/Sage/h/dep_str.h  |   173 -
 .../dvm_svn/fdvm/trunk/Sage/h/dep_struct.h    |   147 -
 projects/dvm_svn/fdvm/trunk/Sage/h/elist.h    |    79 -
 projects/dvm_svn/fdvm/trunk/Sage/h/f90.h      |    27 -
 projects/dvm_svn/fdvm/trunk/Sage/h/fixcray.h  |    10 -
 projects/dvm_svn/fdvm/trunk/Sage/h/fm.h       |    10 -
 projects/dvm_svn/fdvm/trunk/Sage/h/head       |     2 -
 .../dvm_svn/fdvm/trunk/Sage/h/leak_detector.h |    18 -
 projects/dvm_svn/fdvm/trunk/Sage/h/list.h     |    34 -
 projects/dvm_svn/fdvm/trunk/Sage/h/ll.h       |   163 -
 projects/dvm_svn/fdvm/trunk/Sage/h/prop.h     |    24 -
 projects/dvm_svn/fdvm/trunk/Sage/h/sage.h     |    21 -
 projects/dvm_svn/fdvm/trunk/Sage/h/sagearch.h |     2 -
 projects/dvm_svn/fdvm/trunk/Sage/h/sageroot.h |     1 -
 projects/dvm_svn/fdvm/trunk/Sage/h/sets.h     |    86 -
 projects/dvm_svn/fdvm/trunk/Sage/h/symb.h     |   225 -
 projects/dvm_svn/fdvm/trunk/Sage/h/symblob.h  |    17 -
 projects/dvm_svn/fdvm/trunk/Sage/h/tag        |   628 -
 projects/dvm_svn/fdvm/trunk/Sage/h/tag.doc    |   274 -
 projects/dvm_svn/fdvm/trunk/Sage/h/tag.h      |   630 -
 projects/dvm_svn/fdvm/trunk/Sage/h/tag_make   |     7 -
 projects/dvm_svn/fdvm/trunk/Sage/h/version.h  |     2 -
 projects/dvm_svn/fdvm/trunk/Sage/h/vextern.h  |   167 -
 projects/dvm_svn/fdvm/trunk/Sage/h/vparse.h   |   126 -
 projects/dvm_svn/fdvm/trunk/Sage/h/vpc.h      |   182 -
 projects/dvm_svn/fdvm/trunk/Sage/h/window.h   |    71 -
 .../fdvm/trunk/Sage/lib/CMakeLists.txt        |     6 -
 projects/dvm_svn/fdvm/trunk/Sage/lib/Makefile |    55 -
 .../fdvm/trunk/Sage/lib/include/attributes.h  |    95 -
 .../fdvm/trunk/Sage/lib/include/baseClasses.h |   124 -
 .../fdvm/trunk/Sage/lib/include/bif_node.def  |   594 -
 .../fdvm/trunk/Sage/lib/include/dependence.h  |   117 -
 .../fdvm/trunk/Sage/lib/include/ext_ann.h     |    56 -
 .../fdvm/trunk/Sage/lib/include/ext_high.h    |    29 -
 .../fdvm/trunk/Sage/lib/include/ext_lib.h     |    24 -
 .../fdvm/trunk/Sage/lib/include/ext_low.h     |   269 -
 .../fdvm/trunk/Sage/lib/include/ext_mid.h     |    64 -
 .../fdvm/trunk/Sage/lib/include/extcxx_low.h  |   272 -
 .../fdvm/trunk/Sage/lib/include/libSage++.h   |  9921 -------
 .../fdvm/trunk/Sage/lib/include/macro.h       |   434 -
 .../trunk/Sage/lib/include/sage++callgraph.h  |   123 -
 .../Sage/lib/include/sage++classhierarchy.h   |   216 -
 .../trunk/Sage/lib/include/sage++extern.h     |    34 -
 .../fdvm/trunk/Sage/lib/include/sage++proto.h |    40 -
 .../fdvm/trunk/Sage/lib/include/sage++user.h  |    45 -
 .../fdvm/trunk/Sage/lib/include/symb.def      |    30 -
 .../fdvm/trunk/Sage/lib/include/type.def      |    69 -
 .../fdvm/trunk/Sage/lib/include/unparse.def   |  1060 -
 .../trunk/Sage/lib/include/unparseC++.def     |   833 -
 .../trunk/Sage/lib/include/unparseDVM.def     |   448 -
 .../dvm_svn/fdvm/trunk/Sage/lib/makefile.uni  |    35 -
 .../dvm_svn/fdvm/trunk/Sage/lib/makefile.win  |    48 -
 .../fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt |    16 -
 .../fdvm/trunk/Sage/lib/newsrc/Makefile       |    83 -
 .../fdvm/trunk/Sage/lib/newsrc/annotate.tab.c |  3145 ---
 .../fdvm/trunk/Sage/lib/newsrc/annotate.tab.h |    74 -
 .../fdvm/trunk/Sage/lib/newsrc/annotate.y     |  1988 --
 .../fdvm/trunk/Sage/lib/newsrc/comments.c     |   694 -
 .../fdvm/trunk/Sage/lib/newsrc/low_level.c    |  9147 -------
 .../fdvm/trunk/Sage/lib/newsrc/makefile.uni   |    40 -
 .../fdvm/trunk/Sage/lib/newsrc/makefile.win   |    54 -
 .../fdvm/trunk/Sage/lib/newsrc/toolsann.c     |  1043 -
 .../fdvm/trunk/Sage/lib/newsrc/unparse.c      |  3265 ---
 .../fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt |    18 -
 .../fdvm/trunk/Sage/lib/oldsrc/Makefile       |   123 -
 .../fdvm/trunk/Sage/lib/oldsrc/anal_ind.c     |  1031 -
 .../dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db.c   |  2308 --
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp.c       |  1956 --
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c  |    10 -
 .../fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c   |  1924 --
 .../fdvm/trunk/Sage/lib/oldsrc/dbutils.c      |   961 -
 .../fdvm/trunk/Sage/lib/oldsrc/garb_coll.c    |   229 -
 .../fdvm/trunk/Sage/lib/oldsrc/glob_anal.c    |   494 -
 .../fdvm/trunk/Sage/lib/oldsrc/ker_fun.c      |   433 -
 .../dvm_svn/fdvm/trunk/Sage/lib/oldsrc/list.c |   655 -
 .../fdvm/trunk/Sage/lib/oldsrc/make_nodes.c   |   641 -
 .../fdvm/trunk/Sage/lib/oldsrc/makefile.uni   |    83 -
 .../fdvm/trunk/Sage/lib/oldsrc/makefile.win   |    96 -
 .../fdvm/trunk/Sage/lib/oldsrc/mod_ref.c      |   540 -
 .../fdvm/trunk/Sage/lib/oldsrc/ndeps.c        |  1076 -
 .../fdvm/trunk/Sage/lib/oldsrc/readnodes.c    |  1124 -
 .../dvm_svn/fdvm/trunk/Sage/lib/oldsrc/sets.c |  1818 --
 .../fdvm/trunk/Sage/lib/oldsrc/setutils.c     |  2518 --
 .../fdvm/trunk/Sage/lib/oldsrc/symb_alg.c     |  1050 -
 .../fdvm/trunk/Sage/lib/oldsrc/writenodes.c   |  1018 -
 projects/dvm_svn/fdvm/trunk/Sage/makefile.uni |    35 -
 projects/dvm_svn/fdvm/trunk/Sage/makefile.win |    46 -
 .../CodeTransformer/CodeTransformer.vcxproj   |   123 -
 .../CodeTransformer.vcxproj.filters           |    74 -
 .../FDVM/FDVM.sln                             |    65 -
 .../FDVM/FDVM/FDVM.vcxproj                    |   131 -
 .../FDVM/FDVM/FDVM.vcxproj.filters            |    96 -
 .../FDVM/NEWsrc/NEWsrc.vcxproj                |    98 -
 .../FDVM/NEWsrc/NEWsrc.vcxproj.filters        |    25 -
 .../FDVM/OLDsrc/OLDsrc.vcxproj                |   114 -
 .../FDVM/OLDsrc/OLDsrc.vcxproj.filters        |    73 -
 .../FDVM/Parser/Parser.vcxproj                |   120 -
 .../FDVM/Parser/Parser.vcxproj.filters        |    72 -
 .../FDVM/SageLib++/SageLib++.vcxproj          |    97 -
 .../FDVM/SageLib++/SageLib++.vcxproj.filters  |    22 -
 .../FDVM/inlineExp/inlineExp.vcxproj          |   104 -
 .../FDVM/inlineExp/inlineExp.vcxproj.filters  |    33 -
 .../fdvm/trunk/acrossDebugging/across.cpp     |   494 -
 .../dvm_svn/fdvm/trunk/examples/gausf.fdv     |    60 -
 .../dvm_svn/fdvm/trunk/examples/gausgb.fdv    |    57 -
 .../dvm_svn/fdvm/trunk/examples/gaush.hpf     |    45 -
 .../dvm_svn/fdvm/trunk/examples/gauswh.fdv    |    53 -
 projects/dvm_svn/fdvm/trunk/examples/jac.fdv  |    47 -
 .../dvm_svn/fdvm/trunk/examples/jacas.fdv     |    62 -
 projects/dvm_svn/fdvm/trunk/examples/jach.hpf |    44 -
 .../dvm_svn/fdvm/trunk/examples/redbf.fdv     |    46 -
 .../dvm_svn/fdvm/trunk/examples/redbh.hpf     |    53 -
 projects/dvm_svn/fdvm/trunk/examples/sor.fdv  |    38 -
 .../dvm_svn/fdvm/trunk/examples/task2j.fdv    |   130 -
 .../dvm_svn/fdvm/trunk/examples/tasks.fdv     |   126 -
 .../dvm_svn/fdvm/trunk/examples/taskst.fdv    |   169 -
 .../dvm_svn/fdvm/trunk/fdvm/CMakeLists.txt    |    27 -
 projects/dvm_svn/fdvm/trunk/fdvm/Makefile     |   158 -
 projects/dvm_svn/fdvm/trunk/fdvm/acc.cpp      | 15256 -----------
 .../dvm_svn/fdvm/trunk/fdvm/acc_across.cpp    |  6318 -----
 .../fdvm/trunk/fdvm/acc_across_analyzer.cpp   |  2249 --
 .../dvm_svn/fdvm/trunk/fdvm/acc_analyzer.cpp  |  4325 ---
 projects/dvm_svn/fdvm/trunk/fdvm/acc_data.cpp |    47 -
 projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c.cpp  |  3584 ---
 .../fdvm/trunk/fdvm/acc_f2c_handlers.cpp      |   305 -
 .../fdvm/trunk/fdvm/acc_index_analyzer.cpp    |    58 -
 projects/dvm_svn/fdvm/trunk/fdvm/acc_rtc.cpp  |   390 -
 .../fdvm/trunk/fdvm/acc_unused_code.cpp       |    87 -
 .../dvm_svn/fdvm/trunk/fdvm/acc_utilities.cpp |  1038 -
 .../fdvm/trunk/fdvm/aks_analyzeLoops.cpp      |  2567 --
 .../fdvm/trunk/fdvm/aks_loopStructure.cpp     |   615 -
 .../dvm_svn/fdvm/trunk/fdvm/aks_structs.cpp   |   206 -
 projects/dvm_svn/fdvm/trunk/fdvm/calls.cpp    |  2589 --
 .../dvm_svn/fdvm/trunk/fdvm/checkpoint.cpp    |   552 -
 projects/dvm_svn/fdvm/trunk/fdvm/debug.cpp    |  1181 -
 projects/dvm_svn/fdvm/trunk/fdvm/dvm.cpp      | 14930 ----------
 projects/dvm_svn/fdvm/trunk/fdvm/funcall.cpp  |  4999 ----
 projects/dvm_svn/fdvm/trunk/fdvm/help.cpp     |  1070 -
 projects/dvm_svn/fdvm/trunk/fdvm/hpf.cpp      |  1698 --
 projects/dvm_svn/fdvm/trunk/fdvm/io.cpp       |  2905 --
 projects/dvm_svn/fdvm/trunk/fdvm/makefile.uni |   151 -
 projects/dvm_svn/fdvm/trunk/fdvm/makefile.win |   148 -
 projects/dvm_svn/fdvm/trunk/fdvm/omp.cpp      |   879 -
 projects/dvm_svn/fdvm/trunk/fdvm/ompdebug.cpp |  3557 ---
 projects/dvm_svn/fdvm/trunk/fdvm/parloop.cpp  |  2587 --
 projects/dvm_svn/fdvm/trunk/fdvm/stmt.cpp     |  1583 --
 .../fdvm/trunk/include/acc_across_analyzer.h  |   157 -
 .../dvm_svn/fdvm/trunk/include/acc_analyzer.h |  1211 -
 .../dvm_svn/fdvm/trunk/include/acc_data.h     |    76 -
 .../fdvm/trunk/include/aks_loopStructure.h    |   136 -
 .../dvm_svn/fdvm/trunk/include/aks_structs.h  |   207 -
 projects/dvm_svn/fdvm/trunk/include/calls.h   |    74 -
 projects/dvm_svn/fdvm/trunk/include/dvm.h     |  2386 --
 projects/dvm_svn/fdvm/trunk/include/dvm_tag.h |   160 -
 projects/dvm_svn/fdvm/trunk/include/extern.h  |    58 -
 projects/dvm_svn/fdvm/trunk/include/fdvm.h    |    74 -
 .../dvm_svn/fdvm/trunk/include/fdvm_version.h |     1 -
 projects/dvm_svn/fdvm/trunk/include/inc.h     |    11 -
 .../fdvm/trunk/include/leak_detector.h        |    18 -
 .../dvm_svn/fdvm/trunk/include/libSageOMP.h   |  2000 --
 projects/dvm_svn/fdvm/trunk/include/libdvm.h  |   341 -
 projects/dvm_svn/fdvm/trunk/include/libnum.h  |   341 -
 .../dvm_svn/fdvm/trunk/include/unparse.hpf    |  1127 -
 .../dvm_svn/fdvm/trunk/include/unparse1.hpf   |  1097 -
 projects/dvm_svn/fdvm/trunk/include/user.h    |    47 -
 projects/dvm_svn/fdvm/trunk/makefile.uni      |    46 -
 projects/dvm_svn/fdvm/trunk/makefile.win      |    69 -
 .../dvm_svn/fdvm/trunk/parser/CMakeLists.txt  |    33 -
 projects/dvm_svn/fdvm/trunk/parser/Makefile   |   196 -
 projects/dvm_svn/fdvm/trunk/parser/cftn.c     |   922 -
 projects/dvm_svn/fdvm/trunk/parser/errors.c   |   352 -
 projects/dvm_svn/fdvm/trunk/parser/facc.gram  |   145 -
 projects/dvm_svn/fdvm/trunk/parser/fdvm.gram  |  2257 --
 projects/dvm_svn/fdvm/trunk/parser/fomp.gram  |   644 -
 projects/dvm_svn/fdvm/trunk/parser/fspf.gram  |   214 -
 projects/dvm_svn/fdvm/trunk/parser/ftn.gram   |  4594 ----
 .../dvm_svn/fdvm/trunk/parser/gram1.tab.c     | 14474 ----------
 .../dvm_svn/fdvm/trunk/parser/gram1.tab.h     |   440 -
 projects/dvm_svn/fdvm/trunk/parser/gram1.y    |  8211 ------
 projects/dvm_svn/fdvm/trunk/parser/hash.c     |   286 -
 projects/dvm_svn/fdvm/trunk/parser/head       |     2 -
 projects/dvm_svn/fdvm/trunk/parser/init.c     |   281 -
 projects/dvm_svn/fdvm/trunk/parser/lexfdvm.c  |  3319 ---
 projects/dvm_svn/fdvm/trunk/parser/lists.c    |   108 -
 projects/dvm_svn/fdvm/trunk/parser/low_hpf.c  |  1006 -
 .../dvm_svn/fdvm/trunk/parser/makefile.uni    |    99 -
 .../dvm_svn/fdvm/trunk/parser/makefile.win    |   129 -
 projects/dvm_svn/fdvm/trunk/parser/misc.c     |   212 -
 projects/dvm_svn/fdvm/trunk/parser/stat.c     |  1449 -
 projects/dvm_svn/fdvm/trunk/parser/sym.c      |  2012 --
 projects/dvm_svn/fdvm/trunk/parser/tag        |   628 -
 projects/dvm_svn/fdvm/trunk/parser/tag.h      |   630 -
 projects/dvm_svn/fdvm/trunk/parser/tokdefs.h  |   357 -
 projects/dvm_svn/fdvm/trunk/parser/tokens     |   357 -
 projects/dvm_svn/fdvm/trunk/parser/types.c    |   778 -
 .../dvm_svn/fdvm/trunk/parser/unparse_hpf.c   |  4895 ----
 .../fdvm/trunk/sageExample/SwapFors.cpp       |  1565 --
 .../fdvm/trunk/sageExample/makefile.uni       |    42 -
 .../fdvm/trunk/sageExample/makefile.win       |    59 -
 projects/dvm_svn/tools/Zlib/CMakeLists.txt    |     1 -
 projects/dvm_svn/tools/Zlib/include/deflate.h |   318 -
 .../dvm_svn/tools/Zlib/include/infblock.h     |    39 -
 .../dvm_svn/tools/Zlib/include/infcodes.h     |    27 -
 projects/dvm_svn/tools/Zlib/include/inffast.h |    17 -
 .../dvm_svn/tools/Zlib/include/inffixed.h     |   151 -
 .../dvm_svn/tools/Zlib/include/inftrees.h     |    58 -
 projects/dvm_svn/tools/Zlib/include/infutil.h |    98 -
 projects/dvm_svn/tools/Zlib/include/trees.h   |   128 -
 projects/dvm_svn/tools/Zlib/include/zconf.h   |   283 -
 projects/dvm_svn/tools/Zlib/include/zlib.h    |   913 -
 projects/dvm_svn/tools/Zlib/include/zutil.h   |   227 -
 projects/dvm_svn/tools/Zlib/makefile.uni      |    72 -
 projects/dvm_svn/tools/Zlib/makefile.win      |   316 -
 .../dvm_svn/tools/Zlib/src/CMakeLists.txt     |    12 -
 projects/dvm_svn/tools/Zlib/src/adler32.c     |    45 -
 projects/dvm_svn/tools/Zlib/src/compress.c    |    61 -
 projects/dvm_svn/tools/Zlib/src/crc32.c       |   159 -
 projects/dvm_svn/tools/Zlib/src/deflate.c     |  1308 -
 projects/dvm_svn/tools/Zlib/src/example.c     |   556 -
 projects/dvm_svn/tools/Zlib/src/gzio.c        |   851 -
 projects/dvm_svn/tools/Zlib/src/infblock.c    |   395 -
 projects/dvm_svn/tools/Zlib/src/infcodes.c    |   247 -
 projects/dvm_svn/tools/Zlib/src/inffast.c     |   180 -
 projects/dvm_svn/tools/Zlib/src/inflate.c     |   356 -
 projects/dvm_svn/tools/Zlib/src/inftrees.c    |   458 -
 projects/dvm_svn/tools/Zlib/src/infutil.c     |    85 -
 projects/dvm_svn/tools/Zlib/src/maketree.c    |    85 -
 projects/dvm_svn/tools/Zlib/src/minigzip.c    |   320 -
 projects/dvm_svn/tools/Zlib/src/trees.c       |  1212 -
 projects/dvm_svn/tools/Zlib/src/uncompr.c     |    55 -
 projects/dvm_svn/tools/Zlib/src/zutil.c       |   210 -
 .../tools/pppa/branches/dvm4.07/makefile.uni  |    28 -
 .../tools/pppa/branches/dvm4.07/makefile.win  |    42 -
 .../tools/pppa/branches/dvm4.07/src/bool.h    |     7 -
 .../tools/pppa/branches/dvm4.07/src/dvmvers.h |     2 -
 .../tools/pppa/branches/dvm4.07/src/inter.cpp |   350 -
 .../tools/pppa/branches/dvm4.07/src/inter.h   |    72 -
 .../pppa/branches/dvm4.07/src/makefile.uni    |    44 -
 .../pppa/branches/dvm4.07/src/makefile.win    |    46 -
 .../pppa/branches/dvm4.07/src/potensyn.cpp    |   175 -
 .../pppa/branches/dvm4.07/src/potensyn.h      |    52 -
 .../pppa/branches/dvm4.07/src/statfile.cpp    |   523 -
 .../tools/pppa/branches/dvm4.07/src/statist.h |     7 -
 .../pppa/branches/dvm4.07/src/statprintf.cpp  |    83 -
 .../pppa/branches/dvm4.07/src/statprintf.h    |    23 -
 .../pppa/branches/dvm4.07/src/statread.cpp    |   961 -
 .../pppa/branches/dvm4.07/src/statread.h      |   136 -
 .../tools/pppa/branches/dvm4.07/src/strall.h  |   132 -
 .../tools/pppa/branches/dvm4.07/src/sysstat.h |    29 -
 .../pppa/branches/dvm4.07/src/treeinter.cpp   |   296 -
 .../pppa/branches/dvm4.07/src/treeinter.h     |    63 -
 .../tools/pppa/branches/dvm4.07/src/ver.h     |     8 -
 .../pppa/stuff/Zlib_1.1.3/Include/deflate.h   |   318 -
 .../pppa/stuff/Zlib_1.1.3/Include/infblock.h  |    39 -
 .../pppa/stuff/Zlib_1.1.3/Include/infcodes.h  |    27 -
 .../pppa/stuff/Zlib_1.1.3/Include/inffast.h   |    17 -
 .../pppa/stuff/Zlib_1.1.3/Include/inffixed.h  |   151 -
 .../pppa/stuff/Zlib_1.1.3/Include/inftrees.h  |    58 -
 .../pppa/stuff/Zlib_1.1.3/Include/infutil.h   |    98 -
 .../pppa/stuff/Zlib_1.1.3/Include/trees.h     |   128 -
 .../pppa/stuff/Zlib_1.1.3/Include/zconf.h     |   279 -
 .../pppa/stuff/Zlib_1.1.3/Include/zlib.h      |   893 -
 .../pppa/stuff/Zlib_1.1.3/Include/zutil.h     |   220 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/Makefile  |    31 -
 .../pppa/stuff/Zlib_1.1.3/Src/Makefile.1      |    35 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c |    48 -
 .../pppa/stuff/Zlib_1.1.3/Src/compress.c      |    68 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c   |   162 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c |  1350 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/example.c |   556 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c    |   875 -
 .../pppa/stuff/Zlib_1.1.3/Src/infblock.c      |   398 -
 .../pppa/stuff/Zlib_1.1.3/Src/infcodes.c      |   257 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c |   170 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c |   366 -
 .../pppa/stuff/Zlib_1.1.3/Src/inftrees.c      |   455 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c |    87 -
 .../pppa/stuff/Zlib_1.1.3/Src/makefile.uni    |    31 -
 .../pppa/stuff/Zlib_1.1.3/Src/maketree.c      |    85 -
 .../pppa/stuff/Zlib_1.1.3/Src/minigzip.c      |   320 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/trees.c   |  1214 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c |    58 -
 .../tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c   |   225 -
 .../tools/pppa/stuff/Zlib_1.1.3/Zlib.mak      |   316 -
 .../tools/pppa/stuff/Zlib_1.1.3/readme        |   148 -
 .../dvm_svn/tools/pppa/trunk/CMakeLists.txt   |     1 -
 .../dvm_svn/tools/pppa/trunk/makefile.uni     |    27 -
 .../dvm_svn/tools/pppa/trunk/makefile.win     |    40 -
 .../tools/pppa/trunk/src/CMakeLists.txt       |    20 -
 .../tools/pppa/trunk/src/LibraryImport.cpp    |    50 -
 .../tools/pppa/trunk/src/LibraryImport.h      |    21 -
 .../tools/pppa/trunk/src/PPPA/PPPA.sln        |    37 -
 .../pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj     |   231 -
 .../trunk/src/PPPA/PPPA/PPPA.vcxproj.filters  |   141 -
 projects/dvm_svn/tools/pppa/trunk/src/bool.h  |     7 -
 .../dvm_svn/tools/pppa/trunk/src/dvmh_stat.h  |   208 -
 .../dvm_svn/tools/pppa/trunk/src/dvmvers.h.in |     2 -
 .../dvm_svn/tools/pppa/trunk/src/inter.cpp    |   409 -
 projects/dvm_svn/tools/pppa/trunk/src/inter.h |   178 -
 .../dvm_svn/tools/pppa/trunk/src/json.hpp     | 22828 ----------------
 .../dvm_svn/tools/pppa/trunk/src/makefile.uni |    44 -
 .../dvm_svn/tools/pppa/trunk/src/makefile.win |    46 -
 .../tools/pppa/trunk/src/makefileJnilib       |    49 -
 .../dvm_svn/tools/pppa/trunk/src/potensyn.cpp |   175 -
 .../dvm_svn/tools/pppa/trunk/src/potensyn.h   |    52 -
 .../dvm_svn/tools/pppa/trunk/src/stat.cpp     |   269 -
 .../dvm_svn/tools/pppa/trunk/src/statfile.cpp |  1118 -
 .../tools/pppa/trunk/src/statinter.cpp        |   704 -
 .../dvm_svn/tools/pppa/trunk/src/statinter.h  |    93 -
 .../dvm_svn/tools/pppa/trunk/src/statist.h    |     7 -
 .../dvm_svn/tools/pppa/trunk/src/statlist.cpp |   361 -
 .../dvm_svn/tools/pppa/trunk/src/statlist.h   |   168 -
 .../tools/pppa/trunk/src/statprintf.cpp       |    83 -
 .../dvm_svn/tools/pppa/trunk/src/statprintf.h |    23 -
 .../dvm_svn/tools/pppa/trunk/src/statread.cpp |  1242 -
 .../dvm_svn/tools/pppa/trunk/src/statread.h   |   194 -
 .../dvm_svn/tools/pppa/trunk/src/strall.h     |   178 -
 .../dvm_svn/tools/pppa/trunk/src/sysstat.h    |    31 -
 .../tools/pppa/trunk/src/treeinter.cpp        |   473 -
 .../dvm_svn/tools/pppa/trunk/src/treeinter.h  |    86 -
 projects/dvm_svn/tools/pppa/trunk/src/ver.h   |     8 -
 projects/paths.default.txt                    |    20 +-
 356 files changed, 34 insertions(+), 265540 deletions(-)
 delete mode 100644 projects/dvm_svn/fdvm/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/InlineExpansion/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/InlineExpansion/dvm_tag.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/InlineExpansion/hlp.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/InlineExpansion/inl_exp.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/InlineExpansion/inline.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/InlineExpansion/inliner.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/InlineExpansion/intrinsic.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.win
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Makefile
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/LICENSE
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/Makefile
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/Sage++/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/Sage++/Makefile
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/Sage++/libSage++.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.win
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/Makefile
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/bif.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/compatible.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/db.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/db.new.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/defines.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/defs.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/dep.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/dep_str.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/dep_struct.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/elist.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/f90.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/fixcray.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/fm.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/head
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/leak_detector.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/list.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/ll.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/prop.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/sage.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/sagearch.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/sageroot.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/sets.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/symb.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/symblob.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/tag
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/tag.doc
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/tag.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/tag_make
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/version.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/vextern.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/vparse.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/vpc.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/h/window.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/Makefile
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/attributes.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/baseClasses.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/bif_node.def
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/dependence.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_ann.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_high.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_lib.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_low.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_mid.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/extcxx_low.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/libSage++.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/macro.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++callgraph.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++extern.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++proto.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++user.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/symb.def
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/type.def
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparse.def
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseC++.def
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseDVM.def
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.win
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/Makefile
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.y
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/comments.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/low_level.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.win
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/toolsann.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/unparse.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/Makefile
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/list.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.win
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/sets.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/setutils.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/Sage/makefile.win
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
 delete mode 100644 projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
 delete mode 100644 projects/dvm_svn/fdvm/trunk/acrossDebugging/across.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/gausf.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/gausgb.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/gaush.hpf
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/gauswh.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/jac.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/jacas.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/jach.hpf
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/redbf.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/redbh.hpf
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/sor.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/task2j.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/tasks.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/examples/taskst.fdv
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/Makefile
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_across.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_across_analyzer.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_analyzer.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_data.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_index_analyzer.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_rtc.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_unused_code.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/acc_utilities.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/aks_loopStructure.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/aks_structs.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/calls.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/checkpoint.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/debug.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/dvm.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/funcall.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/help.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/hpf.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/io.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/makefile.win
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/omp.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/ompdebug.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/parloop.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/fdvm/stmt.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/acc_across_analyzer.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/acc_analyzer.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/acc_data.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/aks_loopStructure.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/aks_structs.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/calls.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/dvm.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/dvm_tag.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/extern.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/fdvm.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/fdvm_version.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/inc.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/leak_detector.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/libSageOMP.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/libdvm.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/libnum.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/unparse.hpf
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/unparse1.hpf
 delete mode 100644 projects/dvm_svn/fdvm/trunk/include/user.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/makefile.win
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/Makefile
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/cftn.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/errors.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/facc.gram
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/fdvm.gram
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/fomp.gram
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/fspf.gram
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/ftn.gram
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/gram1.tab.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/gram1.tab.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/gram1.y
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/hash.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/head
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/init.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/lexfdvm.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/lists.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/low_hpf.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/makefile.win
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/misc.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/stat.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/sym.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/tag
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/tag.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/tokdefs.h
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/tokens
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/types.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/parser/unparse_hpf.c
 delete mode 100644 projects/dvm_svn/fdvm/trunk/sageExample/SwapFors.cpp
 delete mode 100644 projects/dvm_svn/fdvm/trunk/sageExample/makefile.uni
 delete mode 100644 projects/dvm_svn/fdvm/trunk/sageExample/makefile.win
 delete mode 100644 projects/dvm_svn/tools/Zlib/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/deflate.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/infblock.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/infcodes.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/inffast.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/inffixed.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/inftrees.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/infutil.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/trees.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/zconf.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/zlib.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/include/zutil.h
 delete mode 100644 projects/dvm_svn/tools/Zlib/makefile.uni
 delete mode 100644 projects/dvm_svn/tools/Zlib/makefile.win
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/adler32.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/compress.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/crc32.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/deflate.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/example.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/gzio.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/infblock.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/infcodes.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/inffast.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/inflate.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/inftrees.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/infutil.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/maketree.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/minigzip.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/trees.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/uncompr.c
 delete mode 100644 projects/dvm_svn/tools/Zlib/src/zutil.c
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.uni
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.win
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/bool.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/dvmvers.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.uni
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.win
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statfile.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statist.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/strall.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/sysstat.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.h
 delete mode 100644 projects/dvm_svn/tools/pppa/branches/dvm4.07/src/ver.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
 delete mode 100644 projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/readme
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/makefile.uni
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/makefile.win
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/CMakeLists.txt
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA.sln
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/bool.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/dvmh_stat.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/dvmvers.h.in
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/inter.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/inter.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/json.hpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/makefile.uni
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/makefile.win
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/makefileJnilib
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/potensyn.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/potensyn.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/stat.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statfile.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statinter.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statinter.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statist.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statlist.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statlist.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statprintf.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statprintf.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statread.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/statread.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/strall.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/sysstat.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/treeinter.cpp
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/treeinter.h
 delete mode 100644 projects/dvm_svn/tools/pppa/trunk/src/ver.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b345d9..6f9644e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,16 +13,16 @@ add_definitions("-D YYDEBUG")
 
 set(CMAKE_CXX_STANDARD 17)
 
-set(fdvm_include   projects/dvm_svn/fdvm/trunk/include)
-set(fdvm_sources   projects/dvm_svn/fdvm/trunk/fdvm/)
-set(sage_include_1 projects/dvm_svn/fdvm/trunk/Sage/lib/include)
-set(sage_include_2 projects/dvm_svn/fdvm/trunk/Sage/h/)
-set(libdb_sources  projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc)
-set(sage_sources   projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc)
-set(sagepp_sources projects/dvm_svn/fdvm/trunk/Sage/Sage++)
-set(parser_sources projects/dvm_svn/fdvm/trunk/parser)
-set(pppa_sources   projects/dvm_svn/tools/pppa/trunk/src)
-set(zlib_sources   projects/dvm_svn/tools/Zlib)
+set(fdvm_include   projects/dvm/fdvmh/include/fdvmh/)
+set(fdvm_sources   projects/dvm/fdvmh/tools/fdvmh/)
+set(sage_include_1 projects/dvm/fdvmh/include/sage/lib/)
+set(sage_include_2 projects/dvm/fdvmh/include/sage/h/)
+set(libdb_sources  projects/dvm/fdvmh/lib/sage/db/)
+set(sage_sources   projects/dvm/fdvmh/lib/sage/sage/)
+set(sagepp_sources projects/dvm/fdvmh/lib/sage/sage++/)
+set(parser_sources projects/dvm/fdvmh/tools/parser/)
+set(pppa_sources   projects/dvm/pppa/src/)
+set(zlib_sources   projects/dvm/third-party/Zlib/)
 
 include_directories(src)
 #Sage lib includes
diff --git a/projects/Fdvm/CMakeLists.txt b/projects/Fdvm/CMakeLists.txt
index 28bff03..e0f64d8 100644
--- a/projects/Fdvm/CMakeLists.txt
+++ b/projects/Fdvm/CMakeLists.txt
@@ -11,15 +11,16 @@ message("processing ${project}")
 
 # Read pathes to external sapfor directories
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../paths.txt")
-    message("Found paths.txt, using custom paths.")
+#    message("Found paths.txt, using custom paths.")
     FILE(STRINGS ../paths.txt SAPFOR_PATHS)
 else ()
-    message("Not found paths.txt, using default paths.")
+#    message("Not found paths.txt, using default paths.")
     FILE(STRINGS ../paths.default.txt SAPFOR_PATHS)
 endif ()
+
 foreach (NameAndValue ${SAPFOR_PATHS})
     # Strip leading spaces
-    string(REGEX REPLACE "^[ ]+" "" NameAndValue ${NameAndValue})
+   string(REGEX REPLACE "^[ ]+" "" NameAndValue ${NameAndValue})
     # Find variable name
     string(REGEX MATCH "^[^=]+" Name ${NameAndValue})
     # Find the value
diff --git a/projects/Parser/CMakeLists.txt b/projects/Parser/CMakeLists.txt
index 1638e23..20b50a6 100644
--- a/projects/Parser/CMakeLists.txt
+++ b/projects/Parser/CMakeLists.txt
@@ -11,10 +11,10 @@ message("processing ${project}")
 
 # Read pathes to external sapfor directories
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../paths.txt")
-    message("Found paths.txt, using custom paths.")
+#    message("Found paths.txt, using custom paths.")
     FILE(STRINGS ../paths.txt SAPFOR_PATHS)
 else ()
-    message("Not found paths.txt, using default paths.")
+#    message("Not found paths.txt, using default paths.")
     FILE(STRINGS ../paths.default.txt SAPFOR_PATHS)
 endif ()
 foreach (NameAndValue ${SAPFOR_PATHS})
@@ -47,8 +47,8 @@ set(SOURCE_EXE
         ${parser_sources}/unparse_hpf.c
         ${PARSER_HEADERS})
 
-# if not default ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
-include_directories(${sage_include_1} ${sage_include_2})
+# if not default ${fdvm_include} ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
+include_directories(${fdvm_include} ${sage_include_1} ${sage_include_2})
 add_executable(Parser ${SOURCE_EXE})
 
 if (MSVC_IDE)
diff --git a/projects/SageLib/CMakeLists.txt b/projects/SageLib/CMakeLists.txt
index e072b03..21dc798 100644
--- a/projects/SageLib/CMakeLists.txt
+++ b/projects/SageLib/CMakeLists.txt
@@ -10,10 +10,10 @@ message("processing ${project}")
 
 # Read pathes to external sapfor directories
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../paths.txt")
-    message("Found paths.txt, using custom paths.")
+#    message("Found paths.txt, using custom paths.")
     FILE(STRINGS ../paths.txt SAPFOR_PATHS)
 else ()
-    message("Not found paths.txt, using default paths.")
+#    message("Not found paths.txt, using default paths.")
     FILE(STRINGS ../paths.default.txt SAPFOR_PATHS)
 endif ()
 foreach (NameAndValue ${SAPFOR_PATHS})
diff --git a/projects/SageNewSrc/CMakeLists.txt b/projects/SageNewSrc/CMakeLists.txt
index 1b822d5..8869d39 100644
--- a/projects/SageNewSrc/CMakeLists.txt
+++ b/projects/SageNewSrc/CMakeLists.txt
@@ -11,10 +11,10 @@ message("processing ${project}")
 
 # Read pathes to external sapfor directories
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../paths.txt")
-    message("Found paths.txt, using custom paths.")
+#    message("Found paths.txt, using custom paths.")
     FILE(STRINGS ../paths.txt SAPFOR_PATHS)
 else ()
-    message("Not found paths.txt, using default paths.")
+#    message("Not found paths.txt, using default paths.")
     FILE(STRINGS ../paths.default.txt SAPFOR_PATHS)
 endif ()
 foreach (NameAndValue ${SAPFOR_PATHS})
diff --git a/projects/SageOldSrc/CMakeLists.txt b/projects/SageOldSrc/CMakeLists.txt
index 7b1dcc2..0e5b9b0 100644
--- a/projects/SageOldSrc/CMakeLists.txt
+++ b/projects/SageOldSrc/CMakeLists.txt
@@ -11,10 +11,10 @@ message("processing ${project}")
 
 # Read pathes to external sapfor directories
 if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../paths.txt")
-    message("Found paths.txt, using custom paths.")
+#    message("Found paths.txt, using custom paths.")
     FILE(STRINGS ../paths.txt SAPFOR_PATHS)
 else ()
-    message("Not found paths.txt, using default paths.")
+#    message("Not found paths.txt, using default paths.")
     FILE(STRINGS ../paths.default.txt SAPFOR_PATHS)
 endif ()
 foreach (NameAndValue ${SAPFOR_PATHS})
diff --git a/projects/dvm_svn/fdvm/CMakeLists.txt b/projects/dvm_svn/fdvm/CMakeLists.txt
deleted file mode 100644
index d6b5e2b..0000000
--- a/projects/dvm_svn/fdvm/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(trunk)
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/CMakeLists.txt
deleted file mode 100644
index f4a5851..0000000
--- a/projects/dvm_svn/fdvm/trunk/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-set(DVM_FORTRAN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-add_subdirectory(Sage)
-add_subdirectory(parser)
-add_subdirectory(fdvm)
-add_subdirectory(InlineExpansion)
-
diff --git a/projects/dvm_svn/fdvm/trunk/InlineExpansion/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/InlineExpansion/CMakeLists.txt
deleted file mode 100644
index faac3be..0000000
--- a/projects/dvm_svn/fdvm/trunk/InlineExpansion/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-set(INLINE_SOURCES inl_exp.cpp inliner.cpp hlp.cpp)
-
-if(MSVC_IDE)
-  file(GLOB_RECURSE INLINE_HEADERS RELATIVE
-    ${CMAKE_CURRENT_SOURCE_DIR} *.h)
-  foreach(DIR ${DVM_FORTRAN_INCLUDE_DIRS})
-    file(GLOB_RECURSE FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${DIR}/*.h")
-    set(INLINE_HEADERS ${INLINE_HEADERS} ${FILES})
-  endforeach()
-endif()
-
-add_executable(inl_exp ${INLINE_SOURCES} ${INLINE_HEADERS})
-
-add_dependencies(inl_exp db sage sage++)
-target_link_libraries(inl_exp db sage sage++)
-
-target_include_directories(inl_exp PRIVATE "${DVM_FORTRAN_INCLUDE_DIRS}")
-set_target_properties(inl_exp PROPERTIES
-  FOLDER "${DVM_TOOL_FOLDER}"
-  RUNTIME_OUTPUT_DIRECTORY ${DVM_BIN_DIR}
-  COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>
-  PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>
-)
diff --git a/projects/dvm_svn/fdvm/trunk/InlineExpansion/dvm_tag.h b/projects/dvm_svn/fdvm/trunk/InlineExpansion/dvm_tag.h
deleted file mode 100644
index 43ec990..0000000
--- a/projects/dvm_svn/fdvm/trunk/InlineExpansion/dvm_tag.h
+++ /dev/null
@@ -1,85 +0,0 @@
-#define HPF_TEMPLATE_STAT            296
-#define HPF_ALIGN_STAT               297
-#define HPF_PROCESSORS_STAT	     298
-#define DVM_DISTRIBUTE_DIR           277
-#define DVM_REDISTRIBUTE_DIR         299
-#define DVM_PARALLEL_ON_DIR          211
-#define DVM_SHADOW_START_DIR         212
-#define DVM_SHADOW_GROUP_DIR         213
-#define DVM_SHADOW_WAIT_DIR          214
-#define DVM_REDUCTION_START_DIR      215
-#define DVM_REDUCTION_GROUP_DIR      216
-#define DVM_REDUCTION_WAIT_DIR       217
-#define DVM_DYNAMIC_DIR              218
-#define DVM_ALIGN_DIR                219 
-#define DVM_REALIGN_DIR              220 
-#define DVM_REALIGN_NEW_DIR          221  
-#define DVM_REMOTE_ACCESS_DIR        222  
-#define HPF_INDEPENDENT_DIR          223 
-#define DVM_SHADOW_DIR               224 
-#define DVM_NEW_VALUE_DIR            247
-#define DVM_VAR_DECL           	     248
-#define DVM_POINTER_DIR              249
-#define DVM_DEBUG_DIR	      	     146  
-#define DVM_ENDDEBUG_DIR	     147  
-#define DVM_TRACEON_DIR		     148  
-#define DVM_TRACEOFF_DIR	     149       
-#define DVM_INTERVAL_DIR	     128  
-#define DVM_ENDINTERVAL_DIR	     129
-#define DVM_TASK_REGION_DIR 	     605	
-#define DVM_END_TASK_REGION_DIR      606	
-#define DVM_ON_DIR  		     607	
-#define DVM_END_ON_DIR		     608	
-#define DVM_TASK_DIR                 609	
-#define DVM_MAP_DIR 		     610	
-#define DVM_PARALLEL_TASK_DIR	     611	
-#define DVM_INHERIT_DIR		     612
-#define DVM_INDIRECT_GROUP_DIR	     613	
-#define DVM_INDIRECT_ACCESS_DIR      614	
-#define DVM_REMOTE_GROUP_DIR         615	
-#define DVM_RESET_DIR		     616	
-#define DVM_PREFETCH_DIR	     617	
-#define DVM_OWN_DIR		     618	
-#define DVM_HEAP_DIR		     619	
-#define DVM_ASYNCID_DIR		     620	
-#define DVM_ASYNCHRONOUS_DIR	     621	
-#define DVM_ENDASYNCHRONOUS_DIR	     622	
-#define DVM_ASYNCWAIT_DIR	     623	
-#define DVM_F90_DIR		     624 
-#define DVM_BARRIER_DIR		     625
-#define FORALL_STAT                  626
-#define DVM_CONSISTENT_GROUP_DIR     627	
-#define DVM_CONSISTENT_START_DIR     628	
-#define DVM_CONSISTENT_WAIT_DIR      629	
-#define DVM_CONSISTENT_DIR           630
-	   
-#define BLOCK_OP           705
-#define NEW_SPEC_OP        706
-#define REDUCTION_OP       707
-#define SHADOW_RENEW_OP    708
-#define SHADOW_START_OP    709
-#define SHADOW_WAIT_OP     710
-#define DIAG_OP            711
-#define REMOTE_ACCESS_OP   712
-#define TEMPLATE_OP        713     
-#define PROCESSORS_OP      714     
-#define DYNAMIC_OP         715     
-#define ALIGN_OP           716     
-#define DISTRIBUTE_OP      717     
-#define SHADOW_OP          718 
-#define INDIRECT_ACCESS_OP 719
-#define ACROSS_OP          720  
-#define NEW_VALUE_OP       721 
-#define SHADOW_COMP_OP     722  
-#define STAGE_OP           723  
-#define FORALL_OP          724
-#define CONSISTENT_OP      725          
-#define SHADOW_GROUP_NAME     523
-#define REDUCTION_GROUP_NAME  524
-#define REF_GROUP_NAME        525      
-#define ASYNC_ID	      526
-#define CONSISTENT_GROUP_NAME 527 
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/InlineExpansion/hlp.cpp b/projects/dvm_svn/fdvm/trunk/InlineExpansion/hlp.cpp
deleted file mode 100644
index 39f8816..0000000
--- a/projects/dvm_svn/fdvm/trunk/InlineExpansion/hlp.cpp
+++ /dev/null
@@ -1,622 +0,0 @@
-/**************************************************************\
-* Inline Expansion                                             *
-*                                                              *
-*            Miscellaneous help routines                       *
-\**************************************************************/
-
-#include "inline.h"
-#include <ctype.h>
-#include <stdlib.h>
-#ifdef __SPF
-#include <string>
-#endif
-
-//*************************************************************
-/*
- * Error - formats the error message then call "err" to print it
- *
- * input:
- *	  s - string that specifies the conversion format
- *	  t - string that to be formated according to s
- *        num  - error message number
- *        stmt - pointer to the statement
- */
- //*************************************************************
-void Error(const char *s, const char *t, int num, SgStatement *stmt)
-
-{
-    char *buff = new char[strlen(s) + strlen(t) + 32];
-    sprintf(buff, s, t);
-    err(buff, num, stmt);
-    delete[]buff;
-}
-
-/*
- * Err_g - formats and prints the special kind error message (without statement reference)
- *
- * input:
- *	  s - string that specifies the conversion format
- *	  t - string that to be formated according to s
- *        num  - error message number
- */
-
-void Err_g(const char *s, const char *t, int num)
-
-{
-    char *buff = new char[strlen(s) + strlen(t) + 32];
-    char num3s[16];
-    sprintf(buff, s, t);
-    format_num(num, num3s);
-    errcnt++;
-    (void)fprintf(stderr, "Error %s in   %s  of %s: %s\n", num3s, cur_func->symbol()->identifier(), cur_func->fileName(), buff);
-    delete[]buff;
-}
-/*
- * err -- prints the error message
- *
- * input:
- *	  s - string to be printed out
- *        num  - error message number
- *        stmt - pointer to the statement
- */
-void err(const char *s, int num, SgStatement *stmt)
-
-{
-    char num3s[16];
-    format_num(num, num3s);
-    errcnt++;
-    //  printf( "Error on line %d : %s\n", stmt->lineNumber(),  s);
-#ifdef __SPF
-    char message[256];
-    sprintf(message, "Error %d: %s", num, s);
-
-    std::string toPrint = "|";
-    toPrint += std::to_string(1) + " "; // ERROR
-    toPrint += std::string(stmt->fileName()) + " ";
-    toPrint += std::to_string(stmt->lineNumber()) + " ";
-    toPrint += std::to_string(0);
-    toPrint += "|" + std::string(message);
-
-    printf("@%s@\n", toPrint.c_str());
-#else
-    (void)fprintf(stderr, "Error %s on line %d of %s: %s\n", num3s, stmt->lineNumber(), stmt->fileName(), s);
-#endif
-}
-
-/*
- * Warning -- formats a warning message then call "warn" to print it out
- *
- * input:
- *	  s - string that specifies the conversion format
- *	  t - string that to be converted according to s
- *        num  - warning message number
- *        stmt - pointer to the statement
- */
-void Warning(const char *s, const char *t, int num, SgStatement *stmt)
-{
-    char *buff = new char[strlen(s) + strlen(t) + 32];
-    sprintf(buff, s, t);
-    warn(buff, num, stmt);
-    delete[]buff;
-}
-
-/*
- * warn -- print the warning message if specified
- *
- * input:
- *	  s - string to be printed
- *        num  - warning message number
- *        stmt - pointer to the statement
- */
-void warn(const char *s, int num, SgStatement *stmt)
-{
-    char num3s[16];
-    format_num(num, num3s);
-    // printf( "Warning on line %d: %s\n", stmt->lineNumber(), s);
-    (void)fprintf(stderr, "Warning %s on line %d of %s: %s\n", num3s, stmt->lineNumber(), stmt->fileName(), s);
-}
-
-void Warn_g(const char *s, const char *t, int num)
-{
-    char *buff = new char[strlen(s) + strlen(t) + 32];
-    char num3s[16];
-    format_num(num, num3s);
-    sprintf(buff, s, t);
-    (void)fprintf(stderr, "Warning %s in   %s  of %s: %s\n", num3s, cur_func->symbol()->identifier(), cur_func->fileName(), buff);
-    delete[]buff;
-}
-//*********************************************************************
-void printVariantName(int i) {
-    if ((i >= 0 && i < MAXTAGS) && tag[i]) printf("%s", tag[i]);
-    else printf("not a known node variant");
-}
-//***********************************
-
-char *UnparseExpr(SgExpression *e)
-{
-    char *buf;
-    int l;
-    Init_Unparser();
-    buf = Tool_Unparse2_LLnode(e->thellnd);
-    l = strlen(buf);
-    char *ustr = new char[l + 1];
-    strcpy(ustr, buf);
-    //ustr[l]   = ' ';
-    //ustr[l+1] = '\0';
-    return(ustr);
-}
-//************************************
-
-const char* header(int i) {
-    switch (i) {
-    case(PROG_HEDR):
-        return("program");
-    case(PROC_HEDR):
-        return("subroutine");
-    case(FUNC_HEDR):
-        return("function");
-    default:
-        return("error");
-    }
-}
-
-SgLabel* firstLabel(SgFile *f)
-{
-    SetCurrentFileTo(f->filept);
-    SwitchToFile(GetFileNumWithPt(f->filept));
-    return LabelMapping(PROJ_FIRST_LABEL());
-}
-
-int isLabel(int num) {
-    PTR_LABEL lab;
-    for (lab = PROJ_FIRST_LABEL(); lab; lab = LABEL_NEXT(lab))
-        if (num == LABEL_STMTNO(lab))
-            return 1;
-    return 0;
-}
-
-SgLabel *isLabelWithScope(int num, SgStatement *stmt) {
-    PTR_LABEL lab;
-    for (lab = PROJ_FIRST_LABEL(); lab; lab = LABEL_NEXT(lab))
-        //if( num == LABEL_STMTNO(lab) && LABEL_BODY(lab)->scope == stmt->thebif)
-        if (num == LABEL_STMTNO(lab) && LABEL_SCOPE(lab) == stmt->thebif)
-            return LabelMapping(lab);
-    return NULL;
-}
-
-
-SgLabel * GetLabel()
-{
-    static int lnum = 90000;
-    if (lnum > max_lab)
-        return (new SgLabel(lnum--));
-    while (isLabel(lnum))
-        lnum--;
-    return (new SgLabel(lnum--));
-}
-
-SgLabel * GetNewLabel()
-{
-    static int lnum = 99999;
-    if (lnum > max_lab) /*  for current file must be set before first call GetNewLabel() :max_lab = getLastLabelId(); */
-        return (new SgLabel(lnum--));
-    while (isLabel(lnum))
-        lnum--;
-    return (new SgLabel(lnum--));
-    /*
-      int lnum;
-      if(max_lab <99999)
-         return(new SgLabel(++max_lab));
-      lnum = 1;
-      while(isLabel(lnum))
-        lnum++;
-      return(new SgLabel(lnum));
-    */
-}
-
-SgLabel * NewLabel()
-{
-    if (max_lab < 99999)
-        return(new SgLabel(++max_lab));
-    ++num_lab;
-    while (isLabel(num_lab))
-        ++num_lab;
-    return(new SgLabel(num_lab));
-}
-
-void SetScopeOfLabel(SgLabel *lab, SgStatement *scope)
-{
-    LABEL_SCOPE(lab->thelabel) = scope->thebif;
-}
-
-/*
-SgLabel * NewLabel(int lnum)
-{
-  if(max_lab <99999)
-     return(new SgLabel(++max_lab));
-
-  while(isLabel(lnum))
-    ++lnum;
-  return(new SgLabel(lnum));
-}
-*/
-
-int isSymbolName(char *name)
-//
-{
-    SgSymbol *s;
-    for (s = current_file->firstSymbol(); s; s = s->next())
-        if (!strcmp(name, s->identifier()))
-            return 1;
-    return 0;
-}
-
-int isSymbolNameInScope(char *name, SgStatement *scope)
-{
-    SgSymbol *s;
-    for (s = current_file->firstSymbol(); s; s = s->next())
-        if (scope == s->scope() && !strcmp(name, s->identifier()))
-            return 1;
-    return 0;
-}
-/*
-{
-  PTR_SYMB sym;
-  for(sym=PROJ_FIRST_SYMB(); sym; sym=SYMB_NEXT(sym))
-     if( SYMB_SCOPE(sym) == scope->thebif && (!strcmp(name,SYMB_IDENT(sym)) ) )
-       return 1;
-  return 0;
-}
-*/
-
-void format_num(int num, char num3s[])
-{
-    if (num > 99)
-        num3s[sprintf(num3s, "%3d", num)] = 0;
-    else if (num > 9)
-        num3s[sprintf(num3s, "0%2d", num)] = 0;
-    else
-        num3s[sprintf(num3s, "00%1d", num)] = 0;
-}
-
-SgExpression *ConnectList(SgExpression *el1, SgExpression *el2)
-{
-    SgExpression *el;
-    if (!el1)
-        return(el2);
-    if (!el2)
-        return(el1);
-    for (el = el1; el->rhs(); el = el->rhs())
-        ;
-    el->setRhs(el2);
-    return(el1);
-}
-
-int is_integer_value(char *str)
-{
-    char *p;
-    p = str;
-    for (; *str != '\0'; str++)
-        if (!isdigit(*str))
-            return 0;
-    return (atoi(p));
-}
-
-void PrintSymbolTable(SgFile *f)
-{
-    SgSymbol *s;
-    printf("\nS Y M B O L   T A B L E \n");
-    for (s = f->firstSymbol(); s; s = s->next())
-        //printf(" %s/%d/     ", s->identifier(), s->id() );
-        printSymb(s);
-}
-
-void printSymb(SgSymbol *s)
-{
-    const char *head;
-    head = isHeaderStmtSymbol(s) ? "HEADER  " : "        ";
-    printf("SYMB[%3d]  scope=STMT[%3d] : %s    %s", s->id(), (s->scope()) ? (s->scope())->id() : -1, s->identifier(), head);
-    printType(s->type());
-    printf("\n");
-}
-
-void printType(SgType *t)
-{
-    SgArrayType *arrayt;
-    /*SgExpression *e = new SgExpression(TYPE_RANGES(t->thetype));*/
-    int i, n;
-    if (!t) { printf("no type "); return; }
-    else   printf("TYPE[%d]:", t->id());
-    if ((arrayt = isSgArrayType(t)) != 0)
-    {
-        printf("dimension(");
-        n = arrayt->dimension();
-        for (i = 0; i < n; i++)
-        {
-            (arrayt->sizeInDim(i))->unparsestdout();
-            if (i < n - 1)  printf(", ");
-        }
-        printf(") ");
-    }
-    else
-    {
-        switch (t->variant())
-        {
-        case  T_INT:      printf("integer "); break;
-        case  T_FLOAT:    printf("real "); break;
-        case  T_DOUBLE:   printf("double precision "); break;
-        case  T_CHAR:     printf("character "); break;
-        case  T_STRING:   printf("Character ");
-            UnparseLLND(TYPE_RANGES(t->thetype));
-            /*if(t->length()) printf("[%d]",t->length()->variant());*/
-            /*((SgArrayType *) t)->getDimList()->unparsestdout();*/
-            break;
-        case  T_BOOL:     printf("logical "); break;
-        case  T_COMPLEX:  printf("complex "); break;
-        case  T_DCOMPLEX:  printf("double complex "); break;
-
-        default: break;
-        }
-    }
-    /*  if(e) e->unparsestdout();*/
-    if (t->hasBaseType())
-    {
-        printf("of ");
-        printType(t->baseType());
-    }
-}
-
-void PrintTypeTable(SgFile *f)
-{
-    SgType *t;
-    printf("\nT Y P E   T A B L E \n");
-    for (t = f->firstType(); t; t = t->next())
-    {
-        printType(t); printf("\n");
-    }
-
-}
-
-SgExpression *ReplaceParameter(SgExpression *e)
-{
-    if (!e)
-        return(e);
-    if (e->variant() == CONST_REF) {
-        SgConstantSymb * sc = isSgConstantSymb(e->symbol());
-        return(ReplaceParameter(&(sc->constantValue()->copy())));
-    }
-    e->setLhs(ReplaceParameter(e->lhs()));
-    e->setRhs(ReplaceParameter(e->rhs()));
-    return(e);
-}
-
-SgExpression *ReplaceIntegerParameter(SgExpression *e)
-{
-    if (!e)
-        return(e);
-    if (e->variant() == CONST_REF && e->type()->variant() == T_INT) {
-        SgConstantSymb * sc = isSgConstantSymb(e->symbol());
-        return(ReplaceIntegerParameter(&(sc->constantValue()->copy())));
-    }
-    e->setLhs(ReplaceIntegerParameter(e->lhs()));
-    e->setRhs(ReplaceIntegerParameter(e->rhs()));
-    return(e);
-}
-
-/*
-SgExpression *ReplaceFuncCall(SgExpression *e)
-{
-  if(!e)
-    return(e);
-  if(isSgFunctionCallExp(e) && e->symbol()) {//function call
-     if( !e->lhs()  && (!strcmp(e->symbol()->identifier(),"number_of_processors") || !strcmp(e->symbol()->identifier(),"actual_num_procs"))) {             //NUMBER_OF_PROCESSORS() or
-                                                              // ACTUAL_NUM_PROCS()
-    SgExprListExp *el1,*el2;
-    if(!strcmp(e->symbol()->identifier(),"number_of_processors"))
-      el1 = new SgExprListExp(*ParentPS());
-    else
-      el1 = new SgExprListExp(*CurrentPS());
-    el2 = new SgExprListExp(*ConstRef(0));
-    e->setSymbol(fdvm[GETSIZ]);
-    fmask[GETSIZ] = 1;
-    el1->setRhs(el2);
-    e->setLhs(el1);
-    return(e);
-    }
-
-   if( !e->lhs() && (!strcmp(e->symbol()->identifier(),"processors_rank"))) {
-                                                                //PROCESSORS_RANK()
-    SgExprListExp *el1;
-    el1 = new SgExprListExp(*ParentPS());
-    e->setSymbol(fdvm[GETRNK]);
-    fmask[GETRNK] = 1;
-    e->setLhs(el1);
-    return(e);
-    }
-
-   if(!strcmp(e->symbol()->identifier(),"processors_size")) {
-                                                               //PROCESSORS_SIZE()
-    SgExprListExp *el1;
-    el1 = new SgExprListExp(*ParentPS());
-    e->setSymbol(fdvm[GETSIZ]);
-    fmask[GETSIZ] = 1;
-    el1->setRhs(*(e->lhs())+(*ConstRef(0)));  //el1->setRhs(e->lhs());
-    e->setLhs(el1);
-    return(e);
-   }
-  }
-  e->setLhs(ReplaceFuncCall(e->lhs()));
-  e->setRhs(ReplaceFuncCall(e->rhs()));
-  return(e);
-}
-*/
-
-/* version from dvm.cpp
-SgExpression *Calculate(SgExpression *e)
-{ SgExpression *er;
-   er  = ReplaceParameter( &(e->copy()));
-   if(er->isInteger())
-      return( new SgValueExp(er->valueInteger()));
-    else
-      return(e);
-}
-*/
-
-/* new version */
-SgExpression *Calculate(SgExpression *e)
-{
-    if (e->isInteger())
-        return(new SgValueExp(e->valueInteger()));
-    else
-        return(e);
-}
-
-
-SgExpression *Calculate_List(SgExpression *e)
-{
-    SgExpression *el;
-    for (el = e; el; el = el->rhs())
-        el->setLhs(Calculate(el->lhs()));
-    return(e);
-}
-
-
-int ExpCompare(SgExpression *e1, SgExpression *e2)
-{//compares two expressions
-// returns 1 if they are textually identical
-    if (!e1 && !e2) // both expressions are null
-        return(1);
-    if (!e1 || !e2) // one of them is null
-        return(0);
-    if (e1->variant() != e2->variant()) // variants are not equal
-        return(0);
-    switch (e1->variant()) {
-    case INT_VAL:
-        return(NODE_IV(e1->thellnd) == NODE_IV(e2->thellnd));
-    case FLOAT_VAL:
-    case DOUBLE_VAL:
-    case BOOL_VAL:
-    case CHAR_VAL:
-    case STRING_VAL:
-        return(!strcmp(NODE_STR(e1->thellnd), NODE_STR(e2->thellnd)));
-    case COMPLEX_VAL:
-        return(ExpCompare(e1->lhs(), e2->lhs()) && ExpCompare(e1->rhs(), e2->rhs()));
-    case CONST_REF:
-    case VAR_REF:
-        return(e1->symbol() == e2->symbol());
-    case ARRAY_REF:
-    case FUNC_CALL:
-        if (e1->symbol() == e2->symbol())
-            return(ExpCompare(e1->lhs(), e2->lhs())); // compares subscript/argument lists
-        else
-            return(0);
-    case EXPR_LIST:
-    {SgExpression *el1, *el2;
-    for (el1 = e1, el2 = e2; el1&&el2; el1 = el1->rhs(), el2 = el2->rhs())
-        if (!ExpCompare(el1->lhs(), el2->lhs()))  // the corresponding elements of lists are not identical
-            return(0);
-    if (el1 || el2) //one list is shorter than other
-        return(0);
-    else
-        return(1);
-    }
-    case MINUS_OP:  //unary operations
-    case NOT_OP:
-        return(ExpCompare(e1->lhs(), e2->lhs())); // compares operands    
-    default:
-        return(ExpCompare(e1->lhs(), e2->lhs()) && ExpCompare(e1->rhs(), e2->rhs()));
-    }
-}
-
-
-SgExpression *LowerBound(SgSymbol *ar, int i)
-// lower bound of i-nd dimension of array ar (i= 0,...,Rank(ar)-1)
-{
-    SgArrayType *artype;
-    SgExpression *e;
-    SgSubscriptExp *sbe;
-    //if(IS_POINTER(ar))
-     // return(new SgValueExp(1));
-    artype = isSgArrayType(ar->type());
-    if (!artype)
-        return(NULL);
-    e = artype->sizeInDim(i);
-    if (!e)
-        return(NULL);
-    if ((sbe = isSgSubscriptExp(e)) != NULL) {
-        if (sbe->lbound())
-            return(sbe->lbound());
-
-        //else if(IS_ALLOCATABLE_POINTER(ar)){
-        //  if(HEADER(ar))
-        //    return(header_ref(ar,Rank(ar)+3+i));
-        //  else
-        //    return(LBOUNDFunction(ar,i+1));
-        //}
-
-        else
-            return(new SgValueExp(1));
-    }
-    else
-        return(new SgValueExp(1));  // by default lower bound = 1      
-}
-
-int Rank(SgSymbol *s)
-{
-    SgArrayType *artype;
-    //if(IS_POINTER(s))
-     // return(PointerRank(s));
-    artype = isSgArrayType(s->type());
-    if (artype)
-        return (artype->dimension());
-    else
-        return (0);
-}
-
-SgExpression *UpperBound(SgSymbol *ar, int i)
-// upper bound of i-nd dimension of array ar (i= 0,...,Rank(ar)-1)
-{
-    SgArrayType *artype;
-    SgExpression *e;
-    SgSubscriptExp *sbe;
-
-
-    artype = isSgArrayType(ar->type());
-    if (!artype)
-        return(NULL);
-    e = artype->sizeInDim(i);
-    if (!e)
-        return(NULL);
-    if ((sbe = isSgSubscriptExp(e)) != NULL) {
-        if (sbe->ubound())
-            return(sbe->ubound());
-
-        //else if(HEADER(ar))
-        //  return(&(*GetSize(HeaderRefInd(ar,1),i+1)-*HeaderRefInd(ar,Rank(ar)+3+i)+*new SgValueExp(1)));
-        //else
-        //  return(UBOUNDFunction(ar,i+1));
-
-    }
-    else
-        return(e);
-    // !!!! test case "*"
-    return(e);
-}
-
-symb_list  *AddToSymbList(symb_list *ls, SgSymbol *s)
-{
-    symb_list *l;
-    //adding the symbol 's' to symb_list 'ls'
-    if (!ls) {
-        ls = new symb_list;
-        ls->symb = s;
-        ls->next = NULL;
-    }
-    else {
-        l = new symb_list;
-        l->symb = s;
-        l->next = ls;
-        ls = l;
-    }
-    return(ls);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/InlineExpansion/inl_exp.cpp b/projects/dvm_svn/fdvm/trunk/InlineExpansion/inl_exp.cpp
deleted file mode 100644
index 3fcbb4f..0000000
--- a/projects/dvm_svn/fdvm/trunk/InlineExpansion/inl_exp.cpp
+++ /dev/null
@@ -1,1750 +0,0 @@
-/*********************************************************************/
-/*                   Inline Expansion    2006                        */
-/*********************************************************************/
-
-
-/*********************************************************************/
-/*                   Inliner Driver                                  */
-/*********************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <string>
-#include <map>
-#include <set>
-#include <vector>
-#include <sstream>
-//#define IN_DVM_
-//#include "dvm.h" 
-//#undef IN_DVM_
-
-#define IN_M_ 
-#include "inline.h" 
-#undef IN_M_
-
-// Inliner version
-#define VERSION_NUMBER "4"
-
-using std::string;
-using std::map;
-using std::set;
-using std::vector;
-
-const char *name_loop_var[8] = { "idvm00","idvm01","idvm02","idvm03", "idvm04","idvm05","idvm06","idvm07" };
-const char *name_bufIO[6] = { "i000io","r000io", "d000io","c000io","l000io","dc00io" };
-SgSymbol *rmbuf[6];
-const char *name_rmbuf[6] = { "i000bf","r000bf", "d000bf","c000bf","l000bf","dc00bf" };
-SgSymbol *dvmcommon;
-SgSymbol *heapcommon;
-SgSymbol *redcommon;
-SgSymbol *dbgcommon;
-int lineno;  // number of line in file
-SgStatement *first_exec; // first executable statement in procedure
-int nproc, ndis, nblock, ndim, nblock_all;
-int iblock, isg, iacross;
-int saveall; //= 1 if there is SAVE without name-list in current function(procedure)  
-int mem_use[6] = { 0,0,0,0,0,0 };
-int buf_use[6] = { 0,0,0,0,0,0 };
-base_list *mem_use_structure;
-int lab;  // current label  
-int v_print = 0; //set to 1 by -v flag
-int warn_all = 0; //set to 1 by -w flag
-int own_exe;
-symb_list *new_red_var_list;
-SgSymbol *file_var_s;
-int nloopred; //counter of parallel loops with reduction group
-int nloopcons; //counter of parallel loops with consistent group
-stmt_list *wait_list; // list of REDUCTION_WAIT directives
-int task_ps = 0;
-SgStatement *end_of_unit; // last node (END statement) of program unit
-SgStatement *has_contains; //node for CONTAINS statement
-int dvm_const_ref;
-
-extern "C" int out_free_form;
-//
-//-----------------------------------------------------------------------
-// FOR DEBUGGING
-//#include "dump_info.C"
-//-----------------------------------------------------------------------
-
-set<string> needToInline;
-#ifdef __SPF
-void removeIncludeStatsAndUnparse(SgFile *file, const char *fileName, const char *fout);
-#endif
-
-int main(int argc, char *argv[]) 
-{
-    FILE *fout;
-    char *fout_name = (char *)"out.f";
-    //char *fout_name = NULL;
-    int level, hpf, openmp, isz;
-    // initialisation
-    initialize();
-    
-#ifdef __SPF
-    if (argc == 1)
-    {
-        printf("Usage:\n");
-        printf("Parse project with 'Parser' command first.\n");
-        printf("Specify functions to inline by parameter:\n");
-        printf("   -toInlined N name1 name2 name3... nameN, \n");
-        printf("where N - number of functions to inline, nameI - name of each function.\n");
-        printf("NOTE: count of nameI and N must be equal.\n");
-        return 0;
-    }
-#endif
-    openmp = hpf = 0;
-    argv++;
-    while ((argc > 1) && (*argv)[0] == '-') 
-    {
-        if ((*argv)[1] == 'o' && ((*argv)[2] == '\0')) 
-        {
-            fout_name = argv[1];
-            argv++;
-            argc--;
-        }
-        else if (!strcmp(argv[0], "-dc"))
-            with_cmnt = 1;
-        else if ((*argv)[1] == 'd')
-        {
-            switch ((*argv)[2])
-            {
-                /*case '0':  level = 0; break;*/
-            case '1':  level = 1; break;
-            case '2':  level = 2; break;
-            case '3':  level = 3; break;
-            case '4':  level = 4; break;
-                /* case '5':  level = -1; many_files=1; break;*/
-            default:  level = -1;
-            }
-            if (level > 0)
-                deb_reg = level;
-        }
-        else if (!strcmp(argv[0], "-p")) {
-            only_debug = 0; hpf = 0;
-        }
-        else if (!strcmp(argv[0], "-s")) {
-            only_debug = 1; hpf = 0;
-        }
-        else if (!strcmp(argv[0], "-v"))
-            v_print = 1;
-        else if (!strcmp(argv[0], "-w"))
-            warn_all = 1;
-        else if (!strcmp(argv[0], "-bind0"))
-            bind = 0;
-        else if (!strcmp(argv[0], "-bind1")) {
-            bind = 1; len_long = 8;
-        }
-        else if (!strcmp(argv[0], "-hpf") || !strcmp(argv[0], "-hpf1") || !strcmp(argv[0], "-hpf2"))
-            hpf = 1;
-        else if (!strcmp(argv[0], "-mp"))
-            openmp = 1;
-        else if (!strcmp(argv[0], "-ffo"))
-            out_free_form = 1;
-        else if (!strncmp(argv[0], "-bufio", 6)) 
-        {
-            if ((*argv)[6] != '\0' && (isz = is_integer_value(*argv + 6)))
-                IOBufSize = isz;
-        }
-        else if (!strcmp(argv[0], "-ver"))
-        {
-            (void)fprintf(stderr, "inliner version is \"%s\"\n", VERSION_NUMBER);
-            exit(0);
-        }
-#ifdef __SPF
-        else if (!strcmp(argv[0], "-toInlined"))
-        {
-            argc--;
-            argv++;
-            int count = 0;
-            int err = sscanf(argv[0], "%d", &count);
-            //TODO: check err
-            argc--;
-            argv++;
-            for (int z = 0; z < count; ++z)
-            {
-                needToInline.insert(argv[0]);
-                if (z != count - 1)
-                {
-                    argc--;
-                    argv++;
-                }
-            }
-
-            if (needToInline.size() > 0)
-            {
-                printf("need to inline:\n");
-                for (auto it = needToInline.begin(); it != needToInline.end(); ++it)
-                    printf("%s\n", (*it).c_str());
-            }
-        }
-#endif
-        argc--;
-        argv++;
-    }
-
-    SgProject project((char *)"dvm.proj");
-    SgFile *file;
-    int i;
-    //printf("Number Of Files: %d\n",project.numberOfFiles());
-
-    for (i = 0; i < project.numberOfFiles(); i++) 
-    {
-        SgFile *f;
-        f = &(project.file(i));
-        if (deb_reg)
-            printf("              FILE[%d]: %s\n", i, project.fileName(i));
-    }
-    
-    file = &(project.file(0));
-    fin_name = new char[80];
-    sprintf(fin_name, "%s%s", project.fileName(0), " ");
-    //fin_name = strcat(project.fileName(0)," "); 
-                                            // for call of function 'tpoint' 
-                                            //added one symbol to input-file name
-    initVariantNames();
-    initIntrinsicNames();
-    //InitDVM(file);
-
-    current_file = file;   // global variable (used in SgTypeComplex)
-    max_lab = getLastLabelId();
-    //if(dbg_if_regim) GetLabel(); //set maxlabval=90000
-    /*
-       printf("Labels:\n");
-       printf("first:%d  max: %d \n",firstLabel(file)->thelabel->stateno, getLastLabelId());
-       for(int num=1; num<=getLastLabelId(); num++)
-       if(isLabel(num))
-       printf("%d is label\n",num);
-       else
-       printf("%d isn't label\n",num);
-    */
-    if (v_print)
-        (void)fprintf(stderr, "<<<<< Inline Expansion   >>>>>\n");
-    
-    //build CallGraph of all files
-    for (int i = 0; i < project.numberOfFiles(); i++)
-    {
-        SgFile *currF = &(project.file(i));
-        // Building a directed acyclic call multigrahp (call DAMG) 
-        // which represents calls between routines of the program
-        // which are to be (or not to be) expanded
-
-        for (int k = 0; k < currF->numberOfFunctions(); ++k)
-        {
-            SgStatement *func = currF->functions(k);
-            cur_func = func;
-            cur_symb = func->symbol();
-            CallGraph(func);
-        }
-    }
-    InlinerDriver(file);
-
-    /*
-    { SgSymbol *s, *scop;
-
-      s= file->functions(0)->symbol();
-      //file =&(project.file(1));
-      //scop= &(s->copyAcrossFiles(*(file->firstStatement())));
-      scop= &(s->copySubprogram(*(file->firstStatement())));
-      printf(" \n****** BODY COPY FUNCTION(0) %s ********\n", scop->identifier());
-      scop->body()->unparsestdout();
-      printf(" \n****** AFTER COPY FUNCTION(0) ********\n");
-      file->unparsestdout();
-     }
-    */
-
-    if (v_print)
-        (void)fprintf(stderr, "<<<<< End Inline Expansion >>>>>\n");
-
-    /* DEBUG */
-    /*       classifyStatements(file);
-           printf("**************************************************\n");
-           printf("**** Expression Table ****************************\n");
-           printf("**************************************************\n");
-           classifyExpressions(file);
-           printf("**************************************************\n");
-           printf("**** Symbol  Table *******************************\n");
-           printf("**************************************************\n");
-           classifySymbols(file);
-           printf("**************************************************\n");
-     */
-     /*  end DEBUG */
-
-
-    if (errcnt) {
-        (void)fprintf(stderr, "%d error(s)\n", errcnt);
-        //!!! exit(1);
-        return 1;
-    }
-    //file->saveDepFile("dvm.dep");
-    // DVMFileUnparse(file);
-    //  file->saveDepFile("f.dep");
-    if (!fout_name) { //outfile is not specified, output result to stdout
-        file->unparsestdout();
-        return 0;
-    }
-#ifdef __SPF
-    string outFile;
-    //printf("out file is %s\n", fout_name);
-    if (string("out.f") == fout_name)
-    {
-        outFile = file->filept->filename;
-        auto itS = outFile.end();
-        itS--;
-        size_t pos = outFile.size() - 1;
-        while (itS[0] != '.' && itS != outFile.begin())
-        {
-            itS--;
-            pos--;
-        }
-
-        FILE *check = NULL;
-        string insert = "_inl";
-        do
-        {
-            string copy(outFile);
-            copy.insert(pos, insert);
-            if (check)
-                fclose(check);
-            check = fopen(copy.c_str(), "r");
-            if (check)
-                insert += "_";
-        } while (check);
-
-        outFile.insert(pos, insert);
-    }
-    else
-        outFile = fout_name;
-    printf("out file is %s\n", outFile.c_str());
-    removeIncludeStatsAndUnparse(file, file->filept->filename, outFile.c_str());
-#else
-    //writing result of converting into file
-    if ((fout = fopen(fout_name, "w")) == NULL) {
-        (void)fprintf(stderr, "Can't open file %s for write\n", fout_name);
-        // exit (1);
-        return 1;
-    }
-
-    if (v_print)
-        (void)fprintf(stderr, "<<<<<  Unparsing   %s  >>>>>\n", fout_name);
-
-    file->unparse(fout);
-
-    if ((fclose(fout)) < 0) 
-    {
-        fprintf(stderr, "Could not close %s\n", fout_name);
-        return 1;
-    }
-
-    if (v_print)
-        fprintf(stderr, "\n*****  Done  *****\n");
-#endif
-    return 0;
-}
-
-void initialize()
-{
-    node_list = NULL;
-    do_dummy = 0; do_stmtfn = 0;
-    gcount = 0;
-    deb_reg = 0;
-    with_cmnt = 0;
-}
-
-void initVariantNames() 
-{
-    for (int i = 0; i < MAXTAGS; i++) 
-        tag[i] = NULL;
-    /*!!!*/
-#include "tag.h"
-}
-
-void initIntrinsicNames() 
-{
-    for (int i = 0; i < MAX_INTRINSIC_NUM; i++) 
-    {
-        intrinsic_type[i] = 0;
-        intrinsic_name[i] = NULL;
-    }
-#include "intrinsic.h" 
-}
-
-
-
-/***********************************************************************/
-
-void InlinerDriver(SgFile *f)
-{
-  // function is program unit accept BLOCKDATA and MODULE (F90),i.e. 
-  // PROGRAM, SUBROUTINE, FUNCTION
-    //if(debug_fragment || perf_fragment) // is debugging or performance analizing regime specified ?
-     // BeginDebugFragment(0,NULL);// begin the fragment with number 0 (involving whole file(program) 
-    
-    if (deb_reg > 1)
-        PrintWholeGraph();
-
-    //Removing nodes representing "dead" subprogram
-    RemovingDeadSubprograms();
-
-    //Removing nodes representing "nobody" subprogram
-    NoBodySubprograms();
-
-    if (deb_reg > 1)
-    {
-        PrintWholeGraph();
-        PrintWholeGraph_kind_2();
-    }
-
-    //Building a list of header nodes to represent "top level" routines  
-    BuildingHeaderNodeList();
-
-    // for debug
-    //PrintSymbolTable(f);
-
-  // Looking through the list of header nodes,
-  // splitting header node n which has "inlined" edges representing inlined calls to n
-    {
-        graph_node *gnode, *gnode_new;
-        graph_node_list *ln;
-        edge *edg;
-        global_st = f->firstStatement();
-        if (deb_reg > 1)
-            printf("\nLooking header node list ....\n");
-        for (ln = header_node_list; ln; ln = ln->next)
-        {
-            gnode = ln->node;
-            if (deb_reg > 1)
-                printf("\nlooking NODE[%d]  %s\n", gnode->id, gnode->symb->identifier());
-
-            // looking through the incoming edges list of gnode
-            for (edg = gnode->from_calling; edg; edg = edg->next)
-            {
-                if (edg->inlined) //gnode has "inlined" incoming edge
-                {
-                    //split gnode, creating node gnode_new
-                    gnode_new = SplittingNode(gnode);
-                    //reset all edges representing inlined calls to gnode to point to gnode_new
-                    ReseatEdges(gnode, gnode_new);
-                    break;
-                }
-            }
-        }
-    }
-
-    // Removing all edges representing uninlined calls 
-    RemovingUninlinedEdges();
-
-    // for debug
-    if (deb_reg > 1)
-    {
-        PrintWholeGraph();
-        PrintWholeGraph_kind_2();
-        PrintSymbolTable(f);
-        PrintTypeTable(f);
-    }
-
-    // Parttion the call graph into inline flow graphs
-    Partition();
-    if (deb_reg)
-    {
-        PrintWholeGraph();
-        PrintWholeGraph_kind_2();
-    }
-
-    // For each non-trivial inline flow graph 
-    //     call the inliner to create the corresconding "top level" routine    
-    for (graph_node_list *ln = header_node_list; ln; ln = ln->next)
-    {
-        if (ln->node->to_called)
-            Inliner(ln->node);
-    }
-    //(f->functions(0)->symbol())->copyAcrossFiles(*(f->firstStatement()));
-    //printf(" \n****** AFTER COPY FUNCTION(0) ********\n");
-    if (deb_reg > 1)
-        f->unparsestdout();
-    return;
-
-    /*
-      has_contains = NULL;
-      //all_replicated=1;
-      for(stat=stat->lexNext(); stat; stat=end_of_unit->lexNext()) {
-        //end of external procedure with CONTAINS statement
-        if(has_contains && stat->variant() == CONTROL_END && has_contains->controlParent() == stat->controlParent()){
-          end_of_unit = stat; has_contains = NULL;
-          continue;
-        }
-        if( stat->variant() == BLOCK_DATA){//BLOCK_DATA header
-          end_of_unit = stat->lastNodeOfStmt();
-          //TransModule(stat); //changing variant VAR_DECL with VAR_DECL_90
-          continue;
-        }
-        // PROGRAM, SUBROUTINE, FUNCTION header
-        func = stat;
-        cur_func = func;
-
-            //scanning the Symbols Table of the function
-            //     ScanSymbTable(func->symbol(), (f->functions(i+1))->symbol());
-
-       // all_replicated= has_contains ? 0 : 1;
-    // translating the function
-    //     if(only_debug)
-    //        InsertDebugStat(func);
-    //     else
-    //        TransFunc(func);
-
-      }
-
-    */
-}
-
-
-void CallGraph(SgStatement *func)
-{
-    // Build a directed acyclic call multigrahp (call DAMG) 
-    // which represents calls between routines of the program
-    // which are to be (or not to be) expanded
-
-    SgStatement *stmt, *last, *data_stf, *first, *last_spec, *stam;
-    //SgExpression *e;
-    //SgStatement *task_region_parent, *on_parent, *mod_proc, *begbl;
-    //SgStatement *copy_proc = NULL;
-    SgLabel *lab_exec;
-
-    //int i;
-    //stmt_list *pstmt = NULL;
-    //initialization              
-    data_stf = NULL;
-
-    DECL(func->symbol()) = 1;
-    if (func->variant() == PROG_HEDR)
-        PROGRAM_HEADER(func->symbol()) = func->thebif;
-
-    //creating graph node for header of function (procedure, program)
-    cur_node = CreateGraphNode(func->symbol(), func);
-
-    first = func->lexNext();
-    //printf("\n%s  header_id= %d \n", func->symbol()->identifier(), func->symbol()->id());
-      //!!!debug
-      //if(fsymb)
-      //printf("\n%s   %s \n", header(func->variant()),fsymb->identifier()); 
-      //else {
-      //printf("Function name error  \n");
-      //return;
-      //}
-   //get the last node of the program unit(function) 
-    last = func->lastNodeOfStmt();
-    end_of_unit = last;
-    if (!(last->variant() == CONTROL_END))
-        printf(" END Statement is absent\n");
-
-    //**********************************************************************
-    //           Specification Directives Processing 
-    //**********************************************************************
-    // follow the statements of the function in lexical order
-    // until first executable statement
-    for (stmt = first; stmt && (stmt != last); stmt = stmt->lexNext()) {
-
-        if (!isSgExecutableStatement(stmt)) //is Fortran specification statement
-    // isSgExecutableStatement: 
-    //               FALSE  -  for specification statement of Fortan 90
-    //               TRUE   -  for executable statement of Fortan 90 and
-    //                         all directives of F-DVM 
-        {
-            //!!!debug
-                //  printVariantName(stmt->variant()); //for debug
-                //  printf("\n");
-
-
-            if ((stmt->variant() == DATA_DECL) || (stmt->variant() == STMTFN_STAT)) {
-                /* if(stmt->variant() == STMTFN_STAT && stmt->expr(0) && stmt->expr(0)->symbol() && ((!strcmp(stmt->expr(0)->symbol()->identifier(),"number_of_processors")) || (!strcmp(stmt->expr(0)->symbol()->identifier(),"processors_rank")) || (!strcmp(stmt->expr(0)->symbol()->identifier(),"processors_size")))){
-                        stmt=stmt->lexPrev();
-                        stmt->lexNext()->extractStmt();
-                                      //deleting the statement-function declaration named
-                                  //  NUMBER_OF_PROCESSORS or PROCESSORS_RANK or PROCESSORS_SIZE
-                        continue;
-                     }
-                   */
-                if (!data_stf)
-                    data_stf = stmt; //first statement in data-or-function statement part 
-                continue;
-            }
-            if (stmt->variant() == ENTRY_STAT) {
-                //err("ENTRY statement is not permitted in FDVM", stmt);  
-                //warn("ENTRY among specification statements", 81,stmt);  
-                continue;
-            }
-
-            continue;
-        }
-
-        if ((stmt->variant() == FORMAT_STAT))
-            continue;
-
-
-        // processing the DVM Specification Directives
-
-         /*   //including the DVM specification directive to list of these directives
-              pstmt = addToStmtList(pstmt, stmt);
-
-            switch(stmt->variant()) {
-
-               case(HPF_TEMPLATE_STAT):
-               case(HPF_PROCESSORS_STAT):
-               continue;
-           }
-        */
-        // all declaration statements are processed,
-        // current statement is executable (F77/DVM)
-
-        break;
-    }
-
-    //**********************************************************************
-    //              LibDVM References Generation
-    //           for distributed and aligned arrays
-    //**********************************************************************
-
-
-    first_exec = stmt; // first executable statement
-
-    lab_exec = first_exec->label(); // store the label of first ececutable statement 
-    last_spec = first_exec->lexPrev();//may be extracted after
-    where = first_exec; //before first executable statement will be inserted new statements
-    stam = NULL;
-
-
-    //**********************************************************************
-    //           Executable Directives Processing 
-    //**********************************************************************
-
-    //initialization
-    // . . .
-    //follow the executable statements in lexical order until last statement
-    // of the function
-
-    for (stmt = first_exec; stmt && (stmt != last); stmt = stmt->lexNext()) {  //for(stmt=first_exec;stmt ; stmt=stmt->lexNext()) 
-        cur_st = stmt;
-
-        switch (stmt->variant()) {
-
-        case ENTRY_STAT:
-            // !!!!!!!
-            break;
-
-        case CONTROL_END:
-        case STOP_STAT:
-        case PAUSE_NODE:
-        case GOTO_NODE:             // GO TO             
-            break;
-
-        case SWITCH_NODE:           // SELECT CASE ...
-        case ARITHIF_NODE:          // Arithmetical IF
-        case IF_NODE:               // IF... THEN
-        case WHILE_NODE:            // DO WHILE (...) 
-        case CASE_NODE:             // CASE ...
-        case ELSEIF_NODE:           // ELSE IF...
-        case LOGIF_NODE:            // Logical IF
-            FunctionCallSearch(stmt->expr(0));
-            break;
-
-        case COMGOTO_NODE:          // Computed GO TO
-        case OPEN_STAT:
-        case CLOSE_STAT:
-        case INQUIRE_STAT:
-        case BACKSPACE_STAT:
-        case ENDFILE_STAT:
-        case REWIND_STAT:
-            FunctionCallSearch(stmt->expr(1));
-            break;
-
-        case PROC_STAT: {           // CALL
-            SgExpression *el;
-#ifdef __SPF
-            if (needToInline.find(stmt->symbol()->identifier()) != needToInline.end())
-                Call_Site(stmt->symbol(), 1);
-            else
-                Call_Site(stmt->symbol(), 0);
-#else
-            Call_Site(stmt->symbol(), 1);
-#endif
-            // looking through the arguments list
-            for (el = stmt->expr(0); el; el = el->rhs())
-                Arg_FunctionCallSearch(el->lhs());   // argument
-        }
-                        break;
-
-        case ASSIGN_STAT:             // Assign statement
-        case WRITE_STAT:
-        case READ_STAT:
-        case PRINT_STAT:
-        case FOR_NODE:
-            FunctionCallSearch(stmt->expr(0));   // left part
-            FunctionCallSearch(stmt->expr(1));   // right part
-            break;
-
-        default:
-            break;
-        }
-
-    } // end of processing executable statement/directive 
-
-   //END_:
-       // for debugging
-    if (deb_reg > 1)
-        PrintGraphNode(cur_node);
-    return;
-}
-
-
-
-
-
-void Replace(SgStatement *stfun) {
-    SgSymbol *fname, *name;
-    fname = stfun->symbol();
-    SYMB_IDENT(fname->thesymb) = (char*)"DEBUG";
-    name = stfun->lexNext()->expr(0)->lhs()->symbol();
-    SYMB_IDENT(name->thesymb) = (char*)"dvdvdv";
-}
-
-/*
-void TransFunc(SgStatement *func) {
-  SgStatement *stmt,*last,*rmout, *data_stf, *first, *first_dvm_exec, *last_spec, *stam;
-  SgStatement *st_newv = NULL;// for NEW_VALUE directives
-  SgExpression *e;
-  SgStatement *task_region_parent, *on_parent, *mod_proc, *begbl;
-  SgStatement *copy_proc = NULL;
-  SgLabel *lab_exec;
-
-  int i;
-  int begin_block;
-  distribute_list *distr =  NULL;
-  distribute_list *dsl,*distr_last;
-  align *pal = NULL;
-  align *node, *root;
-  stmt_list *pstmt = NULL;
-  int inherit_is = 0;
-  int contains[2];
-           CallGraph(func);
-return;
-   if(func->variant() != PROG_HEDR){
-       stmt=func->copyPtr();
-       Replace(stmt);
-       func->insertStmtBefore(*stmt,*(func->controlParent()));
-   }
-   return;
-}
-*/
-
-
-
-void FunctionCallSearch(SgExpression *e)
-{
-    SgExpression *el;
-    if (!e)
-        return;
-
-    /*  if(isSgArrayRefExp(e)) {
-        for(el=e->lhs(); el; el=el->rhs())
-           FunctionCallSearch(el->lhs());
-
-        return;
-      }
-    */
-
-    if (isSgFunctionCallExp(e)) 
-    {
-#ifdef __SPF
-        if (needToInline.find(e->symbol()->identifier()) != needToInline.end())
-            Call_Site(e->symbol(), 1);
-        else
-            Call_Site(e->symbol(), 0);
-#else
-        Call_Site(e->symbol(), 1);
-#endif
-        for (el = e->lhs(); el; el = el->rhs())
-            Arg_FunctionCallSearch(el->lhs());
-        return;
-    }
-    FunctionCallSearch(e->lhs());
-    FunctionCallSearch(e->rhs());
-    return;
-}
-
-void Arg_FunctionCallSearch(SgExpression *e)
-{
-    FunctionCallSearch(e);
-    return;
-}
-
-void FunctionCallSearch_Left(SgExpression *e)
-{
-    FunctionCallSearch(e);
-}
-
-
-void Call_Site(SgSymbol *s, int inlined)
-{
-    graph_node * gnode;
-    //printf("\n%s  id= %d \n", s->identifier(), s->id());
-    if (!do_dummy  && isDummyArgument(s)) 
-        return;
-    if (!do_stmtfn && isStatementFunction(s)) 
-        return;
-    // if(isIntrinsicFunction(s)) return; 
- //printf("\nLINE %d", cur_st->lineNumber());
-    gnode = CreateGraphNode(s, NULL);
-    CreateOutcomingEdge(gnode, inlined); // for node 'cur_node' edge: [cur_node]-> gnode
-    CreateIncomingEdge(gnode, inlined); // for node 'gnode'    edge:  cur_node ->[gnode]
-}
-
-graph_node *CreateGraphNode(SgSymbol *s, SgStatement *header_st)
-{
-    graph_node * gnode;
-    graph_node **pnode = new (graph_node *);
-    gnode = NodeForSymbInGraph(s, header_st);
-    if (!gnode)
-        gnode = NewGraphNode(s, header_st);
-
-    *pnode = gnode;
-    if (!ATTR_NODE(s)) 
-    {
-        s->addAttribute(GRAPH_NODE, (void*)pnode, sizeof(graph_node *));
-        if (deb_reg > 1)
-            printf("attribute NODE[%d] for %s[%d]\n", GRAPHNODE(s)->id, s->identifier(), s->id());
-    }
-    return gnode;
-}
-
-graph_node *NodeForSymbInGraph(SgSymbol *s, SgStatement *stheader)
-{
-    graph_node *ndl;
-    for (ndl = node_list; ndl; ndl = ndl->next) 
-    {
-#ifdef __SPF
-        //TODO: improve this!
-        if (std::string(s->identifier()) == ndl->symb->identifier())
-        {
-            if (ndl->st_header == NULL)
-            {
-                ndl->st_header = stheader;
-                ndl->symb = s;
-            }
-            return ndl;
-        }
-#else
-        if (s == ndl->symb) 
-            return ndl;
-        if ((ndl->st_header == NULL) && !strcmp(ndl->symb->identifier(), s->identifier()) && (ndl->symb->scope() == s->scope()))
-        {
-            if (stheader)
-            {
-                ndl->st_header = stheader;
-                ndl->symb = s;
-            }
-            return ndl;
-        }
-#endif
-        /*  else   //if(s->thesymb->decl == NULL)
-        {   Err_g("Call graph error '%s' ", s->identifier(), 1);
-        (void) fprintf( stderr,"%s %d    %d  in line %d\n",s->identifier(),s->id(),ndl->symb->id(),cur_st->lineNumber());
-        }
-        */
-    }
-    return NULL;
-}
-
-graph_node *NewGraphNode(SgSymbol *s, SgStatement *header_st)
-{
-    graph_node * gnode;
-
-    gnode = new graph_node;
-    gnode->id = ++gcount;
-    gnode->next = node_list;
-    node_list = gnode;
-    gnode->file = current_file;
-    gnode->st_header = header_st;
-    gnode->symb = s;
-    gnode->to_called = NULL;
-    gnode->from_calling = NULL;
-    gnode->split = 0;
-    gnode->tmplt = 0;
-    gnode->clone = 0;
-    gnode->count = 0;
-    return(gnode);
-}
-
-edge *CreateOutcomingEdge(graph_node *gnode, int inlined)
-{
-    edge *out_edge, *edgl;
-    //SgSymbol *sunit;
-     //sunit = cur_func->symbol();
-
-     // testing outcoming edge list of current (calling) routine graph-node: cur_node 
-    for (edgl = cur_node->to_called; edgl; edgl = edgl->next)
-        if ((edgl->to->symb == gnode->symb) && (edgl->inlined == inlined)) //there is outcoming edge: [cur_node]->gnode 
-            return(edgl);
-    // creating new edge: [cur_node]->gnode 
-    out_edge = NewEdge(NULL, gnode, inlined);   //NULL -> cur_node
-    out_edge->next = cur_node->to_called;
-    cur_node->to_called = out_edge;
-    return(out_edge);
-}
-
-edge *CreateIncomingEdge(graph_node *gnode, int inlined)
-{
-    edge *in_edge, *edgl;
-    //SgSymbol *sunit;
-    //sunit = cur_func->symbol();
-
-    // testing incoming edge list of called routine graph-node: gnode 
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next)
-        if ((edgl->from->symb == cur_node->symb) && (edgl->inlined == inlined)) //there is incoming edge: : cur_node->[gnode] 
-            return(edgl);
-    // creating new edge: cur_node->[gnode]
-    in_edge = NewEdge(cur_node, NULL, inlined);   //NULL -> gnode
-    in_edge->next = gnode->from_calling;
-    gnode->from_calling = in_edge;
-    return(in_edge);
-}
-
-edge *NewEdge(graph_node *from, graph_node *to, int inlined)
-{
-    edge *nedg;
-    nedg = new edge;
-    nedg->from = from;
-    nedg->to = to;
-    nedg->inlined = inlined;
-    return(nedg);
-}
-/**********************************************************************/
-
-/*    Testing Functions                                               */
-
-/**********************************************************************/
-
-int isDummyArgument(SgSymbol *s)
-{
-    if (s->thesymb->entry.var_decl.local == IO)  // is dummy argument
-        return(1);
-    else
-        return(0);
-}
-
-int isHeaderStmtSymbol(SgSymbol *s)
-{
-    return(DECL(s) == 1 && (s->variant() == FUNCTION_NAME || s->variant() == PROCEDURE_NAME || s->variant() == PROGRAM_NAME));
-}
-
-int isStatementFunction(SgSymbol *s)
-{
-    if (s->scope() == cur_func && s->variant() == FUNCTION_NAME) 
-        return 1; //is statement function symbol
-    else 
-        return 0;
-}
-
-int isHeaderNode(graph_node *gnode)
-{
-    //header node represent a "top level" routine:
-    //main program, or any subprogram which was called 
-    //without inline expansion somewhere in the original program 
-    edge * edgl;
-#ifdef __SPF
-    if (needToInline.find(gnode->symb->identifier()) == needToInline.end())
-#else
-    if (gnode->symb->variant() == PROGRAM_NAME)
-#endif
-        return 1;
-
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next)
-        if (!edgl->inlined) 
-            return 1;
-    return 0;
-}
-
-int isDeadNode(graph_node *gnode)
-{
-    // dead node represent a "dead" routine:
-    // a subprogram which was not called
-#ifdef __SPF
-    if (gnode->from_calling || needToInline.find(gnode->symb->identifier()) == needToInline.end())
-#else
-    if (gnode->from_calling || gnode->symb->variant() == PROGRAM_NAME)
-#endif
-        return 0;
-    else
-        return 1;
-}
-
-int isNoBodyNode(graph_node *gnode)
-{
-    // nobody node represent a "nobody" routine: intrinsic or absent
-
-    if (gnode->st_header)
-        return(0);
-    else
-        return(1);
-}
-
-/**********************************************************************/
-stmt_list* addToStmtList(stmt_list *pstmt, SgStatement *stat)
-{
-    // adding the statement to the beginning of statement list 
-    // pstmt-> stat -> stmt-> ... -> stmt     
-    stmt_list * stl;
-    if (!pstmt) 
-    {
-        pstmt = new stmt_list;
-        pstmt->st = stat;
-        pstmt->next = NULL;
-    }
-    else 
-    {
-        stl = new stmt_list;
-        stl->st = stat;
-        stl->next = pstmt;
-        pstmt = stl;
-    }
-    return pstmt;
-}
-
-stmt_list* delFromStmtList(stmt_list *pstmt)
-{
-    // deletinging last statement from the statement list 
-    // pstmt-> stat -> stmt-> ... -> stmt
-    pstmt = pstmt->next;
-    return (pstmt);
-}
-
-
-graph_node_list* addToNodeList(graph_node_list *pnode, graph_node *gnode)
-{
-    // adding the node to the beginning of node list 
-    // pnode-> gnode -> gnode-> ... -> gnode     
-    graph_node_list * ndl;
-    if (!pnode) {
-        pnode = new graph_node_list;
-        pnode->node = gnode;
-        pnode->next = NULL;
-    }
-    else {
-        ndl = new graph_node_list;
-        ndl->node = gnode;
-        ndl->next = pnode;
-        pnode = ndl;
-    }
-    return (pnode);
-}
-
-graph_node_list* delFromNodeList(graph_node_list *pnode, graph_node *gnode)
-{
-    // deleting the node from the node list 
-
-    graph_node_list *ndl, *l;
-    if (!pnode) 
-        return NULL;
-
-    if (pnode->node == gnode) 
-        return pnode->next;
-    l = pnode;
-    for (ndl = pnode->next; ndl; ndl = ndl->next)
-    {
-        if (ndl->node == gnode)
-        {
-            l->next = ndl->next;
-            return pnode;
-        }
-        else
-            l = ndl;
-    }
-    return pnode;
-}
-
-graph_node_list  *isInNodeList(graph_node_list *pnode, graph_node *gnode)
-{
-    // testing: is there node in the node list 
-
-    graph_node_list * ndl;
-    if (!pnode) return (NULL);
-    for (ndl = pnode; ndl; ndl = ndl->next)
-    {
-        if (ndl->node == gnode)
-            return(ndl);
-    }
-    return (NULL);
-}
-
-
-void PrintGraphNode(graph_node *gnode)
-{
-    edge * edgl;
-    printf("%s(%d)  ->   ", gnode->symb->identifier(), gnode->symb->id());    
-    for (edgl = gnode->to_called; edgl; edgl = edgl->next)
-        printf("  %s(%d)", edgl->to->symb->identifier(), edgl->to->symb->id());
-    printf("\n");
-}
-
-void PrintGraphNodeWithAllEdges(graph_node *gnode)
-{
-    edge * edgl;
-    printf("\n");
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next)
-        printf("   %s(%d)", edgl->from->symb->identifier(), edgl->from->symb->id());
-    if (!gnode->from_calling)
-        printf("          ");
-    printf("   ->%s(%d)->   ", gnode->symb->identifier(), gnode->symb->id());
-    for (edgl = gnode->to_called; edgl; edgl = edgl->next)
-        printf("   %s(%d)", edgl->to->symb->identifier(), edgl->to->symb->id());
-}
-
-void PrintWholeGraph()
-{
-    graph_node *ndl;
-    printf("\n%s\n", "C a l l  G r a p h");
-    for (ndl = node_list; ndl; ndl = ndl->next)
-        PrintGraphNode(ndl);
-    printf("\n");
-    fflush(NULL);
-}
-
-void PrintWholeGraph_kind_2()
-{
-    graph_node *ndl;
-    printf("\nC a l l  G r a p h  2\n");
-    for (ndl = node_list; ndl; ndl = ndl->next)
-        PrintGraphNodeWithAllEdges(ndl);
-    printf("\n");
-    fflush(NULL);
-}
-
-
-void BuildingHeaderNodeList()
-{
-    //Build a list of header nodes to represent "top level" routines
-
-    graph_node *ndl;
-    if (deb_reg)
-        printf("\nH e a d e r   N o d e   L i s t\n");
-    for (ndl = node_list; ndl; ndl = ndl->next) {
-        if (isHeaderNode(ndl))
-        {
-            header_node_list = addToNodeList(header_node_list, ndl);
-            if (deb_reg)
-                printf("%s\n", ndl->symb->identifier());
-        }
-    }
-}
-
-void RemovingDeadSubprograms()
-{
-    //Prune the call graph by removing nodes representing "dead" subprogram
-
-    graph_node *ndl, *lnode;
-    int dead;
-    edge *edgl;
-
-    do
-    {
-        lnode = NULL; dead = 0;
-        for (ndl = node_list; ndl; ndl = ndl->next) {
-            if (isDeadNode(ndl)) //removing node ndl
-            {
-                if (deb_reg)
-                    printf("\n%s(%d)  dead  ", ndl->symb->identifier(), ndl->symb->id());
-                dead = 1;
-                //removing dead node from node_list
-                if (lnode)
-                    lnode->next = ndl->next;
-                else
-                    node_list = ndl->next;
-                //removing  edges that are incomig to any node from dead node 
-                for (edgl = ndl->to_called; edgl; edgl = edgl->next)
-                    DeleteIncomingEdgeFrom(edgl->to, ndl);
-                //removing the code of subpogram (extracting statements)
-                //?????????
-                //includind dead node in dead_node_list
-                dead_node_list = addToNodeList(dead_node_list, ndl);
-            }
-            else
-                lnode = ndl;
-        }
-    } while (dead == 1);
-
-    if (dead_node_list && deb_reg) {
-        graph_node_list *dl;
-        printf("\n%s\n", "D e a d   N o d e   L i s t");
-        for (dl = dead_node_list; dl; dl = dl->next)
-            printf("\n%s\n", dl->node->symb->identifier());
-    }
-}
-
-
-void NoBodySubprograms()
-{
-    //looking through the call graph for nodes representing "no body" subprogram: intrinsic or absent
-
-    graph_node *ndl, *lnode;
-    int empty;
-    edge *edgl;
-
-    do
-    {
-        lnode = NULL; empty = 0;
-        for (ndl = node_list; ndl; ndl = ndl->next) {
-            if (isNoBodyNode(ndl)) //removing node ndl
-            {
-                empty = 1;
-
-                //removing empty node from node_list
-                if (lnode)
-                    lnode->next = ndl->next;
-                else
-                    node_list = ndl->next;
-                //removing  edges that are incoming to empty node from any node 
-                for (edgl = ndl->from_calling; edgl; edgl = edgl->next)
-                    DeleteOutcomingEdgeTo(edgl->from, ndl);
-                //includind empty node in nobody_node_list
-                nobody_node_list = addToNodeList(nobody_node_list, ndl);
-
-            }
-            else
-                lnode = ndl;
-        }
-    } while (empty == 1);
-
-    if (nobody_node_list && deb_reg) {
-        graph_node_list *dl;
-        printf("\n\nN o  B o d y   N o d e   L i s t\n");
-        for (dl = nobody_node_list; dl; dl = dl->next)
-            printf("%s\n", dl->node->symb->identifier());
-    }
-    //deleting nobody nodes
-    //?????????? there are references to node from attribute(GRAPH_NODE) of symbols
-}
-
-void DeleteIncomingEdgeFrom(graph_node *gnode, graph_node *from)
-{
-    // deleting edge that is incoming to node 'gnode' from node 'from' 
-    edge *edgl, *ledge;
-    ledge = NULL;
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next) {
-        if (edgl->from == from) {
-            if (deb_reg > 1)
-                printf("\n%s(%d)-%s(%d) edge dead  ", from->symb->identifier(), from->symb->id(), gnode->symb->identifier(), gnode->symb->id());
-
-            if (ledge)
-                ledge->next = edgl->next;
-            else
-                gnode->from_calling = edgl->next;
-        }
-        else
-            ledge = edgl;
-    }
-}
-
-void DeleteOutcomingEdgeTo(graph_node *gnode, graph_node *gto)
-{
-    // deleting edge that is outcoming from node 'gnode' to node 'gto' 
-    edge *edgl, *ledge;
-    ledge = NULL;
-    for (edgl = gnode->to_called; edgl; edgl = edgl->next) {
-        if (edgl->to == gto) {
-            if (deb_reg > 1)
-                printf("\n%s(%d)-%s(%d) edge empty  ", gnode->symb->identifier(), gnode->symb->id(), gto->symb->identifier(), gto->symb->id());
-
-            if (ledge)
-                ledge->next = edgl->next;
-            else
-                gnode->to_called = edgl->next;
-        }
-        else
-            ledge = edgl;
-    }
-}
-
-
-void ScanSymbolTable(SgFile *f)
-{
-    SgSymbol *s;
-    for (s = f->firstSymbol(); s; s = s->next())
-        if (isHeaderStmtSymbol(s))
-            printSymb(s);
-}
-
-void ScanTypeTable(SgFile *f)
-{
-    SgType *t;
-    for (t = f->firstType(); t; t = t->next())
-    {   // printf("TYPE[%d] : ", t->id());
-        printType(t);
-    }
-}
-
-void ReseatEdges(graph_node *gnode, graph_node *newnode)
-{//reseat all edges representing inlined calls to gnode to point to newnode 
-    edge *edgl, *tol, *ledge, *curedg;
-    graph_node *from;
-    ledge = NULL;
-    // for(edgl=gnode->from_calling; edgl; edgl=edgl->next)
-// looking through the incoming edge list of gnode
-    edgl = gnode->from_calling;
-    while (edgl)
-    {
-        if (edgl->inlined)
-        {
-            from = edgl->from;
-            // reseating outcoming edge to 'gnode' to point to 'newnode'
-            for (tol = from->to_called; tol; tol = tol->next)
-                if (tol->to == gnode && tol->inlined)
-                {
-                    tol->to = newnode; break;
-                }
-            // removing "inlined" incoming edge of gnode
-            if (ledge)
-                ledge->next = edgl->next;
-            else
-                gnode->from_calling = edgl->next;
-
-            curedg = edgl;    // set curedg to point at removed edge  
-            edgl = edgl->next;  // to next node of list
-
-            // adding removed edge  to 'newnode' 
-            curedg->next = newnode->from_calling;
-            newnode->from_calling = curedg;
-
-        }
-        else
-        {
-            ledge = edgl;
-            edgl = edgl->next;
-        }
-    } //end while  
-}
-
-graph_node *SplittingNode(graph_node *gnode)
-{
-    if (!gnode->split)
-    { // . . . !!! new COMMON block and BLOCK DATA
-        gnode->split = 1;
-    }
-    if (deb_reg)
-        printf("\nSplitting NODE[%d]  %s\n", gnode->id, gnode->symb->identifier());
-
-    return (CloneNode(gnode));
-}
-
-graph_node *CloneNode(graph_node *gnode)
-{// Clone gnode to create a new node gnew
-    graph_node *gnew;
-    SgSymbol *scopy;
-    graph_node **pnode = new (graph_node *);
-    // copying subprogram, inserting after END statement of last subroutine of current file
-    scopy = &((gnode->symb)->copySubprogram(*(global_st)));    // copyAcrossFiles(*(cur_st)));
- // for debug
-    //printf(" \n****** BODY COPY FUNCTION(0) %s [%d] ********\n", scopy->identifier(), scopy->id());
-    //scopy->body()->unparsestdout(); 
-
- // creating new graph node 
-    gnew = NewGraphNode(scopy, scopy->body());
-    gnew->clone = 1;
-    // copying edges
-          //CopyIncomingEdges (gnode,gnew);
-    CopyOutcomingEdges(gnode, gnew);
-    // adding the attribute GRAPH_NODE to new symbol: scopy
-    *pnode = gnew;
-    scopy->addAttribute(GRAPH_NODE, (void*)pnode, sizeof(graph_node *));
-    if (deb_reg > 1)
-        printf("\n attribute NODE[%d] for %s[%d]  CLONE of NODE[%d]\n", GRAPHNODE(scopy)->id, scopy->identifier(), scopy->id(), gnode->id);
-
-    return(gnew);
-}
-
-void CopyOutcomingEdges(graph_node *gnode, graph_node *gnew)
-{
-    edge *out_edge, *in_edge, *edgl;
-    graph_node *s;
-    // looking through the outcoming edge list of gnode
-    for (edgl = gnode->to_called; edgl; edgl = edgl->next)
-    {
-        s = edgl->to; // successor of gnode
-  // creating new edge of gnew (copy of edgl)
-        out_edge = NewEdge(NULL, edgl->to, edgl->inlined);
-        out_edge->next = gnew->to_called;
-        gnew->to_called = out_edge;
-        // creating new edge of  s (successor  of gnode)
-        in_edge = NewEdge(gnew, NULL, edgl->inlined);
-        in_edge->next = s->from_calling;
-        s->from_calling = in_edge;
-    }
-    return;
-}
-
-void CopyIncomingEdges(graph_node *gnode, graph_node *gnew)
-{
-    edge *in_edge, *out_edge, *edgl;
-    graph_node *p;
-    // looking through the incoming edge list of gnode
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next)
-    {
-        p = edgl->from; // predecessor of gnode
-     // creating new edge of gnew (copy of edgl) 
-        in_edge = NewEdge(edgl->from, NULL, edgl->inlined);
-        in_edge->next = gnew->from_calling;
-        gnew->from_calling = in_edge;
-        // creating new edge of p (predecessor of gnode)
-        out_edge = NewEdge(NULL, gnew, edgl->inlined);
-        out_edge->next = p->to_called;
-        p->to_called = out_edge;
-
-    }
-    return;
-}
-
-void RemovingUninlinedEdges()
-{
-    // Removing all edges representing uninlined calls
-    graph_node *ndl;
-    edge  *edgl, *ledge;
-    for (ndl = node_list; ndl; ndl = ndl->next)
-    {
-        ledge = NULL;
-        // looking through the incoming edge list 
-        for (edgl = ndl->from_calling; edgl; edgl = edgl->next)
-        {
-            if (!edgl->inlined)
-            {//removing uninlined edge
-                if (ledge)
-                    ledge->next = edgl->next;
-                else
-                    ndl->from_calling = edgl->next;
-            }
-            else
-                ledge = edgl;
-        }
-        ledge = NULL;
-        // looking through the outcoming edge list 
-        for (edgl = ndl->to_called; edgl; edgl = edgl->next)
-        {
-            if (!edgl->inlined)
-            {//removing uninlined edge
-                if (ledge)
-                    ledge->next = edgl->next;
-                else
-                    ndl->to_called = edgl->next;
-            }
-            else
-                ledge = edgl;
-        }
-    }
-}
-
-
-/************************ P A R T I T I O N ************************************/
-void Partition()
-{
-    graph_node_list *ndl, *replication, *interval, *Ilist;
-    graph_node *hnode, *n, *s, *nnew;
-    edge *edg;
-    for (ndl = header_node_list; ndl; ndl = ndl->next)
-    {
-        hnode = ndl->node;
-        replication = NULL; interval = NULL;
-        interval = addToNodeList(interval, hnode);
-        hnode->Inext = NULL; DAG_list = hnode;
-
-        while (replication || unvisited_in(interval))
-        {//-------------------------------------------------------
-            do
-                for (Ilist = interval; Ilist; Ilist = Ilist->next)
-                {
-                    n = Ilist->node;
-                    if (n->visited == 1) continue;
-                    n->visited = 1;
-                    for (edg = n->to_called; edg; edg = edg->next)
-                    {
-                        s = edg->to;
-                        if (inInterval(s, interval)) continue;
-                        if (allPredecessorInInterval(s, interval))
-                        {
-                            interval = addToNodeList(interval, s);
-                            s->Inext = DAG_list; DAG_list = s;
-                            MoveEdgesPointTo(s);
-                            replication = delFromNodeList(replication, s);
-                        }
-                        else
-                        {
-                            if (!isInNodeList(replication, s))
-                                replication = addToNodeList(replication, s);
-                        }
-                    }
-                }
-            while (unvisited_in(interval));
-            //--------------------------------------------------------
-            for (Ilist = replication; Ilist; Ilist = Ilist->next)
-            {
-                n = Ilist->node;
-                replication = delFromNodeList(replication, n);
-                nnew = SplittingNode(n);
-                interval = addToNodeList(interval, n);
-                n->Inext = DAG_list; DAG_list = n;
-                ReseatEdgesOutsideToNew(n, nnew, interval);
-                MoveEdgesPointTo(n);
-            }
-        }
-    }
-    return;
-}
-
-int unvisited_in(graph_node_list *interval)
-{
-    graph_node_list *Ilist;
-    for (Ilist = interval; Ilist; Ilist = Ilist->next)
-        if (Ilist->node->visited == 0) return(1);
-    return(0);
-}
-
-int inInterval(graph_node *gnode, graph_node_list *interval)
-{
-    graph_node_list *Ilist;
-    for (Ilist = interval; Ilist; Ilist = Ilist->next)
-        if (Ilist->node == gnode) return(1);
-    return(0);
-}
-
-int allPredecessorInInterval(graph_node *gnode, graph_node_list *interval)
-{
-    edge *edg;
-    for (edg = gnode->from_calling; edg; edg = edg->next)
-        if (!inInterval(edg->from, interval)) return(0);
-    return(1);
-}
-
-void MoveEdgesPointTo(graph_node *gnode)
-{
-    edge *edg, *el;
-    for (edg = gnode->from_calling; edg; edg = edg->next)
-    {
-        edg->inlined = 2;
-        for (el = edg->from->to_called; el; el = el->next)
-            if (el->to == gnode)
-            {
-                el->inlined = 2; break;
-            }
-    }
-}
-
-void ReseatEdgesOutsideToNew(graph_node *gnode, graph_node *gnew, graph_node_list *interval)
-{//reseat all edges from nodes outside interval to 'gnode' to point to 'gnew' 
-    edge *edgl, *tol, *ledge, *curedg;
-    ledge = NULL;
-    //looking through the incoming edge list of 'gnode' 
-    edgl = gnode->from_calling;
-    while (edgl)
-        //for(edgl=gnode->from_calling; edgl; edgl=edgl->next)
-    {
-        if (inInterval(edgl->from, interval)) { ledge = edgl; edgl = edgl->next; continue; }
-        // reseating  outcoming edge to 'gnode' to point to 'gnew'
-        for (tol = edgl->from->to_called; tol; tol = tol->next)
-            if (tol->to == gnode)
-            {
-                tol->to = gnew; break;
-            }
-        // removing  incoming edge of 'gnode'
-        if (ledge)
-            ledge->next = edgl->next;
-        else
-            gnode->from_calling = edgl->next;
-
-        curedg = edgl;    // set curedg to point at removed edge  
-        edgl = edgl->next;  // to next node of list
-
-        // adding removed edge to 'gnew' 
-        curedg->next = gnew->from_calling;
-        gnew->from_calling = curedg;
-    }
-}
-
-#ifdef __SPF
-static void splitString(const string &strIn, const char delim, vector<string> &result)
-{
-    std::stringstream ss;
-    ss.str(strIn);
-
-    std::string item;
-    while (std::getline(ss, item, delim))
-        result.push_back(item);
-}
-
-void removeIncludeStatsAndUnparse(SgFile *file, const char *fileName, const char *fout)
-{
-    fflush(NULL);
-    int funcNum = file->numberOfFunctions();
-    FILE *currFile = fopen(fileName, "r");
-    if (currFile == NULL)
-    {        
-        printf("ERROR: Can't open file %s for read\n", fileName);
-        //addToGlobalBufferAndPrint(buf);
-        //throw(-1);
-    }
-
-    // name -> unparse comment
-    map<string, string> includeFiles;
-
-    // TODO: extend buff size in dynamic
-    char buf[8192];
-    while (!feof(currFile))
-    {
-        char *read = fgets(buf, 8192, currFile);
-        if (read)
-        {
-            string line(read);
-            size_t posF = line.find("include");
-            if (posF != string::npos)
-            {
-                posF += sizeof("include") - 1;
-                int tok = 0;
-                size_t st = -1, en;
-                for (size_t k = posF; k < line.size(); ++k)
-                {
-                    if (line[k] == '\'' && tok == 1)
-                        break;
-                    else if (line[k] == '\'')
-                        tok++;
-                    else if (tok == 1 && st == -1)
-                        st = k;
-                    else
-                        en = k;
-                }
-                string inclName(line.begin() + st, line.begin() + en + 1);
-
-                auto toInsert = includeFiles.find(inclName);
-                if (toInsert == includeFiles.end())
-                    includeFiles.insert(toInsert, make_pair(inclName, line));
-                //printf("insert %s -> %s\n", inclName.c_str(), line.c_str());
-            }
-        }
-    }
-
-    vector<string> needDel;
-
-    vector<SgStatement*> removeFunctions;
-    for (int i = 0; i < funcNum; ++i)
-    {
-        SgStatement *st = file->functions(i);
-        if (string(st->fileName()) != fileName)
-        {
-            removeFunctions.push_back(st);
-            continue;
-        }
-        SgStatement *lastNode = st->lastNodeOfStmt();
-
-        set<string> toInsert;
-        SgStatement *first = NULL;
-        bool start = false;
-
-        while (st != lastNode)
-        {
-            if (st == NULL)
-            {
-                printf("Internal error\n");
-                break;
-            }
-
-            if (strcmp(st->fileName(), fileName))
-            {
-                toInsert.insert(st->fileName());
-                start = true;
-            }
-            else if (start && first == NULL)
-                first = st;
-            st = st->lexNext();
-        }
-
-        for (auto it = toInsert.begin(); it != toInsert.end(); ++it)
-        {
-            auto foundIt = includeFiles.find(*it);
-            if (foundIt != includeFiles.end())
-            {
-                if (first)
-                {
-                    if (first->comments() == NULL)
-                        first->addComment(foundIt->second.c_str());
-                    else
-                    {
-                        const char *comments = first->comments();
-                        if (strstr(comments, foundIt->second.c_str()) == NULL)
-                            first->addComment(foundIt->second.c_str());
-                    }
-                }
-                else //TODO
-                    printf("Internal error\n");
-            }
-        }
-
-        // remove code from 'include' only from file, not from Sage structures
-        start = file->functions(i);
-        st = file->functions(i);
-        lastNode = st->lastNodeOfStmt();
-
-        while (st != lastNode)
-        {
-            if (st == NULL)
-            {
-                printf("Internal error\n");
-                break;
-            }
-
-            if (strcmp(st->fileName(), fileName))
-                splitString(st->unparse(), '\n', needDel);
-            st = st->lexNext();
-        }
-    }
-
-    for (int i = 0; i < removeFunctions.size(); ++i)
-        removeFunctions[i]->extractStmt();
-
-    FILE *fOut = fopen(fout, "w");
-    if (fOut == NULL)
-        printf("Internal error\n");
-    file->unparse(fOut);
-    fclose(fOut);
-
-    if (needDel.size() > 0)
-    {
-        fOut = fopen(fout, "r");
-
-        string currFile = "";
-        int idxDel = 0;
-        while (!feof(fOut))
-        {
-            fgets(buf, 8192, fOut);
-            const int len = strlen(buf);
-            if (len > 0)
-                buf[len - 1] = '\0';
-
-            if (needDel.size() > idxDel)
-            {
-                if (needDel[idxDel] == buf)
-                    idxDel++;
-                else
-                {
-                    currFile += buf;
-                    currFile += "\n";
-                }
-            }
-            else
-            {
-                currFile += buf;
-                currFile += "\n";
-            }
-        }
-        fclose(fOut);
-
-        fOut = fopen(fout, "w");
-        fwrite(currFile.c_str(), sizeof(char), currFile.length(), fOut);
-        fclose(fOut);
-    }
-}
-#endif
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/InlineExpansion/inline.h b/projects/dvm_svn/fdvm/trunk/InlineExpansion/inline.h
deleted file mode 100644
index 5f5e4c7..0000000
--- a/projects/dvm_svn/fdvm/trunk/InlineExpansion/inline.h
+++ /dev/null
@@ -1,643 +0,0 @@
-#include "user.h"
-
-#define MAXTAGS 1000
-#include "dvm_tag.h"
-
-
-#ifdef IN_M_
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-struct graph_node {
-       int id;   //a number of node
-       graph_node *next;
-       graph_node *next_header_node; //???
-       graph_node *Inext;
-       SgFile *file;      
-       SgStatement *st_header;
-       SgSymbol *symb;              //??? st_header->symbol()
-       struct edge *to_called;    //outcoming
-       struct edge *from_calling; //incoming
-       int split;     //flag
-       int tmplt;     //flag
-       int visited;   //flag for partition algorithm
-       int clone;    //flag is clone node
-       int count;    //counter of inline expansions
-};
-
-struct graph_node_list { 
-       graph_node_list *next;
-       graph_node *node;
-};
-
-struct edge {
-       edge *next;
-       graph_node *from;
-       graph_node *to;
-       int inlined; //1 - inlined, 0 - not inlined
-};
-
-struct edge_list {
-       edge_list *next;
-       edge *edg;
-};
-
-
-struct block_list {
-       block_list *next;
-       block_list *same_name;
-       SgExpression *block;
-};
-
-
-struct distribute_list {
-       distribute_list *next;
-       SgStatement *stdis;
-};
-
-struct stmt_list {
-       stmt_list *next;
-       SgStatement *st;
-};
-
-struct label_list {
-       label_list *next;
-       SgLabel *lab;
-       SgLabel *newlab;
-};
-
-struct dist_symb_list {
-       dist_symb_list *next;
-       SgSymbol *symb;
-};
-
-
-struct align {
-       SgSymbol * symb;
-       align * next;
-       align * alignees;
-       SgStatement * align_stmt;
-};
-struct mod_attr{
-       SgSymbol *symb;
-       SgSymbol *symb_list;
-};
-struct algn_attr {
-       int type;
-       align *ref;
-};
-struct rem_var {
-       int index;
-       int amv;
-       int ncolon;
-};
-struct rem_acc {
-       SgExpression *rml;
-       SgStatement *rmout;
-       int rmbuf_use[5];
-       rem_acc *next;
-};
-struct group_name_list {
-       group_name_list *next;
-       SgSymbol *symb;
-};
-struct symb_list {
-       symb_list *next;
-       SgSymbol *symb;
-};
-struct base_list {
-       base_list *next;
-       SgSymbol *type_symbol;
-       SgSymbol *base_symbol;
-};
-struct D_do_list {
-       D_do_list *next;
-       int No;
-       int num_line;
-       SgLabel *end_lab;
-       SgSymbol *do_var;
-};
-struct interval_list {
-       interval_list *prev;
-       int No;
-       SgStatement *begin_st;
-};
-struct D_fragment {
-       D_fragment *next;
-       int No;
-};
-
-struct fragment_list {
-       int No;
-       SgStatement *begin_st;
-       int dlevel;
-       int elevel;
-       int dlevel_spec;
-       int elevel_spec;
-       fragment_list *next;
-};
-struct fragment_list_in {
-       int N1;
-       int N2;
-       int level;
-       fragment_list_in *next;
-};
-struct reduction_list {
-       reduction_list *next;
-       int red_op;
-       SgExpression *red_var;
-       int ind;
-};
-struct IND_ref_list {
-       IND_ref_list *next;
-       SgExpression *rmref;
-       SgExpression *axis[7];
-       SgExpression *coef[7];
-       SgExpression *cons[7];
-       int nc;
-       int ind;
-};
-
-struct coeffs {
-       SgSymbol *sc[10];
-       int use;
-};
-
-struct heap_pointer_list {
-       heap_pointer_list *next;
-       SgSymbol *symb_heap;
-       SgSymbol *symb_p;
-};
-
-struct filename_list {
-       filename_list *next;
-       char *name;
-       SgSymbol *fns;
-};
-
-const int ROOT = 1;
-const int NODE = 2;
-const int GRAPH_NODE   = 1000;
-const int PRE_BOUND = 1001;
-const int CONSTANT_MAP = 1002;
-const int ARRAY_MAP = 1003;
-const int ARRAY_MAP_1 = 1004;
-const int ARRAY_MAP_2 = 1005;
-const int ADJUSTABLE_ = 1006;
-
-const int MAX_INTRINSIC_NUM =300;
-
-const int MAX_LOOP_LEVEL = 10; // 7 - maximal number of loops in parallel loop nest 
-const int MAX_LOOP_NEST = 25;  // maximal number of nested loops
-const int MAX_FILE_NUM = 100;  // maximal number of file reference in procedure
-const int SIZE_IO_BUF = 262144; //4185600;   // IO buffer size in elements
-const int ANTIDEP = 0;
-const int FLOWDEP = 1;
-#define FICT_INT  2000000000            /* -2147483648  0x7FFFFFFFL*/
-
-//enum{ Integer, Real, Double, Complex, Logical, DoubleComplex};
-enum {UNIT_,FMT_,REC_,ERR_,IOSTAT_,END_,NML_,EOR_,SIZE_,ADVANCE_};
-enum {U_,FILE_,STATUS_,ER_,IOST_,ACCESS_,FORM_,RECL_,BLANK_,EXIST_,
-OPENED_,NUMBER_,NAMED_,NAME_,SEQUENTIAL_,DIRECT_,NEXTREC_,FORMATTED_,
-UNFORMATTED_,POSITION_,ACTION_,READWRITE_,READ_,WRITE_,DELIM_,PAD_};
-
-enum {ICHAR, CHAR,INT,IFIX,IDINT,FLOAT,REAL,SNGL,DBLE,CMPLX,DCMPLX,AINT,DINT,ANINT,DNINT,NINT,IDNINT,ABS,IABS,DABS,CABS,
-      MOD,AMOD,DMOD, SIGN,ISIGN, DSIGN, DIM,IDIM,DDIM, MAX,MAX0, AMAX1,DMAX1, AMAX0,MAX1, MIN,MIN0,
-      AMIN1,DMIN1,AMIN0,MIN1,LEN,INDEX,AIMAG,DIMAG,CONJG,DCONJG,SQRT,DSQRT,CSQRT,EXP,DEXP,CEXP,LOG,ALOG,DLOG,CLOG,
-      LOG10,ALOG10,DLOG10,SIN,DSIN,CSIN,COS,DCOS,CCOS,TAN,DTAN,ASIN,DASIN,ACOS,DACOS,ATAN,DATAN,
-      ATAN2,DATAN2,SINH,DSINH,COSH,DCOSH,TANH,DTANH, LGE,LGT,LLE,LLT};
-//universal: ANINT,NINT,ABS,  MOD,SIGN,DIM,MAX,MIN,SQRT,EXP,LOG,LOG10,SIN,COS,TAN,ASIN,ACOS,ATAN,ATAN2,SINH,COSH,TANH
-//enum {SIZE,LBOUND,UBOUND,LEN,CHAR,KIND,F_INT,F_REAL,F_CHAR,F_LOGICAL,F_CMPLX}; //intrinsic functions of Fortran 90
-
-const int Integer = 0;
-const int Real = 1;
-const int Double = 2;
-const int Complex = 3;
-const int Logical = 4;
-const int DComplex = 5;
-
-
-
-#define ATTR_NODE(A) ((graph_node **)(A)->attributeValue(0,GRAPH_NODE))
-#define GRAPHNODE(A) (*((graph_node **)(A)->attributeValue(0,GRAPH_NODE)))
-#define PREBOUND(A) ((SgExpression **)(A)->attributeValue(0,PRE_BOUND))
-#define ARRAYMAP(A) ((SgExpression *)(A)->attributeValue(0,ARRAY_MAP_1))
-#define ARRAYMAP2(A) ((SgExpression *)(A)->attributeValue(0,ARRAY_MAP_2))
-#define CONSTANTMAP(A) ((SgExpression *)(A)->attributeValue(0,CONSTANT_MAP))
-#define ADJUSTABLE(A) ((SgExpression *)(A)->attributeValue(0,ADJUSTABLE_))
-
-
-#define HEADER(A)  ((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,ARRAY_HEADER))
-#define INDEX(A) (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,ARRAY_HEADER)))
-#define DVM000(N)   (new SgArrayRefExp(*dvmbuf, *new SgValueExp(N)))  
-#define SH_GROUP(S)  (*((int *) (S) -> attributeValue(0, SHADOW_GROUP_IND)))
-#define RED_GROUP(S)  (*((int *) (S) -> attributeValue(0, RED_GROUP_IND)))
-#define SHADOW_(A) ((SgExpression **)(ORIGINAL_SYMBOL(A))->attributeValue(0,SHADOW_WIDTH))
-#define POINTER_DIR(A) ((SgStatement **)(ORIGINAL_SYMBOL(A))->attributeValue(0,POINTER_))
-#define DISTRIBUTE_DIRECTIVE(A) ((SgStatement **)(ORIGINAL_SYMBOL(A))->attributeValue(0,DISTRIBUTE_))
-#define ARRAY_BASE_SYMBOL(A) ((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,ARRAY_BASE))
-#define INDEX_SYMBOL(A) ((SgSymbol **)(A)->attributeValue(0,INDEX_DELTA))
-#define INIT_LOOP_VAR(A) ((SgSymbol **)(A)->attributeValue(0,INIT_LOOP))
-#define CONSISTENT_HEADER(A) (*((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,CONSISTENT_ARRAY_HEADER)))
-#define POINTER_INDEX(A) (*((int *)(A)->attributeValue(0,HEAP_INDEX)))
-#define BUFFER_INDEX(A) (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,BUFFER_COUNT)))
-#define BUFFER_COUNT_PLUS_1(A) (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,BUFFER_COUNT))) =  (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,BUFFER_COUNT)))+1;
-#define PS_INDEX(A) (*((int *)(A)->attributeValue(0,TASK_INDEX)))
-#define DEBUG_INDEX(A) (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,DEBUG_AR_INDEX)))
-#define TASK_SYMBOL(A) (*((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,TSK_SYMBOL)))
-#define AR_COEFFICIENTS(A)  ((coeffs *) (ORIGINAL_SYMBOL(A))->attributeValue(0,ARRAY_COEF))
-#define MAX_DVM   maxdvm = (maxdvm < ndvm) ? ndvm-1 : maxdvm  
-#define FREE_DVM(A)  maxdvm = (maxdvm < ndvm) ? ndvm-1 : maxdvm;  ndvm-=A  
-#define SET_DVM(A)   maxdvm = (maxdvm < ndvm) ? ndvm-1 : maxdvm;  ndvm=A  
-#define FREE_HPF(A)  maxhpf = (maxhpf < nhpf) ? nhpf-1 : maxhpf;  nhpf-=A  
-#define SET_HPF(A)   maxhpf = (maxhpf < nhpf) ? nhpf-1 : maxhpf;  nhpf=A  
-#define HPF000(N)   (new SgArrayRefExp(*hpfbuf, *new SgValueExp(N)))  
-#define IS_DUMMY(A)  ((A)->thesymb->entry.var_decl.local == IO) 
-#define IS_TEMPLATE(A)  ((A)->attributes() & TEMPLATE_BIT) 
-#define IN_COMMON(A)  ((A)->attributes() & COMMON_BIT) 
-#define IN_DATA(A)  ((A)->attributes() & DATA_BIT) 
-#define IN_EQUIVALENCE(A)  ((A)->attributes() & EQUIVALENCE_BIT) 
-#define IS_ARRAY(A)  ((A)->attributes() & DIMENSION_BIT)
-#define IS_ALLOCATABLE(A)  ((A)->attributes() & ALLOCATABLE_BIT) 
-#define IS_ALLOCATABLE_POINTER(A)  (((A)->attributes() & ALLOCATABLE_BIT) || ((A)->attributes() & POINTER_BIT))
-#define IS_POINTER_F90(A)  ((A)->attributes() & POINTER_BIT) 
-#define CURRENT_SCOPE(A)  (((A)->scope() == cur_func) && ((A)->thesymb->entry.var_decl.local != BY_USE) )
-#define IS_BY_USE(A)  ((A)->thesymb->entry.Template.base_name != 0) 
-/*#define ORIGINAL_SYMBOL(A) (OriginalSymbol(A)) */
-#define ORIGINAL_SYMBOL(A) (IS_BY_USE(A) ? (A)->moduleSymbol() : (A))
-#define IS_SAVE(A) (((A)->attributes() & SAVE_BIT) || (saveall && !IS_TEMPLATE(A) && !IN_COMMON(A) && !IS_DUMMY(A)) )
-#define IS_POINTER(A)  ((A)->attributes() & DVM_POINTER_BIT) 
-#define IS_SH_GROUP_NAME(A) ((A)->variant() == SHADOW_GROUP_NAME)
-#define IS_RED_GROUP_NAME(A) ((A)->variant() == REDUCTION_GROUP_NAME)
-#define IS_GROUP_NAME(A) (((A)->variant() == SHADOW_GROUP_NAME) || ((A)->variant() == REDUCTION_GROUP_NAME) || ((A)->variant() == REF_GROUP_NAME)) 
-#define IS_DVM_ARRAY(A) (((A)->attributes() & DISTRIBUTE_BIT) || ((A)->attributes() & ALIGN_BIT) || ((A)->attributes() & INHERIT_BIT))
-#define IS_DISTR_ARRAY(A) (((A)->attributes() & DISTRIBUTE_BIT) || ((A)->attributes() & ALIGN_BIT) || ((A)->attributes() & INHERIT_BIT))
-#define IN_MODULE (cur_func->variant() == MODULE_STMT)
-#define IN_MAIN_PROGRAM (cur_func->variant() == PROG_HEDR)
-#define DVM_PROC_IN_MODULE(A) ((mod_attr *)(A)->attributeValue(0,MODULE_STR))
-#define LINE_NUMBER_BEFORE(ST,WHERE)     doAssignStmtBefore(new SgValueExp((ST)->lineNumber()),WHERE); ndvm--; InsertNewStatementBefore((many_files ? D_FileLine(ndvm,ST) : D_Lnumb(ndvm)) ,WHERE)
-#define LINE_NUMBER_STL_BEFORE(STL,ST,WHERE)     doAssignStmtBefore(new SgValueExp((ST)->lineNumber()),WHERE); ndvm--; InsertNewStatementBefore(STL= (many_files ? D_FileLine(ndvm,ST) :  D_Lnumb(ndvm)),WHERE)
-#define LINE_NUMBER_AFTER(ST,WHERE)   InsertNewStatementAfter ((many_files ? D_FileLine(ndvm,ST) : D_Lnumb(ndvm)),WHERE,(WHERE)->controlParent());  doAssignStmtBefore(new SgValueExp((ST)->lineNumber()),cur_st); ndvm--
-#define LINE_NUMBER_N_AFTER(N,WHERE,CP)  InsertNewStatementAfter((many_files ? D_FileLine(ndvm,CP): D_Lnumb(ndvm)),WHERE,CP);  doAssignStmtBefore(new SgValueExp(N),cur_st); ndvm--
-#define LINE_NUMBER_NEXP_AFTER(NE,WHERE,CP)  InsertNewStatementAfter((many_files ? D_DummyFileLine(ndvm,"dvm_check"): D_Lnumb(ndvm)),WHERE,CP);  doAssignStmtBefore((NE),cur_st); ndvm--
-#define ALIGN_RULE_INDEX(A) ((int*)(A)->attributeValue(0,ALIGN_RULE))
-#define INTERVAL_LINE  (St_frag->begin_st->lineNumber())
-#define INTERVAL_NUMBER  (St_frag->No)
-#define GROUP_REF(S,I) (new SgArrayRefExp(*(S),*new SgValueExp(I)))
-#define IS_DO_VARIABLE_USE(E) ((SgExpression **)(E)->attributeValue(0,DO_VARIABLE_USE))
-#define HEADER_SIZE(A) (1+(maxbuf+1)*2*(Rank(A)+1))
-#define HSIZE(R) (2*R + 2)
-#define ARRAY_ELEMENT(A,I)  (new SgArrayRefExp(*A, *new SgValueExp(I)))
-#define INTEGER_VALUE(E,C) ((E)->variant() == INT_VAL && (E)->valueInteger() == (C))
-#define IS_INTRINSIC_TYPE(T) (!TYPE_RANGES((T)->thetype) && !TYPE_KIND_LEN((T)->thetype) && ((T)->variant() != T_DERIVED_TYPE))
-
-//----------------------------------------------------------------------------------------
-
-#define DECL(A)  ((A)->thesymb->decl) 
-#define HEDR(A)  ((A)->thesymb->entry.Template.func_hedr)
-#define PROGRAM_HEADER(A) ((A)->thesymb->entry.prog_decl.prog_hedr)
-
-#define NON_CONFORMABLE   0
-#define _IDENTICAL_       1
-#define _CONSTANT_        2
-#define _ARRAY_           3
-#define SCALAR_ARRAYREF   4
-#define VECTOR_ARRAYREF   5
-#define _SUBARRAY_        6
-         
-EXTERN SgConstantSymb *Iconst[10];
-EXTERN const char *tag[MAXTAGS];
-EXTERN int ndvm;  // index for buffer array 'dvm000'	
-EXTERN int maxdvm;  //  size of array 'dvm000' 
-EXTERN int loc_distr;
-EXTERN int send;  //set to 1 if I/O statement require 'send' operation
-EXTERN char *fin_name; //input file name
-EXTERN SgFile *current_file;    //current file
-EXTERN SgStatement *where;//used in doAssignStmt: new statement is inserted before 'where' statement
-EXTERN int nio;
-EXTERN SgSymbol *bufIO[6];
-EXTERN SgSymbol *loop_var[8]; // for generatig DO statements
-
-
-EXTERN SgStatement *par_do;  // first DO statement of current parallel loop  
-EXTERN int iplp; //dvm000 element number for storing ParLoopRef
-EXTERN int irg;  //dvm000 element number for storing RedGroupRef
-EXTERN int irgts;  //dvm000 element number for storing RedGroupRef(task_region)
-EXTERN int idebrg;  //dvm000 element number for storing DebRedGroupRef
-EXTERN SgExpression *redgref; // reduction group reference
-EXTERN SgExpression *redgrefts; // reduction group reference for TASK_REGION
-EXTERN SgExpression *debredgref; // debug reduction group reference
-EXTERN SgExpression *red_list; // reduction operation list in FDVM program
-EXTERN SgExpression *task_red_list; // reduction operation list (in TASK_REGION directive)
-EXTERN int iconsg;  //dvm000 element number for storing ConsistGroupRef
-EXTERN int iconsgts;  //dvm000 element number for storing ConsistGroupRef(task_region)
-EXTERN int idebcg;  //dvm000 element number for storing DebRedGroupRef
-EXTERN SgExpression *consgref; // consistent group reference
-EXTERN SgExpression *consgrefts; // consistent group reference for TASK_REGION
-EXTERN SgExpression *debconsgref; // debug reduction(consistent) group reference
-EXTERN SgExpression *cons_list; // consistent array list in FDVM program
-EXTERN SgExpression *task_cons_list; // consistent array list (in TASK_REGION directive)
-EXTERN SgLabel *end_lab, *begin_lab; //labels for parallel loop nest
-EXTERN D_do_list *cur_do;
-EXTERN D_do_list *free_list;
-EXTERN int Dloop_No;
-EXTERN int pardo_No;
-EXTERN int taskreg_No;
-EXTERN int pardo_line;
-EXTERN int D_end_do;
-EXTERN int nfrag ; //counter of intervals for performance analizer 
-EXTERN interval_list *St_frag ;
-EXTERN interval_list *St_loop_first;
-EXTERN interval_list *St_loop_last;
-EXTERN int perf_analysis ; //set to 1 by -e1
-EXTERN int close_loop_interval;
-EXTERN stmt_list *goto_list;
-EXTERN int len_int; //set by option -bind
-EXTERN int len_long;//set by option -bind
-EXTERN int bind;//set by option -bind
-EXTERN int dvm_debug ;   //set to 1 by -d1  or -d2 or -d3 or -d4 flag
-EXTERN int only_debug ;  //set to 1 by -s flag
-EXTERN int level_debug ; //set to 1 by -d1, to 2 by -d2, ...
-EXTERN fragment_list_in *debug_fragment; //set by option -d
-EXTERN fragment_list_in *perf_fragment; //set by option -e
-EXTERN int debug_regim; //set by option -d
-EXTERN int check_regim; //set by option -dc
-EXTERN int dbg_if_regim; //set by option -dbif
-EXTERN  int IOBufSize; //set by option -bufio
-EXTERN SgSymbol *dbg_var;
-EXTERN int HPF_program;
-EXTERN int rmbuf_size[6];
-EXTERN int first_time;
-EXTERN SgStatement *indep_st; //first INDEPENDENT directive of loop nest
-EXTERN SgStatement *ins_st1, *ins_st2; // for INDEPENDENT loop
-EXTERN SgSymbol *DoVar[MAX_LOOP_NEST], **IND_var, **IEX_var;
-EXTERN int iarg; // for INDEPENDENT loop
-//---------------------------------------------------------------------
-EXTERN int errcnt;  // counter of errors in file 
-EXTERN graph_node *first_node, *node_list, *first_header_node, *cur_node, *DAG_list, *top_node; 
-EXTERN graph_node_list  *all_node_list, *header_node_list, *dead_node_list, *nobody_node_list;
-EXTERN SgStatement *cur_func;  // current function
-EXTERN SgSymbol *cur_symb, *top_symb_list, *sub_symb_list;
-EXTERN int do_dummy, do_stmtfn; // flag for building call graph: by default do_dummy=0, do_stmtfn=0
-EXTERN int gcount;
-EXTERN SgStatement *cur_st;  // current statement  (for inserting)
-EXTERN SgStatement *global_st;  // first statement of file (global_bfnd)
-EXTERN stmt_list *entryst_list;
-//EXTERN stmt_list  *DATA_list;
-EXTERN int max_lab;  // maximal  label in file
-EXTERN int num_lab;  // maximal(last)  new  label
-EXTERN int vcounter;
-EXTERN SgStatement *top_header, *top_last,* top_first_executable,*top_last_declaration, *top_global;
-EXTERN label_list *format_labels, *top_labels, *proc_labels; 
-EXTERN SgSymbol *do_var[10];
-EXTERN symb_list *top_temp_vars;
-EXTERN block_list *common_list, *common_list_l, *equiv_list, *equiv_list_l;
-EXTERN block_list *top_common_list, *top_common_list_l, *top_equiv_list, *top_equiv_list_l;
-EXTERN int modified;
-EXTERN int intrinsic_type[MAX_INTRINSIC_NUM];
-EXTERN const char *intrinsic_name[MAX_INTRINSIC_NUM];
-EXTERN int deb_reg, with_cmnt;
-//---------------------------------------------------------------------
-/*  inl_exp.cpp   */
-void initialize();
-void InlinerDriver(SgFile *f);
-void CallGraph(SgStatement *func);
-void initVariantNames();
-int isDummyArgument(SgSymbol *s);
-int isStatementFunction(SgSymbol *s);
-void FunctionCallSearch(SgExpression *e);
-void FunctionCallSearch_Left(SgExpression *e);
-void Arg_FunctionCallSearch(SgExpression *e);
-stmt_list  *addToStmtList(stmt_list *pstmt, SgStatement *stat);
-stmt_list  *delFromStmtList(stmt_list *pstmt);
-graph_node_list  *addToNodeList(graph_node_list *pnode, graph_node *gnode);
-graph_node_list  *delFromNodeList(graph_node_list *pnode, graph_node *gnode);
-graph_node_list  *isInNodeList(graph_node_list *pnode, graph_node *gnode);
-graph_node *CreateGraphNode(SgSymbol *s, SgStatement *header_st);
-graph_node *NewGraphNode(SgSymbol *s, SgStatement *header_st);
-void PrintGraphNode(graph_node *gnode);
-void PrintGraphNodeWithAllEdges(graph_node *gnode);
-void PrintWholeGraph();
-void PrintWholeGraph_kind_2 ();
-graph_node *NodeForSymbInGraph(SgSymbol *s, SgStatement *stheader);
-void Call_Site(SgSymbol *s, int inlined);
-edge *CreateOutcomingEdge(graph_node *gnode, int inlined);
-edge *CreateIncomingEdge(graph_node *gnode, int inlined);
-edge *NewEdge(graph_node *from, graph_node *to, int inlined);
-void BuildingHeaderNodeList();
-void RemovingDeadSubprograms();
-int isHeaderNode(graph_node *gnode);
-int isDeadNode(graph_node *gnode);
-int isHeaderStmtSymbol(SgSymbol *s);
-void DeleteIncomingEdgeFrom(graph_node *gnode, graph_node *from);
-void ScanSymbolTable(SgFile *f);
-void NoBodySubprograms();
-void DeleteOutcomingEdgeTo(graph_node *gnode, graph_node *gto);
-int isNoBodyNode(graph_node *gnode);
-void ReseatEdges(graph_node *gnode, graph_node *newnode);
-graph_node *SplittingNode(graph_node *gnode);
-graph_node *CloneNode(graph_node *gnode);
-void CopyOutcomingEdges(graph_node *gnode, graph_node *gnew);
-void CopyIncomingEdges (graph_node *gnode, graph_node *gnew);
-void RemovingUninlinedEdges();
-void Partition();
-void MoveEdgesPointTo(graph_node *gnode);
-int unvisited_in(graph_node_list *interval);
-int inInterval(graph_node *gnode,graph_node_list *interval);
-int allPredecessorInInterval(graph_node *gnode,graph_node_list *interval);
-void ReseatEdgesOutsideToNew(graph_node *gnode, graph_node *gnew,graph_node_list *interval);
-void initIntrinsicNames();
-
-
-/*  hlp.cpp */
-SgLabel *  firstLabel(SgFile *f);
-int isLabel(int num) ;
-SgLabel * GetLabel();
-SgLabel * GetNewLabel();
-SgLabel * NewLabel();
-//SgLabel * NewLabel(int lnum);
-const char* header(int i);
-char *UnparseExpr(SgExpression *e) ;
-void printVariantName(int i);
-void Error(const char *s, const char *t, int num, SgStatement *stmt);
-void err(const char *s, int num, SgStatement *stmt);
-void Err_g(const char *s, const char *t, int num);
-void Warning(const char *s, const char *t, int num, SgStatement *stmt);
-void warn(const char *s, int num, SgStatement *stmt);
-void Warn_g(const char *s, const char *t, int num);
-void errN(const char *s, int num, SgStatement *stmt);
-void format_num (int num, char num3s[]);
-SgExpression *ConnectList(SgExpression *el1, SgExpression *el2);
-int is_integer_value(char *str);
-void PrintSymbolTable(SgFile *f);
-void printSymb(SgSymbol *s);
-void printType(SgType *t);
-void PrintTypeTable(SgFile *f);
-int isSymbolNameInScope(char *name, SgStatement *scope);
-int isSymbolName(char *name);
-SgExpression *ReplaceIntegerParameter(SgExpression *e);
-void SetScopeOfLabel(SgLabel *lab, SgStatement *scope);
-SgLabel *isLabelWithScope(int num, SgStatement *stmt) ;
-SgExpression *UpperBound(SgSymbol *ar, int i);
-SgExpression *LowerBound(SgSymbol *ar, int i);
-int Rank (SgSymbol *s);
-symb_list  *AddToSymbList ( symb_list *ls, SgSymbol *s);
-void MakeDeclarationForTempVarsInTop();
-SgExpression *Calculate(SgExpression *er);
-int ExpCompare(SgExpression *e1, SgExpression *e2);
-SgExpression *Calculate_List(SgExpression *e);
-
-
-/* inliner.cpp  */
-void Inliner(graph_node *gtop);
-void EntryPointList(SgFile *file);
-void IntegerConstantSubstitution(SgStatement *header);
-int isIntrinsicFunctionName(char *name);
-char *ChangeIntrinsicFunctionName(char *name);
-void RoutineCleaning(SgStatement *header);
-void StatementCleaning(SgStatement *stmt);
-SgSymbol *SearchFunction(SgExpression *e,SgStatement *stmt);
-SgSymbol *PrecalculateFtoVar(SgExpression *e,SgStatement *stmt);
-void PrecalculateActualParameters(SgSymbol *s,SgExpression *e,SgStatement *stmt);
-void PrecalculateExpression(SgSymbol *sp,SgExpression *e,SgStatement *stmt);
-void InsertNewStatementBefore (SgStatement *stat, SgStatement *current);
-void InsertNewStatementAfter (SgStatement *stat, SgStatement *current, SgStatement *cp);
-int ParameterType(SgExpression *e,SgStatement *stmt);
-int TestSubscripts(SgExpression *e,SgStatement *stmt);
-int TestRange(SgExpression *e,SgStatement *stmt);
-SgSymbol *GetTempVarForF(SgSymbol *sf, SgType *t);
-SgSymbol *GetTempVarForArg(int i, SgSymbol *sf, SgType *t);
-SgSymbol *GetTempVarForSubscr(SgType *t);
-SgSymbol *GetTempVarForBound(SgSymbol *sa);
-SgStatement *InlineExpansion(graph_node *gtop, SgStatement *stmt, SgSymbol *sf, SgExpression *args);
-int isInSymbolTable(SgSymbol *sym);
-SgStatement * CreateTemplate(graph_node *gnode);
-void SiteIndependentTransformation(graph_node *gnode); //(SgStatement *header);
-void MoveToTopOfRoutine(SgStatement *entrystmt, SgStatement *first_executable);
-void LogIf_to_IfThen(SgStatement *stmt);
-void MoveToTopOfRoutine(SgStatement *entrystmt, SgStatement *first_executable);
-SgStatement *ReplaceByGoToBottomOfRoutine(SgStatement *retstmt, SgLabel *lab_return);
-void MoveFormatToTopOfRoutine(SgStatement *format_stmt, SgStatement *last_declaration);
-int TestFormatLabel(SgLabel *lab);
-int isInlinedCall(graph_node *gtop, graph_node *gnode);
-void ReplaceReturnByContinue(SgStatement *return_st);
-SgStatement *MoveFormatIntoTopLevel(SgStatement *format_stmt, int clone);
-graph_node *getNodeForSymbol(graph_node *gtop,char *name);
-int isInlinedCallSite(SgStatement *stmt);
-graph_node *getAttrNodeForSymbol(SgSymbol *sf);
-label_list  *addToLabelList(label_list *lablist, SgLabel *lab);
-int isInLabelList(SgLabel *lab, label_list *lablist);
-void ReplaceFormatLabelsInStmts(SgStatement *header);
-int isLabelOfTop(SgLabel *lab);
-void LabelList(SgStatement *header);
-SgLabel *isInFormatMap(SgLabel *lab);
-void SetScopeToLabels(SgStatement *header);
-void AdjustableArrayBounds(SgStatement *header, SgStatement *after);
-int isAdustableBound(SgExpression *bound);
-int SearchVarRef(SgExpression *e);
-void PrecalculateArrayBound(SgSymbol *ar,SgExpression *bound, SgStatement *after, SgStatement *header);
-void ReplaceWholeArrayRefInIOStmts(SgStatement *header);
-SgExpression *ImplicitLoop(SgSymbol *ar);
-SgSymbol *GetImplicitDoVar(int j);
-SgExpression * LowerLoopBound(SgSymbol *ar, int i);
-SgExpression * UpperLoopBound(SgSymbol *ar, int i);
-void RemapLocalVariables(SgStatement *header);
-SgSymbol *CreateListOfLocalVariables(SgStatement *header);
-void MakeDeclarationStmtInTop(SgSymbol *s);
-SgSymbol *NextSymbol(SgSymbol *s);
-SgSymbol *GetNewTopSymbol(SgSymbol *s);
-int isInTopSymbList(SgSymbol *sym);
-SgSymbol *GetImplicitDoVar(int j);
-char *NewName(char *name);
-SgSymbol *isTopName(char *name);
-SgSymbol *isTopNameOfType(char *name, SgType *type);
-void ReplaceIntegerParameterInTypeOfVars(SgStatement *header, SgStatement *last);
-void ReplaceIntegerParameter_InType(SgType *t);
-void MakeDeclarationStmtsForConstant(SgSymbol *s);
-void RemapFunctionResultVar(SgExpression *topref, SgSymbol *sf);
-SgStatement *TranslateSubprogramReferences(SgStatement *header);
-//void TranslateExpression(SgExpression * e, int md[]);
-SgExpression *TranslateExpression(SgExpression * e, int *md);
-SgSymbol *SymbolMap(SgSymbol *s);
-void InsertBlockAfter(SgStatement *after, SgStatement *first, SgStatement *last);
-void ExtractSubprogramsOfCallGraph(graph_node *gtop);
-int CompareConstants(SgSymbol *rs, SgSymbol *ts);
-void RemapConstants(SgStatement *header,SgStatement *first_exec);
-void RemapLocalObject(SgSymbol *s);
-void CommonBlockList(SgStatement *stmt);
-void TopCommonBlockList(SgStatement *stmt);
-block_list *AddToBlockList(block_list *blist_last, SgExpression *eb);
-void EquivBlockList(SgStatement *stmt);
-void TranslateExpression_1(SgExpression *e);
-void TranslateExpressionList(SgExpression *e) ;
-SgStatement *DeclaringCommonBlock(SgExpression *bl);
-void RemapCommonBlocks(SgStatement *header);
-int isUnconflictingCommon(SgSymbol *s);
-block_list *isConflictingCommon(SgSymbol *s);
-SgType *BaseType(SgType *type);
-block_list *isInCommonList(SgSymbol *s, block_list *blc );
-int areOfSameType(SgSymbol *st, SgSymbol *sr);
-int IntrinsicTypeSize(SgType *t);
-int TypeSize(SgType *t);
-int TypeLength(SgType *t);
-void MakeRefsConformable(SgExpression *tref, SgExpression *ref);
-void CalculateTopLevelRef(SgSymbol *tops,SgExpression *tref, SgExpression *ref);
-void CreateTopCommonBlockList();
-void RemapCommonObject(SgSymbol *s,SgSymbol *tops);
-void RemapCommonList(SgExpression *el);
-int CompareValues(PTR_LLND pe1,PTR_LLND pe2);
-SgType * TypeOfResult(SgExpression *e); 
-int is_IntrinsicFunction(SgSymbol *sf);
-int IntrinsicInd(SgSymbol *sf);
-SgType *TypeF(int indf,SgExpression *e);
-SgType * SgTypeComplex(SgFile *f);
-SgType * SgTypeDoubleComplex(SgFile *f);
-void ConformActualAndFormalParameters(SgSymbol *scopy,SgExpression *args,SgStatement *parentSt);
-SgSymbol *FirstDummy(SgSymbol *sf);
-SgSymbol *NextDummy(SgSymbol *s);
-int TestConformability(SgSymbol *darg, SgExpression *fact, SgStatement *parentSt);
-int isScalar(SgSymbol *symb);
-int SameType(SgSymbol *darg, SgExpression *fact);
-int Same(SgType *ft,SgType *dt);
-int isArray(SgSymbol *symb);
-int TestShapes(SgArrayType *ftp, SgArrayType *dtp);
-SgExpression *LowerBoundOfDim(SgExpression *e);
-SgExpression *UpperBoundOfDim(SgExpression *e);
-int IdenticalValues(SgExpression *e1, SgExpression *e2);
-SgExpression *ArrayMap(SgSymbol *s);
-//SgExpression *ArrayMap1(SgSymbol *s);
-SgExpression *ArrayMap2(SgSymbol *s);
-SgExpression *FirstIndexChange(SgExpression *e, SgExpression *index);
-int SameShapes(SgArrayType *ftp, SgArrayType *dtp);
-int is_NoExpansionFunction(SgSymbol *sf);
-int isFormalProcedure(SgSymbol *symb);
-int SameDims(SgExpression *fe,SgExpression *de); 
-SgExpression *FirstIndexesChange(SgExpression *mape, SgExpression *re);
-void ConformReferences(SgSymbol *darg, SgExpression *fact, SgStatement *parentSt);
-void TranslateArrayTypeExpressions(SgSymbol *darg);
-int isAdjustableArray(SgSymbol *param);
-int TestBounds(SgExpression *fact, SgArrayType *ftp, SgArrayType *dtp);
-void TransformForFortran77();
-SgExpression *IndexChange(SgExpression *e, SgExpression *index, SgExpression *lbe);
-int TestVector(SgExpression *fact, SgArrayType *ftp, SgArrayType *dtp);
-SgType *TypeOfArgument(SgExpression *e);
-void ReplaceContext(SgStatement *stmt);
-int isDoEndStmt(SgStatement *stmt);
-void ReplaceDoNestLabel(SgStatement *last_st, SgLabel *new_lab);
-void EditExpressionList(SgExpression *e);
-void Add_Comment(graph_node *g, SgStatement *stmt, int flag);
-void PrintTopSymbList();
-void PrintSymbList(SgSymbol *slist, SgStatement *header);
-
-/*  driver.cpp */
-
-//-----------------------------------------------------------------------
-
-extern "C" char* funparse_bfnd(...);
-extern "C" char* Tool_Unparse2_LLnode(...);
-extern "C" void Init_Unparser(...);
-
-//-----------------------------------------------------------------------
-//extern SgLabel * LabelMapping(PTR_LABEL label);
diff --git a/projects/dvm_svn/fdvm/trunk/InlineExpansion/inliner.cpp b/projects/dvm_svn/fdvm/trunk/InlineExpansion/inliner.cpp
deleted file mode 100644
index d19ef88..0000000
--- a/projects/dvm_svn/fdvm/trunk/InlineExpansion/inliner.cpp
+++ /dev/null
@@ -1,2993 +0,0 @@
-/*********************************************************************/
-/*                   Inline Expansion    2006                        */
-/*********************************************************************/
-
-
-/*********************************************************************/
-/*                         Inliner                                   */
-/*********************************************************************/
-
-#include <stdio.h>
-#include <string.h>
-#include "inline.h"
-
-#ifdef __SPF
-extern "C" void printLowLevelWarnings(const char *fileName, const int line, const wchar_t *messageR, const char *messageE, const int group) { }
-extern "C" void addToCollection(const int line, const char *file, void *pointer, int type) { }
-extern "C" void removeFromCollection(void *pointer) { }
-
-#include <map>
-#include <string>
-
-std::map<PTR_BFND, std::pair<std::string, int>> sgStats;
-std::map<PTR_LLND, std::pair<std::string, int>> sgExprs;
-void addToGlobalBufferAndPrint(const std::string &toPrint) { }
-#endif
-
-void Inliner(graph_node *gtop)
-{
-    SgStatement *header, *stmt, *last, *newst;
-    int i;
-
-    header = gtop->st_header;
-    top_header = header;
-    if (with_cmnt)
-        top_header->addComment("!*****AFTER INLINE EXPANSION******\n");
-    top_node = gtop;
-    vcounter = 0;
-    max_lab = getLastLabelId();
-    num_lab = 0;
-    for (i = 0; i < 10; i++)
-        do_var[i] = NULL;
-    top_temp_vars = NULL;
-
-    if (deb_reg)
-        printf("\nINLINER  %s [%d]\n", gtop->symb->identifier(), gtop->symb->id());
-
-    //Find all entry points
-    EntryPointList(gtop->file);
-
-    //Substitute all integer symbolic constants in "top level" routine
-    IntegerConstantSubstitution(header);
-
-    //Clean "top level" routine (precalculation of function call and actual parameter expressions)
-    RoutineCleaning(header);
-    SetScopeToLabels(header);
-
-    // for debugging
-    if (deb_reg > 1)
-        PrintSymbolTable(gtop->file);
-
-    // Perform the inline expansion
-    // for each call site to be expanded (as encountered at "top level")
-    last = header->lastNodeOfStmt();
-    top_last = last;
-    for (stmt = header; stmt && (stmt != last); stmt = stmt->lexNext())
-        if (isSgExecutableStatement(stmt) && stmt->variant() != FORMAT_STAT) {
-            top_first_executable = stmt; break;
-        }
-    top_last_declaration = top_first_executable->lexPrev();
-
-    newst = new SgStatement(CONT_STAT);
-#if __SPF
-    insertBfndListIn(newst->thebif, top_last_declaration->thebif, NULL);
-#else
-    top_last_declaration->insertStmtAfter(*newst);
-#endif
-    top_first_executable = newst;
-
-    MakeDeclarationForTempVarsInTop();  //finish cleaning
-
-    for (stmt = top_first_executable; stmt && (stmt != last); )
-    {
-        switch (stmt->variant())
-        {
-        case ASSIGN_STAT:
-            if (stmt->expr(1)->variant() == FUNC_CALL)
-                stmt = InlineExpansion(gtop, stmt, stmt->expr(1)->symbol(), stmt->expr(1)->lhs()); //stmt = first inserted statement or next statement
-            else
-                stmt = stmt->lexNext();
-            continue;
-        case PROC_STAT:
-            stmt = InlineExpansion(gtop, stmt, stmt->symbol(), stmt->expr(0));  //stmt = first inserted statement or next statement
-            continue;
-        default:
-            stmt = stmt->lexNext();
-            continue;
-        }
-    }
-    // Make delarations for temporary variables created by translation algorithm (TranslateSubprogramReferences()) 
-    MakeDeclarationForTempVarsInTop();
-
-    // Transform declaration part of top level routine
-    // DATA and statement functions -> after all specification statements (standard F77)
-    TransformForFortran77();
-
-    newst->extractStmt();
-
-    // Extract routines for all the graph nodes except top node
-    if (deb_reg && gtop && gtop->to_called)
-        printf("\n   T a b l e   o f   I n l i n e   E x p a n s i o n s  i n  %s\n\n", gtop->symb->identifier());
-
-    ExtractSubprogramsOfCallGraph(gtop);
-
-    //
-    if (deb_reg > 2)
-        PrintSymbolTable(gtop->file);
-    return;
-}
-
-void EntryPointList(SgFile *file)
-//find entry point in the inline flow DAG 
-{
-    SgStatement *first_st, *stmt;
-    first_st = file->firstStatement();
-    for (stmt = first_st; stmt; stmt = stmt->lexNext())
-        if (stmt->variant() == ENTRY_STAT)
-            entryst_list = addToStmtList(entryst_list, stmt);
-}
-
-void IntegerConstantSubstitution(SgStatement *header)
-//Substitute all integer symbolic constants in  routine
-{
-    SgStatement *last, *stmt;
-    SgExpression *e;
-    SgExprListExp *el;
-    SgConstantSymb  *sc;
-    // PTR_LLND ranges;
-    int i;
-    last = header->lastNodeOfStmt();
-    for (stmt = header; stmt && (stmt != last); stmt = stmt->lexNext())
-    {  // PARAMETER statement
-        if (stmt->variant() == PARAM_DECL)
-
-        {
-            for (el = isSgExprListExp(stmt->expr(0)); el; el = el->next())
-            {
-                e = el->lhs(); sc = isSgConstantSymb(e->symbol());
-                SYMB_VAL(sc->thesymb) = ReplaceIntegerParameter(&(sc->constantValue()->copy()))->thellnd;
-            }
-            //printf("PARAM_DECL\n");
-            continue;
-        }
-        if (stmt->variant() == VAR_DECL)
-            ReplaceIntegerParameter_InType(stmt->expr(1)->type());
-
-        // any other statement
-        for (i = 0; i < 3; i++)
-            if (stmt->expr(i))
-                stmt->setExpression(i, *ReplaceIntegerParameter(stmt->expr(i)));
-
-    }
-    ReplaceIntegerParameterInTypeOfVars(header, last);
-}
-
-void ReplaceIntegerParameterInTypeOfVars(SgStatement *header, SgStatement *last)
-{
-    SgSymbol *s, *sl;
-    // PTR_LLND ranges;
-    sl = last->lexNext() ? last->lexNext()->symbol() : NULL;
-
-    //if(sl) printf("%s  %s\n",header->symbol()->identifier(),sl->identifier());
-    for (s = header->symbol(); s != sl && s != NULL; s = s->next())
-        if (s->scope() == header)   //local variable
-            ReplaceIntegerParameter_InType(s->type());
-    return;
-}
-void ReplaceIntegerParameter_InType(SgType *t)
-{
-    PTR_LLND ranges;
-    SgExpression *ne;
-    if (!t) return;
-    if ((ranges = TYPE_RANGES(t->thetype)) != 0)
-    {
-        ne = ReplaceIntegerParameter(LlndMapping(ranges));
-        // if(isSgArrayType(t))     //ranges->variant() == EXPR_LIST
-          //  Calculate_List(ne); 
-    }
-    if ((ranges = TYPE_KIND_LEN(t->thetype)) != 0)
-        ne = ReplaceIntegerParameter(LlndMapping(ranges));
-
-}
-
-
-void MakeDeclarationForTempVarsInTop()
-{
-    symb_list *sl;
-    for (sl = top_temp_vars; sl; sl = sl->next)
-        MakeDeclarationStmtInTop(sl->symb);
-    top_temp_vars = NULL;
-}
-
-void TransformForFortran77()
-{
-    SgStatement *stmt, *st1;
-    for (stmt = top_header; stmt != top_last_declaration; )
-    {
-        if (stmt->variant() == DATA_DECL || stmt->variant() == STMTFN_STAT)
-        {
-            st1 = stmt;
-            stmt = stmt->lexNext();
-            st1->extractStmt();
-            top_first_executable->insertStmtBefore(*st1, *top_header);
-        }
-        else
-            stmt = stmt->lexNext();
-    }
-}
-
-void ExtractSubprogramsOfCallGraph(graph_node *gtop)
-{
-    edge *el;
-    // graph_node *nd;
-
-    for (el = gtop->to_called; el; el = el->next)
-    {
-        if (el->to->st_header)
-        {
-            el->to->st_header->extractStmt();
-            el->to->st_header = NULL;
-            if (deb_reg)
-                printf("  %s: %d\n", el->to->symb->identifier(), el->to->count);
-            ExtractSubprogramsOfCallGraph(el->to);
-        }
-    }
-}
-
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-//                 R O U T I N E   C L E A N I N G
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-
-void RoutineCleaning(SgStatement *header)
-{
-    SgStatement *last, *stmt;
-    //SgExpression *e;
-    //SgExprListExp *el;
-    //SgConstantSymb  *sc;
-    SgSymbol *s;
-    //int i;
-    cur_func = header;
-    last = header->lastNodeOfStmt();
-    //scanning local symbols,
-    // if symbol used as a variable and is an intrinsic function name,
-    // rename the symbol to not conflict with any intrinsic function names 
-    for (s = header->symbol(); s; s = s->next())
-        if (s->scope() == header && isSgVariableSymb(s) && isIntrinsicFunctionName(s->identifier()))
-            SYMB_IDENT(s->thesymb) = ChangeIntrinsicFunctionName(s->identifier());
-    // cleaning each executable statement 
-    for (stmt = header; stmt && (stmt != last); stmt = stmt->lexNext())
-    {
-        if (isSgExecutableStatement(stmt)) //is not Fortran specification statement        
-            StatementCleaning(stmt);
-    }
-}
-
-
-void StatementCleaning(SgStatement *stmt)
-{
-    SgAssignStmt *asst;
-    SgSymbol *sf;
-    if ((asst = isSgAssignStmt(stmt)) != 0)
-        //if(stmt->variant() == ASSIGN_STAT)
-    {
-        if ((asst->rhs()->variant() == FUNC_CALL) &&
-            (isSgVarRefExp(asst->lhs())
-                ||
-                (isSgArrayRefExp(asst->lhs()) && !isSgArrayType(asst->lhs()->type()))))
-        {
-            ReplaceContext(stmt);
-            SearchFunction(asst->lhs(), stmt);
-            SearchFunction(asst->rhs()->lhs(), stmt); // actual parameter expression list
-            PrecalculateActualParameters(asst->rhs()->symbol(), asst->rhs()->lhs(), stmt);
-            return;
-        }
-
-    }
-    if ((sf = SearchFunction(stmt->expr(0), stmt)) != 0)   stmt->setExpression(0, *new SgVarRefExp(sf));
-    if ((sf = SearchFunction(stmt->expr(1), stmt)) != 0)   stmt->setExpression(1, *new SgVarRefExp(sf));
-    if ((sf = SearchFunction(stmt->expr(2), stmt)) != 0)   stmt->setExpression(2, *new SgVarRefExp(sf));
-
-    if (stmt->variant() == PROC_STAT)
-    {
-        ReplaceContext(stmt);
-        PrecalculateActualParameters(stmt->symbol(), stmt->expr(0), stmt);
-    }
-}
-
-SgSymbol *SearchFunction(SgExpression *e, SgStatement *stmt)
-{
-    SgSymbol *sf;
-    if (!e)
-        return(NULL);
-    if (e->variant() == FUNC_CALL)
-    {
-        return(PrecalculateFtoVar(e, stmt));
-    }
-
-    if ((sf = SearchFunction(e->lhs(), stmt)) != 0)  e->setLhs(new SgVarRefExp(sf));
-    if ((sf = SearchFunction(e->rhs(), stmt)) != 0)  e->setRhs(new SgVarRefExp(sf));
-    return (NULL);
-}
-
-SgSymbol *PrecalculateFtoVar(SgExpression *e, SgStatement *stmt)
-{
-    SgStatement *newst;
-    SgSymbol *sf;
-    SgType *t;
-    t = TypeOfResult(e);
-    if (!t)
-        err("Wrong type", 2, stmt);
-    sf = GetTempVarForF(e->symbol(), t);
-    newst = new SgAssignStmt(*new SgVarRefExp(sf), *e);
-    InsertNewStatementBefore(newst, stmt);
-    StatementCleaning(newst);
-    return(sf);
-}
-
-void PrecalculateActualParameters(SgSymbol *s, SgExpression *e, SgStatement *stmt)
-{// Precalculate actual parameter expressions
- //e - actual parameter list
-    int i;
-    SgExpression *el;
-    SgSymbol *sp;
-    if (!e) return;
-    if (is_NoExpansionFunction(s)) return; // expansion may not be made
-    i = 1;
-    for (el = e; el; el = el->rhs(), i++)
-        switch (ParameterType(el->lhs(), stmt))
-        {
-        case 1:  break; //actual parameter can be accessed by reference
-       //case 2:  PrecalculateSubscripts(el->lhs(),stmt); break;
-        default: sp = GetTempVarForArg(i, s, el->lhs()->type());
-            PrecalculateExpression(sp, el->lhs(), stmt); //to support access by reference 
-            el->setLhs(new SgVarRefExp(sp)); //replace actual parameter expression by 'sp' reference
-            break;
-        }
-}
-
-void PrecalculateExpression(SgSymbol *sp, SgExpression *e, SgStatement *stmt)
-{
-    SgStatement *newst;
-    newst = new SgAssignStmt(*new SgVarRefExp(sp), *e);
-    InsertNewStatementBefore(newst, stmt);
-}
-
-
-int ParameterType(SgExpression *e, SgStatement *stmt)
-{
-    if (isSgVarRefExp(e) ||                                      // scalar variable
-        (isSgArrayRefExp(e) && !e->lhs()) ||                     // array variable whithout subscript or string variable
-        e->variant() == CONST_REF ||                              // symbol (named) constant
-        (isSgValueExp(e) && e->type()->variant() != T_STRING) || // literal constant
-        (isSgArrayRefExp(e) && TestSubscripts(e->lhs(), stmt)) || // array reference whose subscripts are constant or scalar
-        (e->variant() == ARRAY_OP && isSgVarRefExp(e->lhs()) &&
-            TestRange(e->rhs(), stmt)) ||// substring reference whose subscripts are constant or scalar
-            (e->variant() == ARRAY_OP && isSgArrayRefExp(e->lhs())
-                && TestSubscripts(e->lhs()->lhs(), stmt)
-                && TestRange(e->rhs(), stmt)))    // substring reference whose subscripts are constant or scalar                                                    
-        return(1); // actual parameter can be accessed by reference
-
-    //  else if(isSgArrayRefExp(e))
-    //    return(2);
-    //  else if(e->variant()==ARRAY_OP)
-    //    return(3);
-
-    else
-        return(0); // precalculation expression is needed to support access by reference   
-}
-
-int TestSubscripts(SgExpression *e, SgStatement *stmt)
-{
-    SgExpression *el, *ei;
-    //SgSymbol *sp;
-    for (el = e; el; el = el->rhs()) {
-        ei = el->lhs(); // a subscript
-        if (isSgVarRefExp(ei) || (ei->variant() == CONST_REF) || isSgValueExp(ei)) // constant or scalar
-            continue;
-        else
-            //return(0);
-        {//sp=GetTempVarForSubscr(ei->type());
-         //PrecalculateExpression(sp,ei,stmt); //to support access by reference 
-         //el->setLhs(new SgVarRefExp(sp)); //replace subscript expression by 'sp' reference
-            continue;
-        }
-    }
-    return(1);
-}
-
-int TestRange(SgExpression *e, SgStatement *stmt)
-{
-    SgExpression *ei;
-    SgSymbol *sp;
-
-    int ret;
-    ret = 0;
-    //e->unparsestdout();  (e->lhs())->unparsestdout(); //(e->rhs())->unparsestdout();
-    //printf("  testrange %d  %d\n", e->variant(), (e->lhs())->variant());
-
-    ei = e->lhs();
-
-    if (!ei || isSgVarRefExp(ei) || (ei->variant() == CONST_REF) || isSgValueExp(ei))
-        ret = 1;
-    else
-    {
-        sp = GetTempVarForSubscr(ei->type());
-        PrecalculateExpression(sp, ei, stmt); //to support access by reference 
-        e->setLhs(new SgVarRefExp(sp)); //replace subrange expression by 'sp' reference
-    }
-
-    ei = e->rhs();
-    if (!ei || isSgVarRefExp(ei) || (ei->variant() == CONST_REF) || isSgValueExp(ei))
-        return(1);
-    else
-        //return(0);
-    {
-        sp = GetTempVarForSubscr(ei->type());
-        PrecalculateExpression(sp, ei, stmt); //to support access by reference 
-        e->setRhs(new SgVarRefExp(sp)); //replace subscript expression by 'sp' reference
-        return(1);
-    }
-
-    return 1;
-}
-
-void LabelList(SgStatement *header)
-{
-    SgStatement *last, *stmt;
-
-    last = header->lastNodeOfStmt();
-    for (stmt = header; stmt && (stmt != last); stmt = stmt->lexNext())
-    {
-        if (stmt->hasLabel())
-            proc_labels = addToLabelList(proc_labels, stmt->label());
-    }
-}
-
-void SetScopeToLabels(SgStatement *header)
-{
-    SgStatement *last, *stmt;
-
-    last = header->lastNodeOfStmt();
-    for (stmt = header; stmt && (stmt != last); stmt = stmt->lexNext())
-    {
-        if (stmt->hasLabel())
-            LABEL_SCOPE(stmt->label()->thelabel) = header->thebif;
-    }
-}
-
-
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-//            I N L I N E    E X P A N S I O N
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-
-SgStatement *InlineExpansion(graph_node *gtop, SgStatement *stmt, SgSymbol *sf, SgExpression *args)
-// return next processed statement in top level routine:
-// first of inline expansion statements (inserted in top level routine)
-//  or
-// next statement following stmt in top level routine ( stmt->lexNext()), if it is not inlined call
-{
-    graph_node *gnode;
-    SgStatement *header_tmplt, *global_st, *header_work, *calling_stmt, *expanded_stmt;
-    SgSymbol *scopy;
-    SgLabel *lab;
-    /*
-      if(!(pnode = ATTR_NODE(sf)))
-      { printf("Error: NO ATTRIBUTE \n");
-        return (stmt->lexNext());
-      } else
-        gnode = *pnode;
-      if(!isInlinedCall(gtop,gnode))
-         return(stmt->lexNext());
-    */
-    //gnode = getAttrNodeForSymbol(sf);
-    if (deb_reg > 1)
-        printf("INLINE EXPANSION %s \n", sf->identifier());
-    if (!ATTR_NODE(sf))   // call without inline expansion (dummy argument, statement function) 15.03.07
-        return(stmt->lexNext());
-    gnode = getNodeForSymbol(gtop, sf->identifier());
-    if (!gnode)
-        return(stmt->lexNext());
-    if (deb_reg > 1)
-        printf("node %d for symbol %s\n", gnode->id, sf->identifier());
-    //if(!isInlinedCallSite(stmt))  // if there is assertion (special comment) in program for call site 
-      // return(stmt->lexNext());
-
-    (gnode->count)++;
-    // 1. if gnode is not template object 
-    //    create a template inline object by performing site-independent transformations
-    if (!gnode->tmplt)
-        header_tmplt = CreateTemplate(gnode);
-
-    // 2. clone the "template" inline object to create work inline object:  
-    //    copying subprogram, inserting after global statement of file (in beginning of file)
-    global_st = gtop->file->firstStatement();
-    top_global = global_st;
-    scopy = &((gnode->symb)->copySubprogram(*(global_st)));
-    header_work = scopy->body(); //global_st->lexNext();
-
-
-// 3. perform site_specific transformations
-    if (stmt->variant() == ASSIGN_STAT)
-        RemapFunctionResultVar(stmt->expr(0), scopy);
-    ConformActualAndFormalParameters(scopy, args, stmt);
-
-    // 4. transform all references to subprogram variables to "top level" form
-    expanded_stmt = TranslateSubprogramReferences(header_work);
-
-    // debugging
-    if (deb_reg > 1)
-        (gtop->file)->unparsestdout();
-    if (deb_reg > 2)
-    {
-        printf("---------------------\n");
-        expanded_stmt->unparsestdout();
-        printf("---------------------\n");
-        printf("\n");
-    }
-    // 5. replace the calling statement in the "top level" routine by transformed statements
-    calling_stmt = stmt;
-    /*  if(sf->variant() == FUNCTION_NAME)   //calling_stmt->variant()==ASSIGN_STAT
-      {
-           newst = new SgAssignStmt(*stmt->expr(0),*new SgVarRefExp(sf) );
-           InsertNewStatementAfter(newst,stmt,stmt->controlParent());
-      }
-     */
-    if (with_cmnt)
-    {
-        char *buf;
-        buf = stmt->lexNext()->comments();
-        BIF_CMNT(stmt->lexNext()->thebif) = NULL;
-        Add_Comment(gnode, stmt->lexNext(), 1);
-        stmt->lexNext()->addComment(buf);
-    }
-    InsertBlockAfter(stmt, expanded_stmt, header_work);
-
-    if (with_cmnt)
-    {
-        expanded_stmt->addComment(stmt->comments());
-        Add_Comment(gnode, expanded_stmt, 0);
-    }
-    lab = (stmt->hasLabel()) ? stmt->label() : NULL;
-    if (lab)
-    {
-        if (expanded_stmt->hasLabel())
-            InsertNewStatementBefore(new SgStatement(CONT_STAT), stmt);
-        else
-            BIF_LABEL(expanded_stmt->thebif) = lab->thelabel;
-    }
-    calling_stmt->extractStmt();
-
-    // temporary !!!!
-    //   return(stmt->lexNext());
-
-    return(expanded_stmt);
-}
-
-void Add_Comment(graph_node *g, SgStatement *stmt, int flag)
-{
-    char *buf;
-    buf = new char[80];
-    if (!flag)
-        sprintf(buf, "!*********INLINE EXPANSION %s[%d]*********\n", g->symb->identifier(), g->count);
-    else
-        sprintf(buf, "!*********END OF EXPANSION %s[%d]*********\n", g->symb->identifier(), g->count);
-    stmt->addComment(buf);
-}
-
-
-graph_node *getNodeForSymbol(graph_node *gtop, char *name)
-{
-    edge *el;
-    graph_node *nd;
-    for (el = gtop->to_called; el; el = el->next)
-    {
-        if (!strcmp(el->to->symb->identifier(), name))
-            return(el->to);
-        else if ((nd = getNodeForSymbol(el->to, name)) != 0)
-            return(nd);
-    }
-    return NULL;
-}
-
-graph_node *getAttrNodeForSymbol(SgSymbol *sf)
-{
-    graph_node *gnode, **pnode;
-    if (!(pnode = ATTR_NODE(sf)))
-    {
-        printf("Warning: NO ATTRIBUTE FOR  %s\n", sf->identifier());
-        gnode = NULL;
-    }
-    else
-        gnode = *pnode;
-    return(gnode);
-}
-
-int isInlinedCall(graph_node *gtop, graph_node *gnode)
-{
-    edge  *edgl;
-
-    // testing incoming edge list of called routine graph-node: gnode 
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next)
-        if (edgl->from == gtop) //there is incoming edge: : gtop->[gnode] 
-            return(1);
-    return(0);
-}
-
-SgStatement * CreateTemplate(graph_node *gnode)
-{ // Create a template inline object by performing site-independent transformations
-    gnode->tmplt = 1;
-    // routine cleaning
-    RoutineCleaning(gnode->st_header);
-    SetScopeToLabels(gnode->st_header);
-    // site-independent transformation
-    SiteIndependentTransformation(gnode);
-    if (deb_reg > 1)
-        printf("template for %s\n", gnode->st_header->symbol()->identifier());
-    return(gnode->st_header);
-}
-
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-//    S I T E   I N D E P E N D E N T   T R A N S F O R M A T I O N S
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-
-void SiteIndependentTransformation(graph_node *gnode) //(SgStatement *header)
-
-{// Perform site-independent transformation
-
-    SgStatement *last, *first_executable, *last_declaration, *stmt, *return_st, *prev;
-    SgStatement *header;
-    SgLabel *lab_return;
-    int has_return;
-    stmt_list *DATA_list = NULL;
-    header = gnode->st_header;
-    last = header->lastNodeOfStmt();
-    first_executable = NULL;
-    for (stmt = header; stmt && (stmt != last); stmt = stmt->lexNext())
-        if (isSgExecutableStatement(stmt) && stmt->variant() != FORMAT_STAT) {
-            first_executable = stmt; break;
-        }
-    //last_declaration = first_executable->lexPrev();
-
-   //----------------------------
-   //Move all entry points to the top of the subprogram
-    for (stmt = first_executable; stmt && (stmt != last); stmt = stmt->lexNext())
-        if (stmt->variant() == ENTRY_STAT)
-            MoveToTopOfRoutine(stmt, first_executable);
-
-    //stmt_list *entryl;
-    //for(entryl=entryst_list; entryl; entryl=entryl->next)
-    //   if(entryl->st->controlParent() == header)
-    //      MoveToTop(entryl->st, first_executable);
-    //   else
-    //      continue;
-
-//----------------------------
-//Move all return points to the bottom of the subprogram
-    prev = last->lexPrev();
-    return_st = NULL;
-    lab_return = NULL;
-    has_return = 0;
-    if (prev->variant() == RETURN_STAT && prev->controlParent()->variant() != LOGIF_NODE)
-    {
-        return_st = prev;
-        if (return_st->hasLabel())
-            lab_return = return_st->label();
-    }
-    if (!lab_return)
-    {
-        lab_return = NewLabel();
-        SetScopeOfLabel(lab_return, header);
-    }
-
-    for (stmt = first_executable; stmt && (stmt != return_st) && (stmt != last); stmt = stmt->lexNext())
-        if (stmt->variant() == RETURN_STAT)
-        {
-            stmt = ReplaceByGoToBottomOfRoutine(stmt, lab_return);
-            has_return = 1;
-        }
-    if (has_return)
-    {
-        if (!return_st)
-        {
-            stmt = new SgStatement(CONT_STAT);
-            InsertNewStatementBefore(stmt, last);
-            stmt->setLabel(*lab_return);
-        }
-        else
-        {
-            return_st->setLabel(*lab_return);
-            ReplaceReturnByContinue(return_st);
-        }
-    }
-    else if (return_st)
-        ReplaceReturnByContinue(return_st);
-
-    //----------------------------
-    //Substitute all integer symbolic constants in subprogram
-    IntegerConstantSubstitution(header);
-
-    //----------------------------
-    //Move all FORMAT statements into the top level routine
-    format_labels = NULL;
-    for (stmt = header; stmt && (stmt != last); )
-        if (stmt->variant() == FORMAT_STAT)
-            //MoveFormatToTopOfRoutine(stmt, last_declaration);
-            stmt = MoveFormatIntoTopLevel(stmt, gnode->clone);
-        else if (stmt->variant() == DATA_DECL)
-        {
-            DATA_list = addToStmtList(DATA_list, stmt);
-            stmt = stmt->lexNext();
-            //!!!!
-            Error("DATA statement in procedure %s. Sorry, not implemented yet", header->symbol()->identifier(), 1, stmt);
-        }
-        else
-            stmt = stmt->lexNext();
-    ReplaceFormatLabelsInStmts(header);
-    //----------------------------
-    //Precalculate all of the subprogram's adjustable array bounds
-    last_declaration = first_executable->lexPrev();
-
-    AdjustableArrayBounds(header, last_declaration);
-    first_executable = last_declaration->lexNext();
-    //---------------------------- 
-    //Replace each reference to whole formal array in I/O statements
-    //by implied DO-loop 
-    ReplaceWholeArrayRefInIOStmts(header);
-    //---------------------------- 
-    //Remap all local subprogram variables by creating new unconflicting top level variables
-    top_symb_list = CreateListOfLocalVariables(top_header);
-    sub_symb_list = CreateListOfLocalVariables(header);
-    //PrintTopSymbList();
-
-    //PrintSymbList(sub_symb_list, header);
-
-
-    RemapConstants(header, first_executable);
-    RemapLocalVariables(header);
-
-    //---------------------------- 
-    //Remap COMMON bloks
-    CreateTopCommonBlockList();
-    RemapCommonBlocks(header);
-    //----------------------------
-    //Remap EQUIVALENCE blocks 
-    //---------------------------- 
-    //Move all DATA statements into top level routine
-      //DATA_list has been created: list of DATA statements
-      // internal form of DATA statement must be changed in parser and unparser
-      //if(DATA_list)   // temporary !!!
-        //printf("There are DATA statements in procedure. Sorry, not implemented yet \n" );
-
-}
-
-void MoveToTopOfRoutine(SgStatement *entrystmt, SgStatement *first_executable)
-{//Move entry point to the top of the subprogram
- // generate GO TO statement (will be removed after expansion)
-    SgStatement *go_to;
-    SgLabel *entry_lab;
-
-    if (!entrystmt->lexNext()->hasLabel())
-    {
-        entry_lab = NewLabel();
-        SetScopeOfLabel(entry_lab, entrystmt->controlParent());
-        entrystmt->lexNext()->setLabel(*entry_lab);
-    }
-    else
-        entry_lab = entrystmt->lexNext()->label();
-    go_to = new SgGotoStmt(*entry_lab);
-    entrystmt->extractStmt();
-    InsertNewStatementBefore(entrystmt, first_executable);
-    InsertNewStatementAfter(go_to, entrystmt, entrystmt->controlParent());
-}
-
-//-------------------------------------------------------------------------------------------
-SgStatement *ReplaceByGoToBottomOfRoutine(SgStatement *retstmt, SgLabel *lab_return)
-{//Replace return point by goto to the bottom of the subprogram
- // generate GO TO statement 
-    SgStatement *go_to;
-    go_to = new SgGotoStmt(*lab_return);
-    InsertNewStatementBefore(go_to, retstmt);
-    retstmt->extractStmt();
-    return(go_to);
-}
-
-void ReplaceReturnByContinue(SgStatement *return_st)
-{
-    InsertNewStatementBefore(new SgStatement(CONT_STAT), return_st);
-    return_st->extractStmt();
-}
-
-//-------------------------------------------------------------------------------------------
-void MoveFormatToTopOfRoutine(SgStatement *format_stmt, SgStatement *last_declaration)
-{//Move FORMAT statements  to the top of the subprogram
-    SgLabel *format_lab;
-    // SgLabel *label_insection[200];
-
-    if (format_stmt->hasLabel())
-    {
-        format_lab = format_stmt->label();
-        if (!TestFormatLabel(format_stmt->label()))
-        {
-            format_lab = NewLabel();
-            format_stmt->setLabel(*format_lab);
-        }
-        format_stmt->extractStmt();
-        InsertNewStatementAfter(format_stmt, last_declaration, last_declaration->controlParent());
-        last_declaration = format_stmt;
-    }
-}
-
-SgStatement *MoveFormatIntoTopLevel(SgStatement *format_stmt, int clone)
-{
-    SgStatement *next;
-    SgLabel *format_lab;
-    next = format_stmt->lexNext();
-    format_lab = format_stmt->label();
-    if (!clone && isLabelOfTop(format_stmt->label()))
-    {
-        if (deb_reg > 2)
-            printf("new label: %d -> ", (int)LABEL_STMTNO(format_lab->thelabel));
-        format_labels = addToLabelList(format_labels, format_lab);
-        format_lab = NewLabel();
-        format_stmt->setLabel(*format_lab);
-        format_labels->newlab = format_lab;
-        if (deb_reg > 2)
-            printf(" %d\n", (int)LABEL_STMTNO(format_lab->thelabel));
-    }
-
-    format_stmt->extractStmt();
-    InsertNewStatementAfter(format_stmt, top_last_declaration, top_header);
-    SetScopeOfLabel(format_lab, top_header);
-    //top_last_declaration = format_stmt;
-
-    return(next);
-}
-
-label_list  *addToLabelList(label_list *lablist, SgLabel *lab)
-{
-    // adding the label to the beginning of label list 
-
-    label_list * nl;
-    if (!lablist) {
-        lablist = new label_list;
-        lablist->lab = lab;
-        lablist->next = NULL;
-    }
-    else {
-        nl = new label_list;
-        nl->lab = lab;
-        nl->next = lablist;
-        lablist = nl;
-    }
-    return (lablist);
-}
-
-int isInLabelList(SgLabel *lab, label_list *lablist)
-{
-    label_list *ll;
-    for (ll = lablist; ll; ll = ll->next)
-        if (LABEL_STMTNO(ll->lab->thelabel) == LABEL_STMTNO(lab->thelabel))
-            return(1);
-    return(0);
-}
-
-int isLabelOfTop(SgLabel *lab)
-{
-    return(isLabelWithScope(LABEL_STMTNO(lab->thelabel), top_header) != NULL);
-}
-
-void ReplaceFormatLabelsInStmts(SgStatement *header)
-{
-    SgStatement *stmt, *last;
-    if (!format_labels)
-        return;
-    if (deb_reg > 2)
-        printf("replace format labels in %s\n", header->symbol()->identifier());
-    last = header->lastNodeOfStmt();
-    for (stmt = header; stmt && (stmt != last); stmt = stmt->lexNext())
-    {
-        switch (stmt->variant())
-        {
-        case WRITE_STAT:
-        case READ_STAT:
-        case PRINT_STAT:
-        { SgKeywordValExp *kwe;
-        SgExpression *e, *ee, *el, *fmt;
-        fmt = NULL;
-        e = stmt->expr(1); // IO control list
-        if (e->variant() == SPEC_PAIR)
-        {
-            if (stmt->variant() == PRINT_STAT)
-                fmt = e;
-            else
-            {
-                kwe = isSgKeywordValExp(e->lhs());
-                if (!kwe)
-                    break;
-                if (!strcmp(kwe->value(), "fmt"))
-                    fmt = e;
-                else
-                    break;;
-            }
-        }
-        else if (e->variant() == EXPR_LIST)
-        {
-            for (el = e; el; el = el->rhs())
-            {
-                ee = el->lhs();
-                if (ee->variant() != SPEC_PAIR)
-                    break; // IO_control list error
-                kwe = isSgKeywordValExp(ee->lhs());
-                if (!kwe)
-                    break;
-                if (!strcmp(kwe->value(), "fmt"))
-                {
-                    fmt = ee;
-                    break;
-                }
-            }
-        }
-        else
-            break;
-
-        // analis  fmt
-        { SgLabel *lab, *newlab;
-        lab = NULL;
-        if (deb_reg > 2)
-            printf("fmt variant %d\n", fmt->rhs()->variant());
-        if (fmt && fmt->rhs()->variant() == LABEL_REF)
-        {
-            lab = ((SgLabelRefExp *)(fmt->rhs()))->label();
-            if (deb_reg > 2)
-                printf("label [%d] \n", lab->id());
-        }
-        else if (fmt && fmt->rhs()->variant() == INT_VAL)  //!!!parser error
-        {
-            if (deb_reg > 2)
-                printf("variant fmt = %d  %d\n", fmt->rhs()->variant(), ((SgValueExp *)(fmt->rhs()))->intValue());
-            lab = isLabelWithScope(((SgValueExp *)(fmt->rhs()))->intValue(), header);
-            if (lab)
-                fmt->setRhs(new SgLabelRefExp(*lab));
-        }
-        if (!lab)  break;
-        //printf("label [%d] %d\ n",lab->id(),LABEL_STMTNO(lab->thelabel));
-      // replace label in fmt->lhs() 
-        if ((newlab = isInFormatMap(lab)) != NULL)
-            NODE_LABEL(fmt->rhs()->thellnd) = newlab->thelabel;
-        }
-        }
-        break;
-        default:
-            break;
-        }
-    }
-    return;
-}
-
-SgLabel *isInFormatMap(SgLabel *lab)
-{
-    label_list *ll;
-    for (ll = format_labels; ll; ll = ll->next)
-    {
-        if (ll->lab == lab)
-            return(ll->newlab);
-    }
-    return(NULL);
-}
-
-//-------------------------------------------------------------------------------------------
-void AdjustableArrayBounds(SgStatement *header, SgStatement *after)
-{
-    int npar, i, j, rank;
-    SgExpression *bound;
-    SgSymbol *param;
-
-    cur_func = header;
-    npar = ((SgProgHedrStmt *)header)->numberOfParameters();
-    for (i = 0; i < npar; i++)
-    {
-        param = ((SgProgHedrStmt *)header)->parameter(i);
-        if (isSgArrayType(param->type()))  // is array
-        {
-            rank = Rank(param);
-            for (j = 0; j < rank; j++)
-            {
-                if (isAdustableBound(bound = LowerBound(param, j)))
-                    PrecalculateArrayBound(param, bound, after, header);
-
-                if (isAdustableBound(bound = UpperBound(param, j)))
-                    PrecalculateArrayBound(param, bound, after, header);
-            } //end for j
-        }
-    } // end for i
-}
-
-int isAdustableBound(SgExpression *bound)
-{
-    if (!bound)
-        return 0;
-    if (bound->variant() == INT_VAL)
-        return 0;
-    return(SearchVarRef(bound));
-}
-
-int SearchVarRef(SgExpression *e)
-{
-    if (!e)
-        return 0;
-    if (isSgVarRefExp(e) && e->symbol()->variant() == VARIABLE_NAME)
-        return 1;
-    if (SearchVarRef(e->lhs()) || SearchVarRef(e->rhs()))
-        return 1;
-    else
-        return 0;
-}
-void PrecalculateArrayBound(SgSymbol *ar, SgExpression *bound, SgStatement *after, SgStatement *header)
-
-{
-    SgStatement *newst;
-    SgSymbol *sb;
-    SgExpression **pbe = new (SgExpression *);
-
-    sb = GetTempVarForBound(ar);
-    newst = new SgAssignStmt(*new SgVarRefExp(sb), bound->copy());
-    InsertNewStatementAfter(newst, after, header);
-    *pbe = new SgVarRefExp(sb);
-    bound->addAttribute(PRE_BOUND, (void *)pbe, sizeof(SgExpression *));
-
-    return;
-}
-
-//-------------------------------------------------------------------------------------------
-void ReplaceWholeArrayRefInIOStmts(SgStatement *header)
-{
-    SgStatement *stmt, *last;
-    SgExpression *iol, *e;
-
-    cur_func = header;
-
-    last = header->lastNodeOfStmt();
-
-    for (stmt = header; stmt && (stmt != last); stmt = stmt->lexNext())
-    {
-        switch (stmt->variant())
-        {
-        case WRITE_STAT:
-        case READ_STAT:
-        case PRINT_STAT:
-            iol = stmt->expr(0); //input-output list
-            for (; iol; iol = iol->rhs())
-            {
-                e = iol->lhs();  // list item
-                if (isSgArrayRefExp(e) && isSgArrayType(e->symbol()->type()) && !e->lhs() && isDummyArgument(e->symbol())) //whole formal array ref
-                    iol->setLhs(ImplicitLoop(e->symbol()));
-            }
-            break;
-        default:
-            break;
-        }
-    } //end for
-}
-
-
-SgExpression *ImplicitLoop(SgSymbol *ar)
-{
-    SgExpression *ei[10];
-    SgArrayRefExp *eref;
-    int rank, i;
-
-    rank = Rank(ar);
-    for (i = 0; i < rank; i++)
-        if (!do_var[i])
-        {
-            do_var[i] = GetImplicitDoVar(i);
-            MakeDeclarationStmtInTop(do_var[i]);
-        }
-    //ei[0] = new SgIOAccessExp(*do_var[0], *LowerLoopBound(ar,0), *UpperLoopBound(ar,0));
-    ei[0] = new SgExpression(IOACCESS);
-    ei[0]->setSymbol(do_var[0]);
-    ei[0]->setRhs(new SgExpression(SEQ, new SgExpression(DDOT, LowerLoopBound(ar, 0), UpperLoopBound(ar, 0), NULL), NULL, NULL));
-    eref = new SgArrayRefExp(*ar);
-    for (i = 0; i < rank; i++)
-        eref->addSubscript(*new SgVarRefExp(do_var[i]));
-    ei[0]->setLhs(new SgExprListExp(*eref));
-
-    for (i = 1; i < rank; i++)
-    {  //ei[i] = new SgIOAccessExp(*si[i], LowerBound(ar,i)->copy(), UpperBound(ar,i)->copy());
-        ei[i] = new SgExpression(IOACCESS);
-        ei[i]->setSymbol(do_var[i]);
-        ei[i]->setRhs(new SgExpression(SEQ, new SgExpression(DDOT, LowerLoopBound(ar, i), UpperLoopBound(ar, i), NULL), NULL, NULL));
-        ei[i]->setLhs(new SgExprListExp(*ei[i - 1]));
-    }
-    return(ei[rank - 1]);
-}
-
-SgExpression * LowerLoopBound(SgSymbol *ar, int i)
-{
-    SgExpression *e;
-    e = LowerBound(ar, i);
-    if (PREBOUND(e))
-        e = *PREBOUND(e);
-    return(&(e->copy()));
-}
-
-SgExpression * UpperLoopBound(SgSymbol *ar, int i)
-{
-    SgExpression *e;
-    e = UpperBound(ar, i);
-    if (PREBOUND(e))
-        e = *PREBOUND(e);
-    return(&(e->copy()));
-}
-
-
-//-------------------------------------------------------------------------------------------
-void RemapConstants(SgStatement *header, SgStatement *first_exec)
-{
-    SgStatement *stmt;
-    common_list = common_list_l = NULL;
-    equiv_list = equiv_list_l = NULL;
-    for (stmt = header; stmt && (stmt != first_exec); stmt = stmt->lexNext())
-    {
-        switch (stmt->variant())
-        {
-        case PARAM_DECL:
-        {SgExpression *el;
-        for (el = stmt->expr(0); el; el = el->rhs())
-        {
-            RemapLocalObject(el->lhs()->symbol());
-        }
-        continue;
-        }
-        case COMM_STAT:
-            CommonBlockList(stmt);
-            continue;
-        case EQUI_STAT:
-            EquivBlockList(stmt);
-            continue;
-
-        default:
-            continue;
-        }
-    }
-}
-
-void RemapLocalVariables(SgStatement *header)
-{
-    SgSymbol  *s;
-    for (s = sub_symb_list; s; s = NextSymbol(s))
-    {  //printf("*****%s\n",s->identifier());
-        if (s->variant() == CONST_NAME)
-            continue;
-        if (IN_COMMON(s))
-            continue;
-
-        RemapLocalObject(s);
-    }
-}
-
-/*
-void RemapLocalVariables(SgStatement *header)
-{ SgSymbol *symb_list, *s, *ts, *snew;
-  int is_in_top;
-  top_symb_list = CreateListOfLocalVariables(top_header);
-      symb_list = CreateListOfLocalVariables(header);
-  for(s=symb_list; s; s=NextSymbol(s) )
-  {  //printf("*****%s\n",s->identifier());
-     RemapLocalObject(s);
-       if(isDummyArgument(s))
-        continue;
-     if(s->variant() == CONST_NAME && s->type()->variant() == T_INT)
-        continue;
-     is_in_top = 0;
-     for(ts=top_symb_list; ts; ts=NextSymbol(ts) )
-     {
-        if(!strcmp(s->identifier(),ts->identifier()))
-          {is_in_top = 1; break;}
-     }
-     if(is_in_top)
-     {
-        if((s->variant()==CONST_NAME) && (ts->variant()==CONST_NAME) && CompareConstants(s,ts)) // is the same constant
-        {  s->thesymb->entry.Template.declared_name = ts->thesymb;    // symbol map
-             continue;
-        }
-        else
-        { snew = GetNewTopSymbol(s);  //create new symbol of top_header scope
-          s->thesymb->entry.Template.declared_name = snew->thesymb;    // symbol map
-        }
-     }
-     else
-     {  snew = s;
-        SYMB_SCOPE(snew->thesymb) = top_header->thebif; //move symbol into top level routine
-     }
-     if(snew->variant() == CONST_NAME)
-       MakeDeclarationStmtsForConstant(snew);
-     else
-       MakeDeclarationStmtInTop(snew);
-
-  }
-
-}
-*/
-
-void RemapLocalObject(SgSymbol *s)
-{
-    int is_in_top, md;
-    SgSymbol *ts, *snew;
-
-    if (isDummyArgument(s))
-        return;
-    if (s->variant() == CONST_NAME && s->type()->variant() == T_INT)
-        return;
-    if (s->variant() == CONST_NAME)
-        TranslateExpression(((SgConstantSymb *)s)->constantValue(), &md);
-
-    is_in_top = 0;
-    for (ts = top_symb_list; ts; ts = NextSymbol(ts))
-    {
-        if (!strcmp(s->identifier(), ts->identifier()))
-        {
-            is_in_top = 1; break;
-        }
-    }
-    if (is_in_top)
-    {
-        if ((s->variant() == CONST_NAME) && (ts->variant() == CONST_NAME) && CompareConstants(s, ts)) // is the same constant
-        {
-            s->thesymb->entry.Template.declared_name = ts->thesymb;    // symbol map
-            return;
-        }
-        else
-        {
-            snew = GetNewTopSymbol(s);  //create new symbol of top_header scope
-            s->thesymb->entry.Template.declared_name = snew->thesymb;    // symbol map
-        }
-    }
-    else
-    {
-        snew = s;
-        SYMB_SCOPE(snew->thesymb) = top_header->thebif; //move symbol into top level routine
-    }
-    if (snew->variant() == CONST_NAME)
-        MakeDeclarationStmtsForConstant(snew);
-    else
-        MakeDeclarationStmtInTop(snew);
-
-}
-
-void RemapCommonObject(SgSymbol *s, SgSymbol *tops)
-{
-    s->thesymb->entry.Template.declared_name = tops->thesymb;    // symbol map
-}
-
-SgSymbol *CreateListOfLocalVariables(SgStatement *header)
-{
-    SgSymbol *s, *first, *symb_list;
-    //first = header->symbol(); 
-    first = (header == top_header) ? top_node->file->firstSymbol() : header->symbol();
-    symb_list = NULL;
-    for (s = first; s; s = s->next())
-        if (SYMB_SCOPE(s->thesymb) == header->thebif) //if( s->scope() == header )
-        {
-            SYMB_LIST(s->thesymb) = symb_list ? symb_list->thesymb : NULL;    //s->thesymb->id_list
-            symb_list = s;
-        }
-
-    return symb_list;
-}
-
-SgSymbol *NextSymbol(SgSymbol *s)
-{
-    return(SymbMapping(SYMB_LIST(s->thesymb)));
-}
-
-void MakeDeclarationStmtInTop(SgSymbol *s)
-{
-    SgStatement *st;
-    st = s->makeVarDeclStmt();
-#if __SPF
-    insertBfndListIn(st->thebif, top_last_declaration->thebif, NULL);
-#else
-    top_last_declaration->insertStmtAfter(*st);
-#endif
-    top_last_declaration = st;
-    if (IS_ALLOCATABLE(s)) {
-        SgDeclarationStatement *allocatableStmt = new SgDeclarationStatement(ALLOCATABLE_STMT);
-        SgVarRefExp *expr = new SgVarRefExp(s);
-        SgExprListExp *list = new SgExprListExp(*expr);
-        allocatableStmt->setExpression(0, *list);
-#if __SPF        
-        BIF_CP(allocatableStmt->thebif) = top_last_declaration->controlParent()->thebif;
-#else
-        allocatableStmt->setControlParent(top_last_declaration->controlParent());
-#endif
-
-#if __SPF
-        insertBfndListIn(allocatableStmt->thebif, top_last_declaration->thebif, NULL);
-#else
-        top_last_declaration->insertStmtAfter(*allocatableStmt);
-#endif
-        top_last_declaration = allocatableStmt;
-    }
-}
-void MakeDeclarationStmtsForConstant(SgSymbol *s)
-{
-    SgStatement *st;
-    SgExpression *eel;
-    st = new SgStatement(PARAM_DECL);
-    eel = new SgExprListExp(*new SgRefExp(CONST_REF, *((SgConstantSymb *)s)));
-    eel->setRhs(NULL);
-    st->setExpression(0, *eel);
-#if __SPF
-    insertBfndListIn(st->thebif, top_last_declaration->thebif, NULL);
-#else
-    top_last_declaration->insertStmtAfter(*st);
-#endif
-    //top_header -> insertStmtAfter(*st);
-    st = s->makeVarDeclStmt();
-    //top_header -> insertStmtAfter(*st);
-#if __SPF
-    insertBfndListIn(st->thebif, top_last_declaration->thebif, NULL);
-#else
-    top_last_declaration->insertStmtAfter(*st);
-#endif
-    top_last_declaration = st->lexNext();
-}
-// SgConstantSymb * sc =  isSgConstantSymb(e->symbol());
-//  return(ReplaceIntegerParameter(&(sc->constantValue()->copy())));
-
-int CompareConstants(SgSymbol *rs, SgSymbol *ts)
-{
-    PTR_LLND cers, cets;
-    int ic;
-    cers = SYMB_VAL(rs->thesymb);
-    cets = SYMB_VAL(ts->thesymb);
-    if (cers->variant != cets->variant)
-        return(0);
-
-    /*
-     if(cers->variant==FLOAT_VAL || cers->variant==DOUBLE_VAL || cers->variant==STRING_VAL)
-     {   if(!strcmp(NODE_STR(cers),NODE_STR(cets)) )
-           return(1);
-         else
-           return(0);
-     }
-     if(cers->variant==COMPLEX_VAL) {
-         int icm;
-         icm = CompareConstants(NODE_TEMPLATE_LL1(cers)) && CompareConstants(cers->rhs());
-         return(icm);
-     }
-     if(cers->variant==BOOL_VAL)
-         if(NODE_BV(cers) == NODE_BV(cets))
-           return(1);
-         else
-           return(0);
-     return(0);
-    */
-
-    ic = 0;
-    switch (cers->variant)
-    {
-    case (FLOAT_VAL):
-    case (DOUBLE_VAL):
-    case (STRING_VAL):
-        if (!strcmp(NODE_STR(cers), NODE_STR(cets)))
-            ic = 1;
-        break;
-    case (BOOL_VAL):
-        if (NODE_BV(cers) == NODE_BV(cets))
-            ic = 1;;
-        break;
-    case (COMPLEX_VAL):
-        ic = CompareValues(NODE_TEMPLATE_LL1(cers), NODE_TEMPLATE_LL1(cets)) && CompareValues(NODE_TEMPLATE_LL2(cers), NODE_TEMPLATE_LL2(cets));
-        break;
-    default:
-        break;
-    }
-    return (ic);
-}
-
-int CompareValues(PTR_LLND pe1, PTR_LLND pe2)
-{
-    if (pe1->variant != pe2->variant)
-        return(0);
-    if ((pe1->variant != FLOAT_VAL) && (pe1->variant != DOUBLE_VAL))
-        return(0);
-    if (!strcmp(NODE_STR(pe1), NODE_STR(pe2)))
-        return(1);
-    return(0);
-}
-
-void CommonBlockList(SgStatement *stmt)
-{
-    SgExpression *ec, *el;
-    SgSymbol *sc;
-    for (ec = stmt->expr(0); ec; ec = ec->rhs()) // looking through COMM_LIST
-    { //if(isInCommonList(common_list->block->symbol(),common_list)
-        common_list_l = AddToBlockList(common_list_l, ec);
-        if (!common_list) common_list = common_list_l;
-        for (el = ec->lhs(); el; el = el->rhs())
-        {
-            sc = el->lhs()->symbol();
-            //if(sc && ((sc->attributes() & ALIGN_BIT) || (sc->attributes() & DISTRIBUTE_BIT)) )
-              // el->lhs()->setLhs(NULL);  
-            if (sc)
-                SYMB_ATTR(sc->thesymb) = SYMB_ATTR(sc->thesymb) | COMMON_BIT;
-        }
-    }
-}
-
-void TopCommonBlockList(SgStatement *stmt)
-{
-    SgExpression *ec, *el;
-    SgSymbol *sc;
-    for (ec = stmt->expr(0); ec; ec = ec->rhs()) // looking through COMM_LIST
-    {
-        top_common_list_l = AddToBlockList(top_common_list_l, ec);
-        if (!top_common_list) top_common_list = top_common_list_l;
-        for (el = ec->lhs(); el; el = el->rhs())
-        {
-            sc = el->lhs()->symbol();
-            //if(sc && ((sc->attributes() & ALIGN_BIT) || (sc->attributes() & DISTRIBUTE_BIT)) )
-              // el->lhs()->setLhs(NULL);  
-            if (sc)
-                SYMB_ATTR(sc->thesymb) = SYMB_ATTR(sc->thesymb) | COMMON_BIT;
-        }
-    }
-}
-
-void CreateTopCommonBlockList()
-{
-    SgStatement *stmt;
-    top_common_list = top_common_list_l = NULL;
-    top_equiv_list = top_equiv_list_l = NULL;
-    for (stmt = top_header; stmt && (stmt != top_first_executable); stmt = stmt->lexNext())
-    {
-        switch (stmt->variant())
-        {
-        case COMM_STAT:
-            TopCommonBlockList(stmt);
-            continue;
-        case EQUI_STAT:
-            //TopEquivBlockList(stmt);
-            continue;
-
-        default:
-            continue;
-        }
-    }
-}
-
-
-block_list *AddToBlockList(block_list *blist_last, SgExpression *eb)
-{
-    block_list * bl;
-    bl = new block_list;
-    bl->block = eb;
-    bl->next = NULL;
-    if (!blist_last) {
-        blist_last = bl;
-    }
-    else {
-        blist_last->next = bl;
-        blist_last = bl;
-    }
-    return(blist_last);
-}
-
-void EquivBlockList(SgStatement *stmt)
-{
-    SgExpression *ec;
-    // SgSymbol *sc; 
-    for (ec = stmt->expr(0); ec; ec = ec->rhs()) // looking through LIST
-    {
-        equiv_list_l = AddToBlockList(equiv_list_l, ec);
-        if (!equiv_list) equiv_list = equiv_list_l;
-    }
-}
-
-void RemapCommonBlocks(SgStatement *header)
-{
-    block_list *bl, *topbl;
-    SgStatement *com;
-    SgExpression *tl, *rl;
-    SgSymbol *tops = NULL;
-    //int md[1];
-   // for each subprogram COMMON block 
-    for (bl = common_list; bl; bl = bl->next)
-        if (!(topbl = isConflictingCommon(bl->block->symbol())))  //unconflicting common
-        {  //bl->block->lhs()->unparsestdout();
-            RemapCommonList(bl->block->lhs());
-            EditExpressionList(bl->block->lhs());
-            TranslateExpressionList(bl->block->lhs());
-            //bl->block->lhs()->unparsestdout();
-            com = DeclaringCommonBlock(bl->block); //creating new COMMON statement and inserting one in top routine
-#if __SPF
-            insertBfndListIn(com->thebif, top_last_declaration->thebif, NULL);
-#else
-            top_last_declaration->insertStmtAfter(*com);
-#endif
-            top_last_declaration = com;
-        }
-        else
-        {
-            tl = topbl->block->lhs();
-            rl = bl->block->lhs();
-            while (tl && rl)
-            {
-                if (!areOfSameType(tl->lhs()->symbol(), rl->lhs()->symbol()))
-                {
-                    Error("COMMON block in procedure  %s  with unconformable reference. Sorry, not implemented yet", header->symbol()->identifier(), 1, header);  //tops = generate an equivalenced top level variable
-                    printf("%s    %s\n", tl->lhs()->symbol()->identifier(), rl->lhs()->symbol()->identifier());
-                }
-                else
-                    tops = tl->lhs()->symbol();
-                RemapCommonObject(rl->lhs()->symbol(), tops); //!!! remake after realizing CalculateTopLevelRef()
-                CalculateTopLevelRef(tops, tl->lhs(), rl->lhs());
-                MakeRefsConformable(tl->lhs(), rl->lhs());
-                tl = tl->rhs();
-                rl = rl->rhs();
-            }
-        }
-}
-void RemapCommonList(SgExpression *el)
-{
-    SgExpression *coml;
-    coml = el;
-    while (coml)
-    {
-        RemapLocalObject(coml->lhs()->symbol());
-        coml = coml->rhs();
-    }
-}
-
-int areOfSameType(SgSymbol *st, SgSymbol *sr)
-{
-    int res;
-    SgType *tt, *rt;
-    tt = BaseType(st->type());
-    rt = BaseType(sr->type());
-    res = tt->variant() == rt->variant() && TypeSize(tt) && TypeSize(tt) == TypeSize(rt);
-    return(res);
-}
-
-int IntrinsicTypeSize(SgType *t)
-{
-    switch (t->variant()) {
-    case T_INT:
-    case T_BOOL:     return (4);
-    case T_FLOAT:    return (4);
-    case T_COMPLEX:  return (8);
-    case T_DOUBLE:   return (8);
-
-    case T_DCOMPLEX: return(16);
-
-    case T_STRING:
-    case T_CHAR:
-        return(1);
-    default:
-        return(0);
-    }
-}
-
-int TypeSize(SgType *t)
-{
-    //SgExpression *le;
-    int len;
-    if (!TYPE_RANGES(t->thetype) && !TYPE_KIND_LEN(t->thetype))       return (IntrinsicTypeSize(t));
-
-    if ((len = TypeLength(t)))    return(len);
-
-    //le = TypeLengthExpr(t);
-    //if(le->isInteger()){
-    //  len = le->valueInteger();
-    //  len = len < 0 ? 0 : len; //according to standard F90
-    //} else
-    //  len = -1; //may be error situation
-
-    return(0);
-}
-
-int TypeLength(SgType *t)
-{
-    SgExpression *le;
-    SgValueExp *ve;
-    //if(t->variant() == T_STRING)   return (0);
-    if (TYPE_RANGES(t->thetype)) {
-        le = t->length();
-        if ((ve = isSgValueExp(le)))
-            return (ve->intValue());
-        else
-            return (0);
-    }
-    if (TYPE_KIND_LEN(t->thetype)) {        /*22.04.14*/
-        le = t->selector()->lhs();
-        if ((ve = isSgValueExp(le)))
-            if (t->variant() == T_COMPLEX || t->variant() == T_DCOMPLEX)
-                return (2 * ve->intValue());
-            else
-                return (ve->intValue());
-        else
-            return (0);
-    }
-
-    return(0);
-}
-
-SgType *BaseType(SgType *type)
-{
-    return (isSgArrayType(type) ? type->baseType() : type);
-}
-
-int isUnconflictingCommon(SgSymbol *s)
-{
-    block_list *bl;
-    for (bl = top_common_list; bl; bl = bl->next)
-        if (bl->block->symbol() == s)
-            return(0);
-    return(1);
-}
-
-block_list *isConflictingCommon(SgSymbol *s)
-{
-    block_list *bl;
-    //printSymb(s);
-    //printf("  variant %d\n",s->variant());
-    for (bl = top_common_list; bl; bl = bl->next) {
-        //if(bl && bl->block ) printSymb(bl->block->symbol());
-        if (bl->block->symbol() == s)
-            return(bl);
-    }
-    //printf("NO\n");
-    return(NULL);
-}
-
-block_list *isInCommonList(SgSymbol *s, block_list *blc)
-{
-    block_list *bl;
-    for (bl = blc; bl; bl = bl->next)
-        if (bl->block->symbol() == s)
-            return(bl);
-    return(NULL);
-}
-
-
-SgStatement *DeclaringCommonBlock(SgExpression *bl)
-{
-    SgStatement *com;
-    //SgExpression *eeq;
-        // eeq = new SgExpression (COMM_LIST);
-        // eeq -> setSymbol(*bl->symbol());
-        // eeq -> setLhs(*bl->lhs());
-        // com = new SgStatement(COMM_STAT);
-        // com->setExpression(0,*eeq);
-    com = new SgStatement(COMM_STAT);
-    com->setExpression(0, *bl);
-
-    return(com);
-}
-//-------------------------------------------------------------------------------------------
-
-
-
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-//    S I T E - S P E C I F I C    T R A N S F O R M A T I O N S
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-
-void RemapFunctionResultVar(SgExpression *topref, SgSymbol *sf)
-{
-    SgSymbol *topvar;
-    topvar = topref->symbol();
-    sf->thesymb->entry.Template.declared_name = topvar->thesymb;    // symbol map
-    if (isSgArrayRefExp(topref) && topref->lhs())
-        sf->addAttribute(ARRAY_MAP_1, (void *)topref, 0);
-}
-
-void ConformActualAndFormalParameters(SgSymbol *scopy, SgExpression *args, SgStatement *parentSt)
-{
-    PTR_SYMB  dummy;
-    SgSymbol *darg;
-    SgExpression *fact, *farglist;
-    //int cnf_type;
-    int adj;
-    adj = 0;
-    farglist = args;
-    dummy = scopy->thesymb->entry.proc_decl.in_list;
-    /*
-      if(!dummy) return;
-        printf("dummy of %s: %s\n",scopy->identifier(),dummy->ident);
-      next = dummy->entry.var_decl.next_in ;
-      while(next)
-      {   //if(!next) return;
-        printf("dummy of %s: %s\n",scopy->identifier(),next->ident);
-        next = next->entry.var_decl.next_in ;
-      }
-   */
-
-
-   // alternative return, dummy is *, represented by symbol with kind DEFAULT and name "*" !!!!????
-
-    while (dummy && farglist)
-    {  // printf("dummy of %s: %s\n",scopy->identifier(),dummy->ident);
-        fact = farglist->lhs();
-        darg = SymbMapping(dummy);
-        if (isAdjustableArray(darg))
-        {
-            adj = 1;
-            darg->addAttribute(ADJUSTABLE_, (void *)fact, 0);
-        }
-        else
-            ConformReferences(darg, fact, parentSt);
-        dummy = dummy->entry.var_decl.next_in;
-        farglist = farglist->rhs();
-    }
-    dummy = scopy->thesymb->entry.proc_decl.in_list;
-    while (adj && dummy)
-    {
-        darg = SymbMapping(dummy);
-        if ((fact = ADJUSTABLE(darg)))
-        {
-            TranslateArrayTypeExpressions(darg);
-            ConformReferences(darg, fact, parentSt);
-        }
-        dummy = dummy->entry.var_decl.next_in;
-    }
-
-}
-
-void ConformReferences(SgSymbol *darg, SgExpression *fact, SgStatement *parentSt)
-{
-    int cnf_type;
-
-    cnf_type = TestConformability(darg, fact, parentSt);
-    if (!cnf_type)
-    {
-        Error("Non conformable %s. Case not implemented yet", darg->identifier(), 1, parentSt); // not realized
-        //fact->unparsestdout(); printf("\n"); darg->scope()->unparsestdout();
-        if (deb_reg)
-            printf("Non conformable. Case not implemented yet\n");
-    }
-
-    switch (cnf_type)
-    {
-    case _IDENTICAL_:
-        darg->thesymb->entry.Template.declared_name = fact->symbol()->thesymb;
-        break;
-
-    case SCALAR_ARRAYREF:
-        darg->thesymb->entry.Template.declared_name = fact->symbol()->thesymb;
-        darg->addAttribute(ARRAY_MAP_1, (void *)fact, 0);
-        break;
-
-    case _SUBARRAY_:
-        darg->thesymb->entry.Template.declared_name = fact->symbol()->thesymb;
-        darg->addAttribute(ARRAY_MAP_1, (void *)(fact->lhs()), 0);
-        break;
-    case _CONSTANT_:
-        darg->addAttribute(CONSTANT_MAP, (void *)fact, 0);
-        break;
-    case VECTOR_ARRAYREF:
-        darg->thesymb->entry.Template.declared_name = fact->symbol()->thesymb;
-        //if(fact->lhs()->lhs())
-        darg->addAttribute(ARRAY_MAP_2, (void *)(fact->lhs()), 0);
-        break;
-    case _ARRAY_:
-        break;
-    }
-}
-
-int isAdjustableArray(SgSymbol *param)
-{
-    int rank, j;
-    if (!isSgArrayType(param->type()))
-        return(0);
-    rank = Rank(param);
-    for (j = 0; j < rank; j++)
-    {
-        if (isAdustableBound(LowerBound(param, j)))
-            return(1);;
-
-        if (isAdustableBound(UpperBound(param, j)))
-            return(1);;
-    }
-    return(0);
-}
-
-SgSymbol *FirstDummy(SgSymbol *sf)
-{
-    return(SymbMapping(sf->thesymb->entry.proc_decl.in_list));
-}
-
-
-SgSymbol *NextDummy(SgSymbol *s)
-{    
-    return(SymbMapping(s->thesymb->entry.var_decl.next_in));
-}
-
-int TestConformability(SgSymbol *darg, SgExpression *fact, SgStatement *parentSt)
-{
-    SgArrayType *ftp;
-
-    if (isFormalProcedure(darg))
-        return(_IDENTICAL_);
-
-    if (!SameType(darg, fact))
-        return(NON_CONFORMABLE);
-
-    if (isSgValueExp(fact))
-        return(_CONSTANT_);
-
-    if (isScalar(darg))
-    {  //printf("scalar %s(%d): %s\n", darg->identifier(),darg->variant(),fact->symbol()->identifier());
-        if (isSgArrayRefExp(fact) && fact->lhs() && !isSgArrayType(fact->type()))
-            return(SCALAR_ARRAYREF);
-        else
-            return(_IDENTICAL_);
-    }
-
-    if (isArray(darg))
-    {  //printf("array %s(%d): %s\n", darg->identifier(),darg->variant(),fact->symbol()->identifier()); 
-        if ((ftp = isSgArrayType(fact->symbol()->type())) && fact->lhs() && TestShapes(ftp, (SgArrayType *)(darg->type())) && TestBounds(fact, ftp, (SgArrayType *)(darg->type())))
-            return(_SUBARRAY_);
-        if ((ftp = isSgArrayType(fact->symbol()->type())) && fact->lhs() && TestVector(fact, ftp, (SgArrayType *)(darg->type())))
-            return(VECTOR_ARRAYREF);
-
-        if ((ftp = isSgArrayType(fact->symbol()->type())) && !fact->lhs() && SameShapes(ftp, (SgArrayType *)(darg->type())))
-            return(_IDENTICAL_);
-
-    }
-    Error("TestConformability(%s,...). Case not implemented yet", darg->identifier(), 1, parentSt);
-    if (deb_reg)
-        printf("TestConformability(). Case not implemented yet\n");
-    return(NON_CONFORMABLE);
-}
-
-int SameType(SgSymbol *darg, SgExpression *fact)
-{
-    SgType *dtype, *fact_type, *fstype;
-    SgSymbol *fsymb;
-    dtype = darg->type();
-    if (isSgArrayType(dtype))
-        dtype = dtype->baseType();
-    fact_type = fact->type();
-    fsymb = fact->symbol();
-
-    // if(isSgVarRefExp(fact) && !isSgArrayType(fact->symbol()->type()) && 
-    //    Same(dtype,fact->symbol()->type())
-    //   return(1);
-
-     //if(isScalar(darg) && !isSgArrayType(fact->type()))
-    {   if (isSgVarRefExp(fact) || fact->variant() == CONST_REF)
-        return(Same(fsymb->type(), dtype));
-    if (isSgArrayRefExp(fact) && isSgArrayType(fsymb->type()))
-        return(Same(fsymb->type()->baseType(), dtype));
-    if (isSgValueExp(fact))
-        return(Same(fact->type(), dtype));
-    if (isSgArrayRefExp(fact) && fsymb->type()->variant() == T_STRING)
-        return(Same(fsymb->type(), dtype));
-    if (fact->variant() == ARRAY_OP)
-    {
-        if (isSgArrayType(fstype = fact->lhs()->symbol()->type()))
-            fstype = fstype->baseType();
-        return(Same(fstype, dtype));
-    }
-    }
-    ////!!!!!!!
-    return(0);
-}
-
-int Same(SgType *ft, SgType *dt)
-{
-    //TYPE_RANGES((T)->thetype)
-
-    if (!ft || !dt)
-        return(1);
-    if ((dt->variant() == T_STRING) != 0)
-    {
-        if (ft->variant() == dt->variant())
-            return(1);
-        else
-            return(0);
-    }
-
-    if (ft->variant() == dt->variant() && TypeSize(ft) && TypeSize(ft) == TypeSize(dt))
-        return(1);
-
-    if (ft->variant() == T_DOUBLE && dt->variant() == T_FLOAT && TypeSize(ft) == TypeSize(dt))
-        return(1);
-    if (dt->variant() == T_DOUBLE && ft->variant() == T_FLOAT && TypeSize(ft) == TypeSize(dt))
-        return(1);
-
-    if (ft->variant() == T_DCOMPLEX && dt->variant() == T_COMPLEX && TypeSize(ft) == TypeSize(dt))
-        return(1);
-    if (dt->variant() == T_DCOMPLEX && ft->variant() == T_COMPLEX && TypeSize(ft) == TypeSize(dt))
-        return(1);
-    return(0);
-
-    //return(1); // temporary!!!!
-}
-
-int isScalar(SgSymbol *symb)
-{
-    if ((symb->variant() == VARIABLE_NAME) && !isSgArrayType(symb->type()))
-        return(1);
-    else
-        return(0);
-}
-
-int isArray(SgSymbol *symb)
-{
-    if ((symb->variant() == VARIABLE_NAME) && isSgArrayType(symb->type()))
-        return(1);
-    else
-        return(0);
-}
-
-int isFormalProcedure(SgSymbol *symb)
-{
-    switch (symb->variant())
-    {
-    case PROCEDURE_NAME:
-    case FUNCTION_NAME:
-    case ROUTINE_NAME:
-        return(1);
-    default:
-        return(0);
-    }
-}
-
-/*
-int TestShapes(SgArrayType *ftp, SgArrayType *dtp)
-{SgExpression *fe, *de;
-
- if(dtp && dtp->dimension() == 1 && ftp->dimension() > 1 && IdenticalValues((fe=ftp->sizeInDim(0)),(de=dtp->sizeInDim(0))) && IdenticalValues(LowerBoundOfDim(fe),LowerBoundOfDim(de)) )
-    return(1);
- else
-    return(0);
-}
-*/
-
-int TestShapes(SgArrayType *ftp, SgArrayType *dtp)
-{
-    SgExpression *fe, *de;
-    int rank, i;
-    if (!dtp || !ftp) return(0);
-    rank = dtp->dimension();
-    if (rank > ftp->dimension())
-        return(0);
-
-    for (i = 0; i < rank; i++)
-    {
-        fe = ftp->sizeInDim(i);
-        de = dtp->sizeInDim(i);
-        if (!SameDims(fe, de))
-            return(0);
-    }
-    return(1);
-}
-
-int TestBounds(SgExpression *fact, SgArrayType *ftp, SgArrayType *dtp)
-{
-    SgExpression *fe, *fl;
-    int rank, i;
-    if (!dtp || !ftp) return(0);
-    rank = dtp->dimension();
-    fl = fact->lhs();
-    for (i = 0; i < rank; i++, fl = fl->rhs())
-    {
-        fe = ftp->sizeInDim(i);
-        if (!isSgSubscriptExp(fe) && fl->lhs()->isInteger() && fl->lhs()->valueInteger() == 1)
-            continue;
-        if (IdenticalValues(fl->lhs(), LowerBoundOfDim(fe)))
-            continue;
-        else
-            return(0);
-    }
-    return(1);
-}
-
-int TestVector(SgExpression *fact, SgArrayType *ftp, SgArrayType *dtp)
-{//SgExpression *fe, *de, *e1;
-    int rank;
-    if (!dtp || !ftp) return(0);
-    rank = dtp->dimension();
-    if (rank > 1) return(0);
-    //fl = fact->lhs();
-    //de=dtp->sizeInDim(0);
-    //fe=ftp->sizeInDim(0);
-   /* e1=&(*(fl->lhs()) - (LowerBoundOfDim(de)->copy()));
-    fl->setLhs(e1);
-    if(e1->isInteger() && e1->valueInteger()==0)
-      fl->setLhs(NULL);
-   */
-    return(1);
-}
-
-
-int SameDims(SgExpression *fe, SgExpression *de)
-{
-    if (isSgSubscriptExp(fe) || isSgSubscriptExp(de))
-    {
-        if (!IdenticalValues(LowerBoundOfDim(fe), LowerBoundOfDim(de)))
-            return(0);
-    }
-    if (!IdenticalValues(UpperBoundOfDim(fe), UpperBoundOfDim(de)))
-        return(0);
-
-    return(1);
-}
-
-
-int SameShapes(SgArrayType *ftp, SgArrayType *dtp)
-{
-    SgExpression *fe, *de;
-    int rank, i;
-    if (!dtp || !ftp) return(0);
-    rank = dtp->dimension();
-    if (rank != ftp->dimension())
-        return(0);
-
-    for (i = 0; i < rank; i++)
-    {
-        fe = ftp->sizeInDim(i);
-        de = dtp->sizeInDim(i);
-        if (isSgSubscriptExp(fe) || isSgSubscriptExp(de))
-        {
-            if (!IdenticalValues(LowerBoundOfDim(fe), LowerBoundOfDim(de)))
-                return(0);
-        }
-        if (i < rank - 1 && !IdenticalValues(UpperBoundOfDim(fe), UpperBoundOfDim(de)))
-            return(0);
-    }
-    return(1);
-}
-
-SgExpression *LowerBoundOfDim(SgExpression *e)
-// lower bound of dimension e
-{
-    SgSubscriptExp *sbe;
-
-    if (!e)
-        return(NULL);
-
-    if ((sbe = isSgSubscriptExp(e)) != NULL) {
-        if (sbe->lbound())
-            return(sbe->lbound());
-        else
-            return(new SgValueExp(1));
-    }
-    else
-        return(new SgValueExp(1));  // by default lower bound = 1      
-}
-
-SgExpression *UpperBoundOfDim(SgExpression *e)
-// upper bound of dimension e
-{
-    SgSubscriptExp *sbe;
-
-    if (!e)
-        return(NULL);
-    if ((sbe = isSgSubscriptExp(e)) != NULL) {
-        if (sbe->ubound())
-            return(sbe->ubound());
-    }
-    return(e);
-
-}
-
-
-SgExpression *FirstIndexChange(SgExpression *e, SgExpression *index)
-{ //SgExpression *e0;
-  //e0 = e->lhs();
-    if (!index)
-        return(e);
-    e->setLhs(index->copy());
-    return(e);
-}
-
-SgExpression *IndexChange(SgExpression *e, SgExpression *index, SgExpression *lbe)
-{
-    SgExpression *e0;
-    int iv;
-    if (!index)
-        return(e);
-    //e->setLhs(index->copy()+*(e->lhs())-lbe->copy());
-
-    e0 = &(*(e->lhs()) - lbe->copy());
-
-    if (e0->isInteger())
-    {
-        if ((iv = e0->valueInteger()) == 0)
-            e->setLhs(index->copy());
-        else
-            e->setLhs(index->copy() + *new SgValueExp(iv));
-    }
-    else
-        e->setLhs(index->copy() + *e0);
-    return(e);
-}
-
-SgExpression *FirstIndexesChange(SgExpression *mape, SgExpression *re)
-{
-    SgExpression *el, *mel;
-    for (el = re, mel = mape; el; el = el->rhs(), mel = mel->rhs())
-        mel->setLhs(el->lhs());
-    return(mape);
-}
-
-
-
-int IdenticalValues(SgExpression *e1, SgExpression *e2)
-{
-    //return(ExpCompare(Calculate(e1), Calculate(e2)));
-    if (!e1 || !e2)
-        return(0);
-    if (e1->isInteger() && e2->isInteger())
-    {
-        if (e1->valueInteger() == e2->valueInteger())
-            return(1);
-        else
-            return(0);
-    }
-    else
-        return(0);
-}
-
-void TranslateArrayTypeExpressions(SgSymbol *darg)
-{
-    SgArrayType *arrtype;
-    SgExpression *el;
-    int rank, md;
-    arrtype = isSgArrayType(darg->type());
-    rank = arrtype->dimension();
-    el = arrtype->getDimList();
-    TranslateExpression(el, &md);
-
-}
-
-SgStatement *TranslateSubprogramReferences(SgStatement *header)
-{
-    SgStatement *stmt, *last, *first_executable = NULL, *last_decl;
-    SgSymbol *s_top;
-    int mdfd[3];
-    last = header->lastNodeOfStmt();
-    cur_func = top_header;
-    for (stmt = header->lexNext(); stmt && (stmt != last); stmt = stmt->lexNext())
-        if (isSgExecutableStatement(stmt) && stmt->variant() != FORMAT_STAT) {
-            first_executable = stmt;  break;
-        }
-    last_decl = stmt->lexPrev();
-    for (stmt = first_executable; stmt && (stmt != last); stmt = stmt->lexNext())
-    {
-        mdfd[0] = mdfd[1] = mdfd[2] = 0; //modified=0;
-        switch (stmt->variant())
-        {
-            /* case OPEN_STAT:
-               case CLOSE_STAT:
-               case INQUIRE_STAT:
-               case BACKSPACE_STAT:
-               case ENDFILE_STAT:
-               case REWIND_STAT:
-                    break;
-            */
-        case WRITE_STAT:
-        case READ_STAT:
-        case PRINT_STAT:
-            //mdfd[0]=mdfd[1]=0; //modified=0;
-            if (stmt->expr(1))
-                stmt->setExpression(1, *TranslateExpression(stmt->expr(1), &mdfd[1]));
-            if (stmt->expr(0))
-                stmt->setExpression(0, *TranslateExpression(stmt->expr(0), &mdfd[0]));
-            if (mdfd[0] || mdfd[1])
-                StatementCleaning(stmt);
-            continue;
-
-        case FOR_NODE:
-        case PROC_STAT:
-            if ((s_top = SymbolMap(stmt->symbol())) != 0)
-            {
-                stmt->setSymbol(*s_top);
-                if (stmt->variant() == PROC_STAT)
-                    mdfd[0] = 1;
-            }
-
-        default:
-            //mdfd[0]=mdfd[1]=mdfd[2]=0; //modified=0;
-            if (stmt->expr(0))
-                stmt->setExpression(0, *TranslateExpression(stmt->expr(0), &mdfd[0]));
-            if (stmt->expr(1))
-                stmt->setExpression(1, *TranslateExpression(stmt->expr(1), &mdfd[1]));
-            if (stmt->expr(2))
-                stmt->setExpression(2, *TranslateExpression(stmt->expr(2), &mdfd[2]));
-            if (mdfd[0] || mdfd[1] || mdfd[2])
-                StatementCleaning(stmt);
-            continue;
-        }
-
-    }
-    return(last_decl->lexNext());
-}
-
-SgExpression *TranslateExpression(SgExpression *e, int *md)
-{
-    SgExpression *el, *aref, *cref;
-    SgSymbol *s_top, *s;
-    if (!e)
-        return(e);
-
-    if (isSgArrayRefExp(e))
-    {
-        for (el = e->lhs(); el; el = el->rhs())
-            el->setLhs(TranslateExpression(el->lhs(), md));
-        s = e->symbol();
-        /* if((s_top=SymbolMap(s)))
-          if(!(aref=ArrayMap(s)))
-            e->setSymbol(s_top);
-          else if(aref->variant() == EXPR_LIST)
-          { e->setSymbol(s_top);
-            e->setLhs(FirstIndexesChange(&(aref->copy()),e->lhs()));
-            *md = 1;
-          }
-        */
-        if ((s_top = SymbolMap(s)))
-            e->setSymbol(s_top);
-        if ((aref = ArrayMap(s)) && (aref->variant() == EXPR_LIST))
-        {
-            e->setLhs(FirstIndexesChange(&(aref->copy()), e->lhs()));
-            *md = 1;
-        }
-        if ((aref = ARRAYMAP2(s)))
-        {
-            e->setLhs(IndexChange(&(aref->copy()), e->lhs(), LowerBound(s, 0)));
-            *md = 1;
-        }
-        return(e);
-    }
-    //if(e->variant()==ARRAY_OP)
-    // ;
-    if (isSgVarRefExp(e))
-    {
-        s = e->symbol();
-        //if((s_top=SymbolMap(s)) && !ArrayMap(s))
-         // e->setSymbol(s_top);
-        if ((s_top = SymbolMap(s)) != 0)
-        {
-            if (!(aref = ArrayMap(s)))
-                e->setSymbol(s_top);
-            else      //if(aref->variant() == ARRAY_REF)
-            {
-                NODE_CODE(e->thellnd) = ARRAY_REF;   //e->setVariant(ARRAY_REF);
-                e->setSymbol(s_top);
-                e->setLhs(aref->lhs()->copy());
-            }
-        }
-
-        if ((cref = CONSTANTMAP(s)))
-        {
-            return(&(cref->copy()));
-        }
-
-        return(e);
-    }
-
-    if (e->variant() == CONST_REF)
-    {
-        s = e->symbol();
-        if ((s_top = SymbolMap(s)))
-            e->setSymbol(s_top);
-        return(e);
-    }
-
-
-    if (isSgFunctionCallExp(e))
-    {
-        s = e->symbol();
-        if ((s_top = SymbolMap(s)))
-        {
-            e->setSymbol(s_top);
-            *md = 1;
-        }
-    }
-
-    e->setLhs(TranslateExpression(e->lhs(), md));
-    e->setRhs(TranslateExpression(e->rhs(), md));
-    return(e);
-}
-
-
-/*
-void TranslateExpression(SgExpression *e, int *md)
-{  SgExpression *el, *aref;
-   SgSymbol *s_top, *s;
- if(!e)
-  return;
- if(isSgArrayRefExp(e))
- {
-   for(el=e->lhs();el;el=el->rhs())
-      TranslateExpression(el->lhs(),md);
-   s= e->symbol();
-   if((s_top=SymbolMap(s)))
-    if(!(aref=ArrayMap(s)))
-      e->setSymbol(s_top);
-    else if(aref->variant() == EXPR_LIST)
-    { e->setSymbol(s_top);
-      e->setLhs(FirstIndexChange(&(aref->copy()),e->lhs()->lhs()));
-      *md = 1;
-    }
-   return;
- }
- //if(e->variant()==ARRAY_OP)
- // ;
- if(isSgVarRefExp(e))
- { s= e->symbol();
-   //if((s_top=SymbolMap(s)) && !ArrayMap(s))
-    // e->setSymbol(s_top);
-   if((s_top=SymbolMap(s)) )
-     if(!(aref=ArrayMap(s)))
-       e->setSymbol(s_top);
-     else      //if(aref->variant() == ARRAY_REF)
-     { NODE_CODE(e->thellnd) = ARRAY_REF;   //e->setVariant(ARRAY_REF);
-       e->setSymbol(s_top);
-       e->setLhs(aref->lhs()->copy());
-     }
-   return;
- }
- TranslateExpression(e->lhs(),md);
- TranslateExpression(e->rhs(),md);
-}
-*/
-
-void TranslateExpression_1(SgExpression *e)
-{
-    SgExpression *el;
-    SgSymbol *s_top, *s;
-    if (!e)
-        return;
-    if (isSgArrayRefExp(e))
-    {
-        for (el = e->lhs(); el; el = el->rhs())
-            TranslateExpression_1(el->lhs());
-        s = e->symbol();
-        if ((s_top = SymbolMap(s)) && !ArrayMap(s))
-            e->setSymbol(s_top);
-        return;
-    }
-    //if(e->variant()==ARRAY_OP)
-    // ;
-    if (isSgVarRefExp(e))
-    {
-        s = e->symbol();
-        if ((s_top = SymbolMap(s)) && !ArrayMap(s))
-            e->setSymbol(s_top);
-        return;
-    }
-    TranslateExpression_1(e->lhs());
-    TranslateExpression_1(e->rhs());
-}
-
-void EditExpressionList(SgExpression *e)
-{
-    SgExpression *el;
-    for (el = e; el; el = el->rhs())
-        el->lhs()->setLhs(NULL);
-}
-
-
-void TranslateExpressionList(SgExpression *e)
-{
-    SgExpression *el;
-    for (el = e; el; el = el->rhs())
-        TranslateExpression_1(el->lhs());
-}
-
-SgSymbol *SymbolMap(SgSymbol *s)
-{
-    return(SymbMapping(s->thesymb->entry.Template.declared_name));
-}
-
-SgExpression *ArrayMap(SgSymbol *s)
-{
-    SgExpression *aref;
-    if ((aref = ARRAYMAP(s)))
-        return(aref);
-    else
-        return(NULL);
-}
-
-SgExpression *ArrayMap2(SgSymbol *s)
-{
-    SgExpression *aref;
-    if ((aref = ARRAYMAP2(s)))
-        return(aref);
-    else
-        return(NULL);
-}
-
-void InsertBlockAfter(SgStatement *after, SgStatement *first, SgStatement *header)
-{
-    SgStatement *prevst, *last;
-    last = header->lastNodeOfStmt();
-    if ((prevst = last->lexPrev()) && prevst->variant() == CONT_STAT && !(prevst->hasLabel()))
-        prevst->extractStmt();
-    header->extractStmt();
-#if __SPF
-    insertBfndListIn(first->thebif, after->thebif, NULL);
-#else
-    after->insertStmtAfter(*first);
-#endif
-    last->extractStmt();  //extract  END
-
-}
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-//      S T A T E M E N T S  (inserting, creating and so all)
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-
-void InsertNewStatementBefore(SgStatement *stat, SgStatement *current) {
-    //SgExpression *le;
-    //SgValueExp * index;
-    SgStatement *st;
-
-    st = current->controlParent();
-    if (st->variant() == LOGIF_NODE) { // Logical IF
-       // change by construction IF () THEN <current> ENDIF and
-       // then insert statement before current statement
-        st->setVariant(IF_NODE);
-#if __SPF
-        insertBfndListIn((new SgStatement(CONTROL_END))->thebif, current->thebif, NULL);
-#else
-        current->insertStmtAfter(*new SgStatement(CONTROL_END));
-#endif
-
-#if __SPF
-        insertBfndListIn(stat->thebif, st->thebif, NULL);
-#else
-        st->insertStmtAfter(*stat);
-#endif
-        return;
-    }
-
-    if (current->hasLabel() && current->variant() != FORMAT_STAT && current->variant() != DATA_DECL && current->variant() != ENTRY_STAT) { //current statement has label
-      //insert statement before current and set on it the label of current
-        SgLabel *lab;
-        lab = current->label();
-        BIF_LABEL(current->thebif) = NULL;
-        current->insertStmtBefore(*stat, *current->controlParent());//inserting before current statement
-        stat->setLabel(*lab);
-        return;
-    }
-    current->insertStmtBefore(*stat, *current->controlParent());//inserting before current statement 
-}
-
-void InsertNewStatementAfter(SgStatement *stat, SgStatement *current, SgStatement *cp)
-{
-    SgStatement *st;
-    st = current;
-    if (current->variant() == LOGIF_NODE)   // Logical IF
-        st = current->lexNext();
-    if (cp->variant() == LOGIF_NODE)
-        LogIf_to_IfThen(cp);
-    st->insertStmtAfter(*stat, *cp);
-    // cur_st = stat;
-}
-
-void LogIf_to_IfThen(SgStatement *stmt)
-{
-    //replace Logical IF statement: IF ( <condition> ) <statement>
-    // by construction:  IF  ( <condition> ) THEN
-    //                         <statement> 
-    //                   ENDIF
-    stmt->setVariant(IF_NODE);
-    (stmt->lexNext())->insertStmtAfter(*new SgControlEndStmt(), *stmt);
-}
-
-void ReplaceContext(SgStatement *stmt)
-{
-    if (isDoEndStmt(stmt))
-        ReplaceDoNestLabel(stmt, NewLabel());
-    else if (isSgLogIfStmt(stmt->controlParent())) {
-        if (isDoEndStmt(stmt->controlParent()))
-            ReplaceDoNestLabel(stmt->controlParent(), NewLabel());
-        LogIf_to_IfThen(stmt->controlParent());
-    }
-}
-
-int isDoEndStmt(SgStatement *stmt)
-{
-    SgLabel *lab, *do_lab;
-    SgForStmt *parent;
-    if (!(lab = stmt->label()) && stmt->variant() != CONTROL_END) //the statement has no label and
-        return(0);                                               //is not ENDDO 
-    parent = isSgForStmt(stmt->controlParent());
-    if (!parent)  //parent isn't DO statement
-        return(0);
-    do_lab = parent->endOfLoop(); // label of loop end or NULL
-    if (do_lab) //  DO statement with label
-        if (lab && LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(do_lab->thelabel))
-            // the statement label is the label of loop end  
-            return(1);
-        else
-            return(0);
-    else   //  DO statement without label
-        if (stmt->variant() == CONTROL_END)
-            return(1);
-        else
-            return(0);
-}
-void ReplaceDoNestLabel(SgStatement *last_st, SgLabel *new_lab)
-//replaces the label of DO statement nest, which is ended by last_st,
-// by new_lab
-//         DO 1 I1 = 1,N1                              DO 99999 I1 = 1,N1
-//         DO 1 I2 = 1,N2                              DO 99999 I2 = 1,N2
-//          .  .   .                                      .  .   .       
-//         DO 1 IK = 1,NK                              DO 99999 IK = 1,NK
-//           . . .                                      .  .   . 
-// 1       statement                              1     statement   
-//                                            99999    CONTINUE
-{
-    SgStatement *parent, *st;
-    SgLabel *lab;
-    SgForStmt *do_st;
-    parent = last_st->controlParent();
-    lab = last_st->label();
-    while ((do_st = isSgForStmt(parent)) != NULL && do_st->endOfLoop()) {
-        if (LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(do_st->endOfLoop()->thelabel)) {
-            if (!new_lab)
-                new_lab = NewLabel();
-            BIF_LABEL_USE(do_st->thebif) = new_lab->thelabel;
-            parent = parent->controlParent();
-        }
-        else
-            break;
-    }
-    //inserts CONTINUE statement with new_lab as label  
-    st = new SgStatement(CONT_STAT);
-    st->setLabel(*new_lab);
-    SetScopeOfLabel(new_lab, cur_func);
-    // for debug regim
-    LABEL_BODY(new_lab->thelabel) = st->thebif;
-    //BIF_LINE(st->thebif) = (last_st->lineNumber()) ? last_st->lineNumber() : LineNumberOfStmtWithLabel(lab);
-    if (last_st->variant() != LOGIF_NODE)
-        last_st->insertStmtAfter(*st, *last_st->controlParent());
-    else
-        (last_st->lexNext())->insertStmtAfter(*st, *last_st->controlParent());
-}
-
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-//   T E M P O R A R Y   V A R I B L E S
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-
-SgSymbol *GetTempVarForF(SgSymbol *sf, SgType *t)
-{
-    char *name;
-    SgSymbol *sn;
-    name = new char[80];
-    sprintf(name, "%s_%d_%d", sf->identifier(), sf->id(), vcounter++);
-    sn = new SgVariableSymb(name, *t, *cur_func);
-    if (isInSymbolTable(sn))
-        sn = GetTempVarForF(sf, t);
-    if (cur_func == top_header)
-        top_temp_vars = AddToSymbList(top_temp_vars, sn);
-    return(sn);
-}
-
-SgType * TypeOfResult(SgExpression *e)
-{
-    int indf;
-    SgSymbol *sf;
-    sf = e->symbol();
-    indf = is_IntrinsicFunction(sf);
-    if (deb_reg > 2)
-        printf("indf: %d\n", indf);
-    if (indf > 0)
-        return(TypeF(indf, e));
-    else
-        return(sf->type());
-}
-
-SgType *TypeF(int indf, SgExpression *e)
-{
-    graph_node *gnode;
-    //SgFile *f;
-    gnode = getAttrNodeForSymbol(e->symbol());
-    current_file = gnode->file;
-
-    switch (intrinsic_type[indf])
-    {
-    case 1:    return(SgTypeInt());
-    case 2:    return(SgTypeBool());
-    case 3:    return(SgTypeFloat());
-    case 4:    return(SgTypeDouble());
-    case 5:    return(SgTypeComplex(current_file));
-    case 6:    return(SgTypeDoubleComplex(current_file));
-    case 7:    return(SgTypeChar());
-    case (-1): //return(e->lhs()->lhs()->type()); //type of first argument
-        return(TypeOfArgument(e->lhs()->lhs()));
-    default:
-        return(NULL);
-    }
-}
-
-SgType *TypeOfArgument(SgExpression *e)
-//set_expr_type() in types.c
-{
-    SgType *t;
-    //int indf;
-    //SgSymbol *sf;
-    t = e ? e->type() : NULL;
-    switch (e->variant()) {
-    case (FUNC_CALL):
-    {
-        /*  sf = e->symbol();
-          indf=is_IntrinsicFunction(sf);
-          if(indf>0 )
-          { t=TypeF(indf,e);
-            if(!t)
-              t=sf->type();
-          }
-          else
-            t=sf->type();
-        */
-        t = TypeOfResult(e);
-        break;
-    }
-    /*    case (VAR_REF):
-             if(e->symbol())
-               t=e->symbol()->type();
-             else
-               t=NULL;
-        case (ARRAY_REF):
-
-        case (AND_OP):
-        case (OR_OP):
-        case (EQ_OP):
-        case (LT_OP):
-        case (GT_OP):
-        case (NOTEQL_OP):
-        case (LTEQL_OP):
-        case (EQV_OP):
-        case (NEQV_OP):
-        case (GTEQL_OP):
-    */
-    case (DIV_OP):
-    case (ADD_OP):
-    case (SUBT_OP):
-    case (MULT_OP):
-    case (EXP_OP):
-    {PTR_LLND expr, len;
-    PTR_TYPE l_operand, r_operand;
-    int l_type, r_type, ilen = 0;
-    expr = e->thellnd;
-    l_operand = expr->entry.binary_op.l_operand->type;
-    r_operand = expr->entry.binary_op.r_operand->type;
-    if (!l_operand || !r_operand)
-        break;
-    else {
-        if (l_operand->variant == T_ARRAY)
-            l_type = l_operand->entry.ar_decl.base_type->variant;
-        else
-            l_type = l_operand->variant;
-        if (r_operand->variant == T_ARRAY)
-            r_type = r_operand->entry.ar_decl.base_type->variant;
-        else
-            r_type = r_operand->variant;
-        if (l_operand->entry.Template.ranges)
-        {
-            len = (l_operand->entry.Template.ranges)->entry.Template.ll_ptr1;
-            if (len && len->variant == INT_VAL)
-                ilen = len->entry.ival;
-            if (l_type == T_FLOAT && ilen == 8)
-                l_type = T_DOUBLE;
-            if (l_type == T_COMPLEX && ilen == 16)
-                l_type = T_DCOMPLEX;
-        }
-        if (r_operand->entry.Template.ranges)
-        {
-            len = (r_operand->entry.Template.ranges)->entry.Template.ll_ptr1;
-            if (len && len->variant == INT_VAL)
-                ilen = len->entry.ival;
-            if (r_type == T_FLOAT && ilen == 8)
-                r_type = T_DOUBLE;
-            if (r_type == T_COMPLEX && ilen == 16)
-                r_type = T_DCOMPLEX;
-        }
-
-        if (l_type == T_DCOMPLEX || r_type == T_DCOMPLEX)
-            t = SgTypeDoubleComplex(current_file);
-        else if (l_type == T_COMPLEX || r_type == T_COMPLEX)
-            t = SgTypeComplex(current_file);
-        else if (l_type == T_DOUBLE || r_type == T_DOUBLE)
-            t = SgTypeDouble();
-        else if (l_type == T_FLOAT || r_type == T_FLOAT)
-            t = SgTypeFloat();
-        else if (l_type == T_INT && r_type == T_INT)
-            t = SgTypeInt();
-
-        else t = NULL;
-        /*
-      if (l_operand->variant == T_ARRAY)
-      {
-           expr->type = copy_type_node(expr->entry.binary_op.l_operand->type);
-           expr->type->entry.ar_decl.base_type =  temp;
-      }
-                  else if (r_operand->variant == T_ARRAY)
-          {
-              expr->type = copy_type_node(expr->entry.binary_op.r_operand->type);
-              expr->type->entry.ar_decl.base_type =  temp;
-          }
-      else  expr->type =  temp;
-                 */
-    }
-    break;
-    }
-    case (NOT_OP):
-    case (UNARY_ADD_OP):
-    case (MINUS_OP):
-    case (CONCAT_OP):
-        //expr->type = expr->entry.unary_op.operand->type;
-        t = e->lhs()->type();
-        break;
-    default:
-        //err("Expression variant not known",322);
-        break;
-    }
-    e->setType(t);
-    return(t);
-
-}
-
-
-
-
-SgType * SgTypeComplex(SgFile *f)
-{
-    SgType *t;
-    for (t = f->firstType(); t; t = t->next())
-        if (t->variant() == T_COMPLEX)
-            return(t);
-
-    return(new SgType(T_COMPLEX));
-}
-
-SgType * SgTypeDoubleComplex(SgFile *f)
-{
-    SgType *t;
-    for (t = f->firstType(); t; t = t->next())
-        if (t->variant() == T_DCOMPLEX)
-            return(t);
-
-    return(new SgType(T_DCOMPLEX));
-}
-
-int is_IntrinsicFunction(SgSymbol *sf)
-{
-    graph_node *gnode;
-    //printf("is intrinsic ?\n");
-    gnode = getAttrNodeForSymbol(sf);
-    //printf("gnode:%d\n",gnode);
-    if (!gnode) return (-1);
-    if (isNoBodyNode(gnode))
-        return(IntrinsicInd(sf));
-    else
-        return(-1);
-}
-
-int is_NoExpansionFunction(SgSymbol *sf)
-{
-    graph_node *gnode;
-    //printf("is no body ?\n");
-    gnode = getAttrNodeForSymbol(sf);
-    //printf("gnode:%d\n",gnode);
-    if (isDummyArgument(sf)) return(0);
-    if (!gnode) return (1);
-    return(isNoBodyNode(gnode));
-}
-
-int IntrinsicInd(SgSymbol *sf)
-{
-    int i;
-    if (deb_reg > 2)
-        printf("is intrinsic %s\n", sf->identifier());
-    for (i = 0; i < MAX_INTRINSIC_NUM; i++)
-    {
-        if (!intrinsic_name[i])
-            break;
-        //printf("%d   %s = %s\n", i, intrinsic_name[i], sf->identifier());
-        if (!strcmp(sf->identifier(), intrinsic_name[i]))
-            return(i);
-    }
-    return(-1);
-}
-
-
-SgSymbol *GetTempVarForArg(int i, SgSymbol *sf, SgType *t)
-{
-    char *name;
-    SgSymbol *sn;
-    name = new char[80];
-    sprintf(name, "%s_%d_arg%d_%d", sf->identifier(), sf->id(), i, vcounter++);
-    sn = new SgVariableSymb(name, *t, *cur_func);
-    if (isInSymbolTable(sn))
-        sn = GetTempVarForArg(i, sf, t);
-    if (cur_func == top_header)
-        top_temp_vars = AddToSymbList(top_temp_vars, sn);
-
-    return(sn);
-}
-
-SgSymbol *GetTempVarForSubscr(SgType *t)
-{
-    char *name;
-    SgSymbol *sn;
-    name = new char[80];
-    sprintf(name, "sbscr_arg_%d", vcounter++);
-    sn = new SgVariableSymb(name, *t, *cur_func);
-    if (isInSymbolTable(sn))
-        sn = GetTempVarForSubscr(t);
-    if (cur_func == top_header)
-        top_temp_vars = AddToSymbList(top_temp_vars, sn);
-
-    return(sn);
-}
-
-
-SgSymbol *GetTempVarForBound(SgSymbol *sa)
-{
-    char *name;
-    SgSymbol *sn;
-    name = new char[80];
-    sprintf(name, "%s_%d_%d", sa->identifier(), sa->id(), vcounter++);
-    sn = new SgVariableSymb(name, *SgTypeInt(), *(sa->scope()));
-    if (isInSymbolTable(sn))
-        sn = GetTempVarForBound(sa);
-    return(sn);
-}
-
-SgSymbol *GetImplicitDoVar(int j)
-{
-    char *name;
-    SgSymbol *sn;
-    name = new char[80];
-    sprintf(name, "i0%d", j + 1);
-    name = NewName(name);
-
-    //if(sn = isTopName(name)
-     // if(sn->type == SgTypeInt())
-       //  return(sn);
-     // else
-        // return(GetImplicitDoVar
-    //else
-
-    sn = new SgVariableSymb(name, *SgTypeInt(), *top_header);
-    return(sn);
-}
-
-int isInSymbolTable(SgSymbol *sym)
-{
-    SgSymbol *s;
-    for (s = cur_func->symbol(); s; s = s->next())
-        if (sym != s && !strcmp(sym->identifier(), s->identifier()))
-            return(1);
-    return(0);
-}
-
-char *NewName(char *name)
-{
-    if (isTopName(name))
-    {
-        sprintf(name, "%s_", name);
-        name = NewName(name);
-    }
-    return(name);
-}
-
-SgSymbol *isTopName(char *name)
-{
-    SgSymbol *s;
-    for (s = top_header->symbol(); s; s = s->next())
-        if (s->scope() == top_header && !strcmp(name, s->identifier()))
-            return(s);
-    return(NULL);
-}
-
-SgSymbol *isTopNameOfType(char *name, SgType *type)
-{
-    SgSymbol
-        *s;
-    for (s = top_header->symbol(); s; s = s->next())
-        if (s->scope() == top_header && !strcmp(name, s->identifier()) && type == s->type())
-            return(s);
-    return(NULL);
-}
-
-SgSymbol *GetNewTopSymbol(SgSymbol *s)
-{
-    char *name;
-    SgSymbol *sn;
-    name = new char[80];
-
-    sprintf(name, "%s__%d", s->identifier(), vcounter++);
-    sn = new SgSymbol(s->variant(), name, *s->type(), *top_header);
-    if (sn->variant() == CONST_NAME)
-        SYMB_VAL(sn->thesymb) = SYMB_VAL(s->thesymb);
-
-    if (isInTopSymbList(sn))
-        sn = GetNewTopSymbol(s);
-
-    return(sn);
-
-}
-
-int isInTopSymbList(SgSymbol *sym)
-{
-    SgSymbol *s;
-    for (s = top_symb_list; s; s = NextSymbol(s))
-        if (sym != s && !strcmp(sym->identifier(), s->identifier()))
-            return(1);
-    return(0);
-}
-
-void PrintTopSymbList()
-{
-    SgSymbol *s;
-    printf("\nSymbol List of Top:\n");
-    for (s = top_symb_list; s; s = NextSymbol(s))
-        printf("    %s", s->identifier());
-    return;
-}
-
-void PrintSymbList(SgSymbol *slist, SgStatement *header)
-{
-    SgSymbol *s;
-    printf("\nSymbol List of  %s:\n", header->symbol()->identifier());
-    for (s = slist; s; s = NextSymbol(s))
-        printf("    %s", s->identifier());
-    return;
-}
-
-
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-//   N O T   R E A L I S E D  ! ! !
-//-------------------------------------------------------------------------------------------
-//-------------------------------------------------------------------------------------------
-
-int isIntrinsicFunctionName(char *name)
-{
-    return(0);
-}
-
-char *ChangeIntrinsicFunctionName(char *name)
-{
-    return(name);
-}
-
-int isInlinedCallSite(SgStatement *stmt)
-{ // !!!!! temporary
-    return(1);
-}
-int TestFormatLabel(SgLabel *lab)
-{
-    return 0;
-}
-
-void MakeRefsConformable(SgExpression *tref, SgExpression *ref)
-{
-    return;
-}
-
-void CalculateTopLevelRef(SgSymbol *tops, SgExpression *tref, SgExpression *ref)
-{
-    return;
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/InlineExpansion/intrinsic.h b/projects/dvm_svn/fdvm/trunk/InlineExpansion/intrinsic.h
deleted file mode 100644
index 5323aec..0000000
--- a/projects/dvm_svn/fdvm/trunk/InlineExpansion/intrinsic.h
+++ /dev/null
@@ -1,196 +0,0 @@
-intrinsic_type[ICHAR] = 1; 
-intrinsic_type[CHAR]  = 7;
-intrinsic_type[INT]   = 1; //
-intrinsic_type[IFIX]  = 1;
-intrinsic_type[IDINT] = 1;
-intrinsic_type[FLOAT] = 3;
-intrinsic_type[REAL]  = 3; //
-intrinsic_type[SNGL]  = 3;
-intrinsic_type[DBLE]  = 4; //
-intrinsic_type[CMPLX] = 5; //
-intrinsic_type[DCMPLX]= 6;
-intrinsic_type[AINT]  = 3; //
-intrinsic_type[DINT]  = 4;
-intrinsic_type[ANINT] = 3; //
-intrinsic_type[DNINT] = 4;
-intrinsic_type[NINT]  = 1; //
-intrinsic_type[IDNINT]= 1;
-intrinsic_type[ABS]   =-1; //3
-intrinsic_type[IABS]  = 1;
-intrinsic_type[DABS]  = 4;
-intrinsic_type[CABS]  = 5;
-intrinsic_type[MOD]   =-1; //1
-intrinsic_type[AMOD]  = 3;
-intrinsic_type[DMOD]  = 4;
-intrinsic_type[SIGN]  =-1; //3
-intrinsic_type[ISIGN] = 1;
-intrinsic_type[DSIGN] = 4;
-intrinsic_type[DIM]   =-1; //3
-intrinsic_type[IDIM]  = 1;
-intrinsic_type[DDIM]  = 4;
-intrinsic_type[MAX]   =-1;
-intrinsic_type[MAX0]  = 1;
-intrinsic_type[AMAX1] = 3;
-intrinsic_type[DMAX1] = 4;
-intrinsic_type[AMAX0] = 3;
-intrinsic_type[MAX1]  = 1;
-intrinsic_type[MIN]   =-1;  //
-intrinsic_type[MIN0]  = 1;
-intrinsic_type[AMIN1] = 3;
-intrinsic_type[DMIN1] = 4;
-intrinsic_type[AMIN0] = 3;
-intrinsic_type[MIN1]  = 1;
-intrinsic_type[LEN]   = 1;
-intrinsic_type[INDEX] = 1;
-intrinsic_type[AIMAG] =-1; //3
-intrinsic_type[DIMAG] = 4;
-intrinsic_type[CONJG] =-1; //5
-intrinsic_type[DCONJG]= 6;
-intrinsic_type[SQRT]  =-1; //3
-intrinsic_type[DSQRT] = 4;
-intrinsic_type[CSQRT] = 5;
-intrinsic_type[EXP]   =-1; //3
-intrinsic_type[DEXP]  = 4;
-intrinsic_type[CEXP]  = 5;
-intrinsic_type[LOG]   =-1; //
-intrinsic_type[ALOG]  = 3;
-intrinsic_type[DLOG]  = 4;
-intrinsic_type[CLOG]  = 5;
-intrinsic_type[LOG10] =-1; //
-intrinsic_type[ALOG10]= 3;
-intrinsic_type[DLOG10]= 4;
-intrinsic_type[SIN]   =-1; //3
-intrinsic_type[DSIN]  = 4;
-intrinsic_type[CSIN]  = 5;
-intrinsic_type[COS]   =-1; //3
-intrinsic_type[DCOS]  = 4;
-intrinsic_type[CCOS]  = 5;
-intrinsic_type[TAN]   =-1; //3
-intrinsic_type[DTAN]  = 4;
-intrinsic_type[ASIN]  =-1; //3
-intrinsic_type[DASIN] = 4;
-intrinsic_type[ACOS]  =-1; //3
-intrinsic_type[DACOS] = 4;
-intrinsic_type[ATAN]  =-1; //3
-intrinsic_type[DATAN] = 4;
-intrinsic_type[ATAN2] =-1; //3
-intrinsic_type[DATAN2]= 4;
-intrinsic_type[SINH]  =-1; //3
-intrinsic_type[DSINH] = 4;
-intrinsic_type[COSH]  =-1; //3
-intrinsic_type[DCOSH] = 4;
-intrinsic_type[TANH]  =-1; //3
-intrinsic_type[DTANH] = 4;
-intrinsic_type[LGE]   = 2;
-intrinsic_type[LGT]   = 2;
-intrinsic_type[LLE]   = 2;
-intrinsic_type[LLT]   = 2;
-//intrinsic_type[] = ;
-//intrinsic_type[] = ;
-
-
-//{ICHAR, CHAR,INT,IFIX,IDINT,FLOAT,REAL,SNGL,DBLE,CMPLX,DCMPLX,AINT,DINT,ANINT,DNINT,NINT,IDNINT,ABS,IABS,DABS,CABS,
-//      MOD,AMOD,DMOD, SIGN,ISIGN, DSIGN, DIM,IDIM,DDIM, MAX,MAX0, AMAX1,DMAX1, AMAX0,MAX1, MIN,MIN0,
-//      AMIN1,DMIN1,AMIN0,MIN1,LEN,INDEX,AIMAG,DIMAG,CONJG,DCONJG,SQRT,DSQRT,CSQRT,EXP,DEXP.CEXP,LOG,ALOG,DLOG,CLOG,
-//      LOG10,ALOG10,DLOG10,SIN,DSIN,CSIN,COS,DCOS,CCOS,TAN,DTAN,ASIN,DASIN,ACOS,DACOS,ATAN,DATAN,
-//      ATAN2,DATAN2,SINH,DSINH,COSH,DCOSH,TANH,DTANH, LGE,LGT,LLE,LLT};
-//universal: ANINT,NINT,ABS,  MOD,SIGN,DIM,MAX,MIN,SQRT,EXP,LOG,LOG10,SIN,COS,TAN,ASIN,ACOS,ATAN,ATAN2,SINH,COSH,TANH
-
-//universal name - -1
-//integer - 1
-//logical - 2
-//real - 3
-//double precision - 4
-//complex - 5
-//complex*16 - 6
-//character - 7
-
-intrinsic_name[ICHAR] = "ichar"; 
-intrinsic_name[CHAR]  = "char";
-intrinsic_name[INT]   = "int"; //
-intrinsic_name[IFIX]  = "ifix";
-intrinsic_name[IDINT] = "idint";
-intrinsic_name[FLOAT] = "float";
-intrinsic_name[REAL]  = "real"; //
-intrinsic_name[SNGL]  = "sngl";
-intrinsic_name[DBLE]  = "dble"; //
-intrinsic_name[CMPLX] = "cmplx"; //
-intrinsic_name[DCMPLX]= "dcmplx";
-intrinsic_name[AINT]  = "aint"; //
-intrinsic_name[DINT]  = "dint";
-intrinsic_name[ANINT] = "anint"; //
-intrinsic_name[DNINT] = "dnint";
-intrinsic_name[NINT]  = "nint"; //
-intrinsic_name[IDNINT]= "idnint";
-intrinsic_name[ABS]   = "abs"; //
-intrinsic_name[IABS]  = "iabs";
-intrinsic_name[DABS]  = "dabs";
-intrinsic_name[CABS]  = "cabs";
-intrinsic_name[MOD]   = "mod"; //
-intrinsic_name[AMOD]  = "amod";
-intrinsic_name[DMOD]  = "dmod";
-intrinsic_name[SIGN]  = "sign"; //
-intrinsic_name[ISIGN] = "isign";
-intrinsic_name[DSIGN] = "dsign";
-intrinsic_name[DIM]   = "dim"; //
-intrinsic_name[IDIM]  = "idim";
-intrinsic_name[DDIM]  = "ddim";
-intrinsic_name[MAX]   = "max";
-intrinsic_name[MAX0]  = "max0";
-intrinsic_name[AMAX1] = "amax1";
-intrinsic_name[DMAX1] = "dmax1";
-intrinsic_name[AMAX0] = "amax0";
-intrinsic_name[MAX1]  = "max1";
-intrinsic_name[MIN]   = "min";  //
-intrinsic_name[MIN0]  = "min0";
-intrinsic_name[AMIN1] = "amin1";
-intrinsic_name[DMIN1] = "dmin1";
-intrinsic_name[AMIN0] = "amin0";
-intrinsic_name[MIN1]  = "min1";
-intrinsic_name[LEN]   = "len";
-intrinsic_name[INDEX] = "index";
-intrinsic_name[AIMAG] = "AIMAG"; //
-intrinsic_name[DIMAG] = "DIMAG";
-intrinsic_name[CONJG] = "conjg"; //
-intrinsic_name[DCONJG]= "dconjg";
-intrinsic_name[SQRT]  = "sqrt"; //
-intrinsic_name[DSQRT] = "dsqrt";
-intrinsic_name[CSQRT] = "csqrt";
-intrinsic_name[EXP]   = "exp"; //
-intrinsic_name[DEXP]  = "dexp";
-intrinsic_name[CEXP]  = "cexp";
-intrinsic_name[LOG]   = "log"; //
-intrinsic_name[ALOG]  = "alog";
-intrinsic_name[DLOG]  = "dlog";
-intrinsic_name[CLOG]  = "clog";
-intrinsic_name[LOG10] = "log10"; //
-intrinsic_name[ALOG10]= "alog10";
-intrinsic_name[DLOG10]= "dlog10";
-intrinsic_name[SIN]   = "sin"; //
-intrinsic_name[DSIN]  = "dsin";
-intrinsic_name[CSIN]  = "csin";
-intrinsic_name[COS]   = "cos"; //
-intrinsic_name[DCOS]  = "dcos";
-intrinsic_name[CCOS]  = "ccos";
-intrinsic_name[TAN]   = "tan"; //
-intrinsic_name[DTAN]  = "dtan";
-intrinsic_name[ASIN]  = "asin"; //
-intrinsic_name[DASIN] = "dasin";
-intrinsic_name[ACOS]  = "acos"; //
-intrinsic_name[DACOS] = "dacos";
-intrinsic_name[ATAN]  = "atan"; //
-intrinsic_name[DATAN] = "datan";
-intrinsic_name[ATAN2] = "atan2"; //
-intrinsic_name[DATAN2]= "datan2";
-intrinsic_name[SINH]  = "sinh"; //
-intrinsic_name[DSINH] = "dsinh";
-intrinsic_name[COSH]  = "cosh"; //
-intrinsic_name[DCOSH] = "dcosh";
-intrinsic_name[TANH]  = "tanh"; //
-intrinsic_name[DTANH] = "dtanh";
-intrinsic_name[LGE]   = "lge";
-intrinsic_name[LGT]   = "lgt";
-intrinsic_name[LLE]   = "lle";
-intrinsic_name[LLT]   = "llt";
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.uni b/projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.uni
deleted file mode 100644
index f961955..0000000
--- a/projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.uni
+++ /dev/null
@@ -1,46 +0,0 @@
-#echo#######################################################################
-# Makefile for   Fortran DVM transformator
-#
-#echo#######################################################################
-
-# dvm/fdvm/fdvm_transform/makefile.uni
-
-SAGEROOT = ../Sage
-LIBDIR = ../lib
-BINDIR = ../../bin
-LIBINCLUDE = $(SAGEROOT)/lib/include
-HINCLUDE = $(SAGEROOT)/h
-DVMINCLUDE = ../include
-EXECUTABLES = inl_exp
-
-LOADER = $(LINKER)
-
-INCL = -I. -I$(LIBINCLUDE) -I$(HINCLUDE) -I$(DVMINCLUDE)
-
-CFLAGS = -c $(INCL) -Wall
-LDFLAGS =
-
-LIBS = $(LIBDIR)/libSage++.a $(LIBDIR)/libsage.a $(LIBDIR)/libdb.a
-OBJS = inl_exp.o inliner.o hlp.o
-
-
-$(BINDIR)/$(EXECUTABLES): $(OBJS)
-	$(LOADER) $(LDFLAGS) -o $(BINDIR)/$(EXECUTABLES) $(OBJS) $(LIBS)
-
-all: $(BINDIR)/$(EXECUTABLES)
-	@echo "****** COMPILING $(EXECUTABLES) DONE ******"
-
-clean:
-	rm -f $(OBJS)
-cleanall:
-	rm -f $(OBJS)
-
-############################# dependencies ############################
-
-
-inl_exp.o: inl_exp.cpp inline.h
-	$(CXX) $(CFLAGS) inl_exp.cpp
-inliner.o: inliner.cpp inline.h
-	$(CXX) $(CFLAGS) inliner.cpp
-hlp.o: hlp.cpp inline.h
-	$(CXX) $(CFLAGS) hlp.cpp
diff --git a/projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.win b/projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.win
deleted file mode 100644
index 110ce87..0000000
--- a/projects/dvm_svn/fdvm/trunk/InlineExpansion/makefile.win
+++ /dev/null
@@ -1,61 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# dvm/fdvm/fdvm_transform/makefile.win
-
-OUTDIR = ..\obj
-BINDIR = ..\..\bin
-LIBDIR = ..\lib
-SAGEROOT =..\Sage
-
-LIBINCLUDE = $(SAGEROOT)\lib\include
-HINCLUDE = $(SAGEROOT)\h
-FDVMINCL = ..\include
-EXECUTABLES = inl_exp
-
-INCL = -I. -I$(LIBINCLUDE) -I$(HINCLUDE) -I$(FDVMINCL)
-
-
-# -w don't issue warning now.
-#CFLAGS=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-#	/Fp"$(OUTDIR)/fdvm_transform.pch" /YX /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-CFLAGS=/nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-	/Fp"$(OUTDIR)/fdvm_transform.pch" /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-
-.cpp{$(OUTDIR)/}.obj:
-    $(CXX) $(CFLAGS) $<
-
-LINK=$(LINKER)
- 
-LINK_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-LINK_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-OBJS = $(OUTDIR)/inl_exp.obj $(OUTDIR)/inliner.obj $(OUTDIR)/hlp.obj
-
-LIBS = $(LIBDIR)/libSage++.lib $(LIBDIR)\libsage.lib $(LIBDIR)\libdb.lib 
-
-
-$(BINDIR)/$(EXECUTABLES).exe: $(OBJS)
-	$(LINK) @<<
-	$(LINK_FLAGS) $(OBJS) $(LIBS)  
-<<
-
-all: $(BINDIR)/$(EXECUTABLES).exe
-    @echo "*** COMPILING EXECUTABLE $(EXECUTABLES) DONE"
-
- 
-clean:
-
-cleanall:
-
-
-# ***********************************************************
-
-inl_exp.obj: inl_exp.cpp inline.h
-inliner.obj: inliner.cpp  inline.h 
-hlp.obj: hlp.cpp  inline.h
diff --git a/projects/dvm_svn/fdvm/trunk/Makefile b/projects/dvm_svn/fdvm/trunk/Makefile
deleted file mode 100644
index 783b4ed..0000000
--- a/projects/dvm_svn/fdvm/trunk/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-
-SHELL = /bin/sh
-INSTALL = /bin/cp
-
-SUBDIR	= Sage parser fdvm
-
-install: 
-	     @for i in ${SUBDIR}; do (cd $$i; \
-	     echo "   ***  $$i DIRECTORY   ***";\
-             $(MAKE) "MAKE=$(MAKE)" install); done
-
-clean:      
-	     @for i in ${SUBDIR}; do (cd $$i; \
-	     echo "   ***  $$i DIRECTORY   ***";\
-             $(MAKE) "MAKE=$(MAKE)" clean); done
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/CMakeLists.txt
deleted file mode 100644
index 76992fb..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-set(DVM_SAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/h)
-
-add_subdirectory(lib)
-add_subdirectory(Sage++)
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/LICENSE b/projects/dvm_svn/fdvm/trunk/Sage/LICENSE
deleted file mode 100644
index 64be3a7..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/LICENSE
+++ /dev/null
@@ -1,67 +0,0 @@
-************************************************************************
-./LICENSE            pC++/Sage++ License Information        (PHB 9/2/93)
-************************************************************************
-
-      This file is a REQUIRED part of the pC++/Sage++ Environment
-
-The pC++/Sage++ software is *not* in the public domain.  However, it
-is freely available without fee for education, research, and
-non-profit purposes.  By obtaining copies of this and other files that
-comprise the pC++/Sage++ environment, you, the Licensee, agree to
-abide by the following conditions and understandings with respect to
-the copyrighted software:
-
-1.  The software is copyrighted by Indiana University (IU), University
-of Oregon (UO), and the University of Rennes (UR), and they retain
-ownership of the software.
-
-2.  Permission to use and modify this software and its documentation
-for education, research, and non-profit purposes is hereby granted to
-Licensee, provided that the copyright notice, the original author's
-names and unit identification, and this permission notice appear on
-all such works, and that no charge be made for such copies.
-
-3.  We request that the Licensee not distribute the pC++/Sage++
-software.  In order to maintain the software, we will distribute the
-most up-to-date version of the software via FTP.  Please "finger
-sage@cica.indiana.edu" for more information.  Furthermore, our funding
-agencies would like to know what you think about pC++/Sage++.  If you
-are using the software, PLEASE join our mailing list by sending mail
-to sage-request.cica.indiana.edu with the Subject: "subscribe".  We
-will notify you of important bug fixes and updates as they become
-available.
-
-Any entity desiring permission to incorporate this software into
-commercial products should contact:
-
-         Dennis Gannon                            gannon@cs.indiana.edu
-         215 Lindley Hall
-         Department of Computer Science
-         Indiana Univerity
-	 Bloomington, IN  47401
-         USA
-
-4.  Licensee may not use the name, logo, or any other symbol of
-IU/UO/UR nor the names of any of its employees nor any adaptation
-thereof in advertizing or publicity pertaining to the software without
-specific prior written approval of the IU/UO/UR.
-
-5.  IU/UO/UR MAKES NO REPRESENTATIONS ABOUT THE SUITABILITY OF THE
-SOFTWARE FOR ANY PURPOSE.  IT IS PROVIDED "AS IS" WITHOUT EXPRESS OR
-IMPLIED WARRANTY.
-
-6.  IU/UO/UR shall not be liable for any damages suffered by Licensee
-from the use of this software.
-
-7.  The software was developed under agreements between the IU/UO/UR
-and the Federal Government which entitle the Government to certain
-rights.
-
-************************************************************************
-
-Copyright (c) 1993 Indiana University, University of Oregon,
-University of Rennes.  All Rights Reserved.
-
-Funded by: ARPA under Rome Labs contract AF 30602-92-C-0135 and the
-National Science Foundation Office of Advanced Scientific Computing
-under grant ASC-9111616 and Esprit BRA APPARC
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/Makefile
deleted file mode 100644
index ab8f42a..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-#######################################################################
-##                  pC++/Sage++  Copyright (C) 1993                  ##
-##  Indiana University  University of Oregon  University of Rennes   ##
-#######################################################################
-
-
-# sage/Makefile (phb)
-
-# Pete Beckman  (5/27/93)
-
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-# There are two configurations for this Makefile at the present time
-# 1) Users/Developers of the Sage++ Compiler tools
-# 2) Users/Developers of pC++, a Parallel C++ for Supercomputers
-#
-
-SHELL   = /bin/sh
-
-CONFIG_ARCH=iris4d
-
-CC	= gcc
-#CC=cc#ENDIF##USE_CC#
-#PTX#CC=cc#ENDIF#
-
-CXX     = g++
-#USE_CFRONT#CXX= CC#ENDIF#
-#USE_DECCXX#CXX=cxx#ENDIF#
-#USE_IBMXLC#CXX=xlC#ENDIF#
-CXX=DCC#ENDIF##USE_SGIDCC#
-CXX     = g++
-LINKER	= $(CC)
-
-#PTX#EXTRASRC=target/symmetry/src#ENDIF#
-#SYMMETRY#EXTRASRC=target/symmetry/src#ENDIF#
-#CM5#EXTRASRC=target/cm5/src#ENDIF#
-#PARAGON#EXTRASRC=target/paragon/src#ENDIF#
-#PARAGON_XDEV#EXTRASRC=target/paragon/src#ENDIF#
-#KSR#EXTRASRC=target/ksr1/src#ENDIF#
-#SP1#EXTRASRC=target/sp1/src#ENDIF#
-#CS2#EXTRASRC=target/cs2/src#ENDIF#
-EXTRASRC=target/sgimp/src#ENDIF##SGIMP#
-
-# instr temporarily removed until libSage++ stable
-
-# Several types of configurations....
-
-# tools EVERYONE needs
-BASIC = lib  Sage++
-
-# Other Compiler Tools
-SAGEXX = f2dep#ENDIF##SAGEXX#
-
-# pC++ system
-#PVM_INSTALLED#PVMTEMP=target/pvm/src#ENDIF#
-TEMP = breezy instr dep2C++ target/uniproc/src $(PVMTEMP)
-#PCXX#PCXX = $(TEMP) $(EXTRASRC) TestSuite#ENDIF#
-
-# What to compile
-SUBDIR1 = $(BASIC) 
-
-# Subdirectories to make resursively
-SUBDIR  = ${SUBDIR1}
-
-all:
-	@echo "*********** RECURSIVELY MAKING SUBDIRECTORIES ***********"
-	@for i in ${SUBDIR1}; do (echo "*** COMPILING $$i DIRECTORY"; cd $$i;\
-             $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" ); done
-	@echo "***************** DONE ************************
-#	@echo "To run the TestSuite code (in uniprocessor mode) type:"
-#	@echo "cd TestSuite; make test"
-
-clean:
-	for i in ${SUBDIR1} Sage++; do (cd $$i; $(MAKE) "MAKE=$(MAKE)" clean); done
-
-cleandist:	clean cleangood
-cleaninstall:	clean cleangood
-cleangood:
-	@echo "Deleting *~ #* core *.a *.sl *.o *.dep"
-	@find . \( -name \*~ -o -name \#\* -o -name core \) \
-	   -exec /bin/rm {} \; -print
-	@find . \( -name \*.a -o -name \*.sl -o -name \*.o -o -name \*.dep \) \
-	   -exec /bin/rm {} \; -print
-	@if [ ! -d bin/$(CONFIG_ARCH) ] ; then true; \
-	      else /bin/rm -r bin/$(CONFIG_ARCH) ; fi
-	@if [ ! -d lib/$(CONFIG_ARCH) ] ; then true; \
-	      else /bin/rm -r lib/$(CONFIG_ARCH) ; fi
-	@if [ ! -d target/pvm/lib ] ; then true; \
-	      else /bin/rm -r target/pvm/lib ; fi
-
-install:
-	@echo "*********** RECURSIVELY MAKING SUBDIRECTORIES ***********"
-	@for i in ${SUBDIR1}; do (echo "*** COMPILING $$i DIRECTORY"; cd $$i;\
-             $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" install); done
-	@echo "***************** DONE ************************"
-#	@echo "To run the TestSuite code (in uniprocessor mode) type:"
-#	@echo "cd TestSuite; make test"
-
-.RECURSIVE: ${SUBDIR1}
-
-${SUBDIR}: FRC
-	cd $@; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-FRC:
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/CMakeLists.txt
deleted file mode 100644
index 793dc59..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-set(SAGEP_SOURCES libSage++.cpp)
-
-if(MSVC_IDE)
-  foreach(DIR ${DVM_SAGE_INCLUDE_DIRS})
-    file(GLOB_RECURSE FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-      "${DIR}/*.h" "${DIR}/*.def" "${DIR}/head" "${DIR}/tag")
-    set(SAGEP_HEADERS ${SAGEP_HEADERS} ${FILES})
-  endforeach()
-  source_group("Header Files" FILES ${SAGEP_HEADERS})
-endif()
-add_library(sage++ ${SAGEP_SOURCES} ${SAGEP_HEADERS})
-
-target_include_directories(sage++ PUBLIC "${DVM_SAGE_INCLUDE_DIRS}")
-set_target_properties(sage++ PROPERTIES FOLDER "${DVM_LIBRARY_FOLDER}")
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/Makefile
deleted file mode 100644
index 0e5298b..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/Makefile
+++ /dev/null
@@ -1,97 +0,0 @@
-#######################################################################
-##                  pC++/Sage++  Copyright (C) 1993                  ##
-##  Indiana University  University of Oregon  University of Rennes   ##
-#######################################################################
-
-# sage/Sage++/Makefile (PHB)
-
-SHELL = /bin/sh
-CONFIG_ARCH=iris4d
-
-RANLIB_TEST = [ -f /usr/bin/ranlib ] || [ -f /bin/ranlib ]
-#NO_RANLIB#RANLIB_TEST = (exit 1)#ENDIF#
-
-# Shared library hack for HP-UX
-LSX = .a
-#HP_CFLAGS#CEXTRA = -Aa +z#ENDIF#
-#HP_CFLAGS#LSX = .sl#ENDIF#
-
-PCXX = ../bin/$(CONFIG_ARCH)/pc++
-
-CC = gcc
-#CC=cc
-
-CXX     = #CC
-#USE_CFRONT#CXX= CC#ENDIF#
-#USE_DECCXX#CXX=cxx#ENDIF#
-#USE_IBMXLC#CXX=xlC#ENDIF#
-CXX=DCC#ENDIF##USE_SGIDCC#
-CXX=g++
-LOADER = $(CXX)
-#INSTALLDEST = ../lib/$(CONFIG_ARCH)
-INSTALLDEST = ../../libsage
-INSTALL = /bin/cp
-HDRS        = ../h
-LIBINCLUDE  = ../lib/include
-SAGEINCLUDE = -I$(HDRS) -I$(LIBINCLUDE)
-
-# Directory in which include files can be found
-INCLUDEDIR = ./h
-INCLUDE = -I$(INCLUDEDIR) $(SAGEINCLUDE)
-
-# -w don't issue warning now.
-CFLAGS	= $(INCLUDE) -g -Wall -c $(CEXTRA)
-LDFLAGS	= 
-#BISON= /usr/freeware/bin/bison
-BISON= bison
-TOOLSage++_SRC	=  libSage++.cpp
-
-TOOLSage++_HDR     = $(LIBINCLUDE)/macro.h $(LIBINCLUDE)/bif_node.def  $(LIBINCLUDE)/type.def  $(LIBINCLUDE)/symb.def $(LIBINCLUDE)/libSage++.h
-
-TOOLSage++_OBJ	=   libSage++.o 
-
-SUBDIR1 = extentions
-SUBDIR  = ${SUBDIR1}
-
-#all: $(TOOLSage++_OBJ) $(TOOLSage++_HDR)
-#	@for i in ${SUBDIR1}; do (echo "*** COMPILING $$i DIRECTORY"; cd $$i;\
-#	  $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" $@); done
-
-libSage++.a: libSage++.o  $(TOOLSage++_HDR)
-		/bin/rm -f libSage++.a
-		ar qc libSage++.a libSage++.o
-		@if $(RANLIB_TEST) ; then ranlib libSage++.a ; \
-	           else echo "\tNOTE: ranlib not required" ; fi
-libSage++.o: libSage++.cpp $(TOOLSage++_HDR)
-		$(CXX) $(CFLAGS)  libSage++.cpp
-
-libSage++.dep: libSage++.cpp $(TOOLSage++_HDR)
-		$(PCXX) -deponly $(INCLUDE) libSage++.cpp -o libSage++.o
-
-libSage++ : libSage++$(LSX)
-
-clean:
-	/bin/rm -f libSage++$(LSX) libSage++.dep libSage++.proj
-	/bin/rm -f $(TOOLSage++_OBJ)
-	/bin/rm -f extentions/sgCallGraph.o
-	/bin/rm -f extentions/sgClassHierarchy.o
-
-cleaninstall: clean
-
-install:$(INSTALLDEST)/libSage++.a
-
-#	@for i in ${SUBDIR1}; do (echo "*** COMPILING $$i DIRECTORY"; cd $$i;\
-#	  $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" $@); done
-
-$(INSTALLDEST)/libSage++.a: libSage++.a
-		if [ -d $(INSTALLDEST) ] ; then true; \
-                    else mkdir $(INSTALLDEST) ;fi
-		$(INSTALL) libSage++.a $(INSTALLDEST)
-		@if $(RANLIB_TEST) ; then ranlib $(INSTALLDEST)/libSage++.a ; \
-	           else echo "\tNOTE: ranlib not required" ; fi
-
-${SUBDIR}: FRC
-	cd $@; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
- 
-FRC:
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/libSage++.cpp b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/libSage++.cpp
deleted file mode 100644
index dc7874e..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/libSage++.cpp
+++ /dev/null
@@ -1,9158 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-#include "leak_detector.h"
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <map>
-#include <string>
-
-#ifndef __GNUC__
-
-#else
-extern "C" void abort(void);
-extern "C" void exit(int status);
-/*# pragma implementation*/
-#endif
-
-#define CPLUS_
-#include "macro.h"
-#undef CPLUS_
-#include "vpc.h"
-#include "f90.h"
-
-#include "extcxx_low.h"
-extern "C" int number_of_ll_node;
-extern "C" PTR_SYMB last_file_symbol;
-
-#undef USER
-
-#if __SPF
-extern "C" void addToCollection(const int line, const char *file, void *pointer, int type);
-extern "C" void removeFromCollection(void *pointer);
-extern std::map<PTR_BFND, std::pair<std::string, int> > sgStats;
-extern std::map<PTR_LLND, std::pair<std::string, int> > sgExprs;
-extern void addToGlobalBufferAndPrint(const std::string &toPrint);
-#endif
-
-//
-// define for having the debugging
-//
-//define  DEBUGLIB 1
-#define  MAX_FILES 1000
-//
-//
-// Array to keep track of table for a file
-//
-//
-
-void **tablebfnd[MAX_FILES];
-void **tablellnd[MAX_FILES];
-void **tabletype[MAX_FILES];
-void **tablesymbol[MAX_FILES];
-void **tablelabel[MAX_FILES];
-
-int numtablebfnd[MAX_FILES];
-int numtablellnd[MAX_FILES];
-int numtabletype[MAX_FILES];
-int numtablesymbol[MAX_FILES];
-int numtablelabel[MAX_FILES];
-
-
-////////////////////////////  ATTRIBUTES /////////////////////////////////
-// Array to keep track of the attributes for statement, symbol, ...
-///////////////////////////////////////////////////////////////////////////
-
-class SgAttribute;
-
-SgAttribute **tablebfndAttribute[MAX_FILES];
-SgAttribute **tablellndAttribute[MAX_FILES];
-SgAttribute **tabletypeAttribute[MAX_FILES];
-SgAttribute **tablesymbolAttribute[MAX_FILES];
-SgAttribute **tablelabelAttribute[MAX_FILES];
-
-int numtablebfndAttribute[MAX_FILES];
-int numtablellndAttribute[MAX_FILES];
-int numtabletypeAttribute[MAX_FILES];
-int numtablesymbolAttribute[MAX_FILES];
-int numtablelabelAttribute[MAX_FILES];
-
-
-
-//
-// Table definition for attributes 
-// 
-//
-
-
-SgAttribute **fileTableAttribute;
-int allocatedForfileTableAttribute;
-SgAttribute **bfndTableAttribute;
-int allocatedForbfndTableAttribute;
-SgAttribute **llndTableAttribute;
-int allocatedForllndTableAttribute;
-SgAttribute **typeTableAttribute;
-int allocatedFortypeTableAttribute;
-SgAttribute **symbolTableAttribute;
-int allocatedForsymbolTableAttribute;
-SgAttribute **labelTableAttribute;
-int allocatedForlabelTableAttribute;
-
-///////////////////////////////// END ATTRIBUTES ///////////////////////////
-
-
-static int CurrentFileNumber = 0;
-
-//
-// Table for making link between the nodes and the classes
-// Take the id and return a pointer
-//
-
-void **fileTableClass;
-int allocatedForfileTableClass;
-void **bfndTableClass;
-int allocatedForbfndTableClass;
-void **llndTableClass;
-int allocatedForllndTableClass;
-void **typeTableClass;
-int allocatedFortypeTableClass;
-void **symbolTableClass;
-int allocatedForsymbolTableClass;
-void **labelTableClass;
-int allocatedForlabelTableClass;
-
-
-//
-// Some definition for this module
-//
-#define ALLOCATECHUNK 10000
-
-#define SORRY Message("Sorry, not implemented yet",0)
-
-class SgProject;
-class SgFile;
-class SgStatement;
-class SgExpression;
-class SgLabel;
-class SgSymbol;
-class SgType;
-class SgUnaryExp;
-class SgClassSymb;
-class SgVarDeclStmt; 
-
-
-//
-// Set of function to care about the table management
-//
-
-void InitializeTable()
-{
-    int i;
-    for (i = 0; i < MAX_FILES; i++)
-    {
-        tablebfnd[i] = NULL;
-        tablellnd[i] = NULL;
-        tabletype[i] = NULL;
-        tablesymbol[i] = NULL;
-        tablelabel[i] = NULL;
-
-        numtablebfnd[i] = 0;
-        numtablellnd[i] = 0;
-        numtabletype[i] = 0;
-        numtablesymbol[i] = 0;
-        numtablelabel[i] = 0;
-
-        // FOR ATTRIBUTES;
-        tablebfndAttribute[i] = NULL;
-        tablellndAttribute[i] = NULL;
-        tabletypeAttribute[i] = NULL;
-        tablesymbolAttribute[i] = NULL;
-        tablelabelAttribute[i] = NULL;
-
-        numtablebfndAttribute[i] = 0;
-        numtablellndAttribute[i] = 0;
-        numtabletypeAttribute[i] = 0;
-        numtablesymbolAttribute[i] = 0;
-        numtablelabelAttribute[i] = 0;
-    }
-
-
-    fileTableClass = NULL;
-    bfndTableClass = NULL;
-    llndTableClass = NULL;
-    typeTableClass = NULL;
-    symbolTableClass = NULL;
-    labelTableClass = NULL;
-    allocatedForfileTableClass = 0;
-    allocatedForbfndTableClass = 0;
-    allocatedForllndTableClass = 0;
-    allocatedFortypeTableClass = 0;
-    allocatedForsymbolTableClass = 0;
-    allocatedForlabelTableClass = 0;
-
-    // FOR ATTRIBUTES;
-    fileTableAttribute = NULL;
-    bfndTableAttribute = NULL;
-    llndTableAttribute = NULL;
-    typeTableAttribute = NULL;
-    symbolTableAttribute = NULL;
-    labelTableAttribute = NULL;
-    allocatedForfileTableAttribute = 0;
-    allocatedForbfndTableAttribute = 0;
-    allocatedForllndTableAttribute = 0;
-    allocatedFortypeTableAttribute = 0;
-    allocatedForsymbolTableAttribute = 0;
-    allocatedForlabelTableAttribute = 0;
-}
-
-
-void SwitchToFile(int i)
-{
-    if (i >= MAX_FILES)
-    {
-        Message("Too many files", 0);
-        exit(1);
-    }
-
-    tablebfnd[CurrentFileNumber] = bfndTableClass;
-    tablellnd[CurrentFileNumber] = llndTableClass;
-    tabletype[CurrentFileNumber] = typeTableClass;
-    tablesymbol[CurrentFileNumber] = symbolTableClass;
-    tablelabel[CurrentFileNumber] = labelTableClass;
-
-    numtablebfnd[CurrentFileNumber] = allocatedForbfndTableClass;
-    numtablellnd[CurrentFileNumber] = allocatedForllndTableClass;
-    numtabletype[CurrentFileNumber] = allocatedFortypeTableClass;
-    numtablesymbol[CurrentFileNumber] = allocatedForsymbolTableClass;
-    numtablelabel[CurrentFileNumber] = allocatedForlabelTableClass;
-
-    bfndTableClass = tablebfnd[i];
-    llndTableClass = tablellnd[i];
-    typeTableClass = tabletype[i];
-    symbolTableClass = tablesymbol[i];
-    labelTableClass = tablelabel[i];
-
-    allocatedForbfndTableClass = numtablebfnd[i];
-    allocatedForllndTableClass = numtablellnd[i];
-    allocatedFortypeTableClass = numtabletype[i];
-    allocatedForsymbolTableClass = numtablesymbol[i];
-    allocatedForlabelTableClass = numtablelabel[i];
-
-    // FOR ATTRIBUTES
-    tablebfndAttribute[CurrentFileNumber] = bfndTableAttribute;
-    tablellndAttribute[CurrentFileNumber] = llndTableAttribute;
-    tabletypeAttribute[CurrentFileNumber] = typeTableAttribute;
-    tablesymbolAttribute[CurrentFileNumber] = symbolTableAttribute;
-    tablelabelAttribute[CurrentFileNumber] = labelTableAttribute;
-
-    numtablebfndAttribute[CurrentFileNumber] = allocatedForbfndTableAttribute;
-    numtablellndAttribute[CurrentFileNumber] = allocatedForllndTableAttribute;
-    numtabletypeAttribute[CurrentFileNumber] = allocatedFortypeTableAttribute;
-    numtablesymbolAttribute[CurrentFileNumber] = allocatedForsymbolTableAttribute;
-    numtablelabelAttribute[CurrentFileNumber] = allocatedForlabelTableAttribute;
-
-    bfndTableAttribute = tablebfndAttribute[i];
-    llndTableAttribute = tablellndAttribute[i];
-    typeTableAttribute = tabletypeAttribute[i];
-    symbolTableAttribute = tablesymbolAttribute[i];
-    labelTableAttribute = tablelabelAttribute[i];
-
-    allocatedForbfndTableAttribute = numtablebfndAttribute[i];
-    allocatedForllndTableAttribute = numtablellndAttribute[i];
-    allocatedFortypeTableAttribute = numtabletypeAttribute[i];
-    allocatedForsymbolTableAttribute = numtablesymbolAttribute[i];
-    allocatedForlabelTableAttribute = numtablelabelAttribute[i];
-    CurrentFileNumber = i;
-}
-
-/////////////////////////////////////////// FOR ATTRIBUTES //////////////////////////////////
-
-
-// add a chunk to the size 
-void ReallocatefileTableAttribute()
-{
-  int i;
-  SgAttribute **pt;
-  
-  pt  =  new SgAttribute *[allocatedForfileTableAttribute + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedForfileTableAttribute + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  
-  for (i=0 ; i < allocatedForfileTableAttribute; i++)
-    {
-      pt[i] = fileTableAttribute[i];
-    }
-  if (allocatedForfileTableAttribute)
-  {
-#ifdef __SPF   
-      removeFromCollection(fileTableAttribute);
-#endif
-      delete fileTableAttribute;
-  }
-  fileTableAttribute = pt;
-  allocatedForfileTableAttribute = allocatedForfileTableAttribute + ALLOCATECHUNK;
-}
-
-
-void ReallocatebfndTableAttribute()
-{
-  int i;
-  SgAttribute **pt;
-  
-  pt  =  new SgAttribute *[allocatedForbfndTableAttribute + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedForbfndTableAttribute + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  for (i=0 ; i < allocatedForbfndTableAttribute; i++)
-    {
-      pt[i] = bfndTableAttribute[i];
-    }
-  if (allocatedForbfndTableAttribute)
-  {
-#ifdef __SPF   
-      removeFromCollection(bfndTableAttribute);
-#endif
-      delete bfndTableAttribute;
-  }
-  bfndTableAttribute = pt;
-  allocatedForbfndTableAttribute = allocatedForbfndTableAttribute + ALLOCATECHUNK;
-}
-
-
-void ReallocatellndTableAttribute()
-{
-  int i;
-  SgAttribute **pt;
-  
-  pt  =  new SgAttribute *[allocatedForllndTableAttribute + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedForllndTableAttribute + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  for (i=0 ; i < allocatedForllndTableAttribute; i++)
-    {
-      pt[i] = llndTableAttribute[i];
-    }
-  if (allocatedForllndTableAttribute)
-  {
-#ifdef __SPF   
-      removeFromCollection(llndTableAttribute);
-#endif
-      delete llndTableAttribute;
-  }
-  llndTableAttribute = pt;
-  allocatedForllndTableAttribute = allocatedForllndTableAttribute + ALLOCATECHUNK;
-}
-
-void ReallocatesymbolTableAttribute()
-{
-  int i;
-  SgAttribute **pt;
-  
-  pt  =  new SgAttribute *[allocatedForsymbolTableAttribute + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedForsymbolTableAttribute + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  for (i=0 ; i < allocatedForsymbolTableAttribute; i++)
-    {
-      pt[i] = symbolTableAttribute[i];
-    }
-  if (allocatedForsymbolTableAttribute)
-  {
-#ifdef __SPF   
-      removeFromCollection(symbolTableAttribute);
-#endif
-      delete symbolTableAttribute;
-  }
-  symbolTableAttribute = pt;
-  allocatedForsymbolTableAttribute = allocatedForsymbolTableAttribute + ALLOCATECHUNK;
-}
-
-
-void ReallocatelabelTableAttribute()
-{
-  int i;
-  SgAttribute **pt;
-  
-  pt  =  new SgAttribute *[allocatedForlabelTableAttribute + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedForlabelTableAttribute + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  for (i=0 ; i < allocatedForlabelTableAttribute; i++)
-    {
-      pt[i] = labelTableAttribute[i];
-    }
-  if (allocatedForlabelTableAttribute)
-  {
-#ifdef __SPF   
-      removeFromCollection(labelTableAttribute);
-#endif
-      delete labelTableAttribute;
-  }
-  labelTableAttribute = pt;
-  allocatedForlabelTableAttribute = allocatedForlabelTableAttribute + ALLOCATECHUNK;
-}
-
-
-void ReallocatetypeTableAttribute()
-{
-  int i;
-  SgAttribute **pt;
-  
-  pt  =  new SgAttribute *[allocatedFortypeTableAttribute + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedFortypeTableAttribute + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  for (i=0 ; i < allocatedFortypeTableAttribute; i++)
-    {
-      pt[i] = typeTableAttribute[i];
-    }
-  if (allocatedFortypeTableAttribute)
-  {
-#ifdef __SPF   
-      removeFromCollection(typeTableAttribute);
-#endif
-      delete typeTableAttribute;
-  }
-  typeTableAttribute = pt;
-  allocatedFortypeTableAttribute = allocatedFortypeTableAttribute + ALLOCATECHUNK;
-}
-
-
-void 
-SetMappingInTableForBfndAttribute(PTR_BFND bif, SgAttribute *pt)
-{
-  if (!bif)
-    return ;
-  while (allocatedForbfndTableAttribute <= BIF_ID(bif))
-    {
-      ReallocatebfndTableAttribute();
-    }
-  bfndTableAttribute[BIF_ID(bif)] = pt;
-}
-
-
-void 
-SetMappingInTableForTypeAttribute(PTR_TYPE type, SgAttribute *pt)
-{
-  if (!type)
-    return ;
-  while (allocatedFortypeTableAttribute <= TYPE_ID(type))
-    {
-      ReallocatetypeTableAttribute();
-    }
-  typeTableAttribute[TYPE_ID(type)] = pt;
-}
-
-
-void 
-SetMappingInTableForSymbolAttribute(PTR_SYMB symb, SgAttribute *pt)
-{
-  if (!symb)
-    return ;
-  while (allocatedForsymbolTableAttribute <= SYMB_ID(symb))
-    {
-      ReallocatesymbolTableAttribute();
-    }
-  symbolTableAttribute[SYMB_ID(symb)] = pt;
-}
-
-void 
-SetMappingInTableForLabelAttribute(PTR_LABEL lab, SgAttribute *pt)
-{
-  if (!lab)
-    return ;
-  while (allocatedForlabelTableAttribute <= LABEL_ID(lab))
-    {
-      ReallocatelabelTableAttribute();
-    }
-  labelTableAttribute[LABEL_ID(lab)] = pt;
-}
-
-
-
-void 
-SetMappingInTableForLlndAttribute(PTR_LLND ll, SgAttribute *pt)
-{
-  if (!ll)
-    return ;
-  while (allocatedForllndTableAttribute <= NODE_ID(ll))
-    {
-      ReallocatellndTableAttribute();
-    }
-  llndTableAttribute[NODE_ID(ll)] = pt;
-}
-
-
-void 
-SetMappingInTableForFileAttribute(PTR_FILE file, SgAttribute *pt)
-{
-  int id;
-  if (!file)
-    return ;
-  id = GetFileNum(FILE_FILENAME(file));
-  while (allocatedForfileTableAttribute <= id)
-    {
-      ReallocatefileTableAttribute();
-    }
-  fileTableAttribute[id] = pt;
-}
-
-
-SgAttribute *
-GetMappingInTableForSymbolAttribute(PTR_SYMB symb)
-{
-  int id;
-  if (!symb)
-    return NULL;
-  id = SYMB_ID(symb);
-  if (allocatedForsymbolTableAttribute <= id)    
-    {
-      return NULL;
-    }
-  return  symbolTableAttribute[id];
-}
-
-
-
-SgAttribute *
-GetMappingInTableForLabelAttribute(PTR_LABEL lab)
-{
-  int id;
-  if (!lab)
-    return NULL;
-  id = LABEL_ID(lab);
-  if (allocatedForlabelTableAttribute <= id)    
-    {
-      return NULL;
-    }
-  return  labelTableAttribute[id];
-}
-
-
-SgAttribute *
-GetMappingInTableForBfndAttribute(PTR_BFND bf)
-{
-  int id;
-  if (!bf)
-    return NULL;
-  id = BIF_ID(bf);
-  if (allocatedForbfndTableAttribute <= id)    
-    {
-      return NULL;
-    }
-  return bfndTableAttribute[id];
-}
-
-
-SgAttribute *
-GetMappingInTableForTypeAttribute(PTR_TYPE t)
-{
-  int id;
-  if (!t)
-    return NULL;
-  id = TYPE_ID(t);
-  if (allocatedFortypeTableAttribute <= id)    
-    {
-      return NULL;
-    }
-  return  typeTableAttribute[id];
-}
-
-
-SgAttribute *
-GetMappingInTableForLlndAttribute(PTR_LLND ll)
-{
-  int id;
-  if (!ll)
-    return NULL;
-  id = NODE_ID(ll);
-  if (allocatedForllndTableAttribute <= id)    
-    {
-      return NULL;
-    }
-  return  llndTableAttribute[id];
-}
-
-
-SgAttribute *
-GetMappingInTableForFileAttribute(PTR_FILE file)
-{
-  int id;
-  if (!file)
-    return NULL;
-  id = GetFileNum(FILE_FILENAME(file));
-  if (allocatedForfileTableAttribute <= id)
-    {
-      return NULL;
-    }
-  return  fileTableAttribute[id];
-}
-
-
-
-//////////////////////////////////END ATTRIBUTE STUFFS/////////////////////////////////////////
-
-// add a chunk to the size 
-void ReallocatefileTableClass()
-{
-  int i;
-  void **pt;
-  
-  pt  =  new void *[allocatedForfileTableClass + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedForfileTableClass + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  
-  for (i=0 ; i < allocatedForfileTableClass; i++)
-    {
-      pt[i] = fileTableClass[i];
-    }
-  if (allocatedForfileTableClass)
-  {
-#ifdef __SPF   
-      removeFromCollection(fileTableClass);
-#endif
-      delete fileTableClass;
-  }
-  fileTableClass = pt;
-  allocatedForfileTableClass = allocatedForfileTableClass + ALLOCATECHUNK;
-}
-
-
-void ReallocatebfndTableClass()
-{
-  int i;
-  void **pt;
-  
-  pt  =  new void *[allocatedForbfndTableClass + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedForbfndTableClass + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  for (i=0 ; i < allocatedForbfndTableClass; i++)
-    {
-      pt[i] = bfndTableClass[i];
-    }
-  if (allocatedForbfndTableClass)
-  {
-#ifdef __SPF   
-      removeFromCollection(bfndTableClass);
-#endif
-      delete bfndTableClass;
-  }
-  bfndTableClass = pt;
-  allocatedForbfndTableClass = allocatedForbfndTableClass + ALLOCATECHUNK;
-}
-
-
-void ResetbfndTableClass()
-{
-  int i;
-  
-  for (i=0 ; i < allocatedForbfndTableClass; i++)
-    {
-//      delete bfndTableClass[i];
-      bfndTableClass[i] = NULL;
-    }
-}
-
-void ReallocatellndTableClass()
-{
-    int i;
-    void **pt;
-
-    pt = new void *[allocatedForllndTableClass + ALLOCATECHUNK];
-#ifdef __SPF   
-    addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-    for (i = 0; i < allocatedForllndTableClass + ALLOCATECHUNK; i++)
-        pt[i] = NULL;
-    for (i = 0; i < allocatedForllndTableClass; i++)
-    {
-        pt[i] = llndTableClass[i];
-    }
-    if (allocatedForllndTableClass)
-    {
-#ifdef __SPF   
-        removeFromCollection(llndTableClass);
-#endif
-        delete llndTableClass;
-    }
-    llndTableClass = pt;
-    allocatedForllndTableClass = allocatedForllndTableClass + ALLOCATECHUNK;
-}
-
-void ReallocatesymbolTableClass()
-{
-  int i;
-  void **pt;
-  
-  pt  =  new void *[allocatedForsymbolTableClass + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedForsymbolTableClass + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  for (i=0 ; i < allocatedForsymbolTableClass; i++)
-    {
-      pt[i] = symbolTableClass[i];
-    }
-  if (allocatedForsymbolTableClass)
-  {
-#ifdef __SPF   
-      removeFromCollection(symbolTableClass);
-#endif
-      delete symbolTableClass;
-  }
-  symbolTableClass = pt;
-  allocatedForsymbolTableClass = allocatedForsymbolTableClass + ALLOCATECHUNK;
-}
-
-
-void ReallocatelabelTableClass()
-{
-  int i;
-  void **pt;
-  
-  pt  =  new void *[allocatedForlabelTableClass + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedForlabelTableClass + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  for (i=0 ; i < allocatedForlabelTableClass; i++)
-    {
-      pt[i] = labelTableClass[i];
-    }
-  if (allocatedForlabelTableClass)
-  {
-#ifdef __SPF   
-      removeFromCollection(labelTableClass);
-#endif
-      delete labelTableClass;
-  }
-  labelTableClass = pt;
-  allocatedForlabelTableClass = allocatedForlabelTableClass + ALLOCATECHUNK;
-}
-
-
-void ReallocatetypeTableClass()
-{
-  int i;
-  void **pt;
-  
-  pt  =  new void *[allocatedFortypeTableClass + ALLOCATECHUNK];
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 2);
-#endif
-  for (i=0; i<allocatedFortypeTableClass + ALLOCATECHUNK; i++)
-    pt[i] = NULL;
-  for (i=0 ; i < allocatedFortypeTableClass; i++)
-    {
-      pt[i] = typeTableClass[i];
-    }
-  if (allocatedFortypeTableClass)
-  {
-#ifdef __SPF   
-      removeFromCollection(typeTableClass);
-#endif
-      delete typeTableClass;
-  }
-  typeTableClass = pt;
-  allocatedFortypeTableClass = allocatedFortypeTableClass + ALLOCATECHUNK;
-}
-
-
-void RemoveFromTableType(void * pt)
-{
-  int i;
-  for (i=0 ; i < allocatedFortypeTableClass; i++)
-    {
-      if (typeTableClass[i] == pt)
-        {
-          typeTableClass[i] = NULL;
-          return;
-        }
-    }
-}
-
-
-void RemoveFromTableSymb(void * pt)
-{
-  int i;
-  for (i=0 ; i < allocatedForsymbolTableClass; i++)
-    {
-      if (symbolTableClass[i] == pt)
-        {
-          symbolTableClass[i] = NULL;
-          return;
-        }
-    }
-}
-
-
-
-void RemoveFromTableBfnd(void * pt)
-{
-  int i;
-  for (i=0 ; i < allocatedForbfndTableClass; i++)
-    {
-      if (bfndTableClass[i] == pt)
-        {
-          bfndTableClass[i] = NULL;
-          return;
-        }
-    }
-}
-
-
-void RemoveFromTableFile(void * pt)
-{
-  int i;
-  for (i=0 ; i < allocatedForfileTableClass; i++)
-    {
-      if (fileTableClass[i] == pt)
-        {
-          fileTableClass[i] = NULL;
-          return;
-        }
-    }
-}
-
-// forward, to be defined later in this file;
-void RemoveFromTableLlnd(void * pt); 
-
-
-void RemoveFromTableLabel(void * pt)
-{
-    int i;
-    for (i = 0; i < allocatedForlabelTableClass; i++)
-    {
-        if (labelTableClass[i] == pt)
-        {
-            labelTableClass[i] = NULL;
-            return;
-        }
-    }
-}
-
-void SetMappingInTableForBfnd(PTR_BFND bif, void *pt)
-{
-    if (!bif)
-        return;
-    while (allocatedForbfndTableClass <= BIF_ID(bif))
-    {
-        ReallocatebfndTableClass();
-    }
-#if __SPF
-    std::map<PTR_BFND, std::pair<std::string, int> >::iterator it = sgStats.find(bif);
-    if (it != sgStats.end())
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp, this place was occupied\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw(-1);
-    }
-#endif
-    bfndTableClass[BIF_ID(bif)] = pt;
-}
-
-
-void SetMappingInTableForType(PTR_TYPE type, void *pt)
-{
-    if (!type)
-        return;
-    while (allocatedFortypeTableClass <= TYPE_ID(type))
-    {
-        ReallocatetypeTableClass();
-    }
-    typeTableClass[TYPE_ID(type)] = pt;
-}
-
-
-void SetMappingInTableForSymb(PTR_SYMB symb, void *pt)
-{
-    if (!symb)
-        return;
-    while (allocatedForsymbolTableClass <= SYMB_ID(symb))
-    {
-        ReallocatesymbolTableClass();
-    }
-    symbolTableClass[SYMB_ID(symb)] = pt;
-}
-
-void SetMappingInTableForLabel(PTR_LABEL lab, void *pt)
-{
-    if (!lab)
-        return;
-    while (allocatedForlabelTableClass <= LABEL_ID(lab))
-    {
-        ReallocatelabelTableClass();
-    }
-    labelTableClass[SYMB_ID(lab)] = pt;
-}
-
-void SetMappingInTableForLlnd(PTR_LLND ll, void *pt)
-{
-    if (!ll)
-        return;
-    while (allocatedForllndTableClass <= NODE_ID(ll))
-    {
-        ReallocatellndTableClass();
-    }
-#if __SPF
-    std::map<PTR_LLND, std::pair<std::string, int> >::iterator it = sgExprs.find(ll);
-    if (it != sgExprs.end())
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp, this place was occupied\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw(-1);
-    }
-#endif
-    llndTableClass[NODE_ID(ll)] = pt;
-}
-
-
-void SetMappingInTableForFile(PTR_FILE file, void *pt)
-{
-    int id;
-    if (!file)
-        return;
-    id = GetFileNum(FILE_FILENAME(file));
-    while (allocatedForfileTableClass <= id)
-    {
-        ReallocatefileTableClass();
-    }
-    fileTableClass[id] = pt;
-}
-
-
-SgSymbol *GetMappingInTableForSymbol(PTR_SYMB symb)
-{
-  int id;
-  if (!symb)
-    return NULL;
-  id = SYMB_ID(symb);
-  if (allocatedForsymbolTableClass <= id)    
-    {
-      return NULL;
-    }
-  return (SgSymbol *) symbolTableClass[id];
-}
-
-
-
-SgLabel *
-GetMappingInTableForLabel(PTR_LABEL lab)
-{
-  int id;
-  if (!lab)
-    return NULL;
-  id = LABEL_ID(lab);
-  if (allocatedForlabelTableClass <= id)    
-    {
-      return NULL;
-    }
-  return (SgLabel *) labelTableClass[id];
-}
-
-
-SgStatement *
-GetMappingInTableForBfnd(PTR_BFND bf)
-{
-  int id;
-  if (!bf)
-    return NULL;
-  id = BIF_ID(bf);
-  if (allocatedForbfndTableClass <= id)    
-    {
-      return NULL;
-    }
-  return (SgStatement *) bfndTableClass[id];
-}
-
-
-SgType *
-GetMappingInTableForType(PTR_TYPE t)
-{
-  int id;
-  if (!t)
-    return NULL;
-  id = TYPE_ID(t);
-  if (allocatedFortypeTableClass <= id)    
-    {
-      return NULL;
-    }
-  return (SgType *) typeTableClass[id];
-}
-
-
-SgExpression *
-GetMappingInTableForLlnd(PTR_LLND ll)
-{
-    int id;
-    if (!ll)
-        return NULL;
-    id = NODE_ID(ll);
-    if (allocatedForllndTableClass <= id)
-    {
-        return NULL;
-    }
-    return (SgExpression *)llndTableClass[id];
-}
-
-
-SgFile *
-GetMappingInTableForFile(PTR_FILE file)
-{
-  int id;
-  if (!file)
-    return NULL;
-  id = GetFileNum(FILE_FILENAME(file));
-  if (allocatedForfileTableClass <= id)
-    {
-      return NULL;
-    }
-  return (SgFile *) fileTableClass[id];
-}
-
-
-//Fortran and C++ Structures
-//
-// There several families of classes here.
-//   Projects-    which correspond to a collection of parsed
-//                source files.
-//   Files -      which corresponds to an individual source file
-//   Statements-  Fortran or C statements
-//   Expressions- Fortran or C expression trees.
-//   Symbols-     Symbol Table entries.
-//   Types-       Each symbol has a type which lives in a type table.
-//   Labels-      Statement labels in fortran or C
-//   Dependences- Data Dependence Class 
-//
-//  naming convention: Classnames begin with Sg (for Sage)
-//  class functions begin with a lower case and have first letters
-//  of words in Caps likeThisWord.
-//  
-//  In general functions return references when ever possible.  
-//
-//
-// ************* Project and File Types ******************
-// the sage fortran 90 and c++ parsers generate files with
-// a .dep extension.  A project is a file with a .proj extension
-// that consists of a list of .dep files that make the basis
-// of the project.  The following describes the
-// basic mechanisms to access and modify the structures
-// The class hierarch is as follows:
-//
-//SgProject     = the class representing multi source file projects
-//
-//SgFile        = the basic source file object.
-//   - SgFortranFile  = the subclass for Fortran sources
-//   - SgCFile        = the subclass for C files.
-//
-// ******************************************************************
-
-// forward ref
-SgStatement * BfndMapping(PTR_BFND bif);
-SgExpression * LlndMapping(PTR_LLND llin);
-SgSymbol * SymbMapping(PTR_SYMB symb);
-SgType * TypeMapping(PTR_TYPE ty);
-SgLabel * LabelMapping(PTR_LABEL label);
-
-// As you can see, some statements are specifically Fortran and
-// some apply only to C and C++.
-//
-
-// the generic statement class has functions to access or modify any
-// property of a given statement.
-
-SgProject *CurrentProject;
-
-#include "libSage++.h"
-
-
-//
-// checking if correct; (better for garbage collecting that way)....
-//
-void RemoveFromTableLlnd(void * pt)
-{
-  SgExpression *pte;
-
-  if (!pt)  return;
-
-  pte = (SgExpression *) pt;
-  if (pte->thellnd)
-    llndTableClass[NODE_ID(pte->thellnd)] = NULL;
-}
-
-
-//
-// Some Mapping stuff
-//
-SgStatement * BfndMapping(PTR_BFND bif)
-{
-  SgStatement *pt = NULL;
-  if (!bif)
-    {
-      return pt;
-    }
-  pt = GetMappingInTableForBfnd(bif);
-  if (pt)
-    return pt;
-  else
-    {
-      pt = new SgStatement(bif);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-    }  
-  return pt;
-}
-
-
-//
-// Some mapping stuff
-//
-
-SgExpression * LlndMapping(PTR_LLND llin)
-{
-  SgExpression *pt;
-  if (!llin)
-    return NULL;
-  pt = GetMappingInTableForLlnd(llin);
-  if (pt)
-    return pt;
-  else
-    {
-      pt = new SgExpression(llin);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-    } 
-  return pt;
-}
-
-
-SgSymbol * SymbMapping(PTR_SYMB symb)
-{
-  SgSymbol *pt = NULL;
-  if (!symb)
-    {
-      return pt;
-    }
-  pt = GetMappingInTableForSymbol(symb);
-  if (pt)
-    return pt;
-  else
-    {
-      pt = new SgSymbol(symb);      
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-    }  
-  return pt;
-}
-
-SgType * TypeMapping(PTR_TYPE ty)
-{
-  SgType *pt = NULL;
-  
-  if (!ty)
-    return NULL;
-  pt = GetMappingInTableForType(ty);
-  if (pt)
-    return pt;
-  else
-    {
-      pt = new SgType(ty);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-    } 
-  return pt;
-}
-
-
-
-SgLabel * LabelMapping(PTR_LABEL label)
-{
-  SgLabel *pt = NULL;
-  if (!label)
-    {
-      return pt;
-    }
-  pt = GetMappingInTableForLabel(label);
-  if (pt)
-    return pt;
-  else
-    {
-      pt = new SgLabel(label);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-    }  
-  return pt;
-}
-
-
-
-SgValueExp * isSgValueExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case INT_VAL:
-    case BOOL_VAL:  /*podd 3.12.11*/
-    case CHAR_VAL:
-    case FLOAT_VAL:
-    case DOUBLE_VAL:
-    case STRING_VAL:
-    case COMPLEX_VAL:
-    case KEYWORD_VAL:
-      return (SgValueExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-SgKeywordValExp * isSgKeywordValExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case KEYWORD_VAL:
-      return (SgKeywordValExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgUnaryExp & makeAnUnaryExpression(int code,PTR_LLND ll1);
-
-// I didn't understand what this function does.
-// Should be modified to use LlndMapping.
-
-SgExpression & SgUnaryExp::operand()
-{
-  PTR_LLND ll;
-  SgExpression *pt = NULL;
-  
-  ll = NODE_OPERAND0(thellnd);
-  if (!ll)
-    ll = NODE_OPERAND1(thellnd);
-  pt = GetMappingInTableForLlnd(ll);
-  if (pt)
-    return *pt;
-  else
-    {
-      pt = new SgExpression(ll);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-    } 
-  return *pt;
-}
-
-// Other handy constructors
-SgUnaryExp &SgDerefOp(SgExpression &e)
-  {return makeAnUnaryExpression(DEREF_OP,e.thellnd);}
-
-SgUnaryExp &SgAddrOp(SgExpression &e)
-  {return makeAnUnaryExpression(ADDRESS_OP,e.thellnd);}
-
-SgUnaryExp &SgUMinusOp(SgExpression &e)
-  {return makeAnUnaryExpression(MINUS_OP,e.thellnd);}
-
-SgUnaryExp &SgUPlusOp(SgExpression &e)
-  {return makeAnUnaryExpression(UNARY_ADD_OP,e.thellnd);}
-
-SgUnaryExp &SgPrePlusPlusOp(SgExpression &e)
-  {return makeAnUnaryExpression(PLUSPLUS_OP,e.thellnd);}
-
-SgUnaryExp &SgPreMinusMinusOp(SgExpression &e)
-  {return makeAnUnaryExpression(MINUSMINUS_OP,e.thellnd);}
-
-SgUnaryExp &SgPostPlusPlusOp(SgExpression &e)
-  { SgUnaryExp *pt;
-    pt =  &makeAnUnaryExpression(PLUSPLUS_OP,e.thellnd);
-    
-    NODE_OPERAND1(pt->thellnd) = NODE_OPERAND0(pt->thellnd);
-    NODE_OPERAND0(pt->thellnd) = 0;
-    return *pt;
-  }
-SgUnaryExp &SgPostMinusMinusOp(SgExpression &e)
-  {
-    SgUnaryExp *pt;
-    pt =  &makeAnUnaryExpression(MINUSMINUS_OP,e.thellnd);
-    
-    NODE_OPERAND1(pt->thellnd) = NODE_OPERAND0(pt->thellnd);
-    NODE_OPERAND0(pt->thellnd) = 0;
-    return *pt;
-  }
-SgUnaryExp &SgBitCompfOp(SgExpression &e)
-  {return makeAnUnaryExpression(BIT_COMPLEMENT_OP,e.thellnd);}
-SgUnaryExp &SgNotOp(SgExpression &e)
-  {return makeAnUnaryExpression(NOT_OP,e.thellnd);}
-SgUnaryExp &SgSizeOfOp(SgExpression &e)
-  {return makeAnUnaryExpression(SIZE_OP,e.thellnd);}
-
-
-// Add type-checking here.
-SgUnaryExp &
-makeAnUnaryExpression(int code,PTR_LLND ll1)
-{
-  PTR_LLND ll;
-  SgUnaryExp *pt = NULL;
-
-  ll = newExpr(code,NODE_TYPE(ll1),ll1);
-  pt = new SgUnaryExp(ll);
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-  return *pt;
-}
-
-SgUnaryExp * isSgUnaryExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case DEREF_OP:
-    case ADDRESS_OP:
-    case SIZE_OP:
-    case MINUS_OP:
-    case UNARY_ADD_OP:
-    case PLUSPLUS_OP:
-    case MINUSMINUS_OP:
-    case BIT_COMPLEMENT_OP:
-    case NOT_OP:
-      return (SgUnaryExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgCastExp * isSgCastExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case CAST_OP:
-      return (SgCastExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgDeleteExp * isSgDeleteExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case DELETE_OP:
-      return (SgDeleteExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgNewExp * isSgNewExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case NEW_OP:
-      return (SgNewExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgExpression & SgExprIfExp::conditional()
-{// expr 1
-   PTR_LLND ll;
-   SgExpression *pt = NULL;
- 
- ll = NODE_OPERAND0(thellnd);
- pt = GetMappingInTableForLlnd(ll);
- if (pt)
-   return *pt;
- else
-   {
-     pt = new SgExpression(ll);
-#ifdef __SPF   
-     addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-   } 
- return *pt;
-}
-
-SgExpression & SgExprIfExp::trueExp()
-{// expr 2
-   PTR_LLND ll = NULL,ll2;
- SgExpression *pt = NULL;
- ll2 = NODE_OPERAND1(thellnd);
- if (ll2)
-   ll = NODE_OPERAND0(ll2);
- else
-   Message("pb in SgExprIfExp",0);
- pt = GetMappingInTableForLlnd(ll);
- if (pt)
-   return *pt;
- else
-   {
-     pt = new SgExpression(ll);
-#ifdef __SPF   
-     addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-   } 
- return *pt;
-}
-
-SgExpression & SgExprIfExp::falseExp()
-{// expr 3
-   PTR_LLND ll = NULL,ll2;
- SgExpression *pt = NULL;
- ll2 = NODE_OPERAND1(thellnd);
- if (ll2)
-   ll = NODE_OPERAND1(ll2);
- else
-   Message("pb in SgExprIfExp",0);
- pt = GetMappingInTableForLlnd(ll);
- if (pt)
-   return *pt;
- else
-   {
-     pt = new SgExpression(ll);
-#ifdef __SPF   
-     addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-   } 
- return *pt;
-}
-
-void SgExprIfExp::setTrueExp(SgExpression &t)
-{
-  PTR_LLND ll;
-  ll = NODE_OPERAND1(thellnd);
-  if (ll)
-    NODE_OPERAND0(ll) = t.thellnd;
-  else
-    {
-      NODE_OPERAND1(thellnd)= newExpr(EXPR_IF_BODY,NULL,t.thellnd,NULL);
-    }
-}
-
-void SgExprIfExp::setFalseExp(SgExpression &f)
-{
-  PTR_LLND ll;
-  ll = NODE_OPERAND1(thellnd);
-  if (ll)
-    NODE_OPERAND1(ll) = f.thellnd;
-  else
-    {
-      NODE_OPERAND1(thellnd)= newExpr(EXPR_IF_BODY,NULL,NULL,f.thellnd);
-    }
-}
-
-SgExprIfExp * isSgExprIfExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case EXPR_IF:
-      return (SgExprIfExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgFunctionCallExp * isSgFunctionCallExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case FUNC_CALL:
-      return (SgFunctionCallExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgFuncPntrExp * isSgFuncPntrExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case FUNCTION_OP:
-      return (SgFuncPntrExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-void SgExprListExp::linkToEnd(SgExpression &arg)
-{
-  PTR_LLND  lptr;
-  lptr = Follow_Llnd(thellnd,2);
-  NODE_OPERAND1(lptr) = arg.thellnd;
-}
-
-
-SgExprListExp * isSgExprListExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case EXPR_LIST:
-      return (SgExprListExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgProject::SgProject(const char *proj_file_name)
-{
-    // first let init the library we need
-    if (!proj_file_name)
-    {
-        Message("Cannot open project: no file specified", 0);
-        exit(1);
-    }
-    if (open_proj_toolbox(proj_file_name, proj_file_name) < 0)
-    {
-        fprintf(stderr, "%s   ", proj_file_name);
-#if __SPF
-        throw -98;
-#else
-        Message("Cannot open project", 0);
-        exit(1);
-#endif
-    }
-    Init_Tool_Box();
-
-    // we have to initialize some specific data for this interface 
-    CurrentProject = this;
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgProject::SgProject(const char* proj_file_name, char** files_list, int no)
-{
-    // first let init the library we need
-    if (!proj_file_name)
-    {
-        Message("Cannot open project: no file specified", 0);
-        exit(1);
-    }
-
-    if (open_proj_files_toolbox(proj_file_name, files_list, no) < 0)
-    {
-        fprintf(stderr, "%s   ", proj_file_name);
-#if __SPF
-        throw -97;
-#else
-        Message("Cannot open project", 0);
-        exit(1);
-#endif
-    }
-    Init_Tool_Box();
-
-    // we have to initialize some specific data for this interface 
-    CurrentProject = this;
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-int current_file_id;     //number of current file 
-SgFile &SgProject::file(int i)
-{
-    PTR_FILE file;
-    SgFile *pt = NULL;
-    file = GetFileWithNum(i);
-    SetCurrentFileTo(file);
-    SwitchToFile(GetFileNumWithPt(file));
-    if (!file)
-    {
-        Message("SgProject::file; File not found", 0);
-#ifdef __SPF   
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-#endif
-        return *pt;
-    }
-    pt = GetMappingInTableForFile(file);
-    if (!pt)
-    {
-        pt = new SgFile(FILE_FILENAME(file));
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-
-    }
-
-    current_file_id = i;
-    current_file = pt;
-    
-#ifdef __SPF   
-    SgStatement::setCurrProcessFile(pt->filename());
-    SgStatement::setCurrProcessLine(0);
-    last_file_symbol = file->cur_symb;
-#endif
-    return *pt;
-}
-
-
-
-
-
-//  #ifdef NOT_YET_IMPLEMENTED  (No #ifdef because it is used later... PHB)
-void SgProject::addFile(char *)
-{
-  SORRY;
-}
-//#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-void SgProject::deleteFile(SgFile * file)
-{
-   SORRY;
-   return;
-}
-#endif
-
-const char* SgFile::filename()
-{
-    return filept->filename;
-}
-
-SgFile::SgFile(char * dep_file_name)
-{
-    filept = GetPointerOnFile(dep_file_name);
-    SetCurrentFileTo(filept);
-    SwitchToFile(GetFileNumWithPt(filept));
-    if (!filept)
-    {
-        Message("File not found in SgFile; added", 0);
-        if (CurrentProject)
-            CurrentProject->addFile(dep_file_name);
-    }
-    SetMappingInTableForFile(filept, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgFile::~SgFile()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-    RemoveFromTableFile((void *)this);
-}
-
-SgFile::SgFile(SgFile &f)
-{
-    filept = f.filept;
-#ifndef __SPF
-    Message("SgFile: copy constructor not allowed", 0);
-#endif
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-extern "C"{
-  int new_empty_file(int, const char *);
-}
-
-SgFile::SgFile(int Language, const char * dep_file_name)
-{
-
-    if (new_empty_file(Language, dep_file_name) == 0)
-    {
-        Message("create failed", 0);
-#ifdef __SPF
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-#endif
-    }
-
-    filept = GetPointerOnFile(dep_file_name);
-    SetCurrentFileTo(filept);
-    SwitchToFile(GetFileNumWithPt(filept));
-    if (!filept)
-    {
-        Message("File not found in SgFile; failed!", 0);
-#ifdef __SPF   
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-#endif
-        return;
-    }
-    SetMappingInTableForFile(filept, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-static inline std::string replaceSlash(const std::string &in)
-{
-    std::string out = in;
-    for (int z = 0; z < in.size(); ++z)
-        if (out[z] == '\\')
-            out[z] = '/';
-    return out;
-}
-
-std::map<std::string, std::pair<SgFile*, int> > SgFile::files;
-int SgFile::switchToFile(const std::string &name)
-{
-    std::map<std::string, std::pair<SgFile*, int> >::iterator it = files.find(replaceSlash(name));
-    if (it == files.end())
-        return -1;
-    else
-    {
-        if (current_file_id != it->second.second)
-        {
-            SgFile *file = &(CurrentProject->file(it->second.second));
-            current_file_id = it->second.second;
-            current_file = file;
-            
-            SgStatement::setCurrProcessFile(file->filename());
-            SgStatement::setCurrProcessLine(0);
-            last_file_symbol = current_file->filept->cur_symb; 
-        }
-    }
-    
-    return it->second.second;
-}
-
-void SgFile::addFile(const std::pair<SgFile*, int> &toAdd)
-{
-    files[replaceSlash(toAdd.first->filename()).c_str()] = toAdd;
-}
-
-
-std::map<int, std::map<std::pair<std::string, int>, SgStatement*> > SgStatement::statsByLine;
-std::map<SgExpression*, SgStatement*> SgStatement::parentStatsForExpression;
-
-bool SgStatement::consistentCheckIsActivated = false;
-bool SgStatement::deprecatedCheck = false;
-std::string SgStatement::currProcessFile = "";
-int SgStatement::currProcessLine = -1;
-bool SgStatement::sapfor_regime = false;
-
-void SgStatement::checkConsistence()
-{
-#if __SPF
-    if (consistentCheckIsActivated && fileID != current_file_id && fileID != -1)
-    {
-        const int var = variant();
-        if (var < 950) // not SPF DIRS
-        {
-            //unparsestdout();
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp, file id was inconsistent: current id = %d, was id = %d\n", __LINE__, current_file_id, fileID);
-            addToGlobalBufferAndPrint(buf);
-            throw(-1);
-        }
-    }
-#endif
-}
-
-void SgStatement::checkDepracated()
-{
-#if __SPF
-    if (deprecatedCheck)
-    {
-        //unparsestdout();
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp, deprecated operators are used\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw(-1);
-    }
-#endif
-}
-
-void SgStatement::checkCommentPosition(const char* com)
-{
-#if __SPF
-    checkConsistence();
-    if (variant() == GLOBAL)
-        return;
-
-    SgStatement* prev = lexPrev();
-    if (prev && (prev->variant() == LOGIF_NODE || prev->variant() == FORALL_STAT))
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp, unsupported comments modification after LOGIF and FORALL statements, user line %d (prev %d), statement variant %d, prev statement variant %d, '%s'\n", 
-                __LINE__, lineNumber(), prev->lineNumber(), variant(), prev->variant(), com);
-        addToGlobalBufferAndPrint(buf);
-        throw(-1);
-    }
-#endif
-}
-
-void SgStatement::updateStatsByLine(std::map<std::pair<std::string, int>, SgStatement*> &toUpdate)
-{
-    PTR_BFND node = current_file->firstStatement()->thebif;
-    for (; node; node = node->thread)
-    {
-        SgStatement *st = BfndMapping(node);
-        toUpdate[std::make_pair(replaceSlash(st->fileName()), st->lineNumber())] = st;
-    }
-}
-
-SgStatement* SgStatement::getStatementByFileAndLine(const std::string &fName, const int lineNum)
-{
-    const int fildID = SgFile::switchToFile(fName);
-    std::map<int, std::map<std::pair<std::string, int>, SgStatement*> >::iterator itID = statsByLine.find(fildID);
-    if (itID == statsByLine.end())
-        itID = statsByLine.insert(itID, std::make_pair(fildID, std::map<std::pair<std::string, int>, SgStatement*>()));
-
-    if (itID->second.size() == 0)
-        updateStatsByLine(itID->second);
-    
-    std::map<std::pair<std::string, int>, SgStatement*>::iterator itPair = itID->second.find(make_pair(replaceSlash(fName), lineNum));
-    if (itPair == itID->second.end())
-        return NULL;
-    else
-        return itPair->second;
-}
-
-void SgStatement::updateStatsByExpression(SgStatement *where, SgExpression *what)
-{
-    if (what)
-    {
-        parentStatsForExpression[what] = where;
-
-        updateStatsByExpression(where, what->lhs());
-        updateStatsByExpression(where, what->rhs());
-    }
-}
-
-void SgStatement::updateStatsByExpression()
-{
-    SgFile* save = current_file;
-    const int save_id = current_file_id;
-
-    for (int i = 0; i < CurrentProject->numberOfFiles(); ++i)
-    {
-        SgFile *file = &(CurrentProject->file(i));
-        current_file_id = i;
-        current_file = file;
-
-        PTR_BFND node = current_file->firstStatement()->thebif;
-        for (; node; node = node->thread)
-        {
-            SgStatement *st = BfndMapping(node);
-            for (int z = 0; z < 3; ++z)
-                updateStatsByExpression(st, st->expr(z));
-        }
-    }
-
-    CurrentProject->file(save_id);
-    current_file_id = save_id;
-    current_file = save;
-}
-
-SgStatement* SgStatement::getStatmentByExpression(SgExpression* toFind)
-{
-    if (parentStatsForExpression.size() == 0)
-        updateStatsByExpression();
-
-    std::map<SgExpression*, SgStatement*>::iterator itS = parentStatsForExpression.find(toFind);
-    if (itS == parentStatsForExpression.end())
-        return NULL;
-    else
-        return itS->second;
-}
-
-SgStatement* SgFile::functions(int i)
-{
-  PTR_BFND bif;
-  SgStatement *pt = NULL;
-
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  bif = getFunctionNumHeader(i);
-  if (!bif)
-    {
-      Message("SgFile::functions; Function not found",0);
-#ifdef __SPF   
-      char buf[512];
-      sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-      addToGlobalBufferAndPrint(buf);
-      throw -1;
-#endif
-      return pt;
-    }
-  pt = GetMappingInTableForBfnd(bif);
-  if (pt)
-    return pt;
-  else
-    {
-      pt = new SgStatement(bif);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-    }  
-  return pt;
-}
-
-
-
-SgStatement *SgFile::getStruct(int i)
-{  
-  PTR_BFND bif;
-  SgStatement *pt = NULL;
-
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  bif = getStructNumHeader(i);
-  if (!bif)
-    {
-      Message("SgFile::getStruct; Struct not found",0);
-        return pt;
-    }
-  pt = GetMappingInTableForBfnd(bif);
-  if (pt)
-    return pt;
-  else
-    {
-      pt = new SgStatement(bif);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-    }  
-  return pt;
-}
-
-
-
-SgStatement::SgStatement(int variant)
-{
-    if (!isABifNode(variant))
-    {
-        Message("Attempt to create a bif node with a variant that is not", 0);
-#ifdef __SPF   
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thebif = (PTR_BFND)newNode(BASIC_BLOCK);
-    }
-    else
-        thebif = (PTR_BFND)newNode(variant);
-    SetMappingInTableForBfnd(thebif, (void *)this);
-
-    fileID = current_file_id;
-    project = CurrentProject;
-    unparseIgnore = false;
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgStatement::SgStatement(SgStatement &s)
-{
-#ifndef __SPF
-    Message("SgStatement: copy constructor not allowed", 0);
-#endif
-    thebif = s.thebif;
-
-#if __SPF
-    fileID = s.getFileId();
-    project = s.getProject();
-    unparseIgnore = s.getUnparseIgnore();
-
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-
-SgStatement::~SgStatement()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-    RemoveFromTableBfnd((void *)this);
-}
-
-void SgStatement::insertStmtAfter(SgStatement &s,SgStatement &cp)
-{
-#ifdef __SPF
-    checkConsistence();
-    //convert to simple IF
-    if (cp.variant() == LOGIF_NODE)
-    {
-        SgControlEndStmt* control = new SgControlEndStmt();
-        cp.setVariant(IF_NODE);
-        this->insertStmtAfter(*control, cp);
-    }
-#endif
-    
-    insertBfndListIn(s.thebif,thebif,cp.thebif); 
-}
-  
-
-SgStatement::SgStatement(PTR_BFND bif)
-{
-    thebif = bif;
-    SetMappingInTableForBfnd(thebif, (void *)this);
-
-    fileID = current_file_id;
-    project = CurrentProject;
-    unparseIgnore = false;
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-
-SgExpression * SgStatement::expr(int i)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-  PTR_LLND ll;
-  switch (i)
-    {
-    case 0:
-      ll = BIF_LL1(thebif);
-      break;
-    case 1:
-      ll = BIF_LL2(thebif);
-      break;
-    case 2:
-      ll = BIF_LL3(thebif);
-      break;
-    default:
-       ll = BIF_LL1(thebif);
-      Message("A bif node can only have 3 expressions (0,1,2)",BIF_LINE(thebif));
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-    }
-  return LlndMapping(ll);
-}
-
-
-
-
-SgLabel *SgStatement::label()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    PTR_LABEL lab;
-    SgLabel *pt = NULL;
-    lab = BIF_LABEL(thebif);
-    if (!lab)
-    {
-        //      Message("The bif has no label",BIF_LINE(thebif));
-        return pt;
-    }
-    pt = GetMappingInTableForLabel(lab);
-    if (pt)
-        return pt;
-    else
-    {
-        pt = new SgLabel(lab);
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, pt, 1);
-#endif
-    }
-    return pt;
-}
-
-void SgStatement::setExpression(int i, SgExpression &e)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    switch (i)
-    {
-    case 0:
-        BIF_LL1(thebif) = e.thellnd;
-        break;
-    case 1:
-        BIF_LL2(thebif) = e.thellnd;
-        break;
-    case 2:
-        BIF_LL3(thebif) = e.thellnd;
-        break;
-    default:
-        Message("A bif node can only have 3 expressions (0, 1, 2)", BIF_LINE(thebif));
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-    }
-}
-
-void SgStatement::setExpression(int i, SgExpression *e)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    switch (i)
-    {
-    case 0:
-        if (e)
-            BIF_LL1(thebif) = e->thellnd;
-        else
-            BIF_LL1(thebif) = NULL;
-        break;
-    case 1:
-        if (e)
-            BIF_LL2(thebif) = e->thellnd;
-        else
-            BIF_LL2(thebif) = NULL;
-        break;
-    case 2:
-        if (e)
-            BIF_LL3(thebif) = e->thellnd;
-        else
-            BIF_LL3(thebif) = NULL;
-        break;
-    default:
-        Message("A bif node can only have 3 expressions (0, 1, 2)", BIF_LINE(thebif));
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-    }
-}
-
-
-SgStatement* SgStatement::nextInChildList()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    PTR_BLOB blob;
-    SgStatement *x;
-
-    if (BIF_CP(thebif))
-    {
-        blob = lookForBifInBlobList(BIF_BLOB1(BIF_CP(thebif)), thebif);
-        if (!blob)
-            blob = lookForBifInBlobList(BIF_BLOB2(BIF_CP(thebif)), thebif);
-        if (blob)
-            blob = BLOB_NEXT(blob);
-        if (blob)
-            x = BfndMapping(BLOB_VALUE(blob));
-        else x = NULL;
-    }
-    else
-        x = NULL;
-
-    return x;
-}
-
-std::string SgStatement::sunparse(int lang)
-{    
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return std::string(unparse(lang));
-}
-
-
-#ifdef NOT_YET_IMPLEMENTED
-int  SgStatement::numberOfComments()  
-{
-  SORRY;
-  return 0;
-}     
-#endif
-
-void SgStatement::addComment(const char *com)
-{
-    checkCommentPosition(com);
-    LibAddComment(thebif,com);
-}
-
-void SgStatement::addComment(char *com)
-{
-    checkCommentPosition(com);
-    LibAddComment(thebif,com);
-}
- 
-#ifdef NOT_YET_IMPLEMENTED
-int  SgStatement::hasAnnotations()
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-int  SgStatement::IsSymbolInScope(SgSymbol &symb)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return  LibIsSymbolInScope(thebif,symb.thesymb);
-}
-
-int  SgStatement::IsSymbolReferenced(SgSymbol &symb)   
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return LibIsSymbolReferenced(thebif,symb.thesymb);
-}   
-
-SgExpression::~SgExpression()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-    RemoveFromTableLlnd((void *)this);
-}
-
-SgExpression::SgExpression(SgExpression &e)
-{
-#ifndef __SPF
-    Message("SgExpression: copy constructor not allowed", 0);
-#endif
-    thellnd = e.thellnd;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgExpression::SgExpression(int variant)
-{
-    if (!isALoNode(variant))
-    {
-        Message("Attempt to create a low level node with a variant that is not", 0);
-#ifdef __SPF  
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thellnd = (PTR_LLND)newNode(EXPR_LIST);
-    }
-    else
-        thellnd = (PTR_LLND)newNode(variant);
-    SetMappingInTableForLlnd(thellnd, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-
-SgExpression::SgExpression(PTR_LLND ll)
-{
-    thellnd = ll;
-    SetMappingInTableForLlnd(thellnd, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgExpression::SgExpression(int variant, SgExpression &lhs, SgExpression &rhs,
-    SgSymbol &s, SgType &type)
-{
-    if (!isALoNode(variant))
-    {
-        Message("Attempt to create a low level node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thellnd = (PTR_LLND)newNode(EXPR_LIST);
-    }
-    else
-        thellnd = (PTR_LLND)newNode(variant);
-    SetMappingInTableForLlnd(thellnd, (void *)this);
-    NODE_OPERAND0(thellnd) = lhs.thellnd;
-    NODE_OPERAND1(thellnd) = rhs.thellnd;
-    NODE_SYMB(thellnd) = s.thesymb;
-    NODE_TYPE(thellnd) = type.thetype;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-/* Pointer constructor by ajm 26-Jan-94. */
- SgExpression::SgExpression(int variant, SgExpression *lhs, SgExpression *rhs, SgSymbol *s, SgType *type)
- {
-     if (!isALoNode(variant))
-     {
-         Message("Attempt to create a low level node with a variant that is not", 0);
-#ifdef __SPF   
-         {
-             char buf[512];
-             sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-             addToGlobalBufferAndPrint(buf);
-         }
-         throw -1;
-#endif
-         // arbitrary choice for the variant
-         thellnd = (PTR_LLND)newNode(EXPR_LIST);
-     }
-     else
-         thellnd = (PTR_LLND)newNode(variant);
-     SetMappingInTableForLlnd(thellnd, (void *)this);
-     NODE_OPERAND0(thellnd) = ((lhs != 0) ? lhs->thellnd : 0);
-     NODE_OPERAND1(thellnd) = ((rhs != 0) ? rhs->thellnd : 0);
-     NODE_SYMB(thellnd) = ((s != 0) ? s->thesymb : 0);
-
-     /* If we ever get T_NOTYPE, put that here. */
-     NODE_TYPE(thellnd) = ((type != 0) ? type->thetype : 0);
-
-#if __SPF
-     addToCollection(__LINE__, __FILE__, this, 1);
-#endif
- }
-
- SgExpression::SgExpression(int variant, SgExpression *lhs, SgExpression *rhs, SgSymbol *s)
- {
-     if (!isALoNode(variant))
-     {
-         Message("Attempt to create a low level node with a variant that is not", 0);
-#ifdef __SPF   
-         {
-             char buf[512];
-             sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-             addToGlobalBufferAndPrint(buf);
-         }
-         throw -1;
-#endif
-         // arbitrary choice for the variant
-         thellnd = (PTR_LLND)newNode(EXPR_LIST);
-     }
-     else
-         thellnd = (PTR_LLND)newNode(variant);
-     SetMappingInTableForLlnd(thellnd, (void *)this);
-     NODE_OPERAND0(thellnd) = ((lhs != 0) ? lhs->thellnd : 0);
-     NODE_OPERAND1(thellnd) = ((rhs != 0) ? rhs->thellnd : 0);
-     NODE_SYMB(thellnd) = ((s != 0) ? s->thesymb : 0);
-
-#if __SPF
-     addToCollection(__LINE__, __FILE__, this, 1);
-#endif
- }
-
- SgExpression::SgExpression(int variant, SgExpression* lhs, SgExpression* rhs) 
- {
-     if (!isALoNode(variant))
-     {
-         Message("Attempt to create a low level node with a variant that is not", 0);
-#ifdef __SPF   
-         {
-             char buf[512];
-             sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-             addToGlobalBufferAndPrint(buf);
-         }
-         throw -1;
-#endif
-         // arbitrary choice for the variant
-         thellnd = (PTR_LLND)newNode(EXPR_LIST);
-     }
-     else
-         thellnd = (PTR_LLND)newNode(variant);
-     SetMappingInTableForLlnd(thellnd, (void*)this);
-     NODE_OPERAND0(thellnd) = ((lhs != 0) ? lhs->thellnd : 0);
-     NODE_OPERAND1(thellnd) = ((rhs != 0) ? rhs->thellnd : 0);
-     NODE_SYMB(thellnd) = 0;
-
-#if __SPF
-     addToCollection(__LINE__, __FILE__, this, 1);
-#endif
- }
-
- SgExpression::SgExpression(int variant, SgExpression* lhs) 
- { 
-     if (!isALoNode(variant))
-     {
-         Message("Attempt to create a low level node with a variant that is not", 0);
-#ifdef __SPF   
-         {
-             char buf[512];
-             sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-             addToGlobalBufferAndPrint(buf);
-         }
-         throw -1;
-#endif
-         // arbitrary choice for the variant
-         thellnd = (PTR_LLND)newNode(EXPR_LIST);
-     }
-     else
-         thellnd = (PTR_LLND)newNode(variant);
-     SetMappingInTableForLlnd(thellnd, (void*)this);
-     NODE_OPERAND0(thellnd) = ((lhs != 0) ? lhs->thellnd : 0);
-     NODE_OPERAND1(thellnd) = 0;
-     NODE_SYMB(thellnd) = 0;
-
-#if __SPF
-     addToCollection(__LINE__, __FILE__, this, 1);
-#endif
- }
-
-SgSymbol *SgExpression::symbol()
-{
-     /* Value expressions do not have valid symbol pointers */
-     if ( isSgValueExp (this) )
-          return NULL;
-     else
-          return SymbMapping(NODE_SYMB(thellnd));
-}
-
-
-
-
-SgExpression *SgExpression::operand(int i)
-{
-  PTR_LLND ll;
-  switch (i)
-    {
-    case 1:
-      ll = NODE_OPERAND0(thellnd);
-      break;
-    case 2:
-      ll =  NODE_OPERAND1(thellnd);
-      break;
-    default:
-      ll = NODE_OPERAND0(thellnd);
-      Message("A ll node can only have 2 child (1,2)",0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-    }
-  return LlndMapping(ll);
-}
-
-std::string SgExpression::sunparse()
-{
-    return std::string(unparse());
-}
-
-
-#define ERR_TOOMANYSYMS -1
-
-int SgExpression::linearRepresentation(int *coeff, SgSymbol **symb, int *cst, int size)
-{
-    const int maxElem = 300;
-    PTR_SYMB *ts = new PTR_SYMB[maxElem];
-    int i;
-    if (!symb || !coeff || !cst)
-        return 0;
-    if (size > maxElem)
-    {
-        Message(" Too many symbols in linearRepresentation ", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        return ERR_TOOMANYSYMS;
-    }
-    for (i = 0; i < size; i++)
-        ts[i] = symb[i]->thesymb;
-
-    int retVal = buildLinearRep(thellnd, coeff, ts, size, cst);
-    delete ts;
-    return retVal;
-}
-
-
-
-#ifdef NOT_YET_IMPLEMENTED
-SgExpression *SgExpression::normalForm(int n, SgSymbol *s)
-{
- SORRY;
- return (SgExpression *) NULL;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-SgExpression *SgExpression::coefficient(SgSymbol &s)
-{
-  SORRY;
-  return (SgExpression *) NULL;
-}
-#endif
-
-int SgExpression::isInteger()
-{
-    int *res;
-    int resul = 0;
-    res = evaluateExpression(thellnd);
-    if (res[0] != -1)
-    {
-        resul = 1;
-    }
-#ifdef __SPF   
-    removeFromCollection(res);
-#endif
-    free(res);
-    return resul;
-}
-
-int SgExpression::valueInteger()
-{
-    int *res;
-    int resul = 0;
-    res = evaluateExpression(thellnd);
-    if (res[0] != -1)
-    {
-        resul = res[1];
-    }
-#ifdef __SPF   
-    removeFromCollection(res);
-#endif
-    free(res);
-    return resul;
-}
-
-SgExpression &
-makeAnBinaryExpression(int code,SgExpression *ll1,SgExpression *ll2)
-{
-  //SgExpression *resul = NULL;
-  if (ll1 && ll2)
-    return *LlndMapping(newExpr(code,NODE_TYPE(ll1->thellnd),ll1->thellnd,ll2->thellnd));
-  else
-    if (ll1) 
-      return *LlndMapping(newExpr(code,NODE_TYPE(ll1->thellnd),ll1->thellnd,NULL));
-    else
-      if (ll2)
-        return *LlndMapping(newExpr(code,NODE_TYPE(ll2->thellnd),NULL,ll2->thellnd));
-      else
-        return *LlndMapping(newExpr(code,NULL,NULL,NULL));
-  //return *resul; never reached
-}
-
-
-SgExpression &
-makeAnBinaryExpression(int code,PTR_LLND ll1,PTR_LLND ll2)
-{
-
-  return *LlndMapping(newExpr(code,NODE_TYPE(ll1),ll1,ll2));
-}
-
-SgExpression &operator + ( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(ADD_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &operator - ( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(SUBT_OP,lhs.thellnd,rhs.thellnd);}
- 
-SgExpression &operator * ( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(MULT_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &operator / ( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(DIV_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &operator % ( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(MOD_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &operator <<( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(LSHIFT_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &operator >>( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(RSHIFT_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &operator < ( SgExpression &lhs, SgExpression &rhs)
-{
-  return makeAnBinaryExpression(LT_OP,lhs.thellnd,rhs.thellnd);
-} 
-
-SgExpression &operator > ( SgExpression &lhs, SgExpression &rhs)
-{
-  return makeAnBinaryExpression(GT_OP,lhs.thellnd,rhs.thellnd);
-} 
-
-
-SgExpression &operator <= ( SgExpression &lhs, SgExpression &rhs)
-{
-  if (CurrentProject->Fortranlanguage())
-    return makeAnBinaryExpression(LTEQL_OP,lhs.thellnd,rhs.thellnd);
-  else
-    return makeAnBinaryExpression(LE_OP,lhs.thellnd,rhs.thellnd);
-} 
-
-SgExpression &operator >= ( SgExpression &lhs, SgExpression &rhs)
-{
-  if (CurrentProject->Fortranlanguage())
-    return makeAnBinaryExpression(GTEQL_OP,lhs.thellnd,rhs.thellnd);
-  else
-    return makeAnBinaryExpression(GE_OP,lhs.thellnd,rhs.thellnd);
-} 
-
-SgExpression& operator &( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(BITAND_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator |( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(BITOR_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator &&( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(AND_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator ||( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(OR_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator +=( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(PLUS_ASSGN_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator &=( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(AND_ASSGN_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator *=( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(MULT_ASSGN_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator /=( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(DIV_ASSGN_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator %=( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(MOD_ASSGN_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator ^=( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(XOR_ASSGN_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator <<=( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(LSHIFT_ASSGN_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression& operator >>=( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(RSHIFT_ASSGN_OP,lhs.thellnd,rhs.thellnd);}
-
-SgExpression& operator==(SgExpression &lhs, SgExpression &rhs)
-{ return SgEqOp(lhs, rhs); }
-
-SgExpression& operator!=(SgExpression &lhs, SgExpression &rhs)
-{ return SgNeqOp(lhs, rhs); }
-
-SgExpression &SgAssignOp( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(ASSGN_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &    SgEqOp( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(EQ_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &   SgNeqOp( SgExpression &lhs, SgExpression &rhs)
-{
-  if (CurrentProject->Fortranlanguage())
-    return makeAnBinaryExpression(NOTEQL_OP,lhs.thellnd,rhs.thellnd);
-  else
-    return makeAnBinaryExpression(NE_OP,lhs.thellnd,rhs.thellnd);
-} 
-
-SgExpression &SgExprListOp( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(EXPR_LIST,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &  SgRecRefOp( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(RECORD_REF,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression & SgPointStOp( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(POINTST_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &   SgScopeOp( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(SCOPE_OP,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression &    SgDDotOp( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(DDOT,lhs.thellnd,rhs.thellnd);} 
-
-SgExpression & SgBitNumbOp( SgExpression &lhs, SgExpression &rhs)
-{return makeAnBinaryExpression(BIT_NUMBER,lhs.thellnd,rhs.thellnd);} 
-
-
-
-
-
-
-// For correctness of symbol creation, it is
-// necessary to have a symbol table of some form to
-// ensure there are no duplicate symbols being 
-// created.
-
-SgSymbol::SgSymbol(int variant, const char *name)
-{
-    if (!isASymbNode(variant))
-    {
-        Message("Attempt to create a symbol node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thesymb = newSymbol(VARIABLE_NAME, name, NULL);
-    }
-    else
-        thesymb = newSymbol(variant, name, NULL);
-
-    SYMB_TYPE(thesymb) = GetAtomicType(T_INT);
-    SetMappingInTableForSymb(thesymb, (void *)this);
-
-    fileID = current_file_id;
-    project = CurrentProject;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgSymbol::SgSymbol(int variant)
-{
-    if (!isASymbNode(variant))
-    {
-        Message("Attempt to create a symbol node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thesymb = newSymbol(VARIABLE_NAME, NULL, NULL);
-    }
-    else
-        thesymb = newSymbol(variant, NULL, NULL);
-    SYMB_TYPE(thesymb) = GetAtomicType(T_INT);
-    SetMappingInTableForSymb(thesymb, (void *)this);
-
-    fileID = current_file_id;
-    project = CurrentProject;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgSymbol::SgSymbol(PTR_SYMB symb)
-{
-    thesymb = symb;
-    SetMappingInTableForSymb(thesymb, (void *)this);
-
-    fileID = current_file_id;
-    project = CurrentProject;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-#if __SPF
-SgSymbol::SgSymbol(const SgSymbol &s)
-{
-    thesymb = s.thesymb;
-
-    fileID = s.fileID;
-    project = s.project;
-//    Message("SgSymbol: no copy constructor allowed", 0);
-    addToCollection(__LINE__, __FILE__, this, 1);
-}
-#endif
-
-SgSymbol::SgSymbol(int variant, const char *identifier, SgType &t, SgStatement &scope)
- {
-     if (!isASymbNode(variant))
-     {
-         Message("Attempt to create a symbol node with a variant that is not", 0);
-#ifdef __SPF   
-         {
-             char buf[512];
-             sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-             addToGlobalBufferAndPrint(buf);
-         }
-         throw -1;
-#endif
-         // arbitrary choice for the variant
-         thesymb = newSymbol(VARIABLE_NAME, identifier, NULL);
-     }
-     else
-         thesymb = newSymbol(variant, identifier, NULL);
-
-     SYMB_TYPE(thesymb) = t.thetype;
-     SYMB_SCOPE(thesymb) = scope.thebif;
-     SetMappingInTableForSymb(thesymb, (void *)this);
-
-     fileID = current_file_id;
-     project = CurrentProject;
-
-#if __SPF
-     addToCollection(__LINE__, __FILE__, this, 1);
-#endif
- }
-
- SgSymbol::SgSymbol(int variant, const char *identifier, SgType *t, SgStatement *scope)
- {
-     if (!isASymbNode(variant))
-     {
-         Message("Attempt to create a symbol node with a variant that is not", 0);
-#ifdef __SPF   
-         {
-             char buf[512];
-             sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-             addToGlobalBufferAndPrint(buf);
-         }
-         throw -1;
-#endif
-         // arbitrary choice for the variant
-         thesymb = newSymbol(VARIABLE_NAME, identifier, NULL);
-     }
-     else
-         thesymb = newSymbol(variant, identifier, NULL);
-
-     if (t != 0)
-     {
-         SYMB_TYPE(thesymb) = t->thetype;
-     }
-     else
-     {
-         SYMB_TYPE(thesymb) = 0;
-     }
-
-     if (scope != 0)
-     {
-         SYMB_SCOPE(thesymb) = scope->thebif;
-     }
-     else
-     {
-         SYMB_SCOPE(thesymb) = 0;
-     }
-
-     SetMappingInTableForSymb(thesymb, (void *)this);
-
-     fileID = current_file_id;
-     project = CurrentProject;
-
-#if __SPF
-     addToCollection(__LINE__, __FILE__, this, 1);
-#endif
- }
-
- SgSymbol::SgSymbol(int variant, const char *identifier, SgStatement &scope)
- {
-     if (!isASymbNode(variant))
-     {
-         Message("Attempt to create a symbol node with a variant that is not", 0);
-#ifdef __SPF   
-         {
-             char buf[512];
-             sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-             addToGlobalBufferAndPrint(buf);
-         }
-         throw -1;
-#endif
-         // arbitrary choice for the variant
-         thesymb = newSymbol(VARIABLE_NAME, identifier, NULL);
-     }
-     else
-         thesymb = newSymbol(variant, identifier, NULL);
-
-     SYMB_TYPE(thesymb) = GetAtomicType(T_INT);
-     SYMB_SCOPE(thesymb) = scope.thebif;
-     SetMappingInTableForSymb(thesymb, (void *)this);
-
-     fileID = current_file_id;
-     project = CurrentProject;
-
-#if __SPF
-     addToCollection(__LINE__, __FILE__, this, 1);
-#endif
- }
-
-
- SgSymbol::SgSymbol(int variant, const char *identifier, SgStatement *scope)
- {
-     if (!isASymbNode(variant))
-     {
-         Message("Attempt to create a symbol node with a variant that is not", 0);
-#ifdef __SPF   
-         {
-             char buf[512];
-             sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-             addToGlobalBufferAndPrint(buf);
-         }
-         throw -1;
-#endif
-         // arbitrary choice for the variant
-         thesymb = newSymbol(VARIABLE_NAME, identifier, NULL);
-     }
-     else
-         thesymb = newSymbol(variant, identifier, NULL);
-
-     SYMB_TYPE(thesymb) = GetAtomicType(T_INT);
-     SYMB_SCOPE(thesymb) = (scope == 0) ? 0 : scope->thebif;
-     SetMappingInTableForSymb(thesymb, (void *)this);
-
-     fileID = current_file_id;
-     project = CurrentProject;
-
-#if __SPF
-     addToCollection(__LINE__, __FILE__, this, 1);
-#endif
- }
-
- SgSymbol::~SgSymbol()
- {
-#if __SPF
-     removeFromCollection(this);
-#endif
-     RemoveFromTableSymb((void *)this);
- }
-
-SgStatement *SgSymbol::declaredInStmt()
-{
-  return BfndMapping(LibWhereIsSymbDeclare(thesymb));
-  
-}
-
-int SgSymbol::attributes()
-{
-    return SYMB_ATTR(thesymb);
-}
-
-void SgSymbol::setAttribute(int attribute)
-{
-    SYMB_ATTR(thesymb) |= attribute;
-}
-
-void SgSymbol::removeAttribute(int attribute)
-{
-    SYMB_ATTR(thesymb) ^= attribute;
-}
-
-SgStatement *SgSymbol::body()
-{
-  PTR_BFND  bif = NULL;
-  PTR_TYPE type;
-  // there is a function low_level.c that does it.
-  if ((SYMB_CODE(thesymb) == COLLECTION_NAME) ||
-      (SYMB_CODE(thesymb) == CLASS_NAME)||
-	(SYMB_CODE(thesymb) == TECLASS_NAME))
-    {
-      type = SYMB_TYPE(thesymb);
-      if (type)
-        {
-          bif = TYPE_COLL_ORI_CLASS(type);
-        } else
-          {
-            Message("Body of collection or class not found",0);
-#ifdef __SPF   
-            {
-                char buf[512];
-                sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-                addToGlobalBufferAndPrint(buf);
-            }
-            throw -1;
-#endif
-          }
-    } else
-      {
-        if ((SYMB_CODE(thesymb) == FUNCTION_NAME) ||
-            (SYMB_CODE(thesymb) == PROGRAM_NAME) ||
-            (SYMB_CODE(thesymb) == PROCEDURE_NAME) ||
-            (SYMB_CODE(thesymb) == MEMBER_FUNC))
-          {
-	 	bif = SYMB_FUNC_HEDR(thesymb); // needed, otherwise breaks pC++
-		if (!bif)
-        	 bif = getFunctionHeader(thesymb);
-          } else
-            {
-              Message("Body not found, may not be implemented yet",0);
-#ifdef __SPF   
-              {
-                  char buf[512];
-                  sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-                  addToGlobalBufferAndPrint(buf);
-              }
-              throw -1;
-#endif
-              SORRY;
-            }	
-      }
-  
-  return BfndMapping(bif);
-}
-
-
-
-
-SgType::SgType(int variant)
-{
-    if (!isATypeNode(variant))
-    {
-        Message("Attempt to create a type node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thetype = (PTR_TYPE)newNode(T_INT);
-    }
-    else
-        thetype = (PTR_TYPE)newNode(variant);
-    SetMappingInTableForType(thetype, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-
-/* This code by Andrew Mauer (ajm) */
-/*
-  maskDescriptors:
-
-  This routine strips many descriptive type traits which you are probably
-  not interested in cloning for variable declarations, etc.
-
-  Returns the getTrueType of the base type being described IF there
-  are no descriptors which are not masked out. The following masks
-  can be specified as an optional second argument:
-        MASK_NO_DESCRIPTORS: Do not mask out anything.
-        MASK_MOST_DESCRIPTORS: Only leave in: signed, unsigned, short, long,
-	                                      const, volatile.
-	MASK_ALL_DESCRIPTORS: Mask out everything. 
-
-  If you build your own mask, you should make sure that the traits
-  you want to set out have their bits UN-set, and the rest should have
-  their bits set. The complementation (~) operator is a good one to use.
-
-  See libSage++.h, where the MASK_*_DESCRIPTORS variables are defined.
-*/
-
-/* Thanks a lot for the stupid $@!@$ #ifdef USER in libSage++.h */
-class SgDerivedType;
-SgDescriptType *isSgDescriptType(SgType *pt);
-SgPointerType *isSgPointerType(SgType *pt);
-SgArrayType *isSgArrayType(SgType *pt);
-SgDerivedType *isSgDerivedType(SgType *pt);
-
-SgType *SgType::maskDescriptors (int mask)
-{
-     if ( ! isSgDescriptType(this))
-	  return this;
-  
-     int current_bits_set = isSgDescriptType(this)->modifierFlag();
-     
-     if ( (current_bits_set & mask ) == 0 )
-     {
-	  return this->baseType()->getTrueType(mask,0);
-     }
-     else if ( current_bits_set != (current_bits_set & mask) )
-     {
-	  /* Mask has changed bits set. Need to build the new type
-	     with the unwanted bits masked off. */
-	  
-	  SgDescriptType *t_new = isSgDescriptType(&this->copy());
-	  
-	  t_new->setModifierFlag( current_bits_set & mask );
-	  
-	  return t_new;
-     }
-     else
-     {
-	  return this;
-     }
-}
-
-/* This code by Andrew Mauer (ajm) */
-/*
-  getTrueType:
-
-  Since Sage stores dereferenced pointers as PTR(-1) -> PTR(1) -> BASE_TYPE,
-  we may need to follow the chain of dereferencing to find the type
-  which we expect.
-
-  This code currently assumes that:
-  o If you follow the dereferencing pointer (PTR(-1)), you find another
-  pointer type or an array type. 
-
-  We do NOT assume that the following situation cannot occur:
-      PTR(-1) -> PTR(-1) -> PTR(1) -> PTR(1) -> PTR(-1) -> PTR(1)
-
-  This means there may be more pointers to follow after we come to
-  an initial "equilibrium".
-
-  ALGORITHM:
-
-  T_POINTER:
-     [WARNING: No consideration is given to pointers with attributes
-     (ls_flags) set. For instance, a const pointer is treated the same
-     as any other pointer.]
-     
-     1. Return the same type we got if it is not a pointer type or
-     the pointer is not a dereferencing pointer type.
-
-     2. Repeat { get next pointer , add its indirection to current total }
-     until the current total is 0. We have reached an equilibrium, so
-     the next type will not necessarily be a pointer type.
-
-     3. Check the next type for further indirection with another call
-     to getTrueType.
-
-  T_DESCRIPT:
-     Returns the result of maskDescriptors called with the given type and mask.
-
-  T_ARRAY:
-     If the array has zero dimensions, we pass over it. This type arose
-     for me in the following situation:
-          double x[2];
-	  x[1] = 0;
-     
-  T_DERIVED_TYPE:
-     If we have been told to follow typedefs, get the type of the
-     symbol from which this type is derived from, and continue digging.
-     Otherwise return this type.
-
-
-  HITCHES:
-     Some programs may dereference a T_ARRAY as a pointer, so we need
-     to be prepared to deal with that.
-  */
-
-SgType *SgType::getTrueType (int mask, int follow_typedefs)
-{
-     switch (this->variant())
-     {
-       case T_POINTER:
-       {
-	    SgType *next = NULL;
-	    SgType *current = NULL;
-	    int current_indirection;
-
-	    current = this;
-	    
-	    current_indirection =
-		 isSgPointerType(current)->indirection();
-
-	    if (current_indirection > 0)
-		 return this;
-
-	    while (current_indirection < 0)
-	    {
-		 // Get next type
-		 next = current->baseType();
-
-		 if ( isSgPointerType (next) )
-		 {
-		      // add indirection to current
-		      current_indirection +=
-			   isSgPointerType(next)->indirection();
-		 }
-		 else if ( isSgArrayType (next) )
-		 {
-		      /* One level of indirection for each dimension. */
-		      current_indirection +=
-			   isSgArrayType(next)->dimension();
-		 }
-		 else
-		 {
-		      /* Don't know what's going on. Fix me.
-		         This includes the case of ptr not having
-			 a base type, so next = NULL. */
-		      abort();
-		 }
-		 current = next;
-	    }
-
-	    return next->getTrueType(mask, follow_typedefs);
-       }
-       //break;
-	  
-       case T_DESCRIPT:
-	    return this->maskDescriptors (mask);
-            //break;
-       case T_DERIVED_TYPE:
-       {
-	    if ( follow_typedefs )
-	    {
-		 SgDerivedType *derived_type = isSgDerivedType (this);
-
-		 return
-		      (derived_type->typeName()->type())
-		      ->getTrueType(mask, follow_typedefs);
-	    }
-	    else
-	    {
-		 return this;
-	    }
-	    //break;
-       }
-       case T_ARRAY:
-       {
-	    SgArrayType *the_array = isSgArrayType(this);
-	    if (the_array->dimension() == 0)
-	    {
-		 return the_array->baseType()->getTrueType(mask,
-							   follow_typedefs);
-	    }
-	    else
-	    {
-		 return this;
-	    }
-       }
-       default:
-            return this;
-            //break;
-     }
-}
-
-
-SgType *SgTypeInt()
-{
-  return TypeMapping(GetAtomicType(T_INT));
-}
-
-
-SgType *SgTypeChar()
-{
-  return TypeMapping(GetAtomicType(T_CHAR));
-}
-
-SgType *SgTypeFloat()
-{
-   return TypeMapping(GetAtomicType(T_FLOAT));
-}
-
-SgType *SgTypeDouble()
-{
-  return TypeMapping(GetAtomicType(T_DOUBLE));
-}
-
-SgType *SgTypeVoid()
-{
-  return TypeMapping(GetAtomicType(T_VOID));
-}
-
-SgType *SgTypeBool()
-{
-  return TypeMapping(GetAtomicType(T_BOOL));
-}
-
-SgType *SgTypeDefault()
-{
-  return TypeMapping(GetAtomicType(DEFAULT));
-}
-
-
-
-//
-//
-// Subclass for reference to symbol
-//
-//
-
-
-SgRefExp * isSgRefExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case CONST_REF:
-    case TYPE_REF:
-    case INTERFACE_REF:
-      return (SgRefExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-#ifdef NOT_YET_IMPLEMENTED
-SgExpression * SgVarRefExp::progatedValue()
- {
-   SORRY;     // if scalar propogation worked
-   return (SgExpression *) NULL;
- }
-#endif
-
-
-SgVarRefExp * isSgVarRefExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case VAR_REF:
-      return (SgVarRefExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgThisExp * isSgThisExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case THIS_NODE:
-      return (SgThisExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgArrayRefExp * isSgArrayRefExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case ARRAY_REF:
-      return (SgArrayRefExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-SgPntrArrRefExp * isSgPntrArrRefExp(SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case ARRAY_OP:
-      return (SgPntrArrRefExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgPointerDerefExp * isSgPointerDerefExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case DEREF_OP:
-      return (SgPointerDerefExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgRecordRefExp * isSgRecordRefExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case RECORD_REF:
-      return (SgRecordRefExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgStructConstExp* isSgStructConstExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case STRUCTURE_CONSTRUCTOR:
-      return (SgStructConstExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgConstExp* isSgConstExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case CONSTRUCTOR_REF:
-      return (SgConstExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgVecConstExp * isSgVecConstExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case VECTOR_CONST:
-      return (SgVecConstExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgInitListExp * isSgInitListExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case INIT_LIST:
-      return (SgInitListExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgObjectListExp * isSgObjectListExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case EQUI_LIST:
-    case NAMELIST_LIST:
-    case COMM_LIST:
-      return (SgObjectListExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgAttributeExp * isSgAttributeExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case PARAMETER_OP:
-    case PUBLIC_OP:
-    case PRIVATE_OP:
-    case ALLOCATABLE_OP:
-    case DIMENSION_OP:
-    case EXTERNAL_OP:
-    case IN_OP:
-    case OUT_OP:
-    case INOUT_OP:
-    case INTRINSIC_OP:
-    case POINTER_OP:
-    case OPTIONAL_OP:
-    case SAVE_OP:
-    case TARGET_OP:
-      return (SgAttributeExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-SgKeywordArgExp * isSgKeywordArgExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case KEYWORD_ARG:
-      return (SgKeywordArgExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgSubscriptExp* isSgSubscriptExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case DDOT:
-      return (SgSubscriptExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgUseOnlyExp * isSgUseOnlyExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case ONLY_NODE:
-      return (SgUseOnlyExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgUseRenameExp * isSgUseRenameExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case RENAME_NODE:
-      return (SgUseRenameExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgSpecPairExp * isSgSpecPairExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case SPEC_PAIR:
-      return (SgSpecPairExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgIOAccessExp * isSgIOAccessExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case IOACCESS:
-      return (SgIOAccessExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgImplicitTypeExp * isSgImplicitTypeExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case IMPL_TYPE:
-      return (SgImplicitTypeExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgTypeExp * isSgTypeExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case TYPE_OP:
-      return (SgTypeExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgSeqExp * isSgSeqExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case SEQ:
-      return (SgSeqExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgStringLengthExp * isSgStringLengthExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case LEN_OP:
-      return (SgStringLengthExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgDefaultExp * isSgDefaultExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case DEFAULT:
-      return (SgDefaultExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgLabelRefExp * isSgLabelRefExp (SgExpression *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case LABEL_REF:
-      return (SgLabelRefExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-///////////////////////////////////////////////////////////////////////////////
-//                                                                           //
-//                                                                           //
-// We add the subclass for statements  here.                                 //
-// Need more comment and so on ........                                      //
-// Reorganizing that file may be necessary sometimes                         //
-//                                                                           //
-///////////////////////////////////////////////////////////////////////////////
-
-
-
-SgProgHedrStmt * isSgProgHedrStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case PROC_HEDR:
-    case FUNC_HEDR:
-    case PROG_HEDR:
-      return (SgProgHedrStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgProcHedrStmt * isSgProcHedrStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case FUNC_HEDR:
-    case PROC_HEDR:
-      return (SgProcHedrStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgFunctionType *isSgFunctionType(SgType *);
-
-SgExpression *SgMakeDeclExp(SgSymbol *sym, SgType *t) {
-    SgExpression *s = NULL;
-    int first = 1, done = 0;
-    SgType *tsave = t;
-    if ((sym != NULL) && (t != NULL))
-        sym->setType(*t);
-    while ((!done) && (t != NULL)) {
-        // printf("loop var = %d\n", t->variant());
-        switch (t->variant()) {
-        case T_POINTER:
-            if (first) {
-                s = new SgVarRefExp(sym);
-#ifdef __SPF   
-                addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-                s->setType(*tsave);
-            }
-            s = &SgDerefOp(*s);
-            s->setType(*t); // this is wrong but it is consistant with parser.
-            t = t->baseType();
-            // s->setType(*t); this should be correct, but because of paser..
-            first = 0;
-            break;
-        case T_REFERENCE:
-            if (first) {
-                s = new SgVarRefExp(sym);
-#ifdef __SPF   
-                addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-                s->setType(*tsave);
-            }
-            s = &SgAddrOp(*s);
-            s->setType(*t); // this is wrong but it is consistant with parser.
-            t = t->baseType();
-            // s->setType(*t); this should be correct, but because of paser..
-            first = 0;
-            break;
-        case T_ARRAY: {
-            SgArrayType *art = isSgArrayType(t);
-            if (first) {
-                s = new SgArrayRefExp(*sym, *(art->getDimList()));
-#ifdef __SPF   
-                addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-            }
-            else {
-                s = new SgPntrArrRefExp(*s, *(art->getDimList()));
-#ifdef __SPF   
-                addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-            }
-            t = t->baseType();
-            s->setType(*tsave);
-            first = 0;
-        }
-                      break;
-        case T_FUNCTION: {
-            SgFunctionType *f = isSgFunctionType(t);
-            if (s == NULL) 
-            {
-                Message("error in AddArg", 0);
-#ifdef __SPF   
-                {
-                    char buf[512];
-                    sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-                    addToGlobalBufferAndPrint(buf);
-                }
-                throw -1;
-#endif
-                return NULL; 
-            }
-            s = new SgFuncPntrExp(*s);
-#ifdef __SPF   
-            addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-            t = f->returnedValue();
-            s->setType(*t);
-            first = 0;
-        }
-                         break;
-        case T_DESCRIPT:
-            t = t->baseType();
-            break;
-        default:
-            done = 1;
-            if (first) {
-                s = new SgVarRefExp(sym);
-#ifdef __SPF   
-                addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-                s->setType(*tsave);
-            }
-            first = 0;
-            break;
-        }
-    }
-    return s;
-}
-
-SgExpression * SgFuncPntrExp::AddArg(SgSymbol *f,  char *name, SgType &t)
-    // to add a parameter to pointer
-    // to a function or to a pointer to an array of functions
-{
-  PTR_SYMB symb;
-  SgExpression *arg = NULL;
-  SgSymbol *s;
-  if (!f)
-  {
-      Message("SgFuncPntrExp::AddArg: must have non-null funct. symb", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  s = new SgVariableSymb(name, t, *f->scope()); //create the variable with scope
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-  symb = s->thesymb;
-  appendSymbToArgList(f->thesymb,symb); 
-
-  if(LibFortranlanguage())
-  {
-        Message("Fortran function args do not have arg lists", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-	}
- else{
-        arg = SgMakeDeclExp(s, &t); 
-	NODE_OPERAND1(this->thellnd) = 
-	    addToExprList(NODE_OPERAND1(this->thellnd),arg->thellnd);
-      }
- return arg;
-}
-	
-SgExpression * SgProcHedrStmt::AddArg(char *name, SgType &t)
-{
-  PTR_SYMB symb;
-  PTR_LLND ll;
-  SgExpression *arg;
-  SgSymbol *s;
-
-  s = new SgVariableSymb(name, t, *this); //create the variable with scope
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-  symb = s->thesymb;
-  appendSymbToArgList(BIF_SYMB(thebif),symb); 
-
-  if(LibFortranlanguage()){
-        arg = new SgVarRefExp(*s);
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, arg, 1);
-#endif
- 	BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg->thellnd);
-        declareAVar(symb,thebif);
-	}
- else{
-        arg = SgMakeDeclExp(s, &t); 
-        ll = BIF_LL1(thebif);
-        ll = NODE_OPERAND0(ll);
-	NODE_OPERAND0(ll) = addToExprList(NODE_OPERAND0(ll),arg->thellnd);
-      }
- return arg;
-}
-
-SgExpression * SgProcHedrStmt::AddArg(char *name, SgType &t, SgExpression &init)
-{
-  PTR_SYMB symb;
-  PTR_LLND ll;
-  SgExpression *arg, *ref;
-  SgSymbol *s;
-
-  if(LibFortranlanguage()){
-     Message("no initializer allowed for fortran parameters",0);
-     }
-
-  s = new SgVariableSymb(name, t, *this); //create the variable with scope
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-  symb = s->thesymb;
-  appendSymbToArgList(BIF_SYMB(thebif),symb); 
-  ref = SgMakeDeclExp(s, &t);
-  arg = &SgAssignOp(*ref, init);
-  ll = BIF_LL1(thebif);
-  ll = NODE_OPERAND0(ll);
-  NODE_OPERAND0(ll) = addToExprList(NODE_OPERAND0(ll),arg->thellnd);
-  return arg;
-}
-
-SgFuncHedrStmt * isSgFuncHedrStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case FUNC_HEDR:
-      return (SgFuncHedrStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-#ifdef NOT_YET_IMPLEMENTED
-class  SgModuleStmt: public SgStatement{
-        // Fortran 90 Module statement
-        // variant ==  MODULE_STMT
-     public:
-        SgModuleStmt(SgSymbol &moduleName, SgStatement &body):SgStatement(MODULE_STMT)
-          {
-            SORRY;
-          };
-        SgModuleStmt(SgSymbol &moduleName):SgStatement(PROG_HEDR)
-          {
-            SORRY;
-          };
-        ~SgModuleStmt(){RemoveFromTableBfnd((void *) this);};
-
-        SgSymbol *moduleName()
-          {
-            SORRY;
-          };               // module name 
-        void setName(SgSymbol &symbol)
-          {
-            SORRY;
-          };        // set module name 
-
-        int numberOfSpecificationStmts()
-          {
-            SORRY;
-          };
-        int numberOfRoutinesDefined()
-          {
-            SORRY;
-          };
-        int numberOfFunctionsDefined()
-          {
-            SORRY;
-          };
-        int numberOfSubroutinesDefined()
-          {
-            SORRY;
-          };
-
-        SgStatement *specificationStmt(int i)
-          {
-            SORRY;
-          };
-        SgStatement *routine(int i)
-          {
-            SORRY;
-          };
-        SgStatement *function(int i)
-          {
-            SORRY;
-          };
-        SgStatement *subroutine(int i)
-          {
-            SORRY;
-          };
-
-        int isSymbolInScope(SgSymbol &symbol)
-          {
-            SORRY;
-          };
-        int isSymbolDeclaredHere(SgSymbol &symbol)
-          {
-            SORRY;
-          };
-
-        SgSymbol &addVariable(SgType &T, char *name)
-          {
-            SORRY;
-          }; 
-                                        //add a declaration for new variable
-
-        SgStatement *addCommonBlock(char *blockname, int noOfVars,
-                                    SgSymbol *Vars)
-          {
-            SORRY;
-          }; // add a new common block
-};
-
-
-SgModuleStmt * isSgModuleStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case MODULE_STMT:
-      return (SgModuleStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-class  SgInterfaceStmt: public SgStatement{
-        // Fortran 90 Operator Interface Statement
-        // variant == INTERFACE_STMT
-     public:
-        SgInterfaceStmt(SgSymbol &name, SgStatement &body, SgStatement &scope):SgStatement(INTERFACE_STMT)
-          {
-            SORRY;
-          };
-        ~SgInterfaceStmt(){RemoveFromTableBfnd((void *) this);};
-
-        SgSymbol *interfaceName()
-          {
-            SORRY;
-          };               // interface name if given
-        int setName(SgSymbol &symbol)
-          {
-            SORRY;
-          };           // set interface name 
-
-        int numberOfSpecificationStmts()
-          {
-            SORRY;
-          };
-
-        SgStatement *specificationStmt(int i)
-          {
-            SORRY;
-          };
-
-        int isSymbolInScope(SgSymbol &symbol)
-          {
-            SORRY;
-          };
-        int isSymbolDeclaredHere(SgSymbol &symbol)
-          {
-            SORRY;
-          };
-};
-
-
-SgInterfaceStmt * isSgInterfaceStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case INTERFACE_STMT:
-      return (SgInterfaceStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-class  SgBlockDataStmt: public SgStatement{
-        // Fortran Block Data statement
-        // variant == BLOCK_DATA
-     public:
-        SgBlockDataStmt(SgSymbol &name, SgStatement &body):SgStatement(BLOCK_DATA)
-          {
-            BIF_SYMB(thebif) = name.thesymb;
-            insertBfndListIn(body.thebif,thebif,thebif);            
-          };
-        ~SgBlockDataStmt(){RemoveFromTableBfnd((void *) this);};
-
-        SgSymbol *name()  // block data name if given
-          { return SymbMapping(BIF_SYMB(thebif)); };
-        int setName(SgSymbol &symbol)
-          { 
-            BIF_SYMB(thebif) = symbol.thesymb;
-            return 1;
-          };           // set block data name 
-
-        int isSymbolInScope(SgSymbol &symbol)
-          {
-            SORRY;
-          };
-        int isSymbolDeclaredHere(SgSymbol &symbol)
-          {
-            SORRY;
-          };
-};
-
-
-
-SgBlockDataStmt * isSgBlockDataStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case BLOCK_DATA:
-      return (SgBlockDataStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-#endif
-
-SgClassStmt * isSgClassStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case CLASS_DECL:
-    case TECLASS_DECL:
-    case STRUCT_DECL:
-    case UNION_DECL:
-    case ENUM_DECL:
-    case COLLECTION_DECL:
-      return (SgClassStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgStructStmt * isSgStructStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case STRUCT_DECL:
-      return (SgStructStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgUnionStmt * isSgUnionStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case UNION_DECL:
-      return (SgUnionStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgEnumStmt * isSgEnumStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case ENUM_DECL:
-      return (SgEnumStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgCollectionStmt * isSgCollectionStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case COLLECTION_DECL:
-      return (SgCollectionStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgBasicBlockStmt * isSgBasicBlockStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case BASIC_BLOCK:
-      return (SgBasicBlockStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-SgForStmt * isSgForStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case FOR_NODE :
-      return (SgForStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgProcessDoStmt * isSgProcessDoStmt (SgStatement *pt)
-{
- 
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case PROCESS_DO_STAT :
-      return (SgProcessDoStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgWhileStmt * isSgWhileStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case WHILE_NODE:
-      return (SgWhileStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgDoWhileStmt * isSgDoWhileStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case DO_WHILE_NODE:
-      return (SgDoWhileStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgLogIfStmt * isSgLogIfStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case LOGIF_NODE:
-      return (SgLogIfStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgIfStmt * isSgIfStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case IF_NODE:
-      return (SgIfStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-#ifdef NOT_YET_IMPLEMENTED
-class  SgIfElseIfStmt: public SgIfStmt {
-        // For Fortran if then elseif .. elseif ... case
-        // variant == ELSEIF_NODE
-     public:
-        SgIfElseIfStmt(SgExpression &condList, SgStatement &blockList,
-                       SgSymbol &constructName):SgIfStmt(ELSEIF_NODE)
-          {
-            SORRY;
-          }; 
-        int numberOfConditionals()
-          {
-            SORRY;
-          };       // the number of conditionals
-        SgStatement *body(int b)
-          {
-            SORRY;
-          };          // block b
-        void setBody(int b)
-          {
-            SORRY;
-          };              // sets block 
-        SgExpression *conditional(int i)
-          {
-            SORRY;
-          }; // the i-th conditional
-        void setConditional(int i)
-          {
-            SORRY;
-          };       // sets the i-th conditional
-        void addClause(SgExpression &cond, SgStatement &block)
-          {
-            SORRY;
-          };
-        void removeClause(int b)
-          {
-            SORRY;
-          };          // removes block b and it's conditional
-
-};
-
-
-SgIfElseIfStmt * isSgIfElseIfStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case ELSEIF_NODE:
-      return (SgIfElseIfStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-#endif
-
-SgArithIfStmt * isSgArithIfStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case ARITHIF_NODE:
-      return (SgArithIfStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgWhereStmt * isSgWhereStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case WHERE_NODE:
-      return (SgWhereStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgWhereBlockStmt * isSgWhereBlockStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case WHERE_BLOCK_STMT:
-      return (SgWhereBlockStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgSwitchStmt * isSgSwitchStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case SWITCH_NODE:
-      return (SgSwitchStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-SgCaseOptionStmt * isSgCaseOptionStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case CASE_NODE:
-      return (SgCaseOptionStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-// ******************** Leaf Executable Nodes ***********************
-
-
-SgExecutableStatement* isSgExecutableStatement(SgStatement *pt)
-{
-    if (!pt)
-        return NULL;
-    if (!isADeclBif(BIF_CODE(pt->thebif)))
-    {
-        if (SgStatement::isSapforRegime())
-        {
-            const int var = pt->variant();
-            if (var == CONTROL_END)
-            {
-                SgStatement* cp = pt->controlParent();
-                if (cp->variant() == PROG_HEDR || cp->variant() == PROC_HEDR || cp->variant() == FUNC_HEDR)
-                {
-                    SgStatement* cpcp = cp->controlParent();
-                    if (cpcp && cpcp->variant() == INTERFACE_STMT)
-                        return NULL;
-                    else
-                        return (SgExecutableStatement*)pt;
-                }
-                else
-                    return isSgExecutableStatement(cp);
-            }
-            else if (var == DVM_INHERIT_DIR || var == DVM_ALIGN_DIR || var == DVM_DYNAMIC_DIR ||
-                var == DVM_DISTRIBUTE_DIR || var == DVM_VAR_DECL || var == DVM_SHADOW_DIR ||
-                var == DVM_HEAP_DIR || var == DVM_CONSISTENT_DIR || var == DVM_POINTER_DIR ||
-                var == HPF_TEMPLATE_STAT || var == HPF_PROCESSORS_STAT || var == DVM_TASK_DIR ||
-                var == DVM_INDIRECT_GROUP_DIR || var == DVM_REMOTE_GROUP_DIR || var == DVM_REDUCTION_GROUP_DIR ||
-                var == DVM_CONSISTENT_GROUP_DIR || var == DVM_ASYNCID_DIR || var == ACC_ROUTINE_DIR)
-                return NULL;
-            else if (var == SPF_ANALYSIS_DIR || var == FORMAT_STAT)
-                return isSgExecutableStatement(pt->lexNext());
-            else
-                return (SgExecutableStatement*)pt;
-        }
-        else
-            return (SgExecutableStatement*)pt;
-    }
-    else
-    {
-        if (SgStatement::isSapforRegime())
-        {
-            const int var = pt->variant();
-            if (var == SPF_PARALLEL_DIR)
-                return (SgExecutableStatement*)pt;
-            if (var == SPF_ANALYSIS_DIR || var == SPF_PARALLEL_REG_DIR)
-                return isSgExecutableStatement(pt->lexNext());
-            if (var == SPF_END_PARALLEL_REG_DIR)
-                return isSgExecutableStatement(pt->lexPrev());
-            if (var == SPF_TRANSFORM_DIR)
-            {
-                SgExpression* ex = pt->expr(0);
-                while (ex)
-                {
-                    if (ex->lhs()->variant() == SPF_NOINLINE_OP)
-                        return NULL;
-                    else if (ex->lhs()->variant() == SPF_FISSION_OP || ex->lhs()->variant() == SPF_EXPAND_OP)
-                        return (SgExecutableStatement*)pt;
-
-                    ex = ex->rhs();
-                }
-            }
-
-            if (var == DVM_PARALLEL_ON_DIR || var == ACC_REGION_DIR || var == ACC_END_REGION_DIR || var == DVM_EXIT_INTERVAL_DIR)
-                return (SgExecutableStatement*)pt;
-            if (var == DVM_INTERVAL_DIR)
-                return isSgExecutableStatement(pt->lexNext());
-            if (var == DVM_ENDINTERVAL_DIR)
-                return isSgExecutableStatement(pt->lexPrev());
-            if (var == DVM_BARRIER_DIR)
-                return (SgExecutableStatement*)pt;
-            if (var == DVM_INHERIT_DIR)
-                return NULL;
-            if (var == DVM_INHERIT_DIR || var == DVM_ALIGN_DIR || var == DVM_DYNAMIC_DIR ||
-                var == DVM_DISTRIBUTE_DIR || var == DVM_VAR_DECL || var == DVM_SHADOW_DIR ||
-                var == DVM_HEAP_DIR || var == DVM_CONSISTENT_DIR || var == DVM_POINTER_DIR)
-                return NULL;
-        }
-        return NULL;
-    }
-}
-
-SgAssignStmt * isSgAssignStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case ASSIGN_STAT:
-      return (SgAssignStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgCExpStmt * isSgCExpStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case EXPR_STMT_NODE:
-      return (SgCExpStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgPointerAssignStmt * isSgPointerAssignStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case POINTER_ASSIGN_STAT:
-      return (SgPointerAssignStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgHeapStmt * isSgHeapStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case ALLOCATE_STMT:
-    case DEALLOCATE_STMT:
-      return (SgHeapStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-   
-SgNullifyStmt * isSgNullifyStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case NULLIFY_STMT:
-      return (SgNullifyStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgContinueStmt * isSgContinueStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case CONT_STAT:
-      return (SgContinueStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-   
-
-SgControlEndStmt * isSgControlEndStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case CONTROL_END :
-      return (SgControlEndStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgBreakStmt * isSgBreakStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case BREAK_NODE:
-      return (SgBreakStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgCycleStmt * isSgCycleStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case CYCLE_STMT:
-      return (SgCycleStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgReturnStmt * isSgReturnStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case RETURN_NODE:
-    case RETURN_STAT:
-      return (SgReturnStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgExitStmt * isSgExitStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case EXIT_STMT:
-      return (SgExitStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgGotoStmt * isSgGotoStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case GOTO_NODE:
-      return (SgGotoStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgLabelListStmt * isSgLabelListStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case COMGOTO_NODE:
-    case  ASSGOTO_NODE:
-      return (SgLabelListStmt *) pt;
-    default:
-//      SORRY;
-      return NULL;
-    }
-}
-
-
-SgAssignedGotoStmt * isSgAssignedGotoStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case ASSGOTO_NODE:
-      return (SgAssignedGotoStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgComputedGotoStmt * isSgComputedGotoStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case COMGOTO_NODE:
-      return (SgComputedGotoStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgStopOrPauseStmt * isSgStopOrPauseStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case STOP_STAT:
-      return (SgStopOrPauseStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgCallStmt* isSgCallStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case PROC_STAT:
-      return (SgCallStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgProsHedrStmt* isSgProsHedrStmt (SgStatement *pt) /* Fortran M */
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case PROS_HEDR:
-      return (SgProsHedrStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgProsCallStmt* isSgProsCallStmt (SgStatement *pt) /* Fortran M */
-{
- 
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case PROS_STAT:
-      return (SgProsCallStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgProsCallLctn* isSgProsCallLctn (SgStatement *pt) /* Fortran M */
-{
- 
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case PROS_STAT_LCTN:
-      return (SgProsCallLctn *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgProsCallSubm* isSgProsCallSubm (SgStatement *pt) /* Fortran M */
-{
- 
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case PROS_STAT_SUBM:
-      return (SgProsCallSubm *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgIOStmt * isSgIOStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case 0:
-      return (SgIOStmt *) pt;
-    default:
-      SORRY;
-      return NULL;
-    }
-}
-
-
-SgInputOutputStmt * isSgInputOutputStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case READ_STAT:
-    case WRITE_STAT:
-    case PRINT_STAT:
-      return (SgInputOutputStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgIOControlStmt::SgIOControlStmt(int variant, SgExpression &controlSpecifierList):SgExecutableStatement(variant)
-{
-  switch (variant){
-  case OPEN_STAT:
-  case CLOSE_STAT:
-  case INQUIRE_STAT:
-  case BACKSPACE_STAT:
-  case REWIND_STAT:
-  case ENDFILE_STAT:
-  case FORMAT_STAT:
-    break;
-  default:
-    Message("illegal variant for SgIOControlStmt",0);
-#ifdef __SPF   
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-    }
-    throw -1;
-#endif
-  }
-  
-  BIF_LL2(thebif) = controlSpecifierList.thellnd;
-}
-
-SgIOControlStmt * isSgIOControlStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-      case OPEN_STAT:
-    case CLOSE_STAT:
-    case INQUIRE_STAT:
-    case BACKSPACE_STAT:
-    case REWIND_STAT:
-    case ENDFILE_STAT:
-    case FORMAT_STAT:
-      return (SgIOControlStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-// ******************** Declaration Nodes ***************************
-
-SgDeclarationStatement * isSgDeclarationStatement (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case VAR_DECL:
-    case VAR_DECL_90:
-    case ENUM_DECL:
-    case STRUCT_DECL:
-    case CLASS_DECL:
-    case TECLASS_DECL:
-    case COLLECTION_DECL:
-      return (SgDeclarationStatement *) pt;
-    default:
-      return NULL;
-    }
-}
-
-// the complete initial value ASSGN_OP expression ofthe i-th variable
-// from Michael Golden
-SgExpression * SgVarDeclStmt::completeInitialValue(int i)
-{ 
-  PTR_LLND varRefExp;
-  SgExpression *x;
-
-  varRefExp = getPositionInExprList(BIF_LL1(thebif),i);
-  if (varRefExp == LLNULL)
-    x = NULL;
-  else if (NODE_CODE(varRefExp) == ASSGN_OP)
-    x = LlndMapping(varRefExp);
-  else 
-    x = NULL;
-
-  return x;
-}
-
-
-// sets the initial value ofthe i-th variable
-// an alternative way to initialize variables. The low-level node 
-// (VAR_REF or ARRAY_REF) is replaced by a ASSIGN_OP low-level node.
-void SgVarDeclStmt::setInitialValue(int i, SgExpression &initVal) // sets the initial value ofthe i-th variable
-{
-  int j;
-  SgExpression *list, *varRef;
-  list = this->expr(0);
-  for(j = 0; j < i; j++) if(list) list = list->rhs();
-  if(!list) return;
-  varRef = list->lhs();
-  if(!varRef) return;
-  if(varRef->variant() == ASSGN_OP){
-	 varRef->setRhs(initVal);
-	 return;
-	}
-  SgExpression &e = SgAssignOp(*varRef, initVal);
-  list->setLhs(e);
-  return;
-}
-  
-// method below contributed by Michael Golden 
-// removes the initial value of the i-ith declaration
- void SgVarDeclStmt::clearInitialValue(int i)
- {
-     int j;
-     SgExpression *list, *varRef;  
- 
-     list = this->expr(0);
-     for(j = 0; j < i; j++) 
-       if (list) 
- 	list = list->rhs();
-     if(!list) 
-       return;
-     varRef = list->lhs();
-     if(!varRef) 
-       return;
-     
-     /* If there is an assignment here, then change it to just the LHS */
-     /* Which is the variable itself                                   */
-     if (varRef->variant() == ASSGN_OP) 
-       list->setLhs(*(varRef->lhs()));
- 
- 
- }
-
-
-SgVarDeclStmt * isSgVarDeclStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case VAR_DECL:
-      return (SgVarDeclStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgIntentStmt * isSgIntentStmt (SgStatement *pt) /* Fortran M */
-{
- 
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case INTENT_STMT:
-      return (SgIntentStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgVarListDeclStmt::SgVarListDeclStmt(int variant, SgExpression &):SgDeclarationStatement(variant)
-          {
-            switch (variant) {
-              case INTENT_STMT:
-              case OPTIONAL_STMT:
-              case SAVE_DECL:
-              case PUBLIC_STMT:
-              case PRIVATE_STMT:
-              case EXTERN_STAT:
-              case INTRIN_STAT:
-              case DIM_STAT:
-              case ALLOCATABLE_STMT:
-              case POINTER_STMT:
-              case TARGET_STMT:
-              case MODULE_PROC_STMT:
-                   break;
-              default:
-                   Message("Illegal variant for SgVarListDeclStmt",0);
-#ifdef __SPF   
-                   {
-                       char buf[512];
-                       sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-                       addToGlobalBufferAndPrint(buf);
-                   }
-                   throw -1;
-#endif
-            };
-
-//            findStatementAttribute(variant, attribute);
-//            BIF_LL1(thesymb) = symbolrefList.thellnd;
-//            setSymbolAttributesInVarRefList(BIF_LL1(thesymb));
-            SORRY;
-          }
-
-SgVarListDeclStmt::SgVarListDeclStmt(int variant, SgSymbol &, SgStatement &):SgDeclarationStatement(variant)
-          {
-            switch (variant) {
-              case INTENT_STMT:
-              case OPTIONAL_STMT:
-              case SAVE_DECL:
-              case PUBLIC_STMT:
-              case PRIVATE_STMT:
-              case EXTERN_STAT:
-              case INTRIN_STAT:
-              case DIM_STAT:
-              case ALLOCATABLE_STMT:
-              case POINTER_STMT:
-              case TARGET_STMT:
-              case MODULE_PROC_STMT:
-                   break;
-              default:
-                   Message("Illegal variant for SgVarListDeclStmt",0);
-#ifdef __SPF   
-                   {
-                       char buf[512];
-                       sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-                       addToGlobalBufferAndPrint(buf);
-                   }
-                   throw -1;
-#endif
-            };
-
-//            findStatementAttribute(variant,attribute);
-//            BIF_LL1(thesymb) = symbolList.thellnd;
-//            setSymbolAttributesInVarRefList(BIF_LL1(thesymb));
-            SORRY;
-          }
-
-SgVarListDeclStmt * isSgVarListDeclStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case INTENT_STMT:
-    case OPTIONAL_STMT:
-    case SAVE_DECL:
-    case PUBLIC_STMT:
-    case PRIVATE_STMT:
-    case EXTERN_STAT:
-    case INTRIN_STAT:
-    case DIM_STAT:
-    case ALLOCATABLE_STMT:
-    case POINTER_STMT:
-    case TARGET_STMT:
-    case MODULE_PROC_STMT:
-    case PROCESSORS_STAT:
-    case STATIC_STMT:
-      return (SgVarListDeclStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-     
-     
-
-SgStructureDeclStmt * isSgStructureDeclStmtSgStructureDeclStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case STRUCT_DECL:
-      return (SgStructureDeclStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgNestedVarListDeclStmt::SgNestedVarListDeclStmt(int variant, SgExpression &listOfVarList):SgDeclarationStatement(VAR_DECL)
-{
-  int listVariant;
-  
-  switch (variant) {
-  case NAMELIST_STAT:
-    listVariant = NAMELIST_LIST;
-    break;
-  case EQUI_STAT:
-    listVariant = EQUI_LIST;
-    break;
-  case COMM_STAT:
-    listVariant = COMM_LIST;
-    break;
-  case PROS_COMM:  /* Fortran M */
-    listVariant = COMM_LIST;
-    break;
-  default:
-    Message("Illegal variant in SgNestedVarListDeclStmt",0);
-#ifdef __SPF   
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-    }
-    throw -1;
-#endif
-  };
-  BIF_CODE(thebif) = variant;
-//            checkIfListOfVariant(listVariant, listOfVarList);            
-  listVariant = listVariant; SORRY;
-  BIF_LL1(thebif) = listOfVarList.thellnd;
-}
-
-SgNestedVarListDeclStmt * isSgNestedVarListDeclStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case NAMELIST_STAT:
-    case EQUI_STAT:
-    case PROS_COMM:
-    case COMM_STAT:
-      return (SgNestedVarListDeclStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-     
-
-SgParameterStmt * isSgParameterStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case PARAM_DECL:
-      return (SgParameterStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-    
-
-SgImplicitStmt * isSgImplicitStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case IMPL_DECL:
-      return (SgImplicitStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgInportStmt * isSgInportStmt(SgStatement *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case INPORT_DECL:
-      return (SgInportStmt *) pt;
-    default:
-      return NULL;
-    }
-}
- 
- 
-SgOutportStmt * isSgOutportStmt(SgStatement *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case OUTPORT_DECL:
-      return (SgOutportStmt *) pt;
-    default:
-      return NULL;
-    }
-}
- 
- 
-SgChannelStmt * isSgChannelStmt(SgStatement *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case CHANNEL_STAT:
-      return (SgChannelStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgMergerStmt * isSgMergerStmt(SgStatement *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case MERGER_STAT:
-      return (SgMergerStmt *) pt;
-    default:
-      return NULL;
-    }
-}
- 
-
-SgMoveportStmt * isSgMoveportStmt(SgStatement *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case MOVE_PORT:
-      return (SgMoveportStmt *) pt;
-    default:
-      return NULL;
-    }
-}
- 
-
-SgSendStmt * isSgSendStmt(SgStatement *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case SEND_STAT:
-      return (SgSendStmt *) pt;
-    default:
-      return NULL;
-    }
-}
- 
-
-SgReceiveStmt * isSgReceiveStmt(SgStatement *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case RECEIVE_STAT:
-      return (SgReceiveStmt *) pt;
-    default:
-      return NULL;
-    }
-}
- 
-
-SgEndchannelStmt * isSgEndchannelStmt(SgStatement *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case ENDCHANNEL_STAT:
-      return (SgEndchannelStmt *) pt;
-    default:
-      return NULL;
-    }
-}
- 
-
-SgProbeStmt * isSgProbeStmt(SgStatement *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case PROBE_STAT:
-      return (SgProbeStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgProcessorsRefExp * isSgProcessorsRefExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case PROCESSORS_REF:
-      return (SgProcessorsRefExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgPortTypeExp * isSgPortTypeExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case PORT_TYPE_OP:
-    case INPORT_TYPE_OP:
-    case OUTPORT_TYPE_OP:
-      return (SgPortTypeExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgInportExp * isSgInportExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case INPORT_NAME:
-      return (SgInportExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgOutportExp * isSgOutportExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case OUTPORT_NAME:
-      return (SgOutportExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgFromportExp * isSgFromportExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case FROMPORT_NAME:
-      return (SgFromportExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgToportExp * isSgToportExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case TOPORT_NAME:
-      return (SgToportExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgIO_statStoreExp * isSgIO_statStoreExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case IOSTAT_STORE:
-      return (SgIO_statStoreExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgEmptyStoreExp * isSgEmptyStoreExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case EMPTY_STORE:
-      return (SgEmptyStoreExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgErrLabelExp * isSgErrLabelExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case ERR_LABEL:
-      return (SgErrLabelExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgEndLabelExp * isSgEndLabelExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case END_LABEL:
-      return (SgEndLabelExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgDataImpliedDoExp * isSgDataImpliedDoExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case DATA_IMPL_DO:
-      return (SgDataImpliedDoExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgDataEltExp * isSgDataEltExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case DATA_ELT:
-      return (SgDataEltExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgDataSubsExp * isSgDataSubsExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case DATA_SUBS:
-      return (SgDataSubsExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgDataRangeExp * isSgDataRangeExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case DATA_RANGE:
-      return (SgDataRangeExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgIconExprExp * isSgIconExprExp(SgExpression *pt) /* Fortran M */
-{
-  if (!pt)
-    return NULL;
-  switch(NODE_CODE(pt->thellnd))
-    {
-    case ICON_EXPR:
-      return (SgIconExprExp *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-
-#ifdef NOT_YET_IMPLEMENTED
-class SgUseStmt: public SgDeclarationStatement{
-       // Fortran 90 module usuage statement
-       // variant = USE_STMT
-   public:
-     SgUseStmt(SgSymbol &moduleName, SgExpression &renameList, SgStatement &scope):SgDeclarationStatement(USE_STMT)
-          {
-            SORRY;
-          };
-          // renameList must be a list of low-level nodes of variant RENAME_NODE
-     ~SgUseStmt(){RemoveFromTableBfnd((void *) this);};
-
-     int isOnly()
-          {
-            SORRY;
-          };
-     SgSymbol *moduleName()
-          {
-            SORRY;
-          };
-     void setModuleName(SgSymbol &moduleName)
-          {
-            SORRY;
-          };
-     int numberOfRenames()
-          {
-            SORRY;
-          };
-     SgExpression *renameNode(int i)
-          {
-            SORRY;
-          };
-     void  addRename(SgSymbol &localName, SgSymbol &useName)
-          {
-            SORRY;
-          };
-     void  addRenameNode(SgExpression &renameNode)
-          {
-            SORRY;
-          };
-     void  deleteRenameNode(int i)
-          {
-            SORRY;
-          };
-     void deleteTheRenameNode(SgExpression &renameNode)
-          {
-            SORRY;
-          };
-};
-
-
-SgUseStmt * isSgUseStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case USE_STMT:
-      return (SgUseStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-class  SgStmtFunctionStmt: public SgDeclarationStatement{
-        // Fortran statement function declaration
-        // variant == STMTFN_DECL
-     public:        
-        SgStmtFunctionStmt(SgSymbol &name, SgExpression &args, SgStatement Body):SgDeclarationStatement(STMTFN_DECL)
-          {
-            SORRY;
-          };
-        ~SgStmtFunctionStmt(){RemoveFromTableBfnd((void *) this);};
-
-        SgSymbol *name()
-          {
-            SORRY;
-          };
-        void setName(SgSymbol &name)
-          {
-            SORRY;
-          };
-        SgType *type()
-          {
-            SORRY;
-          };
-        int numberOfParameters()
-          {
-            SORRY;
-          };       // the number of parameters
-        SgSymbol *parameter(int i)
-          {
-            SORRY;
-          };     // the i-th parameter
-};      
-
-class  SgMiscellStmt: public SgDeclarationStatement{
-        // Fortran 90 simple miscellaneous statements
-        // variant == CONTAINS_STMT, PRIVATE_STMT, SEQUENCE_STMT
-     public:        
-        SgMiscellStmt(int variant):SgDeclarationStatement(variant) {}
-        ~SgMiscellStmt(){RemoveFromTableBfnd((void *) this);};
-};      
-
-
-
-SgStmtFunctionStmt * isSgStmtFunctionStmt (SgStatement *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(BIF_CODE(pt->thebif))
-    {
-    case STMTFN_DECL:
-      return (SgStmtFunctionStmt *) pt;
-    default:
-      return NULL;
-    }
-}
-#endif
-
-//
-//
-// More stuffs for types and symbols
-//
-//
-
-
-SgVariableSymb * isSgVariableSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case VARIABLE_NAME:
-      return (SgVariableSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgConstantSymb * isSgConstantSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case CONST_NAME :
-      return (SgConstantSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgFunctionSymb::SgFunctionSymb(int variant):SgSymbol(variant)
-{
-  switch (variant) {
-  case PROGRAM_NAME:
-  case PROCEDURE_NAME:
-  case FUNCTION_NAME:
-  case MEMBER_FUNC:
-    break;
-  default:
-    Message("SgFunctionSymb variant invalid",0);
-#ifdef __SPF 
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-    }
-    throw -1;
-#endif
-  }
-}
-
-SgFunctionSymb::SgFunctionSymb(int variant, char *identifier, SgType &t, 
-                               SgStatement &scope):SgSymbol(variant,identifier,t,scope)
-{
-  switch (variant) {
-  case PROGRAM_NAME:
-  case PROCEDURE_NAME:
-  case FUNCTION_NAME:
-  case MEMBER_FUNC:
-    break;
-  default:
-    Message("SgFunctionSymb variant invalid",0);
-#ifdef __SPF  
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-    }
-    throw -1;
-#endif
-  }
-  SYMB_TYPE(thesymb) = t.thetype;
-}
-
-SgFunctionSymb::SgFunctionSymb(int variant, const char *identifier, SgType &t,
-    SgStatement &scope) :SgSymbol(variant, identifier, t, scope)
-{
-    switch (variant) {
-    case PROGRAM_NAME:
-    case PROCEDURE_NAME:
-    case FUNCTION_NAME:
-    case MEMBER_FUNC:
-        break;
-    default:
-        Message("SgFunctionSymb variant invalid", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-    }
-    SYMB_TYPE(thesymb) = t.thetype;
-}
-
-SgExpression * SgFunctionRefExp::AddArg( char *name, SgType &t)
-    // to add a formal parameter to a function symbol.
-{
-  PTR_SYMB symb;
-  SgExpression *arg = NULL;
-  SgSymbol *s;
-  SgSymbol *f = this->funName();
-  if(!f){
-    Message("SgFunctionRefExp::AddArg: no symbol for function_ref", 0);
-#ifdef __SPF 
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-    }
-    throw -1;
-#endif
-  }
-  s = new SgVariableSymb(name, t, *f->scope()); //create the variable with scope
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-  symb = s->thesymb;
-  appendSymbToArgList(f->thesymb,symb); 
-
-  if(LibFortranlanguage()){
-        Message("Fortran function protos do not have arg lists", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-	}
- else{
-        arg = SgMakeDeclExp(s, &t); 
-	NODE_OPERAND0(this->thellnd) = 
-	    addToExprList(NODE_OPERAND0(this->thellnd),arg->thellnd);
-      }
- return arg;
-}
-
-SgFunctionSymb * isSgFunctionSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case PROGRAM_NAME:
-    case PROCEDURE_NAME:
-    case FUNCTION_NAME:
-    case MEMBER_FUNC:
-      return (SgFunctionSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-            
-
-SgMemberFuncSymb * isSgMemberFuncSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case MEMBER_FUNC:
-      return (SgMemberFuncSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgFieldSymb * isSgFieldSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case ENUM_NAME:
-    case FIELD_NAME:
-      return (SgFieldSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgClassSymb * isSgClassSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case CLASS_NAME:
-    case TECLASS_NAME:
-    case UNION_NAME:
-    case STRUCT_NAME:
-    case COLLECTION_NAME:
-      return (SgClassSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-#ifdef NOT_YET_IMPLEMENTED
-class SgTypeSymb: public SgSymbol{
-        // a C typedef.  the type() function returns the base type.
-        // variant == TYPE_NAME
-      public:
-        SgTypeSymb(char *name, SgType &baseType):SgSymbol(TYPE_NAME)
-          {
-            SORRY;
-          };
-        SgType &baseType()
-          {
-            SORRY;
-          };
-        ~SgTypeSymb(){RemoveFromTableSymb((void *) this);};
-};
-
-
-SgTypeSymb * isSgTypeSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case TYPE_NAME:
-      return (SgTypeSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-#endif
-
-SgLabelSymb * isSgLabelSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case LABEL_NAME:
-      return (SgLabelSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgLabelVarSymb * isSgLabelVarSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case LABEL_NAME:
-      return (SgLabelVarSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgExternalSymb * isSgExternalSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case ROUTINE_NAME:
-      return (SgExternalSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgConstructSymb * isSgConstructSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case CONSTRUCT_NAME:
-      return (SgConstructSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgInterfaceSymb * isSgInterfaceSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case INTERFACE_NAME:
-      return (SgInterfaceSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-SgModuleSymb * isSgModuleSymb (SgSymbol *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(SYMB_CODE(pt->thesymb))
-    {
-    case MODULE_NAME:
-      return (SgModuleSymb *) pt;
-    default:
-      return NULL;
-    }
-}
-
-// ********************* Types *******************************
-
-
-SgArrayType * isSgArrayType (SgType *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(TYPE_CODE(pt->thetype))
-    {
-    case T_ARRAY:
-      return (SgArrayType *) pt;
-    default:
-      return NULL;
-    }
-}
-
-#ifdef NOT_YET_IMPLEMENTED
-class SgClassType: public SgType{
-        // a C struct or Fortran Record, a C++ class, a C Union and a C Enum
-        // and a pC++ collection.  note: derived classes are another type.
-        // this type is very simple.  it only contains the standard type
-        // info from SgType and a pointer to the class declaration stmt
-        // and a pointer to the symbol that is the first field in the struct.
-        // variant == T_STRUCT, T_ENUM, T_CLASS, T_TECLASS T_ENUM, T_COLLECTION
-    public:
-        // why is struct_decl needed. No appropriate field found.
-        // assumes that first_field has been declared as
-        // FIELD_NAME and the remaining fields have been stringed to it.
-        SgClassType(int variant, char *name, SgStatement &struct_decl, int num_fields,
-                     SgSymbol &first_field):SgType(variant)
-          { 
-            
-            SORRY;
-          };
-        SgStatement &structureDecl()
-          {
-            SORRY;
-          };
-        SgSymbol *firstFieldSymb()
-          { return SymbMapping(TYPE_FIRST_FIELD(thetype)); };
-        SgSymbol *fieldSymb(int i)
-          { return SymbMapping(GetThOfFieldListForType(thetype, i)); }
-        int numberOfFields()
-          { return lenghtOfFieldListForType(thetype); }
-        ~SgClassType(){RemoveFromTableType((void *) this);};
-};
-        
-
-SgClassType * isSgClassType (SgType *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(TYPE_CODE(pt->thetype))
-    {
-    case T_STRUCT:
-    case T_ENUM:
-    case T_CLASS:
-    case T_TECLASS:
-    case T_COLLECTION:
-      return (SgClassType *) pt;
-    default:
-      return NULL;
-    }
-}
-#endif
-
-SgPointerType::SgPointerType(SgType &base_type):SgType(T_POINTER)
-{ TYPE_BASE(thetype) = base_type.thetype; }
-
-SgPointerType::SgPointerType(SgType *base_type):SgType(T_POINTER)
-{ TYPE_BASE(thetype) = base_type->thetype; }
-
-SgPointerType * isSgPointerType (SgType *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(TYPE_CODE(pt->thetype))
-    {
-    case T_POINTER:
-      return (SgPointerType *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgReferenceType * isSgReferenceType (SgType *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(TYPE_CODE(pt->thetype))
-    {
-    case T_REFERENCE:
-      return (SgReferenceType *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgFunctionType * isSgFunctionType (SgType *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(TYPE_CODE(pt->thetype))
-    {
-    case T_FUNCTION:
-      return (SgFunctionType *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-
-SgDerivedType * isSgDerivedType (SgType *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(TYPE_CODE(pt->thetype))
-    {
-    case T_DERIVED_TYPE:
-      return (SgDerivedType *) pt;
-    default:
-      return NULL;
-    }
-}
-
-SgDerivedClassType * isSgDerivedClassType (SgType *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(TYPE_CODE(pt->thetype))
-    {
-    case T_DERIVED_CLASS:
-      return (SgDerivedClassType *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-SgDescriptType * isSgDescriptType (SgType *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(TYPE_CODE(pt->thetype))
-    {
-    case T_DESCRIPT:
-      return (SgDescriptType *) pt;
-    default:
-      return NULL;
-    }
-}
-
-
-
-SgDerivedCollectionType * isSgDerivedCollectionType (SgType *pt)
-{
-
-  if (!pt)
-    return NULL;
-  switch(TYPE_CODE(pt->thetype))
-    {
-    case T_DERIVED_COLLECTION:
-      return (SgDerivedCollectionType *) pt;
-    default:
-      return NULL;
-    }
-}
-
-// perhaps this function can use LlndMapping
-SgExpression * SgSubscriptExp::lbound()
-{
-  PTR_LLND ll = NULL;
-  ll = NODE_OPERAND0(thellnd);
-  if (ll && (NODE_CODE(ll) == DDOT))
-    ll = NODE_OPERAND0(ll);
-  return LlndMapping(ll);
-}
-
-SgExpression * SgSubscriptExp::ubound()
-{
-  PTR_LLND ll = NULL;
-
-  ll = NODE_OPERAND0(thellnd);
-  if (ll && (NODE_CODE(ll) == DDOT))
-    ll = NODE_OPERAND1(ll);
-  else
-    ll = NODE_OPERAND1(thellnd);
-  return LlndMapping(ll);
-}
-
-SgExpression * SgSubscriptExp::step()
-{
-  PTR_LLND ll = NULL;
-  ll = NODE_OPERAND0(thellnd);
-  if (ll && (NODE_CODE(ll) == DDOT))
-    ll = NODE_OPERAND1(thellnd);
-  else
-    ll = makeInt(1);
-  return LlndMapping(ll);
-}
-
-//
-// miscelleanous functions
-//
-
-// return a symbol with the name;
-// if where is NULL the first symbol, whose name matches, found is returned;
-// if where is non NULL the first symbol which scope included  where 
-// is returned; as an example getSymbol("foo", GLOBAL_NODE)
-// returns only the symbol named foo with scope = GLOBAL_NODE;
-
-SgSymbol *getSymbol(char *name, SgStatement *where)
-{
-  if (where)
-    return SymbMapping(getSymbolWithNameInScope(name, where->thebif));
-  else
-    return SymbMapping(getSymbolWithNameInScope(name,NULL));
-}
-
-void SgSymbol::declareTheSymbol(SgStatement &st)
-{ 
-    SgClassStmt *cl = NULL;
-    SgFuncHedrStmt *fh = NULL;
-    SgSymbol *fsym;
-    if(LibFortranlanguage()){
-	declareAVar(thesymb, st.thebif); 
-	}
-    else{
-       SgType *t = this->type();
-       SgExpression *e = SgMakeDeclExp(this, t );
-       SYMB_SCOPE(this->thesymb) = st.thebif;
-       SgStatement *hdr = &st;
-       while( (hdr->variant() != GLOBAL) &&
-             ((cl = isSgClassStmt(hdr)) == NULL) && 
-             ((fh = isSgFuncHedrStmt(hdr)) == NULL)) 
-	         hdr = hdr->controlParent();
-       if(cl){
-            if((fsym = cl->name()) != NULL)
-	        appendSymbToArgList(fsym->thesymb,this->thesymb);
-	    }
-       if(fh){
-	    if((fsym = &(fh->name())) != NULL)
-	        appendSymbToArgList(fsym->thesymb,this->thesymb);
-	    }
-       e = new SgExprListExp(*e);
-#ifdef __SPF   
-       addToCollection(__LINE__, __FILE__, e, 1);
-#endif
-       SgVarDeclStmt *s = new SgVarDeclStmt(*e,  *t);
-#ifdef __SPF   
-       addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-       st.insertStmtAfter(*s, *s->controlParent());
-       }
- }
-
-SgExpression *SgSymbol::makeDeclExpr()
-{ 
-    if(LibFortranlanguage()){
-	return LlndMapping(makeDeclExp(thesymb)); 
-	}
-    else return SgMakeDeclExp(this,  this->type());
-} 
-
-SgVarDeclStmt *SgSymbol::makeVarDeclStmt()
-{
-   if(LibFortranlanguage()){
-       return 
-           isSgVarDeclStmt(BfndMapping(makeDeclStmt(thesymb)));
-	   }
-   else{
-       SgType *t = this->type();
-       SgExpression *e = SgMakeDeclExp(this, t );
-       e = new SgExprListExp(*e);
-#ifdef __SPF   
-       addToCollection(__LINE__, __FILE__, e, 1);
-#endif
-       SgVarDeclStmt *s = new SgVarDeclStmt(*e,  *t);
-#ifdef __SPF   
-       addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-       return s;
-       }
-   }
-
-SgVarDeclStmt *SgSymbol::makeVarDeclStmtWithParamList
-           (SgExpression &parlist)
-{ return 
-       isSgVarDeclStmt
-         (BfndMapping(makeDeclStmtWPar(thesymb, parlist.thellnd)));} 
-
-
-//
-//
-//
-// Main file for debug purpose, check the routines in the
-// in this file
-//
-//
-//
-
-#ifdef DEBUGLIB
-main()
-{
-  SgProject project("test.proj");
-  SgFile    file("simple.f");
-  SgValueExp c1(1), c2(2), c3(3), c100(100);
-  SgExpression *pt;
-  SgVarRefExp  *e1, *e2, *e3, *e4;
-  SgStatement *themain, *first, *firstex, *last;
-  SgFuncHedrStmt *ptfunc;
-  SgSymbol *ptsymb;
-  SgSymbol *i1;
-  SgSymbol *i2;
-  SgSymbol *i3;
-  SgSymbol *i4;
-  SgSymbol *anarray;
-  SgAssignStmt *stmt, *stmt1;
-  SgIfStmt *anif;
-  SgStatement *anotherif;
-  SgWhileStmt *awhile;
-  SgForStmt *afor;
-  SgReturnStmt *areturn;
-  SgCallStmt *afuncall;
-  SgArrayType *typearray;
-  SgType basetype(T_FLOAT);
-
-
-  printf("There is %d files in that project\n",project.numberOfFiles());
-  first = (file.firstStatement());
-  themain = (file.mainProgram());
-
-  ptfunc = new SgFuncHedrStmt("funct1");
-
-  ptsymb = new SgVariableSymb("var1");
-  pt = new SgVarRefExp(*ptsymb);
-  ptfunc->AddArg(*pt);
-
-  ptsymb = new SgVariableSymb("var2");
-  pt = new SgVarRefExp(*ptsymb);
-  ptfunc->AddArg(*pt);
-
-  first->insertStmtAfter(*ptfunc);
-
-  // lets add a statement to that function 
-  i1 = new SgVariableSymb("i1");
-  i1->declareTheSymbol(*ptfunc);
-  e1 = new SgVarRefExp(*i1);
-
-  i2 = new SgVariableSymb("i2");
-  i2->declareTheSymbol(*ptfunc);
-  e2 = new SgVarRefExp(*i2);
-
-  i3 = new SgVariableSymb("i3");
-  i3->declareTheSymbol(*ptfunc);
-  e3 = new SgVarRefExp(*i3);
-  
-  i4 = new SgVariableSymb("i4");
-  i4->declareTheSymbol(*ptfunc);
-  e4 = new SgVarRefExp(*i4);
-
-  firstex = (ptfunc->lastDeclaration());
-  stmt = new SgAssignStmt((*e1), (*e2) + ((*e3) + c1) * (*e4));
-
-  stmt1 = new SgAssignStmt(*e2,*e3);
-
-  anif = new SgIfStmt(c1 > c2 , *stmt1, stmt->copy());
-  anotherif = &(anif->copy());
-
-  awhile = new SgWhileStmt( (*e4)< c2 , anif->copy());
-
-  afor = new SgForStmt(* i1, c1, c2, c3, awhile->copy());
-  areturn = new SgReturnStmt();
-
-  afuncall = new SgCallStmt(*ptfunc->symbol());
-  afuncall->addArg(c1.copy());
-  afuncall->addArg(c2.copy());
-  afuncall->addArg(c3.copy());
-  
-// let insert what we have created 
-  firstex->insertStmtAfter(*anif);
-  firstex->insertStmtAfter(stmt->copy());
-  firstex->insertStmtAfter(*awhile);
-  firstex->insertStmtAfter(*afor);
-
-  last = (ptfunc->lastExecutable());
-  last->insertStmtAfter(*areturn);
-
-  
-  themain->insertStmtAfter(*anotherif);
-  themain->insertStmtAfter(*afuncall);
-
-// Let's try array
-   typearray = new SgArrayType(basetype);
-   typearray->addRange(c1);
-   typearray->addRange(c2);
-   typearray->addRange(c3);
-   anarray = new SgVariableSymb("Array1",*typearray);
-   anarray->declareTheSymbol(*ptfunc);
-
-// make an array expression
-   pt =  new SgArrayRefExp(*anarray,*e1,*e2,*e3);
-   stmt = new SgAssignStmt((*pt), (*e2) + ((*pt) + c1) * (*pt));
-   firstex->insertStmtAfter(*stmt);
-
-// unparse the file
-  file.unparsestdout();
-  file.saveDepFile("debug.dep");
-  
-}
-#endif
-
-
-// SgReturnStmt--inlines
-
-SgReturnStmt::SgReturnStmt(SgExpression &returnValue):SgExecutableStatement(RETURN_NODE)
-{
-  BIF_LL1(thebif) = returnValue.thellnd;
-  if (CurrentProject->Fortranlanguage())
-    {
-      Message("Fortran return does not have expression",0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      BIF_CODE(thebif) = RETURN_STAT;
-    }
-}
-
-SgReturnStmt::SgReturnStmt():SgExecutableStatement(RETURN_NODE)
-{
-  if (CurrentProject->Fortranlanguage())
-    BIF_CODE(thebif) = RETURN_STAT;
-}
-
-
-
-/////////////////////////// METHOD FOR ATTRIBUTES (IN A SEPARATE FILES????) ///////////////
-
-
-SgAttribute::SgAttribute(int t, void *pt, int size, SgStatement &st, int)
-{
-    type = t;
-    data = pt;
-    dataSize = size;
-    next = NULL;
-    // enum typenode { BIFNODE, LLNODE, SYMBNODE, TYPENODE, BLOBNODE,
-    //                    BLOB1NODE};
-    typeNode = BIFNODE;
-    ptToSage = (void *)&st;
-    fileNumber = CurrentFileNumber;
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgAttribute::SgAttribute(int t, void *pt, int size, SgSymbol &st, int)
-{
-    type = t;
-    data = pt;
-    dataSize = size;
-    next = NULL;
-    typeNode = SYMBNODE;
-    ptToSage = (void *)&st;
-    fileNumber = CurrentFileNumber;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgAttribute::SgAttribute(int t, void *pt, int size, SgExpression &st, int)
-{
-    type = t;
-    data = pt;
-    dataSize = size;
-    next = NULL;
-    typeNode = LLNODE;
-    ptToSage = (void *)&st;
-    fileNumber = CurrentFileNumber;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgAttribute::SgAttribute(int t, void *pt, int size, SgType &st, int)
-{
-    type = t;
-    data = pt;
-    dataSize = size;
-    next = NULL;
-    typeNode = TYPENODE;
-    ptToSage = (void *)&st;
-    fileNumber = CurrentFileNumber;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgAttribute::SgAttribute(int t, void *pt, int size, SgLabel &st, int)
-{
-    type = t;
-    data = pt;
-    dataSize = size;
-    next = NULL;
-    typeNode = LABEL;
-    ptToSage = (void *)&st;
-    fileNumber = CurrentFileNumber;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgAttribute::SgAttribute(int t, void *pt, int size, SgFile &st, int)
-{
-    type = t;
-    data = pt;
-    dataSize = size;
-    next = NULL;
-    typeNode = FILENODE;
-    ptToSage = (void *)&st;
-    fileNumber = CurrentFileNumber;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgAttribute::~SgAttribute()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-}
-
-int SgAttribute::getAttributeType()
-{
-  return type;
-}
-
-void SgAttribute::setAttributeType(int t)
-{
-  type = t;
-}
-
-void *SgAttribute::getAttributeData()
-{
-  return data;
-}
-
-void *SgAttribute::setAttributeData(void *d)
-{
-  void *temp;
-  temp = data;
-  data = d;
-  return temp;
-}
-
-int SgAttribute::getAttributeSize()
-{
-  return dataSize;
-}
-
-void SgAttribute::setAttributeSize(int s)
-{
-  dataSize = s;
-}
-
-typenode SgAttribute::getTypeNode()
-{
-  return typeNode;
-}
-
-void *SgAttribute::getPtToSage()
-{
-  return ptToSage;
-}
- 
-void  SgAttribute::setPtToSage(void *sa)
-{
-  ptToSage = sa;
-}
-
-void  SgAttribute::resetPtToSage()
-{
-  ptToSage = NULL;
-}
-
-void  SgAttribute::setPtToSage(SgStatement &st)
-{
-  ptToSage = (void *) &st;
-  typeNode = BIFNODE; 
-  
-}
-
-void  SgAttribute::setPtToSage(SgSymbol &st)
-{
-  ptToSage = (void *) &st;
-  typeNode = SYMBNODE;
-}
-
-void  SgAttribute::setPtToSage(SgExpression &st)
-{
-  ptToSage = (void *) &st;
-  typeNode =  LLNODE;
-}
-
-void  SgAttribute::setPtToSage(SgType &st)
-{
-  ptToSage = (void *) &st;
-  typeNode = TYPENODE;
-}
-
-void SgAttribute::setPtToSage(SgLabel &st)
-{
-  ptToSage = (void *) &st;
-  typeNode = LABEL;
-}
-
-void SgAttribute::setPtToSage(SgFile &st)
-{
-  ptToSage = (void *) &st;
-  typeNode = FILENODE;
-}
-
-SgStatement *SgAttribute::getStatement()
-{
-  if (typeNode == BIFNODE)
-    return (SgStatement *) ptToSage;
-  else
-    return NULL;
-}
-
-SgExpression *SgAttribute::getExpression()
-{
-  if (typeNode == LLNODE)
-    return (SgExpression *) ptToSage;  
-  else
-    return NULL;
-}
-
-SgSymbol  *SgAttribute::getSgSymbol()
-{
-  if (typeNode == SYMBNODE)
-    return (SgSymbol  *) ptToSage;
-  else
-    return NULL;
-}
-
-SgType  *SgAttribute::getType()
-{
-  if (typeNode == TYPENODE)
-    return (SgType  *) ptToSage;
-  else
-    return NULL;
-}
-
-SgLabel *SgAttribute::getLabel()
-{
-  if (typeNode == LABEL)
-    return (SgLabel  *) ptToSage;
-  else
-    return NULL;
-}
-
-SgFile *SgAttribute::getFile()
-{
-  if (typeNode == FILENODE)
-    return (SgFile  *) ptToSage;
-  else
-    return NULL;
-}
-
-int SgAttribute::getfileNumber()
-{
-  return fileNumber;
-}
-
-SgAttribute *SgAttribute::copy()
-{
-  return NULL;
-}
-
-SgAttribute *SgAttribute::getNext()
-{
-  return next;
-}
-  
-void SgAttribute::setNext(SgAttribute *s)
-{
-  next = s;
-}
-
-int SgAttribute::listLenght()
-{
-  SgAttribute *first;
-  int nb = 0;
-
-  first = this;
-  while (first)
-    {
-      nb++;
-      first = first->getNext();
-    }
-  return nb;
-}
-
-SgAttribute *SgAttribute::getInlist(int num)
-{
-  SgAttribute *first;
-  int nb = 0;
-
-  first = this;
-  while (first)
-    {
-      if (nb == num)
-        return first;
-      nb++;
-      first = first->getNext();
-    }
-  return NULL;
-}
-
-
-void SgAttribute::save(FILE *file)
-{
-  SgStatement *stat;
-  SgSymbol *symb;
-  SgExpression *exp;
-  SgType *ty;
-  int id = 0;
-  int i;
-  char *pt;
-  char c1,c2,c;
-  unsigned int mask = 15;
-
-  if (!file) return;
-  
-  switch (typeNode)
-    {
-    case BIFNODE:
-      stat = (SgStatement *) ptToSage;
-      id = stat->id();
-      break;
-    case  SYMBNODE:
-      symb = (SgSymbol *) ptToSage;
-      id = symb->id();
-      break;
-    case LLNODE:
-      exp = (SgExpression *) ptToSage;
-        id = exp->id();
-      break;  
-    case TYPENODE:
-      ty = (SgType * ) ptToSage;
-      id = ty->id();
-      break;
-    case BLOBNODE:
-    case BLOB1NODE:
-    case LABEL:
-    case FILENODE:
-        break;
-    default:
-        break;
-    }
-  fprintf(file,"ID %d typeNode %d FileNum %d TYPE %d DATASIZE %d\n",id,typeNode,fileNumber,type,dataSize);
-
-  if (dataSize && data)
-    { // simple way of storing the data in ascii form;
-      pt = (char *) data;
-      for (i = 0; i<dataSize; i++)
-        {
-          c = pt[i];
-          c1 = (c & mask) + 'a';
-          c2 = c >> 4;
-          c2 = (c2  & mask) + 'a';
-          fprintf(file,"%c%c",c1,c2);
-        }
-      fprintf(file,"\n");
-    }
-}
-
-
-
-void SgAttribute::save(FILE *file,void (*savefunction)(void *dat, FILE *f))
-{
-  SgStatement *stat;
-  SgSymbol *symb;
-  SgExpression *exp;
-  SgType *ty;
-  int id = 0;
-
-  if (!file || !savefunction) return;
-  
-  switch (typeNode)
-    {
-    case BIFNODE:
-      stat = (SgStatement *) ptToSage;
-      id = stat->id();
-      break;
-    case  SYMBNODE:
-      symb = (SgSymbol *) ptToSage;
-      id = symb->id();
-      break;
-    case LLNODE:
-      exp = (SgExpression *) ptToSage;
-        id = exp->id();
-      break;  
-    case TYPENODE:
-      ty = (SgType * ) ptToSage;
-      id = ty->id();
-      break;
-    case BLOBNODE:
-    case BLOB1NODE:
-    case LABEL:
-    case FILENODE:
-        break;
-    default:
-        break;
-    }
-  fprintf(file,"ID %d typeNode %d FileNum %d TYPE %d DATASIZE %d\n",id,typeNode,fileNumber,type,dataSize);
-  (*savefunction)(data,file);
-}
-
-
-  
-///////////////////// ATTRIBUTES METHODS FOR FILES /////////////////////////////////
-
-void SgFile::saveAttributes(char *file)
-{
-  int i;
-  int nba;
-  SgAttribute *att;
-  FILE *outfilea;
-
-  if (!file)
-    return;
-  outfilea = fopen(file,"w");
-  if (!outfilea)
-    {
-      Message("Cannot open output file; unparsing stdout",0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      outfilea = stdout;
-    }
-  nba = this->numberOfAttributes();
-  fprintf(outfilea,"%d\n",nba);
-  for (i=0 ; i< nba; i++)
-    {
-      att = this->attribute(i);
-      if (att)
-        att->save(outfilea);
-    }
-  fclose(outfilea);
-}
- 
-
-void SgFile::saveAttributes(char *file, void  (*savefunction)(void *dat,FILE *f))
-{
-  int i;
-  int nba;
-  SgAttribute *att;
-  FILE *outfilea;
-
-  if (!file)
-    return;
-  outfilea = fopen(file,"w");
-  if (!outfilea)
-    {
-      Message("Cannot open output file; unparsing stdout",0);
-#ifdef __SPF  
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      outfilea = stdout;
-    }
-  nba = this->numberOfAttributes();
-  fprintf(outfilea,"%d\n",nba);
-  for (i=0 ; i< nba; i++)
-    {
-      att = this->attribute(i);
-      if (att)
-        att->save(outfilea,savefunction);
-    }
-  fclose(outfilea);
-}
- 
-
-
-void SgFile::readAttributes(char *file)
-{
-  int i,j;
-  int nba = 0;
-  FILE *infilea;
-  char *str;
-  char buf1[64],buf2[64],buf3[64],buf4[64],buf5[64];
-  int id, tn,f,t,ds;
-  char c1,c2,c;
-  SgStatement *stat;
-  PTR_BFND bf;
-
-  if (!file)
-    return;
-  infilea = fopen(file,"r");
-  if (!infilea)
-    {
-      Message("Cannot open input file",0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      return;
-    }
-  // first read the number of attributes;
-  fscanf(infilea,"%d", &nba);
-  for (i=0; i< nba; i++)
-    {
-      fscanf(infilea,"%s%d%s%d%s%d%s%d%s%d",
-             buf1,&id,buf2,&tn,buf3,&f,buf4,&t,buf5,&ds);
-      str = NULL;
-      if (ds)
-        {
-          // skip return;
-          fscanf(infilea,"%c",&c1);
-          //read the data;
-          str = new char[ds];
-#ifdef __SPF   
-          addToCollection(__LINE__, __FILE__, str, 2);
-#endif
-          for (j=0;j<ds; j++)
-            {
-              fscanf(infilea,"%c%c",&c1,&c2);
-              c1 = c1 - 'a';
-              c2 = c2 - 'a';
-              c2 = c2 << 4;
-              c = c1 + c2;
-              str[j] = c;
-            }
-        }
-      // now allocate the attribute;
-      switch (tn)
-        {
-        case BIFNODE:
-          stat = NULL;
-          bf = Get_bif_with_id(id);
-          if (bf)
-            stat = (SgStatement *) GetMappingInTableForBfnd(bf);
-          if (stat)
-            stat->addAttribute(t, (void *) str,ds);
-          break;
-        case  SYMBNODE:
-          break;
-        case LLNODE:
-          break;  
-        case TYPENODE:
-          break;
-        }
-    }
-}
-
-
-void SgFile::readAttributes(char *file, void * (*readfunction)(FILE *f))
-{
-  int i;
-  int nba = 0;
-  FILE *infilea;
-  void *str;
-  char buf1[64],buf2[64],buf3[64],buf4[64],buf5[64];
-  int id, tn,f,t,ds;
-  char c1;
-  SgStatement *stat;
-  PTR_BFND bf;
-
-  if (!file)
-    return;
-  infilea = fopen(file,"r");
-  if (!infilea)
-    {
-      Message("Cannot open input file",0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      return;
-    }
-  // first read the number of attributes;
-  fscanf(infilea,"%d", &nba);
-  for (i=0; i< nba; i++)
-    {
-      fscanf(infilea,"%s%d%s%d%s%d%s%d%s%d",
-             buf1,&id,buf2,&tn,buf3,&f,buf4,&t,buf5,&ds);
-      str = NULL;
-      fscanf(infilea,"%c",&c1);
-      // read the attributes;
-      str = (*readfunction)(infilea);
-      // now allocate the attribute;
-      switch (tn)
-        {
-        case BIFNODE:
-          stat = NULL;
-          bf = Get_bif_with_id(id);
-          if (bf)
-            stat = (SgStatement *) GetMappingInTableForBfnd(bf);
-          if (stat)
-            stat->addAttribute(t, (void *) str,ds);
-          break;
-        case  SYMBNODE:
-          break;
-        case LLNODE:
-          break;  
-        case TYPENODE:
-          break;
-        }
-    }
-}
-
-int  SgFile::numberOfAttributes()
-{
-  int i;
-  int nb = 0;
-
-  for (i=0 ; i < allocatedForfileTableAttribute; i++)
-    {
-      if (fileTableAttribute[i])
-        nb = nb + fileTableAttribute[i]->listLenght();
-    }
-  for (i=0 ; i < allocatedForbfndTableAttribute; i++)
-    {
-      if (bfndTableAttribute[i])
-        nb = nb + bfndTableAttribute[i]->listLenght();
-    }
-
-  for (i=0 ; i < allocatedForllndTableAttribute; i++)
-    {
-      if (llndTableAttribute[i])
-        nb = nb + llndTableAttribute[i]->listLenght();
-    }
-
-  for (i=0 ; i < allocatedForsymbolTableAttribute; i++)
-    {
-      if (symbolTableAttribute[i])
-        nb = nb + symbolTableAttribute[i]->listLenght();
-    }
-
-  for (i=0 ; i < allocatedForlabelTableAttribute; i++)
-    {
-      if (labelTableAttribute[i])
-        nb = nb + labelTableAttribute[i]->listLenght();
-    }
-  return nb;
-}
-
-SgAttribute *SgFile::attribute(int num)
-{
-  int i;
-  int nb = 0;
-
-  // to be optimize later, not very efficient for large amout of attribute.
-    for (i=0 ; i < allocatedForfileTableAttribute; i++)
-      {
-        if (fileTableAttribute[i])
-          {
-            if ((nb <= num+1) && (num+1 <= nb + fileTableAttribute[i]->listLenght()))
-              {
-                return fileTableAttribute[i]->getInlist(num - nb);
-              }
-            nb = nb + fileTableAttribute[i]->listLenght();
-          }
-      }
-  for (i=0 ; i < allocatedForbfndTableAttribute; i++)
-    {
-      if (bfndTableAttribute[i])
-          {
-            if ((nb <= num+1) && (num+1 <= nb + bfndTableAttribute[i]->listLenght()))
-              {
-                return bfndTableAttribute[i]->getInlist(num - nb);
-              }
-            nb = nb + bfndTableAttribute[i]->listLenght();
-          }
-    }
-  
-  for (i=0 ; i < allocatedForllndTableAttribute; i++)
-    {
-      if (llndTableAttribute[i])
-        {
-            if ((nb <= num+1) && (num+1 <= nb + llndTableAttribute[i]->listLenght()))
-              {
-                return llndTableAttribute[i]->getInlist(num - nb);
-              }
-            nb = nb + llndTableAttribute[i]->listLenght();
-          }
-    }
-
-  for (i=0 ; i < allocatedForsymbolTableAttribute; i++)
-    {
-      if (symbolTableAttribute[i])
-          {
-            if ((nb <= num+1) && (num+1 <= nb + symbolTableAttribute[i]->listLenght()))
-              {
-                return symbolTableAttribute[i]->getInlist(num - nb);
-              }
-            nb = nb + symbolTableAttribute[i]->listLenght();
-          }
-    }
-
-  for (i=0 ; i < allocatedForlabelTableAttribute; i++)
-    {
-      if (labelTableAttribute[i])
-        {
-          if ((nb <= num+1) && (num+1 <= nb + labelTableAttribute[i]->listLenght()))
-            {
-              return labelTableAttribute[i]->getInlist(num - nb);
-            }
-          nb = nb + labelTableAttribute[i]->listLenght();
-        }
-    }
-  return NULL;
-}  
-
-////////////////// NOW the function for ATTRIBUTES IN THE CLASS /////////////////////
-
-////////////////// ATTRIBUTE FOR SgFile /////////////////////
-// Kataev 15.07.2013
-
-int SgFile::numberOfFileAttributes()
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForFileAttribute(filept);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      first = first->getNext();
-      nb++;
-    }
-  return nb;
-}
-
-
-int SgFile::numberOfAttributes(int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForFileAttribute(filept);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return nb;
-}
-
-
-
-SgAttribute *SgFile::getAttribute(int i)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForFileAttribute(filept);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if (nb == i)
-        return first;
-      first = first->getNext();
-      nb++;
-    }
-  return NULL;
-}
-
-
-SgAttribute *SgFile::getAttribute(int i, int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForFileAttribute(filept);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if ((nb == i) && (first->getAttributeType() == type))
-        return first;
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return NULL;
-}
-
-void *SgFile::attributeValue(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
- 
-void *SgFile::attributeValue(int i, int type)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i,type)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
-int SgFile::attributeType(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeType();
-  else
-    return 0;
-}
-
-
-void *SgFile::deleteAttribute(int i)
-{
-    SgAttribute *tobedel, *before, *after;
-  void *data = NULL;
-
-  tobedel = getAttribute(i);
-  if (!tobedel) return NULL;
-  
-  if (i > 0)
-    {
-      before = getAttribute(i-1);
-      before->setNext(tobedel->getNext());
-      data = tobedel->getAttributeData();
-#ifdef __SPF   
-      removeFromCollection(tobedel);
-#endif
-      delete tobedel;
-    } else
-      {
-        after = tobedel->getNext();
-        SetMappingInTableForFileAttribute(filept,after);
-        data = tobedel->getAttributeData();
-#ifdef __SPF   
-        removeFromCollection(tobedel);
-#endif
-        delete tobedel;
-      }
-	
-  return data;
-}
-
-void SgFile::addAttribute(int type, void *a, int size)
-{
-  SgAttribute *first, *last;
-  first = GetMappingInTableForFileAttribute(filept);
-  if (!first)
-    {
-      first = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, first, 1);
-#endif
-      SetMappingInTableForFileAttribute(filept,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, last, 1);
-#endif
-        first->setNext(last);
-      }
-}
-
-
-void SgFile::addAttribute(SgAttribute *att)
-{
-  SgAttribute *first, *last;
-  if (!att) return;
-  first = GetMappingInTableForFileAttribute(filept);
-  if (!first)
-    {
-      first = att;
-      SetMappingInTableForFileAttribute(filept,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = att;
-        first->setNext(last);
-      }
-}
-
-
-void SgFile::addAttribute(int type)
-{
-  addAttribute(type, NULL, 0);
-}
-
-
-void SgFile::addAttribute(void *a, int size)
-{
-  addAttribute(0, a, size);
-}
-
-
-
-int SgStatement::numberOfAttributes()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgAttribute *first;
-    int nb = 0;
-    first = GetMappingInTableForBfndAttribute(thebif);
-    if (!first)
-        return 0;
-    while (first)
-    {
-        first = first->getNext();
-        nb++;
-    }
-    return nb;
-}
-
-
-int SgStatement::numberOfAttributes(int type)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgAttribute *first;
-    int nb = 0;
-    first = GetMappingInTableForBfndAttribute(thebif);
-    if (!first)
-        return 0;
-    while (first)
-    {
-        if (first->getAttributeType() == type)
-            nb++;
-        first = first->getNext();
-    }
-    return nb;
-}
-
-SgAttribute *SgStatement::getAttribute(int i)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgAttribute *first;
-    int nb = 0;
-    first = GetMappingInTableForBfndAttribute(thebif);
-    if (!first)
-        return NULL;
-    while (first)
-    {
-        if (nb == i)
-            return first;
-        first = first->getNext();
-        nb++;
-    }
-    return NULL;
-}
-
-
-SgAttribute *SgStatement::getAttribute(int i, int type)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgAttribute *first;
-    int nb = 0;
-    first = GetMappingInTableForBfndAttribute(thebif);
-    if (!first)
-        return NULL;
-    while (first)
-    {
-        if ((nb == i) && (first->getAttributeType() == type))
-            return first;
-        if (first->getAttributeType() == type)
-            nb++;
-        first = first->getNext();
-    }
-    return NULL;
-}
-
-void *SgStatement::attributeValue(int i)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgAttribute *first;
-
-    if ((first = getAttribute(i)) != 0)
-        return first->getAttributeData();
-    else
-        return NULL;
-}
-
- 
-void *SgStatement::attributeValue(int i, int type)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgAttribute *first;
-
-    if ((first = getAttribute(i, type)) != 0)
-        return first->getAttributeData();
-    else
-        return NULL;
-}
-
-int  SgStatement::attributeType(int i)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgAttribute *first;
-
-    if ((first = getAttribute(i)) != 0)
-        return first->getAttributeType();
-    else
-        return 0;
-}
-
-
-void *SgStatement::deleteAttribute(int i)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgAttribute *tobedel, *before, *after;
-    void *data = NULL;
-
-    tobedel = getAttribute(i);
-    if (!tobedel) return NULL;
-
-    if (i > 0)
-    {
-        before = getAttribute(i - 1);
-        before->setNext(tobedel->getNext());
-        data = tobedel->getAttributeData();
-#ifdef __SPF   
-        removeFromCollection(tobedel);
-#endif
-        //TODO: crash here
-        //delete tobedel;
-    }
-    else
-    {
-        after = tobedel->getNext();
-        SetMappingInTableForBfndAttribute(thebif, after);
-        data = tobedel->getAttributeData();
-#ifdef __SPF   
-        removeFromCollection(tobedel);
-#endif
-        //TODO: crash here
-        //delete tobedel;
-    }
-
-    return data;
-}
-
-void SgStatement::addAttribute(int type, void *a, int size)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgAttribute *first, *last;
-    first = GetMappingInTableForBfndAttribute(thebif);
-    if (!first)
-    {
-        first = new SgAttribute(type, a, size, *this, CurrentFileNumber);
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, first, 1);
-#endif
-        SetMappingInTableForBfndAttribute(thebif, first);
-    }
-    else
-    {
-        while (first->getNext())
-        {
-            first = first->getNext();
-        }
-        last = new SgAttribute(type, a, size, *this, CurrentFileNumber);
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, last, 1);
-#endif
-        first->setNext(last);
-    }
-}
-
-void SgStatement::addAttributeTree(SgAttribute *firstAtt)
-{
-    if (!firstAtt) 
-        return;
-    SetMappingInTableForBfndAttribute(thebif, firstAtt);
-}
-
-void SgStatement::addAttribute(SgAttribute *att)
-{
-  SgAttribute *first, *last;
-  if (!att) return;
-  first = GetMappingInTableForBfndAttribute(thebif);
-  if (!first)
-    {
-      first = att;
-      SetMappingInTableForBfndAttribute(thebif,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = att;
-        first->setNext(last);
-      }
-}
-
-
-void SgStatement::addAttribute(int type)
-{
-    addAttribute(type, NULL, 0);
-}
-
-void SgStatement::addAttribute(void *a, int size)
-{
-    addAttribute(0, a, size);
-}
-
-
-  
-
-////////////////// ATTRIBUTE FOR SgExpression /////////////////////
-
-
-int SgExpression::numberOfAttributes()
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForLlndAttribute(thellnd);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      first = first->getNext();
-      nb++;
-    }
-  return nb;
-}
-
-
-int SgExpression::numberOfAttributes(int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForLlndAttribute(thellnd);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return nb;
-}
-
-
-
-SgAttribute *SgExpression::getAttribute(int i)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForLlndAttribute(thellnd);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if (nb == i)
-        return first;
-      first = first->getNext();
-      nb++;
-    }
-  return NULL;
-}
-
-
-SgAttribute *SgExpression::getAttribute(int i, int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForLlndAttribute(thellnd);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if ((nb == i) && (first->getAttributeType() == type))
-        return first;
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return NULL;
-}
-
-void *SgExpression::attributeValue(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
- 
-void *SgExpression::attributeValue(int i, int type)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i,type)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
-int  SgExpression::attributeType(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeType();
-  else
-    return 0;
-}
-
-
-void *SgExpression::deleteAttribute(int i)
-{
-    SgAttribute *tobedel, *before, *after;
-  void *data = NULL;
-
-  tobedel = getAttribute(i);
-  if (!tobedel) return NULL;
-  
-  if (i > 0)
-    {
-      before = getAttribute(i-1);
-      before->setNext(tobedel->getNext());
-      data = tobedel->getAttributeData();
-#ifdef __SPF   
-      removeFromCollection(tobedel);
-#endif
-      delete tobedel;
-    } else
-      {
-        after = tobedel->getNext();
-        SetMappingInTableForLlndAttribute(thellnd,after);
-        data = tobedel->getAttributeData();
-#ifdef __SPF   
-        removeFromCollection(tobedel);
-#endif
-        delete tobedel;
-      }
-	
-  return data;
-}
-
-void SgExpression::addAttribute(int type, void *a, int size)
-{
-  SgAttribute *first, *last;
-  first = GetMappingInTableForLlndAttribute(thellnd);
-  if (!first)
-    {
-      first = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, first, 1);
-#endif
-      SetMappingInTableForLlndAttribute(thellnd,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, last, 1);
-#endif
-        first->setNext(last);
-      }
-}
-
-
-void SgExpression::addAttribute(SgAttribute *att)
-{
-  SgAttribute *first, *last;
-  if (!att) return;
-  first = GetMappingInTableForLlndAttribute(thellnd);
-  if (!first)
-    {
-      first = att;
-      SetMappingInTableForLlndAttribute(thellnd,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = att;
-        first->setNext(last);
-      }
-}
-
-void SgExpression::addAttributeTree(SgAttribute* firstAtt)
-{
-    if (!firstAtt)
-        return;
-    SetMappingInTableForLlndAttribute(thellnd, firstAtt);
-}
-
-void SgExpression::addAttribute(int type)
-{
-  addAttribute(type, NULL, 0);
-}
-
-
-void SgExpression::addAttribute(void *a, int size)
-{
-  addAttribute(0, a, size);
-}
-
-
-
-////////////////// ATTRIBUTE FOR SgSymbol /////////////////////
-
-
-int SgSymbol::numberOfAttributes()
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForSymbolAttribute(thesymb);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      first = first->getNext();
-      nb++;
-    }
-  return nb;
-}
-
-
-int SgSymbol::numberOfAttributes(int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForSymbolAttribute(thesymb);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return nb;
-}
-
-
-
-SgAttribute *SgSymbol::getAttribute(int i)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForSymbolAttribute(thesymb);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if (nb == i)
-        return first;
-      first = first->getNext();
-      nb++;
-    }
-  return NULL;
-}
-
-
-SgAttribute *SgSymbol::getAttribute(int i, int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForSymbolAttribute(thesymb);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if ((nb == i) && (first->getAttributeType() == type))
-        return first;
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return NULL;
-}
-
-void *SgSymbol::attributeValue(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
- 
-void *SgSymbol::attributeValue(int i, int type)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i,type)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
-int  SgSymbol::attributeType(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeType();
-  else
-    return 0;
-}
-
-
-void *SgSymbol::deleteAttribute(int i)
-{
-    SgAttribute *tobedel, *before, *after;
-  void *data = NULL;
-
-  tobedel = getAttribute(i);
-  if (!tobedel) return NULL;
-  
-  if (i > 0)
-    {
-      before = getAttribute(i-1);
-      before->setNext(tobedel->getNext());
-      data = tobedel->getAttributeData();
-#ifdef __SPF   
-      removeFromCollection(tobedel);
-#endif
-      delete tobedel;
-    } else
-      {
-        after = tobedel->getNext();
-        SetMappingInTableForSymbolAttribute(thesymb,after);
-        data = tobedel->getAttributeData();
-#ifdef __SPF   
-        removeFromCollection(tobedel);
-#endif
-        delete tobedel;
-      }
-	
-  return data;
-}
-
-void SgSymbol::addAttribute(int type, void *a, int size)
-{
-  SgAttribute *first, *last;
-  first = GetMappingInTableForSymbolAttribute(thesymb);
-  if (!first)
-    {
-      first = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, first, 1);
-#endif
-      SetMappingInTableForSymbolAttribute(thesymb,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, last, 1);
-#endif
-        first->setNext(last);
-      }
-}
-
-
-void SgSymbol::addAttribute(SgAttribute *att)
-{
-  SgAttribute *first, *last;
-  if (!att) return;
-  first = GetMappingInTableForSymbolAttribute(thesymb);
-  if (!first)
-    {
-      first = att;
-      SetMappingInTableForSymbolAttribute(thesymb,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = att;
-        first->setNext(last);
-      }
-}
-
-
-void SgSymbol::addAttribute(int type)
-{
-  addAttribute(type, NULL, 0);
-}
-
-
-void SgSymbol::addAttribute(void *a, int size)
-{
-  addAttribute(0, a, size);
-}
-
-
-void SgSymbol::changeName(const char *name)
-{
-    if (name)
-    {
-        if (SYMB_IDENT(thesymb))
-        {
-#ifdef __SPF
-            removeFromCollection(SYMB_IDENT(thesymb));
-#endif
-            free(SYMB_IDENT(thesymb));
-        }
-
-        char *str = (char *)xmalloc(strlen(name) + 1);
-        strcpy(str, name);
-        SYMB_IDENT(thesymb) = str;
-    }
-}
-
-
-////////////////// ATTRIBUTE FOR SgType /////////////////////
-
-
-int SgType::numberOfAttributes()
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForTypeAttribute(thetype);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      first = first->getNext();
-      nb++;
-    }
-  return nb;
-}
-
-
-int SgType::numberOfAttributes(int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForTypeAttribute(thetype);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return nb;
-}
-
-
-
-SgAttribute *SgType::getAttribute(int i)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForTypeAttribute(thetype);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if (nb == i)
-        return first;
-      first = first->getNext();
-      nb++;
-    }
-  return NULL;
-}
-
-
-SgAttribute *SgType::getAttribute(int i, int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForTypeAttribute(thetype);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if ((nb == i) && (first->getAttributeType() == type))
-        return first;
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return NULL;
-}
-
-void *SgType::attributeValue(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
- 
-void *SgType::attributeValue(int i, int type)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i,type)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
-int  SgType::attributeType(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeType();
-  else
-    return 0;
-}
-
-
-void *SgType::deleteAttribute(int i)
-{
-    SgAttribute *tobedel, *before, *after;
-  void *data = NULL;
-
-  tobedel = getAttribute(i);
-  if (!tobedel) return NULL;
-  
-  if (i > 0)
-    {
-      before = getAttribute(i-1);
-      before->setNext(tobedel->getNext());
-      data = tobedel->getAttributeData();
-#ifdef __SPF   
-      removeFromCollection(tobedel);
-#endif
-      delete tobedel;
-    } else
-      {
-        after = tobedel->getNext();
-        SetMappingInTableForTypeAttribute(thetype,after);
-        data = tobedel->getAttributeData();
-#ifdef __SPF   
-        removeFromCollection(tobedel);
-#endif
-        delete tobedel;
-      }
-	
-  return data;
-}
-
-void SgType::addAttribute(int type, void *a, int size)
-{
-  SgAttribute *first, *last;
-  first = GetMappingInTableForTypeAttribute(thetype);
-  if (!first)
-    {
-      first = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, first, 1);
-#endif
-      SetMappingInTableForTypeAttribute(thetype,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, last, 1);
-#endif
-        first->setNext(last);
-      }
-}
-
-
-void SgType::addAttribute(SgAttribute *att)
-{
-  SgAttribute *first, *last;
-  if (!att) return;
-  first = GetMappingInTableForTypeAttribute(thetype);
-  if (!first)
-    {
-      first = att;
-      SetMappingInTableForTypeAttribute(thetype,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = att;
-        first->setNext(last);
-      }
-}
-
-
-void SgType::addAttribute(int type)
-{
-  addAttribute(type, NULL, 0);
-}
-
-
-void SgType::addAttribute(void *a, int size)
-{
-  addAttribute(0, a, size);
-}
-
-////////////////// ATTRIBUTE FOR SgLabel /////////////////////
-// Kataev 21.03.2013
-
-SgLabel::SgLabel(SgLabel &lab)
-{
-#ifndef __SPF
-    Message("SgLabel: copy constructor not allowed", 0);
-#endif
-    thelabel = lab.thelabel;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgLabel::SgLabel(PTR_LABEL lab)
-{
-    thelabel = lab;
-    SetMappingInTableForLabel(thelabel, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgLabel::SgLabel(int i)
-{
-    thelabel = (PTR_LABEL)newNode(LABEL_KIND);
-    LABEL_STMTNO(thelabel) = i;
-    SetMappingInTableForLabel(thelabel, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgLabel::~SgLabel()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-    RemoveFromTableLabel((void *)this);
-}
-
-int SgLabel::numberOfAttributes()
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForLabelAttribute(thelabel);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      first = first->getNext();
-      nb++;
-    }
-  return nb;
-}
-
-
-int SgLabel::numberOfAttributes(int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForLabelAttribute(thelabel);
-  if (!first)
-    return 0;
-  while (first)
-    {
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return nb;
-}
-
-
-
-SgAttribute *SgLabel::getAttribute(int i)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForLabelAttribute(thelabel);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if (nb == i)
-        return first;
-      first = first->getNext();
-      nb++;
-    }
-  return NULL;
-}
-
-
-SgAttribute *SgLabel::getAttribute(int i, int type)
-{
-  SgAttribute *first;
-  int nb = 0;
-  first = GetMappingInTableForLabelAttribute(thelabel);
-  if (!first)
-    return NULL;
-  while (first)
-    {
-      if ((nb == i) && (first->getAttributeType() == type))
-        return first;
-      if (first->getAttributeType() == type)
-        nb++;
-      first = first->getNext();
-    }
-  return NULL;
-}
-
-void *SgLabel::attributeValue(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
- 
-void *SgLabel::attributeValue(int i, int type)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i,type)) != 0)
-    return first->getAttributeData();
-  else
-  return NULL;
-}
-
-int SgLabel::attributeType(int i)
-{
-  SgAttribute *first;
-
-  if ( (first = getAttribute(i)) != 0)
-    return first->getAttributeType();
-  else
-    return 0;
-}
-
-
-void *SgLabel::deleteAttribute(int i)
-{
-    SgAttribute *tobedel, *before, *after;
-  void *data = NULL;
-
-  tobedel = getAttribute(i);
-  if (!tobedel) return NULL;
-  
-  if (i > 0)
-    {
-      before = getAttribute(i-1);
-      before->setNext(tobedel->getNext());
-      data = tobedel->getAttributeData();
-#ifdef __SPF   
-      removeFromCollection(tobedel);
-#endif
-      delete tobedel;
-    } else
-      {
-        after = tobedel->getNext();
-        SetMappingInTableForLabelAttribute(thelabel,after);
-        data = tobedel->getAttributeData();
-#ifdef __SPF   
-        removeFromCollection(tobedel);
-#endif
-        delete tobedel;
-      }
-	
-  return data;
-}
-
-void SgLabel::addAttribute(int type, void *a, int size)
-{
-  SgAttribute *first, *last;
-  first = GetMappingInTableForLabelAttribute(thelabel);
-  if (!first)
-    {
-      first = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, first, 1);
-#endif
-      SetMappingInTableForLabelAttribute(thelabel,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = new SgAttribute(type,a,size, *this, CurrentFileNumber);
-#ifdef __SPF   
-        addToCollection(__LINE__, __FILE__, last, 1);
-#endif
-        first->setNext(last);
-      }
-}
-
-
-void SgLabel::addAttribute(SgAttribute *att)
-{
-  SgAttribute *first, *last;
-  if (!att) return;
-  first = GetMappingInTableForLabelAttribute(thelabel);
-  if (!first)
-    {
-      first = att;
-      SetMappingInTableForLabelAttribute(thelabel,first);
-    } else
-      {
-        while (first->getNext())
-          {
-            first = first->getNext();
-          }
-        last = att;
-        first->setNext(last);
-      }
-}
-
-
-void SgLabel::addAttribute(int type)
-{
-  addAttribute(type, NULL, 0);
-}
-
-
-void SgLabel::addAttribute(void *a, int size)
-{
-  addAttribute(0, a, size);
-}
-
-////////////////////////////////////////////////////////////////////////
-// This routines performa garbage collection on Expression Statements //
-// not to use simultaneously with the data dependence information that//
-// creates nodes not to be removed                                    //
-// This use the attribute mechanism                                   //
-// two flags are used, one the user can set to avoid a node to be     //
-// garbage                                                            //
-// #define NOGARBAGE_ATTRIBUTE                                        //
-// the following one internal to the system                           //
-// #define GARBAGE_ATTRIBUTE                                          //
-// return the number of nodes collected                               //
-////////////////////////////////////////////////////////////////////////
-
-
-void  saveattXXXGarbage (void *dat,FILE *f)
-{
-  int *t;
-  if (!dat || !f)
-    return;
-
-  t = (int *) dat;
-  fprintf(f,"Value of the attributes---> %d  %d\n",t[0], t[1]);
-  
-}
-
-void markExpression(SgExpression *exp)
-{
-  int *garinfo;
-
-  if (!exp) return;
-  if (!isALoNode(exp->variant())) 
-    {
-      Message("Trying to mark a non Expression Node in Garbage Collection",0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      return;
-    }
-
-  garinfo = (int *) exp->attributeValue(0,GARBAGE_ATTRIBUTE);
-  if (garinfo[1]) return; // avoid looping, already visited (necessary???);
-  garinfo[0]++;
-  garinfo[1] = 1; // visited;
-  
-  markExpression(exp->lhs());
-  markExpression(exp->rhs());
-}
-
-int SgFile::expressionGarbageCollection(int deleteExpressionNode, int verbose)
-{
-  
-  SgExpression *exp, *previous, *def, *use, *ann;
-  SgStatement *stmt;
-  SgSymbol *symb;
-  SgType *type;
-  int *garinfo;
-  int i,j;
-  SgConstantSymb *cstsymb;
-  SgArrayType *arr;
-  int nbatt, typeat;
-  int curident;
-  PTR_LLND last = NULL;
-  int nbdeleted = 0;
-
-  if (verbose)
-    printf("garbage collection in process, please wait (did you had coffee yet?)\n");
-
-  if (deleteExpressionNode)
-    setFreeListForExpressionNode();    
-  else
-    resetFreeListForExpressionNode();
-  
-  for (exp = this->firstExpression(); exp; exp = exp->nextInExprTable())
-    {
-      garinfo = new int[2];
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, garinfo, 2);
-#endif
-      garinfo[0] = 0;
-      garinfo[1] = 0;
-      exp->addAttribute(GARBAGE_ATTRIBUTE,(void *) garinfo, 2*sizeof(int));
-    }
-
-  for (stmt = this->firstStatement(); stmt; stmt = stmt->lexNext())
-    {
-      markExpression(stmt->expr(0));
-      markExpression(stmt->expr(1));
-      markExpression(stmt->expr(2));
-      def = (SgExpression *) stmt->attributeValue(0,DEFINEDLIST_ATTRIBUTE);
-      markExpression(def);
-      use = (SgExpression *) stmt->attributeValue(0,USEDLIST_ATTRIBUTE);
-      markExpression(use);
-      nbatt = stmt->numberOfAttributes();
-      for (j = 0; j < nbatt ; j++)
-        {
-          typeat = stmt->attributeType(j);
-          if (typeat == ANNOTATION_EXPR_ATTRIBUTE)
-            {
-              ann = (SgExpression *) stmt->attributeValue(j);
-              markExpression(ann);
-            }
-        }  
-    }
-
-  // needs more, to be completed later;
-
-  for (symb = this->firstSymbol(); symb; symb = symb->next())
-    {
-      // according to the type symbol, it may have pointer to a llnd;
-      if ( (cstsymb = isSgConstantSymb(symb)) != 0)
-        {
-          markExpression(cstsymb->constantValue());
-        }
-    }
-
-  for (type = this->firstType(); type; type = type->next())
-    {
-      if ( (arr = isSgArrayType(type)) != 0)
-        {
-          for (i = 0; i < arr->dimension(); i++)
-            markExpression(type->length());
-        }      
-      if ((type->variant() != DEFAULT) && isAtomicType(type->variant()))
-        {
-          // check for the range; an mark it;
-          markExpression(type->length());
-        }
-    }
-  // actually remove the nodes;
-  // this->saveAttributes("markedNODES",saveattXXXGarbage);  For debug purpose;
-  previous = this->firstExpression();
-  if (previous)
-    {
-      // keep the first one to avoid to much trouble;
-      // to be removed later.
-      for (exp = previous->nextInExprTable(); exp; exp = exp->nextInExprTable())
-        {
-          if (!isALoNode(exp->variant())  || (exp->variant() == DEFAULT))
-            {
-              Message("Trying to USE a non Expression Node in Garbage Collection",0);
-#ifdef __SPF   
-              {
-                  char buf[512];
-                  sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-                  addToGlobalBufferAndPrint(buf);
-              }
-              throw -1;
-#endif
-            }
-          if (!exp->getAttribute(0,NOGARBAGE_ATTRIBUTE))
-            {
-              garinfo = (int *) exp->attributeValue(0,GARBAGE_ATTRIBUTE);
-              if (!garinfo[0])
-                {
-                  // remove the node;
-                  // first remove all the attribute;
-#ifdef __SPF   
-                  removeFromCollection(garinfo);
-#endif
-                  delete garinfo;
-                  // removes all the attributes;
-                  while (exp->deleteAttribute(0));
-                  // now delete the node from the data base;
-                  NODE_NEXT(previous->thellnd) = NODE_NEXT(exp->thellnd);
-                  curident = exp->id();                  
-                  libFreeExpression(exp->thellnd);
-                  llndTableClass[curident] = NULL;
-#ifdef __SPF   
-                  removeFromCollection(exp);
-#endif
-                  delete exp;
-                  exp = previous;
-                  nbdeleted++;
-                } else
-                  previous = exp;
-            } else
-              previous = exp;
-        }
-      // now remove the garbage attribute for all nodes;
-      previous = this->firstExpression();
-      for (exp = previous; exp; exp = exp->nextInExprTable())
-        {
-          if (!isALoNode(exp->variant())  || (exp->variant() == DEFAULT)) 
-            {
-              Message("Trying to USE (1) a non Expression Node in Garbage Collection",0);
-#ifdef __SPF   
-              {
-                  char buf[512];
-                  sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-                  addToGlobalBufferAndPrint(buf);
-              }
-              throw -1;
-#endif
-            }
-          nbatt = exp->numberOfAttributes();
-          for (j = 0; j < nbatt ; j++)
-            {
-              typeat = exp->attributeType(j);
-              if (typeat == GARBAGE_ATTRIBUTE)
-                {
-                  garinfo = (int *) exp->attributeValue(0,GARBAGE_ATTRIBUTE);      
-#ifdef __SPF   
-                  removeFromCollection(garinfo);
-#endif
-                  delete garinfo;
-                  exp->deleteAttribute(j);
-                  j--;
-                }
-            }
-        }
-
-      // needs also to update the llnode numbers;
-      // no need to check the table,  already allocated;
-      curident = 1;
-      previous = this->firstExpression();
-      for (exp = previous; exp; exp = exp->nextInExprTable())
-        {
-          if (!isALoNode(exp->variant())  || (exp->variant() == DEFAULT)) 
-            {
-              Message("Trying to USE (1) a non Expression Node in Garbage Collection",0);
-            }
-          last = exp->thellnd;
-          llndTableAttribute[curident] = llndTableAttribute[NODE_ID(exp->thellnd)];
-	  NODE_ID(exp->thellnd) =  curident;      
-          llndTableClass[curident] = (void *) exp;
-          curident++;
-        }
-      number_of_ll_node = curident-1;
-      CUR_FILE_NUM_LLNDS() =  curident-1;
-      CUR_FILE_CUR_LLND()  = last;
-    }
-  return nbdeleted;
-}
-
-////////////////////////////  TEMPLATE RELATED STUFF /////////////////////////
-
-SgTemplateStmt::SgTemplateStmt(SgExpression *arglist)
-  :SgStatement(TEMPLATE_FUNDECL){
-  if(arglist)
-     BIF_LL1(thebif) = arglist->thellnd;
-   // probably should change the scope of the symbols in this list.
-}
-SgExpression * SgTemplateStmt::AddArg(char *name, SgType &t){
-   // returns decl expr created.  if name == null this is a type arg
-  PTR_SYMB symb;
-  SgExpression *arg;
-  SgSymbol *s;
-
-  s = new SgVariableSymb(name, t, *this); //create the variable with scope
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-  symb = s->thesymb;
-  appendSymbToArgList(BIF_SYMB(thebif),symb); 
-  arg = SgMakeDeclExp(s, &t); 
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg->thellnd);
- return arg;
-}
-
-SgExpression * SgTemplateStmt::AddArg(char *name, SgType &t, 
-   SgExpression &init)
-{
-  PTR_SYMB symb;
-  PTR_LLND ll;
-  SgExpression *arg, *ref;
-  SgSymbol *s;
-
-  if(name == NULL){
-      name = new char;
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, name, 1);
-#endif
-      *name = (char) 0;
-      }
-  s = new SgVariableSymb(name, t, *this); //create the variable with scope
-#ifdef __SPF   
-  addToCollection(__LINE__, __FILE__, s, 1);
-#endif
-  symb = s->thesymb;
-  appendSymbToArgList(BIF_SYMB(thebif),symb); 
-  ref = SgMakeDeclExp(s, &t);
-  arg = &SgAssignOp(*ref, init);
-  ll = BIF_LL1(thebif);
-  ll = NODE_OPERAND0(ll);
-  NODE_OPERAND0(ll) = addToExprList(NODE_OPERAND0(ll),arg->thellnd);
-  return arg;
-}
-
-int SgTemplateStmt::numberOfArgs(){
-    return exprListLength(BIF_LL1(thebif));
-}
-SgExpression * SgTemplateStmt::arg(int i){
-	return LlndMapping(getPositionInExprList(BIF_LL1(thebif), i));
-}
-SgExpression * SgTemplateStmt::argList(){
-       return LlndMapping(BIF_LL1(thebif));
-}
-void SgTemplateStmt::addFunction(SgFuncHedrStmt &theTemplateFunc){
-             this->insertStmtAfter(theTemplateFunc,*this);
-}
-void SgTemplateStmt::addClass(SgClassStmt &theTemplateClass){
-             this->insertStmtAfter(theTemplateClass,*this);
-}
-SgFuncHedrStmt * SgTemplateStmt::isFunction(){
-   PTR_BLOB blob;
-   SgStatement *x;
-      blob = lookForBifInBlobList(BIF_BLOB1(BIF_CP(thebif)), thebif);
-      if (!blob)
-        return NULL;
-      x = BfndMapping(BLOB_VALUE(blob));
-      return isSgFuncHedrStmt(x);
-}
-SgClassStmt * SgTemplateStmt::isClass(){
-   PTR_BLOB blob;
-   SgStatement *x;
-      blob = lookForBifInBlobList(BIF_BLOB1(BIF_CP(thebif)), thebif);
-      if (!blob)
-        return NULL;
-      x = BfndMapping(BLOB_VALUE(blob));
-      return isSgClassStmt(x);
-}
-
-//- the T_DERIVED_TEMPLATE class functions 
-
-SgDerivedTemplateType::SgDerivedTemplateType(SgExpression *arg_vals, 
-                            SgSymbol *classname): SgType(T_DERIVED_TEMPLATE){
-              if(classname)
-		TYPE_TEMPL_NAME(thetype) = classname->thesymb;
-              if(arg_vals)
-		TYPE_TEMPL_ARGS(thetype) = arg_vals->thellnd;
-
-}
-SgExpression * SgDerivedTemplateType::argList(){
-     return LlndMapping(TYPE_TEMPL_ARGS(thetype));
-}
-
-void SgDerivedTemplateType::addArg(SgExpression *arg){
- TYPE_TEMPL_ARGS(thetype) = 
-    addToExprList(TYPE_TEMPL_ARGS(thetype),arg->thellnd);
-}
-
-int SgDerivedTemplateType::numberOfArgs(){
-    return exprListLength(TYPE_TEMPL_ARGS(thetype));
-}
-SgExpression  * SgDerivedTemplateType::arg(int i){
-    return LlndMapping(getPositionInExprList(TYPE_TEMPL_ARGS(thetype), i));
-}
-void SgDerivedTemplateType::setName(SgSymbol &s){
-     TYPE_TEMPL_NAME(thetype) = s.thesymb;
-}
-SgSymbol * SgDerivedTemplateType::typeName(){
-     return SymbMapping(TYPE_TEMPL_NAME(thetype));
-}
-
-//////////////////////////////////////  ADDED  GENERIC METHODS /////////////////////
-
-SgStatement::SgStatement(int code, SgLabel *lab, SgSymbol *symb, SgExpression *e1, SgExpression *e2, SgExpression *e3)
-{
-    thebif = (PTR_BFND)newNode(code);
-
-    BIF_SYMB(thebif) = NULL;
-    BIF_LL1(thebif) = NULL;
-    BIF_LL2(thebif) = NULL;
-    BIF_LL3(thebif) = NULL;
-    BIF_LABEL(thebif) = NULL;
-
-    if (lab)  BIF_LABEL(thebif) = lab->thelabel;
-    if (symb) BIF_SYMB(thebif) = symb->thesymb;
-    if (e1)   BIF_LL1(thebif) = e1->thellnd;
-    if (e2)   BIF_LL2(thebif) = e2->thellnd;
-    if (e3)   BIF_LL3(thebif) = e3->thellnd;
-
-    // this should be function of low_level.c
-    switch (BIF_CODE(thebif))
-    { // node that can be a bif control parent 
-    case  GLOBAL:
-    case  PROG_HEDR:
-    case  PROC_HEDR:
-    case  PROS_HEDR:
-    case  BASIC_BLOCK:
-    case  IF_NODE:
-    case  WHERE_BLOCK_STMT:
-    case  LOOP_NODE:
-    case  FOR_NODE:
-    case  FORALL_NODE:
-    case  WHILE_NODE:
-    case  CDOALL_NODE:
-    case  SDOALL_NODE:
-    case  DOACROSS_NODE:
-    case  CDOACROSS_NODE:
-    case  FUNC_HEDR:
-    case  ENUM_DECL:
-    case  STRUCT_DECL:
-    case  UNION_DECL:
-    case  CLASS_DECL:
-    case  TECLASS_DECL:
-    case  COLLECTION_DECL:
-    case  SWITCH_NODE:
-    case  EXTERN_C_STAT:
-        addControlEndToStmt(thebif);
-        break;
-    }
-
-    fileID = current_file_id;
-    project = CurrentProject;
-    unparseIgnore = false;
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgType::SgType(int var, SgExpression *len, SgType *base)
-{
-    if (!isATypeNode(var))
-    {
-        Message("Attempt to create a type node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thetype = (PTR_TYPE)newNode(T_INT);
-    }
-    else
-        thetype = (PTR_TYPE)newNode(var);
-
-    if (len)
-    {
-        TYPE_RANGES(thetype) = len->thellnd;
-    }
-    if (base)
-    {
-        TYPE_BASE(thetype) = base->thetype;
-    }
-    SetMappingInTableForType(thetype, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgType::SgType(int var, SgSymbol *symb, SgExpression *len, SgType *base)
-{
-    if (!isATypeNode(var))
-    {
-        Message("Attempt to create a type node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thetype = (PTR_TYPE)newNode(T_INT);
-    }
-    else
-        thetype = (PTR_TYPE)newNode(var);
-
-    if (len)
-    {
-        TYPE_RANGES(thetype) = len->thellnd;
-    }
-    if (base)
-    {
-        TYPE_BASE(thetype) = base->thetype;
-    }
-    if (symb)
-    {
-        TYPE_SYMB(thetype) = symb->thesymb;
-    }
-    SetMappingInTableForType(thetype, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgType::SgType(int var, SgSymbol *symb)
-{
-    if (!isATypeNode(var))
-    {
-        Message("Attempt to create a type node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thetype = (PTR_TYPE)newNode(T_INT);
-    }
-    else
-        thetype = (PTR_TYPE)newNode(var);
-    if (symb)
-    {
-        TYPE_SYMB_DERIVE(thetype) = symb->thesymb;
-    }
-    SetMappingInTableForType(thetype, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgType::SgType(int var, SgSymbol *firstfield, SgStatement *structstmt)
-{
-    if (!isATypeNode(var))
-    {
-        Message("Attempt to create a type node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thetype = (PTR_TYPE)newNode(T_INT);
-    }
-    else
-        thetype = (PTR_TYPE)newNode(var);
-
-    if (structstmt)
-        TYPE_COLL_ORI_CLASS(thetype) = structstmt->thebif;
-    if (firstfield)
-        TYPE_COLL_FIRST_FIELD(thetype) = firstfield->thesymb;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgType::SgType(PTR_TYPE type)
-{
-    thetype = type;
-    SetMappingInTableForType(thetype, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgType::SgType(SgType &t)
-{
-    thetype = t.thetype;
-#ifndef __SPF
-    Message("SgType: no copy constructor allowed", 0);
-#endif
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-SgType::~SgType()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-}
-
-SgSymbol::SgSymbol(int variant, const char *identifier, SgType *type, SgStatement *scope, SgSymbol *structsymb, SgSymbol *nextfield)
-{
-    if (!isASymbNode(variant))
-    {
-        Message("Attempt to create a symbol node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thesymb = newSymbol(VARIABLE_NAME, identifier, NULL);
-    }
-    else
-        thesymb = newSymbol(variant, identifier, NULL);
-
-    if (type)
-        SYMB_TYPE(thesymb) = type->thetype;
-
-    if (scope)
-        SYMB_SCOPE(thesymb) = scope->thebif;
-
-    if (structsymb)
-    {
-        if (variant == MEMBER_FUNC)
-            SYMB_MEMBER_BASENAME(thesymb) = structsymb->thesymb;
-        else
-            SYMB_FIELD_BASENAME(thesymb) = structsymb->thesymb;
-    }
-
-    if (nextfield)
-    {
-        if (variant == FIELD_NAME)
-            SYMB_NEXT_FIELD(thesymb) = nextfield->thesymb;
-        else
-            SYMB_MEMBER_NEXT(thesymb) = nextfield->thesymb;
-    }
-    SetMappingInTableForSymb(thesymb, (void *)this);
-
-    fileID = current_file_id;
-    project = CurrentProject;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-
-SgExpression::SgExpression(int variant, char *str)
-{
-    if (!isALoNode(variant))
-    {
-        Message("Attempt to create a low level node with a variant that is not", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.cpp\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-        // arbitrary choice for the variant
-        thellnd = (PTR_LLND)newNode(EXPR_LIST);
-    }
-    else
-        thellnd = (PTR_LLND)newNode(variant);
-    NODE_STR(thellnd) = str;
-    SetMappingInTableForLlnd(thellnd, (void *)this);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 1);
-#endif
-}
-
-
-///// a supoort routine for the sage code generator //////
-
-
-SgLabel* getLabel(int id)
-{
-  PTR_LABEL lab;
-
-  // first check its there;
-  if ( (lab = Get_label_with_id(id)) != 0)
-    return LabelMapping(lab);
-  else
-  {
-      SgLabel *ret = new SgLabel(id);
-#ifdef __SPF   
-      addToCollection(__LINE__, __FILE__, ret, 1);
-#endif
-      return ret;
-  }
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.uni
deleted file mode 100644
index ea138c3..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.uni
+++ /dev/null
@@ -1,40 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# sage/Sage++/makefile.win
-
-LIBDIR = ../../lib
-
-HDRS        = ../h
-LIBINCLUDE  = ../lib/include
-SAGEINCLUDE = -I$(HDRS) -I$(LIBINCLUDE)
-
-# Directory in which include files can be found
-INCLUDEDIR = ./h
-INCL = -I$(INCLUDEDIR) $(SAGEINCLUDE)
-
-CFLAGS = $(INCL) -c -Wall
-TOOLSage_SRC = libSage++.cpp
-
-TOOLSage_HDR = $(LIBINCLUDE)/macro.h $(LIBINCLUDE)/bif_node.def \
-	$(LIBINCLUDE)/type.def $(LIBINCLUDE)/symb.def $(LIBINCLUDE)/libSage++.h
-
-TOOLSage_OBJ = libSage++.o
-
-libSage++.o: libSage++.cpp $(TOOLSage_HDR)
-	$(CXX) $(CFLAGS) libSage++.cpp
-
-$(LIBDIR)/libSage++.a: $(TOOLSage_OBJ)
-	ar qc $(LIBDIR)/libSage++.a $(TOOLSage_OBJ)
-
-all : $(LIBDIR)/libSage++.a
-	@echo "*** COMPILING LIBRARY Sage++ DONE"
-
-
-clean:
-	rm -f libSage++.o
-
-cleanall:
-	rm -f libSage++.o
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.win
deleted file mode 100644
index 3237d9e..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/Sage++/makefile.win
+++ /dev/null
@@ -1,49 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# sage/Sage++/makefile.win
-
-OUTDIR = ../../obj
-LIBDIR = ../../lib
-
-HDRS        = ../h
-LIBINCLUDE  = ../lib/include
-SAGEINCLUDE = -I$(HDRS) -I$(LIBINCLUDE)
-
-# Directory in which include files can be found
-INCLUDEDIR = ./h
-INCL = -I$(INCLUDEDIR) $(SAGEINCLUDE)
-
-LIB32=$(LINKER) -lib
-LIB32_FLAGS=/nologo /out:"$(LIBDIR)/libSage++.lib" 
-
-# -w don't issue warning now.
-#CFLAGS=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" $(INCL) \
-#	/Fp"$(OUTDIR)/libSage++.pch" /YX /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-CFLAGS=/nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" $(INCL) \
-	/Fp"$(OUTDIR)/libSage++.pch"  /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-
-TOOLSage_SRC	=  libSage++.cpp
-
-TOOLSage_HDR     = $(LIBINCLUDE)/macro.h $(LIBINCLUDE)/bif_node.def  \
-	$(LIBINCLUDE)/type.def  $(LIBINCLUDE)/symb.def $(LIBINCLUDE)/libSage++.h
-
-TOOLSage_OBJ	=   $(OUTDIR)/libSage++.obj 
-
-$(OUTDIR)/libSage++.obj: libSage++.cpp $(TOOLSage_HDR)
-		$(CXX) $(CFLAGS)  libSage++.cpp
-
-$(LIBDIR)/libSage++.lib: $(TOOLSage_OBJ) 
-	$(LIB32) @<<
-	$(LIB32_FLAGS) $(TOOLSage_OBJ) 
-<<
-
-all : $(LIBDIR)/libSage++.lib
-    @echo "*** COMPILING LIBRARY Sage++ DONE"
-
-
-clean:
-
-cleanall:
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/h/Makefile
deleted file mode 100644
index 0eb57af..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-#######################################################################
-##                  pC++/Sage++  Copyright (C) 1993                  ##
-##  Indiana University  University of Oregon  University of Rennes   ##
-#######################################################################
-
-
-CC = gcc
-CC = cc
-CXX = g++
-CXX = DCC
-
-LINKER = $(CC)
-
-all:	tag.h
-
-tag.h:	head tag
-	( cat head; \
-	  sed < tag \
-	    '/#defin/s/\([^ ]*\) \([^ 	]*\)\(.*\)/  tag \[ \2 \] = \"\2\";/')\
-	  > tag.h
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/bif.h b/projects/dvm_svn/fdvm/trunk/Sage/h/bif.h
deleted file mode 100644
index c76326a..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/bif.h
+++ /dev/null
@@ -1,453 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/************************************************************************
- *								        *
- *			       BIF NODES				*
- *								        *
- ************************************************************************/
-
-struct bfnd {
-
-     int	variant, id;	/* variant and identification tags */
-     int	index;		/* used in the strongly con. comp. routines */
-     int	g_line, l_line; /* global & local line numbers */
-     int        decl_specs; /* declaration specifiers stored with
-                               bif nodes: static, extern, friend, and inline */
-
-     PTR_LABEL	label;
-     PTR_BFND	thread;
-
-     PTR_FNAME	filename;	/* point to the source filename */
-
-     PTR_BFND	control_parent; /* current bif node in on the control blob list
-				  of control_parent */
-     PTR_PLNK	prop_list;	/* property list */
-    
-     union bfnd_union {
-	 
-	 struct {
-		  PTR_BFND  bf_ptr1;	/* used by the parser and should */
-		  PTR_CMNT  cmnt_ptr;   /* to attach comments */
-
-		  PTR_SYMB  symbol;	/* a symbol table entry */
-
-		  PTR_LLND  ll_ptr1;	/* an L-value expr tree */
-		  PTR_LLND  ll_ptr2;	/* an R-value expr tree */
-		  PTR_LLND  ll_ptr3;	/* a spare expr tree (see below) */
-
-		  PTR_LABEL lbl_ptr;    /* used by do */
-
-		  PTR_BLOB  bl_ptr1;	/* a list of control dep subnodes */
-		  PTR_BLOB  bl_ptr2;	/* another such list (for if stmt) */
-
-		  PTR_DEP   dep_ptr1;	/* a list of dependences nodes */
-		  PTR_DEP   dep_ptr2;	/* another list of dep nodes */
-
-		  PTR_SETS  sets;	/* a list of sets like GEN, KILL etc */
-		}				Template;	      
-
-	 struct {
-		  PTR_BFND  proc_list;	/* a list of procedures in this file */
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  list;	/* list of global const and type */
-
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-		  PTR_LLND  null_4;
-		  
-		  PTR_LABEL null_5;
-
-		  PTR_BLOB  control;	/* used for list of procedures */
-		  PTR_BLOB  null_6;
-
-		  PTR_DEP   null_7;
-		  PTR_DEP   null_8;
-		  
-		  PTR_SETS  null_9;
-		}				Global;
-
-	 struct {
-		  PTR_BFND  next_prog;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  prog_symb;
-
-		  PTR_LLND  null_1;
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-
-		  PTR_LABEL null_4;
-
-		  PTR_BLOB  control;
-		  PTR_BLOB  format_group;
-
-		  PTR_DEP   null_5;
-		  PTR_DEP   null_6;
-
-		  PTR_SETS  null_7;
-		}				program;
-
-	 struct {
-		  PTR_BFND  next_proc;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  proc_symb;
-
-		  PTR_LLND  null_1;
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-
-		  PTR_LABEL null_4;
-
-		  PTR_BLOB  control;
-		  PTR_BLOB  format_group;
-
-		  PTR_DEP   null_5;
-		  PTR_DEP   null_6;
-		  
-		  PTR_SETS  null_7;
-		}				procedure;
-
-	 struct {
-		  PTR_BFND  next_func;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  func_symb;
-
-		  PTR_LLND  ftype;
-		  PTR_LLND  null_1;
-		  PTR_LLND  null_2;
-
-		  PTR_LABEL null_3;
-
-		  PTR_BLOB  control;
-		  PTR_BLOB  format_group;
-
-		  PTR_DEP   null_4;
-		  PTR_DEP   null_5;
-
-		  PTR_SETS  null_6;
-		}				function;
-
-	 struct {
-		  PTR_BFND  next_bif;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-		  PTR_LLND  null_4;
-
-		  PTR_LABEL null_5;
-
-		  PTR_BLOB  control;
-		  PTR_BLOB  null_6;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				basic_block;
-
-	 struct {
-		  PTR_BFND  next_stat;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-		  PTR_LLND  null_4;
-
-		  PTR_LABEL null_5;
-
-		  PTR_BLOB  null_6;
-		  PTR_BLOB  null_7;
-
-		  PTR_DEP   null_8;
-		  PTR_DEP   null_9;
-
-		  PTR_SETS  sets;
-		}				control_end;
-
-	 struct {
-		  PTR_BFND  true_branch;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  condition;
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-
-		  PTR_LABEL null_4;
-
-		  PTR_BLOB  control_true;
-		  PTR_BLOB  control_false;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				if_node;
-
-	 struct {
-		  PTR_BFND  true_branch;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  condition;
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-
-		  PTR_LABEL null_4;
-
-		  PTR_BLOB  control_true;
-		  PTR_BLOB  control_false;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				where_node;
-
-	 struct {
-		  PTR_BFND  loop_end;
-		  PTR_CMNT  cmnt_ptr;
-		  
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-		  PTR_LLND  null_4;
-
-		  PTR_LABEL null_5;
-
-		  PTR_BLOB  control;
-		  PTR_BLOB  null_6;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				loop_node;
-
-	 struct {
-		  PTR_BFND  for_end;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  control_var;
-
-		  PTR_LLND  range;
-		  PTR_LLND  increment;
-		  PTR_LLND  where_cond;
-
-		  PTR_LABEL doend;
-
-		  PTR_BLOB  control;
-		  PTR_BLOB  null_1;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				for_node;
-
-	 struct {
-		  PTR_BFND  forall_end;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  control_var;
-
-		  PTR_LLND  range;
-		  PTR_LLND  increment;
-		  PTR_LLND  where_cond;
-
-		  PTR_LABEL null_1;
-
-		  PTR_BLOB  control;
-		  PTR_BLOB  null_2;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				forall_nd;
-
-	 struct {
-		  PTR_BFND  alldo_end;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  control_var;
-
-		  PTR_LLND  range;
-		  PTR_LLND  increment;
-		  PTR_LLND  null_0;
-
-		  PTR_LABEL null_1;
-
-		  PTR_BLOB  control;
-		  PTR_BLOB  null_2;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				alldo_nd;
-
-	 struct {
-		  PTR_BFND  while_end;
-		  PTR_CMNT  cmnt_ptr;
-		  
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  condition;
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-
-		  PTR_LABEL null_4;
-
-		  PTR_BLOB  control;
-		  PTR_BLOB  null_5;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				while_node;
-
-	 struct {
-		  PTR_BFND  next_stat;
-		  PTR_CMNT  cmnt_ptr;
-		  
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  condition;
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-
-		  PTR_LABEL null_4;
-
-		  PTR_BLOB  control_true;
-		  PTR_BLOB  control_false;
-
-		  PTR_DEP   null_5;
-		  PTR_DEP   null_6;
-
-		  PTR_SETS  sets;
-		}				exit_node;
-
-	 struct {
-		  PTR_BFND  next_stat;
-		  PTR_CMNT  cmnt_ptr;
-		  
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  l_value;
-		  PTR_LLND  r_value;
-		  PTR_LLND  null_2;
-
-		  PTR_LABEL null_3;
-
-		  PTR_BLOB  null_4;
-		  PTR_BLOB  null_5;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				assign;
-
-	 struct {
-		  PTR_BFND  next_stat;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  l_value;
-		  PTR_LLND  r_value;
-		  PTR_LLND  null_2;
-
-		  PTR_LABEL null_3;
-
-		  PTR_BLOB  null_4;
-		  PTR_BLOB  null_5;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				identify;
-
-	 struct {
-		  PTR_BFND  next_stat;
-		  PTR_CMNT  cmnt_ptr;
-
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  spec_string;
-		  PTR_LLND  null_2;
-		  PTR_LLND  null_3;
-
-		  PTR_LABEL null_4;
-
-		  PTR_BLOB  null_5;
-		  PTR_BLOB  null_6;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				format;
-
-	 struct {
-		  PTR_BFND  next_stat;
-		  PTR_CMNT  cmnt_ptr;
-		  
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  format;		/* used by blaze only */
-		  PTR_LLND  expr_list;
-		  PTR_LLND  control_list;	/* used by cedar fortan only */
-
-		  PTR_LABEL null_2;
-
-		  PTR_BLOB  null_3;
-		  PTR_BLOB  null_4;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-		}				write_stat;
-
-	 struct {
-		  PTR_BFND  next_stat;
-		  PTR_CMNT  cmnt_ptr;
-		  
-		  PTR_SYMB  null_1;
-
-		  PTR_LLND  format;		/* used by blaze only */
-		  PTR_LLND  var_list;
-		  PTR_LLND  control_list;	/* used by cedar fortran */
-
-		  PTR_LABEL null_2;
-
-		  PTR_BLOB  null_3;
-		  PTR_BLOB  null_4;
-
-		  PTR_DEP   dep_from;
-		  PTR_DEP   dep_to;
-
-		  PTR_SETS  sets;
-	     }					read_stat;
-       } entry;
-  };
-
-#define __BIF_DEF__
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/compatible.h b/projects/dvm_svn/fdvm/trunk/Sage/h/compatible.h
deleted file mode 100644
index 4768420..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/compatible.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/* Simple compatibility module for pC++/Sage (phb) */
-
-/* include it only once... */
-#ifndef COMPATIBLE_H
-#define COMPATIBLE_H
-
-#include "sage.h"
-
-#ifndef _NEEDALLOCAH_
-#  if (defined(__ksr__) || (defined(SAGE_solaris2) && !defined(__GNUC__)))
-#    define _NEEDALLOCAH_
-#  endif
-#endif
-
-#ifdef __hpux
-#  ifndef SYS5
-#    define SYS5 1
-#  endif
-#endif
- 
-#ifdef _SEQUENT_
-#  define NO_u_short
- 
-#  ifndef SYS5
-#    define SYS5 1
-#  endif
-#endif
- 
-#ifdef sparc
-#  if (defined(__svr4__) || defined(SAGE_solaris2))  /* Solaris 2!!! YUK! */
-#    ifndef SYS5
-#      define SYS5 1
-#    endif
-#  endif
-#endif
-
-#ifndef SYS5
-#  define BSD 1
-#endif
-
-#ifdef _NEEDCALLOC_
-# ifdef CALLOC_DEF
-#   undef CALLOC_DEF
-# endif
-
-# ifndef CALLOC_DEF
-#   ifdef __GNUC__
-      extern void *calloc();
-#     define CALLOC_DEF
-#   endif
-# endif
-
-# ifndef CALLOC_DEF
-#   ifdef __ksr__
-      extern void *calloc();
-#     define CALLOC_DEF
-#   endif
-# endif
-
-# ifndef CALLOC_DEF
-#   ifdef cray
-#     include "fixcray.h"
-#   endif
-# endif
-
-# ifndef CALLOC_DEF
-    extern char *calloc();
-# endif
-
-#endif
-
-#endif
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/db.h b/projects/dvm_svn/fdvm/trunk/Sage/h/db.h
deleted file mode 100644
index 36a1371..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/db.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/****************************************************************
- *								*
- *   db.h -- contains all definitions needed by the data base	*
- *	     management routines				*
- *								*
- ****************************************************************/
-
-
-#ifndef CallSiteE
-
-#ifndef FILE
-#   include <stdio.h>
-#endif
-
-#ifndef DEP_DIR
-#   include "defs.h"
-#endif
-
-#ifndef __BIF_DEF__
-#   include "bif.h"
-#endif
-
-#ifndef __LL_DEF__
-#   include "ll.h"
-#endif
-
-#ifndef __SYMB_DEF__
-#   include "symb.h"
-#endif
-
-#ifndef MAX_LP_DEPTH
-#   include "sets.h"
-#endif
-
-
-/*
- * Definitions for inquiring the information about variables
- */
-#define Use	1	/* for inquiring USE info */
-#define Mod	2	/* for inquiring MOD info */
-#define UseMod	3	/* for inquiring both USE and MOD info */
-#define Alias	4	/* for inquiring ALIAS information */
-
-
-/*
- * Definitions for inquiring the information about procedures
- * This previous four definitions are shared here
- */
-#define ProcDef    5	/* procedure's definition */
-#define CallSite   6	/* list of the call sites of this procedure */
-#define CallSiteE  7	/* the call sites extended with loop info */
-#define ExternProc 8	/* list of external procedures references */
-
-/*
- * Definitions for inquiring the information about files
- */
-#define IncludeFile   1	/* list of files included by this file */
-#define GlobalVarRef  2	/* list of global variables referenced */
-#define ExternProcRef 3	/* list of external procedure referenced */
-
-
-/*
- * Definitions for inquiring the information about project
- */
-#define ProjFiles   1	/* get a list of .dep files make up the project */
-#define ProjNames   2	/* list of all procedures in the project */
-#define UnsolvRef   3	/* list of unsolved global references */
-#define ProjGlobals 4	/* list of all global declarations */
-#define ProjSrc	    5	/* list of source files (e.g. .h, .c and .f) */
-/*
- * Definition for blobl tree
- */
-#define IsLnk	0	/* this blob1 node is only a link */
-#define IsObj	1	/* this blob1 node is a real object */
-
-
-/*****************************
- * Some data structures used *
- ******************************/
-
-typedef struct proj_obj *PTR_PROJ;
-typedef struct file_obj *PTR_FILE;
-typedef struct blob1	*PTR_BLOB1;
-typedef struct obj_info	*PTR_INFO;
-typedef char *(*PCF)();
-
-
-/*
- * structure for the whole project
- */
-struct proj_obj {
-	char	 *proj_name;	/* project filename */
-	PTR_BLOB  file_chain;	/* list of all opened files in the project */
-	PTR_BLOB *hash_tbl;	/* hash table of procedures declared */
-	PTR_PROJ  next;		/* point to next project */
-};
-
-
-/*
- * Structure for each files in the project
- */
-struct file_obj {
-	char	 *filename;		/* filename of the .dep file */
-	FILE	 *fid;			/* its file id */
-	int	  lang;			/* type of language */
-	PTR_HASH *hash_tbl;		/* hash table for this file obj */
-	PTR_BFND  global_bfnd;		/* global BIF node for this file */
-	PTR_BFND  head_bfnd,		/* head of BIF node for this file */
-		  cur_bfnd;
-	PTR_LLND  head_llnd,		/* head of low level node */
-		  cur_llnd;
-	PTR_SYMB  head_symb,		/* head of symbol node */
-		  cur_symb;
-	PTR_TYPE  head_type,		/* head of type node */
-		  cur_type;
-	PTR_BLOB  head_blob,		/* head of blob node */
-		  cur_blob;
-	PTR_DEP   head_dep,		/* head of dependence node */
-		  cur_dep;
-	PTR_LABEL head_lab,		/* head of label node */
-		  cur_lab;
-	PTR_CMNT  head_cmnt,		/* head of comment node */
-		  cur_cmnt;
-	PTR_FNAME head_file;
-	int	  num_blobs,		/* no. of blob nodes */
-		  num_bfnds,		/* no. of bif nodes */
-		  num_llnds,		/* no. of ll nodes */
-		  num_symbs,		/* no. of symb nodes */
-		  num_label,		/* no. of label nodes */
-		  num_types,		/* no. of type nodes */
-		  num_files,		/* no. of filename nodes */
-		  num_dep,		/* no. of dependence nodes */
-		  num_cmnt;		/* no. of comment nodes */
-};
-
-
-/*
- * A cons obj structure
- */
-struct blob1{
-	char	   tag;	/* type of this blob node */
-	char	  *ref;	/* pointer to the objects of interest */
-	PTR_BLOB1  next;/* point to next cons obj */
-};
-
-
-/*
- * Structure for information objects
- */
-struct obj_info {
-	char	*filename;	/* filename of the reference */
-	int	 g_line;	/* absolute line number in the file */
-	int	 l_line;	/* relative line number to the object */
-	char	*source;	/* source line */
-};
-
-
-/*
- * Structure for property list
- */
-struct prop_link {
-	char	*prop_name;	/* property name */
-	char	*prop_val;	/* property value */
-	PTR_PLNK next;		/* point to the next property list */
-};
-
-/*
- * declaration of data base routines
- */
-PTR_PROJ  OpenProj();
-PTR_PROJ  SelectProj();
-PTR_BLOB1 GetProjInfo();
-PTR_BLOB1 GetProcInfo();
-PTR_BLOB1 GetTypeInfo();
-PTR_BLOB1 GetTypeDef ();
-PTR_BLOB1 GetVarInfo ();
-PTR_BLOB1 GetDepInfo ();
-
-int AddToProj();
-int DelFromProj();
-#endif /* CallSiteE */
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/db.new.h b/projects/dvm_svn/fdvm/trunk/Sage/h/db.new.h
deleted file mode 100644
index a37f189..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/db.new.h
+++ /dev/null
@@ -1,190 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/****************************************************************
- *								*
- *   db.h -- contains all definitions needed by the data base	*
- *	     management routines				*
- *								*
- ****************************************************************/
-
-
-#ifndef CallSiteE
-
-#ifndef FILE
-#   include <stdio.h>
-#endif
-
-#ifndef DEP_DIR
-#   include "defs.h"
-#endif
-
-#ifndef __BIF_DEF__
-#   include "bif.h"
-#endif
-
-#ifndef __LL_DEF__
-#   include "ll.h"
-#endif
-
-#ifndef __SYMB_DEF__
-#   include "symb.h"
-#endif
-
-#ifndef MAX_LP_DEPTH
-#   include "sets.h"
-#endif
-
-
-/*
- * Definitions for inquiring the information about variables
- */
-#define Use	1	/* for inquiring USE info */
-#define Mod	2	/* for inquiring MOD info */
-#define UseMod	3	/* for inquiring both USE and MOD info */
-#define Alias	4	/* for inquiring ALIAS information */
-
-
-/*
- * Definitions for inquiring the information about procedures
- * This previous four definitions are shared here
- */
-#define ProcDef    5	/* procedure's definition */
-#define CallSite   6	/* list of the call sites of this procedure */
-#define CallSiteE  7	/* the call sites extended with loop info */
-#define ExternProc 8	/* list of external procedures references */
-
-/*
- * Definitions for inquiring the information about files
- */
-#define IncludeFile   1	/* list of files included by this file */
-#define GlobalVarRef  2	/* list of global variables referenced */
-#define ExternProcRef 3	/* list of external procedure referenced */
-
-
-/*
- * Definitions for inquiring the information about project
- */
-#define ProjFiles   1	/* get a list of .dep files make up the project */
-#define ProjNames   2	/* list of all procedures in the project */
-#define UnsolvRef   3	/* list of unsolved global references */
-#define ProjGlobals 4	/* list of all global declarations */
-#define ProjSrc	    5	/* list of source files (e.g. .h, .c and .f) */
-/*
- * Definition for blobl tree
- */
-#define IsLnk	0	/* this blob1 node is only a link */
-#define IsObj	1	/* this blob1 node is a real object */
-
-
-/*****************************
- * Some data structures used *
- ******************************/
-
-typedef struct proj_obj *PTR_PROJ;
-typedef struct file_obj *PTR_FILE;
-typedef struct blob1	*PTR_BLOB1;
-typedef struct obj_info	*PTR_INFO;
-
-
-/*
- * structure for the whole project
- */
-struct proj_obj {
-	char	 *proj_name;	/* project filename */
-	PTR_BLOB  file_chain;	/* list of all opened files in the project */
-	PTR_BLOB *hash_tbl;	/* hash table of procedures declared */
-	PTR_PROJ  next;		/* point to next project */
-};
-
-
-/*
- * Structure for each files in the project
- */
-struct file_obj {
-	char	 *filename;		/* filename of the .dep file */
-	FILE	 *fid;			/* its file id */
-	int	  lang;			/* type of language */
-	PTR_HASH *hash_tbl;		/* hash table for this file obj */
-	PTR_BFND  global_bfnd;		/* global BIF node for this file */
-	PTR_BFND  head_bfnd,		/* head of BIF node for this file */
-		  cur_bfnd;
-	PTR_LLND  head_llnd,		/* head of low level node */
-		  cur_llnd;
-	PTR_SYMB  head_symb,		/* head of symbol node */
-		  cur_symb;
-	PTR_TYPE  head_type,		/* head of type node */
-		  cur_type;
-	PTR_BLOB  head_blob,		/* head of blob node */
-		  cur_blob;
-	PTR_DEP   head_dep,		/* head of dependence node */
-		  cur_dep;
-	PTR_LABEL head_lab,		/* head of label node */
-		  cur_lab;
-	PTR_CMNT  head_cmnt,		/* head of comment node */
-		  cur_cmnt;
-	PTR_FNAME head_file;
-	int	  num_blobs,		/* no. of blob nodes */
-		  num_bfnds,		/* no. of bif nodes */
-		  num_llnds,		/* no. of ll nodes */
-		  num_symbs,		/* no. of symb nodes */
-		  num_label,		/* no. of label nodes */
-		  num_types,		/* no. of type nodes */
-		  num_files,		/* no. of filename nodes */
-		  num_dep,		/* no. of dependence nodes */
-		  num_cmnt;		/* no. of comment nodes */
-};
-
-
-/*
- * A cons obj structure
- */
-struct blob1{
-	char	   tag;	/* type of this blob node */
-	char	  *ref;	/* pointer to the objects of interest */
-	PTR_BLOB1  next;/* point to next cons obj */
-};
-
-
-/*
- * Structure for information objects
- */
-struct obj_info {
-	char	*filename;	/* filename of the reference */
-	int	 g_line;	/* absolute line number in the file */
-	int	 l_line;	/* relative line number to the object */
-	char	*source;	/* source line */
-};
-
-
-/*
- * Structure for property list
- */
-struct prop_link {
-	char	*prop_name;	/* property name */
-	char	*prop_val;	/* property value */
-	PTR_PLNK next;		/* point to the next property list */
-};
-
-/*
- * declaration of data base routines
- */
-typedef char *(*PCF)();
-
-extern PCF UnparseBfnd[];
-extern PCF UnparseLlnd[];
-extern PCF UnparseSymb[];
-extern PCF UnparseType[];
-
-PTR_PROJ  OpenProj();
-PTR_BLOB1 GetProjInfo();
-PTR_BLOB1 GetProcInfo();
-PTR_BLOB1 GetTypeInfo();
-PTR_BLOB1 GetTypeDef ();
-PTR_BLOB1 GetVarInfo ();
-PTR_BLOB1 GetDepInfo ();
-
-#endif CallSiteE
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/defines.h b/projects/dvm_svn/fdvm/trunk/Sage/h/defines.h
deleted file mode 100644
index 0a0f6be..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/defines.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/* label type codes */
-
-#define LABUNKNOWN	0
-#define LABEXEC		1
-#define LABFORMAT	2
-#define LABOTHER	3
-
-
-/* parser states */
-
-#define OUTSIDE 0
-#define INSIDE	1
-#define INDCL	2
-#define INDATA	3
-#define INEXEC	4
-
-/* nesting states */
-#define IN_OUTSIDE 4
-#define IN_MODULE 3
-#define IN_PROC   2
-#define IN_INTERNAL_PROC 1
-
-/* Control stack type */
-
-#define CTLIF 0
-#define CTLELSEIF 1
-#define CTLELSE 2
-#define CTLDO 3
-#define CTLALLDO 4
-
-
-/* name classes -- vclass values */
-
-#define CLUNKNOWN 0
-#define CLPARAM 1
-#define CLVAR 2
-#define CLENTRY 3
-#define CLMAIN 4
-#define CLBLOCK 5
-#define CLPROC 6
-#define CLNAMELIST 7
-
-/* These are tobe used in decl_stat field of symbol */
-#define SOFT 0   /* Canbe Redeclared */
-#define HARD 1   /* Not allowed to redeclre */
-
-/* Attributes (used in attr) */
-#define ATT_CLUSTER 0
-#define ATT_GLOBAL  1
-
-#define SECTION_SUBSCRIPT 1
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/defs.h b/projects/dvm_svn/fdvm/trunk/Sage/h/defs.h
deleted file mode 100644
index 66ec91f..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/defs.h
+++ /dev/null
@@ -1,131 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#include "tag"
-
-#define hashMax		1007   /*max hash table size */
-
-/**************** variant tags for dependence nodes *********************/
-
-#define DEP_DIR         0200	/* direction vector information only */
-#define DEP_DIST        0000	/* direction and distance vector */
-
-#define NO_ALL_ST_DEP   0010    /* no all statiionary dir for this pair of statements */
-#define DEP_CROSS       0100	/* dependence MUST wrap around loop */
-#define DEP_UNCROSS     0000	/* dependence MAY not wrap around loop */
-
-#define DEP_FLOW        0
-#define DEP_ANTI        1
-#define DEP_OUTPUT      2
-
-/************************************************************************/
-
-typedef struct bfnd	*PTR_BFND;
-typedef struct llnd	*PTR_LLND;
-typedef struct blob	*PTR_BLOB;
-//typedef struct string	*PTR_STRING;
-typedef struct symb	*PTR_SYMB;
-typedef struct hash_entry *PTR_HASH;
-typedef struct data_type  *PTR_TYPE;
-typedef struct dep	*PTR_DEP;
-typedef struct sets	*PTR_SETS;
-typedef struct def	*PTR_DEF;
-typedef struct deflst	*PTR_DEFLST;
-typedef struct Label	*PTR_LABEL;
-typedef struct cmnt     *PTR_CMNT;
-typedef struct file_name *PTR_FNAME;
-typedef struct prop_link *PTR_PLNK;
-
-struct blob {
-	PTR_BFND  ref;
-	PTR_BLOB  next;
-}; 
-
-
-struct Label {
-	int		id;		/* identification tag */
-	PTR_BFND 	scope;		/* level at which ident is declared */
-	PTR_BLOB	ud_chain;	/* use-definition chain */
-	unsigned	labused :1;	/* if it's been referenced */
-	unsigned	labinacc:1;	/* illegal use of this label */
-	unsigned	labdefined:1;	/* if this label been defined */
-	unsigned	labtype:2;	/* UNKNOWN, EXEC, FORMAT, and OTHER */
-	long		stateno;	/* statement label */
-	PTR_LABEL	next;		/* point to next label entry */
-	PTR_BFND	statbody;	/* point to body of statement */
-	PTR_SYMB	label_name;	/* label name for VPC++       */
-					/* The variant will be LABEL_NAME */
-};
-
-
-struct Ctlframe	{
-	int		ctltype;	/* type of control frame */
-	int		level;		/* block level */
-	int		dolabel;	/* DO loop's end label */
-	PTR_SYMB	donamep;	/* DO loop's control variable name */
-	PTR_SYMB	block_list;	/* start of local decl */
-	PTR_SYMB	block_end;	/* end of local decl */
-	PTR_BFND	loop_hedr;	/* save the current loop header */
-	PTR_BFND	header;		/* header of the block */
-	PTR_BFND	topif;		/* keep track of if header */
-	struct Ctlframe *next;	 	/* thread */
-};
-
-struct cmnt {
-	int id;
-	int type;
-        int counter;                     /* New Added for VPC++ */
-	char* string;
-	struct cmnt *next;
-	struct cmnt *thread;
-};
-
-
-struct file_name {		/* for keep source filenames in the project */
-	int id;
-	char *name;
-	PTR_FNAME next;
-};
-
-
-#define NO	   0
-#define YES	   1
-#ifndef FALSE
-#  define FALSE	   0
-#endif
-#ifndef TRUE
-#  define TRUE	   1
-#endif
-#define BOOL	 int
-#define EOL 	  -1
-#define SAME_GROUP 0
-#define NEW_GROUP1 1
-#define NEW_GROUP2 2
-#define FULL       0
-#define HALF       1
-
-#define DEFINITE	1
-#define DEFINITE_SAME	7
-#define DEFINITE_DIFFER	0
-#define FIRST_LARGER	2
-#define SECOND_LARGER	4
-
-
-/*
- * Tags for various languages
- */
-#define ForSrc	0	/* This is a Fortran program */
-#define CSrc	1	/* This is a C program */
-#define BlaSrc	2	/* This is a Blaze program */
-
-
-#define BFNULL		(PTR_BFND) 0
-#define LLNULL		(PTR_LLND) 0
-#define BLNULL		(PTR_BLOB) 0
-#define SMNULL		(PTR_SYMB) 0
-#define HSNULL		(PTR_HASH) 0
-#define TYNULL		(PTR_TYPE) 0
-#define LBNULL		(PTR_LABEL)0
-#define CMNULL          (PTR_CMNT)0
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/dep.h b/projects/dvm_svn/fdvm/trunk/Sage/h/dep.h
deleted file mode 100644
index 281cb2a..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/dep.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/************************************************************************/
-/*									*/
-/*			    DEPENDENCE NODES				*/
-/*									*/
-/************************************************************************/
-
-# define    MAX_LP_DEPTH       10
-# define    MAX_DEP     (MAX_LP_DEPTH+1)
-
-struct ref { /* reference of a variable */
-    PTR_BFND  stmt;  /* statement containing reference */
-    PTR_LLND  refer; /* pointer to the actual reference */
-    } ;
-
-
-struct dep { /* data dependencies */
-
-    int id;	/* identification for reading/writing */
-    PTR_DEP thread;
-
-    char     type;		  /* flow-, output-, or anti-dependence */
-    char     direct[MAX_DEP];	  /* direction/distance vector */
-
-    PTR_SYMB   symbol;		  /* symbol table entry */
-    struct ref from;		  /* tail of dependence */
-    struct ref to;		  /* head of dependence */
-    PTR_BFND from_hook, to_hook;  /* bifs where dep is hooked in */
-
-    PTR_DEP  from_fwd, from_back; /* list of dependencies going to tail */
-    PTR_DEP  to_fwd, to_back;     /* list of dependencies going to head */
-
-    } ;
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/dep_str.h b/projects/dvm_svn/fdvm/trunk/Sage/h/dep_str.h
deleted file mode 100644
index 1ef42a2..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/dep_str.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/****************************************************************
- *								*
- *	 Structure of the dep files generated by parsers	*
- *								*
- ****************************************************************/
-
-/*#include <sys/types.h>
- */
-#ifndef MAX_DEP
-#include dep.h
-#endif
-
-#include "compatible.h"
-/*#ifdef NO_u_short
- *#ifndef DEF_USHORT
- *#define DEF_USHORT 1
- */
-
-
-
-
-
-typedef unsigned int u_shrt;
-/*#endif
-#endif
- */
-
-#define D_MAGIC	0420
-
-struct preamble {		/* structure of preamble of dep file */
-        u_shrt ptrsize;        /* bit length of pointers (32 or 64) phb */
-	u_shrt language;	/* source language type */
-	u_shrt  num_blobs;	/* number of blob nodes */
-	u_shrt num_bfnds;	/* number of bif nodes */
-	u_shrt num_llnds;	/* number of low level nodes */
-	u_shrt num_symbs;	/* number of symbol nodes */
-	u_shrt num_types;	/* number of type nodes */
-	u_shrt num_label;	/* number of label nodes */
-	u_shrt num_dep;	/* number of dep nodes */
-	u_shrt num_cmnts;	/* number of comment nodes */
-	u_shrt num_files;	/* number of filename nodes */
-	u_shrt global_bfnd;	/* id of the global bif node */
-};
-
-
-struct locs {
-	long llnd;		/* offset of llnd in the dep file */
-	long symb;		/* 	     symbol nodes	  */
-	long type;		/*	     type nodes		  */
-	long labs;		/*	     label nodes	  */
-	long cmnt;		/*	     comment nodes	  */
-	long file;		/*	     filename nodes	  */
-	long deps;		/*	     dep nodes		  */
-	long strs;		/*	     string tables	  */
-};
-
-struct bf_nd {			/* structure of bif node in dep file */
-	u_shrt id;		/* id of this bif node */
-	u_shrt variant;	/* type of this bif node */
-	u_shrt cp;		/* control parent of this node */
-	u_shrt bf_ptr1;
-	u_shrt cmnt_ptr;
-	u_shrt symbol;
-	u_shrt ll_ptr1;
-	u_shrt ll_ptr2;
-	u_shrt ll_ptr3;
-	u_shrt dep_ptr1;
-	u_shrt dep_ptr2;
-	u_shrt label;
-	u_shrt lbl_ptr;
-	u_shrt g_line;
-	u_shrt l_line;
-        u_shrt decl_specs;
-	u_shrt filename;
-};
-
-
-struct ll_nd {
-	u_shrt id;
-	u_shrt variant;
-	u_shrt type;
-};
-
-
-struct sym_nd {
-	u_shrt id;
-	u_shrt variant;
-	u_shrt type;
-	u_shrt attr;
-	u_shrt next;
-	u_shrt scope;
-	u_shrt ident;
-};
-
-
-struct typ_nd {
-	u_shrt id;
-	u_shrt variant;
-	u_shrt name;
-};
-
-
-struct lab_nd {
-	u_shrt id;
-	u_shrt labtype;
-	u_shrt body;
-	u_shrt name;
-	long	stat_no;
-};
-
-
-struct fil_nd {
-	u_shrt id;
-	u_shrt name;
-};
-
-
-struct cmt_nd {
-	u_shrt id;
-	u_shrt type;
-	u_shrt next;
-	u_shrt str;
-};
-
-
-struct dep_nd {
-	u_shrt id;
-	u_shrt type;
-	u_shrt sym;
-	u_shrt from_stmt;
-	u_shrt from_ref;
-	u_shrt to_stmt;
-	u_shrt to_ref;
-	u_shrt from_hook;
-	u_shrt to_hook;
-	u_shrt from_fwd;
-	u_shrt from_back;
-	u_shrt to_fwd;
-	u_shrt to_back;
-	u_shrt dire[MAX_DEP];
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/dep_struct.h b/projects/dvm_svn/fdvm/trunk/Sage/h/dep_struct.h
deleted file mode 100644
index 7822bbc..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/dep_struct.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/****************************************************************
- *								*
- *	 Structure of the dep files generated by parsers	*
- *								*
- ****************************************************************/
-
-/*#include <sys/types.h>
- */
-#ifndef MAX_DEP
-#include dep.h
-#endif
-
-#include "compatible.h"
-/*#ifdef NO_u_short
- *#ifndef DEF_USHORT
- *#define DEF_USHORT 1
- */
-
-
-
-
-
-/*typedef unsigned int u_short;*/
-/*#endif
-#endif
- */
-
-#define D_MAGIC	0420
-
-struct preamble {		/* structure of preamble of dep file */
-        u_short ptrsize;        /* bit length of pointers (32 or 64) phb */
-	u_short language;	/* source language type */
-	u_short num_blobs;	/* number of blob nodes */
-	u_short num_bfnds;	/* number of bif nodes */
-	u_short num_llnds;	/* number of low level nodes */
-	u_short num_symbs;	/* number of symbol nodes */
-	u_short num_types;	/* number of type nodes */
-	u_short num_label;	/* number of label nodes */
-	u_short num_dep;	/* number of dep nodes */
-	u_short num_cmnts;	/* number of comment nodes */
-	u_short num_files;	/* number of filename nodes */
-	u_short global_bfnd;	/* id of the global bif node */
-};
-
-
-struct locs {
-	long llnd;		/* offset of llnd in the dep file */
-	long symb;		/* 	     symbol nodes	  */
-	long type;		/*	     type nodes		  */
-	long labs;		/*	     label nodes	  */
-	long cmnt;		/*	     comment nodes	  */
-	long file;		/*	     filename nodes	  */
-	long deps;		/*	     dep nodes		  */
-	long strs;		/*	     string tables	  */
-};
-
-struct bf_nd {			/* structure of bif node in dep file */
-	u_short id;		/* id of this bif node */
-	u_short variant;	/* type of this bif node */
-	u_short cp;		/* control parent of this node */
-	u_short bf_ptr1;
-	u_short cmnt_ptr;
-	u_short symbol;
-	u_short ll_ptr1;
-	u_short ll_ptr2;
-	u_short ll_ptr3;
-	u_short dep_ptr1;
-	u_short dep_ptr2;
-	u_short label;
-	u_short lbl_ptr;
-	u_short g_line;
-	u_short l_line;
-        u_short decl_specs;
-	u_short filename;
-};
-
-
-struct ll_nd {
-	u_short id;
-	u_short variant;
-	u_short type;
-};
-
-
-struct sym_nd {
-	u_short id;
-	u_short variant;
-	u_short type;
-	u_short attr;
-	u_short next;
-	u_short scope;
-	u_short ident;
-};
-
-
-struct typ_nd {
-	u_short id;
-	u_short variant;
-	u_short name;
-};
-
-
-struct lab_nd {
-	u_short id;
-	u_short labtype;
-	u_short body;
-	u_short name;
-	long	stat_no;
-};
-
-
-struct fil_nd {
-	u_short id;
-	u_short name;
-};
-
-
-struct cmt_nd {
-	u_short id;
-	u_short type;
-	u_short next;
-	u_short str;
-};
-
-
-struct dep_nd {
-	u_short id;
-	u_short type;
-	u_short sym;
-	u_short from_stmt;
-	u_short from_ref;
-	u_short to_stmt;
-	u_short to_ref;
-	u_short from_hook;
-	u_short to_hook;
-	u_short from_fwd;
-	u_short from_back;
-	u_short to_fwd;
-	u_short to_back;
-	u_short dire[MAX_DEP];
-};
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/elist.h b/projects/dvm_svn/fdvm/trunk/Sage/h/elist.h
deleted file mode 100644
index 79885cb..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/elist.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-struct ELIST_rec
-       {
-	  int type; /* 0 for int, 1 for string, 2 for ELIST */
-	  char * car;
-	  struct ELIST_rec * cdr;
-       };
-
-#define TEINT 0
-#define TESTRING 1
-#define TELIST 2
-
-typedef struct ELIST_rec * ELIST;
-
-
-/* 
-   the following two defines are pretty bad. But have been done so as to
-   avoid globals which look like global variables. For these to go away
-   libdb.a has to change.
-*/
-#define currentFile cur_file
-#define currentProject cur_proj
-
-extern PTR_FILE currentFile;    /* actually cur_file */
-extern PTR_PROJ currentProject; /* actually cur_proj */
-
-#ifndef TRUE
-#  define TRUE 1
-#endif
-#ifndef FALSE
-#  define FALSE 0
-#endif
-
-/* functions that are used within the cbaselib */
-ELIST ENew( /* etype */ );
-void EFree( /* e */ );
-ELIST ECopy( /* e */ );
-ELIST ECpCar( /* e */ );
-ELIST ECpCdr( /* e */ );
-ELIST EAppend( /* e1, e2 */ );
-ELIST EString( /* s */ );
-ELIST ENumber( /* n */ );
-ELIST ECons( /* e1, e2 */ );
-int ENumP(/*e*/);
-int EStringP(/*e*/);
-int EListP(/*e*/);
-
-#define ECar(x) ((x)->car)
-#define ECdr(x) ((x)->cdr)
-#define ECaar(x) (ECar((ELIST)ECar(x)))
-#define ECdar(x) (ECdr((ELIST)ECar(x)))
-#define ECadr(x) (ECar(ECdr(x)))
-#define ECddr(x) (ECdr(ECdr(x)))
-
-#define ECaaar(x) (ECar((ELIST)ECaar(x)))
-#define ECdaar(x) (ECdr((ELIST)ECaar(x)))
-#define ECadar(x) (ECar(ECdar(x)))
-#define ECaadr(x) (ECar((ELIST)ECadr(x)))
-#define ECaddr(x) (ECar(ECddr(x)))
-#define ECddar(x) (ECdr(ECdar(x)))
-#define ECdadr(x) (ECdr((ELIST)ECadr(x)))
-#define ECdddr(x) (ECdr(ECddr(x)))
-
-char *Allocate(/* size */);
-
-PTR_BFND FindCurrBifNode( /* id */ );
-PTR_LLND FindLLNode( /* id */ );
-PTR_LABEL FindLabNode(/* id */);
-PTR_SYMB FindSymbolNode(/* id */);
-PTR_TYPE FindTypeNode(/* id */);   
-PTR_FILE FindFileObj(/* filename */);
-PTR_DEP FindDepNode(/* id */); 
-PTR_BFND MakeDeclStmt(/* s */);
-int VarId(/* id */);
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/f90.h b/projects/dvm_svn/fdvm/trunk/Sage/h/f90.h
deleted file mode 100644
index 958120a..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/f90.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* The following 16 different options are used to
-   declare variables are as follows:
-   ( stored in symptr->attr )                      */
-
-#define ALLOCATABLE_BIT		1
-#define DIMENSION_BIT		2
-#define EXTERNAL_BIT		8
-#define IN_BIT			16
-#define INOUT_BIT	        32
-#define INTRINSIC_BIT	        64
-#define OPTIONAL_BIT		128
-#define OUT_BIT			256
-#define PARAMETER_BIT		512
-#define POINTER_BIT		1024
-#define PRIVATE_BIT		2048
-#define PUBLIC_BIT		4096
-#define SAVE_BIT		8192
-#define SEQUENCE_BIT		16384
-#define RECURSIVE_BIT		32768
-#define TARGET_BIT		65536
-#define PROCESSORS_BIT		131072
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/fixcray.h b/projects/dvm_svn/fdvm/trunk/Sage/h/fixcray.h
deleted file mode 100644
index adaa0fb..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/fixcray.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-#    ifdef CRAY-C90
-      extern void *calloc();
-#     define CALLOC_DEF
-#    endif
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/fm.h b/projects/dvm_svn/fdvm/trunk/Sage/h/fm.h
deleted file mode 100644
index 520a9bd..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/fm.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/* FORTRAN M additions */
-
-#define PLAIN	0
-#define LCTN	1
-#define SUBM	2
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/head b/projects/dvm_svn/fdvm/trunk/Sage/h/head
deleted file mode 100644
index 333fa33..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/head
+++ /dev/null
@@ -1,2 +0,0 @@
-/* don't modify this file directly, it is made by a clever 'sed'
-script using "tag".  Run make tag.h to regenerate this file */
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/leak_detector.h b/projects/dvm_svn/fdvm/trunk/Sage/h/leak_detector.h
deleted file mode 100644
index d26beac..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/leak_detector.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#ifdef _WIN32
-#ifdef _DEBUG
-
-#define _CRTDBG_MAP_ALLOC 
-#include <stdlib.h> 
-#include <crtdbg.h>  
-
-#ifdef _DEBUG 
-	#ifndef DBG_NEW 
-		#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
-		#define new DBG_NEW 
-	#endif 
-#endif 
-
-#endif
-#endif
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/list.h b/projects/dvm_svn/fdvm/trunk/Sage/h/list.h
deleted file mode 100644
index 4172c53..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/list.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-
-#define BIFNDE 0
-#define DEPNDE 1
-#define LLNDE 2
-#define SYMNDE 3
-#define LISNDE 4
-#define BIFLISNDE 5
-#define UNUSED -1
-#define NUMLIS 100
-#define DEPARC  1
-#define MAXGRNODE 50
-
-typedef struct lis_node *LIST;
-
-struct lis_node {
-	int variant; /* one of BIFNDE, BIFLISNDE, DEPNDE, LLNDE, SYMNDE, LISNDE */
-	union list_union {
-		PTR_BFND bfnd;
-		PTR_BLOB biflis;
-		PTR_DEP dep;
-		PTR_LLND llnd;
-		PTR_SYMB symb;
-		LIST lisp;
-		} entry;
-	LIST next;
-	} ;
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/ll.h b/projects/dvm_svn/fdvm/trunk/Sage/h/ll.h
deleted file mode 100644
index a29f48d..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/ll.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/************************************************************************/
-/*									*/
-/*			  low level nodes				*/
-/*									*/
-/************************************************************************/
-
-struct llnd {
-
-    int		variant, id;   /* variant and identification tags */
-
-    PTR_LLND	thread;	   /* connects nodes together by allocation order */
-
-    PTR_TYPE	type;	   /* to be modified */
-
-    union llnd_union {
-
-	char *string_val;/* for integers floats doubles and strings*/
-	int	ival;
-	double	dval;	    /* for floats and doubles */
-	char	cval;
-	int	bval;	    /* for booleans */
-
-	struct {			/* for range, upper, and lower */
-		PTR_SYMB  symbol;
-		int	  dim;
-	       }					array_op;
-
-	struct {
-		PTR_SYMB  symbol;
-
-		PTR_LLND  ll_ptr1;
-		PTR_LLND  ll_ptr2;
-	       }					Template;
-
-	struct {	    /* for complexes and double complexes */
-		PTR_SYMB  null;
-
-		PTR_LLND  real_part;
-		PTR_LLND  imag_part;
-	       }					complex;
-
-	struct {
-		PTR_LABEL lab_ptr;
-
-		PTR_LLND  null_1;
-		PTR_LLND  next;
-	       }					label_list;
-
-	struct {
-		PTR_SYMB  null_1;
-
-		PTR_LLND  item; 
-		PTR_LLND  next;
-	       }					list;
-
-	struct {
-		PTR_SYMB  null_1;
-
-		PTR_LLND  size;
-		PTR_LLND  list;
-	       }					cons;
-	
-	struct {
-		PTR_SYMB  control_var;
-		   
-		PTR_LLND  array;
-		PTR_LLND  range;
-	       }					access;
-
-	struct {
-		PTR_SYMB  control_var;
-
-		PTR_LLND  array;
-		PTR_LLND  range;
-	       }					ioaccess;
-
-	struct {
-		PTR_SYMB  symbol;
-
-		PTR_LLND  null_1;
-		PTR_LLND  null_2;
-	       }					const_ref;
-
-	struct {
-		PTR_SYMB  symbol;
-
-		PTR_LLND  null_1;
-		PTR_LLND  null_2;
-	       }					var_ref;
-
-	struct {
-		PTR_SYMB  symbol;
-
-		PTR_LLND  index;
-		PTR_LLND  array_elt;
-	       }					array_ref;
-
-	struct {
-		PTR_SYMB  null_1;
-
-		PTR_LLND  access;
-		PTR_LLND  index;
-	       }					access_ref;
-
-	struct {
-		PTR_SYMB  null_1;
-
-		PTR_LLND  cons;
-		PTR_LLND  index;
-	       }					cons_ref;
-
-	struct {
-		PTR_SYMB  symbol;
-
-		PTR_LLND  null_1;
-		PTR_LLND  rec_field;  /* for record fields */
-	       }					record_ref; 
-
-
-	struct {
-		PTR_SYMB  symbol;
-
-		PTR_LLND  param_list;
-		PTR_LLND  next_call;
-	       }					proc;
-
-	struct {
-		PTR_SYMB  null_1;
-
-		PTR_LLND  operand;  
-		PTR_LLND  null_2;
-	       }					unary_op; 
-
-	struct {
-		PTR_SYMB  null_1;
-
-		PTR_LLND  l_operand;
-		PTR_LLND  r_operand;
-	       }					binary_op;
-
-	struct {
-		PTR_SYMB  null_1;
-
-		PTR_LLND  ddot;
-		PTR_LLND  stride;
-	       }					seq;
-
-	struct {
-		PTR_SYMB  null_1;
-
-		PTR_LLND  sp_label;
-		PTR_LLND  sp_value;
-	       }					spec_pair;
-
-    } entry;
-};
-
-#define __LL_DEF__
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/prop.h b/projects/dvm_svn/fdvm/trunk/Sage/h/prop.h
deleted file mode 100644
index f7451f2..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/prop.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/****************************************************************
- *								*
- *		Definitions for the property list 		*
- *								*
- ****************************************************************/
-
-#ifndef __PROP__
-
-typedef struct prop_link *PTR_PLNK;
-struct prop_link {
-	char	*prop_name;	/* property name */
-	char	*prop_val;	/* property value */
-	PTR_PLNK next;		/* point to the next property list */
-};
-
-#define __PROP__
-
-#endif
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/sage.h b/projects/dvm_svn/fdvm/trunk/Sage/h/sage.h
deleted file mode 100644
index 8463cde..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/sage.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* Standard include file for all sage products (phb) */
-
-/* include it only once... */
-#ifndef SAGE_H
-#define SAGE_H
- 
-#include "version.h"
-#include "sageroot.h"
-#include "sagearch.h"
-
-#define SAGE_INFO "'finger sage@cica.indiana.edu' for more information.\n \
-Send bug reports to sage-bugs@cica.indiana.edu\n"
-
-#endif
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/sagearch.h b/projects/dvm_svn/fdvm/trunk/Sage/h/sagearch.h
deleted file mode 100644
index fcb11de..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/sagearch.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define SAGE_iris4d
-#define SAGE_ARCH iris4d
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/sageroot.h b/projects/dvm_svn/fdvm/trunk/Sage/h/sageroot.h
deleted file mode 100644
index 9828210..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/sageroot.h
+++ /dev/null
@@ -1 +0,0 @@
-#define SAGEROOT "/usr/people/podd/sage"
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/sets.h b/projects/dvm_svn/fdvm/trunk/Sage/h/sets.h
deleted file mode 100644
index 8a393ae..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/sets.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-# define    MAX_LP_DEPTH       10
-# define    MAX_DEP	11
- 
-struct ref { /* reference of a variable */
-    PTR_BFND  stmt;  /* statement containing reference */
-    PTR_LLND  refer; /* pointer to the actual reference */
-    } ;
- 
-struct refl {
-    PTR_SYMB id;
-    struct ref * node;
-    struct refl * next;
- };
- 
-typedef struct refl * PTR_REFL;
-
-/* Added by Mannho from here */
-
-struct aref {
-   PTR_SYMB id;
-   PTR_LLND decl_ranges;
-   PTR_LLND use_bnd0; /* undecidable list because index with variables */
-   PTR_LLND mod_bnd0;
-   PTR_LLND use_bnd1; /* decidable with induction variables */
-   PTR_LLND mod_bnd1;
-   PTR_LLND use_bnd2; /* decidable with only constants */
-   PTR_LLND mod_bnd2;
-   struct aref *next;
-};
-
-typedef struct aref *PTR_AREF;
-
-/* Added by Mannho to here */
-
-struct sets {
-	PTR_REFL gen;	 /* local attribute */
-	PTR_REFL in_def; /* inhereted attrib */
-	PTR_REFL use;	/* local attribute */
-	PTR_REFL in_use; /* inherited attrib */
-	PTR_REFL out_def; /* synth. attrib  */
-	PTR_REFL out_use; /* synth. attrib  */
-	PTR_AREF arefl;   /* array reference */
-	};
- 
- 
-struct dep { /* data dependencies */
- 
-    int id;	/* identification for reading/writing */
-    PTR_DEP thread;
- 
-    char     type;	 /* flow-, output-, or anti-dependence */
-    char     direct[MAX_DEP]; /* direction/distance vector */
- 
-    PTR_SYMB   symbol; /* symbol table entry */
-    struct ref from;   /* tail of dependence */
-    struct ref to;     /* head of dependence */
- 
-    PTR_DEP  from_fwd, from_back; /* list of dependencies going to tail */
-    PTR_DEP  to_fwd, to_back;	  /* list of dependencies going to head */
- 
-    } ;
- 
-#define AR_DIM_MAX 5
-#define MAX_NEST_DEPTH 10
- 
-struct subscript{
-	int decidable;	/* if 1 then analysis is ok. if 2 then vector range */
-			/* if it is 0 it is not analizable.		    */
-	PTR_LLND parm_exp; /* this is a symbolic expression involving	    */
-			   /* procedure parameters or common variables.     */
-	int offset;	   /* This is the constant term in a linear form    */
-	PTR_LLND vector;   /* pointer to ddot for vector range		    */
-	int coefs[MAX_NEST_DEPTH];  /* if coef[2] = 3 then the second */
-				    /* level nesting induction var has*/
-				    /* coef 3 in this position.       */
-	PTR_LLND coefs_symb[MAX_NEST_DEPTH];
-			   /* if coefs[2] is not null then this is the*/
-			   /* pointer to a symbolic coef. in terms of */
-			   /* procedure parameters, globals or commons*/
-	};
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/symb.h b/projects/dvm_svn/fdvm/trunk/Sage/h/symb.h
deleted file mode 100644
index d2c4adf..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/symb.h
+++ /dev/null
@@ -1,225 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/* VPC Version modified by Jenq-Kuen Lee Nov 15 , 1987 */
-/* Original Filename : symb.h			       */
-/* New filename	     : vsymb.h			       */
-
-/************************************************************************
- *									*
- *		      hash and symbol table entries			*
- *									*
- ************************************************************************/
-
-
-struct hash_entry
-   {
-    char *ident;
-    struct hash_entry *next_entry;
-    PTR_SYMB id_attr;
-   };
-
-struct symb {
-    int		variant;
-    int		id;
-    char	*ident;
-    struct hash_entry *parent;
-    PTR_SYMB	outer;		/* pointer to symbol in enclosing block */
-    PTR_SYMB	next_symb;	/* pointer to next symbol in same block */
-    PTR_SYMB	id_list;	/* used for making lists of ids */
-    PTR_SYMB	thread;		/* list of all allocated symbol pointers */
-    PTR_TYPE	type;		/* data type of this identifier */
-    PTR_BFND	scope;		/* level at which ident is declared */
-    PTR_BLOB	ud_chain;	/* use_definition chain */
-    int		attr;		/* attributes of the variable */
-    int		dovar;		/* set if used as loop's control variable */
-    int		decl;		/* field that the parser use in keeping track
-				   of declarations */
-
-    union symb_union {
-	PTR_LLND  const_value;	/* for constants */
-
-	struct {		/* for enum-field and record field */
-		int tag;
-		int offset;    
-		PTR_SYMB declared_name ;   /* used for friend construct */
-		PTR_SYMB next;
-		PTR_SYMB  base_name; /* name of record or enumerated type */
-		PTR_LLND  restricted_bit ;  /* Used by VPC++ for restricted bit number */
-	} field;
-
-	struct {		/* for variant fields */
-		int tag;
-		int offset;
-		PTR_SYMB next;
-		PTR_SYMB base_name;
-		PTR_LLND variant_list;
-	} variant_field;
-
-	
-	struct {		/* for program */
-		PTR_SYMB   symb_list;
-		PTR_LABEL  label_list;
-		PTR_BFND   prog_hedr;
-	} prog_decl;
-
-	struct {		/* for PROC */
-		int	   seen;
-		int	   num_input,  num_output,  num_io;
-		PTR_SYMB   in_list;
-		PTR_SYMB   out_list;
-		PTR_SYMB   symb_list;
-		int	   local_size;
-		PTR_LABEL  label_list;
-		PTR_BFND   proc_hedr;
-		PTR_LLND   call_list;
-	} proc_decl;
-
-	struct {		/* for FUNC */
-		int	   seen;
-		int	   num_input,  num_output,  num_io;
-		PTR_SYMB   in_list;
-		PTR_SYMB   out_list;
-		PTR_SYMB   symb_list;
-		int	   local_size;
-		PTR_LABEL  label_list;
-		PTR_BFND   func_hedr;
-		PTR_LLND   call_list;
-	} func_decl;
-
-	struct {		/* for variable declaration */
-		 int	   local;    /* local or input or output or both param*/
-	         int	   num1,  num2, num3 ; /*24.02.03*/
-		 PTR_SYMB  next_out; /* for list of output parameters*//*perestanovka c next_out *24.02.03*/
-		 PTR_SYMB  next_in;  /* for list of input parameters*/
-		 int	   offset;
-		 int	   dovar;    /* set if being used as DO control var */
-	} var_decl;
-       
-	struct {
-		int	   seen ;
-		int	   num_input,  num_output, num_io ;
-		PTR_SYMB   in_list ;
-		PTR_SYMB   out_list ;
-		PTR_SYMB   symb_list;
-		int	   local_size;
-		PTR_LABEL  label_list ;
-		PTR_BFND   func_hedr ;
-		PTR_LLND   call_list ;
-				      /* the following information for field */
-		int	   tag ;
-		int	   offset ;
-		PTR_SYMB   declared_name; /* used for friend construct */
-		PTR_SYMB   next ;
-		PTR_SYMB   base_name ;
-				      /* the following is newly added */
-
-	} member_func	    ;	      /* New  one for VPC */
-
-
-	/* an attempt to unify the data structure   */
-	struct {
-		int	   seen ;
-		int	   num_input,  num_output, num_io ;
-		PTR_SYMB   in_list ;
-		PTR_SYMB   out_list ;
-		PTR_SYMB   symb_list;
-		int	   local_size;
-		PTR_LABEL  label_list ;
-		PTR_BFND   func_hedr ;
-		PTR_LLND   call_list ;
-				      /* the following information for field */
-		int	   tag ;
-		int	   offset ;
-		PTR_SYMB   declared_name; /* used for friend construct */
-		PTR_SYMB   next ;
-		PTR_SYMB   base_name ;
-
-				      /* the following is newly added */
-	} Template	;	      /* New  one for VPC */
-
-    } entry;
-};
-
-struct data_type {
-    int variant;
-    int id;
-    int length;
-    PTR_TYPE	thread;		/* list of all allocated symbol pointers */
-    PTR_SYMB	name;		/* type name */
-    PTR_BLOB	ud_chain;	/* use_definition chain */
-    union type_union {
-  /* no entry needed for T_INT, T_CHAR, T_FLOAT, T_DOUBLE, T_VOID T_BOOL */
-
-
-
-	struct {		/* for T_SUBRANGE */
-	    PTR_TYPE base_type;	/* = to T_INT, T_CHAR, T_FLOAT */
-	    PTR_LLND lower, upper;
-	} subrange;
-
-	struct {		/* for T_ARRAY */
-	    PTR_TYPE base_type; /* New order   */
-	    int num_dimensions;
-	    PTR_LLND ranges;
-	} ar_decl;
-
-	struct {
-	    PTR_TYPE base_type ;
-	    int	 dummy1;
-	    PTR_LLND ranges    ;
-	    PTR_LLND kind_len  ;
-	    int	 dummy3;
-	    int	 dummy4;
-	    int	 dummy5;
-	}  Template ;		/* for T_DESCRIPT,T_ARRAY,T_FUNCTION,T_POINTER */
-	PTR_TYPE base_type;	/* for T_LIST */
-
-	struct {		/* for T_RECORD or T_ENUM */
-	    int num_fields;
-	    int record_size;
-	    PTR_SYMB first;
-	} re_decl;
-				/* the following is added fro VPC */
-       
-         struct {
-            PTR_SYMB symbol;
-            PTR_SYMB scope_symbol;
-        } derived_type ; /* for type name deriving type */
-
-	struct {		/* for class T_CLASS T_UNION T_STRUCT */
-	    int num_fields;
-	    int record_size;
-	    PTR_SYMB first;
-	    PTR_BFND original_class ;
-	    PTR_TYPE base_type;	/* base type or inherited collection */
-	} derived_class ;
-
-	struct {		/* for class T_DERIVED_TEMPLATE   */
-	    PTR_SYMB templ_name;
-	    PTR_LLND args;	/* argument list for templ */
-	} templ_decl ;
-
-			        /* for T_MEMBER_POINTER and */
-	struct {		/* for class T_DERIVED_COLLECTION   */
-	    PTR_SYMB collection_name;
-	    PTR_TYPE base_type;	/* base type or inherited collection */
-	} col_decl ;
-
-	struct {		/* for T_DESCRIPT */
-	    PTR_TYPE  base_type ;
-	    int signed_flag ;
-	    PTR_LLND ranges    ;
-	    int long_short_flag ;
-	    int mod_flag ;
-	    int storage_flag;
-	    int access_flag;
-	 } descriptive ;       
-	    
-    } entry;
-}; 
-
-
-#define __SYMB_DEF__
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/symblob.h b/projects/dvm_svn/fdvm/trunk/Sage/h/symblob.h
deleted file mode 100644
index 945b9a0..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/symblob.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-
-
-typedef struct sblob *PTR_SBLOB;
-
-struct  sblob  { PTR_SYMB  symb;
-	             PTR_SBLOB next;
-	           };
-
-struct  sblob  syms[100];
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/tag b/projects/dvm_svn/fdvm/trunk/Sage/h/tag
deleted file mode 100644
index 343d1f5..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/tag
+++ /dev/null
@@ -1,628 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
- 
-/******************* variant tags for bif nodes **********************/
-
-#define GLOBAL			100
-#define PROG_HEDR		101
-#define PROC_HEDR		102
-#define BASIC_BLOCK		103
-#define CONTROL_END		104
-#define IF_NODE			105
-#define LOOP_NODE		106
-#define FOR_NODE		107
-#define FORALL_NODE		108
-#define WHILE_NODE		109
-#define EXIT_NODE		110
-#define ASSIGN_STAT		111
-#define M_ASSIGN_STAT		112
-#define PROC_STAT		113
-#define SUM_ACC			114	/* accumulation statements */
-#define MULT_ACC		115
-#define MAX_ACC			116
-#define MIN_ACC			117
-#define CAT_ACC			118
-#define OR_ACC			119
-#define AND_ACC			120
-#define READ_STAT		121
-#define WRITE_STAT		122
-#define OTHERIO_STAT		123
-#define CDOALL_NODE		124
-#define SDOALL_NODE		125
-#define DOACROSS_NODE		126
-#define CDOACROSS_NODE		127
-#define DVM_INTERVAL_DIR	128  /* DVM-F */
-#define DVM_ENDINTERVAL_DIR	129  /* DVM-F */
-#define FUNC_HEDR		130
-#define WHERE_NODE		131
-#define ALLDO_NODE		132
-#define IDENTIFY		133
-#define FORMAT_STAT		134
-#define STOP_STAT		135
-#define RETURN_STAT		136
-#define ELSEIF_NODE		137
-#define ARITHIF_NODE		138
-#define GOTO_NODE		139
-#define ASSGOTO_NODE		140
-#define COMGOTO_NODE		141
-#define PAUSE_NODE		142
-#define STOP_NODE		143
-#define ASSLAB_STAT		144
-#define LOGIF_NODE		145
-#define DVM_DEBUG_DIR		146  /* DVM-F */
-#define DVM_ENDDEBUG_DIR	147  /* DVM-F */
-#define DVM_TRACEON_DIR		148  /* DVM-F */
-#define DVM_TRACEOFF_DIR	149  /* DVM-F */
-#define BLOB			150
-#define SIZES			151
-#define COMMENT_STAT		152
-#define CONT_STAT		153
-#define VAR_DECL		154
-#define PARAM_DECL		155
-#define COMM_STAT		156
-#define EQUI_STAT		157
-#define IMPL_DECL		158
-#define DATA_DECL		159
-#define SAVE_DECL		160
-#define ENTRY_STAT		162
-#define STMTFN_STAT		163
-#define DIM_STAT		164
-#define BLOCK_DATA		165
-#define EXTERN_STAT		166
-#define INTRIN_STAT		167
-#define ENUM_DECL		168	/* New added for VPC */
-#define CLASS_DECL		169	/* New added for VPC */
-#define UNION_DECL		170	/* New added for VPC */
-#define STRUCT_DECL		171	/* New added for VPC */
-#define DERIVED_CLASS_DECL	172	/* New added for VPC */
-#define EXPR_STMT_NODE		173	/* New added for VPC */
-#define DO_WHILE_NODE		174	/* New added for VPC */
-#define SWITCH_NODE		175	/* New added for VPC */
-#define CASE_NODE		176	/* New added for VPC */
-#define DEFAULT_NODE		177	/* New added for VPC */
-#define BREAK_NODE		178	/* New added for VPC */
-#define CONTINUE_NODE		179	/* New added for VPC */
-#define RETURN_NODE		180	/* New added for VPC */
-#define ASM_NODE		181	/* New added for VPC */
-#define SPAWN_NODE		182	/* New added for CC++ */
-#define PARFOR_NODE		183	/* New added for CC++ */
-#define PAR_NODE		184	/* New added for CC++ */
-#define LABEL_STAT		185	/* New added for VPC */
-#define PROS_COMM		186	/* Fortran M */
-#define ATTR_DECL		187	/* attribute declaration */
-#define NAMELIST_STAT		188
-#define FUTURE_STMT		189	/* NEW added for VPC */
-#define COLLECTION_DECL		190	/* NEW added for PC++ */
-#define TEMPLATE_DECL		191     /* added by dbg for templates */
-#define TEMPLATE_FUNDECL	192     /* added by dbg for template function*/
-#define TECLASS_DECL		193     /* added for pC++ */
-#define ELSEWH_NODE		194     /*F95*/
-#define STATIC_STMT             195     /*F95*/
-#define INCLUDE_LINE            196     /*F95*/
-#define PREPROCESSOR_DIR        197     /*C,C++*/
-#define PRINT_STAT		200
-#define BACKSPACE_STAT		201
-#define REWIND_STAT		202
-#define ENDFILE_STAT		203
-#define INQUIRE_STAT		204
-#define OPEN_STAT		205
-#define CLOSE_STAT		206
-#define EXTERN_C_STAT		207	/* Added by PHB for 'extern "C" {}' */
-#define INCLUDE_STAT		208
-#define TRY_STAT		209     /* added by dbg for C++ exceptions  */
-#define CATCH_STAT		210     /* moreexcpt handling (part of try) */
-#define DVM_PARALLEL_ON_DIR     211  /* DVM-F */
-#define DVM_SHADOW_START_DIR    212  /* DVM-F */
-#define DVM_SHADOW_GROUP_DIR    213  /* DVM-F */
-#define DVM_SHADOW_WAIT_DIR     214  /* DVM-F */
-#define DVM_REDUCTION_START_DIR 215  /* DVM-F */
-#define DVM_REDUCTION_GROUP_DIR 216  /* DVM-F */
-#define DVM_REDUCTION_WAIT_DIR  217  /* DVM-F */
-#define DVM_DYNAMIC_DIR         218  /* DVM-F */
-#define DVM_ALIGN_DIR           219  /* DVM-F */
-#define DVM_REALIGN_DIR         220  /* DVM-F */
-#define DVM_REALIGN_NEW_DIR     221  /* DVM-F */
-#define DVM_REMOTE_ACCESS_DIR   222  /* DVM-F */
-#define HPF_INDEPENDENT_DIR     223  /* HPF */
-#define DVM_SHADOW_DIR          224  /* DVM-F */
-#define PARDO_NODE		225     /* Following added for PCF Fortran */
-#define PARSECTIONS_NODE	226
-#define SECTION_NODE		227
-#define GUARDS_NODE		228
-#define LOCK_NODE		229
-#define UNLOCK_NODE		230
-#define CRITSECTION_NODE	231
-#define POST_NODE		232
-#define WAIT_NODE		233
-#define CLEAR_NODE		234
-#define POSTSEQ_NODE		235
-#define WAITSEQ_NODE		236
-#define SETSEQ_NODE		237
-#define ASSIGN_NODE		238
-#define RELEASE_NODE		239
-#define PRIVATE_NODE		240
-#define SCOMMON_NODE		241
-#define PARREGION_NODE		242
-#define PDO_NODE		243
-#define PSECTIONS_NODE		244
-#define SINGLEPROCESS_NODE	245
-#define SKIPPASTEOF_NODE	246
-#define DVM_NEW_VALUE_DIR	247 /* DVM-F */
-#define DVM_VAR_DECL    	248 /* DVM-F */
-#define DVM_POINTER_DIR    	249 /* DVM-F */
-#define INTENT_STMT             250        /* Added for Fortran 90 */
-#define OPTIONAL_STMT           251
-#define PUBLIC_STMT             252
-#define PRIVATE_STMT            253
-#define ALLOCATABLE_STMT        254
-#define POINTER_STMT            255
-#define TARGET_STMT             256
-#define ALLOCATE_STMT           257
-#define NULLIFY_STMT            258
-#define DEALLOCATE_STMT         259
-#define SEQUENCE_STMT	        260
-#define CYCLE_STMT	        261
-#define EXIT_STMT	        262
-#define CONTAINS_STMT           263
-#define WHERE_BLOCK_STMT 	264
-#define MODULE_STMT	        265
-#define USE_STMT	        266
-#define INTERFACE_STMT	        267
-#define MODULE_PROC_STMT	268
-#define OVERLOADED_ASSIGN_STAT  269
-#define POINTER_ASSIGN_STAT     270
-#define OVERLOADED_PROC_STAT	271
-#define DECOMPOSITION_STMT	275
-#define ALIGN_STMT		276
-#define DVM_DISTRIBUTE_DIR	277  /* DVM-F */ 
-#define REDUCE_STMT		278
-#define PROS_HEDR		279  /* Fortran M */
-#define PROS_STAT		280  /* Fortran M */
-#define PROS_STAT_LCTN		281  /* Fortran M */
-#define PROS_STAT_SUBM		282  /* Fortran M */
-#define PROCESSES_STAT		283  /* Fortran M */
-#define PROCESSES_END		284  /* Fortran M */
-#define PROCESS_DO_STAT         285  /* Fortran M */
-#define PROCESSORS_STAT		286  /* Fortran M */
-#define CHANNEL_STAT		287  /* Fortran M */
-#define MERGER_STAT		288  /* Fortran M */
-#define MOVE_PORT		289  /* Fortran M */
-#define SEND_STAT		290  /* Fortran M */
-#define RECEIVE_STAT		291  /* Fortran M */
-#define ENDCHANNEL_STAT		292  /* Fortran M */
-#define PROBE_STAT		293  /* Fortran M */
-#define INPORT_DECL     	294  /* Fortran M */
-#define OUTPORT_DECL		295  /* Fortran M */
-#define HPF_TEMPLATE_STAT       296  /* HPF */
-#define HPF_ALIGN_STAT          297  /* HPF */    
-#define HPF_PROCESSORS_STAT     298  /* HPF */
-#define DVM_REDISTRIBUTE_DIR    299  /* DVM-F */
-#define DVM_TASK_REGION_DIR 	605	/* DVM-F */
-#define DVM_END_TASK_REGION_DIR	606	/* DVM-F */
-#define DVM_ON_DIR  		607	/* DVM-F */
-#define DVM_END_ON_DIR		608	/* DVM-F */
-#define DVM_TASK_DIR           	609	/* DVM-F */
-#define DVM_MAP_DIR 		610	/* DVM-F */
-#define DVM_PARALLEL_TASK_DIR	611     /* DVM-F */
-#define DVM_INHERIT_DIR		612	/* DVM-F */
-#define DVM_INDIRECT_GROUP_DIR	613	/* DVM-F */
-#define DVM_INDIRECT_ACCESS_DIR	614	/* DVM-F */
-#define DVM_REMOTE_GROUP_DIR	615	/* DVM-F */
-#define DVM_RESET_DIR		616	/* DVM-F */
-#define DVM_PREFETCH_DIR	617	/* DVM-F */
-#define DVM_OWN_DIR		618	/* DVM-F */
-#define DVM_HEAP_DIR		619	/* DVM-F */
-#define DVM_ASYNCID_DIR		620	/* DVM-F */
-#define DVM_ASYNCHRONOUS_DIR	621	/* DVM-F */
-#define DVM_ENDASYNCHRONOUS_DIR	622	/* DVM-F */
-#define DVM_ASYNCWAIT_DIR	623	/* DVM-F */
-#define DVM_F90_DIR		624	/* DVM-F */
-#define DVM_BARRIER_DIR		625	/* DVM-F */
-#define FORALL_STAT		626	/* F95 */
-#define DVM_CONSISTENT_GROUP_DIR 627	/* DVM-F */
-#define DVM_CONSISTENT_START_DIR 628	/* DVM-F */
-#define DVM_CONSISTENT_WAIT_DIR  629	/* DVM-F */
-#define DVM_CONSISTENT_DIR       630	/* DVM-F */
-#define DVM_CHECK_DIR            631	/* DVM-F */
-#define DVM_IO_MODE_DIR          632	/* DVM-F */
-#define DVM_LOCALIZE_DIR         633    /* DVM-F */
-#define DVM_SHADOW_ADD_DIR       634    /* DVM-F */
-#define DVM_CP_CREATE_DIR        635	/* DVM-F */ 
-#define DVM_CP_LOAD_DIR          636	/* DVM-F */
-#define DVM_CP_SAVE_DIR          637	/* DVM-F */
-#define DVM_CP_WAIT_DIR          638	/* DVM-F */
-#define DVM_EXIT_INTERVAL_DIR	 639    /* DVM-F */
-#define DVM_TEMPLATE_CREATE_DIR	 640    /* DVM-F */ 
-#define DVM_TEMPLATE_DELETE_DIR	 641    /* DVM-F */
-#define PRIVATE_AR_DECL          642    /* DVM-F */
-    
-/***************** variant tags for low level nodes ********************/
-
-#define INT_VAL			300
-#define FLOAT_VAL		301
-#define DOUBLE_VAL		302
-#define BOOL_VAL		303
-#define CHAR_VAL		304
-#define STRING_VAL		305
-#define CONST_REF		306
-#define VAR_REF			307
-#define ARRAY_REF		308
-#define RECORD_REF		309   /* diff struct between Blaze and VPC++ */
-#define ENUM_REF		310
-#define VAR_LIST		311
-#define EXPR_LIST		312
-#define RANGE_LIST		313
-#define CASE_CHOICE		314
-#define DEF_CHOICE		315
-#define VARIANT_CHOICE		316
-#define COMPLEX_VAL		317
-#define LABEL_REF		318
-#define KEYWORD_VAL		319   /* Strings to be printed with quotes */
-#define DDOT			324
-#define RANGE_OP		325
-#define UPPER_OP		326
-#define LOWER_OP		327
-#define EQ_OP			328
-#define LT_OP			329
-#define GT_OP			330
-#define NOTEQL_OP		331
-#define LTEQL_OP		332
-#define GTEQL_OP		333
-#define ADD_OP			334
-#define SUBT_OP			335
-#define OR_OP			336
-#define MULT_OP			337
-#define DIV_OP			338
-#define MOD_OP			339
-#define AND_OP			340
-#define EXP_OP			341
-#define ARRAY_MULT		342
-#define CONCAT_OP		343	/* cancatenation of strings */
-#define XOR_OP			344	/* .XOR. in fortran */
-#define EQV_OP			345	/* .EQV. in fortran */
-#define NEQV_OP			346	/* .NEQV. in fortran */
-#define MINUS_OP		350	/* unary operations */
-#define NOT_OP			351
-#define ASSGN_OP		352	/* New ADDED For VPC */
-#define DEREF_OP		353	/* New ADDED For VPC */
-#define POINTST_OP		354	/* New ADDED For VPC */	/* ptr->x  */
-#define FUNCTION_OP		355	/* New ADDED For VPC */	/* (*DD)() */
-#define MINUSMINUS_OP		356	/* New ADDED For VPC */
-#define PLUSPLUS_OP		357	/* New ADDED For VPC */
-#define BITAND_OP		358	/* New ADDED For VPC */
-#define BITOR_OP		359	/* New ADDED For VPC */
-#define STAR_RANGE		360	/* operations with no operands 360.. */
-#define PROC_CALL		370
-#define FUNC_CALL		371
-#define CONSTRUCTOR_REF 	380
-#define ACCESS_REF		381
-#define CONS			382
-#define ACCESS			383
-#define IOACCESS		384
-#define CONTROL_LIST		385
-#define SEQ			386
-#define SPEC_PAIR		387
-#define COMM_LIST		388
-#define STMT_STR		389
-#define EQUI_LIST		390
-#define IMPL_TYPE		391
-#define STMTFN_DECL		392
-#define BIT_COMPLEMENT_OP     	393
-#define EXPR_IF			394
-#define EXPR_IF_BODY		395
-#define FUNCTION_REF		396
-#define LSHIFT_OP		397
-#define RSHIFT_OP		398
-#define UNARY_ADD_OP		399
-#define SIZE_OP			400
-#define INTEGER_DIV_OP		401
-#define SUB_OP			402
-#define LE_OP			403	/* New added for VPC */
-#define GE_OP			404	/* New added for VPC */
-#define NE_OP			405	/* New added for VPC */
-#define CLASSINIT_OP		406	/* New added for VPC */
-#define CAST_OP			407	/* New added for VPC */
-#define ADDRESS_OP		408	/* New added for VPC */
-#define POINSTAT_OP		409	/* New added for VPC */    
-#define COPY_NODE		410	/* New added for VPC */    
-#define INIT_LIST		411	/* New added for VPC */    
-#define VECTOR_CONST		412	/* New added for VPC */    
-#define BIT_NUMBER		413	/* New added for VPC */    
-#define ARITH_ASSGN_OP		414	/* New added for VPC */    
-#define ARRAY_OP		415	/* New added for VPC */   
-#define NEW_OP			416	/* New added for VPC */    
-#define DELETE_OP		417	/* New added for VPC */
-#define NAMELIST_LIST		418
-#define THIS_NODE		419	/* New added for VPC */    
-#define SCOPE_OP		420	/* New added for VPC */    
-#define PLUS_ASSGN_OP		421	/* New added for VPC */    
-#define MINUS_ASSGN_OP		422	/* New added for VPC */    
-#define AND_ASSGN_OP		423	/* New added for VPC */    
-#define IOR_ASSGN_OP		424	/* New added for VPC */    
-#define MULT_ASSGN_OP		425	/* New added for VPC */    
-#define DIV_ASSGN_OP		426	/* New added for VPC */    
-#define MOD_ASSGN_OP		427	/* New added for VPC */    
-#define XOR_ASSGN_OP		428	/* New added for VPC */    
-#define LSHIFT_ASSGN_OP 	429	/* New added for VPC */    
-#define RSHIFT_ASSGN_OP 	430	/* New added for VPC */    
-#define ORDERED_OP		431     /* Following added for PCF FORTRAN */
-#define EXTEND_OP		432
-#define MAXPARALLEL_OP		433
-#define SAMETYPE_OP             434
-#define TYPE_REF                450     /* Added for FORTRAN 90 */
-#define STRUCTURE_CONSTRUCTOR   451
-#define ARRAY_CONSTRUCTOR       452
-#define SECTION_REF             453
-#define VECTOR_SUBSCRIPT        454
-#define SECTION_OPERANDS        455
-#define KEYWORD_ARG   	        456
-#define OVERLOADED_CALL	        457
-#define INTERFACE_REF           458
-#define RENAME_NODE	        459
-#define TYPE_NODE	        460
-#define PAREN_OP	        461
-#define PARAMETER_OP	        462
-#define PUBLIC_OP	        463
-#define PRIVATE_OP	        464
-#define ALLOCATABLE_OP	        465
-#define DIMENSION_OP	        466
-#define EXTERNAL_OP	        467
-#define IN_OP	                468
-#define OUT_OP	        	469
-#define INOUT_OP	        470
-#define INTRINSIC_OP	        471
-#define POINTER_OP	        472
-#define OPTIONAL_OP	        473
-#define SAVE_OP	        	474
-#define TARGET_OP	        475
-#define ONLY_NODE        	476
-#define LEN_OP	        	477
-#define TYPE_OP 	        479
-#define DOTSTAR_OP         	480	/* C++ .* operator */
-#define ARROWSTAR_OP		481	/* C++ ->* operator */
-#define FORDECL_OP		482	/* C++ for(int i; needs a new op */
-#define THROW_OP		483	/* C++ throw operator */
-#define PROCESSORS_REF		484	/* Fortran M */
-#define PORT_TYPE_OP		485	/* Fortran M */
-#define INPORT_TYPE_OP		486	/* Fortran M */
-#define OUTPORT_TYPE_OP		487	/* Fortran M */
-#define INPORT_NAME		488	/* Fortran M */
-#define OUTPORT_NAME		489	/* Fortran M */
-#define FROMPORT_NAME		490	/* Fortran M */
-#define TOPORT_NAME		491	/* Fortran M */
-#define IOSTAT_STORE		492	/* Fortran M */
-#define EMPTY_STORE		493	/* Fortran M */
-#define ERR_LABEL		494	/* Fortran M */
-#define END_LABEL		495	/* Fortran M */
-#define PROS_CALL		496	/* Fortran M */
-#define STATIC_OP               497     /* F95*/
-#define LABEL_ARG               498  
-#define DATA_IMPL_DO            700     /* Fortran M */
-#define DATA_ELT                701     /* Fortran M */
-#define DATA_SUBS               702     /* Fortran M */
-#define DATA_RANGE              703     /* Fortran M */
-#define ICON_EXPR               704     /* Fortran M */
-#define BLOCK_OP                705     /* DVM-F */
-#define NEW_SPEC_OP             706     /* DVM-F */
-#define REDUCTION_OP            707     /* DVM-F */
-#define SHADOW_RENEW_OP         708     /* DVM-F */
-#define SHADOW_START_OP         709     /* DVM-F */
-#define SHADOW_WAIT_OP          710     /* DVM-F */
-#define DIAG_OP                 711     /* DVM-F */
-#define REMOTE_ACCESS_OP        712     /* DVM-F */
-#define TEMPLATE_OP             713     /* DVM-F */
-#define PROCESSORS_OP           714     /* DVM-F */
-#define DYNAMIC_OP              715     /* DVM-F */
-#define ALIGN_OP                716     /* DVM-F */
-#define DISTRIBUTE_OP           717     /* DVM-F */
-#define SHADOW_OP               718     /* DVM-F */
-#define INDIRECT_ACCESS_OP      719     /* DVM-F */
-#define ACROSS_OP               720     /* DVM-F */
-#define NEW_VALUE_OP            721     /* DVM-F */
-#define SHADOW_COMP_OP          722     /* DVM-F */
-#define STAGE_OP                723     /* DVM-F */
-#define FORALL_OP               724     /* F95 */	
-#define CONSISTENT_OP           725     /* DVM-F */
-#define INTERFACE_OPERATOR	726     /* F95 */
-#define INTERFACE_ASSIGNMENT	727     /* F95 */
-#define VAR_DECL_90             728     /* F95 */
-#define ASSIGNMENT_OP           729     /* F95 */
-#define OPERATOR_OP             730     /* F95 */
-#define KIND_OP                 731     /* F95 */
-#define LENGTH_OP               732     /* F95 */
-#define RECURSIVE_OP            733     /* F95 */
-#define ELEMENTAL_OP            734     /* F95 */
-#define PURE_OP                 735     /* F95 */
-#define DEFINED_OP	        736     /* F95 */
-#define PARALLEL_OP             737     /*DVM-F */ 
-#define INDIRECT_OP             738     /*DVM-F */
-#define DERIVED_OP              739     /*DVM-F */
-#define DUMMY_REF               740     /*DVM-F */
-#define COMMON_OP               741     /*DVM-F */
-#define SHADOW_NAMES_OP         742     /*DVM-F */
-
-/***************** variant tags for symbol table entries ********************/
-
-#define CONST_NAME		500	/* constant types */
-#define ENUM_NAME		501
-#define FIELD_NAME		502   
-#define VARIABLE_NAME		503 
-#define TYPE_NAME		504
-#define PROGRAM_NAME		505
-#define PROCEDURE_NAME		506
-#define VAR_FIELD		507
-#define LABEL_VAR		508	/* dest of assigned goto stmt */
-#define FUNCTION_NAME		509
-#define MEMBER_FUNC		510	/* new added for VPC */
-#define CLASS_NAME		511	/* new added for VPC */
-#define UNION_NAME		512	/* new added for VPC */
-#define STRUCT_NAME		513	/* new added for VPC */
-#define LABEL_NAME		514	/* new added for VPC */
-#define COLLECTION_NAME		515	/* new added for VPC */
-#define ROUTINE_NAME		516	/*added for external statement*/
-#define CONSTRUCT_NAME          517
-#define INTERFACE_NAME	        518
-#define MODULE_NAME	        519
-#define TEMPLATE_CL_NAME	520
-#define TEMPLATE_FN_NAME	521
-#define TECLASS_NAME		522
-#define SHADOW_GROUP_NAME	523   /*  DVM_F */
-#define REDUCTION_GROUP_NAME	524   /*  DVM_F */
-#define REF_GROUP_NAME	        525   /*  DVM_F */
-#define ASYNC_ID		526   /*  DVM_F */
-#define CONSISTENT_GROUP_NAME   527   /*  DVM_F */
-#define NAMELIST_NAME           528
-#define COMMON_NAME             529 /* name of a common block (add Kataev N.A., 02.04.2014)*/
-
-#define DEFAULT			550
-#define T_INT			551	/* scalar types */
-#define T_FLOAT			552
-#define T_DOUBLE		553
-#define T_CHAR			554
-#define T_BOOL			555
-#define T_STRING		556
-#define T_ENUM			557
-#define T_SUBRANGE		558
-#define T_LIST			559
-#define T_ARRAY			560
-#define T_RECORD		561
-#define T_ENUM_FIELD		562
-#define T_UNKNOWN		563
-#define T_COMPLEX		564
-#define T_VOID			565	/* New one for VPC */
-#define T_DESCRIPT		566	/* New one for VPC */
-#define T_FUNCTION		567	/* New one for VPC */
-#define T_POINTER		568	/* New one for VPC */
-#define T_UNION			569	/* New one for VPC */
-#define T_STRUCT		570	/* New one for VPC */
-#define T_CLASS			571	/* New one for VPC */
-#define T_DERIVED_CLASS 	572	/* New one for VPC */
-#define T_DERIVED_TYPE		573	/* New one for VPC */
-#define T_COLLECTION		574	/* New one for PC++*/
-#define T_DERIVED_COLLECTION	575	/* New one for PC++*/
-#define T_REFERENCE		576	/* New one for PC++*/
-#define T_DERIVED_TEMPLATE      577     /* template type T<A,3,4> */
-#define T_MEMBER_POINTER        578     /* need for C::* (ptr to memb ) */ 
-#define T_TECLASS		579	/* new one for pC++*/
-#define T_GATE			580     /* added for PCF FORTRAN */
-#define T_EVENT			581
-#define T_SEQUENCE		582
-#define T_DCOMPLEX		583
-#define T_LONG			584
-#define BY_USE		        599     /* Fortran 90 */
-#define LOCAL			600	/* variable type */
-#define INPUT			601
-#define OUTPUT			602
-#define IO			603
-#define PROCESS_NAME 		604     /* Fortran M */
-
-#define OMP_PRIVATE                      801     /* OpenMP Fortran */
-#define OMP_SHARED                       802     /* OpenMP Fortran */
-#define OMP_FIRSTPRIVATE                 803     /* OpenMP Fortran */
-#define OMP_LASTPRIVATE                  804     /* OpenMP Fortran */
-#define OMP_THREADPRIVATE                805     /* OpenMP Fortran */
-#define OMP_COPYIN                       806     /* OpenMP Fortran */
-#define OMP_COPYPRIVATE                  807     /* OpenMP Fortran */
-#define OMP_DEFAULT                      808     /* OpenMP Fortran */
-#define OMP_ORDERED                      809     /* OpenMP Fortran */
-#define OMP_SCHEDULE                     810	 /* OpenMP Fortran */
-#define OMP_REDUCTION                    811	 /* OpenMP Fortran */
-#define OMP_IF                           812     /* OpenMP Fortran */
-#define OMP_NUM_THREADS                  813     /* OpenMP Fortran */
-#define OMP_NOWAIT                       814     /* OpenMP Fortran */
-#define OMP_PARALLEL_DIR                 820     /* OpenMP Fortran */
-#define OMP_END_PARALLEL_DIR             821     /* OpenMP Fortran */
-#define OMP_DO_DIR                       822     /* OpenMP Fortran */
-#define OMP_END_DO_DIR                   823     /* OpenMP Fortran */
-#define OMP_SECTIONS_DIR                 824     /* OpenMP Fortran */
-#define OMP_END_SECTIONS_DIR             825     /* OpenMP Fortran */
-#define OMP_SECTION_DIR                  826     /* OpenMP Fortran */
-#define OMP_SINGLE_DIR                   827     /* OpenMP Fortran */ 
-#define OMP_END_SINGLE_DIR               828     /* OpenMP Fortran */ 
-#define OMP_WORKSHARE_DIR                829     /* OpenMP Fortran */ 
-#define OMP_END_WORKSHARE_DIR            830     /* OpenMP Fortran */   
-#define OMP_PARALLEL_DO_DIR              831     /* OpenMP Fortran */    
-#define OMP_END_PARALLEL_DO_DIR          832     /* OpenMP Fortran */   
-#define OMP_PARALLEL_SECTIONS_DIR        833     /* OpenMP Fortran */    
-#define OMP_END_PARALLEL_SECTIONS_DIR    834     /* OpenMP Fortran */   
-#define OMP_PARALLEL_WORKSHARE_DIR       835     /* OpenMP Fortran */   
-#define OMP_END_PARALLEL_WORKSHARE_DIR   836     /* OpenMP Fortran */   
-#define OMP_MASTER_DIR                   837     /* OpenMP Fortran */    
-#define OMP_END_MASTER_DIR               838     /* OpenMP Fortran */    
-#define OMP_CRITICAL_DIR                 839     /* OpenMP Fortran */   
-#define OMP_END_CRITICAL_DIR             840     /* OpenMP Fortran */   
-#define OMP_BARRIER_DIR                  841     /* OpenMP Fortran */   
-#define OMP_ATOMIC_DIR                   842     /* OpenMP Fortran */   
-#define OMP_FLUSH_DIR                    843     /* OpenMP Fortran */   
-#define OMP_ORDERED_DIR                  844     /* OpenMP Fortran */   
-#define OMP_END_ORDERED_DIR              845     /* OpenMP Fortran */   
-#define RECORD_DECL                      846     /* OpenMP Fortran */   
-#define FUNC_STAT                        847     /* OpenMP Fortran */   
-#define OMP_ONETHREAD_DIR                848     /* OpenMP Fortran */
-#define OMP_THREADPRIVATE_DIR            849     /* OpenMP Fortran */   
-#define OMP_DEFAULT_SECTION_DIR          850     /* OpenMP Fortran */
-#define OMP_COLLAPSE                     851     /* OpenMP Fortran */
-
-#define ACC_REGION_DIR        	         900     /* ACC Fortran */
-#define ACC_END_REGION_DIR               901     /* ACC Fortran */
-#define ACC_CALL_STMT                    907     /* ACC Fortran */
-#define ACC_KERNEL_HEDR                  908     /* ACC Fortran */
-#define ACC_GET_ACTUAL_DIR               909     /* ACC Fortran */
-#define ACC_ACTUAL_DIR                   910     /* ACC Fortran */
-#define ACC_CHECKSECTION_DIR             911     /* ACC Fortran */
-#define ACC_END_CHECKSECTION_DIR         912     /* ACC Fortran */
-#define ACC_ROUTINE_DIR                  913     /* ACC Fortran */
-#define ACC_DECLARE_DIR                  914     /* ACC Fortran */
-
-#define ACC_TIE_OP                       930     /* ACC Fortran */          
-#define ACC_INLOCAL_OP                   931     /* ACC Fortran */
-#define ACC_INOUT_OP                     932     /* ACC Fortran */
-#define ACC_IN_OP                        933     /* ACC Fortran */
-#define ACC_OUT_OP                       934     /* ACC Fortran */
-#define ACC_LOCAL_OP                     935     /* ACC Fortran */
-#define ACC_PRIVATE_OP                   936     /* ACC Fortran */
-#define ACC_DEVICE_OP                    937     /* ACC Fortran */
-#define ACC_CUDA_OP                      938     /* ACC Fortran */
-#define ACC_HOST_OP                      939     /* ACC Fortran */
-
-#define ACC_GLOBAL_OP                    940     /* ACC Fortran */ 
-#define ACC_ATTRIBUTES_OP                941     /* ACC Fortran */
-#define ACC_VALUE_OP                     942     /* ACC Fortran */
-#define ACC_SHARED_OP                    943     /* ACC Fortran */
-#define ACC_CONSTANT_OP                  944     /* ACC Fortran */
-#define ACC_USES_OP                      945     /* ACC Fortran */
-#define ACC_CALL_OP                      946     /* ACC Fortran */
-#define ACC_CUDA_BLOCK_OP                947     /* ACC Fortran */
-
-#define ACC_TARGETS_OP                   948     /* ACC Fortran */
-#define ACC_ASYNC_OP                     949     /* ACC Fortran */
-
-#define SPF_ANALYSIS_DIR                 950     /* SAPFOR */
-#define SPF_PARALLEL_DIR                 951     /* SAPFOR */
-#define SPF_TRANSFORM_DIR                952     /* SAPFOR */
-#define SPF_NOINLINE_OP                  953     /* SAPFOR */
-#define SPF_PARALLEL_REG_DIR             954     /* SAPFOR */
-#define SPF_END_PARALLEL_REG_DIR         955     /* SAPFOR */
-#define SPF_REGION_NAME                  956     /* SAPFOR */ 
-#define SPF_EXPAND_OP                    957     /* SAPFOR */
-#define SPF_FISSION_OP                   958     /* SAPFOR */
-#define SPF_SHRINK_OP                    959     /* SAPFOR */
-#define SPF_CHECKPOINT_DIR               960     /* SAPFOR */
-#define SPF_TYPE_OP                      961     /* SAPFOR */
-#define SPF_VARLIST_OP                   962     /* SAPFOR */
-#define SPF_EXCEPT_OP                    963     /* SAPFOR */
-#define SPF_FILES_COUNT_OP               964     /* SAPFOR */
-#define SPF_INTERVAL_OP                  965     /* SAPFOR */
-#define SPF_TIME_OP                      966     /* SAPFOR */
-#define SPF_ITER_OP                      967     /* SAPFOR */
-#define SPF_FLEXIBLE_OP                  968     /* SAPFOR */
-#define SPF_PARAMETER_OP                 969     /* SAPFOR */
-#define SPF_CODE_COVERAGE_OP             970     /* SAPFOR */
-#define SPF_UNROLL_OP                    971     /* SAPFOR */
-#define SPF_COVER_OP                     972     /* SAPFOR */
-#define SPF_MERGE_OP                     973     /* SAPFOR */
-#define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
-#define SPF_WEIGHT_OP			 975     /* SAPFOR */
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/tag.doc b/projects/dvm_svn/fdvm/trunk/Sage/h/tag.doc
deleted file mode 100644
index 14f9c11..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/tag.doc
+++ /dev/null
@@ -1,274 +0,0 @@
-/************************************************************************
- *									*
- *   This file contains the documentation of the tags used in various	*
- *   structures of the Sigma database					*
- *									*
- ************************************************************************/
-
-/******************* variant tags for bif nodes **********************/
-
-#define GLOBAL		100	/* pseudo root node */
-#define PROG_HEDR	101	/* main program node */
-#define PROC_HEDR	102	/* procedure/function node */
-#define BASIC_BLOCK	103	/* start node of a basic block */
-#define CONTROL_END	104	/* end of a block */
-
-#define IF_NODE		105	/* an IF statement */
-#define ARITHIF_NODE	138	/* an arithmatic IF statement */
-#define LOGIF_NODE	145	/* a logical IF statement */
-
-#define LOOP_NODE	106	/* a loop statement */
-#define FOR_NODE	107	/* a DO (in fortran) or a for (in C) statement */
-#define FORALL_NODE	108	/* a forall (Blaze??) statement */
-#define WHILE_NODE	109	/* a while statement */
-#define CDOALL_NODE	124	/* a CDOALL statement */
-#define SDOALL_NODE	125	/* a SDOALL statement */
-#define DOACROSS_NODE	126	/* a DOACROSS statement */
-#define CDOACROSS_NODE	127	/* a CDOACROSS statement */
-#define EXIT_NODE	110	/* an EXIT statement */
-#define GOTO_NODE	139	/* a GOTO statement */
-#define ASSGOTO_NODE	140	/* an ASSIGN GOTO statement */
-#define COMGOTO_NODE	141	/* a COMPUTED GOGO statement */
-#define PAUSE_NODE	142	/* a PAUSE statement */
-#define STOP_NODE	143	/* a STOP statement */
-
-#define ASSIGN_STAT	111	/* an assignment statement */
-#define M_ASSIGN_STAT	112	/* a multiple assignment statement (Blaze??) */
-#define PROC_STAT	113	/*  */
-#define ASSLAB_STAT	146
-
-#define SUM_ACC		114	/* accumulation statements */
-#define MULT_ACC	115
-#define MAX_ACC		116
-#define MIN_ACC		117
-#define CAT_ACC		118
-#define OR_ACC		119
-#define AND_ACC		120
-
-#define READ_STAT	121
-#define WRITE_STAT	122
-#define OTHERIO_STAT	123
-
-#define BLOB		150
-#define SIZES		151
-
-
-#define FUNC_HEDR	130
-#define WHERE_NODE	131
-#define ALLDO_NODE	132
-#define IDENTIFY	133
-#define FORMAT_STAT	134
-#define STOP_STAT	135
-#define RETURN_STAT	136
-#define ELSEIF_NODE	137
-
-				/* NO_OP nodes */
-#define COMMENT_STAT	152
-#define CONT_STAT	153
-#define VAR_DECL	154
-#define PARAM_DECL	155
-#define COMM_STAT	156
-#define EQUI_STAT	157
-#define IMPL_DECL	158
-#define DATA_DECL	159
-#define SAVE_DECL	160
-#define ENTRY_STAT	162
-#define STMTFN_STAT	163
-#define DIM_STAT	164
-#define BLOCK_DATA	165
-#define EXTERN_STAT	166
-#define INTRIN_STAT	167
-
-#define ENUM_DECL	168	   /* New added for VPC */
-#define CLASS_DECL	169	   /* New added for VPC */
-#define UNION_DECL	170	   /* New added for VPC */
-#define STRUCT_DECL	171	   /* New added for VPC */
-#define DERIVED_CLASS_DECL  172	   /* New added for VPC */
-#define EXPR_STMT_NODE	    173	   /* New added for VPC */
-#define DO_WHILE_NODE	    174	   /* New added for VPC */
-#define SWITCH_NODE	    175	   /* New added for VPC */
-#define CASE_NODE	    176	   /* New added for VPC */
-#define DEFAULT_NODE	    177	   /* New added for VPC */
-#define BREAK_NODE	    178	   /* New added for VPC */
-#define CONTINUE_NODE	    179	   /* New added for VPC */
-#define RETURN_NODE	    180	   /* New added for VPC */
-#define ASM_NODE	    181	   /* New added for VPC */
-#define COBREAK_NODE	    182	   /* New added for VPC */
-#define COLOOP_NODE	    183	   /* New added for VPC */
-#define COEXEC_NODE	    184	   /* New added for VPC */
-#define LABEL_STAT	    185	   /* New added for VPC */
-#define PROC_COM	    186	   /* process common */
-#define ATTR_DECL	    187	   /* attribute declaration */
-#define NAMELIST_STAT	    188
-#define FUTURE_STMT	    189	   /* NEW added for VPC */
-
-
-/***************** variant tags for low level nodes ********************/
-
-#define INT_VAL		300
-#define FLOAT_VAL	301
-#define DOUBLE_VAL	302
-#define BOOL_VAL	303
-#define CHAR_VAL	304
-#define STRING_VAL	305
-#define COMPLEX_VAL	317
-
-#define CONST_REF	306
-#define VAR_REF		307
-#define ARRAY_REF	308
-#define RECORD_REF	309   /* different structure between Blaze and VPC++ */
-#define ENUM_REF	310
-#define LABEL_REF	318
-
-#define VAR_LIST	311
-#define EXPR_LIST	312
-#define RANGE_LIST	313
-
-#define CASE_CHOICE	314
-#define DEF_CHOICE	315
-#define VARIANT_CHOICE	316
-
-#define DDOT		324
-#define RANGE_OP	325
-#define UPPER_OP	326
-#define LOWER_OP	327
-
-#define EQ_OP		328
-#define LT_OP		329
-#define GT_OP		330
-#define NOTEQL_OP	331
-#define LTEQL_OP	332
-#define GTEQL_OP	333
-
-#define ADD_OP		334
-#define SUBT_OP		335
-#define OR_OP		336
-
-#define MULT_OP		337
-#define DIV_OP		338
-#define MOD_OP		339
-#define AND_OP		340
-
-#define EXP_OP		341
-#define ARRAY_MULT	342
-#define CONCAT_OP	343	/* cancatenation of strings */
-#define XOR_OP		344	/* .XOR. in fortran */
-#define EQV_OP		345	/* .EQV. in fortran */
-#define NEQV_OP		346	/* .NEQV. in fortran */
-
-#define MINUS_OP	350	/* unary operations */
-#define NOT_OP		351
-#define ASSGN_OP	352	/* New ADDED For VPC */
-#define DEREF_OP	353	/* New ADDED For VPC */
-#define POINTST_OP	354	/* New ADDED For VPC */	    /* ptr->x  */
-#define FUNCTION_OP	355	/* New ADDED For VPC */	    /* (*DD)() */
-#define MINUSMINUS_OP	356	/* New ADDED For VPC */
-#define PLUSPLUS_OP	357	/* New ADDED For VPC */
-#define BITAND_OP	358	/* New ADDED For VPC */
-#define BITOR_OP	359	/* New ADDED For VPC */
-
-
-
-
-#define STAR_RANGE	360	/* operations with no operands 360.. */
-
-#define PROC_CALL	370
-#define FUNC_CALL	371
-
-
-#define CONSTRUCTOR_REF 380
-#define ACCESS_REF	381
-#define CONS		382
-#define ACCESS		383
-#define IOACCESS	384
-#define CONTROL_LIST	385
-#define SEQ		386
-#define SPEC_PAIR	387
-#define COMM_LIST	388
-#define STMT_STR	389
-#define EQUI_LIST	390
-#define IMPL_TYPE	391
-#define STMTFN_DECL	392
-#define BIT_COMPLEMENT_OP     393
-#define EXPR_IF		394
-#define EXPR_IF_BODY	395
-#define FUNCTION_REF	396
-#define LSHIFT_OP	397
-#define RSHIFT_OP	398
-#define UNARY_ADD_OP	399
-#define SIZE_OP		400
-#define INTEGER_DIV_OP	401
-#define SUB_OP		402
-#define LE_OP		403	   /* New added for VPC */
-#define GE_OP		404	   /* New added for VPC */
-#define NE_OP		405	   /* New added for VPC */
-
-#define CLASSINIT_OP	406	   /* New added for VPC */
-#define CAST_OP		407	   /* New added for VPC */
-#define ADDRESS_OP	408	   /* New added for VPC */
-#define POINSTAT_OP	409	   /* New added for VPC */    
-#define COPY_NODE	410	   /* New added for VPC */    
-#define INIT_LIST	411	   /* New added for VPC */    
-#define VECTOR_CONST	412	   /* New added for VPC */    
-#define BIT_NUMBER	413	   /* New added for VPC */    
-#define ARITH_ASSGN_OP	414	   /* New added for VPC */    
-#define ARRAY_OP	415	   /* New added for VPC */    
-#define NEW_OP		416	   /* New added for VPC */
-#define DELETE_OP	417	   /* New added for VPC */
-#define NAMELIST_LIST	418
-#define THIS_NODE	419	   /* New added for VPC */    
-#define SCOPE_OP	420	   /* New added for VPC */    
-
-
-/***************** variant tags for symbol table entries ********************/
-
-
-#define CONST_NAME	500	/* constant types */
-#define ENUM_NAME	501
-#define FIELD_NAME	502   
-#define VARIABLE_NAME	503 
-#define TYPE_NAME	504
-#define PROGRAM_NAME	505
-#define PROCEDURE_NAME	506
-#define VAR_FIELD	507
-#define LABEL_VAR	508	/* dest of assigned goto stmt */
-#define FUNCTION_NAME	509
-#define MEMBER_FUNC	510	/* new added for VPC */
-#define CLASS_NAME	511	/* new added for VPC */
-#define UNION_NAME	512	/* new added for VPC */
-#define STRUCT_NAME	513	/* new added for VPC */
-#define LABEL_NAME	514	/* new added for VPC */
-
-
-#define DEFAULT		550  
-
-#define T_INT		551	/* scalar types */
-#define T_FLOAT		552
-#define T_DOUBLE	553
-#define T_CHAR		554
-#define T_BOOL		555
-#define T_STRING	556
-#define T_COMPLEX	564
-
-#define T_ENUM		557
-#define T_SUBRANGE	558
-#define T_LIST		559
-#define T_ARRAY		560
-#define T_RECORD	561
-#define T_ENUM_FIELD	562
-#define T_UNKNOWN	563
-#define T_VOID		565	       /* New one for VPC */
-#define T_DESCRIPT	566	       /* New one for VPC */
-#define T_FUNCTION	567	       /* New one for VPC */
-#define T_POINTER	568	       /* New one for VPC */
-#define T_UNION		569	       /* New one for VPC */
-#define T_STRUCT	570	       /* New one for VPC */
-#define T_CLASS		571	       /* New one for VPC */
-#define T_DERIVED_CLASS 572	       /* New one for VPC */
-#define T_DERIVED_TYPE	573	       /* New one for VPC */
-
-
-#define LOCAL		600		/* variable type */
-#define INPUT		601
-#define OUTPUT		602
-#define IO		603
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/tag.h b/projects/dvm_svn/fdvm/trunk/Sage/h/tag.h
deleted file mode 100644
index 02ff849..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/tag.h
+++ /dev/null
@@ -1,630 +0,0 @@
-/* don't modify this file directly, it is made by a clever 'sed'
-script using "tag".  Run make tag.h to regenerate this file */
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
- 
-/******************* variant tags for bif nodes **********************/
-
-  tag [ GLOBAL ] = "GLOBAL";
-  tag [ PROG_HEDR ] = "PROG_HEDR";
-  tag [ PROC_HEDR ] = "PROC_HEDR";
-  tag [ BASIC_BLOCK ] = "BASIC_BLOCK";
-  tag [ CONTROL_END ] = "CONTROL_END";
-  tag [ IF_NODE ] = "IF_NODE";
-  tag [ LOOP_NODE ] = "LOOP_NODE";
-  tag [ FOR_NODE ] = "FOR_NODE";
-  tag [ FORALL_NODE ] = "FORALL_NODE";
-  tag [ WHILE_NODE ] = "WHILE_NODE";
-  tag [ EXIT_NODE ] = "EXIT_NODE";
-  tag [ ASSIGN_STAT ] = "ASSIGN_STAT";
-  tag [ M_ASSIGN_STAT ] = "M_ASSIGN_STAT";
-  tag [ PROC_STAT ] = "PROC_STAT";
-  tag [ SUM_ACC ] = "SUM_ACC";
-  tag [ MULT_ACC ] = "MULT_ACC";
-  tag [ MAX_ACC ] = "MAX_ACC";
-  tag [ MIN_ACC ] = "MIN_ACC";
-  tag [ CAT_ACC ] = "CAT_ACC";
-  tag [ OR_ACC ] = "OR_ACC";
-  tag [ AND_ACC ] = "AND_ACC";
-  tag [ READ_STAT ] = "READ_STAT";
-  tag [ WRITE_STAT ] = "WRITE_STAT";
-  tag [ OTHERIO_STAT ] = "OTHERIO_STAT";
-  tag [ CDOALL_NODE ] = "CDOALL_NODE";
-  tag [ SDOALL_NODE ] = "SDOALL_NODE";
-  tag [ DOACROSS_NODE ] = "DOACROSS_NODE";
-  tag [ CDOACROSS_NODE ] = "CDOACROSS_NODE";
-  tag [ DVM_INTERVAL_DIR ] = "DVM_INTERVAL_DIR";
-  tag [ DVM_ENDINTERVAL_DIR ] = "DVM_ENDINTERVAL_DIR";
-  tag [ FUNC_HEDR ] = "FUNC_HEDR";
-  tag [ WHERE_NODE ] = "WHERE_NODE";
-  tag [ ALLDO_NODE ] = "ALLDO_NODE";
-  tag [ IDENTIFY ] = "IDENTIFY";
-  tag [ FORMAT_STAT ] = "FORMAT_STAT";
-  tag [ STOP_STAT ] = "STOP_STAT";
-  tag [ RETURN_STAT ] = "RETURN_STAT";
-  tag [ ELSEIF_NODE ] = "ELSEIF_NODE";
-  tag [ ARITHIF_NODE ] = "ARITHIF_NODE";
-  tag [ GOTO_NODE ] = "GOTO_NODE";
-  tag [ ASSGOTO_NODE ] = "ASSGOTO_NODE";
-  tag [ COMGOTO_NODE ] = "COMGOTO_NODE";
-  tag [ PAUSE_NODE ] = "PAUSE_NODE";
-  tag [ STOP_NODE ] = "STOP_NODE";
-  tag [ ASSLAB_STAT ] = "ASSLAB_STAT";
-  tag [ LOGIF_NODE ] = "LOGIF_NODE";
-  tag [ DVM_DEBUG_DIR ] = "DVM_DEBUG_DIR";
-  tag [ DVM_ENDDEBUG_DIR ] = "DVM_ENDDEBUG_DIR";
-  tag [ DVM_TRACEON_DIR ] = "DVM_TRACEON_DIR";
-  tag [ DVM_TRACEOFF_DIR ] = "DVM_TRACEOFF_DIR";
-  tag [ BLOB ] = "BLOB";
-  tag [ SIZES ] = "SIZES";
-  tag [ COMMENT_STAT ] = "COMMENT_STAT";
-  tag [ CONT_STAT ] = "CONT_STAT";
-  tag [ VAR_DECL ] = "VAR_DECL";
-  tag [ PARAM_DECL ] = "PARAM_DECL";
-  tag [ COMM_STAT ] = "COMM_STAT";
-  tag [ EQUI_STAT ] = "EQUI_STAT";
-  tag [ IMPL_DECL ] = "IMPL_DECL";
-  tag [ DATA_DECL ] = "DATA_DECL";
-  tag [ SAVE_DECL ] = "SAVE_DECL";
-  tag [ ENTRY_STAT ] = "ENTRY_STAT";
-  tag [ STMTFN_STAT ] = "STMTFN_STAT";
-  tag [ DIM_STAT ] = "DIM_STAT";
-  tag [ BLOCK_DATA ] = "BLOCK_DATA";
-  tag [ EXTERN_STAT ] = "EXTERN_STAT";
-  tag [ INTRIN_STAT ] = "INTRIN_STAT";
-  tag [ ENUM_DECL ] = "ENUM_DECL";
-  tag [ CLASS_DECL ] = "CLASS_DECL";
-  tag [ UNION_DECL ] = "UNION_DECL";
-  tag [ STRUCT_DECL ] = "STRUCT_DECL";
-  tag [ DERIVED_CLASS_DECL ] = "DERIVED_CLASS_DECL";
-  tag [ EXPR_STMT_NODE ] = "EXPR_STMT_NODE";
-  tag [ DO_WHILE_NODE ] = "DO_WHILE_NODE";
-  tag [ SWITCH_NODE ] = "SWITCH_NODE";
-  tag [ CASE_NODE ] = "CASE_NODE";
-  tag [ DEFAULT_NODE ] = "DEFAULT_NODE";
-  tag [ BREAK_NODE ] = "BREAK_NODE";
-  tag [ CONTINUE_NODE ] = "CONTINUE_NODE";
-  tag [ RETURN_NODE ] = "RETURN_NODE";
-  tag [ ASM_NODE ] = "ASM_NODE";
-  tag [ SPAWN_NODE ] = "SPAWN_NODE";
-  tag [ PARFOR_NODE ] = "PARFOR_NODE";
-  tag [ PAR_NODE ] = "PAR_NODE";
-  tag [ LABEL_STAT ] = "LABEL_STAT";
-  tag [ PROS_COMM ] = "PROS_COMM";
-  tag [ ATTR_DECL ] = "ATTR_DECL";
-  tag [ NAMELIST_STAT ] = "NAMELIST_STAT";
-  tag [ FUTURE_STMT ] = "FUTURE_STMT";
-  tag [ COLLECTION_DECL ] = "COLLECTION_DECL";
-  tag [ TEMPLATE_DECL ] = "TEMPLATE_DECL";
-  tag [ TEMPLATE_FUNDECL ] = "TEMPLATE_FUNDECL";
-  tag [ TECLASS_DECL ] = "TECLASS_DECL";
-  tag [ ELSEWH_NODE ] = "ELSEWH_NODE";
-  tag [ STATIC_STMT ] = "STATIC_STMT";
-  tag [ INCLUDE_LINE ] = "INCLUDE_LINE";
-  tag [ PREPROCESSOR_DIR ] = "PREPROCESSOR_DIR";
-  tag [ PRINT_STAT ] = "PRINT_STAT";
-  tag [ BACKSPACE_STAT ] = "BACKSPACE_STAT";
-  tag [ REWIND_STAT ] = "REWIND_STAT";
-  tag [ ENDFILE_STAT ] = "ENDFILE_STAT";
-  tag [ INQUIRE_STAT ] = "INQUIRE_STAT";
-  tag [ OPEN_STAT ] = "OPEN_STAT";
-  tag [ CLOSE_STAT ] = "CLOSE_STAT";
-  tag [ EXTERN_C_STAT ] = "EXTERN_C_STAT";
-  tag [ INCLUDE_STAT ] = "INCLUDE_STAT";
-  tag [ TRY_STAT ] = "TRY_STAT";
-  tag [ CATCH_STAT ] = "CATCH_STAT";
-  tag [ DVM_PARALLEL_ON_DIR ] = "DVM_PARALLEL_ON_DIR";
-  tag [ DVM_SHADOW_START_DIR ] = "DVM_SHADOW_START_DIR";
-  tag [ DVM_SHADOW_GROUP_DIR ] = "DVM_SHADOW_GROUP_DIR";
-  tag [ DVM_SHADOW_WAIT_DIR ] = "DVM_SHADOW_WAIT_DIR";
-  tag [ DVM_REDUCTION_START_DIR ] = "DVM_REDUCTION_START_DIR";
-  tag [ DVM_REDUCTION_GROUP_DIR ] = "DVM_REDUCTION_GROUP_DIR";
-  tag [ DVM_REDUCTION_WAIT_DIR ] = "DVM_REDUCTION_WAIT_DIR";
-  tag [ DVM_DYNAMIC_DIR ] = "DVM_DYNAMIC_DIR";
-  tag [ DVM_ALIGN_DIR ] = "DVM_ALIGN_DIR";
-  tag [ DVM_REALIGN_DIR ] = "DVM_REALIGN_DIR";
-  tag [ DVM_REALIGN_NEW_DIR ] = "DVM_REALIGN_NEW_DIR";
-  tag [ DVM_REMOTE_ACCESS_DIR ] = "DVM_REMOTE_ACCESS_DIR";
-  tag [ HPF_INDEPENDENT_DIR ] = "HPF_INDEPENDENT_DIR";
-  tag [ DVM_SHADOW_DIR ] = "DVM_SHADOW_DIR";
-  tag [ PARDO_NODE ] = "PARDO_NODE";
-  tag [ PARSECTIONS_NODE ] = "PARSECTIONS_NODE";
-  tag [ SECTION_NODE ] = "SECTION_NODE";
-  tag [ GUARDS_NODE ] = "GUARDS_NODE";
-  tag [ LOCK_NODE ] = "LOCK_NODE";
-  tag [ UNLOCK_NODE ] = "UNLOCK_NODE";
-  tag [ CRITSECTION_NODE ] = "CRITSECTION_NODE";
-  tag [ POST_NODE ] = "POST_NODE";
-  tag [ WAIT_NODE ] = "WAIT_NODE";
-  tag [ CLEAR_NODE ] = "CLEAR_NODE";
-  tag [ POSTSEQ_NODE ] = "POSTSEQ_NODE";
-  tag [ WAITSEQ_NODE ] = "WAITSEQ_NODE";
-  tag [ SETSEQ_NODE ] = "SETSEQ_NODE";
-  tag [ ASSIGN_NODE ] = "ASSIGN_NODE";
-  tag [ RELEASE_NODE ] = "RELEASE_NODE";
-  tag [ PRIVATE_NODE ] = "PRIVATE_NODE";
-  tag [ SCOMMON_NODE ] = "SCOMMON_NODE";
-  tag [ PARREGION_NODE ] = "PARREGION_NODE";
-  tag [ PDO_NODE ] = "PDO_NODE";
-  tag [ PSECTIONS_NODE ] = "PSECTIONS_NODE";
-  tag [ SINGLEPROCESS_NODE ] = "SINGLEPROCESS_NODE";
-  tag [ SKIPPASTEOF_NODE ] = "SKIPPASTEOF_NODE";
-  tag [ DVM_NEW_VALUE_DIR ] = "DVM_NEW_VALUE_DIR";
-  tag [ DVM_VAR_DECL ] = "DVM_VAR_DECL";
-  tag [ DVM_POINTER_DIR ] = "DVM_POINTER_DIR";
-  tag [ INTENT_STMT ] = "INTENT_STMT";
-  tag [ OPTIONAL_STMT ] = "OPTIONAL_STMT";
-  tag [ PUBLIC_STMT ] = "PUBLIC_STMT";
-  tag [ PRIVATE_STMT ] = "PRIVATE_STMT";
-  tag [ ALLOCATABLE_STMT ] = "ALLOCATABLE_STMT";
-  tag [ POINTER_STMT ] = "POINTER_STMT";
-  tag [ TARGET_STMT ] = "TARGET_STMT";
-  tag [ ALLOCATE_STMT ] = "ALLOCATE_STMT";
-  tag [ NULLIFY_STMT ] = "NULLIFY_STMT";
-  tag [ DEALLOCATE_STMT ] = "DEALLOCATE_STMT";
-  tag [ SEQUENCE_STMT ] = "SEQUENCE_STMT";
-  tag [ CYCLE_STMT ] = "CYCLE_STMT";
-  tag [ EXIT_STMT ] = "EXIT_STMT";
-  tag [ CONTAINS_STMT ] = "CONTAINS_STMT";
-  tag [ WHERE_BLOCK_STMT ] = "WHERE_BLOCK_STMT";
-  tag [ MODULE_STMT ] = "MODULE_STMT";
-  tag [ USE_STMT ] = "USE_STMT";
-  tag [ INTERFACE_STMT ] = "INTERFACE_STMT";
-  tag [ MODULE_PROC_STMT ] = "MODULE_PROC_STMT";
-  tag [ OVERLOADED_ASSIGN_STAT ] = "OVERLOADED_ASSIGN_STAT";
-  tag [ POINTER_ASSIGN_STAT ] = "POINTER_ASSIGN_STAT";
-  tag [ OVERLOADED_PROC_STAT ] = "OVERLOADED_PROC_STAT";
-  tag [ DECOMPOSITION_STMT ] = "DECOMPOSITION_STMT";
-  tag [ ALIGN_STMT ] = "ALIGN_STMT";
-  tag [ DVM_DISTRIBUTE_DIR ] = "DVM_DISTRIBUTE_DIR";
-  tag [ REDUCE_STMT ] = "REDUCE_STMT";
-  tag [ PROS_HEDR ] = "PROS_HEDR";
-  tag [ PROS_STAT ] = "PROS_STAT";
-  tag [ PROS_STAT_LCTN ] = "PROS_STAT_LCTN";
-  tag [ PROS_STAT_SUBM ] = "PROS_STAT_SUBM";
-  tag [ PROCESSES_STAT ] = "PROCESSES_STAT";
-  tag [ PROCESSES_END ] = "PROCESSES_END";
-  tag [ PROCESS_DO_STAT ] = "PROCESS_DO_STAT";
-  tag [ PROCESSORS_STAT ] = "PROCESSORS_STAT";
-  tag [ CHANNEL_STAT ] = "CHANNEL_STAT";
-  tag [ MERGER_STAT ] = "MERGER_STAT";
-  tag [ MOVE_PORT ] = "MOVE_PORT";
-  tag [ SEND_STAT ] = "SEND_STAT";
-  tag [ RECEIVE_STAT ] = "RECEIVE_STAT";
-  tag [ ENDCHANNEL_STAT ] = "ENDCHANNEL_STAT";
-  tag [ PROBE_STAT ] = "PROBE_STAT";
-  tag [ INPORT_DECL ] = "INPORT_DECL";
-  tag [ OUTPORT_DECL ] = "OUTPORT_DECL";
-  tag [ HPF_TEMPLATE_STAT ] = "HPF_TEMPLATE_STAT";
-  tag [ HPF_ALIGN_STAT ] = "HPF_ALIGN_STAT";
-  tag [ HPF_PROCESSORS_STAT ] = "HPF_PROCESSORS_STAT";
-  tag [ DVM_REDISTRIBUTE_DIR ] = "DVM_REDISTRIBUTE_DIR";
-  tag [ DVM_TASK_REGION_DIR ] = "DVM_TASK_REGION_DIR";
-  tag [ DVM_END_TASK_REGION_DIR ] = "DVM_END_TASK_REGION_DIR";
-  tag [ DVM_ON_DIR ] = "DVM_ON_DIR";
-  tag [ DVM_END_ON_DIR ] = "DVM_END_ON_DIR";
-  tag [ DVM_TASK_DIR ] = "DVM_TASK_DIR";
-  tag [ DVM_MAP_DIR ] = "DVM_MAP_DIR";
-  tag [ DVM_PARALLEL_TASK_DIR ] = "DVM_PARALLEL_TASK_DIR";
-  tag [ DVM_INHERIT_DIR ] = "DVM_INHERIT_DIR";
-  tag [ DVM_INDIRECT_GROUP_DIR ] = "DVM_INDIRECT_GROUP_DIR";
-  tag [ DVM_INDIRECT_ACCESS_DIR ] = "DVM_INDIRECT_ACCESS_DIR";
-  tag [ DVM_REMOTE_GROUP_DIR ] = "DVM_REMOTE_GROUP_DIR";
-  tag [ DVM_RESET_DIR ] = "DVM_RESET_DIR";
-  tag [ DVM_PREFETCH_DIR ] = "DVM_PREFETCH_DIR";
-  tag [ DVM_OWN_DIR ] = "DVM_OWN_DIR";
-  tag [ DVM_HEAP_DIR ] = "DVM_HEAP_DIR";
-  tag [ DVM_ASYNCID_DIR ] = "DVM_ASYNCID_DIR";
-  tag [ DVM_ASYNCHRONOUS_DIR ] = "DVM_ASYNCHRONOUS_DIR";
-  tag [ DVM_ENDASYNCHRONOUS_DIR ] = "DVM_ENDASYNCHRONOUS_DIR";
-  tag [ DVM_ASYNCWAIT_DIR ] = "DVM_ASYNCWAIT_DIR";
-  tag [ DVM_F90_DIR ] = "DVM_F90_DIR";
-  tag [ DVM_BARRIER_DIR ] = "DVM_BARRIER_DIR";
-  tag [ FORALL_STAT ] = "FORALL_STAT";
-  tag [ DVM_CONSISTENT_GROUP_DIR ] = "DVM_CONSISTENT_GROUP_DIR";
-  tag [ DVM_CONSISTENT_START_DIR ] = "DVM_CONSISTENT_START_DIR";
-  tag [ DVM_CONSISTENT_WAIT_DIR ] = "DVM_CONSISTENT_WAIT_DIR";
-  tag [ DVM_CONSISTENT_DIR ] = "DVM_CONSISTENT_DIR";
-  tag [ DVM_CHECK_DIR ] = "DVM_CHECK_DIR";
-  tag [ DVM_IO_MODE_DIR ] = "DVM_IO_MODE_DIR";
-  tag [ DVM_LOCALIZE_DIR ] = "DVM_LOCALIZE_DIR";
-  tag [ DVM_SHADOW_ADD_DIR ] = "DVM_SHADOW_ADD_DIR";
-  tag [ DVM_CP_CREATE_DIR ] = "DVM_CP_CREATE_DIR";
-  tag [ DVM_CP_LOAD_DIR ] = "DVM_CP_LOAD_DIR";
-  tag [ DVM_CP_SAVE_DIR ] = "DVM_CP_SAVE_DIR";
-  tag [ DVM_CP_WAIT_DIR ] = "DVM_CP_WAIT_DIR";
-  tag [ DVM_EXIT_INTERVAL_DIR ] = "DVM_EXIT_INTERVAL_DIR";
-  tag [ DVM_TEMPLATE_CREATE_DIR ] = "DVM_TEMPLATE_CREATE_DIR";
-  tag [ DVM_TEMPLATE_DELETE_DIR ] = "DVM_TEMPLATE_DELETE_DIR";
-  tag [ PRIVATE_AR_DECL ] = "PRIVATE_AR_DECL";
-    
-/***************** variant tags for low level nodes ********************/
-
-  tag [ INT_VAL ] = "INT_VAL";
-  tag [ FLOAT_VAL ] = "FLOAT_VAL";
-  tag [ DOUBLE_VAL ] = "DOUBLE_VAL";
-  tag [ BOOL_VAL ] = "BOOL_VAL";
-  tag [ CHAR_VAL ] = "CHAR_VAL";
-  tag [ STRING_VAL ] = "STRING_VAL";
-  tag [ CONST_REF ] = "CONST_REF";
-  tag [ VAR_REF ] = "VAR_REF";
-  tag [ ARRAY_REF ] = "ARRAY_REF";
-  tag [ RECORD_REF ] = "RECORD_REF";
-  tag [ ENUM_REF ] = "ENUM_REF";
-  tag [ VAR_LIST ] = "VAR_LIST";
-  tag [ EXPR_LIST ] = "EXPR_LIST";
-  tag [ RANGE_LIST ] = "RANGE_LIST";
-  tag [ CASE_CHOICE ] = "CASE_CHOICE";
-  tag [ DEF_CHOICE ] = "DEF_CHOICE";
-  tag [ VARIANT_CHOICE ] = "VARIANT_CHOICE";
-  tag [ COMPLEX_VAL ] = "COMPLEX_VAL";
-  tag [ LABEL_REF ] = "LABEL_REF";
-  tag [ KEYWORD_VAL ] = "KEYWORD_VAL";
-  tag [ DDOT ] = "DDOT";
-  tag [ RANGE_OP ] = "RANGE_OP";
-  tag [ UPPER_OP ] = "UPPER_OP";
-  tag [ LOWER_OP ] = "LOWER_OP";
-  tag [ EQ_OP ] = "EQ_OP";
-  tag [ LT_OP ] = "LT_OP";
-  tag [ GT_OP ] = "GT_OP";
-  tag [ NOTEQL_OP ] = "NOTEQL_OP";
-  tag [ LTEQL_OP ] = "LTEQL_OP";
-  tag [ GTEQL_OP ] = "GTEQL_OP";
-  tag [ ADD_OP ] = "ADD_OP";
-  tag [ SUBT_OP ] = "SUBT_OP";
-  tag [ OR_OP ] = "OR_OP";
-  tag [ MULT_OP ] = "MULT_OP";
-  tag [ DIV_OP ] = "DIV_OP";
-  tag [ MOD_OP ] = "MOD_OP";
-  tag [ AND_OP ] = "AND_OP";
-  tag [ EXP_OP ] = "EXP_OP";
-  tag [ ARRAY_MULT ] = "ARRAY_MULT";
-  tag [ CONCAT_OP ] = "CONCAT_OP";
-  tag [ XOR_OP ] = "XOR_OP";
-  tag [ EQV_OP ] = "EQV_OP";
-  tag [ NEQV_OP ] = "NEQV_OP";
-  tag [ MINUS_OP ] = "MINUS_OP";
-  tag [ NOT_OP ] = "NOT_OP";
-  tag [ ASSGN_OP ] = "ASSGN_OP";
-  tag [ DEREF_OP ] = "DEREF_OP";
-  tag [ POINTST_OP ] = "POINTST_OP";
-  tag [ FUNCTION_OP ] = "FUNCTION_OP";
-  tag [ MINUSMINUS_OP ] = "MINUSMINUS_OP";
-  tag [ PLUSPLUS_OP ] = "PLUSPLUS_OP";
-  tag [ BITAND_OP ] = "BITAND_OP";
-  tag [ BITOR_OP ] = "BITOR_OP";
-  tag [ STAR_RANGE ] = "STAR_RANGE";
-  tag [ PROC_CALL ] = "PROC_CALL";
-  tag [ FUNC_CALL ] = "FUNC_CALL";
-  tag [ CONSTRUCTOR_REF ] = "CONSTRUCTOR_REF";
-  tag [ ACCESS_REF ] = "ACCESS_REF";
-  tag [ CONS ] = "CONS";
-  tag [ ACCESS ] = "ACCESS";
-  tag [ IOACCESS ] = "IOACCESS";
-  tag [ CONTROL_LIST ] = "CONTROL_LIST";
-  tag [ SEQ ] = "SEQ";
-  tag [ SPEC_PAIR ] = "SPEC_PAIR";
-  tag [ COMM_LIST ] = "COMM_LIST";
-  tag [ STMT_STR ] = "STMT_STR";
-  tag [ EQUI_LIST ] = "EQUI_LIST";
-  tag [ IMPL_TYPE ] = "IMPL_TYPE";
-  tag [ STMTFN_DECL ] = "STMTFN_DECL";
-  tag [ BIT_COMPLEMENT_OP ] = "BIT_COMPLEMENT_OP";
-  tag [ EXPR_IF ] = "EXPR_IF";
-  tag [ EXPR_IF_BODY ] = "EXPR_IF_BODY";
-  tag [ FUNCTION_REF ] = "FUNCTION_REF";
-  tag [ LSHIFT_OP ] = "LSHIFT_OP";
-  tag [ RSHIFT_OP ] = "RSHIFT_OP";
-  tag [ UNARY_ADD_OP ] = "UNARY_ADD_OP";
-  tag [ SIZE_OP ] = "SIZE_OP";
-  tag [ INTEGER_DIV_OP ] = "INTEGER_DIV_OP";
-  tag [ SUB_OP ] = "SUB_OP";
-  tag [ LE_OP ] = "LE_OP";
-  tag [ GE_OP ] = "GE_OP";
-  tag [ NE_OP ] = "NE_OP";
-  tag [ CLASSINIT_OP ] = "CLASSINIT_OP";
-  tag [ CAST_OP ] = "CAST_OP";
-  tag [ ADDRESS_OP ] = "ADDRESS_OP";
-  tag [ POINSTAT_OP ] = "POINSTAT_OP";
-  tag [ COPY_NODE ] = "COPY_NODE";
-  tag [ INIT_LIST ] = "INIT_LIST";
-  tag [ VECTOR_CONST ] = "VECTOR_CONST";
-  tag [ BIT_NUMBER ] = "BIT_NUMBER";
-  tag [ ARITH_ASSGN_OP ] = "ARITH_ASSGN_OP";
-  tag [ ARRAY_OP ] = "ARRAY_OP";
-  tag [ NEW_OP ] = "NEW_OP";
-  tag [ DELETE_OP ] = "DELETE_OP";
-  tag [ NAMELIST_LIST ] = "NAMELIST_LIST";
-  tag [ THIS_NODE ] = "THIS_NODE";
-  tag [ SCOPE_OP ] = "SCOPE_OP";
-  tag [ PLUS_ASSGN_OP ] = "PLUS_ASSGN_OP";
-  tag [ MINUS_ASSGN_OP ] = "MINUS_ASSGN_OP";
-  tag [ AND_ASSGN_OP ] = "AND_ASSGN_OP";
-  tag [ IOR_ASSGN_OP ] = "IOR_ASSGN_OP";
-  tag [ MULT_ASSGN_OP ] = "MULT_ASSGN_OP";
-  tag [ DIV_ASSGN_OP ] = "DIV_ASSGN_OP";
-  tag [ MOD_ASSGN_OP ] = "MOD_ASSGN_OP";
-  tag [ XOR_ASSGN_OP ] = "XOR_ASSGN_OP";
-  tag [ LSHIFT_ASSGN_OP ] = "LSHIFT_ASSGN_OP";
-  tag [ RSHIFT_ASSGN_OP ] = "RSHIFT_ASSGN_OP";
-  tag [ ORDERED_OP ] = "ORDERED_OP";
-  tag [ EXTEND_OP ] = "EXTEND_OP";
-  tag [ MAXPARALLEL_OP ] = "MAXPARALLEL_OP";
-  tag [ SAMETYPE_OP ] = "SAMETYPE_OP";
-  tag [ TYPE_REF ] = "TYPE_REF";
-  tag [ STRUCTURE_CONSTRUCTOR ] = "STRUCTURE_CONSTRUCTOR";
-  tag [ ARRAY_CONSTRUCTOR ] = "ARRAY_CONSTRUCTOR";
-  tag [ SECTION_REF ] = "SECTION_REF";
-  tag [ VECTOR_SUBSCRIPT ] = "VECTOR_SUBSCRIPT";
-  tag [ SECTION_OPERANDS ] = "SECTION_OPERANDS";
-  tag [ KEYWORD_ARG ] = "KEYWORD_ARG";
-  tag [ OVERLOADED_CALL ] = "OVERLOADED_CALL";
-  tag [ INTERFACE_REF ] = "INTERFACE_REF";
-  tag [ RENAME_NODE ] = "RENAME_NODE";
-  tag [ TYPE_NODE ] = "TYPE_NODE";
-  tag [ PAREN_OP ] = "PAREN_OP";
-  tag [ PARAMETER_OP ] = "PARAMETER_OP";
-  tag [ PUBLIC_OP ] = "PUBLIC_OP";
-  tag [ PRIVATE_OP ] = "PRIVATE_OP";
-  tag [ ALLOCATABLE_OP ] = "ALLOCATABLE_OP";
-  tag [ DIMENSION_OP ] = "DIMENSION_OP";
-  tag [ EXTERNAL_OP ] = "EXTERNAL_OP";
-  tag [ IN_OP ] = "IN_OP";
-  tag [ OUT_OP ] = "OUT_OP";
-  tag [ INOUT_OP ] = "INOUT_OP";
-  tag [ INTRINSIC_OP ] = "INTRINSIC_OP";
-  tag [ POINTER_OP ] = "POINTER_OP";
-  tag [ OPTIONAL_OP ] = "OPTIONAL_OP";
-  tag [ SAVE_OP ] = "SAVE_OP";
-  tag [ TARGET_OP ] = "TARGET_OP";
-  tag [ ONLY_NODE ] = "ONLY_NODE";
-  tag [ LEN_OP ] = "LEN_OP";
-  tag [ TYPE_OP ] = "TYPE_OP";
-  tag [ DOTSTAR_OP ] = "DOTSTAR_OP";
-  tag [ ARROWSTAR_OP ] = "ARROWSTAR_OP";
-  tag [ FORDECL_OP ] = "FORDECL_OP";
-  tag [ THROW_OP ] = "THROW_OP";
-  tag [ PROCESSORS_REF ] = "PROCESSORS_REF";
-  tag [ PORT_TYPE_OP ] = "PORT_TYPE_OP";
-  tag [ INPORT_TYPE_OP ] = "INPORT_TYPE_OP";
-  tag [ OUTPORT_TYPE_OP ] = "OUTPORT_TYPE_OP";
-  tag [ INPORT_NAME ] = "INPORT_NAME";
-  tag [ OUTPORT_NAME ] = "OUTPORT_NAME";
-  tag [ FROMPORT_NAME ] = "FROMPORT_NAME";
-  tag [ TOPORT_NAME ] = "TOPORT_NAME";
-  tag [ IOSTAT_STORE ] = "IOSTAT_STORE";
-  tag [ EMPTY_STORE ] = "EMPTY_STORE";
-  tag [ ERR_LABEL ] = "ERR_LABEL";
-  tag [ END_LABEL ] = "END_LABEL";
-  tag [ PROS_CALL ] = "PROS_CALL";
-  tag [ STATIC_OP ] = "STATIC_OP";
-  tag [ LABEL_ARG ] = "LABEL_ARG";
-  tag [ DATA_IMPL_DO ] = "DATA_IMPL_DO";
-  tag [ DATA_ELT ] = "DATA_ELT";
-  tag [ DATA_SUBS ] = "DATA_SUBS";
-  tag [ DATA_RANGE ] = "DATA_RANGE";
-  tag [ ICON_EXPR ] = "ICON_EXPR";
-  tag [ BLOCK_OP ] = "BLOCK_OP";
-  tag [ NEW_SPEC_OP ] = "NEW_SPEC_OP";
-  tag [ REDUCTION_OP ] = "REDUCTION_OP";
-  tag [ SHADOW_RENEW_OP ] = "SHADOW_RENEW_OP";
-  tag [ SHADOW_START_OP ] = "SHADOW_START_OP";
-  tag [ SHADOW_WAIT_OP ] = "SHADOW_WAIT_OP";
-  tag [ DIAG_OP ] = "DIAG_OP";
-  tag [ REMOTE_ACCESS_OP ] = "REMOTE_ACCESS_OP";
-  tag [ TEMPLATE_OP ] = "TEMPLATE_OP";
-  tag [ PROCESSORS_OP ] = "PROCESSORS_OP";
-  tag [ DYNAMIC_OP ] = "DYNAMIC_OP";
-  tag [ ALIGN_OP ] = "ALIGN_OP";
-  tag [ DISTRIBUTE_OP ] = "DISTRIBUTE_OP";
-  tag [ SHADOW_OP ] = "SHADOW_OP";
-  tag [ INDIRECT_ACCESS_OP ] = "INDIRECT_ACCESS_OP";
-  tag [ ACROSS_OP ] = "ACROSS_OP";
-  tag [ NEW_VALUE_OP ] = "NEW_VALUE_OP";
-  tag [ SHADOW_COMP_OP ] = "SHADOW_COMP_OP";
-  tag [ STAGE_OP ] = "STAGE_OP";
-  tag [ FORALL_OP ] = "FORALL_OP";
-  tag [ CONSISTENT_OP ] = "CONSISTENT_OP";
-  tag [ INTERFACE_OPERATOR ] = "INTERFACE_OPERATOR";
-  tag [ INTERFACE_ASSIGNMENT ] = "INTERFACE_ASSIGNMENT";
-  tag [ VAR_DECL_90 ] = "VAR_DECL_90";
-  tag [ ASSIGNMENT_OP ] = "ASSIGNMENT_OP";
-  tag [ OPERATOR_OP ] = "OPERATOR_OP";
-  tag [ KIND_OP ] = "KIND_OP";
-  tag [ LENGTH_OP ] = "LENGTH_OP";
-  tag [ RECURSIVE_OP ] = "RECURSIVE_OP";
-  tag [ ELEMENTAL_OP ] = "ELEMENTAL_OP";
-  tag [ PURE_OP ] = "PURE_OP";
-  tag [ DEFINED_OP ] = "DEFINED_OP";
-  tag [ PARALLEL_OP ] = "PARALLEL_OP";
-  tag [ INDIRECT_OP ] = "INDIRECT_OP";
-  tag [ DERIVED_OP ] = "DERIVED_OP";
-  tag [ DUMMY_REF ] = "DUMMY_REF";
-  tag [ COMMON_OP ] = "COMMON_OP";
-  tag [ SHADOW_NAMES_OP ] = "SHADOW_NAMES_OP";
-
-/***************** variant tags for symbol table entries ********************/
-
-  tag [ CONST_NAME ] = "CONST_NAME";
-  tag [ ENUM_NAME ] = "ENUM_NAME";
-  tag [ FIELD_NAME ] = "FIELD_NAME";
-  tag [ VARIABLE_NAME ] = "VARIABLE_NAME";
-  tag [ TYPE_NAME ] = "TYPE_NAME";
-  tag [ PROGRAM_NAME ] = "PROGRAM_NAME";
-  tag [ PROCEDURE_NAME ] = "PROCEDURE_NAME";
-  tag [ VAR_FIELD ] = "VAR_FIELD";
-  tag [ LABEL_VAR ] = "LABEL_VAR";
-  tag [ FUNCTION_NAME ] = "FUNCTION_NAME";
-  tag [ MEMBER_FUNC ] = "MEMBER_FUNC";
-  tag [ CLASS_NAME ] = "CLASS_NAME";
-  tag [ UNION_NAME ] = "UNION_NAME";
-  tag [ STRUCT_NAME ] = "STRUCT_NAME";
-  tag [ LABEL_NAME ] = "LABEL_NAME";
-  tag [ COLLECTION_NAME ] = "COLLECTION_NAME";
-  tag [ ROUTINE_NAME ] = "ROUTINE_NAME";
-  tag [ CONSTRUCT_NAME ] = "CONSTRUCT_NAME";
-  tag [ INTERFACE_NAME ] = "INTERFACE_NAME";
-  tag [ MODULE_NAME ] = "MODULE_NAME";
-  tag [ TEMPLATE_CL_NAME ] = "TEMPLATE_CL_NAME";
-  tag [ TEMPLATE_FN_NAME ] = "TEMPLATE_FN_NAME";
-  tag [ TECLASS_NAME ] = "TECLASS_NAME";
-  tag [ SHADOW_GROUP_NAME ] = "SHADOW_GROUP_NAME";
-  tag [ REDUCTION_GROUP_NAME ] = "REDUCTION_GROUP_NAME";
-  tag [ REF_GROUP_NAME ] = "REF_GROUP_NAME";
-  tag [ ASYNC_ID ] = "ASYNC_ID";
-  tag [ CONSISTENT_GROUP_NAME ] = "CONSISTENT_GROUP_NAME";
-  tag [ NAMELIST_NAME ] = "NAMELIST_NAME";
-  tag [ COMMON_NAME ] = "COMMON_NAME";
-
-  tag [ DEFAULT ] = "DEFAULT";
-  tag [ T_INT ] = "T_INT";
-  tag [ T_FLOAT ] = "T_FLOAT";
-  tag [ T_DOUBLE ] = "T_DOUBLE";
-  tag [ T_CHAR ] = "T_CHAR";
-  tag [ T_BOOL ] = "T_BOOL";
-  tag [ T_STRING ] = "T_STRING";
-  tag [ T_ENUM ] = "T_ENUM";
-  tag [ T_SUBRANGE ] = "T_SUBRANGE";
-  tag [ T_LIST ] = "T_LIST";
-  tag [ T_ARRAY ] = "T_ARRAY";
-  tag [ T_RECORD ] = "T_RECORD";
-  tag [ T_ENUM_FIELD ] = "T_ENUM_FIELD";
-  tag [ T_UNKNOWN ] = "T_UNKNOWN";
-  tag [ T_COMPLEX ] = "T_COMPLEX";
-  tag [ T_VOID ] = "T_VOID";
-  tag [ T_DESCRIPT ] = "T_DESCRIPT";
-  tag [ T_FUNCTION ] = "T_FUNCTION";
-  tag [ T_POINTER ] = "T_POINTER";
-  tag [ T_UNION ] = "T_UNION";
-  tag [ T_STRUCT ] = "T_STRUCT";
-  tag [ T_CLASS ] = "T_CLASS";
-  tag [ T_DERIVED_CLASS ] = "T_DERIVED_CLASS";
-  tag [ T_DERIVED_TYPE ] = "T_DERIVED_TYPE";
-  tag [ T_COLLECTION ] = "T_COLLECTION";
-  tag [ T_DERIVED_COLLECTION ] = "T_DERIVED_COLLECTION";
-  tag [ T_REFERENCE ] = "T_REFERENCE";
-  tag [ T_DERIVED_TEMPLATE ] = "T_DERIVED_TEMPLATE";
-  tag [ T_MEMBER_POINTER ] = "T_MEMBER_POINTER";
-  tag [ T_TECLASS ] = "T_TECLASS";
-  tag [ T_GATE ] = "T_GATE";
-  tag [ T_EVENT ] = "T_EVENT";
-  tag [ T_SEQUENCE ] = "T_SEQUENCE";
-  tag [ T_DCOMPLEX ] = "T_DCOMPLEX";
-  tag [ T_LONG ] = "T_LONG";
-  tag [ BY_USE ] = "BY_USE";
-  tag [ LOCAL ] = "LOCAL";
-  tag [ INPUT ] = "INPUT";
-  tag [ OUTPUT ] = "OUTPUT";
-  tag [ IO ] = "IO";
-  tag [ PROCESS_NAME ] = "PROCESS_NAME";
-
-  tag [ OMP_PRIVATE ] = "OMP_PRIVATE";
-  tag [ OMP_SHARED ] = "OMP_SHARED";
-  tag [ OMP_FIRSTPRIVATE ] = "OMP_FIRSTPRIVATE";
-  tag [ OMP_LASTPRIVATE ] = "OMP_LASTPRIVATE";
-  tag [ OMP_THREADPRIVATE ] = "OMP_THREADPRIVATE";
-  tag [ OMP_COPYIN ] = "OMP_COPYIN";
-  tag [ OMP_COPYPRIVATE ] = "OMP_COPYPRIVATE";
-  tag [ OMP_DEFAULT ] = "OMP_DEFAULT";
-  tag [ OMP_ORDERED ] = "OMP_ORDERED";
-  tag [ OMP_SCHEDULE ] = "OMP_SCHEDULE";
-  tag [ OMP_REDUCTION ] = "OMP_REDUCTION";
-  tag [ OMP_IF ] = "OMP_IF";
-  tag [ OMP_NUM_THREADS ] = "OMP_NUM_THREADS";
-  tag [ OMP_NOWAIT ] = "OMP_NOWAIT";
-  tag [ OMP_PARALLEL_DIR ] = "OMP_PARALLEL_DIR";
-  tag [ OMP_END_PARALLEL_DIR ] = "OMP_END_PARALLEL_DIR";
-  tag [ OMP_DO_DIR ] = "OMP_DO_DIR";
-  tag [ OMP_END_DO_DIR ] = "OMP_END_DO_DIR";
-  tag [ OMP_SECTIONS_DIR ] = "OMP_SECTIONS_DIR";
-  tag [ OMP_END_SECTIONS_DIR ] = "OMP_END_SECTIONS_DIR";
-  tag [ OMP_SECTION_DIR ] = "OMP_SECTION_DIR";
-  tag [ OMP_SINGLE_DIR ] = "OMP_SINGLE_DIR";
-  tag [ OMP_END_SINGLE_DIR ] = "OMP_END_SINGLE_DIR";
-  tag [ OMP_WORKSHARE_DIR ] = "OMP_WORKSHARE_DIR";
-  tag [ OMP_END_WORKSHARE_DIR ] = "OMP_END_WORKSHARE_DIR";
-  tag [ OMP_PARALLEL_DO_DIR ] = "OMP_PARALLEL_DO_DIR";
-  tag [ OMP_END_PARALLEL_DO_DIR ] = "OMP_END_PARALLEL_DO_DIR";
-  tag [ OMP_PARALLEL_SECTIONS_DIR ] = "OMP_PARALLEL_SECTIONS_DIR";
-  tag [ OMP_END_PARALLEL_SECTIONS_DIR ] = "OMP_END_PARALLEL_SECTIONS_DIR";
-  tag [ OMP_PARALLEL_WORKSHARE_DIR ] = "OMP_PARALLEL_WORKSHARE_DIR";
-  tag [ OMP_END_PARALLEL_WORKSHARE_DIR ] = "OMP_END_PARALLEL_WORKSHARE_DIR";
-  tag [ OMP_MASTER_DIR ] = "OMP_MASTER_DIR";
-  tag [ OMP_END_MASTER_DIR ] = "OMP_END_MASTER_DIR";
-  tag [ OMP_CRITICAL_DIR ] = "OMP_CRITICAL_DIR";
-  tag [ OMP_END_CRITICAL_DIR ] = "OMP_END_CRITICAL_DIR";
-  tag [ OMP_BARRIER_DIR ] = "OMP_BARRIER_DIR";
-  tag [ OMP_ATOMIC_DIR ] = "OMP_ATOMIC_DIR";
-  tag [ OMP_FLUSH_DIR ] = "OMP_FLUSH_DIR";
-  tag [ OMP_ORDERED_DIR ] = "OMP_ORDERED_DIR";
-  tag [ OMP_END_ORDERED_DIR ] = "OMP_END_ORDERED_DIR";
-  tag [ RECORD_DECL ] = "RECORD_DECL";
-  tag [ FUNC_STAT ] = "FUNC_STAT";
-  tag [ OMP_ONETHREAD_DIR ] = "OMP_ONETHREAD_DIR";
-  tag [ OMP_THREADPRIVATE_DIR ] = "OMP_THREADPRIVATE_DIR";
-  tag [ OMP_DEFAULT_SECTION_DIR ] = "OMP_DEFAULT_SECTION_DIR";
-  tag [ OMP_COLLAPSE ] = "OMP_COLLAPSE";
-
-  tag [ ACC_REGION_DIR ] = "ACC_REGION_DIR";
-  tag [ ACC_END_REGION_DIR ] = "ACC_END_REGION_DIR";
-  tag [ ACC_CALL_STMT ] = "ACC_CALL_STMT";
-  tag [ ACC_KERNEL_HEDR ] = "ACC_KERNEL_HEDR";
-  tag [ ACC_GET_ACTUAL_DIR ] = "ACC_GET_ACTUAL_DIR";
-  tag [ ACC_ACTUAL_DIR ] = "ACC_ACTUAL_DIR";
-  tag [ ACC_CHECKSECTION_DIR ] = "ACC_CHECKSECTION_DIR";
-  tag [ ACC_END_CHECKSECTION_DIR ] = "ACC_END_CHECKSECTION_DIR";
-  tag [ ACC_ROUTINE_DIR ] = "ACC_ROUTINE_DIR";
-  tag [ ACC_DECLARE_DIR ] = "ACC_DECLARE_DIR";
-
-  tag [ ACC_TIE_OP ] = "ACC_TIE_OP";
-  tag [ ACC_INLOCAL_OP ] = "ACC_INLOCAL_OP";
-  tag [ ACC_INOUT_OP ] = "ACC_INOUT_OP";
-  tag [ ACC_IN_OP ] = "ACC_IN_OP";
-  tag [ ACC_OUT_OP ] = "ACC_OUT_OP";
-  tag [ ACC_LOCAL_OP ] = "ACC_LOCAL_OP";
-  tag [ ACC_PRIVATE_OP ] = "ACC_PRIVATE_OP";
-  tag [ ACC_DEVICE_OP ] = "ACC_DEVICE_OP";
-  tag [ ACC_CUDA_OP ] = "ACC_CUDA_OP";
-  tag [ ACC_HOST_OP ] = "ACC_HOST_OP";
-
-  tag [ ACC_GLOBAL_OP ] = "ACC_GLOBAL_OP";
-  tag [ ACC_ATTRIBUTES_OP ] = "ACC_ATTRIBUTES_OP";
-  tag [ ACC_VALUE_OP ] = "ACC_VALUE_OP";
-  tag [ ACC_SHARED_OP ] = "ACC_SHARED_OP";
-  tag [ ACC_CONSTANT_OP ] = "ACC_CONSTANT_OP";
-  tag [ ACC_USES_OP ] = "ACC_USES_OP";
-  tag [ ACC_CALL_OP ] = "ACC_CALL_OP";
-  tag [ ACC_CUDA_BLOCK_OP ] = "ACC_CUDA_BLOCK_OP";
-
-  tag [ ACC_TARGETS_OP ] = "ACC_TARGETS_OP";
-  tag [ ACC_ASYNC_OP ] = "ACC_ASYNC_OP";
-
-  tag [ SPF_ANALYSIS_DIR ] = "SPF_ANALYSIS_DIR";
-  tag [ SPF_PARALLEL_DIR ] = "SPF_PARALLEL_DIR";
-  tag [ SPF_TRANSFORM_DIR ] = "SPF_TRANSFORM_DIR";
-  tag [ SPF_NOINLINE_OP ] = "SPF_NOINLINE_OP";
-  tag [ SPF_PARALLEL_REG_DIR ] = "SPF_PARALLEL_REG_DIR";
-  tag [ SPF_END_PARALLEL_REG_DIR ] = "SPF_END_PARALLEL_REG_DIR";
-  tag [ SPF_REGION_NAME ] = "SPF_REGION_NAME";
-  tag [ SPF_EXPAND_OP ] = "SPF_EXPAND_OP";
-  tag [ SPF_FISSION_OP ] = "SPF_FISSION_OP";
-  tag [ SPF_SHRINK_OP ] = "SPF_SHRINK_OP";
-  tag [ SPF_CHECKPOINT_DIR ] = "SPF_CHECKPOINT_DIR";
-  tag [ SPF_TYPE_OP ] = "SPF_TYPE_OP";
-  tag [ SPF_VARLIST_OP ] = "SPF_VARLIST_OP";
-  tag [ SPF_EXCEPT_OP ] = "SPF_EXCEPT_OP";
-  tag [ SPF_FILES_COUNT_OP ] = "SPF_FILES_COUNT_OP";
-  tag [ SPF_INTERVAL_OP ] = "SPF_INTERVAL_OP";
-  tag [ SPF_TIME_OP ] = "SPF_TIME_OP";
-  tag [ SPF_ITER_OP ] = "SPF_ITER_OP";
-  tag [ SPF_FLEXIBLE_OP ] = "SPF_FLEXIBLE_OP";
-  tag [ SPF_PARAMETER_OP ] = "SPF_PARAMETER_OP";
-  tag [ SPF_CODE_COVERAGE_OP ] = "SPF_CODE_COVERAGE_OP";
-  tag [ SPF_UNROLL_OP ] = "SPF_UNROLL_OP";
-  tag [ SPF_COVER_OP ] = "SPF_COVER_OP";
-  tag [ SPF_MERGE_OP ] = "SPF_MERGE_OP";
-  tag [ SPF_PROCESS_PRIVATE_OP ] = "SPF_PROCESS_PRIVATE_OP";
-  tag [ SPF_WEIGHT_OP ] = "SPF_WEIGHT_OP";
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/tag_make b/projects/dvm_svn/fdvm/trunk/Sage/h/tag_make
deleted file mode 100644
index 68b8d7d..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/tag_make
+++ /dev/null
@@ -1,7 +0,0 @@
-all:	tag.h
-
-tag.h:	head tag
-	( cat head; \
-	  sed < tag \
-	    '/#defin/s/\([^ ]*\) \([^ 	]*\)\(.*\)/  tag \[ \2 \] = \"\2\";/')\
-	  > tag.h
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/version.h b/projects/dvm_svn/fdvm/trunk/Sage/h/version.h
deleted file mode 100644
index 6db35ab..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/version.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define VERSION_NUMBER     "6.9"
-#define VERSION_NUMBER_INT "69"
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/vextern.h b/projects/dvm_svn/fdvm/trunk/Sage/h/vextern.h
deleted file mode 100644
index c2b08ce..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/vextern.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-
-/* Modified By Jenq-Kuen Lee Nov 20, 1987 */
-
-extern int NoWarnings;  /* Used by newer code pC++2dep (phb) */
-extern int nowarnflag;  /* Used by older obsolete code c2dep, f2dep */
-
-/* The following variable used by verrors.c */
-extern int yylineno;
-extern char *infname;
-extern int nwarn;
-extern int errcnt;
-extern int errline;
-extern int  wait_first_include_name;
-extern  char *first_line_name;
-
-/* leave it out */
-/*
-
-extern char yytext[];
-
-
-extern int yyleng;
-extern int lineno;
-extern int needkwd;
-extern int inioctl;
-extern int shiftcase;
-
-extern int parstate;
-extern int blklevel;
-
-extern int procclass;
-extern long procleng;
-extern int nentry;
-extern int blklevel;
-extern int undeftype;
-extern int dorange;
-extern char intonly;
-*/
-
-
-
-
-
-
-
-
-extern int     num_bfnds;		/* total # of bif nodes */
-extern int     num_llnds;		/* total # of low level nodes */
-extern int     num_symbs;		/* total # of symbol nodes */
-extern int     num_types;		/* total # of types nodes */
-extern int     num_blobs;		/* total # of blob nodes */
-extern int     num_sets;		/* total # of set nodes */
-extern int     num_cmnt;
-extern int     num_def;		/* total # of dependncy nodes */
-extern int	num_dep;
-extern int     num_deflst;
-extern int     num_label;		/* total # of label nodes */
-extern int     num_files;
-
-extern int     cur_level;		/* current block level */
-extern int     next_level;
-
-extern char   *tag[610];
-
-extern PTR_SYMB global_list;
-
-extern PTR_BFND head_bfnd,	/* start of bfnd chain */
-	        cur_bfnd,	/* poextern int to current bfnd */
-                pred_bfnd,	/* used in finding the predecessor */
-                last_bfnd;
-
-extern PTR_LLND head_llnd, cur_llnd;
-
-extern PTR_SYMB head_symb, cur_symb;
-
-extern PTR_TYPE head_type, cur_type;
-
-extern PTR_LABEL head_label, cur_label, thislabel;
-
-extern PTR_FNAME head_file,cur_thread_file;
-
-extern PTR_BLOB head_blob, cur_blob;
-
-extern PTR_SETS head_sets, cur_sets;
-
-extern PTR_DEF head_def, cur_def;
-
-extern PTR_DEFLST head_deflst, cur_deflst;
-
-extern PTR_DEP head_dep, cur_dep, pre_dep;
-
-/*************************************************************************/
-/* DECLARE is defined to be null (nothing) so that the variable is declared,
-   or it is defined to be "extern". (phb) */
-
-#ifndef DECLARE
-#define DECLARE extern
-#endif
-
-DECLARE PTR_CMNT head_cmnt, cur_cmnt;
-DECLARE PTR_BLOB global_blob ; 
-DECLARE PTR_BFND global_bfnd;
-DECLARE PTR_SYMB star_symb;
-DECLARE PTR_TYPE vartype;
-DECLARE PTR_CMNT comments;
-
-#undef DECLARE
-/*************************************************************************/
-
-extern PTR_CMNT cur_comment;
-/* struct Ctlframe *ctlsp = (struct Ctlframe *)NULL;  */
-
-extern PTR_TYPE make_type();
-extern PTR_SYMB make_symb();
-extern PTR_BFND make_bfnd();
-extern PTR_BFND make_bfndnt(); /* non-threaded ver. (lib/oldsrc/make_nodes.c */
-extern PTR_BFND get_bfnd();
-extern PTR_BLOB make_blob();
-extern PTR_LLND make_llnd();
-extern void	 init_hash();
-
-extern PTR_TYPE global_int, global_float, global_double, global_char, global_string,global_void;
-extern PTR_TYPE global_bool, global_complex, global_default, global_string_2;
-
-extern char	*ckalloc();
-extern char	*copyn(), *copys();
-
-#define ALLOC(x)  (struct x *) ckalloc(sizeof(struct x))
-
-#define INLOOP(x) ((LOOP_NODE <= x) && (x <= WHILE_NODE))
-/* Used By pC++2dep  */
-extern int ExternLangDecl;  /* PHB */
-extern int mod_offset ;
-extern int old_line ;
-extern int branch_flag;
-extern int main_type_flag ;
-extern int primary_flag;
-extern int function_flag ;
-extern int friend_flag ;
-extern int cur_flag ;
-extern int exception_flag ;
-extern PTR_SYMB first_symbol,right_symbol ;
-extern PTR_BFND passed_bfnd;
-extern PTR_BFND new_cur_bfnd ;
-extern PTR_LLND new_cur_llnd ;
-extern PTR_TYPE new_cur_type ;
-extern PTR_SYMB new_cur_symb;
-extern char     *new_cur_fname;
-extern char     *line_pos_fname;
-extern PTR_HASH cur_id_entry ;
-extern PTR_CMNT new_cur_comment;
-extern int      yydebug ;
-extern int      TRACEON ;
-extern int      declare_flag ;
-extern int      not_fetch_yet ;  /* for comments */
-extern int      recursive_yylex;   /* for comments */
-extern int      line_pos_1 ;
-extern PTR_FILE fi;
-PTR_TYPE get_type();
-PTR_LABEL get_label();
-extern PTR_SYMB elementtype_symb;
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/vparse.h b/projects/dvm_svn/fdvm/trunk/Sage/h/vparse.h
deleted file mode 100644
index 8c3a172..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/vparse.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* Modified By Jenq-Kuen Lee Sep 30, 1987          */
-/* Define constants for communication with parse.y. */
-/* Copyright (C) 1987 Free Software Foundation, Inc. */
-
-#include <stdio.h>
-enum rid
-{
-  RID_UNUSED,
-  RID_INT,
-  RID_CHAR,
-  RID_FLOAT,
-  RID_DOUBLE,
-  RID_VOID,
-  RID_UNUSED1,
-
-  RID_UNSIGNED,
-  RID_SHORT,
-  RID_LONG,
-  RID_AUTO,
-  RID_STATIC,
-  RID_EXTERN,
-  RID_REGISTER,
-  RID_TYPEDEF,
-  RID_SIGNED,
-  RID_CONST,
-  RID_VOLATILE,
-  RID_PRIVATE,
-  RID_FUTURE,
-  RID_VIRTUAL,
-  RID_INLINE,
-  RID_FRIEND,
-  RID_PUBLIC,
-  RID_PROTECTED,
-  RID_SYNC,
-  RID_GLOBL,
-  RID_ATOMIC,
-  RID_KSRPRIVATE,
-  RID_RESTRICT,
-  RID_MAX,
-  RID_CUDA_GLOBAL,
-  RID_CUDA_SHARED,
-  RID_CUDA_DEVICE,
-
-  LONG_UNSIGNED_TYPE_CONST,       /*  For numerical constant  */
-  LONG_INTEGER_TYPE_CONST,
-  UNSIGNED_TYPE_CONST,
-  INTEGER_TYPE_CONST,
-  FLOAT_TYPE_CONST,
-  LONG_DOUBLE_TYPE_CONST,
-  DOUBLE_TYPE_CONST,
-                                  /* For char constant   */
-  UNSIGNED_CHAR_TYPE_CONST,
-  CHAR_TYPE_CONST,
-  CHAR_ARRAY_TYPE_CONST,
-
-  PLUS_EXPR ,                    /* Statement code  */
-  MINUS_EXPR,
-  BIT_AND_EXPR,
-  BIT_IOR_EXPR,
-  MULT_EXPR,
-  TRUNC_DIV_EXPR,
-  TRUNC_MOD_EXPR,
-  BIT_XOR_EXPR,
-  LSHIFT_EXPR ,
-  RSHIFT_EXPR,
-  LT_EXPR,
-  GT_EXPR,
-  LE_EXPR,
-  GE_EXPR,
-  NE_EXPR,
-  EQ_EXPR
-};
-
-/* #define RID_FIRST_MODIFIER RID_UNSIGNED   */
-
-#define NEXT_FULL     10 /*for comments type, FULL, HALF, NEXT_FULL */
-
-/* for access_flag */
-#define BIT_PROTECTED 1 /* note: also see PROTECTED_FIELD */
-#define BIT_PUBLIC    2 /* note: also see PUBLIC_FIELD  */ 
-#define BIT_PRIVATE   4 /* note: also see PRIVATE_FIELD */
-#define BIT_FUTURE    8
-#define BIT_VIRTUAL   16
-#define BIT_INLINE    32
-
-/*for signed_flag */
-#define BIT_UNSIGNED  64
-#define BIT_SIGNED    128
-
-/* for long_short_flag */
-#define BIT_SHORT     256
-#define BIT_LONG      512
-
-/* for mod_flag */
-#define BIT_VOLATILE  1024
-#define BIT_CONST     1024*2
-#define BIT_GLOBL     1024*128*2
-#define BIT_SYNC      1024*128*4
-#define BIT_ATOMIC    1024*128*8
-#define BIT_KSRPRIVATE 1024*128*16
-#define BIT_RESTRICT  1024*128*32
-/* for storage flag */
-#define BIT_TYPEDEF   1024*4
-#define BIT_EXTERN    1024*8
-#define BIT_AUTO      1024*128  /* swapped values for AUTO and FRIEND */
-#define BIT_STATIC    1024*32
-#define BIT_REGISTER  1024*64
-#define BIT_FRIEND    1024*16 /* so that friend would fit in u_short BW*/ 
-
-#define MAX_BIT       1024*128*64
-#define STORAGE_FLAG  1024*(4+8+16+32+64+128)
-#define BIT_OPENMP    1024*128*128     /* OpenMP Fortran */
-#define BIT_CUDA_GLOBAL 1024*128*256     /* Cuda */
-#define BIT_CUDA_SHARED 1024*128*512     /* Cuda */
-#define BIT_CUDA_DEVICE 1024*128*1024    /* Cuda */
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/vpc.h b/projects/dvm_svn/fdvm/trunk/Sage/h/vpc.h
deleted file mode 100644
index a5bdd96..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/vpc.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* TAG : pC++2dep used Created by Jenq_kuen Lee  Nov 28, 1987 */
-/* definitions of Some Key_echo */
-/* Define results of standard character escape sequences.  */
-#define TARGET_BELL 007
-#define TARGET_BS 010
-#define TARGET_TAB 011
-#define TARGET_NEWLINE 012
-#define TARGET_VT 013
-#define TARGET_FF 014
-#define TARGET_CR 015
-
-
-#define BITS_PER_UNIT  8
-#define pedantic       1
-
-/* Debugging flag */
-
-
-/* switch used for parser */
-#define UP_TO_CLASS     6
-#define UP_ONE_LEVEL    5
-#define UP_TO_NODECL    4
-#define UP_TO_FUNC_HEDR 3
-#define OTHER 2
-#define ON 1
-#define OFF 0
-
-/* switch used for parser */
-#define ONE 1
-#define TWO 2
-#define THREE 3
-
-#define DONOT_CARE     0
-
-#define TYPE_CLEAN 0
-#define TYPE_ONE 1
-#define TYPE_TWO 2
-#define TYPE_THREE 3
-#define TYPE_FOUR  4
-#define TYPE_FIVE 5
-
-#define BRANCH_OFF 0
-#define BRANCH_ON  1
-
-/* flag for declarator rule */
-/* information kept in cur_flag */
-#define  RULE_PARAM   1
-#define  RULE_ID      2
-#define  RULE_MULTIPLE_ID 4
-#define  RULE_LR      8
-#define  RULE_DEREF   16
-#define  RULE_ARRAY   32
-#define  RULE_ARRAY_E 64
-#define  RULE_CLASSINIT  128
-#define  RULE_ERROR      256
-#define  LAZY_INSTALL    512
-#define  CLEAN        0
-
-/* flag for primary_flag */
-#define ID_ONLY  1
-#define RANGE_APPEAR 2
-#define EXCEPTION_ON 4
-#define EXPR_LR      8
-#define VECTOR_CONST_APPEAR 16
-#define ARRAY_OP_NEED 32
-
-/* flag for access_class for parameter_flag  */
-#define XDECL       4096
-
-/* automata state for comments.c */
-#define ZERO     0
-#define STATE_1  1
-#define STATE_2  2
-#define STATE_3  3
-#define STATE_4  4
-#define STATE_5  5
-#define STATE_6  6
-#define STATE_7  7
-#define STATE_8  8
-#define STATE_9  9
-#define STATE_10 10
-#define STATE_11 11
-#define STATE_12 12
-#define STATE_13 13
-#define STATE_14 14
-#define STATE_15 15
-#define STATE_16 16
-#define STATE_17 17
-#define STATE_18 18
-#define STATE_19 19
-#define STATE_20 20
-#define IF_STATE            30
-#define IF_STATE_2          32
-#define IF_STATE_3          33
-#define IF_STATE_4          34
-#define ELSE_EXPECTED_STATE 35
-#define BLOCK_STATE         40
-#define BLOCK_STATE_2       42
-#define WHILE_STATE         50
-#define WHILE_STATE_2       52
-#define FOR_STATE           55
-#define FOR_STATE_2         56
-#define CASE_STATE          57
-#define COEXEC_STATE        58
-#define COEXEC_STATE_2      59
-#define COLOOP_STATE        60
-#define COLOOP_STATE_2      61
-#define DO_STATE            62
-#define DO_STATE_1          63 
-#define DO_STATE_2          64
-#define DO_STATE_3          65
-#define DO_STATE_4          66
-#define DO_STATE_5          67
-#define DO_STATE_6          68
-#define RETURN_STATE        70
-#define RETURN_STATE_2      71
-#define RETURN_STATE_3      72
-#define GOTO_STATE          75
-#define GOTO_STATE_2        76
-#define SWITCH_STATE        80
-#define SWITCH_STATE_2      81
-#define STATE_ARG           82
-#define BLOCK_STATE_WAITSEMI 83
-#define TEMPLATE_STATE      84
-#define TEMPLATE_STATE_2    85
-#define CONSTR_STATE	    86
-/* for comments.c */
-#define MAX_NESTED_SIZE 800
-
-
-
-/* parameter for function body and struct declaration body  */
-#define  NOT_SEEN  1    
-#define  BEEN_SEEN 0
-#define  FUNCTION_BODY_APPEAR 700
-
-/* parameter for find_type_symbol  */
-#define  TYPE_ONLY    1     /* TYPE_NAME */
-#define  STRUCT_ONLY  2     
-#define  VAR_ONLY     4
-#define  FIELD_ONLY   8
-#define FUNCTION_NAME_ONLY 16
-#define MEMBER_FUNC_ONLY 32
-
-
-/*flag for the error message of lazy_install */
-/* No More symbol, Alliant C compiler's symbol table is full */
-/* #define NOW 1   */
-/* #define DELAY 2 */
-/* For symbptr->attr  */
-#define ATT_CLUSTER     0
-#define ATT_GLOBAL      1
-#define PURE            8
-#define PRIVATE_FIELD   16
-#define PROTECTED_FIELD 32
-#define PUBLIC_FIELD    64
-#define ELEMENT_FIELD   128
-#define COLLECTION_FIELD 256
-#define CONSTRUCTOR      512
-#define DESTRUCTOR       1024
-#define PCPLUSPLUS_DOSUBSET 2048
-#define INVALID             4096
-#define SUBCOLLECTION       4096*2
-/* #define OVOPERATOR	4096*4  (defined in macro.h) (phb) */
-#define VIRTUAL_DESTRUCTOR 4096*8 /* added by BW */
-
-/* For find_type_symbol() */
-/* for check_field_decl_3 */
-#define ALL_FIELDS    1
-#define CLASS_ONLY    2
-#define COLLECTION_ONLY 3
-#define ELEMENT_ONLY    4
-#define FUNCTION_ONLY 5
-
-/* for collection nested dimension */
-#define MAX_NESTED_DIM 5
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/h/window.h b/projects/dvm_svn/fdvm/trunk/Sage/h/window.h
deleted file mode 100644
index ddc1adb..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/h/window.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-
-#define MAX_WINDOW 256
-#define MAX_ARRAYREF 256
-#define MAX_STEP 10000
-#define NO_STEP 10000
-struct WINDOW
-{
- int dimension;
- int Array_Id[MAX_ARRAYREF];
- int level;
- int level_update;
- char name[64];
- char gain[128];
- int coeff[MAXTILE][MAXTILE];
- int inf[MAXTILE];
- int sup[MAXTILE];
- int nb_ref;
- PTR_SYMB symb;
- PTR_SYMB array_symbol;
- PTR_SYMB pt;
- int lambda[MAXTILE];
- int delta[MAXTILE];
- int size[MAXTILE];
- int cst[MAXTILE];
-};
-
-struct WINDOWS 
-{
-  int nb_windows;
-  int nb_loop;
-  int tile_order[MAXTILE];
-  int tile_sup[MAXTILE];
-  int tile_inf[MAXTILE];
-  int tile_bounds[MAXTILE];
-  struct WINDOW thewindow[MAX_WINDOW];
-  PTR_SYMB index[MAXTILE];
-};
-
-
-#define WINDS_NB(NODE)           ((NODE).nb_windows)
-#define WINDS_INDEX(NODE)        ((NODE).index)
-#define WINDS_NB_LOOP(NODE)      ((NODE).nb_loop)
-#define WINDS_TILE_INF(NODE)     ((NODE).tile_inf)
-#define WINDS_TILE_SUP(NODE)     ((NODE).tile_sup)
-#define WINDS_TILE_ORDER(NODE)   ((NODE).tile_order)
-#define WINDS_TILE_BOUNDS(NODE)  ((NODE).tile_bounds)
-#define WINDS_WINDOWS(NODE,NUM)  (&((NODE).thewindow[NUM]))
-
-#define WIND_DIM(NODE)           ((NODE)->dimension)
-#define WIND_ARRAY(NODE)         ((NODE)->Array_Id)
-#define WIND_LEVEL(NODE)         ((NODE)->level)
-#define WIND_LEVEL_UPDATE(NODE)  ((NODE)->level_update)
-#define WIND_NB_REF(NODE)        ((NODE)->nb_ref)
-#define WIND_SYMBOL(NODE)        ((NODE)->symb)
-#define WIND_POINTER(NODE)       ((NODE)->pt)
-#define WIND_NAME(NODE)          ((NODE)->name)
-#define WIND_GAIN(NODE)          ((NODE)->gain)
-#define WIND_COEFF(NODE)         ((NODE)->coeff)
-#define WIND_INF(NODE)           ((NODE)->inf)
-#define WIND_SUP(NODE)           ((NODE)->sup)
-#define WIND_LAMBDA(NODE)        ((NODE)->lambda)
-#define WIND_DELTA(NODE)         ((NODE)->delta)
-#define WIND_SIZE_DIM(NODE)      ((NODE)->size)
-#define WIND_DIM_CST(NODE)       ((NODE)->cst)
-#define WIND_ARRAY_SYMBOL(NODE)  ((NODE)->array_symbol)
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/lib/CMakeLists.txt
deleted file mode 100644
index 169f04a..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-set(DVM_SAGE_INCLUDE_DIRS ${DVM_SAGE_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}/include)
-set(DVM_SAGE_INCLUDE_DIRS ${DVM_SAGE_INCLUDE_DIRS} PARENT_SCOPE)
-
-add_subdirectory(newsrc)
-add_subdirectory(oldsrc)
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/lib/Makefile
deleted file mode 100644
index e109575..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-#######################################################################
-##                  pC++/Sage++  Copyright (C) 1993                  ##
-##  Indiana University  University of Oregon  University of Rennes   ##
-#######################################################################
-
-
-# sage/lib/Makefile (phb)
-
-SHELL = /bin/sh
-INSTALL = /bin/cp
-
-# Flags passed down to Makefiles in subdirectories
-MFLAGS	= 
-
-CC = gcc
-#CC=cc#ENDIF##USE_CC#
-
-CXX = g++
-CXX = /usr/WorkShop/usr/bin/DCC
-LINKER = $(CC)
-
-NOP = echo
-#C90#EXTRAOBJ=alloca-c90.o#ENDIF#
-#C90#NOP = @/bin/rm -f alloca-c90.o#ENDIF#
-
-SUBDIR1	= oldsrc newsrc
-# Subdirectories to make resursively
-SUBDIR	=  ${SUBDIR1}
-
-all:	${SUBDIR} $(EXTRAOBJ)
-
-clean:	
-	$(NOP)
-	for i in ${SUBDIR1}; do (cd $$i; $(MAKE) "MAKE=$(MAKE)" clean); done
-
-install: FRC $(EXTRAOBJ)
-	@for i in ${SUBDIR1}; do (cd $$i; \
-	     echo "   *** COMPILING $$i DIRECTORY";\
-             $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" install); done
-
-# If you are on a C90, you will need the gnu alloca()
-alloca-c90.o:	alloca-c90.c
-	$(CC) -c alloca-c90.c
-	if [ -d c90 ] ; then true; \
-	  else mkdir c90 ;fi
-	$(INSTALL) alloca-c90.o c90
-
-.RECURSIVE: ${SUBDIR}
-
-${SUBDIR}:	FRC
-	@echo "   *** COMPILING $@ DIRECTORY"; cd $@; \
-          $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-FRC:
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/attributes.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/attributes.h
deleted file mode 100644
index b9effe1..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/attributes.h
+++ /dev/null
@@ -1,95 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-//
-// Defines the data structure for attributes in sage
-// attributes can be used to store any information for any statement, expression, symbol or types nodes
-// F. Bodin Indiana July 94.
-// 
-//
-////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-class SgAttribute{
- private:
-  // the attribute data;
-  int type; // a label;
-  void *data;  // the data;
-  int dataSize; // the size of the data in bytes to allow data to be copied;
-  SgAttribute *next; // to the next attribute of a statements (do that way or not??);
-  // link to sage node, allow to go from an attribute to sage stuffs;
-  typenode typeNode;   // indicates if SgStatement, SgExpression, ... ptToSage is pointed to;
-  void *ptToSage; // pointer to SgStatement, SgExpression, ... ;
-  int fileNumber; // the file methods;
-// the methods to access the structure of an attributes;  
- public:
-  SgAttribute(int t, void *pt, int size, SgStatement &st, int filenum);
-  SgAttribute(int t, void *pt, int size, SgSymbol &st, int filenum);
-  SgAttribute(int t, void *pt, int size, SgExpression &st, int filenum);
-  SgAttribute(int t, void *pt, int size, SgType &st, int filenum);
-  SgAttribute(int t, void *pt, int size, SgLabel &st, int filenum); //Kataev 21.03.2013
-  SgAttribute(int t, void *pt, int size, SgFile &st, int filenum); //Kataev 15.07.2013
-  SgAttribute(const SgAttribute& copy)
-  {
-      type = copy.type;
-      data = copy.data;
-      dataSize = copy.dataSize;
-      next = NULL;
-      typeNode = copy.typeNode;
-      ptToSage = copy.ptToSage;
-      fileNumber = copy.fileNumber;
-  }
-
-  ~SgAttribute();
-  int getAttributeType();
-  void setAttributeType(int t);
-  void *getAttributeData();
-  void *setAttributeData(void *d);
-  int getAttributeSize();
-  void setAttributeSize(int s);
-  typenode getTypeNode();
-  void *getPtToSage(); 
-  void  setPtToSage(void *sa);
-  void  resetPtToSage();
-  void  setPtToSage(SgStatement &st);
-  void  setPtToSage(SgSymbol &st);
-  void  setPtToSage(SgExpression &st);
-  void  setPtToSage(SgType &st);
-  void  setPtToSage(SgLabel &st); //Kataev 21.03.2013
-  void  setPtToSage(SgFile &st); //Kataev 15.07.2013
-  SgStatement *getStatement();
-  SgExpression *getExpression();
-  SgSymbol  *getSgSymbol();
-  SgType  *getType();
-  SgLabel *getLabel(); //Kataev 21.03.2013
-  SgFile *getFile(); //Kataev 15.07.2013
-  int getfileNumber();
-  SgAttribute *copy(); 
-  SgAttribute *getNext();
-  void setNext(SgAttribute *s);
-  int listLenght();
-  SgAttribute *getInlist(int num);
-  void save(FILE *file);
-  void save(FILE *file, void (*savefunction)(void *dat,FILE *f));
-  
-};
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////
-// The ATTRIBUTE TYPE ALREADY USED
-///////////////////////////////////////////////////////////////////////////////////////
-
-#define DEPENDENCE_ATTRIBUTE   -1001
-#define INDUCTION_ATTRIBUTE    -1002
-#define ACCESS_ATTRIBUTE       -1003
-#define DEPGRAPH_ATTRIBUTE     -1004
-#define USEDLIST_ATTRIBUTE     -1005
-#define DEFINEDLIST_ATTRIBUTE  -1006
-
-#define NOGARBAGE_ATTRIBUTE    -1007
-#define GARBAGE_ATTRIBUTE      -1008
-
-// store the annotation expression; it is then visible from the
-// garbage collection
-#define ANNOTATION_EXPR_ATTRIBUTE   -1009
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/baseClasses.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/baseClasses.h
deleted file mode 100644
index 0201354..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/baseClasses.h
+++ /dev/null
@@ -1,124 +0,0 @@
-//  ----------------------------------
-//  Darryl Brown
-//  University of Oregon pC++/Sage++
-//
-//  baseClasses.h  -  module for basic classes used by 
-//       breakpoint modules.
-//
-//  
-//  ----------------------------------
-
-//if already included, skip this file...
-#ifdef BASE_CL_ALREADY_INCLUDED
-// do nothing;
-#else 
-#define BASE_CL_ALREADY_INCLUDED 1
-
- 
-//  -------------------------------------------------------------;
-// this class is the base pointer type of all elements ;
-// stored in linked lists;
-class brk_basePtr {
- public:
-
-  virtual void print();
-    // this function should be overridden by later classes.;
-  virtual void print(int);
-    // this function should be overridden by later classes.;
-  virtual void printToBuf(int, char *);
-    // this function should be overridden by later classes.;
-  virtual void print(int t, FILE *fptr);
-    // this function should be overridden by later classes.;
-  virtual void printAll();
-    // this function should be overridden by later classes.;
-  virtual void printAll(int);
-    // this function should be overridden by later classes.;
-#if 0
-  virtual void printAll(int, FILE *);
-    // this function should be overridden by later classes.;
-  virtual void printAll(FILE *);
-    // this function should be overridden by later classes.;
-#endif
-  int (* userCompare)(brk_basePtr *, brk_basePtr *);
-    // this function should be overridden by later classes.;
-  virtual int compare(brk_basePtr *);
-    // this function should be overridden by later classes.;
-  brk_basePtr();
-};
-
-
-//  -------------------------------------------------------------
-// the nodes of the linked lists kept for children and parents of each class;
-class brk_ptrNode : public brk_basePtr {
- public: 
-  brk_ptrNode *next;  // next node;
-  brk_ptrNode *prev;  // previous node;
-  brk_basePtr *node;  // the ptr to the hierarchy at this node;
-
-  // constructors;
-  brk_ptrNode (void); 
-  brk_ptrNode (brk_basePtr *h);
-  virtual int compare(brk_basePtr *);
-    // compares this heirarchy with another alphabetically using className;
-
-};
-
-//  -------------------------------------------------------------
-// the class implementing the linked list for 
-class brk_linkedList : public brk_basePtr {
-
- public: 
-
-  brk_ptrNode *end;  // end of list;
-  brk_ptrNode *start; // start of list;
-  brk_ptrNode *current; // pointer to current element in list, 
-    // used for traversal of list.;
-  int length;  // length of list;
-
-  // constructor;
-  brk_linkedList();  
-
-  // access functions;
-  void push (brk_basePtr *h);  // push hierarchy h onto front of list;
-  void pushLast (brk_basePtr *h);   // push hierarchy h onto back of list;
-  brk_basePtr *pop (); // remove and return the first element in list;    
-  brk_basePtr *popLast ();  // remove and return the last element in list;
-  brk_basePtr *searchList ();  // begin traversal of list;
-  brk_basePtr *nextItem();   // give the next item in list during traversal;
-  brk_basePtr *remove (int i);  // remove & return the i-th element of list;
-  brk_basePtr *getIth (int i);  // return the i-th element of list;
-  brk_basePtr *insert(int i, brk_basePtr * p);  
-    // insert *p at point i in list;
-  brk_ptrNode *findMember (brk_basePtr *);   // look for this element and 
-    // return the brk_ptrNode that points to it;
-  int memberNum(brk_ptrNode *);   // what order does this element fall in list;
-
-  virtual void print(int);  // print all elements;
-  virtual void print(int, FILE *ftpr);  // print all elements;
-  virtual void print();  // print all elements;
-  virtual void printIth(int i);  // print i-th element of list;
-  virtual void printToBuf(int, char *);
-    // this function should be overridden by later classes.;
-  void sort ();   // sorts the list, elements must have compare function.,;
-  void sort(int (* compareFunc) (brk_basePtr *, brk_basePtr *));
-  virtual void swap(brk_ptrNode *l, brk_ptrNode *r);
-    // swaps these two basic elements
-};
-
-
-// ---------------------------------------------------
-//   external declarations.
-// ---------------------------------------------------
-
-extern char * brk_stringSave(char * str);
-extern int brk_strsame(char * str, char * str1);
-extern void brk_printtabs(int tabs);
-extern void brk_printtabs(int tabs, FILE *fptr);
-// here is the endif 
-
-#endif
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/bif_node.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/bif_node.def
deleted file mode 100644
index bf4065f..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/bif_node.def
+++ /dev/null
@@ -1,594 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/* format description
-	'_' stands for no.
-	'e' stands for control end statement
-	'd' declaration statement // what is not executable
-	DEFNODECODE(f1,f2,f3,f4,f5,f6,f7,f8,f9,f10)
-	f1 : variant of the node
-	f2 : string that gives the name (not used yet)
-	f3 : kind of node (stmt, declaration); not used yet
-	f4 : number of child (2 if blob list2, 1 if cp, 0 if leaf)
-	f5 : type of the node BIFNODE...
-	-------- particular info ---------------
-	f6 : is a declaration node 'd' or executable 'e' ,'c' controlend
-	f7 : is a declarator node if bif node 's' (for structure, union , enum) 
-	     for low lewe node c indicate constant expression 
-	f8 : has a symbol associated 's' valid for bif and llnode
-	f9 : is a control parent 'p' or a control end 'c'
-	f10: not used yet
-*/
-
-DEFNODECODE(GLOBAL,"nodetext",'s',1,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(PROG_HEDR,"nodetext",'s',1,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(PROC_HEDR,"nodetext",'s',1,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(PROS_HEDR,"nodetext",'s',1,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(BASIC_BLOCK,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(CONTROL_END,"nodetext",'s',0,BIFNODE,	'c','_','_','_','_')
-DEFNODECODE(IF_NODE,"nodetext",'s',2,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(WHERE_BLOCK_STMT,"nodetext",'s',2,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(ARITHIF_NODE,"nodetext",'s',0,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(LOGIF_NODE,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(FORALL_STAT,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(LOOP_NODE,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(FOR_NODE,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(PROCESS_DO_STAT,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(TRY_STAT,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(CATCH_STAT,"nodetext",'s',0,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(FORALL_NODE,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(WHILE_NODE,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(CDOALL_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(SDOALL_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(DOACROSS_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(CDOACROSS_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(EXIT_NODE,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(GOTO_NODE,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(ASSGOTO_NODE,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(COMGOTO_NODE,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(PAUSE_NODE,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(STOP_NODE,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-
-DEFNODECODE(ALLOCATE_STMT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(DEALLOCATE_STMT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(NULLIFY_STMT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(ASSIGN_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(POINTER_ASSIGN_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(M_ASSIGN_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-
-DEFNODECODE(PROC_STAT,"nodetext",'s',1,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(PROS_STAT,"nodetext",'s',1,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(PROS_STAT_LCTN,"nodetext",'s',2,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(PROS_STAT_SUBM,"nodetext",'s',2,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(ASSLAB_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(SUM_ACC,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(MULT_ACC,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(MAX_ACC,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(MIN_ACC,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(CAT_ACC,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(OR_ACC,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(AND_ACC,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-
-DEFNODECODE(READ_STAT,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(WRITE_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(OTHERIO_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-
-DEFNODECODE(BLOB,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(SIZES,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-
-
-DEFNODECODE(FUNC_HEDR,"nodetext",'s',1,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(MODULE_STMT,"nodetext",'s',1,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(USE_STMT,"nodetext",'s',1,BIFNODE, 		'd','_','_','_','_')
-DEFNODECODE(WHERE_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(ALLDO_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(IDENTIFY,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(FORMAT_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(STOP_STAT,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(RETURN_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(ELSEIF_NODE,"nodetext",'s',2,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(ELSEWH_NODE,"nodetext",'s',2,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(INCLUDE_LINE,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(PREPROCESSOR_DIR,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-
-/*NO_OPnodes*/
-DEFNODECODE(COMMENT_STAT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(CONT_STAT,"nodetext",'s',0,BIFNODE,		'c','_','_','_','_')
-DEFNODECODE(VAR_DECL,"nodetext",'s',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(VAR_DECL_90,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(PARAM_DECL,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(COMM_STAT,"nodetext",'s',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(EQUI_STAT,"nodetext",'s',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(IMPL_DECL,"nodetext",'s',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(DATA_DECL,"nodetext",'s',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(SAVE_DECL,"nodetext",'s',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(ENTRY_STAT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(STMTFN_STAT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(DIM_STAT,"nodetext",'s',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(PROCESSORS_STAT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(BLOCK_DATA,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(EXTERN_STAT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(INTRIN_STAT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-
-DEFNODECODE(ENUM_DECL,"nodetext",'d',1,BIFNODE,		'd','e','_','_','_')
-DEFNODECODE(CLASS_DECL,"nodetext",'d',1,BIFNODE,	'd','s','_','_','_')
-DEFNODECODE(TECLASS_DECL,"nodetext",'d',1,BIFNODE,	'd','s','_','_','_')
-DEFNODECODE(COLLECTION_DECL,"nodetext",'d',1,BIFNODE,	'd','s','_','_','_')
-DEFNODECODE(TEMPLATE_FUNDECL,"nodetext",'d',1,BIFNODE,	'd','s','_','_','_')
-DEFNODECODE(TEMPLATE_DECL,"nodetext",'d',1,BIFNODE,	'd','s','_','_','_')
-DEFNODECODE(UNION_DECL,"nodetext",'d',1,BIFNODE,	'd','u','_','_','_')
-DEFNODECODE(STRUCT_DECL,"nodetext",'d',1,BIFNODE,	'd','s','_','_','_')
-DEFNODECODE(DERIVED_CLASS_DECL,"nodetext",'d',1,BIFNODE,'d','_','_','_','_')
-DEFNODECODE(EXPR_STMT_NODE,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(DO_WHILE_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(SWITCH_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(CASE_NODE,"nodetext",'s',1,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(DEFAULT_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(BREAK_NODE,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(CONTINUE_NODE,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(RETURN_NODE,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(ASM_NODE,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(SPAWN_NODE,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(PARFOR_NODE,"nodetext",'s',1,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(PAR_NODE,"nodetext",'s',0,BIFNODE,	  	'_','_','_','_','_')
-DEFNODECODE(LABEL_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(PROS_COMM,"nodetext",'s',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(ATTR_DECL,"nodetext",'s',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(NAMELIST_STAT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-
-DEFNODECODE(PROCESSES_STAT,"nodetext",'s',0,BIFNODE,  	'_','_','_','_','_')
-DEFNODECODE(PROCESSES_END,"nodetext",'s',0,BIFNODE,	'c','_','_','_','_')
-DEFNODECODE(INPORT_DECL,"nodetext",'d',2,BIFNODE,	'd','-','_','_','_')
-DEFNODECODE(OUTPORT_DECL,"nodetext",'d',2,BIFNODE,	'd','-','_','_','_')
-DEFNODECODE(CHANNEL_STAT,"nodetext",'s',1,BIFNODE,	'e','-','_','_','_')
-DEFNODECODE(MERGER_STAT,"nodetext",'s',1,BIFNODE,	'e','-','_','_','_')
-DEFNODECODE(MOVE_PORT,"nodetext",'s',1,BIFNODE,		'e','-','_','_','_')
-DEFNODECODE(SEND_STAT,"nodetext",'s',2,BIFNODE,		'e','-','_','_','_')
-DEFNODECODE(RECEIVE_STAT,"nodetext",'s',2,BIFNODE,	'e','-','_','_','_')
-DEFNODECODE(ENDCHANNEL_STAT,"nodetext",'s',1,BIFNODE,	'e','-','_','_','_')
-DEFNODECODE(PROBE_STAT,"nodetext",'s',1,BIFNODE,	'e','-','_','_','_')
-DEFNODECODE(INTENT_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(PRIVATE_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(PUBLIC_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(OPTIONAL_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(ALLOCATABLE_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(POINTER_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(TARGET_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(STATIC_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(MODULE_PROC_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(INTERFACE_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(INTERFACE_OPERATOR,"nodetext",'s',0,BIFNODE,'d','_','_','_','_')
-DEFNODECODE(INTERFACE_ASSIGNMENT,"nodetext",'s',0,BIFNODE,'d','_','_','_','_')
-DEFNODECODE(SEQUENCE_STMT,"nodetext",'s',0,BIFNODE,	'd','_','_','_','_')
-
-/*****************variant tags for low level nodes********************/
-
-DEFNODECODE(INT_VAL,"nodetext",'c',0,LLNODE,			'_','c','_','_','_')
-DEFNODECODE(FLOAT_VAL,"nodetext",'c',0,LLNODE,			'_','c','_','_','_')
-DEFNODECODE(DOUBLE_VAL,"nodetext",'c',0,LLNODE,			'_','c','_','_','_')
-DEFNODECODE(BOOL_VAL,"nodetext",'c',0,LLNODE,			'_','c','_','_','_')
-DEFNODECODE(CHAR_VAL,"nodetext",'c',0,LLNODE,			'_','c','_','_','_')
-DEFNODECODE(STRING_VAL,"nodetext",'c',0,LLNODE,			'_','c','_','_','_')
-DEFNODECODE(KEYWORD_VAL,"nodetext",'c',0,LLNODE,		'_','c','_','_','_')
-DEFNODECODE(COMPLEX_VAL,"nodetext",'c',0,LLNODE,		'_','c','_','_','_')
-
-DEFNODECODE(CONST_REF,"nodetext",'r',0,LLNODE,			'_','_','s','_','_')
-DEFNODECODE(VAR_REF,"nodetext",'r',0,LLNODE,			'_','_','s','_','_')
-DEFNODECODE(ARRAY_REF,"nodetext",'r',1,LLNODE,			'_','_','s','_','_')
-DEFNODECODE(PROCESSORS_REF,"nodetext",'r',1,LLNODE,		'_','_','s','_','_')
-DEFNODECODE(RECORD_REF,"nodetext",'r',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(STRUCTURE_CONSTRUCTOR,"nodetext",'r',1,LLNODE,	'_','_','s','_','_')
-DEFNODECODE(CONSTRUCTOR_REF,"nodetext",'r',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ENUM_REF,"nodetext",'r',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(LABEL_REF,"nodetext",'r',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(TYPE_OP,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(PORT_TYPE_OP,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(INPORT_TYPE_OP,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(OUTPORT_TYPE_OP,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(TYPE_REF,"nodetext",'e',0,LLNODE,                   '_','_','s','_','_')
-
-DEFNODECODE(VAR_LIST,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(EXPR_LIST,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(RANGE_LIST,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(CASE_CHOICE,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(DEF_CHOICE,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(VARIANT_CHOICE,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(DDOT,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(KEYWORD_ARG,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(RANGE_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(FORALL_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(UPPER_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(LOWER_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(EQ_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(LT_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(GT_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(NOTEQL_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(LTEQL_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(GTEQL_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-
-DEFNODECODE(ADD_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(SUBT_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(OR_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-
-DEFNODECODE(MULT_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(DIV_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(MOD_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(AND_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-
-DEFNODECODE(EXP_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(ARRAY_MULT,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(CONCAT_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(XOR_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(EQV_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(NEQV_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(MINUS_OP,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(NOT_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(ASSGN_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(DEREF_OP,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(RENAME_NODE,"nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ONLY_NODE,"nodetext",'e',1,LLNODE,	    		'_','_','_','_','_')
-DEFNODECODE(POINTST_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(FUNCTION_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(MINUSMINUS_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(PLUSPLUS_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(BITAND_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(BITOR_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(DIMENSION_OP,"nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ALLOCATABLE_OP,"nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(PARAMETER_OP,"nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(TARGET_OP,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(STATIC_OP,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(SAVE_OP,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(POINTER_OP,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(INTRINSIC_OP,"nodetext",'e',0,LLNODE, 		'_','_','_','_','_')
-DEFNODECODE(OPTIONAL_OP,"nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(EXTERNAL_OP,"nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(PRIVATE_OP,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(PUBLIC_OP,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(IN_OP,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(OUT_OP,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(INOUT_OP,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(LABEL_ARG,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(STAR_RANGE,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-
-DEFNODECODE(PROC_CALL,"nodetext",'e',2,LLNODE,			'_','_','s','_','_')
-DEFNODECODE(PROS_CALL,"nodetext",'e',2,LLNODE,			'_','_','s','_','_')
-DEFNODECODE(FUNC_CALL,"nodetext",'e',1,LLNODE,			'_','_','s','_','_')
-DEFNODECODE(OVERLOADED_CALL,"nodetext",'e',1,LLNODE,		'_','_','s','_','_')
-DEFNODECODE(THROW_OP,"nodetext",'e',1,LLNODE,			'_','_','s','_','_')
-DEFNODECODE(DEFINED_OP,"nodetext",'e',2,LLNODE,  		'_','_','s','_','_')
-
-DEFNODECODE(ACCESS_REF,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(CONS,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(ACCESS,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(IOACCESS,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(CONTROL_LIST,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SEQ,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(SPEC_PAIR,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(COMM_LIST,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(STMT_STR,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(EQUI_LIST,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(IMPL_TYPE,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(STMTFN_DECL,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(BIT_COMPLEMENT_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(EXPR_IF,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(EXPR_IF_BODY,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FUNCTION_REF,"nodetext",'e',2,LLNODE,		'_','_','s','_','_')
-DEFNODECODE(LSHIFT_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(RSHIFT_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(UNARY_ADD_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SIZE_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(INTEGER_DIV_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SUB_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(LE_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(GE_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(NE_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-
-DEFNODECODE(CLASSINIT_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(CAST_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(ADDRESS_OP,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(POINSTAT_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(COPY_NODE,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(INIT_LIST,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(VECTOR_CONST,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(BIT_NUMBER,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(ARITH_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ARRAY_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(NEW_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(DELETE_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(NAMELIST_LIST,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(INPORT_NAME,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(OUTPORT_NAME,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(FROMPORT_NAME,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(TOPORT_NAME,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(IOSTAT_STORE,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(EMPTY_STORE,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(ERR_LABEL,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-
-DEFNODECODE(END_LABEL,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-
-DEFNODECODE(DATA_IMPL_DO,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(DATA_ELT,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(DATA_SUBS,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(DATA_RANGE,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(ICON_EXPR,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-/* new tag for some expression */
-
-DEFNODECODE(CEIL_DIV_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(MAX_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(BIF_SAVE_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(MIN_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(BIF_ADDR_EXPR,"nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(BIF_NOP_EXPR,"nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(BIF_RTL_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(TRUNC_MOD_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(TRUNC_DIV_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FLOOR_DIV_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FLOOR_MOD_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(CEIL_MOD_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ROUND_DIV_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ROUND_MOD_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(RDIV_EXPR,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(EXACT_DIV_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(CONVERT_EXPR,"nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(CONST_DECL,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(ABS_EXPR,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(TRUTH_ANDIF_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(TRUTH_AND_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(TRUTH_NOT_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(TRUTH_ORIF_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(PREINCREMENT_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(PREDECREMENT_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(COMPOUND_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FLOAT_EXPR,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(BIT_IOR_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(BIT_XOR_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(BIT_ANDTC_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(TRUTH_OR_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FIX_TRUNC_EXPR,"nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(RROTATE_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(LROTATE_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(RANGE_EXPR,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(POSTDECREMENT_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(REFERENCE_TYPE,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FIX_FLOOR_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FIX_ROUND_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FIX_CEIL_EXPR ,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FUNCTION_DECL ,"nodetext",'d',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(MODIFY_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(REFERENCE_EXPR,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(RESULT_DECL,"nodetext",'d',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(PARM_DECL,"nodetext",'d',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(LEN_OP,"nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(THIS_NODE,"nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(SCOPE_OP,"nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(PLUS_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(MINUS_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')	
-DEFNODECODE(AND_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')	
-DEFNODECODE(IOR_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')	
-DEFNODECODE(MULT_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')	
-DEFNODECODE(DIV_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')	
-DEFNODECODE(MOD_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')	
-DEFNODECODE(XOR_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')	
-DEFNODECODE(LSHIFT_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(RSHIFT_ASSGN_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ARROWSTAR_OP,"nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(DOTSTAR_OP, "nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(FORDECL_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OPERATOR_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ASSIGNMENT_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(KIND_OP, "nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(LENGTH_OP, "nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(RECURSIVE_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ELEMENTAL_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(PURE_OP, "nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-
-/*		DVM tags			*/
-DEFNODECODE(BLOCK_OP, "nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(INDIRECT_OP, "nodetext",'e',1,LLNODE,	        '_','_','_','_','_')
-DEFNODECODE(DERIVED_OP, "nodetext",'e',1,LLNODE,	        '_','_','_','_','_')
-DEFNODECODE(NEW_SPEC_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(REDUCTION_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SHADOW_RENEW_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SHADOW_START_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SHADOW_WAIT_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(DIAG_OP, "nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(REMOTE_ACCESS_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(TEMPLATE_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(PROCESSORS_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(DYNAMIC_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ALIGN_OP, "nodetext",'e',2,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(DISTRIBUTE_OP, "nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SHADOW_OP, "nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(SHADOW_COMP_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(INDIRECT_ACCESS_OP, "nodetext",'e',1,LLNODE,	'_','_','_','_','_')
-DEFNODECODE(ACROSS_OP, "nodetext",'e',2,LLNODE,	 		'_','_','_','_','_')
-DEFNODECODE(NEW_VALUE_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(CONSISTENT_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(STAGE_OP, "nodetext",'e',1,LLNODE,	           	'_','_','_','_','_')
-DEFNODECODE(COMMON_OP, "nodetext",'e',0,LLNODE,	           	'_','_','_','_','_')
-DEFNODECODE(ACC_CALL_OP,"nodetext",'e',2,LLNODE,		'_','_','s','_','_')
-DEFNODECODE(ACC_DEVICE_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_SHARED_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_CONSTANT_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_VALUE_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_HOST_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_GLOBAL_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_ATTRIBUTES_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_PRIVATE_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_CUDA_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_CUDA_BLOCK_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_PRIVATE_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_INOUT_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_IN_OP, "nodetext",'e',1,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(ACC_OUT_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_LOCAL_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_INLOCAL_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_TARGETS_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_ASYNC_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SHADOW_NAMES_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_TIE_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(DUMMY_REF, "nodetext",'r',0,LLNODE,			'_','_','s','_','_')
-
-DEFNODECODE(ACC_CALL_STMT,"nodetext",'s',2,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(DVM_NEW_VALUE_DIR,"nodetext",'s',1,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_ROUTINE_DIR,"nodetext",'s',1,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(ACC_DECLARE_DIR,"nodetext",'s',1,BIFNODE,		'_','_','_','_','_')
-
-/* SAPFOR */
-DEFNODECODE(SPF_NOINLINE_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_FISSION_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_EXPAND_OP, "nodetext",'e',0,LLNODE,     	'_','_','_','_','_')
-DEFNODECODE(SPF_SHRINK_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_TYPE_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_VARLIST_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_EXCEPT_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_FILES_COUNT_OP, "nodetext",'e',1,LLNODE,	'_','_','_','_','_')
-DEFNODECODE(SPF_INTERVAL_OP, "nodetext",'e',2,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_TIME_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_ITER_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_FLEXIBLE_OP, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_PARAMETER_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_CODE_COVERAGE_OP, "nodetext",'e',0,LLNODE,	'_','_','_','_','_')
-DEFNODECODE(SPF_UNROLL_OP, "nodetext",'e',1,LLNODE,    		'_','_','_','_','_')
-DEFNODECODE(SPF_COVER_OP, "nodetext",'e',1,LLNODE,    		'_','_','_','_','_')
-DEFNODECODE(SPF_MERGE_OP, "nodetext",'e',0,LLNODE,    		'_','_','_','_','_')
-DEFNODECODE(SPF_PROCESS_PRIVATE_OP, "nodetext",'e',1,LLNODE,	'_','_','_','_','_')
-DEFNODECODE(SPF_WEIGHT_OP, "nodetext",'e',1,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(SPF_ANALYSIS_DIR,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_PARALLEL_DIR,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_TRANSFORM_DIR,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(SPF_PARALLEL_REG_DIR,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(SPF_END_PARALLEL_REG_DIR,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(SPF_CHECKPOINT_DIR,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-
-/*		OpenMP Fortran tags      */
-DEFNODECODE(OMP_NOWAIT, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_NUM_THREADS, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_IF, "nodetext",'e',0,LLNODE,			'_','_','_','_','_')
-DEFNODECODE(OMP_ORDERED, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_DEFAULT, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_SCHEDULE, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_PRIVATE, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_REDUCTION, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_FIRSTPRIVATE, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_LASTPRIVATE, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_SHARED, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_COPYIN, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_COPYPRIVATE, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_COLLAPSE, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_THREADPRIVATE, "nodetext",'e',0,LLNODE,		'_','_','_','_','_')
-
-DEFNODECODE(OMP_PARALLEL_DIR,"nodetext",'s',0,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_END_PARALLEL_DIR,"nodetext",'s',0,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_DO_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_END_DO_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_SECTIONS_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_END_SECTIONS_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_SECTION_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_SINGLE_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_END_SINGLE_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_WORKSHARE_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_END_WORKSHARE_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_PARALLEL_DO_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_END_PARALLEL_DO_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_PARALLEL_SECTIONS_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_END_PARALLEL_SECTIONS_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_PARALLEL_WORKSHARE_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_END_PARALLEL_WORKSHARE_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_MASTER_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_END_MASTER_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_CRITICAL_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_END_CRITICAL_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_BARRIER_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_ATOMIC_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_FLUSH_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_ORDERED_DIR,"nodetext",'s',1,BIFNODE,		'e','_','_','_','_')
-DEFNODECODE(OMP_END_ORDERED_DIR,"nodetext",'s',1,BIFNODE,	'e','_','_','_','_')
-DEFNODECODE(OMP_THREADPRIVATE_DIR, "nodetext",'d',0,BIFNODE,	'd','_','_','_','_')
-DEFNODECODE(RECORD_DECL,"nodetext",'d',0,BIFNODE,		'd','_','_','_','_')
-DEFNODECODE(FUNC_STAT,"nodetext",'d',0,BIFNODE,			'd','_','_','_','_')
-DEFNODECODE(POINTER_ASSIGN_STAT,"nodetext",'s',0,BIFNODE,	'_','_','_','_','_')
-DEFNODECODE(CYCLE_STMT,"nodetext",'s',0,BIFNODE,		'_','_','_','_','_')
-DEFNODECODE(OMP_ONETHREAD_DIR,"nodetext",'s',1,BIFNODE,		'd','_','_','_','_')
-/*****************variant tags for symbol table entries********************/
-
-DEFNODECODE(BIF_PARM_DECL,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(CONST_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(ENUM_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(FIELD_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(VARIABLE_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(TYPE_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(PROGRAM_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(PROCEDURE_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(PROCESS_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(VAR_FIELD,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(LABEL_VAR,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(FUNCTION_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(MEMBER_FUNC,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(CLASS_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(TECLASS_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(UNION_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(STRUCT_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(LABEL_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-DEFNODECODE(COLLECTION_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')	
-DEFNODECODE(ROUTINE_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')	
-DEFNODECODE(CONSTRUCT_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')  
-DEFNODECODE(INTERFACE_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')	
-DEFNODECODE(MODULE_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')	
-DEFNODECODE(COMMON_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')	
-DEFNODECODE(SPF_REGION_NAME,"nodetext",'r',0,SYMBNODE,'_','_','_','_','_')
-
-DEFNODECODE(DEFAULT,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_INT,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_FLOAT,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_DOUBLE,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_CHAR,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_BOOL,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_STRING,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_COMPLEX,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_DCOMPLEX,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_LONG,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-
-DEFNODECODE(T_ENUM,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_SUBRANGE,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_LIST,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_ARRAY,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_RECORD,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_ENUM_FIELD,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_UNKNOWN,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_VOID,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_DESCRIPT,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_FUNCTION,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_POINTER,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_UNION,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_STRUCT,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_CLASS,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_TECLASS,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_DERIVED_CLASS,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_DERIVED_TYPE,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_COLLECTION,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_DERIVED_COLLECTION,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_MEMBER_POINTER,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_GATE,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_EVENT,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_SEQUENCE,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_DERIVED_TEMPLATE,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(T_REFERENCE,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-
-DEFNODECODE(LOCAL,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(INPUT,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(OUTPUT,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-DEFNODECODE(IO,"nodetext",'t',0,TYPENODE,'_','_','_','_','_')
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/dependence.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/dependence.h
deleted file mode 100644
index f80b60c..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/dependence.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-
-/* declaration for the dependencies computation and use in the toolbox */
-
-/* on declare de macro d'acces aux dependence de donnee */
-
-#define BIF_DEP_STRUCT1(NODE) ((NODE)->entry.Template.dep_ptr1)
-#define BIF_DEP_STRUCT2(NODE) ((NODE)->entry.Template.dep_ptr2)
-
-#define FIRST_DEP_IN_PROJ(X)  ((X)->head_dep)
-/* decription d'une dependance */
-
-#define DEP_ID(DEP)          ((DEP)->id)
-#define DEP_NEXT(DEP)        ((DEP)->thread)
-#define DEP_TYPE(DEP)       ((DEP)->type)
-#define DEP_DIRECTION(DEP)   ((DEP)->direct)
-#define DEP_SYMB(DEP)        ((DEP)->symbol)
-#define DEP_FROM_BIF(DEP)    (((DEP)->from).stmt)
-#define DEP_FROM_LL(DEP)     (((DEP)->from).refer)
-#define DEP_TO_BIF(DEP)      (((DEP)->to).stmt)
-#define DEP_TO_LL(DEP)       (((DEP)->to).refer)
-#define DEP_FROM_FWD(DEP)    ((DEP)->from_fwd)
-#define DEP_FROM_BACK(DEP)   ((DEP)->from_back)
-#define DEP_TO_FWD(DEP)      ((DEP)->to_fwd)
-#define DEP_TO_BACK(DEP)     ((DEP)->to_back)
-
-
-/* la forme normale de dependence de donnee est le vecteur de direction */
-
-/* on rappel temporairement la forme des dep  (sets.h)
-struct dep {  data dependencies 
- 
-    int id;      identification for reading/writing 
-    PTR_DEP thread;
- 
-    char     type;        flow-, output-, or anti-dependence 
-    char     direct[MAX_DEP]; direction/distance vector 
- 
-    PTR_SYMB   symbol;  symbol table entry 
-    struct ref from;    tail of dependence 
-    struct ref to;     head of dependence 
- 
-    PTR_DEP  from_fwd, from_back;  list of dependencies going to tail
-    PTR_DEP  to_fwd, to_back;      list of dependencies going to head 
- 
-    } ;
-
-*/
-
-
-
-/* pour la gestion memoire */
-struct chaining
-{
-  char *zone;
-  struct chaining *list;
-};
- 
-typedef struct chaining *ptchaining;
-
-
-struct stack_chaining
-{
-   ptchaining first;
-   ptchaining last;
-   struct stack_chaining *prev;
-   struct stack_chaining *next;
-   int level;
-};
-
-typedef struct stack_chaining *ptstack_chaining;
-
-/* structure pour les graphes de dependence */
-#define MAXSUC 100
-
-struct graph
-{
-  int id; /* identificateur */
-  int linenum;
-  int mark;
-  int order;
-  PTR_BFND stmt;
-  PTR_LLND expr;
-  PTR_LLND from_expr[MAXSUC];
-  PTR_LLND to_expr[MAXSUC];
-  PTR_DEP dep_struct[MAXSUC];
-  char *dep_vect[MAXSUC];
-  char type[MAXSUC];
-  struct graph *suc[MAXSUC]; /* next */
-  struct graph *pred[MAXSUC]; /* next */
-  struct graph *list;  /* chaine les noeuds d'un graphe */
-};
-
-typedef struct graph  *PTR_GRAPH;
-
-#define CHAIN_LIST(NODE)           ((NODE)->list)
-#define GRAPH_ID(NODE)             ((NODE)->id)
-#define GRAPH_ORDER(NODE)          ((NODE)->order)
-#define GRAPH_MARK(NODE)           ((NODE)->mark)
-#define GRAPH_LINE(NODE)           ((NODE)->linenum)
-#define GRAPH_BIF(NODE)            ((NODE)->stmt)
-#define GRAPH_LL(NODE)             ((NODE)->expr)
-#define GRAPH_DEP(NODE)            (((NODE)->dep_struct))
-#define GRAPH_VECT(NODE)           (((NODE)->dep_vect))
-#define GRAPH_TYPE(NODE)           ((NODE)->type)
-#define GRAPH_SUC(NODE)            (((NODE)->suc))
-#define GRAPH_PRED(NODE)           (((NODE)->pred))
-#define GRAPH_LL_FROM(NODE)        (((NODE)->from_expr))
-#define GRAPH_LL_TO(NODE)          (((NODE)->to_expr))
-
-
-#define NOT_ORDERED -1
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_ann.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_ann.h
deleted file mode 100644
index 54ad539..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_ann.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-extern char *Unparse_Annotation();
-extern PTR_LLND Parse_Annotation();
-extern Is_Annotation();
-extern Is_Annotation_Cont();
-extern char * Get_Annotation_String();
-extern char * Get_to_Next_Annotation_String();
-extern Init_Annotation();
-extern PTR_LLND Get_Define_Field();
-extern char * Get_Define_Label_Field();
-extern char * Get_Label_Field();
-extern PTR_LLND Get_ApplyTo_Field();
-extern PTR_LLND Get_ApplyToIf_Field();
-extern PTR_LLND Get_LocalVar_Field();
-extern PTR_LLND Get_Annotation_Field();
-extern char * Get_Annotation_Field_Label();
-extern char * Does_Annotation_Defines();
-extern int Set_The_Define_Field();
-extern int Get_Annotation_With_Label();
-extern Get_Scope_Of_Annotation();
-extern Propagate_defined_value();
-extern PTR_LLND Does_Annotation_Apply();
-extern PTR_LLND Get_Annotation_Field_List_For_Stmt();
-extern PTR_LLND Get_Annotation_List_For_Stmt();
-extern Get_Number_of_Annotation();
-extern PTR_BFND Get_Annotation_Bif();
-extern PTR_LLND Get_Annotation_Expr();
-extern char * Get_String_of_Annotation();
-extern PTR_CMNT Get_Annotation_Comment();
-extern int Is_Annotation_Defined();
-extern char * Annotation_Defines_string();
-extern int Annotation_Defines_string_Value();
-extern PTR_LLND Annotation_LLND[];
-extern PTR_TYPE  global_int_annotation;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_high.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_high.h
deleted file mode 100644
index ebb4cf0..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_high.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-extern int tiling_p ();/*non implante, mais ne plante pas*/
-extern void tiling ();
-extern void strip_mining ();
-
-extern PTR_BLOB Distribute_Loop ();
-extern PTR_BLOB Distribute_Loop_SCC ();
-extern Loop_Fusion ();
-extern Unroll_Loop ();
-extern Interchange_Loops ();
-
-extern Compute_With_Maple ();
-extern Unimodular ();
-
-extern Expand_Scalar ();
-extern PTR_BFND Scalar_Forward_Substitution ();
-
-extern int Normalized ();
-extern Normalize_Loop ();
-
-extern int Vectorize ();
-extern int Vectorize_Nest ();
-
-extern Print_Property_For_Loop ();
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_lib.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_lib.h
deleted file mode 100644
index a87a5ea..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_lib.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-
-extern PTR_FILE cur_file;
-extern char *main_input_filename; /*not find in lib*/
-extern PTR_PROJ cur_proj;		/* pointer to the project header */
-extern char *cunparse_bfnd();
-extern char *cunparse_llnd();
-extern char *funparse_bfnd();
-extern char *funparse_llnd();
-extern char *cunparse_blck();
-extern char *funparse_blck();
-extern  PTR_SYMB Current_Proc_Graph_Symb; /*not find in lib*/
-
-/*extern FILE *finput;
-extern FILE *outfile;*/
-
-extern char node_code_type[];
-extern int node_code_length[];
-extern enum typenode node_code_kind[];
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_low.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_low.h
deleted file mode 100644
index 73a474b..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_low.h
+++ /dev/null
@@ -1,269 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* DO NOT EDIT THIS FILE! */
-/* This file was automatically created by /u/sage/bin/mkCextern */
-/* Source file: /u/sage/project/sage/lib/newsrc/low_level.c */
-/* Created on Mon Jul 11 13:40:50 EST 1994       (phb)  */
-extern POINTER newNode();
-extern PTR_BFND FindNearBifNode();
-extern PTR_BFND Get_Last_Node_Of_Project();
-extern PTR_BFND Get_bif_with_id();
-extern PTR_BFND GetcountInStmtNode1();
-extern PTR_BFND LibGetScopeForDeclare();
-extern PTR_BFND LibWhereIsSymbDeclare();
-extern PTR_BFND LibcreateCollectionWithType();
-extern PTR_BFND LibdeleteStmt();
-extern PTR_BFND LibextractStmt();
-extern PTR_BFND LibextractStmtBody();
-extern PTR_BFND LibfirstElementMethod();
-extern PTR_BFND LibgetInnermostLoop();
-extern PTR_BFND LibgetNextNestedLoop();
-extern PTR_BFND LibgetPreviousNestedLoop();
-extern PTR_BFND LiblastDeclaration();
-extern PTR_BFND LocalRedoBifNextChain();
-extern PTR_BFND Redo_Bif_Next_Chain_Internal();
-extern PTR_BFND childfInBlobList();
-extern PTR_BFND computeControlParent();
-extern PTR_BFND deleteBfnd();
-extern PTR_BFND deleteBfndFromBlobAndLabel();
-extern PTR_BFND duplicateOneStmt();
-extern PTR_BFND duplicateStmts();
-extern PTR_BFND duplicateStmtsBlock();
-extern PTR_BFND duplicateStmtsNoExtract();
-extern PTR_BFND extractBifSectionBetween();
-extern PTR_BFND getBodyOfSymb();
-extern PTR_BFND getFirstStmt();
-extern PTR_BFND getFuncScope();
-extern PTR_BFND getFunctionHeader();
-extern PTR_BFND getFunctionHeaderAllFile();
-extern PTR_BFND getFunctionNumHeader();
-extern PTR_BFND getGlobalFunctionHeader();
-extern PTR_BFND getLastNodeList();
-extern PTR_BFND getLastNodeOfStmt();
-extern PTR_BFND getLastNodeOfStmtNoControlEnd();
-extern PTR_BFND getMainProgram();
-extern PTR_BFND getNodeBefore();
-extern PTR_BFND getObjectStmt();
-extern PTR_BFND getScopeForLabel();
-extern PTR_BFND getStatementNumber();
-extern PTR_BFND getStructNumHeader();
-extern PTR_BFND getWhereToInsertInBfnd();
-extern PTR_BFND lastBifInBlobList();
-extern PTR_BFND lastBifInBlobList1();
-extern PTR_BFND lastBifInBlobList2();
-extern PTR_BFND makeDeclStmt();
-extern PTR_BFND makeDeclStmtWPar();
-extern PTR_BFND rec_num_near_search();
-extern PTR_BLOB appendBlob();
-extern PTR_BLOB deleteBfndFrom();
-extern PTR_BLOB getLabelUDChain();
-extern PTR_BLOB lastBlobInBlobList();
-extern PTR_BLOB lastBlobInBlobList1();
-extern PTR_BLOB lastBlobInBlobList2();
-extern PTR_BLOB lookForBifInBlobList();
-extern PTR_CMNT Get_cmnt_with_id();
-extern PTR_FILE GetFileWithNum();
-extern PTR_FILE GetPointerOnFile();
-extern PTR_LABEL Get_label_with_id();
-extern PTR_LABEL getLastLabel();
-extern PTR_LLND Follow_Llnd();
-extern PTR_LLND Follow_Llnd0();
-extern PTR_LLND Get_First_Parameter_For_Call();
-extern PTR_LLND Get_Second_Parameter_For_Call();
-extern PTR_LLND Get_Th_Parameter_For_Call();
-extern PTR_LLND Get_ll_with_id();
-extern PTR_LLND LibIsSymbolInExpression();
-extern PTR_LLND LibarrayRefs();
-extern PTR_LLND LibsymbRefs();
-extern PTR_LLND Make_Function_Call();
-extern PTR_LLND addLabelRefToExprList();
-extern PTR_LLND addSymbRefToExprList();
-extern PTR_LLND addToExprList();
-extern PTR_LLND addToList();
-extern PTR_LLND copyLlNode();
-extern PTR_LLND deleteNodeInExprList();
-extern PTR_LLND deleteNodeWithItemInExprList();
-extern PTR_LLND findPtrRefExp();
-extern PTR_LLND getPositionInExprList();
-extern PTR_LLND getPositionInList();
-extern PTR_LLND giveLlSymbInDeclList();
-extern PTR_LLND makeDeclExp();
-extern PTR_LLND makeDeclExpWPar();
-extern PTR_LLND makeInt();
-extern PTR_LLND newExpr();
-extern PTR_SYMB GetThOfFieldList();
-extern PTR_SYMB GetThOfFieldListForType();
-extern PTR_SYMB GetThParam();
-extern PTR_SYMB Get_Symb_with_id();
-extern PTR_SYMB doesClassInherit();
-extern PTR_SYMB duplicateParamList();
-extern PTR_SYMB duplicateSymbol();
-extern PTR_SYMB duplicateSymbolAcrossFiles();
-extern PTR_SYMB duplicateSymbolLevel1();
-extern PTR_SYMB duplicateSymbolLevel2();
-extern PTR_SYMB getClassNextFieldOrMember();
-extern PTR_SYMB getFieldOfStructWithName();
-extern PTR_SYMB getFirstFieldOfStruct();
-extern PTR_SYMB getSymbolWithName();
-extern PTR_SYMB getSymbolWithNameInScope();
-extern PTR_SYMB lookForNameInParamList();
-extern PTR_SYMB newSymbol();
-extern PTR_TYPE FollowTypeBaseAndDerived();
-extern PTR_TYPE GetAtomicType();
-extern PTR_TYPE Get_type_with_id();
-extern PTR_TYPE addToBaseTypeList();
-extern PTR_TYPE createDerivedCollectionType();
-extern PTR_TYPE duplicateType();
-extern PTR_TYPE duplicateTypeAcrossFiles();
-extern PTR_TYPE getDerivedTypeWithName();
-extern PTR_TYPE lookForInternalBasetype();
-extern PTR_TYPE lookForTypeDescript();
-extern char *allocateFreeListNodeExpression();
-extern char* Get_Function_Name_For_Call();
-extern char* Remove_Carriage_Return();
-extern char* UnparseTypeBuffer();
-extern char* filter();
-extern char* mymalloc();
-extern char* xmalloc();
-extern int Apply_To_Bif();
-extern int Check_Lang_C();
-extern int Check_Lang_Fortran();
-extern int GetFileNum();
-extern int GetFileNumWithPt();
-extern int Init_Tool_Box();
-extern int IsRefToSymb();
-extern int Is_String_Val_With_Val();
-extern int LibClanguage();
-extern int LibFortranlanguage();
-extern int LibIsSymbolInScope();
-extern int LibIsSymbolReferenced();
-extern int LibisEnddoLoop();
-extern int LibisMethodOfElement();
-extern int LibnumberOfFiles();
-extern int LibperfectlyNested();
-extern void Message();
-extern int Replace_String_In_Expression();
-extern int appendBfndListToList1();
-extern int appendBfndListToList2();
-extern int appendBfndToList();
-extern int appendBfndToList1();
-extern int appendBfndToList2();
-extern int arraySymbol();
-extern int blobListLength();
-extern int buildLinearRep();
-extern int buildLinearRepSign();
-extern int convertToEnddoLoop();
-extern int countInStmtNode1();
-extern int countInStmtNode2();
-extern int exprListLength();
-extern int findBif();
-extern int findBifInList1();
-extern int findBifInList2();
-extern int firstBfndInList1();
-extern int firstBfndInList2();
-extern int firstInBfndList2();
-extern int getElementEvaluate();
-extern int getLastLabelId();
-extern int getNumberOfFunction();
-extern int getNumberOfStruct();
-extern int getTypeNumDimension();
-extern int hasNodeASymb();
-extern int hasTypeBaseType();
-extern int hasTypeSymbol();
-extern int inScope();
-extern int insertBfndInList1();
-extern int insertBfndInList2();
-extern int insertBfndListIn();
-extern int insertBfndListInList1();
-extern int isABifNode();
-extern int isAControlEnd();
-extern int isADeclBif();
-extern int isAEnumDeclBif();
-extern int isALoNode();
-extern int isAStructDeclBif();
-extern int isASymbNode();
-extern int isATypeNode();
-extern int isAUnionDeclBif();
-extern int isAtomicType();
-extern int isElementType();
-extern int isEnumType();
-extern int isInStmt();
-extern int isIntegerType();
-extern int isItInSection();
-extern int isNodeAConst();
-extern int isPointerType();
-extern int isStructType();
-extern int isTypeEquivalent();
-extern int isUnionType();
-extern int lenghtOfFieldList();
-extern int lenghtOfFieldListForType();
-extern int lenghtOfParamList();
-extern int localToFunction();
-extern int lookForTypeInType();
-extern int makeLinearExpr();
-extern int makeLinearExpr_Sign();
-extern int numberOfBifsInBlobList();
-extern int open_proj_toolbox();
-extern int open_proj_files_toolbox();
-extern int patternMatchExpression();
-extern int pointerType();
-extern int replaceTypeInType();
-extern int sameName();
-extern int* evaluateExpression();
-extern void Count_Bif_Next_Chain();
-extern void LibAddComment();
-extern void LibSetAllComments();
-extern void LibconvertLogicIf();
-extern void LibreplaceSymbByExp();
-extern void LibreplaceSymbByExpInStmts();
-extern void LibreplaceWithStmt();
-extern void LibsaveDepFile();
-extern void Redo_Bif_Next_Chain();
-extern void Reset_Bif_Next();
-extern void Reset_Bif_Next_Chain();
-extern void Reset_Tool_Box();
-extern void SetCurrentFileTo();
-extern void UnparseBif();
-extern void UnparseLLND();
-extern void UnparseProgram();
-extern void addControlEndToList2();
-extern void addControlEndToStmt();
-extern void addElementEvaluate();
-extern void addSymbToFieldList();
-extern void allocateValueEvaluate();
-extern void appendSymbToArgList();
-extern void declareAVar();
-extern void declareAVarWPar();
-extern void duplicateAllSymbolDeclaredInStmt();
-extern void insertBfndBeforeIn();
-extern void insertSymbInArgList();
-extern void libFreeExpression();
-extern void make_a_malloc_stack();
-extern void myfree();
-extern void replaceSymbInExpression();
-extern void replaceSymbInExpressionSameName();
-extern void replaceSymbInStmts();
-extern void replaceSymbInStmtsSameName();
-extern void replaceTypeForSymb();
-extern void replaceTypeInExpression();
-extern void replaceTypeInStmts();
-extern void replaceTypeUsedInStmt();
-extern void resetDoVarForSymb();
-extern void resetFreeListForExpressionNode();
-extern void resetPresetEvaluate();
-extern void setFreeListForExpressionNode();
-extern void updateControlParent();
-extern void updateTypesAndSymbolsInBody();
-extern void writeDepFileInDebugdep();
-extern void updateTypeAndSymbolInStmts();
-extern void updateTypesAndSymbolsInBodyOfRoutine();
-extern PTR_SYMB duplicateSymbolOfRoutine();
-extern char* UnparseBif_Char();
-char *UnparseLLnode_Char(); 
-extern void UnparseProgram_ThroughAllocBuffer();
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_mid.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_mid.h
deleted file mode 100644
index 3c15364..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/ext_mid.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-extern PTR_BFND Make_For_Loop ();
-extern PTR_LLND Loop_Set_Borne_Inf ();
-extern PTR_LLND Loop_Set_Borne_Sup ();
-extern PTR_LLND Loop_Set_Step ();
-extern PTR_SYMB Loop_Set_Index ();
-extern PTR_LLND Loop_Get_Borne_Inf ();
-extern PTR_LLND Loop_Get_Borne_Sup ();
-extern PTR_LLND Loop_Get_Step ();
-extern PTR_SYMB Loop_Get_Index ();
-
-extern PTR_BFND Get_Scope_For_Declare ();
-extern PTR_BFND Get_Scope_For_Label ();
-
-extern PTR_LLND Make_Array_Ref ();
-extern PTR_LLND Make_Array_Ref_With_Tab ();
-extern PTR_BFND Declare_Array ();
-
-extern PTR_BFND Make_Procedure ();
-extern PTR_LLND Make_Function_Call ();
-extern PTR_LLND Make_Function_Call_bis ();
-extern PTR_BFND Make_Procedure_Call  ();
-
-extern PTR_LLND Make_Linear_Expression ();
-extern PTR_LLND Make_Linear_Expression_From_Int ();
-extern PTR_LLND Make_Linear_Expression_From_Int_List ();
-
-extern PTR_BFND Make_Assign ();
-extern PTR_BFND Make_If_Then_Else ();
-extern int Declare_Scalar ();
-extern int Perfectly_Nested ();
-extern int Is_Good_Loop ();
-
-extern PTR_BFND Extract_Loop_Body ();
-extern PTR_BFND Get_Next_Nested_Loop ();
-extern PTR_BFND Get_Internal_Loop ();
-extern PTR_BFND Get_Previous_Nested_Loop ();
-
-extern PTR_BLOB Get_Label_UD_chain ();
-
-extern int Convert_Loop ();
-extern int Loop_Conversion ();
-
-extern PTR_SYMB Generate_Variable_Name ();
-extern PTR_SYMB Install_Variable ();
-
-extern int Verif_No_Func ();
-extern int Verif_Assign ();
-extern int Verif_Assign_If ();
-
-extern int Generate_Alternative_Code ();
-extern void Localize_Array_Section ();
-
-extern int Check_Index ();
-extern int Check_Right_Assign ();
-extern int Check_Left_Assign ();
-extern int No_Dependent_Index ();
-extern int No_Basic_Induction ();
-extern int No_Def_Of_Induction ();
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/extcxx_low.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/extcxx_low.h
deleted file mode 100644
index 9750dca..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/extcxx_low.h
+++ /dev/null
@@ -1,272 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* DO NOT EDIT THIS FILE! */
-/* This file was automatically created by /u/sage/bin/mkC++extern */
-/* Source file: /u/sage/project/sage/lib/newsrc/low_level.c */
-/* Created on Tue Jul 12 12:46:22 EST 1994       (phb)  */
-extern "C" {
-     POINTER newNode(...);
-     PTR_BFND FindNearBifNode(...);
-     PTR_BFND Get_Last_Node_Of_Project(...);
-     PTR_BFND Get_bif_with_id(...);
-     PTR_BFND GetcountInStmtNode1(...);
-     PTR_BFND LibGetScopeForDeclare(...);
-     PTR_BFND LibWhereIsSymbDeclare(...);
-     PTR_BFND LibcreateCollectionWithType(...);
-     PTR_BFND LibdeleteStmt(...);
-     PTR_BFND LibextractStmt(...);
-     PTR_BFND LibextractStmtBody(...);
-     PTR_BFND LibfirstElementMethod(...);
-     PTR_BFND LibgetInnermostLoop(...);
-     PTR_BFND LibgetNextNestedLoop(...);
-     PTR_BFND LibgetPreviousNestedLoop(...);
-     PTR_BFND LiblastDeclaration(...);
-     PTR_BFND LocalRedoBifNextChain(...);
-     PTR_BFND Redo_Bif_Next_Chain_Internal(...);
-     PTR_BFND childfInBlobList(...);
-     PTR_BFND computeControlParent(...);
-     PTR_BFND deleteBfnd(...);
-     PTR_BFND deleteBfndFromBlobAndLabel(...);
-     PTR_BFND duplicateOneStmt(...);
-     PTR_BFND duplicateStmts(...);
-     PTR_BFND duplicateStmtsBlock(...);
-     PTR_BFND duplicateStmtsNoExtract(...);
-     PTR_BFND extractBifSectionBetween(...);
-     PTR_BFND getBodyOfSymb(...);
-     PTR_BFND getFirstStmt(...);
-     PTR_BFND getFuncScope(...);
-     PTR_BFND getFunctionHeader(...);
-     PTR_BFND getFunctionHeaderAllFile(...);
-     PTR_BFND getFunctionNumHeader(...);
-     PTR_BFND getGlobalFunctionHeader(...);
-     PTR_BFND getLastNodeList(...);
-     PTR_BFND getLastNodeOfStmt(...);
-     PTR_BFND getLastNodeOfStmtNoControlEnd(...);
-     PTR_BFND getMainProgram(...);
-     PTR_BFND getNodeBefore(...);
-     PTR_BFND getObjectStmt(...);
-     PTR_BFND getScopeForLabel(...);
-     PTR_BFND getStatementNumber(...);
-     PTR_BFND getStructNumHeader(...);
-     PTR_BFND getWhereToInsertInBfnd(...);
-     PTR_BFND lastBifInBlobList(...);
-     PTR_BFND lastBifInBlobList1(...);
-     PTR_BFND lastBifInBlobList2(...);
-     PTR_BFND makeDeclStmt(...);
-     PTR_BFND makeDeclStmtWPar(...);
-     PTR_BFND rec_num_near_search(...);
-     PTR_BLOB appendBlob(...);
-     PTR_BLOB deleteBfndFrom(...);
-     PTR_BLOB getLabelUDChain(...);
-     PTR_BLOB lastBlobInBlobList(...);
-     PTR_BLOB lastBlobInBlobList1(...);
-     PTR_BLOB lastBlobInBlobList2(...);
-     PTR_BLOB lookForBifInBlobList(...);
-     PTR_CMNT Get_cmnt_with_id(...);
-     PTR_FILE GetFileWithNum(...);
-     PTR_FILE GetPointerOnFile(...);
-     PTR_LABEL Get_label_with_id(...);
-     PTR_LABEL getLastLabel(...);
-     PTR_LLND Follow_Llnd(...);
-     PTR_LLND Follow_Llnd0(...);
-     PTR_LLND Get_First_Parameter_For_Call(...);
-     PTR_LLND Get_Second_Parameter_For_Call(...);
-     PTR_LLND Get_Th_Parameter_For_Call(...);
-     PTR_LLND Get_ll_with_id(...);
-     PTR_LLND LibIsSymbolInExpression(...);
-     PTR_LLND LibarrayRefs(...);
-     PTR_LLND LibsymbRefs(...);
-     PTR_LLND Make_Function_Call(...);
-     PTR_LLND addLabelRefToExprList(...);
-     PTR_LLND addSymbRefToExprList(...);
-     PTR_LLND addToExprList(...);
-     PTR_LLND addToList(...);
-     PTR_LLND copyLlNode(...);
-     PTR_LLND deleteNodeInExprList(...);
-     PTR_LLND deleteNodeWithItemInExprList(...);
-     PTR_LLND findPtrRefExp(...);
-     PTR_LLND getPositionInExprList(...);
-     PTR_LLND getPositionInList(...);
-     PTR_LLND giveLlSymbInDeclList(...);
-     PTR_LLND makeDeclExp(...);
-     PTR_LLND makeDeclExpWPar(...);
-     PTR_LLND makeInt(...);
-     PTR_LLND newExpr(...);
-     PTR_SYMB GetThOfFieldList(...);
-     PTR_SYMB GetThOfFieldListForType(...);
-     PTR_SYMB GetThParam(...);
-     PTR_SYMB Get_Symb_with_id(...);
-     PTR_SYMB doesClassInherit(...);
-     PTR_SYMB duplicateParamList(...);
-     PTR_SYMB duplicateSymbol(...);
-     PTR_SYMB duplicateSymbolAcrossFiles(...);
-     PTR_SYMB duplicateSymbolLevel1(...);
-     PTR_SYMB duplicateSymbolLevel2(...);
-     PTR_SYMB getClassNextFieldOrMember(...);
-     PTR_SYMB getFieldOfStructWithName(...);
-     PTR_SYMB getFirstFieldOfStruct(...);
-     PTR_SYMB getSymbolWithName(...);
-     PTR_SYMB getSymbolWithNameInScope(...);
-     PTR_SYMB lookForNameInParamList(...);
-     PTR_SYMB newSymbol(...);
-     PTR_SYMB duplicateSymbolOfRoutine(...);
-     PTR_TYPE FollowTypeBaseAndDerived(...);
-     PTR_TYPE GetAtomicType(...);
-     PTR_TYPE Get_type_with_id(...);
-     PTR_TYPE addToBaseTypeList(...);
-     PTR_TYPE createDerivedCollectionType(...);
-     PTR_TYPE duplicateType(...);
-     PTR_TYPE duplicateTypeAcrossFiles(...);
-     PTR_TYPE getDerivedTypeWithName(...);
-     PTR_TYPE lookForInternalBasetype(...);
-     PTR_TYPE lookForTypeDescript(...);
-     char *allocateFreeListNodeExpression(...);
-     char* Get_Function_Name_For_Call(...);
-     char* Remove_Carriage_Return(...);
-     char* UnparseTypeBuffer(...);
-     char* filter(...);
-     char* mymalloc(...);
-     char* xmalloc(...);
-     int Apply_To_Bif(...);
-     int Check_Lang_C(...);
-     int Check_Lang_Fortran(...);
-     int GetFileNum(...);
-     int GetFileNumWithPt(...);
-     int Init_Tool_Box(...);
-     int IsRefToSymb(...);
-     int Is_String_Val_With_Val(...);
-     int LibClanguage(...);
-     int LibFortranlanguage(...);
-     int LibIsSymbolInScope(...);
-     int LibIsSymbolReferenced(...);
-     int LibisEnddoLoop(...);
-     int LibisMethodOfElement(...);
-     int LibnumberOfFiles(...);
-     int LibperfectlyNested(...);
-     int Message(...);
-     int Replace_String_In_Expression(...);
-     int appendBfndListToList1(...);
-     int appendBfndListToList2(...);
-     int appendBfndToList(...);
-     int appendBfndToList1(...);
-     int appendBfndToList2(...);
-     int arraySymbol(...);
-     int blobListLength(...);
-     int buildLinearRep(...);
-     int buildLinearRepSign(...);
-     int convertToEnddoLoop(...);
-     int countInStmtNode1(...);
-     int countInStmtNode2(...);
-     int exprListLength(...);
-     int findBif(...);
-     int findBifInList1(...);
-     int findBifInList2(...);
-     int firstBfndInList1(...);
-     int firstBfndInList2(...);
-     int firstInBfndList2(...);
-     int getElementEvaluate(...);
-     int getLastLabelId(...);
-     int getNumberOfFunction(...);
-     int getNumberOfStruct(...);
-     int getTypeNumDimension(...);
-     int hasNodeASymb(...);
-     int hasTypeBaseType(...);
-     int hasTypeSymbol(...);
-     int inScope(...);
-     int insertBfndInList1(...);
-     int insertBfndInList2(...);
-     int insertBfndListIn(...);
-     int insertBfndListInList1(...);
-     int isABifNode(...);
-     int isAControlEnd(...);
-     int isADeclBif(...);
-     int isAEnumDeclBif(...);
-     int isALoNode(...);
-     int isAStructDeclBif(...);
-     int isASymbNode(...);
-     int isATypeNode(...);
-     int isAUnionDeclBif(...);
-     int isAtomicType(...);
-     int isElementType(...);
-     int isEnumType(...);
-     int isInStmt(...);
-     int isIntegerType(...);
-     int isItInSection(...);
-     int isNodeAConst(...);
-     int isPointerType(...);
-     int isStructType(...);
-     int isTypeEquivalent(...);
-     int isUnionType(...);
-     int lenghtOfFieldList(...);
-     int lenghtOfFieldListForType(...);
-     int lenghtOfParamList(...);
-     int localToFunction(...);
-     int lookForTypeInType(...);
-     int makeLinearExpr(...);
-     int makeLinearExpr_Sign(...);
-     int numberOfBifsInBlobList(...);
-     int open_proj_toolbox(...);
-     int open_proj_files_toolbox(...);
-     int patternMatchExpression(...);
-     int pointerType(...);
-     int replaceTypeInType(...);
-     int sameName(...);
-     int* evaluateExpression(...);
-     void Count_Bif_Next_Chain(...);
-     void LibAddComment(...);
-     void LibSetAllComments(...);
-     //Kolganov 15.11.2017
-     void LibDelAllComments(...);
-     void LibconvertLogicIf(...);
-     void LibreplaceSymbByExp(...);
-     void LibreplaceSymbByExpInStmts(...);
-     void LibreplaceWithStmt(...);
-     void LibsaveDepFile(...);
-     void Redo_Bif_Next_Chain(...);
-     void Reset_Bif_Next(...);
-     void Reset_Bif_Next_Chain(...);
-     void Reset_Tool_Box(...);
-     void SetCurrentFileTo(...);
-     void UnparseBif(...);
-     void UnparseLLND(...);
-     void UnparseProgram(...);
-     void addControlEndToList2(...);
-     void addControlEndToStmt(...);
-     void addElementEvaluate(...);
-     void addSymbToFieldList(...);
-     void allocateValueEvaluate(...);
-     void appendSymbToArgList(...);
-     void declareAVar(...);
-     void declareAVarWPar(...);
-     void duplicateAllSymbolDeclaredInStmt(...);
-     void insertBfndBeforeIn(...);
-     void insertSymbInArgList(...);
-     void libFreeExpression(...);
-     void make_a_malloc_stack(...);
-     void myfree(...);
-     void replaceSymbInExpression(...);
-     void replaceSymbInExpressionSameName(...);
-     void replaceSymbInStmts(...);
-     void replaceSymbInStmtsSameName(...);
-     void replaceTypeForSymb(...);
-     void replaceTypeInExpression(...);
-     void replaceTypeInStmts(...);
-     void replaceTypeUsedInStmt(...);
-     void resetDoVarForSymb(...);
-     void resetFreeListForExpressionNode(...);
-     void resetPresetEvaluate(...);
-     void setFreeListForExpressionNode(...);
-     void updateControlParent(...);
-     void updateTypesAndSymbolsInBody(...);
-     void writeDepFileInDebugdep(...);
-     void updateTypeAndSymbolInStmts(...);
-     void updateTypesAndSymbolsInBodyOfRoutine(...);
-     char* UnparseBif_Char(...); 
-     char *UnparseLLND_Char(...);
-     char *UnparseLLnode_Char(...); 
-     void UnparseProgram_ThroughAllocBuffer(...);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/libSage++.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/libSage++.h
deleted file mode 100644
index a41beb6..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/libSage++.h
+++ /dev/null
@@ -1,9921 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#ifndef LIBSAGEXX_H
-#define LIBSAGEXX_H 1
-
-#include <string.h>
-#include <map>
-#include <string>
-#include <algorithm>
-
-/* includes the attributes data structure */
-
-#include "attributes.h"
-
-/**************************************************************
-File: libSage++.h
-Included in: sage++user.h and libSage++.C
-
-Purpose:It contains all the class definitions and the inline
-definitions in Sage++. The start of each class and the start of inlines
-in each class are easily identifiable. For example the SgProject class
-definition starts with class  SgProject (note the 2 spaces between
-class and SgProject) and the comment line preceding the inline
-declarations of SgProject is something like // SgProject--inlines.
-Sections of the include file are within a #ifdef USER  #endif. Those sections
-are included only in sage++user.h and not in libSage++.C. Sections of
-the include file are within a #if 0  #endif.  These refer to the unimplemented
-portions of Sage++ library.
-***************************************************************/
-
-#if __SPF
-extern "C" void removeFromCollection(void *pointer);
-extern void addToGlobalBufferAndPrint(const std::string& toPrint);
-#endif
-
-class  SgProject {
-  public:
-  inline SgProject(SgProject &);
-  SgProject(const char *proj_file_name);
-  SgProject(const char *proj_file_name, char **files_list, int no);
-  inline ~SgProject();
-  inline int numberOfFiles();
-  SgFile &file(int i);   
-  inline char *fileName(int i); 
-  inline int Fortranlanguage(); 
-  inline int Clanguage();
-  void addFile(char * dep_file_name);
-  void deleteFile(SgFile * file);
-};
-
-class  SgFile {
-private:
-    static std::map<std::string, std::pair<SgFile*, int> > files;
-
-public:
-    PTR_FILE filept;
-    SgFile(char* file_name); // the file must exist.
-    SgFile(int Language, const char* file_name); // for new empty file objects.
-    ~SgFile();
-    SgFile(SgFile &);
-    inline int languageType();
-    inline void saveDepFile(const char *dep_file);
-    inline void unparse(FILE *filedisc);
-    inline void unparsestdout();
-    inline void unparseS(FILE *filedisc, int size);
-    const char* filename();
-
-    inline SgStatement *mainProgram();
-    SgStatement *functions(int i);
-    inline int numberOfFunctions();
-    SgStatement *getStruct(int i);
-    inline int numberOfStructs();
-
-    inline SgStatement *firstStatement();
-    inline SgSymbol *firstSymbol();
-    inline SgType *firstType();
-    inline SgExpression *firstExpression();
-
-    inline SgExpression *SgExpressionWithId(int i);
-    inline SgStatement *SgStatementWithId(int id);
-    inline SgStatement *SgStatementAtLine(int lineno);
-    inline SgSymbol *SgSymbolWithId(int id);
-    inline SgType *SgTypeWithId(int id);
-    // for attributes;
-    void saveAttributes(char *file);
-    void saveAttributes(char *file, void(*savefunction)(void *dat, FILE *f));
-    void readAttributes(char *file);
-    void readAttributes(char *file, void * (*readfunction)(FILE *f));
-    int numberOfAttributes();
-    SgAttribute *attribute(int i);
-
-    /***** Kataev 15.07.2013 *****/
-    int numberOfFileAttributes();
-    int numberOfAttributes(int type); // of a specified type;
-    void *attributeValue(int i);
-    int  attributeType(int i);
-    void *attributeValue(int i, int type); // only considering one type attribute
-    void *deleteAttribute(int i);
-    void addAttribute(int type, void *a, int size); // void * can be NULL;
-    void addAttribute(int type); //void * is NULL;
-    void addAttribute(void *a, int size); //no type specifed;
-    void addAttribute(SgAttribute *att);
-    SgAttribute *getAttribute(int i);
-    SgAttribute *getAttribute(int i, int type);
-    /*****************************/
-
-    int expressionGarbageCollection(int deleteExpressionNode, int verbose);
-    //int SgFile::expressionGarbageCollection(int deleteExpressionNode, int verbose);
-
-    static int switchToFile(const std::string &name);
-    static void addFile(const std::pair<SgFile*, int> &toAdd);    
-};
-
-
-extern SgFile *current_file;    //current file
-extern int current_file_id;     //number of current file 
-
-// Discuss about control parent, BIF structure etc
-class  SgStatement 
-{
-private:
-    int fileID;
-    SgProject *project;
-    bool unparseIgnore;
-
-    static bool sapfor_regime;
-    static std::string currProcessFile;
-    static int currProcessLine;
-    static bool deprecatedCheck;
-    static bool consistentCheckIsActivated;
-    // fileID -> [ map<FileName, line>, SgSt*]
-    static std::map<int, std::map<std::pair<std::string, int>, SgStatement*> > statsByLine;
-    static void updateStatsByLine(std::map<std::pair<std::string, int>, SgStatement*> &toUpdate);
-    static std::map<SgExpression*, SgStatement*> parentStatsForExpression;
-    static void updateStatsByExpression();
-    static void updateStatsByExpression(SgStatement *where, SgExpression *what);
-
-    void checkConsistence();
-    void checkDepracated();
-    void checkCommentPosition(const char* com);
-
-public:
-    PTR_BFND thebif;
-    SgStatement(int variant);
-    SgStatement(PTR_BFND bif);
-    SgStatement(int code, SgLabel *lab, SgSymbol *symb, SgExpression *e1 = NULL, SgExpression *e2 = NULL, SgExpression *e3 = NULL);
-    SgStatement(SgStatement &);
-    // info about statement
-    inline int lineNumber();          // source text line number
-    inline int localLineNumber();
-    inline int id();                  // unique id;
-    inline int variant();             // the type of the statement
-    SgExpression *expr(int i); // i = 0,1,2 returns the i-th expression.
-
-    inline int hasSymbol();  // returns TRUE if tmt has symbol, FALSE otherwise
-    // returns the symbol field. Used by loop headers to point to the
-    // loop variable symbol; Used by function and subroutine headers to
-    // point to the function or subroutine name.
-    SgSymbol *symbol();        // returns the symbol field.
-    inline char *fileName();
-    inline void setFileName(char *newFile);
-
-    inline int hasLabel();     // returns 1 if there is a label on the stmt.
-    SgLabel *label();          // the label
-
-    // modifying the info.
-    inline void setlineNumber(const int n); // change the line number info
-    inline void setLocalLineNumber(const int n);
-    inline void setId(int n);         // cannot change the id info
-    inline void setVariant(int n);    // change the type of the statement
-    void setExpression(int i, SgExpression &e); // change the i-th expression
-    void setExpression(int i, SgExpression *e); // change the i-th expression
-    inline void setLabel(SgLabel &l); // change the label
-    inline void deleteLabel(bool saveLabel = false); // delete label
-    inline void setSymbol(SgSymbol &s); // change the symbol
-
-    // Control structure
-    inline SgStatement *lexNext();   // the next statement in lexical order.
-    inline SgStatement *lexPrev();   // the previous stmt in lexical order.
-    inline SgStatement *controlParent(); // the enclosing control statement
-
-    inline void setLexNext(SgStatement &s); // change the lexical ordering
-    inline void setLexNext(SgStatement* s);
-
-    // change the control parent.
-    inline void setControlParent(SgStatement& s) // DEPRECATED IN SAPFOR!! 
-    {
-        checkDepracated();
-        BIF_CP(thebif) = s.thebif; 
-    }
-
-    inline void setControlParent(SgStatement* s) // DEPRECATED IN SAPFOR!!
-    {
-        checkDepracated();
-        if (s != 0)
-            BIF_CP(thebif) = s->thebif;
-        else
-            BIF_CP(thebif) = 0;
-    }
-
-  // Access statement using the tree structure
-  // Describe BLOB lists here?
-
-    inline int numberOfChildrenList1();
-    inline int numberOfChildrenList2();
-    inline SgStatement *childList1(int i);
-    inline SgStatement *childList2(int i);
-    SgStatement *nextInChildList();
-
-    inline SgStatement *lastDeclaration();
-    inline SgStatement *lastExecutable();
-    inline SgStatement *lastNodeOfStmt();
-    inline SgStatement *nodeBefore();
-    inline void insertStmtBefore(SgStatement &s, SgStatement &cp);
-    void insertStmtAfter(SgStatement &s, SgStatement &cp);
-
-    inline void insertStmtBefore(SgStatement& s)  // DEPRECATED IN SAPFOR!!
-    {
-        checkDepracated();
-        insertBfndBeforeIn(s.thebif, thebif, NULL); 
-    }
-    inline void insertStmtAfter(SgStatement& s) // DEPRECATED IN SAPFOR!!
-    {
-        checkDepracated();
-        insertBfndListIn(s.thebif, thebif, NULL); 
-    }
-
-    inline SgStatement *extractStmt();
-    inline SgStatement *extractStmtBody();
-    inline void replaceWithStmt(SgStatement &s);
-    inline void deleteStmt();
-    inline SgStatement  &copy(void);
-    inline SgStatement  *copyPtr(void);
-    inline SgStatement  &copyOne(void);
-    inline SgStatement  *copyOnePtr(void);
-    inline SgStatement  &copyBlock(void);
-    inline SgStatement  *copyBlockPtr(void);
-    inline SgStatement  *copyBlockPtr(int saveLabelId);
-    inline int isIncludedInStmt(SgStatement &s);
-    inline void replaceSymbByExp(SgSymbol &symb, SgExpression &exp);
-    inline void replaceSymbBySymb(SgSymbol &symb, SgSymbol &newsymb);
-    inline void replaceSymbBySymbSameName(SgSymbol &symb, SgSymbol &newsymb);
-    inline void replaceTypeInStmt(SgType &old, SgType &newtype);
-    char* unparse(int lang = 0); // FORTRAN_LANG
-    inline void unparsestdout();
-    std::string sunparse(int lang = 0); // FORTRAN_LANG
-    inline char *comments();      //preceding comment lines.
-    void addComment(const char *com);
-    void addComment(char *com);
-    /* ajm: setComments: set ALL of the node's comments */
-    inline void setComments(char *comments);
-    inline void setComments(const char *comments);
-    inline void delComments();
-    int numberOfComments(); //number of preceeding comments. CAREFUL! 
-
-    int hasAnnotations();   //1 if there are annotations; 0 otherwise
-    ~SgStatement();
-    // These function must be removed. Doesn't make sense here.
-    int IsSymbolInScope(SgSymbol &symb); // TRUE if symbol is in scope
-    int IsSymbolReferenced(SgSymbol &symb);
-    inline SgStatement *getScopeForDeclare(); // return where a variable can be declared;
-
-    /////////////// FOR ATTRIBUTES //////////////////////////
-
-    int numberOfAttributes();
-    int numberOfAttributes(int type); // of a specified type;
-    void *attributeValue(int i);
-    int  attributeType(int i);
-    void *attributeValue(int i, int type); // only considering one type attribute
-    void *deleteAttribute(int i);
-    void addAttribute(int type, void *a, int size); // void * can be NULL;
-    void addAttribute(int type); //void * is NULL;
-    void addAttribute(void *a, int size); //no type specifed;
-    void addAttribute(SgAttribute *att);
-    void addAttributeTree(SgAttribute *firstAtt);
-    SgAttribute *getAttribute(int i);
-    SgAttribute *getAttribute(int i, int type);
-
-    //////////// FOR DECL_SPECS (friend, inline, extern, static) ////////////
-
-    inline void addDeclSpec(int type);   //type should be one of BIT_EXTERN,
-                                  //BIT_INLINE, BIT_FRIEND, BIT_STATIC
-    inline void clearDeclSpec();        //resets the decl_specs field to zero
-    inline int isFriend();               //returns non-zero if friend modifier set
-                                  //returns zero otherwise
-    inline int isInline();
-    inline int isExtern();
-    inline int isStatic();
-
-    // new opportunities were added by Kolganov A.S. 16.04.2018
-    inline int getFileId() const { return fileID; }
-    inline void setFileId(const int newFileId) { fileID = newFileId; }
-
-    inline SgProject* getProject() const { return project; }
-    inline void setProject(SgProject *newProj) { project = newProj; }
-
-    inline bool switchToFile()
-    {
-        if (fileID == -1 || project == NULL)
-            return false;
-
-        if (current_file_id != fileID)
-        {
-            SgFile* file = &(project->file(fileID));
-            currProcessFile = file->filename();
-            currProcessLine = 0;
-        }
-        return true;
-    }
-
-    inline SgFile* getFile() const 
-    { 
-        if (fileID == -1 || project == NULL)
-            return NULL;
-        else
-            return &(project->file(fileID)); 
-    }
-
-    inline void setUnparseIgnore(bool flag) { unparseIgnore = flag; }
-    inline bool getUnparseIgnore() const { return unparseIgnore; }
-
-    static SgStatement* getStatementByFileAndLine(const std::string &fName, const int lineNum);
-    static void cleanStatsByLine() { statsByLine.clear(); }
-
-    static SgStatement* getStatmentByExpression(SgExpression*);
-    static void cleanParentStatsForExprs() { parentStatsForExpression.clear(); }
-    static void activeConsistentchecker() { consistentCheckIsActivated = true; }
-    static void deactiveConsistentchecker() { consistentCheckIsActivated = false; }
-    static void activeDeprecatedchecker() { deprecatedCheck = true; }
-    static void deactiveDeprecatedchecker() { deprecatedCheck = false; }
-
-    static void setCurrProcessFile(const std::string& name) { currProcessFile = name; }
-    static void setCurrProcessLine(const int line) { currProcessLine = line; }
-    static std::string getCurrProcessFile() { return currProcessFile; }
-    static int getCurrProcessLine() { return currProcessLine; }
-
-    static void setSapforRegime() { sapfor_regime = true; }
-    static bool isSapforRegime() { return sapfor_regime; }
-};
-
-class  SgExpression
-{
-public:
-  PTR_LLND thellnd;
-  // generic expression class.
-  SgExpression(int variant, SgExpression &lhs, SgExpression &rhs, SgSymbol &s, SgType &type);
-  SgExpression(int variant, SgExpression *lhs, SgExpression *rhs, SgSymbol *s, SgType *type);
-  SgExpression(int variant, SgExpression *lhs, SgExpression *rhs, SgSymbol *s);
-  SgExpression(int variant, SgExpression *lhs, SgExpression *rhs);
-  SgExpression(int variant, SgExpression* lhs);
-
-  // for some node in fortran
-  SgExpression(int variant,char *str);
-
-  SgExpression(int variant);
-  SgExpression(PTR_LLND ll);
-  SgExpression(SgExpression &);
-  ~SgExpression();
-  
-  inline SgExpression *lhs();
-  inline SgExpression *rhs();
-  SgExpression *operand(int i);
-  inline int variant();      
-  inline SgType *type(); 
-  SgSymbol *symbol();
-  inline int id();
-  inline SgExpression *nextInExprTable();
-  
-  inline void setLhs(SgExpression &e);
-  inline void setLhs(SgExpression *e);
-  inline void setRhs(SgExpression &e);
-  inline void setRhs(SgExpression *e);
-  inline void setSymbol(SgSymbol &s);
-  inline void setSymbol(SgSymbol *s);
-  inline void setType(SgType &t);
-  inline void setType(SgType *t);
-  inline void setVariant(int v);
-  
-  inline SgExpression &copy();
-  inline SgExpression *copyPtr();
-  char *unparse(); 
-  inline char *unparse(int lang);  //0 - Fortran, 1 - C
-  std::string sunparse();
-  inline void unparsestdout();
-  inline SgExpression *IsSymbolInExpression(SgSymbol &symbol);
-  inline void replaceSymbolByExpression(SgSymbol &symbol, SgExpression &expr);
-  inline SgExpression *symbRefs();
-  inline SgExpression *arrayRefs(); 
-  int  linearRepresentation(int *coeff, SgSymbol **symb,int *cst, int size);
-  SgExpression *normalForm(int n, SgSymbol *s);        
-  SgExpression *coefficient(SgSymbol &s); 
-  int isInteger();
-  int valueInteger();
-
-friend SgExpression &operator + ( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator - ( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator * ( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator / ( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator % ( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator <<( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator >>( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator < ( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator > ( SgExpression &lhs, SgExpression &rhs);
-friend SgExpression &operator <= ( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator >= ( SgExpression &lhs, SgExpression &rhs);
-friend SgExpression &operator & ( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator | ( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator &&( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator ||( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator +=( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator &=( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator *=( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator /=( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator %=( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator ^=( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator <<=( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &operator >>=( SgExpression &lhs, SgExpression &rhs);
-friend SgExpression &operator ==(SgExpression &lhs, SgExpression &rhs);
-friend SgExpression &operator !=(SgExpression &lhs, SgExpression &rhs);
-friend SgExpression &SgAssignOp( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &SgEqOp( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &SgNeqOp( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &SgExprListOp( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &SgRecRefOp( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &SgPointStOp( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &SgScopeOp( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &SgDDotOp( SgExpression &lhs, SgExpression &rhs); 
-friend SgExpression &SgBitNumbOp( SgExpression &lhs, SgExpression &rhs); 
-
-  /////////////// FOR ATTRIBUTES //////////////////////////
-
-  int numberOfAttributes();
-  int numberOfAttributes(int type); // of a specified type;
-  void *attributeValue(int i); 
-  int  attributeType(int i); 
-  void *attributeValue(int i,int type); // only considering one type attribute
-  void *deleteAttribute(int i); 
-  void addAttribute(int type, void *a, int size); // void * can be NULL;
-  void addAttribute(int type); //void * is NULL;
-  void addAttribute(void *a, int size); //no type specifed;
-  void addAttribute(SgAttribute *att);
-  SgAttribute *getAttribute(int i);
-  SgAttribute *getAttribute(int i,int type);
-  void addAttributeTree(SgAttribute* firstAtt);
-};
-
-class SgSymbol{
-private:
-    // copyed by Yashin 08.09.2018
-    int fileID;
-    SgProject *project;
-    //
-
-public:
-  // basic class contains
-  PTR_SYMB thesymb;
-  SgSymbol(int variant, const char *identifier, SgType &t, SgStatement &scope);
-  SgSymbol(int variant, const char *identifier, SgType *t, SgStatement *scope);
-  SgSymbol(int variant, const char *identifier,  SgStatement &scope);
-  SgSymbol(int variant, const char *identifier,  SgStatement *scope);
-  SgSymbol(int variant, const char *identifier,   SgType *type, SgStatement *scope, SgSymbol *structsymb, SgSymbol *nextfield );
-
-  SgSymbol(int variant, const char *name);
-  SgSymbol(int variant);
-  SgSymbol(PTR_SYMB symb);
-#if __SPF
-  SgSymbol(const SgSymbol &);
-#endif
-  ~SgSymbol();
-  inline int variant() const;  
-  inline int id() const;             // unique identifier
-  inline char *identifier() const;   // the text name for the symbol.
-  inline SgType *type();       // the type of the symbol
-  inline void setType(SgType &t);       // the type of the symbol
-  inline void setType(SgType *t);       // the type of the symbol
-  inline SgStatement *scope(); // the SgControlStatement where defined.
-  inline SgSymbol *next();     // next symbol reference.
-  SgStatement *declaredInStmt();  // the declaration statement
-  inline SgSymbol &copy();
-  inline SgSymbol* copyPtr();
-  inline SgSymbol &copyLevel1(); // copy also parameters
-  inline SgSymbol &copyLevel2(); // copy parameters, body also
-  inline SgSymbol &copyAcrossFiles(SgStatement &where); // special copy to move things from a file.
-  inline SgSymbol &copySubprogram(SgStatement &where); // special copy for inline expansion 07.06.06
-  int attributes();    // the Fortran 90 attributes
-  void setAttribute(int attribute);
-  void removeAttribute(int attribute);
-  void declareTheSymbol(SgStatement &st);
-  inline void declareTheSymbolWithParamList
-                          (SgStatement &st, SgExpression &parlist);
-  SgExpression *makeDeclExpr();
-  inline SgExpression *makeDeclExprWithParamList
-                          (SgExpression &parlist);
-  SgVarDeclStmt *makeVarDeclStmt();
-  SgVarDeclStmt *makeVarDeclStmtWithParamList
-                          (SgExpression &parlist);
- 
-  SgStatement *body(); // the body of the symbol if has one (like, function call, class,...)
-  inline SgSymbol *moduleSymbol();  // module symbol reference  "by use"
-
-  // new opportunities were added by Kolganov A.S. 16.04.2018 and copyed by Yashin 08.09.2018
-  inline int getFileId() const { return fileID; }
-  inline void setFileId(const int newFileId) { fileID = newFileId; }
-  void changeName(const char *); // set new name for the symbol
-
-  inline SgProject* getProject() const { return project; }
-  inline void setProject(SgProject *newProj) { project = newProj; }
-
-  inline bool switchToFile()
-  {
-      if (fileID == -1 || project == NULL)
-          return false;
-
-      if (current_file_id != fileID)
-          SgFile *file = &(project->file(fileID));
-      return true;
-  }
-
-  inline SgFile* getFile() const
-  {
-      if (fileID == -1 || project == NULL)
-          return NULL;
-      else
-          return &(project->file(fileID));
-  }
-  //
-
-  /////////////// FOR ATTRIBUTES //////////////////////////
-
-  int numberOfAttributes();
-  int numberOfAttributes(int type); // of a specified type;
-  void *attributeValue(int i); 
-  int  attributeType(int i); 
-  void *attributeValue(int i,int type); // only considering one type attribute
-  void *deleteAttribute(int i); 
-  void addAttribute(int type, void *a, int size); // void * can be NULL;
-  void addAttribute(int type); //void * is NULL;
-  void addAttribute(void *a, int size); //no type specifed;
-  void addAttribute(SgAttribute *att);
-  SgAttribute *getAttribute(int i);
-  SgAttribute *getAttribute(int i,int type);
-};
-
-
-/* This code by Andrew Mauer (ajm) */
-/* These constants are used by SgType::maskDescriptors() and 
-   SgType::getTrueType(). */
-
-const int MASK_NO_DESCRIPTORS = ~0; /* all ones = keep everything */
-const int MASK_MOST_DESCRIPTORS =  ( BIT_SIGNED | BIT_UNSIGNED
-				     | BIT_LONG | BIT_SHORT
-				     | BIT_CONST | BIT_VOLATILE );
-
-const int MASK_ALL_DESCRIPTORS = 0; /* keep nothing */
-
-
-class SgType{
-public:
-  PTR_TYPE thetype;
-  SgType(int variant);
-  SgType(int var, SgExpression *len,SgType *base);
-  SgType(int var, SgSymbol *symb);
-  SgType(int var, SgSymbol *firstfield, SgStatement *structstmt);
-  SgType(int var, SgSymbol *symb, SgExpression *len, SgType *base);
-  SgType(PTR_TYPE type);
-  SgType(SgType &);
-  ~SgType();
-  inline int variant();
-  inline int id();
-  inline SgSymbol *symbol();
-  inline SgType &copy();
-  inline SgType *copyPtr();
-  inline SgType *next();
-  inline int isTheElementType();
-  inline int equivalentToType(SgType &type);
-  inline int equivalentToType(SgType *type);
-  inline SgType *internalBaseType();
-  inline int hasBaseType();
-  inline SgType *baseType();
-  inline SgExpression *length(); // update Kataev N.A. 30.08.2013
-  inline void setLength(SgExpression* newLen);
-  inline SgExpression *selector(); // update Kataev N.A. 30.08.2013
-  inline void setSelector(SgExpression* newSelector);
-  inline void deleteSelector();
-
-/* This code by Andrew Mauer (ajm) */
-/*
-  maskDescriptors:
-
-  This routine strips many descriptive type traits which you are probably
-  not interested in cloning for variable declarations, etc.
-
-  Returns the getTrueType of the base type being described IF there
-  are no descriptors which are not masked out. The following masks
-  can be specified as an optional second argument:
-        MASK_NO_DESCRIPTORS: Do not mask out anything.
-        MASK_MOST_DESCRIPTORS: Only leave in: signed, unsigned, short, long,
-	                                      const, volatile.
-	MASK_ALL_DESCRIPTORS: Mask out everything. 
-
-  If you build your own mask, you should make sure that the traits
-  you want to set out have their bits UN-set, and the rest should have
-  their bits set. The complementation (~) operator is a good one to use.
-
-  See libSage++.h, where the MASK_*_DESCRIPTORS variables are defined.
-*/
-
-   SgType *maskDescriptors (int mask);
-
-
-/* This code by Andrew Mauer (ajm) */
-/*
-  getTrueType:
-
-  Since Sage stores dereferenced pointers as PTR(-1) -> PTR(1) -> BASE_TYPE,
-  we may need to follow the chain of dereferencing to find the type
-  which we expect.
-
-  This code currently assumes that:
-  o If you follow the dereferencing pointer (PTR(-1)), you find another
-  pointer type or an array type. 
-
-  We do NOT assume that the following situation cannot occur:
-      PTR(-1) -> PTR(-1) -> PTR(1) -> PTR(1) -> PTR(-1) -> PTR(1)
-
-  This means there may be more pointers to follow after we come to
-  an initial "equilibrium".
-
-  ALGORITHM:
-
-  T_POINTER:
-     [WARNING: No consideration is given to pointers with attributes
-     (ls_flags) set. For instance, a const pointer is treated the same
-     as any other pointer.]
-     
-     1. Return the same type we got if it is not a pointer type or
-     the pointer is not a dereferencing pointer type.
-
-     2. Repeat { get next pointer , add its indirection to current total }
-     until the current total is 0. We have reached an equilibrium, so
-     the next type will not necessarily be a pointer type.
-
-     3. Check the next type for further indirection with another call
-     to getTrueType.
-
-  T_DESCRIPT:
-     Returns the result of maskDescriptors called with the given type and mask.
-
-  T_ARRAY:
-     If the array has zero dimensions, we pass over it. This type arose
-     for me in the following situation:
-          double x[2];
-	  x[1] = 0;
-     
-  T_DERIVED_TYPE:
-     If we have been told to follow typedefs, get the type of the
-     symbol from which this type is derived from, and continue digging.
-     Otherwise return this type.
-
-
-  HITCHES:
-     Some programs may dereference a T_ARRAY as a pointer, so we need
-     to be prepared to deal with that.
-  */
-
-  SgType *getTrueType (int mask = MASK_MOST_DESCRIPTORS, 
-                       int follow_typedefs = 0);
-
-  int numberOfAttributes();
-  int numberOfAttributes(int type); // of a specified type;
-  void *attributeValue(int i); 
-  int  attributeType(int i); 
-  void *attributeValue(int i,int type); // only considering one type attribute
-  void *deleteAttribute(int i); 
-  void addAttribute(int type, void *a, int size); // void * can be NULL;
-  void addAttribute(int type); //void * is NULL;
-  void addAttribute(void *a, int size); //no type specifed;
-  void addAttribute(SgAttribute *att);
-  SgAttribute *getAttribute(int i);
-  SgAttribute *getAttribute(int i,int type);
-};
-
-// SgMakeDeclExp can be called by the user to generate declaration
-// expressions from type strings.  it handles all C types.
-SgExpression *SgMakeDeclExp(SgSymbol *sym, SgType *t);
-
-
-class SgLabel{
-public:
-  PTR_LABEL thelabel;
-  SgLabel(PTR_LABEL lab);
-  SgLabel(SgLabel &);
-  SgLabel(int i);
-  inline int getLabNumber() { return (int)(thelabel->stateno); }
-  inline int id();
-  inline int getLastLabelVal();
-  ~SgLabel();
-
-  /***** Kataev 21.03.2013 *****/
-  int numberOfAttributes();
-  int numberOfAttributes(int type); // of a specified type;
-  void *attributeValue(int i); 
-  int  attributeType(int i); 
-  void *attributeValue(int i,int type); // only considering one type attribute
-  void *deleteAttribute(int i); 
-  void addAttribute(int type, void *a, int size); // void * can be NULL;
-  void addAttribute(int type); //void * is NULL;
-  void addAttribute(void *a, int size); //no type specifed;
-  void addAttribute(SgAttribute *att);
-  SgAttribute *getAttribute(int i);
-  SgAttribute *getAttribute(int i,int type);
-  /*****************************/
-};
-
-class  SgValueExp: public SgExpression{
-  // a value of one of the base types
-  // variants: INT_VAL, CHAR_VAL, FLOAT_VAL, 
-  //           DOUBLE_VAL, STRING_VAL, COMPLEX_VAL, KEYWORD_VAL
-public:
-  inline SgValueExp(bool value); // add for bool value (Kolganov, 26.11.2019)
-  inline SgValueExp(int value);
-  inline SgValueExp(char char_val);
-  inline SgValueExp(float float_val);
-  inline SgValueExp(double double_val);
-  inline SgValueExp(float float_val, char*);
-  inline SgValueExp(double double_val, char*);
-  inline SgValueExp(char *string_val);
-  inline SgValueExp(const char *string_val);
-  inline SgValueExp(double real, double imaginary);
-  inline SgValueExp(SgValueExp &real, SgValueExp &imaginary);
-  inline void setValue(int int_val);
-  inline void setValue(char char_val);
-  inline void setValue(float float_val);
-  inline void setValue(double double_val);
-  inline void setValue(char *string_val);
-  inline void setValue(double real, double im);
-  inline bool boolValue(); // add for bool value (Kataev, 16.03.2013)
-  inline void setValue(SgValueExp &real, SgValueExp & im);
-  inline int intValue();
-  inline char*  floatValue();
-  inline char  charValue();
-  inline char*  doubleValue();
-  inline char * stringValue();
-  inline SgExpression *realValue();
-  inline SgExpression *imaginaryValue();
-};
-
-class  SgKeywordValExp: public SgExpression{
-public:
-  inline SgKeywordValExp(char *name);
-  inline SgKeywordValExp(const char *name);
-  inline char *value();
-};
-
-
-class  SgUnaryExp: public  SgExpression{
-public:
-  inline SgUnaryExp(PTR_LLND ll);
-  inline SgUnaryExp(int variant, SgExpression & e);
-  inline SgUnaryExp(int variant, int post, SgExpression & e);
-  inline int post();
-  SgExpression &operand();
-};
-
-class  SgCastExp: public SgExpression{
-public:
-  inline SgCastExp(PTR_LLND ll);
-  inline SgCastExp(SgType &t, SgExpression &e);
-  inline SgCastExp(SgType &t);
-  inline ~SgCastExp();
-};
-
-// delete [size]  expr
-// variant == DELETE_OP
-class SgDeleteExp: public SgExpression{
-public:
-  inline SgDeleteExp(PTR_LLND ll);
-  inline SgDeleteExp(SgExpression &size, SgExpression &expr);
-  inline SgDeleteExp(SgExpression &expr);
-  inline ~SgDeleteExp();
-};
-
-// new typename
-// new typename (expr)
-// variant == NEW_OP
-class SgNewExp: public SgExpression{
-public:
-  inline SgNewExp(PTR_LLND ll);
-  inline SgNewExp(SgType &t);
-  inline SgNewExp(SgType &t, SgExpression &e);
-#if 0
-  SgExpression &numberOfArgs();
-  SgExpression &argument(int i);
-#endif
-  ~SgNewExp();
-};
-
-// functions here can use LlndMapping perhaps.
-class SgExprIfExp: public SgExpression{
-  //  (expr1)? expr2 : expr3
-  // variant == EXPR_IF
-public:
-  inline SgExprIfExp(PTR_LLND ll);
-  inline SgExprIfExp(SgExpression &exp1,SgExpression &exp2, SgExpression &exp3);
-  SgExpression &conditional();
-  SgExpression &trueExp();
-  SgExpression &falseExp();
-  inline void setConditional(SgExpression &c);
-  void setTrueExp(SgExpression &t);
-  void setFalseExp(SgExpression &f);
-  ~SgExprIfExp();
-};
-
-class SgFunctionRefExp: public SgExpression{
-   // function_name(formal args)  - for function headers and protytpes.
-   // variant = FUNCTION_REF
-public:
-  inline SgFunctionRefExp(PTR_LLND ll);
-  inline SgFunctionRefExp(SgSymbol &fun);
-  inline ~SgFunctionRefExp();
-  inline SgSymbol *funName();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  SgExpression * AddArg(char *, SgType &);
-};
-
-class SgFunctionCallExp: public SgExpression{
-  // function_name(expr1, expr2, ....)
-  // variant == FUNC_CALL
-public:
-  inline SgFunctionCallExp(PTR_LLND ll);
-  inline SgFunctionCallExp(SgSymbol &fun, SgExpression &paramList);
-  inline SgFunctionCallExp(SgSymbol &fun);
-  inline ~SgFunctionCallExp();
-  inline SgSymbol *funName();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-class SgFuncPntrExp: public SgExpression{
-  // (functionpointer)(expr1,expr2,expr3)
-  // variant == FUNCTION_OP
-public:
-  inline SgFuncPntrExp(PTR_LLND ll);
-  inline SgFuncPntrExp(SgExpression &ptr);
-  inline ~SgFuncPntrExp();
-  inline SgExpression *funExp();
-  inline void setFunExp(SgExpression &s);
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);  // add an argument.
-  SgExpression* AddArg(SgSymbol *thefunc, char *name, SgType &); 
-              // add a formal parameter
-              // to a pointer to a function prototype or parameter.
-              // this returns the expression
-};
-
-class SgExprListExp: public SgExpression{
-        // variant == EXPR_LIST
-public:
-  inline SgExprListExp(PTR_LLND ll);
-  inline SgExprListExp();
-  inline SgExprListExp(SgExpression &ptr);
-
-  // create new constructor for every variant, 
-  // added by Kolganov A.S. 31.10.2013
-  inline SgExprListExp(int variant);
-
-  inline ~SgExprListExp();
-  inline int length();
-  inline SgExpression *elem(int i);
-  inline SgExprListExp *next();
-  inline SgExpression *value();
-  inline void setValue(SgExpression &ptr);      
-  inline void append(SgExpression &arg);
-  void linkToEnd(SgExpression &arg);
-};
-
-class  SgRefExp: public SgExpression{
-  // Fortran name references
-  // variant == CONST_REF, TYPE_REF, INTERFACE_REF
-public:
-  inline SgRefExp(PTR_LLND ll);
-  inline SgRefExp(int variant, SgSymbol &s);
-  inline ~SgRefExp();
-};
-
-class SgTypeRefExp: public SgExpression{
-   // a reference to a type in a c++ template argument 
-  public:
-    inline SgTypeRefExp(SgType &t);
-    inline ~SgTypeRefExp();
-    inline SgType *getType();
-};
-
-class  SgVarRefExp: public SgExpression{
-  // scalar variable reference or non-indexed array reference
-  // variant == VAR_REF
-public:
-  inline SgVarRefExp (PTR_LLND ll);
-  inline SgVarRefExp(SgSymbol &s);
-  inline SgVarRefExp(SgSymbol *s);
-  SgExpression *progatedValue(); // if scalar propogation worked
-  inline ~SgVarRefExp();
-};
-
-
-class  SgThisExp: public SgExpression{
-  // variant == THIS_NODE
-public:
-  inline SgThisExp (PTR_LLND ll);
-  inline SgThisExp(SgType &t);
-  inline ~SgThisExp();
-};
-
-class  SgArrayRefExp: public SgExpression{
-  // an array reference
-  // variant == ARRAY_REF
-public:
-  inline SgArrayRefExp(PTR_LLND ll);
-  inline SgArrayRefExp(SgSymbol &s);
-  inline SgArrayRefExp(SgSymbol &s, SgExpression &subscripts);
-  inline SgArrayRefExp(SgSymbol &s, SgExpression &sub1,SgExpression &sub2);
-  
-  inline SgArrayRefExp(SgSymbol &s, SgExpression &sub1,SgExpression &sub2,SgExpression &sub3);
-  
-  inline SgArrayRefExp(SgSymbol &s, SgExpression &sub1,SgExpression &sub2,SgExpression &sub3,SgExpression &sub4);
-  inline ~SgArrayRefExp();
-  inline int numberOfSubscripts();  // the number of subscripts in reference
-  inline SgExpression *subscripts();
-  inline SgExpression *subscript(int i);
-  inline void addSubscript(SgExpression &e);
-  inline void replaceSubscripts(SgExpression& e);
-  inline void setSymbol(SgSymbol &s);
-};
-
-// set NODE _TYPE.
-class SgPntrArrRefExp: public SgExpression{
-public:
-  inline SgPntrArrRefExp(PTR_LLND ll);
-  inline SgPntrArrRefExp(SgExpression &p);
-  inline SgPntrArrRefExp(SgExpression &p, SgExpression &subscripts);
-  inline SgPntrArrRefExp(SgExpression &p, int n, SgExpression &sub1, SgExpression &sub2);
-  inline SgPntrArrRefExp(SgExpression &p, int n, SgExpression &sub1, SgExpression &sub2, SgExpression &sub3);
-  inline SgPntrArrRefExp(SgExpression &p, int n, SgExpression &sub1, SgExpression &sub2, SgExpression &sub3, SgExpression &sub4);
-  inline ~SgPntrArrRefExp();
-  inline int dimension();  // the number of subscripts in reference
-  inline SgExpression *subscript(int i);
-  inline void addSubscript(SgExpression &e);
-  inline void setPointer(SgExpression &p);
-};
-
-class SgPointerDerefExp: public SgExpression{
-  // pointer dereferencing
-  // variant == DEREF_OP
-public:
-  inline SgPointerDerefExp(PTR_LLND ll);
-  inline SgPointerDerefExp(SgExpression &pointerExp);
-  inline ~SgPointerDerefExp();
-  inline SgExpression *pointerExp();
-};
-
-class SgRecordRefExp: public SgExpression{
-  // a field reference of a structure
-  // variant == RECORD_REF
-public:
-  inline SgRecordRefExp(PTR_LLND ll);
-  inline SgRecordRefExp(SgSymbol &recordName, char *fieldName);
-  inline SgRecordRefExp(SgExpression &recordExp, char *fieldName);
-  inline SgRecordRefExp(SgSymbol &recordName, const char *fieldName);
-  inline SgRecordRefExp(SgExpression &recordExp, const char *fieldName);
-  inline ~SgRecordRefExp();
-  inline SgSymbol *fieldName();
-  inline SgSymbol *recordName();
-  inline SgExpression *record();
-  inline SgExpression* field();
-};
-
-
-class SgStructConstExp:  public SgExpression{
-  // Fortran 90 structure constructor
-  // variant == STRUCTURE_CONSTRUCTOR
-public:
-  inline SgStructConstExp(PTR_LLND ll);
-  // further checks on values need to be done.
-  inline SgStructConstExp(SgSymbol &structName, SgExpression &values);
-  inline SgStructConstExp(SgExpression  &typeRef, SgExpression &values);
-  inline ~SgStructConstExp();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-};
-
-class SgConstExp:  public SgExpression{
-public:
-  inline SgConstExp(PTR_LLND ll);
-  inline SgConstExp(SgExpression &values);
-  inline ~SgConstExp();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-};
-
-class SgVecConstExp: public SgExpression{
-  // a vector constant of the form: [ expr1, expr2, expr3]
-  // variant == VECTOR_CONST
-public:
-  inline SgVecConstExp(PTR_LLND ll);
-  inline SgVecConstExp(SgExpression &expr_list);
-  inline SgVecConstExp(int n, SgExpression *components);
-  inline ~SgVecConstExp();
-  
-  inline SgExpression *arg(int i); // the i-th term
-  inline int numberOfArgs();
-  inline void setArg(int i, SgExpression &e);
-};
-
-class SgInitListExp: public SgExpression{
-  // used for initializations.  form: { expr1,expr2,expr3}
-  // variant == INIT_LIST
-public:
-  inline SgInitListExp(PTR_LLND ll);
-  inline SgInitListExp(SgExpression &expr_list);
-  inline SgInitListExp(int n, SgExpression *components);
-  inline ~SgInitListExp();
-  
-  inline SgExpression *arg(int i); // the i-th term
-  inline int numberOfArgs();
-  inline void setArg(int i, SgExpression &e);
-};
-
-class SgObjectListExp: public SgExpression{
-  // used for EQUIVALENCE, NAMELIST and COMMON statements
-  // variant == EQUI_LIST, NAMELIST_LIST, COMM_LIST
-public:
-  inline SgObjectListExp(PTR_LLND ll);
-  inline SgObjectListExp(int variant, SgSymbol &object, SgExpression &list);
-  inline SgObjectListExp(int variant,SgExpression &objectRef, SgExpression &list);
-  inline ~SgObjectListExp();
-  inline SgSymbol *object();    //fix Kataev N.A. 20.03.2014
-  inline SgObjectListExp * next( ); //add Kataev N.A. 20.03.2014
-  inline SgExpression * body( ); //rename from objectRef( ) Kataev N.A. 20.03.2014
-  inline int listLength();      // fix Kataev N.A. 20.03.2014
-  inline SgExpression object( int i); //add Kataev N.A. 20.03.2014
-  inline SgSymbol *symbol(int i);   // fix Kataev N.A. 20.03.2014
-  inline SgExpression *body(int i);  // rename from objectRef( int) and fix Kataev N.A. 20.03.2014
-};
-
-
-class SgAttributeExp: public SgExpression{
-  // Fortran 90 attributes
-  // variant ==  PARAMETER_OP, PUBLIC_OP, PRIVATE_OP, ALLOCATABLE_OP,
-  // DIMENSION_OP, EXTERNAL_OP, IN_OP, OUT_OP, INOUT_OP, INTRINSIC_OP, 
-  // POINTER_OP, OPTIONAL_OP, SAVE_OP, TARGET_OP
-public:
-  inline SgAttributeExp(PTR_LLND ll);
-  inline SgAttributeExp(int variant);
-  inline ~SgAttributeExp();
-};
-
-class SgKeywordArgExp: public SgExpression{
-  // Fortran 90 keyword argument
-  // variant == KEYWORD_ARG
-public:
-  inline SgKeywordArgExp(PTR_LLND ll);
-  inline SgKeywordArgExp(char *argName, SgExpression &exp);
-  inline SgKeywordArgExp(const char *argName, SgExpression &exp);
-  inline ~SgKeywordArgExp();
-  //inline SgSymbol *arg(); does not work, always return NULL
-  inline SgExpression *arg(); //! now return SgKeywordValueExp (Kataev N.A. 30.05.2013)
-  inline SgExpression *value();
-};
-
-class SgSubscriptExp: public SgExpression{
-  // Fortran 90 vector subscript expression
-  // variant == DDOT
-public:
-  inline SgSubscriptExp(PTR_LLND ll);
-  inline SgSubscriptExp(SgExpression &lbound, SgExpression &ubound, SgExpression &step);
-  inline SgSubscriptExp(SgExpression &lbound, SgExpression &ubound);
-  inline ~SgSubscriptExp();
-  // perhaps this function can use LlndMapping
-  SgExpression *lbound();
-  SgExpression *ubound();
-  SgExpression *step();
-};
-
-class SgUseOnlyExp: public SgExpression{
-  // Fortran 90 USE statement ONLY attribute 
-  // variant == ONLY_NODE
-public:
-  inline SgUseOnlyExp(PTR_LLND ll);
-  inline SgUseOnlyExp(SgExpression &onlyList);
-  inline ~SgUseOnlyExp();
-  inline SgExpression *onlyList();
-};
-
-class SgUseRenameExp: public SgExpression{
-  // Fortran 90 USE statement renaming
-  // variant == RENAME_NODE
-public:
-  inline SgUseRenameExp(PTR_LLND ll);
-  inline SgUseRenameExp(SgSymbol &newName, SgSymbol &oldName);
-  inline ~SgUseRenameExp();
-  inline SgSymbol *newName();
-  inline SgSymbol *oldName();
-  inline SgExpression *newNameExp();
-  inline SgExpression *oldNameExp();
-};
-
-
-class SgSpecPairExp: public SgExpression{
-  // Fortran default control arguments to Input/Output statements
-  // variant == SPEC_PAIR
-public:
-  inline SgSpecPairExp(PTR_LLND ll);
-  inline SgSpecPairExp(SgExpression &arg, SgExpression &value);
-  inline SgSpecPairExp(SgExpression &arg);
-  inline SgSpecPairExp(char *arg, char *value);
-  inline ~SgSpecPairExp();
-  inline SgExpression *arg();
-  inline SgExpression *value();
-};
-
-
-//used for do-loop range representation also.
-// this form needs to be standardized. 
-class SgIOAccessExp: public SgExpression{
-  // Fortran index variable bound instantiation
-  // variant == IOACCESS
-public:
-  inline SgIOAccessExp(PTR_LLND ll);
-  // type-checking on bounds needs to be done.
-  // Float values are legal in some cases. check manual.
-  inline SgIOAccessExp(SgSymbol &s, SgExpression lbound, SgExpression ubound, SgExpression step);
-  inline SgIOAccessExp(SgSymbol &s, SgExpression lbound, SgExpression ubound);
-  inline ~SgIOAccessExp();
-};
-
-class SgImplicitTypeExp: public SgExpression{
-  // Fortran index variable bound instantiation
-  // variant == IMPL_TYPE
-public:
-  inline SgImplicitTypeExp(PTR_LLND ll);
-  inline SgImplicitTypeExp(SgType &type, SgExpression &rangeList);
-  inline ~SgImplicitTypeExp();
-  inline SgType *type();
-  inline SgExpression *rangeList();
-  inline char *alphabeticRange();
-};
-
-class SgTypeExp: public SgExpression{
-  // Fortran type expression 
-  // variant == TYPE_OP
-public:
-  inline SgTypeExp(PTR_LLND ll);
-  inline SgTypeExp(SgType &type);
-  inline ~SgTypeExp();
-  inline SgType *type();
-};
-
-class SgSeqExp: public SgExpression{
-  // Fortran index variable bound instantiation
-  // variant == SEQ
-public:
-  inline SgSeqExp(PTR_LLND ll);
-  inline SgSeqExp(SgExpression &exp1, SgExpression &exp2);
-  inline ~SgSeqExp();
-  inline SgExpression *front();
-  inline SgExpression *rear();
-};
-
-class SgStringLengthExp: public SgExpression{
-  // Fortran index variable bound instantiation
-  // variant == LEN_OP
-public:
-  inline SgStringLengthExp(PTR_LLND ll);
-  inline SgStringLengthExp(SgExpression &length);
-  inline ~SgStringLengthExp();
-  inline SgExpression *length();
-};
-
-class SgDefaultExp: public SgExpression {
-  // Fortran default node
-  // variant == DEFAULT
-public:
-  SgDefaultExp(PTR_LLND ll);
-  SgDefaultExp();
-  ~SgDefaultExp();
-};
-
-class SgLabelRefExp: public SgExpression{
-  // Fortran label reference
-  // variant == LABEL_REF
-public:
-  inline SgLabelRefExp(PTR_LLND ll);
-  inline SgLabelRefExp(SgLabel &label);
-  inline ~SgLabelRefExp();
-  inline SgLabel *label();
-};
-
-
-class  SgProgHedrStmt: public SgStatement{
-  // fortran Program block
-  // variant == PROG_HEDR
-public:
-  inline SgProgHedrStmt(PTR_BFND bif);
-  inline SgProgHedrStmt(int variant);
-  inline SgProgHedrStmt(SgSymbol &name, SgStatement &Body);
-  inline SgProgHedrStmt(SgSymbol &name);
-  inline SgProgHedrStmt(char *name);
-  inline SgSymbol &name();
-  // added 15.08.2018 by A.S. Kolganov. <contains cp name>.funcName
-  inline std::string nameWithContains()
-  {
-      std::string containsName = "";
-      SgStatement *st_cp = this->controlParent();
-      if (st_cp->variant() == PROC_HEDR || st_cp->variant() == PROG_HEDR || st_cp->variant() == FUNC_HEDR)
-          containsName = st_cp->symbol()->identifier() + std::string(".");
-
-      return containsName + this->symbol()->identifier();
-  }
-
-  inline void setName(SgSymbol &symbol); // set program name 
-
-  inline int numberOfFunctionsCalled();  // the number of functions called
-  inline SgSymbol *calledFunction(int i);// the i-th called function
-  inline int numberOfStmtFunctions();   // the number of statement funcions;
-  inline SgStatement *statementFunc(int i); // the i-th statement function;
-  inline int numberOfEntryPoints();     // the number of entry points;
-  inline SgStatement *entryPoint(int i); // the i-th entry point;
-  inline int numberOfParameters();       // the number of parameters;       
-  inline SgSymbol *parameter(int i);     // the i-th parameter  
-  inline int numberOfSpecificationStmts();
-  inline SgStatement *specificationStmt(int i);
-  inline int numberOfExecutionStmts();
-  inline SgStatement *executionStmt(int i);
-  inline int numberOfInternalFunctionsDefined();
-  inline SgStatement *internalFunction(int i);
-  inline int numberOfInternalSubroutinesDefined();
-  inline SgStatement *internalSubroutine(int i);
-  inline int numberOfInternalSubProgramsDefined();
-  inline SgStatement *internalSubProgram(int i);
-  
-#if 0
-  SgSymbol &addVariable(SgType &T, char *name); 
-                                        //add a declaration for new variable
-  
-  SgStatement &addCommonBlock(char *blockname, int noOfVars,
-                              SgSymbol *Vars); // add a new common block
-#endif        
-  inline int isSymbolInScope(SgSymbol &symbol);
-  inline int isSymbolDeclaredHere(SgSymbol &symbol);
-  
-  // global analysis data
-  
-  inline int numberOfVarsUsed();  // list of used variable access sections
-  inline SgExpression *varsUsed(int i); // i-th var used section descriptor
-  inline int numberofVarsMod();   // list of modifed variable access sections
-  inline SgExpression *varsMod(int i);   // i-th var mod section descriptor
-  inline ~SgProgHedrStmt();
-};
-
-class  SgProcHedrStmt: public SgProgHedrStmt{
-  // Fortran subroutine
-  // variant == PROC_HEDR
-public:        
-  inline SgProcHedrStmt(int variant);
-  inline SgProcHedrStmt(SgSymbol &name, SgStatement &Body);
-  inline SgProcHedrStmt(SgSymbol &name);
-  inline SgProcHedrStmt(const char *name);
-  inline void AddArg(SgExpression &arg); 
-  SgExpression * AddArg(char *name, SgType &t); // returns decl expr created.
-  SgExpression * AddArg(char *name, SgType &t, SgExpression &initializer);
-  inline int isRecursive();  // 1 if recursive.;
-  inline int numberOfEntryPoints();      // the number of entry points
-                                         // other than the main, 0 for C funcs.
-  inline SgStatement *entryPoint(int i);  // the i-th entry point
-  // this is incorrect. Takes only subroutines calls into account.
-  // Should be modified to take function calls into account too.
-  inline int numberOfCalls();            // number of calls to this proc.
-  inline SgStatement *call(int i);       // position of the i-th call.  
-  inline ~SgProcHedrStmt();
-};      
-
-
-class  SgProsHedrStmt: public SgProgHedrStmt{
-  // Fortran M process
-  // variant == PROS_HEDR
-public:        
-  inline SgProsHedrStmt();
-  inline SgProsHedrStmt(SgSymbol &name, SgStatement &Body);
-  inline SgProsHedrStmt(SgSymbol &name);
-  inline SgProsHedrStmt(char *name);
-  inline void AddArg(SgExpression &arg);
-  inline int numberOfCalls();            // number of calls to this proc.
-  inline SgStatement *call(int i);       // position of the i-th call.  
-  inline ~SgProsHedrStmt();
-};      
-
-
-class  SgFuncHedrStmt: public SgProcHedrStmt{
-  // Fortran and C function.
-  // variant == FUNC_HEDR
-public:
-  inline SgFuncHedrStmt(SgSymbol &name, SgStatement &Body);
-  inline SgFuncHedrStmt(SgSymbol &name, SgType &type, SgStatement &Body);
-  inline SgFuncHedrStmt(SgSymbol &name, SgSymbol &resultName, SgType &type, SgStatement &Body);
-  inline SgFuncHedrStmt(SgSymbol &name);
-  inline SgFuncHedrStmt(SgSymbol &name, SgExpression *exp);
-  inline SgFuncHedrStmt(char *name);
-  inline ~SgFuncHedrStmt();
-  
-  inline SgSymbol *resultName();  // name of result variable.;
-  int  setResultName(SgSymbol &symbol); // set name of result variable.;
-  
-  inline SgType *returnedType();  // type of returned value
-  inline void setReturnedType(SgType &type);  // set type of returned value
-};
-
-class SgClassStmt;
-
-class SgTemplateStmt: public SgStatement{
-  // This is a function template or class template
-  // in both cases the variant is TEMPLATE_FUNDECL
-public:
-   SgTemplateStmt(SgExpression *arglist);
-  SgExpression * AddArg(char *name, SgType &t); // returns decl expr created.
-     // if name == NULL then this is a type reference.
-  SgExpression * AddArg(char *name, SgType &t, SgExpression &initializer);
-   int numberOfArgs();
-   SgExpression *arg(int i);
-   SgExpression *argList();
-   void addFunction(SgFuncHedrStmt &theTemplateFunc);
-   void addClass(SgClassStmt &theTemplateClass);
-   SgFuncHedrStmt *isFunction();
-   SgClassStmt *isClass();
-};
-
-#if 0
-class  SgModuleStmt: public SgStatement{
-  // Fortran 90 Module statement
-  // variant ==  MODULE_STMT
-public:
-  SgModuleStmt(SgSymbol &moduleName, SgStatement &body);
-  SgModuleStmt(SgSymbol &moduleName);
-  ~SgModuleStmt();
-  
-  SgSymbol *moduleName();               // module name 
-  void setName(SgSymbol &symbol);        // set module name 
-  
-  int numberOfSpecificationStmts();
-  int numberOfRoutinesDefined();
-  int numberOfFunctionsDefined();
-  int numberOfSubroutinesDefined();
-  
-  SgStatement *specificationStmt(int i);
-  SgStatement *routine(int i);
-  SgStatement *function(int i);
-  SgStatement *subroutine(int i);
-  
-  int isSymbolInScope(SgSymbol &symbol);
-  int isSymbolDeclaredHere(SgSymbol &symbol);
-  
-  SgSymbol &addVariable(SgType &T, char *name); 
-                                        //add a declaration for new variable
-  
-  SgStatement *addCommonBlock(char *blockname, int noOfVars,
-                              SgSymbol *Vars); // add a new common block
-};
-
-class  SgInterfaceStmt: public SgStatement{
-  // Fortran 90 Operator Interface Statement
-  // variant == INTERFACE_STMT
-public:
-  SgInterfaceStmt(SgSymbol &name, SgStatement &body, SgStatement &scope);
-  ~SgInterfaceStmt();
-  
-  SgSymbol *interfaceName();               // interface name if given
-  int setName(SgSymbol &symbol);           // set interface name 
-  
-  int numberOfSpecificationStmts();
-  
-  SgStatement *specificationStmt(int i);
-  
-  int isSymbolInScope(SgSymbol &symbol);
-  int isSymbolDeclaredHere(SgSymbol &symbol);
-};
-
-class  SgBlockDataStmt: public SgStatement{
-  // Fortran Block Data statement
-  // variant == BLOCK_DATA
-public:
-  SgBlockDataStmt(SgSymbol &name, SgStatement &body);
-  ~SgBlockDataStmt();
-  
-  SgSymbol *name();  // block data name if given;
-  int setName(SgSymbol &symbol);           // set block data name 
-  
-  int isSymbolInScope(SgSymbol &symbol);
-  int isSymbolDeclaredHere(SgSymbol &symbol);
-};
-
-#endif
-
-
-class SgClassStmt: public SgStatement{
-  // C++ class statement
-  //    class name : superclass_list ElementTypeOf collection_name {
-  //            body
-  //     } variables_list;
-  // variant == CLASS_DECL
-public:
-  inline SgClassStmt(int variant);
-  inline SgClassStmt(SgSymbol &name);
-  inline ~SgClassStmt();
-  inline int numberOfSuperClasses();
-  inline SgSymbol *name();
-  inline SgSymbol *superClass(int i);
-  inline void setSuperClass(int i, SgSymbol &symb);
-#if 0
-  int numberOfVars();            // variables in variables_list
-  SgExpression variable(int i);  // i-th variable in variable_list
-  SgExpression collectionName(); // if an ElementType class.
-  
-  // body manipulation functions.
-  int numberOfPublicVars();
-  int numberOfPrivateVars();
-  int numberOfProtectedVars();
-  SgSymbol *publicVar(int i);
-  SgSymbol *protectedVar(int i);
-  SgSymbol *privateVar(int i);
-  void addPublicVar(SgSymbol &s);
-  void addPrivateVar(SgSymbol &s);
-  void addProtectedVar(SgSymbol &s);
-  int numberOfPublicFuns();
-  int numberOfPrivateFuns();
-  int numberOfProtectedFuns();
-  SgStatement *publicFun(int i);
-  SgStatement *protectedFun(int i);
-  SgStatement *privateFun(int i);
-  void addPublicFun(SgStatement &s);
-  void addPrivateFun(SgStatement &s);
-  void addProtectedFun(SgStatement &s);
-#endif
-};
-
-class SgStructStmt: public SgClassStmt{
-  // basic C++ structure
-  // struct name ;
-  //                   body
-  //              } variables_list;
-  // variant == STRUCT_DECL
-public:
-  // consider like a class.
-  inline SgStructStmt();
-  inline SgStructStmt(SgSymbol &name);
-  inline ~SgStructStmt();
-  
-};
-
-
-class SgUnionStmt: public SgClassStmt{
-  // basic C++ structure
-  // union name  {
-  //     body
-  //    } variables_list;
-  // variant == UNION_DECL
-public:
-  // consider like a class.
-  inline SgUnionStmt();
-  inline SgUnionStmt(SgSymbol &name);
-  inline ~SgUnionStmt();
-};
-
-class SgEnumStmt: public SgClassStmt{
-  // basic C++ structure
-  // enum name  {
-  //     body
-  //    } variables_list;
-  // variant == ENUM_DECL
-public:
-  // consider like a class.
-  inline SgEnumStmt();
-  inline SgEnumStmt(SgSymbol &name);
-  inline ~SgEnumStmt();
-};
-
-class SgCollectionStmt: public SgClassStmt{
-  // basic C++ structure
-  // collection name ;
-  //                    body
-  //                } variables_list;
-  // variant == COLLECTION_DECL
-public:
-  inline SgCollectionStmt();
-  inline SgCollectionStmt(SgSymbol &name);
-  inline ~SgCollectionStmt();
-#if 0
-  int numberOfElemMethods();
-  SgStatement *elementMethod(int i);
-  void addElementMethod(SgStatement &s);
-#endif
-  inline SgStatement *firstElementMethod();
-};
-
-class SgBasicBlockStmt: public SgStatement{
-  // in C we have: {  body; }
-  // variant == BASIC_BLOCK
-public:
-  inline SgBasicBlockStmt();
-  inline ~SgBasicBlockStmt();
-};
-
-// ********************* traditional control Structures ************
-class  SgForStmt: public SgStatement{
-  // for Fortran Do and C for();
-  // variant = FOR_NODE
-public:
-  inline SgForStmt(SgSymbol &do_var, SgExpression &start, SgExpression &end,
-            SgExpression &step, SgStatement &body);
-  inline SgForStmt(SgSymbol *do_var, SgExpression *start, SgExpression *end,
-            SgExpression *step, SgStatement *body);
-  inline SgForStmt(SgSymbol &do_var, SgExpression &start, SgExpression &end,
-            SgStatement &body);
-  inline SgForStmt(SgExpression &start, SgExpression &end, SgExpression &step,
-            SgStatement &body);
-
-  inline SgForStmt(SgExpression *start, SgExpression *end, SgExpression *step, SgStatement *body);
-#if __SPF
-  inline SgSymbol* doName();
-#else
-  inline SgSymbol doName();
-#endif                          // the name of the loop (for F90.)
-  inline void setDoName(SgSymbol &doName);// sets the name of the loop(for F90)
-
-  inline SgSymbol* constructName()
-  {
-      if (BIF_LL3(thebif))
-        return SymbMapping(NODE_SYMB(BIF_LL3(thebif)));
-      return NULL;
-  }
-
-  inline void setConstructName(SgSymbol* s)
-  {
-      BIF_LL3(thebif) = (new SgVarRefExp(s))->thellnd;
-  }
-
-  inline SgExpression *start();            
-  inline void setStart(SgExpression &lbound);
-
-  inline SgExpression *end();
-  inline void setEnd(SgExpression &ubound);
-
-  inline SgExpression *step();
-  inline void setStep(SgExpression &step);  
-  inline void interchangeNestedLoops(SgForStmt* loop);
-  inline void swapStartEnd()
-  {
-      if (CurrentProject->Fortranlanguage())
-      {
-          if ((BIF_LL1(thebif) != LLNULL) && (NODE_CODE(BIF_LL1(thebif)) == DDOT))
-              std::swap(NODE_OPERAND0(BIF_LL1(thebif)), NODE_OPERAND1(BIF_LL1(thebif)));
-          else
-              SORRY;
-      }
-      else
-          SORRY;
-  }
-  inline SgLabel *endOfLoop();
-
-//SgExpression &bounds();   // bounds are returned as a triplet lb:ub;
-//void setBounds(SgTripletOp &bounds); // bounds are passed as a triplet lb:ub;
-
-  // body is returned with control end statement
-  //   still attached. 
-  inline SgStatement *body();
-  // s is assumed to terminate with a
-  //   control end statement.
-  inline void set_body(SgStatement &s);
-#if 0
-  int replaceBody(SgStatement &s); // new body = s and lex successors.
-  
-  
-  int numberOfInductVars();        // 1 if an induction variable can be found.
-  SgSymbol *inductionVar(int i);   // i-th induction variable
-  SgExpression *indVarRange(int i); // range of i-th ind. var.
-#endif
-  inline int isPerfectLoopNest();
-  inline SgStatement *getNextLoop(); 
-  inline SgStatement *getPreviousLoop();   // returns outer nested loop
-  inline SgStatement *getInnermostLoop();  // returns innermost nested loop
-#if 0
-  int isLinearLoopNest();          // TRUE if the bound and step of the loops
-                                   // in the loop nest are linear expressions
-                                 // and use the index variables of the previous
-                                // loops of the nest.
-#endif
-  inline int isEnddoLoop();            // TRUE if the loop ends with an Enddo
-  inline int convertLoop();            // Convert the loop into a Good loop.
-#if 0
-  int isAssignLoop();          // TRUE if the body consists only of assignments
-  int isAssignIfLoop();        // TRUE if the body consists only of assigments
-  //             and conditional statements.
-  //high level program transformations. 
-  // Most are from SIGMA Toolbox by F.Bodin et al.
-  // Semantics can be found in the above reference.
-  int tiling_p(int i);     
-  int tiling(int i, int tab[]);
-  int stripMining(int i);
-  SgStatement distributeLoop(int i);
-  SgStatement distributeLoopSCC();
-  SgStatement loopFusion(SgForStmt &loop);
-  SgStatement unrollLoop(int i);
-  int interchangeLoops(SgForStmt &loop);
-  int interchangeWithLoop(int i);
-  int normalized();
-  int NormalizeLoop();
-  int vectorize();
-  int vectorizeNest();
-  int ExpandScalar(SgSymbol &symbol, int i);
-  int ScalarForwardSubstitution(SgSymbol &symbol);
-  int pullStatementToFront(SgStatement &s);
-  int pullStatementToEnd(SgStatement &s);
-#endif
-  inline ~SgForStmt();
-};
-
-
-class  SgProcessDoStmt: public SgStatement{
-  // for Fortran M ProcessDo statement;
-  // variant = PROCESS_DO_STAT
-public:
-  inline SgProcessDoStmt(SgSymbol &do_var, SgExpression &start,
-                         SgExpression &end, SgExpression &step,
-                         SgLabel &endofloop, SgStatement &body);
-  inline SgProcessDoStmt(SgSymbol &do_var, SgExpression &start,
-                         SgExpression &end, SgLabel &endofloop,
-                         SgStatement &body);
-  inline SgProcessDoStmt(SgSymbol &do_var, SgExpression &start,
-                         SgExpression &end, SgExpression &step,
-                         SgStatement &body);
-  inline SgProcessDoStmt(SgSymbol &do_var, SgExpression &start,
-                         SgExpression &end, SgStatement &body);
-  //inline SgSymbol doName();
-  inline void setDoName(SgSymbol &doName);
-  inline SgExpression *start();            
-  inline SgExpression *end();
-  inline SgExpression *step();
-  inline SgLabel *endOfLoop();
-  // body is returned with control end statement
-  //   still attached. 
-  inline SgStatement *body();
-  // s is assumed to terminate with a
-  //   control end statement.
-  inline void set_body(SgStatement &s);
-
-#if 0
-  int replaceBody(SgStatement &s); // new body = s and lex successors.
-  
-  
-  int numberOfInductVars();        // 1 if an induction variable can be found.
-  SgSymbol *inductionVar(int i);   // i-th induction variable
-  SgExpression *indVarRange(int i); // range of i-th ind. var.
-#endif
-
-  inline int isPerfectLoopNest();
-  inline SgStatement *getNextLoop(); 
-  inline SgStatement *getPreviousLoop();   // returns outer nested loop
-  inline SgStatement *getInnermostLoop();  // returns innermost nested loop
-#if 0
-  int isLinearLoopNest();          // TRUE if the bound and step of the loops
-                                   // in the loop nest are linear expressions
-                                 // and use the index variables of the previous
-                                // loops of the nest.
-#endif
-  inline int isEnddoLoop();            // TRUE if the loop ends with an Enddo
-  inline int convertLoop();            // Convert the loop into a Good loop.
-#if 0
-  int isAssignLoop();          // TRUE if the body consists only of assignments
-  int isAssignIfLoop();        // TRUE if the body consists only of assignments
-                               // and conditional statements.
-  //high level program transformations. 
-  // Most are from SIGMA Toolbox by F.Bodin et al.
-  // Semantics can be found in the above reference.
-  int tiling_p(int i);     
-  int tiling(int i, int tab[]);
-  int stripMining(int i);
-  SgStatement distributeLoop(int i);
-  SgStatement distributeLoopSCC();
-  SgStatement loopFusion(SgForStmt &loop);
-  SgStatement unrollLoop(int i);
-  int interchangeLoops(SgForStmt &loop);
-  int interchangeWithLoop(int i);
-  int normalized();
-  int NormalizeLoop();
-  int vectorize();
-  int vectorizeNest();
-  int ExpandScalar(SgSymbol &symbol, int i);
-  int ScalarForwardSubstitution(SgSymbol &symbol);
-  int pullStatementToFront(SgStatement &s);
-  int pullStatementToEnd(SgStatement &s);
-#endif
-  inline ~SgProcessDoStmt();
-};
-
-
-class  SgWhileStmt: public SgStatement{
-  // for C while()
-  // variant = WHILE_NODE
-public:
-  inline SgWhileStmt(int variant);
-  inline SgWhileStmt(SgExpression &cond, SgStatement &body);
-
-  // added by A.S.Kolganov 8.04.2015
-  inline SgWhileStmt(SgExpression *cond, SgStatement *body);
-  inline SgExpression *conditional();      // the while test
-#if 0
-  int numberOfInductVars(); // 1 if an induction variable can be found.
-  SgSymbol *inductionVar(int i);    // i-th induction variable
-  SgExpression *indVarRange(int i); // range of i-th ind. var.
-#endif
-  inline void replaceBody(SgStatement &s); // new body = s and lex successors.
-  inline ~SgWhileStmt();
-
-  // added by A.V.Rakov 16.03.2015
-  inline SgStatement *body();
-  
-  inline SgLabel* endOfLoop( ); //label for end statement in Fortran 'do while' and 'do' loops (16.03.2013, Kataev)
-};
-
-class  SgDoWhileStmt: public SgWhileStmt{
-  // For Fortran dowhile().. and C do{....) while();
-  // variant = DO_WHILE_NODE
-public:
-  inline SgDoWhileStmt(SgExpression &cond, SgStatement &body);
-  inline ~SgDoWhileStmt();
-};
-
-// forward reference;
-class  SgIfStmt;
-
-class  SgLogIfStmt: public SgStatement{
-  // For Fortran logical if  - only one body statement allowed
-  // variant == LOGIF_NODE
-public:
-  inline SgLogIfStmt(int variant);
-  inline SgLogIfStmt(SgExpression &cond, SgStatement &s);
-  inline SgStatement *body();  // returns reference to first stmt in the body
-  inline SgExpression *conditional();  // the while test
-  // check if the statement s is a single statement. 
-  inline void setBody(SgStatement &s); // new body = s 
-  // this code won't work, since after the addition false
-  //   clause, it should become SgIfThenElse statement.
-  inline void addFalseClause(SgStatement &s); // make it into if-then-else
-  inline SgIfStmt *convertLogicIf();
-  inline ~SgLogIfStmt();
-};
-
-class  SgIfStmt: public SgStatement{
-  // For Fortran if then else and C if()
-  // variant == IF_NODE
-public:
-  inline SgIfStmt(int variant);
-  inline SgIfStmt(SgExpression &cond, SgStatement &trueBody, SgStatement &falseBody,
-                  SgSymbol &construct_name);
-  inline SgIfStmt(SgExpression &cond, SgStatement &trueBody, SgStatement &falseBody);
-  inline SgIfStmt(SgExpression &cond, SgStatement &trueBody);
-
-  // added by A.S. Kolganov 02.07.2014, updated 21.12.2014
-  inline SgIfStmt(SgExpression &cond, SgStatement &body, int t);
-  inline SgIfStmt(SgExpression &cond);
-  inline SgIfStmt(SgExpression* cond);
-
-  // added by A.S. Kolganov 27.07.2018,
-  inline void setBodies(SgStatement *trueBody, SgStatement *falseBody);
-  inline SgStatement *trueBody();      // the first stmt in the True clause
-  // SgBlock is needed? 
-  inline SgStatement *trueBody(int i); // i-th stmt in True clause
-  inline SgStatement *falseBody();     // the first stmt in the False
-  inline SgStatement *falseBody(int i);// i-th statement of the body.
-  inline SgExpression *conditional();  // the while test
-  inline SgSymbol *construct_name();
-  inline void replaceTrueBody(SgStatement &s);// new body=s and lex successors.
-  inline void replaceFalseBody(SgStatement &s);//new body=s and lex successors.
-// added by A.S. Kolganov 12.12.2024
-  inline void setConditional(SgExpression* cond) { BIF_LL1(thebif) = cond->thellnd; }
-  inline ~SgIfStmt();
-};
-
-#if 0
-class  SgIfElseIfStmt: public SgIfStmt {
-  // For Fortran if then elseif .. elseif ... case
-  // variant == ELSEIF_NODE
-public:
-  SgIfElseIfStmt(SgExpression &condList, SgStatement &blockList, SgSymbol &constructName);
-  SgIfElseIfStmt(SgExpression &condList, SgStatement &blockList);
-  int numberOfConditionals();       // the number of conditionals
-  SgStatement *body(int b);          // block b
-  void setBody(int b);              // sets block 
-  SgExpression *conditional(int i); // the i-th conditional
-  void setConditional(int i);       // sets the i-th conditional
-  void addClause(SgExpression &cond, SgStatement &block);
-  void removeClause(int b);          // removes block b and it's conditional
-  ~SgIfElseIfStmt();
-};
-
-inline SgIfElseIfStmt::~SgIfElseIfStmt() { RemoveFromTableBfnd((void *) this); }
-#endif
-
-
-class  SgArithIfStmt: public SgStatement{
-  // For Fortran Arithementic if
-  // variant == ARITHIF_NODE
-public:
-  inline SgArithIfStmt(int variant);
-  inline SgArithIfStmt(SgExpression &cond, SgLabel &llabel, SgLabel &elabel, SgLabel &glabel);
-  inline SgExpression *conditional();
-  inline void set_conditional(SgExpression &cond);
-  inline SgExpression *label(int i);  // the <, ==, and > goto labels. in order 0->2.
-  inline void setLabel(SgLabel &label);
-  inline ~SgArithIfStmt();
-};
-
-class  SgWhereStmt: public SgLogIfStmt{
-  // fortran Where stmt
-  // variant == WHERE_NODE
-public:
-  inline SgWhereStmt(SgExpression &cond, SgStatement &body);
-  inline ~SgWhereStmt();
-};
-
-class  SgWhereBlockStmt: public SgIfStmt{
-  // fortran Where - Elsewhere stmt
-  // variant == WHERE_BLOCK_STMT
-public:
-  SgWhereBlockStmt(SgExpression &cond, SgStatement &trueBody, SgStatement &falseBody);
-  ~SgWhereBlockStmt();
-};
-
-
-class  SgSwitchStmt: public SgStatement{
-  // Fortran Case and C switch();
-  // variant == SWITCH_NODE
-public:
-  inline SgSwitchStmt(SgExpression &selector, SgStatement &caseOptionList, SgSymbol &constructName);
-  // added by A.V.Rakov 16.03.2015
-  inline SgSwitchStmt(SgExpression &selector, SgStatement &caseOptionList);
-  inline SgSwitchStmt(SgExpression &selector);
-  inline ~SgSwitchStmt();
-  inline SgExpression *selector();  // the switch selector
-  inline void setSelector(SgExpression &cond);
-  inline int numberOfCaseOptions();       // the number of cases
-  inline SgStatement *caseOption(int i);  // i-th case block
-  inline void addCaseOption(SgStatement &caseOption);
-  // added by A.V.Rakov 16.03.2015
-  inline SgStatement *defOption();
-#if 0
-  void  deleteCaseOption(int i);
-#endif
-};
-
-class SgCaseOptionStmt: public SgStatement{
-  // Fortran case option statement
-  // variant == CASE_NODE
-public:
-  // added by A.S.Kolganov 18.07.2018
-  inline SgCaseOptionStmt(SgExpression &caseRangeList, SgStatement &body);
-  inline SgCaseOptionStmt(SgExpression &caseRangeList, SgStatement &body, SgSymbol &constructName);
-  // added by A.V.Rakov 16.03.2015
-  inline SgCaseOptionStmt(SgExpression &caseRangeList);
-  inline ~SgCaseOptionStmt();
-
-  inline SgExpression *caseRangeList();
-  inline void setCaseRangeList(SgExpression &caseRangeList);
-  inline SgExpression *caseRange(int i);
-  inline void setCaseRange(int i, SgExpression &caseRange);
-  inline SgStatement *body();
-  inline void setBody(SgStatement &body);
-};
-
-
-class  SgExecutableStatement: public  SgStatement{
-  // this is really a non-control, non-declaration stmt.
-  // no special functions here.
-public: 
-  inline SgExecutableStatement(int variant);
-};
-
-class SgAssignStmt: public SgExecutableStatement{
-  // Fortran assignment Statment
-  // variant == ASSIGN_STAT
-public:
-  inline SgAssignStmt(int variant);
-  inline SgAssignStmt(SgExpression &lhs, SgExpression &rhs);
-  inline SgExpression *lhs();  // the left hand side
-  inline SgExpression *rhs();  // the right hand side
-  inline void replaceLhs(SgExpression &e); // replace lhs with e
-  inline void replaceRhs(SgExpression &e); // replace rhs with e
-#if 0
-  SgExpression *varReferenced();
-  SgExpression *varUsed();
-  SgExpression *varDefined();
-#endif
-};
-
-
-class  SgCExpStmt: public SgExecutableStatement{
-  // C non-control expression Statment
-  // variant == EXPR_STMT_NODE
-public:
-  inline SgCExpStmt(SgExpression &exp);
-  inline SgCExpStmt(SgExpression &lhs, SgExpression &rhs);
-  inline SgExpression *expr();  // the expression
-  inline void replaceExpression(SgExpression &e); // replace exp with e
-  inline ~SgCExpStmt();
-};
-
-class  SgPointerAssignStmt: public SgAssignStmt{
-  // Fortran  pointer assignment statement
-  // variant == POINTER_ASSIGN_STAT
-public:
-  inline SgPointerAssignStmt(SgExpression lhs, SgExpression rhs);
-  inline ~SgPointerAssignStmt();
-};
-
-// heap and nullify statements can be sub-classes 
-// of list executable statement class.
-class  SgHeapStmt: public SgExecutableStatement{
-  // Fortran heap space allocation and deallocation statements
-  // variant == ALLOCATE_STMT or DEALLOCATE_STMT 
-public:
-  inline SgHeapStmt(int variant, SgExpression &allocationList, SgExpression &statVariable);
-  inline ~SgHeapStmt();
-  inline SgExpression *allocationList();
-  inline void setAllocationList(SgExpression &allocationList);
-  inline SgExpression *statVariable();
-  inline void setStatVariable(SgExpression &statVar);
-};
-
-class  SgNullifyStmt: public SgExecutableStatement{
-  // Fortran pointer initialization statement
-  // variant == NULLIFY_STMT 
-public:
-  inline SgNullifyStmt(SgExpression &objectList);
-  inline ~SgNullifyStmt();
-  inline SgExpression *nullifyList();
-  inline void setNullifyList(SgExpression &nullifyList);
-};
-
-
-class  SgContinueStmt: public SgExecutableStatement{
-  // variant == CONT_STAT in Fortran and
-  // variant == CONTINUE_NODE in C
-public:
-  inline SgContinueStmt();
-  inline ~SgContinueStmt();
-};
-
-class  SgControlEndStmt: public SgExecutableStatement{
-  // the end of a basic block
-  // variant == CONTROL_END 
-public:
-  inline SgControlEndStmt(int variant);
-  inline SgControlEndStmt();
-  inline ~SgControlEndStmt();
-};
-
-
-class  SgBreakStmt: public SgExecutableStatement{
-  // the end of a basic block
-  // variant == BREAK_NODE 
-public:
-  inline SgBreakStmt();
-  inline ~SgBreakStmt();
-};
-
-class  SgCycleStmt: public SgExecutableStatement{
-  // the fortran 90 cycle statement
-  // variant == CYCLE_STMT
-public:
-  inline SgCycleStmt(SgSymbol &symbol);
-// added by A.S. Kolganov 20.12.2015
-  inline SgCycleStmt();
-  inline SgSymbol *constructName();  // the name of the loop to cycle
-  inline void setConstructName(SgSymbol &constructName);
-  inline ~SgCycleStmt();
-};
-
-class  SgReturnStmt: public SgExecutableStatement{
-  // the return (expr) node
-  // variant == RETURN_NODE//RETURN_STAT
-public:
-  SgReturnStmt(SgExpression &returnValue);
-  SgReturnStmt();
-  inline SgExpression *returnValue();
-  inline void setReturnValue(SgExpression &retVal);
-  inline ~SgReturnStmt();
-};
-
-
-class  SgExitStmt: public SgControlEndStmt{
-  // the fortran 90 exit statement
-  // variant == EXIT_STMT
-public:
-  inline SgExitStmt(SgSymbol &construct_name);
-  inline ~SgExitStmt();
-  inline SgSymbol *constructName();  // the name of the loop to cycle
-  inline void setConstructName(SgSymbol &constructName);
-};
-
-class  SgGotoStmt: public SgExecutableStatement{
-  // the fortran or C goto
-  // variant == GOTO_NODE
-public:
-  inline SgGotoStmt(SgLabel &label);
-  inline SgLabel *branchLabel();
-#if 0
-  SgStatement *target(); //the statement we go to
-#endif
-  inline ~SgGotoStmt();
-};
-
-
-class SgLabelListStmt: public SgExecutableStatement{
-  // the fortran
-  // statements containg a list of labels
-public:
-  SgLabelListStmt(int variant);
-  int numberOfTargets();
-  SgExpression *labelList();
-  void setLabelList(SgExpression &labelList);
-#if 0
-  SgStatement *target(int i); //the statement we go to
-#endif
-};
-
-
-class  SgAssignedGotoStmt: public SgLabelListStmt{
-  // the fortran 
-  // variant == ASSGOTO_NODE
-public:
-  SgAssignedGotoStmt(SgSymbol &symbol, SgExpression &labelList);
-  SgSymbol *symbol();
-  void setSymbol(SgSymbol &symb);
-  ~SgAssignedGotoStmt();
-};
-
-
-class  SgComputedGotoStmt: public SgLabelListStmt{
-  // the fortran goto
-  // variant == COMGOTO_NODE
-public:
-  inline SgComputedGotoStmt(SgExpression &expr, SgLabel &label);
-  inline void addLabel(SgLabel &label);
-  inline SgExpression *exp();
-  inline void setExp(SgExpression &exp);
-  inline ~SgComputedGotoStmt();
-};
-
-class  SgStopOrPauseStmt: public SgExecutableStatement{
-  // the fortran stop
-  // variant == STOP_STAT
-public:
-  SgStopOrPauseStmt(int variant, SgExpression *expr);
-  SgExpression *exp();
-  void setExp(SgExpression &exp);
-  ~SgStopOrPauseStmt();
-};
-
-class  SgCallStmt: public SgExecutableStatement{
-  // the fortran call
-  // variant == PROC_STAT
-public:
-  SgCallStmt(SgSymbol &name, SgExpression &args);
-  SgCallStmt(SgSymbol &name);
-  SgSymbol *name();    // name of subroutine being called
-  int numberOfArgs();  // the number of arguement expressions
-  void  addArg(SgExpression &arg);
-  SgExpression *arg(int i); // the i-th argument expression
-  ~SgCallStmt();
-  
-#if 0
-  // global analysis functions
-  int numberOfVarsUsed();
-  SgExpression *varsUsed(int i);  // i-th region description
-  int numberOfVarsMod();
-  SgExpression *varsMod(int i);  // i-th region description
-#endif
-};  
-
-
-class  SgProsCallStmt: public SgExecutableStatement{
-  // the Fortran M process call
-  // variant == PROS_STAT
-public:
-  SgProsCallStmt(SgSymbol &name, SgExprListExp &args);
-  SgProsCallStmt(SgSymbol &name);
-  SgSymbol *name();    // name of process being called
-  int numberOfArgs();  // the number of arguement expressions
-  void  addArg(SgExpression &arg);
-  SgExprListExp *args();
-  SgExpression *arg(int i); // the i-th argument expression
-  ~SgProsCallStmt();
-};
- 
- 
-class  SgProsCallLctn: public SgExecutableStatement{
-  // the Fortran M process call with location
-  // variant == PROS_STAT_LCTN
-public:
-  SgProsCallLctn(SgSymbol &name, SgExprListExp &args, SgExprListExp &lctn);
-  SgProsCallLctn(SgSymbol &name, SgExprListExp &lctn);
-  SgSymbol *name();    // name of process being called
-  int numberOfArgs();  // the number of arguement expressions
-  void  addArg(SgExpression &arg);
-  SgExprListExp *args();
-  SgExpression *arg(int i); // the i-th argument expression
-  SgExpression *location();
-  ~SgProsCallLctn();
-};
- 
-
-class  SgProsCallSubm: public SgExecutableStatement{
-  // the Fortran M process call with submachine
-  // variant == PROS_STAT_SUBM
-public:
-  SgProsCallSubm(SgSymbol &name, SgExprListExp &args, SgExprListExp &subm);
-  SgProsCallSubm(SgSymbol &name, SgExprListExp &subm);
-  SgSymbol *name();    // name of process being called
-  int numberOfArgs();  // the number of arguement expressions
-  void  addArg(SgExpression &arg);
-  SgExprListExp *args();
-  SgExpression *arg(int i); // the i-th argument expression
-  SgExpression *submachine();
-  ~SgProsCallSubm();
-};
- 
-
-class  SgProcessesStmt: public SgStatement{
-  // the Fortran M processes statement
-  // variant == PROCESSES_STAT
-public:
-  inline SgProcessesStmt();
-  inline ~SgProcessesStmt();
-};
- 
-
-class  SgEndProcessesStmt: public SgStatement{
-  // the Fortran M endprocesses statement 
-  // variant == PROCESSES_END
-public:
-  inline SgEndProcessesStmt();
-  inline ~SgEndProcessesStmt();
-};
-
-
-class SgPortTypeExp: public SgExpression{
-  // variant == PORT_TYPE_OP, INPORT_TYPE_OP, or OUTPORT_TYPE_OP
-public:
-  inline SgPortTypeExp(SgType &type);
-  inline SgPortTypeExp(SgType &type, SgExpression &ref);
-  inline SgPortTypeExp(int variant, SgExpression &porttype);
-  inline ~SgPortTypeExp();
-  inline SgType *type();
-  inline int numberOfRef();
-  inline SgExpression *ref(); // return a ref or a port type
-  inline SgPortTypeExp *next();
-};
- 
- 
-class SgInportStmt: public SgStatement
-{
-  // the Fortran M inport statement
-  // variant == INPORT_DECL
-public:
-  inline SgInportStmt(SgExprListExp &name);
-  inline SgInportStmt(SgExprListExp &name, SgPortTypeExp &porttype);
-  inline ~SgInportStmt();
-  inline void addname(SgExpression &name);
-  inline int numberOfNames();
-  inline SgExprListExp *names();
-  inline SgExpression *name(int i);
-  inline void addporttype(SgExpression &porttype);
-  inline int numberOfPortTypes();
-  inline SgPortTypeExp *porttypes();
-  inline SgPortTypeExp *porttype(int i);
-};
-
- 
-class SgOutportStmt: public SgStatement{
-  // the Fortran M outport statement
-  // variant == OUTPORT_DECL
-public:
-  inline SgOutportStmt(SgExprListExp &name);
-  inline SgOutportStmt(SgExprListExp &name, SgPortTypeExp &porttype);
-  inline ~SgOutportStmt();
-  inline void addname(SgExpression &name);
-  inline int numberOfNames();
-  inline SgExprListExp *names();
-  inline SgExpression *name(int i);
-  inline void addporttype(SgExpression &porttype);
-  inline int numberOfPortTypes();
-  inline SgPortTypeExp *porttypes();
-  inline SgPortTypeExp *porttype(int i);
-};
-
- 
-class SgChannelStmt: public SgStatement{
-  // the Fortran M channel statement
-  // variant == CHANNEL_STAT
-public:
-  inline SgChannelStmt(SgExpression &outport, SgExpression &inport);
-  inline SgChannelStmt(SgExpression &outport, SgExpression &inport,
-                       SgExpression &io_or_err);
-  inline SgChannelStmt(SgExpression &outport, SgExpression &inport,
-                       SgExpression &iostore, SgExpression &errlabel);
-  inline ~SgChannelStmt();
-  inline SgExpression *outport();
-  inline SgExpression *inport();
-  inline SgExpression *ioStore();
-  inline SgExpression *errLabel();
-};
- 
-
-class SgMergerStmt: public SgStatement{
-  // the Fortran M merger statement
-  // variant == MERGER_STAT
-public:
-  inline SgMergerStmt(SgExpression &outport, SgExpression &inport);
-  inline SgMergerStmt(SgExpression &outport, SgExpression &inport,
-                     SgExpression &io_or_err);
-  inline SgMergerStmt(SgExpression &outport, SgExpression &inport,
-                     SgExpression &iostore, SgExpression &errlabel);
-  inline ~SgMergerStmt();
-  inline void addOutport(SgExpression &outport);
-  inline void addIoStore(SgExpression &iostore); //can't add it before outports
-  inline void addErrLabel(SgExpression &errlabel); //can't add it before iostore
-  inline int numberOfOutports();
-  inline SgExpression *outport(int i);
-  inline SgExpression *inport();
-  inline SgExpression *ioStore();
-  inline SgExpression *errLabel();
-};
-
-
-class SgMoveportStmt: public SgStatement{
-  // the Fortran M moveport statement
-  // variant == MOVE_PORT
-public:
-  inline SgMoveportStmt(SgExpression &fromport, SgExpression &toport);
-  inline SgMoveportStmt(SgExpression &fromport, SgExpression &toport,
-                        SgExpression &io_or_err);
-  inline SgMoveportStmt(SgExpression &fromport, SgExpression &toport,
-                        SgExpression &iostore, SgExpression &errlabel);
-  inline ~SgMoveportStmt();
-  inline SgExpression *fromport();
-  inline SgExpression *toport();
-  inline SgExpression *ioStore();
-  inline SgExpression *errLabel();
-};
- 
-
-class SgSendStmt: public SgStatement{
-  // the Fortran M send statement
-  // variant == SEND_STAT
-public:
-  inline SgSendStmt(SgExpression &control, SgExprListExp &argument);
-  inline SgSendStmt(SgExpression &outport, SgExprListExp &argument, SgExpression &io_or_err);
-  inline SgSendStmt(SgExpression &outport, SgExprListExp &argument, SgExpression &iostore, SgExpression &errlabel);
-  inline ~SgSendStmt();
-  inline void addOutport(SgExpression &outport);
-  inline void addIoStore(SgExpression &iostore); //can't add it before outports
-  inline void addErrLabel(SgExpression &errlabel); //can't add it before iostore
-  inline void addArgument(SgExpression &argument);
-  inline int numberOfOutports();
-  inline int numberOfArguments();
-  inline SgExpression *controls();
-  inline SgExpression *outport(int i);
-  inline SgExprListExp *arguments();
-  inline SgExpression *argument(int i);
-  inline SgExpression *ioStore();
-  inline SgExpression *errLabel();
-};
-
-
-class SgReceiveStmt: public SgStatement{
-  // the Fortran M receive statement
-  // variant == RECEIVE_STAT
-public:
-  inline SgReceiveStmt(SgExpression &control, SgExprListExp &argument);
-  inline SgReceiveStmt(SgExpression &inport, SgExprListExp &argument,
-                       SgExpression &e1);
-  inline SgReceiveStmt(SgExpression &inport, SgExprListExp &argument,
-                       SgExpression &e1, SgExpression &e2);
-  inline SgReceiveStmt(SgExpression &inport, SgExprListExp &argument,
-                       SgExpression &e1, SgExpression &e2, SgExpression &e3);
-  inline ~SgReceiveStmt();
-  inline void addInport(SgExpression &inport);
-  inline void addIoStore(SgExpression &iostore);//can't add it before inports
-  inline void addErrLabel(SgExpression &errlabel);//can't add it before iostore
-  inline void addEndLabel(SgExpression &endlabel);//can't add it before errlabel
-  inline void addArgument(SgExpression &argument);
-  inline int numberOfInports();
-  inline int numberOfArguments();
-  inline SgExpression *controls();
-  inline SgExpression *inport(int i);
-  inline SgExprListExp *arguments();
-  inline SgExpression *argument(int i);
-  inline SgExpression *ioStore();
-  inline SgExpression *errLabel();
-  inline SgExpression *endLabel();
-};
-
-
-
-class SgEndchannelStmt: public SgStatement{
-  // the Fortran M endchannel statement
-  // variant == ENDCHANNEL_STAT
-public:
-  inline SgEndchannelStmt(SgExpression &outport);
-  inline SgEndchannelStmt(SgExpression &outport, SgExpression &io_or_err);
-  inline SgEndchannelStmt(SgExpression &outport, SgExpression &iostore,
-                          SgExpression &errlabel);
-  inline ~SgEndchannelStmt();
-  inline void addOutport(SgExpression &outport);
-  inline void addIoStore(SgExpression &iostore);//can't add it before outports
-  inline void addErrLabel(SgExpression &errlabel);//can't add it before iostore
-  inline int numberOfOutports();
-  inline SgExpression *controls();
-  inline SgExpression *outport(int i);
-  inline SgExpression *ioStore();
-  inline SgExpression *errLabel();
-};
-
-
-class SgProbeStmt: public SgStatement{
-  // the Fortran M probe statement
-  // variant == PROBE_STAT
-public:
-  inline SgProbeStmt(SgExpression &inport);
-  inline SgProbeStmt(SgExpression &inport, SgExpression &e1);
-  inline SgProbeStmt(SgExpression &inport, SgExpression &e1,
-                     SgExpression &e2);
-  inline SgProbeStmt(SgExpression &inport, SgExpression &e1,
-                          SgExpression &e2, SgExpression &e3);
-  inline ~SgProbeStmt();
-  inline void addInport(SgExpression &inport);
-  inline void addIoStore(SgExpression &iostore);//can't add before inports
-  inline void addErrLabel(SgExpression &errlabel);//can't add before iostore
-  inline void addEmptyStore(SgExpression &endlabel);//can't add before errlabel
-  inline int numberOfInports();
-  inline SgExpression *controls();
-  inline SgExpression *inport(int i);
-  inline SgExpression *ioStore();
-  inline SgExpression *errLabel();
-  inline SgExpression *emptyStore();
-};
-
-
-class SgProcessorsRefExp: public SgExpression{
-  // variant == PROCESSORS_REF
-public:
-  inline SgProcessorsRefExp(PTR_LLND ll);
-  inline SgProcessorsRefExp();
-  inline SgProcessorsRefExp(SgExpression &subscripts);
-  inline SgProcessorsRefExp(SgExpression &sub1,SgExpression &sub2);
- 
-  inline SgProcessorsRefExp(SgExpression &sub1,SgExpression &sub2,
-                            SgExpression &sub3);
- 
-  inline SgProcessorsRefExp(SgExpression &sub1,SgExpression &sub2,
-                            SgExpression &sub3,SgExpression &sub4);
-  inline ~SgProcessorsRefExp();
-  inline int numberOfSubscripts();  // the number of subscripts in reference
-  inline SgExpression *subscripts();
-  inline SgExpression *subscript(int i);
-  inline void addSubscript(SgExpression &e);
-};
-
-
-class SgControlExp: public SgExpression{
-  //parent of INPORT_NAME, OUTPORT_NAME, FROMPORT_NAME, TOPORT_NAME
-  //          IOSTAT_STORE, EMPTY_STORE, ERR_LABEL, END_LABEL
-public:
-  inline SgControlExp(int variant);
-  inline ~SgControlExp();
-  inline SgExpression *exp();
-};
-
-
-class SgInportExp: public SgControlExp{
-  // variant == INPORT_NAME
-public:
-  inline SgInportExp(SgExprListExp &exp);
-  inline ~SgInportExp();
-};
-
-
-class SgOutportExp: public SgControlExp{
-  // variant == OUTPORT_NAME
-public:
-  inline SgOutportExp(SgExprListExp &exp);
-  inline ~SgOutportExp();
-};
-
-
-class SgFromportExp: public SgControlExp{
-  // variant == FROMPORT_NAME
-public:
-  inline SgFromportExp(SgExprListExp &exp);
-  inline ~SgFromportExp();
-};
-
-
-class SgToportExp: public SgControlExp{
-  // variant == TOPORT_NAME
-public:
-  inline SgToportExp(SgExprListExp &exp);
-  inline ~SgToportExp();
-};
-
-
-class SgIO_statStoreExp: public SgControlExp{
-  // variant == IOSTAT_STORE
-public:
-  inline SgIO_statStoreExp(SgExprListExp &exp);
-  inline ~SgIO_statStoreExp();
-};
-
-
-class SgEmptyStoreExp: public SgControlExp{
-  // variant == EMPTY_STORE
-public:
-  inline SgEmptyStoreExp(SgExprListExp &exp);
-  inline ~SgEmptyStoreExp();
-};
-
-
-class SgErrLabelExp: public SgControlExp{
-  // variant == ERR_LABEL
-public:
-  inline SgErrLabelExp(SgExprListExp &exp);
-  inline ~SgErrLabelExp();
-};
-
-
-class SgEndLabelExp: public SgControlExp{
-  // variant == END_LABEL
-public:
-  inline SgEndLabelExp(SgExprListExp &exp);
-  inline ~SgEndLabelExp();
-};
-
-
-class SgDataImpliedDoExp: public SgExpression{
-  // variant == DATA_IMPL_DO
-public:
-  inline SgDataImpliedDoExp(SgExprListExp &dlist, SgSymbol &iname,
-                            SgExprListExp &ilist);
-  inline ~SgDataImpliedDoExp();
-  inline void addDataelt(SgExpression &data);
-  inline void addIconexpr(SgExpression &icon);
-  inline SgSymbol *iname();
-  inline int numberOfDataelt();
-  inline SgExprListExp *dataelts();
-  inline SgExprListExp *iconexprs(); /* only the first 3 elements in the
-                                        iconexpr list are useful. They represent
-                                        the initial value, the limit, and the 
-                                        increment of the implied do expression
-                                        respectively */
-  inline SgExpression *dataelt(int i);
-  inline SgExpression *init();
-  inline SgExpression *limit();
-  inline SgExpression *increment();
-};
- 
-
-class SgDataEltExp: public SgExpression{
-  // variant == DATA_ELT
-public:
-  inline SgDataEltExp(SgExpression &dataimplieddo);
-  inline SgDataEltExp(SgSymbol &name, SgExpression &datasubs,
-                      SgExpression &datarange);
-  inline ~SgDataEltExp();
-  inline SgExpression *dataimplieddo();
-  inline SgSymbol *name();
-  inline SgExpression *datasubs();
-  inline SgExpression *datarange();
-};
-
-
-class SgDataSubsExp: public SgExpression{
-  // variant == DATA_SUBS
-public:
-  inline SgDataSubsExp(SgExprListExp &iconexprlist);
-  inline ~SgDataSubsExp();
-  inline SgExprListExp *iconexprlist();
-};
-
-
-class SgDataRangeExp: public SgExpression{
-  // variant == DATA_RANGE
-public:
-  inline SgDataRangeExp(SgExpression &iconexpr1, SgExpression &iconexpr2);
-  inline ~SgDataRangeExp();
-  inline SgExpression *iconexpr1();
-  inline SgExpression *iconexpr2();
-};
-
-
-class SgIconExprExp: public SgExpression{
-  // variant == ICON_EXPR
-public:
-  inline SgIconExprExp(SgExpression &expr);
-  inline ~SgIconExprExp();
-  inline SgExpression *expr();
-};
-
-
-class SgIOStmt: public SgExecutableStatement{
-  // fortran input/output and their control statements
-  // abstract class
-public:
-  inline SgIOStmt(int variant);
-};
-
-class SgInputOutputStmt: public SgIOStmt{
-  // fortran input and output statements
-  // variant = READ_STAT, WRITE_STATE, PRINT_STAT
-public:
-  inline SgInputOutputStmt(int variant, SgExpression &specList, SgExpression &itemList);
-  inline SgExpression *specList();
-  inline void setSpecList(SgExpression &specList);
-  inline SgExpression *itemList();
-  inline void setItemList(SgExpression &itemList);
-  inline ~SgInputOutputStmt();
-};
-
-class SgIOControlStmt: public SgExecutableStatement{
-  // fortran input/output control and editing statements
-  // variant = OPEN_STAT, CLOSE_STAT, INQUIRE_STAT, BACKSPACE_STAT,
-  // REWIND_STAT, ENDFILE_STAT, FORMAT_STAT
-public:
-  SgIOControlStmt(int variant, SgExpression &controlSpecifierList);
-  inline SgExpression *controlSpecList();
-  inline void setControlSpecList(SgExpression &controlSpecList);
-  inline ~SgIOControlStmt();
-};
-
-// ******************** Declaration Nodes ***************************
-
-class  SgDeclarationStatement: public SgStatement{
-  // Declaration class
-  // abstract class
-public:
-  inline SgDeclarationStatement(int variant);
-  inline ~SgDeclarationStatement();
-  
-  inline SgExpression *varList();
-  inline int numberOfVars();
-  inline SgExpression *var(int i);
-  inline void deleteVar(int i);
-  inline void deleteTheVar(SgExpression &var);
-  inline void addVar(SgExpression &exp);
-};
-
-class  SgVarDeclStmt: public SgDeclarationStatement{
-  // Declaration Statement
-  // variant == VAR_DECL
-public:
-  // varRefValList is a list of low-level nodes of
-  // variants VAR_REFs or ARRAY_REFs or ASSIGN_OPs
-  inline SgVarDeclStmt(SgExpression &varRefValList, SgExpression &attributeList, SgType &type);
-  inline SgVarDeclStmt(SgExpression &varRefValList, SgType &type);
-  inline SgVarDeclStmt(SgExpression &varRefValList);
-  inline ~SgVarDeclStmt();
-  inline SgType *type();  // the type;
-  inline int numberOfAttributes(); // the number of F90 attributes;
-  // the attributes are: PARAMETER_OP | PUBLIC_OP |
-  //    PRIVATE_OP | ALLOCATABLE_OP | EXTERNAL_OP |
-  //    OPTIONAL_OP | POINTER_OP | SAVE_OP TARGET_OP
-
-  inline SgExpression* attribute(int i)
-  {
-      SgExpression* ex = LlndMapping(BIF_LL3(thebif));
-      if (ex->variant() != EXPR_LIST)
-          return NULL;
-
-      SgExprListExp* list = (SgExprListExp*)ex;
-      return list->elem(i);
-  }
-
-  inline bool addAttributeExpression(SgExpression* attr)
-  {
-      SgExpression* ex = LlndMapping(BIF_LL3(thebif));
-      if (ex && ex->variant() != EXPR_LIST)
-          return false;
-
-      if (ex != NULL)
-      {
-          SgExprListExp* list = (SgExprListExp*)ex;
-          list->append(*attr);
-      }
-      else
-      {
-          ex = new SgExpression(EXPR_LIST, attr, NULL);
-          BIF_LL3(thebif) = ex->thellnd;
-      }
-      return true;
-  }
-
-  inline int numberOfSymbols();  // the number of variables declared;        
-  inline SgSymbol *symbol(int i);
-  
-  inline void deleteSymbol(int i);
-  inline void deleteTheSymbol(SgSymbol &symbol);
-  inline SgExpression *initialValue(int i);  // the initial value ofthe i-th variable
-  SgExpression *completeInitialValue(int i); // The complete ASSGN_OP
-					// expression of the initial value *BW* from M. Golden
-  void setInitialValue(int i, SgExpression &initVal); // sets the initial value ofthe i-th variable
-  // an alternative way to initialize variables. The low-level node (VAR_REF or ARRAY_REF) is
-  // replaced by a ASSIGN_OP low-level node.
-  void clearInitialValue(int i);  // removes initial value of the i-th declaration 
-};
-
-
-class  SgIntentStmt: public SgDeclarationStatement{
-  // the Fortran M Intent Statement
-  // variant == INTENT_STMT
-public:
-  inline SgIntentStmt(SgExpression &varRefValList, SgExpression &attribute);
-  inline ~SgIntentStmt();
-  inline int numberOfArgs();  // the number of arguement expressions
-  inline void  addArg(SgExpression &arg);
-  inline SgExpression *args();
-  inline SgExpression *arg(int i); // the i-th argument expression
-  inline SgExpression *attribute();
-};
-
-
-class  SgVarListDeclStmt: public SgDeclarationStatement{
-  // Declaration Statement
-  // variant == OPTIONAL_STMT, SAVE_STMT, PUBLIC_STMT,
-  // PRIVATE_STMT, EXTERNAL_STAT, INTRINSIC_STAT, DIM_STAT, 
-  // ALLOCATABLE_STAT, POINTER_STAT, TARGET_STAT, MODULE_PROC_STMT,
-  // PROCESSORS_STAT (for Fortran M processors statement)
-public:
-  SgVarListDeclStmt(int variant, SgExpression &symbolRefList);
-  SgVarListDeclStmt(int variant, SgSymbol &symbolList, SgStatement &scope);
-
-  inline ~SgVarListDeclStmt();
-  
-  inline int numberOfSymbols();
-  inline SgSymbol *symbol(int i);
-  inline void appendSymbol(SgSymbol &symbol);
-  inline void deleteSymbol(int i);
-  inline void deleteTheSymbol(SgSymbol &symbol);
-};
-
-
-class SgStructureDeclStmt: public SgDeclarationStatement{
-  // Fortran 90 structure declaration statement
-  // variant == STRUCT_DECL
-public:
-  SgStructureDeclStmt(SgSymbol &name, SgExpression &attributes, SgStatement &body);
-  ~SgStructureDeclStmt();
-  
-#if 0
-  int isPrivate();
-  int isPublic();
-  int isSequence();
-#endif
-};
-
-class SgNestedVarListDeclStmt: public SgDeclarationStatement{
-  // Declaration statement
-  // variant == NAMELIST_STAT, EQUI_STAT, COMM_STAT,
-  //            and  PROS_COMM for Fortran M
-  // These statements have the format of a list of variable lists. For example,
-  // EQUIVALENCE (A, C, D), (B, G, F), ....
-public:
-  SgNestedVarListDeclStmt(int variant, SgExpression &listOfVarList);
-  // varList must be of low-level variant appropriate to variant. For example,
-  // if the variant is COMM_STAT, listOfVarList must be of variant COMM_LIST.
-  ~SgNestedVarListDeclStmt();
-  
-  SgExpression *lists();
-  int numberOfLists();
-  SgExpression *list(int i);
-#if 0
-  SgExpression *leadingVar(int i);
-#endif
-  void addList(SgExpression &list);
-  void  addVarToList(SgExpression &varRef);
-  void deleteList(int i);
-  void deleteTheList(SgExpression &list);
-  void deleteVarInList(int i, SgExpression &varRef);
-  void deleteVarInTheList(SgExpression &list, SgExpression &varRef);
-};
-
-class SgParameterStmt: public SgDeclarationStatement{      
-  // Fortran constants declaration statement
-  // variant = PARAM_DECL
-public:
-  SgParameterStmt() : SgDeclarationStatement(PARAM_DECL) { }
-  SgParameterStmt(SgExpression &constants, SgExpression &values);
-  SgParameterStmt(SgExpression &constantsWithValues);
-  ~SgParameterStmt();
-  
-  int numberOfConstants();    // the number of constants declared
-  
-  SgSymbol *constant(int i);  // the i-th variable
-  SgExpression *value(int i); // the value of i-th variable
-  
-  void addConstant(SgSymbol *constant);
-  void deleteConstant(int i);
-  void deleteTheConstant(SgSymbol &constant);
-};
-
-class SgImplicitStmt: public SgDeclarationStatement{      
-  // Fortran implicit type declaration statement
-  // variant = IMPL_DECL
-public:
-  SgImplicitStmt(SgExpression& implicitLists);
-  SgImplicitStmt(SgExpression* implicitLists);
-  ~SgImplicitStmt();
-  
-  int numberOfImplicitTypes();  // the number of implicit types declared;
-  SgType *implicitType(int i); // the i-th implicit type
-  SgExpression *implicitRangeList(int i) ;
-  void  appendImplicitNode(SgExpression &impNode);
-#if 0
-  void  addImplicitType(SgType Type, char alphabet[]);
-  int deleteImplicitItem(int i);
-  int deleteTheImplicitItem(SgExpression &implicitItem);
-#endif
-};
-#if 0
-class SgUseStmt: public SgDeclarationStatement{
-  // Fortran 90 module usuage statement
-  // variant = USE_STMT
-public:
-  SgUseStmt(SgSymbol &moduleName, SgExpression &renameList, SgStatement &scope);
-  // renameList must be a list of low-level nodes of variant RENAME_NODE
-  ~SgUseStmt();
-  
-  int isOnly();
-  SgSymbol *moduleName();
-  void setModuleName(SgSymbol &moduleName);
-  int numberOfRenames();
-  SgExpression *renameNode(int i);
-  void  addRename(SgSymbol &localName, SgSymbol &useName);
-  void  addRenameNode(SgExpression &renameNode);
-  void  deleteRenameNode(int i);
-  void deleteTheRenameNode(SgExpression &renameNode);
-};
-
-
-
-
-class  SgStmtFunctionStmt: public SgDeclarationStatement{
-  // Fortran statement function declaration
-  // variant == STMTFN_DECL
-public:        
-  SgStmtFunctionStmt(SgSymbol &name, SgExpression &args, SgStatement Body);
-  ~SgStmtFunctionStmt();
-  SgSymbol *name();
-  void setName(SgSymbol &name);
-  SgType *type();
-  int numberOfParameters();       // the number of parameters
-  SgSymbol *parameter(int i);     // the i-th parameter
-};      
-
-class  SgMiscellStmt: public SgDeclarationStatement{
-  // Fortran 90 simple miscellaneous statements
-  // variant == CONTAINS_STMT, PRIVATE_STMT, SEQUENCE_STMT
-public:        
-  SgMiscellStmt(int variant);
-  ~SgMiscellStmt();
-};      
-
-
-#endif
-//
-//
-// More stuffs for types and symbols
-//
-//
-
-
-class SgVariableSymb: public SgSymbol{
-  // a variable
-  // variant = VARIABLE_NAME
-public:
-  inline SgVariableSymb(char *identifier, SgType &t, SgStatement &scope);
-  inline SgVariableSymb(char *identifier, SgType *t, SgStatement *scope);
-  inline SgVariableSymb(char *identifier, SgType &t);
-  inline SgVariableSymb(char *identifier,  SgStatement &scope);
-  inline SgVariableSymb(char *identifier,  SgStatement *scope);
-  inline SgVariableSymb(char *identifier);
-  inline SgVariableSymb(const char *identifier, SgType &t, SgStatement &scope);
-  inline SgVariableSymb(const char *identifier, SgType *t, SgStatement *scope);
-  inline SgVariableSymb(const char *identifier, SgType &t);
-  inline SgVariableSymb(const char *identifier, SgStatement &scope);
-  inline SgVariableSymb(const char *identifier, SgStatement *scope);
-  inline SgVariableSymb(const char *identifier);
-  inline ~SgVariableSymb();
-
-  /* This function allocates and returns a new variable reference
-     expression to this symbol. (ajm) */
-  inline SgVarRefExp *varRef (void);
-
-#if 0
-  int isAttributeSet(int attribute);
-  void setAttribute(int attribute);
-  
-  int numberOfUses();            // number of uses.
-  SgStatement  *useStmt(int i);  // statement where i-th use occurs
-  SgExpression *useExpr(int i);  // expression where i-th use occurs
-  int numberOfDefs();
-#endif
-};
-
-class SgConstantSymb: public SgSymbol{
-  // a symbol for a constant object
-  // variant == CONST_NAME 
-public:
-  inline SgConstantSymb(char *identifier, SgStatement &scope, 
-                 SgExpression &value);
-  inline SgConstantSymb(const char *identifier, SgStatement &scope,
-      SgExpression &value);
-  inline ~SgConstantSymb();
-  inline SgExpression *constantValue();
-};
-
-
-class SgFunctionSymb: public SgSymbol{
-  // a subroutine, function or main program
-  // variant == PROGRAM_NAME, PROCEDURE_NAME, or FUNCTION_NAME
-public:
-  SgFunctionSymb(int variant);
-  SgFunctionSymb(int variant, char *identifier, SgType &t, 
-                 SgStatement &scope);
-  SgFunctionSymb(int variant, const char *identifier, SgType &t,
-      SgStatement &scope);
-  ~SgFunctionSymb();
-  void addParameter(int, SgSymbol &parameters);
-  void insertParameter(int position, SgSymbol &symb);
-  int numberOfParameters();
-  SgSymbol *parameter(int i); 
-  SgSymbol *result();
-  void  setResult(SgSymbol &symbol);
-#if 0
-  int isRecursive();
-  int setRecursive();
-#endif
-};
-
-
-class SgMemberFuncSymb: public SgFunctionSymb{
-  // a member function for a class or struct or collection
-  // variant = MEMBER_FUNC
-  // may be either MEMB_PRIVATE, MEMB_PUBLIC,
-  // MEMP_METHOELEM or MEMB_PROTECTED
-public:
-  inline SgMemberFuncSymb(char *identifier, SgType &t, SgStatement &cla,
-                          int status);
-  inline ~SgMemberFuncSymb();
-#if 0
-  int status();       
-  int isVirtual();       // 1 if virtual.
-#endif
-  inline int isMethodOfElement();
-  inline SgSymbol *className();
-  inline void setClassName(SgSymbol &symb);
-};
-
-class SgFieldSymb: public SgSymbol{
-  // a field in an enum or in a struct.
-  // variant == ENUM_NAME or FIELD_NAME
-public:
-  // no check is made to see if the field "identifier"
-  //   already exists in the structure. 
-  inline SgFieldSymb(char *identifier, SgType &t, SgSymbol &structureName);
-  inline SgFieldSymb(const char *identifier, SgType &t, SgSymbol &structureName);
-  inline ~SgFieldSymb();
-  inline int offset();        // position in the structure
-  inline SgSymbol *structureName();  // parent structure
-  inline SgSymbol *nextField();
-  inline int isMethodOfElement();
-#if 0
-  int isPrivate();
-  int isSequence();
-  void  setPrivate();
-  void setSequence();
-#endif
-};
-
-class SgClassSymb: public SgSymbol{
-  // the class, union, struct and collection type.
-  // variant == CLASS_NAME, UNION_NAME, STRUCT_NAME or COLLECTION_NAME
-public:
-  inline SgClassSymb(int variant, char *name, SgStatement &scope);
-  inline ~SgClassSymb();
-  inline int numberOfFields();
-  inline SgSymbol *field(int i);
-};
-
-#if 0
-class SgTypeSymb: public SgSymbol{
-  // a C typedef.  the type() function returns the base type.
-  // variant == TYPE_NAME
-public:
-  SgTypeSymb(char *name, SgType &baseType);
-  SgType &baseType();
-  ~SgTypeSymb();
-};
-
-#endif
-
-
-class SgLabelSymb: public SgSymbol{
-  // a C label name
-  // variant == LABEL_NAME
-public:
-  inline SgLabelSymb(char *name);
-  inline ~SgLabelSymb();
-};
-
-
-class SgLabelVarSymb: public SgSymbol{
-  // a Fortran label variable for an assigned goto stmt
-  // variant == LABEL_NAME
-public:
-  inline SgLabelVarSymb(char *name, SgStatement &scope);
-  inline ~SgLabelVarSymb();
-};
-
-class SgExternalSymb: public SgSymbol{
-  // for fortran external statement
-  // variant == ROUTINE_NAME
-public:
-  inline SgExternalSymb(char *name, SgStatement &scope);
-  inline ~SgExternalSymb();
-};
-
-class SgConstructSymb: public SgSymbol{
-  // for fortran statement with construct names
-  // variant == CONSTRUCT_NAME
-public:
-  inline SgConstructSymb(char *name, SgStatement &scope);
-  inline ~SgConstructSymb();
-};
-
-// A lot of work needs to be done on this class.
-class SgInterfaceSymb: public SgSymbol{
-  // for fortran interface statement
-  // variant == INTERFACE_NAME
-public:
-  inline SgInterfaceSymb(char *name, SgStatement &scope);
-  inline ~SgInterfaceSymb();
-};
-
-// A lot of work needs to be done on this class.
-class SgModuleSymb: public SgSymbol{
-  // for fortran module statement
-  // variant == MODULE_NAME
-public:
-  inline SgModuleSymb(char *name);
-  inline ~SgModuleSymb();
-};
-
-// ********************* Types *******************************
-
-class SgArrayType: public SgType{
-  // A new array type is generated for each array.
-  // variant == T_ARRAY
-public:
-  inline SgArrayType(SgType &base_type);
-  inline int dimension();
-  inline SgExpression *sizeInDim(int i);
-  inline void addDimension(SgExpression *e);
-  inline SgExpression * getDimList();
-  inline SgType * baseType();
-  inline void setBaseType(SgType &bt);
-  inline void addRange(SgExpression &e);
-  inline ~SgArrayType();
-};
-
-
-#if 0
-class SgClassType: public SgType{
-  // a C struct or Fortran Record, a C++ class, a C Union and a C Enum
-  // and a pC++ collection.  note: derived classes are another type.
-  // this type is very simple.  it only contains the standard type
-  // info from SgType and a pointer to the class declaration stmt
-  // and a pointer to the symbol that is the first field in the struct.
-  // variant == T_STRUCT, T_ENUM, T_CLASS, T_ENUM, T_COLLECTION
-public:
-  // why is struct_decl needed. No appropriate field found.
-  // assumes that first_field has been declared as
-  // FIELD_NAME and the remaining fields have been stringed to it.
-  SgClassType(int variant, char *name, SgStatement &struct_decl, int num_fields,
-              SgSymbol &first_field);
-  SgStatement &structureDecl();
-  SgSymbol *firstFieldSymb();
-  SgSymbol *fieldSymb(int i);
-  ~SgClassType();
-};
-
-#endif
-
-
-class SgPointerType: public SgType{
-  // A pointer type contains only one hany bit of information:
-  // the base type.
-  // can also have a modifier like BIT_CONST BIT_GLOBAL. see SgDescriptType.
-  // variant == T_POINTER
-public:
-  SgPointerType(SgType &base_type);
-  SgPointerType(SgType *base_type);
-  inline SgType *baseType();
-  inline int indirection();
-  inline void setIndirection(int);
-  inline int modifierFlag();
-  inline void setModifierFlag(int flag); 
-  inline void setBaseType(SgType &baseType);
-  inline ~SgPointerType();
-};
-
-
-class SgFunctionType: public SgType{
-  // Function Types have a returned value type
-  // variant == T_FUNCTION
-public:
-  SgFunctionType(SgType &return_val_type);
-  SgType *returnedValue();
-  void changeReturnedValue(SgType &rv);
-  ~SgFunctionType();
-};
-
-
-class SgReferenceType: public SgType{
-  // A reference (&xx in c+=) type contains only one hany bit of information:
-  // the base type.
-  // variant == T_REFERENCE
-public:
-  inline SgReferenceType(SgType &base_type);
-  inline SgType *baseType();
-  inline void setBaseType(SgType &baseType);
-  inline ~SgReferenceType();
-  inline int modifierFlag();
-  inline void setModifierFlag(int flag); 
-};
-
-class SgDerivedType: public SgType{
-  // for example:  typedef int integer;  go to the symbol table
-  // for the base type and Id.
-  // variant == T_DERIVED_TYPE
-public:
-  inline SgDerivedType(SgSymbol &type_name);
-  inline SgSymbol * typeName();
-  inline ~SgDerivedType();
-};
-
-class SgDerivedClassType: public SgType{
-  // for example:  typedef int integer;  go to the symbol table
-  // for the base type and Id.
-  // variant == T_DERIVED_CLASS
-public:
-  inline SgDerivedClassType(SgSymbol &type_name);
-  inline SgSymbol *typeName();
-  inline ~SgDerivedClassType();
-};
-
-class SgDerivedTemplateType: public SgType{
-   // this is the type for a template object: T_DERIVED_TEMPLATE
-public:
-   SgDerivedTemplateType(SgExpression *arg_vals, SgSymbol *classname);
-   SgExpression *argList();
-   void addArg(SgExpression *arg);
-   int numberOfArgs();
-   SgExpression  *arg(int i);
-   void setName(SgSymbol &s);
-   SgSymbol *typeName(); // the name of the template class.
-};
-
-class SgDescriptType: public SgType{
-  // for example in C: long volatile int x; 
-  // long and volatile are modifiers and there is a descriptor
-  // type whose base type is the real type of x.
-  // the modifier is an integer with bits set if the modifier
-  // holds.
-  // the bits are:
-  // BIT_SYN, BIT_SHARED, BIT_PRIVATE, BIT_FUTURE, BIT_VIRTUAL, 
-  // BIT_INLINE, BIT_UNSIGNED, BIT_SIGNED, BIT_LONG, BIT_SHORT,
-  // BIT_VOLATILE, BIT_CONST, BIT_TYPEDEF, BIT_EXTERN, BIT_AUTO,
-  // BIT_STATIC, BIT_REGISTER, BIT_FRIEND, BIT_GLOBAL, and more.
-  //
-  // variant = T_DESCRIPT
-public:
-  inline SgDescriptType(SgType &base_type, int bit_flag);
-  inline int modifierFlag();
-  inline void setModifierFlag(int flag);
-  inline ~SgDescriptType();
-};
-
-class SgDerivedCollectionType: public SgType{
-  // for example:
-  // Collection DistributedArray {body1} ;
-  // class object {body2} ;
-  // DistributedArray<object>  X;
-  // X is of type with variant = T_DERIVED_COLLECTION
-public:
-  inline SgDerivedCollectionType(SgSymbol &s, SgType &t);
-  inline SgType *elementClass();
-  inline void setElementClass(SgType &ty);
-  inline SgSymbol *collectionName();
-  inline SgStatement *createCollectionWithElemType();
-  inline ~SgDerivedCollectionType();
-};
-
-// Class definition ends; Inline definitions begin
-
-// SgProject--inlines
-
-inline SgProject::~SgProject()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-}
-inline SgProject::SgProject(SgProject &)
-{ 
- Message("SgProject copy constructor not allowed",0);
-#if __SPF
-     {
-         char buf[512];
-         sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-         addToGlobalBufferAndPrint(buf);
-     }
-    throw -1;
-#endif
-}
-
-inline int SgProject::numberOfFiles()
-{ return LibnumberOfFiles(); }
-
-inline char *SgProject::fileName(int i)
-{
-  PTR_FILE file;
-  char * x;
-
-  file = GetFileWithNum(i);
-  SetCurrentFileTo(file);
-  SwitchToFile(GetFileNumWithPt(file));
-  if (!file)
-    x = NULL;
-  else
-    x = FILE_FILENAME(file);
-  return x;
-}    
-
-inline int SgProject::Fortranlanguage()
-{ return LibFortranlanguage(); }
-
-inline int SgProject::Clanguage()
-{ return LibClanguage(); }
-
-
-// SgFile--inlines
-inline int SgFile::languageType()
-{  return FILE_LANGUAGE(filept); }
-
-inline void SgFile::saveDepFile(const char *dep_file)
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  LibsaveDepFile(dep_file);
-// id may have change all the bifnode class are deleted....
-  ResetbfndTableClass();
-}
-
-inline void SgFile::unparse(FILE *filedisc)
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  UnparseProgram(filedisc);
-}
-
-inline void SgFile::unparseS(FILE *filedisc, int size)
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  UnparseProgram_ThroughAllocBuffer(filedisc,filept,size);
-}
-
-     
-inline void SgFile::unparsestdout()
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  UnparseProgram(stdout);
-}
-
-
-inline SgStatement *SgFile::mainProgram()
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  return BfndMapping(getMainProgram());
-}
-
-inline int SgFile::numberOfFunctions()
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  return getNumberOfFunction();
-}
-
-inline int SgFile::numberOfStructs()
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  return getNumberOfStruct();
-}
-
-inline SgStatement *SgFile::firstStatement()
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  SgStatement* retVal = BfndMapping(getFirstStmt());
-#ifdef __SPF
-  if (retVal)
-  {
-      SgStatement::setCurrProcessFile(retVal->fileName());
-      SgStatement::setCurrProcessLine(0);
-  }
-#endif
-  return retVal;
-}
-
-inline SgSymbol *SgFile::firstSymbol()
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  return SymbMapping(PROJ_FIRST_SYMB ());
-}
-
-inline SgExpression *SgFile::firstExpression()
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  return LlndMapping(PROJ_FIRST_LLND ());
-}
-
-inline SgType *SgFile::firstType()
-{
-  SetCurrentFileTo(filept);
-  SwitchToFile(GetFileNumWithPt(filept));
-  return TypeMapping(PROJ_FIRST_TYPE ());
-}
-
-
-inline SgExpression *SgFile::SgExpressionWithId(int i)
-{ return LlndMapping(Get_ll_with_id (i));}
-
-inline SgStatement *SgFile::SgStatementWithId( int id)
-{ return BfndMapping(Get_bif_with_id (id)); }
-        
-inline SgStatement *SgFile::SgStatementAtLine(int lineno)
-{ return BfndMapping(rec_num_near_search(lineno));}
-
-inline SgSymbol *SgFile::SgSymbolWithId( int id)
-{ return SymbMapping(Get_Symb_with_id (id)); }
-
-inline SgType *SgFile::SgTypeWithId( int id)
-{ return TypeMapping(Get_type_with_id (id)); }
-
-
-
-// SgStatement--inlines
-
-inline int SgStatement::lineNumber()
-{ return BIF_LINE(thebif); }
-
-inline int SgStatement::localLineNumber()
-{ return BIF_LOCAL_LINE(thebif); }
-
-inline int  SgStatement::id()
-{ return BIF_ID(thebif);}
-
-inline int  SgStatement::variant()
-{ return BIF_CODE(thebif); }
-
-// inline functions should contain single return
-// hence int x is needed.
-inline int SgStatement::hasSymbol()
-{
-  int x;
-
-  if (BIF_SYMB(thebif))
-    x = TRUE;
-  else 
-    x = FALSE;
-
-  return x;
-}
-
-inline SgSymbol * SgStatement::symbol()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return SymbMapping(BIF_SYMB(thebif)); 
-}
-
-inline char * SgStatement::fileName()
-{ return BIF_FILE_NAME(thebif)->name; }
-
-inline void SgStatement::setFileName(char *newFile)
-{    
-#ifdef __SPF
-    checkConsistence();
-#endif
-    BIF_FILE_NAME(thebif)->name = newFile;
-}
-
-inline int SgStatement::hasLabel()
-{
-  int x;
-  if (BIF_LABEL(thebif))
-    x = TRUE;
-  else
-    x = FALSE;
-  return x;
-}
-
-inline void SgStatement::setlineNumber(const int n)
-{ BIF_LINE(thebif) = n; }
-
-inline void SgStatement::setLocalLineNumber(const int n)
-{ BIF_LOCAL_LINE(thebif) = n; }
-
-inline void SgStatement::setId(int)
-{ Message("Id cannot be changed",BIF_LINE(thebif)); }
-
-inline void SgStatement::setVariant(int n)
-{ BIF_CODE(thebif) = n; }
-
-inline void  SgStatement::setLabel(SgLabel &l) 
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    BIF_LABEL(thebif) = l.thelabel; 
-}
-
-inline void  SgStatement::deleteLabel(bool saveLabel)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    if (!saveLabel)
-        if (BIF_LABEL(thebif))
-            BIF_LABEL(thebif)->stateno = -1;
-    BIF_LABEL(thebif) = NULL;
-}
-
-inline void  SgStatement::setSymbol(SgSymbol &s)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    BIF_SYMB(thebif) =  s.thesymb; 
-}
-
-
-inline SgStatement * SgStatement::lexNext()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgStatement* retVal = BfndMapping(BIF_NEXT(thebif));
-#ifdef __SPF
-    if (retVal)
-        setCurrProcessLine(retVal->lineNumber());
-#endif
-    return retVal;
-}
-
-inline SgStatement * SgStatement::lexPrev()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgStatement* retVal = BfndMapping(getNodeBefore(thebif));
-#ifdef __SPF
-    if (retVal)
-        setCurrProcessLine(retVal->lineNumber());
-#endif
-    return retVal;
-}
-
-
-inline SgStatement * SgStatement::controlParent()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    if (this->variant() != GLOBAL)
-        return BfndMapping(BIF_CP(thebif));
-    else
-        return 0;
-}
-
-inline int SgStatement::numberOfChildrenList1()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return (blobListLength(BIF_BLOB1(thebif)));
-}
-
-inline int SgStatement::numberOfChildrenList2()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return (blobListLength(BIF_BLOB2(thebif))); 
-}
-
-inline SgStatement * SgStatement::childList1(int i)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return BfndMapping(childfInBlobList(BIF_BLOB1(thebif),i)); 
-}
-
-inline SgStatement * SgStatement::childList2(int i)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return BfndMapping(childfInBlobList(BIF_BLOB2(thebif),i)); 
-}
-
-
-inline void  SgStatement::setLexNext(SgStatement &s)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    BIF_NEXT(thebif) = s.thebif; 
-}
-
-inline void  SgStatement::setLexNext(SgStatement* s)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    if (s)
-        BIF_NEXT(thebif) = s->thebif;
-    else
-        BIF_NEXT(thebif) = NULL;
-}
-
-inline SgStatement * SgStatement::lastDeclaration()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return BfndMapping(LiblastDeclaration(thebif)); 
-}
-
-
-inline SgStatement * SgStatement::lastExecutable()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    PTR_BFND last;
-    last = getLastNodeOfStmt(thebif);
-    last = getNodeBefore(last);
-    return BfndMapping(last);
-}
-
-inline SgStatement *SgStatement::lastNodeOfStmt()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return BfndMapping(getLastNodeOfStmt(thebif)); 
-}
-
-inline SgStatement *SgStatement::nodeBefore()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return BfndMapping(getNodeBefore(thebif)); 
-}
-
-inline void SgStatement::insertStmtBefore(SgStatement &s,SgStatement &cp )
-{ 
-#ifdef __SPF
-    checkConsistence();
-
-    //convert to simple IF
-    if (cp.variant() == LOGIF_NODE)
-    {
-        SgControlEndStmt* control = new SgControlEndStmt();
-        cp.setVariant(IF_NODE);
-        this->insertStmtAfter(*control, cp);
-    }
-#endif
-    insertBfndBeforeIn(s.thebif,thebif,cp.thebif); 
-}
-
-
-inline SgStatement * SgStatement::extractStmt()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return BfndMapping(LibextractStmt(thebif)); 
-}
-
-inline SgStatement *SgStatement::extractStmtBody()
-{ 
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return BfndMapping(LibextractStmtBody(thebif)); 
-}
-
-inline void  SgStatement::replaceWithStmt(SgStatement &s)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    LibreplaceWithStmt(thebif,s.thebif); 
-}
-
-inline void  SgStatement::deleteStmt()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    LibdeleteStmt(thebif); 
-}
-
-inline int SgStatement::isIncludedInStmt(SgStatement &s)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    return isInStmt(thebif, s.thebif);
-}
-
-inline SgStatement &SgStatement::copy()
-{
-    return *copyPtr();
-}
-
-inline SgStatement *SgStatement::copyPtr()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgStatement *copy = BfndMapping(duplicateStmtsNoExtract(thebif));
-
-#ifdef __SPF
-    copy->setProject(project);
-    copy->setFileId(fileID);
-    copy->setUnparseIgnore(unparseIgnore);
-#endif
-    return copy; 
-}
-
-inline SgStatement & SgStatement::copyOne()
-{
-     return *copyOnePtr();
-}
-
-inline SgStatement * SgStatement::copyOnePtr()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-     SgStatement *new_stmt = BfndMapping(duplicateOneStmt(thebif));
-
-     /* Hackery to make sure the control parent propagates correctly.
-	Unfortunately, the copy function itself it badly broken. */
-
-     new_stmt->setControlParent (this->controlParent());
-#ifdef __SPF
-     new_stmt->setProject(project);
-     new_stmt->setFileId(fileID);
-     new_stmt->setUnparseIgnore(unparseIgnore);
-#endif
-     return new_stmt;
-}
-  
-inline SgStatement& SgStatement::copyBlock()
-{ return *copyBlockPtr(); }
-
-inline SgStatement *SgStatement::copyBlockPtr() 
-{ return copyBlockPtr(0); }
-
-inline SgStatement* SgStatement::copyBlockPtr(int saveLabelId)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    SgStatement *new_stmt = BfndMapping(duplicateStmtsBlock(thebif, saveLabelId));
-#ifdef __SPF
-    new_stmt->setProject(project);
-    new_stmt->setFileId(fileID);
-    new_stmt->setUnparseIgnore(unparseIgnore);
-#endif
-    return new_stmt; 
-}
-
-inline void SgStatement::replaceSymbByExp(SgSymbol &symb, SgExpression &exp)
-{
-  LibreplaceSymbByExpInStmts(thebif, getLastNodeOfStmt(thebif), symb.thesymb, exp.thellnd);
-}
-
-inline void SgStatement::replaceSymbBySymb(SgSymbol &symb,SgSymbol &newsymb )
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    replaceSymbInStmts(thebif, getLastNodeOfStmt(thebif), symb.thesymb, newsymb.thesymb);
-}
-
-inline void SgStatement::replaceSymbBySymbSameName(SgSymbol &symb,SgSymbol &newsymb)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    replaceSymbInStmtsSameName(thebif, getLastNodeOfStmt(thebif), symb.thesymb, newsymb.thesymb);
-}
-
-inline void SgStatement::replaceTypeInStmt(SgType &old, SgType &newtype)
-{// do redundant work by should be ok go twice in member function 
-#ifdef __SPF
-    checkConsistence();
-#endif
-  if (BIF_SYMB(thebif))
-    replaceTypeUsedInStmt(BIF_SYMB(thebif),thebif,old.thetype,newtype.thetype);
-  else
-    replaceTypeUsedInStmt(NULL,thebif,old.thetype,newtype.thetype);
-}
-
-inline void SgStatement::setComments(char *comments)
-{
-    checkCommentPosition(comments);
-    LibSetAllComments (thebif, comments);
-}
-
-inline void SgStatement::setComments(const char *comments)
-{
-    checkCommentPosition(comments);
-    LibSetAllComments(thebif, comments);
-}
-
-inline void SgStatement::delComments()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    LibDelAllComments(thebif);
-}
-
-
-inline SgStatement *SgStatement::getScopeForDeclare()
-{
-  return BfndMapping(LibGetScopeForDeclare(thebif));
-}
-
-//Kataev 07.03.2013
-inline char* SgStatement::unparse(int lang)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-	return UnparseBif_Char(thebif, lang); //0 - fortran language 
-}
-
-inline void SgStatement::unparsestdout()
-{
-    UnparseBif(thebif);
-}
-
-inline char* SgStatement::comments()
-{
-    char *x;
-
-    if (BIF_CMNT(thebif))
-        x = CMNT_STRING(BIF_CMNT(thebif));
-    else
-        x = NULL;
-
-    return x;
-}
-
-inline void SgStatement::addDeclSpec(int type)
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    BIF_DECL_SPECS(thebif) = BIF_DECL_SPECS(thebif) | type;
-}  
-
-inline void SgStatement::clearDeclSpec()
-{
-#ifdef __SPF
-    checkConsistence();
-#endif
-    BIF_DECL_SPECS(thebif) = 0;
-}        
-
-inline int SgStatement::isFriend()
-{
-  return (BIF_DECL_SPECS(thebif) & BIT_FRIEND);
-}
-
-inline int SgStatement::isInline()
-{
-  return (BIF_DECL_SPECS(thebif) & BIT_INLINE);
-}
-
-inline int SgStatement::isExtern()
-{
-  return (BIF_DECL_SPECS(thebif) & BIT_EXTERN);
-}
-
-inline int SgStatement::isStatic()
-{
-  return (BIF_DECL_SPECS(thebif) & BIT_STATIC);
-}
-
-
-// SgExpression--inlines
-       
-inline SgExpression *SgExpression::lhs()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression *SgExpression::rhs()
-{  return LlndMapping(NODE_OPERAND1(thellnd)); }
-
-inline SgExpression *SgExpression::nextInExprTable()
-{  return LlndMapping(NODE_NEXT(thellnd)); }
-
-inline int SgExpression::variant()
-{  return NODE_CODE(thellnd); }
-
-inline SgType *SgExpression::type()
-{ return TypeMapping(NODE_TYPE(thellnd)); }
-
-inline int SgExpression::id()
-{ return NODE_ID(thellnd); }
-
-inline void SgExpression::setLhs(SgExpression &e)
-{ NODE_OPERAND0(thellnd) = e.thellnd; }
-
-inline void SgExpression::setLhs(SgExpression *e)
-{ NODE_OPERAND0(thellnd) = (e == 0) ? 0 : e->thellnd; }
-
-inline void SgExpression::setRhs(SgExpression &e)
-{ NODE_OPERAND1(thellnd) = e.thellnd; }
-
-inline void SgExpression::setRhs(SgExpression *e)
-{ NODE_OPERAND1(thellnd) = ( e == 0 ) ? 0 : e->thellnd; }
-
-inline void SgExpression::setSymbol(SgSymbol &s)
-{ NODE_SYMB(thellnd) = s.thesymb; }
-
-inline void SgExpression::setSymbol(SgSymbol *s)
-{ NODE_SYMB(thellnd) = ( s == 0 ) ? 0 : s->thesymb; }
-
-inline void SgExpression::setType(SgType &t)
-{ NODE_TYPE(thellnd) = t.thetype; }
-
-inline void SgExpression::setType(SgType *t)
-{ NODE_TYPE(thellnd) = (t == 0) ? 0 : t->thetype; }
-
-inline void SgExpression::setVariant(int v)
-{  
-  Message("Variant of a low level node node should not be change",0);
-  NODE_CODE(thellnd) = v; 
-}
-
-inline SgExpression &SgExpression::copy()
-{  return *copyPtr(); }
-
-inline SgExpression *SgExpression::copyPtr()
-{  return LlndMapping(copyLlNode(thellnd)); }
-
-
-inline SgExpression *SgExpression::IsSymbolInExpression(SgSymbol &symbol)
-{ return LlndMapping(LibIsSymbolInExpression(thellnd, symbol.thesymb)); }
-
-inline void SgExpression::replaceSymbolByExpression(SgSymbol &symbol, SgExpression &expr)
-{ LibreplaceSymbByExp(thellnd, symbol.thesymb, expr.thellnd); }
-
-inline SgExpression *SgExpression::arrayRefs()
-{ return LlndMapping(LibarrayRefs(thellnd)); }
-
-inline SgExpression *SgExpression::symbRefs()
-{ return LlndMapping(LibsymbRefs(thellnd,NULL));}
-
-//Kataev 07.03.2013, update 19.10.2013
-inline char* SgExpression::unparse()
-{
-	return UnparseLLND_Char(thellnd);
-}
-// podd 08.04.24
-inline char* SgExpression::unparse(int lang)  //0 - Fortran, 1 - C
-{
-        return UnparseLLnode_Char(thellnd,lang); 
-}
-
-inline void SgExpression::unparsestdout()
-{ 
-    UnparseLLND(thellnd);
-    printf("\n");
-}
-
-
-// SgSymbol--inlines
-inline int SgSymbol::variant() const
-{ return SYMB_CODE(thesymb); }
-
-inline int SgSymbol::id() const
-{ return SYMB_ID(thesymb); }
-
-inline char *SgSymbol::identifier() const
-{ return SYMB_IDENT(thesymb); }
-
-inline SgType *SgSymbol::type()
-{ return TypeMapping(SYMB_TYPE(thesymb)); }
-
-
-inline void SgSymbol::setType(SgType &t)
-{ SYMB_TYPE(thesymb) = t.thetype; }
-
-inline void SgSymbol::setType(SgType *t)
-{ SYMB_TYPE(thesymb) = (t == 0) ? 0 : t->thetype; }
-
-inline SgStatement *SgSymbol::scope()
-{ return BfndMapping(SYMB_SCOPE(thesymb)); }
-
-inline SgSymbol *SgSymbol::next()
-{ return SymbMapping(SYMB_NEXT(thesymb));}
-
-inline SgSymbol &SgSymbol::copy() 
-{
-    SgSymbol *copy = SymbMapping(duplicateSymbol(thesymb));
-
-#ifdef __SPF
-    if (!copy)
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-    }
-
-    copy->setProject(project);
-    copy->setFileId(fileID);
-#endif
-    return *copy;
-}
-
-inline SgSymbol* SgSymbol::copyPtr()
-{
-    SgSymbol* copy = SymbMapping(duplicateSymbol(thesymb));
-
-#ifdef __SPF
-    if (!copy)
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-    }
-
-    copy->setProject(project);
-    copy->setFileId(fileID);
-#endif
-    return copy;
-}
-
-inline SgSymbol &SgSymbol::copyLevel1() 
-{
-    SgSymbol *new_symb = SymbMapping(duplicateSymbolLevel1(thesymb));
-
-#ifdef __SPF
-    if (!new_symb)
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-    }
-    new_symb->setProject(project);
-    new_symb->setFileId(fileID);
-#endif
-    return *new_symb;
-}
-
-inline SgSymbol &SgSymbol::copyLevel2() 
-{
-    SgSymbol *new_symb = SymbMapping(duplicateSymbolLevel2(thesymb));
-
-#ifdef __SPF
-    if (!new_symb)
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-    }
-    new_symb->setProject(project);
-    new_symb->setFileId(fileID);
-#endif
-    return *new_symb;
-}
-
-inline SgSymbol& SgSymbol::copyAcrossFiles(SgStatement& where)
-{
-    resetDoVarForSymb();
-    SgSymbol* new_symb = SymbMapping(duplicateSymbolAcrossFiles(thesymb, where.thebif));    
-#ifdef __SPF
-    if (!new_symb)
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-    }
-    new_symb->setProject(project);
-    new_symb->setFileId(fileID);
-#endif
-    return *new_symb;
-}
-
-inline SgSymbol &SgSymbol::copySubprogram(SgStatement &where) 
-{ 
-  return *SymbMapping(duplicateSymbolOfRoutine(thesymb,where.thebif)); 
-}
-
-inline void SgSymbol::declareTheSymbolWithParamList
-            (SgStatement &st, SgExpression &parlist)
-{ declareAVarWPar(thesymb, parlist.thellnd, st.thebif); }
-
-
-inline SgExpression *SgSymbol::makeDeclExprWithParamList
-           (SgExpression &parlist)
-{ return LlndMapping(makeDeclExpWPar(thesymb, parlist.thellnd));} 
-
-inline SgSymbol *SgSymbol::moduleSymbol()
-{ return SymbMapping(SYMB_BASE_NAME(thesymb));}
-
-// SgType--inlines
-
-inline int SgType::variant()
-{ return TYPE_CODE(thetype); }
-
-inline int SgType::id()
-{ return TYPE_ID(thetype); }
-
-inline SgSymbol *SgType::symbol()
-{/* return SymbMapping(TYPE_SYMB_DERIVE(thetype));*/
- return SymbMapping(TYPE_SYMB(thetype));}
-
-inline SgType &SgType::copy()
-{ return *copyPtr(); }
-
-inline SgType *SgType::copyPtr()
-{ return TypeMapping(duplicateType(thetype));}
-
-inline SgType *SgType::next()
-{ return TypeMapping(TYPE_NEXT(thetype)); }
-
-inline int SgType::isTheElementType()
-{ return isElementType(thetype);}
-
-inline int SgType::equivalentToType(SgType &type)
-{ return isTypeEquivalent(thetype, type.thetype);}
-
-inline int SgType::equivalentToType(SgType *type)
-{
-  if ( type == 0 )
-    return 0;
-  else
-    return isTypeEquivalent(thetype, type->thetype);
-}
-
-
-inline SgType *SgType::internalBaseType()
-{
-  PTR_TYPE ty;
-  ty = lookForInternalBasetype(thetype);
-  return TypeMapping(ty);
-}
-
-inline int SgType::hasBaseType()
-{
-  return hasTypeBaseType(TYPE_CODE(thetype));
-}
-
-inline SgType *SgType::baseType()
-{
-  SgType * x;
-  if (hasTypeBaseType(TYPE_CODE(thetype)))
-    x = TypeMapping(TYPE_BASE(thetype));
-  else
-    x = NULL;
-
-  return x;
-}
-
-/* update Kataev N.A. 30.08.2013
-- add check for NULL range
-*/
-inline SgExpression *SgType::length()
-{
-	PTR_LLND lenExpr = TYPE_RANGES( thetype);
-	
-	return lenExpr ? LlndMapping(NODE_OPERAND0(lenExpr)) : NULL; 
-}
-
-inline void SgType::setLength(SgExpression* newLen)
-{
-    if (TYPE_RANGES(thetype))
-        NODE_OPERAND0(TYPE_RANGES(thetype)) = newLen->thellnd;
-    else
-        ; //TODO
-}
-
-inline SgExpression *SgType::selector()
-{
-    PTR_LLND kindExpr = TYPE_KIND_LEN(thetype);
-    return kindExpr ? LlndMapping(TYPE_KIND_LEN(thetype)) : NULL;
-}
-
-inline void SgType::setSelector(SgExpression* newSelector)
-{
-    TYPE_KIND_LEN(thetype) = newSelector->thellnd;
-}
-
-inline void SgType::deleteSelector()
-{
-    PTR_LLND kindExpr = TYPE_KIND_LEN(thetype);
-    if (kindExpr)
-        TYPE_KIND_LEN(thetype) = NULL;
-}
-
-// SgLabel--inlines
-inline int SgLabel::id()
-{ return LABEL_STMTNO(thelabel); }
-
-inline int SgLabel::getLastLabelVal()
-{ return getLastLabelId();}
-
-// SgValueExp--inlines
-
-inline SgValueExp::SgValueExp(bool value) :SgExpression(BOOL_VAL)
-{
-  NODE_TYPE(thellnd) = GetAtomicType(T_BOOL);
-  NODE_BOOL_CST(thellnd) = value;
-}
-
-inline SgValueExp::SgValueExp(int value):SgExpression(INT_VAL)
-{
-  NODE_TYPE(thellnd) =  GetAtomicType(T_INT);
-  NODE_INT_CST_LOW (thellnd) = value;
-}
-
-inline SgValueExp::SgValueExp(char char_val):SgExpression( CHAR_VAL)
-{
-  NODE_TYPE(thellnd) = GetAtomicType(T_CHAR);
-  NODE_CHAR_CST(thellnd) = char_val;
-}
-
-inline SgValueExp::SgValueExp(float float_val, char *val) :SgExpression(FLOAT_VAL)
-{
-    NODE_STR(thellnd) = (char*)xmalloc((strlen(val) + 1)*sizeof(char));
-    strcpy(NODE_STR(thellnd), val);
-    NODE_TYPE(thellnd) = GetAtomicType(T_FLOAT);    
-}
-
-inline SgValueExp::SgValueExp(double double_val, char *val) :SgExpression(DOUBLE_VAL)
-{
-    NODE_STR(thellnd) = (char*)xmalloc((strlen(val) + 1)*sizeof(char));
-    strcpy(NODE_STR(thellnd), val);
-    NODE_TYPE(thellnd) = GetAtomicType(T_DOUBLE);
-}
-
-inline SgValueExp::SgValueExp(float float_val):SgExpression(FLOAT_VAL)
-{
-  char tmp[100]; // No doubles longer than 100 digits;
-  sprintf (tmp,"%.8e",float_val);
-  NODE_STR(thellnd) = (char*) xmalloc ((strlen(tmp) + 1)*sizeof(char));
-  strcpy(NODE_STR(thellnd), tmp);
-  NODE_TYPE(thellnd) = GetAtomicType(T_FLOAT);
-  
-}
-
-inline SgValueExp::SgValueExp(double double_val):SgExpression(DOUBLE_VAL)
-{
-  char tmp[100]; // No doubles longer than 100 digits ;
-  sprintf (tmp,"%.16e",double_val);
-  NODE_STR(thellnd) = (char*) xmalloc ((strlen(tmp) + 1)*sizeof(char));
-  strcpy(NODE_STR(thellnd), tmp);
-  NODE_TYPE(thellnd) = GetAtomicType(T_DOUBLE);
-}
-
-inline SgValueExp::SgValueExp(char *string_val):SgExpression(STRING_VAL)
-{
-  NODE_TYPE(thellnd) = GetAtomicType(T_STRING);
-  NODE_STRING_POINTER(thellnd) = string_val;
-}
-
-inline SgValueExp::SgValueExp(const char *string_val) :SgExpression(STRING_VAL)
-{
-    NODE_STR(thellnd) = (char*)xmalloc((strlen(string_val) + 1) * sizeof(char));
-    strcpy(NODE_STR(thellnd), string_val);
-    NODE_TYPE(thellnd) = GetAtomicType(T_STRING);
-}
-
-inline SgValueExp::SgValueExp(double real, double imaginary):SgExpression(COMPLEX_VAL)
-{
-  NODE_TYPE(thellnd) = GetAtomicType(T_COMPLEX);
-  NODE_OPERAND0(thellnd) = SgValueExp(real).thellnd;
-  NODE_OPERAND1(thellnd) = SgValueExp(imaginary).thellnd;
-}
-
-inline SgValueExp::SgValueExp(SgValueExp &real, SgValueExp &imaginary):SgExpression(COMPLEX_VAL)
-{
-  NODE_TYPE(thellnd) = GetAtomicType(T_COMPLEX);
-  NODE_OPERAND0(thellnd) = real.thellnd;
-  NODE_OPERAND1(thellnd) = imaginary.thellnd;
-}
-
-// are these setValue functions really needed?
-// the user can simply say, SgValueExp(3.0) and
-// get the same functionality, in most cases.
-// Moreover, the code is wrong. The NODE_ CODE field
-// must be checked.
-inline  void SgValueExp::setValue(int int_val)
-{
-  NODE_INT_CST_LOW (thellnd) = int_val;
-}
-
-inline  void SgValueExp::setValue(char char_val)
-{
-  NODE_CHAR_CST(thellnd) = char_val;
-}
-
-inline  void SgValueExp::setValue(float float_val)
-{
-  char tmp[100]; // No doubles longer than 100 digits ;
-  sprintf (tmp,"%e",float_val);
-  if (!NODE_STR(thellnd))
-    NODE_STR(thellnd) = (char*) xmalloc ((strlen(tmp) + 1)*sizeof(char));
-  strcpy(NODE_STR(thellnd),tmp);
-}
-
-inline  void SgValueExp::setValue(double double_val)
-{
-  char tmp[100]; // No doubles longer than 100 digits ;
-  sprintf (tmp,"%e",double_val);
-  if (!NODE_STR(thellnd))
-    NODE_STR(thellnd) = (char*) xmalloc ((strlen(tmp) + 1)*sizeof(char));
-  strcpy(NODE_STR(thellnd),tmp);
-}
-
-inline  void SgValueExp::setValue(char *string_val)
-{
-  NODE_STRING_POINTER(thellnd) = string_val;
-}
-
-inline  void SgValueExp::setValue(double real, double im)
-{
-  NODE_OPERAND0(thellnd) = SgValueExp(real).thellnd;
-  NODE_OPERAND1(thellnd) = SgValueExp(im).thellnd;
-}
-
-inline  void SgValueExp::setValue(SgValueExp &real, SgValueExp & im)
-{
-  NODE_OPERAND0(thellnd) = real.thellnd;
-  NODE_OPERAND1(thellnd) = im.thellnd;
-}
-
-inline bool SgValueExp::boolValue()
-{
-  bool x;
-  if (NODE_CODE(thellnd) != BOOL_VAL)
-    {
-      Message("message boolValue not understood");
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      x = false;
-    }
-  else
-    x = NODE_BOOL_CST(thellnd);
-  return x;
-}
-
-inline int SgValueExp::intValue()
-{
-  int x;
-  if (NODE_CODE(thellnd) != INT_VAL)
-    {
-      Message("message intValue not understood");
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      x = 0;
-    }
-  else
-    x = NODE_INT_CST_LOW (thellnd);
-  return x;
-}
-
-inline char* SgValueExp::floatValue()
-{
-  char*  x;
-
-  if (NODE_CODE(thellnd) != FLOAT_VAL)
-    {
-      Message("message floatValue not understood");
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      x = NULL;
-    }
-  else 
-    x = NODE_FLOAT_CST(thellnd);
-
-  return x;
-}
-
-inline char SgValueExp::charValue()
-{
-  char x;
-
-  if (NODE_CODE(thellnd) != CHAR_VAL)
-    {
-      Message("message charValue not understood");
-#ifdef __SPF
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      x = 0;
-    }
-  else
-    x = NODE_CHAR_CST(thellnd);
-
-  return x;
-}
-
-inline char*  SgValueExp::doubleValue()
-{
-  char*  x;
-
-  if (NODE_CODE(thellnd) != DOUBLE_VAL)
-    {
-      Message("message doubleValue not understood");
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      x = NULL;
-    }
-  else
-    x = NODE_DOUBLE_CST(thellnd);
-
-  return x;
-}
-
-inline char * SgValueExp::stringValue()
-{
-  char *x;
-
-  if (NODE_CODE(thellnd) != STRING_VAL)
-    {
-      Message("message stringValue not understood");
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      x = NULL;
-    }
-  else
-    x = NODE_STRING_POINTER(thellnd);
-
-  return x;
-}
-
-inline SgExpression * SgValueExp:: realValue()
-{
-  SgExpression *x;
-
-  if (NODE_CODE(thellnd) != COMPLEX_VAL)
-    {
-      Message("message realValue not understood");
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      x = NULL;
-    }
-  else 
-    x = LlndMapping(NODE_OPERAND0(thellnd));
-
-  return x;
-}
-
-inline SgExpression * SgValueExp::imaginaryValue()
-{
-  SgExpression *x;
-
-  if (NODE_CODE(thellnd) != COMPLEX_VAL)
-    {
-      Message("message imaginaryValue not understood");
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-      x = NULL;
-    }
-  else
-    x = LlndMapping(NODE_OPERAND1(thellnd));
-
-  return x;
-}
-
-
-
-// SgKeywordValExp--inlines
-inline  SgKeywordValExp::SgKeywordValExp(char *name):SgExpression(KEYWORD_VAL)
-{ NODE_STRING_POINTER(thellnd) = name; }
-
-inline  SgKeywordValExp::SgKeywordValExp(const char *name):SgExpression(KEYWORD_VAL)
-{
-    NODE_STR(thellnd) = (char*)xmalloc((strlen(name) + 1) * sizeof(char));
-    strcpy(NODE_STR(thellnd), name);
-}
-
-inline char * SgKeywordValExp::value()
-{ return NODE_STRING_POINTER(thellnd); }
-
-
-// SgUnaryExp--inlines
-
-// In the code below, no type checking has been done. 
-// Some of the parser code may be modified to do the type-checking.
-// For example, SgUnaryExp(ADDRESS_OP, 2) should not
-// be detected.
-// the standard unary expressons
-// variant:DEREF_OP      * expr
-// variant:ADDRESS_OP    & expr
-// variant:MINUS_OP      - expr
-// variant:UNARY_ADD_OP  + expr
-// variant:PLUSPLUS_OP   ++lhd  or rhs++
-// variant:MINUSMINUS_OP --lhs  or rhs--
-// variant:BIT_COMPLEMENT_OP  ~ expr
-// variant:NOT_OP        ! expr
-// variant:SIZE_OP       sizeof( expr)
-
-inline SgUnaryExp::SgUnaryExp(PTR_LLND ll):SgExpression(ll)
-{}
-inline SgUnaryExp::SgUnaryExp(int variant, SgExpression & e):SgExpression(variant)
-{
-  NODE_OPERAND0(thellnd) = e.thellnd;
-}
-
-inline SgUnaryExp::SgUnaryExp(int variant, int post, SgExpression &e):SgExpression(variant)
-{  // post =1 rhs++
-  if (post)
-    NODE_OPERAND1(thellnd) = e.thellnd;
-  else
-    NODE_OPERAND0(thellnd) = e.thellnd;
-}
-
-inline  int SgUnaryExp::post() // returns TRUE if a post inc or dec op.
-{ if (NODE_OPERAND1(thellnd)) return TRUE; else return FALSE;}
-
-
-// SgCastExp--inlines
-
-inline SgCastExp::SgCastExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgCastExp::SgCastExp(SgType &t, SgExpression &e):SgExpression(CAST_OP)
-{
-  NODE_TYPE(thellnd) = t.thetype;
-  NODE_OPERAND0(thellnd) = e.thellnd;
-  // an experiment to fix the bernd bug.
-  NODE_OPERAND1(thellnd) = (SgMakeDeclExp(NULL, &t))->thellnd;
-}
-
-inline SgCastExp::SgCastExp(SgType &t):SgExpression(CAST_OP)
-{ NODE_TYPE(thellnd) = t.thetype; }
-
-inline SgCastExp::~SgCastExp(){RemoveFromTableLlnd((void *) this);}
-
-
-// SgDeleteExp--inlines
-
-inline SgDeleteExp::SgDeleteExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgDeleteExp::SgDeleteExp(SgExpression &size,SgExpression &expr):SgExpression(DELETE_OP)
-{
-  NODE_OPERAND0(thellnd) = expr.thellnd;
-  NODE_OPERAND1(thellnd) = size.thellnd;
-}
-
-inline SgDeleteExp::SgDeleteExp( SgExpression &expr):SgExpression(DELETE_OP)
-{
-  NODE_OPERAND0(thellnd) = expr.thellnd;
-}
-
-inline SgDeleteExp::~SgDeleteExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-
-// SgNewExp--inlines
-
-
-inline SgNewExp::SgNewExp(PTR_LLND ll):SgExpression(ll)
-{}
- 
-inline SgNewExp::SgNewExp(SgType &t):SgExpression(NEW_OP)
-{
-  SgCastExp *pt;
-   pt =  new SgCastExp(t);
-   NODE_OPERAND0(thellnd) = pt->thellnd;
-}
- 
-inline SgNewExp::SgNewExp(SgType &t, SgExpression &e):SgExpression(NEW_OP)
-{
-  SgCastExp *pt;
-  pt =  new SgCastExp(t);
-  NODE_OPERAND0(thellnd) = pt->thellnd;
-  NODE_OPERAND1(thellnd) = e.thellnd;
-}
-
-inline SgNewExp::~SgNewExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-// SgExprIfExp--inlines
-
-inline SgExprIfExp::SgExprIfExp(PTR_LLND ll): SgExpression(ll)
-{}
-
-inline SgExprIfExp::SgExprIfExp(SgExpression &exp1, 
-                                SgExpression &exp2, 
-                                SgExpression &exp3):SgExpression(EXPR_IF)
-{
-  NODE_OPERAND0(thellnd)= exp1.thellnd;
-  NODE_OPERAND1(thellnd)= newExpr(EXPR_IF_BODY,NODE_TYPE(exp2.thellnd),exp2.thellnd,exp3.thellnd);
-}
-
-inline void SgExprIfExp::setConditional(SgExpression &c)
-{
-  NODE_OPERAND0(thellnd) = c.thellnd;
-}
-
-// SgFunctionRefExp--inlines
-inline SgFunctionRefExp::SgFunctionRefExp(PTR_LLND ll):SgExpression(ll)
-{}
-inline SgFunctionRefExp::SgFunctionRefExp(SgSymbol &fun):SgExpression(FUNCTION_REF)
-{
-  NODE_SYMB (thellnd) = fun.thesymb;
-}
-inline SgFunctionRefExp::~SgFunctionRefExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgSymbol *SgFunctionRefExp::funName()
-{ return SymbMapping(NODE_SYMB(thellnd)); }
-
-inline SgExpression * SgFunctionRefExp::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgFunctionRefExp::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgFunctionRefExp::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-// SgFunctionCallExp--inlines
-
-inline SgFunctionCallExp::SgFunctionCallExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgFunctionCallExp::SgFunctionCallExp(SgSymbol &fun, SgExpression &paramList):SgExpression(FUNC_CALL)
-{
-  NODE_SYMB (thellnd) = fun.thesymb;
-  NODE_OPERAND0(thellnd) = paramList.thellnd;
-}
-
-inline SgFunctionCallExp::SgFunctionCallExp(SgSymbol &fun):SgExpression(FUNC_CALL)
-{
-  NODE_SYMB (thellnd) = fun.thesymb;
-}
-inline SgFunctionCallExp::~SgFunctionCallExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgSymbol *SgFunctionCallExp::funName()
-{ return SymbMapping(NODE_SYMB(thellnd)); }
-
-inline SgExpression * SgFunctionCallExp::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgFunctionCallExp::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgFunctionCallExp::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-inline void SgFunctionCallExp::addArg(SgExpression &arg)
-{ NODE_OPERAND0(thellnd) = addToExprList(NODE_OPERAND0(thellnd),arg.thellnd); }
-
-
-
-// SgFuncPntrExp--inlines
-
-inline SgFuncPntrExp::SgFuncPntrExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgFuncPntrExp::SgFuncPntrExp(SgExpression &ptr):SgExpression(FUNCTION_OP)
-{ NODE_OPERAND0(thellnd) = ptr.thellnd; }
-
-inline SgFuncPntrExp::~SgFuncPntrExp(){RemoveFromTableLlnd((void *) this);}
-
-inline SgExpression * SgFuncPntrExp::funExp()
-{  return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  void SgFuncPntrExp::setFunExp(SgExpression &s)
-{ NODE_OPERAND0(thellnd) = s.thellnd; }
-
-inline int SgFuncPntrExp::numberOfArgs()
-{ return exprListLength(NODE_OPERAND1(thellnd)); }
-
-inline  SgExpression * SgFuncPntrExp::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND1(thellnd),i)); }
-
-inline void SgFuncPntrExp::addArg(SgExpression &arg)
-{ NODE_OPERAND1(thellnd) = addToExprList(NODE_OPERAND1(thellnd),arg.thellnd);}
-          
-
-
-// SgExprListExp--inlines
-
-// Kolganov A.S. 31.10.2013
-inline SgExprListExp::SgExprListExp(int variant) :SgExpression(variant)
-{}
-
-inline SgExprListExp::SgExprListExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgExprListExp::SgExprListExp():SgExpression(EXPR_LIST)
-{}
-
-inline SgExprListExp::SgExprListExp(SgExpression &ptr):SgExpression(EXPR_LIST)
-{ NODE_OPERAND0(thellnd) = ptr.thellnd; }
-
-inline SgExprListExp::~SgExprListExp(){RemoveFromTableLlnd((void *) this);}
-
-inline  int SgExprListExp::length()
-{ return exprListLength(thellnd); }
-
-inline  SgExpression * SgExprListExp::elem(int i)
-{ return LlndMapping(getPositionInExprList(thellnd,i)); }
-
-inline SgExprListExp * SgExprListExp::next()
-{ return (SgExprListExp *) LlndMapping(NODE_OPERAND1(thellnd)); }
-
-inline SgExpression * SgExprListExp::value()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline void SgExprListExp::setValue(SgExpression &ptr)
-{ NODE_OPERAND0(thellnd) = ptr.thellnd; }
-
-inline void SgExprListExp::append(SgExpression &arg)
-{ thellnd = addToExprList(thellnd,arg.thellnd); }
-
-
-// SgRefExp--inlines
-inline SgRefExp::SgRefExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgRefExp::SgRefExp(int variant, SgSymbol &s):SgExpression(variant)
-{
-  NODE_SYMB(thellnd) = s.thesymb;
-  NODE_TYPE(thellnd) = SYMB_TYPE(s.thesymb);
-}
-
-inline SgRefExp::~SgRefExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-// SgTypeRefExp -- inlines
-
-inline SgTypeRefExp::SgTypeRefExp(SgType &t): SgExpression(TYPE_REF){
-     NODE_TYPE(thellnd) = t.thetype;
-}
-
-inline SgType * SgTypeRefExp::getType(){
-     return TypeMapping(NODE_TYPE(thellnd));
-}
-
-inline SgTypeRefExp::~SgTypeRefExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-// SgVarRefExp--inlines
-
-inline SgVarRefExp::SgVarRefExp (PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgVarRefExp::SgVarRefExp(SgSymbol &s):SgExpression(VAR_REF)
-{
-  NODE_TYPE(thellnd) = SYMB_TYPE(s.thesymb);
-  NODE_SYMB(thellnd) = s.thesymb;
-}
-inline SgVarRefExp::SgVarRefExp(SgSymbol *s):SgExpression(VAR_REF)
-{
-  if(s){
-  NODE_TYPE(thellnd) = SYMB_TYPE(s->thesymb);
-  NODE_SYMB(thellnd) = s->thesymb;
-  }
-}
-
-inline SgVarRefExp::~SgVarRefExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-// SgThisExp--inlines
-
-inline SgThisExp::SgThisExp (PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgThisExp::SgThisExp(SgType &t):SgExpression(THIS_NODE)
-{ NODE_TYPE(thellnd) = t.thetype; }
-
-inline SgThisExp::~SgThisExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-// SgArrayRefExp--inlines
-
-inline SgArrayRefExp::SgArrayRefExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgArrayRefExp::SgArrayRefExp(SgSymbol &s):SgExpression(ARRAY_REF)
-{
-  PTR_SYMB symb;
-  
-  symb = s.thesymb;
-  if (!arraySymbol(symb))
-  {
-      Message("Attempt to create an array ref with a symbol not of type array", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  NODE_SYMB(thellnd) = symb;
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb));
-}
-
-inline SgArrayRefExp::SgArrayRefExp(SgSymbol &s, SgExpression &subscripts):SgExpression(ARRAY_REF)
-{
-  PTR_SYMB symb;
-  
-  symb = s.thesymb;
-  if (!arraySymbol(symb))
-  {
-      Message("Attempt to create an array ref with a symbol not of type array", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  
-  NODE_SYMB(thellnd) = symb;
-  if(NODE_CODE(subscripts.thellnd) == EXPR_LIST)
-     NODE_OPERAND0(thellnd) = subscripts.thellnd;
-  else
-     NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),subscripts.thellnd);
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb));
-}
-
-inline SgArrayRefExp::SgArrayRefExp(SgSymbol &s, SgExpression &sub1,SgExpression &sub2):SgExpression(ARRAY_REF)
-{
-  PTR_SYMB symb;
-  
-  symb = s.thesymb;
-  
-  if (!arraySymbol(symb))
-  {
-      Message("Attempt to create an array ref with a symbol not of type array", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  NODE_SYMB(thellnd) = symb;
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub1.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub2.thellnd);
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb));
-}
-
-
-inline SgArrayRefExp::SgArrayRefExp(SgSymbol &s, SgExpression &sub1,SgExpression &sub2,SgExpression &sub3):SgExpression(ARRAY_REF)
-{
-  PTR_SYMB symb;
-  
-  symb = s.thesymb;
-  
-  if (!arraySymbol(symb))
-  {
-      Message("Attempt to create an array ref with a symbol not of type array", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  NODE_SYMB(thellnd) = symb;
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub1.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub2.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub3.thellnd);
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb));
-}
-
-inline SgArrayRefExp::SgArrayRefExp(SgSymbol &s, SgExpression &sub1,SgExpression &sub2,SgExpression &sub3,SgExpression &sub4):SgExpression(ARRAY_REF)
-{
-  PTR_SYMB symb;
-  
-  symb = s.thesymb;
-  
-  if (!arraySymbol(symb))
-  {
-      Message("Attempt to create an array ref with a symbol not of type array", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  NODE_SYMB(thellnd) = symb;
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub1.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub2.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub3.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub4.thellnd);
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb));
-}
-
-inline SgArrayRefExp::  ~SgArrayRefExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-// the number of subscripts in reference
-inline int SgArrayRefExp::numberOfSubscripts()
-{ return exprListLength(NODE_OPERAND0(thellnd));}
-
-inline SgExpression * SgArrayRefExp::subscripts()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgArrayRefExp::subscript(int i)
-{
-  PTR_LLND ll = NULL;
-  ll = getPositionInExprList(NODE_OPERAND0(thellnd),i);
-  return LlndMapping(ll);
-}
-
-inline void SgArrayRefExp::addSubscript(SgExpression &e)
-{ NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),e.thellnd);}
-
-inline void SgArrayRefExp::replaceSubscripts(SgExpression &e)
-{ NODE_OPERAND0(thellnd) = e.thellnd; }
-
-inline void SgArrayRefExp::setSymbol(SgSymbol &s)
-{ NODE_SYMB(thellnd) = s.thesymb;}
-
-
-// SgProcessorsRefExp--inlines
-
-inline SgProcessorsRefExp::SgProcessorsRefExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgProcessorsRefExp::SgProcessorsRefExp():SgExpression(PROCESSORS_REF)
-{
-  SgSymbol *symb;
-  
-  symb = new SgSymbol(VARIABLE_NAME, "_PROCESSORS");
-  NODE_SYMB(thellnd) = symb->thesymb;
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb->thesymb));
-}
-
-inline SgProcessorsRefExp::SgProcessorsRefExp(SgExpression &subscripts):SgExpression(PROCESSORS_REF)
-{
-  SgSymbol *symb;
-  
-  symb = new SgSymbol(VARIABLE_NAME, "_PROCESSORS");
-  NODE_SYMB(thellnd) = symb->thesymb;
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),subscripts.thellnd);
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb->thesymb));
-}
-
-inline SgProcessorsRefExp::SgProcessorsRefExp(SgExpression &sub1,SgExpression &sub2):SgExpression(PROCESSORS_REF)
-{
-  SgSymbol *symb;
-  
-  symb = new SgSymbol(VARIABLE_NAME, "_PROCESSORS");
-  NODE_SYMB(thellnd) = symb->thesymb;
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub1.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub2.thellnd);
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb->thesymb));
-}
-
-
-inline SgProcessorsRefExp::SgProcessorsRefExp(SgExpression &sub1,SgExpression &sub2,SgExpression &sub3):SgExpression(PROCESSORS_REF)
-{
-  SgSymbol *symb;
-  
-  symb = new SgSymbol(VARIABLE_NAME, "_PROCESSORS");
-  NODE_SYMB(thellnd) = symb->thesymb;
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub1.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub2.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub3.thellnd);
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb->thesymb));
-}
-
-inline SgProcessorsRefExp::SgProcessorsRefExp(SgExpression &sub1,SgExpression &sub2,SgExpression &sub3,SgExpression &sub4):SgExpression(PROCESSORS_REF)
-{
-  SgSymbol *symb;
-  
-  symb = new SgSymbol(VARIABLE_NAME, "_PROCESSORS");
-  NODE_SYMB(thellnd) = symb->thesymb;
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub1.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub2.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub3.thellnd);
-  NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),sub4.thellnd);
-  NODE_TYPE(thellnd) = lookForInternalBasetype(SYMB_TYPE(symb->thesymb));
-}
-
-inline SgProcessorsRefExp::  ~SgProcessorsRefExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-// the number of subscripts in reference
-inline int SgProcessorsRefExp::numberOfSubscripts()
-{ return exprListLength(NODE_OPERAND0(thellnd));}
-
-inline SgExpression * SgProcessorsRefExp::subscripts()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgProcessorsRefExp::subscript(int i)
-{
-  PTR_LLND ll = NULL;
-  ll = getPositionInExprList(NODE_OPERAND0(thellnd),i);
-  return LlndMapping(ll);
-}
-
-inline void SgProcessorsRefExp::addSubscript(SgExpression &e)
-{ NODE_OPERAND0(thellnd) =  addToExprList(NODE_OPERAND0(thellnd),e.thellnd);}
-
-
-
-// SgPntrArrRefExp--inlines
-
-inline SgPntrArrRefExp::SgPntrArrRefExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgPntrArrRefExp::SgPntrArrRefExp(SgExpression &p):SgExpression(ARRAY_OP)
-{ NODE_OPERAND0(thellnd) = p.thellnd; }
-
-inline SgPntrArrRefExp::SgPntrArrRefExp(SgExpression &p, SgExpression &subscripts):SgExpression(ARRAY_OP)
-{
-  NODE_OPERAND0(thellnd) = p.thellnd;
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),subscripts.thellnd);
-}
-
-inline SgPntrArrRefExp::SgPntrArrRefExp(SgExpression &p, int, SgExpression &sub1, SgExpression &sub2):SgExpression(ARRAY_OP)
-{
-  NODE_OPERAND0(thellnd) = p.thellnd;
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),sub1.thellnd);
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),sub2.thellnd);
-}
-
-inline SgPntrArrRefExp::SgPntrArrRefExp(SgExpression &p, int, SgExpression &sub1, SgExpression &sub2, SgExpression &sub3):SgExpression(ARRAY_OP)
-{
-  NODE_OPERAND0(thellnd) = p.thellnd;
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),sub1.thellnd);
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),sub2.thellnd);
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),sub3.thellnd);
-}
-
-inline SgPntrArrRefExp::SgPntrArrRefExp(SgExpression &p, int, SgExpression &sub1, SgExpression &sub2, SgExpression &sub3, SgExpression &sub4):SgExpression(ARRAY_OP)
-{
-  NODE_OPERAND0(thellnd) = p.thellnd;
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),sub1.thellnd);
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),sub2.thellnd);
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),sub3.thellnd);
-  NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),sub4.thellnd);
-}
-
-inline SgPntrArrRefExp::~SgPntrArrRefExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline int SgPntrArrRefExp::dimension()
-{ return exprListLength(NODE_OPERAND1(thellnd)); }
-
-inline SgExpression *SgPntrArrRefExp::subscript(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND1(thellnd),i)); }
-
-inline void SgPntrArrRefExp::addSubscript(SgExpression &e)
-{ NODE_OPERAND1(thellnd) =  addToExprList(NODE_OPERAND1(thellnd),e.thellnd); }
-
-inline void SgPntrArrRefExp::setPointer(SgExpression &p)
-{ NODE_OPERAND0(thellnd) = p.thellnd; }
-
-
-// SgPointerDerefExp--inlines
-
-inline SgPointerDerefExp::SgPointerDerefExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgPointerDerefExp::SgPointerDerefExp(SgExpression &pointerExp):SgExpression(DEREF_OP)
-{
-  PTR_TYPE expType;
-  
-  expType = NODE_TYPE(pointerExp.thellnd);
-  if (!pointerType(expType))
-  {
-      Message("Attempt to create SgPointerDerefExp with non pointer type", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-
-  NODE_OPERAND0(thellnd) = pointerExp.thellnd;
-  NODE_TYPE(thellnd) = lookForInternalBasetype(expType);
-}
-
-inline SgPointerDerefExp::~SgPointerDerefExp()
-{ RemoveFromTableLlnd((void *) this);}
-
-
-inline SgExpression * SgPointerDerefExp::pointerExp()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-
-// SgRecprdRefExp--inlines
-
-inline SgRecordRefExp::SgRecordRefExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgRecordRefExp::SgRecordRefExp(SgSymbol &recordName, char *fieldName):SgExpression(RECORD_REF)
-{ 
-  PTR_SYMB recordSym, fieldSym;
-  
-  recordSym = recordName.thesymb;
-
-  if ((fieldSym = getFieldOfStructWithName(fieldName, SYMB_TYPE(recordSym))) == SMNULL)
-  {
-      Message("No such field", 0);
-#ifdef __SPF 
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-
-  NODE_OPERAND0(thellnd) = newExpr(VAR_REF,SYMB_TYPE(recordName.thesymb), recordName.thesymb);
-  NODE_OPERAND1(thellnd) = newExpr(VAR_REF,SYMB_TYPE(fieldSym), fieldSym);
-  NODE_TYPE(thellnd) = SYMB_TYPE(fieldSym);
-}
-
-inline SgRecordRefExp::SgRecordRefExp(SgExpression &recordExp, char *fieldName):SgExpression(RECORD_REF)
-{
-  PTR_SYMB  fieldSym;
-
-            
-  if ((fieldSym = getFieldOfStructWithName(fieldName, NODE_TYPE(recordExp.thellnd))) == SMNULL)
-  {
-      Message("No such field", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  
-  NODE_OPERAND0(thellnd) = recordExp.thellnd;
-  NODE_OPERAND1(thellnd) = newExpr(VAR_REF,SYMB_TYPE(fieldSym),fieldSym);
-  NODE_TYPE(thellnd) = SYMB_TYPE(fieldSym);
-}
-
-inline SgRecordRefExp::SgRecordRefExp(SgSymbol &recordName, const char *fieldName) :SgExpression(RECORD_REF)
-{
-    PTR_SYMB recordSym, fieldSym;
-
-    recordSym = recordName.thesymb;
-
-    if ((fieldSym = getFieldOfStructWithName(fieldName, SYMB_TYPE(recordSym))) == SMNULL)
-    {
-        Message("No such field", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-    }
-
-    NODE_OPERAND0(thellnd) = newExpr(VAR_REF, SYMB_TYPE(recordName.thesymb), recordName.thesymb);
-    NODE_OPERAND1(thellnd) = newExpr(VAR_REF, SYMB_TYPE(fieldSym), fieldSym);
-    NODE_TYPE(thellnd) = SYMB_TYPE(fieldSym);
-}
-
-inline SgRecordRefExp::SgRecordRefExp(SgExpression &recordExp, const char *fieldName) :SgExpression(RECORD_REF)
-{
-    PTR_SYMB  fieldSym;
-
-
-    if ((fieldSym = getFieldOfStructWithName(fieldName, NODE_TYPE(recordExp.thellnd))) == SMNULL)
-    {
-        Message("No such field", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-    }
-
-    NODE_OPERAND0(thellnd) = recordExp.thellnd;
-    NODE_OPERAND1(thellnd) = newExpr(VAR_REF, SYMB_TYPE(fieldSym), fieldSym);
-    NODE_TYPE(thellnd) = SYMB_TYPE(fieldSym);
-}
-
-inline SgRecordRefExp::~SgRecordRefExp(){RemoveFromTableLlnd((void *) this);}
-
-inline SgSymbol * SgRecordRefExp::fieldName()
-{ return SymbMapping(NODE_SYMB(NODE_OPERAND1(thellnd))); }
-
-inline SgSymbol * SgRecordRefExp::recordName()
-{
-  SgSymbol *x;
-
-  if (NODE_CODE(NODE_OPERAND0(thellnd)) != VAR_REF)
-    x = NULL;
-  else 
-    x = SymbMapping(NODE_SYMB(NODE_OPERAND0(thellnd)));
-  
-  return x;
-}
-
-inline SgExpression* SgRecordRefExp::record()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression* SgRecordRefExp::field()
-{ return LlndMapping(NODE_OPERAND1(thellnd)); }
-
-
-// SgStructConstExp--inlines
-
-inline SgStructConstExp::SgStructConstExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgStructConstExp::SgStructConstExp(SgSymbol &structName, SgExpression &values):SgExpression(STRUCTURE_CONSTRUCTOR)
-{
-  NODE_OPERAND0(thellnd) = newExpr(TYPE_REF,SYMB_TYPE(structName.thesymb),structName.thesymb);
-  NODE_OPERAND1(thellnd) = values.thellnd;
-  NODE_TYPE(thellnd) = SYMB_TYPE(structName.thesymb);
-}
-
-inline SgStructConstExp::SgStructConstExp(SgExpression  &typeRef, SgExpression &values):SgExpression(STRUCTURE_CONSTRUCTOR)
-{
-  NODE_OPERAND0(thellnd) = typeRef.thellnd;
-  NODE_OPERAND1(thellnd) = values.thellnd;
-  NODE_TYPE(thellnd) = NODE_TYPE(typeRef.thellnd);
-}
-
-inline SgStructConstExp::~SgStructConstExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline int SgStructConstExp::numberOfArgs()
-{ return exprListLength(NODE_OPERAND1(thellnd)); }
- 
-inline SgExpression * SgStructConstExp::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND1(thellnd),i)); }
-
-
-// SgConstExp--inlines
-
-inline  SgConstExp::SgConstExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-// NODE_ TYPE needs to be filled here.
-// type-checking of values needs to be done.
-inline  SgConstExp::SgConstExp(SgExpression &values):SgExpression(CONSTRUCTOR_REF)
-{
-  NODE_OPERAND0(thellnd) = values.thellnd;
-}
-
-inline SgConstExp::~SgConstExp(){RemoveFromTableLlnd((void *) this);}
-
-inline int SgConstExp::numberOfArgs()
-{ return exprListLength(NODE_OPERAND1(thellnd)); }
-
-inline SgExpression * SgConstExp::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND1(thellnd),i)); }
-
-
-
-// SgVecConstExp--inlines
-
-inline SgVecConstExp::SgVecConstExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgVecConstExp::SgVecConstExp(SgExpression &expr_list):SgExpression(VECTOR_CONST)
-{ SORRY; }
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgVecConstExp::SgVecConstExp(int n, SgExpression *components):SgExpression(VECTOR_CONST)
-{ SORRY; }
-#endif
-
-inline SgVecConstExp::~SgVecConstExp()
-{ RemoveFromTableLlnd((void *) this); }
-        
-#ifdef NOT_YET_IMPLEMENTED
-inline SgExpression * SgVecConstExp::arg(int i)
-{ 
-  SORRY;
-  return (SgExpression *) NULL;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgVecConstExp::numberOfArgs()
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline void SgVecConstExp::setArg(int i, SgExpression &e)
-{
-  SORRY;
-}
-#endif
-
-
-
-// SgInitListExp--inlines
-
-inline SgInitListExp::SgInitListExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgInitListExp::SgInitListExp(SgExpression &expr_list):SgExpression(INIT_LIST)
-{
-  NODE_OPERAND0(thellnd)=expr_list.thellnd;
-  NODE_TYPE(thellnd)=NODE_TYPE(expr_list.thellnd);
-}
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgInitListExp::SgInitListExp(int n, SgExpression *components):SgExpression(INIT_LIST)
-{
-  SORRY;
-}
-#endif
-
-inline SgInitListExp::~SgInitListExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-        
-#ifdef NOT_YET_IMPLEMENTED
-inline SgExpression * SgInitListExp::arg(int i)
-{
-  SORRY;
-  return (SgExpression *) NULL;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgInitListExp::numberOfArgs()
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline void SgInitListExp::setArg(int i, SgExpression &e)
-{
-  SORRY;
-}
-#endif
-
-
-// SgObjectListExp--inlines
-
-inline SgObjectListExp::SgObjectListExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgObjectListExp::SgObjectListExp(int variant, SgSymbol &object, SgExpression &list):SgExpression(variant)
-{
-#ifdef AJM_SUGGESTS
-
-// This is not what is expected in a COMMON block.
-//  NODE_OPERAND0(thellnd) = newExpr(VAR_REF, SYMB_TYPE(object.thesymb), object.thesymb);
-  NODE_SYMB(thellnd) = object.thesymb;
-  NODE_OPERAND0(thellnd) = list.thellnd;
-
-#else /* Original */
-
-  NODE_OPERAND0(thellnd) = newExpr(VAR_REF, SYMB_TYPE(object.thesymb), object.thesymb);
-  NODE_OPERAND1(thellnd) = list.thellnd;
-
-#endif
-}
-
-inline SgObjectListExp::SgObjectListExp(int variant,SgExpression &objectRef, SgExpression &list):SgExpression(variant)
-{
-#ifdef AJM_SUGGESTS
-// Not what a common block wants.
-//  NODE_OPERAND0(thellnd) = objectRef.thellnd;
-  NODE_SYMB(thellnd)=objectRef.symbol()->thesymb;
-  NODE_OPERAND0(thellnd) = list.thellnd;
-#else
-  NODE_OPERAND0(thellnd) = objectRef.thellnd;
-  NODE_OPERAND1(thellnd) = list.thellnd;
-#endif
-}
-
-inline SgObjectListExp::~SgObjectListExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgSymbol * SgObjectListExp::object( )
-{ return SymbMapping( NODE_SYMB(thellnd)); }
-
-inline SgObjectListExp * SgObjectListExp::next( )
-{ return static_cast< SgObjectListExp * >( LlndMapping(NODE_OPERAND1(thellnd))); }
-
-inline SgExpression * SgObjectListExp::body( )
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline int SgObjectListExp::listLength()
-{ return exprListLength(thellnd); }
-
-inline SgSymbol * SgObjectListExp::symbol(int i)
-{
-    PTR_LLND tail;
-    int len;
-    for (len = 0, tail = thellnd; len < i && tail; tail = NODE_OPERAND1(tail), ++len);
-
-    return SymbMapping(NODE_SYMB(tail));
-}
-
-inline SgExpression * SgObjectListExp::body(int i) 
-{ return LlndMapping( getPositionInExprList(NODE_OPERAND1(thellnd),i)); }
-
-
-// SgAttributeExp--inlines
-inline SgAttributeExp::SgAttributeExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgAttributeExp::SgAttributeExp(int variant):SgExpression(variant)
-{}
-
-inline SgAttributeExp::~SgAttributeExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-// SgKeywordArgExp--inlines
-
-inline SgKeywordArgExp::SgKeywordArgExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgKeywordArgExp::SgKeywordArgExp(char *argName, SgExpression &exp):SgExpression(KEYWORD_ARG)
-{ 
-  NODE_OPERAND1(thellnd) = exp.thellnd;
-  NODE_OPERAND0(thellnd) = SgKeywordValExp(argName).thellnd;
-  NODE_TYPE(thellnd) = NODE_TYPE(exp.thellnd);
-}
-
-inline SgKeywordArgExp::SgKeywordArgExp(const char *argName, SgExpression &exp) :SgExpression(KEYWORD_ARG)
-{
-    NODE_OPERAND1(thellnd) = exp.thellnd;
-    NODE_OPERAND0(thellnd) = SgKeywordValExp(argName).thellnd;
-    NODE_TYPE(thellnd) = NODE_TYPE(exp.thellnd);
-}
-
-inline SgKeywordArgExp::~SgKeywordArgExp()
-{ RemoveFromTableLlnd((void *) this); }
-  
-#if 0 //Kataev N.A. 30.05.2013
-inline SgSymbol * SgKeywordArgExp::arg()
-{ return SymbMapping(NODE_SYMB(thellnd)); }
-#endif
-
-inline SgExpression * SgKeywordArgExp::arg() //Kataev N.A. 30.05.2013
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgKeywordArgExp::value()
-{ return LlndMapping(NODE_OPERAND1(thellnd)); } // fix bag: change NODE_OPERAND0 -> NODE_OPERAND1 (Kataev N.A. 30.05.2013)
-
-
-// SgSubscriptExp--inlines
-
-inline SgSubscriptExp::SgSubscriptExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgSubscriptExp::SgSubscriptExp(SgExpression &lbound, SgExpression &ubound, SgExpression &step):SgExpression(DDOT)
-{
-  PTR_LLND lb, ub, inc;
-  
-  lb = lbound.thellnd; ub = ubound.thellnd; inc = step.thellnd;
-  if (!isIntegerType(lb) && !isIntegerType(ub) && !isIntegerType(inc))
-  {
-      Message("Non integer type for SgSubscriptExp", 0);
-#ifdef __SPF  
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  
-  NODE_OPERAND0(thellnd) = lbound.thellnd;
-  NODE_OPERAND1(thellnd) = newExpr(DDOT,NULL,ubound.thellnd, step.thellnd);
-}
-
-inline SgSubscriptExp::SgSubscriptExp(SgExpression &lbound, SgExpression &ubound):SgExpression(DDOT)
-{
-  PTR_LLND lb, ub;
-  
-  lb = lbound.thellnd; ub = ubound.thellnd;
-  if (!isIntegerType(lb) && !isIntegerType(ub))
-  {
-      Message("Non integer type for SgSubscriptExp", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  
-  NODE_OPERAND0(thellnd) = lbound.thellnd;
-  NODE_OPERAND1(thellnd) =  ubound.thellnd;
-}
-
-inline SgSubscriptExp:: ~SgSubscriptExp()
-{ RemoveFromTableLlnd((void *) this);}
-
-// SgUseOnlyExp--inlines
-
-inline SgUseOnlyExp::SgUseOnlyExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgUseOnlyExp::SgUseOnlyExp(SgExpression &onlyList):SgExpression(ONLY_NODE)
-{ NODE_OPERAND0(thellnd) = onlyList.thellnd; }
-
-inline SgUseOnlyExp::~SgUseOnlyExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression * SgUseOnlyExp::onlyList()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-
-inline SgUseRenameExp::SgUseRenameExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgUseRenameExp::SgUseRenameExp(SgSymbol &newName, SgSymbol &oldName):SgExpression( RENAME_NODE)
-{ SORRY; }
-#endif
-
-inline SgUseRenameExp::~SgUseRenameExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgSymbol *SgUseRenameExp::newName()
-{
-  SORRY;
-  return (SgSymbol *) NULL;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgSymbol *SgUseRenameExp::oldName()
-{
-  SORRY;
-  return (SgSymbol *) NULL;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgExpression * SgUseRenameExp::newNameExp()
-{
-  SORRY;
-  return (SgExpression *) NULL;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgExpression * SgUseRenameExp::oldNameExp()
-{
-  SORRY;
-  return (SgExpression *) NULL;
-}
-#endif
-
-
-// SgSpecPairExp--inlines
-
-inline SgSpecPairExp::SgSpecPairExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgSpecPairExp::SgSpecPairExp(SgExpression &arg, SgExpression &value):SgExpression(SPEC_PAIR)
-{
-  NODE_OPERAND0(thellnd) = arg.thellnd;
-  NODE_OPERAND1(thellnd) = value.thellnd;
-}
-
-inline SgSpecPairExp::SgSpecPairExp(SgExpression &arg):SgExpression(SPEC_PAIR)
-{ NODE_OPERAND0(thellnd) = arg.thellnd; }
-
-inline SgSpecPairExp::SgSpecPairExp(char *arg, char *):SgExpression(SPEC_PAIR)
-{
-  NODE_OPERAND0(thellnd) = SgKeywordValExp(arg).thellnd;
-  NODE_OPERAND1(thellnd) = SgKeywordValExp(arg).thellnd;
-}
-
-inline SgSpecPairExp::~SgSpecPairExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression *SgSpecPairExp::arg()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgSpecPairExp::value()
-{ return LlndMapping(NODE_OPERAND1(thellnd)); }
-
-
-// SgIOAccessExp--inlines
-
-inline SgIOAccessExp::SgIOAccessExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-// type-checking on bounds needs to be done.
-// Float values are legal in some cases. check manual.
-inline SgIOAccessExp::SgIOAccessExp(SgSymbol &s, SgExpression lbound, SgExpression ubound, SgExpression step):SgExpression(IOACCESS)
-{ 
-  NODE_SYMB(thellnd) = s.thesymb;
-  NODE_OPERAND0(thellnd) = newExpr(SEQ,NULL, newExpr(DDOT,NULL, lbound.thellnd, ubound.thellnd), step.thellnd);
-}
-
-inline SgIOAccessExp::SgIOAccessExp(SgSymbol &s, SgExpression lbound, SgExpression ubound):SgExpression(IOACCESS)
-{
-  NODE_SYMB(thellnd) = s.thesymb;
-  NODE_OPERAND0(thellnd) = newExpr(SEQ,NULL, newExpr(DDOT,NULL, lbound.thellnd, ubound.thellnd), NULL);
-}
-
-inline SgIOAccessExp::~SgIOAccessExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-// SgImplicitTypExp--inlines
-
-inline SgImplicitTypeExp::SgImplicitTypeExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgImplicitTypeExp::SgImplicitTypeExp(SgType &type, SgExpression &rangeList):SgExpression(IMPL_TYPE)
-{
-  NODE_TYPE(thellnd) = type.thetype;
-  NODE_OPERAND0(thellnd) = rangeList.thellnd;
-}
-
-inline SgImplicitTypeExp::~SgImplicitTypeExp()
-{ RemoveFromTableLlnd((void *) this);}
-
-inline SgType * SgImplicitTypeExp::type()
-{ return TypeMapping(NODE_TYPE(thellnd)); }
-
-inline SgExpression * SgImplicitTypeExp::rangeList()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-#ifdef NOT_YET_IMPLEMENTED
-inline char * SgImplicitTypeExp::alphabeticRange()
-{
-  SORRY;
-  return (char *) NULL;
-}
-#endif
-
-
-// SgTypeExp--inlines
-
-inline SgTypeExp::SgTypeExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgTypeExp::SgTypeExp(SgType &type):SgExpression(TYPE_OP)
-{ NODE_TYPE(thellnd) = type.thetype; }
-
-inline SgTypeExp::~SgTypeExp()
-{ RemoveFromTableLlnd((void *) this);}
-
-inline SgType * SgTypeExp::type()
-{ return TypeMapping( NODE_TYPE(thellnd)); }
-
-
-// SgSeqExp--inlines
-
-inline SgSeqExp::SgSeqExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgSeqExp::SgSeqExp(SgExpression &exp1, SgExpression &exp2):SgExpression(SEQ)
-{
-  NODE_OPERAND0(thellnd) = exp1.thellnd;
-  NODE_OPERAND1(thellnd) = exp2.thellnd;
-}
-
-inline SgSeqExp::~SgSeqExp()
-{ RemoveFromTableLlnd((void *) this);}
-
-inline SgExpression * SgSeqExp::front()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgSeqExp::rear()
-{ return LlndMapping(NODE_OPERAND1(thellnd)); }
-
-
-
-// SgStringLengthExp--inlines
-
-inline SgStringLengthExp::SgStringLengthExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgStringLengthExp::SgStringLengthExp(SgExpression &length):SgExpression(LEN_OP)
-{ NODE_OPERAND0(thellnd) = length.thellnd; }
-
-inline SgStringLengthExp::~SgStringLengthExp()
-{ RemoveFromTableLlnd((void *) this);}
-
-inline SgExpression * SgStringLengthExp::length()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-
-
-// SgDefaultExp--inlines
-
-inline SgDefaultExp::SgDefaultExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgDefaultExp::SgDefaultExp():SgExpression(DEFAULT) 
-{}
-
-inline SgDefaultExp::~SgDefaultExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-// SgLabelRefExp--inlines
-
-inline SgLabelRefExp::SgLabelRefExp(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgLabelRefExp::SgLabelRefExp(SgLabel &label):SgExpression(LABEL_REF)
-{ NODE_LABEL(thellnd) = label.thelabel; }
-
-inline SgLabelRefExp::~SgLabelRefExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgLabel * SgLabelRefExp::label()
-{ return LabelMapping(NODE_LABEL(thellnd)); }
-
-
-// SgProgHedrStmt--inlines
-
-
-inline SgProgHedrStmt::SgProgHedrStmt(PTR_BFND bif):SgStatement(bif)
-{}
-
-inline SgProgHedrStmt::SgProgHedrStmt(int variant):SgStatement(variant)
-{ addControlEndToStmt(thebif); }
-
-inline SgProgHedrStmt::SgProgHedrStmt(SgSymbol &name, SgStatement &Body):SgStatement(PROG_HEDR)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  insertBfndListIn(Body.thebif,thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-inline SgProgHedrStmt::SgProgHedrStmt(SgSymbol &name):SgStatement(PROG_HEDR)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  addControlEndToStmt(thebif);
-}
-
-inline SgProgHedrStmt::SgProgHedrStmt(char *name):SgStatement(PROG_HEDR)
-{
-  SgSymbol *proc;
-  proc = new SgSymbol(PROGRAM_NAME, name); 
-  SYMB_SCOPE(proc->thesymb) = PROJ_FIRST_BIF();
-  SYMB_TYPE(proc->thesymb) = GetAtomicType(DEFAULT);
-  BIF_SYMB(thebif) = proc->thesymb;
-  addControlEndToStmt(thebif);
-}
-
-inline SgSymbol & SgProgHedrStmt::name()
-{
-  PTR_SYMB symb;
-  SgSymbol *pt = NULL;
-  symb = BIF_SYMB(thebif);
-  if (!symb)
-  {
-      Message("The bif has no symbol", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-  else 
-    {
-      pt = GetMappingInTableForSymbol(symb);
-      if (!pt)
-        pt = new SgSymbol(symb);      
-    }
-  return *pt;
-}     
-   
-inline void SgProgHedrStmt::setName(SgSymbol &symbol)
-{ BIF_SYMB(thebif) = symbol.thesymb; }
-
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgProgHedrStmt::numberOfFunctionsCalled()
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgSymbol * SgProgHedrStmt::calledFunction(int i)
-{
-  SORRY;
-  return (SgSymbol *) NULL;
-}
-#endif
-
-inline int SgProgHedrStmt::numberOfStmtFunctions()
-{ return countInStmtNode1(thebif, STMTFN_STAT); }
-
-inline SgStatement * SgProgHedrStmt::statementFunc(int i)
-{ return BfndMapping(GetcountInStmtNode1(thebif, STMTFN_STAT, i)); }
-
-inline int SgProgHedrStmt::numberOfEntryPoints()
-{ return countInStmtNode1(thebif, ENTRY_STAT); }
-
-inline SgStatement * SgProgHedrStmt::entryPoint(int i)
-{ return BfndMapping(GetcountInStmtNode1(thebif, ENTRY_STAT, i)); }
-
-inline int SgProgHedrStmt::numberOfParameters()
-{
-    if (BIF_CODE(thebif) == PROG_HEDR)
-        return 0;
-    else
-        return lenghtOfParamList(BIF_SYMB(thebif)); 
-}
-
-inline SgSymbol * SgProgHedrStmt::parameter(int i)
-{
-  PTR_SYMB symb;
-  symb = GetThParam(BIF_SYMB(thebif),i);
-  return SymbMapping(symb);
-}
-
-        
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgProgHedrStmt::numberOfSpecificationStmts()
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgProgHedrStmt::numberOfExecutionStmts()
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgStatement * SgProgHedrStmt::specificationStmt(int i)
-{
-  SORRY;
-  return (SgStatement *) NULL;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgStatement * SgProgHedrStmt::executionStmt(int i)
-{
-  SORRY;
-  return (SgStatement *) NULL;
-}
-#endif
- 
-inline int SgProgHedrStmt::numberOfInternalFunctionsDefined()
-{ return countInStmtNode1(thebif, FUNC_HEDR); }
-
-inline int SgProgHedrStmt::numberOfInternalSubroutinesDefined()
-{ return countInStmtNode1(thebif, PROC_HEDR); }
-
-inline int SgProgHedrStmt::numberOfInternalSubProgramsDefined()
-{
-  return (countInStmtNode1(thebif, FUNC_HEDR) +
-          countInStmtNode1(thebif, PROC_HEDR)) ;
-}
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgStatement * SgProgHedrStmt::internalSubProgram(int i)
-{
-  SORRY;
-  return (SgStatement *) NULL;
-}
-#endif
-
-inline SgStatement * SgProgHedrStmt::internalFunction(int i)
-{ return BfndMapping(GetcountInStmtNode1(thebif, FUNC_HEDR, i)); }
-
-inline SgStatement * SgProgHedrStmt::internalSubroutine(int i)
-{ return BfndMapping(GetcountInStmtNode1(thebif, PROC_HEDR, i)); }
-
-
-#ifdef NOT_YET_IMPLEMENTED
-SgSymbol &addVariable(SgType &T, char *name)
-{
-  SORRY;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-//add a declaration for new variable
-SgStatement &addCommonBlock(char *blockname, int noOfVars,
-                            SgSymbol *Vars)
-{
-  SORRY;
-}
-#endif
-        
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgProgHedrStmt::isSymbolInScope(SgSymbol &symbol)
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgProgHedrStmt::isSymbolDeclaredHere(SgSymbol &symbol)
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-// global analysis data
-
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgProgHedrStmt::numberOfVarsUsed()
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgExpression * SgProgHedrStmt::varsUsed(int i)
-{
-  SORRY;
-  return (SgExpression *) NULL;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgProgHedrStmt::numberofVarsMod()
-{
-  SORRY;
-  return 0;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgExpression *varsMod(int i)
-{
-  SORRY;
-  return (SgExpression *) NULL;
-}
-#endif
-
-inline SgProgHedrStmt::~SgProgHedrStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgProcHedrStmt--inlines
-
-inline SgProcHedrStmt::SgProcHedrStmt(int variant):SgProgHedrStmt(variant)
-{ }
-
-inline SgProcHedrStmt::SgProcHedrStmt(SgSymbol &name, SgStatement &Body):SgProgHedrStmt(PROC_HEDR)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-    if(LibClanguage())
-    {
-        printf("SgProcHedrStmt: not a valid C construct. use FuncHedr\n");
-	}
-  name.thesymb->entry.proc_decl.proc_hedr = thebif;
-  insertBfndListIn(Body.thebif,thebif,thebif);
-}
-
-inline SgProcHedrStmt::SgProcHedrStmt(SgSymbol &name):SgProgHedrStmt(PROC_HEDR)
-{ BIF_SYMB(thebif) = name.thesymb;  
-  name.thesymb->entry.proc_decl.proc_hedr = thebif;
-    if(LibClanguage()){
-        printf("SgProcHedrStmt: not a valid C construct. use FuncHedr\n");
-	}
-}
-
-inline SgProcHedrStmt::SgProcHedrStmt(const char *name):SgProgHedrStmt(PROC_HEDR)
-{
-  SgSymbol *proc;
-  proc = new SgSymbol(PROCEDURE_NAME, name); 
-  SYMB_SCOPE(proc->thesymb) = PROJ_FIRST_BIF();
-  SYMB_TYPE(proc->thesymb) = GetAtomicType(DEFAULT);
-  BIF_SYMB(thebif) = proc->thesymb;
-  proc->thesymb->entry.proc_decl.proc_hedr = thebif;
-    if(LibClanguage()){
-        printf("SgProcHedrStmt: not a valid C construct. use FuncHedr\n");
-	}
-        
-}
-
-inline void SgProcHedrStmt::AddArg(SgExpression &arg)
-{
-  PTR_SYMB symb;
-  PTR_LLND ll;
-
-  if(LibFortranlanguage())
- 	BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg.thellnd);
-  else{ 
-        ll = BIF_LL1(thebif);
-        ll = NODE_OPERAND0(ll);
-	NODE_OPERAND0(ll) = addToExprList(NODE_OPERAND0(ll),arg.thellnd);
-      }
-  ll = giveLlSymbInDeclList(arg.thellnd);
-  if (ll && (symb= NODE_SYMB(ll)))
-    {
-      appendSymbToArgList(BIF_SYMB(thebif),symb); 
-      SYMB_SCOPE(symb) = thebif;
-      if(LibFortranlanguage())
-            declareAVar(symb,thebif);
-    } 
-  else
-  {
-      Message("bad symbol in SgProcHedrStmt::AddArg", 0);
-#ifdef __SPF  
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-}
-
-
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgProcHedrStmt::isRecursive()  // 1 if recursive.
-{ 
-  SORRY;
-  return 0;
-  //return isAttributeSet(BIF_SYMB(thebif), RECURSIVE_BIT); 
-}
-#endif
-
-inline int SgProcHedrStmt::numberOfEntryPoints()
-{ return countInStmtNode1(thebif,ENTRY_STAT); }
-
-inline SgStatement * SgProcHedrStmt::entryPoint(int i)
-{ return BfndMapping(GetcountInStmtNode1(thebif,ENTRY_STAT,i)); }
-
-// this is incorrect. Takes only subroutines calls into account.
-// Should be modified to take function calls into account too.
-inline int SgProcHedrStmt::numberOfCalls()
-{ return countInStmtNode1(thebif,PROC_STAT); }
-
-inline SgStatement * SgProcHedrStmt::call(int i)
-{ return BfndMapping(GetcountInStmtNode1(thebif,PROC_STAT,i)); }
-
-inline SgProcHedrStmt::~SgProcHedrStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgProsHedrStmt--inlines
-
-inline SgProsHedrStmt::SgProsHedrStmt():SgProgHedrStmt(PROS_HEDR)
-{}
-
-inline SgProsHedrStmt::SgProsHedrStmt(SgSymbol &name, SgStatement &Body)
-                      :SgProgHedrStmt(PROS_HEDR)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  insertBfndListIn(Body.thebif,thebif,thebif);
-}
-
-inline SgProsHedrStmt::SgProsHedrStmt(SgSymbol &name):SgProgHedrStmt(PROS_HEDR)
-{ BIF_SYMB(thebif) = name.thesymb; }
-
-inline SgProsHedrStmt::SgProsHedrStmt(char *name):SgProgHedrStmt(PROS_HEDR)
-{
-  SgSymbol *pros;
-  pros = new SgSymbol(PROCESS_NAME, name); 
-  SYMB_SCOPE(pros->thesymb) = PROJ_FIRST_BIF();
-  SYMB_TYPE(pros->thesymb) = GetAtomicType(DEFAULT);
-  BIF_SYMB(thebif) = pros->thesymb;
-}
-
-inline void SgProsHedrStmt::AddArg(SgExpression &arg)
-{
-  PTR_SYMB symb;
-  PTR_LLND ll;
-
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg.thellnd);
-  ll = giveLlSymbInDeclList(arg.thellnd);
-  if (ll && (symb= NODE_SYMB(ll)))
-    {
-      appendSymbToArgList(BIF_SYMB(thebif),symb); 
-      SYMB_SCOPE(symb) = thebif;
-      declareAVar(symb,thebif);
-    } 
-  else
-  {
-      Message("Pb in SgProsHedrStmt::AddArg", 0);
-#ifdef __SPF   
-      {
-          char buf[512];
-          sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-          addToGlobalBufferAndPrint(buf);
-      }
-      throw -1;
-#endif
-  }
-}
-
-inline int SgProsHedrStmt::numberOfCalls()
-{ return countInStmtNode1(thebif,PROS_STAT); }
-
-inline SgStatement * SgProsHedrStmt::call(int i)
-{ return BfndMapping(GetcountInStmtNode1(thebif,PROS_STAT,i)); }
-
-inline SgProsHedrStmt::~SgProsHedrStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgFuncHedrStmt--inlines
-inline SgFuncHedrStmt::SgFuncHedrStmt(SgSymbol &name, SgStatement &Body): 
-   SgProcHedrStmt(FUNC_HEDR)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  if(LibClanguage()){
-	SgExpression *fref = new SgExpression(FUNCTION_REF);
-	fref->setSymbol(name);
-  	BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),fref->thellnd);
-	}
-  SYMB_FUNC_HEDR(name.thesymb) = thebif;
-  insertBfndListIn(Body.thebif,thebif,thebif);
-}
-
-inline SgFuncHedrStmt::SgFuncHedrStmt(SgSymbol &name, SgType &type, SgStatement &Body): SgProcHedrStmt(FUNC_HEDR)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  if(LibClanguage()){
-	SgExpression *fref = new SgExpression(FUNCTION_REF);
-	fref->setSymbol(name);
-  	BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),fref->thellnd);
-	}
-  SYMB_TYPE(BIF_SYMB(thebif)) = type.thetype;
-  SYMB_FUNC_HEDR(name.thesymb) = thebif;
-  insertBfndListIn(Body.thebif,thebif,thebif);
-}
-
-inline SgFuncHedrStmt::SgFuncHedrStmt(SgSymbol &name, SgSymbol &resultName, 
-                  SgType &type, SgStatement &Body): SgProcHedrStmt(FUNC_HEDR)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  if(LibClanguage()){
-	SgExpression *fref = new SgExpression(FUNCTION_REF);
-	fref->setSymbol(name);
-  	BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),fref->thellnd);
-	}
-  SYMB_TYPE(BIF_SYMB(thebif)) = type.thetype;
-  SYMB_DECLARED_NAME(BIF_SYMB(thebif)) = resultName.thesymb;
-  SYMB_FUNC_HEDR(name.thesymb) = thebif;
-  insertBfndListIn(Body.thebif,thebif,thebif);
-}
-
-inline SgFuncHedrStmt::SgFuncHedrStmt(SgSymbol &name): SgProcHedrStmt(FUNC_HEDR)
-{ BIF_SYMB(thebif) = name.thesymb; 
-  if(LibClanguage()){
-	SgExpression *fref = new SgExpression(FUNCTION_REF);
-	fref->setSymbol(name);
-  	BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),fref->thellnd);
-	}
-}
-
-inline SgFuncHedrStmt::SgFuncHedrStmt(SgSymbol &name, SgExpression *exp): SgProcHedrStmt(FUNC_HEDR)
-{ 
-  BIF_SYMB(thebif) = name.thesymb; 
-  if (exp)
-    BIF_LL1(thebif) = exp->thellnd;
-  SYMB_FUNC_HEDR(name.thesymb) = thebif;
-}
-
-inline SgFuncHedrStmt::SgFuncHedrStmt(char *name): SgProcHedrStmt(FUNC_HEDR)
-{
-  SgSymbol *proc;
-  proc = new SgSymbol(FUNCTION_NAME, name); 
-  if(LibClanguage()){
-	SgExpression *fref = new SgExpression(FUNCTION_REF);
-	fref->setSymbol(*proc);
-  	BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),fref->thellnd);
-	}
-  SYMB_SCOPE(proc->thesymb) = PROJ_FIRST_BIF();
-  SYMB_TYPE(proc->thesymb) = GetAtomicType(T_INT);
-  SYMB_FUNC_HEDR(proc->thesymb) = thebif;
-  BIF_SYMB(thebif) = proc->thesymb;
-}
-
-inline SgFuncHedrStmt::~SgFuncHedrStmt()
-{ RemoveFromTableBfnd((void *) this); } 
-
-inline SgType * SgFuncHedrStmt::returnedType()
-{
-  PTR_TYPE ty = NULL;
-  if (BIF_SYMB(thebif))
-    ty = SYMB_TYPE(BIF_SYMB(thebif));
-  return TypeMapping(ty);
-}
-
-inline void SgFuncHedrStmt::setReturnedType(SgType &type)
-{
-  if (BIF_SYMB(thebif))
-    SYMB_TYPE(BIF_SYMB(thebif)) = type.thetype;
-}
-
-//fixed by Kolganov A.S. 02.06.2022
-inline SgSymbol* SgFuncHedrStmt::resultName()  // name of result variable.
-{
-    SgSymbol* x = NULL;
-    PTR_LLND ll = BIF_LL1(thebif);
-    if (ll)
-        x = SymbMapping(NODE_SYMB(ll));
-    return x;
-}
-
-// Use Message to flag error and type it void?
-//fixed by Kolganov A.S. 02.06.2022
-inline int SgFuncHedrStmt::setResultName(SgSymbol& symbol) // set name of result variable.
-{
-    int x = 0;
-    PTR_LLND ll = BIF_LL1(thebif);
-    if (ll)
-    {
-        x = 1;
-        NODE_SYMB(ll) = symbol.thesymb;
-    }
-    return x;
-}
-
-
-// SgClassStmt--inlines
-
-inline SgClassStmt::SgClassStmt(int variant):SgStatement(variant)
-{}
-
-inline SgClassStmt::SgClassStmt(SgSymbol &name):SgStatement(CLASS_DECL)
-{ BIF_SYMB(thebif) = name.thesymb; }
-
-inline SgClassStmt::~SgClassStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline int SgClassStmt::numberOfSuperClasses()
-{ return exprListLength(BIF_LL2(thebif)); }
-
-inline SgSymbol * SgClassStmt::name()
-{ return SymbMapping(BIF_SYMB(thebif)); }
-
-inline SgSymbol * SgClassStmt::superClass(int i)
-{
-  PTR_LLND pt;
-  SgSymbol *x;
-
-  pt = getPositionInExprList(BIF_LL2(thebif),i);
-  pt = giveLlSymbInDeclList(pt);
-  if (pt)
-    x = SymbMapping(NODE_SYMB(pt));
-  else
-    x = SymbMapping(NULL);
-
-  return x;
-}
-
-inline void SgClassStmt::setSuperClass(int i, SgSymbol &symb)
-{
-  PTR_LLND pt;
-  
-  if (!BIF_LL2(thebif))
-    {
-      BIF_LL2(thebif) = addToExprList(BIF_LL2(thebif),newExpr(VAR_REF,NULL,symb.thesymb));
-    } 
-  else
-    {
-      pt = getPositionInExprList(BIF_LL2(thebif),i);
-      pt = giveLlSymbInDeclList(pt);
-      if (pt)
-        NODE_SYMB(pt) = symb.thesymb;
-      else
-        BIF_LL2(thebif) = addToExprList(BIF_LL2(thebif),newExpr(VAR_REF,NULL,symb.thesymb));
-    }
-}
-
-
-// SgStructStmt--inlines
-
-inline SgStructStmt::SgStructStmt():SgClassStmt(STRUCT_DECL)
-{}
-
-inline SgStructStmt::SgStructStmt(SgSymbol &name):SgClassStmt(name)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  BIF_CODE(thebif) = STRUCT_DECL;
-}
-
-inline SgStructStmt::~SgStructStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgUnionStmt--inlines
-// consider like a class.
-inline SgUnionStmt::SgUnionStmt():SgClassStmt(UNION_DECL)
-{}
-
-inline SgUnionStmt::SgUnionStmt(SgSymbol &name):SgClassStmt(name)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  BIF_CODE(thebif) = UNION_DECL;
-}
-
-inline SgUnionStmt::~SgUnionStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgEnumStmt--inlines
-// consider like a class.
-inline SgEnumStmt::SgEnumStmt():SgClassStmt(ENUM_DECL)
-{}
-
-inline SgEnumStmt::SgEnumStmt(SgSymbol &name):SgClassStmt(name)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  BIF_CODE(thebif) = ENUM_DECL;
-}
-
-inline SgEnumStmt::~SgEnumStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgCollectionStmt--inlines
-
-inline SgCollectionStmt::SgCollectionStmt():SgClassStmt(COLLECTION_DECL)
-{}
-
-inline SgCollectionStmt::SgCollectionStmt(SgSymbol &name):SgClassStmt(name)
-{ BIF_CODE(thebif) = COLLECTION_DECL; }
-
-inline SgCollectionStmt::~SgCollectionStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline SgStatement * SgCollectionStmt::firstElementMethod()
-{ return BfndMapping(LibfirstElementMethod(thebif)); }
-
-
-// SgBasicBlockStmt--inlines
-inline SgBasicBlockStmt::SgBasicBlockStmt(): SgStatement(BASIC_BLOCK)
-{}
-
-inline SgBasicBlockStmt::~SgBasicBlockStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgForStmt--inlines
-inline SgForStmt::SgForStmt(SgSymbol &do_var, SgExpression &start, SgExpression &end,
-                            SgExpression &step, SgStatement &body):SgStatement(FOR_NODE)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      BIF_SYMB(thebif) = do_var.thesymb;
-      BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(end.thellnd),start.thellnd,end.thellnd);
-      BIF_LL2(thebif) = step.thellnd;
-      insertBfndListIn(body.thebif,thebif,thebif);
-      addControlEndToStmt(thebif);
-    } else
-      {
-        SORRY;
-      }
-}
-
-inline SgForStmt::SgForStmt(SgSymbol *do_var, SgExpression *start, SgExpression *end,
-            SgExpression *step, SgStatement *body):SgStatement(FOR_NODE)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      if (do_var)
-        BIF_SYMB(thebif) = do_var->thesymb;
-      if (start && end)
-        BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(end->thellnd),start->thellnd,end->thellnd);
-      if (step)
-        BIF_LL2(thebif) = step->thellnd;
-      if (body)
-        insertBfndListIn(body->thebif,thebif,thebif);
-      addControlEndToStmt(thebif);
-    } else
-      {
-        SORRY;
-      }
-}
-
-inline SgForStmt::SgForStmt(SgSymbol &do_var, SgExpression &start, SgExpression &end
-                            , SgStatement &body):SgStatement(FOR_NODE)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      BIF_SYMB(thebif) = do_var.thesymb;
-      BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(end.thellnd),start.thellnd,end.thellnd);
-      BIF_LL2(thebif) = NULL;
-      insertBfndListIn(body.thebif,thebif,thebif);
-      addControlEndToStmt(thebif);
-    } else
-      {
-        SORRY;
-      }
-}
-// For C Statement;
-// added by Kolganov A.S. 24.10.2013
-inline SgForStmt::SgForStmt(SgExpression *start, SgExpression *end, SgExpression *step, SgStatement *body): SgStatement(FOR_NODE)
-{
-	if(start)
-		BIF_LL1(thebif) = start->thellnd;
-	if(end)
-        BIF_LL2(thebif) = end->thellnd;
-	if(step)
-        BIF_LL3(thebif) = step->thellnd;
-
-	if(body)
-		insertBfndListIn(body->thebif, thebif, thebif);
-    addControlEndToStmt(thebif);    
-}
-
-inline SgForStmt::SgForStmt(SgExpression &start, SgExpression &end,
-                            SgExpression &step, SgStatement &body):SgStatement(FOR_NODE)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(end.thellnd),start.thellnd,end.thellnd);
-      BIF_LL2(thebif) = step.thellnd;
-      insertBfndListIn(body.thebif,thebif,thebif);
-      addControlEndToStmt(thebif);
-    } else
-      {
-        BIF_LL1(thebif) = start.thellnd;
-        BIF_LL2(thebif) = end.thellnd;
-        BIF_LL3(thebif) = step.thellnd;
-        insertBfndListIn(body.thebif,thebif,thebif);
-        addControlEndToStmt(thebif);
-      }
-}
-
-inline void SgForStmt::setDoName(SgSymbol &doName)
-{ BIF_SYMB(thebif) = doName.thesymb; }  // sets the name of the loop (for F90.)
-
-#if __SPF
-inline SgSymbol* SgForStmt::doName()
-{
-    return symbol();
-}
-#else
-inline SgSymbol SgForStmt::doName()
-{
-    return SgSymbol(BIF_SYMB(thebif));   // the name of the loop (for F90.)
-}
-#endif
-
-inline SgExpression * SgForStmt::start()
-{       
-  SgExpression *x;
-
-  if (CurrentProject->Fortranlanguage())
-    {
-      if ((BIF_LL1(thebif) != LLNULL) &&
-          (NODE_CODE(BIF_LL1(thebif)) == DDOT))
-         x = LlndMapping(NODE_OPERAND0(BIF_LL1(thebif)));
-      else {
-        x = NULL;
-        SORRY;
-      }
-    } 
-  else
-      x = LlndMapping(BIF_LL1(thebif));
-
-  return x;
-}
-
-inline void SgForStmt::setStart(SgExpression &lbound)
-{
-
-  if (CurrentProject->Fortranlanguage())
-    {
-      if ((BIF_LL1(thebif) != LLNULL) &&
-          (NODE_CODE(BIF_LL1(thebif)) == DDOT))
-        {
-          NODE_OPERAND0(BIF_LL1(thebif)) =  lbound.thellnd;
-        }
-      else
-        {
-          BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(lbound.thellnd),lbound.thellnd,NULL);
-        }
-    }
-  else 
-    {
-      BIF_LL1(thebif) = lbound.thellnd;
-    }
-}
-
-inline SgExpression * SgForStmt::end()
-{
-  SgExpression *x;
-
-  if (CurrentProject->Fortranlanguage())
-    {
-      if ((BIF_LL1(thebif) != LLNULL) &&
-          (NODE_CODE(BIF_LL1(thebif)) == DDOT))
-        x = LlndMapping(NODE_OPERAND1(BIF_LL1(thebif)));
-      else {
-        x = NULL;
-        SORRY;
-      }
-    } 
-  else  /* BW, change contributed by Michael Golden */
-    {
-      if (BIF_LL2(thebif) == LLNULL)
-        x = NULL;
-      else
-        x = LlndMapping(BIF_LL2(thebif));
-    }
-  return x;
-}
-
-inline void SgForStmt::setEnd(SgExpression &ubound)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      if ((BIF_LL1(thebif) != LLNULL) &&
-          (NODE_CODE(BIF_LL1(thebif)) == DDOT))
-        NODE_OPERAND1(BIF_LL1(thebif)) =  ubound.thellnd;
-      else
-        {
-          BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(ubound.thellnd),NULL,ubound.thellnd);
-        }
-    }
-  else 
-    {
-      BIF_LL2(thebif) = ubound.thellnd;
-    }
-}
-
-
-inline SgLabel * SgForStmt::endOfLoop()
-    { return LabelMapping(BIF_LABEL_USE(thebif)); }
-
-inline SgExpression * SgForStmt::step()
-{
-  SgExpression *x;
-  if (CurrentProject->Fortranlanguage())
-    {
-      x = LlndMapping(BIF_LL2(thebif));
-    } 
-  else  /* BW, change contributed by Michael Golden */
-    {
-      if (BIF_LL3(thebif) == LLNULL)
-        x =  NULL;
-      else
-        x = LlndMapping(BIF_LL3(thebif));
-    }
-
-  return x;
-}
-
-inline void SgForStmt::setStep(SgExpression &step)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      BIF_LL2(thebif) = step.thellnd;
-    }
-  else
-    {
-      BIF_LL3(thebif) = step.thellnd;
-    }
-}
-
-//added by Kolganov A.S. 27.10.2020
-inline void SgForStmt::interchangeNestedLoops(SgForStmt* loop)
-{
-    std::swap(BIF_LL1(thebif), BIF_LL1(loop->thebif));
-    std::swap(BIF_LL2(thebif), BIF_LL2(loop->thebif));
-    std::swap(BIF_LL3(thebif), BIF_LL3(loop->thebif));
-    std::swap(BIF_SYMB(thebif), BIF_SYMB(loop->thebif));
-    std::swap(BIF_LABEL(thebif), BIF_LABEL(loop->thebif));
-}
-
-inline SgStatement * SgForStmt::body()
-{
-  PTR_BFND bif =NULL;
-  
-  if (BIF_BLOB1(thebif)) 
-    bif = BLOB_VALUE(BIF_BLOB1(thebif));
-            
-  return BfndMapping(bif);
-}
-
-// s is assumed to terminate with a
-//   control end statement.
-inline void SgForStmt::set_body(SgStatement &s)
-{
-  BIF_BLOB1(thebif) = NULL;
-  insertBfndListIn(s.thebif,thebif,thebif);
-}
-
-// False if the loop is not a prefect nest
-// else returns size of the loop nest
-
-inline int SgForStmt::isPerfectLoopNest()
-{ return LibperfectlyNested (thebif); }
-
-// returns inner nested loop
-inline SgStatement * SgForStmt::getNextLoop()
-{ return BfndMapping(LibgetNextNestedLoop (thebif)); }
-
-// returns outer nested loop
-inline SgStatement * SgForStmt::getPreviousLoop()
-{ return BfndMapping(LibgetPreviousNestedLoop (thebif));  }
-
-// returns innermost nested loop
-inline SgStatement * SgForStmt::getInnermostLoop()
-{ return BfndMapping(LibgetInnermostLoop (thebif)); }
-
-// TRUE if the loop ends with an Enddo
-inline int SgForStmt::isEnddoLoop()
-{ return LibisEnddoLoop (thebif); }
-
-// Convert the loop into a Good loop.
-inline int SgForStmt::convertLoop()
-{ return convertToEnddoLoop (thebif); }
-
-inline SgForStmt::~SgForStmt()
-{ RemoveFromTableBfnd((void *) this);}
-
-
-
-// SgProcessDoStmt--inlines
-inline SgProcessDoStmt::SgProcessDoStmt(SgSymbol &do_var, SgExpression &start,
-                                        SgExpression &end, SgExpression &step,
-                                        SgLabel &endofloop, SgStatement &body)
-                       :SgStatement(PROCESS_DO_STAT)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      BIF_SYMB(thebif) = do_var.thesymb;
-      BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(start.thellnd),start.thellnd,end.thellnd);
-      BIF_LL2(thebif) = step.thellnd;
-      BIF_LABEL_USE(thebif) = endofloop.thelabel;
-      insertBfndListIn(body.thebif,thebif,thebif);
-      addControlEndToStmt(thebif);
-    } else
-      {
-        SORRY;
-      }
-}
-
-inline SgProcessDoStmt::SgProcessDoStmt(SgSymbol &do_var, SgExpression &start,
-                                        SgExpression &end, SgLabel &endofloop,
-                                        SgStatement &body)
-                       :SgStatement(PROCESS_DO_STAT)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      BIF_SYMB(thebif) = do_var.thesymb;
-      BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(start.thellnd),start.thellnd,end.
-thellnd);
-      BIF_LABEL_USE(thebif) = endofloop.thelabel;
-      insertBfndListIn(body.thebif,thebif,thebif);
-      addControlEndToStmt(thebif);
-    } else
-      {
-        SORRY;
-      }
-}
-
-inline SgProcessDoStmt::SgProcessDoStmt(SgSymbol &do_var, SgExpression &start,
-                                        SgExpression &end, SgExpression &step,
-                                        SgStatement &body)
-                       :SgStatement(PROCESS_DO_STAT)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      BIF_SYMB(thebif) = do_var.thesymb;
-      BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(start.thellnd),start.thellnd,end.
-thellnd);
-      BIF_LL2(thebif) = step.thellnd;
-      insertBfndListIn(body.thebif,thebif,thebif);
-      addControlEndToStmt(thebif);
-    } else
-      {
-        SORRY;
-      }
-}
-
-inline SgProcessDoStmt::SgProcessDoStmt(SgSymbol &do_var, SgExpression &start,
-                                        SgExpression &end, SgStatement &body)
-                       :SgStatement(PROCESS_DO_STAT)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-      BIF_SYMB(thebif) = do_var.thesymb;
-      BIF_LL1(thebif) = newExpr(DDOT,NODE_TYPE(start.thellnd),start.thellnd,end.
-thellnd);
-      insertBfndListIn(body.thebif,thebif,thebif);
-      addControlEndToStmt(thebif);
-    } else
-      {
-        SORRY;
-      }
-}
-
-
-inline void SgProcessDoStmt::setDoName(SgSymbol &doName)
-{ BIF_SYMB(thebif) = doName.thesymb; }
-
-/*
-inline SgSymbol SgProcessDoStmt::doName() 
-{ return SgSymbol(BIF_SYMB(thebif)); } 
-*/
-
-inline SgExpression * SgProcessDoStmt::start()
-{       
-  SgExpression *x;
-
-  if (CurrentProject->Fortranlanguage())
-    {
-      if ((BIF_LL1(thebif) != LLNULL) &&
-          (NODE_CODE(BIF_LL1(thebif)) == DDOT))
-         x = LlndMapping(NODE_OPERAND0(BIF_LL1(thebif)));
-      else {
-        x = NULL;
-        SORRY;
-      }
-    } 
-  else {
-    x = NULL;
-    SORRY;
-  }
-
-  return x;
-}
-
-inline SgExpression * SgProcessDoStmt::end()
-{
-  SgExpression *x;
-
-  if (CurrentProject->Fortranlanguage())
-    {
-      if ((BIF_LL1(thebif) != LLNULL) &&
-          (NODE_CODE(BIF_LL1(thebif)) == DDOT))
-        x = LlndMapping(NODE_OPERAND1(BIF_LL1(thebif)));
-      else {
-        x = NULL;
-        SORRY;
-      }
-    } 
-  else {
-    x = NULL;
-    SORRY;
-    }
-
-  return x;
-}
-
-inline SgExpression * SgProcessDoStmt::step()
-{
-  SgExpression *x;
-  if (CurrentProject->Fortranlanguage())
-    {
-      x = LlndMapping(BIF_LL2(thebif));
-    } 
-  else {
-    x = NULL;
-    SORRY;
-    };
-
-  return x;
-}
-
-inline SgLabel * SgProcessDoStmt::endOfLoop()
-{ return LabelMapping(BIF_LABEL_USE(thebif)); }
-
-inline SgStatement * SgProcessDoStmt::body()
-{
-  PTR_BFND bif =NULL;
-  
-  if (BIF_BLOB1(thebif)) 
-    bif = BLOB_VALUE(BIF_BLOB1(thebif));
-            
-  return BfndMapping(bif);
-}
-
-// s is assumed to terminate with a
-//   control end statement.
-inline void SgProcessDoStmt::set_body(SgStatement &s)
-{
-  BIF_BLOB1(thebif) = NULL;
-  insertBfndListIn(s.thebif,thebif,thebif);
-}
-
-// False if the loop is not a prefect nest
-// else returns size of the loop nest
-
-inline int SgProcessDoStmt::isPerfectLoopNest()
-{ return LibperfectlyNested (thebif); }
-
-// returns inner nested loop
-inline SgStatement * SgProcessDoStmt::getNextLoop()
-{ return BfndMapping(LibgetNextNestedLoop (thebif)); }
-
-// returns outer nested loop
-inline SgStatement * SgProcessDoStmt::getPreviousLoop()
-{ return BfndMapping(LibgetPreviousNestedLoop (thebif));  }
-
-// returns innermost nested loop
-inline SgStatement * SgProcessDoStmt::getInnermostLoop()
-{ return BfndMapping(LibgetInnermostLoop (thebif)); }
-
-// TRUE if the loop ends with an Enddo
-inline int SgProcessDoStmt::isEnddoLoop()
-{ return LibisEnddoLoop (thebif); }
-
-// Convert the loop into a Good loop.
-inline int SgProcessDoStmt::convertLoop()
-{ return convertToEnddoLoop (thebif); }
-
-inline SgProcessDoStmt::~SgProcessDoStmt()
-{ RemoveFromTableBfnd((void *) this);}
-
-
-
-// SgWhileStmt--inlines
-
-inline SgWhileStmt::SgWhileStmt(int variant):SgStatement(variant)
-{}
-
-inline SgWhileStmt::SgWhileStmt(SgExpression &cond, SgStatement &body):SgStatement(WHILE_NODE)
-{
-  BIF_LL1(thebif) = cond.thellnd;
-  insertBfndListIn(body.thebif,thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-//added by A.S.Kolganov 08.04.2015
-inline SgWhileStmt::SgWhileStmt(SgExpression *cond, SgStatement *body) :SgStatement(WHILE_NODE)
-{
-    if (cond)
-        BIF_LL1(thebif) = cond->thellnd;
-    if (body)
-        insertBfndListIn(body->thebif, thebif, thebif);
-    addControlEndToStmt(thebif);
-}
-
-// the while test
-inline SgExpression * SgWhileStmt::conditional()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void SgWhileStmt::replaceBody(SgStatement &s)
-{
-  BIF_BLOB1(thebif) = NULL;
-  insertBfndListIn(s.thebif,thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-// added by A.V.Rakov 16.03.2015
-inline SgStatement * SgWhileStmt::body()
-{
-	PTR_BFND bif = NULL;
-
-	if (BIF_BLOB1(thebif))
-		bif = BLOB_VALUE(BIF_BLOB1(thebif));
-
-	return BfndMapping(bif);
-}
-
-inline SgWhileStmt::~SgWhileStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgDoWhileStmt--inlines
-
-inline SgDoWhileStmt::SgDoWhileStmt(SgExpression &cond, SgStatement &body): SgWhileStmt(DO_WHILE_NODE)
-{
-  BIF_LL1(thebif) = cond.thellnd;
-  insertBfndListIn(body.thebif,thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-inline SgDoWhileStmt::~SgDoWhileStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline SgLabel *SgWhileStmt::endOfLoop( )
-{ 
-	return LabelMapping(BIF_LABEL_USE(thebif)); 
-}
-
-// SgLofIfStmt--inlines
-
-inline SgLogIfStmt::SgLogIfStmt(int variant):SgStatement(variant)
-{}
-
-inline SgLogIfStmt::SgLogIfStmt(SgExpression &cond, SgStatement &s):SgStatement(LOGIF_NODE)
-{
-  BIF_LL1(thebif) = cond.thellnd;
-  insertBfndListIn(s.thebif,thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-inline SgStatement * SgLogIfStmt::body()
-{
-  PTR_BFND bif =NULL;
-  if (BIF_BLOB1(thebif))
-    bif = BLOB_VALUE(BIF_BLOB1(thebif));
-  return BfndMapping(bif);
-}
-
-inline SgExpression * SgLogIfStmt::conditional()
-{  return LlndMapping(BIF_LL1(thebif)); }  // the while test
-
-// check if the statement s is a single statement. 
-inline void SgLogIfStmt::setBody(SgStatement &s)
-{
-  BIF_BLOB1(thebif) = NULL;
-  insertBfndListIn(s.thebif,thebif,thebif);
-}
-
-// this code won't work, since after the addition false
-//   clause, it should become SgIfThenElse statement.
-inline void SgLogIfStmt::addFalseClause(SgStatement &s)
-{
-  appendBfndListToList2(s.thebif,thebif);
-  addControlEndToList2(thebif);
-}
-
-//need a forward definition;
-SgIfStmt * isSgIfStmt (SgStatement *pt);
-
-inline SgIfStmt *SgLogIfStmt::convertLogicIf()
-{
-  LibconvertLogicIf(thebif);
-  return isSgIfStmt(this);
-}
-
-inline SgLogIfStmt::~SgLogIfStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgIfStmt--inlines
-inline SgIfStmt::SgIfStmt(int variant): SgStatement(variant)
-{}
-
-// added by A.S.Kolganov 02.07.2014
-inline SgIfStmt::SgIfStmt(SgExpression &cond, SgStatement &body, int t) : SgStatement(IF_NODE)
-{
-	BIF_LL1(thebif) = cond.thellnd;
-	if (t == 0) // only false body
-		appendBfndListToList2(body.thebif, thebif);
-	else if (t == 1) // only true body
-		insertBfndListIn(body.thebif, thebif, thebif);
-	addControlEndToStmt(thebif);
-}
-// added by A.S.Kolganov 21.12.2014
-inline SgIfStmt::SgIfStmt(SgExpression &cond) : SgStatement(IF_NODE)
-{
-    BIF_LL1(thebif) = cond.thellnd;
-    addControlEndToStmt(thebif);
-}
-
-inline SgIfStmt::SgIfStmt(SgExpression* cond) : SgStatement(IF_NODE)
-{
-    if (cond)
-        BIF_LL1(thebif) = cond->thellnd;
-    addControlEndToStmt(thebif);
-}
-
-inline SgIfStmt::SgIfStmt(SgExpression &cond, SgStatement &trueBody, SgStatement &falseBody, SgSymbol &construct_name):SgStatement(IF_NODE)
-{
-  BIF_LL1(thebif) = cond.thellnd;
-  BIF_SYMB(thebif) = construct_name.thesymb;
-  insertBfndListIn(trueBody.thebif,thebif,thebif);
-  appendBfndListToList2(falseBody.thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-inline SgIfStmt::SgIfStmt(SgExpression &cond, SgStatement &trueBody, SgStatement &falseBody):SgStatement(IF_NODE)
-{
-  BIF_LL1(thebif) = cond.thellnd;
-  insertBfndListIn(trueBody.thebif,thebif,thebif);
-  appendBfndListToList2(falseBody.thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-inline void SgIfStmt::setBodies(SgStatement *trueBody, SgStatement *falseBody)
-{
-    if (trueBody && falseBody)
-    {
-        insertBfndListIn(trueBody->thebif, thebif, thebif);
-        appendBfndListToList2(falseBody->thebif, thebif);
-        addControlEndToStmt(thebif);
-    }
-    else if (trueBody)
-    {        
-        insertBfndListIn(trueBody->thebif, thebif, thebif);
-        addControlEndToStmt(thebif);
-    }
-}
-
-inline SgIfStmt::SgIfStmt(SgExpression &cond, SgStatement &trueBody):SgStatement(IF_NODE)
-{
-  BIF_LL1(thebif) = cond.thellnd;
-  insertBfndListIn(trueBody.thebif,thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-// the first stmt in the True clause
-inline SgStatement * SgIfStmt::trueBody()
-{
-  PTR_BFND bif = NULL;
-  if (BIF_BLOB1(thebif))
-    bif = BLOB_VALUE(BIF_BLOB1(thebif));
-  return BfndMapping(bif);
-}
-
-// SgBlock is needed? 
-// i-th stmt in True clause
-inline SgStatement * SgIfStmt::trueBody(int i)
-{
-  PTR_BFND bif =NULL;
-  if (BIF_BLOB1(thebif))
-    bif = BLOB_VALUE(BIF_BLOB1(thebif));
-  return BfndMapping(getStatementNumber(bif,i));
-}
-
-// the first stmt in the False
-inline SgStatement * SgIfStmt::falseBody()
-{
-  PTR_BFND bif = NULL;
-  if (BIF_BLOB2(thebif))
-    bif = BLOB_VALUE(BIF_BLOB2(thebif));
-  return BfndMapping(bif);
-}
-
-// i-th statement of the body.
-inline SgStatement * SgIfStmt::falseBody(int i)
-{
-  PTR_BFND bif =NULL;
-  if (BIF_BLOB2(thebif))
-    bif = BLOB_VALUE(BIF_BLOB2(thebif));
-  return BfndMapping(getStatementNumber(bif,i));
-}
-
-// the while test
-inline SgExpression * SgIfStmt::conditional()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline SgSymbol * SgIfStmt::construct_name()
-{ return SymbMapping(BIF_SYMB(thebif)); }
-
-// new body=s and lex successors.
-inline void SgIfStmt::replaceTrueBody(SgStatement &s)
-{
-  BIF_BLOB1(thebif) = NULL;
-  insertBfndListIn(s.thebif,thebif,thebif);
-}
-
-// new body=s and lex successors.
-inline void SgIfStmt::replaceFalseBody(SgStatement &s)
-{
-  BIF_BLOB2(thebif) = NULL;
-  appendBfndListToList2(s.thebif,thebif);
-  addControlEndToList2(thebif);
-}
-
-inline SgIfStmt::~SgIfStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgArithIfStmt--inlines
-
-inline SgArithIfStmt::SgArithIfStmt(int variant):SgStatement(variant)
-{}
-
-inline SgArithIfStmt::SgArithIfStmt(SgExpression &cond, SgLabel &llabel, SgLabel &elabel, SgLabel &glabel):SgStatement(ARITHIF_NODE)
-{
-  BIF_LL1(thebif) = cond.thellnd;
-  BIF_LL2(thebif) = addLabelRefToExprList(BIF_LL2(thebif),llabel.thelabel);
-  BIF_LL2(thebif) = addLabelRefToExprList(BIF_LL2(thebif),elabel.thelabel);
-  BIF_LL2(thebif) = addLabelRefToExprList(BIF_LL2(thebif),glabel.thelabel);
-}
-
-inline SgExpression * SgArithIfStmt::conditional()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void SgArithIfStmt::set_conditional(SgExpression &cond)
-{ BIF_LL1(thebif) = cond.thellnd; }
-
-// the <, ==, and > goto labels. in order 0->2.
-inline SgExpression * SgArithIfStmt::label(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif),i)); }
-
-#ifdef NOT_YET_IMPLEMENTED
-inline void SgArithIfStmt::setLabel(SgLabel &label)
-{
-  BIF_LL3(thebif) = addLabelRefToExprList(BIF_LL3(thebif) , label.thelabel);
-  SORRY;
-}
-#endif
-
-inline SgArithIfStmt::~SgArithIfStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgWhereStmt--inlines
-
-inline SgWhereStmt::SgWhereStmt(SgExpression &cond, SgStatement &body):SgLogIfStmt(WHERE_NODE)
-{
-  BIF_LL1(thebif) = cond.thellnd;
-  insertBfndListIn(body.thebif,thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-inline SgWhereStmt::~SgWhereStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgWhereBlockStmt--inlines
-
-inline SgWhereBlockStmt::SgWhereBlockStmt(SgExpression &cond, SgStatement &trueBody, SgStatement &falseBody):SgIfStmt(WHERE_BLOCK_STMT)
-{
-  BIF_LL1(thebif) = cond.thellnd;
-  insertBfndListIn(trueBody.thebif,thebif,thebif);
-  appendBfndListToList2(falseBody.thebif,thebif);
-  // appendBfndListToList2 does not update BIF_ NEXT...
-    addControlEndToList2(thebif);
-}
-
-inline SgWhereBlockStmt::~SgWhereBlockStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgSwitchStmt--inlines
-
-inline SgSwitchStmt::SgSwitchStmt(SgExpression &selector, SgStatement &caseOptionList,
-                                  SgSymbol &constructName):SgStatement(SWITCH_NODE)
-{
-  BIF_SYMB(thebif) = constructName.thesymb;
-  BIF_LL1(thebif) = selector.thellnd;
-  insertBfndListIn(caseOptionList.thebif,thebif,thebif);
-}
-
-// added by A.V.Rakov 16.03.2015
-inline SgSwitchStmt::SgSwitchStmt(SgExpression &selector, SgStatement &caseOptionList) :SgStatement(SWITCH_NODE)
-{
-	BIF_LL1(thebif) = selector.thellnd;
-	insertBfndListIn(caseOptionList.thebif, thebif, thebif);
-}
-
-// added by A.S. Kolganov 14.04.2015
-inline SgSwitchStmt::SgSwitchStmt(SgExpression &selector) :SgStatement(SWITCH_NODE)
-{
-    BIF_LL1(thebif) = selector.thellnd;
-}
-
-inline SgSwitchStmt::~SgSwitchStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline SgExpression * SgSwitchStmt::selector()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void  SgSwitchStmt::setSelector(SgExpression &cond)
-{ BIF_LL1(thebif) = cond.thellnd; }
-
-// the number of cases
-inline int SgSwitchStmt::numberOfCaseOptions()
-{ return countInStmtNode1(thebif,CASE_NODE); }
-
-// i-th case block
-inline SgStatement * SgSwitchStmt::caseOption(int i)
-{ return BfndMapping(GetcountInStmtNode1(thebif,CASE_NODE,i)); }
-
-// added by A.V.Rakov 16.03.2015
-inline SgStatement * SgSwitchStmt::defOption()
-{ return BfndMapping(GetcountInStmtNode1(thebif, DEFAULT_NODE, 0)); }
-inline void SgSwitchStmt::addCaseOption(SgStatement &caseOption)
-{ insertBfndListIn(caseOption.thebif,thebif,thebif); }
-
-#if 0 
-// extractBifSectionBetween not defined
-inline void  SgSwitchStmt::deleteCaseOption(int i)
-{
-  PTR_BFND pt;
-  if ( pt = GetcountInStmtNode1(thebif,CASE_NODE,i))
-    extractBifSectionBetween(pt,getLastNodeOfStmt(pt));
-}
-#endif
-
-
-// SgCaseOptionStmt--inlines
-
-inline SgCaseOptionStmt::SgCaseOptionStmt(SgExpression &caseRangeList, SgStatement &body) : SgStatement(CASE_NODE)
-{
-  BIF_LL1(thebif) = caseRangeList.thellnd;
-  insertBfndListIn(body.thebif, thebif, thebif);
-  addControlEndToStmt(thebif);
-}
-
-inline SgCaseOptionStmt::SgCaseOptionStmt(SgExpression &caseRangeList, SgStatement &body, 
-                                          SgSymbol &constructName):SgStatement(CASE_NODE)
-{
-  BIF_SYMB(thebif) = constructName.thesymb;
-  BIF_LL1(thebif) = caseRangeList.thellnd;
-  insertBfndListIn(body.thebif,thebif,thebif);
-  addControlEndToStmt(thebif);
-}
-
-inline SgCaseOptionStmt::SgCaseOptionStmt(SgExpression &caseRangeList) :SgStatement(CASE_NODE)
-{
-	BIF_LL1(thebif) = caseRangeList.thellnd;
-	addControlEndToStmt(thebif);
-}
-
-inline SgCaseOptionStmt::~SgCaseOptionStmt()
-{ RemoveFromTableBfnd((void *) this);}
-
-inline SgExpression * SgCaseOptionStmt::caseRangeList()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void SgCaseOptionStmt::setCaseRangeList(SgExpression &caseRangeList)
-{ BIF_LL1(thebif) = caseRangeList.thellnd; }
-
-inline SgExpression * SgCaseOptionStmt::caseRange(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif),i));}
-
-inline void SgCaseOptionStmt::setCaseRange(int, SgExpression &caseRange)
-{ 
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),caseRange.thellnd); 
-}
-
-inline SgStatement * SgCaseOptionStmt::body()
-{
-  PTR_BFND bif =NULL;
-  if (BIF_BLOB1(thebif))
-    bif = BLOB_VALUE(BIF_BLOB1(thebif));
-  return BfndMapping(bif);
-}
-
-inline void SgCaseOptionStmt::setBody(SgStatement &body)
-{
-  BIF_BLOB1(thebif) = NULL;
-  insertBfndListIn(body.thebif,thebif,thebif);
-}
-
-
-// ******************** Leaf Executable Nodes ***********************
-
-// SgExecutableStatement--inlines
-
-inline SgExecutableStatement::SgExecutableStatement(int variant):SgStatement(variant)
-{}
-
-// SgAssignStmt--inlines
-
-inline SgAssignStmt::SgAssignStmt(int variant):SgExecutableStatement(variant)
-{}
-inline SgAssignStmt::SgAssignStmt(SgExpression &lhs, SgExpression &rhs):SgExecutableStatement(ASSIGN_STAT)
-{
-  BIF_LL1(thebif) = lhs.thellnd;
-  BIF_LL2(thebif) = rhs.thellnd;
-}
-
-inline SgExpression * SgAssignStmt::lhs()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-// the right hand side
-inline SgExpression * SgAssignStmt::rhs()
-{ return LlndMapping(BIF_LL2(thebif)); }
-
-// replace lhs with e
-inline void SgAssignStmt::replaceLhs(SgExpression &e)
-{ BIF_LL1(thebif) = e.thellnd; }
-
-// replace rhs with e
-inline void SgAssignStmt::replaceRhs(SgExpression &e)
-{ BIF_LL2(thebif) = e.thellnd; }
-
-
-// SgCExpStmt--inlines
-inline SgCExpStmt::SgCExpStmt(SgExpression &exp):SgExecutableStatement(EXPR_STMT_NODE)
-{ BIF_LL1(thebif) = exp.thellnd; }
-
-inline SgCExpStmt::SgCExpStmt(SgExpression &lhs, SgExpression &rhs):SgExecutableStatement(EXPR_STMT_NODE)
-{ BIF_LL1(thebif) =addToExprList(BIF_LL1(thebif),newExpr(ASSGN_OP,NULL,lhs.thellnd,rhs.thellnd)); }
-
-// the expression
-inline SgExpression *SgCExpStmt::expr()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-// replace exp with e
-inline void SgCExpStmt::replaceExpression(SgExpression &e)
-{ BIF_LL1(thebif) = e.thellnd; }
-
-inline SgCExpStmt::~SgCExpStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgPointerAssignStmt--inlines
-
-inline SgPointerAssignStmt::SgPointerAssignStmt(SgExpression lhs, SgExpression rhs):SgAssignStmt(POINTER_ASSIGN_STAT)
-{
-  BIF_LL1(thebif) = lhs.thellnd;
-  BIF_LL2(thebif) = rhs.thellnd;
-}
-
-inline SgPointerAssignStmt::~SgPointerAssignStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgHeapStmt--inlines
-
-inline SgHeapStmt::SgHeapStmt(int variant, SgExpression &allocationList, SgExpression &statVariable):SgExecutableStatement(variant)
-{
-  BIF_LL1(thebif) = allocationList.thellnd;
-  BIF_LL2(thebif) = statVariable.thellnd;
-}
-
-inline SgHeapStmt::~SgHeapStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline SgExpression * SgHeapStmt::allocationList()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void SgHeapStmt::setAllocationList(SgExpression &allocationList)
-{ BIF_LL1(thebif) = allocationList.thellnd;}
-
-inline SgExpression * SgHeapStmt::statVariable()
-{ return LlndMapping(BIF_LL2(thebif)); }
-
-inline void SgHeapStmt::setStatVariable(SgExpression &statVar)
-{ BIF_LL2(thebif) = statVar.thellnd; }
-
-
-// SgNullifyStmt--inlines
-
-inline SgNullifyStmt::SgNullifyStmt(SgExpression &objectList):SgExecutableStatement(NULLIFY_STMT)
-{ BIF_LL1(thebif) = objectList.thellnd; }
-
-inline SgNullifyStmt::~SgNullifyStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline SgExpression * SgNullifyStmt::nullifyList()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void SgNullifyStmt::setNullifyList(SgExpression &nullifyList)
-{ BIF_LL1(thebif) = nullifyList.thellnd; }
-
-
-// SgContinueStmt--inlines
-
-inline SgContinueStmt::SgContinueStmt():SgExecutableStatement(CONT_STAT)
-{}
-inline SgContinueStmt::~SgContinueStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgControlEndStmt--inlines
-
-inline SgControlEndStmt::SgControlEndStmt(int variant):SgExecutableStatement(variant)
-{}
-
-inline SgControlEndStmt::SgControlEndStmt():SgExecutableStatement(CONTROL_END)
-{}
-
-inline SgControlEndStmt::~SgControlEndStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgBreakStmt--inlines
-
-inline SgBreakStmt::SgBreakStmt():SgExecutableStatement(BREAK_NODE)
-{}
-
-inline SgBreakStmt::~SgBreakStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgCycleStmt--inlines
-
-
-inline SgCycleStmt::SgCycleStmt(SgSymbol &symbol):SgExecutableStatement(CYCLE_STMT)
-{ BIF_SYMB(thebif) = symbol.thesymb; }
-
-// added by A.S. Kolganov 20.12.2015
-inline SgCycleStmt::SgCycleStmt():SgExecutableStatement(CYCLE_STMT)
-{ }
-
-// the name of the loop to cycle
-inline SgSymbol * SgCycleStmt::constructName()
-{ return SymbMapping(BIF_SYMB(thebif)); }
-
-inline void SgCycleStmt::setConstructName(SgSymbol &constructName)
-{ BIF_SYMB(thebif) = constructName.thesymb; }
-
-inline SgCycleStmt::~SgCycleStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-inline SgExpression * SgReturnStmt::returnValue()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void SgReturnStmt::setReturnValue(SgExpression &retVal)
-{ BIF_LL1(thebif) = retVal.thellnd; }
-
-inline SgReturnStmt::~SgReturnStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgExitStmt--inlines
-
-inline SgExitStmt::SgExitStmt(SgSymbol &construct_name):SgControlEndStmt(EXIT_STMT)
-{ BIF_SYMB(thebif) = construct_name.thesymb; }
-
-inline SgExitStmt::~SgExitStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline SgSymbol * SgExitStmt::constructName()
-{ return SymbMapping(BIF_SYMB(thebif)); }  // the name of the loop to cycle
-
-inline void SgExitStmt::setConstructName(SgSymbol &constructName)
-{ BIF_SYMB(thebif) = constructName.thesymb; }
-
-
-
-// SgGotoStmt--inlines
-inline SgGotoStmt::SgGotoStmt(SgLabel &label):SgExecutableStatement(GOTO_NODE)
-{ BIF_LL3(thebif) = SgLabelRefExp(label).thellnd; }
-/* Tried to fix a bug reported by anl's people.
-   The following line is the original code.
-{ BIF_LABEL(thebif) = label.thelabel; }
-*/
-
-
-inline SgLabel * SgGotoStmt::branchLabel()
-{ SgLabelRefExp *e =  (SgLabelRefExp *) LlndMapping(BIF_LL3(thebif));
-  return (e)?e->label(): (SgLabel *) NULL;
- }
-	
-
-inline SgGotoStmt::~SgGotoStmt(){RemoveFromTableBfnd((void *) this);}
-
-
-// SgLabelListStmt--inlines
-
-inline SgLabelListStmt::SgLabelListStmt(int variant):SgExecutableStatement(variant)
-{}
-
-inline int SgLabelListStmt::numberOfTargets()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-inline SgExpression * SgLabelListStmt::labelList()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void SgLabelListStmt::setLabelList(SgExpression &labelList)
-{ BIF_LL1(thebif) = labelList.thellnd; }
-
-
-
-// SgAssignedGotoStmt--inlines
-
-inline SgAssignedGotoStmt::SgAssignedGotoStmt(SgSymbol &symbol, SgExpression &labelList):SgLabelListStmt(ASSGOTO_NODE)
-{
-  BIF_SYMB(thebif) = symbol.thesymb;
-  BIF_LL1(thebif) = labelList.thellnd;
-}
-
-inline SgSymbol * SgAssignedGotoStmt::symbol()
-{ return SymbMapping(BIF_SYMB(thebif)); }
-
-inline void SgAssignedGotoStmt::setSymbol(SgSymbol &symb)
-{ BIF_SYMB(thebif) = symb.thesymb; }
-
-inline SgAssignedGotoStmt::~SgAssignedGotoStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgComputedGotoStmt--inlines
-
-inline SgComputedGotoStmt::SgComputedGotoStmt(SgExpression &expr, SgLabel &label):SgLabelListStmt(COMGOTO_NODE)
-{
-  BIF_LL1(thebif) = addLabelRefToExprList(BIF_LL1(thebif),label.thelabel);
-  BIF_LL2(thebif) = expr.thellnd;
-}
-
-inline void SgComputedGotoStmt::addLabel(SgLabel &label)
-{
-  BIF_LL1(thebif) = addLabelRefToExprList(BIF_LL1(thebif),label.thelabel); 
-}
-
-inline SgExpression * SgComputedGotoStmt::exp()
-{ return LlndMapping(BIF_LL2(thebif)); }
-
-inline void SgComputedGotoStmt::setExp(SgExpression &exp)
-{ BIF_LL2(thebif) = exp.thellnd; }
-
-inline SgComputedGotoStmt::~SgComputedGotoStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgStopOrPauseStmt--inlines
-
-inline SgStopOrPauseStmt::SgStopOrPauseStmt(int variant, SgExpression *expr):SgExecutableStatement(variant)
-{ 
-if (expr)
-  BIF_LL1(thebif) = expr->thellnd;
- }
-
-inline SgExpression * SgStopOrPauseStmt::exp()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void SgStopOrPauseStmt::setExp(SgExpression &exp)
-{ BIF_LL1(thebif) = exp.thellnd; }
-
-inline SgStopOrPauseStmt::~SgStopOrPauseStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgCallStmt--inlines
-
-inline SgCallStmt::SgCallStmt(SgSymbol &name, SgExpression &args):SgExecutableStatement(PROC_STAT)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  BIF_LL1(thebif) = args.thellnd;
-}
-
-inline SgCallStmt::SgCallStmt(SgSymbol &name):SgExecutableStatement(PROC_STAT)
-{ BIF_SYMB(thebif) = name.thesymb; }
-
-// name of subroutine being called
-inline SgSymbol * SgCallStmt::name()
-{ return SymbMapping(BIF_SYMB(thebif)); }
-
-// the number of arguement expressions
-inline int SgCallStmt::numberOfArgs()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-inline void SgCallStmt::addArg(SgExpression &arg)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg.thellnd); }
-
-// the i-th argument expression
-inline SgExpression * SgCallStmt::arg(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif), i)); }
-
-inline SgCallStmt::~SgCallStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgProsCallStmt--inlines
- 
-inline SgProsCallStmt::SgProsCallStmt(SgSymbol &name, SgExprListExp &args):SgExecutableStatement(PROS_STAT)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  BIF_LL1(thebif) = args.thellnd;
-}
- 
-inline SgProsCallStmt::SgProsCallStmt(SgSymbol &name):SgExecutableStatement(PROS_STAT)
-{ BIF_SYMB(thebif) = name.thesymb; }
-
-// name of process being called
-inline SgSymbol * SgProsCallStmt::name()
-{ return SymbMapping(BIF_SYMB(thebif)); }
- 
-// the number of arguement expressions
-inline int SgProsCallStmt::numberOfArgs()
-{ return exprListLength(BIF_LL1(thebif)); }
- 
-inline void SgProsCallStmt::addArg(SgExpression &arg)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg.thellnd); }
-
-inline SgExprListExp *SgProsCallStmt::args()
-{ return (SgExprListExp *) LlndMapping(BIF_LL1(thebif)); }
- 
-// the i-th argument expression
-inline SgExpression * SgProsCallStmt::arg(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif), i)); }
- 
-inline SgProsCallStmt::~SgProsCallStmt()
-{ RemoveFromTableBfnd((void *) this); }
- 
- 
- 
-// SgProsCallLctn--inlines
- 
-inline SgProsCallLctn::SgProsCallLctn(SgSymbol &name, SgExprListExp &args,
-                                      SgExprListExp &lctn)
-                      :SgExecutableStatement(PROS_STAT_LCTN)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  BIF_LL1(thebif) = args.thellnd;
-  BIF_LL2(thebif) = lctn.thellnd;
-}
- 
-inline SgProsCallLctn::SgProsCallLctn(SgSymbol &name, SgExprListExp &lctn)
-                      :SgExecutableStatement(PROS_STAT_LCTN)
-{
-   BIF_SYMB(thebif) = name.thesymb;
-   BIF_LL2(thebif) = lctn.thellnd;
-}
- 
-// name of process being called
-inline SgSymbol * SgProsCallLctn::name()
-{ return SymbMapping(BIF_SYMB(thebif)); }
- 
-// the number of arguement expressions
-inline int SgProsCallLctn::numberOfArgs()
-{ return exprListLength(BIF_LL1(thebif)); }
- 
-inline void SgProsCallLctn::addArg(SgExpression &arg)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg.thellnd); }
- 
-inline SgExprListExp *SgProsCallLctn::args()
-{ return (SgExprListExp *) LlndMapping(BIF_LL1(thebif)); }
- 
-// the i-th argument expression
-inline SgExpression * SgProsCallLctn::arg(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif), i)); }
- 
-inline SgExpression * SgProsCallLctn::location()
-{ return LlndMapping(BIF_LL2(thebif)); }
-
-inline SgProsCallLctn::~SgProsCallLctn()
-{ RemoveFromTableBfnd((void *) this); }
- 
- 
-
-// SgProsCallSubm--inlines
- 
-inline SgProsCallSubm::SgProsCallSubm(SgSymbol &name, SgExprListExp &args,
-                                      SgExprListExp &subm)
-                      :SgExecutableStatement(PROS_STAT_SUBM)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  BIF_LL1(thebif) = args.thellnd;
-  BIF_LL2(thebif) = subm.thellnd;
-}
- 
-inline SgProsCallSubm::SgProsCallSubm(SgSymbol &name, SgExprListExp &subm)
-                      :SgExecutableStatement(PROS_STAT_SUBM)
-{
-   BIF_SYMB(thebif) = name.thesymb;
-   BIF_LL2(thebif) = subm.thellnd;
-}
- 
-// name of process being called
-inline SgSymbol * SgProsCallSubm::name()
-{ return SymbMapping(BIF_SYMB(thebif)); }
- 
-// the number of arguement expressions
-inline int SgProsCallSubm::numberOfArgs()
-{ return exprListLength(BIF_LL1(thebif)); }
- 
-inline void SgProsCallSubm::addArg(SgExpression &arg)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg.thellnd); }
- 
-inline SgExprListExp *SgProsCallSubm::args()
-{ return (SgExprListExp *) LlndMapping(BIF_LL1(thebif)); }
- 
-// the i-th argument expression
-inline SgExpression * SgProsCallSubm::arg(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif), i)); }
-
-inline SgExpression * SgProsCallSubm::submachine()
-{ return LlndMapping(BIF_LL2(thebif)); }
- 
-inline SgProsCallSubm::~SgProsCallSubm()
-{ RemoveFromTableBfnd((void *) this); }
- 
- 
-
-// SgProcessesStmt--inlines
-
-inline SgProcessesStmt::SgProcessesStmt():SgStatement(PROCESSES_STAT)
-{}
-
-inline SgProcessesStmt::~SgProcessesStmt()
-{ RemoveFromTableBfnd((void *) this); }
- 
-
-
-// SgEndProcessesStmt--inlines
- 
-inline SgEndProcessesStmt::SgEndProcessesStmt():SgStatement(PROCESSES_END)
-{}
- 
-inline SgEndProcessesStmt::~SgEndProcessesStmt()
-{ RemoveFromTableBfnd((void *) this); }
- 
- 
-
-// SgInportStmt--inlines
-
-inline SgInportStmt::SgInportStmt(SgExprListExp &name):SgStatement(INPORT_DECL)
-{ BIF_LL1(thebif) = name.thellnd; }
-
-inline SgInportStmt::SgInportStmt(SgExprListExp &name, SgPortTypeExp &porttype)
-                    :SgStatement(INPORT_DECL)
-{
-  BIF_LL1(thebif) = name.thellnd;
-  BIF_LL2(thebif) = porttype.thellnd;
-}
-
-inline SgInportStmt::~SgInportStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline void SgInportStmt::addname(SgExpression &name)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), name.thellnd); }
-
-inline int SgInportStmt::numberOfNames()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-inline SgExprListExp * SgInportStmt::names()
-{ return (SgExprListExp *) LlndMapping(BIF_LL1(thebif)); }
-
-inline SgExpression *SgInportStmt::name(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif),i)); }
-
-inline void SgInportStmt::addporttype(SgExpression &porttype)
-{ BIF_LL2(thebif) = addToList(BIF_LL2(thebif), porttype.thellnd); }
-
-inline int SgInportStmt::numberOfPortTypes()
-{ return exprListLength(BIF_LL2(thebif)); }
-
-inline SgPortTypeExp * SgInportStmt::porttypes()
-{ return (SgPortTypeExp *) LlndMapping(BIF_LL2(thebif)); }
-
-inline SgPortTypeExp * SgInportStmt::porttype(int i)
-{ return (SgPortTypeExp *) LlndMapping(getPositionInList(BIF_LL2(thebif),i)); }
-
-
-
-// SgOutportStmt--inlines
- 
-inline SgOutportStmt::SgOutportStmt(SgExprListExp &name)
-                     :SgStatement(OUTPORT_DECL)
-{ BIF_LL1(thebif) = name.thellnd; }
- 
-inline SgOutportStmt::SgOutportStmt(SgExprListExp &name,
-                                    SgPortTypeExp &porttype)
-                    :SgStatement(OUTPORT_DECL)
-{
-  BIF_LL1(thebif) = name.thellnd;
-  BIF_LL2(thebif) = porttype.thellnd;
-}
- 
-inline SgOutportStmt::~SgOutportStmt()
-{ RemoveFromTableBfnd((void *) this); }
- 
-inline void SgOutportStmt::addname(SgExpression &name)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), name.thellnd); }
- 
-inline int SgOutportStmt::numberOfNames()
-{ return exprListLength(BIF_LL1(thebif)); }
- 
-inline SgExprListExp * SgOutportStmt::names()
-{ return (SgExprListExp *) LlndMapping(BIF_LL1(thebif)); }
- 
-inline SgExpression *SgOutportStmt::name(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif),i)); }
-
-inline void SgOutportStmt::addporttype(SgExpression &porttype)
-{ BIF_LL2(thebif) = addToList(BIF_LL2(thebif), porttype.thellnd); }
- 
-inline int SgOutportStmt::numberOfPortTypes()
-{ return exprListLength(BIF_LL2(thebif)); }
- 
-inline SgPortTypeExp * SgOutportStmt::porttypes()
-{ return (SgPortTypeExp *) LlndMapping(BIF_LL2(thebif)); }
- 
-inline SgPortTypeExp * SgOutportStmt::porttype(int i)
-{ return (SgPortTypeExp *) LlndMapping(getPositionInList(BIF_LL2(thebif),i)); }
-
- 
-
-// SgChannelStmt--inlines
-
-inline SgChannelStmt::SgChannelStmt(SgExpression &outport, SgExpression &inport)
-                     :SgStatement(CHANNEL_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), inport.thellnd);
-}
- 
-
-inline SgChannelStmt::SgChannelStmt(SgExpression &outport, SgExpression &inport,
-                                    SgExpression &io_or_err)
-                     :SgStatement(CHANNEL_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), inport.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), io_or_err.thellnd);
-}
- 
-
-inline SgChannelStmt::SgChannelStmt(SgExpression &outport, SgExpression &inport,
-                                  SgExpression &iostore, SgExpression &errlabel)
-                     :SgStatement(CHANNEL_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), inport.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd);
-}
- 
-
-inline SgChannelStmt::~SgChannelStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-inline SgExpression * SgChannelStmt::outport()
-{ return LlndMapping(getPositionInList(BIF_LL1(thebif),0)); }
-
-
-inline SgExpression * SgChannelStmt::inport()
-{ return LlndMapping(getPositionInList(BIF_LL1(thebif),1)); }
-
-
-inline SgExpression * SgChannelStmt::ioStore()
-{
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),2);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != IOSTAT_STORE) // must be ERR_LABEL
-      return (SgExpression *) NULL;
-    else
-      return  LlndMapping(ll);
-}
-
-
-inline SgExpression * SgChannelStmt::errLabel()
-{
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),2);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != ERR_LABEL) { // must be IOSTAT_STORE
-      ll = NODE_OPERAND1(ll);
-      if ((!ll) || (NODE_CODE(ll) != ERR_LABEL))
-        return (SgExpression *) NULL;
-      else
-        return LlndMapping(ll);
-    } else
-      return  LlndMapping(ll);
-}
-
-
-
-// SgMergerStmt--inlines
-
-inline SgMergerStmt::SgMergerStmt(SgExpression &outport, SgExpression &inport):
-                    SgStatement(MERGER_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), inport.thellnd);
-}
-
-
-inline SgMergerStmt::SgMergerStmt(SgExpression &outport, SgExpression &inport,
-                                SgExpression &io_or_err)
-                   :SgStatement(MERGER_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), inport.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), io_or_err.thellnd);
-}
-
-
-inline SgMergerStmt::SgMergerStmt(SgExpression &outport, SgExpression &inport,
-                                SgExpression &iostore, SgExpression &errlabel):
-                   SgStatement(MERGER_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), inport.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd);
-}
-
-
-inline SgMergerStmt::~SgMergerStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-inline void SgMergerStmt::addOutport(SgExpression &outport)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), outport.thellnd); }
-  
-
-inline void SgMergerStmt::addIoStore(SgExpression &iostore)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd); }
-
-
-inline void SgMergerStmt::addErrLabel(SgExpression &errlabel)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd); }
-
-
-inline int SgMergerStmt::numberOfOutports()
-{
-  PTR_LLND ll = BIF_LL1(thebif);
-  int n = 0;
-
-  while (ll && (n != 3)) {
-    if (( NODE_CODE(ll) == IOSTAT_STORE ) || ( NODE_CODE(ll) == ERR_LABEL ) ||
-       ( NODE_CODE(ll) == INPORT_NAME ))
-      n = n + 1;
-    ll = NODE_OPERAND1(ll);
-  };
-  return (exprListLength(BIF_LL1(thebif)) - n);
-  // double scanning the list may be improved
-}
-
-
-inline SgExpression * SgMergerStmt::outport(int i)
-{ return LlndMapping(getPositionInList(BIF_LL1(thebif),i)); }
-
-
-inline SgExpression * SgMergerStmt::inport()
-{
-  int n = numberOfOutports();
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll) {
-    return (SgExpression *) NULL;
-  } else
-    return  LlndMapping(ll);
-}
- 
-
-inline SgExpression * SgMergerStmt::ioStore()
-{
-  int n = numberOfOutports();
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),n+1);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != IOSTAT_STORE) //must be ERR_LABEL
-      return (SgExpression *) NULL;
-    else
-      return  LlndMapping(ll);
-}
- 
-
-inline SgExpression * SgMergerStmt::errLabel()
-{
-  int n = numberOfOutports();
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),n+1);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != ERR_LABEL) { // imust be IOSTAT_STORE
-      ll = NODE_OPERAND1(ll);
-      if (!ll)
-        return (SgExpression *) NULL;
-      else
-        if (NODE_CODE(ll) != ERR_LABEL)
-          return (SgExpression *) NULL;
-        else
-          return  LlndMapping(ll);
-    }
-    else
-      return  LlndMapping(ll);
-}
-
-
-
-// SgMoveportStmt--inlines
-
-inline SgMoveportStmt::SgMoveportStmt(SgExpression &fromport,
-                                      SgExpression &toport)
-                     :SgStatement(MOVE_PORT)
-{
-  BIF_LL1(thebif) = fromport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), toport.thellnd);
-}
- 
-
-inline SgMoveportStmt::SgMoveportStmt(SgExpression &fromport,
-                                      SgExpression &toport,
-                                      SgExpression &io_or_err)
-                     :SgStatement(MOVE_PORT)
-{
-  BIF_LL1(thebif) = fromport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), toport.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), io_or_err.thellnd);
-}
- 
-
-inline SgMoveportStmt::SgMoveportStmt(SgExpression &fromport,
-                                      SgExpression &toport,
-                                      SgExpression &iostore,
-                                      SgExpression &errlabel)
-                     :SgStatement(MOVE_PORT)
-{
-  BIF_LL1(thebif) = fromport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), toport.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd);
-}
- 
-
-inline SgMoveportStmt::~SgMoveportStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-inline SgExpression * SgMoveportStmt::fromport()
-{ return LlndMapping(getPositionInList(BIF_LL1(thebif),0)); }
-
-
-inline SgExpression * SgMoveportStmt::toport()
-{ return LlndMapping(getPositionInList(BIF_LL1(thebif),1)); }
-
-
-inline SgExpression * SgMoveportStmt::ioStore()
-{
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),2);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != IOSTAT_STORE) // must be ERR_LABEL
-      return (SgExpression *) NULL;
-    else
-      return  LlndMapping(ll);
-}
-
-
-inline SgExpression * SgMoveportStmt::errLabel()
-{
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),2);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != ERR_LABEL) { // must be IOSTAT_STORE
-      ll = NODE_OPERAND1(ll);
-      if ((!ll) || (NODE_CODE(ll) != ERR_LABEL))
-        return (SgExpression *) NULL;
-      else
-        return  LlndMapping(ll);
-    } else
-      return  LlndMapping(ll);
-}
-
-
-
-// SgSendStmt--inlines
-
-inline SgSendStmt::SgSendStmt(SgExpression &control, SgExprListExp &argument):
-                   SgStatement(SEND_STAT)
-{
-  BIF_LL1(thebif) = control.thellnd;
-  BIF_LL2(thebif) = argument.thellnd;
-}
-
-
-inline SgSendStmt::SgSendStmt(SgExpression &outport, SgExprListExp &argument,
-                              SgExpression &io_or_err): SgStatement(SEND_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), io_or_err.thellnd);
-  BIF_LL2(thebif) = argument.thellnd;
-}
-
-
-inline SgSendStmt::SgSendStmt(SgExpression &outport, SgExprListExp &argument,
-                              SgExpression &iostore, SgExpression &errlabel):
-                   SgStatement(SEND_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd);
-  BIF_LL2(thebif) = argument.thellnd;
-}
-
-
-inline SgSendStmt::~SgSendStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-inline void SgSendStmt::addOutport(SgExpression &outport)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), outport.thellnd); }
-  
-
-inline void SgSendStmt::addIoStore(SgExpression &iostore)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd); }
-
-
-inline void SgSendStmt::addErrLabel(SgExpression &errlabel)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd); }
-
-
-inline void SgSendStmt::addArgument(SgExpression &argument)
-{ BIF_LL2(thebif) = addToExprList(BIF_LL2(thebif), argument.thellnd); }
-
-
-inline int SgSendStmt::numberOfOutports()
-{
-  PTR_LLND ll = BIF_LL1(thebif);
-  int n = 0;
-
-  while (ll && (n != 2)) {
-    if (( NODE_CODE(ll) == IOSTAT_STORE ) || ( NODE_CODE(ll) == ERR_LABEL ))
-      n = n + 1;
-    ll = NODE_OPERAND1(ll);
-  };
-  return (exprListLength(BIF_LL1(thebif)) - n);
-  // double scanning the list may be improved
-}
-
-
-inline int SgSendStmt::numberOfArguments()
-{ return exprListLength(BIF_LL2(thebif)); }
-
-
-inline SgExpression * SgSendStmt::controls()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-
-inline SgExpression * SgSendStmt::outport(int i)
-{ return LlndMapping(getPositionInList(BIF_LL1(thebif),i)); }
-
-
-inline SgExprListExp * SgSendStmt::arguments()
-{ return (SgExprListExp *) LlndMapping(BIF_LL2(thebif)); }
-
-
-inline SgExpression * SgSendStmt::argument(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL2(thebif),i)); }
-
-
-inline SgExpression * SgSendStmt::ioStore()
-{
-  int n = numberOfOutports();
-  PTR_LLND ll;
-
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != IOSTAT_STORE)
-      return (SgExpression *) NULL;
-    else
-      return  LlndMapping(ll);
-}
-
-
-inline SgExpression * SgSendStmt::errLabel()
-{
-  int n = numberOfOutports();
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != ERR_LABEL) { // must be IOSTAT_STORE
-      ll = NODE_OPERAND1(ll);
-      if ((!ll) || (NODE_CODE(ll) != ERR_LABEL))
-        return (SgExpression *) NULL;
-      else
-        return  LlndMapping(ll);
-    } else
-      return  LlndMapping(ll);
-}
-
-
-
-// SgReceiveStmt--inlines
-
-inline SgReceiveStmt::SgReceiveStmt(SgExpression &control,
-                                    SgExprListExp &argument)
-                     :SgStatement(RECEIVE_STAT)
-{
-  BIF_LL1(thebif) = control.thellnd;
-  BIF_LL2(thebif) = argument.thellnd;
-}
-
-
-inline SgReceiveStmt::SgReceiveStmt(SgExpression &inport,
-                                    SgExprListExp &argument,
-                                    SgExpression &e1):SgStatement(RECEIVE_STAT)
-{
-  BIF_LL1(thebif) = inport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e1.thellnd);
-  BIF_LL2(thebif) = argument.thellnd;
-}
-
-
-inline SgReceiveStmt::SgReceiveStmt(SgExpression &inport,
-                                    SgExprListExp &argument,
-                                    SgExpression &e1,
-                                    SgExpression &e2):SgStatement(RECEIVE_STAT)
-{
-  BIF_LL1(thebif) = inport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e1.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e2.thellnd);
-  BIF_LL2(thebif) = argument.thellnd;
-}
-
-
-inline SgReceiveStmt::SgReceiveStmt(SgExpression &inport,
-                                    SgExprListExp &argument,
-                                    SgExpression &e1,
-                                    SgExpression &e2,
-                                    SgExpression &e3):SgStatement(RECEIVE_STAT)
-{
-  BIF_LL1(thebif) = inport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e1.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e2.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e3.thellnd);
-  BIF_LL2(thebif) = argument.thellnd;
-}
- 
-
-inline SgReceiveStmt::~SgReceiveStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-inline void SgReceiveStmt::addInport(SgExpression &inport)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), inport.thellnd); }
-  
-
-inline void SgReceiveStmt::addIoStore(SgExpression &iostore)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd); }
-
-
-inline void SgReceiveStmt::addErrLabel(SgExpression &errlabel)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd); }
-
-
-inline void SgReceiveStmt::addEndLabel(SgExpression &endlabel)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), endlabel.thellnd); }
- 
-
-inline void SgReceiveStmt::addArgument(SgExpression &argument)
-{ BIF_LL2(thebif) = addToExprList(BIF_LL2(thebif), argument.thellnd); }
-
-
-inline int SgReceiveStmt::numberOfInports()
-{
-  PTR_LLND ll = BIF_LL1(thebif);
-  int n = 0;
-
-  while (ll && (n != 3)) {
-    if (( NODE_CODE(ll) == IOSTAT_STORE ) || ( NODE_CODE(ll) == ERR_LABEL ) ||
-       ( NODE_CODE(ll) == END_LABEL ))
-      n = n + 1;
-    ll = NODE_OPERAND1(ll);
-  };
-  return (exprListLength(BIF_LL1(thebif)) - n);
-  // double scanning the list may be improved
-}
-
-
-inline int SgReceiveStmt::numberOfArguments()
-{ return exprListLength(BIF_LL2(thebif)); }
-
-
-inline SgExpression * SgReceiveStmt::controls()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-
-inline SgExpression * SgReceiveStmt::inport(int i)
-{ return LlndMapping(getPositionInList(BIF_LL1(thebif),i)); }
-
-
-inline SgExprListExp * SgReceiveStmt::arguments()
-{ return (SgExprListExp *) LlndMapping(BIF_LL2(thebif)); }
-
-
-inline SgExpression * SgReceiveStmt::argument(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL2(thebif),i)); }
-
-
-inline SgExpression * SgReceiveStmt::ioStore()
-{
-  int n = numberOfInports();
-  PTR_LLND ll;
-
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != IOSTAT_STORE)
-      return (SgExpression *) NULL;
-    else
-      return  LlndMapping(ll);
-}
-
-
-inline SgExpression * SgReceiveStmt::errLabel()
-{
-  int n = numberOfInports();
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != ERR_LABEL) { // must be IOSTAT_STORE
-      ll = NODE_OPERAND1(ll);
-      if ((!ll) || (NODE_CODE(ll) != ERR_LABEL))
-        return (SgExpression *) NULL;
-      else
-        return  LlndMapping(ll);
-    } else
-      return  LlndMapping(ll);
-}
-
-
-inline SgExpression * SgReceiveStmt::endLabel()
-{
-  int n = numberOfInports();
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != END_LABEL) { // must be IOSTAT_STORE or ERR_LABEL
-      ll = NODE_OPERAND1(ll);
-      if (!ll)
-        return (SgExpression *) NULL;
-      else
-        if (NODE_CODE(ll) != END_LABEL) { // must be ERR_LABEL
-          ll = NODE_OPERAND1(ll);
-          if ((!ll) || (NODE_CODE(ll) != END_LABEL))
-            return (SgExpression *) NULL;
-          else
-            return  LlndMapping(ll);
-        } else
-          return  LlndMapping(ll);
-    } else
-      return  LlndMapping(ll);
-}
-
-
-// SgEndchannelStmt--inlines
-
-inline SgEndchannelStmt::SgEndchannelStmt(SgExpression &outport)
-                        :SgStatement(ENDCHANNEL_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-}
-
-
-inline SgEndchannelStmt::SgEndchannelStmt(SgExpression &outport,
-                                          SgExpression &io_or_err)
-                        :SgStatement(ENDCHANNEL_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), io_or_err.thellnd);
-}
-
-
-inline SgEndchannelStmt::SgEndchannelStmt(SgExpression &outport,
-                                          SgExpression &iostore,
-                                          SgExpression &errlabel)
-                        :SgStatement(ENDCHANNEL_STAT)
-{
-  BIF_LL1(thebif) = outport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd);
-}
-
-
-inline SgEndchannelStmt::~SgEndchannelStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-inline void SgEndchannelStmt::addOutport(SgExpression &outport)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), outport.thellnd); }
-  
-
-inline void SgEndchannelStmt::addIoStore(SgExpression &iostore)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd); }
-
-
-inline void SgEndchannelStmt::addErrLabel(SgExpression &errlabel)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd); }
-
-
-inline int SgEndchannelStmt::numberOfOutports()
-{
-  PTR_LLND ll = BIF_LL1(thebif);
-  int n = 0;
-
-  while (ll && (n != 2)) {
-    if (( NODE_CODE(ll) == IOSTAT_STORE ) || ( NODE_CODE(ll) == ERR_LABEL ))
-      n = n + 1;
-    ll = NODE_OPERAND1(ll);
-  };
-  return (exprListLength(BIF_LL1(thebif)) - n);
-  // double scanning the list may be improved
-}
-
-
-inline SgExpression * SgEndchannelStmt::controls()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-
-inline SgExpression * SgEndchannelStmt::outport(int i)
-{ return LlndMapping(getPositionInList(BIF_LL1(thebif),i)); }
-
-
-inline SgExpression * SgEndchannelStmt::ioStore()
-{
-  int n = numberOfOutports();
-  PTR_LLND ll;
-
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != IOSTAT_STORE)
-      return (SgExpression *) NULL;
-    else
-      return  LlndMapping(ll);
-}
-
-
-inline SgExpression * SgEndchannelStmt::errLabel()
-{
-  int n = numberOfOutports();
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != ERR_LABEL) { // must be IOSTAT_STORE
-      ll = NODE_OPERAND1(ll);
-      if ((!ll) || (NODE_CODE(ll) != ERR_LABEL))
-        return (SgExpression *) NULL;
-      else
-        return  LlndMapping(ll);
-    } else
-      return  LlndMapping(ll);
-}
-
-
-
-// SgProbeStmt--inlines
-
-inline SgProbeStmt::SgProbeStmt(SgExpression &inport):SgStatement(PROBE_STAT)
-{ BIF_LL1(thebif) = inport.thellnd; }
-
-
-inline SgProbeStmt::SgProbeStmt(SgExpression &inport, SgExpression &e1)
-                   :SgStatement(PROBE_STAT)
-{
-  BIF_LL1(thebif) = inport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e1.thellnd);
-}
-
-
-inline SgProbeStmt::SgProbeStmt(SgExpression &inport, SgExpression &e1,
-                                SgExpression &e2):SgStatement(PROBE_STAT)
-{
-  BIF_LL1(thebif) = inport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e1.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e2.thellnd);
-}
-
-
-inline SgProbeStmt::SgProbeStmt(SgExpression &inport, SgExpression &e1,
-                                SgExpression &e2, SgExpression &e3)
-                   :SgStatement(PROBE_STAT)
-{
-  BIF_LL1(thebif) = inport.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e1.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e2.thellnd);
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e3.thellnd);
-}
- 
-
-inline SgProbeStmt::~SgProbeStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-inline void SgProbeStmt::addInport(SgExpression &inport)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), inport.thellnd); }
-  
-
-inline void SgProbeStmt::addIoStore(SgExpression &iostore)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), iostore.thellnd); }
-
-
-inline void SgProbeStmt::addErrLabel(SgExpression &errlabel)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), errlabel.thellnd); }
-
-
-inline void SgProbeStmt::addEmptyStore(SgExpression &emptystore)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), emptystore.thellnd); }
- 
-
-inline int SgProbeStmt::numberOfInports()
-{
-  PTR_LLND ll = BIF_LL1(thebif);
-  int n = 0;
-
-  while (ll && (n != 3)) {
-    if (( NODE_CODE(ll) == IOSTAT_STORE ) || ( NODE_CODE(ll) == ERR_LABEL ) ||
-       ( NODE_CODE(ll) == EMPTY_STORE ))
-      n = n + 1;
-    ll = NODE_OPERAND1(ll);
-  };
-  return (exprListLength(BIF_LL1(thebif)) - n);
-  // double scanning the list may be improved
-}
-
-
-inline SgExpression * SgProbeStmt::controls()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-
-inline SgExpression * SgProbeStmt::inport(int i)
-{ return LlndMapping(getPositionInList(BIF_LL1(thebif),i)); }
-
-
-inline SgExpression * SgProbeStmt::ioStore()
-{
-  int n = numberOfInports();
-  PTR_LLND ll;
-
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != IOSTAT_STORE)
-      return (SgExpression *) NULL;
-    else
-      return  LlndMapping(ll);
-}
-
-
-inline SgExpression * SgProbeStmt::errLabel()
-{
-  int n = numberOfInports();
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != ERR_LABEL) { // must be IOSTAT_STORE
-      ll = NODE_OPERAND1(ll);
-      if ((!ll) || (NODE_CODE(ll) != ERR_LABEL)) // must be EMPTY_STORE
-          return (SgExpression *) NULL;
-      else
-        return  LlndMapping(ll);
-    } else
-      return  LlndMapping(ll);
-}
-
-
-inline SgExpression * SgProbeStmt::emptyStore()
-{
-  int n = numberOfInports();
-  PTR_LLND ll;
- 
-  ll = getPositionInList(BIF_LL1(thebif),n);
-  if (!ll)
-    return (SgExpression *) NULL;
-  else
-    if (NODE_CODE(ll) != EMPTY_STORE) { // must be IOSTAT_STORE or ERR_LABEL
-      ll = NODE_OPERAND1(ll);
-      if (!ll)
-        return (SgExpression *) NULL;
-      else
-        if (NODE_CODE(ll) != EMPTY_STORE) { // must be ERR_LABEL
-          ll = NODE_OPERAND1(ll);
-          if ((!ll) || (NODE_CODE(ll) != EMPTY_STORE))
-            return (SgExpression *) NULL;
-          else
-            return  LlndMapping(ll);
-        } else
-          return  LlndMapping(ll);
-    } else
-      return  LlndMapping(ll);
-}
-
-
-
-// SgPortTypeExp--inlines
-
-inline SgPortTypeExp::SgPortTypeExp(SgType &type):SgExpression(PORT_TYPE_OP)
-{ NODE_TYPE(thellnd) = type.thetype; }
-
-
-inline SgPortTypeExp::SgPortTypeExp(SgType &type, SgExpression &ref)
-                     :SgExpression(PORT_TYPE_OP)
-{
-  NODE_TYPE(thellnd) = type.thetype;
-  NODE_OPERAND0(thellnd) = ref.thellnd;
-}
-
-
-inline SgPortTypeExp::SgPortTypeExp(int variant, SgExpression &porttype)
-                     :SgExpression(variant)
-{ NODE_OPERAND0(thellnd) = porttype.thellnd; }
-
-
-inline SgPortTypeExp::~SgPortTypeExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-inline SgType * SgPortTypeExp::type()
-{ return TypeMapping(NODE_TYPE(thellnd)); }
-
-inline int SgPortTypeExp::numberOfRef()
-{
-  PTR_LLND ll = NODE_OPERAND0(thellnd);
-  int n = 0;
-  while (ll) {
-      n = n + 1;
-  ll = NODE_OPERAND1(ll);
-  };
-  return n;
-}
-
-inline SgExpression * SgPortTypeExp::ref()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgPortTypeExp * SgPortTypeExp::next()
-{ return (SgPortTypeExp *) LlndMapping(NODE_OPERAND1(thellnd)); }
-
-
-// SgControlExp--inlines
- 
-inline SgControlExp::SgControlExp(int variant):SgExpression(variant)
-{}
- 
-inline SgControlExp::~SgControlExp()
-{ RemoveFromTableLlnd((void *) this); }
- 
-inline SgExpression * SgControlExp::exp()
-{  return LlndMapping(NODE_OPERAND0(thellnd)); }
- 
- 
-
-// SgInportExp--inlines
-
-inline SgInportExp::SgInportExp(SgExprListExp &exp):SgControlExp(INPORT_NAME)
-{ NODE_OPERAND0(thellnd) = exp.thellnd; }
-
-inline SgInportExp::~SgInportExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-
-// SgOutportExp--inlines
- 
-inline SgOutportExp::SgOutportExp(SgExprListExp &exp):SgControlExp(OUTPORT_NAME)
-{ NODE_OPERAND0(thellnd) = exp.thellnd; }
- 
-inline SgOutportExp::~SgOutportExp()
-{ RemoveFromTableLlnd((void *) this); }
- 
- 
-
-// SgFromportExp--inlines
- 
-inline SgFromportExp::SgFromportExp(SgExprListExp &exp)
-                     :SgControlExp(FROMPORT_NAME)
-{ NODE_OPERAND0(thellnd) = exp.thellnd; }
- 
-inline SgFromportExp::~SgFromportExp()
-{ RemoveFromTableLlnd((void *) this); }
- 
- 
-
-// SgToportExp--inlines
- 
-inline SgToportExp::SgToportExp(SgExprListExp &exp):SgControlExp(TOPORT_NAME)
-{ NODE_OPERAND0(thellnd) = exp.thellnd; }
- 
-inline SgToportExp::~SgToportExp()
-{ RemoveFromTableLlnd((void *) this); }
- 
- 
-
-// SgIO_statStoreExp--inlines
- 
-inline SgIO_statStoreExp::SgIO_statStoreExp(SgExprListExp &exp)
-                       :SgControlExp(IOSTAT_STORE)
-{ NODE_OPERAND0(thellnd) = exp.thellnd; }
- 
-inline SgIO_statStoreExp::~SgIO_statStoreExp()
-{ RemoveFromTableLlnd((void *) this); }
- 
- 
-
-// SgEmptyStoreExp--inlines
- 
-inline SgEmptyStoreExp::SgEmptyStoreExp(SgExprListExp &exp)
-                       :SgControlExp(EMPTY_STORE)
-{ NODE_OPERAND0(thellnd) = exp.thellnd; }
- 
-inline SgEmptyStoreExp::~SgEmptyStoreExp()
-{ RemoveFromTableLlnd((void *) this); }
- 
- 
-
-// SgErrLabelExp--inlines
- 
-inline SgErrLabelExp::SgErrLabelExp(SgExprListExp &exp):SgControlExp(ERR_LABEL)
-{ NODE_OPERAND0(thellnd) = exp.thellnd; }
- 
-inline SgErrLabelExp::~SgErrLabelExp()
-{ RemoveFromTableLlnd((void *) this); }
- 
- 
-
-// SgEndLabelExp--inlines
- 
-inline SgEndLabelExp::SgEndLabelExp(SgExprListExp &exp):SgControlExp(END_LABEL)
-{ NODE_OPERAND0(thellnd) = exp.thellnd; }
- 
-inline SgEndLabelExp::~SgEndLabelExp()
-{ RemoveFromTableLlnd((void *) this); }
- 
- 
-
-// SgDataImpliedDoExp--inlines
-
-inline SgDataImpliedDoExp::SgDataImpliedDoExp(SgExprListExp &dlist,
-                                              SgSymbol &iname,
-                                              SgExprListExp &ilist)
-                          :SgExpression(DATA_IMPL_DO)
-{
-  NODE_OPERAND0(thellnd) = dlist.thellnd;
-  NODE_SYMB(thellnd) = iname.thesymb;
-  NODE_OPERAND1(thellnd) = ilist.thellnd;
-}
-
-inline SgDataImpliedDoExp::~SgDataImpliedDoExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline void SgDataImpliedDoExp::addDataelt(SgExpression &data)
-{ NODE_OPERAND0(thellnd) = addToList(NODE_OPERAND0(thellnd),data.thellnd); }
-
-inline void SgDataImpliedDoExp::addIconexpr(SgExpression &icon)
-{ NODE_OPERAND1(thellnd) = addToList(NODE_OPERAND1(thellnd),icon.thellnd); }
-
-inline SgSymbol *SgDataImpliedDoExp::iname()
-{ return SymbMapping(NODE_SYMB(thellnd)); }
-
-inline int SgDataImpliedDoExp::numberOfDataelt()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExprListExp *SgDataImpliedDoExp::dataelts()
-{ return (SgExprListExp *) LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression *SgDataImpliedDoExp::dataelt(int i)
-{ return LlndMapping(getPositionInList(NODE_OPERAND0(thellnd),i));  }
-
-inline SgExprListExp *SgDataImpliedDoExp::iconexprs()
-{ return (SgExprListExp *) LlndMapping(NODE_OPERAND1(thellnd)); }
-
-inline SgExpression *SgDataImpliedDoExp::init()
-{ return LlndMapping(getPositionInList(NODE_OPERAND1(thellnd),0));  }
-
-inline SgExpression *SgDataImpliedDoExp::limit()
-{ return LlndMapping(getPositionInList(NODE_OPERAND1(thellnd),1));  }
-
-inline SgExpression *SgDataImpliedDoExp::increment()
-{ return LlndMapping(getPositionInList(NODE_OPERAND1(thellnd),2));  }
-
-
-
-// SgDataEltExp--inlines
-
-inline SgDataEltExp::SgDataEltExp(SgExpression &dataimplieddo)
-                    :SgExpression(DATA_ELT)
-{ NODE_OPERAND0(thellnd) = dataimplieddo.thellnd; }
-
-inline SgDataEltExp::SgDataEltExp(SgSymbol &name, SgExpression &datasubs,
-                                  SgExpression &datarange)
-                    :SgExpression(DATA_ELT)
-{
-  NODE_SYMB(thellnd) = name.thesymb;
-  NODE_OPERAND1(datasubs.thellnd) = datarange.thellnd;
-  NODE_OPERAND0(thellnd) = datasubs.thellnd;
-}
-
-inline SgDataEltExp::~SgDataEltExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgSymbol *SgDataEltExp::name()
-{ return SymbMapping(NODE_SYMB(thellnd)); }
-
-inline SgExpression *SgDataEltExp::dataimplieddo()
-{
-  if (NODE_SYMB(thellnd) == NULL)
-    return LlndMapping(NODE_OPERAND0(thellnd));
-  else
-    return NULL;
-}
-
-inline SgExpression *SgDataEltExp::datasubs()
-{
-  if (NODE_SYMB(thellnd) != NULL)
-    if (NODE_CODE(NODE_OPERAND0(thellnd)) == DATA_SUBS)
-      return LlndMapping(NODE_OPERAND0(thellnd));
-    else
-      return (SgExpression *) NULL;
-  else
-    return (SgExpression *) NULL;
-}
-
-inline SgExpression *SgDataEltExp::datarange()
-{
-  if (NODE_SYMB(thellnd) != NULL)
-    if (NODE_CODE(NODE_OPERAND0(thellnd)) == DATA_RANGE)
-      return LlndMapping(NODE_OPERAND0(thellnd));
-    else
-      if (NODE_OPERAND1(NODE_OPERAND0(thellnd)) != NULL)
-        return LlndMapping(NODE_OPERAND1(NODE_OPERAND0(thellnd)));
-      else
-        return (SgExpression *) NULL;
-  else
-    return (SgExpression *) NULL;
-}
-
-
-
-// SgDataSubsExp--inlines
-
-inline SgDataSubsExp::SgDataSubsExp(SgExprListExp &iconexprlist)
-                     :SgExpression(DATA_SUBS)
-{ NODE_OPERAND0(thellnd) = iconexprlist.thellnd; }
-
-inline SgDataSubsExp::~SgDataSubsExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExprListExp *SgDataSubsExp::iconexprlist()
-{ return (SgExprListExp *) LlndMapping(NODE_OPERAND0(thellnd)); }
-
-
-
-// SgDataRangeExp--inlines
-
-inline SgDataRangeExp::SgDataRangeExp(SgExpression &iconexpr1,
-                                      SgExpression &iconexpr2)
-                      :SgExpression(DATA_RANGE)
-{
-  NODE_OPERAND0(thellnd) = iconexpr1.thellnd;
-  NODE_OPERAND1(thellnd) = iconexpr2.thellnd;
-}
-
-inline SgDataRangeExp::~SgDataRangeExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression *SgDataRangeExp::iconexpr1()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression *SgDataRangeExp::iconexpr2()
-{ return LlndMapping(NODE_OPERAND1(thellnd)); }
-
-
-
-// SgIconExprExp--inlines
-
-inline SgIconExprExp::SgIconExprExp(SgExpression &exp):SgExpression(ICON_EXPR)
-{ NODE_OPERAND0(thellnd) = exp.thellnd; }
-
-inline SgIconExprExp::~SgIconExprExp()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression *SgIconExprExp::expr()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-
-
-// SgIOStmt--inlines
-inline SgIOStmt::SgIOStmt(int variant):SgExecutableStatement(variant)
-{}
-
-
-// SgInputOutputStmt--inlines
-         
-inline SgInputOutputStmt::SgInputOutputStmt(int variant, SgExpression &specList, SgExpression &itemList): SgIOStmt(variant) 
-{
-    if (variant != READ_STAT && variant != WRITE_STAT && variant != PRINT_STAT)
-    {
-        Message("illegal variant for SgInputOutputStmt", 0);
-#ifdef __SPF   
-        {
-            char buf[512];
-            sprintf(buf, "Internal error at line %d and file libSage++.h\n", __LINE__);
-            addToGlobalBufferAndPrint(buf);
-        }
-        throw -1;
-#endif
-    }
-  BIF_LL1(thebif) = itemList.thellnd;
-  BIF_LL2(thebif) = specList.thellnd;
-}
-        
-inline SgExpression * SgInputOutputStmt::specList()
-{ return LlndMapping(BIF_LL2(thebif)); }
-
-inline void SgInputOutputStmt::setSpecList(SgExpression &specList)
-{ BIF_LL2(thebif) = specList.thellnd; }
-
-inline SgExpression * SgInputOutputStmt::itemList()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline void SgInputOutputStmt::setItemList(SgExpression &itemList)
-{ BIF_LL1(thebif) = itemList.thellnd; }
-
-inline SgInputOutputStmt::~SgInputOutputStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-
-// SgIOControlStmt--inlines
-
-inline SgExpression * SgIOControlStmt::controlSpecList()
-{ return LlndMapping(BIF_LL2(thebif)); }
-
-inline void SgIOControlStmt::setControlSpecList(SgExpression &controlSpecList)
-{ BIF_LL2(thebif) = controlSpecList.thellnd; }
-
-inline SgIOControlStmt::~SgIOControlStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgDeclarationStatement--inlines
-inline SgDeclarationStatement::SgDeclarationStatement(int variant):SgStatement(variant)
-{}
-
-inline SgDeclarationStatement::~SgDeclarationStatement()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline SgExpression * SgDeclarationStatement::varList()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline int SgDeclarationStatement::numberOfVars()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-inline SgExpression * SgDeclarationStatement::var(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif),i)); }
-
-inline void SgDeclarationStatement::deleteVar(int i)
-{ BIF_LL1(thebif) = deleteNodeInExprList(BIF_LL1(thebif), i); }
-
-inline void SgDeclarationStatement::deleteTheVar(SgExpression &var)
-{
- BIF_LL1(thebif) = deleteNodeWithItemInExprList(BIF_LL1(thebif),var.thellnd); 
-}
-
-inline void SgDeclarationStatement::addVar(SgExpression &exp)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), exp.thellnd); }
-
-
-
-// SgVarDeclStmt--inlines
-
-inline SgVarDeclStmt::SgVarDeclStmt(SgExpression &varRefValList, SgExpression &attributeList, SgType &type):SgDeclarationStatement(VAR_DECL)
-{
-  if ( CurrentProject->Fortranlanguage() )
-    {
-      BIF_LL1(thebif) = varRefValList.thellnd;
-      BIF_LL2(thebif) = (PTR_LLND) newNode(TYPE_OP);
-      NODE_TYPE(BIF_LL2(thebif)) =  type.thetype;
-      BIF_LL3(thebif) = attributeList.thellnd;
-    }
-  else /* C or C++ */
-    {
-      BIF_LL1(thebif) = varRefValList.thellnd;
-      NODE_TYPE(BIF_LL1(thebif)) = type.thetype;
-    }
-}
-
-inline SgVarDeclStmt::SgVarDeclStmt(SgExpression &varRefValList, SgType &type):SgDeclarationStatement(VAR_DECL)
-{
-  if ( CurrentProject->Fortranlanguage ())
-    {
-      BIF_LL1(thebif) = varRefValList.thellnd;
-      BIF_LL2(thebif) = newExpr(TYPE_OP,type.thetype);
-      BIF_LL3(thebif) = LLNULL;
-    }
-  else /* C or C++ */
-    {
-      BIF_LL1(thebif) = varRefValList.thellnd;
-      NODE_TYPE(BIF_LL1(thebif)) = type.thetype;
-    }
-}
-
-inline SgVarDeclStmt::SgVarDeclStmt(SgExpression &varRefValList)
-     :SgDeclarationStatement(VAR_DECL)
-{
-  if ( CurrentProject->Fortranlanguage ())
-    {
-      BIF_LL1(thebif) = varRefValList.thellnd;
-      BIF_LL2(thebif) = LLNULL;
-      BIF_LL3(thebif) = LLNULL;
-    }
-  else /* C or C++ */
-    {
-      BIF_LL1(thebif) = varRefValList.thellnd;
-      NODE_TYPE(BIF_LL1(thebif)) = TYNULL;
-    }
-}
-
-inline SgVarDeclStmt::~SgVarDeclStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline SgType * SgVarDeclStmt::type()  // the type
-{ 
-  SgType *x;
-
-  if ( CurrentProject->Fortranlanguage() )
-    {
-      if (BIF_LL2(thebif))
-	x = TypeMapping(NODE_TYPE(BIF_LL2(thebif))); 
-      else
-	x = NULL;
-    }
-  else /* C or C++ */
-    {
-       if (BIF_LL1(thebif))
-	    x = TypeMapping(NODE_TYPE(BIF_LL1(thebif))); 
-       else
-	    x = NULL;
-    }
-  return x;
-}
-
-
-// the number of F90 attributes
-inline int SgVarDeclStmt::numberOfAttributes()
-{ return exprListLength(BIF_LL3(thebif)); }
-
-// the number of variables declared
-inline int SgVarDeclStmt::numberOfSymbols()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-inline SgSymbol * SgVarDeclStmt::symbol(int i)
-{
-  PTR_LLND  pt;
-  PTR_SYMB symb = NULL;
-  SgSymbol *x;
-
-  pt = getPositionInExprList(BIF_LL1(thebif),i);
-  if (pt)
-    pt = giveLlSymbInDeclList(pt);
-  if (pt && (symb= NODE_SYMB(pt)))
-    {
-      x = SymbMapping(symb);
-    }
-  else
-    x = NULL;
-
-  return x;
-}
-     
-inline void SgVarDeclStmt::deleteSymbol(int i)
-{ BIF_LL1(thebif) = deleteNodeInExprList(BIF_LL1(thebif),i); }
-
-#ifdef NOT_YET_IMPLEMENTED
-inline void SgVarDeclStmt::deleteTheSymbol(SgSymbol &symbol)
-{ SORRY; }
-#endif
-
-// the initial value ofthe i-th variable
-inline SgExpression * SgVarDeclStmt::initialValue(int i)
-{ 
-  PTR_LLND varRefExp;
-  SgExpression *x;
-
-  varRefExp = getPositionInExprList(BIF_LL1(thebif),i);
-  if (varRefExp == LLNULL)
-    x = NULL;
-  else if (NODE_CODE(varRefExp) == ASSGN_OP)
-    x = LlndMapping(NODE_OPERAND1(varRefExp));
-  else 
-    x = NULL;
-
-  return x;
-}
-
-
-// SgIntentStmt--inlines
-
-inline SgIntentStmt::SgIntentStmt(SgExpression &varRefValList,
-                                  SgExpression &attribute)
-                    :SgDeclarationStatement(INTENT_STMT)
-{
-  BIF_LL1(thebif) = varRefValList.thellnd;
-  BIF_LL2(thebif) = attribute.thellnd;
-}
-
-inline SgIntentStmt::~SgIntentStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-inline int SgIntentStmt::numberOfArgs()  // the number of arguement expressions
-{ return exprListLength(BIF_LL1(thebif)); }
-
-inline void SgIntentStmt::addArg(SgExpression &arg)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg.thellnd); }
-
-inline SgExpression * SgIntentStmt::args()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline SgExpression * SgIntentStmt::arg(int i) // the i-th argument expression
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif), i)); }
-
-inline SgExpression * SgIntentStmt::attribute()
-{ return LlndMapping(BIF_LL2(thebif)); }
-
-
-// SgVarListDeclStmt--inlines
-
-inline SgVarListDeclStmt::~SgVarListDeclStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-// the number of variables declared
-inline int SgVarListDeclStmt::numberOfSymbols()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-inline SgSymbol * SgVarListDeclStmt::symbol(int i)   // the i-th variable
-{ 
-  PTR_LLND pt;
-  SgSymbol *x;
-  pt = getPositionInExprList(BIF_LL1(thebif),i);
-  if (pt)
-    x = SymbMapping(NODE_SYMB(pt)); 
-  else
-    x = NULL;
-
-  return x;
-}
-
-inline void SgVarListDeclStmt::appendSymbol(SgSymbol &symbol)
-{ 
-  BIF_LL1(thebif) =  addSymbRefToExprList(BIF_LL1(thebif), symbol.thesymb); 
-}
-
-inline void SgVarListDeclStmt::deleteSymbol(int i)
-{ BIF_LL1(thebif) = deleteNodeInExprList(BIF_LL1(thebif), i); }
-
-#ifdef NOT_YET_IMPLEMENTED
-inline void SgVarListDeclStmt::deleteTheSymbol(SgSymbol &symbol)
-{ SORRY; }
-#endif
-
-
-// SgStructureDeclStmt--inlines
-
-inline SgStructureDeclStmt::SgStructureDeclStmt(SgSymbol &name, SgExpression &attributes, SgStatement &body):SgDeclarationStatement(STRUCT_DECL)
-{
-  BIF_SYMB(thebif) = name.thesymb;
-  BIF_LL1(thebif) = attributes.thellnd;
-  insertBfndListIn(body.thebif,thebif,thebif);             
-}
-
-inline SgStructureDeclStmt::~SgStructureDeclStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-// SgNestedVarListDeclStmt--inlines
-
-       
-// varList must be of low-level variant appropriate to variant. For example,
-// if the variant is COMM_STAT, listOfVarList must be of variant COMM_LIST.
-
-inline SgNestedVarListDeclStmt::~SgNestedVarListDeclStmt()
-{ RemoveFromTableBfnd((void *) this); }
- 
-inline SgExpression * SgNestedVarListDeclStmt::lists()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline int SgNestedVarListDeclStmt::numberOfLists()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-inline SgExpression * SgNestedVarListDeclStmt::list(int i)
-{ return LlndMapping(getPositionInExprList( BIF_LL1(thebif),i)); }
-
-inline void SgNestedVarListDeclStmt::addList(SgExpression &list)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), list.thellnd); }
-
-inline void SgNestedVarListDeclStmt::addVarToList(SgExpression &varRef)
-{ 
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),varRef.thellnd);
-}
-
-inline void SgNestedVarListDeclStmt::deleteList(int i)
-{ 
-  BIF_LL1(thebif) = deleteNodeInExprList(BIF_LL1(thebif), i);
-}
-
-#ifdef NOT_YET_IMPLEMENTED
-inline void SgNestedVarListDeclStmt::deleteTheList(SgExpression &list)
-{ 
-  //            deleteNodeWithItemInExprList(BIF_LL1(thebif), list.thellnd);
-  SORRY;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline void SgNestedVarListDeclStmt::deleteVarInList(int i, SgExpression &varRef)
-{ 
-  SORRY;
-}
-#endif
-
-#ifdef NOT_YET_IMPLEMENTED
-inline void SgNestedVarListDeclStmt::deleteVarInTheList(SgExpression &list, SgExpression &varRef)
-{ 
-  SORRY;
-}
-#endif
-
-
-// SgParameterStmt--inlines
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgParameterStmt::SgParameterStmt(SgExpression &constants, SgExpression &values):SgDeclarationStatement(PARAM_DECL)
-{
-  //  PTR_LLND constantWithValues;
-  
-  //            constantWithValues = stringConstantsWithTheirValues(constants.thellnd, values.thellnd);
-  //            BIF_LL1(thebif) = LlndMapping(constantWithValues);
-  SORRY;
-}
-#endif
-
-inline SgParameterStmt::SgParameterStmt(SgExpression &constantsWithValues):SgDeclarationStatement(PARAM_DECL)
-{ BIF_LL1(thebif) = constantsWithValues.thellnd; }
-
-inline SgParameterStmt::~SgParameterStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-// the number of constants declared
-inline int SgParameterStmt::numberOfConstants()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-// the i-th variable
-inline SgSymbol * SgParameterStmt::constant(int i)
-{ return SymbMapping(NODE_SYMB(getPositionInExprList(BIF_LL1(thebif),i))); }
-
-// the value of i-th variable
-inline SgExpression * SgParameterStmt::value(int i)
-{ return LlndMapping(SYMB_VAL(NODE_SYMB(getPositionInExprList(BIF_LL1(thebif),i)))); }
-
-inline void SgParameterStmt::addConstant(SgSymbol *constant)
-{ 
-    SgRefExp constNode(CONST_REF, *constant);  
-    BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), constNode.thellnd); 
-}
-
-  
-inline void SgParameterStmt::deleteConstant(int i)
-{ BIF_LL1(thebif) = deleteNodeInExprList(BIF_LL1(thebif), i); }
-
-#ifdef NOT_YET_IMPLEMENTED
-inline void SgParameterStmt::deleteTheConstant(SgSymbol &constant)
-{ 
-  // deleteNodeWithSymbolInExprList(i, BIF_LL1(thebif)); 
-  SORRY;
-}
-#endif
-
-
-// SgImplicitStmt--inlines
-
-inline SgImplicitStmt::SgImplicitStmt(SgExpression &implicitLists):SgDeclarationStatement(IMPL_DECL)
-{ BIF_LL1(thebif) = implicitLists.thellnd; }
-
-inline SgImplicitStmt::SgImplicitStmt(SgExpression *implicitLists):SgDeclarationStatement(IMPL_DECL)
-{
-    if (implicitLists)
-        BIF_LL1(thebif) = implicitLists->thellnd; 
-}
-
-inline SgImplicitStmt::~SgImplicitStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-// the number of implicit types declared
-inline int SgImplicitStmt::numberOfImplicitTypes()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-// the i-th implicit type
-inline SgType * SgImplicitStmt::implicitType(int i)
-{ 
-  PTR_LLND pt;
-  SgType *x;
-
-  if ( (pt = getPositionInList(BIF_LL1(thebif),i)) &&
-      NODE_OPERAND0(pt))
-    x = TypeMapping(NODE_TYPE(NODE_OPERAND0(pt))); 
-  else
-    x = NULL;
-
-  return x;
-}
-
-// the i-th implicit type's range list eg. (A-E, G)
-inline SgExpression * SgImplicitStmt::implicitRangeList(int i)
-{ 
-  PTR_LLND pt;
-  SgExpression *x;
-
-  if ( (pt = getPositionInExprList(BIF_LL1(thebif),i)) &&
-      NODE_OPERAND0(pt))
-    x = LlndMapping(NODE_OPERAND0(pt)); 
-  else
-    x = NULL;
-
-  return x;
-}
-
-inline void SgImplicitStmt::appendImplicitNode(SgExpression &impNode)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), impNode.thellnd); }
-
-
-
-// SgVariableSymb--inlines
-
-
-inline SgVariableSymb::SgVariableSymb(char *identifier, SgType &t, SgStatement &scope):SgSymbol(VARIABLE_NAME,identifier)
-{
-  SYMB_SCOPE(thesymb) = scope.thebif;
-  SYMB_TYPE(thesymb) = t.thetype;
-}
-
-inline SgVariableSymb::SgVariableSymb(char *identifier, SgType *t, SgStatement *scope):SgSymbol(VARIABLE_NAME,identifier)
-{
-  if (scope)
-    SYMB_SCOPE(thesymb) = scope->thebif;
-  if (t)
-    SYMB_TYPE(thesymb) = t->thetype;
-}
-
-inline SgVariableSymb::SgVariableSymb(char *identifier, 
-                                SgType &t):SgSymbol(VARIABLE_NAME,identifier)
-{ SYMB_TYPE(thesymb) = t.thetype; }
-
-
-inline SgVariableSymb::SgVariableSymb(char *identifier,
-                         SgStatement &scope):SgSymbol(VARIABLE_NAME,identifier)
-{    SYMB_SCOPE(thesymb) = scope.thebif;}
-
-
-inline SgVariableSymb::SgVariableSymb(char *identifier,
-                         SgStatement *scope):SgSymbol(VARIABLE_NAME,identifier)
-{    SYMB_SCOPE(thesymb) = scope->thebif;}
-
-
-inline SgVariableSymb::SgVariableSymb(char *identifier):
-                                   SgSymbol(VARIABLE_NAME,identifier)
-{}
-
-inline SgVariableSymb::SgVariableSymb(const char *identifier, SgType &t, SgStatement &scope) : SgSymbol(VARIABLE_NAME, identifier)
-{
-    SYMB_SCOPE(thesymb) = scope.thebif;
-    SYMB_TYPE(thesymb) = t.thetype;
-}
-
-inline SgVariableSymb::SgVariableSymb(const char *identifier, SgType *t, SgStatement *scope) :SgSymbol(VARIABLE_NAME, identifier)
-{
-    if (scope)
-        SYMB_SCOPE(thesymb) = scope->thebif;
-    if (t)
-        SYMB_TYPE(thesymb) = t->thetype;
-}
-
-inline SgVariableSymb::SgVariableSymb(const char *identifier,
-    SgType &t) :SgSymbol(VARIABLE_NAME, identifier)
-{
-    SYMB_TYPE(thesymb) = t.thetype;
-}
-
-
-inline SgVariableSymb::SgVariableSymb(const char *identifier,
-    SgStatement &scope) :SgSymbol(VARIABLE_NAME, identifier)
-{
-    SYMB_SCOPE(thesymb) = scope.thebif;
-}
-
-
-inline SgVariableSymb::SgVariableSymb(const char *identifier,
-    SgStatement *scope) :SgSymbol(VARIABLE_NAME, identifier)
-{
-    SYMB_SCOPE(thesymb) = scope->thebif;
-}
-
-
-inline SgVariableSymb::SgVariableSymb(const char *identifier) :
-SgSymbol(VARIABLE_NAME, identifier)
-{}
-
-inline SgVariableSymb::~SgVariableSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-/* ajm */
-inline SgVarRefExp *SgVariableSymb::varRef(void)
-{
-     return new SgVarRefExp (*this);
-}
-
-
-// SgConstantSymb--inlines
-
-inline SgConstantSymb::SgConstantSymb(char *identifier, SgStatement &scope, 
-                                   SgExpression &value):SgSymbol(CONST_NAME,identifier, scope)
-{ SYMB_VAL(thesymb) = value.thellnd; }
-
-inline SgConstantSymb::SgConstantSymb(const char *identifier, SgStatement &scope, 
-                                   SgExpression &value):SgSymbol(CONST_NAME,identifier, scope)
-{ SYMB_VAL(thesymb) = value.thellnd; }
-
-inline SgConstantSymb::~SgConstantSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-inline SgExpression * SgConstantSymb::constantValue()
-{ return LlndMapping(SYMB_VAL(thesymb)); }
-
-
-// SgFunctionSymb--inlines
-
-inline SgFunctionSymb::~SgFunctionSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-inline void SgFunctionSymb::addParameter(int, SgSymbol &parameters)
-{ 
-     SgSymbol *copy_symb = &(parameters.copy());
-     SYMB_NEXT_DECL(copy_symb->thesymb) = 0;
-     appendSymbToArgList (thesymb,copy_symb->thesymb);
-}
-
-inline void SgFunctionSymb::insertParameter(int position, SgSymbol &symb)
-{ insertSymbInArgList (this->thesymb, position, symb.thesymb);  }
-
-inline int SgFunctionSymb::numberOfParameters()
-{ return lenghtOfParamList(thesymb); }
-
-inline SgSymbol * SgFunctionSymb::parameter(int i)
-{ return SymbMapping(GetThParam(thesymb,i)); }
-
-inline SgSymbol * SgFunctionSymb::result()
-{ return SymbMapping(SYMB_DECLARED_NAME(thesymb)); }
-
-inline void SgFunctionSymb::setResult(SgSymbol &symbol)
-{ SYMB_DECLARED_NAME(thesymb) = symbol.thesymb; }
-
-
-// SgMemberFuncSymb--inlines
-//  status = MEMB_<see above>;
-inline SgMemberFuncSymb::SgMemberFuncSymb(char *identifier, SgType &t,
-                                        SgStatement &cla, int status):
-                       SgFunctionSymb(MEMBER_FUNC, identifier, t, cla)
-{
-  SYMB_ATTR(thesymb) = status;
-  SYMB_MEMBER_BASENAME(thesymb) = BIF_SYMB(cla.thebif);
-}
-
-inline SgMemberFuncSymb::~SgMemberFuncSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-inline int SgMemberFuncSymb::isMethodOfElement()
-{
-  int x;
-  if ((int) SYMB_ATTR(thesymb) & (int) ELEMENT_FIELD)
-    x = TRUE;
-  else
-    x = FALSE;
-
-  return x;
-}
-
-// name of containing class;
-inline SgSymbol * SgMemberFuncSymb::className()
-{
-  return SymbMapping(SYMB_MEMBER_BASENAME(thesymb));
-}
-
-// name of containing class
-inline void SgMemberFuncSymb::setClassName(SgSymbol &symb)
-{
-  SYMB_MEMBER_BASENAME(thesymb) = symb.thesymb;
-}
-          
-
-// SgFieldSymb--inlines
-
-inline SgFieldSymb::SgFieldSymb(char *identifier, SgType &t, 
-        SgSymbol &structureName):SgSymbol(FIELD_NAME,identifier)
-{
-      SYMB_TYPE(thesymb) = t.thetype; 
-      SYMB_FIELD_BASENAME(thesymb) = structureName.thesymb; 
-}
-
-inline SgFieldSymb::SgFieldSymb(const char *identifier, SgType &t,
-    SgSymbol &structureName) :SgSymbol(FIELD_NAME, identifier)
-{
-    SYMB_TYPE(thesymb) = t.thetype;
-    SYMB_FIELD_BASENAME(thesymb) = structureName.thesymb; 
-}
-
-inline SgFieldSymb::~SgFieldSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-// position in the structure
-#ifdef NOT_YET_IMPLEMENTED
-inline int SgFieldSymb::offset()
-{
-  // return positionOfFieldInStruct(thesymb, SYMB_BASE_NAME(thesymb));
-  SORRY;
-  return 0;
-}
-#endif
-
-// parent structure
-inline SgSymbol * SgFieldSymb::structureName()
-{ return SymbMapping(SYMB_FIELD_BASENAME(thesymb)); }
-
-inline SgSymbol * SgFieldSymb::nextField()
-{ return SymbMapping(getClassNextFieldOrMember(thesymb)); }
-
-inline int SgFieldSymb::isMethodOfElement()
-{
-  int x;
-
-  if ((int) SYMB_ATTR(thesymb) & (int) ELEMENT_FIELD)
-    x = TRUE;
-  else
-    x = FALSE;
-
-  return x;
-}
-
-
-// SgClassSymb--inlines
-
-inline SgClassSymb::SgClassSymb(int variant, char *name, 
-         SgStatement &scope):SgSymbol(variant, name, scope)
-{}
-
-inline SgClassSymb::~SgClassSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-// number of fields and member functions.
-inline int SgClassSymb::numberOfFields()
-{ return lenghtOfFieldList(thesymb);}
-
-// the i-th field or member function.
-inline SgSymbol * SgClassSymb::field(int i)
-{ return SymbMapping(GetThOfFieldList(thesymb,i)); }
-
-
-// SgLabelSymb--inlines
-
-#ifdef NOT_YET_IMPLEMENTED
-inline SgLabelSymb::SgLabelSymb(char *name):SgSymbol(LABEL_NAME)
-{
-  SORRY;
-}
-#endif
-
-inline SgLabelSymb::~SgLabelSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-
-inline SgLabelVarSymb::SgLabelVarSymb(char *name, SgStatement &scope):SgSymbol(LABEL_NAME, name, scope)
-{}
-  
-inline SgLabelVarSymb::~SgLabelVarSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-
-// SgExternalSymb--inlines
-inline SgExternalSymb::SgExternalSymb(char *name, SgStatement &scope):SgSymbol(ROUTINE_NAME, name, scope)
-{}
-
-inline SgExternalSymb::~SgExternalSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-
-// SgConstructSymb--inlines
-
-inline SgConstructSymb::SgConstructSymb(char *name, SgStatement &scope):SgSymbol(CONSTRUCT_NAME, name, scope)
-{}
-        
-inline SgConstructSymb::~SgConstructSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-
-// SgInterfaceSymb--inlines
-
-inline SgInterfaceSymb::SgInterfaceSymb(char *name, SgStatement &scope):SgSymbol(INTERFACE_NAME, name, scope)
-{}
-
-inline SgInterfaceSymb::~SgInterfaceSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-
-// SgModuleSymb--inlines
-inline SgModuleSymb::SgModuleSymb(char *name):SgSymbol(MODULE_NAME, name, *BfndMapping(getFirstStmt()))
-{}
-
-inline SgModuleSymb::~SgModuleSymb()
-{ RemoveFromTableSymb((void *) this); }
-
-
-// SgArrayType--inlines
-
-inline SgArrayType::SgArrayType(SgType &base_type):SgType(T_ARRAY)
-{ TYPE_BASE(thetype) = base_type.thetype; }
-
-inline int SgArrayType::dimension()
-{ return exprListLength(TYPE_RANGES(thetype)); }
-
-inline SgExpression * SgArrayType::sizeInDim(int i)
-{ return LlndMapping(getPositionInExprList(TYPE_RANGES(thetype),i)); }
-
-inline SgType * SgArrayType::baseType()
-{
- return TypeMapping(lookForInternalBasetype(thetype));
- // perhaps should be return TYPE_BASE(thetype);
-}
-
-inline void SgArrayType::setBaseType(SgType &bt)
-{ TYPE_BASE(thetype) = bt.thetype; }
-
-inline void SgArrayType::addDimension(SgExpression *e)
-{
- if(!e){
-  SgExprListExp *l = new SgExprListExp();
-  TYPE_RANGES(thetype) = l->thellnd;
-  }
- else
-  TYPE_RANGES(thetype) = addToExprList(TYPE_RANGES(thetype),e->thellnd);
-}
-inline SgExpression * SgArrayType::getDimList()
-{
-  return LlndMapping(TYPE_RANGES(thetype));
-}
-inline void SgArrayType::addRange(SgExpression &e)
-{
-  TYPE_RANGES(thetype) = addToExprList(TYPE_RANGES(thetype),e.thellnd);
-  // For C when adding range adding one level of pointer in basetype.
-  // This routine should only be used to build a dereferencing expression
-  // like x[i][j] and not a declaration.  use addDimension for that.
-    if (!CurrentProject->Fortranlanguage())
-      {
-        PTR_TYPE type;
-        type = (PTR_TYPE) newNode(T_POINTER);
-        TYPE_BASE(type) = TYPE_BASE(thetype);
-        TYPE_BASE(thetype) = type;
-      }
-}
-
-inline SgArrayType::~SgArrayType()
-{ RemoveFromTableType((void *) this); }
-
-
-// SgPointerType--inlines
-
-inline SgType * SgPointerType::baseType()
-{ return TypeMapping(TYPE_BASE(thetype)); }
-
-inline void SgPointerType::setBaseType(SgType &baseType)
-{ TYPE_BASE(thetype) = baseType.thetype; }
-
-inline int SgPointerType::indirection()
-{ return TYPE_TEMPLATE_DUMMY1(thetype); }
-
-inline void SgPointerType::setIndirection(int i)
-{ TYPE_TEMPLATE_DUMMY1(thetype) = i; }
-
-inline SgPointerType::~SgPointerType()
-{ RemoveFromTableType((void *) this); }
-
-inline int SgPointerType::modifierFlag()
-{ return TYPE_TEMPLATE_DUMMY5(thetype); }
-
-inline void SgPointerType::setModifierFlag(int flag) 
-{ TYPE_TEMPLATE_DUMMY5(thetype) = TYPE_TEMPLATE_DUMMY5(thetype) | flag; }
-
-
-// SgFunctionType-- inlines
-
-inline SgFunctionType::SgFunctionType(SgType &ret_val):SgType(T_FUNCTION)
-{ TYPE_BASE(thetype) = ret_val.thetype; }
-
-inline SgType * SgFunctionType::returnedValue()
-{ return TypeMapping(TYPE_BASE(thetype)); }
-
-inline void SgFunctionType::changeReturnedValue(SgType &ret_val)
-{ TYPE_BASE(thetype) = ret_val.thetype; }
-
-inline SgFunctionType::~SgFunctionType()
-{ RemoveFromTableType((void *) this); }
-
-// SgReferenceType--inlines
-
-inline SgReferenceType::SgReferenceType(SgType &base_type):SgType(T_REFERENCE)
-{ TYPE_BASE(thetype) = base_type.thetype; }
-
-inline SgType * SgReferenceType::baseType()
-{ return TypeMapping(TYPE_BASE(thetype)); }
-
-inline void SgReferenceType::setBaseType(SgType &baseType)
-{ TYPE_BASE(thetype) = baseType.thetype; }
-
-inline SgReferenceType::~SgReferenceType()
-{ RemoveFromTableType((void *) this); }
-
-inline int SgReferenceType::modifierFlag()
-{ return TYPE_TEMPLATE_DUMMY5(thetype); }
-
-inline void SgReferenceType::setModifierFlag(int flag) 
-{ TYPE_TEMPLATE_DUMMY5(thetype) = TYPE_TEMPLATE_DUMMY5(thetype) | flag; }
-
-
-// SgDerivedType--inlines
-
-inline SgDerivedType::SgDerivedType(SgSymbol &type_name):SgType(T_DERIVED_TYPE)
-{ TYPE_SYMB_DERIVE(thetype) = type_name.thesymb; }
-
-inline SgSymbol * SgDerivedType::typeName()
-{ return SymbMapping(TYPE_SYMB_DERIVE(thetype)); }
-
-inline SgDerivedType::~SgDerivedType()
-{ RemoveFromTableType((void *) this); }
-
-
-// SgDerivedClassType--inlines
-
-inline SgDerivedClassType::SgDerivedClassType(SgSymbol &type_name):SgType(T_DERIVED_CLASS)
-{ TYPE_SYMB_DERIVE(thetype) = type_name.thesymb; }
-
-inline SgSymbol * SgDerivedClassType::typeName()
-{ return SymbMapping(TYPE_SYMB_DERIVE(thetype)); }
-
-inline SgDerivedClassType::~SgDerivedClassType()
-{ RemoveFromTableType((void *) this); }
-
-
-// SgDescriptType--inlines
-
-
-inline SgDescriptType::SgDescriptType(SgType &base_type, int bit_flag):SgType(T_DESCRIPT)
-{
-  TYPE_LONG_SHORT(thetype) =  bit_flag;
-  TYPE_BASE(thetype) = base_type.thetype;
-}
-
-inline int SgDescriptType::modifierFlag()
-{ return TYPE_LONG_SHORT(thetype); }
-
-inline void SgDescriptType::setModifierFlag(int flag) 
-{ TYPE_LONG_SHORT(thetype) = TYPE_LONG_SHORT(thetype) | flag; }
-
-inline SgDescriptType::~SgDescriptType()
-{ RemoveFromTableType((void *) this); }
-
-
-
-// SgDerivedCollectionType--inlines
-
-inline SgDerivedCollectionType::SgDerivedCollectionType(SgSymbol &s, SgType &t):SgType(T_DERIVED_COLLECTION)
-{
-  TYPE_COLL_BASE(thetype) = t.thetype;
-  TYPE_SYMB_DERIVE(thetype) = s.thesymb;
-}
-
-inline SgType * SgDerivedCollectionType::elementClass() 
-{ return TypeMapping(TYPE_COLL_BASE(thetype)); }
-
-inline void SgDerivedCollectionType::setElementClass(SgType &ty)
-{ TYPE_COLL_BASE(thetype) = ty.thetype; }
-
-inline SgSymbol * SgDerivedCollectionType::collectionName()
-{  return SymbMapping(TYPE_SYMB_DERIVE(thetype)); }
-
-inline SgStatement * SgDerivedCollectionType::createCollectionWithElemType()
-{
-  return BfndMapping(LibcreateCollectionWithType(thetype,TYPE_COLL_BASE(thetype)));
-}
-
-inline SgDerivedCollectionType::~SgDerivedCollectionType()
-{ RemoveFromTableType((void *) this); }
-
-void InitializeTable();
-
-#ifdef USER
-
-SgType *SgTypeInt();
-SgType *SgTypeChar();
-SgType *SgTypeFloat();
-SgType *SgTypeDouble();
-SgType *SgTypeVoid();
-SgType *SgTypeBool();
-SgType *SgTypeDefault();
-
-SgUnaryExp & SgDerefOp(SgExpression &e);
-SgUnaryExp & SgAddrOp(SgExpression &e);
-SgUnaryExp & SgUMinusOp(SgExpression &e);
-SgUnaryExp & SgUPlusOp(SgExpression &e);
-SgUnaryExp & SgPrePlusPlusOp(SgExpression &e);
-SgUnaryExp & SgPreMinusMinusOp(SgExpression &e);
-SgUnaryExp & SgPostPlusPlusOp(SgExpression &e);
-SgUnaryExp & SgPostMinusMinusOp(SgExpression &e);
-SgUnaryExp & SgBitCompfOp(SgExpression &e);
-SgUnaryExp & SgNotOp(SgExpression &e);
-SgUnaryExp & SgSizeOfOp(SgExpression &e);
-SgUnaryExp & makeAnUnaryExpression(int code,PTR_LLND ll1);
-
-
-SgValueExp *             isSgValueExp(SgExpression *pt);
-SgKeywordValExp *        isSgKeywordValExp(SgExpression *pt);
-SgUnaryExp *             isSgUnaryExp(SgExpression *pt);
-SgCastExp *              isSgCastExp(SgExpression *pt);
-SgDeleteExp *            isSgDeleteExp(SgExpression *pt);
-SgNewExp *               isSgNewExp(SgExpression *pt);
-SgExprIfExp *            isSgExprIfExp(SgExpression *pt);
-SgFunctionCallExp *      isSgFunctionCallExp(SgExpression *pt);
-SgFuncPntrExp *          isSgFuncPntrExp(SgExpression *pt);
-SgExprListExp *          isSgExprListExp(SgExpression *pt);
-SgRefExp *               isSgRefExp (SgExpression *pt);
-SgVarRefExp *            isSgVarRefExp (SgExpression *pt);
-SgThisExp *              isSgThisExp (SgExpression *pt);
-SgArrayRefExp *          isSgArrayRefExp (SgExpression *pt);
-SgPntrArrRefExp *        isSgPntrArrRefExp(SgExpression *pt);
-SgPointerDerefExp *      isSgPointerDerefExp (SgExpression *pt);
-SgRecordRefExp *         isSgRecordRefExp (SgExpression *pt);
-SgStructConstExp*        isSgStructConstExp (SgExpression *pt);
-SgConstExp*              isSgConstExp (SgExpression *pt);
-SgVecConstExp *          isSgVecConstExp (SgExpression *pt);
-SgInitListExp *          isSgInitListExp (SgExpression *pt);
-SgObjectListExp *        isSgObjectListExp (SgExpression *pt);
-SgAttributeExp *         isSgAttributeExp (SgExpression *pt);
-SgKeywordArgExp *        isSgKeywordArgExp (SgExpression *pt);
-SgSubscriptExp*          isSgSubscriptExp (SgExpression *pt);
-SgUseOnlyExp *           isSgUseOnlyExp (SgExpression *pt);
-SgUseRenameExp *         isSgUseRenameExp (SgExpression *pt);
-SgSpecPairExp *          isSgSpecPairExp (SgExpression *pt);
-SgIOAccessExp *          isSgIOAccessExp (SgExpression *pt);
-SgImplicitTypeExp *      isSgImplicitTypeExp (SgExpression *pt);
-SgTypeExp *              isSgTypeExp (SgExpression *pt);
-SgSeqExp *               isSgSeqExp (SgExpression *pt);
-SgStringLengthExp *      isSgStringLengthExp (SgExpression *pt);
-SgDefaultExp *           isSgDefaultExp (SgExpression *pt);
-SgLabelRefExp *          isSgLabelRefExp (SgExpression *pt);
-SgProgHedrStmt *         isSgProgHedrStmt (SgStatement *pt);
-SgProcHedrStmt *         isSgProcHedrStmt (SgStatement *pt);
-SgFuncHedrStmt *         isSgFuncHedrStmt (SgStatement *pt);
-SgClassStmt *            isSgClassStmt (SgStatement *pt);
-SgStructStmt *           isSgStructStmt (SgStatement *pt);
-SgUnionStmt *            isSgUnionStmt (SgStatement *pt);
-SgEnumStmt *             isSgEnumStmt (SgStatement *pt);
-SgCollectionStmt *       isSgCollectionStmt (SgStatement *pt);
-SgBasicBlockStmt *       isSgBasicBlockStmt (SgStatement *pt);
-SgForStmt *              isSgForStmt (SgStatement *pt);
-SgWhileStmt *            isSgWhileStmt (SgStatement *pt);
-SgDoWhileStmt *          isSgDoWhileStmt (SgStatement *pt);
-SgLogIfStmt *            isSgLogIfStmt (SgStatement *pt);
-SgIfStmt *               isSgIfStmt (SgStatement *pt);
-SgArithIfStmt *          isSgArithIfStmt (SgStatement *pt);
-SgWhereStmt *            isSgWhereStmt (SgStatement *pt);
-SgWhereBlockStmt *       isSgWhereBlockStmt (SgStatement *pt);
-SgSwitchStmt *           isSgSwitchStmt (SgStatement *pt);
-SgCaseOptionStmt *       isSgCaseOptionStmt (SgStatement *pt);
-SgExecutableStatement *  isSgExecutableStatement (SgStatement *pt);
-SgAssignStmt *           isSgAssignStmt (SgStatement *pt);
-SgCExpStmt *             isSgCExpStmt (SgStatement *pt);
-SgPointerAssignStmt *    isSgPointerAssignStmt (SgStatement *pt);
-SgHeapStmt *             isSgHeapStmt (SgStatement *pt);
-SgNullifyStmt *          isSgNullifyStmt (SgStatement *pt);
-SgContinueStmt *         isSgContinueStmt (SgStatement *pt);
-SgControlEndStmt *       isSgControlEndStmt (SgStatement *pt);
-SgBreakStmt *            isSgBreakStmt (SgStatement *pt);
-SgCycleStmt *            isSgCycleStmt (SgStatement *pt);
-SgReturnStmt *           isSgReturnStmt (SgStatement *pt);
-SgExitStmt *             isSgExitStmt (SgStatement *pt);
-SgGotoStmt *             isSgGotoStmt (SgStatement *pt);
-SgLabelListStmt *        isSgLabelListStmt (SgStatement *pt);
-SgAssignedGotoStmt *     isSgAssignedGotoStmt (SgStatement *pt);
-SgComputedGotoStmt *     isSgComputedGotoStmt (SgStatement *pt);
-SgStopOrPauseStmt *      isSgStopOrPauseStmt (SgStatement *pt);
-SgCallStmt*              isSgCallStmt (SgStatement *pt);
-SgProsHedrStmt *	 isSgProsHedrStmt (SgStatement *pt); /* Fortran M */
-SgProcessDoStmt *        isSgProcessDoStmt (SgStatement *pt);  /* Fortran M */
-SgProsCallStmt*          isSgProsCallStmt (SgStatement *pt); /* Fortran M */
-SgProsCallLctn*          isSgProsCallLctn (SgStatement *pt); /* Fortran M */
-SgProsCallSubm*          isSgProsCallSubm (SgStatement *pt); /* Fortran M */
-SgInportStmt *           isSgInportStmt (SgStatement *pt); /* Fortran M */
-SgOutportStmt *          isSgOutportStmt (SgStatement *pt); /* Fortran M */
-SgIntentStmt *		 isSgIntentStmt (SgStatement *pt); /* Fortran M */
-SgChannelStmt *          isSgChannelStmt (SgStatement *pt); /* Fortran M */
-SgMergerStmt *           isSgMergerStmt (SgStatement *pt); /* Fortran M */
-SgMoveportStmt *         isSgMoveportStmt (SgStatement *pt); /* Fortran M */
-SgSendStmt *             isSgSendStmt (SgStatement *pt); /* Fortran M */
-SgReceiveStmt *          isSgReceiveStmt (SgStatement *pt); /* Fortran M */
-SgEndchannelStmt *       isSgEndchannelStmt (SgStatement *pt); /* Fortran M */
-SgProbeStmt *            isSgProbeStmt (SgStatement *pt); /* Fortran M */
-SgProcessorsRefExp *	 isSgProcessorsRefExp(SgExpression *pt); /* Fortran M */
-SgPortTypeExp *          isSgPortTypeExp (SgExpression *pt); /* Fortran M */ 
-SgInportExp *            isSgInportExp (SgExpression *pt); /* Fortran M */
-SgOutportExp *           isSgOutportExp (SgExpression *pt); /* Fortran M */
-SgFromportExp *          isSgFromportExp (SgExpression *pt); /* Fortran M */
-SgToportExp *            isSgToportExp (SgExpression *pt); /* Fortran M */
-SgIO_statStoreExp *      isSgIO_statStoreExp (SgExpression *pt); /* Fortran M */
-SgEmptyStoreExp *        isSgEmptyStoreExp (SgExpression *pt); /* Fortran M */
-SgErrLabelExp *          isSgErrLabelExp (SgExpression *pt); /* Fortran M */
-SgEndLabelExp *          isSgEndLabelExp (SgExpression *pt); /* Fortran M */
-SgDataImpliedDoExp *     isSgDataImpliedDoExp (SgExpression *pt);/* Fortran M */
-SgDataEltExp *           isSgDataEltExp (SgExpression *pt); /* Fortran M */
-SgDataSubsExp *          isSgDataSubsExp (SgExpression *pt); /* Fortran M */
-SgDataRangeExp *         isSgDataRangeExp (SgExpression *pt); /* Fortran M */
-SgIconExprExp *          isSgIconExprExp (SgExpression *pt); /* Fortran M */
-SgIOStmt *               isSgIOStmt (SgStatement *pt);
-SgInputOutputStmt *      isSgInputOutputStmt (SgStatement *pt);
-SgIOControlStmt *        isSgIOControlStmt (SgStatement *pt);
-SgDeclarationStatement * isSgDeclarationStatement (SgStatement *pt);
-SgVarDeclStmt *          isSgVarDeclStmt (SgStatement *pt);
-SgVarListDeclStmt *      isSgVarListDeclStmt (SgStatement *pt);
-SgStructureDeclStmt *    isSgStructureDeclStmt (SgStatement *pt);
-SgNestedVarListDeclStmt* isSgNestedVarListDeclStmt (SgStatement *pt);
-SgParameterStmt *        isSgParameterStmt (SgStatement *pt);
-SgImplicitStmt *         isSgImplicitStmt (SgStatement *pt);
-SgVariableSymb *         isSgVariableSymb (SgSymbol *pt);
-SgConstantSymb *         isSgConstantSymb (SgSymbol *pt);
-SgFunctionSymb *         isSgFunctionSymb (SgSymbol *pt);
-SgMemberFuncSymb *       isSgMemberFuncSymb (SgSymbol *pt);
-SgFieldSymb *            isSgFieldSymb (SgSymbol *pt);
-SgClassSymb *            isSgClassSymb (SgSymbol *pt);
-SgLabelSymb *            isSgLabelSymb (SgSymbol *pt);
-SgLabelVarSymb *         isSgLabelVarSymb (SgSymbol *pt);
-SgExternalSymb *         isSgExternalSymb (SgSymbol *pt);
-SgConstructSymb *        isSgConstructSymb (SgSymbol *pt);
-SgInterfaceSymb *        isSgInterfaceSymb (SgSymbol *pt);
-SgModuleSymb *           isSgModuleSymb (SgSymbol *pt);
-SgArrayType *            isSgArrayType (SgType *pt);
-SgPointerType *          isSgPointerType (SgType *pt);
-SgFunctionType *         isSgFunctionType (SgType *pt);
-SgReferenceType *        isSgReferenceType (SgType *pt);
-SgDerivedType *          isSgDerivedType (SgType *pt);
-SgDerivedClassType *     isSgDerivedClassType (SgType *pt);
-SgDescriptType *         isSgDescriptType (SgType *pt);
-SgDerivedCollectionType* isSgDerivedCollectionType (SgType *pt);
-#endif
-
-#endif /* ndef LIBSAGEXX_H */
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/macro.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/macro.h
deleted file mode 100644
index b08876e..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/macro.h
+++ /dev/null
@@ -1,434 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* declaration pour la toolbox 19/12/91 */
-
-/* The following include files are sigma  include files */
-#include "defs.h"
-#include "bif.h"
-#include "ll.h"
-#include "symb.h"
-#include "sets.h"
-#include "db.h"
-#include "vparse.h"
-
-#ifdef CPLUS_
-extern "C" PTR_FILE pointer_on_file_proj;   
-#else
-extern PTR_FILE pointer_on_file_proj;
-#endif
-/* the following are names of constants used by the C parser to */
-/* add attributed to symbol table entries.                      */
-/* For symbptr->attr   access with SYMB_ATTR(..) */
-/* note these are ALSO IN FILE vpc.h and we should find a single spot for them!! */
-#define ATT_CLUSTER     0
-#define ATT_GLOBAL      1
-#define PURE            8
-#define PRIVATE_FIELD   16
-#define PROTECTED_FIELD 32
-#define PUBLIC_FIELD    64
-#define ELEMENT_FIELD   128
-#define COLLECTION_FIELD 256
-#define CONSTRUCTOR      512
-#define DESTRUCTOR       1024
-#define PCPLUSPLUS_DOSUBSET 2048
-#define INVALID             4096
-#define SUBCOLLECTION       4096*2
-#define OVOPERATOR      4096*4
-
-
-/*  
- * There are 3 types  of macros:
- *       the first type deals with bif nodes and are named BIF_XXX
- *       the second type deals with symbol nodes and are named SYMB_XXX 
- *       the last type deasl with  low level nodes and are named NODE_XXX
- */
-
-/* Macros for BIF NODE */
-#define DECL_SOURCE_LINE(FUNC) ((FUNC)->g_line)
-#define DECL_SOURCE_FILE(FUNC) (default_filename)
-/* give the code of a node */
-#define BIF_CODE(NODE) ((NODE)->variant)
-#define BIF_LINE(NODE) ((NODE)->g_line)
-#define BIF_LOCAL_LINE(NODE) ((NODE)->l_line)
-#define BIF_DECL_SPECS(NODE) ((NODE)->decl_specs)
-#define BIF_INDEX(NODE) ((NODE)->index)
-/* give the identifier */
-#define BIF_ID(NODE)   ((NODE)->id)
-#define BIF_NEXT(NODE)   ((NODE)->thread)
-#define BIF_CP(NODE)   ((NODE)->control_parent)
-#define BIF_LABEL(NODE) ((NODE)->label)
-#define BIF_LL1(NODE)  ((NODE)->entry.Template.ll_ptr1)
-#define BIF_LL2(NODE)  ((NODE)->entry.Template.ll_ptr2)
-#define BIF_LL3(NODE)  ((NODE)->entry.Template.ll_ptr3)
-#define BIF_SYMB(NODE)  ((NODE)->entry.Template.symbol)
-#define BIF_BLOB1(NODE)  ((NODE)->entry.Template.bl_ptr1)
-#define BIF_BLOB2(NODE)  ((NODE)->entry.Template.bl_ptr2)
-#define BIF_FLOW(NODE)  ((NODE)->entry.Template.bl_ptr1->ref)
-#define BIF_FLOW_TRUE(NODE)  ((NODE)->entry.Template.bl_ptr1->ref)
-#define BIF_FLOW_FALSE_EXIST(NODE)  ((NODE)->entry.Template.bl_ptr2)
-#define BIF_FLOW_FALSE(NODE)  ((NODE)->entry.Template.bl_ptr2->ref)
-#define BIF_FILE_NAME(NODE) ((NODE)->filename)
-#define BIF_CMNT(NODE) ((NODE)->entry.Template.cmnt_ptr)
-#define BIF_LABEL_USE(NODE) ((NODE)->entry.Template.lbl_ptr)
-#define BIF_SETS(NODE)       ((NODE)->entry.Template.sets)
-#define BIF_PROPLIST(NODE)  ((NODE)->prop_list)
-/* seems to be useless not used that way???????*/
-#define BIF_PROPLIST_NAME(NODE)  ((NODE)->prop_list.prop_name)
-#define BIF_PROPLIST_VAL(NODE)  ((NODE)->prop_list.prop_val)
-#define BIF_PROPLIST_NEXT(NODE)  ((NODE)->prop_list.next)
-
-/* Macros for LOW LEVEL NODE*/
-
-/* Give the code of the node */
-#define NODE_CODE(NODE) ((NODE)->variant)
-/* give the identifier */
-#define NODE_ID(NODE)   ((NODE)->id)
-#define NODE_NEXT(NODE) ((NODE)->thread)
-#define NODE_CHAIN(NODE) ((NODE)->thread)
-#define NODE_TYPE(NODE) ((NODE)->type)
-#define NODE_STR(NODE)  ((NODE)->entry.string_val)
-#define NODE_STRING_POINTER(NODE)  ((NODE)->entry.string_val)
-#define NODE_IV(NODE)   ((NODE)->entry.ival)
-
-/* use for integer constant 
-   the boolean value is use if the constante is big
-   (two integers) */
-#define NODE_INT_CST_LOW(NODE)   ((NODE)->entry.ival)
-#define NODE_DOUBLE_CST(NODE)  ((NODE)->entry.string_val)
-#define NODE_FLOAT_CST(NODE)  ((NODE)->entry.string_val)
-#define NODE_CHAR_CST(NODE)  ((NODE)->entry.cval)
-#define NODE_BOOL_CST(NODE)  ((NODE)->entry.bval)
-/* la partie haute est dans les noeuds info 
-   A modifier par la suite */
-
-
-#define NODE_CV(NODE)   ((NODE)->entry.cval)
-#define NODE_DV(NODE)   ((NODE)->entry.dval)
-#define NODE_REAL_CST(NODE)   ((NODE)->entry.dval)
-#define NODE_BV(NODE)   ((NODE)->entry.bval)
-#define NODE_ARRAY_OP(NODE) ((NODE)->entry.array_op)
-#define NODE_TEMPLATE(NODE) ((NODE)->entry.Template)
-#define NODE_SYMB(NODE) ((NODE)->entry.Template.symbol)
-#define NODE_TEMPLATE_LL1(NODE) ((NODE)->entry.Template.ll_ptr1)
-#define NODE_TEMPLATE_LL2(NODE) ((NODE)->entry.Template.ll_ptr2)
-#define NODE_OPERAND0(NODE) ((NODE)->entry.Template.ll_ptr1)
-#define NODE_PURPOSE(NODE) ((NODE)->entry.Template.ll_ptr1)
-#define NODE_OPERAND1(NODE) ((NODE)->entry.Template.ll_ptr2)
-#define NODE_OPERAND2(NODE) bif_sorry("OPERAND2")
-#define NODE_VALUE(NODE) ((NODE)->entry.Template.ll_ptr2)
-#define NODE_STRING_LENGTH(NODE) (strlen((NODE)->entry.string_val))
-#define NODE_LABEL(NODE)          ((NODE)->entry.label_list.lab_ptr)
-#define NODE_LIST_ITEM(NODE)       ((NODE)->entry.list.item)
-#define NODE_LIST_NEXT(NODE)       ((NODE)->entry.list.next)
-
-/* For symbole NODE */
-#define SYMB_VAL(NODE)   ((NODE)->entry.const_value)
-#define SYMB_DECLARED_NAME(NODE)   ((NODE)->entry.member_func.declared_name)
-#define SYMB_CODE(NODE)   ((NODE)->variant)
-#define SYMB_ID(NODE)   ((NODE)->id)
-#define SYMB_IDENT(NODE)   ((NODE)->ident)
-#define SYMB_PARENT(NODE)   ((NODE)->parent)
-#define SYMB_DECL(NODE)   ((NODE)->decl)
-#define SYMB_ATTR(NODE)   ((NODE)->attr)
-#define SYMB_DOVAR(NODE)   ((NODE)->dovar)
-#define SYMB_BLOC_NEXT(NODE)   ((NODE)->next_symb)
-#define SYMB_NEXT(NODE)   ((NODE)->thread)
-#define SYMB_LIST(NODE)   ((NODE)->id_list)
-#define SYMB_TYPE(NODE)   ((NODE)->type)
-#define SYMB_SCOPE(NODE)   ((NODE)->scope)
-#define SYMB_UD_CHAIN(NODE) ((NODE)->ud_chain)
-#define SYMB_ENTRY(NODE)   ((NODE)->entry)
-#define SYMB_NEXT_DECL(NODE)   ((NODE)->entry.var_decl.next_in)
-#define SYMB_NEXT_FIELD(NODE)   ((NODE)->entry.field.next)
-#define SYMB_RESTRICTED_BIT(NODE)   ((NODE)->entry.field.restricted_bit)
-#define SYMB_BASE_NAME(NODE)   ((NODE)->entry.Template.base_name)
-#define SYMB_FUNC_HEDR(NODE)   ((NODE)->entry.func_decl.func_hedr)
-#define SYMB_FUNC_PARAM(NODE)   ((NODE)->entry.proc_decl.in_list)
-#define SYMB_FUNC_NB_PARAM(NODE) ((NODE)->entry.proc_decl.num_input)
-#define SYMB_FUNC_OUTPUT(NODE)   ((NODE)->entry.proc_decl.num_output)
-#define SYMB_FIELD_BASENAME(NODE)   ((NODE)->entry.field.base_name)
-#define SYMB_FIELD_TAG(NODE)   ((NODE)->entry.field.tag)
-#define SYMB_FIELD_DECLARED_NAME(NODE)   ((NODE)->entry.field.declared_name)
-#define SYMB_FIELD_OFFSET(NODE)   ((NODE)->entry.field.offset)
-#define SYMB_MEMBER_BASENAME(NODE)   ((NODE)->entry.member_func.base_name)
-#define SYMB_MEMBER_NEXT(NODE)   ((NODE)->entry.member_func.next)
-#define SYMB_MEMBER_HEADER(NODE)   ((NODE)->entry.member_func.func_hedr)
-#define SYMB_MEMBER_LIST(NODE)   ((NODE)->entry.member_func.symb_list)
-#define SYMB_MEMBER_PARAM(NODE)   ((NODE)->entry.member_func.in_list)
-#define SYMB_MEMBER_TAG(NODE)   ((NODE)->entry.member_func.tag)
-#define SYMB_MEMBER_OFFSET(NODE)   ((NODE)->entry.member_func.offset)
-#define SYMB_MEMBER_DECLARED_NAME(NODE)   ((NODE)->entry.member_func.declared_name)
-#define SYMB_MEMBER_OUTLIST(NODE)   ((NODE)->entry.member_func.out_list)
-#define SYMB_MEMBER_NB_OUTPUT(NODE)   ((NODE)->entry.member_func.num_output)
-#define SYMB_MEMBER_NB_IO(NODE)   ((NODE)->entry.member_func.num_io)
-
-/* for Template */
-#define SYMB_TEMPLATE_DUMMY1(NODE)   ((NODE)->entry.Template.seen)
-#define SYMB_TEMPLATE_DUMMY2(NODE) ((NODE)->entry.Template.num_input)
-#define SYMB_TEMPLATE_DUMMY3(NODE) ((NODE)->entry.Template.num_output)
-#define SYMB_TEMPLATE_DUMMY4(NODE) ((NODE)->entry.Template.num_io)
-#define SYMB_TEMPLATE_DUMMY5(NODE) ((NODE)->entry.Template.in_list)
-#define SYMB_TEMPLATE_DUMMY6(NODE) ((NODE)->entry.Template.out_list)
-#define SYMB_TEMPLATE_DUMMY7(NODE) ((NODE)->entry.Template.symb_list)
-#define SYMB_TEMPLATE_DUMMY8(NODE) ((NODE)->entry.Template.local_size)
-#define SYMB_TEMPLATE_DUMMY9(NODE) ((NODE)->entry.Template.label_list)
-#define SYMB_TEMPLATE_DUMMY10(NODE) ((NODE)->entry.Template.func_hedr)
-#define SYMB_TEMPLATE_DUMMY11(NODE) ((NODE)->entry.Template.call_list)
-#define SYMB_TEMPLATE_DUMMY12(NODE) ((NODE)->entry.Template.tag)
-#define SYMB_TEMPLATE_DUMMY13(NODE) ((NODE)->entry.Template.offset)
-#define SYMB_TEMPLATE_DUMMY14(NODE) ((NODE)->entry.Template.declared_name)
-#define SYMB_TEMPLATE_DUMMY15(NODE) ((NODE)->entry.Template.next)
-#define SYMB_TEMPLATE_DUMMY16(NODE) ((NODE)->entry.Template.base_name)
-
-
-/* for BLOB NODE */
-
-#define  BLOB_NEXT(NODE) ((NODE)->next)
-#define  BLOB_VALUE(NODE) ((NODE)->ref)
-#define  HEAD_BLOB(NODE)  ((NODE)->head_blob)
-
-/* for type node */
-#define TYPE_CODE(NODE)  ((NODE)->variant)
-#define TYPE_ID(NODE)  ((NODE)->id)
-#define TYPE_SYMB(NODE)  ((NODE)->name)
-#define TYPE_UD_CHAIN(NODE) ((NODE)->ud_chain)
-#define TYPE_LENGTH(NODE) ((NODE)->length)
-#define TYPE_BASE(NODE)   ((NODE)->entry.Template.base_type)
-#define TYPE_RANGES(NODE) ((NODE)->entry.Template.ranges)
-#define TYPE_KIND_LEN(NODE) ((NODE)->entry.Template.kind_len)
-#define TYPE_QUOTE(NODE) ((NODE)->entry.Template.dummy1)
-#define TYPE_DIM(NODE) ((NODE)->entry.ar_decl.num_dimensions)
-#define TYPE_DECL_BASE(NODE) ((NODE)->entry.ar_decl.base_type)
-#define TYPE_DECL_RANGES(NODE) ((NODE)->entry.ar_decl.ranges)
-#define TYPE_NEXT(NODE) ((NODE)->thread)
-#define TYPE_DESCRIP(NODE) ((NODE)->entry.descriptive)
-#define TYPE_DESCRIP_BASE_TYPE(NODE) ((NODE)->entry.descriptive.base_type)
-#define TYPE_FIRST_FIELD(NODE) ((NODE)->entry.re_decl.first)
-#define TYPE_UNSIGNED(NODE) ((NODE)->entry.descriptive.signed_flag)
-#define TYPE_LONG_SHORT(NODE) ((NODE)->entry.descriptive.long_short_flag)
-#define TYPE_MODE_FLAG(NODE) ((NODE)->entry.descriptive.mod_flag)
-#define TYPE_STORAGE_FLAG(NODE) ((NODE)->entry.descriptive.storage_flag)
-#define TYPE_ACCESS_FLAG(NODE) ((NODE)->entry.descriptive.access_flag)
-#define TYPE_SYMB_DERIVE(NODE) ((NODE)->entry.derived_type.symbol)
-#define TYPE_SCOPE_SYMB_DERIVE(NODE) ((NODE)->entry.derived_type.scope_symbol)
-#define TYPE_COLL_BASE(NODE) ((NODE)->entry.col_decl.base_type)
-#define TYPE_COLL_ORI_CLASS(NODE) ((NODE)->entry.derived_class.original_class)
-#define TYPE_COLL_NUM_FIELDS(NODE) ((NODE)->entry.derived_class.num_fields)
-#define TYPE_COLL_RECORD_SIZE(NODE) ((NODE)->entry.derived_class.record_size)
-#define TYPE_COLL_FIRST_FIELD(NODE) ((NODE)->entry.derived_class.first)
-#define TYPE_COLL_NAME(NODE)     ((NODE)->entry.col_decl.collection_name)
-#define TYPE_TEMPL_NAME(NODE)     ((NODE)->entry.templ_decl.templ_name)
-#define TYPE_TEMPL_ARGS(NODE)     ((NODE)->entry.templ_decl.args)
-/* sepcial case for enumeral type */
-#define TYPE_VALUES(NODE) ((NODE)->entry.Template.ranges) /* wrong, to verify */
-
-/* To allow copies of type */
-#define TYPE_TEMPLATE_BASE(NODE)   ((NODE)->entry.Template.base_type)
-#define TYPE_TEMPLATE_DUMMY1(NODE) ((NODE)->entry.Template.dummy1)
-#define TYPE_TEMPLATE_RANGES(NODE) ((NODE)->entry.Template.ranges)
-#define TYPE_TEMPLATE_DUMMY2(NODE) ((NODE)->entry.Template.dummy2)
-#define TYPE_TEMPLATE_DUMMY3(NODE) ((NODE)->entry.Template.dummy3)
-#define TYPE_TEMPLATE_DUMMY4(NODE) ((NODE)->entry.Template.dummy4)
-#define TYPE_TEMPLATE_DUMMY5(NODE) ((NODE)->entry.Template.dummy5)
-/* Other */
-#define FILE_OF_CURRENT_PROJ(PROJ) ((PROJ)->proj_name)
-#define FUNCT_NAME(FUNC) ((FUNC)->entry.Template.symbol->ident)
-#define FUNCT_SYMB(FUNC) ((FUNC)->entry.Template.symbol)
-#define FUNCT_FIRST_PAR(FUNC) ((FUNC)->entry.Template.symbol->entry.func_decl.in_list)
-
-
-#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))
-#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))
-#define CEIL(x,y) (((x) + (y) - 1) / (y))
-
-/* extern pour Bif */
-
-/* other type of low level node and decl */
-#define CEIL_DIV_EXPR 1000
-#define MAX_OP  1001
-#define BIF_PARM_DECL 1002 
-#define BIF_SAVE_EXPR 1003
-#define MIN_OP 1004
-#define BIF_ADDR_EXPR 1005
-#define BIF_NOP_EXPR 1006
-#define BIF_RTL_EXPR 1007
-/* #define TRUNC_MOD_EXPR 1008  killed by dbg because in rid enum*/
-/* #define TRUNC_DIV_EXPR 1009 killed by dbg because in rid enum*/
-#define FLOOR_DIV_EXPR 1010
-#define FLOOR_MOD_EXPR 1011
-#define CEIL_MOD_EXPR 1012
-#define ROUND_DIV_EXPR 1013
-#define ROUND_MOD_EXPR 1014
-#define RDIV_EXPR 1015
-#define EXACT_DIV_EXPR 1016
-#define COND_EXPR EXPR_IF 
-#define CONVERT_EXPR 1017
-/*#define MINUS_EXPR SUBT_OP  removed by Beckman*/
-#define CONST_DECL 1018 /* to be modify */
-#define ABS_EXPR 1019
-#define BIT_NOT_EXPR BIT_COMPLEMENT_OP
-#define NEGATE_EXPR MINUS_OP
-#define TRUTH_ANDIF_EXPR 1020
-#define TRUTH_AND_EXPR 1021
-#define TRUTH_NOT_EXPR 1022
-#define TRUTH_ORIF_EXPR 1023
-#define POSTINCREMENT_EXPR PLUSPLUS_OP
-#define PREINCREMENT_EXPR 1024
-#define PREDECREMENT_EXPR 1025
-#define COMPOUND_EXPR 1026
-#define ENUMERAL_TYPE T_ENUM
-#define FLOAT_EXPR 1027
-/*#define RSHIFT_EXPR RSHIFT_OP
-  #define LSHIFT_EXPR  LSHIFT_OP   removed by Pete Beckman*/
-/* #define BIT_IOR_EXPR 1028 killed by dbg because in rid enum*/
-/* #define BIT_XOR_EXPR 1029 killed by dbg because in rid enum*/
-#define BIT_ANDTC_EXPR 1030
-#define ERROR_MARK NULL
-#define TRUTH_OR_EXPR 1031
-#define FIX_TRUNC_EXPR 1032
-#define RROTATE_EXPR 1033
-#define LROTATE_EXPR 1034
-#define RANGE_EXPR 1035
-#define POSTDECREMENT_EXPR 1036
-#define COMPONENT_REF RECORD_REF /* NODE SYMB define for this node */
-#define INDIRECT_REF DEREF_OP
-#define REFERENCE_TYPE 1037
-/* #define CONSTRUCTOR 1038*/
-#define FIX_FLOOR_EXPR 1039
-#define FIX_ROUND_EXPR 1040
-#define FIX_CEIL_EXPR 1041
-#define FUNCTION_DECL 1042
-#define MODIFY_EXPR 1043
-#define REFERENCE_EXPR  1044
-#define RESULT_DECL 1045
-#define PARM_DECL 1046 /* not used */
-#define CALL_EXPR 1047
-#define INIT_EXPR 1048
-
-
-/* other type for type node */
-#define T_LITERAL 1100 /* not use */
-#define T_SIZE 1101
-#define LAST_CODE T_SIZE
-/* end other type of node */
-
-/* definition for project */
-
-#define PROJ_FIRST_SYMB() (pointer_on_file_proj->head_symb)
-#define PROJ_FIRST_TYPE() (pointer_on_file_proj->head_type)
-#define PROJ_FIRST_LLND() (pointer_on_file_proj->head_llnd)
-#define PROJ_FIRST_BIF() (pointer_on_file_proj->head_bfnd)
-#define PROJ_FIRST_CMNT() (pointer_on_file_proj->head_cmnt)
-#define PROJ_FIRST_LABEL() (pointer_on_file_proj->head_lab)
-
-#define CUR_FILE_NUM_BIFS() (pointer_on_file_proj->num_bfnds)
-#define CUR_FILE_NUM_LLNDS() (pointer_on_file_proj->num_llnds)
-#define CUR_FILE_NUM_SYMBS() (pointer_on_file_proj->num_symbs)
-#define CUR_FILE_NUM_TYPES() (pointer_on_file_proj->num_types)
-#define CUR_FILE_NUM_LABEL() (pointer_on_file_proj->num_label)
-#define CUR_FILE_NUM_BLOBS() (pointer_on_file_proj->num_blobs)
-#define CUR_FILE_NUM_CMNT() (pointer_on_file_proj->num_cmnt)
-#define CUR_FILE_CUR_BFND() (pointer_on_file_proj->cur_bfnd)
-#define CUR_FILE_CUR_LLND() (pointer_on_file_proj->cur_llnd)
-#define CUR_FILE_CUR_SYMB() (pointer_on_file_proj->cur_symb)
-#define CUR_FILE_CUR_TYPE() (pointer_on_file_proj->cur_type)
-#define CUR_FILE_GLOBAL_BFND() (pointer_on_file_proj->global_bfnd)
-#define CUR_FILE_NAME() (pointer_on_file_proj->filename)
-#define CUR_FILE_HEAD_FILE() (pointer_on_file_proj->head_file)
-
-
-#define FILE_GLOBAL_BFND(FIL) ((FIL)->global_bfnd)
-#define FILE_FILENAME(FIL)  ((FIL)->filename)
-#define FILE_LANGUAGE(FIL) ((FIL)->lang)
-
-
-#define CUR_PROJ_FILE_CHAIN() (cur_proj->file_chain)   /* modified by Pete */
-#define CUR_PROJ_NAME() (cur_proj->proj_name) /* modified by Pete */
-
-#define PROJ_FILE_CHAIN(PROJ) ((PROJ)->file_chain)
-                                
-/* use as a general pointer */
-
-typedef  char *POINTER;
-enum typenode { BIFNODE, LLNODE, SYMBNODE, TYPENODE, BLOBNODE,
-                  BLOB1NODE, LABEL, FILENODE}; //add LABEL (Kataev 21.03.2013), FILE (Kataev 15.07.2013
-
-
-#define MAXTILE 10 /* nombre maximum de boucle que l'on peut tiler */
-#define MAX_STMT 100 /* nombre d'instruction d'une boucle */
-
-
-/**************** For Comment Nodes *****************************/
-
-
-#define CMNT_ID(NODE)      ((NODE)->id)
-#define CMNT_TYPE(NODE)    ((NODE)->type)
-#define CMNT_STRING(NODE)  ((NODE)->string)
-#define CMNT_NEXT(NODE)    ((NODE)->thread)
-#define CMNT_NEXT_ATTACH(NODE)    ((NODE)->next)
-
-
-/**************** For LABEL NODES *****************************/
-
-#define LABEL_ID(NODE)             ((NODE)->id)
-#define LABEL_NEXT(NODE)           ((NODE)->next)
-#define LABEL_UD_CHAIN(NODE)       ((NODE)->ud_chain)
-#define LABEL_USED(NODE)           ((NODE)->labused)
-#define LABEL_ILLEGAL(NODE)        ((NODE)->labinacc)
-#define LABEL_DEFINED(NODE)        ((NODE)->labdefined)
-#define LABEL_SCOPE(NODE)          ((NODE)->scope)
-#define LABEL_BODY(NODE)           ((NODE)->statbody)
-#define LABEL_SYMB(NODE)           ((NODE)->label_name)
-#define LABEL_TYPE(NODE)           ((NODE)->labtype)
-#define LABEL_STMTNO(NODE)         ((NODE)->stateno)
-
-
-/**************** Misceallous ***********************************/
-
-#define LABEL_KIND   100000  /* bigger than the variant of all kind of node*/
-#define BLOB_KIND    100001
-#define CMNT_KIND    100002
-
-/************** For Sets Node ********************************/
-
-#define SETS_GEN(NODE)       ((NODE)->gen)
-#define SETS_INDEF(NODE)     ((NODE)->in_def)
-#define SETS_USE(NODE)       ((NODE)->use)
-#define SETS_INUSE(NODE)     ((NODE)->in_use)
-#define SETS_OUTDEF(NODE)    ((NODE)->out_def)
-#define SETS_OUTUSE(NODE)    ((NODE)->out_use)
-#define SETS_ARRAYEF(NODE)   ((NODE)->arefl)
-
-#define SETS_REFL_SYMB(NODE) ((NODE)->id)
-#define SETS_REFL_NEXT(NODE) ((NODE)->next)
-#define SETS_REFL_NODE(NODE) ((NODE)->node)
-#define SETS_REFL_REF(NODE) ((NODE)->node->refer)
-#define SETS_REFL_STMT(NODE) ((NODE)->node->stmt)
-
-/************** For HASH NODE     ********************************/
-#define HASH_IDENT(NODE)  ((NODE)->ident)
-
-/************** For Special malloc ********************************/
-
- 
-/* pour la gestion memoire */
-struct chaining
-{
-  char *zone;
-  struct chaining *list;
-};
- 
-typedef struct chaining *ptchaining;
-struct stack_chaining
-{
-   ptchaining first;
-   ptchaining last;
-   struct stack_chaining *prev;
-   struct stack_chaining *next;
-   int level;
-};
-typedef struct stack_chaining *ptstack_chaining;
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++callgraph.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++callgraph.h
deleted file mode 100644
index 1e20c10..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++callgraph.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/*******************************************************************/
-/* A class for creating a static call tree for C++ and pC++        */
-/* functions.  usage:                                              */
-/* include "sage++user.h"                                          */
-/* include "sage++callgraph.h"                                     */
-/* main(){                                                         */
-/*   SgProject project("myfile")                                   */
-/*   SgCallGraph CG;                                               */
-/*   Cg.GenCallTree(&(project->file(0)));                          */
-/*   CG.computeClosures();                                         */
-/* the object then contains call info for that file.               */
-/* see the public functions for data that can be extracted         */
-/*******************************************************************/
-#define SGMOE_FUN 1
-#define SGNORMAL_FUN 0
-#define SGMOC_FUN 2
-#define SGMAX_HASH 541
-
-class SgCallGraphFunRec;
-
-typedef struct _SgCallSiteList{
-  SgStatement *stmt;
-  SgExpression *expr;
-  struct _SgCallSiteList *next;
-}SgCallSiteList;
-
-typedef struct _SgCallGraphFunRecList{
-  SgStatement *stmt;
-  SgExpression *expr;
-  SgCallGraphFunRec *fr;
-  struct _SgCallGraphFunRecList *next;
-}SgCallGraphFunRecList;
-
-class SgCallGraphFunRec{
-  public:
-   int type; // either moe, normal or moc.
-   SgStatement *body;
-   SgCallSiteList *callSites;  // pointer to tail of circular linked list
-   SgSymbol *s;
-   int Num_Call_Sites;
-   SgCallGraphFunRecList *callList; // pointer to tail of circular linked list
-   int Num_Call_List;
-   int isCollection;  // = 1 if this is a method of a collection
-   int calledInPar;   // = 1 if called in a parallel section
-   int calledInSeq;   // = 1 if called in sequentail main thread
-   SgSymbol *className;  // for member functions.
-   int flag;  // used for traversals.
-
-   int id;  // serial number 
-   SgCallGraphFunRec *next;  // used for linked list
-   SgCallGraphFunRec *next_hash;  // used for hash table collisions
-   // used for next* functions
-   SgCallSiteList *currentCallSite; 
-   SgCallSiteList *currentCallExpr;
-   SgCallGraphFunRecList *currentFunCall;
-};
-
-class SgCallGraph{
-
-  public:
-        SgCallGraph(void) {};                     // constructor
-	void GenCallTree(SgFile *);               // initialize and build the call tree
-        void printFunctionEntry(SgSymbol *fname); // print info about fname
-        int numberOfFunctionsInGraph();           // number of functions in the table.
-        int numberOfCallSites(SgSymbol *fname);   // number of call sites for funame
-        int numberOfFunsCalledFrom(SgSymbol *fname); // how many call sites in fname
-
-        int isAMethodOfElement(SgSymbol* fname);  // 1 if fname is a method of an element of a coll.
-        int isACollectionFunc(SgSymbol* fname);   // 1 if fname is a method of a collection (not MOE)
-        int isCalledInSeq(SgSymbol* fname);       // 1 if fname is called in a sequential sect.
-        int isCalledInPar(SgSymbol* fname);       // 1 if fname is called in parallel code
-	void computeClosures();
-
-	SgSymbol *firstFunction();                // first function in callgraph
-	SgSymbol *nextFunction();                 // next function in callgraph
-        int functionId(SgSymbol *fname);                  // id of fname
-	SgStatement *functionBody(SgSymbol *fname);       // body of fname
-        SgStatement *firstCallSiteStmt(SgSymbol *fname);  // stmt of first call of fname
-        SgStatement *nextCallSiteStmt(SgSymbol *fname);   // stmt of next call of fname
-        SgExpression *firstCallSiteExpr(SgSymbol *fname); // expression of first call
-        SgExpression *nextCallSiteExpr(SgSymbol *fname);  // expression of next call
-        SgSymbol *firstCalledFunction(SgSymbol *fname);   // first function called in fname
-        SgSymbol *nextCalledFunction(SgSymbol *fname);    // next function called in fname
-        SgStatement *SgCalledFunctionStmt(SgSymbol *fname); // get statement of current called function
-        SgExpression *SgCalledFunctionExpr(SgSymbol *fname); // get expression of current called function
-
-  // obsolete functions: 
-        SgSymbol *function(int i);          // i-th function in table (0 = first)
-        SgStatement *functionBody(int i);   // i-th function in table (0 = first)
-        void printTableEntry(int);          // print the i-th table entry.
-
-        SgStatement *callSiteStmt(SgSymbol *fname, int i);  // stmt of i-th call of fname
-        SgExpression *callSiteExpr(SgSymbol *fname, int i); // expression of i-th call
-        SgSymbol *calledFunction(SgSymbol *fname, int i);   // i-th function called in fname
-  // end obsolete
-  protected:
-	SgCallGraphFunRec *FunListHead;
-	int num_funs_in_table;
-	SgCallGraphFunRec *hash_table[SGMAX_HASH];
-	SgCallGraphFunRec *locateFunctionInTable(SgSymbol *); 
-	SgCallGraphFunRec *lookForFunctionOpForClass(SgSymbol *);
-	void updateFunctionTableConnections(SgCallGraphFunRec *, SgStatement *, SgExpression *);
-	void findFunctionCalls(SgStatement *, SgExpression *);
-        void init();
-
-	void insertInHashTable(SgSymbol *, SgCallGraphFunRec *);
-	unsigned long int hashSymbol(SgSymbol *);
-   	SgCallGraphFunRec *currentFun;
-};
-
-SgType *findTrueType(SgExpression *);
-SgType *makeReducedType(SgType *);
-	SgSymbol *firstFunction();
-	SgSymbol *nextFunction();
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
deleted file mode 100644
index caf7fe2..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++classhierarchy.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-//  ----------------------------------
-//  Darryl Brown
-//  University of Oregon pC++/Sage++
-//
-//  sage++classhierarchy.h  -  the header file for the class classHierarchy.
-//
-//  a class(es) for inspecting the class hierarchy
-//  of a sage++ project.
-//  
-//  ----------------------------------
-
-//  ----------------------------------
-//  To traverse the hierarcy of classes, the most obvious approach is
-//  in the following example.  This example searches the tree for a given
-//  class name and a hierarchy to search.  Note that this searches the whole
-//  tree, not just the immediate children.
-//
-//   classHierarchy *findHierarchy(char *name, classHierarchy *h) {
-//     classHierarchy *tmp, *depth;
-//     
-//     // initialize searchlist of hierarchy immediate children...;
-//     // this returns the first hierarchy in the child list...;
-//     tmp = (classHierarchy *) h->children->searchList();
-//
-//     while (tmp) {
-//
-//       // if they are the same, return the current hierarchy...;
-//       if (strcmp(name, tmp->className) == 0) {
-//         return tmp;
-//       } else {
-//         // search tmps children recursively, if not NULL, return that value...;
-//         if (depth = findHierarchy(name, tmp)) {
-//           return depth;
-//         }
-//       }
-//       // get next item in list;
-//       tmp = (classHierarchy *) h->children->nextItem();
-//     }
-//     //  if weve made it to here, it is not anywhere in the hierarchy,
-//     //  so return NULL;
-//     return NULL;
-//   }
-// 
-//   -------------------------------------------------------
-//   There is also a list of the classMembers for each class.  To traverse
-//   that list, it is very similar, but more simple than the above example.
-//   Here is an example of printing out each class member of a specific
-//   member type (e.g. public function).
-//
-// virtual void printMemberType(memberType mt, classHierarchy *h) {
-//   classMember *tmp;
-//   
-//   tmp = (classMember *) h->classMembers->searchList();
-//
-//   while (tmp) {
-//     if (tmp->typeVariant == mt) {
-//       tmp->print();
-//     }
-//     tmp = (classMember *) h->classMembers->nextItem();
-//   }
-// }
-//
-
-
-//  -------------------------------------------------------------
-//  Forward declarations;
-//
-class relationList;   
-
-//  -------------------------------------------------------------
-//  Extern declarations
-//
-//
-extern int strToType(char *s);
-extern char *typeToStr(int ty);
-
-
-// --------------------
-//  type of class members...;
-typedef enum {
-  UNKNOWN_FUNC,
-  PRIVATE_FUNC,
-  PUBLIC_FUNC,
-  PROTECTED_FUNC,
-  ELEMENT_FUNC,
-  UNKNOWN_VAR,
-  PRIVATE_VAR,
-  PUBLIC_VAR,
-  PROTECTED_VAR,
-  ELEMENT_VAR
-  } memberType;
-
-//  -------------------------------------------------------------
-// the main class for accessing the class hierarchy within a sage++
-// file.
-class classHierarchy : public brk_basePtr {
-
- private:
-
-  //  private functions
-  virtual classHierarchy *findClassHierarchy(char *cl); 
-    //returns the hierarchy of the class with className cl;
-  classHierarchy *pushOnTop(SgClassStmt *clSt);
-    // creates a new hierarchy for clSt (a class declarative statement);
-    // and puts it at the highest level of the hierarchy (exclusively ;
-    // for classes with no superclasses) ;
-  virtual classHierarchy * storeInClassHierarchy (SgClassStmt *clSt);
-    // creates a new hierarchy for the class declarative statement clSt;
-    // and stores it where it fits in the hierarchy of classes.  It makes
-    // use of the above two functions pushOnTop and findHierarchy.;
-  void determineMembers(SgFile *aFile);
-    // finds all members in a class, initializing publicVars, protectedVars,
-    // privateVars, publicFuncs, protectedFuncs, and privateFuncs;
-  void allocateLists();
-    // allocates new relationList instances for member fields.;
-
- public:
-
-  // members;
-  relationList *parents;  // linked list of parents  ;
-  relationList *children;  // linked list of children  ;
-  relationList *classMembers;  // linked list of class vars and funcs ;
-  char *className;   // contains the class name ;
-  SgSymbol *classSymbol;   // contains the Sage symbol for the name;
-  SgClassStmt *declaration;   // contains the Sage declaration of the class;
-
-  // constructors;
-  classHierarchy(void);
-  classHierarchy(char * cn);
-  classHierarchy(SgSymbol * cs);
-  classHierarchy(SgClassStmt * clSt);
-
-  // access functions;
-  virtual void print(int tabs); // prints out this class after <tabs> tabs.;
-  virtual void print();   // prints out this class after 0 tabs.;
-  virtual void printAll(int tabs); 
-     // prints out this class after <tabs> tabs, as well as all descendants;
-  virtual void printAllCollections(int tabs); 
-     // prints out this class if it is a collection    ;
-     // after <tabs> tabs, as well as all descendants;
-  virtual void printAll();   
-    // prints out this class after 0 tabs, as well as all descendants;
-  virtual void printMemberType(memberType mt);
-    // prints out all member field/functions of type mt;
-  classHierarchy *findMember (brk_basePtr *);   // look for this element and 
-    // return the ptrNode that points to it;
-  int numParents();  // returns the number of parents;
-  int numChildren();  // returns the number of children ;
-  void determineClassHierarchy(SgFile *aFile);
-    // finds all classes in a file and stores them in a hierarchy.  It makes
-    // use of private functions.  Typically, this is the only necessary 
-    // function to call when trying to find out a class hierarchy for a file.
-  int numberOfDescendants (void); 
-    // returns the total number of all descendants;
-  int numberOfParents (void);  
-    // returns the number of parents of this class;
-  int numberOfChildren (void); 
-    // returns the number of direct children of this class;
-  int isCollection();  
-    // returns true if it is a collection, false if not a collection,
-    // or if it is not known.;
-  char *fileName();  // returns file name where this class is defined if known,
-    // NULL if not known.;
-  int lineNumber();  // returns line number where this class is defined if known,
-    // -1 if not known.;
-  virtual int compare(brk_basePtr *);
-    // compares this heirarchy with another alphabetically using className;
-  void sort ();   // sorts the list, elements must have compare function.,;
-  void sort(int (* compareFunc) (brk_basePtr *, brk_basePtr *));
-  
-};
-
-//  -------------------------------------------------------------
-// the class implementing the linked list for 
-class relationList : public brk_linkedList {
-
- public: 
-
-  // constructor;
-  relationList();  
-
-  // access functions;
-  virtual void printAll(int tNum);  // print all elements in list preceded by
-    // tNum tabs AND print all descendants, incrementing tNum with each 
-    // generation;
-  virtual void printAll();  // as above, with tNum = 0;
-};
-
-
-//  -------------------------------------------------------------;
-// For class variables & functions..;
-class classMember : public brk_basePtr {
-
- public:
-
-  // class vars
-  memberType typeVariant; 
-  SgStatement * declaration;
-  SgSymbol * symbol;
-  char * name;
-  char * typeOf;
-  SgType *memType;
-  
-  // access functions
-  classMember(SgSymbol *sym, memberType tv);
-  classMember(SgStatement *decl, memberType tv);
-  virtual void print();
-  virtual void print(int);
-};
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++extern.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++extern.h
deleted file mode 100644
index ebfa275..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++extern.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-extern void **tablebfnd[];
-extern void **tablellnd[];
-extern void **tabletype[];
-extern void **tablesymbol[];
-extern void **tablelabel[];
- 
-extern int numtablebfnd[];
-extern int numtablellnd[];
-extern int numtabletype[];
-extern int numtablesymbol[];
-extern int numtablelabel[];
- 
- 
-extern void **fileTableClass;
-extern int allocatedForfileTableClass;
-extern void **bfndTableClass;
-extern int allocatedForbfndTableClass;
-extern void **llndTableClass;
-extern int allocatedForllndTableClass;
-extern void **typeTableClass;
-extern int allocatedFortypeTableClass;
-extern void **symbolTableClass;
-extern int allocatedForsymbolTableClass;
-extern void **labelTableClass;
-extern int allocatedForlabelTableClass;
-
-extern SgProject *CurrentProject;
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++proto.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++proto.h
deleted file mode 100644
index 39ade30..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++proto.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-
-void SwitchToFile(int i);
-void ReallocatefileTableClass();
-void ReallocatebfndTableClass();
-void ResetbfndTableClass();
-void ReallocatellndTableClass();
-void ReallocatesymbolTableClass();
-void ReallocatelabelTableClass();
-void ReallocatetypeTableClass();
-void RemoveFromTableType(void * pt);
-void RemoveFromTableSymb(void * pt);
-void RemoveFromTableBfnd(void * pt);
-void RemoveFromTableFile(void * pt);
-void RemoveFromTableLlnd(void * pt);
-void RemoveFromTableLabel(void * pt);
-void SetMappingInTableForBfnd(PTR_BFND bif, void *pt);
-void SetMappingInTableForType(PTR_TYPE type, void *pt);
-void SetMappingInTableForSymb(PTR_SYMB symb, void *pt);
-void SetMappingInTableForLabel(PTR_LABEL lab, void *pt);
-void SetMappingInTableForLlnd(PTR_LLND ll, void *pt);
-void SetMappingInTableForFile(PTR_FILE file, void *pt);
-SgSymbol *GetMappingInTableForSymbol(PTR_SYMB symb);
-SgLabel *GetMappingInTableForLabel(PTR_LABEL lab);
-SgStatement *GetMappingInTableForBfnd(PTR_BFND bf);
-SgStatement *GetMappingInTableForBfnd(PTR_BFND bf);
-SgType *GetMappingInTableForType(PTR_TYPE t);
-SgExpression *GetMappingInTableForLlnd(PTR_LLND ll);
-SgFile *GetMappingInTableForFile(PTR_FILE file);
-SgStatement * BfndMapping(PTR_BFND bif);
-SgExpression * LlndMapping(PTR_LLND llin);
-SgSymbol * SymbMapping(PTR_SYMB symb);
-SgType * TypeMapping(PTR_TYPE ty);
-SgLabel * LabelMapping(PTR_LABEL label);
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++user.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++user.h
deleted file mode 100644
index 2ccd555..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/sage++user.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#ifndef SAGEXXUSER_H 
-#define SAGEXXUSER_H 1
-
-#include "macro.h"
-
-// For C/C++ parser internals
-#include "vpc.h"
-
-// For the fortran parser internals
-#include "f90.h"
-
-// All the "C" functions from the Rennes toolbox
-#include "extcxx_low.h"
-
-class SgProject;
-class SgFile;
-class SgStatement;
-class SgExpression;
-class SgLabel;
-class SgSymbol;
-class SgType;
-class SgUnaryExp;
-class SgClassSymb;
-class SgVarDeclStmt;
-class SgVarRefExp; /* ajm: I think they should all be here! @$!@ */
-
-// All the externs (from libSage++.C) used in libSage++.h
-#include "sage++extern.h"
-
-#define SORRY Message("Sorry, not implemented yet",0)
-
-// Prototype definitions  for all the functions in libSage++.C
-#include "sage++proto.h"
-
-
-// dont delete needed in libSage++.h
-#define USER
-#include "libSage++.h"
-
-#endif /* ndef SAGEXXUSER_H */
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/symb.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/symb.def
deleted file mode 100644
index df72b8b..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/symb.def
+++ /dev/null
@@ -1,30 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-DEFNODECODE(BIF_PARM_DECL,'_','_','_','_','_')
-DEFNODECODE(CONST_NAME,'_','_','_','_','_')
-DEFNODECODE(ENUM_NAME,'_','_','_','_','_')
-DEFNODECODE(FIELD_NAME,'_','_','_','_','_')
-DEFNODECODE(VARIABLE_NAME,'_','_','_','_','_')
-DEFNODECODE(TYPE_NAME,'_','_','_','_','_')
-DEFNODECODE(PROGRAM_NAME,'_','_','_','_','_')
-DEFNODECODE(PROCEDURE_NAME,'_','_','_','_','_')
-DEFNODECODE(PROCESS_NAME,'_','_','_','_','_')
-DEFNODECODE(VAR_FIELD,'_','_','_','_','_')
-DEFNODECODE(LABEL_VAR,'_','_','_','_','_')
-DEFNODECODE(FUNCTION_NAME,'_','_','_','_','_')
-DEFNODECODE(MEMBER_FUNC,'_','_','_','_','_')
-DEFNODECODE(CLASS_NAME,'_','_','_','_','_')
-DEFNODECODE(TECLASS_NAME,'_','_','_','_','_')
-DEFNODECODE(UNION_NAME,'_','_','_','_','_')
-DEFNODECODE(STRUCT_NAME,'_','_','_','_','_')
-DEFNODECODE(LABEL_NAME,'_','_','_','_','_')
-DEFNODECODE(COLLECTION_NAME,'_','_','_','_','_')	
-DEFNODECODE(ROUTINE_NAME,'_','_','_','_','_')	
-DEFNODECODE(CONSTRUCT_NAME,'_','_','_','_','_')  
-DEFNODECODE(INTERFACE_NAME,'_','_','_','_','_')	
-DEFNODECODE(MODULE_NAME,'_','_','_','_','_')
-DEFNODECODE(COMMON_NAME,'_','_','_','_','_')
-	
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/type.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/type.def
deleted file mode 100644
index f7534e4..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/type.def
+++ /dev/null
@@ -1,69 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/* format is the following variant 'a'|'s'|'u'|'t'|'e'|'p'|'d'|'D'|'_',
-   's'|'_', 'b'|'_','c'|'C'|'_', 'f'|'_'
-
-	_ stands for no
------------------------
-	a stands for atomic type (T_INT and so on)
-	u stands for union 
-	t stands for array
-	s stands for structure (first field structure)
-	e stands for enumeration 
-	p stands for pointer or reference
-	d stands for derived 
-	D stands for descript type
-------------------
-	s stands for symbol
-------------------
-	b stands for bastype
-------------------
-	c stands for class type
-	C stand  for collection type
-------------------
-        f stands have a list of fields (should go to symbol also)
-
-*/
-DEFNODECODE(DEFAULT,			'a','_','_','_','_')
-DEFNODECODE(T_INT,			'a','_','_','_','_')
-DEFNODECODE(T_FLOAT,			'a','_','_','_','_')
-DEFNODECODE(T_DOUBLE,			'a','_','_','_','_')
-DEFNODECODE(T_CHAR,			'a','_','_','_','_')
-DEFNODECODE(T_BOOL,			'a','_','_','_','_')
-DEFNODECODE(T_STRING,			'a','_','_','_','_')
-DEFNODECODE(T_COMPLEX,			'a','_','_','_','_')
-DEFNODECODE(T_DCOMPLEX,			'a','_','_','_','_')
-DEFNODECODE(T_GATE,			'a','_','_','_','_')
-DEFNODECODE(T_EVENT,			'a','_','_','_','_')
-DEFNODECODE(T_SEQUENCE,			'a','_','_','_','_')
-
-DEFNODECODE(T_ENUM,			'e','_','_','_','f')
-DEFNODECODE(T_SUBRANGE,			'_','_','_','_','_')
-DEFNODECODE(T_LIST,			'_','_','_','_','_')
-DEFNODECODE(T_ARRAY,			't','_','b','_','_')
-DEFNODECODE(T_RECORD,			's','_','_','_','f')
-DEFNODECODE(T_ENUM_FIELD,		'_','_','_','_','_')
-DEFNODECODE(T_UNKNOWN,			'a','_','_','_','_')
-DEFNODECODE(T_VOID,			'a','_','_','_','_')
-DEFNODECODE(T_DESCRIPT,			'D','_','b','_','_')
-DEFNODECODE(T_FUNCTION,			'_','_','b','_','_')
-DEFNODECODE(T_POINTER,			'p','_','b','_','_')
-DEFNODECODE(T_UNION,			'u','_','_','_','f')
-DEFNODECODE(T_STRUCT,			's','_','_','_','f')
-DEFNODECODE(T_CLASS,			's','_','_','_','f')
-DEFNODECODE(T_TECLASS,			's','_','_','_','f')
-DEFNODECODE(T_DERIVED_CLASS,		'd','s','_','_','_')
-DEFNODECODE(T_DERIVED_TYPE,		'd','s','_','_','_')
-DEFNODECODE(T_COLLECTION,		's','_','_','_','f')
-DEFNODECODE(T_DERIVED_COLLECTION,	'd','s','_','_','_')
-DEFNODECODE(T_DERIVED_TEMPLATE,		'd','s','_','_','_')
-DEFNODECODE(T_REFERENCE,		'p','_','b','_','_')
-
-DEFNODECODE(LOCAL,			'_','_','_','_','_')
-DEFNODECODE(INPUT,			'_','_','_','_','_')
-DEFNODECODE(OUTPUT,			'_','_','_','_','_')
-DEFNODECODE(IO,				'_','_','_','_','_')
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparse.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparse.def
deleted file mode 100644
index 8cd382d..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparse.def
+++ /dev/null
@@ -1,1060 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/*****************************************************************************/
-/*****************************************************************************/
-/*****                                                                   *****/
-/*****    UNPARSE.DEF:   Gregory HOGDAL / Eric MARCHAND    July 1992     *****/
-/*****                   Bodin Francois August 1992                      *****/
-/*****                                                                   *****/
-/*****************************************************************************/
-/*****************************************************************************/
-
-/* 
-   The following types exist: BIFNODE, LLNODE, SYMBNODE and TYPENODE
-
-   Any erroneous construct is parsed into a node of this type.
-   This type of node is accepted without complaint in all contexts
-   by later parsing activities, to avoid multiple error messages
-   for one error.
-   No fields in these nodes are used except the NODE_CODE.  
-*/
-
-/* exemple 
-DEFNODECODE (ERROR_MARK, "error_mark", "x", 0, LLNODE)
-*/
-
-/***** List of commands for BIF NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %CMNT	      : the comment attached to a bif node */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %SYMBID     : Symbol identifier */
-       /* %LL1        : Low Level Node 1 */
-       /* %LL2        : Low Level Node 2 */
-       /* %LL3        : Low Level Node 3 */
-       /* %L2L2       : Low Level Node 2 of Low Level Node 2 */
-       /* %BLOB1      : All Blob 1 */
-       /* %BLOB2      : All Blob 2 */
-       /* %STATENO    : Statement number */
-       /* %L1SYMBID   : pbf->entry.Template.ll_ptr1->entry.Template.symbol->ident; */
-       /* %INWRITEON  : In_Write_Statement Flag ON */
-       /* %INWRITEOFF : In_Write_Statement Flag OFF */
-       /* %INPARAMON  : In_Param_Statement Flag ON */
-       /* %INPARAMOFF : In_Param_Statement Flag OFF */
-       /* %INIMPLION  : In_Impli_Statement Flag ON */
-       /* %INIMPLIOFF : In_Impli_Statement Flag OFF */
-       /* SYMBTYPE    : Type of Symbol */
-       /* %VARLIST    : list of variables / parameters */
-/******************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for BIF NODE *****/
-       /* %RECURSBIT  : int constant RECURSIVE_BIT (integer) */
-       /* %EXPR_LIST  : int constant EXPR_LIST code for Low Level Node (integer) */
-       /* %SPEC_PAIR  : int constant SPEC_PAIR code for Low Level Node (integer) */
-       /* %IOACCESS   : int constant IOACCESS code for Low Level Node (integer) */
-       /* %SATTR      : Symbol Attribut (integer) */
-       /* %STRCST     : String Constant in '' */
-       /* %SYMBID     : Symbol Identifier (string) */
-       /* %SYMBOL     : Symbol node (integer) */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %LL1        : Low Level Node 1 (integer) */
-       /* %LL2        : Low Level Node 2 (integer) */
-       /* %LL3        : Low Level Node 3 (integer) */
-       /* %LABUSE     : Label ptr (do end) (integer) */
-       /* %L1CODE     : Code (variant) of Low Level Node 1 (integer) */
-       /* %L2CODE     : Code (variant) of Low Level Node 2 (integer) */
-       /* %L1L2L1CODE : Code (variant) of Low Level Node 1 of Low Level Node 2 of Low Level Node 1 (integer) */
-	/* %L1L2*L1CODE : Code (variant) of Low Level Node 1 of (Low Level Node 2)* of Low Level Node 1 (integer) follow L2*/
-       /* %L2L1STR    : String (string_val) of Low Level Node 1 of Low Level Node 2 (string) */
-/*****************************************************************************************/
-
-/*
-DEFNODECODE(GLOBAL,             "%CMNT%SETFLAG(QUOTE)%INCTAB%BLOB1%DECTAB%UNSETFLAG(QUOTE)",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(GLOBAL,             "%CMNT%SETFLAG(QUOTE)%BLOB1%UNSETFLAG(QUOTE)",
-'s',0,BIFNODE)
-
-DEFNODECODE(PROG_HEDR,          "%CMNT%IF(%SYMBID != %STRCST'_MAIN')%PUTTABprogram %SYMBID%NL%ENDIF%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(PROC_HEDR,          "%CMNT%PUTTAB%IF(%LL3 != %NULL)%LL3 %ENDIFsubroutine %SYMBID (%VARLIST)%NL%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(PROS_HEDR,          "%CMNT%PUTTAB%IF(%LL3 != %NULL)%LL3 %ENDIFsubroutine %SYMBID (%LL1)%NL%BLOB1",
-'s',0,BIFNODE)
-/*DEFNODECODE(PROS_HEDR,          "%CMNT%PUTTABprocess %SYMBID (%VARLIST)%NL%BLOB1",
-'s',0,BIFNODE) */
-DEFNODECODE(BASIC_BLOCK,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PROCESSES_STAT,     "%CMNT%PUTTABprocesses%NL%INCTAB%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(INPORT_DECL,        "%CMNT%PUTTABinport (%LL2) %LL1%NL",
-'s',2,BIFNODE)
-DEFNODECODE(OUTPORT_DECL,       "%CMNT%PUTTABoutport (%LL2) %LL1%NL",
-'s',2,BIFNODE)
-DEFNODECODE(CHANNEL_STAT,       "%CMNT%PUTTABchannel(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(MERGER_STAT,         "%CMNT%PUTTABmerger(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(MOVE_PORT,          "%CMNT%PUTTABmoveport(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(SEND_STAT,          "%CMNT%PUTTABsend%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT) %IF ( %LL2 != %NULL )%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(RECEIVE_STAT,       "%CMNT%PUTTABreceive%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT) %IF ( %LL2 != %NULL )%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(ENDCHANNEL_STAT,    "%CMNT%PUTTABendchannel%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(PROBE_STAT,          "%CMNT%PUTTABprobe%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(INTENT_STMT,        "%CMNT%PUTTAB%LL2 %LL1%NL",
-'s',2,BIFNODE)
-DEFNODECODE(ALLOCATE_STMT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABallocate(%LL1%IF(%LL2 != %NULL), %LL2%ENDIF)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DEALLOCATE_STMT,    "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABdeallocate(%LL1%IF(%LL2 != %NULL), %LL2%ENDIF)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(NULLIFY_STMT,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABnullify(%LL1)%NL",
-'s',0,BIFNODE)
-
-/* 107 is value for FOR_NODE 
-DEFNODECODE(CONTROL_END,        "%CMNT%IF ( %VALINT107  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABenddo  %SYMBID%INCTAB%NL%ENDIF%IF ( %VALINT102  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%NL%ENDIF%IF ( %VALINT101  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%ENDIF%IF ( %VALINT130  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%NL%ENDIF%IF ( %VALINT124  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF",
-'s',0,BIFNODE) */
-
-DEFNODECODE(CONTROL_END,        "%CMNT%IF ( %VALINT107  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABenddo  %SYMBID%INCTAB%NL%ENDIF%IF ( %VALINT102  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%IF ( %VALINT100  != %CPBIF) subroutine  %SYMBID%ELSE%NL%ENDIF%NL%ENDIF%IF ( %VALINT101  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%NL%ENDIF%IF ( %VALINT130  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%IF ( %VALINT100  != %CPBIF) function  %SYMBID%ELSE%NL%ENDIF%NL%ENDIF%IF ( %VALINT124  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF%IF ( %VALINT109  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABenddo  %SYMBID%INCTAB%NL%ENDIF%IF ( %VALINT285  == %BIFCP)%DECTAB%PUTTABendprocessdo%INCTAB%NL%ENDIF%IF ( %VALINT279  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABend subroutine%NL%NL%NL%ENDIF%IF ( %VALINT175  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABend select  %SYMBID%INCTAB%NL%ENDIF%IF ( %VALINT108  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABend forall  %SYMBID%INCTAB%NL%ENDIF%IF (%VALINT105 == %BIFCP)%SAVENAME%ENDIF%IF (%VALINT137 == %BIFCP)%SAVENAME%ENDIF%IF (%VALINT194 == %BIFCP)%SAVENAME%ENDIF%IF (%VALINT264 == %BIFCP)%SAVENAME%ENDIF",
-  's',0,BIFNODE)
-DEFNODECODE(PROCESSES_END,      "%CMNT%DECTAB%PUTTABendprocesses%NL",
-  's',0,BIFNODE)
-DEFNODECODE(IF_NODE,            "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF(%LL3 != %NULL)%LL3: %ENDIFif (%LL1) then%NL%INCTAB%BLOB1%DECTAB%IF (%BLOB2 != %NULL)%IF (%ELSIFBLOB2 == %NULL)%PUTTABelse  %CNTRNAME%NL%INCTAB%BLOB2%DECTAB%LABELENDIF%PUTTABendif  %CNTRNAME%NL%ELSE%BLOB2%ENDIF%ELSE%LABELENDIF%PUTTABendif  %CNTRNAME%NL%ENDIF",
-'s',0,BIFNODE)
-DEFNODECODE(WHERE_BLOCK_STMT,   "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF(%LL3 != %NULL)%LL3: %ENDIFwhere (%LL1)%NL%INCTAB%BLOB1%DECTAB%IF (%BLOB2 != %NULL)%IF (%ELSWHBLOB2 == %NULL)%PUTTABelsewhere  %CNTRNAME%NL%INCTAB%BLOB2%DECTAB%LABELENDIF%PUTTABendwhere  %CNTRNAME%NL%ELSE%BLOB2%ENDIF%ELSE%LABELENDIF%PUTTABendwhere  %CNTRNAME%NL%ENDIF",
-'s',0,BIFNODE)
-DEFNODECODE(ARITHIF_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABif (%LL1) %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(LOGIF_NODE,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABif (%LL1)  %TABOFF%BLOB1%TABON",
-'s',0,BIFNODE)
-DEFNODECODE(FORALL_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABforall (%LL1%IF(%LL2 != %NULL), %LL2%ENDIF)  %TABOFF%BLOB1%TABON",
-'s',0,BIFNODE)
-DEFNODECODE(LOOP_NODE,          "%ERROR", 
-'s',0,BIFNODE) 
-DEFNODECODE(FOR_NODE,           "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3: %ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)do %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%BLOB1%DECTAB",
-'s',0,BIFNODE)    
-                                                                              
-  /* previously : for %SYMBID = %LL1 %NL %INCTAB%BLOB1%DECTAB enddo%NL",*/
-DEFNODECODE(PROCESS_DO_STAT,    "%CMNT%IF(%LABEL !=%NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 !=%NULL)%LL3: %ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)processdo %IF (%LABUSE !=%NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 !=%NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%BLOB1%DECTAB",  
-'s',2,BIFNODE)
-
-/* wrong
-DEFNODECODE(WHILE_NODE,         "%CMNT%IF(%LABEL !=%NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIFdo %IF (%LABUSE !=%NULL)%STATENO%ENDIF while (%LL1)%NL", 's',0,BIFNODE) 
-*/
-DEFNODECODE(WHILE_NODE,         "%CMNT%IF(%LABEL !=%NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3: %ENDIFdo %IF (%LABUSE !=%NULL)%STATENO %ENDIF%IF(%LL1 != %NULL)while (%LL1)%ENDIF%NL%INCTAB%BLOB1%DECTAB",   
-'s',0,BIFNODE)
-DEFNODECODE(FORALL_NODE,        "%CMNT%IF(%LABEL !=%NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3: %ENDIFforall (%LL1%IF(%LL2 != %NULL), %LL2%ENDIF)%NL%INCTAB%BLOB1%DECTAB",
-'s',0,BIFNODE)
-
-/* DEFNODECODE(CDOALL_NODE,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcdoall %IF (%LABUSE != %NULL)%STATENO%ENDIF%SYMBID = %LL1, %LL2%IF (%LL2 != %NULL) , %LL2%ENDIF%NL",
-'s',0,BIFNODE) */
-
-DEFNODECODE(CDOALL_NODE,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)cdoall %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%BLOB1%DECTAB",
-'s',0,BIFNODE) 
-
-DEFNODECODE(SDOALL_NODE,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(DOACROSS_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CDOACROSS_NODE,     "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(EXIT_STMT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABexit %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CYCLE_STMT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcycle %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(GOTO_NODE,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABgoto %LL3%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ASSGOTO_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABgoto %SYMBID %IF (%LL1 != %NULL)(%LL1)%ENDIF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(COMGOTO_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABgoto (%LL1), %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PAUSE_NODE,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABpause%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CONTAINS_STMT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcontains%NL%NL",
-'s',0,BIFNODE)
-DEFNODECODE(STOP_NODE,          "%ERROR",
-'s',0,BIFNODE)
-
-DEFNODECODE(ASSIGN_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%LL1 = %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(POINTER_ASSIGN_STAT, "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%LL1 => %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(M_ASSIGN_STAT,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PROC_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcall %SYMBID(%LL1)%NL",
-'s',0,BIFNODE)
-/*ACC*/
-DEFNODECODE(ACC_CALL_STMT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcall %SYMBID<<<%LL2>>>(%LL1)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PROS_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprocess call %SYMBID(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(PROS_STAT_LCTN,     "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprocess call %SYMBID(%LL1) location%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(PROS_STAT_SUBM,     "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprocess call %SYMBID(%LL1) submachine%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(ASSLAB_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABassign %LL1 to %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SUM_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MULT_ACC,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MAX_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MIN_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CAT_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(OR_ACC,             "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(AND_ACC,            "%ERROR",
-'s',0,BIFNODE)
-
-/*DEFNODECODE(READ_STAT,          "%CMNTread %IF (%L2CODE == %EXPR_LIST)(%LL2) %ELSE%IF (%L2CODE == %SPEC_PAIR)%IF (%L2L1STR == %STRCST 'fmt')(%LL2) %ELSE%L2L2%IF (%LL1 != %NULL), %ENDIF%ENDIF%ELSE%L2L2%IF (%LL1 != %NULL), %ENDIF%ENDIF%ENDIF%LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(READ_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIFread %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%INWRITEON%IF (%L1L2*L1CODE == %IOACCESS)(%ENDIF%LL1%IF (%L1L2*L1CODE == %IOACCESS))%ENDIF%INWRITEOFF%NL",
-'s',0,BIFNODE) */
-
-/* this is OK but WRITE NODE differ for what reason????????, Should be the same*/
-DEFNODECODE(READ_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABread %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE%IF (%LL2 != %NULL)(%LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%ENDIF%INWRITEON %LL1%INWRITEOFF%NL",
-'s',0,BIFNODE)
-
-/*
-DEFNODECODE(WRITE_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABwrite %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%INWRITEON%IF (%L1L2*L1CODE == %IOACCESS)(%ENDIF%LL1%IF (%L1L2*L1CODE == %IOACCESS))%ENDIF%INWRITEOFF%NL",
-'s',0,BIFNODE) */
-
-
-DEFNODECODE(WRITE_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABwrite %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE%IF (%LL2 != %NULL)(%LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%ENDIF%INWRITEON %LL1%INWRITEOFF%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(PRINT_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprint %IF (%LL2 != %NULL)%SETFLAG(PRINT)%LL2%UNSETFLAG(PRINT)%IF (%LL1!= %NULL),%ENDIF%ENDIF%INWRITEON %LL1%INWRITEOFF%NL",
-'s',0,BIFNODE)
-
-
-
-DEFNODECODE(OTHERIO_STAT,       "%CMNT%PUTTAB%LL1%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(BLOB,               "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(SIZES,              "%ERROR",
-'s',0,BIFNODE)
-
-
-/*
-DEFNODECODE(FUNC_HEDR,          "%CMNT%PUTTAB%IF(%SATTR == %RECURSBIT)recursive %ENDIF%SYMBTYPE function %SYMBID (%VARLIST) %NL%BLOB1",
-*/
-DEFNODECODE(FUNC_HEDR,          "%CMNT%PUTTAB%IF(%LL3 != %NULL)%LL3 %ENDIF%IF(%LL2 != %NULL)%LL2 %ENDIFfunction %SYMBID (%VARLIST)%IF(%LL1 != %NULL) result(%LL1)%ENDIF %NL%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(WHERE_NODE,         "%CMNT%IF (%LABEL != %NULL)%LABEL%ENDIF%PUTTABwhere (%LL1) %LL2 = %LL3%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ALLDO_NODE,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(IDENTIFY,           "%CMNT%PUTTABidentify %LL1 %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(FORMAT_STAT,        "%CMNT%IF (%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%LL1%NL", 
-'s',0,BIFNODE)
-DEFNODECODE(STOP_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABstop%IF (%LL1 != %NULL)%LL1%ENDIF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(RETURN_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABreturn %LL1%NL",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(ELSEIF_NODE,        " (%LL1) then%NL%INCTAB%BLOB1%DECTAB %IF (%BLOB2 != %NULL) %IF (%ELSIFBLOB2 == %NULL)%PUTTABelse%NL%ELSE%PUTTABelse if%ENDIF%BLOB2%IF (%BLOB2 != %NULL)%NL%ENDIF%ELSE%NL%ENDIF",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(ELSEIF_NODE,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABelse if (%LL1) then  %SYMBID%NL%INCTAB%BLOB1%DECTAB%IF (%BLOB2 != %NULL)%IF (%ELSIFBLOB2 == %NULL)%PUTTABelse  %CNTRNAME%NL%INCTAB%BLOB2%DECTAB%LABELENDIF%PUTTABendif  %CNTRNAME%NL%ELSE%BLOB2%ENDIF%ELSE%LABELENDIF%PUTTABendif  %CNTRNAME%NL%ENDIF",
-'s',0,BIFNODE)
-DEFNODECODE(ELSEWH_NODE,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABelsewhere (%LL1)  %SYMBID%NL%INCTAB%BLOB1%DECTAB%IF (%BLOB2 != %NULL)%IF (%ELSWHBLOB2 == %NULL)%PUTTABelsewhere  %CNTRNAME%NL%INCTAB%BLOB2%DECTAB%LABELENDIF%PUTTABendwhere  %CNTRNAME%NL%ELSE%BLOB2%ENDIF%ELSE%LABELENDIF%PUTTABendwhere  %CNTRNAME%NL%ENDIF",
-'s',0,BIFNODE)
-
-/*NO_OPnodes*/
-DEFNODECODE(COMMENT_STAT,       "%CMNT%NL",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(CONT_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABcontinue%NL",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(CONT_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcontinue%NL",
-'s',0,BIFNODE)
-DEFNODECODE(VAR_DECL,           "%CMNT%PUTTAB%SETFLAG(VARLEN)%TYPEDECLON%LL2%IF (%LL3 != %NULL),%LL3:: %SETFLAG(VARDECL)%SETFLAG(PARAM)%LL1%UNSETFLAG(VARDECL)%UNSETFLAG(PARAM)%ELSE%SETFLAG(VARDECL) %LL1%UNSETFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%TYPEDECLOF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(VAR_DECL_90,        "%CMNT%PUTTAB%SETFLAG(VARLEN)%TYPEDECLON%LL2%IF (%LL3 != %NULL),%LL3:: %SETFLAG(VARDECL)%SETFLAG(PARAM)%LL1%UNSETFLAG(VARDECL)%UNSETFLAG(PARAM)%ELSE:: %SETFLAG(VARDECL) %LL1%UNSETFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%TYPEDECLOF%NL",
-'s',0,BIFNODE)
-/*
-ALLOCATABLE_STMT,       ALLOCATE_STMT,           CONTAINS_STMT,           CYCLE_STMT,              DEALLOCATE_STMT,
- EXIT_STMT,              INTENT_STMT,             INTERFACE_STMT,          MODULE_PROC_STMT,        MODULE_STMT,
- NULLIFY_STMT,           OPTIONAL_STMT,           POINTER_STMT,            PRIVATE_STMT,            PUBLIC_STMT,
- SEQUENCE_STMT,          TARGET_STMT,             USE_STMT, 
-*/
-DEFNODECODE(PARAM_DECL,         "%CMNT%PUTTABparameter (%INPARAMON%SETFLAG(PARAM)%LL1%UNSETFLAG(PARAM)%INPARAMOFF)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(COMM_STAT,          "%CMNT%PUTTABcommon %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PROS_COMM,           "%CMNT%PUTTABprocess common %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(EQUI_STAT,          "%CMNT%PUTTABequivalence %LL1%NL",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(IMPL_DECL,          "%CMNT%PUTTABimplicit %IF (%LL1 != %NULL)%IF (%LL2 != %NULL)%ERROR'IMPLICIT Error'%ELSE%INIMPLION%LL1%INIMPLIOFF%ENDIF%ELSE%INIMPLION%LL2%INIMPLIOFF%ENDIF%NL",
-'s',0,BIFNODE)
-*/
-
-DEFNODECODE(IMPL_DECL,          "%CMNT%PUTTABimplicit %IF (%LL1 != %NULL)%SETFLAG(RANGEPRINT)%INIMPLION%LL1%INIMPLIOFF%UNSETFLAG(RANGEPRINT)%ELSEnone%ENDIF%NL",
-'s',0,BIFNODE)
-
-
-DEFNODECODE(DATA_DECL,          "%CMNT%PUTTAB%LL1%NL",
-'s',0,BIFNODE)
-/* DEFNODECODE(SAVE_DECL,          "%CMNT%PUTTABsave %IF (%LL1 != %NULL)%LL1%ELSEall%ENDIF%NL",
-'s',0,BIFNODE) */
-DEFNODECODE(SAVE_DECL,          "%CMNT%PUTTABsave %IF (%LL1 != %NULL)%LL1%ENDIF%NL",
-'s',0,BIFNODE) 
-DEFNODECODE(STMTFN_STAT,        "%CMNT%PUTTAB%LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DIM_STAT,           "%CMNT%PUTTABdimension %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PROCESSORS_STAT,    "%CMNT%PUTTABprocessors %LL1%NL",
-'s',1,BIFNODE)
-DEFNODECODE(ALLOCATABLE_STMT,   "%CMNT%PUTTABallocatable:: %LL1%NL",
-'s',1,BIFNODE)
-DEFNODECODE(OPTIONAL_STMT,      "%CMNT%PUTTABoptional:: %LL1%NL",
-'s',1,BIFNODE)
-DEFNODECODE(EXTERN_STAT,        "%CMNT%PUTTABexternal %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(INTRIN_STAT,        "%CMNT%PUTTABintrinsic %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PRIVATE_STMT,       "%CMNT%PUTTABprivate %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PUBLIC_STMT,        "%CMNT%PUTTABpublic %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(POINTER_STMT,       "%CMNT%PUTTABpointer:: %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(TARGET_STMT,        "%CMNT%PUTTABtarget:: %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(STATIC_STMT,        "%CMNT%PUTTABstatic:: %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SEQUENCE_STMT,      "%CMNT%PUTTABsequence%NL",
-'s',0,BIFNODE)
-DEFNODECODE(INTERFACE_STMT,     "%CMNT%PUTTABinterface %SYMBID%NL%INCTAB%BLOB1%DECTAB%PUTTABend interface%NL",
-'s',0,BIFNODE)
-DEFNODECODE(INTERFACE_ASSIGNMENT, "%CMNT%PUTTABinterface assignment (=)%NL%INCTAB%BLOB1%DECTAB%PUTTABend interface%NL",
-'s',0,BIFNODE)
-DEFNODECODE(INTERFACE_OPERATOR, "%CMNT%PUTTABinterface operator (%SYMBID)%NL%INCTAB%BLOB1%DECTAB%PUTTABend interface%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(ENUM_DECL,          "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(CLASS_DECL,         "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(UNION_DECL,         "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(STRUCT_DECL,        "%CMNT%PUTTABtype %IF (%LL1 != %NULL),%LL1:: %ENDIF%SYMBID%NL%INCTAB%BLOB1%DECTAB%PUTTABend type%NL",
-'d',0,BIFNODE)
-DEFNODECODE(DERIVED_CLASS_DECL, "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(EXPR_STMT_NODE,     "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(DO_WHILE_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CASE_NODE,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABcase (%LL1) %SYMBID%INCTAB%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SWITCH_NODE,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3: %ENDIFselect case (%LL1)%NL%INCTAB%BLOB1%DECTAB",
-'s',0,BIFNODE)
-DEFNODECODE(DEFAULT_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABcase default %SYMBID%INCTAB%NL",
-'s',0,BIFNODE)
-DEFNODECODE(BREAK_NODE,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CONTINUE_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(RETURN_NODE,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(ASM_NODE,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(LABEL_STAT,         "%ERROR",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(PROC_COM,           "%ERROR",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(ATTR_DECL,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(NAMELIST_STAT,      "%CMNT%PUTTABnamelist %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(OPEN_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABopen (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CLOSE_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABclose (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ENDFILE_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABendfile (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(BACKSPACE_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABbackspace (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(INQUIRE_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABinquire (%LL2)%IF(%LL1 != %NULL) %LL1%ENDIF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(REWIND_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABrewind (%LL2)%NL",
-'s',0,BIFNODE)
-/* DEFNODECODE(ENTRY_STAT,      "%CMNT%PUTTABentry %SYMBID(%VARLIST)%NL",
-'s',0,BIFNODE) */
-DEFNODECODE(ENTRY_STAT,      "%CMNT%PUTTABentry %SYMBID%IF(%LL1 != %NULL)(%LL1)%ENDIF%IF(%LL2 != %NULL) result(%LL2)%ENDIF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(MODULE_PROC_STMT,      "%CMNT%PUTTABmodule procedure %LL1%NL",
-'s',0,BIFNODE) 
-
-DEFNODECODE(BLOCK_DATA,      "%CMNT%PUTTABblock data%IF(%SYMBID != %STRCST'_BLOCK') %SYMBID%ENDIF%NL%BLOB1%NL%PUTTABend%NL",
-'s',0,BIFNODE)
-/*DEFNODECODE(BLOCK_DATA,      "%CMNT%PUTTABblock data %SYMBID%NL%BLOB1%NL%PUTTABend%NL",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(MODULE_STMT,      "%CMNT%PUTTABmodule %SYMBID%NL%BLOB1%PUTTABend module %NL%NL",
-'s',0,BIFNODE)
-DEFNODECODE(USE_STMT,        "%CMNT%PUTTABuse %SYMBID%IF(%LL1 != %NULL), %LL1%ENDIF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(INCLUDE_LINE,        "%CMNT%PUTTABinclude %LL1%NL",
-'s',0,BIFNODE)
-
-/*****************variant tags for low level nodes********************/
-
-/***** List of commands for LOW LEVEL NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %LL1        : Low Level Node 1 */
-       /* %LL2        : Low Level Node 2 */
-       /* %SYMBID     : Symbol identifier */
-       /* %TYPE       : Type */
-       /* %L1SYMBCST  : Constant Value of Low Level Node Symbol */
-       /* %INTVAL     : Integer Value */
-       /* %STATENO    : Statement Number */
-       /* %STRVAL     : String Value */
-       /* %BOOLVAL    : Boolean Value */
-       /* %CHARVAL    : Char Value */
-       /* %ORBPL1     : Openning Round Brackets on Precedence of Low Level Node 1 */
-       /* %CRBPL1     : Closing Round Brackets on Precedence of Low Level Node 1 */
-       /* %ORBPL2     : Openning Round Brackets on Precedence of Low Level Node 2 */
-       /* %CRBPL2     : Closing Round Brackets on Precedence of Low Level Node 2 */
-/***********************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for LOW LEVEL NODE *****/
-       /* %STRCST     : String Constant in '' */
-       /* %SYMBID     : Symbol Identifier (string) */
-       /* %SYMBOL     : Symbol node (integer) */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %LL1        : Low Level Node 1 (integer) */
-       /* %LL2        : Low Level Node 2 (integer) */
-       /* %LABUSE     : Label ptr (do end) (integer) */
-       /* %L1CODE     : Code (variant) of Low Level Node 1 (integer) */
-       /* %L2CODE     : Code (variant) of Low Level Node 2 (integer) */
-       /* %INWRITE    : In_Write_Statement (integer / boolean flag) */
-       /* %INPARAM    : In_Param_Statement (integer / boolean flag) */
-       /* %INIMPLI    : In_Impli_Statement (integer / boolean flag) */
-/************************************************************************************************/
-
-
-DEFNODECODE(LEN_OP,            "%IF (%LL1 != %NULL)%IF(%LL2 != %NULL)*(%LL1)%ELSE*%LL1%ENDIF%IF (%CHECKFLAG(STYPE) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%ENDIF",'e',0,LLNODE)
-DEFNODECODE(INT_VAL,            "%INTKIND",
-'c',0,LLNODE)
-DEFNODECODE(FLOAT_VAL,          "%STRVAL%KIND",
-'c',0,LLNODE)
-DEFNODECODE(DOUBLE_VAL,         "%STRVAL%KIND",
-'c',0,LLNODE)
-DEFNODECODE(BOOL_VAL,           "%BOOLVAL%KIND",
-'c',0,LLNODE)
-DEFNODECODE(CHAR_VAL,           "%IF (%INIMPLI == %NULL)\\%ENDIF%CHARVAL%IF (%INIMPLI == %NULL)\\%ENDIF",
-'c',0,LLNODE)
-/*
-DEFNODECODE(STRING_VAL,         "%IF (%CHECKFLAG(QUOTE) != %NULL)'%STRVAL'%ELSE\\%STRVAL\\%ENDIF",
-'c',0,LLNODE)
-*/
-DEFNODECODE(STRING_VAL,         "%STRKIND%SYMQUOTE%STRVAL%SYMQUOTE",
-'c',0,LLNODE)
-DEFNODECODE(KEYWORD_VAL,        "%STRVAL",
-'c',0,LLNODE)
-DEFNODECODE(COMPLEX_VAL,        "%SETFLAG(CMPLXCONST)(%LL1, %LL2)%UNSETFLAG(CMPLXCONST)",
-'c',0,LLNODE)
-
-DEFNODECODE(CONST_REF,          "%SYMBID",
-'r',2,LLNODE)
-/*
-DEFNODECODE(VAR_REF,            "%SYMBID%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',0,LLNODE)
-*/
-DEFNODECODE(VAR_REF,            "%SYMBID%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%TYPEDECL != %NULL)%IF (%TYPEDECL != %TYPEBASE)%STRINGLEN%ENDIF%ENDIF",
-'r',0,LLNODE)
-/*
-DEFNODECODE(ARRAY_REF,          "%SYMBID%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%SETFLAG(ARRAYOP)(%LL1)%POPFLAG(VARDECL)%UNSETFLAG(ARRAYOP)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',1,LLNODE)
-*/
-DEFNODECODE(ARRAY_REF,          "%SYMBID%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%PUSHFLAG(PARAM)%SETFLAG(ARRAYOP)(%LL1)%POPFLAG(VARDECL)%POPFLAG(PARAM)%UNSETFLAG(ARRAYOP)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%TYPEDECL != %NULL)%IF (%TYPEDECL != %TYPEBASE)%STRINGLEN%ENDIF%ENDIF%ENDIF",
-'r',1,LLNODE)
-DEFNODECODE(PROCESSORS_REF,     "%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%IF(%CHECKFLAG(NOARRAY) == %NULL)(%LL1)%ENDIF%POPFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%STRINGLEN%ENDIF",
-'r',1,LLNODE)
-DEFNODECODE(RECORD_REF,         "%LL1%%%LL2",
-'r',2,LLNODE)
-DEFNODECODE(STRUCTURE_CONSTRUCTOR,  "%SYMBID(%LL1)",
-'r',1,LLNODE)
-DEFNODECODE(CONSTRUCTOR_REF,    "(/%LL1/)",
-'r',2,LLNODE)
-DEFNODECODE(TYPE_REF,           "%SYMBID",
-'r',2,LLNODE)
-
-DEFNODECODE(ENUM_REF,           "%SYMBID",
-'r',2,LLNODE)
-
-DEFNODECODE(LABEL_REF,          "%STATENO",
-'r',0,LLNODE)
-DEFNODECODE(TYPE_OP,            "%TYPE",
-'e',1,LLNODE)
-DEFNODECODE(DIMENSION_OP,       "dimension(%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(ALLOCATABLE_OP,     "allocatable",
-'e',1,LLNODE)
-DEFNODECODE(PARAMETER_OP,       "parameter",
-'e',1,LLNODE)
-DEFNODECODE(TARGET_OP,          "target",
-'e',1,LLNODE)
-DEFNODECODE(STATIC_OP,          "static",
-'e',1,LLNODE)
-DEFNODECODE(SAVE_OP,            "save",
-'e',1,LLNODE)
-DEFNODECODE(POINTER_OP,         "pointer",
-'e',1,LLNODE)
-DEFNODECODE(INTRINSIC_OP,       "intrinsic",
-'e',1,LLNODE)
-DEFNODECODE(OPTIONAL_OP,        "optional",
-'e',1,LLNODE)
-DEFNODECODE(EXTERNAL_OP,        "external",
-'e',1,LLNODE)
-DEFNODECODE(PRIVATE_OP,         "private",
-'e',1,LLNODE)
-DEFNODECODE(PUBLIC_OP,          "public",
-'e',1,LLNODE)
-DEFNODECODE(IN_OP,              "intent(in)",
-'e',1,LLNODE)
-DEFNODECODE(OUT_OP,             "intent(out)",
-'e',1,LLNODE)
-DEFNODECODE(INOUT_OP,           "intent(inout)",
-'e',1,LLNODE)
-DEFNODECODE(OPERATOR_OP,        "operator(%SYMBID)",
-'e',1,LLNODE)
-DEFNODECODE(ASSIGNMENT_OP,      "assignment(=)",
-'e',1,LLNODE)
-DEFNODECODE(KIND_OP,            "kind=%LL1",
-'e',1,LLNODE)
-DEFNODECODE(LENGTH_OP,          "len=%LL1",
-'e',1,LLNODE)
-DEFNODECODE(RECURSIVE_OP,       "recursive",
-'e',0,LLNODE)
-DEFNODECODE(ELEMENTAL_OP,       "elemental",
-'e',0,LLNODE)
-DEFNODECODE(PURE_OP,	        "pure",
-'e',0,LLNODE)
-
-DEFNODECODE(ACC_DEVICE_OP,	        "device",
-'e',0,LLNODE)
-DEFNODECODE(ACC_VALUE_OP,	        "value",
-'e',0,LLNODE)
-DEFNODECODE(ACC_SHARED_OP,	        "shared",
-'e',0,LLNODE)
-DEFNODECODE(ACC_CONSTANT_OP,	        "constant",
-'e',0,LLNODE)
-DEFNODECODE(ACC_HOST_OP,	        "host",
-'e',0,LLNODE)
-DEFNODECODE(ACC_GLOBAL_OP,	        "global",
-'e',0,LLNODE)
-DEFNODECODE(ACC_ATTRIBUTES_OP,	        "attributes(%LL1)",
-'e',1,LLNODE)
-
-
-DEFNODECODE(VAR_LIST,           "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(PORT_TYPE_OP,       "%TYPE%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(INPORT_TYPE_OP,       "inport ( %TYPE%SETFLAG(RECPORT)%LL1%IF (%LL2 != %NULL), %LL2%ENDIF%IF(%CHECKFLAG(RECPORT) != %NULL))%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(OUTPORT_TYPE_OP,       "outport( %TYPE%SETFLAG(RECPORT)%LL1%IF (%LL2 != %NULL), %LL2%ENDIF%IF(%CHECKFLAG(RECPORT) != %NULL))%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(INPORT_NAME,        "%IF(%CHECKFLAG(PORT) != %NULL)PORT=%ELSEIN=%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(OUTPORT_NAME,       "%IF(%CHECKFLAG(PORT) != %NULL)PORT=%ELSEOUT=%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(FROMPORT_NAME,      "FROM=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(TOPORT_NAME,        "TO=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(IOSTAT_STORE,       "IOSTAT=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(EMPTY_STORE,        "EMPTY=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(ERR_LABEL,          "ERR=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(END_LABEL,          "END=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_IMPL_DO,       "(%LL1, %SYMBID=%LL2)", 
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_ELT,           "%IF (%SYMBOL == %NULL)%LL1%ELSE%SYMBID%LL1%ENDIF%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_SUBS,          "(%LL1)%IF (%LL2 != %NULL)%LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_RANGE,         "(%IF (%LL1 != %NULL)%LL1%ENDIF:%IF (%LL2 != %NULL)%LL2%ENDIF)",
-'e',2,LLNODE)
-
-DEFNODECODE(ICON_EXPR,          "%LL1%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE)
-
-/* Probablement faux BODIN
-DEFNODECODE(EXPR_LIST,          "%LL1%IF (%INPARAM != %NULL) = %L1SYMBCST%ENDIF%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE) */
-
-DEFNODECODE(EXPR_LIST,          "%LL1%IF (%CHECKFLAG(PARAM) != %NULL)%IF (%VALUE != %NULL) = %PUSHFLAG(PARAM)%PUSHFLAG(VARDECL)%L1SYMBCST%POPFLAG(PARAM)%POPFLAG(VARDECL)%ENDIF%ENDIF%ENDIF%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE) 
- 
-DEFNODECODE(RANGE_LIST,         "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CASE_CHOICE,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(DEF_CHOICE,         "%LL1%IF (%LL2 != %NULL):%LL2",
-'e',2,LLNODE)
-DEFNODECODE(VARIANT_CHOICE,     "%ERROR",
-'e',2,LLNODE)
-/*
-DEFNODECODE(DDOT,               "%LL1%IF (%INWRITE != %NULL),%ELSE%IF (%INIMPLI != %NULL)-%ELSE%IF (%CHECKFLAG(LOOP) != %NULL),%ELSE:%ENDIF%ENDIF%ENDIF%LL2",
-*/
-DEFNODECODE(DDOT,               "%LL1%IF (%CHECKFLAG(ARRAYOP) != %NULL):%ELSE%IF (%INWRITE != %NULL),%ELSE%IF (%INIMPLI != %NULL)-%ELSE%IF (%CHECKFLAG(LOOP) != %NULL),%ELSE:%ENDIF%ENDIF%ENDIF%ENDIF%LL2",
-'e',2,LLNODE)
-DEFNODECODE(RANGE_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FORALL_OP,           "%SYMBID=%LL1",
-'e',2,LLNODE)
-DEFNODECODE(UPPER_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LOWER_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EQ_OP,              "%ORBPL1%LL1%CRBPL1 .eq. %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(LT_OP,              "%ORBPL1%LL1%CRBPL1 .lt. %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(GT_OP,              "%ORBPL1%LL1%CRBPL1 .gt. %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(NOTEQL_OP,          "%ORBPL1%LL1%CRBPL1 .ne. %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(LTEQL_OP,           "%ORBPL1%LL1%CRBPL1 .le. %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(GTEQL_OP,           "%ORBPL1%LL1%CRBPL1 .ge. %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(ADD_OP,             "%ORBPL1%LL1%CRBPL1 + %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(SUBT_OP,            "%ORBPL1%LL1%CRBPL1 - %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(OR_OP,              "%ORBPL1%LL1%CRBPL1 .or. %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(MULT_OP,            "%ORBPL1%LL1%CRBPL1 * %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(DIV_OP,             "%ORBPL1%LL1%CRBPL1 / %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(MOD_OP,             "%ORBPL1%LL1%CRBPL1%% %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(AND_OP,             "%ORBPL1%LL1%CRBPL1 .and. %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(EXP_OP,             "%ORBPL1EXP%LL1%CRBPL1EXP** %ORBPL2EXP%LL2%CRBPL2EXP",
-'e',2,LLNODE)
-DEFNODECODE(ARRAY_MULT,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CONCAT_OP,          "%ORBPL1%LL1%CRBPL1//%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(XOR_OP,             "%ORBPL1%LL1%CRBPL1.xor.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(EQV_OP,             "%ORBPL1%LL1%CRBPL1.eqv.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(NEQV_OP,            "%ORBPL1%LL1%CRBPL1.neqv.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(MINUS_OP,           "%IF (%CHECKFLAG(CMPLXCONST) != %NULL)-%LL1%ELSE(-(%LL1))%ENDIF",
-'e',1,LLNODE)
-DEFNODECODE(NOT_OP,             ".not.(%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(ASSGN_OP,           "%LL1=%PUSHFLAG(VARDECL)%PUSHFLAG(PARAM)%LL2%POPFLAG(VARDECL)%POPFLAG(PARAM)",
-'e',2,LLNODE)
-DEFNODECODE(RENAME_NODE,        "%LL1%IF(%LL2 != %NULL)=>%LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(KEYWORD_ARG,        "%LL1=%LL2",
-'e',2,LLNODE)
-DEFNODECODE(LABEL_ARG,          "*%LL1",
-'e',1,LLNODE)
-DEFNODECODE(ONLY_NODE,          "only: %LL1",
-'e',1,LLNODE)
-DEFNODECODE(DEREF_OP,           "%LL1",
-'e',1,LLNODE)
-DEFNODECODE(POINTST_OP,         "%LL1=>%LL2",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MINUSMINUS_OP,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PLUSPLUS_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BITAND_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BITOR_OP,           "%ERROR",
-'e',2,LLNODE)
-
-
-
-DEFNODECODE(STAR_RANGE,         "*",
-'e',2,LLNODE)
-
-DEFNODECODE(PROC_CALL,          "%SYMBID (%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(PROS_CALL,          "%SYMBID (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(FUNC_CALL,          "%SYMBID (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(OVERLOADED_CALL,    "%LL1",
-'e',1,LLNODE)
-
-
-DEFNODECODE(ACCESS_REF,         "%LL1%IF (%LL2 != %NULL) (%LL2)%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CONS,               "%LL1, %LL2",
-'e',2,LLNODE)
-DEFNODECODE(ACCESS,             "%LL1, FORALL = (%SYMBID = %LL2)",
-'e',2,LLNODE)
-DEFNODECODE(IOACCESS,           "%IF (%LL1 != %NULL)(%LL1, %ENDIF%SYMBID = %LL2%IF (%LL1 != %NULL))%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CONTROL_LIST,       "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(SEQ,                "%LL1%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(SPEC_PAIR,          "%IF (%CHECKFLAG(PRINT) != %NULL)%LL2%ELSE%LL1 = %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(COMM_LIST,          "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)                   
-DEFNODECODE(STMT_STR,           "%STMTSTR",
-'e',2,LLNODE)
-DEFNODECODE(EQUI_LIST,          "(%LL1)%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(IMPL_TYPE,          "%TYPE %IF (%LL1 != %NULL)(%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(STMTFN_DECL,        "%SYMBID (%VARLIST) = %LL1",
-'e',2,LLNODE)
-DEFNODECODE(DEFINED_OP,         "%IF(%LL2 != %NULL)(%LL1 %SYMBID %LL2)%ELSE%SYMBID(%LL1)%ENDIF",
-'e',2,LLNODE)
-
-
-DEFNODECODE(BIT_COMPLEMENT_OP,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXPR_IF,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXPR_IF_BODY,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_REF,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LSHIFT_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RSHIFT_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(UNARY_ADD_OP,       "%IF (%CHECKFLAG(CMPLXCONST) != %NULL)+%LL1%ELSE(+(%LL1))%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(SIZE_OP,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(INTEGER_DIV_OP,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(SUB_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LE_OP,              "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(GE_OP,              "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(NE_OP,              "%ERROR",
-'e',2,LLNODE)
-
-DEFNODECODE(CLASSINIT_OP,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CAST_OP,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ADDRESS_OP,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(POINSTAT_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(COPY_NODE,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(INIT_LIST,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(VECTOR_CONST,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_NUMBER,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ARITH_ASSGN_OP,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ARRAY_OP,           "%LL1%SETFLAG(ARRAYOP)(%LL2)%UNSETFLAG(ARRAYOP)",
-'e',2,LLNODE)
-DEFNODECODE(NEW_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(DELETE_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(NAMELIST_LIST,      "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-/* new tag for some expression */
-
-DEFNODECODE(CEIL_DIV_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MAX_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIF_SAVE_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MIN_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIF_ADDR_EXPR,      "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIF_NOP_EXPR,       "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIF_RTL_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUNC_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUNC_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOOR_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOOR_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CEIL_MOD_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ROUND_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ROUND_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RDIV_EXPR,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXACT_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CONVERT_EXPR,       "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(CONST_DECL,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ABS_EXPR,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_ANDIF_EXPR,   "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_AND_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_NOT_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_ORIF_EXPR,    "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PREINCREMENT_EXPR,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PREDECREMENT_EXPR,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(COMPOUND_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOAT_EXPR,         "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIT_IOR_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_XOR_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_ANDTC_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_OR_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_TRUNC_EXPR,     "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(RROTATE_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LROTATE_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RANGE_EXPR,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(POSTDECREMENT_EXPR, "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(REFERENCE_TYPE,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_FLOOR_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_ROUND_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_CEIL_EXPR ,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_DECL ,     "%ERROR",
-'d',2,LLNODE)
-DEFNODECODE(MODIFY_EXPR,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(REFERENCE_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RESULT_DECL,        "%ERROR",
-'d',2,LLNODE)
-DEFNODECODE(PARM_DECL,          "%ERROR",
-'d',2,LLNODE)
-
-
-/*****************variant tags for symbol table entries********************/
-
-DEFNODECODE(BIF_PARM_DECL,      "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(CONST_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(ENUM_NAME,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(FIELD_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(VARIABLE_NAME,      "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(TYPE_NAME,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(PROGRAM_NAME,       "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(PROCEDURE_NAME,     "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(PROCESS_NAME,       "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(VAR_FIELD,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(LABEL_VAR,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(FUNCTION_NAME,      "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(MEMBER_FUNC,        "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(CLASS_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(UNION_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(STRUCT_NAME,        "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(LABEL_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-
-/*****************variant tags for type nodes********************/
-
-/***** List of commands for TYPE NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %BASETYPE   : Base Type Name Identifier */
-       /* %NAMEID     : Name Identifier */
-       /* %TABNAME    : Self Name from Table */
-       /* %RANGES     : Ranges */
-       /* %RANGLL1    : Low Level Node 1 of Ranges */
-/*******************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for TYPE NODE *****/
-       /* %STRCST     : String Constant in '' */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %INIMPLI    : In_Impli_Statement (integer / boolean flag) */
-/******************************************************************************************/
-
-/* CODES AYANT DISPARU :
- T_SEQUENCE,             T_EVENT,                 T_GATE,
-*/
-
-DEFNODECODE(DEFAULT,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_INT,              "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_FLOAT,            "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_DOUBLE,           "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_CHAR,             "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_BOOL,             "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_STRING,           "%TABNAME%SETFLAG(STYPE)%SETFLAG(TSRIN)%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF%UNSETFLAG(TSRIN)%UNSETFLAG(STYPE) ",
-'t',0,TYPENODE)
-DEFNODECODE(T_COMPLEX,          "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_DCOMPLEX,         "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-
-
-
-DEFNODECODE(T_ENUM,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_SUBRANGE,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_LIST,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_ARRAY,            "%BASETYPE %RANGES",
-'t',0,TYPENODE)
-DEFNODECODE(T_RECORD,           "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_ENUM_FIELD,       "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_UNKNOWN,          "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_VOID,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_DESCRIPT,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_FUNCTION,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_POINTER,          "%BASETYPE",
-'t',0,TYPENODE)
-DEFNODECODE(T_UNION,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_STRUCT,           "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_CLASS,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_DERIVED_CLASS,    "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_DERIVED_TYPE,     "type (%NAMEID)",
-'t',0,TYPENODE)
-
-
-DEFNODECODE(LOCAL,              "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(INPUT,              "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(OUTPUT,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(IO,                 "%ERROR",
-'t',0,TYPENODE)
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseC++.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseC++.def
deleted file mode 100644
index ef81403..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseC++.def
+++ /dev/null
@@ -1,833 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/*****************************************************************************/
-/*****************************************************************************/
-/*****                                                                   *****/
-/*****    UNPARSE.DEF:   Bodin Francois Sepetmber 1992                   *****/
-/*****           with major changes by d. gannon summer 1993             *****/
-/*****           Version C++                                             *****/
-/*****                                                                   *****/
-/*****************************************************************************/
-/*****************************************************************************/
-
-
-DEFNODECODE(GLOBAL,             "%SETFLAG(ARRAYREF)%UNSETFLAG(ARRAYREF)%SETFLAG(CLASSDECL)%UNSETFLAG(CLASSDECL)%SETFLAG(PAREN)%UNSETFLAG(PAREN)%SETFLAG(ELIST)%UNSETFLAG(ELIST)%SETFLAG(QUOTE)%BLOB1%UNSETFLAG(QUOTE)",
-'s',0,BIFNODE)
-DEFNODECODE(PROG_HEDR,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PROC_HEDR,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(BASIC_BLOCK,        "%CMNT%PUTTAB{%NL%INCTAB%BLOB1%DECTAB%PUTTAB}%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(MODULE_STMT,        "%CMNT%PUTTAB%NL%INCTAB%BLOB1%DECTAB%PUTTAB%NL",
-'s',0,BIFNODE)
-
-/* 107 is value for FOR_NODE */
-DEFNODECODE(CONTROL_END,        "",
-'s',0,BIFNODE)
-DEFNODECODE(IF_NODE,            "%CMNT%PUTTABif (%LL1) %NL%PUTTAB{%INCTAB%NL%BLOB1%DECTAB%PUTTAB}%NL%IF (%BLOB2 != %NULL)%PUTTABelse %NL%PUTTAB{%INCTAB%NL%BLOB2%DECTAB%PUTTAB}%NL%ENDIF",
-'s',0,BIFNODE)
-DEFNODECODE(ARITHIF_NODE,       "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(LOGIF_NODE,         "%CMNT%PUTTABif (%LL1) %NL%PUTTAB%INCTAB%BLOB1%DECTAB%PUTTAB%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(LOOP_NODE,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(FOR_NODE,           "%CMNT%PUTTABfor (%LL1 ; %LL2 ; %LL3)%NL%PUTTAB{%INCTAB%NL%BLOB1%DECTAB%PUTTAB}%NL", 
-'s',0,BIFNODE)
-DEFNODECODE(FORALL_NODE,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(WHILE_NODE,         "%CMNT%PUTTABwhile (%LL1)%NL%PUTTAB{%INCTAB%NL%BLOB1%DECTAB%PUTTAB}%NL",
-'s',0,BIFNODE)
-DEFNODECODE(TRY_STAT,           "%CMNT%PUTTABtry {%INCTAB%NL%BLOB1%DECTAB%PUTTAB}%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CATCH_STAT,         "%CMNT%PUTTABcatch (%SETFLAG(VARDECL)%TMPLARGS%UNSETFLAG(VARDECL)){%INCTAB%NL%BLOB1%DECTAB%PUTTAB}%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(SDOALL_NODE,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(DOACROSS_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CDOACROSS_NODE,     "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(EXIT_NODE,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(GOTO_NODE,          "%CMNT%PUTTABgoto %LL3;%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ASSGOTO_NODE,       "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(COMGOTO_NODE,       "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PAUSE_NODE,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(STOP_NODE,          "%ERROR",
-'s',0,BIFNODE)
-
-DEFNODECODE(ASSIGN_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%LL1 = %LL2;%NL",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(ASSIGN_STAT,        "%ERROR",
-'s',0,BIFNODE) */
-DEFNODECODE(M_ASSIGN_STAT,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PROC_STAT,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(ASSLAB_STAT,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(SUM_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MULT_ACC,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MAX_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MIN_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CAT_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(OR_ACC,             "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(AND_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(READ_STAT,          "%ERROR",
-'s',0,BIFNODE) 
-DEFNODECODE(WRITE_STAT,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PRINT_STAT,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(OTHERIO_STAT,       "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(BLOB,               "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(SIZES,              "%ERROR",
-'s',0,BIFNODE)
-/* podd 12.01.12 %CONSTRU deleted
-DEFNODECODE(FUNC_HEDR,          "%CMNT%IF (%CHECKFLAG(CLASSDECL) != %NULL)%PROTECTION%ENDIF%PUTTAB%DECLSPEC%SYMBTYPE %IF (%CHECKFLAG(CLASSDECL) == %NULL)%SYMBSCOPE%IF(%LL3 != %NULL)<%TMPLARGS >%ENDIF%SYMBDC%ENDIF %SETFLAG(VARDECL)%FUNHD%UNSETFLAG(VARDECL)%CONSTRU%ENDIF%CNSTF{%INCTAB%NL%PUSHFLAG(CLASSDECL)%BLOB1%POPFLAG(CLASSDECL)%DECTAB%PUTTAB}%NL",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(FUNC_HEDR,          "%CMNT%IF (%CHECKFLAG(CLASSDECL) != %NULL)%PROTECTION%ENDIF%PUTTAB%DECLSPEC%SYMBTYPE %IF (%CHECKFLAG(CLASSDECL) == %NULL)%SYMBSCOPE%IF(%LL3 != %NULL)<%TMPLARGS >%ENDIF%SYMBDC%ENDIF %SETFLAG(VARDECL)%FUNHD%UNSETFLAG(VARDECL)%ENDIF%CNSTF%NL%PUTTAB{%INCTAB%NL%PUSHFLAG(CLASSDECL)%BLOB1%POPFLAG(CLASSDECL)%DECTAB%PUTTAB}%NL%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(TEMPLATE_FUNDECL, 	"%CMNT%PUTTABtemplate <%SETFLAG(VARDECL)%TMPLARGS%UNSETFLAG(VARDECL) > %BLOB1",
-'s',0,BIFNODE)
- 
-
-DEFNODECODE(WHERE_NODE,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(ALLDO_NODE,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(IDENTIFY,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(FORMAT_STAT,        "%ERROR", 
-'s',0,BIFNODE)
-DEFNODECODE(STOP_STAT,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(RETURN_STAT,        "%CMNT%PUTTABreturn%IF (%LL1 != %NULL) %LL1%ENDIF;%NL",
-'s',0,BIFNODE)
-                               
-DEFNODECODE(ELSEIF_NODE,        "%CMNT%DECTAB%PUTTAB}%NL%PUTTABelse if (%LL1) %NL%PUTTAB{%INCTAB%NL",
-'s',0,BIFNODE)
-
-/*NO_OPnodes*/
-DEFNODECODE(COMMENT_STAT,       "%CMNT%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CONT_STAT,          "%CMNT%PUTTABcontinue;%NL",
-'s',0,BIFNODE)
-DEFNODECODE(VAR_DECL,           "%CMNT%SETFLAG(VARDECL)%IF (%CHECKFLAG(ENUM) == %NULL)%IF (%CHECKFLAG(CLASSDECL) != %NULL)%PROTECTION%ENDIF%PUTTAB%DECLSPEC%TYPE %ENDIF%LL1%IF (%CHECKFLAG(ENUM) == %NULL);%ENDIF%UNSETFLAG(VARDECL)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PRIVATE_AR_DECL,    "%CMNT%PUTTABPrivateArray<%LL1,%LL2> %LL3;%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PARAM_DECL,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(COMM_STAT,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(EQUI_STAT,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(IMPL_DECL,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(DATA_DECL,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(SAVE_DECL,          "%ERROR",
-'s',0,BIFNODE) 
-DEFNODECODE(STMTFN_STAT,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(DIM_STAT,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(EXTERN_STAT,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(INTRIN_STAT,        "%ERROR",
-'s',0,BIFNODE)
-
-DEFNODECODE(ENUM_DECL,          "%CMNT%PUTTAB%DECLSPEC%SETFLAG(ENUM)enum %SYMBID %IF (%BLOB1 != %NULL){%INCTAB%NL %BLOB1%DECTAB%PUTTAB}%LL1;%NL%ELSE%LL1;%NL%ENDIF%UNSETFLAG(ENUM)",
-'d',0,BIFNODE)
-/* the public: in the line below is to mask a dep2C++ bug */
-DEFNODECODE(CLASS_DECL,         "%CMNT%INCLASSON%IF (%CHECKFLAG(CLASSDECL) != %NULL)%PROTECTION%ENDIF%PUSHFLAG(CLASSDECL)%PUTTAB%DECLSPEC%RIDPT%SETFLAG(CLASSDECL)class  %SYMBID%IF (%LL2 !=%NULL):%SETFLAG(SUBCLASS)%LL2%UNSETFLAG(SUBCLASS)%ENDIF %IF (%BLOB1 != %NULL){%INCTAB%NLpublic:%NL%BLOB1 %NL%DECTAB%PUTTAB}%SETFLAG(VARDECL)%LL1;%UNSETFLAG(VARDECL)%NL%ELSE%SETFLAG(VARDECL)%LL1;%UNSETFLAG(VARDECL)%NL%ENDIF%UNSETFLAG(CLASSDECL)%POPFLAG(CLASSDECL)%IF (%CHECKFLAG(CLASSDECL) == %NULL)%INCLASSOFF",
-'d',0,BIFNODE)
-DEFNODECODE(TECLASS_DECL,       "%CMNT%INCLASSON%IF (%CHECKFLAG(CLASSDECL) != %NULL)%PROTECTION%ENDIF%PUSHFLAG(CLASSDECL)%PUTTAB%DECLSPEC%RIDPT%SETFLAG(CLASSDECL)TEClass  %SYMBID%IF (%LL2 !=%NULL):%SETFLAG(SUBCLASS)%LL2%UNSETFLAG(SUBCLASS)%ENDIF %IF (%BLOB1 != %NULL){%INCTAB%NLpublic:%NL%BLOB1 %NL%DECTAB%PUTTAB}%SETFLAG(VARDECL)%LL1;%UNSETFLAG(VARDECL)%NL%ELSE%SETFLAG(VARDECL)%LL1;%UNSETFLAG(VARDECL)%NL%ENDIF%UNSETFLAG(CLASSDECL)%POPFLAG(CLASSDECL)%INCLASSOFF",
-'d',0,BIFNODE)
-DEFNODECODE(UNION_DECL,         "%CMNT%PUTTAB%DECLSPEC%RIDPTunion  %SYMBID %IF (%BLOB1 != %NULL){%INCTAB%NL%BLOB1%NL%DECTAB%PUTTAB} %LL1;%NL%ELSE%LL1;%NL%ENDIF",
-'d',0,BIFNODE)
-DEFNODECODE(STRUCT_DECL,        "%CMNT%PUTTAB%DECLSPEC%RIDPTstruct %SYMBID %IF (%LL2 !=%NULL):%SETFLAG(SUBCLASS)%LL2%UNSETFLAG(SUBCLASS)%ENDIF  %IF (%BLOB1!=%NULL){%INCTAB%NL%BLOB1%DECTAB%PUTTAB} %SETFLAG(VARDECL)%LL1;%UNSETFLAG(VARDECL)%NL%ELSE%SETFLAG(VARDECL)%LL1;%UNSETFLAG(VARDECL)%NL%ENDIF",
-'d',0,BIFNODE)
-DEFNODECODE(EXTERN_C_STAT,      "%CMNT%PUTTABextern \"C\" %IF (%BLOB1!=%NULL){%INCTAB%NL%BLOB1%DECTAB%PUTTAB}%NL%ENDIF",
-'d',0,BIFNODE)
-DEFNODECODE(DERIVED_CLASS_DECL, "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(EXPR_STMT_NODE,     "%CMNT%PUTTAB%LL1;%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DO_WHILE_NODE,      "%CMNT%PUTTABdo {%NL%INCTAB%NL%BLOB1%DECTAB%PUTTAB} while (%LL1);%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SWITCH_NODE,        "%CMNT%PUTTABswitch (%LL1)%NL%PUTTAB{%NL%INCTAB%BLOB1%DECTAB%PUTTAB}%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CASE_NODE,          "%CMNT%PUTTABcase %LL1:%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DEFAULT_NODE,       "%CMNT%PUTTABdefault:%NL",
-'s',0,BIFNODE)
-DEFNODECODE(BREAK_NODE,         "%CMNT%PUTTABbreak;%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CONTINUE_NODE,      "%CMNT%PUTTABcontinue;%NL",
-'s',0,BIFNODE)
-DEFNODECODE(RETURN_NODE,        "%CMNT%PUTTABreturn%IF (%LL1 != %NULL) %LL1%ENDIF;%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ASM_NODE,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(SPAWN_NODE,         "%CMNT%PUTTABspawn %LL1;%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PARFOR_NODE,        "%CMNT%PUTTABparfor (%LL1 ; %LL2 ; %LL3)%NL%PUTTAB{%INCTAB%NL%BLOB1%DECTAB%PUTTAB}%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PAR_NODE,           "%CMNT%PUTTABpar%NL%PUTTAB{%INCTAB%NL%BLOB1%DECTAB%PUTTAB}%NL",
-'s',0,BIFNODE)
-DEFNODECODE(LABEL_STAT,         "%CMNT%LABNAME:%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PROS_COMM,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(ATTR_DECL,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(NAMELIST_STAT,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(OPEN_STAT,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CLOSE_STAT,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(ENDFILE_STAT,       "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(REWIND_STAT,        "%ERROR",
-'s',0,BIFNODE)
-/* DEFNODECODE(ENTRY_STAT,      "%ERROR",
-'s',0,BIFNODE) */
- DEFNODECODE(ENTRY_STAT,        "%ERROR",
-'s',0,BIFNODE) 
-
-DEFNODECODE(BLOCK_DATA,         "%ERROR",
-'s',0,BIFNODE)
-
-DEFNODECODE(COLLECTION_DECL,    "%INCLASSON%CMNT%IF (%CHECKFLAG(CLASSDECL) != %NULL)%PROTECTION%ENDIF%PUSHFLAG(CLASSDECL)%PUTTAB%RIDPT%SETFLAG(CLASSDECL)Collection  %SYMBID%IF (%LL2 !=%NULL):public %LL2%ENDIF %IF (%BLOB1 != %NULL){%INCTAB%NL%BLOB1 %NL%DECTAB%PUTTAB}%SETFLAG(VARDECL)%LL1;%UNSETFLAG(VARDECL)%NL%ELSE%SETFLAG(VARDECL)%LL1;%UNSETFLAG(VARDECL)%NL%ENDIF%UNSETFLAG(CLASSDECL)%POPFLAG(CLASSDECL)%INCLASSOFF",
-'s',0,BIFNODE)
-DEFNODECODE(INCLUDE_LINE,       "%CMNT#include %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PREPROCESSOR_DIR,   "%CMNT%LL1%NL",
-'s',0,BIFNODE)
-
-/*****************variant tags for low level nodes********************/
-
-/***** List of commands for LOW LEVEL NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %LL1        : Low Level Node 1 */
-       /* %LL2        : Low Level Node 2 */
-       /* %SYMBID     : Symbol identifier */
-       /* %TYPE       : Type */
-       /* %L1SYMBCST  : Constant Value of Low Level Node Symbol */
-       /* %INTVAL     : Integer Value */
-       /* %STATENO    : Statement Number */
-       /* %STRVAL     : String Value */
-       /* %BOOLVAL    : Boolean Value */
-       /* %CHARVAL    : Char Value */
-       /* %ORBPL1     : Openning Round Brackets on Precedence of Low Level Node 1 */
-       /* %CRBPL1     : Closing Round Brackets on Precedence of Low Level Node 1 */
-       /* %ORBPL2     : Openning Round Brackets on Precedence of Low Level Node 2 */
-       /* %CRBPL2     : Closing Round Brackets on Precedence of Low Level Node 2 */
-/***********************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for LOW LEVEL NODE *****/
-       /* %STRCST     : String Constant in '' */
-       /* %SYMBID     : Symbol Identifier (string) */
-       /* %SYMBOL     : Symbol node (integer) */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %LL1        : Low Level Node 1 (integer) */
-       /* %LL2        : Low Level Node 2 (integer) */
-       /* %LABUSE     : Label ptr (do end) (integer) */
-       /* %L1CODE     : Code (variant) of Low Level Node 1 (integer) */
-       /* %L2CODE     : Code (variant) of Low Level Node 2 (integer) */
-       /* %INWRITE    : In_Write_Statement (integer / boolean flag) */
-       /* %INPARAM    : In_Param_Statement (integer / boolean flag) */
-       /* %INIMPLI    : In_Impli_Statement (integer / boolean flag) */
-/************************************************************************************************/
-
-/* CODES AYANT DISPARU :
- RENAME_NODE,            ONLY_NODE,               DEFAULT,                 LEN_OP,                  TARGET_OP,
- SAVE_OP,                POINTER_OP,              INTRINSIC_OP,            INOUT_OP,                OUT_OP,
- IN_OP,                  OPTIONAL_OP,             EXTERNAL_OP,             DIMENSION_OP,            ALLOCATABLE_OP,
- PRIVATE_OP,             PUBLIC_OP,               PARAMETER_OP,            MAXPARALLEL_OP,          EXTEND_OP,
- ORDERED_OP,             PAREN_OP,                OVERLOADED_CALL,         STRUCTURE_CONSTRUCTOR,   INTERFACE_REF,
- TYPE_REF,               KEYWORD_ARG,
-*/
-
-DEFNODECODE(LEN_OP,             "%IF (%LL1 != %NULL)*(%LL1)%ENDIF",
-'e',0,LLNODE)
-DEFNODECODE(INT_VAL,            "%INTKIND",
-'c',0,LLNODE)
-DEFNODECODE(FLOAT_VAL,          "%STRVAL",
-'c',0,LLNODE)
-DEFNODECODE(DOUBLE_VAL,         "%STRVAL",
-'c',0,LLNODE)
-DEFNODECODE(BOOL_VAL,           "%BOOLVAL",
-'c',0,LLNODE)
-DEFNODECODE(CHAR_VAL,           "%IF (%INIMPLI == %NULL)'%ENDIF%CHARVAL%IF (%INIMPLI == %NULL)'%ENDIF",
-'c',0,LLNODE)
-DEFNODECODE(STRING_VAL,         "%IF (%CHECKFLAG(QUOTE) != %NULL)\"%STRVAL\"%ELSE\"%STRVAL\"%ENDIF",
-'c',0,LLNODE)
-DEFNODECODE(KEYWORD_VAL,        "%STRVAL",
-'c',0,LLNODE)
-DEFNODECODE(COMPLEX_VAL,        "(%LL1, %LL2)",
-'c',0,LLNODE)
-
-DEFNODECODE(CONST_REF,          "%SYMBID",
-'r',2,LLNODE)
-DEFNODECODE(VAR_REF,            "%IF(%CHECKFLAG(SUBCLASS) != %NULL)%DOPROC%ENDIF%SYMBID%IF(%LL2 != %NULL)%PUSHFLAG(PAREN)<%LL2 >%POPFLAG(PAREN)%ENDIF",
-'r',0,LLNODE)
-DEFNODECODE(ARRAY_REF,          "%SYMBID%IF (%LL1 != %NULL)%PUSHFLAG(ARRAYREF)%SETFLAG(ARRAYREF)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(ARRAYREF)%UNSETFLAG(PAREN)%POPFLAG(PAREN)%POPFLAG(ARRAYREF)%ENDIF",
-'r',1,LLNODE)
-DEFNODECODE(RECORD_REF,         "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1.%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)",
-'r',2,LLNODE)
-DEFNODECODE(ENUM_REF,           "%LL1",
-'r',2,LLNODE)
-DEFNODECODE(LABEL_REF,          "%LABELNAME",
-'r',0,LLNODE)
-DEFNODECODE(TYPE_REF,           "%TYPE",
-'r',0,LLNODE)
-DEFNODECODE(TYPE_OP,            "%TYPE",
-'e',1,LLNODE)
-DEFNODECODE(THROW_OP,           "throw %IF(%LL1 != %NULL)%LL1%ENDIF",
-'r',2,LLNODE)
-
-DEFNODECODE(VAR_LIST,           "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(FORDECL_OP,         "%VARLISTTY",
-'e',2,LLNODE)
-
-DEFNODECODE(EXPR_LIST,
-"%IF(%CHECKFLAG(PAREN)!=%NULL)%IF(%CHECKFLAG(ARRAYREF)!=%NULL)[%ELSE%IF(%CHECKFLAG(ELIST)==%NULL)(%ELSE, %ENDIF%ENDIF%ELSE%IF(%CHECKFLAG(ELIST) != %NULL), %ENDIF%ENDIF%PUSHFLAG(ARRAYREF)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%PUSHFLAG(ELIST)%LL1%POPFLAG(ELIST)%POPFLAG(ARRAYREF)%POPFLAG(PAREN)%IF(%CHECKFLAG(PARAM)!=%NULL) = %L1SYMBCST%ENDIF%IF(%CHECKFLAG(ARRAYREF)!=%NULL)]%ENDIF%IF(%LL2!=%NULL)%IF(%CHECKFLAG(ELIST)==%NULL)%SETFLAG(ELIST)%ENDIF%LL2%ENDIF%IF(%CHECKFLAG(PAREN) != %NULL)%IF(%LL2 == %NULL)%IF(%CHECKFLAG(ARRAYREF) == %NULL))%ENDIF%ENDIF%ENDIF%IF(%LL2 == %NULL)%IF(%CHECKFLAG(ELIST) != %NULL)%UNSETFLAG(ELIST)%ENDIF",
-'e',2,LLNODE) 
-
-/* second way (wrong)
-DEFNODECODE(EXPR_LIST,	
-"%IF (%CHECKFLAG(PAREN) != %NULL)%IF (%CHECKFLAG(ARRAYREF) != %NULL)[%ELSE(%ENDIF%ENDIF%PUSHFLAG(ARRAYREF)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%POPFLAG(ARRAYREF)%IF (%CHECKFLAG(PARAM) != %NULL) = %L1SYMBCST%ENDIF%IF (%LL2 != %NULL)%IF (%CHECKFLAG(ARRAYREF) != %NULL)][%ELSE,%ENDIF%LL2%ENDIF%POPFLAG(PAREN)%IF (%CHECKFLAG(PAREN) != %NULL)%IF (%CHECKFLAG(ARRAYREF) != %NULL)]%ELSE)%ENDIF%ENDIF",
-'e',2,LLNODE) 
-*/
-/*
-DEFNODECODE(EXPR_LIST,          "%PUSHFLAG(ARRAYREF)%LL1%POPFLAG(ARRAYREF)%IF (%CHECKFLAG(PARAM) != %NULL) = %L1SYMBCST%ENDIF%ENDIF%IF (%LL2 != %NULL)%IF (%CHECKFLAG(ARRAYREF) != %NULL)][%ELSE,%ENDIF%LL2%ENDIF",
-'e',2,LLNODE) 
-*/
-DEFNODECODE(RANGE_LIST,         "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CASE_CHOICE,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(DEF_CHOICE,         "%LL1%IF (%LL2 != %NULL):%LL2",
-'e',2,LLNODE)
-DEFNODECODE(VARIANT_CHOICE,     "%ERROR",
-'e',2,LLNODE)
-
-DEFNODECODE(DDOT,               "%LL1%IF (%INWRITE != %NULL),%ELSE%IF (%INIMPLI != %NULL)-%ELSE%IF (%CHECKFLAG(LOOP) != %NULL),%ELSE:%ENDIF%ENDIF%ENDIF%LL2",
-'e',2,LLNODE)
-DEFNODECODE(RANGE_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(UPPER_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LOWER_OP,           "%ERROR",
-'e',2,LLNODE)
-
-DEFNODECODE(EQ_OP,              "%ORBCPL1%LL1%CRBCPL1 == %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(LT_OP,              "%ORBCPL1%LL1%CRBCPL1 < %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(GT_OP,              "%ORBCPL1%LL1%CRBCPL1 > %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(NOTEQL_OP,          "%ORBCPL1%LL1%CRBCPL1 != %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(LTEQL_OP,           "%ORBCPL1%LL1%CRBCPL1 <= %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(GTEQL_OP,           "%ORBCPL1%LL1%CRBCPL1 >= %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(ADD_OP,             "%ORBCPL1%LL1%CRBCPL1 + %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(SUBT_OP,            "%ORBCPL1%LL1%CRBCPL1 - %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(OR_OP,              "%ORBCPL1%LL1%CRBCPL1 || %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(MULT_OP,            "%ORBCPL1%LL1%CRBCPL1 * %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(DIV_OP,             "%ORBCPL1%LL1%CRBCPL1 / %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(MOD_OP,             "%ORBCPL1%LL1%CRBCPL1 %% %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(AND_OP,             "%ORBCPL1%LL1%CRBCPL1 && %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(EXP_OP,             "%ERROR",
-'e',2,LLNODE) 
-DEFNODECODE(ARRAY_MULT,         "%ERROR",
-'e',2,LLNODE)
-/*DEFNODECODE(CONCAT_OP,        "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1//%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)",
-'e',2,LLNODE)*/
-DEFNODECODE(CONCAT_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(XOR_OP,             "%ORBCPL1%LL1%CRBCPL1 ^ %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(EQV_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(NEQV_OP,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MINUS_OP,           "(-%ORBCPL1%LL1%CRBCPL1)",
-'e',1,LLNODE)
-DEFNODECODE(NOT_OP,             "!%ORBCPL1%LL1%CRBCPL1",
-'e',2,LLNODE)
-
-DEFNODECODE(ASSGN_OP,           "%ORBCPL1%LL1%CRBCPL1 = %PUSHFLAG(VARDECL)%LL2%POPFLAG(VARDECL)",
-'e',2,LLNODE)
-/*
-DEFNODECODE(DEREF_OP,           "%IF (%CHECKFLAG(VARDECL) == %NULL)(*%LL1)%ELSE*%LL1%ENDIF",
-'e',1,LLNODE)
-*/
-DEFNODECODE(DEREF_OP,           "%IF (%CHECKFLAG(VARDECL) == %NULL)*%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(PAREN)%POPFLAG(PAREN)%ELSE*%CNSTCHK%LL1%ENDIF",
-'e',1,LLNODE)
-DEFNODECODE(ARROWSTAR_OP,       "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(PAREN)%POPFLAG(PAREN)->*%LL2",
-'e',2,LLNODE)
-DEFNODECODE(DOTSTAR_OP,         "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(PAREN)%POPFLAG(PAREN).*%LL2",
-'e',2,LLNODE)
-DEFNODECODE(POINTST_OP,         "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(PAREN)%POPFLAG(PAREN)->%LL2",
-'e',2,LLNODE)
-DEFNODECODE(SCOPE_OP,           "%LL1::%LL2",
-'e',2,LLNODE)
-
-/* should be 
-DEFNODECODE(FUNCTION_OP,        "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(PAREN)%IF (%CHECKFLAG(VARDECL) != %NULL)(%VARLISTTY)%ELSE%LL2%ENDIF%POPFLAG(PAREN)",
-'e',2,LLNODE)
-but the following works for now */
-
-DEFNODECODE(FUNCTION_OP,        "%PUSHFLAG(PAREN)(%LL1)%PUSHFLAG(FREF)%SETFLAG(FREF)%IF (%CHECKFLAG(VARDECL) != %NULL)(%VARLISTTY)%ELSE%IF(%LL2 != %NULL)%SETFLAG(PAREN)%LL2%UNSETFLAG(PAREN)%ELSE()%ENDIF%ENDIF%UNSETFLAG(FREF)%POPFLAG(FREF)%POPFLAG(PAREN)",
-'e',2,LLNODE)
-
-DEFNODECODE(MINUSMINUS_OP,      "%IF (%LL2 != %NULL)%ORBCPL2%LL2%CRBCPL2%ENDIF--%IF (%LL1 != %NULL)%ORBCPL1%LL1%CRBCPL1%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(PLUSPLUS_OP,        "%IF (%LL2 != %NULL)%ORBCPL2%LL2%CRBCPL2%ENDIF++%IF (%LL1 != %NULL)%ORBCPL1%LL1%CRBCPL1%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(BITAND_OP,          "%ORBCPL1%LL1%CRBCPL1 & %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(BITOR_OP,           "%ORBCPL1%LL1%CRBCPL1 | %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(PLUS_ASSGN_OP,      "%ORBCPL1%LL1%CRBCPL1 += %LL2",
-'e',2,LLNODE)		
-DEFNODECODE(MINUS_ASSGN_OP,     "%ORBCPL1%LL1%CRBCPL1 -= %LL2",
-'e',2,LLNODE)		
-DEFNODECODE(AND_ASSGN_OP,       "%ORBCPL1%LL1%CRBCPL1 &= %LL2",
-'e',2,LLNODE)		
-DEFNODECODE(IOR_ASSGN_OP,       "%ORBCPL1%LL1%CRBCPL1 |= %LL2",
-'e',2,LLNODE)		
-DEFNODECODE(MULT_ASSGN_OP,      "%ORBCPL1%LL1%CRBCPL1 *= %LL2",
-'e',2,LLNODE)		
-DEFNODECODE(DIV_ASSGN_OP,       "%ORBCPL1%LL1%CRBCPL1 /= %LL2",
-'e',2,LLNODE)		
-DEFNODECODE(MOD_ASSGN_OP,       "%ORBCPL1%LL1%CRBCPL1 %= %LL2",
-'e',2,LLNODE)		
-DEFNODECODE(XOR_ASSGN_OP,       "%ORBCPL1%LL1%CRBCPL1 ^= %LL2",
-'e',2,LLNODE)		
-DEFNODECODE(LSHIFT_ASSGN_OP,    "%ORBCPL1%LL1%CRBCPL1 <<= %LL2",
-'e',2,LLNODE) 	
-DEFNODECODE(RSHIFT_ASSGN_OP,    "%ORBCPL1%LL1%CRBCPL1 >>= %LL2",
-'e',2,LLNODE) 	
-
-
-DEFNODECODE(STAR_RANGE,         "*",
-'e',2,LLNODE)
-
-DEFNODECODE(PROC_CALL,          "%SYMBID%IF(%LL1 != %NULL)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(PAREN)%POPFLAG(PAREN)%ELSE()%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(FUNC_CALL,          "%SYMBID%IF(%LL2 != %NULL)%PUSHFLAG(PAREN)<%LL2 >%POPFLAG(PAREN)%ENDIF%IF(%LL1 != %NULL)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(PAREN)%POPFLAG(PAREN)%ELSE()%ENDIF",
-'e',1,LLNODE)
-DEFNODECODE(ACC_CALL_OP,        "%SYMBID%IF(%LL2 != %NULL)%PUSHFLAG(PAREN)<<<%LL2>>>%POPFLAG(PAREN)%ENDIF%IF(%LL1 != %NULL)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(PAREN)%POPFLAG(PAREN)%ELSE()%ENDIF",
-'e',1,LLNODE)
-
-DEFNODECODE(CONSTRUCTOR_REF,    "(/%LL1/)",
-'e',2,LLNODE)
-DEFNODECODE(ACCESS_REF,         "%LL1%IF (%LL2 != %NULL) (%LL2)%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CONS,               "%LL1, %LL2",
-'e',2,LLNODE)
-DEFNODECODE(ACCESS,             "%LL1, FORALL = (%SYMBID = %LL2)",
-'e',2,LLNODE)
-DEFNODECODE(IOACCESS,           "%IF (%LL1 != %NULL)(%LL1, %ENDIF%SYMBID = %LL2%IF (%LL1 != %NULL))%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CONTROL_LIST,       "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(SEQ,                "%LL1%IF (%LL2 != %NULL):%LL2",
-'e',2,LLNODE)
-DEFNODECODE(SPEC_PAIR,          "%IF (%CHECKFLAG(PRINT) != %NULL)%LL2%ELSE%LL1 = %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(COMM_LIST,          "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)                   
-DEFNODECODE(STMT_STR,           "%STRVAL",
-'e',2,LLNODE)
-DEFNODECODE(EQUI_LIST,          "(%LL1)%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(IMPL_TYPE,          "%TYPE %IF (%LL1 != %NULL)(%LL1)%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(STMTFN_DECL,        "%SYMBID (%VARLIST) = %LL1",
-'e',2,LLNODE)
-DEFNODECODE(BIT_COMPLEMENT_OP,  "~%ORBCPL1%LL1%CRBCPL1",
-'e',2,LLNODE)
-DEFNODECODE(EXPR_IF,            "(%LL1)?%LL2",
-'e',2,LLNODE)
-DEFNODECODE(EXPR_IF_BODY,       "%LL1:%LL2",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_REF,       "%SETFLAG(FREF)%SYMBID%IF (%CHECKFLAG(VARDECL) != %NULL)%IF(%CHECKFLAG(TMPLDEC) == %NULL)(%VARLISTTY)%CNSTF%PURE%ENDIF%ENDIF%UNSETFLAG(FREF)",
-'e',2,LLNODE)
-DEFNODECODE(LSHIFT_OP,          "%ORBCPL1%LL1%CRBCPL1 << %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(RSHIFT_OP,          "%ORBCPL1%LL1%CRBCPL1 >> %ORBCPL2%LL2%CRBCPL2",
-'e',2,LLNODE)
-DEFNODECODE(UNARY_ADD_OP,       "(+(%LL1))",
-'e',2,LLNODE)
-/*
-DEFNODECODE(SIZE_OP,            "%IF(%CHECKFLAG(NEW) != %NULL)sizeof(%LL1)%ELSEsizeof %LL1",
-'e',2,LLNODE)
-*/
-DEFNODECODE(SIZE_OP,            "sizeof(%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(INTEGER_DIV_OP,     "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1/%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)",
-'e',2,LLNODE)
-DEFNODECODE(SUB_OP,             "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1-%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)",
-'e',2,LLNODE)
-DEFNODECODE(LE_OP,              "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1<=%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)",
-'e',2,LLNODE)
-DEFNODECODE(GE_OP,              "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1>=%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)",
-'e',2,LLNODE)
-DEFNODECODE(NE_OP,              "%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1!=%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)",
-'e',2,LLNODE)
-
-DEFNODECODE(CLASSINIT_OP,       "%LL1%IF(%LL2 != %NULL)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)%ELSE()%ENDIF",
-'e',2,LLNODE)
-/*
-DEFNODECODE(CAST_OP,            "%IF(%CHECKFLAG(NEW) != %NULL)%IF (%LL2 != %NULL)%PUSHFLAG(VARDECL)%SETFLAG(VARDECL)(%VARLISTTY)%UNSETFLAG(VARDECL)%POPFLAG(VARDECL)%ELSE%SETFLAG(CASTOP)%TYPE%UNSETFLAG(CASTOP)%ENDIF%IF (%LL1 != %NULL)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL1%UNSETFLAG(PAREN)%POPFLAG(PAREN)%ENDIF%ELSE%IF (%LL2 != %NULL)%TYPE%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)%ELSE%SETFLAG(CASTOP)(%TYPE)%UNSETFLAG(CASTOP)%PUSHFLAG(PAREN)%SETFLAG(PAREN) %LL1%UNSETFLAG(PAREN)%POPFLAG(PAREN)%ENDIF%ENDIF",
-'e',2,LLNODE)
-*/
-DEFNODECODE(CAST_OP,            "%IF (%LL2 != %NULL)%PUSHFLAG(VARDECL)%SETFLAG(VARDECL)(%VARLISTTY)%UNSETFLAG(VARDECL)%POPFLAG(VARDECL)%ELSE%SETFLAG(CASTOP)%TYPE%UNSETFLAG(CASTOP)%ENDIF%IF (%LL1 != %NULL)%ORBCPL1%LL1%CRBCPL1%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(ADDRESS_OP,         "%IF (%CHECKFLAG(VARDECL) == %NULL)&%ORBCPL1%LL1%CRBCPL1%ELSE&%CNSTCHK%LL1%ENDIF",
-'e',1,LLNODE)
-/*
-DEFNODECODE(ADDRESS_OP,         "&(%LL1)",
-'e',2,LLNODE)
-*/
-DEFNODECODE(POINSTAT_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(COPY_NODE,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(INIT_LIST,          "%PUSHFLAG(PAREN){%LL1}%POPFLAG(PAREN)",
-'e',2,LLNODE)
-DEFNODECODE(VECTOR_CONST,       "[%LL1]",
-'e',2,LLNODE)
-DEFNODECODE(BIT_NUMBER,         "%LL1:%LL2",
-'e',2,LLNODE)
-DEFNODECODE(ARITH_ASSGN_OP,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ARRAY_OP,           "%PUSHFLAG(PAREN)(%LL1)%POPFLAG(PAREN)%PUSHFLAG(ARRAYREF)%SETFLAG(ARRAYREF)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL2%UNSETFLAG(ARRAYREF)%UNSETFLAG(PAREN)%POPFLAG(PAREN)%POPFLAG(ARRAYREF)",
-'e',2,LLNODE)
-/*
-DEFNODECODE(NEW_OP,             "%SETFLAG(NEW)new %LL1 %IF (%LL2 != %NULL)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL2%UNSETFLAG(PAREN)%POPFLAG(PAREN)%ENDIF%UNSETFLAG(NEW)",
-'e',2,LLNODE)
-*/
-DEFNODECODE(NEW_OP,             "%SETFLAG(NEW)new %IF (%LL2 != %NULL)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%LL2 %UNSETFLAG(PAREN)%POPFLAG(PAREN)%ENDIF%LL1%UNSETFLAG(NEW)",
-'e',2,LLNODE)
-DEFNODECODE(DELETE_OP,          "%IF (%LL2 != %NULL)%SETFLAG(NEW)%ENDIFdelete %IF(%LL2 != %NULL) %LL2 %ENDIF %LL1%IF(%LL2 != %NULL) %UNSETFLAG(NEW)%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(NAMELIST_LIST,      "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(THIS_NODE,          "this %LL1",
-'e',2,LLNODE)
-
-/* new tag for some expression  
-these are tokens not expressions.
-I have killed them.  dbg. 
-
-DEFNODECODE(CEIL_DIV_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MAX_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIF_SAVE_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MIN_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIF_ADDR_EXPR,      "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIF_NOP_EXPR,       "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIF_RTL_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUNC_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUNC_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOOR_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOOR_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CEIL_MOD_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ROUND_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ROUND_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RDIV_EXPR,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXACT_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CONVERT_EXPR,       "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(CONST_DECL,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ABS_EXPR,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_ANDIF_EXPR,   "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_AND_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_NOT_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_ORIF_EXPR,    "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PREINCREMENT_EXPR,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PREDECREMENT_EXPR,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(COMPOUND_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOAT_EXPR,         "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIT_IOR_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_XOR_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_ANDTC_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_OR_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_TRUNC_EXPR,     "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(RROTATE_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LROTATE_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RANGE_EXPR,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(POSTDECREMENT_EXPR, "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(REFERENCE_TYPE,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_FLOOR_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_ROUND_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_CEIL_EXPR ,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_DECL ,     "%ERROR",
-'d',2,LLNODE)
-DEFNODECODE(MODIFY_EXPR,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(REFERENCE_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RESULT_DECL,        "%ERROR",
-'d',2,LLNODE)
-DEFNODECODE(PARM_DECL,          "%ERROR",
-'d',2,LLNODE)
-*/
-
-/*****************variant tags for symbol table entries********************/
-
-DEFNODECODE(BIF_PARM_DECL,      "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(CONST_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(ENUM_NAME,          "enum %SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(FIELD_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(VARIABLE_NAME,      "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(TYPE_NAME,          "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(PROGRAM_NAME,       "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(PROCEDURE_NAME,     "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(VAR_FIELD,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(LABEL_VAR,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(FUNCTION_NAME,      "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(MEMBER_FUNC,        "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(CLASS_NAME,         "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(TECLASS_NAME,       "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(UNION_NAME,         "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(STRUCT_NAME,        "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(LABEL_NAME,         "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(COLLECTION_NAME,    "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(ROUTINE_NAME,       "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(CONSTRUCT_NAME,     "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(INTERFACE_NAME,     "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(MODULE_NAME,        "%SYMBID",
-'r',0,SYMBNODE)
-/*****************variant tags for type nodes********************/
-
-/***** List of commands for TYPE NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %BASETYPE   : Base Type Name Identifier */
-       /* %NAMEID     : Name Identifier */
-       /* %TABNAME    : Self Name from Table */
-       /* %RANGES     : Ranges */
-       /* %RANGLL1    : Low Level Node 1 of Ranges */
-/*******************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for TYPE NODE *****/
-       /* %STRCST     : String Constant in '' */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %INIMPLI    : In_Impli_Statement (integer / boolean flag) */
-/******************************************************************************************/
-
-/* CODES AYANT DISPARU :
- T_SEQUENCE,             T_EVENT,                 T_GATE,
-*/
-
-DEFNODECODE(DEFAULT,            "",
-'t',0,TYPENODE)
-DEFNODECODE(T_INT,              "%TABNAME",
-'t',0,TYPENODE)
-DEFNODECODE(T_FLOAT,            "%TABNAME",
-'t',0,TYPENODE)
-DEFNODECODE(T_DOUBLE,           "%TABNAME",
-'t',0,TYPENODE)
-DEFNODECODE(T_CHAR,             "%TABNAME",
-'t',0,TYPENODE)
-DEFNODECODE(T_BOOL,             "%TABNAME",
-'t',0,TYPENODE)
-DEFNODECODE(T_STRING,           "%TABNAME",
-'t',0,TYPENODE)
-DEFNODECODE(T_COMPLEX,          "%TABNAME",
-'t',0,TYPENODE)
-DEFNODECODE(T_LONG,             "%TABNAME",
-'t',0,TYPENODE)
-DEFNODECODE(T_ENUM,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_SUBRANGE,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_LIST,             "%ERROR",
-'t',0,TYPENODE)
-/*
-DEFNODECODE(T_ARRAY,            "%IF (%CHECKFLAG(CASTOP) == %NULL)%BASETYPE%ELSE%SUBTYPE [%RANGES]%ENDIF",
-'t',0,TYPENODE)
-*/
-DEFNODECODE(T_ARRAY,            "%IF (%CHECKFLAG(CASTOP) == %NULL)%BASETYPE%ELSE%SUBTYPE %PUSHFLAG(ARRAYREF)%SETFLAG(ARRAYREF)%PUSHFLAG(PAREN)%SETFLAG(PAREN)%PUSHFLAG(CASTOP)%PUSHFLAG(NEW)%RANGES%POPFLAG(NEW)%POPFLAG(CASTOP)%UNSETFLAG(PAREN)%UNSETFLAG(ARRAYREF)%POPFLAG(PAREN)%POPFLAG(ARRAYREF)%ENDIF",
-'t',0,TYPENODE)
-DEFNODECODE(T_RECORD,           "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_ENUM_FIELD,       "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_UNKNOWN,          "unknown",
-'t',0,TYPENODE)
-DEFNODECODE(T_VOID,             "void ",
-'t',0,TYPENODE)
-DEFNODECODE(T_DESCRIPT,         "%RIDPT%BASETYPE",
-'t',0,TYPENODE)
-DEFNODECODE(T_FUNCTION,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_POINTER,          "%FBASETYPE %IF (%CHECKFLAG(VARDECL) == %NULL)%STAR%ELSE%IF (%CHECKFLAG(CASTOP) != %NULL)%STAR%ELSE%IF (%CHECKFLAG(FREF) != %NULL)%STAR%ENDIF%ENDIF%ENDIF",
-'t',0,TYPENODE)
-DEFNODECODE(T_UNION,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_STRUCT,           "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_CLASS,            "--ERROR--CLASS NAME---",
-'t',0,TYPENODE)
-DEFNODECODE(T_DERIVED_CLASS,    "%SYMBID",
-'t',0,TYPENODE)
-DEFNODECODE(T_DERIVED_TYPE,     "%SYMBID",
-'t',0,TYPENODE)
-DEFNODECODE(T_COLLECTION,       "------ERROR-----T_COLLECTION",
-'t',0,TYPENODE)		
-DEFNODECODE(T_DERIVED_COLLECTION, "%SYMBID<%COLLBASE>",
-'t',0,TYPENODE)	
-/*
-DEFNODECODE(T_MEMBER_POINTER,   "%COLLBASE %IF (%CHECKFLAG(VARDECL) == %NULL)%SYMBID::*%ELSE%IF (%CHECKFLAG(CASTOP) != %NULL)%SYMBID::*%ELSE%IF (%CHECKFLAG(FREF) != %NULL)%SYMBID::*%ENDIF%ENDIF%ENDIF",
-'t',0,TYPENODE)	i can't solve the problem with %SYMB.  something
-to do with %SYMBID getting a T_CLASS where it expects a symbol 
-*/
-
-DEFNODECODE(T_MEMBER_POINTER,   "%COLLBASE ", 't',0,TYPENODE)
-DEFNODECODE(T_DERIVED_TEMPLATE, "%SYMBID%SETFLAG(TMPLDEC)%PUSHFLAG(PAREN)<%TMPLARGS >%POPFLAG(PAREN)%UNSETFLAG(TMPLDEC)",
-'t',0,TYPENODE)	
-/*
-DEFNODECODE(T_REFERENCE,        "%BASETYPE %IF (%CHECKFLAG(VARDECL) == %NULL)&%ELSE%IF (%CHECKFLAG(FREF) != %NULL)& %ENDIF%ENDIF",
-'t',0,TYPENODE)		
-*/
-DEFNODECODE(T_REFERENCE,        "%FBASETYPE %IF (%CHECKFLAG(VARDECL) == %NULL)%STAR%ELSE%IF (%CHECKFLAG(CASTOP) != %NULL)%STAR%ELSE%IF (%CHECKFLAG(FREF) != %NULL)%STAR%ENDIF%ENDIF%ENDIF",
-'t',0,TYPENODE)
-DEFNODECODE(LOCAL,              "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(INPUT,              "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(OUTPUT,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(IO,                 "%ERROR",
-'t',0,TYPENODE)
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseDVM.def b/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseDVM.def
deleted file mode 100644
index 8aa7f6c..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/include/unparseDVM.def
+++ /dev/null
@@ -1,448 +0,0 @@
-/*****************variant tags for DVM nodes*****************************/
-
-DEFNODECODE(BLOCK_OP,                "%IF(%LL1!=%NULL)WGT_BLOCK(%SYMBID,%LL1)%ELSE%IF(%LL2!=%NULL)MULT_BLOCK(%LL2)%ELSE%IF(%SYMBOL!=%NULL)GEN_BLOCK(%SYMBID)%ELSEBLOCK%ENDIF%ENDIF%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(INDIRECT_OP,             "%IF(%LL1!=%NULL)DERIVED(%LL1)%ELSEINDIRECT(%SYMBID)%ENDIF",
-'e',1,LLNODE)
-
-DEFNODECODE(DERIVED_OP,              "(%LL1) WITH %LL2",
-'e',2,LLNODE)
-
-DEFNODECODE(DUMMY_REF,               "@%SYMBID%IF(%LL1!=%NULL)+%LL1%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(NEW_VALUE_OP,            "%IF(%LL1!=%NULL) NEW(%LL1)%ELSE NEW%ENDIF",
-'e',1,LLNODE)
-
-DEFNODECODE(NEW_SPEC_OP,             "NEW(%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(TEMPLATE_OP,             "TEMPLATE",
-'e',0,LLNODE)
-
-DEFNODECODE(PROCESSORS_OP,           "PROCESSORS",
-'e',0,LLNODE)
-
-DEFNODECODE(DYNAMIC_OP,              "DYNAMIC",
-'e',0,LLNODE)
-
-DEFNODECODE(DIMENSION_OP,            "%IF(%CHECKFLAG(DVM) != %NULL)DIMENSION%ELSEdimension%ENDIF(%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(SHADOW_OP,               "SHADOW (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ALIGN_OP,                "ALIGN %IF(%LL1!=%NULL) (%LL1)%ENDIF%IF(%LL2!=%NULL) WITH %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DISTRIBUTE_OP,           "DISTRIBUTE%IF(%LL1!=%NULL) (%LL1)%ENDIF%IF(%LL2!=%NULL) ONTO %LL2%ENDIF",
-'e',2,LLNODE)
-                         
-DEFNODECODE(REMOTE_ACCESS_OP,        "REMOTE_ACCESS (%IF (%SYMBOL == %NULL)%LL1%ELSE%SYMBID : %LL1 %ENDIF)",
-'e',1,LLNODE)
-
-DEFNODECODE(INDIRECT_ACCESS_OP,      "INDIRECT_ACCESS (%IF(%SYMBOL == %NULL)%LL1%ELSE%SYMBID : %LL1 %ENDIF)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACROSS_OP,               "ACROSS (%LL1)%IF(%LL2!=%NULL)(%LL2)%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(SHADOW_RENEW_OP,         "SHADOW_RENEW (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(SHADOW_START_OP,         "SHADOW_START %SYMBID",
-'e',0,LLNODE)
-
-DEFNODECODE(SHADOW_WAIT_OP,          "SHADOW_WAIT %SYMBID",
-'e',0,LLNODE)
-
-DEFNODECODE(SHADOW_COMP_OP,          "SHADOW_COMPUTE %IF(%LL1!=%NULL)(%LL1)%ENDIF",
-'e',1,LLNODE)
-
-DEFNODECODE(REDUCTION_OP, 	     "REDUCTION (%IF(%SYMBOL == %NULL)%LL1%ELSE%SYMBID : %LL1 %ENDIF)",
-'e',1,LLNODE)
-
-DEFNODECODE(CONSISTENT_OP, 	     "CONSISTENT (%IF(%SYMBOL == %NULL)%LL1%ELSE%SYMBID : %LL1 %ENDIF)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACC_PRIVATE_OP,          "PRIVATE (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(STAGE_OP,                "STAGE (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(COMMON_OP,               "COMMON",
-'e',0,LLNODE)
-
-DEFNODECODE(ACC_CUDA_BLOCK_OP,       "CUDA_BLOCK (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACC_TIE_OP,       	     "TIE (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACC_CUDA_OP,             "CUDA",
-'e',0,LLNODE)
-
-DEFNODECODE(ACC_HOST_OP,             "HOST",
-'e',0,LLNODE)
-
-DEFNODECODE(ACC_ASYNC_OP,            "ASYNC",
-'e',0,LLNODE)
-
-DEFNODECODE(PARALLEL_OP,             "PARALLEL",
-'e',0,LLNODE)
-
-DEFNODECODE(ACC_TARGETS_OP,          "TARGETS (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACC_INLOCAL_OP,          "INLOCAL (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACC_LOCAL_OP,            "LOCAL%IF(%LL1!=%NULL) (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACC_OUT_OP,              "OUT (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACC_INOUT_OP,            "INOUT (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACC_IN_OP,               "IN (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(DVM_NEW_VALUE_DIR,       "%CMNT!DVM$%PUTTABCOMTNEW_VALUE%IF(%LL1!=%NULL) %LL1%ENDIF",
-'s',1,BIFNODE)
-
-DEFNODECODE(HPF_TEMPLATE_STAT,       "%CMNT!DVM$%PUTTABCOMTTEMPLATE%IF(%LL2!=%NULL), %LL2::%ENDIF %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_DYNAMIC_DIR,         "%CMNT!DVM$%PUTTABCOMTDYNAMIC %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_INHERIT_DIR,         "%CMNT!DVM$%PUTTABCOMTINHERIT %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(HPF_PROCESSORS_STAT,     "%CMNT!DVM$%PUTTABCOMTPROCESSORS %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_SHADOW_DIR,          "%CMNT!DVM$%PUTTABCOMTSHADOW %LL1( %LL2 )%NL",
-'s',2,BIFNODE)
-
-DEFNODECODE(DVM_INDIRECT_GROUP_DIR,  "%CMNT!DVM$%PUTTABCOMTINDIRECT_GROUP %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_REMOTE_GROUP_DIR,    "%CMNT!DVM$%PUTTABCOMTREMOTE_GROUP %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_REDUCTION_GROUP_DIR, "%CMNT!DVM$%PUTTABCOMTREDUCTION_GROUP %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_CONSISTENT_DIR,      "%CMNT!DVM$%PUTTABCOMTCONSISTENT %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_CONSISTENT_GROUP_DIR, "%CMNT!DVM$%PUTTABCOMTCONSISTENT_GROUP %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_DISTRIBUTE_DIR,      "%CMNT!DVM$%PUTTABCOMTDISTRIBUTE%IF(%LL2!=%NULL) (%LL2)%ENDIF%IF(%LL3!=%NULL) ONTO %LL3 %ENDIF :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_REDISTRIBUTE_DIR,    "%CMNT!DVM$%PUTTABCOMTREDISTRIBUTE (%LL2)%IF(%LL3!=%NULL) ONTO %LL3%ENDIF :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_ALIGN_DIR,    	     "%CMNT!DVM$%PUTTABCOMTALIGN (%LL2) WITH %LL3 :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_REALIGN_DIR,         "%CMNT!DVM$%PUTTABCOMTREALIGN (%LL2) WITH %LL3 :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_PARALLEL_ON_DIR,     "%CMNT!DVM$%PUTTABCOMTPARALLEL (%LL3)%IF(%LL1!=%NULL) ON %LL1%ENDIF%IF(%LL2!=%NULL), %LL2%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_PARALLEL_TASK_DIR,   "%CMNT!DVM$%PUTTABCOMTPARALLEL (%LL3)%IF(%LL1!=%NULL) ON %LL1%ENDIF%IF(%LL2!=%NULL), %LL2%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_SHADOW_START_DIR,    "%CMNT!DVM$%PUTTABCOMTSHADOW_START %SYMBID%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(DVM_SHADOW_WAIT_DIR,     "%CMNT!DVM$%PUTTABCOMTSHADOW_WAIT %SYMBID%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(DVM_SHADOW_GROUP_DIR,    "%CMNT!DVM$%PUTTABCOMTSHADOW_GROUP %SYMBID ( %LL1 )%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_REDUCTION_START_DIR, "%CMNT!DVM$%PUTTABCOMTREDUCTION_START %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_REDUCTION_WAIT_DIR,  "%CMNT!DVM$%PUTTABCOMTREDUCTION_WAIT %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_CONSISTENT_START_DIR, "%CMNT!DVM$%PUTTABCOMTCONSISTENT_START %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_CONSISTENT_WAIT_DIR, "%CMNT!DVM$%PUTTABCOMTCONSISTENT_WAIT %SYMBID%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(DVM_REMOTE_ACCESS_DIR,   "%CMNT!DVM$%PUTTABCOMTREMOTE_ACCESS (%IF(%SYMBOL == %NULL)%LL1%ELSE%SYMBID : %LL1 %ENDIF)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(DVM_TASK_DIR,	     "%CMNT!DVM$%PUTTABCOMTTASK %LL1%NL",
-'s',1,BIFNODE)
-DEFNODECODE(DVM_MAP_DIR,             "%CMNT!DVM$%PUTTABCOMTMAP %LL1 %IF(%LL2 != %NULL)ONTO %LL2%ENDIF%IF(%LL3 != %NULL)BY %LL3%ENDIF%NL",
-'s',3,BIFNODE)
-DEFNODECODE(DVM_PREFETCH_DIR,        "%CMNT!DVM$%PUTTABCOMTPREFETCH %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_RESET_DIR,           "%CMNT!DVM$%PUTTABCOMTRESET %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_DEBUG_DIR,           "%CMNT!DVM$%PUTTABCOMTDEBUG %LL1 %IF(%LL2!=%NULL)(%LL2)%ENDIF%NL",
-'s',2,BIFNODE)
-DEFNODECODE(DVM_ENDDEBUG_DIR,        "%CMNT!DVM$%PUTTABCOMTEND DEBUG %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_INTERVAL_DIR,        "%CMNT!DVM$%PUTTABCOMTINTERVAL %LL1%NL",
-'s',1,BIFNODE)
-DEFNODECODE(DVM_EXIT_INTERVAL_DIR,   "%CMNT!DVM$%PUTTABCOMTEXIT INTERVAL %LL1%NL",
-'s',1,BIFNODE)
-DEFNODECODE(DVM_ENDINTERVAL_DIR,     "%CMNT!DVM$%PUTTABCOMTEND INTERVAL%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TRACEON_DIR,         "%CMNT!DVM$%PUTTABCOMTTRACE ON%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TRACEOFF_DIR,        "%CMNT!DVM$%PUTTABCOMTTRACE OFF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_BARRIER_DIR,         "%CMNT!DVM$%PUTTABCOMTBARRIER%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_CHECK_DIR,           "%CMNT!DVM$%PUTTABCOMTCHECK (%LL2) :: %LL1%NL",
-'s',2,BIFNODE)
-DEFNODECODE(DVM_OWN_DIR,   	     "%CMNT!DVM$%PUTTABCOMTOWN%NL",
-'s',0,BIFNODE)                 
-DEFNODECODE(DVM_ON_DIR,              "%CMNT!DVM$%PUTTABCOMTON %LL1%IF(%LL2 != %NULL), %LL2%ENDIF%NL",
-'s',2,BIFNODE)
-DEFNODECODE(DVM_END_ON_DIR,          "%CMNT!DVM$%PUTTABCOMTEND ON%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TASK_REGION_DIR,     "%CMNT!DVM$%PUTTABCOMTTASK_REGION %SYMBID%IF(%LL2 != %NULL), %LL2%ENDIF%NL",
-'s',2,BIFNODE)	
-DEFNODECODE(DVM_END_TASK_REGION_DIR, "%CMNT!DVM$%PUTTABCOMTEND TASK_REGION%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_POINTER_DIR,   	     "%CMNT!DVM$%PUTTABCOMT%LL3, POINTER(%LL2) :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_F90_DIR,             "%CMNT!DVM$%PUTTABCOMTF90 %LL1 = %LL2%NL",
-'s',2,BIFNODE)
-
-DEFNODECODE(DVM_ASYNCHRONOUS_DIR,    "%CMNT!DVM$%PUTTABCOMTASYNCHRONOUS %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_ENDASYNCHRONOUS_DIR, "%CMNT!DVM$%PUTTABCOMTEND ASYNCHRONOUS%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(DVM_ASYNCWAIT_DIR,       "%CMNT!DVM$%PUTTABCOMTASYNCWAIT %LL1%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(DVM_TEMPLATE_CREATE_DIR, "%CMNT!DVM$%PUTTABCOMTTEMPLATE_CREATE (%LL1)%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_TEMPLATE_DELETE_DIR, "%CMNT!DVM$%PUTTABCOMTTEMPLATE_DELETE (%LL1)%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_VAR_DECL,            "%CMNT!DVM$%PUTTABCOMT%SETFLAG(VARLEN)%IF(%LL3 != %NULL)%SETFLAG(DVM)%LL3%UNSETFLAG(DVM):: %SETFLAG(PARAM)%LL1%UNSETFLAG(PARAM)%ELSE%SETFLAG(VARDECL) %LL1%UNSETFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_HEAP_DIR,            "%CMNT!DVM$%PUTTABCOMTHEAP %LL1%NL",
-'s',1,BIFNODE)
-                  
-DEFNODECODE(DVM_ASYNCID_DIR,         "%CMNT!DVM$%PUTTABCOMTASYNCID%IF(%LL2 != %NULL), COMMON::%ENDIF %LL1%NL",
-'s',2,BIFNODE)                  
-
-DEFNODECODE(DVM_NEW_VALUE_DIR,       "%CMNT!DVM$%PUTTABCOMTNEW_VALUE%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(DVM_IO_MODE_DIR,         "%CMNT!DVM$%PUTTABCOMTIO_MODE (%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(DVM_SHADOW_ADD_DIR,      "%CMNT!DVM$%PUTTABCOMTSHADOW_ADD (%LL1 = %LL2)%IF(%LL3!=%NULL) INCLUDE_TO %LL3%ENDIF%NL",
-'s',3,BIFNODE)
-DEFNODECODE(DVM_LOCALIZE_DIR,        "%CMNT!DVM$%PUTTABCOMTLOCALIZE (%LL1 => %LL2)%NL",
-'s',2,BIFNODE)
-
-DEFNODECODE(ACC_REGION_DIR,          "%CMNT!DVM$%PUTTABCOMTREGION %LL1%NL",
-'s',1,BIFNODE)
-DEFNODECODE(ACC_END_REGION_DIR,      "%CMNT!DVM$%PUTTABCOMTEND REGION%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ACC_GET_ACTUAL_DIR,      "%CMNT!DVM$%PUTTABCOMTGET_ACTUAL%IF(%LL1!=%NULL) (%LL1)%ENDIF%NL",
-'s',1,BIFNODE)
-DEFNODECODE(ACC_ACTUAL_DIR,          "%CMNT!DVM$%PUTTABCOMTACTUAL%IF(%LL1!=%NULL) (%LL1)%ENDIF%NL",
-'s',1,BIFNODE)
-DEFNODECODE(ACC_CHECKSECTION_DIR,    "%CMNT!DVM$%PUTTABCOMTHOSTSECTION%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ACC_END_CHECKSECTION_DIR,"%CMNT!DVM$%PUTTABCOMTEND HOSTSECTION%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ACC_ROUTINE_DIR,	     "%CMNT!DVM$%PUTTABCOMTROUTINE%IF(%LL1!=%NULL), %LL1%ENDIF%NL",
-'s',1,BIFNODE)
-DEFNODECODE(ACC_DECLARE_DIR,         "%CMNT!DVM$%PUTTABCOMTDECLARE %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(OMP_NOWAIT, 	     "NOWAIT",
-'e',0,LLNODE)
-DEFNODECODE(OMP_PRIVATE, 	     "PRIVATE (%LL1)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_FIRSTPRIVATE, 	     "FIRSTPRIVATE (%LL1)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_LASTPRIVATE, 	     "LASTPRIVATE (%LL1)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_THREADPRIVATE, 	     "/%LL1/",
-'e',0,LLNODE)                       
-DEFNODECODE(OMP_COPYIN, 	     "COPYIN (%LL1)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_SHARED, 	     "SHARED (%LL1)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_DEFAULT, 	     "DEFAULT (%LL1)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_ORDERED, 	     "ORDERED",
-'e',0,LLNODE)
-DEFNODECODE(OMP_IF, 	             "IF (%LL1)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_NUM_THREADS,         "NUM_THREADS (%LL1)",
-'e',0,LLNODE)                       
-DEFNODECODE(OMP_REDUCTION, 	     "REDUCTION (%LL1)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_COLLAPSE, 	     "COLLAPSE (%LL1)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_SCHEDULE, 	     "SCHEDULE (%LL1%IF(%LL2!=%NULL),%LL2%ENDIF)",
-'e',0,LLNODE)
-DEFNODECODE(OMP_COPYPRIVATE, 	     "COPYPRIVATE (%LL1)",
-'e',0,LLNODE)
-
-
-DEFNODECODE(OMP_PARALLEL_DIR,              "!$OMP%PUTTABCOMTPARALLEL %IF(%LL1!=%NULL) %LL1%ENDIF%INCTAB%NL%BLOB1",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_PARALLEL_DIR,          "!$OMP%DECTAB%PUTTABCOMTEND PARALLEL %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_SECTIONS_DIR,              "!$OMP%PUTTABCOMTSECTIONS %IF(%LL1!=%NULL) %LL1%ENDIF%INCTAB%NL%BLOB1",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_SECTION_DIR,               "!$OMP%PUTTABCOMTSECTION%INCTAB%NL%BLOB1%DECTAB",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_SECTIONS_DIR,          "!$OMP%DECTAB%PUTTABCOMTEND SECTIONS %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_DO_DIR,                    "!$OMP%PUTTABCOMTDO %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_DO_DIR,                "!$OMP%PUTTABCOMTEND DO %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_SINGLE_DIR,                "!$OMP%PUTTABCOMTSINGLE %IF(%LL1!=%NULL) %LL1%ENDIF%INCTAB%NL%BLOB1",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_SINGLE_DIR,            "!$OMP%DECTAB%PUTTABCOMTEND SINGLE %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_WORKSHARE_DIR,             "!$OMP%PUTTABCOMTWORKSHARE %IF(%LL1!=%NULL) %LL1%ENDIF%INCTAB%NL%BLOB1",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_WORKSHARE_DIR,         "!$OMP%DECTAB%PUTTABCOMTEND WORKSHARE %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_PARALLEL_DO_DIR,           "!$OMP%PUTTABCOMTPARALLEL DO %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_PARALLEL_DO_DIR,       "!$OMP%PUTTABCOMTEND PARALLEL DO %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_PARALLEL_SECTIONS_DIR,     "!$OMP%PUTTABCOMTPARALLEL SECTIONS %IF(%LL1!=%NULL) %LL1%ENDIF%INCTAB%NL%BLOB1",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_PARALLEL_SECTIONS_DIR, "!$OMP%DECTAB%PUTTABCOMTEND PARALLEL SECTIONS %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_PARALLEL_WORKSHARE_DIR,    "!$OMP%PUTTABCOMTPARALLEL WORKSHARE %IF(%LL1!=%NULL) %LL1%ENDIF%INCTAB%NL%BLOB1",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_PARALLEL_WORKSHARE_DIR, "!$OMP%DECTAB%PUTTABCOMTEND PARALLEL WORKSHARE %IF(%LL1!=%NULL) %LL1%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_THREADPRIVATE_DIR,         "!$OMP%PUTTABCOMTTHREADPRIVATE %IF(%LL1!=%NULL) ( %LL1 )%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_MASTER_DIR,                "!$OMP%PUTTABCOMTMASTER%INCTAB%NL%BLOB1",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_MASTER_DIR,            "!$OMP%DECTAB%PUTTABCOMTEND MASTER%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_ORDERED_DIR,               "!$OMP%PUTTABCOMTORDERED%INCTAB%NL%BLOB1",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_ORDERED_DIR,           "!$OMP%DECTAB%PUTTABCOMTEND ORDERED%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_ATOMIC_DIR,                "!$OMP%PUTTABCOMTATOMIC%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_BARRIER_DIR,               "!$OMP%PUTTABCOMTBARRIER%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_CRITICAL_DIR,              "!$OMP%PUTTABCOMTCRITICAL %IF(%LL1!=%NULL) ( %LL1 )%ENDIF%INCTAB%NL%BLOB1",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_END_CRITICAL_DIR,          "!$OMP%DECTAB%PUTTABCOMTEND CRITICAL %IF(%LL1!=%NULL) ( %LL1 )%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(OMP_FLUSH_DIR,                 "!$OMP%PUTTABCOMTFLUSH %IF(%LL1!=%NULL) ( %LL1 )%ENDIF%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(RECORD_DECL,                   "%CMNT%PUTTABtype %IF (%LL1 != %NULL),%LL1::%ENDIF%SYMBID%INCTAB%NL%BLOB1%DECTAB",
-'d',0,BIFNODE)
-
-
-/*****************variant tags for SPF nodes*****************************/
-DEFNODECODE(SPF_ANALYSIS_DIR,         "%CMNT!$SPF%PUTTABCOMTANALYSIS (%LL1)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SPF_PARALLEL_DIR,         "%CMNT!$SPF%PUTTABCOMTPARALLEL (%LL1)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SPF_TRANSFORM_DIR,        "%CMNT!$SPF%PUTTABCOMTTRANSFORM (%LL1)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SPF_PARALLEL_REG_DIR,     "%CMNT!$SPF%PUTTABCOMTPARALLEL_REG %SYMBID %IF(%LL1 != %NULL), APPLY_REGION(%LL1)%ENDIF%IF(%LL2 != %NULL), APPLY_FRAGMENT(%LL2)%ENDIF%NL",
-'s',2,BIFNODE)
-DEFNODECODE(SPF_END_PARALLEL_REG_DIR, "%CMNT!$SPF%PUTTABCOMTEND PARALLEL_REG%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SPF_CHECKPOINT_DIR,       "%CMNT!$SPF%PUTTABCOMTCHECKPOINT (%LL1)%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(SPF_NOINLINE_OP,          "NOINLINE",
-'e',0,LLNODE)
-DEFNODECODE(SPF_FISSION_OP,           "FISSION (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_EXPAND_OP,            "EXPAND %IF(%LL1 != %NULL)(%LL1)%ENDIF",
-'e',1,LLNODE)
-DEFNODECODE(SPF_SHRINK_OP,            "SHRINK (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_TYPE_OP,              "TYPE (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_VARLIST_OP,           "VARLIST (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_EXCEPT_OP,            "EXCEPT (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_FILES_COUNT_OP,       "FILES_COUNT (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_INTERVAL_OP,          "INTERVAL (%LL1, %LL2)",
-'e',2,LLNODE)
-DEFNODECODE(SPF_TIME_OP,              "TIME",
-'e',0,LLNODE)
-DEFNODECODE(SPF_ITER_OP,              "ITER",
-'e',0,LLNODE)
-DEFNODECODE(SPF_FLEXIBLE_OP,          "FLEXIBLE",
-'e',0,LLNODE)
-DEFNODECODE(SPF_PARAMETER_OP,         "PARAMETER (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_UNROLL_OP,            "UNROLL %IF(%LL1 != %NULL)(%LL1)%ENDIF",
-'e',1,LLNODE)
-DEFNODECODE(SPF_MERGE_OP,             "MERGE",
-'e',0,LLNODE)
-DEFNODECODE(SPF_COVER_OP,             "COVER (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_PROCESS_PRIVATE_OP,   "PROCESS_PRIVATE (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_WEIGHT_OP,	      "WEIGHT (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(SPF_CODE_COVERAGE_OP,     "CODE_COVERAGE",
-'e',0,LLNODE)
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.uni
deleted file mode 100644
index 838baf2..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.uni
+++ /dev/null
@@ -1,35 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# sage/lib/Makefile (phb)
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=oldsrc newsrc
-
-oldsrc:
-	cd oldsrc; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-newsrc:
-	cd newsrc; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-all: oldsrc newsrc
-	@echo "****** DONE MAKING SUBDIRECTORIES $(SUBDIR) ******"
-
-clean:
-	@echo "****** RECURSIVELY CLEAN SUBDIRECTORIES $(SUBDIR) ******"
-	cd oldsrc; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	cd newsrc; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	@echo "****** DONE CLEAN SUBDIRECTORIES $(SUBDIR) ******"
-
-cleanall:
-	@echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES $(SUBDIR) ******"
-	cd oldsrc; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall 
-	cd newsrc; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	@echo "****** DONE CLEANALL SUBDIRECTORIES $(SUBDIR) ******"
-
-.PHONY: all clean cleanall oldsrc newsrc
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.win
deleted file mode 100644
index 1a12396..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/makefile.win
+++ /dev/null
@@ -1,48 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-
-# sage/lib/Makefile (phb)
-
-# Valentin Emelianov  (4/01/99)
-
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=oldsrc newsrc
-
-
-all: 
-	@echo "****** RECURSIVELY MAKING SUBDIRECTORIES $(SUBDIR) ******"
-	@cd oldsrc
-    	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-	@cd ..
-    	@cd newsrc
-    	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-	@cd .. 
-   	@echo "****** DONE MAKING SUBDIRECTORIES $(SUBDIR) ******"
-
-clean:
-	@echo "****** RECURSIVELY CLEAN SUBDIRECTORIES $(SUBDIR) ******"
-   	@cd oldsrc
-   	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-   	@cd .. 
-   	@cd newsrc
-   	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean 
-   	@cd ..
-	@echo "****** DONE CLEAN SUBDIRECTORIES $(SUBDIR) ******"
-
-cleanall:
-	@echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES $(SUBDIR) ******"
-   	@cd oldsrc
-   	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-   	@cd .. 
-   	@cd newsrc
-   	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean 
-   	@cd ..
-	@echo "****** DONE CLEANALL SUBDIRECTORIES $(SUBDIR) ******"
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
deleted file mode 100644
index 51667bc..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-set(SAGE_SOURCES low_level.c unparse.c)
-
-if(MSVC_IDE)
-  foreach(DIR ${DVM_SAGE_INCLUDE_DIRS})
-    file(GLOB_RECURSE FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-      "${DIR}/*.h" "${DIR}/*.def" "${DIR}/head" "${DIR}/tag")
-    set(SAGE_HEADERS ${SAGE_HEADERS} ${FILES})
-  endforeach()
-  source_group("Header Files" FILES ${SAGE_HEADERS})
-endif()
-
-add_library(sage ${SAGE_SOURCES} ${SAGE_HEADERS})
-
-target_compile_definitions(sage PRIVATE SYS5)
-target_include_directories(sage PUBLIC "${DVM_SAGE_INCLUDE_DIRS}")
-set_target_properties(sage PROPERTIES FOLDER "${DVM_LIBRARY_FOLDER}")
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/Makefile
deleted file mode 100644
index a8eb6aa..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/Makefile
+++ /dev/null
@@ -1,83 +0,0 @@
-#######################################################################
-##                  pC++/Sage++  Copyright (C) 1993                  ##
-##  Indiana University  University of Oregon  University of Rennes   ##
-#######################################################################
-
-
-# sage/lib/newsrc/Makefile (phb)
-
-LSX = .a
-
-#HP_CFLAGS#CEXTRA = -Aa +z#ENDIF#
-#HP_CFLAGS#LSX = .sl#ENDIF#
-
-SHELL = /bin/sh
-CONFIG_ARCH=iris4d
-
-# ALPHA Sage new lib.a   modified by Pete Beckman (2/1/93)
-
-RANLIB_TEST = [ -f /usr/bin/ranlib ] || [ -f /bin/ranlib ]
-#NO_RANLIB#RANLIB_TEST = (exit 1)#ENDIF#
-
-CC = gcc
-#CC=cc#ENDIF##USE_CC#
-
-CXX = g++
-CXX = /usr/WorkShop/usr/bin/DCC
-OLDHEADERS = ../../h
-
-#INSTALLDEST = ../$(CONFIG_ARCH)
-INSTALLDEST = ../../../libsage
-INSTALL = /bin/cp
-
-# Directory in which include file can be found
-toolbox_include = ../include
-
-INCLUDE = -I$(OLDHEADERS) -I../include
-CFLAGS	= $(INCLUDE) -g -Wall $(CEXTRA)
-LDFLAGS	= 
-BISON= /usr/freeware/bin/bison
-BISON= bison
-TOOLBOX_SRC	=  comments.c low_level.c unparse.c toolsann.c annotate.tab.c
-
-TOOLBOX_HDR     =  $(toolbox_include)/macro.h $(toolbox_include)/bif_node.def  $(toolbox_include)/type.def  $(toolbox_include)/symb.def 
-
-TOOLBOX_OBJ	=  low_level.o  unparse.o 
-
-TOOLBOX_OBJ_ANN	=  comments.o toolsann.o annotate.tab.o
-
-all: libsage$(LSX) 
-
-clean:
-	/bin/rm -f *.o lib*$(LSX)
-
-low_level.o: low_level.c $(TOOLBOX_HDR)
-
-unparse.o:   unparse.c $(TOOLBOX_HDR) $(toolbox_include)/unparse.def $(toolbox_include)/unparseC++.def
-
-main.o : main.c 
-
-libsage : libsage$(LSX)
-
-libsage.a:      $(TOOLBOX_OBJ) $(TOOLBOX_HDR)
-		/bin/rm -f libsage.a
-		ar qc libsage.a $(TOOLBOX_OBJ)
-		@if $(RANLIB_TEST) ; then ranlib libsage.a ; \
-	           else echo "\tNOTE: ranlib not required" ; fi
-
-libsage.sl:     $(TOOLBOX_OBJ) $(TOOLBOX_HDR)
-		/bin/rm -f libsage.sl
-		ld -b -s -o libsage.sl $(TOOLBOX_OBJ)
-
-
-install: $(INSTALLDEST)/libsage$(LSX) 
-
-$(INSTALLDEST)/libsage$(LSX): libsage$(LSX)
-	if [ -d $(INSTALLDEST) ] ; then true; else mkdir $(INSTALLDEST) ;fi
-	$(INSTALL) libsage$(LSX) $(INSTALLDEST)/libsage$(LSX)
-	@if $(RANLIB_TEST) ; then ranlib $(INSTALLDEST)/libsage$(LSX) ; \
-           else echo "\tNOTE: ranlib not required" ; fi
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
deleted file mode 100644
index 1e2494e..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.c
+++ /dev/null
@@ -1,3145 +0,0 @@
-
-/*  A Bison parser, made from annotate.y with Bison version GNU Bison version 1.22
-  */
-
-#define YYBISON 1  /* Identify Bison output.  */
-
-#define	IFDEFA	258
-#define	APPLYTO	259
-#define	ALABELT	260
-#define	SECTIONT	261
-#define	SPECIALAF	262
-#define	FROMT	263
-#define	TOT	264
-#define	TOTLABEL	265
-#define	TOFUNCTION	266
-#define	DefineANN	267
-#define	IDENTIFIER	268
-#define	TYPENAME	269
-#define	SCSPEC	270
-#define	TYPESPEC	271
-#define	TYPEMOD	272
-#define	CONSTANT	273
-#define	STRING	274
-#define	ELLIPSIS	275
-#define	SIZEOF	276
-#define	ENUM	277
-#define	STRUCT	278
-#define	UNION	279
-#define	IF	280
-#define	ELSE	281
-#define	WHILE	282
-#define	DO	283
-#define	FOR	284
-#define	SWITCH	285
-#define	CASE	286
-#define	DEFAULT_TOKEN	287
-#define	BREAK	288
-#define	CONTINUE	289
-#define	RETURN	290
-#define	GOTO	291
-#define	ASM	292
-#define	CLASS	293
-#define	PUBLIC	294
-#define	FRIEND	295
-#define	ACCESSWORD	296
-#define	OVERLOAD	297
-#define	OPERATOR	298
-#define	COBREAK	299
-#define	COLOOP	300
-#define	COEXEC	301
-#define	LOADEDOPR	302
-#define	MULTIPLEID	303
-#define	MULTIPLETYPENAME	304
-#define	ASSIGN	305
-#define	OROR	306
-#define	ANDAND	307
-#define	EQCOMPARE	308
-#define	ARITHCOMPARE	309
-#define	LSHIFT	310
-#define	RSHIFT	311
-#define	UNARY	312
-#define	PLUSPLUS	313
-#define	MINUSMINUS	314
-#define	HYPERUNARY	315
-#define	DOUBLEMARK	316
-#define	POINTSAT	317
-
-extern char* xmalloc(int size);
-extern void Message(char *s, int l);
-extern void set_up_momentum(int value,int token);
-extern void automata_driver(int value); 
-extern char* copys(char *);
-
-#line 5 "annotate.y"
-
-#include "macro.h"
-#include <stdlib.h>
-
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
- 
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-#ifdef _NEEDALLOCAH_
-#  include <alloca.h>
-#endif
- 
-#define ON 1
-#define OFF 0
-#define OTHER 2
-#define ID_ONLY  1
-#define RANGE_APPEAR 2
-#define EXCEPTION_ON 4
-#define EXPR_LR      8
-#define VECTOR_CONST_APPEAR 16
-#define ARRAY_OP_NEED 32
-#define TRACEON 0
-
-extern POINTER newNode();
-
-
-#line 35 "annotate.y"
-typedef union { 
-         int       token ;
-         char      charv ;
-         char      *charp;
-         PTR_BFND   bfnode ;
-         PTR_LLND   ll_node ;
-         PTR_SYMB   symbol  ;
-         PTR_TYPE   data_type ;
-         PTR_HASH   hash_entry ;
-         PTR_LABEL  label ;        
-         PTR_BLOB   blob_ptr ;
-       } YYSTYPE;
-#line 151 "annotate.y"
- char      *input_filename;	
-   extern    int lastdecl_id;
-   PTR_LLND ANNOTATE_NODE = NULL;
-   PTR_BFND ANNOTATIONSCOPE = NULL;
-   extern PTR_SYMB newSymbol();
-   extern PTR_LLND newExpr();
-   extern PTR_LLND makeInt();
-   static int cur_counter =  0; 
-   static int primary_flag=  0;
-   PTR_TYPE global_int_annotation = NULL;
-   extern PTR_LLND Follow_Llnd();
-   static int recursive_yylex = OFF;
-   static int exception_flag = 0;
-   static PTR_HASH cur_id_entry;
-   int line_pos_1 = 0;
-   char *line_pos_fname = 0;
-   static int old_line = 0;
-   static int yylineno=0;
-   static int yyerror();
-   PTR_CMNT cur_comment = NULL;
-   PTR_CMNT new_cur_comment = NULL ;
-   PTR_HASH look_up_annotate();
-   PTR_HASH look_up_type();
-   char *STRINGTOPARSE = 0;
-   int PTTOSTRINGTOPARSE = 0;
-   int LENSTRINGTOPARSE = 0;
-   extern PTR_LLND Make_Function_Call();
-   static PTR_LLND check_array_id_format();
-   static PTR_LLND look_up_section();
-   extern PTR_SYMB getSymbolWithName(); /*getSymbolWithName(name, scope)*/
-   PTR_SYMB Look_For_Symbol_Ann();
-   char AnnExTensionNumber[255]; /* to symbole right for the annotation  */
-   static int Recog_My_Token();
-   static int look_up_specialfunction();
-   static char unMYGETC(char c);
-   static char MYGETC();
-   static int map_assgn_op();
-
-#ifndef YYLTYPE
-typedef
-  struct yyltype
-    {
-      int timestamp;
-      int first_line;
-      int first_column;
-      int last_line;
-      int last_column;
-      char *text;
-   }
-  yyltype;
-
-#define YYLTYPE yyltype
-#endif
-
-#ifndef YYDEBUG
-#define YYDEBUG 1
-#endif
-
-#include <stdio.h>
-
-#ifndef __cplusplus
-#ifndef __STDC__
-#define const
-#endif
-#endif
-
-
-
-#define	YYFINAL		211
-#define	YYFLAG		-32768
-#define	YYNTBASE	85
-
-#define YYTRANSLATE(x) ((unsigned)(x) <= 317 ? yytranslate[x] : 114)
-
-static const char yytranslate[] = {     0,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    83,     2,    84,     2,    70,    59,     2,    81,
-    82,    68,    66,    50,    67,    77,    69,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,    54,    79,    63,
-    51,    62,    53,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-    78,     2,    80,    58,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,    57,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,     2,     1,     2,     3,     4,     5,
-     6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-    16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-    26,    27,    28,    29,    30,    31,    32,    33,    34,    35,
-    36,    37,    38,    39,    40,    41,    42,    43,    44,    45,
-    46,    47,    48,    49,    52,    55,    56,    60,    61,    64,
-    65,    71,    72,    73,    74,    75,    76
-};
-
-#if YYDEBUG != 0
-static const short yyprhs[] = {     0,
-     0,     1,    10,    14,    15,    20,    21,    26,    27,    32,
-    39,    41,    44,    49,    52,    55,    56,    58,    59,    64,
-    69,    76,    77,    79,    83,    87,    88,    91,    93,    97,
-    99,   101,   103,   105,   107,   108,   110,   112,   116,   119,
-   123,   124,   126,   130,   132,   134,   136,   138,   140,   142,
-   148,   152,   156,   157,   163,   167,   168,   170,   174,   176,
-   178,   180,   183,   186,   190,   194,   198,   202,   206,   210,
-   214,   218,   222,   226,   230,   234,   238,   242,   248,   252,
-   256,   258,   261,   264,   268,   272,   276,   280,   284,   288,
-   292,   296,   300,   304,   308,   312,   316,   320,   324,   328,
-   334,   338,   342,   344,   346,   348,   352,   356,   358,   359,
-   365,   370,   373,   376,   378,   382,   386,   389,   392,   394
-};
-
-static const short yyrhs[] = {    -1,
-    78,    86,    87,    88,    90,    79,    91,    80,     0,    78,
-    91,    80,     0,     0,     3,    81,   113,    82,     0,     0,
-     5,    81,   113,    82,     0,     0,     4,    81,    89,    82,
-     0,     4,    81,    89,    82,    25,    96,     0,     6,     0,
-    11,    13,     0,     8,   113,     9,   113,     0,     9,   113,
-     0,    10,   113,     0,     0,    92,     0,     0,     7,    81,
-    97,    82,     0,    13,    81,    97,    82,     0,    12,    81,
-   113,    50,    18,    82,     0,     0,    93,     0,    92,    50,
-    93,     0,    16,    13,    94,     0,     0,    51,   108,     0,
-    13,     0,     0,    50,    13,     0,    13,     0,    14,     0,
-    67,     0,    83,     0,    98,     0,     0,    98,     0,   108,
-     0,    98,    50,   108,     0,    78,    80,     0,    78,   100,
-    80,     0,     0,   101,     0,   100,    50,   101,     0,   109,
-     0,   103,     0,   104,     0,    99,     0,    18,     0,    13,
-     0,   102,    54,   102,    54,   102,     0,   102,    54,   102,
-     0,    18,    84,    18,     0,     0,   106,    54,   106,    54,
-   106,     0,   106,    54,   106,     0,     0,   108,     0,   108,
-    84,   108,     0,   108,     0,   105,     0,   110,     0,    95,
-   110,     0,    21,   108,     0,   108,    66,   108,     0,   108,
-    67,   108,     0,   108,    68,   108,     0,   108,    69,   108,
-     0,   108,    70,   108,     0,   108,    61,   108,     0,   108,
-    63,   108,     0,   108,    62,   108,     0,   108,    60,   108,
-     0,   108,    59,   108,     0,   108,    57,   108,     0,   108,
-    58,   108,     0,   108,    56,   108,     0,   108,    55,   108,
-     0,   108,    53,   108,    54,   108,     0,   108,    51,   108,
-     0,   108,    52,   108,     0,   112,     0,    95,   109,     0,
-    21,   109,     0,   109,    66,   109,     0,   109,    67,   109,
-     0,   109,    68,   109,     0,   109,    69,   109,     0,   109,
-    70,   109,     0,   109,    64,   109,     0,   109,    65,   109,
-     0,   109,    61,   109,     0,   109,    63,   109,     0,   109,
-    62,   109,     0,   109,    60,   109,     0,   109,    59,   109,
-     0,   109,    57,   109,     0,   109,    58,   109,     0,   109,
-    56,   109,     0,   109,    55,   109,     0,   109,    53,    96,
-    54,   109,     0,   109,    51,   109,     0,   109,    52,   109,
-     0,    13,     0,    18,     0,   113,     0,    81,    96,    82,
-     0,    81,     1,    82,     0,    99,     0,     0,   110,    81,
-   111,    97,    82,     0,   110,    78,   107,    80,     0,   110,
-    72,     0,   110,    73,     0,    18,     0,    81,   109,    82,
-     0,    81,     1,    82,     0,   112,    72,     0,   112,    73,
-     0,    19,     0,   113,    19,     0
-};
-
-#endif
-
-#if YYDEBUG != 0
-static const short yyrline[] = { 0,
-   192,   193,   203,   214,   218,   227,   231,   241,   245,   253,
-   262,   266,   271,   276,   281,   288,   293,   300,   305,   312,
-   319,   330,   334,   339,   348,   367,   371,   380,   387,   393,
-   396,   400,   404,   411,   417,   422,   429,   434,   444,   451,
-   460,   464,   468,   479,   484,   488,   492,   499,   504,   511,
-   519,   526,   534,   538,   544,   551,   555,   561,   566,   567,
-   570,   580,   584,   588,   592,   596,   600,   604,   608,   613,
-   617,   621,   626,   630,   634,   638,   642,   646,   651,   655,
-   663,   671,   675,   679,   683,   687,   691,   695,   699,   703,
-   707,   712,   716,   721,   727,   731,   735,   739,   743,   747,
-   752,   756,   766,   773,   777,   781,   787,   791,   795,   810,
-   851,   875,   880,   891,   897,   903,   907,   911,   918,   923
-};
-
-static const char * const yytname[] = {   "$","error","$illegal.","IFDEFA","APPLYTO",
-"ALABELT","SECTIONT","SPECIALAF","FROMT","TOT","TOTLABEL","TOFUNCTION","DefineANN",
-"IDENTIFIER","TYPENAME","SCSPEC","TYPESPEC","TYPEMOD","CONSTANT","STRING","ELLIPSIS",
-"SIZEOF","ENUM","STRUCT","UNION","IF","ELSE","WHILE","DO","FOR","SWITCH","CASE",
-"DEFAULT_TOKEN","BREAK","CONTINUE","RETURN","GOTO","ASM","CLASS","PUBLIC","FRIEND",
-"ACCESSWORD","OVERLOAD","OPERATOR","COBREAK","COLOOP","COEXEC","LOADEDOPR","MULTIPLEID",
-"MULTIPLETYPENAME","','","'='","ASSIGN","'?'","':'","OROR","ANDAND","'|'","'^'",
-"'&'","EQCOMPARE","ARITHCOMPARE","'>'","'<'","LSHIFT","RSHIFT","'+'","'-'","'*'",
-"'/'","'%'","UNARY","PLUSPLUS","MINUSMINUS","HYPERUNARY","DOUBLEMARK","POINTSAT",
-"'.'","'['","';'","']'","'('","')'","'!'","'#'","annotation","IfDefR","Alabel",
-"ApplyTo","section","LocalDeclare","Expression_List","declare_local_list","onedeclare",
-"domain","unop","expr","exprlist","nonnull_exprlist","vector_constant","vector_list",
-"single_v_expr","element","triplet","compound_constant","array_expr_a","expr_no_commas_1",
-"expr_vector","expr_no_commas","const_expr_no_commas","primary","@1","const_primary",
-"string","@1"
-};
-#endif
-
-static const short yyr1[] = {     0,
-    85,    85,    85,    86,    86,    87,    87,    88,    88,    88,
-    89,    89,    89,    89,    89,    90,    90,    91,    91,    91,
-    91,    92,    92,    92,    93,    94,    94,    -1,    -1,    -1,
-    -1,    95,    95,    96,    97,    97,    98,    98,    99,    99,
-   100,   100,   100,   101,   101,   101,   101,   102,   102,   103,
-   103,   104,   105,   105,   105,   106,   106,    -1,   107,   107,
-   108,   108,   108,   108,   108,   108,   108,   108,   108,   108,
-   108,   108,   108,   108,   108,   108,   108,   108,   108,   108,
-   109,   109,   109,   109,   109,   109,   109,   109,   109,   109,
-   109,   109,   109,   109,   109,   109,   109,   109,   109,   109,
-   109,   109,   110,   110,   110,   110,   110,   110,   111,   110,
-   110,   110,   110,   112,   112,   112,   112,   112,   113,   113
-};
-
-static const short yyr2[] = {     0,
-     0,     8,     3,     0,     4,     0,     4,     0,     4,     6,
-     1,     2,     4,     2,     2,     0,     1,     0,     4,     4,
-     6,     0,     1,     3,     3,     0,     2,     1,     3,     1,
-     1,     1,     1,     1,     0,     1,     1,     3,     2,     3,
-     0,     1,     3,     1,     1,     1,     1,     1,     1,     5,
-     3,     3,     0,     5,     3,     0,     1,     3,     1,     1,
-     1,     2,     2,     3,     3,     3,     3,     3,     3,     3,
-     3,     3,     3,     3,     3,     3,     3,     5,     3,     3,
-     1,     2,     2,     3,     3,     3,     3,     3,     3,     3,
-     3,     3,     3,     3,     3,     3,     3,     3,     3,     5,
-     3,     3,     1,     1,     1,     3,     3,     1,     0,     5,
-     4,     2,     2,     1,     3,     3,     2,     2,     1,     2
-};
-
-static const short yydefact[] = {     1,
-     4,     0,     0,     0,     0,     6,     0,     0,    35,     0,
-    35,     0,     8,     3,   119,     0,   103,   104,     0,    32,
-    41,     0,    33,     0,     0,    36,   108,    37,    61,   105,
-     0,     0,     0,     0,    16,   120,     5,    63,    49,   114,
-     0,    39,     0,     0,    47,     0,    42,     0,    45,    46,
-    44,    81,     0,     0,    34,    62,    19,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   112,   113,    53,   109,     0,
-    20,     0,     0,     0,     0,    17,    23,     0,   114,    83,
-     0,     0,    82,     0,    40,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,     0,     0,     0,   117,   118,   107,   106,    38,
-    79,    80,     0,    77,    76,    74,    75,    73,    72,    69,
-    71,    70,    64,    65,    66,    67,    68,    60,     0,     0,
-    57,    35,     0,     7,    11,     0,     0,     0,     0,     0,
-    26,    18,     0,    52,   116,   115,    43,    48,    51,   101,
-   102,     0,    99,    98,    96,    97,    95,    94,    91,    93,
-    92,    89,    90,    84,    85,    86,    87,    88,     0,    56,
-   111,     0,    21,     0,    14,    15,    12,     9,     0,    25,
-     0,    24,     0,     0,    78,    55,    57,   110,     0,     0,
-    27,     2,    50,   100,    56,    13,    10,    54,     0,     0,
-     0
-};
-
-static const short yydefgoto[] = {   209,
-     6,    13,    35,   150,    85,     7,    86,    87,   190,    24,
-    54,    25,    26,    27,    46,    47,    48,    49,    50,   138,
-   139,   140,    28,    51,    29,   142,    52,    30
-};
-
-static const short yypact[] = {   -55,
-    61,   -51,   -50,   -43,   -16,    72,     4,    84,   155,    84,
-   155,    24,   104,-32768,-32768,   -10,-32768,-32768,   155,-32768,
-   164,   133,-32768,    -3,    35,    86,-32768,   295,    29,   118,
-    13,    60,    84,    63,     8,-32768,-32768,-32768,-32768,   -17,
-   168,-32768,   142,   168,-32768,   -14,-32768,    93,-32768,-32768,
-   255,   -53,    66,    67,    86,    29,-32768,   155,   155,   155,
-   155,   155,   155,   155,   155,   155,   155,   155,   155,   155,
-   155,   155,   155,   155,   155,-32768,-32768,   151,-32768,   147,
--32768,    -6,   103,   153,    88,   125,-32768,   160,-32768,-32768,
-    98,   201,-32768,   132,-32768,     9,   168,   168,   155,   168,
-   168,   168,   168,   168,   168,   168,   168,   168,   168,   168,
-   168,   168,   168,   168,   168,-32768,-32768,-32768,-32768,   295,
-   295,   333,   275,   399,   427,   453,   477,   499,   519,    89,
-    89,    89,   -35,   -35,-32768,-32768,-32768,-32768,   129,   108,
-   229,   155,   102,-32768,-32768,    84,    84,    84,   177,   119,
-   152,     5,   186,-32768,-32768,-32768,-32768,-32768,   150,   255,
-   314,   154,   384,   413,   440,   465,   488,   509,   128,   128,
-   128,   206,   206,     1,     1,-32768,-32768,-32768,   155,   155,
--32768,   124,-32768,     2,   118,   118,-32768,   182,   155,-32768,
-   137,-32768,     9,   168,   369,   165,   295,-32768,    84,   155,
-   295,-32768,-32768,   351,   155,   118,-32768,-32768,   220,   221,
--32768
-};
-
-static const short yypgoto[] = {-32768,
--32768,-32768,-32768,-32768,-32768,    74,-32768,    71,-32768,   -15,
-   -94,    -7,   -19,   -13,-32768,   134,   -89,-32768,-32768,-32768,
-  -166,-32768,   -18,    18,   203,-32768,-32768,    -8
-};
-
-
-#define	YYLAST		589
-
-
-static const short yytable[] = {    16,
-    38,    31,    55,    32,   162,    44,   159,    45,    36,    17,
-   199,     3,    36,   196,    18,    15,     4,     5,   116,   117,
-    36,    39,     1,    84,    82,    44,   158,    44,    44,     8,
-     9,    36,    73,    74,    75,    94,   -48,    10,   208,   120,
-   121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-   131,   132,   133,   134,   135,   136,   137,   -22,    90,   141,
-    92,    93,    80,     2,    11,    95,    88,     3,   113,   114,
-   115,    37,     4,     5,    21,   144,    12,    22,    44,    55,
-    45,    44,    44,    14,    44,    44,    44,    44,    44,    44,
-    44,    44,    44,    44,    44,    44,    44,    44,    44,    44,
-    76,    77,    15,   203,    33,   207,    78,    34,   145,    79,
-   146,   147,   148,   149,   160,   161,    57,   163,   164,   165,
-   166,   167,   168,   169,   170,   171,   172,   173,   174,   175,
-   176,   177,   178,    53,   182,    58,    36,   184,   185,   186,
-   -18,    81,    91,    83,    39,    17,    96,   118,   119,    40,
-    18,    15,    41,    19,    71,    72,    73,    74,    75,    89,
-   195,   197,    41,    17,   143,   151,   152,    17,    18,    15,
-   201,    19,    18,    15,   153,    19,    39,   154,    44,   155,
-    55,    40,   180,   183,    41,    89,   197,   181,    41,   187,
-   206,   109,   110,   111,   112,   113,   114,   115,    20,    20,
-   188,    84,   189,   193,   -56,   198,   200,   194,    20,    21,
-    21,   204,    43,    22,    23,    23,   202,    20,   205,   210,
-   211,    20,    43,   192,    23,   191,    56,   157,    21,     0,
-    20,    22,    21,    23,    20,    22,     0,    23,     0,     0,
-     0,    21,     0,    42,    43,     0,    23,     0,    43,     0,
-    23,    97,    98,    99,     0,   100,   101,   102,   103,   104,
-   105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-   115,   111,   112,   113,   114,   115,     0,     0,     0,    59,
-    60,    61,   156,    62,    63,    64,    65,    66,    67,    68,
-    69,    70,     0,     0,    71,    72,    73,    74,    75,     0,
-     0,     0,     0,     0,     0,    97,    98,    99,   -59,   100,
-   101,   102,   103,   104,   105,   106,   107,   108,   109,   110,
-   111,   112,   113,   114,   115,    59,    60,    61,   179,    62,
-    63,    64,    65,    66,    67,    68,    69,    70,     0,     0,
-    71,    72,    73,    74,    75,    59,    60,    61,     0,    62,
-    63,    64,    65,    66,    67,    68,    69,    70,     0,     0,
-    71,    72,    73,    74,    75,    98,    99,     0,   100,   101,
-   102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-   112,   113,   114,   115,    60,    61,     0,    62,    63,    64,
-    65,    66,    67,    68,    69,    70,     0,     0,    71,    72,
-    73,    74,    75,    99,     0,   100,   101,   102,   103,   104,
-   105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-   115,    61,     0,    62,    63,    64,    65,    66,    67,    68,
-    69,    70,     0,     0,    71,    72,    73,    74,    75,   101,
-   102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-   112,   113,   114,   115,    63,    64,    65,    66,    67,    68,
-    69,    70,     0,     0,    71,    72,    73,    74,    75,   102,
-   103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-   113,   114,   115,    64,    65,    66,    67,    68,    69,    70,
-     0,     0,    71,    72,    73,    74,    75,   103,   104,   105,
-   106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-    65,    66,    67,    68,    69,    70,     0,     0,    71,    72,
-    73,    74,    75,   104,   105,   106,   107,   108,   109,   110,
-   111,   112,   113,   114,   115,    66,    67,    68,    69,    70,
-     0,     0,    71,    72,    73,    74,    75,   105,   106,   107,
-   108,   109,   110,   111,   112,   113,   114,   115,    67,    68,
-    69,    70,     0,     0,    71,    72,    73,    74,    75,   106,
-   107,   108,   109,   110,   111,   112,   113,   114,   115,    68,
-    69,    70,     0,     0,    71,    72,    73,    74,    75
-};
-
-static const short yycheck[] = {     8,
-    19,    10,    22,    11,    99,    21,    96,    21,    19,    13,
-     9,     7,    19,   180,    18,    19,    12,    13,    72,    73,
-    19,    13,    78,    16,    33,    41,    18,    43,    44,    81,
-    81,    19,    68,    69,    70,    50,    54,    81,   205,    58,
-    59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-    69,    70,    71,    72,    73,    74,    75,    50,    41,    78,
-    43,    44,    50,     3,    81,    80,    84,     7,    68,    69,
-    70,    82,    12,    13,    78,    82,     5,    81,    94,    99,
-    94,    97,    98,    80,   100,   101,   102,   103,   104,   105,
-   106,   107,   108,   109,   110,   111,   112,   113,   114,   115,
-    72,    73,    19,   193,    81,   200,    78,     4,     6,    81,
-     8,     9,    10,    11,    97,    98,    82,   100,   101,   102,
-   103,   104,   105,   106,   107,   108,   109,   110,   111,   112,
-   113,   114,   115,     1,   142,    50,    19,   146,   147,   148,
-    80,    82,     1,    81,    13,    13,    54,    82,    82,    18,
-    18,    19,    21,    21,    66,    67,    68,    69,    70,    18,
-   179,   180,    21,    13,    18,    13,    79,    13,    18,    19,
-   189,    21,    18,    19,    50,    21,    13,    18,   194,    82,
-   200,    18,    54,    82,    21,    18,   205,    80,    21,    13,
-   199,    64,    65,    66,    67,    68,    69,    70,    67,    67,
-    82,    16,    51,    54,    54,    82,    25,    54,    67,    78,
-    78,   194,    81,    81,    83,    83,    80,    67,    54,     0,
-     0,    67,    81,   153,    83,   152,    24,    94,    78,    -1,
-    67,    81,    78,    83,    67,    81,    -1,    83,    -1,    -1,
-    -1,    78,    -1,    80,    81,    -1,    83,    -1,    81,    -1,
-    83,    51,    52,    53,    -1,    55,    56,    57,    58,    59,
-    60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-    70,    66,    67,    68,    69,    70,    -1,    -1,    -1,    51,
-    52,    53,    82,    55,    56,    57,    58,    59,    60,    61,
-    62,    63,    -1,    -1,    66,    67,    68,    69,    70,    -1,
-    -1,    -1,    -1,    -1,    -1,    51,    52,    53,    80,    55,
-    56,    57,    58,    59,    60,    61,    62,    63,    64,    65,
-    66,    67,    68,    69,    70,    51,    52,    53,    54,    55,
-    56,    57,    58,    59,    60,    61,    62,    63,    -1,    -1,
-    66,    67,    68,    69,    70,    51,    52,    53,    -1,    55,
-    56,    57,    58,    59,    60,    61,    62,    63,    -1,    -1,
-    66,    67,    68,    69,    70,    52,    53,    -1,    55,    56,
-    57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-    67,    68,    69,    70,    52,    53,    -1,    55,    56,    57,
-    58,    59,    60,    61,    62,    63,    -1,    -1,    66,    67,
-    68,    69,    70,    53,    -1,    55,    56,    57,    58,    59,
-    60,    61,    62,    63,    64,    65,    66,    67,    68,    69,
-    70,    53,    -1,    55,    56,    57,    58,    59,    60,    61,
-    62,    63,    -1,    -1,    66,    67,    68,    69,    70,    56,
-    57,    58,    59,    60,    61,    62,    63,    64,    65,    66,
-    67,    68,    69,    70,    56,    57,    58,    59,    60,    61,
-    62,    63,    -1,    -1,    66,    67,    68,    69,    70,    57,
-    58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-    68,    69,    70,    57,    58,    59,    60,    61,    62,    63,
-    -1,    -1,    66,    67,    68,    69,    70,    58,    59,    60,
-    61,    62,    63,    64,    65,    66,    67,    68,    69,    70,
-    58,    59,    60,    61,    62,    63,    -1,    -1,    66,    67,
-    68,    69,    70,    59,    60,    61,    62,    63,    64,    65,
-    66,    67,    68,    69,    70,    59,    60,    61,    62,    63,
-    -1,    -1,    66,    67,    68,    69,    70,    60,    61,    62,
-    63,    64,    65,    66,    67,    68,    69,    70,    60,    61,
-    62,    63,    -1,    -1,    66,    67,    68,    69,    70,    61,
-    62,    63,    64,    65,    66,    67,    68,    69,    70,    61,
-    62,    63,    -1,    -1,    66,    67,    68,    69,    70
-};
-/* -*-C-*-  Note some compilers choke on comments on `#line' lines.  */
-#line 3 "/usr/local/lib/bison.simple"
-
-/* Skeleton output parser for bison,
-   Copyright (C) 1984, 1989, 1990 Bob Corbett and Richard Stallman
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 1, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-
-#ifndef alloca
-    #ifdef __GNUC__
-        #define alloca __builtin_alloca
-    #else /* not GNU C.  */
-        #if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
-        #include <alloca.h>
-    #else /* not sparc */
-        #if defined (_WIN32 ) && !defined (__TURBOC__)
-            #include <malloc.h>
-        #else /* not MSDOS, or __TURBOC__ */
-            #if defined(_AIX)
-                #include <malloc.h>
-                #pragma alloca
-            #else /* not MSDOS, __TURBOC__, or _AIX */
-                #ifdef __hpux
-                    #ifdef __cplusplus
-                    extern "C" {
-                        void *alloca (unsigned int);
-                    };
-                #else /* not __cplusplus */
-                    void *alloca ();
-                #endif /* not __cplusplus */
-        #endif /* __hpux */
-        #endif /* not _AIX */
-        #endif /* not MSDOS, or __TURBOC__ */
-    #endif /* not sparc.  */
-    #endif /* not GNU C.  */
-#endif /* alloca not defined.  */
-
-/* This is the parser code that is written into each bison parser
-  when the %semantic_parser declaration is not specified in the grammar.
-  It was written by Richard Stallman by simplifying the hairy parser
-  used when %semantic_parser is specified.  */
-
-/* Note: there must be only one dollar sign in this file.
-   It is replaced by the list of actions, each action
-   as one case of the switch.  */
-
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		-2
-#define YYEOF		0
-#define YYACCEPT	return(0)
-#define YYABORT 	return(1)
-#define YYERROR		goto yyerrlab1
-/* Like YYERROR except do call yyerror.
-   This remains here temporarily to ease the
-   transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-#define YYFAIL		goto yyerrlab
-#define YYRECOVERING()  (!!yyerrstatus)
-#define YYBACKUP(token, value) \
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    { yychar = (token), yylval = (value);			\
-      yychar1 = YYTRANSLATE (yychar);				\
-      YYPOPSTACK;						\
-      goto yybackup;						\
-    }								\
-  else								\
-    { yyerror ("syntax error: cannot back up"); YYERROR; }	\
-while (0)
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-#ifndef YYPURE
-int yylex_annotate();
-#define YYLEX		yylex_annotate()
-#endif
-
-#ifdef YYPURE
-#ifdef YYLSP_NEEDED
-#define YYLEX		yylex(&yylval, &yylloc)
-#else
-#define YYLEX		yylex(&yylval)
-#endif
-#endif
-
-/* If nonreentrant, generate the variables here */
-
-#ifndef YYPURE
-
-static int	yychar;			/*  the lookahead symbol		*/
-static YYSTYPE	yylval;			/*  the semantic value of the		*/
-				/*  lookahead symbol			*/
-
-#ifdef YYLSP_NEEDED
-YYLTYPE yylloc;			/*  location data for the lookahead	*/
-				/*  symbol				*/
-#endif
-
-static int yynerrs;			/*  number of parse errors so far       */
-#endif  /* not YYPURE */
-
-#if YYDEBUG != 0
-static int yydebug;			/*  nonzero means print parse trace	*/
-/* Since this is uninitialized, it does not stop multiple parsers
-   from coexisting.  */
-#endif
-
-/*  YYINITDEPTH indicates the initial size of the parser's stacks	*/
-
-#ifndef	YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/*  YYMAXDEPTH is the maximum size the stacks can grow to
-    (effective only if the built-in stack extension method is used).  */
-
-#if YYMAXDEPTH == 0
-#undef YYMAXDEPTH
-#endif
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-/* Prevent warning if -Wstrict-prototypes.  */
-#ifdef __GNUC__
-int yyparse_annotate(void);
-#endif
-
-#if __GNUC__ > 1		/* GNU C and GNU C++ define this.  */
-#define __yy_bcopy(FROM,TO,COUNT)	__builtin_memcpy(TO,FROM,COUNT)
-#else				/* not GNU C or C++ */
-#ifndef __cplusplus
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_bcopy (from, to, count)
-     char *from;
-     char *to;
-     int count;
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#else /* __cplusplus */
-
-/* This is the most reliable way to avoid incompatibilities
-   in available built-in functions on various systems.  */
-static void
-__yy_bcopy (char *from, char *to, int count)
-{
-  register char *f = from;
-  register char *t = to;
-  register int i = count;
-
-  while (i-- > 0)
-    *t++ = *f++;
-}
-
-#endif
-#endif
-
-#line 184 "/usr/local/lib/bison.simple"
-int
-yyparse_annotate()
-{
-  register int yystate;
-  register int yyn;
-  register short *yyssp;
-  register YYSTYPE *yyvsp;
-  int yyerrstatus;	/*  number of tokens to shift before error messages enabled */
-  int yychar1 = 0;		/*  lookahead token as an internal (translated) token number */
-
-  short	yyssa[YYINITDEPTH];	/*  the state stack			*/
-  YYSTYPE yyvsa[YYINITDEPTH];	/*  the semantic value stack		*/
-
-  short *yyss = yyssa;		/*  refer to the stacks thru separate pointers */
-  YYSTYPE *yyvs = yyvsa;	/*  to allow yyoverflow to reallocate them elsewhere */
-
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylsa[YYINITDEPTH];	/*  the location stack			*/
-  YYLTYPE *yyls = yylsa;
-  YYLTYPE *yylsp;
-
-#define YYPOPSTACK   (yyvsp--, yyssp--, yylsp--)
-#else
-#define YYPOPSTACK   (yyvsp--, yyssp--)
-#endif
-
-  int yystacksize = YYINITDEPTH;
-
-#ifdef YYPURE
-  int yychar;
-  YYSTYPE yylval;
-  int yynerrs;
-#ifdef YYLSP_NEEDED
-  YYLTYPE yylloc;
-#endif
-#endif
-
-  YYSTYPE yyval;		/*  the variable used to return		*/
-				/*  semantic values from the action	*/
-				/*  routines				*/
-
-  int yylen;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Starting parse\n");
-#endif
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY;		/* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-  yyssp = yyss - 1;
-  yyvsp = yyvs;
-#ifdef YYLSP_NEEDED
-  yylsp = yyls;
-#endif
-
-/* Push a new state, which is found in  yystate  .  */
-/* In all cases, when you get here, the value and location stacks
-   have just been pushed. so pushing a state here evens the stacks.  */
-yynewstate:
-
-  *++yyssp = yystate;
-
-  if (yyssp >= yyss + yystacksize - 1)
-    {
-      /* Give user a chance to reallocate the stack */
-      /* Use copies of these so that the &'s don't force the real ones into memory. */
-      YYSTYPE *yyvs1 = yyvs;
-      short *yyss1 = yyss;
-#ifdef YYLSP_NEEDED
-      YYLTYPE *yyls1 = yyls;
-#endif
-
-      /* Get the current used size of the three stacks, in elements.  */
-      int size = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      /* Each stack pointer address is followed by the size of
-	 the data in use in that stack, in bytes.  */
-#ifdef YYLSP_NEEDED
-      /* This used to be a conditional around just the two extra args,
-	 but that might be undefined if yyoverflow is a macro.  */
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yyls1, size * sizeof (*yylsp),
-		 &yystacksize);
-#else
-      yyoverflow("parser stack overflow",
-		 &yyss1, size * sizeof (*yyssp),
-		 &yyvs1, size * sizeof (*yyvsp),
-		 &yystacksize);
-#endif
-
-      yyss = yyss1; yyvs = yyvs1;
-#ifdef YYLSP_NEEDED
-      yyls = yyls1;
-#endif
-#else /* no yyoverflow */
-      /* Extend the stack our own way.  */
-      if (yystacksize >= YYMAXDEPTH)
-	{
-	  yyerror("parser stack overflow");
-	  return 2;
-	}
-      yystacksize *= 2;
-      if (yystacksize > YYMAXDEPTH)
-	yystacksize = YYMAXDEPTH;
-      yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,yyss, 0);
-#endif
-      __yy_bcopy ((char *)yyss1, (char *)yyss, size * sizeof (*yyssp));
-      yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,yyvs, 0);
-#endif
-      __yy_bcopy ((char *)yyvs1, (char *)yyvs, size * sizeof (*yyvsp));
-#ifdef YYLSP_NEEDED
-      yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,yyls, 0);
-#endif
-      __yy_bcopy ((char *)yyls1, (char *)yyls, size * sizeof (*yylsp));
-#endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + size - 1;
-      yyvsp = yyvs + size - 1;
-#ifdef YYLSP_NEEDED
-      yylsp = yyls + size - 1;
-#endif
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Stack size increased to %d\n", yystacksize);
-#endif
-
-      if (yyssp >= yyss + yystacksize - 1)
-	YYABORT;
-    }
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Entering state %d\n", yystate);
-#endif
-
-  goto yybackup;
- yybackup:
-
-/* Do appropriate processing given the current state.  */
-/* Read a lookahead token if we need one and don't already have one.  */
-/* yyresume: */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* yychar is either YYEMPTY or YYEOF
-     or a valid token in external form.  */
-
-  if (yychar == YYEMPTY)
-    {
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Reading a token: ");
-#endif
-      yychar = YYLEX;
-    }
-
-  /* Convert token to internal form (in yychar1) for indexing tables with */
-
-  if (yychar <= 0)		/* This means end of input. */
-    {
-      yychar1 = 0;
-      yychar = YYEOF;		/* Don't call YYLEX any more */
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Now at end of input.\n");
-#endif
-    }
-  else
-    {
-      yychar1 = YYTRANSLATE(yychar);
-
-#if YYDEBUG != 0
-      if (yydebug)
-	{
-	  fprintf (stderr, "Next token is %d (%s", yychar, yytname[yychar1]);
-	  /* Give the individual parser a way to print the precise meaning
-	     of a token, for further debugging info.  */
-#ifdef YYPRINT
-	  YYPRINT (stderr, yychar, yylval);
-#endif
-	  fprintf (stderr, ")\n");
-	}
-#endif
-    }
-
-  yyn += yychar1;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != yychar1)
-    goto yydefault;
-
-  yyn = yytable[yyn];
-
-  /* yyn is what to do for this token type in this state.
-     Negative => reduce, -yyn is rule number.
-     Positive => shift, yyn is new state.
-       New state is final state => don't bother to shift,
-       just return success.
-     0, or most negative number => error.  */
-
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrlab;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-  /* Shift the lookahead token.  */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting token %d (%s), ", yychar, yytname[yychar1]);
-#endif
-
-  /* Discard the token being shifted unless it is eof.  */
-  if (yychar != YYEOF)
-    yychar = YYEMPTY;
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  /* count tokens shifted since error; after three, turn off error status.  */
-  if (yyerrstatus) yyerrstatus--;
-
-  yystate = yyn;
-  goto yynewstate;
-
-/* Do the default action for the current state.  */
-yydefault:
-
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-
-/* Do a reduction.  yyn is the number of a rule to reduce with.  */
-yyreduce:
-  yylen = yyr2[yyn];
-  if (yylen > 0)
-    yyval = yyvsp[1-yylen]; /* implement default value of the action */
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      int i;
-
-      fprintf (stderr, "Reducing via rule %d (line %d), ",
-	       yyn, yyrline[yyn]);
-
-      /* Print the symbols being reduced, and their result.  */
-      for (i = yyprhs[yyn]; yyrhs[i] > 0; i++)
-	fprintf (stderr, "%s ", yytname[yyrhs[i]]);
-      fprintf (stderr, " -> %s\n", yytname[yyr1[yyn]]);
-    }
-#endif
-
-
-  switch (yyn) {
-
-case 2:
-#line 194 "annotate.y"
-{ 
-	  ANNOTATE_NODE = newExpr(EXPR_LIST,NULL,yyvsp[-6].ll_node,
-	                   newExpr(EXPR_LIST,NULL,yyvsp[-5].ll_node,
-			     newExpr(EXPR_LIST,NULL,yyvsp[-4].ll_node,
-				newExpr(EXPR_LIST,NULL,yyvsp[-3].ll_node,
-				   newExpr(EXPR_LIST,NULL,yyvsp[-1].ll_node,NULL)))));
-	  if (TRACEON)
-	    printf("Recognized ANNOTATION\n");
-	;
-    break;}
-case 3:
-#line 204 "annotate.y"
-{ 
-	  ANNOTATE_NODE = newExpr(EXPR_LIST,NULL,NULL,
-	                   newExpr(EXPR_LIST,NULL,NULL,
-			     newExpr(EXPR_LIST,NULL,NULL,
-				newExpr(EXPR_LIST,NULL,NULL,
-				   newExpr(EXPR_LIST,NULL,yyvsp[-1].ll_node,NULL)))));
-	   if (TRACEON) printf("Recognized ANNOTATION\n");
-	;
-    break;}
-case 4:
-#line 215 "annotate.y"
-{
-	  yyval.ll_node = NULL; 
-        ;
-    break;}
-case 5:
-#line 219 "annotate.y"
-{
-	  PTR_SYMB ids = NULL;
-	  /* need a symb there, will be global later */
-          ids = Look_For_Symbol_Ann (FUNCTION_NAME,"IfDef", NULL);
-	  yyval.ll_node = Make_Function_Call (ids,NULL,1,yyvsp[-1].ll_node);
-	  if (TRACEON) printf("Recognized IFDEFA \n");
-	;
-    break;}
-case 6:
-#line 228 "annotate.y"
-{	
-	  yyval.ll_node = NULL; 
-        ;
-    break;}
-case 7:
-#line 232 "annotate.y"
-{
-	  PTR_SYMB ids = NULL;
-	  /* need a symb there, will be global later */
-          ids = Look_For_Symbol_Ann (FUNCTION_NAME,"Label", NULL);
-	  yyval.ll_node = Make_Function_Call (ids,NULL,1,yyvsp[-1].ll_node);
-	  if (TRACEON) printf("Recognized IFDEFA \n");
-	  if (TRACEON) printf("Recognized ALABEL\n");
-	;
-    break;}
-case 8:
-#line 242 "annotate.y"
-{
-	  yyval.ll_node = NULL; 
-        ;
-    break;}
-case 9:
-#line 246 "annotate.y"
-{
-	  PTR_SYMB ids = NULL;
-	  /* need a symb there, will be global later */
-          ids = Look_For_Symbol_Ann (FUNCTION_NAME,"ApplyTo", NULL);
-	  yyval.ll_node = Make_Function_Call (ids,NULL,2,yyvsp[-1].ll_node, NULL);
-	   if (TRACEON) printf("Recognized APPLYTO \n");
-	;
-    break;}
-case 10:
-#line 254 "annotate.y"
-{
-	  PTR_SYMB ids = NULL;
-	  /* need a symb there, will be global later */
-          ids = Look_For_Symbol_Ann (FUNCTION_NAME,"ApplyTo", NULL);
-	  yyval.ll_node = Make_Function_Call (ids,NULL,2,yyvsp[-3].ll_node,yyvsp[0].ll_node);
-	   if (TRACEON) printf("Recognized APPLYTO \n");
-	;
-    break;}
-case 11:
-#line 263 "annotate.y"
-{ /* SECTIONT return a string_val llnd */
-            yyval.ll_node = yyvsp[0].ll_node;
-          ;
-    break;}
-case 12:
-#line 267 "annotate.y"
-{
-	    
-            yyval.ll_node =  newExpr(VAR_REF,NULL,yyvsp[0].hash_entry);
-          ;
-    break;}
-case 13:
-#line 272 "annotate.y"
-{  
-             yyval.ll_node = newExpr(EXPR_LIST,NULL,yyvsp[-2].ll_node,
-	                   newExpr(EXPR_LIST,NULL,yyvsp[0].ll_node,NULL));
-          ;
-    break;}
-case 14:
-#line 277 "annotate.y"
-{  
-             yyval.ll_node = newExpr(EXPR_LIST,NULL,NULL,
-	                   newExpr(EXPR_LIST,NULL,yyvsp[0].ll_node,NULL));
-          ;
-    break;}
-case 15:
-#line 282 "annotate.y"
-{  
-             yyval.ll_node = yyvsp[0].ll_node;
-          ;
-    break;}
-case 16:
-#line 289 "annotate.y"
-{
-	  if (TRACEON) printf("Recognized LocalDeclare\n");
-	  yyval.ll_node = NULL; 
-        ;
-    break;}
-case 17:
-#line 294 "annotate.y"
-{
-	  yyval.ll_node = yyvsp[0].ll_node;
-	  if (TRACEON) printf("Recognized  declare_local_list\n");
-	;
-    break;}
-case 18:
-#line 301 "annotate.y"
-{
-	  yyval.ll_node = NULL; 
-	  if (TRACEON) printf("Recognized empty expr\n");
-        ;
-    break;}
-case 19:
-#line 306 "annotate.y"
-{ /* for Key word like parallel loop and so on */
-	  PTR_SYMB ids = NULL;
-	  ids = Look_For_Symbol_Ann (VARIABLE_NAME, yyvsp[-3].hash_entry,global_int_annotation);
-	  yyval.ll_node = Make_Function_Call (ids,NULL,1,yyvsp[-1].ll_node);
-	  if (TRACEON) printf("Recognized Expression_List SPECIALAF  \n");
-	;
-    break;}
-case 20:
-#line 313 "annotate.y"
-{ /* for Key word like parallel loop and so on */
-	  PTR_SYMB ids = NULL;
-	  ids = Look_For_Symbol_Ann (VARIABLE_NAME, yyvsp[-3].hash_entry,global_int_annotation);
-	  yyval.ll_node = Make_Function_Call (ids,NULL,1,yyvsp[-1].ll_node);
-	  if (TRACEON) printf("Recognized Expression_List SPECIALAF  \n");
-	;
-    break;}
-case 21:
-#line 320 "annotate.y"
-{ /* for Key word like parallel loop and so on */
-	  PTR_SYMB ids = NULL;
-	  ids = Look_For_Symbol_Ann (FUNCTION_NAME, "Define" ,global_int_annotation);
-	  yyval.ll_node = Make_Function_Call (ids,NULL,2,yyvsp[-3].ll_node,yyvsp[-1].ll_node);
-	  if (TRACEON) printf("Recognized Expression_List Define  \n");
-	;
-    break;}
-case 22:
-#line 331 "annotate.y"
-{
-	  yyval.ll_node = NULL; 
-        ;
-    break;}
-case 23:
-#line 335 "annotate.y"
-{
-           yyval.ll_node =  newExpr(EXPR_LIST,NODE_TYPE(yyvsp[0].ll_node),yyvsp[0].ll_node,NULL);
-	   if (TRACEON) printf("Recognized onedeclare \n");
-	 ;
-    break;}
-case 24:
-#line 340 "annotate.y"
-{
-	   PTR_LLND ll_ptr ;
-	   ll_ptr = Follow_Llnd(yyvsp[-2].ll_node,2);               
-	   NODE_OPERAND1(ll_ptr) = newExpr(EXPR_LIST,NODE_TYPE(yyvsp[0].ll_node),yyvsp[0].ll_node,NULL);
-	   if (TRACEON) printf("Recognized declare_local_list _inlist \n");
-	   yyval.ll_node=yyvsp[-2].ll_node;
-	 ;
-    break;}
-case 25:
-#line 350 "annotate.y"
-{
-	    PTR_SYMB ids = NULL;
-	    PTR_LLND expr;
-            PTR_HASH p;
-	    char temp1[256];
-	    
-	    /* need a symb there, will be global later */
-            p = yyvsp[-1].hash_entry;
-	    strcpy(temp1,AnnExTensionNumber);
-	    strncat(temp1,p->ident,255);
-	    ids = newSymbol (VARIABLE_NAME,temp1,global_int_annotation);
-	    expr = newExpr(VAR_REF,global_int_annotation, ids);
-	    if (yyvsp[0].ll_node)
-	      yyval.ll_node = newExpr(ASSGN_OP,global_int_annotation,expr, yyvsp[0].ll_node);
-            else
-              yyval.ll_node = expr;
-          ;
-    break;}
-case 26:
-#line 368 "annotate.y"
-{
-	  yyval.ll_node = NULL; 
-        ;
-    break;}
-case 27:
-#line 372 "annotate.y"
-{
-	  yyval.ll_node = yyvsp[0].ll_node;
-	;
-    break;}
-case 28:
-#line 382 "annotate.y"
-{ 
-		  /* to modify, must be check before created */
-		  yyval.symbol = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, yyvsp[0].hash_entry, NULL); 
-		  /* $$ = install_parameter($1,VARIABLE_NAME) ; */
-                ;
-    break;}
-case 29:
-#line 388 "annotate.y"
-{ 
-		  yyval.symbol = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, yyvsp[0].hash_entry, NULL);
-		;
-    break;}
-case 30:
-#line 395 "annotate.y"
-{ yyval.symbol = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, yyvsp[0].hash_entry, NULL);;
-    break;}
-case 31:
-#line 397 "annotate.y"
-{ yyval.symbol = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, yyvsp[0].hash_entry, NULL); ;
-    break;}
-case 32:
-#line 401 "annotate.y"
-{ 
-                 yyval.token = MINUS_OP ;
-	       ;
-    break;}
-case 33:
-#line 405 "annotate.y"
-{ 
-                 yyval.token = NOT_OP ;
-	       ;
-    break;}
-case 34:
-#line 412 "annotate.y"
-{ 
-                  yyval.ll_node = yyvsp[0].ll_node ;
-                ;
-    break;}
-case 35:
-#line 419 "annotate.y"
-{ 
-                  yyval.ll_node = LLNULL ;
-                ;
-    break;}
-case 36:
-#line 423 "annotate.y"
-{ 
-                  yyval.ll_node = yyvsp[0].ll_node ; 
-                ;
-    break;}
-case 37:
-#line 431 "annotate.y"
-{ 
-                  yyval.ll_node = newExpr(EXPR_LIST,NODE_TYPE(yyvsp[0].ll_node),yyvsp[0].ll_node,NULL);
-                ;
-    break;}
-case 38:
-#line 435 "annotate.y"
-{ PTR_LLND ll_ptr ;
-                  ll_ptr = Follow_Llnd(yyvsp[-2].ll_node,2);               
-                  NODE_OPERAND1(ll_ptr) = newExpr(EXPR_LIST,NODE_TYPE(yyvsp[0].ll_node),yyvsp[0].ll_node,NULL);
-
-                  yyval.ll_node=yyvsp[-2].ll_node;
-                ;
-    break;}
-case 39:
-#line 445 "annotate.y"
-{     
-                  yyval.ll_node = newExpr(VECTOR_CONST,NULL,NULL,NULL);
-                  primary_flag = VECTOR_CONST_APPEAR ;
-		  /* Temporarily setting */
-                  NODE_TYPE(yyval.ll_node) = global_int_annotation ;
-		;
-    break;}
-case 40:
-#line 452 "annotate.y"
-{   
-                 yyval.ll_node = newExpr(VECTOR_CONST,NULL,yyvsp[-1].ll_node,NULL);
-                  primary_flag = VECTOR_CONST_APPEAR ;
-		  /* Temporarily setting */
-                  NODE_TYPE(yyval.ll_node) = global_int_annotation ;
-	       ;
-    break;}
-case 41:
-#line 461 "annotate.y"
-{
-           yyval.ll_node = NULL;
-        ;
-    break;}
-case 42:
-#line 465 "annotate.y"
-{ 
-               yyval.ll_node = newExpr(EXPR_LIST,NULL,yyvsp[0].ll_node,NULL);
-             ;
-    break;}
-case 43:
-#line 469 "annotate.y"
-{
-               PTR_LLND ll_node1 ;
-               ll_node1 = Follow_Llnd(yyvsp[-2].ll_node,2);
-               NODE_OPERAND1(ll_node1)= newExpr(EXPR_LIST,NULL,yyvsp[0].ll_node,NULL);
-	       yyval.ll_node=yyvsp[-2].ll_node;
-	     ;
-    break;}
-case 44:
-#line 481 "annotate.y"
-{ 
-               yyval.ll_node = yyvsp[0].ll_node;
-             ;
-    break;}
-case 45:
-#line 485 "annotate.y"
-{ 
-               yyval.ll_node = yyvsp[0].ll_node;
-             ;
-    break;}
-case 46:
-#line 489 "annotate.y"
-{ 
-               yyval.ll_node = yyvsp[0].ll_node;
-             ;
-    break;}
-case 47:
-#line 493 "annotate.y"
-{ 
-                  yyval.ll_node = yyvsp[0].ll_node ;
-                ;
-    break;}
-case 48:
-#line 501 "annotate.y"
-{ 
-                  yyval.ll_node = yyvsp[0].ll_node ;
-	    ;
-    break;}
-case 49:
-#line 505 "annotate.y"
-{ 
-		  yyval.ll_node = newExpr(VAR_REF, NULL,Look_For_Symbol_Ann (VARIABLE_NAME, yyvsp[0].hash_entry, NULL));
-		  exception_flag = ON ;
-		;
-    break;}
-case 50:
-#line 514 "annotate.y"
-{ PTR_LLND p1,p2 ;
-              p1 =  newExpr(DDOT,NULL,yyvsp[-4].ll_node,yyvsp[-2].ll_node);
-              p2 = newExpr(DDOT,NULL,p1,yyvsp[0].ll_node);
-              yyval.ll_node = p2 ;
-	    ;
-    break;}
-case 51:
-#line 520 "annotate.y"
-{ 
-              yyval.ll_node= newExpr(DDOT,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-	    ;
-    break;}
-case 52:
-#line 528 "annotate.y"
-{ 
-             yyval.ll_node=  newExpr(COPY_NODE,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-	   ;
-    break;}
-case 53:
-#line 535 "annotate.y"
-{
-	      yyval.ll_node = NULL;
-	    ;
-    break;}
-case 54:
-#line 539 "annotate.y"
-{ PTR_LLND p1,p2 ;
-	      p1 =  newExpr(DDOT,NULL,yyvsp[-4].ll_node,yyvsp[-2].ll_node);
-              p2 = newExpr(DDOT,NULL,p1,yyvsp[0].ll_node);
-              yyval.ll_node = p2 ;
-	    ;
-    break;}
-case 55:
-#line 545 "annotate.y"
-{
-              yyval.ll_node= newExpr(DDOT,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-	    ;
-    break;}
-case 56:
-#line 552 "annotate.y"
-{
-                yyval.ll_node = LLNULL ;
-             ;
-    break;}
-case 57:
-#line 556 "annotate.y"
-{ 
-                 yyval.ll_node = yyvsp[0].ll_node ;
-           ;
-    break;}
-case 61:
-#line 572 "annotate.y"
-{ 
-            /* Need Another way to check this one */
-            /*  if (primary_flag & EXCEPTION_ON) Message("syntax error 6"); */
-             if (exception_flag == ON)  { /* Message("undefined symbol",0); */
-                                          exception_flag =OFF;
-                                        }
-             yyval.ll_node=yyvsp[0].ll_node ;
-	   ;
-    break;}
-case 62:
-#line 581 "annotate.y"
-{	
-		  yyval.ll_node=newExpr(yyvsp[-1].token,NULL,yyvsp[0].ll_node);
-		;
-    break;}
-case 63:
-#line 585 "annotate.y"
-{ 
-		  yyval.ll_node= newExpr(SIZE_OP,global_int_annotation,yyvsp[0].ll_node,LLNULL);
-                ;
-    break;}
-case 64:
-#line 589 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(ADD_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 65:
-#line 593 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(SUBT_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 66:
-#line 597 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(MULT_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 67:
-#line 601 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(DIV_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 68:
-#line 605 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(MOD_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 69:
-#line 609 "annotate.y"
-{ int op1 ;
-                  op1 = (yyvsp[-1].token == ((int) LE_EXPR)) ? LE_OP : GE_OP ;
-		  yyval.ll_node=newExpr(op1,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 70:
-#line 614 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(LT_OP,global_int_annotation,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 71:
-#line 618 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(GT_OP,global_int_annotation,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 72:
-#line 622 "annotate.y"
-{ int op1 ;
-                  op1 = (yyvsp[-1].token == ((int) NE_EXPR)) ? NE_OP : EQ_OP  ;
-     		  yyval.ll_node=newExpr(op1,global_int_annotation,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 73:
-#line 627 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(BITAND_OP,global_int_annotation,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 74:
-#line 631 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(BITOR_OP,global_int_annotation,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 75:
-#line 635 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(XOR_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 76:
-#line 639 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(AND_OP,global_int_annotation,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 77:
-#line 643 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(OR_OP,global_int_annotation,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 78:
-#line 647 "annotate.y"
-{ PTR_LLND ll_node1;
-		  ll_node1=newExpr(EXPR_IF_BODY,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-		  yyval.ll_node=newExpr(EXPR_IF,NULL,yyvsp[-4].ll_node,ll_node1);
-		;
-    break;}
-case 79:
-#line 652 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(ASSGN_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 80:
-#line 656 "annotate.y"
-{ int op1 ;
-                  op1 = map_assgn_op(yyvsp[-1].token);
-		  yyval.ll_node=newExpr(op1,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 81:
-#line 665 "annotate.y"
-{ 
-             if (exception_flag == ON)  { Message("undefined symbol",0);
-                                          exception_flag =OFF;
-                                        }
-             yyval.ll_node=yyvsp[0].ll_node ;
-	   ;
-    break;}
-case 82:
-#line 672 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(yyvsp[-1].token,NULL,yyvsp[0].ll_node);
-                ;
-    break;}
-case 83:
-#line 676 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(SIZE_OP,NULL,yyvsp[0].ll_node);
-                ;
-    break;}
-case 84:
-#line 680 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(ADD_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 85:
-#line 684 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(SUBT_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 86:
-#line 688 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(MULT_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 87:
-#line 692 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(DIV_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 88:
-#line 696 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(MOD_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 89:
-#line 700 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(LSHIFT_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 90:
-#line 704 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(RSHIFT_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 91:
-#line 708 "annotate.y"
-{ int op1 ;
-                  op1 = (yyvsp[-1].token == ((int) LE_EXPR)) ? LE_OP : GE_OP ;
-		  yyval.ll_node=newExpr(op1,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 92:
-#line 713 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(LT_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 93:
-#line 717 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(GT_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 94:
-#line 722 "annotate.y"
-{ int op1 ;
-
-                  op1 = (yyvsp[-1].token == ((int) NE_EXPR)) ? NE_OP : EQ_OP  ;
-		  yyval.ll_node=newExpr(op1,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 95:
-#line 728 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(BITAND_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 96:
-#line 732 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(BITOR_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 97:
-#line 736 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(XOR_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 98:
-#line 740 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(AND_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 99:
-#line 744 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(OR_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 100:
-#line 748 "annotate.y"
-{ PTR_LLND ll_node1;
-		  ll_node1=newExpr(EXPR_IF_BODY,yyvsp[-3].charv,yyvsp[-2].ll_node);
-		  yyval.ll_node=newExpr(EXPR_IF,NULL,yyvsp[-4].ll_node,ll_node1);
-		;
-    break;}
-case 101:
-#line 753 "annotate.y"
-{ 
-		  yyval.ll_node=newExpr(ASSGN_OP,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 102:
-#line 757 "annotate.y"
-{ int op1 ;
-                  op1 = map_assgn_op(yyvsp[-1].token);
-		  yyval.ll_node=newExpr(op1,NULL,yyvsp[-2].ll_node,yyvsp[0].ll_node);
-                ;
-    break;}
-case 103:
-#line 768 "annotate.y"
-{ PTR_SYMB symbptr;
-		  symbptr = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, yyvsp[0].hash_entry,NULL);
-		  yyval.ll_node = newExpr(VAR_REF,global_int_annotation,symbptr);
-		  exception_flag = ON ;
-		;
-    break;}
-case 104:
-#line 774 "annotate.y"
-{ 
-                  yyval.ll_node = yyvsp[0].ll_node ;
-                ;
-    break;}
-case 105:
-#line 778 "annotate.y"
-{ 
-                  yyval.ll_node = yyvsp[0].ll_node ;    
-                ;
-    break;}
-case 106:
-#line 782 "annotate.y"
-{ 
-                  primary_flag = EXPR_LR ;
-                  yyval.ll_node = yyvsp[-1].ll_node ;
-                ;
-    break;}
-case 107:
-#line 788 "annotate.y"
-{
-	     yyval.ll_node = NULL;
-	   ;
-    break;}
-case 108:
-#line 792 "annotate.y"
-{
-	     yyval.ll_node = yyvsp[0].ll_node;
-	   ;
-    break;}
-case 109:
-#line 796 "annotate.y"
-{  PTR_SYMB symb;
-
-                   if (exception_flag == ON)
-		    {
-                      /* strange behavior for default function */
-		      symb = NODE_SYMB(yyvsp[-1].ll_node);
-		      SYMB_CODE(symb) = FUNCTION_NAME;
-                      exception_flag = OFF ;
-                      yyval.ll_node =  Make_Function_Call (symb,NULL,0,NULL);
-                     }
-                   else
-                      yyval.ll_node = yyvsp[-1].ll_node ;
-		 ;
-    break;}
-case 110:
-#line 811 "annotate.y"
-{ PTR_LLND lnode_ptr ,llp ;
-                  int      status;
-
-                  llp = yyvsp[-2].ll_node ;
-                  status = OFF ;
-                  if ((llp->variant == FUNC_CALL) && (!llp->entry.Template.ll_ptr1))
-                      { 
-                         lnode_ptr = llp;
-                         status = FUNC_CALL ;
-		       }
-                  if ((!status) &&((llp->variant == RECORD_REF)||
-				   (llp->variant == POINTST_OP)))
-		    {
-                       lnode_ptr = llp->entry.Template.ll_ptr2;
-		       if ((lnode_ptr)&&(lnode_ptr->variant== FUNCTION_REF))
-			 {
-                           lnode_ptr->variant = FUNC_CALL;
-			 }
-                       status = FUNC_CALL ;
-		     }
-                  if ((!status) &&(llp->variant== FUNCTION_REF))
-		    {  llp->variant = FUNC_CALL ;
-                       status = FUNC_CALL ;
-		       lnode_ptr = llp;
-		     }
-		  if (!status) {
-                       status = FUNCTION_OP;
-		       lnode_ptr = llp;
-		     }
-                  switch (status) {
-                  case FUNCTION_OP : yyval.ll_node =newExpr(FUNCTION_OP,yyvsp[-2].ll_node,yyvsp[-1].ll_node);
-                                     yyval.ll_node->type = yyvsp[-2].ll_node->type ;
-                                     break;
-                  case FUNC_CALL :   lnode_ptr->entry.Template.ll_ptr1=yyvsp[-1].ll_node;
-                                     yyval.ll_node = yyvsp[-2].ll_node ;
-                                     break;
-	          default :        Message("system error 10",0);
-		  }
-		;
-    break;}
-case 111:
-#line 852 "annotate.y"
-{ int status ;
-             PTR_LLND ll_ptr,lp1;
-
-             ll_ptr = check_array_id_format(yyvsp[-3].ll_node,&status);
-             switch (status) {
-             case NO : Message("syntax error ",0);
-                       break ;
-	     case ARRAY_OP_NEED:
-                       lp1 = newExpr(EXPR_LIST,NULL,yyvsp[-1].ll_node,LLNULL);/*mod*/
-                       yyval.ll_node = newExpr(ARRAY_OP,NULL,yyvsp[-3].ll_node,lp1);
-                       break;
-             case ID_ONLY :
-                       ll_ptr->variant = ARRAY_REF ;
-                       ll_ptr->entry.Template.ll_ptr1 = newExpr(EXPR_LIST,NULL,yyvsp[-1].ll_node,LLNULL);
-                       yyval.ll_node = yyvsp[-3].ll_node ;
-                       break;
-             case RANGE_APPEAR :
-	               ll_ptr->entry.Template.ll_ptr2 = newExpr(EXPR_LIST,NULL,yyvsp[-1].ll_node,LLNULL);
- 	               yyval.ll_node = yyvsp[-3].ll_node ; 
-                       break;
-             }
-/*             $$->type = adjust_deref_type($1->type,DEREF_OP);*/
-           ;
-    break;}
-case 112:
-#line 876 "annotate.y"
-{ 
-                  yyval.ll_node = newExpr(PLUSPLUS_OP,NULL,LLNULL,yyvsp[-1].ll_node);
-		  yyval.ll_node->type = yyvsp[-1].ll_node->type ;
-                ;
-    break;}
-case 113:
-#line 881 "annotate.y"
-{ 
-                  yyval.ll_node = newExpr(MINUSMINUS_OP,NULL,LLNULL,yyvsp[-1].ll_node);
-		  yyval.ll_node->type = yyvsp[-1].ll_node->type ;
-		;
-    break;}
-case 114:
-#line 894 "annotate.y"
-{ 
-                  yyval.ll_node = yyvsp[0].ll_node ;    
-                ;
-    break;}
-case 115:
-#line 898 "annotate.y"
-{ 
-                  primary_flag =EXPR_LR ;
-                  yyval.ll_node = yyvsp[-1].ll_node ;
-                ;
-    break;}
-case 116:
-#line 904 "annotate.y"
-{
-	     yyval.ll_node = NULL;
-	   ;
-    break;}
-case 117:
-#line 908 "annotate.y"
-{ 
-                  yyval.ll_node = newExpr(PLUSPLUS_OP,NULL,LLNULL,yyvsp[-1].ll_node);
-                ;
-    break;}
-case 118:
-#line 912 "annotate.y"
-{ 
-                  yyval.ll_node = newExpr(MINUSMINUS_OP,NULL,LLNULL,yyvsp[-1].ll_node);
-		;
-    break;}
-case 119:
-#line 920 "annotate.y"
-{ 
-              yyval.ll_node = yyvsp[0].ll_node ;
-            ;
-    break;}
-}
-   /* the action file gets copied in in place of this dollarsign */
-#line 465 "/usr/local/lib/bison.simple"
-
-  yyvsp -= yylen;
-  yyssp -= yylen;
-#ifdef YYLSP_NEEDED
-  yylsp -= yylen;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-  *++yyvsp = yyval;
-
-#ifdef YYLSP_NEEDED
-  yylsp++;
-  if (yylen == 0)
-    {
-      yylsp->first_line = yylloc.first_line;
-      yylsp->first_column = yylloc.first_column;
-      yylsp->last_line = (yylsp-1)->last_line;
-      yylsp->last_column = (yylsp-1)->last_column;
-      yylsp->text = 0;
-    }
-  else
-    {
-      yylsp->last_line = (yylsp+yylen-1)->last_line;
-      yylsp->last_column = (yylsp+yylen-1)->last_column;
-    }
-#endif
-
-  /* Now "shift" the result of the reduction.
-     Determine what state that goes to,
-     based on the state we popped back to
-     and the rule number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTBASE] + *yyssp;
-  if (yystate >= 0 && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTBASE];
-
-  goto yynewstate;
-
-yyerrlab:   /* here on detecting error */
-
-  if (! yyerrstatus)
-    /* If not already recovering from an error, report this error.  */
-    {
-      ++yynerrs;
-
-#ifdef YYERROR_VERBOSE
-      yyn = yypact[yystate];
-
-      if (yyn > YYFLAG && yyn < YYLAST)
-	{
-	  int size = 0;
-	  char *msg;
-	  int x, count;
-
-	  count = 0;
-	  /* Start X at -yyn if nec to avoid negative indexes in yycheck.  */
-	  for (x = (yyn < 0 ? -yyn : 0);
-	       x < (sizeof(yytname) / sizeof(char *)); x++)
-	    if (yycheck[x + yyn] == x)
-	      size += strlen(yytname[x]) + 15, count++;
-	  msg = (char *) malloc(size + 15);
-	  if (msg != 0)
-	    {
-	      strcpy(msg, "parse error");
-
-	      if (count < 5)
-		{
-		  count = 0;
-		  for (x = (yyn < 0 ? -yyn : 0);
-		       x < (sizeof(yytname) / sizeof(char *)); x++)
-		    if (yycheck[x + yyn] == x)
-		      {
-			strcat(msg, count == 0 ? ", expecting `" : " or `");
-			strcat(msg, yytname[x]);
-			strcat(msg, "'");
-			count++;
-		      }
-		}
-	      yyerror(msg);
-	      free(msg);
-	    }
-	  else
-	    yyerror ("parse error; also virtual memory exceeded");
-	}
-      else
-#endif /* YYERROR_VERBOSE */
-	yyerror("parse error");
-    }
-
-  goto yyerrlab1;
-yyerrlab1:   /* here on error raised explicitly by an action */
-
-  if (yyerrstatus == 3)
-    {
-      /* if just tried and failed to reuse lookahead token after an error, discard it.  */
-
-      /* return failure if at end of input */
-      if (yychar == YYEOF)
-	YYABORT;
-
-#if YYDEBUG != 0
-      if (yydebug)
-	fprintf(stderr, "Discarding token %d (%s).\n", yychar, yytname[yychar1]);
-#endif
-
-      yychar = YYEMPTY;
-    }
-
-  /* Else will try to reuse lookahead token
-     after shifting the error token.  */
-
-  yyerrstatus = 3;		/* Each real token shifted decrements this */
-
-  goto yyerrhandle;
-
-yyerrdefault:  /* current state does not do anything special for the error token. */
-
-#if 0
-  /* This is wrong; only states that explicitly want error tokens
-     should shift them.  */
-  yyn = yydefact[yystate];  /* If its default is to accept any token, ok.  Otherwise pop it.*/
-  if (yyn) goto yydefault;
-#endif
-
-yyerrpop:   /* pop the current state because it cannot handle the error token */
-
-  if (yyssp == yyss) YYABORT;
-  yyvsp--;
-  yystate = *--yyssp;
-#ifdef YYLSP_NEEDED
-  yylsp--;
-#endif
-
-#if YYDEBUG != 0
-  if (yydebug)
-    {
-      short *ssp1 = yyss - 1;
-      fprintf (stderr, "Error: state stack now");
-      while (ssp1 != yyssp)
-	fprintf (stderr, " %d", *++ssp1);
-      fprintf (stderr, "\n");
-    }
-#endif
-
-yyerrhandle:
-
-  yyn = yypact[yystate];
-  if (yyn == YYFLAG)
-    goto yyerrdefault;
-
-  yyn += YYTERROR;
-  if (yyn < 0 || yyn > YYLAST || yycheck[yyn] != YYTERROR)
-    goto yyerrdefault;
-
-  yyn = yytable[yyn];
-  if (yyn < 0)
-    {
-      if (yyn == YYFLAG)
-	goto yyerrpop;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-  else if (yyn == 0)
-    goto yyerrpop;
-
-  if (yyn == YYFINAL)
-    YYACCEPT;
-
-#if YYDEBUG != 0
-  if (yydebug)
-    fprintf(stderr, "Shifting error token, ");
-#endif
-
-  *++yyvsp = yylval;
-#ifdef YYLSP_NEEDED
-  *++yylsp = yylloc;
-#endif
-
-  yystate = yyn;
-  goto yynewstate;
-}
-#line 926 "annotate.y"
-
-static int lineno;			/* current line number in file being read */
-
-/* comments structure */
-#define MAX_COMMENT_SIZE  1024 
-char    comment_buf[MAX_COMMENT_SIZE + 2];  /* OFFSET '2' to avoid boundary */
-int     comment_cursor = 0;
-int     global_comment_type;
-
-
-/*************************************************************************
- *                                                                       *
- *                      lexical analyzer                                 * 
- *                                                                       *
- *************************************************************************/
-
-static int maxtoken;		/* Current length of token buffer */
-static char *token_buffer;	/* Pointer to token buffer */
-static int previous_value ;     /* last token to be remembered */
-
-/* frw[i] is index in rw of the first word whose length is i. */
-
-#define MAXRESERVED 9
-
-/*static char frw[10] =
-  { 0, 0, 0, 2, 6, 14, 22, 34, 39, 44 };*/
-static char frw[10] =
-{ 0, 0, 0, 2, 5, 13, 21, 32, 37, 41 };
-
-static char *rw[] =
-  { "if", "do", 
-    "int", "for", "asm",
-    "case", "char", "auto", "goto", "else", "long", "void", "enum",
-    "float", "short", "union", "break", "while", "const",  "IfDef","Label",
-    "double", "static", "extern", "struct", "return", "sizeof", "switch", "signed","coexec","coloop","friend",
-    "typedef", "default","private","cobreak", "ApplyTo",
-    "unsigned", "continue", "register", "volatile","operator"};
-
-static short rtoken[] =
-  { IF, DO, 
-    TYPESPEC, FOR, ASM,
-    CASE, TYPESPEC, SCSPEC, GOTO, ELSE, TYPEMOD, TYPESPEC, ENUM,
-    TYPESPEC, TYPEMOD, UNION, BREAK, WHILE, TYPEMOD,  IFDEFA, ALABELT,
-    TYPESPEC, SCSPEC, SCSPEC, STRUCT, RETURN, SIZEOF, SWITCH, TYPEMOD,COEXEC,COLOOP,FRIEND,
-    SCSPEC, DEFAULT_TOKEN,ACCESSWORD,COBREAK, APPLYTO,
-    TYPEMOD, CONTINUE, SCSPEC, TYPEMOD,OPERATOR};
-
-/* This table corresponds to rw and rtoken.
-   Its element is an index in ridpointers  */
-
-#define NORID RID_UNUSED
-
-static enum rid rid[] =
-  { NORID, NORID, 
-    RID_INT, NORID, NORID,
-    NORID, RID_CHAR, RID_AUTO, NORID, NORID, RID_LONG, RID_VOID, NORID,
-    RID_FLOAT, RID_SHORT, NORID, NORID, NORID, RID_CONST, NORID, NORID,
-    RID_DOUBLE, RID_STATIC, RID_EXTERN, NORID, NORID, NORID, NORID, RID_SIGNED,NORID,NORID,NORID,
-    RID_TYPEDEF, NORID,RID_PRIVATE,NORID, NORID,
-    RID_UNSIGNED, NORID, RID_REGISTER, RID_VOLATILE,NORID};
-
-/* The elements of `ridpointers' are identifier nodes
-   for the reserved type names and storage classes.  
-tree ridpointers[(int) RID_MAX];
-static tree line_identifier;    The identifier node named "line" */
-
-
-void
-init_lex ()
-{
-  //extern char *malloc();
-
-  /* Start it at 0, because check_newline is called at the very beginning
-     and will increment it to 1.  */
-  lineno = 0;
-  maxtoken = 40;
-  lastdecl_id = 0;
-  token_buffer = (char *) xmalloc((unsigned)(maxtoken+1));
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,token_buffer, 0);
-#endif
-}
-
-static void
-reinit_parse_for_function ()
-{
-}
-
-/* Put char into comment buffer. When the buffer is full, we make a comment */
-/* structure and reset the comment_cursor. */
-static int
-put_char_buffer(c,sw)
-char c ;
-int sw;
-{
-/* no comment here */
-return 0;
-}
-
-static int
-skip_white_space(type)
-  int type ;
-{
-  register int c;
-
-
-  c = MYGETC();
-
-  for (;;)
-    {
-      switch (c)
-	{
-	case '/':
-	   return '/';	
-
-	case '\n':
-	case ' ':
-	case '\t':
-	case '\f':
-	case '\r':
-	case '\b':
-	  c = MYGETC();
-	  break;
-
-	case '\\':
-	  c = MYGETC();
-	  if (c == '\n')
-	    lineno++;
-	  else
-	    yyerror("stray '\\' in program");
-	  c = MYGETC();
-	  break;
-
-	default:
-	  return (c);
-	}
-    }
-}
-
-/* Take care of the comments in the tail of the source code */
-static int
-skip_white_space_2()
-{
-  register int c;
-
-  c = MYGETC();
-  for (;;)
-    {
-      switch (c)
-	{
-	case '/':
-	  return '/';
-	case '\n':
-           return(c);
-
-	case ' ':
-	case '\t':
-	case '\f':
-	case '\r':
-	case '\b':
-	  c = MYGETC();
-	  break;
-
-	case '\\':
-	  c = MYGETC();
-	  if (c == '\n')
-	    lineno++;
-	  else
-	    yyerror("stray '\\' in program");
-	  c = MYGETC();
-	  break;
-
-	default:
-	  return (c);
-	}
-    }
-}
-
-
-
-/* make the token buffer longer, preserving the data in it.
-p should point to just beyond the last valid character in the old buffer
-and the value points to the corresponding place in the new one.  */
-
-static char *
-extend_token_buffer(p)
-char *p;
-{
-  register char *newbuf;
-  register char *value;
-  int newlength = maxtoken * 2 + 10;
-  register char *p2, *p1;
-  //extern char *malloc();
-
-  newbuf = (char*)malloc(newlength+1);
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,newbuf, 0);
-#endif
-  p2 = newbuf;
-  p1 = newbuf + newlength + 1;
-  while (p1 != p2) *p2++ = 0;
-
-  value = newbuf;
-  p2 = token_buffer;
-  while (p2 != p)
-   *value++ = *p2++;
-
-  token_buffer = newbuf;
-
-  maxtoken = newlength;
-
-  return (value);
-}
-
-
-
-
-#define isalnum(char) ((char >= 'a' && char <= 'z') || (char >= 'A' && char <= 'Z') || (char >= '0' && char <= '9'))
-#define isdigit(char) (char >= '0' && char <= '9')
-#define ENDFILE -1  /* token that represents end-of-file */
-#define isanop(d) ((d == '+') || (d == '-') || (d == '&') || (d == '|') || (d == '<') || (d == '>') || (d == '*') || (d == '/') || (d == '%') || (d == '^') || (d == '!') || (d == '=') )
-
-
-int
-readescape ()
-{
-  register int c = MYGETC ();
-  register int count, code;
-
-  switch (c)
-    {
-    case 'x':
-      code = 0;
-      count = 0;
-      while (1)
-	{
-	  c = MYGETC ();
-	  if (!(c >= 'a' && c <= 'f')
-	      && !(c >= 'A' && c <= 'F')
-	      && !(c >= '0' && c <= '9'))
-	    {
-	      unMYGETC (c);
-	      break;
-	    }
-	  if (c >= 'a' && c <= 'z')
-	    c -= 'a' - 'A';
-	  code *= 16;
-	  if (c >= 'a' && c <= 'f')
-	    code += c - 'a' + 10;
-	  if (c >= 'A' && c <= 'F')
-	    code += c - 'A' + 10;
-	  if (c >= '0' && c <= '9')
-	    code += c - '0';
-	  count++;
-	  if (count == 3)
-	    break;
-	}
-      if (count == 0)
-	yyerror ("\\x used with no following hex digits");
-      return code;
-
-    case '0':  case '1':  case '2':  case '3':  case '4':
-    case '5':  case '6':  case '7':
-      code = 0;
-      count = 0;
-      while ((c <= '7') && (c >= '0') && (count++ < 3))
-	{
-	  code = (code * 8) + (c - '0');
-	  c = MYGETC ();
-	}
-      unMYGETC (c);
-      return code;
-
-    case '\\': case '\'': case '"':
-      return c;
-
-    case '\n':
-      lineno++;
-      return -1;
-
-    case 'n':
-      return c ;  /*     return TARGET_NEWLINE; */
-
-    case 't':
-      return c;  /*      return TARGET_TAB; */
-
-    case 'r':
-      return c;/*      return TARGET_CR; */
-
-    case 'f':
-      return c;/*       return TARGET_FF;*/
-
-    case 'b':
-      return c;/*       return TARGET_BS;*/
-
-    case 'a':
-      return c; /*      return TARGET_BELL;*/
-
-    case 'v':
-      return c; /*      return TARGET_VT;*/
-    }
-  return c;
-}
-
- 
-int
-yylex_annotate()
-{
-  register int c;
-  register char *p;
-  register int value;
-  int low /*,high */ ;
-  char *str1 ;
-/*  double  ddval ; */
-/*  int type; */
-  int c3;
-
-
-
-  if (recursive_yylex == OFF) new_cur_comment = (PTR_CMNT) NULL ;
-
-  /* line_pos_1 = lineno +1 ; */
-  c = skip_white_space(FULL);
-  /*  yylloc.first_line = lineno;*/
-
-  switch (c)
-    {
-    case EOF:
-      value = ENDFILE; break;
-
-    case 'A':  case 'B':  case 'C':  case 'D':  case 'E':
-    case 'F':  case 'G':  case 'H':  case 'I':  case 'J':
-    case 'K':  case 'L':  case 'M':  case 'N':  case 'O':
-    case 'P':  case 'Q':  case 'R':  case 'S':  case 'T':
-    case 'U':  case 'V':  case 'W':  case 'X':  case 'Y':
-    case 'Z':
-    case 'a':  case 'b':  case 'c':  case 'd':  case 'e':
-    case 'f':  case 'g':  case 'h':  case 'i':  case 'j':
-    case 'k':  case 'l':  case 'm':  case 'n':  case 'o':
-    case 'p':  case 'q':  case 'r':  case 's':  case 't':
-    case 'u':  case 'v':  case 'w':  case 'x':  case 'y':
-    case 'z':
-    case '_':
-
-      p = token_buffer;
-      while (isalnum(c) || (c == '_') || (c == '~'))
-	{
-	  if (p >= token_buffer + maxtoken)
-	    p = extend_token_buffer(p);
-	  *p++ = c;
-	  c = MYGETC();
-	}
-
-      *p = 0;
-      unMYGETC(c);
-
-      value = IDENTIFIER;
-
-
-      if (p - token_buffer <= MAXRESERVED)
-	{
-	  register int lim = frw [p - token_buffer + 1];
-	  register int i;
-
-	  for (i = frw[p - token_buffer]; i < lim; i++)
-	    if (rw[i][0] == token_buffer[0] && !strcmp(rw[i], token_buffer))
-	      {
-		if (rid[i])
-		  yylval.token = (int) rid[i] ;
-                  value = (int) rtoken[i];
-		break;
-	      }
-	}
-
-      { int temp;
-	if ((temp = Recog_My_Token(token_buffer)) != -1)
-	  {
-	    yylval.token = temp;
-	    value = temp;
-	  }
-      }
-
-      if (value == IDENTIFIER)
-	{ int t_status ;
-	  PTR_LLND temp;
-	/* temp move it out */
-
-          yylval.hash_entry = look_up_type(token_buffer,&t_status);
-          /* if ((t_status)&&(lastdecl_id ==0))   value = TYPENAME;    
-	     Wait to fix that */
-	  /* temporary fix */
-           temp = look_up_section(token_buffer);
-          if (temp)
-	    {
-	      yylval.ll_node = temp;
-	      value = SECTIONT;
-	    }
-
-	  if (look_up_specialfunction(token_buffer))
-	    {
-	      value =  SPECIALAF;
-	    }
-	      
-	  
-        }
-
-      break;
-
-    case '0':  case '1':  case '2':  case '3':  case '4':
-    case '5':  case '6':  case '7':  case '8':  case '9':
-    case '.':
-      {
-	int base = 10;
-	int count = 0;
-	int largest_digit = 0;
-	/* for multi-precision arithmetic,
-	   we store only 8 live bits in each short,
-	   giving us 64 bits of reliable precision */
-	short shorts[8];
-	int floatflag = 0;  /* Set 1 if we learn this is a floating constant */
-
-	for (count = 0; count < 8; count++)
-	  shorts[count] = 0;
-
-	p = token_buffer;
-	*p++ = c;
-
-	if (c == '0')
-	  {
-	    *p++ = (c = MYGETC());
-	    if ((c == 'x') || (c == 'X'))
-	      {
-		base = 16;
-		*p++ = (c = MYGETC());
-	      }
-	    else
-	      {
-		base = 8;
-	      }
-	  }
-
-	while (c == '.'
-	       || (isalnum (c) && (c != 'l') && (c != 'L')
-		   && (c != 'u') && (c != 'U')
-		   && (!floatflag || ((c != 'f') && (c != 'F')))))
-	  {
-	    if (c == '.')
-	      {
-		if (base == 16)
-		  yyerror ("floating constant may not be in radix 16");
-		floatflag = 1;
-		base = 10;
-		*p++ = c = MYGETC ();
-		/* Accept '.' as the start of a floating-point number
-		   only when it is followed by a digit.
-		   Otherwise, unread the following non-digit
-		   and use the '.' as a structural token.  */
-		if (p == token_buffer + 2 && !isdigit (c))
-		  {
-		    if (c == '.')
-		      {
-			c = MYGETC ();
-			if (c == '.')
-			  { 
-                            value = ELLIPSIS ;
-			    goto done ;
-                          }
-			yyerror ("syntax error");
-		      }
-		    unMYGETC (c);
-		    value = '.';
-                    goto done;
-		  }
-	      }
-	    else
-	      {
-		if (isdigit(c))
-		  {
-		    c = c - '0';
-		  }
-		else if (base <= 10)
-		  {
-		    if ((c&~040) == 'E')
-		      {
-			if (base == 8)
-			  yyerror ("floating constant may not be in radix 8");
-			base = 10;
-			floatflag = 1;
-			break;   /* start of exponent */
-		      }
-		    yyerror ("nondigits in number and not hexadecimal");
-		    c = 0;
-		  }
-		else if (c >= 'a')
-		  {
-		    c = c - 'a' + 10;
-		  }
-		else
-		  {
-		    c = c - 'A' + 10;
-		  }
-		if (c >= largest_digit)
-		  largest_digit = c;
-	    
-		for (count = 0; count < 8; count++)
-		  {
-		    (shorts[count] *= base);
-		    if (count)
-		      {
-			shorts[count] += (shorts[count-1] >> 8);
-			shorts[count-1] &= (1<<8)-1;
-		      }
-		    else shorts[0] += c;
-		  }
-    
-		*p++ = (c = MYGETC());
-	      }
-	  }
-
-	if (largest_digit >= base)
-	  yyerror ("numeric constant contains digits beyond the radix");
-
-	/* Remove terminating char from the token buffer and delimit the string */
-	*--p = 0;
-
-	if (floatflag)
-	  {
-	   /*  enum rid type = DOUBLE_TYPE_CONST ; */
-
-	    /* Read explicit exponent if any, and put it in tokenbuf.  */
-
-	    if ((c == 'e') || (c == 'E'))
-	      {
-		*p++ = c;
-		c = MYGETC();
-		if ((c == '+') || (c == '-'))
-		  {
-		    *p++ = c;
-		    c = MYGETC();
-		  }
-	        while (isdigit(c))
-		  {
-		    *p++ = c;
-		    c = MYGETC();
-		  }
-	      }
-
-	    *p = 0;
-
-	    while (1)
-	      {
-/*		if (c == 'f' || c == 'F')
-		  type = FLOAT_TYPE_CONST ;
-		else if (c == 'l' || c == 'L')
-		  type = LONG_DOUBLE_TYPE_CONST ;
-		else */
-
-                if((c != 'f') && (c != 'F') && (c != 'l') && (c !='L'))
-		  {
-		    if (isalnum (c))
-		      {
-			yyerror ("garbage at end of number");
-			while (isalnum (c))
-			  c = MYGETC ();
-		      }
-		    break;
-		  }
-		c = MYGETC ();
-	      }
-
-	    unMYGETC(c);
-
-/*	    ddval = build_real_from_string (token_buffer, 0);  */
-            str1= (char *) copys(token_buffer);
-            yylval.ll_node = newExpr(FLOAT_VAL,NULL,LLNULL,LLNULL,str1);
-
-	  }
-	else
-	  {
-	    /* enum rid  type; */
-
-	    /* int spec_unsigned = 0; */
-	    /* int spec_long = 0;  */
-
-	    while (1)
-	      {
-/*		if (c == 'u' || c == 'U')
-		  {
-		    spec_unsigned = 1;
-		  }
-		else if (c == 'l' || c == 'L')
-		  {
-		    spec_long = 1;
-		  }
-		else */
-
-               if((c != 'u') && (c != 'U') && (c != 'l') && (c != 'L'))
-		  {
-		    if (isalnum (c))
-		      {
-			yyerror ("garbage at end of number");
-			while (isalnum (c))
-			  c = MYGETC ();
-		      }
-		    break;
-		  }
-		c = MYGETC ();
-	      }
-
-	    unMYGETC (c);
-
-	    /* This is simplified by the fact that our constant
-	       is always positive.  */
-
-	    low= (shorts[3]<<24) + (shorts[2]<<16) + (shorts[1]<<8) + shorts[0] ;
-	  /*  high = (shorts[7]<<24) + (shorts[6]<<16) + (shorts[5]<<8) + shorts[4] ; */
-	    
-
-	    /* type = LONG_UNSIGNED_TYPE_CONST ; */
-	    yylval.ll_node = makeInt(low);	
-	 }
-
-	value = CONSTANT; break;
-      }
-
-    case '\'':
-      c = MYGETC();
-      {
-
-      tryagain:
-
-	if (c == '\\')
-	  {
-	    c = readescape ();
-	    if (c < 0)
-	      goto tryagain;
-	  }
-	else if (c == '\n')
-	  {
-	      Message ("ANSI C forbids newline in character constant",0);
-	    lineno++;
-	  }
-
-	c3= c;
-
-	c = MYGETC ();
-	if (c != '\'')
-	  yyerror("malformatted character constant");
-        yylval.ll_node = newExpr(CHAR_VAL,LLNULL,LLNULL,low);
-	yylval.ll_node->entry.cval = c3;  
-	value = CONSTANT; break;
-      }
-
-    case '"':
-      {
-	c = MYGETC();
-	p = token_buffer;
-
-	while (c != '"')
-	  {
-	    if (c == '\\')
-	      {
-                /* New Added Three lines */
-                if (p == token_buffer + maxtoken)
-	          p = extend_token_buffer(p);
-  	        *p++ = c;
-
-		c = readescape ();
-		if (c < 0)
-		  goto skipnewline;
-	      }
-	    else if (c == '\n')
-	      {
-		  Message ("ANSI C forbids newline in string constant",0);
-		lineno++;
-	      }
-
-	    if (p == token_buffer + maxtoken)
-	      p = extend_token_buffer(p);
-	    *p++ = c;
-
-	  skipnewline:
-	    c = MYGETC ();
-	  }
-
-	*p++ = 0;
-
-	str1= (char *) copys(token_buffer);
-        yylval.ll_node = (PTR_LLND) newNode(STRING_VAL);
-	NODE_STRING_POINTER(yylval.ll_node) = str1;
-	value = STRING; break;
-      }
-      
-    case '+':
-    case '-':
-    case '&':
-    case '|':
-    case '<':
-    case '>':
-    case '*':
-    case '/':
-    case '%':
-    case '^':
-    case '!':
-    case '=':
-      {
-	register int c1;
-        if ( previous_value == OPERATOR )
-           {
-             p = token_buffer;
-             while (isanop(c) )
-              {
-                  if (p >= token_buffer + maxtoken)
-	          p = extend_token_buffer(p);
-	          *p++ = c;
-	          c = MYGETC();
-               }
-             *p = 0;
-             unMYGETC(c);
-             value =  LOADEDOPR ;
-             yylval.hash_entry = look_up_annotate(token_buffer);
-             break;
-            }
-      combine:
-
-	switch (c)
-	  {
-	  case '+':
-	    yylval.token = (int) PLUS_EXPR; break;
-	  case '-':
-	    yylval.token = (int) MINUS_EXPR; break;
-	  case '&':
-	    yylval.token = (int) BIT_AND_EXPR; break;
-	  case '|':
-	    yylval.token = (int) BIT_IOR_EXPR; break;
-	  case '*':
-	    yylval.token = (int) MULT_EXPR; break;
-	  case '/':
-	    yylval.token = (int) TRUNC_DIV_EXPR; break;
-	  case '%':
-	    yylval.token = (int) TRUNC_MOD_EXPR; break;
-	  case '^':
-	    yylval.token = (int) BIT_XOR_EXPR; break;
-	  case LSHIFT:
-	    yylval.token = (int) LSHIFT_EXPR; break;
-	  case RSHIFT:
-	    yylval.token = (int) RSHIFT_EXPR; break;
-	  case '<':
-	    yylval.token = (int) LT_EXPR; break;
-	  case '>':
-	    yylval.token = (int) GT_EXPR; break;
-	  }	
-
-	c1 = MYGETC();
-
-	if (c1 == '=')
-	  {
-	    switch (c)
-	      {
-	      case '<':
-		value = ARITHCOMPARE; yylval.token = (int) LE_EXPR; goto done;
-	      case '>':
-		value = ARITHCOMPARE; yylval.token = (int) GE_EXPR; goto done;
-	      case '!':
-		value = EQCOMPARE; yylval.token = (int) NE_EXPR; goto done;
-	      case '=':
-		value = EQCOMPARE; yylval.token = (int) EQ_EXPR; goto done;
-	      }	
-	    value = ASSIGN; goto done;
-	  }
-	else if (c == c1)
-	  switch (c)
-	    {
-	    case '+':
-	      value = PLUSPLUS; goto done;
-	    case '-':
-	      value = MINUSMINUS; goto done;
-	    case '&':
-	      value = ANDAND; goto done;
-	    case '|':
-	      value = OROR; goto done;
-/* testing  */
-/*            case ':':
-              value = DOUBLEMARK; goto done;  */
-
-	    case '<':
-	      c = LSHIFT;
-	      goto combine;
-	    case '>':
-	      c = RSHIFT;
-	      goto combine;
-	    }
-	else if ((c == '-') && (c1 == '>'))
-	  { value = POINTSAT; goto done; }
-	unMYGETC (c1);
-
-
-        value = c;
-	goto done;
-      }
-
-    default:
-      value = c;
-    }
-
-done:
-
-  if (recursive_yylex == OFF) {
-    previous_value = value ;
-    line_pos_1 = lineno ;
-    c = skip_white_space_2();
-    if (c != '\n');
-       unMYGETC(c);
-    if (value != '}') 
-      { c = skip_white_space(NEXT_FULL);
-	if (c == '\n') lineno++ ;
-	else           unMYGETC(c);
-      }
-    set_up_momentum(value,yylval.token);
-    automata_driver(value);
-    cur_counter++;
-    old_line = yylineno  ;
-    yylineno = line_pos_1;
-  }
-
-  if (TRACEON) printf("yylex returned %d\n", value);
-  return (value);
-}
- 
-
-static int yyerror(s)
-        char   *s;
-{
-  /* Message(s,0); empty at the moment, generate false error report?
-     to be modified later */
-  return 1;  /* PHB needed a return val, 1 seems ok */
-}
-
-
-/*  primary :- primary [ expr_vector ]
- *  <1> check the LHS format
- *  <2> return : NO if incorrect format at LHS
- *               ID_ONLY if LHS only have id format (including multiple id)
- *               RANGE_APPEAR if LHS format owns both id and range_list
- */
-
-static
-PTR_LLND check_array_id_format(ll_ptr,state)
-int *state;
-PTR_LLND ll_ptr ;
-
-{   PTR_LLND temp,temp1;
-
-      temp = ll_ptr;
-      switch (NODE_CODE(ll_ptr)) {
-      case VAR_REF :
-                     *state = ID_ONLY ;
-                     return(ll_ptr);
-      case ARRAY_REF :
-                     temp1 = Follow_Llnd(NODE_OPERAND0(ll_ptr),2);
-                     *state = RANGE_APPEAR;
-                     return(temp1);
-      case  ARRAY_OP:temp1 = Follow_Llnd(NODE_OPERAND1(ll_ptr),2);
-                     *state =RANGE_APPEAR ;
-                     return(temp1);
-        default :    *state = ARRAY_OP_NEED ;
-                     return(temp);
-      }
-  }
-
-static
-int
-map_assgn_op(value)
-int value;
-{
-  switch (value) {
-  case ((int) PLUS_EXPR) :
-      return(PLUS_ASSGN_OP);
-  case ((int) MINUS_EXPR):
-      return(MINUS_ASSGN_OP);
-  case ((int) BIT_AND_EXPR):
-      return(AND_ASSGN_OP);
-  case ((int) BIT_IOR_EXPR):
-      return(IOR_ASSGN_OP);
-  case ((int) MULT_EXPR):
-      return(MULT_ASSGN_OP);
-  case ((int) TRUNC_DIV_EXPR):
-      return(DIV_ASSGN_OP);
-  case ((int) TRUNC_MOD_EXPR):
-      return(MOD_ASSGN_OP);
-  case ((int) BIT_XOR_EXPR):
-      return(XOR_ASSGN_OP);
-  case ((int) LSHIFT_EXPR):
-      return(LSHIFT_ASSGN_OP);
-  case ((int) RSHIFT_EXPR):
-      return(RSHIFT_ASSGN_OP);
-  }
-return 0;
-}
-
-PTR_HASH 
-look_up_type(st, ip)
-     char *st;
-     int *ip;
-{
-  char *pt;
-  
-  pt =  (char *) xmalloc(strlen(st) +1);
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,pt, 0);
-#endif
-  strcpy(pt,st);
- /* dummy, to be cleaned */
-  return (PTR_HASH) pt;
-}
-
-
-PTR_HASH 
-look_up_annotate(st)
-     char *st;
-{
-  char *pt;
-  
-  pt =  (char *)  xmalloc(strlen(st) +1);
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,pt, 0);
-#endif
-  strcpy(pt,st);
- /* dummy, to be cleaned */
-  return (PTR_HASH)  pt;
-}
-
-static char MYGETC()
-{
-  
-  if (LENSTRINGTOPARSE <= PTTOSTRINGTOPARSE)
-	return EOF;
-
-  if (STRINGTOPARSE[ PTTOSTRINGTOPARSE] == '\0')
-    {
-      PTTOSTRINGTOPARSE++;
-      return EOF;
-    }
-  
-  PTTOSTRINGTOPARSE++;
-  return STRINGTOPARSE[ PTTOSTRINGTOPARSE-1];
-}
-
-static char unMYGETC(char c)
-{
-  if (LENSTRINGTOPARSE <= PTTOSTRINGTOPARSE)
-    return EOF;
-
-  if (PTTOSTRINGTOPARSE >0)
-    PTTOSTRINGTOPARSE --;
-  STRINGTOPARSE[ PTTOSTRINGTOPARSE] = c;
-  return c;
-}
-
-
-/* CurrentScope should be the last in the list */
-static char *sectionkeyword[] =
-  { "NextStmt",
-    "NextAnnotation",      
-    "EveryWhere",
-    "Follow",
-/* keep it last*/  "CurrentScope"};
-
-
-static PTR_LLND
-look_up_section(str)
- char *str;
-{ int i;
-  PTR_LLND pt = NULL;
-
-  for (i = 0; i < RID_MAX; i++)
-    {
-      if (strcmp(sectionkeyword[i], str) == 0)
-	{
-	  pt  = (PTR_LLND) newNode(STRING_VAL);
-	  NODE_STRING_POINTER(pt) = (char *) xmalloc(strlen(str) +1);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,NODE_STRING_POINTER(pt), 0);
-#endif
-	  strcpy(NODE_STRING_POINTER(pt),str);
-	  return pt;
-	}
-      if (strcmp(sectionkeyword[i],"CurrentScope") == 0)
-	return NULL;
-    }
-  
-  return NULL;
-}
-
-
-/* Dummy should be the last in the list */
-static char *specialfunction[] =
-  { "ListOfAn",
-    "Align",
-    "Induction",
-    "Used",
-    "Modified",
-    "Alias",
-    "Permutation",
-    "Assert",
-/* keep it last*/  "Dummy"};
-
-static int
-look_up_specialfunction(str)
- char *str;
-{ int i;
-
-  for (i = 0; i < RID_MAX; i++)
-    {
-      if (strcmp(specialfunction[i], str) == 0)
-	{
-	  return TRUE;
-	}
-      if (strcmp(specialfunction[i],"Dummy") == 0)
-	return 0;
-    }
-  
-  return 0;
-}
-
-
-static int 
-Recog_My_Token(str)
-char *str;
-{
-
-  if (strcmp("FromAnn",str) == 0)
-    return FROMT;
-
-  if (strcmp("ToAnn",str) == 0)
-    return TOT;
-
-   if (strcmp("ToLabel",str) == 0)
-    return TOTLABEL;
-
-  if (strcmp("ToFunction",str) == 0)
-    return TOFUNCTION;
-
-  if (strcmp("Define",str) == 0)
-    return DefineANN;
-
-  return -1;
-}
-
-
-PTR_SYMB
-Look_For_Symbol_Ann(code,name,type)
-     int code;
-     char *name;
-     PTR_TYPE type;
-{
-  PTR_SYMB symb;
-  char temp1[256];
-
-  strcpy(temp1, AnnExTensionNumber);
-  strncat(temp1,name,255);
-
-  if ((symb = getSymbolWithName(temp1, ANNOTATIONSCOPE)))
-    return symb;
-
-  if ((symb = getSymbolWithName(name, ANNOTATIONSCOPE)))
-    return symb;
-
-  return  newSymbol (code,name,type);
-}
- 
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
deleted file mode 100644
index f257958..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.tab.h
+++ /dev/null
@@ -1,74 +0,0 @@
-typedef union { 
-         int       token ;
-         char      charv ;
-         char      *charp;
-         PTR_BFND   bfnode ;
-         PTR_LLND   ll_node ;
-         PTR_SYMB   symbol  ;
-         PTR_TYPE   data_type ;
-         PTR_HASH   hash_entry ;
-         PTR_LABEL  label ;        
-         PTR_BLOB   blob_ptr ;
-       } YYSTYPE;
-#define	IFDEFA	258
-#define	APPLYTO	259
-#define	ALABELT	260
-#define	SECTIONT	261
-#define	SPECIALAF	262
-#define	FROMT	263
-#define	TOT	264
-#define	TOTLABEL	265
-#define	TOFUNCTION	266
-#define	DefineANN	267
-#define	IDENTIFIER	268
-#define	TYPENAME	269
-#define	SCSPEC	270
-#define	TYPESPEC	271
-#define	TYPEMOD	272
-#define	CONSTANT	273
-#define	STRING	274
-#define	ELLIPSIS	275
-#define	SIZEOF	276
-#define	ENUM	277
-#define	STRUCT	278
-#define	UNION	279
-#define	IF	280
-#define	ELSE	281
-#define	WHILE	282
-#define	DO	283
-#define	FOR	284
-#define	SWITCH	285
-#define	CASE	286
-#define	DEFAULT_TOKEN	287
-#define	BREAK	288
-#define	CONTINUE	289
-#define	RETURN	290
-#define	GOTO	291
-#define	ASM	292
-#define	CLASS	293
-#define	PUBLIC	294
-#define	FRIEND	295
-#define	ACCESSWORD	296
-#define	OVERLOAD	297
-#define	OPERATOR	298
-#define	COBREAK	299
-#define	COLOOP	300
-#define	COEXEC	301
-#define	LOADEDOPR	302
-#define	MULTIPLEID	303
-#define	MULTIPLETYPENAME	304
-#define	ASSIGN	305
-#define	OROR	306
-#define	ANDAND	307
-#define	EQCOMPARE	308
-#define	ARITHCOMPARE	309
-#define	LSHIFT	310
-#define	RSHIFT	311
-#define	UNARY	312
-#define	PLUSPLUS	313
-#define	MINUSMINUS	314
-#define	HYPERUNARY	315
-#define	DOUBLEMARK	316
-#define	POINTSAT	317
-
-extern YYSTYPE yylval;
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.y b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.y
deleted file mode 100644
index 12226f1..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/annotate.y
+++ /dev/null
@@ -1,1988 +0,0 @@
-
-/* This is a small prototype for the annotation system, it deliver a 
-   set of llnode/bifnode for the annotation system */
-
-%{
-#include "macro.h"
-
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#include <stdlib> 
-#ifdef _NEEDALLOCAH_
-#  include <alloca.h>
-#endif
-
-extern char* xmalloc(int size);
-extern void Message(char *s, int l);
-extern void set_up_momentum(int value,int token);
-extern void automata_driver(int value); 
-extern char* copys(char *);
-
-#define ON 1
-#define OFF 0
-#define OTHER 2
-#define ID_ONLY  1
-#define RANGE_APPEAR 2
-#define EXCEPTION_ON 4
-#define EXPR_LR      8
-#define VECTOR_CONST_APPEAR 16
-#define ARRAY_OP_NEED 32
-#define TRACEON 0
-
-extern POINTER newNode();
-
-%}
-
-%start annotation
-%union { 
-         int       token ;
-         char      charv ;
-         char      *charp;
-         PTR_BFND   bfnode ;
-         PTR_LLND   ll_node ;
-         PTR_SYMB   symbol  ;
-         PTR_TYPE   data_type ;
-         PTR_HASH   hash_entry ;
-         PTR_LABEL  label ;        
-         PTR_BLOB   blob_ptr ;
-       }
-
-/* Begin  Token for annotation system */
-/* The IfDef token */
-%token IFDEFA
-/* the Apply to token */
-%token APPLYTO
-%token ALABELT
-%token SECTIONT
-%token SPECIALAF
-%token FROMT
-%token TOT
-%token TOTLABEL
-%token TOFUNCTION
-%token DefineANN
-/* End Token for annotation system */
-
-/* all identifiers   that are not reserved words
-   and are not declared typedefs in the current block */
-%token IDENTIFIER
-/* all identifiers   that are declared typedefs in the current block.
-   In some contexts, they are treated just like IDENTIFIER,
-   but they can also serve as typespecs in declarations.  */
-%token TYPENAME
-
-/* reserved words that specify storage class.
-   yylval contains an IDENTIFIER_NODE which indicates which one.  */
-%token SCSPEC
-
-/* reserved words that specify type.
-   yylval contains an IDENTIFIER_NODE which indicates which one.  */
-%token TYPESPEC
-
-/* reserved words that modify type: "const" or "volatile".
-   yylval contains an IDENTIFIER_NODE which indicates which one.  */
-%token TYPEMOD
-
-/*character or numeric constants.
-   yylval is the node for the constant.  */
-%token CONSTANT
-
-/* String constants in raw form.
-   yylval is a STRING_CST node.  */
-%token STRING
-
-/* "...", used for functions with variable arglists.  */
-%token ELLIPSIS
-
-/* the reserved words */
-%token SIZEOF ENUM STRUCT UNION IF ELSE WHILE DO FOR SWITCH CASE DEFAULT_TOKEN
-%token BREAK CONTINUE RETURN GOTO ASM
-%token CLASS PUBLIC FRIEND  ACCESSWORD OVERLOAD
-%token OPERATOR COBREAK COLOOP COEXEC LOADEDOPR 
-
-%token MULTIPLEID MULTIPLETYPENAME
-
-/* Define the operator tokens and their precedences.
-   The value is an integer because, if used, it is the tree code
-   to use in the expression made from the operator.  */
-
-%left  <charv> ','
-%right <charv> '='
-%right <token> ASSIGN 
-%right <charv> '?' ':'
-%left <charv> OROR
-%left <charv> ANDAND
-%left <charv> '|'
-%left <charv> '^'
-%left <charv> '&'
-%left <token> EQCOMPARE
-%left <token> ARITHCOMPARE  '>' '<' 
-%left <charv> LSHIFT RSHIFT
-%left <charv> '+' '-'
-%left <token> '*' '/' '%'
-%right <token> UNARY PLUSPLUS MINUSMINUS
-%left HYPERUNARY
-%left <token> DOUBLEMARK 
-%left <token> POINTSAT '.'
-
-
-%type <token> unop
-%type <hash_entry> IDENTIFIER TYPENAME  LOADEDOPR
-%type <ll_node> CONSTANT STRING  primary 
-%type <ll_node> expr_no_commas const_expr_no_commas  
-%type <ll_node> expr nonnull_exprlist exprlist const_primary element
-%type <ll_node> string
-%type <token>   SCSPEC TYPESPEC TYPEMOD 
-%type <ll_node> vector_constant triplet  compound_constant vector_list
-%type <ll_node> single_v_expr array_expr_a 
-%type <ll_node> array_expr_b expr_vector 
-%type <ll_node> expr_no_commas_1  
-%type <symbol>  identifier    identifiers 
-%type <token> ACCESSWORD 
-%type <ll_node> IfDefR
-%type <ll_node> Alabel
-%type <ll_node> ApplyTo
-%type <ll_node> LocalDeclare
-%type <ll_node> Expression_List
-%type <ll_node> declare_local_list
-%type <ll_node> onedeclare
-%type <ll_node> domain
-%type <ll_node> section
-%type <ll_node> SECTIONT
-%type <hash_entry> SPECIALAF
-
-%{ char      *input_filename;	
-   extern    int lastdecl_id;
-   PTR_LLND ANNOTATE_NODE = NULL;
-   PTR_BFND ANNOTATIONSCOPE = NULL;
-   extern PTR_SYMB newSymbol();
-   extern PTR_LLND newExpr();
-   extern PTR_LLND makeInt();
-   static int cur_counter =  0; 
-   static int primary_flag=  0;
-   PTR_TYPE global_int_annotation = NULL;
-   extern PTR_LLND Follow_Llnd();
-   static int recursive_yylex = OFF;
-   static int exception_flag = 0;
-   static PTR_HASH cur_id_entry;
-   int line_pos_1 = 0;
-   char *line_pos_fname = 0;
-   static int old_line = 0;
-   static int yylineno=0;
-   static int yyerror();
-   PTR_CMNT cur_comment = NULL;
-   PTR_CMNT new_cur_comment = NULL ;
-   PTR_HASH look_up();
-   PTR_HASH look_up_type();
-   char *STRINGTOPARSE = 0;
-   int PTTOSTRINGTOPARSE = 0;
-   int LENSTRINGTOPARSE = 0;
-   extern PTR_LLND Make_Function_Call();
-   static PTR_LLND check_array_id_format();
-   static PTR_LLND look_up_section();
-   extern PTR_SYMB getSymbolWithName(); /*getSymbolWithName(name, scope)*/
-   PTR_SYMB Look_For_Symbol_Ann();
-   char AnnExTensionNumber[255]; /* to symbole right for the annotation  */
-   static int Recog_My_Token();
-   static int look_up_specialfunction();
-   static char unMYGETC(char c);
-   static char MYGETC();
-   static int map_assgn_op();
-%}  
-
-%%
-
-annotation: /* empty */
-	| '[' IfDefR   Alabel   ApplyTo   LocalDeclare ';' Expression_List ']'
-        { 
-	  ANNOTATE_NODE = newExpr(EXPR_LIST,NULL,$2,
-	                   newExpr(EXPR_LIST,NULL,$3,
-			     newExpr(EXPR_LIST,NULL,$4,
-				newExpr(EXPR_LIST,NULL,$5,
-				   newExpr(EXPR_LIST,NULL,$7,NULL)))));
-	  if (TRACEON)
-	    printf("Recognized ANNOTATION\n");
-	}
-        | '['Expression_List  ']'
-        { 
-	  ANNOTATE_NODE = newExpr(EXPR_LIST,NULL,NULL,
-	                   newExpr(EXPR_LIST,NULL,NULL,
-			     newExpr(EXPR_LIST,NULL,NULL,
-				newExpr(EXPR_LIST,NULL,NULL,
-				   newExpr(EXPR_LIST,NULL,$2,NULL)))));
-	   if (TRACEON) printf("Recognized ANNOTATION\n");
-	};
-        
-
-IfDefR: /* empty */
-        {
-	  $$ = NULL; 
-        }
-        | IFDEFA '(' string ')'
-        {
-	  PTR_SYMB ids = NULL;
-	  /* need a symb there, will be global later */
-          ids = Look_For_Symbol_Ann (FUNCTION_NAME,"IfDef", NULL);
-	  $$ = Make_Function_Call (ids,NULL,1,$3);
-	  if (TRACEON) printf("Recognized IFDEFA \n");
-	};
-
-Alabel: /* empty */
-        {	
-	  $$ = NULL; 
-        }
-        | ALABELT '(' string ')'
-        {
-	  PTR_SYMB ids = NULL;
-	  /* need a symb there, will be global later */
-          ids = Look_For_Symbol_Ann (FUNCTION_NAME,"Label", NULL);
-	  $$ = Make_Function_Call (ids,NULL,1,$3);
-	  if (TRACEON) printf("Recognized IFDEFA \n");
-	  if (TRACEON) printf("Recognized ALABEL\n");
-	};
-
-ApplyTo: /* empty */
-        {
-	  $$ = NULL; 
-        }
-        |  APPLYTO '(' section ')'
-        {
-	  PTR_SYMB ids = NULL;
-	  /* need a symb there, will be global later */
-          ids = Look_For_Symbol_Ann (FUNCTION_NAME,"ApplyTo", NULL);
-	  $$ = Make_Function_Call (ids,NULL,2,$3, NULL);
-	   if (TRACEON) printf("Recognized APPLYTO \n");
-	}
-        |  APPLYTO '(' section ')' IF expr 
-        {
-	  PTR_SYMB ids = NULL;
-	  /* need a symb there, will be global later */
-          ids = Look_For_Symbol_Ann (FUNCTION_NAME,"ApplyTo", NULL);
-	  $$ = Make_Function_Call (ids,NULL,2,$3,$6);
-	   if (TRACEON) printf("Recognized APPLYTO \n");
-	}; 
-
-section : SECTIONT
-          { /* SECTIONT return a string_val llnd */
-            $$ = $1;
-          }
-          | TOFUNCTION IDENTIFIER
-          {
-	    
-            $$ =  newExpr(VAR_REF,NULL,$2);
-          }
-          | FROMT string TOT string
-          {  
-             $$ = newExpr(EXPR_LIST,NULL,$2,
-	                   newExpr(EXPR_LIST,NULL,$4,NULL));
-          } 
-          | TOT string
-          {  
-             $$ = newExpr(EXPR_LIST,NULL,NULL,
-	                   newExpr(EXPR_LIST,NULL,$2,NULL));
-          }
-          | TOTLABEL string
-          {  
-             $$ = $2;
-          }
-          ;
-
-
-LocalDeclare: /* empty */
-        {
-	  if (TRACEON) printf("Recognized LocalDeclare\n");
-	  $$ = NULL; 
-        }
-        | declare_local_list
-        {
-	  $$ = $1;
-	  if (TRACEON) printf("Recognized  declare_local_list\n");
-	};
-/******************* Annotation Expression Stuff ****************************/ 
-
-Expression_List: /* empty */
-        {
-	  $$ = NULL; 
-	  if (TRACEON) printf("Recognized empty expr\n");
-        }
-        | SPECIALAF '(' exprlist ')'
-        { /* for Key word like parallel loop and so on */
-	  PTR_SYMB ids = NULL;
-	  ids = Look_For_Symbol_Ann (VARIABLE_NAME, $1,global_int_annotation);
-	  $$ = Make_Function_Call (ids,NULL,1,$3);
-	  if (TRACEON) printf("Recognized Expression_List SPECIALAF  \n");
-	}
-        | IDENTIFIER '(' exprlist ')'
-        { /* for Key word like parallel loop and so on */
-	  PTR_SYMB ids = NULL;
-	  ids = Look_For_Symbol_Ann (VARIABLE_NAME, $1,global_int_annotation);
-	  $$ = Make_Function_Call (ids,NULL,1,$3);
-	  if (TRACEON) printf("Recognized Expression_List SPECIALAF  \n");
-	}
-        | DefineANN '(' string ',' CONSTANT ')'
-        { /* for Key word like parallel loop and so on */
-	  PTR_SYMB ids = NULL;
-	  ids = Look_For_Symbol_Ann (FUNCTION_NAME, "Define" ,global_int_annotation);
-	  $$ = Make_Function_Call (ids,NULL,2,$3,$5);
-	  if (TRACEON) printf("Recognized Expression_List Define  \n");
-	};   
-
-
-/******************** LOCAL DECLARATION **********************************/
-/* for local declaration */
-declare_local_list: 
-         {
-	  $$ = NULL; 
-        }
-         | onedeclare
-         {
-           $$ =  newExpr(EXPR_LIST,NODE_TYPE($1),$1,NULL);
-	   if (TRACEON) printf("Recognized onedeclare \n");
-	 } 
-          | declare_local_list  ',' onedeclare
-         {
-	   PTR_LLND ll_ptr ;
-	   ll_ptr = Follow_Llnd($1,2);               
-	   NODE_OPERAND1(ll_ptr) = newExpr(EXPR_LIST,NODE_TYPE($3),$3,NULL);
-	   if (TRACEON) printf("Recognized declare_local_list _inlist \n");
-	   $$=$1;
-	 };
-
-onedeclare:
-           TYPESPEC IDENTIFIER domain
-          {
-	    PTR_SYMB ids = NULL;
-	    PTR_LLND expr;
-            PTR_HASH p;
-	    char temp1[256];
-	    
-	    /* need a symb there, will be global later */
-            p = $2;
-	    strcpy(temp1,AnnExTensionNumber);
-	    strncat(temp1,p->ident,255);
-	    ids = newSymbol (VARIABLE_NAME,temp1,global_int_annotation);
-	    expr = newExpr(VAR_REF,global_int_annotation, ids);
-	    if ($3)
-	      $$ = newExpr(ASSGN_OP,global_int_annotation,expr, $3);
-            else
-              $$ = expr;
-          };
-domain: 
-       {
-	  $$ = NULL; 
-        }
-       | '=' expr_no_commas
-        {
-	  $$ = $2;
-	};
-
-
-/********************* PARSER EXPRESSION ************************/
-/* Must appear precede expr for resolve precedence problem */
-/* A nonempty list of identifiers.  */
-identifiers:	
-	IDENTIFIER
-		{ 
-		  /* to modify, must be check before created */
-		  $$ = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, $1, NULL); 
-		  /* $$ = install_parameter($1,VARIABLE_NAME) ; */
-                }
-	| identifiers ',' IDENTIFIER
-		{ 
-		  $$ = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, $3, NULL);
-		}
-	;
-
-identifier:
-	IDENTIFIER
-         { $$ = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, $1, NULL);}
-	| TYPENAME
-         { $$ = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, $1, NULL); }
-        ;
-
-unop:   '-'
-		{ 
-                 $$ = MINUS_OP ;
-	       }
-	| '!'
-		{ 
-                 $$ = NOT_OP ;
-	       }
-	;
-
-
-expr:	nonnull_exprlist
-		{ 
-                  $$ = $1 ;
-                }
-	;
-
-exprlist:
-	  /* empty */
-		{ 
-                  $$ = LLNULL ;
-                }
-	| nonnull_exprlist
-		{ 
-                  $$ = $1 ; 
-                }
-	;
-
-/* modified */
-nonnull_exprlist:
-          expr_no_commas
-		{ 
-                  $$ = newExpr(EXPR_LIST,NODE_TYPE($1),$1,NULL);
-                }
-	| nonnull_exprlist ',' expr_no_commas
-		{ PTR_LLND ll_ptr ;
-                  ll_ptr = Follow_Llnd($1,2);               
-                  NODE_OPERAND1(ll_ptr) = newExpr(EXPR_LIST,NODE_TYPE($3),$3,NULL);
-
-                  $$=$1;
-                }
-	;
-
-/* modified */
-vector_constant : '['  ']'   %prec ','
-            {     
-                  $$ = newExpr(VECTOR_CONST,NULL,NULL,NULL);
-                  primary_flag = VECTOR_CONST_APPEAR ;
-		  /* Temporarily setting */
-                  NODE_TYPE($$) = global_int_annotation ;
-		}
-        | '['  vector_list  ']'  %prec ','
-             {   
-                 $$ = newExpr(VECTOR_CONST,NULL,$2,NULL);
-                  primary_flag = VECTOR_CONST_APPEAR ;
-		  /* Temporarily setting */
-                  NODE_TYPE($$) = global_int_annotation ;
-	       }
-        ;
-
-vector_list :
-        {
-           $$ = NULL;
-        }
-        |  single_v_expr
-             { 
-               $$ = newExpr(EXPR_LIST,NULL,$1,NULL);
-             }
-        | vector_list ',' single_v_expr
-             {
-               PTR_LLND ll_node1 ;
-               ll_node1 = Follow_Llnd($1,2);
-               NODE_OPERAND1(ll_node1)= newExpr(EXPR_LIST,NULL,$3,NULL);
-	       $$=$1;
-	     }
-
-        ;
-
-/* modified */
-single_v_expr :
-          const_expr_no_commas
-             { 
-               $$ = $1;
-             }
-        | triplet
-             { 
-               $$ = $1;
-             }
-        | compound_constant
-             { 
-               $$ = $1;
-             }
-        |   vector_constant
-                { 
-                  $$ = $1 ;
-                }
-        ;
-
-
- element:
-         CONSTANT
-            { 
-                  $$ = $1 ;
-	    }
-	| IDENTIFIER
-		{ 
-		  $$ = newExpr(VAR_REF, NULL,Look_For_Symbol_Ann (VARIABLE_NAME, $1, NULL));
-		  exception_flag = ON ;
-		}
-       ;
-
- triplet :
-          element ':' element ':' element     %prec '.'
-
-            { PTR_LLND p1,p2 ;
-              p1 =  newExpr(DDOT,NULL,$1,$3);
-              p2 = newExpr(DDOT,NULL,p1,$5);
-              $$ = p2 ;
-	    }
-         | element ':' element               %prec '.'
-            { 
-              $$= newExpr(DDOT,NULL,$1,$3);
-	    }
-        ;
-
-
-compound_constant :
-          CONSTANT '#' CONSTANT
-           { 
-             $$=  newExpr(COPY_NODE,NULL,$1,$3);
-	   }
-
-        ;
-/* modified */
-array_expr_a :        /* empty */
-            {
-	      $$ = NULL;
-	    }
-        | expr_no_commas_1 ':' expr_no_commas_1 ':' expr_no_commas_1  %prec ','
-            { PTR_LLND p1,p2 ;
-	      p1 =  newExpr(DDOT,NULL,$1,$3);
-              p2 = newExpr(DDOT,NULL,p1,$5);
-              $$ = p2 ;
-	    }
-        | expr_no_commas_1 ':' expr_no_commas_1                     %prec ','
-            {
-              $$= newExpr(DDOT,NULL,$1,$3);
-	    }
-        ;
-
-
-expr_no_commas_1 :
-             {
-                $$ = LLNULL ;
-             } 
-       | expr_no_commas
-           { 
-                 $$ = $1 ;
-           }
-       ;
-/* modified */
-array_expr_b :  expr_no_commas '#' expr_no_commas  
-        ;
-
-
-/* modified */
-expr_vector : expr_no_commas   /* original is expr  */
-        |  array_expr_a
-        ;
- 
-expr_no_commas:
-	primary
-           { 
-            /* Need Another way to check this one */
-            /*  if (primary_flag & EXCEPTION_ON) Message("syntax error 6"); */
-             if (exception_flag == ON)  { /* Message("undefined symbol",0); */
-                                          exception_flag =OFF;
-                                        }
-             $$=$1 ;
-	   }
-	| unop primary %prec UNARY
-		{	
-		  $$=newExpr($1,NULL,$2);
-		}
-	| SIZEOF expr_no_commas  %prec UNARY
-		{ 
-		  $$= newExpr(SIZE_OP,global_int_annotation,$2,LLNULL);
-                }
-	| expr_no_commas '+' expr_no_commas
-		{ 
-		  $$=newExpr(ADD_OP,NULL,$1,$3);
-                }
-	| expr_no_commas '-' expr_no_commas
-		{ 
-		  $$=newExpr(SUBT_OP,NULL,$1,$3);
-                }
-	| expr_no_commas '*' expr_no_commas
-		{ 
-		  $$=newExpr(MULT_OP,NULL,$1,$3);
-                }
-	| expr_no_commas '/' expr_no_commas
-		{ 
-		  $$=newExpr(DIV_OP,NULL,$1,$3);
-                }
-	| expr_no_commas '%' expr_no_commas
-		{ 
-		  $$=newExpr(MOD_OP,NULL,$1,$3);
-                }
-	| expr_no_commas ARITHCOMPARE expr_no_commas
-		{ int op1 ;
-                  op1 = ($2 == ((int) LE_EXPR)) ? LE_OP : GE_OP ;
-		  $$=newExpr(op1,NULL,$1,$3);
-                }
-	| expr_no_commas '<'  expr_no_commas  
-                { 
-		  $$=newExpr(LT_OP,global_int_annotation,$1,$3);
-                }
-	| expr_no_commas '>'  expr_no_commas   
-                { 
-		  $$=newExpr(GT_OP,global_int_annotation,$1,$3);
-                }
-	| expr_no_commas EQCOMPARE expr_no_commas
-		{ int op1 ;
-                  op1 = ($2 == ((int) NE_EXPR)) ? NE_OP : EQ_OP  ;
-     		  $$=newExpr(op1,global_int_annotation,$1,$3);
-                }
-	| expr_no_commas '&' expr_no_commas
-		{ 
-		  $$=newExpr(BITAND_OP,global_int_annotation,$1,$3);
-                }
-	| expr_no_commas '|' expr_no_commas
-		{ 
-		  $$=newExpr(BITOR_OP,global_int_annotation,$1,$3);
-                }
-	| expr_no_commas '^' expr_no_commas
-		{ 
-		  $$=newExpr(XOR_OP,NULL,$1,$3);
-                }
-	| expr_no_commas ANDAND expr_no_commas
-		{ 
-		  $$=newExpr(AND_OP,global_int_annotation,$1,$3);
-                }
-	| expr_no_commas OROR expr_no_commas
-		{ 
-		  $$=newExpr(OR_OP,global_int_annotation,$1,$3);
-                }
-	| expr_no_commas '?' expr_no_commas ':' expr_no_commas  /* expr */
-		{ PTR_LLND ll_node1;
-		  ll_node1=newExpr(EXPR_IF_BODY,$3,$5);
-		  $$=newExpr(EXPR_IF,NULL,$1,ll_node1);
-		}
-	| expr_no_commas '=' expr_no_commas
-		{ 
-		  $$=newExpr(ASSGN_OP,NULL,$1,$3);
-                }
-	| expr_no_commas ASSIGN expr_no_commas
-		{ int op1 ;
-                  op1 = map_assgn_op($2);
-		  $$=newExpr(op1,NULL,$1,$3);
-                }
-
-	;
- 
-const_expr_no_commas:
-	const_primary
-           { 
-             if (exception_flag == ON)  { Message("undefined symbol",0);
-                                          exception_flag =OFF;
-                                        }
-             $$=$1 ;
-	   }
-	| unop const_expr_no_commas  %prec UNARY
-		{ 
-		  $$=newExpr($1,NULL,$2);
-                }
-	| SIZEOF const_expr_no_commas  %prec UNARY
-		{ 
-		  $$=newExpr(SIZE_OP,NULL,$2);
-                }
-	| const_expr_no_commas '+' const_expr_no_commas
-		{ 
-		  $$=newExpr(ADD_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas '-' const_expr_no_commas
-		{ 
-		  $$=newExpr(SUBT_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas '*' const_expr_no_commas
-		{ 
-		  $$=newExpr(MULT_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas '/' const_expr_no_commas
-		{ 
-		  $$=newExpr(DIV_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas '%' const_expr_no_commas
-		{ 
-		  $$=newExpr(MOD_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas LSHIFT const_expr_no_commas
-		{ 
-		  $$=newExpr(LSHIFT_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas RSHIFT const_expr_no_commas
-		{ 
-		  $$=newExpr(RSHIFT_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas ARITHCOMPARE const_expr_no_commas
-		{ int op1 ;
-                  op1 = ($2 == ((int) LE_EXPR)) ? LE_OP : GE_OP ;
-		  $$=newExpr(op1,NULL,$1,$3);
-                }
-	| const_expr_no_commas '<'  const_expr_no_commas  
-                { 
-		  $$=newExpr(LT_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas '>'  const_expr_no_commas   
-                { 
-		  $$=newExpr(GT_OP,NULL,$1,$3);
-                }
-
-	| const_expr_no_commas EQCOMPARE const_expr_no_commas
-		{ int op1 ;
-
-                  op1 = ($2 == ((int) NE_EXPR)) ? NE_OP : EQ_OP  ;
-		  $$=newExpr(op1,NULL,$1,$3);
-                }
-	| const_expr_no_commas '&' const_expr_no_commas
-		{ 
-		  $$=newExpr(BITAND_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas '|' const_expr_no_commas
-		{ 
-		  $$=newExpr(BITOR_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas '^' const_expr_no_commas
-		{ 
-		  $$=newExpr(XOR_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas ANDAND const_expr_no_commas
-		{ 
-		  $$=newExpr(AND_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas OROR const_expr_no_commas
-		{ 
-		  $$=newExpr(OR_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas '?' expr ':' const_expr_no_commas
-		{ PTR_LLND ll_node1;
-		  ll_node1=newExpr(EXPR_IF_BODY,$2,$3);
-		  $$=newExpr(EXPR_IF,NULL,$1,ll_node1);
-		}
-	| const_expr_no_commas '=' const_expr_no_commas
-		{ 
-		  $$=newExpr(ASSGN_OP,NULL,$1,$3);
-                }
-	| const_expr_no_commas ASSIGN const_expr_no_commas
-		{ int op1 ;
-                  op1 = map_assgn_op($2);
-		  $$=newExpr(op1,NULL,$1,$3);
-                }
-
-	;
-
-
-/* modified */
-primary:
-	IDENTIFIER
-		{ PTR_SYMB symbptr;
-		  symbptr = (PTR_SYMB) Look_For_Symbol_Ann (VARIABLE_NAME, $1,NULL);
-		  $$ = newExpr(VAR_REF,global_int_annotation,symbptr);
-		  exception_flag = ON ;
-		}
-	| CONSTANT
-                { 
-                  $$ = $1 ;
-                }
-	| string
-		{ 
-                  $$ = $1 ;    
-                }
-	| '(' expr ')'
-		{ 
-                  primary_flag = EXPR_LR ;
-                  $$ = $2 ;
-                }
-
-	| '(' error ')'
-           {
-	     $$ = NULL;
-	   }
-        |   vector_constant       %prec '.'
-           {
-	     $$ = $1;
-	   }
-	| primary '('  
-                {  PTR_SYMB symb;
-
-                   if (exception_flag == ON)
-		    {
-                      /* strange behavior for default function */
-		      symb = NODE_SYMB($1);
-		      SYMB_CODE(symb) = FUNCTION_NAME;
-                      exception_flag = OFF ;
-                      $<ll_node>$ =  Make_Function_Call (symb,NULL,0,NULL);
-                     }
-                   else
-                      $<ll_node>$ = $1 ;
-		 }
-
-          exprlist ')'   %prec '.'
-		{ PTR_LLND lnode_ptr ,llp ;
-                  int      status;
-
-                  llp = $<ll_node>3 ;
-                  status = OFF ;
-                  if ((llp->variant == FUNC_CALL) && (!llp->entry.Template.ll_ptr1))
-                      { 
-                         lnode_ptr = llp;
-                         status = FUNC_CALL ;
-		       }
-                  if ((!status) &&((llp->variant == RECORD_REF)||
-				   (llp->variant == POINTST_OP)))
-		    {
-                       lnode_ptr = llp->entry.Template.ll_ptr2;
-		       if ((lnode_ptr)&&(lnode_ptr->variant== FUNCTION_REF))
-			 {
-                           lnode_ptr->variant = FUNC_CALL;
-			 }
-                       status = FUNC_CALL ;
-		     }
-                  if ((!status) &&(llp->variant== FUNCTION_REF))
-		    {  llp->variant = FUNC_CALL ;
-                       status = FUNC_CALL ;
-		       lnode_ptr = llp;
-		     }
-		  if (!status) {
-                       status = FUNCTION_OP;
-		       lnode_ptr = llp;
-		     }
-                  switch (status) {
-                  case FUNCTION_OP : $$ =newExpr(FUNCTION_OP,$<ll_node>3,$4);
-                                     $$->type = $<ll_node>3->type ;
-                                     break;
-                  case FUNC_CALL :   lnode_ptr->entry.Template.ll_ptr1=$4;
-                                     $$ = $<ll_node>3 ;
-                                     break;
-	          default :        Message("system error 10",0);
-		  }
-		}
-
-	| primary '[' expr_vector ']'   %prec '.'
-	   { int status ;
-             PTR_LLND ll_ptr,lp1;
-
-             ll_ptr = check_array_id_format($1,&status);
-             switch (status) {
-             case NO : Message("syntax error ",0);
-                       break ;
-	     case ARRAY_OP_NEED:
-                       lp1 = newExpr(EXPR_LIST,NULL,$3,LLNULL);/*mod*/
-                       $$ = newExpr(ARRAY_OP,NULL,$1,lp1);
-                       break;
-             case ID_ONLY :
-                       ll_ptr->variant = ARRAY_REF ;
-                       ll_ptr->entry.Template.ll_ptr1 = newExpr(EXPR_LIST,NULL,$3,LLNULL);
-                       $$ = $1 ;
-                       break;
-             case RANGE_APPEAR :
-	               ll_ptr->entry.Template.ll_ptr2 = newExpr(EXPR_LIST,NULL,$3,LLNULL);
- 	               $$ = $1 ; 
-                       break;
-             }
-/*             $$->type = adjust_deref_type($1->type,DEREF_OP);*/
-           }
-	| primary PLUSPLUS
-		{ 
-                  $$ = newExpr(PLUSPLUS_OP,NULL,LLNULL,$1);
-		  $$->type = $1->type ;
-                }
-	| primary MINUSMINUS
-		{ 
-                  $$ = newExpr(MINUSMINUS_OP,NULL,LLNULL,$1);
-		  $$->type = $1->type ;
-		}
-	;
-
-
-
-
-/* modified */
-const_primary:
-
-          CONSTANT
-                { 
-                  $$ = $1 ;    
-                }
-	| '(' const_expr_no_commas ')'
-		{ 
-                  primary_flag =EXPR_LR ;
-                  $$ = $2 ;
-                }
-
-	| '(' error ')'
-           {
-	     $$ = NULL;
-	   }          
-	| const_primary PLUSPLUS
-		{ 
-                  $$ = newExpr(PLUSPLUS_OP,NULL,LLNULL,$1);
-                }
-	| const_primary MINUSMINUS
-		{ 
-                  $$ = newExpr(MINUSMINUS_OP,NULL,LLNULL,$1);
-		}
-	;
-
-/* Produces a STRING_CST with perhaps more STRING_CSTs chained onto it.  */
-string:
-	  STRING
-            { 
-              $$ = $1 ;
-            }
-	| string STRING
-	;
-
-%%
-int lineno;			/* current line number in file being read */
-
-/* comments structure */
-#define MAX_COMMENT_SIZE  1024 
-char    comment_buf[MAX_COMMENT_SIZE + 2];  /* OFFSET '2' to avoid boundary */
-int     comment_cursor = 0;
-int     global_comment_type;
-
-
-/*************************************************************************
- *                                                                       *
- *                      lexical analyzer                                 * 
- *                                                                       *
- *************************************************************************/
-
-static int maxtoken;		/* Current length of token buffer */
-static char *token_buffer;	/* Pointer to token buffer */
-static int previous_value ;     /* last token to be remembered */
-
-/* frw[i] is index in rw of the first word whose length is i. */
-
-#define MAXRESERVED 9
-
-/*static char frw[10] =
-  { 0, 0, 0, 2, 6, 14, 22, 34, 39, 44 };*/
-static char frw[10] =
-{ 0, 0, 0, 2, 5, 13, 21, 32, 37, 41 };
-
-static char *rw[] =
-  { "if", "do", 
-    "int", "for", "asm",
-    "case", "char", "auto", "goto", "else", "long", "void", "enum",
-    "float", "short", "union", "break", "while", "const",  "IfDef","Label",
-    "double", "static", "extern", "struct", "return", "sizeof", "switch", "signed","coexec","coloop","friend",
-    "typedef", "default","private","cobreak", "ApplyTo",
-    "unsigned", "continue", "register", "volatile","operator"};
-
-static short rtoken[] =
-  { IF, DO, 
-    TYPESPEC, FOR, ASM,
-    CASE, TYPESPEC, SCSPEC, GOTO, ELSE, TYPEMOD, TYPESPEC, ENUM,
-    TYPESPEC, TYPEMOD, UNION, BREAK, WHILE, TYPEMOD,  IFDEFA, ALABELT,
-    TYPESPEC, SCSPEC, SCSPEC, STRUCT, RETURN, SIZEOF, SWITCH, TYPEMOD,COEXEC,COLOOP,FRIEND,
-    SCSPEC, DEFAULT_TOKEN,ACCESSWORD,COBREAK, APPLYTO,
-    TYPEMOD, CONTINUE, SCSPEC, TYPEMOD,OPERATOR};
-
-/* This table corresponds to rw and rtoken.
-   Its element is an index in ridpointers  */
-
-#define NORID RID_UNUSED
-
-static enum rid rid[] =
-  { NORID, NORID, 
-    RID_INT, NORID, NORID,
-    NORID, RID_CHAR, RID_AUTO, NORID, NORID, RID_LONG, RID_VOID, NORID,
-    RID_FLOAT, RID_SHORT, NORID, NORID, NORID, RID_CONST, NORID, NORID,
-    RID_DOUBLE, RID_STATIC, RID_EXTERN, NORID, NORID, NORID, NORID, RID_SIGNED,NORID,NORID,NORID,
-    RID_TYPEDEF, NORID,RID_PRIVATE,NORID, NORID,
-    RID_UNSIGNED, NORID, RID_REGISTER, RID_VOLATILE,NORID};
-
-/* The elements of `ridpointers' are identifier nodes
-   for the reserved type names and storage classes.  
-tree ridpointers[(int) RID_MAX];
-static tree line_identifier;    The identifier node named "line" */
-
-
-void
-init_lex ()
-{
-  //extern char *malloc();
-
-  /* Start it at 0, because check_newline is called at the very beginning
-     and will increment it to 1.  */
-  lineno = 0;
-  maxtoken = 40;
-  lastdecl_id = 0;
-  token_buffer = (char *) xmalloc((unsigned)(maxtoken+1));
-}
-
-static void
-reinit_parse_for_function ()
-{
-}
-
-/* Put char into comment buffer. When the buffer is full, we make a comment */
-/* structure and reset the comment_cursor. */
-static int
-put_char_buffer(c,sw)
-char c ;
-int sw;
-{
-/* no comment here */
-return 0;
-}
-
-static int
-skip_white_space(type)
-  int type ;
-{
-  register int c;
-
-
-  c = MYGETC();
-
-  for (;;)
-    {
-      switch (c)
-	{
-	case '/':
-	   return '/';	
-
-	case '\n':
-	case ' ':
-	case '\t':
-	case '\f':
-	case '\r':
-	case '\b':
-	  c = MYGETC();
-	  break;
-
-	case '\\':
-	  c = MYGETC();
-	  if (c == '\n')
-	    lineno++;
-	  else
-	    yyerror("stray '\\' in program");
-	  c = MYGETC();
-	  break;
-
-	default:
-	  return (c);
-	}
-    }
-}
-
-/* Take care of the comments in the tail of the source code */
-static int
-skip_white_space_2()
-{
-  register int c;
-
-  c = MYGETC();
-  for (;;)
-    {
-      switch (c)
-	{
-	case '/':
-	  return '/';
-	case '\n':
-           return(c);
-
-	case ' ':
-	case '\t':
-	case '\f':
-	case '\r':
-	case '\b':
-	  c = MYGETC();
-	  break;
-
-	case '\\':
-	  c = MYGETC();
-	  if (c == '\n')
-	    lineno++;
-	  else
-	    yyerror("stray '\\' in program");
-	  c = MYGETC();
-	  break;
-
-	default:
-	  return (c);
-	}
-    }
-}
-
-
-
-/* make the token buffer longer, preserving the data in it.
-p should point to just beyond the last valid character in the old buffer
-and the value points to the corresponding place in the new one.  */
-
-static char *
-extend_token_buffer(p)
-char *p;
-{
-  register char *newbuf;
-  register char *value;
-  int newlength = maxtoken * 2 + 10;
-  register char *p2, *p1;
-  extern char *malloc();
-
-  newbuf = malloc(newlength+1));
-
-  p2 = newbuf;
-  p1 = newbuf + newlength + 1;
-  while (p1 != p2) *p2++ = 0;
-
-  value = newbuf;
-  p2 = token_buffer;
-  while (p2 != p)
-   *value++ = *p2++;
-
-  token_buffer = newbuf;
-
-  maxtoken = newlength;
-
-  return (value);
-}
-
-
-
-
-#define isalnum(char) ((char >= 'a' && char <= 'z') || (char >= 'A' && char <= 'Z') || (char >= '0' && char <= '9'))
-#define isdigit(char) (char >= '0' && char <= '9')
-#define ENDFILE -1  /* token that represents end-of-file */
-#define isanop(d) ((d == '+') || (d == '-') || (d == '&') || (d == '|') || (d == '<') || (d == '>') || (d == '*') || (d == '/') || (d == '%') || (d == '^') || (d == '!') || (d == '=') )
-
-
-int
-readescape ()
-{
-  register int c = MYGETC ();
-  register int count, code;
-
-  switch (c)
-    {
-    case 'x':
-      code = 0;
-      count = 0;
-      while (1)
-	{
-	  c = MYGETC ();
-	  if (!(c >= 'a' && c <= 'f')
-	      && !(c >= 'A' && c <= 'F')
-	      && !(c >= '0' && c <= '9'))
-	    {
-	      unMYGETC (c);
-	      break;
-	    }
-	  if (c >= 'a' && c <= 'z')
-	    c -= 'a' - 'A';
-	  code *= 16;
-	  if (c >= 'a' && c <= 'f')
-	    code += c - 'a' + 10;
-	  if (c >= 'A' && c <= 'F')
-	    code += c - 'A' + 10;
-	  if (c >= '0' && c <= '9')
-	    code += c - '0';
-	  count++;
-	  if (count == 3)
-	    break;
-	}
-      if (count == 0)
-	yyerror ("\\x used with no following hex digits");
-      return code;
-
-    case '0':  case '1':  case '2':  case '3':  case '4':
-    case '5':  case '6':  case '7':
-      code = 0;
-      count = 0;
-      while ((c <= '7') && (c >= '0') && (count++ < 3))
-	{
-	  code = (code * 8) + (c - '0');
-	  c = MYGETC ();
-	}
-      unMYGETC (c);
-      return code;
-
-    case '\\': case '\'': case '"':
-      return c;
-
-    case '\n':
-      lineno++;
-      return -1;
-
-    case 'n':
-      return c ;  /*     return TARGET_NEWLINE; */
-
-    case 't':
-      return c;  /*      return TARGET_TAB; */
-
-    case 'r':
-      return c;/*      return TARGET_CR; */
-
-    case 'f':
-      return c;/*       return TARGET_FF;*/
-
-    case 'b':
-      return c;/*       return TARGET_BS;*/
-
-    case 'a':
-      return c; /*      return TARGET_BELL;*/
-
-    case 'v':
-      return c; /*      return TARGET_VT;*/
-    }
-  return c;
-}
-
- 
-int
-yylex()
-{
-  register int c;
-  register char *p;
-  register int value;
-  int low /*,high */ ;
-  char *str1 ;
-/*  double  ddval ; */
-/*  int type; */
-  int c3;
-
-
-
-  if (recursive_yylex == OFF) new_cur_comment = (PTR_CMNT) NULL ;
-
-  /* line_pos_1 = lineno +1 ; */
-  c = skip_white_space(FULL);
-  /*  yylloc.first_line = lineno;*/
-
-  switch (c)
-    {
-    case EOF:
-      value = ENDFILE; break;
-
-    case 'A':  case 'B':  case 'C':  case 'D':  case 'E':
-    case 'F':  case 'G':  case 'H':  case 'I':  case 'J':
-    case 'K':  case 'L':  case 'M':  case 'N':  case 'O':
-    case 'P':  case 'Q':  case 'R':  case 'S':  case 'T':
-    case 'U':  case 'V':  case 'W':  case 'X':  case 'Y':
-    case 'Z':
-    case 'a':  case 'b':  case 'c':  case 'd':  case 'e':
-    case 'f':  case 'g':  case 'h':  case 'i':  case 'j':
-    case 'k':  case 'l':  case 'm':  case 'n':  case 'o':
-    case 'p':  case 'q':  case 'r':  case 's':  case 't':
-    case 'u':  case 'v':  case 'w':  case 'x':  case 'y':
-    case 'z':
-    case '_':
-
-      p = token_buffer;
-      while (isalnum(c) || (c == '_') || (c == '~'))
-	{
-	  if (p >= token_buffer + maxtoken)
-	    p = extend_token_buffer(p);
-	  *p++ = c;
-	  c = MYGETC();
-	}
-
-      *p = 0;
-      unMYGETC(c);
-
-      value = IDENTIFIER;
-
-
-      if (p - token_buffer <= MAXRESERVED)
-	{
-	  register int lim = frw [p - token_buffer + 1];
-	  register int i;
-
-	  for (i = frw[p - token_buffer]; i < lim; i++)
-	    if (rw[i][0] == token_buffer[0] && !strcmp(rw[i], token_buffer))
-	      {
-		if (rid[i])
-		  yylval.token = (int) rid[i] ;
-                  value = (int) rtoken[i];
-		break;
-	      }
-	}
-
-      { int temp;
-	if ((temp = Recog_My_Token(token_buffer)) != -1)
-	  {
-	    yylval.token = temp;
-	    value = temp;
-	  }
-      }
-
-      if (value == IDENTIFIER)
-	{ int t_status ;
-	  PTR_LLND temp;
-	/* temp move it out */
-
-          yylval.hash_entry = look_up_type(token_buffer,&t_status);
-          /* if ((t_status)&&(lastdecl_id ==0))   value = TYPENAME;    
-	     Wait to fix that */
-	  /* temporary fix */
-           temp = look_up_section(token_buffer);
-          if (temp)
-	    {
-	      yylval.ll_node = temp;
-	      value = SECTIONT;
-	    }
-
-	  if (look_up_specialfunction(token_buffer))
-	    {
-	      value =  SPECIALAF;
-	    }
-	      
-	  
-        }
-
-      break;
-
-    case '0':  case '1':  case '2':  case '3':  case '4':
-    case '5':  case '6':  case '7':  case '8':  case '9':
-    case '.':
-      {
-	int base = 10;
-	int count = 0;
-	int largest_digit = 0;
-	/* for multi-precision arithmetic,
-	   we store only 8 live bits in each short,
-	   giving us 64 bits of reliable precision */
-	short shorts[8];
-	int floatflag = 0;  /* Set 1 if we learn this is a floating constant */
-
-	for (count = 0; count < 8; count++)
-	  shorts[count] = 0;
-
-	p = token_buffer;
-	*p++ = c;
-
-	if (c == '0')
-	  {
-	    *p++ = (c = MYGETC());
-	    if ((c == 'x') || (c == 'X'))
-	      {
-		base = 16;
-		*p++ = (c = MYGETC());
-	      }
-	    else
-	      {
-		base = 8;
-	      }
-	  }
-
-	while (c == '.'
-	       || (isalnum (c) && (c != 'l') && (c != 'L')
-		   && (c != 'u') && (c != 'U')
-		   && (!floatflag || ((c != 'f') && (c != 'F')))))
-	  {
-	    if (c == '.')
-	      {
-		if (base == 16)
-		  yyerror ("floating constant may not be in radix 16");
-		floatflag = 1;
-		base = 10;
-		*p++ = c = MYGETC ();
-		/* Accept '.' as the start of a floating-point number
-		   only when it is followed by a digit.
-		   Otherwise, unread the following non-digit
-		   and use the '.' as a structural token.  */
-		if (p == token_buffer + 2 && !isdigit (c))
-		  {
-		    if (c == '.')
-		      {
-			c = MYGETC ();
-			if (c == '.')
-			  { 
-                            value = ELLIPSIS ;
-			    goto done ;
-                          }
-			yyerror ("syntax error");
-		      }
-		    unMYGETC (c);
-		    value = '.';
-                    goto done;
-		  }
-	      }
-	    else
-	      {
-		if (isdigit(c))
-		  {
-		    c = c - '0';
-		  }
-		else if (base <= 10)
-		  {
-		    if ((c&~040) == 'E')
-		      {
-			if (base == 8)
-			  yyerror ("floating constant may not be in radix 8");
-			base = 10;
-			floatflag = 1;
-			break;   /* start of exponent */
-		      }
-		    yyerror ("nondigits in number and not hexadecimal");
-		    c = 0;
-		  }
-		else if (c >= 'a')
-		  {
-		    c = c - 'a' + 10;
-		  }
-		else
-		  {
-		    c = c - 'A' + 10;
-		  }
-		if (c >= largest_digit)
-		  largest_digit = c;
-	    
-		for (count = 0; count < 8; count++)
-		  {
-		    (shorts[count] *= base);
-		    if (count)
-		      {
-			shorts[count] += (shorts[count-1] >> 8);
-			shorts[count-1] &= (1<<8)-1;
-		      }
-		    else shorts[0] += c;
-		  }
-    
-		*p++ = (c = MYGETC());
-	      }
-	  }
-
-	if (largest_digit >= base)
-	  yyerror ("numeric constant contains digits beyond the radix");
-
-	/* Remove terminating char from the token buffer and delimit the string */
-	*--p = 0;
-
-	if (floatflag)
-	  {
-	   /*  enum rid type = DOUBLE_TYPE_CONST ; */
-
-	    /* Read explicit exponent if any, and put it in tokenbuf.  */
-
-	    if ((c == 'e') || (c == 'E'))
-	      {
-		*p++ = c;
-		c = MYGETC();
-		if ((c == '+') || (c == '-'))
-		  {
-		    *p++ = c;
-		    c = MYGETC();
-		  }
-	        while (isdigit(c))
-		  {
-		    *p++ = c;
-		    c = MYGETC();
-		  }
-	      }
-
-	    *p = 0;
-
-	    while (1)
-	      {
-/*		if (c == 'f' || c == 'F')
-		  type = FLOAT_TYPE_CONST ;
-		else if (c == 'l' || c == 'L')
-		  type = LONG_DOUBLE_TYPE_CONST ;
-		else */
-
-                if((c != 'f') && (c != 'F') && (c != 'l') && (c !='L'))
-		  {
-		    if (isalnum (c))
-		      {
-			yyerror ("garbage at end of number");
-			while (isalnum (c))
-			  c = MYGETC ();
-		      }
-		    break;
-		  }
-		c = MYGETC ();
-	      }
-
-	    unMYGETC(c);
-
-/*	    ddval = build_real_from_string (token_buffer, 0);  */
-            str1= (char *) copys(token_buffer);
-            yylval.ll_node = newExpr(FLOAT_VAL,NULL,LLNULL,LLNULL,str1);
-
-	  }
-	else
-	  {
-	    /* enum rid  type; */
-
-	    /* int spec_unsigned = 0; */
-	    /* int spec_long = 0;  */
-
-	    while (1)
-	      {
-/*		if (c == 'u' || c == 'U')
-		  {
-		    spec_unsigned = 1;
-		  }
-		else if (c == 'l' || c == 'L')
-		  {
-		    spec_long = 1;
-		  }
-		else */
-
-               if((c != 'u') && (c != 'U') && (c != 'l') && (c != 'L'))
-		  {
-		    if (isalnum (c))
-		      {
-			yyerror ("garbage at end of number");
-			while (isalnum (c))
-			  c = MYGETC ();
-		      }
-		    break;
-		  }
-		c = MYGETC ();
-	      }
-
-	    unMYGETC (c);
-
-	    /* This is simplified by the fact that our constant
-	       is always positive.  */
-
-	    low= (shorts[3]<<24) + (shorts[2]<<16) + (shorts[1]<<8) + shorts[0] ;
-	  /*  high = (shorts[7]<<24) + (shorts[6]<<16) + (shorts[5]<<8) + shorts[4] ; */
-	    
-
-	    /* type = LONG_UNSIGNED_TYPE_CONST ; */
-	    yylval.ll_node = makeInt(low);	
-	 }
-
-	value = CONSTANT; break;
-      }
-
-    case '\'':
-      c = MYGETC();
-      {
-
-      tryagain:
-
-	if (c == '\\')
-	  {
-	    c = readescape ();
-	    if (c < 0)
-	      goto tryagain;
-	  }
-	else if (c == '\n')
-	  {
-	      Message ("ANSI C forbids newline in character constant",0);
-	    lineno++;
-	  }
-
-	c3= c;
-
-	c = MYGETC ();
-	if (c != '\'')
-	  yyerror("malformatted character constant");
-        yylval.ll_node = newExpr(CHAR_VAL,LLNULL,LLNULL,low);
-	yylval.ll_node->entry.cval = c3;  
-	value = CONSTANT; break;
-      }
-
-    case '"':
-      {
-	c = MYGETC();
-	p = token_buffer;
-
-	while (c != '"')
-	  {
-	    if (c == '\\')
-	      {
-                /* New Added Three lines */
-                if (p == token_buffer + maxtoken)
-	          p = extend_token_buffer(p);
-  	        *p++ = c;
-
-		c = readescape ();
-		if (c < 0)
-		  goto skipnewline;
-	      }
-	    else if (c == '\n')
-	      {
-		  Message ("ANSI C forbids newline in string constant",0);
-		lineno++;
-	      }
-
-	    if (p == token_buffer + maxtoken)
-	      p = extend_token_buffer(p);
-	    *p++ = c;
-
-	  skipnewline:
-	    c = MYGETC ();
-	  }
-
-	*p++ = 0;
-
-	str1= (char *) copys(token_buffer);
-        yylval.ll_node = (PTR_LLND) newNode(STRING_VAL);
-	NODE_STRING_POINTER(yylval.ll_node) = str1;
-	value = STRING; break;
-      }
-      
-    case '+':
-    case '-':
-    case '&':
-    case '|':
-    case '<':
-    case '>':
-    case '*':
-    case '/':
-    case '%':
-    case '^':
-    case '!':
-    case '=':
-      {
-	register int c1;
-        if ( previous_value == OPERATOR )
-           {
-             p = token_buffer;
-             while (isanop(c) )
-              {
-                  if (p >= token_buffer + maxtoken)
-	          p = extend_token_buffer(p);
-	          *p++ = c;
-	          c = MYGETC();
-               }
-             *p = 0;
-             unMYGETC(c);
-             value =  LOADEDOPR ;
-             yylval.hash_entry = look_up(token_buffer);
-             break;
-            }
-      combine:
-
-	switch (c)
-	  {
-	  case '+':
-	    yylval.token = (int) PLUS_EXPR; break;
-	  case '-':
-	    yylval.token = (int) MINUS_EXPR; break;
-	  case '&':
-	    yylval.token = (int) BIT_AND_EXPR; break;
-	  case '|':
-	    yylval.token = (int) BIT_IOR_EXPR; break;
-	  case '*':
-	    yylval.token = (int) MULT_EXPR; break;
-	  case '/':
-	    yylval.token = (int) TRUNC_DIV_EXPR; break;
-	  case '%':
-	    yylval.token = (int) TRUNC_MOD_EXPR; break;
-	  case '^':
-	    yylval.token = (int) BIT_XOR_EXPR; break;
-	  case LSHIFT:
-	    yylval.token = (int) LSHIFT_EXPR; break;
-	  case RSHIFT:
-	    yylval.token = (int) RSHIFT_EXPR; break;
-	  case '<':
-	    yylval.token = (int) LT_EXPR; break;
-	  case '>':
-	    yylval.token = (int) GT_EXPR; break;
-	  }	
-
-	c1 = MYGETC();
-
-	if (c1 == '=')
-	  {
-	    switch (c)
-	      {
-	      case '<':
-		value = ARITHCOMPARE; yylval.token = (int) LE_EXPR; goto done;
-	      case '>':
-		value = ARITHCOMPARE; yylval.token = (int) GE_EXPR; goto done;
-	      case '!':
-		value = EQCOMPARE; yylval.token = (int) NE_EXPR; goto done;
-	      case '=':
-		value = EQCOMPARE; yylval.token = (int) EQ_EXPR; goto done;
-	      }	
-	    value = ASSIGN; goto done;
-	  }
-	else if (c == c1)
-	  switch (c)
-	    {
-	    case '+':
-	      value = PLUSPLUS; goto done;
-	    case '-':
-	      value = MINUSMINUS; goto done;
-	    case '&':
-	      value = ANDAND; goto done;
-	    case '|':
-	      value = OROR; goto done;
-/* testing  */
-/*            case ':':
-              value = DOUBLEMARK; goto done;  */
-
-	    case '<':
-	      c = LSHIFT;
-	      goto combine;
-	    case '>':
-	      c = RSHIFT;
-	      goto combine;
-	    }
-	else if ((c == '-') && (c1 == '>'))
-	  { value = POINTSAT; goto done; }
-	unMYGETC (c1);
-
-
-        value = c;
-	goto done;
-      }
-
-    default:
-      value = c;
-    }
-
-done:
-
-  if (recursive_yylex == OFF) {
-    previous_value = value ;
-    line_pos_1 = lineno ;
-    c = skip_white_space_2();
-    if (c != '\n');
-       unMYGETC(c);
-    if (value != '}') 
-      { c = skip_white_space(NEXT_FULL);
-	if (c == '\n') lineno++ ;
-	else           unMYGETC(c);
-      }
-    set_up_momentum(value,yylval.token);
-    automata_driver(value);
-    cur_counter++;
-    old_line = yylineno  ;
-    yylineno = line_pos_1;
-  }
-
-  if (TRACEON) printf("yylex returned %d\n", value);
-  return (value);
-}
- 
-
-static int yyerror(s)
-        char   *s;
-{
-  /* Message(s,0); empty at the moment, generate false error report?
-     to be modified later */
-  return 1;  /* PHB needed a return val, 1 seems ok */
-}
-
-
-/*  primary :- primary [ expr_vector ]
- *  <1> check the LHS format
- *  <2> return : NO if incorrect format at LHS
- *               ID_ONLY if LHS only have id format (including multiple id)
- *               RANGE_APPEAR if LHS format owns both id and range_list
- */
-
-static
-PTR_LLND check_array_id_format(ll_ptr,state)
-int *state;
-PTR_LLND ll_ptr ;
-
-{   PTR_LLND temp,temp1;
-
-      temp = ll_ptr;
-      switch (NODE_CODE(ll_ptr)) {
-      case VAR_REF :
-                     *state = ID_ONLY ;
-                     return(ll_ptr);
-      case ARRAY_REF :
-                     temp1 = Follow_Llnd(NODE_OPERAND0(ll_ptr),2);
-                     *state = RANGE_APPEAR;
-                     return(temp1);
-      case  ARRAY_OP:temp1 = Follow_Llnd(NODE_OPERAND1(ll_ptr),2);
-                     *state =RANGE_APPEAR ;
-                     return(temp1);
-        default :    *state = ARRAY_OP_NEED ;
-                     return(temp);
-      }
-  }
-
-static
-int
-map_assgn_op(value)
-int value;
-{
-  switch (value) {
-  case ((int) PLUS_EXPR) :
-      return(PLUS_ASSGN_OP);
-  case ((int) MINUS_EXPR):
-      return(MINUS_ASSGN_OP);
-  case ((int) BIT_AND_EXPR):
-      return(AND_ASSGN_OP);
-  case ((int) BIT_IOR_EXPR):
-      return(IOR_ASSGN_OP);
-  case ((int) MULT_EXPR):
-      return(MULT_ASSGN_OP);
-  case ((int) TRUNC_DIV_EXPR):
-      return(DIV_ASSGN_OP);
-  case ((int) TRUNC_MOD_EXPR):
-      return(MOD_ASSGN_OP);
-  case ((int) BIT_XOR_EXPR):
-      return(XOR_ASSGN_OP);
-  case ((int) LSHIFT_EXPR):
-      return(LSHIFT_ASSGN_OP);
-  case ((int) RSHIFT_EXPR):
-      return(RSHIFT_ASSGN_OP);
-  }
-return 0;
-}
-
-PTR_HASH 
-look_up_type(st, ip)
-     char *st;
-     int *ip;
-{
-  char *pt;
-  
-  pt =  (char *) xmalloc(strlen(st) +1);
-  strcpy(pt,st);
- /* dummy, to be cleaned */
-  return (PTR_HASH) pt;
-}
-
-
-PTR_HASH 
-look_up(st)
-     char *st;
-{
-  char *pt;
-  
-  pt =  (char *)  xmalloc(strlen(st) +1);
-  strcpy(pt,st);
- /* dummy, to be cleaned */
-  return (PTR_HASH)  pt;
-}
-
-static char MYGETC()
-{
-  
-  if (LENSTRINGTOPARSE <= PTTOSTRINGTOPARSE)
-	return EOF;
-
-  if (STRINGTOPARSE[ PTTOSTRINGTOPARSE] == '\0')
-    {
-      PTTOSTRINGTOPARSE++;
-      return EOF;
-    }
-  
-  PTTOSTRINGTOPARSE++;
-  return STRINGTOPARSE[ PTTOSTRINGTOPARSE-1];
-}
-
-static char unMYGETC(char c)
-{
-  if (LENSTRINGTOPARSE <= PTTOSTRINGTOPARSE)
-    return EOF;
-
-  if (PTTOSTRINGTOPARSE >0)
-    PTTOSTRINGTOPARSE --;
-  STRINGTOPARSE[ PTTOSTRINGTOPARSE] = c;
-  return c;
-}
-
-
-/* CurrentScope should be the last in the list */
-static char *sectionkeyword[] =
-  { "NextStmt",
-    "NextAnnotation",      
-    "EveryWhere",
-    "Follow",
-/* keep it last*/  "CurrentScope"};
-
-
-static PTR_LLND
-look_up_section(str)
- char *str;
-{ int i;
-  PTR_LLND pt = NULL;
-
-  for (i = 0; i < RID_MAX; i++)
-    {
-      if (strcmp(sectionkeyword[i], str) == 0)
-	{
-	  pt  = (PTR_LLND) newNode(STRING_VAL);
-	  NODE_STRING_POINTER(pt) = (char *) xmalloc(strlen(str) +1);
-	  strcpy(NODE_STRING_POINTER(pt),str);
-	  return pt;
-	}
-      if (strcmp(sectionkeyword[i],"CurrentScope") == 0)
-	return NULL;
-    }
-  
-  return NULL;
-}
-
-
-/* Dummy should be the last in the list */
-static char *specialfunction[] =
-  { "ListOfAn",
-    "Align",
-    "Induction",
-    "Used",
-    "Modified",
-    "Alias",
-    "Permutation",
-    "Assert",
-/* keep it last*/  "Dummy"};
-
-static int
-look_up_specialfunction(str)
- char *str;
-{ int i;
-
-  for (i = 0; i < RID_MAX; i++)
-    {
-      if (strcmp(specialfunction[i], str) == 0)
-	{
-	  return TRUE;
-	}
-      if (strcmp(specialfunction[i],"Dummy") == 0)
-	return 0;
-    }
-  
-  return 0;
-}
-
-
-static int 
-Recog_My_Token(str)
-char *str;
-{
-
-  if (strcmp("FromAnn",str) == 0)
-    return FROMT;
-
-  if (strcmp("ToAnn",str) == 0)
-    return TOT;
-
-   if (strcmp("ToLabel",str) == 0)
-    return TOTLABEL;
-
-  if (strcmp("ToFunction",str) == 0)
-    return TOFUNCTION;
-
-  if (strcmp("Define",str) == 0)
-    return DefineANN;
-
-  return -1;
-}
-
-
-PTR_SYMB
-Look_For_Symbol_Ann(code,name,type)
-     int code;
-     char *name;
-     PTR_TYPE type;
-{
-  PTR_SYMB symb;
-  char temp1[256];
-
-  strcpy(temp1, AnnExTensionNumber);
-  strncat(temp1,name,255);
-
-  if ((symb = getSymbolWithName(temp1, ANNOTATIONSCOPE)))
-    return symb;
-
-  if ((symb = getSymbolWithName(name, ANNOTATIONSCOPE)))
-    return symb;
-
-  return  newSymbol (code,name,type);
-}
- 
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/comments.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/comments.c
deleted file mode 100644
index 5159ce6..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/comments.c
+++ /dev/null
@@ -1,694 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993,1995             */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* Created By Jenq-Kuen Lee  April 14, 1988     */
-/* A Sub-program to help yylex() catch all the comments */
-/* A small finite automata used to identify the input token corresponding to */
-/* Bif node position */
-
-#include <stdio.h>
-#include "vparse.h"
-#include "vpc.h"
-#include "db.h"
-#include "vextern.h"
-#include "annotate.tab.h"
-
-extern void Message(char *s, int l);
-
-void reset_semicoln_handler();
-void reset();
-int class_struct(int value);
-int is_declare(int value);
-int declare_symb(int value);
-int block_like(int state);
-int keep_original(int state);
-
-int lastdecl_id; /* o if no main_type appeared */
-int left_paren ;
-static int cur_state ;
-int cur_counter;
-
-struct {
-         PTR_CMNT stack[MAX_NESTED_SIZE];
-         int      counter[MAX_NESTED_SIZE];
-	 int      node_type[MAX_NESTED_SIZE];
-	 int      automata_state[MAX_NESTED_SIZE];
-         int      top ;
-       }  comment_stack ;
-
-
-struct {
-         PTR_CMNT stack[MAX_NESTED_SIZE + 1 ];
-         int      front ;
-         int      rear ;
-       }  comment_queue;
-
-struct {
-         int      line_stack[MAX_NESTED_SIZE + 1 ];
-	 PTR_FNAME file_stack[MAX_NESTED_SIZE + 1 ];
-         int      front ;
-         int      rear ;
-	 int      BUGGY[100]; /* This is included because some versions of
-                                 gcc seemed to have bugs that overwrite
-                                 previous fields without.  */
-       }  line_queue;
-
-
-PTR_FNAME find_file_entry()
-{
-  /* dummy, should not be use after cleaning */
-  return NULL;
-}
-
-
-void put_line_queue(line_offset,name)
-int line_offset ;
-char *name;
-{  PTR_FNAME find_file_entry();
-
-   if (line_queue.rear == MAX_NESTED_SIZE) line_queue.rear = 0;
-   else line_queue.rear++;
-   if (line_queue.rear == line_queue.front) Message("stack/queue overflow",0);
-   line_queue.line_stack[line_queue.rear] = line_offset ;
-   line_queue.file_stack[line_queue.rear] = find_file_entry(name);
-}
-
-
-PTR_FNAME
-fetch_line_queue(line_ptr )
-int *line_ptr;
-{
-   if (line_queue.front == line_queue.rear)
-     { *line_ptr = line_queue.line_stack[line_queue.front] ;
-       return(line_queue.file_stack[line_queue.front]);
-     }
-   if (line_queue.front == MAX_NESTED_SIZE) line_queue.front = 0;
-   else line_queue.front++;
-   *line_ptr = line_queue.line_stack[line_queue.front] ;
-   return(line_queue.file_stack[line_queue.front]);
-}
-
-
-void push_state()
-{
-  comment_stack.top++;
-  comment_stack.stack[  comment_stack.top ] = cur_comment ;
-  comment_stack.counter[  comment_stack.top ] = cur_counter ;
-  comment_stack.automata_state[  comment_stack.top ] = cur_state ;
-}
-
-void pop_state()
-{  
-  
-   cur_comment  =  comment_stack.stack[  comment_stack.top ] ;
-   cur_counter =  comment_stack.counter[  comment_stack.top ] ;
-   cur_state  =  comment_stack.automata_state[  comment_stack.top ]  ;
-   comment_stack.top--;
-	
-}
-
-void init_stack()
-{
-  comment_stack.top = 0 ;
-  comment_stack.automata_state[  comment_stack.top ] = ZERO;
-}
-
-
-
-void automata_driver(value)
-int value ;
-{
- int shift_flag  ;
- int temp_state ;
-
-
-
- for (shift_flag = ON  ; shift_flag==ON ;    )
-{  shift_flag = OFF ;
-
-   switch(cur_state) {
-
-   case ZERO :
-
-             switch (value) {
-             case IF :
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = IF_STATE;
-                   break ;
-	     case ELSE :
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = ELSE_EXPECTED_STATE ;
-                   break;
-             case DO :
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = DO_STATE ;
-		   break;
-	     case FOR :
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = FOR_STATE ;
-		   break;
-             case CASE :
-             case DEFAULT_TOKEN:
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = CASE_STATE;
-                   break;
-             case GOTO :
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = GOTO_STATE;
-		   break;
-             case WHILE :
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = WHILE_STATE;
-		   break;
-             case SWITCH:
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = SWITCH_STATE;
-		   break;
-	     case COEXEC :
-                   cur_state = COEXEC_STATE ;
-                   put_line_queue(line_pos_1,line_pos_fname); 
-		   break;
-	     case COLOOP:
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = COLOOP_STATE ;
-		   break;
-	     case RETURN:
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = RETURN_STATE ;
-		   break;
-             case '}':
-                   pop_state();
-		   switch (cur_state) {
-		   case ELSE_EXPECTED_STATE:
-		     put_line_queue(line_pos_1,line_pos_fname); 
-		     break;
-		   case STATE_4:
-		   case BLOCK_STATE:
-		     put_line_queue(line_pos_1,line_pos_fname); 
-		     reset();
-		     reset_semicoln_handler();
-		     break;
-		   case IF_STATE_4:
-		     cur_state= ELSE_EXPECTED_STATE;
-		     put_line_queue(line_pos_1,line_pos_fname); 
-		     break;
-		   case DO_STATE_1:
-		     cur_state= DO_STATE_2;
-		     reset_semicoln_handler();
-		     break;
-		   case DO_STATE_2:
-		   case STATE_2:
-		     break;
-		   default:
-		     reset();
-		     reset_semicoln_handler();
-		   }
-
-                   break ;
-
-		 case '{':    
-                   temp_state=comment_stack.automata_state[comment_stack.top];
-                   if (temp_state == STATE_ARG)
-		      comment_stack.automata_state[comment_stack.top]= STATE_4;
-                   else {   cur_state = BLOCK_STATE ;
-                            put_line_queue(line_pos_1,line_pos_fname); 
-                            push_state();
-			  }
-                   reset();
-                   break ;
-             case '(':
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = STATE_15;
-                   left_paren++;
-                   break;
-             case IDENTIFIER:
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   cur_state = STATE_6 ;
-		   break;
-             case ';':
-		   reset_semicoln_handler();
-		   break;
-             default : /* other */
-                   put_line_queue(line_pos_1,line_pos_fname); 
-                   if (class_struct(value)) cur_state = STATE_10 ;
-                   else                     cur_state =  STATE_1 ; 
-                   break;
-		 }
-              break;
-  case STATE_1 :
-          if (value == '(')     {   cur_state =STATE_15 ;
-                                    left_paren++;
-				  }
-          if (class_struct(value))  cur_state =STATE_10 ;
-          if (value == IDENTIFIER)  cur_state =STATE_2 ;
-          if (value == OPERATOR)    cur_state =STATE_4 ;
-	  if (value ==';')  reset_semicoln_handler();
-	     break ;
-
-  case STATE_2 :
-          if (value == '(')    {    cur_state = STATE_15 ;
-				    left_paren++;
-				  }
-	  if (value ==';')  { 
-	    reset();
-	    reset_semicoln_handler();
-	  }
-          break;
-
-  case STATE_4:
-          switch (value) {
-          case  '(':
-                 cur_state =  STATE_15 ;
-                 left_paren++;
-		 break;
-          case '{':         /*  cur_state = STATE_5; */
-	         push_state();
-                 reset();
-		 break;
-	  case  '=':
-          case  ',':
-                 cur_state = STATE_12;
-                 break;
-	       case  ';':
-		 reset_semicoln_handler();
-		 break;
-          default:
-              if (is_declare(value))
-	        {  cur_state = STATE_ARG ;
-                   push_state();
-		   reset();
-		 }
-	      else      cur_state = STATE_12;
-	     }
-	   
-          break;
-   case STATE_6:
-          if (value == ':') cur_state = ZERO;
-          else {
-	    if (value ==';') reset_semicoln_handler();
-	    else {  cur_state = STATE_2;
-                      shift_flag = ON ;
-		    }
-	  }
-          break;
-  case STATE_10 :
-          if (value =='{')
-	    { cur_state = STATE_2 ;
-	      push_state();
-	      reset();
-	    }
-          if ((value == '=' )||(value ==','))  cur_state = STATE_12;
-	  if (value == '(' )    {     cur_state = STATE_15;
-					 left_paren++;
-				       }
-	  if (value ==';') reset_semicoln_handler();
-	  break ;
-  case STATE_12:
-	  if (value ==';') reset_semicoln_handler();
-           break ;
-
-  case  STATE_15 :
-           if (value == '(') left_paren++ ;
-           if (value == ')')  left_paren--;
-           if (left_paren == 0) cur_state = STATE_4 ;
-           break ;
-  case IF_STATE:
-           if (value == '(') { left_paren++;
-                               cur_state = IF_STATE_2;
-			     }
-           break;
-  case IF_STATE_2:
-           if (value == '(') left_paren++ ;
-           if (value == ')')  left_paren--;
-           if (left_paren == 0) cur_state = IF_STATE_3 ;
-           break ;
-  case IF_STATE_3:
-	     if (value == ';') {
-	       put_line_queue(line_pos_1,line_pos_fname); 
-	       cur_state= ELSE_EXPECTED_STATE ;
-	     }
-           if (value =='{') {  cur_state= ELSE_EXPECTED_STATE ;
-                               push_state();
-			       cur_state = ZERO ; /* counter continuing */
-			     }
-           if (cur_state == IF_STATE_3) 
-	     {  cur_state = IF_STATE_4 ;
-                push_state();
-                reset();
-		shift_flag = ON;
-	      }
-           break;
-
-  case ELSE_EXPECTED_STATE:
-           if (value == ELSE) cur_state = BLOCK_STATE ;
-           else  { 
-	     reset();
-	     reset_semicoln_handler();
-	     shift_flag = ON ;
-	   }
-           break;
-
-  case BLOCK_STATE:
-	  if (value ==';') {
-	    cur_state =  BLOCK_STATE_WAITSEMI;
-	    push_state();
-	    reset_semicoln_handler();
-	  }
-	  if (value == '{') { push_state();
-			      reset();
-			    }
-          if (cur_state == BLOCK_STATE)
-	    {  
-	      cur_state =  BLOCK_STATE_WAITSEMI;
-	      push_state();
-	      reset();
-	      shift_flag = ON ;
-	    }
-	  break;
-	     
-  case WHILE_STATE:
-           if (value == '('){ left_paren++;
-                              cur_state = WHILE_STATE_2;
-			    }
-           break;
-  case WHILE_STATE_2:
-           if (value == '(') left_paren++ ;
-           if (value == ')')  left_paren--;
-           if (left_paren == 0) cur_state = BLOCK_STATE ;
-           break ;
-
-  case FOR_STATE:
-           if (value == '(') { left_paren++;
-                               cur_state = FOR_STATE_2;
-			     }
-           break;
-  case FOR_STATE_2:
-           if (value == '(') left_paren++ ;
-           if (value == ')')  left_paren--;
-           if (left_paren == 0) cur_state = BLOCK_STATE ;
-           break ;
-
-  case COLOOP_STATE:
-           if (value == '(') { left_paren++;
-			       cur_state = COLOOP_STATE_2;
-			     }
-           break;
-  case COLOOP_STATE_2:
-           if (value == '(') left_paren++ ;
-           if (value == ')')  left_paren--;
-           if (left_paren == 0) cur_state = BLOCK_STATE ;
-           break ;
-
-  case COEXEC_STATE:
-           if (value == '(') { left_paren++;
-			       cur_state = COEXEC_STATE_2;
-			     }
-           break;
-  case COEXEC_STATE_2:
-           if (value == '(') left_paren++ ;
-           if (value == ')')  left_paren--;
-           if (left_paren == 0) cur_state = BLOCK_STATE ;
-           break ;
-
-  case SWITCH_STATE:
-           if (value == '(') { left_paren++;
-			       cur_state = SWITCH_STATE_2;
-			     }
-           break;
-  case SWITCH_STATE_2:
-           if (value == '(') left_paren++ ;
-           if (value == ')')  left_paren--;
-           if (left_paren == 0) cur_state = BLOCK_STATE ;
-           break ;
-
-  case CASE_STATE :
-           if (value == ':') reset();
-           break;
-  case DO_STATE : /* Need More, some problem exists */
-           if (value == ';') { cur_state = DO_STATE_2 ; }
-           if (value == '{') { cur_state = DO_STATE_2 ;
-                               push_state();
-                               reset();
-			     }
-           if (cur_state == DO_STATE)
-	     { cur_state = DO_STATE_1 ;
-	       push_state();
-	       reset();
-	       shift_flag = ON;
-	     }
-           break;
-   case DO_STATE_2:
-           if (value == WHILE) cur_state= DO_STATE_3 ;
-           break ;
-   case DO_STATE_3:
-	   if (value == '(') { cur_state = DO_STATE_4 ; 
-                               left_paren++;
-			     }
-           break;
-   case DO_STATE_4:
-           if (value == '(') left_paren++ ;
-           if (value == ')')  left_paren--;
-           if (left_paren == 0) cur_state = DO_STATE_5 ;
-           break ;
-   case DO_STATE_5:
-	  if (value ==';') 
-	    { 
-	      put_line_queue(line_pos_1,line_pos_fname); 
-	      reset();
-	      reset_semicoln_handler();
-	    }
-           break;
-   case RETURN_STATE:
-	  if (value ==';') reset_semicoln_handler();
-	  if (value == '(') { left_paren++;
-                                cur_state = RETURN_STATE_2 ;
-			     }
-           break;
-   case RETURN_STATE_2:
-           if (value == '(') left_paren++ ;
-           if (value == ')')  left_paren--;
-           if (left_paren == 0) cur_state = RETURN_STATE_3 ;
-           break ;
-   case RETURN_STATE_3:
-	     if (value ==';') reset_semicoln_handler();
-           break;
-   case GOTO_STATE:
-           if (value == IDENTIFIER) cur_state = GOTO_STATE_2 ;
-           break;
-   case GOTO_STATE_2:
-	     if (value ==';') reset_semicoln_handler();
-           break;
-   default:
-           Message(" comments state un_expected...",0);
-           break;
-	   }
-
-
- }
-
-}
-
-int class_struct(int value)
-{
-  switch (value) {
-  case ENUM :
-  case CLASS:
-  case STRUCT :
-  case UNION: return(1);
-  default : return(0);
-  }
-}
-
-int declare_symb(int value)
-{
-  switch (value) {
-  case TYPENAME :
-  case TYPESPEC:
-  case TYPEMOD:
-  case ACCESSWORD:
-  case SCSPEC:
-  case ENUM :
-  case CLASS:
-  case STRUCT :
-  case UNION: return(1);
-  default : return(0);
-  }
-}
-
-
-void reset()
-{
-   cur_state = 0 ;
-   cur_counter = 0 ;
-   cur_comment     = (PTR_CMNT) NULL ; 
-
-/*   put_line_queue(line_pos_1,line_pos_fname); */
- }
-
-int block_like(int state)
-{
-
-   switch( state) {
-   case BLOCK_STATE:
-   case ZERO:
-   case SWITCH_STATE:
-   case FOR_STATE :
-   case WHILE_STATE :
-   case COEXEC_STATE :
-   case COLOOP_STATE:
-   case STATE_4: /* end of function_body */
-            return(1);
-   default: return(0);
- }
-}
-
-int is_declare(int value)
-{
-  switch (value) {
-  case   TYPENAME:
-  case   TYPESPEC :
-  case   ACCESSWORD:
-  case   SCSPEC:
-  case   TYPEMOD:
-  case   ENUM:
-  case   UNION:
-  case   CLASS:
-  case   STRUCT:  return(1);
-    default :     return(0);
-  }
-}
-
-
-
-/* pop state until reach a stable state BLOCK_STATE or ZERO        */
-void reset_semicoln_handler()
-{
-  int sw,state;
-
-  for (sw=1; sw;  )
-    {
-      if (keep_original(cur_state)) return;
-      state = comment_stack.automata_state[comment_stack.top];
-      switch (state) {
-      case IF_STATE_4:
-	pop_state();
-	cur_state = ELSE_EXPECTED_STATE ;
-	put_line_queue(line_pos_1,line_pos_fname); 
-	break;
-      case  DO_STATE_1:
-	pop_state();
-	cur_state = DO_STATE_2 ;
-	break;
-      case BLOCK_STATE_WAITSEMI:
-	put_line_queue(line_pos_1,line_pos_fname); 
-	pop_state();
-	reset();
-	break;
-      default :
-	reset();
-	sw = 0 ;
-      }
-    }
-
-}
-
-
-int keep_original(int state)
-{
-  switch (state) {
-  case ELSE_EXPECTED_STATE:
-  case DO_STATE_2:
-  case STATE_2:
-       return(1);
- default:
-       return(0);
-     }
-}
-
-
-
-
-
-/*****************************************************************************/
-/* is_at_decl_state() & is_look_ahead_of_identifier()                        */
-/* These two routines are used in yylex to identify if a TYPENAME is just    */
-/* a IDENTIFIER                                                              */
-/*                                                                           */
-/*****************************************************************************/
-int
-is_at_decl_state()
-{
-
-  /* to see if it is inside (, )  */
-  switch(cur_state) {
-  case STATE_15:
-  case IF_STATE_2:
-  case WHILE_STATE_2:
-  case FOR_STATE_2:
-  case COLOOP_STATE_2:
-  case COEXEC_STATE_2:
-  case SWITCH_STATE_2:
-  case DO_STATE_4:
-    return(0);
-  default:
-    return(1);
-  }
-}
-
-
-int is_look_ahead_of_identifier(c)
-char c;
-{
-  switch (c) {
-  case ':' :
-  case '(':
-  case '[':
-  case ',':
-  case ';':
-  case '=':
-    return(1);
-  default:
-    return(0);
-  }
-
-}
-
-
-void set_up_momentum(value,token)
-int value,token;
-{
-
-  if (lastdecl_id == 0)
-    {
-      /* check if main_type appears */
-       switch (value) {
-       case TYPESPEC:
-	 lastdecl_id = 1;
-	 break;
-       case TYPEMOD:
-	 if ((token == (int)RID_LONG)||(token == (int)RID_SHORT)||
-	     (token==(int)RID_SIGNED)||(token==(int)RID_UNSIGNED))
-         lastdecl_id = 1;
-	 break;
-       }
-     }
-  else
-    {
-      /* case for main_type already appear, then check if 
-	 1. this is still a decl.
-	 2. reset it to wait for another decl stat.   */
-      switch (value) {
-      case TYPESPEC:
-      case TYPEMOD:
-      case SCSPEC:
-	break;
-      default:
-	lastdecl_id = 0;
-      }
-    }
-
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/low_level.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/low_level.c
deleted file mode 100644
index 320bb45..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/low_level.c
+++ /dev/null
@@ -1,9147 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/* This file is used to automatically generate a "#include" header */
-/* 
-mkCextern $SAGEROOT/lib/newsrc/low_level.c > ! $SAGEROOT/lib/include/ext_low.h
-mkC++extern $SAGEROOT/lib/newsrc/low_level.c > ! $SAGEROOT/lib/include/extcxx_low.h
-*/
-
-#include <stdio.h>
-
-#include <stdlib.h>
-#include <stdarg.h> /* ANSI variable argument header */
-#include <ctype.h>
-
-#include "compatible.h"   /* Make different system compatible... (PHB) */
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#include "vpc.h"
-#include "macro.h"
-#include "ext_lib.h"
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-extern void removeFromCollection(void *pointer);
-#endif
-
-#define MAX_FILE 1000 /*max number of files in a project*/
-#define MAXFIELDSYMB 10
-#define MAXFIELDTYPE 10
-#define MAX_SYMBOL_FOR_DUPLICATE 1000
-char Current_File_name[256];
-
-int debug =NO; /* used in db.c*/
-
-PTR_FILE pointer_on_file_proj;
-static int number_of_bif_node = 0;
-int number_of_ll_node = 0; /* this counters are useless anymore ??*/
-static int number_of_symb_node  = 0;
-static int number_of_type_node = 0;
-char  *default_filename;
-int Warning_count = 0;
-
-/* FORWARD DECLARATIONS (phb) */
-int buildLinearRepSign();
-int makeLinearExpr_Sign();
-int getLastLabelId();
-int isItInSection();
-int Init_Tool_Box();
-void Message();
-
-PTR_BFND rec_num_near_search();
-PTR_BFND Redo_Bif_Next_Chain_Internal();
-PTR_SYMB duplicateSymbol();
-void Redo_Bif_Next_Chain();
-PTR_LABEL getLastLabel();
-PTR_BFND getNodeBefore ();
-char *filter();
-PTR_BFND getLastNodeList();
-int *evaluateExpression();
-PTR_SYMB duplicateSymbolOfRoutine();
-void SetCurrentFileTo();
-void UnparseProgram_ThroughAllocBuffer();
-void updateTypesAndSymbolsInBodyOfRoutine();
-
-extern int write_nodes();
-extern char* Tool_Unparse2_LLnode(); 
-extern void Init_Unparser();
-extern void Set_Function_Language();
-extern void Unset_Function_Language();
-extern char* Tool_Unparse_Bif ();
-extern char* Tool_Unparse_Type();
-extern void BufferAllocate();
-
-int out_free_form;
-int out_upper_case;
-int out_line_unlimit;
-int out_line_length; // out_line_length = 132 for -ffo mode; out_line_length = 72 for -uniForm mode
-PTR_SYMB last_file_symbol;
-
-static int CountNullBifNext = 0; /* for internal debugging */
-
-/* records propoerties and type of node */
-char node_code_type[LAST_CODE];
-/* Number of argument-words in each kind of tree-node.  */
-int node_code_length[LAST_CODE];
-enum typenode node_code_kind[LAST_CODE];
-/* special table for infos on type and symbol */
-char info_type[LAST_CODE][MAXFIELDTYPE];
-char info_symb[LAST_CODE][MAXFIELDSYMB];
-char general_info[LAST_CODE][MAXFIELDSYMB];
-/*static struct bif_stack_level   *stack_level = NULL;*/
-/*static struct bif_stack_level *current_level = NULL;*/
-
-PTR_BFND  getFunctionHeader();
-
-/*****************************************************************************
- *                                                                           *
- *                   Procedure of general use                                *
- *                                                                           *
- *****************************************************************************/
-
-/* Modified to return a pointer (64bit clean) (phb) */
-/***************************************************************************/
-char* xmalloc(int size)
-{
-  char *val;
-  val = (char *) malloc (size);
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,val, 0);  
-#endif
-  if (val == 0)
-    Message("Virtual memory exhausted (malloc failed)",0);
-  return val;
-}
-
-/* list of allocated data */
-static ptstack_chaining Current_Allocated_Data = NULL;
-static ptstack_chaining First_STACK= NULL;
-
-/***************************************************************************/
-void make_a_malloc_stack()
-{
-  ptstack_chaining pt;
-    
-  pt = (ptstack_chaining) malloc(sizeof(struct stack_chaining));
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,pt, 0);
-#endif
-  if (!pt)
-    {
-      Message("sorry : out of memory\n",0);
-      exit(1);
-    }
-  
-  if (Current_Allocated_Data)
-    Current_Allocated_Data->next = pt;
-  pt->first = NULL;
-  pt->last = NULL;
-  pt->prev = Current_Allocated_Data;
-  if (Current_Allocated_Data)
-    pt->level = Current_Allocated_Data->level +1;
-  else
-    pt->level = 0;
-/*  printf("make_a_malloc_stack %d \n",pt->level);*/
-  Current_Allocated_Data = pt;
-  if (First_STACK == NULL)
-    First_STACK = pt;
-}
-
-/***************************************************************************/
-void myfree()
-{
-  ptstack_chaining pt;
-  ptchaining pt1, pt2;
-  if (!Current_Allocated_Data)
-     {
-      Message("Stack not defined\n",0);
-      exit(1);
-    }
-
-  pt2 = Current_Allocated_Data->first;
-
-/*  printf("myfree %d \n", Current_Allocated_Data->level);*/
-  while (pt2)
-    {
-#ifdef __SPF
-      removeFromCollection(pt2->zone);
-#endif
-      free(pt2->zone);
-      pt2->zone = 0;
-      pt2 = pt2->list;
-    }
-
-  pt2 = Current_Allocated_Data->first;
-  while (pt2)
-    {
-      pt1 = pt2;
-      pt2 = pt2->list;
-#ifdef __SPF
-      removeFromCollection(pt1);
-#endif
-      free(pt1);
-    } 
-  pt = Current_Allocated_Data;
-  Current_Allocated_Data = pt->prev;
-  Current_Allocated_Data->next = NULL;
-#ifdef __SPF
-  removeFromCollection(pt);
-#endif
-  free(pt);
-}
-
-
-/***************************************************************************/
-char* mymalloc(int size)
-{
-  char *pt1;
-  ptchaining pt2;
-  if (!Current_Allocated_Data)
-    {
-      Message("Allocated Stack not defined\n",0);
-      exit(1);
-    }
-
-/*  if (Current_Allocated_Data->level > 0)
-    printf("mymalloc  %d \n", Current_Allocated_Data->level); */
-  pt1 = (char *) malloc(size);
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,pt1, 0);
-#endif
-  if (!pt1)
-    {
-      Message("sorry : out of memory\n",0);
-      exit(1);
-    }
- 
-  pt2 = (ptchaining) malloc(sizeof(struct chaining));
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,pt2, 0);
-#endif
-  if (!pt2 )
-    {
-      Message("sorry : out of memory\n",0);
-      exit(1);
-    }
-  
-  pt2->zone = pt1;
-  pt2->list = NULL;
-
-  if (Current_Allocated_Data->first == NULL)
-    Current_Allocated_Data->first = pt2;
-  
-  if (Current_Allocated_Data->last == NULL)
-    Current_Allocated_Data->last = pt2;
-  else
-    {
-      Current_Allocated_Data->last->list = pt2;
-      Current_Allocated_Data->last = pt2;
-    }
-  return pt1;
-}
-
-/***************** Provides infos on nodes ********************************
- *                                                                        *
- *     based on the table info in include dir *.def                       *
- *                                                                        *
- **************************************************************************/
-
-/***************************************************************************/
-int isATypeNode(variant)
-int variant;
-{
-  return (TYPENODE == (int) node_code_kind[variant]);
-}
-
-/***************************************************************************/
-int isASymbNode(variant)
-int variant;
-{
-  return (SYMBNODE == (int) node_code_kind[variant]);
-}
-
-/***************************************************************************/
-int isABifNode(variant)
-int variant;
-{
-  return (BIFNODE == (int) node_code_kind[variant]);
-}
-
-/***************************************************************************/
-int isALoNode(variant)
-int variant;
-{
-  return (LLNODE == (int) node_code_kind[variant]);
-}
-
-/***************************************************************************/
-int hasTypeBaseType(variant)
-int variant;
-{
-    if (!isATypeNode(variant))
-    {
-#if !__SPF
-        Message("hasTypeBaseType not applied to a type node", 0);
-#endif
-        return FALSE;
-    }
-    if (info_type[variant][2] == 'b')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int isStructType(variant)
-int variant;
-{
-    if (!isATypeNode(variant))
-    {
-#if !__SPF
-        Message("isStructType not applied to a type node", 0);
-#endif
-        return FALSE;
-    }
-    if (info_type[variant][0] == 's')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int isPointerType(variant)
-int variant;
-{
-    if (!isATypeNode(variant))
-    {
-#if !__SPF
-        Message("isPointerType not applied to a type node", 0);
-#endif
-        return FALSE;
-    }
-    if (info_type[variant][0] == 'p')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int isUnionType(variant)
-int variant;
-{
-    if (!isATypeNode(variant))
-    {
-#if !__SPF
-        Message("isUnionType not applied to a type node", 0);
-#endif
-        return FALSE;
-    }
-    if (info_type[variant][0] == 'u')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-/***************************************************************************/
-int isEnumType(variant)
-int variant;
-{
-    if (!isATypeNode(variant))
-    {
-#if !__SPF
-        Message("EnumType not applied to a type node", 0);
-#endif
-        return FALSE;
-    }
-    if (info_type[variant][0] == 'e')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-/***************************************************************************/
-int hasTypeSymbol(variant)
-int variant;
-{
-    if (!isATypeNode(variant))
-    {
-#if !__SPF
-        Message("hasTypeSymbol not applied to a type node", 0);
-#endif
-        return FALSE;
-    }
-    if (info_type[variant][1] == 's')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int isAtomicType(variant)
-int variant;
-{
-    if (!isATypeNode(variant))
-    {
-#if !__SPF
-        Message("isAtomicType not applied to a type node", 0);
-#endif
-        return FALSE;
-    }
-    if (info_type[variant][0] == 'a')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int hasNodeASymb(variant)
-int variant;
-{
-    if ((!isABifNode(variant)) && (!isALoNode(variant)))
-    {
-#if !__SPF
-        Message("hasNodeASymb not applied to a bif or low level node", 0);
-#endif
-        return FALSE;
-    }
-    if (general_info[variant][2] == 's')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int isNodeAConst(variant)
-int variant;
-{
-    if ((!isABifNode(variant)) && (!isALoNode(variant)))
-    {
-#if !__SPF
-        Message("isNodeAConst not applied to a bif or low level node", 0);
-#endif
-        return FALSE;
-    }
-    if (general_info[variant][1] == 'c')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-
-/***************************************************************************/
-int isAStructDeclBif(variant)
-int variant;
-{
-    if (!isABifNode(variant))
-    {
-#if !__SPF
-        Message("isAStructDeclBif not applied to a bif", 0);
-#endif
-        return FALSE;
-    }
-    if (general_info[variant][1] == 's')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int isAUnionDeclBif(variant)
-int variant;
-{
-    if (!isABifNode(variant))
-    {
-#if !__SPF
-        Message("isAUnionDeclBif not applied to a bif", 0);
-#endif
-        return FALSE;
-    }
-    if (general_info[variant][1] == 'u')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int isAEnumDeclBif(variant)
-int variant;
-{
-    if (!isABifNode(variant))
-    {
-#if !__SPF
-        Message("isAEnumDeclBif not applied to a bif", 0);
-#endif
-        return FALSE;
-    }
-    if (general_info[variant][1] == 'e')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int isADeclBif(variant)
-int variant;
-{
-    if (!isABifNode(variant))
-    {
-#if !__SPF
-        Message("isADeclBif not applied to a bif", 0);
-#endif
-        return FALSE;
-    }
-    if (general_info[variant][0] == 'd')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-/***************************************************************************/
-int isAControlEnd(variant)
-int variant;
-{
-    if (!isABifNode(variant))
-    {
-#if !__SPF
-        Message("isAControlEnd not applied to a bif", 0);
-#endif
-        return FALSE;
-    }
-    if (general_info[variant][0] == 'c')
-        return TRUE;
-    else
-        return FALSE;
-}
-
-#ifdef __SPF
-extern void printLowLevelWarnings(const char *fileName, const int line, const wchar_t* messageR, const char *message, const int group);
-#endif
-/***************************************************************************/
-void Message(char *s, int l)
-{
-    if (l != 0)
-        fprintf(stderr, "Warning : %s line %d\n", s, l);
-    else
-        fprintf(stderr, "Warning : %s\n", s);
-    Warning_count++;
-#ifdef __SPF
-    if (l == 0)
-        l = 1;
-
-    printLowLevelWarnings(cur_file->filename, l, NULL, s, 4001);
-
-    if (strstr(s, "Error in"))
-    {
-        char buf[512];
-        sprintf(buf, "Internal error at line %d and file low_level.c\n", __LINE__);
-        addToGlobalBufferAndPrint(buf);
-        throw -1;
-    }
-#endif
-}
-
-
-/***************************************************************************/
-/* A set of functions for dealing with a free list for low_level node      */
-/***************************************************************************/
-
-static int ExpressionNodeInFreeList = 0;
-static ptstack_chaining expressionFreeNodeList = NULL;
-
-void setFreeListForExpressionNode()
-{
-  if (ExpressionNodeInFreeList) return;
-  
-  ExpressionNodeInFreeList = 1;
-  if (!expressionFreeNodeList)
-    {
-      expressionFreeNodeList = (ptstack_chaining) xmalloc(sizeof(struct stack_chaining));
-      expressionFreeNodeList->first = NULL;
-      expressionFreeNodeList->last = NULL;
-      expressionFreeNodeList->prev = NULL;
-      expressionFreeNodeList->level = 0;
-    }
-}
-
-
-void resetFreeListForExpressionNode()
-{
-  ExpressionNodeInFreeList = 0;
-}
-
-
-/* Added for garbage collection */
-void libFreeExpression(ll)
-     PTR_LLND ll;
-{
-  ptchaining  pt2;
-
-  if (!ExpressionNodeInFreeList) return;
-  if (!ll)  return;
-  if (!expressionFreeNodeList)
-     {
-      Message("Free list for expression node not defined\n",0);
-      exit(1);
-    }
-  pt2 = (ptchaining) xmalloc(sizeof(struct chaining));
-  pt2->zone = (char *) ll;
-  pt2->list = NULL;
-
-  if (expressionFreeNodeList->first == NULL)
-    expressionFreeNodeList->first = pt2;
-
-  if (expressionFreeNodeList->last == NULL)
-    expressionFreeNodeList->last = pt2;
-  else
-    {
-      expressionFreeNodeList->last->list = pt2;
-      expressionFreeNodeList->last = pt2;
-    }
-}
-
-char *allocateFreeListNodeExpression()
-{
-  char *pt;
-  ptchaining  pt2;
-
-  if (!ExpressionNodeInFreeList) return xmalloc(sizeof (struct llnd));
-  if (!expressionFreeNodeList)
-     {
-      Message("Free list for expression node not defined\n",0);
-      exit(1);
-    }
-  if (expressionFreeNodeList->first == NULL) return xmalloc(sizeof (struct llnd));
-  
-  pt2 = expressionFreeNodeList->first;
-  if (expressionFreeNodeList->first == expressionFreeNodeList->last)
-    {
-      expressionFreeNodeList->first = NULL;
-      expressionFreeNodeList->last = NULL;
-    } else
-      expressionFreeNodeList->first = pt2->list;
-  
-  pt = pt2->zone;
-#ifdef __SPF
-  removeFromCollection(pt2);
-#endif
-  free(pt2);
-  memset((char *) pt, 0 , sizeof (struct llnd));
-  return pt;
-}
-
-
-/***************************************************************************/
-POINTER newNode(code)
-     int code;
-{
-   PTR_BFND tb = NULL;
-   PTR_LLND tl = NULL;
-   PTR_TYPE tt = NULL;
-   PTR_SYMB ts = NULL;
-   PTR_LABEL tlab;
-   PTR_CMNT tcmnt;
-   PTR_BLOB tbl;
-   int length;
-   int kind;
-  
-   if (code == CMNT_KIND)
-   { /* lets create a comment */
-
-       length = sizeof(struct cmnt);
-       tcmnt = (PTR_CMNT)xmalloc(length);
-       memset((char *)tcmnt, 0, length);
-       CMNT_ID(tcmnt) = ++CUR_FILE_NUM_CMNT();
-       CMNT_NEXT(tcmnt) = PROJ_FIRST_CMNT();
-       PROJ_FIRST_CMNT() = tcmnt;
-       return (POINTER)tcmnt;
-   }
-
-  if (code == LABEL_KIND)
-    { /* lets create a label */
-      PTR_LABEL last;
-      
-      /* allocating space... PHB */
-      length = sizeof (struct Label); 
-      tlab = (PTR_LABEL) xmalloc(length);
-      memset((char *) tlab, 0, length);
-      LABEL_ID(tlab) = ++CUR_FILE_NUM_LABEL();
-
-      if ((last=getLastLabel())) /* is there an existing label? PHB */
-        {
-        LABEL_NEXT(last)=tlab;
-        return (POINTER) tlab;
-        }
-      else  /* There is no existing label, make one PHB */
-        {
-        LABEL_NEXT(tlab) = LBNULL;
-        PROJ_FIRST_LABEL() = tlab;  /* set pointer to first label */
-        return (POINTER) tlab;
-        }
-    }
-
-  if (code == BLOB_KIND)
-    { 
-      length = sizeof (struct blob);
-      tbl = (PTR_BLOB) xmalloc (length);
-      memset((char *) tbl, 0, length);
-      CUR_FILE_NUM_BLOBS()++; 
-      return (POINTER) tbl;
-    }
-  
-
-  kind = (int) node_code_kind[(int) code];
-  switch (kind)
-    {
-    case BIFNODE:
-      length = sizeof (struct bfnd);      
-      break;
-    case LLNODE :
-     length = sizeof (struct llnd);  
-      break;
-    case SYMBNODE:
-     length = sizeof (struct symb);  
-      break;
-    case TYPENODE:
-     length = sizeof (struct data_type);   
-      break;
-    default:
-      Message("Node inconnu",0);
-    }
-
-  switch (kind)
-    {
-    case BIFNODE:
-      tb = (PTR_BFND) xmalloc(length);
-      memset((char *) tb, 0, length);
-      BIF_ID (tb)  = ++CUR_FILE_NUM_BIFS ();
-      number_of_bif_node++;
-      /*BIF_ID (tb) = number_of_bif_node++;*/
-      BIF_CODE(tb) = code;
-      BIF_FILE_NAME(tb) = CUR_FILE_HEAD_FILE();/* recently added, to check */
-      CUR_FILE_CUR_BFND() = tb;
-      BIF_LINE(tb) = 0; /* set to know that this is a new node */ 
-      break;
-    case LLNODE :
-      if (ExpressionNodeInFreeList)
-        tl = (PTR_LLND) allocateFreeListNodeExpression();
-      else
-        {
-          tl = (PTR_LLND) xmalloc(length);
-          memset((char *) tl, 0, length);
-        }
-      NODE_ID (tl) = ++CUR_FILE_NUM_LLNDS();
-      NODE_NEXT (tl) = LLNULL;
-      number_of_ll_node++;
-      if (CUR_FILE_NUM_LLNDS() == 1)
-	PROJ_FIRST_LLND () = tl;
-      else
-	NODE_NEXT (CUR_FILE_CUR_LLND()) = tl;
-      CUR_FILE_CUR_LLND() = tl;
-      NODE_CODE(tl) = code;
-      break;
-    case SYMBNODE:
-      ts = (PTR_SYMB)  xmalloc(length); 
-      memset((char *) ts, 0, length);
-      number_of_symb_node++;
-      SYMB_ID (ts) = ++CUR_FILE_NUM_SYMBS();
-      SYMB_CODE(ts) = code;
-      if (CUR_FILE_NUM_SYMBS() == 1)
-	PROJ_FIRST_SYMB () =  ts;
-      else
-	SYMB_NEXT (CUR_FILE_CUR_SYMB()) = ts;
-      CUR_FILE_CUR_SYMB() = ts;
-      SYMB_NEXT (ts) = NULL;
-      SYMB_SCOPE (ts) = PROJ_FIRST_BIF();/* the default value */
-      break;
-    case TYPENODE:
-      /*tt = (PTR_TYPE) alloc_type ( cur_file ); xmalloc(length);
-      number_of_type_node++;
-      TYPE_ID (tt) = number_of_type_node++;
-      TYPE_NEXT (tt) = NULL;*/
-      
-      tt = (PTR_TYPE) xmalloc (length);
-      memset((char *) tt, 0, length);
-      number_of_type_node++;
-      TYPE_ID (tt) = ++CUR_FILE_NUM_TYPES();
-      TYPE_CODE (tt) = code;
-      TYPE_NEXT (tt) = NULL;
-      if (CUR_FILE_NUM_TYPES () == 1)
-        PROJ_FIRST_TYPE() = tt;
-      else 
-        TYPE_NEXT (CUR_FILE_CUR_TYPE()) = tt;
-      CUR_FILE_CUR_TYPE() = tt;
-      /* for VPC very ugly and should be removed later */
-      if (code == T_POINTER)  TYPE_TEMPLATE_DUMMY1(tt) = 1 ;
-      if (code == T_REFERENCE) TYPE_TEMPLATE_DUMMY1(tt) = 1 ;
-      break;
-    default:
-      Message("Node inconnu",0);
-    }
-
-
-  switch (kind)
-    {
-    case BIFNODE:
-      return (POINTER) tb; 
-    case LLNODE :
-      return (POINTER) tl;
-    case SYMBNODE:
-      return (POINTER) ts; 
-    case TYPENODE:
-      return (POINTER) tt;
-    default:
-      Message("Node inconnu",0);
-    }
-   return NULL;
-}
-
-/***************************************************************************/
-PTR_LLND copyLlNode(node)
-     PTR_LLND node;
-{
-   PTR_LLND t;
-   int code;
-  
-  if (!node)
-    return NULL;
-
-  code = NODE_CODE (node);
-  if (node_code_kind[(int) code] != LLNODE)
-    Message("bif_copy_node != low_level_node",0);
-
-  t = (PTR_LLND) newNode (code);
-  
-  NODE_SYMB(t)  = NODE_SYMB(node);
-  NODE_TYPE(t) = NODE_TYPE(node);
-  NODE_OPERAND0(t) = copyLlNode(NODE_OPERAND0(node));
-  NODE_OPERAND1(t) = copyLlNode(NODE_OPERAND1(node));
-  return t;
-}
-
-/***************************************************************************/
-PTR_LLND makeInt(low)
-     int low;
-{
-   PTR_LLND t =  (PTR_LLND) newNode(INT_VAL);
-  NODE_TYPE(t) = NULL;
-  NODE_INT_CST_LOW (t) = low;
-  return t;
-}
-
-/* Originally coded by fbodin, but the code used K&R varargs conventions,
-   I have rewritten the code to use ANSI conventions (phb) */
-/***************************************************************************/
-PTR_LLND newExpr(int code, PTR_TYPE ntype, ... )
-{
-  va_list p;
-  PTR_LLND t;
-  int length;
-
-  /* Create a new node of type 'code' */
-  t = (PTR_LLND) newNode(code);
-  NODE_TYPE(t) = ntype;
-
-  /* calculate the number of args required for this type of node */
-  length = node_code_length[code];
-
-  /* Set pointer p to the very first variable argument in list */
-  va_start(p,ntype);  
-
-  if (hasNodeASymb(code))
-    {
-      /* Extract third argument (type PTR_SYMB), inc arg pointer p */
-      PTR_SYMB arg0 = va_arg(p, PTR_SYMB);
-      NODE_SYMB(t) = arg0;
-    } 
-  if (length != 0)
-    {
-      if (length == 2)
-	{
-	  /* This is equivalent to the loop below, but faster.  */
-	  /* Extract another argument (type PTR_LLND), inc arg pointer p */
-	  PTR_LLND arg0 = va_arg(p, PTR_LLND);
-	  /* Extract another argument (type PTR_LLND), inc arg pointer p */
-	  PTR_LLND arg1 = va_arg(p, PTR_LLND);
-	  NODE_OPERAND0(t) = arg0;
-	  NODE_OPERAND1(t) = arg1;
-	  va_end (p);
-	  return t;
-	}
-      else 
-	if (length == 1)
-	  {
-	    /* This is equivalent to the loop below, but faster.  */
-	    /* Extract another argument (type PTR_LLND), inc arg pointer p */
-	    PTR_LLND arg0 = va_arg(p, PTR_LLND);
-	    NODE_OPERAND0(t) = arg0;
-	    va_end(p);
-	    return t;
-	  } else
-	    Message("A low level node have more than two operands",0);
-    }
-  va_end(p);
-  return t;
-}
-
-/***************************************************************************/
-PTR_SYMB newSymbol(code, name, type)
-     int code;
-     char *name;
-     PTR_TYPE type;
-{
-   PTR_SYMB t;
-  char *str;
-  
-  if(name){
-    str = (char *) xmalloc(strlen(name) +1);
-    strcpy(str,name);
-    }
-  else str=NULL;
-  t = (PTR_SYMB) newNode (code);
-  SYMB_IDENT (t) = str;
-  SYMB_TYPE (t) = type;
-  return t;
-}
-
-/***************************************************************************/
-int Check_Lang_C(proj)
-PTR_PROJ proj;
-{
-  PTR_FILE ptf;
-  PTR_BLOB ptb;
-  if (!proj)
-    return TRUE;
-  for (ptb = PROJ_FILE_CHAIN (proj); ptb ; ptb =  BLOB_NEXT (ptb))
-    {
-      ptf = (PTR_FILE) BLOB_VALUE (ptb);
-
-/*      if (debug)
-	fprintf(stderr,"%s\n",FILE_FILENAME (ptf)); */
-
-      if (FILE_LANGUAGE (ptf) != CSrc)
-	return(FALSE);
-    }
-  return(TRUE);
-}
-
-
-/***************************************************************************/
-int Check_Lang_Fortran(proj)
-PTR_PROJ proj;
-{
-  PTR_FILE ptf;
-  PTR_BLOB ptb;
-  if (!proj)
-    return FALSE;
-  for (ptb = PROJ_FILE_CHAIN (proj); ptb ; ptb =  BLOB_NEXT (ptb))
-    {
-      ptf = (PTR_FILE) BLOB_VALUE (ptb);
-    /*  if (debug)
-	fprintf(stderr,"%s\n",FILE_FILENAME (ptf)); */
-
-      if (FILE_LANGUAGE(ptf) != ForSrc)
-	return(FALSE);
-    }
-  return(TRUE);
-}
-
-
-/* Procedure for unparse a program use when debug is required 
-   the current project is taking */
-/***************************************************************************/
-void UnparseProgram(fout)
-     FILE *fout;
-{
-/*  char *s;
-  PTR_BLOB b, bl;
-  PTR_FILE f;
-  */ /*podd 15.03.99*/
-  if (Check_Lang_Fortran(cur_proj))
-    {  
-      Init_Unparser();
-            
-      fprintf(fout,"%s",filter(Tool_Unparse_Bif(PROJ_FIRST_BIF())));
-    } else
-      {
-	Init_Unparser();
-	fprintf(fout,"%s",Tool_Unparse_Bif(PROJ_FIRST_BIF()));
-      }
-}
-
-/***************************************************************************/
-void UnparseProgram_ThroughAllocBuffer(fout,filept,size)
-     FILE *fout;
-     PTR_FILE filept;
-     int size;
-{
-/*  char *s;
-  PTR_BLOB b, bl;
-  PTR_FILE f;
-  */ /*podd 29.01.07*/
-  
-           //SetCurrentFileTo(filept);
-           //SwitchToFile(GetFileNumWithPt(filept));
-
-  if (Check_Lang_Fortran(cur_proj))
-    { 
-      Init_Unparser();
-     
-      BufferAllocate(size);
-     
-      fprintf(fout,"%s",filter(Tool_Unparse_Bif(PROJ_FIRST_BIF())));
-    } else
-      {
-	Init_Unparser();
-	fprintf(fout,"%s",Tool_Unparse_Bif(PROJ_FIRST_BIF()));
-      }
-}
-
-/* Procedure for unparse a program use when debug is required 
-   the current project is taking */
-/***************************************************************************/
-void UnparseBif(bif)
-     PTR_BFND bif;
-{
-/*  char *s;
-  PTR_BLOB b, bl;
-*/ /* podd 15.03.99*/
-  if (Check_Lang_Fortran(cur_proj))
-    {  
-      Init_Unparser();
-      printf("%s",filter(Tool_Unparse_Bif(bif)));
-    } else
-      {
-	Init_Unparser();
-	printf("%s",(Tool_Unparse_Bif(bif)));
-      }
-
-}
-
-/***************************************************************************/
-
-/* podd 28.01.07 */   /*change podd 16.12.11*/
-char *UnparseBif_Char(bif,lang)
-     PTR_BFND bif;
-     int lang; /* ForSrc=0 - Fortran language, CSrc=1 - C language */
-{
-    char *s;
-/*  PTR_BLOB b, bl;
-*/ /* podd 15.03.99*/
-  if (Check_Lang_Fortran(cur_proj) && lang != CSrc)  /*podd 16.12.11*/
-    {  
-      Init_Unparser();
-      s = filter(Tool_Unparse_Bif(bif));
-    } else
-      { if(lang == CSrc)
-          Set_Function_Language(CSrc);
-	Init_Unparser();
-	s = Tool_Unparse_Bif(bif);
-        if(lang == CSrc)
-          Unset_Function_Language();
-      }
-   return(s);
-}
-
-/* podd 08.04.24 */
-char *UnparseLLnode_Char(llnd,lang)  
-     PTR_LLND llnd;
-     int lang; /* ForSrc=0 - Fortran language, CSrc=1 - C language */
-{
-    char *s;
-/*  PTR_BLOB b, bl;
-*/ /* podd 15.03.99*/
-  if (Check_Lang_Fortran(cur_proj) && lang != CSrc)  /*podd 16.12.11*/
-    {  
-      Init_Unparser();
-      s = filter(Tool_Unparse2_LLnode(llnd));
-    } else
-      { if(lang == CSrc)
-          Set_Function_Language(CSrc);
-	Init_Unparser();
-	s = Tool_Unparse2_LLnode(llnd);
-        if(lang == CSrc)
-          Unset_Function_Language();
-      }
-   return(s);
-}
-
-/* Kataev N.A. 03.09.2013 base on UnparseBif_Char with change podd 16.12.11
-   Kataev N.A. 19.10.2013 fix
-*/
-char *UnparseLLND_Char(llnd)
-     PTR_LLND llnd;    
-{
-    char *s;
-    Init_Unparser();
-    s = Tool_Unparse2_LLnode(llnd);    
-   return(s);
-}
-
-/* Procedure for unparse a program use when debug is required 
-   the current project is taking */
-/***************************************************************************/
-void UnparseLLND(ll)
-     PTR_LLND ll;
-{
-  Init_Unparser();
-  printf("%s",Tool_Unparse2_LLnode(ll));
-}
-
-/***************************************************************************/
-char* UnparseTypeBuffer(type)
-     PTR_TYPE type;
-{
-  Init_Unparser();
-  return Tool_Unparse_Type(type);
-}
-
-/***************************************************************************/
-int open_proj_toolbox(char* proj_name, char* proj_file)
-{
-    char* mem[MAX_FILE];          /* for file in the project */
-    int   no = 0;           /* number of file in the project */
-    int   c;
-    FILE* fd;               /* file descriptor for project */
-    char** p, * t;
-    char* tmp, tmpa[3000];
-
-    tmp = &(tmpa[0]);
-
-    if ((fd = fopen(proj_file, "r")) == NULL)
-        return -1;
-
-    p = mem;
-    t = tmp;
-    while ((c = getc(fd)) != EOF) 
-    {
-        
-        //if (c != ' ') /* assum no blanks in filename */
-
-        {
-            if (c == '\n') 
-            {
-                if (t != tmp) 
-                {   /* not a blank line */
-                    *t = '\0';
-                    *p = (char*)malloc((unsigned)(strlen(tmp) + 1));
-#ifdef __SPF
-                    addToCollection(__LINE__, __FILE__, *p, 0);
-#endif
-                    strcpy(*p++, tmp);
-                    t = tmp;
-                }
-            }
-            else 
-                *t++ = c;
-        }
-    }
-
-    fclose(fd);
-    no = p - mem;
-    if (no > 0)
-    {
-        /* Now make it the active project */
-        if ((cur_proj = OpenProj(proj_name, no, mem)))
-        {
-            cur_file = (PTR_FILE)BLOB_VALUE(CUR_PROJ_FILE_CHAIN());
-            pointer_on_file_proj = cur_file;
-            return 0;
-        }
-        else
-        {
-            fprintf(stderr, "-2 Cannot open project\n");
-            return -2;
-        }
-    }
-    else
-    {
-        fprintf(stderr, "-3 No files in the project\n");
-        return -3;
-    }
-}
-
-int open_proj_files_toolbox(char* proj_name, char** file_list, int no)
-{    
-    if (no > 0)
-    {
-        /* Now make it the active project */
-        if ((cur_proj = OpenProj(proj_name, no, file_list)))
-        {
-            cur_file = (PTR_FILE)BLOB_VALUE(CUR_PROJ_FILE_CHAIN());
-            pointer_on_file_proj = cur_file;
-            return 0;
-        }
-        else
-        {
-            fprintf(stderr, "-2 Cannot open project\n");
-            return -2;
-        }
-    }
-    else
-    {
-        fprintf(stderr, "-3 No files in the project\n");
-        return -3;
-    }
-}
-
-static int ToolBOX_INIT = 0;
-/***************************************************************************/
-void Reset_Tool_Box()
-{
-  Init_Tool_Box();
-}
-
-/***************************************************************************/
-void Reset_Bif_Next()
-{
-  PTR_BLOB ptb;
-  if (cur_proj)
-    {
-      for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-	{
-	  pointer_on_file_proj = (PTR_FILE) BLOB_VALUE (ptb);
-	  Redo_Bif_Next_Chain(PROJ_FIRST_BIF());
-	}
-    } else
-      if(pointer_on_file_proj)
-	Redo_Bif_Next_Chain(PROJ_FIRST_BIF());
-}
-
-/***************************************************************************/
-int Init_Tool_Box()
-{
-
-    PTR_BLOB ptb;
-
-    pointer_on_file_proj = cur_file;
-    number_of_type_node = CUR_FILE_NUM_TYPES() + 1;
-    number_of_ll_node = CUR_FILE_NUM_LLNDS() + 1;
-    number_of_bif_node = CUR_FILE_NUM_BIFS() + 1;
-    number_of_symb_node = CUR_FILE_NUM_SYMBS() + 1;
-    if (CUR_FILE_NAME()) strcpy(Current_File_name, CUR_FILE_NAME());
-    if (ToolBOX_INIT)
-        return 0;
-
-    ToolBOX_INIT = 1;
- 
-    make_a_malloc_stack();
-
-    /* initialisation des noeuds */
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT,f1,f2,f3,f4,f5) node_code_type[SYM] = TYPE;
-#include"bif_node.def"
-#undef DEFNODECODE
-
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT,f1,f2,f3,f4,f5) node_code_length[SYM] =LENGTH;
-#include"bif_node.def"
-#undef DEFNODECODE
-
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT,f1,f2,f3,f4,f5) node_code_kind[SYM] = NT;
-#include"bif_node.def"
-#undef DEFNODECODE
-
-/* set special table for symbol and type */
-#define DEFNODECODE(SYMB,f1,f2,f3,f4,f5) info_type[SYMB][0] = f1; info_type[SYMB][1] = f2; info_type[SYMB][2] = f3;  info_type[SYMB][3] = f4;   info_type[SYMB][4] = f5;  
-#include"type.def"
-#undef DEFNODECODE
-
-#define DEFNODECODE(SYMB,f1,f2,f3,f4,f5) info_symb[SYMB][0] = f1; info_symb[SYMB][1] = f2; info_symb[SYMB][2] = f3;  info_symb[SYMB][3] = f4;   info_symb[SYMB][4] = f5;  
-#include"symb.def"
-#undef DEFNODECODE
-
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT,f1,f2,f3,f4,f5) general_info[SYM][0] = f1; general_info[SYM][1] = f2; general_info[SYM][2] = f3;  general_info[SYM][3] = f4;   general_info[SYM][4] = f5; 
-#include"bif_node.def"
-#undef DEFNODECODE
-
-    if (cur_proj)
-    {
-        for (ptb = PROJ_FILE_CHAIN(cur_proj); ptb; ptb = BLOB_NEXT(ptb))
-        {
-            pointer_on_file_proj = (PTR_FILE)BLOB_VALUE(ptb);
-            Redo_Bif_Next_Chain_Internal(PROJ_FIRST_BIF());
-        }
-    }
-    pointer_on_file_proj = cur_file;
-    number_of_type_node = CUR_FILE_NUM_TYPES() + 1;
-    number_of_ll_node = CUR_FILE_NUM_LLNDS() + 1;
-    number_of_bif_node = CUR_FILE_NUM_BIFS() + 1;
-    number_of_symb_node = CUR_FILE_NUM_SYMBS() + 1;
-
-    return 1;
-  
-}
-
-/* For debug  */
-/***************************************************************************/
-void writeDepFileInDebugdep()
-{
-  PTR_BFND thebif;
-  int i;
-
-  thebif = PROJ_FIRST_BIF();
-  i = 1;
-  for (;thebif;thebif=BIF_NEXT(thebif), i++) 
-       BIF_ID(thebif) = i;     
-   
-  CUR_FILE_NUM_BIFS() = i-1;
-
-  if (write_nodes(cur_file,"debug.dep") < 0)
-      Message("Error, write_nodes() failed (000)",0);
-
-}
-
-int isBlankString(char *str)
-{int i; 
-
- for(i=0;i<72;i++)
-   if(str[i] !=' ')
-     return(0);
- return(1);
-
-}
-
-/* this function converts a letter to uppercase except char strings (text inside quotes) */
-char to_upper_case (char c, int *quote)
-{ 
-    if(c == '\'' || c == '\"')
-    {
-       if(*quote == c)
-          *quote = 0;
-       else if(*quote==0)
-          *quote = c;
-       return c;
-    }
-    if(c >= 0 && islower(c) && *quote==0)
-       return toupper(c);
-    return c;        
-}
-
-char* filter(char *s)
-{
-    char c;
-    int i = 1, quote = 0;
-    
-    // 14.10.2016 Kolganov. Switch constant buffer to dynamic
-    int temp_size = 4096;
-    char *temp = (char*)malloc(sizeof(char) * temp_size);
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,temp, 0);
-#endif
-    // out_line_length = 132 if -ffo option is used or out_line_length = 72 if -uniForm option is used
-    int temp_i = 0;
-    int buf_i = 0;
-    int commentline = 0;
-    char *resul, *init;
-    int OMP, DVM, SPF; /*OMP*/
-    OMP = DVM = SPF = 0;
-
-    if (!s) 
-        return NULL;
-    if (strlen(s) == 0) 
-        return s;
-    make_a_malloc_stack();
-    //XXX: result is not free at the end of procedure!!
-    resul = (char *)mymalloc(2 * strlen(s));
-    memset(resul, 0, 2 * strlen(s));
-    init = resul;
-    c = s[0];
-
-    if ((c != ' ')
-        && (c != '\n')
-        && (c != '0')
-        && (c != '1')
-        && (c != '2')
-        && (c != '3')
-        && (c != '4')
-        && (c != '5')
-        && (c != '6')
-        && (c != '7')
-        && (c != '8')
-        && (c != '9'))
-        commentline = 1;
-    else
-        commentline = 0;
-    if (commentline) 
-    { 
-        if ( (s[1] == '$') && (s[2] == 'O') && (s[3] == 'M') && (s[4] == 'P')) 
-        {
-            OMP = 1;
-            DVM = SPF = 0; 
-        }        
-        else if ( (s[1] == '$') && (s[2] == 'S') && (s[3] == 'P') && (s[4] == 'F')) 
-        {
-            SPF = 1;
-            OMP = DVM = 0;
-        } 
-        else if (s[1] == '$') 
-        {
-            OMP = 2;
-            DVM = SPF = 0;
-        }
-        else if ( (s[1] == 'D') && (s[2] == 'V') && (s[3] == 'M') && (s[4] == '$'))  
-        {
-            DVM = 1;
-            OMP = SPF = 0;
-        }
-        else 
-            OMP = DVM = SPF = 0;        
-    }
-    temp_i = 0;
-    i = 0;
-    buf_i = 0;    
-    while (c != '\0')
-    {
-        c = s[i];
-        temp[buf_i] = out_upper_case && (!commentline || DVM || SPF || OMP) ? to_upper_case(c,&quote) : c;
-        if (c == '\n')
-        {
-            if (buf_i + 1 > temp_size)
-            {
-                temp_size *= 2;
-#ifdef __SPF
-                removeFromCollection(temp);
-#endif
-                temp = (char*)realloc(temp, sizeof(char) * temp_size);
-#ifdef __SPF
-                addToCollection(__LINE__, __FILE__,temp, 0);
-#endif
-            }
-
-            temp[buf_i + 1] = '\0';
-            sprintf(resul, "%s", temp);
-            resul = resul + strlen(temp);
-            temp_i = -1;
-            buf_i = -1;
-            if ((s[i + 1] != ' ')
-                && (s[i + 1] != '\n')
-                && (s[i + 1] != '0')
-                && (s[i + 1] != '1')
-                && (s[i + 1] != '2')
-                && (s[i + 1] != '3')
-                && (s[i + 1] != '4')
-                && (s[i + 1] != '5')
-                && (s[i + 1] != '6')
-                && (s[i + 1] != '7')
-                && (s[i + 1] != '8')
-                && (s[i + 1] != '9'))
-                commentline = 1;
-            else
-                commentline = 0;
-            if (commentline) 
-            {
-                if ( (s[i+2] == '$') && (s[i+3] == 'O') && (s[i+4] == 'M') && (s[i+5] == 'P'))  
-                {
-                    OMP = 1;
-                    DVM = SPF = 0;
-                }
-                else if ( (s[i+2] == '$') && (s[i+3] == 'S') && (s[i+4] == 'P') && (s[i+5] == 'F')) 
-                {
-                    SPF = 1;
-                    OMP = DVM = 0;                    
-                } 
-                else if (s[i + 2] == '$') 
-                {
-                    OMP = 2;
-                    DVM = SPF = 0;
-                }
-                else 
-                {
-                    if ( (s[i+2] == 'D') && (s[i+3] == 'V') && (s[i+4] == 'M') && (s[i+5] == '$'))   
-                    {
-                        DVM = 1;
-                        OMP = SPF = 0;
-                    }
-                    else OMP = DVM = SPF = 0;
-                }
-            }
-        }
-        else 
-        {
-            if (((!out_free_form && temp_i == 71) || (out_free_form && !out_line_unlimit && temp_i == out_line_length - 1)) && !commentline && (s[i + 1] != '\n'))
-            {
-                if (buf_i + 1 > temp_size)
-                {
-                    temp_size *= 2;
-#ifdef __SPF
-                    removeFromCollection(temp);
-#endif
-                    temp = (char*)realloc(temp, sizeof(char) * temp_size);
-#ifdef __SPF
-                    addToCollection(__LINE__, __FILE__,temp, 0);
-#endif
-                }
-                /* insert where necessary */
-                temp[buf_i + 1] = '\0';
-                if (out_free_form)
-                {
-                    sprintf(resul, "%s&\n", temp);
-                    resul = resul + strlen(temp) + 2;
-                }
-                else 
-                {
-                    sprintf(resul, "%s\n", temp);
-                    resul = resul + strlen(temp) + 1;
-                }
-                if (!out_free_form && isBlankString(temp))   /*24.06.13*/
-                    /* string of 72 blanks in fixed form */
-                    sprintf(resul, "      ");
-                else
-                    sprintf(resul, "     &");
-                resul = resul + strlen("     &");
-                commentline = 0;
-                memset(temp, 0, sizeof(char) * temp_size);
-                temp_i = strlen("     &") - 1;
-                buf_i = -1;
-            }
-
-            if (((!out_free_form && temp_i == 71) || (out_free_form && !out_line_unlimit && temp_i == out_line_length - 1)) && commentline && (s[i + 1] != '\n') && ((OMP == 1) || (OMP == 2) || (DVM == 1) || (SPF == 1))) /*07.08.17*/
-            {
-                if (buf_i + 1 > temp_size)
-                {
-                    temp_size *= 2;
-#ifdef __SPF
-                    removeFromCollection(temp);
-#endif
-                    temp = (char*)realloc(temp, sizeof(char) * temp_size);
-#ifdef __SPF
-                    addToCollection(__LINE__, __FILE__,temp, 0);
-#endif
-                }
-
-                temp[buf_i + 1] = '\0';
-                if (out_free_form)
-                {
-                    sprintf(resul, "%s&\n", temp);
-                    resul = resul + strlen(temp) + 2;
-                }
-                else 
-                {
-                    sprintf(resul, "%s\n", temp);
-                    resul = resul + strlen(temp) + 1;
-                }
-                if (OMP == 1) 
-                {
-                    sprintf(resul, "!$OMP&");
-                    resul = resul + strlen("!$OMP&");
-                    temp_i = strlen("!$OMP&") - 1;
-                }
-                if (OMP == 2)
-                {
-                    sprintf(resul, "!$   &");
-                    resul = resul + strlen("!$   &");
-                    temp_i = strlen("!$   &") - 1;
-                }
-                if (DVM == 1)
-                {
-                    sprintf(resul, "!DVM$&");
-                    resul = resul + strlen("!DVM$&");
-                    temp_i = strlen("!DVM$&") - 1;
-                }
-
-                if (SPF == 1)
-                {
-                    sprintf(resul, "!$SPF&");
-                    resul = resul + strlen("!$SPF&");
-                    temp_i = strlen("!$SPF&") - 1;
-                }
-                memset(temp, 0, sizeof(char) * temp_size);
-                temp_i = strlen("     +") - 1;
-                buf_i = -1;
-            }
-        }
-        i++;
-        temp_i++;
-        buf_i++;
-        if (buf_i > temp_size)
-        {
-            temp_size *= 2;
-#ifdef __SPF
-            removeFromCollection(temp);
-#endif
-            temp = (char*)realloc(temp, sizeof(char) * temp_size);
-#ifdef __SPF
-            addToCollection(__LINE__, __FILE__,temp, 0);
-#endif
-        }
-    }
-#ifdef __SPF
-    removeFromCollection(temp);
-#endif
-    free(temp);
-    return init;
-}
-
-
-
-/* BW, june 1994
-   this function is used in duplicateStmtsBlock to determine how many
-   bif nodes need to be copied
-*/
-/***************************************************************************/
-int numberOfBifsInBlobList(blob)
-PTR_BLOB blob;
-{
-  PTR_BFND cur_bif;
-
-  if(!blob) return 0;
-  cur_bif = BLOB_VALUE(blob);
-  return (numberOfBifsInBlobList(BIF_BLOB1(cur_bif))
-       + numberOfBifsInBlobList(BIF_BLOB2(cur_bif))
-       + numberOfBifsInBlobList(BLOB_NEXT(blob)) + 1);
-}
-
-/***************************************************************************/
-int findBifInList1(bif_source, bif_cherche)
-PTR_BFND bif_source, bif_cherche;
-{
-  PTR_BLOB temp;
-  
-  if ((bif_cherche == NULL) || (bif_source == NULL)) 
-    return FALSE;
-  
-  for (temp = BIF_BLOB1 (bif_source); temp ; temp = BLOB_NEXT (temp))
-    if (BLOB_VALUE (temp) == bif_cherche)
-      return TRUE;
-  return FALSE;
-}
-
-/***************************************************************************/
-int findBifInList2(bif_source, bif_cherche)
-PTR_BFND bif_source, bif_cherche;
-{
-  PTR_BLOB temp;
-  
-  if ((bif_cherche == NULL) || (bif_source == NULL)) 
-    return FALSE;
-
-  for (temp = BIF_BLOB2 (bif_source); temp ; temp = BLOB_NEXT (temp))
-    if (BLOB_VALUE (temp) == bif_cherche)
-      return TRUE;
-  return FALSE;
-}
-
-/***************************************************************************/
-int findBif(bif_source, bif_target, i)
-PTR_BFND bif_source, bif_target;
-int i;
-{
-  switch(i){
-  case 0:
-    if (findBifInList1 (bif_source, bif_target))
-      return TRUE;
-    else return findBifInList2 (bif_source, bif_target);
-   
-  case 1:
-    return findBifInList1 (bif_source, bif_target);
-    
-  case 2:
-    return findBifInList2 (bif_source, bif_target);
-    
-  }
-  return 0;
-}
-
-
-/***************************************************************************/
-PTR_BLOB appendBlob(b1, b2)
-PTR_BLOB b1, b2;
-{
-    if (b1) {
-         PTR_BLOB p, q;
-
-        for (p = b1; p; p = BLOB_NEXT (p)) /* skip to the end of b1 */
-            q = p;
-        BLOB_NEXT (q) = b2;
-    } else
-        b1 = b2;
-    return b1;
-}
-
-/* 
- *delete a bif node from the list of blob node
- */
-/***************************************************************************/
-PTR_BFND deleteBfndFromBlobAndLabel(bf,label)
-     PTR_BFND bf;
-     PTR_LABEL label;
-{
-    PTR_BLOB first;
-    PTR_BLOB bl1, bl2;
-
-    if (label) {
-      first = LABEL_UD_CHAIN(label);     
-      if (first && (BLOB_VALUE (first) == bf))
-	{
-	  bl2 = first;
-	  LABEL_UD_CHAIN(label) = BLOB_NEXT (first);
-	  return (BLOB_VALUE (bl2));
-	}
-
-      for (bl1 = bl2 = first; bl1; bl1 = BLOB_NEXT (bl1)) {
-	if (BLOB_VALUE (bl1) == bf) {
-	  BLOB_NEXT (bl2) = BLOB_NEXT (bl1);
-	  return (BLOB_VALUE (bl2));
-	}
-	bl2 = bl1;
-      }
-      return NULL;
-    }
-    return NULL;
-}
-
-/***************************************************************************/
-PTR_BLOB lookForBifInBlobList(first, bif)
-PTR_BLOB first;
-PTR_BFND bif;
-{
-  PTR_BLOB tail;
-  if (first == NULL)
-    return NULL;
-  for (tail = first; tail; tail = BLOB_NEXT(tail) )
-    {
-      if (BLOB_VALUE(tail) == bif)
-        return tail;
-    }
-  return NULL;
-}
-
-/***************************************************************************/
-PTR_BFND childfInBlobList(first, num)
-PTR_BLOB first;
-int num;
-{
-  PTR_BLOB tail;
-  int len = 0;
-  if (first == NULL)
-    return NULL;
-  for (tail = first; tail; tail = BLOB_NEXT(tail) )
-    {
-      if (len == num)
-        return BLOB_VALUE(tail);
-      len++;
-    }
-  return NULL;
-}
-
-/***************************************************************************/
-int blobListLength(first)
-PTR_BLOB first;
-{
-  PTR_BLOB tail;
-  int len = 0;
-  if (first == NULL)
-    return(0);
-  for (tail = first; tail; tail = BLOB_NEXT(tail) )
-    len++;
-  return(len);
-}
-
-/***************************************************************************/
-PTR_BFND lastBifInBlobList1(noeud)
-     PTR_BFND noeud;
-{
-  PTR_BLOB bl1 = NULL;
-  if (!noeud )
-    return NULL;
-  /* on va cherche le dernier dans la liste */
-  for (bl1 = BIF_BLOB1(noeud); bl1; bl1 = BLOB_NEXT(bl1)) 
-    {
-      if (BLOB_NEXT(bl1) == NULL)
-	break;
-    }
-  if (bl1)
-    return BLOB_VALUE(bl1);
-  else
-    return NULL;
-}
-
-/***************************************************************************/
-PTR_BFND lastBifInBlobList2(noeud)
-     PTR_BFND noeud;
-{
-  PTR_BLOB bl1 = NULL;
-  if (!noeud )
-    return NULL;
-  /* on va cherche le dernier dans la liste */
-  for (bl1 = BIF_BLOB2(noeud); bl1; bl1 = BLOB_NEXT(bl1)) 
-    {
-      if (BLOB_NEXT(bl1) == NULL)
-	break;
-    }
-  if (bl1)
-    return BLOB_VALUE(bl1);
-  else
-    return NULL;
-}
-
-/***************************************************************************/
-PTR_BFND lastBifInBlobList(noeud)
-     PTR_BFND noeud;
-{
-  if (!BIF_INDEX(noeud))
-    return lastBifInBlobList1( noeud);
-  else
-    return lastBifInBlobList2( noeud);
-}
-
-/***************************************************************************/
-PTR_BLOB lastBlobInBlobList1(noeud)
-     PTR_BFND noeud;
-{
-  PTR_BLOB bl1 = NULL;
-  if (!noeud )
-    return NULL;
-  /* on va cherche le dernier dans la liste */
-  for (bl1 = BIF_BLOB1(noeud); bl1; bl1 = BLOB_NEXT(bl1)) 
-    {
-      if (BLOB_NEXT(bl1) == NULL)
-	break;
-    }
-  if (bl1)
-    return bl1;
-  else
-    return NULL;
-}
-
-/***************************************************************************/
-PTR_BLOB lastBlobInBlobList2(noeud)
-     PTR_BFND noeud;
-{
-  PTR_BLOB bl1 = NULL;
-  if (!noeud )
-    return NULL;
-  /* on va cherche le dernier dans la liste */
-  for (bl1 = BIF_BLOB2(noeud); bl1; bl1 = BLOB_NEXT(bl1)) 
-    {
-      if (BLOB_NEXT(bl1) == NULL)
-	break;
-    }
-  if (bl1)
-    return bl1;
-  else
-    return NULL;
-}
-
-/***************************************************************************/
-PTR_BLOB lastBlobInBlobList(noeud)
-     PTR_BFND noeud;
-{
-  if (!BIF_INDEX(noeud))
-    return lastBlobInBlobList1( noeud);
-  else
-    return lastBlobInBlobList2( noeud);
-}
-
-/*
- *
- * append dans la blob liste d'un noeud bif, un noeud bif
- *
- */
-/***************************************************************************/
-int appendBfndToList1(biftoinsert, noeud)
-     PTR_BFND biftoinsert, noeud;
-{
-  PTR_BLOB bl1;
-
-  if (!noeud || !biftoinsert)
-    return 0;
-  if (BIF_BLOB1(noeud) == NULL)
-    {
-      BIF_BLOB1(noeud) = (PTR_BLOB) newNode (BLOB_KIND);
-      BLOB_VALUE(BIF_BLOB1(noeud)) = biftoinsert; 
-      BLOB_NEXT(BIF_BLOB1(noeud)) = NULL;
-      BIF_CP(biftoinsert) = noeud;
-    } else
-      {
-        /* on va cherche le dernier dans la liste */
-        for (bl1 = BIF_BLOB1(noeud); bl1; bl1 = BLOB_NEXT(bl1)) 
-          {
-            if (BLOB_NEXT(bl1) == NULL)
-              break;
-          }
-        BLOB_NEXT(bl1) = (PTR_BLOB) newNode (BLOB_KIND);
-        BLOB_VALUE(BLOB_NEXT(bl1)) = biftoinsert;
-	BIF_CP(biftoinsert) = noeud;
-        BLOB_NEXT(BLOB_NEXT(bl1)) = NULL;
-      }
-  
-  return 1;
-}
-
-/***************************************************************************/
-int appendBfndToList2(biftoinsert, noeud)
-     PTR_BFND biftoinsert, noeud;
-{
-  PTR_BLOB bl1;
-
-  if (!noeud || !biftoinsert)
-    return 0;
-  if (BIF_BLOB2(noeud) == NULL)
-    {
-      BIF_BLOB2(noeud) = (PTR_BLOB) newNode (BLOB_KIND);
-      BLOB_VALUE (BIF_BLOB2(noeud)) = biftoinsert;      
-      BLOB_NEXT (BIF_BLOB2(noeud)) = NULL;
-      BIF_CP(biftoinsert) = noeud;
-    } else
-      {
-        /* on va cherche le dernier dans la liste */
-        for (bl1 = BIF_BLOB2(noeud); bl1; bl1 = BLOB_NEXT(bl1)) 
-          {
-            if (BLOB_NEXT(bl1) == NULL)
-              break;
-          }
-        BLOB_NEXT(bl1) = (PTR_BLOB) newNode (BLOB_KIND);
-        BLOB_VALUE(BLOB_NEXT(bl1)) = biftoinsert;
-        BLOB_NEXT(BLOB_NEXT(bl1)) = NULL;
-	BIF_CP(biftoinsert) = noeud;
-      }
-  
-  return 1;
-}
-
-/* replace chain_up() */
-/***************************************************************************/
-int appendBfndToList(noeud, biftoinsert)
-     PTR_BFND biftoinsert, noeud;
-{
-  /* use the index field to set the right blob node list */
-  if (!noeud || !biftoinsert)
-    return 0;
-  if (!BIF_INDEX(noeud))
-    return appendBfndToList1(biftoinsert, noeud);
-  else
-    return appendBfndToList2(biftoinsert, noeud);
-}
-
-
-/***************************************************************************/
-int firstBfndInList1(biftoinsert, noeud)
-     PTR_BFND biftoinsert, noeud;
-{
-  PTR_BLOB bl2;
-
-  if (!noeud || !biftoinsert)
-    return 0;
-  if (BIF_BLOB1(noeud) == NULL)
-    {
-      BIF_BLOB1(noeud) = (PTR_BLOB) newNode (BLOB_KIND);
-      BLOB_VALUE (BIF_BLOB1(noeud)) = biftoinsert;
-      BLOB_NEXT (BIF_BLOB1(noeud)) = NULL;
-      BIF_CP(biftoinsert) = noeud;
-    } else
-      {
-        bl2 = BIF_BLOB1(noeud);
-        BIF_BLOB1(noeud) = (PTR_BLOB) newNode (BLOB_KIND);
-        BLOB_VALUE (BIF_BLOB1(noeud)) = biftoinsert;
-        BLOB_NEXT (BIF_BLOB1(noeud)) =  bl2 ;
-	BIF_CP(biftoinsert) = noeud;
-      }
-  return 1;
-}
-
-
-/***************************************************************************/
-int firstBfndInList2(biftoinsert, noeud)
-     PTR_BFND biftoinsert, noeud;
-{
-  PTR_BLOB bl2;
-  if (!noeud || !biftoinsert)
-    return 0;
-  if (BIF_BLOB2(noeud) == NULL)
-    {
-      BIF_BLOB2(noeud) = (PTR_BLOB) newNode (BLOB_KIND);
-      BLOB_VALUE (BIF_BLOB2(noeud)) = biftoinsert;
-      BLOB_NEXT (BIF_BLOB2(noeud)) = NULL;
-      BIF_CP(biftoinsert) = noeud;
-    } else
-      {
-        bl2 = BIF_BLOB2(noeud);
-        BIF_BLOB2(noeud) = (PTR_BLOB) newNode (BLOB_KIND);
-        BLOB_VALUE (BIF_BLOB2(noeud)) = biftoinsert; 
-        BLOB_NEXT (BIF_BLOB2(noeud)) =  bl2 ;
-	BIF_CP(biftoinsert) = noeud;
-      }
-  return 1;
-}
-
-/***************************************************************************/
-int insertBfndInList1(biftoinsert, current, noeud)
-     PTR_BFND biftoinsert, noeud,current;
-{
-  PTR_BLOB bl1 = NULL, bl2;
-  if (!noeud || !biftoinsert || !current)
-    return 0;
-  if (BIF_BLOB1(noeud) == NULL)
-    {
-      BIF_BLOB1(noeud) = (PTR_BLOB) newNode (BLOB_KIND);
-      BLOB_VALUE (BIF_BLOB1(noeud)) = biftoinsert;
-      BLOB_NEXT (BIF_BLOB1(noeud)) = NULL;
-      BIF_CP(biftoinsert) = noeud;
-    } else
-      {
-       /* on va cherche current  dans la liste */
-        for (bl1 = BIF_BLOB1(noeud); bl1; bl1 = BLOB_NEXT(bl1)) 
-          {
-            if (BLOB_VALUE(bl1) == current)
-              break;
-          }
-
-        if (!bl1)
-          {
-            Message("insertBfndInList1 failed",0);
-	    return FALSE;
-          }
-
-        bl2 = BLOB_NEXT(bl1);
-        BLOB_NEXT(bl1) = (PTR_BLOB) newNode (BLOB_KIND);
-        BLOB_VALUE (BLOB_NEXT(bl1)) = biftoinsert;
-        BLOB_NEXT (BLOB_NEXT(bl1)) =  bl2; 
-	BIF_CP(biftoinsert) = noeud;
-      }
-  return TRUE;
-}
-
-/***************************************************************************/
-int insertBfndInList2(biftoinsert, current, noeud)
-     PTR_BFND biftoinsert, noeud,current;
-{
-  PTR_BLOB bl1 = NULL, bl2;
-
-  if (!noeud || !biftoinsert || !current)
-    return 0;
-  if (BIF_BLOB2(noeud) == NULL)
-    {
-      BIF_BLOB2(noeud) = (PTR_BLOB)  newNode (BLOB_KIND);
-      BLOB_VALUE (BIF_BLOB2(noeud)) = biftoinsert;
-      BLOB_NEXT (BIF_BLOB2(noeud)) = NULL;
-      BIF_CP(biftoinsert) = noeud;
-    } else
-      {
-       /* on va cherche current  dans la liste */
-        for (bl1 = BIF_BLOB2(noeud); bl1; bl1 = BLOB_NEXT(bl1)) 
-          {
-            if (BLOB_VALUE(bl1) == current)
-              break;
-          }
-
-        if (!bl1)
-          {
-            Message("insertBfndInList2 failed",0);
-            abort();
-          }
-
-        bl2 = BLOB_NEXT(bl1);
-        BLOB_NEXT(bl1) = (PTR_BLOB)  newNode (BLOB_KIND);
-        BLOB_VALUE (BLOB_NEXT(bl1)) = biftoinsert;
-        BLOB_NEXT(BLOB_NEXT(bl1)) =   bl2 ; 
-	BIF_CP(biftoinsert) = noeud;
-
-      }
-  return 1;
-}
-
-/* enleve in noeud de la liste de bif node si s'y trouve */
-/***************************************************************************/
-PTR_BLOB deleteBfndFrom(b1,b2)
-     PTR_BFND b1,b2;
-{
-  PTR_BLOB temp, last, res = NULL;
-  
-  if (!b1)
-    return NULL;
-  
-  last = NULL;
-  for (temp = BIF_BLOB1(b1) ; temp ; temp = BLOB_NEXT (temp))
-    {
-      if (BLOB_VALUE(temp) == b2)
-        {
-          res = temp;
-          if (last  == NULL)
-            {
-              BIF_BLOB1(b1) = BLOB_NEXT (temp);              
-              break;
-            }          
-          else
-            {
-              BLOB_NEXT (last) = BLOB_NEXT (temp);
-              break;
-            }
-        }
-      last = temp;      
-    }
-  
-  if (!res)
-    {
-      last = NULL;
-      for (temp = BIF_BLOB2(b1) ; temp ; temp = BLOB_NEXT (temp))
-        {
-          if (BLOB_VALUE(temp) == b2)
-            {
-               res = temp;
-              if (last  == NULL)
-                {
-                  BIF_BLOB2(b1) = BLOB_NEXT (temp);
-                  break;
-                }          
-              else
-                {
-                  BLOB_NEXT (last) = BLOB_NEXT (temp);
-                  break;
-                }
-            }
-          last = temp; 
-        }
-    }
-  return res;
-}
-
-
-/***************************************************************************/
-PTR_BFND getNodeBefore(b)
-     PTR_BFND b;
-{
-  PTR_BFND temp, first;
-  
-  if (!b)
-    return NULL;
-
-  if (BIF_CP(b))
-    first = BIF_CP(b);
-  else
-    first = PROJ_FIRST_BIF();
-
-  for (temp = first; temp ; temp = BIF_NEXT(temp))
-    {
-      if (BIF_NEXT(temp) == b)
-        return temp;
-    }
- 
-  if (BIF_CP(b))
-    {
-      for (temp = BIF_CP(BIF_CP(b)); temp ; temp = BIF_NEXT(temp))
-        {
-          if (BIF_NEXT(temp) == b)
-            return temp;
-        }
-    }
-  if (debug)
-    Message("Node Before not found ",0);
-  return NULL;
-}
-
-/***************************************************************************/
-void updateControlParent(first,last,cp)
-PTR_BFND first,cp,last;
-
-{
-  PTR_BFND temp;
-  
-  for (temp = first; temp && (temp != last); temp = BIF_NEXT(temp))
-    {      
-      if (!isItInSection(first,last,BIF_CP(temp)))
-        BIF_CP(temp) = cp;
-    }
-
-  if (!isItInSection(first,last,BIF_CP(last)))
-    BIF_CP(last) = cp;
-}
-
-
-/***************************************************************************/
-PTR_BFND getWhereToInsertInBfnd(where,cpin)
-PTR_BFND where, cpin;
-{
-  PTR_BFND temp;
-  PTR_BLOB blob;
-  
-  if (!cpin || !where)
-    return NULL;
-
-  if (findBifInList1 (cpin, where))
-    return where;
-  if (findBifInList2 (cpin, where))
-    return where;
-
-  
-  for (blob = BIF_BLOB1(cpin) ; blob; blob = BLOB_NEXT(blob))
-    {
-      temp = getWhereToInsertInBfnd(where,BLOB_VALUE(blob));
-      if (temp)
-        return BLOB_VALUE(blob);
-    }
-
-  for (blob = BIF_BLOB2(cpin) ; blob; blob = BLOB_NEXT(blob))
-    {
-      temp = getWhereToInsertInBfnd(where,BLOB_VALUE(blob));
-      if (temp)
-        return BLOB_VALUE(blob);
-    }
-
-  return NULL;
-  
-}
-
-
-/* Given a node where we want to insert another node, 
-   compute the control parent */
-/***************************************************************************/
-PTR_BFND computeControlParent(where)
-PTR_BFND where;
-{
-  PTR_BFND cp;
-
-      
-  if (!where)
-    {
-      Message("where not defined in computeControlParent: abort()",0);
-      abort();
-    }
-
-  if (!BIF_CP(where))
-    {
-      switch(BIF_CODE(where))
-        { /* node that can be a bif control parent */
-        case  GLOBAL	       :
-        case  PROG_HEDR      :
-        case  PROC_HEDR	:	
-        case  PROS_HEDR	:	
-        case  BASIC_BLOCK	:
-        case  IF_NODE		:
-	case WHERE_BLOCK_STMT :
-        case  LOOP_NODE	:	
-        case  FOR_NODE	:	
-        case  FORALL_NODE	:
-        case  WHILE_NODE	:
-        case  CDOALL_NODE	:
-        case  SDOALL_NODE	:
-        case  DOACROSS_NODE	:
-        case  CDOACROSS_NODE	:
-        case  FUNC_HEDR	:
-	case  ENUM_DECL:
-	case  STRUCT_DECL:
-	case  UNION_DECL:
-	case  CLASS_DECL:
-	case  TECLASS_DECL:
-	case  COLLECTION_DECL:
-	case  SWITCH_NODE:
-        case   ELSEIF_NODE    :
-          return where;     
-        default:
-          Message("No Control Parent in computeControlParent: abort()",0);
-          abort();
-        }
-    }
-
-  switch(BIF_CODE(where))
-    {
-    case CONT_STAT :
-      if (BIF_CP(where) &&
-          (BIF_CODE(BIF_CP(where)) != FOR_NODE) &&
-          (BIF_CODE(BIF_CP(where)) != WHILE_NODE) &&
-          (BIF_CODE(BIF_CP(where)) != LOOP_NODE) &&
-          (BIF_CODE(BIF_CP(where)) != CDOALL_NODE) &&
-          (BIF_CODE(BIF_CP(where)) != SDOALL_NODE) &&
-          (BIF_CODE(BIF_CP(where)) != DOACROSS_NODE) &&
-          (BIF_CODE(BIF_CP(where)) != CDOACROSS_NODE))
-        {
-          cp = BIF_CP(where);
-          break;
-        }
-    case CONTROL_END :
-	  cp = BIF_CP(BIF_CP(where)); /* handle by the function insert in */
-          break;
-      /* that a node with a list of blobs */
-    case  GLOBAL	:
-    case  PROG_HEDR     :
-    case  PROC_HEDR	:	
-    case  PROS_HEDR	:	
-    case  BASIC_BLOCK	:
-    case  IF_NODE	:
-    case WHERE_BLOCK_STMT :
-    case  LOOP_NODE	:	
-    case  FOR_NODE	:	
-    case  FORALL_NODE	:
-    case  WHILE_NODE	:
-    case  CDOALL_NODE	:
-    case  SDOALL_NODE	:
-    case  DOACROSS_NODE	:
-    case  CDOACROSS_NODE :
-    case  FUNC_HEDR	:
-    case  ENUM_DECL:
-    case  STRUCT_DECL:
-    case  UNION_DECL:
-    case  CLASS_DECL:
-    case  TECLASS_DECL:
-    case  COLLECTION_DECL:
-    case  SWITCH_NODE:
-    case   ELSEIF_NODE    :
-      cp = where;
-          break; 
-        default:
-          cp = BIF_CP(where); /* dont specify it */
-    }
-
-  return cp;  
-}
-
-
-/***************************************************************************/
-int insertBfndListIn(first,where,cpin)
-PTR_BFND first,where;
-PTR_BFND cpin;
-{
-  PTR_BFND cp;
-  PTR_BFND biforblob;
-  PTR_BFND temp, last;  
-  int inblob2;
-
-  if (!first)
-    return 0;
-  
-  if (!where)
-    {
-      Message("where not defined in insertBfndListIn: abort()",0);
-      abort();
-    }
-
-  if (!cpin)
-    cp = computeControlParent(where);
-  else
-    cp = cpin;
-
-  /* find where in the blob list where to insert it */
-  /* treat first the special case of if_node */
-  if ((BIF_CODE(where) == CONTROL_END) && BIF_CP(where) &&
-      (BIF_CODE(BIF_CP(where)) == IF_NODE || BIF_CODE(BIF_CP(where)) == ELSEIF_NODE) &&
-      (!findBifInList2 (BIF_CP(where),where)) &&
-      BIF_BLOB2(BIF_CP(where)))
-    {
-      cp = BIF_CP(where);
-      inblob2 = TRUE;
-      biforblob = NULL;
-      last =  getLastNodeList(first);
-    }
-    else
-      {
-        biforblob =  getWhereToInsertInBfnd(where,cp);
-        last =  getLastNodeList(first);
-        inblob2 = findBifInList2 (cp,biforblob);
-/*        if (BIF_CODE(where) == ELSEIF_NODE)
-          inblob2 = TRUE;*/
-      }
-
-  for (temp = first; temp; temp = BIF_NEXT(temp))
-    {      
-      if (!isItInSection(first,last,BIF_CP(temp)))
-        {
-          if (!biforblob)
-            {
-              if (inblob2)
-                firstBfndInList2(temp, cp);
-              else
-                firstBfndInList1(temp, cp);
-            } else
-              {
-                if (inblob2)
-                  insertBfndInList2(temp,biforblob, cp);
-                else
-                  insertBfndInList1(temp,biforblob, cp);
-              }          
-          biforblob = temp;       
-        }
-    }
-
-  updateControlParent(first,last,cp); 
-  BIF_NEXT(last) = BIF_NEXT(where);
-  BIF_NEXT(where) = first;
-  return 1;  
-}
-
-/***************************************************************************/
-int insertBfndListInList1(first,cpin)
-PTR_BFND first;
-PTR_BFND cpin;
-{
-  PTR_BFND biforblob;
-  PTR_BFND temp, last;  
-
-  if (!first || !cpin)
-    return 0;
-  
-  biforblob = NULL; 
-  last =  getLastNodeList(first);
-  for (temp = first; temp; temp = BIF_NEXT(temp))
-    {      
-      if (!isItInSection(first,last,BIF_CP(temp)))
-        {
-          if (!biforblob)
-            {
-                firstBfndInList1(temp, cpin);
-            } else
-              {
-                  insertBfndInList1(temp,biforblob, cpin);
-              }          
-          biforblob = temp;       
-        }
-    }
-
-  updateControlParent(first,last,cpin); 
-  return 1;
-}
-
-/***************************************************************************/
-int appendBfndListToList1(first,cpin)
-PTR_BFND first;
-PTR_BFND cpin;
-{
-  PTR_BFND biforblob;
-  PTR_BFND temp, last;  
-
-  if (!first || !cpin)
-    return 0;
-  
-  biforblob = NULL; 
-  last =  getLastNodeList(first);
-  for (temp = first; temp; temp = BIF_NEXT(temp))
-    {      
-      if (!isItInSection(first,last,BIF_CP(temp)))
-        {
-          if (!biforblob)
-            {
-                appendBfndToList1(temp, cpin);
-            } else
-              {
-                  insertBfndInList1(temp,biforblob, cpin);
-              }          
-          biforblob = temp;       
-        }
-    }
-  
-  updateControlParent(first,last,cpin); 
-  
-  return 1;
-}
-
-
-/***************************************************************************/
-int firstInBfndList2(first,cpin)
-PTR_BFND first;
-PTR_BFND cpin;
-{
-  PTR_BFND biforblob;
-  PTR_BFND temp, last;  
-
-  if (!first || !cpin)
-    return 0;
-  
-  biforblob = NULL;  
-  last =  getLastNodeList(first);
-  for (temp = first; temp; temp = BIF_NEXT(temp))
-    {      
-      if (!isItInSection(first,last,BIF_CP(temp)))
-        {
-          if (!biforblob)
-            {
-                firstBfndInList2(temp, cpin);
-            } else
-              {
-                  insertBfndInList2(temp,biforblob, cpin);
-              }          
-          biforblob = temp;       
-        }
-    }
-
-  updateControlParent(first,last,cpin); 
-  return 1;
-}
-
-/***************************************************************************/
-int appendBfndListToList2(first,cpin)
-PTR_BFND first;
-PTR_BFND cpin;
-{
-  PTR_BFND biforblob;
-  PTR_BFND temp, last;  
-
-  if (!first || !cpin)
-    return 0;
-  
-  biforblob = NULL; 
-  last =  getLastNodeList(first);
-  for (temp = first; temp; temp = BIF_NEXT(temp))
-    {      
-      if (!isItInSection(first,last,BIF_CP(temp)))
-        {
-          if (!biforblob)
-            {
-                appendBfndToList2(temp, cpin);
-            } else
-              {
-                  insertBfndInList2(temp,biforblob, cpin);
-              }          
-          biforblob = temp;       
-        }
-    }
-
-  updateControlParent(first,last,cpin); 
-  return 1;
-}
-
-/***************************************************************************/
-void insertBfndBeforeIn(biftoinsert, bif_current, cpin)
-     PTR_BFND bif_current, biftoinsert,cpin;
-{
-  PTR_BFND  the_one_before = NULL;
-
-  if (! bif_current || ! biftoinsert)
-    {
-      Message("NULL bif node in biftoinsert\n",0);
-      exit(-1);
-    }
-  
-  
-  if (BIF_CODE (bif_current) == GLOBAL)
-    {
-      Message("Cannot insert before global\n",0);
-      exit(-1);
-    }  
-
-  the_one_before = getNodeBefore (bif_current);
-  insertBfndListIn (biftoinsert, the_one_before,cpin);
-  
-} 
-
-
-/* warning to be used carefully; i.e. remove sons before a root */
-/***************************************************************************/
-PTR_BFND deleteBfnd(bif)
-     PTR_BFND bif;
-{
-  PTR_BFND temp;
-  
-  temp = getNodeBefore (bif);
-  deleteBfndFrom (BIF_CP (bif), bif);
-  if (temp) 
-    BIF_NEXT (temp) = BIF_NEXT (bif);
-  return temp;
-}
-
-
-/***************************************************************************/
-int isItInSection(bif_depart, bif_fin, noeud)
-     PTR_BFND bif_depart, bif_fin, noeud;
-{
-  PTR_BFND temp;
-  
-  if (! noeud)
-    return FALSE;
-  
-  for (temp = bif_depart; temp; temp = BIF_NEXT (temp))
-    {
-      if (temp ==  noeud)
-        return TRUE;
-      if (temp == bif_fin)
-        return FALSE;
-    }
-  return FALSE;
-  
-}
-
-
-/***************************************************************************/
-PTR_BFND extractBifSectionBetween(bif_depart, bif_fin)
-     PTR_BFND bif_depart, bif_fin;
-{
-  PTR_BFND temp;
-  
-  if (bif_depart && bif_fin)
-    {
-      for (temp = bif_depart; temp !=  bif_fin; temp = BIF_NEXT (temp))
-        {
-          if (!isItInSection(bif_depart, bif_fin,BIF_CP (temp)))
-            {
-              deleteBfndFrom(BIF_CP (temp),temp);
-              BIF_CP (temp) = NULL;              
-            }
-        }
-  
-      /* on traite maintenant bif_fin */
-      if (!isItInSection(bif_depart, bif_fin,BIF_CP ( bif_fin)))
-        {
-          deleteBfndFrom(BIF_CP (bif_fin), bif_fin);
-           BIF_CP (bif_fin) = NULL;   
-        }
-
-      temp = getNodeBefore(bif_depart);
-      if (temp && bif_fin)
-        BIF_NEXT(temp) = BIF_NEXT (bif_fin);
-      BIF_NEXT (bif_fin) = NULL;
-    }  
-  
-  return bif_depart;
-}
-
-/***************************************************************************/
-PTR_BFND getLastNodeList(b)
-     PTR_BFND b;
-{
-  PTR_BFND temp;  
-  for (temp = b; temp; temp = BIF_NEXT(temp))
-    {      
-      if (!BIF_NEXT(temp))
-        {
-          return temp;          
-        }
-    }
-  return temp;  
-}
-
-/***************************************************************************/
-PTR_BFND getLastNodeOfStmt(b)
-     PTR_BFND b;
-{
-  PTR_BLOB temp,last = NULL;
-  if (!b)
-    return NULL;
-  if (BIF_BLOB2(b))
-    {
-      for (temp = BIF_BLOB2(b); temp ; temp = BLOB_NEXT(temp))
-        {
-          last = temp;
-        }
-    } else
-     {
-       for (temp = BIF_BLOB1(b); temp ; temp = BLOB_NEXT(temp))
-         {
-           last = temp;
-         }      
-     } 
-  if (last)
-    {  
-      if (Check_Lang_Fortran(cur_proj))
-        return BLOB_VALUE(last);
-      else
-        { /* in C the Control end may not exist */
-          return getLastNodeOfStmt(BLOB_VALUE(last));
-        }
-    }
-  else
-    return b;
-}
-
-/* version that does not assume, there is a last */
-/***************************************************************************/
-PTR_BFND getLastNodeOfStmtNoControlEnd(b)
-     PTR_BFND b;
-{
-  PTR_BLOB temp,last = NULL;
-  if (!b)
-    return NULL;
-  if (BIF_BLOB2(b))
-    {
-      for (temp = BIF_BLOB2(b); temp ; temp = BLOB_NEXT(temp))
-        {
-          last = temp;
-        }
-    } else
-     {
-       for (temp = BIF_BLOB1(b); temp ; temp = BLOB_NEXT(temp))
-         {
-           last = temp;
-         }      
-     } 
-  if (last)
-    {  
-      return getLastNodeOfStmt(BLOB_VALUE(last));
-    }
-  else
-    return b;
-}
-
-/* preset some values of symbols for evaluateExpression*/
-#define ALLOCATECHUNKVALUE  100
-static PTR_SYMB  *ValuesSymb = NULL;
-static int       *ValuesInt  = NULL;
-static int        NbValues   = 0;
-static int        NbElement   = 0;
-
-/***************************************************************************/
-void allocateValueEvaluate()
-{
-  int i;
-  PTR_SYMB  *pt1;
-  int       *pt2;
-  
-  pt1 = (PTR_SYMB  *) xmalloc( sizeof(PTR_SYMB  *) * 
-			      (NbValues + ALLOCATECHUNKVALUE));
-  pt2 =  (int *) xmalloc( sizeof(int  *) * (NbValues + ALLOCATECHUNKVALUE));
-  
-  for (i=0; i<NbValues + ALLOCATECHUNKVALUE; i++) {
-    pt1[i] = NULL;
-    pt2[i] = 0;
-  }
-  
-  for (i=0 ; i < NbValues; i++) {
-    pt1[i] = ValuesSymb[i];
-    pt2[i] = ValuesInt[i];
-  }
-  
-  if (NbValues) {
-#ifdef __SPF
-      removeFromCollection(ValuesSymb);
-      removeFromCollection(ValuesInt);
-#endif
-    free(ValuesSymb);
-    free(ValuesInt);
-  }
-    
-  ValuesSymb = pt1;
-  ValuesInt = pt2;
-  NbValues = NbValues + ALLOCATECHUNKVALUE;
-}
-
-/***************************************************************************/
-void addElementEvaluate(symb, val)
-     PTR_SYMB symb;
-     int val;
-{
-  if (!symb)
-    return;
-  while (NbValues <= ( NbElement+1))
-    {
-      allocateValueEvaluate();
-    }
-  ValuesSymb[NbElement] = symb;
-  ValuesInt[NbElement] = val;
-  NbElement++;
-}
-
-
-/***************************************************************************/
-int getElementEvaluate(symb)
-     PTR_SYMB symb;
-{
-  int i;
-  if (!symb)
-    return -1;
-  for (i=0 ; i < NbElement; i++)
-    {
-      if (ValuesSymb[i] == symb)
-        return i;
-    }
-  return -1;
-}
-
-
-/***************************************************************************/
-void resetPresetEvaluate()
-{
-  NbValues = 0;
-  NbElement  = 0;
-  if (ValuesSymb) {
-#ifdef __SPF
-      removeFromCollection(ValuesSymb);      
-#endif
-      free(ValuesSymb);
-  }
-  if (ValuesInt)
-  {
-#ifdef __SPF      
-      removeFromCollection(ValuesInt);
-#endif
-      free(ValuesInt);
-  }
-  ValuesSymb = NULL;
-  ValuesInt = NULL;
-}
-
-/***************************************************************************/
-int* evaluateExpression(expr)
-     PTR_LLND expr;
-{
-  int *res, *op1, *op2, i;
-  
-  res = (int *) xmalloc(2 * sizeof(int));
-  memset((char *) res, 0, 2 * sizeof (int));
-  op1 = (int *) xmalloc(2 * sizeof(int));
-  memset((char *)op1, 0, 2 * sizeof (int));
-  op2 = (int *) xmalloc(2 * sizeof(int));
-  memset((char *) op2, 0, 2 * sizeof (int));
-  if (! expr)
-    {
-      res [0] = -1;
-      return res;
-    }
-  
-  switch (BIF_CODE (expr)) 
-    {
-    case INT_VAL:
-      res [1] = NODE_INT_CST_LOW (expr);
-#ifdef __SPF      
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-    case ADD_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] + op2 [1];
-#ifdef __SPF      
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case MULT_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] * op2 [1];
-#ifdef __SPF      
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case SUBT_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] - op2 [1];
-#ifdef __SPF      
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case DIV_OP :
-        op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1) || (op2[1] == 0))  /*28.05.17 Kolganov*/
-        res [0] = -1;
-      else
-        res [1] = op1 [1] / op2 [1];
-#ifdef __SPF      
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case MOD_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] % op2 [1];
-#ifdef __SPF      
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case EXP_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else {
-        res [1] = op1 [1];
-        for(i=1; i<op2 [1]; i++)
-          res [1] = res [1] * op1 [1];
-      }
-#ifdef __SPF      
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-
-    case MINUS_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      if (op1 [0] == -1)
-        res [0] = -1;
-      else
-        res [1] = - op1 [1];
-#ifdef __SPF      
-      removeFromCollection(op1);      
-#endif
-      free(op1);
-      return res;
-    case VAR_REF: /* assume here that some value for Symbole are given*/
-      {
-        int ind;
-        if ((ind = getElementEvaluate(NODE_SYMB(expr))) != -1)
-          {
-             res [1] = ValuesInt[ind];
-#ifdef __SPF      
-             removeFromCollection(op1);
-             removeFromCollection(op2);
-#endif
-             free(op1); free(op2);
-             return res;
-           } else
-             {
-                res [0] = -1;
-#ifdef __SPF      
-                removeFromCollection(op1);
-                removeFromCollection(op2);
-#endif
-                free(op1); free(op2);
-                return res;
-             }
-      }
-   default :
-     res [0] = -1;
-#ifdef __SPF      
-     removeFromCollection(op1);
-     removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-    }
-}
-
-/***************************************************************************/
-PTR_BFND duplicateStmts(body)
-     PTR_BFND body;
-{
- PTR_BFND copie, last, temp, cherche, lastnode;
- int lenght,i,j;
- PTR_BFND *alloue;
- PTR_BLOB blobtemp;
- PTR_LABEL *label_insection;
- PTR_LABEL lab;
- int maxlabelname;
-
- if (! body) return NULL;
-  /* on calcul d'abord la longueur */
-
- maxlabelname = getLastLabelId();
- 
- lenght = 0;
- for (temp = body; temp ; temp = BIF_NEXT(temp))
-   {
-     lenght++;
-     lastnode = temp;     
-   }
- alloue = (PTR_BFND *) xmalloc(2*lenght * sizeof(PTR_BFND));
- memset((char *) alloue, 0, 2* lenght * sizeof(PTR_BFND));
- 
- /* label part, we record label */
- label_insection = (PTR_LABEL *) xmalloc(2*lenght * sizeof(PTR_LABEL));
- memset((char *) label_insection, 0, 2* lenght * sizeof(PTR_LABEL)); 
- temp = body;
- last = NULL;
- for (i = 0; i < lenght; i++)
-   {
-      copie = (PTR_BFND) newNode (BIF_CODE (temp));
-      BIF_SYMB (copie) = BIF_SYMB (temp);
-      BIF_LL1 (copie) = copyLlNode(BIF_LL1 (temp));
-      BIF_LL2 (copie) = copyLlNode(BIF_LL2 (temp));
-      BIF_LL3 (copie) = copyLlNode(BIF_LL3 (temp));
-      BIF_DECL_SPECS (copie) = BIF_DECL_SPECS(temp);
-      if (last)
-        BIF_NEXT(last) = copie;
-
-     
-      if (BIF_LABEL(temp))/* && (LABEL_BODY(BIF_LABEL(temp)) == temp))*/
-	{
-	  /* create a new label */
-	  label_insection[2*i+1] = (PTR_LABEL) newNode(LABEL_KIND); 
-	  maxlabelname++;
-	  LABEL_STMTNO(label_insection[2*i+1]) = maxlabelname;
-	  LABEL_BODY(label_insection[2*i+1]) = copie;
-	  LABEL_USED(label_insection[2*i+1]) = LABEL_USED(BIF_LABEL(temp));
-	  LABEL_ILLEGAL(label_insection[2*i+1])=LABEL_ILLEGAL(BIF_LABEL(temp));
-	  LABEL_DEFINED(label_insection[2*i+1])=LABEL_DEFINED(BIF_LABEL(temp));
-	  BIF_LABEL(copie) = label_insection[2*i+1];
-	  label_insection[2*i] = BIF_LABEL(temp);
-	} 	  
-
-      /* on fait corresponde temp et copie */
-      alloue[2*i] = temp;
-      alloue[2*i+1] = copie;
-      temp = BIF_NEXT(temp);
-      last = copie;
-   }
-
- /* On met a jour les labels */
- temp = body;
- for (i = 0; i < lenght; i++)
-   {
-     int cas;
-     copie = alloue[2*i+1]; 
-     lab = NULL;
-     
-     /* We treat first the COMGOTO_NODE first */
-     if (BIF_CODE(temp) == COMGOTO_NODE)
-       {
-         PTR_LLND listlab, ptl;
-         int trouve = 0;	
-         
-         listlab = BIF_LL1(copie);
-         while (listlab)
-           {
-             ptl = NODE_OPERAND0(listlab);
-             /* we look in the list */
-             if (ptl)
-               {                
-                 lab = NODE_LABEL(ptl);
-                 trouve = 0;	 
-                 for (j = 0; j < lenght; j++)
-                   {
-                     if (label_insection[2*j])
-                       if (LABEL_STMTNO(label_insection[2*j]) == LABEL_STMTNO(lab))
-                         {
-                           trouve = j+1;
-                           break;
-                         }
-                   }
-                 if(trouve)
-                   {
-                     NODE_LABEL(ptl) =  label_insection[2*(trouve-1)+1];
-                   }
-               }
-             listlab = NODE_OPERAND1(listlab);             
-           }
-         temp = BIF_NEXT(temp);
-         continue;         
-       }
-     
-         
-     if (BIF_LL3(temp) && (NODE_CODE(BIF_LL3(temp)) == LABEL_REF))
-       {
-	 lab = NODE_LABEL(BIF_LL3(temp));
-	 cas = 2;	
-       }
-     else
-       {
-	 lab = BIF_LABEL_USE(temp);
-	 cas = 1;
-       }
-     if (lab)
-       { /* look where the label is the label is defined somewhere */
-	 int trouve = 0;	 
-	 for (j = 0; j < lenght; j++)
-	   {
-	     if (label_insection[2*j])
-	       if (LABEL_STMTNO(label_insection[2*j]) == LABEL_STMTNO(lab))
-		 {
-		   trouve = j+1;
-		   break;
-		 }
-	   }
-	 if(trouve)
-	   {
-	     if (cas == 1)
-	       {
-		 BIF_LABEL_USE(copie) = label_insection[2*(trouve-1)+1];
-	       }
-	     if (cas == 2)
-	       {
-		 if (BIF_LL3(copie))
-		   {
-		     NODE_LABEL(BIF_LL3(copie)) = label_insection[2*(trouve-1)+1];
-		   }
-	       }
-	   } else
-	     {
-	       if (cas == 1)
-		 BIF_LABEL_USE(copie) = lab; /* outside */
-	       /* if ((cas == 2) no change */
-	     }
-       }
-     temp = BIF_NEXT(temp);
-   }
- 
- /* on met a jour le blob list */
- copie = alloue[1];
- for (temp = body; temp ; temp = BIF_NEXT(temp))
-   {
-     if (BIF_BLOB1(temp))
-       { /* on doit cree la blob liste */
-         for (blobtemp = BIF_BLOB1(temp);blobtemp; 
-              blobtemp = BLOB_NEXT(blobtemp)) 
-           {
-             /* on cherche la reference dans le tableaux allouer */
-             cherche = NULL;
-             for (i = 0; i <lenght ; i++)
-               {
-                 if (alloue[2*i] == BLOB_VALUE(blobtemp))
-                     {
-                       cherche = alloue[2*i+1];
-                       break;
-                     }
-               }
-             appendBfndToList1(cherche, copie);
-           }
-       }
-     if (BIF_BLOB2(temp))
-       { /* on doit cree la blob liste */
-         for (blobtemp = BIF_BLOB2(temp);blobtemp; 
-              blobtemp = BLOB_NEXT(blobtemp)) 
-           {
-             /* on cherche la reference dans le tableaux allouer */
-             cherche = NULL;
-             for (i = 0; i <lenght ; i++)
-               {
-                 if (alloue[2*i] == BLOB_VALUE(blobtemp))
-                     {
-                       cherche = alloue[2*i+1];
-                       break;
-                     }
-               }
-             appendBfndToList2(cherche, copie);
-           }
-       }
-     copie = BIF_NEXT(copie);
-   }
-
- /* on remet ici a jour les CP */
- copie = alloue[1];
- for (temp = body; temp ; temp = BIF_NEXT(temp))
-   {
-     if (isItInSection(body, lastnode, BIF_CP(temp)))
-       { /* on cherche le bif_cp pour la copie */
-         cherche = NULL;
-         for (i = 0; i <lenght ; i++)
-           {
-             if (alloue[2*i] == BIF_CP(temp))
-               {
-                 cherche = alloue[2*i+1];
-                 break;
-               }
-           }
-         BIF_CP(copie) = cherche;
-       }
-     copie = BIF_NEXT(copie);
-   }
- copie = alloue[1];
-#ifdef __SPF      
- removeFromCollection(alloue);
- removeFromCollection(label_insection);
-#endif
- free(alloue);
- free(label_insection);
- return copie;
-}
-
-/***************************************************************************/
-int isLabelId(num)
-   int num; 
-{ PTR_LABEL lab;
-  for(lab=PROJ_FIRST_LABEL(); lab; lab=LABEL_NEXT(lab)) 
-     if( num == LABEL_STMTNO(lab))
-       return 1;
-  return 0;
-}
-
-/***************************************************************************/
-int getNewLabelId(llab)
-  int llab;
-{  
-  while(isLabelId(llab))
-    ++llab;
-
-  return llab;
-}
-   
-
-/************************************** New version, does not need extract **************/
-/********************************* only copies a statement and the children *************/
-PTR_BFND duplicateStmtsNoExtract(PTR_BFND body)
-{
-    PTR_BFND copie, last, temp, cherche, lastnode;
-    int lenght, i, j;
-    PTR_BFND *alloue;
-    PTR_BLOB blobtemp;
-    PTR_LABEL *label_insection;
-    PTR_LABEL lab;
-    int maxlabelname, newlabelname;
-
-    if (!body)
-        return NULL;
-    /* on calcul d'abord la longueur */
-
-    maxlabelname = getLastLabelId();
-    newlabelname = 0;
-    lastnode = getLastNodeOfStmt(body);
-
-    /*podd 03.06.14*/
-    if (BIF_CODE(body) == IF_NODE || BIF_CODE(body) == ELSEIF_NODE)
-        while (BIF_CODE(lastnode) == ELSEIF_NODE)
-            lastnode = getLastNodeOfStmt(lastnode);
-    else if (BIF_CODE(body) == FOR_NODE || BIF_CODE(body) == WHILE_NODE)
-    {
-        while (BIF_CODE(lastnode) == FOR_NODE || BIF_CODE(lastnode) == WHILE_NODE)
-            lastnode = getLastNodeOfStmt(lastnode);
-        if (BIF_CODE(lastnode) == LOGIF_NODE)
-            lastnode = BIF_NEXT(lastnode);
-    }
-
-    lenght = 0;
-    for (temp = body; temp; temp = BIF_NEXT(temp))
-    {
-        lenght++;
-        if (lastnode == temp)
-            break;
-    }
-    alloue = (PTR_BFND *)xmalloc(2 * lenght * sizeof(PTR_BFND));
-    memset((char *)alloue, 0, 2 * lenght * sizeof(PTR_BFND));
-
-    /* label part, we record label */
-    label_insection = (PTR_LABEL *)xmalloc(2 * lenght * sizeof(PTR_LABEL));
-    memset((char *)label_insection, 0, 2 * lenght * sizeof(PTR_LABEL));
-    temp = body;
-    last = NULL;
-    for (i = 0; i < lenght; i++)
-    {
-        copie = (PTR_BFND)newNode(BIF_CODE(temp));
-        BIF_SYMB(copie) = BIF_SYMB(temp);
-        BIF_LL1(copie) = copyLlNode(BIF_LL1(temp));
-        BIF_LL2(copie) = copyLlNode(BIF_LL2(temp));
-        BIF_LL3(copie) = copyLlNode(BIF_LL3(temp));
-        if (last)
-            BIF_NEXT(last) = copie;
-
-
-        if (BIF_LABEL(temp))/* && (LABEL_BODY(BIF_LABEL(temp)) == temp))*/
-        {
-            /* create a new label */
-            label_insection[2 * i + 1] = (PTR_LABEL)newNode(LABEL_KIND);
-            if (maxlabelname < 99999)
-                newlabelname = ++maxlabelname;
-            else
-                newlabelname = getNewLabelId(++newlabelname);
-            LABEL_STMTNO(label_insection[2 * i + 1]) = newlabelname;
-            LABEL_BODY(label_insection[2 * i + 1]) = copie;
-            LABEL_USED(label_insection[2 * i + 1]) = LABEL_USED(BIF_LABEL(temp));
-            LABEL_ILLEGAL(label_insection[2 * i + 1]) = LABEL_ILLEGAL(BIF_LABEL(temp));
-            LABEL_DEFINED(label_insection[2 * i + 1]) = LABEL_DEFINED(BIF_LABEL(temp));
-            BIF_LABEL(copie) = label_insection[2 * i + 1];
-            label_insection[2 * i] = BIF_LABEL(temp);
-        }
-
-        /* on fait corresponde temp et copie */
-        alloue[2 * i] = temp;
-        alloue[2 * i + 1] = copie;
-        temp = BIF_NEXT(temp);
-        last = copie;
-    }
-
-    /* On met a jour les labels */
-    temp = body;
-    for (i = 0; i < lenght; i++)
-    {
-        int cas, kind;
-        copie = alloue[2 * i + 1];
-        lab = NULL;
-
-        /* We treat first the COMGOTO_NODE first */
-        switch (BIF_CODE(temp)) 
-        {
-        case COMGOTO_NODE:
-        case ASSGOTO_NODE:
-            kind = 2;
-            break;
-        case ARITHIF_NODE:
-            kind = 3;
-            break;
-        case WRITE_STAT:
-        case READ_STAT:
-        case PRINT_STAT:
-        case BACKSPACE_STAT:
-        case REWIND_STAT:
-        case ENDFILE_STAT:
-        case INQUIRE_STAT:
-        case OPEN_STAT:
-        case CLOSE_STAT:
-            kind = 1;
-            break;
-        default:
-            kind = 0;
-            break;
-        }
-
-
-        if (kind == 1)
-        {
-            PTR_LLND lb, list;
-
-            list = BIF_LL2(copie); /*control list or format*/
-            if (list && NODE_CODE(list) == EXPR_LIST)
-            {
-                for (; list; list = NODE_OPERAND1(list))
-                {
-                    lb = NODE_OPERAND1(NODE_OPERAND0(list));
-                    if (NODE_CODE(lb) == LABEL_REF)
-                        lab = NODE_LABEL(lb);
-                    if (lab)
-                    { /* look where the label is the label is defined somewhere */
-                        int trouve = 0;
-                        for (j = 0; j < lenght; j++)
-                        {
-                            if (label_insection[2 * j])
-                                if (LABEL_STMTNO(label_insection[2 * j]) == LABEL_STMTNO(lab))
-                                {
-                                    trouve = j + 1;
-                                    break;
-                                }
-                        }
-                        if (trouve)
-                        {
-                            NODE_LABEL(lb) = label_insection[2 * (trouve - 1) + 1];
-                        }
-                    }
-                }
-            }
-
-            else if (list && (NODE_CODE(list) == SPEC_PAIR))
-            {
-                lb = (NODE_OPERAND1(list));
-                if (NODE_CODE(lb) == LABEL_REF)
-                    lab = NODE_LABEL(lb);
-                if (lab)
-                { /* look where the label is the label is defined somewhere */
-                    int trouve = 0;
-                    for (j = 0; j < lenght; j++)
-                    {
-                        if (label_insection[2 * j])
-                            if (LABEL_STMTNO(label_insection[2 * j]) == LABEL_STMTNO(lab))
-                            {
-                                trouve = j + 1;
-                                break;
-                            }
-                    }
-                    if (trouve)
-                    {
-                        NODE_LABEL(lb) = label_insection[2 * (trouve - 1) + 1];
-                    }
-                }
-            }
-            temp = BIF_NEXT(temp);
-            continue;
-        }
-
-
-        if (kind > 1)
-        {
-            PTR_LLND listlab, ptl;
-            int trouve = 0;
-
-            listlab = (kind == 2) ? BIF_LL1(copie) : BIF_LL2(copie);
-            while (listlab)
-            {
-                ptl = NODE_OPERAND0(listlab);
-                /* we look in the list */
-                if (ptl)
-                {
-                    lab = NODE_LABEL(ptl);
-                    trouve = 0;
-                    for (j = 0; j < lenght; j++)
-                    {
-                        if (label_insection[2 * j])
-                            if (LABEL_STMTNO(label_insection[2 * j]) == LABEL_STMTNO(lab))
-                            {
-                                trouve = j + 1;
-                                break;
-                            }
-                    }
-                    if (trouve)
-                    {
-                        NODE_LABEL(ptl) = label_insection[2 * (trouve - 1) + 1];
-                    }
-                }
-                listlab = NODE_OPERAND1(listlab);
-            }
-            temp = BIF_NEXT(temp);
-            continue;
-        }
-
-
-
-        lab = NULL;
-        if (BIF_LL3(temp) && (NODE_CODE(BIF_LL3(temp)) == LABEL_REF))
-        {
-            lab = NODE_LABEL(BIF_LL3(temp));
-            cas = 2;
-        }
-        else if (BIF_LL1(temp) && (NODE_CODE(BIF_LL1(temp)) == LABEL_REF))
-        {
-            lab = NODE_LABEL(BIF_LL1(temp));
-            cas = 3;
-        }
-        else
-        {
-            lab = BIF_LABEL_USE(temp);
-            cas = 1;
-        }
-        if (lab)
-        { /* look where the label is the label is defined somewhere */
-            int trouve = 0;
-            for (j = 0; j < lenght; j++)
-            {
-                if (label_insection[2 * j])
-                    if (LABEL_STMTNO(label_insection[2 * j]) == LABEL_STMTNO(lab))
-                    {
-                        trouve = j + 1;
-                        break;
-                    }
-            }
-            if (trouve)
-            {
-                if (cas == 1)
-                {
-                    BIF_LABEL_USE(copie) = label_insection[2 * (trouve - 1) + 1];
-                }
-                if (cas == 2)
-                {
-                    if (BIF_LL3(copie))
-                    {
-                        NODE_LABEL(BIF_LL3(copie)) = label_insection[2 * (trouve - 1) + 1];
-                    }
-                }
-                if (cas == 3)
-                {
-                    if (BIF_LL1(copie))
-                    {
-                        NODE_LABEL(BIF_LL1(copie)) = label_insection[2 * (trouve - 1) + 1];
-                    }
-                }
-
-            }
-            else
-            {
-                if (cas == 1)
-                    BIF_LABEL_USE(copie) = lab; /* outside */
-                      /* if ((cas == 2) no change */
-            }
-        }
-        temp = BIF_NEXT(temp);
-    }
-
-    /* on met a jour le blob list */
-    copie = alloue[1];
-    for (temp = body; temp; temp = BIF_NEXT(temp))
-    {
-        if (BIF_BLOB1(temp))
-        { /* on doit cree la blob liste */
-            for (blobtemp = BIF_BLOB1(temp); blobtemp;
-                blobtemp = BLOB_NEXT(blobtemp))
-            {
-                /* on cherche la reference dans le tableaux allouer */
-                cherche = NULL;
-                for (i = 0; i < lenght; i++)
-                {
-                    if (alloue[2 * i] == BLOB_VALUE(blobtemp))
-                    {
-                        cherche = alloue[2 * i + 1];
-                        break;
-                    }
-                }
-                appendBfndToList1(cherche, copie);
-            }
-        }
-        if (BIF_BLOB2(temp))
-        { /* on doit cree la blob liste */
-            for (blobtemp = BIF_BLOB2(temp); blobtemp;
-                blobtemp = BLOB_NEXT(blobtemp))
-            {
-                /* on cherche la reference dans le tableaux allouer */
-                cherche = NULL;
-                for (i = 0; i < lenght; i++)
-                {
-                    if (alloue[2 * i] == BLOB_VALUE(blobtemp))
-                    {
-                        cherche = alloue[2 * i + 1];
-                        break;
-                    }
-                }
-                appendBfndToList2(cherche, copie);
-            }
-        }
-        copie = BIF_NEXT(copie);
-        if (temp == lastnode)
-            break;
-    }
-
-    /* on remet ici a jour les CP */
-    copie = alloue[1];
-    for (temp = body; temp; temp = BIF_NEXT(temp))
-    {
-        if (isItInSection(body, lastnode, BIF_CP(temp)))
-        { /* on cherche le bif_cp pour la copie */
-            cherche = NULL;
-            for (i = 0; i < lenght; i++)
-            {
-                if (alloue[2 * i] == BIF_CP(temp))
-                {
-                    cherche = alloue[2 * i + 1];
-                    break;
-                }
-            }
-            BIF_CP(copie) = cherche;
-        }
-        else
-            BIF_CP(copie) = NULL;
-        copie = BIF_NEXT(copie);
-        if (temp == lastnode)
-            break;
-    }
-    copie = alloue[1];
-#ifdef __SPF      
-    removeFromCollection(alloue);
-    removeFromCollection(label_insection);
-#endif
-    free(alloue);
-    free(label_insection);
-    return copie;
-}
-
-
-
-/* (ajm)
-   This function will copy one statement and all of its children 
-   (presumably; I didn't touch that one way or the other). 
-
-   It differs from low_level.c:duplicateStmt (v1.00) in that does not 
-   copy all of the BIF_NEXT successors of the statement as well.
-
-*/
-
-/***************************************************************************/
-PTR_BFND duplicateOneStmt(body)
-     PTR_BFND body;
-{
- PTR_BFND copie, last, temp, cherche, lastnode;
- int lenght,i,j;
- PTR_BFND *alloue;
- PTR_BLOB blobtemp;
- PTR_LABEL *label_insection;
- PTR_LABEL lab;
- int maxlabelname;
-
- if (! body) return NULL;
-  /* on calcul d'abord la longueur */
-
- maxlabelname = getLastLabelId();
- 
- lenght = 0;
-/* Changed area, by ajm 1-Feb-94 */
-#if 0
- for (temp = body; temp ; temp = BIF_NEXT(temp))
-   {
-     lenght++;
-     lastnode = temp;     
-   }
-#else
- if ( body != 0 )
- {
-      lenght = 1;
-      lastnode = body;/*podd 12.03.99*/
- }
-#endif /* ajm */
-
- alloue = (PTR_BFND *) xmalloc(2*lenght * sizeof(PTR_BFND));
- memset((char *) alloue, 0, 2* lenght * sizeof(PTR_BFND));
- 
- /* label part, we record label */
- label_insection = (PTR_LABEL *) xmalloc(2*lenght * sizeof(PTR_LABEL));
- memset((char *) label_insection, 0, 2* lenght * sizeof(PTR_LABEL)); 
- temp = body;
- last = NULL;
- for (i = 0; i < lenght; i++)
-   {
-      copie = (PTR_BFND) newNode (BIF_CODE (temp));
-      BIF_SYMB (copie) = BIF_SYMB (temp);
-      BIF_LL1 (copie) = copyLlNode(BIF_LL1 (temp));
-      BIF_LL2 (copie) = copyLlNode(BIF_LL2 (temp));
-      BIF_LL3 (copie) = copyLlNode(BIF_LL3 (temp));
-      BIF_DECL_SPECS (copie) = BIF_DECL_SPECS(temp);
-
-      if (last)
-        BIF_NEXT(last) = copie;
-
-     
-      if (BIF_LABEL(temp))/* && (LABEL_BODY(BIF_LABEL(temp)) == temp))*/
-	{
-	  /* create a new label */
-	  label_insection[2*i+1] = (PTR_LABEL) newNode(LABEL_KIND); 
-	  maxlabelname++;
-	  LABEL_STMTNO(label_insection[2*i+1]) = maxlabelname;
-	  LABEL_BODY(label_insection[2*i+1]) = copie;
-	  LABEL_USED(label_insection[2*i+1]) = LABEL_USED(BIF_LABEL(temp));
-	  LABEL_ILLEGAL(label_insection[2*i+1])=LABEL_ILLEGAL(BIF_LABEL(temp));
-	  LABEL_DEFINED(label_insection[2*i+1])=LABEL_DEFINED(BIF_LABEL(temp));
-	  BIF_LABEL(copie) = label_insection[2*i+1];
-	  label_insection[2*i] = BIF_LABEL(temp);
-	} 	  
-
-      /* on fait corresponde temp et copie */
-      alloue[2*i] = temp;
-      alloue[2*i+1] = copie;
-      temp = BIF_NEXT(temp);
-      last = copie;
-   }
-
- /* On met a jour les labels */
- temp = body;
- for (i = 0; i < lenght; i++)
-   {
-     int cas;
-     copie = alloue[2*i+1]; 
-     lab = NULL;
-     
-     /* We treat first the COMGOTO_NODE first */
-     if (BIF_CODE(temp) == COMGOTO_NODE)
-       {
-         PTR_LLND listlab, ptl;
-         int trouve = 0;	
-         
-         listlab = BIF_LL1(copie);
-         while (listlab)
-           {
-             ptl = NODE_OPERAND0(listlab);
-             /* we look in the list */
-             if (ptl)
-               {                
-                 lab = NODE_LABEL(ptl);
-                 trouve = 0;	 
-                 for (j = 0; j < lenght; j++)
-                   {
-                     if (label_insection[2*j])
-                       if (LABEL_STMTNO(label_insection[2*j]) == LABEL_STMTNO(lab))
-                         {
-                           trouve = j+1;
-                           break;
-                         }
-                   }
-                 if(trouve)
-                   {
-                     NODE_LABEL(ptl) =  label_insection[2*(trouve-1)+1];
-                   }
-               }
-             listlab = NODE_OPERAND1(listlab);             
-           }
-         temp = BIF_NEXT(temp);
-         continue;         
-       }
-     
-         
-     if (BIF_LL3(temp) && (NODE_CODE(BIF_LL3(temp)) == LABEL_REF))
-       {
-	 lab = NODE_LABEL(BIF_LL3(temp));
-	 cas = 2;	
-       }
-     else
-       {
-	 lab = BIF_LABEL_USE(temp);
-	 cas = 1;
-       }
-     if (lab)
-       { /* look where the label is the label is defined somewhere */
-	 int trouve = 0;	 
-	 for (j = 0; j < lenght; j++)
-	   {
-	     if (label_insection[2*j])
-	       if (LABEL_STMTNO(label_insection[2*j]) == LABEL_STMTNO(lab))
-		 {
-		   trouve = j+1;
-		   break;
-		 }
-	   }
-	 if(trouve)
-	   {
-	     if (cas == 1)
-	       {
-		 BIF_LABEL_USE(copie) = label_insection[2*(trouve-1)+1];
-	       }
-	     if (cas == 2)
-	       {
-		 if (BIF_LL3(copie))
-		   {
-		     NODE_LABEL(BIF_LL3(copie)) = label_insection[2*(trouve-1)+1];
-		   }
-	       }
-	   } else
-	     {
-	       if (cas == 1)
-		 BIF_LABEL_USE(copie) = lab; /* outside */
-	       /* if ((cas == 2) no change */
-	     }
-       }
-     temp = BIF_NEXT(temp);
-   }
- 
- /* on met a jour le blob list */
- copie = alloue[1];
-/* Change by ajm */
-#if 0
-   for (temp = body; temp ; temp = BIF_NEXT(temp))
-#else
-   for (temp = body; temp ; temp = 0 /* not BIF_NEXT(temp)!! */ )
-#endif
-   {
-     if (BIF_BLOB1(temp))
-       { /* on doit cree la blob liste */
-         for (blobtemp = BIF_BLOB1(temp);blobtemp; 
-              blobtemp = BLOB_NEXT(blobtemp)) 
-           {
-             /* on cherche la reference dans le tableaux allouer */
-             cherche = NULL;
-             for (i = 0; i <lenght ; i++)
-               {
-                 if (alloue[2*i] == BLOB_VALUE(blobtemp))
-                     {
-                       cherche = alloue[2*i+1];
-                       break;
-                     }
-               }
-             appendBfndToList1(cherche, copie);
-           }
-       }
-     if (BIF_BLOB2(temp))
-       { /* on doit cree la blob liste */
-         for (blobtemp = BIF_BLOB2(temp);blobtemp; 
-              blobtemp = BLOB_NEXT(blobtemp)) 
-           {
-             /* on cherche la reference dans le tableaux allouer */
-             cherche = NULL;
-             for (i = 0; i <lenght ; i++)
-               {
-                 if (alloue[2*i] == BLOB_VALUE(blobtemp))
-                     {
-                       cherche = alloue[2*i+1];
-                       break;
-                     }
-               }
-             appendBfndToList2(cherche, copie);
-           }
-       }
-     copie = BIF_NEXT(copie);
-   }
-
- /* on remet ici a jour les CP */
- copie = alloue[1];
-
-/* Change by ajm */
-#if 0
-   for (temp = body; temp ; temp = BIF_NEXT(temp))
-#else
-   for (temp = body; temp ; temp = 0 /* not BIF_NEXT(temp)!! */ )
-#endif
-   {
-     if (isItInSection(body, lastnode, BIF_CP(temp)))
-       { /* on cherche le bif_cp pour la copie */
-         cherche = NULL;
-         for (i = 0; i <lenght ; i++)
-           {
-             if (alloue[2*i] == BIF_CP(temp))
-               {
-                 cherche = alloue[2*i+1];
-                 break;
-               }
-           }
-         BIF_CP(copie) = cherche;
-       }
-     copie = BIF_NEXT(copie);
-   }
- copie = alloue[1];
-#ifdef __SPF      
- removeFromCollection(alloue);
- removeFromCollection(label_insection);
-#endif
- free(alloue);
- free(label_insection);
- return copie;
-}
-
-/* BW, june 1994
-   This function will copy all the remaining statements in the block to which
-   the given statement belongs (and all of its children) including the given statement 
-
-   It is yet another variation on duplicateStmts and duplicateOneStmt. It
-   is not "fundamentally right" because it does not reproduce the "top-level" blob
-   structure of the block being copied (but it does reproduce the internal 
-   blob structure). 
-   As a result, calling duplicateStmtsBlock with an argument that is itself a result 
-   of duplicateStmtsBlock will not work.
-
-*/
-
-/***************************************************************************/
-PTR_BFND duplicateStmtsBlock(body,saveLabelId)
-     PTR_BFND body;
-     int saveLabelId;
-{
- PTR_BFND copie, last, temp, cherche, lastnode;
- int lenght,i,j;
- PTR_BFND *alloue;
- PTR_BLOB blobtemp;
- PTR_LABEL *label_insection;
- PTR_LABEL lab;
- int maxlabelname, newlabelname;
- PTR_BLOB blob;
- int iii;
-
- if (! body) return NULL;
-  /* on calcul d'abord la longueur */
-
- maxlabelname = getLastLabelId();
- newlabelname = 0;  /*podd 13.01.14*/
- lenght = 0;
-
-/* need to find the correct blob chain and then count how many bif nodes we want to copy */
-  if (!BIF_CP(body))
-    {
-     Message("Error in duplicateStmtsBlock, can't find control parent", 0);
-     exit(0);
-    }
-  else
-    {
-      blob = lookForBifInBlobList(BIF_BLOB1(BIF_CP(body)), body);
-      if (!blob)
-        blob = lookForBifInBlobList(BIF_BLOB2(BIF_CP(body)), body);
-      if (!blob)
-        {
-         Message("Error in duplicateStmtsBlock, can't find the blob", 0);
-         exit(0);
-        }
-    }
-
- lenght = numberOfBifsInBlobList(blob);
-
- for (temp = body, i = 0; i < lenght ; temp = BIF_NEXT(temp), i++)
-     lastnode = temp;     
-
- alloue = (PTR_BFND *) xmalloc(2*lenght * sizeof(PTR_BFND));
- memset((char *) alloue, 0, 2* lenght * sizeof(PTR_BFND));
- 
- /* label part, we record label */
- label_insection = (PTR_LABEL *) xmalloc(2*lenght * sizeof(PTR_LABEL));
- memset((char *) label_insection, 0, 2* lenght * sizeof(PTR_LABEL)); 
- temp = body;
- last = NULL;
- for (i = 0; i < lenght; i++)
-   {
-      copie = (PTR_BFND) newNode (BIF_CODE (temp));
-      BIF_SYMB (copie) = BIF_SYMB (temp);
-      BIF_LL1 (copie) = copyLlNode(BIF_LL1 (temp));
-      BIF_LL2 (copie) = copyLlNode(BIF_LL2 (temp));
-      BIF_LL3 (copie) = copyLlNode(BIF_LL3 (temp));
-      BIF_DECL_SPECS (copie) = BIF_DECL_SPECS(temp);
-
-      if (last)
-        BIF_NEXT(last) = copie;
-
-     
-      if (BIF_LABEL(temp))/* && (LABEL_BODY(BIF_LABEL(temp)) == temp))*/
-	{
-	  /* create a new label */
-	  label_insection[2*i+1] = (PTR_LABEL) newNode(LABEL_KIND);
-          
-          if(saveLabelId)
-              newlabelname = LABEL_STMTNO(BIF_LABEL(temp));  /*use  Label Id of source statement*/
-          else
-	  { if(maxlabelname<99999)      /*podd 06.04.13*/
-              newlabelname = ++maxlabelname;  
-            else
-              newlabelname = getNewLabelId(++newlabelname); 
-          }
-	  /*maxlabelname++;*/  /*podd 06.04.13*/
-	  LABEL_STMTNO(label_insection[2*i+1]) = newlabelname; /* maxlabelname-> newlabelname  *//*podd 13.01.14*/
-	  LABEL_BODY(label_insection[2*i+1]) = copie;
-	  LABEL_USED(label_insection[2*i+1]) = LABEL_USED(BIF_LABEL(temp));
-	  LABEL_ILLEGAL(label_insection[2*i+1])=LABEL_ILLEGAL(BIF_LABEL(temp));
-	  LABEL_DEFINED(label_insection[2*i+1])=LABEL_DEFINED(BIF_LABEL(temp));
-	  BIF_LABEL(copie) = label_insection[2*i+1];
-	  label_insection[2*i] = BIF_LABEL(temp);
-	} 	  
-
-      /* on fait corresponde temp et copie */
-      alloue[2*i] = temp;
-      alloue[2*i+1] = copie;
-      temp = BIF_NEXT(temp);
-      last = copie;
-   }
-
- /* On met a jour les labels */ /*podd 06.04.13  this fragment (renewing of label references ) is copied from function duplicateStmtsNoExtract()*/
- temp = body;
- for (i = 0; i < lenght; i++)
-   {
-     int cas, kind;
-     copie = alloue[2*i+1]; 
-     lab = NULL;
-     
-     /* We treat first the COMGOTO_NODE first */
-     switch(BIF_CODE(temp)) {
-       case COMGOTO_NODE:
-       case ASSGOTO_NODE:
-            kind = 2;
-            break;
-       case ARITHIF_NODE:
-            kind = 3;
-            break;
-       case WRITE_STAT:
-       case READ_STAT:
-       case PRINT_STAT:
-       case BACKSPACE_STAT:
-       case REWIND_STAT:
-       case ENDFILE_STAT:
-       case INQUIRE_STAT:
-       case OPEN_STAT:
-       case CLOSE_STAT:
-            kind = 1;
-            break;
-       default:
-            kind = 0;
-            break;
-     }
-
-
-     if(kind == 1)
-       {
-         PTR_LLND lb, list;
-	
-         list = BIF_LL2(copie); /*control list or format*/
-         if(list && NODE_CODE(list) == EXPR_LIST)
-          {  
-           for(;list;list=NODE_OPERAND1(list))
-           { 
-            lb = NODE_OPERAND1(NODE_OPERAND0(list)); 
-            if(NODE_CODE(lb) == LABEL_REF)
-              lab = NODE_LABEL(lb); 
-            if (lab)
-             { /* look where the label is the label is defined somewhere */
-	       int trouve = 0;	 
-	       for (j = 0; j < lenght; j++)
-	       {
-	         if (label_insection[2*j])
-	           if (LABEL_STMTNO(label_insection[2*j]) == LABEL_STMTNO(lab))
-		   {
-		     trouve = j+1;
-		     break;
-		   }
-	       }
-               if(trouve)
-               {
-	       NODE_LABEL(lb) = label_insection[2*(trouve-1)+1];
-               }
-             } 
-           }
-          }
-
-          else if(list && (NODE_CODE(list) == SPEC_PAIR))
-          {  
-            lb =(NODE_OPERAND1(list)); 
-            if(NODE_CODE(lb) == LABEL_REF)
-              lab = NODE_LABEL(lb);
-            if (lab)
-             { /* look where the label is the label is defined somewhere */
-	       int trouve = 0;	 
-	       for (j = 0; j < lenght; j++)
-	       {
-	         if (label_insection[2*j])
-	           if (LABEL_STMTNO(label_insection[2*j]) == LABEL_STMTNO(lab))
-		   {
-		     trouve = j+1;
-		     break;
-		   }
-	       }
-              if(trouve)
-              {
-	        NODE_LABEL(lb) = label_insection[2*(trouve-1)+1];
-              }
-            }       
-          }
-          temp = BIF_NEXT(temp);
-          continue;
-      }
-
-
-      if(kind > 1)
-       {
-         PTR_LLND listlab, ptl;
-         int trouve = 0;	
-         
-         listlab = (kind==2) ? BIF_LL1(copie) : BIF_LL2(copie);
-         while (listlab)
-           {
-             ptl = NODE_OPERAND0(listlab);
-             /* we look in the list */
-             if (ptl)
-               {                
-                 lab = NODE_LABEL(ptl);
-                 trouve = 0;	 
-                 for (j = 0; j < lenght; j++)
-                   {
-                     if (label_insection[2*j])
-                       if (LABEL_STMTNO(label_insection[2*j]) == LABEL_STMTNO(lab))
-                         {
-                           trouve = j+1;
-                           break;
-                         }
-                   }
-                 if(trouve)
-                   {
-                     NODE_LABEL(ptl) =  label_insection[2*(trouve-1)+1];
-                   }
-               }
-             listlab = NODE_OPERAND1(listlab);             
-           }
-         temp = BIF_NEXT(temp);
-         continue;         
-       }
-
-
-     
-     lab=NULL;    
-     if (BIF_LL3(temp) && (NODE_CODE(BIF_LL3(temp)) == LABEL_REF))
-       {
-	 lab = NODE_LABEL(BIF_LL3(temp)); 
-	 cas = 2;	
-       }
-     else if (BIF_LL1(temp) && (NODE_CODE(BIF_LL1(temp)) == LABEL_REF))
-       {
-	 lab = NODE_LABEL(BIF_LL1(temp));
-	 cas = 3;	
-       }
-     else
-       {
-	 lab = BIF_LABEL_USE(temp);
-	 cas = 1;
-       }
-     if (lab)
-       { /* look where the label is the label is defined somewhere */
-	 int trouve = 0;	 
-	 for (j = 0; j < lenght; j++)
-	   {
-	     if (label_insection[2*j])
-	       if (LABEL_STMTNO(label_insection[2*j]) == LABEL_STMTNO(lab))
-		 {
-		   trouve = j+1;
-		   break;
-		 }
-	   }
-	 if(trouve)
-	   {
-	     if (cas == 1)
-	       {
-		 BIF_LABEL_USE(copie) = label_insection[2*(trouve-1)+1];
-	       }
-	     if (cas == 2)
-	       {
-		 if (BIF_LL3(copie))
-		   {
-		     NODE_LABEL(BIF_LL3(copie)) = label_insection[2*(trouve-1)+1];
-		   }
-	       }
-             if (cas == 3)
-	       {
-		 if (BIF_LL1(copie))
-		   {
-		     NODE_LABEL(BIF_LL1(copie)) = label_insection[2*(trouve-1)+1];
-		   }
-	       }
-
-	   } else
-	     {
-	       if (cas == 1)
-		 BIF_LABEL_USE(copie) = lab; /* outside */
-	       /* if ((cas == 2) no change */
-	     }
-       }
-     temp = BIF_NEXT(temp);
-   }
-
- 
- /* on met a jour le blob list */  
- copie = alloue[1];
- for (temp = body, iii = 0; iii <lenght ; temp = BIF_NEXT(temp), iii++)
-   {
-     if (BIF_BLOB1(temp))
-       { /* on doit cree la blob liste */
-         for (blobtemp = BIF_BLOB1(temp);blobtemp; 
-              blobtemp = BLOB_NEXT(blobtemp)) 
-           {
-             /* on cherche la reference dans le tableaux allouer */
-             cherche = NULL;
-             for (i = 0; i <lenght ; i++)
-               {
-                 if (alloue[2*i] == BLOB_VALUE(blobtemp))
-                     {
-                       cherche = alloue[2*i+1];
-                       break;
-                     }
-               }
-             appendBfndToList1(cherche, copie);
-           }
-       }
-     if (BIF_BLOB2(temp))
-       { /* on doit cree la blob liste */
-         for (blobtemp = BIF_BLOB2(temp);blobtemp; 
-              blobtemp = BLOB_NEXT(blobtemp)) 
-           {
-             /* on cherche la reference dans le tableaux allouer */
-             cherche = NULL;
-             for (i = 0; i <lenght ; i++)
-               {
-                 if (alloue[2*i] == BLOB_VALUE(blobtemp))
-                     {
-                       cherche = alloue[2*i+1];
-                       break;
-                     }
-               }
-             appendBfndToList2(cherche, copie);
-           }
-       }
-     copie = BIF_NEXT(copie);
-   }
-
- /* on remet ici a jour les CP */
- copie = alloue[1];
- for (temp = body, iii = 0; iii < lenght ; temp = BIF_NEXT(temp), iii++)
-   {
-     if (isItInSection(body, lastnode, BIF_CP(temp)))
-       { /* on cherche le bif_cp pour la copie */
-         cherche = NULL;
-         for (i = 0; i <lenght ; i++)
-           {
-             if (alloue[2*i] == BIF_CP(temp))
-               {
-                 cherche = alloue[2*i+1];
-                 break;
-               }
-           }
-         BIF_CP(copie) = cherche;
-       }
-     copie = BIF_NEXT(copie);
-   }
- copie = alloue[1];
-#ifdef __SPF      
- removeFromCollection(alloue);
- removeFromCollection(label_insection);
-#endif
- free(alloue);
- free(label_insection);
- return copie;
-}
-   
-/***************************************************************************/
-PTR_BFND getFunctionHeader(symb)
-     PTR_SYMB symb;
-{
-  PTR_BFND thebif;
-  if ((SYMB_CODE(symb) != FUNCTION_NAME) &&
-      (SYMB_CODE(symb) != PROCESS_NAME) &&
-      (SYMB_CODE(symb) != PROCEDURE_NAME) &&
-      (SYMB_CODE(symb) != PROGRAM_NAME))
-    return NULL;
-
-/*  if (SYMB_FUNC_HEDR(symb))
-    return SYMB_FUNC_HEDR(symb); */
-
-  thebif = PROJ_FIRST_BIF();
-  for (;thebif;thebif=BIF_NEXT(thebif)) 
-    {
-      if (((BIF_CODE(thebif) == FUNC_HEDR)  ||
-           (BIF_CODE(thebif) == PROC_HEDR)  || 
-           (BIF_CODE(thebif) == PROS_HEDR)  || 
-           (BIF_CODE(thebif) == PROG_HEDR))
-          &&
-          (BIF_SYMB(thebif) == symb))
-        return thebif;
-    }
-  return NULL;
-}
-
-/******* same as getFunctionHeader but looks in all the files *******/
-
-PTR_BFND getFunctionHeaderAllFile(symb)
-     PTR_SYMB symb;
-{
-  PTR_FILE ptf, saveptf;
-  PTR_BLOB ptb;
-  PTR_BFND tmp;
-
-  if ((SYMB_CODE(symb) != FUNCTION_NAME) &&
-      (SYMB_CODE(symb) != PROCESS_NAME) &&
-      (SYMB_CODE(symb) != PROCEDURE_NAME) &&
-      (SYMB_CODE(symb) != PROGRAM_NAME))
-
-    return NULL;
-  
-  /* look in currentfile first*/
-  tmp = getFunctionHeader(symb);
-  if (tmp)
-    {
-      return tmp;
-    }
-
-  saveptf = pointer_on_file_proj;
-  /* have to look in the bif list   return SYMB_FUNC_HEDR(symb); seens not to be set */
-  
-  for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-    {
-      ptf = (PTR_FILE) BLOB_VALUE (ptb);
-      cur_file = ptf;      
-      /* reset the toolbox and pointers*/
-      Init_Tool_Box();
-      tmp = getFunctionHeader(symb);
-      if (tmp)
-        {
-          /* reset the pointers */
-          cur_file = saveptf;
-          Init_Tool_Box();
-          return tmp;
-        }
-    }
-  cur_file = saveptf;
-  Init_Tool_Box();
-  return NULL;
-}
-     
-/***************************************************************************/
-PTR_BFND getGlobalFunctionHeader(name)
-     char *name;
-{
-  PTR_SYMB tsymb;
-  PTR_FILE ptf;
-  PTR_BLOB ptb;
-  PTR_BFND tmp;
-  
-
-  for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-    {
-      ptf = (PTR_FILE) BLOB_VALUE (ptb);
-      cur_file = ptf;      
-      /* reset the toolbox and pointers*/
-      Init_Tool_Box();
-      
-      for (tsymb = PROJ_FIRST_SYMB() ; tsymb; tsymb = SYMB_NEXT(tsymb))
-        {
-          if ( SYMB_IDENT(tsymb) && (strcmp (name, SYMB_IDENT(tsymb)) == 0)
-              && ((SYMB_CODE(tsymb) == FUNCTION_NAME) ||
-                  (SYMB_CODE(tsymb) == PROCESS_NAME) ||
-                  (SYMB_CODE(tsymb) == PROCEDURE_NAME)))
-            {
-              tmp = getFunctionHeader(tsymb);
-              if (tmp)
-                return tmp;
-            }
-        }
-    }
-  return NULL;
-}
-
-
-/* return true if declare in the function or global */
-/***************************************************************************/
-int inScope(header, symb)
-     PTR_BFND header;
-     PTR_SYMB symb;
-{
-  PTR_BFND temp;
-
-  if (!SYMB_SCOPE(symb))
-     return FALSE;
-
-  if (BIF_CODE(SYMB_SCOPE(symb)) == GLOBAL)
-    return TRUE;
-
-  temp = SYMB_SCOPE(symb);
-  while (temp)
-    {
-      if (temp == header)
-	return TRUE;
-      temp = BIF_CP(temp);
-    }
-  return FALSE;
-}
-
-/* return return FUNC_HEDR or Global*/
-/***************************************************************************/
-PTR_BFND getFuncScope(header)
-     PTR_BFND header;
-{
-  /*  PTR_BFND temp;*/ /*podd 15.03.99*/
-  
-  if (!header)
-    return NULL;
-
-  if (BIF_CODE(header) == GLOBAL)
-    return header;
-  if (BIF_CODE(header) == FUNC_HEDR)
-    return header;
-  return getFuncScope(BIF_CP(header));
-}
-
-/***************************************************************************/
-int localToFunction(header, symb)
-     PTR_BFND header;
-     PTR_SYMB symb;
-{
-  PTR_BFND temp;
-
-  if (!SYMB_SCOPE(symb))
-     return FALSE;
-
-  if (BIF_CODE(SYMB_SCOPE(symb)) == GLOBAL)
-    return FALSE;
-
-  temp = SYMB_SCOPE(symb);
-  if (temp == header)
-    return FALSE;    /* this a parameter */
-  while (temp)
-    {
-      if (temp == header)
-	return TRUE;
-      temp = BIF_CP(temp);
-    }
-  return FALSE;
-}
-
-/***************************************************************************/
-int isInStmt(stmt,pt)
-     PTR_BFND stmt,pt;
-{
-  if (!stmt || !pt)
-    return FALSE;
-
- if (BIF_CODE(stmt) == GLOBAL)
-    return TRUE;
-  
-  if (BIF_CODE(pt) == GLOBAL)
-    return FALSE;
-
-  if (stmt == BIF_CP(pt))
-    return TRUE;
-
-  return isInStmt(stmt,BIF_CP(pt));
-}
-
-/***************************************************************************/
-int exprListLength(first)
-PTR_LLND first;
-{
-  PTR_LLND tail;
-  int len = 0;
-  if (first == NULL)
-    return(0);
-  for (tail = first; tail; tail = NODE_OPERAND1(tail) )
-    len++;
-  return(len);
-}
-
-/****************************************************************
- *								*
- *   Get_ll_with_id  -- find the low level node in the current	*
- *		   active file with given id number		*
- *								*
- *   Input:							*
- *	id -- the low level node id number			*
- *								*
- *   Output:							*
- *	the corresponding low level node pointer if found	*
- *	nil otherwise						*
- *								*
- ****************************************************************/
-/***************************************************************************/
-PTR_LLND Get_ll_with_id(id)
-    int id;
-{
-    PTR_LLND ll;
-
-    for (ll = PROJ_FIRST_LLND (); ll ; ll = NODE_NEXT (ll))
-	if (NODE_ID (ll) == id)
-	    return ll;
-    return NULL;
-}
-
-/***************************************************************************/
-PTR_BFND Get_bif_with_id(id)
-     int id;
-{
-  PTR_BFND bif;
-  
-  for (bif = PROJ_FIRST_BIF(); bif ; bif = BIF_NEXT (bif))
-    if (BIF_ID (bif) == id)
-      return bif;
-  return NULL;
-}
-
-/***************************************************************************/
-PTR_SYMB Get_Symb_with_id(id)
-     int id;
-{
-  PTR_SYMB symb;
-  
-  for (symb = PROJ_FIRST_SYMB (); symb ; symb = SYMB_NEXT (symb))
-    if (SYMB_ID (symb) == id)
-      return symb;
-  return NULL;
-}
-
-/***************************************************************************/
-PTR_TYPE Get_type_with_id(id)
-     int id;
-     
-{
-  PTR_TYPE type;
-  
-  for (type = PROJ_FIRST_TYPE (); type ; type = TYPE_NEXT (type))
-    if (TYPE_ID (type) == id)
-      return type;
-  return NULL;
-}
-
-/***************************************************************************/
-PTR_LABEL Get_label_with_id(id)
-     int id;
-{
-  PTR_LABEL label;
-  
-  for (label = PROJ_FIRST_LABEL (); label ; label = LABEL_NEXT (label))
-    if (LABEL_ID (label) == id)
-      return label;
-  return NULL;
-}
-
-/***************************************************************************/
-PTR_CMNT Get_cmnt_with_id(id)
-     int id;
-{
-  PTR_CMNT comment;
-  
-  for (comment = PROJ_FIRST_CMNT (); comment ; comment = CMNT_NEXT (comment))
-    if (CMNT_ID (comment) == id)
-      return comment;
-  return NULL;
-}
-   
-/***************************************************************************/
-int getLastLabelId()
-{
-    int maxlabelname;
-    PTR_LABEL lab;
-
-    maxlabelname = 0;
-    for (lab = PROJ_FIRST_LABEL(); lab; lab = LABEL_NEXT(lab))
-    {
-        if (maxlabelname < LABEL_STMTNO(lab))
-        {
-            maxlabelname = LABEL_STMTNO(lab);
-        }
-    }
-
-    return maxlabelname;
-}
-   
- 
-/***************************************************************************/
-PTR_LABEL getLastLabel()
-{
-  PTR_LABEL lab;
-  
-  for (lab = PROJ_FIRST_LABEL(); lab; lab = LABEL_NEXT(lab))
-    {
-      if  (!LABEL_NEXT(lab))
-	return lab;
-    }
-  return NULL;
-}
-    
-/***************************************************************************/
-PTR_SYMB getSymbolWithName(name, scope)
-     char *name;
-     PTR_BFND scope;
-{
-  PTR_SYMB tsymb;
-  PTR_BFND temp;
-  
- for (tsymb = PROJ_FIRST_SYMB() ; tsymb; tsymb = SYMB_NEXT(tsymb))
-   {
-     if ( SYMB_IDENT(tsymb) && (strcmp (name, SYMB_IDENT(tsymb)) == 0))
-       {
-         /* we check the scope */
-         temp = scope;         
-         while (temp)
-           {
-             if (SYMB_SCOPE(tsymb) == temp)
-                  return tsymb;
-	     if (BIF_CODE(temp) != GLOBAL)
-	       temp = BIF_CP(temp);
-	     else
-	       temp = NULL;
-           }
-       }
-   }
-  /* si non trouver on en recupere 1 */
-  for (tsymb = PROJ_FIRST_SYMB() ; tsymb; tsymb = SYMB_NEXT(tsymb))
-    {
-       if ( SYMB_IDENT(tsymb) && (strcmp (name, SYMB_IDENT(tsymb)) == 0))
-         {
-           return tsymb;
-         }
-     }
-  return NULL;
-}
-
-
-/***************************************************************************/
-PTR_SYMB getSymbolWithNameInScope(name, scope)
-     char *name;
-     PTR_BFND scope;
-{
-  PTR_SYMB tsymb;
-  PTR_BFND temp;
-  
- for (tsymb = PROJ_FIRST_SYMB() ; tsymb; tsymb = SYMB_NEXT(tsymb))
-   {
-     if ( SYMB_IDENT(tsymb) && (strcmp (name, SYMB_IDENT(tsymb)) == 0))
-       {
-         /* we check the scope */
-         if (scope)
-           return tsymb;
-         temp = scope;         
-         while (temp)
-           {
-             if (SYMB_SCOPE(tsymb) == temp)
-                  return tsymb;
-	     if (BIF_CODE(temp) != GLOBAL)
-	       temp = BIF_CP(temp);
-	     else
-	       temp = NULL;
-           }
-       }
-   }
-  return NULL;
-}
-
-/***************************************************************************/
-int makeLinearExpr(exp,coef,symb,size, last)
-     PTR_LLND exp;
-     int *coef;
-     PTR_SYMB *symb;
-     int size;
-     int *last;    
-{
-  return makeLinearExpr_Sign(exp,coef,symb,size, last,1,1);
-}
-
-/* initialy coeff are 0, return 1 if Ok, 0 if abort*/
-/***************************************************************************/
-int makeLinearExpr_Sign(exp,coef,symb,size, last,sign,factor)
-     PTR_LLND exp;
-     int *coef;
-     PTR_SYMB *symb;
-     int size;
-     int *last;  
-     int sign;     
-     int factor;
-{
-  int code;
-  int i, *res1,*res2;
-  
-  if (!exp)
-    return TRUE;
-  
-  code = NODE_CODE(exp);
-  switch (code)
-    {
-    case VAR_REF:
-      for (i=0; i< size; i++)
-        {
-          if (NODE_SYMB(exp) == symb[i])
-            {
-              coef[i] = coef[i] + sign*factor;
-              break;
-            }
-        }
-      break;
-    case SUBT_OP:
-      makeLinearExpr_Sign(NODE_OPERAND0(exp),coef,symb,size,last,sign,factor);
-      makeLinearExpr_Sign(NODE_OPERAND1(exp),coef,symb,size,last,-1*sign,factor);
-      break;
-    case ADD_OP:
-      makeLinearExpr_Sign(NODE_OPERAND0(exp),coef,symb,size,last,sign,factor);
-      makeLinearExpr_Sign(NODE_OPERAND1(exp),coef,symb,size,last,sign,factor);
-      break;
-    case MULT_OP:
-      res1 = evaluateExpression (NODE_OPERAND0(exp));
-      res2 = evaluateExpression (NODE_OPERAND1(exp));
-      if ((res1[0] != -1) && (res2[0] != -1))
-        {
-          *last = *last + factor*sign*(res1[1]*res2[1]);
-        } else
-          {
-            if (res1[0] != -1) 
-              {
-                /* la constante est le fils gauche */
-                if (NODE_CODE(NODE_OPERAND1(exp)) != VAR_REF)
-                  return  makeLinearExpr_Sign(NODE_OPERAND1(exp),coef,symb,size, last,sign,res1[1]*factor);
-                for (i=0; i< size; i++)
-                  {
-                    if (NODE_SYMB(NODE_OPERAND1(exp)) == symb[i])
-                      {
-                        coef[i] = coef[i] + factor*sign*(res1[1]);
-                        break;
-                      }
-                  }
-              } else
-                if (res2[0] != -1) 
-                  {
-                    /* la constante est le fils droit */
-                    if (NODE_CODE(NODE_OPERAND0(exp)) != VAR_REF)
-                      return  makeLinearExpr_Sign(NODE_OPERAND0(exp),coef,symb,size, last,sign,res2[1]*factor);
-
-                    for (i=0; i< size; i++)
-                      {
-                        if (NODE_SYMB(NODE_OPERAND0(exp)) == symb[i])
-                          {
-                            coef[i] = coef[i] + factor*sign*(res2[1]);
-                            break;
-                          }
-                      }
-                  } else                    
-                    return FALSE;
-          }
-      break;
-    case INT_VAL:
-      *last = *last + factor*sign*(NODE_INT_CST_LOW(exp));
-      break;
-    default:
-      
-      return FALSE;
-    }
-  return TRUE;
-}
-
-
-/***************************************************************************/
-char* Get_Function_Name_For_Call(pt)
-PTR_LLND pt;
-{
-  if (!pt)
-    return NULL;
-
-  if (NODE_CODE(pt) != FUNC_CALL)
-    return NULL;
-  if (NODE_SYMB(pt))
-    return SYMB_IDENT(NODE_SYMB(pt));
-  else
-    return NULL;
-}
-
-/***************************************************************************/
-PTR_BFND Get_Last_Node_Of_Project()
-{
-  PTR_BFND temp;
-
-  for (temp = PROJ_FIRST_BIF();  temp;  temp = BIF_NEXT(temp))
-    {
-      if (!BIF_NEXT(temp))
-	return temp;
-    }
-  return NULL;
-}
-
-/***************************************************************************/
-PTR_LLND Follow_Llnd(ll,c)
-PTR_LLND ll;
-int c;
-{
-  PTR_LLND pt;
-  if(c == 2)
-    {
-      pt = ll;
-      while(pt)
-	{
-	  if (NODE_OPERAND1(pt) == NULL)
-	    return pt;
-	  pt = NODE_OPERAND1(pt);	  
-	}
-    } else
-      {
-        pt = ll;
-        while(pt)
-          {
-            if (NODE_OPERAND1(pt) == NULL)
-              return NODE_OPERAND0(pt);
-            pt = NODE_OPERAND1(pt);	  
-          }
-      }
-  return NULL;
-}
-
-/***************************************************************************/
-PTR_LLND Follow_Llnd0(ll)
-PTR_LLND ll;
-{
-  PTR_LLND pt;
-  pt = ll;
-  while(pt)
-    {
-      if (NODE_OPERAND0(pt) == NULL)
-	return pt;
-      pt = NODE_OPERAND0(pt);	  
-    }
-  return NULL;
-}
-
-/***************************************************************************/
-PTR_LLND Get_Th_Parameter_For_Call(ptin,n)
-     PTR_LLND ptin;
-     int n;
-{
-  int i;
-  PTR_LLND pt;
-  pt = ptin;
-  
-  if (!pt)
-    return NULL;
-
-  if (NODE_CODE(pt) != FUNC_CALL)
-    return NULL;
-
-  if (!NODE_OPERAND0(pt))
-    return NULL;
-
-  pt = NODE_OPERAND0(pt); 
-  
-  if (!NODE_OPERAND0(pt))
-    return NULL; /* the node is an expression list with only 
-                    one node, an expression list */
-  pt = NODE_OPERAND0(pt); 
-  for (i = 0; (i < n) && pt; i++)
-    {
-      pt = NODE_OPERAND1 (pt);
-    }
-  
-  if (pt)
-    return NODE_OPERAND0(pt);
-  else
-     return NULL;
-}
-
-/* old function kept for the annotation part */
-/***************************************************************************/
-PTR_LLND Get_First_Parameter_For_Call(pt)
-PTR_LLND pt;
-{
-  if (!pt)
-    return NULL;
-
-  if (NODE_CODE(pt) != FUNC_CALL)
-    return NULL;
-
-  if (!NODE_OPERAND0(pt))
-    return NULL;
-  pt = NODE_OPERAND0 (NODE_OPERAND0(pt));
-  return pt;
-
-}
-
-/***************************************************************************/
-PTR_LLND Get_Second_Parameter_For_Call(pt)
-PTR_LLND pt;
-{
-  if (!pt)
-    return NULL;
-
-  if (NODE_CODE(pt) != FUNC_CALL)
-    return NULL;
-
-  if (!NODE_OPERAND0(pt))
-    return NULL;
-
-  pt = NODE_OPERAND1(NODE_OPERAND0(pt));
-  if (!pt)
-    return NULL;
-  else
-    return NODE_OPERAND0(pt);
-
-}
-
-/***************************************************************************/
-int Is_String_Val_With_Val(expr,str)
-     PTR_LLND expr;
-     char *str;
-{
-  if (!str)
-    return FALSE;
-  if (!expr)
-    return FALSE;
-
-  if (NODE_CODE(expr) != STRING_VAL)
-    return FALSE;
-
-  if (strcmp(NODE_STRING_POINTER(expr),str) == 0)
-    return TRUE;
-
-    return FALSE;
-
-}
-
-/***************************************************************************/
-void Replace_String_In_Expression(exprold, str, exprnew)
-     char *str;
-     PTR_LLND exprold, exprnew;
-{
-  if (!exprold || !exprnew)
-    return ;
-
-  if (Is_String_Val_With_Val(NODE_OPERAND0(exprold),str))
-    NODE_OPERAND0(exprold) = exprnew;
-  else
-    Replace_String_In_Expression(NODE_OPERAND0(exprold), str, exprnew);
-  
-      
-  if (Is_String_Val_With_Val(NODE_OPERAND1(exprold),str))
-    NODE_OPERAND1(exprold) = exprnew;
-  else
-    Replace_String_In_Expression(NODE_OPERAND1(exprold), str, exprnew);
-  
-}
-
-/* Originally coded by fbodin, but the code used K&R varargs conventions,
-   I have rewritten the code to use ANSI conventions (phb) */
-/***************************************************************************/
-PTR_LLND Make_Function_Call(PTR_SYMB symb, PTR_TYPE type, int taille, ...)
-{
-  va_list p;
-  PTR_LLND func_call, temp, op, last;
-  int i; /* nb parametres*/  /* FRENCH! */
-  
-  /* Set pointer p to the very first variable argument in list */
-  va_start(p,taille);
-
-  func_call = newExpr(FUNC_CALL,type,NULL);
-  NODE_SYMB(func_call) = symb;
-
-  last = NULL;
-  temp = NULL;
-  
-  /* Loop through remaining arguments, extracting them */
-  for (i=1;i<=taille;i++)
-    {
-      /* Extract 3+ith argument (type PTR_LLND), inc arg pointer p */
-      op = va_arg(p,PTR_LLND);
-      temp = newExpr(EXPR_LIST,NULL,op,NULL);
-      if (!last) 
-        NODE_OPERAND0(func_call) = temp;
-      else
-        NODE_OPERAND1(last) = temp;
-      last  = temp;      
-    }
-  va_end(p);
-  return func_call;
-}
-
-/*******************************MISCELLANEOUS*******************************/
-char* Remove_Carriage_Return(str)
-char *str;
-{
-  int i =0;
-
-  if (str == NULL)
-    return NULL;
-
-  while (str[i] != '\0')
-    {
-      if (str[i] == '\n')
-	str[i] = ' ';
-      i++;
-    }
-  return str;
-}
-
-
-
-/***************************************************************************/
-int Apply_To_Bif(bif, f)
-     PTR_BFND bif;
-     int (*f)();
-{
-  PTR_BLOB blob;
-  int resul;
-  
-  if (!bif)
-    return FALSE;
-  
-  resul = f(bif);  
-
-  for (blob = BIF_BLOB1 (bif); blob; blob = BLOB_NEXT (blob))
-    {
-      resul = resul |  Apply_To_Bif (BLOB_VALUE (blob), f);
-    }
-  
-  for (blob = BIF_BLOB2 (bif); blob; blob = BLOB_NEXT (blob))
-    {
-      resul =  resul | Apply_To_Bif (BLOB_VALUE (blob), f);
-    }
-  return resul;
-  
-}
-
-/* reset to null the bif_next */
-/***************************************************************************/
-void Reset_Bif_Next_Chain(start)
-     PTR_BFND start;
-{
-  PTR_BLOB blob;
-
-  if (!start)
-    return ;
-    
-  BIF_NEXT(start) = NULL;
-
-  for (blob = BIF_BLOB1(start); blob ; blob = BLOB_NEXT(blob))
-    {
-      Reset_Bif_Next_Chain(BLOB_VALUE(blob));
-    }
-  for (blob = BIF_BLOB2(start); blob ; blob = BLOB_NEXT(blob))
-    {
-       Reset_Bif_Next_Chain(BLOB_VALUE(blob));
-    }
-}
-
-/***************************************************************************/
-void Count_Bif_Next_Chain(start)
-     PTR_BFND start;
-{
-  PTR_BLOB blob;
-
-  if (!start)
-    return;
-    
-  if (BIF_NEXT(start) == NULL)
-    {
-      CountNullBifNext++;
-/*      Message("Bif_Next is Null", BIF_LINE(start));*/
-      
-    }
-
-  for (blob = BIF_BLOB1(start); blob ; blob = BLOB_NEXT(blob))
-    {
-      Count_Bif_Next_Chain(BLOB_VALUE(blob));
-    }
-  for (blob = BIF_BLOB2(start); blob ; blob = BLOB_NEXT(blob))
-    {
-       Count_Bif_Next_Chain(BLOB_VALUE(blob));
-    }
-}
-
-/* Redo the BIF_NEXT Field for the DATA base so it is correct in the data 
-   return the last also reset the BIF_ID to be added to low level and call
-   in init toolbax */
-static int idfirst = 1;
-/***************************************************************************/
-PTR_BFND Redo_Bif_Next_Chain_Internal(start)
-     PTR_BFND start;
-{
-    PTR_BLOB blob;
-    PTR_BFND last;
-
-    if (!start)
-        return NULL;
-
-//  BIF_ID(start) = idfirst;   /*podd 29.06.20 */
-//  idfirst++;
-
-    if (BIF_BLOB1(start))
-    {
-        BIF_NEXT(start) = BLOB_VALUE(BIF_BLOB1(start));
-    }
-    last = start;
-    for (blob = BIF_BLOB1(start); blob; blob = BLOB_NEXT(blob))
-    {
-        last = Redo_Bif_Next_Chain_Internal(BLOB_VALUE(blob));
-        if (BLOB_NEXT(blob))
-            BIF_NEXT(last) = BLOB_VALUE(BLOB_NEXT(blob));
-
-        if (!last)
-            last = BLOB_VALUE(blob);
-    }
-
-    if (last)
-    {
-        if (BIF_BLOB2(start))
-            BIF_NEXT(last) = BLOB_VALUE(BIF_BLOB2(start));
-    }
-    for (blob = BIF_BLOB2(start); blob; blob = BLOB_NEXT(blob))
-    {
-        last = Redo_Bif_Next_Chain_Internal(BLOB_VALUE(blob));
-        if (BLOB_NEXT(blob))
-            BIF_NEXT(last) = BLOB_VALUE(BLOB_NEXT(blob));
-        if (!last)
-            last = BLOB_VALUE(blob);
-    }
-    return last;
-}
-
-
-/***************************************************************************/
-PTR_BFND LocalRedoBifNextChain(start)
-     PTR_BFND start;
-{
-  PTR_BLOB blob;
-  PTR_BFND last;
-
-  if (!start)
-    return NULL;  
-  if (BIF_BLOB1(start))
-    {
-      BIF_NEXT(start) = BLOB_VALUE(BIF_BLOB1(start));
-    }
-  last = start;
-  for (blob = BIF_BLOB1(start); blob ; blob = BLOB_NEXT(blob))
-    {
-      last = LocalRedoBifNextChain(BLOB_VALUE(blob));
-      if (BLOB_NEXT(blob))
-        BIF_NEXT(last) = BLOB_VALUE(BLOB_NEXT(blob));
-      
-      if (!last)
-        last = BLOB_VALUE(blob);
-    }
-
-  if (last)
-    {
-      if (BIF_BLOB2(start))
-        BIF_NEXT(last) = BLOB_VALUE(BIF_BLOB2(start));
-    }
-  for (blob = BIF_BLOB2(start); blob ; blob = BLOB_NEXT(blob))
-    {
-      last = LocalRedoBifNextChain(BLOB_VALUE(blob));
-      if (BLOB_NEXT(blob))
-        BIF_NEXT(last) = BLOB_VALUE(BLOB_NEXT(blob));
-      if (!last)
-        last = BLOB_VALUE(blob);
-    }
-  return last;
-}
-
-/***************************************************************************/
-void Redo_Bif_Next_Chain(start)
-     PTR_BFND start;
-{
-  int i;
-  PTR_BFND thebif;
-  Reset_Bif_Next_Chain(start);
-  Redo_Bif_Next_Chain_Internal(start);
-  Count_Bif_Next_Chain(start);
-  thebif = PROJ_FIRST_BIF();
-  i = 1;
-  for (;thebif;thebif=BIF_NEXT(thebif), i++) 
-    BIF_ID(thebif) = i;        
-  CUR_FILE_NUM_BIFS() = i-1;
-}
-
-/****************************** Added by D.Windheiser ************************/
-/* find the bif node corresponding to a given line number
-   Note that if line is a continuation line, there is no bif node 
-   with this line number
-   So the corresponding bif node is the bif node with the
-   largest line number lower or equal to the line num 
-*/
-
-/****************************************************************
- *								*
- *   FindNearBifNode -- find the corresponding BIF node given a	*
- *		    filename and line number			*
- *								*
- *   Input:							*
- *	    filename - name of the file to be looked upon	*
- *	    line     - line number to be checked		*
- *								*
- *   Output:							*
- *	    A bif pointer (PTR_BFND) points to the bif node	*
- *	    corresponds to the given line number		*
-*	    NULL if error occured				*
- *								*
- ****************************************************************/
-
-/***************************************************************************/
-
-/***************************************************************************/
-PTR_BFND FindNearBifNode(filename, line)
-	char	*filename;
-	int	 line;
-	
-{
-  PTR_FILE ptf;
-  PTR_BLOB ptb;
-  
-
-  for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-    {
-      ptf = (PTR_FILE) BLOB_VALUE (ptb);
-      cur_file = ptf;      
-      /* reset the toolbox and pointers*/
-      Reset_Tool_Box();
-      
-      if (strcmp(Current_File_name,filename) == 0)
-        { /* now look for the line number */
-          return rec_num_near_search(line);
-        }
-    }
-  fprintf(stderr,"%s",filename);
-  Message("No such file in this project",0);
-  return NULL;
-}
-
-/****************************************************************
- *								*
- *  rec_num_near_search --                                      *
- *                    search for the bif node that	        *
- *		      corresponds to the num'th line in the	*
- *		      current file           			*
- *								*
- *  Inputs:							*
- *         - line number of current file                        *
- *								*
- *  Output:							*
- *	The bif node pointer if one exists for the given line	*
- *	in the given file					*
- *								*
- ****************************************************************/
-/***************************************************************************/
-PTR_BFND rec_num_near_search(num)
-     int	 num;
-{
-  PTR_BFND temp,last = NULL;
-  
-  for (temp = PROJ_FIRST_BIF (); temp ; temp = BIF_NEXT(temp))
-    {
-      if (BIF_LINE(temp) == num)
-        return temp;
-      if (BIF_LINE(temp) > num)
-        return last;
-      last =temp;
-    }
-  return(NULL);
-}
-
-
-
-/********* Add a comment to a node *************************************/
-
-
-/***************************************************************************/
-void LibAddComment(PTR_BFND bif, char *str)
-{
-    char *pt;
-    PTR_CMNT cmnt;
-
-    if (!bif || !str)
-        return;
-
-    if (!BIF_CMNT(bif))
-    {
-        pt = (char *)xmalloc(strlen(str) + 1);
-        cmnt = (PTR_CMNT)newNode(CMNT_KIND);
-        strcpy(pt, str);
-        CMNT_STRING(cmnt) = pt;
-        BIF_CMNT(bif) = cmnt;
-    }
-    else
-    {
-        cmnt = BIF_CMNT(bif);
-        if (CMNT_STRING(cmnt))
-        {
-            pt = (char *)xmalloc(strlen(str) + strlen(CMNT_STRING(cmnt)) + 1);
-            sprintf(pt, "%s%s", CMNT_STRING(cmnt), str);
-            CMNT_STRING(cmnt) = pt;
-        }
-        else
-        {
-            pt = (char *)xmalloc(strlen(str) + 1);
-            sprintf(pt, "%s", str);
-            CMNT_STRING(cmnt) = pt;
-        }
-    }
-}
-
-
-/* ajm */
-/********************** Set a node's comment *******************************/
-//Kolganov 15.11.2017
-void LibDelAllComments(PTR_BFND bif)
-{
-    PTR_CMNT cmnt;
-    char *pt;
-
-    if (!bif)
-        return;
-
-    if (BIF_CMNT(bif))
-    {
-        if (CMNT_STRING(BIF_CMNT(bif)))
-        {
-#ifdef __SPF      
-            removeFromCollection(CMNT_STRING(BIF_CMNT(bif)));
-#endif
-            free(CMNT_STRING(BIF_CMNT(bif)));
-            CMNT_STRING(BIF_CMNT(bif)) = NULL;
-        }
-
-        cmnt = BIF_CMNT(bif);
-        // remove comment from list before free
-        if (cmnt == PROJ_FIRST_CMNT())
-        {
-            if (cmnt->thread)
-                PROJ_FIRST_CMNT() = cmnt->thread;
-            else
-                PROJ_FIRST_CMNT() = NULL;
-        }
-        else
-        {
-            PTR_CMNT before = PROJ_FIRST_CMNT();
-            while (before->thread)
-            {
-                if (before->thread == cmnt)
-                {
-                    if (cmnt->thread)
-                    {
-                        before->thread = cmnt->thread;
-                        cmnt->thread = NULL;
-                    }
-                    else
-                        before->thread = NULL;
-                    break;
-                }
-                before = before->thread;
-            }
-        }
-        /*
-#ifdef __SPF      
-        removeFromCollection(BIF_CMNT(bif));
-#endif
-        free(BIF_CMNT(bif));*/
-        BIF_CMNT(bif) = NULL;
-    }
-}
-
-void LibSetAllComments(PTR_BFND bif, char *str)
-{
-     PTR_CMNT cmnt;
-     char *pt;
-
-     if ( !bif || !str )
-	  return;
-     
-     LibDelAllComments(bif);
-
-     pt = (char *) xmalloc(strlen(str) + 1);
-     cmnt = (PTR_CMNT) newNode(CMNT_KIND);
-     strcpy(pt, str);
-     CMNT_STRING(cmnt) = pt;
-     BIF_CMNT(bif) = cmnt;
-}
-
-/***************************************************************************/
-int patternMatchExpression(ll1,ll2)
-     PTR_LLND ll1,ll2;
-{
- /*  char *string1, *string2;*/ /*podd 15.03.99*/
-  int *res1, *res2;
-  
-  if (ll1 == ll2)
-    return TRUE;
-  
- if (!ll1 || !ll2)
-   return FALSE;
-
-  if (NODE_CODE(ll1) != NODE_CODE(ll2))
-    return FALSE;
-
-  /* because of identical names does not work also no commutativity
-     string1 = funparse_llnd(ll1);
-     string2 = funparse_llnd(ll2);
-     if (strcmp(string1, string2) == 0)
-     return TRUE;
-    */
-  /* first test if constant equations identical */
-  res1 = evaluateExpression(ll1);
-  res2 = evaluateExpression(ll2);
-  if ((res1[0] != -1) &&
-      (res2[0] != -1) &&
-      (res1[1] == res2[1]))
-    {
-#ifdef __SPF      
-      removeFromCollection(res1);
-      removeFromCollection(res2);
-#endif
-      free(res1);
-      free(res2);
-      return TRUE;
-    }
-  if ((res1[0] != -1) && (res2[0] == -1))
-    {
-#ifdef __SPF      
-      removeFromCollection(res1);
-      removeFromCollection(res2);
-#endif
-      free(res1);
-      free(res2);
-      return FALSE;
-    }
-  if ((res1[0] == -1) && (res2[0] != -1))
-    {
-#ifdef __SPF      
-      removeFromCollection(res1);
-      removeFromCollection(res2);
-#endif
-      free(res1);
-      free(res2);
-      return FALSE;
-    }
-#ifdef __SPF      
-  removeFromCollection(res1);
-  removeFromCollection(res2);
-#endif
-  free(res1);
-  free(res2);
-
-  /* for each  kind of node do the pattern match */
-  switch (NODE_CODE(ll1))
-    {
-    case VAR_REF:
-      if (NODE_SYMB(ll1) == NODE_SYMB(ll2))
-        return TRUE;
-      break;
-
-      /* commutatif operator */
-    case EQ_OP:
-      if ((NODE_SYMB(ll1) == NODE_SYMB(ll2)) &&
-          patternMatchExpression(NODE_OPERAND0(ll1),
-                                   NODE_OPERAND1(ll2)) &&
-          patternMatchExpression(NODE_OPERAND0(ll1),
-                                   NODE_OPERAND1(ll2))) 
-        return TRUE;
-    default :
-      if ((NODE_SYMB(ll1) == NODE_SYMB(ll2)) &&
-          patternMatchExpression(NODE_OPERAND0(ll1),
-                                    NODE_OPERAND0(ll2)) &&
-          patternMatchExpression(NODE_OPERAND1(ll1),
-                                   NODE_OPERAND1(ll2))) 
-        return TRUE;
-    }
-  return FALSE;
-}
-
-
-/* 
-  new functions added, they have a match with the one in the C++
-  interface library
-*/
-/***************************************************************************/
-void SetCurrentFileTo(file)
-     PTR_FILE file;
-{
-  if (!file)
-    return;
-  if (pointer_on_file_proj == file)
-    return;
-  cur_file  = file;
-  /* reset the toolbox and pointers*/
-  Init_Tool_Box();
-}
-
-
-/***************************************************************************/
-int LibnumberOfFiles()
-{
-  PTR_BLOB ptb;
-  int count = 0;
-  if (cur_proj)
-    {
-      for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-	{
-	  count++;
-	}
-    } else
-      if(pointer_on_file_proj)
-	return 1;
-  return count;
-}
-
-/***************************************************************************/
-PTR_FILE GetPointerOnFile(dep_file_name)
-     char *dep_file_name;
-{
-/*  PTR_FILE pt;*/ /*podd 15.03.99*/
-  PTR_BLOB ptb;
-  if (cur_proj && dep_file_name)
-    {
-      for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-	{
-	  cur_file  = (PTR_FILE) BLOB_VALUE (ptb);
-	  /* reset the toolbox and pointers*/
-	  SetCurrentFileTo(cur_file);
-	  if (CUR_FILE_NAME() && !strcmp(CUR_FILE_NAME(),dep_file_name))
-	    return  pointer_on_file_proj;
-	}
-    }
-  return NULL;
-}
-
-/***************************************************************************/
-int GetFileNum(dep_file_name)
-     char *dep_file_name;
-{
-  PTR_FILE pt;
-  PTR_BLOB ptb;
-  int count= 0;
-  if (cur_proj && dep_file_name)
-    {
-      for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-	{
-	  count++;
-	  pt = (PTR_FILE) BLOB_VALUE (ptb);
-	  /* reset the toolbox and pointers*/
-	  SetCurrentFileTo(pt);
-	  if (FILE_FILENAME(pt) && !strcmp(FILE_FILENAME(pt),dep_file_name))
-	    return  count;
-	}
-    }
-  return 0;
-}
-
-
-/***************************************************************************/
-int GetFileNumWithPt(dep_file)
-     PTR_FILE dep_file;
-{
-  PTR_FILE pt;
-  PTR_BLOB ptb;
-  int count= 0;
-  if (cur_proj && dep_file)
-    {
-      for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-	{
-	  count++;
-	  pt = (PTR_FILE) BLOB_VALUE (ptb);
-	  /* reset the toolbox and pointers*/
-	  SetCurrentFileTo(pt);
-	  if (pt==dep_file)
-	    return  count;
-	}
-    }
-  return 0;
-}
-
-
-/***************************************************************************/
-PTR_FILE GetFileWithNum(num)
-     int num;
-{
-  PTR_FILE pt;
-  PTR_BLOB ptb;
-  int count= 0;
-  if (cur_proj)
-    {
-      for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-	{
-	  pt = (PTR_FILE) BLOB_VALUE (ptb);
-	  /* reset the toolbox and pointers*/
-	   SetCurrentFileTo(pt);
-	  if (count == num)
-	    return pt;
-	  count++;
-	}
-    }
-  return NULL;
-}
-
-/***************************************************************************/
-void LibsaveDepFile(str)
-     char *str;
-{
-  PTR_BFND thebif;
-  int i;
-  if (!str)
-    {
-      Message("No name specified in saveDepFile",0);
-      return;
-    }
-  thebif = PROJ_FIRST_BIF();
-  i = 1;
-  for (;thebif;thebif=BIF_NEXT(thebif), i++) 
-       BIF_ID(thebif) = i;     
-   
-  CUR_FILE_NUM_BIFS() = i-1;
-
-  if (write_nodes(cur_file,str) < 0)
-      Message("Error, write_nodes() failed (001)",0);
-
-}
-
-/***************************************************************************/
-int getNumberOfFunction()
-{
-    PTR_BFND thebif;
-    int count = 0;
-
-    thebif = PROJ_FIRST_BIF();
-    for (; thebif; thebif = BIF_NEXT(thebif))
-    {
-        if ((BIF_CODE(thebif) == FUNC_HEDR) || (BIF_CODE(thebif) == PROC_HEDR) ||
-            (BIF_CODE(thebif) == PROS_HEDR) || (BIF_CODE(thebif) == PROG_HEDR))
-        {
-            if (thebif->control_parent->variant != INTERFACE_STMT && 
-                thebif->control_parent->variant != INTERFACE_OPERATOR &&
-                thebif->control_parent->variant != INTERFACE_ASSIGNMENT)
-                count++;
-        }        
-    }
-    return count;
-}
-  
-/***************************************************************************/
-PTR_BFND getFunctionNumHeader(int num)
-{
-    PTR_BFND thebif;
-    int count = 0;
-
-    thebif = PROJ_FIRST_BIF();
-    for (; thebif; thebif = BIF_NEXT(thebif))
-    {
-        if ((BIF_CODE(thebif) == FUNC_HEDR) || (BIF_CODE(thebif) == PROC_HEDR) ||
-            (BIF_CODE(thebif) == PROS_HEDR) || (BIF_CODE(thebif) == PROG_HEDR))
-        {
-            if (thebif->control_parent->variant != INTERFACE_STMT &&
-                thebif->control_parent->variant != INTERFACE_OPERATOR &&
-                thebif->control_parent->variant != INTERFACE_ASSIGNMENT)
-            {
-                if (count == num)
-                    return thebif;
-                count++;
-            }
-        }        
-    }
-    return NULL;
-}
-  
-/***************************************************************************/
-int getNumberOfStruct()
-{
-  PTR_BFND thebif;
-  int count  =0;
-
-  thebif = PROJ_FIRST_BIF();
-  for (;thebif;thebif=BIF_NEXT(thebif)) 
-    {
-      if (isAStructDeclBif(BIF_CODE(thebif)))
-	count++;
-    }
-
-  return count;
-}
-
-/***************************************************************************/
-PTR_BFND getStructNumHeader(num)
-     int num;
-{
-  PTR_BFND thebif;
-  int count  =0;
-
-  thebif = PROJ_FIRST_BIF();
-  for (;thebif;thebif=BIF_NEXT(thebif)) 
-    {
-      if (isAStructDeclBif(BIF_CODE(thebif)))
-	{
-	  if (count == num)
-	    return thebif;
-	  count++;
-	}
-    }
-  return NULL;
-}
-
-/***************************************************************************/
-PTR_BFND getFirstStmt()
-{
-  return PROJ_FIRST_BIF();
-}
-
-/***************************************************************************/
-PTR_TYPE GetAtomicType(tt)
-     int tt;
-{
-  PTR_TYPE ttype = NULL;
-
-  if(!isAtomicType(tt))
-    {
-      Message("Misuse of GetAtomicType",0);
-      return NULL;
-    }
-  for (ttype = PROJ_FIRST_TYPE () ; ttype; ttype = TYPE_NEXT(ttype))
-    {
-      if (TYPE_CODE(ttype) == tt)
-	return ttype;
-    }
-  return (ttype);
-}
-
-/***************************************************************************/
-PTR_BFND LiblastDeclaration(start)
-PTR_BFND start;
-{
-  PTR_BFND temp;
-  
-  if (start)
-    temp = start;
-  else
-    temp = PROJ_FIRST_BIF ();
-  for ( ; temp; temp = BIF_NEXT(temp))
-    {
-      if ( BIF_NEXT(temp) && !isADeclBif(BIF_CODE(BIF_NEXT(temp))))
-	return temp;
-    }
-  Message("LiblastDeclaration return NULL",0);
-  return NULL;  
-}
-
-/***************************************************************************/
-int LibIsSymbolInScope(bif,symb)
-     PTR_BFND bif;
-     PTR_SYMB symb;
-{
-  PTR_BFND scope;
-  
-  if (!symb || !bif)
-    return FALSE;
-  scope = SYMB_SCOPE(symb);
-/*  return isItInSection(BIF_CP(bif), getLastNodeOfStmt(BIF_CP(bif)), scope);*/
-  if (scope)
-/* assume scope is the declaration of the variable, otherwise to be removed*/
-    return isItInSection(BIF_CP(scope), getLastNodeOfStmt(BIF_CP(scope)), bif);
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int IsRefToSymb(expr,symb)
-     PTR_LLND expr;
-     PTR_SYMB symb;
-{
-  
-  if (!expr)
-    return FALSE;
-  
-  if (!hasNodeASymb(NODE_CODE(expr)))
-    return FALSE;
-  
-  if (NODE_SYMB(expr) != symb)
-    return FALSE;
-  return TRUE;
-}
-
-/***************************************************************************/
-void LibreplaceSymbByExp(exprold, symb, exprnew)
-     PTR_SYMB symb;
-     PTR_LLND exprold, exprnew;
-{
-  if (!exprold)
-    return ;
-
-  if (IsRefToSymb(NODE_OPERAND0(exprold),symb))
-    NODE_OPERAND0(exprold) = exprnew;
-  else
-    LibreplaceSymbByExp(NODE_OPERAND0(exprold), symb, exprnew);
-        
-  if (IsRefToSymb(NODE_OPERAND1(exprold),symb))
-    NODE_OPERAND1(exprold) = exprnew;
-  else
-    LibreplaceSymbByExp(NODE_OPERAND1(exprold), symb, exprnew);
-}
-
-/***************************************************************************/
-void LibreplaceSymbByExpInStmts(debut, fin, symb, expr)
-     PTR_BFND debut, fin;
-     PTR_SYMB symb;
-     PTR_LLND expr;
-{
-  PTR_BFND temp;
-  
-  for (temp = debut; temp ; temp = BIF_NEXT(temp))
-    {
-      if (IsRefToSymb(BIF_LL1(temp),symb))
-        BIF_LL1(temp) = expr;
-      else
-        LibreplaceSymbByExp(BIF_LL1(temp), symb, expr);
-
-      if (IsRefToSymb(BIF_LL2(temp),symb))
-        BIF_LL2(temp) = expr;
-      else
-        LibreplaceSymbByExp(BIF_LL2(temp), symb, expr);
-
-      if (IsRefToSymb(BIF_LL3(temp),symb))
-        BIF_LL3(temp) = expr;
-      else
-        LibreplaceSymbByExp(BIF_LL3(temp), symb, expr);
-      if (fin && (temp == fin))
-        break;
-    }  
-}
-   
-/***************************************************************************/
-PTR_LLND LibIsSymbolInExpression(exprold, symb)
-     PTR_SYMB symb;
-     PTR_LLND exprold;
-{
-  PTR_LLND pt =NULL;
-  if (!exprold)
-    return NULL;
-
-  if (IsRefToSymb(NODE_OPERAND0(exprold),symb))
-    return NODE_OPERAND0(exprold);
-  else
-    pt = LibIsSymbolInExpression(NODE_OPERAND0(exprold), symb);
-  if (pt)
-    return pt;
-
-  if (IsRefToSymb(NODE_OPERAND1(exprold),symb))
-    return NODE_OPERAND1(exprold) ;
-  else
-    pt = LibIsSymbolInExpression(NODE_OPERAND1(exprold), symb);
-
-  return pt;
-}
-
-/***************************************************************************/
-PTR_BFND LibWhereIsSymbDeclare(symb)
-      PTR_SYMB symb;
-{
-  PTR_BFND scopeof, temp, last;
-  if (!symb)
-    return NULL;
-  
-  scopeof = SYMB_SCOPE(symb);
-  if (!scopeof)
-     return NULL;
-  
-  last = getLastNodeOfStmt(scopeof);
-  
-  for (temp = scopeof; temp ; temp=BIF_NEXT(temp))
-    {
-#if __SPF
-      //SKIP SPF dirs
-      //for details see dvm_tag.h
-      if (scopeof->variant >= 950 && scopeof->variant <= 958)
-          continue;
-#endif
-      if (LibIsSymbolInExpression(BIF_LL1(temp), symb))
-        return temp;
-      if (LibIsSymbolInExpression(BIF_LL2(temp), symb))
-        return temp;
-      if (temp == last)
-        break;
-    }
-  return NULL;
-}
-
-
-
-/* return a symbol in a declaration list 
- replace find_suit_declarator() but also more ... 
- replace also find_parameter_name()
-*/
-/***************************************************************************/
-PTR_LLND giveLlSymbInDeclList(expr)
-PTR_LLND expr;
-{
-  PTR_LLND list1, list2;
-  if (!expr)
-    return NULL;
-  
-  if (NODE_CODE(expr) == EXPR_LIST)
-    {
-      for (list1= expr; list1; list1 = NODE_OPERAND1(list1))
-	{
-	  if (NODE_OPERAND0(list1))
-	    {
-	      for (list2= NODE_OPERAND0(list1); list2; )
-		{
-		  if (hasNodeASymb(NODE_CODE(list2)))
-		    {
-		      if (NODE_SYMB(list2))
-			return list2;
-		    }
-		if(NODE_CODE(list2) == SCOPE_OP) list2 = NODE_OPERAND1(list2);
-		else list2 = NODE_OPERAND0(list2);
-		}
-	    }
-	}
-    } else
-      {
-	for (list2= expr; list2; )
-	  {
-	    if (hasNodeASymb(NODE_CODE(list2)))
-	      {
-		if (NODE_SYMB(list2))
-		  return list2;
-	      }
-	      if(NODE_CODE(list2) == SCOPE_OP) list2 = NODE_OPERAND1(list2);
-	     else list2 = NODE_OPERAND0(list2);
-	  }
-      }
-/*  Message("giveSymbInDeclList did not find the symbol (crash will happen)",0); */
-  return NULL;
-}
-
-/* return the first non null type in the base type list */
-/***************************************************************************/
-PTR_TYPE lookForInternalBasetype(type)
-     PTR_TYPE type;
-{
-  if (!type)
-    return NULL;
-
-  if (TYPE_CODE(type) == T_MEMBER_POINTER){
-	if (TYPE_COLL_BASE(type))
-	   return lookForInternalBasetype(TYPE_COLL_BASE(type));
-        else
-           return type;
-	}
-  else if (hasTypeBaseType(TYPE_CODE(type))) 
-    {
-      if (TYPE_BASE(type))
-	return lookForInternalBasetype(TYPE_BASE(type));
-      else
-	return type;
-    }
-  else
-    return type;
-}
-
-
-/* return the first non null type in the base type list */
-/***************************************************************************/
-PTR_TYPE lookForTypeDescript(type)
-     PTR_TYPE type;
-{
-  if (!type)
-    return NULL;
-
-  if (TYPE_CODE(type) == T_DESCRIPT)
-    return type;
-  if (hasTypeBaseType(TYPE_CODE(type))) 
-    {
-      if (TYPE_BASE(type))
-	return lookForTypeDescript(TYPE_BASE(type));
-      else
-	return NULL;
-    }
-  else
-    return  NULL;
-}
-
-/***************************************************************************/
-int getTypeNumDimension(type)
-     PTR_TYPE type;
-{
-  if (!type)
-    return 0;
-  return exprListLength(TYPE_DECL_RANGES(type));
-}
-
-/***************************************************************************/
-int isElementType(type)
-PTR_TYPE type;
-{
-  if (!type)
-    return 0;
-
-  if (TYPE_CODE(type) == T_DERIVED_TYPE)
-    {
-      if (TYPE_SYMB_DERIVE(type) &&
-	  SYMB_IDENT(TYPE_SYMB_DERIVE(type)) &&
-	  (strcmp(SYMB_IDENT(TYPE_SYMB_DERIVE(type)), "ElementType") == 0))
-	return 1;
-    }
-  return 0;
-}
-
-/***************************************************************************/
-PTR_TYPE getDerivedTypeWithName(str)
-     char *str;
-{
-  PTR_TYPE ttype = NULL;
-  for (ttype = PROJ_FIRST_TYPE () ; ttype; ttype = TYPE_NEXT(ttype))
-    {
-      if (TYPE_CODE(ttype) == T_DERIVED_TYPE)
-        {
-          if (TYPE_SYMB_DERIVE(ttype) &&
-              SYMB_IDENT(TYPE_SYMB_DERIVE(ttype)) &&
-              (strcmp(SYMB_IDENT(TYPE_SYMB_DERIVE(ttype)), str) == 0))
-            return ttype;
-        }
-    }
-  return (ttype);
-}
-
-
-/***************************************************************************/
-int sameName(symb1,symb2)
- PTR_SYMB symb1,symb2;
-{
-  if (!symb1 || !symb2)
-    return FALSE;
-
-  if (!SYMB_IDENT(symb1) || !SYMB_IDENT(symb2))
-    return FALSE;
-  
-  if (strcmp(SYMB_IDENT(symb1),SYMB_IDENT(symb2)) == 0)
-    return TRUE;
-  else
-    return FALSE;
-}
-
-
-/***************************************************************************/
-PTR_SYMB lookForNameInParamList(functor,name)
-PTR_SYMB functor;
-char *name;
-{ 
-   PTR_SYMB list1;
-   
-   if (!functor || !name)
-     return NULL;
-
-   for ( list1 = SYMB_MEMBER_PARAM(functor) ; list1 ; list1 = SYMB_NEXT_DECL(list1))
-      {    
-	if (!strcmp(SYMB_IDENT(list1),name)) 
-	  return(list1) ;
-      }
-   return(NULL);
- }
-
-/***************************************************************************/
-PTR_TYPE FollowTypeBaseAndDerived(type)
-PTR_TYPE type;
-{
-  PTR_TYPE tmp;
-  PTR_SYMB symb;
-  if (!type)
-    return NULL;
-  if (isAtomicType(TYPE_CODE(type)))
-    return type;
-  tmp = lookForInternalBasetype(type);
-  if (hasTypeSymbol(TYPE_CODE(tmp)))
-    {
-      symb = TYPE_SYMB_DERIVE(tmp);
-      if (symb && SYMB_TYPE(symb))
-	return FollowTypeBaseAndDerived(SYMB_TYPE(symb));
-      else
-	return tmp;
-    }
-  return tmp;
-}
-
-/* replace chain_up_type() */
-/***************************************************************************/
-PTR_TYPE addToBaseTypeList(type1,type2)
-     PTR_TYPE type1,type2;
-{ 
- PTR_TYPE tmp;
-  if (!type2) return(type1);
-  if (!type1) return(type2);
-
- tmp = lookForInternalBasetype(type2);
- if (tmp)
-   {
-     TYPE_BASE(tmp) = type1;
-     return(type2);
-   } else
-     Message("error in addToBaseTypeList",0);
- return NULL;
-}
-
-/* return the symbol it inherit from */
-/***************************************************************************/
-PTR_SYMB doesClassInherit(bif)
-     PTR_BFND bif;
-{
-  PTR_LLND ll;
-  int lenght;
-  if (!bif)
-    return NULL;
-  
-  ll = BIF_LL2(bif);
-
-  
-  lenght = exprListLength(ll);
-  if (lenght > 1)
-    Message("Multiple inheritance not allowed",BIF_LINE(bif));
-  ll = giveLlSymbInDeclList(ll);
-
-  if (ll)
-    return NODE_SYMB(ll);
-  else
-    return NULL;
-}
-
-/***************************************************************************/
-PTR_SYMB getClassNextFieldOrMember(symb)
-     PTR_SYMB symb;
-{
-  if (!symb)
-    return NULL;
-
-  if (SYMB_CODE(symb) == FIELD_NAME)
-    return SYMB_NEXT_FIELD(symb);
-  else  
-    if (SYMB_CODE(symb) == MEMBER_FUNC)
-      return SYMB_MEMBER_NEXT(symb);
-  else
-    return symb->next_symb;
-
-  /* return NULL; */
-}
-
-/* find_first_field(pred) and find_first_field_2(pred)*/
-/***************************************************************************/
-PTR_SYMB getFirstFieldOfStruct(pred)
-PTR_BFND  pred ;
-{   
-  /*  PTR_LLND ll_ptr1; */ /* podd 15.03.99*/
-  PTR_LLND l2;
-  /* PTR_BFND bf1 ;*/ /* podd 15.03.99*/
-  PTR_BLOB blob;
-
-  if (!pred)
-      return  NULL;
-
-  if (isAStructDeclBif(BIF_CODE(pred)) || isAUnionDeclBif(BIF_CODE(pred)) ||
-      isAEnumDeclBif(BIF_CODE(pred)))
-    {
-      if (!(blob= BIF_BLOB1(pred)))
-	{  
-	  return NULL;
-	}
-      else
-	{  
-	  for ( ; blob ; blob = BLOB_NEXT(blob))
-	    {
-	      if (BLOB_VALUE(blob))
-		l2 = giveLlSymbInDeclList(BIF_LL1(BLOB_VALUE(blob)));
-	      else
-		l2 = NULL;
-	      if (l2) 
-		{  
-		  return NODE_SYMB(l2);
-		}
-	    }
-	}
-    }    
-  return(NULL);
-}
-
-
-/***************************************************************************/
-PTR_LLND addToExprList(expl,ll)
-PTR_LLND expl, ll;
-{
-  PTR_LLND  tmp, lptr;
-
-  if (!ll)
-    return expl;
-  if (!expl)
-    return newExpr(EXPR_LIST,NULL,ll,NULL);
-
-    tmp = newExpr(EXPR_LIST,NULL,ll,NULL);
-    lptr = Follow_Llnd(expl,2);
-    NODE_OPERAND1(lptr) = tmp;
-
-  return expl;
-}
-
-
-/***************************************************************************/
-PTR_LLND addToList(first,pt)
-PTR_LLND first, pt;
-{
-  PTR_LLND  tail = first;
- 
-  if (!pt)
-    return first;
-  if (!first)
-    return pt;
-  else {
-    while (NODE_OPERAND1(tail))
-      tail = NODE_OPERAND1(tail);
-    NODE_OPERAND1(tail) = pt;
-    return first;
-  }
-}
-
-
-/* was find_class_bfnd(object)*/ 
-/***************************************************************************/
-PTR_BFND getObjectStmt(object)
-PTR_SYMB object;
-{ 
-  PTR_TYPE type;
-  if (!object)
-    return NULL;
-  type = FollowTypeBaseAndDerived(SYMB_TYPE(object));
-  if (type)
-    {
-      if (isStructType(TYPE_CODE(type)) ||
-	  isEnumType(TYPE_CODE(type)) ||
-	  isUnionType(TYPE_CODE(type))
-	  )
-	{    
-	  return TYPE_COLL_ORI_CLASS(type);
-	} else
-	  Message("unexpected class/struct constructs",0);
-    }
-  return NULL;
-}
-
-/* was chain_field_symb() */
-/***************************************************************************/
-void addSymbToFieldList(first_one, current_one)
-     PTR_SYMB first_one,current_one ;
-{  
-  PTR_SYMB old_symb,symb;
-
-  if (!first_one || !current_one)
-    return;
-  for ( old_symb = symb = first_one ;symb  ;   )
-    {  
-      old_symb = symb ;
-      symb = getClassNextFieldOrMember(symb);
-    }
-  if (SYMB_CODE(old_symb) == FIELD_NAME)
-    SYMB_NEXT_FIELD(old_symb)  =  current_one ;
-  else /* if(SYMB_CODE(old_symb) = MEMBER_FUNC) */
-    SYMB_MEMBER_NEXT(old_symb) =  current_one ;
-  old_symb->next_symb = current_one; 
-}
-
-
-/* 
-  look for Array Reference From an expression
-  There are chained in an expression list
-*/
-/***************************************************************************/
-PTR_LLND LibarrayRefs(expr,listin)
-     PTR_LLND expr,listin;
-{
-  PTR_LLND list = listin;
- 
-  if (!expr)
-    return listin;
-  
-  if (NODE_CODE(expr) == ARRAY_REF)
-    {
-      list = addToExprList(list, expr);
-    }
-  list = LibarrayRefs(NODE_OPERAND0(expr),list);
-  list = LibarrayRefs(NODE_OPERAND1(expr),list);
-  return list;
-}
- 
-
-/* all reference to a symbol (does not go inside array index expression ...)*/
-/***************************************************************************/
-PTR_LLND LibsymbRefs(expr,listin)
-     PTR_LLND expr,listin;
-{
-  PTR_LLND list = listin;
-
-  if (!expr)
-    return listin;
-  
-  if (hasNodeASymb(NODE_CODE(expr)))
-    {
-      list = addToExprList(list, expr); 
-      return list;
-    }
-  list = LibsymbRefs(NODE_OPERAND0(expr),list);
-  list = LibsymbRefs(NODE_OPERAND1(expr),list);
-  return list;
-}
-
-/***************************************************************************/
-void LibreplaceWithStmt(biftoreplace,newbif)
-     PTR_BFND biftoreplace,newbif;
-{
-  PTR_BFND before,parent,last;
-
-  if (!biftoreplace|| !newbif)
-    return;
-
-  before = getNodeBefore(biftoreplace);
-  parent = BIF_CP(biftoreplace);
-  last = getLastNodeOfStmt(biftoreplace);
-  
-  extractBifSectionBetween(biftoreplace,last);
-  insertBfndListIn(newbif,before,parent);
-
-}
-
-/***************************************************************************/
-PTR_BFND LibdeleteStmt(bif)
-     PTR_BFND bif;
-{
-  PTR_BFND last,current;
-
-  if (!bif)
-    return NULL;
-  last = getLastNodeOfStmt(bif);
-  /*podd 03.06.14*/
-  current = bif;  /*podd 19.11.14*/
-  if(BIF_CODE(bif)==IF_NODE || BIF_CODE(bif)==ELSEIF_NODE)
-     while(current != last && BIF_CODE(last)==ELSEIF_NODE)
-     {   current = last; last = getLastNodeOfStmt(last); }
-  else if(BIF_CODE(bif)==FOR_NODE || BIF_CODE(bif)==WHILE_NODE)
-  {  while( ((current != last) && (BIF_CODE(last) == FOR_NODE)) || (BIF_CODE(last) == WHILE_NODE) )
-     {   current = last; last = getLastNodeOfStmt(last); }
-     if(BIF_CODE(last)==LOGIF_NODE && BIF_CP(BIF_NEXT(last))==last) 
-        last = BIF_NEXT(last);
-  }
-  extractBifSectionBetween(bif,last);
-  return bif;
-}
-
-/***************************************************************************/
-int LibIsSymbolReferenced(bif,symb)
-     PTR_BFND bif;
-     PTR_SYMB symb;
-{
-  PTR_BFND last,temp;
-
-  if (!bif)
-    return FALSE;
-  last = getLastNodeOfStmt(bif);
-  
-  for (temp = bif; temp; temp = BIF_NEXT (temp))
-    {
-      if (IsRefToSymb(BIF_LL1(temp),symb) || 
-          LibIsSymbolInExpression(BIF_LL1(temp),symb))
-        return TRUE;
- 
-      if (IsRefToSymb(BIF_LL2(temp),symb) || 
-          LibIsSymbolInExpression(BIF_LL2(temp),symb))
-        return TRUE;
- 
-      if (IsRefToSymb(BIF_LL3(temp),symb) || 
-          LibIsSymbolInExpression(BIF_LL3(temp),symb))
-        return TRUE;
-      if (temp == last)
-        break;
-    }
-  return FALSE;
-}
-
-
-/***************************************************************************/
-PTR_BFND LibextractStmt(bif)
-     PTR_BFND bif;
-{
-  /*PTR_BFND last;*/ /* podd 15.03.99*/
-  return  LibdeleteStmt (bif);
-}
-
-
-/***************************************************************************/
-PTR_LLND getPositionInExprList(first,pos)
-PTR_LLND first;
-int pos;
-{
-  PTR_LLND tail;
-  int len = 0;
-  if (first == NULL)
-    return NULL;
-  for (tail = first; (len <pos) && tail; tail = NODE_OPERAND1(tail) ){
-    len++;
-  }
-  
-  if (tail)
-    return NODE_OPERAND0(tail);
-
-  return NULL;
-}
-
-
-/***************************************************************************/
-PTR_LLND getPositionInList(first, pos)
-PTR_LLND first;
-int pos;
-{
-  PTR_LLND tail;
-  int len = 0;
-  if (first == NULL)
-    return NULL;
-  for (tail = first; (len <pos) && tail; tail = NODE_OPERAND1(tail) ){
-    len++;
-  }
- 
-  return tail;
- 
-}
-
-
-/***************************************************************************/
-int lenghtOfParamList(symb)
-PTR_SYMB symb;
-{
-  PTR_SYMB ptsymb;
-  int count = 0;
-  if (!symb)
-    return 0;
-  ptsymb = SYMB_FUNC_PARAM (symb);
-  while (ptsymb)
-    {
-      count++;
-      ptsymb = SYMB_NEXT_DECL (ptsymb);
-    }
-  return count;
-}
-
-
-/***************************************************************************/
-PTR_SYMB GetThParam(symb,pos)
-PTR_SYMB symb;
-int pos;
-{
-  PTR_SYMB ptsymb;
-  int count = 0;
-  if (!symb)
-    return NULL;
-  ptsymb = SYMB_FUNC_PARAM (symb);
-  while (ptsymb)
-    {
-      if (count == pos)
-	return  ptsymb;
-      count++;
-      ptsymb = SYMB_NEXT_DECL (ptsymb);
-    }
-  return NULL;
-}
-
-
-/* Code by ajm. */
-/***************************************************************************/
-void insertSymbInArgList(function_symb, arglist_loc, new_symb)
-PTR_SYMB function_symb,new_symb;
-int arglist_loc;
-{
-
-     PTR_SYMB next_symb;
-     PTR_SYMB current_symb;
-
-     int count = 0;
-
-     if (function_symb == 0 )
-	  return;
-
-     current_symb = SYMB_FUNC_PARAM (function_symb);
-
-     if ( arglist_loc == 0 )
-     {
-	  SYMB_FUNC_PARAM (function_symb) = new_symb;
-	  SYMB_NEXT_DECL(new_symb) = current_symb;
-     }	  
-     else
-     {
-	  /* Each time we enter this while loop, we have already
-	     checked out the symbol CURRENT_SYMB. */
-	  
-	  while (current_symb != 0)
-	  {
-	       count ++;
-	       next_symb = SYMB_NEXT_DECL(current_symb);
-
-	       if ( count == arglist_loc )
-	       {
-		    SYMB_NEXT_DECL(current_symb) = new_symb;
-		    SYMB_NEXT_DECL(new_symb) = next_symb;
-		    break;
-	       }
-
-	       current_symb = next_symb;
-	  }
-
-	  if ( count < arglist_loc )
-	  {
-	       Message ("Warning: Request to insert parameter way past existing last param.",0);
-	  }
-     }
-}
-
-
-/***************************************************************************/
-void appendSymbToArgList(symb,ne)
-PTR_SYMB symb,ne;
-{
-  PTR_SYMB ptsymb;
-  /* int count = 0;*/
-  if (!symb)
-    return;
-  ptsymb = SYMB_FUNC_PARAM (symb);
-  if (!ptsymb)
-    SYMB_FUNC_PARAM (symb) = ne;
-  else
-    {
-      while (ptsymb)
-	{
-	  if (!SYMB_NEXT_DECL (ptsymb))
-	    {
-	      SYMB_NEXT_DECL (ptsymb) = ne;
-	      break;
-	    }
-	  ptsymb = SYMB_NEXT_DECL (ptsymb);
-	}
-    }
-}
-
-/***************************************************************************/
-int lenghtOfFieldList(symb)
-PTR_SYMB symb;
-{
-  PTR_SYMB ptsymb=0;  /* BW and PHB */
-  PTR_TYPE type;
-  int count = 0;
-  if (!symb)
-    return 0;
-  type = SYMB_TYPE(symb);
-  if (type)
-    {
-      if(TYPE_CODE(type) == T_DESCRIPT)
-         type = TYPE_BASE(type);
-      ptsymb = TYPE_COLL_FIRST_FIELD(type);
-    }
-  while (ptsymb)
-    {
-      count++;
-      ptsymb = getClassNextFieldOrMember (ptsymb);
-    }
-  return count;
-}
-
-/***************************************************************************/
-int lenghtOfFieldListForType(type)
-     PTR_TYPE type;
-{
-  PTR_SYMB ptsymb = NULL;
-  int count = 0;
-  if (type)
-    ptsymb = TYPE_COLL_FIRST_FIELD(type);
-  while (ptsymb)
-    {
-      count++;
-      ptsymb = getClassNextFieldOrMember (ptsymb);
-    }
-  return count;
-}
-
-/***************************************************************************/
-PTR_SYMB GetThOfFieldList(symb,pos)
-PTR_SYMB symb;
-int pos;
-{
-  PTR_SYMB ptsymb = NULL;
-  PTR_TYPE type;
-  int count = 0;
-  if (!symb)
-    return  NULL;
-  type = SYMB_TYPE(symb);
-  if (type)
-    {
-      if(TYPE_CODE(type) == T_DESCRIPT)
-         type = TYPE_BASE(type);
-      ptsymb = TYPE_COLL_FIRST_FIELD(type);
-    }
-  while (ptsymb)
-    {
-      count++;
-      if (count == pos)
-	return  ptsymb;
-      ptsymb = getClassNextFieldOrMember (ptsymb);
-    }
-  return  NULL;
-}
-
-/***************************************************************************/
-PTR_SYMB GetThOfFieldListForType(type,pos)
-PTR_TYPE type;
-int pos;
-{
-  PTR_SYMB ptsymb = NULL;
-  int count = 0;
-  if (type)
-    ptsymb = TYPE_FIRST_FIELD(type);
-  while (ptsymb)
-    {
-      count++;
-      if (count == pos)
-	return  ptsymb;
-      ptsymb = getClassNextFieldOrMember(ptsymb);
-    }
-  return  NULL;
-}
-
-/***************************************************************************/
-int countInStmtNode1(first,ki1)
-     PTR_BFND first;
-     int ki1;
-{
-  PTR_BLOB temp;
-  PTR_BFND bif;
-  int count =0;
-
-  if (!first)
-    return 0;
-  
-  for (temp = BIF_BLOB1 (first); temp ; temp = BLOB_NEXT (temp))
-    {
-      if ((bif = BLOB_VALUE(temp)) != 0)
-      {
-          if (BIF_CODE(bif) == ki1)
-              count++;
-      }
-    }
-  
-  for (temp = BIF_BLOB2 (first); temp ; temp = BLOB_NEXT (temp))
-    {
-      if ((bif = BLOB_VALUE(temp)) != 0)
-      {
-          if (BIF_CODE(bif) == ki1)
-              count++;
-      }
-    }
-  return count;
-}
-/***************************************************************************/
-PTR_BFND GetcountInStmtNode1(first,ki1,num)
-     PTR_BFND first;
-     int ki1,num;
-{
-  PTR_BLOB temp;
-  PTR_BFND bif;
-  int count =0;
-
-  if (!first)
-    return NULL;
-  
-  for (temp = BIF_BLOB1 (first); temp ; temp = BLOB_NEXT (temp))
-    {
-      if ((bif = BLOB_VALUE(temp)) != 0)
-      {
-          if (BIF_CODE(bif) == ki1)
-          {
-              if (count == num)
-                  return bif;
-              count++;
-          }
-      }
-    }
-  
-  for (temp = BIF_BLOB2 (first); temp ; temp = BLOB_NEXT (temp))
-    {
-      if ((bif = BLOB_VALUE(temp)) != 0)
-      {
-          if (BIF_CODE(bif) == ki1)
-          {
-              if (count == num)
-                  return bif;
-              count++;
-          }
-      }
-    }
-  return NULL;
-}
-
-
-/***************************************************************************/
-int countInStmtNode2(first,ki1,ki2)
-     PTR_BFND first;
-     int ki1,ki2;
-{
-  PTR_BLOB temp;
-  PTR_BFND bif;
-  int count =0;
-
-  if (!first)
-    return 0;
-  
-  for (temp = BIF_BLOB1 (first); temp ; temp = BLOB_NEXT (temp))
-    {
-      if ((bif = BLOB_VALUE(temp)) != 0)
-      {
-          if ((BIF_CODE(bif) == ki1) ||
-              (BIF_CODE(bif) == ki2))
-              count++;
-      }
-    }
-   
-  for (temp = BIF_BLOB2 (first); temp ; temp = BLOB_NEXT (temp))
-    {
-      if ((bif = BLOB_VALUE(temp)) != 0)
-      {
-          if ((BIF_CODE(bif) == ki1) ||
-              (BIF_CODE(bif) == ki2))
-              count++;
-      }
-    }
-  return count;
-}
-
-
-
-/***************************************************************************/
-PTR_BFND getMainProgram()
-{
-  PTR_BFND thebif;
-
-  if (Check_Lang_Fortran(cur_proj))
-    {
-      for ( thebif = PROJ_FIRST_BIF();thebif;thebif=BIF_NEXT(thebif)) 
-	{
-	  if (BIF_CODE(thebif) == PROG_HEDR)
-	    return thebif;
-	}
-    } else
-      {
-	for ( thebif = PROJ_FIRST_BIF();thebif;thebif=BIF_NEXT(thebif)) 
-	  {
-	    if (BIF_CODE(thebif) == FUNC_HEDR)
-	      {
-		if (BIF_SYMB(thebif) &&  SYMB_IDENT(BIF_SYMB(thebif))
-		    && !strcmp("main",SYMB_IDENT(BIF_SYMB(thebif))))
-		  return thebif;
-	      }
-	  }
-      }
-  return NULL;
-}
-
-/******************************************************************************/
-/*  findPtrRefExp   -- a help procedure for makeDeclExp                        */
-/*  BW, Feb 1994                                                              */
-/*  given a symbol, and a type, this procedure constructs DEREF_OP/ADDRESS_OP */
-/*  expressions corresponding to pointer/reference types                      */
-
-PTR_LLND findPtrRefExp(symb, type)
-      PTR_SYMB symb;
-      PTR_TYPE type;
-{
-  PTR_LLND newex;
-  PTR_TYPE oldtype=type;
-
-  
-  if (TYPE_CODE(type) == T_ARRAY)   /* for arrays ptrs and refs come */
-                                    /* after T_ARRAY                 */
-     newex = newExpr(ARRAY_REF,SYMB_TYPE(symb),symb,TYPE_RANGES(type));
-  else {  /* for other types, go through all * an & to get to the first */
-          /*  non-ptr/ref type */
-       while ( (TYPE_CODE(type) == T_POINTER) 
-            ||(TYPE_CODE(type) == T_REFERENCE)) {
-         type = TYPE_BASE(type);
-         }
- 
-       newex = newExpr(VAR_REF,type,symb);
-       }
-
-   if (SYMB_TYPE(symb) && (isAtomicType(TYPE_CODE(type))
-			  || (TYPE_CODE(type) == T_DERIVED_COLLECTION)
-			  || (TYPE_CODE(type) == T_DERIVED_TYPE)
-                          || (TYPE_CODE(type) == T_DESCRIPT)
-                          || (TYPE_CODE(type) == T_ARRAY)
-                          || (TYPE_CODE(type) == T_FUNCTION)
-			  )
-      ) 
-  {  /* traverse the ptr/ref types building DEREF_OP/ADDRESS_OP expressions */
-     if (TYPE_CODE(type) == T_ARRAY) type = TYPE_BASE(oldtype);
-     else  type = oldtype;
-       while ( (TYPE_CODE(type) == T_POINTER) 
-            ||(TYPE_CODE(type) == T_REFERENCE)) {
-        if (TYPE_CODE(type) == T_POINTER) newex = newExpr(DEREF_OP,type,newex);
-        else newex = newExpr(ADDRESS_OP,type,newex);
-        type = TYPE_BASE(type);
-        }  
-  }
-  else
-            Message("Sorry declareAVar not completed yet",0);
-
-  return newex;
-}
-
-
-/***************************************************************************/
-/* BW feb 94                                                               */
-
-PTR_LLND makeDeclExp(symb)
-     PTR_SYMB symb;
-{
-    PTR_TYPE type;
-    PTR_LLND newex = NULL;
-    if (!symb)
-        return NULL;
-    if (SYMB_TYPE(symb) && (isAtomicType(TYPE_CODE(SYMB_TYPE(symb)))
-        || (TYPE_CODE(SYMB_TYPE(symb)) == T_DERIVED_COLLECTION)
-        || (TYPE_CODE(SYMB_TYPE(symb)) == T_DERIVED_TYPE)
-        || (TYPE_CODE(SYMB_TYPE(symb)) == T_DESCRIPT))
-       )
-    {
-        newex = newExpr(VAR_REF, SYMB_TYPE(symb), symb);
-    }
-
-
-
-    else if (SYMB_TYPE(symb) && ((TYPE_CODE(SYMB_TYPE(symb)) == T_POINTER) || (TYPE_CODE(SYMB_TYPE(symb)) == T_REFERENCE)) )
-    {
-        newex = findPtrRefExp(symb, SYMB_TYPE(symb));
-    }
-    else if (SYMB_TYPE(symb) && (TYPE_CODE(SYMB_TYPE(symb)) == T_ARRAY))
-    {
-        PTR_TYPE typebase;
-        type = SYMB_TYPE(symb);
-        typebase = lookForInternalBasetype(type);
-        if ((TYPE_CODE(TYPE_BASE(SYMB_TYPE(symb))) == T_POINTER) || (TYPE_CODE(TYPE_BASE(SYMB_TYPE(symb))) == T_REFERENCE) )
-        {
-            newex = findPtrRefExp(symb, SYMB_TYPE(symb));
-        }
-        else newex = newExpr(ARRAY_REF, SYMB_TYPE(symb), symb, TYPE_RANGES(type));
-    }
-    else
-        Message("Sorry, makeDeclExp not completed yet", 0);
-    return newex;
-}
-
-/***************************************************************************/
-/*  added by BW to handle functions and pointers to functions              */
-/*  same as makeDeclExp but need a pointer to the parameter list                                                                       */
-
-PTR_LLND makeDeclExpWPar(symb, parlist)
-     PTR_SYMB symb;
-     PTR_LLND parlist;
-{
-/*  PTR_BFND decl;
-    PTR_TYPE type;
-*/ /* podd 15.03.99*/
-  PTR_LLND expr = NULL;
-  if (!symb)
-    return NULL;
-  if(!parlist)
-    return NULL;
-
-  if (SYMB_CODE(symb) == FUNCTION_NAME)
-      
-    {
-
-        expr= newExpr(FUNCTION_REF,SYMB_TYPE(symb), symb, parlist, NULL);
-    } 
-
-
-
-else if (SYMB_TYPE(symb) && ((TYPE_CODE(SYMB_TYPE(symb)) == T_POINTER)
-			  || (TYPE_CODE(SYMB_TYPE(symb)) == T_REFERENCE)
-			  )
-        )
-    {
-        expr = findPtrRefExp(symb,SYMB_TYPE(symb));
-        expr = newExpr(FUNCTION_OP, SYMB_TYPE(symb),expr,parlist);
-
-
-    }
- else
-	Message("Sorry makeDeclExpWPar not completed yet",0);
- return expr;
-}
-
-/***************************************************************************/
-/* BW feb 94                                                               */
-
-PTR_BFND makeDeclStmt(symb)
-     PTR_SYMB symb;
-{
-  PTR_BFND decl;
-  PTR_TYPE type;
-  if (!symb)
-    return NULL;
-
-
-  decl = (PTR_BFND) newNode(VAR_DECL);
-  BIF_LL1(decl) = addToExprList(BIF_LL1(decl),
-                                 makeDeclExp(symb));
-
-
-  /* (ajm) I make no claim that I have correctly transposed these tests
-     or that I understand what goes on here. Hopefully it works for
-     me, though. */
-  if (SYMB_TYPE(symb) && (TYPE_CODE(SYMB_TYPE(symb)) == T_ARRAY)) 
-  {
-       PTR_TYPE typebase;
-       type = SYMB_TYPE(symb);
-       typebase = lookForInternalBasetype(type);
-
-       if (Check_Lang_Fortran(cur_proj)) 
-       {
-	    BIF_LL2(decl) = newExpr(TYPE_OP,typebase,NULL); 
-       }
-       else
-       {
-	    NODE_TYPE(BIF_LL1(decl)) = typebase;
-       }
-  }
-  else
-  { 
-       if (Check_Lang_Fortran(cur_proj)) 
-       {
-	    BIF_LL2(decl) = newExpr(TYPE_OP,SYMB_TYPE(symb),NULL);
-       }
-       else
-       {
-	    NODE_TYPE(BIF_LL1(decl)) = SYMB_TYPE(symb);
-       }
-  }
-
-  return decl;
-}
-
-/***************************************************************************/
-/*  added by BW to handle functions and pointers to functions              */
-/*                                                                         */
-
-PTR_BFND makeDeclStmtWPar(symb, parlist)
-     PTR_SYMB symb;
-     PTR_LLND parlist;
-{
-  PTR_BFND decl;
-
-  if (!symb)
-    return NULL;
-  if(!parlist)
-    return NULL;
-
-  decl = (PTR_BFND) newNode(VAR_DECL);
-
-  BIF_LL1(decl) = addToExprList(BIF_LL1(decl),
-                          makeDeclExpWPar(symb,parlist));
-
-  if (Check_Lang_Fortran(cur_proj))
-    {
-      BIF_LL2(decl) = newExpr(TYPE_OP,SYMB_TYPE(symb),NULL);
-    }
-  else
-    {
-      /* ajm: WARNING -- I think there's a bug here. Is the type of 
-	 the symbol the type that is supposed to be declared? (Isn't
-	 it T_ARRAY. */
-      NODE_TYPE(BIF_LL1(decl)) = SYMB_TYPE(symb);
-    }
-  return decl;
-}
-
-/***************************************************************************/
-/* modified feb 94, BW                                                     */
-/*                                                                         */
-void declareAVar(symb, where)
-     PTR_SYMB symb;
-     PTR_BFND where;
-{
-  SYMB_SCOPE(symb) = where;
-  insertBfndListIn(makeDeclStmt(symb),where,where);
-}
-
-/***************************************************************************/
-/*  added by BW to handle functions and pointers to functions              */
-/*  feb 94                                                                 */
-
-void declareAVarWPar(symb, parlist, where)
-     PTR_SYMB symb;
-     PTR_LLND parlist;
-     PTR_BFND where;
-{
-  SYMB_SCOPE(symb) = where;
-  insertBfndListIn(makeDeclStmtWPar(symb,parlist),where,where);
-}
-
-
-/* add control end and set properly the BIF_NEXT node*/
-/***************************************************************************/
-void addControlEndToStmt(bif)
-PTR_BFND bif;
-{
-  PTR_BFND cend,last;
-  if (!bif)
-    return; 
-  cend = (PTR_BFND) newNode(CONTROL_END);
-  BIF_CP(cend) = bif;
-  last = getLastNodeOfStmtNoControlEnd(bif);
-  appendBfndListToList1(cend,bif);
-  if (last)
-    {
-      BIF_NEXT(cend) = BIF_NEXT(last);
-      BIF_NEXT(last) = cend ; 
-    } else
-      {
-	BIF_NEXT(cend) = BIF_NEXT(bif);
-	BIF_NEXT(bif) = cend ; 
-      }
-
-  if (BIF_BLOB2(bif))
-    {
-      cend = (PTR_BFND) newNode(CONTROL_END);
-      BIF_CP(cend) = bif;
-      appendBfndListToList2(cend,bif);
-      if (BIF_CP(bif))
-	LocalRedoBifNextChain(BIF_CP(bif));
-      else
-	LocalRedoBifNextChain(bif);
-    }
-}
-
-
-/***************************************************************************/
-void addControlEndToList2(bif)
-PTR_BFND bif;
-{
-  PTR_BFND cend;
-  if (!bif)
-    return; 
-  cend = (PTR_BFND) newNode(CONTROL_END);
-  BIF_CP(cend) = bif;
-  appendBfndListToList2(cend,bif);
-  if (BIF_CP(bif))
-    LocalRedoBifNextChain(BIF_CP(bif));
-  else
-    LocalRedoBifNextChain(bif);
-}
-
-/***************************************************************************/
-int LibClanguage()
-{
-return !(Check_Lang_Fortran(cur_proj));
-}
-
-/***************************************************************************/
-int LibFortranlanguage()
-{
-  return (Check_Lang_Fortran(cur_proj));
-}
-
-/***************************************************************************/
-PTR_BFND LibextractStmtBody(bif)
-PTR_BFND bif;
-{
-  PTR_BFND cend, body;
-
-   if (!bif)
-    return NULL;
-  cend = getLastNodeOfStmt(bif);
-  if (cend && isAControlEnd(BIF_CODE(cend)))
-    cend = getNodeBefore(cend);
-  if (cend != bif)
-    body =  extractBifSectionBetween(BIF_NEXT(bif),cend);
-  else
-    body =  NULL;
-  return body;
-}
-
-/* function for loops */
-/***************************************************************************/
-int LibisEnddoLoop(loop)
-     PTR_BFND loop;
-{
-  PTR_BFND bif;
-  
-  if (BIF_CODE (loop) != FOR_NODE) 
-    return FALSE;
-  bif = getLastNodeOfStmt(loop);
-  if (BIF_CODE (bif) != CONTROL_END)
-    return FALSE;
-  else 
-    return TRUE;
-}
-
-/***************************************************************************/
-int LibperfectlyNested(loop)
-    PTR_BFND loop;
-{
-  int i = 0;
-  PTR_BFND temp = loop;
-  
-  if (!loop)
-    return 0;
-
-  while (temp && BIF_NEXT (temp) &&
-	 (BIF_CODE (BIF_NEXT (temp)) == FOR_NODE) &&
-	 (BIF_CODE (temp) == FOR_NODE) 
-	 && (LibisEnddoLoop (temp)) &&
-	 (blobListLength(BIF_BLOB1 (temp)) == 2))
-    {
-      i++;
-      temp = BIF_NEXT (temp);
-    }
-  
-  if (temp &&
-      (BIF_CODE (temp) == FOR_NODE) && 
-      (LibisEnddoLoop(temp)))
-    i++;
-  return  i;
-}
-
-/***************************************************************************/
-PTR_BFND LibgetNextNestedLoop(b)
-     PTR_BFND b;
-{
-  PTR_BLOB blob;
-  
-  for(blob = BIF_BLOB1(b) ; blob; blob = BLOB_NEXT(blob))
-    {
-      if (BIF_CODE(BLOB_VALUE(blob)) == FOR_NODE)
-        return(BLOB_VALUE(blob));
-    }
-  return(NULL);
-}
-
-/***************************************************************************/
-PTR_BFND LibgetInnermostLoop(b)
-     PTR_BFND b;
-{
-  PTR_BFND loop;
-  int nb;
-  
-  if (!b)
-    return NULL;
-  nb = LibperfectlyNested(b);
-  loop = b;
-  while (LibgetNextNestedLoop(loop) && nb)
-    {
-      loop = LibgetNextNestedLoop(loop);
-      nb --;
-    }  
-  return loop;
-}
-
-/***************************************************************************/
-PTR_BFND LibgetPreviousNestedLoop(b)
-PTR_BFND b;
-{
-  PTR_BFND loop;
-  
-  if (!b) return NULL;
-  
-  loop = BIF_CP(b);
-  while(loop)
-    {
-      if (BIF_CODE(loop) == FOR_NODE)
-        return loop;       
-      if (BIF_CODE(loop) == GLOBAL)
-        return NULL;
-      loop = BIF_CP(loop);      
-    }        
-  return(NULL);
-}
-
-/***************************************************************************/
-
-PTR_BFND LibGetScopeForDeclare(scope)
-PTR_BFND scope;
-{
-  
-  PTR_BFND temp;
-  
-  temp = scope;
-  while(temp)
-    {
-      if ((BIF_CODE(temp) == PROC_HEDR) ||
-          (BIF_CODE(temp) == PROS_HEDR) ||
-          (BIF_CODE(temp) == PROG_HEDR) ||
-          (BIF_CODE(temp) == GLOBAL) ||
-          (BIF_CODE(temp) == FUNC_HEDR))
-        break;
-      temp = BIF_CP(temp);
-    }
-  return(temp);
-}
-
-
-/***************************************************************************/
-PTR_BFND getScopeForLabel(scope)
-PTR_BFND scope;
-{
-  
-  PTR_BFND temp;
-  /* rule for fortran */
-  temp = scope;
-  while(temp)
-    {
-      if ((BIF_CODE(temp) == PROC_HEDR) ||
-          (BIF_CODE(temp) == PROS_HEDR) ||
-          (BIF_CODE(temp) == PROG_HEDR) ||
-          (BIF_CODE(temp) == GLOBAL) ||
-          (BIF_CODE(temp) == FUNC_HEDR))
-        break;
-      temp = BIF_CP(temp);
-    }
-  return(temp);
-}
-
-/***************************************************************************/
-PTR_BLOB getLabelUDChain(PTR_LABEL label, PTR_BFND scope)
-{
-    PTR_BFND func, last, temp;
-    PTR_BLOB blob, first;
-    PTR_LABEL tl;
-
-    if (!label)
-        return NULL;
-    
-    func = getScopeForLabel(scope);
-    if (!func)
-        return NULL;
-    last = getLastNodeOfStmt(func);
-
-    blob = NULL;
-    first = NULL;
-    for (temp = func; temp && (temp != last); temp = BIF_NEXT(temp))
-    {
-        tl = BIF_LABEL_USE(temp);
-        if (BIF_LL3(temp) && (NODE_CODE(BIF_LL3(temp)) == LABEL_REF))
-            tl = NODE_LABEL(BIF_LL3(temp));
-
-        // Kolganov 18.07.18, take into account of ARITH lables and COMGOTO
-        if (temp->variant == ARITHIF_NODE || temp->variant == COMGOTO_NODE || temp->variant == ASSGOTO_NODE)
-        {
-            PTR_LLND lb;
-            if (temp->variant == COMGOTO_NODE || temp->variant == ASSGOTO_NODE)
-                lb = BIF_LL1(temp);
-            else
-                lb = BIF_LL2(temp);
-            PTR_LABEL arith_lab[256];
-
-            int idx = 0;
-            while (lb)
-            {
-                arith_lab[idx++] = NODE_LABEL(NODE_OPERAND0(lb));
-                lb = NODE_OPERAND1(lb);
-            }
-
-            int z;
-            for (z = 0; z < idx; ++z)
-            {
-                if (arith_lab[z] && (LABEL_STMTNO(arith_lab[z]) == LABEL_STMTNO(label)))
-                {
-                    if (blob)
-                    {
-                        BLOB_NEXT(blob) = (PTR_BLOB)newNode(BLOB_KIND);
-                        blob = BLOB_NEXT(blob);
-                        BLOB_VALUE(blob) = temp;
-                    }
-                    else
-                    {
-                        blob = (PTR_BLOB)newNode(BLOB_KIND);
-                        BLOB_VALUE(blob) = temp;
-                        first = blob;
-                    }
-                    break;
-                }
-            }
-        }
-        else
-        {
-            if (tl && (LABEL_STMTNO(tl) == LABEL_STMTNO(label)))
-            {
-                if (blob)
-                {
-                    BLOB_NEXT(blob) = (PTR_BLOB)newNode(BLOB_KIND);
-                    blob = BLOB_NEXT(blob);
-                    BLOB_VALUE(blob) = temp;
-                }
-                else
-                {
-                    blob = (PTR_BLOB)newNode(BLOB_KIND);
-                    BLOB_VALUE(blob) = temp;
-                    first = blob;
-                }
-            }
-        }
-    }
-    return first;
-}
-
-/***************************************************************************/
-
-void LibconvertLogicIf(PTR_BFND ifst)
-{
-    if (!ifst)
-        return;
-    if (BIF_CODE(ifst) == LOGIF_NODE)
-    {/* Convert to if */
-        PTR_BFND last, ctl;
-        BIF_CODE(ifst) = IF_NODE;
-        /* need to add a contro_end */
-        last = getLastNodeOfStmt(ifst);
-        ctl = (PTR_BFND)newNode(CONTROL_END);
-        insertBfndListIn(ctl, last, ifst);
-    }
-}
-
-/***************************************************************************/
-int convertToEnddoLoop(PTR_BFND loop)
-{
-    PTR_BFND cend, bif, lastcend;
-    PTR_BLOB blob, list_ud;
-    PTR_LABEL label;
-    PTR_CMNT comment;
-    
-    if (!loop)
-        return 0;
-
-    if (BIF_CODE(loop) != FOR_NODE)
-        return 0;
-
-    if (!LibisEnddoLoop(loop))
-    {
-        bif = getLastNodeOfStmt(loop);
-        if (!bif)
-            return 0;
-        while (BIF_CODE(bif) == FOR_NODE)
-        {
-            /* because of continue stmt shared by loops */
-            bif = getLastNodeOfStmt(bif);
-            if (!bif)
-                return 0;
-        }
-
-        if (BIF_CODE(bif) == CONT_STAT)
-        {
-            if (BIF_LABEL(bif) != NULL)
-            {
-                label = BIF_LABEL(bif);
-                if (BIF_LABEL_USE(loop) &&
-                    (LABEL_STMTNO(BIF_LABEL_USE(loop)) == LABEL_STMTNO(label)))
-                {
-                    list_ud = getLabelUDChain(label, loop);
-                    if (blobListLength(list_ud) <= 1)
-                    {
-                        cend = (PTR_BFND)newNode(CONTROL_END);
-                        BIF_CP(cend) = loop;
-                        BIF_LABEL_USE(loop) = NULL;
-                        BIF_CMNT(cend) = BIF_CMNT(bif);
-                        BIF_LINE(cend) = BIF_LINE(bif); /*Bakhtin 26.01.10*/
-                        bif = deleteBfnd(bif);
-                        insertBfndListIn(cend, bif, loop);
-                    }
-                    else
-                    { /* more than on uses of the label check if ok */
-                        for (blob = list_ud; blob;
-                            blob = BLOB_NEXT(blob))
-                        {
-                            if (!BLOB_VALUE(blob) || (BIF_CODE(BLOB_VALUE(blob)) != FOR_NODE))
-                                return 0;
-                        }
-                        /* we insert as much enddo than necessary */
-                        comment = BIF_CMNT(bif);
-                        bif = deleteBfnd(bif);
-                        lastcend = bif;
-                        for (blob = list_ud; blob; blob = BLOB_NEXT(blob))
-                        {
-                            if (BLOB_VALUE(blob) && (BIF_CODE(BLOB_VALUE(blob)) == FOR_NODE))
-                            {
-                                BIF_LABEL_USE(BLOB_VALUE(blob)) = NULL;
-                                cend = (PTR_BFND)newNode(CONTROL_END);
-                                BIF_CMNT(cend) = comment;
-                                BIF_LINE(cend) = BIF_LINE(lastcend); /*Bakhtin 26.01.10*/
-                                comment = NULL;
-                                BIF_CMNT(bif) = NULL;
-                                insertBfndListIn(cend, lastcend, BLOB_VALUE(blob));
-                                /*lastcend = Get_Node_Before(cend); */
-                            }
-                        }
-                    }
-                    return 1;
-                }
-                else
-                    return 0;  /* something is wrong the label is not the same */
-            }
-            else
-            { /* should not appear CONTINUE without label */
-                cend = (PTR_BFND)newNode(CONTROL_END);/*podd 12.03.99*/
-                BIF_CMNT(cend) = BIF_CMNT(bif);
-                BIF_LINE(cend) = BIF_LINE(bif); /*Bakhtin 26.01.10*/
-                bif = deleteBfnd(bif);
-                insertBfndListIn(cend, bif, loop);
-                return 0;
-            }
-
-        }
-        else
-        { /* this not a enddo or a cont stat; probably a statement */
-            label = BIF_LABEL(bif);
-            list_ud = getLabelUDChain(label, loop);
-            if (label && blobListLength(list_ud) <= 1)
-            {
-                cend = (PTR_BFND)newNode(CONTROL_END);
-                BIF_LINE(cend) = BIF_LINE(bif); /*Bakhtin 26.01.10*/
-                insertBfndListIn(cend, bif, loop);
-                BIF_LABEL(bif) = NULL;
-                BIF_LABEL_USE(loop) = NULL;
-            }
-            else
-                return 0;
-        }
-        return 1;
-    }
-    else
-        return 1;
-}
-
-
-/* (fbodin) Duplicate Symbol and type routine (modified phb) */
-/***************************************************************************/
-PTR_TYPE duplicateType(type)
-     PTR_TYPE type;
-{
-  PTR_TYPE newtype;  
-  if (!type)
-    return NULL;
-  
-  if (!isATypeNode(NODE_CODE(type)))
-    {
-      Message("duplicateType; Not a type node",0);
-      return NULL;
-    }
-  if (isAtomicType(TYPE_CODE(type)) && TYPE_CODE(type)!= T_STRING && !TYPE_RANGES(type) && !TYPE_KIND_LEN(type))
-    return(GetAtomicType(TYPE_CODE(type)));  /*07.06.06*/ /*22.04.14*/
- 
-  /***** Allocate a new node *****/
-  newtype = (PTR_TYPE) newNode(TYPE_CODE(type));
-
-  /* Copy the fields that are NOT in the union */
-  TYPE_SYMB(newtype) = TYPE_SYMB(type);
-  TYPE_LENGTH(newtype) =TYPE_LENGTH(type);
-
-  /* Copy the size of the union (all of the fields) (phb)*/
-  memcpy(&(newtype->entry),&(type->entry),sizeof(type->entry));
-
-  if (isAtomicType(TYPE_CODE(type)))
-    {
-      if (TYPE_RANGES(type))
-        TYPE_RANGES(newtype) = copyLlNode(TYPE_RANGES(type));
-      if (TYPE_KIND_LEN(type))
-        TYPE_KIND_LEN(newtype) = copyLlNode(TYPE_KIND_LEN(type)); /*22.04.14*/
-      return newtype;
-    }
-  if (hasTypeBaseType(TYPE_CODE(type))) 
-    {
-      if (TYPE_BASE(type))
-       TYPE_BASE(newtype) = duplicateType(TYPE_BASE(type));
-    }
-  if (hasTypeSymbol(TYPE_CODE(type)))
-    {
-      TYPE_SYMB_DERIVE(newtype) = TYPE_SYMB_DERIVE(type);
-    }
-  switch (TYPE_CODE(type))
-    {
-    case T_ARRAY		:
-      TYPE_RANGES(newtype) = copyLlNode(TYPE_RANGES(type));
-      break;	
-    case T_DESCRIPT		:
-      TYPE_LONG_SHORT(newtype) = TYPE_LONG_SHORT(type);
-      break;
-    }
-  return newtype;
-}
-
-/***************************************************************************/
-
-PTR_SYMB duplicateSymbolAcrossFiles();
-
-PTR_TYPE duplicateTypeAcrossFiles(type)
-     PTR_TYPE type;
-{
-  PTR_TYPE newtype;  
-  if (!type)
-    return NULL;
-  
-  if (!isATypeNode(NODE_CODE(type)))
-    {
-      Message("duplicateTypeAcrossFiles; Not a type node",0);
-      return NULL;
-    }
-  if (isAtomicType(TYPE_CODE(type)) && TYPE_CODE(type)!= T_STRING && !TYPE_RANGES(type) && !TYPE_KIND_LEN(type))
-    return(GetAtomicType(TYPE_CODE(type)));   /*07.06.06*/ /*22.04.14*/
-  
-  /***** Allocate a new node *****/
-  newtype = (PTR_TYPE) newNode(TYPE_CODE(type));
-
-  /* Copy the fields that are NOT in the union */
-  TYPE_SYMB(newtype) = TYPE_SYMB(type);
-  TYPE_LENGTH(newtype) =TYPE_LENGTH(type);
-
-  /* Copy the size of the union (all of the fields) (phb)*/
-  memcpy(&(newtype->entry),&(type->entry),sizeof(type->entry));
-
-  if (isAtomicType(TYPE_CODE(type)))
-    {
-      if (TYPE_RANGES(type))
-        TYPE_RANGES(newtype) = copyLlNode(TYPE_RANGES(type)); /*07.06.06*/
-      if (TYPE_KIND_LEN(type))
-        TYPE_KIND_LEN(newtype) = copyLlNode(TYPE_KIND_LEN(type)); /*22.04.14*/
-
-      return newtype;
-    }
-
-  if (hasTypeBaseType(TYPE_CODE(type))) 
-    {
-      if (TYPE_BASE(type))
-       TYPE_BASE(newtype) = duplicateTypeAcrossFiles(TYPE_BASE(type));
-    }
-  if (hasTypeSymbol(TYPE_CODE(type)))
-    {
-      TYPE_SYMB_DERIVE(newtype) = duplicateSymbolAcrossFiles(TYPE_SYMB_DERIVE(type));
-    }
-  switch (TYPE_CODE(type))
-    {
-    case T_ARRAY		:
-      TYPE_RANGES(newtype) = copyLlNode(TYPE_RANGES(type));
-      break;	
-    case T_DESCRIPT		:
-      TYPE_LONG_SHORT(newtype) = TYPE_LONG_SHORT(type);
-      break;
-    }
-  return newtype;
-}
-
-
-/***************************************************************************/
-PTR_SYMB duplicateParamList(symb)
-     PTR_SYMB symb;
-{
-  PTR_SYMB first, previous, ptsymb,ts;
-  ptsymb = SYMB_FUNC_PARAM (symb);
-  ts = NULL;
-  first = NULL;
-  previous = NULL;
-  while (ptsymb)
-    {
-      ts = duplicateSymbol(ptsymb);
-      if (!first)
-        first = ts;
-      if (previous)
-        SYMB_NEXT_DECL (previous) = ts;
-      previous = ts;
-      ptsymb = SYMB_NEXT_DECL (ptsymb);
-    }
-  if (ts)
-    SYMB_NEXT_DECL (ts) = NULL;
-  return first;
-}
-
-
-/***************************************************************************/
-PTR_SYMB duplicateSymbol(symb)
-     PTR_SYMB symb;
-{
-  PTR_SYMB  newsymb;
-  /* char *str;*/ /* podd 15.03.99*/
-  if (!symb)
-    return NULL;
-  
-  if (!isASymbNode(NODE_CODE(symb)))
-    {
-      Message("duplicateSymbol; Not a symbol node",0);
-      return NULL;
-    }
-  newsymb = (PTR_SYMB) newSymbol(SYMB_CODE(symb),SYMB_IDENT(symb),SYMB_TYPE(symb));
-  
-  SYMB_ATTR(newsymb) = SYMB_ATTR(symb);
-
-  /* Copy the size of the union (all of the fields) (phb)*/
-  memcpy(&(newsymb->entry.Template),&(symb->entry.Template),
-        sizeof(newsymb->entry.Template));
-
-  /*dirty trick for debug, to identify copie/
-  str = (char *) xmalloc(512);
-  sprintf(str,"DEBUG%d%s",newsymb,SYMB_IDENT(newsymb));
-  SYMB_IDENT(newsymb) = str;
-  */
-  /* copy the expression for Constant Node */
-  if (SYMB_CODE(newsymb) == CONST_NAME)
-    SYMB_VAL(newsymb) = copyLlNode(SYMB_VAL(newsymb));
-  return newsymb;
-}
-
-/***************************************************************************/
-PTR_SYMB duplicateSymbolLevel1(symb)
-     PTR_SYMB symb;
-{
-  PTR_SYMB  newsymb;
-
-  if (!symb)
-    return NULL;
-
-  if (!isASymbNode(NODE_CODE(symb)))
-    {
-      Message("duplicateSymbolLevel1; Not a symbol node",0);
-      return NULL;
-    }
-  newsymb = duplicateSymbol(symb);
-
-  /* to be updated later Not that simple*/
-  switch (SYMB_CODE(symb))
-    {
-    case MEMBER_FUNC:
-    case FUNCTION_NAME:
-    case PROCEDURE_NAME:
-    case PROCESS_NAME:
-      SYMB_FUNC_PARAM (newsymb) = duplicateParamList(symb);
-      break;
-    }
-  return newsymb;
-}
-
-/***************************************************************************/
-PTR_BFND getBodyOfSymb(symb)
-PTR_SYMB symb;
-{
-  /*  PTR_SYMB  newsymb = NULL;*/
-  PTR_BFND body = NULL;
-  PTR_TYPE type;
-  if (!symb)
-    return NULL;
-
-  if (!isASymbNode(NODE_CODE(symb)))
-    {
-      Message("getbodyofsymb; not a symbol node",0);
-      return NULL;
-    }
-  switch (SYMB_CODE(symb))
-    {
-    case MEMBER_FUNC:
-    case FUNCTION_NAME:
-    case PROCEDURE_NAME:
-    case PROCESS_NAME:
-    case MODULE_NAME:
-      body = SYMB_FUNC_HEDR(symb);
-      if (!body)
-        body = getFunctionHeaderAllFile(symb);
-      break;
-    case PROGRAM_NAME:
-      body = symb->entry.prog_decl.prog_hedr;
-      if (!body)
-        body = getFunctionHeaderAllFile(symb);
-      break;
-
-    case CLASS_NAME:
-    case TECLASS_NAME:
-    case COLLECTION_NAME:
-      type = SYMB_TYPE(symb);
-      if (type)
-        {
-          body = TYPE_COLL_ORI_CLASS(type);
-        } else
-          {
-            Message("body of collection or class not found",0);
-	    return NULL;
-          }
-      break;
-    }
-  return body;
-}
-
-
-/***************************************************************************/
-void replaceSymbInExpression(PTR_LLND exprold, PTR_SYMB symb, PTR_SYMB new)
-{
-    if (!exprold || !symb || !new)
-        return;
-    if (!isASymbNode(SYMB_CODE(symb)))
-    {
-        Message(" not a symbol node in replaceSymbInExpression", 0);
-        return;
-    }
-    if (!isASymbNode(SYMB_CODE(new)))
-    {
-        Message(" not a symbol node in replaceSymbInExpression", 0);
-        return;
-    }
-
-    if (hasNodeASymb(NODE_CODE(exprold)))
-    {
-        if (NODE_SYMB(exprold) == symb)
-            NODE_SYMB(exprold) = new;
-    }
-    replaceSymbInExpression(NODE_OPERAND0(exprold), symb, new);
-    replaceSymbInExpression(NODE_OPERAND1(exprold), symb, new);
-}
-
-/***************************************************************************/
-void replaceSymbInStmts(debut, fin, symb, new)
-     PTR_BFND debut, fin;
-     PTR_SYMB symb,new;
-{
-    PTR_BFND temp;
-
-    for (temp = debut; temp; temp = BIF_NEXT(temp))
-    {
-        if (BIF_SYMB(temp) == symb)
-            BIF_SYMB(temp) = new;
-        replaceSymbInExpression(BIF_LL1(temp), symb, new);
-        replaceSymbInExpression(BIF_LL2(temp), symb, new);
-        replaceSymbInExpression(BIF_LL3(temp), symb, new);
-        if (fin && (temp == fin))
-            break;
-    }
-}
-
-/***************************************************************************/
-void replaceSymbInExpressionSameName(exprold,symb, new)
-     PTR_LLND exprold;
-     PTR_SYMB symb, new;
-{
-  if (!exprold || !symb || !new)
-    return;
-  if (!isASymbNode(SYMB_CODE(symb)))
-    {
-      Message(" not a symbol node in replaceSymbInExpressionSameName",0);
-      return;
-    }
-  if (!isASymbNode(SYMB_CODE(new)))
-    {
-      Message(" not a symbol node in replaceSymbInExpressionSameName",0);
-      return;
-    }
-  if (hasNodeASymb(NODE_CODE(exprold)))
-    {
-      if (sameName(NODE_SYMB(exprold),symb))
-	{
-	  NODE_SYMB(exprold) = new;
-	}
-    }
-  replaceSymbInExpressionSameName(NODE_OPERAND0(exprold), symb, new);
-  replaceSymbInExpressionSameName(NODE_OPERAND1(exprold), symb, new);
-}
-
-
-/***************************************************************************/
-void replaceSymbInStmtsSameName(debut, fin, symb, new)
-     PTR_BFND debut, fin;
-     PTR_SYMB symb,new;
-{
-  PTR_BFND temp;
-  
-  for (temp = debut; temp ; temp = BIF_NEXT(temp))
-    {
-      if (sameName(BIF_SYMB(temp),symb))
-	BIF_SYMB(temp) = new;
-      replaceSymbInExpressionSameName(BIF_LL1(temp), symb,new);
-      replaceSymbInExpressionSameName(BIF_LL2(temp), symb,new);
-      replaceSymbInExpressionSameName(BIF_LL3(temp), symb,new);
-      if (fin && (temp == fin))
-        break;
-    }  
-}
-
-/***************************************************************************/
-PTR_SYMB duplicateSymbolLevel2(symb)
-     PTR_SYMB symb;
-{
-  PTR_SYMB  newsymb;
-  PTR_BFND body,newbody,last,before,cp;
-  PTR_SYMB ptsymb,ptref;
-  if (!symb)
-    return NULL;
-
-  if (!isASymbNode(NODE_CODE(symb)))
-    {
-      Message("duplicateSymbolLevel2; Not a symbol node",0);
-      return NULL;
-    }
-  newsymb = duplicateSymbolLevel1(symb);
-
-  /* to be updated later Not that simple*/
-  switch (SYMB_CODE(symb))
-    {
-    case MEMBER_FUNC:
-    case FUNCTION_NAME:
-    case PROCEDURE_NAME:
-    case PROCESS_NAME:
-      /* duplicate the body */
-      body = getBodyOfSymb(symb);
-      if (body)
-	{
-	  before = getNodeBefore(body);
-	  cp = BIF_CP(body);
-	  last = getLastNodeOfStmt(body);
-	  body =  extractBifSectionBetween(body,last);
-	  newbody = duplicateStmts (body);
-	  insertBfndListIn (body, before,cp);
-	  insertBfndListIn (newbody, before,cp);
-	  BIF_SYMB(newbody) = newsymb;
-	  SYMB_FUNC_HEDR(newsymb) = newbody;
-	  /* we have to propagate change in the param list in the new body */
-	  ptsymb = SYMB_FUNC_PARAM (newsymb);
-	  ptref =  SYMB_FUNC_PARAM (symb);
-	  last = getLastNodeOfStmt(newbody);
-	  while (ptsymb)
-	    {
-	      replaceSymbInStmts(newbody,last,ptref,ptsymb);
-	      ptsymb = SYMB_NEXT_DECL (ptsymb);
-	      ptref = SYMB_NEXT_DECL (ptref);
-	    }
-	}
-      break;
-    case CLASS_NAME:
-    case TECLASS_NAME:
-    case COLLECTION_NAME:
-    case STRUCT_NAME:
-    case UNION_NAME:
-      body = getBodyOfSymb(symb);
-      if (body)
-	{
-	  before = getNodeBefore(body);
-	  cp = BIF_CP(body);
-	  last = getLastNodeOfStmt(body);
-	  body =  extractBifSectionBetween(body,last);
-	  newbody = duplicateStmts (body);
-	  insertBfndListIn (body, before,cp);
-	  insertBfndListIn (newbody, before,cp);
-	  BIF_SYMB(newbody) = newsymb;
-	  /* probably more to do here */
-	  SYMB_TYPE(newsymb) = duplicateType(SYMB_TYPE(symb));
-	  /* set the new body for the symbol */
-	  TYPE_COLL_ORI_CLASS(SYMB_TYPE(newsymb)) = newbody;
-	}
-      break;
-    }
-  return newsymb;
-}
-
-/***************************************************************************/
-int arraySymbol(symb)
-     PTR_SYMB symb;
-{
-  PTR_TYPE type;
-  if (!symb)
-    return FALSE;
-  type = SYMB_TYPE(symb);
-  if (!type)
-    return FALSE;
-  if (TYPE_CODE(type) == T_ARRAY)
-    return TRUE;  
-  return FALSE;
-}
-
-/***************************************************************************/
-int pointerType(type)
-     PTR_TYPE type;
-{
-  if (!type)
-    return FALSE;
-  return  isPointerType(TYPE_CODE(type));
-}
-
-/***************************************************************************/
-int isIntegerType(type)
-     PTR_TYPE type;
-{
-  if (!type)
-    return FALSE;
-  return (TYPE_CODE(type) == T_INT);
-}
-
-/***************************************************************************/
-/* this function was all wrong, fixed May 25 1994, BW                      */
-PTR_SYMB getFieldOfStructWithName(name,typein)
-     char *name;
-     PTR_TYPE typein;
-{
-  PTR_TYPE type;
-  PTR_SYMB ptsymb = NULL;
-  if (!typein || !name)
-    return  NULL;
-
-      type = SYMB_TYPE(TYPE_SYMB_DERIVE(typein));  
-
-
-      if(TYPE_CODE(type) == T_DESCRIPT)
-         type = TYPE_BASE(type); 
-         /* the if statement above is necessary because of another bug */
-         /* with "friend" specifier                                    */
-      ptsymb = TYPE_COLL_FIRST_FIELD(type);
-
-
-  if (! (ptsymb)) Message("did not find the first field\n",0);
-
-  while (ptsymb)
-    {
-      if (!strcmp(SYMB_IDENT(ptsymb), name))
-	return  ptsymb;
-      ptsymb = getClassNextFieldOrMember (ptsymb);
-    }
-  return  NULL;
-}
-
-/***************************************************************************/
-PTR_LLND addLabelRefToExprList(expl,label)
-     PTR_LLND expl;
-     PTR_LABEL label;
-{
-  PTR_LLND  tmp, lptr,pt;
-
-  if (!label)
-    return expl;
-  pt = (PTR_LLND) newNode(LABEL_REF);
-  NODE_LABEL(pt) = label;
-  tmp = newExpr(EXPR_LIST,NULL,pt,NULL);
-  if (!expl)
-    return tmp;
-  lptr = Follow_Llnd(expl,2);
-  NODE_OPERAND1(lptr) = tmp;
-  return expl;
-}
-
-/***************************************************************************/
-PTR_BFND getStatementNumber(bif,pos)
-     int pos;
-     PTR_BFND bif;
-{
-  PTR_BFND ptbfnd = NULL;
-  /*  PTR_TYPE type;*/ /* podd 15.03.99*/
-  int count = 0;
-  if (!bif)
-    return  NULL;
-    ptbfnd = bif;
-  while (ptbfnd)
-    {
-      count++;
-      if (count == pos)
-	return  ptbfnd;
-      ptbfnd = BIF_NEXT(ptbfnd);
-    }
-  return  NULL;
-
-}
-
-/***************************************************************************/
-PTR_LLND deleteNodeInExprList(first,pos)
-PTR_LLND first;
-int pos;
-{
-  PTR_LLND tail,old = NULL;
-  int len = 0;
-  if (first == NULL)
-    return NULL;
-
-  if (pos == 0)
-    return NODE_OPERAND1(first);
-  for (tail = first; tail; tail = NODE_OPERAND1(tail) )
-    {
-      len++;
-      if (len  == pos)
-	{
-	  NODE_OPERAND1(old) = NODE_OPERAND1(tail);
-	  return first;
-	}
-      old = tail;
-    }
-  
-  return first;
-}
-
-/***************************************************************************/
-PTR_LLND deleteNodeWithItemInExprList(first,ll)
-PTR_LLND first,ll;
-{
-  PTR_LLND tail,old = NULL;
-  if (first == NULL)
-    return NULL;
-
-  if (NODE_OPERAND0(first) == ll)
-    return NODE_OPERAND1(first);
-  for (tail = first; tail; tail = NODE_OPERAND1(tail) )
-    {
-      if (NODE_OPERAND0(tail) == ll)
-	{
-	  NODE_OPERAND1(old) = NODE_OPERAND1(tail);
-	  return first;
-	}
-      old = tail;
-    }
-  return first;
-}
-
-/***************************************************************************/
-PTR_LLND addSymbRefToExprList(expl,symb)
-     PTR_LLND expl;
-     PTR_SYMB symb;
-{
-  PTR_LLND  tmp, lptr,pt;
-
-  if (!symb)
-    return expl;
-  pt = newExpr(VAR_REF,SYMB_TYPE(symb), symb);
-  tmp = newExpr(EXPR_LIST,NULL,pt,NULL);
-  if (!expl)
-    return tmp;
-  lptr = Follow_Llnd(expl,2);
-  NODE_OPERAND1(lptr) = tmp;
-  return expl;
-}
-
-/* functions mainly dedicated to libcreatecollectionwithtype */
-/***************************************************************************/
-void duplicateAllSymbolDeclaredInStmt(symb,stmt, oldident)
-     PTR_SYMB symb; /* symb is not to duplicate */
-     PTR_BFND stmt;
-     char *oldident;
-{
-  PTR_SYMB oldsymb, newsymb, ptsymb, ptref;
-  PTR_BFND cur,last,last1;
-  /*PTR_BFND body;*/ /* podd 15.03.99*/
-  PTR_BFND cur1,last2;
-  PTR_LLND ll1, ll2;
-  char str[512], *str1 = NULL;
-  PTR_SYMB tabsymbold[MAX_SYMBOL_FOR_DUPLICATE];
-  PTR_SYMB tabsymbnew[MAX_SYMBOL_FOR_DUPLICATE];
-  int nbintabsymb = 0;
-  int i;
-  if (!stmt || !symb )
-    return;
-
-  last = getLastNodeOfStmt(stmt);
-  
-  /* if that is a class/collection we have to take care of the constructor and destructor */
-  if (oldident)
-    {
-      str1 = (char *) xmalloc(strlen(SYMB_IDENT(symb))+2);
-      if ((int)strlen(oldident) >= 511)
-	{
-	  Message("internal error: string too long exit",0);
-	  exit(1);
-	}
-      sprintf(str1,"~%s",SYMB_IDENT(symb)); 
-      sprintf(str,"~%s",oldident);
-    }
-  for (cur = stmt; cur ; cur =  BIF_NEXT(cur))
-    {
-      if ((BIF_CODE(cur) == FUNC_HEDR) && (isInStmt(stmt,cur)))
-	{ /* local declaration, update the owner */
-	  if (BIF_SYMB(cur))
-	    {
-	      oldsymb = BIF_SYMB(cur);
-	      newsymb = duplicateSymbolLevel1(BIF_SYMB(cur));
-	      
-/*	      str1 = (char *) xmalloc(512);
-	      sprintf(str1,"COPYFORDEBUG%d%s",newsymb,SYMB_IDENT(newsymb));
-	      SYMB_IDENT(newsymb) = str1;*/
-	      tabsymbold[nbintabsymb] = oldsymb;
-	      tabsymbnew[nbintabsymb] = newsymb;
-	      nbintabsymb ++;
-	      if (nbintabsymb >= MAX_SYMBOL_FOR_DUPLICATE)
-		{
-		  Message("To many symbol in duplicateAllSymbolDeclaredInStmt",0);
-		  exit(1);
-		}
-	      BIF_SYMB(cur) = newsymb;
-	      SYMB_FUNC_HEDR(newsymb) = cur;
-	      SYMB_SCOPE(newsymb) = stmt;
-	      ptsymb = SYMB_FUNC_PARAM (newsymb);
-	      ptref =  SYMB_FUNC_PARAM (oldsymb);
-	      last2 = getLastNodeOfStmt(cur);
-	      while (ptsymb)
-		{
-		  replaceSymbInStmts(cur,last2,ptref,ptsymb);
-		  ptsymb = SYMB_NEXT_DECL (ptsymb);
-		  ptref = SYMB_NEXT_DECL (ptref);
-		}
-	      duplicateAllSymbolDeclaredInStmt(newsymb,cur,oldident);
-	      if (SYMB_CODE(newsymb) == MEMBER_FUNC)
-		{ /* there is more to do here */
-		  SYMB_MEMBER_BASENAME(newsymb) = symb;
-		}
-	      if (oldident)
-		{ /* change name of constructor and destructor */
-		  if (!strcmp(SYMB_IDENT(newsymb),oldident)) 
-		    {
-		      SYMB_IDENT(newsymb) = SYMB_IDENT(symb);
-		    }
-		  if (!strcmp(SYMB_IDENT(newsymb),str)) 
-		    {
-		      SYMB_IDENT(newsymb) = str1;
-		    }
-		}
-	      cur = getLastNodeOfStmt(cur);
-	    }
-	}
-      if ((BIF_CODE(cur) == VAR_DECL) && (isInStmt(stmt,cur)))
-	{ /* we have to declare what is declare there */
-	  /*  ll1= BIF_LL1(cur); this is the declaration */
-	  	  
-	  for (ll1= BIF_LL1(cur); ll1; ll1 = NODE_OPERAND1(ll1))
-	    {
-	      ll2 = giveLlSymbInDeclList(NODE_OPERAND0(ll1));
-	      if (ll2 && NODE_SYMB(ll2) && (NODE_SYMB(ll2) != symb))
-		{
-		  oldsymb = NODE_SYMB(ll2);
-		  NODE_SYMB(ll2) = duplicateSymbolLevel2(NODE_SYMB(ll2));
-		  tabsymbold[nbintabsymb] = oldsymb;
-		  tabsymbnew[nbintabsymb] = NODE_SYMB(ll2);
-		  nbintabsymb ++;
-		  if (nbintabsymb >= MAX_SYMBOL_FOR_DUPLICATE)
-		    {
-		      Message("To many symbol in duplicateAllSymbolDeclaredInStmt",0);
-		      exit(1);
-		    }
-		  /* apply recursively */
-		  if (getBodyOfSymb(NODE_SYMB(ll2)) && (!isInStmt(stmt,getBodyOfSymb(NODE_SYMB(ll2)))))
-		    {
-		      duplicateAllSymbolDeclaredInStmt(NODE_SYMB(ll2), getBodyOfSymb(NODE_SYMB(ll2)),oldident);
-		    }
-		  /* if member function we must attach the new symbol of
-		     collection also true for field name */
-		  if (SYMB_CODE(NODE_SYMB(ll2)) == MEMBER_FUNC)
-		    { /* there is more to do here */
-		      SYMB_MEMBER_BASENAME(NODE_SYMB(ll2)) = symb;
-		    }
-		  if (SYMB_CODE(NODE_SYMB(ll2)) == FIELD_NAME)
-		    { /* there is more to do here */
-		      SYMB_FIELD_BASENAME(NODE_SYMB(ll2)) = symb;
-		    }
-		  SYMB_SCOPE(NODE_SYMB(ll2)) = stmt; /* is that correct??? */
-		  
-		  if (oldident)
-		    { /* change name of constructor and destructor */
-
-		      if (!strcmp(SYMB_IDENT(NODE_SYMB(ll2)),oldident)) 
-			{
-			  SYMB_IDENT(NODE_SYMB(ll2)) = SYMB_IDENT(symb);
-			}
-		      if (!strcmp(SYMB_IDENT(NODE_SYMB(ll2)),str)) 
-			{
-			  SYMB_IDENT(NODE_SYMB(ll2)) = str1;
-			}
-		     
-		    }
-		  /* we have to replace the old symbol in the section */
-		  replaceSymbInStmts(stmt,last,oldsymb,NODE_SYMB(ll2));		  
-		}
-	    }
-	}
-      if (cur == last)
-	break;
-    }
-
-  /* we need to replace in the member function the symbol declared in the structure */
-  for (cur = stmt; cur ; cur =  BIF_NEXT(cur))
-    {
-      if ((BIF_CODE(cur) == FUNC_HEDR) && isInStmt(stmt,cur))
-	{ /* local declaration, update the owner */
-	  if (BIF_SYMB(cur))
-	    {
-	      cur1 = stmt;
-	      last1 = getLastNodeOfStmt(cur1);
-	      for (i=0; i<nbintabsymb; i++)
-		replaceSymbInStmts(cur1,last1,tabsymbold[i],tabsymbnew[i]);
-	    }
-	}
-      if ((BIF_CODE(cur) == VAR_DECL) && isInStmt(stmt,cur))
-	{ /* we have to declare what is declare there */
-	  
-	  for (ll1= BIF_LL1(cur); ll1; ll1 = NODE_OPERAND1(ll1))
-	    {
-	      ll2 = giveLlSymbInDeclList(NODE_OPERAND0(ll1));
-	      if (ll2 && NODE_SYMB(ll2) && (NODE_SYMB(ll2) != symb))
-		{
-		  oldsymb = NODE_SYMB(ll2);
-		  cur1 = getBodyOfSymb(oldsymb);
-		  if (cur1 && !isInStmt(stmt,cur1))
-		    {
-		      last1 = getLastNodeOfStmt(cur1);
-		      for (i=0; i<nbintabsymb; i++)
-			replaceSymbInStmts(cur1,last1,tabsymbold[i],tabsymbnew[i]);
-		    }
-		}
-	    }
-	}
-      if (cur == last)
-	break;
-    }
-}
-
-/*
-  function to implement replace type in 
-*/
-/***************************************************************************/
-int isTypeEquivalent(type1, type2)
-     PTR_TYPE type1, type2;
-{
-/*  PTR_TYPE type_a,type_b ;
-  int level1, level2 ;
-  int temp_var1,temp_var2;
-  PTR_TYPE b1,b2;
-*/ /*podd 15.03.99 */
-  PTR_SYMB symb1,symb2;
- 
-
-  if (type1 == type2)
-    return TRUE;  
-  if (!type1 ||!type2)
-    return FALSE;
-  
-  if (!isATypeNode(TYPE_CODE(type1)))
-    {
-      Message("isTypeEquivalent; arg1 Not a type node",0);
-      return 0;
-    }
-  if (!isATypeNode(TYPE_CODE(type2)))
-    {
-      Message("isTypeEquivalent; arg2 Not a type node",0);
-      return 0;
-    }
-  
-  if (TYPE_CODE(type1) != TYPE_CODE(type2))
-      return 0;
-
-  if (isAtomicType(TYPE_CODE(type1)) && !TYPE_RANGES(type1) && !TYPE_RANGES(type2) && !TYPE_KIND_LEN(type1) && !TYPE_KIND_LEN(type2))
-     return(1);
-
-  if (hasTypeBaseType(TYPE_CODE(type1)) && hasTypeBaseType(TYPE_CODE(type2))) 
-     {
-       if (TYPE_BASE(type1))
-	 return isTypeEquivalent(TYPE_BASE(type1),TYPE_BASE(type2));
-     }
-  if ((TYPE_CODE(type1) ==T_DERIVED_COLLECTION) &&
-      (TYPE_CODE(type2) ==T_DERIVED_COLLECTION))
-     { /* check for class<nnn> */
-       symb1 = TYPE_SYMB_DERIVE(type1);
-       symb2 = TYPE_SYMB_DERIVE(type2);
-       if (symb1 && symb2)
-	 {
-	   if (symb1 == symb2)
-	     return isTypeEquivalent(TYPE_COLL_BASE(type1), TYPE_COLL_BASE(type2));
-	   else
-	     if (sameName(symb1,symb2)) /* this is a type name, the same ident should be enough*/
-	       return isTypeEquivalent(TYPE_COLL_BASE(type1), TYPE_COLL_BASE(type2));
-	     else
-	       return 0;
-	 }
-     } else 
-       if (hasTypeSymbol(TYPE_CODE(type1)))
-	 {
-	   symb1 = TYPE_SYMB_DERIVE(type1);
-	   symb2 = TYPE_SYMB_DERIVE(type2);
-	   if (symb1 && symb2)
-	     {
-	       if (symb1 == symb2)
-		 return 1;
-	       else
-		 if (sameName(symb1,symb2)) /* this is a type name, the same ident should be enough*/
-		   return 1;
-		 else
-		   return 0;
-	     }
-	 }
-   return(0);
-}
-
-
-/***************************************************************************/
-int lookForTypeInType(type,comp)
-     PTR_TYPE type,comp;
-{
-  if (!type)
-    return 0;
-  if (!isATypeNode(TYPE_CODE(type)))
-    {
-      Message("lookForTypeInType; arg1 Not a type node",0);
-      return 0;
-    }
-  if (hasTypeBaseType(TYPE_CODE(type))) 
-    {
-      if (TYPE_BASE(type))
-	{
-	  if (isTypeEquivalent(TYPE_BASE(type), comp))
-	    {
-	      return 1;
-	    } 
-	  return lookForTypeInType(TYPE_BASE(type),comp);
-	}
-    }
-  return 0;
-}
-
-/***************************************************************************/
-int replaceTypeInType(type,comp,new)
-     PTR_TYPE type,comp,new;
-{
-  if (!type)
-    return 0;
-  if (!isATypeNode(TYPE_CODE(type)))
-    {
-      Message("replaceTypeInType; arg1 Not a type node",0);
-      return 0;
-    }
-  if (hasTypeBaseType(TYPE_CODE(type))) 
-    {
-      if (TYPE_BASE(type))
-	{
-	  if (isTypeEquivalent(TYPE_BASE(type), comp))
-	    {
-	      TYPE_BASE(type) = new;
-	      return 1;
-	    } 
-	  return replaceTypeInType(TYPE_BASE(type),comp,new);
-	}
-    }
-  return 0;
-}
-
-/***************************************************************************/
-void replaceTypeForSymb(symb, type, new)
-PTR_SYMB symb;
-PTR_TYPE type, new;
-{
-  PTR_TYPE ts;
-  PTR_SYMB ptsymb;
-  if (!symb || !type || !new) 
-    return;
-  
-  if (!isATypeNode(TYPE_CODE(type)))
-    {
-      Message(" not a type node in replaceTypeForSymb",0);
-      return;
-    }
-  if (!isASymbNode(SYMB_CODE(symb)))
-    {
-      Message(" not a symbol node in replaceTypeForSymb",0);
-      return;
-    }
-  ts = SYMB_TYPE(symb);
-  if (isTypeEquivalent(ts,type))
-    {
-      SYMB_TYPE(symb) = new;
-    } else
-      if (lookForTypeInType(ts,type))
-	{
-	  SYMB_TYPE(symb) = duplicateType(SYMB_TYPE(symb));
-	  replaceTypeInType(SYMB_TYPE(symb),type, new);
-	}
-  /* look if have a param list */
-  switch (SYMB_CODE(symb))
-    {
-    case MEMBER_FUNC:
-    case FUNCTION_NAME:
-    case PROCEDURE_NAME:
-    case PROCESS_NAME:
-      ptsymb = SYMB_FUNC_PARAM (symb);
-      while (ptsymb)
-	{
-	  replaceTypeForSymb(ptsymb,type,new);
-	  ptsymb = SYMB_NEXT_DECL (ptsymb);
-	}
-      break;
-    }
-}
-
-/***************************************************************************/
-void replaceTypeInExpression(exprold, type, new)
-     PTR_LLND exprold;
-     PTR_TYPE type, new;
-{
-  /*  PTR_SYMB symb, newsymb;*/  /* podd 15.03.99*/
-
-  if (!exprold || !type || !new)
-    return;
-
-  if (!isATypeNode(TYPE_CODE(type)))
-    {
-      Message(" not a type node in replaceTypeInExpression",0);
-      return;
-    }
-  if (!isATypeNode(TYPE_CODE(new)))
-    {
-      Message(" not a type node in replaceTypeInExpression",0);
-      return;
-    }
-  
-  if (isTypeEquivalent(NODE_TYPE(exprold),type))
-    {
-      NODE_TYPE(exprold) = new;
-    } else
-      {
-	if (lookForTypeInType(NODE_TYPE(exprold),type))
-	  {
-	    NODE_TYPE(exprold) = duplicateType(NODE_TYPE(exprold));
-	    replaceTypeInType(NODE_TYPE(exprold),type,new);
-	  }	  
-      }
-
-/*  if (hasNodeASymb(NODE_CODE(exprold))) do not do that it will alias some symbols not to be changes
-    {
-      if (symb = NODE_SYMB(exprold))
-	{
-	  replaceTypeForSymb(symb,type,new);
-	}
-    }*/
-
-  replaceTypeInExpression(NODE_OPERAND0(exprold), type, new);
-  replaceTypeInExpression(NODE_OPERAND1(exprold), type, new);
-  
-}
-
-
-/***************************************************************************/
-void replaceTypeInStmts(debut, fin, type, new)
-     PTR_BFND debut, fin;
-     PTR_TYPE type,new;
-{
-  PTR_BFND temp;
-  
-  for (temp = debut; temp ; temp = BIF_NEXT(temp))
-    {
-/*      if (BIF_SYMB(temp)) do not do that it will alias some symbols not to be changes
-	{
-	  replaceTypeForSymb(BIF_SYMB(temp),type,new);
-	}*/
-      replaceTypeInExpression(BIF_LL1(temp), type,new);
-      replaceTypeInExpression(BIF_LL2(temp), type,new);
-      replaceTypeInExpression(BIF_LL3(temp), type,new);
-      if (fin && (temp == fin))
-        break;
-    }  
-}
-
-/* the following fonction are mainly dedicated to libcreatecollectionwithtype 
- used in the C++ library also with symb == NULL */
-/***************************************************************************/
-void replaceTypeUsedInStmt(symb,stmt,type,new)
-     PTR_SYMB symb; /* symb is not to duplicate */
-     PTR_BFND stmt;
-     PTR_TYPE type,new;
-{
-  PTR_SYMB oldsymb;
-  PTR_BFND cur,last,body;
-  PTR_LLND ll1, ll2;
-  if (!stmt)
-    return;
-  last = getLastNodeOfStmt(stmt);
-  if (symb)
-    replaceTypeForSymb(symb,type,new);
-  replaceTypeInStmts(stmt,last,type,new);	  
-  for (cur = stmt; cur ; cur =  BIF_NEXT(cur))
-    {
-      if (symb)
-	{
-	  if (isADeclBif(BIF_CODE(cur)) && (isInStmt(stmt,cur)))
-	    { /* we have to declare what is declare there */
-	      for (ll1= BIF_LL1(cur); ll1; ll1 = NODE_OPERAND1(ll1))
-		{
-		  ll2 = giveLlSymbInDeclList(NODE_OPERAND0(ll1));
-		  if (ll2 && NODE_SYMB(ll2) && (NODE_SYMB(ll2) != symb))
-		    {
-		      oldsymb = NODE_SYMB(ll2);
-		      /*symbol is declared here so change the type*/
-		      replaceTypeForSymb(oldsymb,type,new);
-		      /* apply recursively */
-		      body = getBodyOfSymb(NODE_SYMB(ll2));
-		      if (body && (!isInStmt(stmt,body)))
-			{
-			  replaceTypeUsedInStmt(NODE_SYMB(ll2),body,type,new);
-			  replaceTypeInStmts(body,getLastNodeOfStmt(body),type,new);
-			}
-		    }
-		}
-	    }
-	} else
-	  { /* simpler we have just to look the stmt 
-	       this is an replacement for everywhere */
-	    if (isADeclBif(BIF_CODE(cur)))
-	    { /* we have to declare what is declare there */
-	      for (ll1= BIF_LL1(cur); ll1; ll1 = NODE_OPERAND1(ll1))
-		{
-		  ll2 = giveLlSymbInDeclList(NODE_OPERAND0(ll1));
-		  if (ll2 && NODE_SYMB(ll2) && (NODE_SYMB(ll2) != symb))
-		    {
-		      oldsymb = NODE_SYMB(ll2);
-		      /*symbol is declared here so change the type*/
-		      replaceTypeForSymb(oldsymb,type,new);
-		    }
-		}
-	    }
-	  }
-      if (cur == last)
-	break;
-    }
-}
-
-/***************************************************************************/
-PTR_TYPE createDerivedCollectionType(col,etype)
-     PTR_SYMB col;
-     PTR_TYPE etype;
-{
-  PTR_TYPE  newtc;
-  newtc =  (PTR_TYPE) newNode(T_DERIVED_COLLECTION); /*wasted*/
-  TYPE_COLL_BASE(newtc) = etype;
-  TYPE_SYMB_DERIVE(newtc) = col;
-  return newtc;
-}
-
-/* the following function is not trivial 
-   take a collection<type> and generate the right
-   instance of the collection with name 
-   collection_typename.
-   replace the type in the new body by the right one 
-   needs many duplication, not only 
-   duplicate for the code, but also for symbol type and so on
-   this function is presently use in the translator pc++2c++
-   make basically an identical work as Templates........
-    elemtype is going to replace elementtype;
-
-    warning, all the symbol are not duplicated, expression are not duplicated too
-    useless to to it for all (at least for the moment)
- */
-
-/***************************************************************************/
-PTR_BFND LibcreateCollectionWithType(colltype, elemtype)
-     PTR_TYPE colltype, elemtype;
-{
-  PTR_SYMB coltoduplicate, copystruct,se = NULL;
-  PTR_TYPE etype,newt,newtc;
-  int len;
-  char *newname;
-  if (!colltype || !elemtype)
-    return NULL;
-
-  /* the symbol we are duplicating */
-  coltoduplicate = TYPE_SYMB_DERIVE(colltype);
-  etype = getDerivedTypeWithName("ElementType");
-  if (!coltoduplicate || !etype)
-    {
-      Message("internal error in libcreatecollectionwithtype",0);
-      return NULL;
-    }
-  if (TYPE_CODE(elemtype) == T_DERIVED_TYPE)
-    {
-      se = TYPE_SYMB_DERIVE(elemtype);
-      if (!se)
-	{
-	  Message("The element type must be a class type-1",0);
-	  exit(1);
-	}
-      if (!SYMB_TYPE(se))
-	{
-	  Message("The element type must be a class type-2",0);
-	  exit(1);
-	}
-      if (SYMB_TYPE(se) && ((TYPE_CODE(SYMB_TYPE(se)) != T_CLASS)
-	&& (TYPE_CODE(SYMB_TYPE(se)) != T_TECLASS)))
-	{
-	  Message("The element type must be a class type-3",0);
-	  exit(1);
-	}
-    }
-  /* look for element type is given by  iselementtype(type) */
-  /* first we have to duplicate the code look at all the symbol */
-  /* first duplicate the collection structure then we will do the methods 
-     declare outside of the structure */
-  copystruct = duplicateSymbolLevel2(coltoduplicate);
-  if (!copystruct)
-    Message("internal error in LibcreateCollectionWithType",0);
-
-  /* duplicate at level 2 so must it is not necessary to do more 
-   for duplicating */
-  /* we have to set the new ID for the symbol according to the element type */
-  len = strlen(SYMB_IDENT(copystruct)) + strlen(SYMB_IDENT(se))+10;
-  newname = (char *) xmalloc(len);
-  memset(newname, 0, len);
-  sprintf(newname,"%s__%s",SYMB_IDENT(copystruct),SYMB_IDENT(se));
-
-  SYMB_IDENT(copystruct) = newname;
-
-  /* duplicate the symbol declared inside so we can attach a new type eventually */
-  duplicateAllSymbolDeclaredInStmt(copystruct, getBodyOfSymb(copystruct),SYMB_IDENT(coltoduplicate));
-
-  /* the collection body and the method have been duplicated no we have to replace the type */
-  /* first replace element type */
-  replaceTypeUsedInStmt(copystruct, getBodyOfSymb(copystruct),etype,elemtype);
-
-  /* now replace type like DistributedArray<ElementType> but first construct the new type
-   corresponding to that */
-  newt = (PTR_TYPE) newNode(T_DERIVED_CLASS);
-  TYPE_SYMB_DERIVE(newt) = copystruct;
-  /* need to create a type for reference */
-  newtc =  createDerivedCollectionType(coltoduplicate,etype);
-  replaceTypeUsedInStmt(copystruct, getBodyOfSymb(copystruct),newtc,newt);
-
-  /* replacing DistributedArray<vector> for instance  is done elsewhere*/
-  return getBodyOfSymb(copystruct);
-}
-
-/***************************************************************************/
-int LibisMethodOfElement(symb)
-     PTR_SYMB symb;
-{
-  if (!symb) return FALSE;
-  if ((int) SYMB_ATTR(symb) & (int) ELEMENT_FIELD)
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-PTR_BFND LibfirstElementMethod(coll)
-     PTR_BFND coll;
-{
-  PTR_BFND pt,last;
-  PTR_SYMB symb;
-  PTR_LLND ll;
-   if (!coll )
-    return NULL;
-  last = getLastNodeOfStmt(coll);
-  for (pt = coll; pt && (pt != BIF_NEXT(last)); pt = BIF_NEXT(pt))
-    {
-      if (isADeclBif(BIF_CODE(pt))
-	  && (BIF_CP(pt) == coll))
-	{
-	  ll = giveLlSymbInDeclList(BIF_LL1(pt));
-	  if (ll && NODE_SYMB(ll))
-	    {
-	      symb = NODE_SYMB(ll);
-	      if (LibisMethodOfElement(symb))
-		return pt;
-	    }
-	}
-    }
-  return NULL;
-}
-
-
-/***************************************************************************/
-int buildLinearRep(exp,coef,symb,size,last)
-     PTR_LLND exp;
-     int *coef;
-     PTR_SYMB *symb;
-     int size;
-     int *last;    
-{
-  return buildLinearRepSign(exp,coef,symb,size, last,1,1);
-}
-
-
-/* initialy coeff are 0, return 1 if Ok, 0 if abort*/
-/***************************************************************************/
-int buildLinearRepSign(exp,coef,symb,size, last,sign,factor)
-     PTR_LLND exp;
-     int *coef;
-     PTR_SYMB *symb;
-     int size;
-     int *last;  
-     int sign;     
-     int factor;
-{
-  int code;
-  int i, *res1,*res2;
-  
-  if (!exp)
-    return TRUE;
-  
-  code = NODE_CODE(exp);
-  switch (code)
-    {
-    case VAR_REF:
-      for (i=0; i< size; i++)
-        {
-          if (NODE_SYMB(exp) == symb[i])
-            {
-              coef[i] = coef[i] + sign*factor;
-              return TRUE;
-            }
-        }
-      return FALSE;
-     
-    case SUBT_OP:
-      if (!buildLinearRepSign(NODE_OPERAND0(exp),coef,symb,size,last,sign,factor))
-        return FALSE;
-      if (!buildLinearRepSign(NODE_OPERAND1(exp),coef,symb,size,last,-1*sign,factor))
-        return FALSE;
-      break; 
-    case ADD_OP:
-      if (!buildLinearRepSign(NODE_OPERAND0(exp),coef,symb,size,last,sign,factor))
-        return FALSE;
-      if (!buildLinearRepSign(NODE_OPERAND1(exp),coef,symb,size,last,sign,factor))
-        return FALSE;
-      break;
-    case MULT_OP:
-      res1 = evaluateExpression (NODE_OPERAND0(exp));
-      res2 = evaluateExpression (NODE_OPERAND1(exp));
-      if ((res1[0] != -1) && (res2[0] != -1))
-        {
-          *last = *last + factor*sign*(res1[1]*res2[1]);
-        } else
-          { 
-            int found;
-            if (res1[0] != -1) 
-              {
-                /* la constante est le fils gauche */
-                if (NODE_CODE(NODE_OPERAND1(exp)) != VAR_REF)
-                  return  buildLinearRepSign(NODE_OPERAND1(exp),coef,symb,size, last,sign,res1[1]*factor);
-                found = 0;
-                for (i=0; i< size; i++)
-                  {
-                    if (NODE_SYMB(NODE_OPERAND1(exp)) == symb[i])
-                      {
-                        coef[i] = coef[i] + factor*sign*(res1[1]);
-                        found = 1;
-                        break;
-                      }
-                  }
-                if (!found) return FALSE;
-              } else
-                if (res2[0] != -1) 
-                  {
-                    /* la constante est le fils droit */
-                    if (NODE_CODE(NODE_OPERAND0(exp)) != VAR_REF)
-                      return  buildLinearRepSign(NODE_OPERAND0(exp),coef,symb,size, last,sign,res2[1]*factor);
-                    found =0;
-                    for (i=0; i< size; i++)
-                      {
-                        if (NODE_SYMB(NODE_OPERAND0(exp)) == symb[i])
-                          {
-                            coef[i] = coef[i] + factor*sign*(res2[1]);
-                            found = 1;
-                            break;
-                          }
-                      }
-                    if (!found) return FALSE;
-                  } else                    
-                    return FALSE;
-          }
-      break;
-    case INT_VAL:
-      *last = *last + factor*sign*(NODE_INT_CST_LOW(exp));
-      break;
-    default:
-      
-      return FALSE;
-    }
-  return TRUE;
-}
-
-
-/********************** FB ADDED JULY 94 ***********************
- * ALLOW TO COPY A FULL SYMBOL ACCROSS FILE                    *
- * THIS IS A FRAGILE FUNCTION BE CAREFUL WITH IT               *
- ***************************************************************/
-
-
-void resetDoVarForSymb()
-{
-  PTR_FILE ptf, saveptf;
-  PTR_BLOB ptb;
-  /* PTR_BFND tmp;*/ /* podd 15.03.99*/
-  PTR_SYMB tsymb;
-
-  saveptf = pointer_on_file_proj;
-  for (ptb = PROJ_FILE_CHAIN (cur_proj); ptb ; ptb =  BLOB_NEXT (ptb))
-    {
-      ptf = (PTR_FILE) BLOB_VALUE (ptb);
-      cur_file = ptf;      
-      /* reset the toolbox and pointers*/
-      Init_Tool_Box();
-      for (tsymb = PROJ_FIRST_SYMB() ; tsymb; tsymb = SYMB_NEXT(tsymb))
-        {
-          tsymb->dovar = 0;
-        }
-    }
-  cur_file = saveptf;
-  Init_Tool_Box();
-}
-
-
-void updateTypesAndSymbolsInBody(symb, stmt, where)
-     PTR_BFND stmt, where;
-     PTR_SYMB symb;
-{
-  PTR_SYMB oldsymb, newsymb, param;
-  PTR_BFND cur,last;
-  PTR_LLND ll1, ll2;
-  PTR_TYPE type,new;
-  int isparam;
-  if (!stmt)
-    return;
-  last = getLastNodeOfStmt(stmt);
-  for (cur = stmt; cur ; cur =  BIF_NEXT(cur))
-    {
-      if (isADeclBif(BIF_CODE(cur)))
-        { /* we have to declare what is declare there */
-          for (ll1= BIF_LL1(cur); ll1; ll1 = NODE_OPERAND1(ll1))
-            {
-              ll2 = giveLlSymbInDeclList(NODE_OPERAND0(ll1));
-              if (ll2 && NODE_SYMB(ll2) && (NODE_SYMB(ll2) != symb))
-                {
-                  oldsymb = NODE_SYMB(ll2);
-                  if (oldsymb != symb)
-                    {
-                      /* should check for param since already propagated
-                         needs TO BE WRITTEN EXPRESSION?????? */
-                       param = SYMB_FUNC_PARAM (symb);
-                       isparam = 0;
-                       while (param)
-                         {
-                           if (param == oldsymb )
-                             {
-                               isparam = 1;
-                               break;
-                             }
-                           param  = SYMB_NEXT_DECL (param );
-                         }
-                       if (! isparam)
-                         {
-                           newsymb = duplicateSymbolAcrossFiles(oldsymb, where);
-                           SYMB_SCOPE(newsymb) = stmt;
-                           type = SYMB_TYPE(oldsymb);
-                           new = duplicateTypeAcrossFiles(type);
-                           SYMB_TYPE(newsymb) = new;
-                           replaceTypeInStmts(stmt, last, type, new);
-                           replaceSymbInStmts(stmt,last,oldsymb,newsymb);
-                         }
-                    }
-                }
-            }
-        }
-      if (cur == last)
-        break;
-    }
-}
-
-
-
-PTR_SYMB duplicateSymbolAcrossFiles(symb, where)
-     PTR_SYMB symb;
-     PTR_BFND where;
-{
-  PTR_SYMB  newsymb;
-  PTR_BFND body,newbody,last,before,cp;
-  PTR_SYMB ptsymb,ptref;
-  if (!symb)
-    return NULL;
-
-  if (!isASymbNode(NODE_CODE(symb)))
-    {
-      Message("duplicateSymbolAcrossFiles; Not a symbol node",0);
-      return NULL;
-    }
-  if (symb->dovar)
-    {
-      /* already duplicated don't do it again */
-      return symb;
-    }
-  newsymb = duplicateSymbolLevel1(symb);
-  newsymb->dovar = 1;
-  symb->dovar = 1;
-  /* need a function resetDovar for all files and all symb to be called before*/
-  SYMB_SCOPE(newsymb) = where;
-  /* to be updated later Not that simple*/
-  switch (SYMB_CODE(symb))
-    {
-    case MEMBER_FUNC:
-    case FUNCTION_NAME:
-    case PROCEDURE_NAME:
-    case PROCESS_NAME:
-      /* find the body in the right file????*/
-      body = getBodyOfSymb(symb);
-      if (body)
-	{
-	  before = getNodeBefore(body);
-	  cp = BIF_CP(body);
-	  last = getLastNodeOfStmt(body);
-	  newbody = duplicateStmtsNoExtract(body);
-          if (BIF_CODE (where) == GLOBAL)
-            insertBfndListIn (newbody, where,where);
-          else
-            insertBfndListIn (newbody, where,BIF_CP(where));
-	  BIF_SYMB(newbody) = newsymb;
-	  SYMB_FUNC_HEDR(newsymb) = newbody;
-	  /* we have to propagate change in the param list in the new body */
-	  ptsymb = SYMB_FUNC_PARAM (newsymb);
-	  ptref =  SYMB_FUNC_PARAM (symb);
-	  last = getLastNodeOfStmt(newbody);
-	  while (ptsymb)
-	    {
-              SYMB_SCOPE(ptsymb) = newbody;
-	      replaceSymbInStmts(newbody,last,ptref,ptsymb);
-	      ptsymb = SYMB_NEXT_DECL (ptsymb);
-	      ptref = SYMB_NEXT_DECL (ptref);
-	    }
-          /* update the all the symbol and type used in the statement */
-          updateTypesAndSymbolsInBody(newsymb,newbody, where);
-/*          printf(">>>>>>>>>>>>>>>>>>>>>>\n");
-          UnparseProgram(stdout);
-          printf("<<<<<<<<<<<<<<<<<<<<<<\n");*/
-	}
-      break;
-    case TECLASS_NAME:
-    case CLASS_NAME:
-    case COLLECTION_NAME:
-    case STRUCT_NAME:
-    case UNION_NAME:
-      body = getBodyOfSymb(symb);
-      if (body)
-	{
-	  cp = BIF_CP(body);/*podd 12.03.99*/
-          before = getNodeBefore(body);/*podd 12.03.99*/
-          newbody = duplicateStmtsNoExtract(body);       
-	  insertBfndListIn (newbody, before,cp);
-	  BIF_SYMB(newbody) = newsymb;
-	  /* probably more to do here */
-	  SYMB_TYPE(newsymb) = duplicateTypeAcrossFiles(SYMB_TYPE(symb));
-	  /* set the new body for the symbol */
-	  TYPE_COLL_ORI_CLASS(SYMB_TYPE(newsymb)) = newbody;
-          updateTypesAndSymbolsInBody(newsymb,newbody, where);
-	}
-      break;
-    }
-  return newsymb;
-}
-/*-----------------------------------------------------------------*/
-/*podd 20.03.07*/
-
-void updateExpression(exp, symb, newsymb)
- PTR_LLND exp;
- PTR_SYMB symb, newsymb;
-{
-  PTR_SYMB param,newparam;
-  param    = SYMB_FUNC_PARAM (symb);
-  newparam = SYMB_FUNC_PARAM (newsymb);
-  while(param)
-  {
-    replaceSymbInExpression(exp,param, newparam);
-    param=SYMB_NEXT_DECL(param);
-    newparam=SYMB_NEXT_DECL(newparam);
-  }
-}
-
-/*podd 06.06.06*/
-void updateTypeAndSymbolInStmts(PTR_BFND stmt, PTR_BFND last, PTR_SYMB oldsymb, PTR_SYMB newsymb)
-{
-   PTR_TYPE type, new;
-
-   type = SYMB_TYPE(oldsymb);
-   new = duplicateTypeAcrossFiles(type);
-   SYMB_TYPE(newsymb) = new;
-   replaceTypeInStmts(stmt, last, type, new);
-   replaceSymbInStmts(stmt, last, oldsymb, newsymb);
-}
-
-/*podd 26.02.19*/
-void replaceSymbByNameInExpression(PTR_LLND exprold, PTR_SYMB new)
-{  
-   if(!exprold)
-      return;
-   if (hasNodeASymb(NODE_CODE(exprold)))
-   {    
-      if ( !strcmp(SYMB_IDENT(NODE_SYMB(exprold)), new->ident) )
-         NODE_SYMB(exprold) = new; 
-   }
-   replaceSymbByNameInExpression(NODE_OPERAND0(exprold), new);
-   replaceSymbByNameInExpression(NODE_OPERAND1(exprold), new);
-}
-
-/*podd 26.02.19*/
-void replaceSymbByNameInConstantValues(PTR_SYMB first_const_name, PTR_SYMB new)
-{
-   PTR_SYMB s;
-   for (s=first_const_name; s; s = SYMB_LIST(s))
-   {   
-      replaceSymbByNameInExpression (SYMB_VAL(s),new); 
-   }
-}
-/*podd 26.02.19*/
-void updateConstantSymbolsInParameterValues(PTR_SYMB first_const_name)
-{
-   PTR_SYMB symb, prev_symb;
-   for (symb=first_const_name; symb; symb = SYMB_LIST(symb))
-   {  
-      replaceSymbByNameInConstantValues(first_const_name,symb);
-   }
-   
-   symb=first_const_name;
-   while (symb)
-   {
-      prev_symb = symb;
-      symb = SYMB_LIST(symb);
-      SYMB_LIST(prev_symb) = SMNULL;  
-   }   
-}
-
-/*podd 26.02.19*/
-void replaceSymbInType(PTR_TYPE type, PTR_SYMB newsymb)
-{  
-  if (!type)
-    return;
-  
-  if (!isATypeNode(NODE_CODE(type)))
-  {
-      Message("duplicateTypeAcrossFiles; Not a type node",0);
-      return ;
-  }
-
-  if (isAtomicType(TYPE_CODE(type)))
-  {
-     replaceSymbByNameInExpression(TYPE_RANGES(type),newsymb);
-     replaceSymbByNameInExpression(TYPE_KIND_LEN(type),newsymb);
-  }
-
-  if (hasTypeBaseType(TYPE_CODE(type))) 
-     replaceSymbInType(TYPE_BASE(type), newsymb);
-   
-
-  if ( TYPE_CODE(type) == T_ARRAY)
-     replaceSymbByNameInExpression(TYPE_RANGES(type),newsymb);
-}
-
-/*podd 26.02.19*/
-void replaceSymbInTypeOfSymbols(PTR_SYMB newsymb,PTR_SYMB first_new)
-{
-   PTR_SYMB symb;
-   for( symb=first_new; symb; symb = SYMB_NEXT(symb) )
-      replaceSymbInType(SYMB_TYPE(symb),newsymb);
-}
-
-/*podd 26.02.19*/
-void updatesSymbolsInTypeExpressions(PTR_BFND new_stmt)
-{
-   PTR_SYMB symb, first_new;
-   first_new= BIF_SYMB(new_stmt);
-   for( symb=first_new; symb; symb = SYMB_NEXT(symb)) 
-      replaceSymbInTypeOfSymbols(symb,first_new);
-}
-/*podd 05.12.20*/
-void updateSymbInInterfaceBlock(PTR_BFND block)
-{
-    PTR_BFND last, stmt;
-    PTR_SYMB symb, newsymb;
-    last = getLastNodeOfStmt(block);
-    stmt = BIF_NEXT(block);
-    while(stmt != last)
-    {
-        symb = BIF_SYMB(stmt);
-        if(symb && (BIF_CODE(stmt) == FUNC_HEDR || BIF_CODE(stmt) == PROC_HEDR))
-        {           
-            newsymb = duplicateSymbolLevel1(symb);
-            SYMB_SCOPE(newsymb) = block;
-            updateTypesAndSymbolsInBodyOfRoutine(newsymb, stmt, stmt);
-            stmt = BIF_NEXT(getLastNodeOfStmt(stmt));
-        } 
-        else
-            stmt = BIF_NEXT(stmt); 
-    }  
-}
-
-void updateSymbolsOfList(PTR_LLND slist, PTR_BFND struct_stmt)
-{  
-    PTR_LLND ll;
-    PTR_SYMB symb, newsymb;
-    for(ll=slist; ll; ll=ll->entry.Template.ll_ptr2)
-    {
-        symb = NODE_SYMB(ll->entry.Template.ll_ptr1); 
-        if(symb)
-        {  
-           newsymb = duplicateSymbolLevel1(symb); 
-           SYMB_SCOPE(newsymb) = struct_stmt;  
-           NODE_SYMB(ll->entry.Template.ll_ptr1) = newsymb;  
-        }
-    }
-}
-
-void updateSymbolsOfStructureFields(PTR_BFND struct_stmt)
-{
-    PTR_BFND last, stmt;
-    last = getLastNodeOfStmt(struct_stmt);
-    for(stmt=BIF_NEXT(struct_stmt); stmt!=last; stmt=BIF_NEXT(stmt))
-    {   
-        if(BIF_CODE(stmt) == VAR_DECL || BIF_CODE(stmt) == VAR_DECL_90)
-           updateSymbolsOfList(stmt->entry.Template.ll_ptr1, struct_stmt);
-    }
-}
-
-void updateSymbolsInStructures(PTR_BFND new_stmt)
-{
-    PTR_BFND last, stmt;
-    last = getLastNodeOfStmt(new_stmt);
-    for(stmt=BIF_NEXT(new_stmt); stmt!=last; stmt=BIF_NEXT(stmt))
-    {
-        if( BIF_CODE(stmt) == STRUCT_DECL)
-        {
-            updateSymbolsOfStructureFields(stmt);
-            stmt = getLastNodeOfStmt(stmt);
-        } 
-    }
-}
-
-void updateSymbolsInInterfaceBlocks(PTR_BFND new_stmt)
-{
-    PTR_BFND last, stmt;
-    last = getLastNodeOfStmt(new_stmt);
-    for(stmt=BIF_NEXT(new_stmt); stmt!=last; stmt=BIF_NEXT(stmt))
-    {
-        if(BIF_CODE(stmt) == INTERFACE_STMT || BIF_CODE(stmt) == INTERFACE_ASSIGNMENT || BIF_CODE(stmt) == INTERFACE_OPERATOR )
-        {   
-            updateSymbInInterfaceBlock(stmt); 
-            stmt = getLastNodeOfStmt(stmt);
-        }
-    }
-}
-
-PTR_BFND getHedrOfSymb(PTR_SYMB symb, PTR_BFND new_stmt)
-{
-    PTR_BFND last, stmt;
-    last = getLastNodeOfStmt(new_stmt);
-    for(stmt = new_stmt; stmt != last; stmt = BIF_NEXT(stmt))
-    {   
-        if((stmt->variant == FUNC_HEDR || stmt->variant == PROC_HEDR) && BIF_SYMB(stmt) && !strcmp(symb->ident,BIF_SYMB(stmt)->ident))   
-            return stmt; 
-    }
-    return NULL;
-}
-
-void updateTypesAndSymbolsInBodyOfRoutine(PTR_SYMB new_symb, PTR_BFND stmt, PTR_BFND new_stmt)
-{
-    PTR_SYMB oldsymb, newsymb, until, const_list, first_const_name;
-    PTR_BFND last, last_new;
-    PTR_TYPE type;
-    PTR_SYMB symb, ptsymb, ptref;
-    if (!stmt || !new_stmt)
-        return; 
-    symb =  BIF_SYMB(stmt);
-    BIF_SYMB(new_stmt) = new_symb;
-    new_symb->decl = 1;
-    if(SYMB_CODE(new_symb) == PROGRAM_NAME)
-        new_symb->entry.prog_decl.prog_hedr = new_stmt;
-    else 
-        SYMB_FUNC_HEDR(new_symb) = new_stmt;
-    last_new = getLastNodeOfStmt(new_stmt);
-    updateTypeAndSymbolInStmts(new_stmt, last_new, symb, new_symb);
-            
-    /* we have to propagate change in the param list in the new body */
-    if(SYMB_CODE(new_symb) == PROGRAM_NAME || SYMB_CODE(new_symb) == MODULE_NAME)
-        ptsymb = ptref = SMNULL;
-    else
-    {
-        ptsymb = SYMB_FUNC_PARAM(new_symb);
-        ptref  = SYMB_FUNC_PARAM(symb);
-    }
-    while (ptsymb)
-    {
-        SYMB_SCOPE(ptsymb) = new_stmt;
-        updateTypeAndSymbolInStmts(new_stmt, last_new, ptref, ptsymb);
-        ptsymb = SYMB_NEXT_DECL(ptsymb);        
-        ptref  = SYMB_NEXT_DECL(ptref);
-    }
-
-    const_list = first_const_name = SMNULL; /* to make a list of constant names  */
-
-    last = getLastNodeOfStmt(stmt);    
-    if (BIF_NEXT(last) && BIF_CODE(BIF_NEXT(last)) != COMMENT_STAT && stmt != new_stmt)
-        until = BIF_SYMB(BIF_NEXT(last));
-    else
-        until = SYMB_NEXT(last_file_symbol);    /*last_file_symbol is last symbol of source file's Symbol Table */
-
-    for (oldsymb = SYMB_NEXT(symb); oldsymb && oldsymb != until; oldsymb = SYMB_NEXT(oldsymb))
-    {
-        if (SYMB_SCOPE(oldsymb) == stmt)
-        {              
-            if (SYMB_TEMPLATE_DUMMY1(oldsymb) != IO)  /*is not a dummy parameter */
-            {
-                newsymb = duplicateSymbolLevel1(oldsymb); 
-                if(SYMB_CODE(newsymb)==CONST_NAME) 
-                {
-                    if(first_const_name == SMNULL)
-                    {
-                       first_const_name = const_list = newsymb;
-                       newsymb->id_list = SMNULL;
-                    }
-                    const_list->id_list = newsymb;
-                    newsymb->id_list = SMNULL;
-                    const_list = newsymb;
-                }
-
-                if((SYMB_CODE(newsymb)==FUNCTION_NAME || SYMB_CODE(newsymb)==PROCEDURE_NAME) && SYMB_FUNC_HEDR(oldsymb)) 
-                   updateTypesAndSymbolsInBodyOfRoutine(newsymb, SYMB_FUNC_HEDR(oldsymb), getHedrOfSymb(oldsymb,new_stmt));              
-               
-                SYMB_SCOPE(newsymb) = new_stmt;
-                updateTypeAndSymbolInStmts(new_stmt, last_new, oldsymb, newsymb);
-            }
-        }
-    }
-    updateConstantSymbolsInParameterValues(first_const_name); /*podd 26.02.19*/
-    updatesSymbolsInTypeExpressions(new_stmt);                /*podd 26.02.19*/
-    updateSymbolsInInterfaceBlocks(new_stmt);                 /*podd 07.12.20*/
-    updateSymbolsInStructures(new_stmt);                      /*podd 07.12.20*/
-}
-
-PTR_SYMB duplicateSymbolOfRoutine(PTR_SYMB symb, PTR_BFND where)
-{
-    PTR_SYMB newsymb;
-    PTR_BFND body, newbody, last;
-             
-    if (!symb)
-        return NULL;
-
-    if (!isASymbNode(NODE_CODE(symb)))
-    {
-        Message("duplicateSymbolAcrossFiles; Not a symbol node", 0);
-        return NULL;
-    }
-   
-    newsymb = duplicateSymbolLevel1(symb);
-
-    SYMB_SCOPE(newsymb) = SYMB_SCOPE(symb); /*where*/
-
-    /* to be updated later Not that simple*/
-    switch (SYMB_CODE(symb))
-    {
-    case FUNCTION_NAME:
-    case PROCEDURE_NAME:
-    case PROGRAM_NAME:
-    case MODULE_NAME:
-
-            body = getBodyOfSymb(symb);
-            last = getLastNodeOfStmt(body);
-            newbody = duplicateStmtsNoExtract(body);  
-            if (where)
-            {
-                if (BIF_CODE(where) == GLOBAL)
-                    insertBfndListIn(newbody, where, where);
-                else
-                    insertBfndListIn(newbody, where, BIF_CP(where));
-            }
-            /* update the all the symbol and type used in the program unit */
-            updateTypesAndSymbolsInBodyOfRoutine(newsymb, body, newbody);
-
-                        /*          printf(">>>>>>>>>>>>>>>>>>>>>>\n");
-                                    UnparseProgram(stdout);
-                                    printf("<<<<<<<<<<<<<<<<<<<<<<\n");     */
-        
-            break;
-    }
-    return newsymb;
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.uni
deleted file mode 100644
index 4d468b7..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.uni
+++ /dev/null
@@ -1,40 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# sage/lib/newsrc/makefile.sgi
-
-LIBDIR = ../../../lib
-
-OLDHEADERS = ../../h
-
-# Directory in which include file can be found
-TOOLBOX_INCLUDE = ../include
-
-INCL = -I$(OLDHEADERS) -I../include
-
-TOOLBOX_SRC	=  low_level.c unparse.c 
-
-TOOLBOX_HDR =  $(TOOLBOX_INCLUDE)/macro.h $(TOOLBOX_INCLUDE)/bif_node.def \
-	$(TOOLBOX_INCLUDE)/type.def  $(TOOLBOX_INCLUDE)/symb.def 
-
-CFLAGS = $(INCL) -c -DSYS5 -Wall
-
-low_level.o: low_level.c $(TOOLBOX_HDR)
-
-unparse.o:   unparse.c $(TOOLBOX_HDR) $(TOOLBOX_INCLUDE)/unparse.def \
-	 $(TOOLBOX_INCLUDE)/unparseC++.def
-
-TOOLBOX_OBJ	=  low_level.o  unparse.o 
-
-$(LIBDIR)/libsage.a: $(TOOLBOX_OBJ) $(TOOLBOX_HDR)  
-	ar qc $(LIBDIR)/libsage.a $(TOOLBOX_OBJ) 
-
-all: $(LIBDIR)/libsage.a
-	@echo "*** COMPILING LIBRARY newsrc DONE"
-
-clean:
-	rm -f $(TOOLBOX_OBJ)
-cleanall:
-	rm -f $(TOOLBOX_OBJ)
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.win
deleted file mode 100644
index a75c78b..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/makefile.win
+++ /dev/null
@@ -1,54 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# sage/lib/newsrc/makefile.win
-
-OUTDIR = ../../../obj
-LIBDIR = ../../../lib
-
-OLDHEADERS = ../../h
-
-# Directory in which include file can be found
-TOOLBOX_INCLUDE = ../include
-
-INCL = -I$(OLDHEADERS) -I../include
-
-TOOLBOX_SRC	=  low_level.c unparse.c 
-
-TOOLBOX_HDR =  $(TOOLBOX_INCLUDE)/macro.h $(TOOLBOX_INCLUDE)/bif_node.def \
-	$(TOOLBOX_INCLUDE)/type.def  $(TOOLBOX_INCLUDE)/symb.def 
-
-# -w don't issue warning now.
-#CFLAGS=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-#	/Fp"$(OUTDIR)/newsrc.pch" /YX /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-CFLAGS=/nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-	/Fp"$(OUTDIR)/newsrc.pch" /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-
-.c{$(OUTDIR)/}.obj:
-    $(CC) $(CFLAGS) $<
-
-LIB32=$(LINKER) -lib
-LIB32_FLAGS=/nologo /out:"$(LIBDIR)/libsage.lib" 
-
-
-$(OUTDIR)/low_level.obj: low_level.c $(TOOLBOX_HDR)
-
-$(OUTDIR)/unparse.obj:   unparse.c $(TOOLBOX_HDR) $(TOOLBOX_INCLUDE)/unparse.def \
-	 $(TOOLBOX_INCLUDE)/unparseC++.def
-
-TOOLBOX_OBJ	=  $(OUTDIR)/low_level.obj  $(OUTDIR)/unparse.obj 
-
-$(LIBDIR)/libsage.lib: $(TOOLBOX_OBJ) $(TOOLBOX_HDR)  
-	$(LIB32) @<<
-	$(LIB32_FLAGS) $(TOOLBOX_OBJ)  
-<<
-
-all: $(LIBDIR)/libsage.lib
-    @echo "*** COMPILING LIBRARY newsrc DONE"
-
-
-clean:
-
-cleanall:
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/toolsann.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/toolsann.c
deleted file mode 100644
index ec02171..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/toolsann.c
+++ /dev/null
@@ -1,1043 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993,1995             */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/**************************************************************************
-* * * Annotation toolbox for Sigma * * * * *
-**************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "compatible.h"   /* Make different system compatible... (PHB) */
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#include "macro.h"
-#include "ext_lib.h"
-#include "ext_low.h"
-
-#define ASYMBOLEXT   "_%d_"    /* must have a %d field for number */
-#define MAX_ANNOTATION 10000
-#define ForCOMMENTSTART "C$ann\0"  /* For fortran Must start with big C */
-#define ForCOMMENTCONT  "C$cont\0" /* idem */
-#define C_COMMENTSTART "//$ann\0"  /* For C Must start with big / */
-#define C_COMMENTCONT  "-+-++++--\0" /* not in C */
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-extern void removeFromCollection(void *pointer);
-#endif
-
-int TRACEANN = 0;
-
-/* Assertion Tab */
-
-extern int Number_of_proc;
-extern PTR_FILE pointer_on_file_proj;
-extern PTR_LLND ANNOTATE_NODE;
-extern char *STRINGTOPARSE;
-extern int  LENSTRINGTOPARSE;
-extern int PTTOSTRINGTOPARSE;
-extern PTR_BFND ANNOTATIONSCOPE;
-extern PTR_TYPE global_int_annotation;
-extern char AnnExTensionNumber[];
-extern int yyparse_annotate(void);
-
-/* FORWARD DECLARATION */
-int Get_Scope_Of_Annotation();
-void Propagate_defined_value();
-int Set_The_Define_Field();
-char *Unparse_Annotation();
-PTR_LLND Parse_Annotation();
-
-
-char *
-Remove_Ann_Cont(str)
-char *str;
-{
-  int i =0;
-  int j;
-
-  if (str == NULL)
-    return NULL;
-
-  if (Check_Lang_Fortran(cur_proj))
-    { /* does not apply to C */
-      while (str[i] != '\0')
-	{
-	  if (str[i] == 'C')
-	    {
-	      if (strncmp(&(str[i]),ForCOMMENTCONT,strlen(ForCOMMENTCONT)) == 0)
-		{
-		  for (j = 0; j < (int)strlen(ForCOMMENTCONT); j++)
-		    str[i+j] = ' ';
-		  i = i+j;
-		}
-	    }
-	  i++;
-	}
-    }
-  return str;
-}
-
-
-/* Init annotation System, mainly gathers annotation */
-/* we use array to store annotation can be modify to count the size and alloc
-   things */
-
-static char    *Annotation_PT[MAX_ANNOTATION];    /* the string        */
-static PTR_BFND Annotation_BIFND[MAX_ANNOTATION]; /* the bif node next */
-PTR_LLND Annotation_LLND[MAX_ANNOTATION];  /* result of unparse */
-static PTR_CMNT Annotation_CMNT[MAX_ANNOTATION];  /* to the comment */
-static int      Annotation_Def[MAX_ANNOTATION];   /* is it define      */
-static int      Nb_Annotation;             /* number of annotation found */
-static char    *Defined_Value_Str[MAX_ANNOTATION];
-static int     Defined_Value_Value[MAX_ANNOTATION];
-
-/*     Indicate if comment is an annotation */
-int Is_Annotation(str)
-char *str;
-{
-  
-  if (!str)
-    return FALSE;
-
-  if (Check_Lang_Fortran(cur_proj))
-    { 
-      if (strncmp(ForCOMMENTSTART,str, strlen(ForCOMMENTSTART)) == 0)
-	return TRUE;
-      else
-	return FALSE;
-    } else
-      {
-	if (strncmp(C_COMMENTSTART,str, strlen(C_COMMENTSTART)) == 0)
-	  return TRUE;
-	else
-	  return FALSE;
-      }
-}
-
-int Is_Annotation_Cont(str)
-char *str;
-{
-  
-  if (!str)
-    return FALSE;
-
-  if (!Check_Lang_Fortran(cur_proj))
-    return FALSE;
-  if (strncmp(ForCOMMENTCONT,str, strlen(ForCOMMENTCONT)) == 0)
-    return TRUE;
-  else
-    return FALSE;
-}
-
-
-char *
-Get_Annotation_String(str)
-char * str;
-{
-  char * pt, *pt1;
-  int i,goahead;
-  char * stra = NULL;
-  pt = str;
-  
-  if (!str)
-    return NULL;
-
-  while((*pt != '\0') && (*pt != '['))
-    {
-      pt++;
-    }
-  if (*pt != '[')
-    Message("Annotation failed",0);
-  /* count the length */
-  pt1 = pt;
-  i = 0;
-  goahead = TRUE;
-  while(goahead)
-    {
-      goahead = FALSE;
-      while((*pt1 != '\0') && (*pt1 != '\n'))
-	{
-	  pt1++;
-	  i++;
-	}
-
-      if (*pt1 != '\0')
-	{
-	  if (Is_Annotation_Cont(pt1+1))
-	    {
-	      goahead = TRUE;
-	      pt1++;
-	      i++;
-	    }
-	}
-    }
-  if (i > 1024)
-    {      
-      stra = (char *) xmalloc(i+2);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,stra, 0);      
-#endif
-      memset(stra, 0, i+2);
-    }
-  else
-    {      
-      stra = (char *) xmalloc(1024);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,stra, 0);
-#endif
-      memset(stra, 0,1024);
-    }
-  strncpy(stra,pt,i);
-  stra = Remove_Carriage_Return(stra);
-  stra = Remove_Ann_Cont(stra);
-  return stra;
-}
-
-/* basically got to the carriage return */
-char *
-Get_to_Next_Annotation_String(str)
-char *str;
-{
-  char * pt;
-  pt = str;
-  if (!Check_Lang_Fortran(cur_proj))
-    return NULL;
-  pt++;  /* avoid pb of looping */    
-  while((*pt != '\0'))
-    {
-      if (*pt == 'C')
-	{
-	  if (strncmp(pt,ForCOMMENTSTART, strlen(ForCOMMENTSTART)) == 0)
-	      break;
-	}
-      pt++;
-    }
-  if (*pt == '\n') 
-    pt++;
-  if (*pt == '\0')
-    return NULL;
-  return pt;
-}
-
-/* basically go thrue the program and parse annotation, and set
-   if they are defined */
-int initAnnotation()
-{
-  PTR_CMNT cmnt;
-  PTR_BFND ptbif;
-  int count =0;
-  int i;
-  char *str;
-
-  global_int_annotation = GetAtomicType(T_INT);
-  memset((char *) Annotation_PT, 0, sizeof(char) *MAX_ANNOTATION);
-  memset((char *) Annotation_BIFND, 0, sizeof(PTR_BFND) *MAX_ANNOTATION);
-  memset((char *) Annotation_LLND, 0, sizeof(PTR_LLND) *MAX_ANNOTATION);
-  memset((char *) Annotation_CMNT, 0, sizeof(PTR_CMNT) *MAX_ANNOTATION);
-  memset((char *) Annotation_Def, 0, sizeof(int) *MAX_ANNOTATION);
-
-  ptbif = PROJ_FIRST_BIF();
-  count =0;
-  while (ptbif)
-    {
-      if (BIF_CMNT(ptbif))
-	{
-	  cmnt = BIF_CMNT(ptbif);
-	  str = CMNT_STRING(cmnt);
-	  while (str)
-	    {
-	      if (Is_Annotation(str))
-		{
-		  Annotation_PT[count] = Get_Annotation_String(str);
-		  Annotation_CMNT[count] = cmnt;	
-		  Annotation_BIFND[count] = ptbif;
-		  count++;
-		  if (MAX_ANNOTATION <= count)
-		    {
-		      Message("Too many annotations",0);
-		      exit(1);
-		    }
-		}
-	      str = Get_to_Next_Annotation_String(str);
-	    }
-
-	}
-      ptbif = BIF_NEXT(ptbif);
-    }
-  Nb_Annotation = count;
-
-  for (i=0; i < Nb_Annotation; i++)
-    {
-      if (TRACEANN) printf("See annotation %s\n",Annotation_PT[i]);
-    }
-  
-
-  /* unparse the annotation */
-  if (TRACEANN) printf("---------------------------------------------\n\n\n");
-  for (i=0; i < Nb_Annotation; i++)
-    {
-      sprintf(AnnExTensionNumber,ASYMBOLEXT,i);
-      Annotation_LLND[i] = Parse_Annotation(Annotation_PT[i],
-					    Annotation_BIFND[i]);
-      if (!Annotation_LLND[i])
-        Message("Annotation Parse Error",BIF_LINE(Annotation_BIFND[i]));
-      
-      if (TRACEANN) printf("Unparse :: %s\n",Unparse_Annotation(Annotation_LLND[i]));
-    }
-  if (TRACEANN) printf("---------------------------------------------\n\n\n");
-  /* setup which annotation is defined */
-  Set_The_Define_Field();
-  /* propagate the defined value */
-  Propagate_defined_value();
-  if (TRACEANN)
-    {
-      PTR_BFND first,last;
-       printf("---------------------------------------------\n\n\n");
-      for (i=0; i < Nb_Annotation; i++)
-	{
-	  Get_Scope_Of_Annotation(i,&first,&last);
-	  if (first)
-	     printf("A(%d) Scope first (line %d) :: %s", i,BIF_LINE(first), funparse_bfnd(first));
-	  if (last)
-	     printf("A(%d) Scope last (line %d)  :: %s", i, BIF_LINE(last), funparse_bfnd(last));
-	}
-    }
-
-  /* unparse the annotation */
-  if (TRACEANN) 
-    {
-      
-      printf("---------------------------------------------\n\n\n");
-      for (i=0; i < Nb_Annotation; i++)
-        {
-          printf("Unparse :: %s\n",Unparse_Annotation(Annotation_LLND[i]));
-        }
-    }
-  return  1;
-}
-
-
-PTR_LLND
-Parse_Annotation(string,scope)
-     char * string;
-     PTR_BFND scope;
-{
-  PTTOSTRINGTOPARSE = 0;
-  STRINGTOPARSE = string;
-  ANNOTATIONSCOPE = scope;
-  ANNOTATE_NODE = NULL;
-  LENSTRINGTOPARSE = strlen(string) +1;
-  
-  yyparse_annotate();
-
-  return  ANNOTATE_NODE;
-}
-
-
-PTR_LLND 
-Get_Define_Field(ann)
-PTR_LLND ann;
-{
- PTR_LLND pt;
-  int i;
- if (!ann)
-   return(NULL);
-  pt = ann;
-  for(i =0 ; i < 0; i++)
-    pt = NODE_OPERAND1(pt);
-
-  return(NODE_OPERAND0(pt));
-
-}
-
-
-char *
-Get_Define_Label_Field(ann)
-PTR_LLND ann;
-{
- PTR_LLND pt;
-
-  pt = ann;
- 
- if(!pt) 
-   return NULL;
- if (!NODE_OPERAND0(pt))
-   return NULL;
-
- /* it a function call name with one parameter */
- pt = NODE_OPERAND0 (NODE_OPERAND0(pt));
- /* pt is Expr_list */
-
- if (pt && NODE_OPERAND0(pt))
-   return(NODE_STRING_POINTER(NODE_OPERAND0(pt)));
- else
-   return NULL;
-}
-
-
-char * 
-Get_Label_Field(ann)
-PTR_LLND ann;
-{
-  PTR_LLND pt;
-  int i;
-
-  if(!ann) 
-    return NULL;
-
-  pt = ann;
-  for(i =0 ; i < 1; i++)
-    pt = NODE_OPERAND1(pt);
-
-  
- if (!NODE_OPERAND0(pt))
-   return NULL;
-
- /* it a function call name with one parameter */
- pt = NODE_OPERAND0 (NODE_OPERAND0(pt));
- /* pt is Expr_list */
-
- if (pt && NODE_OPERAND0(pt))
-   return(NODE_STRING_POINTER(NODE_OPERAND0(pt)));
- else
-   return NULL;
-}
-
-
-PTR_LLND 
-Get_ApplyTo_Field(ann)
-PTR_LLND ann;
-{
- PTR_LLND pt;
-  int i;
-
-  if(!ann) 
-    return NULL;
-
-  pt = ann;
-  for(i =0 ; i < 2; i++)
-    pt = NODE_OPERAND1(pt);
-
- if(!pt) 
-   return NULL;
- if (!NODE_OPERAND0(pt))
-   return NULL;
-
- /* it a function call name with one parameter */
- pt = NODE_OPERAND0 (NODE_OPERAND0(pt));
- /* pt is Expr_list */
-
- if (pt && NODE_OPERAND0(pt))
-   return(NODE_OPERAND0(pt));
- else
-   return NULL;
-
-}
-
-PTR_LLND 
-Get_ApplyToIf_Field(ann)
-PTR_LLND ann;
-{
- PTR_LLND pt;
-  int i;
-
-  pt = ann;
-  for(i =0 ; i < 2; i++)
-    pt = NODE_OPERAND1(pt);
-
-
- if(!pt) 
-   return NULL;
- if (!NODE_OPERAND0(pt))
-   return NULL;
-
- /* it a function call name with two parameters, we want the second one */
- pt = NODE_OPERAND0 (NODE_OPERAND0(pt));
- /* pt is Expr_list */
-
- if (pt && NODE_OPERAND1(pt))
-   return(NODE_OPERAND0(NODE_OPERAND1(pt)));
- else
-   return NULL;
-}
-
-
-PTR_LLND 
-Get_LocalVar_Field(ann)
-PTR_LLND ann;
-{
- PTR_LLND pt;
-  int i;
-
-  if(!ann) 
-    return NULL;
-
-  pt = ann;
-  for(i =0 ; i < 3; i++)
-    pt = NODE_OPERAND1(pt);
-
-  return(NODE_OPERAND0(pt));
-
-}
-
-
-PTR_LLND 
-Get_Annotation_Field(ann)
-PTR_LLND ann;
-{
- PTR_LLND pt;
-  int i;
-
-  if(!ann) 
-    return NULL;
-
-  pt = ann;
-  for(i =0 ; i < 4; i++)
-    pt = NODE_OPERAND1(pt);
-
-  return(NODE_OPERAND0(pt));
-
-}
-
-
-char *
-Get_Annotation_Field_Label(ann)
-PTR_LLND ann;
-{
- PTR_LLND pt;
-
- if (!ann)
-   return NULL;
-
- pt = Get_Annotation_Field(ann);
- 
- if (!pt)
-   return NULL;
-
- if (NODE_CODE(pt) != FUNC_CALL)
-   {
-     Message("Pb in annotation field",0);
-     return NULL;
-   }
- 
- return Get_Function_Name_For_Call(pt);
-}
-
-char *
-Unparse_Annotation(ann)
-PTR_LLND ann;
-{
-  char *str;
-  char temp[256];
-
-  if(!ann) 
-    return NULL;
-
-  str = (char *) xmalloc(1024);
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,str, 0);
-#endif
-  sprintf(str,"[");
-  if (Get_Define_Label_Field(ann))
-    {
-      sprintf(temp,"IfDef(\"%s\");",Get_Define_Label_Field(ann));
-      strcat(str,temp);
-    }
-
-  if (Get_Label_Field(ann))
-    {
-      sprintf(temp,"Label(\"%s\");",Get_Label_Field(ann));
-      strcat(str,temp);
-    }
-
-  if (Get_ApplyTo_Field(ann))
-    { /* need  more than that */
-      sprintf(temp,"ApplyTo( %s) ",Remove_Carriage_Return(cunparse_llnd(Get_ApplyTo_Field(ann))));
-      strcat(str,temp);
-      if (Get_ApplyToIf_Field(ann))
-	{
-	  sprintf(temp,"If ( %s) ;",Remove_Carriage_Return(cunparse_llnd(Get_ApplyToIf_Field(ann))));
-	  strcat(str,temp);
-	} else
-	  strcat(str,";");
-    } 
-  
-  if (Get_LocalVar_Field(ann))
-    {
-      sprintf(temp,"%s; ",Remove_Carriage_Return(cunparse_llnd(Get_LocalVar_Field(ann))));
-      strcat(str,temp);
-    }
-
-  if (Get_Annotation_Field(ann))
-    {
-      sprintf(temp,"%s",Remove_Carriage_Return(cunparse_llnd(Get_Annotation_Field(ann))));
-      strcat(str,temp);
-    }
-
-  strcat(str,"]");
-  return(str);
-}
-
-
-char *
-Does_Annotation_Defines(ann, value)
-int *value;
-PTR_LLND ann;
-{
-  PTR_LLND pt,pt1;
-  char *name;
-  int *res1;
-
-  if (! (pt = Get_Annotation_Field(ann)))
-    return NULL;
-
-  name = Get_Function_Name_For_Call(pt);
-  
-  if(strcmp(name,"Define") == 0)
-     if ((pt1 = Get_First_Parameter_For_Call(pt)))
-       {
-	 res1 = evaluateExpression(Get_Second_Parameter_For_Call(pt));
-	 if (res1[0] != -1)
-	   *value =  res1[1];
-	 
-	 return NODE_STRING_POINTER(pt1);
-       }
-
-   return NULL;
-}
-
-/* set all the annotation that are defined */
-int Set_The_Define_Field()
-{
-  int i,j;
-  char *str, *tsrt;
-  int value;
-  int found;
-  /* set up those field 
-    Annotation_Def[]
-    char    *Defined_Value_Str[MAX_ANNOTATION];
-    int     Defined_Value_Value[MAX_ANNOTATION];
-  */
-
-  for (i = 0; i < Nb_Annotation; i++)
-  {
-      if (Get_Define_Field(Annotation_LLND[i]) == NULL)
-      {
-          /* independant defined */
-          if (TRACEANN) 
-              printf("Annotation Defined : %s\n", tsrt = Unparse_Annotation(Annotation_LLND[i]));
-#ifdef __SPF
-          removeFromCollection(tsrt);
-#endif
-          free(tsrt);
-
-          Annotation_Def[i] = TRUE;
-          /* check if it defined something */
-          Defined_Value_Str[i] =
-              Does_Annotation_Defines(Annotation_LLND[i]
-                  , &value);
-          Defined_Value_Value[i] = value;
-      }
-  }
-  /* end of initial setup */
-  /* propagate forward only */
-      for (i=0; i<  Nb_Annotation ; i++)
-	{
-	  str = Get_Define_Label_Field(Annotation_LLND[i]);
-	  if (str)
-	    { /* look if the word is defined */
-	      found = FALSE;
-	      for (j = i-1; j>= 0 ; j--)
-		{
-		  if (Defined_Value_Str[j])
-		    {
-		      if (strcmp(str,Defined_Value_Str[j]) == 0)
-			{
-			  found = TRUE;
-			  break;
-			}
-		    }
-		}
-	      if (found)
-		{
-		  Annotation_Def[i] = TRUE;
-		  if (TRACEANN) printf("Annotation Defined : %s\n",Unparse_Annotation(Annotation_LLND[i]));
-		  /* check if it defined something */
-		  Defined_Value_Str[i] = 
-		    Does_Annotation_Defines(Annotation_LLND[i]
-					    , &value);
-		  Defined_Value_Value[i] = value;
-		}
-
-	    }
-	}
- return 0; 
-}
-
-
-/* return the annotation with label -1 for not found */
-int
-Get_Annotation_With_Label(str)
-char *str;
-{ int i;
-  char *strc;
-
-
-  for (i=0; i < Nb_Annotation; i++)
-    {
-      strc = Get_Label_Field(Annotation_LLND[i]);
-      if (strc)
-	{
-	  if (strcmp(strc, str) == 0)
-	    {
-	      return i;
-	    }
-	}
-    }
-  return -1;
-}
-
-
-/* Compute the first and last bif node a annotation applies */
-
-int Get_Scope_Of_Annotation(nb,first,last)
-int nb;
-PTR_BFND *first, *last;
-{
-  PTR_LLND ann,f1,f2;
-  PTR_LLND field_apply;
-  char *str;
-  int nb2;
-
-  ann = Annotation_LLND[nb];
-  if (!ann)
-    {
-      *first = NULL;
-      *last = NULL;
-      return FALSE;      
-    }
-  if (!Annotation_Def[nb])
-     {
-       *first = NULL;
-       *last = NULL;
-       return TRUE;      
-     }
-
-  /* the first case is easy */
-  field_apply = Get_ApplyTo_Field(ann);
-  if (!field_apply)
-    {
-      *first = Annotation_BIFND[nb];
-      *last  = Annotation_BIFND[nb];
-      return TRUE;  
-    }
-  
-  /* depend on */
-  f1 = field_apply;
-  if (!f1)
-    {
-      *first = Annotation_BIFND[nb];
-      *last  = Annotation_BIFND[nb];
-      return FALSE;      
-    }
-  switch(NODE_CODE(f1))
-    {
-    case VAR_REF:
-      Message("Function Call in Get_Scope_Of_Annotation not yet implemented, sorry",0);
-      break;
-    case STRING_VAL :
-      str = NODE_STRING_POINTER(f1);
-      if (strcmp(str,"NextStmt") == 0)
-	{
-	  *first = Annotation_BIFND[nb];
-	  *last  = Annotation_BIFND[nb];
-	  return TRUE;
-	}
-      if (strcmp(str,"NextAnnotation") == 0)
-	{
-	  *first = Annotation_BIFND[nb];
-	  *last  = Annotation_BIFND[nb+1];
-	  if (*last == NULL)
-	    *last = Get_Last_Node_Of_Project();
-	  return TRUE;
-	}
-      if (strcmp(str,"EveryWhere") == 0)
-	{
-	  *first = PROJ_FIRST_BIF();
-	  *last  = Get_Last_Node_Of_Project();
-	  return TRUE;
-	}
-      if (strcmp(str,"Follow") == 0)
-	{
-	  *first = Annotation_BIFND[nb];
-	  *last = Get_Last_Node_Of_Project();
-	  return TRUE;
-	}
-      if (strcmp(str,"CurrentScope") == 0)
-	{
-	  *first = BIF_CP(Annotation_BIFND[nb]);
-	  if (*first)
-	    *last = getLastNodeOfStmt(*first);
-	  else
-	    *last = NULL;
-	  return TRUE;
-	}
-      Message("Pb in Get_Scope_Of_Annotation",0);
-        break;
-    case  EXPR_LIST :
-      *first = Annotation_BIFND[nb];
-      if (NODE_OPERAND0(f1))
-	{
-	  f2 = NODE_OPERAND0(f1);
-	  if (f2 && (NODE_CODE(f2) == STRING_VAL))
-	    {
-	      str = NODE_STRING_POINTER(f2);
-	      nb2 = Get_Annotation_With_Label(str);
-	      if (nb2!= -1)
-		{
-		  *first  = Annotation_BIFND[nb2];
-		} else
-		  Message("Pb in Get_Scope_Of_Annotation",0);
-	    } else
-	      Message("Pb in Get_Scope_Of_Annotation",0);
-	}
-      f2 = NODE_OPERAND0(NODE_OPERAND1(f1));
-      if (f2 && (NODE_CODE(f2) == STRING_VAL))
-	{
-	  str = NODE_STRING_POINTER(f2);
-	  nb2 = Get_Annotation_With_Label(str);
-	  if (nb2!= -1)
-	    {
-	      *last  = getNodeBefore(Annotation_BIFND[nb2]);
-	    } else
-	      Message("Pb in Get_Scope_Of_Annotation",0);
-	} else
-	  Message("Pb in Get_Scope_Of_Annotation",0);
-
-      break;
-    default:
-      {
-	Message("Pb in Get_Scope_Of_Annotation",0);
-	return FALSE;
-	}
-    }
-  return TRUE;
-}
-
-
-/* for all defined value, propagate forward */
-
-void Propagate_defined_value()
-{
-  int i; 
-  int j;
-  PTR_LLND val;
-  char *str;
-  for (i=0 ; i< Nb_Annotation ; i++)
-    {
-      if (Defined_Value_Str[i])
-	{
-	  val = makeInt(Defined_Value_Value[i]);
-	  str = Defined_Value_Str[i];
-	  for (j = i+1 ; j< Nb_Annotation ; j++)
-	    {
-	      if (Annotation_LLND[j])
-		if (Get_Annotation_Field_Label(Annotation_LLND[j]))
-		  {
-		    if (strcmp(Get_Annotation_Field_Label(Annotation_LLND[j]), 
-			       "Define") != 0)
-		      Replace_String_In_Expression(NODE_OPERAND1(NODE_OPERAND1(Annotation_LLND[j])), str, val);
-		  } else
-		    Replace_String_In_Expression(NODE_OPERAND1(NODE_OPERAND1(Annotation_LLND[j])), str, val); 
-	    }
-	}
-    }
-}
-
-/* return NULL if not annotation of kind apply, otherwise return the 
-   llnd expression corresponding to the annotation 
-   Very dumb version, but simple one (warning, because of label an annotation
-   does not apply where it is necessarely, except for defined annotation )*/
-
-PTR_LLND
-Does_Annotation_Apply(kind,bif)
-     char *kind;
-     PTR_BFND bif;
-{
-  int i;
-  PTR_BFND first,last;
-
-  for (i=0 ; i< Nb_Annotation ; i++)
-    {
-      if (Annotation_Def[i])
-	{
-	  if (kind)
-	    {
-	      if (strcmp(Get_Annotation_Field_Label(Annotation_LLND[i]), kind) == 0)
-		{
-		  if (Get_Scope_Of_Annotation(i,&first,&last))
-		    {
-		      if (isItInSection(first, last, bif))
-			return Get_Annotation_Field(Annotation_LLND[i]);
-		    }
-		}
-	    }else
-	      {
-		if (Get_Scope_Of_Annotation(i,&first,&last))
-		  {
-		    if (isItInSection(first, last, bif))
-		      return Get_Annotation_Field(Annotation_LLND[i]);
-		  }
-	      }
-	}
-    }
-  return NULL;
-}     
-
-
-PTR_LLND
-Get_Annotation_Field_List_For_Stmt(bif)
-     PTR_BFND bif;
-{
-  int i;
-  PTR_BFND first,last;
-  PTR_LLND list = NULL, pt =NULL;
-  
- 
-  for (i=0 ; i< Nb_Annotation ; i++)
-    {
-      if (Annotation_Def[i])
-	{
-	  if (Get_Scope_Of_Annotation(i,&first,&last))
-	    {
-	      if (isItInSection(first, last, bif))
-		{
-		  if (!list)
-		    {
-		      list = newExpr(EXPR_LIST,NULL, 
-				   Get_Annotation_Field(Annotation_LLND[i]),
-				   NULL);
-		      pt = list;
-		    }else
-		      {
-			NODE_OPERAND1(pt) = newExpr(EXPR_LIST,NULL, 
-				   Get_Annotation_Field(Annotation_LLND[i]),
-				   NULL);
-			pt = NODE_OPERAND1(pt);
-		      }
-		  
-		}
-	    }
-	}
-    }
-  return list;
-}     
-
-
-
-PTR_LLND
-Get_Annotation_List_For_Stmt(bif)
-     PTR_BFND bif;
-{
-  int i;
-  PTR_BFND first,last;
-  PTR_LLND list = NULL, pt =NULL;
-  
- 
-  for (i=0 ; i< Nb_Annotation ; i++)
-    {
-      if (Annotation_Def[i])
-	{
-	  if (Get_Scope_Of_Annotation(i,&first,&last))
-	    {
-	      if (isItInSection(first, last, bif))
-		{
-		  if (!list)
-		    {
-		      list = newExpr(EXPR_LIST,NULL, 
-				       Annotation_LLND[i],
-				       NULL);
-		      pt = list;
-		    }else
-		      {
-			NODE_OPERAND1(pt) = newExpr(EXPR_LIST,NULL, 
-						      Annotation_LLND[i],
-						      NULL);
-			pt = NODE_OPERAND1(pt);
-		      }
-		  
-		}
-	    }
-	}
-    }
-  return list;
-}     
-
-/* Access functions */
-int
-Get_Number_of_Annotation()
-{
-  return Nb_Annotation;
-}
-
-
-PTR_BFND
-Get_Annotation_Bif(id)
-     int id;
-{
-  return Annotation_BIFND[id];
-}
-
-
-PTR_LLND
-Get_Annotation_Expr(id)
-     int id;
-{
-  return Annotation_LLND[id];
-}
-
-char *
-Get_String_of_Annotation(id)
-     int id;
-{
-  return Annotation_PT[id];
-}
-
-PTR_CMNT
-Get_Annotation_Comment(id)
-     int id;
-{
-  return Annotation_CMNT[id];
-}
-
-
-int
-Is_Annotation_Defined(id)
-     int id;
-{
-  return Annotation_Def[id];
-}
-
-
-char *
-Annotation_Defines_string(id)
-     int id;
-{
-  return Defined_Value_Str[id];
-}
-
-int
-Annotation_Defines_string_Value(id)
-     int id;
-{
-  return Defined_Value_Value[id];
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/unparse.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/unparse.c
deleted file mode 100644
index cc70fb9..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/newsrc/unparse.c
+++ /dev/null
@@ -1,3265 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
- /**************************************************************************
-  *                                                                        *
-  *   Unparser for toolbox                                                 *
-  *                                                                        *
-  *************************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h> /* podd 15.03.99*/
-#include <ctype.h>
-
-#include "compatible.h"   /* Make different system compatible... (PHB) */
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#include "macro.h"
-#include "ext_lib.h"
-#include "ext_low.h"
-/*static FILE *finput;*/
-/*static FILE *outfile;*/
-static int TabNumber = 0;
-static int TabNumberCopy = 0;
-static int Number_Of_Flag = 0;
-#define MAXFLAG 64
-#define  MAXLFLAG 256
-#define MAXLEVEL 256
-static char TabOfFlag[MAXFLAG][MAXLFLAG];
-static int  FlagLenght[MAXFLAG];
-static int  FlagLevel[MAXFLAG];
-static int  FlagOn[MAXLEVEL][MAXFLAG];
-
-//#define MAXLENGHTBUF 5000000
-//static char UnpBuf[MAXLENGHTBUF];
-
-#define INIT_LEN 500000
-static int Buf_pointer = 0;
-static int max_lenght_buf = 0;
-static char* allocated_buf = NULL;
-static char* Buf_address = NULL;
-static char* UnpBuf = NULL;
-
-int CommentOut = 0;
-int HasLabel = 0;
-#define C_Initialized 1
-#define Fortran_Initialized 2
-static int Parser_Initiated = 0;
-static int Function_Language = 0; /* 0 - undefined, 1 - C language, 2 - Fortran language */
-
-extern void Message();
-extern int out_free_form;
-
-/* FORWARD DECLARATIONS */
-int BufPutString();
-
-/* usage exemple
-    Init_Unparser(); or Reset_Unparser(); if Init_Unparser(); has been done
-
-    fprintf(outfile,"%s",Tool_Unparse_Bif(PROJ_FIRST_BIF ()));
-*/
-
-/*****************************************************************************/
-/*****************************************************************************/
-/*****                                                                   *****/
-/*****    UNPARSE.C:     Gregory HOGDAL / Eric MARCHAND    July 1992     *****/
-/*****    Modified F. Bodin 08/92 .  Modified D. Gannon 3/93 - 6/93      *****/
-/*****                                                                   *****/
-/*****************************************************************************/
-/*****************************************************************************/
-
-/***********************************/
-/* function de unparse des bif node */
-/***********************************/
-
-#include "f90.h"
-
-typedef struct 
-{
-  char *str;
-  char *(* fct)();
-} UNP_EXPR;
-
-
-static UNP_EXPR Unparse_Def[LAST_CODE];
-
-/************ Unparse Flags **************/
-static int In_Write_Flag = 0;
-static int Rec_Port_Decl = 0;
-static int In_Param_Flag = 0;
-static int In_Impli_Flag = 0;
-static int In_Class_Flag = 0;
-static int Type_Decl_Ptr = 0;
-/*****************************************/
-static PTR_SYMB construct_name;
-
-/*************** TYPE names in ASCII form ****************/
-static char *ftype_name[] = {"integer",
-			       "real",
-			       "double precision",
-			       "character",
-			       "logical",
-			       "character",
-			       "gate",
-			       "event",
-			       "sequence",
-			       "",
-			       "",
-			       "",
-			       "",
-			       "complex",
-			       "",
-			       "",		
-			       "",		
-			       "",			
-			       "",	
-			       "",	
-			       "",	
-			       "",	
-			       "",	
-			       "",	
-			       "",	
-			       "",		
-			       "",	
-			       "",		
-			       "",
-			       "",
-			       "",
-			       "",
-			       "double complex",
-                               "" 
-};static char *ctype_name[] = {"int",
-			       "float",
-			       "double",
-			       "char",
-			       "logical",
-			       "char",
-			       "gate",
-			       "event",
-			       "sequence",
-			       "error1",
-			       "error2",
-			       "error3",
-			       "error4",
-			       "complex",
-			       "void",
-			       "error6",		
-			       "error7",		
-			       "error8",			
-			       "error9",	
-			       "error10",	
-			       "error11",	
-			       "error12",	
-			       "ElementType",	
-			       "error14",	
-			       "error15",	
-			       "error16",		
-			       "error17",	
-			       "error18",		
-			       "error19",
-			       "error20",
-			       "error21",
-			       "error22",
-			       "error23",
-                               "long"
-};
-
-static
-char *ridpointers[] = {
-	"-error1-",			/* unused */
-	"-error2-",			/* int */
-	"char", 		/* char */
-	"float",		/* float */
-	"double",		/* double */
-	"void", 		/* void */
-	"-error3-",			/* unused1 */
-	"unsigned",		/* unsigned */
-	"short",		/* short */
-	"long", 		/* long */
-	"auto", 		/* auto */
-	"static",		/* static */
-	"extern",		/* extern */
-	"register",		/* register */
-	"typedef",		/* typedef */
-	"signed",		/* signed */
-	"const",		/* const */
-	"volatile",		/* volatile */
-	"private",		/* private */
-	"future",		/* future */
-	"virtual",		/* virtual */
-	"inline",		/* inline */
-	"friend",		/* friend */
-	"-error4-",			/* public */
-	"-error5-",			/* protected */
-        "Sync",                 /* CC++ sync */
-        "global",               /* CC++ global */
-        "atomic",               /* CC++ atomic */
-        "__private",            /* for KSR */
-        "restrict",
-        "_error6-",
-        "__global__",           /* Cuda */
-        "__shared__",           /* Cuda */
-        "__device__"            /* Cuda */
-};
-
-/*********************************************************/
-
-/******* Precedence table of operators for C++ *******/
-static short precedence_C[RSHIFT_ASSGN_OP-EQ_OP+1]=
-                              {6,      /*  ==  */
-                               5,      /*  <   */
-                               5,      /*  >   */
-                               6,      /*  !=  */
-                               5,      /*  <=  */
-                               5,      /*  >=  */
-                               3,      /*  +   */
-                               3,      /*  -   */
-                               11,     /*  ||  */
-                               2,      /*  *   */
-                               2,      /*  /   */
-                               2,      /*  %   */
-                               10,     /*  &&  */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               8,      /*  ^   */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               1,      /* Minus_op*/
-                               1,      /*  !   */
-                               13,     /*  =   */ 
-                               1,      /*  * (by adr)*/
-                               0,      /*  ->  */
-                               0,      /*  function  */
-                               1,      /*  --  */
-                               1,      /*  ++  */
-                               7,      /*   &  */
-                               9       /*   |  */
-                               };
-static short precedence2_C[]= {1,      /*  ~   */
-                               12,     /*  ?   */
-                               0,      /* none */
-                               0,      /* none */
-                               4,      /*  <<  */
-                               4,      /*  >>  */
-                               0,      /* none */
-                               1,      /*sizeof*/
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               1,      /*(type)*/ 
-                               1,      /*&(address)*/
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */
-                               0,      /* none */                        
-                               13,     /*   += */
-                               13,     /*   -= */
-                               13,     /*   &= */
-                               13,     /*   |= */
-                               13,     /*   *= */
-                               13,     /*   /= */
-                               13,     /*   %= */
-                               13,     /*   ^= */
-                               13,     /*  <<= */
-                               13      /*  >>= */
-                              };
-
-/******* Precedence table of operators for Fortran *******/
-static char precedence[] = {5,      /* .eq. */
-                            5,      /* .lt. */
-                            5,      /* .gt. */
-                            5,      /* .ne. */
-                            5,      /* .le. */
-                            5,      /* .ge. */
-                            3,      /*  +   */
-                            3,      /*  -   */
-                            8,      /* .or. */
-                            2,      /*  *   */
-                            2,      /*  /   */
-                            0,      /* none */
-                            7,      /* .and. */
-                            1,      /*  **  */
-                            0,      /* none */
-                            4,      /*  //  */
-                            8,      /* .xor. */
-                            9,      /* .eqv. */
-                            9,     /* .neqv. */
-                            0,      /* none */
-                            0,      /* none */
-                            0,      /* none */                      
-                            1,     /* Minus_op*/
-                            1      /* not op */
-                            };
-
-#define type_index(X)   (X-T_INT)                 /* gives the index of a type to access the Table "ftype_name" from a type code */
-#define binop(n)    (n >= EQ_OP && n <= NEQV_OP)  /* gives the boolean value of the operation "n" being binary (not unary) */ 
-#define C_op(n)     (n >= EQ_OP && n <= RSHIFT_ASSGN_OP)
-
-/* manage the unparse buffer */
-
-void
-DealWith_Rid(typei, flg)
-     PTR_TYPE typei;
-     int flg;  /* if 1 then do virtual */
-{ int j;
-  
-  int index;
-   PTR_TYPE type;
-  if (!typei)
-    return;
-  
-  for (type = typei; type; )
-    {
-      switch(TYPE_CODE(type))
-	{
-	case T_POINTER : 
-	case T_REFERENCE :
-	case T_FUNCTION :
-	case T_ARRAY	:
-	  type = TYPE_BASE(type);
-	  break;
-        case T_MEMBER_POINTER:
-          type = TYPE_COLL_BASE(type);
-	case T_DESCRIPT :
-	  index = TYPE_LONG_SHORT(type);
-           /* printf("index = %d\n", index); */
-          if( index & BIT_RESTRICT) {
-		BufPutString(ridpointers[(int)RID_RESTRICT],0);
-		BufPutString(" ", 0);
-		}
-          if( index & BIT_KSRPRIVATE) {
-		BufPutString(ridpointers[(int)RID_KSRPRIVATE],0);
-		BufPutString(" ", 0);
-		}
-          if( index & BIT_EXTERN) {
-		BufPutString(ridpointers[(int)RID_EXTERN],0);
-		BufPutString(" ", 0);
-		}
-          if( index & BIT_TYPEDEF) {
-		BufPutString(ridpointers[(int)RID_TYPEDEF],0);
-		BufPutString(" ", 0);
-		}
-	  for (j=1; j< MAX_BIT; j= j*2)
-	    {
-	      switch (index & j)
-		{
-		case (int) BIT_PRIVATE:   BufPutString(ridpointers[(int)RID_PRIVATE],0);
-		  break;
-		case (int) BIT_FUTURE:	BufPutString(ridpointers[(int)RID_FUTURE],0);
-		  break;
-		case (int) BIT_VIRTUAL:  if(flg) BufPutString(ridpointers[(int)RID_VIRTUAL],0);
-		  break;
-		case (int) BIT_ATOMIC:  if(flg) BufPutString(ridpointers[(int)RID_ATOMIC],0);
-		  break;
-		case (int) BIT_INLINE:	BufPutString(ridpointers[(int)RID_INLINE],0);
-		  break;
-		case (int) BIT_UNSIGNED:  BufPutString(ridpointers[(int)RID_UNSIGNED],0);
-		  break;
-		case (int) BIT_SIGNED :   BufPutString(ridpointers[(int)RID_SIGNED],0);
-		  break;
-		case (int) BIT_SHORT :	BufPutString(ridpointers[(int)RID_SHORT],0);
-		  break;
-		case (int) BIT_LONG :	BufPutString(ridpointers[(int)RID_LONG],0);
-		  break;
-		case (int) BIT_VOLATILE:  BufPutString(ridpointers[(int)RID_VOLATILE],0);
-		  break;
-		case (int) BIT_CONST   :  BufPutString(ridpointers[(int)RID_CONST],0); 
-		  break;
-		case (int) BIT_GLOBL   :  BufPutString(ridpointers[(int)RID_GLOBL],0);
-		  break; 
-		case (int) BIT_SYNC   :  BufPutString(ridpointers[(int)RID_SYNC],0); 
-		  break;
-		case (int) BIT_TYPEDEF :  /* BufPutString(ridpointers[(int)RID_TYPEDEF],0); */
-		  break;
-		case (int) BIT_EXTERN  :  /* BufPutString(ridpointers[(int)RID_EXTERN],0); */
-		  break;
-		case (int) BIT_AUTO :	BufPutString(ridpointers[(int)RID_AUTO],0);
-		  break;
-		case (int) BIT_STATIC :   BufPutString(ridpointers[(int)RID_STATIC],0);
-		  break;
-		case (int) BIT_REGISTER:  BufPutString(ridpointers[(int)RID_REGISTER],0);
-		  break;
-		case (int) BIT_FRIEND:	BufPutString(ridpointers[(int)RID_FRIEND],0);
-
-		}
-	      if ((index & j) != 0)
-		BufPutString(" ",0);
-	    }
-	  type = TYPE_DESCRIP_BASE_TYPE(type);
-	  break;
-	  default:
-	  type = NULL;
-	}
-    }
-}
-
-int is_overloaded_type(bif)
-   PTR_BFND bif;
-{
-   PTR_LLND ll;
-   if(!bif) return 0;
-   ll = BIF_LL1(bif);
-   while(ll && (NODE_SYMB(ll) == NULL)) ll = NODE_OPERAND0(ll);
-   if(ll == NULL) return 0;
-   if(SYMB_ATTR(NODE_SYMB(ll)) & OVOPERATOR) return 1;
-   else return 0;
-}
-
-PTR_TYPE Find_Type_For_Bif(bif)
-     PTR_BFND bif;
-{
-  PTR_TYPE type = NULL;
-  if (BIF_LL1(bif) && (NODE_CODE(BIF_LL1(bif)) == EXPR_LIST))
-    { PTR_LLND tp;
-      tp = BIF_LL1(bif);
-      for (tp = NODE_OPERAND0(tp); tp && (type == NULL); )
-	{
-	  switch (NODE_CODE(tp)) {
-	  case BIT_NUMBER:
-	  case ASSGN_OP :
-	  case ARRAY_OP:
-	  case FUNCTION_OP :
-	  case CLASSINIT_OP:
-	  case ADDRESS_OP:
-	  case DEREF_OP :
-	    tp = NODE_OPERAND0(tp);
-	    break ;
-          case SCOPE_OP:
-            tp = NODE_OPERAND1(tp);
-            break;
-	  case FUNCTION_REF:
-	  case ARRAY_REF:
-	  case VAR_REF:
-          if (tp)
-          {
-              if (!NODE_SYMB(tp)){
-                  printf("syntax error at line %d\n", bif->g_line);
-                  exit(1);
-              }
-              else
-                  type = SYMB_TYPE(NODE_SYMB(tp));
-          }
-	      tp = NULL;
-	      break ;
-	  default:
-             type = NODE_TYPE(tp);
-	    break;
-	  }
-	}
-    }
-  return type;
-}
-
-
-int Find_Protection_For_Bif(bif)
-     PTR_BFND bif;
-{
-  int protect = 0;
-  if (BIF_LL1(bif) && (BIF_CODE(BIF_LL1(bif)) == EXPR_LIST))
-    { PTR_LLND tp;
-      tp = BIF_LL1(bif);
-      for (tp = NODE_OPERAND0(tp); tp && (protect == 0); )
-	{
-	  switch (NODE_CODE(tp)) {
-	  case BIT_NUMBER:
-	  case ASSGN_OP :
-	  case ARRAY_OP:
-	  case FUNCTION_OP :
-	  case CLASSINIT_OP:
-	  case ADDRESS_OP:
-	  case DEREF_OP :
-	    tp = NODE_OPERAND0(tp);
-	    break ;
-          case SCOPE_OP:
-	    tp = NODE_OPERAND1(tp);
-	    break;
-	  case FUNCTION_REF:
-	  case ARRAY_REF:
-	  case VAR_REF:
-	    if (tp)
-	      protect = SYMB_ATTR(NODE_SYMB(tp));
-	    tp = NULL;
-	    break ;
-	  }
-	}
-    }
-  return protect;
-}
-
-PTR_TYPE Find_BaseType(ptype)
-     PTR_TYPE ptype;
-{
-  PTR_TYPE pt;
-
-  if (!ptype)
-    return NULL;
-  pt = TYPE_BASE (ptype); 
-  if (pt)
-    { int j;
-      j = 0;
-      while ((j < 100) && pt)
-	{
-	  if (TYPE_CODE(pt) == DEFAULT) break;
-	  if (TYPE_CODE(pt) == T_INT) break;
-	  if (TYPE_CODE(pt) == T_FLOAT) break;
-	  if (TYPE_CODE(pt) == T_DOUBLE) break;
-	  if (TYPE_CODE(pt) == T_CHAR) break;
-	  if (TYPE_CODE(pt) == T_BOOL) break;
-	  if (TYPE_CODE(pt) == T_STRING) break;
-	  if (TYPE_CODE(pt) == T_COMPLEX) break;
-	  if (TYPE_CODE(pt) == T_DCOMPLEX) break;
-	  if (TYPE_CODE(pt) == T_VOID) break;
-	  if (TYPE_CODE(pt) == T_UNKNOWN) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_TYPE) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_COLLECTION) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_TEMPLATE) break;
-          if (TYPE_CODE(pt) == T_DERIVED_CLASS) break;
-	  if (TYPE_CODE(pt) == T_CLASS) break;
-	  if (TYPE_CODE(pt) == T_COLLECTION) break;
-	  if (TYPE_CODE(pt) == T_DESCRIPT) break;  /* by dbg */
-          if (TYPE_CODE(pt) == T_LONG) break;     /*15.11.12*/
-			  
-	  pt = TYPE_BASE (pt);
-	  j++;
-	}
-      if (j == 100)
-	{
-	  Message("Looping in getting the Basetype; sorry",0);
-	  exit(1);
-	}
-    }
-  return pt;
-}
-
-PTR_TYPE Find_BaseType2(ptype)         /* breaks out of the loop for pointers and references   BW */
-     PTR_TYPE ptype;
-{
-  PTR_TYPE pt;
-
-  if (!ptype)
-    return NULL;
-  pt = TYPE_BASE (ptype); 
-  if (pt)
-    { int j;
-      j = 0;
-      while ((j < 100) && pt)
-	{
-	  if (TYPE_CODE(pt) == T_REFERENCE) break;
-	  if (TYPE_CODE(pt) == T_POINTER) break;
-	  if (TYPE_CODE(pt) == DEFAULT) break;
-	  if (TYPE_CODE(pt) == T_INT) break;
-	  if (TYPE_CODE(pt) == T_FLOAT) break;
-	  if (TYPE_CODE(pt) == T_DOUBLE) break;
-	  if (TYPE_CODE(pt) == T_CHAR) break;
-	  if (TYPE_CODE(pt) == T_BOOL) break;
-	  if (TYPE_CODE(pt) == T_STRING) break;
-	  if (TYPE_CODE(pt) == T_COMPLEX) break;
-	  if (TYPE_CODE(pt) == T_DCOMPLEX) break;
-	  if (TYPE_CODE(pt) == T_VOID) break;
-	  if (TYPE_CODE(pt) == T_UNKNOWN) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_TYPE) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_COLLECTION) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_CLASS) break;
-	  if (TYPE_CODE(pt) == T_CLASS) break;
-	  if (TYPE_CODE(pt) == T_COLLECTION) break;
-	  if (TYPE_CODE(pt) == T_DESCRIPT) break;  /* by dbg */
-			  
-	  pt = TYPE_BASE (pt);
-	  j++;
-	}
-      if (j == 100)
-	{
-	  Message("Looping in getting the Basetype; sorry",0);
-	  exit(1);
-	}
-    }
-  return pt;
-}
-
-
-
-char *create_unp_str(str)
-     char *str;
-{
-  char *pt;
-
-  if (!str)
-    return NULL;
-    
-  pt = (char *) xmalloc(strlen(str)+1);
-  memset(pt, 0, strlen(str)+1);
-  strcpy(pt,str);
-  return pt;
-}     
-
-
-char *alloc_str(size)
-     int size;
-{
-  char *pt;
-
-  if (!(size++)) return NULL;
-  pt = (char *) xmalloc(size);
-  memset(pt, 0, size);
-  return pt;
-}     
-
-int next_letter(str)
-    char *str;
-{
-  int i = 0;
-  while(isspace(str[i])) 
-    i++;
-  return i;
-}
-
-char *unparse_stmt_str(str)
-     char *str;
-{
-  char *pt;
-  int i,j,len;
-  char c;
-  if(!out_free_form)
-    return str;
-  if (!str)
-    return NULL;
-  pt = (char *) xmalloc(strlen(str)+2);
-
-  i = next_letter(str);  /*first letter*/
-  c = tolower(str[i]);
-  if(c == 'd')
-    len = 4;
-  else if (c == 'f')
-    len = 6;
- 
-  for(j=1; j < len; j++)
-    i = i + next_letter(str+i+1) + 1;            
-  
-  if(len == 4) 
-    strcpy(pt,"data ");
-  else
-    strcpy(pt,"format ");
-
-  strcpy(pt+len+1,str+i+1);
-  return pt;  
-}
-
-void Reset_Unparser()
-{
-  int i,j;
-
-  /* initialize the number of flag */
-  Number_Of_Flag = 0;
-  for (i=0; i < MAXFLAG ; i++)
-    {
-      TabOfFlag[i][0] = '\0';
-      FlagLenght[i] = 0;
-      for(j=0; j<MAXLEVEL; j++)
-        FlagOn[j][i] = 0;
-      FlagLevel[i] = 0;
-    }
-  /* setbuffer to 0 */
-  Buf_pointer = 0;  
-  if (UnpBuf == NULL)
-  {
-      UnpBuf = malloc(INIT_LEN);
-      max_lenght_buf = INIT_LEN;
-  }
-  memset(UnpBuf, 0, max_lenght_buf);
-  Buf_address = UnpBuf;
-
-  //Buf_address = &(UnpBuf[0]); /* may be reallocated */
-  //memset(UnpBuf, 0, MAXLENGHTBUF);
-}
-
-void Set_Function_Language(lg)  /*16.12.11 podd*/
-   int lg;
-{ Function_Language = lg;
-}
-
-void Unset_Function_Language()   /*16.12.11 podd*/
-{
- Function_Language = 0; 
-}
-
-int Check_Lang_Fortran_For_File(proj)  /*16.12.11 podd*/
-PTR_PROJ proj;
-{ if(Function_Language == CSrc)   /* Csrc=1 */
-   return(FALSE);
-  else if(Function_Language != CSrc && Check_Lang_Fortran(proj)) 
-   return(TRUE);
-  else
-   return(FALSE);
-}
-
-void Init_Unparser()
-{
-  int i,j;
-  
-
-  if (Check_Lang_Fortran_For_File(cur_proj) )  /*16.12.11 podd*/    
-    {
-      if (Parser_Initiated != Fortran_Initialized)
-        {
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT) Unparse_Def[SYM].str = create_unp_str( NAME);
-#include"unparse.def"
-#include"unparseDVM.def"
-#undef DEFNODECODE
-
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT) Unparse_Def[SYM].fct = NULL;
-#include"unparse.def"
-#include"unparseDVM.def"
-#undef DEFNODECODE
-          Parser_Initiated = Fortran_Initialized;
-          /* set the first tabulation */
-          TabNumber = 1;
-        }
-    } 
-  else
-    {
-      if (Parser_Initiated != C_Initialized)
-        {
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT) Unparse_Def[SYM].str = create_unp_str( NAME);
-#include"unparseC++.def"
-#undef DEFNODECODE
-
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT) Unparse_Def[SYM].fct = NULL;
-#include"unparseC++.def"
-#undef DEFNODECODE
-          Parser_Initiated = C_Initialized;
-          /* set the first tabulation */
-          TabNumber = 0;
-
-          /* init  precedence table of operators for C++ */ 
-          for(i=BIT_COMPLEMENT_OP - EQ_OP; i<=RSHIFT_ASSGN_OP-EQ_OP;i++)
-             precedence_C[i] = precedence2_C[i-BIT_COMPLEMENT_OP+EQ_OP];  
-        }
-    }
-
-
-  /* initialize the number of flag */
-  Number_Of_Flag = 0;
-  for (i=0; i < MAXFLAG ; i++)
-    {
-      TabOfFlag[i][0] = '\0';
-      FlagLenght[i] = 0;
-      for(j=0; j<MAXLEVEL; j++)
-        FlagOn[j][i] = 0;
-      FlagLevel[i] = 0;
-    }
-  /* setbuffer to 0 */
-  Buf_pointer = 0;
-  if (UnpBuf == NULL)
-  {
-      UnpBuf = malloc(INIT_LEN);
-      max_lenght_buf = INIT_LEN;
-  }
-  memset(UnpBuf, 0, max_lenght_buf);
-  Buf_address = UnpBuf;
-
-  //Buf_address = &(UnpBuf[0]); /* may be reallocated */
-  //memset(UnpBuf, 0, MAXLENGHTBUF);
-}
-
-void BufferAllocate(size)
-int size;
-{ if(!allocated_buf || max_lenght_buf != size)  
-    allocated_buf = xmalloc(size); /* reallocated */
-  max_lenght_buf = size; 
-  Buf_address = allocated_buf;
-  memset(Buf_address, 0, size);
-}
-
-/* function to manage the unparse buffer */
-
-static void realocBuf(int minSize)
-{
-    size_t newSize = max_lenght_buf * 1.35; // added 35%
-    if (newSize < minSize)
-        newSize = minSize + 1;
-
-    Buf_address = UnpBuf = realloc(UnpBuf, newSize);
-    memset(UnpBuf + max_lenght_buf, 0, newSize - max_lenght_buf);
-    
-    //printf(" realloc buffer from %ld to %ld\n", max_lenght_buf, newSize);
-    max_lenght_buf = newSize;
-}
-
-int BufPutChar(char c)
-{
-    if (Buf_pointer >= max_lenght_buf)  //MAXLENGHTBUF)
-    {
-        realocBuf(Buf_pointer + 1);
-        //Message("Unparse Buffer Full",0);
-        /*return 0;*/ /*podd*/
-        //exit(1);
-    }
-    Buf_address[Buf_pointer] = c;
-    Buf_pointer++;
-    return 1;
-}
-
-int BufPutString(char* s, int len)
-{
-    int length;
-    if (!s)
-    {
-        Message("Null String in BufPutString", 0);
-        return 0;
-    }
-
-    length = len;
-    if (length <= 0)
-        length = strlen(s);
-
-    if (Buf_pointer + length >= max_lenght_buf)  //MAXLENGHTBUF)
-    {
-        realocBuf(Buf_pointer + length);
-        //Message("Unparse Buffer Full", 0);
-        /*return 0;*/ /*podd*/
-        //exit(1);
-    }
-    strncpy(&(Buf_address[Buf_pointer]), s, length);
-    Buf_pointer += length;
-    return 1;
-}
-
-
-int BufPutInt(int i)
-{
-    int length;
-    char s[MAXLFLAG];
-
-    sprintf(s, "%d", i);
-    length = strlen(s);
-
-    if (Buf_pointer + length >= max_lenght_buf) //MAXLENGHTBUF)
-    {
-        realocBuf(Buf_pointer + length);
-        //Message("Unparse Buffer Full", 0);
-        /*return 0;*/ /*podd*/
-        //exit(1);
-    }
-    strncpy(&(Buf_address[Buf_pointer]), s, length);
-    Buf_pointer += length;
-    return 1;
-}
-
-int Get_Flag_val(str, i)
-     char  *str;
-     int *i;
-{
-  int j, con;
-  char sflag[MAXLFLAG];
-  (*i)++; /* skip the paranthesis */  
-  /* extract the flag name */
-  j = *i;
-  con = 0;
-  
-  while ((str[j]  != '\0') && (str[j]  != ')'))
-    {
-      sflag[con] = str[j];      
-      con ++;      
-      j ++;
-    }
-  sflag[con] = '\0';
-  con ++; 
-  
-  /* look in table if flag is in */
-  
-  for (j = 0 ;  j < Number_Of_Flag; j++)
-    {
-      if (strncmp(TabOfFlag[j],sflag, con) == 0)
-          break;
-    }
-  *i += con;      
-  if (j >= Number_Of_Flag)
-    {
-      /* not found  */
-      return 0;
-    }
-  else          
-    return FlagOn[FlagLevel[j]][j];
-
-}
-
-void Treat_Flag(str, i, val)
-     char  *str;
-     int *i;
-     int val;     
-{
-  int j, con;
-  char sflag[MAXLFLAG];
-  (*i)++; /* skip the paranthesis */  
-  /* extract the flag name */
-  j = *i;
-  con = 0;
-  
-  while ((str[j]  != '\0') && (str[j]  != ')'))
-    {
-      sflag[con] = str[j];      
-      con ++;      
-      j ++;
-    }
-  sflag[con] = '\0';
-  con ++; 
-  
-  /* look in table if flag is in */
-  
-  for (j = 0 ;  j < Number_Of_Flag; j++)
-    {
-      if (strncmp(TabOfFlag[j],sflag, con) == 0)
-          break;
-    }
-      if (j >= Number_Of_Flag)
-        {
-          /* not found  */
-          strcpy(TabOfFlag[Number_Of_Flag],sflag);
-          FlagOn[0][Number_Of_Flag] = val;
-          FlagLenght[Number_Of_Flag] = con-1;
-          Number_Of_Flag++;          
-        } else
-          FlagOn[FlagLevel[j]][j] += val;
-      *i += con;      
-}
-
-
-void PushPop_Flag(str, i, val)
-     char  *str;
-     int *i;
-     int val;     
-{
-  int j, con;
-  char sflag[MAXLFLAG];
-  (*i)++; /* skip the paranthesis */  
-  /* extract the flag name */
-  j = *i;
-  con = 0;
-  
-  while ((str[j]  != '\0') && (str[j]  != ')'))
-    {
-      sflag[con] = str[j];      
-      con ++;      
-      j ++;
-    }
-  sflag[con] = '\0';
-  con ++; 
-  
-  /* look in table if flag is in */
-  
-  for (j = 0 ;  j < Number_Of_Flag; j++)
-    {
-      if (strncmp(TabOfFlag[j],sflag, con) == 0)
-          break;
-    }
-      if (j < Number_Of_Flag)
-        {
-          /* if a pop, clear old value befor poping */
-          if(val< 0) FlagOn[FlagLevel[j]][j] = 0; /* added by dbg to make sure initialized */
-          FlagLevel[j]  += val;
-          if (FlagLevel[j] < 0)
-            FlagLevel[j] = 0;
-          if (FlagLevel[j] >= MAXLEVEL)
-            {
-              Message("Stack of flag overflow; abort()",0);
-              abort();
-            }
-        }
-      /* else printf("WARNING(unparser): unknow flag pushed or popped:%s\n",sflag); */
-      *i += con;      
-}
-
-char * Tool_Unparse_Type();
-
-char *
-Tool_Unparse_Symbol (symb)
-     PTR_SYMB symb;
-{
-  PTR_TYPE ov_type;
-  if (!symb)
-    return NULL;
-  if (SYMB_IDENT(symb))
-    {
-       if((SYMB_ATTR(symb) & OVOPERATOR)){
-	  ov_type = SYMB_TYPE(symb);
-	  if(TYPE_CODE(ov_type) == T_DESCRIPT){
-	      if(TYPE_LONG_SHORT(ov_type) == BIT_VIRTUAL && In_Class_Flag){
-               BufPutString ("virtual ",0);
-	       if(TYPE_LONG_SHORT(ov_type) == BIT_ATOMIC) BufPutString ("atomic ",0);
-	       ov_type = TYPE_DESCRIP_BASE_TYPE(ov_type);
-	       }
-	      if(TYPE_LONG_SHORT(ov_type) == BIT_INLINE){
-               BufPutString ("inline ",0);
-	       ov_type = TYPE_DESCRIP_BASE_TYPE(ov_type);
-	       }
-          }
-       } else ov_type = NULL;
-              
-/*      if ((SYMB_ATTR(symb) & OVOPERATOR) ||
-	  (strcmp(SYMB_IDENT(symb),"()")==0) ||
-          (strcmp(SYMB_IDENT(symb),"*")==0) ||
-          (strcmp(SYMB_IDENT(symb),"+")==0) ||
-          (strcmp(SYMB_IDENT(symb),"-")==0) ||
-          (strcmp(SYMB_IDENT(symb),"/")==0) ||
-          (strcmp(SYMB_IDENT(symb),"=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"%")==0) ||
-          (strcmp(SYMB_IDENT(symb),"&")==0) ||
-          (strcmp(SYMB_IDENT(symb),"|")==0) ||
-          (strcmp(SYMB_IDENT(symb),"!")==0) ||
-          (strcmp(SYMB_IDENT(symb),"~")==0) ||
-          (strcmp(SYMB_IDENT(symb),"^")==0) ||
-          (strcmp(SYMB_IDENT(symb),"+=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"-=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"*=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"/=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"%=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"^=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"&=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"|=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"<<")==0) ||
-          (strcmp(SYMB_IDENT(symb),">>")==0) ||
-          (strcmp(SYMB_IDENT(symb),"<<=")==0) ||
-          (strcmp(SYMB_IDENT(symb),">>=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"==")==0) ||
-          (strcmp(SYMB_IDENT(symb),"!=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"<=")==0) ||
-          (strcmp(SYMB_IDENT(symb),">=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"<")==0) ||
-          (strcmp(SYMB_IDENT(symb),">")==0) ||
-          (strcmp(SYMB_IDENT(symb),"&&")==0) ||
-          (strcmp(SYMB_IDENT(symb),"||")==0) ||
-          (strcmp(SYMB_IDENT(symb),"++")==0) ||
-          (strcmp(SYMB_IDENT(symb),"--")==0) ||
-          (strcmp(SYMB_IDENT(symb),"->")==0) ||
-          (strcmp(SYMB_IDENT(symb),"->*")==0) ||
-          (strcmp(SYMB_IDENT(symb),",")==0) ||	  
-          (strcmp(SYMB_IDENT(symb),"[]")==0) )
-        BufPutString ("operator ",0);
-*/	
-    }
-  /*
-  if(ov_type) Tool_Unparse_Type(ov_type, 0);
-  else */
-  BufPutString (SYMB_IDENT(symb),0);
-  return Buf_address;
-}
-
-
-typedef struct
-{
-  int typ;
-  union {char *S;
-//         int  I;
-           long  I;
-        } val;
-} operand;
-
-/* macro def. of operand type */
-#define UNDEF_TYP   0
-#define STRING_TYP  1
-#define INTEGER_TYP 2
-
-/* macro def. of comparison operators */
-#define COMP_UNDEF -1 /* Bodin */
-#define COMP_EQUAL 0
-#define COMP_DIFF  1
-
-
-
-void Get_Type_Operand (str, iptr, ptype,Op)
-     char *str;
-     int *iptr;
-     PTR_TYPE ptype;
-     operand *Op;
-{
-
-  Op->typ = UNDEF_TYP;
-  if (strncmp(&(str[*iptr]),"%CHECKFLAG", strlen("%CHECKFLAG"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%CHECKFLAG");
-      Op->val.I = Get_Flag_val(str, iptr);
-    } else
-  if (strncmp(&(str[*iptr]),"%STRCST", strlen("%STRCST"))== 0)               /* %STRCST : String Constant */
-    {
-      int i_save;
-
-      *iptr += strlen("%STRCST");
-      while (str[*iptr] == ' ') {(*iptr)++;} /* skip spaces before string */
-      if (str[*iptr] != '\'')
-        {
-          Message (" *** Missing \"'\" after %STRCST *** ",0);
-        }
-      i_save = ++(*iptr);
-      while ((str[*iptr] != '\0') && (str[*iptr] != '\'')) (*iptr)++;
-      Op->val.S = alloc_str ((*iptr) - i_save);
-      strncpy (Op->val.S, &(str[i_save]), (*iptr) - i_save);
-      Op->typ = STRING_TYP;
-    } else
-  if (strncmp(&(str[*iptr]),"%NULL", strlen("%NULL"))== 0)                   /* %NULL : Integer Constant (or false boolean) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = 0;
-      *iptr += strlen("%NULL");
-    } else
-  if (strncmp(&(str[*iptr]),"%INIMPLI", strlen("%INIMPLI"))== 0)             /* %INIMPLI : In_Impli_Statement (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = In_Impli_Flag;
-      *iptr += strlen("%INIMPLI");
-    } else
-      {
-        Message (" *** Unknown operand in %IF (condition) for Type Node *** ",0);
-      }
-}
-
-void Get_LL_Operand (str, iptr, ll, Op)
-     char *str;
-     int *iptr;
-     PTR_LLND ll;
-     operand *Op;
-{
-
-  Op->typ = UNDEF_TYP;
-  if (strncmp(&(str[*iptr]),"%CHECKFLAG", strlen("%CHECKFLAG"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%CHECKFLAG");
-      Op->val.I = Get_Flag_val(str, iptr);
-    } else
-  if (strncmp(&(str[*iptr]),"%STRCST", strlen("%STRCST"))== 0)               /* %STRCST : String Constant */
-    {
-      int i_save;
-
-      *iptr += strlen("%STRCST");
-      while (str[*iptr] == ' ') {(*iptr)++;} /* skip spaces before string */
-      if (str[*iptr] != '\'')
-        {
-          Message  (" *** Missing \"'\" after %STRCST *** ",0);
-        }
-      i_save = ++(*iptr);
-      while ((str[*iptr] != '\0') && (str[*iptr] != '\'')) (*iptr)++;
-      Op->val.S = alloc_str ((*iptr) - i_save);
-      strncpy (Op->val.S, &(str[i_save]), (*iptr) - i_save);
-      Op->typ = STRING_TYP;
-    } else
-  if (strncmp(&(str[*iptr]),"%SYMBOL", strlen("%SYMBOL"))== 0)               /* %SYMBOL : Symbol pointer (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) NODE_SYMB (ll);
-      *iptr += strlen("%SYMBOL");
-    } else
-  if (strncmp(&(str[*iptr]),"%SYMBID", strlen("%SYMBID"))== 0)               /* %SYMBID : Symbol identifier (string) */
-    {
-      Op->typ = STRING_TYP;
-      if (NODE_SYMB (ll))
-        Op->val.S = SYMB_IDENT (NODE_SYMB (ll));
-      else
-        Op->val.S = NULL;
-      *iptr += strlen("%SYMBID");
-    } else
-  if (strncmp(&(str[*iptr]),"%VALUE", strlen("%VALUE"))== 0)               /* %VALUE: Symbol value */
-    {
-      Op->typ = INTEGER_TYP;
-      if (NODE_TEMPLATE_LL1 (ll) && NODE_SYMB (NODE_TEMPLATE_LL1 (ll)) && NODE_CODE(NODE_SYMB (NODE_TEMPLATE_LL1 (ll)))==CONST_NAME)
-        Op->val.I = (long) (NODE_SYMB (NODE_TEMPLATE_LL1(ll)))->entry.const_value;
-      else
-        Op->val.I =  0;
-      *iptr += strlen("%VALUE");
-    } else
-  if (strncmp(&(str[*iptr]),"%NULL", strlen("%NULL"))== 0)                   /* %NULL : Integer Constant (or false boolean) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = 0;
-      *iptr += strlen("%NULL");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL1", strlen("%LL1"))== 0)                     /* %LL1 : Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;      
-      Op->val.I = (long) NODE_TEMPLATE_LL1 (ll);
-      *iptr += strlen("%LL1");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL2", strlen("%LL2"))== 0)                     /* %LL2 : Low Level Node 2 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) NODE_TEMPLATE_LL2 (ll);
-      *iptr += strlen("%LL2");
-    } else
-  if (strncmp(&(str[*iptr]),"%LABUSE", strlen("%LABUSE"))== 0)               /* %LABUSE : label ptr (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) NODE_LABEL (ll);
-      *iptr += strlen("%LABUSE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L1CODE", strlen("%L1CODE"))== 0)               /* %L1CODE : Code (variant) of Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (NODE_TEMPLATE_LL1 (ll))
-        Op->val.I = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-      else
-        Op->val.I = 0;
-      *iptr += strlen("%L1CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L2CODE", strlen("%L2CODE"))== 0)               /* %L2CODE : Code (variant) of Low Level Node 2 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (NODE_TEMPLATE_LL2 (ll))
-        Op->val.I = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-      else
-        Op->val.I = 0;
-      *iptr += strlen("%L2CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%INWRITE", strlen("%INWRITE"))== 0)             /* %INWRITE : In_Write_Statement (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = In_Write_Flag;
-      *iptr += strlen("%INWRITE");
-    } else
-  if (strncmp(&(str[*iptr]),"%RECPORT", strlen("%RECPORT"))== 0)            /* %RECPORT : reccursive_port_decl (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = Rec_Port_Decl;
-      *iptr += strlen("%RECPORT");
-    } else
-  if (strncmp(&(str[*iptr]),"%INPARAM", strlen("%INPARAM"))== 0)             /* %INPARAM : In_Param_Statement (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = In_Param_Flag;
-      *iptr += strlen("%INPARAM");
-    } else
-  if (strncmp(&(str[*iptr]),"%INIMPLI", strlen("%INIMPLI"))== 0)             /* %INIMPLI : In_Impli_Statement (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = In_Impli_Flag;
-      *iptr += strlen("%INIMPLI");
-    } else
-      if (strncmp(&(str[*iptr]),"%L1L2*L1CODE", strlen("%L1L2*L1CODE"))== 0)       /* %L1L2L1CODE : Code (variant) of Low Level Node 1 of Low Level Node 2 of Low Level Node 1 (integer) */
-    {
-      PTR_LLND temp;
-      
-      Op->typ = INTEGER_TYP;
-      if (NODE_OPERAND0(ll))
-        {
-          temp = NODE_OPERAND0(ll);
-          while (temp && NODE_OPERAND1(temp)) temp =  NODE_OPERAND1(temp);
-          if (temp && NODE_OPERAND0(temp))
-            Op->val.I = NODE_CODE (NODE_OPERAND0(temp));
-          else
-            Op->val.I = 0;
-        }
-      else
-        Op->val.I = 0;
-      *iptr += strlen("%L1L2*L1CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%TYPEDECL", strlen("%TYPEDECL"))== 0)            /* %TYPEDECL */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = Type_Decl_Ptr;
-      *iptr += strlen("%TYPEDECL");
-    } else
-  if (strncmp(&(str[*iptr]),"%TYPEBASE", strlen("%TYPEBASE"))== 0)            /* %TYPEBASE */
-    { PTR_TYPE type;
-      Op->typ = INTEGER_TYP;
-      if (NODE_SYMB(ll))
-        type = SYMB_TYPE( NODE_SYMB (ll));
-      else
-        type = NULL;
-      if (type && (TYPE_CODE(type) == T_ARRAY))
-	{  
-	   type = Find_BaseType(type);
-	} 
-      Op->val.I = (long) type;
-      *iptr += strlen("%TYPEBASE");
-
-    } else
-      {
-        Message  (" *** Unknown operand in %IF (condition) for LL Node *** ",0);
-      }
-}
-
-
-void Get_Bif_Operand (str, iptr, bif,Op)
-     char *str;
-     int *iptr;
-     PTR_BFND bif;
-     operand *Op;
-{
-
-  Op->typ = UNDEF_TYP;
-  if (strncmp(&(str[*iptr]),"%ELSIFBLOB2", strlen("%ELSIFBLOB2"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%ELSIFBLOB2");
-      if (BIF_BLOB2(bif) && (BIF_CODE(BLOB_VALUE(BIF_BLOB2(bif))) == ELSEIF_NODE))
-        Op->val.I = 1;
-      else
-        Op->val.I = 0;      
-    } else
-  if (strncmp(&(str[*iptr]),"%ELSWHBLOB2", strlen("%ELSWHBLOB2"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%ELSWHBLOB2");
-      if (BIF_BLOB2(bif) && (BIF_CODE(BLOB_VALUE(BIF_BLOB2(bif))) == ELSEWH_NODE))
-        Op->val.I = 1;
-      else
-        Op->val.I = 0;      
-    } else
-  if (strncmp(&(str[*iptr]),"%LABEL", strlen("%LABEL"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%LABEL");
-      Op->val.I = (long) BIF_LABEL(bif);
-    } else
-  if (strncmp(&(str[*iptr]),"%CHECKFLAG", strlen("%CHECKFLAG"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%CHECKFLAG");
-      Op->val.I = Get_Flag_val(str, iptr);
-    } else
-  if (strncmp(&(str[*iptr]),"%BLOB1", strlen("%BLOB1"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_BLOB1(bif);
-      *iptr += strlen("%BLOB1");
-    } else
-  if (strncmp(&(str[*iptr]),"%BLOB2", strlen("%BLOB2"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long)  BIF_BLOB2(bif);
-      *iptr += strlen("%BLOB2");
-    } else
-      if (strncmp(&(str[*iptr]),"%BIFCP", strlen("%BIFCP"))== 0)  
-        {
-          Op->typ = INTEGER_TYP;
-          if (BIF_CP(bif))
-            Op->val.I = BIF_CODE(BIF_CP(bif));
-          else
-            Op->val.I = 0;          
-          *iptr += strlen("%BIFCP");
-
-    } else
-      if (strncmp(&(str[*iptr]),"%CPBIF", strlen("%CPBIF"))== 0)  
-        {
-          Op->typ = INTEGER_TYP;
-          if (BIF_CP(bif) && BIF_CP(BIF_CP(bif)))
-            Op->val.I = BIF_CODE(BIF_CP(BIF_CP(bif)));
-          else
-            Op->val.I = 0;          
-          *iptr += strlen("%CPBIF");
-
-        } else
-          if (strncmp(&(str[*iptr]),"%VALINT", strlen("%VALINT"))== 0)  
-            {
-              Op->typ = INTEGER_TYP;              
-              Op->val.I = atoi(&(str[*iptr + strlen("%VALINT")]));    /* %VALINT-12232323  space is necessary after the number*/
-              /* skip to next statement */
-              while (str[*iptr] != ' ') (*iptr)++;
-            } else
-  if (strncmp(&(str[*iptr]),"%RECURSBIT", strlen("%RECURSBIT"))== 0)         /* %RECURSBIT : Symbol Attribut (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = RECURSIVE_BIT;
-      *iptr += strlen("%RECURSBIT");
-    } else
-  if (strncmp(&(str[*iptr]),"%EXPR_LIST", strlen("%EXPR_LIST"))== 0)         /* %EXPR_LIST : int constant EXPR_LIST code for Low Level Node (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = EXPR_LIST;
-      *iptr += strlen("%EXPR_LIST");
-    } else
-  if (strncmp(&(str[*iptr]),"%SPEC_PAIR", strlen("%SPEC_PAIR"))== 0)         /* %SPEC_PAIR : int constant SPEC_PAIR code for Low Level Node (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = SPEC_PAIR;
-      *iptr += strlen("%SPEC_PAIR");
-    } else
-  if (strncmp(&(str[*iptr]),"%IOACCESS", strlen("%IOACCESS"))== 0)           /* %IOACCESS : int constant IOACCESS code for Low Level Node (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = IOACCESS;
-      *iptr += strlen("%IOACCESS");
-    } else
-  if (strncmp(&(str[*iptr]),"%STRCST", strlen("%STRCST"))== 0)               /* %STRCST : String Constant */
-    {
-      int i_save;
-
-      *iptr += strlen("%STRCST");
-      while (str[*iptr] == ' ') {(*iptr)++;} /* skip spaces before string */
-      if (str[*iptr] != '\'')
-        {
-          Message  (" *** Missing \"'\" after %STRCST *** ",0);
-        }
-      i_save = ++(*iptr);
-      while ((str[*iptr] != '\0') && (str[*iptr] != '\'')) (*iptr)++;
-      Op->val.S = alloc_str ((*iptr) - i_save);
-      strncpy (Op->val.S, &(str[i_save]), (*iptr) - i_save);
-      Op->typ = STRING_TYP;
-       (*iptr)++; /* skip the ' */
-    } else
-  if (strncmp(&(str[*iptr]),"%SYMBOL", strlen("%SYMBOL"))== 0)               /* %SYMBOL : Symbol pointer (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_SYMB (bif);
-      *iptr += strlen("%SYMBOL");
-    } else
-  if (strncmp(&(str[*iptr]),"%SATTR", strlen("%SATTR"))== 0)                 /* %SATTR : Symbol Attribut (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (BIF_SYMB (bif))->attr;
-      *iptr += strlen("%SATTR");
-    } else
-  if (strncmp(&(str[*iptr]),"%SYMBID", strlen("%SYMBID"))== 0)               /* %SYMBID : Symbol identifier (string) */
-    {
-      Op->typ = STRING_TYP;
-      if (BIF_SYMB (bif))
-        Op->val.S = SYMB_IDENT (BIF_SYMB (bif));
-      else
-        Op->val.S = NULL;
-      *iptr += strlen("%SYMBID");
-    } else
-  if (strncmp(&(str[*iptr]),"%NULL", strlen("%NULL"))== 0)                   /* %NULL : Integer Constant (or false boolean) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = 0;
-      *iptr += strlen("%NULL");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL1", strlen("%LL1"))== 0)                     /* %LL1 : Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_LL1 (bif);
-      *iptr += strlen("%LL1");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL2", strlen("%LL2"))== 0)                     /* %LL2 : Low Level Node 2 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_LL2 (bif);
-      *iptr += strlen("%LL2");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL3", strlen("%LL3"))== 0)                     /* %LL3 : Low Level Node 3 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_LL3 (bif);
-      *iptr += strlen("%LL3");
-    } else
-  if (strncmp(&(str[*iptr]),"%LABUSE", strlen("%LABUSE"))== 0)               /* %LABUSE : label ptr (used for do : doend) (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_LABEL_USE (bif);
-      *iptr += strlen("%LABUSE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L1CODE", strlen("%L1CODE"))== 0)               /* %L1CODE : Code (variant) of Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (BIF_LL1 (bif))
-        Op->val.I = NODE_CODE (BIF_LL1 (bif));
-      else
-        Op->val.I = 0;
-      *iptr += strlen("%L1CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L2CODE", strlen("%L2CODE"))== 0)               /* %L2CODE : Code (variant) of Low Level Node 2 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (BIF_LL2 (bif))
-        Op->val.I = NODE_CODE (BIF_LL2 (bif));
-      else
-        Op->val.I = 0;
-      *iptr += strlen("%L2CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L1L2L1CODE", strlen("%L1L2L1CODE"))== 0)       /* %L1L2L1CODE : Code (variant) of Low Level Node 1 of Low Level Node 2 of Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (BIF_LL1 (bif) && NODE_TEMPLATE_LL2 (BIF_LL1 (bif)) && NODE_TEMPLATE_LL1 (NODE_TEMPLATE_LL2 (BIF_LL1 (bif))))
-        Op->val.I = NODE_CODE (NODE_TEMPLATE_LL1 (NODE_TEMPLATE_LL2 (BIF_LL1 (bif))));
-      else
-        Op->val.I = 0;
-      *iptr += strlen("%L1L2L1CODE");
-    } else
-      if (strncmp(&(str[*iptr]),"%L1L2*L1CODE", strlen("%L1L2*L1CODE"))== 0)       /* %L1L2L1CODE : Code (variant) of Low Level Node 1 of Low Level Node 2 of Low Level Node 1 (integer) */
-    {
-      PTR_LLND temp;
-      
-      Op->typ = INTEGER_TYP;
-      if (BIF_LL1 (bif) && NODE_TEMPLATE_LL2 (BIF_LL1 (bif)) && NODE_TEMPLATE_LL1 (NODE_TEMPLATE_LL2 (BIF_LL1 (bif))))
-        {
-          temp = BIF_LL1 (bif);
-          while (NODE_OPERAND1(temp)) temp =  NODE_OPERAND1(temp);
-          if (NODE_TEMPLATE_LL1 (temp))
-            Op->val.I = NODE_CODE (NODE_TEMPLATE_LL1 (temp));
-          else
-            Op->val.I = 0;
-        }
-      else
-        Op->val.I = 0;
-      *iptr += strlen("%L1L2*L1CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L2L1STR", strlen("%L2L1STR"))== 0)             /* %L2L1STR : String (string_val) of Low Level Node 1 of Low Level Node 2 (string) */
-    {
-      Op->typ = STRING_TYP;
-      if (BIF_LL2 (bif) && NODE_TEMPLATE_LL1 (BIF_LL2 (bif)))
-        Op->val.S = NODE_STR (NODE_TEMPLATE_LL1 (BIF_LL2 (bif)));
-      else
-        Op->val.S = NULL;
-      *iptr += strlen("%L2L1STR");
-
-    } else
-      {
-        Message  (" *** Unknown operand in %IF (condition) for Bif Node *** ",0);
-      }
-}
-
-
-int
-GetComp (str, iptr)
-     char *str;
-     int *iptr;
-{
-  int Comp;
-
-  if (strncmp(&(str[*iptr]),"==", strlen("==")) == 0)         /* == : Equal */
-    {
-      Comp = COMP_EQUAL;
-      *iptr += strlen("==");
-    } else
-  if (strncmp(&(str[*iptr]),"!=", strlen("!=")) == 0)         /* != : Different */
-    {
-      Comp = COMP_DIFF;
-      *iptr += strlen("!=");
-    } else
-      {
-        Message (" *** Unknown comparison operator in %IF (condition) *** ",0);
-        Comp = COMP_UNDEF;
-      }
-  return Comp;
-}
-
-int
-Eval_Type_Condition(str, ptype)
-     char *str;
-     PTR_TYPE ptype;
-{
-  int Result = 0;
-  int i = 0;
-  operand Op1, Op2;
-  int Comp;
-
-  while (str[i] == ' ') {i++;} /* skip spaces before '(condition)' */
-  if (str[i++] != '(')
-    {
-      Message  (" *** Missing (condition) after %IF *** ",0);
-      
-      return 0;
-    } else
-  while (str[i] == ' ') {i++;} /* skip spaces before first operand */
-  Get_Type_Operand(str, &i, ptype, &Op1);
-  while (str[i] == ' ') {i++;} /* skip spaces before the comparison operator */
-  Comp = GetComp(str, &i);
-  while (str[i] == ' ') {i++;} /* skip spaces before second operand */
-  Get_Type_Operand(str, &i, ptype, &Op2);
-  while (str[i] == ' ') {i++;} /* skip spaces before the closing round bracket */
-  if (str[i] != ')')
-    {
-      Message (" *** Missing ')' after %IF (condition *** ",0);
-      return i;
-    } else
-  i++;
-  if ((Op1.typ != UNDEF_TYP) && (Op1.typ == Op2.typ) && (Comp !=COMP_UNDEF))
-    {
-      switch (Op1.typ)
-        {
-          case STRING_TYP : Result = strcmp (Op1.val.S, Op2.val.S);
-            break;
-          case INTEGER_TYP : Result = Op1.val.I - Op2.val.I;
-            break;
-        }
-      if (Comp == COMP_EQUAL) Result = !Result;
-      if (Result) return i; /* continue from here to the corresponding %ELSE if exists */
-      else                  /* continue at the corresponding %ELSE */
-        {
-          int ifcount_local = 1;
-          while (str[i])
-            {
-              while (str[i] != '%') {
-                                      if (str[i]) i++;
-                                      else return i;
-                                    }
-              i++;
-              if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* Counts %IF */
-                {
-                  ifcount_local++;
-                  i += strlen("IF");
-                } else
-              if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* Counts %ENDIF ; stop skipping if corresponding */
-                {
-                  ifcount_local--;
-                  i += strlen("ENDIF");
-                  if (ifcount_local == 0) return i;
-                } else
-              if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* Counts %ELSE ; stop skipping if corresponding*/
-                {
-                  i += strlen("ELSE");
-                  if (ifcount_local == 1) return i;
-                }
-            }
-          return i;
-        }
-    } else
-        {
-          Message (" *** Error in condition for %IF command *** 1",0);
-          return i;
-        }
-}
-
-
-int
-Eval_LLND_Condition(str, ll)
-     char *str;
-     PTR_LLND ll;
-{
-  int Result = 0;
-  int i = 0;
-  operand Op1, Op2;
-  int Comp = 0;
-
-  while (str[i] == ' ') {i++;} /* skip spaces before '(condition)' */
-  if (str[i++] != '(')
-    {
-      Message  (" *** Missing (condition) after %IF *** ",0);
-      return 0;
-    } else
-  while (str[i] == ' ') {i++;} /* skip spaces before first operand */
- Get_LL_Operand(str, &i, ll, &Op1);
-  while (str[i] == ' ') {i++;} /* skip spaces before the comparison operator */
-  Comp = GetComp(str, &i);
-  while (str[i] == ' ') {i++;} /* skip spaces before second operand */
-  Get_LL_Operand(str, &i, ll, &Op2);
-  while (str[i] == ' ') {i++;} /* skip spaces before the closing round bracket */
-  if (str[i] != ')')
-    {
-      Message (" *** Missing ')' after %IF (condition *** ",0);
-      i++;      
-      return i;
-    }  else
-       i++; 
-
-  if ((Op1.typ != UNDEF_TYP) && (Op1.typ == Op2.typ) && (Comp != COMP_UNDEF))
-    {
-      switch (Op1.typ)
-        {
-          case STRING_TYP : Result = strcmp (Op1.val.S, Op2.val.S);
-            break;
-          case INTEGER_TYP : Result = Op1.val.I - Op2.val.I;
-            break;
-        }
-      if (Comp == COMP_EQUAL) Result = !Result;
-      if (Result) return i; /* continue from here to the corresponding %ELSE if exists */
-      else                  /* continue at the corresponding %ELSE */
-        {
-          int ifcount_local = 1;
-          while (str[i])
-            {
-              while (str[i] != '%') {
-                                      if (str[i]) i++;
-                                      else return i;
-                                    }
-              i++;
-              if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* Counts %IF */
-                {
-                  ifcount_local++;
-                  i += strlen("IF");
-                } else
-              if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* Counts %ENDIF ; stop skipping if corresponding */
-                {
-                  ifcount_local--;
-                  i += strlen("ENDIF");
-                  if (ifcount_local == 0) return i;
-                } else
-              if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* Counts %ELSE ; stop skipping if corresponding*/
-                {
-                  i += strlen("ELSE");
-                  if (ifcount_local == 1) return i;
-                }
-            }
-          return i;
-        }
-    } else
-        {
-          Message  (" *** Error in condition for %IF command *** 2",0);
-          return i;
-        }
-}
-
-
-int
-Eval_Bif_Condition(str, bif)
-     char *str;
-     PTR_BFND bif;
-{
-  int Result = 0;
-  int i = 0;
-  operand Op1, Op2;
-  int Comp;
-
-  while (str[i] == ' ') {i++;} /* skip spaces before '(condition)' */
-  if (str[i++] != '(')
-    {
-      Message (" *** Missing (condition) after %IF *** ",0);
-      return 0;
-    } else
-  while (str[i] == ' ') {i++;} /* skip spaces before first operand */
-  Get_Bif_Operand(str, &i, bif, &Op1);
-  while (str[i] == ' ') {i++;} /* skip spaces before the comparison operator */
-  Comp = GetComp(str, &i);
-  while (str[i] == ' ') {i++;} /* skip spaces before second operand */
-  Get_Bif_Operand(str, &i, bif, &Op2);
-  while (str[i] == ' ') {i++;} /* skip spaces before the closing round bracket */
-
-  if (str[i] != ')')
-    {
-      Message  (" *** Missing ')' after %IF (condition *** ",0);
-      return i;
-    } else
-  i++;
-  if ((Op1.typ != UNDEF_TYP) && (Op1.typ == Op2.typ) && (Comp != COMP_UNDEF))
-    {
-      switch (Op1.typ)
-        {
-          case STRING_TYP : Result = strcmp (Op1.val.S, Op2.val.S);
-            break;
-          case INTEGER_TYP : Result = Op1.val.I - Op2.val.I;
-            break;
-        }
-      if (Comp == COMP_EQUAL) Result = !Result;
-      if (Result) return i; /* continue from here to the corresponding %ELSE if exists */
-      else                  /* continue at the corresponding %ELSE */
-        {
-          int ifcount_local = 1;
-          while (str[i])
-            {
-              while (str[i] != '%') {
-                                      if (str[i]) i++;
-                                      else return i;
-                                    }
-              i++;
-              if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* Counts %IF */
-                {
-                  ifcount_local++;
-                  i += strlen("IF");
-                } else
-              if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* Counts %ENDIF ; stop skipping if corresponding */
-                {
-                  ifcount_local--;
-                  i += strlen("ENDIF");
-                  if (ifcount_local == 0) return i;
-                } else
-              if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* Counts %ELSE ; stop skipping if corresponding*/
-                {
-                  i += strlen("ELSE");
-                  if (ifcount_local == 1) return i;
-                }
-            }
-          return i;
-        }
-    } else
-        {
-          Message  (" *** Error in condition for %IF command *** 3",0);
-          return i;
-        }
-}
-
-
-int
-SkipToEndif (str)
-     char *str;
-{
-  int ifcount_local = 1;
-  int i = 0;
-
-  while (str[i])
-    {
-      while (str[i] != '%') {
-                              if (str[i]) i++;
-                              else return i;
-                            }
-      i++;
-      if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                         /* Counts %IF */
-        {
-          ifcount_local++;
-          i += strlen("IF");
-        } else
-      if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)                   /* Counts %ENDIF ; stop skipping if corresponding */
-        {
-          ifcount_local--;
-          i += strlen("ENDIF");
-          if (ifcount_local == 0) return i;
-        }
-    }
-  return i;
-}
-
-char *Tool_Unparse2_LLnode (); 
-
-char *
-Tool_Unparse_Type (ptype)
-     PTR_TYPE ptype;
-     /*int def;*/        /* def = 1 : defined type*/
-                     /*   def = 0 : named type */
-{
-  int variant;
-  int kind;
-  char *str;
-  char c;
-  int i;
-
-  if (!ptype)
-    return NULL;
-
-  variant = TYPE_CODE (ptype);
-  kind = (int) node_code_kind [(int) variant];
-  if (kind != (int)TYPENODE)
-    Message ("Error in Unparse, not a type node", 0);
-
-  str = Unparse_Def [variant].str;
-
-  /* now we have to interpret the code to unparse it */
-
-  if (str == NULL)
-    return NULL;
-  if (strcmp ( str, "n") == 0)
-    {
-      Message("Node not define for unparse",0);
-      return NULL;
-    }
-  
-
-  i = 0 ;
-  c = str[i];
-  while (c != '\0')
-    {
-      if (c == '%')
-        {
-          i++;
-          c = str[i];
-          /******** WE HAVE TO INTERPRET THE COMMAND *********/
-          if (c  == '%')                                                 /* %% : Percent Sign */
-            {
-              BufPutString ("%",0);
-              i++;
-            } else
-          if (strncmp(&(str[i]),"ERROR", strlen("ERROR"))== 0)           /* %ERROR : Generate error message */
-            {
-              Message("Error Node not defined",0);
-	      BufPutInt(variant);
-              BufPutString ("-----TYPE ERROR--------",0);
-              i += strlen("ERROR");
-            } else
-          if (strncmp(&(str[i]),"NL", strlen("NL"))== 0)                 /* %NL : NewLine */
-            {
-              /*int j;*/ /* podd 15.03.99*/
-              BufPutChar ('\n');
-/*              for (j = 0; j < TabNumber; j++)
-                if (j>1)
-                  BufPutString ("   ",0);
-                else
-                  BufPutString ("       ",0);*/
-               i += strlen("NL");
-            } else
-           if (strncmp(&(str[i]),"NOTABNL", strlen("NOTABNL"))== 0)                 /* %NL : NewLine */
-            {
-              BufPutChar ('\n');
-              i += strlen("NOTABNL");
-            } else
-	   if (strncmp(&(str[i]),"RIDPT", strlen("RIDPT"))== 0)      
-                { /*int j;*/ /* podd 15.03.99*/
-		  DealWith_Rid(ptype,In_Class_Flag);
-                  i += strlen("RIDPT");
-                } else
-           if (strncmp(&(str[i]),"TABNAME", strlen("TABNAME"))== 0)       /* %TABNAME : Self Name from Table */
-                {
-		  if (Check_Lang_Fortran_For_File(cur_proj)) /*16.12.11 podd*/
-		    BufPutString (ftype_name [type_index (TYPE_CODE (ptype))],0);
-		  else
-		    {
-		      BufPutString (ctype_name [type_index (TYPE_CODE (ptype))],0);
-		    }
-                  i += strlen("TABNAME");
-                } else
-                  if (strncmp(&(str[i]),"TAB", strlen("TAB"))== 0)               /* %TAB : Tab */
-               {
-              BufPutString ("      ",0); /* cychen */
-              i += strlen("TAB");
-            } else
-	 if (strncmp(&(str[i]),"SETFLAG", strlen("SETFLAG"))== 0)
-	   {               
-		i = i + strlen("SETFLAG");
-		Treat_Flag(str, &i,1);
-	   } else
-	 if (strncmp(&(str[i]),"UNSETFLAG", strlen("UNSETFLAG"))== 0) 
-	   {               
-		i = i + strlen("UNSETFLAG");
-		Treat_Flag(str, &i,-1);
-	   } else
-         if (strncmp(&(str[i]),"PUSHFLAG", strlen("PUSHFLAG"))== 0)
-           {               
-                i = i + strlen("PUSHFLAG");
-                PushPop_Flag(str, &i,1);
-           } else
-         if (strncmp(&(str[i]),"POPFLAG", strlen("POPFLAG"))== 0) 
-            {               
-                i = i + strlen("POPFLAG");
-                PushPop_Flag(str, &i,-1);
-            } else
-          if (strncmp(&(str[i]),"PUTTAB", strlen("PUTTAB"))== 0)               /* %TAB : Tab */
-        {
-                  int j, k;
-
-                  if (Check_Lang_Fortran_For_File(cur_proj)) /*16.12.11 podd*/
-                    for (j = 0; j < TabNumber; j++)
-                      if (j>0)
-                        BufPutString ("   ",0);
-                      else {
-                        for (k=0; k<6; k++) {
-                          if (HasLabel == 0)
-                            BufPutString (" ",0); /* cychen */
-                          HasLabel = HasLabel/10;
-                        };
-                      }
-                  else
-                    for (j = 0; j < TabNumber; j++)
-                      if (j>0)
-                        BufPutString ("   ",0);
-                      else 
-                        BufPutString ("      ",0); /* cychen */
-
-                  i += strlen("PUTTAB");
-
-                } else
-           if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* %IF : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-            {
-              i += strlen("IF");
-              i += Eval_Type_Condition(&(str[i]), ptype);
-            } else
-          if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* %ELSE : Else */
-            {
-              i += strlen("ELSE");
-              i += SkipToEndif(&(str[i]));  /* skip to the corresponding endif */
-            } else
-          if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* %ENDIF : End of If */
-            {
-              i += strlen("ENDIF");
-            } else
-          if (strncmp(&(str[i]),"SUBTYPE", strlen("SUBTYPE"))== 0)     /* %SUBTYPE :  find the next type for (CAST) */
-	    {
-		PTR_TYPE pt;
-                pt = TYPE_BASE(ptype);
-		if(pt) Tool_Unparse_Type(pt);
-		i += strlen("SUBTYPE");
-	     } else
-          if (strncmp(&(str[i]),"BASETYPE", strlen("BASETYPE"))== 0)     /* %BASETYPE : Base Type Name Identifier */
-            {
-	      if (Check_Lang_Fortran_For_File(cur_proj))  /*16.12.11 podd*/
-		BufPutString (ftype_name [type_index (TYPE_CODE (TYPE_BASE (ptype)))],0);
-	      else
-		{
-		  PTR_TYPE pt;
-		  pt = Find_BaseType(ptype);
-		  if (pt)
-		    {
-		      Tool_Unparse_Type(pt);
-		    } else{
-		      /* printf("offeding node type node: %d\n", ptype->id);
-		      Message("basetype not found",0);
-                      */
-		      }
-		}
-              i += strlen("BASETYPE");
-            } else
-
-          if (strncmp(&(str[i]),"FBASETYPE", strlen("FBASETYPE"))== 0)     /* %FBASETYPE : Base Type Name Identifier */
-            {
-		  PTR_TYPE pt;
-		  pt = Find_BaseType2(ptype);
-		  if (pt)
-		    {
-		      Tool_Unparse_Type(pt);
-		    } else{
-		      /* printf("offeding node type node: %d\n", ptype->id);
-		      Message("basetype not found",0);
-                      */
-		      }
-              i += strlen("FBASETYPE");
-            } else
-
-
-          if (strncmp(&(str[i]),"STAR", strlen("STAR"))== 0)    
-            {
-              PTR_TYPE pt;
-              int flg;
-              pt = ptype;
-       /*       while (pt)        */
-                {
-                  if (TYPE_CODE(pt) == T_POINTER){
-                    BufPutString ("*",0); 
-		    flg = pt->entry.Template.dummy5;  
-		    if(flg & BIT_RESTRICT) BufPutString(" restrict ",0);
-		    if(flg & BIT_CONST) BufPutString(" const ",0);
-		    if(flg & BIT_GLOBL) BufPutString(" global ",0);
-		    if(flg & BIT_SYNC) BufPutString(" Sync ",0);
-		    if(flg & BIT_VOLATILE) BufPutString(" volatile ",0);
-		    }
-                  else
-                  if (TYPE_CODE(pt) == T_REFERENCE){
-                    BufPutString ("&",0);
-		    flg = pt->entry.Template.dummy5;  
-		    if(flg & BIT_RESTRICT) BufPutString(" restrict ",0);
-		    if(flg & BIT_CONST) BufPutString(" const ",0);
-		    if(flg & BIT_GLOBL) BufPutString(" global ",0);
-		    if(flg & BIT_SYNC) BufPutString(" Sync ",0);
-		    if(flg & BIT_VOLATILE) BufPutString(" volatile ",0);
-		    }
- /*                 else
-                    break;
-                  if(TYPE_CODE(pt) == T_MEMBER_POINTER)
-                          pt = TYPE_COLL_BASE(pt);
-                  else pt = TYPE_BASE(pt);           */
-                } 
-              i += strlen("STAR");
-            } else
-          if (strncmp(&(str[i]),"RANGES", strlen("RANGES"))== 0)         /* %RANGES : Ranges */
-            {
-              Tool_Unparse2_LLnode (TYPE_RANGES (ptype));
-	      if(TYPE_KIND_LEN(ptype)){
-	        BufPutString("(",0);
-	        Tool_Unparse2_LLnode (TYPE_KIND_LEN(ptype));
-		BufPutString(")",0);
-	      }
-              i += strlen("RANGES");
-            } else
-          if (strncmp(&(str[i]),"NAMEID", strlen("NAMEID"))== 0)         /* %NAMEID : Name Identifier */
-            {
-	      if (ptype->name)
-		BufPutString ( ptype->name->ident,0);
-	      else
-		{
-		  BufPutString ("-------TYPE ERROR (NAMEID)------",0);
-		}
-              i += strlen("NAMEID");
-            } else
-	 if (strncmp(&(str[i]),"SYMBID", strlen("SYMBID"))== 0)         /* %NAMEID : Name Identifier */
-		{
-		  if (TYPE_SYMB_DERIVE(ptype)){
-		    PTR_SYMB cname;
-		    cname = TYPE_SYMB_DERIVE(ptype);
-                    if(TYPE_CODE(ptype) == T_DERIVED_TYPE){
-			if((SYMB_CODE(cname) == STRUCT_NAME) && (SYMB_TYPE(cname) == NULL) 
-                           &&(BIF_CODE(SYMB_SCOPE(cname)) == GLOBAL))
-				BufPutString("struct ", 0);
-                        if((SYMB_CODE(cname) == CLASS_NAME) && (SYMB_TYPE(cname) == NULL) 
-                           &&(BIF_CODE(SYMB_SCOPE(cname)) == GLOBAL))
-				BufPutString("class ", 0);
-                        if((SYMB_CODE(cname) == UNION_NAME) && (SYMB_TYPE(cname) == NULL) 
-                           &&(BIF_CODE(SYMB_SCOPE(cname)) == GLOBAL))
-				BufPutString("union ", 0);
-			}
-                     if(TYPE_SCOPE_SYMB_DERIVE(ptype) && TYPE_CODE(ptype) != T_DERIVED_TEMPLATE && TYPE_CODE(ptype) != T_DERIVED_COLLECTION) {
-                         Tool_Unparse_Symbol(TYPE_SCOPE_SYMB_DERIVE(ptype));
-                         BufPutString("::",0);
-                         }
-		    Tool_Unparse_Symbol(cname);
-		    }
-                  else if(TYPE_CODE(ptype) == T_MEMBER_POINTER)
-                    Tool_Unparse_Symbol(TYPE_COLL_NAME(ptype));
-		  else
-		    {
-                      printf("node = %d, variant = %d\n",TYPE_ID(ptype), TYPE_CODE(ptype));
-		      BufPutString ("-------TYPE ERROR (ISYMBD)------",0);
-		    }
-		  i += strlen("SYMBID");
-		} else
-          if (strncmp(&(str[i]),"RANGLL1", strlen("RANGLL1"))== 0)       /* %RANGLL1 : Low Level Node 1 of Ranges */
-            {
-              if (TYPE_RANGES (ptype))
-                Tool_Unparse2_LLnode (NODE_TEMPLATE_LL1 (TYPE_RANGES (ptype)));
-              i += strlen("RANGLL1");
-            } else
-          if (strncmp(&(str[i]),"COLLBASE", strlen("COLLBASE"))== 0)       /* %COLL BASE */
-            {
-              if (TYPE_COLL_BASE(ptype))
-		Tool_Unparse_Type(TYPE_COLL_BASE(ptype));
-              i += strlen("COLLBASE");
-            }  else
-          if (strncmp(&(str[i]),"TMPLARGS", strlen("TMPLARGS"))== 0)       /* %RANGLL1 : Low Level Node 1 of Ranges */
-            {
-              if (TYPE_TEMPL_ARGS(ptype))
-		Tool_Unparse2_LLnode(TYPE_TEMPL_ARGS(ptype));
-              i += strlen("TMPLARGS");
-            }  else
-          Message  (" *** Unknown type node COMMAND *** ",0);
-        }
-
-       else
-         {
-           BufPutChar (c);
-           i++;
-         }
-      c = str[i];
-    }
-  return  Buf_address;
-}
-
-
-char *
-Tool_Unparse2_LLnode(ll)
-     PTR_LLND ll;
-{
-  int variant;
-  int kind;
-  char *str;
-  char c;
-  int i;
-  
-  if (!ll)
-    return NULL;
-  
-  variant = NODE_CODE (ll);
-  kind = (int) node_code_kind[(int) variant];
-  if (kind != (int)LLNODE)
-    {
-      Message("Error in Unparse, not a llnd node",0);
-      BufPutInt(variant);
-      BufPutString ("------ERROR--------",0);
-      return NULL;
-    }
-  
-  str = Unparse_Def[variant].str;
-  
-  /* now we have to interpret the code to unparse it */
-  
-  if (str == NULL)
-    return NULL;
-  if (strcmp( str, "n") == 0)
-    return NULL;
-
-  i = 0 ;
-  c = str[i];
-  while (c != '\0')
-    {
-      if (c == '%')
-        {
-          i++;
-          c = str[i];
-          /******** WE HAVE TO INTERPRET THE COMMAND *********/
-          if (c  == '%')                                                 /* %% : Percent Sign */
-            {
-              BufPutString ("%",0);
-              i++;
-            } else
-          if (strncmp(&(str[i]),"ERROR", strlen("ERROR"))== 0)           /* %ERROR : Generate error message */
-            {
-              Message ("--- unparsing error[0] : ",0);
-	      BufPutInt(variant);
-              BufPutString ("------ERROR--------",0);
-              i += strlen("ERROR");
-            } else
-          if (strncmp(&(str[i]),"NL", strlen("NL"))== 0)                 /* %NL : NewLine */
-            {
-	      /*  int j;*/ /* podd 15.03.99*/
-              BufPutChar ('\n');
-/*              for (j = 0; j < TabNumber; j++)
-                if (j>1)
-                  BufPutString ("   ",0);
-                else
-                  BufPutString ("       ",0);*/
-               i += strlen("NL");
-            } else
-          if (strncmp(&(str[i]),"TAB", strlen("TAB"))== 0)               /* %TAB : Tab */
-            {
-              BufPutString ("      ",0); /* cychen */
-              i += strlen("TAB");
-            } else
-          if (strncmp(&(str[i]),"DELETE_COMMA", strlen("DELETE_COMMA"))== 0)               /* %DELETE_COMMA : , */
-            {
-	      if (Buf_address[Buf_pointer-1]==',') 
-			{
-			  Buf_address[Buf_pointer-1]=' ';
-			  Buf_pointer--;	
-			}
-			  i += strlen("DELETE_COMMA");
-            } else
-          if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* %IF : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-            {
-              i += strlen("IF");
-              i += Eval_LLND_Condition(&(str[i]), ll);
-            } else
-          if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* %ELSE : Else */
-            {
-              i += strlen("ELSE");
-              i += SkipToEndif(&(str[i]));  /* skip to the corresponding endif */
-            } else
-          if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* %ENDIF : End of If */
-            {
-              i += strlen("ENDIF");
-            } else
-          if (strncmp(&(str[i]),"LL1", strlen("LL1"))== 0)               /* %LL1 : Low Level Node 1 */
-            {
-              Tool_Unparse2_LLnode(NODE_TEMPLATE_LL1(ll));
-              i += strlen("LL1");
-            } else
-          if (strncmp(&(str[i]),"LL2", strlen("LL2"))== 0)               /* %LL2 : Low Level Node 2 */
-            {
-              Tool_Unparse2_LLnode(NODE_TEMPLATE_LL2(ll));
-              i += strlen("LL2");
-            } else
-          if (strncmp(&(str[i]),"SYMBID", strlen("SYMBID"))== 0)         /* %SYMBID : Symbol identifier */
-            {
-              Tool_Unparse_Symbol (NODE_SYMB (ll));
-              i += strlen("SYMBID");
-            } else
-          if (strncmp(&(str[i]),"DOPROC", strlen("DOPROC"))== 0)             /* for subclass qualification */
-            { int flg;
-              if(NODE_TYPE(ll) && (NODE_CODE(NODE_TYPE(ll)) == T_DESCRIPT)){
-		flg = (NODE_TYPE(ll))->entry.Template.dummy5;
-		if(flg & BIT_VIRTUAL) BufPutString(" virtual ",0);
-		if(flg & BIT_ATOMIC) BufPutString(" atomic ",0);
-		if(flg & BIT_PRIVATE) BufPutString(" private ",0);
-		if(flg & BIT_PROTECTED) BufPutString(" protected ",0);
-		if(flg & BIT_PUBLIC) BufPutString(" public ",0);
-		}
-	       else BufPutString(" public ", 0);
-		/* note: this last else condition is to fix a bug in
-		   the dep2C++ which does not create the right types
-		   when converting a collection to a class.
-                */
-              i += strlen("DOPROC");
-            } else
-          if (strncmp(&(str[i]),"TYPE", strlen("TYPE"))== 0)             /* %TYPE : Type */
-            { 
-              if(NODE_SYMB(ll) &&  (SYMB_ATTR(NODE_SYMB(ll)) & OVOPERATOR)){
-		  /* this is an overloaded operator.  don't do type */
-		}
-              else{ Tool_Unparse_Type (NODE_TYPE (ll)); }
-              i += strlen("TYPE");
-            } else
-          if (strncmp(&(str[i]),"L1SYMBCST", strlen("L1SYMBCST"))== 0)   /* %L1SYMBCST  : Constant Value of Low Level Node Symbol */
-            {
-              if (NODE_TEMPLATE_LL1 (ll) && NODE_SYMB (NODE_TEMPLATE_LL1 (ll)))
-                {
-                   Tool_Unparse2_LLnode((NODE_SYMB (NODE_TEMPLATE_LL1 (ll)))->entry.const_value);
-                }
-              i += strlen("L1SYMBCST");
-            } else
-          if (strncmp(&(str[i]),"INTKIND", strlen("INTKIND"))== 0)         /* %INTKIND : Integer Value */
-            { PTR_LLND kind;
-              if (NODE_INT_CST_LOW (ll) < 0)
-                 BufPutString ("(",0);
-              BufPutInt (NODE_INT_CST_LOW (ll));
-	      if( ( kind=TYPE_KIND_LEN(NODE_TYPE(ll)) ) ) {
-                 BufPutString ("_",0);
-                 Tool_Unparse2_LLnode(kind);
-              }
-              if (NODE_INT_CST_LOW (ll) < 0)
-                    BufPutString (")",0);
-                  
-              i += strlen("INTKIND");
-            } else
-          if (strncmp(&(str[i]),"STATENO", strlen("STATENO"))== 0)       /* %STATENO : Statement number */
-            {
-              if (NODE_LABEL (ll))
-                {
-                  BufPutInt ( LABEL_STMTNO (NODE_LABEL (ll)));
-                }
-              i += strlen("STATENO");
-            } else
-          if (strncmp(&(str[i]),"LABELNAME", strlen("LABELNAME"))== 0)       /* %LABELNAME : Statement label *//*podd 06.01.13*/
-            {
-              if (NODE_LABEL (ll))
-                {
-                  BufPutString ( SYMB_IDENT(LABEL_SYMB (NODE_LABEL (ll))),0); 
-                }
-              i += strlen("LABELNAME");
-            } else
-          if (strncmp(&(str[i]),"KIND", strlen("KIND"))== 0)         /* %KIND : KIND parameter */
-            { PTR_LLND kind;
-	    if( ( kind=TYPE_KIND_LEN(NODE_TYPE(ll)) ) ) {
-                 BufPutString ("_",0);
-                 Tool_Unparse2_LLnode(kind);
-            }
-              i += strlen("KIND");
-            } else
-          if (strncmp(&(str[i]),"STRKIND", strlen("STRKIND"))== 0)         /* %STRKIND : KIND parameter of String Value */
-            { PTR_LLND kind;
-	    if( ( kind=TYPE_KIND_LEN(NODE_TYPE(ll)) ) ) {
-                 Tool_Unparse2_LLnode(kind);
-                 BufPutString ("_",0);
-            }
-              i += strlen("STRKIND");
-            } else
-          if (strncmp(&(str[i]),"SYMQUOTE", strlen("SYMQUOTE"))== 0)         /* %SYMQUOTE : first Symbol of String Value:" or ' */
-            { 
-	    if( ( TYPE_QUOTE(NODE_TYPE(ll)) == 2 ) ) {
-                 BufPutChar ('\"');
-            } else
-                 BufPutChar ('\'');
-              i += strlen("SYMQUOTE");
-
-            } else
-          if (strncmp(&(str[i]),"STRVAL", strlen("STRVAL"))== 0)         /* %STRVAL : String Value */
-            {
-              BufPutString (NODE_STR (ll),0);
-              i += strlen("STRVAL");
-            } else
-          if (strncmp(&(str[i]),"STMTSTR", strlen("STMTSTR"))== 0)  /* %STMTSTR : String Value */
-            {
-              BufPutString (unparse_stmt_str(NODE_STR (ll)),0);
-              i += strlen("STMTSTR");
-            } else
-
-          if (strncmp(&(str[i]),"BOOLVAL", strlen("BOOLVAL"))== 0)       /* %BOOLVAL : String Value */
-            {
-              BufPutString (NODE_BV (ll) ? ".TRUE." : ".FALSE.",0);
-              i += strlen("BOOLVAL");
-            } else
-          if (strncmp(&(str[i]),"CHARVAL", strlen("CHARVAL"))== 0)       /* %CHARVAL : Char Value */
-            {
-	      switch(NODE_CV(ll)){
-    		     case '\n':BufPutChar('\\'); BufPutChar('n'); break;
-    		     case '\t':BufPutChar('\\'); BufPutChar('t'); break;
-    		     case '\r':BufPutChar('\\'); BufPutChar('r'); break;
-		     case '\f':BufPutChar('\\'); BufPutChar('f'); break;
-    		     case '\b':BufPutChar('\\'); BufPutChar('b'); break;
-    		     case '\a':BufPutChar('\\'); BufPutChar('a'); break;
-    		     case '\v':BufPutChar('\\'); BufPutChar('v'); break;
-		    default:
-              		BufPutChar (NODE_CV (ll));
-		    }
-              i += strlen("CHARVAL");
-            } else
-          if (strncmp(&(str[i]),"ORBCPL1", strlen("ORBCPL1"))== 0)         /* %ORBCPL1 : Openning Round Brackets on Precedence of Low Level Node 1 for C++*/
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-              if (C_op (llvar) && (precedence_C [variant - EQ_OP] < precedence_C [llvar - EQ_OP])) 
-                BufPutString ("(",0);
-              i += strlen("ORBCPL1");
-            } else
-          if (strncmp(&(str[i]),"CRBCPL1", strlen("CRBCPL1"))== 0)         /* %CRBCPL1 : Closing Round Brackets on Precedence of Low Level Node 1 for C++ */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-              if (C_op (llvar) && (precedence_C [variant - EQ_OP] < precedence_C [llvar - EQ_OP]))
-                BufPutString (")",0);
-              i += strlen("CRBCPL1");
-            } else
-          if (strncmp(&(str[i]),"ORBCPL2", strlen("ORBCPL2"))== 0)         /* %ORBCPL2 : Openning Round Brackets on Precedence of Low Level Node 2 for C++ */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-              if (C_op (llvar) && (precedence_C [variant - EQ_OP] <= precedence_C [llvar - EQ_OP]))
-                BufPutString ("(",0);
-              i += strlen("ORBCPL2");
-            } else
-          if (strncmp(&(str[i]),"CRBCPL2", strlen("CRBCPL2"))== 0)         /* %CRBCPL2 : Closing Round Brackets on Precedence of Low Level Node 2 for C++ */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-              if (C_op (llvar) && (precedence_C [variant - EQ_OP] <= precedence_C [llvar - EQ_OP]))             
-                BufPutString (")",0);
-              i += strlen("CRBCPL2");
-            } else
-          if (strncmp(&(str[i]),"ORBPL1EXP", strlen("ORBPL1EXP"))== 0)         /* %ORBPL1 : Openning Round Brackets on Precedence of Low Level Node 1 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] <= precedence [llvar - EQ_OP]))
-                BufPutString ("(",0);
-              i += strlen("ORBPL1EXP");
-            } else
-          if (strncmp(&(str[i]),"CRBPL1EXP", strlen("CRBPL1EXP"))== 0)         /* %CRBPL1 : Closing Round Brackets on Precedence of Low Level Node 1 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] <= precedence [llvar - EQ_OP]))
-                BufPutString (")",0);
-              i += strlen("CRBPL1EXP");
-            } else
-          if (strncmp(&(str[i]),"ORBPL2EXP", strlen("ORBPL2EXP"))== 0)         /* %ORBPL2 : Openning Round Brackets on Precedence of Low Level Node 2 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] < precedence [llvar - EQ_OP]))
-                BufPutString ("(",0);
-              i += strlen("ORBPL2EXP");
-            } else
-          if (strncmp(&(str[i]),"CRBPL2EXP", strlen("CRBPL2EXP"))== 0)         /* %CRBPL2 : Closing Round Brackets on Precedence of Low Level Node 2 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] < precedence [llvar - EQ_OP]))
-                BufPutString (")",0);
-              i += strlen("CRBPL2EXP");
-            } else        
-        
-          if (strncmp(&(str[i]),"ORBPL1", strlen("ORBPL1"))== 0)         /* %ORBPL1 : Openning Round Brackets on Precedence of Low Level Node 1 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] < precedence [llvar - EQ_OP]))
-                BufPutString ("(",0);
-              i += strlen("ORBPL1");
-            } else
-          if (strncmp(&(str[i]),"CRBPL1", strlen("CRBPL1"))== 0)         /* %CRBPL1 : Closing Round Brackets on Precedence of Low Level Node 1 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] < precedence [llvar - EQ_OP]))
-                BufPutString (")",0);
-              i += strlen("CRBPL1");
-            } else
-          if (strncmp(&(str[i]),"ORBPL2", strlen("ORBPL2"))== 0)         /* %ORBPL2 : Openning Round Brackets on Precedence of Low Level Node 2 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] <= precedence [llvar - EQ_OP]))
-                BufPutString ("(",0);
-              i += strlen("ORBPL2");
-            } else
-          if (strncmp(&(str[i]),"CRBPL2", strlen("CRBPL2"))== 0)         /* %CRBPL2 : Closing Round Brackets on Precedence of Low Level Node 2 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] <= precedence [llvar - EQ_OP]))
-                BufPutString (")",0);
-              i += strlen("CRBPL2");
-            } else
-	 if (strncmp(&(str[i]),"SETFLAG", strlen("SETFLAG"))== 0)
-	   {               
-		i = i + strlen("SETFLAG");
-		Treat_Flag(str, &i,1);
-	   } else
-	 if (strncmp(&(str[i]),"UNSETFLAG", strlen("UNSETFLAG"))== 0) 
-	   {               
-		i = i + strlen("UNSETFLAG");
-		Treat_Flag(str, &i,-1);
-	   } else
-         if (strncmp(&(str[i]),"PUSHFLAG", strlen("PUSHFLAG"))== 0)
-           {               
-                i = i + strlen("PUSHFLAG");
-                PushPop_Flag(str, &i,1);
-           } else
-         if (strncmp(&(str[i]),"POPFLAG", strlen("POPFLAG"))== 0) 
-            {               
-                i = i + strlen("POPFLAG");
-                PushPop_Flag(str, &i,-1);
-            } else
-         if (strncmp(&(str[i]),"PURE", strlen("PURE"))== 0) /* for pure function declarations */
-	{
-	   PTR_SYMB symb;
-	   symb = NODE_SYMB(ll);
-	   if(symb && (SYMB_TEMPLATE_DUMMY8(symb) &  128)) BufPutString ("= 0",0);
-           i += strlen("PURE");
-           }
-          else
-          if (strncmp(&(str[i]),"CNSTF", strlen("CNSTF"))== 0)    /* for const functions */
-           {
-              PTR_SYMB symb;
-              if (NODE_SYMB (ll)){
-                symb = BIF_SYMB (ll);
-		if(SYMB_TEMPLATE_DUMMY8(symb) & 64) BufPutString(" const",0); 
-		}
-	      i += strlen("CNSTF");
-             } else        
-         if (strncmp(&(str[i]),"CNSTCHK", strlen("CNSTCHK"))== 0) /* do "const", vol" after * */
-	{
-	   int flg;
-           PTR_TYPE t;
-           if((t = NODE_TYPE(ll)) &&( (NODE_CODE(t) == T_POINTER) ||
-		(NODE_CODE(t) == T_REFERENCE))){
-		flg = t->entry.Template.dummy5;  
-		    if(flg & BIT_RESTRICT) BufPutString(" restrict ",0);
-		    if(flg & BIT_CONST) BufPutString(" const ",0);
-		    if(flg & BIT_GLOBL) BufPutString(" global ",0);
-		    if(flg & BIT_SYNC) BufPutString(" Sync ",0);
-		if(flg & BIT_VOLATILE) BufPutString(" volatile ",0);
-		}
-           i += strlen("CNSTCHK");
-           }
-          else
-         if (strncmp(&(str[i]),"VARLISTTY", strlen("VARLISTTY"))== 0)  /* %VARLIST : list of variables / parameters */
-            {
-              PTR_SYMB symb, s;
-	      PTR_LLND args, arg_item = NULL, t;
-	      PTR_TYPE typ;
-              int new_op_flag; /* 1 if this is a new op */
-              new_op_flag = 0;
-              if(NODE_CODE(ll) == CAST_OP ){
-			args = NODE_OPERAND1(ll);
-			new_op_flag = 1;
-                        }
-	      else if(NODE_CODE(ll) != FUNCTION_OP){ 
-			args = NODE_OPERAND0(ll);
-			/* symb = SYMB_FUNC_PARAM(NODE_SYMB(ll)); */
-		  	}
-              else {  /* this is a pointer to a function parameter */
-			args = NODE_OPERAND1(ll);
-			t = NODE_OPERAND0(ll); /* node_code(t) == deref_op */
-			t = NODE_OPERAND0(t);  /* node_code(t) == var_ref */
-			s = NODE_SYMB(t);
-			if(s) symb = SYMB_NEXT(s);
-			else symb = NULL;
-		}	
-              while (args )
-                      { 
-                        int typflag;
-			if(new_op_flag) t = args;
-			else{
-				arg_item = NODE_OPERAND0(args);
-				t = arg_item;
-                        	typflag = 1;
-				while(t && typflag){
-                           		if((NODE_CODE(t) == VAR_REF) || (NODE_CODE(t) == ARRAY_REF))
-                                    		typflag = 0;
-                           	else if (NODE_CODE(t) == SCOPE_OP) t = NODE_OPERAND1(t);
-                           	else  t = NODE_OPERAND0(t);
-                           } 
-			  }
- 			if(t){
-			      symb = NODE_SYMB(t); 
-			      typ = NODE_TYPE(t);
-			      if(symb && (typ == NULL)) typ = SYMB_TYPE(symb);
-			      if(new_op_flag || symb  ) {
-                                 typflag = 1;
-			         while(typ && typflag){
-                                          if(TYPE_CODE(typ) == T_ARRAY || 
-				             TYPE_CODE(typ) == T_FUNCTION ||
-			                     TYPE_CODE(typ) == T_REFERENCE ||
-				             TYPE_CODE(typ) == T_POINTER) typ = TYPE_BASE(typ);
-				          else 	if(TYPE_CODE(typ) == T_MEMBER_POINTER)
-                                                      typ = TYPE_COLL_BASE(typ);
-					  else typflag = 0;
-				          } 
-                                   }
-                              if(typ) Tool_Unparse_Type (typ);
-                              BufPutString (" ",0);
-			   }
-			else printf("unp could not find var ref!\n");
-			if(new_op_flag){
-			        Tool_Unparse2_LLnode(args);
-				args = LLNULL;
-				new_op_flag = 0;
-				}
-			else{
-			     Tool_Unparse2_LLnode(arg_item);
-			     args = NODE_OPERAND1(args);
-			    }
-                        if (args) BufPutString (", ",0);
-                      }
-              i += strlen("VARLISTTY");
-            } 
-	      else 
-	   if (strncmp(&(str[i]),"VARLIST", strlen("VARLIST"))== 0)    /* %VARLIST : list of variables / parameters */
-		  {
-		    PTR_SYMB symb;
-		    if (NODE_SYMB (ll))
-		      symb = SYMB_FUNC_PARAM (NODE_SYMB (ll));
-		    else
-		      symb = NULL;
-		    while (symb)
-		      {
-			BufPutString ( SYMB_IDENT (symb),0);
-			symb = SYMB_NEXT_DECL (symb);
-			if (symb) BufPutString (", ",0);
-		      }
-		    i += strlen("VARLIST");
-		  } else
-    	    if (strncmp(&(str[i]),"STRINGLEN", strlen("STRINGLEN"))== 0)
-		      {
-			PTR_SYMB symb;
-			PTR_TYPE type;
-			if (NODE_SYMB (ll))
-			  symb = NODE_SYMB (ll);
-			else
-			  symb = NULL;
-			if (symb)
-			  {
-			    type = SYMB_TYPE(symb);
-			    if (type && (TYPE_CODE(type) == T_ARRAY))
-			      {
-				type = Find_BaseType(type);
-			      }
-			    if (type && (TYPE_CODE(type) == T_STRING))
-			      {
-				if (TYPE_RANGES(type))
-				  Tool_Unparse2_LLnode(TYPE_RANGES(type));
-			      }
-			  }
-			i += strlen("STRINGLEN");
-      
-		 }  else
-			Message  (" *** Unknown low level node COMMAND *** ",0);
-	}
-      else
-	{
-	  BufPutChar ( c);
-	  i++; /* Bodin */
-	}
-      c = str[i];
-    }
-  return Buf_address;
-}
-
-char *Tool_Unparse_Bif(PTR_BFND bif)
-{
-    int variant;
-    int kind;
-    char *str;
-    char c;
-    int i;
-
-    if (!bif)
-        return NULL;
-
-    variant = BIF_CODE(bif);
-#ifdef __SPF
-    if (variant < 0)
-        return NULL;
-#endif
-    kind = (int) node_code_kind[(int) variant];
-    if (kind  != (int)BIFNODE)
-        Message("Error in Unparse, not a bif node", 0);
-    if (BIF_LINE(bif) == -1)
-        BufPutString("!$", 0);
-    //if (BIF_DECL_SPECS(bif) == BIT_OPENMP) BufPutString("!$",0); 
-    str = Unparse_Def[variant].str;
-    /*printf("variant = %d, str = %s\n", variant, str);*/
-    /* now we have to interpret the code to unparse it */
-  
-    if (str == NULL)
-        return NULL;
-    if (strcmp( str, "n") == 0)
-        if (strcmp(str, "n") == 0)
-        {
-            Message("Node not define for unparse", BIF_LINE(bif));
-            return NULL;
-        }
-
-
-  i = 0 ;
-  c = str[i];
-  while ((c != '\0') && (c != '\n'))
-    {
-      if (c == '%')
-        {
-          i++;
-          c = str[i];
-          /******** WE HAVE TO INTERPRET THE COMMAND *********/
-          if (c  == '%')                                                 /* %% : Percent Sign */
-            {
-              BufPutString ("%",0);
-              i++;
-            } else
-          if (strncmp(&(str[i]),"CMNT", strlen("CMNT"))== 0)
-            {               
-              i = i + strlen("CMNT");
-              if (!CommentOut)
-              {
-                  /* print the attached comment first */
-                  if (BIF_CMNT(bif))
-                  {
-                      /*  int j;*/ /* podd 15.03.99*/
-                      if (CMNT_STRING(BIF_CMNT(bif)))
-                      {
-                          BufPutChar('\n');
-                          BufPutString(CMNT_STRING(BIF_CMNT(bif)), 0);
-                          if (!Check_Lang_Fortran_For_File(cur_proj)) /*16.12.11 podd*/
-                              BufPutChar('\n');
-                      }
-                  }
-              }
-            } else
-          if (strncmp(&(str[i]),"DECLSPEC", strlen("DECLSPEC"))== 0)             /* %DECLSPEC : for extern, static, inline, friend */
-            {
-              int index = BIF_DECL_SPECS(bif);
-              i = i + strlen("DECLSPEC");
-              if( index & BIT_EXTERN) {
-		 BufPutString(ridpointers[(int)RID_EXTERN],0);
-		 BufPutString(" ", 0);
-		 }
-              if( index & BIT_STATIC) {
-		 BufPutString(ridpointers[(int)RID_STATIC],0);
-		 BufPutString(" ", 0);
-		 }
-              if( index & BIT_INLINE) {
-	         BufPutString(ridpointers[(int)RID_INLINE],0);
-		 BufPutString(" ", 0);
-		 }
-              if( index & BIT_FRIEND) {
-		 BufPutString(ridpointers[(int)RID_FRIEND],0);
-		 BufPutString(" ", 0);
-		 }
-              if( index & BIT_CUDA_GLOBAL) {
-		 BufPutString(ridpointers[(int)RID_CUDA_GLOBAL],0);
-		 BufPutString(" ", 0);
-		 }
-              if( index & BIT_CUDA_SHARED) {
-		 BufPutString(ridpointers[(int)RID_CUDA_SHARED],0);
-		 BufPutString(" ", 0);
-		 }
-              if( index & BIT_CUDA_DEVICE) {
-		 BufPutString(ridpointers[(int)RID_CUDA_DEVICE],0);
-		 BufPutString(" ", 0);
-                 }
-              if (index & BIT_CONST) {
-                 BufPutString(ridpointers[(int)RID_CONST], 0);
-                 BufPutString(" ", 0);
-                 }
-            } else
-          if (strncmp(&(str[i]),"SETFLAG", strlen("SETFLAG"))== 0)
-            {               
-              i = i + strlen("SETFLAG");
-              Treat_Flag(str, &i,1);
-            } else
-          if (strncmp(&(str[i]),"UNSETFLAG", strlen("UNSETFLAG"))== 0) 
-            {               
-              i = i + strlen("UNSETFLAG");
-              Treat_Flag(str, &i,-1);
-            } else
-          if (strncmp(&(str[i]),"PUSHFLAG", strlen("PUSHFLAG"))== 0)
-                        {               
-                          i = i + strlen("PUSHFLAG");
-                          PushPop_Flag(str, &i,1);
-                        } else
-                          if (strncmp(&(str[i]),"POPFLAG", strlen("POPFLAG"))== 0) 
-                            {               
-                              i = i + strlen("POPFLAG");
-                              PushPop_Flag(str, &i,-1);
-                            } else
-          if (strncmp(&(str[i]),"ERROR", strlen("ERROR"))== 0)           /* %ERROR : Generate error message */
-            {
-              Message("--- stmt unparsing error[1] : ",0);
-              i += strlen("ERROR");
-              BufPutString (" *** UNPARSING ERROR OCCURRED HERE ***\n",0);
-            } else
-          if (strncmp(&(str[i]),"NL", strlen("NL"))== 0)                 /* %NL : NewLine */
-            { /*int j; */ /* podd 15.03.99*/             
-              BufPutChar ('\n');
-/*              for (j = 0; j < TabNumber; j++)
-                if (j>1)
-                  BufPutString ("   ",0);
-                else
-                  BufPutString ("       ",0);*/
-              i += strlen("NL");
-            } else
-          if (strncmp(&(str[i]),"NOTABNL", strlen("NOTABNL"))== 0)                 /* %NL : NewLine */
-            {
-              BufPutChar ('\n');
-              i += strlen("NOTABNL");
-            } else
-          if (strncmp(&(str[i]),"TABOFF", strlen("TABOFF"))== 0)               /* turn off tabulation */
-            {
-              TabNumberCopy = TabNumber;
-              TabNumber = 0;              
-              i += strlen("TABOFF");
-            }  else
-          if (strncmp(&(str[i]),"TABON", strlen("TABON"))== 0)                 /* turn on tabulation */
-            {
-              TabNumber  = TabNumberCopy;              
-              i += strlen("TABON");
-            }  else
-          if (strncmp(&(str[i]),"TAB", strlen("TAB"))== 0)               /* %TAB : Tab */
-                {
-              BufPutString ("      ",0); /* cychen */
-              i += strlen("TAB");
-            } else
-          if (strncmp(&(str[i]),"PUTTABCOMT", strlen("PUTTABCOMT"))== 0)               /* %TAB : Tab */
-            {
-                  int j, k;
-                  if (Check_Lang_Fortran_For_File(cur_proj)) /*16.12.11 podd*/
-                    for (j = 0; j < TabNumber; j++)
-                      if (j>0)
-                        BufPutString ("   ",0);
-                      else {
-                        for (k=0; k<6; k++) {
-                          if (HasLabel == 0)
-                            BufPutString (" ",0); /* cychen */
-                          HasLabel = HasLabel/10;
-                        };
-		  Buf_pointer-=5;
-                      }
-                  else
-                    for (j = 0; j < TabNumber; j++)
-                      if (j>0)
-                        BufPutString ("   ",0);
-                      else
-                        BufPutString ("      ",0); /* cychen */
-
-                  i += strlen("PUTTABCOMT");
-            } else
-          if (strncmp(&(str[i]),"PUTTAB", strlen("PUTTAB"))== 0)               /* %TAB : Tab */
-            {
-                  int j, k;
- 
-                  if (Check_Lang_Fortran_For_File(cur_proj)) /*16.12.11 podd*/
-                    for (j = 0; j < TabNumber; j++)
-                      if (j>0)
-                        BufPutString ("   ",0);
-                      else {
-                        for (k=0; k<6; k++) {
-                          if (HasLabel == 0)
-                            BufPutString (" ",0); /* cychen */
-                          HasLabel = HasLabel/10;
-                        };
-                      }
-                  else
-                    for (j = 0; j < TabNumber; j++)
-                      if (j>0)
-                        BufPutString ("   ",0);
-                      else
-                        BufPutString ("      ",0); /* cychen */
-
-                  i += strlen("PUTTAB");
-
-            } else
-          if (strncmp(&(str[i]),"INCTAB", strlen("INCTAB"))== 0)               /* increment tab */
-            {
-              TabNumber++;              
-              i += strlen("INCTAB");
-            }  else
-          if (strncmp(&(str[i]),"DECTAB", strlen("DECTAB"))== 0)               /*deccrement tab */
-            {
-	      if (Check_Lang_Fortran_For_File(cur_proj)) /*16.12.11 podd*/
-		{
-		  if (TabNumber>1)
-		    TabNumber--;              
-		} else
-		  TabNumber--; 
-              i += strlen("DECTAB");
-            }  else
-          if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* %IF : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-            {
-              i += strlen("IF");
-              i += Eval_Bif_Condition(&(str[i]), bif);
-            } else
-          if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* %ELSE : Else */
-            {
-              i += strlen("ELSE");
-              i += SkipToEndif(&(str[i]));  /* skip to the corresponding endif */
-            } else
-          if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* %ENDIF : End of If */
-            {
-              i += strlen("ENDIF");
-            } else
-          if (strncmp(&(str[i]),"BLOB1", strlen("BLOB1"))== 0)           /* %BLOB1 : All Blob 1 */
-            {
-              PTR_BLOB blob;
-
-              for (blob = BIF_BLOB1(bif);blob; blob = BLOB_NEXT (blob))
-                {
-                  Tool_Unparse_Bif(BLOB_VALUE(blob));
-                }
-              i += strlen("BLOB1");
-            } else
-          if (strncmp(&(str[i]),"BLOB2", strlen("BLOB2"))== 0)           /* %BLOB2 : All Blob 2 */
-            {
-              PTR_BLOB blob;
-
-              for (blob = BIF_BLOB2(bif);blob; blob = BLOB_NEXT (blob))
-                {
-                  Tool_Unparse_Bif(BLOB_VALUE(blob));
-                }
-              i += strlen("BLOB2");
-            } else
-          if (strncmp(&(str[i]),"LL1", strlen("LL1"))== 0)               /* %LL1 : Low Level Node 1 */
-            {
-              Tool_Unparse2_LLnode(BIF_LL1(bif));
-              i += strlen("LL1");
-            } else
-          if (strncmp(&(str[i]),"LL2", strlen("LL2"))== 0)               /* %LL2 : Low Level Node 2 */
-            {
-              Tool_Unparse2_LLnode (BIF_LL2 (bif));
-              i += strlen("LL2");
-            } else
-          if (strncmp(&(str[i]),"LL3", strlen("LL3"))== 0)               /* %LL3 : Low Level Node 3 */
-            {
-              Tool_Unparse2_LLnode(BIF_LL3(bif));
-              i += strlen("LL3");
-            } else
-          if (strncmp(&(str[i]),"L2L2", strlen("L2L2"))== 0)          /* %L2L2 : Low Level Node 2 of Low Level Node 2 */
-            {
-              if (BIF_LL2 (bif))
-                Tool_Unparse2_LLnode (NODE_TEMPLATE_LL2 (BIF_LL2 (bif)));
-              i += strlen("L2L2");
-            } else
-          if (strncmp(&(str[i]),"FUNHD", strlen("FUNHD"))== 0)         /* %FUNHD track down a function header */
-	    {
-	       PTR_LLND p;
-               p = BIF_LL1(bif);
-	       while(p && NODE_CODE(p) != FUNCTION_REF) p = NODE_OPERAND0(p);
-	       if(p == NULL) printf("unparse error in FUNHD!!\n");
-	       else Tool_Unparse2_LLnode(p);
-              i += strlen("FUNHD");
-	    } else
-          if (strncmp(&(str[i]),"SYMBIDFUL", strlen("SYMBIDFUL"))== 0)         /* %SYMBID : Symbol identifier */
-            {
-	      if (BIF_SYMB(bif) && SYMB_MEMBER_BASENAME(BIF_SYMB(bif)))
-		{
-		  Tool_Unparse_Symbol(SYMB_MEMBER_BASENAME(BIF_SYMB(bif)));
-		  BufPutString("::",0);
-		}
-              Tool_Unparse_Symbol(BIF_SYMB(bif));
-              i += strlen("SYMBIDFUL");
-            } else
-	  if (strncmp(&(str[i]),"SYMBID", strlen("SYMBID"))== 0)         /* %SYMBID : Symbol identifier */
-            {
-              Tool_Unparse_Symbol(BIF_SYMB(bif));
-              i += strlen("SYMBID");
-            } else
-          if (strncmp(&(str[i]),"SYMBSCOPE", strlen("SYMBSCOPE"))== 0)         /* %SYMBSCOPE : Symbol identifier */
-            {
-	      if (BIF_SYMB(bif) && SYMB_MEMBER_BASENAME(BIF_SYMB(bif)))
-		{ printf("SYMBSCOPE\n");
-		  Tool_Unparse_Symbol(SYMB_MEMBER_BASENAME(BIF_SYMB(bif)));
-		}
-              i += strlen("SYMBSCOPE");
-            } else
-          if (strncmp(&(str[i]),"SYMBDC", strlen("SYMBDC"))== 0)         /* %SYMBSCOPE : Symbol identifier */
-            {
-	      if (BIF_LL3(bif) ||
-                 (BIF_SYMB(bif) && SYMB_MEMBER_BASENAME(BIF_SYMB(bif))))
-		{
-		  BufPutString("::",0);
-		}
-              i += strlen("SYMBDC");
-            } else
-	      
-          if (strncmp(&(str[i]),"STATENO", strlen("STATENO"))== 0)       /* %STATENO : Statement number */
-            {
-              if (BIF_LABEL_USE (bif))
-                {
-                  BufPutInt (LABEL_STMTNO (BIF_LABEL_USE (bif)));
-                }
-              i += strlen("STATENO");
-            } else
-          if (strncmp(&(str[i]),"LABELENDIF", strlen("LABELENDIF"))== 0)       /* %STATENO : Statement number */
-                {
-                  PTR_BFND temp;
-                  PTR_BLOB blob;
-
-                  temp = NULL;
-                  if (!BIF_BLOB2(bif))
-                    blob = BIF_BLOB1(bif);
-                  else
-                     blob = BIF_BLOB2(bif);
-                  for (;blob; blob = BLOB_NEXT (blob))
-                    {
-                      temp = BLOB_VALUE(blob);
-                      if (temp && (BIF_CODE(temp) == CONTROL_END))
-                        {
-                          if (BIF_LABEL(temp))
-                            break;
-                        }
-                      temp = NULL;
-                    }
-                  if (temp && BIF_LABEL(temp))
-                    {
-                      BufPutInt (LABEL_STMTNO (BIF_LABEL(temp)));
-                    }
-              i += strlen("LABELENDIF");
-            } else
-          if (strncmp(&(str[i]),"LABNAME", strlen("LABNAME")) == 0)  /* %LABNAME for C labels: added by dbg */
-            {  
-              if(BIF_LABEL_USE(bif)){
-                if(LABEL_SYMB(BIF_LABEL_USE(bif)))
-			BufPutString (SYMB_IDENT(LABEL_SYMB(BIF_LABEL_USE(bif))), 0);
-                else printf("label-symbol error\n");
-              } else printf("label error\n");
-             i += strlen("LABNAME");
-            } else
-          if (strncmp(&(str[i]),"LABEL", strlen("LABEL"))== 0)       /* %STATENO : Statement number */
-            {
-              if (BIF_LABEL(bif))
-                {
-                  HasLabel = LABEL_STMTNO (BIF_LABEL(bif));
-                  BufPutInt (LABEL_STMTNO (BIF_LABEL(bif)));
-                }
-              i += strlen("LABEL");
-            } else
-          if (strncmp(&(str[i]),"SYMBTYPE", strlen("SYMBTYPE"))== 0)     /* SYMBTYPE : Type of Symbol */
-            {
-              if (BIF_SYMB (bif) && SYMB_TYPE (BIF_SYMB (bif)))
-		{
-		  if (Check_Lang_Fortran_For_File(cur_proj))/*16.12.11 podd*/
-                  BufPutString ( ftype_name [type_index (TYPE_CODE (SYMB_TYPE (BIF_SYMB (bif))))],0);
-		  else if((SYMB_ATTR(BIF_SYMB(bif)) & OVOPERATOR ) == 0){
-			PTR_LLND el;
-                        el = BIF_LL1(bif);
-			if((BIF_CODE(BIF_CP(bif)) == TEMPLATE_FUNDECL) &&
-			    el && NODE_TYPE(el))
-			    Tool_Unparse_Type(NODE_TYPE(el));
-			else
-		           Tool_Unparse_Type(SYMB_TYPE (BIF_SYMB (bif)));
-			}
-		}
-              i += strlen("SYMBTYPE");
-            } else
-          if (strncmp(&(str[i]),"CNSTF", strlen("CNSTF"))== 0)    /* for const functions */
-            {
-              PTR_SYMB symb;
-              if (BIF_SYMB (bif)){
-                symb = BIF_SYMB (bif);
-	        /* if(SYMB_TEMPLATE_DUMMY8(symb) & 64) BufPutString(" const",0); */
-		}
-	      i += strlen("CNSTF");
-             } else        
-          if (strncmp(&(str[i]),"VARLISTTY", strlen("VARLISTTY"))== 0)       /* %VARLIST : list of variables / parameters */
-            {
-              PTR_SYMB symb;
-              if (BIF_SYMB (bif))
-                symb = SYMB_FUNC_PARAM (BIF_SYMB (bif));
-              else
-                symb = NULL;
-              while (symb)
-                {
-		  Tool_Unparse_Type (SYMB_TYPE(symb));
-		  BufPutString (" ",0);
-                  BufPutString ( SYMB_IDENT (symb),0);
-                  symb = SYMB_NEXT_DECL (symb);
-                  if (symb) BufPutString (", ",0);
-                }
-              i += strlen("VARLISTTY");
-            } else
-          if (strncmp(&(str[i]),"TMPLARGS", strlen("TMPLARGS"))== 0)       
-            {
-              PTR_SYMB symb;
-              /* PTR_SYMB s; */ /* podd 15.03.99*/
-	      PTR_LLND args, arg_item, t;
-	      PTR_TYPE typ;
-              if(BIF_CODE(bif) == FUNC_HEDR) args = BIF_LL3(bif);
-              else args = BIF_LL1(bif);
-              while (args )
-                      { 
-                        int typflag;
-			arg_item = NODE_OPERAND0(args);
-			if(arg_item == NULL) printf("MAJOR TEMPLATE UNPARSE ERROR. contact dbg \n");
-			t = arg_item;
-                        typflag = 1;
-			while(t && typflag){
-                           if((NODE_CODE(t) == VAR_REF) || (NODE_CODE(t) == ARRAY_REF))
-                                    typflag = 0;
-                           else if (NODE_CODE(t) == SCOPE_OP) t = NODE_OPERAND1(t);
-                           else  t = NODE_OPERAND0(t);
-                           } 
- 			if(t){
-			      symb = NODE_SYMB(t); 
-			      typ = NODE_TYPE(t);
-			      if(typ == NULL) typ = SYMB_TYPE(symb);
-			      if((int)strlen(symb->ident) > 0){ /* special case for named arguments */
-                                 typflag = 1;
-			         while(typ && typflag){
-                                          if(TYPE_CODE(typ) == T_ARRAY || 
-				             TYPE_CODE(typ) == T_FUNCTION ||
-			                     TYPE_CODE(typ) == T_REFERENCE ||
-				             TYPE_CODE(typ) == T_POINTER) typ = TYPE_BASE(typ);
-				          else 	if(TYPE_CODE(typ) == T_MEMBER_POINTER)
-                                                      typ = TYPE_COLL_BASE(typ);
-					  else typflag = 0;
-				          } 
-                                 }
-			      else BufPutString("class ", 0); 
-                              Tool_Unparse_Type (typ);
-                              BufPutString (" ",0);
-			   }
-			/* else printf("could not find var ref!\n"); */
-                        Tool_Unparse2_LLnode(arg_item);
-			args = NODE_OPERAND1(args);
-                        if (args) BufPutString (", ",0);
-                      }
-              i += strlen("TMPLARGS");
-            } else
-          if (strncmp(&(str[i]),"CONSTRU", strlen("CONSTRU"))== 0)       
-            {
-              /*PTR_SYMB symb;*/ /* podd 15.03.99*/
-              PTR_LLND ll;
-              if (BIF_LL1(bif))
-                {
-                  ll = NODE_OPERAND0(BIF_LL1(bif));
-                  if (ll)
-                    ll = NODE_OPERAND1(ll);
-                  if (ll)
-                    {
-                      BufPutString (":",0);
-                      Tool_Unparse2_LLnode(ll);
-                    }
-                }
-              i += strlen("CONSTRU");
-            } else
-	  if (strncmp(&(str[i]),"L1SYMBID", strlen("L1SYMBID"))== 0)     /* %L1SYMBID : Symbol of Low Level Node 1 */
-            {
-              if (BIF_LL1 (bif))
-                  Tool_Unparse_Symbol (NODE_SYMB (BIF_LL1 (bif)));
-              i += strlen("L1SYMBID");
-            } else
-          if (strncmp(&(str[i]),"VARLIST", strlen("VARLIST"))== 0)       /* %VARLIST : list of variables / parameters */
-            {
-              PTR_SYMB symb;
-              if (BIF_SYMB (bif))
-                symb = SYMB_FUNC_PARAM (BIF_SYMB (bif));
-              else
-                symb = NULL;
-              while (symb)
-                {
-                  BufPutString ( SYMB_IDENT (symb),0);
-                  symb = SYMB_NEXT_DECL (symb);
-                  if (symb) BufPutString (", ",0);
-                }
-              i += strlen("VARLIST");
-            } else
-	  if (strncmp(&(str[i]),"RIDPT", strlen("RIDPT"))== 0)      
-                { 
-		  PTR_TYPE type = NULL;
-
-		  type = Find_Type_For_Bif(bif);
-		  if (type )
-		    {
-			DealWith_Rid(type, In_Class_Flag);
-		    }
-		  else if(BIF_CODE(bif) == CLASS_DECL)
-		    {
-			DealWith_Rid(SYMB_TYPE(BIF_SYMB(bif)), In_Class_Flag);
-		    } 
-                  i += strlen("RIDPT");
-                } else
-          if (strncmp(&(str[i]),"INCLASSON", strlen("INCLASSON"))== 0)   
-            {
-              In_Class_Flag = 1;
-              i += strlen("INCLASSON");
-            } else
-          if (strncmp(&(str[i]),"INCLASSOFF", strlen("INCLASSOFF"))== 0) 
-            {
-              In_Class_Flag = 0;
-              i += strlen("INCLASSOFF");
-            } else
-          if (strncmp(&(str[i]),"INWRITEON", strlen("INWRITEON"))== 0)   /* %INWRITEON : In_Write_Statement Flag ON */
-            {
-              In_Write_Flag = 1;
-              i += strlen("INWRITEON");
-            } else
-          if (strncmp(&(str[i]),"INWRITEOFF", strlen("INWRITEOFF"))== 0) /* %INWRITEOFF : In_Write_Statement Flag OFF */
-            {
-              In_Write_Flag = 0;
-              i += strlen("INWRITEOFF");
-            } else
-          if (strncmp(&(str[i]),"RECPORTON", strlen("RECPORTON"))== 0)   /* %RECPORTON : recursive_port_decl Flag ON */
-            {
-              Rec_Port_Decl = 1;
-              i += strlen("RECPORTON");
-            } else
-          if (strncmp(&(str[i]),"RECPORTOFF", strlen("RECPORTOFF"))== 0) /* %RECPORTOFF : recursive_port_decl Flag OFF */
-            {
-              Rec_Port_Decl = 0;
-              i += strlen("RECPORTOFF");
-            } else
-
-          if (strncmp(&(str[i]),"INPARAMON", strlen("INPARAMON"))== 0)   /* %INPARAMON : In_Param_Statement Flag ON */
-            {
-              In_Param_Flag = 1;
-              i += strlen("INPARAMON");
-            } else
-          if (strncmp(&(str[i]),"INPARAMOFF", strlen("INPARAMOFF"))== 0) /* %INPARAMOFF : In_Param_Statement Flag OFF */
-            {
-              In_Param_Flag = 0;
-              i += strlen("INPARAMOFF");
-            } else
-          if (strncmp(&(str[i]),"INIMPLION", strlen("INIMPLION"))== 0)   /* %INIMPLION : In_Impli_Statement Flag ON */
-            {
-              In_Impli_Flag = 1;
-              i += strlen("INIMPLION");
-            } else
-          if (strncmp(&(str[i]),"INIMPLIOFF", strlen("INIMPLIOFF"))== 0) /* %INIMPLIOFF : In_Impli_Statement Flag OFF */
-            {
-              In_Impli_Flag = 0;
-              i += strlen("INIMPLIOFF");
-
-            } else /*podd 3.02.03*/
-          if (strncmp(&(str[i]),"SAVENAME", strlen("SAVENAME"))== 0) /* save construct name for ELSE and ENDIF */
-            {
-              construct_name = BIF_SYMB(bif);
-              i += strlen("SAVENAME");
-            } else /*podd 3.02.03*/
-          if (strncmp(&(str[i]),"CNTRNAME", strlen("CNTRNAME"))== 0) /* save construct name for ELSE and ENDIF */
-            {
-              Tool_Unparse_Symbol(construct_name);
-              i += strlen("CNTRNAME");
-
-           } else
-    	    if (strncmp(&(str[i]),"TYPEDECLON", strlen("TYPEDECLON"))== 0) /* %TYPEDECLON */
-	   {       if( BIF_LL2(bif) && NODE_TYPE(BIF_LL2(bif)) &&  TYPE_CODE(NODE_TYPE(BIF_LL2(bif))) == T_STRING)
-                     Type_Decl_Ptr = (long) NODE_TYPE(BIF_LL2(bif));
-                   else
-                     Type_Decl_Ptr = 0;
-           i += strlen("TYPEDECLON");
-           } else
-    	    if (strncmp(&(str[i]),"TYPEDECLOF", strlen("TYPEDECLOF"))== 0) /* %TYPEDECLOF */
-	    {    Type_Decl_Ptr = 0;
-                 i += strlen("TYPEDECLOF");
-            } else
-	      if (strncmp(&(str[i]),"TYPE", strlen("TYPE"))== 0)
-		{
-		  PTR_TYPE type = NULL;
-		  type = Find_Type_For_Bif(bif);
-		  if (!type)
-		    {
-		      Message("TYPE not found",0);
-		      BufPutString("------TYPE ERROR----",0);
-		    }
-		  if( !is_overloaded_type(bif) ) 
-		      Tool_Unparse_Type (type);
-              i += strlen("TYPE");
-            } else
-	      if (strncmp(&(str[i]),"PROTECTION", strlen("PROTECTION"))== 0)
-		{
-		  int protect = 0;
-		  protect  = Find_Protection_For_Bif(bif);
-		  if (protect)
-		    {
-		      if (protect & 128)
-			{
-			  /* BufPutString("MethodOfElement:\n",0);  a temporary fix until dep2C++ done */
-                          BufPutString("public:\n", 0);
-			} else
-			  {
-			    switch (protect)
-			      { /* find the definition of the flag someday */
-			      case 64:  BufPutString("public:\n",0); break;
-			      case 32:  BufPutString("protected:\n",0); break;
-			      case 16:  BufPutString("private:\n",0); break;
-			      }
-			  }
-		    }
-              i += strlen("PROTECTION");
-            } else
-              if (strncmp(&(str[i]),"DUMMY", strlen("DUMMY"))== 0) /* %DUMMY Do nothing */
-            {
-              i += strlen("DUMMY");
-
-            } else
-          Message (" *** Unknown bif node COMMAND *** ",0);
-        }
-       else
-         {
-           BufPutChar( c);
-           i++;
-         }
-      c = str[i];
-    }
-  return Buf_address;
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
deleted file mode 100644
index 942ce21..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-set(DB_SOURCES anal_ind.c db.c db_unp.c db_unp_vpc.c dbutils.c
-  garb_coll.c glob_anal.c ker_fun.c list.c make_nodes.c mod_ref.c ndeps.c
-  readnodes.c sets.c setutils.c symb_alg.c writenodes.c)
-
-if(MSVC_IDE)
-  foreach(DIR ${DVM_SAGE_INCLUDE_DIRS})
-    file(GLOB_RECURSE FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-      "${DIR}/*.h" "${DIR}/*.def" "${DIR}/head" "${DIR}/tag")
-    set(DB_HEADERS ${DB_HEADERS} ${FILES})
-  endforeach()
-  source_group("Header Files" FILES ${DB_HEADERS})
-endif()
-
-add_library(db ${DB_SOURCES} ${DB_HEADERS})
-
-target_compile_definitions(db PRIVATE SYS5)
-target_include_directories(db PUBLIC "${DVM_SAGE_INCLUDE_DIRS}")
-set_target_properties(db PROPERTIES FOLDER "${DVM_LIBRARY_FOLDER}")
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/Makefile b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/Makefile
deleted file mode 100644
index f4136f1..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/Makefile
+++ /dev/null
@@ -1,123 +0,0 @@
-#######################################################################
-##                  pC++/Sage++  Copyright (C) 1993                  ##
-##  Indiana University  University of Oregon  University of Rennes   ##
-#######################################################################
-
-
-# sage/lib/oldsrc/Makefile (phb)
-
-LSX = .a
-
-#HP_CFLAGS#CEXTRA = -Ae +z#ENDIF#
-#HP_CFLAGS#LSX = .sl#ENDIF#
-
-SHELL = /bin/sh
-CONFIG_ARCH=iris4d
-
-RANLIB_TEST = [ -f /usr/bin/ranlib ] || [ -f /bin/ranlib ]
-#NO_RANLIB#RANLIB_TEST = (exit 1)#ENDIF#
-
-# Directory with all the include headers
-H = ../../h
-
-#INSTALLDEST = ../$(CONFIG_ARCH)
-INSTALLDEST = ../../../libsage
-INSTALL = /bin/cp
-
-CC = gcc
-#CC=cc#ENDIF##USE_CC#
-
-CXX = g++
-CXX = /usr/WorkShop/usr/bin/DCC
-LINKER = $(CC)
-
-CFLAGS	= -g -Wall -I$H $(CEXTRA)
-
-DEST	= ${HOME}/bin
-
-EXTHDRS	= $H/bif.h $H/db.h $H/db.h $H/defs.h $H/dep.h \
-	  $H/dep_str.h $H/list.h $H/ll.h $H/sets.h $H/symb.h \
-	  $H/tag $H/vparse.h
-
-OBJS	= anal_ind.o db.o db_unp.o db_unp_vpc.o  dbutils.o \
-	  garb_coll.o glob_anal.o ker_fun.o list.o \
-	  make_nodes.o mod_ref.o ndeps.o readnodes.o sets.o setutils.o \
-	  symb_alg.o writenodes.o 
-
-SRCS	= anal_ind.c db.c db_unp.c db_unp_vpc.c  dbutils.c \
-	  garb_coll.c glob_anal.c ker_fun.c list.c \
-	  make_nodes.c mod_ref.c ndeps.c readnodes.c sets.c setutils.c \
-	  symb_alg.c writenodes.c
-
-
-all:		$(OBJS) libdb$(LSX)
-
-libdb.a:	$(OBJS)
-		/bin/rm -f libdb.a
-		ar qc libdb.a $(OBJS)
-		@if $(RANLIB_TEST) ; then ranlib libdb.a ; \
-		   else echo "\tNOTE: ranlib not required" ; fi
-
-libdb.sl:	$(OBJS)
-		/bin/rm -f libdb.sl
-		ld -b -s -o libdb.sl $(OBJS)
-
-clean:
-		@/bin/rm -f $(OBJS) $(PROGRAM) *.dep libdb$(LSX)
-
-index:
-		ctags -wx $(HDRS) $(SRCS)
-
-print:
-		$(PRINT) $(HDRS) $(SRCS)
-
-program:        $(PROGRAM)
-
-tags:           $(HDRS) $(SRCS); ctags $(HDRS) $(SRCS)
-
-install: $(INSTALLDEST)/libdb$(LSX)
-
-$(INSTALLDEST)/libdb$(LSX): libdb$(LSX)
-		if [ -d $(INSTALLDEST) ] ; then true; \
-                    else mkdir $(INSTALLDEST) ;fi
-		$(INSTALL) libdb$(LSX) $(INSTALLDEST)
-		@if $(RANLIB_TEST) ; then ranlib $(INSTALLDEST)/libdb$(LSX) ; \
-		   else echo "\tNOTE: ranlib not required" ; fi
-
-###
-anal_ind.o: $H/db.h $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-db.o:  $H/db.h $H/defs.h \
-	$H/tag $H/bif.h $H/ll.h $H/symb.h $H/sets.h
-db_unp.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-db_unp_vpc.o:  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h $H/db.h $H/vparse.h
-dbutils.o:  $H/db.h \
-	$H/defs.h $H/tag $H/bif.h $H/ll.h $H/symb.h $H/sets.h
-garb-coll.o:  $H/db.h $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-glob_anal.o:  $H/db.h $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-ker_fun.o:  $H/defs.h $H/tag $H/bif.h $H/ll.h \
-	$H/symb.h $H/sets.h
-list.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h $H/list.h
-make_nodes.o: $H/db.h  $H/defs.h $H/tag \
-	$H/bif.h $H/ll.h $H/symb.h $H/sets.h
-mod_ref.o:  $H/defs.h $H/tag $H/bif.h $H/ll.h \
-	$H/symb.h $H/sets.h $H/vparse.h $H/db.h
-ndeps.o:  $H/db.h $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-readnodes.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h $H/dep_str.h \
-	 $H/dep.h
-sets.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-setutils.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-symb_alg.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-writenodes.o: $H/db.h $H/defs.h $H/tag \
-	$H/bif.h $H/ll.h $H/symb.h $H/sets.h $H/dep_str.h \
-	$H/dep.h
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
deleted file mode 100644
index fd2b032..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/anal_ind.c
+++ /dev/null
@@ -1,1031 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* file: anal_ind.c */
-
-/**********************************************************************/
-/*  This file contains the routines called in sets.c that do all index*/
-/*  and subscript analysis.					      */
-/**********************************************************************/
-
-#include <stdlib.h>
-#include "db.h"
- 
-#define PLUS 2
-#define ZPLUS 3
-#define MINUS 4
-#define ZMINUS 5
-#define PLUSMINUS 6
-#define NODEP -1
-
-/* extern variables */
-extern PTR_SYMB induct_list[MAX_NEST_DEPTH];
-extern int stride[MAX_NEST_DEPTH];
-extern int language;
-extern PTR_FILE cur_file;
-
-extern PCF UnparseBfnd[];
-extern PCF UnparseLlnd[];
-
-
-/* local variables */
-struct subscript blank, extra;
-int table_generated = 0;
-int np = 2 * MAX_NEST_DEPTH;
-int tbl_depth = 4 * MAX_NEST_DEPTH + AR_DIM_MAX;
-int num_eqn, num_ineq;
-int adm = MAX_NEST_DEPTH;
-int *table[MAX_NEST_DEPTH * 4 + AR_DIM_MAX];
-int upper_bnd[2 * MAX_NEST_DEPTH], lower_bnd[2 * MAX_NEST_DEPTH];
-int dist_ub[2 * MAX_NEST_DEPTH], dist_lb[2 * MAX_NEST_DEPTH];
-
-/* forward references */
-PTR_SETS alloc_sets();
-PTR_REFL alloc_ref();
-int disp_refl();
-PTR_REFL copy_refl();
-PTR_REFL union_refl();
-void add_eqn();
-void set_troub();
-void print_tbl();
-void print_etbl();
-void set_vec();
-int simple_algebraic();
-int reduce();
-int solve_system();
-int chk_bnds();
-
-/* extern references */
-int make_induct_list();
-void make_subscr();
-int reduce_ll_exp();
-int sequiv();
-int unif_gen(); 
-int gcd();
-void make_vect_range();
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-int check_for_indvar(s, d, lis)
-PTR_SYMB s, lis[];
-
-int d;
-{
-  int i;
-
-  for (i = 0; i < d; i++)
-    if (s == lis[i])
-      return (1);
-  return (0);
-}
-
-PTR_LLND append_ll_elist(PTR_LLND list, PTR_LLND item);
-
-/*************************************************************/
-/* find_bounds(b,q,qnew) takes a bifnode-llnd pair (b,q) and */
-/*  creates a low level expression that describes the range  */
-/* of values that are touched by the reference in the current*/
-/* context.  the index expressions are all scalars and ranges*/
-/* interms of parameters or constants.	if the index exp is  */
-/* undecidable, then the whole range of the index is assumed */
-/*  the parameter qnew is a low level list upon which this   */
-/*  expression is appended.				     */
-/*************************************************************/
-PTR_LLND find_bounds(PTR_BFND b, PTR_LLND q, PTR_LLND qnew)
-/*PTR_BFND b;*/
-/*PTR_LLND q, qnew;*/
-{
-  PTR_SYMB ind_list[MAX_NEST_DEPTH];
-  //PTR_LLND ind_terms[MAX_NEST_DEPTH];
-  struct subscript il_lo[MAX_NEST_DEPTH];
-  struct subscript il_hi[MAX_NEST_DEPTH];
-  struct subscript source[AR_DIM_MAX];	/* a source reference or def. */
-  int i, j, count, dumb,sign;
-  struct ref sor;
-  PTR_LLND qind_list, new_list, q_index, make_llnd(), tmp;
-  PTR_LLND exp1, exp2, exp3, build_exp_from_bound();
-  PTR_BFND fun;
-  PTR_REFL parms;
-  PTR_LLND copy_llnd();
-
-  for (i = 0; i < MAX_NEST_DEPTH; i++) {
-    ind_list[i] = NULL;
-    //ind_terms[i] = NULL;
-    for (j = 0; j < MAX_NEST_DEPTH; j++) {
-      il_lo[i].coefs_symb[j] = NULL;
-      il_hi[i].coefs_symb[j] = NULL;
-    }
-  }
-
-  make_induct_list(b, ind_list, il_lo, il_hi);
-  sor.stmt = b;
-  sor.refer = q;
-  make_subscr(&sor, source);	/* source is an array of */
-				/* subscript records that */
-				/* shared by all routines */
-				/* find the parameter list */
-  fun = b;
-  while ((fun->variant != PROG_HEDR) &&
-	 (fun->variant != FUNC_HEDR) &&
-	 (fun->variant != PROC_HEDR))
-    fun = fun->control_parent;
-  parms = fun->entry.Template.sets->in_def;
-
-  qind_list = q->entry.Template.ll_ptr1;
-  new_list = NULL;
-  i = 0;
-  while (qind_list != NULL) {
-    q_index = qind_list->entry.Template.ll_ptr1;
-    if (source[i].decidable == 2) {	/* ddot case */
-      PTR_LLND low, hi, ar1, ar2, rl1, rl2, ltmp, htmp;
-      /* skip stride for now */
-      if (q_index->variant == DDOT && q_index->entry.Template.ll_ptr1 != NULL 
-	  && q_index->entry.Template.ll_ptr1->variant == DDOT)
-	q_index = q_index->entry.Template.ll_ptr1;
-      if (q_index->variant == STAR_RANGE) {
-	rl1 = make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL);
-      }
-      else {
-	low = copy_llnd(q_index->entry.Template.ll_ptr1);
-	hi = copy_llnd(q_index->entry.Template.ll_ptr2);
-
-	rl1 = make_llnd(cur_file, EXPR_LIST, low, NULL, NULL);
-	rl2 = make_llnd(cur_file, EXPR_LIST, hi, NULL, NULL);
-	ar1 = make_llnd(cur_file,ARRAY_REF,rl1,NULL, q->entry.Template.symbol);
-	ar2 = make_llnd(cur_file,ARRAY_REF,rl2,NULL, q->entry.Template.symbol);
-	ltmp = find_bounds(b, ar1, NULL);
-	htmp = find_bounds(b, ar2, NULL);
-	ltmp = ltmp->entry.Template.ll_ptr1;
-	htmp = htmp->entry.Template.ll_ptr1;
-	
-	if (ltmp!= NULL && (ltmp->variant == EXPR_LIST || ltmp->variant == EXPR_LIST))
-	  ltmp = ltmp->entry.Template.ll_ptr1;
-	if (htmp!= NULL && (htmp->variant == EXPR_LIST || htmp->variant == EXPR_LIST))
-	  htmp = htmp->entry.Template.ll_ptr1;
-	if(ltmp == NULL) low =	make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL); 
-	else if (ltmp->variant == DDOT)
-	  low = ltmp->entry.Template.ll_ptr1;
-	else
-	  low = ltmp;
-	if(htmp == NULL) hi =  make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL);
-	else if (htmp->variant == DDOT) {
-	  hi = htmp->entry.Template.ll_ptr2;
-	  if (hi->variant == DDOT)
-	    hi = hi->entry.Template.ll_ptr1;
-	}
-	else
-	  hi = htmp;
-	if (low->variant == STAR_RANGE)
-	  rl1 = low;
-	else if (hi->variant == STAR_RANGE)
-	  rl1 = hi;
-	else {
-	  rl1->variant = DDOT;
-	  rl1->entry.Template.ll_ptr1 = low;
-	  rl1->entry.Template.ll_ptr2 = hi;
-	}
-      }
-      new_list = append_ll_elist(new_list, rl1);
-    }
-    else if (source[i].decidable == 0) {	/* parm */
-      if (q_index == NULL || q_index->variant == STAR_RANGE) {
-	exp3 = make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL);
-	new_list = append_ll_elist(new_list, exp3);
-      }
-      else if (reduce_ll_exp(b, parms, ind_list, q_index, &exp2, &dumb) == 0) {
-	/* was not able to resolve */
-	if (simple_algebraic(q_index)) {
-	  sign = 1;
-	  exp1 = build_exp_from_bound(il_lo, &(source[i]),&sign);
-	  if (exp1 == NULL) {
-	    /* this should only happen if the subscript */
-	    /* is very strange. 		    */
-	  }
-	  if (reduce_ll_exp(b, parms, ind_list, exp1, &exp2, &dumb) == 0) {
-	    /* was not able to resolve ! */
-	    exp3 = make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL);
-	  }
-	  else {
-	    exp1 = exp2;
-	    count = 0;
-	    for (j = 0; j < MAX_NEST_DEPTH; j++)
-	      if (source[i].coefs[j] != 0)
-		count++;
-	    if (count == 0)
-	      exp3 = exp1;
-	    else {
-	      sign = 1;
-	      exp2 = build_exp_from_bound(il_hi, &(source[i]),&sign);
-	       if (reduce_ll_exp(b, parms, ind_list, exp2, &exp3, &dumb) == 0) {
-		exp3 = make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL);
-	      }
-	      else {
-		exp2 = exp3;
-		if(sign > 0)
-		   exp3 = make_llnd(cur_file, DDOT, exp1, exp2, NULL);
-		else
-		   exp3 = make_llnd(cur_file, DDOT, exp2, exp1, NULL);
-	      }
-	    }
-	  }
-	  new_list = append_ll_elist(new_list, exp3);
-	}
-	else {
-	  tmp = make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL);
-	  new_list = append_ll_elist(new_list, tmp);
-	}
-      }
-      else
-	new_list = append_ll_elist(new_list, exp2);
-    }
-    else if (source[i].decidable == 1) {	/* standard linear */
-      sign = 1;
-      exp1 = build_exp_from_bound(il_lo, &(source[i]),&sign);
-       if (exp1 == NULL) {
-	/* fprintf(stderr, "OOPS null!\n"); */
-	/* this should only happen if the subscript */
-	/* is very strange.  or the low bound is strange   */
-      }
-      if (reduce_ll_exp(b, parms, ind_list, exp1, &exp2, &dumb) == 0) {
-	/* was not able to resolve ! */
-	exp3 = make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL);
-      }
-      else {
-	exp1 = exp2;
-	count = 0;
-	for (j = 0; j < MAX_NEST_DEPTH; j++)
-	  if (source[i].coefs[j] != 0
-	      || source[i].coefs_symb[j] != NULL)
-	    count++;
-	if (count == 0)
-	  exp3 = exp1;
-	else {
-	  sign = 1;
-	  exp2 = build_exp_from_bound(il_hi, &(source[i]),&sign);
-	   if (reduce_ll_exp(b, parms, ind_list, exp2, &exp3, &dumb) == 0) {
-	    exp3 = make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL);
-	  }
-	  else {
-	    exp2 = exp3;
-	    if(sign> 0)
-	      exp3 = make_llnd(cur_file, DDOT, exp1, exp2, NULL);
-	    else
-	      exp3 = make_llnd(cur_file, DDOT, exp2, exp1, NULL);
-	  }
-	}
-      }
-      new_list = append_ll_elist(new_list, exp3);
-    }
-    else {
-      fprintf(stderr, "source[i].decidable = %d\n", source[i].decidable);
-      fprintf(stderr, "strange brew in find_bounds %s\n",
-	      (UnparseLlnd[cur_file->lang])(q_index));
-      new_list = append_ll_elist(new_list, q_index);
-    }
-    qind_list = qind_list->entry.Template.ll_ptr2;
-    i++;
-  }
-  if (qnew != NULL)
-    qnew->entry.Template.ll_ptr1 = new_list;
-  else
-    qnew = new_list;
-  return (qnew);
-}
-
-
-int simple_algebraic(p)
-PTR_LLND p;
-{
-  if (p == NULL)
-    return (1);
-  switch (p->variant) {
-   case EXPR_LIST:
-   case ADD_OP:
-   case DIV_OP:
-   case MULT_OP:
-   case SUBT_OP:
-   case MINUS_OP:
-    return (simple_algebraic(p->entry.Template.ll_ptr1) *
-	    simple_algebraic(p->entry.Template.ll_ptr2));
-   case VAR_REF:
-   case CONST_REF:
-   case INT_VAL:
-    return (1);
-   default:
-    return (0);
-  }
-}
-
-PTR_LLND append_ll_elist(list, item)
-PTR_LLND list, item;
-{
-  PTR_LLND tmp, make_llnd();
-
-  if (list == NULL) {
-    tmp = make_llnd(cur_file, EXPR_LIST, item, NULL, NULL);
-    return (tmp);
-  }
-  if (list->variant != EXPR_LIST) {
-    fprintf(stderr, "append_ll_elist screw up\n");
-    return (list);
-  }
-  else if (list->entry.list.next == NULL) {
-    tmp = append_ll_elist(NULL, item);
-    list->entry.list.next = tmp;
-    return (list);
-  }
-  else {
-    append_ll_elist(list->entry.list.next, item);
-    return (list);
-  }
-}
-
-PTR_LLND build_exp_from_bound(il, sub, sign)
-struct subscript il[MAX_NEST_DEPTH];
-struct subscript *sub;
-int *sign;
-{
-  PTR_LLND exp, exp2, exp3, exp4, make_llnd();
-  int j;
-  
-  if (sub->decidable == 2) {	/* ddot case */
-    return (sub->vector);
-  }
-  if (sub->decidable == 0 /* && simple_algebraic(sub->parm_exp) == 0 */ ) {
-    /* parameter expression (we hope) */
-    /* first we need to check for other vars */
-    return (sub->parm_exp);
-  }
-  if (sub->decidable == 1) {  /* standard linear */
-    exp = NULL;
-    if (sub->parm_exp == NULL) {
-      exp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-      exp->entry.ival = sub->offset;
-    }
-    else
-      exp = sub->parm_exp;
-    for (j = 0; j < MAX_NEST_DEPTH; j++) {
-      if (sub->coefs_symb[j] != NULL) { /* symbolic case! */
-	exp3 = build_exp_from_bound(il, &(il[j]), sign);
-	if (exp3 == NULL) {
-	  exp4 = NULL;
-	  exp = NULL;
-	}
-	else if (exp3->variant == DDOT) {
-	  fprintf(stderr, "DDOT case\n");
-	  exp4 = exp3;
-	}
-	else {	/* exp3 is loop bound which must mult by symbolic coef */
-	  exp4 = make_llnd(cur_file, MULT_OP, sub->coefs_symb[j],
-			   exp3, NULL);
-	}
-	if (exp != NULL) {
-	  exp3 = make_llnd(cur_file, ADD_OP, exp4, exp, NULL);
-	  exp = exp3;
-	}
-	else
-	  exp = exp4;
-      }
-      else if (sub->coefs[j] != 0) { /* a nice integer coef. */
-	exp3 = build_exp_from_bound(il, &(il[j]),sign);
-	if (exp3 == NULL) {
-	  exp4 = NULL;
-	  exp = NULL;
-	}
-	else if (exp3->variant == DDOT) {
-	  fprintf(stderr, "DDOT case\n");
-	  exp4 = exp3;
-	}
-	else if (sub->coefs[j] == 1)
-	  exp4 = exp3;
-	else {
-	  exp2 = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	  exp2->entry.ival = sub->coefs[j];
-	  if(sub->coefs[j] < 0) *sign = -1;
-	  exp2->type = cur_file->head_type;	/* always INT type */
-	  exp4 = make_llnd(cur_file, MULT_OP, exp2, exp3, NULL);
-	}
-	if (exp != NULL) {
-	  exp3 = make_llnd(cur_file, ADD_OP, exp4, exp, NULL);
-	  exp = exp3;
-	}
-	else
-	  exp = exp4;
-      }
-    }
-    return (exp);
-  }
-  else
-    return (make_llnd(cur_file, STAR_RANGE, NULL, NULL, NULL));
-}
-
-/**************************************************************/
-/* compute dist vect.  calculates the distance vector between */
-/* two references source and destination.  The vector is an   */
-/* array of integers of the form ( len, dist1, dist2, ....)   */
-/* trouble is an array which indicates one of several problems*/
-/*  if trouble[0] = 1 then there is no intersection!	      */
-/*  if trouble[i] = PLUSMINUS then the i-th component is "<=>"*/
-/*  if trouble[i] = PLUS then vector is "+" ,i.e. positive    */
-/*	  but variable in nature. similar for ZPLUS which     */
-/*		  means the vector is "0+" = non-negative     */
-/*    other cases are ZMINUS="0-" and MINUS = "-"	      */
-/*  if trouble[i] = NODEP then no depend. on this index at all*/
-/*    NOTE: trouble[i] = NODEP is the case for scalars.       */
-/* the first component of vec is the length of the vector.    */
-/* function returns nothing				      */
-/**************************************************************/
-int comp_dist(vec, trouble, sor, des, lexord)
-int vec[], trouble[];
-struct ref *sor;
-struct ref *des;
-int lexord;			/* true if sor precedes des in lex order */
-{
-  PTR_SYMB sor_ind_l[MAX_NEST_DEPTH], des_ind_l[MAX_NEST_DEPTH];
-  struct subscript il_lo[MAX_NEST_DEPTH];
-  struct subscript il_hi[MAX_NEST_DEPTH];
-  struct subscript source[AR_DIM_MAX];	/* a source reference or def. */
-  struct subscript destin[AR_DIM_MAX];	/* a destination ref. or def. */
-  int inorder, i, j, sd, dd, depth, step, depfound;
-  //int eqntbl[AR_DIM_MAX][2 * MAX_NEST_DEPTH + 1];
-  PTR_SYMB s;
-
-  if (table_generated == 0)
-  {
-      for (i = 0; i < tbl_depth; i++)
-      {
-          table[i] = (int *)calloc(2 * MAX_NEST_DEPTH + 1, sizeof(int));
-#ifdef __SPF
-          addToCollection(__LINE__, __FILE__,table[i], 0);
-#endif
-      }
-      table_generated = 1;
-  }
-  for (i = 0; i < tbl_depth; i++)
-    for (j = 0; j < np + 1; j++) {
-      table[i][j] = 0;
-     // if (i < AR_DIM_MAX)
-	//eqntbl[i][j] = 0;
-    }
-
-  blank.decidable = 1;
-  extra.decidable = 1;
-  extra.offset = 0;
-  blank.offset = 0;
-  for (i = 0; i < MAX_NEST_DEPTH; i++) {
-    sor_ind_l[i] = NULL;
-    des_ind_l[i] = NULL;
-    blank.coefs[i] = 0;
-    il_lo[i].decidable = 1;
-    il_hi[i].decidable = 1;
-    il_lo[i].offset = 0;
-    il_hi[i].offset = 0;
-    for (j = 0; j < MAX_NEST_DEPTH; j++) {
-      il_lo[i].coefs[j] = 0;
-      il_hi[i].coefs[j] = 0;
-    }
-  }
-
-  sd = make_induct_list(sor->stmt, sor_ind_l, il_lo, il_hi);
-
-  dd = make_induct_list(des->stmt, des_ind_l, il_lo, il_hi);
-
-  depth = (sd < dd) ? sd : dd;
-  inorder = (sor->stmt->g_line < des->stmt->g_line) ? 1 : 0;
-
-  i = 0;
-  while ((i < depth) && (des_ind_l[i] == sor_ind_l[i]))
-    i++;
-  if (i < depth)
-    depth = i;
-
-  make_subscr(sor, source);
-  make_subscr(des, destin);
-  /* for each subscript expression we need to check for */
-  /* symbolic references.  if they are the same we are	*/
-  /* ok.  if they are different we set the flag to be	*/
-  /* undecidable.				       */
-  for (j = 0; j < AR_DIM_MAX; j++) {
-    if ((source[j].parm_exp != NULL) ||
-	(destin[j].parm_exp != NULL)) {
-      if (sequiv(source[j].parm_exp, destin[j].parm_exp) == 0) {
-	/* the following is temporary.	we   */
-	/* should do a symbolic subtraction  */
-	source[j].offset = 1;
-	destin[j].offset = 0;
-	source[j].decidable = 1;
-	destin[j].decidable = 1;
-	source[j].parm_exp = NULL;
-	destin[j].parm_exp = NULL;
-      }
-    }
-  }
-  s = sor->refer->entry.Template.symbol;
-  for (i = 1; i < MAX_NEST_DEPTH; i++) {
-    vec[i] = 0;
-    trouble[i] = NODEP;
-  }
-  vec[0] = depth;
-  trouble[0] = 0;
-  /* first check for uniformly generated cases */
-  if ((s->type->variant == T_ARRAY || s->type->variant == T_POINTER)
-       && unif_gen(sor, des, vec, trouble, source, destin));
-  else {
-    /* if a scalar ... */
-    if (s->type->variant != T_ARRAY && s->type->variant != T_POINTER) {
-      for (i = 1; i <= depth; i++) {
-	trouble[i] = 0;
-	vec[i] = 0;
-      }
-
-      if (inorder == 0) {
-	vec[depth] = 1;
-	trouble[depth] = 0;
-      }
-      return (1);
-    }
-    else
-      /* if not uniform do generalized shoestak */
-      for (step = 0; step <= depth; step++) {
-	if (solve_system(step, depth, sd, sor_ind_l,
-			 dd, des_ind_l, il_lo, il_hi, source, destin) != 0) {
-	  set_troub(step + 1, vec, trouble, PLUS);
-	}
-	else if (step == 0)
-	  trouble[0] = 1;
-      }
-  }
-  depfound = 0;
-
-  for (i = 1; i < MAX_NEST_DEPTH; i++) {
-    if (vec[i] != 0 || trouble[i] != NODEP)
-      depfound = 1;
-    if (trouble[i] == -99)
-      trouble[i] = 0;
-  }
-
-  if (depfound == 0 && !lexord)
-    trouble[0] = 1;
-  return (1);			/* return value means nothing here */
-
-}
-
-int solve_system(step,depth,sd,sor_ind_l,dd,des_ind_l,il_lo,il_hi,source,destin)
-int step, depth, sd, dd;
-PTR_SYMB sor_ind_l[MAX_NEST_DEPTH], des_ind_l[MAX_NEST_DEPTH];
-struct subscript il_lo[];
-struct subscript il_hi[];
-struct subscript source[];	/* a source reference or def. */
-struct subscript destin[];	/* a destination ref. or def. */
-{
-  struct subscript lo, hi;
-  int i, j, k, max_depth;
-  int num_eqn, num_ineq;
-
-  max_depth = (sd > dd) ? sd : dd;
-
-  /* now build equation rows of the table */
-  num_eqn = -1;
-  for (j = 0; j < AR_DIM_MAX; j++) {
-    if (source[j].decidable != -1 || destin[j].decidable != -1)
-      add_eqn(table[j], &source[j], &destin[j]);
-    else if (num_eqn == -1)
-      num_eqn = j;
-  }
-  /* add step equations */
-  for (k = 0; k < step; k++) {
-    for (j = 0; j < MAX_NEST_DEPTH; j++) {
-      extra.coefs[j] = 0;
-      blank.coefs[j] = 0;
-    }
-    extra.coefs[k] = 1;
-    blank.coefs[k] = 1;
-    add_eqn(table[num_eqn], &extra, &blank);
-    num_eqn++;
-    blank.coefs[k] = 0;
-  }
-
-  /* fix normalization for stride */
-  for (i = 0; i < depth; i++) {
-    if (stride[i] != 1) {
-      for (j = 0; j < num_eqn; j++) {
-	table[j][i] = table[j][i] * stride[i];
-	table[j][MAX_NEST_DEPTH + i] =
-	  table[j][MAX_NEST_DEPTH + i] * stride[i];
-      }
-
-      if (stride[i] < 0) {
-	for (j = 0; j < num_eqn; j++)
-	  if (table[j][i] < 0)
-	    for (k = 0; k <= np; k++)
-	      table[j][k] = -table[j][k];
-      }
-    }
-  }
-
-  num_ineq = 0;
-
-  /* now add direction inequality at position step */
-  for (j = 0; j < MAX_NEST_DEPTH; j++) {
-    extra.coefs[j] = 0;
-    blank.coefs[j] = 0;
-  }
-  extra.coefs[step] = -1;
-  blank.coefs[step] = -1;
-  extra.offset = -1;
-  add_eqn(table[num_eqn], &extra, &blank);
-  extra.coefs[step] = 0;
-  blank.coefs[step] = 0;
-  extra.offset = 0;
-
-  num_ineq = 1;
-  /* now add vector range subscript ineq. */
-  for (j = 0; j < AR_DIM_MAX; j++) {
-    if (source[j].decidable == 2) {
-      /* source is vector in component j */
-      make_vect_range(sd, source[j].vector, sor_ind_l, &lo, &hi);
-      add_eqn(table[num_eqn + num_ineq], &lo, &blank);
-      add_eqn(table[num_eqn + num_ineq + 1], &hi, &blank);
-      num_ineq = num_ineq + 2;
-    }
-    if (destin[j].decidable == 2) {
-      /* destin is vector in component j */
-      make_vect_range(dd, destin[j].vector, des_ind_l, &lo, &hi);
-      add_eqn(table[num_eqn + num_ineq], &lo, &blank);
-      add_eqn(table[num_eqn + num_ineq + 1], &hi, &blank);
-      num_ineq = num_ineq + 2;
-    }
-  }
-
-
-  /* now add induction bound inequalities */
-  for (j = 0; j < max_depth; j++) {
-    /* reverse lo */
-    il_lo[j].offset = -il_lo[j].offset;
-    for (i = 0; i < MAX_NEST_DEPTH; i++)
-      il_lo[j].coefs[i] = -il_lo[j].coefs[i];
-    il_lo[j].coefs[j] = 1;	/* perhaps repalce by stride ? */
-    il_hi[j].coefs[j] = -1;
-
-    if (il_lo[j].decidable == 1) {
-      add_eqn(table[num_eqn + num_ineq], &il_lo[j], &blank);
-      num_ineq = num_ineq + 1;
-    }
-    if (il_hi[j].decidable == 1) {
-      add_eqn(table[num_eqn + num_ineq], &il_hi[j], &blank);
-      num_ineq = num_ineq + 1;
-    }
-    /* reset lo and reverse hi */
-    for (i = 0; i < MAX_NEST_DEPTH; i++) {
-      il_lo[j].coefs[i] = -il_lo[j].coefs[i];
-      il_hi[j].coefs[i] = -il_hi[j].coefs[i];
-    }
-    il_lo[j].offset = -il_lo[j].offset;
-    il_hi[j].offset = -il_hi[j].offset;
-    if (il_lo[j].decidable == 1) {
-      add_eqn(table[num_eqn + num_ineq], &blank, &il_lo[j]);
-      num_ineq = num_ineq + 1;
-    }
-    if (il_hi[j].decidable == 1) {
-      add_eqn(table[num_eqn + num_ineq], &blank, &il_hi[j]);
-      num_ineq = num_ineq + 1;
-    }
-    /* reset hi */
-    for (i = 0; i < MAX_NEST_DEPTH; i++) {
-      il_hi[j].coefs[i] = -il_hi[j].coefs[i];
-    }
-    il_hi[j].offset = -il_hi[j].offset;
-    il_lo[j].coefs[j] = 0;
-    il_hi[j].coefs[j] = 0;
-
-  }
-
-  /* table complete.. now put in reduced form */
-  if (reduce(table, num_eqn, num_eqn + num_ineq) == 0)
-    return (0);
-  else
-    return (1);
-}
-
-void add_eqn(table, source, destin)
-struct subscript *source;	/* a source reference or def. */
-struct subscript *destin;	/* a destination ref. or def. */
-int table[];
-{
-  int i;
-
-  if (source->decidable < 1 || destin->decidable < 1)
-    for (i = 0; i < np + 1; i++)
-      table[i] = 0;
-  else {
-    for (i = 0; i < MAX_NEST_DEPTH; i++) {
-      table[i] = source->coefs[i];
-      table[i + MAX_NEST_DEPTH] = -(destin->coefs[i]);
-    }
-    table[np] = source->offset - destin->offset;
-  }
-}
-
-void print_tbl(depth, neqn, neq, tbl)
-int depth, neqn, neq;
-int *tbl[];
-{
-  int i, j;
-
-  depth = depth;		/* make lint happy, depth unused */
-
-  fprintf(stderr, "|---------------table----------------------|\n");
-  fprintf(stderr, "|  i   j   k   i'   j'	  k'   const   relat|\n");
-  fprintf(stderr, "|------------------------------------------|\n");
-  j = np / 2;
-  for (i = 0; i < neqn; i++)
-    fprintf(stderr, "| %2d  %2d  %2d  %2d   %2d   %2d	%4d	     ==  |\n",
-	   tbl[i][0], tbl[i][1], tbl[i][2],
-	   tbl[i][j], tbl[i][j + 1], tbl[i][j + 2], tbl[i][np]);
-  fprintf(stderr, "|------------------------------------------|\n");
-  for (i = neqn; i < neqn + neq; i++)
-    fprintf(stderr, "| %2d  %2d  %2d  %2d   %2d   %2d	%4d	     >=  |\n",
-	   tbl[i][0], tbl[i][1], tbl[i][2],
-	   tbl[i][j], tbl[i][j + 1], tbl[i][j + 2], tbl[i][np]);
-  fprintf(stderr, "|------------------------------------------|\n");
-}
-
-void print_etbl(depth, neqn, tbl)
-int depth, neqn;
-int tbl[AR_DIM_MAX][2 * MAX_NEST_DEPTH + 1];
-{
-  int i, j;
-
-  depth = depth;		/* make lint happy, depth unused */
-
-  fprintf(stderr, "|---------------table----------------------|\n");
-  fprintf(stderr, "|  i   j   k   i'   j'	  k'   const   relat|\n");
-  fprintf(stderr, "|------------------------------------------|\n");
-  j = np / 2;
-  for (i = 0; i < neqn; i++)
-    fprintf(stderr, "| %2d  %2d  %2d  %2d   %2d   %2d	%4d	     ==  |\n",
-	   tbl[i][0], tbl[i][1], tbl[i][2],
-	   tbl[i][j], tbl[i][j + 1], tbl[i][j + 2], tbl[i][np]);
-  fprintf(stderr, "|------------------------------------------|\n");
-}
-
-int reduce(tbl, num_eqn, tbl_depth)
-int *tbl[];
-int num_eqn, tbl_depth;
-{
-  int j, i, k, t, mgcd, piv, pcol, opc, alf, bet;
-  int *tmp;
-
-  for (i = 0; i < 2 * MAX_NEST_DEPTH; i++) {
-    upper_bnd[i] = 32000;
-    lower_bnd[i] = -32000;
-    if (i < MAX_NEST_DEPTH) {
-      dist_lb[i] = -32000;
-      dist_ub[i] = 32000;
-    }
-  }
-
-  for (i = 0; i < tbl_depth; i++)
-    if (chk_bnds(tbl, i, upper_bnd, lower_bnd) == 0)
-      return (0);
-
-  pcol = -1;
-  /* first eliminate by using the equations */
-  for (j = 0; j < num_eqn; j++) {
-    /* find leader pivod equation */
-    piv = -1;
-    opc = pcol;
-    for (k = opc + 1; k < MAX_NEST_DEPTH * 2; k++)
-      for (t = j; t < num_eqn; t++)
-	if (opc == pcol && tbl[t][k] != 0) {
-	  pcol = k;
-	  piv = t;
-	}
-
-    if (piv > -1) {
-      /* swap to bring to top */
-      tmp = tbl[j];
-      tbl[j] = tbl[piv];
-      tbl[piv] = tmp;
-      /* first reduce by gcd of row */
-      if (tbl[j][pcol] < 0)
-	for (i = 0; i <= np; i++)
-	  tbl[j][i] = -tbl[j][i];
-      mgcd = gcd(np - 1, tbl[j]);
-      if (mgcd > 1) {
-	/* first test for bad congruence class */
-	if ((tbl[j][np] % mgcd) != 0)
-	  return (0);
-	for (i = 0; i <= np; i++)
-	  tbl[j][i] = tbl[j][i] / mgcd;
-      }
-      /* now do elimination on pcol */
-      alf = tbl[j][pcol];
-      if (alf == 0)
-	fprintf(stderr, "reduce error\n");
-      else if (alf < 0) {
-	alf = -alf;
-	for (i = 0; i <= np; i++)
-	  tbl[j][i] = -tbl[j][i];
-      }
-      for (k = j + 1; k < tbl_depth; k++) {
-	if ((bet = tbl[k][pcol]) != 0) {
-	  /* first reduce row k */
-	  for (i = pcol; i <= np; i++)
-	    tbl[k][i] = alf * tbl[k][i] - bet * tbl[j][i];
-	  /* test for dim 1 or 0 constraint */
-	  if (chk_bnds(tbl, k, upper_bnd, lower_bnd) == 0)
-	    return (0);
-	}
-      }
-    }				/* end of piv found case */
-  }				/* end of factorization loop */
-  /* second eliminate by adding inequalities */
-  for (j = num_eqn; j < tbl_depth; j++) {
-    /* find leader pivod equation */
-    piv = -1;
-    opc = pcol;
-    for (k = opc + 1; k < MAX_NEST_DEPTH * 2; k++)
-      for (t = j; t < tbl_depth; t++)
-	if (opc == pcol && tbl[t][k] > 0) {
-	  pcol = k;
-	  piv = t;
-	}
-
-    if (piv > -1) {
-      /* swap to bring to top */
-      tmp = tbl[j];
-      tbl[j] = tbl[piv];
-      tbl[piv] = tmp;
-      /* now do elimination on pcol */
-      alf = tbl[j][pcol];
-      if (alf <= 0)
-	fprintf(stderr, "reduce error\n");
-      for (k = j + 1; k < tbl_depth; k++) {
-	if ((bet = tbl[k][pcol]) < 0) {
-	  /* first do the ellimination */
-	  for (i = 0; i <= np; i++)
-	    tbl[k][i] = alf * tbl[k][i] - bet * tbl[j][i];
-	  /* now check for constraint errors */
-	  if (chk_bnds(tbl, k, upper_bnd, lower_bnd) == 0)
-	    return (0);
-	}
-      }
-    }				/* end of piv found case */
-  }				/* end of factorization loop */
-
-  /* now look for contradictions in eqnations */
-  for (j = 0; j < tbl_depth; j++)
-    if (chk_bnds(tbl, j, upper_bnd, lower_bnd) == 0)
-      return (0);
-  return (1);
-}
-
-int chk_bnds(tbl, k, upper_bnd, lower_bnd)
-int *tbl[];
-int k;
-int upper_bnd[], lower_bnd[];
-{
-  int i, first, second, third, gama;
-
-  third = -1;
-  first = -1;
-  second = -1;
-  for (i = 0; i < np; i++)
-    if (tbl[k][i] != 0) {
-      if (first == -1)
-	first = i;
-      else if (second == -1)
-	second = i;
-      else if (third == -1)
-	third = i;
-    }
-  if (first == -1) {		/* this is a dimension 0 constraint */
-    if ((k < num_eqn) & (tbl[k][np] != 0))
-      return (0);
-    if ((k >= num_eqn) & (tbl[k][np] < 0))
-      return (0);
-  }
-  else if (second == -1) {	/* this is a dimension 1 constraint */
-    if (k < num_eqn) {
-      gama = -tbl[k][np] / tbl[k][first];
-      /* var first has lower bound gama and upper bound gama */
-      if (gama < lower_bnd[first])
-	return (0);
-      lower_bnd[first] = gama;
-      if (gama > upper_bnd[first])
-	return (0);
-      upper_bnd[first] = gama;
-    }
-    else {			/* this is an inequality */
-      if (tbl[k][first] > 0) {	/* the inequality is > */
-	gama = -tbl[k][np] / tbl[k][first];
-	/* gama is a new lower bound */
-	if (gama > upper_bnd[first])
-	  return (0);
-	if (gama > lower_bnd[first])
-	  lower_bnd[first] = gama;
-      }
-      else {			/* the inequality is < */
-	gama = -tbl[k][np] / tbl[k][first];
-	/* gama is a new upper bound */
-	if (gama < lower_bnd[first])
-	  return (0);
-	if (gama < upper_bnd[first])
-	  upper_bnd[first] = gama;
-      }
-    }
-  }				/* end dim 1 case */
-  else if (third == -1 && (second - first) == MAX_NEST_DEPTH) { 
-  
-  /* dimension 2 case involving i and i' look for i' - i > k forms */
-    if (tbl[k][first] == -tbl[k][second]) {
-      if (k < num_eqn) {
-	dist_ub[first] = -tbl[k][np] / tbl[k][second];
-	dist_lb[first] = dist_ub[first];
-      }
-      else if (tbl[k][second] < 0
-	       && dist_ub[first] > tbl[k][np] / tbl[k][first])
-	dist_ub[first] = tbl[k][np] / tbl[k][first];
-      else if (tbl[k][second] > 0
-	       && dist_lb[first] < tbl[k][np] / tbl[k][second])
-	dist_lb[first] = -tbl[k][np] / tbl[k][second];
-      if (dist_ub[first] < dist_lb[first])
-	return (0);
-    }
-  }				/* end dim 2 case */
-  return (1);
-}
-
-
-/*****************************************************************/
-/* set_vec check the previous state of the troub and val vectors */
-/* to see if a previous index computation has determined values  */
-/* for the i-th induction var that differ from the current one.  */
-/* if a val of zero is set troub[i] is set to -99 as a reminder. */
-/*****************************************************************/
-void set_vec(i, vec, troub, val)
-int i;
-int vec[], troub[];
-int val;
-{
-  if ((vec[i] != 0) || (troub[i] == -99)) {
-    if (vec[i] != val)
-      troub[0] = 1;
-    if (val == 0)
-      troub[i] = -99;
-  }
-  else if (((val < 0) && (troub[i] == ZPLUS)) ||
-	   ((val > 0) && (troub[i] == ZMINUS)) ||
-	   ((val == 0) && ((troub[i] == PLUS) || (troub[i] == MINUS)))
-    )
-    troub[0] = 1;
-  else {
-    vec[i] = val;
-    if (val == 0)
-      troub[i] = -99;
-    else
-      troub[i] = 0;
-  }
-}
-
-void set_troub(i, vec, troub, val)
-int i;
-int vec[], troub[];
-int val;
-{
-  switch (val) {
-   case PLUS:
-    if ((vec[i] < 0) || (troub[i] == -99) ||
-	(troub[i] == ZMINUS))
-      troub[0] = 1;
-    break;
-   case MINUS:
-    if ((vec[i] > 0) || (troub[i] == -99) ||
-	(troub[i] == ZPLUS))
-      troub[0] = 1;
-    break;
-   case ZPLUS:
-    if ((vec[i] < 0) || (troub[i] == MINUS))
-      troub[0] = 1;
-    break;
-   case ZMINUS:
-    if ((vec[i] > 0) || (troub[i] == PLUS))
-      troub[0] = 1;
-    break;
-   case PLUSMINUS:		/* does not invalidate anything! */
-    break;
-   default:
-    troub[i] = val;
-  }
-  if ((troub[i] == NODEP) && (vec[i] == 0))
-    troub[i] = val;
-}
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db.c
deleted file mode 100644
index 90e4faf..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db.c
+++ /dev/null
@@ -1,2308 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/****************************************************************
- *								*
- *  db.c:							*
- *								*
- *  contains miscellaneous routines to handle inquiries to the	*
- *  program date base.  Supposed to be a higher level interface	*
- *								*
- ****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
- 
-#include "db.h"
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-extern void removeFromCollection(void *pointer);
-#endif
-
-/*
- * external references
- */
-extern int debug;
-extern int language;
-
-int	 read_nodes();
-int	 test_mod_ref();	/* in "mod_ref.c" */
-int	 check_ref();
-void	 build_ref(),
-	 visit_llnd();
-
-char	*(* unparse_bfnd)();	/* routine to unparse BIF nodes */
-char	*(* unparse_llnd)();	/* routine to unparse Low level nodes */
-char	*(* unparse_symb)();	/* routine to unparse Symbol nodes */
-char	*(* unparse_type)();	/* routine to unparse Type nodes */
-void	 readnodes();
-void	 gen_udchain();
-void	 dump_udchain();
-PTR_BLOB  alloc_blob();
-PTR_BLOB1 make_blob1();
-PTR_INFO  make_obj_info();
-
-PTR_BFND make_bfnd();
-PTR_TYPE make_type();
-PTR_SYMB make_symb();
-
-char *funparse_bfnd(),		/* bif nodes unparser for Fortran */
-     *funparse_blck(),		/* unparse the whole block for Fortran */
-     *funparse_llnd(),		/* ll nodes unparser for Fortran */
-     *funparse_symb(),		/* symbol nodes unparser for Fortran */
-     *funparse_type(),		/* type nodes unparser for Fortran */
-     *cunparse_bfnd(),          /* bif nodes unparser for C */ 
-     *cunparse_blck(),		/* unparse the whole block for C */
-     *cunparse_llnd(),          /* ll nodes unparser for C */  
-     *cunparse_symb(),          /* symbol nodes unparser for C */
-     *cunparse_type();          /* type nodes unparser for C */
-
-/*
- * Global variables to be shared by other routines
- */
-
-/*
- * Here we put unparsers of various kind of nodes into an array
- * indexed by the language type:
- *
- *   (*UnparseBfnd[ForSrc])();   calls the bif node unparser for Fortran
- *   (*UnparseBfnd[CSrc])();	  calls the bif node unparser for C
- */
-
-/* typedef char *(*PCF)(); */
-
-PCF UnparseBfnd[] = {
-	funparse_bfnd,
-	cunparse_bfnd
-};
-
-PCF UnparseBlock[] = {
-	funparse_blck,
-	cunparse_blck
-};
-
-PCF UnparseLlnd[] = {
-	funparse_llnd,
-	cunparse_llnd
-};
-
-PCF UnparseSymb[] = {
-	funparse_symb,
-	cunparse_symb
-};
-
-PCF UnparseType[] = {
-	funparse_type,
-	cunparse_type
-};
-
-
-/*
- * global variables
- */
-PTR_BLOB head_proj;		/* pointer to the project header */
-PTR_PROJ cur_proj = NULL;	/* point to the current active project */
-PTR_FILE cur_file = NULL;	/* point to the current active file */
-char db_err_msg[100];
-
-
-/*
- * local variables
- */
-static PTR_HASH hash_table[hashMax];
-static PTR_BLOB1 obj, tail;
-static int skip_rest = 0;	/* set to 1 if one proc/func ref found in llnd */
-
-/*
- * last_char returns the last character of the given NON-EMPTY string
- */
-static char
-last_char(s)
-    register char *s;
-{
-    while (*s++);
-    return *(s-2);
-}
-
-
-/****************************************************************
- *								*
- *   init_hash -- initialize the hash table			*
- *								*
- *   Input:							*
- *	hash_tbl - pointer to the hash table to be initializes	*
- *								*
- ****************************************************************/
-/*static void
-init_hash(hash_tbl)
-	PTR_HASH hash_tbl[];
-{
-    register int i = hashMax;
-    register PTR_HASH *p = hash_tbl;
-
-    for (; i; --i)
-	*p++ = (PTR_HASH) NULL;
-}*/
-
-
-/****************************************************************
- *								*
- *   hash -- computes the hash value of a given string		*
- *								*
- *   Input:							*
- *		str - a character string			*
- *								*
- *   Output:							*
- *		an integer representing the hash value of the	*
- *		given string					*
- *								*
- ****************************************************************/
-static int 
-hash(str)
-	register char *str;
-{
-    register int i;
-
-    for (i = 0; *str;)
-	i += *str++;
-    return (i % hashMax);
-}
-
-
-/****************************************************************
- *								*
- *  insert_hash -- insert the given symbol table entry into	*
- *		   the hash table				*
- *  input:							*
- *	   symb - the symbol entry to be inserted		*
- *	   head_hash - start of hash table			*
- *								*
- ****************************************************************/
-static void
-insert_hash(symb, head_hash)
-	register PTR_SYMB symb;
-	PTR_HASH head_hash[];
-{
-    int    index;
-    PTR_HASH entry;
-
-    index = hash(symb->ident);
-    if ((entry = (PTR_HASH)calloc(1, sizeof(struct hash_entry))) != 0)
-    {
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,entry, 0);
-#endif
-        entry->id_attr = symb;
-        entry->next_entry = head_hash[index];
-        head_hash[index] = entry;
-    }
-    else
-        (void)strcpy(db_err_msg, "No more space");
-}
-
-
-/****************************************************************
- *								*
- *  build_hash -- build the hash table for all symbols in the	*
- *		  project					*
- *								*
- *  Inputs:							*
- *	   head_symb - starting point of the symbol entries	*
- *	   head_hash - starting point of the hash table 	*
- *								*
- ****************************************************************/
-static void
-build_hash(head_symb, head_hash)
-	PTR_SYMB head_symb;
-	PTR_HASH head_hash[];
-{
-    register PTR_SYMB s;
-
-    for (s = head_symb; s; s = s->thread)
-	insert_hash(s, head_hash);
-}
-
-
-/****************************************************************
- *								*
- *  append_blob1_nd -- append b2 to the end of b1		*
- *								*
- *  Inputs:							*
- *	   b1 - head of the blob1 list				*
- *	   b2 - second list to be appended to b1		*
- *								*
- *  Output:							*
- *	   a blob1 list with b2 appended to end of b1		*
- *								*
- ****************************************************************/
-static PTR_BLOB1
-append_blob1_nd(b1, b2)
-	PTR_BLOB1 b1, b2;
-{
-    if (b1) {
-	register PTR_BLOB1 p, q;
-
-	for (p=b1; p; p = p->next) /* skip to the end of b1 */
-	    q = p;
-	q->next = b2;
-    } else
-	b1 = b2;
-    return b1;
-}
-
-
-/****************************************************************
- *								*
- *  insert_info_nd -- insert an info node to the return list	*
- *								*
- *  Input:							*
- *	   new - new info node to be added to the list		*
- *								*
- *  Side Effects:						*
- *	   The new node was added to the end of list pointed	*
- *	   to by the global variable "tail".  It changes the	*
- *	   global variable "obj", too, if the list was empty	*
- *								*
- ****************************************************************/
-static void
-insert_info_nd(new)
-	PTR_BLOB1 new;
-{
-    if (obj == NULL)
-	obj = tail = new;
-    else {
-	tail->next = new;
-	tail = new;
-    }
-}
-
-
-/****************************************************************
- *								*
- *   check_llnd -- traverse the given low level node "llnd"	*
- *		   for the USE or MOD information about the	*
- *		   symbol "var_name"				*
- *								*
- *   Inputs:							*
- *	   bf   - bif node					*
- *	   llnd - the low level node to be searched		*
- *	   type - type of information wanted			*
- *	   var_name - the given variable name			*
- *								*
- *   Side effect:						*
- *	   add a new obj_info node to the reference list	*
- *								*
- ****************************************************************/
-static void
-check_llnd(bf, llnd, type, var_name)
-	PTR_BFND  bf;
-	PTR_LLND llnd;
-	int	 type;
-	char	*var_name;
-{
-    if (llnd == NULL) return;
-
-    switch (llnd->variant) {
-    case LABEL_REF:
-	break;
-    case CONST_REF:
-    case VAR_REF	:
-    case ARRAY_REF:
-	if(check_ref(llnd->entry.Template.symbol->id) == 0)
-	    ;
-	build_ref(llnd->entry.Template.symbol, bf);
-	break;
-    case CONSTRUCTOR_REF:
-	break;
-    case ACCESS_REF:
-	break;
-    case CONS:
-	break;
-    case ACCESS:
-	break;
-    case IOACCESS	:
-	break;
-    case PROC_CALL:
-    case FUNC_CALL:
-	visit_llnd(bf,llnd->entry.proc.param_list);
-	break;
-    case EXPR_LIST:
-	visit_llnd(bf,llnd->entry.list.item);
-	if (llnd->entry.list.next)
-	    visit_llnd(bf,llnd->entry.list.next);
-	break;
-    case EQUI_LIST:
-	visit_llnd(bf,llnd->entry.list.item);
-	if (llnd->entry.list.next)
-	    visit_llnd(bf,llnd->entry.list.next);
-	break;
-    case COMM_LIST:
-	if (llnd->entry.Template.symbol) {
-	    /*	addstr(llnd->entry.Template.symbol->ident);
-	     */
-	}
-	visit_llnd(bf,llnd->entry.list.item);
-	if (llnd->entry.list.next)
-	    visit_llnd(bf,llnd->entry.list.next);
-	break;
-    case VAR_LIST	:
-    case RANGE_LIST:
-    case CONTROL_LIST:
-	visit_llnd(bf,llnd->entry.list.item);
-	if (llnd->entry.list.next)
-	    visit_llnd(bf,llnd->entry.list.next);
-	break;
-    case DDOT:
-	visit_llnd(bf,llnd->entry.binary_op.l_operand);
-	if (llnd->entry.binary_op.r_operand)
-	    visit_llnd(bf,llnd->entry.binary_op.r_operand);
-	break;
-    case DEF_CHOICE:
-    case SEQ:
-	visit_llnd(bf,llnd->entry.seq.ddot);
-	if (llnd->entry.seq.stride)
-	    visit_llnd(bf,llnd->entry.seq.stride);
-	break;
-    case SPEC_PAIR:
-	visit_llnd(bf,llnd->entry.spec_pair.sp_label);
-	visit_llnd(bf,llnd->entry.spec_pair.sp_value);
-	break;
-    case EQ_OP:
-    case LT_OP:
-    case GT_OP:
-    case NOTEQL_OP:
-    case LTEQL_OP:
-    case GTEQL_OP:
-    case ADD_OP:
-    case SUBT_OP:
-    case OR_OP:
-    case MULT_OP:
-    case DIV_OP:
-    case MOD_OP:
-    case AND_OP:
-    case EXP_OP:
-    case CONCAT_OP:
-	visit_llnd(bf,llnd->entry.binary_op.l_operand);
-	visit_llnd(bf,llnd->entry.binary_op.r_operand);
-	break;
-    case MINUS_OP:
-    case NOT_OP:
-	visit_llnd(bf,llnd->entry.unary_op.operand);
-	break;
-    case STAR_RANGE:
-	break;
-    default:
-	break;
-    }
-}
-
-
-/****************************************************************
- *								*
- * proc_ref_in_llnd -- recursively traverses the given low level*
- *		       node to find all procedures or functions *
- *		       references in it 			*
- *								*
- *  Input:							*
- *	   fi  - the file obj where this bif node belongs to	*
- *	   bif - the bif node where the llnd belongs		*
- *	   ll  - the low level node to be checked		*
- *								*
- *  Side Effect:						*
- *	   a blob1 list that contains all the call sites under	*
- *	   the node "ll" is put on the GLOBAL variable "obj".	*
- *								*
- ****************************************************************/
-static void
-proc_ref_in_llnd(fi, bif, ll)
-	PTR_FILE fi;
-	PTR_BFND bif;
-	PTR_LLND ll;
-{
-    if (ll == NULL)
-	return;
-
-    if (ll->variant == FUNC_CALL || ll->variant == PROC_CALL || ll->variant == FUNCTION_REF) {
-	PTR_INFO inf;
-	char	*bp, *t;
-
-	t = (UnparseBfnd[language])(bif);
-	skip_rest = 1;
-	bp = malloc(strlen(t) + 1);
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,bp, 0);
-#endif
-	(void) strcpy(bp, t);
-	inf = make_obj_info(fi->filename, bif->g_line, bif->l_line, bp);
-	insert_info_nd(make_blob1(IsObj, inf, NULL));
-	return;
-    }
-
-    /* NOTE: the following code is "tag" dependent */
-    if (ll->variant >= VAR_LIST && ll->variant < CONST_NAME) {
-	if (! skip_rest)
-	    proc_ref_in_llnd(fi, bif, ll->entry.Template.ll_ptr1);
-	if (! skip_rest)
-	    proc_ref_in_llnd(fi, bif, ll->entry.Template.ll_ptr2);
-    }
-}
-
-
-/****************************************************************
- *								*
- *  find_proc_call -- recursively traverses the given bif node	*
- *		      to find all procedures or functions calls *
- *		      in it.					*
- *								*
- *  Inputs:							*
- *	   fi  - the file obj where this bif node belongs to	*
- *	   bif - the bif node to be checked			*
- *								*
- *  Side effect:						*
- *	   a blob1 list that contains all the call sites under	*
- *	   the node " bif", i.e. itself and all its subtree is	*
- *	   put on the "global" variable "obj"			* 
- *								*
- ****************************************************************/
-static void
-find_proc_call(fi, bif)
-	PTR_FILE fi;
-	PTR_BFND bif;
-{
-    char	 buf[200], *bp, *tmp, *t;
-    PTR_INFO inf;
-    PTR_BLOB bl;
-
-    if (bif == NULL)
-	return;
-
-    bp = buf;
-    switch (bif->variant) {
-    case GLOBAL:
-    case PROG_HEDR:
-    case PROC_HEDR:
-    case FUNC_HEDR:
-    case BASIC_BLOCK:
-    case ARITHIF_NODE:
-    case LOGIF_NODE:
-    case LOOP_NODE:
-    case FOR_NODE:
-    case WHILE_NODE:
-    case CDOALL_NODE:
-    case SDOALL_NODE:
-	if (!skip_rest)
-	    proc_ref_in_llnd(fi, bif, bif->entry.Template.ll_ptr1);
-	if (!skip_rest)
-	    proc_ref_in_llnd(fi, bif, bif->entry.Template.ll_ptr2);
-	if (!skip_rest)
-	    proc_ref_in_llnd(fi, bif, bif->entry.Template.ll_ptr3);
-	for (bl = bif->entry.Template.bl_ptr1; bl; bl = bl->next) {
-	    skip_rest = 0;
-	    find_proc_call(fi, bl->ref);
-	}
-	break;
-    case IF_NODE:
-    case ELSEIF_NODE:
-	proc_ref_in_llnd(fi, bif, bif->entry.Template.ll_ptr1);
-	for (bl = bif->entry.Template.bl_ptr1; bl; bl = bl->next) {
-	    skip_rest = 0;
-	    find_proc_call(fi, bl->ref);
-	}
-	for (bl = bif->entry.Template.bl_ptr2; bl; bl = bl->next) {
-	    skip_rest = 0;
-	    find_proc_call(fi, bl->ref);
-	}
-	break;
-    case PROC_STAT:		/* this is a procedure call */
-    case FUNC_CALL:		/* this is a function call */
-	t = tmp = (UnparseBfnd[language])(bif);
-	bp = malloc(strlen(t) + 1);
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,bp, 0);
-#endif
-	(void) strcpy(bp, t);
-#ifdef __SPF
-    removeFromCollection(tmp);
-#endif
-	free(tmp);
-	inf = make_obj_info(fi->filename, bif->g_line, bif->l_line, bp);
-	insert_info_nd(make_blob1(IsObj, inf, NULL));
-	break;
-    default:
-	if (!skip_rest)
-	    proc_ref_in_llnd(fi, bif, bif->entry.Template.ll_ptr1);
-	if (!skip_rest)
-	    proc_ref_in_llnd(fi, bif, bif->entry.Template.ll_ptr2);
-	if (!skip_rest)
-	    proc_ref_in_llnd(fi, bif, bif->entry.Template.ll_ptr3);
-	skip_rest = 0;
-	break;
-    }
-}
-
-
-/****************************************************************
- *								*
- * proc_ref_llnd -- recursively traverses the given low level	*
- *		    node to find all procedures or functions	*
- *		    references in it				*
- *								*
- *  Input:							*
- *	   fi  - the file obj where this bif node belongs to	*
- *	   bif - the bif node where the llnd belongs		*
- *	   ll  - the low level node to be checked		*
- *								*
- *  Output:							*
- *	   a blob1 list that contains all the call sites under	*
- *	   the node "ll"					*
- *								*
- ****************************************************************/
-static PTR_BLOB1
-proc_ref_llnd(fi, bif, ll)
-	PTR_FILE fi;
-	PTR_BFND bif;
-	PTR_LLND ll;
-{
-    PTR_BLOB1 bl = NULL;
-
-    if (ll) {
-	if (ll->variant == FUNC_CALL || ll->variant == PROC_CALL || ll->variant == FUNCTION_REF) {
-	    char    *bp, *t;
-	    PTR_INFO inf;
-
-	    t = ll->entry.Template.symbol->ident;
-	    bp = malloc(strlen(t) + 1);
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,bp, 0);
-#endif
-	    (void) strcpy(bp, t);
-	    inf = make_obj_info(fi->filename, bif->g_line, bif->l_line, bp);
-	    bl = make_blob1(IsObj, inf, NULL);
-	}
-
-	/* NOTE: the following code is "tag" dependent */
-	if (ll->variant >= VAR_LIST && ll->variant < CONST_NAME) {
-	    PTR_BLOB1 n;
-
-	    n = proc_ref_llnd(fi, bif, ll->entry.Template.ll_ptr1);
-        if (n)		/* there are proc references in llnd1 */
-        {
-            if (bl)
-                bl->next = n;
-            else
-                bl = n;
-        }
-	    n = proc_ref_llnd(fi, bif, ll->entry.Template.ll_ptr2);
-        if (n)		/* there are proc references in llnd2 */
-        {
-            if (bl) 
-            {
-                register PTR_BLOB1 p, q;
-
-                for (p = bl; p; p = p->next) /* skip to the end of list */
-                    q = p;
-                q->next = n;
-            }
-            else
-                bl = n;
-        }
-	}
-    }
-    return bl;
-}
-
-
-/****************************************************************
- *								*
- *  ext_proc_call -- recursively traverse the given bif node to *
- *		     find all procedure or functions calls	*
- *		     inside a block (basic, loop, if-then-else) *
- *								*
- *  Inputs:							*
- *	   fi  - the file obj where this bif node belongs to	*
- *	   bl  - the blob chain to be checked			*
- *								*
- *  Output:							*
- *	   a blob1 list that contains all the call sites inside *
- *	   loops in the node "bif", i.e. itself and all its	*
- *	   subtree						*
- *								*
- ****************************************************************/
-static PTR_BLOB1
-ext_proc_call(fi, bl)
-	PTR_FILE fi;
-	PTR_BLOB bl;
-{
-    char	   *t;
-    PTR_INFO  inf;
-    PTR_BLOB  b;
-    PTR_BFND  bf;
-    PTR_BLOB1 obj, tail, new, n1, n2;
-
-    obj = tail = NULL;
-    for (b = bl; b; b = b->next) {
-	bf = b->ref;
-	switch(bf->variant) {
-	case PROC_STAT:
-	case FUNC_CALL:
-	    t = malloc(strlen(bf->entry.Template.symbol->ident) + 1);
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,t, 0);
-#endif
-	    (void) strcpy(t, bf->entry.Template.symbol->ident);
-	    inf = make_obj_info(fi->filename, bf->g_line, bf->l_line, t);
-	    new = make_blob1(IsObj, inf, NULL);
-	    if (obj == NULL)
-		obj = tail = new;
-	    else {
-		tail->next = new;
-		tail = new;
-	    }
-	    break;
-	case LOOP_NODE:
-	case FOR_NODE:
-	case WHILE_NODE:
-	case PARFOR_NODE:
-	case PAR_NODE:
-	    n1 = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr1);
-	    if ((n2 = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr2)))
-		n1 = append_blob1_nd(n1, n2);
-	    if ((n2 = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr3)))
-		n1 = append_blob1_nd(n1,n2);
-	    if ((n2 = ext_proc_call(fi, bf->entry.Template.bl_ptr1)))
-		n1 = append_blob1_nd(n1, n2);
-
-	    if (n1) {
-		PTR_INFO inf1;
-
-		inf1 = make_obj_info(fi->filename, bf->g_line, bf->l_line, "loop");
-		n2 = make_blob1(IsObj, inf1, n1);
-		new = make_blob1(IsLnk, (PTR_INFO)n2, NULL);
-		if (obj == NULL)
-		    obj = tail = new;
-		else {
-		    tail->next = new;
-		    tail = new;
-		}
-	    }
-	    break;
-	case CDOALL_NODE:
-	case SDOALL_NODE:
-	    n1 = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr1);
-	    if ((n2 = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr2)))
-		n1 = append_blob1_nd(n1, n2);
-	    if ((n2 = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr3)))
-		n1 = append_blob1_nd(n1,n2);
-	    if ((n2 = ext_proc_call(fi, bf->entry.Template.bl_ptr2)))
-		n1 = append_blob1_nd(n1, n2);
-	    if (n1) {
-		PTR_INFO inf1;
-
-		inf1 = make_obj_info(fi->filename, bf->g_line, bf->l_line, "loop");
-		n2 = make_blob1(IsObj, inf1, n1);
-		new = make_blob1(IsLnk, (PTR_INFO)n2, NULL);
-		if (obj == NULL)
-		    obj = tail = new;
-		else {
-		    tail->next = new;
-		    tail = new;
-		}
-	    }
-	    break;
-	case IF_NODE:
-	case ELSEIF_NODE:
-	    n1 = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr1);
-	    if ((n2 = ext_proc_call(fi, bf->entry.Template.bl_ptr1)))
-		n1 = append_blob1_nd(n1, n2);
-	    n2 = ext_proc_call(fi, bf->entry.Template.bl_ptr2);
-	    if (n1)	{	/* if the true branch has proc call */
-		n1 =append_blob1_nd(n1, n2);
-	    } else {		/* if no proc call in true branch */
-		if (n2) 	/* but some in false branch */
-		    n1 = n2;
-	    }
-	    if (n1) {
-		PTR_INFO inf1;
-
-		inf1 = make_obj_info(fi->filename, bf->g_line, bf->l_line, "if");
-		n2 = make_blob1(IsObj, inf1, n1);
-		new = make_blob1(IsLnk, (PTR_INFO)n2, NULL);
-		if (obj == NULL)
-		    obj = tail = new;
-		else {
-		    tail->next = new;
-		    tail = new;
-		}
-	    }
-	    break;
-	default:
-	    new = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr1);
-	    if ((n2 = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr2)))
-		new = append_blob1_nd(new, n2);
-	    if ((n2 = proc_ref_llnd(fi, bf, bf->entry.Template.ll_ptr3)))
-		new = append_blob1_nd(new, n2);
-        if (new)
-        {
-            if (obj == NULL)
-                obj = tail = new;
-            else
-            {
-                tail->next = new;
-                tail = new;
-            }
-        }
-	    break;
-	}
-    }
-    return (obj);
-}
-
-/****************************************************************
- *								*
- *  open_file -- open the dep file "filename"			*
- *								*
- *  Input:							*
- *	   filename -- the name of the dep file to be read in	*
- *								*
- *  Output:							*
- *	   NON-NULL : a pointer to file_obj so as to be able	*
- *		      to access the information.		*
- *	   NULL : open failure					*
- *								*
- ****************************************************************/
-static PTR_FILE
-open_file(filename)
-	char	*filename;
-{
-    PTR_FILE f;
-    FILE	  *fid;
-    char	  *temp;
-    int    l;
-
-    l = strlen(filename);
-    temp = malloc(l + 5);
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,temp, 0);
-#endif
-    (void)strcpy(temp, filename);
-    if ((fid = fopen(temp, "rb")) == NULL) {
-        register char *t = temp + l;
-
-        *t++ = '.';
-        *t++ = 'd';
-        *t++ = 'e';
-        *t++ = 'p';
-        *t = '\0';
-        if ((fid = fopen(temp, "rb")) == NULL) {
-            sprintf(db_err_msg, "OpenProj -- Cannot open file \"%s\"", filename);
-            return(NULL);
-        }
-    }
-    f = (PTR_FILE)calloc(1, sizeof(struct file_obj));
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,f, 0);
-#endif
-    if (f == NULL) {
-        (void)strcpy(db_err_msg, "open_file -- No more space");
-        return(NULL);
-    }
-
-    f->fid = fid;
-    if (read_nodes(f) < 0)
-        return NULL;
-    fclose(fid);
-    f->hash_tbl = (PTR_HASH *)calloc(hashMax, sizeof(PTR_HASH));
-    if (f->hash_tbl == NULL) 
-    {
-        (void)strcpy(db_err_msg, "open_file -- No more space");
-        return(NULL);
-    }
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,f->hash_tbl, 0);
-#endif
-    build_hash(f->head_symb, f->hash_tbl);
-    /* the following line is for special testing routine
-    if (language == CSrc)
-    test_mod_ref(f->global_bfnd);
-    */
-    gen_udchain(f);
-    if (debug)
-        dump_udchain(f);
-    return(f);
-}
-
-
-static void
-dealloc(f)
-    PTR_FILE f;
-{
-    PTR_BLOB b, b1, b2;
-
-    /* Delete all function entries from project's hash table */
-    for (b = f->global_bfnd->entry.Template.bl_ptr1; b; b = b->next)
-        if (language == ForSrc || (language == CSrc && b->ref->variant == FUNC_HEDR))
-            for (b1 = b2 = *(cur_proj->hash_tbl + hash(b->ref->entry.Template.symbol->ident)); b1; b1 = b1->next)
-                if (b1->ref == b->ref) {
-                    b2 = b1->next;
-                    break;
-                }
-                else
-                    b2 = b1;
-
-    /* clean up a little bit.  This is by no means a thorough one */
-    if (f->num_blobs)
-    {
-#ifdef __SPF
-        removeFromCollection(f->head_blob);
-#endif
-        free(f->head_blob);
-    }
-
-    if (f->num_bfnds)
-    {
-#ifdef __SPF
-        removeFromCollection(f->head_bfnd);
-#endif
-        free(f->head_bfnd);
-    }
-
-    if (f->num_llnds)
-    {
-#ifdef __SPF
-        removeFromCollection(f->head_llnd);
-#endif
-        free(f->head_llnd);
-    }
-
-    if (f->num_symbs)
-    {
-#ifdef __SPF
-        removeFromCollection(f->head_symb);
-#endif
-        free(f->head_symb);
-    }
-
-    if (f->num_types)
-    {
-#ifdef __SPF
-        removeFromCollection(f->head_type);
-#endif
-        free(f->head_type);
-    }
-
-    if (f->num_dep)
-    {
-#ifdef __SPF
-        removeFromCollection(f->head_dep);
-#endif
-        free(f->head_dep);
-    }
-
-    if (f->num_label)
-    {
-#ifdef __SPF
-        removeFromCollection(f->head_lab);
-#endif
-        free(f->head_lab);
-    }
-
-    if (f->num_cmnt)
-    {
-#ifdef __SPF
-        removeFromCollection(f->head_cmnt);
-#endif
-        free(f->head_cmnt);
-    }
-
-    if (f->num_files)
-    {
-#ifdef __SPF
-        removeFromCollection(f->head_file);
-#endif
-        free(f->head_file);
-    }
-
-#ifdef __SPF
-    removeFromCollection(f->hash_tbl);
-    removeFromCollection(f);
-#endif
-    free(f->hash_tbl);
-    free(f);
-}
-
-
-/* this creates a new empty file with the given dep file name
-   and the given Language type.  It tries to open the file and
-   returns 0 if it fails.  If it finds a similar file in the
-   project it deletes it.  It enters the file in the project.
-   returns 1 if it worked.
-   note this file has a global node, the standard types are defined,
-   and the default symbol is defined.
-*/
-
-int
-new_empty_file(Language, filename) 
-        int Language; /* 1 = CSrc or C++  and 0 = ForSrc */
-	char	*filename;
-{
-    PTR_FILE f;
-    /* FILE	  *fid; */
-    char	  *temp;
-    int    l;
-    /* PTR_SYMB star_symb; */
-    PTR_BLOB b, b1;
-    /* PTR_BFND global_bfnd; */
-    PTR_FNAME fname;
-
-    l = strlen(filename);
-    temp = malloc(l+5);
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,temp, 0);
-#endif
-    (void) strcpy(temp, filename);
-    /*
-    if ((fid=fopen(temp, "w")) == NULL) {
-	register char *t = temp+l;
-
-	*t++ = '.';
-	*t++ = 'd';
-	*t++ = 'e';
-	*t++ = 'p';
-	*t   = '\0';
-	if ((fid=fopen(temp, "w")) == NULL) {
-	    sprintf(db_err_msg, "OpenProj -- Cannot create file \"%s\"", filename);
-	    return(NULL);
-	}
-    }
-    */
-    f = (PTR_FILE) calloc(1, sizeof(struct file_obj));
-    if (f == NULL) {
-        (void)strcpy(db_err_msg, "open_file -- No more space");
-        return(0);
-    }
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,f, 0);
-#endif
-    fname = (PTR_FNAME) calloc(1, sizeof(struct file_name));
-    if (f == NULL) {
-        (void)strcpy(db_err_msg, "open_empty_file -- no more space");
-        return 0;
-    };
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,fname, 0);
-#endif
-    f->num_files = 1;
-    f->head_file = fname;
-    fname->name = temp;
-    fname->id = 1;
-
-    f->fid = NULL;
-    f->lang = Language;
-/*    fclose(fid);  */
-    f->hash_tbl = (PTR_HASH *) calloc(hashMax, sizeof(PTR_HASH));
-    if (f->hash_tbl == NULL) {
-        (void)strcpy(db_err_msg, "open_file -- No more space");
-        return(0);
-    }
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,f->hash_tbl, 0);
-#endif
-    build_hash(f->head_symb, f->hash_tbl);
-    /* global_int    = (PTR_TYPE)*/ make_type(f, T_INT);
-    /* global_float  = (PTR_TYPE)*/ make_type(f, T_FLOAT);
-    /* global_double = (PTR_TYPE)*/ make_type(f, T_DOUBLE);
-    /* global_char   = (PTR_TYPE)*/ make_type(f, T_CHAR);
-    /* global_string = (PTR_TYPE)*/ make_type(f, T_STRING);
-    /* global_bool   = (PTR_TYPE)*/ make_type(f, T_BOOL);
-    /* global_complex= (PTR_TYPE)*/ make_type(f, T_COMPLEX);
-    /* global_default= (PTR_TYPE)*/ make_type(f, DEFAULT);
-    /* global_void   = (PTR_TYPE)*/ make_type(f, T_VOID);   
-    /* global_void   = (PTR_TYPE)*/ make_type(f, T_UNKNOWN);   
-    /* DEFAULT is used for type */
-    make_symb(f, DEFAULT, "*");
-    f->global_bfnd =  make_bfnd(f,GLOBAL, SMNULL, LLNULL, LLNULL, LLNULL);
-    f->global_bfnd->filename=fname;
-    f->filename = temp;
-    /* add it to the project */
-    for (b = b1 = cur_proj->file_chain; b; b1 = b, b = b->next)
-	if (! strcmp(temp, ((PTR_FILE)b->ref)->filename))
-	    break;
-    if (b)			/* if non-NULL, then already in the project */
-	dealloc((PTR_FILE)b->ref);
-    if (b == NULL) {		/* it's not in the project before */
-	if ((b = alloc_blob()) == NULL)
-	    return 0;
-	b1->next = b;		/* add it to the end of the list */
-    }
-    b->ref = (PTR_BFND) f;
-    return 1; 
-}
-
-
-/****************************************************************
- *								*
- *  AddToProj -- Add another file to the current project	*
- *								*
- *  Input:							*
- *	   file -- file name to be added to the project 	*
- *								*
- *  Output:							*
- *	   1 if everything ok					*
- *	   0 if something wrong 				*
- *								*
- ****************************************************************/
-int
-AddToProj(file)
-	char *file;
-{
-    char tmp[50], *p = tmp, *q = file;
-    PTR_BLOB b, b1, new;
-    PTR_FILE f;
-    int index;
-
-    while ((*p++ = *q++) != '.'); /* simple-minded copy*/
-    *p++ = 'd';
-    *p++ = 'e';
-    *p++ = 'p';
-    *p++ = '\0';
-    for (b = b1 = cur_proj->file_chain; b; b1 = b, b = b->next)
-        if (!strcmp(file, ((PTR_FILE)b->ref)->filename))
-            break;
-    if (b)			/* if non-NULL, then already in the project */
-        dealloc((PTR_FILE)b->ref);
-    if ((f = open_file(tmp)) == NULL)
-        return 0;
-    if (b == NULL) {		/* it's not in the project before */
-        if ((b = alloc_blob()) == NULL)
-            return 0;
-        b1->next = b;		/* add it to the end of the list */
-    }
-    b->ref = (PTR_BFND)f;
-
-    /* Insert all procedures in this file into current project's hash table */
-    for (b = f->global_bfnd->entry.Template.bl_ptr1; b; b = b->next) {
-        if (language == ForSrc ||
-            (language == CSrc && b->ref->variant == FUNC_HEDR)) {
-            index = hash(b->ref->entry.Template.symbol->ident);
-            if ((new = (PTR_BLOB)calloc(1, sizeof(struct blob))) != 0)
-            {
-                new->ref = b->ref; /* point to the procedure's bif node */
-                new->next = *(cur_proj->hash_tbl + index);
-                *(cur_proj->hash_tbl + index) = new;
-
-#ifdef __SPF
-                addToCollection(__LINE__, __FILE__,new, 0);
-#endif
-            }
-            else 
-            {
-                (void)strcpy(db_err_msg, "open_proj_file -- No more space");
-                return 0;
-            }
-        }
-    }
-    return 1;
-}
-
-
-/****************************************************************
- *								*
- *  DelFromProj -- Delte the file from the current project	*
- *								*
- *  Input:							*
- *	   file -- file name to be deleted			*
- *								*
- *  Output:							*
- *	   1 if everything ok					*
- *	   0 if something wrong 				*
- *								*
- ****************************************************************/
-int
-DelFromProj(file)
-	char *file;
-{
-    PTR_BLOB b, b1;
-
-    for (b = b1 = cur_proj->file_chain; b; b1 = b, b = b->next)
-	if (! strcmp(file, ((PTR_FILE)b->ref)->filename))
-	    break;
-    if (b) {			/* if non-NULL, then it's in the project */
-	dealloc((PTR_FILE)b->ref);
-	b1->next = b->next;
-	return 1;
-    } else
-	return 0;
-}
-
-
-/****************************************************************
- *								*
- *  open_proj_files -- open all the files in a given project	*
- *								*
- *  Input:							*
- *	   proj -- pointer to the project object		*
- *	   no	-- number of files in the project		*
- *	   file_list -- list of file names in the project	*
- *								*
- *  Output:							*
- *	   1 if everything ok					*
- *	   0 if something wrong 				*
- *								*
- ****************************************************************/
-static int
-open_proj_file(proj, no, file_list)
-	PTR_PROJ  proj;
-	int	  no;
-	char	**file_list;
-{
-    int	       i, index;
-    PTR_BLOB   b, new;
-    PTR_FILE   f;
-    char     **fp;
-
-    fp = file_list;		/* points to start of the list */
-    for (i = 1; i <= no; i++) {
-        if ((f = open_file(*fp++)) != NULL) 
-        {
-            b = alloc_blob();
-            if (b == NULL) 
-            {
-                (void)strcpy(db_err_msg, "open_proj_file: alloc_blob failed");
-                return 0;
-            }
-            b->ref = (PTR_BFND)f; /* NOT a bif node, but ... */
-            b->next = proj->file_chain;
-            proj->file_chain = b;
-
-            /* Insert all procedures into the project's hash table */
-            for (b = f->global_bfnd->entry.Template.bl_ptr1; b; b = b->next)
-            {
-                if (language == ForSrc || (language == CSrc && b->ref->variant == FUNC_HEDR))
-                {
-                    index = hash(b->ref->entry.Template.symbol->ident);
-                    if ((new = (PTR_BLOB)calloc(1, sizeof(struct blob))) != 0) 
-                    {
-                        new->ref = b->ref; /* point to the procedure's bif node */
-                        new->next = *(proj->hash_tbl + index);
-                        *(proj->hash_tbl + index) = new;
-#ifdef __SPF
-                        addToCollection(__LINE__, __FILE__,new, 0);
-#endif
-                    }
-                    else 
-                    {
-                        (void)strcpy(db_err_msg, "open_proj_file -- No more space");
-                        return 0;
-                    }
-                }
-            }
-        }
-        else 
-        {
-            (void)sprintf(db_err_msg, "OpenProj -- No such file \"%s\"\n", *(--fp));
-            return 0;
-        }
-    }
-    return 1;
-}
-
-
-
-/****************************************************************
- *								*
- *  OpenProj -- open the project with list of files as		*
- *		specified in the "file_list"			*
- *								*
- *  Inputs:							*
- *	   pname     -- the project name			*
- *	   no	     -- number of files in the project		*
- *	   file_list -- list of .dep files to be read in	*
- *								*
- *  Output:							*
- *	   NON-NULL : a pointer to the project object so as to	*
- *		      be able to access the information.	*
- *	   NULL : open failure					*
- *								*
- ****************************************************************/
-PTR_PROJ
-OpenProj(pname, no, file_list)
-	char	 *pname;
-	int	  no;
-	char	**file_list;
-{
-    PTR_BLOB b;
-    PTR_PROJ p;
-
-    /* First allocate a project structure to it */
-    if ((p = (PTR_PROJ)calloc(1, sizeof(struct proj_obj))) == NULL)
-        return NULL;
-
-    p->proj_name = malloc(strlen(pname) + 1);
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__, p->proj_name, 0);
-    addToCollection(__LINE__, __FILE__, p, 0);
-#endif
-    (void)strcpy(p->proj_name, pname);
-
-    /* Then insert it to the project chain */
-    b = alloc_blob();
-    b->ref = (PTR_BFND)p;	/* NOT a bif node, but ... */
-    b->next = head_proj;	/* insert this project to */
-    head_proj = b;		/*	...	the list */
-
-    cur_proj = p;		/* Make it the current active project */
-    p->hash_tbl = (PTR_BLOB *)calloc(hashMax, sizeof(PTR_BLOB));
-    if (p->hash_tbl == NULL)
-        return NULL;
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__, p->hash_tbl, 0);
-#endif
-
-    if (open_proj_file(p, no, file_list))
-        return (p);
-    else
-        return NULL;
-}
-
-
-/****************************************************************
- *								*
- *  SelectProj -- Select the project "proj_name" as active	*
- *		  project					*
- *								*
- *  Inputs:							*
- *	   proj_name - the project's filename			*
- *								*
- *  Output:							*
- *	   A PTR_PROJ that points to the selected project	*
- *	   object.  Returns a NULL if the project didn't exit	*
- *								*
- ****************************************************************/
-PTR_PROJ
-SelectProj(proj_name)
-	char	*proj_name;
-{
-    PTR_BLOB  b;
-    PTR_PROJ  p;
-
-    /* First search the project chain to find the one specified */
-    for (b = head_proj; b; b = b->next) {
-	p = (PTR_PROJ) b->ref;
-	if(!strcmp(proj_name, p->proj_name))
-	    break;
-    }
-
-    if (b == NULL) {
-	(void) sprintf(db_err_msg, "SelectProj -- no such project \"%s\"", proj_name);
-	return NULL;
-    }
-
-    return (cur_proj = p);
-}
-
-
-/****************************************************************
- *								*
- *  GetProjInfo -- get info about a given project from the data *
- *		   base 					*
- *								*
- *  Inputs:							*
- *	   proj_name - the project's filename			*
- *	   info      - type of info wanted.  Could be one of	*
- *		       the followings:				*
- *			 ProjFiles,  ProjNames, ProjGlobals,	*
- *			 ProjSrc or UnsolvRef			*
- *  Output:							*
- *	   A blob1 list that contains the info inquired 	*
- *								*
- *  Side Effects:						*
- *	   It changes the global variables "obj" and "tail"	*
- *	   (by calling insert_info_nd)				*
- *								*
- ****************************************************************/
-PTR_BLOB1
-GetProjInfo(proj_name, info)
-	char	*proj_name;
-	int	 info;
-{
-    PTR_BLOB  b, bl;
-    PTR_INFO  inf;
-    PTR_FILE  f;
-    PTR_PROJ  p;
-
-    /* First search the project chain to find the one specified */
-    for (b = head_proj; b; b = b->next) {
-	p = (PTR_PROJ) b->ref;
-	if(!strcmp(proj_name, p->proj_name))
-	    break;
-    }
-
-    if (b == NULL) {
-	(void) sprintf(db_err_msg, "GetProjInfo -- no such project \"%s\"", proj_name);
-	return NULL;
-    }
-
-    obj = tail = NULL;
-
-    /* Then search the file chain inside the project */
-    switch(info) {
-    case ProjFiles:
-	for (b = p->file_chain; b; b = b->next) {
-	    f = (PTR_FILE) b->ref;
-	    inf = make_obj_info(f->filename, 0, 0, NULL);
-	    insert_info_nd(make_blob1(IsObj, inf, NULL));
-	}
-	break;
-    case ProjSrc:
-	{
-	    char *c_tab[100],	/* for .c files */
-	    *h_tab[100],	/* for .h files */
-	    *u_tab[100];	/* for .f and other unknow type files */
-	    char **c1, **c2, **h1, **h2, **u1, **u2, ch;
-	    PTR_FNAME fp;
-
-	    c1 = c2 = c_tab;
-	    u1 = u2 = u_tab;
-	    h1 = h_tab;
-
-	    /* Scan through the file chain to gather all filenames */
-	    for (b = p->file_chain; b; b = b->next)
-		for (fp = ((PTR_FILE)b->ref)->head_file; fp; fp = fp->next) {
-		    if ((ch =last_char(fp->name)) == 'c')
-			*c1++ = fp->name;
-		    else if (ch == 'h') {
-			for (h2 = h_tab; h2 < h1; h2++)
-			    if (!strcmp(fp->name, *h2))
-				break;
-			if (h2 == h1)
-			    *h1++ = fp->name;
-		    }
-		    else
-			*u1++ = fp->name;
-		}
-
-	    /* Now link them all together */
-	    while (c2 < c1)
-		insert_info_nd(make_blob1(IsObj, make_obj_info(*c2++, 0, 0, NULL), NULL));
-
-	    h2 = h_tab;
-	    while (h2 < h1)
-		insert_info_nd(make_blob1(IsObj, make_obj_info(*h2++, 0, 0, NULL), NULL));
-
-	    while (u2 < u1)
-		insert_info_nd(make_blob1(IsObj, make_obj_info(*u2++, 0, 0, NULL), NULL));
-	}
-	break;
-    case ProjNames:
-	for (b = p->file_chain; b; b = b->next) {
-	    f = (PTR_FILE) b->ref;
-	    for(bl = f->global_bfnd->entry.Template.bl_ptr1; bl; bl = bl->next) {
-		PTR_BFND bf;
-		char * ch;
-		if (language == ForSrc ||
-		    (language == CSrc && bl->ref->variant==FUNC_HEDR)) {
-		    bf = bl->ref;
-		    ch = (UnparseBfnd[language])(bf);
-		    inf = make_obj_info(bf->filename->name, bf->g_line, bf->l_line, ch);
-		    insert_info_nd(make_blob1(IsObj, inf, NULL));
-		}
-	    }
-	}
-	break;
-    case ProjGlobals:		/* WARNING -- C languag specific */
-	if (language == CSrc)
-	    for (b = p->file_chain; b; b = b->next) {
-		f = (PTR_FILE) b->ref;
-		for(bl = f->global_bfnd->entry.Template.bl_ptr1; bl; bl = bl->next) {
-		    PTR_BFND bf;
-
-		    if (bl->ref->variant != FUNC_HEDR) {
-			bf = bl->ref;
-			inf = make_obj_info(bf->filename->name, bf->g_line, bf->l_line,
-					    (UnparseBfnd[language])(bf));
-			insert_info_nd(make_blob1(IsObj, inf, NULL));
-		    }
-		}
-	    }
-	break;
-    case UnsolvRef:
-	obj = NULL;
-	for (b = p->file_chain; b; b = b->next) {
-	    f = (PTR_FILE) b->ref;
-	}
-	break;
-    }
-    return obj;
-}
-
-
-/****************************************************************
- *								*
- *  GetProcInfo -- get info about a given procedure from the	*
- *		   data base					*
- *								*
- *  Input:							*
- *	  proc_name - the procedure's filename			*
- *	  info	    - type of info wanted.  Could be one of	*
- *		      the followings:				*
- *		      ProcDef, Mod, Use, Alias, CallSite,	*
- *		      ExternProc, or CallSiteE			*
- *  Output:							*
- *	   A blob1 list that contains the info inquired 	*
- *								*
- ****************************************************************/
-PTR_BLOB1
-GetProcInfo(proc_name, info)
-	char	*proc_name;
-	int	 info;
-{
-    int    i;
-    char	   buf[1000], *bp, *tmp, *t;
-    PTR_PROJ proj;
-    PTR_FILE fi;
-    PTR_INFO inf;
-    PTR_BLOB bl;
-    PTR_BFND bf, bf1;
-    PTR_SYMB s;
-    PTR_LLND tp;
-
-    /* First search for the hash table to find the procedure bif node */
-    proj = cur_proj;
-    i = hash(proc_name);
-    for (bl = *(proj->hash_tbl + i); bl; bl = bl->next)
-        if (!strcmp(bl->ref->entry.Template.symbol->ident, proc_name))
-            break;		/* find it */
-
-    if (bl == NULL)		/* no such procedures or functions */
-        return NULL;
-
-    bf = bl->ref;		/* get the procedure header */
-    bf1 = bf->control_parent;	/* should get the global_bfnd */
-    fi = (PTR_FILE)bf1->control_parent; /* the file_info node */
-    obj = tail = NULL;
-    switch (info) {
-    case ProcDef:
-        bp = buf;		/* reset the pointer */
-        bf1 = bf->control_parent; /* should get the global_bfnd */
-        fi = (PTR_FILE)bf1->control_parent; /* the file_info node */
-        t = tmp = (UnparseBfnd[language])(bf); /* unparse the proc node */
-        while ((*bp = *t++) != 0)	/* save to the output area */
-            bp++;
-#ifdef __SPF
-        removeFromCollection(tmp);
-#endif
-        free(tmp);
-        s = bf->entry.Template.symbol; /* symbol node of the proc */
-
-        /* Now trace down its parameter declaration */
-        for (s = s->entry.proc_decl.in_list; s; s = s->entry.var_decl.next_in) {
-            tmp = t = (UnparseSymb[language])(s);
-            while ((*bp = *t++) != 0)
-                bp++;
-#ifdef __SPF
-            removeFromCollection(tmp);
-#endif
-            free(tmp);
-        }
-        *bp = '\0';		/* Mark end of string */
-        bp = malloc(strlen(buf) + 1);
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,bp, 0);
-#endif
-        (void)strcpy(bp, buf);
-        inf = make_obj_info(fi->filename, bf->g_line, bf->l_line, bp);
-        return(make_blob1(IsObj, inf, NULL));
-    case Mod:
-        tp = bf->entry.Template.ll_ptr2;
-        if (tp->entry.Template.ll_ptr2 != NULL)
-            tp = tp->entry.Template.ll_ptr2;
-        inf = make_obj_info(fi->filename, bf->g_line, bf->l_line,
-            (UnparseLlnd[language])(tp));
-        return(make_blob1(IsObj, inf, NULL));
-    case Use:
-        tp = bf->entry.Template.ll_ptr3;
-        if (tp->entry.Template.ll_ptr2 != NULL)
-            tp = tp->entry.Template.ll_ptr2;
-        inf = make_obj_info(fi->filename, bf->g_line, bf->l_line,
-            (UnparseLlnd[language])(tp));
-        return(make_blob1(IsObj, inf, NULL));
-    case Alias:
-        break;
-    case CallSite:
-        bf = bl->ref;
-        for (bl = bf->entry.Template.bl_ptr1; bl; bl = bl->next)
-            find_proc_call(fi, bl->ref);
-        skip_rest = 0;
-        return obj;
-    case ExternProc:
-        break;
-    case CallSiteE:
-        bp = malloc(strlen(bf->entry.Template.symbol->ident) + 1);
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,bp, 0);
-#endif
-        (void)strcpy(bp, bf->entry.Template.symbol->ident);
-        inf = make_obj_info(fi->filename, bf->g_line, bf->l_line, bp);
-        return (make_blob1(IsObj, inf, ext_proc_call(fi, bf->entry.Template.bl_ptr1)));
-    default:
-        (void)strcpy(db_err_msg, "GetProcInfo -- No such info available");
-        break;
-    }
-    return NULL;
-}
-
-
-/****************************************************************
- *								*
- *  GetVarInfo -- get info about a given variable from the data *
- *		  base						*
- *								*
- *  Inputs:							*
- *	   var_name - the variable's name			*
- *	   info     - type of info wanted.  Could be one of the *
- *		      following: Use, Mod, UseMod and Alias	*
- *	   proc_name - specifies the procedure you want to	*
- *		      check.  If it's NULL, then all instances	*
- *		      of the "var_name" will be returned	*
- *  Output:							*
- *	   A blob1 list that contains the info inquired 	*
- *								*
- ****************************************************************/
-PTR_BLOB1
-GetVarInfo(var_name, info, proc_name)
-	char	*var_name;
-	int	 info;
-	char	*proc_name;
-{
-    int   i;
-    PTR_HASH  p;
-    PTR_BFND  bif;
-    PTR_BLOB  bl;
-	
-    /* First, get the symbol table entry */
-    i = hash(var_name);
-    for (p = hash_table[i]; p ; p = p->next_entry)
-	if(!strcmp(var_name, p->id_attr->ident))
-	    break;
-    if (p == NULL)		/* no such variable */
-	return(NULL);
-
-    /* Then for its ud_chain */
-    for (bl = p->id_attr->ud_chain; bl; bl = bl->next) {
-	bif = bl->ref;
-	switch(bif->variant) {
-	case PROG_HEDR:
-	case PROC_HEDR:
-	case FUNC_HEDR:
-	    break;
-	case CDOALL_NODE:
-	case FOR_NODE:
-	    check_llnd(bif, bif->entry.Template.ll_ptr1, Use, var_name); /* check range */
-	    check_llnd(bif, bif->entry.Template.ll_ptr2, Use, var_name); /* check incr */
-	    check_llnd(bif, bif->entry.Template.ll_ptr3, Use, var_name); /* where cond */
-	    break;
-	case WHILE_NODE:
-	case WHERE_NODE:
-	    check_llnd(bif, bif->entry.Template.ll_ptr1, Use, var_name); /* check cond */
-	    break;
-	case IF_NODE:
-	case ELSEIF_NODE:
-	    check_llnd(bif, bif->entry.Template.ll_ptr1, Use, var_name); /* check cond */
-	    break;
-	case LOGIF_NODE:
-	    check_llnd(bif, bif->entry.Template.ll_ptr1, Use, var_name); /* check cond */
-	    break;
-	case ARITHIF_NODE:
-	    check_llnd(bif, bif->entry.Template.ll_ptr1, Use, var_name); /* check cond */
-	    break;
-	case ASSIGN_STAT:
-	case IDENTIFY:
-	    check_llnd(bif, bif->entry.Template.ll_ptr1, Use, var_name); /* check l_val */
-	    check_llnd(bif, bif->entry.Template.ll_ptr2, Use, var_name); /* check r_val */
-	    break;
-	case PROC_STAT:
-	    check_llnd(bif, bif->entry.Template.ll_ptr1, Use, var_name); /* check l_val */
-	    break;
-	case ASSGOTO_NODE:
-	case COMGOTO_NODE:
-	    check_llnd(bif, bif->entry.Template.ll_ptr1, Use, var_name); /* check l_val */
-	    break;
-	case VAR_DECL:
-	case PARAM_DECL:
-	case DIM_STAT:
-	case EQUI_STAT:
-	case DATA_DECL:
-	case IMPL_DECL:
-	    /* for type decl chain
-	       check_llnd(bif, bif->entry.Template.ll_ptr1, Use, var_name);
-	       break;
-	       */
-	case READ_STAT:
-	case WRITE_STAT:
-	    break;
-	case STOP_STAT:
-	case OTHERIO_STAT:
-	case COMM_STAT:
-	case CONT_STAT:
-	case FORMAT_STAT:
-	case GOTO_NODE:
-	case CONTROL_END:
-	    break;
-	default:
-	    break;
-	}
-    }
- return(NULL);
-}
-
-
-/****************************************************************
- *								*
- *  GetTypeInfo -- get a list of variables of a given type from *
- *		   the data base				*
- *								*
- *  Input:							*
- *	  type_name - the type's name				*
- *	  proc_name - specifies the procedure you want to	*
- *		      check.  If it's NULL, then all instances	*
- *		      of the "var_name" will be returned	*
- *  Output:							*
- *	   A blob1 list that contains the info inquired 	*
- *								*
- ****************************************************************/
-PTR_BLOB1
-GetTypeInfo(type_name, proc_name)
-	char	*type_name;
-	char	*proc_name;
-{
-    return NULL;
-}
-
-
-/****************************************************************
- *								*
- *  GetTypeDef -- Get definition about a given type from	*
- *		  the data base 				*
- *								*
- *  Input:							*
- *	  type_name - the type's name				*
- *	  proc_name - specifies the procedure you want to	*
- *		      check.  If it's NULL, then all instances	*
- *		      of the "var_name" will be returned	*
- *  Output:							*
- *	   A blob1 list that contains the info inquired 	*
- *								*
- ****************************************************************/
-PTR_BLOB1
-GetTypeDef(type_name, proc_name)
-	char	*type_name;
-	char	*proc_name;
-{
-    int i;
-    char *c;
-    PTR_BLOB bl;
-    PTR_BLOB1 bl1 = NULL, bl2;
-    PTR_BFND bf;
-    PTR_FILE f;
-    PTR_HASH p;
-
-    if (proc_name) {		/* if procedure name was specified */
-	i = hash(proc_name);
-	for (bl = *(cur_proj->hash_tbl + i); bl; bl = bl->next)
-	    if (!strcmp(proc_name, bl->ref->entry.Template.symbol->ident))
-		break;		/* find it */
-	if (bl == NULL) {
-	    (void) sprintf(db_err_msg,"GetTypeDef -- no such procedure \"%s\"",proc_name);
-	    return NULL;
-	}
-	bf = bl->ref->control_parent; /* should get the global bif node */
-	f = (PTR_FILE)bf->control_parent; /* get the file info node */
-	i = hash(type_name);
-	for (p = *(f->hash_tbl + i); p; p = p->next_entry)
-	    if( 		/* p->id_attr->variant == TYPE_NAME && */
-	       !strcmp(type_name, p->id_attr->ident)) {
-		c = (*unparse_type)(p->id_attr->type);
-		return (make_blob1(IsObj, make_obj_info(proc_name, 0, 0, c), NULL));
-	    }
-	(void) sprintf(db_err_msg, "GetTypeDef -- No such type \"%s\"",type_name);
-	return NULL;
-    } else {			/* procedure name not specified */
-	for (bl = cur_proj->file_chain; bl; bl = bl->next) {
-	    f = (PTR_FILE)bl->ref;
-	    i = hash(type_name);
-	    for (p = *(f->hash_tbl + i); p; p = p->next_entry)
-		if(		/* p->id_attr->variant == TYPE_NAME && */
-		   !strcmp(type_name, p->id_attr->ident)) {
-		    c = (*unparse_type)(p->id_attr->type);
-		    bl2 = make_blob1(IsObj,
-				     make_obj_info(p->id_attr->scope->entry.Template.symbol->ident, 0, 0, c),
-				     NULL);
-		    if (bl1) {
-			bl2->next = bl1;
-			bl1 = bl2;
-		    } else
-			bl1 = bl2;
-		}
-	}
-	return bl1;
-    }
-}
-
-/****************************************************************
- *								*
- *  rec_num_search -- recursively search for the bif node that	*
- *		      corresponds to the num'th line in the	*
- *		      file fname				*
- *								*
- *  Inputs:							*
- *	bf    - the bif node that will be searched		*
- *	num   - line number					*
- *	fname - filename to be checked against			*
- *								*
- *  Output:							*
- *	The bif node pointer if one exists for the given line	*
- *	in the given file					*
- *								*
- ****************************************************************/
-PTR_BFND
-rec_num_search(bf,num,fname)
-	PTR_BFND bf;
-	int	 num;
-	char 	*fname;
-{
-    if (!strcmp(bf->filename->name, fname) && bf->g_line == num)
-	return(bf);
-    else{
-	PTR_BLOB b;
-	PTR_BFND rv;
-
-	for (b = bf->entry.Template.bl_ptr1; b; b = b->next)
-	    if( (rv = rec_num_search(b->ref,num,fname)) != NULL)
-		return(rv);
-
-	for (b = bf->entry.Template.bl_ptr2; b; b = b->next)
-	    if( (rv = rec_num_search(b->ref,num,fname)) != NULL)
-		return(rv);
-    }
-    return(NULL);
-}
-
-
-/****************************************************************
- *								*
- *   FindBifNode -- find the corresponding BIF node given a	*
- *		    filename and line number			*
- *								*
- *   Input:							*
- *	    filename - name of the file to be looked upon	*
- *	    line     - line number to be checked		*
- *								*
- *   Output:							*
- *	    A bif pointer (PTR_BFND) points to the bif node	*
- *	    corresponds to the given line number		*
- *	    NULL if error occured				*
- *								*
- ****************************************************************/
-PTR_BFND
-FindBifNode(filename, line)
-	char	*filename;
-	int	 line;
-	
-{
-    PTR_PROJ p = cur_proj;
-    PTR_BFND bf = NULL;
-    PTR_BFND rec_num_search();
-    PTR_BLOB b;
-
-    for (b=p->file_chain; b; b = b->next) {
-	if(!strcmp(((PTR_FILE)b->ref)->filename, filename)) {
-	    bf = ((PTR_FILE)b->ref)->head_bfnd;
-	    break;
-	}
-    }
-
-    if (!b) {
-	(void) sprintf(db_err_msg, "No such file \"%s\" in this project",filename);
-	return NULL;
-    }
-    return(rec_num_search(bf,line,filename));
-}
-
-
-/****************************************************************
- *								*
- *  bget_prop -- Get property named "pname" from the property	*
- *		 of a given bif node				*
- *								*
- *  Inputs:							*
- *	  bf	- bif pointer from which the property is to be	*
- *		  extracted					*
- *	  pname - property name in string			*
- *								*
- *  Output:							*
- *	  value of the specified property			*
- *	  NULL if not found					*
- *								*
- ****************************************************************/
-char *
-bget_prop(bf, pname)
-	PTR_BFND bf;
-	char	*pname;
-{
-    register PTR_PLNK prop;
-
-    for (prop = bf->prop_list; prop; prop = prop->next)
-	if (! strcmp(prop->prop_name, pname))
-	    return (prop->prop_val);
-    return (NULL);
-}
-
-
-/****************************************************************
- *								*
- *  get_prop -- Get property named "pname" from a given 	*
- *	       statement's property list			*
- *								*
- *  Inputs:							*
-
- *	  fname   - name of the source file			*
- *	  line_no - line number of the statement		*
- *	  pname   - property name in string			*
- *								*
- *  Output:							*
- *	  value of the specified property			*
- *								*
- ****************************************************************/
-char *
-get_prop(fname, line_no, pname)
-	char	*fname;
-	int	 line_no;
-	char	*pname;
-{
-    PTR_BFND bf;
-
-    bf = FindBifNode(fname, line_no);
-    return (bf? bget_prop(bf, pname): NULL);
-}
-
-
-/****************************************************************
- *								*
- *  put_prop -- Put property "prop" about a given statement to	*
- *		  the data base 				*
- *								*
- *  Inputs:							*
- *	  fname   - name of the source file			*
- *	  line_no - line number of the statement		*
- *	  pname   - property name in string			*
- *	  value   - property value				*
- *								*
- *  Output:							*
- *	  0 - if no error occured				*
- *	  1 - if error occured					*
- *								*
- ****************************************************************/
-int
-put_prop(fname, line_no, pname, value)
-	char	*fname;
-	int	 line_no;
-	char	*pname;
-	char	*value;
-{
-    PTR_BFND bf;
-    PTR_PLNK pr;
-
-    bf = FindBifNode(fname, line_no);
-    if (bf)
-    {
-        if ((pr = (PTR_PLNK)malloc(sizeof(struct prop_link))) != 0) 
-        {
-            pr->prop_name = pname;
-            pr->prop_val = value;
-            pr->next = bf->prop_list;
-            bf->prop_list = pr;
-#ifdef __SPF
-            addToCollection(__LINE__, __FILE__,pr, 0);
-#endif
-            return 0;
-        }
-        else
-            (void)strcpy(db_err_msg, "put_prop -- No more space");
-    }
-    return 1;
-}
-
-
-static char *depstrs[] = { "flow","anti","output","huh??","got me?"};
-static char *dirstrs[] = { "  ", "= ", "- ", "0-", "+ ", "0+", ". ", "+-"};
-
-static PTR_BFND current_par_loop = NULL;
-
-static int
-same_loop(from, to)
-	PTR_BFND from, to;
-{
-    PTR_BFND c;
-    c = from;
-    while(c != NULL && c->variant != GLOBAL && c != current_par_loop)
-	c = c->control_parent;
-    if(c != current_par_loop) return(0);
-    c = to;
-    while(c != NULL && c->variant != GLOBAL && c != current_par_loop)
-	c = c->control_parent;
-    if(c != current_par_loop) return(0);
-    return(1);
-}
-
-static PTR_BLOB1
-search_deps(nb,q,depth)
-    PTR_BLOB1	nb;
-    PTR_BLOB	q;
-    int 	depth;
-{
-    PTR_BFND  bchild;
-    PTR_DEP   d;
-    char	   *s;
-    PTR_BLOB1 lb = NULL, btmp;
-
-    if (nb != NULL) lb = nb;
-    while (q != NULL) {
-        bchild = q->ref;
-        q = q->next;
-        d = bchild->entry.Template.dep_ptr1;
-        while (d != NULL) {
-            if ((d->symbol->type->variant == T_ARRAY && d->direct[depth] > 1) ||
-                (d->type == 0 && d->direct[depth] > 1))
-                if (same_loop(d->from.stmt, d->to.stmt)) {
-                    btmp = (PTR_BLOB1)malloc(sizeof(struct blob1));
-                    if (nb == NULL) { nb = btmp; lb = btmp; }
-                    else { lb->next = btmp; lb = btmp; }
-                    s = malloc(256);
-#ifdef __SPF
-                    addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-                    sprintf(s, "id:%s type:%s to line %d dir_vect =(%s,%s,%s)\n",
-                        d->symbol->ident, depstrs[(int)(d->type)],
-                        d->to.stmt->g_line,
-                        dirstrs[(int)(d->direct[1])], dirstrs[(int)(d->direct[2])],
-                        dirstrs[(int)(d->direct[3])]);
-                    btmp->ref = s;
-                    btmp->next = NULL;
-                }
-            d = d->from_fwd;
-        }
-        if (bchild->entry.Template.bl_ptr1 != NULL) {
-            nb = search_deps(nb, bchild->entry.Template.bl_ptr1, depth);
-            lb = nb; while (lb != NULL && lb->next != NULL) lb = lb->next;
-        }
-        if (bchild->entry.Template.bl_ptr2 != NULL) {
-            nb = search_deps(nb, bchild->entry.Template.bl_ptr2, depth);
-            lb = nb; while (lb != NULL && lb->next != NULL) lb = lb->next;
-        }
-    }
-    return(nb);
-}
-
-
-PTR_BLOB1
-GetDepInfo(filename, line)
-	char *filename;
-	int line;
-{
-    PTR_BFND b, bpar;
-    PTR_DEP d;
-    int depth;
-    char * s;
-    PTR_BLOB1 nb, lb, btmp;
-    PTR_BLOB q;
-
-    b = FindBifNode(filename, line);
-    if (b == NULL) return(NULL);
-    /* if b is a loop, we look for all loop carried deps for */
-    /* this loop.  otherwise just list dependence going out */
-    if (b->variant == FOR_NODE) {
-        depth = 0;
-        bpar = b;
-        current_par_loop = b;
-        while (bpar != NULL && bpar->variant != GLOBAL) {
-            if (bpar->variant == FOR_NODE ||
-                bpar->variant == CDOALL_NODE ||
-                bpar->variant == WHILE_NODE ||
-                bpar->variant == FORALL_NODE) depth++;
-            bpar = bpar->control_parent;
-        }
-        q = b->entry.Template.bl_ptr1;
-        nb = (PTR_BLOB1)malloc(sizeof(struct blob1));
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,nb, 0);
-#endif
-        s = malloc(256);
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-        sprintf(s, "Essential dependences inhibiting parallelization of loop are:\n");
-        nb->ref = s;
-        nb->next = NULL;
-        nb = search_deps(nb, q, depth);
-        return(nb);
-    }				/* if loop case */
-    d = b->entry.Template.dep_ptr1;
-    nb = NULL;
-    while (d != NULL) {
-        btmp = (PTR_BLOB1)malloc(sizeof(struct blob1));
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,btmp, 0);
-#endif
-        if (nb == NULL) { nb = btmp; lb = btmp; }
-        else { lb->next = btmp; lb = btmp; }
-        s = malloc(256);
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-        sprintf(s, "id:%s type:%s to line %d dir_vect =(%s,%s,%s)\n",
-            d->symbol->ident, depstrs[(int)(d->type)],
-            d->to.stmt->g_line,
-            dirstrs[(int)(d->direct[1])], dirstrs[(int)(d->direct[2])],
-            dirstrs[(int)(d->direct[3])]);
-        btmp->ref = s;
-        btmp->next = NULL;
-        d = d->from_fwd;
-    }
-    return(nb);
-}
-
-
-/****************************************************************
- *								*
- *   FindRef -- find the reference of the given symbol in the	*
- *		low level node					*
- *								*
- *   Inputs:							*
- *		ll - the low level node to be searched		*
- *		name - the symbol name to be looked up		*
- *								*
- *   Output:							*
- *		an integer indicating the type of the "name":	*
- *								*
- *			0 -- program				*
- *			1 -- procedure				*
- *			2 -- function				*
- *			3 -- constant (or parmameter in Fortran)*
- *			4 -- scalar variable			*
- *			5 -- array variable			*
- *			6 -- record variable			*
- *			7 -- enumerated type			*
- *			8 -- label variable			*
- *			9 -- name of common block		*
- *								*
- ****************************************************************/
-static int
-FindRef(ll, name)
-	PTR_LLND  ll;
-	char	 *name;
-{
-    int val;
-
-    if (!ll)
-	return -1;
-	
-    switch (ll->variant) {
-    case CONST_REF:
-	if (!strcmp(name, ll->entry.Template.symbol->ident))
-	    return 3;
-	break;
-    case VAR_REF:
-	if (!strcmp(name, ll->entry.Template.symbol->ident))
-	    return 4;
-	break;
-    case ARRAY_REF:
-	if (!strcmp(name, ll->entry.Template.symbol->ident))
-	    return 5;
-	break;
-    case RECORD_REF:
-	if (!strcmp(name, ll->entry.Template.symbol->ident))
-	    return 6;
-	break;
-    case ENUM_REF:
-	if (!strcmp(name, ll->entry.Template.symbol->ident))
-	    return 7;
-	break;
-    case LABEL_REF:
-	if (!strcmp(name, ll->entry.Template.symbol->ident))
-	    return 8;
-	break;
-    case COMM_LIST:
-	if (ll->entry.Template.symbol && /* could be blank common */
-	    !strcmp(name, ll->entry.Template.symbol->ident))
-	    return 9;
-	break;
-    case FUNC_CALL:
-	if (!strcmp(name, ll->entry.Template.symbol->ident))
-	    return 2;
-	break;
-    default:
-	break;
-    }
-
-    if ((val=FindRef(ll->entry.Template.ll_ptr1,name)) != -1)
-	return val;
-
-    if ((val=FindRef(ll->entry.Template.ll_ptr2,name)) != -1)
-	return val;
-    return -1;
-}
-
-
-/****************************************************************
- *								*
- *   SymbType -- find the type of the given symbol		*
- *								*
- *   Input:							*
- *	    filename - name of the file to be looked upon	*
- *	    line     - line number of the symbol reference	*
- *	    name     - varaible name				*
- *								*
- *   Output:							*
- *	    an integer representing the variable type (take a	*
- *	    look at "../h/tag" for possible returned values	*
- *	    return a -1 if error occured			*
- *								*
- ****************************************************************/
-int
-SymbType(filename, line, name)
-	char	*filename;
-	int	 line;
-	char	*name;
-{
-    int val;
-    PTR_BFND bf;
-
-    if ((bf = FindBifNode(filename, line)) == NULL)
-	return -1;
-
-    switch (bf->variant) {
-    case PROG_HEDR:
-	if (!strcmp(name, bf->entry.Template.symbol->ident))
-	    return 0;
-	break;
-    case PROC_HEDR:
-	if (!strcmp(name, bf->entry.Template.symbol->ident))
-	    return 1;
-	break;
-    case FUNC_HEDR:
-    case PROC_STAT:
-	if (!strcmp(name, bf->entry.Template.symbol->ident))
-	    return 2;
-	break;
-    }
-    if ((val=FindRef(bf->entry.Template.ll_ptr1,name)) != -1)
-	return val;
-
-    if ((val=FindRef(bf->entry.Template.ll_ptr2,name)) != -1)
-	return val;
-
-    if ((val=FindRef(bf->entry.Template.ll_ptr3,name)) != -1)
-	return val;
-    (void) sprintf(db_err_msg, "No such symbol \"%s\" in line %d",name, line);
-    return -1;
-}
-
-
-/****************************************************************
- *								*
- *   EndOfLoop -- find line number of end of loop statement	*
- *								*
- *   Input:							*
- *	    filename - name of the file to be looked upon	*
- *	    line     - line number of the lopp statement	*
- *								*
- *   Output:							*
- *	    return the line number of the end-of-loop statement *
- *	    return -1 if error occured				*
- *								*
- ****************************************************************/
-int
-EndOfLoop(filename, line)
-	char	*filename;
-	int	 line;
-{
-    PTR_BFND bf;
-    PTR_BLOB bl, bl1;
-
-    if ( (bf = FindBifNode(filename, line)) != NULL) {
-	bl1 = NULL;
-	for (bl=bf->entry.for_node.control; bl; bl = bl->next)
-	    bl1 = bl;
-	if (bl1)
-	    return bl1->ref->g_line;
-    }
-    return -1;
-}
-
-
-/****************************************************************
- *								*
- *    ProgName -- get the main program's name from data base	*
- *								*
- *    Input:							*
- *		proj -- poniter of project object		*
- *								*
- *    Output:							*
- *		A string that contains the program's name	*
- *		A NULL point if no main program exists		*
- *								*
- ****************************************************************/
-char *
-ProjName(proj)
-	PTR_PROJ proj;
-{
-    PTR_BLOB b, bl;
-    PTR_FILE f;
-
-    for (b = proj->file_chain; b; b = b->next) {
-	f = (PTR_FILE) b->ref;
-	for (bl = f->global_bfnd->entry.Template.bl_ptr1; bl; bl = bl->next)
-	    if (bl->ref->variant == PROG_HEDR)
-		return (bl->ref->entry.Template.symbol->ident);
-    }
-    return NULL;
-}
-
-
-/****************************************************************
- *								*
- * GetLangType -- get the type of language of a file		*
- *								*
- * Input:							*
- *	bf - a bif node pointer (to represent a file)		*
- *								*
- * Output:							*
- *	An integer of value CSrc, ForSrc etc.  with the CSrc	*
- *	means this is a C program and ForSrc, a Fortran one.	*
- *	A -1 indicates something wrong.				*
- *								*
- ****************************************************************/
-int
-GetLangType(bf)
-    PTR_BFND bf;
-{
-    PTR_BFND b;
-
-    /* First, find the global bif node of this dep file */
-    for(b = bf; b && b->variant == GLOBAL ; b = b->control_parent)
-	;
-    
-    /* Its control_parent is set to the file object that contains it */
-    return(b? ((PTR_FILE)b->control_parent)->lang: -1);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
deleted file mode 100644
index 24b5f11..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp.c
+++ /dev/null
@@ -1,1956 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/****************************************************************
- *								*
- *  db_unp.c -- contains the procedures required to unparse the *
- *		bif graph back to source form for Fortran	*
- *								*
- ****************************************************************/
-
-#include <stdlib.h>
-#include "db.h"
-#include "f90.h"
-
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
- 
-#define NULLTEST(VAR)	(VAR == NULL? -1 : VAR->id)
-#define type_index(X)	(X-T_INT)
-#define binop(n)	(n >= EQ_OP && n <= NEQV_OP)
- 
-PTR_SYMB cur_symb_head;		/* point to the head of the list of symbols */
-				/* used to search type that LIKE the current*/
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-int   figure_tabs();
-//TODO: allocate buffer dynamically
-//used in vpc.c
-#define BUFLEN 500000
-char buffer[BUFLEN], *bp;
-
-static int	 in_param = 0;	/* set if unparsing the parameter statement */
-static int	 in_impli = 0;	/* set if unparsing the implicit statement */
-static PTR_CMNT  cmnt = NULL;	/* point to chain of comment list */
-static int	 print_comments = 1; /* 0 if no comments */
-static char	 first = 1;	/* used when unparsing LOGGOTO which has two */
-				/*  ...  bif nodes */
-
-/*
- * Forward references
- */
-static void unp_llnd();
-
-
-/*
- * Ascii names for operators in the language
- */
-static
-char *fop_name[] = {
-	" .eq. ",
-	" .lt. ",
-	" .gt. ",
-	" .ne. ",
-	" .le. ",
-	" .ge. ",
-	"+",
-	"-",
-	" .or. ",
-	"*",
-	"/",
-	"",
-	" .and. ",
-	"**",
-	"",
-	"//",
-	" .xor. ",
-	" .eqv. ",
-	" .neqv. "
-};
-
-
-/*
- * Precedence table of operators for Fortran
- */
-static
-char  precedence[] = {	/* precedence table of the operators */
-	5,		/* .eq. */
-	5,		/* .lt. */
-	5,		/* .gt. */
-	5,		/* .ne. */
-	5,		/* .le. */
-	5,		/* .ge. */
-	3,		/*  +   */
-	3,		/*  -   */
-	8,		/* .or. */
-	2,		/*  *   */
-	2,		/*  /   */
-	0,		/* none */
-	7,		/* .and. */
-	1,		/*  **  */
-	0,		/* none */
-	4,		/*  //  */
-	8,		/* .xor. */
-	9,		/* .eqv. */
-	9		/* .neqv. */
-};
-
-
-/*
- * Type names in ascii form
- */
-static
-char *ftype_name[] = {
-	"integer",
-	"real",
-	"double precision",
-	"character",
-	"logical",
-	"character",
-	"gate",
-	"event",
-	"sequence",
-	"",
-	"",
-	"",
-	"",
-	"complex",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"",
-	"double complex"
-};
-
-	
-/****************************************************************
- *								*
- *  put_tabs -- indent the statement by putting some blanks	*
- *								*
- *  Input:							*
- *	   n - number of tabs wanted				*
- *								*
- ****************************************************************/
-static void
-put_tabs(n)
-	int n;
-{
-	int i; 
-
-	for(i = 0; i < n; i++) {
-		*bp++ = ' ';
-		*bp++ = ' ';
-	}
-}
-
-
-/****************************************************************
- *								*
- *  figure_tabs -- figure out the indentation level of the	*
- *		    given bif node				*
- *								*
- *  Input:							*
- *	bf - the bif node pointer				*
- *								*
- *  Output:							*
- *	an integer indicating the indentation level		*
- *								*
- ****************************************************************/
-int
-figure_tabs(bf)
-	PTR_BFND bf;
-{
-	int count = 0;
-
-	while(bf->variant != PROG_HEDR && bf->variant != PROC_HEDR &&
-	      bf->variant != FUNC_HEDR && bf->variant != GLOBAL){
-		if(bf->variant != ELSEIF_NODE) count++;
-		bf = bf->control_parent;
-	}
-	return(count);
-}
-
-
-/****************************************************************
- *								*
- *  addstr -- add the string "s" to output buffer		*
- *								*
- *  Input:							*
- *	   s  - the string to be appended to the buffer		*
- *								*
- *  Side effect:						*
- *	   bp - points to where next character will go		*
- *								*
- ****************************************************************/
-static void
-addstr(s)
-	char *s;
-{
-	while( (*bp = *s++) != 0)
-		bp++;
-}
-
-
-/*
- * pr_ftype_name(ptype) -- print out the variable type.
- */
-static int
-pr_ftype_name(ptype, def)
-	PTR_TYPE ptype;
-	int	 def;  /* def = 1 means it is a type define,
-			  	print the whole type
-			  def = 0 : the type has a name.    */
-
-{	int gen_rec_decl ();
-
-
-	if (ptype == NULL)  return(0);
-
-	if (def == 0 && ptype->name) { /* print the type name */
-	   addstr (ptype->name->ident);
-	   return(1);
-	}   
-
-	switch (ptype->variant) {
-	case T_INT   :
-	case T_FLOAT :
-	case T_DOUBLE:
-	case T_CHAR  :
-	case T_BOOL  :
-	case T_STRING:
-	case T_COMPLEX:
-		addstr (ftype_name[ptype->variant - T_INT]);
-		break;
-	case T_DCOMPLEX:
-		addstr (ftype_name[ptype->variant - T_INT]);
-		break;
-	case T_GATE:
-		addstr ("gate");
-		break;
-	case T_EVENT:
-		addstr ("event");
-		break;
-	case T_SEQUENCE:
-		addstr ("sequence");
-		break;
-	case T_ARRAY :
-		pr_ftype_name (ptype->entry.ar_decl.base_type, 0);
-		break;
-        case T_DERIVED_TYPE:
-		addstr("type (");
-		addstr(ptype->name->ident);
-		addstr(")");
-		break;
-        case T_POINTER:
-		pr_ftype_name(ptype->entry.Template.base_type,0);
-		break;
-		
-	default :
-		return 0;
-	}
-	return (1);
-}
-     
-
-static void
-gen_loop_header(looptype, pbf)
-	char	*looptype;
-	PTR_BFND pbf;
-{
-	char	label[7];
-
-	addstr(looptype);
-	if ((pbf->variant == PARDO_NODE) || (pbf->variant == PDO_NODE))
-           if (pbf->entry.for_node.where_cond)
-              {
-                 addstr(" ( ");
-	         unp_llnd(pbf->entry.for_node.where_cond);
-                 addstr(" ) ");
-	      }
-	if (pbf->entry.for_node.doend) {
-		sprintf(label,"%d ",(int)(pbf->entry.for_node.doend->stateno));
-		addstr(label);
-	}
-	addstr(pbf->entry.for_node.control_var->ident);
-	addstr(" = ");
-	unp_llnd(pbf->entry.for_node.range->entry.binary_op.l_operand);
-	addstr(", ");
-	unp_llnd(pbf->entry.for_node.range->entry.binary_op.r_operand);
-	if (pbf->entry.for_node.increment) {
-		addstr(" , ");
-		unp_llnd(pbf->entry.for_node.increment);
-	}
-}
-
-
-/*
- * gen_if_node(pbf) --- generate the if statement pointed to by pbf.
- */
-static void
-gen_branch(branch_tag, branch_type, pbf)
-	int	  branch_tag;
-	char	 *branch_type;
-	PTR_BFND  pbf;
-{
-	addstr(branch_type);
-	*bp++ = '(';
-	unp_llnd(pbf->entry.if_node.condition);
-	*bp++ = ')';
-	if (branch_tag != WHERE_BLOCK_STMT)
-		addstr(" then");
-}
-
-
-/****************************************************************
- *								*
- *  unp_llnd -- unparse the given low level node to source	*
- *		string						*
- *								*
- *  Input:							*
- *	   pllnd - low level node to be unparsed		*
- *	   bp (implicitely) - where the output string to be	*
- *		   placed					*
- *								*
- *  Output:							*
- *	   the unparse string where "bp" was pointed to		*
- *								*
- *  Side Effect:						*
- *	   "bp" will be updated to the next character behind	*
- *	   the end of the unparsed string (by "addstr")		*
- *								*
- ****************************************************************/
-static void
-unp_llnd(pllnd)
-	PTR_LLND pllnd;
-{
-	if (pllnd == NULL) return;
-
-	switch (pllnd->variant) {
-	case INT_VAL	:
-		{ char sb[64];
-
-		  sprintf(sb, "%d", pllnd->entry.ival);
-		  addstr(sb);
-		  break;
-		}
-	case LABEL_REF:
-		{ char sb[64];
-
-		  sprintf(sb, "%d",(int)( pllnd->entry.label_list.lab_ptr->stateno));
-		  addstr(sb);
-		  break;
-		}
-	case FLOAT_VAL	:
-	case DOUBLE_VAL	:
-	case STMT_STR	:
-		addstr(pllnd->entry.string_val);
-		break;		  
-	case STRING_VAL	:
-	        *bp++ = '\'';
-		addstr(pllnd->entry.string_val);
-		*bp++ = '\'';
-		break;
-	case COMPLEX_VAL	:
-	        *bp++ = '(';
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-		*bp++ = ',';
-		unp_llnd(pllnd->entry.Template.ll_ptr2);
-		*bp++ = ')';
-		break;
-	case KEYWORD_VAL	:
-		addstr(pllnd->entry.string_val);
-		break;
-	case KEYWORD_ARG	:
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr("=");
-		unp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case BOOL_VAL	:
-		addstr(pllnd->entry.bval ? ".TRUE." : ".FALSE.");
-		break;
-	case CHAR_VAL	:
-		if (! in_impli)
-			*bp++ = '\'';
-		*bp++ = pllnd->entry.cval;
-		if (! in_impli)
-			*bp++ = '\'';
-		break;
-	case CONST_REF	:
-	case VAR_REF	:
-	case ENUM_REF	:
-	case TYPE_REF   :
-	case INTERFACE_REF:
-		addstr(pllnd->entry.Template.symbol->ident);
- /* Look out !!!! */
-/* Purpose unknown. Commented out. */
-/*
-                if (pllnd->entry.Template.symbol->type->entry.Template.ranges != LLNULL)
-		     unp_llnd(pllnd->entry.Template.symbol->type->entry.Template.ranges);
-*/
-		break;
-	case ARRAY_REF	:
-		addstr(pllnd->entry.array_ref.symbol->ident);
-		if (pllnd->entry.array_ref.index) {
-			*bp++ = '(';
-			unp_llnd(pllnd->entry.array_ref.index);
-			*bp++ = ')';
-		}
-		break;
-	case ARRAY_OP	:
-	        unp_llnd(pllnd->entry.Template.ll_ptr1);
-		*bp++ = '(';
-		unp_llnd(pllnd->entry.Template.ll_ptr2);
-		*bp++ = ')';
-		break;
-	case RECORD_REF	:
-	        unp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr("%");
-		unp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case STRUCTURE_CONSTRUCTOR	:
-	        addstr(pllnd->entry.Template.symbol->ident);
-		*bp++ = '(';
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-		*bp++ = ')';
-		break;
-	case CONSTRUCTOR_REF	:
-		addstr("(/");
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr("/)");
-		break;
-	case ACCESS_REF	:
-		unp_llnd(pllnd->entry.access_ref.access);
-		if (pllnd->entry.access_ref.index != NULL) {
-			*bp++ = '(';
-			unp_llnd(pllnd->entry.access_ref.index);
-			*bp++ = ')';
-		}
-		break;
-        case OVERLOADED_CALL:
-		break;
-	case CONS	:
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr(",");
-		unp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case ACCESS	:
-		unp_llnd(pllnd->entry.access.array);
-		addstr(", FORALL=(");
-		addstr(pllnd->entry.access.control_var->ident);
-		*bp++ = '=';
-		unp_llnd(pllnd->entry.access.range);
-		*bp++ = ')';
-		break;
-	case IOACCESS	:
-		*bp++ = '(';
-		unp_llnd(pllnd->entry.ioaccess.array);
-		addstr(", ");
-		addstr(pllnd->entry.ioaccess.control_var->ident);
-		*bp++ = '=';
-		unp_llnd(pllnd->entry.ioaccess.range);
-		*bp++ = ')';
-		break;
-	case PROC_CALL	:
-	case FUNC_CALL	:
-		addstr(pllnd->entry.proc.symbol->ident);
-		*bp++ = '(';
-		unp_llnd(pllnd->entry.proc.param_list);
-		*bp++ = ')';
-		break;
-	case EXPR_LIST	:
-		unp_llnd(pllnd->entry.list.item);
-		if (in_param) {
-			addstr("=");
-			unp_llnd(pllnd->entry.list.item->entry.const_ref.symbol->entry.const_value);
-		}
-		if (pllnd->entry.list.next) {
-			addstr(", ");
-			unp_llnd(pllnd->entry.list.next);
-		}
-		break;
-	case EQUI_LIST	:
-		*bp++ = '(';
-		unp_llnd(pllnd->entry.list.item);
-		*bp++ = ')';
-		if (pllnd->entry.list.next) {
-			addstr(", ");
-			unp_llnd(pllnd->entry.list.next);
-		}
-		break;
-	case COMM_LIST	  :
-	case NAMELIST_LIST:
-		if (pllnd->entry.Template.symbol) {
-			*bp++ = '/';
-			addstr(pllnd->entry.Template.symbol->ident);
-			*bp++ = '/';
-		}
-		unp_llnd(pllnd->entry.list.item);
-		if (pllnd->entry.list.next) {
-			addstr(", ");
-			unp_llnd(pllnd->entry.list.next);
-		}
-		break;
-	case VAR_LIST	 :
-	case RANGE_LIST	 :
-	case CONTROL_LIST:
-		unp_llnd(pllnd->entry.list.item);
-		if (pllnd->entry.list.next) {
-			addstr(",");
-			unp_llnd(pllnd->entry.list.next);
-		}
-		break;
-	case DDOT	:
-	        if (pllnd->entry.binary_op.l_operand)
-		     unp_llnd(pllnd->entry.binary_op.l_operand);
-		*bp++ = in_impli? '-' : ':';
-		if (pllnd->entry.binary_op.r_operand) 
-		     unp_llnd(pllnd->entry.binary_op.r_operand);
-		break;
-        case DEFAULT:
-		addstr("default");
-		break;
-	case DEF_CHOICE	:
-	case SEQ	:
-		unp_llnd(pllnd->entry.seq.ddot);
-		if (pllnd->entry.seq.stride) {
-			*bp++ = ':';
-			unp_llnd(pllnd->entry.seq.stride);
-		}
-		break;
-	case SPEC_PAIR	:
-		unp_llnd(pllnd->entry.spec_pair.sp_label);
-		*bp++ = '=';
-		unp_llnd(pllnd->entry.spec_pair.sp_value);
-		break;
-	case EQ_OP	:
-	case LT_OP	:
-	case GT_OP	:
-	case NOTEQL_OP	:
-	case LTEQL_OP	:
-	case GTEQL_OP	:
-	case ADD_OP	:
-	case SUBT_OP	:
-	case OR_OP	:
-	case MULT_OP	:
-	case DIV_OP	:
-	case MOD_OP	:
-	case AND_OP	:
-	case EXP_OP	:
-	case CONCAT_OP	:
-		{
-			int i = pllnd->variant - EQ_OP, j;
-			PTR_LLND p;
-			int num_paren = 0;
-
-			p = pllnd->entry.binary_op.l_operand;
-			j = p->variant;
-			if (binop(j) && precedence[i] < precedence[j-EQ_OP]) {
-				num_paren++;
-				*bp++ = '(';
-			}
-			unp_llnd(p);
-			if (num_paren) {
-				*bp++ = ')';
-				num_paren--;
-			}
-			addstr(fop_name[i]); /* print the op name */
-			p = pllnd->entry.binary_op.r_operand;
-			j = p->variant;
-			if (binop(j) && precedence[i] <= precedence[j-EQ_OP]) {
-				num_paren++;
-				*bp++ = '(';
-			}
-			unp_llnd(p);
-			if (num_paren) {
-				*bp++ = ')';
-				num_paren--;
-			}
-			break;
-		}
-	case MINUS_OP	:
-		addstr(" -(");
-		unp_llnd(pllnd->entry.unary_op.operand);
-		*bp++ = ')';
-		break;
-	case UNARY_ADD_OP	:
-		addstr(" +(");
-		unp_llnd(pllnd->entry.unary_op.operand);
-		*bp++ = ')';
-		break;
-	case NOT_OP	:
-		addstr(" .not. (");
-		unp_llnd(pllnd->entry.unary_op.operand);
-		*bp++ = ')';
-		break;
-	case PAREN_OP:
-		addstr("(");
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr(")");
-	case ASSGN_OP:
-		addstr("=");
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-	case STAR_RANGE	:
-		addstr(" : ");
-		break;
-	case IMPL_TYPE:
-		pr_ftype_name(pllnd->type, 1);
-		if (pllnd->entry.Template.ll_ptr1 != LLNULL)
-		{
-		     addstr("(");
-		     unp_llnd(pllnd->entry.Template.ll_ptr1);
-		     addstr(")");
-		}
-		break;
-	case ORDERED_OP :
-		addstr("ordered ");
-		break;
-	case EXTEND_OP :
-		addstr("extended ");
-		break;
-        case MAXPARALLEL_OP:
-		addstr("max parallel = ");
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-		break;
-	case PARAMETER_OP :
-		addstr("parameter ");
-		break;
-	case PUBLIC_OP :
-		addstr("public ");
-		break;
-	case PRIVATE_OP :
-		addstr("private ");
-		break;
-	case ALLOCATABLE_OP :
-		addstr("allocatable ");
-		break;
-	case DIMENSION_OP :
-		addstr("dimension (");
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr(")");
-		break;
-	case EXTERNAL_OP :
-		addstr("external ");
-		break;
-	case OPTIONAL_OP :
-		addstr("optional ");
-		break;
-	case IN_OP :
-		addstr("intent (in) ");
-		break;
-	case OUT_OP :
-		addstr("intent (out) ");
-		break;
-	case INOUT_OP :
-		addstr("intent (inout) ");
-		break;
-	case INTRINSIC_OP :
-		addstr("intrinsic ");
-		break;
-	case POINTER_OP :
-		addstr("pointer ");
-		break;
-	case SAVE_OP :
-		addstr("save ");
-		break;
-	case TARGET_OP :
-		addstr("target ");
-		break;
-	case LEN_OP :
-		addstr("*");
-		unp_llnd(pllnd->entry.Template.ll_ptr1);
-		break;
-	case TYPE_OP :
-		pr_ftype_name(pllnd->type, 1);
-		unp_llnd(pllnd->type->entry.Template.ranges);
-		break;
-	case ONLY_NODE :
-  	        addstr("only: ");
-		if (pllnd->entry.Template.ll_ptr1)
-		   unp_llnd(pllnd->entry.Template.ll_ptr1);
-		break;
-	case DEREF_OP :
-   	        unp_llnd(pllnd->entry.Template.ll_ptr1);
-		break;
-	case RENAME_NODE :
-   	        unp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr("=>");
-   	        unp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case VARIABLE_NAME :
-	        addstr(pllnd->entry.Template.symbol->ident);
-		break;
-	default		:
-		fprintf(stderr,"unp_llnd -- bad llnd ptr %d!\n",pllnd->variant);
-		break;
-	}
-}
-
-
-/****************************************************************
- *								*
- *  funp_bfnd -- unparse the given bif node to source string	*
- *								*
- *  Input:							*
- *	   tabs- number of tabs (2 spaces) for indenting	*
- *	   pbf - bif node to be unparsed			*
- *	   bp (implicitely) - where the output string to be	*
- *		   placed					*
- *								*
- *  Output:							*
- *	   the unparse string where "bp" was pointed to		*
- *								*
- *  Side Effect:						*
- *	   "bp" will be updated to the next character behind	*
- *	   the end of the unparsed string (by "addstr")		*
- *								*
- ****************************************************************/
-static void
-funp_bfnd(tabs,pbf)
-	int tabs;
-	PTR_BFND     pbf;
-{
-	PTR_SYMB  s;
- 
-	if (pbf == NULL) return;
-	if (pbf->label) {
-		char b[10];
-
-		sprintf(b ,"%-5d ", (int)(pbf->label->stateno));
-		addstr(b);
-	} else
-		addstr("      ");
-
-	put_tabs(tabs);
-	switch (pbf->variant) {
-	case GLOBAL	:
-		break;
-	case PROG_HEDR	:		/* program header	*/
-	        addstr("program ");
-		if (pbf->entry.program.prog_symb &&
-		    strcmp(pbf->entry.program.prog_symb->ident, (char *)"_MAIN")) {
-			addstr(pbf->entry.program.prog_symb->ident);
-		}
-		break;
-	case BLOCK_DATA	:		
-	        addstr("block data ");
-		if (pbf->entry.program.prog_symb &&
-		    strcmp(pbf->entry.program.prog_symb->ident, (char *)"_BLOCK")) {
-			addstr(pbf->entry.program.prog_symb->ident);
-		}
-		break;
-	case PROC_HEDR	: 
-	        if (pbf->entry.procedure.proc_symb->attr & RECURSIVE_BIT) 
-		   addstr("recursive");
-		addstr("subroutine ");
-		addstr(pbf->entry.procedure.proc_symb->ident);
-		*bp++ = '(';
-		s = pbf->entry.procedure.proc_symb->entry.proc_decl.in_list;
-		while (s) {
-			addstr(s->ident);
-			s = s->entry.var_decl.next_in;
-			if (s) *bp++ = ',';
-		}
-		*bp++ = ')';
-		break;
-	case FUNC_HEDR	:
-	        if (pbf->entry.function.func_symb->attr & RECURSIVE_BIT) 
-		   addstr("recursive");
-		addstr(ftype_name[type_index(pbf->entry.function.func_symb->type->variant)]);
-		addstr(" function ");
-		addstr(pbf->entry.function.func_symb->ident);
-		*bp++ = '(';
-		s = pbf->entry.function.func_symb->entry.proc_decl.in_list;
-		while (s) {
-			addstr(s->ident);
-			s = s->entry.var_decl.next_in;
-			if (s) *bp++ = ',';
-		}
-		addstr(") ");
-		if (pbf->entry.Template.ll_ptr1)
-		{
-		     addstr("result (");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-		     addstr(")");
-		}
-		break;
-	case ENTRY_STAT	:
-		addstr("entry ");
-		addstr(pbf->entry.function.func_symb->ident);
-		*bp++ = '(';
-                unp_llnd(pbf->entry.Template.ll_ptr1);
-		/*
-		s = pbf->entry.function.func_symb->entry.proc_decl.in_list;
-		while (s) {
-			addstr(s->ident);
-			s = s->entry.var_decl.next_in;
-			if (s) *bp++ = ',';
-		}
-                */
-		addstr(") ");
-		break;
-	   case INTERFACE_STMT:
-	   {
-		PTR_SYMB s;
-		char *c;
-		
-		addstr("interface ");
-		if ( (s = (pbf->entry.Template.symbol)) != 0) 
-		{
-		     c = s->ident;
-		     if (*c == '.') 
-		     {
-			  addstr("operator (");
-			  addstr(c);
-			  addstr(")");
-		     }
-		     else if (*c == '=') 
-		     {
-			  addstr("assignment (");
-			  addstr("=");
-			  addstr(")");
-		     }
-		     else addstr(c);
-		}
-	   }
-		break;
-        case MODULE_STMT:
-		addstr("module ");
-		addstr(pbf->entry.Template.symbol->ident);
-		break;
-        case CASE_NODE:
-		if (pbf->entry.Template.ll_ptr3)
-		{
-		     unp_llnd(pbf->entry.Template.ll_ptr3);
-		     addstr(":");
-		}
-		addstr("select case (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(")");
-		break;
-	case SWITCH_NODE	:
-	        addstr("case (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(")");
-		if (pbf->entry.Template.symbol)
-		   addstr(pbf->entry.Template.symbol->ident);
-	        break;
-	case IF_NODE	:
-		/* if (pbf->entry.Template.ll_ptr3)
-		{
-		     unp_llnd(pbf->entry.Template.ll_ptr3);
-		     addstr(":");
-		} */
-		gen_branch(IF_NODE, "if ", pbf);
-		break;
-	case LOGIF_NODE	:
-		addstr("if (");
-		unp_llnd(pbf->entry.if_node.condition);
-		addstr(") ");
-		break;
-	case ELSEIF_NODE:
-		gen_branch(IF_NODE, "else if", pbf);
-		break;
-	case ARITHIF_NODE:
-		addstr("if (");
-		unp_llnd(pbf->entry.if_node.condition);
-		addstr(") ");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-		break;
-	case WHERE_BLOCK_STMT:
-		gen_branch(WHERE_BLOCK_STMT, "where ", pbf);
-		break;
-	case WHERE_NODE:
-		addstr("where (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(") ");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-		addstr(" = ");
-		unp_llnd(pbf->entry.Template.ll_ptr3);
-		break;
-	case PARDO_NODE :
-	        gen_loop_header("parallel do ", pbf);
-                break;
-	case PDO_NODE :
-	        gen_loop_header("pdo ", pbf);
-                break;
-	case FOR_NODE	:
-		if (pbf->entry.Template.ll_ptr3)
-		{
-		     unp_llnd(pbf->entry.Template.ll_ptr3);
-		     addstr(":");
-		}
-		gen_loop_header("do ",pbf); 
-		break;
-	case CDOALL_NODE	:
-		gen_loop_header("cdoall ",pbf);
-		break;
-	case WHILE_NODE	:
-		if (pbf->entry.Template.ll_ptr3)
-		{
-		     unp_llnd(pbf->entry.Template.ll_ptr3);
-		     addstr(":");
-		}
-		addstr("do ");
-		if (pbf->entry.for_node.doend) {
-			char	label[7];
-
-			sprintf(label,"%d ",(int)(pbf->entry.for_node.doend->stateno));
-			addstr(label);
-		}
-		addstr(" while (");
-		unp_llnd(pbf->entry.while_node.condition);
-		*bp++ = ')';
-		break;
-	case ASSIGN_STAT:
-		unp_llnd(pbf->entry.assign.l_value);
-		addstr(" = ");
-		unp_llnd(pbf->entry.assign.r_value);
-		break;
-	case IDENTIFY:
-		addstr("identify ");
-		unp_llnd(pbf->entry.identify.l_value);
-		*bp++ = ' ';
-		unp_llnd(pbf->entry.identify.r_value);
-		break;
-	case PRIVATE_STMT:
-		addstr("private ");
-		if (pbf->entry.Template.ll_ptr1)
-		{
-		     addstr(":: ");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-		}
-		break;
-	case PUBLIC_STMT:
-		addstr("public ");
-		if (pbf->entry.Template.ll_ptr1)
-		{
-		     addstr(":: ");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-		}
-		break;
-	case STRUCT_DECL:
-		{
-		     PTR_LLND l;
-		     addstr("type ");
-		     
-		     if ( (l = pbf->entry.Template.ll_ptr1) != 0) 
-		     {
-			  addstr(",");
-			  unp_llnd(l);
-			  addstr("::");
-		     }
-		     
-		     addstr(pbf->entry.Template.symbol->ident);
-		}
-		break;
-	case SEQUENCE_STMT:
-		addstr("sequence ");
-		break;
-	case CONTAINS_STMT:
-		addstr("contains ");
-		break;
-        case OVERLOADED_ASSIGN_STAT:
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-		addstr("=");
-		unp_llnd(pbf->entry.Template.ll_ptr3);
-		break;
-	case OVERLOADED_PROC_STAT:
-	case PROC_STAT	:
-		addstr("call ");
-		addstr(pbf->entry.Template.symbol->ident);
-		*bp++ = '(';
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		*bp++ = ')';
-		break;
-	case STMTFN_STAT:
-		{PTR_SYMB p;
-		 PTR_LLND body;
-
-		body = pbf->entry.Template.ll_ptr1;
-		p = body->entry.Template.symbol;
-		addstr(p->ident);
-		*bp++ = '(';
-		p=p->entry.func_decl.in_list;
-		while (p) {
-			addstr(p->ident);
-			if( (p=p->entry.var_decl.next_in) != 0) *bp++ = ',';
-		}
-		addstr(") = ");
-		unp_llnd(body->entry.Template.ll_ptr1);
-		break;
-		}
-	case SAVE_DECL:
-		addstr("save ");
-		if (pbf->entry.Template.ll_ptr1)
-			unp_llnd(pbf->entry.Template.ll_ptr1);
-		else
-			addstr("all");
-		break;
-	case CONT_STAT:
-		addstr("continue");
-		break;
-	case FORMAT_STAT:
-/*		addstr("format ("); */
-		unp_llnd(pbf->entry.format.spec_string);
-/*		*bp++ = ')'; */
-		break;
-	case GOTO_NODE:
-		addstr("goto ");
-		unp_llnd(pbf->entry.Template.ll_ptr3);
-		break;
-	case ASSGOTO_NODE:
-		addstr("goto ");
-		addstr(pbf->entry.Template.symbol->ident);
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-	case COMGOTO_NODE:
-		addstr("goto (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(") ");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-		break;
-	case STOP_STAT:
-		addstr("stop");
-		if (pbf->entry.Template.ll_ptr1) {
-			addstr("'");
-			unp_llnd(pbf->entry.Template.ll_ptr1);
-			addstr("'");
-		}
-		break;
-	case RETURN_STAT:
-		addstr("return");
-		break;
-	case OPTIONAL_STMT:
-		addstr("optional :: ");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-	case VAR_DECL:
-		{
-		PTR_LLND p = pbf->entry.Template.ll_ptr1;
-	     /*	PTR_TYPE q;
-
-		q = p->entry.list.item->entry.Template.symbol->type;
-		if (q->variant == T_ARRAY)
-			q = q->entry.ar_decl.base_type;
-		addstr(ftype_name[type_index(q->variant)]);
-		*bp++ = ' '; */
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-		if (pbf->entry.Template.ll_ptr3)
-		{
-		     addstr(",");
-		     unp_llnd(pbf->entry.Template.ll_ptr3);
-		     addstr("::");
-		}
-		else addstr(" ");
-		unp_llnd(p);
-		break;
-		}
-	case INTENT_STMT:
-		{
-		PTR_SYMB s;
-		PTR_LLND p = pbf->entry.Template.ll_ptr1;
-
-		addstr("intent ");
-		s = p->entry.list.item->entry.Template.symbol;
-		if (s->attr & IN_BIT)
-		     addstr("(in) :: ");
-		if (s->attr & OUT_BIT)
-		     addstr("(out) :: ");
-		if (s->attr & INOUT_BIT)
-		     addstr("(inout) :: ");
-		unp_llnd(p);
-		break;
-		}
-	case PARAM_DECL:
-		addstr("parameter (");
-		in_param = 1;
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(")");
-		in_param = 0;
-		break;
-        case DIM_STAT:
-		addstr("dimension ");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-        case ALLOCATABLE_STMT:
-		addstr("allocatable :: ");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-        case POINTER_STMT:
-		addstr("pointer :: ");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-        case TARGET_STMT:
-		addstr("target :: ");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-        case ALLOCATE_STMT:
-		addstr("allocate (");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		if (pbf->entry.Template.ll_ptr2) 
-		{
-		     addstr(", stat = ");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-		}
-		addstr(")");
-		break;
-        case DEALLOCATE_STMT:
-		addstr("deallocate (");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		if (pbf->entry.Template.ll_ptr2) 
-		{
-		     addstr(", stat = ");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-		}
-		addstr(")");
-		break;
-        case NULLIFY_STMT:
-		addstr("nullify (");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(")");
-		break;
-        case MODULE_PROC_STMT:
-		addstr("module procedure ");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-        case POINTER_ASSIGN_STAT:
-	        addstr(pbf->entry.Template.symbol->ident);
-		addstr("=> ");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-        case CYCLE_STMT:
-		addstr("cycle ");
-	        addstr(pbf->entry.Template.symbol->ident);
-		break;
-        case EXIT_STMT:
-		addstr("exit ");
-	        addstr(pbf->entry.Template.symbol->ident);
-		break;
-        case USE_STMT:
-		addstr("use ");
-	        addstr(pbf->entry.Template.symbol->ident);
-		if (pbf->entry.Template.ll_ptr1) 
-		{
-		     addstr(", ");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-		}
-		break;
-	case EQUI_STAT:
-		addstr("equivalence ");
-	case DATA_DECL:
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-	case IMPL_DECL:
-		addstr("implicit ");
-		if (pbf->entry.Template.ll_ptr1 == NULL)
-			addstr("none");
-		else {
-			in_impli = 1;
-			unp_llnd(pbf->entry.Template.ll_ptr1);
-			in_impli = 0;
-		}
-		break;
-	case EXTERN_STAT:
-		addstr("external ");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-	case INTRIN_STAT:
-		addstr("intrinsic ");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-	case PARREGION_NODE:
-		addstr("parallel ");
-		if (pbf->entry.Template.ll_ptr1)
-		{
-		     addstr("( ");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-		     addstr(") ");
-		}
-		break;
-	case PARSECTIONS_NODE:
-		addstr("parallel sections");
-		if (pbf->entry.Template.ll_ptr1)
-		{
-		     addstr("( ");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-		     addstr(") ");
-		}
-		break;
-	case PSECTIONS_NODE:
-		addstr("psections ");
-		if (pbf->entry.Template.ll_ptr1)
-		{
-		     addstr("(");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-		     addstr(") ");
-		}
-		break;
-	case SINGLEPROCESS_NODE:
-		addstr("single process");
-		if (pbf->entry.Template.ll_ptr1)
-		{
-		     addstr("( ");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-		     addstr(") ");
-		}
-		break;
-	case CRITSECTION_NODE:
-		addstr("critical section");
-		if (pbf->entry.Template.ll_ptr1)
-		{
-		     addstr("( ");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-		     addstr(") ");
-		}
-		if (pbf->entry.Template.ll_ptr2)
-		{
-		     addstr("guards (");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-		     addstr(") ");
-		}
-		break;
-        case GUARDS_NODE:
-		addstr("guards ");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr("(");
-	        unp_llnd(pbf->entry.Template.ll_ptr2);
-                addstr(")");
-		break;
-	case LOCK_NODE:
-		addstr("lock (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-                addstr(")");
-		if (pbf->entry.Template.ll_ptr2)
-		{
-		     addstr("guards (");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-                     addstr(")");
-		}
-		break;
-        case UNLOCK_NODE:
-		addstr("unlock (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-                addstr(")");
-		if (pbf->entry.Template.ll_ptr2)
-		{
-		     addstr("guards (");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-                     addstr(")");
-		}
-		break;
-        case POST_NODE:
-		addstr("post (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-                addstr(")");
-		if (pbf->entry.Template.ll_ptr2)
-		{
-		     addstr("guards (");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-                     addstr(")");
-		}
-		break;
-        case WAIT_NODE:
-		addstr("wait (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-                addstr(")");
-		if (pbf->entry.Template.ll_ptr2)
-		{
-		     addstr("guards (");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-                     addstr(")");
-		}
-		break;
-        case CLEAR_NODE:
-		addstr("clear (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-                addstr(")");
-		if (pbf->entry.Template.ll_ptr2)
-		{
-		     addstr("guards (");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-                     addstr(")");
-		}
-		break;
-        case POSTSEQ_NODE:
-		addstr("post (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(", ");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-                addstr(")");
-		if (pbf->entry.Template.ll_ptr3)
-		{
-		     addstr("guards (");
-		     unp_llnd(pbf->entry.Template.ll_ptr3);
-                     addstr(")");
-		}
-		break;
-        case WAITSEQ_NODE:
-		addstr("wait (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(", ");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-                addstr(")");
-		if (pbf->entry.Template.ll_ptr3)
-		{
-		     addstr("guards (");
-		     unp_llnd(pbf->entry.Template.ll_ptr3);
-                     addstr(")");
-		}
-		break;
-        case SETSEQ_NODE:
-		addstr("set (");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(", ");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-                addstr(")");
-		if (pbf->entry.Template.ll_ptr3)
-		{
-		     addstr("guards (");
-		     unp_llnd(pbf->entry.Template.ll_ptr3);
-                     addstr(")");
-		}
-		break;
-        case SECTION_NODE:
-		addstr("section");
-		if (pbf->entry.Template.ll_ptr1)
-		{
-		     addstr("(");
-		     unp_llnd(pbf->entry.Template.ll_ptr1);
-                     addstr(")");
-		}
-		if (pbf->entry.Template.ll_ptr2)
-		{
-		     addstr("wait (");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-                     addstr(")");
-		}
-		break;
-        case ASSIGN_NODE:
-		addstr("assign ( ");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-                addstr(")");
-		break;
-        case RELEASE_NODE:
-		addstr("release ( ");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-                addstr(")");
-		break;
-        case PRIVATE_NODE:
-		addstr("private ");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-	case READ_STAT:
-	   {
-		PTR_LLND p;
-		PTR_LLND q;
-		
-		addstr("read ");
-		p = pbf->entry.Template.ll_ptr2;
-		q = p->entry.Template.ll_ptr1;
-
-		if ((p->variant == EXPR_LIST)  ||
-		    ((p->variant == SPEC_PAIR) && 
-		     (strcmp(q->entry.string_val,"fmt") != 0)))
-		{
-		     addstr("(");
-		     unp_llnd(pbf->entry.Template.ll_ptr2);
-		     addstr(") ");
-		}
-		else 
-		{
-		     unp_llnd(pbf->entry.Template.ll_ptr2->entry.Template.ll_ptr2);
-		     if (pbf->entry.Template.ll_ptr1 != LLNULL)
-			  addstr(",");
-		}
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-	   }
-		break;
-	case WRITE_STAT:
-		addstr("write ");
-		addstr("(");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-		addstr(") ");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-	case PRINT_STAT:
-		addstr("print ");
-		unp_llnd(pbf->entry.Template.ll_ptr2->entry.Template.ll_ptr2);
-		if (pbf->entry.Template.ll_ptr1 != LLNULL)
-			  addstr(",");
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-	case OPEN_STAT:
-		addstr("open ");
-		addstr("(");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-		addstr(") ");
-		break;
-	case CLOSE_STAT:
-		addstr("close ");
-		addstr("(");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-		addstr(") ");
-		break;
-	case INQUIRE_STAT:
-		addstr("inquire ");
-		addstr("(");
-		unp_llnd(pbf->entry.Template.ll_ptr2);
-		addstr(") ");
-		break;
-        case SKIPPASTEOF_NODE:
-	   {
-		PTR_LLND p;
-		PTR_LLND q;
-		
-		addstr("skip past eof ");
-		p = pbf->entry.Template.ll_ptr2;
-		q = p->entry.Template.ll_ptr2;
-
-		if (p->variant == EXPR_LIST)
-		{
-		     addstr("(");
-		     unp_llnd(p);
-		     addstr(") ");
-		}
-		else unp_llnd(q);
-	   }
-		break;
-	case BACKSPACE_STAT:
-	   {
-		PTR_LLND p;
-		PTR_LLND q;
-		
-		addstr("backspace ");
-		p = pbf->entry.Template.ll_ptr2;
-		q = p->entry.Template.ll_ptr2;
-
-		if (p->variant == EXPR_LIST)
-		{
-		     addstr("(");
-		     unp_llnd(p);
-		     addstr(") ");
-		}
-		else unp_llnd(q);
-	   }
-		break;
-	case ENDFILE_STAT:
-	   {
-		PTR_LLND p;
-		PTR_LLND q;
-		
-		addstr("endfile ");
-		p = pbf->entry.Template.ll_ptr2;
-		q = p->entry.Template.ll_ptr2;
-
-		if (p->variant == EXPR_LIST)
-		{
-		     addstr("(");
-		     unp_llnd(p);
-		     addstr(") ");
-		}
-		else unp_llnd(q);
-	   }
-		break;
-	case REWIND_STAT:
-	   {
-		PTR_LLND p;
-		PTR_LLND q;
-		
-		addstr("rewind ");
-		p = pbf->entry.Template.ll_ptr2;
-		q = p->entry.Template.ll_ptr2;
-
-		if (p->variant == EXPR_LIST)
-		{
-		     addstr("(");
-		     unp_llnd(p);
-		     addstr(") ");
-		}
-		else unp_llnd(q);
-	   }
-		break;
-	case OTHERIO_STAT:
-		unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-        case COMM_STAT:
-		addstr("common ");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-        case NAMELIST_STAT:
-		addstr("namelist ");
-	        unp_llnd(pbf->entry.Template.ll_ptr1);
-		break;
-	case CONTROL_END:
-		break;
-	default:
-		break;		/* don't know what to do at this point */
-	}
-
-	if (pbf->variant != CONTROL_END) {
-		if (print_comments && cmnt && cmnt->type != FULL)
-			addstr(cmnt->string);
-		if (pbf->variant != LOGIF_NODE)
-			*bp++ = '\n';
-	   }
-}
-
-/****************************************************************
- *								*
- *  funp_blck -- unparse the given bif node to source string	*
- *		 along with its control children (block)	*
- *								*
- *  Input:							*
- *	   bif - bif node to be unparsed			*
- *	   tab - number of tabs (2 spaces) for indenting	*
- *	   bp (implicitely) - where the output string to be	*
- *		   placed					*
- *								*
- *  Output:							*
- *	   the unparse string where "bp" was pointed to		*
- *								*
- *  Side Effect:						*
- *	   "bp" will be updated to the next character behind	*
- *	   the end of the unparsed string (by "addstr")		*
- *								*
- ****************************************************************/
-static void
-funp_blck(bif, tab)
-	PTR_BFND bif;
-	int	 tab;
-{
-    PTR_BLOB b;
-
-    if (print_comments && (cmnt = bif->entry.Template.cmnt_ptr) != NULL)
-	while (cmnt != NULL && cmnt->type == FULL) {
-	    addstr(cmnt->string);
-	    *bp++ = '\n';
-	    cmnt = cmnt->next;
-	}
-
-    funp_bfnd(tab, bif);
-
-    if (bif->variant != CDOALL_NODE && bif->variant != SDOALL_NODE) {
-	for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-	    if (b->ref->variant != CONTROL_END)
-		funp_blck(b->ref, tab+1);
-	    else {
-		PTR_CMNT cmnt = b->ref->entry.Template.cmnt_ptr;
-
-		if (print_comments && cmnt)
-		    while (cmnt != NULL && cmnt->type == FULL) {
-			addstr(cmnt->string);
-			*bp++ = '\n';
-			cmnt = cmnt->next;
-		    }
-		switch(bif->variant) {
-		case FOR_NODE:
-		case PARDO_NODE:
-		case PDO_NODE:
-		case WHILE_NODE:
-		    if (!bif->entry.Template.lbl_ptr) {
-			put_tabs(tab-1);
-			if (bif->variant == PARDO_NODE)
-            		   addstr("        end parallel do");
-			else if (bif->variant == PDO_NODE)
-			        addstr("        end pdo");
-			else addstr("        end do");
-		    }
-		    break;
-		case IF_NODE: 
-	        case ELSEIF_NODE:
-		    put_tabs(tab-1);
-		    if (bif->entry.Template.bl_ptr2)
-			addstr("        else");
-		    else
-			addstr("        end if");
-		    break;
-	        case WHERE_BLOCK_STMT:
-		    put_tabs(tab);
-		    if (bif->entry.Template.bl_ptr2)
-			addstr("        elsewhere");
-		    else
-			addstr("        end where");
-		    break;
-	        case CASE_NODE:
-		    put_tabs(tab-1);
-		    addstr("        end select ");
-		    if (bif->entry.Template.symbol)
-			 addstr(bif->entry.Template.symbol->ident);
-		    break;
-	        case SWITCH_NODE:
-		    put_tabs(tab-1);
-		    break;
-		case PROG_HEDR:
-		case PROC_HEDR:
-		case FUNC_HEDR:
- 	        case BLOCK_DATA:
-		    addstr("        end");
-		    break;
-		case MODULE_STMT:
-		    addstr("        end module ");
-		    addstr(bif->entry.Template.symbol->ident);
-		    break;
-		case INTERFACE_STMT:
-		    put_tabs(tab-1);
-		    addstr("        end interface");
-		    break;
-		case STRUCT_DECL:
-		    put_tabs(tab-1);
-		    addstr("        end type ");
-		    addstr(bif->entry.Template.symbol->ident);
-		    break;
-	        case PARREGION_NODE:
-		    put_tabs(tab-1);
-		    addstr("        end parallel");
-		    break;
-	        case PARSECTIONS_NODE:
-		    put_tabs(tab-1);
-		    addstr("        end parallel sections");
-		    break;
-	        case PSECTIONS_NODE:
-		    put_tabs(tab-1);
-		    addstr("        end psections");
-		    break;
-	        case SINGLEPROCESS_NODE:
-		    put_tabs(tab-1);
-		    addstr("        end single process");
-		    break;
-	        case CRITSECTION_NODE:
-		    put_tabs(tab-1);
-		    addstr("        end critical section");
-		    if (bif->entry.Template.ll_ptr1)
-		    {
-			 addstr("(");
-			 unp_llnd(bif->entry.Template.ll_ptr1);
-			 addstr(")");
-		    }
-		    break;
-                /* case SECTION_NODE: */
-		default:
-		    break; 
-		}
-		if (print_comments && cmnt && cmnt->type != FULL)
-		    addstr(cmnt->string);
-		*bp++ = '\n';
-	    }
-
-	for (b = bif->entry.Template.bl_ptr2; b; b = b->next)
-	    if (b->ref->variant != CONTROL_END)
-		funp_blck(b->ref, tab+1);
-	    else {
-		PTR_CMNT cmnt = b->ref->entry.Template.cmnt_ptr;
-
-		if (print_comments && cmnt)
-		    while (cmnt != NULL && cmnt->type == FULL) {
-			addstr(cmnt->string);
-			*bp++ = '\n';
-			cmnt = cmnt->next;
-		    }
-		put_tabs(tab); 
-		if (bif->variant == PDO_NODE) 
-		     addstr("       end extended");
-		if (bif->variant == PSECTIONS_NODE)
-		     addstr("      end extended");
-		if (bif->variant == WHERE_BLOCK_STMT)
-		     addstr("      end where");
-		if ((bif->variant == IF_NODE) || (bif->variant == ELSEIF_NODE))
-		     addstr("      end if");
-		if (print_comments && cmnt && cmnt->type != FULL)
-		    addstr(cmnt->string);
-		*bp++ = '\n';
-	    }
-    } else {
-	for (b = bif->entry.Template.bl_ptr2; b; b = b->next)
-	    if (b->ref->variant != CONTROL_END)
-		funp_blck(b->ref, tab+1);
-	    else {
-		PTR_CMNT cmnt = b->ref->entry.Template.cmnt_ptr;
-
-		if (print_comments && cmnt)
-		    while (cmnt != NULL && cmnt->type == FULL) {
-			addstr(cmnt->string);
-			*bp++ = '\n';
-			cmnt = cmnt->next;
-		    }
-		if (!bif->entry.Template.lbl_ptr) {
-		    put_tabs(tab-1);
-		    addstr("        loop");
-		}
-		if (print_comments && cmnt && cmnt->type != FULL)
-		    addstr(cmnt->string);
-		*bp++ = '\n';
-	    }
-
-	for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-	    if (b->ref->variant != CONTROL_END)
-		funp_blck(b->ref, tab+1);
-	    else {
-		PTR_CMNT cmnt = b->ref->entry.Template.cmnt_ptr;
-
-		if (print_comments && cmnt)
-		    while (cmnt != NULL && cmnt->type == FULL) {
-			addstr(cmnt->string);
-			*bp++ = '\n';
-			cmnt = cmnt->next;
-		    }
-		put_tabs(tab); 
-		if (bif->variant == CDOALL_NODE)
-		    addstr("      end cdoall");
-		else
-		    addstr("      end sdoall");
-		if (print_comments && cmnt && cmnt->type != FULL)
-		    addstr(cmnt->string);
-		*bp++ = '\n';
-	    }
-    }
-}
-
-
-/****************************************************************
- *								*
- *  funparse_type -- unparse the type node for Fortran		*
- *								*
- *  input:							*
- *	   type -- the node to be unparsed			*
- *								*
- *  output:							*
- *	   the unparsed string					* 
- *								*
- ****************************************************************/
-char *
-funparse_type(type)
-	PTR_TYPE type;
-{
-	char *b1;
-
-	if (type == NULL)
-		return NULL;
-
-	bp = buffer;
-	switch (type->variant) {
-	case T_INT   :
-	case T_FLOAT :
-	case T_DOUBLE:
-	case T_CHAR  :
-	case T_BOOL  :
-	case T_STRING:
-		addstr(ftype_name[type_index(type->variant)]);
-                if ((type->entry.Template.ranges) != LLNULL)
-		     unp_llnd(type->entry.Template.ranges);
-		break;
-	case T_ARRAY:
-		addstr(ftype_name[type_index(type->entry.ar_decl.base_type->variant)]);
-		*bp++ = ' ';
-		unp_llnd(type->entry.ar_decl.ranges);
-		break;
-	default:
-		return NULL;
-	}
-	*bp++ = '\n';
-	*bp++ = '\0';
-	b1 = malloc(strlen(buffer) + 1);
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,b1, 0);
-#endif
-	(void) strcpy(b1, buffer);
-	bp = buffer;
-	*bp = '\0';
-	return b1;
-}
-
-
-/****************************************************************
- *								*
- *  funparse_symb -- unparse the symbol node for Fortran	*
- *								*
- *  input:							*
- *	   symb -- the node to be unparsed			*
- *								*
- *  output:							*
- *	   the unparsed string					* 
- *								*
- ****************************************************************/
-char *
-funparse_symb(symb)
-	PTR_SYMB symb;
-{
-	int i;
-	char buf[100], *b1, *b2;
-	PTR_TYPE t;
-
-	b1 = buf;
-	for (i = 1; i<10; i++)
-		*b1++ = ' ';
-	t = symb->type;
-	i = t->variant < T_ARRAY? t->variant: t->entry.ar_decl.base_type->variant;
-	b2 = ftype_name[type_index(i)];
-	while ( (*b1 = *b2++) != 0)
-		b1++;
-	*b1++ = ' ';
-	if (t->variant < T_ARRAY) {
-		b2 = symb->ident;
-		while ( (*b1 = *b2++) != 0)
-			b1++;
-	} else {
-		bp = buffer;
-		unp_llnd(t->entry.ar_decl.ranges);
-		b2 = buffer;
-		while ( (*b1 = *b2++) != 0)
-			b1++;
-	}		
-	*b1++ = '\n';
-	*b1++ = '\0';
-	b2 = malloc(strlen(buf) + 1);
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,b2, 0);
-#endif
-	(void) strcpy(b2, buf);
-	*buffer = '\0';
-	return b2;
-}
-
-
-/****************************************************************
- *								*
- *  funparse_llnd -- unparse the low level node for Fortran	*
- *								*
- *  input:							*
- *	   llnd -- the node to be unparsed			*
- *								*
- *  output:							*
- *	   the unparsed string					* 
- *								*
- ****************************************************************/
-char *
-funparse_llnd(llnd)
-	PTR_LLND llnd;
-{
-	int len;
-	char *p;
-
-	bp = buffer;	/* reset the buffer pointer */
-	unp_llnd(llnd);
-	*bp++ = '\n';
-	*bp++ = '\0';
-	len = (bp - buffer) + 1; /* calculate the string length */
-	p = malloc(len);	/* allocate space for returned value */
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	strcpy(p, buffer); 	/* copy the buffer for output */
-	*buffer = '\0';
-	return p;
-}
-
-
-/****************************************************************
- *								*
- *  funparse_bfnd -- unparse the bif node for Fortran		*
- *								*
- *  input:							*
- *	   bif -- the node to be unparsed			*
- *								*
- *  output:							*
- *	   the unparsed string					* 
- *								*
- ****************************************************************/
-char *
-funparse_bfnd(bif)
-	PTR_BFND bif;
-{
-	int len;
-	char *p;
-
-	first = 1;		/* Mark this is the first bif node */
-	bp = buffer;		/* reset the buffer pointer */
-	funp_bfnd(0, bif);
-	*bp++ = '\0';
-	len = (bp - buffer) + 1; /* calculate the string length */
-	p = malloc(len);	/* allocate space for returned value */
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	strcpy(p, buffer); 	/* copy the buffer for output */
-	*buffer = '\0';
-	return (p);
-}
-
-
-/****************************************************************
- *								*
- *  funparse_bfnd_w_tab -- unparse the bif node for Fortran	*
- *								*
- *  input:							*
- *	   bif -- the node to be unparsed			*
- *								*
- *  output:							*
- *	   the unparsed string					* 
- *								*
- ****************************************************************/
-char *
-funparse_bfnd_w_tab(tab, bif)
-	int	 tab;
-	PTR_BFND bif;
-{
-	int len;
-	char *p;
-
-	first = 1;		/* Mark this is the first bif node */
-	bp = buffer;		/* reset the buffer pointer */
-	funp_bfnd(tab, bif);
-	*bp++ = '\0';
-	len = (bp - buffer) + 1; /* calculate the string length */
-	p = malloc(len);	/* allocate space for returned value */
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	strcpy(p, buffer); 	/* copy the buffer for output */
-	*buffer = '\0';
-	return (p);
-}
-
-
-char *
-funparse_blck(bif)
-	PTR_BFND bif;
-{
-	int len;
-	char *p;
-
-	bp = buffer;		/* reset the buffer pointer */
-	funp_blck(bif, figure_tabs(bif));
-
-	*bp++ = '\0';
-	len = (bp - buffer) + 1; /* calculate the string length */
-	p = malloc(len);	/* allocate space for returned value */
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	strcpy(p, buffer); 	/* copy the buffer for output */
-	*buffer = '\0';
-	return (p);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
deleted file mode 100644
index 3b249f4..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_comm.c
+++ /dev/null
@@ -1,10 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-#define BUFLEN		50000
-
-char	 buffer[BUFLEN],	/* buffer to build the unparsed text */
-	*bp;			/* points to where next char goes in buffer */
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
deleted file mode 100644
index 89d7c2b..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/db_unp_vpc.c
+++ /dev/null
@@ -1,1924 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/* Modified by Jenq-Kuen Lee Feb 24,1988	  */
-/* The simple un-parser for VPC++		  */
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
- 
-# include "db.h"
-# include "vparse.h"
-
-# define NULLTEST(VAR)	(VAR == NULL? -1 : VAR->id)
-# define type_index(X)	(X-T_INT)
-# define binop(n)	(n >= EQ_OP && n <= NEQV_OP)
-# define BUFLEN 	500000
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-extern PTR_SYMB	cur_symb_head;	/* point to the head of the list of symbols */
-extern char buffer[], *bp;
-
-static int	first;
-static int	global_tab;
-static char	buffera[BUFLEN];
-static char	temp_buf[BUFLEN]; /* for temporary usage */
-static char	temp1_buf[BUFLEN];
-static char	temp2_buf[BUFLEN]; /* for temporary usage */
-
-static int basket_needed();
-
-/*
- * forward references
- */
-static void cunp_blck();
-static void gen_simple_type();
-static void  gen_func_hedr();
-static PTR_SYMB find_declarator();
-static void cunp_llnd();
-int cdrtext();
-int is_scope_op_needed();
-
-static
-char *cop_name[] = {
-	"->",	    /* 0  */
-	"!",	    /* 1  */
-	"~",	    /* 2  */
-	"++",	    /* 3  */
-	"--",	    /* 4  */
-	"-",	    /* 5  */
-	"*",	    /* 6  */
-	"&",	    /* 7  */
-	"sizeof ",  /* 8  */
-	"*",	    /* 9  */
-	"/",	    /* 10 */
-	"%",	    /* 11 */
-	"+",	    /* 12 */
-	"-",	    /* 13 */
-	">>",	    /* 14 */
-	"<<",	    /* 15 */
-	"<",	    /* 16 */
-	">",	    /* 17 */
-	"<=",	    /* 18 */
-	">=",	    /* 19 */
-	"==",	    /* 20 */
-	"!=",	    /* 21 */
-	"&",	    /* 22 */
-	"^",	    /* 23 */
-	"|",	    /* 24 */
-	"&&",	    /* 25 */
-	"||",	    /* 26 */
-	"=",	    /* 27 */
-	"+=",	    /* 28 */
-	"-=",	    /* 29 */
-	"&=",	    /* 30 */
-	"|=",	    /* 31 */
-	"*=",	    /* 32 */
-	"/=",	    /* 33 */
-	"%=",	    /* 34 */
-	"^=",	    /* 35 */
-	"<<=",	    /* 36 */
-	">>="	    /* 37 */
-};
-
-
-/* Added for VPC */
-static
-char *ridpointers[] = {
-	"",			/* unused */
-	"",			/* int */
-	"char", 		/* char */
-	"float",		/* float */
-	"double",		/* double */
-	"void", 		/* void */
-	"",			/* unused1 */
-	"unsigned",		/* unsigned */
-	"short",		/* short */
-	"long", 		/* long */
-	"auto", 		/* auto */
-	"static",		/* static */
-	"extern",		/* extern */
-	"register",		/* register */
-	"typedef",		/* typedef */
-	"signed",		/* signed */
-	"const",		/* const */
-	"volatile",		/* volatile */
-	"syn",			/* syn */
-	"shared",		/* shared */
-	"private",		/* private */
-	"future",		/* future */
-	"virtual",		/* virtual */
-	"inline",		/* inline */
-	"friend",		/* friend */
-	"",			/* public */
-	"",			/* protected */
-};
-
-/* Added for VPC */
-static int
-re_map_status(rid_value)
-	int rid_value;
-{
-	switch (rid_value) {
-
-	/* The following flag store in type->entry.descriptive.long_short_flag */
-	case (int) BIT_PRIVATE: return((int)RID_PRIVATE);
-	case (int) BIT_FUTURE:	return((int)RID_FUTURE);
-	case (int) BIT_VIRTUAL: return((int)RID_VIRTUAL);
-	case (int) BIT_INLINE:	return((int)RID_INLINE);
-
-	case (int) BIT_UNSIGNED:return((int)RID_UNSIGNED);
-	case (int) BIT_SIGNED : return((int)RID_SIGNED);
-
-
-	case (int) BIT_SHORT :	return((int)RID_SHORT);
-	case (int) BIT_LONG :	return((int)RID_LONG);
-
-
-	case (int) BIT_VOLATILE:return((int)RID_VOLATILE);
-	case (int) BIT_CONST   :return((int)RID_CONST);
-
-	case (int) BIT_TYPEDEF :return((int)RID_TYPEDEF); 
-	case (int) BIT_EXTERN  :return((int)RID_EXTERN);
-	case (int) BIT_AUTO :	return((int)RID_AUTO);
-	case (int) BIT_STATIC : return((int)RID_STATIC);
-	case (int) BIT_REGISTER:return((int)RID_REGISTER);
-	case (int) BIT_FRIEND:	return((int)RID_FRIEND);
-	default:
-		return(0);
-	}
-}
-
-
-static void
-put_tabs(n)
-	int n;
-{
-	int i;
-
-	for(i = 0; i < n; i++) {
-		*bp++ = ' ';
-		*bp++ = ' ';
-	}
-}
-
-
-static void
-addstr(s)
-	char *s;
-{
-	while( (*bp = *s++) != 0)
-		bp++;
-}
-
-
-static void
-addstr1(index)
-	int index ;
-{
-	int i;
-
-	i = re_map_status(index);
-	if (i) {
-		addstr(ridpointers[i]) ;
-		*bp++ = ' ';
-	}
-}
-
-
-
-static void
-put_right(s, temp_buf)
-	char *s ;
-	char *temp_buf;
-{
-	int len,i ;
-	char *p;
-      
-	i=0;
-	len = strlen(temp_buf) ;
-	for ( p = s ; *p ; p++,i++)
-		*(temp_buf + len+ i) = *p ;
-	*(temp_buf+len+i+1) = '\0';
-}
-
-
-static void
-put_left(s, temp_buf)
-	char *s ;
-	char *temp_buf;
-{
-	int i ;
-	int len1 ,len2;  
-
-	len1 = strlen(s);
-	len2 = strlen(temp_buf) ;
-	*(temp_buf+len2+len1) = '\0';
-	for ( i=len2 ; i ; i--)
-		*(temp_buf + len1+ i-1) = *(temp_buf + i -1 );
-	for ( i=0; *s ; i++,s++)
-		*(temp_buf + i ) = *s ;
-
-}
-
-
-static void
-clean(temp_buf)
-	char *temp_buf;
-{
-	char *p;
-
-	for (p = temp_buf ; p < temp_buf+BUFLEN ;)
-		*p++ = '\0';
-}
-
-
-/*
- * gen_if_node(pbf) --- generate the if statement pointed to by pbf.
- */
-static void
-gen_branch(branch_type, pbf)
-	char	       *branch_type;
-	PTR_BFND	pbf;
-{
-	PTR_BFND	gen_stmt_list();
-	addstr(branch_type);
-	*bp++ = '(';
-	cunp_llnd(pbf->entry.Template.ll_ptr1);
-	*bp++ = ')';
-}
-
-
-static void
-gen_descriptive_type(symb1)
-	PTR_SYMB symb1 ;
-{
-	int i;
-	PTR_TYPE q ;
-
-	for (q = symb1->type; q ;   ) { 
-		switch ( q->variant) {
-		case T_POINTER : 
-		case T_FUNCTION :
-			q = q->entry.Template.base_type ;
-			break;
-		case T_DESCRIPT :
-			for (i=1; i< MAX_BIT; i= i*2)
-				addstr1(q->entry.descriptive.long_short_flag & i);
-			q = q->entry.descriptive.base_type ;
-			break ;
-		default:	/* It might need more for complicated case */
-			q = (PTR_TYPE) NULL ;
-		}
-	}
-
-
-} 
-
-
-static void
-cunp_bfnd(tabs,pbf)
-	int tabs;
-	PTR_BFND     pbf;
-{
-        /* PTR_BFND	pbfnd, pnext; */
-	/* PTR_SYMB	s; */
-	/* int		i; */
-        /* int		lines; */
-        PTR_CMNT cmnt;
-	if (!pbf) return;
-	/* printf("variant = %d\n", pbf->variant); */
-        if ( (cmnt = pbf->entry.Template.cmnt_ptr) != 0)
-                while (cmnt != NULL && cmnt->type == FULL) {
-                        addstr(cmnt->string);
-                        addstr("\n");
-                        cmnt = cmnt->next;
-                }    
-
-	if (pbf->label) {
-		char b[10];
-
-		sprintf(b ,"%-5d ", (int)(pbf->label->stateno));
-		addstr(b);
-	}
-
-	put_tabs(tabs);
-
-	switch (pbf->variant) {
-	case GLOBAL	:
-	case PROG_HEDR	:
-	case PROC_HEDR	:
-		break ;
-	case FUNC_HEDR	:
-		gen_simple_type(pbf->entry.Template.symbol->type, pbf, tabs);
-		gen_func_hedr(pbf->entry.Template.symbol, pbf, tabs);
-		break;
-	case IF_NODE	:
-		gen_branch("if ",pbf);
-		break;
-	case LOGIF_NODE :
-	case ARITHIF_NODE:
-	case WHERE_NODE :
-		break;
-	case FOR_NODE	:
-		addstr("for (");
-		cunp_llnd(pbf->entry.Template.ll_ptr1);
-		*bp++ = ';';
-		cunp_llnd(pbf->entry.Template.ll_ptr2);
-		*bp++ = ';';
-		cunp_llnd(pbf->entry.Template.ll_ptr3);
-		addstr(") ") ;
-		break;
-	case FORALL_NODE	:
-	case WHILE_NODE :
-		addstr("while (");
-		cunp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(") ") ;
-		break;
-	case ASSIGN_STAT:
-	case IDENTIFY:
-	case PROC_STAT	:
-	case SAVE_DECL:
-	case CONT_STAT:
-	case FORMAT_STAT:
-		break;
-	case LABEL_STAT:
-		addstr(pbf->entry.Template.lbl_ptr->label_name->ident);
-		addstr(" : ");
-		break;
-	case GOTO_NODE:
-		addstr("goto ");
-		addstr(pbf->entry.Template.lbl_ptr->label_name->ident);
-		addstr(" ;");
-		break;
-	case ASSGOTO_NODE:
-	case COMGOTO_NODE:
-	case STOP_STAT:
-		break;
-	case RETURN_STAT:
-		addstr("return");
-		if (pbf->entry.Template.ll_ptr1) {
-			addstr("(");
-			cunp_llnd(pbf->entry.Template.ll_ptr1);
-			addstr(");");
-		}
-		break;
-	case PARAM_DECL :
-	case DIM_STAT:
-	case EQUI_STAT:
-	case DATA_DECL:
-	case READ_STAT:
-	case WRITE_STAT:
-	case OTHERIO_STAT:
-	case COMM_STAT:
-	case CONTROL_END:
-		break;
-	case ENUM_DECL :		/* New added for VPC */
-	case CLASS_DECL:		/* New added for VPC */
-	case UNION_DECL:		/* New added for VPC */
-	case STRUCT_DECL:		/* New added for VPC */
-	case COLLECTION_DECL:
-	      {  PTR_BLOB blob ;
-		 PTR_SYMB symb,symb1 ;
-		 PTR_LLND llptr,llptr2;
-		 int i;
-
-		      llptr = pbf->entry.Template.ll_ptr1;
-		      symb1 = find_declarator(llptr);
-		      if (symb1) gen_descriptive_type(symb1);
-		      switch (pbf->variant) {
-		      case UNION_DECL: addstr("union ") ;
-				       break;
-		      case STRUCT_DECL:addstr("struct ") ;
-				       break;
-		      case ENUM_DECL  : addstr("enum ") ;
-				       break;
-		      case CLASS_DECL : addstr("class ") ;
-				       break;
-		      case COLLECTION_DECL : addstr("Collection ") ;
-				       break;
-		      }
-		      if ( (symb=pbf->entry.Template.symbol) != 0) {
-			    addstr(symb->ident);
-			    *bp++ = ' ';
-		      }
-		     if (pbf->entry.Template.ll_ptr2) {
-			addstr(" : ");
-			for (llptr2 = pbf->entry.Template.ll_ptr2,i=0;llptr2; 
-			     llptr2= llptr2->entry.Template.ll_ptr2,i++)
-			      { if (i) addstr(" , ");
-				addstr(llptr2->entry.Template.ll_ptr1->entry.Template.symbol->ident);
-			      }
-			  }
-		       if ( (blob=pbf->entry.Template.bl_ptr1) != 0) 
-			{   addstr(" {\n") ;
-			    for ( ; blob ; blob = blob->next)
-			       cunp_blck(blob->ref, tabs+2);
-			    put_tabs(tabs);  addstr("} ");
-			  } 
-		       cunp_llnd(llptr);
-		       *bp++ = ';';
-		       break;
-	       }
-	case DERIVED_CLASS_DECL:	/* Need More for VPC */
-	case VAR_DECL:
-		{  PTR_SYMB symb1 ;
-		   PTR_LLND llptr;
-
-		   llptr = pbf->entry.Template.ll_ptr1;
-		   symb1 = find_declarator(llptr);
-		   if (symb1)
-			   gen_simple_type(symb1->type, pbf, tabs) ;
-		   cunp_llnd(llptr);
-		   if (pbf->control_parent->variant != ENUM_DECL)
-			   addstr(" ;");
-		   break;
-		}
-
-	case EXPR_STMT_NODE:		/* New added for VPC */
-		   cunp_llnd(pbf->entry.Template.ll_ptr1);
-		   addstr(" ;");
-		   break ;
-	case DO_WHILE_NODE:		/* New added for VPC */
-					/* Need study	     */
-	case SWITCH_NODE :		/* New added for VPC */
-		   addstr("switch (");
-		   cunp_llnd(pbf->entry.Template.ll_ptr1);
-		   *bp++ = ')';
-		   break ;
-	case CASE_NODE :		/* New added for VPC */
-		   addstr("case ");
-		   cunp_llnd(pbf->entry.Template.ll_ptr1);
-		   addstr(" : ") ;
-		   break ;
-	case DEFAULT_NODE:		/* New added for VPC */
-		   addstr("default :") ;
-		   break;
-	case BASIC_BLOCK :
-		   break ;
-	case BREAK_NODE  :		/* New added for VPC */
-		   addstr("break;");
-		   break;
-	case CONTINUE_NODE:		/* New added for VPC */
-		   addstr("continue;");
-	case RETURN_NODE  :		/* New added for VPC */
-		addstr("return");
-		if (pbf->entry.Template.ll_ptr1) {
-			addstr("(");
-			cunp_llnd(pbf->entry.Template.ll_ptr1);
-			addstr(");");
-		}
-		break;
-	case ASM_NODE	  :		/* New added for VPC */
-		break;			/* Need More	     */
-	case SPAWN_NODE :		/* New added for VPC */
-		addstr("spawn");
-		cunp_llnd(pbf->entry.Template.ll_ptr1);
-		addstr(" ; ");
-		break;
-	case PARFOR_NODE  :		/* New added for VPC */
-		addstr("parfor (");
-		cunp_llnd(pbf->entry.Template.ll_ptr1);
-		*bp++ = ';';
-		cunp_llnd(pbf->entry.Template.ll_ptr2);
-		*bp++ = ';';
-		cunp_llnd(pbf->entry.Template.ll_ptr3);
-		addstr(") ") ;
-		break;
-	case FUTURE_STMT:
-	       addstr("future ");
-	       cunp_llnd(pbf->entry.Template.ll_ptr1);
-	       addstr(" (");
-	       cunp_llnd(pbf->entry.Template.ll_ptr2);
-	       addstr(")");
-	       break;
-	case PAR_NODE  :		/* New added for VPC */
-		addstr("par ") ;
-		break;
-	default:
-		printf(" unknown biffnode = %d\n", pbf->variant);
-		exit(0);
-		break;		/* don't know what to do at this point */
-	}
-	*bp++ = '\n';
-}
-
-
-/************************************************************************
- *									*
- *		     generate simple declaration			*
- *									*
- ************************************************************************/
-static void
-gen_simple_type(q_type, dum_pbf, tabs)
-	PTR_TYPE q_type ;
-	PTR_BFND dum_pbf ;
-	int tabs;
-{
-   PTR_TYPE q,q3 ;
-   PTR_SYMB s ,symb;
-   /* PTR_BLOB blob ; */
-   /* PTR_BFND pbf;   */
-   int i;
-
-	for (q = q_type ; q ; ) {
-		switch (q->variant) {
-		case T_REFERENCE:
-		case T_POINTER	:
-		case T_FUNCTION :
-		case T_ARRAY	:
-			q = q->entry.Template.base_type ;
-			break ;
-		case T_DESCRIPT :
-			for (i=1; i< MAX_BIT; i *= 2)
-				addstr1(q->entry.descriptive.long_short_flag & i);
-			q = q->entry.descriptive.base_type ;
-			break ;
-		case DEFAULT :	q = (PTR_TYPE ) NULL ;
-			break ;
-		case T_DERIVED_COLLECTION :
-		      symb = q->entry.col_decl.collection_name;
-		      q3 = q->entry.col_decl.base_type;
-		      addstr(symb->ident);
-		      if (q3) {
-			addstr("<");
-			gen_simple_type(q3,dum_pbf,tabs);
-			addstr(">");
-		      }
-		      addstr(" ");
-		     q= (PTR_TYPE) NULL ;
-		    break;
-		case T_DERIVED_TYPE :
-			s = q->entry.derived_type.symbol ;
-			switch (s->variant) {
-			case STRUCT_NAME:	addstr("struct "); break;
-			case ENUM_NAME: 	addstr("enum ");   break;
-			case UNION_NAME:	addstr("union ");  break;
-			case CLASS_NAME:	break;
-			case COLLECTION_NAME:	 break;
-			case TYPE_NAME:
-			default:
-				break ;
-			}
-			addstr(s->ident);
-			*bp++ = ' ';
-			if (s->variant==COLLECTION_NAME) {
-			  if ( (q3=s->type->entry.derived_class.base_type) != 0) {
-			      addstr("<");
-			      gen_simple_type(q3,dum_pbf,tabs);
-			      addstr(">");
-			    }
-			}
-			q = (PTR_TYPE) NULL ;
-			break ;
-
-		case T_INT     :
-			addstr("int ");
-			q= (PTR_TYPE) NULL ;
-			break;
-		case T_CHAR    :
-			addstr("char ");
-			q= (PTR_TYPE) NULL ;
-			break;
-		case T_VOID    :
-			addstr("void ");
-			q= (PTR_TYPE) NULL ;
-			break;
-		case T_DOUBLE  :
-			addstr("double ");
-			q= (PTR_TYPE) NULL ;
-			break;
-		case T_FLOAT   :
-			addstr("float ");
-			q= (PTR_TYPE) NULL ;
-			break;
-
-		case T_UNION   :
-		case T_STRUCT  :
-		case T_ENUM    :
-		case T_CLASS   :
-			switch (q->variant) {
-			case T_UNION   : addstr("union ") ;
-				break;
-			case T_STRUCT  : addstr("struct ") ;
-				break;
-			case T_ENUM    : addstr("enum ") ;
-				break;
-			case T_CLASS   : addstr("class ") ;
-				break;
-			case T_COLLECTION: addstr("Collection ") ;
-				       break;
-			}
-
-			if ( (symb=q->entry.derived_class.original_class->entry.Template.symbol) != 0) {
-				addstr(symb->ident);
-				*bp++ = ' ';
-			}	    
-
-			q = (PTR_TYPE) NULL ;
-			break;
-		case T_COLLECTION:
-		      if ( (symb=q->entry.derived_class.original_class->entry.Template.symbol) != 0)
-			{   addstr(symb->ident);
-			    if ( (q3=q->entry.derived_class.base_type) != 0) {
-			      addstr("<");
-			      gen_simple_type(q3,dum_pbf,tabs);
-			      addstr(">");
-			    }
-			    addstr(" ");
-			  }
-		      q= (PTR_TYPE) NULL ;
-		      break;
-	    /* not in leejenq's version
-		case T_DERIVED_CLASS:
-		   {	PTR_BFND pbf ;
-
-			pbf = q->entry.derived_class.original_class ;
-			addstr("class");
-			if (symb=pbf->entry.Template.symbol)
-				addstr(symb->ident);
-			addstr(" : ");
-			cunp_llnd(pbf->entry.Template.ll_ptr2);
-			if (blob=pbf->entry.Template.bl_ptr1) {
-				addstr(" {") ;
-				for ( ; blob ; blob = blob->next)
-					cunp_bfnd(tabs,blob->ref);
-				put_tabs(tabs);  *bp++ = '}';
-			}
-			break ;
-		}
-	     */
-		default :
-			break;
-		}
-	}
-}
-
-
-static int
-cprecedence(op)
-	int op ;
-{   
-    switch (op)  {
-	case NEW_OP:	   
-	case DELETE_OP:
-			    return(2);
-	case EQ_OP	:   return(7);
-	case LT_OP	:   return(6);
-	case GT_OP	:   return(6);
-	case NOTEQL_OP	:   return(7);
-	case LTEQL_OP	:   return(6);
-	case GTEQL_OP	:   return(6);
-	case ADD_OP	:   return(4);
-	case OR_OP	:   return(12);
-	case MULT_OP	:   return(3);
-	case DIV_OP	:   return(3);
-	case AND_OP	:   return(11);
-	case XOR_OP	:   return(9);
-
-	case LE_OP	:   return(6);	/* duplicated */
-	case GE_OP	:   return(6);	/* duplicated */
-	case NE_OP	:   return(7);	/* duplicated */
-	case UNARY_ADD_OP:  return(2);	/* unary operation */
-	case SUB_OP	:   return(2);	/* unary operation */
-	case SUBT_OP	:   return(11); /* binary operator */
-	case MINUS_OP	:   return(2);	/* unary operator */
-	case NOT_OP	:   return(2);
-
-	case PLUS_ASSGN_OP:
-	case MINUS_ASSGN_OP:
-	case AND_ASSGN_OP:
-	case  IOR_ASSGN_OP:
-	case  MULT_ASSGN_OP:
-	case  DIV_ASSGN_OP:
-	case MOD_ASSGN_OP:
-	case  XOR_ASSGN_OP:
-	case  LSHIFT_ASSGN_OP:
-	case  RSHIFT_ASSGN_OP :
-
-	case ARITH_ASSGN_OP:
-	case ASSGN_OP	:   return(14);
-	case DEREF_OP	:   return(2);
-	case POINTST_OP :   return(1);
-	case RECORD_REF :   return(1);
-	case BITAND_OP	:   return(10);
-	case BITOR_OP	:   return(10);
-	case LSHIFT_OP	:   return(5);
-	case RSHIFT_OP	:   return(5);
-	case MOD_OP :	return(3);	  /* New added for VPC */
-	case ADDRESS_OP:    return(2);
-	case SIZE_OP   :    return(2);
-	case PLUSPLUS_OP:
-	case MINUSMINUS_OP: return(2);
-	case EXPR_LIST	:    return(15);
-	default 	:   return(0);
-	}
-}
-
-
-int
-mapping(op)
-int op ;
-{
-    switch (op)  {
-	case EQ_OP	:   return(20);
-	case LT_OP	:   return(16);
-	case GT_OP	:   return(17);
-	case NOTEQL_OP	:   return(21);
-	case LTEQL_OP	:   return(18);
-	case GTEQL_OP	:   return(19);
-	case ADD_OP	:   return(12);
-	case OR_OP	:   return(26);
-	case MULT_OP	:   return(9);
-	case DIV_OP	:   return(10);
-	case AND_OP	:   return(25);
-	case XOR_OP	:   return(23);
-
-	case LE_OP	:   return(18); /* duplicated */
-	case GE_OP	:   return(19); /* duplicated */
-	case NE_OP	:   return(21); /* duplicated */
-	case SUB_OP	:   return(5); /* unary operator */
-	case MINUS_OP	:   return(5); /* unary operator */
-	case SUBT_OP   :   return(5); /* binary operator */
-	case NOT_OP	:   return(1);
-
-	case PLUS_ASSGN_OP: return(28);
-	case MINUS_ASSGN_OP:return(29);
-	case AND_ASSGN_OP:  return(30);
-	case  IOR_ASSGN_OP: return(31);
-	case  MULT_ASSGN_OP:return(32);
-	case  DIV_ASSGN_OP: return(33);
-	case MOD_ASSGN_OP:  return(34);
-	case  XOR_ASSGN_OP: return(35);
-	case  LSHIFT_ASSGN_OP:return(36);
-	case  RSHIFT_ASSGN_OP :return(37);
-	case ASSGN_OP	:   return(27);
-
-	case DEREF_OP	:   return(6);
-	case POINTST_OP :   return(0);
-	case BITAND_OP	:   return(22);
-	case BITOR_OP	:   return(24);
-	case LSHIFT_OP	:   return(15);
-	case RSHIFT_OP	:   return(14);
-	case MINUSMINUS_OP: return(4);		   /* New added for VPC */
-	case PLUSPLUS_OP  : return(3);		   /* New added for VPC */
-	case UNARY_ADD_OP : return(12); 	   /* New added for VPC */
-	case BIT_COMPLEMENT_OP :return(2);	   /* New added for VPC */
-	case MOD_OP :	return(11);	   /* New added for VPC */
-	case SIZE_OP :	     return(8); 	   /* New added for VPC */
-	case ADDRESS_OP:     return(7);
-	default 	:   sprintf(buffera, "bad case 1");
-			    return(0);
-	}
-}
-
-
-static void
-gen_op(value)
-	int value;
-{
-    switch (value) {
-    case ((int) PLUS_EXPR) : addstr("+= ");
-	break;
-    case ((int) MINUS_EXPR): addstr("-= ");
-	break;
-    case ((int) BIT_AND_EXPR):addstr("&= ");
-	break;
-    case ((int) BIT_IOR_EXPR):addstr("|= ");
-	break;
-    case ((int) MULT_EXPR):  addstr("*= ");
-	break;
-    case ((int) TRUNC_DIV_EXPR): addstr("/= ");
-	break;
-    case ((int) TRUNC_MOD_EXPR): addstr("%= ");
-	break;
-    case ((int) BIT_XOR_EXPR): addstr("^= ");
-	break;
-    case ((int) LSHIFT_EXPR): addstr("<<= ");
-	break;
-    case ((int) RSHIFT_EXPR): addstr(">>= ");
-	break;
-	default : addstr("= ");
-    }
-}
-
-static char left_mod[2000];
-static void
-gen_simple_type_2(q_type, dum_pbf, tabs)
-	PTR_TYPE q_type;
-	PTR_BFND dum_pbf;
-	int tabs;
-{
-   PTR_BFND pbf;
-   PTR_TYPE q ;
-   PTR_SYMB s ,symb;
-   PTR_BLOB blob ;
-   PTR_LLND r1;
-   /*  char *old_bp; */
-   int level ;
-   int i;
-char * bp_save;
-
-   left_mod[0] = '\0';
-   level= 0 ;
-   clean(temp_buf);
-    for (q = q_type ; q ; )
-    {
-     switch (q->variant) {
-     case T_POINTER  :
-	put_left("*",temp_buf);
-	level = 1;
-	q = q->entry.Template.base_type ;
-	break;
-     case T_REFERENCE:
-	put_left("&",temp_buf);
-	level = 1;
-	q = q->entry.Template.base_type ;
-	break;
-     case T_FUNCTION :
-	put_left("(",temp_buf);
-	put_right(")",temp_buf);
-	put_right("()",temp_buf);
-	q = q->entry.Template.base_type ;
-	break;
-     case T_ARRAY    :
-	if (level >0) {
-	    put_left("(",temp_buf);
-	    put_right(")",temp_buf);
-	  }
-	clean(temp1_buf);
-	bp_save = bp;  /* Backup before switching buffer */
-	put_left(buffer,temp1_buf);  /* Backup before switching buffer */
-	clean(buffer);
-	bp = &(buffer[0]);
-	for (r1=q->entry.ar_decl.ranges;r1; r1= r1->entry.Template.ll_ptr2)
-	  {
-	    addstr("[");
-	    cunp_llnd(r1->entry.Template.ll_ptr1);
-	    addstr("]");
-	  }
-	put_right(buffer,temp_buf);
-	clean(buffer);
-	bp = bp_save;
-	put_left(temp1_buf,buffer);
-	q = q->entry.Template.base_type ;
-	break ;
-     case T_DESCRIPT :
-	clean(temp1_buf);
-	bp_save = bp;                /* Backup before switching buffer */
-	put_left(buffer,temp1_buf);  /* Backup before switching buffer */
-	clean(buffer);  
-	bp = &(buffer[0]);
-	for (i=1; i< MAX_BIT; i= i*2)
-	  addstr1(q->entry.descriptive.long_short_flag & i);
-	put_right(buffer, left_mod);
-	clean(buffer); 
-	bp = bp_save;
-	put_left(temp1_buf,buffer);
-	q = q->entry.descriptive.base_type ; 
-	break ;
-    case DEFAULT : 
-	put_left("int ",temp_buf);
-	q = (PTR_TYPE ) NULL ;
-	break ;
-    case T_DERIVED_TYPE :
-	clean(temp1_buf);
-	bp_save = bp;                /* Backup before switching buffer */
-	put_left(buffer,temp1_buf);  /* Backup before switching buffer */
-	clean(buffer);
-	bp = &(buffer[0]);
-	s = q->entry.derived_type.symbol ;
-	switch (s->variant) {
-	case STRUCT_NAME: addstr("struct "); break;
-	case ENUM_NAME:   addstr("enum ");   break;
-	case UNION_NAME:  addstr("union ");  break;
-	case CLASS_NAME:  addstr("class ");  break;
-	case COLLECTION_NAME:  addstr("Collection ");  break;
-	case TYPE_NAME:
-	default:
-	  break ;
-	}
-	addstr(s->ident);
-	addstr(" ");
-	put_left(buffer,temp_buf);
-	clean(buffer);
-	bp = bp_save;
-	put_left(temp1_buf,buffer);
-	q = (PTR_TYPE) NULL ;
-	break ;
-   case T_INT	  :
-       put_left("int ",temp_buf);
-       q= (PTR_TYPE) NULL ;
-       break;
-   case T_CHAR	  :
-       put_left("char ",temp_buf);
-       q= (PTR_TYPE) NULL ;
-       break;
-   case T_VOID	  :
-	put_left("void ",temp_buf);
-	q= (PTR_TYPE) NULL ;
-	break;
-   case T_DOUBLE  :
-	put_left("double ",temp_buf);
-	q= (PTR_TYPE) NULL ;
-	break;
-   case T_FLOAT   :
-	put_left("float ",temp_buf);
-	q= (PTR_TYPE) NULL ;
-	break;
-   case T_UNION   :
-   case T_STRUCT  :
-   case T_ENUM	  :
-   case T_CLASS   :
-   case T_COLLECTION:
-   case T_DERIVED_CLASS:
-     clean(temp1_buf);
-     bp_save = bp;                /* Backup before switching buffer */
-     put_left(buffer,temp1_buf);  /* Backup before switching buffer */
-     clean(buffer);
-     bp = &(buffer[0]);
-     switch (q->variant) {
-     case T_UNION   : addstr("union ") ;
-       break;
-     case T_STRUCT  : addstr("struct ") ;
-       break;
-     case T_ENUM    : addstr("enum ") ;
-       break;
-     case T_DERIVED_CLASS:
-     case T_CLASS   : addstr("class ") ;
-       break;
-     case T_COLLECTION	: addstr("Collection ") ;
-       break;
-     }
-     if ( (symb=q->entry.derived_class.original_class->entry.Template.symbol) != 0)
-       {   addstr(symb->ident);
-	   addstr(" ");
-	 }	   
-     pbf = q->entry.derived_class.original_class ;
-     if (pbf->entry.Template.ll_ptr2) {
-       addstr(" : ");
-       cunp_llnd(pbf->entry.Template.ll_ptr2);
-     }
-     if ( (blob=q->entry.derived_class.original_class->entry.Template.bl_ptr1) != 0)
-       {   addstr(" {\n") ;
-	   for ( ; blob ; blob = blob->next)
-	     { 
-	       cdrtext(blob->ref,tabs,0,100);  
-	       addstr("\n");
-	     }
-	   put_tabs(tabs);  addstr("} ");
-	 }
-     put_left(buffer,temp_buf);
-     clean(buffer);
-     bp = bp_save;
-     put_left(temp1_buf,buffer);
-     q = (PTR_TYPE) NULL ;
-     break;
-  default :	 sprintf(buffera,"unexpected type");
-      }
-   }
-   put_left(left_mod, temp_buf);
-   addstr(temp_buf);
-}
-
-static
-void cunp_llnd(pllnd)
-PTR_LLND	pllnd;
-{
-  PTR_LLND pll2;
-  char ch;  
-	if (pllnd == NULL) return;
-
-	switch (pllnd->variant) {
-	case INT_VAL	:
-	    { char sb[64];
-
-	      sprintf(sb, "%d", pllnd->entry.ival);
-	      addstr(sb);
-	      break;
-	    }
-	case STMT_STR	: break ;
-	case FLOAT_VAL	:
-	case DOUBLE_VAL :
-		addstr(pllnd->entry.string_val);
-		break;
-	case STRING_VAL :
-		*bp++ = '"';
-		sprintf(buffera, "%s", pllnd->entry.string_val);
-		addstr(buffera);
-		*bp++ = '"';
-		break;
-	case BOOL_VAL	:
-		break;
-	case CHAR_VAL	:
-		ch = pllnd->entry.cval;
-		switch (ch) {
-		case  '\t': addstr("\'\\");  addstr("t\'"); return;
-		case '\n':  addstr("\'\\"); addstr("n\'"); return;
-		case '\b':  addstr("\'\\"); addstr("b\'"); return;
-		case '\f':  addstr("\'\\"); addstr("f\'"); return;
-		case '\r':  addstr("\'\\"); addstr("r\'"); return;
-		case '\0':  addstr("\'\\"); addstr("0\'"); return;
-		case '\\':  addstr("\'\\"); addstr("\\"); addstr("\'"); return;
-		case '\'':  addstr("\'\\"); addstr("\'\'"); return;
-		default: break;
-		}
-		sprintf(buffera, "\'%c\'",pllnd->entry.cval);
-		addstr(buffera);
-		break;
-	case THIS_NODE:
-	       addstr("this");
-	       break;
-	case CONST_REF	:
-	case VAR_REF	:
-	case ENUM_REF	:
-		addstr(pllnd->entry.Template.symbol->ident);
-		break;
-	case RECORD_REF:		    
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		*bp++ = '.';
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		break ;
-	case ARRAY_OP :
-		*bp++ = '(';
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		for (pll2 = pllnd->entry.Template.ll_ptr2;pll2; pll2= pll2->entry.Template.ll_ptr2) {
-			*bp++ = '[';
-			cunp_llnd(pll2->entry.Template.ll_ptr1);
-			*bp++ = ']';
-		}
-		*bp++ = ')';
-		break;
-
-	case ARRAY_REF	:
-		addstr(pllnd->entry.array_ref.symbol->ident);
-		for (pll2 = pllnd->entry.Template.ll_ptr1;pll2; pll2= pll2->entry.Template.ll_ptr2) {
-			*bp++ = '[';
-			cunp_llnd(pll2->entry.Template.ll_ptr1);
-			*bp++ = ']';
-		}
-		break;
-	case CONSTRUCTOR_REF	:
-		break;
-	case ACCESS_REF :
-		break;
-	case CONS	:
-		break;
-	case ACCESS	:
-		break;
-	case IOACCESS	:
-		break;
-	case PROC_CALL	:
-	case FUNC_CALL	:
-		addstr(pllnd->entry.Template.symbol->ident);
-		*bp++ = '(';
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		*bp++ = ')';
-		break;
-	case EXPR_LIST	:
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		if (pllnd->entry.Template.ll_ptr2) {
-			addstr(",");
-			cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		}
-		break;
-	case EQUI_LIST	:
-		break;
-	case COMM_LIST	:
-		break;
-	case VAR_LIST	:
-	case CONTROL_LIST	:
-		break;
-	case RANGE_LIST :
-		*bp++ = '[';
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		*bp++ = ']';
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case DDOT	:
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr(":");
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case COPY_NODE :
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr("#");
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case VECTOR_CONST :	/* NEW ADDED FOR VPC++	*/
-		addstr("[ ");
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr(" ]"); 
-		break ;
-	case INIT_LIST:
-		addstr("{ ");
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr(" }"); 
-		break ;
-	case BIT_NUMBER:
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr(" : ");
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		break ;
-	case DEF_CHOICE :
-	case SEQ	:
-		break;
-	case SPEC_PAIR	:
-		break;
-
-
-	case EQ_OP	:
-	case LT_OP	:
-	case GT_OP	:
-	case NOTEQL_OP	:
-	case LTEQL_OP	:
-	case GTEQL_OP	:
-	case ADD_OP	:
-	case SUBT_OP	:
-	case OR_OP	:
-	case MULT_OP	:
-	case DIV_OP	:
-	case AND_OP	:
-	case XOR_OP	:
-	case POINTST_OP :	/* New added for VPC */
-	case LE_OP	:	/* New added for VPC *//*Duplicated*/
-	case GE_OP	:	/* New added for VPC *//*Duplicated*/
-	case NE_OP	:	/* New added for VPC *//*Duplicated*/
-
-	case PLUS_ASSGN_OP:
-	case MINUS_ASSGN_OP:
-	case AND_ASSGN_OP:
-	case  IOR_ASSGN_OP:
-	case  MULT_ASSGN_OP:
-	case  DIV_ASSGN_OP:
-	case MOD_ASSGN_OP:
-	case  XOR_ASSGN_OP:
-	case  LSHIFT_ASSGN_OP:
-	case  RSHIFT_ASSGN_OP :
-
-	case ARITH_ASSGN_OP:
-	case ASSGN_OP	:	/* New added for VPC */
-	case BITAND_OP	  :	/* New added for VPC */
-	case BITOR_OP	  :	/* New added for VPC */
-	case LSHIFT_OP	       : /* New added for VPC */
-	case RSHIFT_OP	       : /* New added for VPC */
-	case MOD_OP :	/* New added for VPC */
-	    {
-		    int i, j ;
-		    PTR_LLND p;
-
-		    i = pllnd->variant ;
-		    p = pllnd->entry.Template.ll_ptr1 ;
-		    j = p->variant;
-		    if ( cprecedence(i) < cprecedence(j) ) {
-			    *bp++ = '(';
-			    cunp_llnd(p);
-			    *bp++ = ')';
-			    if (pllnd->variant != ARITH_ASSGN_OP)
-				    addstr(cop_name[mapping(i)] );
-			    else
-				    gen_op(pllnd->entry.Template.symbol->variant); 
-		    } else {
-			    cunp_llnd(p);
-			    if (pllnd->variant != ARITH_ASSGN_OP)
-				    addstr(cop_name[mapping(i)]);
-			    else
-				    gen_op(pllnd->entry.Template.symbol->variant);
-		    }
-		    p = pllnd->entry.Template.ll_ptr2;
-		    j = p->variant;
-		    if ( cprecedence(i) <= cprecedence(j)) {
-			    *bp++ = '(';
-			    cunp_llnd(p);
-			    *bp++ = ')';
-		    } else
-			    cunp_llnd(p);
-		    break ;
-	    }
-	case SUB_OP   : 	/* duplicated unary minus  */
-	case MINUS_OP	:	/* unary operations */
-	case UNARY_ADD_OP      : /* New added for VPC */
-	case BIT_COMPLEMENT_OP : /* New added for VPC */
-	case NOT_OP	:
-	case DEREF_OP :
-	case SIZE_OP	  :	/* New added for VPC */
-	case ADDRESS_OP   :	/* New added for VPC */
-	    {
-		    int i, j;
-		    PTR_LLND p;
-
-		    i = pllnd->variant ;
-		    p = pllnd->entry.Template.ll_ptr1 ;
-		    j = p->variant;
-		    addstr(cop_name[mapping(i)] );
-		    if ( cprecedence(i) < cprecedence(j) ) {
-			    *bp++ = '(';
-			    cunp_llnd(p);
-			    *bp++ = ')';
-		    } else
-			    cunp_llnd(p);
-	    } 
-		break;
-	case SAMETYPE_OP      : 	      /* New added for VPC */
-	    addstr("SameType (");
-	    cunp_llnd(pllnd->entry.Template.ll_ptr1);
-	    addstr(" , ");
-	    cunp_llnd(pllnd->entry.Template.ll_ptr2);
-	    addstr(")");
-		break;
-	case MINUSMINUS_OP:	/* New added for VPC */
-	case PLUSPLUS_OP  :	/* New added for VPC */
-	    {
-		    int i ,j ;
-		    PTR_LLND p;
-
-		    i = pllnd->variant;
-		    if	( (p = pllnd->entry.Template.ll_ptr1) != 0) {
-			    j = p->variant;
-			    addstr(cop_name[mapping(i)] );
-			    if ( cprecedence(i) < cprecedence(j) ) {
-				    *bp++ = '(';
-				    cunp_llnd(p);
-				    *bp++ = ')';
-			    } else
-				    cunp_llnd(p);
-		    } else {
-			    p = pllnd->entry.Template.ll_ptr2 ;
-			    j = p->variant;
-			    if ( cprecedence(i) < cprecedence(j) ) {
-				    *bp++ = '(';
-				    cunp_llnd(p);
-				    *bp++ = ')';
-			    } else
-				    cunp_llnd(p);
-			    addstr(cop_name[mapping(i)] );
-		    }
-	    } 
-		break;
-
-	case STAR_RANGE :
-		addstr(" : ");
-		break;
-	case FUNCTION_OP :	/* New added for VPC */
-		*bp++ = '(';
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		*bp++ = ')';		    
-		*bp++ = '(';
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);   
-		*bp++ = ')';		    
-		break ;
-	case CLASSINIT_OP :	/* New added for VPC */
-	    {
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		*bp++ = '(';
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		*bp++ = ')';
-	    }
-		break ;
-	case DELETE_OP:
-		 addstr("delete ");
-		 if (pllnd->entry.Template.ll_ptr2) {
-		   *bp++ ='[';
-		   cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		   addstr("] ");
-		 }
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		break;
-	case SCOPE_OP:
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr("::");
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case NEW_OP:
-		{ PTR_LLND pllnd1;
-		  addstr("new ");
-		  pllnd1 = pllnd->entry.Template.ll_ptr1;
-		  gen_simple_type_2(pllnd1->type,BFNULL,global_tab);
-		  if (pllnd->entry.Template.ll_ptr2) {
-		    *bp++= '(';
-		    cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		    addstr(") ");
-		  }
-		  break;
-		}
-	case CAST_OP :		/* New added for VPC */
-		*bp++ = '(';
-		gen_simple_type_2(pllnd->type, BFNULL, global_tab);
-		*bp++ = ')';
-		*bp++ = ' ';
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		break;
-	case EXPR_IF	  :	/* New added for VPC */
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr(" ? ");
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case EXPR_IF_BODY :	/* New added for VPC */
-		cunp_llnd(pllnd->entry.Template.ll_ptr1);
-		addstr(" : ");
-		cunp_llnd(pllnd->entry.Template.ll_ptr2);
-		break;
-	case FUNCTION_REF :	/* New added for VPC */
-		addstr(pllnd->entry.Template.symbol->ident);
-		*bp++ = '(';
-		/*		cunp_llnd(pllnd->entry.Template.ll_ptr1);   */
-		*bp++ = ')';
-		break ;
-	case LABEL_REF: 	/* Fortran Version, For VPC we need more */
-	    { char sb[64];
-
-	      sprintf(sb, "%d", (int)(pllnd->entry.label_list.lab_ptr->stateno));
-	      addstr(sb);
-	      break;
-	    }
-	default :
-		break;
-	}
-}
-
-static int
-is_param_decl(var_bf, functor)
-	PTR_BFND var_bf ;
-	PTR_SYMB functor ;
-{
-	PTR_LLND flow_ptr,lpr ;
-	PTR_SYMB s ;
-
-	switch (var_bf->variant) {
-	case VAR_DECL :
-	case ENUM_DECL:
-	case CLASS_DECL:
-	case UNION_DECL:
-	case STRUCT_DECL:
-	case DERIVED_CLASS_DECL :
-		lpr = var_bf->entry.Template.ll_ptr1 ;
-		for (flow_ptr = lpr; flow_ptr ; flow_ptr = flow_ptr->entry.Template.ll_ptr1) {
-			if ((flow_ptr->variant == VAR_REF) ||
-			    (flow_ptr->variant == ARRAY_REF) ||
-			    (flow_ptr->variant == FUNCTION_REF) ) break ;
-		}
-		if (!flow_ptr)
-			return(0);
-
-		for (s = functor->entry.member_func.in_list; s ;  s = s->entry.var_decl.next_in)
-			if (flow_ptr->entry.Template.symbol == s)
-				return(1);
-		break;
-	default :
-		break;
-	}
-	return(0) ;
-}
-
-
-static int
-this_is_decl(variant)
-int variant ;
-{
-	switch(variant) {
-	case CLASS_DECL :
-	case UNION_DECL :
-	case STRUCT_DECL :
-	case ENUM_DECL :
-	case VAR_DECL :
-	case DERIVED_CLASS_DECL:
-		return(1);
-	default :
-		break;
-	}
-	return(0);
-}
-
-
-static int
-not_explicit(s, pbf)
-	PTR_SYMB  s ;
-	PTR_BFND pbf ;
-{
-	PTR_BLOB blob ;
-	PTR_LLND lptr1;
-	PTR_SYMB symbptr;
-
-	for (blob = pbf->entry.Template.bl_ptr1 ; blob ; blob = blob->next ) {
-		if (!this_is_decl(blob->ref->variant )) return(1);
-		for (lptr1=blob->ref->entry.Template.ll_ptr1 ; lptr1; lptr1 = lptr1->entry.Template.ll_ptr2) {
-			symbptr = find_declarator(lptr1);
-			if ( s == symbptr) return(0);
-		}
-	}
-	return(1);
-}
-
-
-static int
-not_class(pbf)
-PTR_BFND pbf;
-{
-  switch(pbf->variant) {
-  case GLOBAL :
-  case CLASS_DECL :
-  case UNION_DECL :
-  case STRUCT_DECL :
-  case ENUM_DECL :
-  case FUNC_HEDR :
-  case DERIVED_CLASS_DECL:  return(0);
-    default :		    return(1);
-  }
-}
-
-int cdrtext(bfptr,tab,curh,maxh)
-PTR_BFND bfptr;
-int tab,curh,maxh;
-{
-        int lev;
-        register PTR_BLOB b;
-        /*   register PTR_BLOB  p; */
-        int      left_param ;
-	int token = 0;
-
-        left_param = 0;
-        lev = maxh-curh;
-
-        global_tab = tab ;
-        cunp_bfnd(tab, bfptr);
-        global_tab = tab ;
-/*
-        if ((current_proc == global_bfnd) && (bfptr->control_parent == global_bfnd))
-                return(token);
-*/
-
-        if ((basket_needed(bfptr,1) > 1)&&(not_class(bfptr)))
-           {   put_tabs(tab); 
-	      addstr("{ \n");
-	   }
-	  
-        for (b = bfptr->entry.Template.bl_ptr1; b; b = b->next)
-	  {
-/*               PTR_CMNT cmnt = b->ref->entry.Template.cmnt_ptr;
-                 if (cmnt)
-                       while (cmnt != NULL && cmnt->type == FULL) {
-                                        addstr(cmnt->string );
-                                        addstr( "\n" );
-                                        cmnt = cmnt->next;
-                                }
-*/
-                  switch(bfptr->variant){
-	          case CLASS_DECL :
-		  case COLLECTION_DECL:
-                  case UNION_DECL :
-                  case ENUM_DECL:
-                  case STRUCT_DECL :
-                  case DERIVED_CLASS_DECL : break ;
-                  case FUNC_HEDR :
-                      if (left_param==0)
-                            {
-                             if (!is_param_decl(b->ref,bfptr->entry.Template.symbol))
-			       {   put_tabs(tab); addstr("{ \n");
-                                   left_param= 1 ;
-				 }
-
-                           }
-                       token = cdrtext(b->ref,tab+1,curh+1,maxh);
-                       break ; 
-                  default :
-                          token = cdrtext(b->ref,tab+1,curh+1,maxh);
-	          }
-/*                 if (cmnt && cmnt->type != FULL)
-                     {  addstr( cmnt->string );
-                        addstr( "\n" );
-		      }
-*/
-	     } 
-       if (bfptr->variant == FUNC_HEDR)
-         {
-                if (left_param == 0)  {
-                         put_tabs(tab); addstr("{ \n");
-		       }
-                put_tabs(tab); addstr("} \n");
-	    }
-
-        if ((basket_needed(bfptr, 1) > 1)&&(not_class(bfptr)))
-           {   put_tabs(tab); addstr("} \n");
-	   }
-
-        if (basket_needed(bfptr,2) > 0)
-	  {    put_tabs(tab); addstr("else \n");
-	     }
-        if (basket_needed(bfptr,2) > 1)
-           {   put_tabs(tab); addstr("{ \n");
-	   }
-
-
-        for (b = bfptr->entry.Template.bl_ptr2; b; b = b->next)
-          {                  
-            /*  PTR_CMNT cmnt = b->ref->entry.Template.cmnt_ptr;*/
-                       token = cdrtext(b->ref,tab+1,curh+1,maxh);
-   
-          }
-
-        if (basket_needed(bfptr,2) > 1)
-           {   put_tabs(tab); addstr("} \n");
-	   }
-/*        if (cmnt && cmnt->type != FULL)
-            while  (cmnt && cmnt->type != FULL)
-                     {  tm_put_string(Wid,cmnt->string,token);
-                        cmnt =cmnt->next ;
-		      }
-         addstr( "\n" );
-*/
-        return (token);
-
-
- }
-
-
-
-
-
-
-static int 
-basket_needed(bf, index)
-	PTR_BFND  bf ;
-	int index ;
-{
-	PTR_BLOB blob1 ,blob ;
-
-	switch (index) {
-	case 1 :
-		if (bf->variant == FUNC_HEDR || bf->variant == BASIC_BLOCK)
-			return(2);
-		blob = bf->entry.Template.bl_ptr1 ;
-		if (blob == NULL)  return(0) ;
-		if (((blob1= blob->next) == NULL) || 
-		    (blob1->ref->variant == CONTROL_END)) return(1);
-		break;
-	case 2 :
-		blob = bf->entry.Template.bl_ptr2 ;
-		if (!blob)  return(0) ;
-		if (((blob1= blob->next) == NULL) ||
-		    (blob1->ref->variant == CONTROL_END)) return(1);
-		break;
-	}
-	return(2) ;
-}
-
-
-static void
-cunp_blck(bfptr, tab)
-	PTR_BFND bfptr;
-	int	 tab;
-{
-    PTR_BLOB b;
-    int  left_param ;
-
-    left_param = 0;
-    cunp_bfnd(tab, bfptr);
-
-    if ((basket_needed(bfptr,1) > 1)&&(not_class(bfptr))) {
-	put_tabs(tab);
-	addstr("{\n");
-    }
-	  
-    for (b = bfptr->entry.Template.bl_ptr1; b; b = b->next) {
-	switch(bfptr->variant) {
-	case CLASS_DECL :
-	case UNION_DECL :
-	case ENUM_DECL:
-	case STRUCT_DECL :
-	case DERIVED_CLASS_DECL :
-	    break ;
-	case FUNC_HEDR :
-	    if (left_param==0)
-		if (!is_param_decl(b->ref,bfptr->entry.Template.symbol)) {
-		    put_tabs(tab);
-		    addstr("{\n");
-		    left_param= 1 ;
-		}
-	    cunp_blck(b->ref, tab+1);
-	    break ;
-	case CONTROL_END:
-	    break; 
-	default :
-	    cunp_blck(b->ref, tab+1);
-	    break;
-	}
-    } 
-    if (bfptr->variant == FUNC_HEDR) {
-	if (left_param == 0) {
-	    put_tabs(tab);
-	    addstr("{\n");
-	}
-	put_tabs(tab);
-	addstr("}\n");
-    }
-
-    if ((basket_needed(bfptr, 1) > 1)&&(not_class(bfptr))) {
-	put_tabs(tab);
-	addstr("}\n");
-    }
-
-    if (basket_needed(bfptr,2) > 0) {
-	put_tabs(tab);
-	addstr("else\n");
-    }
-    if (basket_needed(bfptr,2) > 1) {
-	put_tabs(tab);
-	addstr("{\n");
-    }
-
-    for (b = bfptr->entry.Template.bl_ptr2; b; b = b->next)
-	cunp_blck(b->ref, tab+1);
-
-    if (basket_needed(bfptr,2) > 1) {
-	put_tabs(tab);
-	addstr("}\n");
-    }
-}
-
-
-/* find_declarator :
- * <1> Given a ll_node <expr_list> to follow ll_ptr1 to find declarator
- * <2> return the symb pointer
- */
-static PTR_SYMB
-find_declarator(expr_list)
-	PTR_LLND expr_list ;
-{
-	PTR_SYMB symb;
-	PTR_LLND p ;
-
-	if (! expr_list)
-		return(SMNULL);
-	symb = SMNULL ;
-	for ( p = expr_list->entry.Template.ll_ptr1 ; p ;   ) {
-	    switch (p->variant) {
-		case BIT_NUMBER:
-		case ASSGN_OP :
-		case ARRAY_OP:
-		case FUNCTION_OP :
-		case CLASSINIT_OP:
-		case ADDRESS_OP:
-		case DEREF_OP : p = p->entry.Template.ll_ptr1 ;
-			break ;
-		case FUNCTION_REF:
-		case ARRAY_REF:
-		case VAR_REF:
-			symb = p->entry.Template.symbol ;
-			p = LLNULL ;
-			break ;
-		}
-	}
-	return(symb);
-}
-
-
-static void
-gen_func_hedr(functor, pbf, tabs)
-	PTR_SYMB functor ;
-	PTR_BFND pbf ;
-	int	 tabs ;
-{
-	PTR_SYMB s ;
-	PTR_TYPE q ;
-	PTR_LLND pllnd;
-	int i;
-
-	for (q = functor->type; q ;	) { 
-		switch ( q->variant) {
-		case T_POINTER : 
-			*bp++ = '*';
-			q = q->entry.Template.base_type ;
-			break;
-                case T_REFERENCE:
-                       *bp++ = '&';
-                       q = q->entry.Template.base_type ;
-                       break;
-		default:	/* It might need more for complicated case */
-			q = (PTR_TYPE) NULL ;
-		}
-	}
-        if (is_scope_op_needed(pbf,functor)) {
-           addstr(functor->entry.member_func.base_name->ident);
-           addstr("::");
-        }
-	addstr(functor->ident);
-	*bp++ = '(';
-	for ( i=0, s = functor->entry.member_func.in_list ; s ; i++ ) {
-		if (i)	*bp++ = ',';  
-		if (not_explicit(s, pbf)) {
-			gen_simple_type(s->type, BFNULL, tabs);
-			for (q = s->type; q ;	) {
-				switch ( q->variant) {
-				case T_POINTER : 
-					*bp++ = '*';
-					q = q->entry.Template.base_type;
-					break;
-	                        case T_REFERENCE:
-                                        *bp++ ='&';
-                                         q = q->entry.Template.base_type ;
-                                         break;
-				default: /* It might need more for complicated case */
-					q = (PTR_TYPE) NULL;
-				}
-			}
-	  
-		}
-		addstr(s->ident);
-		s = s->entry.var_decl.next_in;
-	}
-	*bp++ = ')';
-        pllnd = pbf->entry.Template.ll_ptr1;
-        pllnd = pllnd->entry.Template.ll_ptr1;
-        if (pllnd &&(pllnd->variant == BIT_NUMBER)){
-            addstr(" : ");
-            cunp_llnd(pllnd->entry.Template.ll_ptr2);
-            }
-} 
-
-int
-is_scope_op_needed(pbf,functor)
-PTR_BFND pbf;
-PTR_SYMB functor;
-{
-  PTR_BFND parent;
-
-  if (functor->variant!=MEMBER_FUNC) return(0);
-  parent = pbf->control_parent;
-  if (parent->variant==GLOBAL)       return(1);
-  else                               return(0);
-
-}
-
-char *
-cunparse_llnd(llnd)
-	PTR_LLND llnd;
-{
-	int len;
-	char *p;
-
-	bp = buffer;	/* reset the buffer pointer */
-	cunp_llnd(llnd);
-	*bp++ = '\n';
-	*bp++ = '\0';
-	len = (bp - buffer) + 1; /* calculate the string length */
-	p = malloc(len);	/* allocate space for returned value */
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	strcpy(p, buffer);	/* copy the buffer for output */
-	*buffer = '\0';
-	return p;
-}
-
-
-char *
-cunparse_bfnd(bif)
-	PTR_BFND bif;
-{
-	char *p;
-	int len;
-
-	first = 1;	/* Mark this is the first bif node */
-	bp = buffer;	/* reset the buffer pointer */
-	cunp_bfnd(0, bif) ;
-	*bp++ = '\0';
-	len = (bp - buffer) + 1; /* calculate the string length */
-	p = malloc(len);	/* allocate space for returned value */
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	strcpy(p, buffer);	/* copy the buffer for output */
-	*buffer = '\0';
-	return p;
-
-}
-
-
-static void
-gen_declarator(s)
-	PTR_SYMB s ;
-{
-	PTR_TYPE q ;
-	char * old_bp ;
-
-	clean(temp_buf);
-	put_right(s->ident,temp_buf);
-	for (q = s->type; q ;	) { 
-		switch ( q->variant) {
-		case T_POINTER : 
-			put_left("*",temp_buf);
-			q = q->entry.Template.base_type ;
-			break;
-		case T_ARRAY :
-			clean(temp2_buf);
-			put_right(buffer,temp2_buf);
-			clean(buffer);
-			old_bp = bp ;
-			bp = buffer ;
-			cunp_llnd(q->entry.ar_decl.ranges);
-			bp = old_bp;
-			put_right(buffer,temp_buf);
-			clean(buffer);
-			put_right(temp2_buf,buffer);
-			q = q->entry.Template.base_type ;
-			break;
-		case T_FUNCTION:
-			put_left("(",temp_buf);
-			put_right(")",temp_buf);
-			put_right("()",temp_buf);
-			q = q->entry.Template.base_type ;
-			break;
-
-		default:	/* It might need more for complicated case */
-			q = (PTR_TYPE) NULL ;
-		}
-	}
-	addstr(temp_buf);	
-}
-
-
-char *
-cunparse_symb(symb)
-	PTR_SYMB symb;
-{
-	int len;
-	char *p;
-
-	first = 1;		/* Mark this is the first bif node */
-	bp = buffer;		/* reset the buffer pointer */
-	gen_simple_type(symb->type,BFNULL,0);
-	gen_declarator(symb);
-	*bp++ = '\n';
-	*bp++ = '\0';
-	len = (bp - buffer) + 1; /* calculate the string length */
-	p = malloc(len);	/* allocate space for returned value */
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	strcpy(p, buffer);	/* copy the buffer for output */
-	*buffer = '\0';
-	return p;
-}
-
-
-/****************************************************************
- *								*
- *	    for cunparse_type					*
- *								*
- ****************************************************************/
-
-char *
-cunparse_type(q_type)
-PTR_TYPE q_type;
-{
-	int len;
-	char *p;
-
-	first = 1;	/* Mark this is the first bif node */
-	bp = buffer;	/* reset the buffer pointer */
-	gen_simple_type_2(q_type,BFNULL,0);
-	*bp++ = '\n';
-	*bp++ = '\0';
-	len = (bp - buffer) + 1; /* calculate the string length */
-	p = malloc(len);	/* allocate space for returned value */
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	strcpy(p, buffer);	/* copy the buffer for output */
-	*buffer = '\0';
-	return p;
-}
-
-
-char *
-cunparse_blck(bif)
-	PTR_BFND bif;
-{
-	int len;
-	char *p;
-
-	first = 1;		/* Mark this is the first bif node */
-	bp = buffer;		/* reset the buffer pointer */
-
-	cunp_blck(bif, 0);
-	*bp++ = '\0';
-	len = (bp - buffer) + 1; /* calculate the string length */
-	p = malloc(len);	/* allocate space for returned value */
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	strcpy(p, buffer);	/* copy the buffer for output */
-	*buffer = '\0';
-	return (p);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/dbutils.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
deleted file mode 100644
index 3881e23..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/dbutils.c
+++ /dev/null
@@ -1,961 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/****************************************************************
- *								*
- *   dbutils -- contains those utilities that will be used by	*
- *		the data base management routines		*
- *								*
- ****************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
- 
-# include "db.h"
-
-/*
- * global references
- */
-extern int language;
-extern PTR_FILE cur_file;
-
-int   read_nodes();
-
-/*
- * Local variables
- */
-static PTR_SYMB head_symb;
-static char *proj_filename;
-static int   temp[200];
-static int  *pt;
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-extern void removeFromCollection(void *pointer);
-#endif
-
-/****************************************************************
- *								*
- *  alloc_blob -- allocate new space for structure blob		*
- *								*
- *  output:							*
- *	Non-NULL - pointer to the newly allocated structure	*
- *	NULL - something was wrong				*
- *								*
- ****************************************************************/
-PTR_BLOB
-alloc_blob()
-{
-    void *p = calloc(1, sizeof(struct blob));
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	return ((PTR_BLOB)p);
-}
-
-
-/****************************************************************
- *								*
- *  alloc_blob1 -- allocate new space for structure blob1	*
- *								*
- *  output:							*
- *	Non-NULL - pointer to the newly allocated structure	*
- *	NULL - something was wrong				*
- *								*
- ****************************************************************/
-static PTR_BLOB1
-alloc_blob1()
-{
-    void *p = calloc(1, sizeof(struct blob1));
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	return ((PTR_BLOB1) p);
-}
-
-	
-/****************************************************************
- *								*
- *  alloc_info -- allocate new space for structure obj_info	*
- *								*
- *  output:							*
- *	Non-NULL - pointer to the newly allocated structure	*
- *	NULL - something was wrong				*
- *								*
- ****************************************************************/
-static PTR_INFO
-alloc_info()
-{
-    void *p = calloc(1, sizeof(struct obj_info));
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	return ((PTR_INFO) p);
-}
-
-
-/****************************************************************
- *								*
- *   check_ref -- check if the variable whose id is "id" has	*
- *		  referenced in this statement or not		*
- *   input:							*
- *	    id -- the id of the variable to be checked		*
- *								*
- *   output:							*
- *	    1, if it's been refereneced				*
- *	    0, if not and add it to the table			*
- *								*
- ****************************************************************/
-int
-check_ref(id)
-	int  id;
-{
-	int	*p;
-
-	for(p = temp; p < pt;)
-		if(*p++ == id)
-			return(1);
-	*pt++ = id;
-	return(0);
-}
-
-
-/****************************************************************
- *								*
- *   build_ref -- add "bif" to the reference chain of "symb"	*
- *								*
- *   input:							*
- *	    symb - the symb where the reference to be added	*
- *	    bif  - the statement that references symb		*
- *								*
- ****************************************************************/
-void
-build_ref(symb, bif)
-	PTR_SYMB symb;
-	PTR_BFND bif;
-{
-	register PTR_BLOB   b, b1, b2;
-
-	b = alloc_blob();
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,b, 0);
-#endif
-	b->ref = bif;
-	if (symb->ud_chain == NULL)
-		symb->ud_chain = b;
-	else {
-		for (b1 = b2 = symb->ud_chain; b1; b1 = b1->next)
-			b2 = b1;
-		b2->next = b;
-	}
-	b->next = NULL;
-}
-
-
-/****************************************************************
- *								*
- *  make_blob1 -- make a new blob1 node				*
- *								*
- *  input:							*
- *	   tag  - type of this blob1 node			*
- *	   ref  - pointer to the object it references		*
- *	   next - link to the next blob1 node			*
- *								*
- ****************************************************************/
-PTR_BLOB1
-make_blob1(tag, ref, next)
-	int	  tag;
-	PTR_BFND  ref;
-	PTR_BLOB1 next;
-{
-	PTR_BLOB1 new;
-
-	new = alloc_blob1();
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,new, 0);
-#endif
-	new->tag = tag;
-	new->ref = (char *) ref;
-	new->next = next;
-	return (new);
-}
-
-
-/****************************************************************
- *								*
- *  make_obj_info -- make a new obj_info node			*
- *								*
- *  input:							*
- *	   filename - name of the file where this obj_info	*
- *		      resides					*
- *	   g_line   - ablosute line no. of the obj in the file	*
- *	   l_line   - line no. of the object relative to its	*
- *		      parent objec				*
- *	   source   - the objec in the source form		*
- *								*
- ****************************************************************/
-PTR_INFO
-make_obj_info(filename, g_line, l_line, source)
-	char	*filename;
-	int	 g_line;
-	int	 l_line;
-	char	*source;
-{
-	register PTR_INFO new;
-
-	new = alloc_info();
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,new, 0);
-#endif
-	new->filename = filename;
-	new->g_line = g_line;
-	new->l_line = l_line;
-	new->source = source;
-	return (new);
-}
-
-/****************************************************************
- *								*
- *   visit_llnd -- recursively visit the low level nodes and	*
- *		   find those use and def info it references	*
- *								*
- *   input:							*
- *	    bif  - the bif node to which the llnd belongs	*
- *	    llnd - the low level node to be visit		*
- *								*
- ****************************************************************/
-void
-visit_llnd(bif, llnd)
-	PTR_BFND	bif;
-	PTR_LLND	llnd;
-{
-	if (llnd == NULL) return;
-
-	switch (llnd->variant) {
-	case LABEL_REF:
-		{
-		}
-		break;
-	case CONST_REF	:
-	case VAR_REF	:
-	case ARRAY_REF	:
-		if(check_ref(llnd->entry.Template.symbol->id) == 0)
-			build_ref(llnd->entry.Template.symbol, bif);
-		break;
-	case CONSTRUCTOR_REF	:
-		break;
-	case ACCESS_REF	:
-		break;
-	case CONS	:
-		break;
-	case ACCESS	:
-		break;
-	case IOACCESS	:
-		break;
-	case PROC_CALL	:
-	case FUNC_CALL	:
-		visit_llnd(bif, llnd->entry.proc.param_list);
-		break;
-	case EXPR_LIST	:
-		visit_llnd(bif, llnd->entry.list.item);
-		if (llnd->entry.list.next)
-			visit_llnd(bif, llnd->entry.list.next);
-		break;
-	case EQUI_LIST	:
-		visit_llnd(bif, llnd->entry.list.item);
-		if (llnd->entry.list.next) {
-			visit_llnd(bif, llnd->entry.list.next);
-		}
-		break;
-	case COMM_LIST	:
-		if (llnd->entry.Template.symbol) {
-/*			addstr(llnd->entry.Template.symbol->ident);
- */		}
-		visit_llnd(bif, llnd->entry.list.item);
-		if (llnd->entry.list.next)
-			visit_llnd(bif, llnd->entry.list.next);
-		break;
-	case VAR_LIST	:
-	case RANGE_LIST	:
-	case CONTROL_LIST	:
-		visit_llnd(bif, llnd->entry.list.item);
-		if (llnd->entry.list.next)
-			visit_llnd(bif, llnd->entry.list.next);
-		break;
-	case DDOT	:
-		visit_llnd(bif, llnd->entry.binary_op.l_operand);
-		if (llnd->entry.binary_op.r_operand)
-			visit_llnd(bif, llnd->entry.binary_op.r_operand);
-		break;
-	case DEF_CHOICE	:
-	case SEQ	:
-		visit_llnd(bif, llnd->entry.seq.ddot);
-		if (llnd->entry.seq.stride)
-			visit_llnd(bif, llnd->entry.seq.stride);
-		break;
-	case SPEC_PAIR	:
-		visit_llnd(bif, llnd->entry.spec_pair.sp_label);
-		visit_llnd(bif, llnd->entry.spec_pair.sp_value);
-		break;
-	case EQ_OP	:
-	case LT_OP	:
-	case GT_OP	:
-	case NOTEQL_OP	:
-	case LTEQL_OP	:
-	case GTEQL_OP	:
-	case ADD_OP	:
-	case SUBT_OP	:
-	case OR_OP	:
-	case MULT_OP	:
-	case DIV_OP	:
-	case MOD_OP	:
-	case AND_OP	:
-	case EXP_OP	:
-	case CONCAT_OP	:
-		visit_llnd(bif, llnd->entry.binary_op.l_operand);
-		visit_llnd(bif, llnd->entry.binary_op.r_operand);
-		break;
-	case MINUS_OP	:
-	case NOT_OP	:
-		visit_llnd(bif, llnd->entry.unary_op.operand);
-		break;
-	case STAR_RANGE	:
-		break;
-	default	:
-		break;
-	}
-}
-       
-
-/****************************************************************
- *								*
- *   visit_bfnd -- visits the subtree "bif" and generates the	*
- *		     use-definition info of the variables it	*
- *		     references					*
- *   input:							*
- *	     bif - the root of the tree to be visitd		*
- *								*
- *   side effect:						*
- *	     build the ud_chain at where the static variable	*
- *	     "head_symb" points to				*
- *								*
- ****************************************************************/
-void
-visit_bfnd(bif)
-	PTR_BFND bif;
-{
-	register PTR_BLOB b;
-
-	if(bif == NULL)
-		return;
-	pt = temp;		/* reset the pointer */
-
-	switch(bif->variant) {
-	    case GLOBAL:
-	    case PROG_HEDR:
-	    case PROC_HEDR:
-	    case FUNC_HEDR:
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			visit_bfnd(b->ref);
-		break;
-	    case FOR_NODE:
-		build_ref(bif->entry.Template.symbol, bif); /* control var */
-		visit_llnd(bif, bif->entry.Template.ll_ptr1); /* check range */
-		visit_llnd(bif, bif->entry.Template.ll_ptr2); /* check incr */
-		visit_llnd(bif, bif->entry.Template.ll_ptr3); /* where cond */
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			visit_bfnd(b->ref);
-		break;
-	    case CDOALL_NODE:
-		build_ref(bif->entry.Template.symbol, bif); /* control var */
-		visit_llnd(bif, bif->entry.Template.ll_ptr1); /* check range */
-		visit_llnd(bif, bif->entry.Template.ll_ptr2); /* check incr */
-		visit_llnd(bif, bif->entry.Template.ll_ptr3); /* where cond */
-		for (b = bif->entry.Template.bl_ptr2; b; b = b->next)
-			visit_bfnd(b->ref);
-		break;
-	    case WHILE_NODE:
-		visit_llnd(bif, bif->entry.Template.ll_ptr1); /* check cond */
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			visit_bfnd(b->ref);
-		break;
-	    case WHERE_NODE:
-		visit_llnd(bif, bif->entry.Template.ll_ptr1); /* check cond */
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			visit_bfnd(b->ref);
-		for (b = bif->entry.Template.bl_ptr2; b; b = b->next)
-			visit_bfnd(b->ref);
-		break;
-	    case IF_NODE:
-	    case ELSEIF_NODE:
-		visit_llnd(bif, bif->entry.Template.ll_ptr1); /* check cond */
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			visit_bfnd(b->ref);
-		for (b = bif->entry.Template.bl_ptr2; b; b = b->next)
-			visit_bfnd(b->ref);
-		break;
-	    case LOGIF_NODE:
-		visit_llnd(bif, bif->entry.Template.ll_ptr1); /* check cond */
-		visit_bfnd(bif->entry.Template.bl_ptr1->ref);
-		break;
-	    case ARITHIF_NODE:
-		visit_llnd(bif, bif->entry.Template.ll_ptr1); /* check cond */
-		break;
-	    case ASSIGN_STAT:
-	    case IDENTIFY:
-		visit_llnd(bif, bif->entry.Template.ll_ptr1); /* check l_val */
-		visit_llnd(bif, bif->entry.Template.ll_ptr2); /* check r_val */
-		break;
-	    case PROC_STAT:
-		visit_llnd(bif, bif->entry.Template.ll_ptr1); /* check l_val */
-		break;
-	    case CONT_STAT:
-	    case FORMAT_STAT:
-	    case GOTO_NODE:
-	    case ASSGOTO_NODE:
-	    case COMGOTO_NODE:
-	    case STOP_STAT:
-	    case VAR_DECL:
-	    case PARAM_DECL:
-	    case DIM_STAT:
-	    case EQUI_STAT:
-	    case DATA_DECL:
-	    case IMPL_DECL:
-	    case READ_STAT:
-	    case WRITE_STAT:
-	    case OTHERIO_STAT:
-	    case COMM_STAT:
-	    case CONTROL_END:
-		break;
-	    default:
-		break;
-	}
-}
-
-
-/****************************************************************
- *								*
- *   cvisit_llnd -- recursively visit the low level nodes and	*
- *	 	    find those use and def info it references	*
- *                  for VPC++					*
- *								*
- *   input:							*
- *	    bif  - the bif node to which the llnd belongs	*
- *	    llnd - the low level node to be visit		*
- *								*
- ****************************************************************/
-void
-cvisit_llnd(bif,llnd)
-PTR_BFND        bif;
-PTR_LLND        llnd;
-
-{    
-        if (!llnd) return;
-
-        switch (llnd->variant) {
-        case INT_VAL    :
-        case STMT_STR   : 
-        case FLOAT_VAL  :
-        case DOUBLE_VAL :
-        case STRING_VAL :
-        case BOOL_VAL   :
-        case CHAR_VAL   :
-                break;
-        case CONST_REF  :
-        case ENUM_REF   :
-                break;
-        case VAR_REF    :
-		if(check_ref(llnd->entry.Template.symbol->id) == 0)
-			build_ref(llnd->entry.Template.symbol, bif);
-		break;
-        case POINTST_OP :                /* New added for VPC */
-        case RECORD_REF:	         /* Need More */
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                /* Need More work for pointer combined with structure */
-                break ;
-	case ARRAY_OP :
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-		break;
-        case ARRAY_REF  :
-		if(check_ref(llnd->entry.Template.symbol->id) == 0)
-			build_ref(llnd->entry.Template.symbol, bif);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                break;
-        case CONSTRUCTOR_REF    :
-                break;
-        case ACCESS_REF :
-                break;
-        case CONS       :
-                break;
-        case ACCESS     :
-                break;
-        case IOACCESS   :
-                break;
-        case PROC_CALL  :
-        case FUNC_CALL  :
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                break;
-        case EXPR_LIST  :
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-                break;
-        case EQUI_LIST  :
-                break;
-        case COMM_LIST  :
-                break;
-        case VAR_LIST   :
-        case CONTROL_LIST       :
-                break;
-        case RANGE_LIST :
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-                break;
-        case DDOT       :
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-                break;
-        case COPY_NODE :
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-                break;
-        case VECTOR_CONST : /* NEW ADDED FOR VPC++  */
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-		break;
-        case INIT_LIST:
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                break ;
-        case BIT_NUMBER:
-                break ;
-        case DEF_CHOICE :
-        case SEQ        :
-                break;
-        case SPEC_PAIR  :
-                break;
-        case MOD_OP     :
-	        break;
-        case ASSGN_OP   :                /* New added for VPC */
-        case ARITH_ASSGN_OP:             /* New added for VPC */
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-		break;
-        case EQ_OP      :
-        case LT_OP      :
-        case GT_OP      :
-        case NOTEQL_OP  :
-        case LTEQL_OP   :
-        case GTEQL_OP   :
-        case ADD_OP     :
-        case SUBT_OP    :
-        case OR_OP      :
-        case MULT_OP    :
-        case DIV_OP     :
-        case AND_OP     :
-        case EXP_OP     :
-        case LE_OP      :                /* New added for VPC *//*Duplicated*/
-        case GE_OP      :                /* New added for VPC *//*Duplicated*/
-        case NE_OP      :                /* New added for VPC *//*Duplicated*/
-        case BITAND_OP    :              /* New added for VPC */
-        case BITOR_OP     :              /* New added for VPC */
-        case LSHIFT_OP         :         /* New added for VPC */
-        case RSHIFT_OP         :         /* New added for VPC */
-        case INTEGER_DIV_OP :             /* New added for VPC */
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-                break;
-        case FUNCTION_OP:
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-		break;
-        case ADDRESS_OP   :               /* New added for VPC */
-        case SIZE_OP      :               /* New added for VPC */
-                break;
-        case DEREF_OP :
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-	        break;
-        case SUB_OP   :                  /* duplicated unary minus  */
-        case MINUS_OP   :                /* unary operations */
-        case UNARY_ADD_OP      :         /* New added for VPC */
-        case BIT_COMPLEMENT_OP :         /* New added for VPC */
-        case NOT_OP     :
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-		break;
-        case MINUSMINUS_OP:              /* New added for VPC */
-        case PLUSPLUS_OP  :              /* New added for VPC */
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-		break;
-        case STAR_RANGE :
-                break;
-        case CLASSINIT_OP :               /* New added for VPC */
-                break ;
-        case CAST_OP :             /* New added for VPC */
-	         break;
-        case EXPR_IF      :               /* New added for VPC */
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-		break;
-        case EXPR_IF_BODY :               /* New added for VPC */
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr1);
-                cvisit_llnd(bif,llnd->entry.Template.ll_ptr2);
-		break;
-        case FUNCTION_REF :               /* New added for VPC */
-                break ;
-        case LABEL_REF: /* Fortran Version, For VPC we need more */
-                  break;
-
-        default                 :
-                  break;
-
-        }
-}
-
-
-/****************************************************************
- *								*
- *   cvisit_bfnd -- visits the subtree "bif" and generates the	*
- *	            use-definition info of the variables it	*
- *		    references	for VPC++			*
- *   input:							*
- *	     bif - the root of the tree to be visitd		*
- *								*
- *   side effect:						*
- *	     build the ud_chain at where the static variable	*
- *	     "head_symb" points to				*
- *								*
- ****************************************************************/
-void
-cvisit_bfnd(bif)
-PTR_BFND     bif;
-
-{
-        register PTR_BLOB  b;
-	void cvisit_llnd();
-
-        if (!bif) return;
-        pt = temp;        /* reset the pointer */
-
-        switch (bif->variant) {
-        case GLOBAL     :
-        case PROG_HEDR  :
-        case PROC_HEDR  :  
-        case FUNC_HEDR  :
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			cvisit_bfnd(b->ref);
-                break;
-        case IF_NODE    :
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); /* check cond */
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			cvisit_bfnd(b->ref);
-		for (b = bif->entry.Template.bl_ptr2; b; b = b->next)
-			cvisit_bfnd(b->ref);
-                break;
-        case LOGIF_NODE :
-        case ARITHIF_NODE:
-        case WHERE_NODE :
-                break;
-        case FOR_NODE   :
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); 
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr2); 
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr3); 
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			cvisit_bfnd(b->ref);
-                break;
-        case FORALL_NODE        :
-        case WHILE_NODE :
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); 
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			cvisit_bfnd(b->ref);
-                break;
-        case ASSIGN_STAT:
-        case IDENTIFY:
-        case PROC_STAT  :
-        case SAVE_DECL:
-        case CONT_STAT:
-        case FORMAT_STAT:
-                break;
-        case LABEL_STAT:
-                break;
-        case GOTO_NODE:
-                break;
-        case ASSGOTO_NODE:
-        case COMGOTO_NODE:
-        case STOP_STAT:
-                break;
-        case RETURN_STAT:
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); 
-                break;
-        case PARAM_DECL :
-        case DIM_STAT:
-        case EQUI_STAT:
-        case DATA_DECL:
-        case READ_STAT:
-        case WRITE_STAT:
-        case OTHERIO_STAT:
-        case COMM_STAT:
-        case CONTROL_END:
-                break;
-        case CLASS_DECL:                /* New added for VPC */
-		break;
-        case ENUM_DECL :                /* New added for VPC */
-        case UNION_DECL:                /* New added for VPC */
-        case STRUCT_DECL:               /* New added for VPC */
-	        break;
-        case DERIVED_CLASS_DECL:        /* Need More for VPC */
-        case VAR_DECL:
-		break;
-        case EXPR_STMT_NODE:            /* New added for VPC */
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); 
-		break ;
-        case DO_WHILE_NODE:             /* New added for VPC */
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); 
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			cvisit_bfnd(b->ref);
-                break;
-        case SWITCH_NODE :              /* New added for VPC */
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); 
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			cvisit_bfnd(b->ref);
-		break ;
-        case CASE_NODE :                /* New added for VPC */
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); 
-		break ;
-        case DEFAULT_NODE:              /* New added for VPC */
-		break;
-        case BASIC_BLOCK :
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			cvisit_bfnd(b->ref);
-	        break ;
-        case BREAK_NODE  :              /* New added for VPC */
-	        break;
-        case CONTINUE_NODE:             /* New added for VPC */
-		break;
-        case RETURN_NODE  :             /* New added for VPC */
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); 
-		break;
-        case ASM_NODE     :             /* New added for VPC */
-               break;                   /* Need More         */
-        case SPAWN_NODE :             /* New added for VPC */
-               break;
-        case PARFOR_NODE  :             /* New added for VPC */
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr1); 
-		cvisit_llnd(bif, bif->entry.Template.ll_ptr2); 
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			cvisit_bfnd(b->ref);
-               break;
-        case PAR_NODE  :             /* New added for VPC */
-		for (b = bif->entry.Template.bl_ptr1; b; b = b->next)
-			cvisit_bfnd(b->ref);
-		break;
-        default:
-                break; 
-	}
-     
-}
-
-
-/****************************************************************
- *								*
- *  gen_udchain -- visits the bif tree of the given "proj"	*
- *		   and generates the use-definition info the	*
- *		   proj has referenced				*
- *								*
- *   input:							*
- *	    proj -- the project to be visited			*
- *								*
- ****************************************************************/
-void
-gen_udchain(proj)
-	PTR_FILE proj;
-{
-	if(proj->head_bfnd == NULL)
-		return;
-
-	proj_filename = (char *) calloc(strlen(proj->filename), sizeof(char));
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,proj_filename, 0);
-#endif
-	head_symb = proj->head_symb;
-	switch (language) {
-	case ForSrc:
-		visit_bfnd(proj->global_bfnd);
-		break;
-	case CSrc:
-		cvisit_bfnd(proj->global_bfnd);
-		break;
-	default:
-		break;
-	}
-}
-
-
-void
-dump_udchain(proj)
-	PTR_FILE proj;
-{
-	register PTR_SYMB s;
-	register PTR_BLOB b;
-
-	if(proj->global_bfnd)
-	    for (s = proj->head_symb; s; s = s->thread) {
-		if (s->ud_chain) {
-		    fprintf(stderr, "Variable \"%s\" referenced at line(s) -- ",
-			       s->ident);
-		    for(b = s->ud_chain; b; b = b->next)
-			    fprintf(stderr, "%d%s", b->ref->g_line,
-				   (b->next? ", ": "\n"));
-	    }
-	}
-}
-
-
-static void
-clean_hash_tbl(fi)
-	PTR_FILE fi;
-{
-	register PTR_HASH h, h1, h2;
-
-	for (h = *(fi->hash_tbl); h < *(fi->hash_tbl)+hashMax; h++)
-		if (h) {
-			for (h1 = h->next_entry; h1; h1 = h2) {
-				h2 = h1->next_entry;
-#ifdef __SPF
-                removeFromCollection(h1);
-#endif
-				free(h1);
-			}
-			h = NULL;
-		}
-}
-
-
-static void
-free_dep(fi)
-	PTR_FILE fi;
-{
-	register PTR_BLOB bl1, bl2;
-	register PTR_BFND bf;
-
-	clean_hash_tbl(fi);
-	for (bf = fi->global_bfnd; bf; bf = bf->thread) {
-		for (bl1 = bf->entry.Template.bl_ptr1; bl1; bl1 = bl2) {
-			bl2 = bl1->next;
-#ifdef __SPF
-            removeFromCollection(bl1);
-#endif
-			free(bl1);
-		}
-		for (bl1 = bf->entry.Template.bl_ptr2; bl1; bl1 = bl2) {
-			bl2 = bl1->next;
-#ifdef __SPF
-            removeFromCollection(bl1);
-#endif
-			free(bl1);
-		}
-	}
- 
-    if (fi->num_bfnds)
-    {
-#ifdef __SPF
-        removeFromCollection(fi->head_bfnd);
-#endif
-        free(fi->head_bfnd);
-    }
-
-    if (fi->num_llnds)
-    {
-#ifdef __SPF
-        removeFromCollection(fi->head_llnd);
-#endif
-        free(fi->head_llnd);
-    }
-
-	if (fi->num_symbs) {
-		register PTR_SYMB s;
-
-        for (s = fi->head_symb; s; s = s)
-        {
-#ifdef __SPF
-            removeFromCollection(s->ident);
-#endif
-            free(s->ident);
-        }
-#ifdef __SPF
-        removeFromCollection(fi->head_symb);
-#endif
-		free(fi->head_symb);
-	}
-
-    if (fi->num_label)
-    {
-#ifdef __SPF
-        removeFromCollection(fi->head_lab);
-#endif
-        free(fi->head_lab);
-    }
-
-    if (fi->num_types)
-    {
-#ifdef __SPF
-        removeFromCollection(fi->head_type);
-#endif
-        free(fi->head_type);
-    }
-
-    if (fi->num_dep)
-    {
-#ifdef __SPF
-        removeFromCollection(fi->head_dep);
-#endif
-        free(fi->head_dep);
-    }
-
-	if (fi->num_cmnt) {
-		register PTR_CMNT c;
-
-        for (c = fi->head_cmnt; c; c = c->next)
-        {
-#ifdef __SPF
-            removeFromCollection(c->string);
-#endif
-            free(c->string);
-        }
-#ifdef __SPF
-        removeFromCollection(fi->head_cmnt);
-#endif
-		free(fi->head_cmnt);
-	}
-}
-
-
-int
-replace_dep(filename)
-	char	*filename;
-{
-	PTR_FILE fi;
-	PTR_BLOB bl;
-	extern PTR_PROJ cur_proj;
-
-	for (bl = cur_proj->file_chain; bl; bl = bl->next) {
-		fi = (PTR_FILE) bl->ref;
-		if (!strcmp(fi->filename, filename)) {
-#ifdef __SPF
-            removeFromCollection(fi);
-#endif
-			free_dep(fi);
-			read_nodes(fi);
-			return (1);
-		}
-	}
-	return (0);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
deleted file mode 100644
index fd7474e..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/garb_coll.c
+++ /dev/null
@@ -1,229 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "db.h"
-
-
-
-PTR_LLND free_ll_list = NULL;
-static int num_marked;
-int num_ll_allocated = 0;
-
-
-static void
-mark_llnd(p)
-PTR_LLND p;
-{
-	if(p == NULL || p->id == -1)
-		return;
-	p->id = -1; num_marked++;
-	mark_llnd(p->entry.Template.ll_ptr1);
-	mark_llnd(p->entry.Template.ll_ptr2);
-}
-
-
-static void
-mark_refl(p)
-	PTR_REFL p;
-{
-	for (; p; p = p->next)
-		if(p->node != NULL) 
-			mark_llnd(p->node->refer);
-}
-	
-
-static void
-mark_arefl(p)
-	PTR_AREF p;
-{
-	for (; p; p = p->next){
-   		mark_llnd(p->decl_ranges);
-   		mark_llnd(p->use_bnd0); 
-   		mark_llnd(p->mod_bnd0);
-   		mark_llnd(p->use_bnd1); 
-   		mark_llnd(p->mod_bnd1);
-   		mark_llnd(p->use_bnd2);
-   		mark_llnd(p->mod_bnd2);
-	}
-}
-
-
-static void
-mark_sets(s)
-	struct sets *s;
-{
-	if(s == NULL) return;
-
-	mark_refl(s->gen);
-	mark_refl(s->in_def);
-	mark_refl(s->use);
-	mark_refl(s->in_use);
-	mark_refl(s->out_def);
-	mark_refl(s->out_use);
-	mark_arefl(s->arefl);
-}
-
-
-static void
-mark_depnds(p)
-	PTR_DEP p;
-{
-	int depcnt;
-	depcnt = 0;
-
-	for (; p != NULL; p = p->thread){
-		mark_llnd(p->to.refer);
-		mark_llnd(p->from.refer);
-		depcnt++;
-	}
-}
-
-
-static void
-mark_symb(fi)
-	PTR_FILE fi;
-{
-	PTR_SYMB s;
-
-	for (s = fi->head_symb; s; s = s->thread) {
-		if (s->variant == CONST_NAME)
-			mark_llnd(s->entry.const_value);
-      		else if(s->variant == FIELD_NAME)
-			mark_llnd(s->entry.field.restricted_bit);
-		else if(s->variant == VAR_FIELD)
-			mark_llnd(s->entry.variant_field.variant_list);
-		else if (s->variant == PROCEDURE_NAME || 
-			 s->variant == FUNCTION_NAME)
-			mark_llnd(s->entry.proc_decl.call_list);
-		else if(s->variant == MEMBER_FUNC)
-			mark_llnd(s->entry.member_func.call_list);
-
-	}
-}
-
-
-static void
-mark_type(fi)
-	PTR_FILE fi;
-{
-	PTR_TYPE s;
-	for (s = fi->head_type; s; s = s->thread) {
-		if(s->variant == T_ARRAY)
-			mark_llnd(s->entry.ar_decl.ranges);
-		else if(s->variant == T_DESCRIPT || 
-			s->variant == T_POINTER ||
-			s->variant == T_LIST ||
-			s->variant == T_FUNCTION)
-			mark_llnd(s->entry.Template.ranges);
-		else if(s->variant == T_SUBRANGE){
-			mark_llnd(s->entry.subrange.lower);
-			mark_llnd(s->entry.subrange.upper);
-			}
-		else{
-		 mark_llnd(s->entry.Template.ranges);
-		 }
-	      }
-}
-
-
-
-static void
-mark_bfnd(b)
-	PTR_BFND b;
-{
-	PTR_BLOB bl;
-
-	if(b == NULL) return;
-
-	mark_llnd(b->entry.Template.ll_ptr1);
-	mark_llnd(b->entry.Template.ll_ptr2);
-	mark_llnd(b->entry.Template.ll_ptr3);
-	mark_sets(b->entry.Template.sets); 
-
-	for (bl = b->entry.Template.bl_ptr1; bl; bl = bl->next)
-		mark_bfnd(bl->ref);
-
-	for (bl = b->entry.Template.bl_ptr2; bl; bl = bl->next)
-		mark_bfnd(bl->ref);
-}
-
-
-void
-collect_garbage(fi)
-	PTR_FILE fi;
-{
-	PTR_LLND p, t;
-	int count;
-
-	p = free_ll_list;
-	count = 0;
-	while(p != NULL){
-		count++;
-		p = p->thread;
-	}
-
-	count = 0;
-	for (p = fi->head_llnd; p && p != fi->cur_llnd; p = p->thread){
-		p->id = 0;
-		count++;
-	}
-
-	fi->cur_llnd->id = 0; count++;
-
-	num_marked = 0;
-	mark_bfnd(fi->head_bfnd);
-	/* printf("num marked from bfnd = %d\n", num_marked); */
-
-	num_marked = 0;
-	mark_depnds(fi->head_dep);
-	/* printf("num marked from deps= %d\n", num_marked); */
-
-	num_marked = 0;
-	mark_symb(fi);
-	/* printf("num marked from symb= %d\n", num_marked); */
-
-	num_marked = 0;
-	mark_type(fi);
-	/* printf("num marked from type= %d\n", num_marked); */
-
-	num_marked = 0;
-	p = fi->head_llnd;
-	fi->cur_llnd = fi->head_llnd;
-	count = 1;
-	p->id = count++; p = p->thread;
-	fi->cur_llnd->thread = NULL;
-    
-	while(p != NULL){
-		if(p->id == -1){ /*touched */
-			fi->cur_llnd->thread = p;
-			fi->cur_llnd = p;
-                        p = p->thread;
-			fi->cur_llnd->id = count++;
-			fi->cur_llnd->thread = NULL;
-		} else if(p->id == 0) {
-			t = p; p = p->thread;
-			t->id = -2; num_marked++;
-			t->thread= free_ll_list;
-			t->entry.Template.ll_ptr1 = NULL;
-			t->entry.Template.ll_ptr2 = NULL;
-			t->entry.Template.symbol = NULL;
-			t->variant = 800;
-			free_ll_list = t;
-		      }
-               else { printf("error in garbage collection\n");
-		      exit(0);
-		    }
-		}
-	fi->num_llnds = count -1 ;
-	num_ll_allocated = 0;
-	printf(" total llnodes = %d garbage collected = %d\n",count, num_marked);
-}
-
-int num_of_llnds(fi)
-PTR_FILE fi;
-{ return fi->num_llnds; }
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
deleted file mode 100644
index 94e4ab7..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/glob_anal.c
+++ /dev/null
@@ -1,494 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* file: glob_anal.c */
-
-#include <stdio.h>
-#include "db.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#define MAX_FUNS 500
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-void *malloc();
-void bind_call_site_info();
-
-static PTR_FILE current_file;
-
-extern PTR_FILE cur_file;
-extern int debug;
-
-typedef struct call_list *PTR_CALLS;
-typedef struct function_decl *PTR_FUNCS;
-
-struct call_list {
-  char *name;
-  int funs_number;              /* set to the index in the funs table */
-  /* -1 if the function is unknown      */
-  PTR_LLND used, modified;
-  PTR_BFND call_site;           /* statement which holds call to this fun */
-  PTR_CALLS next;
-};
-
-
-struct function_decl {
-  PTR_FILE file;                /* file object where this function was
-                                 * defined */
-  PTR_SYMB name;                /* point to the symbol table of this functin */
-  PTR_BFND fun;                 /* point to the BIF node of this functio */
-  int is_done;
-  PTR_LLND used, modified;
-  PTR_CALLS calls;
-} funs[MAX_FUNS];
-
-int num_of_funs = 0;
-
-static int now;
-static int val[MAX_FUNS],       /* keep the depth-first numbering */
- ival[MAX_FUNS];                /* keep the inverse calling numbering */
-
-
-/*
- * visit does the depth-first numbering for nodes
- * for the call graph
- *
- * the array "val" keep the depth-first visiting numbering
- * while the array "ival" is the inverse of "val", i.e. is
- * the reverse calling sequence
- */
-static void visit(k)
-int k;
-{
-  PTR_CALLS p;
-
-  ival[now] = k;
-  val[k] = now++;
-  for (p = funs[k].calls; p; p = p->next)       /* for each adjacent node */
-    if (val[p->funs_number] < 0)/* haven't visited yet */
-      visit(p->funs_number);
-}
-
-
-/*
- * dfs does the depth-first search of the call graph
- */
-static void dfs()
-{
-  int k;
-
-  now = 0;                      /* keep track of the numbering */
-  for (k = 0; k < num_of_funs; k++)     /* initialize to be un-read */
-    val[k] = -1;
-  for (k = 0; k < num_of_funs; k++)     /* now do the depth-first search */
-    if (val[k] < 0)
-      visit(k);
-}
-
-
-void reset_llnd(p)
-PTR_LLND p;
-{
-  if (p == NULL)
-    return;
-  if (p->variant == VAR_REF) {
-    p->entry.Template.ll_ptr1 = NULL;
-  }
-  reset_llnd(p->entry.Template.ll_ptr1);
-  reset_llnd(p->entry.Template.ll_ptr2);
-}
-
-
-void reset_scalar_propogation(b)
-PTR_BFND b;
-{
-  PTR_BLOB bl;
-
-  if (b == NULL)
-    return;
-  if ((b->variant != FUNC_HEDR) && (b->variant != PROC_HEDR)) {
-    reset_llnd(b->entry.Template.ll_ptr1);
-    reset_llnd(b->entry.Template.ll_ptr2);
-    reset_llnd(b->entry.Template.ll_ptr3);
-  }
-  for (bl = b->entry.Template.bl_ptr1; bl; bl = bl->next)
-    reset_scalar_propogation(bl->ref);
-
-  for (bl = b->entry.Template.bl_ptr2; bl; bl = bl->next)
-    reset_scalar_propogation(bl->ref);
-}
-
-
-/* make_fun_decl initialized an entry in the funs table for a function at */
-/* statement b                                                            */
-static void make_fun_decl(f, b)
-PTR_FILE f;
-PTR_BFND b;
-{
-  PTR_FUNCS i;
-  PTR_LLND make_llnd();
-
-  i = funs + num_of_funs++;
-  if (num_of_funs > MAX_FUNS) {
-    fprintf(stderr, "Too many functions!\n");
-    return;
-  }
-
-  /* b's ll_ptr3 points to an expr list whose ll_ptr1 is the pre global */
-  /* analysis use set and whose ll_ptr2 will be the post analysis use set */
-  if (b->entry.Template.ll_ptr3 == NULL) {      /* summary of use info */
-    fprintf(stderr, "bad initial analysis. run vcc or cfp again\n");
-    b->entry.Template.ll_ptr3 = make_llnd(cur_file,EXPR_LIST,NULL, NULL, NULL);
-  }
-  if (b->entry.Template.ll_ptr2 == NULL) {      /* summary of mod info */
-    fprintf(stderr, "bad initial analysis. run vcc or cfp again\n");
-    b->entry.Template.ll_ptr2 = make_llnd(cur_file,EXPR_LIST, NULL, NULL, NULL);
-  }
-
-  i->file = f;
-  i->name = b->entry.Template.symbol;
-  i->fun = b;
-  i->is_done = 0;
-  i->used = b->entry.Template.ll_ptr3->entry.Template.ll_ptr1;
-  i->modified = b->entry.Template.ll_ptr2->entry.Template.ll_ptr1;
-  i->calls = NULL;
-}
-
-
-/* call this function with the project_object   */
-/* to build the list of functions.              */
-static void make_fun_list(proj)
-PTR_PROJ proj;
-{
-  PTR_FILE f;
-  PTR_BLOB b1, b;
-  PTR_BFND p;
-  PTR_REFL make_name_list();
-  PTR_SETS alloc_sets();
-  /* Scan through all files in the project */
-  for (b1 = proj->file_chain; b1; b1 = b1->next) {
-    f = (PTR_FILE) b1->ref;
-    for (b = f->global_bfnd->entry.Template.bl_ptr1; b; b = b->next)
-      if (b->ref->variant == FUNC_HEDR ||
-          b->ref->variant == PROC_HEDR ||
-          b->ref->variant == PROG_HEDR) {
-        make_fun_decl(f, b->ref);
-        p = b->ref;
-        if (p->entry.Template.sets == NULL)
-          p->entry.Template.sets = alloc_sets();
-        p->entry.Template.sets->out_use = NULL;
-        p->entry.Template.sets->in_use = NULL;
-        p->entry.Template.sets->out_def = NULL;
-        p->entry.Template.sets->in_def = NULL;
-        p->entry.Template.sets->gen = NULL;
-        p->entry.Template.sets->use = NULL;
-        /* set in_def  to be a ref list of all */
-        /* parameters to this proc.  this is   */
-        /* used in the global analysis phase   */
-        p->entry.Template.sets->in_def =
-          make_name_list(
-                         p->entry.Template.symbol->entry.proc_decl.in_list
-          );
-      }
-  }
-}
-
-
-/* find_by_name searches the funs list for the function whose name is */
-/* given by the char string s                                         */
-static int find_by_name(PTR_FILE f, char *s)
-/*PTR_FILE f;*/
-/*char *s;*/
-{
-  int i;
-
-  f = f;                        /* make lint happy, f unused */
-  for (i = 0; i < num_of_funs; i++)
-    if ( /* funs[i].file == f && */ (!strcmp(s, funs[i].name->ident)))
-      return i;
-  for (i = 0; i < num_of_funs; i++)
-    if (!strcmp(s, funs[i].name->ident))
-      return i;
-  return (-1);
-}
-
-PTR_BFND find_fun_by_name(s)
-char *s;
-{
-  int i;
-  i = find_by_name(NULL, s);
-  if (i < 0)
-    return NULL;
-  return funs[i].fun;
-}
-
-
-/* get_fun_number takes a pointer to a symbol table entry and looks */
-/* it up in the funs table and returns the index.  like the others  */
-/* it returns -1 if nothing is found that matches s.                */
-/*static int get_fun_number(f, s)
-PTR_FILE f;
-PTR_SYMB s;
-{
-  int i;
-  for (i = 0; i < num_of_funs; i++)
-    if (funs[i].file == f && funs[i].name == s)
-      return i;
-  return (-1);
-}*/
-
-
-/* append_to_call_list takes the symbol table pointer of a function */
-/* that calls another function whose name is given by a char string */
-/* and appends the name of the called function to the calls list of */
-/* the funs entry for the calling function.                         */
-static void append_to_call_list(calling_fun, called_fun_ident, bf)
-int calling_fun;
-char *called_fun_ident;
-PTR_BFND bf;
-{
-  int called_fun;
-  PTR_CALLS p;
-  PTR_BFND b;
-
-  called_fun = find_by_name(funs[calling_fun].file, called_fun_ident);
-  if (called_fun == -1) {
-    fprintf(stderr, "Called \"%s\" function not in the project\n",
-           called_fun_ident);
-    return;
-  }
-
-  b = funs[calling_fun].fun;
-  p = (PTR_CALLS) malloc(sizeof(struct call_list));
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-  p->name = b->entry.Template.symbol->ident;
-  p->funs_number = called_fun;
-  p->call_site = bf;
-  p->used = NULL;
-  p->modified = NULL;
-  p->next = funs[calling_fun].calls;
-  funs[calling_fun].calls = p;
-}
-
-
-static void func_call_in_llnd(ll, i, bf)
-PTR_LLND ll;
-int i;
-PTR_BFND bf;
-{
-  if (ll == NULL)
-    return;
-  if (ll->variant == FUNC_CALL ||
-      ll->variant == PROC_CALL ||
-      ll->variant == FUNCTION_REF)
-    append_to_call_list(i, ll->entry.Template.symbol->ident, bf);
-
-  /* NOTE: the following code is "tag" dependent */
-  if (ll->variant >= VAR_LIST && ll->variant < CONST_NAME) {
-    func_call_in_llnd(ll->entry.Template.ll_ptr1, i, bf);
-    func_call_in_llnd(ll->entry.Template.ll_ptr2, i, bf);
-  }
-}
-
-
-static void func_call_in_bfnd(bl, i)
-PTR_BLOB bl;
-int i;
-{
-  PTR_BFND bf;
-  PTR_BLOB bl1;
-
-  for (bl1 = bl; bl1; bl1 = bl1->next) {
-    bf = bl1->ref;
-    if (bf->variant == PROC_CALL ||
-        bf->variant == FUNC_CALL ||
-        bf->variant == PROC_STAT)
-      append_to_call_list(i, bf->entry.Template.symbol->ident, bf);
-    func_call_in_llnd(bf->entry.Template.ll_ptr1, i, bf);
-    func_call_in_llnd(bf->entry.Template.ll_ptr2, i, bf);
-    func_call_in_llnd(bf->entry.Template.ll_ptr3, i, bf);
-
-    func_call_in_bfnd(bf->entry.Template.bl_ptr1, i);
-    func_call_in_bfnd(bf->entry.Template.bl_ptr2, i);
-  }
-}
-
-static void rec_list_cgraph(i)
-int i;
-{
-  func_call_in_bfnd(funs[i].fun->entry.Template.bl_ptr1, i);
-}
-
-
-void BuildCallGraph()
-{
-  int i;
-  fprintf(stderr, "\n the call graph is:\n");
-  for (i = 0; i < num_of_funs; i++) {
-    rec_list_cgraph(i);
-  }
-}
-
-
-/*
- * ready_for_analysis returns
- *
- *      0  if not ready
- *      1  if it is ready
- *      2  if analysis is done.
- */
-static int ready_for_analysis(i)
-int i;
-{
-  PTR_CALLS calls;
-
-  if (funs[i].is_done == 0) {
-    for (calls = funs[i].calls; calls; calls = calls->next)
-      if (calls->funs_number > -1 &&
-          funs[calls->funs_number].is_done == 0)
-        return (0);
-    return (1);
-  }
-  return (2);
-}
-
-
-static PTR_LLND link_ll_chain(list, elist)
-PTR_LLND list, elist;
-{
-  PTR_LLND p;
-
-  p = list;
-  while (p != NULL && p->entry.Template.ll_ptr2 != NULL)
-    p = p->entry.Template.ll_ptr2;
-  if (p != NULL)
-    p->entry.Template.ll_ptr2 = elist;
-  else
-    list = elist;
-  return (list);
-}
-
-
-static PTR_LLND link_ll_set_list(b, s)
-PTR_LLND s;
-PTR_BFND b;
-{
-  PTR_REFL rl, build_refl(), remove_locals_from_list();
-  PTR_LLND link_set_list();
-
-  rl = build_refl(b, s);
-  rl = remove_locals_from_list(rl);
-  return (link_set_list(rl));
-}
-
-
-static void use_mod(c)
-PTR_CALLS c;
-{
-  PTR_BFND b;
-  PTR_LLND used, modified;
-
-  b = c->call_site;
-  bind_call_site_info(b, &used, &modified);
-  c->used = link_ll_set_list(b, used);
-  c->modified = link_ll_set_list(b, modified);
-}
-
-
-static void compute_use_mod()
-{
-  int modified = 1;
-  PTR_CALLS calls;
-  PTR_LLND use, mod;
-  int i, j;
-
-  while (modified) {
-    modified = 0;
-    for (j = num_of_funs - 1; j >= 0; j--) {
-      i = ival[j];
-      if (ready_for_analysis(i) == 1) {
-	if (debug) {
-	  fprintf(stderr, "_______________________________\n");
-          fprintf(stderr, "doing global analysis for %s\n", funs[i].name->ident);
-        }
-        calls = funs[i].calls;
-	current_file = funs[i].file;
-        while (calls != NULL) {
-          if (calls->funs_number > -1 &&
-              funs[calls->funs_number].is_done == 1)
-            use_mod(calls);
-          calls = calls->next;
-        }
-        funs[i].is_done = 1;
-        /* now link results together */
-        use = funs[i].used;
-        mod = funs[i].modified;
-        calls = funs[i].calls;
-        while (calls != NULL) {
-          if (calls->funs_number > -1 &&
-              funs[calls->funs_number].is_done == 1) {
-            use = link_ll_chain(use, calls->used);
-            mod = link_ll_chain(mod, calls->modified);
-          }
-          calls = calls->next;
-        }
-        use = link_ll_set_list(funs[i].fun, use);
-        mod = link_ll_set_list(funs[i].fun, mod);
-        funs[i].used = link_ll_set_list(funs[i].fun, use);
-        funs[i].modified = link_ll_set_list(funs[i].fun, mod);
-        funs[i].fun->entry.Template.ll_ptr3
-          ->entry.Template.ll_ptr2 = funs[i].used;
-        funs[i].fun->entry.Template.ll_ptr2
-          ->entry.Template.ll_ptr2 = funs[i].modified;
-        modified = 1;
-      }
-    }                           /* end for */
-  }                             /* end while */
-
-  modified = 0;
-  for (i = 0; i < num_of_funs; i++) {
-    if (ready_for_analysis(i) == 2) {
-      funs[i].fun->entry.Template.ll_ptr3
-        ->entry.Template.ll_ptr2 = funs[i].used;
-      funs[i].fun->entry.Template.ll_ptr2
-        ->entry.Template.ll_ptr2 = funs[i].modified;
-    }
-    else
-      modified = 1;
-  }
-  if (modified && debug)
-    fprintf(stderr, "; cycle in call graph. no global analysis\n");
-  current_file = NULL;
-}
-
-
-/****************************************************************
- *                                                              *
- *  GlobalAnal -- does the inter-procedural analysis for the    *
- *                given project                                 *
- *                                                              *
- *  Input:                                                      *
- *        proj - the pointer to the project to be analized      *
- *                                                              *
- *  Output:                                                     *
- *        none                                                  *
- *                                                              *
- ****************************************************************/
-void GlobalAnal(proj)
-PTR_PROJ proj;
-{
-  make_fun_list(proj);          /* gather all the functions declared */
-  BuildCallGraph();             /* build the call graph */
-  dfs();                        /* do the depth-first search */
-  compute_use_mod();            /* do the inter-procedural analysis now */
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
deleted file mode 100644
index baa65cd..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ker_fun.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* file: ker_fun.c */
-
-/**********************************************************************/
-/*  This file contains the routines called in sets.c that do all cache*/
-/*  analysis and estimation routines.                                 */
-/**********************************************************************/
-
-#include <stdio.h>
-#include "defs.h"
-#include "bif.h"
-#include "ll.h"
-#include "symb.h"
-#include "sets.h"
-
-#define PLUS 2
-#define ZPLUS 3
-#define MINUS 4
-#define ZMINUS 5
-#define PLUSMINUS 6
-#define NODEP -1
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-extern int show_deps;
-
-void *malloc();
-PTR_SETS alloc_sets();
-PTR_REFL alloc_ref();
-int disp_refl();
-PTR_REFL copy_refl();
-PTR_REFL union_refl();
-int **a_array;
-int a_allocd = 0;
-int x[20];                      /* a temporary used to compute the vector c */
-int c[20];                      /* such that h(c) = dist                    */
-int gcd();
-int make_induct_list();
-int comp_ker();
-int find_mults();
-
-int unif_gen(sor, des, vec, troub, source, destin)
-int vec[], troub[];
-struct ref *sor;
-struct ref *des;
-struct subscript *source;
-struct subscript *destin;
-{
-  PTR_SYMB sor_ind_l[MAX_NEST_DEPTH], des_ind_l[MAX_NEST_DEPTH];
-  struct subscript il_lo[MAX_NEST_DEPTH];
-  struct subscript il_hi[MAX_NEST_DEPTH];
-  PTR_LLND ll, tl;
-  int arr_dim, uniform;
-  int v[AR_DIM_MAX];
-  int r, i, j, sd, dd, depth;
-
-  /* the a array that is used here is allocated once and used */
-  /* again in future calls */
-
-  if (a_allocd == 0) {
-      a_allocd = 1;
-      a_array = (int **)malloc(MAX_NEST_DEPTH * (sizeof(int *)));
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,a_array, 0);
-#endif
-      for (i = 0; i < MAX_NEST_DEPTH; i++)
-      {
-          a_array[i] = (int *)malloc((AR_DIM_MAX + MAX_NEST_DEPTH) * (sizeof(int)));
-#ifdef __SPF
-          addToCollection(__LINE__, __FILE__,a_array[i], 0);
-#endif
-      }
-  }
-  for (i = 0; i < MAX_NEST_DEPTH; i++) {
-    sor_ind_l[i] = NULL;
-    des_ind_l[i] = NULL;
-  }
-
-
-  dd = make_induct_list(des->stmt, des_ind_l, il_lo, il_hi);
-  sd = make_induct_list(sor->stmt, sor_ind_l, il_lo, il_hi);
-
-  depth = (sd < dd) ? sd : dd;
-
-  i = 0;
-  while ((i < depth) && (des_ind_l[i] == sor_ind_l[i]))
-    i++;
-  if (i < depth)
-    depth = i;
-
-  arr_dim = 0;
-  /* compute the dimension of the array */
-  ll = sor->refer;
-  if (ll->variant == ARRAY_REF) {
-    tl = ll->entry.array_ref.index;
-    while (tl != NULL) {
-      if ((tl->variant == VAR_LIST) ||
-          (tl->variant == EXPR_LIST) ||
-          (tl->variant == RANGE_LIST)) {
-        tl = tl->entry.list.next;
-        arr_dim++;
-      }
-    }
-  }
-  uniform = 1;
-  for (i = 0; i < arr_dim; i++) {
-    if (source[i].decidable != destin[i].decidable)
-      uniform = 0;
-    v[i] = source[i].offset - destin[i].offset;
-    for (j = 0; j < depth; j++)
-      if (source[i].coefs[j] != destin[i].coefs[j])
-        uniform = 0;
-  }
-  if (uniform == 1) {
-    r = comp_ker(arr_dim, depth, source, a_array, sor_ind_l, v, vec, troub);
-  }
-  /* else if (show_deps) fprintf(stderr, "not uniform\n"); */
-  return (uniform);
-
-}
-
-/* comp_ker is a function that takes the matrix "h" associated with        */
-/* a uniformly generated (potential) dependence and a offest vector "dist" */
-/* and computes the distance vector "vec" and a trouble vector "troub"     */
-/* the matrix is associated with the access function of an array reference */
-/* where the array is of dimension "adim" and the depth of nesting is      */
-/* depth.  The "a" array is a matrix that is allocated by the caller and   */
-/* upon return contains a factorization of "h".  The array is "depth" rows */
-/* by dept+adim columns but is viewed as its transpose mathematically.     */
-/* It should be allocated as MAX_NEST_DEPTH by AR_DIM_MAX+MAX_NEST_DEPTH   */
-/* In other words "a" is first initialized as
-             
-                  |<- depth ->|
-           -------|           |
-            ^     |           |
-           adim   |    h      |
-            v     |           |
-           -------|-----------|  where rows in C are columns.
-            ^     |           |
-           depth  |    I      |
-            v     |           |
-           --------------------
-
-   A factoriation takes place which converts this to the form where the
-h component is now the matrix L and the Identity block I is now a square
-matrix B such that
-             L = hB
-
-and L is lower triangular and B and L  are integer valued.  
-
-What this means is that
-if dist = Lx, for some x then let c be such that c = Bx and we have 
-dist = Lx = hBx = hc.  (note x and c are global and returned by side effect.)
-and c is the distance vector.
-
-Furturemore, comp_ker returns the dimension of ker(h) and the right hand
-dim(ker(h)) columns of B form a basis of the kernel.
-
-*/
-
-  
-int comp_ker(adim, depth, sa, a, sor_ind_l, dist, vec, troub)
-int adim, depth;
-struct subscript *sa;
-int **a;
-PTR_SYMB sor_ind_l[];
-int dist[];
-int vec[], troub[];
-{
-  int i, j, k, piv_row, piv_col, cols_done, m, mval, cur_x;
-  int nosolution;
-  int p, q, r, s, z;
-  int *tmp;
-
-  sor_ind_l = sor_ind_l;        /* make lint happy, sor_ind_l not used */
-
-  /* h components in first adim rows of matrix */
-  for (i = 0; i < adim; i++) {
-    for (j = 0; j < depth; j++)
-      a[j][i] = sa[i].coefs[j];
-  }
-
-  /* depth by depth square identity in second block of matrix */
-  for (i = adim; i < adim + depth; i++) {
-    for (j = 0; j < depth; j++)
-      if ((i - adim) == j)
-        a[j][i] = 1;
-      else
-        a[j][i] = 0;
-  }
-  /* if(show_deps) print_a_arr(adim+depth,depth); */
-  /* The following is a factorization of the  array H from the */
-  /* function h (stored as the upper part of a ) into a lower  */
-  /* triangluar matrix L and a matrix B such that L = HB          */
-  /* now do column operations to reduce top to lower triangular */
-  /* remember that a is transposed to use pointers for columns */
-  /* for each row ... */
-  cols_done = 0;
-  for (i = 0; i < adim; i++) {
-    piv_row = i;
-    piv_col = cols_done;
-    while ((a[piv_col][piv_row] == 0) && (piv_col < depth))
-      piv_col++;
-    if (piv_col < depth) {
-      m = piv_col;
-      mval = a[m][piv_row];
-      mval = mval * mval;
-      k = 0;
-      /* pick min non-zero term on row to right of cols_done */
-      for (j = cols_done; j < depth; j++)
-        if ((a[j][piv_row] != 0) &&
-            ((a[j][piv_row] * a[j][piv_row]) < mval)) {
-          m = j;
-          mval = a[j][piv_row] * a[j][piv_row];
-        }
-      /* now move col m to col cols_done */
-      tmp = a[m];
-      a[m] = a[cols_done];
-      a[cols_done] = tmp;
-      /* now eliminate rest of row */
-      for (j = cols_done + 1; j < depth; j++)
-        if (a[j][piv_row] != 0) {
-          find_mults(a[cols_done][piv_row],
-                     a[j][piv_row], &p, &q, &r, &s);
-          for (k = 0; k < adim + depth; k++) {
-            z = a[cols_done][k] * p + a[j][k] * q;
-            a[j][k] = a[cols_done][k] * r
-              + a[j][k] * s;
-            a[cols_done][k] = z;
-          }
-          if (a[cols_done][piv_row] == 0) {
-            tmp = a[j];
-            a[j] = a[cols_done];
-            a[cols_done] = tmp;
-          }
-        }
-      cols_done++;
-    }
-  }
-  /* reduce system by gcd of each column */
-  for (j = 0; j < depth; j++) {
-    z = gcd(depth + adim, a[j]);
-    if (z != 1 && z != 0) {
-      for (k = 0; k < adim + depth; k++)
-        a[j][k] = a[j][k] / z;
-    }
-  }
-
-  /* now back solve for x in dist = Lx */
-  nosolution = 0;
-  cur_x = 0;
-  for (j = 0; (j < adim && cur_x < depth); j++) {
-    z = 0;
-    for (k = 0; k < cur_x; k++)
-      z = z + a[k][j] * x[k];
-    if (a[cur_x][j] == 0) {
-      if (z != dist[j]) {
-        nosolution = 1;
-      }
-      /* this equation is consistent, so skip it */
-    }
-    else {
-      r = (dist[j] - z) / a[cur_x][j];
-      if (r * a[cur_x][j] != dist[j] - z) {
-        nosolution = 1;
-      }
-      x[cur_x] = r;
-      cur_x++;
-    }
-  }
-  for (j = cur_x; j < depth; j++) x[j] = 0;
-
-
-  /* the following is a double check on the solution */
-
-  for (j = 0; j < adim; j++) {
-    z = 0;
-    for (k = 0; k < depth; k++)
-      z = z + a[k][j] * x[k];
-    if (z != dist[j])
-      nosolution = 1;
-  }
-  /* if there is no solution then there is no dependence! */
-  if (nosolution) {
-    troub[0] = 1;
-    return (depth - cols_done);
-  }
-  /* because L = HB where B is the lower block of a       */
-  /* and dist = Lx  we have dist = HBx, so if c = Bx, dist = Hc    */
-  for (j = 0; j < depth; j++) {
-    c[j] = 0;
-    for (k = 0; k < depth; k++)
-      c[j] = c[j] + a[k][j + adim] * x[k];
-  }
-  /* to compute vec and troub, we start by setting */
-  /* vec to c.  (if ker(h) =0) we are done then  */
-  for (j = 0; j < depth; j++)
-    vec[j + 1] = c[j];
-  /* we now modify by the leading terms of the ker basis */
-  for (j = cols_done; j < depth; j++) {
-    /* find leading non-zero */
-    z = -1;
-    for (k = 0; k < depth; k++)
-      if (z == -1 && a[j][k + adim] != 0)
-        z = k;
-    if (z > -1) {
-      troub[z + 1] = PLUS;
-    }
-  }
-  z = 100;
-  for (j = 1; j < depth + 1; j++) {
-    if (troub[j] == PLUS || vec[j] > 0)
-      z = j;
-    if (troub[j] != PLUS && vec[j] < 0 && z == 100) {
-      troub[0] = 1;
-      /* fprintf(stderr, " reject - wrong direction \n"); */
-      return (depth - cols_done);
-    }
-    if (z < j && troub[j] == PLUS && vec[j] < 0)
-      troub[j] = ZPLUS;
-  }
-
-  /* print_a_arr(adim+depth,depth); */
-  return (depth - cols_done);
-}
-
-static int myabs(x)
-int x;
-{
-  if (x < 0)
-    return (-x);
-  else
-    return (x);
-}
-
-int eval_h(c, depth, i, val)
-int c[];
-int depth, i, val;
-{
-  depth = depth;                /* make lint happy, depth unused */
-
-  return (c[i] * val);
-}
-
-int find_mults(a, b, p1, q1, r1, s1)
-int a, b;
-int *p1;
-int *q1;
-int *r1;
-int *s1;
-{
-  /* upon return :      a*p+b*q  or a*r+b*s is 0 */
-  int p, q, r, s, olda, oldb;
-
-  olda = a;
-  oldb = b;
-  p = 1;
-  q = 0;
-  r = 0;
-  s = 1;
-  while (a * b != 0) {
-    if (a == b) {
-      r = r - p;
-      s = s - q;
-      b = 0;
-    }
-    else if (a == -b) {
-      r = r + p;
-      s = s + q;
-      b = 0;
-    }
-    else if (myabs(a) < myabs(b)) {
-      if (a * b > 0) {          /* same sign */
-        r = r - p;
-        s = s - q;
-        b = b - a;
-      }
-      else {
-        r = r + p;
-        s = s + q;
-        b = b + a;
-      }
-    }
-    else {
-      if (a * b > 0) {
-        p = p - r;
-        q = q - s;
-        a = a - b;
-      }
-      else {
-        p = p + r;
-        q = q + s;
-        a = a + b;
-      }
-    }
-  }                             /* end while */
-
-  if ((a != (olda * p + oldb * q)) || (b != (olda * r + oldb * s)))
-    fprintf(stderr, " reduce failed!\n");
-  *p1 = p;
-  *q1 = q;
-  *r1 = r;
-  *s1 = s;
-return 1;
-}
-
-void print_a_arr(rows, cols)
-int rows, cols;
-{
-  int i, j;
-  for (i = 0; i < rows; i++) {
-    fprintf(stderr, "    | ");
-    for (j = 0; j < cols; j++) {
-      fprintf(stderr, " %d ", a_array[j][i]);
-      if (j == cols - 1)
-        fprintf(stderr, "        |\n");
-    }
-  }
-}
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/list.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/list.c
deleted file mode 100644
index f47d801..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/list.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#include <stdlib.h>
-
-#include "db.h"
-#include "list.h"
- 
-/* the following declarations are temporary fixes until we */
-/* decide how to deal with numbering and write nodes.	   */
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-struct bfnd cbfnd;
-struct dep  cdep;
-
-static LIST lis_array;
-static int list_not_ready = 1;
-
-/* end of declaration hack */
-
-extern PTR_FILE cur_file;
-
-PTR_BFND make_bfnd();
-PTR_BLOB make_blob();
-PTR_LLND make_llnd();
-PTR_LLND copy_llnd();
-PTR_SYMB make_symb();
-
-/************************************************************************
- *									*
- *	List manipuliation functions alloc_list(), push_llnd()		*
- *	push_symb(), free_list() to be used by make_expr()		*
- *									*
- ************************************************************************/
-
-LIST
-alloc_list(type)
-	int type;
-{
-	int i;
-
-	if(list_not_ready){
-		lis_array   =  (LIST) calloc(NUMLIS, sizeof(struct lis_node));
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,lis_array, 0);
-#endif
-		for(i = 0; i < NUMLIS; i++) 
-			lis_array[i].variant = UNUSED; 
-		list_not_ready = 0;
-	}
-	for(i = 0; i < NUMLIS; i++)
-		if(lis_array[i].variant == UNUSED){
-			lis_array[i].variant = type;
-			return(&lis_array[i]);
-		}
-	return(NULL);
-}
-
-
-/* push the low level node llnd on the front of list lis */
-LIST
-push_llnd(llnd, lis)
-	PTR_LLND llnd;
-	LIST lis;
-{
-	LIST nl;
-
-	nl = alloc_list(LLNDE);
-	nl->entry.llnd = llnd;
-	nl->next = lis;
-	return(nl);
-}
-
-
-/* push the symb node symb on the front of list lis */
-LIST
-push_symb(symb, lis)
-	PTR_SYMB symb;
-	LIST lis;
-{
-	LIST nl;
-
-	nl = alloc_list(SYMNDE);
-	nl->entry.symb = symb;
-	nl->next = lis;
-	return(nl);
-}
-
-
-void
-free_list(lis)
-	LIST lis;
-{
-	LIST nxt;
-
-	while(lis != NULL){
-		lis->variant = UNUSED;
-		nxt = lis->next;
-		lis->next = NULL;
-		lis = nxt;
-	}
-}
-
-
-
-/************************************************************************
- *									*
- *		blob list manipulation routines car, cdr, append.	*
- *									*
- ************************************************************************/
-
-#define car(bl_list)  bl_list->ref
-#define cdr(bl_list)  bl_list->next
-
-PTR_BLOB
-cons( bif, bl_list)
-	PTR_BFND bif;
-	PTR_BLOB bl_list;
-{
-	return (make_blob(cur_file, bif, bl_list));
-}
-
-
-/* append without copy -- not standard lisp append */
-PTR_BLOB
-append(bl_list, bif)
-	PTR_BLOB bl_list;
-	PTR_BFND bif;
-{
-	PTR_BLOB b;
-
-	if (bl_list == NULL)
-		return(make_blob(cur_file, bif, NULL));
-
-	for (b = bl_list; b->next; b = b->next)
-		;
-	b->next = make_blob(cur_file, bif, NULL);
-	return(bl_list);
-}
-
-
-
-
-/*
- * get_r_follow_node recursively checks source and all of its decendents until
- * it finds the ith dependence.	 It returns the node on the same level as
- * source.
- */
-PTR_BFND
-get_r_follow_node(par,source,bfptr,j,i)
-    PTR_BFND bfptr, par, source;
-    int *j;
-    int i;
-{
-	PTR_DEP  p;
-	PTR_BFND targ;
-	PTR_BLOB b;
-	PTR_BFND child, final; 
-
-	p = bfptr->entry.Template.dep_ptr1;
-	while(( p != NULL) && ( *j <= i)) {
-		if((p->to.stmt != source) &&
-		   ((p->type == 0) ||(p->type == 1) ||(p->type == 2))
-		   ){
-			if( *j == i){ 
-				targ = p->to.stmt;
-				while(targ != NULL && targ->variant != GLOBAL &&
-				      targ->control_parent != par) targ = targ->control_parent; 
-				if(targ->variant == GLOBAL) return(NULL);
-				else if (targ == source) p = p->from_fwd;
-				else return( targ);
-			}
-			else {
-				p =p->from_fwd;
-				*j = (*j)+1;
-			}
-		}
-		else p =p->from_fwd;
-	} 
-	if(p == NULL && (bfptr->variant == FOR_NODE || bfptr->variant == FORALL_NODE || bfptr->variant == IF_NODE)){ 
-		b = bfptr->entry.Template.bl_ptr1;
-		while(b != NULL && *j <=i){ 
-			child = b->ref;
-			final = get_r_follow_node(par,source,child,j,i);
-			if(final != NULL && final != source) return(final);
-			b = b->next;
-		}
-	}
-	if(p == NULL && bfptr->variant == IF_NODE){ 
-		b = bfptr->entry.Template.bl_ptr2;
-		while(b != NULL && *j <=i){ 
-			child = b->ref;
-			final = get_r_follow_node(par,source,child,j,i);
-			if(final != NULL && final != source) return(final);
-			b = b->next;
-		} 
-	}
-	/* if *j <= i then we are not there yet but out of dependences and childern so return null */
-  
-	return(NULL);
-}
-
-
-/* returns pointer to i-th bf-node following *bfptr in dep order */
-PTR_BFND
-get_follow_node(bfptr,i)
-	PTR_BFND bfptr;
-	int i;
-{
-	PTR_BFND par    = bfptr->control_parent,
-	source = bfptr;
-	int	     j	    = 0;
-    
-	return(get_r_follow_node(par,source,bfptr,&j,i));
-}  
-
-/****************************************************************
- *								*
- *		MAKE functions: make_expr(),			*
- *				mk_llnd(),			*
- *				make_ddnd(),			*
- *				mk_symb(),			*
- *				make_asign()			*
- *				make_for()  & mkloop()		*
- *				make_cntlend()			*
- *								*
- ****************************************************************/
-
-PTR_LLND
-mk_llnd(PTR_LLND p)
-/*	PTR_LLND p;*/
-{
-	PTR_LLND nd;
-	
-	nd = make_llnd(cur_file, 0, NULL, NULL, NULL);
-	if (p != NULL){
-		nd->variant = p->variant;
-		nd->type = p->type;   
-		nd->entry.Template.symbol = p->entry.Template.symbol;
-		nd->entry.Template.ll_ptr1 = p->entry.Template.ll_ptr1;
-		nd->entry.Template.ll_ptr2 = p->entry.Template.ll_ptr2;
-	} else
-		nd->variant = VAR_REF;
-	return(nd);
-}
-
-
-PTR_SYMB
-mk_symb(name,p)
-	char    *name;
-	PTR_SYMB p;
-{
-	PTR_SYMB nd;
-	
-	nd = make_symb(cur_file, 0, name);
-	if (p != NULL){
-		nd->variant = p->variant;
-		nd->type = p->type;
-		nd->next_symb = p->next_symb;
-		p->next_symb = nd;
-		nd->parent = p->parent;
-	} else {
-		nd->variant = VARIABLE_NAME;
-		nd->type = NULL;
-		nd->next_symb = NULL;
-		nd->parent = NULL;
-	}
-	nd->entry.var_decl.local = LOCAL;
-	nd->outer = NULL;
-	nd->id_list = NULL;
-	
-	return(nd);
-}
-
-
-static LIST lispt;
-
-/* op = one of ADD_OP SUBT_OP MULT_OP DIV_OP (or other binary ops) */
-PTR_LLND
-make_oper(op)
-	int op;
-{
-	PTR_LLND nd;
-
-	nd = mk_llnd(NULL);
-	nd->variant = op;
-	return(nd);
-}
-
-
-PTR_LLND
-make_arref(ar,index)
-    PTR_SYMB ar;
-    PTR_LLND index;
-{
-	PTR_LLND nd;
-
-	nd = mk_llnd(NULL);
-	nd->variant = ARRAY_REF;
-	nd->entry.array_ref.symbol = ar;
-	nd->entry.array_ref.index = index;
-	nd->entry.array_ref.array_elt = NULL;
-	return(nd);
-}
-
-
-PTR_LLND
-make_int(i)
-	int i;
-{
-	PTR_LLND nd;
-
-	nd = mk_llnd(NULL);
-	nd->variant = INT_VAL;
-	nd->entry.ival = i;
-	return(nd);
-}
-
-
-PTR_LLND
-hmake_expr()
-{
-	LIST lis;
-	PTR_LLND nd;
-     
-	if (lispt  == NULL)
-		return(NULL);
-
-	lis = lispt;
-	lispt = lis->next;
-	if (lis->variant == SYMNDE){
-		nd = mk_llnd(NULL);
-		if(lis->entry.symb->variant == VARIABLE_NAME)
-			nd->variant = VAR_REF;
-		else
-			fprintf(stderr, "wrong symbol type in make_expr");
-		nd->entry.Template.symbol = lis->entry.symb;
-		return(nd);
-	} else if(lis->variant == LLNDE){
-		nd = lis->entry.llnd;
-		switch (nd->variant) {
-		case DDOT	:
-		case EQ_OP	:
-		case LT_OP	:
-		case GT_OP	:
-		case NOTEQL_OP	:
-		case LTEQL_OP	:
-		case GTEQL_OP	:
-		case ADD_OP	:
-		case SUBT_OP 	:
-		case OR_OP	:
-		case MULT_OP 	:
-		case DIV_OP	:
-		case MOD_OP	:
-		case AND_OP	:
-		case EXP_OP	:
-			if (nd->entry.binary_op.l_operand == NULL){
-				nd->entry.binary_op.l_operand =
-					hmake_expr();
-				nd->entry.binary_op.r_operand =
-					hmake_expr();
-			}
-			break;
-		case MINUS_OP	:
-		case NOT_OP	:
-			if (nd->entry.unary_op.operand == NULL){
-				nd->entry.unary_op.operand =
-					hmake_expr();
-			}
-			break;
-			
-		default:
-			break;
-		}
-		return(nd);
-	}
-	return NULL;
-}
-
-
-/*
- * this routine creates a low level expression tree from the preorder
- * list of llnds and symbol pointers then deletes the list
- */
-PTR_LLND
-make_expr(lis)
-	LIST lis;
-{
-	LIST L;
-	PTR_LLND n;
-
-	L = lis;
-	lispt = lis;
-	n = hmake_expr();
-	free_list(L);
-	return(n);
-}
-
-
-PTR_BFND
-make_asign(lhs,rhs)
-	PTR_LLND lhs,rhs;
-{
-	return(make_bfnd(cur_file, ASSIGN_STAT, NULL, lhs, rhs, NULL));
-}
-
-
-PTR_BFND
-make_for(index,range)
-	PTR_SYMB index;
-	PTR_LLND range;
-{
-	return(make_bfnd(cur_file, FOR_NODE, index, range, NULL, NULL));
-}
-
-
-/*
- * make a for_node like *p
- * this is a special version used by distribute
- */
-PTR_BFND
-mkloop(p)
-	PTR_BFND p;
-{
-	PTR_BFND newp;
- 
-	/* we should be making new copies of the following structures! */
-	newp = make_bfnd(cur_file,
-			 FOR_NODE,
-			 p->entry.Template.symbol,
-			 p->entry.Template.ll_ptr1,
-			 p->entry.Template.ll_ptr2,
-			 p->entry.Template.ll_ptr3);
-
-	newp->entry.Template.bf_ptr1  = p->entry.Template.bf_ptr1;
-	newp->entry.Template.cmnt_ptr  = p->entry.Template.cmnt_ptr;
-	
-	newp->filename = p->filename;
-	return(newp);
-}
-
-
-
-PTR_BFND
-make_cntlend(par)
-	PTR_BFND par;
-{
-	PTR_BFND b;
-
-	b = make_bfnd(cur_file, CONTROL_END, NULL, NULL, NULL, NULL);
-	b->control_parent = par;
-	return(b);
-}
- 
-
-static int modified = 0;
-
-/* create a NEW low level node tree with cvar replaced by newref */
-PTR_LLND
-replace_ref(lnd,cvar,newref)
-	PTR_LLND lnd;
-	PTR_SYMB cvar;
-	PTR_LLND newref;
-{
-	PTR_LLND pllnd, rtnval;
-	
-	if (lnd == NULL) return(NULL);
-	
-	pllnd = mk_llnd(lnd);
-	rtnval = pllnd;
-
-	switch (pllnd->variant) {
-	case CONST_REF:
-	case VAR_REF  :
-	case ENUM_REF :
-		if( pllnd->entry.Template.symbol==cvar){
-			/* replace with subtree consisting of newref */
-			modified = 1;
-			rtnval = copy_llnd(newref);
-		}
-		break;
-	case ARRAY_REF:
-		pllnd->entry.array_ref.index =
-			replace_ref(pllnd->entry.array_ref.index,cvar,newref);
-		if (pllnd->entry.array_ref.array_elt != NULL) {
-			pllnd->entry.array_ref.array_elt =
-				replace_ref(pllnd->entry.array_ref.array_elt,cvar,newref);
-		}
-		break;
-	case RECORD_REF:
-		if (pllnd->entry.record_ref.rec_field != NULL) {
-			pllnd->entry.record_ref.rec_field =
-				replace_ref(pllnd->entry.record_ref.rec_field,cvar,newref);
-		}
-		break;
-	case PROC_CALL	:
-	case FUNC_CALL	:
-		pllnd->entry.proc.param_list =
-			replace_ref(pllnd->entry.proc.param_list,cvar,newref);
-		break;
-	case VAR_LIST	:
-	case EXPR_LIST	:
-	case RANGE_LIST	:
-		pllnd->entry.list.item =
-			replace_ref(pllnd->entry.list.item,cvar,newref);
-		if (pllnd->entry.list.next != NULL) {
-			pllnd->entry.list.next =
-				replace_ref(pllnd->entry.list.next,cvar,newref);
-		}
-		break;
-
-	case CASE_CHOICE:
-	case DDOT	:
-		pllnd->entry.binary_op.l_operand =
-			replace_ref(pllnd->entry.binary_op.l_operand,cvar,newref);
-		pllnd->entry.binary_op.r_operand =
-			replace_ref(pllnd->entry.binary_op.r_operand,cvar,newref);
-		break;
-		/* binary ops */
-	case EQ_OP	:
-	case LT_OP	:
-	case GT_OP	:
-	case NOTEQL_OP	:
-	case LTEQL_OP	:
-	case GTEQL_OP	:
-	case ADD_OP	:
-	case SUBT_OP	:
-	case OR_OP	:
-	case MULT_OP	:
-	case DIV_OP	:
-	case MOD_OP	:
-	case AND_OP	:
-	case EXP_OP	:
-		pllnd->entry.binary_op.l_operand =
-			replace_ref(pllnd->entry.binary_op.l_operand,cvar,newref);
-		pllnd->entry.binary_op.r_operand =
-			replace_ref(pllnd->entry.binary_op.r_operand,cvar,newref);
-		break;
-	case MINUS_OP:
-	case NOT_OP	 :
-		pllnd->entry.unary_op.operand =
-			replace_ref(pllnd->entry.unary_op.operand,cvar,newref);
-		break;
-	default:
-		break;
-	}
-	return(rtnval);
-}
-
-
-/* routine to make double dot node  low..hi  from an expression */
-PTR_LLND
-make_ddnd(pllnd,cvar,low,hi)
-	PTR_LLND pllnd,low,hi;
-	PTR_SYMB cvar;
-{
-	PTR_LLND tmp, dotnd;
-	
-	tmp = replace_ref(pllnd,cvar,low);
-	if(modified){ 
-		dotnd = mk_llnd(NULL);
-		dotnd->variant = DDOT;
-		dotnd->entry.Template.symbol = NULL;
-		dotnd->entry.Template.ll_ptr1 = tmp;
-		dotnd->entry.Template.ll_ptr2 = 
-			replace_ref(pllnd,cvar,hi);
-		return(dotnd);
-	}
-	else return(pllnd);
-}
-
-
-/*
- * create a new ddot node for every array-ref in expression containing
- * a reference to cvar
- */
-void
-expand_ref(pllnd,cvar,low,hi)
-	PTR_LLND	pllnd;
-	PTR_SYMB	cvar;
-	PTR_LLND	low,hi;
-{
-	if (pllnd == NULL) return;
-
-	switch (pllnd->variant) {
-	case ARRAY_REF:
-		/* [ */
-		modified = 0;	/* set changed flag */
-		if((pllnd->entry.array_ref.index->variant != EXPR_LIST) &&
-		   (pllnd->entry.array_ref.index->variant != RANGE_LIST))
-			pllnd->entry.array_ref.index =
-				make_ddnd(pllnd->entry.array_ref.index,cvar,low,hi);
-		else expand_ref(pllnd->entry.array_ref.index,cvar,low,hi);
-		
-		/* otherwise this is a scalar reference and should */
-		/* not be changed here. In any case reset flag	   */
-		modified = 0;
-		/* ] */
-		break;
-	case RECORD_REF:
-		if (pllnd->entry.record_ref.rec_field != NULL) 
-			expand_ref(pllnd->entry.record_ref.rec_field,cvar,low,hi);
-		break;
-	case PROC_CALL:
-	case FUNC_CALL:
-		expand_ref(pllnd->entry.proc.param_list,cvar,low,hi);
-		break;
-	case VAR_LIST :
-	case EXPR_LIST:
-	case RANGE_LIST:
-		/* the other place where something can happen is here	*
-		 * if we have a[i,j] and we are vectorizing j then this *
-		 * should be a[i,low..hi], unless it is i we are after	*/
-		modified = 0;
-		pllnd->entry.list.item =
-			make_ddnd(pllnd->entry.list.item,cvar,low,hi);
-		modified = 0;
-		if (pllnd->entry.list.next != NULL) {
-			/* pllnd->entry.list.next = */
-			expand_ref(pllnd->entry.list.next,cvar,low,hi);
-			modified = 0;
-		}
-		break;
-	case EQ_OP	:
-	case LT_OP	:
-	case GT_OP	:
-	case NOTEQL_OP:
-	case LTEQL_OP:
-	case GTEQL_OP:
-	case ADD_OP	:
-	case SUBT_OP:
-	case OR_OP	:
-	case MULT_OP:
-	case DIV_OP	:
-	case MOD_OP	:
-	case AND_OP	:
-	case EXP_OP	:
-		expand_ref(pllnd->entry.binary_op.l_operand,cvar,low,hi);
-		expand_ref(pllnd->entry.binary_op.r_operand,cvar,low,hi);
-		break;
-	case MINUS_OP:
-		expand_ref(pllnd->entry.unary_op.operand,cvar,low,hi);
-		break;
-	case NOT_OP	:
-		expand_ref(pllnd->entry.unary_op.operand,cvar,low,hi);
-		break;
-	default:
-		break;
-	}
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
deleted file mode 100644
index a8f0bba..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/make_nodes.c
+++ /dev/null
@@ -1,641 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#include <stdlib.h>
-
-#include "db.h"
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
- 
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-#define ALLOC(x)  (struct x *) chkalloc(sizeof(struct x))
-#define LABUNKNOWN  0
-
-/*
- * External references
- */
-extern PTR_FILE cur_file;
-
-/*
- * copyn -- makes a copy of a string with known length
- *
- * input:
- *	  n - length of the string "s"
- *	  s - the string to be copied
- *
- * output:
- *	  pointer to the new string
- */
-char   *
-copyn(int n, char *s)
-/*	int n; */
-/*	char *s; */
-{
-	char *p, *q;
-
-	p = q = (char *) calloc(1, (unsigned) n);
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-	while (--n >= 0)
-		*q++ = *s++;
-	return (p);
-}
-
-
-/*
- * copys -- makes a copy of a string
- *
- * input:
- *	  s - string to be copied
- *
- * output:
- *	  pointer to the new string
- */
-char   *
-copys(s)
-	char   *s;
-{
-	return (copyn(strlen(s) + 1, s));
-}
-
-
-char *
-chkalloc(int n)
-/*	int n; */
-{
-	char *p;
-
-    if ((p = (char *)calloc(1, (unsigned)n)) != 0)
-    {
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-        return (p);
-    }
-	return NULL;
-}
-
-
-PTR_BFND
-alloc_bfndnt (fi)
-	PTR_FILE fi;
-{
-	register PTR_BFND new;
-
-	new = ALLOC (bfnd);
-	new->id = ++(fi->num_bfnds);
-	new->thread = BFNULL;
-	return (new);
-}
-
-PTR_BFND
-alloc_bfnd (fi)
-	PTR_FILE fi;
-{
-	register PTR_BFND new;
-
-	new = ALLOC (bfnd);
-	new->id = ++(fi->num_bfnds);
-	new->thread = BFNULL;
-	if (fi->num_bfnds == 1)
-		fi->head_bfnd = new;
-	else
-		fi->cur_bfnd->thread = new;
-	fi->cur_bfnd = new;
-	return (new);
-}
-
-
-PTR_LLND
-alloc_llnd (fi)
-	PTR_FILE fi;
-{
-	register PTR_LLND new;
-
-	new = ALLOC (llnd);
-	new->id = ++(fi->num_llnds);
-	new->thread = LLNULL;
-	if (fi->num_llnds == 1)
-		fi->head_llnd = new;
-	else
-		fi->cur_llnd->thread = new;
-	fi->cur_llnd = new;
-	return (new);
-}
-
-
-PTR_TYPE
-alloc_type (fi)
-	PTR_FILE fi;
-{
-	PTR_TYPE new;
-
-	new = (PTR_TYPE) calloc (1, sizeof (struct data_type));
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,new, 0);
-#endif
-	new->id = ++(fi->num_types);
-	new->thread = TYNULL;
-	if (fi->num_types == 1)
-		fi->head_type = new;
-	else
-		fi->cur_type->thread = new;
-	fi->cur_type = new;
-	return (new);
-}
-
-
-PTR_SYMB
-alloc_symb (fi)
-	PTR_FILE fi;
-{
-	PTR_SYMB new;
-
-	if (fi->cur_symb && (fi->cur_symb->variant == 0))
-		return (fi->cur_symb);
-	new = ALLOC (symb);
-	new->id = ++(fi->num_symbs);
-	new->thread = SMNULL;
-	if (fi->num_symbs == 1)
-		fi->head_symb = new;
-	else
-		fi->cur_symb->thread = new;
-	fi->cur_symb = new;
-	return (new);
-}
-
-
-PTR_LABEL
-alloc_lab (fi)
-	PTR_FILE fi;
-{
-	PTR_LABEL new;
-
-	new = ALLOC (Label);
-	new->id = ++(fi->num_label);
-	new->next = LBNULL;
-	if (fi->num_label == 1)
-		fi->head_lab = new;
-	else
-		fi->cur_lab->next = new;
-	fi->cur_lab = new;
-	return (new);
-}
- 
- 
-PTR_DEP
-alloc_dep (fi)
-	PTR_FILE fi;
-{
-	PTR_DEP new;
-
-	new = ALLOC (dep);
-	new->id = ++(fi->num_dep);
-	new->thread = NULL;
-	if (fi->num_dep == 1)
-	    fi->head_dep = new;
-	else
-	    fi->cur_dep->thread = new;
-	fi->cur_dep = new;
-	return (new);
-}
-
-
-/*
- * Make a BIF node
- */
-PTR_BFND
-make_bfnd (PTR_FILE fi, int node_type, PTR_SYMB symb_ptr, PTR_LLND ll1, PTR_LLND ll2, PTR_LLND ll3)
-/*	PTR_FILE fi; */
-/*	int	 node_type; */
-/*	PTR_SYMB symb_ptr;  */
-/*	PTR_LLND ll1, ll2, ll3; */
-{
-	register PTR_BFND new_bfnd;
-
-	new_bfnd = alloc_bfnd (fi);	/* should set up id field */
-	new_bfnd->variant = node_type;
-	new_bfnd->filename = NULL;
-	new_bfnd->entry.Template.symbol = symb_ptr;
-	new_bfnd->entry.Template.ll_ptr1 = ll1;
-	new_bfnd->entry.Template.ll_ptr2 = ll2;
-	new_bfnd->entry.Template.ll_ptr3 = ll3;
-	new_bfnd->entry.Template.cmnt_ptr = NULL;
-	fi->cur_bfnd = new_bfnd;
-	return (new_bfnd);
-}
-
-PTR_BFND
-make_bfndnt (fi, node_type, symb_ptr, ll1, ll2, ll3)
-	PTR_FILE fi;
-	int	 node_type;
-	PTR_SYMB symb_ptr;
-	PTR_LLND ll1, ll2, ll3;
-{
-	register PTR_BFND new_bfnd;
-
-	new_bfnd = alloc_bfndnt (fi);	/* should set up id field */
-	new_bfnd->variant = node_type;
-	new_bfnd->filename = NULL;
-	new_bfnd->entry.Template.symbol = symb_ptr;
-	new_bfnd->entry.Template.ll_ptr1 = ll1;
-	new_bfnd->entry.Template.ll_ptr2 = ll2;
-	new_bfnd->entry.Template.ll_ptr3 = ll3;
-	new_bfnd->entry.Template.cmnt_ptr = NULL;
-	fi->cur_bfnd = new_bfnd;
-	return (new_bfnd);
-}
-
-/*
- * Make a new low level node
- */
-PTR_LLND
-make_llnd (PTR_FILE fi, int node_type, PTR_LLND ll1, PTR_LLND ll2, PTR_SYMB symb_ptr)
-/*	PTR_FILE fi; */
-/*	int	 node_type; */
-/*	PTR_LLND ll1, ll2; */
-/*	PTR_SYMB symb_ptr; */
-{
-	PTR_LLND new_llnd;
-
-	new_llnd = alloc_llnd (fi);	/* should set up id field */
-
-	new_llnd->variant = node_type;
-	new_llnd->type = TYNULL;
-	new_llnd->entry.Template.ll_ptr1 = ll1;
-	new_llnd->entry.Template.ll_ptr2 = ll2;
-	switch (node_type) {
-	  case INT_VAL:
-        /*    new_llnd->entry.ival = (int) symb_ptr; */
-            break;
-	  case BOOL_VAL:
-         /*   new_llnd->entry.bval = (int) symb_ptr; */
-            break;
-	  default:
-            new_llnd->entry.Template.symbol = symb_ptr;
-            break;
-	  }
-	return (new_llnd);
-}
-
-
-/*
- * Make a new low level node for label
- */
-PTR_LLND
-make_llnd_label (fi, node_type, lab)
-	PTR_FILE  fi;
-	int	  node_type;
-	PTR_LABEL lab;
-{
-	PTR_LLND new_llnd;
-
-	new_llnd = alloc_llnd (fi);	/* should set up id field */
-
-	new_llnd->variant = node_type;
-	new_llnd->type = TYNULL;
-	new_llnd->entry.label_list.lab_ptr = lab;
-	new_llnd->entry.label_list.null_1 = LLNULL;
-	new_llnd->entry.label_list.next = LLNULL;
-	return (new_llnd);
-}
-
-
-/*
- * Make a new symb node
- */
-PTR_SYMB
-make_symb (fi, node_type, string)
-	PTR_FILE fi;
-	int	 node_type;
-	char	*string;
-{
-	PTR_SYMB new_symb;
-
-	new_symb = alloc_symb (fi);
-	new_symb->variant = node_type;
-	new_symb->ident = copys (string);
-	return (new_symb);
-}
-
-
-/*
- * Make a new type node
- */
-PTR_TYPE
-make_type (fi, node_type)
-	PTR_FILE fi;
-	int      node_type;
-{
-	PTR_TYPE new_type;
-
-	new_type = alloc_type (fi);
-	new_type->entry.Template.ranges =  NULL;
-	new_type->variant = node_type;
-	return (new_type);
-}
-
-
-/*
- * Make a new label node for Fortran.  VPC has its own get_labe
- */
-PTR_LABEL
-make_label (fi, l)
-	PTR_FILE fi;
-	long	 l;
-{       
-	PTR_LABEL new_lab;
-	PTR_BFND  this_scope;
-        int num;/*podd*/
-        num = fi->cur_bfnd ? fi->cur_bfnd->g_line : 0; /*podd*/
-	if (l <= 0 || l > 99999) {
-	  /*	fprintf (stderr, "Error 038 on line %d of %s: Label out of range\n", num, fi->filename); */
-		l = 0;
-	}
-	this_scope = NULL;
-	for (new_lab = fi->head_lab; new_lab; new_lab = new_lab->next)
-		if (new_lab->stateno == l && new_lab->scope == this_scope)
-			return (new_lab);
-
-	new_lab = alloc_lab (fi);
-
-	new_lab->stateno = l;
-	new_lab->scope = this_scope;
-	new_lab->labused = NO;
-	new_lab->labdefined = NO;
-	new_lab->labinacc = NO;
-	new_lab->labtype = LABUNKNOWN;
-	new_lab->statbody = BFNULL;
-	return (new_lab);
-}
-
-
-/*
- * Make a DEP node
- */
-PTR_DEP
-make_dep(fi, sym,t,lls,lld,bns,bnd,dv)
-	PTR_FILE fi;
-	PTR_SYMB sym;		/* symbol for variable name		*/
-	char t; 		/* type: 0=flow 1=anti 2 = output	*/
-	PTR_LLND lls, lld;	/* term source and destination		*/
-	PTR_BFND bns, bnd;	/* biff nd source and destination	*/
-	char *dv;		/* dep. vector: 1="="	2="<"  4=">" ?	*/
-{
-	int i;
-	PTR_DEP d;
-
-	if ((d = alloc_dep(fi)) == NULL)
-		return NULL;
-	d->type = t;
-	d->symbol = sym;
-	d->from.stmt = bns; d->from.refer = lls;
-	d->to.stmt   = bnd; d->to.refer   = lld;
-	for(i=0; i < MAX_DEP; i++) d->direct[i] = 0;
-	for(i=0; i < MAX_NEST_DEPTH; i++) d->direct[i] = dv[i];
-
-	return(d);
-}
-
-
-/*------------------------------------------------------*
- *			alloc_blob			*
- *------------------------------------------------------*/
-PTR_BLOB
-alloc_blob1(fi)
-	PTR_FILE fi;
-{
-	PTR_BLOB new;
-
-	new = ALLOC(blob);
-	++(fi->num_blobs);
-	return (new);
-}
-
-
-PTR_CMNT
-alloc_cmnt (fi)
-	PTR_FILE fi;
-{
-	PTR_CMNT new;
-
-	new = ALLOC (cmnt);
-	new->id = ++(fi->num_cmnt);
-	new->thread = CMNULL;
-	if (fi->num_cmnt == 1)
-		fi->head_cmnt = new;
-	else
-		fi->cur_cmnt->thread = new;
-	fi->cur_cmnt = new;
-	return (new);
-}
-
-
-/*------------------------------------------------------*
- *			make_blob			*
- *------------------------------------------------------*/
-PTR_BLOB
-make_blob (fi, ref, next)
-	PTR_FILE fi;
-	PTR_BFND ref;
-	PTR_BLOB next;
-{
-	PTR_BLOB new;
-
-	new = alloc_blob1(fi);
-	new->ref = ref;
-	new->next = next;
-	return (new);
-}
-
-
-PTR_CMNT
-make_comment (fi, s, t)
-	PTR_FILE fi;
-	char	*s;
-	int	 t;
-{
-	PTR_CMNT new;
-
-	new = alloc_cmnt(fi);
-	new->string = copys (s);
-	new->type = t;
-	return (new);
-}
-
-
-void
-MakeBfnd (node_type, symb_ptr, ll1, ll2, ll3)
-	int	 node_type;
-	PTR_SYMB symb_ptr;
-	PTR_LLND ll1, ll2, ll3;
-{
-	PTR_BFND b;
-
-	b = make_bfnd (cur_file, node_type, symb_ptr, ll1, ll2, ll3);
-	fprintf(stderr, "%d\n", b->id);
-}
-
-
-void
-MakeLlnd (node_type, ll1, ll2, symb_ptr)
-	int	 node_type;
-	PTR_LLND ll1, ll2;
-	PTR_SYMB symb_ptr;
-{
-	PTR_LLND l;
-
-	l = make_llnd (cur_file, node_type, ll1, ll2, symb_ptr);
-	fprintf(stderr, "%d\n", l->id);
-}
-
-
-void
-Makellnd_label (node_type, lab)
-	int     node_type;
-	PTR_LABEL lab;
-{
-	make_llnd_label (cur_file, node_type, lab);
-}
-
-
-void
-MakeSymb (node_type, string)
-	int     node_type;
-	char   *string;
-{
-	PTR_SYMB s;
-
-	s = make_symb (cur_file, node_type, string);
-	fprintf(stderr, "%d\n", s->id);
-}
-
-
-void
-Maketype (node_type)
-	int     node_type;
-{
-	PTR_TYPE t;
-	t = make_type (cur_file, node_type);
-	fprintf(stderr, "%d\n", t->id);
-}
-
-
-void
-MakeLabel (l)
-	long    l;
-{
-	PTR_LABEL l1;
-
-	l1 = make_label (cur_file, l);
-	fprintf(stderr, "%d\n",l1->id);
-}
-
-
-void
-MakeBlob (ref, next)
-	PTR_BFND ref;
-	PTR_BLOB next;
-{
-	make_blob (cur_file, ref, next);
-}
-
-
-void
-MakeComment (s, t)
-	char   *s;
-	int     t;
-{
-	PTR_CMNT c;
-
-	c = make_comment (cur_file, s, t);
-	fprintf(stderr, "%d\n",c->id);
-}
-
-
-/*
- * declare variable can be used to create a new variable in the
- * symbol table that is "like" another variable.  For example
- * if x is in a statement b and you wish to make a new variable
- * with id x_new that is an array of the same type as x (which
- * is a scalar), this function creates the new varaible and
- * creates a declartion for it at the appropriate scope level
- */
-PTR_SYMB 
-declare_variable (id, like, dimension, scope)
-	char    *id;		/* identifier for new variable	 */
-	PTR_SYMB like;		/* the Template variable	 */
-	int      dimension;	/* if > 1 then this is an array */
-				/* version of Template variable */
-	PTR_BFND scope;		/* pointer to a statment that is */
-				/* in the block where this is to */
-				/* be declared */
-{
-	PTR_LLND expr_list, reference;
-	PTR_BFND decl_stmt;
-	PTR_LLND dimen_expr;
-	PTR_SYMB new_var;
-
-	if (like == NULL) {
-		fprintf (stderr, "no Template in declare_varaible\n");
-		return (NULL);
-	}
-	if (id == NULL) {
-		fprintf (stderr, "no id in declare_variable\n");
-		return (NULL);
-	}
-	if (scope == NULL) {
-		fprintf (stderr, "no scope in declare_varaible\n");
-		return (NULL);
-	}
-	new_var = make_symb (cur_file, VARIABLE_NAME, id);
-	if (dimension <= 1) {
-		if (like->type == NULL) {
-			fprintf (stderr, "problems with type of like in declare_variable\n");
-			return (NULL);
-		}
-		new_var->type = like->type;
-		if (like->type->variant == T_ARRAY) {
-			dimen_expr = make_llnd (cur_file, INT_VAL, NULL, NULL, NULL);
-			dimen_expr = like->type->entry.ar_decl.ranges ->
-				entry.Template.ll_ptr1;
-			reference = make_llnd (cur_file, ARRAY_REF, dimen_expr,
-					       NULL, new_var);
-		} else
-			reference = make_llnd (cur_file, VAR_REF, NULL, NULL, new_var);
-	} else {
-		dimen_expr = make_llnd (cur_file, INT_VAL, NULL, NULL, NULL);
-		dimen_expr->entry.ival = dimension;
-		reference = make_llnd (cur_file, ARRAY_REF, dimen_expr, NULL, new_var);
-		new_var->type = make_type (cur_file, T_ARRAY);
-		new_var->type->entry.ar_decl.base_type = like->type;
-		new_var->type->entry.ar_decl.num_dimensions = 1;
-		new_var->type->entry.ar_decl.ranges = dimen_expr;
-	}
-	expr_list = make_llnd (cur_file, EXPR_LIST, reference, NULL, NULL);
-	decl_stmt = make_bfnd (cur_file, VAR_DECL, NULL, expr_list, NULL, NULL);
-	scope = scope->control_parent;
-	while (scope != NULL &&
-	       scope->variant != GLOBAL && scope->variant != PROC_HEDR &&
-	       scope->variant != PROG_HEDR && scope->variant != FUNC_HEDR &&
-	       scope->variant != FOR_NODE && scope->variant != CDOALL_NODE &&
-	       scope->variant != PARFOR_NODE && scope->variant != PAR_NODE)
-		scope = scope->control_parent;
-	if (scope == NULL || scope->variant == GLOBAL) {
-		fprintf(stderr, "bad scope in declare_variable \n");
-		return (NULL);
-	}
-	scope->entry.Template.bl_ptr1 = make_blob (cur_file, decl_stmt,
-					   scope->entry.Template.bl_ptr1);
-	return (new_var);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
deleted file mode 100644
index e7a99b4..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.uni
+++ /dev/null
@@ -1,83 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# sage/lib/oldsrc/makefile.sgi
-
-LIBDIR = ../../../lib
-
-OLDHEADERS = ../../h
-H = ../../h
-# Directory in which include file can be found
-TOOLBOX_INCLUDE = ../include
-
-INCL = -I$(OLDHEADERS) -I../include
-
-CFLAGS = $(INCL) -c -DSYS5 -Wall
-
-EXTHDRS	= $H/bif.h $H/db.h $H/db.h $H/defs.h $H/dep.h \
-	  $H/dep_str.h $H/list.h $H/ll.h $H/sets.h $H/symb.h \
-	  $H/tag $H/vparse.h
-
-OBJS	=  anal_ind.o  db.o  db_unp.o \
-           db_unp_vpc.o   dbutils.o  garb_coll.o \
-	   glob_anal.o  ker_fun.o  list.o \
-	   make_nodes.o  mod_ref.o  ndeps.o \
-	   readnodes.o  sets.o  setutils.o \
-	   symb_alg.o  writenodes.o 
-
-SRCS = anal_ind.c db.c db_unp.c db_unp_vpc.c  dbutils.c \
-	  garb_coll.c glob_anal.c ker_fun.c list.c \
-	  make_nodes.c mod_ref.c ndeps.c readnodes.c sets.c setutils.c \
-	  symb_alg.c writenodes.c
-
-$(LIBDIR)/libdb.a: $(OBJS)
-	ar qc $(LIBDIR)/libdb.a $(OBJS)
-
-all: $(LIBDIR)/libdb.a
-	@echo "*** COMPILING LIBRARY oldsrc DONE"
-
-clean:
-	rm -f $(OBJS)
-
-cleanall:
-	rm -f $(OBJS)
-
-###
-anal_ind.o: $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h
-db.o:  $(H)/db.h $(H)/defs.h \
-	$(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-db_unp.o: $(H)/db.h  $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h
-db_unp_vpc.o:  $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/db.h $(H)/vparse.h
-dbutils.o:  $(H)/db.h \
-	$(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-garb-coll.o:  $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h
-glob_anal.o:  $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h
-ker_fun.o:  $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h \
-	$(H)/symb.h $(H)/sets.h
-list.o: $(H)/db.h  $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/list.h
-make_nodes.o: $(H)/db.h  $(H)/defs.h $(H)/tag \
-	$(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h
-mod_ref.o:  $(H)/defs.h $(H)/tag $(H)/bif.h $(H)/ll.h \
-	$(H)/symb.h $(H)/sets.h $(H)/vparse.h $(H)/db.h
-ndeps.o:  $(H)/db.h $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h
-readnodes.o: $(H)/db.h  $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/dep_str.h \
-	 $(H)/dep.h
-sets.o: $(H)/db.h  $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h
-setutils.o: $(H)/db.h  $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h
-symb_alg.o: $(H)/db.h  $(H)/defs.h $(H)/tag $(H)/bif.h \
-	$(H)/ll.h $(H)/symb.h $(H)/sets.h
-writenodes.o: $(H)/db.h $(H)/defs.h $(H)/tag \
-	$(H)/bif.h $(H)/ll.h $(H)/symb.h $(H)/sets.h $(H)/dep_str.h \
-	$(H)/dep.h
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.win
deleted file mode 100644
index 2a2f08a..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/makefile.win
+++ /dev/null
@@ -1,96 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# sage/lib/oldsrc/makefile.win
-
-
-OUTDIR = ..\..\..\obj
-LIBDIR = ..\..\..\lib
-
-OLDHEADERS = ..\..\h
-
-# Directory in which include file can be found
-TOOLBOX_INCLUDE = ../include
-
-INCL = -I$(OLDHEADERS) -I../include
-
-# -w don't issue warning now.
-#CFLAGS=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-#	/Fp"$(OUTDIR)/oldsrc.pch" /YX /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-CFLAGS=/nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-	/Fp"$(OUTDIR)/oldsrc.pch" /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-
-.c{$(OUTDIR)/}.obj:
-    $(CC) $(CFLAGS) $<
-
-LIB32=$(LINKER) -lib
-LIB32_FLAGS=/nologo /out:"$(LIBDIR)/libdb.lib" 
-
-
-EXTHDRS	= $H/bif.h $H/db.h $H/db.h $H/defs.h $H/dep.h \
-	  $H/dep_str.h $H/list.h $H/ll.h $H/sets.h $H/symb.h \
-	  $H/tag $H/vparse.h
-
-OBJS	= $(OUTDIR)/anal_ind.obj $(OUTDIR)/db.obj $(OUTDIR)/db_unp.obj \
-      $(OUTDIR)/db_unp_vpc.obj  $(OUTDIR)/dbutils.obj $(OUTDIR)/garb_coll.obj \
-	  $(OUTDIR)/glob_anal.obj $(OUTDIR)/ker_fun.obj $(OUTDIR)/list.obj \
-	  $(OUTDIR)/make_nodes.obj $(OUTDIR)/mod_ref.obj $(OUTDIR)/ndeps.obj \
-	  $(OUTDIR)/readnodes.obj $(OUTDIR)/sets.obj $(OUTDIR)/setutils.obj \
-	  $(OUTDIR)/symb_alg.obj $(OUTDIR)/writenodes.obj 
-
-SRCS = anal_ind.c db.c db_unp.c db_unp_vpc.c  dbutils.c \
-	  garb_coll.c glob_anal.c ker_fun.c list.c \
-	  make_nodes.c mod_ref.c ndeps.c readnodes.c sets.c setutils.c \
-	  symb_alg.c writenodes.c
-
-$(LIBDIR)/libdb.lib: $(OBJS)
-    $(LIB32) @<<
-	$(LIB32_FLAGS) $(OBJS)  
-<<
-
-all: $(LIBDIR)/libdb.lib
-    @echo "*** COMPILING LIBRARY oldsrc DONE"
-
-clean:
-
-cleanall:
-
-###
-anal_ind.o: $H/db.h $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-db.o:  $H/db.h $H/defs.h \
-	$H/tag $H/bif.h $H/ll.h $H/symb.h $H/sets.h
-db_unp.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-db_unp_vpc.o:  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h $H/db.h $H/vparse.h
-dbutils.o:  $H/db.h \
-	$H/defs.h $H/tag $H/bif.h $H/ll.h $H/symb.h $H/sets.h
-garb-coll.o:  $H/db.h $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-glob_anal.o:  $H/db.h $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-ker_fun.o:  $H/defs.h $H/tag $H/bif.h $H/ll.h \
-	$H/symb.h $H/sets.h
-list.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h $H/list.h
-make_nodes.o: $H/db.h  $H/defs.h $H/tag \
-	$H/bif.h $H/ll.h $H/symb.h $H/sets.h
-mod_ref.o:  $H/defs.h $H/tag $H/bif.h $H/ll.h \
-	$H/symb.h $H/sets.h $H/vparse.h $H/db.h
-ndeps.o:  $H/db.h $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-readnodes.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h $H/dep_str.h \
-	 $H/dep.h
-sets.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-setutils.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-symb_alg.o: $H/db.h  $H/defs.h $H/tag $H/bif.h \
-	$H/ll.h $H/symb.h $H/sets.h
-writenodes.o: $H/db.h $H/defs.h $H/tag \
-	$H/bif.h $H/ll.h $H/symb.h $H/sets.h $H/dep_str.h \
-	$H/dep.h
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
deleted file mode 100644
index c13bf5d..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/mod_ref.c
+++ /dev/null
@@ -1,540 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* file: mod_ref.c */
-
-/* Modified by Jenq-Kuen Lee Feb 24,1988          */
-/* The simple un-parser for VPC++                 */
-# include "db.h"
-# include "vparse.h"
-
-#define  BLOB1_NULL (PTR_BLOB1)NULL
-#define  R_VALUE     0
-#define  L_VALUE     1
-
-extern PCF UnparseBfnd[];
-extern PTR_BLOB1 chain_blob1();
-extern PTR_BLOB1 make_blob1();
-extern char *cunparse_llnd();
-extern PTR_FILE cur_file;
-
-static void ccheck_bfnd();
-static void ccheck_llnd();
-void print_out();
-void test_mod_ref();
-int is_i_code();
-
-static void ccheck_bfnd(pbf, ref_list, mod_list)
-PTR_BFND pbf;
-PTR_BLOB1 *ref_list, *mod_list;
-{
-    PTR_BLOB1 list_r, list_m;
-
-    *ref_list = BLOB1_NULL;
-    *mod_list = BLOB1_NULL;
-    if (!pbf)
-	return;
-
-    switch (pbf->variant) {
-    case GLOBAL:
-	break;
-    case PROG_HEDR:
-    case PROC_HEDR:
-	break;
-    case FUNC_HEDR:
-	break;
-    case IF_NODE:
-	ccheck_llnd(pbf->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case LOGIF_NODE:
-    case ARITHIF_NODE:
-    case WHERE_NODE:
-	break;
-    case FOR_NODE:
-	ccheck_llnd(pbf->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	ccheck_llnd(pbf->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	ccheck_llnd(pbf->entry.Template.ll_ptr3, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case FORALL_NODE:
-    case WHILE_NODE:
-	ccheck_llnd(pbf->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case ASSIGN_STAT:
-    case IDENTIFY:
-    case PROC_STAT:
-    case SAVE_DECL:
-    case CONT_STAT:
-    case FORMAT_STAT:
-	break;
-    case LABEL_STAT:
-	break;
-    case GOTO_NODE:
-	break;
-    case ASSGOTO_NODE:
-    case COMGOTO_NODE:
-    case STOP_STAT:
-	break;
-    case RETURN_STAT:
-	ccheck_llnd(pbf->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case PARAM_DECL:
-    case DIM_STAT:
-    case EQUI_STAT:
-    case DATA_DECL:
-    case READ_STAT:
-    case WRITE_STAT:
-    case OTHERIO_STAT:
-    case COMM_STAT:
-    case CONTROL_END:
-	break;
-    case CLASS_DECL:		/* New added for VPC */
-	break;
-    case ENUM_DECL:		/* New added for VPC */
-    case UNION_DECL:		/* New added for VPC */
-    case STRUCT_DECL:		/* New added for VPC */
-	break;
-    case DERIVED_CLASS_DECL:	/* Need More for VPC */
-    case VAR_DECL:
-	break;
-    case EXPR_STMT_NODE:	/* New added for VPC */
-	ccheck_llnd(pbf->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case DO_WHILE_NODE:		/* New added for VPC */
-	/* Need study        */
-	break;
-    case SWITCH_NODE:		/* New added for VPC */
-	ccheck_llnd(pbf->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case CASE_NODE:		/* New added for VPC */
-	ccheck_llnd(pbf->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case DEFAULT_NODE:		/* New added for VPC */
-	break;
-    case BASIC_BLOCK:
-	break;
-    case BREAK_NODE:		/* New added for VPC */
-	break;
-    case CONTINUE_NODE:		/* New added for VPC */
-	break;
-    case RETURN_NODE:		/* New added for VPC */
-	ccheck_llnd(pbf->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case ASM_NODE:		/* New added for VPC */
-	break;			/* Need More         */
-    case SPAWN_NODE:		/* New added for CC++ */
-	break;
-    case PARFOR_NODE:		/* New added for CC++ */
-	ccheck_llnd(pbf->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case PAR_NODE:		/* New added for CC++ */
-	break;
-    default:
-	fprintf(stderr, "bad bfnd case\n");
-	break;			/* don't know what to do at this point */
-    }
-}
-
-
-static void ccheck_llnd(pllnd, ref_list, mod_list, type)
-PTR_LLND pllnd;
-PTR_BLOB1 *ref_list, *mod_list;
-int type;
-{
-    PTR_BLOB1 list_r, list_m;
-
-    *ref_list = (PTR_BLOB1) NULL;
-    *mod_list = (PTR_BLOB1) NULL;
-    if (pllnd == NULL)
-	return;
-
-    switch (pllnd->variant) {
-    case INT_VAL:
-    case STMT_STR:
-    case FLOAT_VAL:
-    case DOUBLE_VAL:
-    case STRING_VAL:
-    case BOOL_VAL:
-    case CHAR_VAL:
-	break;
-    case CONST_REF:
-    case ENUM_REF:
-	break;
-    case VAR_REF:
-	if (type == L_VALUE) {
-	    *ref_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	    *mod_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	}
-	else {
-	    *ref_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	    *mod_list = (PTR_BLOB1) NULL;
-	}
-	break;
-    case POINTST_OP:		/* New added for VPC */
-    case RECORD_REF:		/* Need More */
-	if (type == L_VALUE) {
-	    *ref_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	    *mod_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	}
-	else {
-	    *ref_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	    *mod_list = (PTR_BLOB1) NULL;
-	}
-	/* Need more */
-	break;
-    case ARRAY_OP:
-	*ref_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	if (type == L_VALUE)
-	    *mod_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	else
-	    *mod_list = BLOB1_NULL;
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case ARRAY_REF:
-	*ref_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	if (type == L_VALUE)
-	    *mod_list = make_blob1(IsObj, pllnd, (PTR_BLOB1) NULL);
-	else
-	    *mod_list = BLOB1_NULL;
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case CONSTRUCTOR_REF:
-	break;
-    case ACCESS_REF:
-	break;
-    case CONS:
-	break;
-    case ACCESS:
-	break;
-    case IOACCESS:
-	break;
-    case PROC_CALL:
-    case FUNC_CALL:
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case EXPR_LIST:
-	if (type == R_VALUE) {
-	    ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	    *ref_list = list_r;
-	    *mod_list = list_m;
-	    ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	    *ref_list = chain_blob1(*ref_list, list_r);
-	    *mod_list = chain_blob1(*mod_list, list_m);
-	}
-	else {
-	    if (pllnd->entry.Template.ll_ptr2) {
-		ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-		*ref_list = list_r;
-		*mod_list = list_m;
-		ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, L_VALUE);
-		*ref_list = chain_blob1(*ref_list, list_r);
-		*mod_list = chain_blob1(*mod_list, list_m);
-	    }
-	    else {
-		ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, L_VALUE);
-		*ref_list = list_r;
-		*mod_list = list_m;
-	    }
-	}
-	break;
-    case EQUI_LIST:
-	break;
-    case COMM_LIST:
-	break;
-    case VAR_LIST:
-    case CONTROL_LIST:
-	break;
-    case RANGE_LIST:
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case DDOT:
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case COPY_NODE:
-	break;
-    case VECTOR_CONST:		/* NEW ADDED FOR VPC++  */
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case INIT_LIST:
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case BIT_NUMBER:
-	break;
-    case DEF_CHOICE:
-    case SEQ:
-	break;
-    case SPEC_PAIR:
-	break;
-    case MOD_OP:
-	break;
-
-    case ASSGN_OP:		/* New added for VPC */
-    case ARITH_ASSGN_OP:	/* New added for VPC */
-    case PLUS_ASSGN_OP:
-    case MINUS_ASSGN_OP:
-    case AND_ASSGN_OP:
-    case IOR_ASSGN_OP:
-    case MULT_ASSGN_OP:
-    case DIV_ASSGN_OP:
-    case MOD_ASSGN_OP:
-    case XOR_ASSGN_OP:
-    case LSHIFT_ASSGN_OP:
-    case RSHIFT_ASSGN_OP:
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, L_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case EQ_OP:
-    case LT_OP:
-    case GT_OP:
-    case NOTEQL_OP:
-    case LTEQL_OP:
-    case GTEQL_OP:
-    case ADD_OP:
-    case SUBT_OP:
-    case OR_OP:
-    case MULT_OP:
-    case DIV_OP:
-    case AND_OP:
-    case EXP_OP:
-    case LE_OP:			/* New added for VPC *//* Duplicated */
-    case GE_OP:			/* New added for VPC *//* Duplicated */
-    case NE_OP:			/* New added for VPC *//* Duplicated */
-    case BITAND_OP:		/* New added for VPC */
-    case BITOR_OP:		/* New added for VPC */
-    case LSHIFT_OP:		/* New added for VPC */
-    case RSHIFT_OP:		/* New added for VPC */
-    case NEW_OP:
-    case DELETE_OP:
-    case THIS_NODE:
-    case SCOPE_OP:
-    case INTEGER_DIV_OP:	/* New added for VPC */
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case ADDRESS_OP:		/* New added for VPC */
-    case SIZE_OP:		/* New added for VPC */
-	break;
-    case DEREF_OP:
-	break;
-    case SUB_OP:		/* duplicated unary minus  */
-    case MINUS_OP:		/* unary operations */
-    case UNARY_ADD_OP:		/* New added for VPC */
-    case BIT_COMPLEMENT_OP:	/* New added for VPC */
-    case NOT_OP:
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	break;
-    case MINUSMINUS_OP:		/* New added for VPC */
-    case PLUSPLUS_OP:		/* New added for VPC */
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, L_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, L_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case STAR_RANGE:
-	break;
-    case CLASSINIT_OP:		/* New added for VPC */
-	break;
-    case CAST_OP:		/* New added for VPC */
-	break;
-    case FUNCTION_OP:
-    case EXPR_IF:		/* New added for VPC */
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case EXPR_IF_BODY:		/* New added for VPC */
-	ccheck_llnd(pllnd->entry.Template.ll_ptr1, &list_r, &list_m, R_VALUE);
-	*ref_list = list_r;
-	*mod_list = list_m;
-	ccheck_llnd(pllnd->entry.Template.ll_ptr2, &list_r, &list_m, R_VALUE);
-	*ref_list = chain_blob1(*ref_list, list_r);
-	*mod_list = chain_blob1(*mod_list, list_m);
-	break;
-    case FUNCTION_REF:		/* New added for VPC */
-	break;
-    case LABEL_REF:		/* Fortran Version, For VPC we need more */
-	break;
-
-    default:
-	fprintf(stderr, "ccheck_llnd -- bad llnd ptr %d!\n", pllnd->variant);
-	break;
-    }
-}
-
-
-/*  Very important routine to see a given bif node of a function is
- *  local-variable declaration or argument declaration
- *   return   1 ---TRUE
- *            0    False
- */
-int is_param_decl_interface(var_bf, functor)
-PTR_BFND var_bf;
-PTR_SYMB functor;
-{
-    PTR_LLND flow_ptr, lpr;
-    PTR_SYMB s;
-
-    switch (var_bf->variant) {
-    case VAR_DECL:
-    case ENUM_DECL:
-    case CLASS_DECL:
-    case UNION_DECL:
-    case STRUCT_DECL:
-    case DERIVED_CLASS_DECL:
-	lpr = var_bf->entry.Template.ll_ptr1;
-	for (flow_ptr = lpr; flow_ptr; flow_ptr=flow_ptr->entry.Template.ll_ptr1) {
-	    if ((flow_ptr->variant == VAR_REF) ||
-		(flow_ptr->variant == ARRAY_REF) ||
-		(flow_ptr->variant == FUNCTION_REF))
-		break;
-	}
-	if (!flow_ptr) {
-	   return 0;
-	}
-
-	for (s = functor->entry.member_func.in_list; s;) {
-	    if (flow_ptr->entry.Template.symbol == s)
-		return (1);
-	    s = s->entry.var_decl.next_in;
-	}
-	return (0);
-
-    default:
-	return (0);
-    }
-
-}
-
-
-PTR_BLOB1 chain_blob1(b1, b2)
-PTR_BLOB1 b1, b2;
-{
-    PTR_BLOB1 oldptr, temptr;
-
-    if (!b1)
-	return (b2);
-    if (!b2)
-	return (b1);
-    for (oldptr = temptr = b1; temptr; temptr = temptr->next)
-	oldptr = temptr;
-
-    oldptr->next = b2;
-    return (b1);
-}
-
-
-/* -------------------------------------------------------------------*/
-/* The following code for testing ccheck_bfnd and ccheck_llnd         */
-void print_out(list, type)
-PTR_BLOB1 list;
-int type;
-{
-    PTR_BLOB1 b;
-    char *source_ptr;
-
-    if (!list)
-	return;
-    if (type == R_VALUE)
-	fprintf(stderr, "------ reference ---------------------------------------------\n");
-    else
-	fprintf(stderr, "------ modified ---------------------------------------------\n");
-    for (b = list; b; b = b->next) {
-	source_ptr = (UnparseBfnd[cur_file->lang])(b->ref);
-	fprintf(stderr, "%s\n", source_ptr);
-    }
-
-}
-
-void test_mod_ref(pbf)
-PTR_BFND pbf;
-{
-    PTR_BLOB b;
-    PTR_BLOB1 list_r, list_m;
-
-    if (!pbf)
-	return;
-    ccheck_bfnd(pbf, &list_r, &list_m);
-
-    if (is_i_code(pbf)) {
-	for (b = pbf->entry.Template.bl_ptr1; b; b = b->next)
-	    test_mod_ref(b->ref);
-	for (b = pbf->entry.Template.bl_ptr2; b; b = b->next)
-	    test_mod_ref(b->ref);
-    }
-
-}
-
-int is_i_code(pbf)
-PTR_BFND pbf;
-{
-    switch (pbf->variant) {
-    case ENUM_DECL:
-    case STRUCT_DECL:
-    case UNION_DECL:
-	return (0);
-    default:
-	return (1);
-    }
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ndeps.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
deleted file mode 100644
index 8bf3201..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/ndeps.c
+++ /dev/null
@@ -1,1076 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#include <stdlib.h>
-#include <stdio.h>
-#include "db.h"
-   
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
- 
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-static PTR_BFND current_par_loop = NULL;
-static char *depstrs[] = { "flow","anti","output","huh??","got me?"};
-static char *dirstrs[] = { "  ", "= ", "- ", "0-", "+ ", "0+", ". ", "+-"};
-extern PCF UnparseBfnd[];
-extern PCF UnparseLlnd[];
-
-extern PTR_FILE cur_file;
-
-/* Forward definitions */
-static PTR_BLOB1 Nsearch_deps();
-static void subtract_list();
-static int same_loop();
-void search_and_replace_call();
-
-extern void normal_form();
-extern int identical();
-
-PTR_LLND search_call(ll, s)
-PTR_LLND ll;
-PTR_SYMB *s;
-{
-   PTR_LLND t;
-   *s = NULL;
-   if(ll == NULL) return(NULL);
-   if(ll->variant == FUNC_CALL){
-      *s = ll->entry.Template.symbol;
-      return(ll->entry.Template.ll_ptr1);
-   }
-   else{
-      t = search_call(ll->entry.Template.ll_ptr1,s);
-      if(t != NULL) return(t);
-      return(search_call(ll->entry.Template.ll_ptr2,s));
-   }
-}
-
-PTR_REFL build_refl(b,s)
-PTR_BFND b;
-PTR_LLND s;
-{
-   PTR_REFL p,h,l,alloc_ref();
-   h = NULL; l = NULL;
-   while(s!= NULL){
-      p = alloc_ref(b,s->entry.Template.ll_ptr1);
-      if(p != NULL){
-	 if(h == NULL){ h = p;}
-	 if(l != NULL) l->next = p;
-	 l = p;
-      }
-      s = s->entry.Template.ll_ptr2;
-   }
-   return(h);
-}
-
-/* find loop bounds takes a bif pointer b and addresses of */
-/* three other pointers low, hi, inc and computes loop bounds */
-/* and returns 1 if it succeds in finding these in terms of */
-/* constants, parameters and external varaibles and returns */
-/* 0 if it failed. */
-int find_loop_bounds(b,low,hi,inc)
-PTR_BFND b;
-PTR_LLND *low, *hi, *inc;
-{return (0);}
-
-/* bind call site info will take a pointer to a call statement and */
-/* return a expression list of the used and modified sets in terms */
-/* of the actual parameters. */
-void bind_call_site_info(b, used, modified)
-PTR_BFND b;
-PTR_LLND *used, *modified;
-{
-   PTR_LLND funargs, formal_used, formal_modified;
-   PTR_SYMB fun, s,formal_args[50];
-   PTR_BFND fun_bif;
-   /* PTR_BLOB bl; */
-   PTR_LLND  u, m, explst;
-   int i, num_formal_args;
-   PTR_LLND called_with[50];
-   PTR_LLND copy_llnd();
-   PTR_BFND find_fun_by_name();
-   int fun_found ;
-    
-   *used = NULL; *modified = NULL; fun = NULL; fun_found = 0;
-   formal_used = NULL; formal_modified = NULL;
-   formal_args[0] = NULL; num_formal_args = 0;;
-   if(b == NULL) return;
-   if(b->variant == PROC_STAT){
-      funargs = b->entry.Template.ll_ptr1;
-      fun = b->entry.Template.symbol;
-   }
-   else  if(b->variant == ASSIGN_STAT){
-      funargs = search_call(b->entry.Template.ll_ptr2,&fun);
-   }
-   else  if(b->variant == EXPR_STMT_NODE){
-      funargs = search_call(b->entry.Template.ll_ptr1,&fun);
-   }
-   /* if(fun != NULL)
-	fprintf(stderr, "funargs = %s\n",
-			(UnparseBfnd[cur_file->lang])(funargs)); */
-   else {
-      fprintf(stderr, "serch_call error. node is %s",
-		      (UnparseBfnd[cur_file->lang])(b));
-      fprintf(stderr, "node type is %d\n",b->variant);
-      return;
-   }
-   if(fun == NULL) return;
-   if(funargs == NULL) return;
-   fun_bif = find_fun_by_name(fun->ident); /*no longer need loop search*/
-   if(fun_bif == NULL){
-	fprintf(stderr, "find fun_by_name failed %s\n",fun->ident);
-	return;
-	}
-   else if (strcmp(fun_bif->entry.Template.symbol->ident,fun->ident)){
-	fprintf(stderr, "find fun by name returned wrong fun\n");
-	return;
-	}
-   if(fun_bif->variant == PROC_HEDR || fun_bif->variant == FUNC_HEDR){
-	 if(!strcmp(fun_bif->entry.Template.symbol->ident,fun->ident)){
-	    fun_found = 1;
-	    s = fun_bif->entry.Template.symbol;
-	    s = s->entry.proc_decl.in_list;
-	    while(s != NULL){ /* gather formal args in formal_args */
-	       formal_args[num_formal_args++] = s;
-	       s = s->entry.var_decl.next_in;
-	    }
-	    explst = fun_bif->entry.Template.ll_ptr3;
-	    if(explst == NULL) return;
-	    if(explst->entry.Template.ll_ptr2 == NULL){
-	       /* only first pass analysis done */
-	       formal_used = explst->entry.Template.ll_ptr1; /* bif graph */
-	    }
-	    else
-	       formal_used = explst->entry.Template.ll_ptr2;
-	    explst = fun_bif->entry.Template.ll_ptr2;
-	    if(explst == NULL) return;
-	    if(explst->entry.Template.ll_ptr2 == NULL){
-	       /* only first pass analysis done */
-	       formal_modified = explst->entry.Template.ll_ptr1; /* bif graph*/
-	    }
-	    else
-	       formal_modified = explst->entry.Template.ll_ptr2;
-	 }
-      }
-   if(fun_found == 0){
-	fprintf(stderr, "could not locate source for function %s\n",fun->ident);
-	return;
-	}
-   if(num_formal_args == 0) return;
-   u = copy_llnd(formal_used);
-   m = copy_llnd(formal_modified);
-   for(i = 0; i < num_formal_args; i++){ /* gather actual args in called_with*/
-     if(funargs == NULL){
-       printf("ERROR: function not called with enough arguments\n");
-       exit(0);
-     }
-      called_with[i] = copy_llnd(funargs->entry.Template.ll_ptr1);
-      funargs = funargs->entry.Template.ll_ptr2;
-   }
-   search_and_replace_call(&u,num_formal_args,formal_args,called_with);
-   search_and_replace_call(&m,num_formal_args,formal_args,called_with);
-   *used = u;
-   *modified = m;
-   /*
-     fprintf(stderr, "formal_used are:\n");
-     fprintf(stderr, "%s",UnparseLlnd[cur_file->lang](formal_used));
-     fprintf(stderr, "actual used are:\n");
-     fprintf(stderr, "%s",UnparseLlnd[cur_file->lang](u));
-     fprintf(stderr, "formal_modified are:\n");
-     fprintf(stderr, "%s",UnparseLlnd[cur_file->lang](formal_modified));
-     fprintf(stderr, "actual modified are:\n");
-     fprintf(stderr, "%s",UnparseLlnd[cur_file->lang](m));
-     fprintf(stderr, "called with:\n");
-     for(i = 0; i < num_formal_args; i++)
-	fprintf(stderr, " %s,",UnparseLlnd[cur_file->lang](called_with[i]));
-     fprintf(stderr, "\n");
-     if(formal_args[0] == NULL) return;
-     fprintf(stderr, "formal args are:\n");
-     for(i = 0; i < num_formal_args; i++)
-	fprintf(stderr, " %s,",formal_args[i]->ident);
-     fprintf(stderr, "\n");
-     */
-}
-
-int get_fargs_index(s,n,fargs)
-PTR_SYMB s;
-int n;
-PTR_SYMB fargs[];
-{
-   int i;
-   for(i = 0; i < n; i++) 
-      if(fargs[i] == s) return(i);
-   return(-1);
-}
-
-void add_offset(offset,term)
-PTR_LLND offset, *term;
-{
-   PTR_LLND p,q,r, make_llnd(), copy_llnd();
-   if(offset == NULL){
-	fprintf(stderr, "bad offset in add_offset\n");
-	return;
-	}
-   if(term == NULL){
-	fprintf(stderr, "badd term in add_offset\n");
-	return;
-	}
-   if(*term == NULL){
-	fprintf(stderr, " null term in add_offset\n");
-	}
-   if(*term == NULL || (
-	offset->variant == DDOT && *term != NULL && (*term)->variant == DDOT)){
-      q = make_llnd(cur_file, STAR_RANGE,NULL,NULL,NULL);
-      *term = q;
-   }
-   else if((*term)->variant == STAR_RANGE){
-      /* term is of the form x[:] and no offset will help */
-   }
-   else if(offset->variant == STAR_RANGE){ /* MANNHO add 9/10 */
-      *term = offset;
-   }
-   else if((*term)->variant == DDOT){
-      PTR_LLND offset1, offset2;
-      offset1 = copy_llnd(offset);
-      p = (*term)->entry.Template.ll_ptr1;
-      q = make_llnd(cur_file, ADD_OP,p,offset1,NULL);
-      /* MANNHO delete
-	 if(cur_file->lang == ForSrc){
-	    p = make_llnd(cur_file, INT_VAL,NULL,NULL,NULL);
-	    p->entry.ival = 1;
-	    q = make_llnd(cur_file, SUBT_OP,q,p,NULL);
-	 }
-	 */
-      normal_form(&q); /* normal_form(&q); */
-      (*term)->entry.Template.ll_ptr1 = q;
-      p = (*term)->entry.Template.ll_ptr2;
-      offset2 = copy_llnd(offset);
-      q = make_llnd(cur_file, ADD_OP,p,offset2,NULL);
-      /* MANNHO delete
-	 if(cur_file->lang == ForSrc){
-		p = make_llnd(cur_file, INT_VAL,NULL,NULL,NULL);
-		p->entry.ival = 1;
-		q = make_llnd(cur_file, SUBT_OP,q,p,NULL);
-		}
-		*/
-      /* normal_form(&q); */
-      normal_form(&q); 
-      (*term)->entry.Template.ll_ptr2 = q;
-   }
-   else if(offset->variant == DDOT){
-      r = copy_llnd(*term);
-      offset = copy_llnd(offset);
-      p = offset->entry.Template.ll_ptr1;
-      q = make_llnd(cur_file, ADD_OP,p,r,NULL);
-      offset->entry.Template.ll_ptr1 = q;
-      p = offset->entry.Template.ll_ptr2;
-      q = make_llnd(cur_file, ADD_OP,p,r,NULL);
-      offset->entry.Template.ll_ptr2 = q;
-      *term = offset;
-   }
-   else{
-      offset = copy_llnd(offset);
-      q = make_llnd(cur_file, ADD_OP,*term,offset,NULL);
-      *term = q;
-   }
-}
-
-PTR_LLND get_array_dim_decl(AR) /* MANNHO add */
-	 PTR_LLND AR; /* ARRAY_REF */
-{
-   PTR_LLND RL, R_L = NULL, ll0, ll1;
-   PTR_TYPE TY;
-   PTR_LLND copy_llnd(), make_llnd();
-
-   TY = AR->entry.Template.symbol->type;
-   switch (TY->variant) {
-   case T_ARRAY : /* MANNHO mod */
-      R_L = TY->entry.ar_decl.ranges;
-      if (R_L->variant != EXPR_LIST) R_L = R_L->entry.Template.ll_ptr1;
-      break;
-   case T_POINTER :
-      R_L = NULL;
-      break;
-   }
-
-   if (R_L == NULL) return(NULL);
-
-   RL = R_L = copy_llnd(R_L);
-   while (RL) {
-      ll1 = RL->entry.Template.ll_ptr1;
-      if (ll1->variant != DDOT) {
-	 if (cur_file->lang == ForSrc)
-	    ll0 = make_llnd(cur_file, INT_VAL, NULL, NULL, 1);
-	 else
-	    ll0 = make_llnd(cur_file, INT_VAL, NULL, NULL, 0);
-	 RL->entry.Template.ll_ptr1 = make_llnd(cur_file, DDOT, ll0, ll1, NULL);
-      }
-      RL = RL->entry.Template.ll_ptr2;
-   }
-   return (R_L);
-}
-
-/* u is a reference to an expression describing the result of an action */
-/* by a call to the function.  fargs is the associated set of formal	*/
-/* formal parameters.  call is the actual values passed to the formal	*/
-/* parameter.  search_and_replace modifies u so that it reflects the	*/
-/* the action in terms of the actual parameters.			*/
-void search_and_replace_call(u,n,fargs,call)
-PTR_LLND *u;
-int n;
-PTR_SYMB fargs[];
-PTR_LLND call[];
-{
-   int i;
-   PTR_LLND v,index,a,b, b1, b2;
-   PTR_LLND make_llnd(), copy_llnd(), linearize_array_range();
-   PTR_LLND get_array_dim_decl();
-   
-   if (*u == NULL) return ;
-   /* *u is the result of the call in terms of the formal params */
-   switch((*u)->variant){
-   case VAR_REF:
-      /* find the position of *u in the parameter list */  
-      i = get_fargs_index((*u)->entry.Template.symbol,n,fargs);
-      if (i<0) return ;
-      if(call[i]->variant == ADDRESS_OP) v = call[i]->entry.Template.ll_ptr1;
-      else v = call[i];
-      *u = copy_llnd(v);
-      break;
-   case ARRAY_REF:
-      i = get_fargs_index((*u)->entry.Template.symbol,n,fargs);
-      if(i < 0) return ;
-      v = call[i];  /* v is the expression that is passed in position i */
-      if(v->variant == VAR_REF){
-	 (*u)->entry.Template.symbol = v->entry.Template.symbol;
-	 search_and_replace_call(&((*u)->entry.Template.ll_ptr1),
-				 n,fargs,call);
-	 search_and_replace_call(&((*u)->entry.Template.ll_ptr2),
-				 n,fargs,call);
-      }
-      else if(cur_file->lang != ForSrc && v->variant == ARRAY_REF){
-	 /* if v has dim 1 greater than *u */
-	 index = (*u)->entry.Template.ll_ptr1;
-	 (*u)->entry.Template.symbol = v->entry.Template.symbol;
-	 search_and_replace_call(&index,n,fargs,call);
-	 index = v->entry.Template.ll_ptr1;
-	 while(index->entry.Template.ll_ptr2 != NULL)
-	    index = index->entry.Template.ll_ptr2;
-	 index->entry.Template.ll_ptr2 = (*u)->entry.Template.ll_ptr1;
-	 (*u)->entry.Template.ll_ptr1 = v->entry.Template.ll_ptr1;
-      }
-      else if(v->variant == ADDRESS_OP){
-	 /* something like &(x[i]) */
-	 a = v->entry.Template.ll_ptr1; /* the x[i] part */
-	 if(a->variant == EXPR_LIST) a = a->entry.Template.ll_ptr1;
-	 (*u)->entry.Template.symbol=a->entry.Template.symbol;	
-	 if(a->variant == VAR_REF ){
-	    search_and_replace_call(&((*u)->entry.Template.ll_ptr1),
-				    n,fargs,call);
-	 }
-	 else if(a->variant == ARRAY_REF){
-	    PTR_LLND second_index;
-	    /* we are adding the offset from &(x[i]) to y[10:2] */
-	    /* u is a *pointer to the summary data and a is a pointer to */
-	    /* the actual argument.  make u look like a  */ 
-	    search_and_replace_call(&((*u)->entry.Template.ll_ptr1),
-				    n,fargs,call);
-	    b = (*u)->entry.Template.ll_ptr1; /* range list */
-	    index = a->entry.Template.ll_ptr1; /*range list */
-	    if(index != NULL) second_index = index->entry.Template.ll_ptr2;
-	    else second_index = NULL;
-	    if(index == NULL){
-	    }
-	    else if(b == NULL){
-	       (*u)->entry.Template.ll_ptr1 = copy_llnd(index);
-	    }	
-	    else {
-	       b1 = b->entry.Template.ll_ptr1;
-	       b2 = b->entry.Template.ll_ptr2;
-	       b->entry.Template.ll_ptr1 =
-		  copy_llnd(index->entry.Template.ll_ptr1);
-	       b->entry.Template.ll_ptr2 = copy_llnd(second_index);
-	       while (b->entry.Template.ll_ptr2 != NULL)
-		  b = b->entry.Template.ll_ptr2;
-	       add_offset(b1, &(b->entry.Template.ll_ptr1));
-	       b->entry.Template.ll_ptr2 = b2;
-	    }
-	 }
-	 else fprintf(stderr, "a variant is %d\n",a->variant);
-      }
-      else if (cur_file->lang == ForSrc && v->variant == ARRAY_REF) {
-	 /* u is a *pointer to a copy of the summary data and v points to */
-	 /* the passed argument.  make u look like v. */
-	 int udim, adim;
-	 a = v;
-	 if(a->variant == EXPR_LIST) a = a->entry.Template.ll_ptr1;
-	 if(a->variant == VAR_REF ){
-	    (*u)->entry.Template.symbol=a->entry.Template.symbol;
-	    /* u now has the symbol of v, now do the substitution on the subscripts */
-	    search_and_replace_call(&((*u)->entry.Template.ll_ptr1),
-				    n,fargs,call);
-	 }
-	 else if(a->variant == ARRAY_REF){
-	    PTR_LLND size,ls,rs,adec;
-	    /* we are adding the offset from &(a[i]) to u[10:2] */
-	    /* u is a *pointer to the summary data and a is a pointer to */
-	    /* the actual argument.  make u look like a. first fix the index */
-	    /* terms in u */
-	    search_and_replace_call(&((*u)->entry.Template.ll_ptr1),
-				    n,fargs,call);
-	    /* next get the dimensions of these array references. */
-	    /* let b be the index expression range list for *u.  */
-	    udim = (*u)->entry.Template.symbol->type->entry.ar_decl.num_dimensions;
-	    adim =    a->entry.Template.symbol->type->entry.ar_decl.num_dimensions;
-	    size = get_array_dim_decl(*u); /* MANNHO mod */
-	    adec = get_array_dim_decl(a);
-	    if(adec->variant == EXPR_LIST || adec->variant == RANGE_LIST) adec = adec->entry.Template.ll_ptr1;
-	    
-	    search_and_replace_call(&size,n,fargs,call);
-	    (*u)->entry.Template.symbol=a->entry.Template.symbol;  
-	    /* we now must linearize the segments described by *u and */
-	    /* then add the offset provided by a */
-	    b = (*u)->entry.Template.ll_ptr1; /* range list */
-	    index = a->entry.Template.ll_ptr1; /*range list */
-	    if(index == NULL && udim == adim){
-			/* *u already has the correct form */
-		}
-	    else if(index == NULL && adim < udim){
-			/* if adim = 1 and udim is bigger */
-			b = linearize_array_range(b,udim,size);
-			ls = b->entry.Template.ll_ptr1->entry.Template.ll_ptr1;
-			rs = b->entry.Template.ll_ptr1->entry.Template.ll_ptr2;
-			add_offset(adec->entry.Template.ll_ptr1,
-			     &(b->entry.Template.ll_ptr1));
-			b->entry.Template.ll_ptr2 = NULL;
-			/* fprintf(stderr," %s ",UnparseLlnd[cur_file->lang](b)); */
-		}
-	    else if(b == NULL){
-			(*u)->entry.Template.ll_ptr1 = copy_llnd(index);
-			}      
-	    else if(index == NULL && adim > udim){
-			int ii;
-			PTR_LLND c;
-			c = make_llnd(cur_file, INT_VAL,NULL,NULL,NULL);
-			c->entry.ival = 1;
-			for(ii = 0; ii < (adim-udim); ii++){
-				b->entry.Template.ll_ptr2 =
-					make_llnd(cur_file, EXPR_LIST,copy_llnd(c),NULL,NULL);
-				b = b->entry.Template.ll_ptr2;
-				}
-			b->entry.Template.ll_ptr2 = NULL;
-			}
-	    else {
-			b = linearize_array_range(b,udim,size);
-			add_offset(index->entry.Template.ll_ptr1,
-			     &(b->entry.Template.ll_ptr1));
-			if(index->entry.Template.ll_ptr2 == NULL) b->entry.Template.ll_ptr2 = NULL;
-			else{
-			     if(index->entry.Template.ll_ptr2 !=NULL &&
-				index->entry.Template.ll_ptr2->variant != EXPR_LIST)
-				 b->entry.Template.ll_ptr2 = 
-				make_llnd(cur_file, EXPR_LIST,index->entry.Template.ll_ptr2,NULL,NULL);
-			     else b->entry.Template.ll_ptr2 = index->entry.Template.ll_ptr2;
-			     }
-			
-			}
-	 }
-	 else fprintf(stderr, "a variant is %d\n",a->variant);
-      }
-      else{  /* something like p+3  for a pointer p */
-	 fprintf(stderr, "a strange pointer case in ser. and repl.\n");
-      }
-      break;
-   default:  /* an expression */
-      search_and_replace_call(&((*u)->entry.Template.ll_ptr1),
-			      n,fargs,call);
-      search_and_replace_call(&((*u)->entry.Template.ll_ptr2),
-			      n,fargs,call);;
-   }
-}
-
-/* MANNHO delete whole this procedure
-PTR_LLND get_leading_arr_dim(s)
-PTR_SYMB s;
-{
-	PTR_LLND x, copy_llnd();
-	x = s->type->entry.ar_decl.ranges;
-	if(x->variant == ARRAY_REF) x = x->entry.Template.ll_ptr1;
-	if(x->variant == EXPR_LIST) x = x->entry.Template.ll_ptr1;
-	return(copy_llnd(x));
-}
-*/
-
-void make_zero_base(ref, decl) /* MANNHO add */
-PTR_LLND ref, decl;
-{
-	PTR_LLND ref_index, ref_low, ref_up, decl_low, dlow;
-        PTR_LLND make_llnd(), copy_llnd();
-
-	while (ref) {
-		ref_index = ref->entry.Template.ll_ptr1;
-		decl_low =decl->entry.Template.ll_ptr1->entry.Template.ll_ptr1;
-
-		if (ref_index->variant == DDOT) {
-			ref_low = ref_index->entry.Template.ll_ptr1;
-			ref_up	= ref_index->entry.Template.ll_ptr2;
-		   if(ref_low != NULL && decl_low != NULL){
-			dlow = copy_llnd(decl_low);
-			ref_low = make_llnd(cur_file, SUBT_OP, ref_low, dlow, NULL);
-		      }
-		   if(ref_up != NULL && decl_low != NULL){
-			dlow = copy_llnd(decl_low);
-			ref_up	= make_llnd(cur_file, SUBT_OP, ref_up,	dlow, NULL);
-		      }
-			ref_index->entry.Template.ll_ptr1 = ref_low;
-			ref_index->entry.Template.ll_ptr2 = ref_up;
-		    }
-		 else if(decl_low != NULL && ref_index->variant != STAR_RANGE){
-			dlow = copy_llnd(decl_low);
-			ref_index = make_llnd(cur_file, SUBT_OP, ref_index, dlow, NULL);
-			ref->entry.Template.ll_ptr1 = ref_index;
-		}
-
-		ref  =	ref->entry.Template.ll_ptr2;
-		decl = decl->entry.Template.ll_ptr2;
-	}
-}
-
-/* linearize_array_range takes a range list and returns a range */
-/* list consiting of a 1-D ddot discription of the range	*/
-PTR_LLND linearize_array_range(rl,dim,size) /* MANNHO mod */
-PTR_LLND rl; /* a range list of expressions and ddots */
-int dim;
-PTR_LLND size; /* size is the declared dimension of the parameter */
-{
-	PTR_LLND RL, sz1, s;
-	PTR_LLND size_upto, size_up, addend, low, up, one;
-	PTR_LLND index, index_low, index_up;
-	int shift_needed;
-        PTR_LLND make_llnd(), copy_llnd();
-
-	make_zero_base(rl, size);
-	s = size; shift_needed = 0;
-	while(s != NULL){
-	    sz1 = s->entry.Template.ll_ptr1;
-	    if(sz1->entry.Template.ll_ptr1 != NULL &&
-	      (( sz1->entry.Template.ll_ptr1->variant != CONST_REF && 
-		 sz1->entry.Template.ll_ptr1->variant != INT_VAL)  ||
-	       sz1->entry.Template.ll_ptr1->entry.ival != 1)){
-	             printf(" ival is %d\n",sz1->entry.Template.ll_ptr1->entry.ival);
-	             shift_needed = 1;
-		   }
-	    s = s->entry.Template.ll_ptr2;
-	  }
-	s = copy_llnd(size);
-	make_zero_base(size, s); 
-	if(shift_needed) s = copy_llnd(size);
-	/*
-	fprintf(stderr, " rl = %s",UnparseLlnd[cur_file->lang](rl));
-	fprintf(stderr, " size = %s",UnparseLlnd[cur_file->lang](size));
-	*/
-	size_upto = NULL; low = NULL; up = NULL;
-	RL = rl;
-	while (RL) {
-		index = RL->entry.Template.ll_ptr1;
-		sz1 = size->entry.Template.ll_ptr1;
-		if (index->variant == DDOT) {
-			index_low = index->entry.Template.ll_ptr1;
-			index_up  = index->entry.Template.ll_ptr2;
-		} else {
-			index_low = index;
-			index_up  = copy_llnd(index);
-		}
-		if(index->variant == STAR_RANGE){
-			index->variant = DDOT;
-			index_low = sz1->entry.Template.ll_ptr1;
-			index_up = sz1->entry.Template.ll_ptr2;
-			}
-		if (low == NULL) { /* 1st index */
-			low = index_low;
-			up  = index_up;
-			}
-		else {
-			if(low != NULL && size_upto != NULL){
-			    addend = make_llnd(cur_file, MULT_OP, copy_llnd(size_upto),
-					   index_low, NULL);
-			    low = make_llnd(cur_file, ADD_OP, low, addend, NULL);
-			    }
-			if(up != NULL && size_upto != NULL){
-			   addend = make_llnd(cur_file, MULT_OP, copy_llnd(size_upto),
-					   index_up, NULL);
-			   up  = make_llnd(cur_file, ADD_OP, up,  addend, NULL);
-			   }
-		}
-		size_up = s->entry.Template.ll_ptr1->entry.Template.ll_ptr2;
-		if(shift_needed){
-		  one = make_llnd(cur_file, INT_VAL, NULL, NULL, 1);
-		  size_up = make_llnd(cur_file, ADD_OP, size_up, one, NULL);
-		}
-		size_upto = (size_upto == NULL) ?
-				size_up :
-				make_llnd(cur_file, MULT_OP, size_upto, size_up, NULL);
-		size = size->entry.Template.ll_ptr2;
-		s = s->entry.Template.ll_ptr2;
-		RL   =	 RL->entry.Template.ll_ptr2;
-	}
-	if (low == NULL && up == NULL){
-		RL = make_llnd(cur_file,STAR_RANGE,NULL, NULL, NULL);
-		}
-	else if (identical(low, up)) {
-		RL = low;
-		/* free_ll_tree(up); */
-	} else {
-		RL = make_llnd(cur_file, DDOT, low, up, NULL);
-	}
-	rl->entry.Template.ll_ptr1 = RL;
-	rl->entry.Template.ll_ptr2 = NULL;
-	return(rl);
-}
-
-PTR_BLOB1
-   NGetCallInfo(filename,line)
-char *filename;
-int line;
-{
-   PTR_BLOB1 lb, nb,tb;
-   PTR_BFND b, FindBifNode();
-   char *s;
-   PTR_LLND used, modified;
-   
-   used = NULL; modified = NULL;
-   b = FindBifNode(filename,line);
-   if(b == NULL){ 
-      nb = (PTR_BLOB1) malloc(sizeof(struct blob1));
-      s = malloc(256);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,nb, 0);
-      addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-      sprintf(s,"Could not find code at line %d\n",line);
-      nb->ref = s;
-      nb->next = NULL;
-      return(nb);
-   }
-   if(b->variant != PROC_STAT && b->variant != EXPR_STMT_NODE){ 
-      nb = (PTR_BLOB1) malloc(sizeof(struct blob1));
-      s = malloc(256);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,nb, 0);
-      addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-      sprintf(s,"Cound not find call at line %d\n",line);
-      nb->ref = s;
-      nb->next = NULL;
-      return(nb);
-   }
-   bind_call_site_info(b,&used,&modified);
-   if(used == NULL){ 
-      tb = nb = (PTR_BLOB1) malloc(sizeof(struct blob1));
-      s = malloc(256);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,tb, 0);
-      addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-      sprintf(s,"nothing used in call. \n");
-      nb->ref = s;
-      nb->next = NULL;
-      lb = nb;
-   }
-   else{ 
-      tb = nb = (PTR_BLOB1) malloc(sizeof(struct blob1));
-      s = malloc(256);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,tb, 0);
-      addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-      sprintf(s,"variables used in call are: \n");
-      nb->ref = s;
-      tb->next = nb = (PTR_BLOB1) malloc(sizeof(struct blob1));
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,tb->next, 0);
-#endif
-      s = (UnparseLlnd[cur_file->lang])(used);
-      nb->ref = s;
-      nb->next = NULL;
-      lb = nb;
-   }
-   if(modified == NULL){ 
-      lb->next = nb = (PTR_BLOB1) malloc(sizeof(struct blob1));
-      s = malloc(256);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,lb->next, 0);
-      addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-      sprintf(s,"nothing modified by call. \n");
-      nb->ref = s;
-      nb->next = NULL;
-      return(tb);
-   }
-   else{ 
-      lb->next = nb = (PTR_BLOB1) malloc(sizeof(struct blob1));
-      s = malloc(256);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,lb->next, 0);
-      addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-      sprintf(s,"variables modified  in call are: \n");
-      nb->ref = s;
-      nb->next = (PTR_BLOB1) malloc(sizeof(struct blob1));
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,nb->next, 0);
-#endif
-      nb = nb->next;
-      s = (UnparseLlnd[cur_file->lang])(modified);
-      nb->ref = s;
-      nb->next = NULL;
-      return(tb);
-   }
-}
-
-
-
-PTR_BLOB1
-   NGetDepInfo(filename, line)
-char *filename;
-int line;
-{
-   PTR_BFND b,bpar;
-   PTR_DEP d;
-   int depth;
-   char * s;
-   PTR_BLOB1 nb, lb, btmp;
-
-   PTR_BLOB q;
-   PTR_SYMB induct_list[100], local_list[100], rename_list[100];
-   int induct_num, local_num, rename_num;
-   /* PTR_LLND used, modified; */
-   PTR_BFND FindBifNode();
-   int i;
-   
-   induct_num = 0; local_num = 0; rename_num = 0;
-   b = FindBifNode(filename,line);
-   /*  bind_call_site_info(b,&used,&modified);*/
-   if(b == NULL){ 
-      nb = (PTR_BLOB1) malloc(sizeof(struct blob1));
-      s = malloc(256);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,nb, 0);
-      addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-      sprintf(s,"Could not find code at line %d\n",line);
-      nb->ref = s;
-      nb->next = NULL;
-      return(nb);
-   }
-   /* if b is a loop, we look for all loop carried deps for */
-   /* this loop.  otherwise just list dependence going out */
-   if(b->variant == FOR_NODE || b->variant == WHILE_NODE){
-      depth = 0;
-      bpar = b;
-      current_par_loop = b;
-      while(bpar != NULL && bpar->variant != GLOBAL){
-	 if(bpar->variant == FOR_NODE ||
-	    bpar->variant == CDOALL_NODE ||
-	    bpar->variant == WHILE_NODE ||
-	    bpar->variant == FORALL_NODE) depth++;
-	 bpar = bpar->control_parent;
-      }  
-      q = b->entry.Template.bl_ptr1;
-      nb = (PTR_BLOB1) malloc(sizeof(struct blob1));
-      s = malloc(256);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,nb, 0);
-      addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-      sprintf(s,"Loop Carried Dependences Prohibiting Parallelism:\n");
-      nb->ref = s;
-      nb->next = NULL;
-      nb = Nsearch_deps(nb,q,depth,induct_list, &induct_num,
-			local_list,&local_num, rename_list, &rename_num);
-      if (nb->next == NULL)
-      {
-          if (induct_num == 0 && local_num == 0 && rename_num == 0)
-              sprintf(nb->ref, "this loop is perfect! parallelize it.\n");
-          else
-              sprintf(nb->ref,
-              "Loop is Parallelizable. First fix these problems.\n");
-      }
-      for(lb = nb; lb->next != NULL; lb = lb->next);
-      if(induct_num > 0){
-	 btmp = (PTR_BLOB1) malloc(sizeof(struct blob1));
-	 lb->next = btmp;  lb = btmp;
-	 s = malloc(256);
-#ifdef __SPF
-     addToCollection(__LINE__, __FILE__,btmp, 0);
-     addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-	 sprintf(s,"The following seem to be pseudo induction variables:\n");
-	 lb->ref = s;
-	 lb->next = NULL;
-	 for(i = 0; i < induct_num; i++){
-	    lb->next = (PTR_BLOB1) malloc(sizeof(struct blob1));
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,lb->next, 0);
-#endif
-	    lb = lb->next;
-	    s = malloc(3+strlen(induct_list[i]->ident) );
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-	    sprintf(s,"%s\n",induct_list[i]->ident);
-	    lb->next = NULL;
-	    lb->ref = s;
-	 }
-	 subtract_list(induct_list,&induct_num,local_list,&local_num);
-	 subtract_list(induct_list,&induct_num,rename_list,&rename_num);
-      }
-      if(local_num > 0){
-	 btmp = (PTR_BLOB1) malloc(sizeof(struct blob1));
-#ifdef __SPF
-     addToCollection(__LINE__, __FILE__,btmp, 0);
-#endif
-	 lb->next = btmp;  lb = btmp;
-	 s = malloc(256);
-#ifdef __SPF
-     addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-	 sprintf(s,"Variables that should be made local to loop:\n");
-	 lb->ref = s;
-	 lb->next = NULL;
-	 for(i = 0; i < local_num; i++){
-	    lb->next = (PTR_BLOB1) malloc(sizeof(struct blob1));
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,lb->next, 0);
-#endif
-	    lb = lb->next;
-	    s = malloc(3+strlen(local_list[i]->ident));
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-	    sprintf(s,"%s\n",local_list[i]->ident);
-	    lb->next = NULL;
-	    lb->ref = s;
-	 }
-	 subtract_list(local_list, &local_num, rename_list, &rename_num);
-      }
-      if(rename_num > 0){
-	 btmp = (PTR_BLOB1) malloc(sizeof(struct blob1));
-#ifdef __SPF
-     addToCollection(__LINE__, __FILE__,btmp, 0);
-#endif
-	 lb->next = btmp;  lb = btmp;
-	 s = malloc(256);
-#ifdef __SPF
-     addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-	 sprintf(s,"Variables that are reused in a funny way:\n");
-	 lb->ref = s;
-	 lb->next = NULL;
-	 for(i = 0; i < rename_num; i++){
-	    lb->next = (PTR_BLOB1) malloc(sizeof(struct blob1));
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,lb->next, 0);
-#endif
-	    lb = lb->next;
-	    s = malloc(64);
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-	    sprintf(s,"%s\n",rename_list[i]->ident);
-	    lb->next = NULL;
-	    lb->ref = s;
-	 }
-      }
-      return(nb);
-   }				/* if loop case */
-   d = b->entry.Template.dep_ptr1;
-   nb = NULL; 
-   btmp = (PTR_BLOB1) malloc(sizeof(struct blob1));
-#ifdef __SPF
-   addToCollection(__LINE__, __FILE__,btmp, 0);
-#endif
-   s = malloc(256);
-#ifdef __SPF
-   addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-   sprintf(s,"variant of this node is %d\n",b->variant);
-   btmp->ref = s;
-   btmp->next = NULL;
-   nb = lb = btmp;
-   while(d != NULL){
-      btmp = (PTR_BLOB1) malloc( sizeof(struct blob1));
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,btmp, 0);
-#endif
-      if (nb == NULL){ nb = btmp; lb = btmp;}
-      else{ lb->next = btmp; lb = btmp;}
-      s = malloc(256);
-#ifdef __SPF
-      addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-      sprintf(s,"id:%s type:%s to line %d dir_vect =(%s,%s,%s)\n",
-	      d->symbol->ident, depstrs[(int) (d->type)], 
-	      d->to.stmt->g_line,
-	      dirstrs[(int) (d->direct[1])], dirstrs[(int) (d->direct[2])], 
-	      dirstrs[(int) (d->direct[3])]);
-      btmp->ref = s;
-      btmp->next = NULL;
-      d = d->from_fwd;
-   }
-   return(nb);
-}
-
-static void subtract_list(a,na, b, nb)
-PTR_SYMB a[], b[];
-int *na, *nb;
-{
-   int i, j;
-   for(i = 0; i < *na; i++){
-      for(j = 0; j < *nb; j++){
-	 if(a[i] == b[j]){
-	    if(j < *nb-1) b[j] = b[*nb -1];
-	    (*nb)--;
-	 }
-      }
-   }
-}
-
-int pointer_as_array(d)
-PTR_DEP d;
-{
-   /*
-     if(d->from.refer == NULL) fprintf(stderr, "no from llnode\n");
-     if(d->to.refer == NULL) fprintf(stderr, "no to llnode\n");
-     fprintf(stderr, " from <%s to <%s\n",
-     unparse_llnd(d->from.refer), unparse_llnd(d->to.refer));
-     */
-   if (d->to.refer->variant == ARRAY_REF || d->from.refer->variant==ARRAY_REF)
-      return 1;
-   else return 0;
-}
-
-static PTR_BLOB1
-   Nsearch_deps(nb,q,depth,induct_list, induct_num,
-		local_list,local_num,rename_list,rename_num)
-PTR_BLOB1	nb;
-PTR_BLOB	q;
-int	depth;
-PTR_SYMB induct_list[], local_list[], rename_list[];
-int *induct_num, *local_num, *rename_num;
-{
-   PTR_BFND  bchild;
-   PTR_DEP   d;
-   char *s;
-   PTR_BLOB1 lb = NULL, btmp;
-   int i,found;
-   PTR_LLND from_list[500];
-   int from_line[500], to_line[500];
-   int from_num;
-   
-   if(nb != NULL) lb = nb;
-   from_num = 0;
-   while(q != NULL){
-      bchild = q->ref;
-      q = q->next;
-      d = bchild->entry.Template.dep_ptr1;
-      while(d != NULL){
-	 /* if the dependence is a carried array dependence (on a array type */
-	 /* or used as an array (fix)) or it is a flow dependence that is    */
-	 /* caried then classify appropriately. */
-	 if (((d->symbol->type->variant == T_ARRAY || pointer_as_array(d)) &&
-	      d->direct[depth] >1) || (d->type == 0 && d->direct[depth] >1)){
-	    /* this is a loop carried flow dependence */
-	    if(d->from.stmt == d->to.stmt && 
-	       (d->symbol->type->variant == T_INT ||
-	       (pointer_as_array(d) == 0 &&
-	       d->symbol->type->variant == T_POINTER) )){
-			for(i = 0, found = 0; i < *induct_num; i++) 
-				if( induct_list[i] == d->symbol) found = 1;
-			if(found == 0) induct_list[(*induct_num)++] = d->symbol;
-		}
-	    else if(same_loop(d->from.stmt,d->to.stmt)){
-	       found = 0;
-	       for(i = 0; i < from_num; i++)
-			if(d->from.refer == from_list[i] && d->from.stmt->g_line == from_line[i]
-			   && d->to.stmt->g_line == to_line[i]) found = 1;
-	       if(found == 0){
-			btmp = (PTR_BLOB1) malloc( sizeof(struct blob1));
-#ifdef __SPF
-            addToCollection(__LINE__, __FILE__,btmp, 0);
-#endif
-			if (nb == NULL){ nb = btmp; lb = btmp;}
-			else{ lb->next = btmp; lb = btmp;}
-			s = malloc(256);
-#ifdef __SPF
-            addToCollection(__LINE__, __FILE__,s, 0);
-#endif     
-			sprintf(s, "an assignment to %s at line %d used in line %d in another iteration\n",
-				(UnparseLlnd[cur_file->lang])(d->from.refer),
-				d->from.stmt->g_line, d->to.stmt->g_line);
-			btmp->ref = s;
-			btmp->next = NULL;
-			from_list[from_num] = d->from.refer;
-			from_line[from_num] = d->from.stmt->g_line;
-			to_line[from_num++] = d->to.stmt->g_line;
-			}
-		}
-	 }
-	 else if(d->symbol->type->variant != T_ARRAY && d->type != 0 &&
-		 d->direct[depth] > 1 && same_loop(d->from.stmt,d->to.stmt)){
-	    /* this is a loop caried output or anti dep */
-	    /* add symbol to list for suggestion for localization */
-	    for(i = 0, found = 0; i < *local_num; i++) 
-	       if( local_list[i] == d->symbol) found = 1;
-	    if(found == 0) local_list[(*local_num)++] = d->symbol;
-	 }
-	 else if(d->type == 2 && d->direct[depth] <= 1 &&
-		 same_loop(d->from.stmt,d->to.stmt)){
-	    /* this is an output dependence of distance 0 */
-	    /* suggest renaming. */
-	    for(i = 0, found = 0; i < *rename_num; i++) 
-	       if( rename_list[i] == d->symbol) found = 1;
-	    if(found == 0) rename_list[(*rename_num)++] = d->symbol;
-	 }
-	 d = d->from_fwd;
-      }
-      if(bchild->entry.Template.bl_ptr1 != NULL){
-	 nb = Nsearch_deps(nb,bchild->entry.Template.bl_ptr1,depth,induct_list,
-			   induct_num, local_list,
-			   local_num, rename_list, rename_num);
-	 lb = nb; while(lb != NULL && lb->next != NULL) lb = lb->next;
-      }
-      if(bchild->entry.Template.bl_ptr2 != NULL){
-	 nb = Nsearch_deps(nb,bchild->entry.Template.bl_ptr2,depth,induct_list,
-			   induct_num, local_list,
-			   local_num, rename_list, rename_num);
-	 lb = nb; while(lb != NULL && lb->next != NULL) lb = lb->next;
-      }
-   }
-   return(nb);
-}
-
-static int same_loop(from, to)
-PTR_BFND from, to;
-{
-   PTR_BFND c;
-   c = from;
-   while(c != NULL && c->variant != GLOBAL && c != current_par_loop)
-      c = c->control_parent;
-   if(c != current_par_loop) return(0);
-   c = to;
-   while(c != NULL && c->variant != GLOBAL && c != current_par_loop)
-      c = c->control_parent;
-   if(c != current_par_loop) return(0);
-   return(1);
-}
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/readnodes.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
deleted file mode 100644
index 9a3f49d..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/readnodes.c
+++ /dev/null
@@ -1,1124 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/*------------------------------------------------------*
- *							*
- *	      Routines to read in BIF graph		*
- *							*
- *------------------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-/*typedef unsigned int u_short;*/
-#include "db.h"
-#include "dep_str.h"
-/*extern int strncmp(); */
-#define NULL_CHECK(BASE,VALUE) ((VALUE) ? (BASE + (VALUE-1)): 0)
-
-/*
- * External variables/functions referenced
- */
-extern int debug;
-
-int   language;			/* type of language of this dep file */
-
-/*	       
- * Local variables
- */
-static struct locs	floc;	/* used to read in preamble "floc" */
-static struct preamble	head;	/* used to read in preamble "head" */
-static struct bf_nd	bf;	/* used to read in bif nodes */
-static struct ll_nd	ll;	/* used to read in ll nodes */
-static struct sym_nd	sym;	/* used to read in symbol nodes */
-static struct typ_nd	typ;	/* used to read in type nodes */
-static struct lab_nd	lab;	/* used to read in label nodes */
-static struct fil_nd	fil;	/* used to read in file nodes */
-static struct cmt_nd	cmt;	/* used to read in comment nodes */
-static struct dep_nd	dpd;	/* used to read in dep nodes */
-
-static PTR_BLOB head_blob, cur_blob;
-static PTR_BFND head_bfnd, cur_bfnd;
-static PTR_LLND head_llnd, cur_llnd;
-static PTR_SYMB head_symb, cur_symb;
-static PTR_TYPE head_type, cur_type;
-static PTR_DEP	head_dep,  cur_dep;
-static PTR_LABEL head_lab, cur_lab;
-static PTR_FNAME head_file;
-static PTR_CMNT head_cmnt, cur_cmnt;
-static PTR_BFND global_bfnd;
-
-static char **strtbl;		/* starting address of string table */
-static u_shrt tmp[10000];	/* temp working area */
-static FILE *fd;		/* local copy of file id for the dep file */
-static PTR_FILE lfi;
-static int need_swap = 0;	/* set to 1 if we need to swap bytes */
-
-void swab();
-/********************************************************
- *			swap_w				*
- *							*
- *	     Swap bytes of one word (2 bytes)		*
- ********************************************************/
-static void
-swap_w(p)
-	char *p;
-{
-    char c;
-
-    c = *(p+1);
-    *(p+1) = *p;
-    *p = c;
-}
-
-
-/********************************************************
- *			swap_i				*
- *							*
- *	     Swap bytes of an integer (4 bytes)		*
- ********************************************************/
-static void
-swap_i(p)
-	char *p;
-{
-    char c;
-
-    c = *(p+3);			/* swap the 1st and 4th bytes */
-    *(p+3) = *p;
-    *p++ = c;
-    c = *p;			/* swap the 2nd and 3rd bytes */
-    *p = *(p+1);
-    *(p+1) = c;
-}
-
-
-/********************************************************
- *			swap_l (phb)                    *
- *							*
- *	     Swap bytes of an 64bit long (8 bytes)      *
- ********************************************************/
-/* UNDER CONSTRUCTION, FIXME */
-/*static void
-swap_l(p)
-	char *p;
-{
-    char c;
-    c = *(p+3);			// swap the 1st and 4th bytes 
-    *(p+3) = *p;
-    *p++ = c;
-    c = *p;			// swap the 2nd and 3rd bytes 
-    *p = *(p+1);
-    *(p+1) = c;
-}*/
-
-
-/*------------------------------------------------------*
- *		   read_str_tbl				*
- *							*
- *	Read in the string table in dep file		*
- *------------------------------------------------------*/
-static int
-read_str_tbl()
-{
-    int	     i, n, sz;
-    u_shrt  u;
-    char    *s;
-    char   **cp;
-
-    /*
-     * Fast forward to where the string table starts
-     */
-    if (fseek(fd, floc.strs, 0) < 0)
-	return -1;
-
-    /*
-     * The first word is the total number of strings in the dep file
-     */
-
-    /* get size of string table */
-    if ((int)fread( (char *) &u, sizeof(u_shrt), 1, fd) < 0) 
-	return -1;
-
-    if (need_swap)
-	swap_w((char *)&u);
-    sz = (int) u;
-    if ((cp = strtbl = (char **)malloc(sz * sizeof(char *))) == NULL)
-    {
-        fprintf(stderr, "read_str_tbl: No more space\n");
-        exit(1);
-    }
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,cp, 0);
-#endif
-
-    /*
-     * Then followed by strings in the form of
-     *		-------------------------
-     *		| str length | contents	|
-     *		-------------------------
-     */
-    for (i = 0; i < sz; i++) {
-        /* get string length */
-	if ((int)fread( (char *) &u, sizeof(u_shrt), 1, fd) < 0) 
-
-	    return -1;
-	if (need_swap)
-	    swap_w((char *)&u);
-	n = (int) u;
-	if ((s = malloc(n+1)) == NULL) 
-    {
-	    fprintf(stderr, "read_str_tbl: No more space\n");
-	    exit(1);
-	}
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-	if ((int)fread(s, sizeof(char), n, fd) < 0) /* now the content */
-	    return -1;
-	*(s+n) = '\0';
-	*cp++ = s;
-    }
-    return 0;
-}
-
-
-/*--------------------------------------------------------------*
- *			read_preamble				*
- *	    Read in the preamble part of the dep file		*
- *--------------------------------------------------------------*/
-static int
-read_preamble()
-{
-    int i;
-    char filemagic[10];
-
-    /* The first 8 bytes is the file magic (see /etc/magic) PHB */
-    if ((int)fread(filemagic, sizeof(char), 8, fd) < 0)
-        return -1;
-    if (strncmp("sage.dep",filemagic,8) != 0) {
-      fprintf(stderr, "This is not a legal .dep file\n");
-      return -2;
-    }
-
-    /* First word (2 bytes) in the dep file is a pre-selected magic number */
-    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0)
-	return -1;
-    if (*tmp != D_MAGIC) {	/* Is this a dep file? */
-	need_swap = 1;		/* No... */
-	swap_w((char *)tmp);		/*  ... Maybe we need to swap bytes */
-	if(*tmp != D_MAGIC) {	/* Try again */
-	  fprintf(stderr, "Are you sure this is a legal dep file? %x\n",*tmp);
-	  return -2;
-	}
-    }
-    
-    /*
-     * The second part is for double checking machanism.  Here we have
-     * the starting locations (offsets) of low level nodes, symbol nodes,
-     * type nodes, label nodes, comment nodes, file nodes, dep nodes and
-     * string table (relative to the beginning of file).
-     */
-
-    /* Some more data */
-    if ((int)fread( (char *) &floc, sizeof(struct locs), 1, fd) < 0)
-	return -1;
-
-    if (need_swap) {
-	swap_i((char *)&floc.llnd);	/* !! long !! 64bit? (phb) */
-	swap_i((char *)&floc.symb);	/* !! long !! 64bit? (phb) */
-	swap_i((char *)&floc.type);	/* !! long !! 64bit? (phb) */
-	swap_i((char *)&floc.labs);	/* !! long !! 64bit? (phb) */
-	swap_i((char *)&floc.cmnt);	/* !! long !! 64bit? (phb) */
-	swap_i((char *)&floc.file);	/* !! long !! 64bit? (phb) */
-	swap_i((char *)&floc.deps);	/* !! long !! 64bit? (phb) */
-	swap_i((char *)&floc.strs);	/* !! long !! 64bit? (phb) */
-    }
-    
-    /* Reconstruct the string table first */
-    if (read_str_tbl() < 0)
-	return -1;
-
-    /* rewind back to the point after "locs" information (8 is filemagic) */
-    if (fseek(fd, sizeof(u_shrt)+sizeof(struct locs)+8, 0) < 0)
-	return -1;
-
-    /*
-     * Read in the second part of preamble.  Here we have numbers of
-     * all nodes (bif, low level, etc.) for this dep file
-     */
-    if ((int)fread( (char *) &head, sizeof(struct preamble), 1, fd) < 0)
-	return -1;
-    if (need_swap)
-	swab((char *)&head, (char *)&head, sizeof(struct preamble));
-
-    language = lfi->lang = (int)head.language;
-
-    if ((sizeof(void *) * 8) != (int) head.ptrsize) {
-	fprintf(stderr, "WARNING: .dep file created on a %d bit machine\n",
-            head.ptrsize);
-	return -2;
-      }
-	
-    lfi->num_blobs = (int) head.num_blobs;
-    lfi->num_bfnds = (int) head.num_bfnds;
-    lfi->num_llnds = (int) head.num_llnds;
-    lfi->num_symbs = (int) head.num_symbs;
-    lfi->num_types = (int) head.num_types;
-    lfi->num_label = (int) head.num_label;
-    lfi->num_dep   = (int) head.num_dep;
-    lfi->num_cmnt  = (int) head.num_cmnts;
-    lfi->num_files = (int) head.num_files;
-
-    /*
-     * Now use those numbers to allocate all nodes for this dep file
-     */
-    lfi->head_blob = head_blob = (PTR_BLOB)(lfi->num_blobs>0? calloc(lfi->num_blobs, sizeof(struct blob)): NULL);
-    lfi->head_bfnd = head_bfnd = (PTR_BFND)(lfi->num_bfnds>0? calloc(lfi->num_bfnds, sizeof(struct bfnd)): NULL);
-    lfi->head_llnd = head_llnd = (PTR_LLND)(lfi->num_llnds>0? calloc(lfi->num_llnds, sizeof(struct llnd)): NULL);
-    lfi->head_symb = head_symb = (PTR_SYMB)(lfi->num_symbs>0? calloc(lfi->num_symbs, sizeof(struct symb)): NULL);
-    lfi->head_type = head_type = (PTR_TYPE)(lfi->num_types>0? calloc(lfi->num_types, sizeof(struct data_type)): NULL);
-    lfi->head_dep  = head_dep  = (PTR_DEP)(lfi->num_dep >0 ?  calloc(lfi->num_dep,	 sizeof(struct dep)) : NULL);
-    lfi->head_lab  = head_lab  = (PTR_LABEL)(lfi->num_label>0? calloc(lfi->num_label, sizeof(struct Label)): NULL);
-    lfi->head_cmnt = head_cmnt = (PTR_CMNT)(lfi->num_cmnt>0 ? calloc(lfi->num_cmnt,	 sizeof(struct cmnt)): NULL);
-    lfi->head_file = head_file = (PTR_FNAME)(lfi->num_files>0? calloc(lfi->num_files, sizeof(struct file_name)): NULL);
-     
-#ifdef __SPF
-    if (lfi->head_blob) addToCollection(__LINE__, __FILE__,lfi->head_blob, 0);
-    if (lfi->head_bfnd) addToCollection(__LINE__, __FILE__,lfi->head_bfnd, 0);
-    if (lfi->head_llnd) addToCollection(__LINE__, __FILE__,lfi->head_llnd, 0);
-    if (lfi->head_symb) addToCollection(__LINE__, __FILE__,lfi->head_symb, 0);
-    if (lfi->head_type) addToCollection(__LINE__, __FILE__,lfi->head_type, 0);
-    if (lfi->head_dep) addToCollection(__LINE__, __FILE__,lfi->head_dep, 0);
-    if (lfi->head_lab) addToCollection(__LINE__, __FILE__,lfi->head_lab, 0);
-    if (lfi->head_cmnt) addToCollection(__LINE__, __FILE__,lfi->head_cmnt, 0);
-    if (lfi->head_file) addToCollection(__LINE__, __FILE__,lfi->head_file, 0);
-#endif
-
-    lfi->global_bfnd = global_bfnd = head_bfnd + ((int)head.global_bfnd - 1);
-
-    cur_blob   = head_blob;
-    cur_bfnd   = lfi->num_bfnds>0 ? head_bfnd + (lfi->num_bfnds - 1) : NULL;
-    cur_llnd   = lfi->num_llnds>0 ? head_llnd + (lfi->num_llnds - 1) : NULL;
-    cur_symb   = lfi->num_symbs>0 ? head_symb + (lfi->num_symbs - 1) : NULL;
-    cur_type   = lfi->num_types>0 ? head_type + (lfi->num_types - 1) : NULL;
-    cur_dep    = lfi->num_dep  >0 ? head_dep  + (lfi->num_dep	- 1) : NULL;
-    cur_lab    = lfi->num_label>0 ? head_lab  + (lfi->num_label - 1) : NULL;
-    cur_cmnt   = lfi->num_cmnt >0 ? head_cmnt + (lfi->num_cmnt	- 1) : NULL;
-
-    for (i = 0; i < lfi->num_bfnds; i++) {
-	(head_bfnd + i)->id	= i + 1;
-	(head_bfnd + i)->thread = head_bfnd + (i + 1);
-    }
-    if (lfi->num_bfnds > 0)	/* the thread field of the last entry was... */
-	cur_bfnd->thread = NULL; /* ...changed in the previous loop */
-
-    for (i = 0; i < lfi->num_llnds; i++) {
-	(head_llnd + i)->id	= i + 1;
-	(head_llnd + i)->thread = head_llnd + (i + 1);
-    }
-    if (lfi->num_llnds > 0)
-	cur_llnd->thread = NULL;
-
-    for (i = 0; i < lfi->num_symbs; i++) {
-	(head_symb + i)->id	= i + 1;
-	(head_symb + i)->thread = head_symb + (i + 1);
-    }
-    if (lfi->num_symbs > 0)
-	cur_symb->thread = NULL;
-
-    for (i = 0; i < lfi->num_types; i++) {
-	(head_type + i)->id	= i + 1;
-	(head_type + i)->thread = head_type + (i + 1);
-    }
-    if (lfi->num_types > 0)
-	cur_type->thread = NULL;
-
-    for (i = 0; i < lfi->num_files; i++){
-	(head_file + i)->id = i + 1;
-	(head_file + i)->next = head_file + (i + 1);
-    }
-    if (lfi->num_files > 0)
-	(head_file+(lfi->num_files-1))->next = NULL;
-
-    for (i = 0; i < lfi->num_dep; i++) {
-	(head_dep + i)->id     = i + 1;
-	(head_dep + i)->thread = head_dep + (i + 1);
-    }
-    if (lfi->num_dep > 0)
-	cur_dep->thread = NULL;
-
-    for (i = 0; i < lfi->num_label; i++) {
-	(head_lab + i)->id     = i + 1;
-	(head_lab + i)->next = head_lab + (i + 1);
-    }
-    if (lfi->num_label > 0)
-	cur_lab->next = NULL;
-
-    for (i = 0; i < lfi->num_cmnt; i++) {
-	(head_cmnt + i)->id	= i + 1;
-	(head_cmnt + i)->thread = head_cmnt + (i + 1);
-    }
-    if (lfi->num_cmnt > 0)
-	cur_cmnt->thread = NULL;
-    return 0;
-}
-
-
-/*------------------------------------------------------*
- *		    read_blob_nodes			*
- *							*
- *		Reads in a blob list			*
- *------------------------------------------------------*/
-static PTR_BLOB
-read_blob_nodes() 
-{
-    int i, n;
-    PTR_BLOB head, blnd_ptr = NULL;
-
-    /* read in the count */
-    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0) { 
-	perror("read_blob_nodes:");
-	return NULL;
-    }
-    if (need_swap)
-	    swap_w((char *)tmp);
-    if (!(n = (int)(*tmp)))
-	return NULL;		/* count = 0; empty list */
-
-    head = cur_blob;
-
-    /* read in blob list */
-    if ((int)fread( (char *) tmp, sizeof(u_shrt), n, fd) < 0) { 
-	perror("read_blob_nodes:");
-	return NULL;
-    }
-    if (need_swap)
-	    swab((char *)tmp, (char*)tmp, n*sizeof(u_shrt));
-
-    for (i = 0; i < n; i++) {	/* re-contruct the blob nodes */
-	blnd_ptr	= cur_blob++;
-	blnd_ptr->next	= cur_blob;
-	blnd_ptr->ref	= head_bfnd + (tmp[i] - 1);
-    }
-    blnd_ptr->next = NULL;
-
-    return head;
-}
-
-
-/*--------------------------------------------------------------*
- *			read_bif_nodes				*
- *								*
- *		routines to read in bif nodes			*
- *--------------------------------------------------------------*/
-static int
-read_bif_nodes() 
-{
-    PTR_BFND bfnd_ptr;
-    int i;
-
-    for (i = 0; i < lfi->num_bfnds; i++) {
-        /* read in a bif node */
-	if ((int)fread( (char *) &bf, sizeof(struct bf_nd), 1, fd) < 0) 
-	    return -1;
-	if (need_swap)
-	    swab((char *)&bf, (char *)&bf, sizeof(struct bf_nd));
-	if (debug)
-	    fprintf(stderr,"Processing bif %d\n",i);
-	bfnd_ptr		 = head_bfnd + i;
-	bfnd_ptr->variant	 = (int) bf.variant;
-	bfnd_ptr->filename	 = NULL_CHECK(head_file, bf.filename);
-	bfnd_ptr->control_parent = NULL_CHECK(head_bfnd, bf.cp);
-	bfnd_ptr->label		 = NULL_CHECK(head_lab, bf.label);
-	bfnd_ptr->entry.Template.bf_ptr1  = NULL_CHECK(head_bfnd,bf.bf_ptr1);
-	bfnd_ptr->entry.Template.cmnt_ptr = NULL_CHECK(head_cmnt,bf.cmnt_ptr);
-	bfnd_ptr->entry.Template.symbol	  = NULL_CHECK(head_symb,bf.symbol);
-	bfnd_ptr->entry.Template.ll_ptr1  = NULL_CHECK(head_llnd,bf.ll_ptr1);
-	bfnd_ptr->entry.Template.ll_ptr2  = NULL_CHECK(head_llnd,bf.ll_ptr2);
-	bfnd_ptr->entry.Template.ll_ptr3  = NULL_CHECK(head_llnd,bf.ll_ptr3);
-	bfnd_ptr->entry.Template.dep_ptr1 = NULL_CHECK(head_dep, bf.dep_ptr1);
-	bfnd_ptr->entry.Template.dep_ptr2 = NULL_CHECK(head_dep, bf.dep_ptr2);
-	bfnd_ptr->entry.Template.lbl_ptr  = NULL_CHECK(head_lab, bf.lbl_ptr);
-	bfnd_ptr->g_line		  = (int) bf.g_line;
-	bfnd_ptr->l_line		  = (int) bf.l_line;
-	bfnd_ptr->decl_specs		  = (int) bf.decl_specs;
-	bfnd_ptr->entry.Template.bl_ptr1  = read_blob_nodes();
-	bfnd_ptr->entry.Template.bl_ptr2  = read_blob_nodes();
-    }
-    return 0;
-}
-
-
-/*--------------------------------------------------------------*
- *			read_ll_nodes				*
- *								*
- *		      routines to read ll_nodes			*
- *--------------------------------------------------------------*/
-static int
-read_ll_nodes()
-{
-    PTR_LLND llnd_ptr;
-    int i;
-
-    for(i = 0; i < lfi->num_llnds; i++) {
-	if ((int)fread( (char *) &ll, sizeof(struct ll_nd), 1, fd) < 0)
-	    return -1;
-	if (need_swap)
-	    swab((char *)&ll, (char *)&ll, sizeof(struct ll_nd));
-
-	llnd_ptr	  = head_llnd + i;
-	llnd_ptr->variant = (int) ll.variant; 
-	llnd_ptr->type	  = NULL_CHECK(head_type, ll.type);
-
-	switch(llnd_ptr->variant) {
-	case INT_VAL :
-	    if ((int)fread( (char *) &llnd_ptr->entry.ival, sizeof(int), 1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swap_i((char *)&llnd_ptr->entry.ival);
-	    break;
-	case BOOL_VAL :
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swap_w((char *)tmp);
-	    llnd_ptr->entry.bval = (int)(*tmp);
-	    break;
-	case CHAR_VAL :
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swap_w((char *)tmp);
-	    llnd_ptr->entry.cval = (char)(*tmp);
-	    break;
-	case DOUBLE_VAL:
-	case FLOAT_VAL :
-	case STMT_STR  :
-	case STRING_VAL:
-	case KEYWORD_VAL:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swap_w((char *)tmp);
-	    llnd_ptr->entry.string_val = *(strtbl+(*tmp));
-	    break;
-	case RANGE_OP  :
-	case UPPER_OP  :
-	case LOWER_OP  :
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 2, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 2*sizeof(u_shrt));
-	    llnd_ptr->entry.array_op.symbol= NULL_CHECK(head_symb,(*tmp));
-	    llnd_ptr->entry.array_op.dim   = (int)tmp[1];
-	    break;
-	case LABEL_REF :
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swap_w((char *)tmp);
-	    llnd_ptr->entry.label_list.lab_ptr= NULL_CHECK(head_lab,(*tmp));
-	    break;
-/*	case ARITH_ASSGN_OP:*/	/* New added for VPC++	*/
-/*	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 3, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 3*sizeof(u_shrt));
-*/		
-/* The next line is a _REAL_ hack, I added the cast (PHB) */
-/*	    llnd_ptr->entry.Template.symbol = (PTR_SYMB) ((int) tmp[0]);
-	    llnd_ptr->entry.Template.ll_ptr1 = NULL_CHECK(head_llnd,tmp[1]);
-	    llnd_ptr->entry.Template.ll_ptr2 = NULL_CHECK(head_llnd,tmp[2]);
-	    break;
-*/	    
-	default:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 3, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 3*sizeof(u_shrt));
-	    llnd_ptr->entry.Template.symbol =NULL_CHECK(head_symb,(*tmp));
-	    llnd_ptr->entry.Template.ll_ptr1=NULL_CHECK(head_llnd,tmp[1]);
-	    llnd_ptr->entry.Template.ll_ptr2=NULL_CHECK(head_llnd,tmp[2]);
-	}
-    }
-    return 0;
-}
-
-
-/*--------------------------------------------------------------*
- *								*
- *		  routines to read symbol table			*
- *								*
- *--------------------------------------------------------------*/
-static int
-read_symb_nodes()
-{
-    PTR_SYMB symb_ptr;
-    int i;
-
-    for(i = 0; i < lfi->num_symbs; i++) {
-	if ((int)fread( (char *) &sym, sizeof(struct sym_nd), 1, fd) < 0)
-	    return -1;
-	if (need_swap)
-	    swab((char *)&sym, (char *)&sym, sizeof(struct sym_nd));
-
-	symb_ptr	    = head_symb + i;
-	symb_ptr->variant   = (int) sym.variant;
-	symb_ptr->type	    = NULL_CHECK(head_type, sym.type);
-	symb_ptr->attr	    = (int) sym.attr;
-	symb_ptr->next_symb = NULL_CHECK(head_symb, sym.next);
-	symb_ptr->scope	    = NULL_CHECK(head_bfnd, sym.scope);
-	symb_ptr->ident	    = *(strtbl + sym.ident);
-
-	switch (symb_ptr->variant) {
-	case DEFAULT	:
-	case TYPE_NAME	:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0)
-		return -1;
-            if (need_swap)
-		swab((char *)tmp, (char *)tmp, 1*sizeof(u_shrt));
-            symb_ptr->entry.Template.base_name = NULL_CHECK(head_symb,tmp[0]);
-	    break;
-	case CONST_NAME	:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 2, fd) < 0)
-		return -1;
-	    if (need_swap)
-		/*swap_w((char *)tmp);*/
-                swab((char *)tmp, (char *)tmp, (2)*sizeof(u_shrt));
-	    symb_ptr->entry.const_value = NULL_CHECK(head_llnd,(*tmp));
-            symb_ptr->entry.Template.base_name = NULL_CHECK(head_symb,tmp[1]);
-	    break;
-	case ENUM_NAME	:
-	case FIELD_NAME	:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 5, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 5*sizeof(u_shrt));
-	    symb_ptr->entry.field.tag	= (int)(*tmp);
-	    symb_ptr->entry.field.next	= NULL_CHECK(head_symb,tmp[1]);
-	    symb_ptr->entry.field.base_name= NULL_CHECK(head_symb,tmp[2]);
-	    symb_ptr->entry.field.declared_name = NULL_CHECK(head_symb,tmp[3]);
-	    symb_ptr->entry.field.restricted_bit= NULL_CHECK(head_llnd,tmp[4]);
-	    break;
-	case VARIABLE_NAME:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 3+1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, (3+1)*sizeof(u_shrt));
-	    symb_ptr->entry.var_decl.local  = (int)(*tmp);
-	    symb_ptr->entry.var_decl.next_in= NULL_CHECK(head_symb,tmp[1]);
-	    symb_ptr->entry.var_decl.next_out=NULL_CHECK(head_symb,tmp[2]);
-            symb_ptr->entry.Template.base_name = NULL_CHECK(head_symb,tmp[3]);
-	    break;
-	case PROGRAM_NAME:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 2+1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, (2+1)*sizeof(u_shrt));
-
-	    symb_ptr->entry.prog_decl.symb_list = NULL_CHECK(head_symb,(*tmp));
-	    symb_ptr->entry.prog_decl.prog_hedr = NULL_CHECK(head_bfnd,tmp[1]);
-            symb_ptr->entry.Template.base_name = NULL_CHECK(head_symb,tmp[2]);
-	    break;
-	    break;
-	case PROCEDURE_NAME :
-        case PROCESS_NAME:
-	case FUNCTION_NAME:	 
-	case INTERFACE_NAME:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 8+1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, (8+1)*sizeof(u_shrt));
-
-	    symb_ptr->entry.proc_decl.num_input	 = (int)(*tmp);
-	    symb_ptr->entry.proc_decl.num_output = (int)tmp[1];
-	    symb_ptr->entry.proc_decl.num_io	 = (int)tmp[2];
-	    symb_ptr->entry.proc_decl.in_list =NULL_CHECK(head_symb,tmp[3]);
-	    symb_ptr->entry.proc_decl.out_list =NULL_CHECK(head_symb,tmp[4]);
-	    symb_ptr->entry.proc_decl.symb_list=NULL_CHECK(head_symb,tmp[5]);
-	    symb_ptr->entry.proc_decl.proc_hedr=NULL_CHECK(head_bfnd,tmp[6]);
-            symb_ptr->entry.proc_decl.local_size = (int)tmp[7];
-            symb_ptr->entry.Template.base_name = NULL_CHECK(head_symb,tmp[8]);
-	    break;
-	case MODULE_NAME:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 2+1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, (2+1)*sizeof(u_shrt));
-
-	    symb_ptr->entry.Template.symb_list = NULL_CHECK(head_symb,(*tmp));
-	    symb_ptr->entry.Template.func_hedr = NULL_CHECK(head_bfnd,tmp[1]);
-            symb_ptr->entry.Template.base_name = NULL_CHECK(head_symb,tmp[2]);
-	    break;
-	case MEMBER_FUNC:	/*  NEW ADDED FOR VPC */
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 11, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 11*sizeof(u_shrt));
-	    symb_ptr->entry.member_func.num_input  = (int)(*tmp);
-	    symb_ptr->entry.member_func.num_output = (int)tmp[1];
-	    symb_ptr->entry.member_func.num_io	   = (int)tmp[2];
-	    symb_ptr->entry.member_func.in_list =NULL_CHECK(head_symb,tmp[3]);
-	    symb_ptr->entry.member_func.out_list =NULL_CHECK(head_symb,tmp[4]);
-	    symb_ptr->entry.member_func.symb_list  =NULL_CHECK(head_symb,tmp[5]);
-	    symb_ptr->entry.member_func.func_hedr  =NULL_CHECK(head_bfnd,tmp[6]);
-	    symb_ptr->entry.member_func.next	   =NULL_CHECK(head_symb,tmp[7]);
-	    symb_ptr->entry.member_func.base_name  =NULL_CHECK(head_symb,tmp[8]);
-	    symb_ptr->entry.member_func.declared_name =NULL_CHECK(head_symb,tmp[9]);
-            symb_ptr->entry.member_func.local_size = (int)tmp[10];
-	
-	    break;
-	case VAR_FIELD :
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 4, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 4*sizeof(u_shrt));
-	    symb_ptr->entry.variant_field.tag  = tmp[0];
-	    symb_ptr->entry.variant_field.next = NULL_CHECK(head_symb, tmp[1]);
-	    symb_ptr->entry.variant_field.base_name = NULL_CHECK(head_symb, tmp[2]);
-	    symb_ptr->entry.variant_field.variant_list = NULL_CHECK(head_llnd, tmp[3]);
-	    break;
-	default:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0)
-		return -1;
-            if (need_swap)
-		swab((char *)tmp, (char *)tmp, 1*sizeof(u_shrt));
-            symb_ptr->entry.Template.base_name = NULL_CHECK(head_symb,tmp[0]);
-	    break;
-	}
-    }
-    return 0;
-}
-
-
-/*----------------------------------------------------------------------*
- *									*
- *		    routines to read type table				*
- *									*
- *----------------------------------------------------------------------*/
-static int
-read_type_nodes()
-{
-    PTR_TYPE type_ptr;
-    int i, uss1, uss2;
-
-    for(i = 0; i < lfi->num_types; i++) {
-	if ((int)fread( (char *) &typ, sizeof(struct typ_nd), 1, fd) < 0)
-	    return -1;
-	if (need_swap)
-	    swab((char *)&typ, (char *)&typ, sizeof(struct typ_nd));
-
-	type_ptr		= head_type + i;
-	type_ptr->variant	= (int)typ.variant;
-	type_ptr->name		= NULL_CHECK(head_symb,typ.name);
-
-	switch (type_ptr->variant) {
-	case T_INT	:
-	case T_FLOAT	:
-	case T_DOUBLE	:
-	case T_CHAR	:
-	case T_BOOL	:
-        case T_COMPLEX  :
-        case T_DCOMPLEX  :
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 2, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swap_w((char *)tmp); 
-		/* swab((char *)tmp, (char *)tmp, sizeof(u_shrt)); */
-	    type_ptr->entry.Template.ranges    = NULL_CHECK(head_llnd,tmp[0]);
-	    type_ptr->entry.Template.kind_len  = NULL_CHECK(head_llnd,tmp[1]);
-	    break;
-	case T_STRING	:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 3, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swap_w((char *)tmp); 
-	    type_ptr->entry.Template.ranges    = NULL_CHECK(head_llnd,tmp[0]);
-	    type_ptr->entry.Template.kind_len  = NULL_CHECK(head_llnd,tmp[1]);
-	    type_ptr->entry.Template.dummy1    = (int)tmp[2];
-	    break;
-	case DEFAULT	:
-	case T_VOID	:	/* NEW ADDED FOR VPC */
-        case T_UNKNOWN  :
-	case T_ENUM_FIELD:
-	    break;
-	case T_SUBRANGE	:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 3, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 3*sizeof(u_shrt));
-	    type_ptr->entry.subrange.base_type = NULL_CHECK(head_type,tmp[0]);
-	    type_ptr->entry.subrange.lower     = NULL_CHECK(head_llnd,tmp[1]);
-	    type_ptr->entry.subrange.upper     = NULL_CHECK(head_llnd,tmp[2]);
-	    break;
-	case T_ARRAY	:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 3, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 3*sizeof(u_shrt));
-	    type_ptr->entry.ar_decl.num_dimensions = (int)tmp[0];
-	    type_ptr->entry.ar_decl.base_type = NULL_CHECK(head_type,tmp[1]);
-	    type_ptr->entry.ar_decl.ranges    = NULL_CHECK(head_llnd,tmp[2]);
-	    break;
-	case T_LIST	:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swap_w((char *)tmp);
-	    type_ptr->entry.base_type = NULL_CHECK(head_type,(*tmp));
-	    break;
-
-	case T_RECORD	:
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 2, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 2*sizeof(u_shrt));
-	    type_ptr->entry.re_decl.num_fields = (int)(*tmp);
-	    type_ptr->entry.re_decl.first      = NULL_CHECK(head_symb,tmp[1]);
-	    break;
-	case T_DESCRIPT:	/*  NEW ADDED FOR VPC */
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 7, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 7*sizeof(u_shrt));
-	    type_ptr->entry.descriptive.signed_flag	= (int)tmp[0] ;
-					           uss1  = (int)tmp[1];
-					           uss2  = (int)tmp[2];
-	    type_ptr->entry.descriptive.long_short_flag = (int) ((uss1 << 16) | uss2);
-	    type_ptr->entry.descriptive.mod_flag	= (int)tmp[3] ;
-	    type_ptr->entry.descriptive.storage_flag	= (int)tmp[4] ;
-	    type_ptr->entry.descriptive.access_flag	= (int)tmp[5] ;
-	    type_ptr->entry.descriptive.base_type	= NULL_CHECK(head_type,tmp[6]);
-	    break;
-        case T_REFERENCE:	/*  NEW ADDED FOR VPC */
-	case T_POINTER: {	/*  NEW ADDED FOR VPC */
-	    short int s;
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 4, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 4*sizeof(u_shrt));
-	    type_ptr->entry.Template.base_type = NULL_CHECK(head_type,tmp[0]);
-	    s = tmp[1];		/* hack!! since this is a singed short */
-	    type_ptr->entry.Template.dummy1    = (int) s;
-					 uss1  = (int)tmp[2];
-					 uss2  = (int)tmp[3];
-	    type_ptr->entry.Template.dummy5    = (int) ((uss1 << 16) | uss2);
-	    }
-	    break;
-	case T_FUNCTION:	/*  NEW ADDED FOR VPC */
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 1, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swap_w((char *)tmp);
-	    type_ptr->entry.Template.base_type = NULL_CHECK(head_type,(*tmp));
-	    break;
-	case T_DERIVED_TYPE :	/*  NEW ADDED FOR VPC */
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 2, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 2*sizeof(u_shrt));
-	    type_ptr->entry.derived_type.symbol = NULL_CHECK(head_symb,tmp[0]);
-	    type_ptr->entry.derived_type.scope_symbol = NULL_CHECK(head_symb,tmp[1]);
-	    break;
-        case T_MEMBER_POINTER:  /* for C::*  same as derived collection in structure */
-	case T_DERIVED_COLLECTION:	/*  NEW ADDED FOR PC++ */
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 2, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 2*sizeof(u_shrt));
-	    type_ptr->entry.col_decl.collection_name = NULL_CHECK(head_symb,tmp[0]);
-	    type_ptr->entry.col_decl.base_type = NULL_CHECK(head_type,tmp[1]);
-	    break;
-	case T_DERIVED_TEMPLATE:	/*  NEW ADDED FOR PC++ */
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 2, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 2*sizeof(u_shrt));
-	    type_ptr->entry.templ_decl.templ_name = NULL_CHECK(head_symb,tmp[0]);
-	    type_ptr->entry.templ_decl.args = NULL_CHECK(head_llnd,tmp[1]);
-	    break;
-
-	case T_ENUM  :
-	case T_UNION :		/*  NEW ADDED FOR VPC */
-	case T_CLASS :		/*  NEW ADDED FOR VPC */
-	case T_STRUCT :		/*  NEW ADDED FOR VPC */
-	case T_DERIVED_CLASS :	/*  NEW ADDED FOR VPC */
-	case T_COLLECTION:	/*  NEW ADDED FOR PC++ */
-	    if ((int)fread( (char *) tmp, sizeof(u_shrt), 4, fd) < 0)
-		return -1;
-	    if (need_swap)
-		swab((char *)tmp, (char *)tmp, 4*sizeof(u_shrt));
-	    type_ptr->entry.derived_class.num_fields = (int)tmp[0] ;
-	    type_ptr->entry.derived_class.first	     = NULL_CHECK(head_symb,tmp[1]);
-	    type_ptr->entry.derived_class.original_class = NULL_CHECK(head_bfnd,tmp[2]);
-	    type_ptr->entry.derived_class.base_type = NULL_CHECK(head_type,tmp[3]);
-	    break;
-
-	default :
-	    break;
-	}
-    }
-    return 0;
-}
-
-
-/*----------------------------------------------------------------------*
- *			    read_label_nodes				*
- *									*
- *			  Reads the label nodes				*
- *----------------------------------------------------------------------*/
-static int
-read_label_nodes()
-{
-    PTR_LABEL lab_ptr;
-    int i;
-
-    for (i=0; i < lfi->num_label; i++) {
-	if ((int)fread( (char *) &lab, sizeof(struct lab_nd), 1, fd) < 0)
-	    return -1;
-	if (need_swap) {
-	    swab((char *)&lab, (char *)&lab, sizeof(struct lab_nd)-sizeof(long));
-	    swap_i((char *)&lab.stat_no);
-	}
-	
-	lab_ptr	= head_lab +i;
-	lab_ptr->stateno = lab.stat_no;
-	lab_ptr->labtype = lab.labtype;
-	lab_ptr->statbody= NULL_CHECK(head_bfnd, lab.body);
-	lab_ptr->label_name= NULL_CHECK(head_symb,lab.name); /* for VPC */
-    }
-    return 0;
-}
-
-
-/*----------------------------------------------------------------------*
- *			  read_dep_nodes				*
- *									*
- *			Reads the dep nodes				*
- *----------------------------------------------------------------------*/
-static int
-read_dep_nodes()
-{
-    PTR_DEP dep;
-    int i, j;
-
-    for ( i=0; i < lfi->num_dep; i++ ) {
-	if ((int)fread( (char *) &dpd, sizeof(struct dep_nd), 1, fd) < 0)
-	    return -1;
-	if (need_swap)
-	    swab((char *)&dpd, (char *)&dpd, sizeof(struct dep_nd));
-
-	dep = head_dep + (--dpd.id);
-	dep->type	= (int)dpd.type;
-	dep->symbol	= NULL_CHECK(head_symb,dpd.sym);
-	dep->from.stmt	= NULL_CHECK(head_bfnd,dpd.from_stmt);
-	dep->from.refer = NULL_CHECK(head_llnd,dpd.from_ref);
-	dep->to.stmt	= NULL_CHECK(head_bfnd,dpd.to_stmt);
-	dep->to.refer	= NULL_CHECK(head_llnd,dpd.to_ref);
-      /* i dont know what these are!!!
-	dep->from_hook	= NULL_CHECK(head_bfnd,dpd.from_hook);
-	dep->to_hook	= NULL_CHECK(head_bfnd,dpd.to_hook);
-       */
-	dep->from_fwd	= NULL_CHECK(head_dep,dpd.from_fwd);
-	dep->from_back	= NULL_CHECK(head_dep,dpd.from_back);
-	dep->to_fwd	= NULL_CHECK(head_dep,dpd.to_fwd);
-	dep->to_back	= NULL_CHECK(head_dep,dpd.to_back);
-
-	for (j=0; j<MAX_DEP; j++ ) {
-	    dep->direct[j] = (char)dpd.dire[j];
-	}
-    }
-    return 0;
-}
-
-
-/*----------------------------------------------------------------------*
- *			  read_cmnt_nodes				*
- *									*
- *			Reads the comment nodes				*
- *----------------------------------------------------------------------*/
-static int
-read_cmnt_nodes()
-{
-    PTR_CMNT cmnt = lfi->head_cmnt;
-    int i;
-
-    for (i = 0; i < lfi->num_cmnt; i++) {
-	if ((int)fread( (char *) &cmt, sizeof(struct cmt_nd), 1, fd) < 0)
-	    return -1;
-	if (need_swap)
-	    swab((char *)&cmt, (char *)&cmt, sizeof(struct cmt_nd));
-
-	cmnt->type   = (int) cmt.type;
-	cmnt->next   = NULL_CHECK(head_cmnt, cmt.next);
-	cmnt->string = *(strtbl + cmt.str);
-	cmnt++;
-    }
-    return 0;
-}
-
-
-/*
- * strip_dot_slash tries to strip "./" from the filename
- */
-static
-void strip_dot_slash(s)
-    char *s;
-{
-    char *p, *q, ch;
-
-    while ((ch = *s++))
-	if (ch == '.') {
-	    if (*s == '/') {
-		p = q = s++ - 1;
-		while ((*p++ = *s++));
-		s = q;
-	    } else if (*s == '.')
-		s++;
-	}
-}
-
-
-/*----------------------------------------------------------------------*
- *			  read_filename_nodes				*
- *									*
- *			Reads the filename nodes			*
- *----------------------------------------------------------------------*/
-static int
-read_filename_nodes()
-{
-    int i;
-    PTR_FNAME fp = head_file;
-
-    for (i = 0; i < lfi->num_files; i++) {
-	if ((int)fread( (char *) &fil, sizeof(struct fil_nd), 1, fd) < 0)
-	    return -1;
-	if (need_swap)
-	    swab((char *)&fil, (char *)&fil, sizeof(struct fil_nd));
-
-	strip_dot_slash(fp->name = *(strtbl + fil.name));
-	fp++;
-    }
-    lfi->filename  = head_file->name;
-    return 0;
-}
-
-
-/*------------------------------------------------------*
- *		    read_nodes				*
- *							*
- *		Drives the read routines		*
- *------------------------------------------------------*/
-int
-read_nodes(fi)
-	PTR_FILE fi;
-{
-    need_swap = 0;
-    lfi = fi;
-    fd = fi->fid;
-    if (read_preamble() < 0)
-	return -1;
-
-    if (read_bif_nodes() < 0)
-	return -1;
-    if (debug)
-	fprintf(stderr,"bif nodes loaded\n");
-
-    if (ftell(fd) != floc.llnd) {
-	fprintf (stderr,"read_nodes: wrong location of low level nodes\n");
-	if (fseek(fd, floc.llnd, 0) < 0)
-	    return -1;
-    }
-    if (read_ll_nodes() < 0) {
-	perror("read_ll_nodes:");
-	return -1;
-    }
-
-    if (debug)
-	fprintf(stderr,"low level nodes loaded\n");
-
-    if (ftell(fd) != floc.symb) {
-	fprintf(stderr,"read_nodes: wrong location of symbol nodes\n");
-	if(fseek(fd, floc.symb, 0) < 0)
-	    return -1;
-    }
-    if (read_symb_nodes() < 0)
-	return -1;
-    if (debug)
-	fprintf(stderr,"symbol table loaded \n");
-
-    if (ftell(fd) != floc.type) {
-	fprintf(stderr,"read_nodes: wrong location of type nodes\n");
-	if(fseek(fd, floc.type, 0) < 0)
-	    return -1;
-    }
-    if (read_type_nodes() < 0)
-	return -1;
-    if (debug)
-	fprintf(stderr,"type table loaded \n");
-
-    if (ftell(fd) != floc.labs) {
-	fprintf(stderr,"read_nodes: wrong location of label nodes\n");
-	if(fseek(fd, floc.labs, 0) < 0)
-	    return -1;
-    }
-    if (read_label_nodes() < 0)
-	return -1;
-    if (debug)
-	fprintf(stderr,"label table loaded\n");
-
-    if (ftell(fd) != floc.cmnt) {
-	fprintf(stderr,"read_nodes: wrong location of comment nodes\n");
-	if(fseek(fd, floc.cmnt, 0) < 0)
-	    return -1;
-    }
-    if (read_cmnt_nodes() < 0)
-	return -1;
-    if (debug)
-	fprintf(stderr,"comment strings loaded \n");
-
-    if (ftell(fd) != floc.file) {
-	fprintf(stderr,"read_nodes: wrong location of filename nodes\n");
-	if(fseek(fd, floc.file, 0) < 0)
-	    return -1;
-    }
-    if (read_filename_nodes() < 0)
-	return -1;
-    if (debug)
-	fprintf(stderr,"filename table loaded\n");
-
-    if (ftell(fd) != floc.deps) {
-	fprintf(stderr,"read_nodes: wrong location of dependence arc nodes\n");
-	if(fseek(fd, floc.deps, 0) < 0)
-	    return -1;
-    }
-    if (read_dep_nodes() < 0)
-	return -1;
-    if (debug)
-	fprintf(stderr,"dependence arcs loaded \n");
-
-    /* Now set up the returned values */
-    global_bfnd->control_parent = (PTR_BFND) fi;
-    fi->cur_blob  = cur_blob;
-    fi->cur_bfnd  = cur_bfnd;
-    fi->cur_llnd  = cur_llnd;
-    fi->cur_symb  = cur_symb;
-    fi->cur_type  = cur_type;
-    fi->cur_dep	  = cur_dep;
-    fi->cur_lab	  = cur_lab;
-    fi->cur_cmnt  = cur_cmnt;
-    return 0;
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/sets.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/sets.c
deleted file mode 100644
index ef45328..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/sets.c
+++ /dev/null
@@ -1,1818 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* File: sets.c */
-#include "db.h"
-
-extern PCF UnparseBfnd[];
-extern PCF UnparseLlnd[];
-
-extern PTR_FILE cur_file;
-
-#define PLUS 2
-#define ZPLUS 3
-#define MINUS 4
-#define ZMINUS 5
-#define PLUSMINUS 6
-#define NODEP -1
-#define FLOWD 1
-#define OUTPUTD 2
-#define ANTID -1
-#define INPUTD 3
-
-extern char *tag[611];
-extern struct subscript source[AR_DIM_MAX];   /* a source reference or def. */
-extern struct subscript destin[AR_DIM_MAX];   /* a destination ref. or def. */
-extern PTR_SYMB induct_list[MAX_NEST_DEPTH];
-extern int is_forall[MAX_NEST_DEPTH];
-extern int language;		/* is either ForSrc or CSrc */
-extern int num_ll_allocated;
-
-extern char *funparse_bfnd();
-extern char *cunparse_bfnd();
-extern char *funparse_llnd();
-extern char *cunparse_llnd();
-extern void collect_garbage();
-extern void normal_form();
-extern void bind_call_site_info();
-extern PTR_LLND make_llnd();
-extern PTR_FILE cur_file;
-extern int show_deps;
-extern void disp_refl();
-int search_decl();
-extern int comp_dist();
-extern int identical();
-extern void assign();
-int node_count = 0;
-
-void fix_symbol_list( b)
-PTR_BFND b;
-{
-   PTR_BLOB bp;
-   PTR_SYMB f, v;
-	if(b == NULL || b->variant != GLOBAL) return;
-	bp = b->entry.Template.bl_ptr1;	
-	while(bp){
-	   if(bp->ref->variant == PROC_HEDR ||
-	      bp->ref->variant == FUNC_HEDR){
-		f = bp->ref->entry.Template.symbol;
-		if(f->entry.proc_decl.symb_list == NULL){
-			v = f->thread;
-			while(v){
-				if(v->scope == bp->ref){
-					f->entry.proc_decl.symb_list = v;
-					v = NULL;
-					}
-				else{
-					v = v->thread;
-				    }
-				}
-			}
-		}
-	   bp=bp->next;
-	   }
- }
-
-			
-
-
-/*******************************************************************/
-/*	The following external functions found in setutils.c and   */
-/*	anal_index.c. and symb_alg.c				   */
-/*******************************************************************/
-
-void *malloc();
-PTR_SETS alloc_sets();
-PTR_REFL alloc_ref();
-PTR_REFL copy_refl();
-PTR_REFL union_refl();
-PTR_REFL intersect_refl();
-PTR_REFL make_name_list();
-PTR_REFL remove_locals_from_list();
-PTR_REFL build_refl(), merge_array_refs();
-void print_subscr();
-void append_refl();
-void normal_form();
-void bind_call_site_info();
-
-/* Gather_ref is a function that makes a reference node and a list */
-/* for each reference to a varialbe at the tree rooted at the low  */
-/* level node ll.  the parameter defs is used by C programs.  in   */
-/* this case defs points to a list of definitions that are generated*/
-/* durring the evaluation of this expression.			    */
-
-PTR_REFL gather_refl(rnd, defs, bif, ll)
-int rnd;			/* flag = 1 to gather refs for func. calls */
-PTR_REFL *defs; 		/* for C expressions that define values */
-PTR_BFND bif;
-PTR_LLND ll;
-{
-  PTR_REFL p, q, t;
-  PTR_REFL r;
-  PTR_LLND a;
-
-  if (ll == NULL)
-    return (NULL);
-
-  if (bif->variant == PROC_STAT && rnd) {
-    PTR_LLND bused, bmodified;
-    PTR_REFL brlu, brlm;
-    /* assume global analysis done. */
-    bind_call_site_info(bif, &bused, &bmodified);
-    brlu = build_refl(bif, bused);
-    brlu = merge_array_refs(brlu);
-    brlu = merge_array_refs(brlu); /* one more pass */
-    brlm = build_refl(bif, bmodified);
-    brlm = merge_array_refs(brlm);
-    brlm = merge_array_refs(brlm); /* one more pass */
-    append_refl(defs, brlm);
-    return (brlu);
-  }
-
-  if (ll->variant == VAR_REF)
-    return (alloc_ref(bif, ll));
-  else if ((ll->variant == PROC_CALL) || (ll->variant == FUNC_CALL))
-    if (rnd) {
-      PTR_LLND bused, bmodified;
-      PTR_REFL brlu, brlm;
-      /* assume global analysis done. */
-      bind_call_site_info(bif, &bused, &bmodified);
-      brlu = build_refl(bif, bused);
-      brlu = merge_array_refs(brlu);
-      brlu = merge_array_refs(brlu); /* one more pass */
-      brlm = build_refl(bif, bmodified);
-      brlm = merge_array_refs(brlm);
-      brlm = merge_array_refs(brlm); /* one more pass */
-      append_refl(defs, brlm);
-      return (brlu);
-    }
-    else
-      return (NULL);
-  else if (ll->variant == ARRAY_REF) {
-    r = alloc_ref(bif, ll);
-    p = gather_refl(rnd, defs, bif, ll->entry.Template.ll_ptr1);
-    if (rnd == 0 && bif->variant == PROC_STAT)
-      t = p;
-    else {
-      t = union_refl(r, p);
-      disp_refl(p);
-    }
-    return (t);
-  }
-  else if (ll->variant == DEREF_OP) {
-    p = gather_refl(rnd, defs, bif, ll->entry.Template.ll_ptr1);
-    return (p);
-  }
-  else if (ll->variant == ADDRESS_OP) {
-    p = gather_refl(rnd, defs, bif, ll->entry.Template.ll_ptr1);
-    return (p);
-  }
-  else if (ll->variant == POINTST_OP || ll->variant == RECORD_REF) {
-    /* a->b type operation.  in this case we have a */
-    /* reference to a substructure of a struct.  */
-    r = alloc_ref(bif, ll);
-    r->id = NULL;
-    return (r);
-  }
-  else if (ll->variant == PLUSPLUS_OP || ll->variant == MINUSMINUS_OP) {
-    p = gather_refl(rnd, defs, bif, ll->entry.Template.ll_ptr1);
-    q = gather_refl(rnd, defs, bif, ll->entry.Template.ll_ptr1);
-    /* better check for predecriment too! */
-    append_refl(defs, q);
-    disp_refl(q);
-    return (p);
-  }
-  else if (ll->variant == ASSGN_OP || ll->variant == ARITH_ASSGN_OP) {
-    if (ll->entry.Template.ll_ptr2->variant == DEREF_OP) {
-      /* create an equivalence pair for later use */
-      /* i don't know what to return */
-      return (NULL);
-    }
-    else {
-      p = gather_refl(rnd, defs, bif, ll->entry.Template.ll_ptr2);
-      a = ll->entry.Template.ll_ptr1;
-      if (a->variant == VAR_REF || a->variant == POINTST_OP
-	  || a->variant == RECORD_REF) {
-	r = alloc_ref(bif, a);
-	append_refl(defs, r);
-	if (ll->variant == ARITH_ASSGN_OP) {
-	  r = alloc_ref(bif, a);
-	  append_refl(&p, r);
-	}
-	return (p);
-      }
-      else if (a->variant == ARRAY_REF) {
-	r = alloc_ref(bif, a);
-	append_refl(defs, r);
-	q = gather_refl(rnd, defs, bif, a->entry.Template.ll_ptr1);
-	t = union_refl(p, q);
-	disp_refl(p);
-	disp_refl(q);
-	if (ll->variant == ARITH_ASSGN_OP) {
-	  r = alloc_ref(bif, a);
-	  append_refl(&t, r);
-	}
-	return (t);
-      }
-      else if (a->variant == DEREF_OP) {
-	/* not so sure about this! */
-	q = gather_refl(rnd, defs, bif, a->entry.Template.ll_ptr1);
-	if (ll->variant == ARITH_ASSGN_OP) {
-	  r = alloc_ref(bif, a);
-	  append_refl(&q, r);
-	}
-	return (q);
-      }
-      else {
-	q = gather_refl(rnd, defs, bif, ll->entry.Template.ll_ptr1);
-	append_refl(defs, q);
-	disp_refl(q);
-	if (ll->variant == ARITH_ASSGN_OP) {
-	  r = alloc_ref(bif, a);
-	  append_refl(&p, r);
-	}
-	return (p);
-      }
-    }
-  }
-  else {
-    p = gather_refl(rnd, defs, bif, ll->entry.Template.ll_ptr1);
-    q = gather_refl(rnd, defs, bif, ll->entry.Template.ll_ptr2);
-    t = union_refl(p, q);
-    disp_refl(p);
-    disp_refl(q);
-    return (t);
-  }
-}
-
-static int before(bsor, bdes)
-PTR_BFND bsor, bdes;
-{
-  return (bsor->id < bdes->id);
-}
-
-
-PTR_REFL rem_kill(in, gen)
-PTR_REFL in, gen;
-{
-  /* search "in" for things in "in" that are killed by gen. */
-  /* for scalars this means we just look at the ID. */
-  /* for arrays we have to check for an induction variable expression */
-  /* that is constant in the current iteration. */
-  PTR_REFL t, g, rk, tmp;
-
-  t = copy_refl(in);
-  for (g = gen; g; g = g->next)
-    for (tmp = t; tmp; tmp = tmp->next)
-      if (tmp->id == g->id) {
-	if ((tmp->node && (tmp->node->refer->variant == POINTST_OP ||
-			   tmp->node->refer->variant == RECORD_REF)) ||
-	    (g->node && (g->node->refer->variant == POINTST_OP ||
-			 g->node->refer->variant == RECORD_REF))
-	  ) {
-	  /* don't know what to do! */
-	}
-	/* have a hit here. */
-	else if (tmp->node->refer->variant == VAR_REF) {
-	  tmp->id = NULL;
-	  tmp->node = NULL;
-	  /* just killed a scalar */
-	}
-	else {
-	  /* it is an ARRAY_REF so we need much work */
-	  /* the key is to kill definitions to the same subscripted */
-	  /* variables that are defined in the same iteration	 */
-	  /* and are lexically before the current definition.	 */
-	  /* But you must then do subscript analysis.  the code  */
-	  /* below gives the idea.  funct. match_subs not yet done */
-	  /* it does not hurt to leave this out. the extra dep.  */
-	  /* that are generated are not harmfull.		 */
-	  /* for now we only kill off unsubscripted array refs */
-	  /* because they are redefinitions of the whole array */
-	  if (tmp->node->refer->variant == ARRAY_REF)
-	    if (g->node->refer->entry.array_ref.index == NULL) {
-	      tmp->id = NULL;
-	      tmp->node = NULL;
-	    }
-	}
-      }
-
-  /* now prune out all killed nodes from t */
-  rk = NULL;
-  while (t) {
-    tmp = t;
-    t = t->next;
-    tmp->next = NULL;
-    if (tmp->node == NULL)
-      disp_refl(tmp);
-    else {
-      tmp->next = rk;
-      rk = tmp;
-    }
-  }
-  return (rk);
-}
-
-
-/****************************************************************************
- * the rountines search_local and remove_local are used to surpress carried *
- * deps for forall loops.  search the reference list looking for references *
- * to locals								    *
- ****************************************************************************/
-int search_local(b, s)
-PTR_BFND b;
-PTR_SYMB s;
-{
-  PTR_SYMB locs;
-  PTR_BLOB blob;
-
-  if (b->variant == FORALL_NODE) {
-    locs = b->entry.forall_nd.control_var;
-    while (locs != NULL && s != locs)
-      locs = locs->next_symb;
-    if (locs == s)
-      return (0);
-    else
-      return (1);
-  }
-  else if (language != ForSrc) {
-    blob = b->entry.Template.bl_ptr1;
-    return (search_decl(blob, s));
-  }
-  else
-    return (1);
-}
-
-int search_decl(blob, s)
-PTR_BLOB blob;
-PTR_SYMB s;
-{
-  PTR_BFND b;
-  PTR_LLND ll, v;
-
-  while (blob != NULL && blob->ref->variant != CONTROL_END) {
-    b = blob->ref;
-    if (b->variant == VAR_DECL) {
-      ll = b->entry.Template.ll_ptr1;
-      /* ll should be an expression list */
-      while (ll != NULL) {
-	if (ll->entry.Template.ll_ptr1 != NULL) {
-	  v = ll->entry.Template.ll_ptr1;
-	  if ((v->variant == VAR_REF ||
-	       v->variant == ARRAY_REF) &&
-	      v->entry.Template.symbol == s)
-	    return (0);
-	}
-	ll = ll->entry.Template.ll_ptr2;
-      }
-    }
-    blob = blob->next;
-  }
-  return (1);
-}
-
-
-PTR_REFL remove_locals(b, in)
-PTR_BFND b;
-PTR_REFL in;
-{
-  PTR_SYMB i;
-  PTR_REFL t, rk, tmp;
-  PTR_BFND loop;
-  int notfound;
-
-  /* prune out all killed nodes from t */
-  rk = NULL;
-  t = in;
-  while (t != NULL) {
-    tmp = t;
-    t = t->next;
-    i = tmp->id;
-    tmp->next = NULL;
-    loop = b;
-    notfound = 1;
-    while (loop != NULL &&
-	   (loop->variant != FOR_NODE &&
-	    loop->variant != WHILE_NODE &&
-	    loop->variant != LOOP_NODE &&
-	    loop->variant != CDOALL_NODE &&
-	    loop->variant != PARFOR_NODE &&
-	    loop->variant != IF_NODE &&
-	    loop->variant != LOGIF_NODE &&
-	    loop->variant != PAR_NODE)) {
-      loop = loop->control_parent;
-    }
-    if (loop != NULL)
-      notfound = search_local(loop, i);
-    if (notfound == 0)
-      disp_refl(tmp);
-    else {
-      tmp->next = rk;
-      rk = tmp;
-    }
-  }
-  return (rk);
-}
-
-int is_star_range(p)
-PTR_LLND p;
-{
-  PTR_LLND q, q2;
-
-  if (p->entry.Template.ll_ptr1 == NULL)
-    return (1);
-  q = p->entry.Template.ll_ptr1;/* q should be an index list */
-  q2 = q->entry.Template.ll_ptr1;	/* q2 is the first index     */
-  if ((q2 == NULL || q2->variant == STAR_RANGE)
-      && q->entry.Template.ll_ptr2 == NULL) {
-    return (1);
-  }
-  return (0);
-}
-
-PTR_REFL remove_scalar_dups(s)
-PTR_REFL s;
-{
-  PTR_SYMB i;
-  PTR_REFL t, arr_no_subs, arr_with_subs, final, loop, tmp, point_exps;
-  PTR_LLND p;
-  int notfound;
-
-  /* prune out all killed nodes from t */
-  final = NULL;
-  arr_no_subs = NULL;
-  arr_with_subs = NULL;
-  point_exps = NULL;
-  t = s;
-  while (t != NULL) {
-    tmp = t;
-    t = t->next;
-    p = tmp->node->refer;
-    i = p->entry.Template.symbol;
-    tmp->next = NULL;
-    if (p->variant == VAR_REF ||
-	(p->variant == ARRAY_REF && is_star_range(p))) {
-      if (p->variant == ARRAY_REF) {
-	loop = arr_no_subs;
-	notfound = 1;
-	while (loop != NULL) {
-	  if (loop->node->refer->entry.Template.symbol == i) {
-	    notfound = 0;
-	  }
-	  loop = loop->next;
-	}
-	if (notfound) {
-	  tmp->next = arr_no_subs;
-	  arr_no_subs = tmp;
-	}
-      }
-      else {
-	loop = final;
-	notfound = 1;
-	while (loop != NULL) {
-	  if (loop->node->refer->entry.Template.symbol == i)
-	    notfound = 0;
-	  loop = loop->next;
-	}
-	if (notfound) {
-	  tmp->next = final;
-	  final = tmp;
-	}
-      }
-    }
-    else if (tmp->node->refer->variant == ARRAY_REF) {
-      tmp->next = arr_with_subs;
-      arr_with_subs = tmp;
-    }
-    else 
-     if(tmp->node->refer->variant==POINTST_OP
-	|| tmp->node->refer->variant == RECORD_REF) {
-      tmp->next = point_exps;
-      point_exps = tmp;
-    }
-  }				/* end while */
-  t = arr_with_subs;
-  while (t != NULL) {
-    tmp = t;
-    t = t->next;
-    i = tmp->node->refer->entry.Template.symbol;
-    tmp->next = NULL;
-    notfound = 1;
-    loop = arr_no_subs;
-    while (loop != NULL) {
-      if (loop->node->refer->entry.Template.symbol == i)
-	notfound = 0;
-      loop = loop->next;
-    }
-    if (notfound) {
-      tmp->next = final;
-      final = tmp;
-    }
-  }
-  t = arr_no_subs;
-  while (t != NULL) {
-    tmp = t;
-    t = t->next;
-    tmp->next = final;
-    final = tmp;
-  }
-  t = point_exps;
-  while (t != NULL) {
-    tmp = t;
-    t = t->next;
-    tmp->next = final;
-    final = tmp;
-  }
-  return (final);
-}
-
-
-/***********************************************************************/
-/*								       */
-/*	dependence manipulation routines rm_dep() and append_dep()     */
-/*	taken from lists.c in bled.  should be deleted from that file  */
-/*								       */
-/***********************************************************************/
-void rm_dep(b, d)		/* remove dep d from the list out of b */
-PTR_BFND b;
-PTR_DEP d;
-{
-  PTR_DEP s, olds = NULL;
-
-  s = b->entry.Template.dep_ptr1;
-  if (s == d) {
-    b->entry.Template.dep_ptr1 = d->from_fwd;
-    d->from_fwd = NULL;
-  }
-  else {
-    while ((s != NULL) && (s != d)) {
-      olds = s;
-      s = s->from_fwd;
-    }
-    if (s) {
-      olds->from_fwd = s->from_fwd;
-      d->from_fwd = NULL;
-    }
-  }
-}
-
-static int check_dep_copy(b, t, s, bf, lf, bt, lt)
-PTR_BFND b, bf, bt;
-PTR_SYMB s;
-int t;
-PTR_LLND lf, lt;
-{
-   PTR_DEP lst;
-   lst = b->entry.Template.dep_ptr1;
-   while(lst){
-     if(lst->type == t && lst->symbol == s &&
-	lst->from.stmt == bf && lst->from.refer == lf &&	
-	lst->to.stmt == bt && lst->to.refer == lt)
-	   return 0;
-     lst = lst->from_fwd;
-   }
-   return 1;
- }
-
-void append_dep(b, d)		/* add the dep d to the list from b */
-PTR_BFND b;
-PTR_DEP d;
-{
-  PTR_BFND t;
-
-  d->from_fwd = b->entry.Template.dep_ptr1;
-  b->entry.Template.dep_ptr1 = d;
-  t = d->to.stmt;
-  d->to_fwd = t->entry.Template.dep_ptr2;
-  t->entry.Template.dep_ptr2 = d;
-}
-
-
-
-/**************************************************************/
-/* make deps is the key routine that checks two references to */
-/* see if they are in fact a dependence.  if so a new dep is  */
-/* created and linked into the structure		      */
-/**************************************************************/
-void make_deps(type, def, use)
-PTR_REFL def, use;
-int type;
-{
-  PTR_REFL g;			/* temporary reference list		 */
-  PTR_SYMB s;			/* symbol for varialble name		 */
-  PTR_SYMB ivar;		/* an induction variable name		 */
-  int i, j, befr, notrub, type1;
-  int vect[MAX_NEST_DEPTH], troub[MAX_NEST_DEPTH];
-
-  PTR_DEP dptr; 		/* pointer to dependence inserted	 */
-  PTR_DEP make_dep();		/* functions from list.c		 */
-  char t;			/* type: 0=flow 1=anti 2 = output	 */
-  PTR_LLND lls, lld;		/* term source and destination		 */
-  PTR_BFND bns, bnd;		/* biff nd source and destination	 */
-  char dv[MAX_NEST_DEPTH];	/* dep. vector: 1="="	2="<"  4=">" ?	 */
-  while (def != NULL) {
-    s = def->id;
-    g = use;
-    if ((s != NULL) && (s->type != NULL) &&
-	((type != INPUTD) || (s->type->variant == T_ARRAY)))
-      while (g != NULL) {
-	if (g->id == s) {
-	  /* compute the distance vector and trouble vector */
-
-	  befr = before(def->node->stmt, g->node->stmt);
-	  comp_dist(vect, troub, def->node, g->node, befr);
-
-	  /* first zero out all vector components */
-	  /* outside the scope of the variable */
-
-	  /* this is to fix the problem with */
-	  /* nested foralls.		   */
-	  s = def->id;
-	  notrub = 1;
-	  for (i = vect[0]; i >= 1; i--) {
-	    if (is_forall[i - 1]) {
-	      ivar = induct_list[i - 1];
-	      while (ivar != NULL && ivar != s)
-		ivar = ivar->next_symb;
-	      if (ivar == s) {	/* found local */
-		notrub = 0;
-	      }
-	    }
-	    if (notrub == 0) {
-	      vect[i] = 0;
-	      troub[i] = 0;
-	    }
-	  }
-
-
-	  if (troub[0] == 1) {
-	    /* no dependence here */
-	  }
-	  else {
-	    /* dependence  exists, so generate the record and information */
-	    bns = def->node->stmt;
-	    lls = def->node->refer;
-	    bnd = g->node->stmt;
-	    lld = g->node->refer;
-	    type1 = type;
-	    if(bns == bnd && (lls != lld) && identical(lls, lld)){
-		/* this is an accumulation recurrence if lls and lld are */
-		/* identical. They should be compared.	if they are the  */
-		/* same, create an accumulation dep ACCD.  Check this	 */
-		/* for flow and avoid generating the output and anti deps*/ 
-		if (type1 == FLOWD) type1 = 5;
-		else type1 = 6;
-	      }
-	    /* convert to standard bif constants */
-	    switch (type1) {
-	    case 5: /* ACCD: */
-	       t = 3;
-	       break;
-	     case FLOWD:
-	      if (show_deps)
-		fprintf(stderr, "flow dependence on var:`%s' -", s->ident);
-	      t = 0;
-	      break;
-	     case OUTPUTD:
-	     case -OUTPUTD:
-	      if (show_deps)
-		fprintf(stderr, " output dependence on var:`%s' -", s->ident);
-	      t = 2;
-	      break;
-	     case ANTID:
-	      if (show_deps)
-		fprintf(stderr, "anti dependence on var:`%s' -", s->ident);
-	      t = 1;
-	      break;
-	     case INPUTD:
-	      t = 4;
-	      break;
-	     default:
-	      if (show_deps)
-		fprintf(stderr, " bad type -");
-	      t = 5;
-	    }
-	    if(t == 5) break;
-	    if (show_deps &&(t != 4))
-		fprintf(stderr, "((level=%d)", vect[0]);
-	    for (j = 0; j < MAX_NEST_DEPTH; j++)
-	      dv[j] = 0;
-	    for (j = 1; j <= vect[0]; j++)
-	      switch (troub[j]) {
-	       case NODEP:
-	       case -99:
-	       case 0:
-		if (show_deps)
-		  if (t != 4)
-		    fprintf(stderr, ", %d ", vect[j]);
-		if (vect[j] > 0)
-		  dv[j] = 4;
-		else if (vect[j] == 0)
-		  dv[j] = 1;
-		else
-		  dv[j] = 2;
-		break;
-	       case PLUS:
-		if (show_deps)
-		  if (t != 4)
-		    fprintf(stderr, ", +");
-		dv[j] = 4;
-		break;
-	       case ZPLUS:
-		if (show_deps)
-		  if (t != 4)
-		    fprintf(stderr, ", 0/+");
-		dv[j] = 5;
-		break;
-	       case MINUS:
-		if (show_deps)
-		  if (t != 4)
-		    fprintf(stderr, ", -");
-		dv[j] = 2;
-		break;
-	       case ZMINUS:
-		if (show_deps)
-		  if (t != 4)
-		    fprintf(stderr, ", 0/-");
-		dv[j] = 3;
-		break;
-	       case PLUSMINUS:
-		if (show_deps)
-		  if (t != 4)
-		    fprintf(stderr, ", +/-");
-		dv[j] = 7;
-		break;
-	       default:
-		if (show_deps)
-		  if (t != 4)
-		    fprintf(stderr, ", ??%d ", troub[j]);
-		dv[j] = 8;
-	      }
-	    if (show_deps && (t != 4))
-		fprintf(stderr, ")\n");
-	    for (j = 1; j <= vect[0]; j++) {
-	      if (is_forall[j - 1] && (t != 4)) {
-		if (troub[j] == 0 || troub[j] == NODEP
-		    || troub[j] == -99) {
-		  if (vect[j] != 0)
-		    fprintf(stderr, "WARNING!! may be potential concurrency conflict\n");
-		}
-		else
-		  fprintf(stderr, "WARNING!! May be potential Concurrency conflict\n");
-	      }
-	    }
-
-
-	    /* now make the dependences...	 */
-	    /* only generate uniformly generated input deps. */
-	    /* Temp for cftn. disable input deps */
-	    /* disabled: note unif_gen has more arguments */
-	    if (t != 4 && t != 5 &&
-		check_dep_copy(bns,t,s,bns,lls,bnd,lld)){
-		   dptr = make_dep(cur_file, s, t, lls, lld, bns, bnd, dv);
-		   append_dep(bns, dptr);
-	    }
-
-	    /* note: only appends to from list	*/
-	    /* if you want more fix append_dep */
-	  }
-	}
-	else {
-	  /* symbols do not agree */
-	}
-	g = g->next;
-      }
-    def = def->next;
-  }
-}
-/***************************************************************/
-/* link_set_list() builds a expr list of low level expressions */
-/* that describe the use of variable in the list.  it will list*/
-/* each scalar only once and for each array reference it will  */
-/* build an expression that describes the use of the variable  */
-/* using ddot form. lots of common subexpressions are used.    */
-/* find_bounds() is found in anal_ind.c 		       */
-/***************************************************************/
-
-PTR_LLND link_set_list(s)
-PTR_REFL s;
-{
-  PTR_LLND p, q, newq, make_llnd(), find_bounds();
-  PTR_BFND b;
-  PTR_REFL remove_scalar_dups();
-  PTR_LLND remove_array_dups(), merge_ll_array_list();
-
-  s = remove_scalar_dups(s);
-  p = NULL;
-  while (s != NULL) {
-    switch (s->node->refer->variant) {
-     case VAR_REF:
-     case POINTST_OP:
-     case RECORD_REF:
-      p = make_llnd(cur_file, EXPR_LIST, s->node->refer, p, NULL);
-      break;
-     case ARRAY_REF:
-      q = s->node->refer;
-      b = s->node->stmt;
-      newq = make_llnd(cur_file, ARRAY_REF,NULL,NULL,q->entry.Template.symbol);
-      newq = find_bounds(b, q, newq);
-      /* now put q into normal form */
-      normal_form(&(newq->entry.Template.ll_ptr1));
-      q = newq->entry.Template.ll_ptr1;
-      /* now link into expr list chain p */
-      p = make_llnd(cur_file, EXPR_LIST, newq, p, NULL);
-      break;
-     default:
-      fprintf(stderr, "something wrong here ");
-      break;
-    }
-    s = s->next;
-  }
-  return (merge_ll_array_list(merge_ll_array_list(p))); /* two passes */
-}
-
-PTR_LLND remove_array_dups(elist)
-PTR_LLND elist;
-{
-  PTR_LLND star_range_list;
-  PTR_LLND tmp_list;
-  PTR_LLND final_list, cons, item, p, q;
-  PTR_SYMB var;
-  int not_found;
-
-  /* first pull off all star range arrays from elist and put them */
-  /* on the star_range_list.  Others go to tmp_list.  Then tmp_list */
-  /* compared to star_range list.  If not there it is added to final */
-  /* list and star_range_list is appended to tmp_list.		  */
-  star_range_list = NULL;
-  tmp_list = NULL;
-  final_list = NULL;
-  while (elist != NULL) {
-    cons = elist;
-    elist = elist->entry.Template.ll_ptr2;
-    cons->entry.Template.ll_ptr2 = NULL;
-    item = cons->entry.Template.ll_ptr1;
-    var = item->entry.Template.symbol;
-    p = star_range_list;
-    q = tmp_list;
-    if (item->variant == ARRAY_REF && is_star_range(item)) {
-      not_found = 1;
-      while (p != NULL) {
-	if (var == p->entry.Template.ll_ptr1->entry.Template.symbol) {
-	  not_found = 0;
-	  break;
-	}
-	p = p->entry.Template.ll_ptr2;
-      }
-      if (not_found) {
-	cons->entry.Template.ll_ptr2 = star_range_list;
-	star_range_list = cons;
-      }
-    }
-    else {
-      not_found = 1;
-      while (q != NULL) {
-	if (identical(q->entry.Template.ll_ptr1, item)) {
-	  not_found = 0;
-	  break;
-	}
-	q = q->entry.Template.ll_ptr2;
-      }
-      if (not_found) {
-	cons->entry.Template.ll_ptr2 = tmp_list;
-	tmp_list = cons;
-      }
-    }
-  }
-  while (tmp_list != NULL) {
-    cons = tmp_list;
-    tmp_list = tmp_list->entry.Template.ll_ptr2;
-    cons->entry.Template.ll_ptr2 = NULL;
-    item = cons->entry.Template.ll_ptr1;
-    var = item->entry.Template.symbol;
-    p = star_range_list;
-    if (item->variant == ARRAY_REF) {
-      not_found = 1;
-      while (p != NULL) {
-	if (var == p->entry.Template.ll_ptr1->entry.Template.symbol) {
-	  not_found = 0;
-	  break;
-	}
-	p = p->entry.Template.ll_ptr2;
-      }
-      if (not_found) {
-	cons->entry.Template.ll_ptr2 = final_list;
-	final_list = cons;
-      }
-    }
-    else {
-      cons->entry.Template.ll_ptr2 = final_list;
-      final_list = cons;
-    }
-  }
-  q = final_list;
-  while (q != NULL && q->entry.Template.ll_ptr2 != NULL)
-    q = q->entry.Template.ll_ptr2;
-  if (q == NULL)
-    final_list = star_range_list;
-  else
-    q->entry.Template.ll_ptr2 = star_range_list;
-  return (final_list);
-}
-/* buid_recur_expr will try to reduce simple recurrences like */
-/* i = i+1 in loop into expressions involving an induction var*/
-PTR_LLND build_recur_expr(stmt, s,lls, lld)
-PTR_BFND stmt;
-PTR_SYMB s;
-PTR_LLND lls,lld;
-{
-   PTR_BFND parent;
-   PTR_LLND init_val, index_ref, rhs, new_expr, coef, lb, one;
-   PTR_LLND copy_llnd();
-  
-   parent = stmt->control_parent;
-   if(parent->variant == FOR_NODE || parent->variant == CDOALL_NODE){
-	  if(stmt->variant == ASSIGN_STAT){
-	    init_val = lld->entry.Template.ll_ptr1;
-	    lb = copy_llnd(parent->entry.Template.ll_ptr1->entry.Template.ll_ptr1);
-	    index_ref = make_llnd(cur_file,VAR_REF,NULL,NULL,
-				  parent->entry.Template.symbol);
-	    one = make_llnd(cur_file,INT_VAL,NULL,NULL,NULL);
-	    one->entry.ival = 0; 
-	    lb = make_llnd(cur_file,SUBT_OP,one,lb,NULL);
-	    index_ref = make_llnd(cur_file,ADD_OP,index_ref,lb,NULL);
-	    rhs = stmt->entry.Template.ll_ptr2;
-	    /*
-	    printf("index:%s init_val:%s rhs:%s",
-		   (UnparseLlnd[cur_file->lang])(index_ref),
-		   (UnparseLlnd[cur_file->lang])(init_val),
-		   (UnparseLlnd[cur_file->lang])(rhs));
-	    */
-	    if(rhs->variant == ADD_OP){
-		 if(rhs->entry.Template.ll_ptr1 == lld)
-		      coef = rhs->entry.Template.ll_ptr2;
-		 else if(rhs->entry.Template.ll_ptr2 == lld)
-		      coef = rhs->entry.Template.ll_ptr1;
-		 else return NULL;
-		 new_expr = make_llnd(cur_file,MULT_OP,
-				       copy_llnd(coef),index_ref,NULL);
-		 new_expr = make_llnd(cur_file,ADD_OP,new_expr,init_val,NULL);
-		/*printf("new expr:%s",(UnparseLlnd[cur_file->lang])(new_expr));*/
-		 return new_expr;
-	       }
-	    else if(rhs->variant == SUBT_OP){
-		 if(rhs->entry.Template.ll_ptr1 == lld)
-		      coef = rhs->entry.Template.ll_ptr2;
-		 else return NULL;
-		 if(coef == NULL) return NULL;
-		 new_expr = make_llnd(cur_file,MULT_OP,
-				       copy_llnd(coef),index_ref,NULL);
-		 new_expr = make_llnd(cur_file,SUBT_OP,init_val,new_expr,NULL);
-		/*printf("new expr:%s",(UnparseLlnd[cur_file->lang])(new_expr));*/
-		 return new_expr;
-	    }
-	    else return NULL;
-	  }
-	  else return NULL;
-	}
-   else return NULL;
-}
-/* propogate will do the scalar propogation.  (test version). */
-void propogate(def, use)
-PTR_REFL def, use;
-{
-  PTR_REFL g;			/* temporary reference list		 */
-  PTR_SYMB s;			/* symbol for varialble name		 */
-  PTR_LLND lls, lld;		/* term source and destination		 */
-  PTR_BFND bns; 		/* biff nd source and destination	 */
-  PTR_LLND p;
-
-  /* search through each of the definitions */
-  while (def != NULL) {
-    s = def->id;		/* s is the symbol table entry */
-    g = use;
-    if ((s != NULL) && (s->type != NULL) &&
-	(s->type->variant == T_INT))
-      while (g != NULL) {
-	if (g->id == s) {
-	  lld = g->node->refer;
-	  if (def->node->stmt == g->node->stmt) {
-	    /* definition is reaching itself where it is used */
-	    /* printf("recurrence\n"); */
-	    lld = g->node->refer;
-	    lls = def->node->refer;
-	    if(lld->entry.Template.ll_ptr1 != NULL)
-	      lld->entry.Template.ll_ptr1 = build_recur_expr(g->node->stmt,s,lls,lld);
-	    else lld->entry.Template.ll_ptr1 = NULL;
-	    }
-	  else{
-	    /* a definition is reaching a different use */
-	    bns = def->node->stmt;
-	    lld = g->node->refer;
-	    lls = def->node->refer;
-	    if (bns->variant == FOR_NODE) {
-	      lld->entry.Template.ll_ptr1 = NULL;
-	    }
-	    else if (bns->variant != EXPR_STMT_NODE) {
-	      /* a Fortran  assignment, p <- rhs of source */
-	      p = bns->entry.Template.ll_ptr2;
-	      if (lld->entry.Template.ll_ptr1 == NULL)
-		lld->entry.Template.ll_ptr1 = p;
-	      else if (lld->entry.Template.ll_ptr1 != p)
-		lld->entry.Template.ll_ptr1 = NULL;
-	    }
-	    else {
-	      /* a C EXPR_STMT_NODE */
-	      p = bns->entry.Template.ll_ptr1;
-	      /* assume it is expr list then asign op */
-	      p = p->entry.Template.ll_ptr1;
-	      while (p != NULL &&
-		     p->entry.Template.ll_ptr1 != lls)
-		p = p->entry.Template.ll_ptr2;
-	      if (p != NULL)
-		p = p->entry.Template.ll_ptr2;
-	      if (lld->entry.Template.ll_ptr1 == NULL)
-		lld->entry.Template.ll_ptr1 = p;
-	      else if (lld->entry.Template.ll_ptr1 != p)
-		lld->entry.Template.ll_ptr1 = NULL;
-	    }
-	  }
-	}
-	else {
-	  /* symbols do not agree */
-	}
-	g = g->next;
-      }
-    def = def->next;
-  }
-}
-
-
-/***************************************************************/
-/* build sets is called four times.Once with pass = 1 and once */
-/* with pass = 2.  On the first pass:			       */
-/*   1. synthesized attributes: gen and use are passed up tree */
-/*   2. the id fields of the biff nodes are renumbered in      */
-/*	control flow tree preorder. i.e. lexical order	       */
-/* on the second pass:					       */
-/*   1. the inherited attributes are propogated down the tree  */
-/*   2. dependence arcs are generated.			       */
-/* the variable rnd is used to destinguish between using info  */
-/* from a global analysis sweep and ignoring the effect of     */
-/* function calls.					       */
-/***************************************************************/
-PTR_SETS build_sets(int rnd, PTR_BFND b, PTR_REFL in_use, PTR_REFL in_def,int pass)
-/*int rnd;*/			/* rnd = 0 first time and rnd = 1 after
-				 * global analysis */
-/*PTR_BFND b;*/
-/*PTR_REFL in_use, in_def;*/
-/*int pass;*/
-{
-  PTR_BLOB bl;
-  PTR_SETS s;
-  PTR_REFL gen, use, out_use, out_def, detmp;
-  PTR_REFL out_useT, out_useF, out_defT, out_defF;
-  PTR_REFL remove_locals();
-  PTR_LLND link_set_list();
-  PTR_REFL tmp1, tmp2, tmp3;
-
-  if (b == NULL)
-    fprintf(stderr, "null bfnd!!\n");
-
-  if (b != NULL)
-    switch (b->variant) {
-
-     case GLOBAL:
-      node_count = 0;
-      bl = b->entry.Template.bl_ptr1;
-      b->id = node_count++;
-      while ((bl != NULL) && (bl->ref != b)) {
-	if ((bl->ref->variant == PROG_HEDR) ||
-	    (bl->ref->variant == FUNC_HEDR) ||
-	    (bl->ref->variant == PROC_HEDR))
-	  s = build_sets(rnd, bl->ref, NULL, NULL, pass);
-	bl = bl->next;
-      }
-      break;
-
-     case PROG_HEDR:
-      /* PASS 1 ---------------------- */
-      /* visit each child		 */
-      if (pass == 1) {
-	b->id = node_count++;
-	if (b->entry.Template.sets == NULL)
-	  b->entry.Template.sets = alloc_sets();
-	b->entry.Template.sets->out_use = NULL;
-	b->entry.Template.sets->in_use = NULL;
-	b->entry.Template.sets->out_def = NULL;
-	b->entry.Template.sets->in_def = NULL;
-	b->entry.Template.sets->gen = NULL;
-	b->entry.Template.sets->use = NULL;
-	bl = b->entry.Template.bl_ptr1;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, NULL, NULL, pass);
-	  bl = bl->next;
-	}
-	return (b->entry.Template.sets);
-      }
-      else {
-	PTR_REFL t1, t2;
-	/* PASS 2 ---------------------- */
-	in_use = NULL;
-	out_def = NULL;
-	out_use = NULL;
-	bl = b->entry.Template.bl_ptr1;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, out_use, out_def, pass);
-	  out_use = s->out_use;
-	  out_def = s->out_def;
-	  bl = bl->next;
-	}
-	/* at this point intersect out_use and */
-	/* out_def with the global and commons */
-	/* and set to out_use and out_def      */
-	t1 = intersect_refl(b->entry.Template.sets->in_def, out_def);
-	t2 = remove_locals_from_list(out_def);
-	b->entry.Template.sets->out_def = union_refl(t1, t2);
-	disp_refl(t1);
-	disp_refl(t2);
-	t1 = intersect_refl(b->entry.Template.sets->in_def, out_use);
-	t2 = remove_locals_from_list(out_use);
-	b->entry.Template.sets->out_use = union_refl(t1, t2);
-	disp_refl(t1);
-	disp_refl(t2);
-	if (rnd == 0) {
-	  fprintf(stderr, "%%program %s --\n",
-		 b->entry.procedure.proc_symb->ident);
-	  fprintf(stderr, "%s\n",
-		 b->entry.procedure.proc_symb->ident);
-	  fprintf(stderr, ">>L %d \n", b->g_line);
-	  fprintf(stderr, "%%defines variables\n");
-	  b->entry.Template.ll_ptr2 =
-	    make_llnd(cur_file, EXPR_LIST, NULL, NULL, NULL);
-	  b->entry.Template.ll_ptr2->entry.Template.ll_ptr1 =
-	    link_set_list(b->entry.Template.sets->out_def);
-	  b->entry.Template.ll_ptr3 =
-	    make_llnd(cur_file, EXPR_LIST, NULL, NULL, NULL);
-	  b->entry.Template.ll_ptr3->entry.Template.ll_ptr1 =
-	    link_set_list(b->entry.Template.sets->out_use);
-	  fprintf(stderr, "%s",
-		  (UnparseLlnd[cur_file->lang])(b->entry.Template.ll_ptr2));
-	  fprintf(stderr, "%% and uses\n");
-	  fprintf(stderr, "%s\n",
-		  (UnparseLlnd[cur_file->lang])(b->entry.Template.ll_ptr3));
-	  fprintf(stderr, "\n");
-	}
-	return (b->entry.Template.sets);
-      }
-
-     case PROC_HEDR:
-     case FUNC_HEDR:
-      /* PASS 1 ---------------------- */
-      if (pass == 1) {
-	b->id = node_count++;
-	if (b->entry.Template.sets == NULL)
-	  b->entry.Template.sets = alloc_sets();
-	b->entry.Template.sets->out_use = NULL;
-	b->entry.Template.sets->in_use = NULL;
-	b->entry.Template.sets->out_def = NULL;
-	b->entry.Template.sets->in_def = NULL;
-	b->entry.Template.sets->gen = NULL;
-	b->entry.Template.sets->use = NULL;
-	/* set in_def  to be a ref list of all */
-	/* parameters to this proc.  this is	 */
-	/* appended with commons and then it is */
-	/* interesected with the real ref and  */
-	/* use list in pass 2.		 */
-	b->entry.Template.sets->in_def =
-	  make_name_list(b->entry.Template.symbol->entry.proc_decl.in_list);
-	bl = b->entry.Template.bl_ptr1;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, NULL, NULL, pass);
-	  bl = bl->next;
-	}
-	return (b->entry.Template.sets);
-      }
-      else {
-	PTR_REFL t1, t2;
-
-	/* PASS 2 ---------------------- */
-	/* visit each child		 */
-	/* in_def = in_params; in_use = {}; out_def = in_def; out_use = {};
-	 * for each child do pass out_use and out_def; visit child; out_use =
-	 * child.out_use; out_def = child.out_def; end; */
-	in_use = NULL;
-	out_def = NULL;
-	out_use = NULL;
-	bl = b->entry.Template.bl_ptr1;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, out_use, out_def, pass);
-	  out_use = s->out_use;
-	  out_def = s->out_def;
-	  bl = bl->next;
-	}
-	/* interest out_use and out_def with the */
-	/* parameters and common statements	    */
-	t1 = intersect_refl(b->entry.Template.sets->in_def, out_def);
-	t2 = remove_locals_from_list(out_def);
-	b->entry.Template.sets->out_def = union_refl(t1, t2);
-	disp_refl(t1);
-	disp_refl(t2);
-	t1 = intersect_refl(b->entry.Template.sets->in_def, out_use);
-	t2 = remove_locals_from_list(out_use);
-	b->entry.Template.sets->out_use = union_refl(t1, t2);
-	disp_refl(t1);
-	disp_refl(t2);
-	t1 = b->entry.Template.sets->out_def;
-	t2 = b->entry.Template.sets->out_use;
-	if (rnd == 0) {
-	  b->entry.Template.ll_ptr2 =
-	    make_llnd(cur_file, EXPR_LIST, NULL, NULL, NULL);
-	  b->entry.Template.ll_ptr2->entry.Template.ll_ptr1 =
-	    link_set_list(t1);
-	  b->entry.Template.ll_ptr3 =
-	    make_llnd(cur_file, EXPR_LIST, NULL, NULL, NULL);
-	  b->entry.Template.ll_ptr3->entry.Template.ll_ptr1 =
-	    link_set_list(t2);
-	  fprintf(stderr, "%%procedure %s-\n",
-		 b->entry.procedure.proc_symb->ident);
-	  fprintf(stderr, "%s", (UnparseBfnd[cur_file->lang])(b));
-	  fprintf(stderr, ">>L %d \n", b->g_line);
-	  fprintf(stderr, "%%which defines values for-\n");
-	  fprintf(stderr, "%s",
-		  (UnparseLlnd[cur_file->lang])(b->entry.Template.ll_ptr2));
-	  fprintf(stderr, "\n%%and uses values-\n");
-	  fprintf(stderr, "%s\n",
-		  (UnparseLlnd[cur_file->lang])(b->entry.Template.ll_ptr3));
-	}
-	return (b->entry.Template.sets);
-      }
-     case COMM_STAT:
-      if (pass == 1) {
-	b->id = node_count++;
-	if (b->entry.Template.sets == NULL)
-	  b->entry.Template.sets = alloc_sets();
-	b->entry.Template.sets->gen = NULL;
-	b->entry.Template.sets->use = NULL;
-	/* now gather up all the varaibles and */
-	/* link them in to the parent node.	  */
-	/* not done yet.			  */
-	detmp = NULL;
-	tmp1 = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr1);
-	tmp2 = b->control_parent->entry.Template.sets->in_def;
-	while ((tmp2 != NULL) && (tmp2->next != NULL))
-	  tmp2 = tmp2->next;
-	if (tmp2 == NULL)
-	  b->control_parent->entry.Template.sets->in_def = tmp1;
-	else
-	  tmp2->next = tmp1;
-	return (b->entry.Template.sets);
-      }
-      else {
-	/* PASS 2 ----------------------- */
-	/* just pass everything through! */
-	b->entry.Template.sets->out_def = in_def;
-	b->entry.Template.sets->out_use = in_use;
-	return (b->entry.Template.sets);
-      }
-     case EXPR_STMT_NODE:
-      /* PASS 1 ----------------------- */
-      /* make synth. attribs gen, use */
-      if (pass == 1) {
-	b->id = node_count++;
-	if (b->entry.Template.sets == NULL)
-	  b->entry.Template.sets = alloc_sets();
-	if (b->entry.Template.sets->gen == NULL) {
-	  detmp = NULL;
-	  tmp1 = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr1);
-	  /* we only want the first.  the others are uses */
-	  b->entry.Template.sets->gen = detmp;
-	  b->entry.Template.sets->use = tmp1;
-	}
-	return (b->entry.Template.sets);
-      }
-      else {
-	/* PASS 2 ----------------------- */
-	b->entry.Template.sets->in_use = copy_refl(in_use);
-	b->entry.Template.sets->in_def = copy_refl(in_def);
-
-	/* set local kill = { X in in_def | ref(X) in gen } */
-	out_def = rem_kill(in_def, b->entry.Template.sets->gen);
-
-	assign(&out_def,union_refl(out_def, b->entry.Template.sets->gen));
-	b->entry.Template.sets->out_def = out_def;
-
-	/* out_use = in_use + use */
-	b->entry.Template.sets->out_use =
-	  union_refl(in_use, b->entry.Template.sets->use);
-	propogate(in_def, b->entry.Template.sets->use);
-	return (b->entry.Template.sets);
-      }
-     case ASSIGN_STAT:
-     case M_ASSIGN_STAT:
-     case SUM_ACC:
-     case MULT_ACC:
-     case MAX_ACC:
-     case MIN_ACC:
-     case CAT_ACC:
-     case OR_ACC:
-     case AND_ACC:
-     case READ_STAT:
-     case WRITE_STAT:
-     case PROC_STAT:
-      /* PASS 1 ----------------------- */
-      /* make synth. attribs gen, use */
-      if (pass == 1) {
-	b->id = node_count++;
-	if (b->entry.Template.sets == NULL)
-	  b->entry.Template.sets = alloc_sets();
-	if (b->entry.Template.sets->gen == NULL) {
-	  detmp = NULL;
-	  tmp1 = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr1);
-	  if (b->variant == PROC_STAT) {
-	    b->entry.Template.sets->gen = detmp;
-	    b->entry.Template.sets->use = tmp1;
-	    return (b->entry.Template.sets);
-	  }
-	  /* we only want the first.  the others are uses */
-	  if (tmp1 == NULL) {
-	    tmp2 = NULL;
-	    b->entry.Template.sets->gen = NULL;
-	  }
-	  else {
-	    tmp2 = tmp1->next;
-	    tmp1->next = NULL;
-	    b->entry.Template.sets->gen = tmp1;
-	  }
-	}
-	else
-	  tmp2 = NULL;
-	if (b->entry.Template.sets->use == NULL) {
-	  detmp = NULL;
-	  tmp1 = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr2);
-	  if (tmp2 != NULL) {
-	    tmp3 = union_refl(tmp1, tmp2);
-	    disp_refl(tmp1);
-	    disp_refl(tmp2);
-	  }
-	  else
-	    tmp3 = tmp1;
-	  b->entry.Template.sets->use = tmp3;
-	}
-	return (b->entry.Template.sets);
-      }
-      else {
-	/* PASS 2 ----------------------- */
-	b->entry.Template.sets->in_use = copy_refl(in_use);
-	b->entry.Template.sets->in_def = copy_refl(in_def);
-
-	/* set local kill = { X in in_def | ref(X) in gen } */
-	out_def = rem_kill(in_def, b->entry.Template.sets->gen);
-
-	/* create synth. attrib. out_def = in_def - kill + gen */
-	assign(&out_def,
-	       union_refl(out_def, b->entry.Template.sets->gen)
-	  );
-	b->entry.Template.sets->out_def = out_def;
-
-	/* out_use = in_use + use */
-	b->entry.Template.sets->out_use =
-	  union_refl(in_use, b->entry.Template.sets->use);
-
-	propogate(in_def, b->entry.Template.sets->use);
-	return (b->entry.Template.sets);
-      }
-
-     case LOOP_NODE:
-     case FOR_NODE:
-     case WHILE_NODE:
-      /* PASS 1 ---------------------- */
-      /* for each child collect gen and use */
-      if (pass == 1) {
-	b->id = node_count++;
-	use = NULL;
-	gen = NULL;
-	detmp = NULL;
-	if (b->entry.Template.symbol == NULL) { /* this is  a C loop */
-	  use = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr1);
-	  gen = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr2);
-	  assign(&use, union_refl(use, gen));
-	  gen = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr3);
-	  assign(&use, union_refl(use, gen));
-	  assign(&gen, detmp);
-	}
-	else
-	  use = gather_refl(rnd, &detmp, b, b->entry.for_node.range);
-	bl = b->entry.Template.bl_ptr1;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, NULL, NULL, pass);
-	  assign(&use, union_refl(use, s->use));
-	  gen = rem_kill(gen, s->gen);	/* try to fix propogation prob */
-	  assign(&gen, union_refl(gen, s->gen));
-	  bl = bl->next;
-	}
-	if (b->entry.Template.sets == NULL)
-	  b->entry.Template.sets = alloc_sets();
-	b->entry.Template.sets->out_use = NULL;
-	b->entry.Template.sets->in_use = NULL;
-	b->entry.Template.sets->out_def = NULL;
-	b->entry.Template.sets->in_def = NULL;
-	b->entry.Template.sets->gen = remove_locals(b, gen);
-	b->entry.Template.sets->use = remove_locals(b, use);
-	return (b->entry.Template.sets);
-      }
-      else {
-	/* PASS 2 ---------------------- */
-	s = b->entry.Template.sets;
-	b->entry.Template.sets->in_use = copy_refl(in_use);
-	b->entry.Template.sets->out_def = copy_refl(in_def);
-	/* first take care of range varible propogation. */
-	detmp = NULL;
-	if (b->entry.Template.symbol == NULL) { /* this is  a C loop */
-	  use = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr1);
-	  gen = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr2);
-	  assign(&use, union_refl(use, gen));
-	  gen = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr3);
-	  assign(&use, union_refl(use, gen));
-	  gen = detmp;
-	}
-	else
-	  use = gather_refl(rnd, &detmp, b, b->entry.for_node.range);
-	propogate(in_def, use);
-	/* now	take care of children */
-	out_use = union_refl(in_use, s->use);
-	out_def = union_refl(in_def, s->gen);
-	bl = b->entry.Template.bl_ptr1;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, out_use, out_def, pass);
-	  assign(&out_use, copy_refl(s->out_use));
-	  assign(&out_def, copy_refl(s->out_def));
-	  bl = bl->next;
-	}
-	b->entry.Template.sets->out_use = out_use;
-	b->entry.Template.sets->out_def = out_def;
-	return (b->entry.Template.sets);
-      }
-     case PARFOR_NODE:
-     case CDOALL_NODE:
-      /* PASS 1 ----------------------		 */
-      /* for each child collect gen and use		 */
-      if (pass == 1) {
-	b->id = node_count++;
-	use = NULL;
-	gen = NULL;
-	detmp = NULL;
-	if (b->variant == PARFOR_NODE) {
-	  use = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr2);
-	  bl = b->entry.Template.bl_ptr1;
-	}
-	else {
-	  use = gather_refl(rnd, &detmp, b, b->entry.for_node.range);
-	  bl = b->entry.Template.bl_ptr2;
-	}
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, NULL, NULL, pass);
-	  assign(&use, union_refl(use, s->use));
-	  assign(&gen, union_refl(gen, s->gen));
-	  bl = bl->next;
-	}
-	if (b->variant == CDOALL_NODE &&
-	    b->entry.Template.bl_ptr1 != NULL) {
-	  bl = b->entry.Template.bl_ptr1;
-	  while ((bl != NULL) && (bl->ref != b)) {
-	    s = build_sets(rnd, bl->ref, NULL, NULL, pass);
-	    assign(&use, union_refl(use, s->use));
-	    assign(&gen, union_refl(gen, s->gen));
-	    bl = bl->next;
-	  }
-	}
-	if (b->entry.Template.sets == NULL)
-	  b->entry.Template.sets = alloc_sets();
-	b->entry.Template.sets->out_use = NULL;
-	b->entry.Template.sets->in_use = NULL;
-	b->entry.Template.sets->out_def = NULL;
-	b->entry.Template.sets->in_def = NULL;
-	/* here is difference with other loops	 */
-	/* locals must be deleted from gen and use	 */
-	b->entry.Template.sets->gen = remove_locals(b, gen);
-	b->entry.Template.sets->use = remove_locals(b, use);
-	return (b->entry.Template.sets);
-      }
-      else {
-	/* PASS 2 ---------------------- */
-	s = b->entry.Template.sets;
-	b->entry.Template.sets->in_use = copy_refl(in_use);
-	b->entry.Template.sets->in_def = copy_refl(in_def);
-	detmp = NULL;
-	if (b->variant == PARFOR_NODE) {
-	  use = gather_refl(rnd, &detmp, b, b->entry.Template.ll_ptr2);
-	  bl = b->entry.Template.bl_ptr1;
-	}
-	else {
-	  use = gather_refl(rnd, &detmp, b, b->entry.for_node.range);
-	  bl = b->entry.Template.bl_ptr2;
-	}
-	out_use = union_refl(in_use, s->use);
-	out_def = union_refl(in_def, s->gen);
-	propogate(in_def, use);
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, out_use, out_def, pass);
-	  assign(&out_use, copy_refl(s->out_use));
-	  assign(&out_def, copy_refl(s->out_def));
-	  bl = bl->next;
-	}
-	if (b->variant == CDOALL_NODE &&
-	    b->entry.Template.bl_ptr1 != NULL) {
-	  bl = b->entry.Template.bl_ptr1;
-	  while ((bl != NULL) && (bl->ref != b)) {
-	    s = build_sets(rnd, bl->ref, out_use, out_def, pass);
-	    assign(&out_use, copy_refl(s->out_use));
-	    assign(&out_def, copy_refl(s->out_def));
-	    bl = bl->next;
-	  }
-	}
-	b->entry.Template.sets->out_use = out_use;
-	b->entry.Template.sets->out_def = out_def;
-	return (b->entry.Template.sets);
-      }
-     case LOGIF_NODE:
-     case ELSEIF_NODE:
-     case IF_NODE:
-      /* PASS 1 ---------------------- */
-      /* for each child collect gen and use */
-      if (pass == 1) {
-	b->id = node_count++;
-	use = NULL;
-	gen = NULL;
-	use = gather_refl(rnd, &gen, b, b->entry.Template.ll_ptr1);
-	bl = b->entry.Template.bl_ptr1;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, NULL, NULL, pass);
-	  assign(&use, union_refl(use, s->use));
-	  assign(&gen, union_refl(gen, s->gen));
-	  bl = bl->next;
-	}
-	if (b->variant != LOGIF_NODE) {
-	  bl = b->entry.Template.bl_ptr2;
-	  while ((bl != NULL) && (bl->ref != b)) {
-	    s = build_sets(rnd, bl->ref, NULL, NULL, pass);
-	    assign(&use, union_refl(use, s->use));
-	    assign(&gen, union_refl(gen, s->gen));
-	    bl = bl->next;
-	  }
-	}
-	if (b->entry.Template.sets == NULL)
-	  b->entry.Template.sets = alloc_sets();
-	b->entry.Template.sets->out_use = NULL;
-	b->entry.Template.sets->in_use = NULL;
-	b->entry.Template.sets->out_def = NULL;
-	b->entry.Template.sets->in_def = NULL;
-	b->entry.Template.sets->gen = gen;
-	b->entry.Template.sets->use = use;
-	return (b->entry.Template.sets);
-      }
-      else {
-	/* PASS 2 ------------------------------------------------ */
-	/* for each branch do					  */
-	/* out_use = in_use; out_def_branch = in_def;	  */
-	/* for each child do			  */
-	/* pass out_use and out_def_branch;  */
-	/* visit child			  */
-	/* out_use = child.out_use;	  */
-	/* out_def_branch = child.out_def;   */
-	/* end; 				  */
-	/* out_def = out_def_lbranch+out_def_rbranch */
-	/* ________________________________________________________ */
-	out_defT = in_def;
-	out_useT = in_use;
-	/* visit True children */
-	b->entry.Template.sets->in_use =
-	  copy_refl(in_use);
-	b->entry.Template.sets->in_def =
-	  copy_refl(in_def);
-	bl = b->entry.Template.bl_ptr1;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, out_useT, out_defT, pass);
-	  out_useT = s->out_use;
-	  out_defT = s->out_def;
-	  bl = bl->next;
-	}
-	out_defF = in_def;
-	out_useF = in_use;
-	/* visit False children */
-	bl = b->entry.Template.bl_ptr2;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  s = build_sets(rnd, bl->ref, out_useF, out_defF, pass);
-	  out_useF = s->out_use;
-	  out_defF = s->out_def;
-	  bl = bl->next;
-	}
-	gen = NULL;
-	use = gather_refl(rnd, &gen, b, b->entry.Template.ll_ptr1);
-	assign(&use, union_refl(out_useF, use));
-	assign(&gen, union_refl(out_defF, gen));
-	b->entry.Template.sets->out_use =
-	  union_refl(use, out_useT);
-	b->entry.Template.sets->out_def =
-	  union_refl(gen, out_defT);
-
-	return (b->entry.Template.sets);
-      }
-     case EXIT_NODE:
-      fprintf(stderr, "exit node found! no dep ananysis!\n");
-
-     default:			/* assume a no op */
-      if (pass == 1) {
-	b->id = node_count++;
-	if (b->entry.Template.sets == NULL)
-	  b->entry.Template.sets = alloc_sets();
-	b->entry.Template.sets->gen = NULL;
-	b->entry.Template.sets->use = NULL;
-	return (b->entry.Template.sets);
-      }
-      else {
-	/* PASS 2 ----------------------- */
-	/* just pass everything through! */
-	b->entry.Template.sets->out_def = in_def;
-	b->entry.Template.sets->out_use = in_use;
-	return (b->entry.Template.sets);
-      }
-    }
-  return (NULL);
-}
-
-void gendeps(b)
-PTR_BFND b;
-{
-  PTR_BLOB bl;
-
-  if (b != NULL)
-    switch (b->variant) {
-
-     case GLOBAL:
-      bl = b->entry.Template.bl_ptr1;
-      while ((bl != NULL) && (bl->ref != b)) {
-	gendeps(bl->ref);
-	bl = bl->next;
-      }
-      break;
-
-     case PROG_HEDR:
-      /* visit each child */
-      bl = b->entry.Template.bl_ptr1;
-      while ((bl != NULL) && (bl->ref != b)) {
-	gendeps(bl->ref);
-	bl = bl->next;
-      }
-      break;
-     case PROC_HEDR:
-     case FUNC_HEDR:
-      /* visit each child */
-      if (show_deps)
-	fprintf(stderr, "---------Procedure %s------------------\n",
-	       b->entry.procedure.proc_symb->ident);
-      bl = b->entry.Template.bl_ptr1;
-      while ((bl != NULL) && (bl->ref != b)) {
-	gendeps(bl->ref);
-	if (num_ll_allocated > 10000)
-	  collect_garbage(cur_file);
-	bl = bl->next;
-      }
-      break;
-     case EXPR_STMT_NODE:
-     case ASSIGN_STAT:
-     case M_ASSIGN_STAT:
-     case SUM_ACC:
-     case MULT_ACC:
-     case MAX_ACC:
-     case MIN_ACC:
-     case CAT_ACC:
-     case OR_ACC:
-     case AND_ACC:
-     case READ_STAT:
-     case WRITE_STAT:
-     case PROC_STAT:
-      if (num_ll_allocated > 10000)
-	collect_garbage(cur_file);
-      if (show_deps)
-	fprintf(stderr, "----- line %d \n", b->g_line);
-      make_deps(FLOWD, b->entry.Template.sets->in_def,
-		b->entry.Template.sets->use);
-
-      make_deps(OUTPUTD, b->entry.Template.sets->in_def,
-		b->entry.Template.sets->gen);
-
-      make_deps(ANTID, b->entry.Template.sets->in_use,
-		b->entry.Template.sets->gen);
-
-      make_deps(INPUTD, b->entry.Template.sets->in_use,
-		b->entry.Template.sets->use);
-
-      break;
-
-     case LOOP_NODE:
-     case FOR_NODE:
-     case WHILE_NODE:
-      if (show_deps)
-	fprintf(stderr, "----- line %d \n", b->g_line);
-      make_deps(FLOWD, b->entry.Template.sets->in_def,
-		b->entry.Template.sets->use);
-
-      make_deps(OUTPUTD, b->entry.Template.sets->in_def,
-		b->entry.Template.sets->gen);
-
-      make_deps(ANTID, b->entry.Template.sets->in_use,
-		b->entry.Template.sets->gen);
-
-      make_deps(INPUTD, b->entry.Template.sets->in_use,
-		b->entry.Template.sets->use);
-
-      if (num_ll_allocated > 10000)
-	collect_garbage(cur_file);
-      bl = b->entry.Template.bl_ptr1;
-      while ((bl != NULL) && (bl->ref != b)) {
-	gendeps(bl->ref);
-	if (num_ll_allocated > 10000)
-	  collect_garbage(cur_file);
-	bl = bl->next;
-      }
-      break;
-     case FORALL_NODE:
-     case CDOALL_NODE:
-     case PARFOR_NODE:
-      if (show_deps)
-	fprintf(stderr, "----- line %d \n", b->g_line);
-      make_deps(FLOWD, b->entry.Template.sets->in_def,
-		b->entry.Template.sets->use);
-
-      make_deps(OUTPUTD, b->entry.Template.sets->in_def,
-		b->entry.Template.sets->gen);
-
-      make_deps(ANTID, b->entry.Template.sets->in_use,
-		b->entry.Template.sets->gen);
-
-      make_deps(INPUTD, b->entry.Template.sets->in_use,
-		b->entry.Template.sets->use);
-
-      bl = b->entry.Template.bl_ptr1;
-      while ((bl != NULL) && (bl->ref != b)) {
-	gendeps(bl->ref);
-	bl = bl->next;
-      }
-      break;
-     case LOGIF_NODE:
-     case IF_NODE:
-      if (show_deps)
-	fprintf(stderr, "----- line %d \n", b->g_line);
-      make_deps(FLOWD, b->entry.Template.sets->in_def,
-		b->entry.Template.sets->use);
-
-      make_deps(OUTPUTD, b->entry.Template.sets->in_def,
-		b->entry.Template.sets->gen);
-
-      make_deps(ANTID, b->entry.Template.sets->in_use,
-		b->entry.Template.sets->gen);
-
-      make_deps(INPUTD, b->entry.Template.sets->in_use,
-		b->entry.Template.sets->use);
-
-      /* visit True children */
-      bl = b->entry.Template.bl_ptr1;
-      while ((bl != NULL) && (bl->ref != b)) {
-	gendeps(bl->ref);
-	if (num_ll_allocated > 10000)
-	  collect_garbage(cur_file);
-	bl = bl->next;
-      }
-      /* visit False children */
-      if (b->variant != LOGIF_NODE) {
-	bl = b->entry.Template.bl_ptr2;
-	while ((bl != NULL) && (bl->ref != b)) {
-	  gendeps(bl->ref);
-	  if (num_ll_allocated > 10000)
-	    collect_garbage(cur_file);
-	  bl = bl->next;
-	}
-      }
-      break;
-     case EXIT_NODE:
-      fprintf(stderr, "exit node found! no dep ananysis!\n");
-      break;
-     default:			/* assume a no op */
-      /* just pass everything through! */
-      break;
-    }
-}
-
-void relink(fi)
-PTR_FILE fi;
-{
-  PTR_BFND bf_ptr;
-  int count = 1;
-
-  for (bf_ptr = fi->head_bfnd; bf_ptr != NULL; bf_ptr = bf_ptr->thread)
-    bf_ptr->id = count++;
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/setutils.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/setutils.c
deleted file mode 100644
index eba6593..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/setutils.c
+++ /dev/null
@@ -1,2518 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* file: setutils.c */
-#include <stdlib.h>
-#include "db.h"
-
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-extern PCF UnparseBfnd[];
-extern PCF UnparseLlnd[];
-
-PTR_SYMB induct_list[MAX_NEST_DEPTH];
-int stride[MAX_NEST_DEPTH];
-int is_forall[MAX_NEST_DEPTH];
-
-/* variable default value structure. */
-struct dflts {
-  PTR_SYMB name;
-  int value;
-  struct dflts *next;
-};
-
-typedef struct dflts *PTR_DFLT;
-PTR_DFLT glob_dflts = NULL;
-PTR_SETS free_sets = NULL;
-PTR_REFL free_refl = NULL;
-PTR_DEP free_dep = NULL;
-/*char *malloc();*/
-
-extern PTR_FILE cur_file;
-extern int language;
-
-/* Forward declarations */
-int is_not_loc();
-void disp_refl();
-int make_range();
-void disp_refl();
-int make_induct_list();
-
-extern int identical();
-extern int integer_difference();
-
-int get_dflt(df, s)
-int *df;
-PTR_SYMB s;
-{
-  PTR_DFLT p;
-  int v;
-
-  p = glob_dflts;
-  *df = 1;
-  while (p != NULL) {
-    if (p->name == s)
-      return (p->value);
-    p = p->next;
-  }
-  p = (PTR_DFLT) malloc(sizeof(struct dflts));
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-  p->next = glob_dflts;
-  glob_dflts = p;
-  p->name = s;
-  *df = 1;
-  v = 100;
-  p->value = v;
-  return (v);
-}
-
-PTR_SETS alloc_sets()
-{
-  PTR_SETS s;
-
-  s = (PTR_SETS) malloc(sizeof(struct sets));
-#ifdef __SPF
-  addToCollection(__LINE__, __FILE__,s, 0);
-#endif
-  if (s == NULL)
-    fprintf(stderr, "! out of space for sets!!\n");
-  s->use = NULL;
-  s->gen = NULL;
-  s->in_use = NULL;
-  s->in_def = NULL;
-  s->out_use = NULL;
-  s->out_def = NULL;
-  s->arefl = NULL;
-  return (s);
-}
-
-/*********************************************************************/
-/* is_not_local() is used to find out if a reference is to a global  */
-/* variable.  The way it works is that it traverses the biffnd tree  */
-/* up to the level of a procedure or function checking for local     */
-/* declarations.  It understands the static scoping of C.	     */
-/*********************************************************************/
-static int search_for_dec(b, s)
-PTR_BFND b;
-PTR_SYMB s;
-{
-  PTR_BFND par;
-  PTR_BLOB p;
-  PTR_LLND ll, def;
-
-  par = b->control_parent;
-  p = par->entry.Template.bl_ptr1;
-  while (p != NULL && p->ref != b) {
-    switch (p->ref->variant) {
-     case VAR_DECL:
-     case STRUCT_DECL:
-      ll = p->ref->entry.Template.ll_ptr1;
-      while (ll != NULL) {
-	def = ll->entry.Template.ll_ptr1;
-	while (def != NULL && def->variant == DEREF_OP)
-	  def = def->entry.Template.ll_ptr1;
-
-	if ((def != NULL) &&
-	    (def->variant == VAR_REF || def->variant == ARRAY_REF)
-	    && (s == def->entry.Template.symbol))
-	  return (0);
-	ll = ll->entry.Template.ll_ptr2;
-      }
-      break;
-     default:
-      break;
-    }
-    p = p->next;
-  }
-  if (par->variant == GLOBAL || par->variant == FUNC_HEDR)
-    return (1);
-  else
-    return (search_for_dec(par, s));
-}
-
-int non_exec_statement(fBF)
-PTR_BFND fBF;
-{
-  switch (fBF->variant) {
-   case PROS_COMM:
-   case COMM_STAT:
-   case EXTERN_STAT:
-   case INTRIN_STAT:
-   case EQUI_STAT:
-   case STMTFN_STAT:
-   case ATTR_DECL:
-   case DIM_STAT:
-   case VAR_DECL:
-   case PARAM_DECL:
-   case IMPL_DECL:
-   case DATA_DECL:
-   case SAVE_DECL:
-   case BLOCK_DATA:
-   case COMMENT_STAT:
-   case ENTRY_STAT:
-   case CONTROL_END:
-    return (1);
-   default:
-    return (0);
-  }
-}
-
-int search_for_common_decl(b, s)
-PTR_BFND b;
-PTR_SYMB s;
-{
-  PTR_BFND par;
-  PTR_BLOB p;
-  PTR_LLND ll, def;
-
-  par = b;
-  while (par != NULL && par->variant != PROG_HEDR &&
-	 par->variant != PROC_HEDR &&
-	 par->variant != FUNC_HEDR)
-    par = par->control_parent;
-  if (par == NULL)
-    return (0);
-
-  p = par->entry.Template.bl_ptr1;
-  while (p != NULL && non_exec_statement(p->ref)) {
-    if (p->ref->variant == COMM_STAT) {
-      ll = p->ref->entry.Template.ll_ptr1;	/* COMM_LIST */
-      ll = ll->entry.Template.ll_ptr1;	/* EXPR_LIST */
-      while (ll != NULL) {
-	def = ll->entry.Template.ll_ptr1;
-	if ((def != NULL) &&
-	    (def->variant == VAR_REF || def->variant == ARRAY_REF) &&
-	    (s == def->entry.Template.symbol))
-	  return (1);
-	ll = ll->entry.Template.ll_ptr2;
-      }
-    }
-    p = p->next;
-  }
-  return (0);
-}
-
-int is_not_local(r)
-struct ref *r;
-{
-  PTR_BFND b;
-  PTR_LLND ll;
-
-  b = r->stmt;
-  ll = r->refer;
-  return (is_not_loc(b, ll));
-}
-
-int is_not_loc(b, ll)
-PTR_BFND b;
-PTR_LLND ll;
-{
-  PTR_BFND curfun;
-  PTR_SYMB s, params;
-  PTR_LLND q;
-  int i;
-
-  curfun = b;
-  while (curfun != NULL && curfun->variant != GLOBAL &&
-	 curfun->variant != FUNC_HEDR && curfun->variant != PROC_HEDR)
-    curfun = curfun->control_parent;
-  if (curfun->variant == FUNC_HEDR || curfun->variant == PROC_HEDR) {
-    params = curfun->entry.Template.symbol;
-    params = params->entry.proc_decl.in_list;
-  }
-  else
-    params = NULL;
-
-  switch (ll->variant) {
-   case VAR_REF:
-   case ARRAY_REF:
-    s = ll->entry.Template.symbol;
-    break;
-   case POINTST_OP:
-    q = ll;
-    while (q != NULL && q->variant != VAR_REF)
-      q = q->entry.Template.ll_ptr1;
-    if (q == NULL)
-      return (1);
-    else {
-      s = q->entry.Template.symbol;
-    }
-    break;
-   default:
-    s = NULL;
-    break;
-  }
-  while (s != NULL && params != NULL) {
-    if (params == s)
-      return (1);
-    params = params->entry.var_decl.next_in;
-  }
-  if (language == ForSrc) {
-    if (search_for_common_decl(b, s))
-      return (1);
-    if (s->attr == 1)
-      return (1);		/* attribute is global */
-    return (0);
-  }
-  if (s != NULL) {
-    if ((i = search_for_dec(b, s)) == 0) {
-    }
-    else {
-    }
-    return (i);
-  }
-  else {
-    return (1);
-  }
-}
-
-PTR_REFL remove_locals_from_list(rl)
-PTR_REFL rl;
-{
-  PTR_REFL t, local, global;
-
-  local = NULL;
-  global = NULL;
-  while (rl != NULL) {
-    if (is_not_local(rl->node)) {
-      t = rl;
-      rl = rl->next;
-      t->next = global;
-      global = t;
-    }
-    else {
-      t = rl;
-      rl = rl->next;
-      t->next = local;
-      local = t;
-    }
-  }
-  disp_refl(local);
-  return (global);
-}
-
-int subsumed(p, q)
-PTR_LLND p,q;
-{
-   PTR_LLND pind[10], qind[10], newpind[10], t;
-   int pdim, qdim, i, same, not_same[10], k,ns ;
-
-  if (p->variant != ARRAY_REF)
-    return (0);
-  if (q->variant != ARRAY_REF)
-    return (0);
-  if (p->entry.Template.symbol != q->entry.Template.symbol)
-    return (0);
-  
-  pdim = 0;
-  t = p->entry.Template.ll_ptr1;
-  while(t && (t->variant == EXPR_LIST) && pdim < 10){
-      pind[pdim++] = t;
-      t = t->entry.Template.ll_ptr2;
-      /* printf("pind[%d] = %s",pdim-1,(UnparseLlnd[cur_file->lang])(pind[pdim-1]));*/
-      }
-  qdim = 0;
-  t = q->entry.Template.ll_ptr1;
-  while(t && (t->variant == EXPR_LIST) && qdim < 10){
-      qind[qdim++] = t;
-      t = t->entry.Template.ll_ptr2;
-     /*  printf("qind[%d] = %s",qdim-1,(UnparseLlnd[cur_file->lang])(qind[qdim-1]));*/
-      }
-
-  if(pdim != qdim) return 0;
-  if(pdim == 0) return 1;
-
-  ns = 0;
-  for(i = 0; i < pdim; i++){
-     same = identical(pind[i]->entry.Template.ll_ptr1,
-                      qind[i]->entry.Template.ll_ptr1);
-     if (same == 0){ ns = 1; not_same[i] = 1;} 
-     else not_same[i] = 0;
-     }
- 
-  if(ns == 0) return 1;
-  /* if(not_same > 1) return 0; */
-
-  for(k = 0; k < pdim; k++)
-     if(not_same[k] &&
-        (make_range(pind[k]->entry.Template.ll_ptr1, 
-                    qind[k]->entry.Template.ll_ptr1, &(newpind[k])) == 0)) return 0;
-
-  for(k = 0; k < pdim; k++)
-    if(not_same[k]){
-       if( k == 0)
-          p->entry.Template.ll_ptr1->entry.Template.ll_ptr1 = newpind[k];
-       else
-          pind[k]->entry.Template.ll_ptr1 = newpind[k];
-     }
-  return 1;
-}    
-     
-int make_range(p,q, newp)
-PTR_LLND p,q, *newp;
-{
-  PTR_LLND plow, phi, qlow, qhi, newlow, newhi,d1,d2;
-  PTR_LLND make_llnd();
-  int diff, pconst, qconst;
-
-  if(p == NULL) {*newp = NULL; return 1;}
-  if(q == NULL) {*newp = NULL; return 1;}
-  if(p->variant == STAR_RANGE){ *newp = p; return 1; }
-  if(q->variant == STAR_RANGE){ *newp = q; return 1; }
-
-  pconst = qconst = 0;
-  if(p->variant == DDOT){ 
-       plow = p->entry.Template.ll_ptr1;
-       phi  = p->entry.Template.ll_ptr2;
-       if(plow == NULL || phi == NULL){
-	 *newp = make_llnd(cur_file, STAR_RANGE, NULL, NULL);
-	 return 1;
-       }
-       if(phi->variant == DDOT) phi = p->entry.Template.ll_ptr1;
-       }
-  else {plow = phi = p; pconst = 1;}
-  if(q->variant == DDOT){ 
-       qlow = q->entry.Template.ll_ptr1;
-       qhi  = q->entry.Template.ll_ptr2;
-       if(qlow == NULL || qhi == NULL){
-	 *newp = make_llnd(cur_file, STAR_RANGE, NULL, NULL);
-	 return 1;
-       }
-       if(qhi->variant == DDOT) qhi = q->entry.Template.ll_ptr1;
-       }
-  else {qlow = qhi = q; qconst = 1;}
-  if(pconst && qconst == 0){
-    if(integer_difference(p,qlow, &diff, &d1) && (diff >= -1)){
-          if(diff == 1 || diff == 0){
-               /* we have qlow < p ? qhi.  we need to know the range of qhi */
-               *newp = q; 
-               return 1;
-	     }
-          else if (diff == -1){
-             /* we hve p = qlow-1 < qhi o  */
-             *newp = make_llnd(cur_file, DDOT, p, qhi, NULL);
-             return 1;
-	   }
-	}
-    if(integer_difference(p,qhi, &diff, &d1) && (diff <= 1)){
-          if(diff == -1 || diff == 0){ 
-            /* we have qlow  < qhi = p+1 */
-              *newp = q; 
-               return 1;
-	     }
-          else if(diff == 1){
-             /* we hve qlow < qhi = p-1 < p   */
-             *newp = make_llnd(cur_file, DDOT, qlow, p, NULL);
-             return 1;
-	   }
- 	}
-    return 0;
-  }
-  if(pconst == 0 && qconst){
-    if(integer_difference(plow,q, &diff, &d1) && (diff <= 1)){
-          if(diff == -1 || diff == 0){
-               /* we have plow < q ? phi.  we need to know the range of phi */
-               *newp = p; 
-               return 1;
-	     }
-          else if(diff == 1){
-             /* we hve q = plow-1<plow < phi */
-             *newp = make_llnd(cur_file, DDOT, q, phi, NULL);
-             return 1;
-	   }
-      	}
-    if(integer_difference(phi,q, &diff, &d1) && (diff >= -1)){
-          if(diff == 1 || diff == 0){ 
-            /* we have qlow ? p < qhi */
-              *newp = p; 
-               return 1;
-	     }
-          else if(diff == -1){
-             /* we hve plow < phi = q-1<q  */
-             *newp = make_llnd(cur_file, DDOT, plow, q, NULL);
-             return 1;
-	   }
-	}
-    return 0;
-  }
-  if(pconst && qconst){
-    if(integer_difference(p,q,&diff,&d1)){
-       if (diff == 1){
-           *newp = make_llnd(cur_file, DDOT, q,p,NULL);
-           return 1;
- }
-       else if (diff ==1){
-           *newp = make_llnd(cur_file, DDOT, p,q,NULL);
-           return 1;
-	 }
-       else return 0;
-     }
-  }
-  if(integer_difference(plow,qlow,&diff, &d1) == 0){
-       /* printf("lo diff is %s", (UnparseLlnd[cur_file->lang])(d1)); */
-       return 0;
-       }
-  if(diff <= 0) newlow = plow; else newlow = qlow;
-  if(integer_difference(phi, qhi, &diff,&d2) == 0){
-       /* printf("hi diff is %s", (UnparseLlnd[cur_file->lang])(d2)); */
-       return 0;
-       }
-  if(diff <= 0) newhi = qhi;   else newhi  = phi;
-  *newp = make_llnd(cur_file, DDOT, newlow, newhi, NULL);
-  /* printf("new ref is%s",(UnparseLlnd[cur_file->lang])(*newp)); */
-  return 1;
-}
-
-  
-
-
-PTR_LLND merge_ll_array_list(rl)
-PTR_LLND rl;
-{
-  PTR_LLND t, newlist, junk;
-  int stop;
-
-  newlist = NULL;
-  junk = NULL;
-  while (rl != NULL) {
-    if (rl->variant != EXPR_LIST) {
-      fprintf(stderr, "problem in merge_ll_array_list, not exprlist\n%s\n",
-		      (UnparseLlnd[cur_file->lang])(rl));
-      break;
-    }
-    t = newlist;
-    stop = 0;
-    while (t != NULL) {
-      if (subsumed(t->entry.Template.ll_ptr1,
-		   rl->entry.Template.ll_ptr1)) {
-	stop = 1;
-      }
-      t = t->entry.Template.ll_ptr2;
-    }
-    if (stop == 0) {
-      t = rl;
-      rl = rl->entry.Template.ll_ptr2;
-      t->entry.Template.ll_ptr2 = newlist;
-      newlist = t;
-    }
-    else {
-      t = rl;
-      rl = rl->entry.Template.ll_ptr2;
-      t->entry.Template.ll_ptr2 = junk;
-      junk = t;
-    }
-  }
-  return (newlist);
-}
-
-PTR_REFL merge_array_refs(rl)
-PTR_REFL rl;
-{
-
-  PTR_REFL t, newlist, junk;
-  int stop;
-
-  newlist = NULL;
-  junk = NULL;
-  while (rl != NULL) {
-    t = newlist;
-    stop = 0;
-    while (t != NULL) {
-      if (subsumed(t->node->refer, rl->node->refer)) {
-	stop = 1;
-      }
-      t = t->next;
-    }
-    if (stop == 0) {
-      t = rl;
-      rl = rl->next;
-      t->next = newlist;
-      newlist = t;
-    }
-    else {
-      t = rl;
-      rl = rl->next;
-      t->next = junk;
-      junk = t;
-    }
-  }
-  disp_refl(junk);
-  return (newlist);
-}
-
-
-PTR_REFL alloc_ref(bif, ll)
-PTR_BFND bif;
-PTR_LLND ll;
-{
-  struct ref *p;
-  PTR_REFL q;
-  if ((bif == NULL) || (ll == NULL))
-    return (NULL);
-
-  if ((ll->variant == VAR_REF) || (ll->variant == ARRAY_REF) ||
-      (ll->variant == RECORD_REF) || (ll->variant == POINTST_OP)) {
-    p = (struct ref *) malloc(sizeof(struct ref));
-#ifdef __SPF
-    addToCollection(__LINE__, __FILE__,p, 0);
-#endif
-    if (p == NULL)
-      fprintf(stderr, "! out of space for references !!\n");
-    p->stmt = bif;
-    p->refer = ll;
-    if (free_refl != NULL) {
-      q = free_refl;
-      free_refl = free_refl->next;
-    }
-    else
-    {
-        q = (PTR_REFL)malloc(sizeof(struct refl));
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,q, 0);
-#endif
-    }
-    if (q == NULL)
-      fprintf(stderr, "out of space for reference lists !!\n");
-    q->next = NULL;
-    if (ll->variant == RECORD_REF || ll->variant == POINTST_OP)
-      q->id = NULL;
-    else
-      q->id = p->refer->entry.Template.symbol;
-    q->node = p;
-    return (q);
-  }
-  else
-    return (NULL);
-}
-
-void disp_refl(p)
-PTR_REFL p;
-{
-  PTR_REFL q;
-
-  while (p != NULL) {
-    q = p->next;
-    p->node = NULL;
-    p->id = NULL;
-    p->next = free_refl;
-    free_refl = p;
-    p = q;
-  }
-}
-
-PTR_REFL copy_refl(p)
-PTR_REFL p;
-{
-    PTR_REFL q;
-    PTR_REFL tail, neo_q;
-
-    if (p == NULL)
-        return (NULL);
-    q = NULL;
-    tail = q;
-
-    if (free_refl == NULL)
-    {
-        q = (PTR_REFL)malloc(sizeof(struct refl));
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,q, 0);
-#endif
-    }
-    else {
-        q = free_refl;
-        free_refl = free_refl->next;
-    }
-    if (q == NULL) {
-        fprintf(stderr, "!! out of space for reference lists !\n");
-        return NULL;
-    }
-    q->node = p->node;
-    q->id = p->id;
-    q->next = NULL;
-    /* now copy the rest of p */
-    tail = q;
-    p = p->next;
-    while (p) {
-        if (free_refl == NULL)
-        {
-            neo_q = (PTR_REFL)malloc(sizeof(struct refl));
-#ifdef __SPF
-            addToCollection(__LINE__, __FILE__,neo_q, 0);
-#endif
-        }
-        else {
-            neo_q = free_refl;
-            free_refl = free_refl->next;
-        }
-        if (neo_q == NULL) {
-            fprintf(stderr, "!! out of space for reference lists !\n");
-            return NULL;
-        }
-        neo_q->node = p->node;
-        neo_q->id = p->id;
-        neo_q->next = NULL;
-        tail->next = neo_q;
-        tail = neo_q;
-        p = p->next;
-    }
-    return q;
-}
-/* create a new reference list that is the interesction of two others */
-/* the intersection is based on names and the actual reference comes  */
-/* from the second argument of the pair.			      */
-/* in the case of a pair  p   p->a  we include p->a in the intersection */
-PTR_REFL intersect_refl(p, q)
-PTR_REFL p, q;
-{
-    PTR_REFL s, t, inter;
-    PTR_SYMB id;
-    PTR_LLND z;
-    int match_found;
-
-    inter = NULL;
-    s = q;
-    while (p != NULL) {
-        id = p->id;
-        if (id == NULL) {		/* this is a ref to a p->a sub struct */
-            z = p->node->refer;
-            while (z != NULL && z->variant != VAR_REF)
-                z = z->entry.Template.ll_ptr1;
-            if (z == NULL)
-                id = NULL;
-            else
-                id = z->entry.Template.symbol;
-        }
-        match_found = 0;
-        while (s != NULL && (match_found == 0)) {
-            if (s->id == NULL) {	/* a ref to a p->a sub struct */
-                z = s->node->refer;
-                while (z != NULL && z->variant != VAR_REF)
-                    z = z->entry.Template.ll_ptr1;
-                if (z == NULL)
-                    s = s->next;
-                else if (z->entry.Template.symbol == id)
-                    match_found = 1;
-                else
-                    s = s->next;
-            }
-            else {
-                if (s->id == id)
-                    match_found = 1;
-                else
-                    s = s->next;
-            }
-        }
-
-        if (match_found && id != NULL) {
-            if (free_refl == NULL)
-            {
-                t = (PTR_REFL)malloc(sizeof(struct refl));
-#ifdef __SPF
-                addToCollection(__LINE__, __FILE__,t, 0);
-#endif
-            }
-            else {
-                t = free_refl;
-                free_refl = free_refl->next;
-            }
-            if (t == NULL)
-                fprintf(stderr, "!!! out of space for reference lists\n");
-            if (p->node != NULL &&
-                (p->node->refer->variant == POINTST_OP ||
-                    p->node->refer->variant == RECORD_REF)) {
-                t->node = p->node;
-                t->id = NULL;
-            }
-            else {
-                t->node = s->node;
-                t->id = s->id;
-            }
-            t->next = inter;
-            inter = t;
-            s = s->next;
-        }
-        else {
-            p = p->next;
-            s = q;
-        }
-    }
-    return (inter);
-}
-
-/*  make name list makes a reference list based on a list of symbol */
-/*  table names.  The node field is null.  This is used for making  */
-/*  a dummy list for arguments to procedures.			    */
-PTR_REFL make_name_list(p)
-PTR_SYMB p;
-{
-  PTR_REFL list, t;
-
-  list = NULL;
-  while (p != NULL) {
-      if (free_refl == NULL)
-      {
-          t = (PTR_REFL)malloc(sizeof(struct refl));
-#ifdef __SPF
-          addToCollection(__LINE__, __FILE__,t, 0);
-#endif
-      }
-    else {
-      t = free_refl;
-      free_refl = free_refl->next;
-    }
-    if (t == NULL)
-      fprintf(stderr, "!!! out of space for reference lists\n");
-    t->node = NULL;
-    t->id = p;
-    t->next = list;
-    list = t;
-    p = p->entry.var_decl.next_in;
-  }
-  return (list);
-}
-
-void append_refl(s, p)		/* and remove dups */
-PTR_REFL *s, p;
-{
-    PTR_REFL t;
-    struct ref *n;
-
-    while (p != NULL) {
-        n = p->node;
-        t = *s;
-        while ((t != NULL) && (t->node != n))
-            t = t->next;
-        if (t == NULL) {
-            if (free_refl == NULL)
-            {
-                t = (PTR_REFL)malloc(sizeof(struct refl));
-#ifdef __SPF
-                addToCollection(__LINE__, __FILE__,t, 0);
-#endif
-            }
-            else {
-                t = free_refl;
-                free_refl = free_refl->next;
-            }
-            if (t == NULL)
-                fprintf(stderr, "!!! out of space for reference lists\n");
-            t->node = p->node;
-            t->id = p->id;
-            t->next = *s;
-            *s = t;
-        }
-        p = p->next;
-    }
-}
-
-PTR_REFL union_refl(p, q)
-PTR_REFL p, q;
-{
-    PTR_REFL s, t;
-    struct ref *n;
-
-    s = copy_refl(q);
-    while (p != NULL) {
-        n = p->node;
-        t = q;
-        while ((t != NULL) && (t->node != n))
-            t = t->next;
-        if (t == NULL) {
-            if (free_refl == NULL)
-            {
-                t = (PTR_REFL)malloc(sizeof(struct refl));
-#ifdef __SPF
-                addToCollection(__LINE__, __FILE__,t, 0);
-#endif
-            }
-            else {
-                t = free_refl;
-                free_refl = free_refl->next;
-            }
-            if (t == NULL) {
-                fprintf(stderr, "!!! out of space for reference lists\n");
-                exit(0);
-            }
-            t->node = p->node;
-            t->id = p->id;
-            t->next = s;
-            s = t;
-        }
-        p = p->next;
-    }
-    return (s);
-}
-
-void assign(to, from) 
-PTR_REFL *to;
-PTR_REFL from;
-{
-  disp_refl(*to);
-  *to = from;
-}
-
-void print_refl(p)
-PTR_REFL p;
-{
-  int i;
-  PTR_LLND z;
-
-  fprintf(stderr, " ref list :");
-  i = 0;
-  while (p != NULL) {
-    if (p->id != NULL)
-      fprintf(stderr, " %s", p->id->ident);
-    else {
-      fprintf(stderr, " pointer de-ref");
-      z = p->node->refer;
-      while (z != NULL && z->variant != VAR_REF)
-	z = z->entry.Template.ll_ptr1;
-      if (z == NULL)
-	fprintf(stderr, "-unknown");
-      else
-	fprintf(stderr, " %s", z->entry.Template.symbol->ident);
-    }
-    p = p->next;
-    i++;
-    if (i > 10) {
-      i = 0;
-      fprintf(stderr, "\n");
-    }
-  }
-  fprintf(stderr, "\n");
-}
-
-int is_param(plist, s)
-PTR_REFL plist;
-PTR_SYMB s;
-{
-  while (plist != NULL) {
-    if (plist->id == s)
-      return (1);
-    plist = plist->next;
-  }
-  return (0);
-}
-
-
-/********************************************************************/
-/*  function equiv_ll_exp(p,q) returns 1 if p and q are equivalent  */
-/*   algebraic expressions. both are low level experessions	    */
-/********************************************************************/
-
-int equiv_ll_exp(p, q)
-PTR_LLND p, q;
-{
-  if (p == NULL && q == NULL)
-    return (1);
-  if (p == NULL || q == NULL)
-    return (0);
-  return (0);
-}
-
-int flat_check(p, q)
-PTR_LLND p, q;
-{
-  if (p == NULL && q == NULL)
-    return (1);
-  if (p == NULL || q == NULL)
-    return (0);
-  if (p->variant != q->variant)
-    return (0);
-  if (p->variant == VAR_REF || p->variant == ARRAY_REF) {
-    if (p->entry.var_ref.symbol != q->entry.var_ref.symbol)
-      return (0);
-  }
-  if (flat_check(p->entry.Template.ll_ptr1, q->entry.Template.ll_ptr1) == 0)
-    return (0);
-  if (flat_check(p->entry.Template.ll_ptr2, q->entry.Template.ll_ptr2) == 0)
-    return (0);
-  return (1);
-}
-
-
-/********************************************************************/
-/* function reduce_ll_exp(p,newp) takes a low level pointer and     */
-/*  returns a new expression (or the same old one) that is a an     */
-/*  simple algebraic expression in terms of constants and parameter */
-/*  common references.	the function returns 1 if sucessfull and 0  */
-/*  if it failed.  if a 2 is returned then an integer value has been*/
-/*  generated and its value is return in the value newv.	    */
-/*  newp is the pointer to the new expression.			    */
-/********************************************************************/
-int reduce_ll_exp(b, plist, induct_list, p, newp, newv)
-PTR_BFND b;			/* bif node of expression (needed for
-				 * context) */
-PTR_REFL plist; 		/* list of parameters and commons in
-				 * enclosing scope */
-PTR_SYMB induct_list[]; 	/* induction variable list for current scope */
-PTR_LLND p, *newp;
-int *newv;
-{
-  int lf, rf, lv, rv;
-  PTR_LLND lp, rp, make_llnd();
-
-  lv = 0;
-  rv = 0;
-  lf = 0;
-  rf = 0;
-  if (p == NULL) {
-    *newp = NULL;
-    return (1);
-  }
-  if ((p->variant == EXPR_LIST || p->variant == RANGE_LIST)
-      && p->entry.Template.ll_ptr2 == NULL)
-    p = p->entry.Template.ll_ptr1;
-  if (p->variant == VAR_REF) {
-    /* first check for scalar propogation possibility */
-    if (p->entry.Template.ll_ptr1 != NULL) {
-      lf = reduce_ll_exp(b, plist, induct_list,
-			 p->entry.Template.ll_ptr1, newp, newv);
-      return (lf);
-    }
-    /* second check to see if this is a parameter or global */
-    else if (is_param(plist, p->entry.Template.symbol) ||
-	     is_not_loc(b, p)) {
-      *newp = p;
-      return (1);
-    }
-    /* this is some other variable and no propogation */
-    /* can reduce it to a simple expression. give up  */
-    else {
-      *newp = p;
-      return (0);
-    }
-  }
-  else if (p->variant == CONST_REF) {
-    *newp = p->entry.Template.symbol->entry.const_value;
-    if ((*newp)->variant == INT_VAL) {
-      *newv = (*newp)->entry.ival;
-      return (2);
-    }
-    return (1);
-  }
-  else if (p->variant == INT_VAL) {
-    *newv = p->entry.ival;
-    *newp = p;
-    return (2);
-  }
-  else if (p->variant != ADD_OP && p->variant != SUBT_OP &&
-	   p->variant != MULT_OP && p->variant != DIV_OP &&
-	   p->variant != MINUS_OP) {
-    *newp = p;
-    return (0);
-  }
-  else {
-    lf = reduce_ll_exp(b, plist, induct_list,
-		       p->entry.Template.ll_ptr1, &lp, &lv);
-    rf = reduce_ll_exp(b, plist, induct_list,
-		       p->entry.Template.ll_ptr2, &rp, &rv);
-    if (lf == 2 && rf == 2) {
-      *newp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-      switch (p->variant) {
-       case ADD_OP:
-	(*newp)->entry.ival = lv + rv;
-	break;
-       case SUBT_OP:
-	(*newp)->entry.ival = lv - rv;
-	break;
-       case MULT_OP:
-	(*newp)->entry.ival = lv * rv;
-	break;
-       case MINUS_OP:
-	(*newp)->entry.ival = -lv;	/* not sure */
-	break;
-       case DIV_OP:
-	if (rv != 0)
-	  (*newp)->entry.ival = lv / rv;
-	else
-	  return (0);
-	break;
-       default:
-	*newp = p;
-	*newv = 0;
-	return (0);
-      }
-      (*newp)->type = cur_file->head_type;
-      *newv = (*newp)->entry.ival;
-      return (2);
-    }
-    else {			/* both not integer case */
-      if (lf == 2 && lv == 1 && p->variant == MULT_OP) {
-	*newp = rp;
-	return (rf);
-      }
-      if ((lf == 2) && (lv < 0)) {
-	switch (p->variant) {
-	 case ADD_OP:
-	  *newp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	  (*newp)->entry.ival = -lv;
-	  *newp = make_llnd(cur_file, SUBT_OP, rp, *newp, NULL);
-	  return (rf);
-	 
-	 case SUBT_OP:
-	  *newp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	  (*newp)->entry.ival = -lv;
-	  *newp = make_llnd(cur_file, ADD_OP, rp, *newp, NULL);
-	  return (rf);
-	 
-	 case MULT_OP:
-	  if (lv == -1) {
-	    if (rp->variant == MINUS_OP) {
-	      *newp = rp->entry.Template.ll_ptr1;
-	      *newv = rv;
-	      return (rf);
-	    }
-	    else {
-	      *newp = make_llnd(cur_file, MINUS_OP, rp, NULL, NULL);
-	      return (rf);
-	    }
-	  }
-	  break;
-	 case MINUS_OP:
-	 case DIV_OP:
-	 default:
-	  break;
-	}
-      } 			/* end if lf == 2 && lv < 0 */
-
-      if (rf == 2 && rv == 1 && p->variant == MULT_OP) {
-	*newp = lp;
-	return (lf);
-      }
-      if (rf == 2 && (rv < 0)) {
-	switch (p->variant) {
-	 case ADD_OP:
-	  *newp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	  (*newp)->entry.ival = -rv;
-	  *newp = make_llnd(cur_file, SUBT_OP, lp, *newp, NULL);
-	  return (lf);
-	  
-	 case SUBT_OP:
-	  *newp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	  (*newp)->entry.ival = -rv;
-	  *newp = make_llnd(cur_file, ADD_OP, lp, *newp, NULL);
-	  return (lf);
-	  
-	 case MULT_OP:
-	  if (rv == -1) {
-	    if (rp->variant == MINUS_OP) {
-	      *newp = lp->entry.Template.ll_ptr1;
-	      *newv = lv;
-	      return (lf);
-	    }
-	    else {
-	      *newp = make_llnd(cur_file, MINUS_OP, lp, NULL, NULL);
-	      return (lf);
-	    }
-	  }
-	  break;
-	 case MINUS_OP:
-	 case DIV_OP:
-	 default:
-	  break;
-	}
-      } 			/* end if rf == 2 && rv < 0 */
-      if (p->variant == ADD_OP) {
-	if (rp->variant == MINUS_OP) {
-	  *newp = make_llnd(cur_file, SUBT_OP, lp,
-			    rp->entry.Template.ll_ptr1, NULL);
-	  return (lf * rf);
-	}
-	if (lp->variant == MINUS_OP) {
-	  *newp = make_llnd(cur_file, SUBT_OP, rp,
-			    lp->entry.Template.ll_ptr1, NULL);
-	  return (lf * rf);
-	}
-      }
-      *newp = make_llnd(cur_file, p->variant,lp,rp,p->entry.Template.symbol);
-      if (lf == 0 || rf == 0) {
-	*newp = p;
-	return (0);
-      }
-      if (lf == 1 || rf == 1) {
-	lf = 1;
-	rf = 1;
-      }
-      return (lf * rf);
-    }
-  }
-}
-
-
-/********************************************************************/
-/* comp_offset computes the constant term in a low level expression */
-/* the value is in coef and a 1 is returned.  If a 0 is returned    */
-/* this means that no integer order zero term was computable.	    */
-/* if a 2 is returned then a ddot was found ".."  coef contains the */
-/* lower value and extra_coef contains the upper value.  Note: we   */
-/* assume that the .. is at the root of the tree.		    */
-/* if a 3 is returned then this is not a normal algebraic expression*/
-/* if a 4 is returned then this is an algebraic expression using    */
-/*   procedure parameters and vexp points to a ll tree representing */
-/* the symbolic part of the constant.				    */
-/* if a 5 is returned then it is a ddot with parameters.	    */
-/* chkdflts = 1 means that the user should be prompted for defautls */
-/* if a variable with no default value is found then a 3 will be    */
-/* returned.  note: this needs more thought!			    */
-/********************************************************************/
-int extra_coef = 0;
-int comp_offset(plist, induct_list, chkdflts, ll, coef, vexp)
-PTR_REFL plist; 		/* list of parameters and commons in
-				 * enclosing scope */
-PTR_SYMB induct_list[]; 	/* induction variable list for current scope */
-int chkdflts;
-PTR_LLND ll;
-int *coef;
-PTR_LLND *vexp;
-{
-  int i, lf, rf, lcoef, rcoef, tmp;
-  PTR_LLND lltmp, lexp, rexp;
-  PTR_LLND make_llnd(), copy_llnd();
-
-  tmp = 0;
-  *coef = 0;
-  *vexp = NULL;
-  if (ll == NULL)
-    return (0);
-  else if (ll->variant == VAR_REF) {
-    /* first check to see if this an induction variable */
-    for (i = 0; i < MAX_NEST_DEPTH; i++) {
-      if (ll->entry.Template.symbol == induct_list[i])
-	return (0);
-    }
-    /* second check for scalar propogation possibility */
-    if (ll->entry.Template.ll_ptr1 != NULL) {
-      return (comp_offset(plist, induct_list, chkdflts,
-			  ll->entry.Template.ll_ptr1, coef, vexp)
-	);
-    }
-    /* third check to see if this is a scalar parameter */
-    /* in this modified version the induction test was	*/
-    /* put at the top and all unknown expressions are	*/
-    /* returned as type 4.				    */
-    else {
-      *vexp = copy_llnd(ll);
-      return (4);
-    }
-  }
-  else if (ll->variant == CONST_REF) {
-    lltmp = ll->entry.Template.symbol->entry.const_value;
-    if (lltmp->variant == INT_VAL) {
-      *coef = lltmp->entry.ival;
-      *vexp = copy_llnd(ll);
-      return (1);
-    }
-    else
-      return (0);
-  }
-  else if (ll->variant == INT_VAL) {
-    *coef = ll->entry.ival;
-    *vexp = copy_llnd(ll);
-    return (1);
-  }
-  else {
-    lf = comp_offset(plist, induct_list, chkdflts,
-		     ll->entry.Template.ll_ptr1, &lcoef, &lexp);
-    rf = comp_offset(plist, induct_list, chkdflts,
-		     ll->entry.Template.ll_ptr2, &rcoef, &rexp);
-    if (lf == 3 || rf == 3)
-      return (3);
-    if (lf == 5 || rf == 5)
-      return (5);
-    switch (ll->variant) {
-     case DDOT:
-      if (lf == 1)
-	*coef = lcoef;
-      else
-	*coef = 0;
-      if (rf == 1)
-	extra_coef = rcoef;
-      else
-	extra_coef = 0;
-      if ((lf == 1) || (rf == 1))
-	return (2);
-      if (lf == 4 || rf == 4)
-	return (5);
-      else
-	return (0);
-     case ADD_OP:
-      tmp = 0;
-      if (lf == 4 && rf == 0) {
-	*vexp = lexp;
-	return (4);
-      }
-      if (rf == 4 && lf == 0) {
-	*vexp = rexp;
-	return (4);
-      }
-      if (lf == 4 || rf == 4) {
-	if (rexp->variant == MINUS_OP)
-	  *vexp = make_llnd(cur_file, SUBT_OP, lexp,
-			    rexp->entry.Template.ll_ptr1, NULL);
-	else
-	  *vexp = make_llnd(cur_file, ADD_OP, lexp, rexp, NULL);
-	return (4);
-      }
-      if (lf == 1)
-	tmp = lcoef;
-      if (rf == 1)
-	tmp = tmp + rcoef;
-      if ((lf == 1) || (rf == 1)) {
-	*coef = tmp;
-	*vexp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	(*vexp)->entry.ival = tmp;
-	return (1);
-      }
-      else
-	return (0);
-     case SUBT_OP:
-      tmp = 0;
-      if (lf == 4 && rf == 0) {
-	*vexp = lexp;
-	return (4);
-      }
-      if (rf == 4 && lf == 0) {
-	if (rexp->variant == INT_VAL) {
-	  rexp->entry.ival = -(rexp->entry.ival);
-	  *vexp = rexp;
-	  return (4);
-	}
-	if (rexp->variant != MINUS_OP)
-	  *vexp = make_llnd(cur_file, MINUS_OP, rexp, NULL, NULL);
-	else
-	  *vexp = rexp->entry.Template.ll_ptr1;
-	return (4);
-      }
-      if (lf == 4 || rf == 4) {
-	if (rexp->variant == MINUS_OP)
-	  *vexp = make_llnd(cur_file, ADD_OP, lexp,
-			    rexp->entry.Template.ll_ptr1, NULL);
-	else
-	  *vexp = make_llnd(cur_file, SUBT_OP, lexp, rexp, NULL);
-	return (4);
-      }
-      if (lf == 1)
-	tmp = lcoef;
-      if (rf == 1)
-	tmp = tmp - rcoef;
-      if ((lf == 1) || (rf == 1)) {
-	*coef = tmp;
-	*vexp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	(*vexp)->entry.ival = tmp;
-	return (1);
-      }
-      else
-	return (0);
-     case MULT_OP:
-      if (lf == 4 && rf == 0)
-	return (0);
-      if (rf == 4 && lf == 0)
-	return (0);
-      if (lf == 4 || rf == 4) {
-	if (rexp->variant == MULT_OP) { /* left associate terms */
-	  lltmp = rexp->entry.Template.ll_ptr1;
-	  lltmp = make_llnd(cur_file, MULT_OP, lexp, lltmp, NULL);
-	  *vexp = make_llnd(cur_file, MULT_OP, lltmp,
-			    rexp->entry.Template.ll_ptr2, NULL);
-	  return (4);
-	}
-	if (rf == 1) {
-	  *vexp = make_llnd(cur_file, MULT_OP, rexp, lexp, NULL);
-	}
-	else {
-	  *vexp = make_llnd(cur_file, MULT_OP, lexp, rexp, NULL);
-	}
-	return (4);
-      }
-      if ((lf == 1) && (rf == 1)) {
-	*coef = lcoef * rcoef;
-	*vexp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	(*vexp)->entry.ival = *coef;
-	return (1);
-      }
-      else
-	return (0);
-     case MINUS_OP:
-      if (lf == 4) {
-	if (lexp->variant == MINUS_OP)
-	  *vexp = lexp->entry.Template.ll_ptr1;
-	else
-	  *vexp = make_llnd(cur_file, MINUS_OP, lexp, NULL, NULL);
-      }
-      else if (lf == 1) {
-	*vexp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	*coef = -lcoef;
-	(*vexp)->entry.ival = *coef;
-      }
-      return (lf);
-     case DIV_OP:
-      if (lf == 4 && rf == 0)
-	return (0);
-      if (rf == 4 && lf == 0)
-	return (0);
-      if (lf == 4 || rf == 4) {
-	*vexp = make_llnd(cur_file, DIV_OP, lexp, rexp, NULL);
-	return (4);
-      }
-      if ((rcoef != 0) && (lf == 1) && (rf == 1)) {
-	*coef = lcoef / rcoef;
-	*vexp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	(*vexp)->entry.ival = *coef;
-	return (1);
-      }
-      else
-	return (0);
-     case EXPR_LIST:
-      if (ll->entry.Template.ll_ptr2 == NULL) {
-	*vexp = lexp;
-	*coef = lcoef;
-	return (lf);
-      }
-     default:
-      *coef = 0;
-      return (3);		/* not normal */
-    }
-  }
-}
-
-/*****************************************************************/
-/* search symb searches a ll tree returns 0 if a const. is found */
-/* a -2 if another symbol is found as a multiplicative factor	 */
-/* for example, searching for i in 2*i*(5+j) returns -2 	 */
-/* a -1 if it is found but not in a linear combination. 	 */
-/* and a  1 if it is and coef has the value of the  coefecient	 */
-/* In the case that a ddot ".." is found a 2 is returned and	 */
-/* coef has the value of the low bound term and extra_coef has	 */
-/* the high value.  Note this implies that .. is at the root of  */
-/* the tree.							 */
-/* chkdflts=1 means that the usr should be prompted for defautls */
-/*****************************************************************/
-
-/* returns 1 if constant coef and *coef is set. 	*/
-/* returns -2 if non-constant coef and *exp is set	*/
-/* returns 0 if constant but not coef and *coef is set	*/
-/* returns 2 if non-constant non-coef is found. *exp set*/
-/* returns -1 for non-linear expressions in s		*/
-
-int new_search_symb(s, induct_list, ll, coef, exp)
-PTR_SYMB s;
-PTR_SYMB induct_list[];
-PTR_LLND ll, *exp;
-int *coef;
-{
-  int lval, rval;
-  PTR_LLND lexp, rexp, nll, make_llnd(), copy_llnd();
-  int lcoef, rcoef;
-
-  if (ll == NULL) {
-    *coef = 0;
-    return (0);
-  }
-  lexp = NULL;
-  rexp = NULL;
-  if (ll->variant == VAR_REF) {
-    if (ll->entry.Template.symbol == s) {
-      *coef = 1;
-      *exp = NULL;
-      return (1);
-    }
-    if (ll->entry.Template.ll_ptr1 != NULL) {
-      return (
-      new_search_symb(s, induct_list, ll->entry.Template.ll_ptr1, coef, exp)
-	);
-    }
-    else {
-      *exp = ll;
-      return (2);
-    }
-  }
-  else if (ll->variant == INT_VAL) {
-    *coef = ll->entry.ival;
-    *exp = NULL;
-    return (0);
-  }
-  else {
-   lval=new_search_symb(s,induct_list,ll->entry.Template.ll_ptr1,&lcoef,&lexp);
-   rval=new_search_symb(s,induct_list,ll->entry.Template.ll_ptr2,&rcoef,&rexp);
-    switch (ll->variant) {
-     case MINUS_OP:
-      if (lval == 1 || lval == 0) {
-	*coef = -lcoef;
-	return (lval);
-      }
-      else if (lval == -2 || lval == 2) {
-	if (lexp->variant == MINUS_OP)
-	  *exp = lexp->entry.Template.ll_ptr1;
-	else
-	  *exp = make_llnd(cur_file, MINUS_OP, lexp, NULL, NULL);
-	return (lval);
-      }
-      else
-	return (-1);
-     case MULT_OP:
-     case DIV_OP:
-      if (rval == 1) {		/* right side is const coef of s */
-	switch (lval) {
-	 case 0:
-	  if (ll->variant == MULT_OP) {
-	    *coef = lcoef * rcoef;
-	    return (1);
-	  }
-	  else if (rcoef != 0) {
-	    *coef = lcoef / rcoef;
-	    return (1);
-	  }
-	  else
-	    return (-1);
-	 case -2:
-	 case -1:
-	 case 1:
-	  return (-1);
-	 case 2:
-	  if (rcoef == 1)
-	    *exp = lexp;
-	  else {
-	    if (ll->variant == DIV_OP && rcoef == 0)
-	      return (-1);
-	    nll = make_llnd(cur_file, INT_VAL, NULL, NULL, rcoef);
-	    nll = make_llnd(cur_file, ll->variant, lexp, nll, NULL);
-	    *exp = nll;
-	  }
-	  return (-2);
-	}
-      }
-      else if (rval == 0) {	/* right side is just a constant */
-	switch (lval) {
-	 case 0:
-	  if (ll->variant == MULT_OP) {
-	    *coef = lcoef * rcoef;
-	    return (0);
-	  }
-	  else if (rcoef != 0) {
-	    *coef = lcoef / rcoef;
-	    return (0);
-	  }
-	  else
-	    return (-1);
-	 case -2:		/* left side is non-const coef of s */
-	 case 2:		/* or non-const non-coef */
-	  if (rcoef == 1)
-	    *exp = lexp;
-	  else {
-	    nll = make_llnd(cur_file, INT_VAL, NULL, NULL, rcoef);
-	    nll = make_llnd(cur_file, ll->variant, lexp, nll, NULL);
-	    *exp = nll;
-	  }
-	  return (lval);
-	 case 1:
-	  if (ll->variant == MULT_OP) {
-	    *coef = lcoef * rcoef;
-	    return (1);
-	  }
-	  else if (rcoef != 0) {
-	    *coef = lcoef / rcoef;
-	    return (1);
-	  }
-	  else
-	    return (-1);
-	 case -1:
-	  return (-1);
-	}
-      }
-      else if (rval == 2) {	/* right side is a non-constant non coef */
-	switch (lval) {
-	 case 1:
-	 case 0:
-	  if (lcoef == 1)
-	    *exp = rexp;
-	  else {
-	    nll = make_llnd(cur_file, INT_VAL, NULL, NULL, lcoef);
-	    nll = make_llnd(cur_file, MULT_OP, nll, rexp, NULL);
-	    *exp = nll;
-	  }
-	  if (lval == 0)
-	    return (2);
-	  else
-	    return (-2);
-	 case 2:
-	  *exp = ll;
-	  return (2);
-	 case -2:
-	  *exp = make_llnd(cur_file, MULT_OP, lexp, rexp, NULL);
-	  return (-2);
-	 case -1:
-	  return (-1);
-	}
-      }
-      else if (rval == -2) {	/* right side is a coef of s but not const */
-	switch (lval) {
-	 case 1:
-	 case -2:
-	 case -1:
-	  return (-1);
-	 case 0:
-	  if (lcoef == 1)
-	    *exp = rexp;
-	  else {
-	    nll = make_llnd(cur_file, INT_VAL, NULL, NULL, lcoef);
-	    nll = make_llnd(cur_file, MULT_OP, nll, rexp, NULL);
-	    *exp = nll;
-	  }
-	  return (-2);
-	 case 2:
-	  *exp = make_llnd(cur_file, MULT_OP, lexp, rexp, NULL);
-	  return (-2);
-	}
-      }
-      else			/* rval == -1 */
-	return (-1);
-     case ADD_OP:
-     case SUBT_OP:
-      if (rval == 1) {		/* right side is const times s */
-	switch (lval) {
-	 case 1:		/* lhs is const coef */
-	  if (ll->variant == ADD_OP)
-	    *coef = lcoef + rcoef;
-	  else
-	    *coef = lcoef - rcoef;
-	  return (1);
-	 case -2:		/* lhs is non-const coef */
-	  nll = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	  if (ll->variant == ADD_OP)
-	    nll->entry.ival = rcoef;
-	  else
-	    nll->entry.ival = -rcoef;
-	  if (lexp->variant == MINUS_OP) {
-	    lexp = lexp->entry.Template.ll_ptr1;
-	    *exp = make_llnd(cur_file, SUBT_OP, nll, lexp, NULL);
-	  }
-	  else
-	    *exp = make_llnd(cur_file, ADD_OP, lexp, nll, NULL);
-	  return (-2);
-	 case -1:
-	  return (-1);
-	 case 0:		/* lhs is const */
-	 case 2:		/* lhs is non const */
-	  if (ll->variant == ADD_OP)
-	    *coef = rcoef;
-	  else
-	    *coef = -rcoef;
-	  return (1);
-	}
-      }
-      else if (rval == -2) {	/* right side is non-const times s */
-	switch (lval) {
-	 case 1:		/* lhs is const coef */
-	  lexp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	  if (lexp->variant == ADD_OP)
-	    lexp->entry.ival = lcoef;
-	  else
-	    lexp->entry.ival = -lcoef;
-	 case -2:		/* lhs is non-const coef */
-	  *exp = make_llnd(cur_file, ll->variant, lexp, rexp, NULL);
-	  return (-2);
-	 case -1:
-	  return (-1);
-	 case 0:		/* lhs is const */
-	 case 2:		/* lhs is non const */
-	  if (ll->variant == SUBT_OP) {
-	    rexp = make_llnd(cur_file, MINUS_OP, rexp, NULL, NULL);
-	  }
-	  *exp = rexp;
-	  return (-2);
-	}
-      }
-      else if (rval == 0) {	/* right side is just constant */
-	switch (lval) {
-	 case 1:		/* lhs is const coef */
-	  *coef = lcoef;
-	  return (1);
-	 case -2:		/* lhs is non-const coef */
-	  *exp = lexp;
-	  return (-2);
-	 case -1:
-	  return (-1);
-	 case 0:		/* lhs is const */
-	  if (ll->variant == ADD_OP)
-	    *coef = lcoef + rcoef;
-	  else
-	    *coef = lcoef - rcoef;
-	  return (0);
-	 case 2:		/* lhs is non const */
-	  nll = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	  nll->entry.ival = rcoef;
-	  *exp = make_llnd(cur_file, ll->variant, lexp, nll, NULL);
-	  return (2);
-	}
-      }
-      else if (rval == 2) {	/* right side in non-const non coef */
-	switch (lval) {
-	 case 1:		/* lhs is const coef */
-	  *coef = lcoef;
-	  return (1);
-	 case -2:		/* lhs is non-const coef */
-	  *exp = lexp;
-	  return (-2);
-	 case -1:
-	  return (-1);
-	 case 0:		/* lhs is const */
-	  lexp = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-	  lexp->entry.ival = lcoef;
-	 case 2:		/* lhs is non const */
-	  *exp = make_llnd(cur_file, ll->variant, lexp, rexp, NULL);
-	  return (2);
-	}
-      }
-      else			/* if(rval == -1) */
-	return (-1);
-     case DDOT:
-     case ARRAY_REF:
-     case FUNC_CALL:
-      return (-1);
-     default:
-      return (-1);
-    }
-  }
-}
-
-int search_symb(chkdflts, s, ll, coef)
-int chkdflts;
-PTR_SYMB s;
-PTR_LLND ll;
-int *coef;
-{
-  int i, lf, rf, lcoef, rcoef, tmp;
-  PTR_LLND lltmp;
-
-  tmp = 0;
-  *coef = 0;
-  if (ll == NULL)
-    return (0);
-  else if (ll->variant == VAR_REF) {
-    if (ll->entry.Template.symbol == s) {
-      *coef = 1;
-      return (1);
-    }
-    else {
-      /* first try a variable propogation to find s */
-      if (ll->entry.Template.ll_ptr1 != NULL) {
-	return (
-		search_symb(chkdflts, s, ll->entry.Template.ll_ptr1, coef)
-	  );
-      }
-      else if (chkdflts) {
-	for (i = 0; i < MAX_NEST_DEPTH; i++) {
-	  if (ll->entry.Template.symbol == induct_list[i])
-	    return (-3);
-	}
-	 return (0);
-      }
-      else
-	return (-3);
-    }
-  }
-  else if (ll->variant == CONST_REF) {
-    lltmp = ll->entry.Template.symbol->entry.const_value;
-    if (lltmp->variant == INT_VAL) {
-      *coef = lltmp->entry.ival;
-      return (0);
-    }
-    else
-      return (-3);
-  }
-  else if (ll->variant == INT_VAL) {
-    *coef = ll->entry.ival;
-    return (0);
-  }
-  else {
-    lf = search_symb(chkdflts, s, ll->entry.Template.ll_ptr1, &lcoef);
-    rf = search_symb(chkdflts, s, ll->entry.Template.ll_ptr2, &rcoef);
-    switch (ll->variant) {
-     case DDOT:
-      if (lf == 1)
-	*coef = lcoef;
-      else
-	*coef = 0;
-      if (rf == 1)
-	extra_coef = rcoef;
-      else
-	extra_coef = 0;
-      if ((lf == 1) || (rf == 1))
-	return (2);
-      else {
-	if (lf * rf == 0)
-	  return (0);
-	else
-	  return ((lf <= rf) ? rf : lf);
-      }
-     case ADD_OP:
-      if (lf == 1)
-	tmp = lcoef;
-      if (rf == 1)
-	tmp = tmp + rcoef;
-      if ((lf == 1) || (rf == 1)) {
-	*coef = tmp;
-	return (1);
-      }
-      else {
-	*coef = rcoef + lcoef;
-	if (lf * rf == 0)
-	  return (0);
-	else
-	  return ((lf <= rf) ? rf : lf);
-      }
-     case SUBT_OP:
-      if (lf == 1)
-	tmp = lcoef;
-      if (rf == 1)
-	tmp = tmp - rcoef;
-      if ((lf == 1) || (rf == 1)) {
-	*coef = tmp;
-	return (1);
-      }
-      else {
-	*coef = lcoef - rcoef;
-	if (lf * rf == 0)
-	  return (0);
-	else
-	  return ((lf <= rf) ? rf : lf);
-      }
-     case MULT_OP:
-      tmp = 1;
-      if ((lf == 1) || (lf == 0))
-	tmp = lcoef;
-      if ((rf == 1) || (rf == 0))
-	tmp = tmp * rcoef;
-      if ((lf * rf) == 0) {
-	*coef = tmp;
-	return (lf + rf);
-      }
-      else if ((lf == 1) && (rf == 1)) {
-	*coef = 1;
-	return (-1);
-      }
-      else {
-	*coef = 1;
-	return (-2);
-      }
-     case MINUS_OP:
-      *coef = -lcoef;
-      return (lf);
-     default:
-      *coef = 999;
-      return (-2);
-    }
-  }
-}
-
-void print_subscr(r, arr, induct_list)
-PTR_SYMB induct_list[];
-struct ref *r;
-struct subscript arr[];
-{
-  int i, j;
-  PTR_LLND ll;
-  char *s;
-
-  ll = r->refer;
-  if (induct_list[0] == NULL)
-    return;
-  for (j = 0; j < 2; j++) {
-    fprintf(stderr, "______________________________________________________\n");
-    fprintf(stderr, "|	ID  | decidable | offset |    %s |    %s |    %s | parm_exp \n",
-	   induct_list[0]->ident,
-	   (induct_list[1] == NULL) ? "-" : induct_list[1]->ident,
-	   (induct_list[2] == NULL) ? "-" : induct_list[2]->ident);
-    fprintf(stderr, "|-----------------------------------------------------|\n");
-    if (arr[j].parm_exp != NULL)
-      s = (UnparseLlnd[cur_file->lang])(arr[j].parm_exp);
-    else
-      s = "";
-    fprintf(stderr, "|	 %s  |	  %d	  |   %d   |	%d |   %d  |   %d  |%s\n",
-	   ll->entry.array_ref.symbol->ident,
-	   arr[j].decidable, arr[j].offset,
-	   arr[j].coefs[0], arr[j].coefs[1], arr[j].coefs[2], s
-      );
-    fprintf(stderr, "|-----------------------------------------------------|\n");
-    for (i = 0; i < 2; i++) {
-      if (arr[j].coefs_symb[i] != NULL)
-	fprintf(stderr, "    arr[%d].coefs_symb[%d] = %s\n", j, i,
-			(UnparseLlnd[cur_file->lang])(arr[j].coefs_symb[i]));
-    }
-    fprintf(stderr, "|-----------------------------------------------------|\n");
-  }
-}
-
-/* structure equiv. takes two low level pointers to expressions and test */
-/* them for equivalence as expressions.  if equif returns 1 else 0	 */
-/* this version checks only syntatic equiv.  algebraic equiv will be needed */
-int sequiv(sub1, sub2)
-PTR_LLND sub1, sub2;
-{
-  if ((sub1 == NULL) && (sub2 == NULL))
-    return (1);
-  if (((sub1 == NULL) && (sub2 != NULL)) ||
-      ((sub1 != NULL) && (sub2 == NULL)))
-    return (0);
-  /* both not null */
-  if (sub1->variant != sub2->variant)
-    return (0);
-  else {
-    if (sub1->variant == VAR_REF) {
-      if (sub1->entry.Template.symbol ==
-	  sub2->entry.Template.symbol)
-	return (1);
-      else
-	return (0);
-    }
-    else {
-      if (sequiv(sub1->entry.Template.ll_ptr1,
-		 sub2->entry.Template.ll_ptr1) &&
-	  sequiv(sub1->entry.Template.ll_ptr2,
-		 sub2->entry.Template.ll_ptr2)
-	)
-	return (1);
-      else
-	return (0);
-    }
-  }
-}
-
-/* make_subscr(r,arr) creates the subscript array for the reference r */
-void make_subscr(r, arr)
-struct ref *r;
-struct subscript arr[];
-{
-  int i, j;
-  PTR_BFND b, fun;
-  PTR_REFL plist;
-  PTR_LLND ll, tl, index_exper, parexp, exp;
-  struct subscript il_lo[MAX_NEST_DEPTH];
-  struct subscript il_hi[MAX_NEST_DEPTH];
-  int depth, found, coef;
-
-  b = r->stmt;
-  ll = r->refer;
-  for (j = 0; j < AR_DIM_MAX; j++) {
-    arr[j].decidable = -1;
-    arr[j].parm_exp = NULL;
-    arr[j].offset = 0;
-    arr[j].vector = NULL;
-    for (i = 0; i < MAX_NEST_DEPTH; i++) {
-      arr[j].coefs[i] = 0;
-      arr[j].coefs_symb[i] = NULL;
-    }
-  }
-
-  /* now make build the set of valid induction variables */
-  depth = make_induct_list(b, induct_list, il_lo, il_hi);
-  /* now find the parameters and common vars for this scope */
-  fun = b;
-  while (fun != NULL && (fun->variant != PROG_HEDR) &&
-	 (fun->variant != FUNC_HEDR) &&
-	 (fun->variant != PROC_HEDR))
-    fun = fun->control_parent;
-  if (fun == NULL)
-    return;
-  if(fun->entry.Template.sets == NULL) plist = NULL;
-  else plist = fun->entry.Template.sets->in_def;
-
-  /* now for each array index position build the vector of coefs. */
-  /* start with the left most position numbered by i */
-  i = 0;
-  if (ll->variant == ARRAY_REF) {
-    tl = ll->entry.array_ref.index;
-    while (tl != NULL) {
-      if ((tl->variant == VAR_LIST) ||
-	  (tl->variant == EXPR_LIST) ||
-	  (tl->variant == RANGE_LIST)) {
-	index_exper = tl->entry.Template.ll_ptr1;
-	if (index_exper == NULL ||
-	    index_exper->variant == STAR_RANGE) {
-	  arr[i].vector = index_exper;
-	  arr[i].decidable = 0;
-	  arr[i].coefs[depth] = 0;
-	}
-	else if (index_exper->variant == DDOT) {
-	  /* we have a vector			 */
-	  /* set the decidable flag to 2	 */
-	  /* and save a pointr to the vector	 */
-	  /* bounds for later use		 */
-	  /* we set the coef in position	 */
-	  /* depth to be 1 so this is		 */
-	  /* a pseudo loop.  the bounds of the	 */
-	  /* loops will be set			 */
-	  /* as inequalities.  NOTE: for stride  */
-	  /* vectors we will			 */
-	  /* set the coef to be equal to thestride */
-	  arr[i].vector = index_exper;
-	  arr[i].decidable = 2;
-	  arr[i].coefs[depth] = 1;
-	}
-	else {
-	  /* this is just a standard scalar expression */
-	  arr[i].decidable = 1;
-	  parexp = NULL;
-	  found = comp_offset(plist, induct_list, 1,
-			      index_exper, &coef, &parexp);
-	  if (found == 1)
-	    arr[i].offset = coef;
-	  if (found == 4) {
-	    arr[i].offset = 0;
-	    arr[i].parm_exp = parexp;
-	  }
-	  for (j = 0; j < depth; j++) {
-	    found=new_search_symb(induct_list[j],
-				  induct_list,index_exper, &coef, &exp);
-	    switch (found) {
-	     case 1:		/* constant coef */
-	      arr[i].coefs[j] = coef;
-	      break;
-	     case -2:		/* variable coef */
-	      arr[i].coefs_symb[j] = exp;
-	      break;
-	     case -1:
-	      arr[i].decidable = 0;
-	     case 0:
-	     case 2:
-	      arr[i].coefs[j] = 0;
-	      break;
-	    }
-	  }
-	  for (j = depth; j < MAX_NEST_DEPTH; j++)
-	    arr[i].coefs[j] = 0;
-	  if (arr[i].decidable == -1)
-	    arr[i].decidable = 3;
-	}
-	tl = tl->entry.Template.ll_ptr2;
-	i++;
-      }
-      else {			/* must be a simple 1 Dim. subscript */
-	arr[i].decidable = 1;
-	parexp = NULL;
-	found = comp_offset(plist, induct_list, 1, tl, &coef, &parexp);
-	if (found != 0)
-	  arr[i].offset = coef;
-	if (found == 4) {
-	  arr[i].offset = 0;
-	  arr[i].parm_exp = parexp;
-	}
-	for (j = 0; j < depth; j++) {
-	  found = new_search_symb(induct_list[j], induct_list, tl,&coef,&exp);
-	  switch (found) {
-	   case 1:		/* constant coef */
-	    arr[i].coefs[j] = coef;
-	    break;
-	   case -2:		/* variable coef */
-	    arr[i].coefs_symb[j] = exp;
-	    break;
-	   case -1:
-	    arr[i].decidable = 0;
-	   case 0:
-	   case 2:
-	    arr[i].coefs[j] = 0;
-	    break;
-	  }
-	}
-	for (j = depth; j < MAX_NEST_DEPTH; j++)
-	  arr[i].coefs[j] = 0;
-	tl = NULL;
-      }
-    }				/* end while */
-  }				/* end if array_ref */
-}
-
-/********************************************************************/
-/* search_inc_scalar(b) looks for a scalar variable in the condition*/
-/*  that is modified in the body of the loop.			    */
-/*  this is returned and used as an induction varialble in the	    */
-/*   routine below. There are two utility routines which recursively*/
-/*   search the condition tree and the body of the loop 	    */
-/********************************************************************/
-int ll_search(ll, s)
-PTR_LLND ll;
-PTR_SYMB s;
-{
-  if (ll == NULL)
-    return (0);
-  else {
-    switch (ll->variant) {
-     case VAR_REF:
-      if (ll->entry.var_ref.symbol == s)
-	return (1);
-      else
-	return (0);
-     case ARRAY_REF:
-      return (ll_search(ll->entry.array_ref.index, s));
-     case CONST_REF:
-      return (0);
-     default:
-      if (ll_search(ll->entry.Template.ll_ptr1, s))
-	return (1);
-      else
-	return (ll_search(ll->entry.Template.ll_ptr2, s));
-    }
-  }
-}
-
-int body_search(b, s)
-PTR_BFND b;
-PTR_SYMB s;
-{
-  PTR_BLOB x;
-
-  if (b == NULL)
-    return (0);
-  else {
-    switch (b->variant) {
-     case ASSIGN_STAT:
-     case M_ASSIGN_STAT:
-     case SUM_ACC:
-     case MULT_ACC:
-     case MAX_ACC:
-     case MIN_ACC:
-     case CAT_ACC:
-     case OR_ACC:
-     case AND_ACC:
-      return (ll_search(b->entry.Template.ll_ptr1, s));
-     case FOR_NODE:
-     case FORALL_NODE:
-     case WHILE_NODE:
-      x = b->entry.Template.bl_ptr1;
-      while (x != NULL && x->ref != b) {
-	if (body_search(x->ref, s))
-	  return (1);
-	x = x->next;
-      }
-      return (0);
-     case IF_NODE:
-      x = b->entry.if_node.control_true;
-      while (x != NULL) {
-	if (body_search(x->ref, s))
-	  return (1);
-	x = x->next;
-      }
-      x = b->entry.if_node.control_false;;
-      while (x != NULL) {
-	if (body_search(x->ref, s))
-	  return (1);
-	x = x->next;
-      }
-      return (0);
-     default:
-      return (0);
-    }
-  }
-}
-
-PTR_SYMB induc_search(b, ll)
-PTR_BFND b;
-PTR_LLND ll;
-{
-  PTR_SYMB s;
-
-  if (ll == NULL)
-    return (NULL);
-  else {
-    switch (ll->variant) {
-     case VAR_REF:
-      if (body_search(b, ll->entry.var_ref.symbol))
-	return (ll->entry.var_ref.symbol);
-      else
-	return (NULL);
-     case ARRAY_REF:
-      return (induc_search(b, ll->entry.array_ref.index));
-     case CONST_REF:
-      return (NULL);
-     default:
-      if ((s = induc_search(b, ll->entry.Template.ll_ptr1))
-	  != NULL)
-	return (s);
-      else
-	return (induc_search(b, ll->entry.Template.ll_ptr2));
-    }
-  }
-}
-
-
-PTR_SYMB search_inc_scalar(b)
-PTR_BFND b;
-{
-  PTR_LLND v;
-
-  v = b->entry.while_node.condition;
-  return (induc_search(b, v));
-}
-
-
-/********************************************************************/
-/* Make_induct_list(b,induct_list ) creates the induction list as   */
-/* seen from this point in the graph.  the function returns the nest*/
-/* level and it also side effects four other arrays: il_lo, il_hi   */
-/* which describe the low and hi bounds for the list and the vectors*/
-/* stride and is_forall.  In the case of a stride component that is */
-/* not one, we normalize the induction list arrays as follows.	    */
-/* if the stride is not a constant il_lo and il_hi is set undecidble*/
-/* otherwise il_lo is set to 0 and il_hi becomes (il_hi-il_lo)/str  */
-/* The way this works:	it goes up the tree and fills in the loop   */
-/* index variables from the top down to this point.		    */
-/* In the case of WHILE loops and C for loops as well as while loops*/
-/* we must try to identify an induction 			    */
-/* variable.  We will do this by searching the test condition for   */
-/* first scalar variable.  This is not accurate.  What we should do */
-/* is search for a scalar variable that changes value in the body of*/
-/* the iteration, but that is not done yet. I will do it later.     */
-/********************************************************************/
-int make_induct_list(b, induct_list, il_lo, il_hi)
-PTR_BFND b;
-PTR_SYMB induct_list[];
-struct subscript il_lo[];
-struct subscript il_hi[];
-{
-  int i, j, found, coef;
-  PTR_LLND p, lv, rv, q, pexp;
-  PTR_REFL plist;
-  PTR_BFND proc;
-
-  if ((b == NULL) || (b->variant == GLOBAL)) {
-    return (0);
-  }
-  else {
-    for (j = 0; j < MAX_NEST_DEPTH; j++) {
-      il_lo[j].decidable = -1;
-      il_lo[j].parm_exp = NULL;
-      il_lo[j].offset = 0;
-      il_lo[j].vector = NULL;
-      for (i = 0; i < MAX_NEST_DEPTH; i++) {
-	il_lo[j].coefs[i] = 0;
-	il_lo[j].coefs_symb[i] = NULL;
-      }
-      il_hi[j].decidable = -1;
-      il_hi[j].parm_exp = NULL;
-      il_hi[j].offset = 0;
-      il_hi[j].vector = NULL;
-      for (i = 0; i < MAX_NEST_DEPTH; i++) {
-	il_hi[j].coefs[i] = 0;
-	il_hi[j].coefs_symb[i] = NULL;
-      }
-    }
-    /* first generate the list of parameters of the function */
-    proc = b;
-    while (proc != NULL && (proc->variant != PROC_HEDR) &&
-	   (proc->variant != FUNC_HEDR) &&
-	   (proc->variant != PROG_HEDR))
-      proc = proc->control_parent;
-    if (proc == NULL)
-      return 0;
-    if (proc->entry.Template.sets == NULL)
-      plist = NULL;
-    else
-      plist = proc->entry.Template.sets->out_use;
-
-    /* now recursive apply procedure */
-    i = make_induct_list(b->control_parent, induct_list, il_lo, il_hi);
-    if ((b->variant == FOR_NODE) ||
-	(b->variant == FORALL_NODE)) {
-      if (i > MAX_NEST_DEPTH) {
-	fprintf(stderr, " nest too deep ! \n");
-	return (0);
-      }
-      if (b->entry.for_node.control_var == NULL) {
-	/* must be a C for loop */
-	lv = b->entry.Template.ll_ptr1; /* exp list */
-	if (lv == NULL) {
-	  /* try to go for the increment exp */
-	  lv = b->entry.Template.ll_ptr3;
-	  rv = lv->entry.Template.ll_ptr1;	/* op */
-	  lv = rv->entry.Template.ll_ptr1;
-	  induct_list[i] =
-	    lv->entry.Template.symbol;
-	  lv = NULL;
-	  il_lo[i].decidable = 0;
-	}
-	else {
-	  rv = lv->entry.Template.ll_ptr1;	/* asign op */
-	  lv = rv->entry.Template.ll_ptr1;	/* var ref */
-	  il_lo[i].decidable = 1;
-	  induct_list[i] = lv->entry.Template.symbol;
-	  lv = rv->entry.Template.ll_ptr2;	/* start val */
-	}
-	is_forall[i] = 0;
-	/* now do hi bound for C case */
-	rv = b->entry.Template.ll_ptr2; /* 2nd expr */
-	rv = rv->entry.Template.ll_ptr1;
-	rv = rv->entry.Template.ll_ptr2;
-	stride[i] = 1;		/* these two lines are bogus */
-	il_hi[i].decidable = 1;
-      }
-      else {			/* fortran case */
-	induct_list[i] = b->entry.for_node.control_var;
-	if (b->variant == FORALL_NODE)
-	  is_forall[i] = 1;
-	else
-	  is_forall[i] = 0;
-	/* now create low and hi bounds */
-	p = b->entry.for_node.range;
-	if (p->variant != DDOT)
-	  fprintf(stderr, "bad range node\n");
-	lv = p->entry.Template.ll_ptr1;
-	rv = p->entry.Template.ll_ptr2;
-	il_lo[i].decidable = 1;
-	il_hi[i].decidable = 1;
-	stride[i] = 1;
-	if ((lv->variant == DDOT) ||
-	    (b->entry.for_node.increment != NULL)) {
-	  /* we have a stride term! */
-	  if (b->entry.for_node.increment != NULL)
-	    q = b->entry.for_node.increment;
-	  else {
-	    q = rv;
-	    rv = lv->entry.Template.ll_ptr2;
-	    lv = lv->entry.Template.ll_ptr1;
-	  }
-	  /* we currently only support constant strides */
-	  /* this can be improved to general expressions */
-	  found = comp_offset(plist, induct_list, 1, q, &coef, &pexp);
-	  if (found != 3)
-	    stride[i] = coef;
-	  if ((found == 4) || (found == 3) || (stride[i] == 0)) {
-	    il_lo[i].decidable = 0;
-	    il_hi[i].decidable = 0;
-	    stride[i] = 1;
-	  }
-	}
-      } 			/* end fortran case */
-      pexp = NULL;
-      found = comp_offset(plist, induct_list, 1, lv, &coef, &pexp);
-      if (found >= 3)
-	il_lo[i].decidable = 0;
-      if (found == 4)
-	il_lo[i].parm_exp = pexp;
-      else
-	il_lo[i].parm_exp = NULL;
-      if (found != 0)
-	il_lo[i].offset = coef;
-      pexp = NULL;
-      found = comp_offset(plist, induct_list, 1, rv, &coef, &pexp);
-      if (found >= 3)
-	il_hi[i].decidable = 0;
-      if (found == 4)
-	il_hi[i].parm_exp = pexp;
-      else
-	il_hi[i].parm_exp = NULL;
-      if (found != 0)
-	il_hi[i].offset = coef;
-      for (j = 0; j < i; j++) {
-	found = search_symb(0, induct_list[j], lv, &coef);
-	if (found >= 1)
-	  il_lo[i].coefs[j] = coef;
-	else if (found == 0)
-	  il_lo[i].coefs[j] = 0;
-	else if ((found == -1) ||
-		 (found == -2))
-	  il_lo[i].decidable = 0;
-
-	found = search_symb(0, induct_list[j], rv, &coef);
-	if (found >= 1)
-	  il_hi[i].coefs[j] = coef;
-	else if (found == 0)
-	  il_hi[i].coefs[j] = 0;
-	else if ((found == -1) ||
-		 (found == -2))
-	  il_hi[i].decidable = 0;
-      }
-      /* now normalize for stride */
-      if (stride[i] != 1) {
-	il_hi[i].offset =
-	  (il_hi[i].offset - il_lo[i].offset) / stride[i];
-	il_lo[i].offset = 0;
-	for (j = 0; j < i; j++) {
-	  il_hi[i].coefs[j] =
-	    (il_hi[i].coefs[j] - il_lo[i].coefs[j]) / stride[i];
-	  il_lo[i].coefs[j] = 0;
-	}
-      }
-      return (i + 1);
-    }
-    else if (b->variant == WHILE_NODE) {
-      if (i > MAX_NEST_DEPTH) {
-	fprintf(stderr, " nest too deep ! \n");
-	return (0);
-      }
-      induct_list[i] = search_inc_scalar(b);;
-      /* now create low and hi bounds */
-      il_lo[i].decidable = 0;
-      il_hi[i].decidable = 0;
-      for (j = 0; j < i; j++) {
-	il_lo[i].coefs[j] = 0;
-	il_hi[i].coefs[j] = 0;
-      }
-
-      return (i + 1);
-    }
-    else
-      return (i);
-  }
-}
-/* make_vect_range takes a pointer to a .. node */
-/* for a vector reference and builds two	*/
-/* subscript records.  One for the lo end the	*/
-/* other for the hi end.  induct_list is	*/
-/* the current active induction list.		*/
-void make_vect_range(depth, p, induct_list, lo, hi)
-PTR_LLND p;
-PTR_SYMB induct_list[];
-struct subscript *lo;
-struct subscript *hi;
-int depth;
-{
-  int i, j, found, coef;
-  PTR_LLND lv, rv, plv, prv;
-  PTR_REFL plist;		/* this is a dummy. need to add this as
-				 * parameter */
-  if (p->variant != DDOT)
-    fprintf(stderr, "bad range node in vector\n");
-  for (i = 0; i < MAX_NEST_DEPTH; i++) {
-    lo->coefs[i] = 0;
-    hi->coefs[i] = 0;
-  }
-  lo->offset = 0;
-  hi->offset = 0;
-  lv = p->entry.Template.ll_ptr1;
-  rv = p->entry.Template.ll_ptr2;
-  lo->decidable = 1;
-  plist = NULL; 		/* ignore parametes in vector range for now */
-  found = comp_offset(plist, induct_list, 1, lv, &coef, &plv);
-  if (found >= 3)
-    lo->decidable = 0;
-  if (found != 0)
-    lo->offset = coef;
-  hi->decidable = 1;
-  found = comp_offset(plist, induct_list, 1, rv, &coef, &prv);
-  if (found >= 3)
-    hi->decidable = 0;
-  if (found != 0)
-    hi->offset = coef;
-  for (j = 0; j < i; j++) {
-    found = search_symb(0, induct_list[j], lv, &coef);
-    if (found >= 1)
-      lo->coefs[j] = coef;
-    else if (found == 0)
-      lo->coefs[j] = 0;
-    else if ((found == -1) ||
-	     (found == -2))
-      lo->decidable = 0;
-
-    found = search_symb(0, induct_list[j], rv, &coef);
-    if (found >= 1)
-      hi->coefs[j] = coef;
-    else if (found == 0)
-      hi->coefs[j] = 0;
-    else if ((found == -1) ||
-	     (found == -2))
-      hi->decidable = 0;
-  }
-  lo->offset = -lo->offset;
-  for (i = 0; i < MAX_NEST_DEPTH; i++) {
-    lo->coefs[i] = -lo->coefs[i];
-  }
-  lo->coefs[depth] = 1; 	/* perhaps repalce by stride ? */
-  hi->coefs[depth] = -1;
-}
-
-/************************************************/
-/* standard gcd routines: gcd of two vectors.	*/
-/*  zeros are not counted.			*/
-/************************************************/
-int sgcd(a, b)
-int a, b;
-{
-  int tmp;
-
-  if (a < 0)
-    a = -a;
-  if (b < 0)
-    b = -b;
-  if (a > b) {
-    tmp = b;
-    b = a;
-    a = tmp;
-  }
-  if (a == 0)
-    return (b);
-  else
-    return (sgcd(a, b % a));
-}
-
-int gcd(d, x)
-int d;
-int x[];
-{
-  int i, g;
-  g = 0;
-  for (i = 0; i < d; i++) {
-    g = sgcd(g, x[i]);
-  }
-  return (g);
-}
-
-
-void clean_loops(b)
-PTR_BFND b;
-{
-  PTR_BLOB x;
-
-  if (b == NULL)
-    return ;
-  else {
-    switch (b->variant) {
-     case GLOBAL:
-     case PROG_HEDR:
-     case PROC_HEDR:
-     case FUNC_HEDR:
-     case FOR_NODE:
-     case FORALL_NODE:
-     case WHILE_NODE:
-      x = b->entry.Template.bl_ptr1;
-      while (x != NULL && x->ref != b) {
-	clean_loops(x->ref);
-	if (x->next != NULL &&
-	    x->next->ref == b)
-	  x->next = NULL;
-	x = x->next;
-      }
-      break;
-     case IF_NODE:
-      x = b->entry.if_node.control_true;
-      while (x != NULL) {
-	clean_loops(x->ref);
-	if (x->next != NULL &&
-	    x->next->ref == b)
-	  x->next = NULL;
-	x = x->next;
-      }
-      x = b->entry.if_node.control_false;;
-      while (x != NULL) {
-	clean_loops(x->ref);
-	if (x->next != NULL &&
-	    x->next->ref == b)
-	  x->next = NULL;
-	x = x->next;
-      }
-      break;
-     default:
-      break;
-    }
-  }
-}
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
deleted file mode 100644
index 31babb0..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/symb_alg.c
+++ /dev/null
@@ -1,1050 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* file: symb_alg.c */
-
-#include "db.h"
-
-extern PTR_LLND make_llnd();
-extern PTR_FILE cur_file;
-
-/*
- * The following routines are used to evaluate low level expressions
- */
-
-int get_symbs(n, p, s)
-PTR_LLND p;
-PTR_SYMB s[];
-int n;
-{
-  int i;
-
-  if (p == NULL)
-    return (n);
-  if (p->variant == VAR_REF) {
-    for (i = 0; i < n; i++)
-      if (s[i] == p->entry.Template.symbol)
-	break;
-    if (i == n) {
-      s[n++] = p->entry.Template.symbol;
-    }
-  }
-  n = get_symbs(n, p->entry.Template.ll_ptr1, s);
-  n = get_symbs(n, p->entry.Template.ll_ptr2, s);
-  return (n);
-}
-
-int eval_exp(p, s, vals, n, valu)	/* returns 0 on failure */
-int n;
-PTR_LLND p;
-PTR_SYMB s[];
-int vals[];
-int *valu;
-{
-  int i, lv, rv, rs, ls;
-
-  if (p == NULL)
-    return (0);
-  if (p->variant == INT_VAL) {
-    *valu = p->entry.ival;
-    return (1);
-  }
-  if (p->variant == VAR_REF) {
-    for (i = 0; i < n; i++)
-      if (s[i] == p->entry.Template.symbol) {
-	*valu = vals[i];
-	return (1);
-      }
-    return (0);
-  }
-  lv = 0;
-  rv = 0;
-  rs = 0;
-  ls = 0;
-  rs = eval_exp(p->entry.Template.ll_ptr2, s, vals, n, &rv);
-  ls = eval_exp(p->entry.Template.ll_ptr1, s, vals, n, &lv);
-
-  switch (p->variant) {
-   case MINUS_OP:
-    *valu = -lv;
-    break;
-   case ADD_OP:
-    *valu = lv + rv;
-    break;
-   case MULT_OP:
-    *valu = lv * rv;
-    break;
-   case DIV_OP:
-    *valu = (rv != 0) ? lv / rv : 0;
-    break;
-   case SUBT_OP:
-    *valu = lv - rv;
-    break;
-   default:
-    fprintf(stderr, "bad op: %d\n", p->variant);
-    return (0);
-    
-  }
-  if (p->variant != MINUS_OP)
-    return (rs * ls);
-  else
-    return (ls);
-}
-
-/* returns 1 if p and q are constant or linear in the same var */
-/* and 0 otherwise.  result = 1 if p is less than q for a large value */
-/* and result = 0 otherwise */
-int numerical_less(p, q, result)
-PTR_LLND p, q;
-int *result;
-{
-  PTR_SYMB psyms[20], qsyms[20];
-  int pvals[20], qvals[20];
-  int pn, qn, pv, qv, ps, qs;
-
-  pn = 0;
-  qn = 0;
-  pv = 0;
-  qv = 0;
-  qs = 0;
-  ps = 0;
-  pn = get_symbs(pn, p, psyms);
-  qn = get_symbs(qn, q, qsyms);
-  if (pn > 1 || qn > 1)
-    return (0);
-  if (pn == 1 && qn == 1 && psyms[0] != qsyms[0])
-    return (0);
-  pvals[0] = 512;
-  qvals[0] = 512;
-  ps = eval_exp(p, psyms, pvals, pn, &pv);
-  qs = eval_exp(q, qsyms, qvals, qn, &qv);
-  if (ps * qs == 0)
-    return (0);
-  *result = (pv < qv) ? 1 : 0;
-  return (1);
-}
-
-
-int less(p, q)
-PTR_LLND p, q;
-{
-  char *name1, *name2;
-  int i;
-
-  if (p->variant == MINUS_OP)
-    p = p->entry.Template.ll_ptr1;
-  if (q->variant == MINUS_OP)
-    q = q->entry.Template.ll_ptr1;
-  if (q->variant == INT_VAL) {
-    if (p->variant == INT_VAL) {
-      if (p->entry.ival < q->entry.ival)
-	return (1);
-      else
-	return (0);
-    }
-    else
-      return (1);
-  }
-  if (p->variant == INT_VAL)
-    return (0);
-  if (p->variant == VAR_REF && q->variant == VAR_REF) {
-    name1 = p->entry.Template.symbol->ident;
-    name2 = q->entry.Template.symbol->ident;
-    i = 0;
-    while (name1[i] != '\0' && name2[i] != '\0') {
-      if (name1[i] > name2[i])
-	return (0);
-      if (name1[i] < name2[i])
-	return (1);
-      i++;
-    }
-    if (name1[i] == '\0' && name2[i] != '\0')
-      return (1);
-    else
-      return (0);
-  }
-  if (p->variant == VAR_REF)
-    return (1);
-  if (q->variant == VAR_REF)
-    return (0);
-  return (0);
-}
-
-int rest_constant(p)
-PTR_LLND p;
-{
-  if (p == NULL)
-    return (1);
-  if (p->variant == INT_VAL)
-    return (1);
-  if (p->variant == MINUS_OP)
-    return (rest_constant(p->entry.Template.ll_ptr1));
-  if (p->variant == MULT_OP)
-    return (rest_constant(p->entry.Template.ll_ptr1) *
-	    rest_constant(p->entry.Template.ll_ptr2));
-  if (p->variant == DIV_OP)
-    return (rest_constant(p->entry.Template.ll_ptr1) *
-	    rest_constant(p->entry.Template.ll_ptr2));
-  return (0);
-}
-
-
-int term_less(p, q)
-PTR_LLND p, q;
-{
-  PTR_LLND p_rchld, q_rchld;
-
-  /* assume in normal form */
-  if (p == NULL && q == NULL)
-    return (0);
-  if (p == NULL)
-    return (1);
-  if (q == NULL)
-    return (0);
-  if (p->variant == MINUS_OP)
-    p = p->entry.Template.ll_ptr1;
-  if (q->variant == MINUS_OP)
-    q = q->entry.Template.ll_ptr1;
-  if (p->variant == DIV_OP && q->variant == DIV_OP) {
-    p_rchld = p->entry.Template.ll_ptr2;
-    q_rchld = q->entry.Template.ll_ptr2;
-    if (less(p_rchld, q_rchld))
-      return (1);
-    if (less(q_rchld, p_rchld))
-      return (0);
-    /* must be equal */
-    return (term_less(p->entry.Template.ll_ptr1,
-		      q->entry.Template.ll_ptr1));
-  }
-  if (p->variant == DIV_OP && q->variant != DIV_OP) {
-    if (rest_constant(p->entry.Template.ll_ptr1))
-      return (term_less(p->entry.Template.ll_ptr2, q));
-  }
-  if (p->variant == MULT_OP && q->variant != MULT_OP) {
-    if (rest_constant(p->entry.Template.ll_ptr1))
-      return (term_less(p->entry.Template.ll_ptr2, q));
-  }
-  if (p->variant != DIV_OP && q->variant == DIV_OP) {
-    if (rest_constant(q->entry.Template.ll_ptr1))
-      return (term_less(p, q->entry.Template.ll_ptr2));
-  }
-  if (p->variant != MULT_OP && q->variant == MULT_OP) {
-    if (rest_constant(q->entry.Template.ll_ptr1))
-      return (term_less(p, q->entry.Template.ll_ptr2));
-  }
-  if (p->variant == MULT_OP && q->variant == MULT_OP) {
-    p_rchld = p->entry.Template.ll_ptr2;
-    q_rchld = q->entry.Template.ll_ptr2;
-    if (less(p_rchld, q_rchld))
-      return (1);
-    if (less(q_rchld, p_rchld))
-      return (0);
-    /* must be equal */
-    return (term_less(p->entry.Template.ll_ptr1, q->entry.Template.ll_ptr1));
-  }
-  /* both not mult */
-  return (less(p, q));
-}
-
-void sort_term(p)
-PTR_LLND p;
-{
-  int notdone;
-  PTR_LLND q;
-  PTR_LLND lchild, rchild, gchild;
-
-  if(p == NULL) return;
-  if (p->variant == MINUS_OP)
-    p = p->entry.Template.ll_ptr1;
-  if (p->variant != MULT_OP && p->variant != DIV_OP)
-    return;
-  notdone = 1;
-  while (notdone) {
-    q = p;
-    notdone = 0;
-    while (q != NULL && q->entry.Template.ll_ptr1 != NULL) {
-      lchild = q->entry.Template.ll_ptr1;
-      rchild = q->entry.Template.ll_ptr2;
-      if(lchild == NULL || rchild == NULL) return;
-      if (lchild->variant == INT_VAL && rchild->variant == INT_VAL) {
-	notdone = 1;
-	if (q->variant == SUBT_OP)
-	  q->entry.ival = lchild->entry.ival - rchild->entry.ival;
-	else if (q->variant == ADD_OP)
-	  q->entry.ival = rchild->entry.ival + lchild->entry.ival;
-	else if (q->variant == MULT_OP)
-	  q->entry.ival = rchild->entry.ival * lchild->entry.ival;
-	else if (q->variant == DIV_OP &&
-		 rchild->entry.ival != 0)
-	  q->entry.ival = lchild->entry.ival / rchild->entry.ival;
-	else
-	  q->entry.ival = 888888;
-	q->variant = INT_VAL;
-	/* better dispose of lchild and rchild later */
-	q->entry.Template.ll_ptr1 = NULL;
-	q->entry.Template.ll_ptr2 = NULL;
-      }
-      else if ((q->variant == MULT_OP &&
-		lchild->variant != MULT_OP && lchild->variant != DIV_OP)
-	       && less(lchild, rchild)) {
-	notdone = 1;
-	q->entry.Template.ll_ptr1 = rchild;
-	q->entry.Template.ll_ptr2 = lchild;
-      }
-      else if (q->variant == MULT_OP && lchild->variant == MULT_OP) {
-	gchild = lchild->entry.Template.ll_ptr2;
-	if (rchild->variant == INT_VAL && gchild->variant == INT_VAL) {
-	  notdone = 1;
-	  rchild->entry.ival = rchild->entry.ival * gchild->entry.ival;
-	  q->entry.Template.ll_ptr1 = lchild->entry.Template.ll_ptr1;
-	}
-	else if (less(gchild, rchild)) {
-	  notdone = 1;
-	  q->entry.Template.ll_ptr2 = gchild;
-	  lchild->entry.Template.ll_ptr2 = rchild;
-	}
-      }
-      q = q->entry.Template.ll_ptr1;
-    }
-  }
-}
-
-void sort_exp(p)
-PTR_LLND p;
-{
-  int notdone, var;
-  PTR_LLND q, q1;
-  PTR_LLND lchild, rchild, gchild;
-
-  q = p;
-  while (q != NULL && (q->variant != ADD_OP && q->variant != SUBT_OP)) {
-    if (q != NULL && (q->variant == MULT_OP || q->variant == DIV_OP))
-      sort_term(q);
-    if (q->variant == DIV_OP) {
-      if (q->entry.Template.ll_ptr1->variant == ADD_OP ||
-	  q->entry.Template.ll_ptr1->variant == SUBT_OP)
-	sort_exp(q->entry.Template.ll_ptr1);
-      if (q->entry.Template.ll_ptr2->variant == ADD_OP ||
-	  q->entry.Template.ll_ptr2->variant == SUBT_OP)
-	sort_exp(q->entry.Template.ll_ptr2);
-    }
-    q = q->entry.Template.ll_ptr1;
-  }
-  q1 = q;
-  if (q1 == NULL)
-    return;
-
-  while (q != NULL) {
-    if (q->variant == ADD_OP || q->variant == SUBT_OP)
-      sort_term(q->entry.Template.ll_ptr2);
-    else if (q->variant == MULT_OP || q->variant == DIV_OP)
-      sort_term(q);
-    if (q->variant == ADD_OP || q->variant == SUBT_OP)
-      q = q->entry.Template.ll_ptr1;
-    else
-      q = NULL;
-  }
-
-  notdone = 1;
-  q = q1;
-  while (notdone) {
-    q = p;
-    notdone = 0;
-    while (q != NULL && q->variant != MULT_OP && q->variant != DIV_OP &&
-	   q->entry.Template.ll_ptr1 != NULL) {
-      lchild = q->entry.Template.ll_ptr1;
-      rchild = q->entry.Template.ll_ptr2;
-      if(lchild == NULL || rchild == NULL) return; /* should never happen! */
-      if (lchild->variant == INT_VAL && rchild->variant == INT_VAL) {
-	var = q->variant;
-	q->variant = INT_VAL;
-	if (var == ADD_OP)
-	  q->entry.ival = lchild->entry.ival + rchild->entry.ival;
-	else
-	  q->entry.ival = lchild->entry.ival - rchild->entry.ival;
-
-	q->entry.Template.ll_ptr1 = NULL;
-	q->entry.Template.ll_ptr2 = NULL;
-	notdone = 1;
-      }
-      else if ((lchild->variant != ADD_OP && lchild->variant != SUBT_OP)
-	       && term_less(lchild, rchild)) {
-	notdone = 1;
-	q->entry.Template.ll_ptr1 = rchild;
-	q->entry.Template.ll_ptr2 = lchild;
-	if (q->variant == SUBT_OP) {
-	  q->variant = ADD_OP;
-	  lchild = make_llnd(cur_file, INT_VAL, NULL, NULL, 0);
-	  q->entry.Template.ll_ptr1=make_llnd(cur_file,SUBT_OP,lchild,rchild,
-					      NULL);
-	}
-      }
-      else if (lchild->variant == ADD_OP || lchild->variant == SUBT_OP) {
-	gchild = lchild->entry.Template.ll_ptr2;
-	if (term_less(gchild, rchild)) {
-	  notdone = 1;
-	  q->entry.Template.ll_ptr2 = gchild;
-	  lchild->entry.Template.ll_ptr2 = rchild;
-	  var = q->variant;
-	  q->variant = lchild->variant;
-	  lchild->variant = var;
-	}
-      }
-      q = q->entry.Template.ll_ptr1;
-    }
-  }
-}
-
-PTR_LLND copy_llnd(p)
-PTR_LLND p;
-{
-  PTR_LLND newp;
-
-  if (p == NULL)
-    return (NULL);
-  newp = make_llnd(cur_file, p->variant, NULL, NULL, p->entry.Template.symbol);
-  newp->entry.Template.ll_ptr1 = copy_llnd(p->entry.Template.ll_ptr1);
-  newp->entry.Template.ll_ptr2 = copy_llnd(p->entry.Template.ll_ptr2);
-  return (newp);
-}
-
-int integer_difference(p,q, value, dif)
-PTR_LLND p,q, *dif;
-int *value;
-{
-   PTR_LLND s;
-   void simplify(), normal_form();
-
-   s = make_llnd(cur_file, SUBT_OP, copy_llnd(p),copy_llnd(q), NULL);
-   normal_form(&s);
-   *dif = s;
-   if(s->variant == INT_VAL){
-	 *value = s->entry.ival;
-	 return 1;
-	 }
-   else if (s->variant == MINUS_OP){
-	 s = s->entry.Template.ll_ptr1;
-	 *value = -s->entry.ival;
-	 return 1;
-	 }
-   return 0;
-}
-
-int no_division(p)
-PTR_LLND p;
-{
-  return (1);
-#if 0
-  while (p != NULL && p->variant == MULT_OP)
-    p = p->entry.Template.ll_ptr1;
-  if (p == NULL)
-    return (1);
-  if (p->variant == DIV_OP)
-    return (0);
-  return (1);
-#endif
-}
-
-
-void expand(p)
-PTR_LLND p;
-{
-  PTR_LLND lson, rson, lgchld, rgchld, cpy, new;
-  if (p == NULL)
-    return;
-
-  if (p->variant == MULT_OP) {
-    lson = p->entry.Template.ll_ptr1;
-    rson = p->entry.Template.ll_ptr2;
-    if (lson->variant == MULT_OP) {
-      expand(p->entry.Template.ll_ptr1);
-      lson = p->entry.Template.ll_ptr1;
-    }
-    if (rson->variant == MULT_OP) {
-      expand(p->entry.Template.ll_ptr2);
-      rson = p->entry.Template.ll_ptr2;
-    }
-    if ((lson->variant == ADD_OP || lson->variant == SUBT_OP)) {
-      lgchld = lson->entry.Template.ll_ptr1;
-      rgchld = lson->entry.Template.ll_ptr2;
-      cpy = copy_llnd(rson);
-      new = make_llnd(cur_file, MULT_OP, rgchld, rson, NULL);
-      lson->entry.Template.ll_ptr1 = lgchld;
-      lson->entry.Template.ll_ptr2 = cpy;
-      p->entry.Template.ll_ptr2 = new;
-      p->variant = lson->variant;
-      lson->variant = MULT_OP;
-    }
-    else if ((rson->variant == ADD_OP || rson->variant == SUBT_OP) &&
-	     no_division(rson->entry.Template.ll_ptr2) &&
-	     no_division(rson->entry.Template.ll_ptr1)) {
-      lgchld = rson->entry.Template.ll_ptr1;
-      rgchld = rson->entry.Template.ll_ptr2;
-      cpy = copy_llnd(lson);
-      new = make_llnd(cur_file, MULT_OP, lson, lgchld, NULL);
-      rson->entry.Template.ll_ptr1 = cpy;
-      rson->entry.Template.ll_ptr2 = rgchld;
-
-      p->entry.Template.ll_ptr1 = new;
-      p->variant = rson->variant;
-      rson->variant = MULT_OP;
-    }
-  }
-  expand(p->entry.Template.ll_ptr2);
-  expand(p->entry.Template.ll_ptr1);
-}
-
-void left_allign_term(p)	/* need fix for divide, similar to - fix
-				 * below */
-PTR_LLND *p;
-{
-  PTR_LLND root_rc, tail_r_chain, last_r_chain, q;
-  if (*p == NULL)
-    return;
-  if ((*p)->variant == MULT_OP) {
-    if ((*p)->entry.Template.ll_ptr2->variant != DIV_OP)
-      left_allign_term(&((*p)->entry.Template.ll_ptr2));
-    left_allign_term(&((*p)->entry.Template.ll_ptr1));
-
-    /* now link these together */
-
-    root_rc = (*p)->entry.Template.ll_ptr2;
-    q = root_rc;
-    last_r_chain = NULL;
-    while (q->variant == MULT_OP /* || q->variant == DIV_OP */ ) {
-      last_r_chain = q;
-      q = q->entry.Template.ll_ptr1;
-    }
-    tail_r_chain = q;
-    if (root_rc == tail_r_chain)
-      return;
-    last_r_chain->entry.Template.ll_ptr1 = *p;
-    (*p)->entry.Template.ll_ptr2 = tail_r_chain;
-    *p = root_rc;
-  }
-  if ((*p)->variant == DIV_OP) {
-    left_allign_term(&((*p)->entry.Template.ll_ptr1));
-    left_allign_term(&((*p)->entry.Template.ll_ptr2));
-  }
-  return;
-}
-
-
-void left_allign_exp(p)
-PTR_LLND *p;
-{
-  PTR_LLND root_rc, tail_r_chain, last_r_chain, q;
-
-  if (*p == NULL)
-    return;
-  if ((*p)->variant == ADD_OP || (*p)->variant == SUBT_OP) {
-    left_allign_exp(&((*p)->entry.Template.ll_ptr1));
-    left_allign_exp(&((*p)->entry.Template.ll_ptr2));
-
-    /* now link these together */
-
-    root_rc = (*p)->entry.Template.ll_ptr2;
-    if(root_rc == NULL) return;
-    if ((*p)->variant == SUBT_OP) {
-      for (q = root_rc; q != NULL &&
-	   (q->variant == ADD_OP || q->variant == SUBT_OP);
-	   q = q->entry.Template.ll_ptr1)
-	if (q->variant == SUBT_OP)
-	  q->variant = ADD_OP;
-	else if (q->variant == ADD_OP)
-	  q->variant = SUBT_OP;
-    }
-    q = root_rc;
-    last_r_chain = NULL;
-    while (q->variant == ADD_OP || q->variant == SUBT_OP) {
-      last_r_chain = q;
-      q = q->entry.Template.ll_ptr1;
-    }
-    tail_r_chain = q;
-    if (root_rc == tail_r_chain)
-      return;
-    last_r_chain->entry.Template.ll_ptr1 = *p;
-    (*p)->entry.Template.ll_ptr2 = tail_r_chain;
-    *p = root_rc;
-  }
-  else if ((*p)->variant == MULT_OP || (*p)->variant == DIV_OP) {
-    left_allign_term(p);
-  }
-  else {
-    left_allign_exp(&((*p)->entry.Template.ll_ptr1));
-    left_allign_exp(&((*p)->entry.Template.ll_ptr2));
-  }
-  return;
-}
-
-
-void clear_unary_minus(p)
-PTR_LLND p;
-{
-  PTR_LLND after_minus;
-
-  while (p != NULL &&
-	 p->variant != ADD_OP && p->variant != SUBT_OP)
-    p = p->entry.Template.ll_ptr1;
-  if (p == NULL)
-    return;
-  if (p->variant == ADD_OP || p->variant == SUBT_OP) {
-    if (p->entry.Template.ll_ptr2->variant == MINUS_OP) {
-      after_minus =
-	p->entry.Template.ll_ptr2->entry.Template.ll_ptr1;
-      p->entry.Template.ll_ptr2 = after_minus;
-      if (p->variant == ADD_OP)
-	p->variant = SUBT_OP;
-      else
-	p->variant = ADD_OP;
-    }
-    clear_unary_minus(p->entry.Template.ll_ptr1);
-  }
-}
-
-int get_term_coef(p)
-PTR_LLND p;
-{
-  int sign, lval;
-
-  sign = 1;
-  while (p != NULL && p->variant == MINUS_OP) {
-    p = p->entry.Template.ll_ptr1;
-    sign = -sign;
-  }
-  if (p == NULL)
-    return (sign);
-  if (p->variant == ADD_OP || p->variant == SUBT_OP)
-    /* should only happen with division as parent */
-    return (1);
-  if (p->variant == VAR_REF)
-    return (sign);
-  if (p->variant == INT_VAL)
-    return (sign * p->entry.ival);
-  if (p->variant == MULT_OP) {
-    lval = sign * get_term_coef(p->entry.Template.ll_ptr1);
-    if (p->entry.Template.ll_ptr2->variant == INT_VAL)
-      return (lval * p->entry.Template.ll_ptr2->entry.ival);
-    else
-      return (lval);
-  }
-  if (p->variant == DIV_OP) {
-    return (sign);
-  }
-  else {
-    fprintf(stderr, "bad coeficient extraction in get_term_coef\n");
-    return (1);
-  }
-}
-
-
-void replace_coef(p, v)
-PTR_LLND p;
-int v;
-{
-  PTR_LLND new_int, new_var, q;
-  if (p == NULL) {
-    fprintf(stderr, "replace_coef failed\n");
-    return;
-  }
-  if (p->variant == INT_VAL) {
-    p->entry.ival = v;
-    return;
-  }
-  if (p->variant == ADD_OP || p->variant == SUBT_OP) {
-    if (v == 1)
-      return;
-    replace_coef(p->entry.Template.ll_ptr1, v);
-    replace_coef(p->entry.Template.ll_ptr2, v);
-    return;
-  }
-  if (p->variant == VAR_REF) {
-    if (v == 1)
-      return;
-    p->variant = MULT_OP;
-    new_int = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-    new_int->entry.ival = v;
-    new_var = make_llnd(cur_file, VAR_REF,NULL,NULL,p->entry.Template.symbol);
-    p->entry.Template.ll_ptr1 = new_int;
-    p->entry.Template.ll_ptr2 = new_var;
-    p->entry.Template.symbol = NULL;
-    return;
-  }
-  else if (v == 1 && p->variant == MULT_OP &&
-	   rest_constant(p->entry.Template.ll_ptr1)) {
-    new_var = p->entry.Template.ll_ptr2;
-    p->variant = new_var->variant;
-    p->entry.Template.symbol = new_var->entry.Template.symbol;
-    p->entry.Template.ll_ptr1 = new_var->entry.Template.ll_ptr1;
-    p->entry.Template.ll_ptr2 = new_var->entry.Template.ll_ptr2;
-  }
-  else if (p->variant == MULT_OP &&
-	   p->entry.Template.ll_ptr1->variant == DIV_OP)
-    replace_coef(p->entry.Template.ll_ptr2, v);
-  else if (p->variant == DIV_OP) {
-    if (v == 1)
-      return;
-    q = make_llnd(cur_file, DIV_OP, p->entry.Template.ll_ptr1,
-		  p->entry.Template.ll_ptr2, NULL);
-    p->entry.Template.ll_ptr1 = q;
-    p->variant = MULT_OP;
-    new_int = make_llnd(cur_file, INT_VAL, NULL, NULL, NULL);
-    new_int->entry.ival = v;
-    p->entry.Template.ll_ptr2 = new_int;
-  }
-  else
-    replace_coef(p->entry.Template.ll_ptr1, v);
-}
-
-
-int identical(p, q)
-PTR_LLND p, q;
-{
-  if (q == NULL && p == NULL)
-    return (1);
-  if (q == NULL && p != NULL)
-    return (0);
-  if (q != NULL && p == NULL)
-    return (0);
-
-  /* now p and q not null */
-  if (p->variant != q->variant)
-    return (0);
-  switch (p->variant) {
-   case VAR_REF:
-    return (p->entry.Template.symbol == q->entry.Template.symbol);
-    
-   case ARRAY_REF:
-    if (p->entry.Template.symbol != q->entry.Template.symbol)
-      return (0);
-    else
-      return (identical(q->entry.Template.ll_ptr1,
-			p->entry.Template.ll_ptr1) *
-	      identical(q->entry.Template.ll_ptr2,
-			p->entry.Template.ll_ptr2));
-    
-   case INT_VAL:
-    return (p->entry.ival == q->entry.ival);
-    
-   default:
-    return (identical(q->entry.Template.ll_ptr1,
-		      p->entry.Template.ll_ptr1) *
-	    identical(q->entry.Template.ll_ptr2,
-		      p->entry.Template.ll_ptr2));
-    
-  }
-}
-
-
-int same_upto_coef(p, q)
-PTR_LLND p, q;
-{
-  PTR_LLND plc, prc, qlc, qrc;
-  if (p == NULL && q == NULL)
-    return (1);
-  if (p == NULL)
-    return (0);
-  if (q == NULL)
-    return (0);
-  if (p->variant == MINUS_OP)
-    p = p->entry.Template.ll_ptr1;
-  if (q->variant == MINUS_OP)
-    q = q->entry.Template.ll_ptr1;
-  if (rest_constant(p) && rest_constant(q))
-    return (1);
-  plc = p->entry.Template.ll_ptr1;
-  prc = p->entry.Template.ll_ptr2;
-  qlc = q->entry.Template.ll_ptr1;
-  qrc = q->entry.Template.ll_ptr2;
-  if (p->variant == VAR_REF) {
-    if (q->variant == VAR_REF) {
-      if (p->entry.Template.symbol == q->entry.Template.symbol)
-	return (1);
-      else
-	return (0);
-    }
-    else if (q->variant == MULT_OP || q->variant == DIV_OP) {
-      if (rest_constant(qlc) &&
-	  qrc->variant == VAR_REF &&
-	  qrc->entry.Template.symbol == p->entry.Template.symbol
-	)
-	return (1);
-      else
-	return (0);
-    }
-    else
-      return (0);
-  }
-  else if (q->variant == VAR_REF) {
-    if (p->variant == MULT_OP || p->variant == DIV_OP) {
-      if (rest_constant(plc) &&
-	  prc->variant == VAR_REF &&
-	  prc->entry.Template.symbol == q->entry.Template.symbol
-	)
-	return (1);
-      else
-	return (0);
-    }
-    else
-      return (0);
-  }
-  else if ((p->variant == ADD_OP && q->variant == ADD_OP) ||
-	   (p->variant == SUBT_OP && q->variant == SUBT_OP) ||
-	   (p->variant == DIV_OP && q->variant == DIV_OP))
-    return (identical(p, q));
-  else if (p->variant == MULT_OP && q->variant == DIV_OP) {
-    if ( (rest_constant(prc) && same_upto_coef(plc, q))
-            ||
-	     (rest_constant(plc) && same_upto_coef(prc, q)) )
-      return (1);
-    else
-      return (0);
-  }
-  else if (q->variant == MULT_OP && p->variant == DIV_OP) {
-    if ( (rest_constant(qrc) && same_upto_coef(qlc, p))
-           ||
-	     (rest_constant(qlc) && same_upto_coef(qrc, p)) )
-      return (1);
-    else
-      return (0);
-  }
-  else if (p->variant == q->variant) {
-    if (same_upto_coef(plc, qlc) && same_upto_coef(prc, qrc))
-      return (1);
-    else
-      return (0);
-  }
-  else
-    return (0);
-}
-
-
-void simplify(p)
-PTR_LLND *p;
-{
-  PTR_LLND q, left, lower, right, qlast, qnext;
-  PTR_LLND rec_nrm_frm();
-  int not_done, val, var, vl, vr, lvar;
-
-  /* clear_unary_minus(*p); */
-  not_done = 1;
-
-  if ((*p)->variant == MULT_OP || (*p)->variant == DIV_OP ||
-      (*p)->variant == ADD_OP || (*p)->variant == SUBT_OP) {
-    if((*p)->entry.Template.ll_ptr1 == NULL) return;
-    if ((*p)->entry.Template.ll_ptr1->variant != VAR_REF &&
-	(*p)->entry.Template.ll_ptr1->variant != INT_VAL)
-      (*p)->entry.Template.ll_ptr1 =
-	rec_nrm_frm((*p)->entry.Template.ll_ptr1);
-    if((*p)->entry.Template.ll_ptr2 == NULL) return;
-    if ((*p)->entry.Template.ll_ptr2->variant != VAR_REF &&
-	(*p)->entry.Template.ll_ptr2->variant != INT_VAL)
-      (*p)->entry.Template.ll_ptr2 =
-	rec_nrm_frm((*p)->entry.Template.ll_ptr2);
-  }
-
-  while (not_done) {
-    not_done = 0;
-    q = *p;
-    qlast = NULL;
-    while (q != NULL && q->variant != MULT_OP && q->variant != DIV_OP &&
-	   q->entry.Template.ll_ptr1 != NULL) {
-      var = q->variant;
-      if (var == ADD_OP || var == SUBT_OP) {
-	right = q->entry.Template.ll_ptr2;
-	left = q->entry.Template.ll_ptr1;
-	if (left->variant != ADD_OP && left->variant != SUBT_OP) {
-	  if (same_upto_coef(left, right)) {
-	    not_done = 1;
-	    vl = get_term_coef(left);
-	    vr = get_term_coef(right);
-	    if (var == ADD_OP)
-	      val = vl + vr;
-	    else
-	      val = vl - vr;
-	    if (val == 0) {
-	      if (qlast != NULL) {
-		qlast->entry.Template.ll_ptr1 =
-		  make_llnd(cur_file, INT_VAL, NULL, NULL, 0);
-	      }
-	      else
-		*p = make_llnd(cur_file, INT_VAL, NULL, NULL, 0);
-	    }
-	    else {
-	      if (val < 0) {
-		if (var == ADD_OP)
-		  q->variant = SUBT_OP;
-		else
-		  q->variant = ADD_OP;
-		val = -val;
-	      }
-	      replace_coef(right, val);
-	      q->variant = right->variant;
-	      if (right->variant != VAR_REF)
-		q->entry.Template.symbol = NULL;
-	      else
-		q->entry.Template.symbol =
-		  right->entry.Template.symbol;
-	      q->entry.Template.ll_ptr1
-		= right->entry.Template.ll_ptr1;
-	      q->entry.Template.ll_ptr2
-		= right->entry.Template.ll_ptr2;
-	    }
-	  }
-	}
-	else {
-	  lvar = left->variant;
-	  lower = left->entry.Template.ll_ptr2;
-	  if (same_upto_coef(lower, right)) {
-	    not_done = 1;
-	    vl = get_term_coef(lower);
-	    vr = get_term_coef(right);
-	    if (var == ADD_OP)
-	      val = vr;
-	    else
-	      val = -vr;
-	    if (lvar == ADD_OP)
-	      val = val + vl;
-	    else
-	      val = val - vl;
-	    if (val == 0) {
-	      if (qlast != NULL) {
-		qlast->entry.Template.ll_ptr1 =
-		  left->entry.Template.ll_ptr1;
-	      }
-	      else
-		*p = left->entry.Template.ll_ptr1;
-	    }
-	    else {
-	      q->variant = ADD_OP;
-	      if (val >= 0)
-		replace_coef(right, val);
-	      else {
-		replace_coef(right, -val);
-		q->variant = SUBT_OP;
-	      }
-	      q->entry.Template.ll_ptr1 =
-		left->entry.Template.ll_ptr1;
-	    }
-	  }
-	}
-      }
-      qlast = q;
-      q = q->entry.Template.ll_ptr1;
-    }
-  }				/* end of outer while */
-  /* now eliminate left over 0 terms. */
-  q = *p;
-  qlast = NULL;
-  qnext = NULL;
-  while (q != NULL && ((qnext = q->entry.Template.ll_ptr1) != NULL)
-	 && (q->variant == ADD_OP || q->variant == SUBT_OP)
-	 && (qnext->variant == ADD_OP || qnext->variant == SUBT_OP)) {
-    qlast = q;
-    q = q->entry.Template.ll_ptr1;
-  }
-  if (qnext == NULL)
-    return;
-  if (qnext->variant == INT_VAL && qnext->entry.ival == 0) {
-    if (q->variant == ADD_OP) {
-      if (qlast != NULL) {
-	qlast->entry.Template.ll_ptr1 =
-	  q->entry.Template.ll_ptr2;
-	/* dispose of q and qnext */
-      }
-      else {
-	*p = q->entry.Template.ll_ptr2;
-	/* dispose of q and qnext */
-      }
-    }
-    else if (q->variant == SUBT_OP) {
-      q->variant = MINUS_OP;
-      q->entry.Template.ll_ptr1 =
-	q->entry.Template.ll_ptr2;
-      q->entry.Template.ll_ptr2 = NULL;
-      /* dispose of qnext */
-    }
-  }
-
-}
-
-
-PTR_LLND
-rec_nrm_frm(cp)
-PTR_LLND cp;
-{
-  expand(cp);
-  left_allign_exp(&cp);
-  sort_exp(cp);
-  simplify(&cp);
-  return (cp);
-}
-
-
-void elim_stupid_expr_list(p)
-PTR_LLND *p;
-{
-  if (*p == NULL)
-    return;
-  if ((*p)->variant == INT_VAL || (*p)->variant == VAR_REF)
-    return;
-  if ((*p)->variant == EXPR_LIST) {
-    if ((*p)->entry.Template.ll_ptr2 == NULL)
-      p = &((*p)->entry.Template.ll_ptr1);
-    else
-      return;
-  }
-  elim_stupid_expr_list(&((*p)->entry.Template.ll_ptr1));
-  elim_stupid_expr_list(&((*p)->entry.Template.ll_ptr2));
-}
-
-PTR_LLND norm_frm_exp(p)
-PTR_LLND p;
-{
-  PTR_LLND cp;
-
-  cp = copy_llnd(p);
-  elim_stupid_expr_list(&cp);
-  return (rec_nrm_frm(cp));
-}
-
-
-void normal_form(p)
-PTR_LLND *p;
-{
-  if (p == NULL)
-    return;
-  if (*p == NULL)
-    return;
-  switch ((*p)->variant) {
-   case STAR_RANGE:
-    break;
-   case ARRAY_REF:
-    normal_form(&((*p)->entry.Template.ll_ptr1));
-    break;
-   case RANGE_LIST:
-   case EXPR_LIST:
-    normal_form(&((*p)->entry.Template.ll_ptr1));
-    normal_form(&((*p)->entry.Template.ll_ptr2));
-    break;
-   case DDOT:
-    normal_form(&((*p)->entry.Template.ll_ptr1));
-    normal_form(&((*p)->entry.Template.ll_ptr2));
-    break;
-   case ADD_OP:
-   case SUBT_OP:
-   case MULT_OP:
-   case DIV_OP:
-   case MINUS_OP:
-   case VAR_REF:
-   case INT_VAL:
-    *p = norm_frm_exp(*p);
-    break;
-   default:
-    fprintf(stderr, "bad case in normal_form %d\n", (*p)->variant);
-    break;
-  }
-}
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/writenodes.c b/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
deleted file mode 100644
index e50edff..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/lib/oldsrc/writenodes.c
+++ /dev/null
@@ -1,1018 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/*------------------------------------------------------*
- *							*
- *	      Routines to write BIF graph out		*
- *							*
- *------------------------------------------------------*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
- 
-#ifdef __SPF
-extern void addToCollection(const int line, const char *file, void *pointer, int type);
-extern void removeFromCollection(void *pointer);
-#endif
-
-/*typedef unsigned int u_short;*/
-#include "db.h"
-#include "dep_str.h"
-/*extern char* strncpy(); */
- 
-#define FOLLOW_BIF_POINTER_TO_ID(VAR) \
-	(bf_ptr->entry.Template.VAR? bf_ptr-> entry.Template.VAR->id: 0)
-
-#define FOLLOW_LL_POINTER_TO_ID(VAR) \
-	(ll_ptr-> entry.Template.VAR? ll_ptr-> entry.Template.VAR->id: 0)
-
-#define FOLLOW_SYMB_POINTER_1_TO_ID(VAR) \
-	(sy_ptr->VAR? sy_ptr->VAR->id: 0)
-
-#define FOLLOW_SYMB_POINTER_2_TO_ID(VAR) \
-	(sy_ptr->entry.VAR? sy_ptr->entry.VAR->id: 0)
-
-#define FOLLOW_TYPE_POINTER_TO_ID(VAR) \
-	(ty_ptr->entry.VAR? ty_ptr->entry.VAR->id: 0)
-
-#define FOLLOW_DEP_TO_ID(VAR) \
-	(dep->VAR? dep->VAR->id: 0)
-
-/*
- * External variables/functions referenced
- */
-
-static PTR_BFND head_bfnd, cur_bfnd;
-static PTR_LLND head_llnd, cur_llnd;
-static PTR_SYMB head_symb, cur_symb;
-static PTR_TYPE head_type, cur_type;
-static PTR_DEP head_dep, cur_dep;
-static PTR_LABEL head_label, cur_label;
-static PTR_CMNT head_cmnt, cur_cmnt;
-static PTR_FNAME head_file;
-static PTR_BFND global_bfnd;
-
-static int num_blobs;
-static int num_bfnds;
-static int num_llnds;
-static int num_symbs;
-static int num_types;
-static int num_label;
-static int num_cmnt;
-static int num_files;
-static int num_dep;
-
-extern int language;
-extern int debug;
-
-/*
- * Local variables
- */
-static struct preamble	head;
-static struct bf_nd	bf;
-static struct ll_nd	ll;
-static struct sym_nd	sym;
-static struct typ_nd	typ;
-static struct lab_nd	lab;
-static struct fil_nd	fil;
-static struct cmt_nd	cmt;
-static struct dep_nd	dpd;
-static struct locs	loc;
-
-static FILE  *fd;		/* file pointer of the dep file */
-static char **strtbl,		/* start of string table */
-	    **endtbl,		/* end of string table */
-	    **cp;		/* current pointer */
-static int nstr = 0;		/* no of string stored so far */
-static int tblsz = 2000;	/* initial string table size */
-
-static u_shrt tmp[100000];	/* some work space */
-
-/*------------------------------------------------------*
- *			store_str			*
- *							*
- *	 put the given string into string table		*
- *------------------------------------------------------*/
-static u_shrt
-store_str(str)
-	char *str;
-{
-    if (nstr >= tblsz) {
-        tblsz += 1000;
-#ifdef __SPF
-        removeFromCollection(strtbl);        
-#endif
-        if (!(strtbl = (char **)realloc(strtbl, tblsz * sizeof(char **))))
-        {
-            fprintf(stderr, "store_str: No more space\n");
-            exit(1);
-        }
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,strtbl, 0);
-#endif
-        endtbl = strtbl + tblsz;
-        cp = strtbl + nstr;
-    }
-	*cp++ = str;
-	return (u_shrt)nstr++;
-}
-
-
-/*------------------------------------------------------*
- *		find_global_bif_node			*
- *							*
- *    Find the global bif node (there is only one)	*
- *------------------------------------------------------*/
-PTR_BFND 
-find_global_bif_node()
-{
-	register PTR_BFND bf_node;
-
-	bf_node = head_bfnd;
-	while (bf_node->variant != GLOBAL)
-		bf_node = bf_node->thread;
-
-	return (bf_node);
-}
-
-
-/*------------------------------------------------------*
- *		    write_preamble			*
- *							*
- *	    Write the preamble of the dep file		*
- *------------------------------------------------------*/
-static int
-write_preamble()
-{
-  u_shrt magic_no = D_MAGIC;
-  char filemagic[10];
-
-  strncpy(filemagic,"sage.dep",8);
-  /* The first 8 bytes is the file magic (see /etc/magic) PHB */
-  if ((int)fwrite(filemagic, sizeof(char), 8, fd) < 0)
-    return -1;
-
-	if ((int)fwrite( (char *) &magic_no, sizeof(u_shrt), 1, fd) < 0)
-		return -1;
-
-	if ((int)fwrite( (char *) &loc, sizeof(struct locs), 1, fd) < 0)
-		return -1;
-
-        head.ptrsize    = (u_shrt) ( sizeof(void *) * 8 );
-	head.language	= (u_shrt) language;
-	head.num_blobs	= (u_shrt) num_blobs;
-	head.num_bfnds	= (u_shrt) num_bfnds;
-	head.num_llnds	= (u_shrt) num_llnds;
-	head.num_symbs	= (u_shrt) num_symbs;
-	head.num_types	= (u_shrt) num_types;
-	head.num_label	= (u_shrt) num_label;
-	head.global_bfnd= (u_shrt) global_bfnd->id;
-	head.num_dep	= (u_shrt) num_dep;
-	head.num_cmnts	= (u_shrt) num_cmnt;
-	head.num_files	= (u_shrt) num_files;
-
-	return (int)fwrite( (char *) &head, sizeof(struct preamble), 1, fd);
-}
-
-
-/*------------------------------------------------------*
- *		   write_blob_list			*
- *							*
- *	dump the blob list with the given head		*
- *------------------------------------------------------*/
-static int 
-write_blob_list(head)
-	PTR_BLOB head;
-{
-	register PTR_BLOB bl_ptr;
-	u_shrt *p;
-	int n;
-
-	for (bl_ptr = head, p = tmp+1; bl_ptr; bl_ptr = bl_ptr->next)
-             if( bl_ptr->ref)
-		*p++ = (u_shrt) bl_ptr->ref->id;
-
-	n = p - tmp;	/* calculate the no of blob nodes in the list */
-	tmp[0] = (u_shrt) n - 1;
-	return (int)fwrite( (char *) tmp, sizeof(u_shrt), n, fd);
-}
-
-
-/*------------------------------------------------------*
- *		    write_bif_node			*
- *							*
- *	    routines to write out one bif node		*
- *------------------------------------------------------*/
-static int 
-write_bif_node(bf_ptr)
-	PTR_BFND bf_ptr;
-{
-	bf.id	   = (u_shrt) bf_ptr->id;
-	bf.variant = (u_shrt) bf_ptr->variant;
-	bf.cp	   = (u_shrt) (bf_ptr->control_parent? bf_ptr->control_parent->id :0);
-	bf.bf_ptr1 = (u_shrt) FOLLOW_BIF_POINTER_TO_ID(bf_ptr1);
-	bf.cmnt_ptr= (u_shrt) FOLLOW_BIF_POINTER_TO_ID(cmnt_ptr);
-	bf.symbol  = (u_shrt) FOLLOW_BIF_POINTER_TO_ID(symbol);
-	bf.ll_ptr1 = (u_shrt) FOLLOW_BIF_POINTER_TO_ID(ll_ptr1);
-	bf.ll_ptr2 = (u_shrt) FOLLOW_BIF_POINTER_TO_ID(ll_ptr2);
-	bf.ll_ptr3 = (u_shrt) FOLLOW_BIF_POINTER_TO_ID(ll_ptr3);
-	bf.dep_ptr1= (u_shrt) FOLLOW_BIF_POINTER_TO_ID(dep_ptr1);
-	bf.dep_ptr2= (u_shrt) FOLLOW_BIF_POINTER_TO_ID(dep_ptr2);
-	bf.label   = (u_shrt) (bf_ptr->label? bf_ptr->label->id: 0);
-	bf.lbl_ptr = (u_shrt) FOLLOW_BIF_POINTER_TO_ID(lbl_ptr);
-	bf.g_line  = (u_shrt) bf_ptr->g_line;
-	bf.l_line  = (u_shrt) bf_ptr->l_line;
-        bf.decl_specs = (u_shrt) bf_ptr->decl_specs;
-	bf.filename= (u_shrt) (bf_ptr->filename? bf_ptr->filename->id: 0);
-
-	if ((int)fwrite( (char *) &bf, sizeof(struct bf_nd), 1, fd) < 0)
-		return -1;
-	if (write_blob_list(bf_ptr->entry.Template.bl_ptr1) < 0)
-		return -1;
-	return write_blob_list(bf_ptr->entry.Template.bl_ptr2);
-}
-
-
-/*------------------------------------------------------*
- *		  write_bif_nodes			*
- *							*
- *	     routines to print bif nodes		*
- *------------------------------------------------------*/
-static int 
-write_bif_nodes()
-{
-	register PTR_BFND bf_ptr;
-
-	for (bf_ptr = head_bfnd; bf_ptr; bf_ptr = bf_ptr->thread)
-		if (write_bif_node(bf_ptr) < 0) {
-			perror("write_bif_nodes:");
-			return -1;
-		}
-	return 0;
-}
-
-
-/*------------------------------------------------------*
- *		     write_ll_node			*
- *							*
- *	       print out one low level node		*
- *------------------------------------------------------*/
-static int 
-write_ll_node(ll_ptr)
-	PTR_LLND ll_ptr;
-{
-	int n = 0;
-
-	ll.id	   = (u_shrt) ll_ptr->id;
-	ll.variant = (u_shrt) ll_ptr->variant;
-	ll.type	   = (u_shrt) (ll_ptr->type ? ll_ptr->type->id : 0);
-	if ((int)fwrite( (char *) &ll, sizeof(struct ll_nd), 1, fd) < 0)
-		return -1;
-
-	switch (ll_ptr->variant) {
-	    case INT_VAL:
-		return (int)fwrite( (char *) &ll_ptr->entry.ival, sizeof(int), 1, fd);
-	    case BOOL_VAL:
-		tmp[0] = (u_shrt) ll_ptr->entry.bval;
-		n = 1;
-		break;
-	    case CHAR_VAL:
-		tmp[0] = (u_shrt) ll_ptr->entry.cval;
-		n = 1;
-		break;
-	    case DOUBLE_VAL:
-	    case FLOAT_VAL:
-	    case STMT_STR:
-	    case STRING_VAL:
-	    case KEYWORD_VAL:
-		tmp[0] = store_str(ll_ptr->entry.string_val);
-		n = 1;
-		break;
-	    case RANGE_OP:
-	    case UPPER_OP:
-	    case LOWER_OP:
-		tmp[0] = (u_shrt) (ll_ptr->entry.array_op.symbol ?
-				    ll_ptr->entry.array_op.symbol->id :
-				    0);
-		tmp[1] = (u_shrt) ll_ptr->entry.array_op.dim;
-		n = 2;
-		break;
-	    case LABEL_REF:
-		tmp[0] = (u_shrt) ll_ptr->entry.label_list.lab_ptr->id;
-		n = 1;
-		break;
-/*	    case ARITH_ASSGN_OP: */	/* New added for VPC++ */
-/* The next line is a _REAL_ hack, I added the cast (PHB) */
-/*		tmp[0] = (u_shrt) ((int) ll_ptr->entry.Template.symbol);
-		tmp[1] = (u_shrt) FOLLOW_LL_POINTER_TO_ID(ll_ptr1);
-		tmp[2] = (u_shrt) FOLLOW_LL_POINTER_TO_ID(ll_ptr2);
-		n = 3;
-		break;
-*/		
-	   default:
-		tmp[0] = (u_shrt) FOLLOW_LL_POINTER_TO_ID(symbol);
-		tmp[1] = (u_shrt) FOLLOW_LL_POINTER_TO_ID(ll_ptr1);
-		tmp[2] = (u_shrt) FOLLOW_LL_POINTER_TO_ID(ll_ptr2);
-		n = 3;
-		break;
-	}
-	return (n? (int)fwrite( (char *) tmp, sizeof(u_shrt), n, fd): 0);
-}
-
-
-/*------------------------------------------------------*
- *		  write_ll_nodes			*
- *							*
- *		dump low level nodes			*
- *------------------------------------------------------*/
-static int 
-write_ll_nodes()
-{
-	register PTR_LLND ll_ptr;
-
-	for (ll_ptr = head_llnd; ll_ptr; ll_ptr = ll_ptr->thread)
-		if (write_ll_node(ll_ptr) < 0) {
-			perror("write_ll_nodes:");
-			return -1;
-		}
-	return 0;
-}
-
-
-/*------------------------------------------------------*
- *		    write_symb_node			*
- *							*
- *		print out one symbol node		*
- *------------------------------------------------------*/
-static int 
-write_symb_node(sy_ptr)
-	PTR_SYMB sy_ptr;
-{
-	int n = 0;
-
-	sym.id	    = (u_shrt) sy_ptr->id;
-	sym.variant = (u_shrt) sy_ptr->variant;
-	sym.type    = (u_shrt) FOLLOW_SYMB_POINTER_1_TO_ID(type);
-	sym.attr    = (u_shrt) sy_ptr->attr;
-	sym.next    = (u_shrt) FOLLOW_SYMB_POINTER_1_TO_ID(next_symb);
-	sym.scope   = (u_shrt) (sy_ptr->scope? sy_ptr->scope->id: 0);
-	sym.ident   = store_str(sy_ptr->ident);
-
-	if ((int)fwrite( (char *) &sym, sizeof(struct sym_nd), 1, fd) < 0)
-		return -1;
-
-	switch (sy_ptr->variant) {
-	    case CONST_NAME:
-		tmp[0] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(const_value);
-                tmp[1] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(Template.base_name);
-		n = 2;
-		break;
-	    case ENUM_NAME:
-	    case FIELD_NAME:
-		tmp[0] = (u_shrt)sy_ptr->entry.field.tag;
-		tmp[1] = (u_shrt)FOLLOW_SYMB_POINTER_2_TO_ID(field.next);
-		tmp[2] = (u_shrt)FOLLOW_SYMB_POINTER_2_TO_ID(field.base_name);
-		tmp[3] = (u_shrt)FOLLOW_SYMB_POINTER_2_TO_ID(field.declared_name); /* VPC++ */
-		tmp[4] = (u_shrt)FOLLOW_SYMB_POINTER_2_TO_ID(field.restricted_bit); /* VPC++ */
-		n = 5;
-		break;
-	    case VARIABLE_NAME:
-		tmp[0] = (u_shrt)sy_ptr->entry.var_decl.local;
-		tmp[1] = (u_shrt)FOLLOW_SYMB_POINTER_2_TO_ID(var_decl.next_in);
-		tmp[2] = (u_shrt)FOLLOW_SYMB_POINTER_2_TO_ID(var_decl.next_out);
-		n = 3;
-                tmp[n] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(Template.base_name);
-                n++;
-		break;
-	    case PROGRAM_NAME:
-		tmp[0] = (u_shrt)FOLLOW_SYMB_POINTER_2_TO_ID(prog_decl.symb_list);
-		tmp[1] = (u_shrt)FOLLOW_SYMB_POINTER_2_TO_ID(prog_decl.prog_hedr);
-		n = 2;
-                tmp[n] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(Template.base_name);
-                n++;
-		break;
-	    case PROCEDURE_NAME:
-            case PROCESS_NAME:
-	    case FUNCTION_NAME:
-	    case INTERFACE_NAME:
-		tmp[0] = (u_shrt) sy_ptr->entry.proc_decl.num_input;
-		tmp[1] = (u_shrt) sy_ptr->entry.proc_decl.num_output;
-		tmp[2] = (u_shrt) sy_ptr->entry.proc_decl.num_io;
-		tmp[3] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(proc_decl.in_list);
-		tmp[4] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(proc_decl.out_list);
-		tmp[5] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(proc_decl.symb_list);
-		tmp[6] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(proc_decl.proc_hedr);
-                tmp[7] = (u_shrt) sy_ptr->entry.func_decl.local_size;
-		n = 8;
-                tmp[n] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(Template.base_name);
-                n++;
-		break;
-            case MODULE_NAME:
-		tmp[0] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(Template.symb_list);
-		tmp[1] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(Template.func_hedr);
-                tmp[2] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(Template.base_name);
-                n = 3;
-                break;
-	    case MEMBER_FUNC:	 /*  NEW ADDED FOR VPC */
-		tmp[0] = (u_shrt) sy_ptr->entry.member_func.num_input;
-		tmp[1] = (u_shrt) sy_ptr->entry.member_func.num_output;
-		tmp[2] = (u_shrt) sy_ptr->entry.member_func.num_io;
-		tmp[3] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(member_func.in_list);
-		tmp[4] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(member_func.out_list);
-		tmp[5] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(member_func.symb_list);
-		tmp[6] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(member_func.func_hedr);
-		tmp[7] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(member_func.next);
-		tmp[8] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(member_func.base_name);
-		tmp[9] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(member_func.declared_name);
-                tmp[10] = (u_shrt) sy_ptr->entry.member_func.local_size;
-		n = 11;
-		break;
-	    default:
-                tmp[n] = (u_shrt) FOLLOW_SYMB_POINTER_2_TO_ID(Template.base_name);
-                n++;
-		break;
-	}
-       
-	return (n? (int)fwrite( (char *) tmp, sizeof(u_shrt), n, fd): 0);
-}
-
-
-/*------------------------------------------------------*
- *		write_symb_nodes			*
- *							*
- *		dump symbol table			*
- *------------------------------------------------------*/
-static int 
-write_symb_nodes()
-{
-	register PTR_SYMB sy_ptr;
-
-	for (sy_ptr = head_symb; sy_ptr; sy_ptr = sy_ptr->thread)
-		if (write_symb_node(sy_ptr) < 0) {
-			perror("write_symb_nodes:");
-			return -1;
-		}
-	return 0;
-}
-
-
-/*------------------------------------------------------*
- *		  write_type_node			*
- *							*
- *	      print out one type node			*
- *------------------------------------------------------*/
-static int 
-write_type_node(ty_ptr)
-	PTR_TYPE ty_ptr;
-{       
-	int	n = 0;
-        int uss1;
-	typ.id	    = (u_shrt) ty_ptr->id;
-	typ.variant = (u_shrt) ty_ptr->variant;
-	typ.name    = (u_shrt) (ty_ptr->name ? ty_ptr->name->id : 0);
-
-	if ((int)fwrite( (char *) &typ, sizeof(struct typ_nd), 1, fd) < 0)
-		return -1;
-
-	switch (ty_ptr->variant) {
-	    case T_INT:
-	    case T_FLOAT:
-	    case T_DOUBLE:
-	    case T_CHAR:
-	    case T_BOOL:
-	    case T_COMPLEX:
-	    case T_DCOMPLEX:
-		tmp[0] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(Template.ranges);
-	        tmp[1] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(Template.kind_len);
-                n = 2;
-		break;
-	    case T_STRING:
-		tmp[0] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(Template.ranges);
-	        tmp[1] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(Template.kind_len);
-		tmp[2] = (u_shrt) ty_ptr->entry.Template.dummy1;
-                n = 3;
-		break;                
-	    case T_SUBRANGE:
-		tmp[0] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(subrange.base_type);
-		tmp[1] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(subrange.lower);
-		tmp[2] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(subrange.upper);
-		n = 3;
-		break;
-	    case T_ARRAY:
-		tmp[0] = (u_shrt) ty_ptr->entry.ar_decl.num_dimensions;
-		tmp[1] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(ar_decl.base_type);
-		tmp[2] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(ar_decl.ranges);		
-		n = 3;
-		break;
-	    case T_LIST:
-		tmp[0] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(base_type);
-		n = 1;
-		break;
-	    case T_RECORD:
-		tmp[0] = (u_shrt) ty_ptr->entry.re_decl.num_fields;
-		tmp[1] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(re_decl.first);
-		n = 2;
-		break;
-	    case T_DESCRIPT:   /*  NEW ADDED FOR VPC */
-		tmp[0] = (u_shrt) ty_ptr->entry.descriptive.signed_flag ;
-                uss1 = ty_ptr->entry.descriptive.long_short_flag;
-                tmp[2] = (u_shrt) uss1;
-                tmp[1] = (u_shrt) (uss1 >> 16);
-		tmp[3] = (u_shrt) ty_ptr->entry.descriptive.mod_flag ;
-		tmp[4] = (u_shrt) ty_ptr->entry.descriptive.storage_flag ;
-		tmp[5] = (u_shrt) ty_ptr->entry.descriptive.access_flag ;
-		tmp[6] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(descriptive.base_type);
-		n = 7;
-		break;
-	    case T_POINTER:	/*  NEW ADDED FOR VPC */
-	    case T_REFERENCE:	/*  NEW ADDED FOR VPC */
-		tmp[0] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(Template.base_type);
-		tmp[1] = (u_shrt) ty_ptr->entry.Template.dummy1 ; /* indirect level */
-		uss1   = ty_ptr->entry.Template.dummy5 ; /* for const etc.  */
-                tmp[3] = (u_shrt) uss1;
-                tmp[2] = (u_shrt) (uss1 >> 16);
-		n = 4;
-		break;
-		
-	    case T_FUNCTION:   /*  NEW ADDED FOR VPC */
-		tmp[0] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(Template.base_type);
-		n = 1;
-		break;
-
-	    case T_DERIVED_TYPE :   /*	NEW ADDED FOR VPC */
-		tmp[0] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(derived_type.symbol);
-		tmp[1] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(derived_type.scope_symbol);
-		n = 2;
-		break;
-	    case T_MEMBER_POINTER:
-	    case T_DERIVED_COLLECTION :	  /*  NEW ADDED FOR PC++ */
-		tmp[0] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(col_decl.collection_name);
-		tmp[1] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(col_decl.base_type);
-		n = 2;
-		break;
-	    case T_DERIVED_TEMPLATE :	  /*  NEW ADDED FOR PC++ */
-		tmp[0] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(templ_decl.templ_name);
-		tmp[1] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(templ_decl.args);
-		n = 2;
-		break;
-	    case T_ENUM:
-	    case T_UNION:   /*	NEW ADDED FOR VPC */
-	    case T_STRUCT:  /*	NEW ADDED FOR VPC */
-	    case T_CLASS :  /*	NEW ADDED FOR VPC */
-	    case T_DERIVED_CLASS :   /*	 NEW ADDED FOR VPC */
-	    case T_COLLECTION:	     /*	 NEW ADDED FOR PC++ */
-		tmp[0] = (u_shrt) ty_ptr->entry.derived_class.num_fields;
-		tmp[1] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(derived_class.first);
-		tmp[2] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(derived_class.original_class);
-		tmp[3] = (u_shrt) FOLLOW_TYPE_POINTER_TO_ID(derived_class.base_type);
-		n = 4;
-		break;
-		
-	    default:
-		break;
-	}
-	return (n? (int)fwrite( (char *) tmp, sizeof(u_shrt), n, fd): 0);
-}
-
-
-/*------------------------------------------------------*
- *		    write_type_nodes			*
- *------------------------------------------------------*/
-static int 
-write_type_nodes()
-{
-	register PTR_TYPE ty_ptr;
-
-	for (ty_ptr = head_type; ty_ptr; ty_ptr = ty_ptr->thread)
-		if (write_type_node(ty_ptr) < 0) {
-			perror("write_type_nodes:");
-			return -1;
-		}
-	return 0;
-}
-
-
-/*------------------------------------------------------*
- *		    write_label_node			*
- *------------------------------------------------------*/
-static int 
-write_label_node(lb_ptr)
-	register PTR_LABEL lb_ptr;
-{
-	lab.id	    = (u_shrt) lb_ptr->id;
-	lab.labtype = (u_shrt) lb_ptr->labtype;
-	lab.body    = (u_shrt) (lb_ptr->statbody ? lb_ptr->statbody->id : 0);
-	lab.name    = (u_shrt) (lb_ptr->label_name ? lb_ptr->label_name->id: 0);
-	lab.stat_no = lb_ptr->stateno;
-	return (int)fwrite( (char *) &lab, sizeof(struct lab_nd), 1, fd);
-}
-
-
-/*------------------------------------------------------*
- *		    write_label_nodes			*
- *------------------------------------------------------*/
-static int 
-write_label_nodes()
-{
-	register PTR_LABEL lb_ptr;
-
-	for (lb_ptr = head_label; lb_ptr; lb_ptr = lb_ptr->next)
-		if (write_label_node(lb_ptr) < 0) {
-			perror("write_label_nodes:");
-			return -1;
-		}
-	return 0;
-}
-
-
-/*------------------------------------------------------*
- *		  write_filename_nodes			*
- *------------------------------------------------------*/
-static int 
-write_filename_nodes()
-{
-	register PTR_FNAME filep;
-
-	for (filep = head_file; filep; filep = filep->next) {
-		fil.id	 = (u_shrt) filep->id;
-		fil.name = store_str(filep->name);
-		if ((int)fwrite( (char *) &fil, sizeof(struct fil_nd), 1, fd) < 0) {
-			perror("write_filename_nodes:");
-			return -1;
-		}
-	}
-	return 0;
-}
-
-
-/*------------------------------------------------------*
- *		  write_comment_node			*
- *							*
- *	      print out one comment node		*
- *------------------------------------------------------*/
-static int 
-write_comment_node(cm_ptr)
-	PTR_CMNT cm_ptr;
-{
-	cmt.id	 = (u_shrt) cm_ptr->id;
-	cmt.type = (u_shrt) cm_ptr->type;
-	cmt.next = (u_shrt) (cm_ptr->next ? cm_ptr->next->id : 0);
-	cmt.str	 = store_str(cm_ptr->string);
-	return (int)fwrite( (char *) &cmt, sizeof(struct cmt_nd), 1, fd);
-}
-
-
-/*------------------------------------------------------*
- *		    write_comment_nodes			*
- *------------------------------------------------------*/
-static int
-write_comment_nodes()
-{
-	register PTR_CMNT cm_ptr;
-
-	for (cm_ptr = head_cmnt; cm_ptr; cm_ptr = cm_ptr->thread)
-		if (write_comment_node(cm_ptr) < 0) {
-			perror("write_comment_nodes:");
-			return -1;
-		}
-	return 0;
-}
-
-
-/*------------------------------------------------------*
- *		   write_dep_node			*
- *							*
- *	    print out one dependence node		*
- *------------------------------------------------------*/
-static int 
-write_dep_node(dep)
-	PTR_DEP dep;
-{
-	register int j;
-
-	dpd.id		= (u_shrt) dep->id;
-	dpd.type	= (u_shrt) dep->type;
-	dpd.sym		= (u_shrt) FOLLOW_DEP_TO_ID(symbol);
-	dpd.from_stmt	= (u_shrt) FOLLOW_DEP_TO_ID(from.stmt);
-	dpd.from_ref	= (u_shrt) FOLLOW_DEP_TO_ID(from.refer);
-	dpd.to_stmt	= (u_shrt) FOLLOW_DEP_TO_ID(to.stmt);
-	dpd.to_ref	= (u_shrt) FOLLOW_DEP_TO_ID(to.refer);
-	dpd.from_hook	= (u_shrt) 0; /* FOLLOW_DEP_TO_ID(from_hook); */
-	dpd.to_hook	= (u_shrt) 0; /* FOLLOW_DEP_TO_ID(to_hook);   */
-	dpd.from_fwd	= (u_shrt) FOLLOW_DEP_TO_ID(from_fwd);
-	dpd.from_back	= (u_shrt) FOLLOW_DEP_TO_ID(from_back);
-	dpd.to_fwd	= (u_shrt) FOLLOW_DEP_TO_ID(to_fwd);
-	dpd.to_back	= (u_shrt) FOLLOW_DEP_TO_ID(to_back);
-
-	for (j = 0; j < MAX_DEP; j++)
-		dpd.dire[j] = (u_shrt) dep->direct[j];
-
-	return (int)fwrite( (char *) &dpd, sizeof(struct dep_nd), 1, fd);
-}
-
-
-
-/*------------------------------------------------------*
- *		    write_dep_nodes			*
- *------------------------------------------------------*/
-static int 
-write_dep_nodes()
-{
-	register PTR_DEP dep;
-
-	if (!num_dep)
-		return 0;
-	for (dep = head_dep; dep && dep->id != -1; dep = dep->thread)
-		if (write_dep_node(dep) < 0) {
-			perror("write_dep_nodes:");
-			return -1;
-		}
-	return 0;
-}
-
-
-/*------------------------------------------------------*
- *		write_string				*
- *------------------------------------------------------*/
-static int
-write_string(str)
-	char *str;
-{
-	int l1;
-
-        if(!str) l1 = 0;
-	else l1 = strlen(str);
-	tmp[0] = (u_shrt) l1;
-	if ((int)fwrite( (char *) tmp, sizeof(u_shrt), 1, fd) >= 0)
-		if ((int)fwrite( (char *) str, sizeof(char), l1, fd) >= 0)
-			return 0;
-	return -1;
-}
-
-
-/*------------------------------------------------------*
- *		write_str_tbl				*
- *------------------------------------------------------*/
-static int
-write_str_tbl(str, n)
-	char **str;
-	int    n;
-{
-	register char **p = str;
-	register int i;
-	u_shrt u;
-
-	u = (u_shrt) n;
-	if ((int)fwrite( (char *) &u, sizeof(u_shrt), 1, fd) < 0) /* output no of strings */
-		return -1;
-	for (i = 0; i < n; i++)
-		if (write_string(*p++) < 0) {
-			perror("write_str_tbl:");
-			return -1;
-		}
-	return 0;
-}
-
-
-/****************************************************************
- *								*
- *  fix_next_symb -- Try to fix the "next_symb" field in the	*
- *		     symbol table field so that they point to	*
- *		     the next symbol declared in the same scope	*
- ****************************************************************/
-static void
-  fix_next_symb()
-{
-  register int no = 0, i, max=0;
-  register PTR_SYMB s;
-  int *id;		/* table to store ids of difference scope */
-  PTR_SYMB *pt;         /* point to the last symbol in that scope */
-  
-  /* This is a hack to find out how much memory we need to malloc (PHB) */
-  for (s = head_symb; s; s = s->thread) max++;
-
-  /* malloc the memory (PHB) */
-  id = (int *)      malloc(sizeof(     int) * (max+100));
-  pt = (PTR_SYMB *) malloc(sizeof(PTR_SYMB) * (max+100));
-  if ((pt == 0) || (id == 0))
-     { fprintf(stderr,"Out of memory in fix_next_symb\n"); exit(1); }
-
-  for (s = head_symb; s; s = s->thread) {
-    for (i = no - 1 ; i >= 0; --i)
-      if ((s->scope != NULL) && (id[i] == s->scope->id)) 
-        /* found one on the table */
-	break;
-    if (i >= 0) {	/* if already in table */
-      if (i > max) 
-	{ fprintf(stderr,"index out of range in fix_next_symb\n"); exit(1);}
-      pt[i]->next_symb = s; /* add to the end in this scope */
-      pt[i] = s; /* this one becomes the tail */
-    } else
-      if (s->scope) {	/* A new one -- add to the table */
-	if (no > max) 
-	  { fprintf(stderr,"index out of range in fix_next_symb\n"); exit(1);}
-	id[no]	 = s->scope->id; /* id of new scope */
-	pt[no++] = s; /* tail pointer */
-      }
-  }
-  free(id);
-  free(pt);
-}
-
-
-/*------------------------------------------------------*
- *							*
- *	     driver routines to print nodes		*
- *							*
- *------------------------------------------------------*/
-int
-write_nodes(fi, name)
-	PTR_FILE  fi;
-	char	 *name;
-{
-	if ((fd = fopen (name, "wb")) == NULL) {
-		fprintf(stderr, "Could not open %s for write\n", name);
-		return (-1);
-	}
-
-	head_bfnd = fi->head_bfnd;
-	cur_bfnd = fi->cur_bfnd;
-	head_llnd = fi->head_llnd;
-	cur_llnd = fi->cur_llnd;
-	head_symb = fi->head_symb;
-	cur_symb = fi->cur_symb;
-	head_type = fi->head_type;
-	cur_type = fi->cur_type;
-	head_dep = fi->head_dep;
-	cur_dep = fi->cur_dep;
-	head_label = fi->head_lab;
-	cur_label = fi->cur_lab;
-	head_cmnt = fi->head_cmnt;
-	cur_cmnt = fi->cur_cmnt;
-	head_file = fi->head_file;
-	global_bfnd = fi->global_bfnd;
-
-	num_blobs = fi->num_blobs;
-	num_bfnds = fi->num_bfnds;
-	num_llnds = fi->num_llnds;
-	num_symbs = fi->num_symbs;
-	num_types = fi->num_types;
-	num_label = fi->num_label;
-	num_cmnt = fi->num_cmnt;
-	num_files = fi->num_files;
-	num_dep = fi->num_dep;
-
-	nstr = 0;
-    if (strtbl == NULL)
-    {
-        if (!(strtbl = (char **)calloc(tblsz, sizeof(char *))))
-        {
-            perror("write_nodes(): calloc() error");
-            return (-1);
-        }
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__,strtbl, 0);
-#endif
-    }
-	cp = strtbl;
-	endtbl = strtbl + tblsz;
-
-	if (!global_bfnd)
-	  global_bfnd = find_global_bif_node();
-	
-	fix_next_symb();
-	if (write_preamble() < 0) {
-	  perror("write_nodes(): write_preamble() failed");
-	  return (-1);
-	}
-	
-	if (write_bif_nodes() < 0) {
-	  perror("write_nodes(): write_bif_nodes() failed");
-	  return (-1);
-	}
-	
-	if ((loc.llnd = ftell(fd)) < 0)	{ 
-	  perror("write_nodes(): ftell() failed (0)");
-	  return (-1);
-	}
-
-	if (write_ll_nodes() < 0) { 
-	  perror("write_nodes(): write_ll_nodes() failed");
-	  return (-1);
-	}
-
-	if ((loc.symb = ftell(fd)) < 0) { 
-	  perror("write_nodes(): ftell() failed (1)");
-	  return (-1);
-	}
-
-	if (write_symb_nodes() < 0) { 
-	  perror("write_nodes(): write_symb_nodes() failed");
-	  return (-1);
-	}
-
-	if ((loc.type = ftell(fd)) < 0)	{ 
-	  perror("write_nodes(): ftell() failed (2)");
-	  return (-1);
-	}
-
-	if (write_type_nodes() < 0) { 
-	  perror("write_nodes(): write_type_nodes() failed");
-	  return (-1);
-	}
-
-	if ((loc.labs = ftell(fd)) < 0)	{ 
-	  perror("write_nodes(): ftell() failed (3)");
-	  return (-1);
-	}
-
-	if (write_label_nodes() < 0) { 
-	  perror("write_nodes(): write_label_nodes() failed");
-	  return (-1);
-	}
-
-	if ((loc.cmnt = ftell(fd)) < 0) { 
-	  perror("write_nodes(): ftell() failed (4)");
-	  return (-1);
-	}
-
-	if (write_comment_nodes() < 0) { 
-	  perror("write_nodes(): write_comment_nodes() failed");
-	  return (-1);
-	}
-
-	if ((loc.file = ftell(fd)) < 0)	{ 
-	  perror("write_nodes(): ftell() failed (5)");
-	  return (-1);
-	}
-
-	if (write_filename_nodes() < 0) { 
-	  perror("write_nodes(): write_filename_nodes() failed");
-	  return (-1);
-	}
-
-	if ((loc.deps = ftell(fd)) < 0)	{ 
-	  perror("write_nodes(): ftell() failed (6)");
-	  return (-1);
-	}
-
-	if (write_dep_nodes() < 0) {
-	  perror("write_nodes(): write_dep_nodes() failed");
-	  return (-1);
-	}
-
-	if ((loc.strs = ftell(fd)) < 0) { 
-	  perror("write_nodes(): ftell() failed (7)");
-	  return (-1);
-	}
-
-	if (write_str_tbl(strtbl, nstr) < 0) { 
-	  perror("write_nodes(): write_str_tbl() failed");
-	  return (-1);
-	}
-
-        /* Rewind to beginning of data segment (Magic + sage.dep) PHB */
-	if (fseek(fd, (long)sizeof(u_shrt)+(long)8, 0) < 0) { 
-	  perror("write_nodes(): fseek");
-	  return -1;
-	}
-        /* write out the offsets */
-	if ((int)fwrite( (char *) &loc, sizeof(struct locs), 1, fd) < 0) {
-	  perror("write_nodes(): Could not write out offsets");
-	  return -1;
-	}
-
-	if (fclose(fd) < 0) {
-	  perror("write_nodes(): Could not close dep file");
-	  return -1;
-	}
-
-	return 0;
-}
-
-
-int
-rewrite_depfile (fi, name)
-	PTR_FILE fi;
-	char   *name;
-{
-	int	 i;
-	PTR_BFND tmp;
-
-	tmp = fi->global_bfnd->control_parent;
-	fi->global_bfnd->control_parent = NULL;
-	i = write_nodes (fi, name);
-	fi->global_bfnd->control_parent = tmp;
-	return i;
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/makefile.uni b/projects/dvm_svn/fdvm/trunk/Sage/makefile.uni
deleted file mode 100644
index 520704e..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/makefile.uni
+++ /dev/null
@@ -1,35 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# dvm/fdvm/Sage/makefile.uni (phb)
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=lib  Sage++
-
-lib:
-	cd lib; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-Sage++:
-	cd Sage++; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-all: lib Sage++
-	@echo "****** DONE MAKING SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-
-clean:
-	@echo "****** RECURSIVELY CLEAN SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-	cd lib;	$(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)"  clean
-	cd Sage++; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	@echo "****** DONE CLEAN SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-
-cleanall:
-	@echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-	cd lib;	$(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)"  cleanall
-	cd Sage++; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	@echo "****** DONE CLEANALL SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-
-.PHONY: all clean cleanall lib Sage++
diff --git a/projects/dvm_svn/fdvm/trunk/Sage/makefile.win b/projects/dvm_svn/fdvm/trunk/Sage/makefile.win
deleted file mode 100644
index 6ce06c7..0000000
--- a/projects/dvm_svn/fdvm/trunk/Sage/makefile.win
+++ /dev/null
@@ -1,46 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-
-# dvm/fdvm/Sage/makefile.win (phb)
-
-# Valentin Emelianov  (4/01/99)
-
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=lib  Sage++
-
-all: 
-    @echo "****** RECURSIVELY MAKING SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-    @cd lib
-    @$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-    @cd ..
-    @cd Sage++
-    @$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-    @cd .. 
-    @echo "****** DONE MAKING SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-
-clean:
-   @echo "****** RECURSIVELY CLEAN SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-   @cd lib
-   @$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-   @cd .. 
-   @cd Sage++
-   @$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean 
-   @cd ..
-   @echo "****** DONE CLEAN SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-
-cleanall:
-   @echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
-   @cd lib
-   @$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-   @cd .. 
-   @cd Sage++
-   @$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-   @cd ..
-   @echo "****** DONE CLEANALL SUBDIRECTORIES dvm/fdvm/Sage/: $(SUBDIR) ******"
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
deleted file mode 100644
index e7dd78d..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{2069BEB4-7CBF-421E-BAFF-AABDF23442C5}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>CodeTransformer</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseIntelIPP>false</UseIntelIPP>
-    <UseIntelTBB>false</UseIntelTBB>
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>
-    <UseIntelMKL>No</UseIntelMKL>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseIntelIPP>false</UseIntelIPP>
-    <UseIntelTBB>false</UseIntelTBB>
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>
-    <UseIntelMKL>No</UseIntelMKL>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath)</IncludePath>
-    <OutDir>..\Debug\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(IncludePath)</IncludePath>
-    <OutDir>..\Release\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\codeTransformer\array_indexes_changer.cpp" />
-    <ClCompile Include="..\..\..\codeTransformer\directive_parser.cpp" />
-    <ClCompile Include="..\..\..\codeTransformer\Distribution\DvmhDirective.cpp" />
-    <ClCompile Include="..\..\..\codeTransformer\errors.cpp" />
-    <ClCompile Include="..\..\..\codeTransformer\GraphCall\graph_calls.cpp" />
-    <ClCompile Include="..\..\..\codeTransformer\GraphLoop\graph_loops.cpp" />
-    <ClCompile Include="..\..\..\codeTransformer\LoopAnalyzer\loop_analyzer.cpp" />
-    <ClCompile Include="..\..\..\codeTransformer\transforms.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\codeTransformer\array_indexes_changer.h" />
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\Array.h" />
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\Arrays.h" />
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\Cycle.h" />
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\Distribution.h" />
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\DvmhDirective.h" />
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\GraphCSR.h" />
-    <ClInclude Include="..\..\..\codeTransformer\errors.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\$(Configuration)\NEWsrc.lib" />
-    <Library Include="..\$(Configuration)\OLDsrc.lib" />
-    <Library Include="..\$(Configuration)\SageLib++.lib" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
deleted file mode 100644
index 38275eb..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/CodeTransformer/CodeTransformer.vcxproj.filters
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Файлы исходного кода">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Заголовочные файлы">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Файлы ресурсов">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\codeTransformer\transforms.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\codeTransformer\errors.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\codeTransformer\array_indexes_changer.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\codeTransformer\GraphCall\graph_calls.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\codeTransformer\GraphLoop\graph_loops.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\codeTransformer\Distribution\DvmhDirective.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\codeTransformer\LoopAnalyzer\loop_analyzer.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\codeTransformer\directive_parser.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\codeTransformer\array_indexes_changer.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\codeTransformer\errors.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\Array.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\Arrays.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\Cycle.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\Distribution.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\DvmhDirective.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\codeTransformer\Distribution\GraphCSR.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\$(Configuration)\NEWsrc.lib" />
-    <Library Include="..\$(Configuration)\OLDsrc.lib" />
-    <Library Include="..\$(Configuration)\SageLib++.lib" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
deleted file mode 100644
index 02f4c9f..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM.sln
+++ /dev/null
@@ -1,65 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25123.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FDVM", "FDVM\FDVM.vcxproj", "{FF6D569D-DBD5-47C7-8149-71E401B0D2E4}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DC00DD23-EDC2-4B24-9988-3C12FD6D5E87} = {DC00DD23-EDC2-4B24-9988-3C12FD6D5E87}
-		{0F9AF026-C750-4245-A5A5-6A58CF3F930A} = {0F9AF026-C750-4245-A5A5-6A58CF3F930A}
-		{F9CB6387-131D-4AC3-ACED-F7BD66A3B81C} = {F9CB6387-131D-4AC3-ACED-F7BD66A3B81C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "inlineExp", "inlineExp\inlineExp.vcxproj", "{5E6D5925-4CBD-4633-BCDC-DA4018CD2C79}"
-	ProjectSection(ProjectDependencies) = postProject
-		{DC00DD23-EDC2-4B24-9988-3C12FD6D5E87} = {DC00DD23-EDC2-4B24-9988-3C12FD6D5E87}
-		{0F9AF026-C750-4245-A5A5-6A58CF3F930A} = {0F9AF026-C750-4245-A5A5-6A58CF3F930A}
-		{F9CB6387-131D-4AC3-ACED-F7BD66A3B81C} = {F9CB6387-131D-4AC3-ACED-F7BD66A3B81C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SageLib++", "SageLib++\SageLib++.vcxproj", "{DC00DD23-EDC2-4B24-9988-3C12FD6D5E87}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Parser", "Parser\Parser.vcxproj", "{23A23D24-2079-462A-A273-AB28271D68E6}"
-	ProjectSection(ProjectDependencies) = postProject
-		{F9CB6387-131D-4AC3-ACED-F7BD66A3B81C} = {F9CB6387-131D-4AC3-ACED-F7BD66A3B81C}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OLDsrc", "OLDsrc\OLDsrc.vcxproj", "{F9CB6387-131D-4AC3-ACED-F7BD66A3B81C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NEWsrc", "NEWsrc\NEWsrc.vcxproj", "{0F9AF026-C750-4245-A5A5-6A58CF3F930A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{FF6D569D-DBD5-47C7-8149-71E401B0D2E4}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FF6D569D-DBD5-47C7-8149-71E401B0D2E4}.Debug|Win32.Build.0 = Debug|Win32
-		{FF6D569D-DBD5-47C7-8149-71E401B0D2E4}.Release|Win32.ActiveCfg = Release|Win32
-		{FF6D569D-DBD5-47C7-8149-71E401B0D2E4}.Release|Win32.Build.0 = Release|Win32
-		{5E6D5925-4CBD-4633-BCDC-DA4018CD2C79}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5E6D5925-4CBD-4633-BCDC-DA4018CD2C79}.Debug|Win32.Build.0 = Debug|Win32
-		{5E6D5925-4CBD-4633-BCDC-DA4018CD2C79}.Release|Win32.ActiveCfg = Release|Win32
-		{5E6D5925-4CBD-4633-BCDC-DA4018CD2C79}.Release|Win32.Build.0 = Release|Win32
-		{DC00DD23-EDC2-4B24-9988-3C12FD6D5E87}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DC00DD23-EDC2-4B24-9988-3C12FD6D5E87}.Debug|Win32.Build.0 = Debug|Win32
-		{DC00DD23-EDC2-4B24-9988-3C12FD6D5E87}.Release|Win32.ActiveCfg = Release|Win32
-		{DC00DD23-EDC2-4B24-9988-3C12FD6D5E87}.Release|Win32.Build.0 = Release|Win32
-		{23A23D24-2079-462A-A273-AB28271D68E6}.Debug|Win32.ActiveCfg = Debug|Win32
-		{23A23D24-2079-462A-A273-AB28271D68E6}.Debug|Win32.Build.0 = Debug|Win32
-		{23A23D24-2079-462A-A273-AB28271D68E6}.Release|Win32.ActiveCfg = Release|Win32
-		{23A23D24-2079-462A-A273-AB28271D68E6}.Release|Win32.Build.0 = Release|Win32
-		{F9CB6387-131D-4AC3-ACED-F7BD66A3B81C}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F9CB6387-131D-4AC3-ACED-F7BD66A3B81C}.Debug|Win32.Build.0 = Debug|Win32
-		{F9CB6387-131D-4AC3-ACED-F7BD66A3B81C}.Release|Win32.ActiveCfg = Release|Win32
-		{F9CB6387-131D-4AC3-ACED-F7BD66A3B81C}.Release|Win32.Build.0 = Release|Win32
-		{0F9AF026-C750-4245-A5A5-6A58CF3F930A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0F9AF026-C750-4245-A5A5-6A58CF3F930A}.Debug|Win32.Build.0 = Debug|Win32
-		{0F9AF026-C750-4245-A5A5-6A58CF3F930A}.Release|Win32.ActiveCfg = Release|Win32
-		{0F9AF026-C750-4245-A5A5-6A58CF3F930A}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
deleted file mode 100644
index 6807066..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FF6D569D-DBD5-47C7-8149-71E401B0D2E4}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>FDVM</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseIntelIPP>false</UseIntelIPP>
-    <UseIntelTBB>false</UseIntelTBB>
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>
-    <UseIntelMKL>No</UseIntelMKL>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);$(IncludePath)</IncludePath>
-    <OutDir>..\Debug\</OutDir>
-    <ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.ilk;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\Release\</OutDir>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-      <BrowseInformation>true</BrowseInformation>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <Profile>true</Profile>
-    </Link>
-    <Bscmake>
-      <PreserveSbr>true</PreserveSbr>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\fdvm\acc_across_analyzer.cpp" />
-    <ClCompile Include="..\..\..\fdvm\acc_rtc.cpp" />
-    <ClCompile Include="..\..\..\fdvm\acc_across.cpp" />
-    <ClCompile Include="..\..\..\fdvm\acc_data.cpp" />
-    <ClCompile Include="..\..\..\fdvm\acc_f2c.cpp" />
-    <ClCompile Include="..\..\..\fdvm\acc_f2c_handlers.cpp" />
-    <ClCompile Include="..\..\..\fdvm\acc_unused_code.cpp" />
-    <ClCompile Include="..\..\..\fdvm\acc_utilities.cpp" />
-    <ClCompile Include="..\..\..\fdvm\acc.cpp" />
-    <ClCompile Include="..\..\..\fdvm\acc_analyzer.cpp" />
-    <ClCompile Include="..\..\..\fdvm\aks_analyzeLoops.cpp" />
-    <ClCompile Include="..\..\..\fdvm\aks_structs.cpp" />
-    <ClCompile Include="..\..\..\fdvm\calls.cpp" />
-    <ClCompile Include="..\..\..\fdvm\checkpoint.cpp" />
-    <ClCompile Include="..\..\..\fdvm\debug.cpp" />
-    <ClCompile Include="..\..\..\fdvm\dvm.cpp" />
-    <ClCompile Include="..\..\..\fdvm\funcall.cpp" />
-    <ClCompile Include="..\..\..\fdvm\help.cpp" />
-    <ClCompile Include="..\..\..\fdvm\hpf.cpp" />
-    <ClCompile Include="..\..\..\fdvm\io.cpp" />
-    <ClCompile Include="..\..\..\fdvm\omp.cpp" />
-    <ClCompile Include="..\..\..\fdvm\ompdebug.cpp" />
-    <ClCompile Include="..\..\..\fdvm\parloop.cpp" />
-    <ClCompile Include="..\..\..\fdvm\stmt.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\$(Configuration)\NEWsrc.lib" />
-    <Library Include="..\$(Configuration)\OLDsrc.lib" />
-    <Library Include="..\$(Configuration)\SageLib++.lib" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
deleted file mode 100644
index 2c84816..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/FDVM/FDVM.vcxproj.filters
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Файлы исходного кода">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Заголовочные файлы">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Файлы ресурсов">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\fdvm\acc.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\aks_analyzeLoops.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\aks_structs.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\debug.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\dvm.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\funcall.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\help.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\hpf.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\io.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\omp.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\ompdebug.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\stmt.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\calls.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\acc_analyzer.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\acc_utilities.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\acc_unused_code.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\acc_across.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\acc_data.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\acc_f2c.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\acc_f2c_handlers.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\acc_rtc.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\acc_across_analyzer.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\parloop.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\fdvm\checkpoint.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\$(Configuration)\NEWsrc.lib" />
-    <Library Include="..\$(Configuration)\OLDsrc.lib" />
-    <Library Include="..\$(Configuration)\SageLib++.lib" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
deleted file mode 100644
index a470125..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Sage\lib\newsrc\low_level.c" />
-    <ClCompile Include="..\..\..\Sage\lib\newsrc\unparse.c" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{0F9AF026-C750-4245-A5A5-6A58CF3F930A}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>NEWsrc</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseIntelIPP>false</UseIntelIPP>
-    <UseIntelTBB>false</UseIntelTBB>
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>
-    <UseIntelMKL>No</UseIntelMKL>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-      <BrowseInformation>true</BrowseInformation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Bscmake>
-      <PreserveSbr>true</PreserveSbr>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
deleted file mode 100644
index b6e769d..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/NEWsrc/NEWsrc.vcxproj.filters
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Файлы исходного кода">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Заголовочные файлы">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Файлы ресурсов">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Sage\lib\newsrc\low_level.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\newsrc\unparse.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
deleted file mode 100644
index e8cb7a6..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\anal_ind.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\db.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\dbutils.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\db_unp.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\db_unp_comm.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\db_unp_vpc.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\garb_coll.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\glob_anal.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\ker_fun.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\list.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\make_nodes.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\mod_ref.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\ndeps.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\readnodes.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\sets.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\setutils.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\symb_alg.c" />
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\writenodes.c" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F9CB6387-131D-4AC3-ACED-F7BD66A3B81C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>OLDsrc</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseIntelIPP>false</UseIntelIPP>
-    <UseIntelTBB>false</UseIntelTBB>
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>
-    <UseIntelMKL>No</UseIntelMKL>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-      <BrowseInformation>true</BrowseInformation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Bscmake>
-      <PreserveSbr>true</PreserveSbr>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
deleted file mode 100644
index 957c584..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/OLDsrc/OLDsrc.vcxproj.filters
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Файлы исходного кода">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Заголовочные файлы">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Файлы ресурсов">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\anal_ind.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\db.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\db_unp.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\db_unp_comm.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\db_unp_vpc.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\dbutils.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\garb_coll.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\glob_anal.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\ker_fun.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\list.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\make_nodes.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\mod_ref.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\ndeps.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\readnodes.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\sets.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\setutils.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\symb_alg.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\Sage\lib\oldsrc\writenodes.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
deleted file mode 100644
index 88efe75..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{23A23D24-2079-462A-A273-AB28271D68E6}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>Parser</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseIntelIPP>false</UseIntelIPP>
-    <UseIntelTBB>false</UseIntelTBB>
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>
-    <UseIntelMKL>No</UseIntelMKL>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);;$(IncludePath)</IncludePath>
-    <OutDir>..\Debug\</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\Release\</OutDir>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(ICIncludeDir);$(IncludePath);$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-      <BrowseInformation>true</BrowseInformation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <Profile>true</Profile>
-    </Link>
-    <Bscmake>
-      <PreserveSbr>true</PreserveSbr>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\trunk\parser\gram1.tab.h" />
-    <ClInclude Include="..\..\..\trunk\parser\tag.h" />
-    <ClInclude Include="..\..\..\trunk\parser\tokdefs.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\parser\cftn.c" />
-    <ClCompile Include="..\..\..\parser\errors.c" />
-    <ClCompile Include="..\..\..\parser\gram1.tab.c" />
-    <ClCompile Include="..\..\..\parser\hash.c" />
-    <ClCompile Include="..\..\..\parser\init.c" />
-    <ClCompile Include="..\..\..\parser\lexfdvm.c" />
-    <ClCompile Include="..\..\..\parser\lists.c" />
-    <ClCompile Include="..\..\..\parser\low_hpf.c" />
-    <ClCompile Include="..\..\..\parser\misc.c" />
-    <ClCompile Include="..\..\..\parser\stat.c" />
-    <ClCompile Include="..\..\..\parser\sym.c" />
-    <ClCompile Include="..\..\..\parser\types.c" />
-    <ClCompile Include="..\..\..\parser\unparse_hpf.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\$(Configuration)\OLDsrc.lib" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
deleted file mode 100644
index 81d5de6..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/Parser/Parser.vcxproj.filters
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Файлы исходного кода">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Заголовочные файлы">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Файлы ресурсов">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\..\trunk\parser\gram1.tab.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\trunk\parser\tag.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\trunk\parser\tokdefs.h">
-      <Filter>Заголовочные файлы</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\parser\cftn.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\errors.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\gram1.tab.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\hash.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\init.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\lexfdvm.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\lists.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\low_hpf.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\misc.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\stat.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\sym.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\types.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\parser\unparse_hpf.c">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\$(Configuration)\OLDsrc.lib" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
deleted file mode 100644
index 73893d0..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Sage\Sage++\libSage++.cpp" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{DC00DD23-EDC2-4B24-9988-3C12FD6D5E87}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SageLib</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseIntelIPP>false</UseIntelIPP>
-    <UseIntelTBB>false</UseIntelTBB>
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>
-    <UseIntelMKL>No</UseIntelMKL>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-      <BrowseInformation>true</BrowseInformation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-    <Bscmake>
-      <PreserveSbr>true</PreserveSbr>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <AdditionalOptions>-I. -I../../../Sage/lib/include -I../../../Sage/h -I../../../include /D "SYS5" /D "YYDEBUG" %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
deleted file mode 100644
index 8d88c25..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/SageLib++/SageLib++.vcxproj.filters
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Файлы исходного кода">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Заголовочные файлы">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Файлы ресурсов">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\Sage\Sage++\libSage++.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
deleted file mode 100644
index 2e12180..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{5E6D5925-4CBD-4633-BCDC-DA4018CD2C79}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>inlineExp</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseIntelIPP>false</UseIntelIPP>
-    <UseIntelTBB>false</UseIntelTBB>
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>
-    <UseIntelMKL>No</UseIntelMKL>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-    <UseIntelIPP>false</UseIntelIPP>
-    <UseIntelTBB>false</UseIntelTBB>
-    <InstrumentIntelTBB>false</InstrumentIntelTBB>
-    <UseIntelMKL>No</UseIntelMKL>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <IncludePath>..\..\..\Sage\lib\include;..\..\..\Sage\h;..\..\..\include;$(VCInstallDir)include;$(VC_IncludePath);$(WindowsSDK_IncludePath);;$(IncludePath)</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\InlineExpansion\hlp.cpp" />
-    <ClCompile Include="..\..\..\InlineExpansion\inliner.cpp" />
-    <ClCompile Include="..\..\..\InlineExpansion\inl_exp.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\$(Configuration)\NEWsrc.lib" />
-    <Library Include="..\$(Configuration)\OLDsrc.lib" />
-    <Library Include="..\$(Configuration)\SageLib++.lib" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters b/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
deleted file mode 100644
index c00843e..0000000
--- a/projects/dvm_svn/fdvm/trunk/VS2019proj_deprecated_move_to_sapfor/FDVM/inlineExp/inlineExp.vcxproj.filters
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Файлы исходного кода">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Заголовочные файлы">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Файлы ресурсов">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\InlineExpansion\hlp.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\InlineExpansion\inl_exp.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\InlineExpansion\inliner.cpp">
-      <Filter>Файлы исходного кода</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <Library Include="..\$(Configuration)\NEWsrc.lib" />
-    <Library Include="..\$(Configuration)\OLDsrc.lib" />
-    <Library Include="..\$(Configuration)\SageLib++.lib" />
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/acrossDebugging/across.cpp b/projects/dvm_svn/fdvm/trunk/acrossDebugging/across.cpp
deleted file mode 100644
index ba2b6d7..0000000
--- a/projects/dvm_svn/fdvm/trunk/acrossDebugging/across.cpp
+++ /dev/null
@@ -1,494 +0,0 @@
-#include <iostream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <vector>
-#include <set>
-#include <array>
-#include <omp.h>
-#include <math.h>
-
-using namespace std;
-
-struct dim3
-{
-    dim3(int _x) { x = _x; y = z = 1; }
-    dim3(int _x, int _y) { x = _x; y = _y; z = 1; }
-    dim3(int _x, int _y, int _z) { x = _x; y = _y; z = _z; }
-    dim3() { x = y = z = 1; }
-    int x, y, z;
-};
-
-//ii j i
-int lowI[3] = { 3, 6, 3 };
-int highI[3] = { 5, 3, 7 };
-
-int idxI[3] = { 1, -1, 1 };
-
-set<array<int, 3>> elems;
-
-static void kernel(int id_x, int id_y,
-                    int base_i, int base_j, int base_ii,
-                    int step_i, int step_j, int step_ii,
-                    int max_z, int SE, int var1, int var2, int var3,
-                    int Emax, int Emin, int min_ij, int swap_ij,
-                    int type_of_run, int idxs_0, int idxs_1, int idxs_2)
-{
-    int coords[3];
-
-    // Local needs
-    int ii, j, i;
-    //id_x = x;// blockIdx.x* blockDim.x + threadIdx.x;
-    //id_y = y;// blockIdx.y* blockDim.y + threadIdx.y;
-    if (id_y < max_z)
-    {
-        if (id_y + SE < Emin)
-            i = id_y + SE;
-        else
-        {
-            if (id_y + SE < Emax)
-                i = min_ij;
-            else
-                i = 2 * min_ij - SE - id_y + Emax - Emin - 1;
-        }
-
-        if (id_x < i)
-        {
-            if (var3 == 1 && Emin < id_y + SE)
-            {
-                base_i = base_i - step_i * (SE + id_y - Emin);
-                base_j = base_j + step_j * (SE + id_y - Emin);
-            }
-
-            coords[idxs_0] = base_i + (id_y * (var1 + var3) - id_x) * step_i;
-            coords[idxs_1] = base_j + (id_y * var2 + id_x) * step_j;
-            coords[idxs_2] = base_ii - id_y * step_ii;
-
-            if (swap_ij * var3)
-                coords[idxs_0] ^= coords[idxs_1] ^= coords[idxs_0] ^= coords[idxs_1];
-
-            i = coords[0];
-            j = coords[1];
-            ii = coords[2];
-
-            if ((i < lowI[2] || i > highI[2]) && idxI[2] > 0 ||
-                (i > lowI[2] || i < highI[2]) && idxI[2] < 0)
-            {
-                printf("error on I\n");
-                exit(-1);
-            }
-            if ((j < lowI[1] || j > highI[1]) && idxI[1] > 0 ||
-                (j > lowI[1] || j < highI[1]) && idxI[1] < 0)
-            {
-                printf("error on J\n");
-                exit(-1);
-            }
-            if ((ii < lowI[0] || ii > highI[0]) && idxI[0] > 0 ||
-                (ii > lowI[0] || ii < highI[0]) && idxI[0] < 0)
-            {
-                printf("error on II\n");
-                exit(-1);
-            }
-            // Loop body
-            /*printf("[%d %d %d] | %d %d %d %d %d %d | %d %d | %d %d %d | %d %d %d %d| %d %d %d %d|\n", i, j, ii,
-                base_i, base_j, base_ii, step_i, step_j, step_ii,
-                max_z, SE, var1, var2, var3, Emax, Emin, min_ij, swap_ij,
-                type_of_run, idxs_0, idxs_1, idxs_2);*/
-
-            array<int, 3> next = { i, j, ii };
-            if (elems.find(next) != elems.end())
-            {
-                printf("error on elems\n");
-                exit(-1);
-            }
-            else
-                elems.insert(next);
-        }
-    }
-}
-
-static void loop_kernel(const dim3& blocks, const dim3& threads, 
-                        int base_i, int base_j, int base_ii,
-                        int step_i, int step_j, int step_ii, 
-                        int max_z, int SE, int var1, int var2, int var3, 
-                        int Emax, int Emin, int min_ij, int swap_ij, 
-                        int type_of_run, int idxs_0, int idxs_1, int idxs_2)
-{
-    for (int y = 0; y < blocks.y * threads.y; ++y)
-        for (int x = 0; x < blocks.x * threads.x; ++x)  
-            kernel(x, y, base_i, base_j, base_ii, step_i, step_j, step_ii,
-                   max_z, SE, var1, var2, var3, Emax, Emin, min_ij, swap_ij,
-                   type_of_run, idxs_0, idxs_1, idxs_2);
-}
-
-void testAcross_7case()
-{
-    dim3 blocks, threads;
-    int base_i, base_j, base_ii;
-    int var3 = 0;
-    int var2 = 0;
-    int var1 = 1;
-    int diag = 1;
-    int SE = 1;
-    int Emax, Emin, Allmin;
-
-    int num_y;
-    int num_x;
-
-    int idxs[5] = { 0, 1, 2 };
-
-    int lowI[3];
-    int highI[3];
-    int idxI[3];
-    for (int k = 0; k < 3; ++k)
-    {
-        lowI[k] = ::lowI[k];
-        highI[k] = ::highI[k];
-        idxI[k] = ::idxI[k];
-    }
-
-    threads = dim3(8, 4, 1);
-    num_x = threads.x;
-    num_y = threads.y;
-
-    const int Mi = (abs(lowI[2] - highI[2]) + 1) / abs(idxI[2]) + ((abs(lowI[2] - highI[2]) + 1) % abs(idxI[2]) != 0);
-    const int Mj = (abs(lowI[1] - highI[1]) + 1) / abs(idxI[1]) + ((abs(lowI[1] - highI[1]) + 1) % abs(idxI[1]) != 0);
-    const int Mk = (abs(lowI[0] - highI[0]) + 1) / abs(idxI[0]) + ((abs(lowI[0] - highI[0]) + 1) % abs(idxI[0]) != 0);
-    Allmin = std::min(std::min(Mi, Mj), Mk);
-    Emin = std::min(Mi, Mj);
-    Emax = std::min(Mi, Mj) + abs(Mi - Mj) + 1;
-    blocks = dim3(num_x, num_y);
-
-    // Start method
-    base_i = lowI[2];
-    base_j = lowI[1];
-    base_ii = lowI[0];
-    int type_of_run = 7;
-    while (diag <= Allmin)
-    {
-        blocks.x = diag / num_x + (diag % num_x != 0);
-        blocks.y = diag / num_y + (diag % num_y != 0);
-        loop_kernel(blocks, threads, base_i, base_j, base_ii, idxI[2], idxI[1], idxI[0], diag, SE, var1, var2, var3, Emax, Emin,
-            std::min(Mi, Mj), Mi > Mj, type_of_run, idxs[0], idxs[1], idxs[2]);
-
-        //printf("1===========\n");
-        base_ii = base_ii + idxI[0];
-        diag = diag + 1;
-    }
-    var1 = 0;
-    var2 = 0;
-    var3 = 1;
-
-    if (Mk > Emin)
-    {
-        base_i = lowI[2] * (Mi <= Mj) + lowI[1] * (Mi > Mj);
-        base_j = lowI[1] * (Mi <= Mj) + lowI[2] * (Mi > Mj);
-        diag = Allmin + 1;
-
-        while (diag - 1 != Mk)
-        {
-            blocks.x = Emin / num_x + (Emin % num_x != 0);
-            blocks.y = diag / num_y + (diag % num_y != 0);
-            if (Mi > Mj)
-                idxI[2] ^= idxI[1] ^= idxI[2] ^= idxI[1];
-            loop_kernel(blocks, threads, base_i, base_j, base_ii, idxI[2], idxI[1], idxI[0], diag, SE, var1, var2, var3, Emax, Emin,
-                std::min(Mi, Mj), Mi > Mj, type_of_run, idxs[0], idxs[1], idxs[2]);
-            if (Mi > Mj)
-                idxI[2] ^= idxI[1] ^= idxI[2] ^= idxI[1];
-            //printf("2===========\n");
-            base_ii = base_ii + idxI[0];
-            diag = diag + 1;
-        }
-    }
-    diag = Mk;
-    blocks.y = diag / num_y + (diag % num_y != 0);
-    blocks.x = Emin / num_x + (Emin % num_x != 0);
-    SE = 2;
-    base_i = (lowI[2] + idxI[2]) * (Mi <= Mj) + (lowI[1] + idxI[1]) * (Mi > Mj);
-    base_j = lowI[1] * (Mi <= Mj) + lowI[2] * (Mi > Mj);
-    base_ii = lowI[0] + idxI[0] * (Mk - 1);
-
-    while (Mi + Mj - Allmin != SE - 1)
-    {
-        if (Mi > Mj)
-            idxI[2] ^= idxI[1] ^= idxI[2] ^= idxI[1];
-        loop_kernel(blocks, threads, base_i, base_j, base_ii, idxI[2], idxI[1], idxI[0], diag, SE, var1, var2, var3, Emax, Emin,
-            std::min(Mi, Mj), Mi > Mj, type_of_run, idxs[0], idxs[1], idxs[2]);
-        if (Mi > Mj)
-            idxI[2] ^= idxI[1] ^= idxI[2] ^= idxI[1];
-
-        //printf("3===========\n");
-        base_i = base_i + idxI[2] * (Mi <= Mj) + idxI[1] * (Mi > Mj);
-        SE = SE + 1;
-    }
-
-    var1 = 0;
-    var2 = 1;
-    var3 = 0;
-    diag = Allmin - 1;
-    base_i = lowI[2] + idxI[2] * (Mi - 1);
-    base_j = lowI[1] * (Mi > Mj) + base_j * (Mi <= Mj);
-    if (Mi > Mj && Mk <= Emin)
-    {
-        base_j = base_j + idxI[1] + abs(Emin - Mk) * (idxI[1] > 0 ? 1 : -1);
-    }
-    else
-    {
-        if (Mi <= Mj && Mk <= Emin)
-        {
-            if (idxI[1] > 0)
-            {
-                base_j = base_j + idxI[1] + Emax - Emin - 1 + abs(Emin - Mk);
-            }
-            else
-            {
-                base_j = base_j + idxI[1] - Emax + Emin + 1 + Mk - Emin;
-            }
-        }
-        else
-        {
-            if (Mi > Mj && Mk > Emin)
-            {
-                base_j = base_j + idxI[1];
-            }
-            else
-            {
-                if (Mi <= Mj && Mk > Emin)
-                {
-                    if (idxI[1] > 0)
-                    {
-                        base_j = base_j + idxI[1] + Emax - Emin - 1;
-                    }
-                    else
-                    {
-                        base_j = base_j + idxI[1] - Emax + Emin + 1;
-                    }
-                }
-            }
-        }
-    }
-
-    while (diag != 0)
-    {
-        blocks.x = diag / num_x + (diag % num_x != 0);
-        blocks.y = diag / num_y + (diag % num_y != 0);
-        loop_kernel(blocks, threads, base_i, base_j, base_ii, idxI[2], idxI[1], idxI[0], diag, SE, var1, var2, var3, Emax, Emin,
-            std::min(Mi, Mj), Mi > Mj, type_of_run, idxs[0], idxs[1], idxs[2]);
-
-        //printf("4===========\n");
-        SE = SE + 1;
-        base_j = base_j + idxI[1];
-        diag = diag - 1;
-    }
-
-    if ((int)elems.size() != (abs(highI[2] - lowI[2]) + 1) * (abs(highI[1] - lowI[1]) + 1) * (abs(highI[0] - lowI[0]) + 1))
-    {
-        printf(" elems count = %d, total %d\n", (int)elems.size(), (abs(highI[2] - lowI[2]) + 1) * (abs(highI[1] - lowI[1]) + 1) * (abs(highI[0] - lowI[0]) + 1));
-        exit(-2);
-    }
-}
-
-int main()
-{
-    testAcross_7case();
-        
-    for (int z = 1; z < 10; ++z)
-    {
-        for (int k = 1; k < 10; ++k)
-        {
-            for (int j = 1; j < 10; ++j)
-            {
-                lowI[0] = 1;
-                lowI[1] = 1;
-                lowI[2] = 1;
-
-                highI[0] = j + 1;
-                highI[1] = k + 1;
-                highI[2] = z + 1;
-
-                idxI[0] = 1;
-                idxI[1] = 1;
-                idxI[2] = 1;
-
-                elems.clear();
-                testAcross_7case();
-            }
-        }
-    }
-    printf("done full +\n");
-
-    for (int z = 1; z < 10; ++z)
-    {
-        for (int k = 1; k < 10; ++k)
-        {
-            for (int j = 1; j < 10; ++j)
-            {
-                lowI[0] = 1;
-                lowI[1] = 1;
-                lowI[2] = z + 1;
-
-                highI[0] = j + 1;
-                highI[1] = k + 1;
-                highI[2] = 1;
-
-                idxI[0] = 1;
-                idxI[1] = 1;
-                idxI[2] = -1;
-
-                elems.clear();
-                testAcross_7case();
-            }
-        }
-    }
-    printf("done - last\n");
-
-    for (int z = 1; z < 10; ++z)
-    {
-        for (int k = 1; k < 10; ++k)
-        {
-            for (int j = 1; j < 10; ++j)
-            {
-                lowI[0] = 1;
-                lowI[1] = k + 1;
-                lowI[2] = 1;
-
-                highI[0] = j + 1;
-                highI[1] = 1;
-                highI[2] = z + 1;
-
-                idxI[0] = 1;
-                idxI[1] = -1;
-                idxI[2] = 1;
-
-                elems.clear();
-                testAcross_7case();
-            }
-        }
-    }
-    printf("done - mid\n");
-
-    for (int z = 1; z < 10; ++z)
-    {
-        for (int k = 1; k < 10; ++k)
-        {
-            for (int j = 1; j < 10; ++j)
-            {
-                lowI[0] = j + 1;
-                lowI[1] = 1;
-                lowI[2] = 1;
-
-                highI[0] = 1;
-                highI[1] = k + 1;
-                highI[2] = z + 1;
-
-                idxI[0] = -1;
-                idxI[1] = 1;
-                idxI[2] = 1;
-
-                elems.clear();
-                testAcross_7case();
-            }
-        }
-    }
-    printf("done - first\n");
-
-    for (int z = 1; z < 10; ++z)
-    {
-        for (int k = 1; k < 10; ++k)
-        {
-            for (int j = 1; j < 10; ++j)
-            {
-                lowI[0] = 1;
-                lowI[1] = k + 1;
-                lowI[2] = z + 1;
-
-                highI[0] = j + 1;
-                highI[1] = 1;
-                highI[2] = 1;
-
-                idxI[0] = 1;
-                idxI[1] = -1;
-                idxI[2] = -1;
-
-                elems.clear();
-                testAcross_7case();
-            }
-        }
-    }
-    printf("done - mid last\n");
-
-    for (int z = 1; z < 10; ++z)
-    {
-        for (int k = 1; k < 10; ++k)
-        {
-            for (int j = 1; j < 10; ++j)
-            {
-                lowI[0] = j + 1;
-                lowI[1] = k + 1;
-                lowI[2] = 1;
-
-                highI[0] = 1;
-                highI[1] = 1;
-                highI[2] = z + 1;
-
-                idxI[0] = -1;
-                idxI[1] = -1;
-                idxI[2] = 1;
-
-                elems.clear();
-                testAcross_7case();
-            }
-        }
-    }
-    printf("done - first mid\n");
-
-    for (int z = 1; z < 10; ++z)
-    {
-        for (int k = 1; k < 10; ++k)
-        {
-            for (int j = 1; j < 10; ++j)
-            {
-                lowI[0] = j + 1;
-                lowI[1] = 1;
-                lowI[2] = z + 1;
-
-                highI[0] = 1;
-                highI[1] = k + 1;
-                highI[2] = 1;
-
-                idxI[0] = -1;
-                idxI[1] = 1;
-                idxI[2] = -1;
-
-                elems.clear();
-                testAcross_7case();
-            }
-        }
-    }
-    printf("done - first last \n");
-
-    for (int z = 1; z < 10; ++z)
-    {
-        for (int k = 1; k < 10; ++k)
-        {
-            for (int j = 1; j < 10; ++j)
-            {
-                lowI[0] = j + 1;
-                lowI[1] = k + 1;
-                lowI[2] = z + 1;
-
-                highI[0] = 1;
-                highI[1] = 1;
-                highI[2] = 1;
-
-                idxI[0] = -1;
-                idxI[1] = -1;
-                idxI[2] = -1;
-
-                elems.clear();
-                testAcross_7case();
-            }
-        }
-    }
-    printf("done full -\n");
-    return 0;
-}
diff --git a/projects/dvm_svn/fdvm/trunk/examples/gausf.fdv b/projects/dvm_svn/fdvm/trunk/examples/gausf.fdv
deleted file mode 100644
index 6d1e752..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/gausf.fdv
+++ /dev/null
@@ -1,60 +0,0 @@
-       PROGRAM GAUSF
-       PARAMETER   ( N = 10 )
-       REAL   A( N, N+1 ),X( N )
-C		section A(1:N,1:N)   - matrix of coefficients "A"
-C		section A(1:N,N+1) - vector of free members "b"
-CDVM$  DISTRIBUTE   A  ( BLOCK,  *)  
-CDVM$  ALIGN   X(I)   WITH   A(I,N+1)
-       PRINT *,  '**********   TEST_GAUSS   **********'
-CDVM$  PARALLEL (I) ON A(I,*)
-       DO 100 I=1,N
-       DO 100 J=1,N+1
-       IF (I .EQ. J) THEN
-         A(I,J)=2.0
-       ELSE
-         IF (J .EQ. N+1)   THEN
-           A(I,J)=1.0
-         ELSE
-           A(I,J)=0.0
-       ENDIF
-       ENDIF   
-  100  CONTINUE 
-C
-C       ELIMINATION
-C
-        DO  1  I = 1, N-1
-
-C		the i-th row of array A will be buffered before
-C		execution of i-th iteration, and reference A(I,K) 
-C		will be replaced with corresponding reference to buffer 
-CDVM$  PARALLEL ( J ) ON  A( J, * ), REMOTE_ACCESS (A( I, :))
-                  DO  5  J = I+1, N
-                  DO  5  K = I+1, N+1
-        A( J, K ) = A( J, K ) - A( J, I ) * A( I, K ) / A( I, I )
-    5             CONTINUE
-    1   CONTINUE
-        X( N ) = A( N, N+1 ) / A( N, N )
-C       BACK SUBSTITUTION
-C
-        DO  6  J = N-1, 1, -1
-C		the (j+1)-th elements of array X will be buffered before
-C		execution of j-th iteration, and reference X(J+1) 
-C		will be replaced with reference to temporal variable
-CDVM$   PARALLEL  ( I )   ON   A( I , * ), REMOTE_ACCESS ( X( J+1 ))
-                  DO  7  I = 1, J
-                     A( I, N+1 )  = A( I, N+1 ) - A( I,J+1)*X(J+1)
-    7             CONTINUE
-        X( J ) = A( J,  N+1 ) / A( J, J)
-    6   CONTINUE
-        PRINT *, X
-        END
-
-
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/gausgb.fdv b/projects/dvm_svn/fdvm/trunk/examples/gausgb.fdv
deleted file mode 100644
index 3482718..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/gausgb.fdv
+++ /dev/null
@@ -1,57 +0,0 @@
-       PROGRAM GAUSGB
-       PARAMETER   ( N = 10 ,N1 = N-3)
-       REAL   A( N, N+1 ),X( N )
-       INTEGER GB(2)
-C		section A(1:N,1:N)   - matrix of coefficients "A"
-C		section A(1:N,N+1) - vector of free members "b"
-CDVM$  DISTRIBUTE   A  ( GEN_BLOCK(GB),  *) 
-CDVM$  ALIGN   X(I)   WITH   A(I,N+1)
-       DATA GB(1)/3/, GB(2)/N1/
-       PRINT *,  '**********  TEST_GAUSGB   **********'
-CDVM$  PARALLEL (I) ON A(I,*)
-       DO 100 I=1,N
-       DO 100 J=1,N+1
-       IF (I .EQ. J) THEN
-         A(I,J)=2.0
-       ELSE
-         IF (J .EQ. N+1)   THEN
-           A(I,J)=1.0
-         ELSE
-           A(I,J)=0.0
-       ENDIF
-       ENDIF   
-  100  CONTINUE 
-C
-C       ELIMINATION
-C
-        DO  1  I = 1, N
-
-C		the i-th row of array A will be buffered before
-C		execution of i-th iteration, and reference A(I,K) 
-C		will be replaced with corresponding reference to buffer 
-CDVM$  PARALLEL ( J ) ON  A( J, * ), REMOTE_ACCESS (A( I, :))
-                  DO  5  J = I+1, N
-                  DO  5  K = I+1, N+1
-        A( J, K ) = A( J, K ) - A( J, I ) * A( I, K ) / A( I, I )
-    5             CONTINUE
-    1   CONTINUE
-        X( N ) = A( N, N+1 ) / A( N, N )
-C       BACK SUBSTITUTION
-C
-        DO  6  J = N-1, 1, -1
-C		the (j+1)-th elements of array X will be buffered before
-C		execution of j-th iteration, and reference X(J+1) 
-C		will be replaced with reference to temporal variable
-CDVM$   PARALLEL  ( I )   ON   A( I , * ), REMOTE_ACCESS ( X( J+1 ))
-                  DO  7  I = 1, J
-                     A( I, N+1 )  = A( I, N+1 ) - A( I,J+1)*X(J+1)
-    7             CONTINUE
-        X( J ) = A( J,  N+1 ) / A( J, J)
-    6   CONTINUE
-        PRINT *, X
-        END
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/gaush.hpf b/projects/dvm_svn/fdvm/trunk/examples/gaush.hpf
deleted file mode 100644
index 0a337cb..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/gaush.hpf
+++ /dev/null
@@ -1,45 +0,0 @@
-       PROGRAM GAUSH
-       PARAMETER   ( N = 10 )
-       REAL   A( N, N+1 ),X( N )
-C		section A(1:N,1:N)   - matrix of coefficients "A"
-C		section A(1:N,N+1) - vector of free members "b"
-CHPF$  DISTRIBUTE   A  ( BLOCK,  *)  
-CHPF$  ALIGN   X(I)   WITH   A(I,N+1)
-       PRINT *,  '**********   TEST_GAUSSHPF *********'
-CHPF$  INDEPENDENT
-       DO 100 I=1,N
-       DO 100 J=1,N+1
-       IF (I .EQ. J) THEN
-         A(I,J)=2.0
-       ELSE
-         IF (J .EQ. N+1)   THEN
-           A(I,J)=1.0
-         ELSE
-           A(I,J)=0.0
-       ENDIF
-       ENDIF   
-  100  CONTINUE 
-C
-C      ELIMINATION
-C
-       DO  1  I = 1, N-1
-
-CHPF$  INDEPENDENT 
-           DO  5  J = I+1, N
-           DO  5  K = I+1, N+1
-        A( J, K ) = A( J, K ) - A( J, I ) * A( I, K ) / A( I, I )
-    5      CONTINUE
-    1  CONTINUE
-       X( N ) = A( N, N+1 ) / A( N, N )
-C      BACK SUBSTITUTION
-C
-       DO  6  J = N-1, 1, -1
-CHPF$  INDEPENDENT 
-           DO  7  I = 1, J
-              A( I, N+1 )  = A( I, N+1 ) - A( I,J+1)*X(J+1)
-    7      CONTINUE
-       X( J ) = A( J,  N+1 ) / A( J, J)
-    6  CONTINUE
-       PRINT *, X
-       END
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/gauswh.fdv b/projects/dvm_svn/fdvm/trunk/examples/gauswh.fdv
deleted file mode 100644
index 94fcafd..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/gauswh.fdv
+++ /dev/null
@@ -1,53 +0,0 @@
-       PROGRAM GAUSWH
-       PARAMETER   ( N = 10 )
-       REAL   A( N, N+1 ),X( N )
-       DOUBLE PRECISION WB(10)
-C		section A(1:N,1:N)   - matrix of coefficients "A"
-C		section A(1:N,N+1) - vector of free members "b"
-CDVM$  DISTRIBUTE   A  ( WGT_BLOCK(WB,10),  *) 
-CDVM$  ALIGN   X(I)   WITH   A(I,N+1)
-       DATA WB/10.,9.,8.,7.,6.,5.,4.,3.,2.,1./      
-
-CDVM$  PARALLEL (I) ON A(I,*)
-       DO 100 I=1,N
-       DO 100 J=1,N+1
-       IF (I .EQ. J) THEN
-         A(I,J)=2.0
-       ELSE
-         IF (J .EQ. N+1)   THEN
-           A(I,J)=1.0
-         ELSE
-           A(I,J)=0.0
-       ENDIF
-       ENDIF   
-  100  CONTINUE 
-C
-C       ELIMINATION
-C
-        DO  1  I = 1, N-1
-
-C		the i-th row of array A will be buffered before
-C		execution of i-th iteration, and reference A(I,K) 
-C		will be replaced with corresponding reference to buffer 
-CDVM$  PARALLEL ( J ) ON  A( J, * ), REMOTE_ACCESS (A( I, :))
-                  DO  5  J = I+1, N
-                  DO  5  K = I+1, N+1
-        A( J, K ) = A( J, K ) - A( J, I ) * A( I, K ) / A( I, I )
-    5             CONTINUE
-    1   CONTINUE
-        X( N ) = A( N, N+1 ) / A( N, N )
-C       BACK SUBSTITUTION
-C
-        DO  6  J = N-1, 1, -1
-C		the (j+1)-th elements of array X will be buffered before
-C		execution of j-th iteration, and reference X(J+1) 
-C		will be replaced with reference to temporal variable
-CDVM$   PARALLEL  ( I )   ON   A( I , * ), REMOTE_ACCESS ( X( J+1 ))
-                  DO  7  I = 1, J
-                     A( I, N+1 )  = A( I, N+1 ) - A( I,J+1)*X(J+1)
-    7             CONTINUE
-        X( J ) = A( J,  N+1 ) / A( J, J)
-    6   CONTINUE
-        PRINT *, X
-        END
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/jac.fdv b/projects/dvm_svn/fdvm/trunk/examples/jac.fdv
deleted file mode 100644
index e82ece9..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/jac.fdv
+++ /dev/null
@@ -1,47 +0,0 @@
-        PROGRAM    JAC
-        PARAMETER    (L=8,  ITMAX=20)
-        REAL     A(L,L), EPS, MAXEPS, B(L,L)
-CDVM$   DISTRIBUTE     ( BLOCK,   BLOCK)   ::   A
-CDVM$   ALIGN  B(I,J)  WITH  A(I,J)
-C		 arrays A and B  with block distribution 
-
-        PRINT *,  '**********  TEST_JACOBI   **********'
-                  MAXEPS  =  0.5E - 7
-CDVM$   PARALLEL    (J,I)   ON   A(I, J)
-C		nest of two parallel loops, iteration (i,j) will be executed on 
-C		processor, which is owner of element A(i,j) 
-            DO  1   J  =  1, L
-            DO  1   I  =  1, L
-                A(I,  J)  =  0.
-                IF(I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.L .OR. J.EQ.L) THEN
-                      B(I,  J) = 0.
-                ELSE
-                      B(I,  J)  = ( 1. + I + J )
-                ENDIF
-    1       CONTINUE
-        DO  2   IT  =  1,  ITMAX
-                  EPS  =  0.
-CDVM$   PARALLEL  (J,  I)   ON  A(I,  J),  REDUCTION ( MAX( EPS ))
-C		variable EPS is used for calculation of maximum value
-                  DO  21  J  =  2, L-1
-                  DO  21  I  =  2, L-1
-                         EPS = MAX ( EPS,  ABS( B( I, J)  -  A( I, J)))
-                         A(I, J)  =  B(I, J)
-   21             CONTINUE
-CDVM$   PARALLEL  (J,  I)   ON  B(I,  J),   SHADOW_RENEW   (A)
-C		Copying shadow elements of array A from 
-C		neighbouring processors before loop execution
-                  DO  22  J = 2,  L-1
-                  DO  22  I = 2,  L-1
-        B(I, J) =  (A( I-1, J ) + A( I, J-1 ) + A( I+1, J)+
-     *                        A( I, J+1 )) / 4
-   22             CONTINUE
-                  PRINT 200,  IT, EPS
-200               FORMAT(' IT = ',I4, '   EPS = ', E14.7)
-                  IF ( EPS . LT . MAXEPS )    GO TO   3
-    2   CONTINUE
-    3   OPEN (3, FILE='JAC.DAT', FORM='FORMATTED', STATUS='UNKNOWN')
-        WRITE (3,*)   B
-        CLOSE (3)
-        END
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/jacas.fdv b/projects/dvm_svn/fdvm/trunk/examples/jacas.fdv
deleted file mode 100644
index c3dd6bb..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/jacas.fdv
+++ /dev/null
@@ -1,62 +0,0 @@
-         PROGRAM    JACAS
-         PARAMETER    (K=8,  ITMAX=20)
-         REAL     A(K,K), EPS, MAXEPS, B(K,K)
-CDVM$    DISTRIBUTE     ( BLOCK,   BLOCK)   ::   A
-CDVM$    ALIGN B(I,J)  WITH  A(I,J)
-CDVM$    REDUCTION_GROUP    REPS 
-C		 arrays A and B  with block distribution 
-
-        PRINT *,  '**********  TEST_JACOBI_AS   **********'
-CDVM$   SHADOW_GROUP    SA ( A )
-C		creation of descriptor for operations with imported/exported 
-C		elements of array A
-                   MAXEPS = 0.5E - 7
-CDVM$    PARALLEL  ( J, I)   ON  A( I,  J)
-C		nest of parallel loops for initialization of arrays
-             DO  1   J =  1,  K
-             DO  1   I =  1,  K
-                 A( I,   J)  =  0.
-                 IF(I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.K .OR. J.EQ.K) THEN
-                    B(I,  J) = 0.
-                 ELSE
-                    B(I,  J)  = ( 1. + I + J )
-                 ENDIF
-    1   CONTINUE
-                   DO  2   IT = 1,  ITMAX
-                          EPS = 0.
-C		descriptor of reduction operations is created 
-C		and  initial values of reduction variables are stored
-CDVM$    PARALLEL  ( J,  I)   ON  A( I,  J) ,  SHADOW_START    SA,
-CDVM$*   REDUCTION(REPS:MAX(EPS))
-C		the loops iteration order is changed: at first
-C		exported (boundary) elements of A are calculated and sent
-C		then internal elements of array A are calculated     
-                   DO  21   J  =  2,  K-1
-                   DO  21   I  =  2,  K-1
-                          EPS =  MAX  ( EPS,  ABS( B( I, J) - A( I, J)))
-                          A( I, J) = B( I, J)
-   21   CONTINUE
-CDVM$    REDUCTION_START     REPS
-C		start of reduction operation to accumulate the partial results
-C		calculated in  copies of variable EPS on every processor
-CDVM$    PARALLEL  ( J,  I)  ON B( I,   J) ,  SHADOW_WAIT     SA
-C		the loops iteration order is changed: at first
-C		internal elements of B are calculated, then imported elements
-C		of array A from neighboring processors are received,
-C		then boundary elements of array B are calculated     
-                    DO  22  J =  2,  K-1
-                    DO  22  I =  2,  K-1
-      B(I, J) =   (A( I-1, J ) + A( I, J-1 ) + A( I+1, J ) +
-     *            A( I, J+1 ))/4 
-   22    CONTINUE
-CDVM$    REDUCTION_WAIT     REPS
-C		awaiting completion of reduction operation
-                    PRINT 200,  IT, EPS
-200                 FORMAT(' IT = ',I4, '   EPS = ', E14.7)
-                    IF  ( EPS .LT. MAXEPS )   GO TO  3
-    2    CONTINUE
-    3    OPEN (3, FILE='JACAS.DAT', FORM='FORMATTED',STATUS='UNKNOWN')
-         WRITE (3,*)   B
-         CLOSE (3)
-         END
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/jach.hpf b/projects/dvm_svn/fdvm/trunk/examples/jach.hpf
deleted file mode 100644
index 5a1974d..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/jach.hpf
+++ /dev/null
@@ -1,44 +0,0 @@
-        PROGRAM    JACH
-        PARAMETER    (L=8,  ITMAX=20)
-        REAL     A(L,L), B(L,L)
-CHPF$   DISTRIBUTE     ( BLOCK,   BLOCK)   ::   A
-CHPF$   ALIGN  B(I,J)  WITH  A(I,J)
-C		 arrays A and B  with block distribution 
-
-        PRINT *,  '**********  TEST_JACH     **********'
-C		nest of two INDEPENDENT loops, iteration (i,j) will be executed on 
-C		processor, which is owner of element A(i,j) 
-CHPF$   INDEPENDENT
-            DO  1   J  =  1, L
-CHPF$   INDEPENDENT
-            DO  1   I  =  1, L
-                A(I,  J)  =  0.
-                IF(I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.L .OR. J.EQ.L) THEN
-                      B(I,  J) = 0.
-                ELSE
-                      B(I,  J)  = ( 1. + I + J )
-                ENDIF
-    1       CONTINUE
-        DO  2   IT  =  1,  ITMAX
-CHPF$   INDEPENDENT
-                  DO  21  J  =  2, L-1
-CHPF$   INDEPENDENT
-                  DO  21  I  =  2, L-1
-                         A(I, J)  =  B(I, J)
-   21             CONTINUE
-
-CHPF$   INDEPENDENT
-                  DO  22  J = 2,  L-1
-CHPF$   INDEPENDENT
-                  DO  22  I = 2,  L-1
-        B(I, J) =  (A( I-1, J ) + A( I, J-1 ) + A( I+1, J)+
-     *                        A( I, J+1 )) / 4
-   22             CONTINUE
-                  PRINT 300,  IT
-  300             FORMAT(' IT = ',I4)
-    2   CONTINUE
-    3   OPEN (3, FILE='JACH.DAT', FORM='FORMATTED', STATUS='UNKNOWN')
-        WRITE (3,*)   B
-        CLOSE (3)
-        END
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/redbf.fdv b/projects/dvm_svn/fdvm/trunk/examples/redbf.fdv
deleted file mode 100644
index 3db55db..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/redbf.fdv
+++ /dev/null
@@ -1,46 +0,0 @@
-      PROGRAM REDBF
-      PARAMETER (N=10)
-      REAL A(N,N), EPS, MAXEXP, W
-      INTEGER ITMAX
-CDVM$ DISTRIBUTE A(BLOCK, BLOCK)
-      PRINT *,  '**********  TEST_REDBLACK   **********'
-      ITMAX = 20
-      MAXEXP = 0.5E - 5
-      W = 0.5
-CDVM$ PARALLEL (J,I) ON A(I, J)
-      DO 1  J = 1,N
-      DO 1  I = 1,N
-         IF (I.EQ.J) THEN
-           A(I,J) = N+2
-         ELSE
-          A(I,J) = -1. 
-         ENDIF
-1     CONTINUE
-      DO 2  IT = 1, ITMAX
-      EPS = 0.
-C	loop for red and black variables 
-      DO 3 IRB = 0,1
-CDVM$ PARALLEL (J,I) ON A(I, J), NEW (S), REDUCTION (MAX(EPS)),
-CDVM$*                      SHADOW_RENEW  (A)
-C	variable S - private variable in loop iterations
-C	variable EPS is used for calculation of maximum value 
-
-C	Exception : iteration space is not rectangular
-
-      DO 21  J = 2,N-1
-      DO 21  I = 2 + MOD(J+IRB,2), N-1, 2
-         S = A(I,J)
-         A(I,J) = (W/4) * (A(I-1,J) + A(I+1,J) + A(I,J-1) +
-     *   A(I,J+1)) + (1-W) * A(I,J)
-         EPS = MAX (EPS, ABS(S - A(I,J)))
-21    CONTINUE
-3     CONTINUE
-      PRINT 200, IT, EPS
-200   FORMAT(' IT = ',I4, '   EPS = ', E14.7)
-      IF (EPS.LT.MAXEXP) GO TO 4
-2     CONTINUE
-4     OPEN (3, FILE='REDBF.DAT', FORM='FORMATTED',STATUS='UNKNOWN')
-      WRITE (3,*)   A
-      CLOSE (3)
-      END
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/redbh.hpf b/projects/dvm_svn/fdvm/trunk/examples/redbh.hpf
deleted file mode 100644
index 658fddb..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/redbh.hpf
+++ /dev/null
@@ -1,53 +0,0 @@
-       PROGRAM REDBH
-       PARAMETER (N1 = 20,N2 = 10)
-       REAL  A(N1,N2),W
-       INTEGER  ITMAX
-!HPF$  DISTRIBUTE  (BLOCK,BLOCK) :: A
-       ITMAX = 20
-       W = 0.5
-!HPF$  INDEPENDENT 
-       DO 1 J = 1,N2
-!HPF$     INDEPENDENT
-          DO 1 I = 1,N1
-             IF (I.EQ.J) THEN 
-                A(I,J) = N1+2
-               ELSE
-                A(I,J) = (-(1.))
-             ENDIF
-1       CONTINUE
-       DO 2 IT = 1,ITMAX
-!HPF$  INDEPENDENT  
-       DO 21 J = 1,N2/2-1
-!HPF$     INDEPENDENT
-          DO 21 I = 1,N1/2-1
-             A(2*I+1,2*J+1) = W/4*(A(2*I,2*J+1)+A(2*I+2,2*J+1)+ 
-     +       A(2*I+1,2*J)+A(2*I+1,2*J+2))+(1-W)*A(2*I+1,2*J+1)
-21        CONTINUE
-!HPF$  INDEPENDENT  
-       DO 22 J = 1, N2/2-1
-!HPF$     INDEPENDENT
-          DO 22 I = 1,N1/2-1
-             A(2*I,2*J) = W/4*(A(2*I-1,2*J)+A(2*I+1,2*J)+A(2*I,2*J-1)+ 
-     +       A(2*I,2*J+1))+(1-W)*A(2*I,2*J)
-22        CONTINUE
-!HPF$  INDEPENDENT 
-       DO 23 J = 1,N2/2-1
-!HPF$     INDEPENDENT
-          DO 23 I = 1,N1/2-1
-             A(2*I,2*J+1) = W/4*(A(2*I-1,2*J+1)+A(2*I+1,2*J+1)+
-     +       A(2*I,2*J)+A(2*I,2*J+2))+(1-W)*A(2*I,2*J+1)
-23        CONTINUE
-!HPF$  INDEPENDENT 
-       DO 24 J = 1,N2/2-1
-!HPF$     INDEPENDENT
-          DO 24 I = 1,N1/2-1
-             A(2*I+1,2*J) = W/4*(A(2*I,2*J)+A(2*I+2,2*J)+A(2*I+1,2*J-1)+
-     +       A(2*I+1,2*J+1))+(1-W)*A(2*I+1,2*J)
-24        CONTINUE
-       PRINT *,'IT= ',IT
-2      CONTINUE
-       OPEN (3, FILE='REDBH.DAT', FORM='FORMATTED',STATUS='UNKNOWN')
-       WRITE (3,*)   A
-       CLOSE (3)
-       END
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/sor.fdv b/projects/dvm_svn/fdvm/trunk/examples/sor.fdv
deleted file mode 100644
index e48588b..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/sor.fdv
+++ /dev/null
@@ -1,38 +0,0 @@
-	PROGRAM  SOR
-	PARAMETER  ( N = 10 )
-	REAL   A( N, N ),  EPS,  MAXEPS, W
-	INTEGER   ITMAX
-*DVM$	DISTRIBUTE     A  ( BLOCK,  BLOCK )  
-        PRINT *,  '**********  TEST_SOR   **********'
-	ITMAX=20
-	MAXEPS = 0.5E - 5
-	W = 0.5
-*DVM$	PARALLEL   ( J, I )  ON  A( I, J )
-	DO  1  J = 1, N
-	DO  1  I = 1, N
-		IF ( I .EQ.J)   THEN
-		     A( I, J ) = N + 2
-		ELSE
-		     A( I, J ) = -1.0
-		ENDIF 
-1	CONTINUE
-	DO  2   IT = 1, ITMAX
-		EPS = 0.
-*DVM$   PARALLEL  ( J, I)   ON  A( I,  J),  NEW (S),  
-*DVM$*  REDUCTION ( MAX( EPS )), ACROSS  (A(1:1,1:1))
-
-	DO  21   J = 2, N-1
-	DO  21   I = 2, N-1
-		S = A( I, J )
-		A( I, J ) = (W / 4) * (A( I-1, J ) + A( I+1, J ) + A( I, J-1 ) +
-     *		A( I, J+1 )) + ( 1-W ) * A( I, J)
-	EPS = MAX ( EPS,  ABS( S - A( I, J )))
-21	CONTINUE
-	PRINT 200,  IT, EPS
-200     FORMAT(' IT = ',I4, '   EPS = ', E14.7)
-	IF    (EPS  .LT.  MAXEPS )     GO TO   4
-2	CONTINUE
-4       OPEN (3, FILE='SOR.DAT', FORM='FORMATTED',STATUS='UNKNOWN')
-        WRITE (3,*)   A
-        CLOSE (3)
-	END
diff --git a/projects/dvm_svn/fdvm/trunk/examples/task2j.fdv b/projects/dvm_svn/fdvm/trunk/examples/task2j.fdv
deleted file mode 100644
index 63ce6b5..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/task2j.fdv
+++ /dev/null
@@ -1,130 +0,0 @@
-        PROGRAM    TASK2J
-        PARAMETER    (L=8,  ITMAX=20)
-        REAL     A(L,L), EPS,EPS1, MAXEPS, B(L,L),A1(L,L),B1(L,L)
-        INTEGER LP(2),HP(2)
-CDVM$   PROCESSORS    P(NUMBER_OF_PROCESSORS())
-CDVM$	TASK  MB( 2 )
-CDVM$	ALIGN   B1( I, J ) WITH  A1( I, J ) 
-CDVM$	ALIGN   B ( I, J ) WITH  A ( I, J ) 
-CDVM$	DISTRIBUTE  ::  A, A1
-        PRINT *,  '**********  TEST_TASK2J   ***********'
-        CALL DPT(LP,HP,2)
-CDVM$	MAP  MB( 1 )  ONTO  P( LP( 1) : HP(1))
-CDVM$	REDISTRIBUTE  A ( *, BLOCK )  ONTO  MB( 1 )
-CDVM$	MAP  MB( 2 )   ONTO  P( LP(2) : HP(2) )
-CDVM$	REDISTRIBUTE  A1( *, BLOCK )  ONTO  MB( 2 )
-        MAXEPS  =  0.5E - 7
-CDVM$	TASK_REGION MB
-CDVM$	ON   MB( 1 )
-CDVM$   PARALLEL    (J,I)   ON   A(I, J)
-C		nest of two parallel loops, iteration (i,j) will be executed on 
-C		processor, which is owner of element A(i,j) 
-            DO  1   J  =  1, L
-            DO  1   I  =  1, L
-                A(I,  J)  =  0.
-                IF(I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.L .OR. J.EQ.L) THEN
-                      B(I,  J) = 0.
-                ELSE
-                      B(I,  J)  = ( 1. + I + J )
-                ENDIF
-    1       CONTINUE
-        DO  2   IT  =  1,  ITMAX
-                  EPS  =  0.
-CDVM$   PARALLEL  (J,  I)   ON  A(I,  J),  REDUCTION ( MAX( EPS ))
-C		variable EPS is used for calculation of maximum value
-                  DO  21  J  =  2, L-1
-                  DO  21  I  =  2, L-1
-                         EPS = MAX ( EPS,  ABS( B( I, J)  -  A( I, J)))
-                         A(I, J)  =  B(I, J)
-  21              CONTINUE
-CDVM$   PARALLEL  (J,  I)   ON  B(I,  J),   SHADOW_RENEW   (A)
-C		Copying shadow elements of array A from 
-C		neighbouring processors before loop execution
-                  DO  22  J = 2,  L-1
-                  DO  22  I = 2,  L-1
-        B(I, J) =  (A( I-1, J ) + A( I, J-1 ) + A( I+1, J)+
-     *                        A( I, J+1 )) / 4
-   22             CONTINUE
-                  IF ( EPS . LT . MAXEPS )    GO TO   3
-    2   CONTINUE
-    3   OPEN  (1, FILE='JACOBI1.DAT',FORM='FORMATTED',STATUS='UNKNOWN')
-        WRITE (1,200) IT, EPS  
-200     FORMAT(' IT = ',I4, '   EPS = ', E14.7)
-        CLOSE (1)
-CDVM$ END ON
-CDVM$	ON   MB( 2 )
-CDVM$   PARALLEL    (J,I)   ON   A1(I, J)
-C		nest of two parallel loops, iteration (i,j) will be executed on 
-C		processor, which is owner of element A1(i,j) 
-            DO  19   J  =  1, L
-            DO  19   I  =  1, L
-                A1(I,  J)  =  0.
-                IF(I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.L .OR. J.EQ.L) THEN
-                      B1(I,  J) = 0.
-                ELSE
-                      B1(I,  J)  = ( 1. + I + J )
-                ENDIF
-   19       CONTINUE
-        DO  29   IT  =  1,  ITMAX
-                  EPS1  =  0.
-CDVM$   PARALLEL  (J,  I)   ON  A1(I,  J),  REDUCTION ( MAX( EPS1 ))
-C		variable EPS1 is used for calculation of maximum value
-                  DO  219  J  =  2, L-1
-                  DO  219  I  =  2, L-1
-                   EPS1 = MAX ( EPS1,  ABS( B1( I, J)  -  A1( I, J)))
-                   A1(I, J)  =  B1(I, J)
-  219             CONTINUE
-CDVM$   PARALLEL  (J,  I)   ON  B1(I,  J),   SHADOW_RENEW   (A1)
-C		Copying shadow elements of array A1 from 
-C		neighbouring processors before loop execution
-                  DO  229  J = 2,  L-1
-                  DO  229  I = 2,  L-1
-        B1(I, J) =  (A1( I-1, J ) + A1( I, J-1 ) + A1(I+1, J)+
-     *                        A1( I, J+1 )) / 4
-  229            CONTINUE
-                 IF ( EPS1 . LT . MAXEPS )    GO TO   39
-   29   CONTINUE 
-   39   OPEN  (2, FILE='JACOBI2.DAT',FORM='FORMATTED',STATUS='UNKNOWN')
-        WRITE (2,200) IT,  EPS1  
-        CLOSE (2)
-CDVM$	END ON
-CDVM$	END  TASK_REGION
-        PRINT *, ' B'
-        PRINT *,   B
-        PRINT *,  ' '
-        PRINT *, ' B1'
-        PRINT *,   B1
-        END
-
-       SUBROUTINE DPT(LP,HP,NT)
-C     distributing processors for NT tasks (NT = 2)      
-      INTEGER LP(2), HP(2)
-      NUMBER_OF_PROCESSORS() = 1
-CDVM$ DEBUG 1 (D = 0)
-      NP = NUMBER_OF_PROCESSORS()
-      NTP = NP/NT
-      IF(NP.EQ.1) THEN
-         LP(1) = 1
-         HP(1) = 1
-         LP(2) = 1
-         HP(2) = 1
-      ELSE
-         LP(1) = 1
-         HP(1) = NTP
-         LP(2) = NTP+1
-         HP(2) = NP
-      END IF
-CDVM$ ENDDEBUG 1
-      END
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/tasks.fdv b/projects/dvm_svn/fdvm/trunk/examples/tasks.fdv
deleted file mode 100644
index dbfe9eb..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/tasks.fdv
+++ /dev/null
@@ -1,126 +0,0 @@
-	PROGRAM    TASKS
-C	rectangular grid is distributed on two blocks
-C
-C	
-	PARAMETER    (K=8,  N1 = 4,  ITMAX=20, N2 = K - N1 )
-CDVM$	PROCESSORS    P(NUMBER_OF_PROCESSORS( ))
-	REAL     A1(N1+1,K), A2(N2+1,K), B1(N1+1,K), B2(N2+1,K)
-        INTEGER LP(2),HP(2) 
-CDVM$	TASK  MB( 2 )
-CDVM$	ALIGN   B1( I, J )  WITH  A1( I, J ) 
-CDVM$	ALIGN   B2( I, J )  WITH  A2( I, J ) 
-CDVM$	DISTRIBUTE  ::  A1, A2 
-CDVM$	REMOTE_GROUP  BOUND
-        PRINT *,  '**********  TEST_TASKS   **********'
-        CALL DPT(LP,HP,2)
-CDVM$	MAP  MB( 1 )  ONTO  P( LP(1) : HP(1))
-CDVM$	REDISTRIBUTE  A1( *, BLOCK )  ONTO  MB( 1 )
-CDVM$	MAP  MB( 2 )  ONTO  P( LP(2) : HP(2))
-CDVM$	REDISTRIBUTE  A2( *, BLOCK )  ONTO  MB( 2 )
-C		Initialization
-CDVM$	PARALLEL    ( J, I )   ON   A1(I, J)
-	DO  10   J  =  1, K
-	DO  10   I  =  1, N1
-		IF(I.EQ.1 .OR. J.EQ.1 .OR. J.EQ.K) THEN
-			A1(I, J) = 0.
-			B1(I, J) = 0.
-		ELSE
-			B1(I, J)  = 1. + I + J 
-			A1(I, J) = B1(I, J)
-		ENDIF
-10	CONTINUE
-CDVM$	PARALLEL    ( J, I )   ON   A2(I, J)
-	DO  20   J  =  1, K
-	DO  20   I  =  2, N2+1
-		IF(I.EQ.N2+1 .OR. J.EQ.1 .OR. J.EQ.K) THEN
-			A2(I, J) = 0.
-			B2(I, J) = 0.
-		ELSE
-			B2(I, J)  = 1. + (I+N1-1) + J 
-			A2(I, J) = B2(I, J)
-		ENDIF
-20	CONTINUE
-	DO  2   IT  =  1, ITMAX
-CDVM$	PREFETCH   BOUND
-C		exchange bounds
-CDVM$	PARALLEL    ( J )   ON   A1(N1+1, J),
-CDVM$*  REMOTE_ACCESS  (BOUND : B2( 2, J ) )
-	DO  30   J  =  1, K
-30		A1(N1+1, J) = B2(2, J)
-CDVM$	PARALLEL    ( J )   ON   A2( 1, J),
-CDVM$*  REMOTE_ACCESS  (BOUND : B1( N1, J ) )
-	DO  40   J  =  1, K
-40		A2(1, J) = B1(N1, J)
-CDVM$	TASK_REGION MB
-CDVM$	ON   MB( 1 )
-CDVM$	PARALLEL    ( J, I )   ON   B1(I, J),
-CDVM$*  SHADOW_RENEW ( A1 )
-	DO  50   J  =  2, K-1
-	DO  50   I  =  2, N1
-50	B1(I, J)=(A1(I-1, J) + A1(I,J-1) + A1(I+1,J) + A1(I,J+1))/4
-CDVM$	PARALLEL    ( J, I )   ON   A1(I, J)
-	DO  60   J  =  2, K-1
-	DO  60   I  =  2, N1
-60		A1(I, J) =  B1( I, J )
-CDVM$	END ON
-CDVM$	ON   MB( 2 )
-CDVM$	PARALLEL    ( J, I )   ON   B2(I, J),
-CDVM$*  SHADOW_RENEW ( A2 )
-	DO  70   J  =  2, K-1
-	DO  70   I  =  2, N2
-70	B2(I,J) = (A2(I-1,J) + A2(I,J-1) + A2(I+1,J) + A2(I,J+1))/4
-CDVM$	PARALLEL    ( J, I )   ON   A2(I, J)
-	DO  80   J  =  2, K-1
-	DO  80   I  =  2, N2
-80		A2(I, J) =  B2( I, J )
-CDVM$	END ON
-CDVM$	END  TASK_REGION
-2	CONTINUE
-        PRINT *,  'A1'
-        PRINT *,   A1
-        PRINT *,  ' '
-        PRINT *,  'A2'
-        PRINT *,   A2
-	END
-
-      SUBROUTINE DPT(LP,HP,NT)
-C     distributing processors for NT tasks (NT = 2)      
-      INTEGER LP(2), HP(2)
-      NUMBER_OF_PROCESSORS() = 1
-CDVM$ DEBUG 1 (D = 0)
-      NP = NUMBER_OF_PROCESSORS()
-      NTP = NP/NT
-      IF(NP.EQ.1) THEN
-         LP(1) = 1
-         HP(1) = 1
-         LP(2) = 1
-         HP(2) = 1
-      ELSE
-         LP(1) = 1
-         HP(1) = NTP
-         LP(2) = NTP+1
-         HP(2) = NP
-      END IF
-CDVM$ ENDDEBUG 1
-      END
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/examples/taskst.fdv b/projects/dvm_svn/fdvm/trunk/examples/taskst.fdv
deleted file mode 100644
index 13adf47..0000000
--- a/projects/dvm_svn/fdvm/trunk/examples/taskst.fdv
+++ /dev/null
@@ -1,169 +0,0 @@
-	PROGRAM    TASKST
-C	rectangular grid is distributed on two blocks
-C
-C	
-	PARAMETER    (K=8,  N1 = 4,  ITMAX=20, N2 = K - N1 )
-CDVM$	PROCESSORS    P(NUMBER_OF_PROCESSORS( ))
-	REAL     A1(N1+1,K), A2(N2+1,K), B1(N1+1,K), B2(N2+1,K) 
-        REAL A(K,K), B(K,K)
-        INTEGER LP(2),HP(2)
-CDVM$	TASK  MB( 2 )
-CDVM$	DISTRIBUTE   A(*,BLOCK) ONTO P
-CDVM$	ALIGN   B( I, J )  WITH  A( I, J )
-CDVM$	ALIGN   B1( I, J )  WITH  A1( I, J ) 
-CDVM$	ALIGN   B2( I, J )  WITH  A2( I, J ) 
-CDVM$	DISTRIBUTE  ::  A1, A2 
-CDVM$	REMOTE_GROUP  BOUND
-        PRINT *,  '**********  TEST_TASKS_T  **********'
-        CALL DPT(LP,HP,2)
-CDVM$	MAP  MB( 1 )  ONTO  P( LP(1) : HP(1) )
-CDVM$	REDISTRIBUTE  A1( *, BLOCK )  ONTO  MB( 1 )
-CDVM$	MAP  MB( 2 )   ONTO  P( LP(2) : HP(2) )
-CDVM$	REDISTRIBUTE  A2( *, BLOCK )  ONTO  MB( 2 )
-C		Initialization
-CDVM$	PARALLEL    ( J, I )   ON   A1(I, J)
-	DO  10   J  =  1, K
-	DO  10   I  =  1, N1
-		IF(I.EQ.1 .OR. J.EQ.1 .OR. J.EQ.K) THEN
-			A1(I, J) = 0.
-			B1(I, J) = 0.
-		ELSE
-			B1(I, J)  = 1. + I + J 
-			A1(I, J) = B1(I, J)
-		ENDIF
-10	CONTINUE
-CDVM$	PARALLEL    ( J, I )   ON   A2(I, J)
-	DO  20   J  =  1, K
-	DO  20   I  =  2, N2+1
-		IF(I.EQ.N2+1 .OR. J.EQ.1 .OR. J.EQ.K) THEN
-			A2(I, J) = 0.
-			B2(I, J) = 0.
-		ELSE
-			B2(I, J)  = 1. + (I+N1-1) + J 
-			A2(I, J) = B2(I, J)
-		ENDIF
-20	CONTINUE
-      
-	DO  2   IT  =  1, ITMAX
-CDVM$	PREFETCH   BOUND
-C		exchange bounds
-CDVM$	PARALLEL    ( J )   ON   A1(N1+1, J),
-CDVM$*  REMOTE_ACCESS  (BOUND : B2( 2, J ) )
-	DO  30   J  =  1, K
-30		A1(N1+1, J) = B2(2, J)
-CDVM$	PARALLEL    ( J )   ON   A2( 1, J),
-CDVM$*  REMOTE_ACCESS  (BOUND : B1( N1, J ) )
-	DO  40   J  =  1, K
-40		A2(1, J) = B1(N1, J)
-CDVM$	TASK_REGION MB
-CDVM$	ON   MB( 1 )
-CDVM$	PARALLEL    ( J, I )   ON   B1(I, J),
-CDVM$*  SHADOW_RENEW ( A1 )
-	DO  50   J  =  2, K-1
-	DO  50   I  =  2, N1
-50	B1(I, J)=(A1(I-1, J) + A1(I,J-1) + A1(I+1,J) + A1(I,J+1))/4
-CDVM$	PARALLEL    ( J, I )   ON   A1(I, J)
-	DO  60   J  =  2, K-1
-	DO  60   I  =  2, N1
-60		A1(I, J) =  B1( I, J )
-CDVM$	END ON
-CDVM$	ON   MB( 2 )
-CDVM$	PARALLEL    ( J, I )   ON   B2(I, J),
-CDVM$*  SHADOW_RENEW ( A2 )
-	DO  70   J  =  2, K-1
-	DO  70   I  =  2, N2
-70	B2(I,J) = (A2(I-1,J) + A2(I,J-1) + A2(I+1,J) + A2(I,J+1))/4
-CDVM$	PARALLEL    ( J, I )   ON   A2(I, J)
-	DO  80   J  =  2, K-1
-	DO  80   I  =  2, N2
-80		A2(I, J) =  B2( I, J )
-CDVM$	END ON
-CDVM$	END  TASK_REGION
-2	CONTINUE
-  
-C 1-task JACOBI       
-CDVM$   PARALLEL    (J,I)   ON   A(I, J)
-C		nest of two parallel loops, iteration (i,j) will be executed on 
-C		processor, which is owner of element A(i,j) 
-            DO  1   J  =  1, K
-            DO  1   I  =  1, K
-                A(I,  J)  =  0.
-                IF(I.EQ.1 .OR. J.EQ.1 .OR. I.EQ.K .OR. J.EQ.K) THEN
-                      B(I,  J) = 0.
-                ELSE
-                      B(I,  J)  = ( 1. + I + J )
-                ENDIF
-    1       CONTINUE
-        DO  3   IT  =  1,  ITMAX
-CDVM$   PARALLEL  (J,  I)   ON  A(I,  J)
-C		variable EPS is used for calculation of maximum value
-                  DO  21  J  =  2, K-1
-                  DO  21  I  =  2, K-1
-                         A(I, J)  =  B(I, J)
-   21             CONTINUE
-CDVM$   PARALLEL  (J,  I)   ON  B(I,  J),   SHADOW_RENEW   (A)
-C		Copying shadow elements of array A from 
-C		neighbouring processors before loop execution
-                  DO  22  J = 2,  K-1
-                  DO  22  I = 2,  K-1
-        B(I, J) =  (A( I-1, J ) + A( I, J-1 ) + A( I+1, J)+
-     *                        A( I, J+1 )) / 4
-   22             CONTINUE
- 
-    3   CONTINUE 
-C   compare 2-task JACOBI with 1-task JACOBI
-CDVM$ PARALLEL (I,J)  ON B1(I,J),REMOTE_ACCESS (B(I,J))
-      DO 11  I = 2,N1
-      DO 11  J = 2, K-1
-      IF(B1(I,J).NE.B(I,J)) THEN
-         PRINT *, 'error B1(',I,',',J,')'
-         STOP
-      ENDIF 
-  11  CONTINUE 
-CDVM$ PARALLEL (I,J)  ON B2(I,J),REMOTE_ACCESS (B(I+(N1-1),J))
-      DO 12  I = 2,N2
-      DO 12  J = 2, K-1
-      IF(B2(I,J).NE.B(I+(N1-1),J)) THEN
-         PRINT *, 'error B2(',I,',',J,')','B(',I+N1-1,',',J,')'
-         STOP
-      ENDIF 
-  12  CONTINUE 
-      PRINT *, '--- DONE ---'
-	END
-
-      SUBROUTINE DPT(LP,HP,NT)
-C     distributing processors for NT tasks (NT = 2)      
-      INTEGER LP(2), HP(2)
-      NUMBER_OF_PROCESSORS() = 1
-CDVM$ DEBUG 1 (D = 0)
-      NP = NUMBER_OF_PROCESSORS()
-      NTP = NP/NT
-      IF(NP.EQ.1) THEN
-         LP(1) = 1
-         HP(1) = 1
-         LP(2) = 1
-         HP(2) = 1
-      ELSE
-         LP(1) = 1
-         HP(1) = NTP
-         LP(2) = NTP+1
-         HP(2) = NP
-      END IF
-CDVM$ ENDDEBUG 1
-      END
-     
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/fdvm/CMakeLists.txt
deleted file mode 100644
index 43e37a2..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/CMakeLists.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-set(FDVM_SOURCES acc.cpp acc_across.cpp acc_across_analyzer.cpp acc_analyzer.cpp
-  acc_data.cpp acc_f2c.cpp acc_f2c_handlers.cpp acc_rtc.cpp acc_utilities.cpp
-  aks_analyzeLoops.cpp aks_structs.cpp calls.cpp checkpoint.cpp debug.cpp
-  dvm.cpp funcall.cpp help.cpp hpf.cpp io.cpp omp.cpp ompdebug.cpp parloop.cpp
-  stmt.cpp)
-
-if(MSVC_IDE)
-  file(GLOB_RECURSE FDVM_HEADERS RELATIVE
-    ${CMAKE_CURRENT_SOURCE_DIR} *.h)
-  foreach(DIR ${DVM_FORTRAN_INCLUDE_DIRS})
-    file(GLOB_RECURSE FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${DIR}/*.h")
-    set(FDVM_HEADERS ${FDVM_HEADERS} ${FILES})
-  endforeach()
-endif()
-
-add_executable(f_dvm ${FDVM_SOURCES} ${FDVM_HEADERS})
-
-add_dependencies(f_dvm db sage sage++)
-target_link_libraries(f_dvm db sage sage++)
-target_compile_definitions(f_dvm PRIVATE SYS5)
-target_include_directories(f_dvm PRIVATE "${DVM_FORTRAN_INCLUDE_DIRS}")
-set_target_properties(f_dvm PROPERTIES
-  FOLDER "${DVM_TOOL_FOLDER}"
-  RUNTIME_OUTPUT_DIRECTORY ${DVM_BIN_DIR}
-  COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>
-  PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>
-)
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/Makefile b/projects/dvm_svn/fdvm/trunk/fdvm/Makefile
deleted file mode 100644
index eb78df4..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/Makefile
+++ /dev/null
@@ -1,158 +0,0 @@
-#echo#######################################################################
-# Makefile for   Fortran DVM back-end
-#
-#echo#######################################################################
-SAGEROOT =../Sage
-CONFIG_ARCH=iris4d
-LIBDIR = ../libsage
-#LIBDIR = $(SAGEROOT)/lib/$(CONFIG_ARCH)
-#LIBDIR1 =/usr/people/podd/oldsrc
-LIBDIR1 = $(LIBDIR)
-LIBINCLUDE = $(SAGEROOT)/lib/include
-HINCLUDE = $(SAGEROOT)/h
-DVMINCLUDE = ../include
-INSTALLDEST = ../bin
-INSTALL = /bin/cp
-
-
-#HP-ALLOCA#LDLIBS  = -lPW#ENDIF#
-#HP_CFLAGS#CEXTRA = -Aa#ENDIF#
-
-CC = gcc
-#USE_CC#CC=cc#ENDIF#
-
-#CXX = DCC
-CXX = g++
-#USE_CFRONT#CXX=CC#ENDIF#
-
-LOADER = $(CXX)
-
-INCLUDE = -I. -I$(LIBINCLUDE) -I$(HINCLUDE) -I$(DVMINCLUDE)
-
-#CFLAGS	= $(INCLUDE) -Wall -c # $(CEXTRA)
-CFLAGS	= $(INCLUDE) -Wall -g -c # $(CEXTRA)
-LDFLAGS	= 
-
-LIBS = $(LIBDIR)/libSage++.a $(LIBDIR)/libsage.a $(LIBDIR)/libdb.a 
-DVM = f_dvm
-OBGS = dvm.o funcall.o stmt.o io.o help.o debug.o hpf.o omp.o ompdebug.o acc.o acc_analyzer.o acc_across_analyzer.o calls.o acc_f2c.o acc_f2c_handlers.o acc_across.o aks_structs.o aks_analyzeLoops.o acc_data.o acc_rtc.o acc_utilities.o parloop.o checkpoint.o
-# ***********************************************************
-f: DVM
-
-install: $(INSTALLDEST)/DVM
-
-DVM: $(OBGS) 
-	$(LOADER) $(LDFLAGS) $(OBGS)  $(LIBS) -o $(DVM)
-
-acc.o: acc.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc.cpp
-	
-acc_across.o: acc_across.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/aks_structs.h
-	$(CXX) $(CFLAGS) acc_across.cpp
-
-acc_across_analyzer.o: acc_across_analyzer.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/acc_across_analyzer.h
-	$(CXX) $(CFLAGS) acc_across_analyzer.cpp
-
-acc_analyzer.o: acc_analyzer.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/acc_analyzer.h
-	$(CXX) $(CFLAGS) acc_analyzer.cpp
-
-acc_data.o: acc_data.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc_data.cpp
-
-acc_f2c.o: acc_f2c.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc_f2c.cpp
-
-acc_f2c_handlers.o: acc_f2c_handlers.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc_f2c_handlers.cpp
-
-acc_rtc.o: acc_rtc.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc_rtc.cpp
-		
-acc_utilities.o: acc_utilities.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc_utilities.cpp
-	
-aks_analyzeLoops.o: aks_analyzeLoops.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/aks_structs.h
-	$(CXX) $(CFLAGS) aks_analyzeLoops.cpp	
-	
-aks_structs.o: aks_structs.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/aks_structs.h
-	$(CXX) $(CFLAGS) aks_structs.cpp
-
-calls.o: calls.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) calls.cpp
-
-checkpoint.o: checkpoint.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) checkpoint.cpp
-	
-debug.o: debug.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) debug.cpp
-	
-dvm.o: dvm.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) dvm.cpp
-	
-funcall.o: funcall.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) funcall.cpp
-
-help.o: help.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) help.cpp
-
-hpf.o: hpf.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) hpf.cpp
-
-io.o: io.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) io.cpp
-	
-omp.o: omp.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) omp.cpp
-
-ompdebug.o: ompdebug.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) ompdebug.cpp
-
-parloop.o: parloop.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) parloop.cpp
-
-stmt.o: stmt.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) stmt.cpp
-
-
-
-$(INSTALLDEST)/DVM: DVM
-		@echo Installing $(DVM) in $(INSTALLDEST)
-		if [ -d $(INSTALLDEST) ] ; then true; \
-                   else mkdir $(INSTALLDEST) ;fi
-		$(INSTALL) $(DVM) $(INSTALLDEST)
-test: tdvm.o
-
-tdvm.o: tdvm.cpp
-	$(CXX) -g -c tdvm.cpp 
-
-clean:
-	/bin/rm -f *.o *.dep $(DVM)
-
-cleaninstall:
-	/bin/rm -f *.o $(DVM)
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc.cpp
deleted file mode 100644
index 5762e0a..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc.cpp
+++ /dev/null
@@ -1,15256 +0,0 @@
-/*********************************************************************/
-/*  Fortran DVM+OpenMP+ACC                                           */
-/*                                                                   */
-/*                   ACC Directive Processing                        */
-/*********************************************************************/
-#include "acc_data.h"
-
-#define Nintent 6
-#define DELTA 3
-#define Nhandler 3
-#define SAVE_LABEL_ID 1
-
-extern int opt_base;
-extern fragment_list *cur_fragment;
-local_part_list *lpart_list;
-
-static int dvmh_targets, has_io_stmt;
-static int targets[Ndev];
-static int has_region, in_arg_list, analyzing, has_max_minloc, for_shadow_compute, private_array_arg;
-//static char *fname_gpu;
-
-static SgStatement *cur_in_block, *cur_in_source, *mod_gpu_end;
-static SgStatement *call_kernel;
-static SgExpression *dvm_array_list, *do_st_list, *indexing_info_list, *acc_declared_list;
-static SgExpression *argument_list, *base_mem_list, *coeff_list, *gpu_coeff_list, *registered_uses_list;
-static SgExpression *red_var_list, *formal_red_offset_list, *red_offset_list, *copy_uses_list;
-static SgConstantSymb *device_const[Ndev], *const_LONG, *intent_const[Nintent], *handler_const[Nhandler];
-static SgSymbol *red_offset_symb, *sync_proc_symb, *mem_use_loc_array[8];
-static SgSymbol *adapter_symb, *hostproc_symb, *s_offset_type, *s_of_cudaindex_type;
-static symb_list *acc_func_list, *acc_registered_list, *non_dvm_list, *parallel_on_list, *tie_list;
-static symb_list *assigned_var_list, *range_index_list, *acc_array_list_whole;
-static SgSymbol *Imem_k, *Rmem_k, *Dmem_k, *Cmem_k, *DCmem_k, *Lmem_k, *Chmem_k;
-static SgSymbol *fdim3;
-static SgSymbol *s_ibof, *s_CudaIndexType_k, *s_warpsize, *s_blockDims;
-static SgSymbol *s_rest_blocks, *s_cur_blocks, *s_add_blocks, *s_begin[MAX_LOOP_LEVEL];
-static SgSymbol *s_end[MAX_LOOP_LEVEL], *s_blocksS_k[MAX_LOOP_LEVEL], *s_loopStep[MAX_LOOP_LEVEL];
-static SgType *type_DvmType, *type_CudaIndexType, *type_with_len_DvmType, *type_FortranDvmType, *CudaIndexType_k;
-static int loopIndexCount;
-
-
-//------ C ----------
-static const char *red_kernel_func_names[] = {
-    NULL,
-    "__dvmh_blockReduceSum", "__dvmh_blockReduceProd",
-    "__dvmh_blockReduceMax", "__dvmh_blockReduceMin",
-    "__dvmh_blockReduceAND", "__dvmh_blockReduceOR",
-    "__dvmh_blockReduceNEQ", "__dvmh_blockReduceEQ",
-    "__dvmh_blockReduceMaxLoc", "__dvmh_blockReduceMinLoc",
-    "__dvmh_blockReduceSumN", "__dvmh_blockReduceProdN",
-    "__dvmh_blockReduceMaxN", "__dvmh_blockReduceMinN",
-    "__dvmh_blockReduceANDN", "__dvmh_blockReduceORN",
-    "__dvmh_blockReduceNEQN", "__dvmh_blockReduceEQN"
-};
-static const char *fermiPreprocDir = "CUDA_FERMI_ARCH";
-static SgSymbol *s_CudaIndexType, *s_CudaOffsetTypeRef, *s_DvmType;
-static SgStatement *end_block, *end_info_block;
-
-reduction_operation_list *red_struct_list;
-symb_list *shared_list, *acc_call_list, *by_value_list;
-
-void InitializeACC()
-{
-    mod_gpu_symb = NULL;
-    mod_gpu = NULL;
-    block_C = NULL;
-    info_block = NULL;
-    //fname_gpu = filenameACC();
-    t_dim3 = Type_dim3();
-    s_threadidx = s_blockidx = s_blockdim = s_griddim = s_warpsize = NULL;
-    s_ibof = NULL;
-    s_blockDims = NULL;
-    sync_proc_symb = NULL;
-    acc_array_list = NULL;
-    cur_in_source = NULL;
-    kernel_st = NULL;
-    in_arg_list = 0;
-    shared_list = NULL;
-    fdim3 = new SgSymbol(FUNCTION_NAME, "dim3", *(current_file->firstStatement()));
-    RGname_list = NULL;
-    type_DvmType = NULL;
-    type_FortranDvmType = NULL;
-    type_CudaIndexType = NULL;
-    type_with_len_DvmType = NULL;
-    declaration_cmnt = NULL;
-    indexType_int = indexType_long = indexType_llong = NULL;
-    dvmh_targets = options.isOn(NO_CUDA) ? HOST_DEVICE : HOST_DEVICE | CUDA_DEVICE;
-    private_array_class = new SgSymbol(TYPE_NAME, "PrivateArray", *(current_file->firstStatement()));
-
-    SpecialSymbols.insert(std::pair<char, const char*>('\n', "\\n\"\n\""));
-    SpecialSymbols.insert(std::pair<char, const char*>('"', "\\\""));
-    SpecialSymbols.insert(std::pair<char, const char*>('\\', "\\\\"));
-
-    InitializeAcrossACC();
-}
-
-char *filenameACC()
-{
-    char *name;
-    int i;
-    name = (char *)malloc((unsigned)(strlen(fin_name) + 1));
-
-    strcpy(name, fin_name);
-    for (i = strlen(name) - 1; i >= 0; i--)
-    {
-        if (name[i] == '.')
-        {
-            name[i] = '\0';
-            break;
-        }
-    }
-    return(name);
-}
-
-char *filename_short(SgStatement *st)
-{
-    char *name;
-    int i;
-    name = (char *)malloc((unsigned)(strlen(st->fileName()) + 1));
-    strcpy(name, st->fileName());
-
-    for (i = strlen(name) - 1; i >= 0; i--)
-    {
-        if (name[i] == '/' || name[i] == '\\')
-        {
-            name = &name[i + 1];
-            break;
-        }
-    }
-    int l = strlen(name);
-    for (i = 0; i < l; i++)
-    {
-        if (name[i] == '.')
-        {
-            name[i] = '\0';
-            break;
-        }
-    }
-    for (i = strlen(name) - 1; i >= 0; i--)
-    {
-        if (isupper(name[i]))
-            name[i] = tolower(name[i]);
-    }
-
-    l = strlen(name);
-    for (int i = 0; i < l; i++) 
-    {
-        char c = name[i];
-        if (!( (c >= 'a' && c <= 'z') || c == '_' || ( c >= '0' && c <= '9') ))
-            name[i] = '_';
-    }
-
-    return(name);
-}
-
-char *ChangeFtoCuf(const char *fout_name)
-{
-    char *name;
-    int i;
-
-    name = (char *)malloc((unsigned)(strlen(fout_name) + 4 + 13 + 1));
-    strcpy(name, fout_name);
-    for (i = strlen(name) - 1; i >= 0; i--)
-    {
-        /*    if ( name[i] == '.' )
-            {  name[i+1] = 'c';
-            name[i+2] = 'u';
-            name[i+3] = 'f';
-            name[i+4] = '\0';
-            break;
-            }
-            */
-        if (name[i] == '.')
-            break;
-    }
-    strcpy(name + i, "_cuda_kernels.cuf");
-    return(name);
-}
-
-char *ChangeFto_C_Cu(const char *fout_name)
-{
-    char *name;
-    int i;
-
-    name = (char *)malloc((unsigned)(strlen(fout_name) + 3 + 14 + 1));
-    strcpy(name, fout_name);
-    for (i = strlen(name) - 1; i >= 0; i--)
-    {    /*
-           if ( name[i] == '.' )
-           {  name[i+1] = 'c';
-           name[i+2] = 'u';
-           name[i+3] = '\0';
-           break;
-           }
-           */
-        if (name[i] == '.')
-        {
-            name[i] = '\0';
-            break;
-        }
-    }
-    //sprintf(name[i],"%s_cuda_handlers.cu",name);
-    if (options.isOn(C_CUDA))
-        strcpy(name + i, "_cuda.cu");
-    else
-        strcpy(name + i, "_cuda_handlers.cu");
-    return(name);
-}
-
-char *ChangeFto_cpp(const char *fout_name)
-{
-    char *name;
-    int i;
-
-    name = (char *)malloc((unsigned)(strlen(fout_name) + 4 + 5 + 1));
-    strcpy(name, fout_name);
-    for (i = strlen(name) - 1; i >= 0; i--)
-    {
-        if (name[i] == '.')
-        {
-            name[i] = '\0';
-            break;
-        }
-    }
-    strcpy(name + i, "_cuda.cpp");
-    return(name);
-}
-
-char *ChangeFto_info_C(const char *fout_name)
-{
-    char *name;
-    int i;
-
-    name = (char *)malloc((unsigned)(strlen(fout_name) + 2 + 10 + 1));
-    strcpy(name, fout_name);
-    for (i = strlen(name) - 1; i >= 0; i--)
-    {
-        if (name[i] == '.')
-            break;
-    }
-    strcpy(name + i, "_cuda_info.c");
-    return(name);
-}
-
-
-void InitializeInFuncACC()
-{
-    int i;
-    maxgpu = 0;          /*ACC*/
-    sym_gpu = NULL;      /*ACC*/
-    cur_region = NULL;   /*ACC*/
-
-    for (i = 0; i < Ntp; i++)
-    {
-        gpu_mem_use[i] = 0; /*ACC*/
-    }
-    for (i = 0; i < 8; i++)
-    {
-        mem_use_loc_array[i] = 0; /*ACC*/
-    }
-    gpu_mem_use[Integer] = 1;
-    nred_gpu = 1;
-    maxred_gpu = 0;
-    red_offset_symb = NULL;
-
-    acc_func_list = NULL;
-    has_region = 0;
-    for (i = 0; i < Ndev; i++)
-    {
-        device_const[i] = NULL; /*ACC*/
-    }
-
-    for (i = 0; i < Nintent; i++)
-    {
-        intent_const[i] = NULL; /*ACC*/
-    }
-
-    for (i = 0; i < Nhandler; i++)
-    {
-        handler_const[i] = NULL; /*ACC*/
-    }
-    for (i = 0; i < Nregim; i++)
-    {
-        region_const[i] = NULL; /*ACC*/
-    }
-    //if(region_compare)
-    //RegionRegimConst(REGION_COMPARE_DEBUG); //region_const[REGION_COMPARE_DEBUG] = < SgConstSymb *>
-
-    acc_return_list = NULL;      /*ACC*/
-    acc_registered_list = NULL;  /*ACC*/
-    registered_uses_list = NULL; /*ACC*/
-    acc_declared_list = NULL;    /*ACC*/
-
-}
-
-int GeneratedForCuda()
-{
-    return (kernel_st || cuda_functions ? 1 : 0);
-}
-
-
-
-void TempVarACC(SgStatement * func) {
-
-    SgValueExp M1(1), M0(0);
-    SgExpression  *MN = new SgExpression(
-        DDOT, NULL, NULL, NULL);
-    SgExpression  *M01 = new SgExpression(DDOT, &M0.copy(), &M1.copy(), NULL);
-    SgArrayType *typearray;
-    SgExpression *MD;
-
-    if (len_DvmType)
-        const_LONG = new SgConstantSymb("LDVMH", *func, *new SgValueExp(len_DvmType));
-
-    typearray = new SgArrayType(*SgTypeInt());
-    gpubuf = new SgVariableSymb("gpu000", *typearray, *func);
-
-    MD = (func->variant() == PROG_HEDR) ? MN : M01;
-
-    typearray = new SgArrayType(*SgTypeInt());
-    typearray->addRange(*MD);
-    Imem_gpu = new SgVariableSymb("i0000g", *typearray, *func);
-
-    typearray = new SgArrayType(*SgTypeFloat());
-    typearray->addRange(*MD);
-    Rmem_gpu = new SgVariableSymb("r0000g", *typearray, *func);
-
-    typearray = new SgArrayType(*SgTypeDouble());
-    typearray->addRange(*MD);
-    Dmem_gpu = new SgVariableSymb("d0000g", *typearray, *func);
-
-    typearray = new SgArrayType(*SgTypeBool());
-    typearray->addRange(*MD);
-    Lmem_gpu = new SgVariableSymb("l0000g", *typearray, *func);
-
-    typearray = new SgArrayType(*SgTypeComplex(current_file));
-    typearray->addRange(*MD);
-    Cmem_gpu = new SgVariableSymb("c0000g", *typearray, *func);
-
-    typearray = new SgArrayType(*SgTypeDoubleComplex(current_file));
-    typearray->addRange(*MD);
-    DCmem_gpu = new SgVariableSymb("dc000g", *typearray, *func);
-
-    typearray = new SgArrayType(*SgTypeChar());
-    typearray->addRange(*MD);
-    Chmem_gpu = new SgVariableSymb("ch000g", *typearray, *func);
-    // if(func->variant()==PROG_HEDR)
-    // {  SYMB_ATTR(Imem_gpu->thesymb)= SYMB_ATTR(Imem_gpu->thesymb) | ALLOCATABLE_BIT;
-    //    SYMB_ATTR(Dmem_gpu->thesymb)= SYMB_ATTR(Dmem_gpu->thesymb) | ALLOCATABLE_BIT;
-    // }
-
-}
-
-void AddExternStmtToBlock_C()
-{
-    SgStatement *stmt = NULL;
-    int ln;
-    symb_list *sl = NULL;
-    if (!RGname_list)
-        return;
-    for (sl = RGname_list, ln = 0; sl; sl = sl->next, ln++)
-    if (!ln)
-        stmt = makeExternSymbolDeclaration(&(sl->symb->copy()));
-    else
-        addDeclExpList(sl->symb, stmt->expr(0));
-
-
-    cur_in_block->insertStmtBefore(*stmt, *block_C);  //10.12.13
-    //block_C->insertStmtAfter(*stmt,*block_C); 
-}
-
-
-int isDestroyable(SgSymbol *s)
-{
-    if (!CURRENT_SCOPE(s))
-        return(0);
-    if (s->attributes() & PARAMETER_BIT)
-        return(0);
-    if ((s->attributes() & SAVE_BIT) || saveall || IN_DATA(s))
-        return(0);
-    if (IN_COMMON(s) || IS_DUMMY(s))
-        return(0);
-    return(1);
-}
-
-
-int isLocal(SgSymbol *s)
-{
-    if (!CURRENT_SCOPE(s))
-        return(0);
-    if ((s->attributes() & SAVE_BIT) || saveall || IN_DATA(s))
-        return(0);
-    if (IN_COMMON(s) || IS_DUMMY(s))
-        return(0);
-
-    return(1);
-}
-
-SgExpression *ACC_GroupRef(int ind)
-{
-    SgExpression *res;
-    res = DVM000(ind);
-    if (IN_COMPUTE_REGION || parloop_by_handler)  //BY_HANDLER
-    {
-        int *id = new int;
-        *id = ind + 3;
-        res->addAttribute(ACROSS_GROUP_IND, (void *)id, sizeof(int));
-    }
-
-    return res;
-}
-
-/*
-SgSymbol*GpuBaseSymbolForLocArray(int n)
-{ SgSymbol *base;
-SgArrayType *typearray;
-SgExpression *MD;
-SgValueExp M1(1),M0(0);
-SgExpression  *MN = new SgExpression(DDOT,NULL,NULL,NULL);
-SgExpression  *M01 =  new SgExpression(DDOT,&M0.copy(),&M1.copy(),NULL);
-char *name;
-name = new char[7];
-sprintf(name,"i%d000g", n);
-typearray = new SgArrayType(*SgTypeInt());
-MD = (cur_func->variant()==PROG_HEDR) ? MN : new SgValueExp(n);
-typearray-> addRange(*MD);
-MD =(cur_func->variant()==PROG_HEDR) ? MN : M01;
-typearray-> addRange(*MD);
-base = new SgVariableSymb(name, *typearray, *cur_func);
-return(base);
-}
-*/
-/*
-SgSymbol*KernelBaseSymbolForLocArray(int n)
-{ SgSymbol *base;
-SgArrayType *typearray;
-SgExpression *MD;
-SgValueExp M1(1),M0(0);
-SgExpression  *M01 =  new SgExpression(DDOT,&M0.copy(),&M1.copy(),NULL);
-char *name;
-name = new char[7];
-sprintf(name,"i%d000m", n);
-typearray = new SgArrayType(*SgTypeInt());
-MD = new SgValueExp(n);
-typearray-> addRange(*MD);
-typearray-> addRange(*M01);
-base = new SgVariableSymb(name, *typearray, *kernel_st);
-return(base);
-}
-*/
-/*
-SgSymbol* DerivedTypeGpuBaseSymbol(SgSymbol *stype,SgType *t)
-{
-char *name;
-SgSymbol *sn;
-SgArrayType *typearray;
-SgValueExp M0(0), M1(1);
-SgExpression  *MD;
-SgExpression  *MN = new SgExpression(DDOT,NULL,NULL,NULL);
-SgExpression  *M01 =  new SgExpression(DDOT,&M0.copy(),&M1.copy(),NULL);
-name = new char[80];
-sprintf(name,"%s0000g",stype->identifier());
-MD = (IN_MAIN_PROGRAM) ? MN : M01;
-typearray = new SgArrayType(*t);
-typearray-> addRange(*MD);
-sn = new SgVariableSymb(name, *typearray, *cur_func);
-return(sn);
-}
-*/
-/*
-SgSymbol* GpuHeaderSymbol(SgSymbol *ar)
-{
-char *name;
-SgSymbol *sn;
-SgArrayType *typearray;
-SgValueExp M0(0);
-SgExpression  *rnk =  new SgValueExp(Rank(ar)+DELTA);
-//name = new char[80];
-name =  (char *) malloc((unsigned)(strlen(ar->identifier())+4+1));
-sprintf(name,"%s_gpu",ar->identifier());
-typearray = new SgArrayType(*SgTypeInt());
-typearray-> addRange(*rnk);
-sn = new SgVariableSymb(name, *typearray, *cur_func);
-return(sn);
-}
-*/
-
-SgType *Type_dim3()
-{
-    SgSymbol *sdim3 = new SgSymbol(TYPE_NAME, "dim3", *(current_file->firstStatement()));
-    SgFieldSymb *sx = new SgFieldSymb("x", *SgTypeInt(), *sdim3);
-    SgFieldSymb *sy = new SgFieldSymb("y", *SgTypeInt(), *sdim3);
-    SgFieldSymb *sz = new SgFieldSymb("z", *SgTypeInt(), *sdim3);
-    SYMB_NEXT_FIELD(sx->thesymb) = sy->thesymb;
-    SYMB_NEXT_FIELD(sy->thesymb) = sz->thesymb;
-    SYMB_NEXT_FIELD(sz->thesymb) = NULL;
-
-    SgType *tstr = new SgType(T_STRUCT);
-    TYPE_COLL_FIRST_FIELD(tstr->thetype) = sx->thesymb;
-    sdim3->setType(tstr);
-
-    SgType *td = new SgType(T_DERIVED_TYPE);
-    TYPE_SYMB_DERIVE(td->thetype) = sdim3->thesymb;
-    TYPE_SYMB(td->thetype) = sdim3->thesymb;
-
-    return(td);
-}
-
-SgType *FortranDvmType()
-{
-    SgType *t;
-    if (type_FortranDvmType)
-        return(type_FortranDvmType);
-    if (len_DvmType)
-    {
-        SgExpression *le;
-        le = new SgExpression(LEN_OP);
-        le->setLhs(new SgValueExp(len_DvmType));
-        t = new SgType(T_INT, le, NULL);
-
-    }
-    else
-        t = SgTypeInt();
-    type_FortranDvmType = t;
-    return(type_FortranDvmType);
-}
-
-void DeviceTypeConsts()
-{
-    if (device_const[HOST]) return;
-    device_const[HOST] = new SgConstantSymb("DEVICE_TYPE_HOST", *cur_func, *new SgValueExp(HOST));
-    device_const[CUDA] = new SgConstantSymb("DEVICE_TYPE_CUDA", *cur_func, *new SgValueExp(CUDA));
-}
-
-SgSymbol *DeviceTypeConst(int i)
-{
-    if (device_const[i])
-        return(device_const[i]);
-    switch (i)
-    {
-    case HOST:
-        device_const[HOST] = new SgConstantSymb("DEVICE_TYPE_HOST", *cur_func, *new SgValueExp(HOST));
-        break;
-    case CUDA:
-        device_const[CUDA] = new SgConstantSymb("DEVICE_TYPE_CUDA", *cur_func, *new SgValueExp(CUDA));
-        break;
-    }
-    return(device_const[i]);
-}
-
-
-void HandlerTypeConsts()
-{
-    if (handler_const[HANDLER_TYPE_PARALLEL]) return;
-    handler_const[HANDLER_TYPE_PARALLEL] = new SgConstantSymb("HANDLER_TYPE_PARALLEL", *cur_func, *new SgValueExp(HANDLER_TYPE_PARALLEL));
-    handler_const[HANDLER_TYPE_MASTER] = new SgConstantSymb("HANDLER_TYPE_MASTER", *cur_func, *new SgValueExp(HANDLER_TYPE_MASTER));
-}
-
-SgSymbol *HandlerTypeConst(int i)
-{
-    if (handler_const[i])
-        return(handler_const[i]);
-    switch (i)
-    {
-    case HANDLER_TYPE_PARALLEL:
-        handler_const[HANDLER_TYPE_PARALLEL] = new SgConstantSymb("HANDLER_TYPE_PARALLEL", *cur_func, *new SgValueExp(HANDLER_TYPE_PARALLEL));
-        break;
-    case HANDLER_TYPE_MASTER:
-        handler_const[HANDLER_TYPE_MASTER] = new SgConstantSymb("HANDLER_TYPE_MASTER", *cur_func, *new SgValueExp(HANDLER_TYPE_MASTER));
-        break;
-    }
-    return(handler_const[i]);
-}
-
-SgSymbol *RegionRegimConst(int regim)
-{
-    if (region_const[regim]) return(region_const[regim]);
-    if (regim == REGION_ASYNC)
-        region_const[REGION_ASYNC] = new SgConstantSymb("REGION_ASYNC", *cur_func, *new SgValueExp(REGION_ASYNC));
-    else if (regim == REGION_COMPARE_DEBUG)
-        region_const[REGION_COMPARE_DEBUG] = new SgConstantSymb("REGION_COMPARE_DEBUG", *cur_func, *new SgValueExp(REGION_COMPARE_DEBUG));
-    return(region_const[regim]);
-}
-
-
-SgSymbol *IntentConst(int intent)
-{
-    const char *name;
-
-    if (intent_const[intent])
-        return(intent_const[intent]);
-
-    switch (intent)
-    {
-    case(INTENT_IN) : name = "INTENT_IN";     break;
-    case(INTENT_OUT) : name = "INTENT_OUT";    break;
-    case(INTENT_INOUT) : name = "INTENT_INOUT";  break;
-    case(INTENT_LOCAL) : name = "INTENT_LOCAL";  break;
-    case(INTENT_INLOCAL) : name = "INTENT_INLOCAL"; break;
-    case(EMPTY) : name = "EMPTY";         break;
-    default:              name = "";              break;
-    }
-
-    intent_const[intent] = new SgConstantSymb(name, *cur_func, *new SgValueExp(intent));
-
-    return(intent_const[intent]);
-}
-
-SgSymbol *ArraySymbol(char *name, SgType *basetype, SgExpression *range, SgStatement *scope)
-{
-    SgSymbol *ar;
-    SgArrayType *typearray;
-
-    typearray = new SgArrayType(*basetype);
-    if (range)
-        typearray->addRange(*range);
-    ar = new SgVariableSymb(name, *typearray, *scope);
-    return(ar);
-}
-
-SgSymbol *ArraySymbol(const char *name, SgType *basetype, SgExpression *range, SgStatement *scope)
-{
-    SgSymbol *ar;
-    SgArrayType *typearray;
-
-    typearray = new SgArrayType(*basetype);
-    if (range)
-        typearray->addRange(*range);
-    ar = new SgVariableSymb(name, *typearray, *scope);
-    return(ar);
-}
-
-
-SgSymbol *KernelSymbol(SgStatement *st_do)
-{
-    SgSymbol *sk;
-    ++nkernel;
-
-    char *kname = (char *)malloc((unsigned)(strlen(st_do->fileName())) + 38);
-    if (inparloop)
-        sprintf(kname, "%s_%s_%d_cuda_kernel", "loop", filename_short(st_do), st_do->lineNumber());
-    else
-        sprintf(kname, "%s_%s_%d_cuda_kernel", "sequence", filename_short(st_do), st_do->lineNumber());
-
-    sk = new SgSymbol(PROCEDURE_NAME, kname, *mod_gpu);
-    if (options.isOn(C_CUDA))
-        sk->setType(C_VoidType());
-    return(sk);
-}
-
-SgSymbol *HostProcSymbol(SgStatement *st_do)
-{
-    SgSymbol *s;
-    char *sname = (char *)malloc((unsigned)(strlen(st_do->fileName())) + 30);
-    if (inparloop)
-        sprintf(sname, "%s_%s_%d_host", "loop", filename_short(st_do), st_do->lineNumber());
-    else
-        sprintf(sname, "%s_%s_%d_host", "sequence", filename_short(st_do), st_do->lineNumber());
-    s = new SgSymbol(PROCEDURE_NAME, sname, *current_file->firstStatement());
-    acc_func_list = AddToSymbList(acc_func_list, s);
-    return(s);
-}
-
-SgSymbol *HostAcrossProcSymbol(SgSymbol *sHostProc, int dependency)
-{
-    SgSymbol *s;
-    char *sname = (char *)malloc((unsigned)(strlen(sHostProc->identifier())) + 5);
-    sprintf(sname, "%s_%d", sHostProc->identifier(), dependency);
-    s = new SgSymbol(PROCEDURE_NAME, sname, *current_file->firstStatement());
-    acc_func_list = AddToSymbList(acc_func_list, s);
-    return(s);
-}
-
-SgSymbol *HostProcSymbol_RA(SgSymbol *sHostProc)
-{
-    SgSymbol *s;
-    char *sname = (char *)malloc((unsigned)(strlen(sHostProc->identifier())) + 4);
-    sprintf(sname, "%s_%s", sHostProc->identifier(), "RA");
-    s = new SgSymbol(PROCEDURE_NAME, sname, *current_file->firstStatement());
-    acc_func_list = AddToSymbList(acc_func_list, s);
-    return(s);
-}
-
-SgSymbol *IndirectFunctionSymbol(SgStatement *stmt, char *name)
-{
-    char *sname = (char *)malloc((unsigned)(strlen(stmt->fileName())) + 40);    
-    sprintf(sname, "indirect_%s_%s_%d", name, filename_short(stmt), stmt->lineNumber());
-    SgSymbol *s = new SgSymbol(PROCEDURE_NAME, sname, *current_file->firstStatement());
-    acc_func_list = AddToSymbList(acc_func_list, s);
-    return(s);
-}
-
-SgSymbol *GPUModuleSymb(SgStatement *global_st)
-{
-    SgSymbol *mod_symb;
-    char *modname;
-
-    modname = (char *)malloc((unsigned)(strlen(global_st->fileName()) + 8 + 1));
-    sprintf(modname, "dvm_gpu_%s", filename_short(global_st)); 
-    mod_symb = new SgSymbol(MODULE_NAME, modname, *global_st);
-    return(mod_symb);
-}
-
-
-SgSymbol *CudaforSymb(SgStatement *global_st)
-{
-    SgSymbol *cudafor_symb;
-    cudafor_symb = new SgSymbol(MODULE_NAME, "cudafor", *global_st);
-    return(cudafor_symb);
-}
-
-/*
-SgSymbol *KernelArgumentSymbol(int n)
-{char *name;
-SgSymbol *sn;
-name = new char[80];
-sprintf(name,"dbv_goto00%d", n);
-sn = new SgVariableSymb(name,*t,*cur_func);
-if_goto = AddToSymbList(if_goto, sn);
-return(sn);
-}
-*/
-
-/*
-SgSymbol *Var_Offset_Symbol(SgSymbol *var)
-{
-if(!red_offset_symb)
-red_offset_symb = new SgVariableSymb("red_offset",*new SgArrayType(*IndexType()),*cur_func);
-
-return(red_offset_symb);
-}
-*/
-
-SgSymbol *RedCountSymbol(SgStatement *scope)
-{
-    //if(red_count_symb) return;
-
-    return(new SgVariableSymb("red_count", *SgTypeInt(), *scope)); // IndexType()
-
-}
-
-char *PointerNameForPrivateArray(SgSymbol *symb)
-{
-    char *name = new char[strlen(symb->identifier())+4];
-    sprintf(name, "_%s_p", symb->identifier());
-    return name;
-}
-
-SgSymbol *OverallBlocksSymbol()
-{
-    SgType *type;
-    type = options.isOn(C_CUDA) ? C_CudaIndexType() : FortranDvmType();
-    return(new SgVariableSymb("overall_blocks", *type, *kernel_st));
-}
-
-void BeginEndBlocksSymbols(int pl_rank)
-{
-    int i;
-    char *name = new char[20];
-    SgType *type;
-    for (i = MAX_LOOP_LEVEL; i; i--)
-    {
-        s_begin[i - 1] = NULL;
-        s_end[i - 1] = NULL;
-        s_blocksS_k[i - 1] = NULL;
-        s_loopStep[i - 1] = NULL;
-    }
-    type = options.isOn(C_CUDA) ? C_Derived_Type(s_CudaIndexType_k) : CudaIndexType();
-    for (i = 1; i <= pl_rank; i++)
-    {
-        sprintf(name, "begin_%d", i);
-        s_begin[i - 1] = new SgVariableSymb(TestAndCorrectName(name), *type, *kernel_st);
-        sprintf(name, "end_%d", i);
-        s_end[i - 1] = new SgVariableSymb(TestAndCorrectName(name), *type, *kernel_st);
-        sprintf(name, "blocks_%d", i);
-        s_blocksS_k[i - 1] = new SgVariableSymb(TestAndCorrectName(name), *type, *kernel_st);
-        sprintf(name, "loopStep_%d", i);
-        s_loopStep[i - 1] = new SgVariableSymb(TestAndCorrectName(name), *type, *kernel_st);
-
-    }
-
-}
-
-/*
-SgSymbol *RedOffsetSymbolInKernel(SgSymbol *s)
-{ char *name;
-SgSymbol *soff;
-
-name =  (char *) malloc((unsigned)(strlen(s->identifier())+8));
-//strcpy (name,s->identifier());
-sprintf(name,"%s_offset",s->identifier());
-soff = new SgVariableSymb(name, *IndexType(), *kernel_st);
-
-return(soff);
-}
-*/
-/*
-SgSymbol *RedOffsetSymbolInKernel_ToList(SgSymbol *s)
-{ char *name;
-SgSymbol *soff;
-SgExpression *ell, *el;
-name =  (char *) malloc((unsigned)(strlen(s->identifier())+8));
-sprintf(name,"%s_offset",s->identifier());
-soff = new SgVariableSymb(name, *IndexType(), *kernel_st);
-ell = new SgExprListExp(*new SgVarRefExp(*soff));
-if(!formal_red_offset_list)
-formal_red_offset_list = ell;
-else
-{ el = formal_red_offset_list;
-while( el->rhs())
-el=el->rhs();
-el->setRhs(ell);
-}
-return(soff);
-}
-
-*/
-
-SgStatement * MakeStructDecl(SgSymbol *strc)
-{
-    SgStatement *typedecl, *st1, *st2;
-    SgSymbol *sf;
-    typedecl = new SgDeclarationStatement(STRUCT_DECL);
-    typedecl->setSymbol(*strc);
-    sf = FirstTypeField(strc->type());
-    st1 = sf->makeVarDeclStmt();
-    typedecl->insertStmtAfter(*st1, *typedecl);
-    sf = ((SgFieldSymb *)sf)->nextField();
-    st2 = sf->makeVarDeclStmt();
-    st1->insertStmtAfter(*st2, *typedecl);
-    return(typedecl);
-
-    /*
-      sf = =((SgFieldSymb *)sf)->nextField();
-      for(sf=FirstTypeField(s->type());sf;sf=((SgFieldSymb *)sf)->nextField())
-
-      SYMB_NEXT_FIELD(sz->thesymb) = NULL;
-
-      SgType *tstr = new SgType(T_STRUCT);
-      TYPE_COLL_FIRST_FIELD(tstr->thetype)=  sx->thesymb;
-      SymbMapping
-      */
-}
-
-/*
-int isIntrinsicFunction(SgSymbol *sf)
-{
-if(IntrinsicInd(sf) == -1)
-return(0);
-else
-return( 1);
-}
-
-
-int IntrinsicInd(SgSymbol *sf)
-{ int i;
-for(i=0; i<MAX_INTRINSIC_NUM; i++)
-{  if(! intrinsic_name[i] )
-break;
-//printf("%d   %s = %s\n", i, intrinsic_name[i], sf->identifier());
-
-if(!strcmp(sf->identifier(),intrinsic_name[i]))
-return(i);
-}
-return(-1);
-}
-*/
-
-void DeclareVarGPU(SgStatement *lstat, SgType *tlen)
-{
-    SgStatement *st;
-    SgExpression *eatr, *el, *eel;
-    int i;
-
-    // declare created procedures(C-functions) as EXTERNAL
-
-    if (acc_func_list)
-    {
-        symb_list *sl;
-        SgExpression *el, *eel;
-        st = new SgStatement(EXTERN_STAT);
-        el = new SgExprListExp(*new SgVarRefExp(acc_func_list->symb));
-        for (sl = acc_func_list->next; sl; sl = sl->next)
-        {
-            eel = new SgExprListExp(*new SgVarRefExp(sl->symb));
-            eel->setRhs(*el);
-            el = eel;
-        }
-        st->setExpression(0, *el);
-
-        lstat->insertStmtAfter(*st);
-    }
-
-    // declare INTENT constants
-
-    for (i = Nintent - 1, el = NULL; i >= 0; i--)
-    if (intent_const[i])
-    {
-        eel = new SgExprListExp(*new SgRefExp(CONST_REF, *intent_const[i]));
-        eel->setRhs(el);
-        el = eel;
-    }
-    if (el)
-    {
-        st = fdvm[0]->makeVarDeclStmt();
-        st->setExpression(0, *el);
-        if (len_DvmType)
-            st->expr(1)->setType(tlen);
-        eatr = new SgExprListExp(*new SgExpression(PARAMETER_OP));
-        st->setExpression(2, *eatr);
-        lstat->insertStmtAfter(*st);
-    }
-    // declare CUDA constants
-
-    for (i = Ndev - 1, el = NULL; i; i--)
-    if (device_const[i])
-    {
-        eel = new SgExprListExp(*new SgRefExp(CONST_REF, *device_const[i]));
-        eel->setRhs(el);
-        el = eel;
-    }
-    if (el)
-    {
-        st = fdvm[0]->makeVarDeclStmt();
-        st->setExpression(0, *el);
-        if (len_DvmType)
-            st->expr(1)->setType(tlen);
-        eatr = new SgExprListExp(*new SgExpression(PARAMETER_OP));
-        st->setExpression(2, *eatr);
-        lstat->insertStmtAfter(*st);
-    }
-
-    // declare Handler constants   /* OpenMP * /
-
-    for (i = Nhandler - 1, el = NULL; i; i--)
-    if (handler_const[i])
-    {
-        eel = new SgExprListExp(*new SgRefExp(CONST_REF, *handler_const[i]));
-        eel->setRhs(el);
-        el = eel;
-    }
-    if (el)
-    {
-        st = fdvm[0]->makeVarDeclStmt();
-        st->setExpression(0, *el);
-        if (len_DvmType)
-            st->expr(1)->setType(tlen);
-        eatr = new SgExprListExp(*new SgExpression(PARAMETER_OP));
-        st->setExpression(2, *eatr);
-        lstat->insertStmtAfter(*st);
-    }
-
-
-
-
-    // declare REGION-REGIM constants
-
-    for (i = Nregim - 1, el = NULL; i; i--)
-    if (region_const[i])
-    {
-        eel = new SgExprListExp(*new SgRefExp(CONST_REF, *region_const[i]));
-        eel->setRhs(el);
-        el = eel;
-    }
-    if (el)
-    {
-        st = fdvm[0]->makeVarDeclStmt();
-        st->setExpression(0, *el);
-        if (len_DvmType)
-            st->expr(1)->setType(tlen);
-        eatr = new SgExprListExp(*new SgExpression(PARAMETER_OP));
-        st->setExpression(2, *eatr);
-        lstat->insertStmtAfter(*st);
-    }
-
-}
-
-/************************************************************************************/
-/*        Data Region                                                               */
-/************************************************************************************/
-void EnterDataRegionForAllocated(SgStatement *stmt)
-{SgExpression *al;
- if(!ACC_program)
-   return;
- for(al=stmt->expr(0); al; al=al->rhs()) 
-   EnterDataRegion(al->lhs(),stmt);   
- 
- allocated_list = AddListToList(allocated_list,&stmt->expr(0)->copy()); 
-}
-
-void EnterDataRegion(SgExpression *ale,SgStatement *stmt)
-{ SgExpression *e,*size;
-  SgSymbol *ar;
-  
-  e = &(ale->copy());
-  if(isSgRecordRefExp(e))
-  {  
-     SgExpression *alce = RightMostField(e);
-     alce->setLhs(NULL);
-     ar = alce->symbol();
-  }  else
-  {
-     e->setLhs(NULL);
-     ar = e->symbol();
-  }
-/*
-  SgType *t = ar->type(); 
-  if(isSgArrayType(t))
-  {
-     t = t->baseType(); 
-     size = &(*SizeFunction(ar,0) * (*ConstRef_F95(TypeSize(t))));
-  } else
-     size = ConstRef_F95(TypeSize(t));   
-  InsertNewStatementAfter(DataEnter(e,size),cur_st,cur_st->controlParent());
-*/
-  InsertNewStatementAfter(DataEnter(e,ConstRef(0)),cur_st,cur_st->controlParent());   
-}
-
-void ExitDataRegion(SgExpression *ale,SgStatement *stmt)
-{ SgExpression *e,*size;
-  SgSymbol *ar,*ar2;
-
-  e = &(ale->copy()); 
-  if(isSgRecordRefExp(e))
-  {  
-     SgExpression *alce = RightMostField(e);
-     alce->setLhs(NULL);  
-     ar = LeftMostField(e)->symbol();
-     
-          //if(!(ar2 = GetTypeField(RightMostField(e->lhs())->symbol(),RightMostField(e)->symbol())))
-     ar2 = RightMostField(e)->symbol();
-      
-
-                  //printf("==%s %d\n",ar->identifier(), TYPE_COLL_FIRST_FIELD(ar->type()->symbol()->type()->thetype)->attr);
-                 //ar->type()->symbol()->type()->firstField()->identifier());// ->type()->symbol()->type()->variant());
-  }  else
-  {
-     e->setLhs(NULL);
-     ar = ar2 = e->symbol();
-  }
-   
-                 //  printf("%s  %d %d %d\n",ar->identifier(),ar->attributes() & POINTER_BIT, ar->attributes(),e->rhs()->symbol()->variant());
-  if(isLocal(ar) && !IS_POINTER_F90(ar2))
-    doLogIfForAllocated(e,stmt);
-               
-}
-
-void UnregisterVariables(int begin_block)
-{
-    stmt_list *stl;
-    int is;
-    if (!ACC_program || IN_MAIN_PROGRAM)
-        return;
-    for (stl = acc_return_list; stl; stl = stl->next)
-    {  
-       is = ExitDataRegionForAllocated(stl->st, begin_block);
-       ExitDataRegionForLocalVariables(stl->st, is || begin_block); 
-    }
-}
-
-/*
-void InsertDestroyBlock(SgStatement *st)  
-{
-    SgExpression *el;
-    symb_list *sl;
-
-    if (st->lexNext()->lineNumber() == 0)  // there are inserted (by EndOfProgramUnit()) statements
-        st = st->lexNext(); // to insert new statements after dvmlf() call
-    for (el = registered_uses_list; el; el = el->rhs())
-    {
-        if (!el->lhs()) continue;
-        if (el->lhs()->symbol()->variant() != CONST_NAME && isLocal(el->lhs()->symbol()) && !IS_ALLOCATABLE(el->lhs()->symbol()))   //  //!(el->lhs()->symbol()->attributes() & PARAMETER_BIT) )
-            st->insertStmtAfter(*DestroyScalar(new SgVarRefExp(el->lhs()->symbol())));
-    }
-    for (sl = acc_registered_list; sl; sl = sl->next)
-    {
-        if (sl->symb->variant() != CONST_NAME && isLocal(sl->symb))      //&& !IS_ALLOCATABLE(sl->symb)       //!(sl->symb->attributes() & PARAMETER_BIT))
-        {
-            if (HEADER(sl->symb))
-                st->insertStmtAfter(*DestroyArray(HeaderRef(sl->symb)));
-            else if (!IS_ALLOCATABLE(sl->symb))
-                st->insertStmtAfter(*DestroyScalar(new SgVarRefExp(sl->symb)));
-        }
-    }
-
-}
-*/
-
-void DeclareDataRegionSaveVariables(SgStatement *lstat, SgType *tlen)
-{
-    SgExpression *el;
-    symb_list *sl;
-    SgSymbol *symb;
-    for (el = registered_uses_list; el; el = el->rhs())
-    {
-        symb =  el->lhs()->symbol();
-        SgSymbol **attr = (SgSymbol **)(symb)->attributeValue(0,DATA_REGION_SYMB);
-        if (attr)
-           DeclareVariableWithInitialization (*attr, tlen, lstat);
-        
-    }
-    for (sl = acc_registered_list; sl; sl = sl->next)
-    {
-        symb = sl->symb; 
-        SgSymbol **attr = (SgSymbol **)(symb)->attributeValue(0,DATA_REGION_SYMB);
-        if (attr)
-           DeclareVariableWithInitialization (*attr, tlen, lstat);        
-    }
-    for (el = acc_declared_list; el; el = el->rhs())
-    {
-        symb =  el->lhs()->symbol();
-        if (!(IS_ARRAY(symb)) || isInExprList(el->lhs(), registered_uses_list) || isInSymbList(symb, acc_registered_list)) 
-            continue;
-        SgSymbol **attr = (SgSymbol **)(symb)->attributeValue(0,DATA_REGION_SYMB);
-        if (attr)
-           DeclareVariableWithInitialization (*attr, tlen, lstat);        
-    }
-}
-
-SgSymbol *DataRegionVar(SgSymbol *symb)
-{
-    char *name = new char[strlen(symb->identifier())+10];
-    sprintf(name, "dvm_save_%s", symb->identifier());
-    SgSymbol *dvm_symb = new SgVariableSymb(name, *SgTypeInt(), *cur_func);
-    SgSymbol **new_s = new (SgSymbol *);
-    *new_s= dvm_symb;
-    symb->addAttribute(DATA_REGION_SYMB, (void*) new_s, sizeof(SgSymbol *));
-
-    return(dvm_symb); 
-}
-
-void EnterDataRegionForLocalVariables(SgStatement *st, SgStatement *first_exec, int begin_block)
-{
-    SgExpression *el;
-    symb_list *sl;
-    SgStatement *newst=NULL;
-    for (el = registered_uses_list; el; el = el->rhs())
-    {
-        if (!el->lhs()) continue;
-        SgSymbol *sym = el->lhs()->symbol();
-        if (IS_ARRAY(sym) && sym->variant() != CONST_NAME && IS_LOCAL_VAR(sym) && !IS_ALLOCATABLE(sym) && !IS_POINTER_F90(sym) && !(sym->attributes() & HEAP_BIT))   //  //!(el->lhs()->symbol()->attributes() & PARAMETER_BIT) )
-        {                                                                              
-            if (HAS_SAVE_ATTR(sym) || IN_DATA(sym))
-                newst = doIfThenForDataRegion(DataRegionVar(sym), st, DataEnter(new SgVarRefExp(sym),ConstRef(0)));            
-            else
-                st->insertStmtAfter(*(newst=DataEnter(new SgVarRefExp(sym),ConstRef(0))),*st->controlParent());
-        }       
-    }
-    for (sl = acc_registered_list; sl; sl = sl->next)
-    {
-        if (IS_ARRAY(sl->symb) && sl->symb->variant() != CONST_NAME && IS_LOCAL_VAR(sl->symb) && !IS_ALLOCATABLE(sl->symb) && !IS_POINTER_F90(sl->symb) && !HEADER(sl->symb))       //!(sl->symb->attributes() & PARAMETER_BIT))        
-        {
-            if (HAS_SAVE_ATTR(sl->symb) || IN_DATA(sl->symb)) 
-                newst = doIfThenForDataRegion(DataRegionVar(sl->symb), st, DataEnter(new SgVarRefExp(sl->symb),ConstRef(0))); 
-            else  
-                st->insertStmtAfter(*(newst=DataEnter(new SgVarRefExp(sl->symb),ConstRef(0))),*st->controlParent());
-        }
-    }
-
-    for (el = acc_declared_list; el; el = el->rhs())
-    {
-        SgSymbol *sym = el->lhs()->symbol();
-        if (!IS_ARRAY(sym) || isInExprList(el->lhs(), registered_uses_list) || isInSymbList(sym, acc_registered_list)) 
-            continue;
-
-        if (sym->variant() != CONST_NAME && IS_LOCAL_VAR(sym) && !IS_ALLOCATABLE(sym) && !IS_POINTER_F90(sym) && !(sym->attributes() & HEAP_BIT) && !HEADER(sym))  
-        {                                                                              
-            if (HAS_SAVE_ATTR(sym) || IN_DATA(sym))
-                newst = doIfThenForDataRegion(DataRegionVar(sym), st, DataEnter(new SgVarRefExp(sym),ConstRef(0)));            
-            else
-                st->insertStmtAfter(*(newst=DataEnter(new SgVarRefExp(sym),ConstRef(0))),*st->controlParent());
-        }       
-    }
-
-    if (newst && !begin_block)
-        LINE_NUMBER_AFTER(first_exec,st);
-}
-
-void ExitDataRegionForLocalVariables(SgStatement *st, int is)
-{
-    SgExpression *el;
-    symb_list *sl;
-
-    for (el = registered_uses_list; el; el = el->rhs())
-    {   
-        if (!el->lhs()) continue;
-        SgSymbol *sym = el->lhs()->symbol();
-        if (IS_ARRAY(sym) && sym->variant() != CONST_NAME && IS_LOCAL_VAR(sym) && !IS_ALLOCATABLE(sym) && !IS_POINTER_F90(sym) && !(sym->attributes() & HEAP_BIT))   //  //!(el->lhs()->symbol()->attributes() & PARAMETER_BIT) )
-        {
-            if (HAS_SAVE_ATTR(sym) || IN_DATA(sym))
-                continue;            
-            if (!is++)
-                LINE_NUMBER_BEFORE(st,st);                   
-            InsertNewStatementBefore(DataExit(new SgVarRefExp(sym),0),st);            
-        }
-    }
-    for (sl = acc_registered_list; sl; sl = sl->next)
-    {
-        if (IS_ARRAY(sl->symb) && sl->symb->variant() != CONST_NAME && IS_LOCAL_VAR(sl->symb) && !IS_ALLOCATABLE(sl->symb) && !IS_POINTER_F90(sl->symb) && !HEADER(sl->symb))       //!(sl->symb->attributes() & PARAMETER_BIT))        
-        {  
-            if (HAS_SAVE_ATTR(sl->symb) || IN_DATA(sl->symb)) 
-                continue; 
-            if (!is++)
-                LINE_NUMBER_BEFORE(st,st);                     
-            InsertNewStatementBefore(DataExit(new SgVarRefExp(sl->symb),0),st);
-        }
-    }
-    for (el = acc_declared_list; el; el = el->rhs())
-    {   
-        if (!el->lhs()) continue;
-        SgSymbol *sym = el->lhs()->symbol();
-        if (!IS_ARRAY(sym) || isInExprList(el->lhs(), registered_uses_list) || isInSymbList(sym, acc_registered_list)) 
-            continue;
-        if (sym->variant() != CONST_NAME && IS_LOCAL_VAR(sym) && !IS_ALLOCATABLE(sym) && !IS_POINTER_F90(sym) && !(sym->attributes() & HEAP_BIT) && !HEADER(sym))
-        {
-            if (HAS_SAVE_ATTR(sym) || IN_DATA(sym)) 
-                continue;            
-            if (!is++)
-                LINE_NUMBER_BEFORE(st,st);                   
-            InsertNewStatementBefore(DataExit(new SgVarRefExp(sym),0),st);            
-        }
-    }
-}
-
-void  testScopeOfDeclaredVariables(SgStatement *stmt)
-{
-    SgExpression *el;
-    for (el = stmt->expr(0); el; el = el->rhs())
-    {
-        SgSymbol *sym = el->lhs()->symbol();
-        if (!IS_LOCAL_VAR(sym))
-            Error("Non-local data object in DECLARE directive: %s", sym->identifier(), 668, stmt);
-        continue;
-    }
-}
-
-void testDeclareDirectives(SgStatement *first_dvm_exec)
-{
-    SgStatement *stmt;
-    for (stmt = cur_func->lexNext(); stmt && (stmt != first_dvm_exec); stmt = stmt->lastNodeOfStmt()->lexNext()) 
-    {   
-        if (stmt->variant()==ACC_DECLARE_DIR)
-        {
-            if (IN_MODULE)
-                err("Illegal directive in module", 632, stmt);
-            else if (!IN_MAIN_PROGRAM)
-                testScopeOfDeclaredVariables(stmt);
-        }
-        continue;
-    }
-    // eliminating duplicate objects from the acc_declared_list
-    SgExpression *el, *el2, *prev;
-    for (el = acc_declared_list; el; el = el->rhs())
-    {
-        for (el2 = el->rhs(), prev = el; el2; )
-            if (ORIGINAL_SYMBOL(el->lhs()->symbol()) == ORIGINAL_SYMBOL(el2->lhs()->symbol()))
-            {   prev->setRhs(el2->rhs()); el2 = el2->rhs();  }
-            else
-            {    prev = el2; el2 = el2->rhs(); }
-    }     
-}
-
-void ExtractCopy(SgExpression *elist)
-{
-  SgExpression *el;
-  SgExpression *e = elist->lhs();
-  if(!e) return;
-  for (el = elist->rhs(); el; el = el->rhs())
-     if(el->lhs() && ExpCompare(e,el->lhs()))
-        el->setLhs(NULL);  
-}
-
-void CleanAllocatedList()
-{
-//the same allocated_list items are deleted  
-  SgExpression *el;
-  for (el = allocated_list; el; el = el->rhs())
-     ExtractCopy(el); 
-  for (el = allocated_list; el; )
-     if(el->rhs() && !el->rhs()->lhs())
-        el->setRhs(el->rhs()->rhs());
-     else
-        el = el->rhs();     
-}
-
-int ExitDataRegionForAllocated(SgStatement *st,int begin_block) 
-{
-    SgExpression *el;
-    if (!ACC_program)
-       return(0);
-  
-    if (TestLocal(allocated_list))
-    {
-       if(!begin_block)
-          LINE_NUMBER_BEFORE(st,st);
-    } else
-       return(0);
-    CleanAllocatedList();
-    for (el = allocated_list; el; el = el->rhs())      
-        ExitDataRegion(el->lhs(),st); 
-    return(1);   
-}
-
-int TestLocal(SgExpression *list)
-{
-    SgExpression *el; 
-    SgSymbol *s;
-    for (el = list; el; el = el->rhs())   
-    {
-       s = isSgRecordRefExp(el->lhs()) ? LeftMostField(el->lhs())->symbol() : el->lhs()->symbol();
-       if(isLocal(s))
-          return(1);
-    }  
-    return (0);
-}
-
-int is_deleted_module_symbol(SgSymbol *s) // deleted because it was renamed (parser/sym.c: function  delete_symbol())
-{
-    if (!strcmp("***", s->identifier()))
-        return 1;
-    return 0;
-}
-
-int  hasSameOriginalName(SgSymbol *s) 
-{
-    SgSymbol *symb = cur_func->symbol()->next();
-    while (symb != s)
-    {
-        if (ORIGINAL_SYMBOL(symb) == ORIGINAL_SYMBOL(s))
-            return 1;
-        symb = symb->next();
-    }
-    return 0;
-}
-
-void EnterDataRegionForVariablesInMainProgram(SgStatement *st)
-{ 
-/*     
-   symb_list *sl;
-   SgSymbol *s;
-   for(sl=registration; sl; sl=sl->next) 
-   {
-      s = sl->symb;
-      if (IS_ARRAY(s) && s->variant() == VARIABLE_NAME && s->scope() == cur_func && !IS_BY_USE(s) && !IS_ALLOCATABLE(s) && !IS_POINTER_F90(s) && !HEADER(s) && !(s->attributes() & HEAP_BIT))  
-         st->insertStmtAfter(*DataEnter(new SgVarRefExp(s),ConstRef(0)),*st->controlParent());
-   }
-   s = cur_func->symbol()->next();
-   while (IS_BY_USE(s))
-   {        
-      if (!is_deleted_module_symbol(s) && IS_ARRAY(s) && !hasSameOriginalName(s) && s->variant() == VARIABLE_NAME && !IS_ALLOCATABLE(s) && !IS_POINTER_F90(s) && !HEADER(s) ) 
-         st->insertStmtAfter(*DataEnter(new SgVarRefExp(s),ConstRef(0)),*st->controlParent());
-      s = s->next();
-   }    
-*/ 
-    SgExpression *el;
-    symb_list *sl;
-    for (el = registered_uses_list; el; el = el->rhs())
-    {
-        SgSymbol *sym = el->lhs()->symbol();
-        if (IS_ARRAY(sym) && sym->variant() != CONST_NAME && !IS_ALLOCATABLE(sym) && !IS_POINTER_F90(sym) && !(sym->attributes() & HEAP_BIT)) 
-                st->insertStmtAfter(*DataEnter(new SgVarRefExp(sym),ConstRef(0)),*st->controlParent());               
-    }
-    for (sl = acc_registered_list; sl; sl = sl->next)
-    {
-        if (sl->symb->variant() != CONST_NAME && !IS_ALLOCATABLE(sl->symb) && !IS_POINTER_F90(sl->symb) && !HEADER(sl->symb))         
-                st->insertStmtAfter(*DataEnter(new SgVarRefExp(sl->symb),ConstRef(0)),*st->controlParent());
-    }
-    for (el = acc_declared_list; el; el = el->rhs())
-    {
-        SgSymbol *sym = el->lhs()->symbol();
-        if (!IS_ARRAY(sym) || isInExprList(el->lhs(), registered_uses_list) || isInSymbList(sym, acc_registered_list)) 
-            continue;
-
-        if (sym->variant() == VARIABLE_NAME && !IS_ALLOCATABLE(sym) && !IS_POINTER_F90(sym) && !HEADER(sym) && !(sym->attributes() & HEAP_BIT))
-                st->insertStmtAfter(*DataEnter(new SgVarRefExp(sym),ConstRef(0)),*st->controlParent());
-    }         
-}
-
-void ExitDataRegionForVariablesInMainProgram(SgStatement *st)
-{
-/*
-   symb_list *sl;
-   SgSymbol *s;
-   for(sl=registration; sl; sl=sl->next) 
-   {
-      s = sl->symb;
-      if (IS_ARRAY(s) && s->variant() == VARIABLE_NAME && s->scope() == cur_func && !IS_BY_USE(s) && !IS_ALLOCATABLE(s) && !IS_POINTER_F90(s) && !HEADER(s) && !(s->attributes() & HEAP_BIT) ) 
-         InsertNewStatementBefore(DataExit(new SgVarRefExp(s),0),st); 
-   }
-
-   s=cur_func->symbol()->next();
-   while (IS_BY_USE(s))
-   {
-      if (!is_deleted_module_symbol(s) && IS_ARRAY(s) && !hasSameOriginalName(s) && s->variant() == VARIABLE_NAME && !IS_ALLOCATABLE(s) && !IS_POINTER_F90(s) && !HEADER(s) ) 
-         InsertNewStatementBefore(DataExit(new SgVarRefExp(s),0),st);
-      s = s->next();
-   }
-    SgSymbol *s;
-    SgExpression *el;
-    for (el = acc_declared_list; el; el = el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (IS_ARRAY(s) && s->variant() == VARIABLE_NAME && !IS_ALLOCATABLE(s) && !IS_POINTER_F90(s) && !HEADER(s) && !(s->attributes() & HEAP_BIT))
-            InsertNewStatementBefore(DataExit(new SgVarRefExp(s),0),st);
-    }   
-*/
-    SgExpression *el;
-    symb_list *sl;
-    for (el = registered_uses_list; el; el = el->rhs())
-    {
-        SgSymbol *sym = el->lhs()->symbol();
-        if (IS_ARRAY(sym) && sym->variant() != CONST_NAME && !IS_ALLOCATABLE(sym) && !IS_POINTER_F90(sym) && !(sym->attributes() & HEAP_BIT)) 
-                InsertNewStatementBefore(DataExit(new SgVarRefExp(sym),0),st);               
-    }
-    for (sl = acc_registered_list; sl; sl = sl->next)
-    {
-        if (sl->symb->variant() != CONST_NAME && !IS_ALLOCATABLE(sl->symb) && !IS_POINTER_F90(sl->symb) && !HEADER(sl->symb))         
-                InsertNewStatementBefore(DataExit(new SgVarRefExp(sl->symb),0),st);
-    }
-    for (el = acc_declared_list; el; el = el->rhs())
-    {
-        SgSymbol *sym = el->lhs()->symbol();
-        if (!IS_ARRAY(sym) || isInExprList(el->lhs(), registered_uses_list) || isInSymbList(sym, acc_registered_list)) 
-            continue;
-
-        if (sym->variant() == VARIABLE_NAME && !IS_ALLOCATABLE(sym) && !IS_POINTER_F90(sym) && !HEADER(sym) && !(sym->attributes() & HEAP_BIT))
-                InsertNewStatementBefore(DataExit(new SgVarRefExp(sym),0),st);
-    }         
-}
-
-/**********************************************************************************/
-
-int isACCdirective(SgStatement *stmt)
-{
-    switch (stmt->variant()) {
-
-        //          case(ACC_DATA_REGION_DIR):
-        //          case(ACC_END_DATA_REGION_DIR):
-        //          case(ACC_REGION_DO_DIR):
-        //          case(ACC_DO_DIR):
-        //          case(ACC_UPDATE_DIR):
-
-    case(ACC_REGION_DIR) :
-    case(ACC_END_REGION_DIR) :
-    case(ACC_ACTUAL_DIR) :
-    case(ACC_GET_ACTUAL_DIR) :
-    case(ACC_CHECKSECTION_DIR) :
-    case(ACC_END_CHECKSECTION_DIR) :
-                                   return(stmt->variant());
-    default:
-        return(0);
-    }
-}
-
-SgStatement *ACC_Directive(SgStatement *stmt)
-{
-    if (!ACC_program)       // by option -noH regime
-        return(stmt);                                
-    switch (stmt->variant()) {
-    case(ACC_REGION_DIR) :
-        return(ACC_REGION_Directive(stmt));
-
-    case(ACC_END_REGION_DIR) :
-        return(ACC_END_REGION_Directive(stmt));
-
-
-    case(ACC_ACTUAL_DIR) :
-        return(ACC_ACTUAL_Directive(stmt));
-
-    case(ACC_GET_ACTUAL_DIR) :
-        return(ACC_GET_ACTUAL_Directive(stmt));
-
-    case(ACC_CHECKSECTION_DIR) :
-        if (!IN_COMPUTE_REGION)
-            err("Misplaced directive", 103, stmt);
-        in_checksection = 1;
-        acc_array_list = NULL;
-        return(stmt);
-    case(ACC_END_CHECKSECTION_DIR) :
-        in_checksection = 0;
-        return(stmt);
-    default:
-        return(stmt);
-    }
-
-}
-
-void ACC_DECLARE_Directive(SgStatement *stmt)
-{
-    if (ACC_program)                                
-        acc_declared_list = ExpressionListsUnion(acc_declared_list, &(stmt->expr(0)->copy()));
-}
-
-void ACC_ROUTINE_Directive(SgStatement *stmt)
-{
-    if(!ACC_program || options.isOn(NO_CUDA) )
-        return;
-    int control_variant =  stmt->controlParent()->controlParent()->variant();
-    if (control_variant == INTERFACE_STMT || control_variant == INTERFACE_OPERATOR || control_variant == INTERFACE_ASSIGNMENT)
-    {
-        stmt->controlParent()->symbol()->addAttribute(ROUTINE_ATTR, (void*)1, 0);
-        return;
-    }
-    else if (control_variant != GLOBAL)
-    {
-        err("Misplaced directive",103,stmt);
-        return;
-    }      
-    if (!mod_gpu_symb)
-        CreateGPUModule();  
-   
-    SgExpression *targets_spec= NULL, *private_spec = NULL, *el;
-    
-    for (el=stmt->expr(0); el; el=el->rhs())
-    {
-         switch (el->lhs()->variant()) 
-         {
-           case ACC_TARGETS_OP:
-	     if (!targets_spec)
-             {
-                targets_spec = el->lhs();
-             }  else
-                err("Double TARGETS clause",669,stmt);
-             break;
-           case ACC_PRIVATE_OP:
-	     if (!private_spec)
-             {
-                private_spec = el->lhs();
-             }  else
-                err("Double PRIVATE clause",607,stmt);
-             break;
-          }
-    } 
-    int targets = targets_spec ? TargetsList(targets_spec->lhs()) : dvmh_targets; //stmt->expr(0) ? TargetsList(stmt->expr(0)->lhs()) : dvmh_targets;
-    targets = targets & dvmh_targets;
-    SgSymbol *s = stmt->controlParent()->symbol();
-    if(!s)
-        return; 
-    if (targets & CUDA_DEVICE)
-    { 
-        MarkAsCalled(s);
-        if (private_spec)
-            MarkPrivateArgumentsOfRoutine(s, private_spec->lhs());
-    }
-    MarkAsRoutine(s);
-    
-    return;
-}
-
-SgStatement *ACC_ACTUAL_Directive(SgStatement *stmt)
-{
-    SgExpression *e, *el;
-    SgSymbol *s;
-    int ilow, ihigh;
-
-    LINE_NUMBER_AFTER(stmt, stmt);
-
-    if (!stmt->expr(0))
-    {
-        doCallAfter(ActualAll());   //inserting after current statement
-        return(cur_st);
-    }
-
-    for (el = stmt->expr(0); el; el = el->rhs())
-    {
-        e = el->lhs();
-        s = e->symbol();
-        if (isSgVarRefExp(e))
-        {
-            doCallAfter(ActualScalar(s));
-            continue;
-        }
-        if (isSgArrayRefExp(e) && isSgArrayType(s->type()))
-        {
-            if (HEADER(s)) //is distributed array reference
-            {
-                if (!e->lhs())   //whole array
-                {
-                    doCallAfter(ActualArray(s));   //inserting after current statement
-                    continue;
-                }
-                else
-                {
-                    ChangeDistArrayRef(e->lhs());
-                    if(INTERFACE_RTS2)                  
-                        doCallAfter(ActualSubArray_2(s, Rank(s), SectionBoundsList(e)));           
-                    else
-                    {
-                        ilow = ndvm;
-                        ihigh = SectionBounds(e);
-                        doCallAfter(ActualSubArray(s, ilow, ihigh)); //inserting after current statement 
-                     }
-                }
-            }
-            else
-            {//if(isSgArrayType(s->type()))  //may be T_STRING
-                //Warning("%s is not DVM-array",s->identifier(),606,cur_region->region_dir);
-                //doCallAfter(ActualScalar(s));
-                //continue;
-                if (!e->lhs())  //whole array
-                    doCallAfter(ActualScalar(s));   //inserting after current statement
-                else
-                {
-                    ChangeDistArrayRef(e->lhs());
-                    if(INTERFACE_RTS2)                  
-                        doCallAfter(ActualSubVariable_2(s, Rank(s), SectionBoundsList(e)));           
-                    else
-                    {
-                        ilow = ndvm;
-                        ihigh = SectionBounds(e);
-                        doCallAfter(ActualSubVariable(s, ilow, ihigh)); //inserting after current statement
-                    } 
-                }
-            }
-            continue;
-        }
-        /* scalar in list is variable name !!!
-         if(isSgRecordrefExp(e) || e->variant()==ARRAY_OP)  //structure component or substring
-         {   Warning ("%s is not DVM-array",e->lhs()->symbol()->identifier(),606,stmt);
-         doCallAfter(ActualScalar(e->lhs()->symbol()));
-         continue;
-         }
-         */
-        err("Illegal element of list",636, stmt);
-        break;
-    }
-    return(cur_st);
-}
-
-SgStatement *ACC_GET_ACTUAL_Directive(SgStatement *stmt)
-{
-    SgExpression *el, *e;
-    SgSymbol *s;
-    int ilow, ihigh;
-
-    LINE_NUMBER_AFTER(stmt, stmt);
-
-    if (!stmt->expr(0))
-    {
-        doCallAfter(GetActualAll());   //inserting after current statement
-        return(cur_st);
-    }
-    for (el = stmt->expr(0); el; el = el->rhs())
-    {
-        e = el->lhs();
-        s = e->symbol();
-        if (isSgVarRefExp(e))
-        {
-            doCallAfter(GetActualScalar(s));   //inserting after current statement
-            continue;
-        }
-        if (isSgArrayRefExp(e) && isSgArrayType(s->type()))   // array reference
-        {
-            if (HEADER(s)) //is distributed array reference
-
-            {                   
-                if (!e->lhs())  //whole array
-                    doCallAfter(GetActualArray(HeaderRef(s)));   //inserting after current statement
-                else
-                {
-                    ChangeDistArrayRef(e->lhs());
-                    if(INTERFACE_RTS2)                  
-                        doCallAfter(GetActualSubArray_2(s, Rank(s), SectionBoundsList(e)));           
-                    else
-                    {
-                        ilow = ndvm;
-                        ihigh = SectionBounds(e);
-                        doCallAfter(GetActualSubArray(s, ilow, ihigh)); //inserting after current statement
-                    } 
-                }
-            }
-            else  // is not distributed array reference
-            {
-                if (!e->lhs())  //whole array
-                    doCallAfter(GetActualScalar(s));   //inserting after current statement
-                else
-                {
-                    ChangeDistArrayRef(e->lhs());
-                    if(INTERFACE_RTS2)                  
-                        doCallAfter(GetActualSubVariable_2(s, Rank(s), SectionBoundsList(e)));           
-                    else
-                    {
-                        ilow = ndvm;
-                        ihigh = SectionBounds(e);
-                        doCallAfter(GetActualSubVariable(s, ilow, ihigh)); //inserting after current statement
-                    } 
-                }
-            }
-            continue;
-        }
-        err("Illegal element of list",636, stmt);
-        break;
-    }   
-    return(cur_st);
-}
-
-
-SgStatement *ACC_END_REGION_Directive(SgStatement *stmt)
-{
-
-    dvm_debug = (cur_fragment && cur_fragment->dlevel) ? 1 : 0; //permit dvm-debugging
-
-    if (!cur_region || cur_region->is_data)
-    {
-        err("Unmatched directive", 182, stmt);
-        return(stmt);
-    }
-    if (cur_region->region_dir->controlParent() != stmt->controlParent())
-        err("Misplaced directive", 103, stmt); //region must be a block
-    if (in_checksection)
-        err("Missing END HOSTSECTION directive in region", 571, stmt);
-
-    //!!!printf("END REGION No:%d begin:%d  end:%d\n",cur_region->No,cur_region->region_dir->lineNumber(), stmt->lineNumber());
-    LINE_NUMBER_AFTER(stmt, stmt);
-    stmt->lexNext()->addComment(EndRegionComment(cur_region->region_dir->lineNumber()));
-    DeleteNonDvmArrays();
-    InsertNewStatementAfter(EndRegion(cur_region->No), cur_st, stmt->controlParent());
-    //cur_st->addComment(EndRegionComment(cur_region->region_dir->lineNumber()));
-
-    SET_DVM(cur_region->No);  //SET_GPU(cur_region->No);
-    region_list *p = cur_region;
-    cur_region = cur_region->next;
-    free(p);
-    return(cur_st);
-}
-
-
-SgStatement *ACC_REGION_Directive(SgStatement *stmt)
-{
-    SgExpression *eop, *el, *tl;
-    int intent, irgn, user_targets, region_targets;
-
-    // inhibit dvm-debugging inside region !
-    dvm_debug = 0;
-
-    // initialization
-    has_region = 1;
-    user_targets = 0;
-
-    in_checksection = 0;
-
-    if (inparloop)
-        err("Misplaced directive", 103, stmt);
-    if (cur_region && !cur_region->is_data)
-        err("Nested compute regions are not permitted", 601, stmt);
-    if(rma)
-        err("REGION directive within the scope of REMOTE_ACCESS directive", 631, stmt);
-    irgn = ndvm++;
-    NewRegion(stmt, irgn, 0);
-    if(AnalyzeRegion(stmt)==1)   // AnalyzeRegion creates uses list for region
-    {   // no END REGION directive 
-        cur_region = cur_region->next; //closing region
-        dvm_debug = (cur_fragment && cur_fragment->dlevel) ? 1 : 0; //permit dvm-debugging
-        return(cur_st);
-    }
-               //printf("REGION No:%d begin:%d  %d\n",cur_region->No,cur_region->region_dir->lineNumber(), stmt->lineNumber());
-    LINE_NUMBER_AFTER(stmt, stmt);
-    //DoHeadersForNonDvmArrays();
-    non_dvm_list = NULL;
-    by_value_list = NULL;
-
-    doAssignTo_After(DVM000(irgn), RegionCreate(0));   //RegionCreate((region_compare ? REGION_COMPARE_DEBUG : 0))); 
-    cur_st->addComment(RegionComment(stmt->lineNumber()));
-    where = cur_st;
-    for (el = stmt->expr(0); el; el = el->rhs())
-    {
-        eop = el->lhs();
-        if (eop->variant() == ACC_TARGETS_OP)
-        {
-            user_targets =  TargetsList(eop->lhs());
-         /*
-            for (tl = eop->lhs(); tl; tl = tl->rhs())
-            if (tl->lhs()->variant() == ACC_CUDA_OP)
-                //targets[CUDA] = 1;
-                user_targets = user_targets | CUDA_DEVICE;
-            else if (tl->lhs()->variant() == ACC_HOST_OP)
-                //targets[HOST] = 1;
-                user_targets = user_targets | HOST_DEVICE;
-            //targets_on = 1;
-          */
-            continue;
-        }
-        if (eop->variant() == ACC_ASYNC_OP)
-        {
-            RegionRegimConst(REGION_ASYNC);
-            err("Clause ASYNC is not implemented yet", 579, stmt);
-            continue;
-        }
-        switch (eop->variant())
-        {
-        case(ACC_INOUT_OP) : intent = INTENT_INOUT;   break;
-        case(ACC_IN_OP) : intent = INTENT_IN;      break;
-        case(ACC_OUT_OP) : intent = INTENT_OUT;     break;
-        case(ACC_LOCAL_OP) : intent = INTENT_LOCAL;   break;
-        case(ACC_INLOCAL_OP) : intent = INTENT_INLOCAL; break;
-        default:                     intent = 0;
-            err("Illegal clause in dvmh-directive", 600, stmt);
-            continue;//break;
-        }
-        RegisterVariablesInRegion(eop->lhs(), intent, irgn);
-    }
-
-    RegisterUses(irgn);
-    RegisterDvmArrays(irgn);
-
-    if (user_targets != 0)
-    {
-        region_targets = user_targets & dvmh_targets;
-        if (region_targets == 0)
-            region_targets = HOST_DEVICE;
-        if (region_targets != user_targets)
-            Warning("Demoting targets for region to %s", DevicesString(region_targets), 611, stmt);
-        if ((cur_region->targets & region_targets) != region_targets)
-            Error("Impossible to execute region on %s", DevicesString(user_targets), 612, stmt);
-        cur_region->targets = region_targets;
-    }
-    else
-    {
-        if (cur_region->targets != dvmh_targets)
-            Warning("Demoting targets for region to %s", DevicesString(cur_region->targets), 611, stmt);
-    }
-
-    //if(!targets_on)
-    //   for(i=Ndev-1; i; i--)   // set targets by default
-    //     targets[i]=1;
-    //if(options.isOn(NO_CUDA)) // by option -noCuda
-    //    targets[CUDA] = 0;
-
-    InsertNewStatementAfter(RegionForDevices(irgn, DevicesExpr(cur_region->targets)), cur_st, cur_st->controlParent());
-
-    //InsertNewStatementAfter(StartRegion(irgn),cur_st,cur_st->controlParent());  /*22.11.12*/
-
-
-    // creating lists of registered variables in procedure
-        acc_registered_list = SymbolListsUnion(acc_registered_list, acc_array_list);
-        registered_uses_list = ExpressionListsUnion(registered_uses_list, uses_list);
-
-    return(cur_st);
-}
-
-int TargetsList(SgExpression *tgs)
-{
-    SgExpression *tl;
-    int user_targets = 0;
-    for (tl = tgs; tl; tl = tl->rhs())
-        if (tl->lhs()->variant() == ACC_CUDA_OP)
-            user_targets = user_targets | CUDA_DEVICE;
-        else if (tl->lhs()->variant() == ACC_HOST_OP)
-            user_targets = user_targets | HOST_DEVICE;
-    return (user_targets); 
-}
-
-void RegisterVariablesInRegion(SgExpression *evl, int intent, int irgn)
-{
-    SgExpression *el, *e;
-    SgSymbol *s;
-    int ilow, ihigh;
-
-    for (el = evl; el; el = el->rhs())
-    {
-        e = el->lhs();
-        s = e->symbol();
-        if (e->variant() == CONST_REF || s->attributes() & PARAMETER_BIT)
-        {
-            by_value_list = AddNewToSymbList(by_value_list, s);
-            continue;
-        }
-        if (isSgVarRefExp(e))
-        {   //Warning("%s is not DVM-array",s->identifier(),606,cur_region->region_dir); //!!!
-            MarkAsRegistered(s);
-            if (!isInUsesList(s))
-            {
-                by_value_list = AddNewToSymbList(by_value_list, s);
-                continue;
-            }
-
-            if (intent == INTENT_IN && (CorrectIntent(e)) == INTENT_IN)
-            {
-                by_value_list = AddNewToSymbList(by_value_list, s);
-                continue;
-            }
-            else
-            {
-                if(INTERFACE_RTS2)
-                   doCallAfter(RegionRegisterScalar(irgn, IntentConst(intent), s)); 
-                else
-                {
-                   doCallAfter(RegisterScalar(irgn, IntentConst(intent), s));
-                   doCallAfter(SetVariableName(irgn, s));
-                }
-            }
-            continue;
-        }
-        if (isSgArrayRefExp(e))
-        {
-            if (isSgArrayType(s->type())) //is array reference or is not string
-
-            {
-                if (!HEADER(s) && !isIn_acc_array_list(s) && !isInSymbList(s, tie_list))  //reduction array is not included in acc_array_list and not registered
-                    //!!!  && !HEADER_OF_REPLICATED(s) is wrong: may be used in previous region as not reduction array          
-                {      //doCallAfter(RegisterScalar(irgn,IntentConst(intent),s));  //must be destroyed!!!              
-                    //Warning("%s is not DVM-array",s->identifier(),606,cur_region->region_dir);
-                    continue;
-                }
-
-                MarkAsRegistered(s);
-
-                if (!HEADER(s) && HEADER_OF_REPLICATED(s) && *HEADER_OF_REPLICATED(s) == 0)
-                    HeaderForNonDvmArray(s, cur_region->region_dir); //creating header (HEADER_OF_REPLICATED) for non-dvm array
-
-                if (!e->lhs())  //whole array
-                {
-                    if(INTERFACE_RTS2)                     
-                        doCallAfter(RegionRegisterArray(irgn, IntentConst(intent), s));
-                    else
-                    { 
-                        doCallAfter(RegisterArray(irgn, IntentConst(intent), s));
-                        doCallAfter(SetArrayName(irgn, s));
-                    }
-                    continue;
-                }
-                else
-                {                    
-                    if(INTERFACE_RTS2)                    
-                        doCallAfter(RegionRegisterSubArray(irgn, IntentConst(intent), s, SectionBoundsList(e)));           
-                    else
-                    {
-                        ilow = ndvm;
-                        ihigh = SectionBounds(e);
-                        doCallAfter(RegisterSubArray(irgn, IntentConst(intent), s, ilow, ihigh));                      
-                        doCallAfter(SetArrayName(irgn, s));
-                    }
-                    continue;
-                }
-                //if( !HEADER(s) )       // deleting created header for RTS
-                //  doAssignStmtAfter(DeleteObject(DVM000(*HEADER_OF_REPLICATED(s))));
-            }
-            else  // scalar variable of type character*(n)
-            {
-                MarkAsRegistered(s);
-                if(INTERFACE_RTS2) 
-                    doCallAfter(RegionRegisterScalar(irgn, IntentConst(intent), s)); 
-                else
-                {
-                    doCallAfter(RegisterScalar(irgn, IntentConst(intent), s));                
-                    doCallAfter(SetVariableName(irgn, s));
-                }
-                continue;
-            }
-
-        }
-    }
-}
-
-void RegisterUses(int irgn)
-{
-    SgExpression *el;
-
-    for (el = uses_list; el; el = el->rhs())
-    {    
-        if (el->lhs()->variant() == CONST_REF || el->lhs()->symbol()->attributes() & PARAMETER_BIT) // is named constant 
-        {
-            by_value_list = AddNewToSymbList(by_value_list, el->lhs()->symbol());
-            continue;
-        }
-        if (*VAR_INTENT(el) == EMPTY) continue;  // is registered early by user specification in REGION directive
-        
-        if (*VAR_INTENT(el) == INTENT_IN)   // this variable doesn't need to be registered
-        { // inserting call dvmh_get_actual_variable() before dvm000(i) = region_create()
-            where->insertStmtBefore(*GetActualScalar(el->lhs()->symbol()), *cur_region->region_dir->controlParent());
-            by_value_list = AddNewToSymbList(by_value_list, el->lhs()->symbol());
-            continue;
-        }
-        if(INTERFACE_RTS2)
-            doCallAfter(RegionRegisterScalar(irgn, IntentConst(*VAR_INTENT(el)), el->lhs()->symbol()));
-        else
-        {
-            doCallAfter(RegisterScalar(irgn, IntentConst(*VAR_INTENT(el)), el->lhs()->symbol()));
-            doCallAfter(SetVariableName(irgn, el->lhs()->symbol()));
-        }
-
-    }
-}
-
-void RegisterDvmArrays(int irgn)
-{
-    symb_list *sl;
-
-    for (sl = acc_array_list; sl; sl = sl->next)
-    {
-        // is not registered yet
-        if ((sl->symb->attributes() & USE_IN_BIT) || (sl->symb->attributes() & USE_OUT_BIT))
-        {
-            if (!HEADER(sl->symb))
-                HeaderForNonDvmArray(sl->symb, cur_region->region_dir); //creating header (HEADER_OF_REPLICATED) for non-dvm array 
-            if(INTERFACE_RTS2)
-                doCallAfter(RegionRegisterArray(irgn, IntentConst(IntentMode(sl->symb)), sl->symb));
-            else
-            {
-                doCallAfter(RegisterArray(irgn, IntentConst(IntentMode(sl->symb)), sl->symb));            
-                doCallAfter(SetArrayName(irgn, sl->symb));
-            }
-        }
-    }
-    for (sl = parallel_on_list; sl; sl = sl->next)
-    {
-        if (sl->symb)
-        {
-            if (!HEADER(sl->symb))
-                HeaderForNonDvmArray(sl->symb, cur_region->region_dir); //creating header (HEADER_OF_REPLICATED) for non-dvm array in TIE-clause
-
-            if(INTERFACE_RTS2)
-                doCallAfter(RegionRegisterArray(irgn, IntentConst(EMPTY), sl->symb));
-            else
-            {     
-                doCallAfter(RegisterArray(irgn, IntentConst(EMPTY), sl->symb));
-                doCallAfter(SetArrayName(irgn, sl->symb));
-            }
-        }
-    }
-}
-
-int IntentMode(SgSymbol *s)
-{
-    int intent = 0;
-    symb_list *sl;
-    if ((s->attributes() & USE_IN_BIT) && (s->attributes() & USE_OUT_BIT))
-    {
-        intent = INTENT_INOUT;
-        SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) & ~USE_IN_BIT;
-        SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) & ~USE_OUT_BIT;
-    }
-    else if (s->attributes() & USE_IN_BIT)
-    {
-        intent = INTENT_IN;
-        SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) & ~USE_IN_BIT;
-    }
-    else if (s->attributes() & USE_OUT_BIT)
-    {
-        intent = INTENT_INOUT;           //14.03.12 OUT=>INOUT
-        SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) & ~USE_OUT_BIT;
-    }
-    if ((sl = isInSymbList(s, parallel_on_list)))
-        sl->symb = NULL;  // clear corresponding element of parallel_on_list  
-
-    return(intent);
-}
-
-void MarkAsRegistered(SgSymbol *s)
-{
-    SgExpression *use;
-
-
-    if (HEADER(s) || HEADER_OF_REPLICATED(s)) //is distributed array 
-    {
-        IntentMode(s);  //clear  INTENT bits
-        return;
-    }
-    if ((use = isInUsesList(s)) != 0)
-        *VAR_INTENT(use) = EMPTY; //set INTENT attribute value to 0
-    return;
-}
-
-int CorrectIntent(SgExpression *e)
-{
-    SgExpression *el, *eop;
-    int intent = INTENT_IN;
-    for (el = cur_region->region_dir->expr(0); el; el = el->rhs())
-    {
-        eop = el->lhs();
-        switch (eop->variant())
-        {
-        case(ACC_INOUT_OP) : if (isInExprList(e, eop->lhs()))  {
-                                 intent = INTENT_INOUT;   return(intent);
-        }
-                             continue;
-
-        case(ACC_OUT_OP) : if (isInExprList(e, eop->lhs()))  {
-                               intent = INTENT_OUT;     return(intent);
-        }
-                           continue;
-
-        case(ACC_LOCAL_OP) : if (isInExprList(e, eop->lhs()))  {
-                                 intent = INTENT_LOCAL;   return(intent);
-        }
-                             continue;
-
-        case(ACC_INLOCAL_OP) : if (isInExprList(e, eop->lhs()))  {
-                                   intent = INTENT_INLOCAL; return(intent);
-        }
-                               continue;
-
-        default:                    continue;
-        }
-    }
-    return(intent);
-}
-
-void doNotForCuda()
-{
-    cur_region->targets = cur_region->targets & ~CUDA_DEVICE;
-}
-
-int isForCudaRegion()
-{
-    if (cur_region && cur_region->targets & CUDA_DEVICE)
-        return(1);
-    else
-        return(0);
-}
-
-char * DevicesString(int targets)
-{
-    char *str = new char[20];
-    str[0] = '\0';
-    if (targets & HOST_DEVICE)
-        strcpy(str, "HOST ");
-    if (targets & CUDA_DEVICE)
-        strcat(str, "CUDA");
-    return(str);
-}
-
-SgExpression *DevicesExpr(int targets)
-{
-    SgExpression *de = NULL, *e;
-    if (targets & HOST_DEVICE)
-        de = new SgVarRefExp(DeviceTypeConst(HOST));   //device_const[HOST]);
-    if (targets & CUDA_DEVICE)
-    {
-        e = new SgVarRefExp(DeviceTypeConst(CUDA));    //device_const[CUDA]);
-        de = de ? IorFunction(de, e) : e;
-    }
-    return(de);
-}
-
-/*
-SgExpression *DevicesExpr(int targets[])
-{int i;
-SgExpression *de,*e;
-for(i=Ndev-1,de=NULL; i; i--)
-if (targets[i])
-{   e = new SgVarRefExp(device_const[i]);
-de = de ? IorFunction(de,e) : e;
-}
-return(de);
-}
-*/
-SgExpression *HandlerExpr() /* OpenMP */
-{
-    int i;
-    SgExpression *de, *e;
-    if (has_max_minloc)
-        return(ConstRef(0));
-
-    for (i = Nhandler - 1, de = NULL; i; i--)
-    {
-        e = new SgVarRefExp(HandlerTypeConst(i));  //handler_const[i]);
-        de = de ? IorFunction(de, e) : e;
-    }
-    return(de);
-}
-
-int isIn_acc_array_list(SgSymbol *s)
-{
-    symb_list *sl;
-    if (!s)
-        return (0);
-    for (sl = acc_array_list; sl; sl = sl->next)
-    if (sl->symb == s)
-        return(1);
-    return(0);
-}
-
-void NewRegion(SgStatement *stmt, int n, int data_flag)
-{
-    region_list * curreg;
-    curreg = new region_list;
-    curreg->is_data = data_flag;
-    curreg->No = n;
-    curreg->region_dir = stmt;
-    curreg->cur_do_dir = NULL;
-    curreg->Lnums = 0;
-    curreg->next = cur_region;
-    curreg->targets = dvmh_targets;
-    cur_region = curreg;
-    return;
-}
-
-void FlagStatement(SgStatement *st)
-{
-    st->addAttribute(STATEMENT_GROUP, (void*)1, 0);
-}
-
-void MarkAsInsertedStatement(SgStatement *st)
-{
-    st->addAttribute(INSERTED_STATEMENT, (void*)1, 0);
-}
-
-void DeleteNonDvmArrays()
-{
-    symb_list *sl;
-    for (sl = non_dvm_list; sl; sl = sl->next)
-    if (HEADER_OF_REPLICATED(sl->symb))
-    {        //doCallAfter(  DestroyArray(DVM000(*HEADER_OF_REPLICATED(sl->symb))));
-        SgExpression *header_ref = DVM000(*HEADER_OF_REPLICATED(sl->symb));
-        doCallAfter(INTERFACE_RTS2 ? ForgetHeader(header_ref) : DeleteObject_H(header_ref));
-        *HEADER_OF_REPLICATED(sl->symb) = 0;
-    }
-}
-
-void StoreLowerBoundsOfNonDvmArray(SgSymbol *ar)
-// generating assign statements to
-//store lower bounds of array in Header(rank+3:2*rank+2)
-
-{
-    int i, rank, ind;
-    SgExpression *le;
-    rank = Rank(ar);
-    ind = *HEADER_OF_REPLICATED(ar);
-    for (i = 0; i < rank; i++)
-    {
-        le = Exprn(LowerBound(ar, i));
-        doAssignTo_After(DVM000(ind + rank + 2 + i), le);  //header_ref(ar,rank+3+i)
-    }
-}
-
-SgExpression *HeaderForArrayInParallelDir(SgSymbol *ar, SgStatement *st, int err_flag)
-{
-    if(HEADER(ar)) 
-      return HeaderRef(ar);     
-    if(st->expr(0) && err_flag)
-    {
-       Error("'%s' isn't distributed array", ar->identifier(), 72, st);   
-       return DVM000(0);  //for the correct completion
-    }
-    if(HEADER_OF_REPLICATED(ar) && *HEADER_OF_REPLICATED(ar) != 0)
-       return DVM000(*HEADER_OF_REPLICATED(ar));
-    if(!HEADER_OF_REPLICATED(ar)) 
-    {
-       int *id = new int;
-       *id = 0;
-       ar->addAttribute(REPLICATED_ARRAY, (void *)id, sizeof(int));      
-    }   
-    *HEADER_OF_REPLICATED(ar) = ndvm;
-    HeaderForNonDvmArray(ar, st);
-    return DVM000(*HEADER_OF_REPLICATED(ar));
-}
-
-int HeaderForNonDvmArray(SgSymbol *s, SgStatement *stat)
-{
-    int dvm_ind, static_sign, re_sign, rank, i;
-    SgExpression *size_array;
-
-    // creating list of non-dvm-arrays for deleting after region
-    if (IN_COMPUTE_REGION)
-        non_dvm_list = AddNewToSymbList(non_dvm_list, s);
-
-    rank = Rank(s);
-    dvm_ind = ndvm;  //header index
-    if (IN_COMPUTE_REGION)
-        *HEADER_OF_REPLICATED(s) = dvm_ind;
-    ndvm += 2 * rank + DELTA;   // extended header
-    if(INTERFACE_RTS2)
-    {
-        doCallAfter(CreateDvmArrayHeader_2(s, DVM000(dvm_ind), rank, doShapeList(s,stat)));
-        if (TestType_RTS2(s->type()->baseType()) == -1)
-             Error("Array reference of illegal type in region: %s ", s->identifier(), 583, stat);
-        return (dvm_ind);
-    }  
-    //store lower bounds of array in Header(rank+3:2*rank+2)
-    for (i = 0; i < rank; i++)
-        doAssignTo_After(DVM000(dvm_ind + rank + 2 + i), Calculate(LowerBound(s, i)));  //header_ref(ar,rank+3+i)    
-
-    static_sign = 1; // staticSign
-    size_array = DVM000(ndvm);
-    re_sign = 0;     // created array may not be redistributed 
-
-    doCallAfter(CreateDvmArrayHeader(s, DVM000(dvm_ind), size_array, rank, static_sign, re_sign));
-    if (TypeIndex(s->type()->baseType()) == -1)
-        Error("Array reference of illegal type in region: %s ", s->identifier(), 583, stat);
-    where = cur_st;
-    doSizeFunctionArray(s, stat);
-    cur_st = where;
-    return (dvm_ind);
-}
-
-void DoHeadersForNonDvmArrays()
-{
-    symb_list *sl;
-    int dvm_ind, static_sign, re_sign, rank, i;
-    SgExpression *size_array;
-    SgStatement *save = cur_st;
-    non_dvm_list = NULL;
-    if(!INTERFACE_RTS2)
-      cur_st = dvm_parallel_dir->lexNext();
-    for (sl = acc_array_list; sl; sl = sl->next)
-      if (!HEADER(sl->symb))
-      {
-        non_dvm_list = AddToSymbList(non_dvm_list, sl->symb); // creating list of non-dvm-arrays for deleting after region
-        rank = Rank(sl->symb);
-        dvm_ind = ndvm;  //header index
-        // adding the attribute  REPLICATED_ARRAY to non-dvm-array
-        if (!HEADER_OF_REPLICATED(sl->symb))
-        {
-            int *id = new int;
-            *id = 0;
-            sl->symb->addAttribute(REPLICATED_ARRAY, (void *)id, sizeof(int));
-        }
-        // adding the attribute  DUMMY_ARRAY to non-dvm-array 
-        if (!DUMMY_FOR_ARRAY(sl->symb))
-        {
-            SgSymbol **dummy = new (SgSymbol *);
-            *dummy = NULL;
-            sl->symb->addAttribute(DUMMY_ARRAY, (void*)dummy, sizeof(SgSymbol *));
-        }
-        if(*HEADER_OF_REPLICATED(sl->symb) != 0)
-            continue;
-        *HEADER_OF_REPLICATED(sl->symb) = dvm_ind;
-        ndvm += 2 * rank + DELTA;   // extended header
-        if(INTERFACE_RTS2)
-        {
-            doCallAfter(CreateDvmArrayHeader_2(sl->symb, DVM000(dvm_ind), rank, doShapeList(sl->symb,dvm_parallel_dir)));
-            if (TestType_RTS2(sl->symb->type()->baseType()) == -1)
-                Error("Array reference of illegal type in region: %s ", sl->symb->identifier(), 583, dvm_parallel_dir);
-            continue;
-        }  
-
-        //store lower bounds of array in Header(rank+3:2*rank+2)
-        for (i = 0; i < rank; i++)
-            doAssignTo_After(DVM000(dvm_ind + rank + 2 + i), Calculate(LowerBound(sl->symb, i)));  //header_ref(ar,rank+3+i)    
-
-        static_sign = 1; // staticSign
-        size_array = DVM000(ndvm);
-        re_sign = 0;     // aligned array may not be redistributed 
-
-        doCallAfter(CreateDvmArrayHeader(sl->symb, DVM000(dvm_ind), size_array, rank, static_sign, re_sign));
-        if (TypeIndex(sl->symb->type()->baseType()) == -1)
-            Error("Array reference of illegal type in parallel loop: %s", sl->symb->identifier(), 583, dvm_parallel_dir);
-
-        where = cur_st;
-        doSizeFunctionArray(sl->symb, dvm_parallel_dir);
-        cur_st = where;
-      }
-    if(!INTERFACE_RTS2)
-      cur_st = save;
-}
-
-int AnalyzeRegion(SgStatement *reg_dir) //AnalyzeLoopBody()  AnalyzeBlock()
-{
-    SgStatement *stmt, *save, *begin;
-    int analysis_err = 0;
-    uses_list = NULL;
-    acc_array_list = NULL;
-    parallel_on_list = NULL;
-    tie_list = NULL;
-    save = cur_st;
-    analyzing = 1;
-    
-    for (stmt = reg_dir->lexNext(); stmt; stmt = stmt->lexNext())
-    {
-        cur_st = stmt;
-
-        // does statement belong to statement group of region?
-        if (stmt->controlParent() == reg_dir->controlParent() && !in_checksection && !inparloop
-            && stmt->variant() != DVM_PARALLEL_ON_DIR && stmt->variant() != OMP_PARALLEL_DIR
-            && stmt->variant() != ACC_CHECKSECTION_DIR && stmt->variant() != ACC_END_CHECKSECTION_DIR
-            && stmt->variant() != ACC_END_REGION_DIR
-            && stmt->variant() != DVM_INTERVAL_DIR && stmt->variant() != DVM_ENDINTERVAL_DIR
-           // && stmt->variant() != DVM_ON_DIR && stmt->variant() != DVM_END_ON_DIR
-            && stmt->variant() != FORMAT_STAT && stmt->variant() != DATA_DECL)
-            FlagStatement(stmt);   // statement belongs to statement group of region  
-        // add attribute STATEMENT_GROUP
-
-        switch (stmt->variant())
-        {
-            // FORMAT_STAT, ENTRY_STAT, DATA_DECL may appear among executable statements
-        case ENTRY_STAT: //error
-        case CONTAINS_STMT: //error
-        case RETURN_STAT:
-            err("Illegal statement in region", 578, cur_st);
-            continue;
-        case STOP_STAT:
-            warn("STOP statement in region", 578, cur_st);
-            doNotForCuda();
-        case FORMAT_STAT:
-        case DATA_DECL:
-            continue;
-        case CONTROL_END:
-            if (stmt->controlParent() == cur_func)
-            {
-                err("Missing END REGION directive", 603, stmt);
-                analysis_err = 1;
-                goto END_ANALYS;
-            }
-            else
-                break;
-        case ASSIGN_STAT:           // Assign statement               
-            RefInExpr(stmt->expr(1), _READ_);
-            RefInExpr(stmt->expr(0), _WRITE_);
-            break;
-
-        case POINTER_ASSIGN_STAT:           // Pointer assign statement               
-            RefInExpr(stmt->expr(1), _READ_);   // ???? _READ_ ????
-            RefInExpr(stmt->expr(0), _WRITE_);
-            break;
-
-        case WHERE_NODE:
-            RefInExpr(stmt->expr(0), _READ_);
-            RefInExpr(stmt->expr(1), _WRITE_);
-            RefInExpr(stmt->expr(2), _READ_);
-            break;
-
-        case WHERE_BLOCK_STMT:
-        case SWITCH_NODE:           // SELECT CASE ...
-        case ARITHIF_NODE:          // Arithmetical IF
-        case IF_NODE:               // IF... THEN
-        case CASE_NODE:             // CASE ...
-        case ELSEIF_NODE:           // ELSE IF...
-        case LOGIF_NODE:            // Logical IF
-        case WHILE_NODE:            // DO WHILE (...) 
-            RefInExpr(stmt->expr(0), _READ_);
-            break;
-
-        case COMGOTO_NODE:          // Computed GO TO
-            RefInExpr(stmt->expr(1), _READ_);
-            break;
-
-        case PROC_STAT:              // CALL
-            Call(stmt->symbol(), stmt->expr(0));
-            break;
-
-        case FOR_NODE:
-            //!!!stmt->symbol()
-            RefInExpr(new SgVarRefExp(stmt->symbol()), _WRITE_);
-            RefInExpr(stmt->expr(0), _READ_);
-            RefInExpr(stmt->expr(1), _READ_);
-            break;
-
-        case FORALL_NODE:
-        case FORALL_STAT:
-            err("FORALL statement", 7, stmt);
-            break;
-
-        case ALLOCATE_STMT:
-            err("Illegal statement in compute region", 578, cur_st);
-            //err("ALLOCATE/DEALLOCATE statement in parallel loop",588,stmt);
-            //RefInExpr(stmt->expr(0), _NUL_);           
-            break;
-
-        case DEALLOCATE_STMT:
-            err("Illegal statement in compute region", 578, cur_st);
-            //err("ALLOCATE/DEALLOCATE statement in parallel loop",588,stmt);
-            break;
-
-        case DVM_IO_MODE_DIR:
-             continue;
-        case OPEN_STAT:
-        case CLOSE_STAT:
-        case INQUIRE_STAT:
-            {SgExpression *ioc[NUM__O];
-             control_list_open(stmt->expr(1), ioc); // control_list analysis
-       /* 
-        if (!io_err && !inparloop) {
-            err("Illegal elements in control list", 185, stmt);
-            break;
-        }
-        if (ioc[ERR_] && !inparloop){
-            err("END= and ERR= specifiers are illegal in FDVM", 186, stmt);
-            break;
-        }
-       */
-             //warn("Input/Output statement in region",587,stmt);
-             RefInControlList_Inquire(ioc, NUM__O);
-             doNotForCuda();
-             break;
-            }
-        case BACKSPACE_STAT:
-        case ENDFILE_STAT:
-        case REWIND_STAT:
-            {SgExpression *ioc[NUM__R];
-             control_list1(stmt->expr(1), ioc); // control_list analysis
-       /*
-        if (!io_err && !inparloop) {
-            err("Illegal elements in control list", 185, stmt);
-            break;
-        }
-        if ((ioc[END_] || ioc[ERR_]) && !inparloop)
-            err("END= and ERR= specifiers are not allowed in FDVM", 186, stmt);
-       */
-             //warn("Input/Output statement in region",587,stmt);
-             RefInControlList(ioc, NUM__R);
-             doNotForCuda();
-             break;
-            }
-        case WRITE_STAT:
-        case READ_STAT:
-        case PRINT_STAT:
-            {SgExpression *ioc[NUM__R];
-
-             // analizes IO control list and sets on ioc[]                                   
-             IOcontrol(stmt->expr(1), ioc, stmt->variant());
-      /*
-        if (!io_err && !inparloop){
-            err("Illegal elements in control list", 185, stmt);
-            break;
-        }
-        if ((ioc[END_] || ioc[ERR_] || ioc[EOR_]) && !inparloop){
-            err("END=, EOR= and ERR= specifiers are illegal in FDVM", 186, stmt);
-            break;
-        }
-       */
-            //warn("Input/Output statement in region",587,stmt);
-            RefInControlList(ioc, NUM__R);
-            RefInIOList(stmt->expr(0), (stmt->variant() == READ_STAT ? _WRITE_ : _READ_));
-            doNotForCuda();
-            break;
-           }
-
-        case DVM_PARALLEL_ON_DIR:
-            if(!TestParallelWithoutOn(stmt,0) || !TestParallelDirective(stmt,0,0,NULL))
-               continue;     // directive is ignored
-            inparloop = 1;
-            dvm_parallel_dir = stmt;
-               
-            ParallelOnList(stmt);  // add target array reference to list 
-            TieList(stmt);
-            par_do = stmt->lexNext();
-            while (par_do->variant() != FOR_NODE)
-                par_do = par_do->lexNext();
-            DoPrivateList(stmt);
-
-            red_struct_list = NULL;
-            CreateStructuresForReductions(DoReductionOperationList(stmt));    
-            continue;
-
-        case ACC_END_REGION_DIR:   //end of compute region
-            //if(reg_dir->controlParent() == stmt->controlParent())
-            goto END_ANALYS;
-
-        case ACC_REGION_DIR:
-            err("Nested compute regions are not permitted", 601, stmt);
-            //continue;
-            goto END_ANALYS;
-
-        case ACC_CHECKSECTION_DIR:
-            // omitting statements until section end
-            begin = stmt;
-            while (stmt && stmt->variant() != ACC_END_CHECKSECTION_DIR && stmt->variant() != ACC_END_REGION_DIR)
-            {
-                if (stmt->variant() == ACC_ACTUAL_DIR || stmt->variant() == ASSIGN_STAT || stmt->variant() == DVM_PARALLEL_ON_DIR)
-                    err("llegal statement/directive in the range of host-section", 572, stmt);
-                stmt = stmt->lexNext();
-            }
-            if (stmt->variant() == ACC_END_CHECKSECTION_DIR)
-            {
-                if (begin->controlParent() != stmt->controlParent())
-                    err("Misplaced directive", 103, stmt); // section must be a block
-                continue;
-            }
-
-            err("Missing END HOSTSECTION directive in region", 571, stmt);
-            if (stmt->variant() != ACC_END_REGION_DIR)
-            {
-                stmt = stmt->lexPrev();
-
-                continue;
-            }
-            else
-                goto END_ANALYS;
-
-        case ACC_END_CHECKSECTION_DIR:
-            err("Unmatched directive", 182, stmt);
-            continue;
-
-        case DVM_ON_DIR:
-             RefInExpr(stmt->expr(0), _READ_);
-             continue;   
-        case DVM_END_ON_DIR:     
-             continue;
-
-        case ACC_GET_ACTUAL_DIR:
-        case ACC_ACTUAL_DIR:
-
-        case DVM_ASYNCHRONOUS_DIR:
-        case DVM_ENDASYNCHRONOUS_DIR:
-        case DVM_REDUCTION_START_DIR:
-        case DVM_REDUCTION_WAIT_DIR:
-        case DVM_SHADOW_GROUP_DIR:
-        case DVM_SHADOW_START_DIR:
-        case DVM_SHADOW_WAIT_DIR:
-        case DVM_REMOTE_ACCESS_DIR:
-        case DVM_NEW_VALUE_DIR:
-        case DVM_REALIGN_DIR:
-        case DVM_REDISTRIBUTE_DIR:
-        case DVM_ASYNCWAIT_DIR:
-        case DVM_F90_DIR:
-        case DVM_CONSISTENT_START_DIR:
-        case DVM_CONSISTENT_WAIT_DIR:
-            //       case DVM_INTERVAL_DIR:
-            //       case DVM_ENDINTERVAL_DIR:
-        case DVM_OWN_DIR:
-        case DVM_DEBUG_DIR:
-        case DVM_ENDDEBUG_DIR:
-        case DVM_TRACEON_DIR:
-        case DVM_TRACEOFF_DIR:
-        case DVM_BARRIER_DIR:
-        case DVM_CHECK_DIR:
-        case DVM_TASK_REGION_DIR:
-        case DVM_END_TASK_REGION_DIR:
-            //case DVM_ON_DIR:
-            //case DVM_END_ON_DIR:
-        case DVM_MAP_DIR:
-        case DVM_RESET_DIR:
-        case DVM_PREFETCH_DIR:
-        case DVM_PARALLEL_TASK_DIR:
-        case DVM_LOCALIZE_DIR:
-        case DVM_SHADOW_ADD_DIR:
-            err("Illegal DVMH-directive in compute region", 577, stmt);
-            continue;
-        default:
-            break;
-        }
-        {SgStatement *end_stmt;
-        end_stmt = isSgLogIfStmt(stmt->controlParent()) ? stmt->controlParent() : stmt;
-      
-        if (inparloop && isParallelLoopEndStmt(end_stmt,par_do)) //end of parallel loop
-        {  
-            inparloop = 0; dvm_parallel_dir = NULL; private_list = NULL;  cur_region->cur_do_dir = NULL;
-            red_struct_list = NULL;
-        }
-        }
-
-    } //end for
-END_ANALYS:
-    cur_st = save;
-    analyzing = 0;
-    inparloop = 0;
-    return(analysis_err);
-}
-
-int  WithAcrossClause()
-{
-    SgExpression *el;
-    // looking through the specification list
-    for (el = dvm_parallel_dir->expr(1); el; el = el->rhs())
-    {
-        if (el->lhs()->variant() == ACROSS_OP)
-            return(1);
-    }
-    return(0);
-}
-
-void ACC_ParallelLoopEnd(SgStatement *pardo)
-{   
-    AddRemoteAccessBufferList_ToArrayList(); // add to acc_array_list remote_access buffer array symbols
-
-    if (options.isOn(O_HOST))  //dvm-array references in host handler are not linearised (do not changed)
-        for_host = 0;
-
-    if (cur_region && cur_region->targets & CUDA_DEVICE)  //if(targets[CUDA]) 
-    {
-        SgStatement* cuda_kernel = NULL;
-
-        if (WithAcrossClause())
-            // creating Cuda-handlers and Cuda-kernels for loop with ACROSS clause.
-            Create_C_Adapter_Function_Across(adapter_symb);
-        else
-        {
-            for (unsigned k = 0; k < countKernels; ++k)
-            {
-                loop_body = CopyOfBody.top();
-                CopyOfBody.pop();
-
-                //enabled analysis for each parallel loop for CUDA
-                if (options.isOn(LOOP_ANALYSIS))
-                    currentLoop = new Loop(loop_body, options.isOn(OPT_EXP_COMP), options.isOn(GPU_IRR_ACC));
-
-                std::string new_kernel_symb = kernel_symb->identifier();
-                if (rtTypes[k] == rt_INT)
-                    new_kernel_symb += "_int";
-                else if (rtTypes[k] == rt_LONG)
-                    new_kernel_symb += "_long";
-                else if (rtTypes[k] == rt_LLONG)
-                    new_kernel_symb += "_llong";
-
-                SgSymbol *kernel_symbol = new SgSymbol(PROCEDURE_NAME, new_kernel_symb.c_str(), *mod_gpu);
-                if (options.isOn(C_CUDA))
-                    kernel_symbol->setType(C_VoidType());
-
-                if (options.isOn(GPU_O1)) //optimization by option -gpuO1
-                {
-                    AnalyzeReturnGpuO1 infoGpuO1 = analyzeLoopBody(NON_ACROSS_TYPE);
-                    int InternalPosition = -1;
-                    for (size_t i = 0; i < infoGpuO1.allArrayGroup.size(); ++i)
-                    {
-                        for (size_t k = 0; k < infoGpuO1.allArrayGroup[i].allGroups.size(); ++k)
-                        {
-                            if (infoGpuO1.allArrayGroup[i].allGroups[k].tableNewVars.size() != 0)
-                            {
-                                InternalPosition = infoGpuO1.allArrayGroup[i].allGroups[k].position;
-                                break;
-                            }
-                        }
-                    }
-
-                    if (InternalPosition == -1)
-                    {
-                        if (k == 0)
-                            Create_C_Adapter_Function(adapter_symb);  //creating Cuda-handler for loop
-                        cuda_kernel = CreateLoopKernel(kernel_symbol, indexTypeInKernel(rtTypes[k])); //creating Cuda-kernel for loop
-                    }
-                    else // don't work yet, because only gpuO1 lvl1 enable
-                    {
-                        if (k == 0)
-                            Create_C_Adapter_Function(adapter_symb, InternalPosition);  //creating Cuda-handler for loop with gpuO1
-                        cuda_kernel = CreateLoopKernel(kernel_symbol, infoGpuO1, indexTypeInKernel(rtTypes[k])); //creating optimal Cuda-kernel for loop with gpuO1
-                    }
-
-                }
-                else
-                {
-                    if (k == 0)
-                        Create_C_Adapter_Function(adapter_symb);  //creating Cuda-handler for loop
-                    cuda_kernel = CreateLoopKernel(kernel_symbol, indexTypeInKernel(rtTypes[k])); //creating Cuda-kernel for loop				
-                }
-
-                if (newVars.size() != 0)
-                {
-                    correctPrivateList(RESTORE);
-                    newVars.clear();
-                }
-
-                if (options.isOn(RTC))
-                {
-                    acc_call_list = ACC_RTC_ExpandCallList(acc_call_list);
-                    if (options.isOn(C_CUDA))
-                        ACC_RTC_ConvertCudaKernel(cuda_kernel, kernel_symbol->identifier());
-                    else
-                        ACC_RTC_AddCalledProcedureComment(kernel_symbol);
-
-                    RTC_FKernelArgs.push_back((SgFunctionCallExp *)kernel_st->expr(0));                    
-                }
-
-                if (options.isOn(LOOP_ANALYSIS))
-                {
-                    delete currentLoop;
-                    currentLoop = NULL;
-                }
-            }
-
-            if (options.isOn(RTC))
-                ACC_RTC_CompleteAllParams();
-        }
-    }
-
-    // creating host-handler for loop anyway
-    if (!WithAcrossClause())
-       Create_Host_Loop_Subroutine_Main(hostproc_symb);
-    else
-    { 
-        Create_Host_Across_Loop_Subroutine(hostproc_symb);
-        first_do_par->extractStmt();
-    }
-
-    dvm_ar = NULL;
-    if (cur_region)
-        cur_region->cur_do_dir = NULL;
-
-    dvm_parallel_dir = NULL;
-    return;
-}
-
-
-void ACC_RenewParLoopHeaderVars(SgStatement *first_do, int nloop)
-{
-    SgStatement *st;
-    int i;
-    SgForStmt *stdo;
-    SgExpression *el, *e;
-    SgSymbol *s;
-
-    uses_list = NULL;
-    acc_array_list = NULL;
-    // looking through the loop nest 
-    for (st = first_do, i = 0; i < nloop; st = st->lexNext(), i++)
-    {
-        stdo = isSgForStmt(st);
-        if (!stdo)
-            break;
-        RefIn_LoopHeaderExpr(stdo->start(), st);
-        RefIn_LoopHeaderExpr(stdo->end(), st);
-        RefIn_LoopHeaderExpr(stdo->step(), st);
-    }
-    
-    for (el = uses_list; el; el = el->rhs())
-    {
-        e = el->lhs();
-        s = e->symbol();
-
-        if (isSgVarRefExp(e))
-        {
-            doCallAfter(GetActualScalar(s));   //inserting after current statement
-            continue;
-        }
-        if (isSgArrayRefExp(e))
-        {
-            if (HEADER(s) || HEADER_OF_REPLICATED(s) && *HEADER_OF_REPLICATED(s) != 0) //is distributed array reference
-
-            {
-               doCallAfter(GetActualArray(HEADER(s) ? HeaderRef(s) : DVM000(*HEADER_OF_REPLICATED(s))));   //inserting after current statement
-               continue;
-            }
-            else
-            {
-               doCallAfter(GetActualScalar(s));   //inserting after current statement
-               continue;
-            }
-        }
-    }
-    uses_list = NULL;
-    return;
-}
-void CorrectUsesList()
-{
-    SgExpression *el, *e;
-    symb_list *sl,*slp;
-    for(el = uses_list, e=NULL; el; el = el->rhs())
-    {      
-        if(IS_BY_USE(el->lhs()->symbol()))
-        { //deleting from list 
-          if(e) 
-          {
-             e->setRhs(el->rhs());  
-             el = e;
-          }
-          else
-             uses_list=el->rhs();
-        }
-        else 
-          e = el;
-    }
-        acc_array_list_whole = CopySymbList(acc_array_list); //to create full base list
-        for (sl = acc_array_list,slp = NULL; sl; sl = sl->next)
-          if(IS_BY_USE(sl->symb))
-             if(slp)
-             {
-               slp->next = sl->next;
-               sl = slp;
-             }
-             else
-               acc_array_list = sl->next;
-          else
-             slp = sl;   
-}               
-
-
-void ACC_CreateParallelLoop(int ipl, SgStatement *first_do, int nloop, SgStatement *par_dir, SgExpression *clause[], int interface)
-{
-    int first, last;
-    SgStatement *dost;
-
-    if(in_checksection)
-        return;            
-
-    ReplaceCaseStatement(first_do);
-    FormatAndDataStatementExport(par_dir, first_do);
-                      //!printf("loop on gpu %d\n",first_do->lineNumber() );
-    dvm_parallel_dir = par_dir;
-    first_do_par = first_do;
-
-    if (options.isOn(O_HOST))  //dvm-array references in host handler are not linearised (do not changed)
-        for_host = 1;
-
-    // making structures for reductions
-    red_struct_list = NULL;
-    CreateStructuresForReductions(clause[REDUCTION_] ? clause[REDUCTION_]->lhs() : NULL);
-
-    // creating private_list
-    private_list = clause[PRIVATE_] ? clause[PRIVATE_]->lhs() : NULL;
-    private_array_arg = 0;
-
-    dost = InnerMostLoop(first_do, nloop);
-        
-    // error checking
-    CompareReductionAndPrivateList();
-    TestPrivateList();
-    // removing different names of the same variable "by use"
-    RemovingDifferentNamesOfVar(first_do);
-    // creating uses_list 
-    assigned_var_list = NULL;
-    for_shadow_compute = clause[SHADOW_COMPUTE_] ? 1 : 0;  // for optimization of shadow_compute 
-    uses_list = UsesList(dost->lexNext(), lastStmtOfDo(dost)); 
-    RefInExpr(IsRedBlack(nloop), _READ_);   // add to uses_list variables used in  start-expression  of redblack loop
-    if (!options.isOn(C_CUDA))
-        UsesInPrivateArrayDeclarations(private_list);  // add to uses_list variables used in private array declarations
-    if(USE_STATEMENTS_ARE_REQUIRED) // || !IN_COMPUTE_REGION)
-        CorrectUsesList();
-    for_shadow_compute = 0;
-    if (assigned_var_list)
-        Error("Variables assign to: %s", SymbListString(assigned_var_list), 586, dvm_parallel_dir);
-
-    // creating replicated arrays for non-dvm-arrays outside regions
-    if (!cur_region)
-        DoHeadersForNonDvmArrays();
-
-    if (!mod_gpu_symb)
-        CreateGPUModule();
-                           
-    if (!block_C)
-        Create_C_extern_block();                        
-
-    if (!info_block)
-        Create_info_block();
-
-    adapter_symb = AdapterSymbol(first_do);
-
-    // add #define for adapter name
-    block_C->addComment(DefineComment(adapter_symb->identifier()));
-
-    hostproc_symb = HostProcSymbol(first_do);
-
-    kernel_symb = KernelSymbol(first_do);
-
-    loop_body = CopyBodyLoopForCudaKernel(first_do, nloop);
-
-    // for TRACE in acc_f2c.cpp
-    number_of_loop_line = first_do->lineNumber();
-
-    // creating buffers for remote_access references (after creating GPU module)
-    //if (rma && !rma->rmout && !rma->rml->symbol())  // there is synchronous REMOTE_ACCESS clause in PARALLEL directive
-        CreateRemoteAccessBuffersUp();
-    if (cur_region)
-    {
-        // is first loop of compute region
-        first = (cur_region->Lnums == 0) ? 1 : 0;
-        (cur_region->Lnums)++;
-
-        // is last loop of compute region
-        last = (first_do->lastNodeOfStmt()->lexNext()->variant() == ACC_END_REGION_DIR) ? 1 : 0;
-        //END_REGION directive follows last statement of parallel loop
-    }
-    // ---------------------------------------------------
-    // Generating statements for loop in source program unit
-
-    if (clause[SHADOW_COMPUTE_] && cur_region) // optimization of SHADOW_COMPUTE in REGION        
-        doStatementsForShadowCompute(ipl,interface);     // is based on the result of UsesList()
-
-    doStatementsToPerformByHandler(ipl, adapter_symb, hostproc_symb, 1, interface); // registration of hahdlers and performing with them
-                                                                                        
-    return;
-}
-
-
-SgStatement *ACC_CreateStatementGroup(SgStatement *first_st)
-{
-    SgStatement *last_st, *st, *st_end;
-    last_st = st = st_end = NULL;
-    SgStatement* cuda_kernel = NULL;
-
-    first_do_par = first_st;          
-    for (st = first_st; IN_STATEMENT_GROUP(st); st = st->lexNext())
-    {                       //printf("begin %d %d\n",st->lineNumber(),st->variant());      
-        if (st->variant() == LOGIF_NODE)
-            LogIf_to_IfThen(st);
-        if (st->variant() == SWITCH_NODE)
-            ReplaceCaseStatement(st);
-        if ((st->variant() == FOR_NODE) || (st->variant() == WHILE_NODE))
-            st = lastStmtOfDo(st);
-        else if (st->variant() == IF_NODE)
-            st = lastStmtOfIf(st);
-        else
-            st = st->lastNodeOfStmt();
-        last_st = st;
-    }
-    
-    if (!TestGroupStatement(first_st, last_st))
-        return(last_st);
-    
-    // creating uses_list
-    uses_list = UsesList(first_st, last_st);
-
-    if (!mod_gpu_symb)
-        CreateGPUModule();
-
-    if (!block_C)
-        Create_C_extern_block();
-    // !!! loop for subgroups of statement group 
-    // (subgroup of statements without dvm-array references, statement with dvm-array references )             
-    adapter_symb = AdapterSymbol(first_st);
-    // add #define for adapter name
-    block_C->addComment(DefineComment(adapter_symb->identifier()));
-
-    hostproc_symb = HostProcSymbol(first_st);
-
-    kernel_symb = KernelSymbol(first_st);
-    
-    // ---------------------------------------------------
-    // Generating statements for block (sequence) in source program unit
-    cur_st = first_st->lexPrev();//last_st;
-    //doStatementsInSourceProgramUnit(first_st, 0, NULL, NULL, adapter_symb, hostproc_symb, 0, NULL, NULL, NULL, NULL);
-    doStatementsToPerformByHandler(CreateLoopForSequence(first_st),adapter_symb, hostproc_symb, 0, parloop_by_handler); 
-    st_end = cur_st; 
-    // ---------------------------------------------------
-    if ((cur_region->targets & CUDA_DEVICE)) //if(targets[CUDA])
-    {
-        // Generating Kernel
-        for_kernel = 1;
-
-        for (unsigned k = 0; k < countKernels; ++k)
-        {
-            std::string new_kernel_symb = kernel_symb->identifier();
-            if (rtTypes[k] == rt_INT)
-                new_kernel_symb += "_int";
-            else if (rtTypes[k] == rt_LONG)
-                new_kernel_symb += "_long";
-            else if (rtTypes[k] == rt_LLONG)
-                new_kernel_symb += "_llong";
-
-            SgSymbol *kernel_symbol = new SgSymbol(PROCEDURE_NAME, new_kernel_symb.c_str(), *mod_gpu);
-            if (options.isOn(C_CUDA))
-                kernel_symbol->setType(C_VoidType());
-
-            cuda_kernel = CreateKernel_ForSequence(kernel_symbol, first_st, last_st, indexTypeInKernel(rtTypes[k]));
-
-            if (newVars.size() != 0)
-            {
-                correctPrivateList(RESTORE);
-                newVars.clear();
-            }
-
-            if (options.isOn(RTC))
-            {
-                acc_call_list = ACC_RTC_ExpandCallList(acc_call_list);
-                if (options.isOn(C_CUDA))
-                    ACC_RTC_ConvertCudaKernel(cuda_kernel, kernel_symbol->identifier());
-                else
-                    ACC_RTC_AddCalledProcedureComment(kernel_symbol);
-
-                RTC_FKernelArgs.push_back((SgFunctionCallExp *)kernel_st->expr(0));                
-            }
-        }               
-
-        for_kernel = 0;
-
-        // Generating  Adapter (handler) Function
-        Create_C_Adapter_Function_For_Sequence(adapter_symb, first_st);
-
-        if (options.isOn(RTC))
-            ACC_RTC_CompleteAllParams();
-    }
-    // Generating host-handler anyway
-
-    Create_Host_Sequence_Subroutine(hostproc_symb, first_st, last_st);
-
-    // return last statement of block    
-
-    return(st_end);
-}
-
-int TestGroupStatement(SgStatement *first, SgStatement *last)
-{
-    SgStatement *st, *end;
-    int test = 1;
-    has_io_stmt = 0;
-    end = last->lexNext();
-    for (st = first; st != end; st = st->lexNext())
-    if (!TestOneGroupStatement(st))
-        test = 0;
-    return(test);
-}
-
-int TestOneGroupStatement(SgStatement *stmt)
-{
-    if (isExecutableDVMHdirective(stmt) && stmt->variant() != DVM_ON_DIR && stmt->variant() != DVM_END_ON_DIR)
-    {
-        err("Misplaced directive", 103, stmt);
-        return 0;
-    }
-    if (stmt->variant() == DATA_DECL || stmt->variant() == FORMAT_STAT)
-    {
-        err("Illegal statement in the range of region", 576, stmt);
-        return 0;
-    }
-    switch (stmt->variant()) {
-    case OPEN_STAT:
-    case CLOSE_STAT:
-    case INQUIRE_STAT:
-    case BACKSPACE_STAT:
-    case ENDFILE_STAT:
-    case REWIND_STAT:
-    case WRITE_STAT:
-    case READ_STAT:
-    case PRINT_STAT:
-        has_io_stmt = 1;
-        break;
-    }
-    return 1;
-}
-
-
-void doStatementsForShadowCompute(int ilh, int interface)
-{
-    symb_list *sl;
-
-    for (sl = acc_array_list; sl; sl = sl->next)
-    {
-        if (HEADER(sl->symb))
-        {
-            if (isOutArray(sl->symb))
-                doCallAfter(interface==1 ? LoopShadowCompute_H(ilh, HeaderRef(sl->symb)) : LoopShadowCompute_Array(ilh, HeaderRef(sl->symb))  );
-                //doCallAfter(interface==1 ? LoopShadowCompute_H(ilh, HeaderRef(sl->symb)) : LoopShadowCompute_Array(ilh, Register_Array_H2(HeaderRef(sl->symb)))  );
-            MarkAsRegistered(sl->symb);
-        }
-    }
-    return;
-}
-
-
-int CreateLoopForSequence(SgStatement *first)
-{
-        LINE_NUMBER_AFTER(first,cur_st); 
-        cur_st->addComment(SequenceComment(first->lineNumber())); 
-        int il = ndvm;    
-        doAssignStmtAfter(LoopCreate_H(cur_region->No, 0));
-        return (il);
-}
-
-void  doStatementsToPerformByHandler(int ilh, SgSymbol *adapter_symb, SgSymbol *hostproc_symb,int is_parloop,int interface)
-{   SgExpression *arg_list, *base_list, *copy_uses_list, *copy_arg_list, *red_dim_list, *red_bound_list, *private_dim_list=NULL, *private_bound_list=NULL;
-    int numb=0, numb_r=0, numb_b=0, numb_p_dim=0, numb_p_bound=0;
-    SgStatement *st_register;
-
-    copy_uses_list = uses_list ? &(uses_list->copy()) : NULL;  //!!!
-    base_list = options.isOn(O_HOST) && inparloop ? AddrArgumentList() : BaseArgumentList(); //before ArrayArgumentList call where: dummy_ar=>ar in acc_array_list  
-    arg_list = is_parloop ? RemoteAccessHeaderList() : NULL;
-    arg_list = AddListToList(arg_list, ArrayArgumentList());
-    copy_arg_list = arg_list ? &(arg_list->copy()) : NULL;
-    red_dim_list = DimSizeListOfReductionArrays();
-    numb_r = ListElemNumber(red_dim_list);
-    red_bound_list = BoundListOfReductionArrays(); // !!! to change
-    numb_b = ListElemNumber(red_bound_list);
-    private_bound_list = BoundListOfPrivateArrays();       
-    numb_p_bound = ListElemNumber(private_bound_list);
-    if (options.isOn(C_CUDA))
-    {
-        private_dim_list = DimSizeListOfPrivateArrays();      
-        numb_p_dim =  ListElemNumber(private_dim_list);    
-    }
-    numb = ListElemNumber(arg_list) + ListElemNumber(uses_list);
-     
-// register CUDA-handler
-    if (cur_region && (cur_region->targets & CUDA_DEVICE))  //if(targets[CUDA])  
-    {
-    
-        arg_list = AddListToList(arg_list, copy_uses_list);
-        arg_list = AddListToList(arg_list, red_dim_list);
-        arg_list = AddListToList(arg_list, private_dim_list);
-        if(interface == 1)
-        {
-            InsertNewStatementAfter(RegisterHandler_H(ilh, DeviceTypeConst(CUDA), ConstRef(0), adapter_symb->next(), 0, numb + numb_r + numb_p_dim), cur_st, cur_st->controlParent()); /* OpenMP */
-            AddListToList(cur_st->expr(0), arg_list);  
-        } else
-        {   
-            SgExpression *efun = HandlerFunc(adapter_symb->next(), numb + numb_r + numb_p_dim, arg_list);
-            InsertNewStatementAfter(RegisterHandler_H2(ilh, DeviceTypeConst(CUDA), ConstRef(0), efun), cur_st, cur_st->controlParent()); /* OpenMP */      
-        }
-    }
-        //base_list = options.isOn(O_HOST) && inparloop ? addr_list : BaseArgumentList();
-    numb = numb + ListElemNumber(base_list);
-// register HOST-handler
-    int iht = ndvm;
-    doAssignStmtAfter(new SgValueExp(0));
-    copy_arg_list = AddListToList(copy_arg_list, base_list);
-    copy_uses_list = uses_list ? &(uses_list->copy()) : NULL;
-    copy_arg_list = AddListToList(copy_arg_list, copy_uses_list);
-    copy_arg_list = AddListToList(copy_arg_list, red_bound_list);
-    copy_arg_list = AddListToList(copy_arg_list, private_bound_list);
-
-    if(interface == 1)
-    {
-        InsertNewStatementAfter(RegisterHandler_H(ilh, DeviceTypeConst(HOST), DVM000(iht), hostproc_symb, 0, numb+numb_b+numb_p_bound), cur_st, cur_st->controlParent());  /* OpenMP */
-        AddListToList(cur_st->expr(0), copy_arg_list);
-    } else
-    {
-        SgExpression *efun = HandlerFunc(hostproc_symb, numb+numb_b+numb_p_bound, copy_arg_list);
-        InsertNewStatementAfter(RegisterHandler_H2(ilh, DeviceTypeConst(HOST), DVM000(iht), efun), cur_st, cur_st->controlParent());  /* OpenMP */
-    }
-    cur_st->addComment(OpenMpComment_HandlerType(iht));
-// perform by handler    
-    InsertNewStatementAfter((interface==1 ? LoopPerform_H(ilh) : LoopPerform_H2(ilh)), cur_st, cur_st->controlParent());
-    if (is_parloop)  //inparloop
-        cur_st->setComments("! Loop execution\n");
-    else
-        cur_st->setComments("! Execution\n");       
-}
-
-SgExpression *DimSizeListOfReductionArrays()
-{//create dimmesion size list for reduction arrays
-    reduction_operation_list *rsl;
-    int idim;
-    SgExpression *ell, *el, *arg, *arg_list;
-
-    if (!red_list)
-        return(NULL);
-    arg_list = NULL;
-    for (rsl = red_struct_list; rsl; rsl = rsl->next)
-    {
-        if (rsl->redvar_size == -1) //reduction variable is array with passed dimension's sizes      
-        {
-            el = NULL;
-            for (idim = Rank(rsl->redvar); idim; idim--)
-            {
-                arg = ArrayDimSize(rsl->redvar, idim);
-                if (arg && arg->variant() == STAR_RANGE)
-                    //arg = SizeFunction(rsl->redvar,idim);
-                    Error("Assumed-size array: %s", rsl->redvar->identifier(), 162, dvm_parallel_dir);
-                else
-                    arg = DvmType_Ref(SizeFunctionWithKind(rsl->redvar, idim, len_DvmType));
-                ell = new SgExprListExp(*arg);
-                ell->setRhs(el);
-                el = ell;
-            }
-            arg_list = AddListToList(arg_list, el);
-            el = NULL;
-            for (idim = Rank(rsl->redvar); idim; idim--)
-            {
-                arg = DvmType_Ref(LBOUNDFunction(rsl->redvar, idim));
-                ell = new SgExprListExp(*arg);
-                ell->setRhs(el);
-                el = ell;
-            }
-            arg_list = AddListToList(arg_list, el);            
-        }
-    }
-
-    return(arg_list);
-}
-
-SgExpression *DimSizeListOfPrivateArrays()
-{
-    int i;
-    SgExpression *pl, *arg_list=NULL;
-    SgSymbol *s;
-    if (!private_list)
-        return(NULL);
-    for (pl = private_list; pl; pl = pl->rhs())
-    {
-         s = pl->lhs()->symbol();
-         if (isSgArrayType(s->type()) && !TestArrayShape(s))
-         {
-             for (i=0; i<Rank(s); i++)             
-                 arg_list = AddListToList( arg_list,  new SgExprListExp(*DvmType_Ref(SizeFunctionWithKind(s, i+1, len_DvmType))));
-             for (i=0; i<Rank(s); i++)
-                 arg_list = AddListToList( arg_list,  new SgExprListExp(*DvmType_Ref(LBOUNDFunction(s,i+1))));
-         }     
-    }  
-    return (arg_list);
-}
-
-SgExpression *isConstantBound(SgSymbol *rv, int i, int isLower)
-{
-  SgExpression *bound;
-  bound = isLower ? Calculate(LowerBound(rv,i)) : Calculate(UpperBound(rv,i));
-  if(bound->isInteger())
-     return bound;
-  else
-     return NULL;
-}
-
-SgExpression *CreateBoundListOfArray(SgSymbol *ar)
-{
-    SgExpression *sl = NULL;
-    SgSymbol *low_s, *upper_s, *new_ar;
-    SgExpression *up_bound, *low_bound;
-    int i;
-    if(!isSgArrayType(ar->type()))
-        return (sl);
-    for(i=0;i<Rank(ar); i++) 
-    {    
-        if(!isConstantBound(ar,i,1))         
-           sl = AddListToList( sl,  new SgExprListExp(*LBOUNDFunction(ar,i+1)) );  
-          
-        if(!isConstantBound(ar,i,0)) 
-           sl = AddListToList( sl,  new SgExprListExp(*UBOUNDFunction(ar,i+1)) );
-    }
-    return(sl);
-}
-
-SgExpression * BoundListOfReductionArrays()
-{
-    reduction_operation_list *rl;
-    SgExpression *bound_list = NULL;
-    for (rl = red_struct_list; rl; rl = rl->next)
-    {
-        if (rl->redvar_size != 0)
-            bound_list = AddListToList(bound_list, CreateBoundListOfArray(rl->redvar)); 
-        if (rl->locvar)
-            bound_list = AddListToList(bound_list, CreateBoundListOfArray(rl->locvar)); 
-    } 
-    return  bound_list;
-}
-
-SgExpression * BoundListOfPrivateArrays()
-{
-    SgExpression *pl, *bound_list=NULL;
-    SgSymbol *s;
-    for (pl = private_list; pl; pl = pl->rhs())
-    {
-         s = pl->lhs()->symbol();
-         if (isSgArrayType(s->type()))
-             bound_list = AddListToList(bound_list, CreateBoundListOfArray(s)); 
-    }
-    return bound_list;
-}
-
-void  ReplaceCaseStatement(SgStatement *first)
-{
-  SgStatement *stmt, *last_st;
-  last_st=lastStmtOf(first);
-  for(stmt= first; stmt != last_st; stmt=stmt->lexNext())
-  {
-     if(stmt->variant() == CASE_NODE)
-        //ConstantExpansionInExpr(stmt->expr(0));
-        stmt->setExpression(0,*ReplaceParameter(stmt->expr(0)));
-  }
-}
-
-void FormatAndDataStatementExport(SgStatement *par_dir, SgStatement *first_do)
-{
-    SgStatement *stmt, *last, *st;
-    last = lastStmtOfDo(first_do);
-    last = last->lexNext();
-
-    for (stmt = first_do; stmt != last;)
-    {
-        st = stmt;
-        stmt = stmt->lexNext();
-        if (st->variant() == DATA_DECL || st->variant() == FORMAT_STAT)
-        {
-            st->extractStmt();
-            par_dir->insertStmtBefore(*st, *par_dir->controlParent());
-        }
-    }
-
-}
-
-void    CreateStructuresForReductions(SgExpression *red_op_list)
-{           
-    SgExpression  *er = NULL, *ev = NULL, *ered = NULL, *loc_var_ref = NULL, *en = NULL, *esize = NULL;
-
-    reduction_operation_list *rl = NULL;
-    has_max_minloc = 0;
-
-    for (er = red_op_list; er; er = er->rhs())
-    {
-        ered = er->lhs(); //  reduction  (variant==ARRAY_OP)
-        ev = ered->rhs(); // reduction variable reference for reduction operations except MINLOC,MAXLOC 
-        loc_var_ref = NULL;
-
-        if (isSgExprListExp(ev)) //MAXLOC,MINLOC     
-        {
-            ev = ev->lhs(); // reduction variable reference         
-            loc_var_ref = ered->rhs()->rhs()->lhs();        //location array reference
-            en = ered->rhs()->rhs()->rhs()->lhs(); // number of elements in location array
-            loc_el_num = LocElemNumber(en);
-            has_max_minloc = 1;
-        }
-
-        if (isSgArrayRefExp(ev) && !ev->lhs()) //whole array
-            esize = ArrayLengthInElems(ev->symbol(), NULL, 0);  
-        else
-            esize = NULL;
-
-
-        // create reduction structure and add to red_struct_list
-        {
-            reduction_operation_list *redstruct = new reduction_operation_list;
-
-            redstruct->redvar = ev->symbol();
-            redstruct->locvar = loc_var_ref ? loc_var_ref->symbol() : NULL;
-
-            redstruct->number = loc_var_ref ? loc_el_num : 0;
-            redstruct->redvar_size = esize ? (esize->isInteger() ? esize->valueInteger() : -1) : 0;
-            redstruct->array_red_size = redstruct->redvar_size;
-
-            if (Rank(redstruct->redvar) > 1 || redstruct->redvar_size > 16)
-                redstruct->redvar_size = -1;
-            if (redstruct->redvar_size == -1)
-            {
-                if (loc_var_ref && !analyzing && cur_region->targets & CUDA_DEVICE)
-                    Error("Wrong reduction variable %s", ev->symbol()->identifier(), 151, dvm_parallel_dir);
-                else if (analyzing)
-                    Warning("Reduction variable %s is array of unknown(large) size", ev->symbol()->identifier(), 597, dvm_parallel_dir);
-            }
-            redstruct->next = NULL;
-            redstruct->dimSize_arg = NULL;
-            redstruct->lowBound_arg = NULL;
-            redstruct->red_host = NULL;
-            redstruct->loc_host = NULL;
-            if (!red_struct_list)
-                red_struct_list = rl = redstruct;
-            else
-            {
-                rl->next = redstruct;
-                rl = redstruct;
-            }
-        }
-    }
-}
-
-
-void CompareReductionAndPrivateList()
-{
-    reduction_operation_list *rsl;
-    if (!red_struct_list)
-        return;
-    for (rsl = red_struct_list; rsl; rsl = rsl->next)
-    {
-        if (isPrivate(rsl->redvar))
-            Error("'%s' in REDUCTION and PRIVATE clause", rsl->redvar->identifier(), 609, dvm_parallel_dir);
-        if (rsl->locvar && isPrivate(rsl->locvar))
-            Error("'%s' in REDUCTION and PRIVATE clause", rsl->locvar->identifier(), 609, dvm_parallel_dir);
-    }
-    return;
-}
-
-void TestPrivateList()
-{
-    SgExpression *el, *el2;
-    for (el = private_list; el; el = el->rhs())
-    {
-        for (el2 = el->rhs(); el2; el2 = el2->rhs())
-        if (ORIGINAL_SYMBOL(el->lhs()->symbol()) == ORIGINAL_SYMBOL(el2->lhs()->symbol()))
-            Error("'%s' appears twice in PRIVATE clause", el->lhs()->symbol()->identifier(), 610, dvm_parallel_dir);
-    }
-    return;
-}
-
-void ReplaceSymbolInExpr(SgExpression *e,SgSymbol *symb)
-{
-    if(!e) return;
-    if(isSgVarRefExp(e) || isSgArrayRefExp(e))
-    {
-       if(ORIGINAL_SYMBOL(e->symbol()) == ORIGINAL_SYMBOL(symb) && e->symbol() != symb)
-          e->setSymbol(symb);
-       return;
-    }
-    ReplaceSymbolInExpr(e->lhs(),symb);
-    ReplaceSymbolInExpr(e->rhs(),symb);
-    return;
-}
-
-void ReplaceSymbolInLoop (SgStatement *first, SgSymbol *symb)
-{
-    SgStatement *last=lastStmtOfDo(first);
-    SgStatement *stmt;
-    for( stmt=first; stmt!=last; stmt=stmt->lexNext())
-    {
-        ReplaceSymbolInExpr(stmt->expr(0), symb);
-	ReplaceSymbolInExpr(stmt->expr(1), symb);
-	ReplaceSymbolInExpr(stmt->expr(2), symb);
-    }
-}
-
-void RemovingDifferentNamesOfVar(SgStatement *first)
-{
-    SgExpression *el;
-    for (el = private_list; el; el = el->rhs())
-    {   
-        if(IS_BY_USE(el->lhs()->symbol()))             
-            ReplaceSymbolInLoop(first,el->lhs()->symbol());
-    }
-    reduction_operation_list *rsl;
-    for (rsl = red_struct_list; rsl; rsl = rsl->next)
-    {
-        if (IS_BY_USE(rsl->redvar))
-            ReplaceSymbolInLoop(first,rsl->redvar);
-        if (rsl->locvar &&  IS_BY_USE(rsl->locvar))
-            ReplaceSymbolInLoop(first,rsl->locvar);
-    }	
-}
-
-void ACC_ReductionVarsAreActual()
-{
-    reduction_operation_list *rl;
-
-    for (rl = red_struct_list; rl; rl = rl->next)
-    {
-        if(rl->redvar)
-            doCallAfter(ActualScalar(rl->redvar));
-        if (rl->locvar)
-            doCallAfter(ActualScalar(rl->locvar));
-    }
-}
-
-void CreateRemoteAccessBuffers(SgExpression *rml, int pl_flag)
-{
-    SgExpression *el;
-    rem_var *remv;
-    coeffs *scoef;
-    int interface = parloop_by_handler == 2 && WhatInterface(dvm_parallel_dir) == 2 ? 2 : 1;
-    for (el = rml; el; el = el->rhs())
-    {
-        remv = (rem_var *)(el->lhs())->attributeValue(0, REMOTE_VARIABLE);
-        if(!remv) continue; // error case: illegal reference in REMOTE_ACCESS directive/clause 
-        remv->buffer = RemoteAccessBufferInKernel(el->lhs()->symbol(), remv->ncolon);
-        // creating variables used for optimisation buffer references in parallel loop
-        scoef = new coeffs;
-        CreateCoeffs(scoef, remv->buffer);
-        // scoef = BufferCoeffs(remv->buffer,el->lhs()->symbol());
-        // adding the attribute (ARRAY_COEF) to  buffer symbol
-        remv->buffer->addAttribute(ARRAY_COEF, (void*)scoef, sizeof(coeffs));
-        if (pl_flag && interface == 2)
-            remv->buffer->addAttribute(REMOTE_ACCESS_BUF, (void*)1, 0);
-    }
-    return;
-}
-
-void CreateRemoteAccessBuffersUp()
-{
-    rem_acc *r;
-    //looking through the remote-access directive/clause list
-    for (r=rma; r; r=r->next)
-    {
-        //if (r->rml->symbol())  // asynchronous REMOTE_ACCESS clause/directive
-        //    continue;
-        if (!r->rmout)         // REMOTE_ACCESS clause in PARALLEL directive
-            CreateRemoteAccessBuffers(r->rml, 1);
-        else
-            CreateRemoteAccessBuffers(r->rml, 0);
-    }
-    return;
-} 
-
-SgSymbol *CreateReplicatedArray(SgSymbol *s)
-{
-    SgSymbol *ar;
-
-    ar = DummyReplicatedArray(s, Rank(s));
-
-    // renewing attribute DUMMY_ARRAY of symbol s
-    *DUMMY_FOR_ARRAY(s) = ar;
-
-    return(ar);
-}
-
-/*
-void ACC_RegisterDvmBuffer(SgExpression *bufref, int buffer_rank)
-{
-    SgStatement *call;
-    int ilow, j;
-    ilow = ndvm;
-    for (j = buffer_rank; j; j--)
-        doAssignStmtAfter(&(*new SgValueExp(-2147483647) - *new SgValueExp(1)));
-    call = RegisterBufferArray(cur_region->No, IntentConst(INTENT_LOCAL), bufref, ilow, ilow);
-    cur_st->insertStmtAfter(*call);
-    cur_st = call;
-    return;
-}
-*/
-
-void ACC_Before_Loadrb(SgExpression *bufref)
-{
-    SgStatement *call;
-    call = RegionBeforeLoadrb(bufref);
-    cur_st->insertStmtAfter(*call);
-    cur_st = call;
-    return;
-}
-
-void ACC_Region_After_Waitrb(SgExpression *bufref)
-{
-    SgStatement *call;
-    if (!cur_region)
-        return;
-    call = RegionAfterWaitrb(cur_region->No, bufref);
-    cur_st->insertStmtAfter(*call);
-    cur_st = call;
-    return;
-}
-
-void ACC_StoreLowerBoundsOfDvmBuffer(SgSymbol *s, SgExpression *dim[], int dim_num[], int rank, int ibuf, SgStatement *stmt)
-// generating assign statements to
-//store lower bounds of dvm-array in Header(rank+3:2*rank+2) of remote_access buffer
-
-{
-    int i;
-
-
-    if (IS_POINTER(s))
-        Error("Fortran 77 dynamic array  %s. Obsolescent feature.", s->identifier(), 575, stmt);
-
-    for (i = 0; i < rank; i++)
-    {
-        if (dim[i]->variant() == DDOT)   //  ':'
-            doAssignTo_After(DVM000(ibuf + rank + 2 + i), header_ref(s, rank + 3 + dim_num[i]));
-        else                            // a*I+b   depends on do-variable of parallel loop
-        {
-            warn("Remote_Access Reference depends on do-variable of parallel loop", 575, stmt);
-            doAssignTo_After(DVM000(ibuf + rank + 2 + i), BufferLowerBound(dim[i]));
-        }
-    }
-
-}
-
-SgExpression *BufferLowerBound(SgExpression *ei)
-{
-    SgSymbol *dovar;
-    SgExpression *e, *do_start;
-    dovar = (*IS_DO_VARIABLE_USE(ei))->symbol(); //printf("%s\n",dovar->identifier()); return(new SgValueExp(0));
-    do_start = DoStart(dovar);  //redblack ???
-    e = &(ei->copy());
-    e = ReplaceIndexRefByLoopLowerBound(e, dovar, do_start);  //e->unparsestdout();
-    return(e);
-}
-
-SgExpression *DoStart(SgSymbol *dovar)
-{
-    SgStatement *st;
-    SgExpression *estart;
-
-    for (st = par_do; st->variant() == FOR_NODE; st = st->lexNext())  //first_do_par not initialized yet
-    {
-        if (st->symbol() == dovar)
-        {
-            estart = &((SgForStmt *)st)->start()->copy();   // estart->unparsestdout();
-            if (!isSgArrayRefExp(estart)) //redblack
-            {
-                warn("Remote_access for redblack", 575, st);
-                estart = estart->lhs();
-            }
-            return(estart);
-        }
-    }
-    return(DVM000(0)); //may not be
-}
-
-SgExpression  *ReplaceIndexRefByLoopLowerBound(SgExpression *e, SgSymbol *dovar, SgExpression *estart)
-{
-    if (!e)
-        return(e);
-    if (isSgVarRefExp(e) && e->symbol() == dovar)
-        return(&(estart->copy()));
-    e->setLhs(ReplaceIndexRefByLoopLowerBound(e->lhs(), dovar, estart));
-    e->setRhs(ReplaceIndexRefByLoopLowerBound(e->rhs(), dovar, estart));
-    return(e);
-}
-
-
-void ACC_UnregisterDvmBuffers()
-{
-    SgExpression *el;
-    rem_var *remv;
-
-    if (rma && !rma->rmout && !rma->rml->symbol()) // there is synchronous REMOTE_ACCESS clause in PARALLEL directive
-    for (el = rma->rml; el; el = el->rhs())
-    {
-        remv = (rem_var *)(el->lhs())->attributeValue(0, REMOTE_VARIABLE);
-        if(!remv) continue; // error case: illegal reference in REMOTE_ACCESS directive/clause 
-        doCallAfter(RegionDestroyRb(cur_region->No, DVM000(remv->index)));
-    }
-}
-
-void ACC_ShadowCompute(SgExpression *shadow_compute_list, SgStatement *st_shcmp)
-{
-    // if(shadow_compute_list)
-    return;
-}
-
-SgExpression *SectionBoundsList(SgExpression *are)
-{
-    SgExpression *el, *einit[MAX_DIMS], *elast[MAX_DIMS], *bounds_list=NULL;
-    SgSymbol *ar = are->symbol(); 
-    int rank = Rank(ar);
-    int i;
-    for (el = are->lhs(), i = 0; el; el = el->rhs(), i++) 
-        if(i<MAX_DIMS) {
-           Doublet(el->lhs(), ar, i, einit, elast);
-           bounds_list = AddElementToList(bounds_list, DvmType_Ref(Calculate(elast[i])));
-           bounds_list = AddElementToList(bounds_list, DvmType_Ref(Calculate(einit[i])));
-        }
-    if (i != rank)
-        Error("Wrong number of subscripts specified for '%s'", ar->identifier(), 140, cur_st);    
-
-    return (bounds_list);
-}
-
-int SectionBounds(SgExpression *are)
-{
-    SgExpression *el, *einit[MAX_DIMS], *elast[MAX_DIMS];    //,*estep[MAX_DIMS];
-    SgSymbol *ar;
-    int init, i, j, rank;
-    init = ndvm;
-    ar = are->symbol();
-    rank = Rank(ar);
-    if (!are->lhs()) {  // A => A(:,:, ...,:)
-        for (j = rank; j; j--)
-            doAssignStmtAfter(&SgUMinusOp(*new SgValueExp(1073741824) * *new SgValueExp(2)));
-
-        return(init);
-    }
-    if(!TestMaxDims(are->lhs(),ar,cur_st))
-        return (0);
-    for (el = are->lhs(), i = 0; el; el = el->rhs(), i++)
-        Doublet(el->lhs(), ar, i, einit, elast);
-    if (i != rank){
-        Error("Wrong number of subscripts specified for '%s'", ar->identifier(), 140, cur_st);
-        return(0);
-    }
-
-    for (j = i; j; j--)
-        doAssignStmtAfter(Calculate(einit[j - 1]));
-    for (j = i; j; j--)
-        doAssignStmtAfter(Calculate(elast[j - 1]));
-    //for(j=i; j; j--)
-    //     doAssignStmtAfter(estep[j-1]); 
-    return(init + rank);
-}
-
-void Doublet(SgExpression *e, SgSymbol *ar, int i, SgExpression *einit[], SgExpression *elast[])
-{
-    SgValueExp c1(1), c0(0);
-
-    if (e->variant() != DDOT) { //is not doublet
-        einit[i] = e;                       //&(*e-*Exprn(LowerBound(ar,i)));
-        elast[i] = einit[i];
-
-        return;
-    }
-    // is doublet
-
-    if (!e->lhs())
-        einit[i] = &c1.copy();
-    else
-        einit[i] = e->lhs();                 //&(*(e->lhs())-*Exprn(LowerBound(ar,i)));
-    if (!e->rhs())
-        elast[i] = Exprn(UpperBound(ar, i));  // &(*Exprn(UpperBound(ar,i))-*Exprn(LowerBound(ar,i)));
-    else
-        elast[i] = e->rhs();                 //&(*(e->rhs())-*Exprn(LowerBound(ar,i)));   
-
-    return;
-}
-
-
-
-SgExpression *ArrayArgumentList()
-{
-    symb_list *sl;
-    SgExpression *el, *ell, *list;
-    // create dvm-array list for parallel loop
-    if (!acc_array_list)
-        return(NULL);
-
-    el = list = NULL;
-    for (sl = acc_array_list; sl; sl = sl->next)
-    {
-        if (HEADER(sl->symb))
-        {
-            ell = new SgExprListExp(*new SgArrayRefExp(*(sl->symb)));
-        }
-        else  if (HEADER_OF_REPLICATED(sl->symb))
-        {
-            ell = new SgExprListExp(*DVM000(*HEADER_OF_REPLICATED(sl->symb)));
-            sl->symb = CreateReplicatedArray(sl->symb);
-        }
-        else
-            return(list);  //error
-        if (el)
-        {
-            el->setRhs(ell);
-            el = ell;
-        }
-        else
-            list = el = ell;
-
-    }
-    return(list);
-}
-
-
-SgExpression *RemoteAccessHeaderList()
-{
-    SgExpression *el, *l, *rma_list;
-    rem_var *remv;
-    rem_acc *r;
-    rma_list = NULL;
-    for (r=rma; r; r=r->next)
-    {
-        for (el = r->rml; el; el = el->rhs())
-        {
-            remv = (rem_var *)(el->lhs())->attributeValue(0, REMOTE_VARIABLE);
-            if(!remv) continue; // error case: illegal reference in REMOTE_ACCESS directive/clause 
-            l = new SgExprListExp(*DVM000(remv->index));
-            l->setRhs(rma_list);
-            rma_list = l;
-            //rma_list = AddListToList(rma_list, l );
-        }
-    }
-    return(rma_list);
-}
-
-void AddRemoteAccessBufferList_ToArrayList()
-{
-    SgExpression *el;
-    rem_var *remv;
-    rem_acc *r;
-    //looking through the remote-access directive/clause list
-    for (r=rma; r; r=r->next)
-    {
-        //if (r->rml->symbol())  // asynchronous REMOTE_ACCESS clause/directive
-        //   continue;
-        for (el = r->rml; el; el = el->rhs())
-        {
-            remv = (rem_var *)(el->lhs())->attributeValue(0, REMOTE_VARIABLE);
-            if (remv && remv->buffer)
-                acc_array_list = AddNewToSymbList(acc_array_list, remv->buffer);
-         }
-
-    }
-
-    return;
-}
-
-SgExpression *AddNewToBaseList(SgExpression *base_list, SgSymbol *symb)
-{
-    SgExpression *el, *l;
-
-    for (l = base_list; l; l = l->rhs())
-    if (baseMemory(symb->type()->baseType()) == l->lhs()->symbol()) //baseMemory(l->lhs()->symbol()->type()->baseType()) )
-        break;
-    if (!l)
-    {
-        el = new SgExprListExp(*new SgArrayRefExp(*baseMemory(symb->type()->baseType())));
-        el->setRhs(base_list);
-        base_list = el;
-    }
-    return(base_list);
-}
-
-SgExpression *ElementOfBaseList(SgExpression *base_list, SgSymbol *symb)
-{
-    SgExpression *el = NULL, *l;
-
-    for (l = base_list; l; l = l->rhs())
-    if (baseMemory(symb->type()->baseType()) == l->lhs()->symbol()) //baseMemory(l->lhs()->symbol()->type()->baseType()) )
-        break;
-    if (!l)
-        el = new SgExprListExp(*new SgArrayRefExp(*baseMemory(symb->type()->baseType())));
-
-    return(el);
-}
-
-
-SgExpression *BaseArgumentList()
-{
-    symb_list *sl, *array_list;
-    SgExpression *el, *l, *base_list = NULL;
-    rem_acc *r;
-    // create memory base list
-    array_list = NULL;
-    // create remote_access objects list
-    for (r=rma; r; r=r->next)
-    {
-        for (el = r->rml; el; el = el->rhs())
-            array_list = AddToSymbList(array_list, el->lhs()->symbol());
-    }
-    if (array_list)
-    {
-        base_list = ElementOfBaseList(NULL, array_list->symb);
-        for (sl = array_list->next; sl; sl = sl->next)
-        {
-            l = ElementOfBaseList(base_list, sl->symb);
-            if (l)
-            {
-                l->setRhs(base_list);
-                base_list = l;
-            }
-        }
-    }
-    array_list = USE_STATEMENTS_ARE_REQUIRED ? acc_array_list_whole : acc_array_list; 
-    if (!base_list && array_list)
-        base_list = ElementOfBaseList(NULL, array_list->symb);
-    for (sl = array_list; sl; sl = sl->next)
-    {
-        l = ElementOfBaseList(base_list, sl->symb);
-        if (l)
-        {
-            l->setRhs(base_list);
-            base_list = l;
-        }
-    }
-
-    return(base_list);
-
-}
-
-
-
-SgExpression *FirstDvmArrayAddress(SgSymbol *ar, int ind)
-{
-    SgExpression *ae;
-    ae = ind ? DVM000(ind) : new SgArrayRefExp(*ar, *new SgValueExp(Rank(ar) + 2));
-    return (new SgArrayRefExp(*baseMemory(ar->type()->baseType()), *ae));
-}
-
-SgExpression *ElementOfAddrArgumentList(SgSymbol *s)
-{
-    SgExpression *ae;
-    if (HEADER(s))
-        ae = new SgArrayRefExp(*s, *new SgValueExp(Rank(s) + 2));
-    else if (HEADER_OF_REPLICATED(s))
-        ae = DVM000(*HEADER_OF_REPLICATED(s) + Rank(s) + 1);
-    else
-        ae = DVM000(1); //error
-    return(new SgExprListExp(*new SgArrayRefExp(*baseMemory(s->type()->baseType()), *ae)));
-}
-
-SgExpression *AddrArgumentList()
-{
-    symb_list *sl;
-    SgExpression *el, *l, *addr_list = NULL, *ae, *rem_list = NULL;
-    rem_var *remv;
-    rem_acc *r;
-    // create array address list
-    if (acc_array_list)
-    {
-        addr_list = el = ElementOfAddrArgumentList(acc_array_list->symb);
-
-        for (sl = acc_array_list->next; sl; sl = sl->next)
-        {
-            l = ElementOfAddrArgumentList(sl->symb);
-            el->setRhs(l);
-            el = l;
-        }
-    }
-    // create remote_access buffer address list and add it to addr_list
-    
-    //looking through the remote-access directive/clause list
-    for (r=rma; r; r=r->next)
-    {
-        for (el = r->rml; el; el = el->rhs())
-        {
-            remv = (rem_var *)(el->lhs())->attributeValue(0, REMOTE_VARIABLE);
-            if(!remv) continue;  // error case: illegal reference in REMOTE_ACCESS directive/clause 
-            if (IS_REMOTE_ACCESS_BUFFER(remv->buffer) )
-                l = new SgExprListExp(*new SgArrayRefExp(*baseMemory(el->lhs()->symbol()->type()->baseType())));
-            else
-            {
-                ae = DVM000(remv->index + remv->ncolon + 1);
-                l = new SgExprListExp(*new SgArrayRefExp(*baseMemory(el->lhs()->symbol()->type()->baseType()), *ae));
-            }
-            l->setRhs(rem_list);
-            rem_list = l;
-        }
-    }
-    addr_list = AddListToList(rem_list, addr_list);
-    return(addr_list);
-}
-
-SgStatement *DoStmt(SgStatement *first_do, int i)
-{
-    SgStatement *stmt;
-    int ind;
-    for (stmt = first_do, ind = 1; ind < i; ind++)
-        stmt = stmt->lexNext();
-    return(stmt);
-}
-
-void CreateRegionVarList()
-{
-    SgStatement *reg_dir;
-    SgExpression *el, *eop;
-    reg_dir = cur_region->region_dir;
-    dvm_array_list = NULL;
-    do_st_list = NULL;
-    for (el = reg_dir->expr(0); el; el = el->rhs())
-    {
-        eop = el->lhs();
-        //dvm_array_list = AddToVarRefList(dvm_array_list,eop->lhs());
-        dvm_array_list = AddListToList(dvm_array_list, eop->lhs());
-    }
-}
-
-
-SgStatement *InnerMostLoop(SgStatement *dost, int nloop)
-{
-    int i;
-    SgStatement *stmt;
-    for (i = nloop - 1, stmt = dost; i; i--)
-        stmt = stmt->lexNext();
-    return(stmt);
-}
-
-void UsesInPrivateArrayDeclarations(SgExpression *privates)
-{
-    SgExpression *el;
-    SgArrayType *tp;
-    for (el=privates; el; el=el->rhs())
-        if(el->lhs()->symbol() && (tp=isSgArrayType(el->lhs()->symbol()->type())))
-            RefInExpr(tp->getDimList(),_READ_); 
-}
-
-SgExpression *UsesList(SgStatement *first, SgStatement *last) //AnalyzeLoopBody()  AnalyzeBlock()
-{
-    SgStatement *stmt, *save;
-
-    uses_list = NULL;
-    acc_array_list = NULL;
-    acc_call_list = NULL;
-    save = cur_st;
-
-    for (stmt = first; stmt != last->lexNext(); stmt = stmt->lexNext())
-    {
-        cur_st = stmt;          //!printf("in useslist line %d\n",stmt->lineNumber()); 
-        if (stmt->lineNumber() == 0)  //inserted debug statement
-            continue;
-
-        // FORMAT_STAT, ENTRY_STAT, DATA_DECL may appear among executable statements
-        switch (stmt->variant())
-        {
-        case ASSIGN_STAT:           // Assign statement               
-            RefInExpr(stmt->expr(1), _READ_);
-            RefInExpr(stmt->expr(0), _WRITE_);
-            break;
-
-        case POINTER_ASSIGN_STAT:           // Pointer assign statement               
-            RefInExpr(stmt->expr(1), _READ_);   // ???? _READ_ ????
-            RefInExpr(stmt->expr(0), _WRITE_);
-            break;
-
-        case WHERE_NODE:
-            RefInExpr(stmt->expr(0), _READ_);
-            RefInExpr(stmt->expr(1), _WRITE_);
-            RefInExpr(stmt->expr(2), _READ_);
-            break;
-
-        case WHERE_BLOCK_STMT:
-        case SWITCH_NODE:           // SELECT CASE ...
-        case ARITHIF_NODE:          // Arithmetical IF
-        case IF_NODE:               // IF... THEN
-        case CASE_NODE:             // CASE ...
-        case ELSEIF_NODE:           // ELSE IF...
-        case LOGIF_NODE:            // Logical IF
-        case WHILE_NODE:            // DO WHILE (...) 
-            RefInExpr(stmt->expr(0), _READ_);
-            break;
-
-        case COMGOTO_NODE:          // Computed GO TO
-            RefInExpr(stmt->expr(1), _READ_);
-            break;
-
-        case PROC_STAT:              // CALL
-            //err("Call statement in parallel loop",589,stmt);
-            Call(stmt->symbol(), stmt->expr(0));
-            break;
-
-        case FOR_NODE:
-            if (inparloop && !isPrivate(stmt->symbol()))
-                assigned_var_list = AddNewToSymbListEnd(assigned_var_list, stmt->symbol());
-            //Error("Index variable %s should be specified as private",stmt->symbol()->identifier(),585,stmt);
-            if (!inparloop)
-                RefInExpr(new SgVarRefExp(stmt->symbol()), _WRITE_);
-            RefInExpr(stmt->expr(0), _READ_);
-            RefInExpr(stmt->expr(1), _READ_);
-            break;
-
-        case FORALL_NODE:
-        case FORALL_STAT:
-            //err("FORALL statement",7,stmt); 
-            break;
-
-        case ALLOCATE_STMT:
-            //err("ALLOCATE/DEALLOCATE statement in region",588,stmt);
-            //RefInExpr(stmt->expr(0), _NUL_);           
-            break;
-
-        case DEALLOCATE_STMT:
-            //err("ALLOCATE/DEALLOCATE statement in region",588,stmt);
-            break;
-        case OPEN_STAT:
-        case CLOSE_STAT:
-        case INQUIRE_STAT:
-        {SgExpression *ioc[NUM__O];
-        control_list_open(stmt->expr(1), ioc); // control_list analysis            
-        RefInControlList_Inquire(ioc, NUM__O);
-        break;
-        }
-        case BACKSPACE_STAT:
-        case ENDFILE_STAT:
-        case REWIND_STAT:
-        {SgExpression *ioc[NUM__R];
-        control_list1(stmt->expr(1), ioc); // control_list analysis
-        RefInControlList(ioc, NUM__R);
-        break;
-        }
-        case WRITE_STAT:
-        case READ_STAT:
-        case PRINT_STAT:
-        {SgExpression *ioc[NUM__R];
-        // analyzes IO control list and sets on ioc[]                               
-        IOcontrol(stmt->expr(1), ioc, stmt->variant());
-        RefInControlList(ioc, NUM__R);
-        RefInIOList(stmt->expr(0), (stmt->variant() == READ_STAT ? _WRITE_ : _READ_));
-        break;
-        }
-        default:
-            break;
-        }
-
-
-    } //end for
-    cur_st = save;
-    return(uses_list);
-}
-
-void Add_Use_Module_Attribute()
-{
-   if(!USE_STATEMENTS_ARE_REQUIRED)
-   {
-      int *index = new int;
-      *index = 0;   
-      first_do_par->addAttribute(MODULE_USE, (void *) index, sizeof(int));  
-   }
-}
-
-void RefInExpr(SgExpression *e, int mode)
-{
-    int i;
-    SgExpression *el, *use;
-    if (!e)
-        return;
-    if (isSgValueExp(e)) 
-    {   
-        if (analyzing)
-            ConstantSubstitutionInTypeSpec(e);  // replace kind parameter if it is a named constant
-        return;
-    }
-    if (!analyzing && inparloop && mode == _WRITE_ && !isSgArrayRefExp(e) && e->symbol()  && !isPrivate(e->symbol()) && !isReductionVar(e->symbol()) && e->symbol()->type() && e->symbol()->type()->variant() != T_DERIVED_TYPE)  //  && !HEADER(e->symbol()) && !IS_CONSISTENT(e->symbol())
-        //Error("Assign to %s",e->symbol()->identifier(),586,cur_st);
-        assigned_var_list = AddNewToSymbListEnd(assigned_var_list, e->symbol());
-
-    //if(e->variant() == CONST_REF && isInUsesList(e->symbol()) != NULL)
-    //   return;
-    if (e->variant() == VAR_REF || e->variant() == CONST_REF || e->variant() == ARRAY_REF && e->symbol()->type()->variant() == T_STRING)
-    {                                //!printf("refinExpr: var %s\n",e->symbol()->identifier());
-        SgType *tp = e->symbol()->type();
-        if (tp->variant() == T_DERIVED_TYPE && (IS_BY_USE(tp->symbol()) || IS_BY_USE(e->symbol())))
-            Add_Use_Module_Attribute();
-        if (inparloop && isParDoIndexVar(e->symbol()))   //index of parallel loop
-            return;
-        if (inparloop && isPrivate(e->symbol()))
-            return;
-        if (inparloop && isReductionVar(e->symbol()))
-            return;
-        
-        if ((use = isInUsesListByChar(e->symbol()->identifier())) != 0)
-        {                              //!printf("RefInExpr  2 (is in list) %d\n",VAR_INTENT(use));
-                                       //uses_list ->unparsestdout();  printf("\n");
-            *VAR_INTENT(use) = WhatMode(*VAR_INTENT(use), mode);
-            return;
-        }
-        
-        i = tp->variant();
-        
-        if (inparloop && !analyzing)            
-            if (i == T_DERIVED_TYPE && !IS_BY_USE(tp->symbol()) && !IS_BY_USE(e->symbol())  || (i == T_STRING && TypeSize(tp) != 1))    //|| i==T_COMPLEX || i==T_DCOMPLEX
-            {
-               Error("Variable reference %s of illegal type in parallel loop", e->symbol()->identifier(), 583, cur_st);            
-            }
-        use = new SgExprListExp(*e);
-        uses_list = AddListToList(uses_list, use);
-        {
-            int *id = new int;
-            *id = WhatMode(mode,mode); 
-            use->addAttribute(INTENT_OF_VAR, (void *)id, sizeof(int));
-        }        
-        return;
-    }
-
-    if (isSgArrayRefExp(e))
-    {          //!printf("refinExpr: array %s\n",e->symbol()->identifier());
-        for (el = e->lhs(), i = 1; el; el = el->rhs(), i++)
-            RefInExpr(el->lhs(), _READ_);  //Index(el->lhs(),use,i);
-        SgType *tp = e->symbol()->type();
-        if (tp->variant()==T_ARRAY && tp->baseType()->variant()==T_DERIVED_TYPE && (IS_BY_USE(tp->baseType()->symbol()) || IS_BY_USE(e->symbol())))
-            Add_Use_Module_Attribute();
-
-        if (HEADER(e->symbol()))    //dvm-array
-        {
-            if (!analyzing && inparloop && mode != _WRITE_  && isRemAccessRef(e))
-                return;
-            if (inparloop && isPrivate(e->symbol()))
-                return;
-            acc_array_list = AddNewToSymbList(acc_array_list, e->symbol());
-            if (analyzing || for_shadow_compute)
-                MarkArraySymbol(e->symbol(), mode);
-            return;
-        }
-        // non-dvm-array
-
-        if (inparloop && isPrivate(e->symbol()))
-            return;
-        if (inparloop && isReductionVar(e->symbol()))
-            return;
-
-        acc_array_list = AddNewToSymbList(acc_array_list, e->symbol());
-
-        if (analyzing)
-        {
-            MarkArraySymbol(e->symbol(), mode);
-            // adding the attribute  REPLICATED_ARRAY to non-dvm-array
-            if (!HEADER_OF_REPLICATED(e->symbol()))
-            {
-                int *id = new int;
-                *id = 0;
-                e->symbol()->addAttribute(REPLICATED_ARRAY, (void *)id, sizeof(int));
-            }
-            // adding the attribute  DUMMY_ARRAY to non-dvm-array 
-            if (!DUMMY_FOR_ARRAY(e->symbol()))
-            {
-                SgSymbol **dummy = new (SgSymbol *);
-                *dummy = NULL;
-                e->symbol()->addAttribute(DUMMY_ARRAY, (void*)dummy, sizeof(SgSymbol *));
-            }
-        }
-        return;
-    }
-
-    if (isSgFunctionCallExp(e))
-    {
-        Call(e->symbol(), e->lhs());
-        //err("Function Call  in parallel loop",589,cur_st);
-        return;
-    }
-    if (e->variant() == ARRAY_OP)
-    {
-        if (inparloop && !analyzing)
-            Error("Substring reference %s in parallel loop", e->lhs()->symbol()->identifier(), 583, cur_st);
-        RefInExpr(e->lhs(), mode);
-        RefInExpr(e->rhs(), _READ_);
-        return;
-    }
-    if (isSgRecordRefExp(e))
-    {
-        SgExpression *estr = LeftMostField(e);
-        if(analyzing)
-          doNotForCuda(); 
-        SgExpression *erec = e;
-        while(isSgRecordRefExp(erec))
-        {
-             RefInExpr(RightMostField(erec)->lhs(),_READ_);
-             erec = erec->lhs();
-        }                  
-        RefInExpr(erec->lhs(),_READ_);
-        SgType *tp =  estr->symbol()->type(); 
-        if(isSgArrayType(tp))
-           tp = tp->baseType(); 
-        if(IS_BY_USE(tp->symbol()) || IS_BY_USE(estr->symbol()))
-        {
-          Warning("Structure component reference %s in parallel loop/region", estr->symbol()->identifier(), 582, cur_st);
-          Add_Use_Module_Attribute();
-          //printf("structure reference:: %s of TYPE %s\n", estr->symbol()->identifier(),estr->symbol()->type()->symbol()->identifier());
-        }
-        else
-          Error("Structure component reference %s in parallel loop/region", estr->symbol()->identifier(), 582, cur_st);
-             //StructureRef(e,mode);
-        RefInExpr(estr,mode);        
-        return;
-    }
-
-    RefInExpr(e->lhs(), mode);
-    RefInExpr(e->rhs(), mode);
-
-    return;
-}
-
-void RefIn_LoopHeaderExpr(SgExpression *e, SgStatement *dost)
-{
-    SgExpression *el, *use;
-
-    if (!e)
-        return;
-    if (e->variant() == VAR_REF)
-    {
-        if ((use = isInUsesList(e->symbol())) != 0)
-            return;
-
-        use = new SgExprListExp(*e);
-        uses_list = AddListToList(uses_list, use);
-        return;
-    }
-
-    if (isSgArrayRefExp(e))
-    {
-        for (el = e->lhs(); el; el = el->rhs())
-            RefIn_LoopHeaderExpr(el->lhs(), dost);
-        
-        if(!(use= isInUsesList(e->symbol())))
-        {
-          use = new SgExprListExp(*new SgArrayRefExp(*e->symbol()));
-          uses_list = AddListToList(uses_list,use);
-        }
-          
-        // Warning("Array reference %s in parallel loop",e->symbol()->identifier(),584,dost);
-
-        return;
-    }
-
-    if (e->variant() == ARRAY_OP)
-    {
-        Warning("Substring reference %s in parallel loop", e->symbol()->identifier(), 583, dost);
-        RefIn_LoopHeaderExpr(e->lhs(), dost);
-        RefIn_LoopHeaderExpr(e->rhs(), dost);
-        return;
-    }
-    if (isSgRecordRefExp(e))
-    {   
-        SgSymbol *s = LeftMostField(e)->symbol();
-        Warning("Structure component reference %s in parallel loop/region", s->identifier(), 582, dost);
-        if(!(use= isInUsesList(s)))
-        {
-          use = new SgExprListExp(*new SgVarRefExp(*s));
-          uses_list = AddListToList(uses_list,use);
-        }       
-        return;
-    }
-
-    RefIn_LoopHeaderExpr(e->lhs(), dost);
-    RefIn_LoopHeaderExpr(e->rhs(), dost);
-
-    return;
-}
-
-void RefInControlList(SgExpression *eoc[], int n)
-{
-    int i;
-    if (!eoc[UNIT_]) // PRINT
-        ;
-    else if (eoc[UNIT_]->type()->variant() == T_INT)  //external file
-        RefInExpr(eoc[UNIT_], _READ_);
-    else  // internal file = variable of character type
-        RefInExpr(eoc[UNIT_], _WRITE_);
-    for (i = 1; i < n; i++)
-    if (i == IOSTAT_)
-        RefInExpr(eoc[i], _WRITE_);
-    else
-        RefInExpr(eoc[i], _READ_);
-}
-
-void RefInControlList_Inquire(SgExpression *eoc[], int n)
-{
-    int i;
-    for (i = 0; i < n; i++)
-    if (i == U_ || i == ER_ || i == FILE_)
-        RefInExpr(eoc[i], _READ_);
-    else
-        RefInExpr(eoc[i], _WRITE_);
-}
-
-void RefInIOList(SgExpression *iol, int mode)
-{
-    SgExpression *el, *e;
-    for (el = iol; el; el = el->rhs()) {
-        e = el->lhs();  // list item
-        if (analyzing)
-            ReplaceFuncCall(e);
-        if (isSgExprListExp(e)) // implicit loop in output list
-            e = e->lhs();
-        if (isSgIOAccessExp(e))
-            RefInImplicitLoop(e, mode);
-        else
-            RefInExpr(e, mode);  //RefInIOitem(e,mode);     
-    }
-
-}
-
-void RefInImplicitLoop(SgExpression *eim, int mode)
-{
-    SgExpression *ell, *e;
-    if (isSgExprListExp(eim->lhs()))
-    for (ell = eim->lhs(); ell; ell = ell->rhs())  //looking through item list of implicit loop
-    {
-        e = ell->lhs();
-        if (isSgExprListExp(e)) // implicit loop in output list
-            e = e->lhs();
-        if (isSgIOAccessExp(e))
-            RefInImplicitLoop(e, mode);
-        else
-            RefInExpr(e, mode);
-    }
-    else
-        RefInExpr(eim->lhs(), mode);
-
-    return;
-}
-
-/*void RefInIOitem(SgExpression *e, int mode)
-{}*/
-
-int WhatMode(int mode, int mode_new)
-{   //17.08.16
-    if (mode == mode_new && mode == _READ_)    
-        return(mode);
-    else
-        return(_READ_WRITE_);
-
-}
-
-void MarkArraySymbol(SgSymbol *ar, int mode)
-{
-    if (mode == _READ_)
-        SYMB_ATTR(ar->thesymb) = SYMB_ATTR(ar->thesymb) | USE_IN_BIT;
-    else if (mode == _WRITE_)
-        SYMB_ATTR(ar->thesymb) = SYMB_ATTR(ar->thesymb) | USE_OUT_BIT;
-    else if (mode == _READ_WRITE_)
-    {
-        SYMB_ATTR(ar->thesymb) = SYMB_ATTR(ar->thesymb) | USE_IN_BIT;
-        SYMB_ATTR(ar->thesymb) = SYMB_ATTR(ar->thesymb) | USE_OUT_BIT;
-    }
-}
-
-int isOutArray(SgSymbol *s)
-{
-    if (s->attributes() & USE_OUT_BIT)
-        return(1);
-    else
-        return(0);
-}
-
-int isPrivate(SgSymbol *s)
-{
-    SgExpression *el;
-    for (el = private_list; el; el = el->rhs())
-    {
-        if (ORIGINAL_SYMBOL(el->lhs()->symbol()) == ORIGINAL_SYMBOL(s))
-            return(1);
-    }
-    return(0);
-}
-
-int isPrivateInRegion(SgSymbol *s)
-{
-    if (IN_COMPUTE_REGION && inparloop && isPrivate(s))
-        return(1);
-    else
-        return(0);
-}
-
-int is_acc_array(SgSymbol *s)
-{
-    if (HEADER(s) && isIn_acc_array_list(s) ||
-        DUMMY_FOR_ARRAY(s) && isIn_acc_array_list(*DUMMY_FOR_ARRAY(s)))
-        return 1;
-    else
-        return 0;
-}
-
-int isReductionVar(SgSymbol *s)
-{
-    reduction_operation_list *rl;
-    for (rl = red_struct_list; rl; rl = rl->next)
-    { 
-        if(ORIGINAL_SYMBOL(rl->redvar) == ORIGINAL_SYMBOL(s))
-            return(1);
-        if (rl->locvar && ORIGINAL_SYMBOL(rl->locvar) == ORIGINAL_SYMBOL(s))
-            return(1);
-    }
-    return(0);
-}
-
-SgExpression *isInUsesList(SgSymbol *s)
-{
-    
-    SgExpression *el;
-    for (el = uses_list; el; el = el->rhs())
-    {
-        if (el->lhs()->symbol() == s)
-            return(el);
-    }
-    return(NULL);
-}
-
-SgExpression *isInUsesListByChar(const char *symb)
-{
-
-    SgExpression *el;
-    for (el = uses_list; el; el = el->rhs())
-    {
-        if (strcmp(el->lhs()->symbol()->identifier(), symb) == 0)
-            return(el);
-    }
-    return(NULL);
-}
-
-int isParDoIndexVar(SgSymbol *s)
-{
-    SgExpression *vl;
-    if (!dvm_parallel_dir)
-        return(0);
-    for (vl = dvm_parallel_dir->expr(2); vl; vl = vl->rhs())
-    {
-        if (vl->lhs()->symbol() == s)
-            return(1);
-    }
-    return(0);
-}
-
-int isByValue(SgSymbol *s)
-{
-    return(isInByValueList(s));
-}
-
-int isInByValueList(SgSymbol *s)
-{
-    symb_list *sl;
-	for (sl = by_value_list; sl; sl = sl->next)
-	{
-		if (sl->symb == s)
-			return(1);
-	}
-    return(0);
-}
-
-SgExpression *DoReductionOperationList(SgStatement *par)
-{
-    SgExpression *el;
-
-    // looking through the specification list of PARALLEL directive
-    for (el = par->expr(1); el; el = el->rhs())
-    if (el->lhs()->variant() == REDUCTION_OP)
-    {
-        return (el->lhs()->lhs());
-    }
-    return(NULL);
-}
-
-void ParallelOnList(SgStatement *par)
-{
-    if(par->expr(0))
-       parallel_on_list = AddNewToSymbList(parallel_on_list, par->expr(0)->symbol());
-}
-
-void TieList(SgStatement *par)
-{
-    SgExpression *el, *es;
-    for(el=par->expr(1); el; el=el->rhs()) 
-       if(el->lhs()->variant() == ACC_TIE_OP)            // TIE specification
-       {
-         for(es=el->lhs()->lhs(); es; es=es->rhs())
-         {
-            SgSymbol *s = es->lhs()->symbol();
-            if (!HEADER(s) && !HEADER_OF_REPLICATED(s))
-            {
-                int *id = new int;
-                *id = 0;
-                s->addAttribute(REPLICATED_ARRAY, (void *)id, sizeof(int));
-            }
-
-            tie_list = AddNewToSymbList(tie_list, s);
-            parallel_on_list = AddNewToSymbList(parallel_on_list, s);
-         }
-         return;
-       }
-}
-
-void DoPrivateList(SgStatement *par)
-{
-    SgExpression *el;
-    private_list = NULL;
-
-    // looking through the specification list of PARALLEL directive
-    for (el = par->expr(1); el; el = el->rhs())
-    if (el->lhs()->variant() == ACC_PRIVATE_OP)
-    {
-        private_list = el->lhs()->lhs();
-        break;
-    }
-    UsesInPrivateArrayDeclarations(private_list);
-}
-
-void CreatePrivateAndUsesVarList()
-{
-    SgExpression *el, *eop;
-    SgStatement *do_dir;
-
-    private_list = NULL;
-    //uses_list = NULL; 
-    do_dir = cur_region->cur_do_dir;
-    if (!do_dir)
-        return;
-
-    for (el = do_dir->expr(0); el; el = el->rhs())
-    {
-        eop = el->lhs();
-        if (eop->variant() == ACC_PRIVATE_OP)
-        {   //private_list = AddToVarRefList(private_list,eop->lhs());
-            private_list = AddListToList(private_list, eop->lhs());
-            continue;
-        }
-        /*
-           if(eop->variant()==ACC_USES_OP)
-           {   //uses_list = AddToVarRefList(uses_list,eop->lhs());
-           uses_list = AddListToList(uses_list,eop->lhs());
-           continue;
-           }
-           */
-    }
-
-    /*
-    // compare two list
-    for(el=private_list; el; el=el->rhs())
-    {
-    for(el2=uses_list; el2; el2=el2->rhs())
-    if(el2->lhs()->symbol() == el->lhs()->symbol() && el2->lhs()->symbol()->variant()==VAR_REF)
-    Error("%s in USES and PRIVATE clause",el->lhs()->symbol()->identifier(),605,do_dir);
-    }
-    */
-    return;
-}
-
-SgSymbol *FunctionResultVar(SgStatement *func)
-{
-    if (func->expr(0))
-        return(func->expr(0)->symbol());
-    else
-        return(func->symbol());
-}
-
-
-void Argument(SgExpression *e, int i, SgSymbol *s)
-{
-    int variant;
-    if(e->variant() == LABEL_ARG) return; //!!! illegal
-    if(e->variant() == KEYWORD_ARG) 
-        Argument(e->rhs(), findParameterNumber(ProcedureSymbol(s), NODE_STR(e->lhs()->thellnd)), s);
-    if (e->variant() == CONST_REF)
-    {
-        RefInExpr(e, _READ_);
-        return;
-    }
-    if (isSgVarRefExp(e))
-    {
-        variant = e->symbol()->variant();  /*printf("argument %s\n", e->symbol()->identifier());*/
-        if ((variant == FUNCTION_NAME && e->symbol() != FunctionResultVar(cur_func)) || variant == PROCEDURE_NAME || variant == ROUTINE_NAME)
-            return;
-        RefInExpr(e, isInParameter(ProcedureSymbol(s),i) ? _READ_ : _READ_WRITE_); 
-        return;
-    }
-    else if (isSgArrayRefExp(e))
-    {
-        if (analyzing && e->lhs() && isSgArrayType(e->type())) // case of array section
-        {
-            Warning("Array section of %s in a region", e->symbol()->identifier(), 667, cur_st);
-            doNotForCuda();
-        }
-        if (!analyzing && isPrivate(e->symbol()) && isArrayParameter(ProcedureSymbol(s),i))
-        {  // scheme with PrivateArray Class
-            private_array_arg++; // += isArrayParameter(ProcedureSymbol(s),i);
-            if (!FromOtherFile(s))
-                addArgumentNumber(i, s);
-        }
-        RefInExpr(e, _READ_WRITE_);
-        return;
-    }
-    else if (e->variant() == ARRAY_OP)
-    {
-        RefInExpr(e->lhs(), _READ_WRITE_);
-        RefInExpr(e->rhs(), _READ_);
-        return;
-    }
-    else
-    {
-        RefInExpr(e, _READ_);
-        return;
-    }
-}
-
-void Call(SgSymbol *s, SgExpression *e)
-{
-    SgExpression *el;
-    int i;
-
-    if (DECL(s) == 2)    //is statement function
-    {
-        RefInExpr(e, _READ_);
-        if (inparloop && analyzing)
-            Error("Call of statement function  %s in parallel loop", s->identifier(), 581, cur_st);
-
-        if (IN_STATEMENT_GROUP(cur_st) && analyzing)
-            Error("Call of statement function  %s in region", s->identifier(), 581, cur_st);
-        return;
-    }
-    if (IsInternalProcedure(s) && analyzing)
-        Error(" Call of the procedure %s in a region, which is internal/module procedure", s->identifier(), 580, cur_st);
-
-    if (!isUserFunction(s) && (s->attributes() & INTRINSIC_BIT || isIntrinsicFunctionName(s->identifier()))) //IsNoBodyProcedure(s)
-    {
-        RefInExpr(e, _READ_);
-        return;
-    }
-
-    if (analyzing)
-    {  
-        if ((!IsPureProcedure(s) && (s->variant() != FUNCTION_NAME || !options.isOn(NO_PURE_FUNC))) || IS_BY_USE(s))
-        {
-            Warning(" Call of the procedure %s in a region, which is not pure. Module procedure call is illegal. Intrinsic procedure should be specified by INTRINSIC statement.", s->identifier(), 580, cur_st);
-            doNotForCuda();
-        }
-    }
-    else
-    {
-        if (IN_COMPUTE_REGION && isForCudaRegion() && (IsPureProcedure(s) || (s->variant() == FUNCTION_NAME && options.isOn(NO_PURE_FUNC)) ))  //pure procedure call from the region witch is preparing for CUDA-device        
-            MarkAsCalled(s);
-        acc_call_list = AddNewToSymbList(acc_call_list, s);
-    }
-
-    if (!e)  //argument list is absent
-        return;
-    in_arg_list++;
-    for (el = e, i = 0; el; el = el->rhs(), i++)
-        Argument(el->lhs(), i, s);
-    in_arg_list--;
-
-    return;
-}
-
-SgExpression * AddListToList(SgExpression *list, SgExpression *el)
-{
-    SgExpression  *l;
-
-    //adding the expression list 'el' to the expression list 'list'
-
-    if (!list) {
-        list = el;
-
-    }
-    else {
-        for (l = list; l->rhs(); l = l->rhs())
-            ;
-        l->setRhs(el);
-    }
-    return(list);
-}
-
-
-SgExpression * ExpressionListsUnion(SgExpression *list, SgExpression *alist)
-{
-    SgExpression  *l, *el, *first;
-
-    //adding the expression list 'alist' to the expression list 'list' without repeating
-
-    if (!list)
-        return(alist);
-
-    first = list;
-
-    for (el = alist; el;)
-    if (isInExprList(el->lhs(), first))
-        el = el->rhs();
-    else
-    {
-        l = el;
-        el = el->rhs();
-        l->setRhs(list);
-        list = l;
-        //AddListToList(list,l);
-    }
-
-    return(list);
-}
-
-SgExpression *isInExprList(SgExpression *e, SgExpression *list)
-{
-    SgExpression *el;
-    SgSymbol *s;
-    s = e->symbol();
-    if (!s)
-        return(NULL);
-    for (el = list; el; el = el->rhs())
-    {
-        if (el->lhs() && el->lhs()->symbol() == s)
-            return(el);
-    }
-    return(NULL);
-
-}
-
-
-symb_list *SymbolListsUnion(symb_list *slist1, symb_list *slist2)
-{
-    symb_list  *l, *sl, *first;
-
-    //adding the symbol list 'slist2' to the symbol list 'slist1' without repeating
-
-    if (!slist1)
-        return(slist2);
-
-    first = slist1;
-
-    for (sl = slist2; sl;)
-    if (isInSymbList(sl->symb, first) != NULL)
-        sl = sl->next;
-    else
-    {
-        l = sl;
-        sl = sl->next;
-        l->next = slist1;
-        slist1 = l;
-
-    }
-
-    return(slist1);
-}
-
-symb_list *isInSymbList(SgSymbol *s, symb_list *slist)
-{
-    symb_list *sl;
-    for (sl = slist; sl; sl = sl->next)
-    if (sl->symb == s)
-        return(sl);
-    return(NULL);
-}
-
-symb_list *isInSymbListByChar(SgSymbol *s, symb_list *slist)
-{
-    symb_list *sl;
-    for (sl = slist; sl; sl = sl->next)
-    if (!strcmp(sl->symb->identifier(), s->identifier()))
-        return(sl);
-    return(NULL);
-}
-
-int ListElemNumber(SgExpression *list)
-{
-    SgExpression  *l;
-    int n = 0;
-    if (!list) return(0);
-    for (l = list; l; l = l->rhs())
-        n = n + 1;
-    return(n);
-}
-
-SgExpression * AddToVarRefList(SgExpression *list, SgExpression *list2)
-{
-    SgExpression  *l, *el;
-
-    //adding the expression 'el' to the expression list 'list'
-    for (el = list2; el; el = el->rhs())
-    if (!list) {
-        list = el;
-        el->setRhs(NULL);
-    }
-    else {
-        for (l = list; l; l = l->rhs())
-        {
-            if (l->lhs()->symbol() == el->lhs()->symbol() && el->lhs()->variant() == VAR_REF)
-                continue;
-        }
-        el->setRhs(list);
-        list = el;
-    }
-    return(list);
-}
-
-
-void AddToRedVarList(SgExpression *ev, int i)
-{
-    SgExpression *el, *el1;
-    el1 = new SgExprListExp(*ev);
-    //el2 = new SgExprListExp(*new SgArrayRefExp(*red_offset_symb,*new SgValueExp(i)));
-    if (!red_var_list)
-    {
-        red_var_list = el1;
-        //el1 -> setRhs(el2);
-        return;
-    }
-    el = red_var_list;
-    while (el->rhs())
-        el = el->rhs();
-    el->setRhs(el1);
-    //el1 -> setRhs(el2);
-    return;
-}
-
-
-SgExpression *CreateActualLocationList(SgSymbol *locvar, int numb)
-{
-    SgExprListExp *sl, *sll;
-    int i;
-    if (!locvar) return(NULL);
-
-    sl = NULL;
-    for (i = numb; i; i--)
-    {
-        sll = new SgExprListExp(*new SgArrayRefExp(*locvar, *LocVarIndex(locvar, i)));
-        sll->setRhs(sl);
-        sl = sll;
-    }
-    return(sl);
-}
-
-/*
-SgExpression *CreateRedOffsetVarList()
-{ SgExpression *el,*newl,*ell;
-SgSymbol *s,*soff;
-reduction_operation_list *rsl;
-//char *name;
-formal_red_offset_list = newl= NULL;
-//for(el=red_var_list;el;el=el->rhs())
-for(rsl=red_struct_list;rsl;rsl=rsl->next)
-{  //s =el->lhs()->symbol();
-s = rsl->redvar;
-soff = RedOffsetSymbolInKernel(s);
-ell = new SgExprListExp(*new SgVarRefExp(*soff));
-if(!formal_red_offset_list)
-formal_red_offset_list = newl = ell;
-else
-{   newl->setRhs(ell);
-newl = ell;
-}
-if(rsl->locvar)
-{ soff = RedOffsetSymbolInKernel(rsl->locvar);
-ell = new SgExprListExp(*new SgVarRefExp(*soff));
-newl->setRhs(ell);
-newl = ell;
-}
-}
-return(formal_red_offset_list);
-}
-*/
-/*
-void AddFormalArg_For_LocArrays()
-{ SgExpression *el;
-reduction_operation_list *rsl;
-
-el = formal_red_offset_list;
-if(!el) return;
-
-while(el->rhs())
-el=el->rhs();
-
-//el - last element of formal_red_offset_list
-
-for(rsl=red_struct_list;rsl;rsl=rsl->next)
-{
-if(rsl->locvar)
-{
-el->setRhs(rsl->formal_arg);
-while(el->rhs())
-el=el->rhs();
-}
-}
-}
-*/
-/*
-void AddActualArg_For_LocArrays()
-{ //add to red_var_list (to end of argument list)
-SgExpression *el;
-reduction_operation_list *rsl;
-
-el = red_var_list;
-if(!el) return;
-
-while(el->rhs())
-el=el->rhs();
-
-//el - last element of red_var_list
-
-for(rsl=red_struct_list;rsl;rsl=rsl->next)
-{
-if(rsl->locvar)
-{
-el->setRhs(rsl->actual_arg);
-while(el->rhs())
-el=el->rhs();
-}
-}
-}
-*/
-/*
-SgExpression *FindUsesInFormalArgumentList()
-{ SgExpression *el,*cl;
-cl = kernel_st->expr(0);
-//cl->unparsestdout(); printf("COPY END\n");
-for(el=argument_list,cl = kernel_st->expr(0); el!=uses_list && el!=red_var_list; el=el->rhs(),cl = cl->rhs())
-;
-
-return(cl);
-}
-*/
-
-SgType *IndexType()
-{
-    return(SgTypeInt()); //!!!!!
-}
-
-int KindOfIndexType()
-{
-    return(4); //!!!!!
-}
-
-SgType *CudaIndexType()
-{
-    SgType *type;
-    if (undefined_Tcuda)
-        return(FortranDvmType());
-
-    type = new SgType(T_INT);
-    TYPE_KIND_LEN(type->thetype) = (new SgExpression(KIND_OP, new SgValueExp(4), NULL, NULL))->thellnd;
-    return(type); //!!!!!
-}
-
-SgType *CudaOffsetType()
-{
-    SgType *type;
-    if (!undefined_Tcuda)
-        return(FortranDvmType());
-
-    type = new SgType(T_INT);
-    TYPE_KIND_LEN(type->thetype) = (new SgExpression(KIND_OP, new SgValueExp(4), NULL, NULL))->thellnd;
-    return(type); //!!!!!
-}
-
-int KindOfCudaIndexType()
-{
-    return(4); //!!!!!
-}
-
-SgStatement *CopyBlockToKernel(SgStatement *first_st, SgStatement *last_st)
-{
-    SgStatement *st, *st_end, *last, *st_copy;
-    int no;
-    st_end = kernel_st->lastNodeOfStmt();
-    for (st = first_st; IN_STATEMENT_GROUP(st); st = st->lexNext())
-    {
-        if ((st->variant() == FOR_NODE) || (st->variant() == WHILE_NODE))
-        {
-            last = LastStatementOfDoNest(st);
-            if (last != (st->lastNodeOfStmt()) || last->variant() == LOGIF_NODE)
-            {
-                last = ReplaceBy_DO_ENDDO(st, last); //ReplaceLabelOfDoStmt(st,last, GetLabel());
-                //ReplaceDoNestLabel_Above(last,first_do,GetLabel());
-            }
-        }
-        st_copy = st->copyPtr();
-
-        st_end->insertStmtBefore(*st_copy, *kernel_st);
-        //replace label identification (it's not correct!!!)
-        if (st->hasLabel())
-        {
-            no = LABEL_STMTNO(st->label()->thelabel);
-            LABEL_STMTNO(st_copy->label()->thelabel) = no;
-        }
-        if ((st->variant() == FOR_NODE) || (st->variant() == WHILE_NODE))
-            st = lastStmtOfDo(st); //last_st
-        //      else if(st->variant() == IF_NODE && st->lastNodeOfStmt()->variant()==ELSEIF_NODE)
-
-        else
-            st = st->lastNodeOfStmt();
-
-    }
-    if (options.isOn(C_CUDA))
-        kernel_st->lexNext()->addComment("// Sequence of statements\n");
-    else
-        kernel_st->lexNext()->addComment("! Sequence of statements\n");
-
-    return(kernel_st->lexNext());
-}
-
-
-void TransferBlockToHostSubroutine(SgStatement *first_st, SgStatement *last_st, SgStatement *st_end)
-{
-    first_st->addComment("! Sequence of statements\n");
-    TransferStatementGroup(first_st,last_st,st_end);
-    TranslateFromTo(first_st,st_end,1);
-}
-
-/*
-void LookTroughTheStatementOfSequenceForDvmAssign(SgStatement *st,SgStatement *stend)
-{ SgStatement *stmt;
-
-for(stmt=st; stmt!=stend; stmt=stmt->lexNext())
-if( st->variant()==ASSIGN_STAT && isDistObject(st->expr(0)) )
-{ if( !isSgArrayType(st->expr(0)->type())){ //array element
-ReplaceByIfWithTestFunction(TranslateBlock (st));
-} else
-
-}
-*/
-
-void TestDvmObjectAssign(SgStatement *st)
-{
-    if (isDistObject(st->expr(0)))
-    {
-        if (!isSgArrayType(st->expr(0)->type())) //array element
-            ReplaceAssignByIfForRegion(st);
-        else //array section or whole array
-            err("Illegal statement in the range of region ", 576, st);
-    }
-}
-
-void ReplaceAssignByIfForRegion(SgStatement *stmt)
-{
-    ReplaceContext(stmt);
-
-
-    ReplaceAssignByIf(stmt);
-
-}
-
-SgStatement *CopyBodyLoopForCudaKernel(SgStatement *first_do, int nloop)
-{
-    int ndo;
-    SgStatement *st, *copy_st;
-    //!printf("loop rank = %d\n",nloop);
-    for (st = first_do, ndo = 0; ndo < nloop; st = ((SgForStmt *)st)->body())
-        ndo++;
-    if (dvm_debug)
-    while (st->lineNumber() == 0) //inserted debug statement
-        st = st->lexNext();
-    //if(nloop>3)
-    //err("Not implemented yet.Rank of loop is greater than 3.",599,first_do);
-    //!printf("in copy body\n"); 
-    copy_st = st->copyBlockPtr(SAVE_LABEL_ID); //&(st->copy());
-
-    //create loop body copies
-    unsigned stackSize = CopyOfBody.size();
-    for (size_t i = 0; i < stackSize; ++i)
-        CopyOfBody.pop();
-    for (int i = 0; i < countKernels * nloop; ++i)
-        CopyOfBody.push(st->copyBlockPtr(SAVE_LABEL_ID));
-
-    return(copy_st);
-}
-
-/*!!!
-SgStatement *CopyBodyLoopToKernel(SgStatement *first_do)
-{ SgExpression *vl,*dovar,*erb;
-int nloop, ndo;
-SgStatement *st,*copy_st,*stend,*last, *stk, *for_st;
-SgSymbol *sind;
-SgForStmt *stdo;
-
-// looking through the do_variables list
-vl = dvm_parallel_dir->expr(2); // do_variables list
-for(dovar=vl,nloop=0; dovar; dovar=dovar->rhs())
-nloop++;
-//!!!printf("nloop:%d\n",nloop);
-// looking through the loop nest
-erb=NULL;
-for(st=first_do,ndo=0; ndo<nloop; st=((SgForStmt *)st)->body())
-{   //!!!printf("line number: %d,  %d\n",st->lineNumber(),((SgForStmt *)st)->body()->lineNumber());
-if(((SgForStmt *)st)->start()->variant()==ADD_OP) //redblack scheme
-{ erb = ((SgForStmt *)st)->start()->rhs(); // MOD function call
-erb = &(erb->lhs()->lhs()->copy());   //first argument of MOD function call
-erb-> setLhs(new SgVarRefExp(st->symbol()));
-for_st = st;
-}
-ndo++;
-}
-//!!!printf("line number of st: %d,  %d\n",st->lineNumber(), st);
-if(nloop>3)
-err("Not implemented yet.Rank of loop is greater 3.",599,first_do);
-
-
-//  copy_st = &first_do->copy();
-//  cur_in_kernel->insertStmtAfter(*copy_st);
-
-//  for(st=copy_st,ndo=0; ndo<nloop-1; st=st->lexNext())
-//     ndo++;
-
-//  while(ndo--)
-//  { //sind = st->symbol();
-//    last = st->lastNodeOfStmt();
-//    if(last->variant()!=CONTROL_END)
-//  continue;
-//    {InsertNewStatementAfter(new SgStatement(CONTROL_END),last,st);
-//     last=
-//    st-> setVariant(IF_NODE);
-//    st->setExpression(0,*KernelCondition(st->symbol(),ndo));
-//    BIF_LL2(st->thebif) = NULL;
-//     BIF_LL3(st->thebif) = NULL;
-//    st=st->controlParent();
-//  }
-
-
-copy_st=st->copyBlockPtr(); //&(st->copy());
-if(erb)
-{   st = new SgIfStmt(*ConditionForRedBlack(erb),*copy_st);
-copy_st = st;
-}
-
-last = cur_in_kernel->lexNext();
-cur_in_kernel->insertStmtAfter(*copy_st, *cur_in_kernel);
-copy_st->addComment("! Loop body\n");
-stk = erb ? last->lexPrev()->lexPrev(): last->lexPrev();
-if(stk->variant()==CONTROL_END )
-if(stk->hasLabel())
-stk->setVariant(CONT_STAT);
-else
-stk->extractStmt();
-
-
-//last = cur_in_kernel->controlParent()->lastNodeOfStmt();
-//last = copy_st->lastNodeOfStmt();
-//  last = last->lexPrev();
-// if(last->variant()==CONTROL_END && last->controlParent()==cur_in_kernel->controlParent())
-//    last->extractStmt();
-//copy_st->extractStmt();
-
-return(last);
-}
-*/
-
-
-/*
-SgExpression *TypeSizeCExpr(SgType *type)
-{ int size;
-size = TypeSize(type);
-// if integer,real,doublepresision, but no complex,bool
-return(& SgSizeOfOp(*new SgTypeRefExp(*type)));
-}
-*/
-
-char *ParallelLoopComment(int line)
-{
-    char *cmnt = new char[35];
-    sprintf(cmnt, "! Parallel loop (line %d)\n", line);
-    return(cmnt);
-}
-
-char *OpenMpComment_InitFlags(int idvm)
-{
-    char *cmnt = new char[80];
-    sprintf(cmnt, "!$    %s = %s \n", UnparseExpr(DVM000(idvm)), UnparseExpr(&(*DVM000(idvm) + *new SgValueExp(8))));
-    return(cmnt);
-}
-
-char *OpenMpComment_HandlerType(int idvm)
-{
-    char *cmnt = new char[80];
-    sprintf(cmnt, "!$    %s = %s \n", UnparseExpr(DVM000(idvm)), UnparseExpr(HandlerExpr()));
-    return(cmnt);
-}
-
-char *SequenceComment(int line)
-{
-    char *cmnt = new char[60];
-    sprintf(cmnt, "! Sequence of statements (line %d)\n", line);
-    return(cmnt);
-}
-
-char *RegionComment(int line)
-{
-    char *cmnt = new char[35];
-    sprintf(cmnt, "! Start region (line %d)\n", line);
-    return(cmnt);
-}
-
-char *EndRegionComment(int line)
-{
-    char *cmnt = new char[35];
-    sprintf(cmnt, "! Region end (line %d)\n", line);
-    return(cmnt);
-}
-
-char *Host_LoopHandlerComment()
-{
-    char *cmnt = new char[100];
-    sprintf(cmnt, "!     Host handler for loop on line %d \n\n", first_do_par->lineNumber());
-    return(cmnt);
-}
-
-char *Host_SequenceHandlerComment(int lineno)
-{
-    char *cmnt = new char[120];
-    sprintf(cmnt, "!     Host handler for sequence of statements on line %d \n\n", lineno);
-    return(cmnt);
-}
-
-char *Indirect_ProcedureComment(int lineno)
-{
-    char *cmnt = new char[130];
-    sprintf(cmnt, "!     Indirect distribution: procedures for statement on line %d \n\n", lineno);
-    return(cmnt);
-}
-
-char *CommentLine(const char *txt)
-{
-    char *cmnt;
-    cmnt = (char *)malloc((unsigned)(strlen(txt) + 5));
-    if (options.isOn(C_CUDA))
-        sprintf(cmnt, "// %s", txt);
-    else
-        sprintf(cmnt, "! %s\n", txt);
-
-    return(cmnt);
-}
-
-char *IncludeComment(const char *txt)
-{
-    char *cmnt;
-    cmnt = (char *)malloc((unsigned)(strlen(txt) + 12));
-    sprintf(cmnt, "#include %s\n", txt);
-    return(cmnt);
-}
-
-char *DefineComment(char *txt)
-{
-    char *cmnt;
-    cmnt = (char *)malloc((unsigned)(2 * strlen(txt) + 12));
-    sprintf(cmnt, "#define %s %s", txt, txt);
-    cmnt[2 * strlen(txt) + 8] = '\n';
-    cmnt[2 * strlen(txt) + 9] = '\0';
-    return(cmnt);
-}
-
-const char *CudaIndexTypeComment()
-{
-    const char *cmnt = NULL;
-
-    cmnt = "typedef int __indexTypeInt; \n"
-        "typedef long long __indexTypeLLong;\n";
-
-    return cmnt;
-}
-
-char *CalledProcedureComment(const char *txt, SgSymbol *symb)
-{
-    char *cmnt = new char[strlen(txt) + strlen(symb->identifier()) + 20];
-    char *tmp = aks_strlowr(txt);
-    sprintf(cmnt, "//DVMH_CALLS %s:%s\n", symb->identifier(), tmp);
-    delete []tmp;
-    return(cmnt);
-}
-
-
-SgExpression *ThreadsGridSize(SgSymbol *s_threads)
-{
-    SgExpression *tgs;
-    tgs = &((*new SgRecordRefExp(*s_threads, "x")) * (*new SgRecordRefExp(*s_threads, "y")) * (*new SgRecordRefExp(*s_threads, "z")));
-    return(tgs);
-}
-
-SgSymbol *isSymbolWithSameNameInTable(SgSymbol *first_in, char *name)
-{
-    SgSymbol *s;
-    for (s = first_in; s; s = s->next())
-    {
-        if (!strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-/***************************************************************************************/
-/*    Unparsing To .cuf and .cu File                                                   */
-/***************************************************************************************/
-
-void UnparseTo_CufAndCu_Files(SgFile *f, FILE *fout_cuf, FILE *fout_C_cu, FILE *fout_info) /*ACC*/
-{
-    SgStatement *stat, *stmt;
-
-    if (!mod_gpu) return;
-
-    if (!GeneratedForCuda())   //if(options.isOn(NO_CUDA) || !kernel_st)
-    {
-        if (info_block)
-            info_block->extractStmt();
-        if (block_C_Cuda)
-            block_C_Cuda->extractStmt();
-        mod_gpu->extractStmt();
-        if(block_C)
-            block_C->extractStmt();
-        return;
-    }
-
-    if (options.isOn(C_CUDA))
-    {
-        // unparsing info_block to fout_info
-        if (info_block)
-        {
-            fprintf(fout_info, "%s", UnparseBif_Char(info_block->thebif, C_LANG));
-            info_block->extractStmt();
-        }
-        // unparsing C-Cuda  block to fout_C_cu
-        //block_C_Cuda->setVariant(EXTERN_C_STAT);  //10.12.13
-        if ( block_C_Cuda)
-        {
-            fprintf(fout_C_cu, "%s", UnparseBif_Char(block_C_Cuda->thebif, C_LANG));
-            block_C_Cuda->extractStmt();
-        }
-        // unparsing Module of C-Cuda-kernels to fout_C_cu
-        //mod_gpu ->setVariant(EXTERN_C_STAT);  //10.12.13//26.12.14
-        fprintf(fout_C_cu, "%s", UnparseBif_Char(mod_gpu->thebif, C_LANG));
-        mod_gpu->extractStmt();
-        // unparsing C Adapter Functions to fout_C_cu
-        if (block_C)
-        {
-            block_C->setVariant(EXTERN_C_STAT);
-            fprintf(fout_C_cu, "%s", UnparseBif_Char(block_C->thebif, C_LANG));
-            block_C->extractStmt();
-        }
-        return;
-    }
-
-    // grab the first statement in the file.
-    stat = f->firstStatement(); // file header
-    stmt = stat->lexNext();
-
-    // unparsing info_block to fout_info
-    if (info_block)
-    {
-        fprintf(fout_info, "%s", UnparseBif_Char(info_block->thebif, C_LANG));
-        info_block->extractStmt();
-    }
-    // unparsing C Adapter Functions to fout_C_cu   (!! C before Fortran because tabulation )
-    //block_C->setSymbol(*mod_gpu_symb);
-    if (block_C)
-    {
-        block_C->setVariant(EXTERN_C_STAT);
-        fprintf(fout_C_cu, "%s", UnparseBif_Char(block_C->thebif, C_LANG));
-        block_C->extractStmt();
-    }
-    // unparsing Module of Fortran-Cuda-kernels to fout_cuf (!!Fortran after C because tabulation)
-    fprintf(fout_cuf, "%s", UnparseBif_Char(mod_gpu->thebif, FORTRAN_LANG));
-    mod_gpu->extractStmt();
-
-    /*
-      while( stmt!=mod_gpu)
-      {   printf("function C: %s \n", stmt->expr(0)->symbol()->identifier());
-      fprintf(fout_C_cu,"%s",UnparseBif_Char(stmt->thebif,C_LANG));
-      st_func = stmt;
-      stmt=stmt->lastNodeOfStmt()->lexNext();
-      st_func->extractStmt();
-      }
-      */
-
-}
-
-void UnparseForDynamicCompilation(FILE *fout_cpp)
-{
-    SgStatement *stmt;
-    stmt = mod_gpu->lexNext();
-    while (stmt->variant() != CONTROL_END)
-    {   //printf("%d\n",stmt->variant());
-        BIF_CMNT(stmt->thebif) = NULL;
-        char *unp_buf = UnparseBif_Char(stmt->thebif, C_LANG);
-        //char *buff = new char[strlen(unp_buf) + 1];
-        //sprintf(buff, "const char *%s = ""extern ""C""  %s"";""", stmt->symbol()->identifier(),unp_buf); 
-        fprintf(fout_cpp, "const char *%s = \"extern \"C\"  %s\";\n\n", stmt->symbol()->identifier(), unp_buf);
-        //delete []buff;
-        stmt = stmt->lastNodeOfStmt()->lexNext(); //printf("%d\n",stmt->variant());
-    }
-
-}
-
-/***************************************************************************************/
-/*    Creating New File                                                                */
-/***************************************************************************************/
-int Create_New_File(char *file_name, SgFile *file, char *fout_name)
-
-{
-    SgFile *fcuf;
-    FILE *fout;
-    char *new_file_name, *dep_file_name;
-    int ll;
-    // old file
-    mod_gpu->extractStmt();
-    ll = strlen(file_name) + 1;
-    dep_file_name = (char *)malloc((unsigned)ll);
-    strcpy(dep_file_name, file_name);
-    *(dep_file_name + ll - 3) = 'd';
-    *(dep_file_name + ll - 2) = 'e';
-    *(dep_file_name + ll - 1) = 'p';
-    file->saveDepFile(dep_file_name);
-
-    // new file
-    fcuf = new SgFile(0, "dvm_gpu");
-
-    fcuf->firstStatement()->insertStmtAfter(*mod_gpu);
-    fcuf->saveDepFile("dvm_gpu.dep");
-
-    new_file_name = (char *)malloc((unsigned)(strlen(file_name) + 10));
-    sprintf(new_file_name, "dvm_gpu_%s", fout_name);
-
-    if ((fout = fopen(new_file_name, "w")) == NULL) {
-        (void)fprintf(stderr, "Can't open file %s for write\n", new_file_name);
-        return 1;
-    }
-    fcuf->unparse(fout);
-    fclose(fout);
-
-    return 0;
-}
-
-/***************************************************************************************/
-/*ACC*/
-/*   Creating and Inserting New Statement in the Program                               */
-/* (Fortran Language, .f file)                                                         */
-/***************************************************************************************/
-/*
-void InsertUseStatementForGpuModule()
-{
-if((fmask[LOOP_GPU] == 0) && (fmask[LOOPNS_GPU] == 0) )   // has been generated kernels
-return;
-SgStatement * st_use = new SgStatement(USE_STMT);
-st_use->setSymbol(*mod_gpu_symb);
-if(cur_func->controlParent()->variant() == MODULE_STMT)
-cur_func->controlParent()->insertStmtAfter(*st_use,*cur_func->controlParent());
-else
-cur_func->insertStmtAfter(*st_use,*cur_func);
-}
-*/
-
-SgStatement *doIfThenConstrForLoop_GPU(SgExpression *ref, SgStatement *endhost, SgStatement *dowhile)
-{
-    SgStatement *ifst;
-    // SgExpression *ea;
-    // creating
-    //          IF ( ref .EQ. 0) THEN
-    //                <endhost>
-    //          ELSE
-    //                <dowhile>
-    //          ENDIF 
-    // 
-
-    ifst = new SgIfStmt(SgEqOp(*ref, *new SgValueExp(0)), *endhost, *dowhile);
-    cur_st->insertStmtAfter(*ifst, *cur_st->controlParent());
-
-    //  ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
-    return(ifst);
-}
-
-SgExpression *ReductionPrivateVariables()
-{
-    reduction_operation_list *rl;
-    SgExpression *red_vars=NULL;
-    for (rl = red_struct_list; rl; rl = rl->next)
-    {  
-        red_vars =  AddListToList(red_vars, new SgExprListExp(*new SgVarRefExp(rl->redvar)));   
-        if (rl->locvar) 
-            red_vars = AddListToList(red_vars, new SgExprListExp(*new SgVarRefExp(rl->locvar)));   
-    }
-    return red_vars;
-}
-
-SgExpression * TranslateReductionToOpenmp(SgExpression *reduction_clause)  /* OpenMP */
-{
-    SgExprListExp *explist, *OpenMPReductions;
-    SgExpression *clause;
-    SgExprListExp *red_max, *red_min, *red_sum, *red_product;
-    SgExprListExp *red_and, *red_eqv, *red_neqv;
-    SgExprListExp *red_or;
-    int i, length;
-    red_max = red_min = red_sum = red_product = red_or = red_and = red_eqv = red_neqv = NULL;
-    OpenMPReductions = NULL;
-    explist = isSgExprListExp(reduction_clause);
-    if (explist == NULL) return NULL;
-    length = explist->length();
-    for (i = 0; i < length; i++) {
-        clause = explist->elem(i);
-        switch (clause->variant()) {
-        case ARRAY_OP: {
-                           if ((clause->lhs() != NULL) && (clause->rhs() != NULL)) {
-                               if (clause->lhs()->variant() == KEYWORD_VAL) {
-                                   char *reduction_name = NODE_STRING_POINTER(clause->lhs()->thellnd);
-                                   if (!strcmp(reduction_name, "max")) {
-                                       if (red_max != NULL) red_max->append(*clause->rhs());
-                                       else red_max = new SgExprListExp(*clause->rhs());
-                                       continue;
-                                   }
-                                   if (!strcmp(reduction_name, "min")) {
-                                       if (red_min != NULL) red_min->append(*clause->rhs());
-                                       else red_min = new SgExprListExp(*clause->rhs());
-                                       continue;
-                                   }
-                                   if (!strcmp(reduction_name, "sum")) {
-                                       if (red_sum != NULL) red_sum->append(*clause->rhs());
-                                       else red_sum = new SgExprListExp(*clause->rhs());
-                                       continue;
-                                   }
-                                   if (!strcmp(reduction_name, "product")) {
-                                       if (red_product != NULL) red_product->append(*clause->rhs());
-                                       else red_product = new SgExprListExp(*clause->rhs());
-                                       continue;
-                                   }
-                                   if (!strcmp(reduction_name, "or")) {
-                                       if (red_or != NULL) red_or->append(*clause->rhs());
-                                       else red_or = new SgExprListExp(*clause->rhs());
-                                       continue;
-                                   }
-                                   if (!strcmp(reduction_name, "and")) {
-                                       if (red_and != NULL) red_and->append(*clause->rhs());
-                                       else red_and = new SgExprListExp(*clause->rhs());
-                                       continue;
-                                   }
-                                   if (!strcmp(reduction_name, "eqv")) {
-                                       if (red_eqv != NULL) red_eqv->append(*clause->rhs());
-                                       else red_eqv = new SgExprListExp(*clause->rhs());
-                                       continue;
-                                   }
-                                   if (!strcmp(reduction_name, "neqv")) {
-                                       if (red_neqv != NULL) red_neqv->append(*clause->rhs());
-                                       else red_neqv = new SgExprListExp(*clause->rhs());
-                                       continue;
-                                   }
-                                   if (!strcmp(reduction_name, "maxloc")) {
-                                       return NULL;
-                                   }
-                                   if (!strcmp(reduction_name, "minloc")) {
-                                       return NULL;
-                                   }
-                               }
-
-                           }
-                           break;
-        }
-
-        }
-    }
-    SgKeywordValExp *kwd;
-    SgExpression *ddot;
-    SgExpression *red;
-    if (red_max != NULL) {
-        kwd = new SgKeywordValExp("max");
-        ddot = new SgExpression(DDOT, kwd, red_max, NULL);
-        red = new SgExpression(OMP_REDUCTION, ddot, NULL, NULL);
-        if (!OpenMPReductions) OpenMPReductions = new SgExprListExp(*red);
-        else OpenMPReductions->append(*red);
-    }
-    if (red_min != NULL) {
-        kwd = new SgKeywordValExp("min");
-        ddot = new SgExpression(DDOT, kwd, red_min, NULL);
-        red = new SgExpression(OMP_REDUCTION, ddot, NULL, NULL);
-        if (!OpenMPReductions) OpenMPReductions = new SgExprListExp(*red);
-        else OpenMPReductions->append(*red);
-    }
-    if (red_sum != NULL) {
-        kwd = new SgKeywordValExp("+");
-        ddot = new SgExpression(DDOT, kwd, red_sum, NULL);
-        red = new SgExpression(OMP_REDUCTION, ddot, NULL, NULL);
-        if (!OpenMPReductions) OpenMPReductions = new SgExprListExp(*red);
-        else OpenMPReductions->append(*red);
-    }
-    if (red_product != NULL) {
-        kwd = new SgKeywordValExp("*");
-        ddot = new SgExpression(DDOT, kwd, red_product, NULL);
-        red = new SgExpression(OMP_REDUCTION, ddot, NULL, NULL);
-        if (!OpenMPReductions) OpenMPReductions = new SgExprListExp(*red);
-        else OpenMPReductions->append(*red);
-    }
-    if (red_eqv != NULL) {
-        kwd = new SgKeywordValExp(".eqv.");
-        ddot = new SgExpression(DDOT, kwd, red_eqv, NULL);
-        red = new SgExpression(OMP_REDUCTION, ddot, NULL, NULL);
-        if (!OpenMPReductions) OpenMPReductions = new SgExprListExp(*red);
-        else OpenMPReductions->append(*red);
-    }
-    if (red_neqv != NULL) {
-        kwd = new SgKeywordValExp(".neqv.");
-        ddot = new SgExpression(DDOT, kwd, red_neqv, NULL);
-        red = new SgExpression(OMP_REDUCTION, ddot, NULL, NULL);
-        if (!OpenMPReductions) OpenMPReductions = new SgExprListExp(*red);
-        else OpenMPReductions->append(*red);
-    }
-    if (red_or != NULL) {
-        kwd = new SgKeywordValExp(".or.");
-        ddot = new SgExpression(DDOT, kwd, red_or, NULL);
-        red = new SgExpression(OMP_REDUCTION, ddot, NULL, NULL);
-        if (!OpenMPReductions) OpenMPReductions = new SgExprListExp(*red);
-        else OpenMPReductions->append(*red);
-    }
-    if (red_and != NULL) {
-        kwd = new SgKeywordValExp(".and.");
-        ddot = new SgExpression(DDOT, kwd, red_and, NULL);
-        red = new SgExpression(OMP_REDUCTION, ddot, NULL, NULL);
-        if (!OpenMPReductions) OpenMPReductions = new SgExprListExp(*red);
-        else OpenMPReductions->append(*red);
-    }
-    return OpenMPReductions;
-}
-
-/*
-SgStatement *checkInternal(SgSymbol *s)
-{
-    enum { SEARCH_INTERNAL, SEARCH_CONTAINS };
-
-    SgStatement *searchStmt = cur_func->lexNext();
-    SgStatement *tmp;
-    const char *funcName = s->identifier();
-    
    int mode = SEARCH_CONTAINS;
-
-    //search internal function
-    while (searchStmt)
-    {
-        switch (mode)
-        {
-        case SEARCH_CONTAINS:
-            if (searchStmt->variant() == CONTAINS_STMT)
-                mode = SEARCH_INTERNAL;
-            searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-            break;
-        case SEARCH_INTERNAL:
-            if (searchStmt->variant() == CONTROL_END)
-                return NULL;
-            else if (!strcmp(searchStmt->symbol()->identifier(), funcName))
-                return searchStmt;
-            else
-                searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-            break;
-        }
-    }
-    return NULL;
-}
-*/
-
-void TestRoutineAttribute(SgSymbol *s, SgStatement *routine_interface)
-{
-    if (isForCudaRegion() && FromOtherFile(s) && !routine_interface)
-        Error("Interface with ROUTINE specification is required for %s", s->identifier(), 646, routine_interface ? routine_interface : cur_func);
-}
-
-/*
-int LookForRoutineDir( SgStatement *interfaceFunc )
-{
-    SgStatement *st;
-    for(st=interfaceFunc->lexNext(); st->variant() != CONTROL_END; st=st->lexNext())
-                if(st->variant() == ACC_ROUTINE_DIR)
-                    return 1; 
-    return 0;
-}
-*/
-
-void CreateCalledFunctionDeclarations(SgStatement *st_hedr)
-{
-    symb_list *sl;
-    SgStatement *contStmt = st_hedr->lastNodeOfStmt();
-    int has_routine_attr = 0;
-
-    for (sl = acc_call_list; sl; sl = sl->next)
-    {
-        if ((sl->symb->variant() == FUNCTION_NAME || sl->symb->variant() == PROCEDURE_NAME || sl->symb->variant() == INTERFACE_NAME) && !IS_BY_USE(sl->symb))
-        {
-            SgStatement *interfaceFunc = getInterface(sl->symb);
-            if (interfaceFunc != NULL)
-            {    
-                if(interfaceFunc->variant() == INTERFACE_STMT)  
-                    st_hedr->insertStmtAfter(interfaceFunc->copy(), *st_hedr);
-                else
-                { 
-                    SgStatement *block = new SgStatement(INTERFACE_STMT);
-                    block->insertStmtAfter(*new SgStatement(CONTROL_END), *block);
-                    block->insertStmtAfter(interfaceFunc->copy(), *block);
-                    st_hedr->insertStmtAfter(*block, *st_hedr);
-                    if (isForCudaRegion() && HAS_ROUTINE_ATTR(interfaceFunc->symbol())) 
-                        has_routine_attr = 1;
-                }
-            }
-          /*
-            else if (interfaceFunc = checkInternal(sl->symb))
-            {
-                if (contStmt->variant() == CONTROL_END)
-                {
-                    contStmt->insertStmtBefore(*new SgStatement(CONTAINS_STMT));
-                    contStmt = contStmt->lexPrev();
-                }
-                contStmt->insertStmtAfter(interfaceFunc->copy(), *st_hedr);
-            }
-          */ 
-            else if(sl->symb->variant() == FUNCTION_NAME)
-                st_hedr->insertStmtAfter(*sl->symb->makeVarDeclStmt(), *st_hedr);
-            TestRoutineAttribute(sl->symb, has_routine_attr ? interfaceFunc : NULL);
-        }
-    }
-}
-
-void CreateUseStatements(SgStatement *st_hedr)
-{
-  CreateUseStatementsForCalledProcedures(st_hedr);
-  CreateUseStatementsForDerivedTypes(st_hedr);
-}
-
-void CreateUseStatementsForCalledProcedures(SgStatement *st_hedr)
-{
-    symb_list *sl;
-    SgStatement *st_use, *stmt;
-
-    for (sl = acc_call_list; sl; sl = sl->next)
-    {
-        SgSymbol *sf = ORIGINAL_SYMBOL(sl->symb); //SourceProcedureSymbol(sl->symb);
-        stmt = sf->scope();
-        if (stmt->variant() == MODULE_STMT)
-        {
-            st_use = new SgStatement(USE_STMT);
-            st_use->setSymbol(*stmt->symbol());
-            st_use->setExpression(0, *new SgExpression(ONLY_NODE, new SgVarRefExp(sl->symb), NULL, NULL));
-            st_hedr->insertStmtAfter(*st_use, *st_hedr);
-        }
-    }
-}
-
-void CreateUseStatementsForDerivedTypes(SgStatement *st_hedr)
-{
-  SgStatement *st, *st_copy, *cur=st_hedr, *from_hedr = cur_func;
-  if(USE_STATEMENTS_ARE_REQUIRED)
-  {
-    while (from_hedr->variant() != GLOBAL)
-    {       
-       for(st=from_hedr->lexNext(); st->variant()==USE_STMT; st=st->lexNext())
-       {
-         st_copy=&st->copy();
-         cur->insertStmtAfter(*st_copy,*st_hedr); 
-         cur = st_copy;
-       }
-       from_hedr = from_hedr->controlParent();
-    } 
-  }
-}
-
-SgStatement *CreateHostProcedure(SgSymbol *sHostProc)
-{
-    SgStatement *st_hedr, *st_end;
-
-    st_hedr = new SgStatement(PROC_HEDR);
-    st_hedr->setSymbol(*sHostProc);
-    st_hedr->setExpression(2, *new SgExpression(RECURSIVE_OP));
-    st_end = new SgStatement(CONTROL_END);
-    st_end->setSymbol(*sHostProc);
-    if (!cur_in_source)
-        cur_in_source = (*FILE_LAST_STATEMENT(current_file->firstStatement()))->lexNext(); //empty statement inserted after last statement of file
-    //mod_gpu ? mod_gpu->lastNodeOfStmt() : current_file->firstStatement();      
-    cur_in_source->insertStmtAfter(*st_hedr, *current_file->firstStatement());
-    st_hedr->insertStmtAfter(*st_end, *st_hedr);
-    st_hedr->setVariant(PROS_HEDR);
-
-    cur_in_source = st_end;
-    return(st_hedr);
-
-}
-
-SgStatement *Create_Host_Across_Loop_Subroutine(SgSymbol *sHostProc)
-{
-    SgStatement *stmt = NULL, *st_end = NULL, *st_hedr = NULL, *cur = NULL, *last_decl = NULL;
-    SgExpression *ae = NULL, *arg_list = NULL, *el = NULL, *de = NULL, *tail = NULL, *baseMem_list = NULL;
-    SgSymbol *s_loop_ref = NULL, *sarg = NULL, *h_first = NULL, *h_last = NULL,*hl = NULL;
-    symb_list *sl = NULL;
-    SgType *tdvm = NULL;
-    int ln, nbuf = 0;
-    char *name = NULL;    
-   
-    SgExprListExp *list = isSgExprListExp(dvm_parallel_dir->expr(2)); // do_variables list
-    SgSymbol *sHostAcrossProc;
-    symb_list *acc_acr_call_list = NULL;
-    for (int i = 0; i < list->length(); i++) 
-    {
-        sHostAcrossProc = HostAcrossProcSymbol(sHostProc, i + 1);
-        Create_Host_Loop_Subroutine(sHostAcrossProc, i + 1);
-        acc_acr_call_list = AddToSymbList(acc_acr_call_list, sHostAcrossProc);
-    }
-    sHostAcrossProc = HostAcrossProcSymbol(sHostProc, 0);
-    Create_Host_Loop_Subroutine(sHostAcrossProc, -1);
-    acc_acr_call_list = AddToSymbList(acc_acr_call_list, sHostAcrossProc);
-
-    // create Host procedure header and end 
-
-    st_hedr = CreateHostProcedure(sHostProc);
-    st_hedr->addComment(Host_LoopHandlerComment());
-    st_end = st_hedr->lexNext();
-
-    // create  dummy argument list
-    // loop_ref,<dvm_array_headers>,<dvm_array_bases>,<uses> 
-    tdvm = FortranDvmType();
-
-    s_loop_ref = new SgSymbol(VARIABLE_NAME, "loop_ref", *tdvm, *st_hedr);
-
-    ae = new SgVarRefExp(s_loop_ref);
-    arg_list = new SgExprListExp(*ae);
-    st_hedr->setExpression(0, *arg_list);
-
-    // add  dvm-array-header list
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)
-    { 
-        sarg = DummyDvmHeaderSymbol(sl->symb,st_hedr);
-        ae = new SgArrayRefExp(*sarg);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            h_first = sarg;
-    }
-    h_last = sarg;
-    // add  dvm-array-address list 
-    if (options.isOn(O_HOST))
-    {
-        tail = arg_list;
-        for (sl = acc_array_list, hl = h_first; sl; sl = sl->next, hl = hl->next())
-        {
-            if (IS_REMOTE_ACCESS_BUFFER(sl->symb)) // case of RTS2 interface
-            {   
-                sarg = DummyDvmBufferSymbol(sl->symb, hl);
-                nbuf++; 
-            }
-            else
-                sarg = DummyDvmArraySymbol(sl->symb, hl);
-            ae = new SgArrayRefExp(*sarg);
-            arg_list->setRhs(*new SgExprListExp(*ae));
-            arg_list = arg_list->rhs();
-        }
-        tail = tail->rhs();
-    }
-    else
-        // create memory base list and add it to the dummy argument list
-    {
-        baseMem_list = tail = CreateBaseMemoryList();
-        AddListToList(arg_list, baseMem_list);
-    }
-
-    // add use's list to dummy argument list
-    if (uses_list)
-    {
-        AddListToList(arg_list, copy_uses_list = &(uses_list->copy()));
-        if (!tail)
-            tail = copy_uses_list;
-    }
-
-    // add bounds of reduction arrays to dummy argument list
-    if(red_list)
-    {    
-        SgExpression * red_bound_list;
-        AddListToList(arg_list, red_bound_list = DummyListForReductionArrays(st_hedr));
-        if(!tail)
-           tail = red_bound_list;         
-    }
-
-    // add dummy arguments for private arrays
-     if(private_list)
-    {    
-        SgExpression * private_dummy_list;
-        AddListToList(arg_list, private_dummy_list = DummyListForPrivateArrays(st_hedr));
-        if(!tail)
-           tail = private_dummy_list;         
-    }
-
-    // create  get_dependency_mask function declaration 
-    stmt = fdvm[GET_DEP_MASK_F]->makeVarDeclStmt();
-    stmt->expr(1)->setType(tdvm);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    last_decl = cur = stmt;
-
-    // create called functions declarations
-    CreateCalledFunctionDeclarations(st_hedr);
-
-    for (sl = acc_acr_call_list; sl; sl = sl->next)
-    {
-        if (sl->symb->variant() == PROCEDURE_NAME) {
-            stmt = new SgStatement(EXTERN_STAT);
-            el = new SgExprListExp(*new SgVarRefExp(sl->symb));
-            stmt->setExpression(0, *el);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-    }
-
-    // create dummy argument declarations
-
-    for (el = tail; el; el = el->rhs())
-    {
-        stmt = el->lhs()->symbol()->makeVarDeclStmt();
-        ConstantSubstitutionInTypeSpec(stmt->expr(1));
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-
-    el = st_hedr->expr(0);
-    stmt = el->lhs()->symbol()->makeVarDeclStmt();
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    de = stmt->expr(0);
-    //for(el=el->rhs(); el!=baseMem_list && el!=copy_uses_list; el=el->rhs())
-    for (el = el->rhs(); el != tail; el = el->rhs())
-    {             //printf("%s \n",el->lhs()->symbol()->identifier());
-        de->setRhs(new SgExprListExp(*el->lhs()->symbol()->makeDeclExpr()));
-        de = de->rhs();
-    }
-
-    SgSymbol *which_run = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("which_run"), *tdvm, *st_hedr);
-    stmt = which_run->makeVarDeclStmt();
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    // generate IMPLICIT NONE statement
-    st_hedr->insertStmtAfter(*new SgStatement(IMPL_DECL), *st_hedr);
-
-    // generate USE statements for called module procedures
-    CreateUseStatements(st_hedr);
-
-    SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GET_DEP_MASK_F]);
-    fe->addArg(*new SgVarRefExp(s_loop_ref));
-    SgFunctionCallExp *fen = new SgFunctionCallExp(*new SgFunctionSymb(FUNCTION_NAME, "not", *SgTypeBool(), *cur_func));
-    fen->addArg(*fe);
-    SgVarRefExp *which_run_expr = new SgVarRefExp(which_run);
-    stmt = new SgAssignStmt(*which_run_expr, *fen);
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-          //stmt = PrintStat(which_run_expr);
-          //st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    // create argument list of handler's call
-    SgExpression *new_arg_list = &st_hedr->expr(0)->copy(); 
-    if (nbuf > 0)  // there is REMOTE_ACCESS clause and  RTS2 interface is used
-    // correct argument list of handler's call
-    {  
-        el = new_arg_list->rhs();
-        while(el->lhs()->symbol() != h_last->next())
-            el = el->rhs();
-        for (sl = acc_array_list, hl = h_first; sl; sl = sl->next, hl = hl->next(), el = el->rhs())   
-        {    
-            if (IS_REMOTE_ACCESS_BUFFER(sl->symb))
-            {   
-                // correct argument: buffer => buffer(buf_header(Rank+2))
-                SgArrayRefExp *buf_ref = new SgArrayRefExp(*hl,*new SgValueExp(Rank(sl->symb)+2));       
-                el->lhs()->setLhs(*new SgExprListExp(*buf_ref));
-                // generate call statements of 'dvmh_loop_get_remote_buf' for remote access buffers
-                stmt = GetRemoteBuf(s_loop_ref, nbuf--, hl);
-                last_decl->insertStmtAfter(*stmt, *st_hedr);
-            }
-        }
-        // create external statement
-        stmt = new SgStatement(EXTERN_STAT);
-        el = new SgExprListExp(*new SgVarRefExp(fdvm[GET_REMOTE_BUF]));
-        stmt->setExpression(0, *el);
-        last_decl->insertStmtAfter(*stmt, *st_hedr);
-    }
-
-    SgIfStmt *ifstmt = NULL;
-    SgStatement *falsestmt = NULL;
-    int i = 0;
-    for (sl = acc_acr_call_list; sl; sl = sl->next)
-    {
-        SgFunctionSymb *sbtest = new SgFunctionSymb(FUNCTION_NAME, "btest", *SgTypeBool(), *cur_func);
-        if (sl->symb->variant() == PROCEDURE_NAME) {
-            SgFunctionCallExp *fbtest = new SgFunctionCallExp(*sbtest);
-            fbtest->addArg(*which_run_expr);
-            fbtest->addArg(*new SgValueExp(i - 1));
-            if (i != 0)
-            {
-                SgCallStmt *truestmt = new SgCallStmt(*sl->symb, *new_arg_list);
-                ifstmt = new SgIfStmt(*fbtest, *truestmt, *falsestmt);
-                falsestmt = ifstmt;
-            }
-            else {
-                falsestmt = new SgCallStmt(*sl->symb, *new_arg_list);
-            }
-            i++;
-        }
-    }
-    if (ifstmt) st_end->insertStmtBefore(*ifstmt, *st_hedr);
-    return(st_hedr);
-}
-
-SgStatement *Create_Host_Loop_Subroutine_Main (SgSymbol *sHostProc)
-{
-    SgStatement *stmt = NULL, *st_end = NULL, *st_hedr = NULL, *last_decl = NULL;
-    SgExpression *ae, *arg_list = NULL, *el = NULL, *de = NULL, *tail = NULL, *baseMem_list = NULL;
-    SgSymbol *s_loop_ref = NULL, *sarg = NULL, *h_first = NULL, *h_last = NULL, *hl = NULL, *bl = NULL;
-    SgSymbol *s = NULL;
-    symb_list *sl = NULL;
-    int ln,  nbuf = 0;
-    SgSymbol *sHostProc_RA;
-
-    if(rma && !rma->rmout && !rma->rml->symbol() && parloop_by_handler == 2 && WhatInterface(dvm_parallel_dir) == 2 )// there is synchronous REMOTE_ACCESS clause in PARALLEL directive  and RTS2 interface is used 
-    // create additional procedure for creating headers of remote access buffers 
-    { 
-        sHostProc_RA = HostProcSymbol_RA(sHostProc);
-        Create_Host_Loop_Subroutine (sHostProc_RA, 0);
-    }
-    else
-        return (Create_Host_Loop_Subroutine (sHostProc, 0));
-
-    // create Host procedure header and end  for subroutine named by sHostProc         
-
-    st_hedr = CreateHostProcedure(sHostProc);
-    st_hedr->addComment(Host_LoopHandlerComment());
-    st_end = st_hedr->lexNext();
-
-    // create  dummy argument list
-    // loop_ref,<dvm_array_headers>,<dvm_array_bases>,<uses> 
-
-    s_loop_ref = new SgSymbol(VARIABLE_NAME, "loop_ref", *FortranDvmType(), *st_hedr);
-
-    ae = new SgVarRefExp(s_loop_ref);
-    arg_list = new SgExprListExp(*ae);
-    st_hedr->setExpression(0, *arg_list);
-
-    // add  dvm-array-header list
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)
-    {                               
-        sarg = DummyDvmHeaderSymbol(sl->symb,st_hedr);
-        ae = new SgArrayRefExp(*sarg);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            h_first = sarg;
-    }
-    h_last = sarg;
-
-    // add  dvm-array-address list 
-    if (options.isOn(O_HOST))        
-    {
-        tail = arg_list;
-        for (sl = acc_array_list, hl = h_first; sl; sl = sl->next, hl = hl->next())
-        {
-            if(IS_REMOTE_ACCESS_BUFFER(sl->symb))
-            {
-                sarg = DummyDvmBufferSymbol(sl->symb, hl);
-                nbuf++; 
-            }
-            else        
-                sarg = DummyDvmArraySymbol(sl->symb, hl);
-            ae = new SgArrayRefExp(*sarg);
-            arg_list->setRhs(*new SgExprListExp(*ae));
-            arg_list = arg_list->rhs();
-        }    
-        tail = tail->rhs();
-    }
-    else
-        // create memory base list and add it to the dummy argument list
-    {
-        baseMem_list = tail = CreateBaseMemoryList();
-        AddListToList(arg_list, baseMem_list);
-    }
-     
-    // add use's list to dummy argument list
-    if (uses_list)
-    {
-        AddListToList(arg_list, copy_uses_list = &(uses_list->copy()));
-        if (!tail)
-            tail = copy_uses_list;
-    }
-    // add dummy arguments for reductions
-    if(red_list)
-    {    
-        SgExpression * red_bound_list;
-        AddListToList(arg_list, red_bound_list = DummyListForReductionArrays(st_hedr));
-        if(!tail)
-           tail = red_bound_list;         
-    }
-
-    // add dummy arguments for private arrays
-     if(private_list)
-    {    
-        SgExpression * private_dummy_list;
-        AddListToList(arg_list, private_dummy_list = DummyListForPrivateArrays(st_hedr));
-        if(!tail)
-           tail = private_dummy_list;         
-    }
-
-    // create external statement
-    stmt = new SgStatement(EXTERN_STAT);
-    el = new SgExprListExp(*new SgVarRefExp(fdvm[GET_REMOTE_BUF]));
-    el->setRhs(*new SgExprListExp(*new SgVarRefExp(sHostProc_RA)));
-    stmt->setExpression(0, *el);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    last_decl = stmt;
-
-    // create dummy argument declarations
-
-    for (el = tail; el; el = el->rhs())
-    {
-        stmt = el->lhs()->symbol()->makeVarDeclStmt();
-        ConstantSubstitutionInTypeSpec(stmt->expr(1)); 
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-
-    el = st_hedr->expr(0);   
-    stmt = el->lhs()->symbol()->makeVarDeclStmt();
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    de = stmt->expr(0);
-   
-    for (el = el->rhs(); el != tail; el = el->rhs())
-    {             //printf("%s \n",el->lhs()->symbol()->identifier());
-        de->setRhs(new SgExprListExp(*el->lhs()->symbol()->makeDeclExpr()));
-        de = de->rhs();
-    }
-
-    // generate IMPLICIT NONE statement
-    st_hedr->insertStmtAfter(*new SgStatement(IMPL_DECL), *st_hedr);
-
-    // generate handler call
-    stmt = new SgCallStmt(*sHostProc_RA, (st_hedr->expr(0))->copy());
-    last_decl->insertStmtAfter(*stmt, *st_hedr);
-    el =  stmt->expr(0)->rhs();
-    // correct argument list of handler call
-    while(el->lhs()->symbol() != h_last->next())
-        el = el->rhs();
-    for (sl = acc_array_list, hl = h_first; sl; sl = sl->next, hl = hl->next(), el = el->rhs())   
-    {    
-        if (IS_REMOTE_ACCESS_BUFFER(sl->symb))
-        {   
-            // correct argument: buffer => buffer(buf_header(Rank+2))
-            SgArrayRefExp *buf_ref = new SgArrayRefExp(*hl,*new SgValueExp(Rank(sl->symb)+2));       
-            el->lhs()->setLhs(*new SgExprListExp(*buf_ref));
-            // generate call statements of 'dvmh_loop_get_remote_buf' for remote access buffers
-            stmt = GetRemoteBuf(s_loop_ref, nbuf--, hl);
-            last_decl->insertStmtAfter(*stmt, *st_hedr);
-        }
-    }
-
-    return (st_hedr);
-}
-
-SgStatement *Create_Host_Loop_Subroutine(SgSymbol *sHostProc, int dependency)
-{
-    SgStatement *stmt = NULL, *st_end = NULL, *st_hedr = NULL, *cur = NULL, *last_decl = NULL, *ass = NULL;
-    SgStatement *alloc = NULL, *red_init_first = NULL;
-    SgStatement *paralleldo = NULL;
-    SgStatement *firstdopar = NULL;
-    SgExprListExp *parallellist = NULL;
-    SgExprListExp *omp_dolist = NULL;
-    SgExprListExp *omp_perflist = NULL;
-    SgExpression *ae, *arg_list = NULL, *el = NULL, *de = NULL, *tail = NULL, *baseMem_list = NULL, *omp_red_vars=NULL;
-    SgSymbol *s_loop_ref = NULL, *sarg = NULL, *h_first = NULL, *hl = NULL;
-    SgSymbol *s_lgsc = NULL; /* OpenMP */
-    SgVarRefExp *v_lgsc = NULL;   /* OpenMP */
-    SgSymbol *s = NULL, *s_low_bound = NULL, *s_high_bound = NULL, *s_step = NULL;
-    symb_list *sl = NULL;
-    SgType *tdvm = NULL;
-    int ln, lrank, addopenmp, number_of_reductions = 0;
-    char *name;
-    tail = NULL;
-    addopenmp = 1;    /* OpenMP */
-
-    // create Host procedure header and end            
-    st_hedr = CreateHostProcedure(sHostProc);
-    st_hedr->addComment(Host_LoopHandlerComment());
-    st_end = st_hedr->lexNext();
-
-    // create  dummy argument list
-    // loop_ref,<dvm_array_headers>,<dvm_array_bases>,<uses> 
-
-    tdvm = FortranDvmType();
-
-    s_loop_ref = new SgSymbol(VARIABLE_NAME, "loop_ref", *tdvm, *st_hedr);
-
-    ae = new SgVarRefExp(s_loop_ref);
-    arg_list = new SgExprListExp(*ae);
-    st_hedr->setExpression(0, *arg_list);
-
-    // add  dvm-array-header list
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)
-    {                               //printf("%s\n",sl->symb->identifier());
-        sarg = DummyDvmHeaderSymbol(sl->symb,st_hedr);
-        ae = new SgArrayRefExp(*sarg);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            h_first = sarg;
-    }
-
-    // add  dvm-array-address list 
-    if (options.isOn(O_HOST))        
-    {
-        tail = arg_list;
-        for (sl = acc_array_list, hl = h_first; sl; sl = sl->next, hl = hl->next())
-        {
-            sarg = DummyDvmArraySymbol(sl->symb, hl);
-            ae = new SgArrayRefExp(*sarg);
-            arg_list->setRhs(*new SgExprListExp(*ae));
-            arg_list = arg_list->rhs();
-        }
-        tail = tail->rhs();
-    }
-    else
-        // create memory base list and add it to the dummy argument list
-    {
-        baseMem_list = tail = CreateBaseMemoryList();
-        AddListToList(arg_list, baseMem_list);
-    }
-
-    // add use's list to dummy argument list
-    if (uses_list)
-    {
-        AddListToList(arg_list, copy_uses_list = &(uses_list->copy()));
-        if (!tail)
-            tail = copy_uses_list;
-    }
-    // add dummy arguments for reductions
-    if(red_list)
-    {    
-        SgExpression * red_bound_list;
-        AddListToList(arg_list, red_bound_list = DummyListForReductionArrays(st_hedr));
-        if(!tail)
-           tail = red_bound_list;         
-    }
-    // add dummy arguments for private arrays
-     if(private_list)
-    {    
-        SgExpression * private_dummy_list;
-        AddListToList(arg_list, private_dummy_list = DummyListForPrivateArrays(st_hedr));
-        if(!tail)
-           tail = private_dummy_list;         
-    }
-
-    // create external statement
-    stmt = new SgStatement(EXTERN_STAT);
-    el = new SgExprListExp(*new SgVarRefExp(fdvm[FILL_BOUNDS]));
-    if (red_list)
-    {
-        SgExpression *eel;
-        eel = new SgExprListExp(*new SgVarRefExp(fdvm[RED_INIT]));
-        eel->setRhs(*el);
-        el = eel;
-        eel = new SgExprListExp(*new SgVarRefExp(fdvm[RED_POST]));
-        eel->setRhs(*el);
-        el = eel;
-    }
-    stmt->setExpression(0, *el);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    last_decl = cur = stmt;
-
-    // create called functions declarations
-    CreateCalledFunctionDeclarations(st_hedr);
-
-    // create  get_slot_count function declaration           /* OpenMP */
-    stmt = fdvm[SLOT_COUNT]->makeVarDeclStmt();
-    stmt->expr(1)->setType(tdvm);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    //  <lgsc_var_for_OpenMp>
-    s_lgsc = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("lgsc"), *tdvm, *st_hedr);  /* OpenMP */
-    v_lgsc = new SgVarRefExp(*s_lgsc);  /* OpenMP */
-    stmt = s_lgsc->makeVarDeclStmt();
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    if (omp_perf) /* OpenMP */
-    {
-	//SgVarRefExp *varDvmhstring = new SgVarRefExp(fdvm[STRING]);
-	SgVarRefExp *varThreadID = new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "dvmh_threadid",tdvm,st_hedr));
-	SgVarRefExp *varStmtID = new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "dvmh_stmtid",tdvm,st_hedr));
-	//SgExpression *exprFilenameType = new SgExpression(LEN_OP);
-	//exprFilenameType->setLhs(new SgValueExp((int)(strlen(dvm_parallel_dir->fileName())+1)));
-	//SgType *typeFilename = new SgType(T_STRING,exprFilenameType,SgTypeChar());
-	//SgVarRefExp *varFilename = new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "dvmh_filename",typeFilename,st_hedr));
-	//stmt=varFilename->symbol()->makeVarDeclStmt();
-	//stmt->expr(0)->setLhs(FileNameInitialization(stmt->expr(0)->lhs(),dvm_parallel_dir->fileName()));
-	//stmt->setVariant(VAR_DECL_90);
-	//stmt->setlineNumber(-1);
-	//st_hedr->insertStmtAfter(*stmt, *st_hedr);
-	//stmt=varDvmhstring->symbol()->makeVarDeclStmt();
-	//stmt->setlineNumber(-1);
-	//st_hedr->insertStmtAfter(*stmt, *st_hedr);
-	//SgExprListExp *funcList = new SgExprListExp(*varDvmhstring);
-	SgExprListExp *funcList = new SgExprListExp(*new SgVarRefExp(fdvm[OMP_STAT_BP]));
-	//funcList->append(*new SgVarRefExp(fdvm[OMP_STAT_BP]));
-	funcList->append(*new SgVarRefExp(fdvm[OMP_STAT_AP]));
-	funcList->append(*new SgVarRefExp(fdvm[OMP_STAT_BL]));
-	funcList->append(*new SgVarRefExp(fdvm[OMP_STAT_AL]));
-	if (dependency == -1) {
-		funcList->append(*new SgVarRefExp(fdvm[OMP_STAT_BS]));
-		funcList->append(*new SgVarRefExp(fdvm[OMP_STAT_AS]));
-	}
-	stmt = new SgStatement(EXTERN_STAT);
-	stmt->setExpression(0, *funcList);
-	stmt->setlineNumber(-1);
-	st_hedr->insertStmtAfter(*stmt, *st_hedr);
-	omp_perflist = new SgExprListExp(*new SgVarRefExp(s_loop_ref)); /* OpenMP */
-	omp_perflist->append(*varStmtID); /* OpenMP */
-	omp_perflist->append(*varThreadID); /* OpenMP */
-	//omp_perflist->append(*ConstRef_F95(dvm_parallel_dir->lineNumber())); /* OpenMP */
-	//omp_perflist->append(*DvmhString(varFilename));
-	SgSymbol *symCommon =new SgSymbol (VARIABLE_NAME,"dvmh_common");
-	stmt = new SgStatement (OMP_THREADPRIVATE_DIR);
-	SgExpression *exprThreadprivate = new SgExpression (OMP_THREADPRIVATE);
-	exprThreadprivate->setLhs (*new SgExprListExp (*new SgVarRefExp (*symCommon)));
-	stmt->setExpression (0, *exprThreadprivate);
-	st_hedr->insertStmtAfter(*stmt, *st_hedr);
-	SgExpression *exprCommon = new SgExpression (COMM_LIST);
-	exprCommon->setSymbol (*symCommon);
-	exprCommon->setLhs (*varThreadID);
-	stmt = new SgStatement(COMM_STAT);
-	stmt->setExpression (0, *exprCommon);
-	stmt->setlineNumber(-1);
-	st_hedr->insertStmtAfter(*stmt, *st_hedr);
-	stmt = varStmtID->symbol()->makeVarDeclStmt();
-	stmt->setlineNumber(-1);
-	st_hedr->insertStmtAfter(*stmt, *st_hedr);
-	stmt = varThreadID->symbol()->makeVarDeclStmt();
-	stmt->setlineNumber(-1);
-	st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-
-    parallellist = new SgExprListExp(*new SgExpression(OMP_NUM_THREADS, v_lgsc, NULL, NULL)); /* OpenMP */
-
-    // create reduction variables declarations and 
-    // generate 'loop_red_init' and 'loop_red_post' function calls
-     
-    //looking through the reduction list
-    if (red_list)
-    {
-        int nr;
-        SgExpression *ev, *ered, *er, *red;
-        SgSymbol *loc_var;
-        reduction_operation_list *rl;
-        red = TranslateReductionToOpenmp(&red_list->copy());           /* OpenMP */
-        if(red != NULL) parallellist->append(*red);  /* OpenMP */ 
-        else  omp_red_vars = ReductionPrivateVariables(); /*MAXLOC/MINLOC*/ /* OpenMP */          
-        for (rl = red_struct_list,nr = 1; rl; rl = rl->next, nr++)
-        {   
-            if (rl->locvar)   
-                DeclareSymbolInHostHandler(rl->locvar, st_hedr, rl->loc_host);  
-           
-            SgSymbol *sred =  rl->redvar_size != 0 ? rl->red_host : rl->redvar;
-            DeclareSymbolInHostHandler(rl->redvar, st_hedr, sred);  
-
-            // generate loop_red_init and loop_red_post function calls 
-            stmt = LoopRedInit_HH(s_loop_ref, nr, sred, rl->locvar);
-            cur->insertStmtAfter(*stmt, *st_hedr);
-            cur = stmt;
-            if (nr == 1) red_init_first = stmt;
-            stmt = LoopRedPost_HH(s_loop_ref, nr, sred, rl->locvar);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        }
-        number_of_reductions = nr; /* OpenMP */
-    }
-
-    // create local variables and it's declarations: 
-    // <loop_index_variables>,<private_variables>,[<dvm-constansts>],<array-coefficients>,<loop-bounds-variables><lgsc_var_for_OpenMp>
-
-
-    //    <loop-bounds-variables>
-    lrank = ParLoopRank();
-    SgArrayType *typearray = new SgArrayType(*tdvm);
-    typearray->addRange(*new SgValueExp(lrank));
-	if (addopenmp == 1) {
-		if (dependency == -1) { /* OpenMP */
-			omp_dolist = new SgExprListExp(*new SgExpression(OMP_SCHEDULE, new SgKeywordValExp("static"), NULL, NULL)); /* OpenMP */
-		} else {
-			omp_dolist = new SgExprListExp(*new SgExpression(OMP_SCHEDULE, new SgKeywordValExp("runtime"), NULL, NULL)); /* OpenMP */
-		    // XXX: 'collapse' clause does not work properly          
-			if ((dependency == 0) && (collapse_loop_count > 1)) {  /* OpenMP */
-				omp_dolist->append(*new SgExpression(OMP_COLLAPSE, new SgValueExp(collapse_loop_count < lrank ? collapse_loop_count : lrank), NULL, NULL));  /* OpenMP */
- 			}/* OpenMP */
-		}
-	}
-
-    s_low_bound = s = new SgSymbol(VARIABLE_NAME, "boundsLow", *typearray, *st_hedr);
-    s_high_bound = new SgSymbol(VARIABLE_NAME, "boundsHigh", *typearray, *st_hedr);
-    s_step = new SgSymbol(VARIABLE_NAME, "loopSteps", *typearray, *st_hedr);
-
-    stmt = s->makeVarDeclStmt();
-    stmt->expr(1)->setType(tdvm);
-    el = new SgExprListExp(*new SgArrayRefExp(*s_high_bound, *new SgValueExp(lrank)));
-    el->setRhs(new SgExprListExp(*new SgArrayRefExp(*s_step, *new SgValueExp(lrank))));
-    stmt->expr(0)->setRhs(el);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    //    <array-coefficients>
-    if (!options.isOn(O_HOST))
-        DeclareArrayCoefficients(st_hedr);
-
-    //   <private_variables>
-    if ((addopenmp == 1) && (private_list != NULL)) parallellist->append(*new SgExpression(OMP_PRIVATE, &(private_list->copy()), NULL, NULL));  /* OpenMP */
-    for (el = private_list; el; el = el->rhs())
-    {
-        SgSymbol *sp = el->lhs()->symbol(); 
-        SgSymbol *sph = isSgArrayType(sp->type()) ? *(SgSymbol **)(el->lhs()->attributeValue(0, PRIVATE_ARRAY)) : sp;
-        DeclareSymbolInHostHandler(sp, st_hedr, sph);
-    }
-    //   <loop_index_variables>     
-    SgExprListExp *indexes = NULL; /* OpenMP */
-    for (el = dvm_parallel_dir->expr(2); el; el = el->rhs())
-    {
-        if (isPrivate(el->lhs()->symbol()))    // is declared as private 
-            continue;
-        stmt = el->lhs()->symbol()->makeVarDeclStmt();
-        ConstantSubstitutionInTypeSpec(stmt->expr(1));    
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        if (addopenmp == 1) {/* OpenMP */
-            if (indexes != NULL) indexes->append(*el->lhs());  /* OpenMP */
-            else indexes = new SgExprListExp(*el->lhs());      /* OpenMP */
-        }   /* OpenMP */
-    }
-
-    if ((addopenmp == 1) && (indexes != NULL)) parallellist->append(*new SgExpression(OMP_PRIVATE, AddListToList(indexes,omp_red_vars), NULL, NULL));  /* OpenMP */
-
-    // create dummy argument declarations
-
-    for (el = tail; el; el = el->rhs())
-    {
-        stmt = el->lhs()->symbol()->makeVarDeclStmt();
-        ConstantSubstitutionInTypeSpec(stmt->expr(1)); 
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-
-    el = st_hedr->expr(0);   
-    stmt = el->lhs()->symbol()->makeVarDeclStmt();
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    de = stmt->expr(0);
-    //for(el=el->rhs(); el!=baseMem_list && el!=copy_uses_list; el=el->rhs())
-    for (el = el->rhs(); el != tail; el = el->rhs())
-    {             //printf("%s \n",el->lhs()->symbol()->identifier());
-        de->setRhs(new SgExprListExp(*el->lhs()->symbol()->makeDeclExpr()));
-        de = de->rhs();
-    }
-
-    // generate IMPLICIT NONE statement
-    st_hedr->insertStmtAfter(*new SgStatement(IMPL_DECL), *st_hedr);
-
-    // generate USE statements for called module procedures
-    CreateUseStatements(st_hedr);
-
-    // generate call statement of 'loop_fill_bounds'
-    stmt = LoopFillBounds_HH(s_loop_ref, s_low_bound, s_high_bound, s_step);
-    last_decl->insertStmtAfter(*stmt, *st_hedr);
-    if (cur == last_decl)
-        cur = stmt;
-    // copying headers elements to array coefficients 
-    if (!options.isOn(O_HOST)) {
-        CopyHeaderElems(last_decl);
-        if (dependency == 0) dvm_ar = NULL;
-    }
-
-    // inserting parallel loop nest
-    // first_do_par - first DO statement of parallel loop nest
-
-    // replace loop nest 
-    ReplaceDoNestLabel_Above(LastStatementOfDoNest(first_do_par), first_do_par, GetLabel());
-    ReplaceLoopBounds(first_do_par, lrank, s_low_bound, s_high_bound, s_step);
-
-    //stmt = first_do_par->extractStmt();
-    if (dependency == 0) firstdopar = stmt = first_do_par->extractStmt();
-    else firstdopar = stmt = first_do_par->copyPtr();
-    cur->insertStmtAfter(*stmt, *st_hedr); 
-
- 
-    if (addopenmp == 1) { /* OpenMP */
-	SgCallStmt *stDvmhstat = NULL;
-	SgStatement *omp_do = new SgStatement(OMP_DO_DIR); /* OpenMP */
-	SgStatement *omp_parallel = new SgStatement(OMP_PARALLEL_DIR);  /* OpenMP */
-	SgStatement *omp_endparallel = new SgStatement(OMP_END_PARALLEL_DIR); /* OpenMP */
-	SgStatement *omp_enddo = new SgStatement(OMP_END_DO_DIR); /* OpenMP */
-	SgForStmt *stdo = isSgForStmt(firstdopar); /* OpenMP */
-	SgStatement *lastdo=LastStatementOfDoNest(stdo);
-        cur->insertStmtAfter(*omp_parallel, *st_hedr); /* OpenMP */		
-        if (omp_perf) {/* OpenMP */
-	    stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_BP],*omp_perflist);/* OpenMP */
-	    stDvmhstat->setlineNumber(-1);/* OpenMP */
-	    cur->insertStmtAfter(*stDvmhstat, *st_hedr); /* OpenMP */	
-	}
-        if (omp_red_vars) /* MINLOC/MAXLOC */   /* OpenMP */
-            st_end->insertStmtBefore(*omp_endparallel,*st_hedr); /* OpenMP */
-        else
-            lastdo->insertStmtAfter(*omp_endparallel,*st_hedr); /* OpenMP */
-	if (omp_perf) {/* OpenMP */
-            stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_AL],*omp_perflist);/* OpenMP */
-	    stDvmhstat->setlineNumber(-1);/* OpenMP */
-	    lastdo->insertStmtAfter(*stDvmhstat);/* OpenMP */
-	}/* OpenMP */
-	omp_parallel->setExpression(0, *parallellist);/* OpenMP */
-	omp_do->setExpression(0, *omp_dolist);/* OpenMP */
-	omp_enddo->setExpression(0, *new SgExprListExp(*new SgExpression(OMP_NOWAIT)));  /* OpenMP */
-	ass = new SgAssignStmt(*v_lgsc, *LoopGetSlotCount_HH(s_loop_ref)); /* OpenMP */
-        if (!dependency) {
-	    omp_parallel->insertStmtAfter(*omp_do); /* OpenMP */           
-            lastdo->insertStmtAfter(*omp_enddo); /* OpenMP */ 
-	} else if (isSgForStmt(firstdopar->lexNext())) {  /* OpenMP */
-            int step = 1;  /* OpenMP */
-            SgSymbol *s_iam = NULL;  /* OpenMP */
-            SgExpression *e_iam = NULL;  /* OpenMP */
-            SgSymbol *s_ilimit = NULL;  /* OpenMP */
-            SgExpression *e_ilimit = NULL;  /* OpenMP */
-            SgSymbol *s_isync = NULL;  /* OpenMP */
-            SgExpression *e_isync = NULL;  /* OpenMP */
-            SgSymbol *omp_get_thread_num = NULL;  /* OpenMP */
-            SgStatement *vardecl = NULL;  /* OpenMP */
-            SgExprListExp *exprlist = NULL;  /* OpenMP */
-            SgForStmt *second_do_par = isSgForStmt(firstdopar->lexNext());  /* OpenMP */
-            SgStatement *assign;        /* OpenMP */
-            SgStatement  *allocatablestmt;        /* OpenMP */
-            ConvertLoopWithLabelToEnddoLoop(firstdopar); /* OpenMP */
-            if (dependency == -1) { /* OpenMP */
-                SgFunctionCallExp *fmin = new SgFunctionCallExp(*new SgFunctionSymb(FUNCTION_NAME, "min", *SgTypeInt(), *cur_func));  /* OpenMP */
-                if (second_do_par->step()) {  /* OpenMP */
-                    if (second_do_par->step()->isInteger())  /* OpenMP */
-                        step = second_do_par->step()->valueInteger();  /* OpenMP */
-                    else  /* OpenMP */
-                        step = 0;  /* OpenMP */
-                }  /* OpenMP */
-                s_iam = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("iam"), *stdo->symbol()->type(), *st_hedr);  /* OpenMP */
-                e_iam = new SgVarRefExp(*s_iam);  /* OpenMP */
-                s_isync = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("isync"), *new SgArrayType(*stdo->symbol()->type()), *st_hedr);  /* OpenMP */
-                e_isync = new SgVarRefExp(*s_isync);  /* OpenMP */
-                s_ilimit = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("ilimit"), *stdo->symbol()->type(), *st_hedr);  /* OpenMP */
-                e_ilimit = new SgVarRefExp(*s_ilimit);  /* OpenMP */
-                omp_get_thread_num = new SgSymbol(FUNCTION_NAME, "omp_get_thread_num", *tdvm, *st_hedr);  /* OpenMP */
-                allocatablestmt = new SgStatement(ALLOCATABLE_STMT);  /* OpenMP */
-                allocatablestmt->setExpression(0, *new SgExprListExp(*new SgArrayRefExp(*s_isync, *new SgExpression(DDOT)))); /* OpenMP */
-                allocatablestmt->setlineNumber(-1);  /* OpenMP */
-                last_decl->insertStmtAfter(*allocatablestmt, *st_hedr);  /* OpenMP */
-                vardecl = s_isync->makeVarDeclStmt(); /* OpenMP */
-                ConstantSubstitutionInTypeSpec(vardecl->expr(1)); 
-                vardecl->setlineNumber(-1);  /* OpenMP */
-                last_decl->insertStmtAfter(*vardecl, *st_hedr);  /* OpenMP */
-                vardecl = s_iam->makeVarDeclStmt();  /* OpenMP */
-                ConstantSubstitutionInTypeSpec(vardecl->expr(1)); 
-                vardecl->setlineNumber(-1);  /* OpenMP */
-                last_decl->insertStmtAfter(*vardecl, *st_hedr);  /* OpenMP */
-                vardecl = s_ilimit->makeVarDeclStmt();  /* OpenMP */
-                ConstantSubstitutionInTypeSpec(vardecl->expr(1)); 
-                vardecl->setlineNumber(-1);  /* OpenMP */
-                last_decl->insertStmtAfter(*vardecl, *st_hedr);  /* OpenMP */
-                vardecl = omp_get_thread_num->makeVarDeclStmt();  /* OpenMP */
-                vardecl->setlineNumber(-1);  /* OpenMP */
-                last_decl->insertStmtAfter(*vardecl, *st_hedr);  /* OpenMP */
-                exprlist = new SgExprListExp(*e_iam);  /* OpenMP */
-                exprlist->append(*e_ilimit);  /* OpenMP */
-                parallellist->append(*new SgExpression(OMP_PRIVATE, exprlist, NULL, NULL));  /* OpenMP */
-                //SgVarRefExp *e_loop = new SgVarRefExp(stdo->symbol());    /* OpenMP */		
-		if (omp_perf) {/* OpenMP */	
-			stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_AS],*omp_perflist);/* OpenMP */
-			stDvmhstat->setlineNumber(-1);/* OpenMP */	
-			omp_parallel->insertStmtAfter(*stDvmhstat); /* OpenMP */
-		}
-                omp_parallel->insertStmtAfter(*new SgStatement(OMP_BARRIER_DIR)); /* OpenMP */				
-		if (omp_perf) {/* OpenMP */	
-			stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_BS],*omp_perflist);/* OpenMP */
-			stDvmhstat->setlineNumber(-1);/* OpenMP */
-			omp_parallel->insertStmtAfter(*stDvmhstat); /* OpenMP */
-		}
-		assign = new SgAssignStmt(*new SgArrayRefExp(*s_isync, *e_iam), *new SgValueExp(0));  /* OpenMP */
-                assign->setlineNumber(-1);  /* OpenMP */
-                omp_parallel->insertStmtAfter(*assign); /* OpenMP */
-                assign = new SgAssignStmt(*e_iam, *new SgFunctionCallExp(*omp_get_thread_num));  /* OpenMP */
-                assign->setlineNumber(-1);  /* OpenMP */
-                omp_parallel->insertStmtAfter(*assign); /* OpenMP */
-                fmin->addArg(*v_lgsc - *new SgValueExp(1));
-                if (step > 0) {  /* OpenMP */
-                    if (step == 1) {
-                        fmin->addArg(*second_do_par->end() - *second_do_par->start() /*+ *new SgValueExp(1)*/);
-                    }
-                    else {
-                        SgValueExp *estep = new SgValueExp(step);
-                        fmin->addArg((*second_do_par->end() - *second_do_par->start()) / *estep /*+ *new SgValueExp(1)*/);
-                    }
-                }
-                else {  /* OpenMP */
-                    if (step == -1) {
-                        fmin->addArg(*second_do_par->start() - *second_do_par->end() /*+ *new SgValueExp(1)*/);
-                    }
-                    else {
-                        SgValueExp *estep = new SgValueExp(step);
-                        fmin->addArg((*second_do_par->start() - *second_do_par->end()) / *estep /*+ *new SgValueExp(1)*/);
-                    }
-                }
-                assign = new SgAssignStmt(*e_ilimit, *fmin);  /* OpenMP */
-                assign->setlineNumber(-1);  /* OpenMP */
-                omp_parallel->insertStmtAfter(*assign); /* OpenMP */
-                alloc = new SgStatement(DEALLOCATE_STMT);  /* OpenMP */
-                alloc->setExpression(0, *new SgArrayRefExp(*s_isync));  /* OpenMP */
-                alloc->setlineNumber(-1);  /* OpenMP */
-                omp_endparallel->insertStmtAfter(*alloc, *st_hedr); /* OpenMP */
-                alloc = new SgStatement(ALLOCATE_STMT);  /* OpenMP */
-                alloc->setExpression(0, *new SgArrayRefExp(*s_isync, *new SgExpression(DDOT, new SgValueExp(0), &(*v_lgsc - *new SgValueExp(1)), NULL)));  /* OpenMP */
-                alloc->setlineNumber(-1);  /* OpenMP */
-                firstdopar->insertStmtAfter(*omp_do); /* OpenMP */
-                omp_do->lexNext()->lastNodeOfStmt()->insertStmtAfter(*omp_enddo);
-                SgStatement *flushst = new SgStatement(OMP_FLUSH_DIR);
-                flushst->setExpression(0, *new SgExprListExp(*e_isync));
-                SgExpression *e_isynciam = new SgArrayRefExp(*s_isync, *e_iam - *new SgValueExp(1));
-                SgWhileStmt *whilest = new SgWhileStmt(SgEqOp(*e_isynciam, *new SgValueExp(0)).copy(), *flushst);
-                whilest->setlineNumber(-1);  /* OpenMP */
-                whilest->lastNodeOfStmt()->setlineNumber(-1);  /* OpenMP */
-                SgIfStmt *ifstmt = new SgIfStmt(*e_iam > *new SgValueExp(0) && *e_iam <= *e_ilimit, *whilest);
-                ifstmt->setlineNumber(-1);  /* OpenMP */
-                ifstmt->lastNodeOfStmt()->setlineNumber(-1);  /* OpenMP */
-		if (omp_perf) {/* OpenMP */	
-			stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_AS],*omp_perflist);/* OpenMP */
-			stDvmhstat->setlineNumber(-1);/* OpenMP */	
-			firstdopar->insertStmtAfter(*stDvmhstat, *firstdopar); /* OpenMP */
-		}
-		firstdopar->insertStmtAfter(*ifstmt, *firstdopar);  /* OpenMP */								
-		if (omp_perf) {/* OpenMP */	
-			stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_BS],*omp_perflist);/* OpenMP */
-			stDvmhstat->setlineNumber(-1);/* OpenMP */	
-			firstdopar->insertStmtAfter(*stDvmhstat, *firstdopar); /* OpenMP */
-		}
-		assign = new SgAssignStmt(*e_isynciam, *new SgValueExp(0));  /* OpenMP */
-                assign->setlineNumber(-1);  /* OpenMP */
-                whilest->lastNodeOfStmt()->insertStmtAfter(*assign); /* OpenMP */
-                assign->insertStmtAfter(flushst->copy()); /* OpenMP */
-                e_isynciam = new SgArrayRefExp(*s_isync, *e_iam);  /* OpenMP */
-                whilest = new SgWhileStmt(SgEqOp(*e_isynciam, *new SgValueExp(1)).copy(), flushst->copy());  /* OpenMP */
-                whilest->setlineNumber(-1);  /* OpenMP */
-                whilest->lastNodeOfStmt()->setlineNumber(-1);  /* OpenMP */
-                ifstmt = new SgIfStmt(*e_iam < *e_ilimit, *whilest);  /* OpenMP */
-                ifstmt->setlineNumber(-1);  /* OpenMP */
-                ifstmt->lastNodeOfStmt()->setlineNumber(-1);  /* OpenMP */				
-		if (omp_perf) {/* OpenMP */	
-			stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_AS],*omp_perflist);/* OpenMP */
-			stDvmhstat->setlineNumber(-1);/* OpenMP */	
-			omp_enddo->insertStmtAfter(*stDvmhstat); /* OpenMP */
-		}
-		omp_enddo->insertStmtAfter(*ifstmt);  /* OpenMP */
-		if (omp_perf) {/* OpenMP */	
-			stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_BS],*omp_perflist);/* OpenMP */
-			stDvmhstat->setlineNumber(-1);/* OpenMP */	
-			omp_enddo->insertStmtAfter(*stDvmhstat); /* OpenMP */
-		}
-		assign = new SgAssignStmt(*e_isynciam, *new SgValueExp(1));  /* OpenMP */
-                assign->setlineNumber(-1);  /* OpenMP */
-                whilest->lastNodeOfStmt()->insertStmtAfter(*assign); /* OpenMP */
-                assign->insertStmtAfter(flushst->copy()); /* OpenMP */
-            }
-            else {
-                firstdopar = firstdopar->lexPrev();  /* OpenMP */
-                for (int i = 1; i < dependency && firstdopar; i++) {  /* OpenMP */
-                    firstdopar = firstdopar->lexNext();  /* OpenMP */
-                }  /* OpenMP */
-                if (isSgForStmt(firstdopar) || firstdopar->variant() == OMP_PARALLEL_DIR) {  /* OpenMP */
-                    firstdopar->insertStmtAfter(*omp_do); /* OpenMP */
-                    omp_do->lexNext()->lastNodeOfStmt()->insertStmtAfter(*omp_enddo);  /* OpenMP */
-                }  /* OpenMP */
-            }  /* OpenMP */
-            if (alloc != NULL) cur->insertStmtAfter(*alloc, *st_hedr); /* OpenMP */
-            ass->setlineNumber(-1); /* OpenMP */
-        }  /* OpenMP */
-	cur->insertStmtAfter(*ass, *st_hedr); /* OpenMP */
-        if (omp_red_vars) {   /* OpenMP */
-            //transfer of reduction initialization statements in case of maxloc/minloc
-            int i;           /* OpenMP */
-            SgStatement *from = red_init_first->lexPrev();  /* OpenMP */
-            cur = omp_parallel;                             /* OpenMP */
-            for (i=number_of_reductions-1; i; i--) {        /* OpenMP */
-                stmt = from->lexNext()->extractStmt();      /* OpenMP */
-                cur->insertStmtAfter(*stmt);                /* OpenMP */
-                cur = stmt;                                 /* OpenMP */
-            }                                               /* OpenMP */
-        }                                                   /* OpenMP */
-	if (omp_perf) {/* OpenMP */	
-		stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_BL],*omp_perflist);/* OpenMP */
-		stDvmhstat->setlineNumber(-1);/* OpenMP */	
-		omp_parallel->insertStmtAfter(*stDvmhstat); /* OpenMP */
-		stDvmhstat = new SgCallStmt(*fdvm[OMP_STAT_AP],*omp_perflist);/* OpenMP */
-		stDvmhstat->setlineNumber(-1);/* OpenMP */
-		omp_endparallel->insertStmtAfter(*stDvmhstat);/* OpenMP */	
-	}/* OpenMP */
-       
-    }   /* OpenMP */
-
-
-    return(st_hedr);
-}
-
-SgStatement *Create_Host_Sequence_Subroutine(SgSymbol *sHostProc, SgStatement *first_st, SgStatement *last_st)
-{
-    SgStatement *stmt, *st_end, *st_hedr;
-    SgExpression *ae, *arg_list, *el, *de, *tail, *baseMem_list;
-    SgSymbol  *s_loop_ref, *sarg, *h_first;
-
-    symb_list *sl;
-    SgType *tdvm;
-    int ln, host_ndvm, save_maxdvm;
-
-    //create Host Procedure header and end
-    st_hedr = CreateHostProcedure(sHostProc);
-    st_hedr->addComment(Host_SequenceHandlerComment(first_st->lineNumber()));
-    st_end = st_hedr->lexNext();
-
-    // create  dummy argument list
-    // loop_ref,<dvm_array_headers>,<dvm_array_bases>,<uses> 
-    tdvm = FortranDvmType();
-
-    s_loop_ref = new SgSymbol(VARIABLE_NAME, "loop_ref", *tdvm, *st_hedr);
-    loop_ref_symb = s_loop_ref;  //assign to global for function HasLocalElement(), called from ReplaseAssignByIf()
-
-    ae = new SgVarRefExp(s_loop_ref);
-    arg_list = new SgExprListExp(*ae);
-    st_hedr->setExpression(0, *arg_list);
-
-    // add  dvm-array-header list
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)
-    {          //printf("%s\n",sl->symb->identifier()); 
-        SgArrayType *typearray = new SgArrayType(*tdvm);
-        typearray->addRange(*new SgValueExp(Rank(sl->symb) + 2));
-        sarg = new SgSymbol(VARIABLE_NAME, sl->symb->identifier(), *typearray, *st_hedr);
-        ae = new SgArrayRefExp(*sarg);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            h_first = sarg;
-    }
-
-    // create memory base list and add it to the dummy argument list
-    baseMem_list = tail = CreateBaseMemoryList();
-    AddListToList(arg_list, baseMem_list);
-
-    // add use's list to dummy argument list
-    if (uses_list)
-        AddListToList(arg_list, copy_uses_list = &(uses_list->copy()));
-    if (!tail)
-        tail = copy_uses_list;    
-
-    // create called functions declarations
-    CreateCalledFunctionDeclarations(st_hedr);
-
-    // create dummy argument declarations
-
-    for (el = tail; el; el = el->rhs())
-    {
-        stmt = el->lhs()->symbol()->makeVarDeclStmt();
-        ConstantSubstitutionInTypeSpec(stmt->expr(1)); 
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-
-    el = st_hedr->expr(0);
-    stmt = el->lhs()->symbol()->makeVarDeclStmt();
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    de = stmt->expr(0);
-
-    for (el = el->rhs(); el && el != tail; el = el->rhs())
-    {             //printf("%s \n",el->lhs()->symbol()->identifier());
-        de->setRhs(new SgExprListExp(*el->lhs()->symbol()->makeDeclExpr()));
-        de = de->rhs();
-    }
-
-
-    // inserting sequence of statements
-    index_array_symb = NULL;
-    host_ndvm = ndvm;
-    save_maxdvm = maxdvm; maxdvm = 0;
-    TransferBlockToHostSubroutine(first_st, last_st, st_end);
-    dvm_ar = NULL;
-
-
-    // declare indexArray if needed  for dvm-array references in left part of assign statement
-    if (index_array_symb)
-    {
-        stmt = index_array_symb->makeVarDeclStmt();
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-    // declare dvm000 array
-    if (host_ndvm < maxdvm)
-    {
-        stmt = dvm000SymbolForHost(host_ndvm, st_hedr)->makeVarDeclStmt();
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-    maxdvm = save_maxdvm;
-
-    // create loop_has_element() / dvmh_loop_has_element() function declaration 
-    int fVariant = INTERFACE_RTS2 ? HAS_ELEMENT_2 : HAS_ELEMENT;  
-    if (fmask[fVariant])
-    {
-        fmask[fVariant] = 0;
-        stmt = fdvm[fVariant]->makeVarDeclStmt();
-        stmt->expr(1)->setType(FortranDvmType());
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-
-    // create tstio() function declaration 
-    if (has_io_stmt)
-    {
-        stmt = fdvm[TSTIOP]->makeVarDeclStmt();
-        stmt->expr(1)->setType(FortranDvmType());
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        if(options.isOn(IO_RTS))
-        {
-           stmt = fdvm[FTN_CONNECTED]->makeVarDeclStmt();
-           stmt->expr(1)->setType(FortranDvmType());
-           st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-    }
-    // generate IMPLICIT NONE statement
-    st_hedr->insertStmtAfter(*new SgStatement(IMPL_DECL), *st_hedr);
-
-    // generate USE statements for called module procedures
-    CreateUseStatements(st_hedr);
-
-    return(st_hedr);
-}
-
-SgExpression *FillerDummyArgumentList(symb_list *paramList,SgStatement *st_hedr)
-{
-  symb_list *sl;
-  SgExpression *dummy_arg_list=NULL;
-    
-  for (sl = paramList; sl; sl = sl->next)
-  {          //printf("%s\n",sl->symb->identifier());
-      if(isSgArrayType(sl->symb->type()))
-      {
-        SgSymbol *shedr = DummyDvmHeaderSymbol(sl->symb,st_hedr);
-        SgExpression *ae = new SgArrayRefExp(*shedr);
-        dummy_arg_list = AddListToList(dummy_arg_list,new SgExprListExp(*ae));
-        ae = new SgArrayRefExp(*DummyDvmArraySymbol(sl->symb, shedr));
-        dummy_arg_list = AddListToList(dummy_arg_list,new SgExprListExp(*ae)); 
-      }
-      else
-        dummy_arg_list = AddListToList(dummy_arg_list,new SgExprListExp(*new SgVarRefExp(sl->symb)));
-  }
-  return dummy_arg_list;
-
-}
-
-SgStatement * makeSymbolDeclarationWithInit_F90(SgSymbol *s, SgExpression *einit)
-{    
-    SgStatement *st = s->makeVarDeclStmt();
-    st->setVariant(VAR_DECL_90);
-    SgExpression *e =  &SgAssignOp(*new SgVarRefExp(s), *einit);
-    st->setExpression(0, *new SgExprListExp(*e));    
-    return(st);
-}
-
-SgSymbol *LoopIndex(SgStatement *body, SgStatement *func)
-{
-    loopIndexCount++;
-    char *sname = (char *)malloc(6+10+1); 
-    sprintf(sname, "%s%d", "subexp", loopIndexCount);
-    SgSymbol *si = new SgSymbol(VARIABLE_NAME, sname, *func);
-    range_index_list = AddToSymbList(range_index_list, si);
-    return si; 
-}
-
-SgStatement *CreateLoopForRange(SgStatement *body, SgExpression *eRange, SgExpression *e, int flag_filler, SgStatement *func)
-{
-    SgSymbol *s_index = LoopIndex(body,func); 
-    SgStatement *loop = new SgForStmt(*s_index, *eRange->lhs(), *eRange->rhs(), *body); 
-    if(flag_filler)
-        if(isSgAssignStmt(body) && !e)        
-            ((SgAssignStmt *) body)->replaceRhs(*new SgVarRefExp(*s_index));
-        else
-            e->setLhs(*new SgVarRefExp(*s_index));
-
-    return loop;
-}
-
-SgStatement *CreateLoopNestForElement(SgStatement *body, SgExpression *edrv, SgExpression *e, int flag_filler, SgStatement *func)
-{
-    if(isSgArrayRefExp(edrv))
-    {
-       for(SgExpression *el=edrv->lhs(); el; el=el->rhs())
-           body = CreateLoopNestForElement(body, el->lhs(), el, flag_filler, func);
-    }
-    else if(isSgSubscriptExp(edrv))
-    {    body = CreateLoopForRange(body, edrv, e, flag_filler, func);
-         body = CreateLoopNestForElement(body, edrv->lhs(), e, flag_filler, func);
-         body = CreateLoopNestForElement(body, edrv->rhs(), e, flag_filler, func);
-    }
-    else
-       return body;
-
-    return (body);
-}
-
-SgStatement * CreateBodyForElememt(SgSymbol *s_elemCount,SgSymbol *s_elemBuf,SgSymbol *s_elemIndex, SgExpression *edrv, int flag_filler)
-{
-    SgExpression *e = flag_filler ? new SgVarRefExp(*s_elemIndex) : new SgVarRefExp(*s_elemCount); 
-    SgStatement *body = new SgAssignStmt(*e,*e + *new SgValueExp(1));
-
-    if(flag_filler)
-    {
-        SgStatement *st = new SgAssignStmt(*new SgArrayRefExp(*s_elemBuf,*new SgVarRefExp(*s_elemIndex)),*edrv); //*DvmType_Ref(edrv));
-        st->setLexNext(*body);
-        body = st;
-    }
-    return (body);
-}
-
-SgStatement *CreateLoopBody_Indirect(SgSymbol *s_elemCount,SgSymbol *s_elemBuf,SgSymbol *s_elemIndex,SgExpression *derived_elem_list,int flag_filler)
-{ 
-    SgStatement *loop_body = NULL,*current_st=NULL;
-    for(SgExpression *el=derived_elem_list; el; el=el->rhs())
-    {        
-        SgStatement *body = CreateBodyForElememt(s_elemCount,s_elemBuf,s_elemIndex, el->lhs(), flag_filler);
-        body = CreateLoopNestForElement(body,el->lhs(),NULL,flag_filler,s_elemCount->scope());
-        if(loop_body)
-            current_st -> setLexNext(*body);
-        else
-            loop_body = body;      
-        current_st = body;
-        while(current_st->lexNext())
-            current_st = current_st->lexNext();        
-    }
-    return (loop_body); 
-}
-
-SgStatement *CreateLoopNest_Indirect(SgSymbol *s_low_bound, SgSymbol *s_high_bound, symb_list *dummy_index_list, SgStatement *body)
-{   SgStatement *stl = body; 
-    symb_list *sl = dummy_index_list;
-    int i = 0;
-    for ( ; sl; sl=sl->next)
-          i++;
-    for (sl= dummy_index_list; sl; sl=sl->next,i--)  
-        stl = new SgForStmt(*sl->symb, *new SgArrayRefExp(*s_low_bound,*new SgValueExp(i)), *new SgArrayRefExp(*s_high_bound,*new SgValueExp(i)), *stl);
-    return (stl);
-}
-
-void CreateProcedureBody_Indirect(SgStatement *after,SgSymbol *s_low_bound,SgSymbol *s_high_bound,symb_list *dummy_index_list,SgSymbol *s_elemBuf,SgSymbol *s_elemCount,SgSymbol *s_elemIndex,SgExpression *derived_elem_list,int flag_filler)
-{
-    loopIndexCount = 0;
-    range_index_list = NULL;
-    after->insertStmtAfter(*CreateLoopNest_Indirect(s_low_bound,s_high_bound,dummy_index_list,CreateLoopBody_Indirect(s_elemCount,s_elemBuf,s_elemIndex,derived_elem_list,flag_filler)),*after->controlParent());
-}
-
-SgStatement *CreateIndirectDistributionProcedure(SgSymbol *sProc,symb_list *paramList,symb_list *dummy_index_list,SgExpression *derived_elem_list,int flag_filler)
-{
-    SgSymbol *s;
-    // create procedure header and end
-
-    SgStatement *st_hedr = CreateHostProcedure(sProc);
-    SgStatement *st_end = st_hedr->lexNext();
-
-    // create  dummy argument list
-    // elemCount/elemBuf,boundsLow,boundsHigh 
-    SgType *tdvm = FortranDvmType();
-    SgExpression  *MD = new SgExpression(DDOT, new SgValueExp(0), new SgKeywordValExp("*"), NULL);
-    SgArrayType *typearray = new SgArrayType(*tdvm);
-    typearray->addRange(*MD);
-    SgSymbol *s_elemBuf   = new SgSymbol(VARIABLE_NAME, "elemBuf",   *typearray, *st_hedr);
-    SgSymbol *s_elemCount = new SgSymbol(VARIABLE_NAME, "elemCount", *tdvm, *st_hedr);
-    
-    s = flag_filler ? s_elemBuf : s_elemCount;
-    SgExpression *ae = new SgVarRefExp(s);
-    SgExpression *arg_list = NULL; //new SgExprListExp(*ae);
-
-    //    <loop-bounds-variables>
-   
-    SgExpression *aster_expr = new SgKeywordValExp("*");
-    SgArrayType *typearray_1 = new SgArrayType(*tdvm);
-    typearray_1 -> addRange(* aster_expr);  //( * new SgValueExp(lrank));
-    SgSymbol *s_low_bound  = new SgSymbol(VARIABLE_NAME, "boundsLow",  *typearray_1, *st_hedr);
-    SgSymbol *s_high_bound = new SgSymbol(VARIABLE_NAME, "boundsHigh", *typearray_1, *st_hedr);
-
-    arg_list = AddElementToList(arg_list, new SgArrayRefExp(*s_high_bound));
-    arg_list = AddElementToList(arg_list, new SgArrayRefExp(*s_low_bound));
-    arg_list = AddElementToList(arg_list,ae);
-    SgExpression *dummy_list = FillerDummyArgumentList(paramList,st_hedr);
-    AddListToList(arg_list,dummy_list);
-    st_hedr->setExpression(0, *arg_list);
-    SgSymbol *s_elemIndex  = new SgSymbol(VARIABLE_NAME, "elemIndex", *tdvm, *st_hedr);
-
-    // make declarations
-
-    SgExpression *el=NULL; 
-    SgStatement *stmt=NULL, *st_cur=st_hedr;
-    for (el = dummy_list; el; el = el->rhs())
-    {
-       stmt = el->lhs()->symbol()->makeVarDeclStmt();
-       ConstantSubstitutionInTypeSpec(stmt->expr(1)); 
-       st_cur->insertStmtAfter(*stmt, *st_hedr);
-       st_cur = stmt;
-    }
-    stmt = s->makeVarDeclStmt();
-    stmt->expr(1)->setType(tdvm);
-    el = new SgExprListExp(*new SgArrayRefExp(*s_low_bound, *aster_expr));
-    el->setRhs(new SgExprListExp(*new SgArrayRefExp(*s_high_bound, *aster_expr)));
-    stmt->expr(0)->setRhs(el);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    // make declarations of dummy-idexes and s_elemIndex
-    for(symb_list *sl=dummy_index_list; sl; sl=sl->next)
-       AddListToList(el,new SgExprListExp(*new SgVarRefExp(*sl->symb)));
-     
-    if(flag_filler)
-    {
-       stmt = makeSymbolDeclarationWithInit_F90(s_elemIndex,new SgValueExp(0));
-       st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-    // make procedure body 
-
-    SgStatement *cur = st_end->lexPrev();
-    CreateProcedureBody_Indirect(cur,s_low_bound,s_high_bound,dummy_index_list,s_elemBuf,s_elemCount,s_elemIndex,derived_elem_list,flag_filler);
-
-    // add range indexes declarations (to declaration statement for dummy indexes)
-
-    for(symb_list *sl=range_index_list; sl; sl=sl->next)
-        AddListToList(el,new SgExprListExp(*new SgVarRefExp(*sl->symb))); 
-    
-    return (st_hedr);
-}
-
-SgSymbol *dvm000SymbolForHost(int host_dvm, SgStatement *hedr)
-{                           
-    SgArrayType *typearray = new SgArrayType(*FortranDvmType());
-    typearray->addRange(*new SgExpression(DDOT, new SgValueExp(host_dvm), new SgValueExp(maxdvm), NULL));
-    return(new SgVariableSymb("dvm000", *typearray, *hedr));
-
-}
-
-void ReplaceLoopBounds(SgStatement *first_do, int lrank, SgSymbol *s_low_bound, SgSymbol *s_high_bound, SgSymbol *s_step)
-{
-    SgStatement *st;
-    SgForStmt *stdo;
-
-    int i;
-    // looking through the loop nest 
-    for (st = first_do, i = 0; i < lrank; st = st->lexNext(), i++)
-    {
-        stdo = isSgForStmt(st);
-        if (!stdo)
-            break;
-        if (isSgArrayRefExp(stdo->start()))
-            stdo->setStart(*new SgArrayRefExp(*s_low_bound, *new SgValueExp(1 + i)));
-        else
-        {
-            stdo->start()->setLhs(new SgArrayRefExp(*s_low_bound, *new SgValueExp(1 + i)));
-            stdo->start()->rhs()->lhs()->lhs()->setLhs(new SgArrayRefExp(*s_low_bound, *new SgValueExp(1 + i)));
-        }
-        if (isSgArrayRefExp(stdo->end()))
-            stdo->setEnd(*new SgArrayRefExp(*s_high_bound, *new SgValueExp(1 + i)));
-        else
-            stdo->end()->setLhs(new SgArrayRefExp(*s_high_bound, *new SgValueExp(1 + i)));
-        if (!stdo->step())
-            continue;
-        int istep = IntStepForHostHandler(stdo->step()); 
-        SgExpression *estep;
-        if(istep)
-            estep =  new SgValueExp(istep);
-        else
-             estep = new SgArrayRefExp(*s_step, *new SgValueExp(1 + i)); 
-        stdo->setStep(*estep);
-    }
-}
-
-void ReplaceArrayBoundsInDeclaration(SgExpression *e)
-{
-    SgExpression *el;
-    for (el = e->lhs(); el; el = el->rhs())
-        el->setLhs(CalculateArrayBound(el->lhs(), e->symbol(), 1));
-}
-
-int fromModule(SgExpression *e)
-{
-   if(!e) return 0;
-
-   if(isSgVarRefExp(e) || e->variant()==CONST_REF)
-   {  
-      if(IS_BY_USE(e->symbol()) || e->symbol()->scope()->variant()==MODULE_STMT)
-      {  
-         Add_Use_Module_Attribute();
-         return 1;
-      }
-      else
-         return 0;
-   } 
-   if(isSgArrayRefExp(e))
-   {  
-      if (e->symbol()->type()->variant()==T_ARRAY && e->symbol()->type()->baseType()->variant()==T_DERIVED_TYPE && (IS_BY_USE(e->symbol()->type()->baseType()->symbol()) || IS_BY_USE(e->symbol())))
-      {
-         Add_Use_Module_Attribute();
-         return 1;
-      }
-      else
-         return 0;
-   }
-   if(isSgRecordRefExp(e))
-   {  
-      SgExpression *estr = LeftMostField(e);
-                             
-      if(IS_BY_USE(estr->symbol()->type()->symbol()) || IS_BY_USE(estr->symbol()))          
-      {
-          Add_Use_Module_Attribute(); 
-          return 1;
-      }
-      else
-          return 0;
-      //fromModule(estr);
-   }
-   if(isSgSubscriptExp(e))
-      return (fromModule(e->lhs()) && fromModule(e->rhs()));
-
-   if((!e->lhs() || fromModule(e->lhs())) && (!e->rhs() || fromModule(e->rhs())))
-      return 1;
-   
-   return 0;
-}
-
-int fromUsesList(SgExpression *e)
-{
-   if(!e) return 1;
-   SgSymbol *s = e->symbol();
-   if(s && !isInUsesList(s)) return 0;
-   return fromUsesList(e->lhs()) && fromUsesList(e->rhs());
-}
-
-SgSymbol *DeclareSymbolInHostHandler(SgSymbol *var, SgStatement *st_hedr, SgSymbol *loc_var)
-{   
-    SgSymbol *s = var;
-    if(!var) return s;
-    if(USE_STATEMENTS_ARE_REQUIRED && IS_BY_USE(var))
-       return s;
-   
-    if (!loc_var && isSgArrayType(s->type()))
-       s = ArraySymbolInHostHandler(s, st_hedr);
-    else if(loc_var)
-       s = loc_var ;
-
-    SgStatement *stmt = s->makeVarDeclStmt();
-    if(IS_POINTER_F90(s))
-       stmt->setExpression(2,*new SgExpression(POINTER_OP));
-
-    ConstantSubstitutionInTypeSpec(stmt->expr(1));    
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    return s;
-}
-
-int ExplicitShape(SgExpression *eShape)
-{
-   SgExpression *el;
-   SgSubscriptExp *sbe;
-   for(el=eShape; el; el=el->rhs())
-   { 
-      SgExpression *uBound =  (sbe=isSgSubscriptExp(el->lhs())) ? sbe->ubound() : el->lhs();
-      if(uBound && uBound->variant()!=STAR_RANGE) 
-            continue;
-      else
-            return 0;
-    }              
-    return 1;
-}
-
-int AssumedShape(SgExpression *eShape)
-{
-   SgExpression *el;
-   SgSubscriptExp *sbe;
-   for(el=eShape; el; el=el->rhs())
-   { 
-      //SgExpression *uBound =  (sbe=isSgSubscriptExp(el->lhs())) ? sbe->ubound() : el->lhs();
-      sbe=isSgSubscriptExp(el->lhs());
-      if(sbe && !sbe->ubound())
-      //if(!uBound) 
-            continue;
-      else
-            return 0;
-    }              
-    return 1;
-}
-
-
-int TestArrayShape(SgSymbol *ar)
-{        
-   int i;
-   SgExpression *esize = NULL; 
-   for(i=1; i<=Rank(ar); i++) 
-   {
-    //calculating size of i-th dimension
-      esize = ReplaceParameter(ArrayDimSize(ar, i));
-      //if(err && esize && esize->variant()==STAR_RANGE)
-      //  return 0; //Error("Assumed-size array: %s",ar->identifier(),162,stmt);
-      if(!esize || !esize->isInteger())
-        return 0;
-    }
-    return 1;
-}
-
-SgSymbol *ArraySymbolInHostHandler(SgSymbol *ar, SgStatement *scope)
-{
-    SgSymbol *soff;
-    SgExpression *edim;
-    int rank, i;
-
-    rank = Rank(ar);
-    soff = ArraySymbol(ar->identifier(), ar->type()->baseType(), NULL, scope);
-    if (!options.isOn(C_CUDA) && !ExplicitShape(isSgArrayType(ar->type())->getDimList()))
-        Error("Illegal array bound of private array %s", ar->identifier(), 442, dvm_parallel_dir);
-
-    for (i = 0; i < rank; i++)
-    {
-        edim = ((SgArrayType *)(ar->type()))->sizeInDim(i);
-             //if( IS_BY_USE(ar) || !fromUsesList(edim) && !fromModule(edim) )
-             //   edim = CalculateArrayBound(edim, ar, 1); 
-        ((SgArrayType *)(soff->type()))->addRange(edim->copy());
-    }
-    return(soff);
-}
-
-void DeclareArrayCoefficients(SgStatement *after)
-{
-    symb_list *sl;
-    SgStatement  *dst;
-    SgExpression *e, *el;
-    int i, rank;
-    coeffs *c;
-
-    for (sl = acc_array_list, el = NULL; sl; sl = sl->next)
-    {
-        c = AR_COEFFICIENTS(sl->symb);
-        rank = Rank(sl->symb);
-        for (i = 2; i <= rank; i++)
-        {  // doAssignTo_After(new SgVarRefExp(*(c->sc[i])), header_ref(sl->symb,i));
-            e = new SgExprListExp(*(c->sc[i])->makeDeclExpr());
-            e->setRhs(el);
-            el = e;
-        }
-        e = opt_base ? (&(*header_ref(sl->symb, rank + 2) + *new SgVarRefExp(*(c->sc[1])))) : header_ref(sl->symb, rank + 2);
-        //doAssignTo_After(new SgVarRefExp(*(c->sc[rank+2])), e);
-        e = new SgExprListExp(*(c->sc[rank + 2])->makeDeclExpr());
-        e->setRhs(el);
-        el = e;
-    }
-    if (el)
-    {
-        dst = after->expr(0)->lhs()->symbol()->makeVarDeclStmt(); // creates INTEGER[*8] name, then name is removed
-        dst->setExpression(0, *el);
-        after->insertStmtAfter(*dst);
-    }
-
-}
-
-SgExpression *CreateBaseMemoryList()
-{
-    symb_list *sl;
-    SgExpression *base_list, *l, *el;
-    SgValueExp M0(0);
-    SgExpression  *MD = new SgExpression(DDOT, &M0.copy(), new SgKeywordValExp("*"), NULL);
-
-    // create memory base list looking through the acc_array_list
-    
-    sl = USE_STATEMENTS_ARE_REQUIRED ? MergeSymbList(acc_array_list_whole, acc_array_list) : acc_array_list;
-    if (!sl) return(NULL);
-    base_list = new SgExprListExp(*new SgArrayRefExp(*baseMemory(sl->symb->type()->baseType())));
-
-    for (sl = sl->next; sl; sl = sl->next)
-    {
-        for (l = base_list; l; l = l->rhs())
-        {       //printf("%d   %d\n",sl->symb->type()->baseType()->variant(),l->lhs()->symbol()->type()->baseType()->variant());  
-            if (baseMemory(sl->symb->type()->baseType()) == l->lhs()->symbol())
-                //baseMemory(l->lhs()->symbol()->type()->baseType()) )
-                break;
-        }
-
-        if (!l)
-        {
-            el = new SgExprListExp(*new SgArrayRefExp(*baseMemory(sl->symb->type()->baseType())));
-            el->setRhs(base_list);
-            base_list = el;
-        }
-    }
-
-    for (l = base_list; l; l = l->rhs())
-    {
-        SgSymbol *sb = &(l->lhs()->symbol()->copy());
-        SYMB_SCOPE(sb->thesymb) = cur_in_source->controlParent()->thebif;
-        SgArrayType *typearray = new SgArrayType(*l->lhs()->symbol()->type()->baseType());
-        typearray->addRange(*MD);       //Dimension(NULL,1,1);
-        sb->setType(typearray);
-        l->lhs()->setSymbol(sb);
-    }
-    return(base_list);
-}
-
-SgExpression *CreateArrayAdrList(SgSymbol *header_symb, SgStatement *st_host)
-{
-    symb_list *sl;
-    SgExpression *adr_list = NULL;
-    int i, rank;
-    SgSymbol *sarg, *hl;
-
-    // create array address list looking through the acc_array_list
-    sl = acc_array_list;
-    if (!sl) return(NULL);
-    adr_list = new SgExprListExp(*new SgArrayRefExp(*DummyDvmArraySymbol(sl->symb, header_symb)));
-
-    for (sl = acc_array_list->next, hl = header_symb->next(); sl; sl = sl->next, hl = hl->next())
-    {
-        SgArrayType *typearray = new SgArrayType(*sl->symb->type()->baseType());
-        rank = Rank(sl->symb);
-        for (i = 1; i < rank; i++)
-            typearray->addRange(*Dimension(hl, i, rank));
-        typearray->addRange(*Dimension(hl, rank, rank));
-
-        sarg = DummyDvmArraySymbol(sl->symb, hl);
-        adr_list->setRhs(*new SgExprListExp(*new SgArrayRefExp(*sarg)));
-        adr_list = adr_list->rhs();
-        /*
-         el = new SgExprListExp(*new SgArrayRefExp(*sarg));
-         el->setRhs(adr_list);
-         adr_list = el;
-         */
-    }
-    return(adr_list);
-}
-
-SgSymbol *HeaderSymbolForHandler(SgSymbol *ar)
-{
- SgSymbol *shead;
- if(HEADER_FOR_HANDLER(ar))
-    shead = *HEADER_FOR_HANDLER(ar);
- else 
- {
-    shead =  DummyDvmHeaderSymbol(ar,cur_func);
-    SgSymbol **s_attr = new (SgSymbol *);
-    *s_attr = shead;
-    ar->addAttribute(HANDLER_HEADER, (void*)s_attr, sizeof(SgSymbol *));
- }
- return (shead);
-}
-
-SgExpression *FirstArrayElementSubscriptsForHandler(SgSymbol *ar)
-{//generating reference AR(L1,...,Ln), where Li - lower bound of i-th dimension
- // Li = AR_header(rank+2+i)
- int i;
- SgExpression *esl=NULL, *el=NULL;
- SgExpression *bound[MAX_DIMS], *ebound;
- 
- SgSymbol *shead = HeaderSymbolForHandler(ar);
- int rank = Rank(ar); 
- for (i = rank; i; i--)
-    bound[i-1] = Calculate(LowerBound(ar,i-1));  
- for (i = rank; i; i--) {
-    if(bound[i-1]->isInteger() && !IS_BY_USE(ar))
-       ebound =  new SgValueExp(bound[i-1]->valueInteger());
-    else
-       ebound =  new SgArrayRefExp(*shead,*new SgExprListExp(*new SgValueExp(rank+2+i)));
-    esl = new SgExprListExp(*ebound); 
-    esl->setRhs(el);
-    el = esl;
- }
- return(el);
-}
-
-SgExpression *FirstArrayElementSubscriptsOfPrivateArray(SgSymbol *s)
-{//generating reference AR(L1,...,Ln), where Li - lower bound of i-th dimension  for kernel in C_Cuda
- // Li - is constant or dummy argument reference
-    SgExpression *elist = NULL, *var; 
-/*  
-  if (!TestArrayShape(s))
-  {  
-    var = ElementOfPrivateList(s);
-    SgExpression **eatr = (SgExpression **) var->lhs()->attributeValue(0, L_BOUNDS);  
-    SgExpression *ela;
-    for (ela = *eatr; ela->rhs(); ela = ela->rhs())
-    {
-      SgExpression *ed = new SgVarRefExp(ela->lhs()->lhs()->symbol());
-      elist = AddListToList(new SgExprListExp(*ed), elist);                        
-    }
-  }
-  else
-  { 
-    for (int i=0; i<Rank(s); i++)
-      elist = AddListToList(elist, new SgExprListExp(*Calculate(LowerBound(s,i-1))));
-  } 
-*/  
-    for (int i=0; i<Rank(s); i++)
-      elist = AddListToList(elist, new SgExprListExp(*new SgValueExp(0)));
-
-    elist->addAttribute(NULL_SUBSCRIPTS, (void*)1, 0);
-    return elist;    
-}
-
-SgSymbol *DummyDvmHeaderSymbol(SgSymbol *ar, SgStatement *st_hedr)
-{
-    SgArrayType *typearray = new SgArrayType(*FortranDvmType());
-    typearray->addRange(*new SgValueExp(2*Rank(ar) + 2));
-    char *name = options.isOn(O_HOST) ? Header_DummyArgName(ar) : ar->identifier();
-    return (new SgSymbol(VARIABLE_NAME, name, *typearray, *st_hedr));
-}
-
-SgSymbol *DummyDvmArraySymbol(SgSymbol *ar, SgSymbol *header_symb)
-{
-    SgArrayType *typearray = new SgArrayType(*ar->type()->baseType());
-    int i, rank;
-    rank = Rank(ar);
-    for (i = 1; i < rank; i++)
-        typearray->addRange(*Dimension(header_symb, i, rank));
-    typearray->addRange(*Dimension(header_symb, rank, rank));
-    return(new SgSymbol(VARIABLE_NAME, ar->identifier(), *typearray, *header_symb->scope()));
-}
-
-SgSymbol *DummyDvmBufferSymbol(SgSymbol *ar, SgSymbol *header_symb)
-{
-    SgArrayType *typearray = new SgArrayType(*ar->type()->baseType());
-    typearray->addRange(*Dimension(header_symb, 1, 1));
-    return(new SgSymbol(VARIABLE_NAME, ar->identifier(), *typearray, *header_symb->scope()));
-}
-
-SgExpression *Dimension(SgSymbol *hs, int i, int rank)
-{
-    SgValueExp M0(0), M1(1);
-    //SgExpression  *MD =  new SgExpression(DDOT,&M0.copy(),new SgKeywordValExp("*"),NULL); 
-    SgExpression  *me;
-
-
-    if (i == rank)
-        return(new SgExpression(DDOT, &M0.copy(), new SgKeywordValExp("*"), NULL));
-    if (i == 1)
-        return(new SgExpression(DDOT, &M0.copy(), &(*new SgArrayRefExp(*hs, *new SgValueExp(rank)) - M1), NULL));
-    //me = new SgArrayRefExp(*hs,*new SgValueExp(rank));
-    //for(j=rank; j>rank-i+2; j--)
-    //me = &(*me * *new SgArrayRefExp(*hs,*new SgValueExp(j-1)) );
-    me = new SgArrayRefExp(*hs, *new SgValueExp(rank - i + 2));
-    return(new SgExpression(DDOT, &M0.copy(), &(*new SgArrayRefExp(*hs, *new SgValueExp(rank - i + 1)) / (*me) - M1), NULL));
-
-}
-
-SgExpression *ConstRef_F95(int ic)
-{
-    SgExpression *kind, *ce;
-
-    ce = new SgValueExp(ic);
-    if (len_DvmType && !type_with_len_DvmType)
-    {
-        type_with_len_DvmType = new SgType(T_INT);
-        kind = new SgValueExp(len_DvmType);
-        TYPE_KIND_LEN(type_with_len_DvmType->thetype) = kind->thellnd;
-    }
-    if (len_DvmType)
-        ce->setType(type_with_len_DvmType);
-
-    return(ce);
-}
-
-SgExpression *DvmType_Ref(SgExpression *e) 
-{
-    if (e->variant() == INT_VAL)
-        return(ConstRef_F95(((SgValueExp *)e)->intValue()));
-    return( len_DvmType ? TypeFunction(SgTypeInt(),e,new SgValueExp(len_DvmType) ) : e);
-}
-
-SgSymbol *indexArraySymbol(SgSymbol *ar)
-{
-    if (index_array_symb)
-        return(index_array_symb);
-
-    //creating new symbol
-
-    index_array_symb = ArraySymbol("indexArray", FortranDvmType(), new SgValueExp(MaxArrayRank()), cur_in_source->controlParent());
-
-    return(index_array_symb);
-
-}
-
-char *Header_DummyArgName(SgSymbol *s)
-{
-    char *name;
-
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 6));
-    sprintf(name, "%s_head", s->identifier());
-    return(TestAndCorrectName(name));
-}
-
-int ParLoopRank()
-{
-    int nloop;
-    SgExpression *dovar;
-
-    // looking through the do_variables list
-
-    for (dovar = dvm_parallel_dir->expr(2), nloop = 0; dovar; dovar = dovar->rhs())
-        nloop++;
-    return(nloop);
-}
-
-int MaxArrayRank()
-{
-    symb_list *sl;
-    int max_rank = 0;
-    int rank;
-    for (sl = acc_array_list; sl; sl = sl->next)
-    {
-        rank = Rank(sl->symb);
-        max_rank = (max_rank < rank) ? rank : max_rank;
-    }
-    return(max_rank);
-}
-
-int OneSteps(int nl, SgStatement *nest)
-{
-    int i;
-    SgExpression *dostep, *ec;
-    SgStatement *stdo;
-    // looking through the loop nest
-
-    for (stdo = nest, i = nl; i; stdo = stdo->lexNext(), i--)
-    {
-        dostep = ((SgForStmt *)stdo)->step();
-        if (!dostep) continue;   //by default do_step == 1
-        ec = Calculate(dostep);
-        if (ec->isInteger() && ec->valueInteger() == 1) // do_step == 1
-            continue;
-        break;
-    }
-    if (i == 0)     //all do_step == 1
-        return(1);
-    else
-        return(0);
-}
-
-int IConstStep(SgStatement *stdo)
-{
-    SgExpression *dostep, *ec;
-    dostep = ((SgForStmt *)stdo)->step();
-    if (!dostep)
-        return(1);   //by default do_step == 1
-    if (((SgForStmt *)stdo)->start()->variant() == ADD_OP) //redblack scheme
-        return(1);
-    if (dostep->variant() == INT_VAL)
-        return(((SgValueExp *)dostep)->intValue());    //NODE_INT_CST_LOW (dostep->thellnd);
-    ec = Calculate(dostep);
-    if (ec->isInteger())
-        return(ec->valueInteger());
-    if(!options.isOn(NO_BL_INFO))
-        err("Non constant do step is not implemented yet", 593, stdo);
-    return(0);
-}
-
-
-int TestParLoopSteps(SgStatement *first_do, int n)
-{
-    int i;
-    SgExpression *dostep, *ec;
-    SgStatement *stdo;
-    for (i = n, stdo = first_do; i; i--, stdo = stdo->lexNext())
-    {
-        dostep = ((SgForStmt *)stdo)->step();
-        if (!dostep)
-            continue;   //by default do_step == 1
-        if (((SgForStmt *)stdo)->start()->variant() == ADD_OP) //redblack scheme
-            continue;
-        if (dostep->variant() == INT_VAL)
-        {
-            if (((SgValueExp *)dostep)->intValue() == 1)
-                continue;
-            else
-                return(0);
-        }
-        ec = Calculate(dostep);
-        if (ec->isInteger())
-        {
-            if (ec->valueInteger() == 1)
-                continue;
-            else
-                return(0);
-        }
-        return(0);
-    }
-    return(1);
-}
-
-int IntStepForHostHandler(SgExpression *dostep)
-{
-    SgExpression *ec;
-    if (!dostep)
-        return(1);   //by default do_step == 1
-    ec = Calculate(ReplaceParameter(dostep));
-    if (ec->isInteger())
-        return(ec->valueInteger());
-    return(0);
-}
-
-void ConstantSubstitutionInTypeSpec(SgExpression *e)
-{
-  SgType *t = e->type(); 
-  if(!TYPE_KIND_LEN(t->thetype)) return;
-  if(t->selector()->variant()==INT_VAL) return;
-  SgType *new_t= &(t->copy());
-  TYPE_KIND_LEN(new_t->thetype) = ReplaceParameter(new_t->selector())->thellnd;
-  e->setType(new_t);
-  return;
-}
-
-char * BoundName(SgSymbol *s, int i, int isLower)
-{
-    char *name = new char[strlen(s->identifier()) + 13];
-    if(isLower)
-      sprintf(name, "lbound%d_%s", i, s->identifier());
-    else
-      sprintf(name, "ubound%d_%s", i, s->identifier());
-    name = TestAndCorrectName(name);
-    return(name);
-}
-
-SgSymbol *DummyBoundSymbol(SgSymbol *rv, int i, int isLower, SgStatement *st_hedr)
-{
-  SgExpression *bound;
-  bound = isLower ? Calculate(LowerBound(rv,i)) : Calculate(UpperBound(rv,i));
-  if(bound->isInteger())
-     return NULL;
-  return(new SgVariableSymb(BoundName(rv, i+1, isLower), *SgTypeInt(), *st_hedr));
-}
-
-SgExpression *CreateDummyBoundListOfArray(SgSymbol *ar, SgSymbol *new_ar, SgStatement *st_hedr)
-{
-    SgExpression *sl = NULL;
-    SgSymbol *low_s, *upper_s;
-    SgExpression *up_bound, *low_bound;
-    SgArrayType *typearray = isSgArrayType(new_ar->type());
-    
-    for(int i=0; i<Rank(ar); i++) 
-    {    
-        if(low_s = DummyBoundSymbol(ar,i,1,st_hedr )) 
-           sl = AddListToList( sl,  new SgExprListExp(*(low_bound = new SgVarRefExp(low_s))) );
-      
-        if(upper_s = DummyBoundSymbol(ar, i, 0, st_hedr)) 
-           sl = AddListToList( sl,  new SgExprListExp(*(up_bound = new SgVarRefExp(upper_s))) );
-
-        typearray->addRange(*new SgExpression(DDOT, low_s ? low_bound : Calculate(LowerBound(ar,i)), upper_s ? up_bound : Calculate(UpperBound(ar,i)))
-); 
-    }
-    return sl;
-}
-
-SgExpression * DummyListForReductionArrays(SgStatement *st_hedr)
-{  
-    reduction_operation_list *rl;
-    SgExpression *dummy_list = NULL;
-    for (rl = red_struct_list; rl; rl = rl->next)
-    {   
-        if (rl->redvar_size != 0)
-        {
-            SgSymbol *ar = rl->redvar;
-            SgType *tp = isSgArrayType(ar->type()) ? ar->type()->baseType() : ar->type();
-            SgSymbol *new_ar = ArraySymbol(ar->identifier(), tp, NULL, st_hedr);
-            rl->red_host = new_ar;
-            dummy_list = AddListToList(dummy_list, CreateDummyBoundListOfArray(ar, new_ar, st_hedr));
-        } 
-        if (rl->locvar)
-        {
-            SgSymbol *ar = rl->locvar;
-            SgType *tp = isSgArrayType(ar->type()) ? ar->type()->baseType() : ar->type();
-            SgSymbol *new_ar = ArraySymbol(ar->identifier(), tp, NULL, st_hedr);
-            rl->loc_host = new_ar;
-            dummy_list = AddListToList(dummy_list, CreateDummyBoundListOfArray(ar, new_ar, st_hedr));
-        } 
-    } 
-    return  dummy_list;
-}
-
-SgExpression * DummyListForPrivateArrays(SgStatement *st_hedr)
-{
-    SgExpression *dummy_list = NULL, *pl;
-    SgSymbol *s;
-    for (pl=private_list; pl;pl=pl->rhs())
-    {
-         s = pl->lhs()->symbol();
-         if (isSgArrayType(s->type()))
-         {
-            SgType *tp = s->type()->baseType();
-            SgSymbol *new_ar = ArraySymbol(s->identifier(), tp, NULL, st_hedr);
-            dummy_list = AddListToList(dummy_list, CreateDummyBoundListOfArray(s, new_ar, st_hedr));
-            SgSymbol **satr = new (SgSymbol *);
-            *satr = new_ar;
-            pl->lhs()->addAttribute(PRIVATE_ARRAY, (void *)satr, sizeof(SgSymbol *) );    
-         }     
-    }
-    return dummy_list;
-}
-
-/***************************************************************************************/
-/*ACC*/
-/*   Creating and Inserting New Statement in the Program                               */
-/* (Fortran Language, .cuf file)                                                       */
-/***************************************************************************************/
-
-SgSymbol *SyncthreadsSymbol()
-{
-    if (sync_proc_symb)
-        return(sync_proc_symb);
-    if (options.isOn(C_CUDA))
-        sync_proc_symb = new SgSymbol(PROCEDURE_NAME, "__syncthreads", *mod_gpu);
-    else
-        sync_proc_symb = new SgSymbol(PROCEDURE_NAME, "syncthreads", *mod_gpu);
-    return(sync_proc_symb);
-}
-
-void CudaVars()
-{
-    if (s_threadidx)
-        return;
-    s_threadidx = new SgVariableSymb("threadIdx", *t_dim3, *mod_gpu);
-    s_blockidx = new SgVariableSymb("blockIdx", *t_dim3, *mod_gpu);
-    s_blockdim = new SgVariableSymb("blockDim", *t_dim3, *mod_gpu);
-    s_griddim = new SgVariableSymb("gridDim", *t_dim3, *mod_gpu);
-    s_warpsize = new SgVariableSymb("warpSize", *SgTypeInt(), *mod_gpu);
-}
-
-void SymbolOfCudaOffsetType()
-{
-    s_offset_type = new SgVariableSymb("symb_offset", *CudaOffsetType(), *mod_gpu);
-}
-
-void SymbolOfCudaIndexType()
-{
-    s_of_cudaindex_type = new SgVariableSymb("symb_cudaindex", *CudaIndexType(), *mod_gpu);
-}
-
-void KernelWorkSymbols()
-{
-    char *name;
-
-    if (s_ibof) return;
-    name = TestAndCorrectName("ibof");
-    s_ibof = new SgVariableSymb(name, *SgTypeInt(), *mod_gpu);
-    if (s_blockDims) return;
-    name = TestAndCorrectName("blockDims");
-    s_blockDims = new SgVariableSymb(name, *SgTypeInt(), *mod_gpu);
-    return;
-}
-
-
-void KernelBloksSymbol()
-{
-    SgValueExp M1(1), M0(0);
-    SgExpression  *M01 = new SgExpression(DDOT, &M0.copy(), &M1.copy(), NULL);
-
-    if (s_blocks_k) return;
-
-    if (options.isOn(C_CUDA))
-    {
-        s_CudaIndexType_k = new SgSymbol(TYPE_NAME, "CudaIndexType", *mod_gpu);
-        CudaIndexType_k = C_Derived_Type(s_CudaIndexType_k);
-        s_blocks_k = ArraySymbol(TestAndCorrectName("blocks"), CudaIndexType_k, (SgExpression *)&M0, mod_gpu);
-        s_rest_blocks = new SgVariableSymb(TestAndCorrectName("rest_blocks"), CudaIndexType_k, mod_gpu);
-        s_cur_blocks = new SgVariableSymb(TestAndCorrectName("cur_blocks"), CudaIndexType_k, mod_gpu);
-        s_add_blocks = new SgVariableSymb(TestAndCorrectName("add_blocks"), CudaIndexType_k, mod_gpu);
-    }
-    else
-    {
-        s_blocks_k = ArraySymbol(TestAndCorrectName("blocks"), CudaIndexType(), M01, mod_gpu);
-        s_rest_blocks = new SgVariableSymb(TestAndCorrectName("rest_blocks"), CudaIndexType(), mod_gpu);
-        s_cur_blocks = new SgVariableSymb(TestAndCorrectName("cur_blocks"), CudaIndexType(), mod_gpu);
-        s_add_blocks = new SgVariableSymb(TestAndCorrectName("add_blocks"), CudaIndexType(), mod_gpu);
-    }
-    return;
-}
-
-void KernelBaseMemorySymbols()
-{
-    SgValueExp M1(1), M0(0);
-    SgExpression  *M01 = new SgExpression(DDOT, &M0.copy(), &M1.copy(), NULL);
-    //SgArrayType *typearray;
-
-    Imem_k = ArraySymbol("i0000m", SgTypeInt(), M01, mod_gpu);
-    Rmem_k = ArraySymbol("r0000m", SgTypeFloat(), M01, mod_gpu);
-    Dmem_k = ArraySymbol("d0000m", SgTypeDouble(), M01, mod_gpu);
-
-    Lmem_k = ArraySymbol("l0000m", SgTypeBool(), M01, mod_gpu);
-    Cmem_k = ArraySymbol("c0000m", SgTypeComplex(current_file), M01, mod_gpu);
-    DCmem_k = ArraySymbol("dc000m", SgTypeDoubleComplex(current_file), M01, mod_gpu);
-    Chmem_k = ArraySymbol("ch000m", SgTypeChar(), M01, mod_gpu);
-}
-
-SgSymbol *FormalLocationSymbol(SgSymbol *locvar, int i)
-{
-    SgType *type;
-    char *name;
-
-    name = (char *)malloc((unsigned)(strlen(locvar->identifier()) + 6));
-    sprintf(name, "%s__%d", locvar->identifier(), i);
-    type = isSgArrayType(locvar->type()) ? (locvar->type()->baseType()) : locvar->type();
-    if (options.isOn(C_CUDA))
-        type = C_Type(type);
-    return(new SgVariableSymb(name, *type, *kernel_st));
-}
-
-SgSymbol *FormalDimSizeSymbol(SgSymbol *var, int i)
-{
-    SgType *type;
-
-    type = options.isOn(C_CUDA) ? C_DvmType() : FortranDvmType();
-    return(new SgVariableSymb(DimSizeName(var, i), *type, *kernel_st));
-}
-
-SgSymbol *FormalLowBoundSymbol(SgSymbol *var, int i)
-{
-    SgType *type;
-
-    type = options.isOn(C_CUDA) ? C_DvmType() : FortranDvmType();
-    return(new SgVariableSymb(BoundName(var, i, 1), *type, *kernel_st));
-}
-
-SgType *Type_For_Red_Loc(SgSymbol *redsym, SgSymbol *locsym, SgType *redtype, SgType *loctype)
-{
-    char *tname;
-    tname = (char *)malloc((unsigned)(strlen(redsym->identifier()) + (strlen(locsym->identifier()) + 7)));
-    sprintf(tname, "%s_%s_type", redsym->identifier(), locsym->identifier());
-
-    SgSymbol *stype = new SgSymbol(TYPE_NAME, tname, *kernel_st);
-    SgFieldSymb *sred = new SgFieldSymb(redsym->identifier(), *redtype, *stype);
-    SgFieldSymb *sloc = new SgFieldSymb(locsym->identifier(), *loctype, *stype);
-
-    SYMB_NEXT_FIELD(sred->thesymb) = sloc->thesymb;
-
-    SYMB_NEXT_FIELD(sloc->thesymb) = NULL;
-
-    SgType *tstr = new SgType(T_STRUCT);
-    TYPE_COLL_FIRST_FIELD(tstr->thetype) = sred->thesymb;
-    stype->setType(tstr);
-
-    SgType *td = new SgType(T_DERIVED_TYPE);
-    TYPE_SYMB_DERIVE(td->thetype) = stype->thesymb;
-    TYPE_SYMB(td->thetype) = stype->thesymb;
-
-    return(td);
-}
-
-SgSymbol *RedBlockSymbolInKernel(SgSymbol *s, SgType *type)
-{
-    char *name;
-    SgSymbol *sb;
-    SgValueExp M0(0);
-    SgExpression  *MD = new SgExpression(DDOT, &M0.copy(), new SgKeywordValExp("*"), NULL);
-    SgArrayType *typearray;
-    SgType *tp;
-    int i = 1;
-    if (!type)
-    {
-        tp = s->type()->baseType();
-        if (options.isOn(C_CUDA))
-            tp = C_Type(tp);
-        typearray = new SgArrayType(*tp);
-    }
-    else if (isSgArrayType(type))
-        typearray = (SgArrayType *)&(type->copy());
-    else
-        typearray = new SgArrayType(*type);
-
-    if (!options.isOn(C_CUDA))
-        typearray->addRange(*MD);
-    else
-        typearray->addDimension(NULL);
-
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 8));
-
-    sprintf(name, "%s_block", s->identifier());
-
-    while (isSameNameShared(name))
-        sprintf(name, "%s_block%d", s->identifier(), i++);
-
-    sb = new SgVariableSymb(name, *typearray, *kernel_st); // scope may be mod_gpu
-    shared_list = AddToSymbList(shared_list, sb);
-
-    return(sb);
-}
-
-SgSymbol *RedFunctionSymbolInKernel(char *name)
-{
-    return(new SgFunctionSymb(FUNCTION_NAME, name, *SgTypeInt(), *kernel_st));
-}
-
-SgSymbol *isSameNameShared(char *name)
-{
-    symb_list *sl;
-    for (sl = shared_list; sl; sl = sl->next)
-    {
-        if (!strcmp(sl->symb->identifier(), name))
-            return(sl->symb);
-    }
-    return(NULL);
-}
-
-
-SgSymbol *IndVarInKernel(SgSymbol *s)
-{
-    char *name;
-    SgSymbol *soff;
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 4));
-    sprintf(name, "%s__1", s->identifier());
-    soff = new SgVariableSymb(name, *IndexType(), *kernel_st);
-    return(soff);
-}
-
-SgSymbol *IndexSymbolForRedVarInKernel(int i)
-{
-    char *name = new char[10];
-    SgSymbol *soff;
-
-    sprintf(name, "k_k%d", i);
-    soff = new SgVariableSymb(TestAndCorrectName(name), *IndexType(), *kernel_st);
-    return(soff);
-}
-
-SgSymbol *RemoteAccessBufferInKernel(SgSymbol *ar, int rank)
-{
-    int i = 1;
-    int j;
-    int *index = new int;
-    char *name;
-    SgSymbol *sn;
-    SgArrayType *typearray;
-
-    SgExpression  *rnk = new SgValueExp(rank + DELTA);
-    name = (char *)malloc((unsigned)(strlen(ar->identifier()) + 4 + 3 + 1));
-    sprintf(name, "%s_rma", ar->identifier());
-    typearray = new SgArrayType(*ar->type()->baseType());
-    for (j = rank; j; j--)
-        typearray->addRange(*rnk);
-    while (isSameNameBuffer(name, rma->rml))
-        sprintf(name, "%s_rma%d", ar->identifier(), i++);
-    sn = new SgVariableSymb(name, *typearray, *mod_gpu);
-
-    *index = 1;
-    // adding the attribute (ARRAY_HEADER) to buffer symbol
-    sn->addAttribute(ARRAY_HEADER, (void*)index, sizeof(int));
-
-    return(sn);
-}
-
-SgSymbol *DummyReplicatedArray(SgSymbol *ar, int rank)
-{//int i = 1;
-    int j;
-    int *index = new int;
-    char *name;
-    SgSymbol *sn;
-    SgArrayType *typearray;
-    coeffs *scoef = new coeffs;
-
-    SgExpression  *rnk = new SgValueExp(rank + DELTA);
-    name = (char *)malloc((unsigned)(strlen(ar->identifier()) + 1));
-    sprintf(name, "%s", ar->identifier());
-    typearray = new SgArrayType(*ar->type()->baseType());
-    for (j = rank; j; j--)
-        typearray->addRange(*rnk);
-    sn = new SgVariableSymb(name, *typearray, *mod_gpu);
-
-    *index = 1;
-    // adding the attribute (ARRAY_HEADER) to buffer symbol
-    sn->addAttribute(ARRAY_HEADER, (void*)index, sizeof(int));
-    // creating variables used for optimisation buffer references in parallel loop
-    CreateCoeffs(scoef, ar);
-
-    // adding the attribute (ARRAY_COEF) to  buffer symbol
-    sn->addAttribute(ARRAY_COEF, (void*)scoef, sizeof(coeffs));
-
-    return(sn);
-}
-
-
-SgSymbol *isSameNameBuffer(char *name, SgExpression *rml)
-{
-    SgExpression *el;
-    rem_var *remv;
-    for (el = rml; el; el = el->rhs())
-    {
-        remv = (rem_var *)(el->lhs())->attributeValue(0, REMOTE_VARIABLE);       
-        if (remv && remv->buffer && !strcmp(remv->buffer->identifier(), name))
-            return(remv->buffer);
-    }
-    return(NULL);
-}
-/*
-coeffs *BufferCoeffs(SgSymbol *sbuf,SgSymbol *ar)
-{int i,r,i0;
-char *name;
-coeffs *scoef = new coeffs;
-r=Rank(ar);
-i0 = opt_base ? 1 : 2;
-//if(opt_loop_range) i0=0;
-for(i=i0;i<=r+2;i++)
-{ name = new char[80];
-sprintf(name,"%s%s%d",sbuf->identifier(),"000",i);
-scoef->sc[i] =  new SgVariableSymb(name, *SgTypeInt(), *cur_func);
-//printf("%s",(scoef->sc[i])->identifier());
-}
-scoef->use = 0;
-return(scoef);
-}
-*/
-
-SgSymbol *RedGridSymbolInKernel(SgSymbol *s, int n, SgExpression *dimSizeArgs, SgExpression *lowBoundArgs, int is_red_or_loc_var)
-{
-    char *name;
-    SgSymbol *soff;
-    SgType *type;
-    SgValueExp M1(1), M0(0);
-    SgExpression  *M01 = new SgExpression(DDOT, &M0.copy(), new SgKeywordValExp("*"), NULL);
-
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 6));
-    sprintf(name, "%s_grid", s->identifier());
-    type = isSgArrayType(s->type()) ? s->type()->baseType() : s->type();
-    if (options.isOn(C_CUDA))
-        type = C_Type(type); //C_PointerType(C_Type(type));
-    if (is_red_or_loc_var == 1) // for reduction variable        
-    {
-        if (n > 0)
-        {
-            if (options.isOn(C_CUDA))
-                soff = ArraySymbol(name, type, (SgExpression *)&M0, kernel_st);
-            else
-            {
-                soff = ArraySymbol(name, type, new SgExpression(DDOT, &M0.copy(), &(*new SgVarRefExp(s_overall_blocks) - M1.copy()), NULL), kernel_st);
-                ((SgArrayType *)(soff->type()))->addRange(*new SgValueExp(n));
-            }
-        }
-        else if (n < 0)
-        {
-            if (options.isOn(C_CUDA))
-                soff = ArraySymbol(name, type, (SgExpression *)&M0, kernel_st);
-            else
-            {
-                SgExpression *sl, *bl;
-                soff = ArraySymbol(name, type, new SgExpression(DDOT, &M0.copy(), &(*new SgVarRefExp(s_overall_blocks) - M1.copy()), NULL), kernel_st);
-                ArrayTypeForRedVariableInKernel(s, soff->type(), dimSizeArgs, lowBoundArgs);
-            }
-        }
-        else
-            soff = options.isOn(C_CUDA) ? ArraySymbol(name, type, (SgExpression *)&M0, kernel_st) : ArraySymbol(name, type, M01, kernel_st);
-    }
-    else //for location variable
-    {
-        if (options.isOn(C_CUDA))
-            soff = ArraySymbol(name, type, (SgExpression *)&M0, kernel_st);
-        else
-        {
-            soff = ArraySymbol(name, type, new SgValueExp(n), kernel_st);
-            ((SgArrayType *)(soff->type()))->addRange(*M01);
-        }
-    }
-
-    return(soff);
-}
-
-SgExpression * RangeOfRedArray(SgSymbol *s, SgExpression *lowBound, SgExpression *dimSize, int i)
-{
-            SgExpression *edim = ((SgArrayType *) s->type())->sizeInDim(i);
-
-            if(edim->variant() != DDOT)
-            {  
-                edim = Calculate(edim);
-                if (edim->variant() == INT_VAL)
-                    return (edim);  
-                else
-                    return (&dimSize->copy());
-            } 
-            else
-            {     
-                    edim = new SgExpression(DDOT);
-                    edim->setLhs(lowBound->copy()); 
-                    edim->setRhs(dimSize->copy()+lowBound->copy()-*new SgValueExp(1)); 
-                    return (edim); 
-            }
-
-}
-
-void ArrayTypeForRedVariableInKernel(SgSymbol *s, SgType *type, SgExpression *dimSizeArgs, SgExpression *lowBoundArgs)
-{
-    SgExpression *sl, *bl;
-    int i; 
-
-    for (sl = dimSizeArgs, bl = lowBoundArgs, i = 0; sl; sl = sl->rhs(), bl = bl->rhs(), i++)
-        ((SgArrayType *) type)->addRange(*RangeOfRedArray(s, bl->lhs(), sl->lhs(), i ));    
-}
-
-SgSymbol *RedInitValSymbolInKernel(SgSymbol *s, SgExpression *dimSizeArgs, SgExpression *lowBoundArgs)
-{
-    char *name;
-    SgSymbol *soff;
-    SgType *type;
-    SgExpression *sl;
-   
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 6));
-    sprintf(name, "%s_init", s->identifier());
-    type = isSgArrayType(s->type()) ? s->type()->baseType() : s->type();
-    //if (options.isOn(C_CUDA))
-    //    type = C_PointerType(C_Type(type));
-
-    soff = ArraySymbol(name, type, NULL, kernel_st);
-    ArrayTypeForRedVariableInKernel(s, soff->type(), dimSizeArgs, lowBoundArgs); 
-
-    return(soff);
-}
-
-SgSymbol *RedVariableSymbolInKernel(SgSymbol *s, SgExpression *dimSizeArgs, SgExpression *lowBoundArgs)
-{
-    char *name;
-    SgSymbol *soff;
-    SgType *type;
-    SgExpression *edim;
-    int i, rank;
-    rank = Rank(s);
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 1));
-    sprintf(name, "%s", s->identifier());
-    type = isSgArrayType(s->type()) ? s->type()->baseType() : s->type();
-    if (options.isOn(C_CUDA))
-        type = C_Type(type);
-    if (rank > 0)
-    {
-        if (options.isOn(C_CUDA))
-        {
-            type = C_PointerType(type);
-            return(new SgVariableSymb(name, *type, *kernel_st));
-        }
-        soff = ArraySymbol(name, type, NULL, kernel_st);
-    }
-    else
-        return(new SgVariableSymb(name, *type, *kernel_st));
-    if (!dimSizeArgs)
-    {
-        if (!options.isOn(C_CUDA))
-        {
-            for (i = 0; i < rank; i++)
-            {
-                edim = ((SgArrayType *)(s->type()))->sizeInDim(i);
-                edim = CalculateArrayBound(edim, s, 0);
-                if (edim)
-                    ((SgArrayType *)(soff->type()))->addRange(edim->copy());
-            }
-        }
-        else
-        {
-            for (i = rank - 1; i >= 0; i--)
-            {
-                edim = ((SgArrayType *)(s->type()))->sizeInDim(i);
-                edim = CalculateArrayBound(edim, s, 0);
-                if (edim)
-                    ((SgArrayType *)(soff->type()))->addRange(edim->copy());
-            }
-        }
-    }
-    else
-        ArrayTypeForRedVariableInKernel(s, soff->type(), dimSizeArgs, lowBoundArgs);
-
-    return(soff);
-}
-
-SgSymbol *LocRedVariableSymbolInKernel(reduction_operation_list *rsl)
-{
-     SgType *declT;
-
-     if (isSgArrayType(rsl->locvar->type()))
-     {
-         SgArrayType *arrT = new SgArrayType(*C_Type(rsl->locvar->type()));
-         arrT->addDimension(new SgValueExp(rsl->number));
-         declT = arrT;
-     }
-     else
-         declT = C_Type(rsl->locvar->type());
-     return (new SgVariableSymb(rsl->locvar->identifier(), *declT, *kernel_st));
-}
-
-SgSymbol *SymbolInKernel(SgSymbol *s)
-{
-    char *name;
-    SgSymbol *soff;
-    SgType *type;
-    SgExpression *edim;
-    int i, rank;
-
-    if (!isSgArrayType(s->type()))  //scalar variable
-    {
-        if (!options.isOn(C_CUDA))
-            return s;
-        else
-            return new SgVariableSymb(s->identifier(), *C_Type(s->type()), *kernel_st);
-    }
-    rank = Rank(s);
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 1));
-    sprintf(name, "%s", s->identifier());
-    type = isSgArrayType(s->type()) ? s->type()->baseType() : s->type();
-    if (options.isOn(C_CUDA))
-        type = C_Type(type);
-    soff = ArraySymbol(name, type, NULL, kernel_st);
-    if (!options.isOn(C_CUDA))
-    for (i = 0; i < rank; i++)
-    {
-        edim = ((SgArrayType *)(s->type()))->sizeInDim(i);
-        edim = CalculateArrayBound(edim, s, 1);
-        if (edim)
-            ((SgArrayType *)(soff->type()))->addRange(edim->copy());
-    }
-    else
-    for (i = rank - 1; i >= 0; i--)
-    {
-        edim = ((SgArrayType *)(s->type()))->sizeInDim(i);
-        edim = CalculateArrayBound(edim, s, 1);
-        if (edim)
-            ((SgArrayType *)(soff->type()))->addRange(edim->copy());
-    }
-
-    return(soff);
-}
-
-SgExpression *CalculateArrayBound(SgExpression *edim, SgSymbol *ar, int flag_private)
-{
-    SgSubscriptExp *sbe;
-    SgExpression *low;
-    if (!edim && flag_private)
-    {
-        // Error("Illegal array bound of private/reduction array %s", ar->identifier(), 442, dvm_parallel_dir);
-        return (edim);
-    }
-    if ((sbe = isSgSubscriptExp(edim)) != NULL){    //DDOT
-
-        if (!sbe->ubound() && flag_private)
-        {
-           // Error("Illegal array bound of private/reduction array %s", ar->identifier(), 442, dvm_parallel_dir);
-            return(edim);
-        }
-
-        if (options.isOn(C_CUDA) && for_kernel)
-        {
-            low = CalculateArrayBound(sbe->lbound(), ar, flag_private);
-            if (!low)
-                low = new SgValueExp(1);
-            edim = CalculateArrayBound(&((sbe->ubound()->copy()) - (low->copy()) + *new SgValueExp(1)), ar, flag_private);
-            return(edim);
-        }
-        else
-        {
-            edim = new SgExpression(DDOT);
-            edim->setLhs(CalculateArrayBound(sbe->lbound(), ar, flag_private));
-            edim->setRhs(CalculateArrayBound(sbe->ubound(), ar, flag_private));
-            return(edim);
-        }
-    }
-    else
-    {
-        edim = Calculate(edim);
-      //  if (edim->variant() != INT_VAL && flag_private )
-      //      Error("Illegal array bound of private/reduction array %s", ar->identifier(), 442, dvm_parallel_dir);
-        return (edim);
-    }
-}
-
-
-SgSymbol *LocalPartSymbolInKernel(SgSymbol *ar)
-{
-    char *name;
-    SgSymbol *s_part;
-    SgValueExp M0(0);
-    SgExpression  *M2R = new SgExpression(DDOT, &M0.copy(), new SgValueExp(2 * Rank(ar) - 1), NULL);
-    name = (char *)malloc((unsigned)(strlen(ar->identifier()) + 6));
-    sprintf(name, "%s_part", ar->identifier());
-
-    s_part = ArraySymbol(name, CudaIndexType(), M2R, kernel_st);
-    return(s_part);
-}
-
-
-SgSymbol *LocalPartArray(SgSymbol *ar)
-{
-    local_part_list *pl;
-    for (pl = lpart_list; pl; pl = pl->next)
-    if (pl->dvm_array == ar)
-        return(pl->local_part);
-    //creating local part array
-    pl = new local_part_list;
-    pl->dvm_array = ar;
-    pl->local_part = LocalPartSymbolInKernel(ar);
-    pl->next = lpart_list;
-    lpart_list = pl;
-    return(pl->local_part);
-}
-
-SgExpression *LocalityConditionInKernel(SgSymbol *ar, SgExpression *ei[])
-{
-    SgExpression *cond;
-    int N, i;
-    SgSymbol *part;
-
-    N = Rank(ar);
-
-    //           ar_part(0) .le. ei[N-1] .and.      ar_part(1) .ge. ei[N-1]
-    // .and.     ar_part(2) .le. ei[N-2] .and.      ar_part(3) .ge. ei[N-2]
-    //     . . .
-    // .and. ar_part(2*N-2) .le. ei[0]   .and.  ar_part(2*N-1) .ge. ei[0]   
-
-    part = LocalPartArray(ar);
-
-    cond = &operator && (operator <= (*VECTOR_REF(part, 0), *ei[N - 1]), operator >= (*VECTOR_REF(part, 1), *ei[N - 1]));
-    for (i = 1; i < N; i++)
-        cond = &operator && (*cond, operator && (operator <= (*VECTOR_REF(part, 2 * i), *ei[N - 1 - i]), operator >= (*VECTOR_REF(part, 2 * i + 1), *ei[N - 1 - i])));
-
-    return(cond);
-
-}
-
-void InsertInKernel_NewStatementAfter(SgStatement *stat, SgStatement *current, SgStatement *cp)
-{
-    SgStatement *st;
-
-    st = current;
-    if (current->variant() == LOGIF_NODE)   // Logical IF
-        st = current->lexNext();
-    if (cp->variant() == LOGIF_NODE)
-        LogIf_to_IfThen(cp);
-    st->insertStmtAfter(*stat, *cp);
-    cur_in_kernel = stat;
-}
-
-SgExpression *ConditionForRedBlack(SgExpression *erb)
-{
-    return(&SgEqOp(*IandFunction(erb, new SgValueExp(1)), *new SgValueExp(0)));
-}
-
-SgExpression *KernelCondition(SgSymbol *sind, SgSymbol *sblock, int level)
-{
-    SgExpression *cond;
-    int N;
-    // i .le. blocks(ibof + N), N = 1 + 2*level 
-
-    N = 1 + 2 * level;
-    cond = &operator <= (*new SgVarRefExp(sind), *blocksRef(sblock, N)); //  *new SgArrayRefExp(*base, (*new SgVarRefExp(s_ibof)+(*new SgValueExp(N)))  ) );
-    return(cond);
-}
-
-SgExpression *KernelCondition2(SgStatement *dost, int level)
-{
-    SgExpression *cond = NULL;
-    SgSymbol *sind = NULL;
-    int istep;
-    // <ind_level> .le. end_<level>
-
-    sind = dost->symbol();
-    istep = IConstStep(dost);
-    if (istep > 0)
-        cond = &operator <= (*new SgVarRefExp(sind), *new SgVarRefExp(s_end[level - 1]));
-    else if (istep < 0)
-        cond = &operator >= (*new SgVarRefExp(sind), *new SgVarRefExp(s_end[level - 1]));
-    else   
-    {
-       SgExpression *eStepLt0  = &operator <  (*new SgVarRefExp(s_loopStep[level - 1]), *new SgValueExp(0)); 
-       SgExpression *eStepGt0  = &operator >  (*new SgVarRefExp(s_loopStep[level - 1]), *new SgValueExp(0)); 
-       SgExpression *eIndLeEnd = &operator <= (*new SgVarRefExp(sind), *new SgVarRefExp(s_end[level - 1]));
-       SgExpression *eIndGeEnd = &operator >= (*new SgVarRefExp(sind), *new SgVarRefExp(s_end[level - 1]));
-
-       cond =  &operator || (operator && (*eStepLt0,*eIndGeEnd), operator && (*eStepGt0,*eIndLeEnd));
-    }
-
-    return(cond);
-}
-
-SgExpression *KernelConditionWithDoStep(SgStatement *stdo, SgSymbol *sblock, int level)
-{
-    SgExpression *cond = NULL;
-    SgSymbol *sind = stdo->symbol();
-    int N, istep;
-
-    // i .le. blocks(ibof + N), N = 1 + 2*level , do-step is literal constant > 0  
-    // i .ge. blocks(ibof + N), N = 1 + 2*level , do-step is literal constant < 0
-    // (<do-step> .gt.0 and i .le. blocks(ibof+N)) .or.  (<do-step> .lt.0 and i .ge. blocks(ibof+N)), otherwise
-
-    N = 1 + 2 * level;
-    //do_step = ((SgForStmt *)stdo)->step();
-    istep = IConstStep(stdo);
-    if (istep >= 0)
-        cond = &operator <= (*new SgVarRefExp(sind), *blocksRef(sblock, N));
-    else if (istep < 0)
-        cond = &operator >= (*new SgVarRefExp(sind), *blocksRef(sblock, N));
-    //else   !!! not implemented
- 
-    return(cond);
-}
-
-
-SgStatement *doIfThenConstrForKernel(SgExpression *cond, SgStatement *if_st)
-{
-    SgStatement *if_res = NULL;
-    // SgExpression *ea;
-    // creating
-    //          IF ( <cond>) THEN
-    //                <if_st>
-    //          ENDIF 
-    // 
-
-    if_res = new SgIfStmt(*cond, *if_st);
-
-    //  ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
-    return(if_res);
-}
-
-
-void CreateGPUModule()
-{
-    SgStatement *fileHeaderSt = NULL;
-    SgStatement *st_mod = NULL, *st_end = NULL;
-
-    fileHeaderSt = current_file->firstStatement();
-    if (mod_gpu_symb)
-        return;
-
-    mod_gpu_symb = GPUModuleSymb(fileHeaderSt);
-
-    st_mod = new SgStatement(MODULE_STMT);
-    st_mod->setSymbol(*mod_gpu_symb);
-    st_end = new SgStatement(CONTROL_END);
-    st_end->setSymbol(*mod_gpu_symb);
-    fileHeaderSt->insertStmtAfter(*st_mod, *fileHeaderSt);
-    st_mod->insertStmtAfter(*st_end, *st_mod);
-    //!!!st_use = new SgStatement(USE_STMT);
-    //!!!st_use->setSymbol(*CudaforSymb(fileHeaderSt));
-    //!!!st_mod->insertStmtAfter(*st_use,*st_mod);
-    if (options.isOn(C_CUDA))
-        st_mod->insertStmtAfter(*new SgStatement(COMMENT_STAT), *st_mod);
-    else
-        st_mod->insertStmtAfter(*new SgStatement(CONTAINS_STMT), *st_mod);
-    mod_gpu = st_mod;
-    cur_in_mod = st_mod->lexNext();
-    //cur_in_mod = options.isOn(C_CUDA) ? st_mod : st_mod->lexNext(); // contains statement or module statement
-    mod_gpu_end = st_end;  // end of module 
-
-    CudaVars();
-    SymbolOfCudaIndexType();             
-
-    KernelBaseMemorySymbols();
-    KernelBloksSymbol();
-    KernelWorkSymbols();
-    return;
-}
-
-//---------------------------------------------------------------------------------
-// create CUDA kernel 
-SgStatement *CreateLoopKernel(SgSymbol *skernel, SgType *indexTypeInKernel)
-{
-    int nloop;
-    SgStatement *st = NULL, *st_end = NULL;
-    SgExpression *fe = NULL;
-    SgSymbol *s_red_count_k = NULL;
-
-    if (!skernel)
-        return(NULL);
-    nloop = ParLoopRank();
-
-    // create kernel procedure for loop in Fortran-Cuda language or kernel function in C_Cuda     
-    // creating Header and End Statement of Kernel
-    if (options.isOn(C_CUDA))
-    {
-        kernel_st = Create_C_Kernel_Function(skernel);
-        fe = kernel_st->expr(0);
-    }
-    else
-        kernel_st = CreateKernelProcedure(skernel);
-
-    kernel_st->addComment(LoopKernelComment());
-    st_end = kernel_st->lexNext();
-    cur_in_kernel = st = kernel_st;
-
-    // creating variables and making structures for reductions
-    CompleteStructuresForReductionInKernel();
-
-    if (red_list)
-        s_red_count_k = RedCountSymbol(kernel_st);
-
-    if (options.isOn(NO_BL_INFO))
-    {
-        BeginEndBlocksSymbols(nloop);
-    }
-
-    // create  dummy argument list of kernel:
-    if (options.isOn(C_CUDA))
-        fe->setLhs(CreateKernelDummyList(NULL, indexTypeInKernel));
-    else
-        // create dummy argument list and add it to kernel header statement (Fortran-Cuda)
-        kernel_st->setExpression(0, *CreateKernelDummyList(s_red_count_k, indexTypeInKernel));
-
-    // generating block of index variables calculation 
-    if (!options.isOn(NO_BL_INFO))
-    {
-        st = Assign_To_ibof(nloop);
-        cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-        cur_in_kernel = st;
-    }
-
-    // generating assign statements for MAXLOC, MINLOC reduction operations and array reduction operations
-    if (red_list)
-        Do_Assign_For_Loc_Arrays();   //the statements are inserted after kernel_st
-
-
-    // looking through the loop nest
-    // generate block to calculate values of thread's loop variables
-    //vl = stmt->expr(2); // do_variables list
-    CreateBlockForCalculationThreadLoopVariables();
-
-    for_kernel = 1;
-
-    // inserting loop body to innermost IF statement of BlockForCalculationThreadLoopVariables
-    {
-        SgStatement *stk, *last, *block, *st;
-        SaveLineNumbers(loop_body);
-        block = CreateIfForRedBlack(loop_body, nloop);
-        last = cur_in_kernel->lexNext();
-
-        cur_in_kernel->insertStmtAfter(*block, *cur_in_kernel); //cur_in_kernel is innermost IF statement
-        if (options.isOn(C_CUDA))
-            block->addComment("// Loop body");
-        else
-            block->addComment("! Loop body\n");
-
-        // correct copy of loop_body (change or extract last statement of block if it is CONTROL_END)
-        stk = (block != loop_body) ? last->lexPrev()->lexPrev() : last->lexPrev();
-
-        if (stk->variant() == CONTROL_END)
-        {
-            if (stk->hasLabel() || stk == loop_body)  // when body of DO_ENDDO loop is empty, stk == loop_body 
-                stk->setVariant(CONT_STAT);
-            else
-            {
-                st = stk->lexPrev();
-                stk->extractStmt();
-                stk = st;
-            }
-        }
-        ReplaceExitCycleGoto(block, stk);
-
-        last = cur_st;
-
-        TranslateBlock(cur_in_kernel);  
-
-        if (options.isOn(C_CUDA))
-        {
-            swapDimentionsInprivateList();
-            std::vector < std::stack < SgStatement*> > zero = std::vector < std::stack < SgStatement*> >(0);
-            Translate_Fortran_To_C(cur_in_kernel, cur_in_kernel->lastNodeOfStmt(), zero, 0);
-        }
-
-        cur_st = last;
-    }
-
-    // generating reduction calculation blocks
-    if (red_list)
-        CreateReductionBlocks(st_end, nloop, red_list, s_red_count_k);
-
-    // make declarations
-    if (options.isOn(C_CUDA))
-        MakeDeclarationsForKernel_On_C(indexTypeInKernel);
-    else // Fortran-Cuda
-        MakeDeclarationsForKernel(s_red_count_k, indexTypeInKernel);
-
-    // inserting IMPLICIT NONE
-    if (!options.isOn(C_CUDA)) // Fortran-Cuda
-        kernel_st->insertStmtAfter(*new SgStatement(IMPL_DECL), *kernel_st);
-    if (options.isOn(C_CUDA))
-        RenamingCudaFunctionVariables(kernel_st, skernel, 1);
-    for_kernel = 0;
-
-    return kernel_st;
-}
-
-SgExpression *CreateKernelDummyList(SgSymbol *s_red_count_k, std::vector<SgSymbol*> &lowI, std::vector<SgSymbol*> &highI, std::vector<SgSymbol*> &stepI)
-{
-    SgExpression  *arg_list, *ae;
-    //SgExpression *eln = new SgExprListExp();
-    //int pl_rank = ParLoopRank();
-
-    arg_list = NULL;
-
-    arg_list = AddListToList(CreateArrayDummyList(), CreateRedDummyList());
-    //   base_ref + <array_coeffs> ...
-    // + <red_var[_1]> [+red_var_2+...+red_var_M] + <red>_grid  [ + <loc_var_1>...<loc_var_N>] 
-
-    if (s_red_count_k)                                           //[+ 'red_count']
-    {
-        ae = new SgExprListExp(*new SgVarRefExp(s_red_count_k));
-        arg_list = AddListToList(arg_list, ae);
-    }
-    //[+ 'overall_blocks']
-    if (s_overall_blocks)
-    {
-        ae = new SgExprListExp(*new SgVarRefExp(s_overall_blocks));
-        arg_list = AddListToList(arg_list, ae);
-    }
-    if (uses_list)
-        arg_list = AddListToList(arg_list, CreateUsesDummyList()); //[+ <uses> ]
-    if (private_list)
-        arg_list = AddListToList(arg_list, CreatePrivateDummyList()); //[+ dummys for private arrays ]
-    for (size_t i = 0; i < lowI.size(); ++i)
-    {
-        ae = new SgExprListExp(*new SgVarRefExp(lowI[i]));
-        arg_list = AddListToList(arg_list, ae);
-        ae = new SgExprListExp(*new SgVarRefExp(highI[i]));
-        arg_list = AddListToList(arg_list, ae);
-        ae = new SgExprListExp(*new SgVarRefExp(stepI[i]));
-        arg_list = AddListToList(arg_list, ae);
-    }
-    return(arg_list);
-}
-
-void MakeDeclarationsForKernelGpuO1(SgSymbol *red_count_symb, SgType *idxTypeInKernel)
-{
-    SgExpression *var;
-    SgStatement *st;
-
-    // declare called functions
-    DeclareCalledFunctions();
-
-    // declare index variablex for reduction array
-    for (var = kernel_index_var_list; var; var = var->rhs())
-    {
-        st = var->lhs()->symbol()->makeVarDeclStmt();
-        kernel_st->insertStmtAfter(*st);
-    }
-
-    // declare do_variables
-    DeclareDoVars();
-
-    // declare private(local in kernel) variables
-    DeclarePrivateVars(idxTypeInKernel);
-
-    // declare dummy arguments:
-    // declare reduction dummy arguments
-    DeclareDummyArgumentsForReductions(red_count_symb, idxTypeInKernel);
-
-    // declare array coefficients
-    //TODO: add type
-    DeclareArrayCoeffsInKernel(NULL);
-
-    // declare bases for arrays 
-    DeclareArrayBases();
-
-    // declare  variables, used in loop
-    DeclareUsedVars();
-}
-
-void MakeDeclarationsForKernel_On_C_GpuO1()
-{
-    // declare do_variables
-    DeclareDoVars();
-
-    // declare private(local in kernel) variables    
-    DeclarePrivateVars();
-
-    // declare  variables, used in loop and passed by reference:
-    // <type> &<name> = *p_<name>; 
-    DeclareUsedVars();
-}
-
-// TODO: replace type CudaIndexType by __indexTypeInt and __indexTypeLLong
-SgStatement *CreateLoopKernel(SgSymbol *skernel, AnalyzeReturnGpuO1 &infoGpuO1, SgType *idxTypeInKernel) // create CUDA kernel with gpuO1	 
-{
-    int nloop;
-    SgStatement *st, *st_end;
-    SgExpression *fe = NULL;
-    SgSymbol *s_red_count_k = NULL;
-
-    if (!skernel)
-        return(NULL);
-    nloop = ParLoopRank();
-
-    // create kernel procedure for loop in Fortran-Cuda language or kernel function in C_Cuda     
-    // creating Header and End Statement of Kernel
-    if (options.isOn(C_CUDA))
-    {
-        kernel_st = Create_C_Kernel_Function(skernel);
-        fe = kernel_st->expr(0);
-    }
-    else
-        kernel_st = CreateKernelProcedure(skernel);
-
-    kernel_st->addComment(LoopKernelComment());
-    st_end = kernel_st->lexNext();
-    cur_in_kernel = st = kernel_st;
-
-    // creating variables and making structures for reductions
-    CompleteStructuresForReductionInKernel();
-
-    if (red_list)
-        s_red_count_k = RedCountSymbol(kernel_st);
-
-    std::vector<SgSymbol* > idxs;
-    SgExpression *expr = dvm_parallel_dir->expr(2);
-    while (expr)
-    {
-        idxs.push_back(expr->lhs()->symbol());
-        expr = expr->rhs();
-    }
-    int InternalPosition = -1;
-    for (size_t i = 0; i < infoGpuO1.allArrayGroup.size(); ++i)
-    {
-        for (size_t k = 0; k < infoGpuO1.allArrayGroup[i].allGroups.size(); ++k)
-        {
-            if (infoGpuO1.allArrayGroup[i].allGroups[k].tableNewVars.size() != 0)
-            {
-                InternalPosition = infoGpuO1.allArrayGroup[i].allGroups[k].position;
-                break;
-            }
-        }
-    }
-    // generating if block of index variables 
-    SgIfStmt *beforeIf = NULL;
-    SgIfStmt *inIf = NULL;
-    SgIfStmt *afterIf = NULL;
-    SgForStmt *doSt = NULL;
-
-    SgStatement *st3 = new SgStatement(IF_NODE);
-    SgStatement *st4 = new SgStatement(IF_NODE);
-    SgStatement *st5 = new SgStatement(IF_NODE);
-    SgStatement *st6 = new SgStatement(IF_NODE);
-
-    std::vector<SgSymbol*> stepI;
-    std::vector<SgSymbol*> lowI;
-    std::vector<SgSymbol*> highI;
-    const char *cuda_block[3] = { "z", "y", "x" };
-
-    {
-        SgIfStmt *ifSt = NULL;
-        for (int i = 0, k = 0; i < nloop; ++i)
-        {
-            char *bufStep = new char[strlen(idxs[i]->identifier()) + 16];
-            char *bufLow = new char[strlen(idxs[i]->identifier()) + 16];
-            char *bufHigh = new char[strlen(idxs[i]->identifier()) + 16];
-
-            bufStep[0] = bufLow[0] = bufHigh[0] = '\0';
-            strcat(bufStep, idxs[i]->identifier());
-            strcat(bufStep, "_step");
-            strcat(bufLow, idxs[i]->identifier());
-            strcat(bufLow, "_low");
-            strcat(bufHigh, idxs[i]->identifier());
-            strcat(bufHigh, "_high");
-
-            if (options.isOn(C_CUDA))
-            {
-                stepI.push_back(new SgSymbol(VARIABLE_NAME, bufStep, *C_DvmType(), *kernel_st));
-                lowI.push_back(new SgSymbol(VARIABLE_NAME, bufLow, *C_DvmType(), *kernel_st));
-                highI.push_back(new SgSymbol(VARIABLE_NAME, bufHigh, *C_DvmType(), *kernel_st));
-            }
-            else
-            {
-                stepI.push_back(new SgSymbol(VARIABLE_NAME, bufStep));
-                lowI.push_back(new SgSymbol(VARIABLE_NAME, bufLow));
-                highI.push_back(new SgSymbol(VARIABLE_NAME, bufHigh));
-            }
-
-            if (i != nloop - 1 - InternalPosition)
-            {
-                if (k == 0)
-                {
-                    ifSt = new SgIfStmt(IF_NODE);
-                    ifSt->setExpression(0, *new SgVarRefExp(*idxs[i]) <= *new SgVarRefExp(*highI[i]));
-                    st = ifSt;
-                    k++;
-                }
-                else
-                    ifSt = new SgIfStmt(*new SgVarRefExp(*idxs[i]) <= *new SgVarRefExp(*highI[i]), *ifSt);
-            }
-        }
-        cur_in_kernel->insertStmtAfter(*ifSt, *kernel_st);
-        cur_in_kernel = st;
-
-        SgStatement *keyAssign = AssignStatement(new SgVarRefExp(idxs[nloop - 1 - InternalPosition]), new SgVarRefExp(lowI[nloop - 1 - InternalPosition]));
-
-        for (int i = 0, k = 0; i < nloop; ++i, ++k)
-        {
-            if (i != nloop - 1 - InternalPosition)
-            {
-                if (options.isOn(C_CUDA))
-                    st = AssignStatement(new SgVarRefExp(*idxs[i]), &(*new SgVarRefExp(*stepI[i]) * ((*new SgRecordRefExp(*s_blockidx, cuda_block[k])) *
-                    *new SgRecordRefExp(*s_blockdim, cuda_block[k]) + *new SgRecordRefExp(*s_threadidx, cuda_block[k])) +
-                    *new SgVarRefExp(*lowI[i])));
-                else
-                    st = AssignStatement(new SgVarRefExp(*idxs[i]), &(*new SgVarRefExp(*stepI[i]) * ((*new SgRecordRefExp(*s_blockidx, cuda_block[k]) - *new SgValueExp(1)) *
-                    *new SgRecordRefExp(*s_blockdim, cuda_block[k]) + *new SgRecordRefExp(*s_threadidx, cuda_block[k]) - *new SgValueExp(1)) +
-                    *new SgVarRefExp(*lowI[i])));
-                ifSt->insertStmtBefore(*st, *kernel_st);
-            }
-        }
-
-        st = new SgStatement(IF_NODE);
-        doSt = new SgForStmt(*idxs[nloop - 1 - InternalPosition], *new SgVarRefExp(*lowI[nloop - 1 - InternalPosition]), *new SgVarRefExp(*highI[nloop - 1 - InternalPosition]), *new SgVarRefExp(*stepI[nloop - 1 - InternalPosition]), *st);
-        cur_in_kernel->insertStmtAfter(*doSt);
-        cur_in_kernel = doSt;
-        st->deleteStmt();
-
-        SgStatement *st1 = new SgStatement(IF_NODE);
-        SgStatement *st2 = new SgStatement(IF_NODE);
-        beforeIf = new SgIfStmt(*new SgVarRefExp(*stepI[nloop - 1 - InternalPosition]) > *new SgValueExp(0), *st1, *st2);
-        inIf = new SgIfStmt(*new SgVarRefExp(*stepI[nloop - 1 - InternalPosition]) > *new SgValueExp(0), *st3, *st4);
-        afterIf = new SgIfStmt(*new SgVarRefExp(*stepI[nloop - 1 - InternalPosition]) > *new SgValueExp(0), *st5, *st6);
-
-        for (size_t i = 0; i < infoGpuO1.allArrayGroup.size(); ++i)
-        {
-            for (size_t k = 0; k < infoGpuO1.allArrayGroup[i].allGroups.size(); ++k)
-            {
-                if (infoGpuO1.allArrayGroup[i].allGroups[k].position == InternalPosition)
-                {
-                    for (size_t m = 0; m < infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr.size(); ++m)
-                    {
-                        for (size_t p = 0; p < infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.loadsBeforePlus.size(); ++p)
-                            beforeIf->insertStmtAfter(*infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.loadsBeforePlus[p]->copyPtr());
-                        for (size_t p = 0; p < infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.loadsBeforeMinus.size(); ++p)
-                            beforeIf->falseBody()->insertStmtBefore(*infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.loadsBeforeMinus[p]->copyPtr());
-
-                        for (size_t p = 0; p < infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.loadsInForPlus.size(); ++p)
-                            inIf->insertStmtAfter(*infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.loadsInForPlus[p]);
-                        for (size_t p = 0; p < infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.loadsInForMinus.size(); ++p)
-                            inIf->falseBody()->insertStmtBefore(*infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.loadsInForMinus[p]);
-
-                        size_t sizeP = infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.swapsDown.size() - 1;
-                        for (size_t p = 0; p < infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.swapsDown.size(); ++p)
-                            afterIf->insertStmtAfter(*infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.swapsDown[sizeP - p]);
-                        for (size_t p = 0; p < infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.swapsUp.size(); ++p)
-                            afterIf->falseBody()->insertStmtBefore(*infoGpuO1.allArrayGroup[i].allGroups[k].allPosGr[m].replaceInfo.swapsUp[p]);
-                    }
-                }
-            }
-        }
-        doSt->insertStmtBefore(*beforeIf);
-        st1->deleteStmt();
-        st2->deleteStmt();
-        beforeIf->insertStmtBefore(*keyAssign);
-    }
-
-    // create  dummy argument list of kernel:
-    if (options.isOn(C_CUDA))
-        fe->setLhs(CreateKernelDummyList(NULL, lowI, highI, stepI));
-    else // create dummy argument list and add it to kernel header statement (Fortran-Cuda)		 
-        kernel_st->setExpression(0, *CreateKernelDummyList(s_red_count_k, lowI, highI, stepI));
-
-    // generating assign statements for MAXLOC, MINLOC reduction operations and array reduction operations
-    if (red_list)
-        Do_Assign_For_Loc_Arrays();   //the statements are inserted after kernel_st
-
-    //CreateBlockForCalculationThreadLoopVariables();
-
-    for_kernel = 1;
-
-    // inserting loop body to innermost IF statement of BlockForCalculationThreadLoopVariables
-
-    {
-        SgStatement *stk, *last, *block, *st;
-        SaveLineNumbers(loop_body);
-        block = CreateIfForRedBlack(loop_body, nloop);
-        last = cur_in_kernel->lexNext();
-
-        cur_in_kernel->insertStmtAfter(*block, *cur_in_kernel); //cur_in_kernel is innermost IF statement
-        if (options.isOn(C_CUDA))
-            block->addComment("// Loop body");
-        else
-            block->addComment("! Loop body\n");
-
-        // correct copy of loop_body (change or extract last statement of block if it is CONTROL_END)
-        stk = (block != loop_body) ? last->lexPrev()->lexPrev() : last->lexPrev();
-
-        if (stk->variant() == CONTROL_END)
-        {
-            if (stk->hasLabel())
-                stk->setVariant(CONT_STAT);
-            else
-            {
-                st = stk->lexPrev();
-                stk->extractStmt();
-                stk = st;
-            }
-        }
-
-        ReplaceExitCycleGoto(block, stk);
-
-        last = cur_st;
-
-        doSt->insertStmtAfter(*inIf, *doSt);
-        doSt->lastExecutable()->insertStmtAfter(*afterIf, *doSt);
-        st3->deleteStmt();
-        st4->deleteStmt();
-        st5->deleteStmt();
-        st6->deleteStmt();
-
-        cur_in_kernel = beforeIf;
-        TranslateBlock(cur_in_kernel);
-        TranslateBlock(doSt);
-
-        if (options.isOn(C_CUDA))
-        {
-            swapDimentionsInprivateList();
-            std::vector < std::stack < SgStatement*> > zero = std::vector < std::stack < SgStatement*> >(0);
-            Translate_Fortran_To_C(cur_in_kernel->controlParent(), cur_in_kernel->controlParent()->lastNodeOfStmt(), zero, 0);
-        }
-
-        cur_st = last;
-    }
-
-    // generating reduction calculation blocks
-    if (red_list)
-        CreateReductionBlocks(st_end, nloop, red_list, s_red_count_k);
-
-    // make declarations
-    if (options.isOn(C_CUDA))
-        MakeDeclarationsForKernel_On_C_GpuO1();
-    else // Fortran-Cuda
-        MakeDeclarationsForKernelGpuO1(s_red_count_k, idxTypeInKernel);
-
-    if (!options.isOn(C_CUDA))
-    {
-        for (size_t i = 0; i < lowI.size(); ++i)
-        {
-            if (i == 0)
-            {
-                st = lowI[i]->makeVarDeclStmt();
-                st->setExpression(2, *new SgExprListExp(*new SgExpression(ACC_VALUE_OP)));
-                kernel_st->insertStmtAfter(*st);
-            }
-            else
-                addDeclExpList(lowI[i], st->expr(0));
-        }
-
-        for (size_t i = 0; i < highI.size(); ++i)
-        {
-            if (i == 0)
-            {
-                st = highI[i]->makeVarDeclStmt();
-                st->setExpression(2, *new SgExprListExp(*new SgExpression(ACC_VALUE_OP)));
-                kernel_st->insertStmtAfter(*st);
-            }
-            else
-                addDeclExpList(highI[i], st->expr(0));
-        }
-
-        for (size_t i = 0; i < stepI.size(); ++i)
-        {
-            if (i == 0)
-            {
-                st = stepI[i]->makeVarDeclStmt();
-                st->setExpression(2, *new SgExprListExp(*new SgExpression(ACC_VALUE_OP)));
-                kernel_st->insertStmtAfter(*st);
-            }
-            else
-                addDeclExpList(stepI[i], st->expr(0));
-        }
-    }
-    // inserting IMPLICIT NONE
-    if (!options.isOn(C_CUDA)) // Fortran-Cuda
-        kernel_st->insertStmtAfter(*new SgStatement(IMPL_DECL), *kernel_st);
-
-    if (options.isOn(C_CUDA))
-        RenamingCudaFunctionVariables(kernel_st, skernel, 1);
-
-    for_kernel = 0;
-
-    return(kernel_st);
-}
-
-void ReplaceExitCycleGoto(SgStatement *block, SgStatement *stk)
-{
-    SgStatement *stmt, *last, *new_st;
-
-    SgLabel *last_lab = NULL;
-    SgLabel *lb;
-    stmt_list *labeled_list = NULL;
-    int label_flag = 0;
-    int i, pl_rank;
-
-    pl_rank = ParLoopRank();
-    last = stk->lexNext();
-    for (stmt = block; stmt != last; stmt = stmt->lexNext())
-    { // do list of  statement with label 
-        if (stmt->hasLabel())
-            labeled_list = addToStmtList(labeled_list, stmt);
-
-    }
-    for (stmt = block; stmt != last; stmt = stmt->lexNext())
-    {
-        if (isSgGotoStmt(stmt) && !IsInLabelList(((SgGotoStmt *)stmt)->branchLabel(), labeled_list) || isSgCycleStmt(stmt) && !isInLoop(stmt) || isSgExitStmt(stmt) && !isInLoop(stmt))
-        {
-            label_flag = 1;  break;
-        }
-
-        if (isSgArithIfStmt(stmt))
-        {
-            SgExpression *lbe = stmt->expr(1);
-            for (i = 0; lbe; lbe = lbe->rhs(), i++)
-            {
-                lb = ((SgLabelRefExp *)(lbe->lhs()))->label();
-                if (!IsInLabelList(lb, labeled_list))
-                {
-                    label_flag = 1;  break;
-                }
-            }
-        }
-        if (isSgAssignedGotoStmt(stmt) || isSgComputedGotoStmt(stmt))
-        {
-            SgExpression *lbe = stmt->expr(0);
-            for (i = 0; lbe; lbe = lbe->rhs(), i++)
-            {
-                lb = ((SgLabelRefExp *)(lbe->lhs()))->label();
-                if (!IsInLabelList(lb, labeled_list))
-                {
-                    label_flag = 1;  break;
-                }
-            }
-        }
-
-    }
-
-    if (!label_flag) return; 
-    if (stk->variant() == CONT_STAT && stk->hasLabel())
-        last_lab = stk->label();
-    else
-    {
-        last_lab = GetLabel();
-        if (stk->variant() == CONT_STAT)
-            stk->setLabel(*last_lab);
-        else
-        {
-            new_st = new SgStatement(CONT_STAT);
-            stk->insertStmtAfter(*new_st, *last->controlParent());
-            new_st->setLabel(*last_lab);
-        }
-    }
-
-    for (stmt = block; stmt != last; stmt = stmt->lexNext())
-    {
-        if (isSgGotoStmt(stmt) && !IsInLabelList((lb = ((SgGotoStmt *)stmt)->branchLabel()), labeled_list))
-        {
-            if (testLabelUse(lb, pl_rank, stmt))
-                stmt->setExpression(2, *new SgLabelRefExp(*last_lab));
-            continue;
-        }
-        if (isSgCycleStmt(stmt) && !isInLoop(stmt) || isSgExitStmt(stmt) && !isInLoop(stmt))
-        {
-            new_st = new SgGotoStmt(*last_lab);
-            (stmt->lexPrev())->insertStmtAfter(*new_st, *stmt->controlParent());
-            if (stmt->hasLabel())
-                new_st->setLabel(*stmt->label());
-            if (stmt->comments())
-                new_st->setComments(stmt->comments());
-            stmt->extractStmt();
-            stmt = new_st;
-            continue;
-        }
-
-        if (isSgArithIfStmt(stmt))
-        {
-            SgExpression *lbe = stmt->expr(1);
-            for (i = 0; lbe; lbe = lbe->rhs(), i++)
-            {
-                lb = ((SgLabelRefExp *)(lbe->lhs()))->label();
-                if (!IsInLabelList(lb, labeled_list) && testLabelUse(lb, pl_rank, stmt))
-                    lbe->setLhs(new SgLabelRefExp(*last_lab));
-            }
-            continue;
-        }
-        if (isSgAssignedGotoStmt(stmt) || isSgComputedGotoStmt(stmt))
-        {
-            SgExpression *lbe = stmt->expr(0);
-            for (i = 0; lbe; lbe = lbe->rhs(), i++)
-            {
-                lb = ((SgLabelRefExp *)(lbe->lhs()))->label();
-                if (!IsInLabelList(lb, labeled_list) && testLabelUse(lb, pl_rank, stmt))
-                    lbe->setLhs(new SgLabelRefExp(*last_lab));
-            }
-            continue;
-        }
-    }
-
-}
-
-int IsParDoLabel(SgLabel *lab, int pl_rank)
-{
-    SgStatement *stmt;
-    int i;
-    for (i = pl_rank, stmt = first_do_par; i; i--, stmt = stmt->lexNext())
-    if (((SgForStmt *)stmt)->endOfLoop() == lab)
-        return(1);
-    return(0);
-}
-
-int IsInLabelList(SgLabel *lab, stmt_list *labeled_list)
-{
-    stmt_list *stl;
-    for (stl = labeled_list; stl; stl = stl->next)
-    if (stl->st->label() == lab)
-        return(1);
-    return(0);
-}
-
-int isInLoop(SgStatement *stmt)
-{
-    SgStatement *parent = stmt->controlParent();
-    while (parent->variant() != FOR_NODE && parent->variant() != WHILE_NODE)
-    if (parent == current_file->firstStatement())
-        return(0);
-    else
-        parent = parent->controlParent();
-    return(1);
-
-}
-
-int testLabelUse(SgLabel *lb, int pl_rank, SgStatement *stmt)
-{
-    char buf[5];
-    if (!IsParDoLabel(lb, pl_rank))
-    {
-        sprintf(buf, "%d", (int)LABEL_STMTNO(lb->thelabel));
-        Error("Label %s out of parallel loop range", buf, 38, stmt);
-        return 0;
-    }
-    return 1;
-}
-
-SgStatement *CreateKernelProcedure(SgSymbol *skernel)
-{
-    SgStatement *st, *st_end;
-    SgExpression *e;
-
-    st = new SgStatement(PROC_HEDR);
-    st->setSymbol(*skernel);
-    e = new SgExpression(ACC_ATTRIBUTES_OP, new SgExpression(ACC_GLOBAL_OP), NULL, NULL);
-    //e ->setRhs(new SgExpression(ACC_GLOBAL_OP));
-    st->setExpression(2, *e);
-    st_end = new SgStatement(CONTROL_END);
-    st_end->setSymbol(*skernel);
-
-    cur_in_mod->insertStmtAfter(*st, *mod_gpu);
-    st->insertStmtAfter(*st_end, *st);
-    st->setVariant(PROS_HEDR);
-
-    cur_in_mod = st_end;
-
-    return(st);
-}
-
-SgStatement * CreateKernel_ForSequence(SgSymbol *kernel_symb, SgStatement *first_st, SgStatement *last_st, SgType *idxTypeInKernel)
-{
-    SgStatement  *block_copy;
-    SgExpression *arg_list;
-    kernel_st = (!options.isOn(C_CUDA)) ? CreateKernelProcedure(kernel_symb) : Create_C_Kernel_Function(kernel_symb);
-    kernel_st->addComment(SequenceKernelComment(first_st->lineNumber()));
-
-    // transferring sequence of statements in kernel                                             
-    block_copy = CopyBlockToKernel(first_st, last_st);
-
-    lpart_list = NULL;
-
-    TranslateBlock(kernel_st);
-
-    if (options.isOn(C_CUDA))
-    {
-        swapDimentionsInprivateList();
-        std::vector < std::stack < SgStatement*> > zero = std::vector < std::stack < SgStatement*> >(0);        
-        Translate_Fortran_To_C(kernel_st, kernel_st->lastNodeOfStmt(), zero, 0);
-    }
-
-    // create dummy argument list and add it to kernel header statement
-    arg_list = CreateKernelDummyList_ForSequence(idxTypeInKernel);
-    if (arg_list)
-    {
-        if (options.isOn(C_CUDA))
-            kernel_st->expr(0)->setLhs(arg_list);
-        else
-            kernel_st->setExpression(0, *arg_list);
-    }
-
-    // make declarations
-    MakeDeclarationsInKernel_ForSequence(idxTypeInKernel);
-
-
-    if (!options.isOn(C_CUDA))  // Fortran-Cuda                                                       
-        // inserting IMPLICIT NONE
-        kernel_st->insertStmtAfter(*new SgStatement(IMPL_DECL), *kernel_st);
-    if (options.isOn(C_CUDA))
-        RenamingCudaFunctionVariables(kernel_st, kernel_symb, 1);
-    return(kernel_st);
-}
-
-
-SgExpression *IsRedBlack(int nloop)
-{
-    SgExpression *erb;
-    SgStatement *st;
-    int ndo;
-    // looking through the loop nest for redblack scheme
-    erb = NULL;
-    for (st = first_do_par, ndo = 0; ndo < nloop; st = ((SgForStmt *)st)->body(), ndo++)
-    {
-        if (((SgForStmt *)st)->start()->variant() == ADD_OP) //redblack scheme
-        {
-            return(((SgForStmt *)st)->start()->rhs()->lhs()->lhs()->rhs());
-        }
-
-    }
-
-    return(NULL);
-
-}
-
-void  CreateBlockForCalculationThreadLoopVariables()
-{
-    int nloop, i, i1;
-    SgStatement *if_st = NULL, *dost = NULL, *ass = NULL, *stmt = NULL;
-    nloop = ParLoopRank();
-
-
-    if (!options.isOn(NO_BL_INFO))
-    {
-        if (options.isOn(C_CUDA))
-            cur_in_kernel->addComment("// Calculate each thread's loop variables' values");
-        else
-            cur_in_kernel->addComment("! Calculate each thread's loop variables' values\n");
-
-        for (i = 0; i<nloop - 3; i++)
-        {
-            dost = DoStmt(first_do_par, i + 1);
-            ass = Assign_To_IndVar(dost, i, nloop, s_blocks_k);
-            cur_in_kernel->insertStmtAfter(*ass, *kernel_st);
-            cur_in_kernel = ass;
-        }
-        i1 = i;
-        if_st = new SgStatement(CONT_STAT);
-        i = nloop;
-        while (i>i1)
-        {
-            dost = DoStmt(first_do_par, i);   //sind = Do_Var(i,vl);
-            if_st = new SgIfStmt(*KernelConditionWithDoStep(dost, s_blocks_k, i - 1), *if_st); //new SgIfStmt( *KernelCondition(dost->symbol(),s_blocks_k,i-1), *if_st);
-            i--;
-        }
-        cur_in_kernel->insertStmtAfter(*if_st, *kernel_st);
-        cur_in_kernel = if_st;
-
-        i = i1;
-        //dost =  first_do_par; 
-        while (i < nloop)
-        {
-            ass = Assign_To_IndVar(dost, i, nloop, s_blocks_k);
-            if_st->insertStmtBefore(*ass, *if_st->controlParent());
-            if_st = if_st->lexNext();
-            dost = dost->lexNext();
-            i++;
-        }
-
-        //dost = dost->controlParent();                       
-        cur_in_kernel = ass->lexNext();  //innermost IF statement
-        cur_in_kernel->lexNext()->extractStmt(); //extracting CONTINUE statement
-        return;
-    }
-
-    //without_blocks_info
-    cur_in_kernel = stmt = kernel_st->lastNodeOfStmt()->lexPrev();
-
-    if_st = new SgStatement(CONT_STAT);
-    i = nloop;
-    while (i)
-    {
-        dost = DoStmt(first_do_par, i);
-        if_st = new SgIfStmt(*KernelCondition2(dost, i), *if_st);
-        i--;
-    }
-    cur_in_kernel->insertStmtAfter(*if_st, *kernel_st);
-    cur_in_kernel = if_st;
-
-    dost = first_do_par;
-    i = 1;
-    while (i <= nloop)
-    {
-        ass = Assign_To_rest_blocks(i - 1);
-        if_st->insertStmtBefore(*ass, *if_st->controlParent());
-        ass = Assign_To_cur_blocks(i - 1, nloop);
-        if_st->insertStmtBefore(*ass, *if_st->controlParent());
-        ass = Assign_To_IndVar2(dost, i, nloop);
-        if_st->insertStmtBefore(*ass, *if_st->controlParent());
-        if_st = if_st->lexNext();
-        dost = dost->lexNext();
-        i++;
-    }
-
-    if (options.isOn(C_CUDA))
-        stmt->lexNext()->addComment("// Calculate each thread's loop variables' values");
-    else
-        stmt->lexNext()->addComment("! Calculate each thread's loop variables' values\n");
-
-    cur_in_kernel = ass->lexNext();  //innermost IF statement
-    cur_in_kernel->lexNext()->extractStmt(); //extracting CONTINUE statement
-
-    return;
-}
-
-SgStatement *CreateIfForRedBlack(SgStatement *loop_body, int nloop)
-{
-    SgExpression *erb;
-    SgStatement *st;
-    int ndo;
-    // looking through the loop nest for redblack scheme
-    erb = NULL;
-    for (st = first_do_par, ndo = 0; ndo < nloop; st = ((SgForStmt *)st)->body())
-    {          //!printf("---line number: %d,  %d\n",st->lineNumber(),((SgForStmt *)st)->body()->lineNumber());
-        if (((SgForStmt *)st)->start()->variant() == ADD_OP) //redblack scheme
-        {
-            erb = ((SgForStmt *)st)->start()->rhs();  // MOD function call (after replacing for dvm realisation)
-            erb = &(erb->lhs()->lhs()->copy());   //first argument of MOD function call 
-            erb->setLhs(new SgVarRefExp(st->symbol()));
-        }
-        ndo++;
-    }
-    //!!!printf("line number of st: %d,  %d\n",st->lineNumber(), st);
-
-    if (erb)
-    {
-        st = new SgIfStmt(*ConditionForRedBlack(erb), *loop_body);
-        return(st);
-    }
-    else
-        return(loop_body);
-
-}
-
-SgExpression *CreateKernelDummyList(SgSymbol *s_red_count_k, SgType *idxTypeInKernel)
-{
-    SgExpression *arg_list, *ae;
-    SgExpression *eln = new SgExprListExp();
-    int pl_rank = ParLoopRank();
-    int i;
-    arg_list = NULL;
-
-    arg_list = AddListToList(CreateArrayDummyList(idxTypeInKernel), CreateRedDummyList());
-    //   base_ref + <array_coeffs> ...
-    // + <red_var[_1]> [+red_var_2+...+red_var_M] + <red>_grid  [ + <loc_var_1>...<loc_var_N>] 
-
-    // + 'blocks' [ or begin_1, end_1,...,begin_<N>,end_<N>,blocks_1,...,blocks_<N-1>,add_blocks ]
-    if (!options.isOn(NO_BL_INFO))
-    {
-        SgArrayType *tmpType = new SgArrayType(*idxTypeInKernel);
-        SgSymbol *copy_s_blocks_k = new SgSymbol(s_blocks_k->variant(), s_blocks_k->identifier(), tmpType, s_blocks_k->scope());
-
-        ae = options.isOn(C_CUDA) ? new SgExprListExp(*new SgArrayRefExp(*copy_s_blocks_k, *eln)) : new SgExprListExp(*new SgArrayRefExp(*copy_s_blocks_k));   // + 'blocks'
-        //ae = options.isOn(C_CUDA) ? new SgExprListExp(*new SgPointerDerefExp(*new SgVarRefExp(copy_s_blocks_k))) : new SgExprListExp(*new SgVarRefExp(copy_s_blocks_k));
-        arg_list = AddListToList(arg_list, ae);
-
-    }
-    else  //without blocks_info
-    {
-        SgSymbol *copy_s_begin, *copy_s_end, *copy_s_step, *copy_s_blocks, *copy_s_add_blocks;
-        for (i = 0; i < pl_rank; i++)
-        {
-            copy_s_begin = new SgSymbol(s_begin[i]->variant(), s_begin[i]->identifier(), idxTypeInKernel, s_begin[i]->scope());
-            ae = new SgVarRefExp(*copy_s_begin);
-            ae = new SgExprListExp(*ae);
-            if (i == 0)
-                indexing_info_list = ae;
-            arg_list = AddListToList(arg_list, ae);
-
-            copy_s_end = new SgSymbol(s_end[i]->variant(), s_end[i]->identifier(), idxTypeInKernel, s_end[i]->scope());
-            ae = new SgVarRefExp(*copy_s_end);
-            ae = new SgExprListExp(*ae);
-            arg_list = AddListToList(arg_list, ae);
-            if (!IConstStep(DoStmt(first_do_par, i + 1)))     
-            {
-                copy_s_step = new SgSymbol(s_loopStep[i]->variant(), s_loopStep[i]->identifier(), idxTypeInKernel, s_loopStep[i]->scope());
-                ae = new SgVarRefExp(*copy_s_step);
-                ae = new SgExprListExp(*ae);
-                arg_list = AddListToList(arg_list, ae);
-            }
-        }
-
-        for (i = 0; i < pl_rank - 1; i++)
-        {
-            copy_s_blocks = new SgSymbol(s_blocksS_k[i]->variant(), s_blocksS_k[i]->identifier(), idxTypeInKernel, s_blocksS_k[i]->scope());
-            ae = new SgVarRefExp(*copy_s_blocks);
-            ae = new SgExprListExp(*ae);
-            arg_list = AddListToList(arg_list, ae);
-        }
-
-        copy_s_add_blocks = new SgSymbol(s_add_blocks->variant(), s_add_blocks->identifier(), idxTypeInKernel, s_add_blocks->scope());
-        ae = new SgVarRefExp(*copy_s_add_blocks);
-        ae = new SgExprListExp(*ae);
-        arg_list = AddListToList(arg_list, ae);
-
-        indexing_info_list = &(indexing_info_list->copy());
-    }
-    if (s_red_count_k)                                           //[+ 'red_count']
-    {
-        ae = new SgExprListExp(*new SgVarRefExp(s_red_count_k));
-        arg_list = AddListToList(arg_list, ae);
-    }
-    //[+ 'overall_blocks']
-    if (s_overall_blocks)
-    {
-        SgSymbol *copy_overall = new SgSymbol(s_overall_blocks->variant(), s_overall_blocks->identifier(), idxTypeInKernel, s_overall_blocks->scope());
-        ae = new SgExprListExp(*new SgVarRefExp(copy_overall));
-        arg_list = AddListToList(arg_list, ae);
-    }
-    if (uses_list)
-        arg_list = AddListToList(arg_list, CreateUsesDummyList()); //[+ <uses> ]
-    if (private_list)
-        arg_list = AddListToList(arg_list, CreatePrivateDummyList()); //[+ dummys for private arrays ]
-
-    return arg_list;
-}
-
-
-SgExpression *CreateKernelDummyList_ForSequence(SgType *idxTypeInKernel)
-{
-    SgExpression *arg_list;
-
-    arg_list = NULL;
-
-    arg_list = AddListToList(CreateArrayDummyList(idxTypeInKernel), CreateLocalPartList(idxTypeInKernel));
-    //   base_ref + <array_coeffs> ...
-    // + <local_part>...  
-
-    if (uses_list)
-        arg_list = AddListToList(arg_list, CreateUsesDummyList()); // [ <uses> ]
-    return(arg_list);
-
-}
-
-SgSymbol *KernelDummyArray(SgSymbol *s)
-{
-    SgArrayType *typearray;
-    SgType *type;
-    //SgExpression  *MD =  new SgExpression(DDOT,new SgValueExp(0),new SgValueExp(1),NULL); 
-
-    type = isSgArrayType(s->type()) ? s->type()->baseType() : s->type();
-
-    //if(options.isOn(C_CUDA))
-    //{ type = C_PointerType(C_Type(type));
-
-    //}
-    //else
-    if (options.isOn(C_CUDA))
-        type = C_Type(type);
-    typearray = new SgArrayType(*type);
-    typearray->addDimension(NULL);
-    type = typearray;
-
-    return(new SgSymbol(VARIABLE_NAME, s->identifier(), *type, *kernel_st));
-
-}
-
-SgSymbol *KernelDummyVar(SgSymbol *s)
-{
-    SgType *type;
-    type = options.isOn(C_CUDA) ? C_Type(s->type()) : s->type();
-    return(new SgSymbol(VARIABLE_NAME, s->identifier(), *type, *kernel_st));
-}
-
-
-SgSymbol *KernelDummyPointerVar(SgSymbol *s)
-{
-    char *name;
-    SgSymbol *sp;
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 2 + 1));
-    sprintf(name, "p_%s", s->identifier());
-    sp = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(name), *C_PointerType(C_Type(s->type())), *kernel_st);
-
-    // adding the attribute  DUMMY_ARG to symbol of user program 
-    if (!DUMMY_ARG(s))
-    {
-        SgSymbol **dummy = new (SgSymbol *);
-        *dummy = sp;
-        s->addAttribute(DUMMY_ARGUMENT, (void*)dummy, sizeof(SgSymbol *));
-    }
-    return(sp);
-
-}
-
-SgExpression * dvm_coef(SgSymbol *ar, int i)
-{ //coeffs *c;
-    //c = AR_COEFFICIENTS(ar);
-    if (options.isOn(C_CUDA))
-    {
-        SgSymbol *s_dummy_coef = new SgSymbol(VARIABLE_NAME, AR_COEFFICIENTS(ar)->sc[i]->identifier(), *CudaIndexType_k, *kernel_st);
-        return(new SgVarRefExp(*s_dummy_coef));
-    }
-
-    return(new SgVarRefExp(*(AR_COEFFICIENTS(ar)->sc[i])));
-
-}
-
-SgSymbol *KernelDummyLocalPart(SgSymbol *s)
-{
-    SgArrayType *typearray;
-    SgType *type;
-
-    // for C_Cuda
-    typearray = new SgArrayType(*CudaIndexType_k);
-    typearray->addDimension(NULL);
-    type = typearray;
-
-    return(new SgSymbol(VARIABLE_NAME, s->identifier(), *type, *kernel_st));
-
-}
-
-
-SgExpression *CreateArrayDummyList()
-{
-    symb_list *sl;
-    SgExpression *ae, *coef_list, *edim;
-    int n, d;
-    SgExpression *arg_list = NULL;
-
-    edim = new SgExprListExp();     // [] dimension
-
-    for (sl = acc_array_list; sl; sl = sl->next)                 // + base_ref + <array_coeffs>
-    {
-        SgSymbol *s_dummy;
-        s_dummy = KernelDummyArray(sl->symb);
-        if (options.isOn(C_CUDA))
-            ae = new SgArrayRefExp(*s_dummy, *edim); // new SgPointerDerefExp(* new SgVarRefExp(s_dummy));
-        else
-            ae = new SgArrayRefExp(*s_dummy);
-        ae->setType(s_dummy->type());   //for C_Cuda
-        ae = new SgExprListExp(*ae);
-        //   ae = new SgPointerDerefExp(*ae);      //   ae->setLhs(*edim);
-        arg_list = AddListToList(arg_list, ae);
-        coef_list = NULL;
-        if (Rank(sl->symb) == 0)      //remote_access buffer may be of rank 0   
-            continue;
-        d = options.isOn(AUTO_TFM) ? 0 : 1;    //inparloop ? 0 : 1;
-        for (n = Rank(sl->symb) - d; n > 0; n--)
-        {
-            ae = new SgExprListExp(*dvm_coef(sl->symb, n + 1));
-            coef_list = AddListToList(coef_list, ae);
-        }
-
-        arg_list = AddListToList(arg_list, coef_list);
-    }
-    return(arg_list);
-
-}
-
-SgExpression *CreateUsesDummyList()
-{
-    SgSymbol *s_dummy, *s;
-    SgExpression *el, *ae;
-    SgExpression *arg_list = NULL;
-
-    for (el = uses_list; el; el = el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (options.isOn(C_CUDA) && !isByValue(s))
-        {
-            s_dummy = KernelDummyPointerVar(s);
-            ae = new SgPointerDerefExp(*new SgVarRefExp(*s_dummy));
-        }
-        else
-        {
-            s_dummy = KernelDummyVar(s);
-            ae = new SgVarRefExp(*s_dummy);
-        }
-        ae = new SgExprListExp(*ae);
-        arg_list = AddListToList(arg_list, ae);
-    }
-    return(arg_list);
-}
-
-SgExpression *CreatePrivateDummyList()
-{
-    SgSymbol *s_dummy, *s;
-    SgExpression *el, *ae;
-    SgExpression *arg_list = NULL;
-    if (!options.isOn(C_CUDA) || !PrivateArrayClassUse(sizeOfPrivateArraysInBytes())) // !sizeOfPrivateArraysInBytes())
-        return NULL;
-    for (el = private_list; el; el = el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (!IS_ARRAY(s))
-            continue;
-        s_dummy =  ArraySymbol(PointerNameForPrivateArray(s), C_Type(s->type()->baseType()), NULL, kernel_st);
-        ae = new SgArrayRefExp(*s_dummy, *new SgExprListExp());
-        ae->setType(s_dummy->type());
-        arg_list = AddListToList(arg_list, new SgExprListExp(*ae));
-        SgSymbol **satr = new (SgSymbol *);
-        *satr = s_dummy;
-        el->lhs()->addAttribute(PRIVATE_POINTER, (void *)satr, sizeof(SgSymbol *) );    
-        if (!TestArrayShape(s))
-        {
-            SgExpression **eatr = (SgExpression **) el->lhs()->attributeValue(0, DIM_SIZES);  
-            SgExpression *ela;
-            for (ela = *eatr; ela; ela=ela->rhs())
-                arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(ela->lhs()->lhs()->symbol())));  //AddListToList(arg_list, &(ela->copy()));
-            
-            eatr = (SgExpression **) el->lhs()->attributeValue(0, L_BOUNDS);   
-            for (ela = *eatr; ela; ela=ela->rhs())
-                arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(ela->lhs()->lhs()->symbol()))); //AddListToList(arg_list, &(ela->copy()));
-        }
-    }
-
-    return(arg_list);
-}
-
-SgExpression *CreateRedDummyList()
-{
-    reduction_operation_list *rsl;
-    SgExpression *ae, *arg_list, *loc_list;
-    arg_list = NULL;
-
-    for (rsl = red_struct_list; rsl; rsl = rsl->next)         // + <red_var[_1]> [+red_var_2+...+red_var_M]  + <red>_grid  [ + <loc_var_1>...<loc_var_N>]  [ + <loc>_grid> ]
-    {
-        if (rsl->locvar)
-        {
-            //ae = C_Cuda ? new SgExprListExp(*new SgPointerDerefExp(*new SgVarRefExp(rsl->loc_grid))) : new SgExprListExp(*new SgVarRefExp(rsl->loc_grid));
-            if (options.isOn(C_CUDA))
-            {
-                ae = new SgArrayRefExp(*rsl->loc_grid, *new SgExprListExp());
-                ae->setType(rsl->loc_grid->type());
-            }
-            else
-                ae = new SgVarRefExp(rsl->loc_grid);
-            ae = new SgExprListExp(*ae);
-            loc_list = AddListToList(&(rsl->formal_arg->copy()), ae);
-        }
-        else
-            loc_list = NULL;
-        if (rsl->redvar_size > 0)   // reduction array of known size (constant bounds)
-            arg_list = AddListToList(arg_list, &(rsl->value_arg->copy()));
-        else if (rsl->redvar_size == 0)
-        {
-            ae = new SgExprListExp(*new SgVarRefExp(KernelDummyVar(rsl->redvar)));
-            arg_list = AddListToList(arg_list, ae);
-        }
-        else                       // reduction array of unknown size
-        {
-            arg_list = AddListToList(arg_list, &(rsl->dimSize_arg->copy()));
-            arg_list = AddListToList(arg_list, &(rsl->lowBound_arg->copy()));
-        }
-        if (options.isOn(C_CUDA))
-        {
-            ae = new SgArrayRefExp(*rsl->red_grid, *new SgExprListExp());
-            ae->setType(rsl->red_grid->type());
-        }
-        else
-            ae = new SgVarRefExp(rsl->red_grid);
-        ae = new SgExprListExp(*ae);
-        arg_list = AddListToList(arg_list, ae);
-        if (rsl->redvar_size < 0)
-        {
-            if (options.isOn(C_CUDA))
-            {
-                ae = new SgArrayRefExp(*rsl->red_init, *new SgExprListExp());
-                //XXX use correct type from red_grid, changed reduction scheme to atomic, Kolganov 06.02.2020
-                ae->setType(rsl->red_grid->type());
-                ae = new SgExprListExp(*ae);
-            }
-            else
-                ae = new SgExprListExp(*new SgVarRefExp(rsl->red_init));
-            arg_list = AddListToList(arg_list, ae);
-        }
-        arg_list = AddListToList(arg_list, loc_list);
-    }
-    return(arg_list);
-}
-
-SgExpression* CreateRedDummyList(SgType* indeTypeInKernel)
-{
-    SgExpression* arg_list = CreateRedDummyList();
-
-    if (ACROSS_MOD_IN_KERNEL)
-    {
-        for (reduction_operation_list* rsl = red_struct_list; rsl; rsl = rsl->next)
-        {
-            if (rsl->redvar_size > 0)
-            {
-                SgSymbol* overAll = OverallBlocksSymbol();
-                if(options.isOn(C_CUDA))
-                    overAll->setType(indeTypeInKernel);
-
-                arg_list = AddListToList(new SgExprListExp(*new SgVarRefExp(overAll)), arg_list);
-                break;
-            }
-        }
-    }    
-    return arg_list;
-}
-
-SgExpression *CreateLocalPartList()
-{
-    local_part_list *pl;
-    SgExpression *ae;
-    SgExpression *arg_list = NULL;
-    for (pl = lpart_list; pl; pl = pl->next)                 // + <local_part>
-    {
-        if (options.isOn(C_CUDA))
-            ae = new SgExprListExp(*new SgArrayRefExp(*KernelDummyLocalPart(pl->local_part), *new SgExprListExp())); //<local_part>[]
-        else
-            ae = new SgExprListExp(*new SgArrayRefExp(*pl->local_part));
-        arg_list = AddListToList(arg_list, ae);
-    }
-    return(arg_list);
-
-}
-
-
-SgExpression *CoefficientList()
-{
-    symb_list *sl;
-    SgExpression *ae;
-    int n, d;
-    SgExpression *coef_list = NULL;
-    for (sl = acc_array_list; sl; sl = sl->next)
-    {
-        if (Rank(sl->symb) == 0)      //remote_access buffer may be of rank 0   
-            continue;
-        d = options.isOn(AUTO_TFM) ? 0 : 1; //inparloop ? 0 : 1;
-        for (n = Rank(sl->symb) - d; n > 0; n--)
-        {
-            ae = new SgExprListExp(*dvm_coef(sl->symb, n + 1));
-            coef_list = AddListToList(coef_list, ae);
-        }
-
-    }
-    return(coef_list);
-
-}
-
-SgExpression *ArrayRefList()
-{
-    symb_list *sl;
-    SgExpression *ae;
-    SgExpression *ar_list = NULL;
-
-    for (sl = acc_array_list; sl; sl = sl->next)
-    {
-        ae = new SgExprListExp(*new SgArrayRefExp(*sl->symb));
-        ar_list = AddListToList(ar_list, ae);
-    }
-    return(ar_list);
-}
-
-void MakeDeclarationsForKernel(SgSymbol *red_count_symb, SgType *idxTypeInKernel)
-{
-    SgExpression *var, *eatr, *edev;
-    SgStatement *st;
-    
-    // declare called functions
-    DeclareCalledFunctions();
-
-    // declare index variablex for reduction array
-    for (var = kernel_index_var_list; var; var = var->rhs())
-    {
-        st = var->lhs()->symbol()->makeVarDeclStmt();
-        kernel_st->insertStmtAfter(*st);
-    }
-
-    // declare variable 'ibof' or cur_blocks,rest_blocks (without blocks_info)
-    if (!options.isOn(NO_BL_INFO))
-        st = s_ibof->makeVarDeclStmt();
-
-    else // without_blocks_info
-    {
-        SgSymbol *copy_s_rest_blocks = new SgSymbol(s_rest_blocks->variant(), s_rest_blocks->identifier(), idxTypeInKernel, s_rest_blocks->scope());
-        st = copy_s_rest_blocks->makeVarDeclStmt();
-        st->expr(0)->setRhs(new SgExprListExp(*new SgVarRefExp(s_cur_blocks)));
-    }
-    kernel_st->insertStmtAfter(*st);
-
-    // declare do_variables
-    DeclareDoVars();
-
-    // declare private(local in kernel) variables    
-    DeclarePrivateVars(idxTypeInKernel);
-
-    // declare dummy arguments:
-    eatr = new SgExprListExp(*new SgExpression(ACC_VALUE_OP));
-    edev = new SgExprListExp(*new SgExpression(ACC_DEVICE_OP));
-
-    // declare reduction dummy arguments
-    DeclareDummyArgumentsForReductions(red_count_symb, idxTypeInKernel);
-
-    if (!options.isOn(NO_BL_INFO))
-    {
-        // declare blocks variable (see CudaIndexType type in util.h)
-        SgSymbol *copy_s_blocks_k = ArraySymbol(s_blocks_k->identifier(), idxTypeInKernel, new SgExpression(DDOT, new SgValueExp(0), new SgKeywordValExp("*"), NULL), s_blocks_k->scope());
-        st = copy_s_blocks_k->makeVarDeclStmt();      // of CudaIndexType
-        st->setExpression(2, *edev);
-        kernel_st->insertStmtAfter(*st);
-        st->addComment("! Loop bounds array\n");
-    }
-    else // without_blocks_info
-    {
-        // declare begin_k,end_k,blocks_k variables (see CudaIndexType type in util.h)
-        SgSymbol *copy_s_blocks_k = new SgSymbol(s_blocks_k->variant(), s_blocks_k->identifier(), idxTypeInKernel, s_blocks_k->scope());
-        st = copy_s_blocks_k->makeVarDeclStmt();      // of CudaIndexType
-        st->setExpression(2, *eatr);
-        st->setExpression(0, *indexing_info_list);
-        kernel_st->insertStmtAfter(*st);
-        st->addComment("! Indexing info\n");
-    }
-
-    // declare array coefficients
-    DeclareArrayCoeffsInKernel(idxTypeInKernel);
-
-    // declare bases for arrays 
-    DeclareArrayBases();
-
-    // declare  variables, used in loop
-    DeclareUsedVars();
-}
-
-void MakeDeclarationsForKernel_On_C(SgType *idxTypeInKernel)
-{
-    SgStatement *st;
-
-    // declare variable 'ibof' or cur_blocks,rest_blocks (without blocks_info)
-    if (!options.isOn(NO_BL_INFO))
-        st = Declaration_Statement(s_ibof);
-    else // without_blocks_info
-    {
-        SgSymbol *copy_symb;
-
-        copy_symb = new SgSymbol(s_rest_blocks->variant(), s_rest_blocks->identifier(), idxTypeInKernel, s_rest_blocks->scope());
-        st = Declaration_Statement(copy_symb);
-
-        copy_symb = new SgSymbol(s_cur_blocks->variant(), s_cur_blocks->identifier(), idxTypeInKernel, s_cur_blocks->scope());
-        addDeclExpList(copy_symb, st->expr(0));
-    }
-    kernel_st->insertStmtAfter(*st);
-
-    // declare do_variables
-    DeclareDoVars(idxTypeInKernel); 
-
-    // declare private(local in kernel) variables 
-    DeclarePrivateVars(idxTypeInKernel);
-
-    // declare  variables, used in loop and passed by reference:
-    // <type> &<name> = *p_<name>;  
-    DeclareUsedVars();
-}
-
-void MakeDeclarationsInKernel_ForSequence(SgType *idxTypeInKernel)
-{
-    if (options.isOn(C_CUDA))
-    {
-        DeclareUsedVars();
-        DeclareInternalPrivateVars();        
-    }
-    else
-    {
-        // in Fortran-Cuda language
-        // declare called functions
-        DeclareCalledFunctions();
-
-        // declaring dummy arguments
-        // declare array coefficients
-        DeclareArrayCoeffsInKernel(idxTypeInKernel);
-
-        // declare bases for arrays 
-        DeclareArrayBases();
-
-        // declare local part variables
-        DeclareLocalPartVars(idxTypeInKernel);
-
-        // declare  variables, used in sequence
-        DeclareUsedVars();
-    }
-}
-
-void DeclareCalledFunctions()
-{
-    SgStatement *st = NULL;
-    symb_list *sl;
-    // declare called functions in Fortran_Cuda kernel
-    for (sl = acc_call_list; sl; sl = sl->next)
-    if (sl->symb->variant() == FUNCTION_NAME && !IS_BY_USE(sl->symb))
-    {
-        st = sl->symb->makeVarDeclStmt();
-        kernel_st->insertStmtAfter(*st, *kernel_st);
-    }
-    if (st)
-        st->addComment("! Called functions\n");
-
-}
-
-
-// declare DO cariables of parallel loop nest in kernel 
-void DeclareDoVars()
-{
-    SgExpression *el;
-    SgStatement *st;
-    SgSymbol *s;
-    // declare do_variables of parallel loop nest       
-    for (el=dvm_parallel_dir->expr(2); el; el=el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (options.isOn(C_CUDA))
-            s =  new SgVariableSymb(s->identifier(), *C_Type(s->type()), *kernel_st); 
-        st = Declaration_Statement(s);
-        kernel_st->insertStmtAfter(*st);
-    }
-    if (options.isOn(C_CUDA))
-        st->addComment("// Local needs");
-    else
-        st->addComment("! Local needs\n");    
-
-}
-
-void DeclareLocalPartVars(SgType *idxTypeInKernel)
-{
-    SgExpression *edev = NULL;
-    local_part_list *pl = NULL;
-    SgStatement *st = NULL;
-
-    edev = new SgExprListExp(*new SgExpression(ACC_DEVICE_OP));
-
-    // declare local-part variables 
-    for (pl = lpart_list; pl; pl = pl->next)
-    {
-        st = pl->local_part->makeVarDeclStmt();
-        st->expr(1)->setType(idxTypeInKernel);
-        st->setExpression(2, *edev);
-        kernel_st->insertStmtAfter(*st);
-    }
-    if (lpart_list)
-        st->addComment("! Local parts of arrays\n");
-}
-
-void DeclareLocalPartVars()
-{
-    SgExpression *edev = NULL;
-    local_part_list *pl = NULL;
-    SgStatement *st = NULL;
-
-    edev = new SgExprListExp(*new SgExpression(ACC_DEVICE_OP));
-
-    // declare local-part variables 
-    for (pl = lpart_list; pl; pl = pl->next)
-    {
-        st = pl->local_part->makeVarDeclStmt();
-        st->setExpression(2, *edev);
-        kernel_st->insertStmtAfter(*st);        
-    }
-    if (lpart_list)
-        st->addComment("! Local parts of arrays\n");
-}
-
-void DeclareArrayCoeffsInKernel(SgType *idxTypeInKernel)
-{ // declare array coefficients
-    SgExpression *el = NULL, *eatr = NULL;
-    SgStatement *st = NULL;
-
-    if (acc_array_list && (el = CoefficientList()))
-    {
-        eatr = new SgExprListExp(*new SgExpression(ACC_VALUE_OP));
-        st = idxTypeInKernel->symbol()->makeVarDeclStmt();   // of CudaIndexType       
-        st->setExpression(2, *eatr);
-        kernel_st->insertStmtAfter(*st);
-        st->addComment("! Array coefficients\n");
-        st->setExpression(0, *el);
-    }
-}
-
-void DeclareArrayBases()
-{
-    // declare bases for arrays 
-    if (acc_array_list)
-    {
-        SgStatement *st = NULL;
-        SgExpression *array_list = NULL, *alist = NULL, *edim = NULL, *edev = NULL;
-        SgSymbol *ar = NULL;
-        //SgSymbol *baseMem = NULL;
-
-        // make attribute DIMENSION(0:*) 
-        edim = new SgExpression(DIMENSION_OP);
-        edim->setLhs(new SgExpression(DDOT, new SgValueExp(0), new SgKeywordValExp("*"), NULL, NULL));
-        edim = new SgExprListExp(*edim);
-        // make attribute DEVICE
-        edev = new SgExprListExp(*new SgExpression(ACC_DEVICE_OP));
-
-        array_list = ArrayRefList();
-        while (array_list)
-        {
-            ar = array_list->lhs()->symbol();
-            //baseMem = baseMemory(ar->type()->baseType());
-            st = ar->makeVarDeclStmt();
-            edim->setRhs(edev);
-            st->setExpression(2, *edim);
-            kernel_st->insertStmtAfter(*st);
-            alist = array_list;
-            st->setExpression(0, *alist);
-            //while (alist->rhs() && baseMemory(alist->rhs()->lhs()->symbol()->type()->baseType()) == baseMem)
-            //    alist = alist->rhs();
-            array_list = array_list->rhs();
-            alist->setRhs(NULL);
-        }
-        st->addComment("! Bases for arrays\n");
-    }
-}
-
-void DeclareInternalPrivateVars()
-{
-    SgStatement *st = NULL;
-    for (unsigned i = 0; i < newVars.size(); ++i)
-    {
-        SgVarRefExp *e = new SgVarRefExp(*newVars[i]);
-        if (!(isParDoIndexVar(e->symbol())))
-        {
-            st = Declaration_Statement(SymbolInKernel(e->symbol()));
-            kernel_st->insertStmtAfter(*st);
-        }
-
-    }
-
-    if (st)
-    {
-        if (options.isOn(C_CUDA))
-            st->addComment("// Internal private variables");
-        else
-            st->addComment("! Internal private variables\n");
-    }
-}
-
-SgStatement *makeClassObjectDeclaration(SgSymbol *s, SgSymbol *sp, SgStatement *header_st, SgType *idxType, SgExpression *dim_list, int flag_true)
-{            
-    SgStatement *st = new SgStatement(VAR_DECL);
-    SgSymbol *s_new = & s->copy();
-    SYMB_SCOPE(s_new->thesymb) = header_st->thebif;
-    SgExpression *e = new SgExprListExp(*new SgTypeRefExp(*C_Type(s_new->type())));
-    SgDerivedTemplateType *tp = new SgDerivedTemplateType(e, private_array_class); 
-    tp->addArg(new SgValueExp(Rank(s)));
-    s_new->setType(tp);
-    SgFunctionCallExp *efc = new SgFunctionCallExp(*s_new);
-    efc->setType(tp); 
-    st->setExpression(0, *new SgExprListExp(*efc)); 
-    header_st->insertStmtAfter(*st);
-
-    SgSymbol *s_dims=NULL;
-    SgStatement *st_dims = NULL;
-    if (Rank(s)>1)
-    {
-        char *name = new char[strlen(s->identifier())+7];
-        sprintf(name, "_%s_dims", s->identifier());
-        s_dims = ArraySymbol(name, idxType, new SgValueExp(Rank(s)-1), header_st);
-        SgExpression *einit = new SgExpression(INIT_LIST);
-/*        SgExpression *elist = NULL;
-
-        if (for_kernel && !TestArrayShape(s))
-        {   
-            SgExpression **eatr = (SgExpression **) var->lhs()->attributeValue(0, DIM_SIZES);  
-            SgExpression *ela;
-            for (ela = *eatr; ela->rhs(); ela = ela->rhs())
-            { 
-                SgExpression *ed = new SgVarRefExp(ela->lhs()->lhs()->symbol());
-                elist = AddListToList(new SgExprListExp(*ed), elist);                        
-            }
-         }
-         else
-         {
-            for (int i=Rank(s)-1; i; i--)
-                elist = AddListToList(elist, new SgExprListExp(*Calculate(ArrayDimSize(s,i))));
-         } 
-  
-         einit->setLhs(elist); 
-*/
-         einit->setLhs(dim_list); 
-         SgStatement *st_dims = makeSymbolDeclarationWithInit(s_dims, einit);
-         header_st->insertStmtAfter(*st_dims); 
-         //st_first = st_dims;
-    }
-    if (s_dims)
-        efc->addArg(*new SgVarRefExp(s_dims));
-           
-            //SgSymbol **satr =  (SgSymbol **) var->lhs()->attributeValue(0, PRIVATE_POINTER); 
-    if (sp)
-           // {   
-            //    SgSymbol *sp = *satr;
-        efc->addArg(*new SgVarRefExp(sp)); 
-           // }                       
-    if (flag_true)
-        efc->addArg(*new SgKeywordValExp("true"));   
-    return (st_dims ? st_dims : st);
-}
-
-void DeclarePrivateVars()
-{
-    DeclarePrivateVars(C_UnsignedLongLongType());
-}
-
-void DeclarePrivateVars(SgType *idxTypeInKernel)
-{
-    SgStatement *st = NULL, *st_first=NULL;
-    SgExpression *var = NULL, *e;
-    SgSymbol *s;
-
-    if(!private_list) return;
-
-    SgExpression *e_all_private_size = sizeOfPrivateArraysInBytes();
-    //SgSymbol *class_name = new SgSymbol(TYPE_NAME, "PrivateArray");
-
-    // declare private variables    
-    for (var = private_list; var; var = var->rhs())
-    {
-        s = var->lhs()->symbol();
-        if (isParDoIndexVar(s))  continue; // declared as index variable of parallel loop
-                           //if (HEADER(var->lhs()->symbol()))  continue; // dvm-array declared as dummy argument
-        if (!options.isOn(C_CUDA) || !IS_ARRAY(s) || !PrivateArrayClassUse(e_all_private_size)) 
-        {
-            st = Declaration_Statement(SymbolInKernel(s));
-            kernel_st->insertStmtAfter(*st);
-            st_first = st;
-        }
-        else
-        {
-            SgStatement *st = new SgStatement(VAR_DECL);
-            SgSymbol *s_new = & s->copy();
-            SYMB_SCOPE(s_new->thesymb) = kernel_st->thebif;
-            e = new SgExprListExp(*new SgTypeRefExp(*C_Type(s_new->type())));
-            SgDerivedTemplateType *tp = new SgDerivedTemplateType(e, private_array_class); 
-            tp->addArg(new SgValueExp(Rank(s)));
-            s_new->setType(tp);
-            SgFunctionCallExp *efc = new SgFunctionCallExp(*s_new);
-            efc->setType(tp); 
-            st->setExpression(0, *new SgExprListExp(*efc)); 
-            kernel_st->insertStmtAfter(*st);
-            st_first = st;
-            SgSymbol *s_dims=NULL;
-            if (Rank(s)>1)
-            {
-                char *name = new char[strlen(s->identifier())+7];
-                sprintf(name, "_%s_dims", s->identifier());
-                s_dims = ArraySymbol(name, idxTypeInKernel, new SgValueExp(Rank(s)-1), kernel_st);
-                SgExpression *einit = new SgExpression(INIT_LIST);
-                SgExpression *elist = NULL;
-                if (!TestArrayShape(s))
-                {   
-                    SgExpression **eatr = (SgExpression **) var->lhs()->attributeValue(0, DIM_SIZES);  
-                    SgExpression *ela;
-                    for (ela = *eatr; ela->rhs(); ela = ela->rhs())
-                    { 
-                        SgExpression *ed = new SgVarRefExp(ela->lhs()->lhs()->symbol());
-                        elist = AddListToList(new SgExprListExp(*ed), elist);                        
-                    }
-                }
-                else
-                {
-                    for (int i=Rank(s)-1; i; i--)
-                        elist = AddListToList(elist, new SgExprListExp(*Calculate(ArrayDimSize(s,i))));
-                }   
-                einit->setLhs(elist); 
-                SgStatement *st_dims = makeSymbolDeclarationWithInit(s_dims, einit);//Declaration_Statement(s_dims);
-                kernel_st->insertStmtAfter(*st_dims); 
-                st_first = st_dims;
-            }
-            if (s_dims)
-            {
-                efc->addArg(*new SgVarRefExp(s_dims));
-            }
-            SgSymbol **satr =  (SgSymbol **) var->lhs()->attributeValue(0, PRIVATE_POINTER); 
-            if (satr)
-            {   
-                SgSymbol *sp = *satr;
-                efc->addArg(*new SgVarRefExp(sp)); 
-            }                       
-        }
-    }
-  
-    if (!st_first)
-        return;
-    
-    if (options.isOn(C_CUDA))
-        st_first->addComment("// Private variables");
-    else
-        st_first->addComment("! Private variables\n");
-}
-
-void DeclareUsedVars()
-{
-    SgSymbol *s = NULL, *sn = NULL;
-    SgExpression *var = NULL, *eatr = NULL, *edev = NULL;
-    SgStatement *st = NULL;
-
-    if (options.isOn(C_CUDA))
-
-    {
-        for (var = uses_list; var; var = var->rhs())
-        {
-            s = var->lhs()->symbol();
-            if (!isByValue(s)) // passing argument by reference
-                // <type> &<name> = *p_<name>;
-            {
-                sn = new SgSymbol(VARIABLE_NAME, s->identifier(), C_ReferenceType(C_Type(s->type())), kernel_st);
-                st = makeSymbolDeclarationWithInit(sn, &SgDerefOp(*new SgVarRefExp(**DUMMY_ARG(s))));
-                kernel_st->insertStmtAfter(*st);
-            }
-        }
-        if (st)
-            st->addComment("// Used values");
-        return;
-    }
-
-    // Fortran-Cuda
-
-    eatr = new SgExprListExp(*new SgExpression(ACC_VALUE_OP));
-    edev = new SgExprListExp(*new SgExpression(ACC_DEVICE_OP));
-    for (var = uses_list; var; var = var->rhs())
-    {
-        s = var->lhs()->symbol();
-        if (!isByValue(s)) // passing argument by reference
-        {
-            st = s->makeVarDeclStmt();
-            st->setExpression(2, *edev);
-            kernel_st->insertStmtAfter(*st);
-            continue;
-        }
-        if (s->variant() == CONST_NAME)
-            s = new SgSymbol(VARIABLE_NAME, s->identifier(), s->type(), kernel_st);
-        st = s->makeVarDeclStmt();
-        st->setExpression(2, *eatr);
-        kernel_st->insertStmtAfter(*st);
-    }
-
-    if (st)
-        st->addComment("! Used values\n");
-}
-
-void DeclareDummyArgumentsForReductions(SgSymbol *red_count_symb, SgType *idxTypeInKernel)
-
-// declare reduction dummy arguments
-
-{
-    reduction_operation_list *rsl = NULL;
-    SgExpression *eatr = NULL, *edev = NULL, *el = NULL;
-    SgStatement *st = NULL;
-
-    eatr = new SgExprListExp(*new SgExpression(ACC_VALUE_OP));
-    edev = new SgExprListExp(*new SgExpression(ACC_DEVICE_OP));
-
-    for (rsl = red_struct_list; rsl; rsl = rsl->next)
-    {
-        for (el = rsl->formal_arg; el; el = el->rhs())    // location array values for MAXLOC/MINLOC
-        {
-            st = el->lhs()->symbol()->makeVarDeclStmt();
-            st->setExpression(2, *eatr);
-            kernel_st->insertStmtAfter(*st);
-        }
-
-        for (el = rsl->value_arg; el; el = el->rhs())      // reduction variable is array of known size
-        {
-            st = el->lhs()->symbol()->makeVarDeclStmt();
-            st->setExpression(2, *eatr);
-            kernel_st->insertStmtAfter(*st);
-        }
-        if (rsl->redvar_size == 0)                      // reduction variable is scalar
-        {
-            st = rsl->redvar->makeVarDeclStmt();
-            st->setExpression(2, *eatr);
-            kernel_st->insertStmtAfter(*st);
-        }
-
-        if (rsl->redvar_size < 0)                      // reduction variable is  array of unknown size
-        {
-            st = rsl->red_init->makeVarDeclStmt();
-            st->setExpression(2, *edev);
-            kernel_st->insertStmtAfter(*st);
-        }
-
-    }
-    if (red_struct_list)
-        st->addComment("! Initial reduction values\n");
-
-    st = NULL;
-    for (rsl = red_struct_list; rsl; rsl = rsl->next)
-    {
-        for (el = rsl->dimSize_arg; el; el = el->rhs())    // reduction variable is array of unknown size
-        {
-            st = el->lhs()->symbol()->makeVarDeclStmt();
-            st->setExpression(2, *eatr);
-            kernel_st->insertStmtAfter(*st);
-        }
-        for (el = rsl->lowBound_arg; el; el = el->rhs())    // reduction variable is array of unknown size
-        {
-            st = el->lhs()->symbol()->makeVarDeclStmt();
-            st->setExpression(2, *eatr);
-            kernel_st->insertStmtAfter(*st);
-        }
-    }
-    if (st)
-        st->addComment("! Bounds of reduction arrays \n");
-
-
-    // declare red_count variable
-    if (red_count_symb)
-    {
-        st = red_count_symb->makeVarDeclStmt();
-        st->setExpression(2, *eatr);
-        kernel_st->insertStmtAfter(*st);
-        st->addComment("! Number of threads to perform reduction\n");
-    }
-
-    // declare overall_blocks variable
-    if (s_overall_blocks)
-    {
-        SgSymbol *copy_overall = new SgSymbol(s_overall_blocks->variant(), s_overall_blocks->identifier(), idxTypeInKernel, s_overall_blocks->scope());
-        st = copy_overall->makeVarDeclStmt();
-        st->setExpression(2, *eatr);
-        kernel_st->insertStmtAfter(*st);
-        st->addComment("! Number of blocks to perform reduction \n");
-    }
-
-    // declare arrays to collect reduction values
-    for (rsl = red_struct_list; rsl; rsl = rsl->next)
-    {
-        if (rsl->loc_grid)
-        {
-            st = rsl->loc_grid->makeVarDeclStmt();
-            st->setExpression(2, *edev);
-            kernel_st->insertStmtAfter(*st);
-        }
-
-        st = rsl->red_grid->makeVarDeclStmt();
-        st->setExpression(2, *edev);
-        kernel_st->insertStmtAfter(*st);
-    }
-    if (red_struct_list)
-        st->addComment("! Array to collect reduction values\n");
-}
-
-
-SgStatement *AssignStatement(SgExpression *le, SgExpression *re)
-{
-    SgStatement *ass = NULL;
-    if (options.isOn(C_CUDA))   // in C Language
-        ass = new SgCExpStmt(SgAssignOp(*le, *re));
-    else         // in Fortan Language
-        ass = new SgAssignStmt(*le, *re);
-    return(ass);
-}
-
-SgStatement *FunctionCallStatement(SgSymbol *sf)
-{
-    SgStatement *stmt = NULL;
-    if (options.isOn(C_CUDA))   // in C Language
-        stmt = new SgCExpStmt(*new SgFunctionCallExp(*sf));
-    else         // in Fortan Language
-        stmt = new SgCallStmt(*sf);
-    return(stmt);
-}
-
-SgStatement *Declaration_Statement(SgSymbol *s)
-{
-    SgStatement *stmt = NULL;
-    if (options.isOn(C_CUDA))   // in C Language
-        stmt = makeSymbolDeclaration(s);
-    else         // in Fortan Language
-        stmt = s->makeVarDeclStmt();
-    return(stmt);
-}
-
-SgStatement *Assign_To_ibof(int rank)
-{
-    SgStatement *ass = NULL;
-    // ibof = (blockIdx%x - 1) * <rank*2>  for Fortran-Cuda
-    // or
-    // ibof = blockIdx%x  * <rank*2>       for C_Cuda
-    ass = AssignStatement(new SgVarRefExp(s_ibof), ExpressionForIbof(rank));
-    return(ass);
-}
-
-SgExpression *ExpressionForIbof(int rank)
-{
-    if (options.isOn(C_CUDA))
-        // blockIdx%x * <rank*2>
-        return(&
-        ((*new SgRecordRefExp(*s_blockidx, "x")) * (*new SgValueExp(rank * 2))));
-    else
-        // (blockIdx%x - 1) * <rank*2>
-        return(&
-        ((*new SgRecordRefExp(*s_blockidx, "x") - (*new SgValueExp(1))) * (*new SgValueExp(rank * 2))));
-}
-
-SgStatement *Assign_To_rest_blocks(int i)
-{
-    SgStatement *ass = NULL;
-    SgExpression *e = NULL;
-    // if i=0
-    //   rest_blocks = blockIdx%x - 1   for Fortran-Cuda
-    // or
-    //   rest_blocks = blockIdx%x       for C_Cuda
-    //if i>0
-    //   rest_blocks=rest_blocks - cur_blocks*blocks_i
-    if (i == 0)
-    {
-        e = &(*new SgVarRefExp(s_add_blocks) + *new SgRecordRefExp(*s_blockidx, "x"));
-        e = options.isOn(C_CUDA) ? e : &(*e - *new SgValueExp(1));
-    }
-    else
-        e = &(*new SgVarRefExp(s_rest_blocks) - *new SgVarRefExp(s_cur_blocks) * (*new SgVarRefExp(s_blocksS_k[i - 1])));
-
-    ass = AssignStatement(new SgVarRefExp(s_rest_blocks), e);
-    return(ass);
-}
-
-SgStatement *Assign_To_cur_blocks(int i, int nloop)
-{
-    SgStatement *ass = NULL;
-    SgExpression *e = NULL;
-    // cur_blocks = rest_blocks / blocks_i     i=0,1,2,...nloop-2
-    // or
-    // cur_blocks = rest_blocks                i = nloop-1
-    e = i != nloop - 1 ? &(*new SgVarRefExp(s_rest_blocks) / *new SgVarRefExp(s_blocksS_k[i])) : new SgVarRefExp(s_rest_blocks);
-    ass = AssignStatement(new SgVarRefExp(s_cur_blocks), e);
-    return(ass);
-}
-
-
-SgStatement *Assign_To_IndVar(SgStatement *dost, int il, int nloop, SgSymbol *sblock)
-{
-    SgExpression *thr = NULL, *re = NULL;
-    SgSymbol *indvar = NULL;
-    SgStatement *ass = NULL;
-    int H, ist;
-    // H == 2
-    // <sind> = blocks(ibof + <2*il>) + (threadIdx%x - 1) [ * <do_step> ]  , il=0,1,2
-    // or for C_Cuda
-    // <sind> = blocks(ibof + <2*il>) +  threadIdx%x  [ * <do_step> ]  , il=0,1,2
-
-    H = 2;
-    if (il == nloop - 1)
-        thr = new SgRecordRefExp(*s_threadidx, "x");
-    else if (il == (nloop - 2))
-        thr = new SgRecordRefExp(*s_threadidx, "y");
-    else if (il == nloop - 3)
-        thr = new SgRecordRefExp(*s_threadidx, "z");
-    indvar = dost->symbol();
-    if (il >= nloop - 3)
-    {
-        re = options.isOn(C_CUDA) ? thr : &(*thr - (*new SgValueExp(1)));
-        //estep=((SgForStmt *)dost)->step();
-        //if( estep && ( ist=IConstStep(estep)) != 1  )
-        if ((ist = IConstStep(dost)) != 1)
-            *re = *re * (*new SgValueExp(ist));
-        *re = (*blocksRef(sblock, H*il)) + (*re);
-    }
-    else
-        re = blocksRef(sblock, H*il);
-
-    ass = AssignStatement(new SgVarRefExp(indvar), re);
-    return(ass);
-}
-
-SgStatement *Assign_To_IndVar2(SgStatement *dost, int i, int nloop)
-{
-    SgStatement *ass = NULL;
-    SgExpression *e = NULL, *step_e = NULL, *eth = NULL, *es = NULL;
-
-    int ist;
-    // i = 1,...,nloop                   
-
-    e = new SgVarRefExp(s_begin[i - 1]);
-
-    if ((ist = IConstStep(dost)) == 0)
-        step_e = new SgVarRefExp(s_loopStep[i-1]);  // step is not constant 
-     else if (ist != 1 )                            // step is constant other than 1
-        step_e = new SgValueExp(ist);
-   
-    if (i == nloop)
-        // ind_i = begin_i + (cur_blocks*blockDim%x + threadIdx%x [- 1]) [ * step_i ]
-    {
-        eth = ThreadIdxRefExpr("x");
-        if (currentLoop && currentLoop->irregularAnalysisIsOn())
-            es = &((*new SgVarRefExp(s_cur_blocks) * *new SgRecordRefExp(*s_blockdim, "x") + *eth) / *new SgVarRefExp(s_warpsize));
-        else
-            es = &(*new SgVarRefExp(s_cur_blocks) * *new SgRecordRefExp(*s_blockdim, "x") + *eth);
-        es = step_e == NULL ? es : &(*es * *step_e);
-        e = &(*e + *es);
-    }
-    else if (i == nloop - 1)
-        // ind_i = begin_i + (cur_blocks*blockDim%y + threadIdx%y [- 1]) [ * step_i ]
-    {
-        eth = ThreadIdxRefExpr("y");
-        es = &(*new SgVarRefExp(s_cur_blocks) * *new SgRecordRefExp(*s_blockdim, "y") + *eth);
-        es = step_e == NULL ? es : &(*es * *step_e);
-        e = &(*e + *es);
-    }
-    else if (i == nloop - 2)
-        // ind_i = begin_i + (cur_blocks*blockDim%z + threadIdx%z [- 1]) [ * step_i ]
-    {
-        eth = ThreadIdxRefExpr("z");
-        es = &(*new SgVarRefExp(s_cur_blocks) * *new SgRecordRefExp(*s_blockdim, "z") + *eth);
-        es = step_e == NULL ? es : &(*es * *step_e);
-        e = &(*e + *es);
-    }
-    else // 1 <= i <= nloop - 3
-        // ind_i = begin_i + cur_blocks [ * step_i ]
-    {
-        es = new SgVarRefExp(s_cur_blocks);
-        es = step_e == NULL ? es : &(*es * *step_e);
-        e = &(*e + *es);
-    }
-    ass = AssignStatement(new SgVarRefExp(dost->symbol()), e);
-    return(ass);
-
-}
-
-SgExpression *IbaseRef(SgSymbol *base, int ind)
-{
-    return(new SgArrayRefExp(*base, (*new SgVarRefExp(s_ibof) + (*new SgValueExp(ind)))));
-}
-
-SgExpression *blocksRef(SgSymbol *sblock, int ind)
-{
-    return(new SgArrayRefExp(*sblock, (*new SgVarRefExp(s_ibof) + (*new SgValueExp(ind)))));
-}
-
-/*!!!
-void InsertDoWhileForRedCount(SgStatement *cp)
-{ // inserting after statement cp (DO_WHILE) the block for red_count calculation:
-//             red_count = 1
-//             do while (red_count * 2 .lt. threads%x * threads%y * threads%z)
-//                red_count = red_count * 2
-//             end do
-
-SgStatement *st_while, *ass;
-SgExpression *cond;
-
-RedCountSymbol();
-
-// red_count * 2 .lt. threads%x * threads%y * threads%z
-cond= & operator < ( *new SgVarRefExp(red_count_symb) * (*new SgValueExp(2)), *ThreadsGridSize(s_threads));
-// insert do while loop
-ass = new SgAssignStmt(*new SgVarRefExp(red_count_symb), (*new SgVarRefExp(red_count_symb))*(*new SgValueExp(2)));
-st_while = new SgWhileStmt(*cond,*ass);
-cp->insertStmtAfter(*st_while,*cp);
-//  insert:           red_count = 1
-ass = new SgAssignStmt(*new SgVarRefExp(red_count_symb), *new SgValueExp(1));
-cp->insertStmtAfter(*ass,*cp);
-}
-*/
-
-SgExpression *ThreadIdxRefExpr(char *xyz)
-{
-    if (options.isOn(C_CUDA))
-        return(new SgRecordRefExp(*s_threadidx, xyz));
-    else
-        return(&(*new SgRecordRefExp(*s_threadidx, xyz) - *new SgValueExp(1)));
-}
-
-SgExpression *ThreadIdxRefExpr(const char *xyz)
-{
-    if (options.isOn(C_CUDA))
-        return(new SgRecordRefExp(*s_threadidx, xyz));
-    else
-        return(&(*new SgRecordRefExp(*s_threadidx, xyz) - *new SgValueExp(1)));
-}
-
-SgExpression *BlockIdxRefExpr(char *xyz)
-{
-    if (!options.isOn(NO_BL_INFO))
-    {
-        if (options.isOn(C_CUDA))
-            return(new SgRecordRefExp(*s_blockidx, xyz));
-        else
-            return(&(*new SgRecordRefExp(*s_blockidx, xyz) - *new SgValueExp(1)));
-    }
-    // without blocks_info
-    if (options.isOn(C_CUDA))
-        return(&(*new SgVarRefExp(s_add_blocks) + *new SgRecordRefExp(*s_blockidx, xyz)));
-    else
-        return(&(*new SgVarRefExp(s_add_blocks) + *new SgRecordRefExp(*s_blockidx, xyz) - *new SgValueExp(1)));
-}
-
-SgExpression *BlockIdxRefExpr(const char *xyz)
-{
-    if (!options.isOn(NO_BL_INFO))
-    {
-        if (options.isOn(C_CUDA))
-            return(new SgRecordRefExp(*s_blockidx, xyz));
-        else
-            return(&(*new SgRecordRefExp(*s_blockidx, xyz) - *new SgValueExp(1)));
-    }
-    // without blocks_info
-    if (options.isOn(C_CUDA))
-        return(&(*new SgVarRefExp(s_add_blocks) + *new SgRecordRefExp(*s_blockidx, xyz)));
-    else
-        return(&(*new SgVarRefExp(s_add_blocks) + *new SgRecordRefExp(*s_blockidx, xyz) - *new SgValueExp(1)));
-}
-
-void CreateReductionBlocks(SgStatement *stat, int nloop, SgExpression *red_op_list, SgSymbol *red_count_symb)
-{
-    SgStatement *newst = NULL, *ass = NULL, *dost = NULL;
-    SgExpression *er = NULL, *re = NULL;
-    SgSymbol *i_var = NULL, *j_var = NULL;
-    reduction_operation_list *rsl = NULL;
-    int n = 0;
-    
-    formal_red_grid_list = NULL;
-
-    // index variables
-    dost = DoStmt(first_do_par, nloop);
-    i_var = dost->symbol();
-
-    if (!options.isOn(C_CUDA))
-    {
-        if (nloop > 1)
-            j_var = dost->controlParent()->symbol();
-        else
-        {
-            j_var = IndVarInKernel(i_var);
-            newst = Declaration_Statement(j_var);
-            kernel_st->insertStmtAfter(*newst, *kernel_st);
-        }
-    }
-
-    // declare '<red_var>_block' array for each reduction var
-    // <i_var> = threadIdx%x -1 + [ (threadIdx%y - 1) * blockDim%x [ + (threadIdx%z - 1) * blockDim%x * blockDim%y ] ]
-    // or C_Cuda
-    // <i_var> = threadIdx%x + [ threadIdx%y * blockDim%x [ + threadIdx%z * blockDim%x * blockDim%y ] ]
-
-    //re = & ( *new SgRecordRefExp(*s_threadidx,"x") - *new SgValueExp(1) );
-    re = ThreadIdxRefExpr("x");
-    if (options.isOn(C_CUDA))
-    {
-        re = &(*re + (*ThreadIdxRefExpr("y")) * (*new SgRecordRefExp(*s_blockdim, "x")));
-        re = &(*re + (*ThreadIdxRefExpr("z")) * (*new SgRecordRefExp(*s_blockdim, "x") * (*new SgRecordRefExp(*s_blockdim, "y"))));
-    }
-    else
-    {
-        if (nloop > 1)
-            //re = &( *re + ((*new SgRecordRefExp(*s_threadidx,"y")) - (*new SgValueExp(1))) * (*new SgRecordRefExp(*s_blockdim,"x")));
-            re = &(*re + (*ThreadIdxRefExpr("y")) * (*new SgRecordRefExp(*s_blockdim, "x")));
-        if (nloop > 2)
-            //re = &( *re + ((*new SgRecordRefExp(*s_threadidx,"z")) - (*new SgValueExp(1))) * (*new SgRecordRefExp(*s_blockdim,"x") * (*new SgRecordRefExp(*s_blockdim,"y"))));
-            re = &(*re + (*ThreadIdxRefExpr("z")) * (*new SgRecordRefExp(*s_blockdim, "x") * (*new SgRecordRefExp(*s_blockdim, "y"))));
-    }
-    ass = AssignStatement(new SgVarRefExp(i_var), re);
-
-    if (options.isOn(C_CUDA))
-        ass->addComment("// Reduction");
-    else
-        ass->addComment("! Reduction\n");
-
-    //looking through the reduction_op_list
-
-    SgIfStmt *if_st = NULL;
-    SgIfStmt *if_del = NULL;
-    SgIfStmt *if_new = NULL;
-    int declArrayVars = 1;
-
-    if (options.isOn(C_CUDA))
-        if_st = new SgIfStmt(SgEqOp(*new SgVarRefExp(i_var) % *new SgVarRefExp(s_warpsize), *new SgValueExp(0)));
-
-    bool assInserted = false;
-    for (er = red_op_list, rsl = red_struct_list, n = 1; er; er = er->rhs(), rsl = rsl->next, n++)
-    {   
-        if (rsl->redvar_size < 0 && options.isOn(C_CUDA)) // array of [UNknown size] or arrays that have [ > 16 elems]
-            continue;
-
-        if (!assInserted)
-        {
-            stat->insertStmtBefore(*ass, *stat->controlParent());
-            assInserted = true;
-        }
-
-        if (options.isOn(C_CUDA))
-            ReductionBlockInKernel_On_C_Cuda(stat, i_var, er->lhs(), rsl, if_st, if_del, if_new, declArrayVars);
-        else
-            ReductionBlockInKernel(stat, nloop, i_var, j_var, er->lhs(), rsl, red_count_symb, n);
-    }
-
-    
-    if (options.isOn(C_CUDA) && assInserted)
-        stat->insertStmtBefore(*if_st, *stat->controlParent());
-}
-
-char* getMultipleTypeName(SgType *base, int num)
-{
-    char dnum = '0' + num;
-    char *ret = new char[32];
-    ret[0] = '\0';
-
-    if (base->variant() == SgTypeChar()->variant())
-        strcat(ret, "char");
-    else if (base->variant() == SgTypeInt()->variant())
-        strcat(ret, "int");
-    else if (base->variant() == SgTypeDouble()->variant())
-        strcat(ret, "double");
-    else if (base->variant() == SgTypeFloat()->variant())
-        strcat(ret, "float");
-
-    int len = strlen(ret);
-    if (len != 0 && num > 0)
-    {
-        ret[len] = dnum;
-        ret[len + 1] = '\0';
-    }
-    return ret;
-}
-
-void ReductionBlockInKernel_On_C_Cuda(SgStatement *stat, SgSymbol *i_var, SgExpression *ered, reduction_operation_list *rsl,
-    SgIfStmt *if_st, SgIfStmt *&delIf, SgIfStmt *&newIf, int &declArrayVars, bool withGridReduction, bool across)
-{
-    SgStatement *newst;
-    SgFunctionCallExp *fun_ref = NULL;
-
-    SgExpression *ex = &(*new SgVarRefExp(i_var) / *new SgVarRefExp(s_warpsize));
-    // blockDim.x * blockDim.y * blockDim.z / warpSize
-    SgExpression *ex1 = &(*new SgRecordRefExp(*s_blockdim, "x") * *new SgRecordRefExp(*s_blockdim, "y") * *new SgRecordRefExp(*s_blockdim, "z") / *new SgVarRefExp(s_warpsize));
-    // blockDim.x * blockDim.y * blockDim.z
-    SgExpression *ex2 = &(*new SgRecordRefExp(*s_blockdim, "x") * *new SgRecordRefExp(*s_blockdim, "y") * *new SgRecordRefExp(*s_blockdim, "z"));
-
-    if (rsl->redvar_size != 0) // array reduction
-    {
-        if (rsl->redvar_size > 0) // array of known size 
-        {
-            char *funcName = new char[256];
-
-            //declare red_var variable
-            if (rsl->array_red_size > 0)
-            {
-                SgSymbol *s = rsl->redvar;
-                SgArrayType *arrT = new SgArrayType(*C_Type(s->type()->baseType()));
-                arrT->addRange(*new SgValueExp(rsl->array_red_size));
-                SgSymbol *forDecl = new SgVariableSymb(rsl->redvar->identifier(), *arrT, *kernel_st);
-                newst = Declaration_Statement(forDecl);
-                kernel_st->insertStmtAfter(*newst, *kernel_st);
-            }
-            else
-            {
-                newst = Declaration_Statement(RedVariableSymbolInKernel(rsl->redvar, NULL, NULL));
-                kernel_st->insertStmtAfter(*newst, *kernel_st);
-            }
-
-            funcName[0] = '\0';
-            strcat(funcName, RedFunctionInKernelC((const int)RedFuncNumber(ered->lhs()), rsl->redvar_size, 0));
-            SgExpression *tmplArgs = new SgExpression(CONS, new SgTypeRefExp(*C_Type(rsl->redvar->type())), new SgValueExp(rsl->redvar_size), NULL);
-
-            fun_ref = new SgFunctionCallExp(*RedFunctionSymbolInKernel(funcName));
-            fun_ref->addArg(*new SgVarRefExp(rsl->redvar));
-            fun_ref->setRhs(tmplArgs);
-            stat->insertStmtBefore(*new SgCExpStmt(*fun_ref), *stat->controlParent());
-
-            int idx = 0;
-            for (int k = 0; k < rsl->redvar_size; ++k)
-            {
-                newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *new SgVarRefExp(s_overall_blocks) * *new SgValueExp(idx)
-                    + *BlockIdxRefExpr("x") * *ex1 + *ex), new SgArrayRefExp(*rsl->redvar, *new SgValueExp(idx)));
-                idx++;
-                if_st->lastExecutable()->insertStmtAfter(*newst);
-            }
-        }
-        else // array of [UNknown size] or arrays that have [ > 16 elems]
-        {
-            int rank = Rank(rsl->redvar);
-
-            if (rsl->array_red_size < 1)
-            {
-                char *newN = new char[strlen(rsl->redvar->identifier()) + 9];
-                newN[0] = '\0';
-                strcat(newN, "__addr_");
-                strcat(newN, rsl->redvar->identifier());
-                SgSymbol *tmp = new SgSymbol(VARIABLE_NAME, newN, C_DvmType(), kernel_st);
-                newst = Declaration_Statement(tmp);
-                newst->addDeclSpec(BIT_CUDA_SHARED);
-                kernel_st->insertStmtAfter(*newst, *kernel_st);
-
-                // insert IF-block with new stmts 
-                SgArrayType *arr = new SgArrayType(*C_Type(rsl->redvar->type()->baseType()));
-                SgExpression *dims = RedVarUpperBound(rsl->dimSize_arg, 1);
-                for (int i = 2; i <= rank; ++i)
-                    dims = &(*dims * *RedVarUpperBound(rsl->dimSize_arg, i));
-                // new type[ num * blockDims]
-                arr->addDimension(&(*dims * *new SgRecordRefExp(*s_blockdim, "x") * *new SgRecordRefExp(*s_blockdim, "y") * *new SgRecordRefExp(*s_blockdim, "z")));
-                SgNewExp *newEx = new SgNewExp(*arr);
-
-                if (newIf)
-                    newIf->lastExecutable()->insertStmtAfter(*new SgCExpStmt(SgAssignOp(*new SgVarRefExp(rsl->redvar), *newEx)));
-                else
-                {
-                    // i = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * (blockDim.x * blockDim.y);
-                    SgStatement *idx = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(i_var),
-                        *new SgRecordRefExp(*s_threadidx, "x") + *new SgRecordRefExp(*s_threadidx, "y") * *new SgRecordRefExp(*s_blockdim, "x") + *new SgRecordRefExp(*s_threadidx, "z") * *new SgRecordRefExp(*s_blockdim, "x")* *new SgRecordRefExp(*s_blockdim, "y")));
-                    newIf = new SgIfStmt(SgEqOp(*new SgVarRefExp(i_var), *new SgValueExp(0)), *new SgCExpStmt(SgAssignOp(*new SgVarRefExp(rsl->redvar), *newEx)));
-
-                    kernel_st->lexNext()->insertStmtAfter(*FunctionCallStatement(SyncthreadsSymbol()));
-                    kernel_st->lexNext()->insertStmtAfter(*newIf);
-                    kernel_st->lexNext()->insertStmtAfter(*idx);
-                    idx->addComment(" // Allocate memory for reduction");
-                }
-
-                SgPointerType *pointer = new SgPointerType(*C_Type(rsl->redvar->type()->baseType()));
-                SgReferenceType *ref = new SgReferenceType(*C_DvmType());
-                newIf->lastExecutable()->insertStmtAfter(*new SgCExpStmt(SgAssignOp(*new SgVarRefExp(tmp), *new SgCastExp(*ref, *new SgVarRefExp(rsl->redvar)))));
-                newIf->lastNodeOfStmt()->lexNext()->insertStmtAfter(*new SgCExpStmt(SgAssignOp(*new SgVarRefExp(rsl->redvar), *new SgVarRefExp(rsl->redvar) + *new SgVarRefExp(i_var))));
-                newIf->lastNodeOfStmt()->lexNext()->insertStmtAfter(*new SgCExpStmt(SgAssignOp(*new SgVarRefExp(rsl->redvar), *new SgCastExp(*pointer, *new SgVarRefExp(tmp)))));
-
-
-                // insert IF-block with delete stmts
-                SgDeleteExp *delEx = new SgDeleteExp(*new SgVarRefExp(rsl->redvar));
-                if (delIf)
-                    delIf->lastExecutable()->insertStmtAfter(*new SgCExpStmt(*delEx));
-                else
-                {
-                    delIf = new SgIfStmt(SgEqOp(*new SgVarRefExp(i_var), *new SgValueExp(0)), *new SgCExpStmt(*delEx));
-                    newst = FunctionCallStatement(SyncthreadsSymbol());
-
-                    if_st->lastNodeOfStmt()->insertStmtAfter(*delIf);
-                    if_st->lastNodeOfStmt()->insertStmtAfter(*newst);
-                    newst->addComment(" // Deallocate memory for reduction");
-                }
-            }
-
-            //declare red_var variable
-            if (rsl->array_red_size > 0)
-            {
-                SgSymbol *s = rsl->redvar;
-                SgArrayType *arrT = new SgArrayType(*C_Type(s->type()->baseType()));
-                arrT->addRange(*new SgValueExp(rsl->array_red_size));
-                SgSymbol *forDecl = new SgVariableSymb(rsl->redvar->identifier(), *arrT, *kernel_st);
-                newst = Declaration_Statement(forDecl);
-                kernel_st->insertStmtAfter(*newst, *kernel_st);
-            }
-            else
-            {
-                newst = Declaration_Statement(RedVariableSymbolInKernel(rsl->redvar, NULL, NULL));
-                kernel_st->insertStmtAfter(*newst, *kernel_st);
-            }
-
-            for (int i = declArrayVars; i <= rank; ++i)
-            {
-                newst = Declaration_Statement(IndexLoopVar(i)); //declare red_varIDX variable
-                kernel_st->insertStmtAfter(*newst, *kernel_st);
-            }
-            declArrayVars = MAX(declArrayVars, rank);
-
-
-            char *funcName = new char[256];
-            SgExpression *tmplArgs;
-
-            funcName[0] = '\0';
-            strcat(funcName, RedFunctionInKernelC((const int)RedFuncNumber(ered->lhs()), rsl->array_red_size, 0));
-            if (rsl->array_red_size > 1)
-                tmplArgs = new SgExpression(CONS, new SgTypeRefExp(*C_Type(rsl->redvar->type())), new SgValueExp(rsl->array_red_size), NULL);
-            else
-                tmplArgs = new SgExpression(CONS, new SgTypeRefExp(*C_Type(rsl->redvar->type())), RedVarUpperBound(rsl->dimSize_arg, 1), NULL);
-
-            fun_ref = new SgFunctionCallExp(*RedFunctionSymbolInKernel(funcName));
-            fun_ref->addArg(*new SgVarRefExp(rsl->redvar));
-            if (rsl->array_red_size > 0)
-                fun_ref->setRhs(tmplArgs);
-            else
-            {
-                // blockDims
-                fun_ref->addArg(*new SgRecordRefExp(*s_blockdim, "x") * *new SgRecordRefExp(*s_blockdim, "y") * *new SgRecordRefExp(*s_blockdim, "z"));
-                SgExpression *dims = RedVarUpperBound(rsl->dimSize_arg, 1);
-                for (int i = 2; i <= rank; ++i)
-                    dims = &(*dims * *RedVarUpperBound(rsl->dimSize_arg, i));
-                fun_ref->addArg(*dims);
-            }
-            stat->insertStmtBefore(*new SgCExpStmt(*fun_ref), *stat->controlParent());
-
-            if (rsl->array_red_size > 1)
-            {
-                int idx = 0;
-                for (int k = 0; k < rsl->array_red_size; ++k)
-                {
-                    newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *new SgVarRefExp(s_overall_blocks) * *new SgValueExp(idx)
-                        + *BlockIdxRefExpr("x") * *ex1 + *ex), new SgArrayRefExp(*rsl->redvar, *new SgValueExp(idx)));
-                    idx++;
-                    if_st->lastExecutable()->insertStmtAfter(*newst);
-                }
-            }
-            else
-            {
-                SgExpression *linearIdx = new SgVarRefExp(IndexLoopVar(1));
-                for (int i = 2; i <= rank; ++i)
-                {
-                    SgExpression *dims = RedVarUpperBound(rsl->dimSize_arg, 1);
-                    for (int k = 2; k < i; ++k)
-                        dims = &(*dims * *RedVarUpperBound(rsl->dimSize_arg, k));
-                    linearIdx = &(*linearIdx + *new SgVarRefExp(IndexLoopVar(i)) * *dims);
-                }
-                newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *new SgVarRefExp(s_overall_blocks) * *linearIdx
-                    + *BlockIdxRefExpr("x") * *ex1 + *ex), new SgArrayRefExp(*rsl->redvar, *linearIdx * *ex2));
-                if_st->lastExecutable()->insertStmtAfter(*doLoopNestForReductionArray(rsl, newst));
-            }
-        }
-    }
-    else if (rsl->locvar) // maxloc/minloc reduction scalar
-    {
-        newst = Declaration_Statement(LocRedVariableSymbolInKernel(rsl)); //declare location variable
-        kernel_st->insertStmtAfter(*newst, *kernel_st);
-
-        //  __dvmh_blockReduce<op>Loc(<red_var>, <loc_var>)
-        fun_ref = new SgFunctionCallExp(*RedFunctionSymbolInKernel((char *)RedFunctionInKernelC((const int)RedFuncNumber(ered->lhs()), 1, rsl->number)));
-        fun_ref->addArg(*new SgVarRefExp(*rsl->redvar));
-        if (rsl->number == 1)
-            fun_ref->addArg(SgAddrOp(*new SgVarRefExp(*rsl->locvar)));
-        else
-            fun_ref->addArg(*new SgVarRefExp(*rsl->locvar));
-
-        SgExpression *tmplArgs = new SgExpression(CONS, new SgTypeRefExp(*C_Type(rsl->redvar->type())),
-            new SgExpression(CONS, new SgTypeRefExp(*C_Type(rsl->locvar->type())), new SgValueExp(rsl->number), NULL), NULL);
-        fun_ref->setRhs(tmplArgs);
-
-        stat->insertStmtBefore(*new SgCExpStmt(*fun_ref), *stat->controlParent());
-
-        if (across)
-        {
-            newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *ex), new SgVarRefExp(rsl->redvar));
-
-            SgExpression* cond = if_st->conditional();
-            int redVar = RedFuncNumber(ered->lhs());
-            if (redVar == 9) // maxloc
-                cond = &(*cond && (*new SgVarRefExp(rsl->redvar) > *new SgArrayRefExp(*rsl->red_grid, *ex)));
-            else if (redVar == 10) // minloc
-                cond = &(*cond && (*new SgVarRefExp(rsl->redvar) < *new SgArrayRefExp(*rsl->red_grid, *ex)));
-
-            if_st->setConditional(cond);
-        }
-        else
-            newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *BlockIdxRefExpr("x") * *ex1 + *ex), new SgVarRefExp(rsl->redvar));
-
-        if_st->insertStmtAfter(*newst);
-
-        if (rsl->number > 1)
-        {
-            for (int i = 0; i < rsl->number; ++i)
-            {
-                if (across)
-                    newst = AssignStatement(new SgArrayRefExp(*rsl->loc_grid, *new SgValueExp(rsl->number) * *ex + *new SgValueExp(i)), new SgArrayRefExp(*rsl->locvar, *new SgValueExp(i)));
-                else
-                    newst = AssignStatement(new SgArrayRefExp(*rsl->loc_grid, *new SgValueExp(rsl->number) * (*BlockIdxRefExpr("x") * *ex1 + *ex) + *new SgValueExp(i)), new SgArrayRefExp(*rsl->locvar, *new SgValueExp(i)));
-                if_st->lastExecutable()->insertStmtAfter(*newst);
-            }
-        }
-        else
-        {
-            if (across)
-                newst = AssignStatement(new SgArrayRefExp(*rsl->loc_grid, *ex), new SgVarRefExp(*rsl->locvar));
-            else
-                newst = AssignStatement(new SgArrayRefExp(*rsl->loc_grid, *BlockIdxRefExpr("x") * *ex1 + *ex), new SgVarRefExp(*rsl->locvar));
-            if_st->lastExecutable()->insertStmtAfter(*newst);
-        }
-
-    }
-    else    // scalar reduction
-    {
-        //  <red_var> = __dvmh_blockReduce<red-op>(<red_var>)
-        fun_ref = new SgFunctionCallExp(*RedFunctionSymbolInKernel((char *)RedFunctionInKernelC(RedFuncNumber(ered->lhs()), 1, 0)));
-        fun_ref->addArg(*new SgVarRefExp(*rsl->redvar));
-        newst = AssignStatement(new SgVarRefExp(*rsl->redvar), fun_ref);
-        stat->insertStmtBefore(*newst, *stat->controlParent());
-
-        if (withGridReduction)
-        {
-            SgExpression* gridRef = NULL;
-            if (across)
-                gridRef = new SgArrayRefExp(*rsl->red_grid, *ex);
-            else
-                gridRef = new SgArrayRefExp(*rsl->red_grid, *BlockIdxRefExpr("x") * *ex1 + *ex);
-
-            SgExpression* redRef = new SgVarRefExp(rsl->redvar);
-            int redVar = RedFuncNumber(ered->lhs());
-            if (redVar == 1) // sum
-                newst = AssignStatement(gridRef, &(gridRef->copy() + *redRef));
-            if (redVar == 2) // product
-                newst = AssignStatement(gridRef, &(gridRef->copy() * *redRef));
-            if (redVar == 3) // max
-            {
-                SgFunctionCallExp* fCall = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "max"));
-                fCall->addArg(gridRef->copy());
-                fCall->addArg(*redRef);
-                newst = AssignStatement(gridRef, fCall);
-            }
-            if (redVar == 4) // min
-            {
-                SgFunctionCallExp* fCall = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "min"));
-                fCall->addArg(gridRef->copy());
-                fCall->addArg(*redRef);
-                newst = AssignStatement(gridRef, fCall);
-            }
-            if (redVar == 5) // and
-                newst = AssignStatement(gridRef, new SgExpression(BITAND_OP, &gridRef->copy(), redRef));
-            if (redVar == 6) // or
-                newst = AssignStatement(gridRef, new SgExpression(BITOR_OP, &gridRef->copy(), redRef));
-
-#ifdef INTEL_LOGICAL_TYPE
-            if (redVar == 7) // neqv
-                newst = AssignStatement(gridRef, new SgExpression(XOR_OP, &gridRef->copy(), redRef));
-            if (redVar == 8) // eqv
-                newst = AssignStatement(gridRef, new SgExpression(BIT_COMPLEMENT_OP, new SgExpression(XOR_OP, &gridRef->copy(), redRef), NULL));            
-#else
-            if (redVar == 7) // neqv
-                newst = AssignStatement(gridRef, &(gridRef->copy() != *redRef));
-            if (redVar == 8) // eqv
-                newst = AssignStatement(gridRef, &(gridRef->copy() == *redRef));
-#endif
-        }
-        else
-            newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *BlockIdxRefExpr("x") * *ex1 + *ex), new SgVarRefExp(rsl->redvar));
-        if_st->insertStmtAfter(*newst);
-    }
-}
-
-void ReductionBlockInKernel(SgStatement *stat, int nloop, SgSymbol *i_var, SgSymbol *j_var, SgExpression *ered, reduction_operation_list *rsl, SgSymbol *red_count_symb, int n)
-{
-    SgStatement *ass = NULL, *newst = NULL, *current = NULL, *if_st = NULL, *while_st = NULL, *typedecl = NULL, *st = NULL, *do_st = NULL;
-    SgExpression *le = NULL, *re = NULL, *eatr = NULL, *cond = NULL, *ev = NULL, *subscript_list = NULL;
-    SgSymbol *red_var = NULL, *red_var_k = NULL, *s_block = NULL, *loc_var = NULL, *sf = NULL;
-    SgType *rtype = NULL;
-    int i, ind;
-    loc_el_num = 0;
-
-    //call syncthreads() for second, third,... reduction operation (n>1) 
-    if (n > 1)
-    {
-        newst = FunctionCallStatement(SyncthreadsSymbol());
-        stat->insertStmtBefore(*newst, *stat->controlParent());
-    }
-    // analys of reduction operation 
-    // ered - reduction operation (variant==ARRAY_OP)
-    ev = ered->rhs(); // reduction variable reference for reduction operations except MINLOC,MAXLOC  
-    if (isSgExprListExp(ev))    // for MAXLOC,MINLOC            
-    {
-        loc_var = ev->rhs()->lhs()->symbol();  //location array reference
-        ev = ev->lhs(); // reduction variable reference 
-    }
-    else
-        loc_var = NULL;
-
-    //              <red_var>_block([ k,] i) = <red_var>       [k=LowerBound:UpperBound]
-    // or for MAXLOC,MINLOC
-    //              <red_var>_block(i)%<red_var>    = <red_var>
-    //              <red_var>_block(i)%<loc_var>(1) = <loc_var>(1)
-    //             [<red_var>_block(i)%<loc_var>(2) = <loc_var>(2) ]
-    //                    .   .   .
-    // create and declare array '<red_var>_block'     
-    red_var = ev->symbol();
-
-    if (rsl->locvar)
-    {
-        newst = Declaration_Statement(RedVariableSymbolInKernel(rsl->locvar, NULL, NULL)); //declare location variable
-        kernel_st->insertStmtAfter(*newst, *kernel_st);
-        //SymbolChange_InBlock(new SgSymbol(VARIABLE_NAME,"aaaa",rsl->locvar->type(),kernel_st),rsl->locvar,cur_in_kernel,cur_in_kernel->lastNodeOfStmt());
-    }
-
-    if (rsl->redvar_size != 0)
-    {   
-        red_var_k = RedVariableSymbolInKernel(rsl->redvar, rsl->dimSize_arg, rsl->lowBound_arg);
-        newst = Declaration_Statement(red_var_k); //declare reduction variable
-        kernel_st->insertStmtAfter(*newst, *kernel_st); 
-        if(rsl->locvar)
-            Error("Reduction variable %s is array (array element), not implemented yet for GPU", ered->rhs()->rhs()->lhs()->symbol()->identifier(), 597, dvm_parallel_dir); 
-    }
-    rtype = (rsl->redvar_size == 0) ? TypeOfRedBlockSymbol(ered) : red_var_k->type();
-
-    s_block = RedBlockSymbolInKernel(red_var, rtype);
-
-    newst = Declaration_Statement(s_block);
-
-    if (options.isOn(C_CUDA)) // in C Language
-        newst->addDeclSpec(BIT_CUDA_SHARED | BIT_EXTERN);
-    else      // in Fortran Language
-    {
-        eatr = new SgExprListExp(*new SgExpression(ACC_SHARED_OP));
-        newst->setExpression(2, *eatr);
-    }
-
-    kernel_st->insertStmtAfter(*newst, *kernel_st);
-
-    // create assign statement[s]     
-    if (isSgExprListExp(ered->rhs())) //MAXLOC,MINLOC
-    {
-        typedecl = MakeStructDecl(rtype->symbol());
-        kernel_st->insertStmtAfter(*typedecl, *kernel_st);
-        sf = RedVarFieldSymb(s_block);
-        le = RedLocVar_Block_Ref(s_block, i_var, NULL, new SgVarRefExp((sf)));
-        re = new SgVarRefExp(red_var);
-        ass = AssignStatement(le, re);
-        stat->insertStmtBefore(*ass, *stat->controlParent());
-        for (i = 1; i <= rsl->number; i++)
-        {
-            ind = options.isOn(C_CUDA) ? i - 1 : i;
-            le = RedLocVar_Block_Ref(s_block, i_var, NULL, new SgArrayRefExp(*((SgFieldSymb *)sf)->nextField(), *new SgValueExp(ind)));
-            if (isSgArrayType(rsl->locvar->type()))
-                re = new SgArrayRefExp(*(rsl->locvar), *LocVarIndex(rsl->locvar, i));
-            else
-                re = new SgVarRefExp(*(rsl->locvar));
-            ass = AssignStatement(le, re);
-            stat->insertStmtBefore(*ass, *stat->controlParent());
-        }
-    }
-    else if (rsl->redvar_size > 0) //reduction variable is array of known size
-
-        for (i = 0; i < rsl->redvar_size; i++)
-        {
-            SgExpression *red_ind;
-            red_ind = RedVarIndex(red_var, i);
-            le = RedVar_Block_2D_Ref(s_block, i_var, red_ind);
-            re = new SgArrayRefExp(*red_var, *red_ind);
-            ass = AssignStatement(le, re);
-            stat->insertStmtBefore(*ass, *stat->controlParent());
-        }
-
-    else  if (rsl->redvar_size == 0) //reduction variable is scalar      
-    {
-        le = RedVar_Block_Ref(s_block, i_var);
-        re = new SgVarRefExp(red_var);
-        ass = AssignStatement(le, re);
-        stat->insertStmtBefore(*ass, *stat->controlParent());
-    }
-    else                             //reduction variable is array of unknown size
-    {           
-        subscript_list = SubscriptListOfRedArray(rsl->redvar);
-        le = RedArray_Block_Ref(s_block, i_var, &subscript_list->copy());
-        re = new SgArrayRefExp(*rsl->redvar, subscript_list->copy());        
-        ass = AssignStatement(le, re);
-        // create loop nest and insert it before 'stat'
-        do_st = doLoopNestForReductionArray(rsl, ass);
-        stat->insertStmtBefore(*do_st, *stat->controlParent());
-        while (do_st->variant() == FOR_NODE)
-            do_st = do_st->lexNext();
-        stat = do_st->lexNext(); // CONTROL_END of innermost loop
-    }
-
-    //call syncthreads()    
-    newst = FunctionCallStatement(SyncthreadsSymbol());
-    stat->insertStmtBefore(*newst, *stat->controlParent());
-
-    // [if (i .lt. red_count) then ]  // for last reduction of loop /*24.10.12*/
-    //         if (i + red_count .lt. blockDim%x [* blockDim%y [* blockDim%z]])  then
-    //            <red_var>_block([ k,] i) = <red_op> (<red_var>_block([ k,] i), <red_var>_block([ k,] i + red_count)) [k=LowerBound:UpperBound]
-    //         end if
-    // [  endif ]
-
-    //  or for MAXLOC,MINLOC
-    // [if (i .lt. red_count) then ]  // for last reduction of loop /*24.10.12*/
-    //         if (i + red_count .lt. blockDim%x [* blockDim%y [* blockDim%z]])  then
-    //            if(<red_var>_block(i + red_count)%<red_var> .gt. <red_var>_block(i)%<red_var>) then//MAXLOC
-    //              <red_var>_block(i)%<red_var>    = <red_var>_block(i + red_count)%<red_var>
-    //              <red_var>_block(i)%<loc_var>(1) = <red_var>_block(i + red_count)%<loc_var>(1)
-    //             [<red_var>_block(i)%<loc_var>(2) = <red_var>_block(i + red_count)%<loc_var>(2) ]
-    //                           .   .   .
-    //            endif
-    //         endif
-    //  [ endif ]
-    re = new SgRecordRefExp(*s_blockdim, "x");
-    if (nloop > 1)
-        re = &(*re * (*new SgRecordRefExp(*s_blockdim, "y")));
-    if (nloop > 2)
-        re = &(*re * (*new SgRecordRefExp(*s_blockdim, "z")));
-    cond = &operator < ((*new SgVarRefExp(i_var) + *new SgVarRefExp(red_count_symb)), *re);
-
-    if (isSgExprListExp(ered->rhs())) //MAXLOC,MINLOC
-        newst = RedOp_If(i_var, s_block, ered, red_count_symb, rsl->number);
-    else
-        newst = RedOp_Assign(i_var, s_block, ered, red_count_symb, 0, rsl->redvar_size < 0 ? &subscript_list->copy() : NULL);
-    if_st = new SgIfStmt(*cond, *newst);
-    if (rsl->redvar_size > 0)
-       for (i = 1; i < rsl->redvar_size; i++)
-       {
-            newst->insertStmtAfter(*(ass = RedOp_Assign(i_var, s_block, ered, red_count_symb, i, NULL)), *if_st);
-            newst = ass;
-       }
-    if (!rsl->next && rsl->redvar_size >= 0) //last reduction of loop, not array of unknown size 
-    {
-        cond = &operator < (*new SgVarRefExp(i_var), *new SgVarRefExp(red_count_symb));
-        newst = new SgIfStmt(*cond, *if_st);
-        stat->insertStmtBefore(*newst, *stat->controlParent());
-     }
-     else
-        stat->insertStmtBefore(*if_st, *stat->controlParent());
-
-     //         j = red_count / 2
-    ass = AssignStatement(new SgVarRefExp(j_var), &(*new SgVarRefExp(red_count_symb) / *new SgValueExp(2)));
-    if (!rsl->next && rsl->redvar_size >= 0) //last reduction of loop, not array of unknown size
-        if_st->insertStmtAfter(*ass, *newst);
-    //!!!if_st->insertStmtAfter(*ass,*stat->controlParent()); //!!!if_st->insertStmtAfter(*ass,*newst);
-    else
-        stat->insertStmtBefore(*ass, *stat->controlParent());
-    current = ass;
-    //!!!last = ass->lexNext();
-
-    //         if (i .eq. 0) then
-    //            <red_var>_grid( blockIdx%x - 1,[ m]) = <red_var>_block([ k,] 0)     [k=LowerBound:UpperBound, m=1,...]
-    //         endif
-    //
-    //               or for MAXLOC,MINLOC
-    //
-    //         if (i .eq. 0) then
-    //            <red_var>_grid   (blockIdx%x [ - 1 ] ) = <red_var>_block(0)%<red_var>
-    //            <loc_var>_grid(1, blockIdx%x  - 1  ) = <red_var>_block(0)%<loc_var>(1)   or if C_Cuda  <loc_var>_grid[(L-1)*blockIdx%x] =     <red_var>_block(0)%<loc_var>[0]
-    //            <loc_var>_grid(2, blockIdx%x  - 1  ) = <red_var>_block(0)%<loc_var>(2)   or if C_Cuda  <loc_var>_grid[(L-1)*blockIdx%x + 1] = <red_var>_block(0)%<loc_var>[1]
-    //                  .    .    .
-    //          
-    //         endif
-
-    cond = &SgEqOp(*new SgVarRefExp(i_var), *new SgValueExp(0));
-    if (isSgExprListExp(ered->rhs())) //MAXLOC,MINLOC
-        //newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *new SgRecordRefExp(*s_blockidx,"x") - *new SgValueExp(1) ) ,RedLocVar_Block_Ref(s_block,NULL,NULL,new SgVarRefExp((sf)))); 
-        newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *BlockIdxRefExpr("x")), RedLocVar_Block_Ref(s_block, NULL, NULL, new SgVarRefExp((sf))));
-    else
-    {
-        if (rsl->redvar_size > 0)
-            //newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *new SgRecordRefExp(*s_blockidx,"x") - *new SgValueExp(1) , *new SgValueExp(1)) , new SgArrayRefExp(*s_block, *RedVarIndex(red_var,0),*new SgValueExp(0))); 
-            newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *BlockIdxRefExpr("x"), *new SgValueExp(1)), new SgArrayRefExp(*s_block, *RedVarIndex(red_var, 0), *new SgValueExp(0)));
-        else if (rsl->redvar_size == 0)
-            //newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *new SgRecordRefExp(*s_blockidx,"x") - *new SgValueExp(1) ) , new SgArrayRefExp(*s_block, *new SgValueExp(0)));         
-            newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *BlockIdxRefExpr("x")), new SgArrayRefExp(*s_block, *new SgValueExp(0)));
-        else
-            newst = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *AddListToList(new SgExprListExp(*BlockIdxRefExpr("x")), &subscript_list->copy())), new SgArrayRefExp(*s_block, *AddListToList( &subscript_list->copy(), new SgValueExp(0))) ); 
-    }
-       
-    if_st = new SgIfStmt(*cond, *newst);
-    if (rsl->redvar_size > 0)
-    for (i = 1; i < rsl->redvar_size; i++)
-    {
-        //ass = AssignStatement(new SgArrayRefExp(*rsl->red_grid,*new SgRecordRefExp(*s_blockidx,"x") - *new SgValueExp(1), *new SgValueExp(i+1) ) , new SgArrayRefExp(*s_block, *RedVarIndex(red_var,i),*new SgValueExp(0))); 
-        ass = AssignStatement(new SgArrayRefExp(*rsl->red_grid, *BlockIdxRefExpr("x"), *new SgValueExp(i + 1)), new SgArrayRefExp(*s_block, *RedVarIndex(red_var, i), *new SgValueExp(0)));
-        newst->insertStmtAfter(*ass, *if_st);
-        newst = ass;
-    }
-    current->insertStmtAfter(*if_st, *current->controlParent());
-    if (isSgExprListExp(ered->rhs())) //MAXLOC,MINLOC
-    {
-        st = newst;
-        for (i = 1; i <= rsl->number; i++)
-        {
-            ind = options.isOn(C_CUDA) ? i - 1 : i;
-            re = RedLocVar_Block_Ref(s_block, NULL, NULL, new SgArrayRefExp(*((SgFieldSymb *)sf)->nextField(), *new SgValueExp(ind)));
-            //le = new SgArrayRefExp(*rsl->loc_grid, *new SgValueExp(ind), *new SgRecordRefExp(*s_blockidx,"x") - *new SgValueExp(1) );
-            if (options.isOn(C_CUDA))
-                le = new SgArrayRefExp(*rsl->loc_grid, *LinearIndex(ind, rsl->number));
-            else
-                le = new SgArrayRefExp(*rsl->loc_grid, *new SgValueExp(ind), *BlockIdxRefExpr("x"));
-            ass = AssignStatement(le, re);
-            st->insertStmtAfter(*ass, *if_st);
-            st = ass;
-        }
-    }
-
-    //         do while(j .ge. 1)
-    //            call syncthreads()
-    //            if (i .lt. j) then
-    //
-    //               <red_var>_block([ k,] i) = <red_op>(<red_var>_block([ k,] i), <red_var>_block([ k,] i + j))
-    //
-    //               or for MAXLOC,MINLOC
-    //
-    //             if(<red_var>_block(i + j)%<red_var> .gt. <red_var>_block(i)%<red_var>) then //MAXLOC
-    //              <red_var>_block(i)%<red_var>    = <red_var>_block(i + j)%<red_var>
-    //              <red_var>_block(i)%<loc_var>(1) = <red_var>_block(i + j)%<loc_var>(1)
-    //             [<red_var>_block(i)%<loc_var>(2) = <red_var>_block(i + j)%<loc_var>(2) ]
-    //                           .   .   .
-    //            endif
-
-    //            end if
-    //         end do
-
-    cond = &operator >=(*new SgVarRefExp(j_var), *new SgValueExp(1));
-    newst = FunctionCallStatement(SyncthreadsSymbol());
-    while_st = new SgWhileStmt(*cond, *newst);
-    current->insertStmtAfter(*while_st, *current->controlParent());
-    current = newst;
-    ass = AssignStatement(new SgVarRefExp(j_var), &(*new SgVarRefExp(j_var) / *new SgValueExp(2)));
-    current->insertStmtAfter(*ass, *while_st);
-    cond = &operator < (*new SgVarRefExp(i_var), *new SgVarRefExp(j_var));
-    if (isSgExprListExp(ered->rhs())) //MAXLOC,MINLOC
-        newst = RedOp_If(i_var, s_block, ered, j_var, rsl->number);
-    else
-        newst = RedOp_Assign(i_var, s_block, ered, j_var, 0, rsl->redvar_size < 0 ? &subscript_list->copy() : NULL);
-
-    //!ass = RedOp_Assign(i_var,s_block,ered,j_var);        
-    if_st = new SgIfStmt(*cond, *newst);
-    if (rsl->redvar_size > 0)       // reduction variable is array
-        for (i = 1; i < rsl->redvar_size; i++)
-        {
-            newst->insertStmtAfter(*(ass = RedOp_Assign(i_var, s_block, ered, j_var, i, NULL)), *if_st);
-            newst = ass;
-         }
-
-    current->insertStmtAfter(*if_st, *while_st);
-
-}
-
-SgExpression * LinearIndex(int ind, int L)
-{
-    SgExpression * e;
-    if (L != 1)
-        e = &(*new SgValueExp(L) * *BlockIdxRefExpr("x"));
-    else
-        e = BlockIdxRefExpr("x");
-    if (ind)
-        e = &(*e + *new SgValueExp(ind));
-    return(e);
-}
-
-SgExpression *Red_grid_index(SgSymbol *sind)
-{
-    SgExpression *e1, *e2;
-    e1 = new SgRecordRefExp(*s_blockidx, "x");
-    e2 = &(*new SgVarRefExp(s_blockDims) / *new SgVarRefExp(s_warpsize));
-    e1 = &(*e1 * *e2);
-    e2 = &(*new SgVarRefExp(sind) / *new SgVarRefExp(s_warpsize));
-    e1 = &(*e1 + *e2);
-    return(e1);
-}
-
-SgType *TypeOfRedBlockSymbol(SgExpression *ered)
-{
-    SgExpression *ev, *el, *en, *ec;
-    SgType *type, *loc_type;
-    SgArrayType *typearray;
-    int num_el = 0;
-    ev = ered->rhs();
-    if (!isSgExprListExp(ev))
-        return(options.isOn(C_CUDA) ? C_Type(ev->symbol()->type()) : ev->symbol()->type());
-    // MAXLOC,MINLOC 
-    el = ev->rhs()->lhs();
-    en = ev->rhs()->rhs()->lhs();
-    // calculation number of location array, assign to global variable  'loc_el_num' 
-    ec = Calculate(en);
-    if (ec->isInteger())
-        loc_el_num = num_el = ec->valueInteger();
-    else
-        Error("Can not calculate number of elements in array %s", el->symbol()->identifier(), 595, dvm_parallel_dir);
-
-    ev = ev->lhs(); // reduction variable reference
-    type = ev->symbol()->type();
-    if (isSgArrayType(type))
-        type = type->baseType();
-    if (options.isOn(C_CUDA))
-        type = C_Type(type);
-    loc_type = el->symbol()->type();
-    if (isSgArrayType(loc_type))
-        loc_type = loc_type->baseType();
-    if (options.isOn(C_CUDA))
-        loc_type = C_Type(loc_type);
-
-    typearray = new SgArrayType(*loc_type);
-
-    typearray->addRange(*new SgValueExp(num_el));
-
-    return(Type_For_Red_Loc(ev->symbol(), el->symbol(), type, typearray));
-
-}
-
-const char* RedFunctionInKernelC(const int num_red, const unsigned num_E = 1, const unsigned num_IE = 1)
-{
-    const char *retVal = NULL;
-
-    if (num_red == 1) // sum
-    {
-        if (num_E == 1)
-            retVal = red_kernel_func_names[red_SUM];
-        else if (num_E > 1)
-            retVal = red_kernel_func_names[red_SUM_N];
-    }
-    else if (num_red == 2)  // product
-    {
-        if (num_E == 1)
-            retVal = red_kernel_func_names[red_PROD];
-        else if (num_E > 1)
-            retVal = red_kernel_func_names[red_PROD_N];
-    }
-    else if (num_red == 3)  // max
-    {
-        if (num_E == 1)
-            retVal = red_kernel_func_names[red_MAX];
-        else if (num_E > 1)
-            retVal = red_kernel_func_names[red_MAX_N];
-    }
-    else if (num_red == 4)  // min
-    {
-        if (num_E == 1)
-            retVal = red_kernel_func_names[red_MIN];
-        else if (num_E > 1)
-            retVal = red_kernel_func_names[red_MIN_N];
-    }
-    else if (num_red == 5)  // and
-    {
-        if (num_E == 1)
-            retVal = red_kernel_func_names[red_AND];
-        else if (num_E > 1)
-            retVal = red_kernel_func_names[red_AND_N];
-    }
-    else if (num_red == 6)  // or
-    {
-        if (num_E == 1)
-            retVal = red_kernel_func_names[red_OR];
-        else if (num_E > 1)
-            retVal = red_kernel_func_names[red_OR_N];
-    }
-    else if (num_red == 7)  // neqv
-    {
-        if (num_E == 1)
-            retVal = red_kernel_func_names[red_NEQ];
-        else if (num_E > 1)
-            retVal = red_kernel_func_names[red_NEQ_N];
-    }
-    else if (num_red == 8)  // eqv
-    {
-        if (num_E == 1)
-            retVal = red_kernel_func_names[red_EQ];
-        else if (num_E > 1)
-            retVal = red_kernel_func_names[red_EQ_N];
-    }
-    else if (num_red == 9)  // maxloc
-    {
-        if (num_E == 1)
-        {
-            if (num_IE >= 1)
-                retVal = red_kernel_func_names[red_MAXL];
-        }
-        else if (num_E > 1)
-        {
-           retVal = red_kernel_func_names[red_MAXL];
-           err("Reduction variable is array, not implemented yet for GPU", 597, dvm_parallel_dir);
-        }
-
-    }
-    else if (num_red == 10)  // minloc
-    {
-        if (num_E == 1)
-        {
-            if (num_IE >= 1)
-                retVal = red_kernel_func_names[red_MINL];
-        }
-        else if (num_E > 1)
-        {
-           retVal = red_kernel_func_names[red_MINL];
-           err("Reduction variable is array, not implemented yet for GPU", 597, dvm_parallel_dir);
-        }
-
-    }
-
-    return retVal;
-}
-
-SgStatement *RedOp_Assign(SgSymbol *i_var, SgSymbol *s_block, SgExpression *ered, SgSymbol *d, int k, SgExpression  *ind_list)
-{
-    SgExpression *le = NULL, *re = NULL, *op1 = NULL, *op2 = NULL, *eind = NULL, *red_ind = NULL;
-    int num_red;
-    // <red_var>_block([ k,] i) = <red_op> (<red_var>_block([ k,] i), <red_var>_block([ k,] i + d))
-    // k = LowerBound:UpperBound
-    if (Rank(s_block) == 1)
-    {
-        red_ind = NULL; le = RedVar_Block_Ref(s_block, i_var);
-    }
-    else if(ind_list)
-    {
-        red_ind = &ind_list->copy(); le = RedArray_Block_Ref(s_block, i_var, red_ind);
-    }
-    else
-    {
-        red_ind = RedVarIndex(s_block, k); le = RedVar_Block_2D_Ref(s_block, i_var, red_ind);
-    }
-    num_red = RedFuncNumber(ered->lhs());
-    if (num_red > 8)   // MAXLOC => 9,MINLOC =>10
-        num_red -= 6; // MAX => 3,MIN =>4      
-    op1 = &(le->copy());                   //RedVar_Block_Ref(s_block,i_var);
-
-    eind = &(*new SgVarRefExp(i_var) + *new SgVarRefExp(d));
-
-    if(ind_list)
-        op2 =  new SgArrayRefExp(*s_block, *AddListToList(&ind_list->copy(),new SgExprListExp(*eind)));
-    else 
-        op2 = red_ind ? new SgArrayRefExp(*s_block, *red_ind, *eind) : new SgArrayRefExp(*s_block, *eind);
-
-    switch (num_red) {
-    case(1) :   //sum
-        re = &(*op1 + *op2);
-        break;
-    case(2) :   //product
-        re = &(*op1 * *op2);
-        break;
-    case(3) :   //max
-        re = MaxFunction(op1, op2);
-        break;
-    case(4) :   //min
-        re = MinFunction(op1, op2);
-        break;
-    case(5) :   //and
-        if (options.isOn(C_CUDA))
-            re = new SgExpression(BITAND_OP, op1, op2, NULL);
-        else
-            re = new SgExpression(AND_OP, op1, op2, NULL);
-        break;
-    case(6) :   //or
-        if (options.isOn(C_CUDA))
-            re = new SgExpression(BITOR_OP, op1, op2, NULL);
-        else
-            re = new SgExpression(OR_OP, op1, op2, NULL);
-        break;
-    case(7) :   //neqv
-        if (options.isOn(C_CUDA))
-            re = new SgExpression(XOR_OP, op1, op2, NULL);
-        else
-            re = new SgExpression(NEQV_OP, op1, op2, NULL);
-        break;
-    case(8) :   //eqv
-        if (options.isOn(C_CUDA))
-            re = new SgUnaryExp(BIT_COMPLEMENT_OP, *new SgExpression(XOR_OP, op1, op2, NULL));
-        else
-            re = new SgExpression(EQV_OP, op1, op2, NULL);
-        break;
-    default:
-        break;
-    }
-    return(AssignStatement(le, re));
-}
-
-SgStatement * GenRedOpAssignStatement(int num_red, SgExpression *op1, SgExpression *op2, SgExpression *le)
-{
-    SgExpression *re = NULL;
-    switch (num_red) {
-    case(1) :   //sum
-        re = &(*op1 + *op2);
-        break;
-    case(2) :   //product
-        re = &(*op1 * *op2);
-        break;
-    case(3) :   //max
-        re = MaxFunction(op1, op2);
-        break;
-    case(4) :   //min
-        re = MinFunction(op1, op2);
-        break;
-    case(5) :   //and
-        re = new SgExpression(AND_OP, op1, op2, NULL);
-        break;
-    case(6) :   //or
-        re = new SgExpression(OR_OP, op1, op2, NULL);
-        break;
-    case(7) :   //neqv
-        re = new SgExpression(NEQV_OP, op1, op2, NULL);
-        break;
-    case(8) :   //eqv
-        re = new SgExpression(EQV_OP, op1, op2, NULL);
-        break;
-    default:
-        break;
-    }
-    return(new SgAssignStmt(*le, *re));
-}
-
-SgStatement *RedOp_If(SgSymbol *i_var, SgSymbol *s_block, SgExpression *ered, SgSymbol *d, int num)
-{
-    SgExpression *cond = NULL, *le = NULL, *re = NULL;
-    SgSymbol *sf = NULL;
-    SgStatement *ass = NULL, *if_st = NULL, *st = NULL;
-    int num_red, i, ind;
-
-    sf = RedVarFieldSymb(s_block);
-    re = RedLocVar_Block_Ref(s_block, i_var, NULL, new SgVarRefExp((sf)));
-    le = RedLocVar_Block_Ref(s_block, i_var, d, new SgVarRefExp((sf)));
-
-    num_red = RedFuncNumber(ered->lhs());
-    if (num_red == 9)   // MAXLOC => 9
-        cond = &operator > (*le, *re);
-    else if (num_red == 10) // MINLOC =>10 
-        cond = &operator < (*le, *re);
-    le = RedLocVar_Block_Ref(s_block, i_var, NULL, new SgVarRefExp((sf)));
-    re = RedLocVar_Block_Ref(s_block, i_var, d, new SgVarRefExp((sf)));
-    ass = AssignStatement(le, re);
-    if_st = new SgIfStmt(*cond, *ass);
-    st = ass;
-
-    for (i = 0; i < num; i++)
-    {
-        ind = options.isOn(C_CUDA) ? i : i + 1;
-        le = RedLocVar_Block_Ref(s_block, i_var, NULL, new SgArrayRefExp(*((SgFieldSymb *)sf)->nextField(), *new SgValueExp(ind)));
-        re = RedLocVar_Block_Ref(s_block, i_var, d, new SgArrayRefExp(*((SgFieldSymb *)sf)->nextField(), *new SgValueExp(ind)));
-        ass = AssignStatement(le, re);
-        st->insertStmtAfter(*ass, *if_st);
-        st = ass;
-    }
-
-    return(if_st);
-}
-
-SgExpression *RedVar_Block_Ref(SgSymbol *sblock, SgSymbol *sind)
-{ // <red_var>_block(i)   
-    //if(sblock->type()->baseType()->variant() != T_DERIVED_TYPE)
-
-    return(new SgArrayRefExp(*sblock, *new SgVarRefExp(sind)));
-}
-
-
-SgExpression *RedVar_Block_2D_Ref(SgSymbol *sblock, SgSymbol *sind, SgExpression *redind)
-{ // <red_var>_block(k,i)   if reduction variable is array
-
-    SgExpression *eind;
-    eind = new SgExprListExp(*redind);
-    eind->setRhs(new SgExprListExp(*new SgVarRefExp(sind)));
-
-    return(new SgArrayRefExp(*sblock, *eind));
-}
-
-SgExpression *RedArray_Block_Ref(SgSymbol *sblock, SgSymbol *sind, SgExpression *ind_list)
-{ // <red_var>_block(k1,k2,...,i)   if reduction variable is array
-
-    SgExpression *eind = AddListToList(ind_list, new SgExprListExp(*new SgVarRefExp(sind)));
-    return(new SgArrayRefExp(*sblock, *eind));
-}
-
-SgExpression *RedLocVar_Block_Ref(SgSymbol *sblock, SgSymbol *sind, SgSymbol *d, SgExpression *field)
-{ // <red_var>_<loc_var_>block(i+d)%<field_name>   or  <red_var>_<loc_var_>block(0)%<field_name>
-    SgExpression *se, *rref;
-    if (!d && !sind)  // index = 1
-        se = new SgArrayRefExp(*sblock, *new SgValueExp(0));
-    else if (!d)
-        se = new SgArrayRefExp(*sblock, *new SgVarRefExp(sind));
-    else
-        se = new SgArrayRefExp(*sblock, *new SgVarRefExp(sind) + *new SgVarRefExp(d));
-    rref = new SgExpression(RECORD_REF);
-
-    NODE_OPERAND0(rref->thellnd) = se->thellnd;
-    NODE_OPERAND1(rref->thellnd) = field->thellnd;
-    NODE_TYPE(rref->thellnd) = field->type()->thetype;
-    return(rref);
-    //return(  new SgRecordRefExp(*new SgArrayRefExp(*sblock, *new SgVarRefExp(sind)),*field));
-}
-
-SgSymbol *RedVarFieldSymb(SgSymbol *s_block)
-{
-    return(FirstTypeField(s_block->type()->baseType()->symbol()->type()));
-
-}
-
-void Do_Assign_For_Loc_Arrays()
-{
-    reduction_operation_list *rl;
-    int i;
-    SgExpression *eind, *el;
-    SgStatement *curst, *ass, *dost;
-
-    if (!red_list) return;
-    ass = NULL;
-    curst = kernel_st;
-    for (rl = red_struct_list; rl; rl = rl->next)
-    {
-        if (!rl->locvar && rl->redvar_size == 0)
-            continue;
-        if (rl->redvar_size > 0)
-            for (i = 0, el = rl->value_arg; i < rl->redvar_size && el; i++, el = el->rhs())
-            {
-                eind = !options.isOn(C_CUDA) ? &(*new SgValueExp(i) + (*LowerBound(rl->redvar, 0))) : new SgValueExp(i);
-                eind = Calculate(eind);
-                //ass = new SgAssignStmt( *new SgArrayRefExp( *rl->redvar,*eind),   el->lhs()->copy() ); 
-                ass = AssignStatement(new SgArrayRefExp(*rl->redvar, *eind), &(el->lhs()->copy()));
-                curst->insertStmtAfter(*ass, *kernel_st);
-                curst = ass;
-            }
-
-        if (rl->redvar_size < 0)
-        {
-            if (options.isOn(C_CUDA))
-            {
-                //XXX changed reduction scheme to atomic, Kolganov 06.02.2020
-                //eind = LinearFormForRedArray(rl->redvar, SubscriptListOfRedArray(rl->redvar), rl);
-                //ass = AssignStatement(new SgArrayRefExp(*rl->redvar, *eind), new SgArrayRefExp(*rl->red_init, *eind));
-            }
-            else
-            {
-                ass = AssignStatement(new SgArrayRefExp(*rl->redvar, *SubscriptListOfRedArray(rl->redvar)), new SgArrayRefExp(*rl->red_init, *SubscriptListOfRedArray(rl->redvar)));
-
-                //XXX move this block to this condition, Kolganov 06.02.2020
-                dost = doLoopNestForReductionArray(rl, ass);
-                curst->insertStmtAfter(*dost, *kernel_st);
-                curst = dost->lastNodeOfStmt();
-            }
-        }
-
-        if (rl->locvar)
-        {
-            for (i = 0, el = rl->formal_arg; i < rl->number && el; i++, el = el->rhs())
-            {
-                if (isSgArrayType(rl->locvar->type()))
-                {
-                    if (options.isOn(C_CUDA)) // in C Language
-                        eind = new SgValueExp(i);
-                    else       // in Fortran Language
-                        eind = Calculate(&(*new SgValueExp(i) + (*LowerBound(rl->locvar, 0))));
-                    // ass = new SgAssignStmt( *new SgArrayRefExp( *rl->locvar,*eind), el->lhs()->copy() );
-                    ass = AssignStatement(new SgArrayRefExp(*rl->locvar, *eind), &(el->lhs()->copy()));
-                }
-                else
-                    //ass = new SgAssignStmt( *new SgVarRefExp( *rl->locvar), el->lhs()->copy() );
-                    ass = AssignStatement(new SgVarRefExp(*rl->locvar), &(el->lhs()->copy()));
-                curst->insertStmtAfter(*ass, *kernel_st);
-                curst = ass;
-            }
-        }
-    }
-    if (ass)
-        kernel_st->lexNext()->addComment(CommentLine("Fill local variable with passed values"));
-}
-
-SgStatement *doLoopNestForReductionArray(reduction_operation_list *rl, SgStatement *ass)
-{
-    SgStatement *dost;
-
-    int rank, i;
-    // creating loop nest
-    //  do kkN = 1,dimSizeN
-    //     . . .
-    //  do kk1 = 1,dimSize1
-    //    <ass>
-    //  enddo
-    //     . . .
-    //  enddo    
-    rank = Rank(rl->redvar);
-    dost = ass;
-    for (i = 1; i <= rank; i++)
-    {
-        if (options.isOn(C_CUDA))
-            dost = new SgForStmt(&SgAssignOp(*new SgVarRefExp(IndexLoopVar(i)), *new SgValueExp(0)),
-            &(*new SgVarRefExp(IndexLoopVar(i)) < *RedVarUpperBound(rl->dimSize_arg, i)),
-            &SgAssignOp(*new SgVarRefExp(IndexLoopVar(i)), *new SgVarRefExp(IndexLoopVar(i)) + *new SgValueExp(1)), dost);
-        else
-        {
-            SgExpression *e1 = RedVarUpperBound(rl->lowBound_arg, i);
-            SgExpression *e2 = RedVarUpperBound(rl->dimSize_arg, i);
-            dost = new SgForStmt(IndexLoopVar(i), e1, &(*e2+*e1-*new SgValueExp(1)), NULL, dost);
-        }
-    }
-
-    return(dost);
-}
-
-SgExpression *SubscriptListOfRedArray(SgSymbol *ar)
-{
-    int rank, j;
-    SgExpression *list, *el;
-    rank = Rank(ar); j = 1;
-    list = el = &kernel_index_var_list->copy();
-    while (j != rank)
-    {
-        el = el->rhs(); j++;
-    }
-    el->setRhs(NULL);
-    return(list);
-}
-
-SgSymbol *IndexLoopVar(int i)
-{
-    int j = 1;
-    SgExpression *ell = kernel_index_var_list;
-
-    while (j != i)
-    {
-        ell = ell->rhs(); j++;
-    }
-    return(ell->lhs()->symbol());
-}
-
-
-SgExpression *RedVarUpperBound(SgExpression *el, int i)
-{
-    int j = 1;
-    SgExpression *ell = el;
-
-    while (j != i)
-    {
-        ell = ell->rhs(); j++;
-    }
-    return(&ell->lhs()->copy());
-}
-
-
-SgExpression *LocVarIndex(SgSymbol *sl, int i)
-{ // i = 1,...
-    int ind;
-    SgExpression *ec;
-    if (!isSgArrayType(sl->type()))
-        return(new SgValueExp(i));
-    ec = Calculate(LowerBound(sl, 0));
-    if (!ec->isInteger())
-    {
-        Error("Can not calculate lower bound of array %s", sl->identifier(), 594, dvm_parallel_dir);
-        return(new SgValueExp(i));
-    }
-    ind = options.isOn(C_CUDA) ? i - 1 : i - 1 + (ec->valueInteger());
-    return(new SgValueExp(ind));
-
-}
-
-
-SgExpression *RedVarIndex(SgSymbol *sl, int i)
-{// i=0,...
-    SgExpression *ec;
-    int ind;
-    ec = Calculate(LowerBound(sl, 0));
-    if (!ec->isInteger())
-    {
-        Error("Can not calculate lower bound of array %s", sl->identifier(), 594, dvm_parallel_dir);
-        return(new SgValueExp(i));
-    }
-    ind = options.isOn(C_CUDA) ? i : i + (ec->valueInteger());
-    return(new SgValueExp(ind));
-
-}
-/*
-SgExpression *RedGridIndex(SgSymbol *sl,int i)
-{ SgExpression *eind;
-if(Rank(sl)==0)
-eind = &(*new SgRecordRefExp(*s_blockidx,"x") - *new SgValueExp(1));
-else
-eind = new
-}
-*/
-
-SgExpression *LinearFormForRedArray(SgSymbol *ar, SgExpression *el, reduction_operation_list *rsl)
-{
-    int i, n;
-    SgExpression *elin, *e;
-    // el - subscript list (I1,I2,...In), n - rank of reduction array 
-
-    // generating                         
-    //                n   
-    //         I1 + SUMMA(DimSize(k-1) * Ik)
-    //               k=2
-  
-    n = Rank(rsl->redvar);
-    if (!el)     // there aren't any subscripts
-        return(new SgValueExp(0));
-
-    if (rsl->dimSize_arg == NULL)
-        return(el);
-
-    elin = ToInt(el->lhs());
-    for (e = el->rhs(), i = 1; e; e = e->rhs(), i++)
-        elin = &(*elin + (*ToInt(e->lhs()) * *coefProd(i, rsl->dimSize_arg))); //  + Ik * DimSize(k-1)
-
-    //XXX changed reduction scheme to atomic, Kolganov 19.03.2020
-    /*if (rsl->array_red_size <= 0)
-        elin = &(*elin * *BlockDimsProduct());*/
-    return(new SgExprListExp(*elin));
-}
-
-SgExpression *coefProd(int i, SgExpression *ec)
-{
-    SgExpression *e, *coef;
-    int j;
-    e = &(ec->lhs()->copy());
-    for (coef = ec->rhs(), j = 2; coef && j <= i; coef = coef->rhs(), j++)
-        e = &(*e * coef->lhs()->copy());
-    return(e);
-}
-
-SgExpression *BlockDimsProduct()
-{
-    return &(*new SgRecordRefExp(*s_blockdim, "x") * *new SgRecordRefExp(*s_blockdim, "y") * *new SgRecordRefExp(*s_blockdim, "z"));
-}
-
-reduction_operation_list *ElementOfReductionStruct(SgSymbol *ar)
-{
-    reduction_operation_list *rl;
-    for (rl=red_struct_list; rl; rl=rl->next)
-        if (!strcmp(rl->redvar->identifier(), ar->identifier()))
-            return rl;
-    return red_struct_list;
-}
-
-SgExpression *ElementOfPrivateList(SgSymbol *ar)
-{
-    SgExpression *el;
-    for (el=private_list; el; el=el->rhs())
-        if (!strcmp(el->lhs()->symbol()->identifier(), ar->identifier()))
-            return el->lhs(); 
-    return private_list->lhs();  
-}
-
-SgExpression *LowerShiftForArrays (SgSymbol *ar, int i, int type) 
-{
-    SgExpression *e = isConstantBound(ar, i, 1);
-    if (e) return e;
-    if (type==0) //private array
-    {
-        SgExpression **eatr = (SgExpression **)ElementOfPrivateList(ar)->attributeValue(0, L_BOUNDS);
-        SgExprListExp *ebounds = (SgExprListExp *)*eatr;
-        e = new SgVarRefExp(ebounds->elem(i)->lhs()->symbol());  
-    }
-     else      // reduction array
-     {
-        SgExprListExp *el =  ((SgExprListExp *) ElementOfReductionStruct(ar)->lowBound_arg);
-        e = &( el->elem(i)->copy() );
-     }
-    return e; 
-}
- 
-SgExpression *UpperShiftForArrays (SgSymbol *ar, int i) 
-{
-    SgExpression *e = isConstantBound(ar, i, 0);
-    if(!e)
-        e = new SgValueExp(1);
-    return e; 
-}
-   
-void CompleteStructuresForReductionInKernel()
-{
-    reduction_operation_list *rl;
-    int max_rank = 0;
-    int r;
-    s_overall_blocks = NULL;
-    
-    for (rl = red_struct_list; rl; rl = rl->next)
-    {
-        rl->value_arg = CreateFormalLocationList(rl->redvar, rl->redvar_size);
-        rl->formal_arg = CreateFormalLocationList(rl->locvar, rl->number);        
-
-        if (!s_overall_blocks && rl->redvar_size != 0)
-            s_overall_blocks = OverallBlocksSymbol();
-        if (rl->redvar_size < 0)
-        {
-            rl->dimSize_arg  = CreateFormalDimSizeList(rl->redvar);
-            rl->lowBound_arg = CreateFormalLowBoundList(rl->redvar);
-            //XXX changed reduction scheme to atomic, Kolganov 06.02.2020
-            if(options.isOn(C_CUDA) )
-                rl->red_init = rl->redvar;
-            else
-                rl->red_init = RedInitValSymbolInKernel(rl->redvar, rl->dimSize_arg, rl->lowBound_arg); // after CreateFormalDimSizeList()
-        }
-        else
-        {
-            rl->dimSize_arg = NULL;
-            rl->lowBound_arg = NULL;
-            rl->red_init = NULL;
-        }
-        rl->red_grid = RedGridSymbolInKernel(rl->redvar, rl->redvar_size, rl->dimSize_arg, rl->lowBound_arg,1); // after CreateFormalDimSizeList()
-        rl->loc_grid = rl->locvar ? RedGridSymbolInKernel(rl->locvar, rl->number, NULL, NULL, 0) : NULL;
-       
-        r = Rank(rl->redvar);
-        max_rank = max_rank < r ? r : max_rank;
-    }
-
-    kernel_index_var_list = CreateIndexVarList(max_rank);
-}
-
-SgExpression *CreateIndexVarList(int N)
-{
-    int i;
-    SgExprListExp *list = NULL;
-    SgExprListExp *el;
-    if (N == 0) return(NULL);
-    for (i = N; i; i--)
-    {
-        el = new SgExprListExp(*new SgVarRefExp(IndexSymbolForRedVarInKernel(i)));
-        el->setRhs(list);
-        list = el;
-    }
-    return(list);
-}
-
-SgExpression *CreateFormalLocationList(SgSymbol *locvar, int numb)
-{
-    SgExprListExp *sl, *sll;
-    int i;
-    if (!locvar || numb <= 0) return(NULL);
-    sl = NULL;
-    for (i = numb; i; i--)
-    {
-        sll = new SgExprListExp(*new SgVarRefExp(FormalLocationSymbol(locvar, i)));
-        sll->setRhs(sl);
-        sl = sll;
-    }
-
-    return(sl);
-}
-
-SgExpression *CreateFormalDimSizeList(SgSymbol *var)
-{
-    SgExprListExp *sl, *sll;
-    int i;
-    sl = NULL;
-    for (i = Rank(var); i; i--)
-    {
-        sll = new SgExprListExp(*new SgVarRefExp(FormalDimSizeSymbol(var, i)));
-        sll->setRhs(sl);
-        sl = sll;
-    }
-    return(sl);
-}
-
-SgExpression *CreateFormalLowBoundList(SgSymbol *var)
-{
-    SgExprListExp *sl, *sll;
-    int i;
-    sl = NULL;
-    for (i = Rank(var); i; i--)
-    {
-        sll = new SgExprListExp(*new SgVarRefExp(FormalLowBoundSymbol(var, i)));
-        sll->setRhs(sl);
-        sl = sll;
-    }
-    return(sl);
-}
-
-char *LoopKernelComment()
-{
-    char *cmnt = new char[100];
-    if (options.isOn(C_CUDA)) // in C Language
-        sprintf(cmnt, "//--------------------- Kernel for loop on line %d ---------------------\n", first_do_par->lineNumber());
-    else   // in Fortran Language
-        sprintf(cmnt, "!----------------------- Kernel for loop on line %d -----------------------\n\n", first_do_par->lineNumber());
-    return(cmnt);
-}
-
-char *SequenceKernelComment(int lineno)
-{
-    char *cmnt = new char[150];
-    if (options.isOn(C_CUDA)) // in C Language
-        sprintf(cmnt, "//--------------------- Kernel for sequence of statements on line %d ---------------------\n", lineno);
-    else   // in Fortran Language
-        sprintf(cmnt, "!----------------------- Kernel for sequence of statements on line %d -----------------------\n\n", lineno);
-    return(cmnt);
-}
-
-void SymbolChange_InBlock(SgSymbol *snew, SgSymbol *sold, SgStatement *first_st, SgStatement *last_st)
-{
-    SgStatement *st;
-    if (!snew || !sold)  return;
-    for (st = first_st; st != last_st; st = st->lexNext())
-    {
-        if (st->symbol() && st->symbol() == sold)
-            st->setSymbol(*snew);
-        //printf("----%d\n", st->lineNumber());
-        SymbolChange_InExpr(snew, sold, st->expr(0));
-        SymbolChange_InExpr(snew, sold, st->expr(1));
-        SymbolChange_InExpr(snew, sold, st->expr(2));
-    }
-}
-
-void SymbolChange_InExpr(SgSymbol *snew, SgSymbol *sold, SgExpression *e)
-{
-    if (!e) return;
-    if (isSgVarRefExp(e) || isSgArrayRefExp(e) || e->variant() == CONST_REF)
-    {
-        if (e->symbol() == sold)
-            e->setSymbol(*snew);
-        //printf("%s %d   %s %d \n",e->symbol()->identifier(),e->symbol()->id(),sold->identifier(),sold->id());
-        return;
-    }
-    SymbolChange_InExpr(snew, sold, e->lhs());
-    SymbolChange_InExpr(snew, sold, e->rhs());
-}
-
-void SaveLineNumbers(SgStatement *stat_copy)
-{
-    SgStatement *stmt, *dost, *st;
-
-    dost = DoStmt(first_do_par, ParLoopRank());
-
-
-    for (stmt = stat_copy, st = dost->lexNext(); stmt; stmt = stmt->lexNext(), st = st->lexNext())
-    {                                           //printf("----loop %d\n",st->lineNumber());
-        BIF_LINE(stmt->thebif) = st->lineNumber();
-    }
-}
-/***************************************************************************************/
-/*ACC*/
-/*   Creating  C-Cuda Kernel Function                                                  */
-/*   and Inserting New Statements                                                      */
-/***************************************************************************************/
-SgStatement *Create_C_Kernel_Function(SgSymbol *sF)
-
-// create kernel for loop in C-Cuda language
-{
-    SgStatement *st_hedr, *st_end;
-    SgExpression *fe;
-
-    // create fuction header
-    st_hedr = new SgStatement(FUNC_HEDR);
-    st_hedr->setSymbol(*sF);
-    fe = new SgFunctionRefExp(*sF);
-    fe->setSymbol(*sF);
-    st_hedr->setExpression(0, *fe);
-    st_hedr->addDeclSpec(BIT_CUDA_GLOBAL);
-
-    // create end of function 
-    st_end = new SgStatement(CONTROL_END);
-    st_end->setSymbol(*sF);
-
-    // inserting      
-    mod_gpu_end->insertStmtBefore(*st_hedr, *mod_gpu);
-    st_hedr->insertStmtAfter(*st_end, *st_hedr);
-
-    cur_in_mod = st_end;
-    return(st_hedr);
-}
-
-/***************************************************************************************/
-/*ACC*/
-/*   Creating  C Program Unit                                                          */
-/*   and Inserting New Statements                                                      */
-/* (C Language, adapter procedure, .cu file)                                           */
-/***************************************************************************************/
-SgType *Cuda_Index_Type()
-{
-    SgSymbol *st = new SgSymbol(TYPE_NAME, "CudaIndexType", options.isOn(C_CUDA) ? *block_C_Cuda : *block_C);
-    SgType *t_dsc;
-    if (undefined_Tcuda)
-        t_dsc = new SgDescriptType(*C_Derived_Type(s_DvmType), BIT_TYPEDEF); //BIT_TYPEDEF | BIT_LONG);  
-    else
-        t_dsc = new SgDescriptType(*SgTypeInt(), BIT_TYPEDEF);
-
-    st->setType(t_dsc);
-    s_CudaIndexType = st;
-
-    //SgType *td = new SgType(T_DERIVED_TYPE); 
-    //TYPE_SYMB_DERIVE(td->thetype) = sdim3->thesymb;
-    //TYPE_SYMB(td->thetype) = sdim3->thesymb;
-    //define TYPE_LONG_SHORT(NODE) ((NODE)->entry.descriptive.long_short_flag)
-    //define TYPE_MODE_FLAG(NODE) ((NODE)->entry.descriptive.mod_flag)
-    //define TYPE_STORAGE_FLAG(NODE) ((NODE)->entry.descriptive.storage_flag)
-    //define TYPE_ACCESS_FLAG(NODE) ((NODE)->entry.descriptive.access_flag)
-
-    return(t_dsc);
-}
-
-SgType *Dvmh_Type()
-{
-    SgSymbol *st = new SgSymbol(TYPE_NAME, "DvmType", options.isOn(C_CUDA) ? *block_C_Cuda : *block_C);
-
-    SgType *t_dsc = new SgDescriptType(*C_BaseDvmType(), BIT_TYPEDEF | BIT_LONG);
-
-    st->setType(t_dsc);
-    s_DvmType = st;
-
-    return(t_dsc);
-}
-
-SgType *DvmhLoopRef_Type()
-{    // DvmhLoopRef => DvmType  in RTS  05.11.16
-    SgSymbol *st = new SgSymbol(TYPE_NAME, "DvmType", options.isOn(C_CUDA) ? *block_C_Cuda : *block_C);
-
-    SgType *t_dsc = new SgDescriptType(*C_Derived_Type(s_DvmType), BIT_TYPEDEF);
-    //new SgDescriptType(*C_BaseDvmType(), BIT_TYPEDEF | BIT_LONG);
-
-    st->setType(t_dsc);
-    s_DvmhLoopRef = st;
-
-    //SgType *td = new SgType(T_DERIVED_TYPE); 
-    //TYPE_SYMB_DERIVE(td->thetype) = sdim3->thesymb;
-    //TYPE_SYMB(td->thetype) = sdim3->thesymb;
-    //define TYPE_LONG_SHORT(NODE) ((NODE)->entry.descriptive.long_short_flag)
-    //define TYPE_MODE_FLAG(NODE) ((NODE)->entry.descriptive.mod_flag)
-    //define TYPE_STORAGE_FLAG(NODE) ((NODE)->entry.descriptive.storage_flag)
-    //define TYPE_ACCESS_FLAG(NODE) ((NODE)->entry.descriptive.access_flag)
-
-    return(t_dsc);
-}
-
-SgType *CudaOffsetTypeRef_Type()
-{
-    SgSymbol *st = new SgSymbol(TYPE_NAME, "CudaOffsetTypeRef", options.isOn(C_CUDA) ? *block_C_Cuda : *block_C);
-
-    SgType *t_dsc = new SgDescriptType(*C_Derived_Type(s_DvmType), BIT_TYPEDEF);
-
-    st->setType(t_dsc);
-    s_CudaOffsetTypeRef = st;
-
-    return(t_dsc);
-}
-
-SgType *C_Derived_Type(SgSymbol *styp)
-{
-    return(new SgDerivedType(*styp));
-}
-SgType * C_VoidType()
-{
-    return(new SgType(T_VOID));
-}
-
-SgType * C_LongType()
-{
-    return(new SgDescriptType(*SgTypeInt(), BIT_LONG));
-}
-
-SgType * C_LongLongType()
-{
-    return(new SgDescriptType(*new SgType(T_LONG), BIT_LONG));
-}
-
-SgType * C_UnsignedLongLongType()
-{
-    return( new SgDescriptType(*new SgType(T_LONG), BIT_UNSIGNED | BIT_LONG)); //TYPE_LONG_SHORT(type->thetype) = BIT_UNSIGNED & BIT_LONG; 
-}
-
-SgType * C_DvmType()
-{
-    if (!type_DvmType)
-        type_DvmType = C_Derived_Type(s_DvmType);
-    return(type_DvmType);
-
-}
-
-SgType * C_BaseDvmType()
-{
-    if (bind_ == 0 && len_DvmType == 8)  // size of long == 4
-        return(new SgType(T_LONG));
-    else
-        return(SgTypeInt());
-}
-
-SgType * C_CudaIndexType()
-{
-    if (!type_CudaIndexType)
-        type_CudaIndexType = C_Derived_Type(s_CudaIndexType);
-    return(type_CudaIndexType);
-
-}
-/*
-SgSymbol *CudaIndexConst(int iconst)
-{
-char name[10];
-if(iconst == rt_INT)
-name = "rt_INT";
-else if(iconst == rt_LONG)
-name = "rt_LONG";
-else
-name = "rt_LLONG";
-return ( new SgVariableSymb(name,SgTypeInt(),block_C) );
-}
-*/
-
-SgSymbol *CudaIndexConst()
-{
-    const char *name;
-    int len;
-    if (undefined_Tcuda)
-        len = TypeSize(FortranDvmType());
-    else
-        len = 4;
-    if (len == 4)
-        name = "rt_INT";
-    else if (len == 8)
-        name = "rt_LONG";
-    else
-        name = "rt_LLONG";
-
-    return (new SgVariableSymb(name, SgTypeInt(), block_C));
-
-}
-
-SgType *C_PointerType(SgType *type)
-{
-    return(new SgPointerType(type));
-}
-
-
-SgType *C_ReferenceType(SgType *type)
-{
-    return(new SgReferenceType(*type));
-}
-
-void CreateComplexTypeSymbols(SgStatement *st_bl)
-{
-    s_cmplx = new SgSymbol(TYPE_NAME, "cmplx2", *st_bl);
-    s_dcmplx = new SgSymbol(TYPE_NAME, "dcmplx2", *st_bl);
-}
-
-SgType *C_Type(SgType *type)
-{
-    SgType *tp;
-    int len;
-    tp = isSgArrayType(type) ? type->baseType() : type;
-    len = TypeSize(tp);
-    switch (tp->variant()) {
-
-    case T_INT:    //if(IS_INTRINSIC_TYPE(tp))
-        //   return(tp);
-        if (len == 4)
-        {
-            if (bind_ == 1)
-                return(SgTypeInt());
-            else                             //if (bind_==0)
-                return C_LongType();
-        }
-        else if (len == 8)
-        {
-            if (bind_ == 1)
-                return C_LongType();
-            else                             // if (bind_==0)
-                return C_LongLongType();
-        }
-        else if (len == 2)
-            return(new SgDescriptType(*SgTypeInt(), BIT_SHORT));
-        else if (len == 1)
-            return(SgTypeChar());
-        break;
-
-
-    case T_FLOAT:  if (IS_INTRINSIC_TYPE(tp))
-        return(tp);
-                   else if (len == 8)
-                       return(SgTypeDouble());
-                   else if (len == 4)
-                       return(SgTypeFloat());
-                   break;
-
-    case T_BOOL:
-        if (len == 8)
-        {
-            if (bind_ == 1)
-                return C_LongType();
-            else                             // if (bind_==0)
-                return C_LongLongType();
-        }
-        else if (len == 4)
-        {
-            if (bind_ == 1)
-                return(SgTypeInt());
-            else                             //if (bind_==0)
-                return C_LongType();
-        }
-        else if (len == 2)
-            return(new SgDescriptType(*SgTypeInt(), BIT_SHORT));
-        else if (len == 1)
-            return(SgTypeChar());
-        break;
-    case T_DOUBLE:   return (tp);
-    case T_COMPLEX:  return(C_Derived_Type(s_cmplx));
-    case T_DCOMPLEX: return(C_Derived_Type(s_dcmplx));
-    case T_DERIVED_TYPE: 
-        if (tp->symbol()->identifier() != std::string("uint4")) // for __dvmh_rand_state
-            err("Illegal type of used or reduction variable", 499, first_do_par);
-        return(tp);    //return (SgTypeInt());
-    case T_CHAR:
-    case T_STRING:   
-        if (len == 1)
-            return (SgTypeChar());
-        break;
-    default: 
-        err("Illegal type of used or reduction variable", 499, first_do_par);
-        return (SgTypeInt());
-    }
-
-    err("Illegal type of used or reduction variable", 499, first_do_par);
-    return (SgTypeInt());
-}
-
-SgSymbol *AdapterSymbol(SgStatement *st_do)
-{
-    SgSymbol *s, *sc;
-    char *aname, *namef;
-
-    aname = (char *)malloc((unsigned)(strlen(st_do->fileName()) + 30));
-    if (inparloop)
-        sprintf(aname, "%s_%s_%d_cuda_", "loop", filename_short(st_do), st_do->lineNumber());
-    else
-        sprintf(aname, "%s_%s_%d_cuda_", "sequence", filename_short(st_do), st_do->lineNumber());
-    s = new SgSymbol(FUNCTION_NAME, aname, *C_VoidType(), *block_C); //*current_file->firstStatement()); 
-
-    namef = (char *)malloc((unsigned)strlen(aname) + 1);
-    //strncpy(namef,aname,strlen(aname)-1);
-    strcpy(namef, aname);
-    namef[strlen(aname) - 1] = '\0';
-    sc = new SgSymbol(PROCEDURE_NAME, namef, *current_file->firstStatement());
-    if (cur_region && cur_region->targets & CUDA_DEVICE)
-        acc_func_list = AddToSymbList(acc_func_list, sc);
-
-    return(s);
-}
-
-void ChangeAdapterName(SgSymbol *s)
-//deleting last symbol "_" 
-{
-    char *name;
-    name = s->identifier();
-    name[strlen(name) - 1] = '\0';
-}
-
-/*--------------------------*/
-
-SgSymbol *isSameRedVar(char *name)
-{
-    reduction_operation_list *rl;
-
-    for (rl = red_struct_list; rl; rl = rl->next)
-    {
-        if (rl->redvar && !strcmp(rl->redvar->identifier(), name))
-            return(rl->redvar);
-        if (rl->locvar && !strcmp(rl->locvar->identifier(), name))
-            return(rl->locvar);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSameRedVar_c(const char *name)
-{
-    reduction_operation_list *rl;
-
-    for (rl = red_struct_list; rl; rl = rl->next)
-    {
-        if (rl->redvar && !strcmp(rl->redvar->identifier(), name))
-            return(rl->redvar);
-        if (rl->locvar && !strcmp(rl->locvar->identifier(), name))
-            return(rl->locvar);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSameUsedVar(char *name)
-{
-    SgExpression *el;
-    SgSymbol *s;
-
-    for (el = uses_list; el; el = el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSameUsedVar_c(const char *name)
-{
-    SgExpression *el;
-    SgSymbol *s;
-
-    for (el = uses_list; el; el = el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSamePrivateVar(char *name)
-{
-    SgExpression *el;
-    SgSymbol *s;
-
-    for (el = private_list; el; el = el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSamePrivateVar_c(const char *name)
-{
-    SgExpression *el;
-    SgSymbol *s;
-
-    for (el = private_list; el; el = el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSameIndexVar(char *name)
-{
-    SgExpression *el;
-    SgSymbol *s;
-    if (!dvm_parallel_dir)
-        return(NULL);
-
-    for (el = dvm_parallel_dir->expr(2); el; el = el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSameIndexVar_c(const char *name)
-{
-    SgExpression *el;
-    SgSymbol *s;
-    if (!dvm_parallel_dir)
-        return(NULL);
-
-    for (el = dvm_parallel_dir->expr(2); el; el = el->rhs())
-    {
-        s = el->lhs()->symbol();
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSameArray(char *name)
-{
-    symb_list *sl;
-    SgSymbol *s;
-
-    for (sl = acc_array_list; sl; sl = sl->next)
-    {
-        s = sl->symb;
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSameArray_c(const char *name)
-{
-    symb_list *sl;
-    SgSymbol *s;
-
-    for (sl = acc_array_list; sl; sl = sl->next)
-    {
-        s = sl->symb;
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-SgSymbol *isSameNameInLoop(char *name)
-{
-    SgSymbol *s;
-    s = isSameUsedVar(name);
-    if (s) return(s);
-    s = isSameRedVar(name);
-    if (s) return(s);
-    s = isSameArray(name);
-    if (s) return(s);
-    s = isSamePrivateVar(name);
-    if (s) return(s);
-    s = isSameIndexVar(name);
-    return(s);
-}
-SgSymbol *isSameNameInLoop_c(const char *name)
-{
-    SgSymbol *s;
-    s = isSameUsedVar_c(name);
-    if (s) return(s);
-    s = isSameRedVar_c(name);
-    if (s) return(s);
-    s = isSameArray_c(name);
-    if (s) return(s);
-    s = isSamePrivateVar_c(name);
-    if (s) return(s);
-    s = isSameIndexVar_c(name);
-    return(s);
-}
-
-
-char *TestAndCorrectName(char *name)
-{
-    SgSymbol *s;
-
-    while ((s = isSameNameInLoop(name)))
-    {
-        name = (char *)malloc((unsigned)(strlen(name) + 2));
-        sprintf(name, "%s_", s->identifier());
-    }
-    return(name);
-}
-
-char *TestAndCorrectName(const char *name)
-{
-    SgSymbol *s = NULL;
-    char *ret = new char[strlen(name) + 1];
-    strcpy(ret,name);
-    while ((s = isSameNameInLoop_c(ret)))
-    {
-        ret = (char *)malloc((unsigned)(strlen(name) + 2));
-        sprintf(ret, "%s_", s->identifier());
-    }
-    return ret;
-}
-
-/*-------------------------------*/
-
-char *GpuHeaderName(SgSymbol *s)
-{
-    char *name;
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 3));
-    sprintf(name, "d_%s", s->identifier());
-    return(TestAndCorrectName(name));
-}
-
-SgSymbol *GpuHeaderSymbolInAdapter(SgSymbol *ar, SgStatement *st_hedr)
-{
-    SgArrayType *typearray = new SgArrayType(*C_DvmType());
-    typearray->addRange(*new SgValueExp(Rank(ar) + DELTA));
-    return(new SgSymbol(VARIABLE_NAME, GpuHeaderName(ar), *typearray, *st_hedr));
-}
-
-SgSymbol *GpuBaseSymbolInAdapter(SgSymbol *ar, SgStatement *st_hedr)
-{
-    char *name;
-    name = (char *)malloc((unsigned)(strlen(ar->identifier()) + 6));
-    sprintf(name, "%s_base", ar->identifier());
-    name = TestAndCorrectName(name);
-    return(new SgSymbol(VARIABLE_NAME, name, *C_PointerType(C_VoidType()), *st_hedr));
-}
-
-SgSymbol *GpuScalarAdrSymbolInAdapter(SgSymbol *s, SgStatement *st_hedr)
-{
-    char *name;
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 5));
-    sprintf(name, "%s_dev", s->identifier());
-    name = TestAndCorrectName(name);
-    return(new SgSymbol(VARIABLE_NAME, name, *C_PointerType(C_VoidType()), *st_hedr));
-}
-
-
-SgSymbol *GridSymbolForRedInAdapter(SgSymbol *s, SgStatement *st_hedr)
-{
-    char *name;
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 6));
-    sprintf(name, "%s_grid", s->identifier());
-    name = TestAndCorrectName(name);
-    return(new SgSymbol(VARIABLE_NAME, name, *C_PointerType(C_VoidType()), *st_hedr));
-}
-
-SgSymbol *InitValSymbolForRedInAdapter(SgSymbol *s, SgStatement *st_hedr)
-{
-    char *name;
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 6));
-    sprintf(name, "%s_init", s->identifier());
-    name = TestAndCorrectName(name);
-    return(new SgSymbol(VARIABLE_NAME, name, *C_PointerType(C_VoidType()), *st_hedr));
-}
-
-SgSymbol *DeviceNumSymbol(SgStatement *st_hedr)
-{
-    char *name;
-    name = TestAndCorrectName("device_num");
-    return(new SgSymbol(VARIABLE_NAME, name, *C_DvmType(), *st_hedr));
-}
-
-SgSymbol *doDeviceNumVar(SgStatement *st_hedr, SgStatement *st_exec, SgSymbol *s_dev_num, SgSymbol *s_loop_ref)
-{
-    SgStatement *ass;
-    SgExpression *le;
-    if (s_dev_num)   return(s_dev_num);
-
-    s_dev_num = DeviceNumSymbol(st_hedr);
-
-    st_exec->insertStmtBefore(*makeSymbolDeclaration(s_dev_num), *st_hedr);
-    le = new SgVarRefExp(s_dev_num);
-    ass = AssignStatement(le, GetDeviceNum(s_loop_ref));
-    st_exec->insertStmtBefore(*ass, *st_hedr);
-    ass->addComment("// Get device number");
-
-    return(s_dev_num);
-}
-
-char * DimSizeName(SgSymbol *s, int i)
-{
-    char *name;
-    name = (char *)malloc((unsigned)(strlen(s->identifier()) + 10));
-    sprintf(name, "dim%d_%s", i, s->identifier());
-    name = TestAndCorrectName(name);
-    return(name);
-}
-
-void Create_C_extern_block()
-{
-    SgStatement *fileHeaderSt;
-    SgStatement *st_mod, *st_end;
-
-    fileHeaderSt = current_file->firstStatement();
-    if (block_C)
-        return;
-    //mod_gpu_symb = GPUModuleSymb(fileHeaderSt);
-
-    if (options.isOn(C_CUDA))
-    {
-        st_mod = new SgStatement(MODULE_STMT);
-        st_end = new SgStatement(CONTROL_END);
-        fileHeaderSt->insertStmtAfter(*st_mod, *fileHeaderSt);
-        st_mod->insertStmtAfter(*st_end, *st_mod);
-        block_C_Cuda = st_mod;
-        //Typedef_Stmts(st_end);   //10.12.13 
-        TypeSymbols(st_end);
-        if(INTERFACE_RTS2)
-            st_mod->addComment(IncludeComment("<dvmhlib2.h>"));      
-        st_mod->addComment(IncludeComment("<dvmhlib_cuda.h>\n#define dcmplx2 Complex<double>\n#define cmplx2 Complex<float>"));
-        st_mod->addComment(CudaIndexTypeComment());
-    }
-
-    st_mod = new SgStatement(MODULE_STMT);
-    //st_mod->setSymbol(*mod_gpu_symb);
-    st_end = new SgStatement(CONTROL_END);
-    //st_end->setSymbol(*mod_gpu_symb);
-    fileHeaderSt->insertStmtAfter(*st_mod, *fileHeaderSt);
-    st_mod->insertStmtAfter(*st_end, *st_mod);
-
-    block_C = st_mod;
-    cur_in_block = st_mod;
-    end_block = st_end;
-    if (!options.isOn(C_CUDA))        // for Fortran-Cuda
-    {      //Typedef_Stmts(end_block); //10.12.13
-        TypeSymbols(end_block);
-        block_C->addComment(IncludeComment("<dvmhlib_cuda.h>"));
-        if(INTERFACE_RTS2)
-            block_C->addComment(IncludeComment("<dvmhlib2.h>"));
-        block_C->addComment(CudaIndexTypeComment());
-    }
-    block_C->addComment("#ifdef _MS_F_\n");
-
-    //Prototypes();   //10.12.13
-    //cur_in_block = Create_Init_Cuda_Function(); 
-    //cur_in_block = cur_in_block->lexNext();
-
-    cur_in_block = Create_Empty_Stat(); // empty line
-
-    CreateComplexTypeSymbols(options.isOn(C_CUDA) ? block_C_Cuda : block_C);
-
-    return;
-}
-
-void Create_info_block()
-{
-    SgStatement *fileHeaderSt;
-    SgStatement *st_mod, *st_end;
-
-    fileHeaderSt = current_file->firstStatement();
-    if (info_block)
-        return;
-
-    st_mod = new SgStatement(MODULE_STMT);
-    st_end = new SgStatement(CONTROL_END);
-    fileHeaderSt->insertStmtAfter(*st_mod, *fileHeaderSt);
-    st_mod->insertStmtAfter(*st_end, *st_mod);
-    info_block = st_mod;
-    end_info_block = st_end;
-    //info_block->insertStmtAfter(*(s_DvmType->makeVarDeclStmt()),*info_block); //10.12.13
-    info_block->addComment(IncludeComment("<dvmhlib.h>"));
-    return;
-}
-
-void TypeSymbols(SgStatement *end_bl)
-{
-    Dvmh_Type();
-    Cuda_Index_Type();
-    DvmhLoopRef_Type();
-    CudaOffsetTypeRef_Type();
-    s_cudaStream = new SgSymbol(TYPE_NAME, "cudaStream_t", *end_bl);
-}
-
-void Typedef_Stmts(SgStatement *end_bl)
-{
-
-    Dvmh_Type();
-    Cuda_Index_Type();
-    DvmhLoopRef_Type();
-    CudaOffsetTypeRef_Type();
-
-    /*  10.12.13
-     st = s_DvmType->makeVarDeclStmt();
-     end_bl-> insertStmtBefore(*st,*end_bl->controlParent());
-     st = s_CudaIndexType->makeVarDeclStmt();
-     end_bl-> insertStmtBefore(*st,*end_bl->controlParent());
-     st = s_DvmhLoopRef->makeVarDeclStmt();
-     end_bl-> insertStmtBefore(*st,*end_bl->controlParent());
-     st = s_CudaOffsetTypeRef->makeVarDeclStmt();
-     end_bl-> insertStmtBefore(*st,*end_bl->controlParent());
-     */
-}
-
-void Prototypes()
-{
-    SgSymbol *sf, *sarg;
-    SgStatement *st;
-    SgExpression *fref, *ae, *el, *arg_list, *devref, *dvmdesc, *dvmHdesc, *hloop, *rednum, *redNumRef, *base, *outThreads, *outStream;
-    SgType *typ, *typ1;
-    SgArrayType *typearray;
-    SgValueExp M0(0);
-    // generating prototypes:
-
-    //
-    //void *dvmh_get_natural_base_(DvmType *deviceRef, DvmType dvmDesc[]);
-
-    sf = fdvm[GET_BASE];
-    sf->setType(*C_PointerType(C_VoidType()));
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    fref->setType(*C_PointerType(C_VoidType()));
-    //fref = new SgPointerDerefExp(*fref);
-    st = new SgStatement(VAR_DECL);
-    //st=sf->makeVarDeclStmt();
-    st->setExpression(0, *new SgExprListExp(*new SgPointerDerefExp(*fref)));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----*/
-    sarg = new SgSymbol(VARIABLE_NAME, "deviceRef", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    devref = new SgPointerDerefExp(*ae);
-    arg_list = new SgExprListExp(*devref);
-
-    typearray = new SgArrayType(*C_DvmType());
-    typearray->addRange(M0);   // addDimension(NULL);
-    sarg = new SgSymbol(VARIABLE_NAME, "dvmDesc", *typearray, *block_C);
-    ae = new SgArrayRefExp(*sarg);
-    ae->setType(*typearray);
-    el = new SgExpression(EXPR_LIST);
-    el->setLhs(NULL);
-    ae->setLhs(*el);
-    dvmdesc = ae;
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    fref->setLhs(arg_list);
-
-    //
-    //void *dvmh_get_device_adr_(DvmType *deviceRef, void *variable);
-
-    sf = fdvm[GET_DEVICE_ADDR];
-    sf->setType(*C_PointerType(C_VoidType()));
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    fref->setType(*C_PointerType(C_VoidType()));
-    //fref = new SgPointerDerefExp(*fref);
-    st = new SgStatement(VAR_DECL);
-    //st=sf->makeVarDeclStmt();
-    st->setExpression(0, *new SgExprListExp(*new SgPointerDerefExp(*fref)));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----*/
-    sarg = new SgSymbol(VARIABLE_NAME, "deviceRef", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    devref = new SgPointerDerefExp(*ae);
-    arg_list = new SgExprListExp(*devref);
-
-    sarg = new SgSymbol(VARIABLE_NAME, "variable", *C_VoidType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_VoidType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    fref->setLhs(arg_list);
-
-    //
-    // void dvmh_fill_header_(DvmType *deviceRef, void *base, DvmType dvmDesc[], DvmType dvmhDesc[]);
-
-    sf = fdvm[FILL_HEADER];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = sf->makeVarDeclStmt();
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(devref->copy());
-    fref->setLhs(arg_list);
-
-    sarg = new SgSymbol(VARIABLE_NAME, "base", *C_VoidType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_VoidType()));
-    ae = base = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    arg_list->setRhs(*new SgExprListExp(dvmdesc->copy()));
-    arg_list = arg_list->rhs();
-
-    typearray = new SgArrayType(*C_DvmType());
-    typearray->addRange(M0);
-    sarg = new SgSymbol(VARIABLE_NAME, "dvmhDesc", *typearray, *block_C);
-    ae = dvmHdesc = new SgArrayRefExp(*sarg);
-    ae->setType(*typearray);
-    el = new SgExpression(EXPR_LIST);
-    el->setLhs(NULL);
-    ae->setLhs(*el);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    //
-    // void dvmh_fill_header_ex_(DvmType *deviceRef, void *base, DvmType dvmDesc[], DvmType dvmhDesc[], DvmType *outTypeOfTransformation, DvmType extendedParams[]);
-
-    sf = fdvm[FILL_HEADER_EX];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = sf->makeVarDeclStmt();
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(devref->copy());
-    fref->setLhs(arg_list);
-
-    sarg = new SgSymbol(VARIABLE_NAME, "base", *C_VoidType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_VoidType()));
-    ae = base = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    arg_list->setRhs(*new SgExprListExp(dvmdesc->copy()));
-    arg_list = arg_list->rhs();
-    arg_list->setRhs(*new SgExprListExp(dvmHdesc->copy()));
-    arg_list = arg_list->rhs();
-
-    sarg = new SgSymbol(VARIABLE_NAME, "outTypeOfTransformation", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "extendedParams", *dvmHdesc->symbol()->type(), *block_C);
-    ae = &(dvmHdesc->copy());
-    ae->setSymbol(*sarg);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    //
-    // void *dvmh_apply_offset(DvmType dvmDesc[], void *base, DvmType dvmhDesc[]);
-
-    // sf = fdvm[APPLY_OFFSET];
-    // sf->setType(*C_PointerType(C_VoidType()));
-    // fref =  new SgFunctionRefExp(*sf);
-    // fref->setSymbol(*sf);
-    // fref->setType(*C_PointerType(C_VoidType()));
-    // st = new SgStatement(VAR_DECL);
-    // st->setExpression(0,*new SgExprListExp(*new SgPointerDerefExp(*fref)));
-
-    // end_block-> insertStmtBefore(*st,*block_C);
-
-    /* ----argument list-----  */
-    // arg_list = new SgExprListExp(dvmdesc->copy());
-    // fref->setLhs(arg_list);
-    // arg_list->setRhs(*new SgExprListExp(base->copy()));
-    // arg_list = arg_list->rhs();
-    // arg_list->setRhs(*new SgExprListExp(dvmHdesc->copy()));
-
-    //
-    // DvmType loop_cuda_do(DvmhLoopRef *InDvmhLoop, dim3 *OutBlocks, IndexType **InOutBlocks);
-
-    sf = fdvm[DO_CUDA];
-    sf->setType(*C_DvmType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    typ = C_PointerType(C_Derived_Type(s_DvmhLoopRef));
-    sarg = new SgSymbol(VARIABLE_NAME, "InDvmhLoop", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    hloop = ae;
-    arg_list = new SgExprListExp(*ae);
-    fref->setLhs(arg_list);
-
-
-    typ = C_PointerType(t_dim3);
-    sarg = new SgSymbol(VARIABLE_NAME, "OutBlocks", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    sarg = new SgSymbol(VARIABLE_NAME, "OutThreads", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    outThreads = new SgPointerDerefExp(*ae);
-
-    s_cudaStream = new SgSymbol(TYPE_NAME, "cudaStream_t", *block_C);
-    typ = C_PointerType(C_Derived_Type(s_cudaStream));
-    sarg = new SgSymbol(VARIABLE_NAME, "OutStream", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    outStream = new SgPointerDerefExp(*ae);
-
-    typ1 = C_PointerType(C_Derived_Type(s_CudaIndexType));
-    typ = C_PointerType(typ1);
-    sarg = new SgSymbol(VARIABLE_NAME, "InOutBlocks", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    ae->setType(typ1);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    //
-    //void loop_cuda_register_red(DvmhLoopRef *InDvmhLoop, DvmType InRedNum, void **ArrayPtr, void **LocPtr);
-    sf = fdvm[RED_CUDA];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-
-    sarg = new SgSymbol(VARIABLE_NAME, "InRedNum", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    rednum = ae;
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    typ1 = C_PointerType(C_VoidType());
-    typ = C_PointerType(typ1);
-    sarg = new SgSymbol(VARIABLE_NAME, "ArrayPtr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    ae->setType(typ1);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    sarg = new SgSymbol(VARIABLE_NAME, "LocPtr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    ae->setType(typ1);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    //
-    // void loop_cuda_register_red_(DvmhLoopRef *InDvmhLoop, Dvmtype *InRedNumRef, void *InDeviceArrayBaseAddr, void *InDeviceLocBaseAddr,CudaOffsetTypeRef *ArrayOffsetPtr, CudaOffsetTypeRef *LocOffsetPtr);
-    sf = fdvm[REGISTER_RED];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-
-    sarg = new SgSymbol(VARIABLE_NAME, "InRedNumRef", *C_PointerType(C_DvmType()), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae = new SgPointerDerefExp(*ae);
-    redNumRef = ae;
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    arg_list = arg_list->rhs();
-
-    typ = C_PointerType(C_VoidType());
-    sarg = new SgSymbol(VARIABLE_NAME, "InDeviceArrayBaseAddr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    sarg = new SgSymbol(VARIABLE_NAME, "InDeviceLocBaseAddr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    typ = C_PointerType(C_Derived_Type(s_CudaOffsetTypeRef));
-    sarg = new SgSymbol(VARIABLE_NAME, "ArrayOffsetPtr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    sarg = new SgSymbol(VARIABLE_NAME, "LocOffsetPtr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    //
-    // void loop_red_init(DvmhLoopRef *InDvmhLoop, Dvmtype *InRedNumRef, void *arrayPtr, void *locPtr);
-    sf = fdvm[RED_INIT_C];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-
-    //sarg=new SgSymbol(VARIABLE_NAME,"InRedNumRef",*C_PointerType(C_DvmType()),*block_C);
-    //ae =  new SgVarRefExp(sarg);
-    //ae =  new SgPointerDerefExp(*ae);
-    //arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list->setRhs(*new SgExprListExp(redNumRef->copy()));
-    arg_list = arg_list->rhs();
-
-    typ = C_PointerType(C_VoidType());
-    sarg = new SgSymbol(VARIABLE_NAME, "arrayPtr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    sarg = new SgSymbol(VARIABLE_NAME, "locPtr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    //
-    // void loop_cuda_red_init(DvmhLoopRef *InDvmhLoop, Dvmtype InRedNum, void *arrayPtr, void *locPtr, void **devArrayPtr, void **devLocPtr);
-    arg_list = fref->lhs();  // argument list of loop_red_init()
-    sf = fdvm[CUDA_RED_INIT];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-
-    fref->setLhs(arg_list->copy()); // copying argument list of loop_red_init() function
-    arg_list = fref->lhs();
-    //renewing second argument: Dvmtype *InRedNumRef => Dvmtype InRedNum
-    sarg = new SgSymbol(VARIABLE_NAME, "InRedNum", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    arg_list->rhs()->setLhs(*ae);
-    while (arg_list->rhs() != 0)
-        arg_list = arg_list->rhs();
-    typ1 = C_PointerType(C_VoidType());
-    typ = C_PointerType(typ1);
-    sarg = new SgSymbol(VARIABLE_NAME, "devArrayPtr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    ae->setType(typ1);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "devLocPtr", *typ, *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    ae->setType(typ1);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    //
-    // void loop_cuda_red_prepare_((DvmhLoopRef *InDvmhLoop, Dvmtype *InRedNumRef, DvmType *InCountRef, DvmType *InFillFlagRef);
-    sf = fdvm[RED_PREPARE];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-
-    arg_list->setRhs(*new SgExprListExp(redNumRef->copy()));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "InCountRef", *C_PointerType(C_DvmType()), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "InFillFlagRef", *C_PointerType(C_DvmType()), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    //
-    // void loop_red_finish_(DvmhLoopRef *InDvmhLoop, Dvmtype *InRedNumRef);
-    sf = fdvm[RED_FINISH];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-
-    arg_list->setRhs(*new SgExprListExp(redNumRef->copy()));
-
-
-    //
-    // void loop_cuda_shared_needed(DvmhLoopRef *InDvmhLoop, DvmType *count);
-    // sf = fdvm[SHARED_NEEDED];
-    // sf->setType(*C_VoidType());
-    // fref =  new SgFunctionRefExp(*sf);
-    // fref->setSymbol(*sf);
-    // st = new SgStatement(VAR_DECL);
-    // st->setExpression(0,*new SgExprListExp(*fref));
-
-    // end_block-> insertStmtBefore(*st,*block_C);
-
-    /* ----argument list-----  */
-    // arg_list = new SgExprListExp(hloop->copy());
-    // fref->setLhs(arg_list);
-
-    // sarg=new SgSymbol(VARIABLE_NAME,"countRef",*C_PointerType(C_DvmType()),*block_C);
-    // ae =  new SgVarRefExp(sarg);
-    // ae = new SgPointerDerefExp(*ae);
-    // arg_list->setRhs(*new SgExprListExp(*ae));
-    // arg_list = arg_list->rhs();
-
-    // CudaIndexType *loop_cuda_get_local_part(DvmhLoopRef *InDvmhLoop, DvmType dvmDesc[]);
-
-    sf = fdvm[GET_LOCAL_PART];
-    typ = C_PointerType(C_Derived_Type(s_CudaIndexType));
-    sf->setType(*typ);  //*C_PointerType(C_Derived_Type(s_CudaIndexType)));
-
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    fref->setType(*typ);
-
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*new SgPointerDerefExp(*fref)));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-
-    arg_list->setRhs(*new SgExprListExp(dvmdesc->copy()));
-    arg_list = arg_list->rhs();
-
-    //DvmType loop_get_device_num_(DvmhLoopRef *InDvmhLoop)
-    sf = fdvm[GET_DEVICE_NUM];
-    sf->setType(*C_DvmType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-
-    //DvmType loop_cuda_get_red_step_(DvmhLoopRef *InDvmhLoop)
-    sf = fdvm[GET_OVERALL_STEP];
-    sf->setType(*C_DvmType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-
-    //
-    //DvmType loop_get_dependency_mask_(DvmhLoopRef *InDvmhLoop)
-    sf = fdvm[GET_DEP_MASK];
-    sf->setType(*C_DvmType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-
-    //
-    //void dvmh_cuda_replicate_(void *addr, DvmType *recordSize, DvmType *quantity, void *devPtr)
-    sf = fdvm[CUDA_REPLICATE];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    sarg = new SgSymbol(VARIABLE_NAME, "addr", *C_VoidType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_VoidType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list = new SgExprListExp(*ae);
-    fref->setLhs(arg_list);
-    sarg = new SgSymbol(VARIABLE_NAME, "recordSize", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "quantity", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "devPtr", *C_VoidType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_VoidType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    //
-    //DvmType DvmType loop_cuda_transform_(DvmhLoopRef *InDvmhLoop, DvmType dvmDesc[], DvmhLoopRef *backFlagRef, DvmType dvmhDesc[], DvmType addressingParams[]);
-    // sf = fdvm[CUDA_TRANSFORM];
-    // sf->setType(*C_DvmType());
-    // fref =  new SgFunctionRefExp(*sf);
-    // fref->setSymbol(*sf);
-    // st = new SgStatement(VAR_DECL);
-    // st->setExpression(0,*new SgExprListExp(*fref));
-
-    // end_block-> insertStmtBefore(*st,*block_C);
-
-    /* ----argument list-----  */
-    // arg_list = new SgExprListExp(hloop->copy());
-    // fref->setLhs(arg_list);
-    // arg_list->setRhs(*new SgExprListExp(dvmdesc->copy()));
-    // arg_list = arg_list->rhs();
-    // typ = C_PointerType(C_Derived_Type(s_DvmhLoopRef));
-    // sarg=new SgSymbol(VARIABLE_NAME,"backFlagRef",*typ,*block_C);
-    // ae =  new SgVarRefExp(sarg);
-    // ae->setType(typ);
-    // ae = new SgPointerDerefExp(*ae);
-    // arg_list->setRhs( *new SgExprListExp(*ae));
-    // arg_list = arg_list->rhs();
-    // arg_list->setRhs(*new SgExprListExp(dvmHdesc->copy()));
-    // arg_list = arg_list->rhs();
-    // sarg=new SgSymbol(VARIABLE_NAME,"addressingParams",*dvmHdesc->symbol()->type(),*block_C);
-    // ae = &(dvmHdesc->copy());
-    // ae->setSymbol(*sarg);
-    // arg_list->setRhs(*new SgExprListExp(*ae));
-
-    //
-    //DvmType DvmType loop_cuda_autotransform_(DvmhLoopRef *InDvmhLoop, DvmType dvmDesc[]);
-    sf = fdvm[CUDA_AUTOTRANSFORM];
-    sf->setType(*C_DvmType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-    arg_list->setRhs(*new SgExprListExp(dvmdesc->copy()));
-    arg_list = arg_list->rhs();
-
-    //
-    //void loop_cuda_get_config_(DvmhLoopRef *InDvmhLoop, DvmType *InSharedPerThread, DvmType *InRegsPerThread, dim3 *OutThreads, cudaStream_t *OutStream, DvmType *OutSharedPerBlock);
-    sf = fdvm[GET_CONFIG];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    arg_list = new SgExprListExp(hloop->copy());
-    fref->setLhs(arg_list);
-    sarg = new SgSymbol(VARIABLE_NAME, "InSharedPerThread", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "InRegsPerThread", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    arg_list->setRhs(*new SgExprListExp(outThreads->copy()));
-    arg_list = arg_list->rhs();
-    arg_list->setRhs(*new SgExprListExp(outStream->copy()));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "OutSharedPerBlock", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-    //
-    //void loop_fill_bounds_(DvmhLoopRef *InDvmhLoop, DvmType idxL[], DvmType idxH[], DvmType steps[]);
-    if (options.isOn(NO_BL_INFO))
-    {
-        sf = fdvm[FILL_BOUNDS_C];
-        sf->setType(*C_VoidType());
-        fref = new SgFunctionRefExp(*sf);
-        fref->setSymbol(*sf);
-        st = new SgStatement(VAR_DECL);
-        st->setExpression(0, *new SgExprListExp(*fref));
-
-        end_block->insertStmtBefore(*st, *block_C);
-
-        /* ----argument list-----  */
-        arg_list = new SgExprListExp(hloop->copy());
-        fref->setLhs(arg_list);
-        typearray = new SgArrayType(*C_DvmType());
-        typearray->addRange(M0);
-        sarg = new SgSymbol(VARIABLE_NAME, "idxL", *typearray, *block_C);
-        ae = new SgArrayRefExp(*sarg);
-        ae->setType(*typearray);
-        el = new SgExpression(EXPR_LIST);
-        el->setLhs(NULL);
-        ae->setLhs(*el);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        sarg = new SgSymbol(VARIABLE_NAME, "idxH", *typearray, *block_C);
-        ae = &(ae->copy());
-        ae->setSymbol(sarg);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        sarg = new SgSymbol(VARIABLE_NAME, "steps", *typearray, *block_C);
-        ae = &(ae->copy());
-        ae->setSymbol(sarg);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-    }
-
-    //
-    //void dvmh_change_filled_bounds(DvmType *low, DvmType *high, DvmType *idx, DvmType n, DvmType dep, DvmType type_of_run, DvmType *idxs);
-    sf = fdvm[CHANGE_BOUNDS];
-    sf->setType(*C_VoidType());
-    fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    end_block->insertStmtBefore(*st, *block_C);
-
-    /* ----argument list-----  */
-    sarg = new SgSymbol(VARIABLE_NAME, "low", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list = new SgExprListExp(*ae);
-    fref->setLhs(arg_list);
-    sarg = new SgSymbol(VARIABLE_NAME, "high", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "idx", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "n", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_DvmType());
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "dep", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_DvmType());
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "type_of_run", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_DvmType());
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-    sarg = new SgSymbol(VARIABLE_NAME, "idxs", *C_DvmType(), *block_C);
-    ae = new SgVarRefExp(sarg);
-    ae->setType(C_PointerType(C_DvmType()));
-    ae = new SgPointerDerefExp(*ae);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-
-}
-
-SgStatement *Create_Empty_Stat()
-{
-    SgStatement *st;
-
-    st = new SgStatement(COMMENT_STAT);
-    end_block->insertStmtBefore(*st, *block_C);
-
-    return(st);
-}
-
-
-
-SgStatement *Create_Init_Cuda_Function()
-{
-    SgStatement *st, *st_end;
-    SgSymbol *sf;
-    SgExpression *e;
-    st = new SgStatement(FUNC_HEDR);
-    sf = new SgSymbol(FUNCTION_NAME, "init_cuda_", *C_VoidType(), *block_C);
-    st->setSymbol(*sf);
-    e = new SgFunctionRefExp(*sf);
-    e->setSymbol(*sf);
-    st->setExpression(0, *e);
-    st_end = new SgStatement(CONTROL_END);
-    st_end->setSymbol(*sf);
-
-    end_block->insertStmtBefore(*st, *block_C);
-    st->insertStmtAfter(*st_end, *st);
-    return(st);
-}
-
-SgStatement *Create_C_Function(SgSymbol *sF)
-{
-    SgStatement *st_hedr, *st_end;
-    SgExpression *fe;
-
-    // create fuction header
-    st_hedr = new SgStatement(FUNC_HEDR);
-    st_hedr->setSymbol(*sF);
-    fe = new SgFunctionRefExp(*sF);
-    fe->setSymbol(*sF);
-    st_hedr->setExpression(0, *fe);
-
-    // create end of function 
-    st_end = new SgStatement(CONTROL_END);
-    st_end->setSymbol(*sF);
-
-    // inserting      
-    end_block->insertStmtBefore(*st_hedr, *block_C);
-    st_hedr->insertStmtAfter(*st_end, *st_hedr);
-
-    return(st_hedr);
-}
-
-// TODO: __indexTypeInt and __indexTypeLLong
-SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter, int InternalPosition)
-{
-    // !!ATTENTION!! gpuO1 lvl2 disabled
-    return(NULL);
-}
-
-SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter)
-{
-    symb_list *sl;
-    SgStatement *st_hedr, *st_end, *stmt, *do_while, *first_exec, *st_base = NULL, *st_call, *cur;
-    SgExpression *fe, *ae, *arg_list, *el, *e, *er;
-    SgExpression *espec, *e_all_private_size = NULL;
-    SgFunctionCallExp *fcall;
-    //SgStatement *fileHeaderSt;
-    SgSymbol *s_loop_ref, *sarg, *s, *sb, *sg, *sdev, *h_first, *hgpu_first, *base_first, *red_first, *uses_first, *scalar_first, *private_first;
-    SgSymbol *s_stream = NULL, *s_blocks = NULL, *s_threads = NULL, *s_blocks_info = NULL, *s_red_count = NULL, *s_tmp_var = NULL;
-    SgSymbol *s_dev_num = NULL, *s_shared_mem = NULL, *s_regs = NULL, *s_blocksS = NULL, *s_idxL = NULL, *s_idxH = NULL, *s_step = NULL, *s_idxTypeInKernel = NULL;
-    SgSymbol *s_num_of_red_blocks = NULL, *s_fill_flag = NULL, *s_red_num = NULL, *s_restBlocks = NULL, *s_addBlocks = NULL, *s_overallBlocks = NULL;
-    SgSymbol *s_max_blocks;
-    SgType *typ = NULL;
-    int ln, num, i, uses_num, shared_mem_count, has_red_array, use_device_num, nbuf, lnp;
-    char *define_name;
-    int pl_rank = ParLoopRank();
-    h_first = hgpu_first = base_first = red_first = uses_first = scalar_first = NULL;
-    has_red_array = 0;  use_device_num = 0; nbuf = 0;
-    s_dev_num = NULL;
-    s_shared_mem = NULL;
-
-    // create function header 
-    st_hedr = Create_C_Function(sadapter);
-    st_end = st_hedr->lexNext();
-    fe = st_hedr->expr(0);
-    st_hedr->addComment(Cuda_LoopHandlerComment());
-    first_exec = st_end;
-
-    // create  dummy argument list:
-    // loop_ref,<dvm-array-headers>,<uses>,<reduction_array_dimSizes-Lbounds>,<private_array_dimSizes_Lbounds>
-
-    typ = C_PointerType(C_Derived_Type(s_DvmhLoopRef));
-    s_loop_ref = new SgSymbol(VARIABLE_NAME, "loop_ref", *typ, *st_hedr);
-
-    ae = new SgVarRefExp(s_loop_ref);                 //loop_ref
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list = new SgExprListExp(*ae);
-    fe->setLhs(arg_list);
-                                   
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)  // headers
-    {                             //printf("%s\n",sl->symb->identifier());
-        SgArrayType *typearray = new SgArrayType(*C_DvmType()); //(*C_LongType()); 
-        typearray->addDimension(NULL);
-        sarg = new SgSymbol(VARIABLE_NAME, sl->symb->identifier(), *typearray, *st_hedr);
-        ae = new SgArrayRefExp(*sarg);
-        ae->setType(*typearray);
-        el = new SgExpression(EXPR_LIST);
-        el->setLhs(NULL);
-        ae->setLhs(*el);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            h_first = sarg;
-        if (IS_REMOTE_ACCESS_BUFFER(sl->symb)) // case of RTS2 interface
-            nbuf++; 
-    }
-    for (el = uses_list, ln = 0; el; el = el->rhs(), ln++)    // uses
-    {
-        s = el->lhs()->symbol();
-        typ = C_PointerType(C_Type(s->type()));
-        sarg = new SgSymbol(VARIABLE_NAME, s->identifier(), *typ, *st_hedr);
-
-        if (isByValue(s))
-            SYMB_ATTR(sarg->thesymb) = SYMB_ATTR(sarg->thesymb) | USE_IN_BIT;
-        ae = UsedValueRef(s, sarg);
-        ae->setType(typ);
-        ae = new SgPointerDerefExp(*ae);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            uses_first = sarg;
-    }
-    uses_num = ln;
-
-    if (red_list)        // reduction array shapes
-    {
-        reduction_operation_list *rsl;  //create dimmesion size list for reduction arrays
-        int idim;
-        SgExpression *ell;
-        SgType *t;
-        for (rsl = red_struct_list; rsl; rsl = rsl->next)
-        {
-            if (rsl->redvar_size == -1) //reduction variable is array with passed dimension's sizes      
-            {
-                el = NULL;
-                t = C_PointerType(C_DvmType());
-                for (idim = Rank(rsl->redvar); idim; idim--)
-                {
-                    sarg = new SgSymbol(VARIABLE_NAME, BoundName(rsl->redvar, idim, 1), *t, *st_hedr);
-                    ae = new SgVarRefExp(sarg);
-                    ae->setType(t);
-                    el = AddElementToList(el, new SgPointerDerefExp(*ae));
-                } 
-                rsl->lowBound_arg = el;   
-                el = NULL;
-                for (idim = Rank(rsl->redvar); idim; idim--)
-                {
-                    sarg = new SgSymbol(VARIABLE_NAME, DimSizeName(rsl->redvar, idim), *t, *st_hedr);
-                    ae = new SgVarRefExp(sarg);
-                    ae->setType(t);
-                    el = AddElementToList(el, new SgPointerDerefExp(*ae));
-                }
-                rsl->dimSize_arg = el;
-                /*arg_list->setRhs(el->copy());*/
-                arg_list = AddListToList(arg_list,&rsl->dimSize_arg->copy());
-                arg_list = AddListToList(arg_list,&rsl->lowBound_arg->copy());
-
-                while (arg_list->rhs() != 0)
-                    arg_list = arg_list->rhs();
-            }
-        }
-    }
-
-    if (options.isOn(C_CUDA))     // private array shapes
-    {
-        int idim;
-        SgExpression *elp;
-        SgType *t = C_PointerType(C_DvmType());
-
-        for (elp=private_list; elp; elp = elp->rhs())
-        {
-            s = elp->lhs()->symbol();
-            if (IS_ARRAY(s) && !TestArrayShape(s))     
-            {   
-                el = NULL;
-                for (idim = Rank(s); idim; idim--)
-                {
-                    sarg = new SgSymbol(VARIABLE_NAME, DimSizeName(s, idim), *t, *st_hedr);
-                    ae = new SgVarRefExp(sarg);
-                    ae->setType(t);
-                    el = AddElementToList(el, new SgPointerDerefExp(*ae));
-                }
-                SgExpression **edim = new (SgExpression *);
-                *edim = el;
-                elp->lhs()->addAttribute(DIM_SIZES, (void *)edim, sizeof(SgExpression *) );    
-                arg_list = AddListToList(arg_list, &el->copy());
-
-                el = NULL;
-                for (idim = Rank(s); idim; idim--)
-                {
-                    sarg = new SgSymbol(VARIABLE_NAME, BoundName(s, idim, 1), *t, *st_hedr);
-                    ae = new SgVarRefExp(sarg);
-                    ae->setType(t);
-                    el = AddElementToList(el, new SgPointerDerefExp(*ae));
-                } 
-                SgExpression **elb = new (SgExpression *);
-                *elb = el;
-                elp->lhs()->addAttribute(L_BOUNDS, (void *)elb, sizeof(SgExpression *) ); 
-                arg_list = AddListToList(arg_list, &el->copy());
-
-                while (arg_list->rhs() != 0)
-                    arg_list = arg_list->rhs();
-            }
-
-        }
-    } 
-    // create variable's declarations: <dvm_array_headers>,<dvm_array_bases>,<scalar_device_addr>,<reduction_variables>,blocks_info [ or blocksS,idxL,idxH ],stream,blocks,threads
-    if (red_list)
-    {
-        reduction_operation_list *rsl;
-        s_shared_mem = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("shared_mem"), *C_DvmType(), *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        if(!options.isOn(C_CUDA))
-        {
-            s_red_count = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("red_count"), *SgTypeInt(), *st_hedr);
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        s_red_num = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("red_num"), *C_DvmType(), *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        if (options.isOn(NO_BL_INFO))  // without blocks_info, by option -noBI
-        {
-            s_num_of_red_blocks = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("num_of_red_blocks"), *C_DvmType(), *st_hedr);
-            addDeclExpList(s, stmt->expr(0));
-            s_fill_flag = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("fill_flag"), *C_DvmType(), *st_hedr);
-            addDeclExpList(s, stmt->expr(0));
-        }
-
-        //looking through the reduction_op_list
-        for (er = red_list, rsl = red_struct_list, ln = 0; er; er = er->rhs(), rsl = rsl->next, ln++)
-        {
-            SgExpression *ered = NULL, *ev = NULL, *en = NULL, *loc_var_ref = NULL;
-            SgSymbol *sred = NULL, *sgrid = NULL, *s_loc_var = NULL, *sgrid_loc = NULL, *sinit = NULL;
-            int is_array;
-            SgType *loc_type = NULL, *btype = NULL;
-
-            loc_var_ref = NULL;  s_loc_var = NULL; is_array = 0;
-            ered = er->lhs();    //  reduction  (variant==ARRAY_OP)
-            //nop =RedFuncNumber(ered->lhs());
-            ev = ered->rhs(); // reduction variable reference for reduction operations except MINLOC,MAXLOC 
-            if (isSgExprListExp(ev))
-            {
-                ev = ev->lhs(); // reduction variable reference         
-                loc_var_ref = ered->rhs()->rhs()->lhs();        //location array reference
-                en = ered->rhs()->rhs()->rhs()->lhs(); // number of elements in location array
-                loc_el_num = LocElemNumber(en);
-                loc_type = loc_var_ref->symbol()->type();
-            }
-            else if (isSgArrayRefExp(ev) && !ev->lhs()) //whole array
-                is_array = 1;
-
-            s = sred = new SgSymbol(VARIABLE_NAME, ev->symbol()->identifier(), st_hedr);   
-            if (rsl->redvar_size > 0)
-            {
-                SgArrayType *typearray = new SgArrayType(*C_Type(ev->symbol()->type()));
-                typearray->addRange(*ArrayLengthInElems(ev->symbol(), NULL, 0));
-                s->setType(*typearray);
-
-            }
-            else if (rsl->redvar_size < 0)
-                s->setType(C_PointerType(C_Type(ev->symbol()->type())));
-            else
-                s->setType(C_Type(ev->symbol()->type()));
-            //stmt = (rsl->redvar_size < 0) ? makeSymbolDeclarationWithInit(s, MallocExpr(s, rsl->dimSize_arg)) : makeSymbolDeclaration(s);
-            if (rsl->redvar_size >= 0)
-            {
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-            }
-            if (!ln)
-                red_first = s;
-            s = sgrid = GridSymbolForRedInAdapter(s, st_hedr);
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-            if (rsl->redvar_size < 0)
-            {
-                s = sinit = InitValSymbolForRedInAdapter(sred, st_hedr);
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-            }
-            s_loc_var = sgrid_loc = NULL;
-            if (loc_var_ref)
-            {
-                s = s_loc_var = &(loc_var_ref->symbol()->copy());
-                if (isSgArrayType(loc_type))
-                    btype = loc_type->baseType();
-                else
-                    btype = loc_type;
-                   
-                SgArrayType *typearray = new SgArrayType(*C_Type(btype));
-                typearray->addRange(*new SgValueExp(loc_el_num));
-                s_loc_var->setType(*typearray);
-                SYMB_SCOPE(s->thesymb) = st_hedr->thebif;
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-                s = sgrid_loc = GridSymbolForRedInAdapter(s, st_hedr);
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-            }
-             
-            /*--- executable statements: register reductions in RTS ---*/
-            e = &SgAssignOp(*new SgVarRefExp(s_red_num), *new SgValueExp(ln + 1));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            if (!ln)
-            {
-                stmt->addComment("// Register reduction for CUDA-execution");
-                first_exec = stmt;
-            }
-
-            //XXX swap pointers, changed reduction scheme to atomic, Kolganov 06.02.2020
-            if (rsl->redvar_size < 0)
-                std::swap(sgrid, sinit);
-
-            stmt = new SgCExpStmt(*RegisterReduction(s_loop_ref, s_red_num, sgrid, sgrid_loc));
-            st_end->insertStmtBefore(*stmt, *st_hedr);                //!printf("__1131 %d\n",s_loc_var);
-            e = (rsl->redvar_size >= 0) ? InitReduction(s_loop_ref, s_red_num, sred, s_loc_var) :
-                                      CudaInitReduction(s_loop_ref, s_red_num, sinit, NULL);  //sred, s_loc_var,
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-              
-        }
-    }
-    if (!options.isOn(NO_BL_INFO))
-    {
-        s_blocks_info = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("blocks_info"), *C_PointerType(C_VoidType()), *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-    else
-    {
-        s_blocksS = s = ArraySymbol(TestAndCorrectName("blocksS"), C_DvmType(), new SgValueExp(pl_rank), st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        s_restBlocks = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("restBlocks"), *C_Derived_Type(s_cudaStream), *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-	s_max_blocks = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("maxBlocks"), *C_DvmType(), *st_hedr);
-	addDeclExpList(s, stmt->expr(0));
-        s_addBlocks = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("addBlocks"), *C_Derived_Type(s_cudaStream), *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-        s_overallBlocks = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("overallBlocks"), *C_Derived_Type(s_cudaStream), *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-        s_idxL = s = ArraySymbol(TestAndCorrectName("idxL"), C_DvmType(), new SgValueExp(pl_rank), st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        s_idxH = s = ArraySymbol(TestAndCorrectName("idxH"), C_DvmType(), new SgValueExp(pl_rank), st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-        s_step = s = ArraySymbol(TestAndCorrectName("loopSteps"), C_DvmType(), new SgValueExp(pl_rank), st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-
-    }
-    s_stream = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("stream"), *C_Derived_Type(s_cudaStream), *st_hedr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    s_blocks = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("blocks"), *t_dim3, *st_hedr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    s_threads = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("threads"), *t_dim3, *st_hedr);
-    addDeclExpList(s, stmt->expr(0));
-
-    s_idxTypeInKernel = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("idxTypeInKernel"), *C_DvmType(), *st_hedr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    for (s = uses_first, ln = 0; ln < uses_num; s = s->next(), ln++)    // uses
-    if (!(s->attributes() & USE_IN_BIT))   // passing to kernel scalar argument by reference
-    {
-        sdev = GpuScalarAdrSymbolInAdapter(s, st_hedr);   // creating new symbol for address in device
-        if (!scalar_first)
-        {
-            scalar_first = sdev;
-            stmt = makeSymbolDeclaration(sdev);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(sdev, stmt->expr(0));
-    }
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)
-    {
-        s = GpuHeaderSymbolInAdapter(sl->symb, st_hedr);
-        if (!ln)
-        {
-            hgpu_first = s;
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(s, stmt->expr(0));
-    }
-      
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)
-    {
-        s = GpuBaseSymbolInAdapter(sl->symb, st_hedr);
-        if (!ln)
-        {
-            base_first = s;
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(s, stmt->expr(0));
-    }
-    num = ln;
-
-    // create execution part
-
-
-    /* -------- call dvmh_get_device_addr(long *deviceRef, void *variable) ----*/
-    for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ln++)    // uses
-    if (!(s->attributes() & USE_IN_BIT))   // passing to kernel scalar argument by reference
-    {
-        s_dev_num = doDeviceNumVar(st_hedr, first_exec, s_dev_num, s_loop_ref);
-        e = &SgAssignOp(*new SgVarRefExp(sdev), *GetDeviceAddr(s_dev_num, s));
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (!ln)
-            stmt->addComment("// Get device addresses");
-        sdev = sdev->next();
-    }
-
-
-    /* -------- call dvmh_get_natural_base(long *deviceRef, long dvmDesc[] ) ----*/
-
-    for (sl = acc_array_list, s = h_first, sb = base_first, ln = 0; ln < num; sl = sl->next, s = s->next(), sb = sb->next(), ln++)
-    {
-        s_dev_num = doDeviceNumVar(st_hedr, first_exec, s_dev_num, s_loop_ref);
-        e = &SgAssignOp(*new SgVarRefExp(sb), *GetNaturalBase(s_dev_num, s));
-        stmt = cur = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (IS_REMOTE_ACCESS_BUFFER(sl->symb)) // case of RTS2 interface
-        {
-            e = LoopGetRemoteBuf(s_loop_ref, nbuf--, s); 
-            stmt = new SgCExpStmt(*e);
-            cur->insertStmtBefore(*stmt, *st_hedr); 
-        }
-        if (!ln)
-        {
-            stmt->addComment("// Get 'natural' bases");
-            st_base = stmt; // save for inserting loop_cuda_autotransform_() before
-        }
-    }
-
-    /* -------- call loop_cuda_autotransform_(DvmhLoopRef *InDvmhLoop, DvmType dvmDesc[] ) ----*/
-
-    if (options.isOn(AUTO_TFM)) // for option -noTfm  calls are not generated
-    {
-        for (s = h_first, ln = 0; ln < num; s = s->next(), ln++)
-        {
-            e = CudaAutoTransform(s_loop_ref, s);
-            stmt = new SgCExpStmt(*e);
-            st_base->insertStmtBefore(*stmt, *st_hedr);  // insert before getting bases for arrays 
-            if (!ln)
-                stmt->addComment("// Autotransform arrays");
-        }
-    }
-    /* -------- call  dvmh_fill_header_(long *deviceRef, void *base, long dvmDesc[], long dvmhDesc[]);----*/
-
-    for (s = h_first, sg = hgpu_first, sb = base_first, ln = 0; ln < num; s = s->next(), sg = sg->next(), sb = sb->next(), ln++)
-    {
-        e = FillHeader(s_dev_num, sb, s, sg);
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (!ln)
-            stmt->addComment("// Fill 'device' headers");
-    }
-
-    if (options.isOn(RTC))
-    {
-        /* -------- call  loop_cuda_rtc_set_lang_(loop_ref, lang); ------------*/
-        if (options.isOn(C_CUDA))
-            stmt = new SgCExpStmt(*RtcSetLang(s_loop_ref, 1));
-        else
-            stmt = new SgCExpStmt(*RtcSetLang(s_loop_ref, 0));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        stmt->addComment("// Set CUDA language for launching kernels in RTC");
-    }
-
-    /* -------- call  loop_guess_index_type_(loop_ref); ------------*/
-    stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_idxTypeInKernel), *GuessIndexType(s_loop_ref)));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Guess index type in CUDA kernel");
-
-    SgFunctionCallExp *sizeofL = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-    SgFunctionCallExp *sizeofLL = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-    SgFunctionCallExp *sizeofI = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-
-    sizeofL->addArg(*new SgKeywordValExp("long"));        //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "long")));
-    sizeofLL->addArg(*new SgKeywordValExp("long long"));  //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "long long")));
-    sizeofI->addArg(*new SgKeywordValExp("int"));        //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "int")));
-
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(s_idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LONG")))
-        &&
-        SgEqOp(*sizeofL, *sizeofI),
-        *new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_INT")))));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(s_idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LONG")))
-        &&
-        SgEqOp(*sizeofL, *sizeofLL),
-        *new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LLONG")))));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    /* -------- call loop_cuda_get_config_(DvmhLoopRef *InDvmhLoop, DvmType *InSharedPerThread, DvmType *InRegsPerThread, dim3 *OutThreads, cudaStream_t *OutStream,DvmType *OutSharedPerBlock) ----*/
-
-    e = &SgAssignOp(*new SgVarRefExp(s_threads), *dim3FunctionCall(0));
-    stmt = new SgCExpStmt(*e);
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Get CUDA configuration parameters");
-
-    shared_mem_count = MaxRedVarSize(red_list);
-    if (shared_mem_count)
-    {
-        if (!options.isOn(C_CUDA))
-        {
-            e = &SgAssignOp(*new SgVarRefExp(s_shared_mem), *new SgValueExp(shared_mem_count));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-        else
-        {
-            std::string preproc = std::string("#ifdef ") + fermiPreprocDir;
-            char *tmp = new char[preproc.size() + 1];
-            strcpy(tmp, preproc.data());
-
-            st_end->insertStmtBefore(*PreprocessorDirective(tmp), *st_hedr);
-            e = &SgAssignOp(*new SgVarRefExp(s_shared_mem), *new SgValueExp(shared_mem_count));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            st_end->insertStmtBefore(*PreprocessorDirective("#else"), *st_hedr);
-            e = &SgAssignOp(*new SgVarRefExp(s_shared_mem), *new SgValueExp(0));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-            st_end->insertStmtBefore(*PreprocessorDirective("#endif"), *st_hedr);
-        }
-    }
-        
-    SgSymbol *s_regs_int, *s_regs_llong;
-
-    std::string define_name_int = kernel_symb->identifier();
-    std::string define_name_long = kernel_symb->identifier();
-
-    define_name_int += "_int_regs";
-    define_name_long += "_llong_regs";
-
-    s_regs_int = new SgSymbol(VARIABLE_NAME, define_name_int.c_str(), *C_DvmType(), *block_C);
-    s_regs_llong = new SgSymbol(VARIABLE_NAME, define_name_long.c_str(), *C_DvmType(), *block_C);
-
-    SgStatement *config_int = new SgCExpStmt(*GetConfig(s_loop_ref, s_shared_mem, s_regs_int, s_threads, s_stream, s_shared_mem));
-    SgStatement *config_long = new SgCExpStmt(*GetConfig(s_loop_ref, s_shared_mem, s_regs_llong, s_threads, s_stream, s_shared_mem));
-
-    RGname_list = AddNewToSymbList(RGname_list, s_regs_int);
-    RGname_list = AddNewToSymbList(RGname_list, s_regs_llong);
-                
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(*s_idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_INT"))), *config_int, *config_long);
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-        
-    /* generating for info_block
-    define_name = RegisterConstName();
-    stmt = ifdef_dir(define_name);
-    end_info_block->insertStmtBefore(*stmt,*info_block);
-    s_regs_info = &(s_regs->copy());
-    SYMB_SCOPE(s_regs_info->thesymb) = info_block->thebif;
-    stmt = makeSymbolDeclarationWithInit(s_regs_info, new SgVarRefExp(new SgSymbol(VARIABLE_NAME, define_name)));
-    end_info_block->insertStmtBefore(*stmt, *info_block);
-    stmt = else_dir();
-    end_info_block->insertStmtBefore(*stmt,*info_block);
-    stmt = makeSymbolDeclarationWithInit(s_regs_info, new SgValueExp(0));
-    end_info_block->insertStmtBefore(*stmt, *info_block);
-    stmt = endif_dir();
-    end_info_block->insertStmtBefore(*stmt,*info_block); */
-    
-
-    /* --------- call cuda-kernel ----*/
-    espec = CreateBlocksThreadsSpec(shared_mem_count, s_blocks, s_threads, s_stream, s_shared_mem);
-
-    fcall = CallKernel(kernel_symb, espec);
-
-    /* --------- add argument list to kernel call ----*/
-    for (sg = hgpu_first, sb = base_first, sl = acc_array_list, ln = 0; ln<num; sg = sg->next(), sb = sb->next(), sl = sl->next, ln++)
-    {
-        e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(sl->symb->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sb));
-        fcall->addArg(*e);   
-        for (i = NumberOfCoeffs(sg); i>0; i--)
-            fcall->addArg(*new SgArrayRefExp(*sg, *new SgValueExp(i)));
-    }
-    if (red_list)
-    {
-        reduction_operation_list *rsl;
-        for (rsl = red_struct_list, s = red_first; rsl; rsl = rsl->next)  //s!=s_blocks_info
-        {
-            if (rsl->redvar_size == 0) //reduction variable is scalar 
-            {
-                if (options.isOn(RTC))
-                {
-                    SgVarRefExp *toAdd = new SgVarRefExp(s);
-                    toAdd->addAttribute(RTC_NOT_REPLACE);
-                    fcall->addArg(*toAdd);
-                }
-                else
-                    fcall->addArg(*new SgVarRefExp(s));
-            }
-            else if (rsl->redvar_size > 0)
-            {
-                int i;
-                has_red_array = 1;
-                for (i = 0; i < rsl->redvar_size; i++)
-                    fcall->addArg(*new SgArrayRefExp(*s, *new SgValueExp(i)));
-            }
-            else
-            {
-                has_red_array = 1;
-                for (el = rsl->dimSize_arg; el; el = el->rhs())
-                    fcall->addArg(el->lhs()->copy());
-                for (el = rsl->lowBound_arg; el; el = el->rhs())
-                    fcall->addArg(el->lhs()->copy());
-            }
-            s = s->next();
-            //if (rsl->redvar_size < 0)  s = s->next(); // to omit symbol for 'malloc'
-            // <red-var_grid> symbol to collect reduction values   
-            e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(rsl->redvar->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(s));
-            fcall->addArg(*e); s = s->next();
-            if (rsl->redvar_size < 0)
-            {// <red-var_init> symbol for initial values of reduction array
-                e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(rsl->redvar->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(s));
-                fcall->addArg(*e); s = s->next();
-            }
-            //if(isSgExprListExp(er->lhs()->rhs())) //MAXLOC,MINLOC
-            if (rsl->locvar)  //MAXLOC,MINLOC
-            {
-                int i;
-                for (i = 0; i < rsl->number; i++)
-                    fcall->addArg(*new SgArrayRefExp(*s, *new SgValueExp(i)));
-                s = s->next();
-                e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(rsl->locvar->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(s));
-                fcall->addArg(*e); s = s->next();
-            }
-        }
-    }
-
-    if (!options.isOn(NO_BL_INFO))
-    {
-        if (options.isOn(C_CUDA))
-            e = new SgVarRefExp(s_blocks_info);
-        else
-            e = new SgCastExp(*C_PointerType(new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(s_blocks_info));
-        fcall->addArg(*e);   //'bloks_info'
-
-    }
-    else  //without blocks_info
-    {
-        for (i = 0; i < pl_rank; i++)
-        {
-            fcall->addArg(*new SgArrayRefExp(*s_idxL, *new SgValueExp(i)));     //'idxL[...]'
-            fcall->addArg(*new SgArrayRefExp(*s_idxH, *new SgValueExp(i)));     //'idxH[...]'
-            if(!IConstStep(DoStmt(first_do_par, i + 1)))     //IntStepForHostHandler
-               fcall->addArg(*new SgArrayRefExp(*s_step, *new SgValueExp(i)));  // loopStep[...]
-        }
-        for (i = 1; i < pl_rank; i++)
-            fcall->addArg(*new SgArrayRefExp(*s_blocksS, *new SgValueExp(i)));  //'blocksS[...]'
-        fcall->addArg(*new SgVarRefExp(*s_addBlocks));                         //'addBlocks'      
-    }
-
-    if (red_list)
-    {
-        if(!options.isOn(C_CUDA))
-            fcall->addArg(*new SgVarRefExp(s_red_count));         //'red_count'
-        if (has_red_array)
-        {
-            if (!options.isOn(NO_BL_INFO))
-                fcall->addArg(*GetOverallStep(s_loop_ref));
-            else
-                fcall->addArg(*new SgVarRefExp(*s_num_of_red_blocks));
-        }
-    }
-
-    for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ln++)  // uses
-    if (s->attributes() & USE_IN_BIT)
-        fcall->addArg(SgDerefOp(*new SgVarRefExp(*s)));   // passing argument by value to kernel
-    else
-    {                                                   // passing argument by reference to kernel
-        e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? s->type()->baseType() : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sdev));
-        fcall->addArg(*e);
-        sdev = sdev->next();
-    }
-
-    e_all_private_size = sizeOfPrivateArraysInBytes();
-    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
-    {
-        for (el=private_list, lnp=0; el; el=el->rhs())
-        {
-             s = el->lhs()->symbol();
-             if (IS_ARRAY(s))
-             {                
-                 sarg = new SgSymbol(VARIABLE_NAME, PointerNameForPrivateArray(s), *C_PointerType(C_VoidType()), *st_hedr);
-                 ae = new SgCastExp(*C_PointerType( C_Type(s->type()->baseType())), *new SgVarRefExp(sarg));
-                 fcall->addArg(*ae);
-                 if (!lnp)
-                     private_first = sarg;
-                 lnp++;        
-                 if (!TestArrayShape(s))
-                 {   
-                     SgExpression **eatr = (SgExpression **) el->lhs()->attributeValue(0, DIM_SIZES);  
-                     SgExpression *ela;
-                     for (ela = *eatr; ela; ela = ela->rhs())
-                         fcall->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol())));  
-                     eatr = (SgExpression **) el->lhs()->attributeValue(0, L_BOUNDS);    
-                     for (ela = *eatr; ela; ela = ela->rhs())
-                         fcall->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol()))); 
-                 }
-
-             }
-         }
-    }         
-
-    if (!options.isOn(NO_BL_INFO))
-    {
-        //insert kernel call
-        stmt = createKernelCallsInCudaHandler(fcall, s_loop_ref, s_idxTypeInKernel, s_blocks);
-
-        /* ------- WHILE (loop_cuda_do(DvmhLoopRef *InDvmhLoop, dim3 *OutBlocks, dim3 *OutThreads, cudaStream_t *OutStream, CudaIndexType **InOutBlocks) != 0) ----*/
-        e = LoopDoCuda(s_loop_ref, s_blocks, s_threads, s_stream, s_blocks_info, s_idxTypeInKernel);
-        do_while = new SgWhileStmt(SgNeqOp(*e, *new SgValueExp(0)), *stmt);
-
-        st_end->insertStmtBefore(*do_while, *st_hedr);
-        do_while->addComment("// GPU execution");
-
-        /* ------ block for reductions ----*/
-        if (red_list && !options.isOn(C_CUDA))  //if(red_op_list)
-            InsertDoWhileForRedCount_C(do_while, s_threads, s_red_count);
-
-    }
-    else //without blocks-info
-    {
-        //loop_fill_bounds_(loop_ref,idxL,idxH,0);
-        e = FillBounds(s_loop_ref, s_idxL, s_idxH, s_step); //s_step => NULL
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        // blocksS[i] = ...           i=0,...,pl_rank-1
-        for (i = pl_rank - 1; i >= 0; i--)
-        {
-            stmt = AssignBlocksSElement(i, pl_rank, s_blocksS, s_idxL, s_idxH, s_step, s_threads);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-
-        // overallBlocks = blocksS[0];
-        // restBlocks = overallBlocks;
-        // addBlocks = 0;
-        // blocks = dim3(1,1,1);
-
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_overallBlocks), *new SgArrayRefExp(*s_blocksS, *new SgValueExp(0))));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (currentLoop && currentLoop->irregularAnalysisIsOn())
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_restBlocks), *new SgVarRefExp(*s_overallBlocks) * *GetWarpSize(s_loop_ref)));
-        else
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_restBlocks), *new SgVarRefExp(*s_overallBlocks)));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_addBlocks), *new SgValueExp(0)));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        e = &SgAssignOp(*new SgVarRefExp(s_blocks), *dim3FunctionCall(1));
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        //    stmt = new SgCExpStmt(SgAssignOp(*new SgRecordRefExp(*s_blocks,"x"),*new SgArrayRefExp(*s_blocksS,*new SgValueExp(0)))); 
-        //    st_end->insertStmtBefore(*stmt,*st_hedr);
-        //    stmt = new SgCExpStmt(SgAssignOp(*new SgRecordRefExp(*s_blocks,"y"),*new SgValueExp(1))); 
-        //    st_end->insertStmtBefore(*stmt,*st_hedr);
-        //    stmt = new SgCExpStmt(SgAssignOp(*new SgRecordRefExp(*s_blocks,"z"),*new SgValueExp(1))); 
-        //    st_end->insertStmtBefore(*stmt,*st_hedr);
-
-        /* ------ block for prepare reductions ----*/
-        if (red_list)
-        {
-            InsertAssignForReduction(st_end, s_num_of_red_blocks, s_fill_flag, s_overallBlocks, s_threads, s_loop_ref);
-            if(!options.isOn(C_CUDA))
-                InsertDoWhileForRedCount_C(st_end, s_threads, s_red_count);
-            InsertPrepareReductionCalls(st_end, s_loop_ref, s_num_of_red_blocks, s_fill_flag, s_red_num);
-        }
-        //insert kernel call
-        st_call = createKernelCallsInCudaHandler(fcall, s_loop_ref, s_idxTypeInKernel, s_blocks);
-
-		
-	SgExpression *getProp = GetDeviceProp(s_loop_ref, new SgKeywordValExp("CUDA_MAX_GRID_X"));
-	stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_max_blocks), *getProp));
-	st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        // insert code for big private arrays
-        if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size)) //(e_size = sizeOfPrivateArraysInBytes()))
-        {
-            SgSymbol *s_private_size = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("privateSizeForBlock"), *C_DvmType(), *st_hedr);
-            stmt = makeSymbolDeclaration(s_private_size);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-            SgSymbol *s_total_threads = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("totalThreads"), *C_DvmType(), *st_hedr);
-            addDeclExpList(s_total_threads, stmt->expr(0));
-                        
-            SgExpression *e_threads = &(*new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z"));
-            SgExpression *e_private_size_for_block = &(*e_threads * *(e_all_private_size ? e_all_private_size : CalculateSizeOfPrivateArraysInBytes()));
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_private_size), *e_private_size_for_block));
-	    st_end->insertStmtBefore(*stmt, *st_hedr);
-            
-            SgExpression *e_maxBlocks = GetMaxBlocks(s_loop_ref, s_max_blocks, s_private_size);
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_max_blocks), *e_maxBlocks));
-	    st_end->insertStmtBefore(*stmt, *st_hedr);
-	                                                                                      
-            SgFunctionCallExp *fmin = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "min", *C_DvmType(), *st_hedr));
-            fmin->addArg(*new SgVarRefExp(s_max_blocks));
-            fmin->addArg(*new SgVarRefExp(s_restBlocks));
-            SgExpression *e_total_threads = &((e_threads->copy()) * *fmin); 
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_total_threads), *e_total_threads));
-	    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            // Get private arrays
-            GetMemoryForPrivateArrays(private_first, s_loop_ref, lnp, st_end, st_hedr, new SgVarRefExp(s_total_threads)); 
-          }
-        if (currentLoop && currentLoop->irregularAnalysisIsOn())
-        {
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s_max_blocks), *new SgVarRefExp(*s_max_blocks) / *GetWarpSize(s_loop_ref) * *GetWarpSize(s_loop_ref)));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-
-        //e = & operator > ( *new SgVarRefExp(s_restBlocks), 
-        do_while = new SgWhileStmt(operator > (*new SgVarRefExp(s_restBlocks), *new SgValueExp(0)), *st_call);
-        st_end->insertStmtBefore(*do_while, *st_hedr);
-        do_while->addComment("// GPU execution");
-	stmt = IfForHeader(s_restBlocks, s_blocks, s_max_blocks);
-        st_call->insertStmtBefore(*stmt, *do_while);
-        stmt = new SgCExpStmt(*new SgExpression(MINUS_ASSGN_OP, new SgVarRefExp(*s_restBlocks), new SgRecordRefExp(*s_blocks, "x"), NULL));
-        st_call->insertStmtAfter(*stmt, *do_while);
-        stmt = new SgCExpStmt(operator += (*new SgVarRefExp(*s_addBlocks), *new SgRecordRefExp(*s_blocks, "x")));
-        st_call->insertStmtAfter(*stmt, *do_while);
-        /* ------ block for finish reductions ----*/
-        if (red_list)
-            InsertFinishReductionCalls(st_end, s_loop_ref, s_red_num);
-
-        // to dispose private arrays
-        if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
-            for (s = private_first, ln = 0;  ln < lnp; s = s->next(), ln++)  // private arrays
-            {
-                stmt = new SgCExpStmt(*DisposePrivateArray(s_loop_ref, s));
-	        st_end->insertStmtBefore(*stmt, *st_hedr);  
-            }
-    }
-
-    if (options.isOn(C_CUDA))
-        RenamingCudaFunctionVariables(st_hedr, s_loop_ref, 0);
-
-    return(st_hedr);
-}
-
-
-SgStatement *Create_C_Adapter_Function_For_Sequence(SgSymbol *sadapter, SgStatement *first_st)
-{
-    symb_list *sl = NULL;
-    SgStatement *st_hedr = NULL, *st_end = NULL, *stmt = NULL, *do_while = NULL, *st_base = NULL;
-    SgExpression *fe = NULL, *ae = NULL, *arg_list = NULL, *el = NULL, *e = NULL;
-    SgExpression *espec = NULL;
-    SgFunctionCallExp *fcall = NULL;
-    //SgStatement *fileHeaderSt;
-    SgSymbol *s_loop_ref = NULL, *sarg = NULL, *s = NULL, *sb = NULL, *sg = NULL, *sdev = NULL, *h_first = NULL;
-    SgSymbol *hgpu_first = NULL, *base_first = NULL, *uses_first = NULL, *scalar_first = NULL;
-    SgSymbol *s_stream = NULL, *s_blocks = NULL, *s_threads = NULL, *s_dev_num = NULL, *s_idxTypeInKernel = NULL;
-    SgType *typ = NULL;
-    int ln, num, i, uses_num;
-
-    // create fuction header
-    st_hedr = Create_C_Function(sadapter);
-    st_end = st_hedr->lexNext();
-    fe = st_hedr->expr(0);
-    st_hedr->addComment(Cuda_SequenceHandlerComment(first_st->lineNumber()));
-
-    // create  dummy argument list:
-    // loop_ref,<dvm-array-headers>,<uses>
-
-    typ = C_PointerType(C_Derived_Type(s_DvmhLoopRef));
-    s_loop_ref = new SgSymbol(VARIABLE_NAME, "loop_ref", *typ, *st_hedr);
-    ae = new SgVarRefExp(s_loop_ref);                 //loop_ref
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list = new SgExprListExp(*ae);
-    fe->setLhs(arg_list);
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)  // headers
-    {  //printf("%s\n",sl->symb->identifier()); 
-        SgArrayType *typearray = new SgArrayType(*C_DvmType());
-        //typearray -> addRange(*new SgValueExp(Rank(sl->symb)+2));
-        sarg = new SgSymbol(VARIABLE_NAME, sl->symb->identifier(), *typearray, *st_hedr);
-        ae = new SgArrayRefExp(*sarg);
-        ae->setType(*typearray);
-        el = new SgExpression(EXPR_LIST);
-        el->setLhs(NULL);
-        ae->setLhs(*el);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            h_first = sarg;
-    }
-    for (el = uses_list, ln = 0; el; el = el->rhs(), ln++)    // uses
-    {
-        s = el->lhs()->symbol();
-        typ = C_PointerType(C_Type(s->type()));
-        sarg = new SgSymbol(VARIABLE_NAME, s->identifier(), *typ, *st_hedr);
-        if (isByValue(s))
-            SYMB_ATTR(sarg->thesymb) = SYMB_ATTR(sarg->thesymb) | USE_IN_BIT;
-
-        ae = UsedValueRef(s, sarg);
-        ae->setType(typ);
-        ae = new SgPointerDerefExp(*ae);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            uses_first = sarg;
-    }
-    uses_num = ln;
-
-    // create variable's declarations: <dvm_array_headers>,<dvm_array_bases>,<scalar_device_addr>,stream,blocks,threads
-
-    s_stream = s = new SgSymbol(VARIABLE_NAME, "stream", *C_Derived_Type(s_cudaStream), *st_hedr);
-    stmt = makeSymbolDeclaration(s); /*stmt = s->makeVarDeclStmt(); */
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    s_blocks = s = new SgSymbol(VARIABLE_NAME, "blocks", *t_dim3, *st_hedr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    s_threads = s = new SgSymbol(VARIABLE_NAME, "threads", *t_dim3, *st_hedr);
-    addDeclExpList(s, stmt->expr(0));
-
-    s_idxTypeInKernel = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("idxTypeInKernel"), *C_DvmType(), *st_hedr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    for (s = uses_first, ln = 0; ln < uses_num; s = s->next(), ln++)    // uses
-    if (!(s->attributes() & USE_IN_BIT))   // passing to kernel scalar argument by reference
-    {
-        sdev = GpuScalarAdrSymbolInAdapter(s, st_hedr);   // creating new symbol for address in device
-        if (!scalar_first)
-        {
-            scalar_first = sdev;
-            stmt = makeSymbolDeclaration(sdev);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(sdev, stmt->expr(0));
-    }
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)
-    {
-        s = GpuHeaderSymbolInAdapter(sl->symb, st_hedr);
-        if (!ln)
-        {
-            hgpu_first = s;
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(s, stmt->expr(0));
-    }
-
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ln++)
-    {
-        s = GpuBaseSymbolInAdapter(sl->symb, st_hedr);
-        if (!ln)
-        {
-            base_first = s;
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(s, stmt->expr(0));
-    }
-    num = ln;
-
-    // create execution part
-
-    /* -------- call dvmh_get_device_addr(DvmType *deviceRef, void *variable) ----*/
-    for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ln++)    // uses
-    if (!(s->attributes() & USE_IN_BIT))   // passing to kernel scalar argument by reference
-    {
-        s_dev_num = doDeviceNumVar(st_hedr, st_end, s_dev_num, s_loop_ref);
-        e = &SgAssignOp(*new SgVarRefExp(sdev), *GetDeviceAddr(s_dev_num, s));
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (!ln)
-            stmt->addComment("// Get device addresses");
-        sdev = sdev->next();
-    }
-
-    /* -------- call dvmh_get_natural_base(DvmType *deviceRef, DvmType dvmDesc[]) ----*/
-
-    for (s = h_first, sb = base_first, ln = 0; ln < num; s = s->next(), sb = sb->next(), ln++)
-    {
-        s_dev_num = doDeviceNumVar(st_hedr, st_end, s_dev_num, s_loop_ref);
-        e = &SgAssignOp(*new SgVarRefExp(sb), *GetNaturalBase(s_dev_num, s));
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (!ln)
-        {
-            stmt->addComment("// Get 'natural' bases");
-            st_base = stmt; // save for inserting loop_cuda_autotransform_() before
-        }
-    }
-
-    /* -------- call loop_cuda_autotransform_(DvmhLoopRef *InDvmhLoop, DvmType dvmDesc[] ) ----*/
-    if (options.isOn(AUTO_TFM)) // for option -noTfm  calls are not generated
-    {
-        for (s = h_first, ln = 0; ln < num; s = s->next(), ln++)
-        {
-            e = CudaAutoTransform(s_loop_ref, s);
-            stmt = new SgCExpStmt(*e);
-            st_base->insertStmtBefore(*stmt, *st_hedr);  // insert before getting bases for arrays 
-            if (!ln)
-                stmt->addComment("// Autotransform arrays");
-        }
-    }
-    /* -------- call  dvmh_fill_header_(DvmType *deviceRef, void *base, DvmType dvmDesc[], DvmType dvmhDesc[]);----*/
-
-    for (s = h_first, sg = hgpu_first, sb = base_first, ln = 0; ln < num; s = s->next(), sg = sg->next(), sb = sb->next(), ln++)
-    {
-        e = FillHeader(s_dev_num, sb, s, sg);
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (!ln)
-            stmt->addComment("// Fill 'device' headers");
-    }
-
-    /* -------- call   loop_guess_index_type_(loop_ref); ------------*/
-    stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_idxTypeInKernel), *GuessIndexType(s_loop_ref)));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Guess index type in CUDA kernel");
-
-    SgFunctionCallExp *sizeofL = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-    SgFunctionCallExp *sizeofLL = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-    SgFunctionCallExp *sizeofI = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-
-    sizeofL->addArg(*new SgKeywordValExp("long"));                 //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "long")));
-    sizeofLL->addArg(*new SgKeywordValExp("long long"));         //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "long long")));
-    sizeofI->addArg(*new SgKeywordValExp("int"));               //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "int")));
-
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(s_idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LONG")))
-        &&
-        SgEqOp(*sizeofL, *sizeofI),
-        *new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_INT")))));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(s_idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LONG")))
-        &&
-        SgEqOp(*sizeofL, *sizeofLL),
-        *new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LLONG")))));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    if (lpart_list)  // there are dvm-array references in left part of assign statement
-    {
-        local_part_list *pl;
-
-        for (pl = lpart_list; pl; pl = pl->next)
-        {
-            pl->local_part = new SgVariableSymb(pl->local_part->identifier(), *C_PointerType(C_VoidType()), *st_hedr);
-            stmt = makeSymbolDeclarationWithInit(pl->local_part, GetLocalPart(s_loop_ref, pl->dvm_array, s_idxTypeInKernel));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-    }
-
-    /* -------- call loop_cuda_get_config_(DvmhLoopRef *InDvmhLoop, DvmType *InSharedPerThread, DvmType *InRegsPerThread, dim3 *OutThreads, cudaStream_t *OutStream,DvmType *OutSharedPerBlock) ----*/
-
-    e = &SgAssignOp(*new SgVarRefExp(s_threads), *dim3FunctionCall(0));
-    stmt = new SgCExpStmt(*e);
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Get CUDA configuration parameters");
-
-    e = GetConfig(s_loop_ref, NULL, NULL, s_threads, s_stream, NULL);
-    stmt = new SgCExpStmt(*e);
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    /* --------- call cuda-kernel ----*/
-    espec = CreateBlocksThreadsSpec(0, s_blocks, s_threads, s_stream, NULL);
-
-    fcall = CallKernel(kernel_symb, espec);
-
-    /* --------- add argument list to kernel call ----*/
-    // bases and coefficients for arrays  
-    for (sg = hgpu_first, sb = base_first, sl = acc_array_list, ln = 0; ln<num; sg = sg->next(), sb = sb->next(), sl = sl->next, ln++)
-    {
-        e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(sl->symb->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sb));
-        fcall->addArg(*e);
-        for (i = NumberOfCoeffs(sg); i>0; i--)
-            fcall->addArg(*new SgArrayRefExp(*sg, *new SgValueExp(i)));
-    }
-
-    if (lpart_list)                                         // local parts for dvm-arrays
-    {
-        local_part_list *pl;
-
-        for (pl = lpart_list; pl; pl = pl->next)
-        {
-            if (options.isOn(C_CUDA))
-            {
-                e = new SgVarRefExp(pl->local_part);                
-                SgAttribute *att = new SgAttribute(1, NULL, 777, *new SgSymbol(VARIABLE_NAME), 777);
-                e->addAttribute(att);
-            }
-            else
-                e = new SgCastExp(*C_PointerType(new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(pl->local_part));
-            fcall->addArg(*e);            
-        }
-    }
-
-    for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ln++)  // uses
-    if (s->attributes() & USE_IN_BIT)
-        fcall->addArg(SgDerefOp(*new SgVarRefExp(*s)));   // passing argument by value to kernel
-    else
-    {                                                   // passing argument by reference to kernel        
-        e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? s->type()->baseType() : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sdev));
-        fcall->addArg(*e);
-        sdev = sdev->next();
-    }
-
-    // inset kernel call
-    stmt = createKernelCallsInCudaHandler(fcall, s_loop_ref, s_idxTypeInKernel, s_blocks);
-    /* ------- WHILE (loop_cuda_do(DvmhLoopRef *InDvmhLoop, dim3 *OutBlocks, dim3 *OutThreads, cudaStream_t *OutStream, CudaIndexType **InOutBlocks) != 0) ----*/
-
-    e = LoopDoCuda(s_loop_ref, s_blocks, s_threads, s_stream, NULL, CudaIndexConst());
-    do_while = new SgWhileStmt(SgNeqOp(*e, *new SgValueExp(0)), *stmt);
-    st_end->insertStmtBefore(*do_while, *st_hedr);
-    do_while->addComment("// GPU execution");
-
-    return(st_hedr);
-}
-
-void GetMemoryForPrivateArrays(SgSymbol *private_first, SgSymbol *s_loop_ref, int nump, SgStatement *st_end, SgStatement *st_hedr, SgExpression *e_totalThreads)
-{
-    SgSymbol *s;
-    SgExpression *el;
-    SgStatement *stmt;  
-    int ln; 
-    if (!private_first) 
-        return;
-    SgStatement *st_decl = makeSymbolDeclaration(private_first);
-    st_end->insertStmtBefore(*st_decl, *st_hedr);           
-    st_decl->addComment("// Get private arrays");
-
-    for (s = private_first, el = private_list, ln = 0;  ln < nump; s = s->next(), el = el->rhs(), ln++)  // private arrays
-    { 
-        while (!IS_ARRAY(el->lhs()->symbol()))
-            el = el->rhs();
-        if (ln)
-            addDeclExpList(s, st_decl->expr(0)); 
-        SgExpression **esizes = (SgExpression **) el->lhs()->attributeValue(0, DIM_SIZES); 
-        SgExpression *elength = esizes ?  &( *ProductOfDimSizeArgs(*esizes) * *sizeOfElementInBytes(el->lhs()->symbol())) : ArrayLength(el->lhs()->symbol(), dvm_parallel_dir, 0); 
-        SgExpression *e_bytes = &(*elength * *e_totalThreads);
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*s), *GetPrivateArray(s_loop_ref, e_bytes)));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-    }
-}
-
-SgExpression *sizeOfElementInBytes(SgSymbol *symb)
-{
-   int isz = TypeSize(symb->type()->baseType());
-   if (isz <= 0 )
-       Error("Illegal type of private array %s, not implemented yet for GPU",symb->identifier(), 592, dvm_parallel_dir);
-   return (new SgValueExp(isz));
-}
-
-SgExpression *sizeOfPrivateArraysInBytes()
-{
-    SgExpression *e_size = CalculateSizeOfPrivateArraysInBytes();
-    if (e_size && e_size->isInteger()) // calculating length if it is possible
-    { 
-        if (options.isOn(BIG_PRIVATES))  
-            return e_size;
-        else
-            return NULL;
-    }
-    return e_size;
-}
-
-SgExpression *CalculateSizeOfPrivateArraysInBytes()
-{
-    SgExpression *el, *e_size = NULL; 
-    int isize = 0;
-                       //if (newVars.size() != 0)
-                       //{
-                       //    correctPrivateList(RESTORE);
-                       //    newVars.clear();
-                       //}
-    for (el = private_list; el; el = el->rhs())
-    {
-        SgSymbol *symb = el->lhs()->symbol();
-        if (IS_ARRAY(symb))
-        {
-            SgExpression **eatr = (SgExpression **) el->lhs()->attributeValue(0, DIM_SIZES);
-            SgExpression *esa;   
-            if (eatr)
-                esa = &(*ProductOfDimSizeArgs(*eatr) * *sizeOfElementInBytes(symb));
-            else
-                esa = &(*ArrayLengthInElems(symb, dvm_parallel_dir, 1) * *sizeOfElementInBytes(symb)); //ArrayLength(symb, dvm_parallel_dir, 1);
-            if (e_size)
-                e_size = &( *e_size + *esa );
-            else
-                e_size = esa; 
-
-           // if (e_size)
-           //     e_size = &( *e_size + *ArrayLengthInElems(symb, dvm_parallel_dir, 1) * *sizeOfElementInBytes(symb));
-           // else
-           //     e_size = &( *ArrayLengthInElems(symb, dvm_parallel_dir, 1) * *sizeOfElementInBytes(symb)); 
-        }                 
-    }
-    if (e_size && e_size->isInteger()) // calculating length if it is possible
-        e_size = new SgValueExp(e_size->valueInteger()); 
-  
-    return e_size;
-}
-
-int PrivateArrayClassUse(SgExpression *e_all_private_size)
-{
-    if (private_array_arg || e_all_private_size)
-        return 1;
-    return 0; 
-}
-
-SgExpression *ProductOfDimSizeArgs(SgExpression *esizes)
-{
-    SgExpression *el, *eprod = NULL;
-    for (el=esizes; el; el=el->rhs())
-    {    
-        if (eprod)
-            eprod = &(*eprod * SgDerefOp(*new SgVarRefExp(el->lhs()->lhs()->symbol()))); 
-
-        else
-            eprod = &SgDerefOp(*new SgVarRefExp(el->lhs()->lhs()->symbol()));          
-    }
-    return eprod;
-}
-
-
-SgStatement *AssignBlocksSElement(int i, int pl_rank, SgSymbol *s_blocksS, SgSymbol *s_idxL, SgSymbol *s_idxH, SgSymbol *s_step, SgSymbol *s_threads)
-{
-    SgExpression *e=NULL, *estep=NULL;
-    int istep;
-    istep = IConstStep(DoStmt(first_do_par, i + 1));
-    // idxH[i] - idxL[i] + 1
-    e = &(*new SgArrayRefExp(*s_idxH, *new SgValueExp(i)) - *new SgArrayRefExp(*s_idxL, *new SgValueExp(i)));
-    if (istep != 1)
-    {
-        // (idxH[i] - idxL[i] + 1)/step[i]
-        if (istep == 0)
-            estep = new SgArrayRefExp(*s_step, *new SgValueExp(i));
-        else
-            estep = new SgValueExp(istep);
-        e = &((*e + estep->copy()) / *estep);
-    }
-    if (istep == 1)
-    {
-        if (i == pl_rank - 1)
-            // blocksS[i]= (idxH[i] - idxL[i]  + threads.x ) / threads.x;
-            e = &((*e + *new SgRecordRefExp(*s_threads, "x")) / *new SgRecordRefExp(*s_threads, "x"));
-
-        if (i == pl_rank - 2)
-            // blocksS[i] =  blocksS[i+1] * ((idxH[i] - idxL[i]  + threads.y ) / threads.y);    
-            e = &(*new SgArrayRefExp(*s_blocksS, *new SgValueExp(i + 1)) * ((*e + *new SgRecordRefExp(*s_threads, "y")) / *new SgRecordRefExp(*s_threads, "y")));
-        if (i == pl_rank - 3)
-            // blocksS[i] =  blocksS[i+1] * ((idxH[i] - idxL[i]  + threads.z ) / threads.z);
-            e = &(*new SgArrayRefExp(*s_blocksS, *new SgValueExp(i + 1)) * ((*e + *new SgRecordRefExp(*s_threads, "z")) / *new SgRecordRefExp(*s_threads, "z")));
-        if (i <= pl_rank - 4)
-            //blocksS[i]=  blocksS[i+1]* (idxH[i] - idxL[i] + 1 );
-            e = &(*new SgArrayRefExp(*s_blocksS, *new SgValueExp(i + 1)) * (*e + *new SgValueExp(1)));
-    }
-    else
-    {
-        if (i == pl_rank - 1)
-            // blocksS[i]= (idxH[i] - idxL[i] + 1)/step[i]  + threads.x - 1) / threads.x;
-            e = &((*e + *new SgRecordRefExp(*s_threads, "x") - *new SgValueExp(1)) / *new SgRecordRefExp(*s_threads, "x"));
-        if (i == pl_rank - 2)
-            // blocksS[i] =  blocksS[i+1] * (((idxH[i] - idxL[i] + 1)/step[i] + threads.y - 1) / threads.y);     step==1
-            e = &(*new SgArrayRefExp(*s_blocksS, *new SgValueExp(i + 1)) * ((*e + *new SgRecordRefExp(*s_threads, "y") - *new SgValueExp(1)) / *new SgRecordRefExp(*s_threads, "y")));
-        if (i == pl_rank - 3)
-            // blocksS[i] =  blocksS[i+1] * (((idxH[i] - idxL[i] + 1)/step[i] + threads.z - 1 ) / threads.z);
-            e = &(*new SgArrayRefExp(*s_blocksS, *new SgValueExp(i + 1)) * ((*e + *new SgRecordRefExp(*s_threads, "z") - *new SgValueExp(1)) / *new SgRecordRefExp(*s_threads, "z")));
-        if (i <= pl_rank - 4)
-            //blocksS[i] =  blocksS[i+1] *   ((idxH[i] - idxL[i] + 1)/step[i]);
-            e = &(*new SgArrayRefExp(*s_blocksS, *new SgValueExp(i + 1)) * *e);
-    }
-    return  new SgCExpStmt(SgAssignOp(*new SgArrayRefExp(*s_blocksS, *new SgValueExp(i)), *e));
-}
-
-SgStatement *IfForHeader(SgSymbol *s_restBlocks, SgSymbol *s_blocks, SgSymbol *s_max_blocks)
-{
-    //             if (restBlocks <= max_blocks)
-    //                 blocks.x = restBlocks;
-    //             else
-    //                 blocks.x = max_blocks;
-    SgStatement *if_st, *stTrue, *stFalse;
-    SgExpression *restBlocksRef, *blocksRef, *cond;
-    restBlocksRef = new SgVarRefExp(s_restBlocks);
-	blocksRef = new SgVarRefExp(s_blocks);
-
-	cond = &(*restBlocksRef <= (*new SgVarRefExp(s_max_blocks)));
-    stTrue = new SgCExpStmt(SgAssignOp(*blocksRef, *restBlocksRef));
-	stFalse = new SgCExpStmt(SgAssignOp(*blocksRef, *new SgVarRefExp(s_max_blocks)));
-	if_st = new SgIfStmt(*cond, *stTrue, *stFalse);
-
-    return if_st;
-}
-
-void InsertDoWhileForRedCount_C(SgStatement *cp, SgSymbol *s_threads, SgSymbol *s_red_count)
-{  
-    // inserting after statement cp (DO_WHILE) the block for red_count calculation:
-    //             red_count = 1;
-    //             while (red_count * 2 < threads%x * threads%y * threads%z)
-    //                red_count *= 2;
-    //            
-    SgStatement *st_while, *ass;
-    SgExpression *cond, *asse;
-    // red_count * 2 .lt. threads%x * threads%y * threads%z
-    cond = &operator < (*new SgVarRefExp(s_red_count) * (*new SgValueExp(2)), *ThreadsGridSize(s_threads));
-    // insert do while loop
-    //ass = new SgAssignStmt(*new SgVarRefExp(red_count_symb), (*new SgVarRefExp(red_count_symb))*(*new SgValueExp(2)));
-    asse = &operator *= (*new SgVarRefExp(s_red_count), *new SgValueExp(2));
-    ass = new SgCExpStmt(*asse);
-    st_while = new SgWhileStmt(*cond, *ass);
-    if (cp->variant() == WHILE_NODE)
-    cp->insertStmtAfter(*st_while, *cp);
-    else
-    cp->insertStmtBefore(*st_while, *cp->controlParent());
-    //  insert:           red_count = 1
-    ass = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_red_count), *new SgValueExp(1)));
-    st_while->insertStmtBefore(*ass, *st_while->controlParent()); 
-    return;
-  
-   
-  /*
-    // !!!!!!!!!!!!! DEPRECATED BLOCK !!!!!!!!!!!!!!!!!!!!!!
-    // inserting after statement cp (DO_WHILE) the block for red_count calculation:
-    //             red_count = 1;
-    SgStatement *ass = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_red_count), *new SgValueExp(1)));
-    if (cp->variant() == WHILE_NODE)
-        cp->insertStmtAfter(*ass, *cp);
-    else
-        cp->insertStmtBefore(*ass, *cp->controlParent());
-    // !!!!!!!!!!!!! END OF DEPRECATED !!!!!!!!!!!!!!!!!!!!!!
-  */
-}
-
-void InsertAssignForReduction(SgStatement *st_where, SgSymbol *s_num_of_red_blocks, SgSymbol *s_fill_flag, SgSymbol *s_overallBlocks, SgSymbol *s_threads, SgSymbol* s_loop_ref)
-{
-    // inserting before statement 'st_where' the block of assignments:
-    SgStatement *ass;
-    // for C_Cuda:
-    //             num_of_red_blocks = overallBlocks * (threads.x * threads.y * threads.z / warpSize);  
-    // for Fortran_Cuda:
-    //             num_of_red_blocks = overallBlocks;
-
-    SgExpression *re = new SgVarRefExp(*s_overallBlocks); 
-    if(options.isOn(C_CUDA))
-        re = &(*re * (*new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *GetWarpSize(s_loop_ref)));
-    ass = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_num_of_red_blocks), *re));
-    st_where->insertStmtBefore(*ass, *st_where->controlParent());
-    ass->addComment("// Prepare reduction");
-
-    // fill_flag = 0; 
-    ass = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_fill_flag), *new SgValueExp(0)));
-    st_where->insertStmtBefore(*ass, *st_where->controlParent());
-}
-
-void  InsertPrepareReductionCalls(SgStatement *st_where, SgSymbol *s_loop_ref, SgSymbol *s_num_of_red_blocks, SgSymbol *s_fill_flag, SgSymbol *s_red_num)
-{ // inserting before statement 'st_where'
-    SgStatement *stmt;
-    int ln;
-    reduction_operation_list *rsl;
-    // red_num = <reduction_operation_number>
-    // loop_cuda_red_prepare_(loop_ref, &(red_num), &(num_of_red_blocks), &(fill_flag));
-    //looking through the reduction_op_list
-    for (rsl = red_struct_list, ln = 0; rsl; rsl = rsl->next, ln++)
-    {
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_red_num), *new SgValueExp(ln + 1)));
-        st_where->insertStmtBefore(*stmt, *st_where->controlParent());
-
-        //XXX changed reduction scheme to atomic, Kolganov 06.02.2020
-        if (rsl->redvar_size < 0)
-            stmt = new SgCExpStmt(*PrepareReduction(s_loop_ref, s_red_num, s_num_of_red_blocks, s_fill_flag, 1, 1));
-        else
-            stmt = new SgCExpStmt(*PrepareReduction(s_loop_ref, s_red_num, s_num_of_red_blocks, s_fill_flag));
-        st_where->insertStmtBefore(*stmt, *st_where->controlParent());
-    }
-}
-
-void InsertFinishReductionCalls(SgStatement *st_where, SgSymbol *s_loop_ref, SgSymbol *s_red_num)
-{ // inserting before statement 'st_where'
-    SgStatement *stmt;
-    int ln;
-    reduction_operation_list *rsl;
-    // red_num = <reduction_operation_number>
-    // loop_red_finish_(loop_ref, &(red_num), &(num_of_red_blocks), &(fill_flag));
-    //looking through the reduction_op_list
-    for (rsl = red_struct_list, ln = 0; rsl; rsl = rsl->next, ln++)
-    {
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_red_num), *new SgValueExp(ln + 1)));
-        st_where->insertStmtBefore(*stmt, *st_where->controlParent());
-        if (!ln)
-            stmt->addComment("// Finish reduction");
-        stmt = new SgCExpStmt(*FinishReduction(s_loop_ref, s_red_num));
-        st_where->insertStmtBefore(*stmt, *st_where->controlParent());
-    }
-}
-
-int    MaxRedVarSize(SgExpression *red_op_list)
-{
-    reduction_operation_list *rsl;
-    SgExpression  *ev, *er, *ered, *el, *en;
-    int   max, size, num_el, size_loc;
-    SgType *type;
-
-    max = 0; el = NULL;
-    if (!red_op_list) return(max);
-
-    //looking through the reduction_op_list
-    for (er = red_op_list, rsl = red_struct_list; er; er = er->rhs(), rsl = rsl->next)
-    {
-        ered = er->lhs();    //  reduction  (variant==ARRAY_OP)
-        ev = ered->rhs(); // reduction variable reference for reduction operations except MINLOC,MAXLOC 
-
-        if (isSgExprListExp(ev))
-        {
-            el = ev->rhs()->lhs();
-            en = ev->rhs()->rhs()->lhs();
-
-            ev = ev->lhs(); // reduction variable reference              
-        }
-        type = ev->symbol()->type();
-
-        if (isSgArrayType(type))
-            type = type->baseType();
-
-        size = TypeSize(type);
-        //esize = TypeSizeCExpr(type);
-        if (rsl->redvar_size > 0) // reduction variable is array
-        {
-            if (options.isOn(C_CUDA))
-                size = size;
-            else
-                size = size * rsl->redvar_size;
-        }
-
-        if (el) // MAXLOC,MINLOC
-        {
-            num_el = rsl->number;
-            // calculation number of location array 
-            // ec = Calculate(en);
-            // if(ec->isInteger())
-            //  num_el = ec->valueInteger();
-
-            type = el->symbol()->type();
-            if (isSgArrayType(type))
-                type = type->baseType();
-
-            size_loc = TypeSize(type) * num_el;
-
-            //      if(size % 8 == 0)
-            //         size_loc = ( size_loc % 8 == 0 ) ? size_loc : (size_loc / 8 ) * 8 + 8;
-            //      else if(size % 4 == 0)
-            //         size_loc = ( size_loc % 4 == 0 ) ? size_loc : (size_loc / 4 ) * 4 + 4;
-            //      else if(size % 2 == 0)
-            //         size_loc = ( size_loc % 2 == 0 ) ? size_loc : (size_loc / 2 ) * 2 + 2;
-
-            size = size + size_loc;
-            size = (size % 8 == 0) ? size : (size / 8) * 8 + 8;
-        }
-        max = (max < size) ? size : max;
-    }
-    return(max);
-}
-
-
-SgExpression *CreateBlocksThreadsSpec(int size, SgSymbol *s_blocks, SgSymbol *s_threads, SgSymbol *s_stream, SgSymbol *s_shared_mem)
-{
-    SgExprListExp *el, *ell, *elm;
-    SgExpression *mult;
-    el = new SgExprListExp(*new SgVarRefExp(s_blocks));
-    ell = new SgExprListExp(*new SgVarRefExp(s_threads));
-    el->setRhs(ell);
-    //size==0  - parallel loop without reduction clause
-    // size - shared memory size per one thread
-    if (size)
-        mult = new SgVarRefExp(s_shared_mem);
-    else
-        mult = new SgValueExp(size);
-    elm = new SgExprListExp(*mult); //shared memory size per one block
-    ell->setRhs(elm);
-    ell = new SgExprListExp(*new SgVarRefExp(s_stream));
-    elm->setRhs(ell);
-    return((SgExpression *)el);
-}
-
-SgExpression *MallocExpr(SgSymbol *var, SgExpression *eldim)
-{
-    SgExpression *e, *el;
-    //e = new SgValueExp(TypeSize(var->type()->baseType()));
-    e = &SgSizeOfOp(*new SgTypeRefExp(*C_Type(var->type()->baseType())));
-    for (el = eldim; el; el = el->rhs())                       // sizeof(<red-var-type>)* *N1...* *Nk
-        e = &(*e * el->lhs()->copy());
-    e = mallocFunction(e, block_C);                 // malloc(sizeof(<red-var-type>)* *N1...* *Nk)
-    e = new SgCastExp(*C_PointerType(C_Type(var->type()->baseType())), *e);
-    // (<red-var-type> *) malloc(sizeof(<red-var-type>)* *N1...* *Nk)
-    return(e);
-}
-
-int NumberOfCoeffs(SgSymbol *sg)
-{
-    SgArrayType *typearray;
-    SgExpression *esize;
-    int d;
-    typearray = isSgArrayType(sg->type());
-    if (!typearray) return(0);
-    esize = typearray->sizeInDim(0);
-    if (((SgValueExp *)esize)->intValue() == 0) return(0);  //remote_acces buffer of 1 element
-    d = options.isOn(AUTO_TFM) ? 0 : 1; //inparloop ? 0 : 1;  //ACROSS_MOD_IN_KERNEL ? 0 : 1; //WithAcrossClause() 
-    return(((SgValueExp *)esize)->intValue() - DELTA - d);
-}
-
-SgStatement * makeSymbolDeclaration(SgSymbol *s)
-{
-    SgStatement * st;
-
-    st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*SgMakeDeclExp(s, s->type())));
-
-    return(st);
-}
-
-SgStatement * makeExternSymbolDeclaration(SgSymbol *s)
-{
-    SgStatement * st;
-
-    st = new SgStatement(VAR_DECL);
-
-    st->setExpression(0, *new SgExprListExp(*SgMakeDeclExp(s, new SgDescriptType(*s->type(), BIT_EXTERN))));
-
-    return(st);
-}
-
-SgStatement * makeSymbolDeclarationWithInit(SgSymbol *s, SgExpression *einit)
-{
-    SgStatement * st;
-    SgExpression *e;
-    st = new SgStatement(VAR_DECL);
-    e = &SgAssignOp(*SgMakeDeclExp(s, s->type()), *einit);
-    st->setExpression(0, *new SgExprListExp(*e));
-
-    return(st);
-}
-
-//       stmt = makeSymbolDeclaration_T(st_hedr);
-//       st_end->insertStmtBefore(*stmt,*st_hedr);
-
-SgStatement * makeSymbolDeclaration_T(SgStatement *st_hedr)
-{
-    SgStatement * st;
-    SgExpression *e;
-    SgSymbol *s;
-    SgSymbol * sc = new SgSymbol(VARIABLE_NAME, "cuda_ptr", *C_PointerType(SgTypeFloat()), *st_hedr);
-    st = new SgStatement(VAR_DECL);
-    SgDerivedCollectionType *tmpT = new SgDerivedCollectionType(*new SgSymbol(VARIABLE_NAME, "device_ptr"), *SgTypeFloat());
-    s = new SgSymbol(VARIABLE_NAME, "dev_ptr", *tmpT, *st_hedr);
-
-    e = new SgExpression(CLASSINIT_OP);
-    e->setLhs(SgMakeDeclExp(s, s->type()));
-    e->setRhs(new SgExprListExp(*new SgVarRefExp(sc)));
-    st->setExpression(0, *new SgExprListExp(*e));
-
-    return(st);
-}
-
-
-SgExpression * addDeclExpList(SgSymbol *s, SgExpression *el)
-{
-    SgExpression *e, *l;
-    e = new SgExprListExp(*SgMakeDeclExp(s, s->type()));
-    for (l = el; l->rhs(); l = l->rhs())
-        ;
-    l->setRhs(e);
-    return(e);
-
-}
-
-SgExpression *UsedValueRef(SgSymbol *susg, SgSymbol *s)
-{
-    if (isSgArrayType(susg->type()))
-        Error("Array %s is used in loop, not implemented yet for GPU", susg->identifier(), 591, first_do_par);
-    if (susg->type()->variant() == T_DERIVED_TYPE)
-        Error("Variable %s of derived type is used in loop, not implemented yet for GPU", susg->identifier(), 590, first_do_par);
-    return(new SgVarRefExp(s));
-}
-
-char *Cuda_LoopHandlerComment()
-{
-    char *cmnt = new char[100];
-    sprintf(cmnt, "//    CUDA handler for loop on line %d \n", first_do_par->lineNumber());
-    //sprintf(cmnt,"//********************* CUDA handler for loop on line %d *********************\n",first_do_par->lineNumber());
-    return(cmnt);
-}
-
-char *Cuda_SequenceHandlerComment(int lineno)
-{
-    char *cmnt = new char[150];
-    sprintf(cmnt, "//    CUDA handler for sequence of statements on line %d \n", lineno);
-    //sprintf(cmnt,"//********************* CUDA handler for sequence of statements on line %d *********************\n",first_do_par->lineNumber());
-    return(cmnt);
-}
-
-SgExpression *dim3FunctionCall(int i)
-{
-    SgFunctionCallExp *fe = new SgFunctionCallExp(*fdim3);
-
-    fe->addArg(*new SgValueExp(i));
-    fe->addArg(*new SgValueExp(i));
-    fe->addArg(*new SgValueExp(i));
-    return fe;
-}
-
-char *RegisterConstName()
-{
-    char *name = new char[strlen(kernel_symb->identifier()) + 6];
-    name[0] = '\0';
-    strcat(name, aks_strupr(kernel_symb->identifier()));
-    strcat(name, "_REGS");
-    return(name);
-
-}
-
-char *Up_regs_Symbol_Name(SgSymbol *s_regs)
-{
-    char *name = new char[strlen(s_regs->identifier()) + 1];
-    name[0] = '\0';
-    strcat(name, aks_strupr(s_regs->identifier()));
-    return(name);
-
-}
-
-void GenerateStmtsForInfoFile()
-{
-    SgStatement *stmt, *end_if_dir;
-    char *define_name;
-    symb_list *sl;
-    //SgSymbol *s_regs_info;
-    if (!RGname_list || !info_block)
-        return;
-    for (sl = RGname_list; sl; sl = sl->next)
-    {
-        // generating for info_block
-
-        end_if_dir = endif_dir();
-        info_block->insertStmtAfter(*end_if_dir, *info_block);
-        define_name = Up_regs_Symbol_Name((sl->symb));
-        stmt = ifdef_dir(define_name);
-        end_if_dir->insertStmtBefore(*stmt, *info_block);
-        //s_regs_info = &(sl->symb->copy());
-        //SYMB_SCOPE(sl->symb->thesymb) = info_block->thebif; 
-        stmt = makeSymbolDeclarationWithInit(sl->symb, new SgVarRefExp(new SgSymbol(VARIABLE_NAME, define_name)));
-        end_if_dir->insertStmtBefore(*stmt, *info_block);
-        stmt = else_dir();
-        end_if_dir->insertStmtBefore(*stmt, *info_block);
-        stmt = makeSymbolDeclarationWithInit(sl->symb, new SgValueExp(0));
-        end_if_dir->insertStmtBefore(*stmt, *info_block);
-    }
-
-}
-
-void GenerateEndIfDir()
-{
-    if (block_C)
-        block_C->addComment("#endif\n");
-}
-
-void GenerateDeclarationDir()
-{
-    if (block_C)
-        block_C->addComment(declaration_cmnt);
-}
-
-#undef Nintent
-#undef DELTA 
-#undef Nhandler 
-#undef SAVE_LABEL_ID
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_across.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_across.cpp
deleted file mode 100644
index 43142dd..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_across.cpp
+++ /dev/null
@@ -1,6318 +0,0 @@
-#include "dvm.h"
-#include "aks_structs.h"
-#include "acc_data.h"
-
-using namespace std;
-
-// all flags
-#define LongT C_DvmType()
-#define debugMode 0
-#define kerneloff 0
-
-// extern variables
-extern reduction_operation_list *red_struct_list;
-extern symb_list *shared_list, *acc_func_list;
-extern symb_list *RGname_list;
-extern symb_list *acc_call_list;
-extern vector<SgSymbol *> loopVars;
-
-// extern functions
-extern SgStatement *Create_C_Function(SgSymbol*);
-extern SgExpression *RedPost(SgSymbol*, SgSymbol*, SgSymbol*, SgSymbol*);
-extern SgSymbol *GridSymbolForRedInAdapter(SgSymbol *, SgStatement *);
-extern SgSymbol *GpuHeaderSymbolInAdapter(SgSymbol *, SgStatement *);
-extern SgSymbol *GpuBaseSymbolInAdapter(SgSymbol *, SgStatement *);
-extern SgExpression *CudaReplicate(SgSymbol *, SgSymbol *, SgSymbol *, SgSymbol *);
-extern SgStatement *IncludeLine(char*);
-extern void optimizeLoopBodyForOne(vector<newInfo> &allNewInfo);
-extern void searchIdxs(vector<acrossInfo> &allInfo, SgExpression *st);
-
-// local functions
-vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol*, SgSymbol*, const int, const int, const int, const vector<SageSymbols>&, const vector<SageSymbols>&);
-vector<ArgsForKernel> Create_C_Adapter_Function_Across_OneThread(SgSymbol*, SgSymbol*, const int, const int);
-symb_list* AddToSymbList(symb_list*, SgSymbol*);
-symb_list* AddNewToSymbList(symb_list*, SgSymbol*);
-void CreateReductionBlocksAcross(SgStatement*, int, SgExpression*, SgSymbol*);
-//void CompleteStructuresForReductionInKernelAcross(void);
-void DeclarationOfReductionBlockInKernelAcross(SgExpression *ered, reduction_operation_list *rsl);
-void DeclarationCreateReductionBlocksAcross(int, SgExpression*);
-AnalyzeReturnGpuO1 analyzeLoopBody(int type);
-
-// local static variables
-static SgSymbol *red_first = NULL;
-static bool createBodyKernel = false;
-static bool createConvert_XY = true;
-static const int numLoopVars = 16;
-static bool ifReadLvlMode = false;
-static vector <stack <SgStatement*> > copyOfBody;
-static vector<SgSymbol*> allRegNames;
-static vector<ParamsForAllVariants> allVariants;
-
-static const char *funcDvmhConvXYfortVer = "       attributes(device) subroutine dvmh_convert_XY_int(x,y,Rx,Ry,slash,idx)\n      implicit none\n      integer ,value:: x\n      integer ,value:: y\n      integer ,value:: Rx\n      integer ,value:: Ry\n      integer ,value:: slash\n      integer ,device:: idx  \n   \n      if(slash .eq. 0) then\n        if(Rx .eq. Ry) then\n          if(x + y .lt. Rx) then\n               idx = y + (1+x+y)*(x+y)/2\n            else\n               idx = Rx*(Rx-1)+x-(2*Rx-x-y-1)*(2*Rx-x-y-2)/2\n            endif      \n         elseif(Rx .lt. Ry) then\n           if(x + y .lt. Rx) then\n               idx = y + ((1+x+y)*(x+y)) / 2\n            elseif(x + y .lt. Ry) then\n               idx = ((1+Rx)*Rx) / 2 + Rx - x - 1 + Rx * (x+y-Rx)\n            else\n               idx = Rx*Ry-Ry+y-(((Rx+Ry-y-x-1)*(Rx+Ry-y-x-2))/2)\n            endif\n         else\n            if(x + y .lt. Ry) then\n                idx = x + (1+x+y)*(x+y) / 2\n            elseif(x + y .lt. Rx) then\n                idx = (1+Ry)*Ry/2 + (Ry-y-1) + Ry * (x+y-Ry)\n            else\n                idx = Rx*Ry-Rx+x-((Rx+Ry-y-x-1)*(Rx+Ry-y-x-2)/2)\n            endif\n         endif\n      else\n       if(Rx .eq. Ry) then\n            if(x + Rx-1-y .lt. Rx) then\n                idx = Rx-1-y + (x+Rx-y)*(x+Rx-1-y)/2\n            else\n                idx = Rx*(Rx-1) + x - (Rx-x+y)*(Rx-x+y-1)/2\n            endif\n         elseif(Rx .lt. Ry) then\n            if(x + Ry-1-y .lt. Rx) then        \n                idx = Ry-1-y + ((x+Ry-y)*(x+Ry-1-y)) / 2\n            elseif(x + Ry-1-y .lt. Ry) then\n                idx = ((1+Rx)*Rx)/2+Rx-x-1+Rx*(x+Ry-1-y-Rx)\n            else\n                idx = Rx*Ry-1-y-(((Rx+y-x)*(Rx+y-x-1))/2)\n            endif\n         else\n            if(x + Ry-1-y .lt. Ry) then\n                idx = x + (1+x+Ry-1-y)*(x+Ry-1-y)/2\n            elseif(x + Ry-1-y .lt. Rx) then\n                idx = (1+Ry)*Ry/2 + y + Ry * (x-y-1)\n            else\n                idx = Rx*Ry-Rx+x-((Rx+y-x)*(Rx+y-x-1)/2)\n            endif\n         endif\n      endif\n      end subroutine\n";
-static const char *funcDvmhConvXYfortVerLong = "       attributes(device) subroutine dvmh_convert_XY_llong(x,y,Rx,Ry,slash,idx)\n      implicit none\n      integer*8 ,value:: x\n      integer*8 ,value:: y\n      integer*8 ,value:: Rx\n      integer*8 ,value:: Ry\n      integer*8 ,value:: slash\n      integer*8 ,device:: idx  \n     \n      if(slash .eq. 0) then\n        if(Rx .eq. Ry) then\n          if(x + y .lt. Rx) then\n               idx = y + (1+x+y)*(x+y)/2\n            else\n               idx = Rx*(Rx-1)+x-(2*Rx-x-y-1)*(2*Rx-x-y-2)/2\n            endif      \n         elseif(Rx .lt. Ry) then\n           if(x + y .lt. Rx) then\n               idx = y + ((1+x+y)*(x+y)) / 2\n            elseif(x + y .lt. Ry) then\n               idx = ((1+Rx)*Rx) / 2 + Rx - x - 1 + Rx * (x+y-Rx)\n            else\n               idx = Rx*Ry-Ry+y-(((Rx+Ry-y-x-1)*(Rx+Ry-y-x-2))/2)\n            endif\n         else\n            if(x + y .lt. Ry) then\n                idx = x + (1+x+y)*(x+y) / 2\n            elseif(x + y .lt. Rx) then\n                idx = (1+Ry)*Ry/2 + (Ry-y-1) + Ry * (x+y-Ry)\n            else\n                idx = Rx*Ry-Rx+x-((Rx+Ry-y-x-1)*(Rx+Ry-y-x-2)/2)\n            endif\n         endif\n      else\n       if(Rx .eq. Ry) then\n            if(x + Rx-1-y .lt. Rx) then\n                idx = Rx-1-y + (x+Rx-y)*(x+Rx-1-y)/2\n            else\n                idx = Rx*(Rx-1) + x - (Rx-x+y)*(Rx-x+y-1)/2\n            endif\n         elseif(Rx .lt. Ry) then\n            if(x + Ry-1-y .lt. Rx) then        \n                idx = Ry-1-y + ((x+Ry-y)*(x+Ry-1-y)) / 2\n            elseif(x + Ry-1-y .lt. Ry) then\n                idx = ((1+Rx)*Rx)/2+Rx-x-1+Rx*(x+Ry-1-y-Rx)\n            else\n                idx = Rx*Ry-1-y-(((Rx+y-x)*(Rx+y-x-1))/2)\n            endif\n         else\n            if(x + Ry-1-y .lt. Ry) then\n                idx = x + (1+x+Ry-1-y)*(x+Ry-1-y)/2\n            elseif(x + Ry-1-y .lt. Rx) then\n                idx = (1+Ry)*Ry/2 + y + Ry * (x-y-1)\n            else\n                idx = Rx*Ry-Rx+x-((Rx+y-x)*(Rx+y-x-1)/2)\n            endif\n         endif\n      endif\n      end subroutine\n" ;
-static const char* fermiPreprocDir = "CUDA_FERMI_ARCH";
-
-// local variables
-SgStatement *kernelScope, *block;
-
-void InitializeAcrossACC()
-{
-    red_first = NULL;
-    createBodyKernel = false;
-    createConvert_XY = true;    
-    ifReadLvlMode = false;
-    copyOfBody.clear();
-    allRegNames.clear();
-    allVariants.clear();
-}
-
-static inline int pow(int n)
-{
-    int tmp = 1;
-    tmp = tmp << n;
-    return tmp;
-}
-
-static void setDvmDebugLvl()
-{
-    char *s = getenv("DVMH_LOGLEVEL");
-    if (!ifReadLvlMode && s != NULL)
-    {
-        sscanf(s, "%d", &DVM_DEBUG_LVL);
-        ifReadLvlMode = true;
-    }
-}
-
-static inline void mywarn(const char *str)
-{
-#if debugMode
-        printf("%s\n", str);
-#endif
-}
-
-static char *getLoopLine(const char *sadapter)
-{
-    char *newLine = new char[strlen(sadapter) + 16];
-    newLine[0] = '\0';
-    strcat(newLine, "loop on line ");
-    int k = (int)strlen(newLine);
-    int i = (int)strlen(sadapter) - 1 - 6;
-
-    for (; sadapter[i] != '_'; i--);
-
-    for (i++; sadapter[i] != '_'; i++, k++)
-    {
-        newLine[k] = sadapter[i];
-    }
-    newLine[k] = '\\';
-    newLine[k + 1] = 'n';
-    newLine[k + 2] = '\0';
-    return newLine;
-}
-
-// generating function call (specially for across):
-//loop_cuda_register_red(DvmhLoopRef *InDvmhLoop, DvmType InRedNum, void **ArrayPtr, void **LocPtr)
-static SgExpression *RegisterReduction_forAcross(SgSymbol *s_loop_ref, SgSymbol *s_var_num, SgSymbol *s_red, SgSymbol *s_loc)
-{
-    SgExpression *eloc;
-    SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[RED_CUDA]);
-
-    fe->addArg(*new SgVarRefExp(s_loop_ref));
-
-    fe->addArg(*new SgVarRefExp(s_var_num));
-    fe->addArg(*new SgCastExp(*C_PointerType(C_PointerType(SgTypeVoid())), SgAddrOp(*new SgVarRefExp(*s_red))));
-    if (s_loc != NULL)
-        eloc = &(SgAddrOp(*new SgVarRefExp(*s_loc)));
-    else
-        eloc = new SgValueExp(0);
-    fe->addArg(*eloc);
-
-    return fe;
-}
-
-SgExpression *CreateBlocksThreadsSpec(SgSymbol *s_shared, SgSymbol *s_blocks, SgSymbol *s_threads, SgSymbol *s_stream)
-{
-    SgExprListExp *el, *ell, *elm;
-    SgExpression *mult;
-    el = new SgExprListExp(*new SgVarRefExp(s_blocks));
-    ell = new SgExprListExp(*new SgVarRefExp(s_threads));
-    el->setRhs(ell);
-    mult = new SgVarRefExp(s_shared);
-    elm = new SgExprListExp(*mult);
-    ell->setRhs(elm);
-    ell = new SgExprListExp(*new SgVarRefExp(s_stream));
-    elm->setRhs(ell);
-    return ((SgExpression *)el);
-}
-
-SgExpression* CreateBlocksThreadsSpec(int size, SgSymbol *s_blocks, SgSymbol *s_threads)
-{
-    SgExprListExp *el, *ell, *elm;
-    SgExpression *mult;
-
-    el = new SgExprListExp(*new SgVarRefExp(s_blocks));
-    ell = new SgExprListExp(*new SgVarRefExp(s_threads));
-    el->setRhs(ell);
-    //size==0  - parallel loop without reduction clause
-    mult = size ? &((*ThreadsGridSize(s_threads)) * (*new SgValueExp(size))) : new SgValueExp(size);
-    elm = new SgExprListExp(*mult);
-    ell->setRhs(elm);
-    return((SgExpression *)el);
-}
-
-SgExpression* CreateBlocksThreadsSpec(SgSymbol *s_blocks, SgSymbol *s_threads)
-{
-    SgExprListExp *el, *ell;
-    el = new SgExprListExp(*new SgVarRefExp(s_blocks));
-    ell = new SgExprListExp(*new SgVarRefExp(s_threads));
-    el->setRhs(ell);
-    return((SgExpression *)el);
-}
-
-static void getDefaultCudaBlock(int &x, int &y, int &z, int loopDep, int loopIndep)
-{
-    if (options.isOn(AUTO_TFM))
-    {
-        if (loopDep == 0)
-        {
-            if (loopIndep == 1)      { x = 256; y = 1; z = 1; }
-            else if (loopIndep == 2) { x = 32; y = 14; z = 1; }
-            else                     { x = 32; y = 7; z = 2; }
-        }
-        else if (loopDep == 1)
-        {
-            if (loopIndep == 0)      { x = 1; y = 1; z = 1; }
-            else if (loopIndep == 1) { x = 256; y = 1; z = 1; }
-            else if (loopIndep == 2) { x = 32; y = 5; z = 1; }
-            else                     { x = 16; y = 8; z = 2; }
-        }
-        else if (loopDep == 2)
-        {
-            if (loopIndep == 0)      { x = 32; y = 1; z = 1; }
-            else if (loopIndep == 1) { x = 32; y = 4; z = 1; }
-            else                     { x = 16; y = 8; z = 2; }
-        }
-        else if (loopDep >= 3)
-        {
-            if (loopIndep == 0) { x = 32; y = 5; z = 1; }
-            else                { x = 32; y = 5; z = 2; }
-        }
-    }
-    else
-    {
-        if (loopDep == 0)
-        {
-            if (loopIndep == 1)      { x = 256; y = 1; z = 1; }
-            else if (loopIndep == 2) { x = 32; y = 14; z = 1; }
-            else                     { x = 32; y = 7; z = 2; }
-        }
-        else if (loopDep == 1)
-        {
-            if (loopIndep == 0)      { x = 1; y = 1; z = 1; }
-            else if (loopIndep == 1) { x = 256; y = 1; z = 1; }
-            else if (loopIndep == 2) { x = 32; y = 8; z = 1; }
-            else                     { x = 16; y = 8; z = 2; }
-        }
-        else if (loopDep == 2)
-        {
-            if (loopIndep == 0)      { x = 32; y = 1; z = 1; }
-            else if (loopIndep == 1) { x = 32; y = 4; z = 1; }
-            else                     { x = 16; y = 8; z = 2; }
-        }
-        else if (loopDep >= 3)
-        {
-            if (loopIndep == 0) { x = 8; y = 4; z = 1; }
-            else                { x = 8; y = 4; z = 2; }
-        }
-    }
-}
-
-static const char *getKeyWordType(SgType *inType)
-{
-    const char *ret = NULL;
-
-    if (inType->baseType()->variant() == SgTypeFloat()->variant())
-        ret = "float";
-    else if (inType->baseType()->variant() == SgTypeDouble()->variant())
-        ret = "double";
-    else if (inType->baseType()->variant() == SgTypeInt()->variant())
-        ret = "int";
-    else if (inType->baseType()->variant() == SgTypeBool()->variant())
-        ret = "bool";
-    else if (inType->baseType()->variant() == SgTypeChar()->variant())
-        ret = "char";
-    else if (inType->baseType()->variant() == SgTypeVoid()->variant())
-        ret = "void";
-    return ret;
-}
-
-static int getSizeOf()
-{
-    int ret = 1;
-    for (SgExpression *er = red_list; er; er = er->rhs())
-    {
-        SgExpression *red_expr_ref = er->lhs()->rhs(); // reduction variable reference
-        SgType *inType = red_expr_ref->type();
-        SgExpression* len = inType->length();
-        if (len && len->isInteger())
-        {
-            ret = MAX(ret, len->valueInteger());
-            continue;
-        }
-
-        SgExpression* kind = inType->selector();
-        if (kind && kind->lhs())
-        {
-            SgExpression *kvalue = Calculate(kind->lhs());
-            if (kvalue->isInteger())
-            {
-                ret = MAX(ret, kvalue->valueInteger());
-                continue;
-            }
-        }
-
-        if (inType->variant() == SgTypeFloat()->variant())
-            ret = MAX(ret, sizeof(float));
-        else if (inType->variant() == SgTypeDouble()->variant())
-            ret = MAX(ret, sizeof(double));
-        else if (inType->variant() == SgTypeInt()->variant())
-            ret = MAX(ret, sizeof(int));
-        else if (inType->variant() == SgTypeBool()->variant())
-            ret = MAX(ret, sizeof(bool));
-        else if (inType->variant() == SgTypeChar()->variant())
-            ret = MAX(ret, sizeof(char));
-    }
-    return ret;
-}
-
-static SgStatement *CreateKernelProcedureDevice(SgSymbol *skernel)
-{
-    SgStatement *st, *st_end;
-    SgExpression *e;
-
-    st = new SgStatement(PROC_HEDR);
-    st->setSymbol(*skernel);
-    e = new SgExpression(ACC_ATTRIBUTES_OP, new SgExpression(ACC_DEVICE_OP), NULL, NULL);
-    //e ->setRhs(new SgExpression(ACC_GLOBAL_OP));
-    st->setExpression(2, *e);
-    st_end = new SgStatement(CONTROL_END);
-    st_end->setSymbol(*skernel);
-
-    cur_in_mod->insertStmtAfter(*st, *mod_gpu);
-    st->insertStmtAfter(*st_end, *st);
-    st->setVariant(PROS_HEDR);
-
-    cur_in_mod = st_end;
-
-    return st;
-}
-
-static SgStatement* AssignStatement(SgExpression &lhs, SgExpression &rhs)
-{
-    SgStatement *st;
-    if (options.isOn(C_CUDA))
-        st = new SgCExpStmt(SgAssignOp(lhs, rhs));
-    else
-        st = new SgAssignStmt(lhs, rhs);
-    return st;
-}
-
-static char* createName(const char* oldName, const char* variant)
-{
-    char* correctName = new char[strlen(oldName) + strlen(variant) + 1];
-    correctName[0] = '\0';
-    strcat(correctName, oldName);
-    strcat(correctName, variant);
-
-    return correctName;
-}
-
-static SgSymbol *createVariantOfSAdapter(SgSymbol *sadapter, const char *variant)
-{
-    SgSymbol *s_adapter;
-    const char *oldName = sadapter->identifier();
-    s_adapter = new SgSymbol(FUNCTION_NAME, createName(oldName, variant), *C_VoidType(), *block_C);
-
-    return s_adapter;
-}
-
-static SgSymbol *createVariantOfKernelSymbol(SgSymbol *kernel_symb, const char *variant)
-{
-    SgSymbol *sk;
-    char *oldName = kernel_symb->identifier();
-    sk = new SgSymbol(PROCEDURE_NAME, createName(oldName, variant), *mod_gpu);
-    if (options.isOn(C_CUDA))
-        sk->setType(C_VoidType());
-    return sk;
-}
-
-static void createNewAdapter(SgSymbol *sadapter, ParamsForAllVariants &newVar, char *str)
-{
-    SgSymbol *s_adapter;
-    char *nameOfNewSAdapter;
-
-    nameOfNewSAdapter = new char[strlen(sadapter->identifier()) + strlen(str) + 1];
-    nameOfNewSAdapter[0] = '\0';
-    strcat(nameOfNewSAdapter, sadapter->identifier());
-    s_adapter = createVariantOfSAdapter(sadapter, str);
-    strcat(nameOfNewSAdapter, str);
-    newVar.nameOfNewSAdapter = nameOfNewSAdapter;
-    newVar.s_adapter = s_adapter;
-}
-
-static void createNewKernel(SgSymbol *kernel_symb, ParamsForAllVariants &newVar, char *str)
-{
-    SgSymbol *s_ks;
-    char *nameOfNewSK;
-
-    nameOfNewSK = new char[strlen(kernel_symb->identifier()) + strlen(str) + 1];
-    nameOfNewSK[0] = '\0';
-    strcat(nameOfNewSK, kernel_symb->identifier());
-    s_ks = createVariantOfKernelSymbol(kernel_symb, str);
-    strcat(nameOfNewSK, str);
-    newVar.nameOfNewKernelSymb = nameOfNewSK;
-    newVar.s_kernel_symb = s_ks;
-}
-
-static int countBit(int num)
-{
-    int ret = 0;
-    while (num != 0)
-    {
-        if ((num & 1) == 1)
-            ret++;
-        num = num >> 1;
-    }
-    return ret;
-}
-
-static void generateAllBitmasks(int dep, int all, vector<int> &out)
-{
-    if (dep == all)
-        out.push_back(pow(all) - 1);
-    else
-    {
-        int maxVar = pow(all);
-        for (int i = 1; i < maxVar; ++i)
-        {
-            if (countBit(i) == dep)
-                out.push_back(i);
-        }
-    }
-}
-
-static void GetAllCombinations2(vector<ParamsForAllVariants> &allVariants, SgSymbol *sadapter, SgSymbol *kernel_symb, int numAcr,
-                                const vector<SageSymbols>& allSymb)
-{
-    const unsigned sizeOfAllSymb = allSymb.size();
-
-    char *tmpstrAdapter = new char[16];
-    char *tmpstrKernel = new char[16];
-    tmpstrAdapter[0] = '\0';
-    tmpstrKernel[0] = '\0';
-
-    ParamsForAllVariants newVar;
-    newVar.allDims = sizeOfAllSymb;
-    newVar.loopSymb.resize(numLoopVars);
-    newVar.loopAcrossSymb.resize(numLoopVars);
-    newVar.nameOfNewSAdapter = NULL;
-    newVar.s_adapter = NULL;
-    newVar.acrossV = numAcr;
-    newVar.loopV = newVar.allDims - newVar.acrossV;
-    newVar.type = (1 << numAcr) - 1;
-
-    sprintf(tmpstrAdapter, "%d", newVar.type);
-    strcat(tmpstrAdapter, "_case");
-    sprintf(tmpstrKernel, "_%d", newVar.type);
-    strcat(tmpstrKernel, "_case");
-
-    createNewAdapter(sadapter, newVar, tmpstrAdapter);
-    createNewKernel(kernel_symb, newVar, tmpstrKernel);
-
-    int k = 0;
-    for (int r = 0; r < sizeOfAllSymb; ++r)
-    {
-        if (r < numAcr)
-        {
-            newVar.loopAcrossSymb[r].across_left = newVar.loopAcrossSymb[r].across_right = 0;
-            newVar.loopAcrossSymb[r].symb = allSymb[sizeOfAllSymb - r - 1].symb;
-            newVar.loopAcrossSymb[r].len = sizeOfAllSymb - r - 1;
-        }
-        else
-        {
-            newVar.loopSymb[k].across_left = newVar.loopSymb[k].across_right = 0;
-            newVar.loopSymb[k].symb = allSymb[sizeOfAllSymb - r - 1].symb;
-            newVar.loopSymb[k].len = sizeOfAllSymb - r - 1;
-            k++;
-        }
-    }
-    allVariants.push_back(newVar);
-}
-
-static void GetAllVariants2(vector<ParamsForAllVariants> &allVariants, SgSymbol *sadapter, SgSymbol *kernel_symb)
-{
-    int acrossV = 0;
-
-    SageAcrossInfo Info = GetLoopsWithParAndAcrDir();
-    vector<SageSymbols> allSymb = GetSymbInParalell(dvm_parallel_dir->expr(2));
-    const int allDims = allSymb.size();
-
-    for (int z = 0; z < Info.idxs.size() && (acrossV < allDims); ++z)
-    {
-        SageArrayIdxs& idxInfo = Info.idxs[z];
-        for (int i = 0; i < idxInfo.dim && (acrossV < allDims); ++i)
-            if (idxInfo.symb[i].across_left != 0 || idxInfo.symb[i].across_right != 0)
-                acrossV++;
-    }
-
-    // correct dependencies lvl only for ACROSS with one dep
-    SgStatement *st = loop_body;
-
-    SgExpression* dvmDir = dvm_parallel_dir->expr(1);
-    vector<acrossInfo> allInfo;
-    bool nextStep = true;
-    loopVars.clear();
-
-    while (dvmDir)
-    {
-        SgExpression *t = dvmDir->lhs();
-        if (t->variant() == ACROSS_OP)
-        {
-            vector<SgExpression*> toAnalyze;
-            SgExpression* list = t->lhs();
-            while (list)
-            {
-                if (list->lhs()->variant() == ARRAY_REF)
-                    toAnalyze.push_back(list->lhs());
-                else if (list->lhs()->variant() == ARRAY_OP)
-                {
-                    if (list->lhs()->lhs()->variant() == ARRAY_REF)
-                        toAnalyze.push_back(list->lhs()->lhs());
-                }
-                list = list->rhs();
-            }
-
-            for (int i = 0; i < toAnalyze.size(); ++i)
-            {
-                SgExpression* array = toAnalyze[i];
-
-                acrossInfo tmpI;
-                tmpI.nameOfArray = array->symbol()->identifier();
-                tmpI.symbol = array->symbol();
-                tmpI.allDim = 0;
-                tmpI.widthL = 0;
-                tmpI.widthR = 0;
-                tmpI.acrossPos = 0;
-                tmpI.acrossNum = 0;
-
-                SgExpression* tt = array->lhs();
-                int position = 0;
-                while (tt)
-                {
-                    bool here = true;
-                    if (tt->lhs()->lhs()->valueInteger() != 0)
-                    {
-                        tmpI.acrossPos = position;
-                        tmpI.acrossNum++;
-                        tmpI.widthL = (-1) * tt->lhs()->lhs()->valueInteger();
-                        here = false;
-                    }
-
-                    if (tt->lhs()->rhs()->valueInteger() != 0)
-                    {
-                        tmpI.acrossPos = position;
-                        if (here)
-                            tmpI.acrossNum++;
-                        tmpI.widthR = tt->lhs()->rhs()->valueInteger();
-                    }
-                    position++;
-                    tt = tt->rhs();
-                }
-
-                for (int i = 0; i < position; ++i)
-                {
-                    tmpI.dims.push_back(0);
-                    tmpI.symbs.push_back(NULL);
-                }
-                allInfo.push_back(tmpI);
-            }
-            break;
-        }
-        dvmDir = dvmDir->rhs();
-    }
-
-    for (size_t i = 0; i < allInfo.size(); ++i)
-    {
-        if (allInfo[i].acrossNum > 1)
-        {
-            nextStep = false;
-            break;
-        }
-    }
-
-    if (nextStep)
-    {
-        SgExpression* dvmDir = dvm_parallel_dir->expr(2);
-        while (dvmDir)
-        {
-            loopVars.push_back(dvmDir->lhs()->symbol());
-            dvmDir = dvmDir->rhs();
-        }
-
-        while (st)
-        {
-            for (int i = 0; i < 3; ++i)
-                if (st->expr(i))
-                    searchIdxs(allInfo, st->expr(i));
-            st = st->lexNext();
-        }
-
-        for (size_t i = 0; i < allInfo.size(); ++i)
-        {
-            if (allInfo[i].symbs[allInfo[i].acrossPos] == NULL)
-            {
-                nextStep = false;
-                break;
-            }
-        }
-
-        if (nextStep)
-        {
-            vector<char*> uniqSymbs;
-
-            uniqSymbs.push_back(allInfo[0].symbs[allInfo[0].acrossPos]->identifier() );
-            for (size_t i = 1; i < allInfo.size(); ++i)
-            {
-                bool uniq = true;
-                char *cmpd = allInfo[i].symbs[allInfo[i].acrossPos]->identifier();
-                for (size_t k = 0; k < uniqSymbs.size(); ++k)
-                {
-                    if (strcmp(uniqSymbs[k], cmpd) == 0)
-                    {
-                        uniq = false;
-                        break;
-                    }
-                }
-                if (uniq)
-                {
-                    uniqSymbs.push_back(cmpd);
-                }
-            }
-
-            acrossV = MIN((int)uniqSymbs.size(), allDims);
-        }
-    }
-    for (int i = 1; i <= acrossV; ++i)
-        GetAllCombinations2(allVariants, sadapter, kernel_symb, i, allSymb);
-}
-
-/*void printAllVars(vector<ParamsForAllVariants> &vectorT)
-{
-    for (size_t i = 0; i < vectorT.size(); ++i)
-    {
-        printf("acrossV = %d  loopV = %d  alldims = %d\n", vectorT[i].acrossV, vectorT[i].loopV, vectorT[i].allDims);
-        printf("nameOfKernel = %s  nameOfAdapt = %s  \n", vectorT[i].nameOfNewKernelSymb, vectorT[i].nameOfNewSAdapter);
-        for (int k = 0; k < vectorT[i].loopV; ++k)
-        {
-            printf("%s, L = %d, R = %d, len= %d\n", vectorT[i].loopSymb[k]->symb->identifier(), vectorT[i].loopSymb[k]->across_left, vectorT[i].loopSymb[k]->across_right, vectorT[i].loopSymb[k]->len);
-        }
-        for (int k = 0; k < vectorT[i].acrossV; ++k)
-        {
-            printf("%s, L = %d, R = %d, len= %d\n", vectorT[i].loopAcrossSymb[k]->symb->identifier(), vectorT[i].loopAcrossSymb[k]->across_left, vectorT[i].loopAcrossSymb[k]->across_right, vectorT[i].loopAcrossSymb[k]->len);
-        }
-        printf("\n");
-    }
-    printf("\n");
-}*/
-
-ArgsForKernel *Create_C_Adapter_Function_Across(SgSymbol *sadapter)
-{
-    createBodyKernel = true;
-
-    // clear information
-    allRegNames.clear();
-
-    SgStatement *st_hedr=NULL, *st_end, *first_exec, *stmt;
-    vector<SgStatement*> cuda_kernel;
-    SgExpression *fe, *ae, *el, *arg_list;
-    SgType *typ;
-    SgSymbol *s_loop_ref, *sarg, *s, *current_symbol;
-    symb_list *sl;
-    vector<SgSymbol *> argsForVariantFunction;
-
-    setDvmDebugLvl();
-
-    mywarn("start: getAllVars");
-    allVariants.clear();
-
-    GetAllVariants2(allVariants, sadapter, kernel_symb);
-    mywarn("  end: getAllVars");
-
-    cuda_kernel.resize(countKernels);
-    current_symbol = SymbMapping(current_file->filept->cur_symb); //CUR_FILE_CUR_SYMB(); 
-
-    if (options.isOn(ONE_THREAD))
-    {
-        const vector<SageSymbols> tmpStr = GetSymbInParalell(dvm_parallel_dir->expr(2));
-        int num = tmpStr.size();
-
-        vector<ArgsForKernel> retValueForKernel = Create_C_Adapter_Function_Across_OneThread(sadapter, kernel_symb, num, 0);
-
-        for (unsigned t = 0; t < countKernels; ++t)
-        {
-            loop_body = CopyOfBody.top();
-            CopyOfBody.pop();
-
-            currentLoop = new Loop(loop_body, options.isOn(OPT_EXP_COMP));
-            SgType *typeParams = indexTypeInKernel(rtTypes[t]);
-
-            for (int i = 0; i < num; ++i)
-            {
-                char *str = new char[64];
-                char *addL = new char[64];
-                str[0] = addL[0] = '\0';
-                retValueForKernel[t].otherVarsForOneTh.push_back(tmpStr[i].symb);
-                strcat(str, tmpStr[i].symb->identifier());
-                strcat(str, "_");
-
-                strcat(addL, str);
-                strcat(addL, "low");
-                retValueForKernel[t].otherVars.push_back(new SgSymbol(VARIABLE_NAME, addL, typeParams, kernel_symb->scope()));
-
-                addL[0] = '\0';
-                strcat(addL, str);
-                strcat(addL, "high");
-                retValueForKernel[t].otherVars.push_back(new SgSymbol(VARIABLE_NAME, addL, typeParams, kernel_symb->scope()));
-
-                addL[0] = '\0';
-                strcat(addL, str);
-                strcat(addL, "idx");
-                retValueForKernel[t].otherVars.push_back(new SgSymbol(VARIABLE_NAME, addL, typeParams, kernel_symb->scope()));
-            }
-
-            string kernel_symbNew = kernel_symb->identifier();
-            if (rtTypes[t] == rt_INT)
-                kernel_symbNew += "_int";
-            else if (rtTypes[t] == rt_LONG)
-                kernel_symbNew += "_long";
-            else if (rtTypes[t] == rt_LLONG)
-                kernel_symbNew += "_llong";
-           
-            cuda_kernel[t] = CreateLoopKernelAcross(new SgSymbol(FUNCTION_NAME, kernel_symbNew.c_str(), *C_VoidType(), *block_C), &retValueForKernel[t], indexTypeInKernel(rtTypes[t]));
-            
-            if (options.isOn(RTC))
-            {
-                acc_call_list = ACC_RTC_ExpandCallList(acc_call_list);
-                if (options.isOn(C_CUDA))
-                    ACC_RTC_ConvertCudaKernel(cuda_kernel[t], kernel_symbNew.c_str());
-                else
-                    ACC_RTC_AddCalledProcedureComment(kernel_symb);
-
-                RTC_FKernelArgs.push_back((SgFunctionCallExp*)cuda_kernel[t]->expr(0));
-            }
-
-            delete currentLoop;
-            currentLoop = NULL;
-        }
-        if (options.isOn(RTC))
-            ACC_RTC_CompleteAllParams();
-    }
-    else
-    {
-        mywarn("start: create all VARIANTS");
-        // if only type ~ 1 across symb
-        bool ifOne = true;
-        for (size_t i = 0; i < allVariants.size(); ++i)
-        {    
-            if (allVariants[i].acrossV != 1)
-                ifOne = false;
-        }
-        // set global if true
-        if (ifOne)
-            dontGenConvertXY = true;
-        else
-            dontGenConvertXY = false;
-
-        for (size_t i = 0; i < allVariants.size(); ++i)
-        {    
-#if debugMode
-                printf("%d case\n", allVariants[i].type);
-#endif
-            ParamsForAllVariants tmp = allVariants[i];
-            vector<ArgsForKernel> retValueForKernel;
-
-            for (unsigned k = 0; k < countKernels; ++k)
-            {
-                loop_body = CopyOfBody.top();
-                CopyOfBody.pop();
-
-                // temporary check for ON mapping
-                const bool contitionOfOptimization = options.isOn(AUTO_TFM);
-                if (contitionOfOptimization)
-                    currentLoop = new Loop(loop_body, true);
-
-                string kernel_symb = tmp.s_kernel_symb->identifier();
-                if (rtTypes[k] == rt_INT)
-                    kernel_symb += "_int";
-                else if (rtTypes[k] == rt_LONG)
-                    kernel_symb += "_long";
-                else if (rtTypes[k] == rt_LLONG)
-                    kernel_symb += "_llong";
-        
-                if (tmp.acrossV == 1 && tmp.type == 1)
-                {
-                    if (k == 0) // create CUDA handler once
-                        retValueForKernel = Create_C_Adapter_Function_Across_variants(tmp.s_adapter, tmp.s_kernel_symb, tmp.loopV, tmp.acrossV, tmp.allDims, tmp.loopSymb, tmp.loopAcrossSymb);
-                    cuda_kernel[k] = CreateLoopKernelAcross(new SgSymbol(FUNCTION_NAME, kernel_symb.c_str(), *C_VoidType(), *block_C), &retValueForKernel[k], tmp.acrossV, indexTypeInKernel(rtTypes[k]));
-                    if (options.isOn(RTC))
-                        acc_call_list = ACC_RTC_ExpandCallList(acc_call_list);
-                }
-                else if (tmp.acrossV != 1 && (tmp.type == 3 || tmp.type == 7 || tmp.type > 14))
-                {
-                    // optimized loop body
-                    if (options.isOn(GPU_O1))
-                        analyzeLoopBody(ACROSS_TYPE);
-
-                    if (k == 0) // create CUDA handler once
-                        retValueForKernel = Create_C_Adapter_Function_Across_variants(tmp.s_adapter, tmp.s_kernel_symb, tmp.loopV, tmp.acrossV, tmp.allDims, tmp.loopSymb, tmp.loopAcrossSymb);
-                    cuda_kernel[k] = CreateLoopKernelAcross(new SgSymbol(FUNCTION_NAME, kernel_symb.c_str(), *C_VoidType(), *block_C), &retValueForKernel[k], tmp.acrossV, indexTypeInKernel(rtTypes[k]));
-                    if (options.isOn(RTC))
-                    {
-                        acc_call_list = ACC_RTC_ExpandCallList(acc_call_list);
-                        if (!options.isOn(C_CUDA) && options.isOn(AUTO_TFM))
-                        {
-                            if (strstr(kernel_symb.c_str(), "_llong") != NULL)
-                                acc_call_list = AddNewToSymbList(acc_call_list, createNewFunctionSymbol("dvmh_convert_XY_llong"));
-                            else if (strstr(kernel_symb.c_str(), "_int") != NULL)
-                                acc_call_list = AddNewToSymbList(acc_call_list, createNewFunctionSymbol("dvmh_convert_XY_int"));
-                        }
-                    }
-                }
-               
-                if (newVars.size() != 0)
-                {
-                    correctPrivateList(RESTORE);
-                    newVars.clear();
-                }
-                if (contitionOfOptimization)
-                {
-                    delete currentLoop;
-                    currentLoop = NULL;
-                }
-            }
-            if (options.isOn(RTC))
-            {
-                for (unsigned diff = 0; diff < RTC_FCall.size() / countKernels; ++diff)
-                {
-                    for (unsigned k = 0; k < countKernels; ++k)
-                        RTC_FKernelArgs.push_back((SgFunctionCallExp*)cuda_kernel[k]->expr(0));
-                }
-
-                for (unsigned k = 0; k < countKernels; ++k)
-                {
-                    string kernel_symb = tmp.s_kernel_symb->identifier();
-                    if (rtTypes[k] == rt_INT)
-                        kernel_symb += "_int";
-                    else if (rtTypes[k] == rt_LONG)
-                        kernel_symb += "_long";
-                    else if (rtTypes[k] == rt_LLONG)
-                        kernel_symb += "_llong";
-
-                    if (options.isOn(C_CUDA))
-                        ACC_RTC_ConvertCudaKernel(cuda_kernel[k], kernel_symb.c_str());
-                    else
-                        ACC_RTC_AddCalledProcedureComment(new SgSymbol(VARIABLE_NAME, kernel_symb.c_str()));
-                }
-
-                ACC_RTC_CompleteAllParams();
-            }
-        }
-
-
-        mywarn("  end: create all VARIANTS");
-
-        //create new control function
-        st_hedr = Create_C_Function(sadapter);
-        st_end = st_hedr->lexNext();
-        fe = st_hedr->expr(0);
-        st_hedr->addComment(Cuda_LoopHandlerComment());
-        first_exec = st_end;
-        mywarn("start: create  dummy argument list ");
-
-        // create  dummy argument list: loop_ref, <dvm-array-headers>, <uses> ,<private-array-shapes>
-        typ = C_PointerType(C_Derived_Type(s_DvmhLoopRef));
-        s_loop_ref = new SgSymbol(VARIABLE_NAME, "loop_ref", *typ, *st_hedr);
-        argsForVariantFunction.push_back(s_loop_ref);
-
-        ae = new SgVarRefExp(s_loop_ref);                 //loop_ref
-        ae->setType(typ);
-        ae = new SgPointerDerefExp(*ae);
-        arg_list = new SgExprListExp(*ae);
-        fe->setLhs(arg_list);
-
-        for (sl = acc_array_list; sl; sl = sl->next)  // <dvm-array-headers>
-        {
-            SgArrayType *typearray = new SgArrayType(*C_DvmType());
-            typearray->addDimension(NULL);
-            sarg = new SgSymbol(VARIABLE_NAME, sl->symb->identifier(), *typearray, *st_hedr);
-            argsForVariantFunction.push_back(sarg);
-            ae = new SgArrayRefExp(*sarg);
-            ae->setType(*typearray);
-            el = new SgExpression(EXPR_LIST);
-            el->setLhs(NULL);
-            ae->setLhs(*el);
-            arg_list->setRhs(*new SgExprListExp(*ae));
-            arg_list = arg_list->rhs();
-        }
-        
-        for (el = uses_list; el; el = el->rhs())    // <uses>
-        {
-            s = el->lhs()->symbol();
-            typ = C_PointerType(C_Type(s->type()));
-            sarg = new SgSymbol(VARIABLE_NAME, s->identifier(), *typ, *st_hedr);
-            argsForVariantFunction.push_back(sarg);
-            if (isByValue(s))
-                SYMB_ATTR(sarg->thesymb) = SYMB_ATTR(sarg->thesymb) | USE_IN_BIT;
-            ae = UsedValueRef(s, sarg);
-            ae->setType(typ);
-            ae = new SgPointerDerefExp(*ae);
-            arg_list->setRhs(*new SgExprListExp(*ae));
-            arg_list = arg_list->rhs();
-        }
-     
-        if (options.isOn(C_CUDA))    // <private-array-shapes>
-        {  
-            int idim;
-            SgExpression *elp;
-            SgType *t = C_PointerType(C_DvmType());
-
-            for (elp=private_list; elp; elp = elp->rhs())
-            {
-                s = elp->lhs()->symbol();
-                if (IS_ARRAY(s) && !TestArrayShape(s))     
-                {   
-                    el = NULL;
-                    for (idim = 1; idim<=Rank(s); idim++)
-                    {
-                        sarg = new SgSymbol(VARIABLE_NAME, DimSizeName(s, idim), *t, *st_hedr);
-                        argsForVariantFunction.push_back(sarg);
-                        ae = new SgVarRefExp(sarg);
-                        ae->setType(t);
-                        ae = new SgPointerDerefExp(*ae);
-                        arg_list->setRhs(*new SgExprListExp(*ae));
-                        arg_list = arg_list->rhs();
-
-                    }
-                    el = NULL;
-                    for (idim = 1; idim<=Rank(s); idim++)
-                    {
-                        sarg = new SgSymbol(VARIABLE_NAME, BoundName(s, idim, 1), *t, *st_hedr);
-                        argsForVariantFunction.push_back(sarg);
-                        ae = new SgVarRefExp(sarg);
-                        ae->setType(t);
-                        ae = new SgPointerDerefExp(*ae);
-                        arg_list->setRhs(*new SgExprListExp(*ae));
-                        arg_list = arg_list->rhs();
-                    } 
-                }
-
-            }
-        } 
-
-        mywarn("  end: create  dummy argument list ");
-
-        mywarn("start: create  IF BLOCK ");
-        SgSymbol *which_run = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("which_run"), *C_Type(SgTypeInt()), *st_hedr);
-        stmt = makeSymbolDeclaration(which_run);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(which_run), *GetDependencyMask(s_loop_ref)));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        char *str = new char[64];
-        str[0] = '\0';
-
-        strcat(str, "which_run in ");
-        strncat(str, sadapter->identifier(), strlen(sadapter->identifier()) - 6);
-        strcat(str, " is %d\\n");
-        SgFunctionCallExp *tmpF2 = new SgFunctionCallExp(*createNewFunctionSymbol("printf"));
-        tmpF2->addArg(*new SgValueExp(str));
-        tmpF2->addArg(*new SgVarRefExp(which_run));
-        if (DVM_DEBUG_LVL > 5)
-            st_end->insertStmtBefore(*new SgCExpStmt(*tmpF2), *st_hedr);
-
-        SgSymbol *s_cudaEvent = new SgSymbol(TYPE_NAME, "cudaEvent_t", *block_C);
-        SgSymbol *cudaEventStart = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("start"), *C_Derived_Type(s_cudaEvent), *st_hedr);
-        SgSymbol *cudaEventStop = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("stop"), *C_Derived_Type(s_cudaEvent), *st_hedr);
-        SgSymbol *gpuTime = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("gpuTime"), *SgTypeFloat(), *st_hedr);
-        SgSymbol *minGpuTime = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("minGpuTime"), *SgTypeFloat(), *st_hedr);
-        SgSymbol *s_i = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("__s_i"), *C_Type(SgTypeInt()), *st_hedr);
-        SgSymbol *s_k = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("__s_k"), *C_Type(SgTypeInt()), *st_hedr);
-        SgSymbol *min_s_i = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("min_s_i"), *C_Type(SgTypeInt()), *st_hedr);
-        SgSymbol *min_s_k = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("min_s_k"), *C_Type(SgTypeInt()), *st_hedr);
-        SgSymbol *max_cuda_block = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("__max_cuda_block"), *C_Type(SgTypeInt()), *st_hedr);
-        SgWhileStmt *whileSt = NULL;
-        SgWhileStmt *whileSt1 = NULL;
-
-        SgIfStmt *if_st;
-        vector<vector<int> > allVarForIfBlock;
-        vector<SgFunctionCallExp *> allFuncCalls;
-
-        for (size_t k = 0; k < allVariants.size(); ++k)
-        {
-            SgFunctionCallExp *funcCall;
-
-            if ((size_t)allVariants[k].acrossV > allVarForIfBlock.size() &&
-                (allVariants[k].type == 1 || allVariants[k].type == 3 || allVariants[k].type == 7 || allVariants[k].type > 14))
-            {
-                vector<int> tmp;
-                generateAllBitmasks(allVariants[k].acrossV, allVariants[k].allDims, tmp);
-                allVarForIfBlock.push_back(tmp);
-                funcCall = new SgFunctionCallExp(*createNewFunctionSymbol(allVariants[k].nameOfNewSAdapter));
-                for (size_t i = 0; i < argsForVariantFunction.size(); ++i)
-                    funcCall->addArg(*new SgVarRefExp(argsForVariantFunction[i]));
-                funcCall->addArg(*new SgVarRefExp(which_run));
-                allFuncCalls.push_back(funcCall);
-            }
-        }
-
-        if (options.isOn(SPEED_TEST_L0))
-        {
-            stmt = makeSymbolDeclarationWithInit(s_i, new SgValueExp(16));
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            stmt = makeSymbolDeclarationWithInit(s_k, new SgValueExp(1));
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            stmt = makeSymbolDeclaration(min_s_i);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            stmt = makeSymbolDeclaration(min_s_k);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            stmt = makeSymbolDeclaration(max_cuda_block);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            stmt = makeSymbolDeclarationWithInit(minGpuTime, new SgValueExp(99999));
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            stmt = makeSymbolDeclaration(gpuTime);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            stmt = makeSymbolDeclaration(cudaEventStart);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            stmt = makeSymbolDeclaration(cudaEventStop);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            SgFunctionCallExp *eventF = new SgFunctionCallExp(*createNewFunctionSymbol("cudaEventCreate"));
-            eventF->addArg(SgAddrOp(*new SgVarRefExp(cudaEventStart)));
-            st_end->insertStmtBefore(*new SgCExpStmt(*eventF), *st_hedr);
-
-            eventF = new SgFunctionCallExp(*createNewFunctionSymbol("cudaEventCreate"));
-            eventF->addArg(SgAddrOp(*new SgVarRefExp(cudaEventStop)));
-            st_end->insertStmtBefore(*new SgCExpStmt(*eventF), *st_hedr);
-
-            SgFunctionCallExp *tmpF = new SgFunctionCallExp(*createNewFunctionSymbol("printf"));
-            tmpF->addArg(*new SgValueExp(getLoopLine(sadapter->identifier())));
-            st_end->insertStmtBefore(*new SgCExpStmt(*tmpF), *st_hedr);
-
-
-            tmpF2 = new SgFunctionCallExp(*createNewFunctionSymbol("MAX"));
-            tmpF2->addArg(*new SgVarRefExp(allRegNames[0]));
-            if (allRegNames.size() == 1)
-                tmpF2->addArg(*new SgVarRefExp(allRegNames[0]));
-            else
-                tmpF2->addArg(*new SgVarRefExp(allRegNames[1]));
-
-            for (size_t i = 2; i < allRegNames.size(); ++i)
-            {
-                SgFunctionCallExp *tmpF1 = new SgFunctionCallExp(*createNewFunctionSymbol("MAX"));
-                tmpF1->addArg(*tmpF2);
-                tmpF1->addArg(*new SgVarRefExp(allRegNames[i]));
-                tmpF2 = tmpF1;
-            }
-
-            tmpF = new SgFunctionCallExp(*createNewFunctionSymbol("MIN"));
-            tmpF->addArg(*new SgValueExp(384));
-            tmpF->addArg(*new SgValueExp(65535) / *tmpF2);
-
-            tmpF2 = tmpF;
-            st_end->insertStmtBefore(*new SgCExpStmt(SgAssignOp(*new SgVarRefExp(max_cuda_block), *tmpF2)), *st_hedr);
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_i), *new SgVarRefExp(s_i) + *new SgValueExp(16)));
-            whileSt = new SgWhileStmt(*new SgVarRefExp(s_i) < *new SgValueExp(257), *stmt);
-            st_hedr->lastExecutable()->insertStmtAfter(*whileSt, *st_hedr);
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_k), *new SgVarRefExp(s_k) + *new SgValueExp(1)));
-            whileSt1 = new SgWhileStmt(*new SgVarRefExp(s_k) < *new SgValueExp(17), *stmt);
-            whileSt->insertStmtAfter(*whileSt1);
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_k), *new SgValueExp(1)));
-            whileSt->insertStmtAfter(*stmt);
-        }
-
-        for (size_t i = 0; i < allVarForIfBlock.size(); ++i)
-        {
-            SgExpression *e = NULL;
-            for (size_t k = 0; k < allVarForIfBlock[i].size(); ++k)
-            {
-                if (k == 0)
-                    e = &(SgEqOp(*new SgVarRefExp(which_run), *new SgValueExp(allVarForIfBlock[i][k])));
-                else
-                    e = &(*e || SgEqOp(*new SgVarRefExp(which_run), *new SgValueExp(allVarForIfBlock[i][k])));
-            }
-            if (options.isOn(SPEED_TEST_L0))
-            {
-                allFuncCalls[i]->addArg(*new SgVarRefExp(s_i));
-                allFuncCalls[i]->addArg(*new SgVarRefExp(s_k));
-            }
-            stmt = new SgCExpStmt(*allFuncCalls[i]);
-            if_st = new SgIfStmt(*e, *stmt);
-            if (!options.isOn(SPEED_TEST_L0))
-                st_end->insertStmtBefore(*if_st, *st_hedr);
-            else
-            {
-                whileSt1->lastExecutable()->insertStmtBefore(*if_st);
-            }
-        }
-
-        tmpF2 = new SgFunctionCallExp(*createNewFunctionSymbol("printf"));
-        tmpF2->addArg(*new SgValueExp("It may be wrong!!\\n"));
-
-        if (DVM_DEBUG_LVL > 5)
-        {
-            if_st = new SgIfStmt(SgEqOp(*new SgVarRefExp(which_run), *new SgValueExp(0)), *new SgCExpStmt(*tmpF2));
-            st_end->insertStmtBefore(*if_st, *st_hedr);
-        }
-
-        if (options.isOn(SPEED_TEST_L0))
-        {
-            SgFunctionCallExp *tmpF = new SgFunctionCallExp(*createNewFunctionSymbol("cudaEventRecord"));
-            tmpF->addArg(*new SgVarRefExp(cudaEventStart));
-            tmpF->addArg(*new SgValueExp(0));
-            whileSt1->insertStmtAfter(*new SgCExpStmt(*tmpF));
-
-            tmpF = new SgFunctionCallExp(*createNewFunctionSymbol("cudaEventRecord"));
-            tmpF->addArg(*new SgVarRefExp(cudaEventStop));
-            tmpF->addArg(*new SgValueExp(0));
-            whileSt1->lastExecutable()->insertStmtBefore(*new SgCExpStmt(*tmpF));
-
-            tmpF = new SgFunctionCallExp(*createNewFunctionSymbol("cudaEventSynchronize"));
-            tmpF->addArg(*new SgVarRefExp(cudaEventStop));
-            whileSt1->lastExecutable()->insertStmtBefore(*new SgCExpStmt(*tmpF));
-
-            tmpF = new SgFunctionCallExp(*createNewFunctionSymbol("cudaEventElapsedTime"));
-            tmpF->addArg(SgAddrOp(*new SgVarRefExp(gpuTime)));
-            tmpF->addArg(*new SgVarRefExp(cudaEventStart));
-            tmpF->addArg(*new SgVarRefExp(cudaEventStop));
-            whileSt1->lastExecutable()->insertStmtBefore(*new SgCExpStmt(*tmpF));
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(min_s_i), *new SgVarRefExp(s_i)));
-            if_st = new SgIfStmt(*new SgVarRefExp(gpuTime) < *new SgVarRefExp(minGpuTime), *stmt);
-            whileSt1->lastExecutable()->insertStmtBefore(*if_st);
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(min_s_k), *new SgVarRefExp(s_k)));
-            if_st->insertStmtAfter(*stmt);
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(minGpuTime), *new SgVarRefExp(gpuTime)));
-            if_st->insertStmtAfter(*stmt);
-
-            if (options.isOn(SPEED_TEST_L1))
-            {
-                tmpF = new SgFunctionCallExp(*createNewFunctionSymbol("printf"));
-                tmpF->addArg(*new SgValueExp("      cuda-block [%d, %d] with time - %f ms\\n"));
-                tmpF->addArg(*new SgVarRefExp(s_i));
-                tmpF->addArg(*new SgVarRefExp(s_k));
-                tmpF->addArg(*new SgVarRefExp(gpuTime));
-                whileSt1->lastExecutable()->insertStmtBefore(*new SgCExpStmt(*tmpF));
-            }
-
-            tmpF = new SgFunctionCallExp(*createNewFunctionSymbol("printf"));
-            tmpF->addArg(*new SgValueExp(" minimum time = %f ms, optimal cuda-block = [%d, %d]\\n\\n"));
-            tmpF->addArg(*new SgVarRefExp(minGpuTime));
-            tmpF->addArg(*new SgVarRefExp(min_s_i));
-            tmpF->addArg(*new SgVarRefExp(min_s_k));
-            st_end->insertStmtBefore(*new SgCExpStmt(*tmpF), *st_hedr);
-
-            SgFunctionCallExp *eventF = new SgFunctionCallExp(*createNewFunctionSymbol("cudaEventDestroy"));
-            eventF->addArg(*new SgVarRefExp(cudaEventStart));
-            st_end->insertStmtBefore(*new SgCExpStmt(*eventF), *st_hedr);
-
-            eventF = new SgFunctionCallExp(*createNewFunctionSymbol("cudaEventDestroy"));
-            eventF->addArg(*new SgVarRefExp(cudaEventStop));
-            st_end->insertStmtBefore(*new SgCExpStmt(*eventF), *st_hedr);
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_k), *new SgVarRefExp(s_k) + *new SgValueExp(1)));
-            SgContinueStmt *contST = new SgContinueStmt();
-
-            if_st = new SgIfStmt(*new SgVarRefExp(s_k) * *new SgVarRefExp(s_i) > *new SgVarRefExp(max_cuda_block), *contST);
-            whileSt1->insertStmtAfter(*if_st);
-            if_st->insertStmtAfter(*stmt);
-        }
-
-        mywarn("  end: create  IF BLOCK ");
-    }
-  
-    if (options.isOn(C_CUDA))   
-        RenamingCudaFunctionVariables(st_hedr, s_loop_ref, 0); //(st_hedr, current_symbol->next(), 0);
-
-    return NULL;
-}
-
-vector<ArgsForKernel> Create_C_Adapter_Function_Across_OneThread(SgSymbol *sadapter, SgSymbol *kernel_symb, const int loopV, const int acrossV)
-{
-#if debugMode
-        warn("PARALLEL directive with ACROSS clause in region", 420, dvm_parallel_dir);
-#endif
-
-    SgSymbol **reduction_ptr;
-    SgSymbol *lowI, *highI, *idxI;
-    symb_list *sl;
-    SgStatement *st_hedr, *st_end, *stmt, *first_exec, *stmt_save;
-    SgExpression *fe, *ae, *arg_list, *el, *e, *espec, *er, *e_all_private_size = NULL;
-    SgSymbol *s_loop_ref, *sarg, *s, *sb, *sg, *sdev, *h_first, *hgpu_first, *base_first, *uses_first, *scalar_first, *private_first=NULL;
-    SgSymbol *s_blocks, *s_threads, *s_dev_num, *s_tmp_var, *idxTypeInKernel;
-    SgType *typ;
-    SgFunctionCallExp *funcCall;
-    vector<char*> dvm_array_headers;
-    int ln, num, uses_num, has_red_array, use_device_num, num_of_red_arrays = 0, nbuf = 0, lnp = 0;
-
-    // init block
-    reduction_ptr = NULL;
-    lowI = highI = idxI = h_first = hgpu_first = base_first = red_first = uses_first = scalar_first = NULL;
-    s_loop_ref = sarg = s = sb = sg = sdev = h_first = s_blocks = s_threads = s_dev_num = s_tmp_var = NULL;
-    sl = NULL;
-    typ = NULL;
-    funcCall = NULL;
-    st_hedr = st_end = stmt = first_exec = NULL;
-    fe = ae = arg_list = el = e = espec = er = NULL;
-    ln = num = uses_num = has_red_array = use_device_num = num_of_red_arrays = 0;
-    // end of init block
-
-    mywarn("start: create fuction header ");
-    // create fuction header
-    st_hedr = Create_C_Function(sadapter);
-    st_hedr->addComment(Cuda_LoopHandlerComment());
-    st_end = st_hedr->lexNext();
-    fe = st_hedr->expr(0);
-
-    first_exec = st_end;
-
-    mywarn("  end: create fuction header ");
-    mywarn("start: create  dummy argument list ");
-
-    // create  dummy argument list: loop_ref, <dvm-array-headers>, <uses>
-    typ = C_PointerType(C_Derived_Type(s_DvmhLoopRef));
-    s_loop_ref = new SgSymbol(VARIABLE_NAME, "loop_ref", *typ, *st_hedr);
-
-    ae = new SgVarRefExp(s_loop_ref);                 //loop_ref
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list = new SgExprListExp(*ae);
-    fe->setLhs(arg_list);
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ++ln)  // <dvm-array-headers>
-    {
-        SgArrayType *typearray = new SgArrayType(*C_DvmType());
-        typearray->addDimension(NULL);
-        sarg = new SgSymbol(VARIABLE_NAME, sl->symb->identifier(), *typearray, *st_hedr);
-        dvm_array_headers.push_back(sl->symb->identifier());
-        ae = new SgArrayRefExp(*sarg);
-        ae->setType(*typearray);
-        el = new SgExpression(EXPR_LIST);
-        el->setLhs(NULL);
-        ae->setLhs(*el);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            h_first = sarg;
-        if (IS_REMOTE_ACCESS_BUFFER(sl->symb)) // case of RTS2 interface
-            nbuf++; 
-    }
-
-    for (el = uses_list, ln = 0; el; el = el->rhs(), ++ln)    // <uses>
-    {
-        s = el->lhs()->symbol();
-        typ = C_PointerType(C_Type(s->type()));
-        sarg = new SgSymbol(VARIABLE_NAME, s->identifier(), *typ, *st_hedr);
-        if (isByValue(s))
-            SYMB_ATTR(sarg->thesymb) = SYMB_ATTR(sarg->thesymb) | USE_IN_BIT;
-        ae = UsedValueRef(s, sarg);
-        ae->setType(typ);
-        ae = new SgPointerDerefExp(*ae);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            uses_first = sarg;
-    }
-    uses_num = ln;
-
-    if (options.isOn(C_CUDA))  // <private-array-shapes>
-    {
-        int idim;
-        SgExpression *elp;
-        SgType *t = C_PointerType(C_DvmType());
-
-        for (elp=private_list; elp; elp = elp->rhs())
-        {
-            s = elp->lhs()->symbol();
-            if (IS_ARRAY(s) && !TestArrayShape(s))     
-            {   
-                el = NULL;
-                for (idim = Rank(s); idim; idim--)
-                {
-                    sarg = new SgSymbol(VARIABLE_NAME, DimSizeName(s, idim), *t, *st_hedr);
-                    ae = new SgVarRefExp(sarg);
-                    ae->setType(t);
-                    el = AddElementToList(el, new SgPointerDerefExp(*ae));
-                }
-                arg_list = AddListToList(arg_list, &el->copy());
-                if (!elp->lhs()->attributeValue(0, DIM_SIZES))
-                {
-                    SgExpression **edim = new (SgExpression *);
-                    *edim = el;
-                    elp->lhs()->addAttribute(DIM_SIZES, (void *)edim, sizeof(SgExpression *) ); 
-                }   
-
-                el = NULL;
-                for (idim = Rank(s); idim; idim--)
-                {
-                    sarg = new SgSymbol(VARIABLE_NAME, BoundName(s, idim, 1), *t, *st_hedr);
-                    ae = new SgVarRefExp(sarg);
-                    ae->setType(t);
-                    el = AddElementToList(el, new SgPointerDerefExp(*ae));
-                } 
-                arg_list = AddListToList(arg_list, &el->copy());
-                if (!elp->lhs()->attributeValue(0, L_BOUNDS))
-                {
-                    SgExpression **elb = new (SgExpression *);
-                    *elb = el;
-                    elp->lhs()->addAttribute(L_BOUNDS, (void *)elb, sizeof(SgExpression *) ); 
-                }
-
-                while (arg_list->rhs() != 0)
-                    arg_list = arg_list->rhs();
-            }
-
-        }
-    } 
-
-    mywarn("  end: create  dummy argument list ");
-    // create variable's declarations: <dvm_array_headers>,<dvm_array_bases>,<scalar_device_addr>,<reduction_variables>,<private-arrays>,blocks_info [ or blocksS,idxL,idxH ],stream,blocks,threads
-    if (red_list) // reduction section
-    {
-        mywarn("start: in reduction section ");
-
-        s_tmp_var = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("tmpVar"), *C_DvmType(), *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        //looking through the reduction_op_list
-        for (er = red_list; er; er = er->rhs())
-            num_of_red_arrays++;
-
-        reduction_ptr = new SgSymbol*[num_of_red_arrays];
-
-        for (er = red_list, ln = 0; er; er = er->rhs(), ++ln)
-        {
-            SgExpression *ered, *ev, *en, *loc_var_ref;
-            SgSymbol *sred, *s_loc_var, *sgrid_loc;
-            int is_array;
-            SgType *loc_type = NULL, *btype = NULL;
-
-            loc_var_ref = NULL;
-            s_loc_var = NULL;
-            is_array = 0;
-            ered = er->lhs();    //  reduction  (variant==ARRAY_OP)
-            ev = ered->rhs(); // reduction variable reference for reduction operations except MINLOC,MAXLOC
-            if (isSgExprListExp(ev))
-            {
-                ev = ev->lhs(); // reduction variable reference
-                loc_var_ref = ered->rhs()->rhs()->lhs();        //location array reference
-                en = ered->rhs()->rhs()->rhs()->lhs(); // number of elements in location array
-                loc_el_num = LocElemNumber(en);
-                loc_type = loc_var_ref->symbol()->type();
-            }
-            else if (isSgArrayRefExp(ev) && !ev->lhs()) //whole array
-                is_array = 1;
-
-            s = sred = &(ev->symbol()->copy());
-            SYMB_SCOPE(s->thesymb) = st_hedr->thebif;
-            if (is_array)
-            {
-                SgArrayType *typearray = new SgArrayType(*C_Type(ev->symbol()->type()));
-                typearray->addRange(*ArrayLengthInElems(ev->symbol(), NULL, 0));
-                s->setType(*typearray);
-            }
-            else
-                s->setType(C_Type(ev->symbol()->type()));
-
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-            if (!ln)
-                red_first = s;
-
-            s_loc_var = sgrid_loc = NULL;
-            if (loc_var_ref)
-            {
-                s = s_loc_var = &(loc_var_ref->symbol()->copy());
-                if (isSgArrayType(loc_type))
-                    btype = loc_type->baseType();
-                else
-                    btype = loc_type;
-                
-                SgArrayType *typearray = new SgArrayType(*C_Type(btype));
-                typearray->addRange(*new SgValueExp(loc_el_num));
-                s_loc_var->setType(*typearray);
-                SYMB_SCOPE(s->thesymb) = st_hedr->thebif;
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-                s = sgrid_loc = GridSymbolForRedInAdapter(s, st_hedr);
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-            }
-
-            /*--- executable statements: register reductions in RTS ---*/
-            e = &SgAssignOp(*new SgVarRefExp(s_tmp_var), *new SgValueExp(ln+1));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            if (!ln)
-            {
-                stmt->addComment("// Register reduction for CUDA-execution");
-                first_exec = stmt;
-            }
-            stmt = new SgCExpStmt(*InitReduction(s_loop_ref, s_tmp_var, sred, s_loc_var));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-
-        for (er = red_list, ln = 0; er; er = er->rhs(), ++ln)
-        {
-            char *buf_tmp = new char[8];
-            sprintf(buf_tmp, "%d", ln);
-            reduction_ptr[ln] = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[16], "cuda_ptr_"), buf_tmp)), *C_PointerType(C_Type(er->lhs()->rhs()->symbol()->type())), *st_hedr);
-            st_hedr->insertStmtAfter(*makeSymbolDeclaration(reduction_ptr[ln]), *st_hedr);
-            delete[]buf_tmp;
-
-            funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("cudaMalloc"));
-            funcCall->addArg(*new SgCastExp(*C_PointerType(C_PointerType(SgTypeVoid())), SgAddrOp(*new SgVarRefExp(reduction_ptr[ln]))));
-            funcCall->addArg(SgSizeOfOp(*new SgKeywordValExp(getKeyWordType(reduction_ptr[ln]->type()))));
-            stmt = new SgCExpStmt(*funcCall);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-
-        mywarn("  end: out reduction section ");
-    }
-
-    mywarn("start: create vars ");
-
-    // create type for static arrays
-    SgArrayType *tpArr = new SgArrayType(*LongT);
-    SgValueExp *dimSize = new SgValueExp(loopV + acrossV + 2);
-    tpArr->addDimension(dimSize);
-
-    lowI = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("lowI"), *LongT, *st_hedr);
-    s->setType(tpArr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    highI = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("highI"), *LongT, *st_hedr);
-    s->setType(tpArr);
-    addDeclExpList(s, stmt->expr(0));
-
-    idxI = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("idxI"), *LongT, *st_hedr);
-    s->setType(tpArr);
-    addDeclExpList(s, stmt->expr(0));
-
-    idxTypeInKernel = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("idxTypeInKernel"), *LongT, *st_hedr);
-    addDeclExpList(s, stmt->expr(0));
-
-    mywarn("  end: create vars ");
-    mywarn("start: create assigns");
-
-    s_blocks = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("blocks"), *t_dim3, *st_hedr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    s_threads = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("threads"), *t_dim3, *st_hedr);
-    addDeclExpList(s, stmt->expr(0));
-
-    for (s = uses_first, ln = 0; ln < uses_num; s = s->next(), ++ln)    // uses
-    if (!(s->attributes() & USE_IN_BIT))   // passing to kernel scalar argument by reference
-    {
-        sdev = GpuScalarAdrSymbolInAdapter(s, st_hedr);   // creating new symbol for address in device
-        if (!ln)
-        {
-            scalar_first = sdev;
-            stmt = makeSymbolDeclaration(sdev);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(sdev, stmt->expr(0));
-    }
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ++ln)
-    {
-        s = GpuHeaderSymbolInAdapter(sl->symb, st_hedr);
-        if (!ln)
-        {
-            hgpu_first = s;
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(s, stmt->expr(0));
-    }
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ++ln)
-    {
-        s = GpuBaseSymbolInAdapter(sl->symb, st_hedr);
-        if (!ln)
-        {
-            base_first = s;
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(s, stmt->expr(0));
-    }
-    num = ln;
-
-
-    /* -------- call dvmh_get_device_addr(long *deviceRef, void *variable) ----*/
-    for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ++ln)    // uses
-    if (!(s->attributes() & USE_IN_BIT))   // passing to kernel scalar argument by reference
-    {
-        s_dev_num = doDeviceNumVar(st_hedr, first_exec, s_dev_num, s_loop_ref);
-        e = &SgAssignOp(*new SgVarRefExp(sdev), *GetDeviceAddr(s_dev_num, s));
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (!ln)
-            stmt->addComment("// Get device addresses");
-        sdev = sdev->next();
-    }
-
-    /* -------- call dvmh_get_natural_base(long *deviceRef, long dvmDesc[] ) ----*/
-
-    for (sl = acc_array_list, s = h_first, sb = base_first, ln = 0; ln < num; sl = sl->next, s = s->next(), sb = sb->next(), ln++)
-    {
-        s_dev_num = doDeviceNumVar(st_hedr, first_exec, s_dev_num, s_loop_ref);
-        e = &SgAssignOp(*new SgVarRefExp(sb), *GetNaturalBase(s_dev_num, s));
-        stmt = new SgCExpStmt(*e);
-        SgStatement *cur = stmt;
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (IS_REMOTE_ACCESS_BUFFER(sl->symb)) // case of RTS2 interface
-        {
-            e = LoopGetRemoteBuf(s_loop_ref, nbuf--, s); 
-            stmt = new SgCExpStmt(*e);
-            cur->insertStmtBefore(*stmt, *st_hedr); 
-        }
-        if (!ln)
-            stmt->addComment("// Get natural bases");
-    }
-    /* -------- call  dvmh_fill_header_(long *deviceRef, void *base, long dvmDesc[], long dvmhDesc[]);----*/
-
-    for (s = h_first, sg = hgpu_first, sb = base_first, ln = 0; ln < num; s = s->next(), sg = sg->next(), sb = sb->next(), ln++)
-    {
-        e = FillHeader(s_dev_num, sb, s, sg);
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (!ln)
-            stmt->addComment("// Fill device headers");
-    }
-
-    /* -------- call  loop_fill_bounds_(loop_ref, lowI, highI, idxI); ----*/
-
-    stmt = new SgCExpStmt(*FillBounds(s_loop_ref, lowI, highI, idxI));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Get bounds");
-    mywarn("  end: create assigns");
-    stmt_save = stmt;
-    
-    stmt = new SgCExpStmt(SgAssignOp(*new SgRecordRefExp(*s_blocks, "x"), *new SgValueExp(1)));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Start counting");
-    SgStatement *st_where = stmt;
-
-    stmt = new SgCExpStmt(SgAssignOp(*new SgRecordRefExp(*s_threads, "x"), *new SgValueExp(1)));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    if (options.isOn(RTC))
-    {
-        /* -------- call  loop_cuda_rtc_set_lang_(loop_ref, lang); ------------*/
-        if (options.isOn(C_CUDA))
-            stmt = new SgCExpStmt(*RtcSetLang(s_loop_ref, 1));
-        else
-            stmt = new SgCExpStmt(*RtcSetLang(s_loop_ref, 0));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        stmt->addComment("// Set CUDA language for launching kernels in RTC");
-    }
-
-    /* -------- call   loop_guess_index_type_(loop_ref); ------------*/
-    stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(idxTypeInKernel), *GuessIndexType(s_loop_ref)));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Guess index type in CUDA kernel");
-
-
-    SgFunctionCallExp *sizeofL = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-    SgFunctionCallExp *sizeofLL = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-    SgFunctionCallExp *sizeofI = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-
-    sizeofL->addArg(*new SgKeywordValExp("long"));       //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "long")));
-    sizeofLL->addArg(*new SgKeywordValExp("long long"));  //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "long long")));
-    sizeofI->addArg(*new SgKeywordValExp("int"));        //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "int")));
-
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LONG")))
-        &&
-        SgEqOp(*sizeofL, *sizeofI),
-        *new SgCExpStmt(SgAssignOp(*new SgVarRefExp(idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_INT")))));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LONG")))
-        &&
-        SgEqOp(*sizeofL, *sizeofLL),
-        *new SgCExpStmt(SgAssignOp(*new SgVarRefExp(idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LLONG")))));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    /* args for kernel */
-    {
-        espec = CreateBlocksThreadsSpec(s_blocks, s_threads);
-        funcCall = CallKernel(kernel_symb, espec);
-
-        for (sg = hgpu_first, sb = base_first, sl = acc_array_list, ln = 0; ln<num; sg = sg->next(), sb = sb->next(), sl = sl->next, ln++)
-        {
-            e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(sl->symb->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sb));
-            funcCall->addArg(*e);
-            for (int i = NumberOfCoeffs(sg); i>0; i--)
-                funcCall->addArg(*new SgArrayRefExp(*sg, *new SgValueExp(i)));
-        }
-
-        if (red_list)
-        {
-            reduction_operation_list *rsl;
-            int i = 0;
-            for (rsl = red_struct_list, s = red_first; rsl; rsl = rsl->next, ++i)  //s!=s_blocks_info
-            {
-                if (rsl->redvar_size == 0) //reduction variable is scalar
-                {
-                    if (options.isOn(RTC))
-                    {
-                        SgVarRefExp *toAdd = new SgVarRefExp(s);
-                        toAdd->addAttribute(RTC_NOT_REPLACE);
-                        funcCall->addArg(*toAdd);
-                    }
-                    else
-                        funcCall->addArg(*new SgVarRefExp(s));
-                }
-                else
-                {
-                    int i;
-                    has_red_array = 1;
-                    for (i = 0; i < rsl->redvar_size; i++)
-                        funcCall->addArg(*new SgArrayRefExp(*s, *new SgValueExp(i)));
-                }
-                s = s->next();
-
-                if (options.isOn(C_CUDA))
-                    funcCall->addArg(*new SgVarRefExp(reduction_ptr[i]));
-                else
-                    funcCall->addArg(*new SgCastExp(*C_PointerType(new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(reduction_ptr[i])));
-            }
-        }
-        for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ln++)  // uses
-        {
-            if (s->attributes() & USE_IN_BIT)
-                funcCall->addArg(SgDerefOp(*new SgVarRefExp(*s)));   // passing argument by value to kernel
-            else
-            {                                                   // passing argument by reference to kernel
-                SgType *tp = NULL;
-                if (s->type()->hasBaseType())
-                    tp = s->type()->baseType();
-                else
-                    tp = s->type();
-                e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? tp : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sdev));
-                funcCall->addArg(*e);
-                sdev = sdev->next();
-            }
-        }
-
-    e_all_private_size = sizeOfPrivateArraysInBytes();
-    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
-    {
-        for (el=private_list, lnp=0; el; el=el->rhs())
-        {
-             s = el->lhs()->symbol();
-             if (IS_ARRAY(s))
-             {                
-                 sarg = new SgSymbol(VARIABLE_NAME, PointerNameForPrivateArray(s), *C_PointerType(C_VoidType()), *st_hedr);
-                 ae = new SgCastExp(*C_PointerType( C_Type(s->type()->baseType())), *new SgVarRefExp(sarg));
-                 funcCall->addArg(*ae);
-                 if (!lnp)
-                     private_first = sarg;
-                 lnp++;        
-                 if (!TestArrayShape(s))
-                 {   
-                     SgExpression **eatr = (SgExpression **) el->lhs()->attributeValue(0, DIM_SIZES);  
-                     SgExpression *ela;
-                     for (ela = *eatr; ela; ela = ela->rhs())
-                         funcCall->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol())));  
-                     eatr = (SgExpression **) el->lhs()->attributeValue(0, L_BOUNDS);    
-                     for (ela = *eatr; ela; ela = ela->rhs())
-                         funcCall->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol()))); 
-                 }
-
-             }
-         }
-    }         
-
-        for (int i = 0; i < acrossV + loopV; ++i)
-        {
-            funcCall->addArg(*new SgArrayRefExp(*lowI, *new SgValueExp(i)));
-            funcCall->addArg(*new SgArrayRefExp(*highI, *new SgValueExp(i)));
-            funcCall->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(i)));
-        }
-    }
-
-    stmt = createKernelCallsInCudaHandler(funcCall, s_loop_ref, idxTypeInKernel, s_blocks);
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    if (red_list)
-    {
-        ln = 0;
-        for (er = red_list, s = red_first; er; er = er->rhs(), ++ln, s=s->next())
-        {
-            funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("cudaMemcpy"));
-            funcCall->addArg(SgAddrOp(*new SgVarRefExp(&(er->lhs()->rhs()->symbol()->copy()))));
-            funcCall->addArg(*new SgVarRefExp(reduction_ptr[ln]));
-            funcCall->addArg(SgSizeOfOp(*new SgKeywordValExp(getKeyWordType(reduction_ptr[ln]->type()))));
-            funcCall->addArg(*new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "cudaMemcpyDeviceToHost")));
-            stmt = new SgCExpStmt(*funcCall);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            e = &SgAssignOp(*new SgVarRefExp(*s_tmp_var), *new SgValueExp(ln+1));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            stmt = new SgCExpStmt(*RedPost(s_loop_ref, s_tmp_var, s, NULL)); // loop_red_post_
-            st_end->insertStmtBefore(*stmt, *st_hedr);            
-        }    
-
-        ln = 0;
-        for (er = red_list; er; er = er->rhs(), ++ln)
-        {
-            funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("cudaFree"));
-            funcCall->addArg(*new SgVarRefExp(reduction_ptr[ln]));
-            stmt = new SgCExpStmt(*funcCall);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-            if (ln == 0)
-                stmt->addComment("// Free temporary variables");
-        }
-    }
-    // insert code for big private arrays
-    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size)) 
-    {
-        GetMemoryForPrivateArrays(private_first, s_loop_ref, lnp, st_where, st_hedr, new SgValueExp(1));        
-
-   // to dispose private arrays
-        for (s = private_first, ln = 0;  ln < lnp; s = s->next(), ln++)  // private arrays
-        {
-            stmt = new SgCExpStmt(*DisposePrivateArray(s_loop_ref, s));
-	    st_end->insertStmtBefore(*stmt, *st_hedr);  
-        }
-    }
-    // create args for kernel and return it
-    vector<ArgsForKernel> argsKernel(countKernels);
-    for (unsigned i = 0; i < countKernels; ++i)
-        argsKernel[i].st_header = st_hedr;
-
-    delete[]reduction_ptr;
-    mywarn("  end Adapter Function");
-    if (options.isOn(C_CUDA))
-        RenamingCudaFunctionVariables(st_hedr, s_loop_ref, 0);
-    
-    return argsKernel;
-}
-
-static inline void insertReductionArgs(SgSymbol **reduction_ptr, SgSymbol **reduction_loc_ptr,
-                                       SgSymbol **reduction_symb, SgSymbol **reduction_loc_symb,
-                                       SgFunctionCallExp *funcCallKernel, SgSymbol* numBlocks, int &has_red_array)
-{
-    reduction_operation_list *rsl;
-    SgSymbol *s = NULL;
-    SgExpression *e = NULL;
-
-    for (rsl = red_struct_list, s = red_first; rsl; rsl = rsl->next)  //s!=s_blocks_info
-    {
-        if (rsl->redvar_size > 0)
-        {
-            funcCallKernel->addArg(*new SgVarRefExp(*numBlocks));
-            break;
-        }
-    }
-
-    int i = 0;
-    for (rsl = red_struct_list, s = red_first; rsl; rsl = rsl->next, ++i)  //s!=s_blocks_info
-    {
-        if (rsl->redvar_size == 0) //reduction variable is scalar
-        {
-            if (options.isOn(RTC))
-            {
-                SgVarRefExp *toAdd = new SgVarRefExp(reduction_symb[i]);
-                toAdd->addAttribute(RTC_NOT_REPLACE);
-                funcCallKernel->addArg(*toAdd);
-            }
-            else
-                funcCallKernel->addArg(*new SgVarRefExp(reduction_symb[i]));
-        }
-        else //TODO!!
-        {
-            has_red_array = 1;
-            for (int k = 0; k < rsl->redvar_size; ++k)
-                funcCallKernel->addArg(*new SgArrayRefExp(*reduction_symb[i], *new SgValueExp(k)));
-        }
-
-        if (options.isOn(C_CUDA))
-            funcCallKernel->addArg(*new SgVarRefExp(reduction_ptr[i]));
-        else
-            funcCallKernel->addArg(*new SgCastExp(*C_PointerType(new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(reduction_ptr[i])));
-
-        if (rsl->locvar)  //MAXLOC,MINLOC
-        {
-            for (int k = 0; k < rsl->number; ++k)
-                funcCallKernel->addArg(*new SgArrayRefExp(*reduction_loc_symb[i], *new SgValueExp(k)));
-            s = s->next();
-
-            if (options.isOn(C_CUDA))
-                e = new SgCastExp(*C_PointerType(C_Type(rsl->locvar->type())), *new SgVarRefExp(reduction_loc_ptr[i]));
-            else
-                e = new SgCastExp(*C_PointerType(new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(s));// TODO it like in C_Cuda
-            funcCallKernel->addArg(*e);
-            s = s->next();
-        }
-    }
-}
-
-static void createPrivatePointers(SgSymbol* &private_first, int &lnp, SgStatement* st_hedr, SgExpression* &e_all_private_size)
-{
-    private_first = NULL;
-    e_all_private_size = sizeOfPrivateArraysInBytes();
-    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
-    {
-        SgExpression *el, *ae;
-        SgSymbol *sarg;
-       
-        for (el=private_list, lnp=0; el; el=el->rhs())
-        {
-            SgSymbol *s = el->lhs()->symbol();
-            if (IS_ARRAY(s))
-            {                
-                sarg = new SgSymbol(VARIABLE_NAME, PointerNameForPrivateArray(s), *C_PointerType(C_VoidType()), *st_hedr);
-                if (!lnp)
-                    private_first = sarg;
-                lnp++;        
-            }
-        }
-    }         
-} 
-
-static void createArgsForKernelForTwoDeps(SgFunctionCallExp*& funcCallKernel, SgSymbol* kernel_symb, SgExpression* espec, SgSymbol*& sg, SgSymbol* hgpu_first,
-                                          SgSymbol*& sb, SgSymbol* base_first, symb_list*& sl, int& ln, int num, SgExpression*& e, SgSymbol** reduction_ptr,
-                                          SgSymbol** reduction_loc_ptr, SgSymbol** reduction_symb, SgSymbol** reduction_loc_symb, SgSymbol* red_blocks, int& has_red_array,
-                                          SgSymbol* diag, const int& loopV, SgSymbol** num_elems, const int& acrossV, SgSymbol* acrossBase[16], SgSymbol* loopBase[16],
-                                          SgSymbol* idxI, const vector<SageSymbols>& loopAcrossSymb, const vector<SageSymbols>& loopSymb, SgSymbol*& s, SgSymbol* uses_first,
-                                          SgSymbol*& sdev, SgSymbol* scalar_first, int uses_num, vector<char*>& dvm_array_headers,
-                                          SgSymbol** addressingParams, SgSymbol** outTypeOfTransformation, SgSymbol* type_of_run, SgSymbol* bIdxs, SgSymbol* private_first, int lnp)
-{
-
-    funcCallKernel = CallKernel(kernel_symb, espec);
-    for (sg = hgpu_first, sb = base_first, sl = acc_array_list, ln = 0; ln < num; sg = sg->next(), sb = sb->next(), sl = sl->next, ln++)
-    {
-        e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(sl->symb->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sb));
-        funcCallKernel->addArg(*e);
-        for (int i = NumberOfCoeffs(sg); i > 0; i--)
-            funcCallKernel->addArg(*new SgArrayRefExp(*sg, *new SgValueExp(i)));
-    }
-    if (red_list)
-        insertReductionArgs(reduction_ptr, reduction_loc_ptr, reduction_symb, reduction_loc_symb, funcCallKernel, red_blocks, has_red_array);
-
-    if (options.isOn(RTC)) // diag is modifiable value
-    {
-        SgVarRefExp* toAdd = new SgVarRefExp(diag);
-        toAdd->addAttribute(RTC_NOT_REPLACE);
-        funcCallKernel->addArg(*toAdd);
-    }
-    else
-        funcCallKernel->addArg(*new SgVarRefExp(diag));
-
-    if (loopV > 2)
-        for (int k = 1; k < loopV + 2; ++k)
-        {
-            if (loopV > 2 && k == 2)
-                continue;
-            funcCallKernel->addArg(*new SgVarRefExp(num_elems[k]));
-        }
-    else if (loopV > 0)
-        for (int k = 1; k < loopV + 1; ++k)
-            funcCallKernel->addArg(*new SgVarRefExp(num_elems[k]));
-    for (int i = 0; i < acrossV; ++i)
-    {
-        if (i <= 1 && options.isOn(RTC)) // across base is modifiable value
-        {
-            SgVarRefExp* toAdd = new SgVarRefExp(acrossBase[i]);
-            toAdd->addAttribute(RTC_NOT_REPLACE);
-            funcCallKernel->addArg(*toAdd);
-        }
-        else
-            funcCallKernel->addArg(*new SgVarRefExp(acrossBase[i]));
-    }
-    for (int i = 0; i < loopV; ++i)
-        funcCallKernel->addArg(*new SgVarRefExp(loopBase[i]));
-    for (int i = 0; i < acrossV; ++i)
-        funcCallKernel->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[i].len)));
-    for (int i = 0; i < loopV; ++i)
-        funcCallKernel->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopSymb[i].len)));
-
-    for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ln++)  // uses
-    {
-        if (s->attributes() & USE_IN_BIT)
-            funcCallKernel->addArg(SgDerefOp(*new SgVarRefExp(*s)));   // passing argument by value to kernel
-        else
-        {                                                   // passing argument by reference to kernel
-            SgType* tp = NULL;
-            if (s->type()->hasBaseType())
-                tp = s->type()->baseType();
-            else
-                tp = s->type();
-            e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? tp : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sdev));
-            funcCallKernel->addArg(*e);
-            sdev = sdev->next();
-        }
-    }
-           
-    if (options.isOn(C_CUDA) && private_first) // there are big private arrays
-    {
-        SgExpression *el, *ae;
-        SgSymbol *sarg, *sp, *s;
-        int ln;
-        for (sp = private_first, el = private_list, ln = 0;  ln < lnp; sp = sp->next(), el = el->rhs(), ln++) 
-        {            
-            while (!IS_ARRAY(el->lhs()->symbol()))
-                el = el->rhs();
-            s = el->lhs()->symbol(); 
-            ae = new SgCastExp(*C_PointerType( C_Type(s->type()->baseType())), *new SgVarRefExp(sp));
-            funcCallKernel->addArg(*ae);
-            if (!TestArrayShape(s))
-            {   
-                SgExpression **eatr = (SgExpression **) el->lhs()->attributeValue(0, DIM_SIZES);  
-                SgExpression *ela;
-                for (ela = *eatr; ela; ela = ela->rhs())
-                    funcCallKernel->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol())));  
-                eatr = (SgExpression **) el->lhs()->attributeValue(0, L_BOUNDS);    
-                for (ela = *eatr; ela; ela = ela->rhs())
-                    funcCallKernel->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol()))); 
-            }
-
-        }
-    }         
-
-    if (options.isOn(AUTO_TFM))
-    {
-        for (size_t i = 0; i < dvm_array_headers.size(); ++i)
-        {
-            funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(0)));
-            funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(1)));
-            funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(2)));
-            funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(3)));
-            funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(4)));
-            funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(5)));
-            funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(6)));
-            funcCallKernel->addArg(*new SgVarRefExp(*outTypeOfTransformation[i]));
-        }
-    }
-
-    funcCallKernel->addArg(*new SgVarRefExp(type_of_run));
-    for (int i = 0; i < acrossV + loopV; ++i)
-        funcCallKernel->addArg(*new SgArrayRefExp(*bIdxs, *new SgValueExp(i)));
-}
-
-vector<ArgsForKernel> Create_C_Adapter_Function_Across_variants(SgSymbol *sadapter, SgSymbol *kernel_symb, const int loopV, const int acrossV,
-                                                                const int allDims, const vector<SageSymbols>& loopSymb, const vector<SageSymbols>& loopAcrossSymb)
-{
-#if debugMode
-        warn("PARALLEL directive with ACROSS clause in region", 420, dvm_parallel_dir);
-#endif
-
-    SgSymbol **num_elems = new SgSymbol*[allDims + 1];
-    SgSymbol **reduction_ptr = NULL, **reduction_loc_ptr = NULL, **addressingParams = NULL;
-    SgSymbol **reduction_symb = NULL, **reduction_loc_symb = NULL;
-    SgSymbol *lowI, *highI, *idxI, *bIdxs;
-    SgSymbol *elem, *red_blocks, *shared_mem, *stream_t;
-    SgSymbol *M, *N, *M1, *M2, *M3, *q, *diag, *Emax, *Emin, *Allmin, *SE, *var1, *var2, *var3;
-    SgSymbol *acrossBase[numLoopVars], *loopBase[numLoopVars], **outTypeOfTransformation = NULL;
-    SgSymbol *nums[3], *steps = NULL;
-    const char *s_cuda_var[3] = { "x", "y", "z" };
-
-    symb_list *sl;
-    SgStatement *st_hedr, *st_end, *stmt, *first_exec;
-    SgExpression *fe, *ae, *arg_list, *el, *e, *espec, *ex, *er, *e_all_private_size = NULL, *e_totalThreads;
-    SgSymbol *s_loop_ref, *sarg, *s, *sb, *sg, *sdev, *h_first, *hgpu_first, *base_first, *uses_first, *scalar_first, *private_first;
-    SgSymbol *s_blocks, *s_threads, *s_dev_num, *s_tmp_var, *type_of_run, *s_i = NULL, *s_k = NULL, *s_tmp_var_1;
-    SgSymbol *idxTypeInKernel;
-    SgType *typ;
-    SgFunctionCallExp *funcCall, *funcCallKernel;
-    vector<char*> dvm_array_headers;
-    int ln, num, uses_num, has_red_array, use_device_num, num_of_red_arrays, nbuf = 0, lnp;
-
-    // init block
-    lowI = highI = idxI = elem = red_blocks = shared_mem = stream_t = bIdxs = NULL;
-    M = N = M1 = M2 = M3 = q = diag = Emax = Emin = Allmin = SE = var1 = var2 = var3 = NULL;
-    s_loop_ref = sarg = s = sb = sg = sdev = h_first = NULL;
-    hgpu_first = base_first = uses_first = scalar_first = NULL;
-    s_blocks = s_threads = s_dev_num = s_tmp_var = s_tmp_var_1 = NULL;
-    typ = NULL;
-    funcCall = funcCallKernel = NULL;
-    sl = NULL;
-    type_of_run = NULL;
-    st_hedr = st_end = stmt = first_exec = NULL;
-    fe = ae = arg_list = el = e = espec = ex = er = NULL;
-    ln = num = uses_num = has_red_array = use_device_num = num_of_red_arrays = 0;
-    //end of init block
-
-    mywarn("start: create fuction header ");
-    // create fuction header
-    st_hedr = Create_C_Function(sadapter);
-    st_hedr->addComment(Cuda_LoopHandlerComment());
-    st_end = st_hedr->lexNext();
-    fe = st_hedr->expr(0);
-    first_exec = st_end;
-    if (declaration_cmnt == NULL)
-        declaration_cmnt = "#include <cstdio>\n#define MIN(X,Y) ((X) < (Y) ? (X) : (Y))\n#define MAX(X,Y) ((X) > (Y) ? (X) : (Y))";
-
-    mywarn("  end: create fuction header ");
-    mywarn("start: create  dummy argument list ");
-
-    // create  dummy argument list: loop_ref, <dvm-array-headers>, <uses>
-    typ = C_PointerType(C_Derived_Type(s_DvmhLoopRef));
-    s_loop_ref = new SgSymbol(VARIABLE_NAME, "loop_ref", *typ, *st_hedr);
-
-    ae = new SgVarRefExp(s_loop_ref);                 //loop_ref
-    ae->setType(typ);
-    ae = new SgPointerDerefExp(*ae);
-    arg_list = new SgExprListExp(*ae);
-    fe->setLhs(arg_list);
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ++ln)  // <dvm-array-headers>
-    {
-        SgArrayType *typearray = new SgArrayType(*C_DvmType());
-        typearray->addDimension(NULL);
-        sarg = new SgSymbol(VARIABLE_NAME, sl->symb->identifier(), *typearray, *st_hedr);
-        dvm_array_headers.push_back(sl->symb->identifier());
-        ae = new SgArrayRefExp(*sarg);
-        ae->setType(*typearray);
-        el = new SgExpression(EXPR_LIST);
-        el->setLhs(NULL);
-        ae->setLhs(*el);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            h_first = sarg;
-        if (IS_REMOTE_ACCESS_BUFFER(sl->symb)) // case of RTS2 interface
-            nbuf++; 
-    }
-
-    for (el = uses_list, ln = 0; el; el = el->rhs(), ++ln)    // <uses>
-    {
-        s = el->lhs()->symbol();
-        typ = C_PointerType(C_Type(s->type()));
-        sarg = new SgSymbol(VARIABLE_NAME, s->identifier(), *typ, *st_hedr);
-        if (isByValue(s))
-            SYMB_ATTR(sarg->thesymb) = SYMB_ATTR(sarg->thesymb) | USE_IN_BIT;
-        ae = UsedValueRef(s, sarg);
-        ae->setType(typ);
-        ae = new SgPointerDerefExp(*ae);
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-        if (!ln)
-            uses_first = sarg;
-    }
-    uses_num = ln;
-
-    if (options.isOn(C_CUDA))  // <private-array-shapes>
-    {
-        int idim;
-        SgExpression *elp;
-        SgType *t = C_PointerType(C_DvmType());
-
-        for (elp=private_list; elp; elp = elp->rhs())
-        {
-            s = elp->lhs()->symbol();
-            if (IS_ARRAY(s) && !TestArrayShape(s))     
-            {   
-                el = NULL;
-                for (idim = Rank(s); idim; idim--)
-                {
-                    sarg = new SgSymbol(VARIABLE_NAME, DimSizeName(s, idim), *t, *st_hedr);
-                    ae = new SgVarRefExp(sarg);
-                    ae->setType(t);
-                    el = AddElementToList(el, new SgPointerDerefExp(*ae));
-                }
-                arg_list = AddListToList(arg_list, &el->copy());
-                if (!elp->lhs()->attributeValue(0, DIM_SIZES))
-                {
-                    SgExpression **edim = new (SgExpression *);
-                    *edim = el;
-                    elp->lhs()->addAttribute(DIM_SIZES, (void *)edim, sizeof(SgExpression *) ); 
-                }   
-
-                el = NULL;
-                for (idim = Rank(s); idim; idim--)
-                {
-                    sarg = new SgSymbol(VARIABLE_NAME, BoundName(s, idim, 1), *t, *st_hedr);
-                    ae = new SgVarRefExp(sarg);
-                    ae->setType(t);
-                    el = AddElementToList(el, new SgPointerDerefExp(*ae));
-                } 
-                arg_list = AddListToList(arg_list, &el->copy());
-                if (!elp->lhs()->attributeValue(0, L_BOUNDS))
-                {
-                    SgExpression **elb = new (SgExpression *);
-                    *elb = el;
-                    elp->lhs()->addAttribute(L_BOUNDS, (void *)elb, sizeof(SgExpression *) ); 
-                }
-
-                while (arg_list->rhs() != 0)
-                    arg_list = arg_list->rhs();
-            }
-
-        }
-    } 
-
-    type_of_run = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("type_of_run"), *LongT, *st_hedr);
-    ae = new SgVarRefExp(type_of_run);
-    ae->setType(LongT);
-    arg_list->setRhs(*new SgExprListExp(*ae));
-    arg_list = arg_list->rhs();
-
-    if (options.isOn(SPEED_TEST_L0))
-    {
-        s_i = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("__s_i"), *C_Type(SgTypeInt()), *st_hedr);
-        ae = new SgVarRefExp(s_i);
-        ae->setType(C_Type(SgTypeInt()));
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-
-        s_k = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("__s_k"), *C_Type(SgTypeInt()), *st_hedr);
-        ae = new SgVarRefExp(s_k);
-        ae->setType(C_Type(SgTypeInt()));
-        arg_list->setRhs(*new SgExprListExp(*ae));
-        arg_list = arg_list->rhs();
-    }
-
-    mywarn("  end: create  dummy argument list ");
-    if (red_list) // reduction section
-    {
-        mywarn("start: in reduction section ");
-        s_tmp_var = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("tmpVar"), *C_DvmType(), *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        s_tmp_var_1 = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("tmpVar1"), *C_DvmType(), *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        //looking through the reduction_op_list
-        for (er = red_list; er; er = er->rhs())
-            num_of_red_arrays++;
-
-        reduction_ptr = new SgSymbol*[num_of_red_arrays];
-        reduction_symb = new SgSymbol*[num_of_red_arrays];
-
-        reduction_loc_ptr = new SgSymbol*[num_of_red_arrays];
-        reduction_loc_symb = new SgSymbol*[num_of_red_arrays];
-
-        for (er = red_list, ln = 0; er; er = er->rhs(), ++ln)
-        {
-            SgExpression *ered, *ev, *en, *loc_var_ref;
-            SgSymbol *sred, *s_loc_var, *sgrid_loc;
-            int is_array;
-            SgType *loc_type = NULL, *btype = NULL;
-
-            loc_var_ref = NULL;
-            s_loc_var = NULL;
-            is_array = 0;
-            ered = er->lhs();    //  reduction  (variant==ARRAY_OP)
-            ev = ered->rhs(); // reduction variable reference for reduction operations except MINLOC,MAXLOC
-            if (isSgExprListExp(ev))
-            {
-                ev = ev->lhs(); // reduction variable reference
-                loc_var_ref = ered->rhs()->rhs()->lhs();        //location array reference
-                en = ered->rhs()->rhs()->rhs()->lhs(); // number of elements in location array
-                loc_el_num = LocElemNumber(en);
-                loc_type = loc_var_ref->symbol()->type();
-            }
-            else if (isSgArrayRefExp(ev) && !ev->lhs()) //whole array
-                is_array = 1;
-
-            s = sred = &(ev->symbol()->copy());
-            SYMB_SCOPE(s->thesymb) = st_hedr->thebif;
-            if (is_array)
-            {
-                SgArrayType *typearray = new SgArrayType(*C_Type(ev->symbol()->type()));
-                typearray->addRange(*ArrayLengthInElems(ev->symbol(), NULL, 0));
-                s->setType(*typearray);
-            }
-            else
-                s->setType(C_Type(ev->symbol()->type()));
-
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-            reduction_symb[ln] = s;
-            if (!ln)
-                red_first = s;
-
-            s_loc_var = sgrid_loc = NULL;
-            if (loc_var_ref)
-            {
-                s = s_loc_var = &(loc_var_ref->symbol()->copy());
-                if (isSgArrayType(loc_type))
-                    btype = loc_type->baseType();
-                else
-                    btype = loc_type;
-                
-                SgArrayType *typearray = new SgArrayType(*C_Type(btype));
-                typearray->addRange(*new SgValueExp(loc_el_num));
-                s_loc_var->setType(*typearray);
-                SYMB_SCOPE(s->thesymb) = st_hedr->thebif;
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-                reduction_loc_symb[ln] = s_loc_var;
-
-                s = sgrid_loc = GridSymbolForRedInAdapter(s, st_hedr);
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-            }
-
-           
-            /*--- executable statements: register reductions in RTS ---*/
-            e = &SgAssignOp(*new SgVarRefExp(s_tmp_var), *new SgValueExp(ln+1));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            if (!ln)
-            {
-                stmt->addComment("// Register reduction for CUDA-execution");
-                first_exec = stmt;
-            }
-
-            char *buf_tmp = new char[8];
-            sprintf(buf_tmp, "%d", ln);
-            reduction_ptr[ln] = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[16], "cuda_ptr_"), buf_tmp)), *C_PointerType(C_Type(ev->symbol()->type())), *st_hedr);
-            st_hedr->insertStmtAfter(*makeSymbolDeclaration(reduction_ptr[ln]), *st_hedr);
-            delete[]buf_tmp;
-
-            if (s_loc_var)
-                reduction_loc_ptr[ln] = sgrid_loc;
-            else
-                reduction_loc_ptr[ln] = NULL;
-
-            // create loop_cuda_register_red()
-            stmt = new SgCExpStmt(*RegisterReduction_forAcross(s_loop_ref, s_tmp_var, reduction_ptr[ln], reduction_loc_ptr[ln]));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-            // create loop_red_init_()
-            stmt = new SgCExpStmt(*InitReduction(s_loop_ref, s_tmp_var, sred, s_loc_var));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-
-        mywarn("  end: out reduction section ");
-    }
-
-    mywarn("start: create vars ");
-
-    // create type for static arrays
-    SgArrayType *tpArr = new SgArrayType(*LongT);
-    SgValueExp *dimSize = new SgValueExp(loopV + acrossV + 2);
-    tpArr->addDimension(dimSize);
-
-    if (red_list)
-    {
-        red_blocks = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("num_of_red_blocks"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-
-    lowI = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("lowI"), *LongT, *st_hedr);
-    s->setType(tpArr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    highI = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("highI"), *LongT, *st_hedr);
-    s->setType(tpArr);
-    addDeclExpList(s, stmt->expr(0));
-
-    idxI = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("idxI"), *LongT, *st_hedr);
-    s->setType(tpArr);
-    addDeclExpList(s, stmt->expr(0));
-
-    idxTypeInKernel = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("idxTypeInKernel"), *LongT, *st_hedr);
-    addDeclExpList(s, stmt->expr(0));
-
-    if (options.isOn(GPU_O0))
-    {
-        steps = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("steps"), *LongT, *st_hedr);
-        s->setType(tpArr);
-        addDeclExpList(s, stmt->expr(0));
-    }
-
-    bIdxs = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("idxs"), *LongT, *st_hedr);
-    s->setType(tpArr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    if (options.isOn(AUTO_TFM))
-    {
-        // create type for static arrays for addresingParams, size = 5
-        SgArrayType *tpArr = new SgArrayType(*LongT);
-        SgValueExp *dimSize = new SgValueExp(7);
-        tpArr->addDimension(dimSize);
-
-        addressingParams = new SgSymbol*[dvm_array_headers.size()];
-        outTypeOfTransformation = new SgSymbol*[dvm_array_headers.size()];
-        char *tmpS = new char[64];
-        for (size_t i = 0; i < dvm_array_headers.size(); ++i)
-        {
-            tmpS[0] = '\0';
-            strcat(tmpS, dvm_array_headers[i]);
-            strcat(tmpS, "_addressingParams");
-            addressingParams[i] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(tmpS), *LongT, *st_hedr);
-            s->setType(tpArr);
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-            tmpS[0] = '\0';
-            strcat(tmpS, dvm_array_headers[i]);
-            strcat(tmpS, "_outTypeOfTfm");
-            outTypeOfTransformation[i] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(tmpS), *LongT, *st_hedr);
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-    }
-
-    if (acrossV == 1) // ACROSS with one dependence: create variables
-    {
-        SgStatement **stmts = new SgStatement*[MIN(loopV, 3) * 2];
-        for (int k = 0, k1 = MIN(loopV, 3); k < MIN(loopV, 3); ++k, ++k1)
-        {
-            nums[k] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[16], "num_"), s_cuda_var[k])), *LongT, *st_hedr);
-            stmts[k] = makeSymbolDeclaration(s);
-
-            num_elems[k] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[16], "num_elem_"), s_cuda_var[k])), *LongT, *st_hedr);
-            stmts[k1] = makeSymbolDeclaration(s);
-        }
-        for (int k = 0; k < MIN(loopV, 3) * 2; ++k)
-            st_hedr->insertStmtAfter(*stmts[k], *st_hedr);
-
-        if (loopV > 3)
-        {
-            for (int k = 0; k < loopV - 2; ++k)
-            {
-                char *tmp = new char[10];
-                sprintf(tmp, "%d", k);
-                num_elems[k + 3] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[16], "num_elem_z_"), tmp)), *LongT, *st_hedr);
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-                delete[]tmp;
-            }
-        }
-
-        delete[]stmts;
-    }
-    else if (acrossV == 2) // ACROSS with two dependence: create variables
-    {
-        M = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("M"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        N = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("N"), *LongT, *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-
-        elem = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("elem"), *LongT, *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-
-        diag = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("diag"), *LongT, *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-
-        q = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("q"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        SgStatement **stmts = new SgStatement*[(MIN(loopV + 1, 3) - 1) * 2];
-        for (int k = 1, k1 = MIN(loopV + 1, 3) - 1; k < MIN(loopV + 1, 3); ++k, ++k1)
-        {
-            nums[k] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[16], "num_"), s_cuda_var[k])), *LongT, *st_hedr);
-            stmts[k - 1] = makeSymbolDeclaration(s);
-
-            num_elems[k] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[16], "num_elem_"), s_cuda_var[k])), *LongT, *st_hedr);
-            stmts[k1] = makeSymbolDeclaration(s);
-        }
-
-        nums[0] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("num_x"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        for (int i = 0; i < (MIN(loopV + 1, 3) - 1) * 2; ++i)
-            st_hedr->insertStmtAfter(*stmts[i], *st_hedr);
-        delete[]stmts;
-
-        if (loopV > 2)
-        {
-            for (int k = 0; k < loopV - 1; ++k)
-            {
-                char *tmp = new char[10];
-                sprintf(tmp, "%d", k);
-                num_elems[k + 3] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[16], "num_elem_z_"), tmp)), *LongT, *st_hedr);
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-                delete[]tmp;
-            }
-        }
-    }
-    else if (acrossV >= 3) // ACROSS with three dependence: create variables
-    {
-        nums[0] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("num_x"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        nums[1] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("num_y"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        if (loopV > 0)
-        {
-            nums[2] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("num_z"), *LongT, *st_hedr);
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-            for (int k = 0; k < loopV; ++k)
-            {
-                char *tmp = new char[10];
-                sprintf(tmp, "%d", k);
-                num_elems[k] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[16], "num_elem_z_"), tmp)), *LongT, *st_hedr);
-                stmt = makeSymbolDeclaration(s);
-                st_hedr->insertStmtAfter(*stmt, *st_hedr);
-                delete[]tmp;
-            }
-
-            num_elems[loopV] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("num_elem_z"), *LongT, *st_hedr);
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-
-        M1 = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("Mi"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        M2 = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("Mj"), *LongT, *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-
-        M3 = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("Mk"), *LongT, *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-
-        Emax = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("Emax"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclaration(s);
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        Emin = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("Emin"), *LongT, *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-
-        Allmin = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("Allmin"), *LongT, *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-
-        SE = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("SE"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclarationWithInit(s, new SgValueExp(1));
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        diag = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("diag"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclarationWithInit(s, new SgValueExp(1));
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        var1 = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("var1"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclarationWithInit(s, new SgValueExp(1));
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        var2 = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("var2"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclarationWithInit(s, new SgValueExp(0));
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-        var3 = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("var3"), *LongT, *st_hedr);
-        stmt = makeSymbolDeclarationWithInit(s, new SgValueExp(0));
-        st_hedr->insertStmtAfter(*stmt, *st_hedr);
-    }
-
-    // create indxs
-    for (int i = 0; i < acrossV; ++i)
-    {
-        acrossBase[i] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[20], "base_"),
-                                         loopAcrossSymb[i].symb->identifier())), *LongT, *st_hedr);
-        if (i == 0)
-        {
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(s, stmt->expr(0));
-    }
-    for (int i = 0; i < loopV; ++i)
-    {
-        loopBase[i] = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(strcat(strcpy(new char[20], "base_"),
-                                       loopSymb[i].symb->identifier())), *LongT, *st_hedr);
-        addDeclExpList(s, stmt->expr(0));
-    }
-    // end
-
-    mywarn("  end: create vars ");
-    mywarn("start: create assigns");
-
-    s_blocks = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("blocks"), *t_dim3, *st_hedr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    s_threads = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("threads"), *t_dim3, *st_hedr);
-    addDeclExpList(s, stmt->expr(0));
-
-    shared_mem = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("shared_mem"), *LongT, *st_hedr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    stream_t = s = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("stream"), *C_Derived_Type(s_cudaStream), *st_hedr);
-    stmt = makeSymbolDeclaration(s);
-    st_hedr->insertStmtAfter(*stmt, *st_hedr);
-
-    for (s = uses_first, ln = 0; ln < uses_num; s = s->next(), ++ln)    // uses
-    if (!(s->attributes() & USE_IN_BIT))   // passing to kernel scalar argument by reference
-    {
-        sdev = GpuScalarAdrSymbolInAdapter(s, st_hedr);   // creating new symbol for address in device
-        if (!scalar_first)
-        {
-            scalar_first = sdev;
-            stmt = makeSymbolDeclaration(sdev);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(sdev, stmt->expr(0));
-    }
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ++ln)
-    {
-        s = GpuHeaderSymbolInAdapter(sl->symb, st_hedr);
-        if (!ln)
-        {
-            hgpu_first = s;
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(s, stmt->expr(0));
-    }
-
-    for (sl = acc_array_list, ln = 0; sl; sl = sl->next, ++ln)
-    {
-        s = GpuBaseSymbolInAdapter(sl->symb, st_hedr);
-        if (!ln)
-        {
-            base_first = s;
-            stmt = makeSymbolDeclaration(s);
-            st_hedr->insertStmtAfter(*stmt, *st_hedr);
-        }
-        else
-            addDeclExpList(s, stmt->expr(0));
-    }
-    num = ln;
-
-    /* call DvmType loop_cuda_autotransform_(DvmhLoopRef *InDvmhLoop, DvmType dvmDesc[]); */
-    if (options.isOn(AUTO_TFM))
-    {
-        s = h_first;
-        for (size_t i = 0; i < dvm_array_headers.size(); ++i, s = s->next())
-        {
-            stmt = new SgCExpStmt(*CudaAutoTransform(s_loop_ref, s));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-            if (!i)
-                stmt->addComment("// Autotransform all arrays");
-        }
-    }
-
-    /* -------- call dvmh_get_device_addr(long *deviceRef, void *variable) ----*/
-    for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ++ln)    // uses
-    if (!(s->attributes() & USE_IN_BIT))   // passing to kernel scalar argument by reference
-    {
-        s_dev_num = doDeviceNumVar(st_hedr, first_exec, s_dev_num, s_loop_ref);
-        e = &SgAssignOp(*new SgVarRefExp(sdev), *GetDeviceAddr(s_dev_num, s));
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (!ln)
-            stmt->addComment("// Get device addresses");
-        sdev = sdev->next();
-    }
-
-    /* -------- call dvmh_get_natural_base(long *deviceRef, long dvmDesc[] ) ----*/
-
-    for (sl = acc_array_list, s = h_first, sb = base_first, ln = 0; ln < num; sl = sl->next, s = s->next(), sb = sb->next(), ln++)
-    {
-        s_dev_num = doDeviceNumVar(st_hedr, first_exec, s_dev_num, s_loop_ref);
-        e = &SgAssignOp(*new SgVarRefExp(sb), *GetNaturalBase(s_dev_num, s));
-        stmt = new SgCExpStmt(*e);
-        SgStatement *cur = stmt;
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        if (IS_REMOTE_ACCESS_BUFFER(sl->symb)) // case of RTS2 interface
-        {
-            e = LoopGetRemoteBuf(s_loop_ref, nbuf--, s); 
-            stmt = new SgCExpStmt(*e);
-            cur->insertStmtBefore(*stmt, *st_hedr); 
-        }
-        if (!ln)
-            stmt->addComment("// Get natural bases");
-    }
-
-    /* call dvmh_fill_header_ex_(DvmType *deviceRef, void *base, DvmType dvmDesc[], DvmType dvmhDesc[], DvmType *outTypeOfTransformation, DvmType extendedParams[]);*/
-    if (options.isOn(AUTO_TFM))
-    {
-        for (s = h_first, sg = hgpu_first, sb = base_first, ln = 0; ln < num; s = s->next(), sg = sg->next(), sb = sb->next(), ln++)
-        {
-            stmt = new SgCExpStmt(*FillHeader_Ex(s_dev_num, sb, s, sg, outTypeOfTransformation[ln], addressingParams[ln]));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-            if (!ln)
-                stmt->addComment("// Fill device headers");
-        }
-    }
-    /* -------- call  dvmh_fill_header_(long *deviceRef, void *base, long dvmDesc[], long dvmhDesc[]);----*/
-    else
-    {
-        for (s = h_first, sg = hgpu_first, sb = base_first, ln = 0; ln < num; s = s->next(), sg = sg->next(), sb = sb->next(), ln++)
-        {
-            e = FillHeader(s_dev_num, sb, s, sg);
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-            if (!ln)
-                stmt->addComment("// Fill device headers");
-        }
-    }
-    /* -------- call  loop_fill_bounds_(loop_ref, lowI, highI, idxI); ----*/
-
-    stmt = new SgCExpStmt(*FillBounds(s_loop_ref, lowI, highI, idxI));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Get bounds");
-
-    /* -------- call  dvmh_change_filled_bounds(low, high, idx, n, dep, type_of_run, idxs); ----*/
-    if (acrossV == 1 || acrossV == 2 || acrossV >= 3)
-    {
-        char *name = new char[16];
-        name[0] = '\0';
-        sprintf(name, "%d", acrossV + loopV);
-        SgSymbol *tmp_1 = new SgSymbol(VARIABLE_NAME, name);
-        name[0] = '\0';
-        sprintf(name, "%d", acrossV);
-        SgSymbol *tmp_2 = new SgSymbol(VARIABLE_NAME, name);
-
-        stmt = new SgCExpStmt(*ChangeFilledBounds(lowI, highI, idxI, tmp_1, tmp_2, type_of_run, bIdxs));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        stmt->addComment("// Swap bounds");
-
-        delete[]name;
-    }
-
-    if (options.isOn(RTC))
-    {
-        /* -------- call  loop_cuda_rtc_set_lang_(loop_ref, lang); ------------*/
-        if (options.isOn(C_CUDA))
-            stmt = new SgCExpStmt(*RtcSetLang(s_loop_ref, 1));
-        else
-            stmt = new SgCExpStmt(*RtcSetLang(s_loop_ref, 0));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        stmt->addComment("// Set CUDA language for launching kernels in RTC");
-    }
-
-    /* -------- call   loop_guess_index_type_(loop_ref); ------------*/
-    stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(idxTypeInKernel), *GuessIndexType(s_loop_ref)));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Guess index type in CUDA kernel");
-
-    SgFunctionCallExp *sizeofL = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-    SgFunctionCallExp *sizeofLL = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-    SgFunctionCallExp *sizeofI = new SgFunctionCallExp(*createNewFunctionSymbol("sizeof"));
-
-    sizeofL->addArg(*new SgKeywordValExp("long"));   //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "long")));
-    sizeofLL->addArg(*new SgKeywordValExp("long long"));  //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "long long")));
-    sizeofI->addArg(*new SgKeywordValExp("int"));    //addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "int")));
-
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LONG")))
-                         &&
-                        SgEqOp(*sizeofL, *sizeofI),
-         *new SgCExpStmt(SgAssignOp(*new SgVarRefExp(idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_INT")))));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LONG")))
-                         &&
-                        SgEqOp(*sizeofL, *sizeofLL),
-         *new SgCExpStmt(SgAssignOp(*new SgVarRefExp(idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_LLONG")))));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    /* -------- call  loop_cuda_get_config_(loop_ref, &shared_mem, &reg_per_th, &threads, &stream, &shared_mem); ------------*/
-    SgFunctionCallExp *tmpFunc = new SgFunctionCallExp(*createNewFunctionSymbol("dim3"));
-    int x = 0, y = 0, z = 0;
-    getDefaultCudaBlock(x, y, z, acrossV, loopV);
-    tmpFunc->addArg(*new SgValueExp(x));
-    tmpFunc->addArg(*new SgValueExp(y));
-    tmpFunc->addArg(*new SgValueExp(z));
-
-    stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_threads), *tmpFunc));
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-    stmt->addComment("// Get CUDA configuration params");
-
-    if (loopV > 0 && red_list)
-    {
-        //OLD VAR
-        //stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*shared_mem), *new SgValueExp(getSizeOf())));
-        //st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        int shared_mem_count = getSizeOf();
-        if (shared_mem_count)
-        {
-            if (!options.isOn(C_CUDA))
-            {
-                e = &SgAssignOp(*new SgVarRefExp(shared_mem), *new SgValueExp(shared_mem_count));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-            else
-            {
-                std::string preproc = std::string("#ifdef ") + fermiPreprocDir;
-                char* tmp = new char[preproc.size() + 1];
-                strcpy(tmp, preproc.data());
-
-                st_end->insertStmtBefore(*PreprocessorDirective(tmp), *st_hedr);
-                e = &SgAssignOp(*new SgVarRefExp(shared_mem), *new SgValueExp(shared_mem_count));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                st_end->insertStmtBefore(*PreprocessorDirective("#else"), *st_hedr);
-                e = &SgAssignOp(*new SgVarRefExp(shared_mem), *new SgValueExp(0));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-                st_end->insertStmtBefore(*PreprocessorDirective("#endif"), *st_hedr);
-            }
-        }
-    }
-    else
-    {
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*shared_mem), *new SgValueExp(0)));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-    }
-
-    string define_name_int = kernel_symb->identifier();
-    string define_name_long = kernel_symb->identifier();
-
-    define_name_int += "_int_regs";
-    define_name_long += "_llong_regs";
-
-    SgStatement *config_int = new SgCExpStmt(*GetConfig(s_loop_ref, shared_mem, new SgSymbol(VARIABLE_NAME, define_name_int.c_str()), s_threads, stream_t, shared_mem));
-    SgStatement *config_long = new SgCExpStmt(*GetConfig(s_loop_ref, shared_mem, new SgSymbol(VARIABLE_NAME, define_name_long.c_str()), s_threads, stream_t, shared_mem));
-
-    stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(*idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_INT"))), *config_int, *config_long);
-    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-    // collect names, all _REGS constant
-    RGname_list = AddNewToSymbList(RGname_list, new SgSymbol(VARIABLE_NAME, define_name_int.c_str(), C_DvmType(), st_hedr));
-    allRegNames.push_back(new SgSymbol(VARIABLE_NAME, define_name_int.c_str()));
-
-    RGname_list = AddNewToSymbList(RGname_list, new SgSymbol(VARIABLE_NAME, define_name_long.c_str(), C_DvmType(), st_hedr));
-    allRegNames.push_back(new SgSymbol(VARIABLE_NAME, define_name_long.c_str()));
-
-    tmpFunc = new SgFunctionCallExp(*createNewFunctionSymbol("dim3"));
-    if (options.isOn(SPEED_TEST_L0))
-    {
-        tmpFunc->addArg(*new SgVarRefExp(s_i));
-        tmpFunc->addArg(*new SgVarRefExp(s_k));
-        tmpFunc->addArg(*new SgValueExp(z));
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_threads), *tmpFunc));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-    }
-
-    if (acrossV == 1) // ACROSS with one dependence: create variables
-    {
-        //SgStatement **stmts = new SgStatement*[MIN(loopV, 3) * 2];
-        for (int k = 0; k < MIN(loopV, 3); ++k)
-        {
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*nums[k]), *new SgRecordRefExp(*s_threads, (char*)s_cuda_var[k])));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-    }
-    else if (acrossV == 2) // ACROSS with two dependence: create variables
-    {
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*nums[0]), *new SgRecordRefExp(*s_threads, "x")));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        for (int k = 1; k < MIN(loopV + 1, 3); ++k)
-        {
-            if (k == 1)
-            {
-                stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*nums[k]), *new SgRecordRefExp(*s_threads, "y")));
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-            else
-            {
-                stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*nums[k]), *new SgRecordRefExp(*s_threads, "z")));
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-        }
-    }
-    else if (acrossV >= 3) // ACROSS with three dependence: create variables
-    {
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*nums[0]), *new SgRecordRefExp(*s_threads, "x")));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*nums[1]), *new SgRecordRefExp(*s_threads, "y")));
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        if (loopV > 0)
-        {
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*nums[2]), *new SgRecordRefExp(*s_threads, "z")));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-    }
-
-    mywarn("  end: create assigns");
-
-    espec = CreateBlocksThreadsSpec(shared_mem, s_blocks, s_threads, stream_t);
-
-    if (acrossV == 1) // ACROSS with one dependence: generate method
-    {
-        mywarn("start: in start across 1");
-        SgFunctionCallExp *f = new SgFunctionCallExp(*createNewFunctionSymbol("dim3"));
-        f->addArg(*new SgValueExp(1));
-        f->addArg(*new SgValueExp(1));
-        f->addArg(*new SgValueExp(1));
-
-        e = &SgAssignOp(*new SgVarRefExp(s_blocks), *f);
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-        stmt->addComment("// Start method");
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[0]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[0].len)));
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        {
-            int *idx = new int[loopV];
-            SgExpression *mult_z = NULL;
-            for (int k = 0; k < MIN(2, loopV); ++k)
-            {
-                SgStatement *st1;
-                idx[k] = loopSymb[k].len;
-
-                e = &SgAssignOp(*new SgVarRefExp(loopBase[k]), *new SgArrayRefExp(*lowI, *new SgValueExp(idx[k])));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                SgFunctionCallExp *f1 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-
-                funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                f1->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(idx[k])));
-                funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(idx[k])) - *new SgArrayRefExp(*highI, *new SgValueExp(idx[k]))));
-                e = &(*funcCall + *f1);
-                st1 = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*num_elems[k]), *e / *f1));
-                st_end->insertStmtBefore(*st1, *st_hedr);
-
-                st1 = new SgCExpStmt(SgAssignOp(*new SgRecordRefExp(*s_blocks, (char *)s_cuda_var[k]),
-                    *new SgVarRefExp(*num_elems[k]) / *new SgVarRefExp(nums[k]) +
-                    SgNeqOp(*new SgVarRefExp(*num_elems[k]) % *new SgVarRefExp(nums[k]), *new SgValueExp(0))));
-                st_end->insertStmtBefore(*st1, *st_hedr);
-
-                e = &SgAssignOp(*new SgRecordRefExp(*s_threads, (char *)s_cuda_var[k]), *new SgVarRefExp(*nums[k]));
-                st_end->insertStmtBefore(*new SgCExpStmt(*e), *st_hedr);
-            }
-
-            if (loopV > 3)
-            {
-                for (int k = 2; k < loopV; ++k)
-                {
-                    SgStatement *st1;
-                    idx[k] = loopSymb[k].len;
-
-                    e = &SgAssignOp(*new SgVarRefExp(loopBase[k]), *new SgArrayRefExp(*lowI, *new SgValueExp(idx[k])));
-                    stmt = new SgCExpStmt(*e);
-                    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                    SgFunctionCallExp *f1 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-
-                    funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                    f1->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(idx[k])));
-                    funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(idx[k])) - *new SgArrayRefExp(*highI, *new SgValueExp(idx[k]))));
-                    e = &(*funcCall + *f1);
-                    st1 = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*num_elems[k + 1]), *e / *f1));
-                    st_end->insertStmtBefore(*st1, *st_hedr);
-
-                    if (k == 2)
-                        mult_z = &(*new SgVarRefExp(*num_elems[k + 1]));
-                    else
-                        mult_z = &((*mult_z) * (*new SgVarRefExp(*num_elems[k + 1])));
-                }
-                stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*num_elems[2]), *mult_z));
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-            else if (loopV > 2)
-            {
-                SgStatement *st1;
-                int k = 2;
-                idx[k] = loopSymb[k].len;
-
-                e = &SgAssignOp(*new SgVarRefExp(loopBase[k]), *new SgArrayRefExp(*lowI, *new SgValueExp(idx[k])));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                SgFunctionCallExp *f1 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-
-                funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                f1->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(idx[k])));
-                funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(idx[k])) - *new SgArrayRefExp(*highI, *new SgValueExp(idx[k]))));
-                e = &(*funcCall + *f1);
-                st1 = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(*num_elems[k]), *e / *f1));
-                st_end->insertStmtBefore(*st1, *st_hedr);
-            }
-
-            if (loopV > 2)
-            {
-                stmt = new SgCExpStmt(SgAssignOp(*new SgRecordRefExp(*s_blocks, (char *)s_cuda_var[2]),
-                    *new SgVarRefExp(*num_elems[2]) / *new SgVarRefExp(nums[2]) +
-                    SgNeqOp(*new SgVarRefExp(*num_elems[2]) % *new SgVarRefExp(nums[2]), *new SgValueExp(0))));
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                e = &SgAssignOp(*new SgRecordRefExp(*s_threads, (char *)s_cuda_var[2]), *new SgVarRefExp(*nums[2]));
-                st_end->insertStmtBefore(*new SgCExpStmt(*e), *st_hedr);
-            }
-
-            delete[]idx;
-        }
-
-        mywarn("  end: out start across 1");
-
-        if (red_list)
-        {
-            mywarn("strat: in red section");
-            if (loopV != 0)
-            {
-                // (blocks.x * blocks.y * blocks.z * threads.x * threads.y * threads.z) / warpSize)
-                e = &SgAssignOp(*new SgVarRefExp(*red_blocks),
-                    (*new SgRecordRefExp(*s_blocks, "x") * *new SgRecordRefExp(*s_blocks, "y") * *new SgRecordRefExp(*s_blocks, "z") *
-                    *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z"))
-                    / *GetWarpSize(s_loop_ref));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-            else
-            {
-                e = &SgAssignOp(*new SgVarRefExp(*red_blocks), *new SgValueExp(1));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_tmp_var_1), *new SgValueExp(1)));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            for (er = red_list, ln = 0; er; er = er->rhs(), ++ln)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(s_tmp_var), *new SgValueExp(ln+1));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                stmt = new SgCExpStmt(*PrepareReduction(s_loop_ref, s_tmp_var, red_blocks, s_tmp_var_1));
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-
-            mywarn("  end: out red section");
-        }
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[0]), *new SgVarRefExp(acrossBase[0])
-            + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len)));
-        stmt = new SgCExpStmt(*e);
-
-
-        if (options.isOn(C_CUDA) || options.isOn(GPU_O0) == false)
-        {
-            SgFunctionCallExp *f1 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            SgFunctionCallExp *f2 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            f1->addArg(*new SgArrayRefExp(*highI, *new SgValueExp(loopAcrossSymb[0].len)) - *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[0].len)));
-            f2->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len)));
-
-            e = &SgAssignOp(*new SgArrayRefExp(*highI, *new SgValueExp(loopAcrossSymb[0].len)), (*f1 + *f2) / *f2);
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-
-        if (options.isOn(GPU_O0))
-        {
-            e = &SgAssignOp(*new SgArrayRefExp(*steps, *new SgArrayRefExp(*bIdxs, *new SgValueExp(0))), *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len)));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            for (int i = 0; i < loopV; ++i)
-            {
-                e = &SgAssignOp(*new SgArrayRefExp(*steps, *new SgArrayRefExp(*bIdxs, *new SgValueExp((int)(i + 1)))), *new SgValueExp(0));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-        }
-        mywarn("start: in adding args section");
-
-        /* args for kernel */
-        {
-            funcCallKernel = CallKernel(kernel_symb, espec);
-
-            for (sg = hgpu_first, sb = base_first, sl = acc_array_list, ln = 0; ln<num; sg = sg->next(), sb = sb->next(), sl = sl->next, ln++)
-            {
-                e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(sl->symb->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sb));
-                funcCallKernel->addArg(*e);
-                for (int i = NumberOfCoeffs(sg); i > 0; i--)
-                    funcCallKernel->addArg(*new SgArrayRefExp(*sg, *new SgValueExp(i)));
-            }
-
-            if (red_list)
-                insertReductionArgs(reduction_ptr, reduction_loc_ptr, reduction_symb, reduction_loc_symb, funcCallKernel, red_blocks, has_red_array);
-
-            for (int k = 0; k < MIN(loopV, 2); ++k)
-                funcCallKernel->addArg(*new SgVarRefExp(num_elems[k]));
-            if (loopV == 3)
-                funcCallKernel->addArg(*new SgVarRefExp(num_elems[2]));
-            else if (loopV > 3)
-            for (int k = 3; k < loopV + 1; ++k)
-                funcCallKernel->addArg(*new SgVarRefExp(num_elems[k]));
-            for (int i = 0; i < acrossV; ++i)
-            {
-                if (i == 0 && options.isOn(RTC)) // across base is modifiable value
-                {
-                    SgVarRefExp *toAdd = new SgVarRefExp(acrossBase[i]);
-                    toAdd->addAttribute(RTC_NOT_REPLACE);
-                    funcCallKernel->addArg(*toAdd);
-                }
-                else
-                    funcCallKernel->addArg(*new SgVarRefExp(acrossBase[i]));
-            }
-            for (int i = 0; i < loopV; ++i)
-                funcCallKernel->addArg(*new SgVarRefExp(loopBase[i]));
-            for (int i = 0; i < acrossV; ++i)
-                funcCallKernel->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[i].len)));
-            for (int i = 0; i < loopV; ++i)
-                funcCallKernel->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopSymb[i].len)));
-
-            for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ln++)  // uses
-            {
-                if (s->attributes() & USE_IN_BIT)
-                    funcCallKernel->addArg(SgDerefOp(*new SgVarRefExp(*s)));   // passing argument by value to kernel
-                else
-                {                                                   // passing argument by reference to kernel
-                    SgType *tp = NULL;
-                    if (s->type()->hasBaseType())
-                        tp = s->type()->baseType();
-                    else
-                        tp = s->type();
-                    e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? tp : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sdev));
-                    funcCallKernel->addArg(*e);
-                    sdev = sdev->next();
-                }
-            }
-            
-            e_all_private_size = sizeOfPrivateArraysInBytes();
-            if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
-            {
-                for (el=private_list, lnp=0; el; el=el->rhs())
-                {
-                     s = el->lhs()->symbol();
-                     if (IS_ARRAY(s))
-                     {                
-                         sarg = new SgSymbol(VARIABLE_NAME, PointerNameForPrivateArray(s), *C_PointerType(C_VoidType()), *st_hedr);
-                         ae = new SgCastExp(*C_PointerType( C_Type(s->type()->baseType())), *new SgVarRefExp(sarg));
-                         funcCallKernel->addArg(*ae);
-                         if (!lnp)
-                             private_first = sarg;
-                         lnp++;        
-                         if (!TestArrayShape(s))
-                         {   
-                             SgExpression **eatr = (SgExpression **) el->lhs()->attributeValue(0, DIM_SIZES);  
-                             SgExpression *ela;
-                             for (ela = *eatr; ela; ela = ela->rhs())
-                                 funcCallKernel->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol())));  
-                             eatr = (SgExpression **) el->lhs()->attributeValue(0, L_BOUNDS);    
-                             for (ela = *eatr; ela; ela = ela->rhs())
-                                 funcCallKernel->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol()))); 
-                         }
-                     }
-                 }
-            }         
-
-            funcCallKernel->addArg(*new SgVarRefExp(type_of_run));
-            for (int i = 0; i < acrossV + loopV; ++i)
-                funcCallKernel->addArg(*new SgArrayRefExp(*bIdxs, *new SgValueExp(i)));
-
-            char *cond_ = new char[strlen("cond_") + strlen(loopAcrossSymb[0].symb->identifier()) + 1];
-            cond_[0] = '\0';
-            strcat(cond_, "cond_");
-            strcat(cond_, loopAcrossSymb[0].symb->identifier());
-
-            if (options.isOn(GPU_O0))
-            {
-                funcCallKernel->addArg(*new SgArrayRefExp(*highI, *new SgValueExp(loopAcrossSymb[0].len)));
-                for (int i = loopV - 1; i >= 0; i--)
-                    funcCallKernel->addArg(*new SgArrayRefExp(*steps, *new SgValueExp(loopSymb[i].len)));
-                funcCallKernel->addArg(*new SgArrayRefExp(*steps, *new SgValueExp(loopAcrossSymb[0].len)));
-            }
-
-        }
-        mywarn("  end: out adding args section");
-
-        stmt = createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks);
-
-        if (options.isOn(GPU_O0))
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-        {
-            SgSymbol *tmpV = new SgSymbol(VARIABLE_NAME, "int tmpV");
-            SgSymbol *tmpV1 = new SgSymbol(VARIABLE_NAME, "tmpV");
-            SgExprListExp *expr = new SgExprListExp();
-            expr->setLhs(SgAssignOp(*new SgVarRefExp(acrossBase[0]), *new SgVarRefExp(acrossBase[0]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len))));
-            expr->setRhs(new SgExprListExp());
-            expr->rhs()->setLhs(SgAssignOp(*new SgVarRefExp(tmpV1), *new SgVarRefExp(tmpV1) + *new SgValueExp(1)));
-            SgForStmt *simple;
-            simple = new SgForStmt(&SgAssignOp(*new SgVarRefExp(tmpV), *new SgValueExp(0)), &(*new SgVarRefExp(tmpV1) < *new SgArrayRefExp(*highI, *new SgValueExp(loopAcrossSymb[0].len))), expr, stmt);
-            st_end->insertStmtBefore(*simple);
-            stmt = simple;
-        }
-        stmt->addComment("// GPU execution");
-        if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
-        {
-            e_totalThreads = &(*new SgRecordRefExp(*s_blocks, "x") * *new SgRecordRefExp(*s_blocks, "y") * *new SgRecordRefExp(*s_blocks, "z") * *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z"));
-            GetMemoryForPrivateArrays(private_first, s_loop_ref, lnp, stmt, st_hedr, e_totalThreads);
-        }
-
-    }
-    else if (acrossV == 2) // ACROSS with two dependence: generate method
-    {
-        // attention!! need to add flag for support all cases
-        if (loopV != 0)
-        {
-            SgSymbol *tmp = nums[0];
-            nums[0] = nums[1];
-            nums[1] = tmp;
-
-            const char *tmpS = s_cuda_var[0];
-            s_cuda_var[0] = s_cuda_var[1];
-            s_cuda_var[1] = tmpS;
-        }
-
-        mywarn("strat: alloc mem");
-        {
-            int idx[2];
-            SgStatement *st1, *st2;
-            idx[1] = loopAcrossSymb[1].len;
-            idx[0] = loopAcrossSymb[0].len;
-            SgFunctionCallExp *f1 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-
-            funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            f1->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(idx[0])));
-            funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(idx[0])) - *new SgArrayRefExp(*highI, *new SgValueExp(idx[0]))));
-            e = &(*funcCall + *new SgValueExp(1));
-            st1 = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(M), *e / *f1 + SgNeqOp(*e % *f1, *new SgValueExp(0))));
-
-            funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            f1 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            f1->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(idx[1])));
-            funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(idx[1])) - *new SgArrayRefExp(*highI, *new SgValueExp(idx[1]))));
-            e = &(*funcCall + *new SgValueExp(1));
-            st2 = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(N), *e / *f1 + SgNeqOp(*e % *f1, *new SgValueExp(0))));
-
-            st_end->insertStmtBefore(*st1, *st_hedr);
-            st_end->insertStmtBefore(*st2, *st_hedr);
-            st1->addComment("// Count used variables");
-        }
-
-        // count num_elem_y and num_elem_z
-        if (loopV > 0)
-        {
-            SgFunctionCallExp *tempF = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(loopSymb[0].len)) - *new SgArrayRefExp(*highI, *new SgValueExp(loopSymb[0].len))));
-            tempF->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopSymb[0].len)));
-            e = &SgAssignOp(*new SgVarRefExp(num_elems[1]), (*funcCall + *new SgValueExp(1)) / *tempF + SgNeqOp((*funcCall + *new SgValueExp(1)) % *tempF, *new SgValueExp(0)));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            SgExpression **e_z = new SgExpression*[loopV - 1];
-            for (int k = 0; k < loopV - 1; ++k)
-            {
-                SgFunctionCallExp *tempF = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(loopSymb[k + 1].len)) - *new SgArrayRefExp(*highI, *new SgValueExp(loopSymb[k + 1].len))));
-                tempF->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopSymb[k + 1].len)));
-                e_z[k] = &((*funcCall + *new SgValueExp(1)) / *tempF + SgNeqOp((*funcCall + *new SgValueExp(1)) % *tempF, *new SgValueExp(0)));
-            }
-            if (loopV > 2)
-            {
-                for (int k = 0; k < loopV - 1; ++k)
-                {
-                    e = &SgAssignOp(*new SgVarRefExp(num_elems[k + 3]), *e_z[k]);
-                    stmt = new SgCExpStmt(*e);
-                    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                    if (k == 0)
-                        e_z[0] = new SgVarRefExp(num_elems[k + 3]);
-                    else
-                        e_z[0] = &(*(e_z[0]) * (*new SgVarRefExp(num_elems[k + 3])));
-                }
-            }
-
-            if (loopV > 1)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(num_elems[2]), *e_z[0]);
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-            delete[]e_z;
-        }
-        funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("dim3"));
-        funcCall->addArg(*new SgVarRefExp(nums[0]));
-        for (int k = 1; k < MIN(loopV + 1, 3); ++k)
-        {
-            funcCall->addArg(*new SgVarRefExp(nums[k]));
-        }
-
-        e = &SgAssignOp(*new SgVarRefExp(s_blocks), *funcCall);
-        st_end->insertStmtBefore(*new SgCExpStmt(*e), *st_hedr);
-
-        for (int k = 1; k < MIN(loopV + 1, 3); ++k)
-        {
-            e = new SgExpression(NOTEQL_OP, &(*new SgVarRefExp(num_elems[k]) % *new SgVarRefExp(nums[k])), new SgValueExp(0), s);
-            e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[k]), *new SgVarRefExp(num_elems[k]) / *new SgVarRefExp(nums[k]) + *e);
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-
-        funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("MIN"));
-        funcCall->addArg(*new SgVarRefExp(M));
-        funcCall->addArg(*new SgVarRefExp(N));
-        e = &SgAssignOp(*new SgVarRefExp(q), *funcCall);
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        mywarn("  end: alloc mem");
-
-        if (red_list)
-        {
-            mywarn("strat: in red section");
-            if (loopV == 0)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(*red_blocks), *new SgVarRefExp(q));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-            else if (loopV == 1)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(*red_blocks), (*new SgVarRefExp(q) / *new SgVarRefExp(nums[0]) +
-                                SgNeqOp(*new SgVarRefExp(q) % *new SgVarRefExp(nums[0]), *new SgValueExp(0))) *
-                                *new SgRecordRefExp(*s_blocks, "y") *
-                                *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *GetWarpSize(s_loop_ref));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-            else
-            {
-                e = &SgAssignOp(*new SgVarRefExp(*red_blocks), (*new SgVarRefExp(q) / *new SgVarRefExp(nums[0]) +
-                                SgNeqOp(*new SgVarRefExp(q) % *new SgVarRefExp(nums[0]), *new SgValueExp(0))) *
-                                *new SgRecordRefExp(*s_blocks, "y") * *new SgRecordRefExp(*s_blocks, "z") *
-                                *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *GetWarpSize(s_loop_ref));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-
-            e = &SgAssignOp(*new SgVarRefExp(s_tmp_var_1), *new SgValueExp(1));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            for (er = red_list, ln = 0; er; er = er->rhs(), ++ln)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(s_tmp_var), *new SgValueExp(ln+1));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                stmt = new SgCExpStmt(*PrepareReduction(s_loop_ref, s_tmp_var, red_blocks, s_tmp_var_1));
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-
-            mywarn("  end: out red section");
-        }
-        createPrivatePointers(private_first, lnp, st_hedr, e_all_private_size);
-        GetMemoryForPrivateArrays (private_first, s_loop_ref, lnp, st_end, st_hedr, new SgVarRefExp(q));
-        mywarn("strat: init bases");
-        // init bases
-        for (int i = 0; i < acrossV; ++i)
-        {
-            e = &SgAssignOp(*new SgVarRefExp(acrossBase[i]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[i].len)));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-            if (i == 0)
-                stmt->addComment("// Start SOR method here");
-        }
-        for (int i = 0; i < loopV; ++i)
-        {
-            e = &SgAssignOp(*new SgVarRefExp(loopBase[i]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopSymb[i].len)));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-
-        mywarn("  end: init bases");
-        mywarn("start: block1");
-
-        e = &SgAssignOp(*new SgVarRefExp(diag), *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-        st_end->insertStmtBefore(*stmt, *st_hedr);
-
-        e = &SgAssignOp(*new SgVarRefExp(diag), *new SgVarRefExp(diag) + *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-
-        SgWhileStmt *while_st = new SgWhileStmt(*new SgVarRefExp(diag) <= *new SgVarRefExp(q), *stmt);
-        st_end->insertStmtBefore(*while_st, *st_hedr);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[0]), *new SgVarRefExp(acrossBase[0]) +
-            *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len)));
-        stmt = new SgCExpStmt(*e);
-
-
-        while_st->insertStmtAfter(*stmt);
-        /* --------- add argument list to kernel call ----*/
-        createArgsForKernelForTwoDeps(funcCallKernel, kernel_symb, espec, sg, hgpu_first, sb, base_first, sl, ln, num, e,
-                                      reduction_ptr, reduction_loc_ptr, reduction_symb, reduction_loc_symb, red_blocks,
-                                      has_red_array, diag, loopV, num_elems, acrossV, acrossBase, loopBase, idxI,
-                                      loopAcrossSymb, loopSymb, s, uses_first, sdev, scalar_first, uses_num, dvm_array_headers,
-                                      addressingParams, outTypeOfTransformation, type_of_run, bIdxs, private_first, lnp);
-
-        stmt = createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks);
-        while_st->insertStmtAfter(*stmt);
-
-        mywarn("  end: block1");
-        mywarn("start: block2");
-
-        ex = new SgExpression(NOTEQL_OP, &(*new SgVarRefExp(diag) % *new SgVarRefExp(nums[0])), new SgValueExp(0), s);
-        e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[0]), *new SgVarRefExp(diag) / *new SgVarRefExp(nums[0]) + *ex);
-        stmt = new SgCExpStmt(*e);
-        while_st->insertStmtAfter(*stmt);
-
-        e = &SgAssignOp(*new SgVarRefExp(*diag), *new SgVarRefExp(*diag) + *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-
-        funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-        funcCall->addArg(*new SgVarRefExp(*M) - *new SgVarRefExp(*N));
-        SgWhileStmt *while_st1 = new SgWhileStmt(*new SgVarRefExp(diag) < *funcCall, *stmt);
-        SgWhileStmt *while_st2 = new SgWhileStmt(*new SgVarRefExp(diag) < *funcCall, stmt->copy());
-        SgWhileStmt *while_st3 = new SgWhileStmt(*new SgVarRefExp(diag) < *new SgVarRefExp(M) + *new SgVarRefExp(N), stmt->copy());
-        SgWhileStmt *while_st4 = new SgWhileStmt(*new SgVarRefExp(diag) < *new SgVarRefExp(M) + *new SgVarRefExp(N), stmt->copy());
-        SgIfStmt *if_st = new SgIfStmt(*new SgVarRefExp(*N) < *new SgVarRefExp(*M), *while_st3, *while_st4);
-        st_end->insertStmtBefore(*if_st, *st_hedr);
-
-        e = &SgAssignOp(*new SgVarRefExp(*elem), *new SgVarRefExp(q) - *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-        if_st->insertStmtAfter(*stmt);
-
-        if_st->falseBody()->insertStmtBefore(stmt->copy());
-        if_st->falseBody()->insertStmtBefore(*while_st2);
-        if_st->falseBody()->insertStmtBefore(*new SgCExpStmt(SgAssignOp(*new SgVarRefExp(diag), *new SgValueExp(0))));
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[0]), *new SgVarRefExp(acrossBase[0])
-            - *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len)));
-        stmt = new SgCExpStmt(*e);
-        if_st->insertStmtAfter(*stmt);
-        if_st->falseBody()->insertStmtBefore(stmt->copy());
-
-        e = &SgAssignOp(*new SgVarRefExp(diag), *new SgVarRefExp(q) + *funcCall + *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-        if_st->lexNext()->insertStmtAfter(*stmt);
-        if_st->falseBody()->lexNext()->lexNext()->lexNext()->insertStmtAfter(stmt->copy(), *if_st);
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[1].len)) +
-            *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)));
-        stmt = new SgCExpStmt(*e);
-        if_st->insertStmtAfter(*stmt);
-        if_st->falseBody()->insertStmtBefore(stmt->copy());
-
-        if_st->insertStmtAfter(*while_st1);
-        if_st->insertStmtAfter(*new SgCExpStmt(SgAssignOp(*new SgVarRefExp(diag), *new SgValueExp(0))));
-
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[0]), *new SgVarRefExp(acrossBase[0]) +
-            *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len)));
-        stmt = new SgCExpStmt(*e);
-        while_st1->insertStmtAfter(*stmt);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgVarRefExp(acrossBase[1]) +
-            *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)));
-        stmt = new SgCExpStmt(*e);
-
-        while_st2->insertStmtAfter(*stmt);
-        while_st3->insertStmtAfter(stmt->copy());
-        while_st4->insertStmtAfter(stmt->copy());
-
-        mywarn("  end: block2");
-        mywarn("start: block3");
-
-        e = &SgAssignOp(*new SgVarRefExp(*elem), *new SgVarRefExp(*elem) - *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-        while_st3->lastExecutable()->insertStmtAfter(*stmt);
-        while_st4->lastExecutable()->insertStmtAfter(stmt->copy());
-
-        /* --------- add argument list to kernel call ----*/
-        createArgsForKernelForTwoDeps(funcCallKernel, kernel_symb, espec, sg, hgpu_first, sb, base_first, sl, ln, num, e,
-                                      reduction_ptr, reduction_loc_ptr, reduction_symb, reduction_loc_symb, red_blocks,
-                                      has_red_array, q, loopV, num_elems, acrossV, acrossBase, loopBase, idxI,
-                                      loopAcrossSymb, loopSymb, s, uses_first, sdev, scalar_first, uses_num, dvm_array_headers,
-                                      addressingParams, outTypeOfTransformation, type_of_run, bIdxs, private_first, lnp);
-
-        while_st1->insertStmtAfter(*createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks));
-        while_st2->insertStmtAfter(*createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks));
-
-        mywarn("  end: block3");
-
-        /* --------- add argument list to kernel call ----*/
-        createArgsForKernelForTwoDeps(funcCallKernel, kernel_symb, espec, sg, hgpu_first, sb, base_first, sl, ln, num, e,
-                                      reduction_ptr, reduction_loc_ptr, reduction_symb, reduction_loc_symb, red_blocks,
-                                      has_red_array, elem, loopV, num_elems, acrossV, acrossBase, loopBase, idxI,
-                                      loopAcrossSymb, loopSymb, s, uses_first, sdev, scalar_first, uses_num, dvm_array_headers,
-                                      addressingParams, outTypeOfTransformation, type_of_run, bIdxs, private_first, lnp);
-
-        while_st3->insertStmtAfter(*createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks));
-        while_st4->insertStmtAfter(*createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks));
-
-
-        ex = new SgExpression(MOD_OP, new SgVarRefExp(q), new SgVarRefExp(nums[0]), s);
-        ex = new SgExpression(NOTEQL_OP, ex, new SgValueExp(0), s);
-        e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[0]), *new SgVarRefExp(q) / *new SgVarRefExp(nums[0]) + *ex);
-        while_st1->insertStmtAfter(*new SgCExpStmt(*e));
-        while_st2->insertStmtAfter(*new SgCExpStmt(*e));
-
-        SgExpression *ex1 = &(*new SgVarRefExp(*elem));
-        ex = new SgExpression(MOD_OP, ex1, new SgVarRefExp(nums[0]), s);
-        ex = new SgExpression(NOTEQL_OP, ex, new SgValueExp(0), s);
-        e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[0]), *ex1 / *new SgVarRefExp(nums[0]) + *ex);
-        while_st3->insertStmtAfter(*new SgCExpStmt(*e));
-        while_st4->insertStmtAfter(*new SgCExpStmt(*e));
-    }
-    else if (acrossV >= 3) // ACROSS with three or more dependence: generate method
-    {
-        // attention!! need to add flag for support all cases
-        if (loopV != 0)
-        {
-            SgSymbol *tmp = nums[0];
-            nums[0] = nums[2];
-            nums[2] = tmp;
-
-            const char *tmpS = s_cuda_var[0];
-            s_cuda_var[0] = s_cuda_var[2];
-            s_cuda_var[2] = tmpS;
-        }
-
-        SgExpression* firstElem = new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len));
-        SgExpression* secondElem = new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len));
-
-        SgIfStmt* if_stSwap = new SgIfStmt(*new SgVarRefExp(M1) > *new SgVarRefExp(M2), *new SgCExpStmt(*firstElem ^= *secondElem ^= *firstElem ^= *secondElem));
-
-        /* --------- add argument list to kernel call ----*/
-        {
-            funcCallKernel = CallKernel(kernel_symb, espec);
-            for (sg = hgpu_first, sb = base_first, sl = acc_array_list, ln = 0; ln<num; sg = sg->next(), sb = sb->next(), sl = sl->next, ln++)
-            {
-                e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? C_Type(sl->symb->type()) : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sb));
-                funcCallKernel->addArg(*e);
-                for (int i = NumberOfCoeffs(sg); i>0; i--)
-                    funcCallKernel->addArg(*new SgArrayRefExp(*sg, *new SgValueExp(i)));
-            }
-            if (red_list)
-                insertReductionArgs(reduction_ptr, reduction_loc_ptr, reduction_symb, reduction_loc_symb, funcCallKernel, red_blocks, has_red_array);
-
-            for (int i = 0; i < acrossV; ++i)
-            {
-                if (options.isOn(RTC)) // across base is modifiable value
-                {
-                    SgVarRefExp *toAdd = new SgVarRefExp(acrossBase[i]);
-                    toAdd->addAttribute(RTC_NOT_REPLACE);
-                    funcCallKernel->addArg(*toAdd);
-                }
-                else
-                    funcCallKernel->addArg(*new SgVarRefExp(acrossBase[i]));
-            }
-            for (int i = 0; i < loopV; ++i)
-                funcCallKernel->addArg(*new SgVarRefExp(loopBase[i]));
-            for (int i = 0; i < acrossV; ++i)
-                funcCallKernel->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[i].len)));
-            for (int i = 0; i < loopV; ++i)
-                funcCallKernel->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopSymb[i].len)));
-
-            for (s = uses_first, sdev = scalar_first, ln = 0; ln < uses_num; s = s->next(), ln++)  // uses
-            {
-                if (s->attributes() & USE_IN_BIT)
-                    funcCallKernel->addArg(SgDerefOp(*new SgVarRefExp(*s)));   // passing argument by value to kernel
-                else
-                {                                                   // passing argument by reference to kernel
-                    SgType *tp = NULL;
-                    if (s->type()->hasBaseType())
-                        tp = s->type()->baseType();
-                    else
-                        tp = s->type();
-                    e = new SgCastExp(*C_PointerType(options.isOn(C_CUDA) ? tp : new SgDescriptType(*SgTypeChar(), BIT_SIGNED)), *new SgVarRefExp(sdev));
-                    funcCallKernel->addArg(*e);
-                    sdev = sdev->next();
-                }
-            }
-            createPrivatePointers(private_first, lnp, st_hedr, e_all_private_size);
-            if (options.isOn(C_CUDA) && private_first) // there are big private arrays
-            {
-                SgSymbol *sp;
-                for (sp = private_first, el = private_list, ln = 0;  ln < lnp; sp = sp->next(), el = el->rhs(), ln++) 
-                {            
-                    while (!IS_ARRAY(el->lhs()->symbol()))
-                        el = el->rhs();
-                    s = el->lhs()->symbol(); 
-                    ae = new SgCastExp(*C_PointerType( C_Type(s->type()->baseType())), *new SgVarRefExp(sp));
-                    funcCallKernel->addArg(*ae);
-                    if (!TestArrayShape(s))
-                    {   
-                        SgExpression **eatr = (SgExpression **) el->lhs()->attributeValue(0, DIM_SIZES);  
-                        SgExpression *ela;
-                        for (ela = *eatr; ela; ela = ela->rhs())
-                            funcCallKernel->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol())));  
-                        eatr = (SgExpression **) el->lhs()->attributeValue(0, L_BOUNDS);    
-                        for (ela = *eatr; ela; ela = ela->rhs())
-                            funcCallKernel->addArg(SgDerefOp(*new SgVarRefExp(ela->lhs()->lhs()->symbol()))); 
-                    }
-                }
-            }         
-
-            funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("MIN"));
-            funcCall->addArg(*new SgVarRefExp(M1));
-            funcCall->addArg(*new SgVarRefExp(M2));
-
-            if (options.isOn(RTC)) // diag and SE are modifiable value
-            {
-                SgVarRefExp *toAdd = new SgVarRefExp(diag);
-                toAdd->addAttribute(RTC_NOT_REPLACE);
-                funcCallKernel->addArg(*toAdd);
-
-                toAdd = new SgVarRefExp(SE);
-                toAdd->addAttribute(RTC_NOT_REPLACE);
-                funcCallKernel->addArg(*toAdd);
-            }
-            else
-            {
-                funcCallKernel->addArg(*new SgVarRefExp(diag));
-                funcCallKernel->addArg(*new SgVarRefExp(SE));
-            }
-
-            funcCallKernel->addArg(*new SgVarRefExp(var1));
-            funcCallKernel->addArg(*new SgVarRefExp(var2));
-            funcCallKernel->addArg(*new SgVarRefExp(var3));
-            funcCallKernel->addArg(*new SgVarRefExp(Emax));
-            funcCallKernel->addArg(*new SgVarRefExp(Emin));
-            funcCallKernel->addArg(*funcCall);
-            funcCallKernel->addArg(*new SgVarRefExp(M1) > *new SgVarRefExp(M2));
-
-            if (loopV > 0)
-                for (int i = 0; i < loopV; ++i)
-                    funcCallKernel->addArg(*new SgVarRefExp(num_elems[i]));
-
-            if (options.isOn(AUTO_TFM))
-            {
-                for (size_t i = 0; i < dvm_array_headers.size(); ++i)
-                {
-                    funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(0)));
-                    funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(1)));
-                    funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(2)));
-                    funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(3)));
-                    funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(4)));
-                    funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(5)));
-                    funcCallKernel->addArg(*new SgArrayRefExp(*addressingParams[i], *new SgValueExp(6)));
-                    funcCallKernel->addArg(*new SgVarRefExp(*outTypeOfTransformation[i]));
-                }
-            }
-            funcCallKernel->addArg(*new SgVarRefExp(type_of_run));
-            for (int i = 0; i < acrossV + loopV; ++i)
-                funcCallKernel->addArg(*new SgArrayRefExp(*bIdxs, *new SgValueExp(i)));
-        }
-
-        {
-            int idx[3];
-            SgStatement *st1;
-            for (int i = 0; i < 3; ++i)
-                idx[i] = loopAcrossSymb[i].len;
-
-            for (int i = 0; i < 3; ++i)
-            {
-                SgFunctionCallExp *f1 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                st1 = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(M1), *e / *f1 + SgNeqOp(*e % *f1, *new SgValueExp(0))));
-                f1->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(idx[i])));
-                funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(idx[i])) - *new SgArrayRefExp(*highI, *new SgValueExp(idx[i]))));
-                e = &(*funcCall + *new SgValueExp(1));
-
-                if (i == 0)
-                    st1 = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(M1), *e / *f1 + SgNeqOp(*e % *f1, *new SgValueExp(0))));
-                else if (i == 1)
-                    st1 = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(M2), *e / *f1 + SgNeqOp(*e % *f1, *new SgValueExp(0))));
-                else
-                    st1 = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(M3), *e / *f1 + SgNeqOp(*e % *f1, *new SgValueExp(0))));
-                st_end->insertStmtBefore(*st1, *st_hedr);
-                if (i == 0)
-                    st1->addComment("// Count used variables");
-            }
-
-            SgFunctionCallExp *f1 = new SgFunctionCallExp(*createNewFunctionSymbol("MIN"));
-            SgFunctionCallExp *f2 = new SgFunctionCallExp(*createNewFunctionSymbol("MIN"));
-            f1->addArg(*new SgVarRefExp(M1));
-            f1->addArg(*new SgVarRefExp(M2));
-            f2->addArg(*f1);
-            f2->addArg(*new SgVarRefExp(M3));
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(Allmin), *f2));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            f2 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            f2->addArg(*new SgVarRefExp(M1) - *new SgVarRefExp(M2));
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(Emin), *f1));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(Emax), *f1 + *f2 + *new SgValueExp(1)));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-        // count num_elem_z
-        if (loopV > 0)
-        {
-            SgFunctionCallExp *tempF = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(loopSymb[0].len)) - *new SgArrayRefExp(*highI, *new SgValueExp(loopSymb[0].len))));
-            tempF->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopSymb[0].len)));
-            e = &SgAssignOp(*new SgVarRefExp(num_elems[0]), (*funcCall + *new SgValueExp(1)) / *tempF + SgNeqOp((*funcCall + *new SgValueExp(1)) % *tempF, *new SgValueExp(0)));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            if (loopV > 1)
-            {
-                SgExpression **e_z = new SgExpression*[loopV - 1];
-                for (int k = 0; k < loopV - 1; ++k)
-                {
-                    SgFunctionCallExp *tempF = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                    funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                    funcCall->addArg((*new SgArrayRefExp(*lowI, *new SgValueExp(loopSymb[k + 1].len)) - *new SgArrayRefExp(*highI, *new SgValueExp(loopSymb[k + 1].len))));
-                    tempF->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopSymb[k + 1].len)));
-                    e_z[k] = &((*funcCall + *new SgValueExp(1)) / *tempF + SgNeqOp((*funcCall + *new SgValueExp(1)) % *tempF, *new SgValueExp(0)));
-                }
-
-                for (int k = 0; k < loopV - 1; ++k)
-                {
-                    e = &SgAssignOp(*new SgVarRefExp(num_elems[k + 1]), *e_z[k]);
-                    stmt = new SgCExpStmt(*e);
-                    st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                    if (k == 0)
-                        e_z[0] = &(*new SgVarRefExp(num_elems[0]) * (*new SgVarRefExp(num_elems[k + 1])));
-                    else
-                        e_z[0] = &(*(e_z[0]) * (*new SgVarRefExp(num_elems[k + 1])));
-                }
-
-                e = &SgAssignOp(*new SgVarRefExp(num_elems[loopV]), *e_z[0]);
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                delete[]e_z;
-            }
-            else
-            {
-                e = &SgAssignOp(*new SgVarRefExp(num_elems[loopV]), *new SgVarRefExp(num_elems[0]));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-        }
-
-        funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("dim3"));
-        if (loopV > 0)
-        {
-            funcCall->addArg(*new SgVarRefExp(num_elems[loopV]) / *new SgVarRefExp(*nums[2]) + SgNeqOp(*new SgVarRefExp(num_elems[loopV]) % *new SgVarRefExp(*nums[2]), *new SgValueExp(0)));
-            funcCall->addArg(*new SgVarRefExp(nums[1]));
-            funcCall->addArg(*new SgVarRefExp(nums[0]));
-        }
-        else
-        {
-            funcCall->addArg(*new SgVarRefExp(nums[0]));
-            funcCall->addArg(*new SgVarRefExp(nums[1]));
-        }
-
-        e = &SgAssignOp(*new SgVarRefExp(s_blocks), *funcCall);
-        st_end->insertStmtBefore(*new SgCExpStmt(*e), *st_hedr);
-
-        if (red_list)
-        {
-            SgFunctionCallExp* f_m1 = new SgFunctionCallExp(*createNewFunctionSymbol("MAX"));
-            SgFunctionCallExp* f_m2 = new SgFunctionCallExp(*createNewFunctionSymbol("MAX"));
-            f_m1->addArg(*new SgVarRefExp(M1));
-            f_m1->addArg(*new SgVarRefExp(M2));
-            f_m2->addArg(*f_m1);
-            f_m2->addArg(*new SgVarRefExp(M3));
-
-            mywarn("strat: in red section");
-            if (loopV == 0)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(*red_blocks), *new SgVarRefExp(Emin) * *f_m2);
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-            else if (loopV > 0)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(*red_blocks), (*new SgVarRefExp(Emin) / *new SgVarRefExp(nums[0]) +
-                                SgNeqOp(*new SgVarRefExp(Emin) % *new SgVarRefExp(nums[0]), *new SgValueExp(0))) *
-                                (*f_m2 / *new SgVarRefExp(nums[1]) + SgNeqOp(*f_m2 % *new SgVarRefExp(nums[1]), *new SgValueExp(0)))
-                                * *new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[2]) *
-                                *new SgRecordRefExp(*s_threads, "x") * *new SgRecordRefExp(*s_threads, "y") * *new SgRecordRefExp(*s_threads, "z") / *GetWarpSize(s_loop_ref));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(s_tmp_var_1), *new SgValueExp(1)));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            for (er = red_list, ln = 0; er; er = er->rhs(), ++ln)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(s_tmp_var), *new SgValueExp(ln+1));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-
-                stmt = new SgCExpStmt(*PrepareReduction(s_loop_ref, s_tmp_var, red_blocks, s_tmp_var_1));
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-
-            mywarn("  end: out red section");
-        }
-        
-        if (options.isOn(C_CUDA) && private_first) 
-        {
-            SgFunctionCallExp *f1 = new SgFunctionCallExp(*createNewFunctionSymbol("MAX"));
-            SgFunctionCallExp *f2 = new SgFunctionCallExp(*createNewFunctionSymbol("MAX"));
-            f1->addArg(*new SgVarRefExp(M1));
-            f1->addArg(*new SgVarRefExp(M2));
-            f2->addArg(*f1);
-            f2->addArg(*new SgVarRefExp(M3));
-            e_totalThreads = &(*new SgVarRefExp(Emin) * *f2);
-            GetMemoryForPrivateArrays (private_first, s_loop_ref, lnp, st_end, st_hedr, e_totalThreads);
-        }
-
-        int flag_comment = 0;
-        for (int i = 3; i < acrossV; ++i)
-        {
-            e = &SgAssignOp(*new SgVarRefExp(acrossBase[i]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[i].len)));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-            if (i - 3 == 0)
-            {
-                stmt->addComment("// Start method");
-                flag_comment = 1;
-            }
-        }
-
-        if (acrossV == 3)
-        {
-            for (int i = 0; i < MIN(3, acrossV); ++i)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(acrossBase[i]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[i].len)));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-                if (i == 0 && flag_comment == 0)
-                    stmt->addComment("// Start method");
-            }
-
-            for (int i = 0; i < loopV; ++i)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(loopBase[i]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopSymb[i].len)));
-                stmt = new SgCExpStmt(*e);
-                st_end->insertStmtBefore(*stmt, *st_hedr);
-            }
-        }
-        SgWhileStmt *main_while_st = NULL;
-        SgStatement *main_stmt = NULL;
-        bool first = true;
-        if (acrossV > 3)
-        {
-            SgWhileStmt *tmp;
-            for (int i = 3; i < acrossV; ++i)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(acrossBase[i]), *new SgVarRefExp(acrossBase[i]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[i].len)));
-                stmt = new SgCExpStmt(*e);
-                SgExpression *e1 = NULL;
-                SgFunctionCallExp *func = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-                func->addArg(*new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[i].len)));
-                e1 = &(*new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[i].len)) / *func);
-                if (first)
-                {
-                    main_while_st = new SgWhileStmt(*e1 * *new SgVarRefExp(acrossBase[i]) <= *e1 * *new SgArrayRefExp(*highI, *new SgValueExp(loopAcrossSymb[i].len)), *stmt);
-                    first = false;
-                }
-                else
-                {
-                    tmp = new SgWhileStmt(*new SgVarRefExp(acrossBase[i]) <= *new SgArrayRefExp(*highI, *new SgValueExp(loopAcrossSymb[i].len)), *stmt);
-                    main_while_st->insertStmtAfter(*tmp);
-                    main_while_st = tmp;
-                }
-                main_stmt = stmt;
-            }
-            st_end->insertStmtBefore(*main_while_st, *st_hedr);
-
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(SE), *new SgValueExp(1)));
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(diag), *new SgValueExp(1)));
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(var1), *new SgValueExp(1)));
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(var2), *new SgValueExp(0)));
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-            stmt = new SgCExpStmt(SgAssignOp(*new SgVarRefExp(var3), *new SgValueExp(0)));
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-            for (int i = 0; i < MIN(3, acrossV); ++i)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(acrossBase[i]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[i].len)));
-                stmt = new SgCExpStmt(*e);
-                main_stmt->insertStmtBefore(*stmt, *main_while_st);
-            }
-
-            for (int i = 0; i < loopV; ++i)
-            {
-                e = &SgAssignOp(*new SgVarRefExp(loopBase[i]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopSymb[i].len)));
-                stmt = new SgCExpStmt(*e);
-                main_stmt->insertStmtBefore(*stmt, *main_while_st);
-            }
-        }
-
-        e = &SgAssignOp(*new SgVarRefExp(diag), *new SgVarRefExp(diag) + *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-
-        SgWhileStmt *while_st = new SgWhileStmt(*new SgVarRefExp(diag) <= *new SgVarRefExp(Allmin), *stmt);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*while_st, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*while_st, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[2]), *new SgVarRefExp(acrossBase[2]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[2].len)));
-        stmt = new SgCExpStmt(*e);
-        while_st->insertStmtAfter(*stmt);
-        while_st->insertStmtAfter(*createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks));
-
-        e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[1]), *new SgVarRefExp(diag) / *new SgVarRefExp(nums[1]) + SgNeqOp(*new SgVarRefExp(diag) % *new SgVarRefExp(nums[1]), *new SgValueExp(0)));
-        stmt = new SgCExpStmt(*e);
-        while_st->insertStmtAfter(*stmt);
-
-        e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[0]), *new SgVarRefExp(diag) / *new SgVarRefExp(nums[0]) + SgNeqOp(*new SgVarRefExp(diag) % *new SgVarRefExp(nums[0]), *new SgValueExp(0)));
-        stmt = new SgCExpStmt(*e);
-        while_st->insertStmtAfter(*stmt);
-
-        e = &SgAssignOp(*new SgVarRefExp(var1), *new SgValueExp(0));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(var2), *new SgValueExp(0));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(var3), *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        { // while for if block
-            e = &SgAssignOp(*new SgVarRefExp(diag), *new SgVarRefExp(diag) + *new SgValueExp(1));
-            stmt = new SgCExpStmt(*e);
-
-            SgWhileStmt *while_st = new SgWhileStmt(SgNeqOp(*new SgVarRefExp(diag) - *new SgValueExp(1), *new SgVarRefExp(M3)), *stmt);
-
-            e = &SgAssignOp(*new SgVarRefExp(acrossBase[2]), *new SgVarRefExp(acrossBase[2]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[2].len)));
-            stmt = new SgCExpStmt(*e);
-            while_st->insertStmtAfter(*stmt, *while_st);
-
-            while_st->insertStmtAfter(if_stSwap->copy(), *while_st);
-            while_st->insertStmtAfter(*createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks));
-            while_st->insertStmtAfter(if_stSwap->copy(), *while_st);
-
-            e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[1]), *new SgVarRefExp(diag) / *new SgVarRefExp(nums[1]) + SgNeqOp(*new SgVarRefExp(diag) % *new SgVarRefExp(nums[1]), *new SgValueExp(0)));
-            stmt = new SgCExpStmt(*e);
-            while_st->insertStmtAfter(*stmt);
-
-            e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[0]), *new SgVarRefExp(Emin) / *new SgVarRefExp(nums[0]) + SgNeqOp(*new SgVarRefExp(Emin) % *new SgVarRefExp(nums[0]), *new SgValueExp(0)));
-            stmt = new SgCExpStmt(*e);
-            while_st->insertStmtAfter(*stmt);
-
-            SgIfStmt *if_st = new SgIfStmt(*new SgVarRefExp(M3) > *new SgVarRefExp(Emin), *while_st);
-            if (acrossV == 3)
-                st_end->insertStmtBefore(*if_st, *st_hedr);
-            else
-                main_stmt->insertStmtBefore(*if_st, *main_while_st);
-
-            e = &SgAssignOp(*new SgVarRefExp(*diag), *new SgVarRefExp(*Allmin) + *new SgValueExp(1));
-            stmt = new SgCExpStmt(*e);
-            if_st->insertStmtAfter(*stmt);
-
-            e = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[1].len)) * (*new SgVarRefExp(M1) <= *new SgVarRefExp(M2)) + *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[0].len)) * (*new SgVarRefExp(M1) > *new SgVarRefExp(M2)));
-            stmt = new SgCExpStmt(*e);
-            if_st->insertStmtAfter(*stmt);
-
-            e = &SgAssignOp(*new SgVarRefExp(acrossBase[0]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[0].len)) * (*new SgVarRefExp(M1) <= *new SgVarRefExp(M2)) + *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[1].len)) * (*new SgVarRefExp(M1) > *new SgVarRefExp(M2)));
-            stmt = new SgCExpStmt(*e);
-            if_st->insertStmtAfter(*stmt);
-        }
-
-        e = &SgAssignOp(*new SgVarRefExp(diag), *new SgVarRefExp(M3));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[1]), *new SgVarRefExp(diag) / *new SgVarRefExp(nums[1]) + SgNeqOp(*new SgVarRefExp(diag) % *new SgVarRefExp(nums[1]), *new SgValueExp(0)));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[0]), *new SgVarRefExp(Emin) / *new SgVarRefExp(nums[0]) + SgNeqOp(*new SgVarRefExp(Emin) % *new SgVarRefExp(nums[0]), *new SgValueExp(0)));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(SE), *new SgValueExp(2));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[0]), (*new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[0].len)) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len))) * (*new SgVarRefExp(M1) <= *new SgVarRefExp(M2)) + (*new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[1].len)) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len))) * (*new SgVarRefExp(M1) > *new SgVarRefExp(M2)));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[1].len)) * (*new SgVarRefExp(M1) <= *new SgVarRefExp(M2)) + *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[0].len)) * (*new SgVarRefExp(M1) > *new SgVarRefExp(M2)));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[2]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[2].len)) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[2].len)) * (*new SgVarRefExp(M3) - *new SgValueExp(1)));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(SE), *new SgVarRefExp(SE) + *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-
-        while_st = new SgWhileStmt(SgNeqOp(*new SgVarRefExp(M1) + *new SgVarRefExp(M2) - *new SgVarRefExp(Allmin), *new SgVarRefExp(SE) - *new SgValueExp(1)), *stmt);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*while_st, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*while_st, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[0]), *new SgVarRefExp(acrossBase[0]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len)) * (*new SgVarRefExp(M1) <= *new SgVarRefExp(M2)) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) * (*new SgVarRefExp(M1) > *new SgVarRefExp(M2)));
-        stmt = new SgCExpStmt(*e);
-        while_st->insertStmtAfter(*stmt, *while_st);
-
-        while_st->insertStmtAfter(if_stSwap->copy(), *while_st);
-        while_st->insertStmtAfter(*createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks));
-        while_st->insertStmtAfter(if_stSwap->copy(), *while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(var1), *new SgValueExp(0));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(var2), *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(var3), *new SgValueExp(0));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(diag), *new SgVarRefExp(Allmin) - *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[0]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[0].len)) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[0].len)) * (*new SgVarRefExp(M1) - *new SgValueExp(1)));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgArrayRefExp(*lowI, *new SgValueExp(loopAcrossSymb[1].len)) * (*new SgVarRefExp(M1) > *new SgVarRefExp(M2)) + *new SgVarRefExp(acrossBase[1]) * (*new SgVarRefExp(M1) <= *new SgVarRefExp(M2)));
-        stmt = new SgCExpStmt(*e);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*stmt, *main_while_st);
-
-        { // if block
-            funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-            funcCall->addArg(*new SgVarRefExp(*Emin) - *new SgVarRefExp(M3));
-            SgExpression *e1 = NULL, *e2 = NULL;
-            SgIfStmt *if_st1 = NULL;
-
-            e1 = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgVarRefExp(acrossBase[1]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) + *new SgVarRefExp(*Emax) - *new SgVarRefExp(*Emin) - *new SgValueExp(1));
-            e2 = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgVarRefExp(acrossBase[1]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) - *new SgVarRefExp(*Emax) + *new SgVarRefExp(*Emin) + *new SgValueExp(1));
-
-            if_st1 = new SgIfStmt(*new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) > *new SgValueExp(0), *new SgCExpStmt(*e1), *new SgCExpStmt(*e2));
-
-            SgIfStmt *if_st = new SgIfStmt(*new SgVarRefExp(*M1) <= *new SgVarRefExp(*M2) && *new SgVarRefExp(*M3) > *new SgVarRefExp(*Emin), *if_st1);
-
-            e = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgVarRefExp(acrossBase[1]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)));
-            stmt = new SgCExpStmt(*e);
-            if_st = new SgIfStmt(*new SgVarRefExp(*M1) > *new SgVarRefExp(*M2) && *new SgVarRefExp(*M3) > *new SgVarRefExp(*Emin), *stmt, *if_st);
-
-            e1 = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgVarRefExp(acrossBase[1]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) + *new SgVarRefExp(*Emax) - *new SgVarRefExp(*Emin) - *new SgValueExp(1) + *funcCall);
-            e2 = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgVarRefExp(acrossBase[1]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) - *new SgVarRefExp(*Emax) + *new SgVarRefExp(*Emin) + *new SgValueExp(1) + *new SgVarRefExp(M3) - *new SgVarRefExp(*Emin));
-
-            if_st1 = new SgIfStmt(*new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) > *new SgValueExp(0), *new SgCExpStmt(*e1), *new SgCExpStmt(*e2));
-
-            if_st = new SgIfStmt(*new SgVarRefExp(*M1) <= *new SgVarRefExp(*M2) && *new SgVarRefExp(*M3) <= *new SgVarRefExp(*Emin), *if_st1, *if_st);
-
-            e = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgVarRefExp(acrossBase[1]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) + *funcCall);
-            stmt = new SgCExpStmt(*e);
-
-            e = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgVarRefExp(acrossBase[1]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) + *funcCall * *new SgValueExp(-1));
-            SgStatement* stmtElse = new SgCExpStmt(*e);
-
-            if_st1 = new SgIfStmt(*new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)) > *new SgValueExp(0), *stmt, *stmtElse);
-
-            if_st = new SgIfStmt(*new SgVarRefExp(*M1) > *new SgVarRefExp(*M2) && *new SgVarRefExp(*M3) <= *new SgVarRefExp(*Emin), *if_st1, *if_st);
-
-            if (acrossV == 3)
-                st_end->insertStmtBefore(*if_st, *st_hedr);
-            else
-                main_stmt->insertStmtBefore(*if_st, *main_while_st);
-        }
-
-        e = &SgAssignOp(*new SgVarRefExp(diag), *new SgVarRefExp(diag) - *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-
-        while_st = new SgWhileStmt(SgNeqOp(*new SgVarRefExp(diag), *new SgValueExp(0)), *stmt);
-        if (acrossV == 3)
-            st_end->insertStmtBefore(*while_st, *st_hedr);
-        else
-            main_stmt->insertStmtBefore(*while_st, *main_while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(acrossBase[1]), *new SgVarRefExp(acrossBase[1]) + *new SgArrayRefExp(*idxI, *new SgValueExp(loopAcrossSymb[1].len)));
-        stmt = new SgCExpStmt(*e);
-        while_st->insertStmtAfter(*stmt, *while_st);
-
-        e = &SgAssignOp(*new SgVarRefExp(SE), *new SgVarRefExp(SE) + *new SgValueExp(1));
-        stmt = new SgCExpStmt(*e);
-        while_st->insertStmtAfter(*stmt, *while_st);
-        while_st->insertStmtAfter(*createKernelCallsInCudaHandler(funcCallKernel, s_loop_ref, idxTypeInKernel, s_blocks));
-
-        e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[1]), *new SgVarRefExp(diag) / *new SgVarRefExp(nums[1]) + SgNeqOp(*new SgVarRefExp(diag) % *new SgVarRefExp(nums[1]), *new SgValueExp(0)));
-        stmt = new SgCExpStmt(*e);
-        while_st->insertStmtAfter(*stmt, *while_st);
-
-        e = &SgAssignOp(*new SgRecordRefExp(*s_blocks, (char*)s_cuda_var[0]), *new SgVarRefExp(diag) / *new SgVarRefExp(nums[0]) + SgNeqOp(*new SgVarRefExp(diag) % *new SgVarRefExp(nums[0]), *new SgValueExp(0)));
-        stmt = new SgCExpStmt(*e);
-        while_st->insertStmtAfter(*stmt, *while_st);
-    }
-
-    // !!! Global for all cases !!!
-    if (red_list)
-    {
-        ln = 0;
-        for (er = red_list; er; er = er->rhs(), ++ln)
-        {
-            //SgExpression *red_expr_ref = er->lhs()->rhs(); // reduction variable reference
-            num = RedFuncNumber(er->lhs()->lhs()); // type of reduction
-
-            e = &SgAssignOp(*new SgVarRefExp(*s_tmp_var), *new SgValueExp(ln+1));
-            stmt = new SgCExpStmt(*e);
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-
-            stmt = new SgCExpStmt(*FinishReduction(s_loop_ref, s_tmp_var));
-            st_end->insertStmtBefore(*stmt, *st_hedr);
-        }
-    }
-    // to dispose private arrays
-    if (options.isOn(C_CUDA) && PrivateArrayClassUse(e_all_private_size))
-        for (s = private_first, ln = 0;  ln < lnp; s = s->next(), ln++)  // private arrays
-        {
-            stmt = new SgCExpStmt(*DisposePrivateArray(s_loop_ref, s));
-	    st_end->insertStmtBefore(*stmt, *st_hedr);  
-        }
-
-    // create args for kernel and return it
-    vector<ArgsForKernel> argsKernel(countKernels);
-    const int rtTypes[] = { rt_INT, rt_LLONG };
-
-    for (unsigned ck = 0; ck < countKernels; ++ck)
-    {
-        argsKernel[ck].st_header = st_hedr;
-        argsKernel[ck].cond_ = NULL;
-
-        SgType *typeParams = indexTypeInKernel(rtTypes[ck]);
-
-        if (acrossV == 1)
-        {
-            char *cond_ = new char[strlen("cond_") + strlen(loopAcrossSymb[0].symb->identifier()) + 1];
-            cond_[0] = '\0';
-            strcat(cond_, "cond_");
-            strcat(cond_, loopAcrossSymb[0].symb->identifier());
-            argsKernel[ck].cond_ = new SgSymbol(VARIABLE_NAME, cond_, typeParams, st_hedr);
-
-            char *st = new char[strlen("steps_") + strlen(loopAcrossSymb[0].symb->identifier()) + 1];
-            st[0] = '\0';
-            strcat(st, "steps_");
-            strcat(st, loopAcrossSymb[0].symb->identifier());
-            argsKernel[ck].steps.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(st), typeParams, st_hedr));
-            for (int i = 0; i < loopV; ++i)
-            {
-                st = new char[strlen("steps_") + strlen(loopSymb[i].symb->identifier()) + 1];
-                st[0] = '\0';
-                strcat(st, "steps_");
-                strcat(st, loopSymb[i].symb->identifier());
-                argsKernel[ck].steps.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(st), typeParams, st_hedr));
-            }
-        }
-
-        if (acrossV != 1 && options.isOn(AUTO_TFM))
-        {
-            char *tmpS = new char[64];
-            for (size_t i = 0; i < dvm_array_headers.size(); ++i)
-            {
-                tmpS[0] = '\0';
-                strcat(tmpS, dvm_array_headers[i]);
-                strcat(tmpS, "_x_axis");
-                argsKernel[ck].otherVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(tmpS), typeParams, st_hedr));
-                tmpS[0] = '\0';
-                strcat(tmpS, dvm_array_headers[i]);
-                strcat(tmpS, "_offset_x");
-                argsKernel[ck].otherVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(tmpS), typeParams, st_hedr));
-                tmpS[0] = '\0';
-                strcat(tmpS, dvm_array_headers[i]);
-                strcat(tmpS, "_Rx");
-                argsKernel[ck].otherVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(tmpS), typeParams, st_hedr));
-                tmpS[0] = '\0';
-                strcat(tmpS, dvm_array_headers[i]);
-                strcat(tmpS, "_y_axis");
-                argsKernel[ck].otherVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(tmpS), typeParams, st_hedr));
-                tmpS[0] = '\0';
-                strcat(tmpS, dvm_array_headers[i]);
-                strcat(tmpS, "_offset_y");
-                argsKernel[ck].otherVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(tmpS), typeParams, st_hedr));
-                tmpS[0] = '\0';
-                strcat(tmpS, dvm_array_headers[i]);
-                strcat(tmpS, "_Ry");
-                argsKernel[ck].otherVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(tmpS), typeParams, st_hedr));
-                tmpS[0] = '\0';
-                strcat(tmpS, dvm_array_headers[i]);
-                strcat(tmpS, "_slash");
-                argsKernel[ck].otherVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(tmpS), typeParams, st_hedr));
-                argsKernel[ck].otherVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(outTypeOfTransformation[i]->identifier()), typeParams, st_hedr));
-            }
-            argsKernel[ck].arrayNames = dvm_array_headers;
-        }
-
-        if (acrossV == 2)
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("num_elem_across"), typeParams, st_hedr));
-        else if (acrossV >= 3)
-        {
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("max_z"), typeParams, st_hedr));
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("SE"), typeParams, st_hedr)); // SE
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("var1"), typeParams, st_hedr)); // var1
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("var2"), typeParams, st_hedr)); // var2
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("var3"), typeParams, st_hedr)); // var3
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("Emax"), typeParams, st_hedr)); // Emax
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("Emin"), typeParams, st_hedr)); // Emin
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("min_ij"), typeParams, st_hedr));
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("swap_ij"), typeParams, st_hedr));
-        }
-
-        char *str = new char[32];
-        for (int i = 0; i < acrossV; ++i)
-        {
-            argsKernel[ck].acrossS.push_back(new SgSymbol(VARIABLE_NAME, acrossBase[i]->identifier(), typeParams, st_hedr)); // acrossBase[i]
-            argsKernel[ck].symb.push_back(loopAcrossSymb[i]);
-            strcpy(str, "step");
-            strcat(str, strchr(acrossBase[i]->identifier(), '_'));
-            argsKernel[ck].idxAcross.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(str), typeParams, st_hedr));
-        }
-        for (int i = 0; i < loopV; ++i)
-        {
-            argsKernel[ck].notAcrossS.push_back(new SgSymbol(VARIABLE_NAME, loopBase[i]->identifier(), typeParams, st_hedr)); // loopBase[i]
-            argsKernel[ck].nSymb.push_back(loopSymb[i]);
-            strcpy(str, "step");
-            strcat(str, strchr(loopBase[i]->identifier(), '_'));
-            argsKernel[ck].idxNotAcross.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(str), typeParams, st_hedr));
-            strcpy(str, "num_elem");
-            strcat(str, strchr(loopBase[i]->identifier(), '_'));
-            argsKernel[ck].sizeVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(str), typeParams, st_hedr));
-        }
-
-        if (acrossV == 1 || acrossV == 2 || acrossV >= 3)
-        {
-            argsKernel[ck].otherVars.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName("type_of_run"), typeParams, st_hedr));
-            char *t = new char[32];
-            for (int i = 0; i < acrossV + loopV; ++i)
-            {
-                char p[8];
-                sprintf(p, "%d", i);
-                t[0] = '\0';
-                strcat(t, "idxs_");
-                strcat(t, p);
-                argsKernel[ck].baseIdxsInKer.push_back(new SgSymbol(VARIABLE_NAME, TestAndCorrectName(t), typeParams, st_hedr));
-            }
-            delete[]t;
-        }
-
-        delete[]str;
-
-    }
-    // end of creation args for kernel
-
-    delete[]reduction_loc_ptr;
-    delete[]reduction_loc_symb;
-    delete[]reduction_ptr;
-    delete[]reduction_symb;
-    delete[]num_elems;
-    mywarn("  end Adapter Function");
-    if (options.isOn(C_CUDA))
-        RenamingCudaFunctionVariables(st_hedr, s_loop_ref, 0);
-    return argsKernel;
-}
-
-
-void MakeDeclarationsForKernel_On_C_Across(SgType *indexType)
-{
-    // declare do_variables
-    DeclareDoVars(indexType);
-
-    // declare private(local in kernel) variables
-    DeclarePrivateVars(indexType);
-
-    // declare  variables, used in loop and passed by reference:
-    // <type> &<name> = *p_<name>;
-    DeclareUsedVars();
-}
-
-void MakeDeclarationsForKernelAcross(SgType *indexType)
-{
-#if debugMode
-        mywarn("strat: MakeDeclarations Function");
-#endif
-
-    // declare do_variables
-    DeclareDoVars();
-
-    // declare private(local in kernel) variables
-    DeclarePrivateVars(indexType);
-
-    // declare dummy arguments:
-
-    // declare reduction dummy arguments
-    DeclareDummyArgumentsForReductions(NULL, indexType);
-
-    // declare array coefficients
-    DeclareArrayCoeffsInKernel(indexType);
-
-    // declare bases for arrays
-    DeclareArrayBases();
-
-    // declare  variables, used in loop
-    DeclareUsedVars();
-
-#if debugMode
-        mywarn("  end: MakeDeclarations Function");
-#endif
-}
-
-SgExpression *CreateKernelDummyListAcross(ArgsForKernel *argsKer, SgType *idxTypeInKernel) //SgSymbol *s_red_count_k,
-{
-#if debugMode
-        mywarn("strat: CreateKernelDummyListAcross Function");
-#endif
-
-    SgExpression *arg_list, *ae;
-    arg_list = NULL;
-
-    arg_list = AddListToList(CreateArrayDummyList(idxTypeInKernel), CreateRedDummyList(idxTypeInKernel));
-    //   base_ref + <array_coeffs> ...
-    // + <red_var[_1]> [+red_var_2+...+red_var_M] + <red>_grid  [ + <loc_var_1>...<loc_var_N>]
-
-    // + 'blocks'
-    if (argsKer->symb.size() < 3)
-    {
-        for (int it = 0; it < argsKer->sizeVars.size(); ++it)
-            arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(argsKer->sizeVars[it])));
-    }
-
-    for (int it = 0; it < argsKer->acrossS.size(); ++it)
-        arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(argsKer->acrossS[it])));
-
-    for (int  it = 0; it < argsKer->notAcrossS.size(); ++it)
-        arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(argsKer->notAcrossS[it])));
-
-    for (int it = 0; it < argsKer->idxAcross.size(); ++it)
-        arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(argsKer->idxAcross[it])));
-
-    for (int it = 0; it < argsKer->idxNotAcross.size(); ++it)
-        arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(argsKer->idxNotAcross[it])));
-
-    if (uses_list)
-        arg_list = AddListToList(arg_list, CreateUsesDummyList()); //[+ <uses> ]
-
-    if (private_list)
-        arg_list = AddListToList(arg_list, CreatePrivateDummyList()); //[+ dummys for private arrays ]
-
-    if (argsKer->symb.size() >= 3)
-        for (int it = 0; it < argsKer->sizeVars.size(); ++it)
-            arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(argsKer->sizeVars[it])));
-
-    if (argsKer->acrossS.size() != 1)
-    {
-        for (size_t i = 0; i < argsKer->otherVars.size(); ++i)
-        {
-            ae = new SgExprListExp(*new SgVarRefExp(argsKer->otherVars[i]));
-            arg_list = AddListToList(arg_list, ae);
-        }
-    }
-    else if (argsKer->otherVars.size() != 0)
-    {
-        ae = new SgExprListExp(*new SgVarRefExp(argsKer->otherVars[argsKer->otherVars.size() - 1]));
-        arg_list = AddListToList(arg_list, ae);
-    }
-
-    for (size_t i = 0; i < argsKer->baseIdxsInKer.size(); ++i)
-    {
-        ae = new SgExprListExp(*new SgVarRefExp(argsKer->baseIdxsInKer[i]));
-        arg_list = AddListToList(arg_list, ae);
-    }
-
-    if (argsKer->cond_ != NULL && options.isOn(GPU_O0))
-    {
-        SgSymbol *tmp = argsKer->cond_;
-        arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(tmp)));
-
-        for (size_t i = 0; i < argsKer->steps.size(); ++i)
-        {
-            SgSymbol *tmp = argsKer->steps[i];
-            arg_list = AddListToList(arg_list, new SgExprListExp(*new SgVarRefExp(tmp)));
-        }
-    }
-
-#if debugMode
-        mywarn("  end: CreateKernelDummyListAcross Function");
-#endif
-
-    return arg_list;
-}
-
-SgStatement *CreateLoopKernelAcross(SgSymbol *skernel, ArgsForKernel* argsKer, SgType *idxTypeInKernel)
-{
-#if debugMode
-        mywarn("strat: CreateLoopKernelAcross");
-#endif
-
-    ACROSS_MOD_IN_KERNEL = 1;
-
-#if kerneloff
-        return NULL;
-#endif
-
-    int nloop = 0;
-    SgStatement *st = NULL, *st_end = NULL;
-    SgExpression *fe = NULL;
-    SgSymbol *tid = NULL, *s_red_count_k = NULL;
-    SgIfStmt *if_st = NULL;
-    SgType *longType = idxTypeInKernel;
-
-    if (!skernel)
-        return(NULL);
-    nloop = ParLoopRank();
-
-    // create kernel procedure for loop in Fortran-Cuda language or kernel function in C_Cuda
-    // creating Header and End Statement of Kernel
-    if (options.isOn(C_CUDA))
-    {
-        kernel_st = Create_C_Kernel_Function(skernel);
-        fe = kernel_st->expr(0);
-    }
-    else
-        kernel_st = CreateKernelProcedure(skernel);
-
-    kernel_st->addComment(LoopKernelComment());
-
-    st_end = kernel_st->lexNext();
-    cur_in_kernel = st = kernelScope = kernel_st;
-
-    // !!creating variables and making structures for reductions
-    CompleteStructuresForReductionInKernel();
-
-    if (red_list)
-        s_red_count_k = RedCountSymbol(kernel_st);
-
-    // create  dummy argument list of kernel:
-    if (options.isOn(C_CUDA))
-        fe->setLhs(CreateKernelDummyListAcross(argsKer, longType)); //s_red_count_k,
-    else
-        // create dummy argument list and add it to kernel header statement (Fortran-Cuda)
-        kernel_st->setExpression(0, *CreateKernelDummyListAcross(argsKer, longType)); //s_red_count_k,
-
-    // generating block of index variables calculation
-
-#if debugMode
-        mywarn("start: block4");
-#endif
-
-    tid = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("id_x"), *longType, *cur_in_kernel);
-
-    if (options.isOn(C_CUDA))
-        st = AssignStatement(*new SgVarRefExp(*tid), (*new SgRecordRefExp(*s_blockidx, "x")) *
-        *new SgRecordRefExp(*s_blockdim, "x") + *new SgRecordRefExp(*s_threadidx, "x"));
-    else
-        st = AssignStatement(*new SgVarRefExp(*tid), (*new SgRecordRefExp(*s_blockidx, "x") - *new SgValueExp(1)) *
-        *new SgRecordRefExp(*s_blockdim, "x") + *new SgRecordRefExp(*s_threadidx, "x") - *new SgValueExp(1));
-
-    cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-    cur_in_kernel = st;
-
-    size_t size = argsKer->otherVarsForOneTh.size();
-    size_t size1 = argsKer->otherVars.size();
-    SgForStmt *for_st = NULL, *inner_for_st = NULL;
-    SgFunctionCallExp *funcAbs = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-    funcAbs->addArg(*new SgVarRefExp(argsKer->otherVars[size1 - 1]));
-    SgExpression *sign = &(*new SgVarRefExp(argsKer->otherVars[size1 - 1]) / *funcAbs);
-
-    if (options.isOn(C_CUDA))
-        for_st = new SgForStmt(&SgAssignOp(*new SgVarRefExp(argsKer->otherVarsForOneTh[size - 1]), *new SgVarRefExp(argsKer->otherVars[size1 - 3])), &(*sign * *new SgVarRefExp(argsKer->otherVarsForOneTh[size - 1]) <= *sign * *new SgVarRefExp(argsKer->otherVars[size1 - 2])), &SgAssignOp(*new SgVarRefExp(argsKer->otherVarsForOneTh[size - 1]), *new SgVarRefExp(argsKer->otherVarsForOneTh[size - 1]) + *new SgVarRefExp(argsKer->otherVars[size1 - 1])), NULL);
-    else
-        for_st = new SgForStmt(argsKer->otherVarsForOneTh[size - 1], new SgVarRefExp(argsKer->otherVars[size1 - 3]), new SgVarRefExp(argsKer->otherVars[size1 - 2]), new SgVarRefExp(argsKer->otherVars[size1 - 1]), NULL);
-    inner_for_st = for_st;
-
-    for (int i = size - 2; i >= 0; i--)
-    {
-        SgForStmt *tmp = for_st;
-        funcAbs = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-        funcAbs->addArg(*new SgVarRefExp(argsKer->otherVars[3 * i + 2]));
-        sign = &(*new SgVarRefExp(argsKer->otherVars[3 * i + 2]) / *funcAbs);
-
-        if (options.isOn(C_CUDA))
-            for_st = new SgForStmt(&SgAssignOp(*new SgVarRefExp(argsKer->otherVarsForOneTh[i]), *new SgVarRefExp(argsKer->otherVars[3 * i])), &(*sign * *new SgVarRefExp(argsKer->otherVarsForOneTh[i]) <= *sign * *new SgVarRefExp(argsKer->otherVars[3 * i + 1])), &(SgAssignOp(*new SgVarRefExp(argsKer->otherVarsForOneTh[i]), *new SgVarRefExp(argsKer->otherVarsForOneTh[i]) + *new SgVarRefExp(argsKer->otherVars[3 * i + 2]))), NULL);
-        else
-            for_st = new SgForStmt(argsKer->otherVarsForOneTh[i], new SgVarRefExp(argsKer->otherVars[3 * i]), new SgVarRefExp(argsKer->otherVars[3 * i + 1]), new SgVarRefExp(argsKer->otherVars[3 * i + 2]), NULL);
-        for_st->insertStmtAfter(*tmp);
-    }
-
-    if_st = new SgIfStmt(SgEqOp(*new SgVarRefExp(*tid), *new SgValueExp(0)), *for_st);
-    cur_in_kernel->insertStmtAfter(*if_st, *kernel_st);
-
-#if debugMode
-        mywarn("  end: block4");
-        mywarn("start: block5");
-#endif
-
-    // generating assign statements for MAXLOC, MINLOC reduction operations
-    if (red_list)
-        Do_Assign_For_Loc_Arrays();
-
-    // inserting loop body to innermost IF statement of BlockForCalculationThreadLoopVariables
-
-#if debugMode
-        mywarn("  end: block5");
-        mywarn("strat: inserting loop body");
-#endif
-
-    vector<SgSymbol*> forDeclarationInKernel;
-
-
-    {
-        SgStatement *stk, *last;
-        block = CreateIfForRedBlack(loop_body, nloop);
-        last = inner_for_st->lastNodeOfStmt();
-        inner_for_st->insertStmtAfter(*block); //cur_in_kernel is innermost IF statement
-
-        if (options.isOn(C_CUDA))
-        {
-            if (block->comments() == NULL)
-                block->addComment("// Loop body");
-        }
-        else
-            block->addComment("! Loop body\n");
-
-        // correct copy of loop_body (change or extract last statement of block if it is CONTROL_END)
-        if (block != loop_body)
-            stk = last->lexPrev()->lexPrev();
-        else
-            stk = last->lexPrev();
-
-        if (stk->variant() == CONTROL_END)
-        {
-            if (stk->hasLabel() || stk == loop_body)  // when body of DO_ENDDO loop is empty, stk == loop_body
-                stk->setVariant(CONT_STAT);
-            else
-            {
-                st = stk->lexPrev();
-                stk->extractStmt();
-                stk = st;
-            }
-        }
-
-        ReplaceExitCycleGoto(block, stk);
-
-        for_kernel = 1;
-        last = cur_st;
-
-        TranslateBlock(inner_for_st);
-        if (options.isOn(C_CUDA))
-        {
-            //get info of arrays in private and locvar lists
-            swapDimentionsInprivateList();
-            vector < stack < SgStatement*> > zero = vector < stack < SgStatement*> >(0);
-            Translate_Fortran_To_C(inner_for_st, inner_for_st->lastNodeOfStmt(), zero, 0);
-        }
-
-        cur_st = last;
-        createBodyKernel = false;
-    }
-
-#if debugMode
-        mywarn("  end: inserting loop body");
-        mywarn("start: create reduction block");
-#endif
-
-    if (red_list)
-    {
-        int num;
-        reduction_operation_list *tmp_list = red_struct_list;
-        for (SgExpression *er = red_list; er; er = er->rhs())
-        {
-            num = 0;
-            SgExpression *red_expr_ref = er->lhs()->rhs(); // reduction variable reference
-            num = RedFuncNumber(er->lhs()->lhs()); // type of reduction
-
-            SgSymbol *redGrid = new SgSymbol(VARIABLE_NAME, tmp_list->red_grid->identifier());
-            redGrid->setType(*new SgArrayType(*tmp_list->red_grid->type()));
-
-            st = AssignStatement(*new SgArrayRefExp(*redGrid, *new SgValueExp(0)), red_expr_ref->copy());
-            if_st->lastExecutable()->insertStmtAfter(*st);
-            tmp_list = tmp_list->next;
-        }
-    }
-#if debugMode
-        mywarn("  end: create reduction block");
-#endif
-
-    // make declarations
-    if (options.isOn(C_CUDA))
-        MakeDeclarationsForKernel_On_C_Across(idxTypeInKernel);
-    else // Fortran-Cuda
-        MakeDeclarationsForKernelAcross(idxTypeInKernel);
-    for_kernel = 0;
-
-    kernel_st->insertStmtAfter(*tid->makeVarDeclStmt());
-
-    if (!options.isOn(C_CUDA))
-    {
-        for (size_t i = 0; i < argsKer->otherVars.size(); ++i)
-        {
-            st = argsKer->otherVars[i]->makeVarDeclStmt();
-            st->setExpression(2, *new SgExprListExp(*new SgExpression(ACC_VALUE_OP)));
-            kernel_st->insertStmtAfter(*st);
-        }
-    }
-#if debugMode
-        mywarn("  end: CreateLoopKernelAcross");
-#endif
-    if (options.isOn(C_CUDA))
-        RenamingCudaFunctionVariables(kernel_st, skernel, 1);
-    ACROSS_MOD_IN_KERNEL = 0;
-    return kernel_st;
-}
-
-static SgStatement* makeBlockIdxAssigment(SgSymbol* tid, const char* XYZ)
-{
-    SgStatement* st = NULL;
-    if (options.isOn(C_CUDA))
-        st = AssignStatement(*new SgVarRefExp(*tid), (*new SgRecordRefExp(*s_blockidx, XYZ)) *
-                             *new SgRecordRefExp(*s_blockdim, XYZ) + *new SgRecordRefExp(*s_threadidx, XYZ));
-    else
-        st = AssignStatement(*new SgVarRefExp(*tid), (*new SgRecordRefExp(*s_blockidx, XYZ) - *new SgValueExp(1)) *
-                             *new SgRecordRefExp(*s_blockdim, XYZ) + *new SgRecordRefExp(*s_threadidx, XYZ) - *new SgValueExp(1));
-
-    return st;
-}
-
-static void createDeclaration(SgSymbol* toDecl)
-{
-    SgStatement* st = toDecl->makeVarDeclStmt();
-    st->setExpression(2, *new SgExprListExp(*new SgExpression(ACC_VALUE_OP)));
-    kernel_st->insertStmtAfter(*st);
-}
-
-static void createDeclaration(const vector<SgSymbol*>& toDecl)
-{
-    for (int it = 0; it < toDecl.size(); ++it)
-        createDeclaration(toDecl[it]);
-}
-
-SgStatement *CreateLoopKernelAcross(SgSymbol *skernel, ArgsForKernel* argsKer, int acrossNum, SgType *idxTypeInKernel)
-{
-#if debugMode
-        mywarn("strat: CreateLoopKernelAcross");
-#endif
-
-    ACROSS_MOD_IN_KERNEL = 1;
-
-#if kerneloff
-        return NULL;
-#endif
-
-    int nloop;
-    SgStatement *st = NULL, *st_end = NULL;
-    SgExpression *e = NULL, *fe = NULL;
-    SgSymbol *tid = NULL, *tid1 = NULL, *tid2 = NULL, *s_red_count_k = NULL, *coords = NULL;
-    SgIfStmt *if_st = NULL, *if_st1 = NULL, *if_st2 = NULL;
-    SgForStmt *mainFor = NULL;
-    SgSymbol *tmpvar1 = NULL;
-    SgExpression **leftExprs, **rightExprs;
-    SgType *longType = idxTypeInKernel;
-
-    if (!skernel)
-        return(NULL);
-    nloop = ParLoopRank();
-
-    // create kernel procedure for loop in Fortran-Cuda language or kernel function in C_Cuda
-    // creating Header and End Statement of Kernel
-    if (options.isOn(C_CUDA))
-    {
-        kernel_st = Create_C_Kernel_Function(skernel);
-        fe = kernel_st->expr(0);
-    }
-    else
-        kernel_st = CreateKernelProcedure(skernel);
-
-    if (!options.isOn(C_CUDA) && createConvert_XY && options.isOn(AUTO_TFM))
-    {
-        kernel_st->addComment("!------------- dvmh_convert_XY() function ------------\n");
-        kernel_st->addComment(funcDvmhConvXYfortVerLong);
-        kernel_st->addComment(funcDvmhConvXYfortVer);
-
-        createConvert_XY = false;
-    }
-    kernel_st->addComment(LoopKernelComment());
-
-    st_end = kernel_st->lexNext();
-    cur_in_kernel = st = kernelScope = kernel_st;
-
-    // !!creating variables and making structures for reductions
-    CompleteStructuresForReductionInKernel(); //CompleteStructuresForReductionInKernelAcross();
-
-    if (red_list)
-        s_red_count_k = RedCountSymbol(kernel_st);
-
-    // create  dummy argument list of kernel:
-    if (options.isOn(C_CUDA))
-        fe->setLhs(CreateKernelDummyListAcross(argsKer, idxTypeInKernel)); // s_red_count_k,
-    else
-        // create dummy argument list and add it to kernel header statement (Fortran-Cuda)
-        kernel_st->setExpression(0, *CreateKernelDummyListAcross(argsKer, idxTypeInKernel)); // s_red_count_k,
-
-    // generating block of index variables calculation
-
-#if debugMode
-        mywarn("start: block4");
-#endif
-
-    SgArrayType *tpArr = new SgArrayType(*longType);
-    SgValueExp *dimSize = new SgValueExp((int)(argsKer->symb.size() + argsKer->nSymb.size()));
-    tpArr->addDimension(dimSize);
-
-    coords = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("coords"), *longType, *cur_in_kernel);
-    coords->setType(tpArr);
-
-    tid = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("id_x"), *longType, *cur_in_kernel);
-    if (argsKer->symb.size() < 3)
-    {
-        if (argsKer->nSymb.size() == 1)
-            tid1 = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("id_y"), *longType, *cur_in_kernel);
-        else if (argsKer->nSymb.size() >= 2)
-        {
-            tid1 = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("id_y"), *longType, *cur_in_kernel);
-            tid2 = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("id_z"), *longType, *cur_in_kernel);
-        }
-    }
-    else if (argsKer->symb.size() >= 3)
-    {
-        tid1 = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("id_y"), *longType, *cur_in_kernel);
-        if (argsKer->nSymb.size() > 0)
-            tid2 = new SgSymbol(VARIABLE_NAME, TestAndCorrectName("id_z"), *longType, *cur_in_kernel);
-    }
-
-    st = makeBlockIdxAssigment(tid, "x");
-    cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-    cur_in_kernel = st;
-
-    if (argsKer->symb.size() == 1)
-    {
-        if (argsKer->nSymb.size() == 2)
-        {
-            st = makeBlockIdxAssigment(tid1, "y");
-            cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-            cur_in_kernel = st;
-        }
-        else if (argsKer->nSymb.size() >= 3)
-        {
-            st = makeBlockIdxAssigment(tid1, "y");
-            cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-            cur_in_kernel = st;
-
-            st = makeBlockIdxAssigment(tid2, "z");
-            cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-            cur_in_kernel = st;
-        }
-    }
-    else if (argsKer->symb.size() == 2)
-    {
-        if (argsKer->nSymb.size() == 1)
-        {
-            st = makeBlockIdxAssigment(tid1, "y");
-            cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-            cur_in_kernel = st;
-        }
-        else if (argsKer->nSymb.size() >= 2)
-        {
-            st = makeBlockIdxAssigment(tid1, "y");
-            cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-            cur_in_kernel = st;
-
-            st = makeBlockIdxAssigment(tid2, "z");
-            cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-            cur_in_kernel = st;
-        }
-    }
-    else if (argsKer->symb.size() >= 3)
-    {
-        st = makeBlockIdxAssigment(tid1, "y");
-        cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-        cur_in_kernel = st;
-
-        if (argsKer->nSymb.size() > 0)
-        {
-            st = makeBlockIdxAssigment(tid2, "z");
-            cur_in_kernel->insertStmtAfter(*st, *kernel_st);
-            cur_in_kernel = st;
-        }
-    }
-
-#if debugMode
-        mywarn("  end: block4");
-        mywarn("start: block5");
-#endif
-
-    if (argsKer->symb.size() == 1) // body for 1 dependence
-    {
-        int idx_exprs = 0;
-        int count_of_dims = argsKer->nSymb.size() + argsKer->symb.size();
-
-        vector<SageSymbols>::iterator itAcr = argsKer->symb.begin();
-        vector<SageSymbols>::iterator it = argsKer->nSymb.begin();
-        vector<SgSymbol*>::iterator itAcrS = argsKer->acrossS.begin();
-        vector<SgSymbol*>::iterator itS = argsKer->notAcrossS.begin();
-        vector<SgSymbol*>::iterator it_sizeV = argsKer->sizeVars.begin();
-        vector<SgSymbol*>::iterator itIdxAcr = argsKer->idxAcross.begin();
-        vector<SgSymbol*>::iterator itIdx = argsKer->idxNotAcross.begin();
-
-
-        leftExprs = new SgExpression*[count_of_dims];
-        rightExprs = new SgExpression*[count_of_dims];
-
-        e = &(*new SgVarRefExp(*itAcrS));
-        st = AssignStatement(*new SgVarRefExp((*itAcr).symb), *e);
-
-        leftExprs[idx_exprs] = &(*new SgVarRefExp((*itAcr).symb));
-        rightExprs[idx_exprs] = &(*new SgVarRefExp(*itAcrS));
-        idx_exprs++;
-
-        if (argsKer->nSymb.size() == 1)
-        {
-            st = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdx));
-
-            leftExprs[idx_exprs] = &(*new SgVarRefExp((*it).symb));
-            rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdx));
-            idx_exprs++;
-        }
-        else if (argsKer->nSymb.size() == 2)
-        {
-            st = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdx));
-
-            leftExprs[idx_exprs] = &(*new SgVarRefExp((*it).symb));
-            rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdx));
-            idx_exprs++;
-
-            it++;
-            itIdx++;
-            itS++;
-
-            st = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(*tid1) * *new SgVarRefExp(*itIdx));
-
-            leftExprs[idx_exprs] = &(*new SgVarRefExp((*it).symb));
-            rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(*tid1) * *new SgVarRefExp(*itIdx));
-            idx_exprs++;
-
-            it++;
-            itIdx++;
-            itS++;
-        }
-        else if (argsKer->nSymb.size() >= 3)
-        {
-            st = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdx));
-
-            leftExprs[idx_exprs] = &(*new SgVarRefExp((*it).symb));
-            rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdx));
-            idx_exprs++;
-
-            it++;
-            itIdx++;
-            itS++;
-
-            st = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(*tid1) * *new SgVarRefExp(*itIdx));
-
-            leftExprs[idx_exprs] = &(*new SgVarRefExp((*it).symb));
-            rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(*tid1) * *new SgVarRefExp(*itIdx));
-            idx_exprs++;
-
-            it++;
-            itIdx++;
-            itS++;
-
-            SgExpression *e_z1, *e_z2, *tmp_exp;
-            it_sizeV = argsKer->sizeVars.begin();
-            it_sizeV++;
-            it_sizeV++;
-            if (argsKer->nSymb.size() > 3)
-            {
-                SgFunctionCallExp *funCall = new SgFunctionCallExp(*createNewFunctionSymbol("mod"));
-                e_z1 = new SgVarRefExp(*it_sizeV);
-                funCall->addArg(*new SgVarRefExp(*tid2));
-                funCall->addArg(*e_z1);
-                tmp_exp = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-
-                st = AssignStatement(*new SgVarRefExp((*it).symb), *tmp_exp);
-
-                leftExprs[idx_exprs] = &(*new SgVarRefExp((*it).symb));
-                rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-                idx_exprs++;
-
-                it++;
-                itS++;
-                itIdx++;
-                it_sizeV++;
-                e_z2 = new SgVarRefExp(*it_sizeV);
-                it_sizeV++;
-                for (unsigned i = 0; i < argsKer->nSymb.size() - 3; ++i, it++, itS++, itIdx++)
-                {
-                    SgFunctionCallExp *funCall = new SgFunctionCallExp(*createNewFunctionSymbol("mod"));
-                    if (i == argsKer->nSymb.size() - 4)
-                        tmp_exp = &(*new SgVarRefExp(*itS) + ((*new SgVarRefExp(*tid2) / *e_z1)) * *new SgVarRefExp(*itIdx));
-                    else
-                    {
-                        funCall->addArg((*new SgVarRefExp(*tid2) / *e_z1));
-                        funCall->addArg(*e_z2);
-                        tmp_exp = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-                    }
-
-                    st = AssignStatement(*new SgVarRefExp((*it).symb), *tmp_exp);
-
-                    leftExprs[idx_exprs] = &(*new SgVarRefExp((*it).symb));
-                    rightExprs[idx_exprs] = &(tmp_exp->copy());
-                    idx_exprs++;
-
-                    e_z1 = &(*e_z1 * *e_z2);
-                    if (i != argsKer->nSymb.size() - 4)
-                    {
-                        e_z2 = new SgVarRefExp(*it_sizeV);
-                        it_sizeV++;
-                    }
-                }
-            }
-            else
-            {
-                st = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(*tid2) * *new SgVarRefExp(*itIdx));
-
-                leftExprs[idx_exprs] = &(*new SgVarRefExp((*it).symb));
-                rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(*tid2) * *new SgVarRefExp(*itIdx));
-                idx_exprs++;
-
-                it++;
-                itIdx++;
-                itS++;
-            }
-        }
-
-        if (options.isOn(C_CUDA))
-            st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[0])), &(rightExprs[0]->copy()));
-        else
-            st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[0]) + *new SgValueExp(1)), &(rightExprs[0]->copy()));
-
-        // main IF
-        it_sizeV = argsKer->sizeVars.begin();
-        if (argsKer->nSymb.size() == 0)
-            if_st = new SgIfStmt(*new SgVarRefExp(*tid) < *new SgValueExp(1), *st);
-        else if (argsKer->nSymb.size() == 1)
-            if_st = new SgIfStmt(*new SgVarRefExp(*tid) < *new SgVarRefExp(*it_sizeV), *st);
-        else if (argsKer->nSymb.size() == 2)
-        {
-            SgSymbol *tmp = *it_sizeV;
-            it_sizeV++;
-            SgSymbol *tmp1 = *it_sizeV;
-
-            if_st = new SgIfStmt(*new SgVarRefExp(*tid) < *new SgVarRefExp(tmp) &&
-                *new SgVarRefExp(*tid1) < *new SgVarRefExp(tmp1), *st);
-        }
-        else if (argsKer->nSymb.size() >= 3)
-        {
-            SgSymbol *tmp = *it_sizeV;
-            it_sizeV++;
-            SgSymbol *tmp1 = *it_sizeV;
-            it_sizeV++;
-
-            SgExpression *if_mult = NULL;
-            for (unsigned i = 0; i < argsKer->nSymb.size() - 2; ++i)
-            {
-                if (i == 0)
-                    if_mult = new SgVarRefExp(*it_sizeV);
-                else
-                    if_mult = &((*if_mult) * *new SgVarRefExp(*it_sizeV));
-                it_sizeV++;
-            }
-            if_st = new SgIfStmt(*new SgVarRefExp(*tid) < *new SgVarRefExp(tmp) &&
-                *new SgVarRefExp(*tid1) < *new SgVarRefExp(tmp1) && *new SgVarRefExp(*tid2) < *if_mult, *st);
-        }
-
-        for (size_t i = 1; i < argsKer->baseIdxsInKer.size(); ++i)
-        {
-            if (options.isOn(C_CUDA))
-                st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[i])), &(rightExprs[i]->copy()));
-            else
-                st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[i]) + *new SgValueExp(1)), &(rightExprs[i]->copy()));
-            if_st->lastExecutable()->insertStmtAfter(*st);
-        }
-
-        for (size_t i = 0; i < argsKer->baseIdxsInKer.size(); ++i)
-        {
-            if (options.isOn(C_CUDA))
-                st = AssignStatement(&(leftExprs[i]->copy()), new SgArrayRefExp(*coords, *new SgValueExp((int)(i))));
-            else
-                st = AssignStatement(&(leftExprs[i]->copy()), new SgArrayRefExp(*coords, *new SgValueExp((int)(i + 1))));
-            if_st->lastExecutable()->insertStmtAfter(*st);
-        }
-
-        if (options.isOn(GPU_O0))
-        {
-            SgSymbol *cond_s = argsKer->cond_;
-            tmpvar1 = new SgSymbol(VARIABLE_NAME, "tmpV");
-            SgExprListExp *listAss = new SgExprListExp();
-            SgExprListExp *tmp = listAss;
-            listAss->setLhs(&SgAssignOp(leftExprs[0]->copy(), (*(&leftExprs[0]->copy())) + *new SgVarRefExp(argsKer->steps[0])));
-            for (size_t i = 1; i < argsKer->baseIdxsInKer.size(); ++i)
-            {
-                tmp->setRhs(new SgExprListExp());
-                tmp = (SgExprListExp*)tmp->rhs();
-                tmp->setLhs(&SgAssignOp(leftExprs[i]->copy(), (*(&leftExprs[i]->copy())) + *new SgVarRefExp(argsKer->steps[i])));
-            }
-            tmp->setRhs(new SgExprListExp());
-            tmp = (SgExprListExp*)tmp->rhs();
-            tmp->setLhs(&SgAssignOp(*new SgVarRefExp(tmpvar1), *new SgVarRefExp(tmpvar1) + *new SgValueExp(1)));
-
-            if (options.isOn(C_CUDA))
-                mainFor = new SgForStmt(&SgAssignOp(*new SgVarRefExp(tmpvar1), *new SgValueExp(1)), &(*new SgVarRefExp(tmpvar1) <= *new SgVarRefExp(*cond_s)), listAss, NULL);
-            else
-                mainFor = new SgForStmt(tmpvar1, &(rightExprs[0]->copy()), new SgVarRefExp(cond_s), new SgVarRefExp(*itIdxAcr), NULL);
-            if_st->lastExecutable()->insertStmtAfter(*mainFor);
-        }
-
-        cur_in_kernel->insertStmtAfter(*if_st, *kernel_st);
-        if (options.isOn(GPU_O0))
-            cur_in_kernel = mainFor->lastExecutable();
-        else
-            cur_in_kernel = if_st->lastExecutable();
-
-        if (!options.isOn(C_CUDA) && options.isOn(GPU_O0))
-        {
-            for (size_t i = 0; i < argsKer->baseIdxsInKer.size(); ++i)
-                mainFor->lastExecutable()->insertStmtAfter(*AssignStatement(*&leftExprs[i]->copy(), (*(&leftExprs[i]->copy())) + *new SgVarRefExp(argsKer->steps[i])), *mainFor);
-        }
-
-        delete []leftExprs;
-        delete []rightExprs;
-    }
-    else if (argsKer->symb.size() == 2) // body for 2 dependence
-    {
-        // attention!! adding to support all variants!!
-        if (argsKer->nSymb.size() != 0)
-        {
-            SgSymbol *tmp = tid1;
-            tid1 = tid;
-            tid = tmp;
-        }
-
-        SgExpression **leftExprs, **rightExprs;
-        int idx_exprs = 0;
-        int count_of_dims = argsKer->nSymb.size() + argsKer->symb.size();
-        leftExprs = new SgExpression*[count_of_dims];
-        rightExprs = new SgExpression*[count_of_dims];
-
-        vector<SageSymbols>::iterator itAcr = argsKer->symb.begin();
-        vector<SageSymbols>::iterator it = argsKer->nSymb.begin();
-        vector<SgSymbol*>::iterator itAcrS = argsKer->acrossS.begin();
-        vector<SgSymbol*>::iterator itS = argsKer->notAcrossS.begin();
-        vector<SgSymbol*>::iterator it_sizeV = argsKer->sizeVars.begin();
-        vector<SgSymbol*>::iterator itIdxAcr = argsKer->idxAcross.begin();
-        vector<SgSymbol*>::iterator itIdx = argsKer->idxNotAcross.begin();
-
-        e = &(*new SgVarRefExp(*itAcrS) - *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdxAcr));
-        st = AssignStatement(*new SgVarRefExp((*itAcr).symb), *e);
-        leftExprs[idx_exprs] = new SgVarRefExp((*itAcr).symb);
-        rightExprs[idx_exprs] = &(*new SgVarRefExp(*itAcrS) - *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdxAcr));
-        idx_exprs++;
-
-        itAcr++;
-        itAcrS++;
-        itIdxAcr++;
-
-        e = &(*new SgVarRefExp(*itAcrS) + *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdxAcr));
-        st = AssignStatement(*new SgVarRefExp((*itAcr).symb), *e);
-        leftExprs[idx_exprs] = new SgVarRefExp((*itAcr).symb);
-        rightExprs[idx_exprs] = &(*new SgVarRefExp(*itAcrS) + *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdxAcr));
-        idx_exprs++;
-
-        itAcr++;
-        itAcrS++;
-        itIdxAcr++;
-
-        if (argsKer->nSymb.size() == 1)
-        {
-            st = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(*tid1) *
-                *new SgVarRefExp(*itIdx));
-            leftExprs[idx_exprs] = new SgVarRefExp((*it).symb);
-            rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(*tid1) * *new SgVarRefExp(*itIdx));
-            idx_exprs++;
-        }
-        else if (argsKer->nSymb.size() >= 2)
-        {
-            st = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(*tid1) *
-                *new SgVarRefExp(*itIdx));
-            leftExprs[idx_exprs] = new SgVarRefExp((*it).symb);
-            rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(*tid1) * *new SgVarRefExp(*itIdx));
-            idx_exprs++;
-
-            it++;
-            itIdx++;
-            itS++;
-
-            SgExpression *e_z1, *e_z2, *tmp_exp;
-            it_sizeV = argsKer->sizeVars.begin();
-            it_sizeV++;
-            it_sizeV++;
-            if (argsKer->nSymb.size() > 2)
-            {
-                SgFunctionCallExp *funCall = new SgFunctionCallExp(*createNewFunctionSymbol("mod"));
-                e_z1 = new SgVarRefExp(*it_sizeV);
-                funCall->addArg(*new SgVarRefExp(*tid2));
-                funCall->addArg(*e_z1);
-                tmp_exp = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-
-                st = AssignStatement(*new SgVarRefExp((*it).symb), *tmp_exp);
-                leftExprs[idx_exprs] = new SgVarRefExp((*it).symb);
-                rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-                idx_exprs++;
-
-                it++;
-                itS++;
-                itIdx++;
-                it_sizeV++;
-                e_z2 = new SgVarRefExp(*it_sizeV);
-                it_sizeV++;
-                for (; it != argsKer->nSymb.end(); it++, itS++, itIdx++)
-                {
-                    SgFunctionCallExp *funCall = new SgFunctionCallExp(*createNewFunctionSymbol("mod"));
-                    it++;
-                    if (it == argsKer->nSymb.end())
-                    {
-                        tmp_exp = &(*new SgVarRefExp(*itS) + ((*new SgVarRefExp(*tid2) / *e_z1)) * *new SgVarRefExp(*itIdx));
-                        rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + ((*new SgVarRefExp(*tid2) / *e_z1)) * *new SgVarRefExp(*itIdx));
-                    }
-                    else
-                    {
-                        funCall->addArg((*new SgVarRefExp(*tid2) / *e_z1));
-                        funCall->addArg(*e_z2);
-                        tmp_exp = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-                        rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-                    }
-                    it--;
-
-                    st = AssignStatement(*new SgVarRefExp((*it).symb), *tmp_exp);
-                    leftExprs[idx_exprs] = new SgVarRefExp((*it).symb);
-                    idx_exprs++;
-
-                    e_z1 = &(*e_z1 * *e_z2);
-                    it++;
-                    if (it != argsKer->nSymb.end())
-                    {
-                        e_z2 = new SgVarRefExp(*it_sizeV);
-                        it_sizeV++;
-                    }
-                    it--;
-                }
-            }
-            else
-            for (; it != argsKer->nSymb.end(); it++, itS++, itIdx++)
-            {
-                st = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(*tid2) *
-                    *new SgVarRefExp(*itIdx));
-                leftExprs[idx_exprs] = new SgVarRefExp((*it).symb);
-                rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(*tid2) * *new SgVarRefExp(*itIdx));
-                idx_exprs++;
-            }
-        }
-
-        if (options.isOn(C_CUDA))
-            st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[0])), &(rightExprs[0]->copy()));
-        else
-            st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[0]) + *new SgValueExp(1)), &(rightExprs[0]->copy()));
-        // main IF
-        it_sizeV = argsKer->sizeVars.begin();
-        if (argsKer->nSymb.size() == 0)
-            if_st = new SgIfStmt(*new SgVarRefExp(*tid) < *new SgVarRefExp(*it_sizeV), *st);
-        else if (argsKer->nSymb.size() == 1)
-        {
-            SgSymbol *tmp = *it_sizeV;
-            it_sizeV++;
-            if_st = new SgIfStmt(*new SgVarRefExp(*tid) < *new SgVarRefExp(tmp) &&
-                *new SgVarRefExp(*tid1) < *new SgVarRefExp(*it_sizeV), *st);
-        }
-        else if (argsKer->nSymb.size() >= 2)
-        {
-            SgExpression *tmp_exp;
-            SgSymbol *tmp = *it_sizeV;
-            it_sizeV++;
-            SgSymbol *tmp1 = *it_sizeV;
-            it_sizeV++;
-            tmp_exp = new SgVarRefExp(*it_sizeV);
-            it_sizeV++;
-            for (; it_sizeV != argsKer->sizeVars.end(); it_sizeV++)
-                tmp_exp = &((*tmp_exp) * *new SgVarRefExp(*it_sizeV));
-
-            if_st = new SgIfStmt(*new SgVarRefExp(*tid) < *new SgVarRefExp(tmp) &&
-                                 *new SgVarRefExp(*tid1) < *new SgVarRefExp(tmp1) &&
-                                 *new SgVarRefExp(*tid2) < *tmp_exp, *st);
-        }
-
-        for (size_t i = 1; i < argsKer->baseIdxsInKer.size(); ++i)
-        {
-            if (options.isOn(C_CUDA))
-                st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[i])), &(rightExprs[i]->copy()));
-            else
-                st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[i]) + *new SgValueExp(1)), &(rightExprs[i]->copy()));
-            if_st->lastExecutable()->insertStmtAfter(*st);
-        }
-
-        for (size_t i = 0; i < argsKer->baseIdxsInKer.size(); ++i)
-        {
-            if (options.isOn(C_CUDA))
-                st = AssignStatement(&(leftExprs[i]->copy()), new SgArrayRefExp(*coords, *new SgValueExp((int)(i))));
-            else
-                st = AssignStatement(&(leftExprs[i]->copy()), new SgArrayRefExp(*coords, *new SgValueExp((int)(i + 1))));
-            if_st->lastExecutable()->insertStmtAfter(*st);
-        }
-
-        cur_in_kernel->insertStmtAfter(*if_st, *kernel_st);
-        cur_in_kernel = if_st->lastExecutable();
-        delete[]leftExprs;
-        delete[]rightExprs;
-    }
-    else if (argsKer->symb.size() >= 3) // body for >3 dependence
-    {
-        // attention!! adding to support all variants!!�� ���������
-
-        if (argsKer->nSymb.size() >= 1)
-        {
-            SgSymbol *tmp = tid2;
-            tid2 = tid;
-            tid = tmp;
-        }
-
-        SgStatement *st, *st1;
-        SgSymbol *max_z, *se, *emax, *emin, *v1, *v2, *v3, *min_ij, *swap_ij, *i, *j;
-        SgSymbol **num_elems;
-        SgIfStmt *if_st3;
-
-        vector<SageSymbols>::iterator itAcr = argsKer->symb.begin();
-        vector<SageSymbols>::iterator it = argsKer->nSymb.begin();
-        vector<SgSymbol*>::iterator itAcrS = argsKer->acrossS.begin();
-        vector<SgSymbol*>::iterator itS = argsKer->notAcrossS.begin();
-        vector<SgSymbol*>::iterator it_sizeV = argsKer->sizeVars.begin();
-        vector<SgSymbol*>::iterator itIdxAcr = argsKer->idxAcross.begin();
-        vector<SgSymbol*>::iterator itIdx = argsKer->idxNotAcross.begin();
-
-        SgExpression **leftExprs, **rightExprs;
-        int idx_exprs = 0;
-        int count_of_dims = argsKer->nSymb.size() + argsKer->symb.size();
-        leftExprs = new SgExpression*[count_of_dims];
-        rightExprs = new SgExpression*[count_of_dims];
-
-        num_elems = new SgSymbol*[argsKer->nSymb.size()];
-        max_z = *it_sizeV;
-        it_sizeV++;
-        se = *it_sizeV;
-        it_sizeV++;
-        v1 = *it_sizeV;
-        it_sizeV++;
-        v2 = *it_sizeV;
-        it_sizeV++;
-        v3 = *it_sizeV;
-        it_sizeV++;
-        emax = *it_sizeV;
-        it_sizeV++;
-        emin = *it_sizeV;
-        it_sizeV++;
-        min_ij = *it_sizeV;
-        it_sizeV++;
-        swap_ij = *it_sizeV;
-        it_sizeV++;
-
-        for (size_t i = 0; i < argsKer->nSymb.size(); ++i)
-        {
-            num_elems[i] = *it_sizeV;
-            it_sizeV++;
-        }
-
-        e = &(*new SgVarRefExp(*itAcrS) - *new SgVarRefExp(*tid) * *new SgVarRefExp(*itIdxAcr));
-
-        st = AssignStatement(*new SgVarRefExp(*itAcrS), *new SgVarRefExp(*itAcrS) - *new SgVarRefExp(*itIdxAcr) *
-            (*new SgVarRefExp(*se) + *new SgVarRefExp(*tid1) - *new SgVarRefExp(*emin)));
-
-        itAcrS++;
-        itIdxAcr++;
-        st1 = AssignStatement(*new SgVarRefExp(*itAcrS), *new SgVarRefExp(*itAcrS) + *new SgVarRefExp(*itIdxAcr) *
-            (*new SgVarRefExp(*se) + *new SgVarRefExp(*tid1) - *new SgVarRefExp(*emin)));
-
-        if_st2 = new SgIfStmt(SgEqOp(*new SgVarRefExp(*v3), *new SgValueExp(1)) && *new SgVarRefExp(emin) < *new SgVarRefExp(tid1) + *new SgVarRefExp(se), *st1);
-        if_st2->insertStmtAfter(*st);
-
-        SgFunctionCallExp *funcCall = new SgFunctionCallExp(*createNewFunctionSymbol("min"));
-        funcCall->addArg(*new SgVarRefExp(*se) + *new SgVarRefExp(*tid1));
-
-        itAcrS--;
-        itIdxAcr--;
-
-        if_st = new SgIfStmt(*new SgVarRefExp(*tid) < *new SgVarRefExp((*itAcr).symb), *if_st2);
-        if (argsKer->nSymb.size() == 0)
-            if_st3 = new SgIfStmt(*new SgVarRefExp(*tid1) < *new SgVarRefExp(*max_z), *if_st);
-        else
-        {
-            SgExpression *tmp = new SgVarRefExp(num_elems[0]);
-            for (size_t i = 1; i < argsKer->nSymb.size(); ++i)
-                tmp = &(*tmp * *new SgVarRefExp(num_elems[i]));
-
-            if_st3 = new SgIfStmt(*new SgVarRefExp(*tid1) < *new SgVarRefExp(*max_z) && *new SgVarRefExp(*tid2) < *tmp, *if_st);
-        }
-        cur_in_kernel->insertStmtAfter(*if_st3, *kernel_st);
-        cur_in_kernel = if_st->lexNext();
-
-        st1 = AssignStatement(*new SgVarRefExp((*itAcr).symb), *new SgVarRefExp(*min_ij));
-
-        st = AssignStatement(*new SgVarRefExp((*itAcr).symb), *new SgValueExp(2) * *new SgVarRefExp(*min_ij) - *new SgVarRefExp(se) -
-            *new SgVarRefExp(tid1) + *new SgVarRefExp(emax) - *new SgVarRefExp(emin) - *new SgValueExp(1));
-
-        if_st1 = new SgIfStmt(*new SgVarRefExp(*tid1) + *new SgVarRefExp(se) < *new SgVarRefExp(*emax), *st1, *st);
-
-        st1 = AssignStatement(*new SgVarRefExp((*itAcr).symb), *new SgVarRefExp(*tid1) + *new SgVarRefExp(se));
-
-        if_st1 = new SgIfStmt(*new SgVarRefExp(*tid1) + *new SgVarRefExp(se) < *new SgVarRefExp(*emin), *st1, *if_st1);
-        if_st3->insertStmtAfter(*if_st1);
-
-        i = (*itAcr).symb;
-        st1 = AssignStatement(*new SgVarRefExp((*itAcr).symb), *new SgVarRefExp(*itAcrS) + ((*new SgVarRefExp(tid1) *
-            (*new SgVarRefExp(v1) + *new SgVarRefExp(v3)) - *new SgVarRefExp(tid))) * *new SgVarRefExp(*itIdxAcr));
-
-        leftExprs[idx_exprs] = new SgVarRefExp((*itAcr).symb);
-        rightExprs[idx_exprs] = &(*new SgVarRefExp(*itAcrS) + ((*new SgVarRefExp(tid1) *
-            (*new SgVarRefExp(v1) + *new SgVarRefExp(v3)) - *new SgVarRefExp(tid))) * *new SgVarRefExp(*itIdxAcr));
-        idx_exprs++;
-
-
-        itAcrS++;
-        itIdxAcr++;
-        itAcr++;
-
-        j = (*itAcr).symb;
-        st1 = AssignStatement(*new SgVarRefExp((*itAcr).symb), *new SgVarRefExp(*itAcrS) + (*new SgVarRefExp(tid1) *
-            *new SgVarRefExp(v2) + *new SgVarRefExp(tid)) * *new SgVarRefExp(*itIdxAcr));
-
-        leftExprs[idx_exprs] = new SgVarRefExp((*itAcr).symb);
-        rightExprs[idx_exprs] = &(*new SgVarRefExp(*itAcrS) + (*new SgVarRefExp(tid1) *
-            *new SgVarRefExp(v2) + *new SgVarRefExp(tid)) * *new SgVarRefExp(*itIdxAcr));
-        idx_exprs++;
-
-        itAcrS++;
-        itIdxAcr++;
-        itAcr++;
-
-        st1 = AssignStatement(*new SgVarRefExp((*itAcr).symb), *new SgVarRefExp(*itAcrS) - *new SgVarRefExp(tid1) *
-            *new SgVarRefExp(*itIdxAcr));
-
-        leftExprs[idx_exprs] = new SgVarRefExp((*itAcr).symb);
-        rightExprs[idx_exprs] = &(*new SgVarRefExp(*itAcrS) - *new SgVarRefExp(tid1) * *new SgVarRefExp(*itIdxAcr));
-        idx_exprs++;
-
-        if (argsKer->symb.size() > 3)
-        {
-            for (size_t i = 0; i < argsKer->symb.size() - 3; ++i)
-            {
-                itAcrS++;
-                itIdxAcr++;
-                itAcr++;
-
-                leftExprs[idx_exprs] = new SgVarRefExp((*itAcr).symb);
-                rightExprs[idx_exprs] = &(*new SgVarRefExp(*itAcrS));
-                idx_exprs++;
-            }
-        }
-
-        if (argsKer->nSymb.size() == 1)
-        {
-            st1 = AssignStatement(*new SgVarRefExp((*it).symb), *new SgVarRefExp(*itS) + *new SgVarRefExp(tid2) *
-                *new SgVarRefExp(*itIdx));
-
-            leftExprs[idx_exprs] = new SgVarRefExp((*it).symb);
-            rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *new SgVarRefExp(tid2) * *new SgVarRefExp(*itIdx));
-            idx_exprs++;
-        }
-        else if (argsKer->nSymb.size() > 1)
-        {
-            SgExpression *e_z1, *e_z2, *tmp_exp;
-            SgFunctionCallExp *funCall = new SgFunctionCallExp(*createNewFunctionSymbol("mod"));
-            e_z1 = new SgVarRefExp(num_elems[0]);
-            funCall->addArg(*new SgVarRefExp(*tid2));
-            funCall->addArg(*e_z1);
-            tmp_exp = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-
-            st = AssignStatement(*new SgVarRefExp((*it).symb), *tmp_exp);
-
-            leftExprs[idx_exprs] = new SgVarRefExp((*it).symb);
-            rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-            idx_exprs++;
-
-            it++;
-            itS++;
-            itIdx++;
-            e_z2 = new SgVarRefExp(num_elems[1]);
-            for (int count = 2; it != argsKer->nSymb.end(); it++, itS++, itIdx++, ++count)
-            {
-                SgFunctionCallExp *funCall = new SgFunctionCallExp(*createNewFunctionSymbol("mod"));
-                it++;
-                if (it == argsKer->nSymb.end())
-                {
-                    tmp_exp = &(*new SgVarRefExp(*itS) + ((*new SgVarRefExp(*tid2) / *e_z1)) * *new SgVarRefExp(*itIdx));
-                    rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + ((*new SgVarRefExp(*tid2) / *e_z1)) * *new SgVarRefExp(*itIdx));
-                }
-                else
-                {
-                    funCall->addArg((*new SgVarRefExp(*tid2) / *e_z1));
-                    funCall->addArg(*e_z2);
-                    tmp_exp = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-                    rightExprs[idx_exprs] = &(*new SgVarRefExp(*itS) + *funCall * *new SgVarRefExp(*itIdx));
-                }
-                it--;
-
-                st = AssignStatement(*new SgVarRefExp((*it).symb), *tmp_exp);
-
-                leftExprs[idx_exprs] = new SgVarRefExp((*it).symb);
-                idx_exprs++;
-
-                e_z1 = &(*e_z1 * *e_z2);
-                it++;
-                if (it != argsKer->nSymb.end())
-                {
-                    e_z2 = new SgVarRefExp(num_elems[count]);
-                }
-                it--;
-            }
-        }
-
-        if (options.isOn(C_CUDA))
-            st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[0])), &(rightExprs[0]->copy()));
-        else
-            st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[0]) + *new SgValueExp(1)), &(rightExprs[0]->copy()));
-        // insert into MAIN If
-        if_st->lastExecutable()->insertStmtAfter(*st);
-
-        for (size_t i = 1; i < argsKer->baseIdxsInKer.size(); ++i)
-        {
-            if (options.isOn(C_CUDA))
-                st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[i])), &(rightExprs[i]->copy()));
-            else
-                st = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[i]) + *new SgValueExp(1)), &(rightExprs[i]->copy()));
-            if_st->lastExecutable()->insertStmtAfter(*st);
-        }
-
-        //insert swap block
-        if (options.isOn(C_CUDA))
-        {
-            SgExpression *firstElem = new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[0]));
-            SgExpression *secondElem = new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[1]));
-
-            if_st2 = new SgIfStmt(*new SgVarRefExp(swap_ij) * *new SgVarRefExp(v3), *new SgCExpStmt(*firstElem ^= *secondElem ^= *firstElem ^= *secondElem));
-        }
-        else
-        {
-            st1 = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[0]) + *new SgValueExp(1)), new SgVarRefExp(v3));
-            if_st2 = new SgIfStmt(*new SgVarRefExp(swap_ij) * *new SgVarRefExp(v3), *st1);
-
-            st1 = AssignStatement(new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[1]) + *new SgValueExp(1)),
-                                  new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[0]) + *new SgValueExp(1)));
-            if_st2->insertStmtAfter(*st1);
-
-            st1 = AssignStatement(new SgVarRefExp(v3), new SgArrayRefExp(*coords, *new SgVarRefExp(argsKer->baseIdxsInKer[1]) + *new SgValueExp(1)));
-            if_st2->insertStmtAfter(*st1);
-        }
-        if_st->lastExecutable()->insertStmtAfter(*if_st2);
-
-        for (size_t i = 0; i < argsKer->baseIdxsInKer.size(); ++i)
-        {
-            if (options.isOn(C_CUDA))
-                st = AssignStatement(&(leftExprs[i]->copy()), new SgArrayRefExp(*coords, *new SgValueExp((int)(i))));
-            else
-                st = AssignStatement(&(leftExprs[i]->copy()), new SgArrayRefExp(*coords, *new SgValueExp((int)(i + 1))));
-            if_st->lastExecutable()->insertStmtAfter(*st);
-        }
-        delete[]leftExprs;
-        delete[]rightExprs;
-
-        cur_in_kernel = if_st->lastExecutable();
-    }
-
-    // generating assign statements for MAXLOC, MINLOC reduction operations
-    if (red_list)
-        Do_Assign_For_Loc_Arrays();
-
-    // inserting loop body to innermost IF statement of BlockForCalculationThreadLoopVariables
-
-#if debugMode
-        mywarn("  end: block5");
-        mywarn("strat: inserting loop body");
-#endif
-
-    SgStatement *currStForInsetGetXY = cur_in_kernel;
-    vector<SgSymbol*> forDeclarationInKernel;
-    set<char *> uniqueNames;
-
-    // create, insert, optimize and convert loop_body into kernel
-    {
-        SgStatement *stk, *last;
-        vector<newInfo> allNewInfo;
-
-        if (argsKer->symb.size() == 1)
-        {
-            if (options.isOn(GPU_O0))
-                optimizeLoopBodyForOne(allNewInfo);
-            oneCase = true;
-        }
-        else
-            oneCase = false;
-
-
-        block = CreateIfForRedBlack(loop_body, nloop);
-        last = cur_in_kernel->lexNext();
-
-        if (argsKer->symb.size() == 1 && allNewInfo.size() != 0 && options.isOn(GPU_O0)) //insert needed assigns
-        {
-            SgIfStmt *ifSt = new SgIfStmt(*new SgVarRefExp(argsKer->idxAcross[0]) > *new SgValueExp(0), *&allNewInfo[0].loadsBeforePlus[0]->copy(), *&allNewInfo[0].loadsBeforeMinus[0]->copy());
-            for (size_t i = 0; i < allNewInfo.size(); ++i)
-            {
-                if (i == 0)
-                {
-                    for (size_t k = 1; k < allNewInfo[i].loadsBeforePlus.size(); ++k)
-                    {
-                        ifSt->insertStmtAfter(*&allNewInfo[i].loadsBeforePlus[k]->copy(), *ifSt);
-                        ifSt->falseBody()->insertStmtBefore(*&allNewInfo[i].loadsBeforeMinus[k]->copy(), *ifSt);
-                    }
-                }
-                else
-                {
-                    for (size_t k = 0; k < allNewInfo[i].loadsBeforePlus.size(); ++k)
-                    {
-                        ifSt->insertStmtAfter(*&allNewInfo[i].loadsBeforePlus[k]->copy(), *ifSt);
-                        ifSt->falseBody()->insertStmtBefore(*&allNewInfo[i].loadsBeforeMinus[k]->copy(), *ifSt);
-                    }
-                }
-            }
-            mainFor->insertStmtBefore(*ifSt);
-        }
-
-        if (argsKer->symb.size() == 1 && options.isOn(GPU_O0))
-            cur_in_kernel->insertStmtAfter(*block, *mainFor); //cur_in_kernel is innermost FOR stmt
-        else
-            cur_in_kernel->insertStmtAfter(*block, *if_st); //cur_in_kernel is innermost IF statement
-
-        if (options.isOn(C_CUDA))
-        {
-            if (block->comments() == NULL)
-                block->addComment("// Loop body");
-        }
-        else
-            block->addComment("! Loop body\n");
-
-        // correct copy of loop_body (change or extract last statement of block if it is CONTROL_END)
-        if (block != loop_body)
-            stk = last->lexPrev()->lexPrev();
-        else
-            stk = last->lexPrev();
-
-        if (stk->variant() == CONTROL_END)
-        {
-            if (stk->hasLabel() || stk == loop_body)  // when body of DO_ENDDO loop is empty, stk == loop_body
-                stk->setVariant(CONT_STAT);
-            else
-            {
-                st = stk->lexPrev();
-                stk->extractStmt();
-                stk = st;
-            }
-        }
-
-        ReplaceExitCycleGoto(block, stk);
-
-        for_kernel = 1;
-        last = cur_st;
-
-        if (argsKer->symb.size() == 1 && allNewInfo.size() != 0 && options.isOn(GPU_O0)) //insert needed assigns
-        {
-            SgIfStmt *ifSt = new SgIfStmt(*new SgVarRefExp(argsKer->idxAcross[0]) > *new SgValueExp(0), *&allNewInfo[0].loadsInForPlus[0]->copy(), *&allNewInfo[0].loadsInForMinus[0]->copy());
-
-            for (size_t i = 0; i < allNewInfo.size(); ++i)
-            {
-                size_t k;
-                if (i == 0)
-                    k = 1;
-                else
-                    k = 0;
-                for (; k < allNewInfo[i].loadsInForPlus.size(); ++k)
-                {
-                    ifSt->insertStmtAfter(*&allNewInfo[i].loadsInForPlus[k]->copy(), *ifSt);
-                    ifSt->falseBody()->insertStmtBefore(*&allNewInfo[i].loadsInForMinus[k]->copy(), *ifSt);
-                }
-            }
-            mainFor->insertStmtAfter(*ifSt);
-
-
-            for (size_t i = 0; i < allNewInfo.size(); ++i)
-            {
-                if (options.isOn(C_CUDA))
-                {
-                    for (size_t k = 0; k < allNewInfo[i].stores.size(); ++k)
-                        mainFor->lastExecutable()->insertStmtAfter(*&allNewInfo[i].stores[k]->copy());
-                }
-                else
-                {
-                    for (size_t k = 0; k < allNewInfo[i].stores.size(); ++k)
-                        mainFor->lastExecutable()->lexPrev()->lexPrev()->insertStmtBefore(*&allNewInfo[i].stores[k]->copy());
-                }
-            }
-
-            size_t k = allNewInfo[0].swapsUp.size() - 1;
-            ifSt = new SgIfStmt(*new SgVarRefExp(argsKer->idxAcross[0]) > *new SgValueExp(0), *&allNewInfo[0].swapsDown[k]->copy(), *&allNewInfo[0].swapsUp[k]->copy());
-            for (size_t i = 0; i < allNewInfo.size(); ++i)
-            {
-                size_t last;
-                if (i == 0)
-                    last = allNewInfo[i].swapsUp.size() - 1;
-                else
-                    last = allNewInfo[0].swapsUp.size();
-                for (size_t k = 0; k < last; ++k)
-                {
-                    ifSt->insertStmtAfter(*&allNewInfo[i].swapsDown[last - 1 - k]->copy(), *ifSt);
-                    ifSt->falseBody()->insertStmtBefore(*&allNewInfo[i].swapsUp[last - 1 - k]->copy(), *ifSt);
-                }
-            }
-            mainFor->lastExecutable()->insertStmtAfter(*ifSt);
-        }
-
-        // insert dvmh_convert_XY calls directly into loop_body if some array accesses depend on its definitions (inserting right before accesses)
-        if (options.isOn(AUTO_TFM))
-        {
-            if (acrossNum != 1)
-            {
-                map<SgSymbol*, Array*>& arrays = currentLoop->getArrays();
-                string funcDvmhConvXYname_type = funcDvmhConvXYname;
-                if (!options.isOn(C_CUDA))
-                {
-                    if (strcmp(idxTypeInKernel->symbol()->identifier(), indexTypeInKernel(rt_INT)->symbol()->identifier()) == 0)
-                        funcDvmhConvXYname_type += "_int";
-                    else if (strcmp(idxTypeInKernel->symbol()->identifier(), indexTypeInKernel(rt_LONG)->symbol()->identifier()) == 0)
-                        funcDvmhConvXYname_type += "_long";
-                    else if (strcmp(idxTypeInKernel->symbol()->identifier(), indexTypeInKernel(rt_LLONG)->symbol()->identifier()) == 0)
-                        funcDvmhConvXYname_type += "_llong";
-                }
-                for (map<SgSymbol*, Array*>::iterator it = arrays.begin(); it != arrays.end(); ++it)
-                {
-                    Array* array = it->second;
-                    set<SgSymbol*>& privateList = currentLoop->getPrivateList();
-                    if (privateList.find(it->first) == privateList.end())
-                    {
-                        for (map<string, Access*>::iterator it2 = array->getAccesses().begin(); it2 != array->getAccesses().end(); ++it2)
-                            analyzeArrayIndxs(array->getSymbol(), it2->second->getSubscripts());
-                        int numSymb = 0;
-                        for (size_t i1 = 0; i1 < argsKer->arrayNames.size(); ++i1)
-                            if (strcmp(argsKer->arrayNames[i1], array->getSymbol()->identifier()) == 0)
-                            {
-                                numSymb = (int)i1;
-                                break;
-                            }
-                        array->generateAssigns(
-                            new SgVarRefExp(argsKer->otherVars[8 * numSymb + 1]),
-                            new SgVarRefExp(argsKer->otherVars[8 * numSymb + 4]),
-                            new SgVarRefExp(argsKer->otherVars[8 * numSymb + 2]),
-                            new SgVarRefExp(argsKer->otherVars[8 * numSymb + 5]),
-                            new SgVarRefExp(argsKer->otherVars[8 * numSymb + 6]));
-                        SgIfStmt* ifSt = NULL, *if1case = NULL, *if2case = NULL;
-                        TfmInfo& tfmInfo = array->getTfmInfo();
-                        map<SgStatement*, vector<SgFunctionCallExp*> >& ifCalls = tfmInfo.ifCalls;
-                        map<SgStatement*, vector<SgFunctionCallExp*> >& elseCalls = tfmInfo.elseCalls;
-                        SgSymbol* x_axis = argsKer->otherVars[8 * numSymb];
-                        SgSymbol* y_axis = argsKer->otherVars[8 * numSymb + 3];
-                        int tfsDim1 = tfmInfo.transformDims[0];
-                        int tfsDim2 = tfmInfo.transformDims[1];
-                        for (map<SgStatement*, vector<SgFunctionCallExp*> >::iterator it = ifCalls.begin(); it != ifCalls.end(); ++it)
-                        {
-                            if (it->first == NULL)
-                                continue;
-                            if (ifCalls[it->first].size() > 0)
-                            {
-                                if (options.isOn(C_CUDA))
-                                {
-                                    if2case = new SgIfStmt((SgEqOp(*new SgVarRefExp(x_axis->copy()), *new SgValueExp(tfsDim2)) && SgEqOp(*new SgVarRefExp(y_axis->copy()), *new SgValueExp(tfsDim1))), *new SgCExpStmt(*(elseCalls[it->first][0])));
-                                    if1case = new SgIfStmt((SgEqOp(*new SgVarRefExp(x_axis->copy()), *new SgValueExp(tfsDim1)) && SgEqOp(*new SgVarRefExp(y_axis->copy()), *new SgValueExp(tfsDim2))), *new SgCExpStmt(*(ifCalls[it->first][0])), *if2case);
-                                    ifSt = new SgIfStmt(SgEqOp(*new SgVarRefExp(argsKer->otherVars[8 * numSymb + 7]), *new SgValueExp(2)), *if1case);
-                                }
-                                else
-                                {
-                                    if2case = new SgIfStmt((SgEqOp(*new SgVarRefExp(x_axis->copy()), *new SgValueExp(tfsDim2)) && SgEqOp(*new SgVarRefExp(y_axis->copy()), *new SgValueExp(tfsDim1))),
-                                        *new SgCallStmt(*createNewFunctionSymbol(funcDvmhConvXYname_type.c_str()), *(elseCalls[it->first][0]->args())));
-                                    if1case = new SgIfStmt((SgEqOp(*new SgVarRefExp(x_axis->copy()), *new SgValueExp(tfsDim1)) && SgEqOp(*new SgVarRefExp(y_axis->copy()), *new SgValueExp(tfsDim2))),
-                                        *new SgCallStmt(*createNewFunctionSymbol(funcDvmhConvXYname_type.c_str()), *(ifCalls[it->first][0]->args())), *if2case);
-                                    ifSt = new SgIfStmt(SgEqOp(*new SgVarRefExp(argsKer->otherVars[8 * numSymb + 7]), *new SgValueExp(2)), *if1case);
-                                }
-                            }
-
-                            for (size_t k = 1; k < ifCalls[it->first].size(); ++k)
-                            {
-                                if (options.isOn(C_CUDA))
-                                {
-                                    if1case->insertStmtAfter(*new SgCExpStmt(*(ifCalls[it->first][k])));
-                                    if2case->insertStmtAfter(*new SgCExpStmt(*(elseCalls[it->first][k])));
-                                }
-                                else
-                                {
-                                    if1case->insertStmtAfter(*new SgCallStmt(*createNewFunctionSymbol(funcDvmhConvXYname_type.c_str()), *(ifCalls[it->first][k]->args())));
-                                    if2case->insertStmtAfter(*new SgCallStmt(*createNewFunctionSymbol(funcDvmhConvXYname_type.c_str()), *(elseCalls[it->first][k]->args())));
-                                }
-                            }
-
-                            if (ifSt != NULL)
-                            {
-                                if (loop_body == it->first)
-                                    loop_body->insertStmtBefore(*ifSt);
-                                else
-                                {
-                                    for (SgStatement* stmt = loop_body; stmt != NULL; stmt = stmt->lexNext())
-                                    {
-                                        if (stmt->lexNext() == it->first)
-                                        {
-                                            stmt->insertStmtAfter(*ifSt);
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
-                            ifSt = NULL;
-                        }
-                    }
-                }
-            }
-        }
-
-        TranslateBlock(if_st);
-
-        if (options.isOn(C_CUDA))
-        {
-            //get info of arrays in private and locvar lists
-            swapDimentionsInprivateList();
-            if (argsKer->symb.size() == 1 && options.isOn(GPU_O0))
-            {         
-                Translate_Fortran_To_C(mainFor->lexPrev()->controlParent());
-                Translate_Fortran_To_C(mainFor, mainFor->lastNodeOfStmt(), copyOfBody, 0); //countOfCopies
-            }
-            else
-                Translate_Fortran_To_C(if_st, if_st->lastNodeOfStmt(), copyOfBody, 0); // countOfCopies
-        }
-
-        cur_st = last;
-        if (createBodyKernel == false)
-            createBodyKernel = true;
-
-    }
-
-    //insert dvmh_convert_XY before loop_body if its arguments depend only on loop indices
-    if (options.isOn(AUTO_TFM))
-    {
-#if debugMode
-        mywarn("strat: inserting transform calls");
-#endif
-        if (acrossNum != 1)
-        {
-            map<SgSymbol*, Array*>& arrays = currentLoop->getArrays();
-            string funcDvmhConvXYname_type = funcDvmhConvXYname;
-            if (!options.isOn(C_CUDA))
-            {
-                if (strcmp(idxTypeInKernel->symbol()->identifier(), indexTypeInKernel(rt_INT)->symbol()->identifier()) == 0)
-                    funcDvmhConvXYname_type += "_int";
-                else if (strcmp(idxTypeInKernel->symbol()->identifier(), indexTypeInKernel(rt_LONG)->symbol()->identifier()) == 0)
-                    funcDvmhConvXYname_type += "_long";
-                else if (strcmp(idxTypeInKernel->symbol()->identifier(), indexTypeInKernel(rt_LLONG)->symbol()->identifier()) == 0)
-                    funcDvmhConvXYname_type += "_llong";
-            }
-            for (map<SgSymbol*, Array*>::iterator it = arrays.begin(); it != arrays.end(); ++it)
-            {
-                Array *array = it->second;
-                set<SgSymbol*>& privateList = currentLoop->getPrivateList();
-                if (privateList.find(it->first) == privateList.end())
-                {
-                    int numSymb = 0;
-                    for (size_t i1 = 0; i1 < argsKer->arrayNames.size(); ++i1)
-                    if (strcmp(argsKer->arrayNames[i1], array->getSymbol()->identifier()) == 0)
-                    {
-                        numSymb = (int)i1;
-                        break;
-                    }
-                    SgIfStmt* ifSt = NULL, *if1case = NULL, *if2case = NULL;
-                    TfmInfo& tfmInfo = array->getTfmInfo();
-                    vector<SgFunctionCallExp*>& ifCalls = tfmInfo.ifCalls[NULL];
-                    vector<SgFunctionCallExp*>& elseCalls = tfmInfo.elseCalls[NULL];
-                    SgSymbol* x_axis = argsKer->otherVars[8 * numSymb];
-                    SgSymbol* y_axis = argsKer->otherVars[8 * numSymb + 3];
-                    int tfsDim1 = tfmInfo.transformDims[0];
-                    int tfsDim2 = tfmInfo.transformDims[1];
-
-                    if (ifCalls.size() > 0)
-                    if (options.isOn(C_CUDA))
-                    {
-                        if2case = new SgIfStmt((SgEqOp(*new SgVarRefExp(x_axis->copy()), *new SgValueExp(tfsDim2)) && SgEqOp(*new SgVarRefExp(y_axis->copy()), *new SgValueExp(tfsDim1))), *new SgCExpStmt(*(elseCalls[0])));
-                        if1case = new SgIfStmt((SgEqOp(*new SgVarRefExp(x_axis->copy()), *new SgValueExp(tfsDim1)) && SgEqOp(*new SgVarRefExp(y_axis->copy()), *new SgValueExp(tfsDim2))), *new SgCExpStmt(*(ifCalls[0])), *if2case);
-                        ifSt = new SgIfStmt(SgEqOp(*new SgVarRefExp(argsKer->otherVars[8 * numSymb + 7]), *new SgValueExp(2)), *if1case);
-                    }
-                    else
-                    {
-                        if2case = new SgIfStmt((SgEqOp(*new SgVarRefExp(x_axis->copy()), *new SgValueExp(tfsDim2)) && SgEqOp(*new SgVarRefExp(y_axis->copy()), *new SgValueExp(tfsDim1))),
-                            *new SgCallStmt(*createNewFunctionSymbol(funcDvmhConvXYname_type.c_str()), *(elseCalls[0]->args())));
-                        if1case = new SgIfStmt((SgEqOp(*new SgVarRefExp(x_axis->copy()), *new SgValueExp(tfsDim1)) && SgEqOp(*new SgVarRefExp(y_axis->copy()), *new SgValueExp(tfsDim2))),
-                            *new SgCallStmt(*createNewFunctionSymbol(funcDvmhConvXYname_type.c_str()), *(ifCalls[0]->args())), *if2case);
-                        ifSt = new SgIfStmt(SgEqOp(*new SgVarRefExp(argsKer->otherVars[8 * numSymb + 7]), *new SgValueExp(2)), *if1case);
-                    }
-                    for (size_t k = 1; k < ifCalls.size(); ++k)
-                    {
-                        if (options.isOn(C_CUDA))
-                        {
-                            if1case->insertStmtAfter(*new SgCExpStmt(*(ifCalls[k])));
-                            if2case->insertStmtAfter(*new SgCExpStmt(*(elseCalls[k])));
-                        }
-                        else
-                        {
-                            if1case->insertStmtAfter(*new SgCallStmt(*createNewFunctionSymbol(funcDvmhConvXYname_type.c_str()), *(ifCalls[k]->args())));
-                            if2case->insertStmtAfter(*new SgCallStmt(*createNewFunctionSymbol(funcDvmhConvXYname_type.c_str()), *(elseCalls[k]->args())));
-                        }
-                    }
-                    if (ifSt != NULL)
-                        currStForInsetGetXY->insertStmtAfter(*ifSt);
-
-                    vector<SgStatement*>& zeroSt = tfmInfo.zeroSt;
-                    for (size_t k = 0; k < zeroSt.size(); ++k)
-                        currStForInsetGetXY->insertStmtAfter(zeroSt[k]->copy());
-
-                    vector<SgSymbol*>& coef = tfmInfo.coefficients;
-                    for (unsigned z = 0; z < coef.size(); ++z)
-                        forDeclarationInKernel.push_back(&(coef[z]->copy()));
-                }
-            }
-        }
-
-#if debugMode
-        mywarn("end: inserting transform calls");
-#endif
-    }
-
-#if debugMode
-        mywarn("  end: inserting loop body");
-        mywarn("start: create reduction block");
-#endif
-
-    if (red_list && argsKer->nSymb.size() == 0)
-    {
-        int num;
-        reduction_operation_list *tmp_list = red_struct_list;
-        int needComment = 1;
-        SgSymbol* overAll = OverallBlocksSymbol();
-        SgSymbol* freeS = *argsKer->acrossS.begin();
-
-        for (SgExpression *er = red_list; er; er = er->rhs())
-        {
-            num = 0;
-            int flag_func_call = 1;
-            SgExpression *red_expr_ref = er->lhs()->rhs(); // reduction variable reference
-            SgExpression *loc_var_ref = NULL, *en = NULL;
-            int loc_el_num = 0;
-            if (isSgExprListExp(red_expr_ref))
-            {
-                red_expr_ref = red_expr_ref->lhs(); // reduction variable reference
-                loc_var_ref = er->lhs()->rhs()->rhs()->lhs(); //location array reference
-                en = er->lhs()->rhs()->rhs()->rhs()->lhs(); // number of elements in location array
-                loc_el_num = LocElemNumber(en);
-            }
-            num = RedFuncNumber(er->lhs()->lhs()); // type of reduction
-            const char *str_operation = NULL;
-            if (num == 1)
-                flag_func_call = 0; // +
-            else if (num == 2)
-                flag_func_call = 0; // *
-            else if (num == 3)
-                str_operation = "max";
-            else if (num == 4)
-                str_operation = "min";
-            else if (num == 5)
-                flag_func_call = 0; // and
-            else if (num == 6)
-                flag_func_call = 0; // or
-            else if (num == 7)
-                flag_func_call = 0; // !=
-            else if (num == 8)
-                flag_func_call = 0; // ==
-            else if (num == 9)
-                flag_func_call = 0; // maxloc
-            else if (num == 10)
-                flag_func_call = 0; // minloc
-
-            if (flag_func_call == 1)
-            {
-                SgFunctionCallExp *funcCall = new SgFunctionCallExp(*createNewFunctionSymbol(str_operation));
-                if (argsKer->symb.size() < 3)
-                {
-                    SgSymbol *redGrid = new SgSymbol(VARIABLE_NAME, tmp_list->red_grid->identifier());
-                    redGrid->setType(*new SgArrayType(*tmp_list->red_grid->type()));
-
-                    if (tmp_list->redvar_size == 0)
-                    {
-                        funcCall->addArg(*new SgArrayRefExp(*redGrid, *new SgVarRefExp(*tid)));
-                        funcCall->addArg(*new SgVarRefExp(*red_expr_ref->symbol()));
-                        st = AssignStatement(*new SgArrayRefExp(*redGrid, *new SgVarRefExp(*tid)), *funcCall);
-                    }
-                    else if (tmp_list->redvar_size > 0 && options.isOn(C_CUDA)) //TODO for Fortran
-                    {
-                        SgExpression* idx = &(*new SgVarRefExp(freeS) * *new SgVarRefExp(overAll) + *new SgVarRefExp(*tid));
-                        funcCall->addArg(*new SgArrayRefExp(*redGrid, *idx));
-                        funcCall->addArg(*new SgArrayRefExp(*red_expr_ref->symbol(), *new SgVarRefExp(freeS)));
-
-                        SgExpression* start = new SgExpression(ASSGN_OP, new SgVarRefExp(freeS), new SgValueExp(0));
-                        SgExpression* end = &(*new SgVarRefExp(freeS) < *new SgValueExp(tmp_list->redvar_size));
-                        SgExpression* step = new SgExpression(ASSGN_OP, new SgVarRefExp(freeS), &(*new SgVarRefExp(freeS) + *new SgValueExp(1)));
-                        st = new SgForStmt(start, end, step, AssignStatement(*new SgArrayRefExp(*redGrid, *idx), *funcCall));
-                    }
-                    else
-                    {
-                        //TODO
-                    }
-                }
-                else
-                {
-                    SgSymbol *redGrid = new SgSymbol(VARIABLE_NAME, tmp_list->red_grid->identifier());
-                    redGrid->setType(*new SgArrayType(*tmp_list->red_grid->type()));
-
-                    SgSymbol *emin = argsKer->sizeVars[6];
-                    funcCall->addArg(*new SgArrayRefExp(*redGrid, *new SgVarRefExp(*tid) + *new SgVarRefExp(*tid1) * *new SgVarRefExp(*emin)));
-                    funcCall->addArg(*new SgVarRefExp(red_expr_ref->symbol()));
-                    st = AssignStatement(*new SgArrayRefExp(*redGrid, *new SgVarRefExp(*tid) + *new SgVarRefExp(*tid1) * *new SgVarRefExp(*emin)), *funcCall);
-                }
-            }
-            else
-            {
-                SgExpression *e1 = NULL;
-                if (argsKer->symb.size() < 3)
-                {
-                    if (tmp_list->redvar_size == 0)
-                        e1 = new SgVarRefExp(*tid);
-                    else if (tmp_list->redvar_size > 0)
-                        e1 = &(*new SgVarRefExp(freeS) * *new SgVarRefExp(overAll) + *new SgVarRefExp(*tid));
-                    else
-                    {
-                        //TODO
-                    }
-                }
-                else
-                {
-                    SgSymbol *emin = argsKer->sizeVars[6];
-                    e1 = &(*new SgVarRefExp(*tid) + *new SgVarRefExp(*tid1) * *new SgVarRefExp(*emin));
-                }
-                e = NULL;
-                SgIfStmt *ifSt = NULL;
-                SgSymbol *redGrid = new SgSymbol(VARIABLE_NAME, tmp_list->red_grid->identifier());
-                redGrid->setType(*new SgArrayType(*tmp_list->red_grid->type()));
-
-                SgExpression* red_ref = NULL;
-
-                if (tmp_list->redvar_size == 0)
-                    red_ref = &red_expr_ref->copy();
-                else // TODO
-                    red_ref = new SgArrayRefExp(*red_expr_ref->symbol(), *new SgVarRefExp(freeS));
-
-                if (num == 1)
-                    e = &(*new SgArrayRefExp(*redGrid, *e1) + *red_ref);
-                else if (num == 2)
-                    e = &(*new SgArrayRefExp(*redGrid, *e1) * *red_ref);
-                else if (num == 5)
-                    e = &(*new SgArrayRefExp(*redGrid, *e1) && *red_ref);
-                else if (num == 6)
-                    e = &(*new SgArrayRefExp(*redGrid, *e1) || *red_ref);
-                else if (num == 7)
-                    e = &SgNeqOp(*new SgArrayRefExp(*redGrid, *e1), *red_ref);
-                else if (num == 8)
-                    e = &SgEqOp(*new SgArrayRefExp(*redGrid, *e1), *red_ref);
-                else if (num == 9 || num == 10)
-                {
-                    st = AssignStatement(*new SgArrayRefExp(*redGrid, *e1), red_expr_ref->copy());
-                    if (num == 9)
-                        ifSt = new SgIfStmt(red_expr_ref->copy() > *new SgArrayRefExp(*redGrid, *e1), *st);
-                    else
-                        ifSt = new SgIfStmt(red_expr_ref->copy() < *new SgArrayRefExp(*redGrid, *e1), *st);
-
-                    for (int i = loc_el_num - 1; i >= 0; i--)
-                    {
-                        SgSymbol *locGrid = new SgSymbol(VARIABLE_NAME, tmp_list->loc_grid->identifier());
-                        locGrid->setType(*new SgArrayType(*tmp_list->loc_grid->type()));
-
-                        if (options.isOn(C_CUDA))
-                            st = AssignStatement(*new SgArrayRefExp(*locGrid, *new SgValueExp(loc_el_num) * *e1 + *new SgValueExp(i)), *new SgArrayRefExp(*loc_var_ref->symbol(), *new SgValueExp(i)));
-                        else
-                            st = AssignStatement(*new SgArrayRefExp(*locGrid, *new SgValueExp(i + 1), *e1), *new SgArrayRefExp(*loc_var_ref->symbol(), *new SgValueExp(i + 1)));//TODO it like in C_Cuda
-                        ifSt->insertStmtAfter(*st);
-                    }
-                }
-
-                if (num != 9 && num != 10)
-                {
-                    if (tmp_list->redvar_size == 0)
-                        st = AssignStatement(*new SgArrayRefExp(*redGrid, *e1), *e);
-                    else if (tmp_list->redvar_size > 0 && options.isOn(C_CUDA)) // TODO for Fortran
-                    {
-                        SgExpression* start = new SgExpression(ASSGN_OP, new SgVarRefExp(freeS), new SgValueExp(0));
-                        SgExpression* end = &(*new SgVarRefExp(freeS) < *new SgValueExp(tmp_list->redvar_size));
-                        SgExpression* step = new SgExpression(ASSGN_OP, new SgVarRefExp(freeS), &(*new SgVarRefExp(freeS) + *new SgValueExp(1)));
-                        st = new SgForStmt(start, end, step, AssignStatement(*new SgArrayRefExp(*redGrid, *e1), *e));
-                    }
-                    else
-                    {
-                        //TODO
-                    }
-                }
-                else
-                    st = ifSt;
-            }
-            if (argsKer->symb.size() < 3)
-                if_st->lastExecutable()->insertStmtAfter(*st, *if_st);
-            else
-                if_st->lastExecutable()->insertStmtAfter(*st);
-            tmp_list = tmp_list->next;
-            if (needComment == 1)
-            {
-                if (options.isOn(C_CUDA))
-                    st->addComment("// Reduction");
-                else
-                    st->addComment("! Reduction\n");
-                needComment = 0;
-            }
-        }
-
-        DeclarationCreateReductionBlocksAcross(nloop, red_list);
-    }
-    else if (red_list && argsKer->nSymb.size() > 0) // generating reduction calculation blocks
-        CreateReductionBlocksAcross(st_end, nloop, red_list, new SgSymbol(*tid));
-
-#if debugMode
-        mywarn(" end: create reduction block");
-#endif
-
-    // make declarations
-    if (options.isOn(C_CUDA))
-        MakeDeclarationsForKernel_On_C_Across(idxTypeInKernel);
-    else // Fortran-Cuda
-        MakeDeclarationsForKernelAcross(idxTypeInKernel);
-    for_kernel = 0;
-
-    st = coords->makeVarDeclStmt();
-    kernel_st->insertStmtAfter(*st);
-
-    st = tid->makeVarDeclStmt();
-    kernel_st->insertStmtAfter(*st);
-
-    if (tmpvar1 != NULL)
-        addDeclExpList(tmpvar1, st->expr(0));
-
-    if (options.isOn(AUTO_TFM))
-    {
-        for (size_t i = 0; i < forDeclarationInKernel.size(); ++i)
-            addDeclExpList(forDeclarationInKernel[i], st->expr(0));
-    }
-
-    if (argsKer->symb.size() == 1)
-    {
-        if (argsKer->nSymb.size() == 2)
-            addDeclExpList(tid1, st->expr(0));
-        else if (argsKer->nSymb.size() >= 3)
-        {
-            addDeclExpList(tid1, st->expr(0));
-            addDeclExpList(tid2, st->expr(0));
-        }
-    }
-    else if (argsKer->symb.size() == 2)
-    {
-        if (argsKer->nSymb.size() == 1)
-            addDeclExpList(tid1, st->expr(0));
-        else if (argsKer->nSymb.size() >= 2)
-        {
-            addDeclExpList(tid1, st->expr(0));
-            addDeclExpList(tid2, st->expr(0));
-        }
-    }
-    else if (argsKer->symb.size() >= 3)
-    {
-        addDeclExpList(tid1, st->expr(0));
-        if (argsKer->nSymb.size() > 0)
-            addDeclExpList(tid2, st->expr(0));
-    }
-
-    if (!options.isOn(C_CUDA))
-    {
-        createDeclaration(argsKer->sizeVars);
-        createDeclaration(argsKer->acrossS);
-        createDeclaration(argsKer->notAcrossS);
-        createDeclaration(argsKer->idxAcross);
-        createDeclaration(argsKer->idxNotAcross);
-
-        for (size_t i = 0; i < argsKer->otherVars.size() / 8 * 8; i += 8)
-        {
-            createDeclaration(argsKer->otherVars[i]);
-            addDeclExpList(argsKer->otherVars[i + 3], st->expr(0));
-
-            createDeclaration(argsKer->otherVars[i + 1]);
-            addDeclExpList(argsKer->otherVars[i + 4], st->expr(0));
-
-            createDeclaration(argsKer->otherVars[i + 2]);
-            addDeclExpList(argsKer->otherVars[i + 5], st->expr(0));
-
-            createDeclaration(argsKer->otherVars[i + 6]);
-            addDeclExpList(argsKer->otherVars[i + 7], st->expr(0));
-        }
-
-        if (argsKer->otherVars.size() != 0 && argsKer->otherVars.size() % 8 != 0)
-            createDeclaration(argsKer->otherVars[argsKer->otherVars.size() - 1]);
-
-        for (size_t i = 0; i < argsKer->baseIdxsInKer.size(); ++i)
-        {
-            if (i == 0)
-                createDeclaration(argsKer->baseIdxsInKer[i]);
-            else
-                addDeclExpList(argsKer->baseIdxsInKer[i], st->expr(0));
-        }
-
-        if (argsKer->cond_ != NULL)
-        {
-            createDeclaration(argsKer->cond_);
-            for (size_t i = 0; i < argsKer->steps.size(); ++i)
-                addDeclExpList(argsKer->steps[i], st->expr(0));
-        }
-    }
-#if debugMode
-        mywarn("  end: CreateLoopKernelAcross");
-#endif
-
-    // inserting IMPLICIT NONE
-    if (!options.isOn(C_CUDA)) // Fortran-Cuda
-        kernel_st->insertStmtAfter(*new SgStatement(IMPL_DECL), *kernel_st);
-    if (options.isOn(C_CUDA))
-        RenamingCudaFunctionVariables(kernel_st, skernel, 1);
-
-    ACROSS_MOD_IN_KERNEL = 0;
-    return kernel_st;
-}
-
-
-// -------------------------- Reduction block for Across ---------------------------- //
-
-SgSymbol *RedBlockSymbolInKernelAcross(SgSymbol *s, SgType *type)
-{
-    char *name = NULL;
-    SgSymbol *sb = NULL;
-    SgValueExp M0(0);
-    SgExpression  *MD = new SgExpression(DDOT, &M0.copy(), new SgKeywordValExp("*"), NULL);
-    SgArrayType *typearray;
-    int i = 1;
-
-    if (!type)
-        typearray = new SgArrayType(*s->type()->baseType());
-    else if (isSgArrayType(s->type()))
-        typearray = (SgArrayType *)&(s->type()->copy());
-    else
-        typearray = new SgArrayType(*type);
-
-    if (!options.isOn(C_CUDA))
-        typearray->addRange(*MD);
-    else
-        typearray->addDimension(NULL);
-
-    name = new char[strlen(s->identifier()) + 8];
-    sprintf(name, "%s_block", s->identifier());
-
-    while (isSameNameShared(name))
-        sprintf(name, "%s_block%d", s->identifier(), i++);
-
-    sb = new SgVariableSymb(name, *typearray, *kernel_st); // scope may be mod_gpu
-#if 0
-    shared_list = AddToSymbList(shared_list, sb);
-#endif
-    delete[]name;
-
-    return sb;
-}
-
-void DeclarationOfReductionBlockInKernelAcross(SgExpression *ered, reduction_operation_list *rsl)
-{
-    SgStatement *newst, *current, *if_st, *while_st, *typedecl, *st, *do_st;
-    SgExpression *eatr, *cond, *ev;
-    SgSymbol *red_var, *red_var_k, *s_block, *loc_var, *sf;
-    SgType *rtype;
-
-    //init block
-    newst = current = if_st = while_st = typedecl = st = do_st = NULL;
-    eatr = cond = ev = NULL;
-    red_var = red_var_k = s_block = loc_var = sf = NULL;
-    rtype = NULL;
-    loc_el_num = 0;
-    //end of init block
-
-    // analys of reduction operation
-    // ered - reduction operation (variant==ARRAY_OP)
-    ev = ered->rhs(); // reduction variable reference for reduction operations except MINLOC,MAXLOC
-    if (isSgExprListExp(ev))    // for MAXLOC,MINLOC
-    {
-        loc_var = ev->rhs()->lhs()->symbol();  //location array reference
-        ev = ev->lhs(); // reduction variable reference
-    }
-    else
-        loc_var = NULL;
-
-    //              <red_var>_block([ k,] i) = <red_var>       [k=LowerBound:UpperBound]
-    // or for MAXLOC,MINLOC
-    //              <red_var>_block(i)%<red_var>    = <red_var>
-    //              <red_var>_block(i)%<loc_var>(1) = <loc_var>(1)
-    //             [<red_var>_block(i)%<loc_var>(2) = <loc_var>(2) ]
-    //                    .   .   .
-    // create and declare array '<red_var>_block'
-    red_var = ev->symbol();
-
-    if (rsl->locvar)
-    {
-        newst = Declaration_Statement(LocRedVariableSymbolInKernel(rsl)); //declare location variable
-        kernel_st->insertStmtAfter(*newst, *kernel_st);
-    }
-
-    if (rsl->redvar_size > 0)
-    {
-        newst = Declaration_Statement(RedVariableSymbolInKernel(rsl->redvar,NULL,NULL)); //declare reduction variable
-        kernel_st->insertStmtAfter(*newst, *kernel_st);
-    }
-    else if (rsl->redvar_size < 0)
-    {
-        red_var_k = RedVariableSymbolInKernel(rsl->redvar, rsl->dimSize_arg, rsl->lowBound_arg);
-        newst = Declaration_Statement(red_var_k); //declare reduction variable
-        kernel_st->insertStmtAfter(*newst, *kernel_st);
-    }
-
-    //XXX: shared memory doesnt use in ACROSS by C_Cuda
-    if (!options.isOn(C_CUDA))
-    {
-        rtype = (rsl->redvar_size >= 0) ? TypeOfRedBlockSymbol(ered) : red_var_k->type();
-        s_block = RedBlockSymbolInKernelAcross(red_var, rtype);
-        newst = Declaration_Statement(s_block);
-        eatr = new SgExprListExp(*new SgExpression(ACC_SHARED_OP));
-        newst->setExpression(2, *eatr);    
-        kernel_st->insertStmtAfter(*newst, *kernel_st);
-
-        if (isSgExprListExp(ered->rhs())) //MAXLOC,MINLOC
-        {
-            typedecl = MakeStructDecl(rtype->symbol());
-            kernel_st->insertStmtAfter(*typedecl, *kernel_st);
-        } 
-    }
-}
-
-void DeclarationCreateReductionBlocksAcross(int nloop, SgExpression *red_op_list)
-{
-    SgStatement *newst, *dost;
-    SgExpression *er;
-    SgSymbol *i_var, *j_var;
-    reduction_operation_list *rsl;
-    int n;
-
-    formal_red_grid_list = NULL;
-
-    // index variables
-    dost = DoStmt(first_do_par, nloop);
-    i_var = dost->symbol();
-    if (nloop > 1)
-        j_var = dost->controlParent()->symbol();
-    else
-    {
-        j_var = IndVarInKernel(i_var);
-        newst = j_var->makeVarDeclStmt();
-        kernel_st->insertStmtAfter(*newst, *kernel_st);
-    }
-
-    //looking through the reduction_op_list
-    for (er = red_op_list, rsl = red_struct_list, n = 1; er; er = er->rhs(), rsl = rsl->next, n++)
-    {
-        DeclarationOfReductionBlockInKernelAcross(er->lhs(), rsl);
-    }
-}
-
-void CreateReductionBlocksAcross(SgStatement *stat, int nloop, SgExpression *red_op_list, SgSymbol *red_count_symb)
-{
-    SgStatement *newst, *ass, *dost;
-    SgExpression *er, *re;
-    SgSymbol *i_var, *j_var;
-    reduction_operation_list *rsl;
-    int n;
-
-    formal_red_grid_list = NULL;
-
-    // index variables
-    dost = DoStmt(first_do_par, nloop);
-    i_var = dost->symbol();
-    if (nloop > 1)
-        j_var = dost->controlParent()->symbol();
-    else
-    {
-        j_var = IndVarInKernel(i_var);
-        newst = j_var->makeVarDeclStmt();
-        kernel_st->insertStmtAfter(*newst, *kernel_st);
-    }
-    //create symbol 'syncthreads'
-    // declare '<red_var>_block' array for each reduction var
-    // <i_var> = threadIdx%x -1 + [ (threadIdx%y - 1) * blockDim%x [ + (threadIdx%z - 1) * blockDim%x * blockDim%y ] ]
-    // or C_Cuda
-    // <i_var> = threadIdx%x + [ threadIdx%y * blockDim%x [ + threadIdx%z * blockDim%x * blockDim%y ] ]
-
-    re = ThreadIdxRefExpr("x");
-    if (nloop > 1)
-        re = &(*re + (*ThreadIdxRefExpr("y")) * (*new SgRecordRefExp(*s_blockdim, "x")));
-    if (nloop > 2)
-        re = &(*re + (*ThreadIdxRefExpr("z")) * (*new SgRecordRefExp(*s_blockdim, "x") * (*new SgRecordRefExp(*s_blockdim, "y"))));
-
-    if (options.isOn(C_CUDA)) // global cuda index
-    {
-        // gIDX = threadIdx.x + threadIdx.y * blockDim.x + threadIdx.z * blockDim.x * blockDim.y + (blockIdx.x + blockIdx.y * gridDim.x + blockIdx.z * gridDim.x * gridDim.y) * blockDim.x * blockDim.y * blockDim.z;
-        SgExpression& thrX = *new SgRecordRefExp(*s_threadidx, "x");
-        SgExpression& thrY = *new SgRecordRefExp(*s_threadidx, "y");
-        SgExpression& thrZ = *new SgRecordRefExp(*s_threadidx, "z");
-
-        SgExpression& blDimX = *new SgRecordRefExp(*s_blockdim, "x");
-        SgExpression& blDimY = *new SgRecordRefExp(*s_blockdim, "y");
-        SgExpression& blDimZ = *new SgRecordRefExp(*s_blockdim, "z");
-
-        SgExpression& blIdxX = *new SgRecordRefExp(*s_blockidx, "x");
-        SgExpression& blIdxY = *new SgRecordRefExp(*s_blockidx, "y");
-        SgExpression& blIdxZ = *new SgRecordRefExp(*s_blockidx, "z");
-
-        SgExpression& grX = *new SgRecordRefExp(*s_griddim, "x");
-        SgExpression& grY = *new SgRecordRefExp(*s_griddim, "y");
-
-        ass = new SgAssignStmt(*new SgVarRefExp(i_var), thrX + thrY * blDimX + thrZ * blDimX * blDimY + (blIdxX + blIdxY * grX + blIdxZ * grX * grY) * blDimX * blDimY * blDimZ);
-    }
-    else
-        ass = AssignStatement(new SgVarRefExp(i_var), re);
-    stat->insertStmtBefore(*ass, *stat->controlParent());
-    if (options.isOn(C_CUDA))
-        ass->addComment("// Reduction");
-    else
-        ass->addComment("! Reduction\n");
-
-    //looking through the reduction_op_list
-
-    SgIfStmt* if_st = NULL;
-    SgIfStmt* if_del = NULL;
-    SgIfStmt* if_new = NULL;
-    int declArrayVars = 1;
-
-    SgSymbol* s_warpsize = new SgVariableSymb("warpSize", *SgTypeInt(), *mod_gpu);
-    if (options.isOn(C_CUDA))
-        if_st = new SgIfStmt(SgEqOp(*new SgVarRefExp(i_var) % *new SgVarRefExp(s_warpsize), *new SgValueExp(0)));
-
-    for (er = red_op_list, rsl = red_struct_list, n = 1; er; er = er->rhs(), rsl = rsl->next, n++)
-    {
-        if (options.isOn(C_CUDA))
-            ReductionBlockInKernel_On_C_Cuda(stat, i_var, er->lhs(), rsl, if_st, if_del, if_new, declArrayVars, true, true);
-        else
-            ReductionBlockInKernel(stat, nloop, i_var, j_var, er->lhs(), rsl, red_count_symb, n);
-    }
-
-    if (options.isOn(C_CUDA))
-        stat->insertStmtBefore(*if_st, *stat->controlParent());
-}
-
-//end of Reduction block for Across
-
-#undef LongT
-#undef debugMode
-#undef kerneloff
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_across_analyzer.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_across_analyzer.cpp
deleted file mode 100644
index 2c680ca..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_across_analyzer.cpp
+++ /dev/null
@@ -1,2249 +0,0 @@
-
-#include "dvm.h"
-#include "acc_across_analyzer.h"
-
-using namespace std;
-
-// special storages to avoid recomputing
-static map<string, SgExpression*> lhs;
-static map<string, SgExpression*> rhs;
-static map<SgExpression*, string> unparsedLhs;
-static map<SgExpression*, string> unparsedRhs;
-
-extern reduction_operation_list* red_struct_list;
-
-template<typename InIt1, typename InIt2, typename OutIt>
-static inline OutIt difference(InIt1 first1, InIt1 last1, InIt2 first2, InIt2 last2, OutIt dest)
-{
-    for (; first1 != last1 && first2 != last2;)
-    {
-        if (*first1 < *first2)
-        {
-            *dest++ = *first1;
-            ++first1;
-        }
-        else if (*first2 < *first1)
-            ++first2;
-        else
-        {
-            ++first1;
-            ++first2;
-        }
-    }
-
-    return copy(first1, last1, dest);
-}
-
-template<typename InIt1, typename InIt2, typename OutIt>
-static inline OutIt intersection(InIt1 first1, InIt1 last1, InIt2 first2, InIt2 last2, OutIt dest)
-{
-    for (; first1 != last1 && first2 != last2;)
-    {
-        if (*first1 < *first2)
-            ++first1;
-        else if (*first2 < *first1)
-            ++first2;
-        else
-        {
-            *dest++ = *first1++;
-            ++first2;
-        }
-    }
-    return dest;
-}
-
-static int replace(SgExpression* expr, SgStatement* parent, SgExpression* patt, SgExpression* subst)
-{
-    if (ExpCompare(expr, patt) != 0)
-    {
-        *expr = subst->copy();
-        if (ExpCompare(parent->expr(0), expr) != 0)
-            parent->setExpression(0, *expr);
-        else if (ExpCompare(parent->expr(1), expr) != 0)
-            parent->setExpression(1, *expr);
-        return 1;
-    }
-    int count = 0;
-    vector<SgExpression*> subexprs;
-    subexprs.push_back(NULL);
-    subexprs.push_back(expr);
-    int k = 1;
-    vector<int> positions(2);
-    for (vector<SgExpression*>::iterator p = subexprs.begin() + 1; p != subexprs.end(); ++k, p = subexprs.begin() + k)
-    {
-        if (ExpCompare(*p, patt) == 0)
-        {
-            SgExpression* lhs = (*p)->lhs();
-            SgExpression* rhs = (*p)->rhs();
-            if (lhs != NULL)
-            {
-                subexprs.push_back(lhs);
-                positions.push_back(-k);
-            }
-            if (rhs != NULL)
-            {
-                subexprs.push_back(rhs);
-                positions.push_back(k);
-            }
-        }
-        else
-        {
-            if (positions[k] < 0)
-                subexprs[-positions[k]]->setLhs(subst->copyPtr());
-            else
-                subexprs[positions[k]]->setRhs(subst->copyPtr());
-            ++count;
-        }
-    }
-    return count;
-}
-
-static int replaceInSubscripts(SgExpression* expr, SgStatement* parent, SgExpression* patt, SgExpression* subst)
-{
-    if (expr == NULL)
-        return 0;
-    int count = 0;
-    vector<SgExpression*> subexprs;
-    subexprs.push_back(expr);
-    int k = 0;
-    for (vector<SgExpression*>::iterator p = subexprs.begin(); p != subexprs.end(); ++k, p = subexprs.begin() + k)
-    {
-        if ((*p)->variant() == ARRAY_REF)
-        {
-            for (SgExpression* tmp = ((SgArrayRefExp*)* p)->subscripts(); tmp != NULL; tmp = tmp->rhs())
-                count += replace(tmp->lhs(), parent, patt, subst);
-        }
-        else
-        {
-            SgExpression* lhs = (*p)->lhs();
-            SgExpression* rhs = (*p)->rhs();
-            if (lhs != NULL)
-                subexprs.push_back(lhs);
-            if (rhs != NULL)
-                subexprs.push_back(rhs);
-        }
-    }
-    return count;
-}
-
-#define add(a, b)      (a) + (b)
-#define subtract(a, b) (a) - (b)
-#define multiply(a, b) (a) * (b)
-#define divide(a, b)   (a) / (b)
-
-#define compute(lhs, rhs, parent, op, cast) \
-switch (lhs->variant()) \
-{ \
-    case BOOL_VAL: \
-        lhs = new SgValueExp(op(cast(((SgValueExp*)lhs)->boolValue() == true ? -1 : 0), rhs)); \
-        break; \
-    case INT_VAL: \
-        lhs = new SgValueExp(op(cast((SgValueExp*)lhs)->intValue(), rhs)); \
-        break; \
-    case FLOAT_VAL: \
-        lhs = new SgValueExp(op(cast strtod(((SgValueExp*)lhs)->floatValue(), NULL), rhs)); \
-        break; \
-    case DOUBLE_VAL: \
-        lhs = new SgValueExp(op(cast strtod(((SgValueExp*)lhs)->doubleValue(), NULL), rhs)); \
-        break; \
-    default: \
-        changed = false; \
-        lhs = parent; \
-        break; \
-}
-
-void Loop::getRPN(SgExpression* expr, list<SgExpression*>& rpn) const
-{
-    if (expr == NULL)
-        return;
-    stack<SgExpression*> stack;
-    stack.push(expr);
-    while (stack.empty() == false)
-    {
-        SgExpression* expr = stack.top();
-        stack.pop();
-        switch (expr->variant())
-        {
-            case ARRAY_REF:
-            case FUNC_CALL:
-                break;
-            case SUBT_OP:
-                *expr = *expr->lhs() + *new SgExpression(MINUS_OP, expr->rhs(), NULL, NULL);
-                stack.push(expr->lhs());
-                stack.push(expr->rhs());
-                break;
-            default:
-                if (expr->lhs() != NULL)
-                    stack.push(expr->lhs());
-                if (expr->rhs() != NULL)
-                    stack.push(expr->rhs());
-                break;
-        }
-        rpn.push_front(expr);
-    }
-}
-
-void Loop::unrollRPN(list<SgExpression*>& rpn, map<SgExpression*, int>& arity) const
-{
-    set<SgExpression*> visited;
-    for (list<SgExpression*>::iterator it = rpn.begin(); it != rpn.end();)
-    {
-        if (visited.find(*it) == visited.end())
-            visited.insert(*it);
-        else
-        {
-            ++it;
-            continue;
-        }
-        switch ((*it)->variant())
-        {
-            case ARRAY_REF:
-            case FUNC_CALL:
-                for (SgExpression* tmp = (*it)->lhs(); tmp != NULL; tmp = tmp->rhs())
-                {
-                    list<SgExpression*> subrpn;
-                    getRPN(tmp->lhs(), subrpn);
-                    optimizeRPN(subrpn, arity, false);
-                    rpn.insert(it, subrpn.begin(), subrpn.end());
-                }
-                it = rpn.begin();
-                break;
-            default:
-                ++it;
-                break;
-        }
-    }
-}
-
-void Loop::optimizeRPN(list<SgExpression*>& rpn, map<SgExpression*, int>& arity, bool unrolled) const
-{
-    for (list<SgExpression*>::iterator it = rpn.begin(); it != rpn.end();)
-    {
-        if ((*it)->lhs() != NULL)
-        {
-            if ((*it)->rhs() != NULL)
-            {
-                int _arity = 2;
-                int variant = (*it)->variant();
-                switch (variant)
-                {
-                    case ADD_OP:
-                    case MULT_OP:
-                    {
-                        if (arity.find(*it) != arity.end())
-                        {
-                            ++it;
-                            break;
-                        }
-                        bool found = false;
-                        list<SgExpression*>::iterator old = it, tmp = it;
-                        for (++it; it != rpn.end(); ++it)
-                        {
-                            if ((*it)->variant() == variant && (((*it)->lhs() != NULL && (*it)->lhs()->variant() == variant) || ((*it)->rhs() != NULL && (*it)->rhs()->variant() == variant)))
-                            {
-                                rpn.erase(tmp);
-                                tmp = it;
-                                ++_arity;
-                            }
-                            else if ((*it)->lhs() != NULL || (unrolled && ((*it)->variant() == ARRAY_REF || (*it)->variant() == FUNC_CALL)))
-                                break;
-                            else if (found == false)
-                            {
-                                old = it;
-                                found = true;
-                            }
-                        }
-
-                        arity[*tmp] = _arity;
-                        if (found == true)
-                            it = ++old;
-                        break;
-                    }
-                    default:
-                        arity[*it] = _arity;
-                        ++it;
-                        break;
-                }
-            }
-            else
-            {
-                if ((*it)->variant() == FUNC_CALL || (*it)->variant() == ARRAY_REF)
-                    arity[*it] = ((SgExprListExp*)(*it)->lhs())->length();
-                else
-                    arity[*it] = 1;
-                ++it;
-            }
-        }
-        else
-            ++it;
-    }
-}
-
-SgExpression* Loop::simplify(SgExpression* expr) const
-{
-    if (enable_opt == false || expr == NULL)
-        return expr;
-
-    list<SgExpression*> rpn;
-    map<SgExpression*, int> arity;
-
-    getRPN(expr, rpn);
-    optimizeRPN(rpn, arity, false);
-    unrollRPN(rpn, arity);
-    optimizeRPN(rpn, arity, true);
-
-    bool changed = true;
-    while (changed == true)
-    {
-        changed = false;
-        stack<SgExpression*> stack;
-        for (list<SgExpression*>::iterator it = rpn.begin(); it != rpn.end(); ++it)
-        {
-            if ((*it)->lhs() != NULL)
-            {
-                if ((*it)->rhs() != NULL)
-                {
-                    int _arity = arity[*it];
-                    vector<SgExpression*> args(_arity);
-                    for (int i = _arity - 1; i >= 0; --i)
-                    {
-                        args[i] = stack.top();
-                        stack.pop();
-                    }
-                    SgExpression* result = NULL;
-                    switch ((*it)->variant())
-                    {
-                        case ADD_OP:
-                        {
-                            result = new SgValueExp(0);
-                            list<SgExpression*> _args;
-                            for (int i = 0; i < _arity; ++i)
-                            {
-                                switch (args[i]->variant())
-                                {
-                                case BOOL_VAL:
-                                    compute(result, ((SgValueExp*)args[i])->boolValue() == true ? -1 : 0, (*it), add, );
-                                    break;
-                                case INT_VAL:
-                                    compute(result, ((SgValueExp*)args[i])->intValue(), (*it), add, );
-                                    break;
-                                case FLOAT_VAL:
-                                    compute(result, (float)strtod(((SgValueExp*)args[i])->floatValue(), NULL), (*it), add, );
-                                    break;
-                                case DOUBLE_VAL:
-                                    compute(result, strtod(((SgValueExp*)args[i])->doubleValue(), NULL), (*it), add, );
-                                    break;
-                                default:
-                                    _args.push_back(args[i]);
-                                    break;
-                                }
-                            }
-                            for (list<SgExpression*>::iterator it1 = _args.begin(); it1 != _args.end();)
-                            {
-                                bool cond = (*it1)->variant() == MINUS_OP;
-                                bool changed = false;
-                                for (list<SgExpression*>::iterator it2 = it1; it2 != _args.end();)
-                                {
-                                    if (cond == true && ExpCompare((*it1)->lhs(), *it2) == 1 || cond == false && (*it2)->variant() == MINUS_OP && ExpCompare(*it1, (*it2)->lhs()) == 1)
-                                    {
-                                        it1 = _args.erase(it1);
-                                        if (it1 == it2)
-                                        {
-                                            it2 = _args.erase(it2);
-                                            it1 = it2;
-                                        }
-                                        else
-                                            it2 = _args.erase(it2);
-                                        changed = true;
-                                    }
-                                    else
-                                        ++it2;
-                                }
-                                if (changed == false)
-                                    ++it1;
-                            }
-                            if (_args.size() + 1 < args.size())
-                                changed = true;
-                            bool zero = false;
-                            switch (result->variant())
-                            {
-                                case BOOL_VAL:
-                                    zero = ((SgValueExp*)result)->boolValue() == false;
-                                    break;
-                                case INT_VAL:
-                                    zero = ((SgValueExp*)result)->intValue() == 0;
-                                    break;
-                                case FLOAT_VAL:
-                                    zero = (float)strtod(((SgValueExp*)result)->floatValue(), NULL) == 0.0f;
-                                    break;
-                                case DOUBLE_VAL:
-                                    zero = strtod(((SgValueExp*)result)->doubleValue(), NULL) == 0.0;
-                                    break;
-                                default:
-                                    break;
-                            }
-                            if (zero == true)
-                            {
-                                if (_args.size() != 0)
-                                {
-                                    result = *_args.begin();
-                                    for (list<SgExpression*>::iterator it = ++_args.begin(); it != _args.end(); ++it)
-                                        result = &(**it + *result);
-                                }
-                            }
-                            else
-                                for (list<SgExpression*>::iterator it = _args.begin(); it != _args.end(); ++it)
-                                    result = &(**it + *result);
-                            break;
-                        }
-                        case MULT_OP:
-                        {
-                            result = new SgValueExp(1);
-                            list<SgExpression*> _args;
-                            for (int i = 0; i < _arity; ++i)
-                            {
-                                switch (args[i]->variant())
-                                {
-                                case BOOL_VAL:
-                                    compute(result, ((SgValueExp*)args[i])->boolValue() == true ? -1 : 0, (*it), multiply, );
-                                    break;
-                                case INT_VAL:
-                                    compute(result, ((SgValueExp*)args[i])->intValue(), (*it), multiply, );
-                                    break;
-                                case FLOAT_VAL:
-                                    compute(result, (float)strtod(((SgValueExp*)args[i])->floatValue(), NULL), (*it), multiply, );
-                                    break;
-                                case DOUBLE_VAL:
-                                    compute(result, strtod(((SgValueExp*)args[i])->doubleValue(), NULL), (*it), multiply, );
-                                    break;
-                                default:
-                                    _args.push_back(args[i]);
-                                    break;
-                                }
-                            }
-
-                            if (_args.size() + 1 < args.size())
-                                changed = true;
-                            bool one = false;
-                            switch (result->variant())
-                            {
-                                case BOOL_VAL:
-                                    one = ((SgValueExp*)result)->boolValue() == true;
-                                    break;
-                                case INT_VAL:
-                                    one = ((SgValueExp*)result)->intValue() == 1;
-                                    break;
-                                case FLOAT_VAL:
-                                    one = (float)strtod(((SgValueExp*)result)->floatValue(), NULL) == 1.0f;
-                                    break;
-                                case DOUBLE_VAL:
-                                    one = strtod(((SgValueExp*)result)->doubleValue(), NULL) == 1.0;
-                                    break;
-                                default:
-                                    break;
-                            }
-
-                            if (one == true)
-                            {
-                                if (_args.size() != 0)
-                                {
-                                    result = *_args.begin();
-                                    for (list<SgExpression*>::iterator it = ++_args.begin(); it != _args.end(); ++it)
-                                        result = &(**it * *result);
-                                }
-                            }
-                            else
-                            {
-                                for (list<SgExpression*>::iterator it = _args.begin(); it != _args.end(); ++it)
-                                    result = &(**it * *result);
-                            }
-                            break;
-                        }
-                        case DIV_OP:
-                        {
-                            SgExpression* lhs = args[0];
-                            SgExpression* rhs = args[1];
-                            changed = true;
-                            if (ExpCompare(lhs, rhs) == 1)
-                            {
-                                result = new SgValueExp(1);
-                                break;
-                            }
-                            else if (lhs->variant() == MINUS_OP && ExpCompare(lhs->lhs(), rhs) == 1 || rhs->variant() == MINUS_OP && ExpCompare(lhs, rhs->lhs()) == 1)
-                            {
-                                result = new SgValueExp(-1);
-                                break;
-                            }
-
-                            result = new SgExpression(lhs->thellnd);
-                            bool error = false;
-                            switch (rhs->variant())
-                            {
-                                case BOOL_VAL:
-                                {
-                                    bool value = ((SgValueExp*)rhs)->boolValue();
-                                    if (value == false)
-                                    {
-                                        error = true;
-                                        break;
-                                    }
-                                    compute(result, value == true ? -1 : 0, (*it), divide,);
-                                    break;
-                                }
-                                case INT_VAL:
-                                {
-                                    int value = ((SgValueExp*)rhs)->intValue();
-                                    if (value == 0)
-                                    {
-                                        error = true;
-                                        break;
-                                    }
-                                    compute(result, value, (*it), divide,);
-                                    break;
-                                }
-                                case FLOAT_VAL:
-                                {
-                                    float value = (float)strtod(((SgValueExp*)rhs)->floatValue(), NULL);
-                                    if (value == 0.0f)
-                                    {
-                                        error = true;
-                                        break;
-                                    }
-                                    compute(result, value, (*it), divide,);
-                                    break;
-                                }
-                                case DOUBLE_VAL:
-                                {
-                                    double value = strtod(((SgValueExp*)rhs)->doubleValue(), NULL);
-                                    if (value == 0.0)
-                                    {
-                                        error = true;
-                                        break;
-                                    }
-                                    compute(result, value, (*it), divide,);
-                                    break;
-                                }
-                                default:
-                                    changed = false;
-                                    delete result;
-                                    result = *it;
-                                    break;
-                            }
-                            if (error == true)
-                            {
-                                changed = false;
-                                delete result;
-                                result = *it;
-                            }
-                            break;
-                        }
-                        case EXP_OP:
-                        {
-                            SgExpression* lhs = args[0];
-                            SgExpression* rhs = args[1];
-                            result = new SgExpression(lhs->thellnd);
-                            changed = true;
-                            switch (rhs->variant())
-                            {
-                                case BOOL_VAL:
-                                    compute(result, (((SgValueExp*)rhs)->boolValue() == true ? -1 : 0), (*it), pow, (float));
-                                    break;
-                                case INT_VAL:
-                                    compute(result, ((SgValueExp*)rhs)->intValue(), (*it), pow, (float));
-                                    break;
-                                case FLOAT_VAL:
-                                    compute(result, strtod(((SgValueExp*)rhs)->floatValue(), NULL), (*it), pow,);
-                                    break;
-                                case DOUBLE_VAL:
-                                    compute(result, strtod(((SgValueExp*)rhs)->doubleValue(), NULL), (*it), pow,);
-                                    break;
-                                default:
-                                    changed = false;
-                                    delete result;
-                                    result = *it;
-                                    break;
-                            }
-                            break;
-                        }
-                        default:
-                            // unsupported node with two subtrees, let compiler deal with it
-                            result = *it;
-                            break;
-                    }
-                    stack.push(result);
-                }
-                else
-                {
-                    switch ((*it)->variant())
-                    {
-                        case FUNC_CALL:
-                        {
-                            vector<SgExpression*> args(arity[*it]);
-                            for (int i = arity[*it] - 1; i >= 0; --i)
-                            {
-                                args[i] = stack.top();
-                                stack.pop();
-                            }
-                            for (unsigned int i = 0; i < args.size(); ++i)
-                                *((SgFunctionCallExp*)*it)->arg(i) = *args[i];
-
-                            // probably can be evaluated
-                            stack.push(*it);
-                            break;
-                        }
-                        case ARRAY_REF:
-                        {
-                            vector<SgExpression*> subscripts(arity[*it]);
-                            for (int i = arity[*it] - 1; i >= 0; --i)
-                            {
-                                subscripts[i] = stack.top();
-                                stack.pop();
-                            }
-                            for (unsigned int i = 0; i < subscripts.size(); ++i)
-                                *((SgArrayRefExp*)*it)->subscript(i) = *subscripts[i];
-
-                            stack.push(*it);
-                            break;
-                        }
-                        case MINUS_OP:
-                        {
-                            SgExpression* arg = stack.top();
-                            SgExpression* result;
-                            stack.pop();
-                            changed = true;
-                            switch (arg->variant())
-                            {
-                            case BOOL_VAL:
-                                result = new SgValueExp(((SgValueExp*)arg)->boolValue() == true ? 1 : 0);
-                                break;
-                            case INT_VAL:
-                                result = new SgValueExp(-((SgValueExp*)arg)->intValue());
-                                break;
-                            case FLOAT_VAL:
-                                result = new SgValueExp(-(float)strtod(((SgValueExp*)arg)->floatValue(), NULL));
-                                break;
-                            case DOUBLE_VAL:
-                                result = new SgValueExp(-strtod(((SgValueExp*)arg)->doubleValue(), NULL));
-                                break;
-                            case MINUS_OP:
-                                result = arg->lhs();
-                                break;
-                            case UNARY_ADD_OP:
-                                result = new SgExpression(MINUS_OP, new SgExpression(arg->lhs()->thellnd), NULL, NULL);
-                            default:
-                                changed = false;
-                                result = *it;
-                                break;
-                            }
-                            stack.push(result);
-                            break;
-                        }
-                        case UNARY_ADD_OP:
-                            break;
-                        default:
-                            // unsupported node with one subtree, let compiler deal with it
-                            stack.push(*it);
-                            break;
-                    }
-                }
-            }
-            else
-                stack.push(*it);
-        }
-
-        if (changed == true)
-        {
-            rpn.clear();
-            getRPN(stack.top(), rpn);
-            arity.clear();
-            optimizeRPN(rpn, arity, false);
-            unrollRPN(rpn, arity);
-            optimizeRPN(rpn, arity, true);
-        }
-        else
-            *expr = *stack.top();
-    }
-    return expr;
-}
-
-
-void Access::getReferences(SgExpression* expr,
-                           set<SgExpression*>& references,
-                           map<SgExpression*, string>& unparsedRefs,
-                           map<string, SgExpression*>& refs) const
-{
-    vector<SgExpression*> subexprs;
-    subexprs.push_back(expr);
-    int k = 0;
-    for (vector<SgExpression*>::iterator p = subexprs.begin(); p != subexprs.end(); ++k, p = subexprs.begin() + k)
-    {
-        if ((*p)->variant() != VAR_REF && (*p)->variant() != ARRAY_REF)
-        {
-            SgExpression* lhs = (*p)->lhs();
-            SgExpression* rhs = (*p)->rhs();
-            if (lhs != NULL)
-                subexprs.push_back(lhs);
-            if (rhs != NULL)
-                subexprs.push_back(rhs);
-        }
-        else
-        {
-            // array reference subscripts are not real dependencies on loop indices
-            if ((*p)->variant() == ARRAY_REF)
-                continue;
-            string s((*p)->symbol()->identifier());
-            refs[s] = *p;
-            unparsedRefs[*p] = s;
-        }
-    }
-
-    for (map<SgExpression*, string>::iterator it = unparsedRefs.begin(); it != unparsedRefs.end(); ++it)
-        references.insert(refs[it->second]);
-}
-
-void Access::analyze()
-{
-    const Loop* loop = array->getLoop();
-    const vector<BasicBlock>& blocks = loop->getBlocks();
-    const map<SgStatement*, int>& blockIn = loop->getBlockIn();
-    const vector<SgSymbol*>& symbols = loop->getSymbols();
-    int dimension = array->getDimension();
-    alignment = new int [dimension];
-
-    for (int i = 0; i < dimension; ++i)
-        alignment[i] = -1;
-
-    int i = 0;
-    for (SgExpression* expr = this->expr; expr != NULL; ++i, expr = expr->rhs())
-    {
-        map<SgExpression*, string> unparsedRefs;
-        map<string, SgExpression*> refs;
-        set<SgExpression*> references, result;
-        getReferences(expr->lhs(), references, unparsedRefs, refs);
-        result = references;
-        map<SgExpression*, set<SgStatement*> > definitions;
-        definitions[expr->lhs()] = blocks[blockIndex].INrd;
-        bool changed = true;
-        while (changed == true)
-        {
-            changed = false;
-            set<SgExpression*> new_references;
-            map<SgExpression*, set<SgStatement*> > new_definitions;
-            for (set<SgExpression*>::iterator ref = references.begin(); ref != references.end(); ++ref)
-            {
-                bool found = false;
-                for (size_t j = 0; j < symbols.size(); ++j)
-                {
-                    if (symbols[j] == (*ref)->symbol())
-                    {
-                        new_references.insert(*ref);
-                        result.insert(*ref);
-                        found = true;
-                        break;
-                    }
-                }
-
-                if (found == false)
-                {
-                    for (set<SgStatement*>::iterator def = definitions[*ref].begin(); def != definitions[*ref].end(); ++def)
-                    {
-                        if (unparsedLhs[(*def)->expr(0)] == unparsedRefs[*ref])
-                        {
-                            getReferences(rhs[unparsedRhs[(*def)->expr(1)]], new_references, unparsedRefs, refs);
-                            for (set<SgExpression*>::iterator it = new_references.begin(); it != new_references.end(); ++it)
-                                new_definitions[*it].insert(blocks[blockIn.at(*def)].INrd.begin(), blocks[blockIn.at(*def)].INrd.end());
-                            found = true;
-                        }
-                    }
-
-                    if (found == true)
-                        result.erase(*ref);
-                }
-            }
-
-            if (new_references != references)
-            {
-                references = new_references;
-                definitions = new_definitions;
-                changed = true;
-            }
-        }
-
-        references.clear();
-        for (set<SgExpression*>::iterator it = result.begin(); it != result.end(); ++it)
-            references.insert(refs[unparsedRefs[*it]]);
-
-        if (references.size() == 1)
-        {
-            for (size_t j = 0; j < symbols.size(); ++j)
-            {
-                if (symbols[j] == (*references.begin())->symbol())
-                    alignment[i] = j;
-            }
-        }
-        else if (references.size() > 1)
-            alignment[i] = -2;
-    }
-
-    for (i = 0; i < symbols.size(); ++i)
-    {
-        int j;
-        for (j = 0; j < dimension; ++j)
-        {
-            if (alignment[j] == i)
-                break;
-        }
-
-        if (j == dimension)
-            break;
-    }
-
-    if (i != symbols.size())
-    {
-        for (int i = 0; i < dimension; ++i)
-        {
-            if (alignment[i] == -2)
-                err((string("array '") + array->getSymbol()->identifier() + "': dependence on multiple loop indices").c_str(), 421, first_do_par);
-        }
-    }
-}
-
-void Array::analyze()
-{
-    alignment = new int [dimension];
-    for (int i = 0; i < dimension; ++i)
-        alignment[i] = -1;
-    if (accesses.size() == 0)
-        return;
-    for (map<string, Access*>::iterator it = accesses.begin(); it != accesses.end(); ++it)
-        it->second->analyze();
-
-    int* tmp = new int [dimension];
-    int* prev = new int [dimension];
-    for (int i = 0; i < dimension; ++i)
-    {
-        prev[i] = -2;
-        tmp[i] = accesses.begin()->second->getAlignment()[i];
-    }
-
-    for (map<string, Access*>::iterator it1 = accesses.begin(); it1 != accesses.end(); ++it1)
-    {
-        const int* alignment = it1->second->getAlignment();
-        for (int i = 0; i < dimension; ++i)
-        {
-            if (alignment[i] > tmp[i])
-            {
-                prev[i] = tmp[i];
-                tmp[i] = alignment[i];
-            }
-        }
-    }
-
-    bool success = true;
-    for (int i = 0; i < dimension; ++i)
-    {
-        if (prev[i] >= 0)
-        {
-            success = false;
-            break;
-        }
-    }
-
-    if (success == true)
-    {
-        for (int i = 0; i < dimension; ++i)
-            alignment[i] = tmp[i];
-    }
-    else
-        err((string("array '") + symbol->identifier() + "': accesses with different subscripts' dependencies were found").c_str(), 422, first_do_par);
-}
-
-void Array::analyzeTransformDimensions()
-{
-    int dimension = loop->getDimension();
-    if (dimension <= 1 || loop->getAcrossType() <= 1)
-        return;
-
-    int symbols[] = { -1, -1 };
-    if (dimension == loop->getAcrossType())
-    {
-        symbols[0] = dimension - 1;
-        symbols[1] = dimension - 2;
-    }
-    else
-    {
-        for (size_t i = acrossDims.size() - 1, j = 0; i != 0 && j != 2; --i)
-        {
-            if (acrossDims[i] == 1)
-                symbols[j++] = i;
-        }
-    }
-
-    int indices[] = { -1, -1 };
-    for (int i = 0; i < this->dimension; ++i)
-    {
-        if (symbols[0] == alignment[i])
-            indices[0] = i;
-        else if (symbols[1] == alignment[i])
-            indices[1] = i;
-    }
-
-    if (indices[0] != -1 && indices[1] != -1)
-    {
-        indices[0] = this->dimension - indices[0];
-        indices[1] = this->dimension - indices[1];
-    }
-    tfmInfo.transformDims.push_back(indices[0]);
-    tfmInfo.transformDims.push_back(indices[1]);
-}
-
-SgSymbol* Array::findAccess(SgExpression* subscripts, string& expr)
-{
-    size_t i = 0;
-    int j = 0;
-    string id;
-    for (SgExpression* tmp = subscripts; tmp != NULL && i < 2; ++j, tmp = tmp->rhs())
-    {
-        if (dimension - j == tfmInfo.transformDims[0] || dimension - j == tfmInfo.transformDims[1])
-        {
-            id.append(tmp->lhs()->unparse()).append("_");
-            ++i;
-        }
-    }
-
-    SgSymbol* result = NULL;
-    for (i = 0; i < tfmInfo.exprs.size(); ++i)
-    {
-        if (tfmInfo.exprs[i].first == id)
-        {
-            result = tfmInfo.coefficients[i];
-            break;
-        }
-    }
-
-    if (result == NULL)
-        expr = id;
-    return result;
-}
-
-void Array::addCoefficient(SgExpression* subscripts, string& expr, SgSymbol* symbol)
-{
-    int i = 0;
-    for (SgExpression* tmp = subscripts; tmp != NULL; ++i, tmp = tmp->rhs())
-    {
-        if (dimension - i == tfmInfo.transformDims[0])
-            tfmInfo.first.push_back(tmp->lhs());
-        else if (dimension - i == tfmInfo.transformDims[1])
-            tfmInfo.second.push_back(tmp->lhs());
-    }
-
-    tfmInfo.exprs.push_back(pair<string, string>(expr, subscripts->unparse()));
-    tfmInfo.coefficients.push_back(symbol);
-}
-
-void Loop::analyzeAcrossClause()
-{
-    for (SgExpression* expr = dvm_parallel_dir->expr(1); expr != NULL; expr = expr->rhs())
-    {
-        SgExpression* tmp = expr->lhs();
-        if (tmp->variant() == ACROSS_OP)
-        {
-            vector<SgExpression*> toAnalyze;
-            SgExpression* list = tmp->lhs();
-            while (list)
-            {
-                if (list->lhs()->variant() == ARRAY_REF)
-                    toAnalyze.push_back(list->lhs());
-                else if (list->lhs()->variant() == ARRAY_OP)
-                {
-                    if (list->lhs()->lhs()->variant() == ARRAY_REF)
-                        toAnalyze.push_back(list->lhs()->lhs());
-                }
-                list = list->rhs();
-            }
-
-            for (int k = 0; k < toAnalyze.size(); ++k)
-            {
-                tmp = toAnalyze[k];
-                if (arrays.find(tmp->symbol()) == arrays.end())
-                    warn((string("array '") + tmp->symbol()->identifier() + "': unused").c_str(), 900, first_do_par);
-                else if (privateList.find(tmp->symbol()) != privateList.end())
-                    err((string("array '") + tmp->symbol()->identifier() + "': incompatible qualifiers (ACROSS, PRIVATE)").c_str(), 423, first_do_par);
-                else
-                {
-                    Array* array = arrays[tmp->symbol()];
-                    SgExpression* dep = tmp->lhs();
-                    int i = 0, raw, war, n = 0;
-                    vector<int>& acrossDims = array->getAcrossDims();
-
-                    while (dep != NULL)
-                    {
-                        raw = dep->lhs()->lhs()->valueInteger();
-                        war = dep->lhs()->rhs()->valueInteger();
-                        acrossDims[i] = (raw != 0 || war != 0) ? 1 : 0;
-                        n += acrossDims[i];
-                        i++;
-                        dep = dep->rhs();
-                    }
-
-                    if (n != 0)
-                        array->setAcrossType((1 << n) - 1);
-
-                    for (int j = 0; j < abs(dimension - array->getDimension()); ++j)
-                        acrossDims.push_back(-1);
-                }
-            }
-        }
-    }
-}
-
-void Loop::analyzeAcrossType()
-{
-    acrossDims = new int [dimension];
-    for (int i = 0; i < dimension; ++i)
-        acrossDims[i] = -1;
-
-    for (map<SgSymbol*, Array*>::iterator it = arrays.begin(); it != arrays.end(); ++it)
-    {
-        const int* alignment = it->second->getAlignment();
-        vector<int>& _acrossDims = it->second->getAcrossDims();
-        if (alignment != NULL)
-        {
-            for (int i = 0; i < it->second->getDimension(); ++i)
-            {
-                if (alignment[i] != -1)
-                    acrossDims[alignment[i]] = max(acrossDims[alignment[i]], _acrossDims[alignment[i]]);
-            }
-        }
-    }
-
-    for (int i = 0; i < dimension; ++i)
-    {
-        if (acrossDims[i] != -1)
-            ++acrossType;
-    }
-}
-
-void Array::generateAssigns(SgVarRefExp* offsetX, SgVarRefExp* offsetY, SgVarRefExp* Rx, SgVarRefExp* Ry, SgVarRefExp* slash)
-{
-    if (tfmInfo.ifCalls.size() == 0 && tfmInfo.elseCalls.size() == 0 && tfmInfo.zeroSt.size() == 0)
-    {
-        for (size_t i = 0; i < tfmInfo.coefficients.size(); ++i)
-        {
-            tfmInfo.zeroSt.push_back(AssignStatement(new SgVarRefExp(tfmInfo.coefficients[i]->copy()), new SgValueExp(0)));
-            
-            SgFunctionCallExp* funcCallExpIf = createNewFCall(funcDvmhConvXYname);
-            SgFunctionCallExp* funcCallExpElse = createNewFCall(funcDvmhConvXYname);
-
-            funcCallExpIf->addArg(*new SgCastExp(*offsetX->type(), tfmInfo.first[i]->copy()) - *offsetX);
-            funcCallExpIf->addArg(*new SgCastExp(*offsetY->type(), tfmInfo.second[i]->copy()) - *offsetY);
-            funcCallExpIf->addArg(*Rx);
-            funcCallExpIf->addArg(*Ry);
-            funcCallExpIf->addArg(*slash);
-            funcCallExpIf->addArg(*new SgVarRefExp(tfmInfo.coefficients[i]->copy()));
-
-            funcCallExpElse->addArg(*new SgCastExp(*offsetX->type(), tfmInfo.second[i]->copy()) - *offsetX);
-            funcCallExpElse->addArg(*new SgCastExp(*offsetY->type(), tfmInfo.first[i]->copy()) - *offsetY);
-            funcCallExpElse->addArg(*Rx);
-            funcCallExpElse->addArg(*Ry);
-            funcCallExpElse->addArg(*slash);
-            funcCallExpElse->addArg(*new SgVarRefExp(tfmInfo.coefficients[i]->copy()));
-
-            SgStatement* stmt = NULL;
-            set<Access*> _accesses;
-            for (map<string, Access*>::iterator it = accesses.begin(); it != accesses.end(); ++it)
-            {
-                bool found[2] = { false, false };
-                string first(tfmInfo.first[i]->unparse());
-                string second(tfmInfo.second[i]->unparse());
-                for (SgExpression* tmp = it->second->getSubscripts(); tmp != NULL; tmp = tmp->rhs())
-                {
-                    string s(tmp->lhs()->unparse());
-                    if (s == first)
-                        found[0] = true;
-                    else if (s == second)
-                        found[1] = true;
-                }
-                if (found[0] == true && found[1] == true)
-                    _accesses.insert(it->second);
-            }
-
-            map<Access*, set<int> > blockIndices;
-            int minIndex = loop->getBlocks().size();
-            for (set<Access*>::iterator it = _accesses.begin(); it != _accesses.end(); ++it)
-            {
-                set<SgSymbol*> symbols;
-                int j = 0;
-                for (SgExpression* tmp = (*it)->getSubscripts(); tmp != NULL; tmp = tmp->rhs())
-                {
-                    if (dimension - j != tfmInfo.transformDims[0] && dimension - j != tfmInfo.transformDims[1])
-                        continue;
-                    vector<SgExpression*> _subtrees;
-                    _subtrees.push_back(tmp->lhs());
-                    int k = 0;
-                    for (vector<SgExpression*>::iterator p = _subtrees.begin(); p != _subtrees.end(); ++k, p = _subtrees.begin() + k)
-                    {
-                        if ((*p)->variant() == VAR_REF && (*p)->symbol() != NULL)
-                            symbols.insert((*p)->symbol());
-                        else
-                        {
-                            SgExpression* lhs = (*p)->lhs();
-                            SgExpression* rhs = (*p)->rhs();
-                            if (lhs != NULL)
-                                _subtrees.push_back(lhs);
-                            if (rhs != NULL)
-                                _subtrees.push_back(rhs);
-                        }
-                    }
-                }
-
-                set<SgSymbol*> _symbols(loop->getSymbols().begin(), loop->getSymbols().end());
-                set<SgSymbol*> diff;
-                difference(symbols.begin(), symbols.end(), _symbols.begin(), _symbols.end(), inserter(diff, diff.end()));
-                const vector<BasicBlock>& blocks = loop->getBlocks();
-
-                if (diff.size() != 0)
-                {
-                    set<int> preds(blocks[(*it)->getBlockIndex()].in.begin(), blocks[(*it)->getBlockIndex()].in.end());
-                    bool changed = true;
-                    while (changed == true)
-                    {
-                        changed = false;
-                        set<int> new_preds(preds);
-                        for (set<int>::iterator pred = preds.begin(); pred != preds.end(); ++pred)
-                            new_preds.insert(blocks[*pred].in.begin(), blocks[*pred].in.end());
-
-                        if (preds != new_preds)
-                        {
-                            preds = new_preds;
-                            changed = true;
-                        }
-                    }
-                    blockIndices[*it].insert(preds.begin(), preds.end());
-                }
-                else
-                    blockIndices[*it].insert(0);
-
-                minIndex = min(minIndex, (*it)->getBlockIndex());
-            }
-            set<int> common_preds;
-            for (set<Access*>::iterator it = _accesses.begin(); it != _accesses.end(); ++it)
-                common_preds.insert(blockIndices[*it].begin(), blockIndices[*it].end());
-
-            for (set<Access*>::iterator it = _accesses.begin(); it != _accesses.end(); ++it)
-            {
-                if (blockIndices[*it].size() == 1 && *blockIndices[*it].begin() == 0)
-                    continue;
-                else
-                {
-                    set<int> tmp;
-                    intersection(common_preds.begin(), common_preds.end(), blockIndices[*it].begin(), blockIndices[*it].end(), inserter(tmp, tmp.end()));
-                    common_preds = tmp;
-                }
-            }
-
-            int max = 0;
-            for (set<int>::iterator it = common_preds.begin(); it != common_preds.end(); ++it)
-            {
-                if (*it < minIndex)
-                {
-                    if (*it > max)
-                        max = *it;
-                }
-            }
-
-            stmt = loop->getBlocks()[max].head;
-            tfmInfo.ifCalls[stmt].push_back(funcCallExpIf);
-            tfmInfo.elseCalls[stmt].push_back(funcCallExpElse);
-        }
-    }
-}
-
-bool Loop::irregularAnalysisIsOn() const
-{
-    return do_irreg_opt;
-}
-
-static bool isOnlyParS(SgExpression* ex, SgSymbol* parS)
-{
-    bool ret = true;
-    if (ex)
-    {
-        if (ex->variant() != VAR_REF || ex->variant() == CONST_REF)
-            return false;
-        if (ex->variant() == VAR_REF)
-            if (ex->symbol()->identifier() != string(parS->identifier()))
-                return false;
-
-        bool left = isOnlyParS(ex->lhs(), parS);
-        bool right = isOnlyParS(ex->rhs(), parS);
-        ret = left && right;
-    }
-    return ret;
-}
-
-static void analyzeExpr(SgExpression* ex, SgSymbol* parS, int arrayLvl, bool& needOpt, bool& wasInderectAccess)
-{
-    if (ex)
-    {
-        if (ex->variant() == ARRAY_REF)
-        {
-            if (arrayLvl > 0)
-                wasInderectAccess = true;
-            arrayLvl++;
-            if (isOnlyParS(ex->lhs(), parS) == false)
-                needOpt = true;
-        }
-
-        analyzeExpr(ex->lhs(), parS, arrayLvl, needOpt, wasInderectAccess);
-        analyzeExpr(ex->rhs(), parS, arrayLvl, needOpt, wasInderectAccess);
-    }
-}
-
-void Loop::analyzeInderectAccess()
-{
-    if (symbols.size() != 1)
-        return;
-
-    SgStatement* stmt = loop_body;
-    bool wasInderectAccess = false;
-    bool needOpt = false;
-    while (stmt)
-    {
-        for (int z = 0; z < 3; ++z)
-            analyzeExpr(stmt->expr(z), symbols[0], 0, needOpt, wasInderectAccess);
-        stmt = stmt->lexNext();
-    }
-
-    if (wasInderectAccess && needOpt)
-        do_irreg_opt = true;
-}
-
-Loop::Loop(SgStatement* loop_body, bool enable_opt, bool irreg_access) : 
-    irregular_acc_opt(irreg_access), enable_opt(enable_opt), loop_body(loop_body), 
-    dimension(0), acrossType(0), acrossDims(NULL), do_irreg_opt(false)
-{
-    reduction_operation_list* rsl;
-    for (rsl = red_struct_list; rsl; rsl = rsl->next)
-    {
-        if (rsl->locvar)  //MAXLOC,MINLOC
-            redArrays.insert(rsl->locvar);
-    }
-
-    lhs.clear();
-    rhs.clear();
-    unparsedLhs.clear();
-    unparsedRhs.clear();
-
-    buildCFG();
-    setupSubstitutes();
-    for (int i = 2; i < blocks.size(); ++i)
-        if (blocks[i].head != NULL && (blocks[i].head->variant() == ASSIGN_STAT || blocks[i].head->variant() == PROC_STAT))
-            analyzeAssignments(blocks[i].index, blocks[i].head);
-
-    for (SgExpression* tmp = dvm_parallel_dir->expr(2); tmp != NULL; tmp = tmp->rhs())
-    {
-        symbols.push_back(tmp->lhs()->symbol());
-        ++dimension;
-    }
-
-    for (SgExpression* tmp = dvm_parallel_dir->expr(1); tmp != NULL; tmp = tmp->rhs())
-    {
-        SgExpression* t = tmp->lhs();
-        if (t->variant() == ACC_PRIVATE_OP)
-        {
-            for (t = t->lhs(); t != NULL; t = t->rhs())
-            {
-                if (isSgArrayType(t->lhs()->symbol()->type()) != NULL)
-                    privateList.insert(t->lhs()->symbol());
-            }
-        }
-    }
-
-    SgSymbol* symbol = NULL;
-    SgExpression* subscripts = NULL;
-
-    if (dvm_parallel_dir->expr(0))
-    {
-        symbol = dvm_parallel_dir->expr(0)->symbol();
-        subscripts = ((SgArrayRefExp*)dvm_parallel_dir->expr(0))->subscripts();
-    }
-    else // TIE
-    {
-        SgExpression* arc = findDirect(dvm_parallel_dir->expr(1), ACROSS_OP);
-        SgExpression* tie = findDirect(dvm_parallel_dir->expr(1), ACC_TIE_OP);
-
-        if (arc != NULL && tie == NULL)
-        {
-            err("internal error in across", 424, first_do_par);
-            exit(-1);
-        }
-        else if (arc && tie)
-        {
-            map<string, SgExpression*> acrossArrays, tieArrays;
-            SgExpression* ex = arc->lhs();
-            while (ex)
-            {
-                acrossArrays[ex->lhs()->symbol()->identifier()] = ex->lhs();
-                ex = ex->rhs();
-            }
-            ex = tie->lhs();
-            while (ex)
-            {
-                tieArrays[ex->lhs()->symbol()->identifier()] = ex->lhs();
-                ex = ex->rhs();
-            }
-
-            bool errM = false;
-            for (map<string, SgExpression*>::iterator acrA = acrossArrays.begin(); acrA != acrossArrays.end(); acrA++)
-            {
-                if (tieArrays.find(acrA->first) == tieArrays.end())
-                {
-                    errM = true;
-                    err((string("can not find array '") + acrA->first + "' in TIE clause").c_str(), 425, first_do_par);
-                }
-            }
-            if (errM)
-                exit(-1);
-
-            //TODO: multiple arrays
-            for (map<string, SgExpression*>::iterator acrA = acrossArrays.begin(); acrA != acrossArrays.end(); acrA++)
-            {
-                SgExpression* firstTie = tieArrays[acrA->first];
-                symbol = firstTie->symbol();
-                subscripts = ((SgArrayRefExp*)firstTie)->subscripts();
-                break;
-            }
-        }
-        else
-        {
-            if (irreg_access)
-                analyzeInderectAccess();
-            return;
-        }
-    }
-    //TODO: tmp is undefined in this scope
-    if (arrays.find(symbol) == arrays.end())
-        warn((string("array '") + symbol->identifier() + "': unused").c_str(), 900, first_do_par);
-
-    for (map<SgSymbol*, Array*>::iterator it1 = arrays.begin(); it1 != arrays.end(); ++it1)
-    {
-        if (privateList.find(it1->second->getSymbol()) == privateList.end())
-            it1->second->analyze();
-    }
-
-    // ACROSS_ANALYZER
-    if (WithAcrossClause() == 0)
-    {
-        if (irreg_access)
-            analyzeInderectAccess();
-        return;
-    }
-
-    analyzeAcrossClause();
-    vector<int> acrossDims(symbols.size(), -1);
-    if (arrays.find(symbol) != arrays.end())
-        acrossDims = arrays[symbol]->getAcrossDims();
-
-    size_t i;
-    for (i = 0; i < symbols.size(); ++i)
-    {
-        if (acrossDims[i] != -1)
-            break;
-        if (i == symbols.size())
-            err((string("array '") + symbol->identifier() + "': mapped on different template than corresponding parallel loop").c_str(), 424, first_do_par);
-    }
-
-    analyzeAcrossType();
-    if (acrossType > 1)
-    {
-        for (map<SgSymbol*, Array*>::iterator it1 = arrays.begin(); it1 != arrays.end(); ++it1)
-        {
-            if (privateList.find(it1->second->getSymbol()) == privateList.end())
-                it1->second->analyzeTransformDimensions();
-        }
-    }
-
-#if 0
-    printf("Loop indices(%d):", dimension);
-    for (vector<SgSymbol*>::iterator it = symbols.begin(); it != symbols.end(); ++it)
-        printf(" %s", (*it)->identifier());
-    printf("\n");
-    printf("Private arrays:");
-    for (set<SgSymbol*>::iterator it = privateList.begin(); it != privateList.end(); ++it)
-        printf(" \"%s\"", (*it)->identifier());
-    printf("\n");
-    for (map<SgSymbol*, Array*>::iterator it1 = arrays.begin(); it1 != arrays.end(); ++it1)
-    {
-        if (privateList.find(it1->first) == privateList.end())
-        {
-            printf("Array %s:", it1->second->getSymbol()->identifier());
-            for (int i = 0; i < it1->second->getDimension(); ++i)
-                printf(" %d", it1->second->getAlignment()[i]);
-            printf("\n");
-        }
-        printf("  AcrossDims:");
-        for (vector<int>::iterator it2 = it1->second->getAcrossDims().begin(); it2 != it1->second->getAcrossDims().end(); ++it2)
-            printf(" %d", *it2);
-        printf("\n");
-        printf("  AcrossType: %d\n", it1->second->getAcrossType());
-        if (privateList.find(it1->first) == privateList.end())
-        {
-            printf("  TransformDims:");
-            for (vector<int>::iterator it2 = it1->second->getTfmInfo().transformDims.begin(); it2 != it1->second->getTfmInfo().transformDims.end(); ++it2)
-                printf(" %d", *it2);
-            printf("\n");
-            for (map<string, Access*>::iterator it2 = it1->second->getAccesses().begin(); it2 != it1->second->getAccesses().end(); ++it2)
-            {
-                printf("    Access:");
-                for (int i = 0; i < it1->second->getDimension(); ++i)
-                    printf(" %d", it2->second->getAlignment()[i]);
-                printf("\n");
-            }
-        }
-    }
-    printf("  LoopAcrossType: %d\n", acrossType);
-    printf("  LoopAcrossDims:");
-    for (int i = 0; i < dimension; ++i)
-        printf(" %d", acrossDims[i]);
-    printf("\n");
-    char* scriptName = new char[64];
-    sprintf(scriptName, "cfg.loop_%d.gv", first_do_par->lineNumber());
-    visualize(scriptName);
-    delete[]scriptName;
-    printf("############################################################\n");
-#endif
-}
-
-void Loop::analyzeAssignments(SgExpression* ex, const int blockIndex)
-{
-    if (ex->variant() != ARRAY_REF)
-    {
-        SgExpression* lhs = ex->lhs();
-        SgExpression* rhs = ex->rhs();
-        if (lhs)
-            analyzeAssignments(lhs, blockIndex);
-        if (rhs)
-            analyzeAssignments(rhs, blockIndex);
-    }
-    else
-    {
-        SgSymbol* symbol = ex->symbol();
-        if (isSgArrayType(symbol->type()) != NULL && redArrays.find(symbol) == redArrays.end())
-        {
-            SgExpression* subscripts = ((SgArrayRefExp*)(ex))->subscripts();
-            if (!subscripts)
-                return;
-
-            for (SgExpression* tmp = subscripts; tmp != NULL; tmp = tmp->rhs())
-                tmp->setLhs(simplify(tmp->lhs()));
-
-            string s(subscripts->unparse());
-            if (arrays.find(symbol) == arrays.end())
-            {
-                Array* array = new Array(symbol, isSgArrayType(symbol->type())->dimension(), this);
-                arrays[symbol] = array;
-                array->getAccesses()[s] = new Access(subscripts, s, array, blockIndex);
-            }
-            else
-            {
-                Array* array = arrays[symbol];
-                if (array->getAccesses().find(s) == array->getAccesses().end())
-                    array->getAccesses()[s] = new Access(subscripts, s, array, blockIndex);
-            }
-        }
-    }
-}
-
-void Loop::analyzeAssignments(int blockIndex, SgStatement* stmt)
-{
-    for (int i = 0; i < 3; ++i)
-        if (stmt->expr(i))
-            analyzeAssignments(stmt->expr(i), blockIndex);
-}
-
-inline bool Loop::IsTargetable(SgStatement* stmt) const
-{
-    return stmt != NULL
-        && stmt->variant() != ELSEIF_NODE
-        && stmt->variant() != CASE_NODE
-        && stmt->variant() != DEFAULT_NODE
-        && stmt->variant() != CONTROL_END;
-}
-
-void Loop::buildCFG()
-{
-    SgStatement* stmt = loop_body;
-    map<SgStatement*, SgStatement*> controlFlow;
-    map<int, vector<SgStatement*> > blockOut;
-
-    map<int, set<string> > GENae, KILLae, INae, OUTae;
-    map<string, vector<SgStatement*> > EXTRA;
-    map<int, set<SgStatement*> > GENrd, KILLrd;
-    map<int, map<string, SgStatement*> > blockAssignments;
-    map<SgStatement*, string> assignments;
-    set<string> allStmts;
-
-    BasicBlock entry;
-    entry.index = ENTRY;
-    BasicBlock exit;
-    exit.index = EXIT;
-    blockOut[ENTRY].push_back(stmt);
-    blockIn[NULL] = EXIT;
-    blocks.push_back(entry);
-    blocks.push_back(exit);
-    int i = 2;
-
-    while (stmt != NULL)
-    {
-        BasicBlock block;
-        block.index = i;
-        block.head = stmt;
-        blockIn[stmt] = i;
-        vector<SgStatement*>& out = blockOut[i];
-        list<string> stmts;
-
-        while (stmt != NULL)
-        {
-            bool tail = true;
-            switch (stmt->variant())
-            {
-                case WHERE_NODE:
-                    break;
-                case WHERE_BLOCK_STMT:
-                    break;
-                case ELSEWH_NODE:
-                    break;
-                case SWITCH_NODE:
-                {
-                    SgSwitchStmt* _stmt = (SgSwitchStmt*)stmt;
-                    controlFlow[_stmt] = IsTargetable(_stmt->lastNodeOfStmt()->lexNext())
-                        && _stmt->lastNodeOfStmt()->lexNext()->controlParent() == _stmt->controlParent() ? _stmt->lastNodeOfStmt()->lexNext() : controlFlow[_stmt->controlParent()];
-
-                    if (_stmt->caseOption(0) == NULL)
-                    {
-                        if (_stmt->defOption() == NULL)
-                            out.push_back(controlFlow[_stmt]);
-                        else
-                            out.push_back(_stmt->defOption());
-                    }
-                    else
-                        out.push_back(_stmt->caseOption(0));
-                    break;
-                }
-                case CASE_NODE:
-                {
-                    SgSwitchStmt* switchStmt = ((SgSwitchStmt*)stmt->controlParent());
-                    controlFlow[stmt] = controlFlow[switchStmt];
-                    int i;
-                    for (i = 0; i < switchStmt->numberOfCaseOptions() && stmt != switchStmt->caseOption(i); i++);
-
-                    SgStatement* nextStmt = stmt->lexNext();
-                    if (nextStmt->variant() != CASE_NODE && nextStmt->variant() != DEFAULT_NODE && nextStmt->variant() != CONTROL_END)
-                        out.push_back(nextStmt);
-
-                    if (i == switchStmt->numberOfCaseOptions() - 1)
-                    {
-                        if (switchStmt->defOption() != NULL)
-                            out.push_back(switchStmt->defOption());
-                        else
-                            out.push_back(controlFlow[stmt]);
-                    }
-                    else
-                        out.push_back(switchStmt->caseOption(i + 1));
-                    break;
-                }
-                case DEFAULT_NODE:
-                {
-                    controlFlow[stmt] = controlFlow[stmt->controlParent()];
-                    SgStatement* nextStmt = stmt->lexNext();
-
-                    if (nextStmt->variant() != CASE_NODE && nextStmt->variant() != CONTROL_END)
-                        out.push_back(nextStmt);
-                    out.push_back(controlFlow[stmt]);
-                    break;
-                }
-                case ARITHIF_NODE:
-                    // something wrong with SgArithIfStmt::label(...) method, this seems ok
-                    out.push_back(StmtWithLabel(((SgLabelRefExp*)LlndMapping(getPositionInExprList(BIF_LL2(stmt->thebif), 0)))->label()));
-                    out.push_back(StmtWithLabel(((SgLabelRefExp*)LlndMapping(getPositionInExprList(BIF_LL2(stmt->thebif), 1)))->label()));
-                    out.push_back(StmtWithLabel(((SgLabelRefExp*)LlndMapping(getPositionInExprList(BIF_LL2(stmt->thebif), 2)))->label()));
-                    break;
-                case IF_NODE:
-                {
-                    SgStatement* falseBody = ((SgIfStmt*)stmt)->falseBody();
-                    SgStatement* _stmt = stmt;
-                    while (falseBody != NULL && falseBody->variant() == ELSEIF_NODE)
-                    {
-                        _stmt = falseBody;
-                        falseBody = ((SgIfStmt*)falseBody)->falseBody();
-                    }
-
-                    controlFlow[stmt] = IsTargetable(_stmt->lastNodeOfStmt()->lexNext())
-                        && _stmt->lastNodeOfStmt()->lexNext()->controlParent() == stmt->controlParent() ? _stmt->lastNodeOfStmt()->lexNext() : controlFlow[stmt->controlParent()];
-
-                    SgStatement* trueBody = ((SgIfStmt*)stmt)->trueBody();
-                    falseBody = ((SgIfStmt*)stmt)->falseBody();
-                    bool trueBodyCond = trueBody != NULL && trueBody->variant() != CONTROL_END;
-                    bool falseBodyCond = falseBody != NULL && falseBody->variant() != CONTROL_END;
-
-                    if (trueBodyCond == true)
-                        out.push_back(trueBody);
-
-                    if (falseBodyCond == true)
-                        out.push_back(falseBody);
-
-                    if (trueBodyCond == false || falseBodyCond == false)
-                        out.push_back(controlFlow[stmt]);
-                    break;
-                }
-                case ELSEIF_NODE:
-                {
-                    controlFlow[stmt] = controlFlow[stmt->controlParent()];
-                    SgStatement* trueBody = ((SgIfStmt*)stmt)->trueBody();
-                    SgStatement* falseBody = ((SgIfStmt*)stmt)->falseBody();
-                    bool trueBodyCond = trueBody != NULL && trueBody->variant() != CONTROL_END;
-                    bool falseBodyCond = falseBody != NULL && falseBody->variant() != CONTROL_END;
-                    if (trueBodyCond == true)
-                        out.push_back(trueBody);
-
-                    if (falseBodyCond == true)
-                        out.push_back(falseBody);
-
-                    if (trueBodyCond == false || falseBodyCond == false)
-                        out.push_back(controlFlow[stmt]);
-                    break;
-                }
-                case LOGIF_NODE:
-                    controlFlow[stmt] = IsTargetable(stmt->lastNodeOfStmt()->lexNext())
-                        && stmt->lastNodeOfStmt()->lexNext()->controlParent() == stmt->controlParent() ? stmt->lastNodeOfStmt()->lexNext() : controlFlow[stmt->controlParent()];
-                    out.push_back(((SgLogIfStmt*)stmt)->body());
-                    out.push_back(controlFlow[stmt]);
-                    break;
-                case WHILE_NODE:
-                {
-                    SgWhileStmt* _stmt = (SgWhileStmt*)stmt;
-                    controlFlow[stmt] = stmt;
-                    out.push_back(_stmt->body());
-                    SgStatement* st = _stmt->body();
-                    while (st != NULL && st->controlParent() != stmt->controlParent())
-                        st = st->lexNext();
-
-                    SgStatement* nextStmt = IsTargetable(st)
-                        && st->controlParent() == stmt->controlParent() ? st : controlFlow[stmt->controlParent()];
-
-                    out.push_back(nextStmt);
-                    break;
-                }
-                case COMGOTO_NODE:
-                {
-                    SgComputedGotoStmt* _stmt = (SgComputedGotoStmt*)stmt;
-                    controlFlow[_stmt] = IsTargetable(_stmt->lastNodeOfStmt()->lexNext())
-                        && _stmt->lastNodeOfStmt()->lexNext()->controlParent() == _stmt->controlParent() ? _stmt->lastNodeOfStmt()->lexNext() : controlFlow[_stmt->controlParent()];
-
-                    SgExpression* labelList = _stmt->labelList();
-                    for (int i = 0; i < _stmt->numberOfTargets(); i++, labelList = labelList->rhs())
-                        out.push_back(StmtWithLabel(((SgLabelRefExp*)labelList->lhs())->label()));
-
-                    out.push_back(controlFlow[_stmt]);
-                    break;
-                }
-                case FOR_NODE:
-                {
-                    SgForStmt* _stmt = (SgForStmt*)stmt;
-                    controlFlow[_stmt] = _stmt;
-                    out.push_back(_stmt->body());
-                    SgStatement* st = _stmt->body();
-                    while (st != NULL && st->controlParent() != _stmt->controlParent())
-                        st = st->lexNext();
-                    SgStatement* nextStmt = IsTargetable(st)
-                        && st->controlParent() == _stmt->controlParent() ? st : controlFlow[_stmt->controlParent()];
-                    out.push_back(nextStmt);
-                    if (_stmt->symbol() != NULL)
-                    {
-                        SgStatement* inc = new SgAssignStmt(*new SgVarRefExp(_stmt->symbol()), *new SgVarRefExp(_stmt->symbol()) + (_stmt->step() != NULL ? *new SgValueExp(_stmt->step()->valueInteger()) : *new SgValueExp(1)));
-                        blockAssignments[i][inc->expr(0)->unparse()] = inc;
-                        for (list<string>::iterator it = stmts.begin(); it != stmts.end();)
-                        {
-                            if (EXTRA[*it][0]->expr(1)->IsSymbolInExpression(*_stmt->symbol()) != NULL)
-                                it = stmts.erase(it);
-                            else
-                                ++it;
-                        }
-                    }
-                    break;
-                }
-                case GOTO_NODE:
-                    out.push_back(StmtWithLabel(((SgGotoStmt*)stmt)->branchLabel()));
-                    break;
-                case EXIT_STMT:
-                {
-                    SgExitStmt* _stmt = (SgExitStmt*)stmt;
-                    SgSymbol* constructName = _stmt->constructName();
-                    SgStatement* parent = _stmt->controlParent();
-                    if (constructName != NULL)
-                        while (parent != NULL && ((parent->variant() != FOR_NODE && parent->variant() != WHILE_NODE) || strcmp(LlndMapping(BIF_LL3(parent->thebif))->unparse(), constructName->identifier()) != 0))
-                            parent = parent->controlParent();
-                    else
-                        while (parent != NULL && parent->variant() != FOR_NODE && parent->variant() != WHILE_NODE)
-                            parent = parent->controlParent();
-                    if (parent != NULL)
-                    {
-                        SgStatement* st = ((SgForStmt*)parent)->body();
-                        while (st != NULL && st->controlParent() != parent->controlParent())
-                            st = st->lexNext();
-                        out.push_back((IsTargetable(st) && st->controlParent() == parent->controlParent()) ? st : controlFlow[parent->controlParent()]);
-                    }
-                    else
-                        out.push_back(NULL);//jump to parallel DOs
-                    break;
-                }
-                case CYCLE_STMT:
-                {
-                    SgCycleStmt* _stmt = (SgCycleStmt*)stmt;
-                    SgSymbol* constructName = _stmt->constructName();
-                    SgStatement* parent = _stmt->controlParent();
-                    if (constructName != NULL)
-                        while (parent != NULL && ((parent->variant() != FOR_NODE && parent->variant() != WHILE_NODE) || strcmp(LlndMapping(BIF_LL3(parent->thebif))->unparse(), constructName->identifier()) != 0))
-                            parent = parent->controlParent();
-                    else
-                        while (parent != NULL && parent->variant() != FOR_NODE && parent->variant() != WHILE_NODE)
-                            parent = parent->controlParent();
-                    out.push_back(parent);
-                    break;
-                }
-                case ASSIGN_STAT:
-                {
-                    string s0(simplify(stmt->expr(0))->unparse());
-                    string s1(simplify(stmt->expr(1))->unparse());
-                    unparsedLhs[stmt->expr(0)] = s0;
-                    unparsedRhs[stmt->expr(1)] = s1;
-                    lhs[s0] = stmt->expr(0);
-                    rhs[s1] = stmt->expr(1);
-                    if (s0 != s1)
-                    {
-                        if (stmt->expr(0)->variant() == ARRAY_REF)
-                        {
-                            bool success = true;
-                            for (SgExpression* tmp = ((SgArrayRefExp*)stmt->expr(0))->subscripts(); tmp != NULL; tmp = tmp->rhs())
-                            {
-                                if (tmp->lhs()->variant() != CONST_REF)
-                                {
-                                    success = false;
-                                    break;
-                                }
-                            }
-
-                            if (success == true)
-                                blockAssignments[i][s0] = stmt;
-                            else
-                                blockAssignments[i][stmt->expr(0)->symbol()->identifier()] = stmt;
-                        }
-                        else
-                            blockAssignments[i][s0] = stmt;
-
-                        GENrd[i].insert(stmt);
-                        assignments[stmt] = s1;
-                        EXTRA[s1].push_back(stmt);
-                        stmts.push_back(s1);
-                        allStmts.insert(s1);
-
-                        for (list<string>::iterator it = stmts.begin(); it != stmts.end();)
-                        {
-                            if (FindInExpr(stmt->expr(0), EXTRA[*it][0]->expr(1)) != 0)
-                                it = stmts.erase(it);
-                            else
-                                ++it;
-                        }
-                    }
-                }
-                default:
-                {
-                    if (stmt->hasLabel() == false)
-                        tail = false;
-                    else
-                    {
-                        SgStatement* parent = stmt->controlParent();
-                        while (parent != NULL && (parent->variant() == FOR_NODE || parent->variant() == WHILE_NODE))
-                        {
-                            if (BIF_LABEL_USE(parent->thebif) != NULL && LABEL_STMTNO(BIF_LABEL_USE(parent->thebif)) == LABEL_STMTNO(stmt->label()->thelabel))
-                                out.push_back(parent);
-                            parent = parent->controlParent();
-                        }
-                        if (out.size() != 0)
-                            break;
-                    }
-
-                    SgStatement* _stmt = stmt->lexNext();
-                    if (_stmt != NULL)
-                    {
-                        switch (_stmt->variant())
-                        {
-                        case FOR_NODE:
-                        case WHILE_NODE:
-                        case WHERE_NODE:
-                        case WHERE_BLOCK_STMT:
-                            tail = true;
-                            out.push_back(_stmt);
-                            break;
-                        case ELSEIF_NODE:
-                        case ELSEWH_NODE:
-                        case CASE_NODE:
-                        case DEFAULT_NODE:
-                        case CONTROL_END:
-                            tail = true;
-                            out.push_back(controlFlow[_stmt->controlParent()]);
-                            break;
-                        case FORMAT_STAT:
-                            tail = false;
-                            break;
-                        default:
-                            if (_stmt->hasLabel() == false)
-                            {
-                                //tail = false;break;// builds CFG of Extended Basic Blocks
-                                tail = true;
-                                out.push_back(_stmt);
-                                break;
-                            }
-                            else
-                            {
-                                SgStatement* parent = _stmt->controlParent();
-                                while (parent != NULL && (parent->variant() == FOR_NODE || parent->variant() == WHILE_NODE))
-                                {
-                                    if (BIF_LABEL_USE(parent->thebif) != NULL && LABEL_STMTNO(BIF_LABEL_USE(parent->thebif)) == LABEL_STMTNO(_stmt->label()->thelabel))
-                                    {
-                                        tail = false;
-                                        break;
-                                    }
-                                    parent = parent->controlParent();
-                                }
-                                //can't find way to get stmts referencing this label
-                                //just start new block even if label is not referenced
-                                tail = true;
-                                out.push_back(_stmt);
-                                break;
-                            }
-                            break;
-                        }
-                    }
-                    else
-                        out.push_back(NULL);
-                    break;
-                }
-            }
-
-            if (tail == true)
-            {
-                GENae[i].insert(stmts.begin(), stmts.end());
-                block.tail = stmt;
-                blocks.push_back(block);
-            }
-
-            stmt = stmt->lexNext();
-            while (stmt != NULL && stmt->variant() == CONTROL_END)
-                stmt = stmt->lexNext();
-
-            if (tail == true)
-                break;
-        }
-        i++;
-    }
-
-    for (map<int, vector<SgStatement*> >::iterator it1 = blockOut.begin(); it1 != blockOut.end(); ++it1)
-    {
-        for (vector<SgStatement*>::iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
-        {
-            blocks[it1->first].out.push_back(blockIn[*it2]);
-            blocks[blockIn[*it2]].in.push_back(it1->first);
-        }
-    }
-    blockOut.clear();
-    controlFlow.clear();
-
-    for (vector<BasicBlock>::iterator block = blocks.begin() + 2; block != blocks.end(); ++block)
-    {
-        map<string, SgStatement*>* bAssignments = &blockAssignments[block->index];
-        for (map<SgStatement*, string>::iterator it = assignments.begin(); it != assignments.end(); ++it)
-        {
-            SgStatement* stmt = NULL;
-            SgExpression* lhs = it->first->expr(0);
-            if (it->first->expr(0)->variant() == ARRAY_REF)
-                stmt = bAssignments->find(lhs->symbol()->identifier()) != bAssignments->end() ?
-                (*bAssignments)[lhs->symbol()->identifier()] : (*bAssignments)[unparsedLhs[lhs]];
-            else
-                stmt = (*bAssignments)[unparsedLhs[lhs]];
-
-            if (stmt != NULL && stmt != it->first && blockIn[it->first] != block->index)
-                KILLrd[block->index].insert(it->first);
-        }
-
-        for (SgStatement* stmt = block->head; stmt != block->tail->lexNext(); stmt = stmt->lexNext())
-        {
-            if (stmt == NULL)
-                continue;
-            if (stmt->variant() == ASSIGN_STAT || stmt->variant() == FOR_NODE)
-            {
-                SgExpression* expr = stmt->variant() == ASSIGN_STAT ? stmt->expr(0) : (*bAssignments)[stmt->symbol()->identifier()]->expr(0);
-                for (map<SgStatement*, string>::iterator it = assignments.begin(); it != assignments.end(); ++it)
-                    if (FindInExpr(expr, it->first->expr(1)) != 0)
-                        KILLae[block->index].insert(it->second);
-            }
-        }
-        block->OUTrd.swap(GENrd[block->index]);
-        difference(allStmts.begin(), allStmts.end(), KILLae[block->index].begin(), KILLae[block->index].end(), inserter(OUTae[block->index], OUTae[block->index].end()));
-    }
-    allStmts.clear();
-    assignments.clear();
-    blockAssignments.clear();
-
-
-    bool changed = true;
-    while (changed == true)
-    {
-        changed = false;
-        for (vector<BasicBlock>::iterator block = blocks.begin() + 2; block != blocks.end(); ++block)
-        {
-            for (vector<int>::iterator it = block->in.begin(); it != block->in.end(); ++it)
-                block->INrd.insert(blocks[*it].OUTrd.begin(), blocks[*it].OUTrd.end());
-            set<SgStatement*> newOUTrd(GENrd[block->index].begin(), GENrd[block->index].end());
-            difference(block->INrd.begin(), block->INrd.end(), KILLrd[block->index].begin(), KILLrd[block->index].end(), inserter(newOUTrd, newOUTrd.end()));
-            if (newOUTrd != block->OUTrd)
-            {
-                block->OUTrd.swap(newOUTrd);
-                changed = true;
-            }
-        }
-    }
-    GENrd.clear();
-    KILLrd.clear();
-
-    changed = true;
-    while (changed == true)
-    {
-        changed = false;
-        for (vector<BasicBlock>::iterator block = blocks.begin() + 2; block != blocks.end(); ++block)
-        {
-            if (block->in.size() != 0)
-            {
-                INae[block->index] = set<string>(OUTae[block->in[0]].begin(), OUTae[block->in[0]].end());
-                for (vector<int>::iterator it = block->in.begin() + 1; it != block->in.end(); ++it)
-                {
-                    set<string> tmp;
-                    intersection(INae[block->index].begin(), INae[block->index].end(), OUTae[*it].begin(), OUTae[*it].end(), inserter(tmp, tmp.end()));
-                    INae[block->index].swap(tmp);
-                }
-            }
-            set<string> _union(GENae[block->index].begin(), GENae[block->index].end());
-            _union.insert(INae[block->index].begin(), INae[block->index].end());
-            set<string> newOUTae;
-            difference(_union.begin(), _union.end(), KILLae[block->index].begin(), KILLae[block->index].end(), inserter(newOUTae, newOUTae.end()));
-            if (newOUTae != OUTae[block->index])
-            {
-                OUTae[block->index].swap(newOUTae);
-                changed = true;
-            }
-        }
-    }
-    GENae.clear();
-    KILLae.clear();
-
-    for (vector<BasicBlock>::iterator block = blocks.begin() + 2; block != blocks.end(); ++block)
-    {
-        for (set<string>::iterator it1 = INae[block->index].begin(); it1 != INae[block->index].end(); ++it1)
-            block->INae.insert(EXTRA[*it1].begin(), EXTRA[*it1].end());
-
-        for (set<string>::iterator it1 = OUTae[block->index].begin(); it1 != OUTae[block->index].end(); ++it1)
-            block->OUTae.insert(EXTRA[*it1].begin(), EXTRA[*it1].end());
-    }
-}
-
-Loop::Loop(SgStatement* stmt) : do_irreg_opt(false)
-{
-    reduction_operation_list* rsl;
-    for (rsl = red_struct_list; rsl; rsl = rsl->next)
-    {
-        if (rsl->locvar)  //MAXLOC,MINLOC
-            redArrays.insert(rsl->locvar);
-    }
-
-    lhs.clear(); rhs.clear(); unparsedLhs.clear(); unparsedRhs.clear();
-    buildCFG();
-}
-
-set<SgStatement*> Loop::RDsAt(SgStatement* stmt) const
-{
-    if (blockIn.find(stmt) == blockIn.end() || !(0 <= blockIn.at(stmt) && blockIn.at(stmt) < blocks.size()))
-    {
-        return set<SgStatement*>();
-    }
-    return blocks[blockIn.at(stmt)].INrd;
-}
-
-set<SgStatement*> Loop::AEsAt(SgStatement* stmt) const
-{
-    if (blockIn.find(stmt) == blockIn.end() || !(0 <= blockIn.at(stmt) && blockIn.at(stmt) < blocks.size()))
-    {
-        return set<SgStatement*>();
-    }
-    return blocks[blockIn.at(stmt)].INae;
-}
-
-void Loop::setupSubstitutes()
-{
-    for (vector<BasicBlock>::iterator block = blocks.begin() + 2; block != blocks.end(); ++block)
-    {
-        set<SgStatement*> ss;
-        intersection(block->INrd.begin(), block->INrd.end(), block->INae.begin(), block->INae.end(), inserter(ss, ss.end()));
-        block->OUTae.clear();
-        block->OUTrd.clear();
-        for (set<SgStatement*>::iterator it = ss.begin(); it != ss.end();)
-        {
-            if (FindInExpr((*it)->expr(0), (*it)->expr(1)) != 0)
-                ss.erase(it++);
-            else
-                ++it;
-        }
-        map<SgExpression*, SgStatement*> parent;
-        map<SgExpression*, set<SgExpression*> > INss;
-        for (set<SgStatement*>::iterator it = ss.begin(); it != ss.end(); ++it)
-        {
-            SgExpression* expr0 = lhs[unparsedLhs[(*it)->expr(0)]];
-            SgExpression* expr1 = rhs[unparsedRhs[(*it)->expr(1)]];
-            INss[expr0].insert(expr1);
-            parent[expr0] = *it;
-            parent[expr1] = *it;
-        }
-
-        for (map<SgExpression*, set<SgExpression*> >::iterator it1 = INss.begin(); it1 != INss.end(); ++it1)
-        {
-            for (set<SgExpression*>::iterator it2 = it1->second.begin(); it2 != it1->second.end(); ++it2)
-            {
-                SgExpression* rhs = (*it2)->copyPtr();
-                block->INss[it1->first].insert(rhs);
-                parent[rhs] = parent[*it2];
-            }
-        }
-
-        for (map<SgExpression*, set<SgExpression*> >::iterator it1 = block->INss.begin(); it1 != block->INss.end(); ++it1)
-        {
-            if (it1->second.size() != 1 || FindInExpr(it1->first, block->head->expr(1)) == 0)
-                continue;
-            bool changed = true;
-            SgExpression* expr = *it1->second.begin();
-            SgStatement* stmt = parent[it1->first];
-            while (changed == true)
-            {
-                changed = false;
-                for (map<SgExpression*, set<SgExpression*> >::iterator it3 = block->INss.begin(); it3 != block->INss.end(); ++it3)
-                    if (it3->second.size() == 1 && it1->first != it3->first)
-                        changed |= replace(expr, stmt, it3->first, *it3->second.begin()) != 0;
-            }
-        }
-    }
-
-    if (enable_opt == true)
-    {
-        for (vector<BasicBlock>::iterator block = blocks.begin() + 2; block != blocks.end(); ++block)
-        {
-            for (map<SgExpression*, set<SgExpression*> >::iterator it = block->INss.begin(); it != block->INss.end(); ++it)
-            {
-                if (it->second.size() == 1)
-                {
-                    if (block->head->variant() == ASSIGN_STAT)
-                    {
-                        replaceInSubscripts(block->head->expr(0), block->head, it->first, *it->second.begin());
-                        replaceInSubscripts(block->head->expr(1), block->head, it->first, *it->second.begin());
-                    }
-                    else if (block->head->variant() == PROC_CALL)
-                        replaceInSubscripts(block->head->expr(0), block->head, it->first, *it->second.begin());
-                }
-            }
-        }
-    }
-
-    vector<bool> visited(blocks.size(), false);
-    visited[ENTRY] = true;
-    visited[EXIT] = true;
-    visited[2] = true;
-    vector<int> _blocks;
-    map<int, int> dfn;
-    dfn[ENTRY] = 0;
-    dfn[EXIT] = 1;
-    _blocks.push_back(2);
-    int k = 0;
-    int count = 2;
-
-    for (vector<int>::iterator p = _blocks.begin(); p != _blocks.end(); ++k, p = _blocks.begin() + k)
-    {
-        int index = *p;
-        visited[index] = true;
-        for (vector<int>::iterator it = blocks[index].out.begin(); it != blocks[index].out.end(); ++it)
-        {
-            if (visited[*it] == false)
-            {
-                visited[*it] = true;
-                _blocks.push_back(*it);
-            }
-        }
-        dfn[index] = count;
-        count++;
-    }
-
-    vector<BasicBlock> tmp(blocks.size());
-    for (vector<BasicBlock>::iterator block = blocks.begin(); block != blocks.end(); ++block)
-    {
-        block->index = dfn[block->index];
-        for (vector<int>::iterator it = block->out.begin(); it != block->out.end(); ++it)
-            *it = dfn[*it];
-
-        for (vector<int>::iterator it = block->in.begin(); it != block->in.end(); ++it)
-            *it = dfn[*it];
-        tmp[block->index] = *block;
-    }
-    blocks.swap(tmp);
-}
-
-
-// graphviz script, for debug
-void Loop::visualize(const char* scriptName) const
-{
-    FILE* f = fopen(scriptName, "w");
-    if (f == NULL)
-    {
-        printf("Failed to open file \"%s\"\n", scriptName);
-        return;
-    }
-    fprintf(f, "digraph\n{\n0[label=\"{Entry|<out>}\",shape=record]\n1[label=\"{<in>Exit|}\",shape=record]\n");
-
-    for (size_t i = 2; i < blocks.size(); ++i)
-    {
-        fprintf(f, "%d[label=\"{<in>B%d|<out>", blocks[i].index, blocks[i].index);
-        for (SgStatement* stmt = blocks[i].head; stmt != NULL && stmt != blocks[i].tail->lexNext(); stmt = stmt->lexNext())
-        {
-            switch (stmt->variant())
-            {
-                case SWITCH_NODE:
-                    if (stmt->label())
-                        fprintf(f, "%ld  ", LABEL_STMTNO(stmt->label()->thelabel));
-                    fprintf(f, "select case (%s)\\n", ((SgSwitchStmt*)stmt)->expr(0)->unparse());
-                    break;
-                case IF_NODE:
-                    if (stmt->label())
-                        fprintf(f, "%ld  ", LABEL_STMTNO(stmt->label()->thelabel));
-                    fprintf(f, "if (%s) then\\n", ((SgIfStmt*)stmt)->conditional()->unparse());
-                    break;
-                case ELSEIF_NODE:
-                    fprintf(f, "elseif (%s) then\\n", ((SgIfStmt*)stmt)->conditional()->unparse());
-                    break;
-                case LOGIF_NODE:
-                    if (stmt->label())
-                        fprintf(f, "%ld  ", LABEL_STMTNO(stmt->label()->thelabel));
-                    fprintf(f, "if (%s)\\n", ((SgLogIfStmt*)stmt)->conditional()->unparse());
-                    break;
-                case WHILE_NODE:
-                {
-                    SgForStmt* _stmt = (SgForStmt*)stmt;
-                    if (_stmt->hasLabel() == TRUE)
-                        fprintf(f, "%ld  ", LABEL_STMTNO(_stmt->label()->thelabel));
-                    if (LlndMapping(BIF_LL3(_stmt->thebif)) != NULL)
-                        fprintf(f, "%s: ", LlndMapping(BIF_LL3(_stmt->thebif))->unparse());
-                    fprintf(f, "do ");
-                    if (BIF_LABEL_USE(_stmt->thebif) != NULL)
-                        fprintf(f, "%ld ", LABEL_STMTNO(BIF_LABEL_USE(_stmt->thebif)));
-                    fprintf(f, "while ");
-                    if (((SgWhileStmt*)stmt)->conditional() != NULL)
-                        fprintf(f, "(%s)\\n", ((SgWhileStmt*)stmt)->conditional()->unparse());
-                    break;
-                }
-                case FOR_NODE:
-                {
-                    SgForStmt* _stmt = (SgForStmt*)stmt;
-                    if (_stmt->hasLabel() == TRUE)
-                        fprintf(f, "%ld ", LABEL_STMTNO(_stmt->label()->thelabel));
-                    if (LlndMapping(BIF_LL3(_stmt->thebif)) != NULL)
-                        fprintf(f, "%s: ", LlndMapping(BIF_LL3(_stmt->thebif))->unparse());
-                    fprintf(f, "do ");
-                    if (BIF_LABEL_USE(_stmt->thebif) != NULL)
-                        fprintf(f, "%ld ", LABEL_STMTNO(BIF_LABEL_USE(_stmt->thebif)));
-#if __SPF
-                    if (_stmt->doName()->identifier() != NULL)
-                        fprintf(f, "%s = ", _stmt->doName()->identifier());
-#else
-                    if (_stmt->doName().identifier() != NULL)
-                        fprintf(f, "%s = ", _stmt->doName().identifier());
-#endif
-                    if (_stmt->start() != NULL)
-                        fprintf(f, "%s, ", _stmt->start()->unparse());
-                    if (_stmt->end() != NULL)
-                        fprintf(f, "%s", _stmt->end()->unparse());
-                    if (_stmt->step() != NULL)
-                        fprintf(f, ", %s\\n", _stmt->step()->unparse());
-                    break;
-                }
-                default:
-                    fprintf(f, "%s\\n", stmt->unparse());
-                    break;
-            }
-        }
-        fprintf(f, "}\",shape=record]\n");
-    }
-
-    for (size_t i = 0; i < blocks.size(); ++i)
-    {
-        for (size_t j = 0; j < blocks[i].out.size(); ++j)
-            fprintf(f, "%d:out->%d:in\n", blocks[i].index, blocks[i].out[j]);
-    }
-    fprintf(f, "}");
-    fclose(f);
-}
-
-
-extern SgStatement* kernelScope;
-
-SgExpression* analyzeArrayIndxs(SgSymbol* ar, SgExpression* subscripts)
-{
-    static int count = 0;
-    SgSymbol* varName = NULL;
-    if (subscripts == NULL || options.isOn(AUTO_TFM) == false || dontGenConvertXY || oneCase)
-        return NULL;
-
-    map<SgSymbol*, Array*>& arrays = currentLoop->getArrays();
-    Array* array = NULL;
-    
-    string toFind = OriginalSymbol(ar)->identifier();
-    for (map<SgSymbol*, Array*>::iterator it = arrays.begin(); it != arrays.end(); it++)
-    {
-        if (OriginalSymbol(it->first)->identifier() == toFind)
-        {
-            array = it->second;
-            break;
-        }
-    }
-        
-    if (array != NULL)
-    {
-        string expr;
-        SgSymbol* symbol = array->findAccess(subscripts, expr);
-        if (symbol == NULL)
-        {
-            char* counter = new char[32];
-            sprintf(counter, "%d", count);
-            ++count;
-            string name(ar->identifier() + string("_") + counter);
-            delete[] counter;
-            if (options.isOn(C_CUDA))
-                varName = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(name.c_str()), *C_DvmType(), *kernelScope);
-            else
-            {
-                if (undefined_Tcuda)
-                    varName = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(name.c_str()), *new SgType(T_INT, new SgExpression(LEN_OP, new SgValueExp(8), NULL, NULL), SgTypeInt()), *kernelScope);
-                else
-                    varName = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(name.c_str()), *SgTypeInt(), *kernelScope);
-            }
-            array->addCoefficient(subscripts, expr, varName);
-        }
-        else
-            varName = symbol;
-    }
-    return varName ? new SgVarRefExp(varName) : NULL;
-}
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_analyzer.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_analyzer.cpp
deleted file mode 100644
index 57e9a36..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_analyzer.cpp
+++ /dev/null
@@ -1,4325 +0,0 @@
-#include "leak_detector.h"
-
-#include "dvm.h"
-#include "acc_analyzer.h"
-#include "calls.h"
-#include <fstream>
-#include <stdint.h>
-
-using std::string;
-using std::vector;
-using std::map;
-using std::list;
-using std::make_pair;
-using std::set;
-using std::pair;
-
-#if __SPF
-using std::wstring;
-#include "Utils/AstWrapper.h"
-#include "Utils/utils.h"
-#include "Utils/errors.h"
-
-static pair<wstring, string> getText(const char *s, const wchar_t *s1, const char *t, int num, SgStatement *stmt, int &line)
-{
-    pair<wstring, string> ret;
-
-    wchar_t bufW[1024];
-#if _WIN32
-    swprintf(bufW, s1, to_wstring(t).c_str());
-#else
-    swprintf(bufW, 1024, s1, to_wstring(t).c_str());
-#endif
-    ret.first = bufW;
-
-    char buf[1024];
-    sprintf(buf, s, t);
-    ret.second = buf;
-
-    line = stmt->lineNumber();
-    if (line == 0)
-    {
-        line = 1;
-        if (stmt->variant() == DVM_PARALLEL_ON_DIR)
-        {
-            line = stmt->lexNext()->lineNumber();
-            ret.first += RR158_1;
-            ret.second += " for this loop";
-        }
-    }
-
-    if (stmt->variant() == SPF_ANALYSIS_DIR)
-    {
-        ret.first += RR158_1;
-        ret.second += " for this loop";
-    }
-
-    return ret;
-}
-
-static inline bool ifVarIsLoopSymb(SgStatement *stmt, const string symb)
-{    
-    bool ret = false;
-    if (stmt == NULL)
-        return ret;
-
-    int var = stmt->variant();    
-    if (var == SPF_ANALYSIS_DIR || var == SPF_PARALLEL_DIR || var == SPF_TRANSFORM_DIR || var == SPF_PARALLEL_REG_DIR || var == SPF_END_PARALLEL_REG_DIR)
-        stmt = stmt->lexNext();
-        
-    SgForStmt *forS = isSgForStmt(stmt);
-    if (forS)
-    {
-        SgStatement *end = forS->lastNodeOfStmt();
-        for (; stmt != end && !ret; stmt = stmt->lexNext())
-            if (stmt->variant() == FOR_NODE)
-                if (isSgForStmt(stmt)->symbol()->identifier() == symb)
-                    ret = true;
-    }
-
-    return ret;
-}
-
-
-template<typename fillType> void fillPrivatesFromComment(Statement *st, std::set<fillType> &privates, int type = -1);
-
-inline void Warning(const char *s, const wchar_t *s1, const char *t, int num, SgStatement *stmt)
-{
-    //TODO: is it correct?
-    if (stmt == NULL)
-        return;
-
-    if (num == PRIVATE_ANALYSIS_REMOVE_VAR)
-    {
-        SgStatement *found = SgStatement::getStatementByFileAndLine(string(stmt->fileName()), stmt->lineNumber());
-        if (found != NULL)
-        {
-            if (ifVarIsLoopSymb(found, t))
-                return;
-        }
-
-        set<string> privates;
-        fillPrivatesFromComment(new Statement(stmt), privates);
-        if (privates.find(t) != privates.end())
-            return;
-    }
-
-    
-    int line;
-    auto retVal = getText(s, s1, t, num, stmt, line);
-    printLowLevelWarnings(stmt->fileName(), line, retVal.first.c_str(), retVal.second.c_str(), 1029);
-}
-
-inline void Note(const char *s, const wchar_t *s1, const char *t, int num, SgStatement *stmt)
-{    
-    int line;
-    auto retVal = getText(s, s1, t, num, stmt, line);
-    printLowLevelNote(stmt->fileName(), line, retVal.first.c_str(), retVal.second.c_str(), 1030);
-}
-#endif
-
-// local functions
-static ControlFlowItem* getControlFlowList(SgStatement*, SgStatement*, ControlFlowItem**, SgStatement**, doLoops*, CallData*, CommonData*);
-static ControlFlowItem* processOneStatement(SgStatement** stmt, ControlFlowItem** pred, ControlFlowItem **list, ControlFlowItem* oldcur, doLoops*, CallData*, CommonData*);
-static ControlFlowItem* switchItem(SgStatement* stmt, ControlFlowItem* empty, SgStatement** lastAnStmt, doLoops* loops, CallData* calls, CommonData*);
-static ControlFlowItem* ifItem(SgStatement*, ControlFlowItem*, SgStatement** lastAnStmt, doLoops* loops, bool ins, CallData*, CommonData*);
-static void setLeaders(ControlFlowItem*);
-static void clearList(ControlFlowItem*);
-static void fillLabelJumps(ControlFlowItem*);
-static SgExpression* GetProcedureArgument(bool isF, void* f, int i);
-static int GetNumberOfArguments(bool isF, void* f);
-#if ACCAN_DEBUG
-static void printControlFlowList(ControlFlowItem*, ControlFlowItem* last = NULL);
-#endif
-
-//static ControlFlowGraph* GetControlFlowGraphWithCalls(bool, SgStatement*, CallData*, CommonData*);
-//static void FillCFGSets(ControlFlowGraph*);
-static void FillPrivates(ControlFlowGraph*);
-static ControlFlowItem* AddFunctionCalls(SgStatement*, CallData*, ControlFlowItem**, CommonData*);
-
-const char* is_correct = NULL;
-const char* failed_proc_name = NULL;
-static PrivateDelayedItem* privateDelayedList = NULL;
-static AnalysedCallsList* currentProcedure = NULL;
-static AnalysedCallsList* mainProcedure = NULL;
-static DoLoopDataList* doLoopList = NULL;
-static CommonData* pCommons;
-static CallData* pCalls;
-
-int total_privates = 0;
-int total_pl = 0;
-
-static const IntrinsicSubroutineData intrinsicData[] = {
-    {"date_and_time", 4, { {-1, "date", INTRINSIC_OUT}, {-1, "time", INTRINSIC_OUT }, {-1, "zone", INTRINSIC_OUT }, {-1, "values", INTRINSIC_OUT } } },
-    {"mod", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"dvtime", 0, {}},
-    {"abs", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"max", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"min", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"wtime", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"dble", 1, { {1, NULL, INTRINSIC_IN } } },
-    {"dabs", 1, { {1, NULL, INTRINSIC_IN } } },
-    {"dmax1", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN } } },
-    {"dmin1", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN } } },
-    {"dsqrt", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"dcos", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"datan2", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"dsign", 2, { {1, NULL, INTRINSIC_IN}, {2, NULL, INTRINSIC_IN} } },
-    {"dlog", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"dexp", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"omp_get_wtime", 0, {}},
-    {"sqrt", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"int", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"iabs", 1, { {1, NULL, INTRINSIC_IN} } },
-    {"fnpr", 4, { {1, NULL, INTRINSIC_IN},{ 2, NULL, INTRINSIC_IN },{ 3, NULL, INTRINSIC_IN },{ 4, NULL, INTRINSIC_IN } } },
-    {"isnan", 1, { {1, NULL, INTRINSIC_IN } } }
-};
-
-//TODO: it does not work
-//static map<SgStatement*, tuple<ControlFlowGraph*, CallData*, CommonData*>> CFG_cache;
-
-
-static bool isIntrinsicFunctionNameACC(char* name)
-{
-#if USE_INTRINSIC_DVM_LIST
-    return isIntrinsicFunctionName(name);
-#else
-    return false;
-#endif
-}
-
-int SwitchFile(int file_id)
-{
-    if (file_id == current_file_id || file_id == -1)
-        return file_id;
-    int stored_file_id = current_file_id;
-    current_file_id = file_id;
-    current_file = &(CurrentProject->file(current_file_id));
-    return stored_file_id;
-}
-
-SgStatement * lastStmtOfDoACC(SgStatement *stdo)
-{
-    // is a copied function
-    SgStatement *st;
-    // second version  (change 04.03.08) 
-    st = stdo;
-RE: st = st->lastNodeOfStmt();
-    if ((st->variant() == FOR_NODE) || (st->variant() == WHILE_NODE))
-        goto RE;
-
-    else if (st->variant() == LOGIF_NODE)
-        return(st->lexNext());
-
-    else
-        return(st);
-
-}
-
-#ifdef __SPF
-bool IsPureProcedureACC(SgSymbol* s)
-#else
-static bool IsPureProcedureACC(SgSymbol* s)
-#endif
-{
-    // is a copied function
-    SgSymbol *shedr = NULL;
-
-    shedr = GetProcedureHeaderSymbol(s);
-    if (shedr)
-        return(shedr->attributes() & PURE_BIT);
-    else
-        return 0;
-}
-
-static bool IsUserFunctionACC(SgSymbol* s)
-{
-    // is a copied function
-    return(s->attributes() & USER_PROCEDURE_BIT);
-}
-
-static const IntrinsicSubroutineData* IsAnIntrinsicSubroutine(const char* name)
-{
-    for (int i = 0; i < sizeof(intrinsicData) / sizeof(intrinsicData[0]); i++)
-        if (strcmp(name, intrinsicData[i].name) == 0)
-            return &(intrinsicData[i]);
-    return NULL;
-}
-
-static SgExpression* CheckIntrinsicParameterFlag(const char* name, int arg, SgExpression* p, unsigned char flag)
-{
-    const IntrinsicSubroutineData* info = IsAnIntrinsicSubroutine(name);
-    if (!info)
-        return NULL; //better avoid this
-    for (int i = 0; i < info->args; i++) 
-    {
-        const IntrinsicParameterData* pd = &(info->parameters[i]);
-        if (pd->index == arg + 1)
-            return (pd->status & flag) != 0 ? p : NULL;
-
-        SgKeywordArgExp* kw = isSgKeywordArgExp(p);
-        if (kw) 
-        {
-            SgExpression* a = kw->arg();
-            SgExpression* val = kw->value();
-            if (pd->name && strcmp(a->unparse(), pd->name) == 0)
-                return (pd->status & flag) != 0 ? val : NULL;
-        }
-    }
-    return NULL;
-}
-/*
-//For parameters replacements in expressions
-//#ifdef __SPF
-
-VarsKeeper varsKeeper;
-
-SgExpression* GetValueOfVar(SgExpression* var)
-{
-    return varsKeeper.GetValueOfVar(var);
-}
-
-void VarsKeeper::GatherVars(SgStatement* start)
-{
-    pCommons = &(data->commons);
-    pCalls = &(data->calls);
-    currentProcedure = data->calls.AddHeader(start, false, start->symbol());
-    mainProcedure = currentProcedure;
-    //stage 1: preparing graph data
-    data->graph = GetControlFlowGraphWithCalls(true, start, &(data->calls), &(data->commons));
-    data->calls.AssociateGraphWithHeader(start, data->graph);
-    data->commons.MarkEndOfCommon(currentProcedure);
-    //calls.printControlFlows();
-    //stage 2: data flow analysis
-    FillCFGSets(data->graph);
-    //stage 3: fulfilling loop data
-    FillPrivates(data->graph);
-
-    if (privateDelayedList)
-            delete privateDelayedList;
-        privateDelayedList = NULL;
-}
-
-SgExpression* VarsKeeper::GetValueOfVar(SgExpression* var)
-{
-    FuncData* curData = data;
-}
-
-//#endif
-*/
-
-
-
-void SetUpVars(CommonData* commons, CallData* calls, AnalysedCallsList* m, DoLoopDataList* list)
-{
-    pCommons = commons;
-    pCalls = calls;
-    currentProcedure = m;
-    mainProcedure = currentProcedure;
-    doLoopList = list;
-}
-
-AnalysedCallsList* GetCurrentProcedure()
-{
-    return currentProcedure;
-}
-//interprocedural analysis, called for main procedure
-void Private_Vars_Analyzer(SgStatement* start)
-{
-#ifndef __SPF 
-    if (!options.isOn(PRIVATE_ANALYSIS)) {
-        return;
-    }
-#endif
-    CallData calls;
-    CommonData commons;
-    DoLoopDataList doloopList;
-    SetUpVars(&commons, &calls, calls.AddHeader(start, false, start->symbol(), current_file_id), &doloopList);
-
-    //stage 1: preparing graph data
-    ControlFlowGraph* CGraph = GetControlFlowGraphWithCalls(true, start, &calls, &commons);
-    calls.AssociateGraphWithHeader(start, CGraph);
-    commons.MarkEndOfCommon(currentProcedure);
-        
-    currentProcedure->graph->getPrivate();
-#if ACCAN_DEBUG
-    calls.printControlFlows();
-#endif
-    //stage 2: data flow analysis
-    FillCFGSets(CGraph);
-    //stage 3: fulfilling loop data
-    FillPrivates(CGraph);
-
-    //test: graphvis
-    /*std::fstream fs;
-    fs.open("graph_old.txt", std::fstream::out);
-    fs << CGraph->GetVisualGraph(&calls);
-    fs.close();*/
-
-#if !__SPF
-    delete CGraph;
-#endif
-
-    if (privateDelayedList)
-        delete privateDelayedList;
-    privateDelayedList = NULL;
-}
-
-CallData::~CallData()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    /*
-    for (AnalysedCallsList* l = calls_list; l != NULL;) 
-    {
-        if (!l->isIntrinsic && l->graph)
-        {
-            if (l->graph->RemoveRef() && !l->graph->IsMain())
-            {
-                delete l->graph;
-                l->graph = NULL;
-            }
-        }
-        AnalysedCallsList *temp = l;
-        l = l->next;
-        delete temp;
-        temp = NULL;
-    }*/
-}
-
-CommonData::~CommonData()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    for (CommonDataItem* i = list; i != NULL;) {
-        for (CommonVarInfo* info = i->info; info != NULL;) {
-            CommonVarInfo* t = info;
-            info = info->next;
-            delete t;
-        }
-        CommonDataItem* tp = i;
-        i = i->next;
-        delete tp;
-    }
-}
-
-ControlFlowGraph::~ControlFlowGraph()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    while (common_def != NULL) 
-    {
-        CommonVarSet* t = common_def;
-        common_def = common_def->next;
-        delete t;
-    }
-    while (common_use != NULL) 
-    {
-        CommonVarSet* t = common_use;
-        common_use = common_use->next;
-        delete t;
-    }
-
-    if (def)
-        delete def;    
-
-    if (use)
-        delete use;   
-
-    if (!temp && pri)
-        delete pri;    
-
-    for (CBasicBlock *bb = first; bb != NULL;) 
-    {
-        CBasicBlock *tmp = bb;
-        bb = bb->getLexNext();
-            
-        delete tmp;
-        tmp = NULL;
-    }
-}
-
-CBasicBlock::~CBasicBlock()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif    
-
-    CommonVarSet* d = getCommonDef();
-    while (d != NULL) 
-    {
-        CommonVarSet* t = d;
-        d = d->next;
-        delete t;
-    }
-
-    d = getCommonUse();
-    while (d != NULL) 
-    {
-        CommonVarSet* t = d;
-        d = d->next;
-        delete t;
-    }
-
-    for (BasicBlockItem* bbi = prev; bbi != NULL;)
-    {
-        BasicBlockItem *tmp = bbi;
-        bbi = bbi->next;
-        delete tmp;
-        tmp = NULL;
-    }
-
-    for (BasicBlockItem *bbi = succ; bbi != NULL;)
-    {
-        BasicBlockItem *tmp = bbi;
-        bbi = bbi->next;
-        delete tmp;
-        tmp = NULL;
-    }
-
-    if (def)
-        delete def;    
-
-    if (use)
-        delete use;    
-
-    if (old_mrd_out)
-        delete old_mrd_out;
-    
-    if (old_mrd_in)
-        delete old_mrd_in;
-    
-    if (mrd_in)
-        delete mrd_in;
-    
-    if (mrd_out)
-        delete mrd_out;
-    
-    if (old_lv_out)
-        delete old_lv_out;
-    
-    if (old_lv_in)
-        delete old_lv_in;
-    
-    if (lv_in)
-        delete lv_in;
-    
-    if (lv_out)
-        delete lv_out;
-}
-
-doLoops::~doLoops()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    for (doLoopItem *it = first; it != NULL; ) 
-    {
-        doLoopItem *tmp = it;
-        it = it->getNext();
-        delete tmp;
-    }
-}
-
-PrivateDelayedItem::~PrivateDelayedItem()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    if (delay)
-        delete delay;
-    if (next)
-        delete next;    
-}
-
-VarSet::~VarSet()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-    for (VarItem* it = list; it != NULL;) 
-    {
-        VarItem* tmp = it;
-        it = it->next;
-        if (tmp->var)
-            if (tmp->var->RemoveReference())
-                delete tmp->var;
-        delete tmp;
-    }
-}
-
-CommonVarSet::CommonVarSet(const CommonVarSet& c)
-{    
-    cvd = c.cvd;
-    if (c.next)
-        next = new CommonVarSet(*c.next);
-    else
-        next = NULL;
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 22);
-#endif
-}
-
-std::string ControlFlowGraph::GetVisualGraph(CallData* calls)
-{
-    std::string result;
-    result += "digraph ";
-    char tmp[512];
-    AnalysedCallsList* cd = calls->GetDataForGraph(this);
-    //if (cd == NULL || cd->header == NULL)
-        sprintf(tmp, "g_%llx", (uintptr_t)this);
-    //else
-    //    sprintf(tmp, "g_%500s", cd->header->symbol());
-    result += tmp;
-    result += "{ \n";
-    for (CBasicBlock* b = this->first; b != NULL; b = b->getLexNext()) {
-        if (!b->IsEmptyBlock()) {
-            result += '\t' + b->GetGraphVisDescription() + "[shape=box,label=\"";
-            result += b->GetGraphVisData() + "\"];\n";
-        }
-    }
-    for (CBasicBlock* b = first; b != NULL; b = b->getLexNext()) {
-        if (!b->IsEmptyBlock())
-            result += b->GetEdgesForBlock(b->GetGraphVisDescription(), true, "");
-    }
-    result += '}';
-    ResetDrawnStatusForAllItems();
-    return result;
-}
-
-void ControlFlowGraph::ResetDrawnStatusForAllItems() {
-    for (CBasicBlock* b = first; b != NULL; b = b->getLexNext()) {
-        for (ControlFlowItem* it = b->getStart(); it != NULL && (it->isLeader() == false || it == b->getStart()); it = it->getNext()) {
-            it->ResetDrawnStatus();
-        }
-    }
-}
-
-std::string GetConditionWithLineNumber(ControlFlowItem* eit)
-{
-    std::string res;
-    if (eit->getOriginalStatement()) {
-        char tmp[16];
-        sprintf(tmp, "%d: ", eit->getOriginalStatement()->lineNumber());
-        res = tmp;
-    }
-    return res + eit->getExpression()->unparse();
-}
-
-std::string GetActualCondition(ControlFlowItem** pItem) {
-    std::string res = "";
-    ControlFlowItem* eit = *pItem;
-    while (true) 
-    {
-        if (eit == NULL || eit->getJump() != NULL || eit->getStatement() != NULL) 
-        {
-            if (eit && eit->getJump() != NULL) 
-            {
-                if (eit->getExpression() != NULL) 
-                {
-                    *pItem = eit;
-                    return GetConditionWithLineNumber(eit);
-                }
-                else 
-                {
-                    *pItem = NULL;
-                    return res;
-                }
-                break;
-            }
-            *pItem = NULL;
-            return res;
-        }
-        eit = eit->GetPrev();
-    }
-    return res;
-}
-
-std::string CBasicBlock::GetEdgesForBlock(std::string name, bool original, std::string modifier)
-{
-    std::string result;
-    for (BasicBlockItem* it = getSucc(); it != NULL; it = it->next) {
-        if (it->drawn)
-            continue;
-        it->drawn = true;
-        char lo = original;
-        std::string cond;
-        ControlFlowItem* eit = NULL;
-        bool pf = false;
-        if (it->jmp != NULL) {
-            if (it->jmp->getExpression() != NULL) {
-                eit = it->jmp;
-                cond = GetConditionWithLineNumber(eit);
-            }
-            else {
-                pf = true;
-                eit = it->jmp->GetPrev();
-                cond = GetActualCondition(&eit);
-            }
-        }
-        if (eit && eit->GetFriend()) {
-            lo = false;
-            eit = eit->GetFriend();
-        }
-        if (!it->block->IsEmptyBlock() || cond.length() != 0) {
-            if (cond.length() != 0 && eit && !pf){
-                char tmp[32];
-                sprintf(tmp, "c_%llx", (uintptr_t)eit);
-                if (!eit->IsDrawn()) {
-                    result += '\t';
-                    result += tmp;
-                    result += "[shape=diamond,label=\"";
-                    result += cond;
-                    result += "\"];\n";
-                }
-                if (it->cond_value && !pf) {
-                    result += '\t' + name + "->";
-                    result += tmp;
-                    result += modifier;
-                    result += '\n';
-                }
-                eit->SetIsDrawn();
-            }
-            if (cond.length() != 0) {
-                if (lo) {
-                    char tmp[32];
-                    sprintf(tmp, "c_%llx", (uintptr_t)eit);
-                    if (!it->block->IsEmptyBlock()) {
-                        result += '\t';
-                        result += tmp;
-                        result += "->" + it->block->GetGraphVisDescription();
-                        result += "[label=";
-                        result += (!pf && it->cond_value) ? "T]" : "F]";
-                        result += ";\n";
-                    }
-                    else {
-                        std::string n = tmp;
-                        std::string label;
-                        label += "[label=";
-                        label += (!pf && it->cond_value) ? "T]" : "F]";
-                        result += it->block->GetEdgesForBlock(n, original, label);
-                    }
-                }
-            }
-            else {
-                result += '\t' + name + " -> " + it->block->GetGraphVisDescription();
-                result += modifier;
-                result += ";\n";
-            }
-            
-        }
-        else {
-            result += it->block->GetEdgesForBlock(name, original, "");
-        }
-    }
-    return result;
-}
-
-std::string CBasicBlock::GetGraphVisDescription()
-{
-    if (visname.length() != 0)
-        return visname;
-    char tmp[16];
-    sprintf(tmp, "%d", num);
-    visname = tmp;
-    return visname;
-}
-
-std::string CBasicBlock::GetGraphVisData()
-{
-    if (visunparse.length() != 0)
-        return visunparse;
-    std::string result;
-    for (ControlFlowItem* it = start; it != NULL && (it->isLeader() == false || it == start); it = it->getNext()) {
-        if (it->getStatement() != NULL) {
-            int ln = it->GetLineNumber();
-            char tmp[16];
-            sprintf(tmp, "%d: ", ln);
-            result += tmp;
-            result += it->getStatement()->unparse();
-        }
-    }
-    visunparse = result;
-    return result;
-}
-
-int ControlFlowItem::GetLineNumber()
-{
-    if (getStatement() == NULL)
-        return 0;
-    if (getStatement()->lineNumber() == 0){
-        if (getOriginalStatement() == NULL)
-            return 0;
-        return getOriginalStatement()->lineNumber();
-    }
-    return getStatement()->lineNumber();
-}
-
-bool CBasicBlock::IsEmptyBlock()
-{
-    for (ControlFlowItem* it = start; it != NULL && (it->isLeader() == false || it == start); it = it->getNext()) {        
-        if (!it->IsEmptyCFI())
-            return false;
-    }
-    return true;
-}
-
-AnalysedCallsList* CallData::GetDataForGraph(ControlFlowGraph* s)
-{
-    for (AnalysedCallsList* it = calls_list; it != NULL; it = it->next) {
-        if (it->graph == s)
-            return it;
-    }
-    return NULL;
-}
-
-ControlFlowGraph* GetControlFlowGraphWithCalls(bool main, SgStatement* start, CallData* calls, CommonData* commons)
-{
-    if (start == NULL) 
-    {
-        //is_correct = "no body for call found";
-        return NULL;
-    }
-
-    ControlFlowGraph *cfgRet = NULL;
-    /*
-#if __SPF
-    auto itF = CFG_cache.find(start);
-    if (itF != CFG_cache.end())
-    {
-        calls = std::get<1>(itF->second);
-        commons = std::get<2>(itF->second);
-        return std::get<0>(itF->second);
-    }
-#endif*/
-    doLoops l;
-    ControlFlowItem *funcGraph = getControlFlowList(start, start->lastNodeOfStmt(), NULL, NULL, &l, calls, commons);
-    fillLabelJumps(funcGraph);
-    setLeaders(funcGraph);
-
-    
-    cfgRet = new ControlFlowGraph(false, main, funcGraph, NULL);
-    //CFG_cache[start] = std::make_tuple(cfgRet, calls, commons);
-    return cfgRet;
-}
-
-void FillCFGSets(ControlFlowGraph* graph)
-{
-    graph->privateAnalyzer();
-}
-
-static void ClearMemoryAfterDelay(ActualDelayedData* d)
-{
-    while (d != NULL) {
-        CommonVarSet* cd = d->commons;
-        while (cd != NULL) {
-            CommonVarSet* t = cd;
-            cd = cd->next;
-            delete t;
-        }
-        delete d->buse;
-        ActualDelayedData* tmp = d;
-        d = d->next;
-        delete tmp;
-    }
-}
-
-static void FillPrivates(ControlFlowGraph* graph)
-{
-    ActualDelayedData* d = graph->ProcessDelayedPrivates(pCommons, mainProcedure, NULL, NULL, false, -1);
-    ClearMemoryAfterDelay(d);
-    if (privateDelayedList)
-        privateDelayedList->PrintWarnings();
-}
-
-ActualDelayedData* CBasicBlock::GetDelayedDataForCall(CallAnalysisLog* log)
-{
-    for (ControlFlowItem* it = start; it != NULL && (!it->isLeader() || it == start); it = it->getNext())
-    {
-        AnalysedCallsList* c = it->getCall();
-        void* cf = it->getFunctionCall();
-        bool isFun = true;
-        if (!cf) {
-            cf = it->getStatement();
-            isFun = false;
-        }
-        if (c != NULL && c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c->graph != NULL)
-            return c->graph->ProcessDelayedPrivates(pCommons, c, log, cf, isFun, it->getProc()->file_id);
-    }
-    return NULL;
-}
-
-void PrivateDelayedItem::MoveFromPrivateToLastPrivate(CVarEntryInfo* var)
-{
-    VarItem* el = detected->belongs(var);
-    if (el) {
-        eVariableType storedType = el->var->GetVarType();
-        detected->remove(el->var);
-        lp->addToSet(var, NULL);
-    }
-}
-
-void ActualDelayedData::RemoveVarFromCommonList(CommonVarSet* c)
-{
-    if (commons == NULL || c == NULL)
-        return;
-    if (c == commons) 
-    {
-        commons = commons->next;
-        delete c;
-        return;
-    }
-    CommonVarSet* prev = c;
-    for (CommonVarSet* cur = c->next; cur != NULL; cur = cur->next) 
-    {
-        if (cur == c) 
-        {
-            prev->next = c->next;
-            delete c;
-            return;
-        }
-        else 
-            prev = cur;        
-    }
-}
-
-void ActualDelayedData::MoveVarFromPrivateToLastPrivate(CVarEntryInfo* var, CommonVarSet* c, VarSet* vs)
-{
-    original->MoveFromPrivateToLastPrivate(var);
-    RemoveVarFromCommonList(c);
-    if (vs) 
-    {
-        if (vs->belongs(var))
-            vs->remove(var);
-    }
-}
-
-int IsThisVariableAParameterOfSubroutine(AnalysedCallsList* lst, SgSymbol* s)
-{
-    if (!lst->header)
-        return -1;
-    int stored = SwitchFile(lst->file_id);
-    SgProcHedrStmt* h = isSgProcHedrStmt(lst->header);
-    if (!h)
-        return -1;
-    for (int i = 0; i < h->numberOfParameters(); i++) {
-        SgSymbol* par = h->parameter(i);
-        if (par == s) {
-            SwitchFile(stored);
-            return i;
-        }
-    }
-    SwitchFile(stored);
-    return -1;
-}
-
-ActualDelayedData* ControlFlowGraph::ProcessDelayedPrivates(CommonData* commons, AnalysedCallsList* call, CallAnalysisLog* log, void* c, bool isFun, int file_id)
-{
-    for (CallAnalysisLog* i = log; i != NULL; i = i->prev) {
-        if (i->el == call) 
-        {
-            //TODO: add name of common
-#if __SPF
-            const wchar_t* rus = R158;
-            Warning("Recursion is not analyzed for privates in common blocks '%s'", rus, "TODO!", PRIVATE_ANALYSIS_NO_RECURSION_ANALYSIS, call->header);
-#else
-            Warning("Recursion is not analyzed for privates in common blocks '%s'", "TODO!", PRIVATE_ANALYSIS_NO_RECURSION_ANALYSIS, call->header);
-#endif
-            return NULL;
-        }
-    }
-    CallAnalysisLog* nl = new CallAnalysisLog();
-    nl->el = call;
-    nl->prev = log;
-    if (log == NULL)
-        nl->depth = 0;
-    else
-        nl->depth = log->depth + 1;
-    log = nl;
-    ActualDelayedData* my = NULL;
-    for (CBasicBlock* bb = first; bb != NULL; bb = bb->getLexNext()) {
-        if (bb->containsParloopStart()) {
-            if (bb->GetDelayedData()) {
-                ActualDelayedData* data = new ActualDelayedData();
-                data->original = bb->GetDelayedData();
-                data->commons = commons->GetCommonsForVarSet(data->original->getDetected(), call);
-                VarSet* bu = new VarSet();
-                bu->unite(data->original->getDelayed(), false);
-                VarSet* tbu = new VarSet();
-                while (!bu->isEmpty()) {
-                    if (IS_BY_USE(bu->getFirst()->var->GetSymbol()))
-                        tbu->addToSet(bu->getFirst()->var, NULL);
-                    else {
-                        CVarEntryInfo* old = bu->getFirst()->var;
-                        int arg_id = IsThisVariableAParameterOfSubroutine(call, bu->getFirst()->var->GetSymbol());
-                        if (arg_id != -1 && c != NULL) {
-                            int stored = SwitchFile(file_id);
-                            SgExpression* exp = GetProcedureArgument(isFun, c, arg_id);
-                            if (isSgVarRefExp(exp) || isSgArrayRefExp(exp)) {
-                                SgSymbol* sym = exp->symbol();
-                                CVarEntryInfo* v;
-                                if (isSgVarRefExp(exp)) {
-                                    v = new CScalarVarEntryInfo(sym);
-                                }
-                                else {
-                                    v = old->Clone(sym);
-                                }
-                                tbu->addToSet(v, NULL, old);
-                            }
-                            SwitchFile(stored);
-                            
-                        }
-                    }
-                    bu->remove(bu->getFirst()->var);
-                }
-                data->buse = tbu;
-                delete bu;
-                data->next = my;
-                data->call = call;
-                my = data;
-            }
-        }
-        ActualDelayedData* calldata = bb->GetDelayedDataForCall(log);
-        while (calldata != NULL) {
-            CommonVarSet* nxt = NULL;
-            for (CommonVarSet* t = calldata->commons; t != NULL; t = nxt) {
-                nxt = t->next;
-                CommonVarInfo* cvd = t->cvd;
-                CommonDataItem* d = commons->IsThisCommonUsedInProcedure(cvd->parent, call);
-                if (!d || commons->CanHaveNonScalarVars(d))
-                    continue;
-                CommonVarInfo* j = cvd->parent->info;
-                CommonVarInfo* i = d->info;
-                while (j != cvd) {
-                    j = j->next;
-                    if (i)
-                        i = i->next;
-                }
-                if (!i)
-                    continue;
-                CVarEntryInfo* var = i->var;
-                if (bb->getLexNext()->getLiveIn()->belongs(var->GetSymbol()) && calldata->original->getDelayed()->belongs(cvd->var)) {
-                    calldata->MoveVarFromPrivateToLastPrivate(cvd->var, t, NULL);
-                }
-                if (bb->IsVarDefinedAfterThisBlock(var, false)) {
-                    calldata->RemoveVarFromCommonList(t);
-                }
-                
-            }
-            if (log->el->header == calldata->call->header) {
-                VarSet* pr = new VarSet();
-                pr->unite(calldata->original->getDelayed(), false);
-                pr->intersect(bb->getLexNext()->getLiveIn(), false, true);
-                for (VarItem* exp = pr->getFirst(); exp != NULL; pr->getFirst()) {
-                    calldata->MoveVarFromPrivateToLastPrivate(exp->var, NULL, NULL);
-                    pr->remove(exp->var);
-                }
-                delete pr;
-            }
-            VarSet* tmp_use = new VarSet();
-            tmp_use->unite(calldata->buse, false);
-            while (!tmp_use->isEmpty()) {
-                VarItem* v = tmp_use->getFirst();
-                CVarEntryInfo* tmp = v->var->Clone(OriginalSymbol(v->var->GetSymbol()));
-                if (bb->getLexNext()->getLiveIn()->belongs(tmp->GetSymbol(), true)) {
-                    calldata->MoveVarFromPrivateToLastPrivate(v->ov ? v->ov : v->var, NULL, calldata->buse);
-                }
-                if (bb->IsVarDefinedAfterThisBlock(v->var, true)) {
-                    calldata->buse->remove(v->ov ? v->ov : v->var);
-                }
-                delete tmp;
-                tmp_use->remove(v->var);
-            }
-            delete tmp_use;
-            ActualDelayedData* tmp = calldata->next;
-            calldata->next = my;
-            my = calldata;
-            calldata = tmp;
-        }
-    }
-    nl = log;
-    log = log->prev;
-
-    delete nl;
-    return my;
-}
-
-extern graph_node* node_list;
-void Private_Vars_Function_Analyzer(SgStatement* start);
-
-void Private_Vars_Project_Analyzer()
-{
-    graph_node* node = node_list;
-    while (node) {
-        if (node->st_header) {
-            int stored_file_id = SwitchFile(node->file_id);
-            Private_Vars_Function_Analyzer(node->st_header);
-            SwitchFile(stored_file_id);
-        }
-        node = node->next;
-    }
-}
-
-// CALL function for PRIVATE analyzing
-void Private_Vars_Function_Analyzer(SgStatement* start)
-{
-    //temporary state
-#ifndef __SPF 
-    if (!options.isOn(PRIVATE_ANALYSIS)){
-        return;
-    }
-#endif
-
-    if (start->variant() == PROG_HEDR) {
-        Private_Vars_Analyzer(start);
-    }
-    /*
-    ControlFlowItem* funcGraph = getControlFlowList(start, start->lastNodeOfStmt(), NULL, NULL, new doLoops());
-    fillLabelJumps(funcGraph);
-    setLeaders(funcGraph);
-#if ACCAN_DEBUG
-    printControlFlowList(funcGraph);
-#endif
-    ControlFlowItem* p = funcGraph;
-    ControlFlowItem* pl_start = NULL;
-    ControlFlowItem* pl_end = NULL;
-    ControlFlowGraph* graph = new ControlFlowGraph(funcGraph, NULL);
-    graph->privateAnalyzer();
-    */
-}
-/*
-// CALL function for PRIVATE analyzing
-void Private_Vars_Analyzer(SgStatement *firstSt, SgStatement *lastSt)
-{
-    // temporary state
-    //return;
-    SgExpression* par_des = firstSt->expr(2);
-    SgSymbol* l;
-    SgForStmt* chk;
-    int correct = 1;
-    firstSt = firstSt->lexNext();
-    while (correct && (par_des != NULL) && (par_des->lhs() != NULL) && ((l = par_des->lhs()->symbol()) != NULL)){
-        if (firstSt->variant() == FOR_NODE){
-            chk = isSgForStmt(firstSt);
-            if (chk->symbol() != l)
-                correct = 0;
-            firstSt = firstSt->lexNext();
-            par_des = par_des->rhs();
-        }
-        else{
-            correct = 0;
-        }
-    }
-    if (correct){
-        doLoops* loops = new doLoops();
-        ControlFlowItem* cfList = getControlFlowList(firstSt, lastSt, NULL, NULL, loops);
-        fillLabelJumps(cfList);
-        setLeaders(cfList);
-#if ACCAN_DEBUG
-        printControlFlowList(cfList);
-#endif
-        VarSet* priv = ControlFlowGraph(cfList, NULL).getPrivate();
-#if ACCAN_DEBUG
-        priv->print();
-#endif
-        clearList(cfList);
-    }
-}
-*/
-
-static void fillLabelJumps(ControlFlowItem* cfList)
-{
-    if (cfList != NULL){
-        ControlFlowItem* temp = cfList;
-        ControlFlowItem* temp2;
-        unsigned int label_no = 0;
-        while (temp != NULL){
-            if (temp->getLabel() != NULL)
-                label_no++;
-            temp = temp->getNext();
-        }
-        LabelCFI* table = new LabelCFI[label_no + 1];
-        unsigned int li = 0;
-        for (temp = cfList; temp != NULL; temp = temp->getNext()){
-            SgLabel* label;
-            if ((label = temp->getLabel()) != NULL){
-                table[li].item = temp;
-                table[li++].l = label->id();
-            }
-            temp2 = temp;
-        }
-        temp = new ControlFlowItem(currentProcedure);
-        temp2->AddNextItem(temp);
-        table[label_no].item = temp2;
-        table[label_no].l = -1;
-        for (temp = cfList; temp != NULL; temp = temp->getNext()){
-            SgLabel* jump = temp->getLabelJump();
-            int l;
-            if (jump != NULL){
-                l = jump->id();
-                for (unsigned int i = 0; i < label_no + 1; i++){
-                    if (table[i].l == l || i == label_no){
-                        temp->initJump(table[i].item);
-                        break;
-                    }
-                }
-            }
-        }
-        delete[] table;
-    }
-}
-
-static void setLeaders(ControlFlowItem* cfList)
-{
-    if (cfList != NULL)
-        cfList->setLeader();
-    while (cfList != NULL)
-    {
-        if (cfList->getJump() != NULL)
-        {
-            cfList->getJump()->setLeader();
-            if (cfList->getNext() != NULL)
-                cfList->getNext()->setLeader();
-        }
-        if (cfList->getCall() != NULL)
-        {
-            if (cfList->getNext() != NULL)
-                cfList->getNext()->setLeader();
-        }
-        cfList = cfList->getNext();
-    }
-}
-
-static void clearList(ControlFlowItem *list)
-{
-    if (list != NULL)
-    {
-        if (list->getNext() != NULL)
-            clearList(list->getNext());
-
-        delete list;
-    }
-}
-
-static ControlFlowItem* ifItem(SgStatement* stmt, ControlFlowItem* empty, SgStatement** lastAnStmt, doLoops* loops, bool ins, CallData* calls, CommonData* commons)
-{
-    if (stmt == NULL)
-        return empty;
-    SgIfStmt* cond;
-    if (stmt->variant() == ELSEIF_NODE)
-        cond = (SgIfStmt*)stmt;
-    if (stmt->variant() == ELSEIF_NODE || (!ins && (cond = isSgIfStmt(stmt)) != NULL))
-    {
-        SgExpression* c = &(SgNotOp((cond->conditional()->copy())));
-        ControlFlowItem *n, *j;
-        ControlFlowItem* last;
-        if ((n = getControlFlowList(cond->trueBody(), NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
-            return NULL;
-        j = ifItem(cond->falseBody(), empty, lastAnStmt, loops, cond->falseBody() != NULL ? cond->falseBody()->variant() == IF_NODE : false, calls, commons);
-        ControlFlowItem* gotoEmpty = new ControlFlowItem(NULL, empty, j, NULL, currentProcedure);
-        if (last != NULL)
-            last->AddNextItem(gotoEmpty);
-        else
-            n = gotoEmpty;
-        ControlFlowItem* tn = new ControlFlowItem(c, j, n, stmt->label(), currentProcedure);
-        tn->setOriginalStatement(stmt);
-        return tn;
-    }
-    else
-    {
-        ControlFlowItem* last;
-        ControlFlowItem* ret;
-        if ((ret = getControlFlowList(stmt, NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
-            return NULL;
-        last->AddNextItem(empty);
-        return ret;
-    }
-}
-
-static ControlFlowItem* switchItem(SgStatement* stmt, ControlFlowItem* empty, SgStatement** lastAnStmt, doLoops* loops, CallData* calls, CommonData* commons)
-{
-    SgSwitchStmt* sw = isSgSwitchStmt(stmt);
-    SgExpression* sw_cond = (sw->selector());
-    stmt = stmt->lexNext();
-    *lastAnStmt = stmt;
-    ControlFlowItem* last_sw = NULL;
-    ControlFlowItem* first = NULL;
-    bool is_def_last = false;
-    SgStatement* not_def_last;
-    while (stmt->variant() == CASE_NODE || stmt->variant() == DEFAULT_NODE)
-    {
-        if (stmt->variant() == DEFAULT_NODE){
-            while (stmt->variant() != CONTROL_END && stmt->variant() != CASE_NODE)
-                stmt = stmt->lexNext();
-            if (stmt->variant() == CONTROL_END)
-                stmt = stmt->lexNext();
-            is_def_last = true;
-            continue;
-        }
-        SgExpression* c = ((SgCaseOptionStmt*)stmt)->caseRange(0);
-        SgExpression *lhs = NULL;
-        SgExpression *rhs = NULL;
-        if (c->variant() == DDOT){
-            lhs = c->lhs();
-            rhs = c->rhs();
-            if (rhs == NULL)
-                c = &(*lhs <= *sw_cond);
-            else if (lhs == NULL)
-                c = &(*sw_cond <= *rhs);
-            else
-                c = &(*lhs <= *sw_cond && *sw_cond <= *rhs);
-        }
-        else
-            c = &SgNeqOp(*sw_cond, *c);
-        ControlFlowItem *n, *j;
-        ControlFlowItem* last;
-        if ((n = getControlFlowList(stmt->lexNext(), NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
-            return NULL;
-        j = new ControlFlowItem(currentProcedure);
-        ControlFlowItem* gotoEmpty = new ControlFlowItem(NULL, empty, j, NULL, currentProcedure);
-        if (last != NULL)
-            last->AddNextItem(gotoEmpty);
-        else
-            n = gotoEmpty;
-        ControlFlowItem* cond = new ControlFlowItem(c, j, n, stmt->label(), currentProcedure);
-        cond->setOriginalStatement(stmt);
-        if (last_sw == NULL)
-            first = cond;
-        else
-            last_sw->AddNextItem(cond);
-        last_sw = j;
-        is_def_last = false;
-        not_def_last = *lastAnStmt;
-        stmt = *lastAnStmt;
-    }
-    SgStatement* def = sw->defOption();
-    if (def != NULL){
-        ControlFlowItem* last;
-        ControlFlowItem* n;
-        if ((n = getControlFlowList(def->lexNext(), NULL, &last, lastAnStmt, loops, calls, commons)) == NULL)
-            return NULL;
-        if (last != NULL)
-            last->AddNextItem(empty);
-        if (last_sw == NULL)
-            first = n;
-        else
-            last_sw->AddNextItem(n);
-        last_sw = last;
-    }
-    last_sw->AddNextItem(empty);
-    if (!is_def_last)
-        *lastAnStmt = not_def_last;
-    return first;
-}
-
-static ControlFlowItem* getControlFlowList(SgStatement *firstSt, SgStatement *lastSt, ControlFlowItem **last, SgStatement **lastAnStmt, doLoops* loops, CallData* calls, CommonData* commons)
-{
-    ControlFlowItem *list = new ControlFlowItem(currentProcedure);
-    ControlFlowItem *cur = list;
-    ControlFlowItem *pred = list;
-    SgStatement *stmt;
-    for (stmt = firstSt; (
-        stmt != lastSt
-        && stmt->variant() != CONTAINS_STMT
-        && (lastSt != NULL || stmt->variant() != ELSEIF_NODE)
-        && (lastSt != NULL || stmt->variant() != CASE_NODE)
-        && (lastSt != NULL || stmt->variant() != DEFAULT_NODE));
-        stmt = stmt->lexNext())
-    {
-        if (stmt->variant() == CONTROL_END)
-        {
-            if (isSgExecutableStatement(stmt))
-                break;
-        }
-
-        cur = processOneStatement(&stmt, &pred, &list, cur, loops, calls, commons);
-        if (cur == NULL)
-        {
-            clearList(list);
-            return NULL;
-        }
-    }
-    if (cur == NULL){
-        cur = list = new ControlFlowItem(currentProcedure);
-    }
-    if (last != NULL)
-        *last = cur;
-    if (lastAnStmt != NULL)
-        *lastAnStmt = stmt;
-    return list;
-}
-
-AnalysedCallsList* CallData::IsHeaderInList(SgStatement* header)
-{
-    if (header == NULL)
-        return NULL;
-    AnalysedCallsList* p = calls_list;
-    while (p != NULL) {
-        if (p->header == header)
-            return p;
-        p = p->next;
-    }
-    return NULL;
-}
-
-void CallData::AssociateGraphWithHeader(SgStatement* st, ControlFlowGraph* gr)
-{
-    AnalysedCallsList* l = calls_list;
-    while (l != NULL) {
-        if (l->header == st) {
-            if (gr == l->graph && gr != NULL)
-                gr->AddRef();
-            l->graph = gr;
-            return;
-        }
-        l = l->next;
-    }
-    delete gr;
-}
-
-AnalysedCallsList* CallData::AddHeader(SgStatement* st, bool isFun, SgSymbol* name, int fid)
-{
-    //test
-    bool add_intr = IsAnIntrinsicSubroutine(name->identifier()) != NULL;
-    AnalysedCallsList* l = new AnalysedCallsList(st, (isIntrinsicFunctionNameACC(name->identifier()) || add_intr) && !IsUserFunctionACC(name), IsPureProcedureACC(name), isFun, name->identifier(), fid);
-    l->next = calls_list;
-    calls_list = l;
-    return l;
-}
-
-extern int isStatementFunction(SgSymbol *s);
-
-AnalysedCallsList* CallData::getLinkToCall(SgExpression* e, SgStatement* s, CommonData* commons)
-{
-    SgStatement* header = NULL;
-    SgSymbol* name;
-    bool isFun;
-    graph_node* g = NULL;
-    if (e == NULL) {
-        //s - procedure call
-        SgCallStmt* f = isSgCallStmt(s);
-        SgSymbol* fdaf = f->name();
-        if (ATTR_NODE(f->name()) != NULL)
-            g = GRAPHNODE(f->name());
-        if (g == NULL) {
-            
-            is_correct = "no header for procedure";
-            failed_proc_name = f->name()->identifier();
-            return (AnalysedCallsList*)(-1);
-            
-        }
-        if (g)
-            header = isSgProcHedrStmt(g->st_header);
-        name = f->name();
-        isFun = false;
-        //intr = isIntrinsicFunctionNameACC(f->name()->identifier()) && !IsUserFunctionACC(f->name());
-        //IsPureProcedureACC(f->name());
-    }
-    else {
-        //e - function call
-        SgFunctionCallExp* f = isSgFunctionCallExp(e);
-        if (isStatementFunction(f->funName()))
-            return (AnalysedCallsList*)(-2);
-        if (ATTR_NODE(f->funName()) != NULL)
-            g = GRAPHNODE(f->funName());
-        if (g == NULL) {
-            is_correct = "no header for function";
-            failed_proc_name = f->funName()->identifier();
-            return (AnalysedCallsList*)(-1);
-        }
-        header = isSgFuncHedrStmt(g->st_header);
-        name = f->funName();
-        isFun = true;
-    }
-    AnalysedCallsList* p;
-    if ((p = IsHeaderInList(header))) {
-        recursion_flag = recursion_flag || p->graph != NULL;
-        return p;
-    }
-    AnalysedCallsList* prev = currentProcedure;
-    currentProcedure = p = AddHeader(header, isFun, name, g->file_id);
-    if (!p->isIntrinsic) {
-        int stored = SwitchFile(g->file_id);
-        
-        ControlFlowGraph* graph = GetControlFlowGraphWithCalls(false, header, this, commons);
-        //if (graph == NULL)
-            //failed_proc_name = name->identifier();
-        
-        SwitchFile(stored);
-        
-        AssociateGraphWithHeader(header, graph);
-        commons->MarkEndOfCommon(p);
-    }
-    currentProcedure = prev;
-    return p;
-}
-
-static ControlFlowItem* GetFuncCallsForExpr(SgExpression* e, CallData* calls, ControlFlowItem** last, CommonData* commons, SgStatement* os)
-{
-    if (e == NULL) {
-        *last = NULL;
-        return NULL;
-    }
-    SgFunctionCallExp* f = isSgFunctionCallExp(e);
-    if (f) {
-        ControlFlowItem* head = new ControlFlowItem(NULL, NULL, currentProcedure, calls->getLinkToCall(e, NULL, commons));
-        head->setOriginalStatement(os);
-        ControlFlowItem* curl = head;
-        head->setFunctionCall(f);
-        ControlFlowItem* l1, *l2;
-        ControlFlowItem* tail1 = GetFuncCallsForExpr(e->lhs(), calls, &l1, commons, os);
-        ControlFlowItem* tail2 = GetFuncCallsForExpr(e->rhs(), calls, &l2, commons, os);
-        *last = head;
-        if (tail2 != NULL) {
-            l2->AddNextItem(head);
-            head = tail2;
-        }
-        if (tail1 != NULL) {
-            l1->AddNextItem(head);
-            head = tail1;
-        }
-
-        return head;
-    }
-    f = isSgFunctionCallExp(e->lhs());
-    if (f) {
-        ControlFlowItem* head = new ControlFlowItem(NULL, NULL, currentProcedure, calls->getLinkToCall(e->lhs(), NULL, commons));
-        head->setOriginalStatement(os);
-        head->setFunctionCall(f);
-        ControlFlowItem* l1, *l2, *l3;
-        ControlFlowItem* tail1 = GetFuncCallsForExpr(e->lhs()->lhs(), calls, &l1, commons, os);
-        ControlFlowItem* tail2 = GetFuncCallsForExpr(e->lhs()->rhs(), calls, &l2, commons, os);
-        ControlFlowItem* tail3 = GetFuncCallsForExpr(e->rhs(), calls, &l3, commons, os);
-        *last = head;
-        if (tail2 != NULL) {
-            l2->AddNextItem(head);
-            head = tail2;
-        }
-        if (tail1 != NULL) {
-            l1->AddNextItem(head);
-            head = tail1;
-        }
-        if (tail3 != NULL) {
-            (*last)->AddNextItem(tail3);
-            *last = l3;
-        }
-        return head;
-    }
-    return GetFuncCallsForExpr(e->rhs(), calls, last, commons, os);
-}
-
-static ControlFlowItem* AddFunctionCalls(SgStatement* st, CallData* calls, ControlFlowItem** last, CommonData* commons)
-{
-    ControlFlowItem* retv = GetFuncCallsForExpr(st->expr(0), calls, last, commons, st);
-    ControlFlowItem* l2 = NULL;
-    ControlFlowItem* second = GetFuncCallsForExpr(st->expr(1), calls, &l2, commons, st);
-    if (retv == NULL) {
-        retv = second;
-        *last = l2;
-    }
-    else if (second != NULL) {
-        (*last)->AddNextItem(second);
-        *last = l2;
-    }
-    ControlFlowItem* l3 = NULL;
-    ControlFlowItem* third = GetFuncCallsForExpr(st->expr(2), calls, &l3, commons, st);
-    if (retv == NULL) {
-        retv = third;
-        *last = l3;
-    }
-    else if (third != NULL) {
-        (*last)->AddNextItem(third);
-        *last = l3;
-    }
-    return retv;
-}
-
-void DoLoopDataList::AddLoop(int file_id, SgStatement* st, SgExpression* l, SgExpression* r, SgExpression* step, SgSymbol* lv)
-{
-    DoLoopDataItem* nt = new DoLoopDataItem();
-    nt->file_id = file_id;
-    nt->statement = st;
-    nt->l = l;
-    nt->r = r;
-    nt->st = step;
-    nt->loop_var = lv;
-    nt->next = list;
-    list = nt;
-}
-
-DoLoopDataList::~DoLoopDataList()
-{
-#if __SPF
-    removeFromCollection(this);
-    return;
-#endif
-    while (list != NULL) {
-        DoLoopDataItem* t = list->next;
-        delete list;
-        list = t;
-    }
-}
-
-static ControlFlowItem* processOneStatement(SgStatement** stmt, ControlFlowItem** pred, ControlFlowItem **list, ControlFlowItem* oldcur, doLoops* loops, CallData* calls, CommonData* commons)
-{
-    ControlFlowItem* lastf;
-    ControlFlowItem* funcs = AddFunctionCalls(*stmt, calls, &lastf, commons);
-    if (funcs != NULL) {
-        if (*pred != NULL)
-            (*pred)->AddNextItem(funcs);
-        else
-            *list = funcs;
-        *pred = lastf;
-    }
-
-    switch ((*stmt)->variant())
-    {
-        case IF_NODE:
-        {
-            ControlFlowItem* emptyAfterIf = new ControlFlowItem(currentProcedure); //empty item to avoid second pass
-            /*
-            if ((*stmt)->hasLabel()){
-                ControlFlowItem* emptyBeforeIf = new ControlFlowItem();
-                emptyBeforeIf->setLabel((*stmt)->label());
-                if (*pred != NULL)
-                    (*pred)->AddNextItem(emptyBeforeIf);
-                else
-                    *list = emptyBeforeIf;
-                *pred = emptyBeforeIf;
-            }
-            */
-            ControlFlowItem* cur = ifItem(*stmt, emptyAfterIf, stmt, loops, false, calls, commons);
-            emptyAfterIf->setLabel((*stmt)->label());
-            if (*pred != NULL)
-                (*pred)->AddNextItem(cur);
-            else
-                *list = cur;
-            return (*pred = emptyAfterIf);
-        }
-        case ASSIGN_STAT:
-        case POINTER_ASSIGN_STAT:
-        case PROC_STAT:
-        case PRINT_STAT:
-        case READ_STAT:
-        case WRITE_STAT:
-        case ALLOCATE_STMT:
-        case DEALLOCATE_STMT:
-        {
-            ControlFlowItem* cur = new ControlFlowItem(*stmt, NULL, currentProcedure, (*stmt)->variant() == PROC_STAT ? calls->getLinkToCall(NULL, *stmt, commons) : NULL);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(cur);
-            else
-                *list = cur;
-            return (*pred = loops->checkStatementForLoopEnding(cur->getLabel() ? cur->getLabel()->id() : -1, cur));
-        }
-        case LOGIF_NODE:
-        {
-            ControlFlowItem* emptyAfterIf = new ControlFlowItem(currentProcedure); //empty item to avoid second pass
-            SgLogIfStmt* cond = isSgLogIfStmt(*stmt);
-            SgLabel* lbl = (*stmt)->label();
-            SgExpression* c = &(SgNotOp((cond->conditional()->copy())));
-            ControlFlowItem* cur = new ControlFlowItem(c, emptyAfterIf, NULL, (*stmt)->label(), currentProcedure);
-            cur->setOriginalStatement(*stmt);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(cur);
-            else
-                *list = cur;
-            *stmt = (*stmt)->lexNext();
-            ControlFlowItem* body;
-            if ((body = processOneStatement(stmt, &cur, list, cur, loops, calls, commons)) == NULL){
-                return NULL;
-            }
-            body->AddNextItem(emptyAfterIf);
-            return (*pred = loops->checkStatementForLoopEnding(lbl ? lbl->id() : -1, emptyAfterIf));
-        }
-        case WHILE_NODE:
-        {
-            SgWhileStmt* cond = isSgWhileStmt(*stmt);
-            bool isEndDo = (*stmt)->lastNodeOfStmt()->variant() == CONTROL_END;
-            SgExpression* c;
-            if (cond->conditional())
-                c = &(SgNotOp((cond->conditional()->copy())));
-            else
-                c = new SgValueExp(1);
-            ControlFlowItem* emptyAfterWhile = new ControlFlowItem(currentProcedure);
-            ControlFlowItem* emptyBeforeBody = new ControlFlowItem(currentProcedure);
-            ControlFlowItem* cur = new ControlFlowItem(c, emptyAfterWhile, emptyBeforeBody, (*stmt)->label(), currentProcedure);
-            cur->setOriginalStatement(cond);
-            ControlFlowItem* gotoStart = new ControlFlowItem(NULL, cur, emptyAfterWhile, NULL, currentProcedure);
-            ControlFlowItem* emptyBefore = new ControlFlowItem(NULL, (ControlFlowItem*)NULL, cur, cond->label(), currentProcedure);
-            SgVarRefExp* doName = (isSgVarRefExp((*stmt)->expr(2)));
-            int lbl = -1;
-            if (!isEndDo){
-                SgStatement* end = lastStmtOfDoACC(cond);
-                if (end->controlParent() && end->controlParent()->variant() == LOGIF_NODE)
-                    lbl = end->controlParent()->label()->id();
-                else
-                    lbl = end->label()->id();
-            }
-            loops->addLoop(lbl, doName ? doName->symbol() : NULL, gotoStart, emptyAfterWhile);
-            ControlFlowItem* n, *last;
-            if (isEndDo){
-                if ((n = getControlFlowList((*stmt)->lexNext(), NULL, &last, stmt, loops, calls, commons)) == NULL)
-                    return NULL;
-                emptyBeforeBody->AddNextItem(n);
-                loops->endLoop(last);
-            }
-            if (*pred != NULL)
-                (*pred)->AddNextItem(emptyBefore);
-            else
-                *list = emptyBefore;
-            if (isEndDo)
-                return (*pred = emptyAfterWhile);
-            return (*pred = emptyBeforeBody);
-        }
-        case FOR_NODE:
-        {
-            SgForStmt* fst = isSgForStmt(*stmt);
-#if __SPF
-            SgStatement *p = NULL;
-            for (int i = 0; i < fst->numberOfAttributes(); ++i)
-            {
-                if (fst->attributeType(i) == SPF_ANALYSIS_DIR)
-                {
-                    p = (SgStatement *)(fst->getAttribute(i)->getAttributeData());
-                    break;
-                }
-            }
-            bool isParLoop = (p && p->variant() == SPF_ANALYSIS_DIR);
-#else
-            SgStatement* p = (*stmt)->lexPrev();
-            bool isParLoop = (p && p->variant() == DVM_PARALLEL_ON_DIR);
-#endif
-            SgExpression* pl = NULL;
-            SgExpression* pPl = NULL;
-            bool pl_flag = true;
-            if (isParLoop){
-#if __SPF
-                SgExpression* el = p->expr(0);
-#else
-                SgExpression* el = p->expr(1);
-#endif
-                pPl = el;
-                while (el != NULL) {
-                    SgExpression* e = el->lhs();
-                    if (e->variant() == ACC_PRIVATE_OP) {
-                        pl = e;
-                        break;
-                    }
-                    pPl = el;
-                    pl_flag = false;
-                    el = el->rhs();
-                }
-                //pl->unparsestdout();
-            }
-            bool isEndDo = fst->isEnddoLoop();
-            SgExpression* lh = new SgVarRefExp(fst->symbol());
-            SgStatement* fa = new SgAssignStmt(*lh, *fst->start());
-            bool needs_goto = true;
-#if !__SPF
-            // create goto edge if can not calculate count of loop's iterations
-            if (fst->start()->variant() == INT_VAL && fst->end()->variant() == INT_VAL && fst->start()->valueInteger() < fst->end()->valueInteger())
-                needs_goto = false;
-#endif
-            //fa->setLabel(*(*stmt)->label());
-            ControlFlowItem* last;
-            ControlFlowItem* emptyAfterDo = new ControlFlowItem(currentProcedure);
-            ControlFlowItem* emptyBeforeDo = new ControlFlowItem(currentProcedure);
-            ControlFlowItem* gotoEndInitial = NULL;
-            if (needs_goto) {
-                SgExpression* sendc = new SgExpression(GT_OP, new SgVarRefExp(fst->symbol()), fst->end(), NULL);
-                gotoEndInitial = new ControlFlowItem(sendc, emptyAfterDo, emptyBeforeDo, NULL, currentProcedure, true);
-                gotoEndInitial->setOriginalStatement(fst);
-            }
-            ControlFlowItem* stcf = new ControlFlowItem(fa, needs_goto ? gotoEndInitial : emptyBeforeDo, currentProcedure);
-            stcf->setOriginalStatement(fst);
-            stcf->setLabel((*stmt)->label());
-            SgExpression* rh = new SgExpression(ADD_OP, new SgVarRefExp(fst->symbol()), new SgValueExp(1), NULL);
-            SgStatement* add = new SgAssignStmt(*lh, *rh);
-            SgExpression* endc = new SgExpression(GT_OP, new SgVarRefExp(fst->symbol()), fst->end(), NULL);
-            ControlFlowItem* gotoStart = new ControlFlowItem(NULL, emptyBeforeDo, emptyAfterDo, NULL, currentProcedure);
-            ControlFlowItem* gotoEnd = new ControlFlowItem(endc, emptyAfterDo, gotoStart, NULL, currentProcedure);
-            gotoEnd->setOriginalStatement(fst);
-            if (needs_goto) {
-                gotoEnd->SetConditionFriend(gotoEndInitial);
-            }
-            ControlFlowItem* loop_d = new ControlFlowItem(add, gotoEnd, currentProcedure);
-            loop_d->setOriginalStatement(fst);
-            ControlFlowItem* loop_emp = new ControlFlowItem(NULL, loop_d, currentProcedure);
-            SgVarRefExp* doName = (isSgVarRefExp((*stmt)->expr(2)));
-            int lbl = -1;
-            if (!isEndDo){
-                SgStatement* end = lastStmtOfDoACC(fst);
-                if (end->variant() == LOGIF_NODE)
-                    lbl = end->controlParent()->label()->id();
-                else
-                    lbl = end->label()->id();
-            }
-            loops->addLoop(lbl, doName ? doName->symbol() : NULL, loop_emp, emptyAfterDo);
-            doLoopList->AddLoop(current_file_id, *stmt, fst->start(), fst->end(), fst->step(), fst->symbol());
-            if (isParLoop) {
-#if __SPF
-                // all loop has depth == 1 ? is it correct?
-                int k = 1;
-#else
-                SgExpression* par_des = p->expr(2);
-                int k = 0;
-                while (par_des != NULL && par_des->lhs() != NULL) {
-                    k++;
-                    par_des = par_des->rhs();
-                }
-#endif
-                loops->setParallelDepth(k, pl, p, pPl, pl_flag);
-            }
-
-            if (loops->isLastParallel()) {
-                SgExpression* ex = loops->getPrivateList();
-                emptyBeforeDo->MakeParloopStart();
-                bool f;
-                SgExpression* e = loops->getExpressionToModifyPrivateList(&f);
-                emptyBeforeDo->setPrivateList(ex, loops->GetParallelStatement(), e, f);
-                loop_d->MakeParloopEnd();
-            }
-            if (isEndDo){
-                ControlFlowItem* body;
-                if ((body = getControlFlowList(fst->body(), NULL, &last, stmt, loops, calls, commons)) == NULL)
-                    return NULL;
-                emptyBeforeDo->AddNextItem(body);
-                loops->endLoop(last);
-            }
-            if (*pred != NULL)
-                (*pred)->AddNextItem(stcf);
-            else
-                *list = stcf;
-            if (isEndDo)
-                return (*pred = emptyAfterDo);
-            return (*pred = emptyBeforeDo);
-        }
-        case GOTO_NODE:
-        {
-            SgGotoStmt* gst = isSgGotoStmt(*stmt);
-            ControlFlowItem* gt = new ControlFlowItem(NULL, gst->branchLabel(), NULL, gst->label(), currentProcedure);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(gt);
-            else
-                *list = gt;
-            return (*pred = gt);
-        }
-        case ARITHIF_NODE:
-        {
-            SgArithIfStmt* arif = (SgArithIfStmt*)(*stmt);
-            ControlFlowItem* gt3 = new ControlFlowItem(NULL, ((SgLabelRefExp*)(*stmt)->expr(1)->rhs()->rhs()->lhs())->label(), NULL, NULL, currentProcedure);
-            ControlFlowItem* gt2 = new ControlFlowItem(&SgEqOp(*(arif->conditional()), *new SgValueExp(0)), ((SgLabelRefExp*)(*stmt)->expr(1)->rhs()->lhs())->label(), gt3, NULL, currentProcedure);
-            gt2->setOriginalStatement(arif);
-            ControlFlowItem* gt1 = new ControlFlowItem(&(*arif->conditional() < *new SgValueExp(0)), ((SgLabelRefExp*)(*stmt)->expr(1)->lhs())->label(), gt2, (*stmt)->label(), currentProcedure);
-            gt1->setOriginalStatement(arif);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(gt1);
-            else
-                *list = gt1;
-            return (*pred = gt3);
-        }
-        case COMGOTO_NODE:
-        {
-            SgComputedGotoStmt* cgt = (SgComputedGotoStmt*)(*stmt);
-            SgExpression* label = cgt->labelList();
-            int i = 0;
-            SgLabel* lbl = ((SgLabelRefExp *)(label->lhs()))->label();
-            ControlFlowItem* gt = new ControlFlowItem(&SgEqOp(*(cgt->exp()), *new SgValueExp(++i)), lbl, NULL, cgt->label(), currentProcedure);
-            gt->setOriginalStatement(cgt);
-            if (*pred != NULL)
-                (*pred)->AddNextItem(gt);
-            else
-                *list = gt;
-            ControlFlowItem* old = gt;
-            while ((label = label->rhs()))
-            {
-                lbl = ((SgLabelRefExp *)(label->lhs()))->label();
-                gt = new ControlFlowItem(&SgEqOp(*(cgt->exp()), *new SgValueExp(++i)), lbl, NULL, NULL, currentProcedure);
-                gt->setOriginalStatement(cgt);
-                old->AddNextItem(gt);
-                old = gt;
-            }
-            return (*pred = gt);
-        }
-        case SWITCH_NODE:
-        {
-             ControlFlowItem* emptyAfterSwitch = new ControlFlowItem(currentProcedure);
-             ControlFlowItem* cur = switchItem(*stmt, emptyAfterSwitch, stmt, loops, calls, commons);
-             emptyAfterSwitch->setLabel((*stmt)->label());
-             if (*pred != NULL)
-                 (*pred)->AddNextItem(cur);
-             else
-                 *list = cur;
-             return (*pred = emptyAfterSwitch);
-        }
-        case CONT_STAT:
-        {
-             ControlFlowItem* cur = new ControlFlowItem(NULL, (ControlFlowItem*)NULL, NULL, (*stmt)->label(), currentProcedure);
-             if (*pred != NULL)
-                 (*pred)->AddNextItem(cur);
-             else
-                 *list = cur;
-             return (*pred = loops->checkStatementForLoopEnding(cur->getLabel() ? cur->getLabel()->id() : -1, cur));
-        }
-        case CYCLE_STMT:
-        {
-             SgSymbol* ref = (*stmt)->symbol();
-             ControlFlowItem* cur = new ControlFlowItem(NULL, loops->getSourceForCycle(ref), NULL, (*stmt)->label(), currentProcedure);
-             if (*pred != NULL)
-                 (*pred)->AddNextItem(cur);
-             else
-                 *list = cur;
-             return (*pred = cur);
-        }
-        case EXIT_STMT:
-        {
-             SgSymbol* ref = (*stmt)->symbol();
-             ControlFlowItem* cur = new ControlFlowItem(NULL, loops->getSourceForExit(ref), NULL, (*stmt)->label(), currentProcedure);
-             if (*pred != NULL)
-                 (*pred)->AddNextItem(cur);
-             else
-                 *list = cur;
-             return (*pred = cur);
-        }
-        case COMMENT_STAT:
-            return *pred;
-        case COMM_STAT:
-        {
-            commons->RegisterCommonBlock(*stmt, currentProcedure);
-            return *pred;
-        }
-        default:
-            return *pred;
-            //return NULL;
-    }
-}
-
-ControlFlowGraph::ControlFlowGraph(bool t, bool m, ControlFlowItem* list, ControlFlowItem* end) : temp(t), main(m), refs(1), def(NULL), use(NULL), pri(NULL), common_def(NULL), common_use(NULL), hasBeenAnalyzed(false)
-#ifdef __SPF
-, pointers(set<SymbolKey>())
-#endif
-{
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 30);
-#endif
-    int n = 0;
-    ControlFlowItem* orig = list;
-    CBasicBlock* prev = NULL;
-    CBasicBlock* start = NULL;
-    int stmtNo = 0;
-    bool ns = list->isEnumerated();
-    if (list != NULL && !ns){
-        while (list != NULL && list != end)
-        {
-            list->setStmtNo(++stmtNo);
-            list = list->getNext();
-        }
-    }
-    ControlFlowItem* last_prev = NULL;
-    list = orig;
-    while (list != NULL && list != end)
-    {
-        CBasicBlock* bb = new CBasicBlock(t, list, ++n, this, list->getProc());
-        last = bb;
-        bb->setPrev(prev);
-        if (prev != NULL){
-            prev->setNext(bb);
-            if (!last_prev->isUnconditionalJump()){
-                bb->addToPrev(prev, last_prev->IsForJumpFlagSet(), false, last_prev);
-                prev->addToSucc(bb, last_prev->IsForJumpFlagSet(), false, last_prev);
-            }
-        }
-        if (start == NULL)
-            start = bb;
-        prev = bb;
-        while (list->getNext() != NULL && list->getNext() != end && !list->getNext()->isLeader()){
-            list->setBBno(n);
-            list = list->getNext();
-        }
-        list->setBBno(n);
-        last_prev = list;
-        list = list->getNext();
-    }
-    list = orig;
-    while (list != NULL && list != end)
-    {
-        ControlFlowItem* target;
-        if ((target = list->getJump()) != NULL)
-        {
-//            //no back edges
-//            if (target->getBBno() > list->getBBno())
-//            { 
-                CBasicBlock* tmp1 = start;
-                CBasicBlock* tmp2 = start;
-                for (int i = 1; i < target->getBBno() || i < list->getBBno(); i++)
-                {
-                    if (i < list->getBBno()) {
-                        tmp2 = tmp2->getLexNext();
-                        if (!tmp2)
-                            break;
-                    }
-                    if (i < target->getBBno()) {
-                        tmp1 = tmp1->getLexNext();
-                        if (!tmp1)
-                            break;
-                    }
-                }
-                if (tmp1 && tmp2) {
-                    tmp1->addToPrev(tmp2, list->IsForJumpFlagSet(), true, list);
-                    tmp2->addToSucc(tmp1, list->IsForJumpFlagSet(), true, list);
-                }
-//            }
-        }
-        list = list->getNext();
-    }
-    start->markAsReached();
-    first = start;
-    common_use = NULL;
-    cuf = false;
-    common_def = NULL;
-    cdf = false;
-}
-
-CommonDataItem* CommonData::IsThisCommonVar(VarItem* item, AnalysedCallsList* call)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->proc == call) {
-            for (CommonVarInfo* inf = it->info; inf != NULL; inf = inf->next) {
-                if (inf->var && item->var && *inf->var == *item->var)
-                    return it;
-            }
-        }
-    }
-    return NULL;
-}
-
-CommonDataItem* CommonData::GetItemForName(const string &name, AnalysedCallsList *call)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->name == name && it->proc == call)
-            return it;
-    }
-    return NULL;
-}
-
-void CommonData::RegisterCommonBlock(SgStatement *st, AnalysedCallsList *cur)
-{
-    //TODO: multiple common blocks in one procedure with same name
-    for (SgExpression *common = st->expr(0); common; common = common->rhs())
-    {
-        bool newBlock = false;
-        SgExprListExp* vars = (SgExprListExp*)common->lhs();
-        if (vars == NULL)
-            continue;
-
-        const string currCommonName = (common->symbol()) ? common->symbol()->identifier() : "spf_unnamed";
-
-        CommonDataItem* it = GetItemForName(currCommonName, cur);
-        if (!it) {
-            it = new CommonDataItem();
-            it->cb = st;
-            it->name = currCommonName;
-            it->isUsable = true;
-            it->proc = cur;
-            it->first = cur;
-            it->onlyScalars = true;
-            newBlock = true;
-
-            for (CommonDataItem *i = list; i != NULL; i = i->next)
-                if (i->name == currCommonName && i->isUsable)
-                    it->first = i->first;
-        }
-        it->commonRefs.push_back(common);
-
-        for (int i = 0; i < vars->length(); ++i)
-        {
-            SgVarRefExp *e = isSgVarRefExp(vars->elem(i));
-            if (e && !IS_ARRAY(e->symbol()))
-            {
-                CommonVarInfo* c = new CommonVarInfo();
-                c->var = new CScalarVarEntryInfo(e->symbol());
-                c->isPendingLastPrivate = false;
-                c->isInUse = false;
-                c->parent = it;
-                c->next = it->info;
-                it->info = c;
-            }
-            else if (isSgArrayRefExp(vars->elem(i))) {
-                it->onlyScalars = false;
-            }
-            else {
-                CommonVarInfo* c = new CommonVarInfo();
-                c->var = new CArrayVarEntryInfo(vars->elem(i)->symbol(), isSgArrayRefExp(vars->elem(i)));
-                c->isPendingLastPrivate = false;
-                c->isInUse = false;
-                c->parent = it;
-                c->next = it->info;
-                it->info = c;
-                it->onlyScalars = false;
-            }
-        }
-
-        if (newBlock)
-        {
-            it->next = list;
-            list = it;
-        }
-    }
-}
-
-void CommonData::MarkEndOfCommon(AnalysedCallsList* cur)
-{
-    for (CommonDataItem* i = list; i != NULL; i = i->next)
-    {
-        if (i->first == cur)
-            i->isUsable = false;
-    }
-}
-
-void CBasicBlock::markAsReached()
-{
-    prev_status = 1;
-    BasicBlockItem* s = succ;
-    while (s != NULL){
-        CBasicBlock* b = s->block;
-        if (b->prev_status == -1)
-            b->markAsReached();
-        s = s->next;
-    }
-}
-
-bool ControlFlowGraph::ProcessOneParallelLoop(ControlFlowItem* lstart, CBasicBlock* of, CBasicBlock*& p, bool first)
-{
-    int stored_fid = SwitchFile(lstart->getProc()->file_id);
-    ControlFlowItem* lend;
-    if (is_correct != NULL)
-    {
-        const char* expanded_log;
-        char* tmp = NULL;
-        if (failed_proc_name)
-        {
-            tmp = new char[strlen(is_correct) + 2 + strlen(failed_proc_name) + 1];
-            strcpy(tmp, is_correct);
-            strcat(tmp, ": ");
-            strcat(tmp, failed_proc_name);
-            expanded_log = tmp;
-        }
-        else
-            expanded_log = is_correct;
-#if __SPF
-        const wchar_t* rus = R159;
-        Warning("Private analysis is not conducted for loop: '%s'", rus, expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
-#else
-        Warning("Private analysis is not conducted for loop: '%s'", expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
-#endif
-        if (tmp)
-            delete[] tmp;
-
-    }
-    else
-    {
-        while ((lend = p->containsParloopEnd()) == NULL)
-        {
-            p->PrivateAnalysisForAllCalls();
-            p = p->getLexNext();
-            ControlFlowItem* mstart;
-            if ((mstart = p->containsParloopStart()) != NULL)
-            {
-                CBasicBlock* mp = p;
-                if (first) {
-                    if (!ProcessOneParallelLoop(mstart, of, mp, false)) {
-                        SwitchFile(stored_fid);
-                        return false;
-                    }
-                }
-            }
-        }
-        CBasicBlock* afterParLoop = p->getLexNext()->getLexNext();
-        VarSet* l_pri = ControlFlowGraph(true, false, lstart, lend).getPrivate();
-        if (is_correct != NULL)
-        {
-            const char* expanded_log;
-            char* tmp = NULL;
-            if (failed_proc_name)
-            {
-                tmp = new char[strlen(is_correct) + 2 + strlen(failed_proc_name) + 1];
-                strcpy(tmp, is_correct);
-                strcat(tmp, ": ");
-                strcat(tmp, failed_proc_name);
-                expanded_log = tmp;
-            }
-            else
-                expanded_log = is_correct;
-
-#if __SPF
-            const wchar_t* rus = R159;
-            Warning("Private analysis is not conducted for loop: '%s'", rus, expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
-#else
-            Warning("Private analysis is not conducted for loop: '%s'", expanded_log ? expanded_log : "", PRIVATE_ANALYSIS_NOT_CONDUCTED, lstart->getPrivateListStatement());
-#endif
-            if (tmp)
-                delete[] tmp;
-            SwitchFile(stored_fid);
-            return false;
-        }
-        VarSet* p_pri = new VarSet();
-        SgExpression* ex_p = lstart->getPrivateList();
-        if (ex_p != NULL)
-            ex_p = ex_p->lhs();
-        for (; ex_p != NULL; ex_p = ex_p->rhs())
-        {
-            SgVarRefExp* pr;
-            if (pr = isSgVarRefExp(ex_p->lhs()))
-            {
-                CScalarVarEntryInfo* tmp = new CScalarVarEntryInfo(pr->symbol());
-                p_pri->addToSet(tmp, NULL);
-                delete tmp;
-            }
-            SgArrayRefExp* ar;
-            if (ar = isSgArrayRefExp(ex_p->lhs()))
-            {
-                CArrayVarEntryInfo* tmp = new CArrayVarEntryInfo(ar->symbol(), ar);
-                p_pri->addToSet(tmp, NULL);
-                delete tmp;
-            }
-        }
-
-        VarSet* live = afterParLoop->getLiveIn();
-        VarSet* adef = afterParLoop->getDef();
-        VarSet* pri = new VarSet();
-        VarSet* tmp = new VarSet();
-        VarSet* delay = new VarSet();
-        tmp->unite(l_pri, false);
-
-        for (VarItem* exp = tmp->getFirst(); exp != NULL; exp = tmp->getFirst())
-        {
-            if (!afterParLoop->IsVarDefinedAfterThisBlock(exp->var, false))
-                delay->addToSet(exp->var, NULL);
-            tmp->remove(exp->var);
-        }
-        delete tmp;
-        pri->unite(l_pri, false);
-        pri->minus(live, true);
-        privateDelayedList = new PrivateDelayedItem(pri, p_pri, l_pri, lstart, privateDelayedList, this, delay, current_file_id);
-        of->SetDelayedData(privateDelayedList);
-    }
-    SwitchFile(stored_fid);
-    return true;
-}
-
-void ControlFlowGraph::privateAnalyzer()
-{
-    if (hasBeenAnalyzed)
-        return;
-    CBasicBlock* p = first;
-    /*
-    printf("GRAPH:\n");
-    while (p != NULL){
-        printf("block %d: ", p->getNum());
-        if (p->containsParloopStart())
-            printf("start");
-        if (p->containsParloopEnd())
-            printf("end");
-        p->print();
-        p = p->getLexNext();
-    }
-    */
-    p = first;
-    liveAnalysis();
-    while (1) 
-    {
-        ControlFlowItem* lstart;
-        CBasicBlock* of = p;
-        p->PrivateAnalysisForAllCalls();
-        if ((lstart = p->containsParloopStart()) != NULL) 
-        {
-            if (!ProcessOneParallelLoop(lstart, of, p, true))
-                break;
-        }
-        if (p == last)
-            break;
-        p = p->getLexNext();
-    }
-    hasBeenAnalyzed = true;
-}
-
-/*#ifdef __SPF
-void PrivateDelayedItem::PrintWarnings()
-{
-    if (next)
-        next->PrintWarnings();
-    lp->minus(detected);
-    while (!detected->isEmpty()) {
-        SgVarRefExp* var = detected->getFirst();
-        detected->remove(var);
-        Warning("Variable '%s' detected as private", var->unparse(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-    }
-    while (!lp->isEmpty()) {
-        SgVarRefExp* var = lp->getFirst();
-        lp->remove(var);
-        Warning("Variable '%s' detected as last private", var->unparse(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-    }
-    if (detected)
-        delete detected;
-    if (original)
-        delete original;
-    if (lp)
-        delete lp;
-}
-#else*/
-
-bool CArrayVarEntryInfo::HasActiveElements() const
-{
-    bool result = false;
-    if (disabled)
-        return false;
-    if (subscripts == 0)
-        return true;
-    for (int i = 0; i < subscripts; i++) 
-    {
-        if (!data[i].defined)
-            return false;
-        if (data[i].left_bound != data[i].right_bound)
-            result = true;
-        if (data[i].left_bound == data[i].right_bound && data[i].bound_modifiers[0] <= data[i].bound_modifiers[1])
-            result = true;
-    }
-    return result;
-}
-
-void CArrayVarEntryInfo::MakeInactive()
-{
-    disabled = true;
-    for (int i = 0; i < subscripts; i++) 
-    {
-        data[i].left_bound = data[i].right_bound = NULL;
-        data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = 0;
-    }
-}
-
-void PrivateDelayedItem::PrintWarnings()
-{
-    if (next)
-        next->PrintWarnings();
-    int stored_fid = SwitchFile(file_id);
-    total_privates += detected->count();
-    total_pl++;
-    lp->minus(detected);
-    detected->LeaveOnlyRecords();
-    detected->RemoveDoubtfulCommonVars(lstart->getProc());
-    VarSet* test1 = new VarSet();
-    test1->unite(detected, false);
-    VarSet* test2 = new VarSet();
-    test2->unite(original, false);
-    test2->minus(detected);
-    test1->minus(original);
-    int extra = 0, missing = 0;
-    SgExpression* prl = lstart->getPrivateList();
-    SgStatement* prs = lstart->getPrivateListStatement();
-    if (prl == NULL && !test1->isEmpty()) 
-    {
-        SgExpression* lst = new SgExprListExp();
-        prl = new SgExpression(ACC_PRIVATE_OP);
-        lst->setLhs(prl);
-        lst->setRhs(NULL);
-#if __SPF
-        SgExpression* clauses = prs->expr(0);
-#else
-        SgExpression* clauses = prs->expr(1);
-#endif
-        if (clauses) {
-            while (clauses->rhs() != NULL)
-                clauses = clauses->rhs();
-            clauses->setRhs(lst);
-        }
-        else {
-#if __SPF
-            prs->setExpression(0, *lst);
-#else
-            prs->setExpression(1, *lst);
-#endif
-        }
-    }
-    SgExpression* op = prl;
-
-    while (!test2->isEmpty()) {
-        //printf("EXTRA IN PRIVATE LIST: ");
-        //test2->print();
-        extra = 1;
-        VarItem* var = test2->getFirst();
-        CVarEntryInfo* syb = var->var->Clone();
-        int change_fid = var->file_id;
-        test2->remove(var->var);
-        int stored_fid = SwitchFile(change_fid);
-        if (syb->GetVarType() != VAR_REF_ARRAY_EXP)
-        {
-#if __SPF
-            const wchar_t* rus = R160;
-            Warning("var '%s' from private list wasn't classified as private", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
-#else
-            Warning("var '%s' from private list wasn't classified as private", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
-#endif
-        }
-        else 
-        {
-            CArrayVarEntryInfo* tt = (CArrayVarEntryInfo*)syb;
-            if (tt->HasActiveElements())
-            {
-#if __SPF
-                const wchar_t* rus = R161;
-                Warning("array '%s' from private list wasn't classified as private", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
-#else
-                Warning("array '%s' from private list wasn't classified as private", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_REMOVE_VAR, lstart->getPrivateListStatement());
-#endif
-            }
-        }
-        delete(syb);
-        SwitchFile(stored_fid);
-    }
-    while (!test1->isEmpty()) {
-        //printf("MISSING IN PRIVATE LIST: ");
-        //test1->print();
-        missing = 1;
-        VarItem* var = test1->getFirst();
-        CVarEntryInfo* syb = var->var->Clone();
-        int change_fid = var->file_id;
-        test1->remove(var->var);
-        int stored_fid = SwitchFile(change_fid);
-        if (syb->GetVarType() != VAR_REF_ARRAY_EXP) {
-#if __SPF
-            const wchar_t* rus = R162;
-            Note("add private scalar '%s'", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-#else
-            Warning("var '%s' was added to private list", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-#endif
-            SgExprListExp* nls = new SgExprListExp();
-            SgVarRefExp* nvr = new SgVarRefExp(syb->GetSymbol());
-            nls->setLhs(nvr);
-            nls->setRhs(prl->lhs());
-            prl->setLhs(nls);
-        }
-        else 
-        {
-            CArrayVarEntryInfo* tt = (CArrayVarEntryInfo*)syb;
-            if (tt->HasActiveElements()) 
-            {
-#if __SPF
-                const wchar_t* rus = R163;
-                Note("add private array '%s'", rus, syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-#else
-                Warning("var '%s' was added to private list", syb->GetSymbol()->identifier(), PRIVATE_ANALYSIS_ADD_VAR, lstart->getPrivateListStatement());
-#endif
-
-// TODO: need to check all situation before commit it to release 
-#if !__SPF
-                SgExprListExp *nls = new SgExprListExp();
-                SgArrayRefExp *nvr = new SgArrayRefExp(*syb->GetSymbol());
-                nls->setLhs(nvr);
-                nls->setRhs(prl->lhs());
-                prl->setLhs(nls);
-#endif
-            }
-        }
-        delete(syb);
-        SwitchFile(stored_fid);
-        
-        /*printf("modified parallel stmt:\n");
-        prs->unparsestdout();
-        printf("\n");*/
-    }
-    if (extra == 0 && missing == 0) {
-#if ACCAN_DEBUG
-        Warning("Correct", "", 0, lstart->getPrivateListStatement());
-#endif
-    }
-    //printf("PRIVATE VARS: ");
-    //detected->print();
-    //printf("DECLARATION: ");
-    //p_pri->print();
-    //printf("LAST PRIVATE VARS: ");
-    //lp->print();
-    if (test1)
-        delete test1;
-    
-
-    if (test2)
-        delete test2;
-    
-    if (detected)
-        delete detected;
-    
-    if (original)
-        delete original;
-    
-    if (lp)
-        delete lp;
-    
-    SwitchFile(stored_fid);
-}
-//#endif
-
-ControlFlowItem* doLoops::checkStatementForLoopEnding(int label, ControlFlowItem* last)
-{
-
-    if (current == NULL || label == -1 || label != current->getLabel())
-        return last;
-    return checkStatementForLoopEnding(label, endLoop(last));
-}
-
-doLoopItem* doLoops::findLoop(SgSymbol* s)
-{
-    doLoopItem* l = first;
-    while (l != NULL){
-        if (l->getName() == s)
-            return l;
-        l = l->getNext();
-    }
-    return NULL;
-}
-
-void doLoops::addLoop(int l, SgSymbol* s, ControlFlowItem* i, ControlFlowItem* e)
-{
-    doLoopItem* nl = new doLoopItem(l, s, i, e);
-    if (first == NULL)
-        first = current = nl;
-    else{
-        current->setNext(nl);
-        nl->HandleNewItem(current);
-        current = nl;
-    }
-}
-
-ControlFlowItem* doLoops::endLoop(ControlFlowItem* last)
-{
-    doLoopItem* removed = current;
-    if (first == current)
-        first = current = NULL;
-    else{
-        doLoopItem* prev = first;
-        while (prev->getNext() != current)
-            prev = prev->getNext();
-        prev->setNext(NULL);
-        current = prev;
-    }
-    last->AddNextItem(removed->getSourceForCycle());
-    ControlFlowItem* empty = removed->getSourceForExit();
-    delete removed;
-    return empty;
-}
-
-VarSet* ControlFlowGraph::getPrivate()
-{
-    //printControlFlowList(first->getStart(), last->getStart());
-    if (pri == NULL)
-    {
-        bool same = false;
-        int it = 0;
-        CBasicBlock* p = first;
-        /*
-        printf("GRAPH:\n");
-        while (p != NULL){
-            printf("block %d: ", p->getNum());
-            p->print();
-            p = p->getLexNext();
-        }
-        */
-        p = first;
-        while (!same){
-            p = first;
-            same = true;
-            while (p != NULL){
-                same = p->stepMrdIn(false) && same;
-                same = p->stepMrdOut(false) && same;
-                p = p->getLexNext();
-            }
-            it++;
-            //printf("iters: %d\n", it);
-        }
-        p = first;
-        while (p != NULL) {
-            p->stepMrdIn(true);
-            p->stepMrdOut(true);
-            //p->getMrdIn(false)->print();
-            p = p->getLexNext();
-        }
-        
-        p = first;
-        VarSet* res = new VarSet();
-        VarSet* loc = new VarSet();
-        bool il = false;
-        while (p != NULL)
-        {
-            res->unite(p->getUse(), false);
-            loc->unite(p->getDef(), false);
-            p = p->getLexNext();
-        }
-        //printf("USE: ");
-        //res->print();
-        //printf("LOC: ");
-        //loc->print();
-        res->unite(loc, false);
-        //printf("GETUSE: ");
-        //getUse()->print();
-
-        //res->minus(getUse()); //test!
-        res->minusFinalize(getUse(), true);
-        pri = res;
-    }
-    return pri;
-}
-
-void ControlFlowGraph::liveAnalysis()
-{
-    bool same = false;
-    int it = 0;
-    CBasicBlock* p = first;
-    p = first;
-    while (!same){
-        p = last;
-        same = true;
-        while (p != NULL){
-            same = p->stepLVOut() && same;
-            same = p->stepLVIn() && same;
-            p = p->getLexPrev();
-        }
-        it++;
-        //printf("iters: %d\n", it);
-    }
-}
-
-VarSet* ControlFlowGraph::getUse()
-{
-    if (use == NULL)
-    {
-        CBasicBlock* p = first;
-        VarSet* res = new VarSet();
-        while (p != NULL)
-        {
-            VarSet* tmp = new VarSet();
-            tmp->unite(p->getUse(), false);
-            tmp->minus(p->getMrdIn(false));
-            //printf("BLOCK %d INSTR %d USE: ", p->getNum(), p->getStart()->getStmtNo());
-            //tmp->print();
-            res->unite(tmp, false);
-            delete tmp;
-            p = p->getLexNext();
-        }
-        use = res;
-
-    }
-    if (!cuf)
-    {
-        AnalysedCallsList* call = first->getStart()->getProc();
-        cuf = true;
-        if (call) {
-            CommonVarSet* s = pCommons->GetCommonsForVarSet(use, call);
-            common_use = s;
-            for (CBasicBlock* i = first; i != NULL; i = i->getLexNext()){
-                for (CommonVarSet* c = i->getCommonUse(); c != NULL; c = c->next) {
-                    /*
-                    CommonVarSet* n = new CommonVarSet();
-                    n->cvd = c->cvd;
-                    n->cvd->refs++;
-                    */
-                    CommonVarSet* n = new CommonVarSet(*c);
-                    CommonVarSet* t;
-                    for (t = n; t->next != NULL; t = t->next);
-                    t->next = common_use;
-                    common_use = n;
-                }
-            }
-        }
-    }
-    return use;
-}
-
-VarSet* ControlFlowGraph::getDef()
-{
-    if (def == NULL) {
-        def = new VarSet();
-        def->unite(last->getMrdOut(false), true);
-    }
-    if (!cdf)
-    {
-        AnalysedCallsList* call = first->getStart()->getProc();
-        if (call) {
-            cdf = true;
-            CommonVarSet* s = pCommons->GetCommonsForVarSet(def, call);
-            common_def = s;
-            for (CBasicBlock* i = first; i != NULL; i = i->getLexNext()) {
-                for (CommonVarSet* c = i->getCommonDef(); c != NULL; c = c->next) {
-                    /*
-                    CommonVarSet* n = new CommonVarSet();
-                    n->cvd = c->cvd;
-                    n->cvd->refs++;
-                    */
-                    CommonVarSet *n = new CommonVarSet(*c);
-                    CommonVarSet* t;
-                    for (t = n; t->next != NULL; t = t->next);
-                    t->next = common_def;
-                    common_def = n;
-                }
-            }
-        }
-    }
-    return def;
-}
-
-CommonVarSet* CommonData::GetCommonsForVarSet(VarSet* set, AnalysedCallsList* call)
-{
-    CommonVarSet* res = NULL;
-    for (CommonDataItem* i = list; i != NULL; i = i->next) {
-        if (i->proc == call) {
-            for (CommonVarInfo* v = i->info; v != NULL; v = v->next) {
-                if (set->belongs(v->var)) {
-                    CommonVarSet* n = new CommonVarSet();
-                    n->cvd = v;
-                    n->next = res;
-                    res = n;
-                }
-            }
-        }
-    }
-    return res;
-}
-
-void CBasicBlock::PrivateAnalysisForAllCalls()
-{
-    ControlFlowItem* p = start;
-    while (p != NULL && (p == start || !p->isLeader())) {
-        AnalysedCallsList* c = p->getCall();
-        const char* oic = is_correct;
-        const char* fpn = failed_proc_name;
-        is_correct = NULL;
-        failed_proc_name = NULL;
-        if (c != NULL && c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c->header != NULL && !c->hasBeenAnalysed) {
-            c->hasBeenAnalysed = true;
-            
-            int stored_fid = SwitchFile(c->file_id);
-            
-            c->graph->privateAnalyzer();
-            
-            SwitchFile(stored_fid);
-            
-        }
-        is_correct = oic;
-        failed_proc_name = fpn;
-        p = p->getNext();
-    }
-    return;
-}
-
-ControlFlowItem* CBasicBlock::containsParloopEnd()
-{
-    ControlFlowItem* p = start;
-    while (p != NULL && (p == start || !p->isLeader())){
-        if (p->IsParloopEnd())
-            return p;
-        p = p->getNext();
-    }
-    return NULL;
-}
-
-ControlFlowItem* CBasicBlock::containsParloopStart()
-{
-    ControlFlowItem* p = start;
-    while (p != NULL && (p == start || !p->isLeader())){
-        if (p->IsParloopStart())
-            return p;
-        p = p->getNext();
-    }
-    return NULL;
-}
-
-void CBasicBlock::print()
-{
-    printf("block %d: prev: ", num);
-    BasicBlockItem* p = prev;
-    while (p != NULL){
-        printf("%d ", p->block->num);
-        p = p->next;
-    }
-    printf("\n");
-}
-
-ControlFlowItem* CBasicBlock::getStart()
-{
-    return start;
-}
-
-ControlFlowItem* CBasicBlock::getEnd()
-{
-    ControlFlowItem* p = start;
-    ControlFlowItem* end = p;
-    while (p != NULL && (p == start || !p->isLeader())){
-        end = p;
-        p = p->getNext();
-    }
-    return end;
-}
-
-VarSet* CBasicBlock::getLVOut()
-{
-    if (lv_out == NULL)
-    {
-        VarSet* res = new VarSet();
-        BasicBlockItem* p = succ;
-        bool first = true;
-        while (p != NULL)
-        {
-            CBasicBlock* b = p->block;
-            if (b != NULL && !b->lv_undef)
-            {
-                res->unite(b->getLVIn(), false);
-            }
-            p = p->next;
-        }
-        lv_out = res;
-    }
-    return lv_out;
-}
-
-VarSet* CBasicBlock::getLVIn()
-{
-    if (lv_in == NULL)
-    {
-        VarSet* res = new VarSet();
-        res->unite(getLVOut(), false);
-        res->minus(getDef());
-        res->unite(getUse(), false);
-        lv_in = res;
-    }
-    return lv_in;
-}
-
-bool CBasicBlock::IsVarDefinedAfterThisBlock(CVarEntryInfo* var, bool os)
-{
-    findentity = var;
-    if (def->belongs(var, os)) {
-        findentity = NULL;
-        return true;
-    }
-    BasicBlockItem* p = succ;
-    while (p != NULL)
-    {
-        CBasicBlock* b = p->block;
-        if (b->ShouldThisBlockBeCheckedAgain(var) && b->IsVarDefinedAfterThisBlock(var, os)) {
-            findentity = NULL;
-            return true;
-        }
-        p = p->next;
-    }
-    findentity = NULL;
-    return false;
-}
-
-bool CBasicBlock::stepLVOut()
-{
-    if (old_lv_out)
-        delete old_lv_out;
-    
-    old_lv_out = lv_out;
-    lv_out = NULL;
-    getLVOut();
-    lv_undef = false;
-    //printf("block %d\n", num);
-    //old_mrd_out->print();
-    //mrd_out->print();
-    return (lv_out->equal(old_lv_out));
-    //return true;
-}
-
-bool CBasicBlock::stepLVIn()
-{
-    if (old_lv_in)
-        delete old_lv_in;
-
-    old_lv_in = lv_in;
-    lv_in = NULL;
-    getLVIn();
-    return (lv_in->equal(old_lv_in));
-    //return true;
-}
-
-VarSet* CBasicBlock::getMrdIn(bool la)
-{
-    if (mrd_in == NULL)
-    {
-        VarSet* res = new VarSet();
-        BasicBlockItem* p = prev;
-        bool first = true;
-
-        while (p != NULL)
-        {
-            CBasicBlock* b = p->block;
-            if (b != NULL && !b->undef && b->hasPrev())
-            {
-                if (first) {
-                    res->unite(b->getMrdOut(la), la);
-                    first = false;
-                }
-                else
-                    res->intersect(b->getMrdOut(la), la, true);
-            }
-            p = p->next;
-        }
-        mrd_in = res;
-    }
-    return mrd_in;
-}
-
-bool CBasicBlock::hasPrev()
-{
-    return prev_status == 1;
-}
-
-VarSet* CBasicBlock::getMrdOut(bool la)
-{
-    if (mrd_out == NULL)
-    {
-        VarSet* res = new VarSet();
-        res->unite(getMrdIn(la), la);
-        res->unite(getDef(), la);
-        mrd_out = res;
-        //printf("BLOCK %d INSTR %d MRDOUT: ", num, start->getStmtNo());
-        //mrd_out->print();
-        //print();
-    }
-    return mrd_out;
-}
-
-bool CBasicBlock::stepMrdOut(bool la)
-{
-    if (old_mrd_out)
-        delete old_mrd_out;
-    
-    old_mrd_out = mrd_out;
-    mrd_out = NULL;
-    getMrdOut(la);
-    undef = false;
-    //printf("block %d\n", num);
-    //old_mrd_out->print();
-    //mrd_out->print();
-    return (mrd_out->equal(old_mrd_out));
-    //return true;
-}
-
-bool CBasicBlock::stepMrdIn(bool la)
-{
-    if (old_mrd_in)
-        delete old_mrd_in;
-    
-    old_mrd_in = mrd_in;
-    mrd_in = NULL;
-    getMrdIn(la);
-    return (mrd_in->equal(old_mrd_in));
-    //return true;
-}
-
-bool IsPresentInExprList(SgExpression* ex, CExprList* lst)
-{
-    while (lst != NULL) {
-        if (lst->entry == ex)
-            return true;
-        lst = lst->next;
-    }
-    return false;
-}
-
-CRecordVarEntryInfo* AddRecordVarRef(SgRecordRefExp* ref)
-{
-    if (isSgRecordRefExp(ref->lhs())) {
-        CVarEntryInfo* parent = AddRecordVarRef(isSgRecordRefExp(ref->lhs()));
-        if (parent)
-            return new CRecordVarEntryInfo(ref->rhs()->symbol(), parent);
-        return NULL;
-    }
-    if (isSgVarRefExp(ref->lhs())) {
-        CVarEntryInfo* parent = new CScalarVarEntryInfo(isSgVarRefExp(ref->lhs())->symbol());
-        return new CRecordVarEntryInfo(ref->rhs()->symbol(), parent);
-    }
-    if (isSgArrayRefExp(ref->lhs())) {
-        CVarEntryInfo* parent = new CArrayVarEntryInfo(isSgArrayRefExp(ref->lhs())->symbol(), isSgArrayRefExp(ref->lhs()));
-        return new CRecordVarEntryInfo(ref->rhs()->symbol(), parent);
-    }
-    return NULL;
-}
-
-void CBasicBlock::AddOneExpressionToUse(SgExpression* ex, SgStatement* st, CArrayVarEntryInfo* v)
-{
-    CVarEntryInfo* var = NULL;
-    SgVarRefExp* r;
-    if ((r = isSgVarRefExp(ex)))
-        var = new CScalarVarEntryInfo(r->symbol());
-    SgArrayRefExp* ar;
-    if ((ar = isSgArrayRefExp(ex))) {
-        if (!v)
-            var = new CArrayVarEntryInfo(ar->symbol(), ar);
-        else {
-            var = v->Clone();
-            var->SwitchSymbol(ar->symbol());
-        }
-    }
-    SgRecordRefExp* rr;
-    if ((rr = isSgRecordRefExp(ex)))
-        var = AddRecordVarRef(rr);
-    if (var) {
-        var->RegisterUsage(def, use, st);
-        delete var;
-    }
-}
-
-void CBasicBlock::AddOneExpressionToDef(SgExpression* ex, SgStatement* st, CArrayVarEntryInfo* v)
-{
-    CVarEntryInfo* var = NULL;
-    SgVarRefExp* r;
-    if ((r = isSgVarRefExp(ex)))
-        var = new CScalarVarEntryInfo(r->symbol());
-    SgRecordRefExp* rr;
-    if ((rr = isSgRecordRefExp(ex)))
-        var = AddRecordVarRef(rr);
-    SgArrayRefExp* ar;
-    if ((ar = isSgArrayRefExp(ex))) {
-        if (!v)
-            var = new CArrayVarEntryInfo(ar->symbol(), ar);
-        else {
-            var = v->Clone();
-            var->SwitchSymbol(ar->symbol());
-        }
-    }
-    if (var) {
-        var->RegisterDefinition(def, use, st);
-        delete var;
-    }
-}
-
-void CBasicBlock::addExprToUse(SgExpression* ex, CArrayVarEntryInfo* v = NULL, CExprList* lst = NULL)
-{
-    if (ex != NULL)
-    {
-        CExprList* cur = new CExprList();
-        cur->entry = ex;
-        cur->next = lst;
-        SgFunctionCallExp* f = isSgFunctionCallExp(ex);
-        if (!f) {
-            if (!IsPresentInExprList(ex->lhs(), cur))
-                addExprToUse(ex->lhs(), v, cur);
-            if (!isSgUnaryExp(ex))
-                if (!IsPresentInExprList(ex->rhs(), cur))
-                    addExprToUse(ex->rhs(), v, cur);
-            AddOneExpressionToUse(ex, NULL, v);
-        }
-        delete cur;
-        /*
-        SgVarRefExp* r;
-        //printf(" %s\n", f->funName()->identifier());
-        bool intr = isIntrinsicFunctionNameACC(f->funName()->identifier()) && !IsUserFunctionACC(f->funName());
-        bool pure = IsPureProcedureACC(f->funName());
-        if (!intr && !pure){
-            printf("function not intristic or pure: %s\n", f->funName()->identifier());
-            is_correct = false;
-            return;
-        }
-        if (intr) {
-            ProcessIntristicProcedure(true, f->numberOfArgs(), f);
-            return;
-        }
-        ProcessProcedureHeader(true, isSgProcHedrStmt(GRAPHNODE(f->funName())->st_header), f);
-        */
-    }
-}
-
-void CBasicBlock::ProcessIntrinsicProcedure(bool isF, int narg, void* f, const char* name)
-{
-    for (int i = 0; i < narg; i++) {
-        SgExpression* ar = GetProcedureArgument(isF, f, i);
-        if (IsAnIntrinsicSubroutine(name)) 
-        {
-            SgExpression* v = CheckIntrinsicParameterFlag(name, i, ar, INTRINSIC_IN);
-            if (v)
-                addExprToUse(v);            
-        }
-        else
-            addExprToUse(ar);
-        
-        AddOneExpressionToDef(CheckIntrinsicParameterFlag(name, i, ar, INTRINSIC_OUT), NULL, NULL);
-    }
-}
-
-void CBasicBlock::ProcessProcedureWithoutBody(bool isF, void* f, bool out)
-{
-    for (int i = 0; i < GetNumberOfArguments(isF, f); i++){
-        addExprToUse(GetProcedureArgument(isF, f, i));
-        if (out)
-            AddOneExpressionToDef(GetProcedureArgument(isF, f, i), NULL, NULL);
-    }
-}
-
-SgSymbol* CBasicBlock::GetProcedureName(bool isFunc, void* f)
-{
-    if (isFunc) {
-        SgFunctionCallExp* fc = (SgFunctionCallExp*)f;
-        return fc->funName();
-    }
-    SgCallStmt* pc = (SgCallStmt*)f;
-    return pc->name();
-}
-
-int GetNumberOfArguments(bool isF, void* f)
-{
-    if (isF) {
-        SgFunctionCallExp* fc = (SgFunctionCallExp*)f;
-        return fc->numberOfArgs();
-    }
-    SgCallStmt* pc = (SgCallStmt*)f;
-    return pc->numberOfArgs();
-}
-
-SgExpression* GetProcedureArgument(bool isF, void *f, const int i)
-{
-    SgExpression *arg = NULL;
-    if (isF)
-    {
-        SgFunctionCallExp* fc = (SgFunctionCallExp*)f;
-        arg = fc->arg(i);
-    }
-    else
-    {
-        SgCallStmt *pc = (SgCallStmt*)f;
-        arg = pc->arg(i);
-    }
-    return arg;
-}
-
-void CBasicBlock::ProcessProcedureHeader(bool isF, SgProcHedrStmt *header, void *f, const char* name)
-{   
-    if (!header) 
-    {
-        is_correct = "no header found";
-        failed_proc_name = name;
-        return;
-    }
-    
-    for (int i = 0; i < header->numberOfParameters(); ++i) 
-    {
-        int stored = SwitchFile(header->getFileId());
-        SgSymbol *arg = header->parameter(i);
-        SwitchFile(stored);
-
-        if (arg->attributes() & (IN_BIT)) 
-        {
-            SgExpression *ar = GetProcedureArgument(isF, f, i);
-            addExprToUse(ar);
-        }        
-        else if (arg->attributes() & (INOUT_BIT)) 
-        {
-            addExprToUse(GetProcedureArgument(isF, f, i));
-            AddOneExpressionToDef(GetProcedureArgument(isF, f, i), NULL, NULL);
-        }
-        else if (arg->attributes() & (OUT_BIT))
-            AddOneExpressionToDef(GetProcedureArgument(isF, f, i), NULL, NULL);
-        else 
-        {
-            is_correct = "no bitflag set for pure procedure";
-            break;
-        }
-    }    
-}
-
-bool AnalysedCallsList::isArgIn(int i, CArrayVarEntryInfo** p)
-{
-    int stored = SwitchFile(this->file_id);
-    SgProcHedrStmt* h = isSgProcHedrStmt(header);
-    VarSet* use = graph->getUse();
-    SgSymbol* par = h->parameter(i);
-    /*
-    CScalarVarEntryInfo* var = new CScalarVarEntryInfo(par);
-    bool result = false;
-    if (use->belongs(var))
-        result = true;
-    delete var;
-    */
-    VarItem* result = use->belongs(par);
-    if (result && result->var->GetVarType() == VAR_REF_ARRAY_EXP && p) 
-        *p = (CArrayVarEntryInfo*)result->var;
-    SwitchFile(stored);
-
-    return result;
-}
-
-bool AnalysedCallsList::isArgOut(int i, CArrayVarEntryInfo** p)
-{
-    int stored = SwitchFile(this->file_id);
-    SgProcHedrStmt* h = isSgProcHedrStmt(header);
-    graph->privateAnalyzer();
-    VarSet* def = graph->getDef();
-    SgSymbol* par = h->parameter(i);
-    /*
-    CScalarVarEntryInfo* var = new CScalarVarEntryInfo(par);
-    bool result = false;
-    if (def->belongs(var))
-        result = true;
-    delete var;
-    */
-    VarItem* result = def->belongs(par);
-    if (result && result->var->GetVarType() == VAR_REF_ARRAY_EXP && p) 
-        *p = (CArrayVarEntryInfo*)result->var;
-    SwitchFile(stored);
-
-    return result;
-}
-
-void CommonData::MarkAsUsed(VarSet* use, AnalysedCallsList* lst)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->proc == lst) {
-            for (CommonVarInfo* v = it->info; v != NULL; v = v->next) {
-                CVarEntryInfo* r = v->var;
-                if (use->belongs(r))
-                    v->isInUse = true;
-            }
-        }
-    }
-}
-
-void CBasicBlock::ProcessUserProcedure(bool isFun, void* call, AnalysedCallsList* c)
-{
-    /*
-    if (c == NULL || c->graph == NULL) {
-        is_correct = "no body found for procedure";
-        if (c != NULL)
-            failed_proc_name = c->funName;
-        else
-            failed_proc_name = NULL;
-        return;
-    }
-    */
-    if (c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c != NULL && c->graph != NULL) 
-    {
-        int stored_file_id = SwitchFile(c->file_id);
-        c->graph->getPrivate(); //all sets actually
-        SgStatement *cp = c->header->controlParent();
-        SwitchFile(stored_file_id);
-
-        if (proc && proc->header->variant() == PROC_HEDR && cp == proc->header) {
-            VarSet* use_c = new VarSet();
-            use_c->unite(c->graph->getUse(), false);
-            for (VarItem* exp = use_c->getFirst(); exp != NULL; exp = use_c->getFirst()) {
-                if (exp->var->GetSymbol()->scope() == proc->header) {
-                    addExprToUse(new SgVarRefExp(exp->var->GetSymbol())); // TESTING
-                }
-                use_c->remove(exp->var);
-            }
-            delete use_c;
-            VarSet* def_c = new VarSet();
-            def_c->unite(c->graph->getDef(), true);
-            for (VarItem* exp = def_c->getFirst(); exp != NULL; exp = def_c->getFirst()) {
-                if (exp->var->GetSymbol()->scope() == proc->header) {
-                    def->addToSet(exp->var, NULL);
-                }
-                def_c->remove(exp->var);
-            }
-            delete def_c;
-        }
-
-        pCommons->MarkAsUsed(c->graph->getUse(), c);
-        SgProcHedrStmt* header = isSgProcHedrStmt(c->header);
-        if (!header) {
-            is_correct = "no header for procedure";
-            failed_proc_name = c->funName;
-            return;
-        }
-    }
-
-    for (int i = 0; i < GetNumberOfArguments(isFun, call); i++) 
-    {
-        SgExpression* ar = GetProcedureArgument(isFun, call, i);
-        CArrayVarEntryInfo* tp = NULL;
-        if (c == (AnalysedCallsList*)(-1) || c == (AnalysedCallsList*)(-2) || c == NULL || c->graph == NULL || c->isArgIn(i, &tp))
-            addExprToUse(ar, tp);
-        tp = NULL;
-        if (c == (AnalysedCallsList*)(-1) || c == NULL || c->graph == NULL || c->isArgOut(i, &tp))
-            AddOneExpressionToDef(GetProcedureArgument(isFun, call, i), NULL, tp);
-    }
-
-    if (c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && c != NULL && c->graph != NULL) {
-        for (CommonVarSet* cu = c->graph->getCommonUse(); cu != NULL; cu = cu->next) {
-            CommonVarInfo* v = cu->cvd;
-            AnalysedCallsList* tp = start->getProc();
-            CommonDataItem* p = v->parent;
-            if (CommonDataItem* it = pCommons->IsThisCommonUsedInProcedure(p, tp)) {
-                if (pCommons->CanHaveNonScalarVars(it))
-                    continue;
-                CommonVarInfo* i = it->info;
-                CommonVarInfo* j = p->info;
-                while (j != v) {
-                    j = j->next;
-                    if (i)
-                        i = i->next;
-                    else
-                        continue;
-                }
-                if (!i)
-                    continue;
-                SgVarRefExp* var = new SgVarRefExp(i->var->GetSymbol());
-                addExprToUse(var);
-            }
-            else {
-                common_use = new CommonVarSet(*cu);
-            }
-        }
-        for (CommonVarSet* cd = c->graph->getCommonDef(); cd != NULL; cd = cd->next) {
-            CommonVarInfo* v = cd->cvd;
-            AnalysedCallsList* tp = start->getProc();
-            CommonDataItem* p = v->parent;
-            if (CommonDataItem* it = pCommons->IsThisCommonUsedInProcedure(p, tp)) {
-                if (pCommons->CanHaveNonScalarVars(it))
-                    continue;
-                CommonVarInfo* i = it->info;
-                CommonVarInfo* j = p->info;
-                while (j != v) {
-                    j = j->next;
-                    if (i)
-                        i = i->next;
-                }
-                if (!i)
-                    continue;
-                def->addToSet(i->var, NULL);
-            }
-            else {
-                common_def = new CommonVarSet(*cd);
-            }
-        }
-    }
-
-}
-
-bool CommonData::CanHaveNonScalarVars(CommonDataItem* item)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->name == item->name && it->first == item->first && !it->onlyScalars)
-            return true;
-    }
-    bool res = !item->onlyScalars;
-    //printf("CommonData::CanHaveNonScalarVars: %d\n", res);
-    return res;
-}
-
-CommonDataItem* CommonData::IsThisCommonUsedInProcedure(CommonDataItem* item, AnalysedCallsList* p)
-{
-    for (CommonDataItem* it = list; it != NULL; it = it->next) {
-        if (it->proc == p) {
-            if (it->name == item->name)
-                return it;
-        }
-    }
-    return NULL;
-}
-
-void CBasicBlock::setDefAndUse()
-{
-    ControlFlowItem* p = start;
-    while (p != NULL && (p == start || !p->isLeader()))
-    {
-        if (p->getJump() == NULL)
-        {
-            SgStatement* st = p->getStatement();
-            SgFunctionCallExp* f = p->getFunctionCall();
-            
-            if (f != NULL)
-            {
-                bool add_intr = IsAnIntrinsicSubroutine(f->funName()->identifier()) != NULL; // strcmp(f->funName()->identifier(), "date_and_time") == 0;
-                bool intr = (isIntrinsicFunctionNameACC(f->funName()->identifier()) || add_intr) && !IsUserFunctionACC(f->funName());
-                bool pure = IsPureProcedureACC(f->funName());
-                AnalysedCallsList* c = p->getCall();
-                if (!intr && !pure && c && c != (AnalysedCallsList*)(-1) && c != (AnalysedCallsList*)(-2) && !(c->IsIntrinsic())) {
-
-                    if (c->header == NULL) {
-                        is_correct = "no header for procedure";
-                        failed_proc_name = c->funName;
-                    }
-                    else {
-                        //graph_node* oldgn = currentGraphNode;
-                        //graph_node* newgn = GRAPHNODE(f->funName())->file_id;
-                        //currentGraphNode = newgn;
-                        ProcessUserProcedure(true, f, c);
-                        //currentGraphNode = oldgn;
-
-                    }
-                }
-                else if (c == (AnalysedCallsList*)(-1) || c == (AnalysedCallsList*)(-2))
-                    ProcessProcedureWithoutBody(true, f, c == (AnalysedCallsList*)(-1));
-                else if (intr || (c && c->IsIntrinsic())) {
-                    ProcessIntrinsicProcedure(true, f->numberOfArgs(), f, f->funName()->identifier());
-                }else
-                    ProcessProcedureHeader(true, isSgProcHedrStmt(GRAPHNODE(f->funName())->st_header), f, f->funName()->identifier());
-            }
-
-
-            if (st != NULL)
-            {
-                switch (st->variant())
-                {
-                case ASSIGN_STAT:
-                    {
-                        SgAssignStmt* s = isSgAssignStmt(st);
-                        SgExpression* l = s->lhs();
-                        SgExpression* r = s->rhs();
-                        addExprToUse(r);
-                        AddOneExpressionToDef(l, st, NULL);
-                        break;
-                    }
-                case PRINT_STAT:
-                case WRITE_STAT:
-                case READ_STAT:
-                    {
-                        SgInputOutputStmt* s = isSgInputOutputStmt(st);
-                        if (s) {
-                            SgExpression* ex = s->itemList();
-                            while (ex && ex->lhs()) {
-                                if (st->variant() == READ_STAT) {
-                                    AddOneExpressionToDef(ex->lhs(), st, NULL);
-                                }
-                                else {
-                                    addExprToUse(ex->lhs());
-                                }
-                                ex = ex->rhs();
-                            }
-                        }
-                        break;
-                    }
-                case PROC_STAT:
-                {
-                    SgCallStmt* f = isSgCallStmt(st);
-                    bool add_intr = IsAnIntrinsicSubroutine(f->name()->identifier()) != NULL;
-                    bool intr = (isIntrinsicFunctionNameACC(f->name()->identifier()) || add_intr) && !IsUserFunctionACC(f->name());
-                    bool pure = IsPureProcedureACC(f->name());
-                    if (!intr && !pure) {
-                        AnalysedCallsList* c = p->getCall();
-                        //graph_node* oldgn = currentGraphNode;
-                        //graph_node* newgn = GRAPHNODE(f->name());
-                        //currentGraphNode = newgn;
-                        ProcessUserProcedure(false, f, c);
-                        //currentGraphNode = oldgn;
-                        break;
-                    }
-                    if (intr) {
-                        ProcessIntrinsicProcedure(false, f->numberOfArgs(), f, f->name()->identifier());
-                        break;
-                    }
-                    ProcessProcedureHeader(false, isSgProcHedrStmt(GRAPHNODE(f->name())->st_header), f, f->name()->identifier());
-                }
-                default:
-                    break;
-                }
-            }
-        }
-        else
-            addExprToUse(p->getExpression());
-            p = p->getNext();
-    }
-}
-
-VarSet* CBasicBlock::getDef()
-{
-    if (def == NULL)
-    {
-        def = new VarSet();
-        use = new VarSet();
-        setDefAndUse();
-    }
-    return def;
-}
-
-VarSet* CBasicBlock::getUse()
-{
-    if (use == NULL)
-    {
-        use = new VarSet();
-        def = new VarSet();
-        setDefAndUse();
-    }
-    return use;
-}
-
-#ifdef __SPF
-template<typename IN_TYPE, typename OUT_TYPE>
-const vector<OUT_TYPE> getAttributes(IN_TYPE st, const set<int> dataType);
-#endif
-
-DoLoopDataItem* DoLoopDataList::FindLoop(SgStatement* st)
-{
-    DoLoopDataItem* it = list;
-    while (it != NULL) {
-        if (it->statement == st)
-            return it;
-        it = it->next;
-    }
-    return NULL;
-}
-
-bool GetExpressionAndCoefficientOfBound(SgExpression* exp, SgExpression** end, int* coef)
-{
-    if (exp->variant() == SUBT_OP) {
-        if (exp->rhs() && exp->rhs()->variant() == INT_VAL) {
-            *end = exp->lhs();
-            *coef = -exp->rhs()->valueInteger();
-            return true;
-        }
-    }
-    if (exp->variant() == ADD_OP) {
-        if (exp->lhs() && exp->lhs()->variant() == INT_VAL) {
-            *end = exp->rhs();
-            *coef = exp->lhs()->valueInteger();
-            return true;
-        }
-        if (exp->rhs() && exp->rhs()->variant() == INT_VAL) {
-            *end = exp->lhs();
-            *coef = exp->lhs()->valueInteger();
-            return true;
-        }
-    }
-    return false;
-}
-
-CArrayVarEntryInfo::CArrayVarEntryInfo(SgSymbol* s, SgArrayRefExp* r) : CVarEntryInfo(s)
-{
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 16);
-#endif
-    // TODO: need to check all alhorithm!!
-    disabled = true;
-
-    if (!r)
-        subscripts = 0;
-    else
-        subscripts = r->numberOfSubscripts();
-    if (subscripts)
-        data.resize(subscripts);    
-
-    for (int i = 0; i < subscripts; i++) 
-    {
-        data[i].defined = false;
-        data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = 0;
-        data[i].step = 1;
-        data[i].left_bound = data[i].right_bound = NULL;
-        data[i].coefs[0] = data[i].coefs[1] = 0;
-        data[i].loop = NULL;
-#if __SPF
-        const vector<int*> coefs = getAttributes<SgExpression*, int*>(r->subscript(i), set<int>{ INT_VAL });
-        const vector<SgStatement*> fs = getAttributes<SgExpression*, SgStatement*>(r->subscript(i), set<int>{ FOR_NODE });
-        if (fs.size() == 1) 
-        {
-            if (data[i].loop != NULL) 
-            {
-                if (coefs.size() == 1) 
-                {
-                    data[i].defined = true;
-                    data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = coefs[0][1];
-                    data[i].coefs[0] = coefs[0][0];
-                    data[i].coefs[1] = coefs[0][1];
-                    data[i].step = coefs[0][0];
-                    int tmp;
-
-                    SgExpression *et;
-                    if (GetExpressionAndCoefficientOfBound(data[i].loop->l, &et, &tmp)) 
-                    {
-                        data[i].left_bound = et;
-                        data[i].bound_modifiers[0] += tmp;
-                    }
-                    else 
-                        data[i].left_bound = data[i].loop->l;
-                    
-                    if (GetExpressionAndCoefficientOfBound(data[i].loop->r, &et, &tmp)) 
-                    {
-                        data[i].right_bound = et;
-                        data[i].bound_modifiers[1] += tmp;
-                    }
-                    else 
-                        data[i].right_bound = data[i].loop->r;                    
-                }
-            }
-        }
-#endif
-        if (!data[i].defined) 
-        {
-            SgExpression* ex = r->subscript(i);
-            if (ex->variant() == INT_VAL) 
-            {
-                data[i].bound_modifiers[0] = ex->valueInteger();
-                data[i].bound_modifiers[1] = ex->valueInteger();
-                data[i].defined = true;
-            }
-            else 
-            {
-                data[i].bound_modifiers[0] = 0;
-                data[i].bound_modifiers[1] = 0;
-                data[i].left_bound = data[i].right_bound = ex;
-                data[i].defined = true;
-            }
-        }
-    }
-}
-
-CArrayVarEntryInfo::CArrayVarEntryInfo(SgSymbol *s, int sub, int ds, const vector<ArraySubscriptData> &d) 
-                                       : CVarEntryInfo(s), subscripts(sub), disabled(ds)
-{ 
-#if __SPF
-    addToCollection(__LINE__, __FILE__, this, 16);
-#endif
-    if (sub > 0) 
-        data = d;
-}
-
-VarItem* VarSet::GetArrayRef(CArrayVarEntryInfo* info)
-{
-    VarItem* it = list;
-    while (it != NULL) {
-        CVarEntryInfo* v = it->var;
-        if (v->GetVarType() == VAR_REF_ARRAY_EXP) {
-            if (OriginalSymbol(info->GetSymbol()) == OriginalSymbol(v->GetSymbol()))
-                return it;
-        }
-        it = it->next;
-    }
-    return NULL;
-}
-
-void CArrayVarEntryInfo::RegisterUsage(VarSet *def, VarSet *use, SgStatement *st)
-{
-    VarItem *it = def->GetArrayRef(this);
-    CArrayVarEntryInfo *add = this;
-    if (it != NULL) 
-        add = *this - *(CArrayVarEntryInfo*)(it->var);
-    
-    if (use != NULL && add != NULL && add->HasActiveElements()) 
-        use->addToSet(add, st);
-    
-    if (add != this)
-        delete add;
-}
-
-CArrayVarEntryInfo& CArrayVarEntryInfo::operator-=(const CArrayVarEntryInfo& b)
-{
-    if (subscripts == 0)
-    {
-        if (b.HasActiveElements()) 
-            disabled = true;        
-        return *this;
-    }
-
-    if (b.subscripts == 0) 
-    {
-        if (HasActiveElements()) 
-            MakeInactive();        
-        return *this;
-    }
-
-    if (subscripts != b.subscripts || !data.size() || !b.data.size() || !(data[0].defined) || !(b.data[0].defined)) 
-        return *this;
-    
-    for (int i = 0; i < subscripts; i++) 
-    {
-        if (b.data[i].left_bound == NULL) 
-        {
-            if (data[i].left_bound && data[i].left_bound->variant() == INT_VAL) 
-            {
-                if (data[i].left_bound->valueInteger() + data[i].bound_modifiers[0] == b.data[i].bound_modifiers[0]) 
-                {
-                    data[i].bound_modifiers[0]++;
-                    continue;
-                }
-            }
-        }
-
-        if (data[i].left_bound == NULL && b.data[i].left_bound == NULL &&
-            data[i].right_bound == NULL && b.data[i].right_bound == NULL) 
-        {
-            if (data[i].bound_modifiers[0] < b.data[i].bound_modifiers[0]) 
-            {
-                data[i].bound_modifiers[1] = b.data[i].bound_modifiers[0] - 1;
-                continue;
-            }
-
-            if (data[i].bound_modifiers[1] > b.data[i].bound_modifiers[1]) 
-            {
-                data[i].bound_modifiers[0] = b.data[i].bound_modifiers[1] + 1;
-                continue;
-            }
-            data[i].defined = false;
-        }
-
-        if (data[i].left_bound == b.data[i].left_bound && data[i].bound_modifiers[0] < b.data[i].bound_modifiers[0]) 
-        {
-            data[i].bound_modifiers[0] = data[i].bound_modifiers[0];
-            data[i].bound_modifiers[1] = b.data[i].bound_modifiers[0] - 1;
-            data[i].right_bound = data[i].left_bound;
-        }
-
-        if (data[i].right_bound == b.data[i].right_bound && data[i].bound_modifiers[1] > b.data[i].bound_modifiers[1]) 
-        {
-            data[i].bound_modifiers[0] = b.data[i].bound_modifiers[1] + 1;
-            data[i].bound_modifiers[1] = data[i].bound_modifiers[1];
-            data[i].left_bound = data[i].right_bound;
-        }
-
-        if (b.data[i].left_bound == NULL && b.data[i].right_bound == NULL && 
-            (data[i].left_bound != NULL || data[i].right_bound != NULL))
-            continue;        
-        else 
-        {
-            data[i].bound_modifiers[0] = data[i].bound_modifiers[1] = 0;
-            data[i].left_bound = NULL;
-            data[i].right_bound = NULL;
-            data[i].defined = false;
-            //empty set
-        }
-    }
-    return *this;
-}
-
-CArrayVarEntryInfo* operator-(const CArrayVarEntryInfo& a, const CArrayVarEntryInfo& b)
-{
-    //return NULL;
-    CArrayVarEntryInfo* nv = (CArrayVarEntryInfo*)a.Clone();
-    *nv -= b;
-    return nv;
-}
-
-CArrayVarEntryInfo* operator+(const CArrayVarEntryInfo& a, const CArrayVarEntryInfo& b)
-{
-    CArrayVarEntryInfo* nv = (CArrayVarEntryInfo*)a.Clone();
-    *nv += b;
-    return nv;
-}
-
-void CArrayVarEntryInfo::RegisterDefinition(VarSet* def, VarSet* use, SgStatement* st)
-{
-    def->addToSet(this, st);
-    use->PossiblyAffectArrayEntry(this);
-}
-
-void VarSet::PossiblyAffectArrayEntry(CArrayVarEntryInfo* var)
-{
-    VarItem* it = GetArrayRef(var);
-    if (!it)
-        return;
-    ((CArrayVarEntryInfo*)(it->var))->ProcessChangesToUsedEntry(var);
-}
-
-void CArrayVarEntryInfo::ProcessChangesToUsedEntry(CArrayVarEntryInfo* var)
-{
-    if (disabled || var->disabled || subscripts != var->subscripts)
-        return;
-    for (int i = 0; i < subscripts; i++) 
-    {
-        if (!data[i].defined)
-            continue;
-
-        if (data[i].loop == var->data[i].loop && data[i].loop != NULL) 
-        {
-            if (data[i].coefs[0] == var->data[i].coefs[0])
-            {
-                if (data[i].coefs[1] < var->data[i].coefs[1]) 
-                {
-                    if (data[i].left_bound && data[i].left_bound->variant() == INT_VAL) 
-                    {
-                        data[i].bound_modifiers[0] = data[i].left_bound->valueInteger() + data[i].bound_modifiers[0];
-                        data[i].bound_modifiers[1] = data[i].left_bound->valueInteger() + var->data[i].coefs[1] - 1;
-                        data[i].left_bound = data[i].right_bound = NULL;
-                    }
-                    else 
-                    {
-                        //maybe add something, not sure
-                    }
-                }
-            }
-        }
-    }
-}
-
-CArrayVarEntryInfo& CArrayVarEntryInfo::operator*=(const CArrayVarEntryInfo& b)
-{
-    if (subscripts == 0)
-    {
-        if (b.HasActiveElements())
-            disabled = true;
-        return *this;
-    }
-
-    if (b.subscripts == 0)
-    {
-        if (HasActiveElements())
-            MakeInactive();
-        return *this;
-    }
-
-    //return *this;
-    if (subscripts != b.subscripts || subscripts == 0 || b.subscripts == 0 || !data.size() || !b.data.size() || !(data[0].defined) || !(b.data[0].defined)) 
-        return *this;
-    
-    for (int i = 0; i < subscripts; i++) 
-    {
-        if (b.disabled) 
-            data[i].left_bound = data[i].right_bound = NULL;
-        
-        if (data[i].left_bound == b.data[i].left_bound) 
-            data[i].bound_modifiers[0] = std::max(data[i].bound_modifiers[0], b.data[i].bound_modifiers[0]);
-        
-        if (data[i].right_bound == b.data[i].right_bound) 
-            data[i].bound_modifiers[1] = std::min(data[i].bound_modifiers[1], b.data[i].bound_modifiers[1]);        
-    }
-    return *this;
-}
-
-CArrayVarEntryInfo& CArrayVarEntryInfo::operator+=(const CArrayVarEntryInfo& b)
-{
-    if (subscripts == 0)
-    {
-        if (b.HasActiveElements())
-            disabled = true;
-        return *this;
-    }
-
-    if (b.subscripts == 0)
-    {
-        if (HasActiveElements())
-            MakeInactive();
-        return *this;
-    }
-
-    //return *this;
-    if (disabled && !b.disabled && b.data.size()) 
-    {
-        for (int i = 0; i < subscripts; i++)
-            data[i] = b.data[i];
-        disabled = false;
-        return *this;
-    }
-
-    if (subscripts != b.subscripts || subscripts == 0 || b.subscripts == 0 || !data.size() || !b.data.size() || disabled || b.disabled) 
-        return *this;
-    
-    for (int i = 0; i < subscripts; i++) 
-    {
-
-        if (data[i].left_bound == b.data[i].left_bound) 
-            data[i].bound_modifiers[0] = std::min(data[i].bound_modifiers[0], b.data[i].bound_modifiers[0]);
-        
-        if (data[i].right_bound == b.data[i].right_bound) 
-            data[i].bound_modifiers[1] = std::max(data[i].bound_modifiers[1], b.data[i].bound_modifiers[1]);
-        
-        if (data[i].left_bound == NULL && data[i].right_bound == NULL && (b.data[i].left_bound != NULL || b.data[i].right_bound != NULL)) 
-        {
-            const ArraySubscriptData &tmp = data[i];
-            data[i] = b.data[i];
-            if (data[i].left_bound && data[i].left_bound->variant() == INT_VAL) 
-            {
-                if (tmp.bound_modifiers[1] == data[i].left_bound->valueInteger() + data[i].bound_modifiers[0] - 1) 
-                    data[i].bound_modifiers[0] -= (1 + tmp.bound_modifiers[1] - tmp.bound_modifiers[0]);
-                
-            }
-
-            if (data[i].right_bound && data[i].right_bound->variant() == INT_VAL) 
-            {
-                if (tmp.bound_modifiers[0] == data[i].left_bound->valueInteger() + data[i].bound_modifiers[1] + 1) 
-                    data[i].bound_modifiers[1] += (1 + tmp.bound_modifiers[1] - tmp.bound_modifiers[0]);                
-            }
-        }
-    }
-    return *this;
-}
-
-void VarSet::RemoveDoubtfulCommonVars(AnalysedCallsList* call)
-{
-    VarItem* it = list;
-    VarItem* prev = NULL;
-    while (it != NULL) {
-        CommonDataItem* d = pCommons->IsThisCommonVar(it, call);
-        if (d && pCommons->CanHaveNonScalarVars(d)) {
-            if (prev == NULL) {
-                it = it->next;
-                delete list;
-                list = it;
-            }
-            else {
-                prev->next = it->next;
-                delete it;
-                it = prev->next;
-            }
-            continue;
-        }
-        prev = it;
-        it = it->next;
-    }
-}
-
-int VarSet::count()
-{
-    VarItem* it = list;
-    int t = 0;
-    while (it != NULL) {
-        it = it->next;
-        t++;
-    }
-    return t;
-}
-
-void VarSet::LeaveOnlyRecords()
-{
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL) {
-        if (p->var->GetVarType() == VAR_REF_RECORD_EXP) {
-            CVarEntryInfo* rrec = p->var->GetLeftmostParent();
-            CVarEntryInfo* old = p->var;
-            if (old->RemoveReference())
-                delete old;
-            if (!belongs(rrec)) {
-                p->var = rrec;
-                prev = p;
-            }
-            else {
-                if (prev == NULL)
-                    list = list->next;
-                else
-                {
-                    prev->next = p->next;
-                    delete(p);
-                    p = prev;
-                }
-            }
-        }
-        else {
-            prev = p;
-        }
-        p = p->next;
-    }
-}
-
-VarItem* VarSet::belongs(const CVarEntryInfo* var, bool os)
-{
-    VarItem* l = list;
-    while (l != NULL)
-    {
-        if ((*l->var == *var))
-            return l;
-        if (os && OriginalSymbol(l->var->GetSymbol()) == OriginalSymbol(var->GetSymbol()))
-            return l;
-        l = l->next;
-    }
-    return NULL;
-}
-
-VarItem* VarSet::belongs(SgSymbol* s, bool os)
-{
-    VarItem* l = list;
-    while (l != NULL)
-    {
-        if ((l->var->GetSymbol() == s))
-            if (l->var->GetVarType() == VAR_REF_ARRAY_EXP)
-                return ((CArrayVarEntryInfo*)(l->var))->HasActiveElements() ? l : NULL;
-            return l;
-        if (os && OriginalSymbol(l->var->GetSymbol()) == OriginalSymbol(s))
-            return l;
-        l = l->next;
-    }
-    return NULL;
-}
-
-/*
-VarItem* VarSet::belongs(SgVarRefExp* var, bool os)
-{
-    return belongs(var->symbol(), os);
-}
-*/
-
-bool VarSet::equal(VarSet* p2)
-{
-    if (p2 == NULL)
-        return false;
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {
-        if (!p2->belongs(p->var) && (p->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(p->var))->HasActiveElements()))
-            return false;
-        p = p->next;
-    }
-    p = p2->list;
-    while (p != NULL) {
-        if (!belongs(p->var) && (p->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(p->var))->HasActiveElements()))
-            return false;
-        p = p->next;
-    }
-    return true;
-}
-
-void VarSet::print()
-{
-    VarItem* l = list;
-    while (l != NULL)
-    {
-        if (l->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(l->var))->HasActiveElements())
-            printf("%s ", l->var->GetSymbol()->identifier());
-#if PRIVATE_GET_LAST_ASSIGN
-        printf("last assignments: %d\n", l->lastAssignments.size());
-        for (list<SgStatement*>::iterator it = l->lastAssignments.begin(); it != l->lastAssignments.end(); it++){
-            if (*it)
-                printf("%s", (*it)->unparse());
-        }
-#endif
-        l = l->next;
-    }
-    putchar('\n');
-}
-
-void VarSet::addToSet(CVarEntryInfo* var, SgStatement* source, CVarEntryInfo* ov)
-{
-    bool add = false;
-    if (var->GetVarType() != VAR_REF_ARRAY_EXP) {
-        VarItem* p = belongs(var, false);
-        add = p == NULL;
-#if PRIVATE_GET_LAST_ASSIGN
-        p->lastAssignments.clear();
-        p->lastAssignments.push_back(source);
-#endif
-        //delete p->lastAssignments;
-        //p->lastAssignments = new CLAStatementItem();
-        //p->lastAssignments->stmt = source;
-        //p->lastAssignments->next = NULL;
-    }
-    else {
-        CArrayVarEntryInfo* av = (CArrayVarEntryInfo*)var;
-        VarItem* p = GetArrayRef(av);
-        if (p == NULL)
-            add = true;
-        else {
-            CArrayVarEntryInfo* fv = (CArrayVarEntryInfo*)p->var;
-            *fv += *av;
-        }
-    }
-    if (add) {
-        VarItem* p = new VarItem();
-        p->var = var->Clone();
-        p->ov = ov;
-        p->next = list;
-        p->file_id = current_file_id;
-        list = p;
-    }
-}
-
-void VarSet::intersect(VarSet* set, bool la, bool array_mode = false)
-{
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {        
-        VarItem* n = set->belongs(p->var);
-        if (!n)
-        {
-            if (!array_mode || p->var->GetVarType() == VAR_REF_VAR_EXP) {
-                if (prev == NULL)
-                    list = list->next;
-                else
-                {
-                    prev->next = p->next;
-                    delete(p);
-                    p = prev;
-                }
-            }
-        }
-        else {
-#if PRIVATE_GET_LAST_ASSIGN
-            if (la)
-                p->lastAssignments.insert(p->lastAssignments.end(), n->lastAssignments.begin(), n->lastAssignments.end());
-#endif
-            if (p->var->GetVarType() == VAR_REF_ARRAY_EXP) {
-                if (!array_mode)
-                    *(CArrayVarEntryInfo*)(p->var) *= *(CArrayVarEntryInfo*)(n->var);
-                else
-                    *(CArrayVarEntryInfo*)(p->var) += *(CArrayVarEntryInfo*)(n->var);
-            }
-            prev = p;
-        }
-        p = p->next;
-    }
-    
-}
-
-VarItem* VarSet::getFirst()
-{
-    return list;
-}
-
-void VarSet::remove(const CVarEntryInfo* var)
-{
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {
-        if (var == (p->var))
-        {
-            if (prev == NULL) {
-                VarItem* t = list;
-                list = list->next;
-                delete(t);
-                p = list;
-
-            }
-            else
-            {
-                prev->next = p->next;
-                delete(p);
-                p = prev->next;
-            }
-        }
-        else {
-            prev = p;
-            p = p->next;
-        }
-    }
-}
-
-void VarSet::minus(VarSet* set, bool complete)
-{
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {
-        VarItem* d = set->belongs(p->var);
-        if (d && (p->var->GetVarType() != VAR_REF_ARRAY_EXP || ((CArrayVarEntryInfo*)(d->var))->HasActiveElements()))
-        {
-            if (p->var->GetVarType() == VAR_REF_ARRAY_EXP && !complete) {
-                *(CArrayVarEntryInfo*)(p->var) -= *(CArrayVarEntryInfo*)(d->var);
-                prev = p;
-            }
-            else if (prev == NULL)
-                list = list->next;
-            else
-            {
-                prev->next = p->next;
-                delete(p);
-                p = prev;
-            }
-        }
-        else
-            prev = p;
-
-        p = p->next;
-    }
-}
-
-bool VarSet::RecordBelong(CVarEntryInfo* rec) 
-{
-    if (rec->GetVarType() != VAR_REF_RECORD_EXP)
-        return false;
-    CRecordVarEntryInfo* rrec = static_cast<CRecordVarEntryInfo*>(rec);
-    CVarEntryInfo* lm = rrec->GetLeftmostParent();
-    VarItem* p = list;
-    while (p != NULL) {
-        if (*lm == *(p->var->GetLeftmostParent()))
-            return true;
-        p = p->next;
-    }
-    return false;
-}
-
-void VarSet::minusFinalize(VarSet* set, bool complete)
-{
-    minus(set, complete);
-    VarItem* p = list;
-    VarItem* prev = NULL;
-    while (p != NULL)
-    {
-        if (set->RecordBelong(p->var)) {
-            {
-                if (prev == NULL)
-                    list = list->next;
-                else
-                {
-                    prev->next = p->next;
-                    delete(p);
-                    p = prev;
-                }
-            }
-        }
-        else
-            prev = p;
-
-        p = p->next;
-    }
-}
-
-unsigned int counter = 0;
-
-CLAStatementItem::~CLAStatementItem()
-{
-#if __SPF
-    removeFromCollection(this);
-#endif
-    if (next)
-        delete next;
-}
-
-CLAStatementItem* CLAStatementItem::GetLast()
-{
-    if (next == NULL)
-        return this;
-    return next->GetLast();
-}
-
-void VarSet::unite(VarSet* set, bool la)
-{
-    VarItem* arg2 = set->list;
-    while (arg2 != NULL)
-    {
-        VarItem* n = belongs(arg2->var);
-        if (!n)
-        {
-            n = new VarItem();
-            if (arg2->var->GetVarType() == VAR_REF_ARRAY_EXP)
-                n->var = arg2->var->Clone();
-            else {
-                n->var = arg2->var;
-                n->var->AddReference();
-            }
-            n->ov = arg2->ov;
-            n->next = list;
-            n->file_id = arg2->file_id;
-#if PRIVATE_GET_LAST_ASSIGN
-            if (la)
-                n->lastAssignments = arg2->lastAssignments;
-#endif
-            list = n;
-        }
-        else {
-#if PRIVATE_GET_LAST_ASSIGN
-            if (la) {
-                //n->lastAssignments.insert(n->lastAssignments.end(), arg2->lastAssignments.begin(), arg2->lastAssignments.end());
-                //n->lastAssignments.splice(n->lastAssignments.end(), arg2->lastAssignments);
-                //n->lastAssignments->GetLast()->next = arg2->lastAssignments;
-                n->lastAssignments = arg2->lastAssignments;
-            }
-#endif
-            //counter++;
-            //if (counter % 100 == 0)
-                //printf("%d!\n", counter);
-            if (n->var->GetVarType() == VAR_REF_ARRAY_EXP) {
-                *(CArrayVarEntryInfo*)(n->var) += *(CArrayVarEntryInfo*)(arg2->var);
-            }
-        }
-        arg2 = arg2->next;
-    }
-}
-
-
-
-void CBasicBlock::addToPrev(CBasicBlock* bb, bool for_jump_flag, bool c, ControlFlowItem* check)
-{
-    BasicBlockItem* n = new BasicBlockItem();
-    n->block = bb;
-    n->next = prev;
-    n->for_jump_flag = for_jump_flag;
-    n->cond_value = c;
-    n->jmp = check;
-    prev = n;
-}
-
-void CBasicBlock::addToSucc(CBasicBlock* bb, bool for_jump_flag, bool c, ControlFlowItem* check)
-{
-    BasicBlockItem* n = new BasicBlockItem();
-    n->block = bb;
-    n->for_jump_flag = for_jump_flag;
-    n->next = succ;
-    n->cond_value = c;
-    n->jmp = check;
-    succ = n;
-}
-
-#if ACCAN_DEBUG
-
-void ControlFlowItem::printDebugInfo()
-{
-    if (jmp == NULL && stmt == NULL && func != NULL)
-        printf("FUNCTION CALL: %s\n", func->unparse());
-    if (jmp == NULL)
-        if (stmt != NULL)
-            if (label != NULL)
-                printf("%d: %s %s %s lab %4d %s", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id(), stmt->unparse());
-            else
-                printf("%d: %s %s %s          %s", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", stmt->unparse());
-        else
-            if (label != NULL)
-                printf("%d: %s %s %s lab %4d \n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id());
-            else
-                printf("%d: %s %s %s         \n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ");
-    else
-        if (expr == NULL)
-            if (label != NULL)
-                printf("%d: %s %s %s lab %4d       goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id(), jmp->getStmtNo());
-            else
-                printf("%d: %s %s %s                goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", jmp->getStmtNo());
-        else
-            if (label != NULL)
-                printf("%d: %s %s %s lab %4d       if %s goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", label->id(), expr->unparse(), jmp->getStmtNo());
-            else
-                printf("%d: %s %s %s                if %s goto %d\n", stmtNo, this->isLeader() ? "L" : " ", this->IsParloopStart() ? "S" : " ", this->IsParloopEnd() ? "E" : " ", expr->unparse(), jmp->getStmtNo());
-}
-
-static void printControlFlowList(ControlFlowItem* list, ControlFlowItem* last)
-{
-
-    printf("DEBUG PRINT START\n");
-    unsigned int stmtNo = 0;
-    ControlFlowItem* list_copy = list;
-    while (list != NULL )
-    {
-        list->setStmtNo(++stmtNo);
-        if (list == last)
-            break;
-        list = list->getNext();
-    }
-
-    list = list_copy;
-    while (list != NULL)
-    {
-        list->printDebugInfo();
-        if (list == last)
-            break;
-        list = list->getNext();
-    }
-    printf("DEBUG PRINT END\n\n");
-}
-#endif
-
-void CallData::printControlFlows()
-{
-#if ACCAN_DEBUG
-    AnalysedCallsList* l = calls_list;
-    while (l != NULL) {
-        if (!l->isIntrinsic && l->graph != NULL && l->header != NULL) {
-            ControlFlowGraph* g = l->graph;
-            SgStatement* h = l->header;
-            printf("CFI for %s\n\n" ,h->symbol()->identifier());
-            if (g != NULL) {
-                printControlFlowList(g->getCFI());
-            }
-            else
-                printf("ERROR: DOES NOT HAVE CFI\n");
-        }
-        l = l->next;
-    }
-#endif
-}
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_data.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_data.cpp
deleted file mode 100644
index b4d0b4c..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_data.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "leak_detector.h"
-
-#include "acc_data.h"
-
-// global data for ACC files
-
-bool READ = false;
-bool WRITE = true;
-bool dontGenConvertXY = false;
-bool oneCase = false;
-int ACROSS_MOD_IN_KERNEL = 0;
-int DVM_DEBUG_LVL = 0;
-const int rtTypes[] = { rt_INT, rt_LLONG };
-
-std::set<std::string> intrinsicF;
-std::set<std::string> intrinsicDoubleT;
-std::set<std::string> intrinsicFloatT;
-std::set<std::string> intrinsicInt4T;
-
-std::map<char, const char*> SpecialSymbols;
-std::vector <SgFunctionCallExp* > RTC_FCall;
-std::vector<SgExpression* > RTC_FArgs;
-std::vector<SgFunctionCallExp* > RTC_FKernelArgs;
-std::vector<SgSymbol*> newVars;
-std::stack<SgStatement*> CopyOfBody;
-
-const char *funcDvmhConvXYname = "dvmh_convert_XY";
-Loop *currentLoop = NULL;
-unsigned countKernels = 2;
-
-int number_of_loop_line = 0; // for TRACE in acc_f2c.cpp
-SgSymbol *s_indexType_int = NULL, *s_indexType_long = NULL, *s_indexType_llong = NULL;
-SgType *indexType_int = NULL, *indexType_long = NULL, *indexType_llong = NULL;
-
-const char *declaration_cmnt;
-int loc_el_num;
-SgStatement *cur_in_mod, *cur_in_kernel;
-SgStatement *dvm_parallel_dir, *loop_body;
-SgStatement *kernel_st;
-SgExpression *private_list, *uses_list, *kernel_index_var_list, *formal_red_grid_list;
-SgSymbol *kernel_symb, *s_overall_blocks;
-SgType *t_dim3;
-SgSymbol *s_threadidx, *s_blockidx, *s_blockdim, *s_griddim, *s_blocks_k;
-
-//------ C ----------
-SgStatement *block_C, *block_C_Cuda, *info_block;
-SgSymbol *s_DvmhLoopRef, *s_cudaStream, *s_cmplx, *s_dcmplx;
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c.cpp
deleted file mode 100644
index e64fd5f..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c.cpp
+++ /dev/null
@@ -1,3584 +0,0 @@
-#include "dvm.h"
-#include "calls.h"
-
-using std::map;
-using std::string;
-using std::vector;
-using std::pair;
-using std::set;
-using std::stack;
-using std::deque;
-using std::make_pair;
-
-#define TRACE 0
-
-// for non linear array list
-struct PrivateArrayInfo
-{
-    string name;
-    int dimSize;
-    vector<SgExpression*> correctExp;
-    int typeRed;
-    reduction_operation_list *rsl;
-};
-
-struct FunctionParam
-{
-    const char *name;
-    int numParam;
-    void(*handler) (SgExpression*, SgExpression *&, const char*, int);
-
-    FunctionParam()
-    {
-        name = NULL;
-        numParam = 0;
-        handler = NULL;
-    }
-
-    FunctionParam(const char *name_, const int numParam_, void(*handler_) (SgExpression*, SgExpression *&, const char*, int))
-    {
-        name = name_;
-        numParam = numParam_;
-        handler = handler_;
-    }
-
-    void CallHandler(SgExpression *expr, SgExpression *&retExpr)
-    {
-        handler(expr, retExpr, name, numParam);
-    }
-};
-
-//global
-map <string, vector<vector<SgType*> > > interfaceProcedures;
-
-// extern 
-extern SgStatement *first_do_par;
-extern SgExpression *private_list;
-extern reduction_operation_list *red_struct_list;
-extern SgExpression *dvm_array_list;
-extern graph_node *node_list;
-
-// extern from acc_f2c_handlers.cpp
-extern void __convert_args(SgExpression *, SgExpression *&, SgExpression *&);
-extern void __cmplx_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __minmax_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __mod_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __iand_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __ior_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __ieor_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __arc_sincostan_d_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __atan2d_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __sindcosdtand_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __cotan_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __cotand_handler(SgExpression *, SgExpression *&, const char *name, int);
-extern void __ishftc_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int);
-extern void __merge_bits_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int);
-extern void __not_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int);
-extern void __poppar_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int);
-extern void __modulo_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int);
-
-// local 
-static map<string, FunctionParam> handlersOfFunction;
-static set<int> supportedVars;
-static map<string, SgSymbol*> fTableOfSymbols;
-static vector<PrivateArrayInfo> arrayInfo;
-static set<long> labels_num;
-static map<string, vector<SgLabel*> > labelsExitCycle;
-static set<int> unSupportedVars;
-static int cond_generator;
-static SgStatement* curTranslateStmt;
-static map<string, SgSymbol*> autoTfmReplacing;
-
-static map<SgStatement*, vector<SgStatement*> > insertBefore;
-static map<SgStatement*, vector<SgStatement*> > insertAfter;
-
-static map<SgStatement*, SgStatement*> replaced;
-static int arrayGenNum;
-static int SAPFOR_CONV = 0;
-
-#if TRACE
-static int lvl_convert_st = 0;
-#endif
-
-// functions
-void convertExpr(SgExpression*, SgExpression*&);
-void createNewFCall(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs);
-static bool isPrivate(const string& array);
-
-#if TRACE
-void printfSpaces(int num)
-{
-    for (int i = 0; i < num; ++i)
-        printf(" ");
-}
-#endif
-
-static void saveInsertBeforeAfter(map<SgStatement*, vector<SgStatement*> > &after, map<SgStatement*, vector<SgStatement*> > &before)
-{
-    if (!options.isOn(AUTO_TFM))
-        return;
-    
-    before = insertBefore;
-    insertBefore.clear();
-
-    after = insertAfter;
-    insertAfter.clear();    
-}
-
-static void restoreInsertBeforeAfter(map<SgStatement*, vector<SgStatement*> >& after, map<SgStatement*, vector<SgStatement*> >& before)
-{
-    if (!options.isOn(AUTO_TFM))
-        return;
-    
-    insertBefore = before;
-    insertAfter = after;
-}
-
-static void copyToStack(stack<SgStatement*> &newBody, const map<SgStatement*, vector<SgStatement*> > &cont)
-{
-    if (!options.isOn(AUTO_TFM))
-        return;
-
-    if (cont.size())
-        for (map<SgStatement*, vector<SgStatement*> >::const_iterator itI = cont.begin(); itI != cont.end(); itI++)
-            for (int z = 0; z < itI->second.size(); ++z)
-                newBody.push(itI->second[z]);
-}
-
-static bool isInPrivate(const string& arr)
-{
-    for (int z = 0; z < arrayInfo.size(); ++z)
-    {
-        if (arrayInfo[z].name == arr)
-            return true;
-    }
-    return false;
-}
-
-static char* getNestCond()
-{
-    char buf[32];
-    buf[0] = '\0';
-    sprintf(buf, "%d", cond_generator);
-    cond_generator++;
-    char *str = new char[strlen("cond_") + strlen(buf) + 2];
-    str[0] = '\0';
-    strcat(str, "cond_");
-    strcat(str, buf);
-    return str;
-}
-
-static char* getNewCycleVar(const char *oldVar)
-{
-    char *str = new char[strlen(oldVar) + 3];
-    str[0] = '\0';
-    strcat(str, "__");
-    strcat(str, oldVar);
-    return str;
-}
-
-static bool inNewVars(const char *name)
-{
-    bool ret = false;
-    for (size_t i = 0; i < newVars.size(); ++i)
-    {
-        if (strcmp(name, newVars[i]->identifier()) == 0)
-        {
-            ret = true;
-            break;
-        }
-    }
-    return ret;
-}
-
-static bool isNullSubscripts(SgExpression *subs)
-{
-    if (subs && subs->attributeValue(0, NULL_SUBSCRIPTS))
-        return true;
-    else
-        return false;
-}
-
-static void addInListIfNeed(SgSymbol *tmp, int type, reduction_operation_list *tmpR)
-{
-    stack<SgExpression*> allArraySub;
-    stack<pair<SgExpression*, SgExpression*> > allArraySubConv;
-    if (tmp)
-    {
-        if (isSgArrayType(tmp->type()))
-        {
-            if (isSgArrayType(tmp->type())->dimension() > 0)
-            {
-                SgExpression *dimList = isSgArrayType(tmp->type())->getDimList();
-                PrivateArrayInfo t;
-                t.dimSize = isSgArrayType(tmp->type())->dimension();
-
-                int rank = 0;
-                while (dimList)
-                {
-                    allArraySub.push(dimList->lhs());
-                    allArraySubConv.push(make_pair(LowerShiftForArrays(tmp, rank, type), UpperShiftForArrays(tmp, rank)));
-                    ++rank;
-                    dimList = dimList->rhs();
-                }
-
-                dimList = isSgArrayType(tmp->type())->getDimList();
-                rank = 0;
-
-                while (dimList)
-                {
-                    SgExpression *ex = allArraySub.top();
-                    bool ddot = false;
-                    if (ex->variant() == DDOT && ex->lhs() || IS_ALLOCATABLE(tmp))
-                        ddot = true;
-                    t.correctExp.push_back(LowerShiftForArrays(tmp, rank, type));
-
-                    // swap array's dimentionss
-                    if (inNewVars(tmp->identifier()))
-                    {
-                        if (ddot)
-                            dimList->setLhs(*allArraySubConv.top().second - *allArraySubConv.top().first + *new SgValueExp(1));
-                        else
-                            dimList->setLhs(allArraySubConv.top().first);
-                    }
-
-                    allArraySub.pop();
-                    allArraySubConv.pop();
-                    ++rank;
-                    dimList = dimList->rhs();
-                }
-                t.name = tmp->identifier();
-                // 0 for private, 1 for loc and redudction variables
-                t.typeRed = type;
-                t.rsl = tmpR;
-                arrayInfo.push_back(t);
-            }
-        }
-    }
-}
-
-static void addRandStateIfNeeded(const string& name)
-{
-    SgExpression* list = private_list;
-    while (list)
-    {
-        if (list->lhs()->symbol()->identifier() == name)
-            return;
-        list = list->rhs();
-    }
-
-    SgSymbol* uint4_t = new SgSymbol(TYPE_NAME, "uint4", *(current_file->firstStatement()));
-
-    SgFieldSymb* sx = new SgFieldSymb("x", *SgTypeInt(), *uint4_t);
-    SgFieldSymb* sy = new SgFieldSymb("y", *SgTypeInt(), *uint4_t);
-    SgFieldSymb* sz = new SgFieldSymb("z", *SgTypeInt(), *uint4_t);
-    SgFieldSymb* sw = new SgFieldSymb("w", *SgTypeInt(), *uint4_t);
-
-    SYMB_NEXT_FIELD(sx->thesymb) = sy->thesymb;
-    SYMB_NEXT_FIELD(sy->thesymb) = sz->thesymb;
-    SYMB_NEXT_FIELD(sz->thesymb) = sw->thesymb;
-    SYMB_NEXT_FIELD(sw->thesymb) = NULL;
-
-    SgType* tstr = new SgType(T_STRUCT);
-    TYPE_COLL_FIRST_FIELD(tstr->thetype) = sx->thesymb;
-    uint4_t->setType(tstr);
-
-    SgType* td = new SgType(T_DERIVED_TYPE);
-    TYPE_SYMB_DERIVE(td->thetype) = uint4_t->thesymb;
-    TYPE_SYMB(td->thetype) = uint4_t->thesymb;
-
-    newVars.push_back(new SgSymbol(VARIABLE_NAME, name.c_str(), td, mod_gpu));
-    SgExprListExp* e = new SgExprListExp(*new SgVarRefExp(newVars.back()));
-    e->setRhs(private_list);
-    private_list = e;
-}
-
-void swapDimentionsInprivateList(SgExpression *pList)
-{
-    private_list = pList;
-    red_struct_list = NULL;
-    swapDimentionsInprivateList();
-    private_list = NULL;
-}
-
-void swapDimentionsInprivateList()
-{
-    SgExpression *tmp = private_list;
-    arrayInfo.clear();
-
-    while (tmp)
-    {
-        addInListIfNeed(tmp->lhs()->symbol(), 0, NULL);
-        tmp = tmp->rhs();
-    }
-
-    reduction_operation_list *tmpR = red_struct_list;
-    while (tmpR)
-    {
-        SgSymbol *tmp = NULL;
-        tmp = tmpR->locvar;
-        addInListIfNeed(tmp, 1, tmpR);
-
-        tmp = tmpR->redvar;
-        addInListIfNeed(tmp, 1, tmpR);
-
-        tmpR = tmpR->next;
-    }
-}
-
-//return 'true' if simple operator, 'false' - complex operator
-static bool checkLastNode(int var)
-{
-    bool ret = true;
-    if (var == FOR_NODE)
-        ret = false;
-    else if (var == WHILE_NODE)
-        ret = false;
-    else if (var == SWITCH_NODE)
-        ret = false;
-    /*else if (var == LOGIF_NODE)
-        ret = false;
-        else if (var == ARITHIF_NODE)
-        ret = false;*/
-    else if (var == IF_NODE)
-        ret = false;
-
-    return ret;
-}
-
-static void setControlLexNext(SgStatement* &currentSt)
-{
-    SgStatement *tmp = currentSt;
-    if (tmp->variant() == IF_NODE)
-    {
-        SgStatement *last = tmp->lastNodeOfStmt();
-        if (((SgIfStmt*)tmp)->falseBody())
-        {
-            last = ((SgIfStmt*)tmp)->falseBody();
-            for (;;)
-            {
-                if (last->variant() == ELSEIF_NODE)
-                {
-                    if (((SgIfStmt*)last)->falseBody())
-                        last = ((SgIfStmt*)last)->falseBody();
-                    else
-                    {
-                        last = last->lastNodeOfStmt();
-                        break;
-                    }
-                }
-                else
-                {
-                    last = last->controlParent()->lastNodeOfStmt();
-                    break;
-                }
-            }
-        }
-        else
-            last = tmp->lastNodeOfStmt();
-
-        currentSt = last->lexNext();
-    }
-    else if (tmp->variant() == FOR_NODE || tmp->variant() == WHILE_NODE || tmp->variant() == SWITCH_NODE)
-    {
-        if (checkLastNode(currentSt->lastNodeOfStmt()->variant()) == false)
-        {
-            currentSt = currentSt->lastNodeOfStmt();
-            setControlLexNext(currentSt);
-        }
-        else
-            currentSt = currentSt->lastNodeOfStmt()->lexNext();
-    }
-    else if (tmp->variant() == LOGIF_NODE || tmp->variant() == ARITHIF_NODE)
-        currentSt = ((SgIfStmt*)tmp)->lastNodeOfStmt()->lexNext();
-    else
-    {
-        //if (tmp->variant() != ASSIGN_STAT && tmp->variant() != CONT_STAT && tmp->variant() != GOTO_NODE)
-        //    printf("  [WARNING: acc_f2c.cpp, line %d] lexNext of %s variant.\n", __LINE__, tag[tmp->variant()]);
-        currentSt = currentSt->lexNext();
-    }
-}
-
-// create lables for EXIT and CYCLE statemets
-static void createNewLabel(vector<SgStatement*> &labSt, vector<SgLabel*> &lab, const char *name)
-{
-    char *str_cont = new char[64];
-    str_cont[0] = '\0';
-    strcat(str_cont, "label_cycle_");
-    strcat(str_cont, name);
-    
-    if (labelsExitCycle.find(str_cont) != labelsExitCycle.end())
-        lab = labelsExitCycle[str_cont];
-    else
-    {
-        SgLabel *lab_cont = GetLabel();
-        SgSymbol *symb_cont = new SgSymbol(LABEL_NAME, str_cont);
-        LABEL_SYMB(lab_cont->thelabel) = symb_cont->thesymb;
-
-        char *str_exit = new char[64];
-        str_exit[0] = '\0';
-        strcat(str_exit, "label_exit_");
-        strcat(str_exit, name);
-
-        SgLabel *lab_exit = GetLabel();
-        SgSymbol *symb_exit = new SgSymbol(LABEL_NAME, str_exit);
-        LABEL_SYMB(lab_exit->thelabel) = symb_exit->thesymb;
-
-        lab.push_back(lab_cont);
-        lab.push_back(lab_exit);
-
-        labelsExitCycle[string(str_cont)] = lab;
-    }
-    SgStatement *cycleSt = new SgStatement(LABEL_STAT);
-    BIF_LABEL_USE(cycleSt->thebif) = lab[0]->thelabel;
-
-    SgStatement *exitSt = new SgStatement(LABEL_STAT);
-    BIF_LABEL_USE(exitSt->thebif) = lab[1]->thelabel;
-
-    labSt.push_back(cycleSt);
-    labSt.push_back(exitSt);
-}
-
-static void createNewLabel(SgStatement* &labSt, SgLabel *lab)
-{
-    SgSymbol *symb;
-    int labDigit = (int)(lab->thelabel->stateno);
-
-    char *str = new char[32];
-    char *digit = new char[32];
-    str[0] = digit[0] = '\0';
-    strcat(str, "label_");
-    sprintf(digit, "%d", labDigit);
-    strcat(str, digit);
-
-    symb = new SgSymbol(LABEL_NAME, str);
-    LABEL_SYMB(lab->thelabel) = symb->thesymb;
-    labSt = new SgStatement(LABEL_STAT);
-    BIF_LABEL_USE(labSt->thebif) = lab->thelabel;
-}
-
-static void convertLabel(SgStatement *st, SgStatement * &ins, bool ret)
-{
-    SgLabel *lab = st->label();
-    SgStatement *labSt = NULL;
-    createNewLabel(labSt, lab);
-
-    if (ret)
-        ins = labSt;
-    else
-        st->insertStmtBefore(*labSt, *st->controlParent());
-}
-
-SgStatement* getInterfaceForCall(SgSymbol* s)
-{
-    SgStatement* searchStmt = cur_func->lexNext();
-    SgStatement* tmp;
-    string funcName = string(s->identifier());
-    enum {SEARCH_INTERFACE,CHECK_INTERFACE, FIND_NAME, SEARCH_INTERNAL,SEARCH_CONTAINS,UNSUCCESS};
-    int mode = SEARCH_CONTAINS;
-    
-    //search internal function
-    while(searchStmt&& mode!=UNSUCCESS)
-    {
-        switch(mode)
-        {
-        case SEARCH_CONTAINS:
-            if(searchStmt->variant() == CONTAINS_STMT)
-                mode = SEARCH_INTERNAL;
-            searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-            break;
-        case SEARCH_INTERNAL:
-            if(searchStmt->variant() == CONTROL_END)
-                mode = UNSUCCESS;
-            else if(string(searchStmt->symbol()->identifier()) == funcName)
-                return searchStmt;
-            else
-              searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-            break;         
-        }
-    }
-    searchStmt = cur_func->lexNext();
-    mode = SEARCH_INTERFACE;
-    //search interface in declare section
-    while(searchStmt && !isSgExecutableStatement(searchStmt) )
-    {
-        switch(mode)
-        {
-        case SEARCH_INTERFACE:
-            if(searchStmt->variant() != INTERFACE_STMT)
-                searchStmt = searchStmt->lexNext();
-            else
-                mode = CHECK_INTERFACE;
-            break;
-        case CHECK_INTERFACE:
-            if(searchStmt->symbol()&& string(searchStmt->symbol()->identifier()) != funcName)
-            {
-                searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-                mode = SEARCH_INTERFACE;
-            }
-            else
-            {
-                mode = FIND_NAME;
-                searchStmt = searchStmt->lexNext();
-            }
-            break;
-        case FIND_NAME:
-            if(searchStmt->variant() == FUNC_HEDR || searchStmt->variant() == PROC_HEDR)
-            {
-                if(string(searchStmt->symbol()->identifier()) == funcName)
-                    return searchStmt;
-                else
-                    searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-            }
-            else if(searchStmt->variant() == MODULE_PROC_STMT)
-            {
-                searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-            }
-            else if(searchStmt->variant() == CONTROL_END)
-            {
-                mode = SEARCH_INTERFACE;    
-                searchStmt = searchStmt->lexNext();
-            }
-            break;
-        }
-    }
-    return NULL;
-}
-
-//TODO: to be removed ??!!
-
-//SgExpression* makePresentExpr(string argName, SgStatement* header)
-//{
-//    int i = 0;
-//    while(header&&(header->variant() != FUNC_HEDR && header->variant()!=PROC_HEDR))
-//        header = header->controlParent();
-//    if(!header)
-//    {
-//        printf("  [EXPR ERROR: %s, line %d, user line %d] use PRESENT outside prcodedure or function  \"%s\"\n", __FILE__, __LINE__, first_do_par->lineNumber(), "****");
-//        return NULL;
-//    }
-//    SgExpression* args = header->expr(0)->lhs();
-//    while(args)
-//        if(string(args->lhs()->symbol()->identifier()) == argName)
-//        {
-//            SgExpression* presentExpr = &(*(new SgVarRefExp(header->expr(0)->lhs()->lhs()->symbol()) ) & *new SgExprListExp( *new SgValueExp(1) << *(new SgValueExp(i-1))));
-//            return presentExpr;
-//        }
-//        else
-//        {
-//            args = args->rhs();
-//            i++;
-//        }
-//    return NULL;
-//
-//}
-
-SgExpression* switchArgumentsByKeyword(const string& name, SgExpression* funcCall, SgStatement* funcInterface)
-{
-    //get list of arguments names
-    vector<string> listArgsNames;
-    SgFunctionSymb* s = (SgFunctionSymb*)funcInterface->symbol();
-    vector<SgExpression*> resultExprCall(s->numberOfParameters(), (SgExpression*)NULL);
-    int useKeywords = false;
-    int useOptional = false;
-    int useArray = false;
-
-    for (int i = 0; i < s->numberOfParameters(); ++i)
-    {
-        listArgsNames.push_back(s->parameter(i)->identifier());
-        if (s->parameter(i)->attributes() & OPTIONAL_BIT)
-            useOptional = true;
-    }
-
-    SgExpression* parseExpr;
-    if (funcCall->variant() == FUNC_CALL)
-        parseExpr = funcCall->lhs();
-    else
-        parseExpr = funcCall;
-
-    int curArgumentPos = 0;
-    while (parseExpr)
-    {
-        if (parseExpr->lhs()->variant() == KEYWORD_ARG)
-        {
-            useKeywords = true;
-            int newPos = 0;
-            string keyword = string(((SgKeywordValExp*)parseExpr->lhs()->lhs())->value());
-            while (listArgsNames[newPos] != keyword)
-                newPos++;
-
-            resultExprCall[newPos] = parseExpr->lhs()->rhs();
-        }
-        else if (useKeywords)
-            Error("Position argument after keyword", "", 650, first_do_par);
-        else
-            resultExprCall[curArgumentPos] = parseExpr->lhs();
-        curArgumentPos++;
-        parseExpr = parseExpr->rhs();
-    }
-
-    //check assumed form array
-    for (int i = 0; i < resultExprCall.size(); ++i)
-    {
-        SgSymbol* sarg = s->parameter(i);
-        if (isSgArrayType(sarg->type()))
-        {
-            int needChanged = true;
-            SgArrayType* arrT = (SgArrayType*)sarg->type();
-            int dims = arrT->dimension();
-            SgExpression* dimList = arrT->getDimList();
-            while (dimList)
-            {
-                if (dimList->lhs()->variant() != DDOT)
-                {
-                    needChanged = false;
-                    break;
-                }
-                else if (dimList->lhs()->rhs())
-                {
-                    needChanged = false;
-                    break;
-                }
-                dimList = dimList->rhs();
-            }
-
-            if (needChanged)
-            {
-                useArray = true;
-
-                SgArrayType* argType = (SgArrayType*)resultExprCall[i]->symbol()->type();
-                SgExprListExp* argInfo = (SgExprListExp*)argType->getDimList();
-                SgExpression* tmp;
-                int argDims = argType->dimension();
-
-                //TODO: 
-                if (argDims != dims)
-                {
-                    char buf[256];
-                    sprintf(buf, "Rank of the %d dummy and actual arguments of '%s' call is not equal", i, name.c_str());
-                    Error(buf, "", 651, first_do_par);
-                }
-
-                SgExpression* argList = NULL;
-                for (int j = MAX_DIMS; j >= 0; --j)
-                {
-                    if (argInfo->elem(j) == NULL)
-                        continue;
-                    //TODO: not checked!!                    
-                    if (j<dims)
-                    {
-                        SgExpression* val = Calculate(&(*UpperBound(resultExprCall[i]->symbol(), j) - *LowerBound(resultExprCall[i]->symbol(), j) + *LowerBound(s->parameter(i), j)));
-                        if (val != NULL)
-                            tmp = new SgExprListExp(*val);
-                        else
-                            tmp = new SgExprListExp(*new SgValueExp(int(0)));
-
-                        tmp->setRhs(argList);
-                        argList = tmp;
-                        val = LowerBound(s->parameter(i), j);
-                        if (val != NULL)
-                            tmp = new SgExprListExp(*val);
-                        else
-                            tmp = new SgExprListExp(*new SgValueExp(int(0)));
-                        tmp->setRhs(argList);
-                        argList = tmp;
-                    }
-                }
-                if (isPrivate(resultExprCall[i]->symbol()->identifier())) //isPrivateArrayDummy==1
-                {  
-                    resultExprCall[i] = new SgArrayRefExp(*resultExprCall[i]->symbol());
-                }
-                else
-                {
-                    SgArrayRefExp* arrRef = new SgArrayRefExp(*resultExprCall[i]->symbol());
-                    for (int j = 0; j < dims; ++j)
-                        arrRef->addSubscript(*new SgValueExp(0));
-
-                    tmp = new SgExprListExp(SgAddrOp(*arrRef));
-                    tmp->setRhs(argList);
-                    argList = tmp;
-                    SgSymbol* aa = s->parameter(i);
-                    SgTypeRefExp* typeExpr = new SgTypeRefExp(*C_Type(s->parameter(i)->type()));
-                    resultExprCall[i] = new SgFunctionCallExp(*((new SgDerivedTemplateType(typeExpr, new SgSymbol(TYPE_NAME, "s_array")))->typeName()), *argList);
-                    resultExprCall[i]->setRhs(typeExpr);
-                }
-            }
-        }
-    }
-
-    //change position in call expression if argument passed by keyword
-    if (useKeywords || useOptional || useArray)
-    {
-        int mask = 0;
-        SgExpression* maskExpr = new SgValueExp(int(0));
-        int bit = 1;
-        //change arg -> point to arg when arg is optional
-        for (int i = 0; i < resultExprCall.size() - 1; ++i)
-        {
-            SgSymbol* tmps = s->parameter(i);
-
-            //TODO: WTF ???!
-            if ((s->parameter(i)->attributes() & OPTIONAL_BIT) && resultExprCall[i] != NULL)
-            {
-                /*if(resultExprCall[i]->variant() == VAR_REF && resultExprCall[i]->symbol()->attributes()&OPTIONAL_BIT )
-                {
-                    SgFunctionSymb* fName = ((SgFunctionSymb *)resultExprCall[i]->symbol()->scope()->symbol());
-                    int pos = 0;
-                    for(int j = 0; j < fName->numberOfParameters(); ++j)
-                        if(string(fName->parameter(j)->identifier()) == string(resultExprCall[j]->symbol()->identifier()))
-                        {
-                            pos = j;
-                            break;
-                        }
-                        maskExpr = &(*maskExpr | (((*new SgVarRefExp(fName->parameter(0)) >> (*new SgValueExp(pos))) & *new SgValueExp(1)) << *new SgValueExp(i)));
-                }
-                else*/
-                // maskExpr = Calculate(&(*maskExpr | *new SgValueExp(int(1<<i))));
-            }
-            else if ((s->parameter(i)->attributes() & OPTIONAL_BIT) && resultExprCall[i] == NULL)
-            {
-                SgTypeRefExp* typeExpr = new SgTypeRefExp(*C_Type(s->parameter(i)->type()));
-                resultExprCall[i] = new SgFunctionCallExp(*((new SgDerivedTemplateType(typeExpr, new SgSymbol(TYPE_NAME, "optArg")))->typeName()));
-                resultExprCall[i]->setRhs(new SgExprListExp(*typeExpr));
-            }
-        }
-
-        SgExprListExp* expr = new SgExprListExp();
-        SgExprListExp* tmp = expr;
-        SgExprListExp* tmp2;
-        //insert info-argument at first position
-
-        //insert rguments
-        for (int i = 0; i < resultExprCall.size() - 1; ++i)
-        {
-            tmp->setLhs(resultExprCall[i]);
-            tmp->setRhs(new SgExprListExp());
-            tmp = (SgExprListExp*)tmp->rhs();
-        }
-
-        tmp->setLhs(resultExprCall[resultExprCall.size() - 1]);
-        if (funcCall->variant() == FUNC_CALL)
-            funcCall->setLhs(expr);
-        else
-            funcCall = expr;
-    }
-    return funcCall;
-}
-
-SgSymbol* createNewFunctionSymbol(const char *name)
-{
-    SgSymbol *symb = NULL;
-    if (name == NULL)
-        name = "__dvmh_tmp_symb";
-
-    if (fTableOfSymbols.find(name) == fTableOfSymbols.end())
-    {
-        symb = new SgSymbol(FUNCTION_NAME, name);
-        fTableOfSymbols[name] = symb;
-    }
-    else
-        symb = fTableOfSymbols[name];
-
-    return symb;
-}
-
-SgFunctionCallExp* createNewFCall(const char *name)
-{
-    SgSymbol *symb = createNewFunctionSymbol(name);
-    return new SgFunctionCallExp(*symb);
-}
-
-void createNewFCall(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *currArgs = ((SgFunctionCallExp *)expr)->args();
-    SgExpression **Arg = new SgExpression*[nArgs];
-    for (int i = 0; i < nArgs; ++i)
-    {
-        Arg[i] = currArgs->lhs();
-        convertExpr(Arg[i], Arg[i]);
-        currArgs = currArgs->rhs();
-    }
-
-    retExp = createNewFCall(name);
-    if (nArgs != 0)
-    {
-        for (int i = 0; i < nArgs; ++i)
-            ((SgFunctionCallExp*)retExp)->addArg(*Arg[i]);
-    }
-    else
-        ((SgFunctionCallExp*)retExp)->addArg(*expr);
-}
-
-static SgExpression* convertDvmAssign(SgExpression *copy, const vector<pair<SgSymbol*, SgSymbol*> >& symbs)
-{
-    SgExpression* list = copy->lhs()->lhs();
-    stack<SgExpression*> pointersToMul;
-    while (list)
-    {
-        if (list->variant() == MULT_OP)
-            pointersToMul.push(list);
-        else if (list->rhs() && list->rhs()->variant() == MULT_OP)
-            pointersToMul.push(list->rhs());
-        list = list->lhs();
-    }
-    for (int z = 0; z < symbs.size(); ++z)
-    {
-        SgSymbol* curr = symbs[z].first;
-        SgExpression* exp = pointersToMul.top();
-        pointersToMul.pop();
-        exp->setRhs(&(*exp->rhs() + *new SgVarRefExp(curr)));
-    }
-    return copy;
-}
-
-static SgForStmt* createFor(const vector<int>& dimSizes, const vector<pair<SgSymbol*, SgSymbol*> >& symbs, SgStatement *inner)
-{
-    SgForStmt* forSt = NULL;
-    for (int z = 0; z < dimSizes.size(); ++z)
-    {
-        SgSymbol* s = symbs[z].first;
-        SgSymbol* s_decl = symbs[z].second;
-
-        SgExpression* start = &SgAssignOp(*new SgVarRefExp(*s_decl), *new SgValueExp(0));
-        SgExpression* end = &(*new SgVarRefExp(*s) < *new SgValueExp(dimSizes[z]));
-        SgExpression* step = new SgUnaryExp(PLUSPLUS_OP, *new SgVarRefExp(*s));
-
-        forSt = new SgForStmt(start, end, step, forSt == NULL ? inner : forSt);
-    }
-    return forSt;
-}
-
-static pair<SgSymbol*, pair<vector<SgStatement*>, vector<SgStatement*> > > createForCopy(const vector<int> &dimSizes, SgExpression *dvmArray, bool in, bool out)
-{    
-    SgType* base = dvmArray->symbol()->type()->baseType();
-    SgForStmt* forSt = NULL, *forStInv = NULL;
-    SgStatement* inner = NULL;
-
-    vector<SgStatement*> ret;
-    vector<SgStatement*> retInv;
-
-    vector<pair<SgSymbol*, SgSymbol*> > symbs(dimSizes.size());
-
-    int total = 1;
-    for (int z = 0; z < dimSizes.size(); ++z)
-        total *= dimSizes[z];
-
-    SgArrayType* arrT = new SgArrayType(*base);
-    arrT->addDimension(new SgValueExp(total));
-
-    char buf[256];
-    sprintf(buf, "%d", arrayGenNum++);
-    SgSymbol* array = new SgSymbol(VARIABLE_NAME, (string("_tfm_arr_") + buf).c_str(), arrT, NULL);
-
-    for (int z = 0; z < dimSizes.size(); ++z)
-    {
-        sprintf(buf, "%d", z);
-        SgSymbol* s = new SgSymbol(VARIABLE_NAME, (string("_tfm__") + buf).c_str());
-        SgSymbol* s_decl = new SgSymbol(VARIABLE_NAME, (string("int _tfm__") + buf).c_str());
-        symbs[z] = make_pair(s, s_decl);
-    }
-
-    SgArrayRefExp* arrayRef = new SgArrayRefExp(*array);
-    SgExpression* subs = new SgVarRefExp(symbs[0].first);
-    int dumS = 1;
-    for (int z = 1; z < symbs.size(); ++z)
-    {
-        subs = &(*subs + (*new SgValueExp(dumS * dimSizes[symbs.size() - z]) * *new SgVarRefExp(symbs[1].first)));
-        dumS *= dimSizes[symbs.size() - z];
-    }
-    
-    SgExpression* copyDvmArrayElems = convertDvmAssign(&dvmArray->copy(), symbs);
-    const string key(copyDvmArrayElems->unparse());
-
-    if (autoTfmReplacing.find(key) != autoTfmReplacing.end())
-        return make_pair(autoTfmReplacing[key], make_pair(ret, retInv));
-
-    arrayRef->addSubscript(*subs);
-    ret.push_back(makeSymbolDeclaration(array));
-
-    if (in)
-    {
-        inner = new SgAssignStmt(*arrayRef, copyDvmArrayElems->copy());
-        forSt = createFor(dimSizes, symbs, inner);
-        ret.push_back(forSt);
-    }
-
-    if (out)
-    {
-        inner = new SgAssignStmt(copyDvmArrayElems->copy(), arrayRef->copy());
-        forStInv = createFor(dimSizes, symbs, inner);
-        retInv.push_back(forStInv);
-    }
-
-    autoTfmReplacing[key] = array;    
-    return make_pair(array, make_pair(ret, retInv));
-}
-
-static vector<int> fillBitsOfArgs(SgProgHedrStmt *hedr)
-{
-    vector<int> bitsOfArgs;
-    for (int z = 0; z < hedr->numberOfParameters(); ++z)
-    {
-        SgSymbol *par = hedr->parameter(z);
-        int attr = par->attributes();
-        if (attr & IN_BIT)
-            bitsOfArgs.push_back(IN_BIT);
-        else if (attr & OUT_BIT)
-            bitsOfArgs.push_back(OUT_BIT);
-        else 
-            bitsOfArgs.push_back(INOUT_BIT);
-    }
-
-    return bitsOfArgs;
-}
-
-static bool isPrivate(const string& array)
-{
-    SgExpression* exp = private_list;
-    while (exp)
-    {
-        if (exp->lhs()->symbol()->identifier() == array)
-            return true;
-        exp = exp->rhs();
-    }
-    return false;
-}
-
-//#define DEB
-static bool matchPrototype(SgSymbol *funcSymb, SgExpression *&listArgs, bool isFunction)
-{
-    bool ret = true;
-    bool casePrivateArray = false;
-    const string name(funcSymb->identifier());
-
-    vector<SgType*> *prototype = NULL;
-    int num = 0;
-    SgExpression* tmp = listArgs;
-    while (tmp)
-    {
-        num++;
-        tmp = tmp->rhs();
-    }
-    
-    map <string, vector<vector<SgType*> > >::iterator it = interfaceProcedures.find(name);
-    bool canFoundInterface = !(it == interfaceProcedures.end());
-
-    //try to find function on current file
-    //TODO: add support of many files
-    //TODO: module functions with the same name
-    vector<int> argsBits;
-    if (canFoundInterface == false)
-    {
-#ifdef DEB
-        map<string, vector<graph_node*>> tmp;
-        for (graph_node* ndl = node_list; ndl; ndl = ndl->next)
-            tmp[ndl->name].push_back(ndl);
-#endif 
-        for (graph_node *ndl = node_list; ndl; ndl = ndl->next)
-        {
-            if (ndl->name == name && current_file == ndl->file)
-            {
-                if (ndl->st_header == NULL)
-                {
-                    Error("Can not find procedure header %s", name.c_str(), 652, first_do_par);
-                    ret = false;
-                }
-                else
-                {
-                    CreateIntefacePrototype(ndl->st_header);
-                    argsBits = fillBitsOfArgs(isSgProgHedrStmt(ndl->st_header));
-                }
-            }
-            else if(ndl->name == name && ndl->st_interface)
-            {
-                  CreateIntefacePrototype(ndl->st_interface);
-                  argsBits = fillBitsOfArgs(isSgProgHedrStmt(ndl->st_interface));
-            }
-        }
-
-        it = interfaceProcedures.find(name);
-        canFoundInterface = !(it == interfaceProcedures.end());
-
-        if (canFoundInterface == false)
-        {
-            Error("Can not find interface for procedure %s", name.c_str(), 653, first_do_par);
-            ret = false;
-        }            
-    }
-    else
-    {
-        for (graph_node* ndl = node_list; ndl; ndl = ndl->next)
-            if (ndl->name == name && current_file == ndl->file)
-                argsBits = fillBitsOfArgs(isSgProgHedrStmt(ndl->st_header));
-    }
-    
-    if (canFoundInterface)
-    {
-        bool found = false;
-
-        //TODO: add support of many interfaces with the same count of parameters
-        for (int k = 0; k < it->second.size(); ++k)
-        {
-            if (it->second[k].size() == num)
-            {
-                found = true;
-                prototype = &it->second[k];
-                break;
-            }
-        }
-
-        if (found == false)
-        {
-            Error("Can not find interface for procedure %s", name.c_str(), 653, first_do_par);
-            ret = false;
-        }
-        else //Match here
-        {
-            SgExpression *argInCall = listArgs;
-            for (int i = 0; i < num; ++i, argInCall = argInCall->rhs())
-            {
-                if (argInCall->lhs() == NULL)
-                {
-                    Error("Internal inconsistency in F->C convertation", "", 654, first_do_par);
-                    ret = false;
-                    continue;
-                }
-                
-                SgType *typeInCall;
-                SgSymbol* parS = NULL;
-                if (argInCall->lhs()->symbol()) // simple argument
-                {
-                    typeInCall = argInCall->lhs()->symbol()->type();
-                    parS = argInCall->lhs()->symbol();
-#ifdef DEB
-                    printf("simple type of typeInCall %d, %s\n", typeInCall->variant(), argInCall->lhs()->symbol()->identifier());
-#endif
-                }
-                else                      // expression
-                {
-                    typeInCall = argInCall->lhs()->type();
-#ifdef DEB
-                    printf("expression type of typeInCall %d\n", typeInCall->variant());
-#endif
-                }
-
-                SgType *typeInProt = (*prototype)[i];
-                SgType* typeInProtSave = (*prototype)[i];
-                
-                int countOfSubscrInCall = 0;
-                int dimSizeInProt = 0;
-                if (argInCall->lhs()->variant() == ARRAY_REF)
-                {
-                    SgExpression *subs = argInCall->lhs()->lhs();
-                    while (subs)
-                    {
-                        countOfSubscrInCall++;
-                        subs = subs->rhs();
-                    }
-
-                    SgArrayType* inCall = isSgArrayType(typeInCall);
-                    SgArrayType* inProt = isSgArrayType(typeInProt);
-
-                    if (countOfSubscrInCall == 0)
-                    {
-                        if (inCall == NULL || inProt == NULL) // inconsistency
-                        {
-                            if (isSgPointerType(typeInCall) && inProt)
-                                typeInCall = typeInProt;
-                            else
-                            {
-                                typeInCall = NULL;
-#ifdef DEB
-                                printf("typeInCall NULL 1\n");
-#endif
-                            }
-                        }
-                        else if (inCall->dimension() != inProt->dimension())
-                        {
-                            if (isPrivate(argInCall->lhs()->symbol()->identifier()) && isPrivateArrayDummy(argInCall->lhs()->symbol()) != 1)
-                                typeInCall = typeInProt;
-                            else
-                                typeInCall = NULL;
-                          
-#ifdef DEB
-                            printf("typeInCall NULL 2\n");
-#endif
-                        }
-                        else
-                        {
-                            typeInCall = typeInProt;
-                            if (for_kernel && isPrivate(argInCall->lhs()->symbol()->identifier()) || isPrivateArrayDummy(argInCall->lhs()->symbol())==1) 
-                            {   
-                                typeInCall = NULL;
-                                casePrivateArray = true;
-#ifdef DEB
-                                printf("typeInCall NULL 2_p\n");
-#endif
-                            }
-                        } 
-                    }
-                    else  // countOfSubscrInCall != 0 
-                    {
-                        //TODO: not supported yet
-                        if (inCall && inProt)
-                        {
-                            if (inCall->dimension() != inProt->dimension()) // TODO
-                            {   //TODO: check for non distributed
-                                typeInCall = typeInProt;
-                                dimSizeInProt = inProt->dimension();
-                            }
-                            else
-                            {
-                                if (options.isOn(O_PL2) && dvm_parallel_dir && dvm_parallel_dir->expr(0) == NULL)
-                                    dimSizeInProt = inCall->dimension();
-
-                                const int arrayDim = isPrivate(argInCall->lhs()->symbol()->identifier()) ? inCall->dimension() : 1;
-
-                                if (isSgArrayType(typeInProt) && (!options.isOn(O_PL2) || !for_kernel || dvm_parallel_dir && dvm_parallel_dir->expr(0) != NULL)) // inconsistency
-                                {
-                                    if (inCall->dimension() == inProt->dimension())
-                                    {
-                                        typeInCall = typeInProt;
-                                        dimSizeInProt = inProt->dimension();
-                                    }
-                                    else
-                                    {
-                                        typeInCall = NULL;
-#ifdef DEB
-                                        printf("typeInCall NULL 3\n");
-#endif
-                                    }
-                                }
-                                else if (arrayDim - countOfSubscrInCall == 0)
-                                    typeInCall = typeInProt;
-                                else // TODO
-                                {
-                                    typeInCall = NULL;
-#ifdef DEB
-                                    printf("typeInCall NULL 4\n");
-#endif
-                                }
-                            }
-                        }
-                        else if (inProt) // inconsistency
-                        {
-                            typeInCall = NULL;
-#ifdef DEB
-                            printf("typeInCall NULL 5\n");
-#endif
-                        }
-                        else if (inCall)
-                        {
-                            const int arrayDim = isPrivate(argInCall->lhs()->symbol()->identifier()) ? inCall->dimension() : 1;
-
-                            if (arrayDim - countOfSubscrInCall == 0)
-                                typeInCall = typeInProt;
-                            else
-                            {
-                                typeInCall = NULL;
-#ifdef DEB
-                                printf("typeInCall NULL 6\n");
-#endif
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    if (typeInCall->variant() == T_DESCRIPT)
-                        typeInCall = ((SgDescriptType*)typeInCall)->baseType();
-
-                    if (typeInProt->variant() == typeInCall->variant())
-                    {
-                        if (typeInProt->hasBaseType() && !typeInCall->hasBaseType()) // inconsistency
-                        {
-                            typeInCall = NULL;
-#ifdef DEB
-                            printf("typeInCall NULL 7\n");
-#endif
-                        }
-
-                        if (typeInProt->hasBaseType() && typeInCall)
-                        {
-                            if (typeInProt->baseType()->variant() != typeInCall->baseType()->variant()) // inconsistency
-                            {
-                                typeInCall = NULL;
-#ifdef DEB
-                                printf("typeInCall NULL 8\n");
-#endif
-                            }
-                            else
-                            {
-                                typeInProt = typeInProt->baseType();
-                                typeInCall = typeInCall->baseType();
-                            }
-                        }
-
-                        if (typeInCall)
-                        {
-                            if (typeInProt->equivalentToType(typeInCall))
-                                typeInCall = typeInProt;
-                            else
-                            {
-                                if (typeInProt->length() && typeInCall->length())
-                                {
-                                    if (string(typeInProt->length()->unparse()) == string(typeInCall->length()->unparse()))
-                                        typeInCall = typeInProt;
-                                    else
-                                    {
-                                        typeInCall = NULL; // TODO
-#ifdef DEB
-                                        printf("typeInCall NULL 9\n");
-#endif
-                                    }
-                                }
-                                else if (typeInProt->selector() && typeInCall->selector())
-                                {
-                                    if (string(typeInProt->selector()->unparse()) == string(typeInCall->selector()->unparse()))
-                                        typeInCall = typeInProt;
-                                    else
-                                    {
-                                        typeInCall = NULL; // TODO
-#ifdef DEB
-                                        printf("typeInCall NULL 10\n");
-#endif
-                                    }
-                                }
-                                else
-                                 printf("typeInCall NULL 11\n");    //TODO
-                            }
-                        }
-
-                        if (typeInProt != typeInCall)
-                        {
-                            if (CompareKind(typeInProt, typeInCall) != 1) // check selector
-                            {
-                                char buf[256];
-                                sprintf(buf, "The type of %d argument of '%s' procedure can not be equal to actual parameter in call", i + 1, name.c_str());
-                                Warning(buf, "", 655, first_do_par);
-                            }
-                            typeInCall = typeInProt;
-                        }
-                    }
-                    else // check selector
-                    {
-                        if (CompareKind(typeInProt, typeInCall))
-                            typeInCall = typeInProt;
-                    }
-                } // end of type analysis
-                //----------------------------------------------------------------------------------------------------
-                if (typeInProt != typeInCall)
-                {
-                    char buf[256];
-                    sprintf(buf, "Can not match the %d argument of '%s' procedure", i + 1, name.c_str());
-                    if (!casePrivateArray) 
-                        Error(buf, "", 656, first_do_par);
-                    //ret = false;
-                }
-                else if (argInCall->lhs()->variant() == ARRAY_REF)
-                {
-                    if (countOfSubscrInCall == 0)
-                    {
-                        SgExpression *arr = argInCall->lhs();
-                        SgType *type = arr->symbol()->type();
-
-                        if (type->hasBaseType())
-                            argInCall->setLhs(*new SgCastExp(*C_PointerType(C_Type(type->baseType())), *arr));
-                        else
-                            argInCall->setLhs(*new SgCastExp(*C_PointerType(C_Type(type)), *arr));
-                    }
-                    else
-                    {
-                        if (dimSizeInProt == 0)
-                        {
-                            //if (isFunction)  //04.02.25 podd
-                            {
-                                SgExpression* arrayRef = argInCall->lhs();
-                                convertExpr(arrayRef, arrayRef);
-                            }
-                        }
-                        else
-                        {
-                            if (options.isOn(AUTO_TFM) && !isInPrivate(argInCall->lhs()->symbol()->identifier()))
-                            {
-                                //TODO: ranges, ex. (-1:2)
-
-                                SgArrayType* arrT = isSgArrayType(typeInProtSave);
-                                int dim = arrT->dimension();
-                                vector<int> dimSizes(dim);
-                                for (int z = 0; z < dim; ++z)
-                                    dimSizes[z] = -1;
-
-                                int dimTotal = 1;
-                                for (int z = 0; z < dim; ++z)
-                                {
-                                    if (arrT->sizeInDim(z)->isInteger())
-                                        dimTotal *= dimSizes[z] = arrT->sizeInDim(z)->valueInteger();
-                                    else
-                                        dimTotal = -1;
-                                }
-
-                                if (dimTotal != -1)
-                                {
-                                    std::reverse(dimSizes.begin(), dimSizes.end());
-                                    bool ifIn = true;
-                                    bool ifOut = true;
-
-                                    pair<SgSymbol*, pair<vector<SgStatement*>, vector<SgStatement*> > > conv = createForCopy(dimSizes, argInCall->lhs(), ifIn, ifOut);
-
-                                    if ( (argsBits[i] & IN_BIT) || (argsBits[i] & INOUT_BIT))
-                                        for (int z = 0; z < conv.second.first.size(); ++z)
-                                            insertBefore[curTranslateStmt].push_back(conv.second.first[z]);
-
-                                    if ((argsBits[i] & OUT_BIT) || (argsBits[i] & INOUT_BIT))
-                                        for (int z = 0; z < conv.second.second.size(); ++z)
-                                            insertAfter[curTranslateStmt].push_back(conv.second.second[z]);
-
-                                    argInCall->setLhs(*new SgArrayRefExp(*conv.first));
-                                }
-                                else
-                                {
-                                    char buf[256];
-                                    sprintf(buf, "Unsupported variant of '%s' procedure call", name.c_str());
-                                    Error(buf, "", 657, first_do_par);
-                                }
-                            }
-                            else
-                            {
-                                SgExpression* arr = argInCall->lhs(); 
-                                if (!isNullSubscripts(arr->lhs())) 
-                                    convertExpr(arr, arr);
-
-                                if (options.isOn(O_PL2))
-                                {
-                                    SgType* cast = NULL;
-                                    if (typeInProtSave->hasBaseType())
-                                        cast = C_PointerType(C_Type(typeInProtSave->baseType()));
-                                    else
-                                        cast = C_PointerType(C_Type(typeInProtSave));
-                                    if (for_kernel && isPrivate(arr->symbol()->identifier()) || isPrivateArrayDummy(arr->symbol())==2)
-                                    {
-                                        cast = C_PointerType(C_VoidType());
-                                    }
-                                    argInCall->setLhs(*new SgCastExp(*cast, SgAddrOp(*arr)));
-                                }
-                                else
-                                {
-                                    if (for_kernel && isPrivate(arr->symbol()->identifier()) || isPrivateArrayDummy(arr->symbol())==2) 
-                                        argInCall->setLhs(*new SgCastExp(*C_PointerType(C_VoidType()), SgAddrOp(*arr)));
-                                    else
-                                        argInCall->setLhs(SgAddrOp(*arr)); 
-                                }
-                            }
-                        }
-                    }
-                } //end of ARRAY_REF
-                else
-                {
-                    SgExpression* arg = argInCall->lhs();
-                    SgType* orig = arg->type();
-                    SgType* typeCopy = orig->copyPtr();
-
-                    SgExpression* selector = typeCopy->selector();
-                    if (selector)
-                    {
-                        typeCopy->deleteSelector();
-                        arg->setType(typeCopy);
-                    }
-
-                    //if (isFunction)   // 04.02.25 podd
-                        convertExpr(arg, arg);
-
-                    if (selector)
-                    {
-                        int size = -1;
-                        SgExpression* e2 = TypeKindExpr(orig);
-                        if (e2 && e2->isInteger())
-                            size = e2->valueInteger();
-
-                        if (size > 0)
-                        {
-                            const int var = typeCopy->variant();
-                            if (var == T_FLOAT || var == T_DOUBLE)
-                            {
-                                if (size == 4)
-                                    arg = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "float"), *new SgExprListExp(*arg));
-                                else if (size == 8)
-                                    arg = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "double"), *new SgExprListExp(*arg));
-                            }
-                            else if (var == T_INT || var == T_BOOL)
-                            {
-                                if (size == 1)
-                                    arg = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "char"), *new SgExprListExp(*arg));
-                                else if (size == 2)
-                                    arg = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "short"), *new SgExprListExp(*arg));
-                                else if (size == 4)
-                                    arg = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "int"), *new SgExprListExp(*arg));
-                                else if (size == 8)
-                                    arg = new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "long long"), *new SgExprListExp(*arg));
-                            }
-                        }
-                    }
-                    
-                    argInCall->setLhs(arg);
-                }
-            }
-        }
-    }
-
-    return ret;
-}
-
-void convertExpr(SgExpression *expr, SgExpression* &retExp)
-{
-    if (expr)
-    {
-        int var = expr->variant();
-        SgExpression *lhs = NULL, *rhs = NULL;
-
-        if (var != FUNC_CALL)
-        {
-            if (expr->lhs())
-            {
-                lhs = expr->lhs();
-                convertExpr(lhs, lhs);
-            }
-
-            if (expr->rhs())
-            {
-                rhs = expr->rhs();
-                convertExpr(rhs, rhs);
-            }
-        }
-
-        if (var == EXP_OP)
-        {
-            bool default_ = false;
-
-            if (rhs->variant() == INT_VAL)
-            {
-                int i = rhs->valueInteger();
-                if (i == 0)
-                    retExp = new SgValueExp(1);
-                else if (i == 1)
-                    retExp = lhs;
-                else if (i == 2)
-                {
-                    if (lhs->variant() != FUNC_CALL && lhs->variant() != PROC_CALL)
-                        retExp = &(*lhs * *lhs);
-                    else
-                        default_ = true;
-                }
-                else
-                    default_ = true;
-            }
-            else
-                default_ = true;
-
-            if (default_)
-            {
-                SgFunctionCallExp *tmpF = new SgFunctionCallExp(*createNewFunctionSymbol("pow"));
-                tmpF->addArg(*lhs);
-                tmpF->addArg(*rhs);
-                retExp = tmpF;
-            }
-        }
-        else if(var == RECORD_REF)
-            retExp = expr;
-        else if (var == FUNC_CALL)
-        {
-            SgFunctionCallExp *tmpF = (SgFunctionCallExp *)expr;
-            const char *name = tmpF->funName()->identifier();
-            map<string, FunctionParam>::iterator it = handlersOfFunction.find(name);
-            if (!strcmp(name, "present"))
-            {
-               /* string argName = expr->lhs()->lhs()->symbol()->identifier();
-                SgStatement* funcHdr = curTranslateStmt;
-                SgExpression* newPresent = makePresentExpr(argName,funcHdr);
-                retExp = newPresent;*/
-                SgExpression* pres = new SgExpression(RECORD_REF);
-                pres->setLhs(new SgVarRefExp(expr->lhs()->lhs()->symbol()));
-                pres->setRhs(new SgVarRefExp(*new SgSymbol(FIELD_NAME, "isExist")));
-                retExp = pres;
-            }
-            else if(!strcmp(name, "ub"))
-                retExp = expr;
-            else
-            {
-                if (it != handlersOfFunction.end())
-                    it->second.CallHandler(expr, retExp);
-                else
-                {
-                    SgSymbol *symb = tmpF->funName();
-                    SgStatement *inter = getInterfaceForCall(symb);
-                    if(inter)
-                    {
-                        //switch arguments by keyword
-                        expr = switchArgumentsByKeyword(name, tmpF, inter);
-                        //check ommited arguments
-                        //transform fact to formal
-                    }
-
-                    SgExpression *tmp = expr->lhs();
-                    matchPrototype(tmpF->funName(), tmp, true);
-
-                    retExp->setLhs(expr->lhs());
-                    retExp->setRhs(expr->rhs());
-
-                    if (isUserFunction(tmpF->funName()) == 0 && !inter)
-                    {
-                        printf("  [EXPR ERROR: %s, line %d, user line %d] unsupported variant of func call with name \"%s\"\n", __FILE__, __LINE__, first_do_par->lineNumber(), name);
-                        if (unSupportedVars.size() != 0)
-                            Error("Internal inconsistency in F->C convertation", "", 654, first_do_par);
-                    }
-                }
-            }
-        }
-        else if (var == DOUBLE_VAL)
-        {
-            char *digit_o = ((SgValueExp*)expr)->doubleValue();
-            SgExpression *val = ((SgValueExp*)expr)->type()->selector();
-
-            char *digit = new char[strlen(digit_o) + 1];
-            strcpy(digit, digit_o);
-            for (size_t i = 0; i < strlen(digit); ++i)
-            {
-                if (digit[i] == 'd')
-                {
-                    digit[i] = 'e';
-                    break;
-                }
-            }
-            SgValueExp *valDouble = new SgValueExp(double(0.0), digit);
-            delete[]digit;
-
-            if (val != NULL)
-            {
-                if (val->valueInteger() == 8) // double
-                    createNewFCall(valDouble, retExp, "double", 0);
-                else if (val->valueInteger() == 4) // float
-                    createNewFCall(valDouble, retExp, "float", 0);
-                else
-                    retExp = valDouble;
-            }
-            else
-                retExp = valDouble;
-        }
-        else if (var == FLOAT_VAL)
-        {
-            char *digit_o = ((SgValueExp*)expr)->floatValue();
-            SgExpression *val = ((SgValueExp*)expr)->type()->selector();
-
-            char *digit = new char[strlen(digit_o) + 2];
-            strcpy(digit, digit_o);
-            digit[strlen(digit_o)] = 'f';
-            digit[strlen(digit_o) + 1] = '\0';
-
-            SgValueExp *valFloat = new SgValueExp(float(0.0), digit);
-            delete[]digit;
-
-            if (val != NULL)
-            {
-                if (val->valueInteger() == 8) // double
-                    createNewFCall(valFloat, retExp, "double", 0);
-                else if (val->valueInteger() == 4) // float
-                    createNewFCall(valFloat, retExp, "float", 0);
-                else
-                    retExp = valFloat;
-            }
-            else
-                retExp = valFloat;
-        }
-        else if (var == INT_VAL)
-        {
-            SgExpression *val = ((SgValueExp*)expr)->type()->selector();
-            int digit = ((SgValueExp*)expr)->valueInteger();
-            if (val != NULL)
-            {
-                if (val->valueInteger() == 8) // long
-                    createNewFCall(new SgValueExp(digit), retExp, "long", 0);
-                else if (val->valueInteger() == 4) // int
-                    createNewFCall(new SgValueExp(digit), retExp, "int", 0);
-                else if (val->valueInteger() == 2) // short
-                    createNewFCall(new SgValueExp(digit), retExp, "short", 0);
-                else if (val->valueInteger() == 1) // char
-                    createNewFCall(new SgValueExp(digit), retExp, "char", 0);
-                else
-                    retExp = expr;
-            }
-            else
-                retExp = expr;
-        }
-        else if (var == COMPLEX_VAL)
-        {
-            SgValueExp *tmp = ((SgValueExp*)expr);
-            SgExpression *re = ((SgValueExp*)expr)->realValue();
-            SgExpression *im = ((SgValueExp*)expr)->imaginaryValue();
-
-            int kind = 8;
-            if (re->variant() != DOUBLE_VAL && im->variant() != DOUBLE_VAL)
-                kind = 4;
-
-            if (kind == 8)
-                retExp = new SgFunctionCallExp(*createNewFunctionSymbol("dcmplx2"));
-            else
-                retExp = new SgFunctionCallExp(*createNewFunctionSymbol("cmplx2"));
-
-            convertExpr(re, re);
-            convertExpr(im, im);
-
-            ((SgFunctionCallExp*)retExp)->addArg(*re);
-            ((SgFunctionCallExp*)retExp)->addArg(*im);
-        }
-        else if (var == ARRAY_REF)
-        {
-            bool ifInPrivateList = false;
-            size_t idx = 0;
-
-            char *strName = expr->symbol()->identifier();
-            for (; idx < arrayInfo.size(); ++idx)
-            {
-                if (arrayInfo[idx].name == strName)
-                {
-                    ifInPrivateList = true;
-                    break;
-                }
-            }
-
-            if (ifInPrivateList)
-            {
-                int dim = isSgArrayType(expr->symbol()->type())->dimension();
-
-                if (dim > 0 && expr->lhs()) // DIM > 0 && ARRAY_REF is not under CALL
-                {
-                    stack<SgExpression*> allArraySub;
-                    //swap subscripts and correct exps
-
-                    SgExpression *tmp = expr->lhs();
-                    for (int i = 0; i < dim; ++i)
-                    {
-                        SgExpression *conv = tmp->lhs();
-                        convertExpr(conv, conv);
-                        tmp = tmp->rhs();
-                        allArraySub.push(conv);
-                    }
-
-                    tmp = expr->lhs();
-                    int k = 0;
-                    for (int i = 0; i < dim; ++i)
-                    {
-                        if (arrayInfo[idx].correctExp[dim - 1 - k])
-                            tmp->setLhs(*allArraySub.top() - *arrayInfo[idx].correctExp[dim - 1 - k]);
-                        else
-                            tmp->setLhs(*allArraySub.top());
-                        allArraySub.pop();
-                        k++;
-                        tmp = tmp->rhs();
-                    }
-
-
-                    if (arrayInfo[idx].typeRed == 1)
-                    {
-                        // revert order of subscr
-                        stack<SgExpression*> allArraySub;
-                        SgExpression *tmp = expr->lhs();
-                        for (int i = 0; i < dim; ++i)
-                        {
-                            allArraySub.push(&tmp->lhs()->copy());
-                            tmp = tmp->rhs();
-                        }
-
-                        tmp = expr->lhs();
-                        for (int i = 0; i < dim; ++i)
-                        {
-                            tmp->setLhs(*allArraySub.top());
-                            allArraySub.pop();
-                            tmp = tmp->rhs();
-                        }
-
-                        // linearized red arrays
-                        expr->setLhs(LinearFormForRedArray(expr->symbol(), expr->lhs(), arrayInfo[idx].rsl));
-                    }
-                }
-            }
-            // else global or dvm array
-            retExp = expr;
-        }
-        else if (var == VAR_REF)
-            retExp = &expr->copy();
-        else if (var == NEQV_OP)
-        {
-#ifdef INTEL_LOGICAL_TYPE
-            retExp  = new SgExpression(XOR_OP, lhs, rhs);
-#else
-            retExp = &(*lhs != *rhs);
-#endif
-        }
-        else if (var == EQV_OP)
-        {
-#ifdef INTEL_LOGICAL_TYPE
-            retExp = new SgExpression(BIT_COMPLEMENT_OP, new SgExpression(XOR_OP, lhs, rhs), NULL);
-#else
-        retExp = &(*lhs == *rhs);
-#endif
-        }
-        else if (var == AND_OP)
-            retExp = new SgExpression(BITAND_OP, lhs, rhs);
-        else if (var == OR_OP)
-            retExp = new SgExpression(BITOR_OP, lhs, rhs);
-        else if (var == NOT_OP)
-        {
-#ifdef INTEL_LOGICAL_TYPE
-            retExp = new SgExpression(BIT_COMPLEMENT_OP, lhs, NULL);
-#else
-            retExp = new SgExpression(NE_OP, lhs, new SgKeywordValExp("true"));
-#endif
-        }
-        else if (var == BOOL_VAL)
-        {         
-            bool val = ((SgValueExp*)expr)->boolValue();
-#ifdef INTEL_LOGICAL_TYPE
-            retExp = val ? new SgExpression(BIT_COMPLEMENT_OP, new SgValueExp(0), NULL) : new SgValueExp(0);
-#else
-            retExp = new SgKeywordValExp(val ? "true" : "false");
-#endif
-        }
-        else
-        {
-            // known vars: ADD_OP, SUBT_OP, MULT_OP, DIV_OP, MINUS_OP, UNARY_ADD_OP, CONST_REF, EXPR_LIST, 
-            retExp->setLhs(lhs);
-            retExp->setRhs(rhs);
-            if (supportedVars.find(var) == supportedVars.end())
-                unSupportedVars.insert(var);
-        }
-    }
-}
-
-static SgExpression* convertReductionAddressForAtomic(SgExpression* exp)
-{
-    SgExpression* ref = exp->copyPtr();
-    ref->setLhs(NULL);
-
-    SgExpression* idx = exp->lhs()->copyPtr();
-
-    return new SgExpression(ADD_OP, ref, idx);
-}
-
-//TODO: need to check bitwise operations
-static SgExpression* splitReductionForAtomic(SgExpression* lhs, SgExpression* rhs, const int num_red)
-{
-    SgExpression* args = NULL;
-    if (!lhs || !rhs)
-    {
-        Error("Internal inconsistency in F->C convertation", "", 654, first_do_par);
-        return NULL;
-    }
-
-    string left(lhs->unparse());
-    set<int> op;
-    if (num_red == 1) // sum
-    {
-        op.insert(ADD_OP);
-        op.insert(SUBT_OP);
-    }
-    else if (num_red == 2)  // product
-        op.insert(MULT_OP);
-    else if (num_red == 3)  // max
-        op.insert(FUNC_CALL);
-    else if (num_red == 4)  // min
-        op.insert(FUNC_CALL);
-    else if (num_red == 5)  // and
-        op.insert(BITAND_OP);
-    else if (num_red == 6)  // or
-        op.insert(BITOR_OP);
-    else if (num_red == 7)  // neqv
-        op.insert(XOR_OP);
-    else if (num_red == 8)  // eqv
-    {
-        if (rhs->variant() == BIT_COMPLEMENT_OP)
-            rhs = rhs->lhs();
-        op.insert(XOR_OP);
-    }
-
-    if (op.size())
-    {
-        if (op.find(rhs->variant()) != op.end())
-        {
-            SgExpression* l_part = rhs->lhs();
-            SgExpression* r_part = rhs->rhs();
-            if (rhs->variant() == FUNC_CALL)
-            {
-                if (rhs->lhs())
-                {
-                    if (rhs->lhs()->lhs())
-                        l_part = rhs->lhs()->lhs();
-                    if (rhs->lhs()->rhs() && rhs->lhs()->rhs()->lhs())
-                        r_part = rhs->lhs()->rhs()->lhs();
-                }
-            }
-
-            if (l_part && r_part)
-            {
-                string Lpart(l_part->unparse());
-                string Rpart(r_part->unparse());
-
-                bool ok = false;
-                if (Lpart == left)
-                    ok = true;
-                else if (Rpart == left)
-                {
-                    std::swap(l_part, r_part);
-                    ok = true;
-                }
-
-                if (ok)
-                {
-                    if (rhs->variant() == SUBT_OP)
-                        r_part = new SgExpression(MINUS_OP, r_part, NULL);
-
-                    SgExpression* arg1 = convertReductionAddressForAtomic(l_part);
-                    SgExpression* arg2 = r_part;
-
-                    args = new SgExpression(EXPR_LIST, arg1, new SgExpression(EXPR_LIST, arg2, NULL));
-                }
-            }
-        }
-    }
-
-    if (args == NULL)
-    {
-        string right(rhs->unparse());
-        Error("Can not match reduction template for this pattern: %s", (left + " = " + right).c_str(), 658, first_do_par);
-    }
-
-    return args;
-}
-
-static bool convertStmt(SgStatement* &st, pair<SgStatement*, SgStatement*> &retSts, vector < stack < SgStatement*> > &copyBlock, 
-                        int countOfCopy, int lvl, const map<string, int>& redArraysWithUnknownSize)
-{
-    bool needReplace = false;
-    SgStatement *labSt = NULL;
-    SgStatement *retSt = NULL;
-    curTranslateStmt = st;
-    if (st->hasLabel())
-    {
-        if (lvl == 0)
-            convertLabel(st, labSt, false);
-        else
-            convertLabel(st, labSt, true);
-
-        for (int i = 0; i < countOfCopy; ++i)
-            copyBlock[i].push(&st->lexPrev()->copy());
-    }
-
-    if (st->variant() == ASSIGN_STAT)
-    {
-        SgExpression *lhs = st->expr(0);
-        SgExpression *rhs = st->expr(1);
-
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert assign node\n");
-        lvl_convert_st += 2;
-#endif
-        convertExpr(lhs, lhs);
-        convertExpr(rhs, rhs);
-#if TRACE
-        lvl_convert_st-=2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert assign node\n");
-#endif
-        if (lhs->variant() == ARRAY_REF && redArraysWithUnknownSize.find(lhs->symbol()->identifier()) != redArraysWithUnknownSize.end())
-        {
-            const string arrayName = lhs->symbol()->identifier();
-            const int num_red = redArraysWithUnknownSize.find(arrayName)->second;
-            string atomicName = "NULL";
-
-            if (num_red == 1) // sum
-                atomicName = "__dvmh_atomic_add";
-            else if (num_red == 2)  // product
-                atomicName = "__dvmh_atomic_prod";
-            else if (num_red == 3)  // max
-                atomicName = "__dvmh_atomic_max";
-            else if (num_red == 4)  // min
-                atomicName = "__dvmh_atomic_min";
-            else if (num_red == 5)  // and
-                atomicName = "__dvmh_atomic_and";
-            else if (num_red == 6)  // or
-                atomicName = "__dvmh_atomic_or";
-            else if (num_red == 7)  // neqv
-                atomicName = "__dvmh_atomic_neqv";
-            else if (num_red == 8)  // eqv
-                atomicName = "__dvmh_atomic_eqv";
-
-            if (atomicName == "NULL")
-            {
-                Error("Unsupported reduction type by unknown(large) array size", "", 659, first_do_par);
-                retSt = new SgCExpStmt(SgAssignOp(*lhs, *rhs));
-            }
-            else
-            {
-                SgFunctionSymb* fCall = new SgFunctionSymb(FUNCTION_NAME, atomicName.c_str(), *SgTypeInt(), *kernel_st);
-
-                SgExpression* args = splitReductionForAtomic(lhs, rhs, num_red);
-                if (args)
-                    retSt = new SgCExpStmt(*new SgFunctionCallExp(*fCall, *args));
-            }
-        }
-        else
-            retSt = new SgCExpStmt(SgAssignOp(*lhs, *rhs));
-        needReplace = true;        
-    }
-    else if (st->variant() == CONT_STAT)
-    {
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert continue node\n");
-        lvl_convert_st += 2;
-#endif
-        retSt = NULL;
-#if TRACE
-        lvl_convert_st-=2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert continue node\n");
-
-#endif
-        needReplace = true;
-    }
-    else if (st->variant() == ARITHIF_NODE)
-    {
-        SgExpression *cond = st->expr(0);
-        SgExpression *lb = st->expr(1);
-        SgLabel *arith_lab[3];
-        int i = 0;
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert arithif node\n");
-        lvl_convert_st += 2;
-#endif
-        convertExpr(cond, cond);
-#if TRACE
-        lvl_convert_st-=2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert arithif node\n");
-#endif
-        while (lb)
-        {
-            SgLabel *lab = ((SgLabelRefExp *)(lb->lhs()))->label();
-            SgStatement *labRet = NULL;
-
-            long lab_num = lab->thelabel->stateno;
-            labels_num.insert(lab_num);
-
-            createNewLabel(labRet, lab);
-            arith_lab[i] = ((SgLabelRefExp *)(lb->lhs()))->label();
-            i++;
-            lb = lb->rhs();
-        }
-
-
-        retSt = new SgIfStmt(*cond < *new SgValueExp(0), *new SgGotoStmt(*arith_lab[0]),
-            *new SgIfStmt(SgEqOp(*cond, *new SgValueExp(0)), *new SgGotoStmt(*arith_lab[1]), *new SgGotoStmt(*arith_lab[2])));
-        needReplace = true;
-    }
-    else if (st->variant() == LOGIF_NODE)
-    {
-        SgExpression *cond = st->expr(0);
-        convertExpr(cond, cond);
-        SgStatement *body = ((SgLogIfStmt*)st)->body();
-        pair<SgStatement*, SgStatement*> t;
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert logicif node\n");
-        lvl_convert_st += 2;
-#endif
-        convertStmt(body, t, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-        lvl_convert_st-=2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert logicif node\n");
-#endif
-        retSt = new SgIfStmt(*cond, *t.first);
-        if (t.second)
-            labSt = t.second;
-        needReplace = true;
-    }
-    else if (st->variant() == IF_NODE)
-    {
-        SgStatement *tb = ((SgIfStmt*)st)->trueBody();
-        SgStatement *fb = ((SgIfStmt*)st)->falseBody();
-        SgIfStmt *newIfSt = NULL;
-
-        if (!fb)
-        {
-            SgStatement *tmp = st->lexNext();
-            stack<SgStatement*> bodySts;
-            while (st->lastNodeOfStmt() != tmp)
-            {
-                pair<SgStatement*, SgStatement*> convSt;
-#if TRACE
-                printfSpaces(lvl_convert_st);
-                printf("convert if node\n");
-                lvl_convert_st += 2;
-#endif
-                convertStmt(tmp, convSt, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-                lvl_convert_st-=2;
-                printfSpaces(lvl_convert_st);
-                printf("end of convert if node\n");
-#endif
-                if (convSt.second)
-                    bodySts.push(convSt.second);
-                if (convSt.first)
-                    bodySts.push(convSt.first);
-
-                setControlLexNext(tmp);
-            }
-
-            if (tmp->variant() == CONTROL_END)
-            {
-                pair<SgStatement*, SgStatement*> convSt;
-                convertStmt(tmp, convSt, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-                if (convSt.second)
-                    bodySts.push(convSt.second);
-            }
-
-            SgExpression *cond = ((SgIfStmt*)st)->conditional();
-            convertExpr(cond, cond);
-            if (bodySts.size())
-            {
-                retSt = new SgIfStmt(*cond, *bodySts.top());
-                bodySts.pop();
-            }
-            else
-                retSt = new SgIfStmt(*cond, *new SgStatement(1), 2);
-
-            int size = bodySts.size();
-            for (int i = 0; i < size; ++i)
-            {
-                retSt->insertStmtAfter(*bodySts.top());
-                bodySts.pop();
-            }
-            needReplace = true;
-        }
-        else
-        {
-            stack<stack<SgStatement*> > bodySts;
-            stack<SgStatement*> bodyFalse;
-            stack<SgExpression*> conds;
-            SgStatement *fb_ControlEnd = NULL;
-
-            stack<SgStatement*> t;
-            SgExpression *cond = ((SgIfStmt*)st)->conditional();
-            convertExpr(cond, cond);
-            conds.push(cond);
-            for (;;)
-            {
-                if (fb->variant() == ELSEIF_NODE)
-                {
-                    if (((SgIfStmt*)fb)->falseBody())
-                    {
-                        if (((SgIfStmt*)fb)->falseBody()->variant() == ELSEIF_NODE)
-                            fb = ((SgIfStmt*)fb)->falseBody();
-                        else
-                        {
-                            fb = ((SgIfStmt*)fb)->falseBody();
-                            fb_ControlEnd = fb->controlParent()->lastNodeOfStmt();
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        fb = fb->lastNodeOfStmt();
-                        fb_ControlEnd = fb;
-                        break;
-                    }
-                }
-                else
-                {
-                    fb_ControlEnd = fb;
-                    while (fb_ControlEnd->variant() != CONTROL_END)
-                        setControlLexNext(fb_ControlEnd);
-                    break;
-                }
-            }
-
-            if (tb == NULL)
-                tb = ((SgIfStmt*)st)->falseBody();
-
-            while (tb != fb)
-            {
-                if (tb->variant() == ELSEIF_NODE)
-                {
-                    bodySts.push(t);
-                    SgExpression *cond = ((SgIfStmt*)tb)->conditional();
-                    convertExpr(cond, cond);
-                    conds.push(cond);
-                    t = stack<SgStatement*>();
-                    tb = tb->lexNext();
-                }
-                else if (tb->variant() != CONTROL_END)
-                {
-                    pair<SgStatement*, SgStatement*> tmp;
-#if TRACE
-                    printfSpaces(lvl_convert_st);
-                    printf("convert if node\n");
-                    lvl_convert_st += 2;
-#endif
-                    convertStmt(tb, tmp, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-                    lvl_convert_st-=2;
-                    printfSpaces(lvl_convert_st);
-                    printf("end of convert if node\n");
-#endif
-                    if (tmp.second)
-                        t.push(tmp.second);
-                    if (tmp.first)
-                        t.push(tmp.first);
-
-                    setControlLexNext(tb);
-                }
-                else
-                    tb = tb->lexNext();
-            }
-            bodySts.push(t);
-
-            while (fb != fb_ControlEnd)
-            {
-                pair<SgStatement*, SgStatement*> tmp;
-#if TRACE
-                printfSpaces(lvl_convert_st);
-                printf("convert if node\n");
-                lvl_convert_st += 2;
-#endif
-                convertStmt(fb, tmp, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-                lvl_convert_st-=2;
-                printfSpaces(lvl_convert_st);
-                printf("end of convert if node\n");
-#endif
-                if (tmp.second)
-                    bodyFalse.push(tmp.second);
-                if (tmp.first)
-                    bodyFalse.push(tmp.first);
-
-                setControlLexNext(fb);
-            }
-
-            if (fb->variant() == CONTROL_END)
-            {
-                pair<SgStatement*, SgStatement*> tmp;
-                convertStmt(fb, tmp, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-                if (tmp.second)
-                    bodyFalse.push(tmp.second);
-            }
-
-            if (bodyFalse.size())
-            {
-                if (bodySts.top().size() != 0)
-                    newIfSt = new SgIfStmt(*conds.top(), *bodySts.top().top(), *bodyFalse.top());
-                else
-                    newIfSt = new SgIfStmt(*conds.top(), *bodyFalse.top(), 0);
-
-                bodyFalse.pop();
-                int cond1 = bodyFalse.size();
-                for (int i = 0; i < cond1; ++i)
-                {
-                    newIfSt->falseBody()->insertStmtBefore(*bodyFalse.top(), *newIfSt);
-                    bodyFalse.pop();
-                }
-            }
-            else
-            {
-                if (bodySts.top().size())
-                    newIfSt = new SgIfStmt(*conds.top(), *bodySts.top().top()); // !!!!
-                else
-                    newIfSt = new SgIfStmt(*conds.top(), *new SgStatement(1), 2); // !!!!
-            }
-
-            conds.pop();
-            int cond1 = bodySts.size();
-            for (int i = 0; i < cond1; ++i)
-            {
-                stack<SgStatement*> tmpS = bodySts.top();
-                int cond2;
-                bodySts.pop();
-                if (i == 0)
-                {
-                    if (tmpS.size() != 0)
-                    {
-                        tmpS.pop();
-                        cond2 = tmpS.size();
-                        for (int k = 0; k < cond2; ++k)
-                        {
-                            newIfSt->insertStmtAfter(*tmpS.top(), *newIfSt);
-                            tmpS.pop();
-                        }
-                    }
-                }
-                else
-                {
-                    if (tmpS.size() != 0)
-                    {
-                        newIfSt = new SgIfStmt(*conds.top(), *tmpS.top(), *newIfSt);
-                        conds.pop();
-                        tmpS.pop();
-                        cond2 = tmpS.size();
-                        for (int k = 0; k < cond2; ++k)
-                        {
-                            newIfSt->insertStmtAfter(*tmpS.top(), *newIfSt);
-                            tmpS.pop();
-                        }
-                    }
-                    else
-                    {
-                        newIfSt = new SgIfStmt(*conds.top(), *newIfSt, 0);
-                        conds.pop();
-                    }
-                }
-            }
-
-            retSt = newIfSt;
-            needReplace = true;
-        }
-    }
-    else if (st->variant() == FOR_NODE)
-    {
-        SgSymbol *cycleName = NULL;
-        if (isSgVarRefExp(st->expr(2)))
-            cycleName = isSgVarRefExp(st->expr(2))->symbol();
-
-        SgSymbol *it = ((SgForStmt *)st)->symbol();
-        SgExpression *ex1 = ((SgForStmt *)st)->start();
-        SgExpression *ex2 = ((SgForStmt *)st)->end();
-        SgExpression *ex3 = NULL;
-        int ex3_lav = 0;
-        SgStatement *inDo = ((SgForStmt *)st)->body();
-        SgSymbol *cond = new SgSymbol(VARIABLE_NAME, getNestCond());
-        SgSymbol *newVar = new SgSymbol(VARIABLE_NAME, getNewCycleVar(it->identifier()));
-        SgFunctionCallExp *abs_f = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-        SgFunctionCallExp *abs_f1 = new SgFunctionCallExp(*createNewFunctionSymbol("abs"));
-        stack<SgStatement*> bodySt;
-
-
-        if (((SgForStmt *)st)->step())
-            ex3 = ((SgForStmt *)st)->step();
-        else
-        {
-            ex3 = new SgValueExp(1);
-            ex3_lav = 1;
-        }
-
-        SgStatement *lastNode = ((SgForStmt *)st)->lastNodeOfStmt();
-
-        while (inDo != lastNode)
-        {
-            pair<SgStatement*, SgStatement*> tmp;
-#if TRACE
-            printfSpaces(lvl_convert_st);
-            printf("convert for node\n");
-            lvl_convert_st += 2;
-#endif
-            map<SgStatement*, vector<SgStatement*> > save_insertBefore, save_insertAfter;            
-            saveInsertBeforeAfter(save_insertAfter, save_insertBefore);
-
-            convertStmt(inDo, tmp, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-            lvl_convert_st-=2;
-            printfSpaces(lvl_convert_st);
-            printf("end of convert for node\n");
-#endif
-            copyToStack(bodySt, insertBefore);
-            if (tmp.second)
-                bodySt.push(tmp.second);
-            if (tmp.first)
-                bodySt.push(tmp.first);
-            copyToStack(bodySt, insertAfter);
-            
-            restoreInsertBeforeAfter(save_insertAfter, save_insertBefore);            
-            setControlLexNext(inDo);
-        }
-
-        if (lastNode->variant() != CONTROL_END)
-        {
-            pair<SgStatement*, SgStatement*> tmp;
-#if TRACE
-            printfSpaces(lvl_convert_st);
-            printf("convert for node\n");
-            lvl_convert_st += 2;
-#endif
-            map<SgStatement*, vector<SgStatement*> > save_insertBefore, save_insertAfter;
-            saveInsertBeforeAfter(save_insertAfter, save_insertBefore);
-            convertStmt(inDo, tmp, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-            lvl_convert_st-=2;
-            printfSpaces(lvl_convert_st);
-            printf("end of convert for node\n");
-#endif
-            copyToStack(bodySt, insertBefore);
-            if (tmp.second)
-                bodySt.push(tmp.second);
-            if (tmp.first)
-                bodySt.push(tmp.first);
-            copyToStack(bodySt, insertAfter);
-            restoreInsertBeforeAfter(save_insertAfter, save_insertBefore);
-        }
-        else
-        {
-            pair<SgStatement*, SgStatement*> tmp;
-
-            map<SgStatement*, vector<SgStatement*> > save_insertBefore, save_insertAfter;
-            saveInsertBeforeAfter(save_insertAfter, save_insertBefore);
-            convertStmt(inDo, tmp, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-            copyToStack(bodySt, insertBefore);
-            if (tmp.second)
-                bodySt.push(tmp.second);
-            copyToStack(bodySt, insertAfter);
-            restoreInsertBeforeAfter(save_insertAfter, save_insertBefore);
-        }
-
-        SgExprListExp *tt = new SgExprListExp();
-        SgExprListExp *tt1 = new SgExprListExp();
-        SgExprListExp *tt2 = new SgExprListExp();
-        SgExprListExp *tt3 = new SgExprListExp();
-
-        tt->setLhs(SgAssignOp(*new SgVarRefExp(it), *ex1));
-
-        abs_f->addArg(*ex3);
-        abs_f1->addArg(*ex1 - *ex2);
-
-        // IF EXPR: t_ex1 ? t_ex2 : t_ex3
-        SgExpression *t_ex1 = &(*ex1 > *ex2 && *ex3 > *new SgValueExp(0) || *ex1 < *ex2 && *ex3 < *new SgValueExp(0));
-        SgExpression *t_ex2 = &SgAssignOp(*new SgVarRefExp(cond), *new SgValueExp(-1));
-        SgExpression *t_ex3;
-        if (ex3_lav != 1)
-            t_ex3 = &SgAssignOp(*new SgVarRefExp(cond), (*abs_f1 + *abs_f) / *abs_f);
-        else
-            t_ex3 = &SgAssignOp(*new SgVarRefExp(cond), (*abs_f1 + *abs_f));
-
-        tt1->setLhs(*new SgExprIfExp(*t_ex1, *t_ex2, *t_ex3));
-        tt->setRhs(tt1);
-        tt2->setLhs(SgAssignOp(*new SgVarRefExp(*newVar), *new SgValueExp(0)));
-        tt1->setRhs(tt2);
-        tt3->setLhs(&SgAssignOp(*new SgVarRefExp(it), *new SgVarRefExp(it) + *ex3));
-        tt3->setRhs(new SgExprListExp());
-        tt3->rhs()->setLhs(&SgAssignOp(*new SgVarRefExp(newVar), *new SgVarRefExp(newVar) + *new SgValueExp(1)));
-
-        if (SAPFOR_CONV) // TODO: negative step
-        {
-            SgExprListExp* start = new SgExprListExp();
-            start->setLhs(SgAssignOp(*new SgVarRefExp(it), *ex1));
-
-            SgExprListExp* step = new SgExprListExp();
-            step->setLhs(&SgAssignOp(*new SgVarRefExp(it), *new SgVarRefExp(it) + *ex3));
-            retSt = new SgForStmt(start, &(*new SgVarRefExp(it) <= ex2->copy()), step, NULL);
-        }
-        else
-            retSt = new SgForStmt(tt, &(*new SgVarRefExp(*newVar) < *new SgVarRefExp(cond)), tt3, NULL);
-
-        if (cycleName)
-        {
-            vector<SgLabel*> labs;
-            vector<SgStatement*> labsSt;
-            createNewLabel(labsSt, labs, cycleName->identifier());
-
-            bodySt.push(labsSt[0]);
-            labels_num.insert(labs[0]->thelabel->stateno);
-            bodySt.push(new SgContinueStmt());
-
-            bodySt.push(labsSt[1]);
-            labels_num.insert(labs[1]->thelabel->stateno);
-            bodySt.push(new SgBreakStmt());
-        }
-
-        int sizeStack = bodySt.size();
-        for (int i = 0; i < sizeStack; ++i)
-        {
-            retSt->insertStmtAfter(*bodySt.top(), *retSt);
-            bodySt.pop();
-        }
-        newVars.push_back(cond);
-
-        SgExprListExp *e = new SgExprListExp(*new SgVarRefExp(cond));
-        e->setRhs(private_list);
-        private_list = e;
-
-        bool needToadd = true;
-        for (size_t i = 0; i < newVars.size(); ++i)
-        {
-            if (strcmp(newVars[i]->identifier(), newVar->identifier()) == 0)
-            {
-                needToadd = false;
-                break;
-            }
-        }
-        if (needToadd)
-        {
-            newVars.push_back(newVar);
-            e = new SgExprListExp(*new SgVarRefExp(newVar));
-            e->setRhs(private_list);
-            private_list = e;
-        }
-
-        needReplace = true;
-    }
-    else if (st->variant() == WHILE_NODE)
-    {
-        SgSymbol *cycleName = NULL;
-        if (isSgVarRefExp(st->expr(2)))
-            cycleName = isSgVarRefExp(st->expr(2))->symbol();
-
-        SgExpression *conditional = ((SgWhileStmt *)st)->conditional();
-        stack<SgStatement*> bodySt;
-        SgStatement *inDo = ((SgWhileStmt *)st)->body();
-        SgStatement *lastNode = ((SgWhileStmt *)st)->lastNodeOfStmt();
-
-
-        while (inDo != lastNode)
-        {
-            pair<SgStatement*, SgStatement*> tmp;
-#if TRACE
-            printfSpaces(lvl_convert_st);
-            printf("convert while node\n");
-            lvl_convert_st += 2;
-#endif
-            (void)convertStmt(inDo, tmp, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-            lvl_convert_st -= 2;
-            printfSpaces(lvl_convert_st);
-            printf("end of convert while node\n");
-#endif
-            if (tmp.second)
-                bodySt.push(tmp.second);
-            if (tmp.first)
-                bodySt.push(tmp.first);
-
-            setControlLexNext(inDo);
-        }
-
-        if (lastNode->variant() != CONTROL_END)
-        {
-            pair<SgStatement*, SgStatement*> tmp;
-#if TRACE
-            printfSpaces(lvl_convert_st);
-            printf("convert while node\n");
-            lvl_convert_st += 2;
-#endif
-            (void)convertStmt(inDo, tmp, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-            lvl_convert_st -= 2;
-            printfSpaces(lvl_convert_st);
-            printf("end of convert while node\n");
-#endif
-            if (tmp.second)
-                bodySt.push(tmp.second);
-            if (tmp.first)
-                bodySt.push(tmp.first);
-        }
-        else
-        {
-            pair<SgStatement*, SgStatement*> tmp;
-            (void)convertStmt(inDo, tmp, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-            if (tmp.second)
-                bodySt.push(tmp.second);
-        }
-
-        convertExpr(conditional, conditional);
-
-        if (conditional == NULL)
-            conditional = new SgValueExp(1);
-        retSt = new SgWhileStmt(conditional, NULL);
-        if (cycleName)
-        {
-            vector<SgLabel*> labs;
-            vector<SgStatement*> labsSt;
-            createNewLabel(labsSt, labs, cycleName->identifier());
-
-            bodySt.push(labsSt[0]);
-            labels_num.insert(labs[0]->thelabel->stateno);
-            bodySt.push(new SgContinueStmt());
-
-            bodySt.push(labsSt[1]);
-            labels_num.insert(labs[1]->thelabel->stateno);
-            bodySt.push(new SgBreakStmt());
-        }
-
-
-        int sizeStack = bodySt.size();
-        for (int i = 0; i < sizeStack; ++i)
-        {
-            retSt->insertStmtAfter(*bodySt.top(), *retSt);
-            bodySt.pop();
-        }
-
-        needReplace = true;
-    }
-    else if (st->variant() == SWITCH_NODE)
-    {
-        SgStatement *tmp = NULL;
-        SgStatement *lastNode = st->lastNodeOfStmt();
-        stack<SgStatement*> bodySt;
-
-        SgExpression *select = ((SgSwitchStmt*)st)->selector();
-        convertExpr(select, select);
-        ((SgSwitchStmt*)st)->setSelector(*select);
-
-        //extract default body
-        deque<SgStatement*> bodyQueue;
-        SgStatement *newIfStmt = NULL;
-        tmp = ((SgSwitchStmt*)st)->defOption();
-        if (tmp != NULL)
-        {
-            newIfStmt = new SgIfStmt(*new SgValueExp(0), *new SgStatement(1), 2);
-
-            SgStatement *st = tmp;
-            setControlLexNext(tmp);
-            st->deleteStmt();
-            while (tmp->variant() != CASE_NODE && tmp->variant() != CONTROL_END)
-            {
-                pair<SgStatement*, SgStatement*> convSt;
-#if TRACE
-                printfSpaces(lvl_convert_st);
-                printf("convert switch node\n");
-                lvl_convert_st+=2;
-#endif
-                (void)convertStmt(tmp, convSt, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-                lvl_convert_st -= 2;
-                printfSpaces(lvl_convert_st);
-                printf("end of convert switch node\n");
-#endif
-                if (convSt.second)
-                    bodyQueue.push_back(convSt.second);
-                if (convSt.first)
-                    bodyQueue.push_back(convSt.first);
-                st = tmp;
-                setControlLexNext(tmp);
-                st->deleteStmt();
-
-            }
-            if (tmp->variant() == CONTROL_END)
-            {
-                pair<SgStatement*, SgStatement*> convSt;
-                (void)convertStmt(tmp, convSt, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-                if (convSt.second)
-                    bodyQueue.push_back(convSt.second);
-            }
-
-            if (!bodyQueue.empty())
-            {
-                ((SgIfStmt*)newIfStmt)->replaceFalseBody(*bodyQueue.front());
-                bodyQueue.pop_front();
-                int sizeVector = bodyQueue.size();
-                for (int i = 0; i < sizeVector; ++i)
-                {
-                    ((SgIfStmt*)newIfStmt)->falseBody()->insertStmtAfter(*bodyQueue.back());
-                    bodyQueue.pop_back();
-                }
-            }
-
-        }
-        //convert other stmts
-        tmp = ((SgSwitchStmt*)st)->caseOption(0);
-        if (tmp != NULL)
-        {
-            if (newIfStmt == NULL)
-                newIfStmt = new SgIfStmt(*new SgValueExp(0), *new SgStatement(1), 2);
-
-            pair<SgStatement*, SgStatement*> convSt;
-#if TRACE
-            printfSpaces(lvl_convert_st);
-            printf("convert switch node\n");
-            lvl_convert_st+=2;
-#endif
-            (void)convertStmt(tmp, convSt, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-            lvl_convert_st -= 2;
-            printfSpaces(lvl_convert_st);
-            printf("end of convert switch node\n");
-#endif
-            if (convSt.second)
-                bodySt.push(convSt.second);
-            if (convSt.first)
-                bodySt.push(convSt.first);
-            setControlLexNext(tmp);
-
-            SgExpression * cond = bodySt.top()->expr(0);
-            newIfStmt->setExpression(0, *cond);
-            bodySt.pop();
-
-            while (tmp != lastNode)
-            {
-                pair<SgStatement*, SgStatement*> convSt;
-#if TRACE
-                printfSpaces(lvl_convert_st);
-                printf("convert switch node\n");
-                lvl_convert_st+=2;
-#endif
-                (void)convertStmt(tmp, convSt, copyBlock, countOfCopy, lvl + 1, redArraysWithUnknownSize);
-#if TRACE
-                lvl_convert_st -= 2;
-                printfSpaces(lvl_convert_st);
-                printf("end of convert switch node\n");
-#endif
-                if (convSt.second)
-                    bodySt.push(convSt.second);
-                if (convSt.first)
-                    bodySt.push(convSt.first);
-                setControlLexNext(tmp);
-            }
-            int sizeStack = bodySt.size();
-            for (int i = 0; i < sizeStack; ++i)
-            {
-                newIfStmt->insertStmtAfter(*bodySt.top(), *newIfStmt);
-                bodySt.pop();
-            }
-        }
-
-        retSt = newIfStmt;
-        needReplace = true;
-    }
-    else if (st->variant() == CASE_NODE)
-    {
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert case node\n");
-        lvl_convert_st += 2;
-#endif        
-        SgExpression *cond = ((SgCaseOptionStmt*)st)->caseRange(0);
-        SgExpression *tmpCond = NULL;
-        SgExpression *lhs = NULL;
-        SgExpression *rhs = NULL;
-        SgExpression *select = ((SgSwitchStmt*)(st->controlParent()))->expr(0);
-        if (cond->variant() == DDOT)
-        {
-            lhs = cond->lhs();
-            convertExpr(lhs, lhs);
-            rhs = cond->rhs();
-            convertExpr(rhs, rhs);
-            if (rhs == NULL)
-                cond = &(*lhs <= *select);
-            else if (lhs == NULL)
-                cond = &(*select <= *rhs);
-            else
-                cond = &(*lhs <= *select && *select <= *rhs);
-        }
-        else
-        {
-            convertExpr(cond, cond);
-            cond = &SgEqOp(*select, *cond);
-        }
-        for (int i = 1; (tmpCond = ((SgCaseOptionStmt*)st)->caseRange(i)) != 0; ++i)
-        {
-            if (tmpCond->variant() == DDOT)
-            {
-                lhs = tmpCond->lhs();
-                convertExpr(lhs, lhs);
-                rhs = tmpCond->rhs();
-                convertExpr(rhs, rhs);
-                if (rhs == NULL)
-                    tmpCond = &(*lhs <= *select);
-                else if (lhs == NULL)
-                    tmpCond = &(*select <= *rhs);
-                else
-                    tmpCond = &(*lhs <= *select && *select <= *rhs);
-            }
-            else
-            {
-                convertExpr(tmpCond, tmpCond);
-                tmpCond = &SgEqOp(*select, *tmpCond);
-            }
-            cond = &(*cond || *tmpCond);
-        }
-
-        retSt = new SgIfStmt(*cond, *new SgStatement(1), 2);
-        retSt->setVariant(ELSEIF_NODE);
-#if TRACE
-        lvl_convert_st -= 2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert case node\n");
-#endif
-        needReplace = true;
-    }
-    else if (st->variant() == GOTO_NODE)
-    {        
-        long lab_num = ((SgGotoStmt*)st)->branchLabel()->thelabel->stateno;
-        labels_num.insert(lab_num);
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert goto node\n");
-        lvl_convert_st+=2;
-#endif
-        retSt = &st->copy();
-#if TRACE
-        lvl_convert_st -= 2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert goto node\n");
-#endif
-        needReplace = false;
-    }
-    else if (st->variant() == COMGOTO_NODE)
-    {
-        SgExpression *labList = ((SgComputedGotoStmt*)st)->labelList();
-        SgExpression *expr = ((SgComputedGotoStmt*)st)->expr(1);
-
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert compute goto node\n");
-        lvl_convert_st += 2;
-#endif
-        convertExpr(expr, expr);
-#if TRACE
-        lvl_convert_st -= 2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert compute goto node\n");
-#endif
-
-        int i = 0;
-        vector<SgLabel*> labs;
-        while (labList)
-        {
-            SgLabel *lab = ((SgLabelRefExp *)(labList->lhs()))->label();
-            SgStatement *labRet = NULL;
-
-            labels_num.insert(lab->thelabel->stateno);
-            createNewLabel(labRet, lab);
-            labs.push_back(lab);
-
-            labList = labList->rhs();
-            i++;
-        }
-        i--;
-
-        SgIfStmt *if_stat = NULL;
-        bool first = true;
-        while (i >= 0)
-        {
-            if (first)
-            {
-                if_stat = new SgIfStmt(SgEqOp(*expr, *new SgValueExp(i + 1)), *new SgGotoStmt(*labs[i]));
-                first = false;
-            }
-            else
-                if_stat = new SgIfStmt(SgEqOp(*expr, *new SgValueExp(i + 1)), *new SgGotoStmt(*labs[i]), *if_stat);
-            i--;
-        }
-
-        retSt = if_stat;
-        needReplace = true;
-
-    }
-    else if (st->variant() == PRINT_STAT) // only for SAPFOR
-    {
-        if (SAPFOR_CONV == 0)
-            Error("Internal inconsistency in F->C convertation", "", 654, first_do_par);
-
-        SgInputOutputStmt* outStat = (SgInputOutputStmt*)st;
-        SgExpression* lhs = outStat->itemList();
-        convertExpr(lhs, lhs);
-        
-        SgExpression* list = lhs;
-        while (list)
-        {
-            SgExpression* item = list->lhs();
-            if (item && item->variant() == STRING_VAL)
-            {
-                SgValueExp* exp = (SgValueExp*)item;
-                string str = exp->stringValue();
-                str += "\\n";
-                exp->setValue(strdup(str.c_str()));
-            }
-            list = list->rhs();
-        }
-        retSt = new SgCExpStmt(*new SgFunctionCallExp(*new SgSymbol(FUNCTION_NAME, "printf"), *lhs));
-    }
-    else if (st->variant() == PROC_STAT)
-    {  
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert call node\n");
-        lvl_convert_st += 2;
-#endif
-        SgExpression *lhs = st->expr(0);
-        //convertExpr(lhs, lhs);  // !!!! 04.02.25 podd
-
-        if (lhs == NULL || SAPFOR_CONV)
-        {
-            if (lhs)
-                retSt = new SgCExpStmt(*new SgFunctionCallExp(*st->symbol(), *lhs));
-            else
-                retSt = new SgCExpStmt(*new SgFunctionCallExp(*st->symbol()));
-        }
-        else
-        {
-            if (st->symbol()->identifier() == string("random_number"))
-            {
-                if (lhs->variant() != EXPR_LIST || lhs->lhs() == NULL || lhs->lhs()->variant() != VAR_REF)
-                    Error("Unsupported random_number call", "", 660, first_do_par);
-                
-                //rand state
-                lhs->setRhs(new SgExpression(EXPR_LIST, new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "__dvmh_rand_state")), NULL));
-                addRandStateIfNeeded("__dvmh_rand_state");
-
-                retSt = new SgCExpStmt(*new SgFunctionCallExp(*new SgSymbol(VARIABLE_NAME, "__dvmh_rand"), *lhs));                
-            }
-            else
-            {
-                SgStatement* inter = getInterfaceForCall(st->symbol());
-                if (inter)
-                {
-                    //switch arguments by keyword
-                    lhs = switchArgumentsByKeyword(st->symbol()->identifier(), lhs, inter);
-                    //check ommited arguments
-                    //transform fact to formal
-                }
-
-                matchPrototype(st->symbol(), lhs, false);
-                retSt = new SgCExpStmt(*new SgFunctionCallExp(*st->symbol(), *lhs));
-            }
-        }
-#if TRACE
-        lvl_convert_st -= 2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert call node\n");
-#endif
-        needReplace = true;
-    }
-    else if (st->variant() == EXIT_STMT)
-    {
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert exit node\n");
-        lvl_convert_st += 2;
-#endif
-        SgSymbol *constrName = ((SgExitStmt*)st)->constructName();
-        if (constrName)
-        {
-            vector<SgLabel*> labs;
-            vector<SgStatement*> labsSt;
-            createNewLabel(labsSt, labs, constrName->identifier());
-
-            retSt = new SgGotoStmt(*labs[1]);
-        }
-        else
-            retSt = new SgBreakStmt();
-#if TRACE
-        lvl_convert_st-=2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert exit node\n");
-#endif
-        needReplace = true;
-    }
-    else if (st->variant() == CYCLE_STMT)
-    {
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert cycle node\n");
-        lvl_convert_st+=2;
-#endif
-        SgSymbol *constrName = ((SgCycleStmt*)st)->constructName();
-        if (constrName)
-        {
-            vector<SgLabel*> labs;
-            vector<SgStatement*> labsSt;
-            createNewLabel(labsSt, labs, constrName->identifier());
-
-            retSt = new SgGotoStmt(*labs[0]);
-        }
-        else
-            retSt = new SgContinueStmt();
-#if TRACE
-        lvl_convert_st -= 2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert cycle node\n");
-#endif
-        needReplace = true;
-    }
-    else if (st->variant() == RETURN_STAT)
-    {
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert return node\n");
-        lvl_convert_st += 2;
-#endif
-        retSt = new SgReturnStmt();        
-#if TRACE
-        lvl_convert_st-=2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert return node\n");
-#endif
-        needReplace = true;
-    }
-    else
-    {
-        retSt = st;
-        if (st->variant() != CONTROL_END && st->variant() != EXPR_STMT_NODE && first_do_par)
-        {
-            printf("  [STMT ERROR: %s, line %d, user line %d] unsupported variant of node: %s\n", __FILE__, __LINE__, first_do_par->lineNumber(), tag[st->variant()]);
-            if (unSupportedVars.size() != 0)
-                Error("Internal inconsistency in F->C convertation", "", 654, first_do_par);
-        }
-    }
-
-    if (lvl > 0)
-    {
-        if (labSt && retSt)
-            retSts = make_pair<SgStatement*, SgStatement*>(&retSt->copy(), &labSt->copy());
-        else if (labSt)
-            retSts = make_pair<SgStatement*, SgStatement*>(NULL, &labSt->copy());
-        else if (retSt)
-            retSts = make_pair<SgStatement*, SgStatement*>(&retSt->copy(), NULL);
-        else
-            retSts = make_pair<SgStatement*, SgStatement*>(NULL, NULL);
-    }
-    else
-    {
-        if (retSt)
-            retSts = make_pair<SgStatement*, SgStatement*>(&retSt->copy(), NULL);
-    }
-    return needReplace;
-}
-
-void initSupportedVars()
-{
-    supportedVars.insert(ADD_OP);
-    supportedVars.insert(AND_OP);
-    supportedVars.insert(NOT_OP);
-    supportedVars.insert(DIV_OP);
-    supportedVars.insert(EQ_OP);
-    supportedVars.insert(EQV_OP);
-    supportedVars.insert(EXP_OP);
-    supportedVars.insert(GT_OP);
-    supportedVars.insert(GTEQL_OP);
-    supportedVars.insert(LT_OP);
-    supportedVars.insert(LTEQL_OP);
-    supportedVars.insert(MINUS_OP);
-    supportedVars.insert(MULT_OP);
-    supportedVars.insert(NEQV_OP);
-    supportedVars.insert(NOTEQL_OP);
-    supportedVars.insert(OR_OP);
-    supportedVars.insert(SUBT_OP);
-    supportedVars.insert(UNARY_ADD_OP);
-
-    supportedVars.insert(BOOL_VAL);
-    supportedVars.insert(DOUBLE_VAL);
-    supportedVars.insert(FLOAT_VAL);
-    supportedVars.insert(INT_VAL);
-    supportedVars.insert(COMPLEX_VAL);
-
-    supportedVars.insert(CONST_REF);
-    supportedVars.insert(VAR_REF);
-
-    supportedVars.insert(EXPR_LIST);
-
-    supportedVars.insert(FUNC_CALL);
-}
-
-void initF2C_FunctionCalls()
-{
-    handlersOfFunction[string("abs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("and")] = FunctionParam("iand", 0, &__iand_handler);
-    handlersOfFunction[string("amod")] = FunctionParam("fmod", 2, &createNewFCall);
-    handlersOfFunction[string("aimax0")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("ajmax0")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("akmax0")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("aimin0")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("ajmin0")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("akmin0")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("amax1")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("amax0")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("amin1")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("amin0")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("aimag")] = FunctionParam("imag", 1, &createNewFCall);
-    handlersOfFunction[string("alog")] = FunctionParam("log", 1, &createNewFCall);
-    handlersOfFunction[string("alog10")] = FunctionParam("log10", 1, &createNewFCall);
-    handlersOfFunction[string("asin")] = FunctionParam("asin", 1, &createNewFCall);
-    handlersOfFunction[string("asind")] = FunctionParam("asin", 0, &__arc_sincostan_d_handler);
-    handlersOfFunction[string("asinh")] = FunctionParam("asinh", 1, &createNewFCall);
-    handlersOfFunction[string("acos")] = FunctionParam("acos", 1, &createNewFCall);
-    handlersOfFunction[string("acosd")] = FunctionParam("acos", 0, &__arc_sincostan_d_handler);
-    handlersOfFunction[string("acosh")] = FunctionParam("acosh", 1, &createNewFCall);
-    handlersOfFunction[string("atan")] = FunctionParam("atan", 1, &createNewFCall);
-    handlersOfFunction[string("atand")] = FunctionParam("atan", 0, &__arc_sincostan_d_handler);
-    handlersOfFunction[string("atanh")] = FunctionParam("atanh", 1, &createNewFCall);
-    handlersOfFunction[string("atan2")] = FunctionParam("atan2", 2, &createNewFCall);
-    handlersOfFunction[string("atan2d")] = FunctionParam("atan2", 0, &__atan2d_handler);
-    //intrinsicF.insert(string("aint"));
-    //intrinsicF.insert(string("anint"));
-    //intrinsicF.insert(string("achar"));
-    handlersOfFunction[string("babs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("bbclr")] = FunctionParam("ibclr", 2, &createNewFCall);
-    handlersOfFunction[string("bdim")] = FunctionParam("fdim", 2, &createNewFCall);
-    handlersOfFunction[string("biand")] = FunctionParam("iand", 0, &__iand_handler);
-    handlersOfFunction[string("bieor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("bior")] = FunctionParam("ior", 0, &__ior_handler);
-    handlersOfFunction[string("bixor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("btest")] = FunctionParam("btest", 2, &createNewFCall);
-    handlersOfFunction[string("bbset")] = FunctionParam("ibset", 2, &createNewFCall);
-    handlersOfFunction[string("bbtest")] = FunctionParam("btest", 2, &createNewFCall);
-    handlersOfFunction[string("bbits")] = FunctionParam("ibits", 3, &createNewFCall);
-    handlersOfFunction[string("bitest")] = FunctionParam("btest", 2, &createNewFCall);
-    handlersOfFunction[string("bjtest")] = FunctionParam("btest", 2, &createNewFCall);
-    handlersOfFunction[string("bktest")] = FunctionParam("btest", 2, &createNewFCall);
-    handlersOfFunction[string("bessel_j0")] = FunctionParam("j0", 1, &createNewFCall);
-    handlersOfFunction[string("bessel_j1")] = FunctionParam("j1", 1, &createNewFCall);
-    handlersOfFunction[string("bessel_jn")] = FunctionParam("jn", 2, &createNewFCall);
-    handlersOfFunction[string("bessel_y0")] = FunctionParam("y0", 1, &createNewFCall);
-    handlersOfFunction[string("bessel_y1")] = FunctionParam("y1", 1, &createNewFCall);
-    handlersOfFunction[string("bessel_yn")] = FunctionParam("yn", 2, &createNewFCall);
-    handlersOfFunction[string("bmod")] = FunctionParam("mod", 0, &__mod_handler);
-    handlersOfFunction[string("bnot")] = FunctionParam("not", 0, &__not_handler);
-    handlersOfFunction[string("bshft")] = FunctionParam("ishft", 2, &createNewFCall);
-    handlersOfFunction[string("bshftc")] = FunctionParam("ishftc", 0, &__ishftc_handler);
-    handlersOfFunction[string("bsign")] = FunctionParam("copysign", 2, &createNewFCall);
-    handlersOfFunction[string("cos")] = FunctionParam("cos", 1, &createNewFCall);
-    handlersOfFunction[string("ccos")] = FunctionParam("cos", 1, &createNewFCall);
-    handlersOfFunction[string("cdcos")] = FunctionParam("cos", 1, &createNewFCall);
-    handlersOfFunction[string("cosd")] = FunctionParam("cos", 0, &__sindcosdtand_handler);
-    handlersOfFunction[string("cosh")] = FunctionParam("cosh", 1, &createNewFCall);
-    handlersOfFunction[string("cotan")] = FunctionParam("tan", 0, &__cotan_handler);
-    handlersOfFunction[string("cotand")] = FunctionParam("tan", 0, &__cotand_handler);
-    handlersOfFunction[string("cexp")] = FunctionParam("exp", 1, &createNewFCall);
-    handlersOfFunction[string("cdexp")] = FunctionParam("exp", 1, &createNewFCall);
-    handlersOfFunction[string("conjg")] = FunctionParam("conj", 1, &createNewFCall);
-    handlersOfFunction[string("csqrt")] = FunctionParam("sqrt", 1, &createNewFCall);
-    handlersOfFunction[string("clog")] = FunctionParam("log", 1, &createNewFCall);
-    handlersOfFunction[string("clog10")] = FunctionParam("log10", 1, &createNewFCall);
-    handlersOfFunction[string("cdlog")] = FunctionParam("log", 1, &createNewFCall);
-    handlersOfFunction[string("cdlog10")] = FunctionParam("log10", 1, &createNewFCall);
-    handlersOfFunction[string("cdsqrt")] = FunctionParam("sqrt", 1, &createNewFCall);
-    handlersOfFunction[string("csin")] = FunctionParam("sin", 1, &createNewFCall);
-    handlersOfFunction[string("ctan")] = FunctionParam("tan", 1, &createNewFCall);
-    handlersOfFunction[string("cabs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("cdabs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("cdsin")] = FunctionParam("sin", 1, &createNewFCall);
-    handlersOfFunction[string("cdtan")] = FunctionParam("tan", 1, &createNewFCall);
-    handlersOfFunction[string("cmplx")] = FunctionParam("cmplx2", 0, &__cmplx_handler);
-    //intrinsicF.insert(string("char"));
-    handlersOfFunction[string("dim")] = FunctionParam("fdim", 2, &createNewFCall);
-    handlersOfFunction[string("ddim")] = FunctionParam("fdim", 2, &createNewFCall);
-    handlersOfFunction[string("dble")] = FunctionParam("double", 1, &createNewFCall);
-    handlersOfFunction[string("dfloat")] = FunctionParam("double", 1, &createNewFCall);
-    handlersOfFunction[string("dfloti")] = FunctionParam("double", 1, &createNewFCall);
-    handlersOfFunction[string("dflotj")] = FunctionParam("double", 1, &createNewFCall);
-    handlersOfFunction[string("dflotk")] = FunctionParam("double", 1, &createNewFCall);
-    //intrinsicF.insert(string("dint"));
-    handlersOfFunction[string("dmax1")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("dmin1")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("dmod")] = FunctionParam("fmod", 2, &createNewFCall);
-    handlersOfFunction[string("dprod")] = FunctionParam("dprod", 2, &createNewFCall);
-    handlersOfFunction[string("dreal")] = FunctionParam("real", 1, &createNewFCall);
-    handlersOfFunction[string("dsign")] = FunctionParam("copysign", 2, &createNewFCall);
-    handlersOfFunction[string("dabs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("dsqrt")] = FunctionParam("sqrt", 1, &createNewFCall);
-    handlersOfFunction[string("dexp")] = FunctionParam("exp", 1, &createNewFCall);
-    handlersOfFunction[string("derf")] = FunctionParam("erf", 1, &createNewFCall);
-    handlersOfFunction[string("derfc")] = FunctionParam("erfc", 1, &createNewFCall);
-    handlersOfFunction[string("dlog")] = FunctionParam("log", 1, &createNewFCall);
-    handlersOfFunction[string("dlog10")] = FunctionParam("log10", 1, &createNewFCall);
-    handlersOfFunction[string("dsin")] = FunctionParam("sin", 1, &createNewFCall);
-    handlersOfFunction[string("dcos")] = FunctionParam("cos", 1, &createNewFCall);
-    handlersOfFunction[string("dcosd")] = FunctionParam("cos", 0, &__sindcosdtand_handler);
-    handlersOfFunction[string("dtan")] = FunctionParam("tan", 1, &createNewFCall);
-    handlersOfFunction[string("dasin")] = FunctionParam("asin", 1, &createNewFCall);
-    handlersOfFunction[string("dasind")] = FunctionParam("asin", 0, &__arc_sincostan_d_handler);
-    handlersOfFunction[string("dasinh")] = FunctionParam("asinh", 1, &createNewFCall);
-    handlersOfFunction[string("dacos")] = FunctionParam("acos", 1, &createNewFCall);
-    handlersOfFunction[string("dacosd")] = FunctionParam("acos", 0, &__arc_sincostan_d_handler);
-    handlersOfFunction[string("dacosh")] = FunctionParam("acosh", 1, &createNewFCall);
-    handlersOfFunction[string("datan")] = FunctionParam("atan", 1, &createNewFCall);
-    handlersOfFunction[string("datand")] = FunctionParam("atan", 0, &__arc_sincostan_d_handler);
-    handlersOfFunction[string("datanh")] = FunctionParam("atanh", 1, &createNewFCall);
-    handlersOfFunction[string("datan2")] = FunctionParam("atan2", 2, &createNewFCall);
-    handlersOfFunction[string("datan2d")] = FunctionParam("atan2", 0, &__atan2d_handler);
-    handlersOfFunction[string("dsind")] = FunctionParam("sin", 0, &__sindcosdtand_handler);
-    handlersOfFunction[string("dsinh")] = FunctionParam("sinh", 1, &createNewFCall);
-    handlersOfFunction[string("dcosh")] = FunctionParam("cosh", 1, &createNewFCall);
-    handlersOfFunction[string("dcotan")] = FunctionParam("tan", 0, &__cotan_handler);
-    handlersOfFunction[string("dcotand")] = FunctionParam("tan", 0, &__cotand_handler);
-    handlersOfFunction[string("dshiftl")] = FunctionParam("dshiftl", 3, &createNewFCall);
-    handlersOfFunction[string("dshiftr")] = FunctionParam("dshiftr", 3, &createNewFCall);
-    handlersOfFunction[string("dtand")] = FunctionParam("tan", 0, &__sindcosdtand_handler);
-    handlersOfFunction[string("dtanh")] = FunctionParam("tanh", 1, &createNewFCall);
-    //intrinsicF.insert(string("dnint"));
-    handlersOfFunction[string("dcmplx")] = FunctionParam("dcmplx2", 0, &__cmplx_handler);
-    handlersOfFunction[string("dconjg")] = FunctionParam("conj", 1, &createNewFCall);
-    handlersOfFunction[string("dimag")] = FunctionParam("imag", 1, &createNewFCall);
-    handlersOfFunction[string("exp")] = FunctionParam("exp", 1, &createNewFCall);
-    handlersOfFunction[string("erf")] = FunctionParam("erf", 1, &createNewFCall);
-    handlersOfFunction[string("erfc")] = FunctionParam("erfc", 1, &createNewFCall);
-    handlersOfFunction[string("erfc_scaled")] = FunctionParam("erfcx", 1, &createNewFCall);
-    handlersOfFunction[string("float")] = FunctionParam("float", 1, &createNewFCall);
-    handlersOfFunction[string("floati")] = FunctionParam("float", 1, &createNewFCall);
-    handlersOfFunction[string("floatj")] = FunctionParam("float", 1, &createNewFCall);
-    handlersOfFunction[string("floatk")] = FunctionParam("float", 1, &createNewFCall);
-    handlersOfFunction[string("gamma")] = FunctionParam("tgamma", 1, &createNewFCall);
-    handlersOfFunction[string("habs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("hbclr")] = FunctionParam("ibclr", 2, &createNewFCall);
-    handlersOfFunction[string("hbits")] = FunctionParam("ibits", 3, &createNewFCall);
-    handlersOfFunction[string("hbset")] = FunctionParam("ibset", 2, &createNewFCall);
-    handlersOfFunction[string("hdim")] = FunctionParam("fdim", 2, &createNewFCall);
-    handlersOfFunction[string("hiand")] = FunctionParam("iand", 0, &__iand_handler);
-    handlersOfFunction[string("hieor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("hior")] = FunctionParam("ior", 0, &__ior_handler);
-    handlersOfFunction[string("hixor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("hmod")] = FunctionParam("mod", 0, &__mod_handler);
-    handlersOfFunction[string("hnot")] = FunctionParam("not", 0, &__not_handler);
-    handlersOfFunction[string("hshft")] = FunctionParam("ishft", 2, &createNewFCall);
-    handlersOfFunction[string("hshftc")] = FunctionParam("ishftc", 0, &__ishftc_handler);
-    handlersOfFunction[string("hsign")] = FunctionParam("copysign", 2, &createNewFCall);
-    handlersOfFunction[string("htest")] = FunctionParam("btest", 2, &createNewFCall);
-    handlersOfFunction[string("hypot")] = FunctionParam("hypot", 2, &createNewFCall);
-    handlersOfFunction[string("int")] = FunctionParam("int", 1, &createNewFCall);
-    handlersOfFunction[string("idint")] = FunctionParam("int", 1, &createNewFCall);
-    handlersOfFunction[string("ifix")] = FunctionParam("int", 1, &createNewFCall);
-    handlersOfFunction[string("imag")] = FunctionParam("imag", 1, &createNewFCall);
-    handlersOfFunction[string("imod")] = FunctionParam("mod", 0, &__mod_handler);
-    handlersOfFunction[string("inot")] = FunctionParam("not", 0, &__not_handler);
-    handlersOfFunction[string("idim")] = FunctionParam("fdim", 2, &createNewFCall);
-    handlersOfFunction[string("isign")] = FunctionParam("copysign", 2, &createNewFCall);
-    //intrinsicF.insert(string("index"));
-    handlersOfFunction[string("iabs")] = FunctionParam("abs", 1, &createNewFCall);
-    //intrinsicF.insert(string("idnint"));
-    //intrinsicF.insert(string("ichar"));
-    handlersOfFunction[string("iand")] = FunctionParam("iand", 0, &__iand_handler);
-    handlersOfFunction[string("iiabs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("iiand")] = FunctionParam("iand", 0, &__iand_handler);
-    handlersOfFunction[string("iibclr")] = FunctionParam("ibclr", 2, &createNewFCall);
-    handlersOfFunction[string("iibits")] = FunctionParam("ibits", 3, &createNewFCall);
-    handlersOfFunction[string("iibset")] = FunctionParam("ibset", 2, &createNewFCall);
-    handlersOfFunction[string("iidim")] = FunctionParam("fdim", 2, &createNewFCall);
-    handlersOfFunction[string("iieor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("iior")] = FunctionParam("ior", 0, &__ior_handler);
-    handlersOfFunction[string("iishft")] = FunctionParam("ishft", 2, &createNewFCall);
-    handlersOfFunction[string("iishftc")] = FunctionParam("ishftc", 0, &__ishftc_handler);
-    handlersOfFunction[string("iisign")] = FunctionParam("copysign", 2, &createNewFCall);
-    handlersOfFunction[string("iixor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("ior")] = FunctionParam("ior", 0, &__ior_handler);
-    handlersOfFunction[string("ibset")] = FunctionParam("ibset", 2, &createNewFCall);
-    handlersOfFunction[string("ibclr")] = FunctionParam("ibclr", 2, &createNewFCall);
-    handlersOfFunction[string("ibchng")] = FunctionParam("ibchng", 2, &createNewFCall);
-    handlersOfFunction[string("ibits")] = FunctionParam("ibits", 3, &createNewFCall);
-    handlersOfFunction[string("ieor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("ilen")] = FunctionParam("ilen", 1, &createNewFCall);
-    handlersOfFunction[string("imax0")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("imax1")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("imin0")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("imin1")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("isha")] = FunctionParam("isha", 2, &createNewFCall);
-    handlersOfFunction[string("ishc")] = FunctionParam("ishc", 2, &createNewFCall);
-    handlersOfFunction[string("ishft")] = FunctionParam("ishft", 2, &createNewFCall);
-    handlersOfFunction[string("ishftc")] = FunctionParam("ishftc", 0, &__ishftc_handler);
-    handlersOfFunction[string("ishl")] = FunctionParam("ishft", 2, &createNewFCall);
-    handlersOfFunction[string("ixor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("jiabs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("jiand")] = FunctionParam("iand", 0, &__iand_handler);
-    handlersOfFunction[string("jibclr")] = FunctionParam("ibclr", 2, &createNewFCall);
-    handlersOfFunction[string("jibits")] = FunctionParam("ibits", 3, &createNewFCall);
-    handlersOfFunction[string("jibset")] = FunctionParam("ibset", 2, &createNewFCall);
-    handlersOfFunction[string("jidim")] = FunctionParam("fdim", 2, &createNewFCall);
-    handlersOfFunction[string("jieor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("jior")] = FunctionParam("ior", 0, &__ior_handler);
-    handlersOfFunction[string("jishft")] = FunctionParam("ishft", 2, &createNewFCall);
-    handlersOfFunction[string("jishftc")] = FunctionParam("ishftc", 0, &__ishftc_handler);
-    handlersOfFunction[string("jisign")] = FunctionParam("copysign", 2, &createNewFCall);
-    handlersOfFunction[string("jixor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("jmax0")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("jmax1")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("jmin0")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("jmin1")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("jmod")] = FunctionParam("mod", 0, &__mod_handler);
-    handlersOfFunction[string("jnot")] = FunctionParam("not", 0, &__not_handler);
-    handlersOfFunction[string("kiabs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("kiand")] = FunctionParam("iand", 0, &__iand_handler);
-    handlersOfFunction[string("kibclr")] = FunctionParam("ibclr", 2, &createNewFCall);
-    handlersOfFunction[string("kibits")] = FunctionParam("ibits", 3, &createNewFCall);
-    handlersOfFunction[string("kibset")] = FunctionParam("ibset", 2, &createNewFCall);
-    handlersOfFunction[string("kidim")] = FunctionParam("fdim", 2, &createNewFCall);
-    handlersOfFunction[string("kieor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("kior")] = FunctionParam("ior", 0, &__ior_handler);
-    handlersOfFunction[string("kishft")] = FunctionParam("ishft", 2, &createNewFCall);
-    handlersOfFunction[string("kishftc")] = FunctionParam("ishftc", 0, &__ishftc_handler);
-    handlersOfFunction[string("kisign")] = FunctionParam("copysign", 2, &createNewFCall);
-    handlersOfFunction[string("kmax0")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("kmax1")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("kmin0")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("kmin1")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("kmod")] = FunctionParam("mod", 0, &__mod_handler);
-    handlersOfFunction[string("knot")] = FunctionParam("not", 0, &__not_handler);
-    //intrinsicF.insert(string("len"));
-    //intrinsicF.insert(string("lge"));
-    //intrinsicF.insert(string("lgt"));
-    //intrinsicF.insert(string("lle"));
-    //intrinsicF.insert(string("llt"));
-    handlersOfFunction[string("log_gamma")] = FunctionParam("lgamma", 1, &createNewFCall);
-    handlersOfFunction[string("log")] = FunctionParam("log", 1, &createNewFCall);
-    handlersOfFunction[string("log10")] = FunctionParam("log10", 1, &createNewFCall);
-    handlersOfFunction[string("lshft")] = FunctionParam("lshft", 2, &createNewFCall);
-    handlersOfFunction[string("lshift")] = FunctionParam("lshft", 2, &createNewFCall);
-    handlersOfFunction[string("max")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("max0")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("max1")] = FunctionParam("max", 0, &__minmax_handler);
-    handlersOfFunction[string("merge_bits")] = FunctionParam("merge_bits", 0, &__merge_bits_handler);
-    handlersOfFunction[string("min")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("min0")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("min1")] = FunctionParam("min", 0, &__minmax_handler);
-    handlersOfFunction[string("mod")] = FunctionParam("mod", 0, &__mod_handler);
-    handlersOfFunction[string("modulo")] = FunctionParam("modulo", 0, &__modulo_handler);
-    handlersOfFunction[string("not")] = FunctionParam("not", 0, &__not_handler);
-    //intrinsicF.insert(string("nint"));
-    handlersOfFunction[string("popcnt")] = FunctionParam("popcnt", 1, &createNewFCall);
-    handlersOfFunction[string("poppar")] = FunctionParam("popcnt", 1, &__poppar_handler);
-    handlersOfFunction[string("real")] = FunctionParam("real", 1, &createNewFCall);
-    handlersOfFunction[string("rshft")] = FunctionParam("rshft", 2, &createNewFCall);
-    handlersOfFunction[string("rshift")] = FunctionParam("rshft", 2, &createNewFCall);
-    handlersOfFunction[string("or")] = FunctionParam("ior", 0, &__ior_handler);
-    handlersOfFunction[string("sign")] = FunctionParam("copysign", 2, &createNewFCall);
-    handlersOfFunction[string("sngl")] = FunctionParam("real", 1, &createNewFCall);
-    handlersOfFunction[string("sqrt")] = FunctionParam("sqrt", 1, &createNewFCall);
-    handlersOfFunction[string("sin")] = FunctionParam("sin", 1, &createNewFCall);
-    handlersOfFunction[string("sind")] = FunctionParam("sin", 0, &__sindcosdtand_handler);
-    handlersOfFunction[string("sinh")] = FunctionParam("sinh", 1, &createNewFCall);
-    handlersOfFunction[string("shifta")] = FunctionParam("shifta", 2, &createNewFCall);
-    handlersOfFunction[string("shiftl")] = FunctionParam("lshft", 2, &createNewFCall);
-    handlersOfFunction[string("shiftr")] = FunctionParam("shiftr", 2, &createNewFCall);
-    handlersOfFunction[string("tan")] = FunctionParam("tan", 1, &createNewFCall);
-    handlersOfFunction[string("tand")] = FunctionParam("tan", 0, &__sindcosdtand_handler);
-    handlersOfFunction[string("tanh")] = FunctionParam("tanh", 1, &createNewFCall);
-    handlersOfFunction[string("trailz")] = FunctionParam("trailz", 1, &createNewFCall);
-    handlersOfFunction[string("xor")] = FunctionParam("ieor", 0, &__ieor_handler);
-    handlersOfFunction[string("zabs")] = FunctionParam("abs", 1, &createNewFCall);
-    handlersOfFunction[string("zcos")] = FunctionParam("cos", 1, &createNewFCall);
-    handlersOfFunction[string("zexp")] = FunctionParam("exp", 1, &createNewFCall);
-    handlersOfFunction[string("zlog")] = FunctionParam("log", 1, &createNewFCall);
-    handlersOfFunction[string("zsin")] = FunctionParam("sin", 1, &createNewFCall);
-    handlersOfFunction[string("zsqrt")] = FunctionParam("sqrt", 1, &createNewFCall);
-    handlersOfFunction[string("ztan")] = FunctionParam("tan", 1, &createNewFCall);
-}
-
-static void correctLabelsUse(SgStatement *firstStmt, SgStatement *lastStmt)
-{
-    if (firstStmt == lastStmt)
-        return;
-
-    SgStatement *copyFSt = firstStmt->lexNext();
-    SgStatement *toRem = NULL;
-    while (copyFSt != lastStmt)
-    {
-        if (copyFSt->variant() == LABEL_STAT)
-        {
-            if (labels_num.find(BIF_LABEL_USE(copyFSt->thebif)->stateno) == labels_num.end())
-                toRem = copyFSt;
-        }
-        copyFSt = copyFSt->lexNext();
-        if (toRem != NULL)
-        {
-            toRem->deleteStmt();
-            toRem = NULL;
-        }
-    }
-}
-
-SgStatement* Translate_Fortran_To_C(SgStatement *Stmt, bool isSapforConv)
-{
-#if TRACE
-    printf("START: CONVERTION OF BODY ON LINE %d\n", number_of_loop_line);
-#endif
-    if (isSapforConv)
-    {
-        SAPFOR_CONV = 1;
-        if (handlersOfFunction.size() == 0)
-            initF2C_FunctionCalls();
-    }
-
-    map<string, int> redArraysWithUnknownSize;
-    SgExpression* er = red_list;
-    for (reduction_operation_list* rsl = red_struct_list; rsl && er; rsl = rsl->next, er = er->rhs())
-        if (rsl->redvar_size < 0)
-            redArraysWithUnknownSize[rsl->redvar->identifier()] = RedFuncNumber(er->lhs()->lhs());
-
-    SgStatement *copyFSt = Stmt;
-    SgStatement* last = (Stmt == Stmt->lastNodeOfStmt()) ? Stmt->lastNodeOfStmt() : Stmt->lastExecutable();
-
-    vector<stack<SgStatement*> > copyBlock;
-    labelsExitCycle.clear();
-    autoTfmReplacing.clear();
-    labels_num.clear();
-    cond_generator = 0;
-    unSupportedVars.clear();
-    bool needReplace = false;
-    pair<SgStatement*, SgStatement*> converted;
-
-#if TRACE
-    printfSpaces(lvl_convert_st);
-    printf("convert Stmt\n");
-    lvl_convert_st += 2;
-#endif
-    needReplace = convertStmt(copyFSt, converted, copyBlock, 0, 0, redArraysWithUnknownSize);
-#if TRACE
-    lvl_convert_st-=2;
-    printfSpaces(lvl_convert_st);
-    printf("end of convert Stmt\n");
-#endif
-
-    if (needReplace && !isSapforConv)
-    {       
-        char *comm = copyFSt->comments();
-        if (comm)
-            converted.first->addComment(comm);
-
-        if (converted.first)
-            copyFSt->insertStmtBefore(*converted.first, *copyFSt->controlParent());
-
-        copyFSt->deleteStmt();
-    }
-        
-    if (first_do_par)
-    {
-        for (set<int>::iterator i = unSupportedVars.begin(); i != unSupportedVars.end(); i++)
-            printf("  [EXPR ERROR: %s, line %d, %d] unsupported variant of node: %s\n", __FILE__, __LINE__, first_do_par->lineNumber(), tag[*i]);
-        if (unSupportedVars.size() != 0)
-            Error("Internal inconsistency in F->C convertation", "", 654, first_do_par);
-    }
-
-    correctLabelsUse(Stmt, last);
-
-#if TRACE
-    printf("END: CONVERTION OF BODY ON LINE %d\n", number_of_loop_line);
-#endif
-
-    return converted.first;
-}
-
-void Translate_Fortran_To_C(SgStatement *firstStmt, SgStatement *lastStmt, int countOfCopy, SgStatement *st_header)
-{ // entry for translating copy of the procedure called from Cuda-kernel    
-    first_do_par = st_header;
-    SgStatement *save_st = cur_func;
-    cur_func = st_header;
-    std::vector < std::stack < SgStatement*> > zero = std::vector < std::stack < SgStatement*> >(0);
-
-    Translate_Fortran_To_C(firstStmt, lastStmt, zero, countOfCopy);
-
-    first_do_par = NULL;
-    cur_func = save_st;
-    return;
-}
-
-void Translate_Fortran_To_C(SgStatement *firstStmt, SgStatement *lastStmt, vector<stack<SgStatement*> > &copyBlock, int countOfCopy)
-{
-#if TRACE
-    printf("START: CONVERTION OF BODY ON LINE %d\n", number_of_loop_line);
-    lvl_convert_st += 2;
-#endif
-
-    map<string, int> redArraysWithUnknownSize;
-    SgExpression* er = red_list;
-    for (reduction_operation_list* rsl = red_struct_list; rsl && er; rsl = rsl->next, er = er->rhs())
-        if (rsl->redvar_size < 0)
-            redArraysWithUnknownSize[rsl->redvar->identifier()] = RedFuncNumber(er->lhs()->lhs());
-
-    SgStatement *copyFSt = firstStmt->lexNext();
-    vector<SgStatement*> forRemove;        
-    labelsExitCycle.clear();
-    autoTfmReplacing.clear();
-    labels_num.clear();
-    unSupportedVars.clear();
-    insertAfter.clear();
-    insertBefore.clear();
-    replaced.clear();
-    cond_generator = 0;
-    arrayGenNum = 0;
-
-    if (countOfCopy)
-        copyBlock = vector<stack< SgStatement*> >(countOfCopy);
-
-    while (copyFSt != lastStmt)
-    {
-        bool needReplace = false;
-        pair<SgStatement*, SgStatement*> converted;
-#if TRACE
-        printfSpaces(lvl_convert_st);
-        printf("convert Stmt\n");
-        lvl_convert_st += 2;
-#endif        
-        needReplace = convertStmt(copyFSt, converted, copyBlock, countOfCopy, 0, redArraysWithUnknownSize);
-#if TRACE
-        lvl_convert_st-=2;
-        printfSpaces(lvl_convert_st);
-        printf("end of convert Stmt\n");
-#endif
-        if (needReplace)
-        {
-            if (converted.first)
-            {
-                char *comm = copyFSt->comments();
-                if (comm)
-                    converted.first->addComment(comm);
-                               
-                copyFSt->insertStmtBefore(*converted.first, *copyFSt->controlParent());
-                replaced[converted.first] = copyFSt;
-                for (int i = 0; i < countOfCopy; ++i)
-                    copyBlock[i].push(&converted.first->copy());
-            }
-
-            SgStatement *tmp1 = copyFSt;
-            forRemove.push_back(tmp1);
-            setControlLexNext(copyFSt);
-        }
-        else
-            copyFSt = copyFSt->lexNext();
-    }
-
-    for (size_t i = 0; i < forRemove.size(); ++i)
-        forRemove[i]->deleteStmt();
-
-    for (set<int>::iterator i = unSupportedVars.begin(); i != unSupportedVars.end(); i++)
-        printf("  [EXPR ERROR: %s, line %d, %d] unsupported variant of node: %s\n", __FILE__, __LINE__, first_do_par->lineNumber(), tag[*i]);
-    if (unSupportedVars.size() != 0)
-        Error("Internal inconsistency in F->C convertation", "", 654, first_do_par);
-
-    correctLabelsUse(firstStmt->lexNext(), lastStmt);
-
-    if (options.isOn(AUTO_TFM))
-    {
-        SgStatement* copyFSt = firstStmt->lexNext();
-        if (insertAfter.size() || insertBefore.size())
-        {
-            while (copyFSt != lastStmt)
-            {
-                SgStatement* key = (replaced.find(copyFSt) != replaced.end()) ? replaced[copyFSt] : copyFSt;
-                if (insertAfter.find(key) != insertAfter.end())
-                {
-                    for (int z = 0; z < insertAfter[key].size(); ++z)
-                        copyFSt->insertStmtAfter(*insertAfter[key][z]);
-                }
-                if (insertBefore.find(key) != insertBefore.end())
-                {
-                    for (int z = 0; z < insertBefore[key].size(); ++z)
-                        copyFSt->insertStmtBefore(*insertBefore[key][z]);
-                }
-                copyFSt = copyFSt->lexNext();
-            }
-        }
-    }
-#if TRACE
-    lvl_convert_st -= 2;
-    printf("END: CONVERTION OF BODY ON LINE %d\n", number_of_loop_line);
-#endif
-}
-
-void  ChangeSymbolName(SgSymbol *symb)
-{ 
-    char *name = new  char[strlen(symb->identifier())+2];
-    sprintf(name, "_%s", symb->identifier());
-    SYMB_IDENT(symb->thesymb) = name;
-}
-
-void RenamingNewProcedureVariables(SgSymbol *proc_name)
-{
-    // replacing new procedure names to avoid conflicts with C language keywords and intrinsic function names
-    SgSymbol *sl;
-    for(sl = proc_name; sl; sl = sl->next())
-        switch(sl->variant())
-        {
-            case VARIABLE_NAME:
-            case CONST_NAME:
-            case FIELD_NAME:
-            case TYPE_NAME:
-            case LABEL_VAR:
-            case COMMON_NAME:
-            case NAMELIST_NAME:
-                ChangeSymbolName(sl);
-                break;
-            default:
-               break; 
-        }
-}
-
-SgSymbol *hasSameNameAsSource(SgSymbol *symb)
-{
-    symb_list *sl;
-    if (!symb)
-        return NULL;
-    if (sl=isInSymbListByChar(symb, acc_array_list))
-        return sl->symb;
-    SgExpression *el;
-    if (newVars.size() != 0)
-    {
-        correctPrivateList(RESTORE);
-        newVars.clear();
-    }
-    for (el = private_list; el; el = el->rhs())
-        if (!strcmp(el->lhs()->symbol()->identifier(), symb->identifier()))
-            return el->lhs()->symbol();
-    if (el=isInUsesListByChar(symb->identifier()))
-        return el->lhs()->symbol();
-    for (el = dvm_parallel_dir ? dvm_parallel_dir->expr(2) : NULL; el; el = el->rhs())
-        if (!strcmp(el->lhs()->symbol()->identifier(), symb->identifier()))
-            return el->lhs()->symbol();
-    reduction_operation_list *rl;
-    for (rl = red_struct_list; rl; rl = rl->next)
-    { 
-        if(rl->redvar && !strcmp(rl->redvar->identifier(), symb->identifier()))
-            return rl->redvar;
-        if(rl->locvar && !strcmp(rl->locvar->identifier(), symb->identifier()))
-            return rl->locvar;
-    }
-    return NULL;
-}
-
-int sameVariableName(SgSymbol *symb1, SgSymbol *symb2)
-{
-     if (!symb1 || !symb2 || (symb1->variant() != VARIABLE_NAME && symb1->variant() != CONST_NAME && symb1->variant() != FUNCTION_NAME) || symb2->variant() != VARIABLE_NAME && symb2->variant() != CONST_NAME && symb2->variant() != FUNCTION_NAME)
-         return 0;
-     if (!strcmp (symb1->identifier(), symb2->identifier()))
-         return 1;
-     else
-         return 0;
-}
-
-void replaceSymbolSameNameInExpr(SgExpression *expr, SgSymbol *symb, SgSymbol *s_new)
-{
-    //SgRecordRefExp *re;
-    if (!expr || !symb || !s_new)
-       return;
-    if (expr->symbol())
-        if (sameVariableName(expr->symbol(), symb))
-            expr->setSymbol(s_new);
-    replaceSymbolSameNameInExpr(expr->lhs(), symb, s_new);
-    replaceSymbolSameNameInExpr(expr->rhs(), symb, s_new);
-}
-
-void replaceVariableSymbSameNameInStatements(SgStatement *first, SgStatement *last, SgSymbol *symb, SgSymbol *s_new, int replace_flag)
-{
-    SgStatement *stmt;
-    for (stmt=first; stmt; stmt = stmt->lexNext())
-    {
-         if (sameVariableName (stmt->symbol(), symb))
-             stmt->setSymbol(*s_new);
-         replaceSymbolSameNameInExpr(stmt->expr(0), symb, s_new);
-         replaceSymbolSameNameInExpr(stmt->expr(1), symb, s_new);
-         replaceSymbolSameNameInExpr(stmt->expr(2), symb, s_new);
-         if (last &&  stmt == last)
-             break;
-    }
-}
-
-void RenamingCudaFunctionVariables(SgStatement *first, SgSymbol *k_symb, int replace_flag)
-{   // replacing kernel names to avoid conflicts with C language keywords and intrinsic function names
-    SgSymbol *sl;
-    for (sl=k_symb->next(); sl; sl=sl->next())
-    {
-        if (sl->scope() != first || sl->variant() != VARIABLE_NAME)
-            continue;
-
-        SgSymbol *s_symb = hasSameNameAsSource(sl);
-        if (s_symb)
-        {   
-            if (replace_flag)
-                replaceVariableSymbSameNameInStatements(first,first->lastNodeOfStmt(), s_symb, sl, replace_flag);
-            ChangeSymbolName(sl);
-        }        
-    }    
-}
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c_handlers.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
deleted file mode 100644
index b4d9f34..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_f2c_handlers.cpp
+++ /dev/null
@@ -1,305 +0,0 @@
-#include "dvm.h"
-
-void __convert_args(SgExpression *expr, SgExpression *&Arg, SgExpression *&Arg1, SgExpression *&Arg2)
-{
-    SgExpression *currArgs = ((SgFunctionCallExp *)expr)->args();
-    Arg = currArgs->lhs();
-    Arg1 = currArgs->rhs()->lhs();
-    Arg2 = currArgs->rhs()->rhs()->lhs();
-    convertExpr(Arg, Arg);
-    convertExpr(Arg1, Arg1);
-    convertExpr(Arg2, Arg2);
-}
-
-void __convert_args(SgExpression *expr, SgExpression *&Arg, SgExpression *&Arg1)
-{
-    SgExpression *currArgs = ((SgFunctionCallExp *)expr)->args();
-    Arg = currArgs->lhs();
-    Arg1 = currArgs->rhs()->lhs();
-    convertExpr(Arg, Arg);
-    convertExpr(Arg1, Arg1);
-}
-
-void __convert_args(SgExpression *expr, SgExpression *&Arg)
-{
-    SgExpression *currArgs = ((SgFunctionCallExp *)expr)->args();
-    Arg = currArgs->lhs();
-    convertExpr(Arg, Arg);
-}
-
-void __cmplx_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *currArgs = ((SgFunctionCallExp *)expr)->args();
-    int countArgs = 0;
-    bool kind = false;
-    int kind_val = -1;
-    int kind_pos = -1;
-
-    while (currArgs)
-    {
-        if (currArgs->lhs()->variant() == KEYWORD_ARG)
-        {
-            kind = true;
-            kind_val = currArgs->lhs()->rhs()->valueInteger();
-            kind_pos = countArgs;
-        }
-        countArgs++;        
-        currArgs = currArgs->rhs();
-    }
-    if (kind == false)
-    {
-        if (countArgs == 1)
-            createNewFCall(expr, retExp, name, 1);
-        else if (countArgs == 2)
-            createNewFCall(expr, retExp, name, 2);
-        else if (countArgs == 3) // with KIND
-        {
-            kind_val = ((SgFunctionCallExp *)expr)->args()->rhs()->rhs()->lhs()->valueInteger();
-            if (kind_val == 4)
-                createNewFCall(expr, retExp, "cmplx2", 2);
-            else if (kind_val == 8)
-                createNewFCall(expr, retExp, "dcmplx2", 2);
-            else
-                createNewFCall(expr, retExp, name, 2);
-        }
-    }
-    else // with key word KIND
-    {
-        const char *name_kind;
-        if (kind_val == 4)
-            name_kind = "cmplx2";
-        else if (kind_val == 8)
-            name_kind = "dcmplx2";
-        else
-            name_kind = name;
-
-        if (countArgs == 2)
-            createNewFCall(expr, retExp, name_kind, 1);
-        else if (countArgs == 3)
-        {
-            if (kind_pos == 2)
-                createNewFCall(expr, retExp, name_kind, 2);
-            else if (kind_pos == 0)
-            {            
-                SgFunctionCallExp *tmp = new SgFunctionCallExp(*createNewFunctionSymbol(NULL));
-                tmp->addArg(*((SgFunctionCallExp *)expr)->args()->rhs()->lhs());
-                tmp->addArg(*((SgFunctionCallExp *)expr)->args()->rhs()->rhs()->lhs());
-
-                createNewFCall(tmp, retExp, name_kind, 2);
-            }
-            else
-                createNewFCall(expr, retExp, "ERROR", 1);
-        }
-    }
-}
-
-void __minmax_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *currArgs = ((SgFunctionCallExp *)expr)->args();
-    SgFunctionCallExp *retFunc = createNewFCall(name);
-    //set first 2 agrs
-    SgExpression *Arg = currArgs->lhs();
-    convertExpr(Arg, Arg);
-    retFunc->addArg(*Arg);
-
-    currArgs = currArgs->rhs();
-    Arg = currArgs->lhs();
-    convertExpr(Arg, Arg);
-    retFunc->addArg(*Arg);
-
-    currArgs = currArgs->rhs();
-    //create nested MAX/MIN functions 
-    while (currArgs)
-    {
-        SgFunctionCallExp *tmp = createNewFCall(name);
-        tmp->addArg(*retFunc);
-        Arg = currArgs->lhs();
-        convertExpr(Arg, Arg);
-        tmp->addArg(*Arg);
-        currArgs = currArgs->rhs();
-        retFunc = tmp;
-    }
-    retExp = retFunc;
-}
-
-static bool isArgIntType(SgExpression *Arg)
-{
-    bool res = true;
-    if (Arg->variant() == VAR_REF)
-    {
-        SgType *tmp = Arg->symbol()->type();
-        if (tmp->equivalentToType(C_Type(SgTypeDouble())) ||
-            tmp->equivalentToType(C_Type(SgTypeFloat())))
-            res = false;
-    }
-    else
-    {
-        if (Arg->lhs())
-            res = res && isArgIntType(Arg->lhs());
-        if (Arg->rhs())
-            res = res && isArgIntType(Arg->rhs());
-    }
-    return res;
-}
-//TODO: add more complex analysis above
-void __mod_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *Arg, *Arg1;
-    __convert_args(expr, Arg, Arg1);
-    if (isArgIntType(Arg) && isArgIntType(Arg1))
-        retExp = &(*Arg % *Arg1);
-    else
-    {
-        retExp = createNewFCall("fmod");
-        ((SgFunctionCallExp*) retExp)->addArg(*Arg);
-        ((SgFunctionCallExp*) retExp)->addArg(*Arg1);
-    }
-}
-
-void __iand_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *Arg, *Arg1;
-    __convert_args(expr, Arg, Arg1);
-    retExp = &(*Arg & *Arg1);
-}
-
-void __ior_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *Arg, *Arg1;
-    __convert_args(expr, Arg, Arg1);
-    retExp = &(*Arg | *Arg1);
-}
-
-void __ieor_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *Arg, *Arg1;
-    __convert_args(expr, Arg, Arg1);
-
-    SgExpression *xor_op = new SgExpression(XOR_OP);
-    xor_op->setLhs(*Arg);
-    xor_op->setRhs(*Arg1);
-    retExp = xor_op;
-}
-
-void __arc_sincostan_d_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *Arg;
-    __convert_args(expr, Arg);
-
-    SgFunctionCallExp *retFunc = createNewFCall(name);
-    retFunc->addArg(*Arg);
-
-    retExp = &(*retFunc * *new SgValueExp(180.0) / *new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "CUDART_PI")));
-}
-
-void __atan2d_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *Arg, *Arg1;
-    __convert_args(expr, Arg, Arg1);
-
-    SgFunctionCallExp *retFunc = createNewFCall(name);
-    retFunc->addArg(*Arg);
-    retFunc->addArg(*Arg1);
-
-    retExp = &(*retFunc * *new SgValueExp(180.0) / *new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "CUDART_PI")));
-}
-
-void __sindcosdtand_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *Arg;
-    __convert_args(expr, Arg);
-
-    SgFunctionCallExp *retFunc = createNewFCall(name);
-    retFunc->addArg(*Arg * *new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "CUDART_PI")) / *new SgValueExp(180.0));
-
-    retExp = retFunc;
-}
-
-void __cotan_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *Arg;
-    __convert_args(expr, Arg);
-
-    SgFunctionCallExp *retFunc = createNewFCall(name);
-    retFunc->addArg(*Arg);
-
-    retExp = &(*new SgValueExp(1.0) / *retFunc);
-}
-
-void __cotand_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *Arg;
-    __convert_args(expr, Arg);
-    
-    SgFunctionCallExp *retFunc = createNewFCall(name);
-    retFunc->addArg(*Arg * *new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "CUDART_PI")) / *new SgValueExp(180.0));
-    
-    retExp = &(*new SgValueExp(1.0) / *retFunc);
-}
-
-void __ishftc_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression *currArgs = ((SgFunctionCallExp *)expr)->args();
-    int countArgs = 0;
-
-    while (currArgs)
-    {
-        countArgs++;
-        currArgs = currArgs->rhs();
-    }
-    switch (countArgs)
-    {
-        case 2:
-            createNewFCall(expr, retExp, "ishc", 2);
-            break;
-        case 3:
-            createNewFCall(expr, retExp, name, 3);
-            break;
-        default:
-            //printf("this function takes 2 or 3 arguments");
-            break;
-    }
-}
-
-void __merge_bits_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression* Arg, * Arg1, * Arg2;
-    __convert_args(expr, Arg, Arg1, Arg2);
-    SgExpression *xor_op = new SgExpression(XOR_OP);
-    xor_op->setLhs(*Arg2);
-    xor_op->setRhs(*new SgValueExp(-1));
-    retExp = &((*Arg & *Arg2) | (*Arg1 & *xor_op));
-}
-
-void __not_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression* Arg;
-    __convert_args(expr, Arg);
-    SgExpression* xor_op = new SgExpression(XOR_OP);
-    xor_op->setLhs(*Arg);
-    xor_op->setRhs(*new SgValueExp(-1));
-    retExp = xor_op;
-}
-
-void __poppar_handler(SgExpression *expr, SgExpression *&retExp, const char *name, int nArgs)
-{
-    SgExpression* Arg;
-    __convert_args(expr, Arg);
-    SgFunctionCallExp* func = createNewFCall(name);
-    func->addArg(*Arg);
-    retExp = &(*func & *new SgValueExp(1));
-}
-
-void __modulo_handler(SgExpression* expr, SgExpression*& retExp, const char* name, int nArgs)
-{
-    SgExpression* Arg, * Arg1;
-    __convert_args(expr, Arg, Arg1);
-    SgFunctionCallExp* floor = createNewFCall("floor");
-    SgFunctionCallExp* doubleA = createNewFCall("double");
-    doubleA->addArg(*Arg);
-    SgFunctionCallExp* doubleB = createNewFCall("double");
-    doubleB->addArg(*Arg1);
-    floor->addArg(*doubleA / *doubleB);
-    retExp = &(*Arg - *Arg1 * *floor);
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_index_analyzer.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_index_analyzer.cpp
deleted file mode 100644
index 14850e3..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_index_analyzer.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#include "acc_data.h"
-
-
-extern SgStatement *kernelScope;
-static int indexGenerator = 0;
-
-SgExpression* analyzeArrayIndxs(SgSymbol *array, SgExpression *listIdx)
-{
-    SgSymbol *varName = NULL;
-    char *strNum = new char[32];
-    char *strArray, *newStr;
-
-    if (listIdx == NULL || !autoTransform || dontGenConvertXY || oneCase)
-        return NULL;
-    else
-    {
-        strArray = array->identifier();
-        newStr = new char[strlen(strArray) + 32];
-
-        Array *tArray = currentLoop->getArray(strArray);
-        if (tArray)
-        {
-            char *charEx = NULL;
-            SgSymbol *tSymb = tArray->findAccess(listIdx, charEx);
-            if (tSymb == NULL)
-            {
-                newStr[0] = '\0';
-                strcat(newStr, strArray);
-                strcat(newStr, "_");
-                sprintf(strNum, "%d", (int) indexGenerator);
-                indexGenerator++;
-                strcat(newStr, strNum);
-
-                if (C_Cuda)
-                    varName = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(newStr), *C_DvmType(), *kernelScope);
-                else
-                {
-                    if (undefined_Tcuda)
-                    {
-                        SgExpression *le;
-                        le = new SgExpression(LEN_OP);
-                        le->setLhs(new SgValueExp(8));
-                        varName = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(newStr), *new SgType(T_INT, le, SgTypeInt()), *kernelScope);
-                    }
-                    else
-                        varName = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(newStr), *SgTypeInt(), *kernelScope);
-                }
-
-                tArray->addNewCoef(listIdx, charEx, varName);
-            }
-            else
-                varName = tSymb;
-        }
-    }
-
-    delete[]strNum;
-    return new SgVarRefExp(varName);
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_rtc.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_rtc.cpp
deleted file mode 100644
index aea3e12..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_rtc.cpp
+++ /dev/null
@@ -1,390 +0,0 @@
-#include "dvm.h"
-#include "acc_data.h"
-#include "calls.h"
-
-//TMP:
-extern symb_list *acc_call_list, *by_value_list;
-
-// create comments of call procedures from each kernel in file _info.c
-// if -FTN_Cuda option selected
-void ACC_RTC_AddCalledProcedureComment(SgSymbol *symbK)
-{
-    symb_list *sl;
-    int len = 0;
-    for (sl = acc_call_list; sl; sl = sl->next)
-        len = len + strlen(sl->symb->identifier()) + 1;
-
-    char *list_txt = new  char[len + 1];
-    list_txt[0] = '\0';
-    for (sl = acc_call_list; sl; sl = sl->next)
-    {
-        strcat(list_txt, " ");
-        strcat(list_txt, sl->symb->identifier());
-    }
-    info_block->addComment(CalledProcedureComment(list_txt, symbK));
-
-}
-
-// complete rtc launch parameters from cuda-handlers
-void ACC_RTC_CompleteAllParams()
-{
-    for (unsigned fc = 0; fc < RTC_FCall.size(); ++fc)
-    {
-        SgFunctionCallExp *fCall = RTC_FKernelArgs[fc];
-        if (fCall->variant() == EXPR_LIST) // if Fortran CUDA
-        {
-            fCall = new SgFunctionCallExp(*createNewFunctionSymbol(""));
-            SgExpression *tmp = RTC_FKernelArgs[fc];
-            while (tmp)
-            {
-                fCall->addArg(*tmp->lhs());
-                tmp = tmp->rhs();
-            }
-        }
-
-        SgExpression *argList = RTC_FArgs[fc];
-        for (int k = 0; k < fCall->numberOfArgs(); ++k)
-        {
-            SgExpression *currArg = fCall->arg(k);
-            bool dontCast = false;
-
-            if (currArg->variant() == DEREF_OP)
-                currArg = currArg->lhs();
-
-            if (currArg->symbol() == NULL)
-            {
-                RTC_FCall[fc]->addArg(*new SgValueExp("<!!! NULL !!!>"));
-                argList = argList->rhs();
-                continue;
-            }
-            std::string tmpN = currArg->symbol()->identifier();
-            bool isarray = isSgArrayType(currArg->symbol()->type());
-            bool ispointer = isSgPointerType(currArg->symbol()->type());
-            bool notbyval = true;
-            symb_list *sl;
-            for (sl = by_value_list; sl; sl = sl->next)
-            {
-                if (strcmp(sl->symb->identifier(), currArg->symbol()->identifier()) == 0)
-                {
-                    notbyval = false;
-                    break;
-                }
-            }
-
-            bool isinuser = isInUsesListByChar(currArg->symbol()->identifier());
-            if (isarray || ispointer || notbyval && isinuser)
-            {
-                RTC_FCall[fc]->addArg(*new SgValueExp(""));
-                RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_POINTER")));
-                RTC_FCall[fc]->addArg(*argList->lhs());
-            }
-            else
-            {
-                SgType *tmp = currArg->symbol()->type();
-
-                if (tmp->hasBaseType())
-                    tmp->baseType();
-
-                unsigned UnFlag = ((SgDescriptType*)tmp)->modifierFlag() & BIT_UNSIGNED;
-
-                SgAttribute *attr = argList->lhs()->getAttribute(0);
-                bool toAdd = false;
-                if (attr != NULL)
-                {
-                    if (attr->getAttributeType() == RTC_NOT_REPLACE)
-                        RTC_FCall[fc]->addArg(*new SgValueExp(""));
-                    else
-                        toAdd = true;
-                }
-                else
-                    toAdd = true;
-
-                if (toAdd)
-                {
-                    if (options.isOn(C_CUDA))
-                        RTC_FCall[fc]->addArg(*new SgValueExp(currArg->symbol()->identifier()));
-                    else
-                    {
-                        // PGI adds to scalars n__V_ !!
-                        std::string tmp = "n__V_";
-                        tmp += aks_strlowr(currArg->symbol()->identifier());
-                        RTC_FCall[fc]->addArg(*new SgValueExp(tmp.c_str()));
-                    }
-                }
-
-                if (tmp->equivalentToType(C_Type(SgTypeChar())) || tmp->equivalentToType(SgTypeChar()))
-                {
-                    if (UnFlag)
-                        RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_UCHAR")));
-                    else
-                        RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_CHAR")));
-                }
-                else if (tmp->equivalentToType(C_Type(SgTypeInt())) || (tmp->equivalentToType(SgTypeInt())))
-                {
-                    if (isSgDescriptType(tmp))
-                    {
-                        SgDescriptType *t = (SgDescriptType*)tmp;
-                        int flag = t->modifierFlag();
-                        if ((flag & BIT_LONG) != 0)
-                        {
-                            if (UnFlag)
-                                RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_ULONG")));
-                            else
-                                RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_LONG")));
-                        }
-                        else if ((flag & BIT_SHORT) != 0)
-                        {
-                            if (UnFlag)
-                                RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_USHORT")));
-                            else
-                                RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_SHORT")));
-                        }
-                        else
-                        {
-                            if (UnFlag)
-                                RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_UINT")));
-                            else
-                                RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_INT")));
-                        }
-                    }
-                    else
-                    {
-                        if (UnFlag)
-                            RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_UINT")));
-                        else
-                            RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_INT")));
-                    }
-                }
-                else if (tmp->equivalentToType(C_LongType()))
-                {
-                    if (UnFlag)
-                        RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_ULONG")));
-                    else
-                        RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_LONG")));
-                }
-                else if (tmp->equivalentToType(C_LongLongType()))
-                {
-                    if (UnFlag)
-                        RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_ULLONG")));
-                    else
-                        RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_LLONG")));
-                }
-                else if (tmp->equivalentToType(C_Type(SgTypeFloat())) || tmp->equivalentToType(SgTypeFloat()))
-                    RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_FLOAT")));
-                else if (tmp->equivalentToType(C_Type(SgTypeDouble())) || tmp->equivalentToType(SgTypeDouble()))
-                    RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_DOUBLE")));
-                else if (tmp->equivalentToType(indexTypeInKernel(rt_INT)))
-                    RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_INT")));
-                else if (tmp->equivalentToType(indexTypeInKernel(rt_LONG)))
-                    RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_LONG")));
-                else if (tmp->equivalentToType(indexTypeInKernel(rt_LLONG)))
-                    RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_LLONG")));
-                else if (tmp->equivalentToType(C_Derived_Type(s_cmplx)))
-                {
-                    RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_FLOAT_COMPLEX")));
-
-                    SgSymbol *symb = createNewFunctionSymbol("real");
-                    RTC_FCall[fc]->addArg(*new SgFunctionCallExp(*symb, *new SgExpression(EXPR_LIST, argList->lhs(), NULL, NULL)));
-
-                    symb = createNewFunctionSymbol("imag");
-                    RTC_FCall[fc]->addArg(*new SgFunctionCallExp(*symb, *new SgExpression(EXPR_LIST, argList->lhs(), NULL, NULL)));
-                    dontCast = true;
-                }
-                else if (tmp->equivalentToType(C_Derived_Type(s_dcmplx)))
-                {
-                    RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_DOUBLE_COMPLEX")));
-
-                    SgSymbol *symb = createNewFunctionSymbol("real");
-                    RTC_FCall[fc]->addArg(*new SgFunctionCallExp(*symb, *new SgExpression(EXPR_LIST, argList->lhs(), NULL, NULL)));
-
-                    symb = createNewFunctionSymbol("imag");
-                    RTC_FCall[fc]->addArg(*new SgFunctionCallExp(*symb, *new SgExpression(EXPR_LIST, argList->lhs(), NULL, NULL)));
-                    dontCast = true;
-                }
-                else
-                {
-                    RTC_FCall[fc]->addArg(*new SgVarRefExp(new SgSymbol(VARIABLE_NAME, "rt_UNKNOWN")));
-                    fprintf(stderr, "Warning[-rtc]: unknown type with variant %d for kernel lauch\n", tmp->variant());
-                }
-
-                if (dontCast == false)
-                    RTC_FCall[fc]->addArg(*new SgCastExp(*tmp, *argList->lhs()));
-            }
-
-            argList = argList->rhs();
-        }
-    }
-
-    RTC_FKernelArgs.clear();
-    RTC_FArgs.clear();
-    RTC_FCall.clear();
-}
-
-// convert unparse buffer for RTC call
-char* _RTC_convertUnparse(const char* inBuf)
-{
-    int count = 0;
-    for (unsigned i = 0; i < strlen(inBuf); ++i)
-    {
-        if (SpecialSymbols.find(inBuf[i]) != SpecialSymbols.end())
-            count += strlen(SpecialSymbols[inBuf[i]]);
-    }
-
-    std::string strBuf = "";
-
-    for (unsigned i = 0; i < strlen(inBuf); ++i)
-    {
-        if (SpecialSymbols.find(inBuf[i]) != SpecialSymbols.end())
-        {
-            const char *tmp = SpecialSymbols[inBuf[i]];
-            for (unsigned k1 = 0; k1 < strlen(tmp); ++k1)
-                strBuf.push_back(tmp[k1]);
-        }
-        else
-            strBuf.push_back(inBuf[i]);
-    }
-
-    strBuf += "#undef dcmplx2\\n\"\n\"#undef cmplx2\\n";
-    char *newBuf = new char[strlen(strBuf.c_str()) + 1];
-    strcpy(newBuf, strBuf.c_str());
-
-    return newBuf;
-}
-
-// convert cuda kernel to static const char*
-void ACC_RTC_ConvertCudaKernel(SgStatement *cuda_kernel, const char *kernelName)
-{
-    if (cuda_kernel != NULL)
-    {
-        cuda_kernel->addComment("#define dcmplx2 Complex<double>\n#define cmplx2 Complex<float>\nextern \"C\"\n");
-        char *buf = copyOfUnparse(UnparseBif_Char(cuda_kernel->thebif, C_LANG));
-        char *newBuf = _RTC_convertUnparse(buf);
-        
-        SgPointerType *arrType = new SgPointerType(*C_Type(SgTypeChar()));
-
-        SgSymbol *cuda_kernel_code = new SgSymbol(VARIABLE_NAME, kernelName, arrType, mod_gpu);
-        SgStatement *decl = makeSymbolDeclarationWithInit(cuda_kernel_code, new SgValueExp(newBuf));
-
-        decl->addDeclSpec(BIT_CONST);
-        decl->addDeclSpec(BIT_STATIC);
-        cuda_kernel->insertStmtBefore(*decl);
-        if(acc_call_list)
-        {
-            symb_list **call_list = new (symb_list *);
-            *call_list = acc_call_list;
-            decl->addAttribute(RTC_CALLS, (void*)call_list, sizeof(symb_list *));
-        }
-        cuda_kernel->deleteStmt();
-        delete[] buf;
-    }
-}
-
-static symb_list *_RTC_addCalledToList(symb_list *call_list, graph_node *gnode)
-{
-    edge *gedge;
-
-    for (gedge = gnode->to_called; gedge; gedge = gedge->next)
-    	if(gedge->to->st_header)
-        {   call_list = AddNewToSymbList(call_list, gedge->to->symb);
-            call_list = _RTC_addCalledToList(call_list, gedge->to);
-	}
-    
-    return call_list;
-}
-
-symb_list *ACC_RTC_ExpandCallList(symb_list *call_list)
-{
-    symb_list *sl;
-    for (sl = call_list; sl; sl = sl->next)
-    {
-        if (!ATTR_NODE(sl->symb))
-            continue;
-        call_list = _RTC_addCalledToList(call_list, GRAPHNODE(sl->symb));
-    }
-    return call_list;
-}
-
-char* _RTC_PrototypesForKernel(symb_list *call_list)
-{
-    SgStatement *st = NULL;
-    symb_list *sl = call_list;
-    st = FunctionPrototype(GRAPHNODE(sl->symb)->st_copy->symbol());
-    st->addDeclSpec(BIT_CUDA_DEVICE);
-    st->addDeclSpec(BIT_STATIC);
-    st->addComment("#define dcmplx2 Complex<double>\n#define cmplx2 Complex<float>\n");
-    char *buffer = copyOfUnparse(UnparseBif_Char(st->thebif, C_LANG));
-    for (sl = call_list->next; sl; sl = sl->next)
-    {
-        st = FunctionPrototype(GRAPHNODE(sl->symb)->st_copy->symbol());
-        st->addDeclSpec(BIT_CUDA_DEVICE);
-        st->addDeclSpec(BIT_STATIC);
-
-        char *unp_buf = UnparseBif_Char(st->thebif, C_LANG);
-        char *buf = new char[strlen(buffer) + strlen(unp_buf) + 1];
-        strcpy(buf, buffer);
-        strcat(buf, unp_buf);
-        delete[] buffer;
-        buffer = buf;
-    }
-    return (buffer);
-}
-
-void _RTC_UnparsedFunctionsToKernelConst(SgStatement *stmt)
-{
-    if (CALLED_FUNCTIONS(stmt) == NULL)
-        return;
-
-    symb_list *call_list = *CALLED_FUNCTIONS(stmt);
-
-    graph_node * gnode = NULL;  
-    char *buffer = _RTC_PrototypesForKernel(call_list);
-
-    for (; call_list; call_list = call_list->next)
-    {   SgStatement *stmt, *end_st;
-        gnode = GRAPHNODE(call_list->symb);
-        end_st = gnode->st_copy_first->lastNodeOfStmt()->lexNext();
-        stmt = gnode->st_copy;
-        while (stmt != end_st) //st_copy,...,st_copy_first
-        {
-            char *unp_buf = UnparseBif_Char(stmt->thebif, C_LANG);
-            char *buf = new char[strlen(unp_buf) + strlen(buffer) + 1];
-            //buf[0] = '\0';
-            strcpy(buf, buffer);
-            strcat(buf, unp_buf);
-            delete[] buffer;
-            buffer = buf;
-            stmt = stmt->lastNodeOfStmt()->lexNext();
-        }
-    }
-    buffer = _RTC_convertUnparse(buffer);
-  
-    char *kernel_buf = ((SgValueExp *)((SgVarDeclStmt *)stmt)->initialValue(0))->stringValue();
-    char *allBuf = new char[strlen(kernel_buf) + strlen(buffer) + 1];
-    strcpy(allBuf, buffer);
-    strcat(allBuf, kernel_buf);
-    ((SgVarDeclStmt *)stmt)->setInitialValue(0, *new SgValueExp(allBuf));
-    delete[] kernel_buf;
-    delete[] buffer;
-}
-
-
-void ACC_RTC_AddFunctionsToKernelConsts(SgStatement *first_kernel_const)
-{
-    SgStatement *stmt = mod_gpu, *next = NULL;
-
-    for (stmt = first_kernel_const; stmt; stmt = stmt->lexNext())
-        _RTC_UnparsedFunctionsToKernelConst(stmt);
-    stmt = mod_gpu;
-    next = mod_gpu->lexNext();
-
-    // extracting  function copies  
-    //while(next->variant() !=  VAR_DECL)
-
-    while (next != first_kernel_const)
-    {
-        stmt = next;
-        next = next->lastNodeOfStmt()->lexNext();
-        stmt->extractStmt();
-    }
-
-}
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_unused_code.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_unused_code.cpp
deleted file mode 100644
index d7d6fa4..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_unused_code.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// all unused code
-#include "dvm.h"
-
-/* FROM acc_index_analyzer (aks_structs.cpp) */
-int dimentionOfArray(SgExpression *listIdxIn)
-{
-    int dim = 0;
-    SgExpression *listIdx = listIdxIn;
-    while (listIdx)
-    {
-        dim++;
-        listIdx = listIdx->rhs();
-    }
-    return dim;
-}
-
-bool ifExist(std::vector<char*> &listL, char *str)
-{
-    bool retval = false;
-    for (size_t i = 0; i < listL.size(); ++i)
-    {
-        if (strcmp(str, listL[i]) == 0)
-        {
-            retval = true;
-            break;
-        }
-    }
-    return retval;
-}
-
-int GetIdxPlaceInParDir(SageSymbols *inList, SgSymbol *id)
-{
-    int ret = -1;
-    int count = 0;
-    SageSymbols *tmp = inList;
-    while (tmp)
-    {
-        if (strcmp(tmp->symb->identifier(), id->identifier()) == 0)
-        {
-            ret = count;
-            break;
-        }
-        count++;
-        tmp = tmp->next;
-    }
-    return ret;
-}
-/* END BLOCK */
-
-/* FORM acc.app*/
-template<int numFields> SgType *Type_N(SgType *type, char *name);
-template<int numFields>
-SgType *Type_N(SgType *type, char *name)
-{
-    SgSymbol *s_t = new SgSymbol(TYPE_NAME, name, *kernel_st);
-    SgFieldSymb *sx, *sy, *sz, *sw, *s;
-
-    if (numFields >= 1)
-        s = sx = new SgFieldSymb("x", *type, *s_t);
-    if (numFields >= 2)
-    {
-        s = sy = new SgFieldSymb("y", *type, *s_t);
-        SYMB_NEXT_FIELD(sx->thesymb) = sy->thesymb;
-    }
-    if (numFields >= 3)
-    {
-        s = sz = new SgFieldSymb("z", *type, *s_t);
-        SYMB_NEXT_FIELD(sy->thesymb) = sz->thesymb;
-    }
-    if (numFields >= 4)
-    {
-        s = sw = new SgFieldSymb("w", *type, *s_t);
-        SYMB_NEXT_FIELD(sz->thesymb) = sw->thesymb;
-    }
-    SYMB_NEXT_FIELD(s->thesymb) = NULL;
-
-    SgType *tstr = new SgType(T_STRUCT);
-    TYPE_COLL_FIRST_FIELD(tstr->thetype) = sx->thesymb;
-    s_t->setType(tstr);
-
-    SgType *td = new SgType(T_DERIVED_TYPE);
-    TYPE_SYMB_DERIVE(td->thetype) = s_t->thesymb;
-    TYPE_SYMB(td->thetype) = s_t->thesymb;
-
-    return(td);
-}
-/* END BLOCK */
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/acc_utilities.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/acc_utilities.cpp
deleted file mode 100644
index c096f43..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/acc_utilities.cpp
+++ /dev/null
@@ -1,1038 +0,0 @@
-/*****************************/
-/* all general functions     */
-/*****************************/
-#include "leak_detector.h"
-
-#include "acc_data.h"
-#include "dvm.h"
-
-using std::string;
-using std::set;
-
-// copy input string to another buffer 
-char *copyOfUnparse(const char *strUp)
-{
-    char *str;
-    str = new char[strlen(strUp) + 1];
-    strcpy(str, strUp);
-    return str;
-}
-
-// convert "str " to "STR "
-char* aks_strupr(const char *str)
-{
-    char *tmpstr = new char[strlen(str) + 1];
-    tmpstr[0] = '\0';
-    strcat(tmpstr, str);
-    for (size_t i = 0; i < strlen(tmpstr); ++i)
-    {
-        if (tmpstr[i] <= 'z' && tmpstr[i] >= 'a')
-            tmpstr[i] += 'A' - 'a';
-    }
-    return tmpstr;
-}
-
-// convert "STR" to "str"
-char* aks_strlowr(const char *str)
-{
-    char *tmpstr = new char[strlen(str) + 1];
-    tmpstr[0] = '\0';
-    strcat(tmpstr, str);
-    for (size_t i = 0; i < strlen(tmpstr); ++i)
-    {
-        if (tmpstr[i] <= 'Z' && tmpstr[i] >= 'A')
-            tmpstr[i] -= 'A' - 'a';
-    }
-    return tmpstr;
-}
-
-void initIntrinsicFunctionNames()
-{
-    if (intrinsicF.size() != 0)
-        return;
-
-    intrinsicF.insert(string("abs"));
-    intrinsicF.insert(string("adjustl"));
-    intrinsicF.insert(string("and"));
-    intrinsicF.insert(string("any"));
-#ifdef __SPF
-    intrinsicF.insert(string("associated"));
-    intrinsicF.insert(string("allocated"));
-#endif
-    intrinsicF.insert(string("amod"));
-    intrinsicF.insert(string("aimax0"));
-    intrinsicF.insert(string("ajmax0"));
-    intrinsicF.insert(string("akmax0"));
-    intrinsicF.insert(string("aimin0"));
-    intrinsicF.insert(string("ajmin0"));
-    intrinsicF.insert(string("akmin0"));
-    intrinsicF.insert(string("amax1"));
-    intrinsicF.insert(string("amax0"));
-    intrinsicF.insert(string("amin1"));
-    intrinsicF.insert(string("amin0"));
-    intrinsicF.insert(string("aimag"));
-    intrinsicF.insert(string("alog"));
-    intrinsicF.insert(string("alog10"));
-    intrinsicF.insert(string("asin"));
-    intrinsicF.insert(string("asind"));
-    intrinsicF.insert(string("asinh"));
-    intrinsicF.insert(string("acos"));
-    intrinsicF.insert(string("acosd"));
-    intrinsicF.insert(string("acosh"));
-    intrinsicF.insert(string("atan"));
-    intrinsicF.insert(string("atand"));
-    intrinsicF.insert(string("atanh"));
-    intrinsicF.insert(string("atan2"));
-    intrinsicF.insert(string("atan2d"));
-    intrinsicF.insert(string("aint"));
-    intrinsicF.insert(string("anint"));
-    intrinsicF.insert(string("achar"));
-    intrinsicF.insert(string("babs"));
-    intrinsicF.insert(string("bbits"));
-    intrinsicF.insert(string("bbset"));
-    intrinsicF.insert(string("bdim"));
-    intrinsicF.insert(string("biand"));
-    intrinsicF.insert(string("bieor"));
-    intrinsicF.insert(string("bior"));
-    intrinsicF.insert(string("bixor"));
-    intrinsicF.insert(string("btest"));
-    intrinsicF.insert(string("bbtest"));
-    intrinsicF.insert(string("bbclr"));
-    intrinsicF.insert(string("bitest"));
-    intrinsicF.insert(string("bjtest"));
-    intrinsicF.insert(string("bktest"));
-    intrinsicF.insert(string("bessel_j0"));
-    intrinsicF.insert(string("bessel_j1"));
-    intrinsicF.insert(string("bessel_jn"));
-    intrinsicF.insert(string("bessel_y0"));
-    intrinsicF.insert(string("bessel_y1"));
-    intrinsicF.insert(string("bessel_yn"));
-    intrinsicF.insert(string("bmod"));
-    intrinsicF.insert(string("bnot"));
-    intrinsicF.insert(string("bshft"));
-    intrinsicF.insert(string("bshftc"));
-    intrinsicF.insert(string("bsign"));
-    intrinsicF.insert(string("cos"));
-    intrinsicF.insert(string("ccos"));
-    intrinsicF.insert(string("cdcos"));
-    intrinsicF.insert(string("cosd"));
-    intrinsicF.insert(string("cosh"));
-    intrinsicF.insert(string("cotan"));
-    intrinsicF.insert(string("cotand"));
-    intrinsicF.insert(string("ceiling"));
-    intrinsicF.insert(string("cexp"));
-    intrinsicF.insert(string("conjg"));
-    intrinsicF.insert(string("csqrt"));
-    intrinsicF.insert(string("clog"));
-    intrinsicF.insert(string("clog10"));
-    intrinsicF.insert(string("cdlog"));
-    intrinsicF.insert(string("cdlog10"));
-    intrinsicF.insert(string("csin"));
-    intrinsicF.insert(string("cabs"));
-    intrinsicF.insert(string("cdabs"));
-    intrinsicF.insert(string("cdexp"));
-    intrinsicF.insert(string("cdsin"));
-    intrinsicF.insert(string("cdsqrt"));
-    intrinsicF.insert(string("cdtan"));
-    intrinsicF.insert(string("cmplx"));
-    intrinsicF.insert(string("char"));
-    intrinsicF.insert(string("ctan"));
-    intrinsicF.insert(string("cpu_time"));
-    intrinsicF.insert(string("dim"));
-    intrinsicF.insert(string("ddim"));
-    intrinsicF.insert(string("dble"));
-    intrinsicF.insert(string("dfloat"));
-    intrinsicF.insert(string("dfloti"));
-    intrinsicF.insert(string("dflotj"));
-    intrinsicF.insert(string("dflotk"));
-    intrinsicF.insert(string("dint"));
-#ifdef __SPF
-    intrinsicF.insert(string("dvtime"));
-#endif
-    intrinsicF.insert(string("dmax1"));
-    intrinsicF.insert(string("dmin1"));
-    intrinsicF.insert(string("dmod"));
-    intrinsicF.insert(string("dprod"));
-    intrinsicF.insert(string("dreal"));
-    intrinsicF.insert(string("dsign"));
-    intrinsicF.insert(string("dshiftl"));
-    intrinsicF.insert(string("dshiftr"));
-    intrinsicF.insert(string("dabs"));
-    intrinsicF.insert(string("dsqrt"));
-    intrinsicF.insert(string("dexp"));
-    intrinsicF.insert(string("dlog"));
-    intrinsicF.insert(string("dlog10"));
-    intrinsicF.insert(string("dsin"));
-    intrinsicF.insert(string("dcos"));
-    intrinsicF.insert(string("dcosd"));
-    intrinsicF.insert(string("dtan"));
-    intrinsicF.insert(string("dtand"));
-    intrinsicF.insert(string("dasin"));
-    intrinsicF.insert(string("dasind"));
-    intrinsicF.insert(string("dasinh"));
-    intrinsicF.insert(string("dacos"));
-    intrinsicF.insert(string("dacosd"));
-    intrinsicF.insert(string("dacosh"));
-    intrinsicF.insert(string("datan"));
-    intrinsicF.insert(string("datand"));
-    intrinsicF.insert(string("datanh"));
-    intrinsicF.insert(string("datan2"));
-    intrinsicF.insert(string("datan2d"));
-    intrinsicF.insert(string("derf"));
-    intrinsicF.insert(string("derfc"));
-    intrinsicF.insert(string("dsind"));
-    intrinsicF.insert(string("dsinh"));
-    intrinsicF.insert(string("dcosh"));
-    intrinsicF.insert(string("dcotan"));
-    intrinsicF.insert(string("dcotand"));
-    intrinsicF.insert(string("dtanh"));
-    intrinsicF.insert(string("dnint"));
-    intrinsicF.insert(string("dcmplx"));
-    intrinsicF.insert(string("dconjg"));
-    intrinsicF.insert(string("dimag"));
-    intrinsicF.insert(string("exp"));
-    intrinsicF.insert(string("erf"));
-    intrinsicF.insert(string("erfc"));
-    intrinsicF.insert(string("erfc_scaled"));
-#ifdef __SPF
-    intrinsicF.insert(string("etime"));
-#endif
-    intrinsicF.insert(string("float"));    
-    intrinsicF.insert(string("floati"));
-    intrinsicF.insert(string("floatj"));
-    intrinsicF.insert(string("floatk"));
-    intrinsicF.insert(string("floor"));
-#ifdef __SPF
-    intrinsicF.insert(string("flush"));
-#endif
-    intrinsicF.insert(string("gamma"));
-    intrinsicF.insert(string("habs"));
-    intrinsicF.insert(string("hbclr"));
-    intrinsicF.insert(string("hbits"));
-    intrinsicF.insert(string("hbset"));
-    intrinsicF.insert(string("hdim"));
-    intrinsicF.insert(string("hiand"));
-    intrinsicF.insert(string("hieor"));
-    intrinsicF.insert(string("hior"));
-    intrinsicF.insert(string("hixor"));
-    intrinsicF.insert(string("hmod"));
-    intrinsicF.insert(string("hnot"));
-    intrinsicF.insert(string("hshft"));
-    intrinsicF.insert(string("hshftc"));
-    intrinsicF.insert(string("hsign"));
-    intrinsicF.insert(string("htest"));
-    intrinsicF.insert(string("huge"));
-    intrinsicF.insert(string("hypot"));    
-    intrinsicF.insert(string("iiabs"));
-#ifdef __SPF
-    intrinsicF.insert(string("iargc"));
-#endif
-    intrinsicF.insert(string("iiand"));
-    intrinsicF.insert(string("iibclr"));
-    intrinsicF.insert(string("iibits"));
-    intrinsicF.insert(string("iibset"));
-    intrinsicF.insert(string("iidim"));
-    intrinsicF.insert(string("iieor"));
-    intrinsicF.insert(string("iior"));
-    intrinsicF.insert(string("iishft"));
-    intrinsicF.insert(string("iishftc"));
-    intrinsicF.insert(string("iisign"));
-    intrinsicF.insert(string("iixor"));
-    intrinsicF.insert(string("int"));
-    intrinsicF.insert(string("idint"));
-    intrinsicF.insert(string("ifix"));
-    intrinsicF.insert(string("idim"));
-    intrinsicF.insert(string("isign"));
-    intrinsicF.insert(string("index"));
-    intrinsicF.insert(string("iabs"));
-    intrinsicF.insert(string("ibits"));
-    intrinsicF.insert(string("idnint"));
-    intrinsicF.insert(string("ichar"));
-    intrinsicF.insert(string("iachar"));    
-    intrinsicF.insert(string("isnan"));
-    intrinsicF.insert(string("iand"));
-    intrinsicF.insert(string("ior"));
-    intrinsicF.insert(string("ibset"));
-    intrinsicF.insert(string("ibclr"));
-    intrinsicF.insert(string("ibchng"));
-    intrinsicF.insert(string("ieor"));
-    intrinsicF.insert(string("ilen"));
-    intrinsicF.insert(string("imag"));
-    intrinsicF.insert(string("imax0"));
-    intrinsicF.insert(string("imax1"));
-    intrinsicF.insert(string("imin0"));
-    intrinsicF.insert(string("imin1"));
-    intrinsicF.insert(string("imod"));
-    intrinsicF.insert(string("inot"));
-    intrinsicF.insert(string("isha"));
-    intrinsicF.insert(string("ishc"));
-    intrinsicF.insert(string("ishft"));
-    intrinsicF.insert(string("ishftc"));
-    intrinsicF.insert(string("ishl"));
-    intrinsicF.insert(string("ixor"));
-    intrinsicF.insert(string("jiabs"));
-    intrinsicF.insert(string("jiand"));
-    intrinsicF.insert(string("jibclr"));
-    intrinsicF.insert(string("jibits"));
-    intrinsicF.insert(string("jibset"));
-    intrinsicF.insert(string("jidim"));
-    intrinsicF.insert(string("jieor"));
-    intrinsicF.insert(string("jior"));
-    intrinsicF.insert(string("jishft"));
-    intrinsicF.insert(string("jishftc"));
-    intrinsicF.insert(string("jisign"));
-    intrinsicF.insert(string("jixor"));
-    intrinsicF.insert(string("jmax0"));
-    intrinsicF.insert(string("jmax1"));
-    intrinsicF.insert(string("jmin0"));
-    intrinsicF.insert(string("jmin1"));
-    intrinsicF.insert(string("jmod"));
-    intrinsicF.insert(string("jnot"));
-    intrinsicF.insert(string("kiabs"));
-    intrinsicF.insert(string("kiand"));
-    intrinsicF.insert(string("kibclr"));
-    intrinsicF.insert(string("kibits"));
-    intrinsicF.insert(string("kibset"));
-    intrinsicF.insert(string("kidim"));
-    intrinsicF.insert(string("kieor"));
-    intrinsicF.insert(string("kior"));
-    intrinsicF.insert(string("kishft"));
-    intrinsicF.insert(string("kishftc"));
-    intrinsicF.insert(string("kisign"));
-    intrinsicF.insert(string("kmax0"));
-    intrinsicF.insert(string("kmax1"));
-    intrinsicF.insert(string("kmin0"));
-    intrinsicF.insert(string("kmin1"));
-    intrinsicF.insert(string("kmod"));
-    intrinsicF.insert(string("knot"));
-    intrinsicF.insert(string("len"));
-    intrinsicF.insert(string("len_trim"));
-    intrinsicF.insert(string("lge"));
-    intrinsicF.insert(string("lgt"));
-    intrinsicF.insert(string("lle"));
-    intrinsicF.insert(string("llt"));
-    intrinsicF.insert(string("log_gamma"));
-    intrinsicF.insert(string("log"));
-    intrinsicF.insert(string("log10"));
-    intrinsicF.insert(string("lshft"));
-    intrinsicF.insert(string("lshift"));
-    intrinsicF.insert(string("max"));
-    intrinsicF.insert(string("max0"));
-    intrinsicF.insert(string("max1"));
-    intrinsicF.insert(string("merge_bits"));
-    intrinsicF.insert(string("min"));
-#ifdef __SPF
-    intrinsicF.insert(string("minval"));
-    intrinsicF.insert(string("maxval"));
-#endif
-    intrinsicF.insert(string("min0"));
-    intrinsicF.insert(string("min1"));
-    intrinsicF.insert(string("mod"));
-    intrinsicF.insert(string("modulo"));
-    intrinsicF.insert(string("not"));
-    intrinsicF.insert(string("nint"));
-    intrinsicF.insert(string("null"));
-    intrinsicF.insert(string("or"));
-    intrinsicF.insert(string("popcnt"));
-    intrinsicF.insert(string("poppar"));
-    intrinsicF.insert(string("random_number"));
-    intrinsicF.insert(string("real"));
-    intrinsicF.insert(string("reshape"));      
-    intrinsicF.insert(string("present"));    
-    intrinsicF.insert(string("repeat"));
-    intrinsicF.insert(string("rshft"));
-    intrinsicF.insert(string("rshift"));
-    intrinsicF.insert(string("sign"));
-    intrinsicF.insert(string("size"));
-    intrinsicF.insert(string("scan"));
-#ifdef __SPF
-    intrinsicF.insert(string("sizeof"));    
-#endif
-    intrinsicF.insert(string("sngl"));
-    intrinsicF.insert(string("sqrt"));
-    intrinsicF.insert(string("sin"));
-    intrinsicF.insert(string("sind"));
-    intrinsicF.insert(string("sinh"));
-    intrinsicF.insert(string("shifta"));
-    intrinsicF.insert(string("shiftl"));
-    intrinsicF.insert(string("shiftr"));
-#ifdef __SPF
-    intrinsicF.insert(string("system_clock"));
-#endif
-    intrinsicF.insert(string("sum"));
-    intrinsicF.insert(string("tan"));
-    intrinsicF.insert(string("tand"));
-    intrinsicF.insert(string("tanh"));
-    intrinsicF.insert(string("tiny"));
-    intrinsicF.insert(string("trailz"));
-    intrinsicF.insert(string("trim"));
-    intrinsicF.insert(string("xor"));
-    intrinsicF.insert(string("wtime"));
-    intrinsicF.insert(string("zabs"));
-    intrinsicF.insert(string("zcos"));
-    intrinsicF.insert(string("zexp"));
-    intrinsicF.insert(string("zlog"));
-    intrinsicF.insert(string("zsin"));
-    intrinsicF.insert(string("zsqrt"));
-    intrinsicF.insert(string("ztan"));
-
-#ifdef __SPF
-    //TODO: add all OMP functions
-    intrinsicF.insert(string("omp_get_wtime"));
-    intrinsicF.insert(string("omp_get_num_threads"));
-    intrinsicF.insert(string("omp_destroy_lock"));
-    intrinsicF.insert(string("omp_destroy_nest_lock"));
-    intrinsicF.insert(string("omp_get_dynamic"));
-    intrinsicF.insert(string("omp_get_max_threads"));
-    intrinsicF.insert(string("omp_get_nested"));
-    intrinsicF.insert(string("omp_get_num_procs"));
-    intrinsicF.insert(string("omp_get_thread_num"));
-    intrinsicF.insert(string("omp_init_lock"));
-    intrinsicF.insert(string("omp_get_wtick"));
-    intrinsicF.insert(string("omp_in_parallel"));
-    intrinsicF.insert(string("omp_init_nest_lock"));
-    intrinsicF.insert(string("omp_set_dynamic"));
-    intrinsicF.insert(string("omp_set_lock"));
-    intrinsicF.insert(string("omp_set_nest_lock"));
-    intrinsicF.insert(string("omp_set_nested"));
-    intrinsicF.insert(string("omp_set_num_threads"));
-    intrinsicF.insert(string("omp_test_lock"));
-    intrinsicF.insert(string("omp_test_nest_lock"));
-    intrinsicF.insert(string("omp_unset_lock"));
-    intrinsicF.insert(string("omp_unset_nest_lock"));
-
-    //TODO: add all MPI functions
-    intrinsicF.insert("mpi_abort");
-    intrinsicF.insert("mpi_address");
-    intrinsicF.insert("mpi_allgather");
-    intrinsicF.insert("mpi_allgatherv");
-    intrinsicF.insert("mpi_allreduce");
-    intrinsicF.insert("mpi_alltoall");
-    intrinsicF.insert("mpi_alltoallv");
-    intrinsicF.insert("mpi_barrier");
-    intrinsicF.insert("mpi_bcast");
-    intrinsicF.insert("mpi_bsend");
-    intrinsicF.insert("mpi_bsend_init");
-    intrinsicF.insert("mpi_buffer_attach");
-    intrinsicF.insert("mpi_buffer_detach");
-    intrinsicF.insert("mpi_cart_coords");
-    intrinsicF.insert("mpi_cart_create");
-    intrinsicF.insert("mpi_cart_get");
-    intrinsicF.insert("mpi_cart_rank");
-    intrinsicF.insert("mpi_cart_shift");
-    intrinsicF.insert("mpi_cart_sub");
-    intrinsicF.insert("mpi_cartdim_get");
-    intrinsicF.insert("mpi_comm_create");
-    intrinsicF.insert("mpi_comm_dup");
-    intrinsicF.insert("mpi_comm_free");
-    intrinsicF.insert("mpi_comm_group");
-    intrinsicF.insert("mpi_comm_rank");
-    intrinsicF.insert("mpi_comm_size");
-    intrinsicF.insert("mpi_comm_split");
-    intrinsicF.insert("mpi_dims_create");
-    intrinsicF.insert("mpi_finalize");
-    intrinsicF.insert("mpi_gather");
-    intrinsicF.insert("mpi_gatherv");
-    intrinsicF.insert("mpi_get_count");
-    intrinsicF.insert("mpi_get_processor_name");
-    intrinsicF.insert("mpi_graph_create");
-    intrinsicF.insert("mpi_graph_get");
-    intrinsicF.insert("mpi_graph_neighbors");
-    intrinsicF.insert("mpi_graph_neighbors_count");
-    intrinsicF.insert("mpi_graphdims_get");
-    intrinsicF.insert("mpi_group_compare");
-    intrinsicF.insert("mpi_group_difference");
-    intrinsicF.insert("mpi_group_excl");
-    intrinsicF.insert("mpi_group_free");
-    intrinsicF.insert("mpi_group_incl");
-    intrinsicF.insert("mpi_group_intersection");
-    intrinsicF.insert("mpi_group_rank");
-    intrinsicF.insert("mpi_group_size");
-    intrinsicF.insert("mpi_group_translate_ranks");
-    intrinsicF.insert("mpi_group_union");
-    intrinsicF.insert("mpi_ibsend");
-    intrinsicF.insert("mpi_init");
-    intrinsicF.insert("mpi_initialized");
-    intrinsicF.insert("mpi_iprobe");
-    intrinsicF.insert("mpi_irecv");
-    intrinsicF.insert("mpi_irsend");
-    intrinsicF.insert("mpi_isend");
-    intrinsicF.insert("mpi_issend");
-    intrinsicF.insert("mpi_op_create");
-    intrinsicF.insert("mpi_op_free");
-    intrinsicF.insert("mpi_pack");
-    intrinsicF.insert("mpi_pack_size");
-    intrinsicF.insert("mpi_probe");
-    intrinsicF.insert("mpi_recv");
-    intrinsicF.insert("mpi_recv_init");
-    intrinsicF.insert("mpi_reduce");
-    intrinsicF.insert("mpi_reduce_scatter");
-    intrinsicF.insert("mpi_request_free");
-    intrinsicF.insert("mpi_rsend");
-    intrinsicF.insert("mpi_rsend_init");
-    intrinsicF.insert("mpi_scan");
-    intrinsicF.insert("mpi_scatter");
-    intrinsicF.insert("mpi_scatterv");
-    intrinsicF.insert("mpi_send");
-    intrinsicF.insert("mpi_send_init");
-    intrinsicF.insert("mpi_sendrecv");
-    intrinsicF.insert("mpi_sendrecv_replace");
-    intrinsicF.insert("mpi_ssend");
-    intrinsicF.insert("mpi_ssend_init");
-    intrinsicF.insert("mpi_start");
-    intrinsicF.insert("mpi_startall");
-    intrinsicF.insert("mpi_test");
-    intrinsicF.insert("mpi_testall");
-    intrinsicF.insert("mpi_testany");
-    intrinsicF.insert("mpi_testsome");
-    intrinsicF.insert("mpi_topo_test");
-    intrinsicF.insert("mpi_type_commit");
-    intrinsicF.insert("mpi_type_contiguous");
-    intrinsicF.insert("mpi_type_extent");
-    intrinsicF.insert("mpi_type_free");
-    intrinsicF.insert("mpi_type_hindexed");
-    intrinsicF.insert("mpi_type_hvector");
-    intrinsicF.insert("mpi_type_indexed");
-    intrinsicF.insert("mpi_type_lb");
-    intrinsicF.insert("mpi_type_size");
-    intrinsicF.insert("mpi_type_struct");
-    intrinsicF.insert("mpi_type_ub");
-    intrinsicF.insert("mpi_type_vector");
-    intrinsicF.insert("mpi_unpack");
-    intrinsicF.insert("mpi_wait");
-    intrinsicF.insert("mpi_waitall");
-    intrinsicF.insert("mpi_waitany");
-    intrinsicF.insert("mpi_waitsome");
-    intrinsicF.insert("mpi_wtick");
-    intrinsicF.insert("mpi_wtime");
-#endif
-
-    // set Types
-    intrinsicDoubleT.insert(string("ddim"));
-    intrinsicDoubleT.insert(string("dble"));
-    intrinsicDoubleT.insert(string("dfloat"));
-    intrinsicDoubleT.insert(string("dfloti"));
-    intrinsicDoubleT.insert(string("dflotj"));
-    intrinsicDoubleT.insert(string("dflotk"));
-    intrinsicDoubleT.insert(string("dint"));
-    intrinsicDoubleT.insert(string("dmax1"));
-    intrinsicDoubleT.insert(string("dmin1"));
-    intrinsicDoubleT.insert(string("dmod"));
-    intrinsicDoubleT.insert(string("dprod"));
-    intrinsicDoubleT.insert(string("dreal"));
-    intrinsicDoubleT.insert(string("dsign"));
-    intrinsicDoubleT.insert(string("dshiftl"));
-    intrinsicDoubleT.insert(string("dshiftr"));
-    intrinsicDoubleT.insert(string("dabs"));
-    intrinsicDoubleT.insert(string("dsqrt"));
-    intrinsicDoubleT.insert(string("dexp"));
-    intrinsicDoubleT.insert(string("dlog"));
-    intrinsicDoubleT.insert(string("dlog10"));
-    intrinsicDoubleT.insert(string("dsin"));
-    intrinsicDoubleT.insert(string("dcos"));
-    intrinsicDoubleT.insert(string("dcosd"));
-    intrinsicDoubleT.insert(string("dtan"));
-    intrinsicDoubleT.insert(string("dtand"));
-    intrinsicDoubleT.insert(string("dasin"));
-    intrinsicDoubleT.insert(string("dasind"));
-    intrinsicDoubleT.insert(string("dasinh"));
-    intrinsicDoubleT.insert(string("dacos"));
-    intrinsicDoubleT.insert(string("dacosd"));
-    intrinsicDoubleT.insert(string("dacosh"));
-    intrinsicDoubleT.insert(string("datan"));
-    intrinsicDoubleT.insert(string("datand"));
-    intrinsicDoubleT.insert(string("datanh"));
-    intrinsicDoubleT.insert(string("datan2"));
-    intrinsicDoubleT.insert(string("datan2d"));
-    intrinsicDoubleT.insert(string("derf"));
-    intrinsicDoubleT.insert(string("derfc"));
-    intrinsicDoubleT.insert(string("dsind"));
-    intrinsicDoubleT.insert(string("dsinh"));
-    intrinsicDoubleT.insert(string("dcosh"));
-    intrinsicDoubleT.insert(string("dcotan"));
-    intrinsicDoubleT.insert(string("dcotand"));
-    intrinsicDoubleT.insert(string("dtanh"));
-    intrinsicDoubleT.insert(string("dnint"));
-    intrinsicDoubleT.insert(string("dcmplx"));
-    intrinsicDoubleT.insert(string("dconjg"));
-    intrinsicDoubleT.insert(string("dimag"));
-
-    intrinsicFloatT.insert(string("sngl"));
-    intrinsicFloatT.insert(string("real"));   
-    intrinsicFloatT.insert(string("float"));
-}
-
-//need to extend 
-int getIntrinsicFunctionType(const char* name)
-{
-    if (!name)
-        return 0;
-        
-    set<string>::iterator result = intrinsicF.find(name);
-    if (result == intrinsicF.end())
-        return 0;
-
-    if (intrinsicDoubleT.find(name) != intrinsicDoubleT.end())
-        return T_DOUBLE;
-    else if (intrinsicFloatT.find(name) != intrinsicFloatT.end())
-        return T_FLOAT;
-    
-    return 0;
-}
-
-int isIntrinsicFunctionName(const char *name)
-{
-    if (!name)
-        return 0;
-
-    int retval = 1;
-    set<string>::iterator result = intrinsicF.find(name);
-
-    if (result == intrinsicF.end())
-        retval = 0;
-
-    //check for dabs, dtan and etc.
-    if (retval == 0 && name[0] == 'd')
-    {
-        string partName(name + 1);
-        result = intrinsicF.find(partName);
-
-        if (result != intrinsicF.end())
-            retval = 1;
-    }
-
-    return retval;
-}
-
-SgSymbol *OriginalSymbol(SgSymbol *s)
-{
-    return((IS_BY_USE(s) ? (s)->moduleSymbol() : s));
-}
-
-#ifdef __SPF
-extern "C" void addToCollection(const int line, const char *file, void *pointer, int type);
-#endif
-
-void addNumberOfFileToAttribute(SgProject *project)
-{
-    int numOfFiles = project->numberOfFiles();
-    for (int i = 0; i < numOfFiles; ++i)
-    {
-        SgFile *currF = &(project->file(i));
-        string t = currF->filename();
-        int *num = new int[1];
-#ifdef __SPF
-        addToCollection(__LINE__, __FILE__, num, 2);
-#endif
-        num[0] = i;
-        currF->addAttribute(SG_FILE_ATTR, num, sizeof(int));
-
-        SgFile::addFile(std::make_pair(currF, i));
-
-        // fill private info for all statements
-        for (SgStatement *st = currF->firstStatement(); st; st = st->lexNext())
-        {
-            st->setFileId(i);
-            st->setProject(project);
-        }
-
-        for (SgSymbol *sm = currF->firstSymbol(); sm; sm = sm->next())
-        {
-            sm->setFileId(i);
-            sm->setProject(project);
-        }
-    }
-}
-
-// correct private list after CUDA kernel generation
-void correctPrivateList(int flag)
-{
-    if (newVars.size() != 0)
-    {
-        if (flag == RESTORE)
-        {
-            if (private_list)
-            {
-                for (size_t i = 0; i < newVars.size(); ++i)
-                    private_list = private_list->rhs();
-            }
-        }
-        else if (flag == ADD)
-        {
-            for (size_t i = 0; i < newVars.size(); ++i)
-            {
-                SgExprListExp *e = new SgExprListExp(*new SgVarRefExp(*newVars[i]));
-                e->setRhs(private_list);
-                private_list = e;
-            }
-        }
-    }
-}
-
-// create kernel call functions from HOST: skernel<<< specs>>>( args)
-SgFunctionCallExp *cudaKernelCall(SgSymbol *skernel, SgExpression *specs, SgExpression *args = NULL)
-{
-    SgExpression *fe = new SgExpression(ACC_CALL_OP);
-    fe->setSymbol(*skernel);
-    fe->setRhs(*specs);
-    if (args)
-        fe->setLhs(*args);
-    
-    return (SgFunctionCallExp *)fe;
-}
-
-// create FORTRAN index type in kernel: integer*4 if rt_INT or 
-// integer*8 if rt_LONG, rt_LLONG   
-static SgType *FortranIndexType(int rtType)
-{
-    SgType *type = NULL;
-
-    if (rtType == rt_INT)
-    {
-        SgExpression *le = new SgExpression(LEN_OP);
-        le->setLhs(new SgValueExp(4));
-        type = new SgType(T_INT, le, SgTypeInt());
-    }
-    else if (rtType == rt_LONG || rtType == rt_LLONG)
-    {
-        SgExpression *le = new SgExpression(LEN_OP);
-        le->setLhs(new SgValueExp(8));
-        type = new SgType(T_INT, le, SgTypeInt());
-    }
-    return type;
-}
-
-// create cuda index type in kernel for FORTRAN and C
-SgType *indexTypeInKernel(int rt_Type)
-{    
-    SgType *ret = NULL;
-
-    if (indexType_int == NULL)
-    {
-        s_indexType_int = new SgSymbol(TYPE_NAME, "__indexTypeInt", options.isOn(C_CUDA) ? *block_C_Cuda : *mod_gpu);
-        s_indexType_int->setType(new SgDescriptType(*SgTypeInt(), BIT_TYPEDEF));
-        if (options.isOn(C_CUDA))
-            indexType_int = C_Derived_Type(s_indexType_int);
-        else
-        {
-            SgExpression *le = new SgExpression(LEN_OP);
-            le->setLhs(new SgValueExp(4));
-            indexType_int = new SgType(T_INT, new SgVariableSymb("_int", *FortranIndexType(rt_INT), *mod_gpu), le, SgTypeInt());
-        }
-    }
-    
-    if (indexType_long == NULL)
-    {
-        s_indexType_long = new SgSymbol(TYPE_NAME, "__indexTypeLong", options.isOn(C_CUDA) ? *block_C_Cuda : *mod_gpu);
-        s_indexType_long->setType(C_LongType());
-        if (options.isOn(C_CUDA))
-            indexType_long = C_Derived_Type(s_indexType_long);
-        else
-        {
-            SgExpression *le = new SgExpression(LEN_OP);
-            le->setLhs(new SgValueExp(8));
-            indexType_long = new SgType(T_INT, new SgVariableSymb("_long", *FortranIndexType(rt_LONG), *mod_gpu), le, SgTypeInt());
-        }
-    }
-
-    if (indexType_llong == NULL)
-    {
-        s_indexType_llong = new SgSymbol(TYPE_NAME, "__indexTypeLLong", options.isOn(C_CUDA) ? *block_C_Cuda : *mod_gpu);
-        s_indexType_llong->setType(C_LongLongType());
-        if (options.isOn(C_CUDA))
-            indexType_llong = C_Derived_Type(s_indexType_llong);
-        else
-        {
-            SgExpression *le = new SgExpression(LEN_OP);
-            le->setLhs(new SgValueExp(8));
-            indexType_llong = new SgType(T_INT, new SgVariableSymb("_llong", *FortranIndexType(rt_LLONG), *mod_gpu), le, SgTypeInt());            
-        }
-    }
-    
-    if (rt_Type == rt_INT)
-        ret = indexType_int;
-    else if (rt_Type == rt_LONG)
-        ret = indexType_long;
-    else if (rt_Type == rt_LLONG)
-        ret = indexType_llong;
-
-    return ret;
-}
-
-// declare DO variables of parallel loop nest in kernel by indexType: rt_INT, rt_LONG, rt_LLONG
-void DeclareDoVars(SgType *indexType)
-{
-    SgStatement *st;
-    SgExpression *vl, *el;
-
-    // declare do_variables of parallel loop nest
-    if (options.isOn(C_CUDA))
-    {
-        vl = &(dvm_parallel_dir->expr(2))->copy(); // do_variables list copy  
-        for (el = vl; el; el = el->rhs())
-            (el->lhs())->setSymbol(new SgVariableSymb(el->lhs()->symbol()->identifier(), *indexType, *kernel_st));
-        st = Declaration_Statement(vl->lhs()->symbol());   // of CudaIndexType
-        st->setExpression(0, *vl);
-        kernel_st->insertStmtAfter(*st);
-        st->addComment("// Local needs");
-    }
-    else // Fortran-Cuda
-    {
-        st = indexType->symbol()->makeVarDeclStmt();   // of CudaIndexType
-        kernel_st->insertStmtAfter(*st);
-        vl = dvm_parallel_dir->expr(2); // do_variables list
-        st->setExpression(0, vl->copy());
-        st->addComment("! Local needs\n");
-    }
-}
-
-
-// create dvm coefficient:*0001, *0002 by indexType: rt_INT, rt_LONG, rt_LLONG
-static SgExpression *dvm_coef(SgSymbol *ar, int i, SgType *indeTypeInKernel)
-{
-    SgVarRefExp *ret = NULL;
-    if (options.isOn(C_CUDA))
-    {
-        SgSymbol *s_dummy_coef = new SgSymbol(VARIABLE_NAME, AR_COEFFICIENTS(ar)->sc[i]->identifier(), *indeTypeInKernel, *kernel_st);
-        ret = new SgVarRefExp(*s_dummy_coef);
-    }
-    else
-        ret = new SgVarRefExp(*(AR_COEFFICIENTS(ar)->sc[i]));
-    return ret;
-}
-
-// create array list by indexType: rt_INT, rt_LONG, rt_LLONG
-SgExpression *CreateArrayDummyList(SgType *indeTypeInKernel)
-{
-    symb_list *sl;
-    SgExpression *ae, *coef_list, *edim;
-    int n, d;
-    SgExpression *arg_list = NULL;
-
-    edim = new SgExprListExp();  // [] dimension
-
-    for (sl = acc_array_list; sl; sl = sl->next)   // + base_ref + <array_coeffs>
-    {
-        SgSymbol *s_dummy;
-        s_dummy = KernelDummyArray(sl->symb);
-        if (options.isOn(C_CUDA))
-            ae = new SgArrayRefExp(*s_dummy, *edim);
-        else
-            ae = new SgArrayRefExp(*s_dummy);
-        ae->setType(s_dummy->type());   //for C_Cuda
-        ae = new SgExprListExp(*ae);
-        
-        arg_list = AddListToList(arg_list, ae);
-        coef_list = NULL;
-        if (Rank(sl->symb) == 0)      //remote_access buffer may be of rank 0   
-            continue;
-        d = options.isOn(AUTO_TFM) ? 0 : 1;
-        for (n = Rank(sl->symb) - d; n>0; n--)
-        {
-            ae = new SgExprListExp(*dvm_coef(sl->symb, n + 1, indeTypeInKernel));
-            coef_list = AddListToList(coef_list, ae);
-        }
-
-        arg_list = AddListToList(arg_list, coef_list);
-    }
-    return(arg_list);
-
-}
-
-
-// create local parts of array list by indexType: rt_INT, rt_LONG, rt_LLONG
-SgSymbol *KernelDummyLocalPart(SgSymbol *s, SgType *indeTypeInKernel)
-{
-    SgArrayType *typearray;
-    SgType *type;
-
-    // for C_Cuda
-    typearray = new SgArrayType(*indeTypeInKernel);
-    typearray->addDimension(NULL);
-    type = typearray;
-
-    return(new SgSymbol(VARIABLE_NAME, s->identifier(), *type, *kernel_st));
-
-}
-
-SgExpression *CreateLocalPartList(SgType *indeTypeInKernel)
-{
-    local_part_list *pl;
-    SgExpression *ae;
-    SgExpression *arg_list = NULL;
-    for (pl = lpart_list; pl; pl = pl->next) // + <local_part>
-    {
-        if (options.isOn(C_CUDA))
-            ae = new SgExprListExp(*new SgArrayRefExp(*KernelDummyLocalPart(pl->local_part, indeTypeInKernel), 
-                                   *new SgExprListExp())); //<local_part>[]
-        else
-            ae = new SgExprListExp(*new SgArrayRefExp(*pl->local_part));
-        arg_list = AddListToList(arg_list, ae);
-    }
-    return(arg_list);
-
-}
-
-// create two kernel calls (for rt_INT and rt_LLONG) in CUDA_handeler by base kernel function. 
-// return if(rt_INT) kernel<<< >>>() else kernel2<<< >>>()
-SgStatement* createKernelCallsInCudaHandler(SgFunctionCallExp *baseFunc, SgSymbol *s_loop_ref, SgSymbol *idxTypeInKernel, SgSymbol *s_blocks)
-{
-    SgStatement *stmt = NULL;
-    std::string fcall_INT = baseFunc->symbol()->identifier();
-    std::string fcall_LLONG = baseFunc->symbol()->identifier();
-    fcall_INT += "_int";
-    fcall_LLONG += "_llong";
-
-    SgExpression *args = baseFunc->args();
-
-    SgFunctionCallExp *funcCall_int = cudaKernelCall(new SgSymbol(VARIABLE_NAME, fcall_INT.c_str()), baseFunc->rhs());
-    SgFunctionCallExp *funcCall_llong = cudaKernelCall(new SgSymbol(VARIABLE_NAME, fcall_LLONG.c_str()), baseFunc->rhs());
-    
-    while (args)
-    {
-        bool flag = false;
-        if (args->lhs()->symbol())
-        {
-            if (strcmp(args->lhs()->symbol()->identifier(), "blocks_info") == 0)
-            {
-                funcCall_int->addArg(*new SgCastExp(*C_PointerType(indexTypeInKernel(rt_INT)), *args->lhs()));
-                funcCall_llong->addArg(*new SgCastExp(*C_PointerType(indexTypeInKernel(rt_LLONG)), *args->lhs()));
-                flag = true;
-            }
-
-            if (args->lhs()->getAttribute(0) != NULL)
-            {
-                SgAttribute *att = args->lhs()->getAttribute(0);
-                if (att->getAttributeSize() == 777)
-                {
-                    funcCall_int->addArg(*new SgCastExp(*C_PointerType(indexTypeInKernel(rt_INT)), *args->lhs()));
-                    funcCall_llong->addArg(*new SgCastExp(*C_PointerType(indexTypeInKernel(rt_LLONG)), *args->lhs()));
-                    flag = true;
-                    args->lhs()->deleteAttribute(0);
-                }
-            }
-        }
-
-        if (flag == false)
-        {
-            funcCall_int->addArg(*args->lhs());
-            funcCall_llong->addArg(*args->lhs());
-        }
-        args = args->rhs();
-    }
-
-    if (options.isOn(RTC))
-    {
-        SgFunctionCallExp *rtc_FCall_INT = new SgFunctionCallExp(*createNewFunctionSymbol("loop_cuda_rtc_launch"));
-        rtc_FCall_INT->addArg(*new SgVarRefExp(s_loop_ref));
-        rtc_FCall_INT->addArg(*new SgValueExp(fcall_INT.c_str()));
-        rtc_FCall_INT->addArg(*new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, fcall_INT.c_str())));
-        rtc_FCall_INT->addArg(SgAddrOp(*new SgVarRefExp(s_blocks)));
-        rtc_FCall_INT->addArg(*new SgValueExp(baseFunc->numberOfArgs()));
-
-        RTC_FArgs.push_back(baseFunc->args());
-        RTC_FCall.push_back(rtc_FCall_INT);
-
-        SgFunctionCallExp *rtc_FCall_LLONG = new SgFunctionCallExp(*createNewFunctionSymbol("loop_cuda_rtc_launch"));
-        rtc_FCall_LLONG->addArg(*new SgVarRefExp(s_loop_ref));
-        rtc_FCall_LLONG->addArg(*new SgValueExp(fcall_LLONG.c_str()));
-        rtc_FCall_LLONG->addArg(*new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, fcall_LLONG.c_str())));
-        rtc_FCall_LLONG->addArg(SgAddrOp(*new SgVarRefExp(s_blocks)));
-        rtc_FCall_LLONG->addArg(*new SgValueExp(baseFunc->numberOfArgs()));
-
-        RTC_FArgs.push_back(baseFunc->args());
-        RTC_FCall.push_back(rtc_FCall_LLONG);
-    }
-
-    if (options.isOn(RTC))
-        stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(*idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_INT"))),
-        *new SgCExpStmt(*RTC_FCall[RTC_FCall.size() - 2]), *new SgCExpStmt(*RTC_FCall[RTC_FCall.size() - 1]));
-    else
-        stmt = new SgIfStmt(SgEqOp(*new SgVarRefExp(*idxTypeInKernel), *new SgVarRefExp(*new SgSymbol(VARIABLE_NAME, "rt_INT"))),
-        *new SgCExpStmt(*funcCall_int), *new SgCExpStmt(*funcCall_llong));
-    return stmt;
-}
-
-static string getValue(SgExpression *exp)
-{
-    if (exp == NULL)
-        return "";
-
-    string ret = "";
-    if (exp->symbol())
-    {
-        if (exp->symbol()->identifier())
-            ret = "(" + string(exp->symbol()->identifier()) + ")";
-    }
-    else if (exp->variant() == INT_VAL)
-    {
-        char buf[256];
-        sprintf(buf, "%d", exp->valueInteger());
-        ret = "(" + string(buf) + ")";
-    }
-    else if (exp->variant() == ADD_OP)
-        ret = "(+)";
-    else if (exp->variant() == SUBT_OP)
-        ret = "(-)";
-    else if (exp->variant() == MULT_OP)
-        ret = "(*)";
-    else if (exp->variant() == DIV_OP)
-        ret = "(/)";
-    else if (exp->variant() == MOD_OP)
-        ret = "(mod)";
-    else if (exp->variant() == EXP_OP)
-        ret = "(**)";
-    else if (exp->variant() == KEYWORD_VAL)
-        ret = "(" + string(((SgKeywordValExp*)exp)->value()) + ")";
-    return ret;
-}
-
-static void recExpressionPrint(SgExpression* exp, const int lvl, const char* LR, const int currNum, int& allNum)
-{
-    if (exp)
-    {
-        SgExpression* lhs = exp->lhs();
-        SgExpression* rhs = exp->rhs();
-        int lNum, rNum;
-
-        string vCurr = getValue(exp);
-        string vL = getValue(lhs);
-        string vR = getValue(rhs);
-
-        if (lhs && rhs)
-        {
-            lNum = allNum + 1;
-            rNum = allNum + 2;
-            allNum += 2;
-            printf("\"%d_%d_%s_%s_%s\" -> \"%d_%d_L_%s_%s\";\n", currNum, lvl, LR, tag[exp->variant()], vCurr.c_str(), lNum, lvl + 1, tag[lhs->variant()], vL.c_str());
-            printf("\"%d_%d_%s_%s_%s\" -> \"%d_%d_R_%s_%s\";\n", currNum, lvl, LR, tag[exp->variant()], vCurr.c_str(), rNum, lvl + 1, tag[rhs->variant()], vR.c_str());
-        }
-        else if (lhs)
-        {
-            lNum = allNum + 1;
-            allNum++;
-            printf("\"%d_%d_%s_%s_%s\" -> \"%d_%d_L_%s_%s\";\n", currNum, lvl, LR, tag[exp->variant()], vCurr.c_str(), lNum, lvl + 1, tag[lhs->variant()], vL.c_str());
-        }
-        else if (rhs)
-        {
-            rNum = allNum + 1;
-            allNum++;
-            printf("\"%d_%d_%s_%s_%s\" -> \"%d_%d_R_%s_%s\";\n", currNum, lvl, LR, tag[exp->variant()], vCurr.c_str(), rNum, lvl + 1, tag[rhs->variant()], vR.c_str());
-        }
-        if (lhs)
-            recExpressionPrint(lhs, lvl + 1, "L", lNum, allNum);
-        if (rhs)
-            recExpressionPrint(rhs, lvl + 1, "R", rNum, allNum);
-    }
-}
-
-void recExpressionPrintFdvm(SgExpression *exp)
-{
-    printf("digraph G{\n");
-    int allNum = 0;
-    recExpressionPrint(exp, 0, "L", allNum, allNum);
-    if (allNum == 0 && exp)
-        printf("\"%d_%d_%s_%s_%s\";\n", allNum, 0, "L", tag[exp->variant()], getValue(exp).c_str());
-    printf("}\n");
-    fflush(NULL);
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/aks_analyzeLoops.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
deleted file mode 100644
index 5de45e2..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/aks_analyzeLoops.cpp
+++ /dev/null
@@ -1,2567 +0,0 @@
-#include "dvm.h"
-#include "aks_structs.h"
-#include "acc_data.h"
-
-// extern block vars
-extern SgStatement *loop_body, *dvm_parallel_dir, *first_do_par;
-
-// extern block functions
-extern void correctPrivateList(int);
-
-// local block vars
-static std::vector<SgStatement*> scalar_stmts;
-static bool only_scalar;
-static bool operation;
-
-// local  functions
-SgExpression *preCalculate(SgExpression*);
-SgExpression *correctDvmDirPattern(SgExpression*, SgExpression*);
-
-// for countInDims
-static int leftBound;
-static int rightBound;
-static bool existLB;
-static bool existRB;
-
-//for analyzeVarRef
-static std::vector<SgExpression*> lBound;
-static std::vector<SgExpression*> rBound;
-static std::vector<int> globalStep;
-static std::vector<SgSymbol*> symbolsOfForNode;
-static std::vector<int> actualDocycle;
-static std::vector<int> loopMultCount;
-
-static FILE *file;
-static FILE *fileStmts;
-
-static std::stack<SgStatement*> controlEndsOfIfStmt;
-static std::stack<SgStatement*> controlEndsOfForStmt;
-
-static unsigned generator = 0;
-static bool unknownLoop = false;
-
-//global variables
-std::vector<SgSymbol*> loopVars;
-ArrayIntents regionArrayInfo;
-LoopInfo currentLoopInfo;
-
-void printEXP(SgExpression *ex, int what, int lvl)
-{
-    if(what == 3)
-        printf("ROOT var %d lvl %d\n", ex->variant(), lvl);
-    else if(what == 2)
-        printf("LHS var %d lvl %d\n", ex->variant(), lvl);
-    else
-        printf("RHS var %d lvl %d\n", ex->variant(),lvl);
-    if(ex->lhs())
-        printEXP(ex->lhs(), 2, lvl+1);
-    if(ex->rhs())
-        printEXP(ex->rhs(), 1, lvl+1);
-}
-
-void fprintEXP(SgExpression *ex, int what, int lvl)
-{
-    if(what == 3)
-        fprintf(file, "ROOT var %d lvl %d\n", ex->variant(), lvl);
-    else if(what == 2)
-        fprintf(file, "LHS var %d lvl %d\n", ex->variant(), lvl);
-    else
-        fprintf(file, "RHS var %d lvl %d\n", ex->variant(),lvl);
-    if(ex->lhs())
-        fprintEXP(ex->lhs(), 2, lvl+1);
-    if(ex->rhs())
-        fprintEXP(ex->rhs(), 1, lvl+1);
-}
-
-void createDoAssigns(AnalyzeStat &currentStat, std::vector<SgSymbol*> &newSymbs, SgExpression *arrayRef, int dim, int dimNew, BestPattern &pattern, std::vector<SgStatement*> &writeStmts, std::vector<SgStatement*> &readStmts)
-{	
-    SgForStmt *forStmtR = NULL, *forStmtW = NULL;
-    int leftBound;
-    int rightBound;
-    bool exL = false;
-    bool exR = false;
-    int wasFirst = 0;	
-
-    if(dimNew >= 1)
-    {
-        SgArrayType *tpArrNew = new SgArrayType(*arrayRef->symbol()->type());
-        for(size_t i = 0; i < pattern.what.size(); ++i)
-        {
-            if(pattern.what[i] < 0)
-            {
-                if(pattern.bounds[i].ifDdot)
-                {
-                    SgExprListExp *ex = new SgExprListExp(DDOT);
-                    ex->setLhs(*new SgValueExp(pattern.bounds[i].L));
-                    ex->setRhs(*new SgValueExp(pattern.bounds[i].R));
-                    tpArrNew->addDimension(ex);
-                }
-                else
-                    tpArrNew->addDimension(new SgValueExp(abs(pattern.bounds[i].R - pattern.bounds[i].L) + 1));
-            }
-        }
-
-        SgExpression *subsc = arrayRef->lhs();
-        SgSymbol *symbArray = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(arrayRef->symbol()->identifier()));		
-
-        symbArray->setType(tpArrNew);
-                
-        SgArrayRefExp *newArray = new SgArrayRefExp(*symbArray);
-        SgArrayRefExp *oldArray = new SgArrayRefExp(*arrayRef->symbol());
-        SgArrayRefExp *newArray1 = new SgArrayRefExp(*symbArray);
-        SgArrayRefExp *oldArray1 = new SgArrayRefExp(*arrayRef->symbol());
-
-        SgStatement *stmtW = new SgAssignStmt(*oldArray, *newArray);
-        SgStatement *stmtR = new SgAssignStmt(*newArray1, *oldArray1);
-
-        for(size_t i = 0; i < pattern.what.size(); ++i)
-        {
-            exL = exR = false;
-            char *idx = new char[32];
-            char *number = new char[32];
-            idx[0] = number[0] = '\0';
-            strcat(idx, arrayRef->symbol()->identifier());
-            strcat(idx, "_");
-            strcat(idx, "m");
-            number[sprintf(number, "%u", (unsigned)i)] = 0;
-            strcat(idx, number);
-
-            if(pattern.what[i] < 0)
-            {
-                SgSymbol *doVarName = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(idx));
-                newSymbs.push_back(doVarName);
-
-                leftBound = pattern.bounds[i].L;
-                rightBound = pattern.bounds[i].R;
-                exL = exR = true;
-                
-                if(leftBound > rightBound)
-                {
-                    int tmp = rightBound;
-                    rightBound = leftBound;
-                    leftBound = tmp;
-                }
-    
-                if(exL && exR)
-                {
-                    if(wasFirst == 0)
-                    {
-                        forStmtR = new SgForStmt(doVarName, new SgValueExp(leftBound), new SgValueExp(rightBound), new SgValueExp(1), stmtR);
-                        forStmtW = new SgForStmt(doVarName, new SgValueExp(leftBound), new SgValueExp(rightBound), new SgValueExp(1), stmtW);
-                        wasFirst = 1;
-                    }
-                    else
-                    {
-                        forStmtR = new SgForStmt(doVarName, new SgValueExp(leftBound), new SgValueExp(rightBound), new SgValueExp(1), forStmtR);
-                        forStmtW = new SgForStmt(doVarName, new SgValueExp(leftBound), new SgValueExp(rightBound), new SgValueExp(1), forStmtW);
-                    }
-                    if(pattern.bounds[i].additionalExpr)
-                    {
-                        SgExpression *ex = new SgExpression(SUBT_OP);
-                        ex->setLhs(pattern.bounds[i].additionalExpr);
-                        ex->setRhs(pattern.bounds[i].additionalExpr);
-                        SgExpression *res = preCalculate(ex);
-                        res = Calculate(res);
-
-                        oldArray->addSubscript(subsc->lhs()->copy() + *new SgValueExp(res->valueInteger()) + *new SgVarRefExp(*doVarName));
-                        oldArray1->addSubscript(subsc->lhs()->copy() + *new SgValueExp(res->valueInteger()) + *new SgVarRefExp(*doVarName));
-                    }
-                    else
-                    {					
-                        oldArray->addSubscript(*new SgVarRefExp(*doVarName));
-                        oldArray1->addSubscript(*new SgVarRefExp(*doVarName));
-                    }
-                    newArray->addSubscript(*new SgVarRefExp(*doVarName));
-                    newArray1->addSubscript(*new SgVarRefExp(*doVarName));
-                }
-            }
-            else
-            {
-                oldArray->addSubscript(subsc->lhs()->copy());
-                oldArray1->addSubscript(subsc->lhs()->copy());
-            }
-            subsc = subsc->rhs();			
-        }
-
-        readStmts.push_back(forStmtR);
-        writeStmts.push_back(forStmtW);
-        newSymbs.push_back(symbArray);
-        currentStat.replaceSymbol = symbArray;
-        currentStat.ifHasDim = 1;
-    }
-    else if(dimNew == 0)
-    {
-        SgArrayRefExp *oldArray = new SgArrayRefExp(*arrayRef->symbol());
-        SgExpression *subsc = arrayRef->lhs();
-        for(int i = 0; i < dim; ++i)
-        {
-            oldArray->addSubscript(subsc->lhs()->copy());
-            subsc = subsc->rhs();
-        }
-
-        SgArrayRefExp *oldArray1 = new SgArrayRefExp(*arrayRef->symbol());
-        subsc = arrayRef->lhs();
-        for(int i = 0; i < dim; ++i)
-        {
-            oldArray1->addSubscript(subsc->lhs()->copy());
-            subsc = subsc->rhs();
-        }
-
-        SgSymbol *scalar = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(arrayRef->symbol()->identifier()));
-        scalar->setType(arrayRef->symbol()->type()->baseType());
-
-        SgStatement *stmtW = new SgAssignStmt(*oldArray, *new SgVarRefExp(scalar));
-        SgStatement *stmtR = new SgAssignStmt(*new SgVarRefExp(scalar), *oldArray1);	
-
-        readStmts.push_back(stmtR);
-        writeStmts.push_back(stmtW);
-        newSymbs.push_back(scalar);
-        currentStat.replaceSymbol = scalar;
-        currentStat.ifHasDim = 0;
-    }
-}
-
-int findPattern(SgExpression *patt, AnalyzeStat &Stat)
-{
-    bool noEq = true;
-    int num = -1;
-    for(size_t i = 0; i < Stat.patterns.size(); ++i)
-    {
-        if(ExpCompare(patt, Stat.patterns[i].symbs) == 1)
-        {
-            noEq = false;
-            num = i;
-            break;
-        }
-    }
-    return num;
-}
-
-void replaceInExpr(SgExpression *ex, SgExpression *by, int nested)
-{
-    if(ex)
-    {
-        bool L = false;
-        bool R = false;
-        if(ex->lhs())
-        {
-            if(ex->lhs()->variant() == VAR_REF)
-            {
-                if(ex->lhs()->symbol() == symbolsOfForNode[nested])
-                    ex->setLhs(by);
-            }
-            L = true;
-        }
-        if(ex->rhs())
-        {
-            if(ex->rhs()->variant() == VAR_REF)
-            {
-                if(ex->rhs()->symbol() == symbolsOfForNode[nested])
-                    ex->setRhs(by);
-            }
-            R = true;
-        }
-        if(L)
-            replaceInExpr(ex->lhs(), by, nested);
-        if(R)
-            replaceInExpr(ex->rhs(), by, nested);		
-    }
-}
-
-void _setsetPatternSymbs(int plus, bool &change, SgExpression *lBound, SgExpression *parent, int where_)
-{
-    if(lBound->variant() != INT_VAL)
-    {
-        if(lBound->lhs())
-            _setsetPatternSymbs(plus, change, lBound->lhs(), lBound, 0);
-        if(lBound->rhs())
-            _setsetPatternSymbs(plus, change, lBound->rhs(), lBound, 1);
-    }
-    else
-    {
-        plus += lBound->valueInteger();
-        if(where_ == 0)
-            parent->setLhs(*new SgValueExp(plus));
-        if(where_ == 1)
-            parent->setRhs(*new SgValueExp(plus));
-        if(where_ == -1)
-            lBound = new SgValueExp(plus);
-        change = true;
-    }
-}
-
-void setPatternSymbs(SgExpression *patt, SgExpression *in, int plus, int nested)
-{	
-    SgExpression *returnEx = patt;
-    SgExpression *localLB = new SgExpression(EXPR_LIST);
-    localLB->setLhs(&lBound[nested]->copy());
-    bool change = false;
-    _setsetPatternSymbs(plus, change, localLB, localLB, -1);
-    localLB = localLB->lhs();
-
-    SgExpression *replace = Calculate(localLB);
-    while(in)
-    {
-        SgExpression *newEx = new SgExpression(EXPR_LIST);
-        newEx->setLhs(&in->lhs()->copy());		
-        replaceInExpr(newEx, replace, nested);
-        newEx = newEx->lhs();
-
-        patt->setLhs(newEx);		
-        in = in->rhs();
-        if(in)
-        {
-            patt->setRhs(new SgExprListExp());
-            patt = patt->rhs();
-        }
-    }
-    patt = returnEx;
-}
-
-// �������� �� �������������� �����
-SgExpression* findReplaceEx(SgSymbol *s)
-{
-    SgExpression *returnEx = NULL;
-    if(scalar_stmts.size() != 0)
-    {
-        for(int i = scalar_stmts.size() - 1; i >= 0; i--)
-        {
-            if(scalar_stmts[i]->expr(0)->symbol() == s)
-            {
-                returnEx = scalar_stmts[i]->expr(1);
-                break;
-            }
-        }
-    }
-    return returnEx;
-}
-
-void ifNeedReplace(SgExpression *s, SgExpression *parent, int where_)
-{
-    if(s->variant() == VAR_REF)
-    {
-        bool ifN = false;
-        bool ifInAllSymb = false;
-        for (size_t i = 0; i < symbolsOfForNode.size(); ++i)
-        {
-            if (symbolsOfForNode[i] == s->symbol())
-            {
-                ifInAllSymb = true;
-                break;
-            }
-        }
-        // if symbol isnt FOR symbol
-        if(ifInAllSymb == false)
-        {
-            for(size_t i = 0; i < loopVars.size(); ++i)
-            {
-                if(loopVars[i] != s->symbol())
-                {
-                    ifN = true;
-                    break;
-                }
-            }
-            
-            if(ifN) // replace
-            {
-                SgExpression *find = findReplaceEx(s->symbol());
-                if(find)
-                {
-                    if(where_ == 0)
-                        parent->setLhs(find);
-                    else if(where_ == 1)
-                        parent->setRhs(find);
-                }
-            }
-        }
-    }
-    else
-    {
-        if(s->lhs())
-            ifNeedReplace(s->lhs(), s, 0);
-        if(s->rhs())
-            ifNeedReplace(s->rhs(), s, 1);
-    }
-}
-
-void correctIdxOfArraRef(SgExpression *ex)
-{
-    SgExpression *tmp = ex->lhs();
-    while(tmp)
-    {
-        ifNeedReplace(tmp->lhs(), tmp, 0);
-        tmp = tmp->rhs();
-    }
-}
-
-void insertLoopVariatns(std::vector<AnalyzeStat> &allStat, int num, bool _new, SgSymbol *s, SgExpression *ex, int nested)
-{
-    if (actualDocycle[nested])
-    {
-        for (int i = 0; i < loopMultCount[nested]; ++i)
-        {
-            SgExpression *pattTmp = new SgExprListExp();
-            setPatternSymbs(pattTmp, &ex->lhs()->copy(), globalStep[nested] * i, nested);
-            if (nested == (int)actualDocycle.size() - 1)
-            {
-                if (_new)
-                {
-                    Pattern p;
-                    p.count_read_op = 0;
-                    p.count_write_op = 0;
-                    if (operation == READ)
-                        p.count_read_op = 1;
-                    else
-                        p.count_write_op = 1;
-                    p.symbs = pattTmp;
-                    allStat[num].patterns.push_back(p);
-                }
-                else
-                {
-                    int num_p = findPattern(pattTmp, allStat[num]);
-                    if (num_p == -1)
-                    {
-                        Pattern p;
-                        p.count_read_op = 0;
-                        p.count_write_op = 0;
-                        if (operation == READ)
-                            p.count_read_op = 1;
-                        else
-                            p.count_write_op = 1;
-                        p.symbs = pattTmp;
-                        allStat[num].patterns.push_back(p);
-                    }
-                    else
-                    {
-                        if (operation == READ)
-                            allStat[num].patterns[num_p].count_read_op++;
-                        else
-                            allStat[num].patterns[num_p].count_write_op++;
-                    }
-                }
-            }
-            else
-                insertLoopVariatns(allStat, num, _new, s, ex, nested + 1);
-        }
-    }
-    else if (nested != (int)actualDocycle.size() - 1)
-        insertLoopVariatns(allStat, num, _new, s, ex, nested + 1);
-}
-
-void analyzeVarRef(std::set<SgSymbol*> &private_vars, std::vector<AnalyzeStat> &allStat, SgSymbol *s, SgExpression *ex)
-{
-    bool inPrivateList = private_vars.find(s) != private_vars.end();
-
-    if(isSgArrayType(s->type()) && !inPrivateList) // if array ref
-    {
-        bool inList = false;
-        int num = -1;
-                
-        correctIdxOfArraRef(ex);
-        only_scalar = false;
-        for(size_t i = 0; i < allStat.size(); ++i)
-        {
-            if(allStat[i].name_of_array == s)
-            {
-                inList = true;
-                num = i;
-                break;
-            }
-        }
-
-        if(!inList)
-        {			
-            AnalyzeStat tmp;			
-            tmp.name_of_array = s;
-            tmp.ex_name_of_array = ex;			
-            allStat.push_back(tmp);
-            int newNum = allStat.size() - 1;
-
-            // if stmt in loops
-            if(symbolsOfForNode.size() != 0)
-                insertLoopVariatns(allStat, newNum, true, s, ex, 0);
-            else
-            {
-                Pattern p;
-                p.count_read_op = 0;
-                p.count_write_op = 0;
-                if(operation == READ)
-                    p.count_read_op = 1;
-                else
-                    p.count_write_op = 1;
-                p.symbs = ex->lhs();
-                allStat[newNum].patterns.push_back(p);
-            }
-            
-        }
-        else
-        {
-            // if stmt in loops
-            if(symbolsOfForNode.size() != 0)
-                insertLoopVariatns(allStat, num, false, s, ex, 0);
-            else
-            {
-                int num_p = findPattern(ex->lhs(), allStat[num]);
-                if(num_p == -1)
-                {
-                    Pattern p;				
-                    p.count_read_op = 0;
-                    p.count_write_op = 0;
-                    if(operation == READ)
-                        p.count_read_op = 1;
-                    else
-                        p.count_write_op = 1;
-                    p.symbs = ex->lhs();
-                    allStat[num].patterns.push_back(p);
-                }
-                else
-                {
-                    if(operation == READ)
-                        allStat[num].patterns[num_p].count_read_op ++;
-                    else
-                        allStat[num].patterns[num_p].count_write_op ++;
-                }
-            }
-        }
-    }	
-}
-
-void analyzeRightAssing(std::set<SgSymbol*> &private_vars, std::vector<AnalyzeStat> &allStat, SgExpression *ex)
-{
-    //printf("var %d\n", ex->variant());
-    if(ex->variant() != ARRAY_REF)
-    {
-        if(ex->lhs())
-            analyzeRightAssing(private_vars, allStat, ex->lhs());
-        if(ex->rhs())
-            analyzeRightAssing(private_vars, allStat, ex->rhs());
-    }
-    else	
-        analyzeVarRef(private_vars, allStat, ex->symbol(), ex);
-}
-
-void findBest(std::vector<AnalyzeStat> &allStat, std::vector<BestPattern> &best, SgExpression *dvm_dir_pattern)
-{
-    for(size_t i = 0; i < allStat.size(); ++i)
-    {
-        int count = 0;
-        size_t first = allStat[i].patterns.size() + 1;
-        SgExpression *ex = NULL;
-        std::vector<int> flags;
-        std::vector<SgExpression*> exps;
-        std::vector<SgExpression*> dvm_dir;
-        BestPattern tmp;
-
-        tmp.count_of_pattern = 0;
-        for(size_t it = 0; it < allStat[i].patterns.size(); ++it)
-        {
-            if(allStat[i].patterns[it].count_write_op != 0)
-            {
-                first = it;
-                break;
-            }
-        }
-
-        if(first > allStat[i].patterns.size())
-        {
-            ex = allStat[i].patterns[0].symbs;
-            while(ex)
-            {
-                flags.push_back(false);
-                ex = ex->rhs();
-            }
-        }
-        else
-        {
-            SgExpression *t = correctDvmDirPattern(dvm_dir_pattern, allStat[i].patterns[first].symbs);
-            ex = allStat[i].patterns[first].symbs;
-            tmp.count_of_pattern += allStat[i].patterns[first].count_write_op;
-            while(ex)
-            {
-                count++;
-                exps.push_back(ex->lhs());
-                flags.push_back(true);
-                ex = ex->rhs();
-
-                dvm_dir.push_back(t->lhs());
-                t = t->rhs();
-            }
-            tmp.bounds = std::vector<Bound>(count);
-            std::vector<SgExpression*> extraExprsInIdx = std::vector<SgExpression*>(count);
-            std::vector<int> minVal = std::vector<int>(count);
-            std::vector<int> maxVal = std::vector<int>(count);
-
-            for(size_t k = first + 1; k < allStat[i].patterns.size(); ++k)
-            {
-                if(allStat[i].patterns[k].count_write_op != 0)
-                {
-                    tmp.count_of_pattern += allStat[i].patterns[k].count_write_op;
-                    ex = allStat[i].patterns[k].symbs;			
-                    for(int m = 0; m < count; ++m)
-                    {
-                        if(flags[m])
-                        {
-                            if(ExpCompare(ex->lhs(), exps[m]) != 1)
-                            {
-                                if(dvm_dir[m] != NULL)
-                                {
-                                    if(dvm_dir[m]->variant() != KEYWORD_VAL)
-                                    {
-                                        SgExprListExp *countEx = new SgExprListExp(SUBT_OP);
-                                        countEx->setRhs(*exps[m]);
-                                        countEx->setLhs(*ex->lhs());
-                                        SgExpression *res = preCalculate(countEx);
-                                
-                                        res = Calculate(res);
-                                        if(res->variant() != INT_VAL)
-                                            flags[m] = false;
-                                        else
-                                        {
-                                            int resval = res->valueInteger();
-                                            if(extraExprsInIdx[m] == NULL)
-                                            {
-                                                extraExprsInIdx[m] = exps[m];
-                                                minVal[m] =  maxVal[m] = 0;
-                                            }
-                                            if(resval < minVal[m])
-                                                minVal[m] = resval;
-                                            else if(resval > maxVal[m])
-                                                maxVal[m] = resval;											
-                                        }
-                                    }
-                                    else
-                                    {
-                                        flags[m] = false;
-                                        extraExprsInIdx[m] = NULL;
-                                    }
-                                }
-                                else
-                                {
-                                    flags[m] = false;
-                                    extraExprsInIdx[m] = NULL;
-                                }
-                            }
-                        }
-                        ex = ex->rhs();
-                    }
-                }
-            }
-
-            for(int i = 0; i < count; ++i)
-            {
-                if(extraExprsInIdx[i] != NULL)
-                {
-                    Bound tmpB;
-                    tmpB.additionalExpr = extraExprsInIdx[i];
-                    tmpB.exL = true;
-                    tmpB.exR = true;
-                    tmpB.ifDdot = true;
-                    tmpB.L = minVal[i];
-                    tmpB.R = maxVal[i];
-                    tmp.bounds[i] = tmpB;
-                    flags[i] = false;
-                }
-            }
-        }	
-        tmp.what = flags;
-        if(first < allStat[i].patterns.size())
-            tmp.bestPatt = allStat[i].patterns[first].symbs;
-        else
-        {
-            //printf(" NO FOUND!!! \n");
-            tmp.bestPatt = NULL;
-        }
-        best.push_back(tmp);		
-    }
-}
-
-void findSymbolInExpression(SgExpression *inFind, int &flag, std::vector<SgSymbol*> &symbsInDvmDir, int &numFind, SgSymbol *sFind)
-{
-    if(flag == 1)
-    {
-        SgExpression *left = inFind->lhs();
-        SgExpression *right = inFind->rhs();
-    
-        if(inFind->variant() != VAR_REF)
-        {
-            if(left)
-                findSymbolInExpression(left, flag, symbsInDvmDir, numFind, sFind);
-            if(right)
-                findSymbolInExpression(right, flag, symbsInDvmDir, numFind, sFind);
-        }
-        else
-        {
-            bool find = false;
-            size_t i = 0;
-            SgSymbol *s = inFind->symbol();
-            for( ; i < symbsInDvmDir.size(); i++)
-            {
-                if(symbsInDvmDir[i] == s)
-                {
-                    find = true;
-                    break;
-                }
-            }
-
-            if(i < symbsInDvmDir.size())
-            {
-                if(numFind == -1)
-                {
-                    numFind = i;
-                    sFind = inFind->symbol();
-                }
-                else if(numFind != (int)i)
-                    flag = 0;
-            }
-        }
-    }
-}
-
-SgExpression *correctDvmDirPattern(SgExpression *dvm_dir_pattern, SgExpression *firstPatt)
-{
-    SgExpression *tmp1 = dvm_dir_pattern;
-    SgExpression *returnExp = dvm_dir_pattern;
-    std::vector<SgSymbol*> symbsInDvmDir;
-    int countDVM = 0;
-    int count = 0;
-
-    while(tmp1)
-    {
-        countDVM++;
-        if(tmp1->lhs()->variant() == VAR_REF)
-            symbsInDvmDir.push_back(tmp1->lhs()->symbol());
-        tmp1 = tmp1->rhs();
-    }
-    tmp1 = firstPatt;
-    while(tmp1)
-    {
-        count++;
-        tmp1 = tmp1->rhs();
-    }
-
-    // if correction needed
-    if(count != countDVM)
-    {
-        tmp1 = firstPatt;
-        
-        returnExp = new SgExprListExp();	
-        SgExpression *t = returnExp;
-        
-        for(int i = 0; i < count; ++i)
-        {
-            int flag = 1;
-            int numFind = -1;	
-            SgSymbol *sFind = NULL;	
-            
-            findSymbolInExpression(tmp1->lhs(), flag, symbsInDvmDir, numFind, sFind);
-            if(flag != 1)
-            {
-                returnExp = NULL;
-                break;
-            }
-            else
-            {
-
-                SgExprListExp *newL = new SgExprListExp();
-                if(numFind != -1)
-                    t->setLhs(*new SgVarRefExp(symbsInDvmDir[numFind]));
-
-                t->setRhs(newL);
-                t = t->rhs();
-            }
-            tmp1 = tmp1->rhs();
-        }
-    }
-
-    return returnExp;
-}
-
-void correctBestPattern(std::vector<AnalyzeStat> &allStat, std::vector<BestPattern> &best, SgExpression *dvm_dir_pattern)
-{	
-    for(size_t i = 0; i < allStat.size(); ++i)
-    {
-        SgExpression *t = dvm_dir_pattern;
-        SgExpression *t1 = NULL;
-        for(size_t p = 0; p < allStat[i].patterns.size(); ++p)
-        {
-            if(allStat[i].patterns[p].count_write_op != 0)
-            {
-                t1 = allStat[i].patterns[p].symbs;
-                break;
-            }
-        }
-        if(t1 != NULL)
-        {
-            t = correctDvmDirPattern(dvm_dir_pattern, t1);
-            if(DVM_DEBUG_LVL > 1)
-                if(t)
-                    fprintf(file, " Found pattern is %s\n", copyOfUnparse(t->unparse()));
-
-            if(t)
-            {
-                for(size_t k = 0; k < best[i].what.size(); ++k)
-                {
-                    if(best[i].what[k] != 0)
-                    {
-                        if(ExpCompare(t->lhs(), t1->lhs()) != 1)
-                            best[i].what[k] = 0;
-                    }
-                    
-                    t = t->rhs();
-                    t1 = t1 ->rhs();
-                }
-            }
-            else
-            {
-                for(size_t k = 0; k < best[i].what.size(); ++k)	
-                    best[i].what[k] = 0;				
-            }
-        }
-    }
-}
-
-int countSizeInDim(SgExpression *ex, bool &ifDdot)
-{	
-    int res = 0;
-    existLB = existRB = false;
-    SgExpression *result;
-    if(ex->variant() == DDOT)
-    {
-        ifDdot = true;
-        if (ex->lhs())
-        {
-            result = Calculate(ex->lhs());
-            if (result->variant() == INT_VAL)
-            {
-                existLB = true;
-                leftBound = result->valueInteger();
-            }
-        }
-
-        if (ex->rhs())
-        {
-            result = Calculate(ex->rhs());
-            if (result->variant() == INT_VAL)
-            {
-                existRB = true;
-                rightBound = result->valueInteger();
-            }
-        }
-        if(existLB && existRB)
-            res = abs(leftBound - rightBound) + 1;
-    }
-    else 
-    {
-        result = Calculate(ex);
-        existLB = true;
-        leftBound = 1;
-        if(result->variant() == INT_VAL)
-        {
-            existRB = true;
-            rightBound = result->valueInteger();
-        }
-        if(existLB && existRB)
-            res = abs(leftBound - rightBound) + 1;
-    }
-    return -1 * res;
-}
-
-bool compareWithPatten(SgExpression *inPatt, SgExpression *compared, std::vector<int> &flags)
-{	
-    bool retval = true;
-    SgExpression *t1 = inPatt;
-    SgExpression *t2 = compared;
-    char **str = new char*[2];
-    
-    if(DVM_DEBUG_LVL > 1)
-        fprintf(file, "%s  VS  %s  is ", copyOfUnparse(t1->unparse()), copyOfUnparse(t2->unparse()));
-
-    for(size_t i = 0; i < flags.size(); ++i)
-    {
-        if(flags[i] == 1)
-        {
-            if(ExpCompare(t1->lhs(), t2->lhs()) != 1)
-            {
-                str[0] = copyOfUnparse(t1->lhs()->unparse());
-                str[1] = copyOfUnparse(t2->lhs()->unparse());				
-                retval = false;
-                break;
-            }
-        }
-        
-        t1 = t1->rhs();
-        t2 = t2->rhs();
-    }
-    if(DVM_DEBUG_LVL > 1)
-    {
-        fprintf(file, "retval = %d  flags: ", retval);		
-        for(size_t i = 0; i < flags.size(); ++i)
-            fprintf(file, "%d ", flags[i]);
-
-        if(!retval)
-            fprintf(file, "  %s VS %s ", str[0], str[1]);
-
-        fprintf(file, "\n");
-    }
-    
-    return retval;
-}
-
-void replaceInStmt(std::vector<AnalyzeStat> &allStat, std::vector<BestPattern> &best, SgExpression *expr, SgExpression *ex_parrent, SgStatement *ex_parrent_st, int RL)
-{
-    if(expr->variant() == ARRAY_REF)
-    {
-        size_t i = 0;
-        SgSymbol *tmp = expr->symbol();
-        for( ; i < allStat.size(); i++)
-        {
-            if(allStat[i].name_of_array == tmp)
-                break;
-        }
-        if(i < allStat.size()) //if found
-        {		
-            if(best[i].count_of_pattern != 0)
-            {
-                if(compareWithPatten(best[i].bestPatt, expr->lhs(), best[i].what))
-                {
-                    SgArrayRefExp *newExp = NULL;					
-                    if(allStat[i].ifHasDim)
-                    {
-                        newExp = new SgArrayRefExp(*allStat[i].replaceSymbol);
-                        SgExpression *idxEx = expr->lhs();
-                        for(size_t k = 0; k < best[i].what.size(); ++k)
-                        {
-                            if(best[i].what[k] != 1)
-                            {
-                                if(best[i].bounds[k].additionalExpr)							
-                                    newExp->addSubscript(idxEx->lhs()->copy() - *best[i].bounds[k].additionalExpr);
-                                else
-                                    newExp->addSubscript(idxEx->lhs()->copy());
-                            }
-                            idxEx = idxEx->rhs();
-                        }
-                    }
-                    if(ex_parrent)
-                    {
-                        if(RL == RIGHT)
-                        {
-                            if(newExp)
-                                ex_parrent->setRhs(*newExp);
-                            else
-                                ex_parrent->setRhs(*new SgVarRefExp(*allStat[i].replaceSymbol));
-                        }
-                        else if(RL == LEFT)
-                        {
-                            if(newExp)
-                                ex_parrent->setLhs(*newExp);
-                            else
-                                ex_parrent->setLhs(*new SgVarRefExp(*allStat[i].replaceSymbol));
-                        }
-                    }
-                    else if(ex_parrent_st)
-                    {
-                        if(RL == RIGHT)
-                        {
-                            if(newExp)
-                                ex_parrent_st->setExpression(1, *newExp);
-                            else
-                                ex_parrent_st->setExpression(1, *new SgVarRefExp(*allStat[i].replaceSymbol));
-                        }
-                        else if(RL == LEFT)
-                        {
-                            if(newExp)
-                                ex_parrent_st->setExpression(0, *newExp);
-                            else
-                                ex_parrent_st->setExpression(0, *new SgVarRefExp(*allStat[i].replaceSymbol));
-                        }
-                    }
-                }
-            }
-        }
-    }
-    else
-    {
-        if(expr->lhs())
-            replaceInStmt(allStat, best, expr->lhs(), expr, NULL, LEFT);
-        if(expr->rhs())
-            replaceInStmt(allStat, best, expr->rhs(), expr, NULL, RIGHT);
-    }
-}
-
-void generateOptimalExpressions(std::vector<AnalyzeStat> &allStat, std::vector<BestPattern> &best, std::vector<SgSymbol*> &newVars)
-{
-    std::vector<SgStatement*> writeStmts;
-    std::vector<SgStatement*> readStmts;
-
-    for(size_t i = 0; i < allStat.size(); ++i)
-    {
-        SgArrayType *type = isSgArrayType(allStat[i].name_of_array->type());
-        if(type != NULL)
-        {
-            int dims = type->dimension();
-            int sum = 1;
-            bool ifSumChanged = false;
-            //fprintf(file, "dims size ");
-            for(int k = 0; k < dims; ++k)
-            {
-                if(!best[i].what[k] && best[i].count_of_pattern != 0)
-                {
-                    if(best[i].bounds[k].additionalExpr == NULL)
-                    {						
-                        SgExpression *ex = type->sizeInDim(k);
-                        best[i].what[k] = countSizeInDim(ex, best[i].bounds[k].ifDdot);
-                    
-                        best[i].bounds[k].L = best[i].bounds[k].R = 0;
-                        best[i].bounds[k].exL = existLB;
-                        best[i].bounds[k].exR = existRB;					
-                        if(existLB)
-                            best[i].bounds[k].L = leftBound;
-                        if(existRB)
-                            best[i].bounds[k].R = rightBound;
-
-                        sum *= (-1 * best[i].what[k]);
-                    }
-                    else
-                    {
-                        best[i].what[k] = -1 * (abs(best[i].bounds[k].L - best[i].bounds[k].R) + 1);
-                        sum *= (-1 * best[i].what[k]);
-                    }
-                    ifSumChanged = true;
-                }
-                /*else
-                {
-                    Bound tmpB;
-                    best[i].bounds.push_back(tmpB);
-                }*/
-                //fprintf(file, "%d ", best[i].what[k]);
-            }
-            //fprintf(file, "\n");
-            if(!ifSumChanged) // scalar ?
-                sum = 1;
-            if(sum >= best[i].count_of_pattern)
-            {
-                if(DVM_DEBUG_LVL > 1)
-                    fprintf(file, " [INFO] in array \" %s \" needed to read = %d, write operations = %d\n", allStat[i].name_of_array->identifier(), sum, best[i].count_of_pattern);
-
-                for(int k = 0; k < dims; ++k)
-                {
-                    best[i].what[k] = 0;
-                }
-                best[i].count_of_pattern = 0;
-            }
-            else
-            {
-                if(DVM_DEBUG_LVL > 1)
-                    fprintf(file, " [INFO] in array \" %s \" needed to read = %d, write operations = %d\n", allStat[i].name_of_array->identifier(), sum, best[i].count_of_pattern);
-                sum = 0;
-                for(int k = 0; k < dims; ++k)
-                {
-                    if(best[i].what[k] < 0)
-                        sum ++;
-                    if(best[i].what[k] == 0)
-                    {
-                        sum = -1;
-                        break;
-                    }
-                }
-                
-                if(sum != -1)
-                    createDoAssigns(allStat[i], newVars, allStat[i].ex_name_of_array, best[i].what.size(), sum, best[i], writeStmts, readStmts);
-            }
-        }
-    }
-
-    // insert and correct loop_body	
-    SgStatement *tmp, *contrEnd = NULL;
-    tmp = loop_body;
-    if(readStmts.size() != 0)
-        while(tmp)
-        {
-            if(tmp->variant() == ASSIGN_STAT)
-            {
-                if(DVM_DEBUG_LVL > 1)
-                    fprintf(file, "COMPARE PATTERNS start:\n");
-
-                replaceInStmt(allStat, best, tmp->expr(0), NULL, tmp, LEFT);
-                replaceInStmt(allStat, best, tmp->expr(1), NULL, tmp, RIGHT);
-
-                if(DVM_DEBUG_LVL > 1)
-                    fprintf(file, "COMPARE PATTERNS stop:\n\n");			
-            }
-        
-            tmp = tmp->lexNext();
-        }
-    
-    for(size_t i = 0; i < readStmts.size(); ++i)
-    {
-        tmp = readStmts[i];
-        tmp->lastNodeOfStmt()->setLexNext(*loop_body);
-        loop_body = tmp;
-    }
-
-    tmp = loop_body;
-    int count = 0;
-    while(tmp)
-    {
-        tmp = tmp->lexNext();
-        count++;
-    }
-
-    tmp = loop_body;
-    for(int i = 0; i < count - 2; ++i)
-    {
-        tmp = tmp->lexNext();
-    }
-    if(tmp->lexNext()->variant() == CONTROL_END)
-        contrEnd = tmp->lexNext();
-
-    for(size_t i = 0; i < writeStmts.size(); ++i)
-    {
-        tmp->setLexNext(*writeStmts[i]);
-        tmp = tmp->lexNext()->lastNodeOfStmt();
-    }
-    if(contrEnd)
-        tmp->setLexNext(*contrEnd);
-
-    // printf its
-    if(DVM_DEBUG_LVL > 1)
-    {
-        if(readStmts.size() != 0)
-            fprintf(file, "  Generated READ stms:\n");
-        for(size_t i = 0; i < readStmts.size(); ++i)
-            fprintf(file, "%s", readStmts[i]->unparse());
-        if(writeStmts.size() != 0)
-            fprintf(file, "  Generated WRITE stms:\n");
-        for(size_t i = 0; i < writeStmts.size(); ++i)
-            fprintf(file, "%s", writeStmts[i]->unparse());
-    }
-}
-
-// sign = 0 - plus, sing = 1 - minus
-void getInformation(std::vector<int> &signs, std::vector<SgSymbol *> &symbs, std::vector<int> &values, int sign, SgExpression *ex)
-{
-    if(ex->variant() == SUBT_OP)
-    {
-        getInformation(signs, symbs, values, 0, ex->lhs());
-        getInformation(signs, symbs, values, 1, ex->rhs());
-    }
-    else if(ex->variant() == ADD_OP)
-    {
-        getInformation(signs, symbs, values, 0 + sign, ex->lhs());
-        getInformation(signs, symbs, values, 0 + sign, ex->rhs());
-    }
-    else if(ex->variant() == VAR_REF)
-    {
-        symbs.push_back(ex->symbol());
-        signs.push_back(sign);
-    }
-    else if(ex->variant() == INT_VAL)
-    {
-        if(sign == 1)
-            values.push_back(-1 * ex->valueInteger());
-        else
-            values.push_back(ex->valueInteger());
-    }
-}
-
-SgExpression *preCalculate(SgExpression *exprL) // �������� ��� ���� ��������� ������
-{
-    std::vector<SgSymbol *> symbs;
-    std::vector<int> values;
-    std::vector<int> signs;
-    int val = 0;
-    bool ifALL = true;
-    SgExpression *retval = exprL;
-
-    getInformation(signs, symbs, values, 0, exprL);
-    for(size_t i = 0; i < symbs.size(); ++i)
-    {
-        SgSymbol *s = symbs[i];
-        for(size_t k = i + 1; k < symbs.size(); ++k)
-        {
-            if(s == symbs[k])
-            {
-                if(signs[i] * signs[k] == 0)
-                {
-                    symbs[i] = NULL;
-                    symbs[k] = NULL;
-                }
-                break;
-            }
-        }
-    }
-
-    for(size_t i = 0; i < symbs.size(); ++i)
-    {
-        if(symbs[i])
-        {
-            ifALL = false;
-            break;
-        }
-    }
-
-    for(size_t i = 0; i < values.size(); ++i)
-    {
-        val += values[i];
-    }
-
-    if(ifALL)
-    {
-        retval = new SgValueExp(val);
-    }
-    return retval;
-}
-
-bool existEqOp(SgExpression *ex)
-{
-    bool retval = false;
-    if(ex)
-    {
-        if(ex->variant() == EQ_OP)
-            retval = true;
-        else
-        {
-            if(ex->lhs())
-                retval = retval || existEqOp(ex->lhs());
-            if(ex->rhs() && !retval)
-                retval = retval || existEqOp(ex->rhs());
-        }
-    }
-    return retval;
-}
-
-// for <-gpuO1:lvl2>
-void findGroups(std::vector<AnalyzeStat> &allStat, std::vector<ArrayGroup> &allArrayGroups)
-{
-    for (size_t i = 0; i < allStat.size(); ++i)
-    {
-        AnalyzeStat tmp = allStat[i];
-        SgExpression *ex = tmp.patterns[0].symbs;
-        int countOfVariants = 0;
-        int position = 0;
-
-        while (ex)
-        {
-            countOfVariants++;
-            ex = ex->rhs();
-        }
-
-        std::vector<Group> allGroup;
-        std::vector<PositionGroup> allPosGr;
-        ArrayGroup newArrayGroup;
-
-        newArrayGroup.arrayName = allStat[i].name_of_array;
-        for (int k = 0; k < countOfVariants; ++k)
-        {
-            position = k;
-            PositionGroup newGr;
-
-            newGr.position = position;
-            for (size_t gl = 0; gl < tmp.patterns.size(); ++gl)
-            {
-                ex = tmp.patterns[gl].symbs;
-                std::vector<char *> charEx;
-                SgExpression *exInPos = NULL;
-                SgExprListExp *positions = new SgExprListExp();
-                SgExpression *currentPos = positions;
-
-                int num = 0;
-                bool first = true;
-                for (int m = 0; m < countOfVariants; ++m)
-                {
-                    if (m != k)
-                    {
-                        charEx.push_back(copyOfUnparse(ex->lhs()->unparse()));
-                        num += strlen(charEx[charEx.size() - 1]);
-                        if (first != true)
-                        {							
-                            currentPos->setRhs(new SgExprListExp());
-                            currentPos = currentPos->rhs();							
-                        }
-                        else
-                            first = false;
-
-                        currentPos->setLhs(ex->lhs());
-                        currentPos->setRhs(NULL);
-                    }
-                    else
-                    {
-                        exInPos = ex->lhs();
-                        if (gl == 0)
-                            newGr.idxInPos = ex->lhs();
-                    }
-                    ex = ex->rhs();
-                }
-                char *buf = new char[num + 16];
-                buf[0] = '\0';
-                strcat(buf, "(");
-                for (size_t m = 0; m < charEx.size(); ++m)
-                {
-                    strcat(buf, charEx[m]);
-                    if (m != charEx.size() - 1)
-                        strcat(buf, ",");
-                }
-                strcat(buf, ")");
-
-                bool exist = false;
-                num = 0;
-                for (size_t m = 0; m < newGr.allPosGr.size(); ++m)
-                {
-                    if (strcmp(newGr.allPosGr[m].strOfmain, buf) == 0)
-                    {
-                        num = m;
-                        exist = true;
-                        break;
-                    }
-                }
-
-                if (exist)
-                    newGr.allPosGr[num].inGroup.push_back(exInPos);
-                else
-                {
-                    Group gr;
-                    gr.inGroup.push_back(exInPos);
-                    gr.strOfmain = buf;
-                    gr.mainPattern = positions;
-                    newGr.allPosGr.push_back(gr);
-                }
-            }
-            allPosGr.push_back(newGr);
-        }
-        newArrayGroup.allGroups = allPosGr;
-        allArrayGroups.push_back(newArrayGroup);
-    }	
-}
-
-void createSwaps(newInfo &info)
-{
-    for (int i = 0; i < info.dimSize[0] - 1; ++i)
-    {
-        SgArrayRefExp *arrayEx = new SgArrayRefExp(*info.newArray);
-        SgArrayRefExp *arrayEx1 = new SgArrayRefExp(*info.newArray);
-
-        arrayEx->addSubscript(*new SgValueExp(i));
-        arrayEx1->addSubscript(*new SgValueExp(i + 1));
-        info.swapsDown.push_back(new SgAssignStmt(*arrayEx, *arrayEx1));
-    }
-
-    for (int i = 1; i < info.dimSize[0]; ++i)
-    {
-        SgArrayRefExp *arrayEx = new SgArrayRefExp(*info.newArray);
-        SgArrayRefExp *arrayEx1 = new SgArrayRefExp(*info.newArray);
-
-        arrayEx->addSubscript(*new SgValueExp(i - 1));
-        arrayEx1->addSubscript(*new SgValueExp(i));
-        info.swapsUp.push_back(new SgAssignStmt(*arrayEx1, *arrayEx));
-    }
-}
-
-void createLoadsAndStores(Group &gr, newInfo &info, ArrayGroup &oldArray, int numGr, PositionGroup &posGr)
-{
-    SgExprListExp *ddot = new SgExprListExp(DDOT);
-    SgArrayType *tpArrNew = new SgArrayType(*oldArray.arrayName->type());
-
-    ddot->setLhs(*new SgValueExp(0));
-    ddot->setRhs(*new SgValueExp(info.dimSize[0] - 1));
-    
-    tpArrNew->addDimension(ddot);
-    info.newArray->setType(tpArrNew);
-
-    for (int i = 0; i < info.dimSize[0]; ++i)
-    {
-        SgArrayRefExp *arrayEx = new SgArrayRefExp(*info.newArray);
-        SgArrayRefExp *oldArrayEx = new SgArrayRefExp(*oldArray.arrayName);
-        SgExpression *tmpEx = gr.mainPattern;
-        int size = 0;
-        
-        while (tmpEx)
-        {
-            size++;
-            tmpEx = tmpEx->rhs();
-        }
-        size++;
-
-        tmpEx = gr.mainPattern;
-        for (size_t k = 0; k < (size_t)size; ++k)
-        {
-            if ((int)k == numGr)
-                oldArrayEx->addSubscript(*gr.inGroup[i]);
-            else
-            {
-                oldArrayEx->addSubscript(*tmpEx->lhs());
-                tmpEx = tmpEx->rhs();
-            }
-        }
-
-        arrayEx->addSubscript(*new SgValueExp((int)i));
-        // fill table
-        posGr.tableReplace[copyOfUnparse(oldArrayEx->lhs()->unparse())] = arrayEx->copyPtr();
-
-        if (i != info.dimSize[0] - 1)
-            info.loadsBeforePlus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));
-
-        if (i != 0)
-            info.loadsBeforeMinus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));
-
-        if (i == info.dimSize[0] - 1)
-            info.loadsInForPlus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));
-
-        if (i == 0)
-            info.loadsInForMinus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));
-        /*
-        if (i == 0)
-            info.stores.push_back(new SgAssignStmt(*oldArrayEx, *arrayEx));*/
-    }
-}
-
-void sortInGroup(Group &gr)
-{
-    for (size_t i = 0; i < gr.sortLen.size() - 1; ++i)
-    {
-        for (size_t k = i; k < gr.sortLen.size() - 1; ++k)
-        {
-            if (gr.sortLen[k] > gr.sortLen[k + 1])
-            {
-                int tmp = gr.sortLen[k];
-                SgExpression *tmpEx = gr.inGroup[k];
-
-                gr.sortLen[k] = gr.sortLen[k + 1];
-                gr.inGroup[k] = gr.inGroup[k + 1];
-                gr.sortLen[k + 1] = tmp;
-                gr.inGroup[k + 1] = tmpEx;
-            }
-        }
-    }
-}
-
-SgExpression *substitutionStep(int stepSub, SgExpression *in, char *symb)
-{
-    SgExpression *ret = NULL;
-    SgExpression *left = NULL, *right = NULL;
-    if (in->variant() == VAR_REF)
-    {
-        if (strcmp(symb, in->symbol()->identifier()) == 0)
-        {
-            ret = new SgValueExp(stepSub);
-        }
-    }
-    else
-    {
-        if (in->lhs())
-            left = substitutionStep(stepSub, in->lhs(), symb);
-        if (in->rhs())
-            right = substitutionStep(stepSub, in->rhs(), symb);
-
-        if (left != NULL && right != NULL)
-        {
-            ret = new SgExprListExp(in->variant());
-            ret->setLhs(left);
-            ret->setRhs(right);
-        }
-        else if (left != NULL)
-        {
-            ret = new SgExprListExp(in->variant());
-            ret->setLhs(left);
-        }
-        else if (right != NULL)
-        {
-            ret = new SgExprListExp(in->variant());
-            ret->setRhs(right);
-        }
-        else
-        {
-            ret = in;
-        }
-    }
-    return ret;
-}
-
-SgExpression* replaceInExpr(SgExpression *current, SgExpression *parent, int nested, char *arrayS, PositionGroup &posGr)
-{
-    SgExpression *ret = NULL;
-    if (current->variant() == ARRAY_REF)
-    {
-        if (strcmp(current->symbol()->identifier(), arrayS) == 0)
-        {
-            SgExpression *replace = NULL;
-            char *need = copyOfUnparse(current->lhs()->unparse());
-
-            replace = posGr.tableReplace[need];			
-            if (replace != NULL)
-            {
-                SgSymbol *s = posGr.tableNewVars[replace->symbol()->identifier()];
-                if (s == NULL)
-                    posGr.tableNewVars[replace->symbol()->identifier()] = replace->symbol();
-
-                if (nested == 0) // assign
-                    ret = replace->copyPtr();
-                else if (nested == -1) // left
-                    parent->setLhs(replace);
-                else if (nested == 1) // rights
-                    parent->setRhs(replace);
-
-                if (DVM_DEBUG_LVL > 1)
-                {
-                    char *old = NULL, *new_ = NULL;
-                    old = copyOfUnparse(current->unparse());
-                    new_ = copyOfUnparse(replace->unparse());
-                    fprintf(file, "  %s -> %s\n", old, new_);
-                }
-            }
-        }
-    }
-    else
-    {
-        if (current->lhs())
-            replaceInExpr(current->lhs(), current, -1, arrayS, posGr);
-        if (current->rhs())
-            replaceInExpr(current->rhs(), current, 1, arrayS, posGr);
-    }
-    return ret;
-}
-
-void correctLoopBody(std::vector<ArrayGroup> &allArrayGroups)
-{
-    if (DVM_DEBUG_LVL > 1)
-        fprintf(file, "********** [REPLACE INFO] *********\n");
-
-    for (size_t i = 0; i < allArrayGroups.size(); ++i)
-    {
-        int bestPosition = -1;
-        int bestSum = -1;
-        // find best replace
-        for (size_t k = 0; k < allArrayGroups[i].allGroups.size(); ++k)
-        {
-            int sum = 0;
-            for (size_t m = 0; m < allArrayGroups[i].allGroups[k].allPosGr.size(); ++m)
-            {
-                if (allArrayGroups[i].allGroups[k].allPosGr[m].inGroup.size() > 1)
-                    sum++;
-            }
-            if (sum >= bestSum && allArrayGroups[i].allGroups[k].position != 0)
-            {
-                bestSum = sum;
-                bestPosition = allArrayGroups[i].allGroups[k].position;
-            }
-        }
-
-        if (bestPosition != -1)
-        {
-            SgStatement *st = loop_body;			
-            while (st)
-            {
-                if (st->variant() == ASSIGN_STAT)
-                {
-                    SgExpression *left, *right;
-                    left = right = NULL;
-                    left = replaceInExpr(st->expr(0), st->expr(0), 0, allArrayGroups[i].arrayName->identifier(), allArrayGroups[i].allGroups[bestPosition]);
-                    right = replaceInExpr(st->expr(1), st->expr(1), 0, allArrayGroups[i].arrayName->identifier(), allArrayGroups[i].allGroups[bestPosition]);
-                    if (left != NULL)
-                        st->setExpression(0, *left);
-                    if (right != NULL)
-                        st->setExpression(1, *right);
-                }
-                st = st->lexNext();
-            }
-            
-            for (std::map < std::string, SgSymbol*> ::iterator it = allArrayGroups[i].allGroups[bestPosition].tableNewVars.begin(); it != allArrayGroups[i].allGroups[bestPosition].tableNewVars.end(); it++)
-            {				
-                newVars.push_back(&*it->second);
-            }			
-        }
-    }
-
-
-    if (DVM_DEBUG_LVL > 1)
-        fprintf(file, "********** [REPLACE INFO] *********\n");
-}
-
-void checkGroup(Group &gr, int stepCycle, SgSymbol *symb)
-{
-    int *old = new int[gr.sortLen.size()];
-    for (size_t i = 0; i < gr.sortLen.size(); ++i)
-        old[i] = gr.sortLen[i];
-
-    for (size_t i = 0; i < gr.sortLen.size(); ++i)
-    {
-        for (size_t k = 0; k < gr.sortLen.size() - 1 - i; ++k)
-        {
-            if (old[k] > old[k + 1])
-            {
-                int tmp = old[k];
-                old[k] = old[k + 1];
-                old[k + 1] = tmp;
-            }
-        }
-    }
-
-    /*for (size_t i = 0; i < gr.sortLen.size(); ++i)
-    {
-        printf("%d ", old[i]);
-    }
-    printf("\n");*/
-
-    size_t size_ = gr.sortLen.size();
-    for (size_t i = 0; i < size_ - 1; ++i)
-    {
-        if (abs(old[i] - old[i + 1]) > abs(stepCycle))
-        {
-            int insertVal = old[i] + stepCycle;
-
-            gr.sortLen.push_back(insertVal);
-            if (insertVal == 0)
-            {
-                gr.len.push_back(0);
-                gr.inGroup.push_back(new SgVarRefExp(*symb));
-            }
-            else
-            {
-                gr.len.push_back(abs(insertVal));
-                SgExprListExp *add = NULL;
-                if (insertVal < 0)
-                {
-                    add = new SgExprListExp(SUBT_OP);
-                    add->setLhs(*new SgVarRefExp(*symb));
-                    add->setRhs(*new SgValueExp(-insertVal));
-                }
-                else
-                {
-                    add = new SgExprListExp(ADD_OP);
-                    add->setLhs(*new SgVarRefExp(*symb));
-                    add->setRhs(*new SgValueExp(insertVal));
-                }
-                gr.inGroup.push_back(add);
-            }
-        }
-    }
-}
-
-void correctGroups(std::vector<ArrayGroup> &allArrayGroups)
-{
-    for (size_t i = 0; i < allArrayGroups.size(); ++i)
-    {
-        for (size_t k = 0; k < allArrayGroups[i].allGroups.size(); ++k)
-        {
-            for (size_t m = 0; m < allArrayGroups[i].allGroups[k].allPosGr.size(); ++m)
-            {				
-                bool nextStep = false;
-                if (strcmp(allArrayGroups[i].allGroups[k].allPosGr[m].strOfmain, "()") != 0 && allArrayGroups[i].allGroups[k].allPosGr[m].inGroup.size() > 1)
-                {
-                    nextStep = true;
-                    allArrayGroups[i].allGroups[k].allPosGr[m].len.push_back(0);
-
-                    for (size_t p = 1; p < allArrayGroups[i].allGroups[k].allPosGr[m].inGroup.size(); ++p)
-                    {
-                        SgExprListExp *expr = new SgExprListExp(SUBT_OP);
-                        SgExpression *result;
-
-                        expr->setLhs(allArrayGroups[i].allGroups[k].allPosGr[m].inGroup[p - 1]);
-                        expr->setRhs(allArrayGroups[i].allGroups[k].allPosGr[m].inGroup[p]);
-                        result = preCalculate(expr);
-                        if (result->variant() == INT_VAL)
-                            allArrayGroups[i].allGroups[k].allPosGr[m].len.push_back(abs(result->valueInteger()));
-                        else
-                        {
-                            allArrayGroups[i].allGroups[k].allPosGr[m].len.clear();
-                            nextStep = false;
-                            break;
-                        }
-                    }
-
-                    for (size_t p = 0; p < allArrayGroups[i].allGroups[k].allPosGr[m].inGroup.size() && nextStep; ++p)
-                    {
-                        SgExprListExp *expr = new SgExprListExp(SUBT_OP);
-                        SgExpression *result;	
-
-                        expr->setLhs(allArrayGroups[i].allGroups[k].allPosGr[m].inGroup[p]);
-                        expr->setRhs(allArrayGroups[i].allGroups[k].idxInPos);
-                        result = preCalculate(expr);
-                        if (result->variant() == INT_VAL)
-                            allArrayGroups[i].allGroups[k].allPosGr[m].sortLen.push_back(result->valueInteger());
-                        else
-                        {
-                            allArrayGroups[i].allGroups[k].allPosGr[m].sortLen.clear();
-                            nextStep = false;
-                            break;
-                        }
-                    }
-
-                    if (nextStep)
-                    {
-                        int stepCycle = 1; // ��������� ��������, �������� �� ����������.
-                        int size;
-                        int shift = 0;						
-                        char *symb = NULL;
-                        bool allOk = true;
-
-                        if (allArrayGroups[i].allGroups[k].idxInPos->symbol())
-                            symb = allArrayGroups[i].allGroups[k].idxInPos->symbol()->identifier();
-                        else
-                            allOk = false;
-                        if (allOk)
-                        {
-                            checkGroup(allArrayGroups[i].allGroups[k].allPosGr[m], stepCycle, allArrayGroups[i].allGroups[k].idxInPos->symbol());
-
-                            size = allArrayGroups[i].allGroups[k].allPosGr[m].len.size();
-                            SgExpression **template1 = new SgExpression*[size];
-                            SgExpression **template2 = new SgExpression*[size];
-
-                            // fill templates
-                            for (int i1 = 0; i1 < size; ++i1)
-                            {
-                                template1[i1] = preCalculate(substitutionStep(0, allArrayGroups[i].allGroups[k].allPosGr[m].inGroup[i1], symb));
-                                template2[i1] = preCalculate(substitutionStep(0 + stepCycle, allArrayGroups[i].allGroups[k].allPosGr[m].inGroup[i1], symb));
-                            }
-
-                            // find shift						
-                            allOk = false;
-                            for (int k1 = 1; k1 < size; ++k1)
-                            {
-                                shift = k1;
-                                allOk = true;
-                                for (int i = shift; i < size; ++i)
-                                {
-                                    SgExprListExp *compare = new SgExprListExp(SUBT_OP);
-                                    SgExpression *zero = NULL;
-                                    compare->setLhs(template1[i]);
-                                    compare->setRhs(template2[i - shift]);
-                                    zero = preCalculate(compare);
-                                    if (zero->variant() == INT_VAL)
-                                    {
-                                        if (zero->valueInteger() != 0)
-                                        {
-                                            allOk = false;
-                                            break;
-                                        }
-                                    }
-                                    else
-                                    {
-                                        allOk = false;
-                                        break;
-                                    }
-                                }
-                                if (allOk)
-                                    break;
-                                else
-                                    allOk = false;
-                            }
-
-                            // if found
-                            if (allOk)
-                            {
-                                char buf[32];
-                                char *newName = new char[strlen(allArrayGroups[i].arrayName->identifier()) + 32];
-
-                                buf[0] = '\0';
-                                sprintf(buf, "%d", generator);
-                                generator++;
-                                newName[0] = '\0';
-                                strcat(newName, allArrayGroups[i].arrayName->identifier());
-                                strcat(newName, "_");
-                                strcat(newName, buf);
-                                allArrayGroups[i].allGroups[k].allPosGr[m].replaceInfo.newArray = new SgSymbol(VARIABLE_NAME, newName);
-                                allArrayGroups[i].allGroups[k].allPosGr[m].replaceInfo.dimSize.push_back(allArrayGroups[i].allGroups[k].allPosGr[m].inGroup.size());
-                                sortInGroup(allArrayGroups[i].allGroups[k].allPosGr[m]);
-                                // �������� ����������� ����������� ����������� ���������
-                                createLoadsAndStores(allArrayGroups[i].allGroups[k].allPosGr[m], allArrayGroups[i].allGroups[k].allPosGr[m].replaceInfo, allArrayGroups[i], k, allArrayGroups[i].allGroups[k]);
-                                createSwaps(allArrayGroups[i].allGroups[k].allPosGr[m].replaceInfo);
-                            }
-
-                            delete []template1;
-                            delete []template2;
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-// main functions for <-gpuO1>. All above for this
-AnalyzeReturnGpuO1 analyzeLoopBody(int type)
-{
-    SgStatement *loop_body_start = loop_body;
-    SgStatement *analyze_stmt = loop_body_start;
-    SgExpression *tmp = NULL;
-    SgExpression *dvm_dir_pattern = NULL;
-    std::set<SgSymbol*> private_vars;
-    std::vector<AnalyzeStat> allStat;	
-    std::vector<BestPattern> best_patterns;
-    std::vector<ArrayGroup> allArrayGroup;
-    bool ifBreak = false;
-    std::set<int> otherVars;
-        
-    // ��������!!! ������
-    int lastDLVL = DVM_DEBUG_LVL;
-    DVM_DEBUG_LVL = 2;
-
-    loopVars.clear();
-    scalar_stmts.clear();
-    
-    tmp = dvm_parallel_dir->expr(2);
-    while(tmp)
-    {
-        loopVars.push_back(tmp->lhs()->symbol());
-        tmp = tmp->rhs();
-    }
-
-    if(DVM_DEBUG_LVL > 1)
-        if(file == NULL)
-            file = fopen("log_optimization.txt", "w+");
-
-    if(DVM_DEBUG_LVL > 1)
-        if(fileStmts == NULL)
-            fileStmts = fopen("log_stms.txt", "w+");
-
-    dvm_dir_pattern = dvm_parallel_dir->expr(0)->lhs();	
-    tmp = dvm_parallel_dir->expr(1);
-    
-    while(tmp)
-    {
-        SgExpression *t = tmp->lhs();		
-        if(t->variant() == ACC_PRIVATE_OP)
-        {
-            t = t->lhs();
-            while(t)
-            {
-                SgExpression *t1 = &t->lhs()->copy();				
-                private_vars.insert(t1->symbol());
-                //printf("symbol as private: %s\n",t1->symbol()->identifier());
-                t = t->rhs();
-            }
-            break;
-        }
-        tmp = tmp->rhs();
-    }
-    
-    // all stmts is not in internal loop 
-    //loopMultCount = 1;
-
-    if(DVM_DEBUG_LVL > 1)
-        fprintf(file, "start analyze stmts in LOOP on line number %d\n", first_do_par->lineNumber());
-    while(analyze_stmt)
-    {		
-        if(analyze_stmt->variant() == ASSIGN_STAT)
-        {
-            SgSymbol *s = analyze_stmt->expr(0)->symbol();
-            SgExpression *ex = analyze_stmt->expr(0);
-
-            only_scalar = true;
-            operation = WRITE;
-            analyzeVarRef(private_vars, allStat, s, ex);
-            if(analyze_stmt->expr(1))
-            {
-                //printf("start\n");
-                //analyze_stmt->expr(1)->unparsestdout();
-                operation = READ;
-                analyzeRightAssing(private_vars, allStat, analyze_stmt->expr(1));
-                //printf("\nend\n\n");
-            }
-            if(only_scalar)
-                scalar_stmts.push_back(analyze_stmt);
-        }
-        else if(analyze_stmt->variant() == FOR_NODE) // �� ������������� ����������� ���������� ������ !!!
-        {
-            int step = 1;
-            bool exStep = true;			
-            SgExpression *ex = NULL;
-
-            symbolsOfForNode.push_back(analyze_stmt->symbol());
-            controlEndsOfForStmt.push(analyze_stmt->lastNodeOfStmt());
-
-            if(analyze_stmt->expr(1))
-            {
-                ex = Calculate(analyze_stmt->expr(1));
-                if(ex->variant() == INT_VAL)
-                    step = ex->valueInteger();
-                else
-                    exStep = false;
-                fprintf(file, "step is %s \n", copyOfUnparse(analyze_stmt->expr(1)->unparse()));
-            }
-
-            if(exStep)
-            {				
-                if(analyze_stmt->expr(0)->variant() == DDOT)
-                {
-                    SgExprListExp *exprL = new SgExprListExp(SUBT_OP);
-                    
-                    globalStep.push_back(step);
-                    lBound.push_back(analyze_stmt->expr(0)->lhs());
-                    rBound.push_back(analyze_stmt->expr(0)->rhs());
-                    loopMultCount.push_back(-999);
-                    exprL->setLhs(rBound[rBound.size() - 1]);
-                    exprL->setRhs(lBound[lBound.size() - 1]);
-
-                    ex = preCalculate(exprL);
-                    ex = Calculate(ex);
-                    if(ex->variant() == INT_VAL)
-                    {						
-                        loopMultCount[loopMultCount.size() - 1] = ((abs(ex->valueInteger()) + 1) / abs(step));
-                        actualDocycle.push_back(1);
-                        if(DVM_DEBUG_LVL > 1)
-                            fprintf(file, " Change loopMultCount by number %d with symbol %s, calculation value = %d, [%s, %s]\n", loopMultCount[loopMultCount.size() - 1], symbolsOfForNode[symbolsOfForNode.size() - 1]->identifier(), ex->valueInteger(), copyOfUnparse(lBound[lBound.size() - 1]->unparse()), copyOfUnparse(rBound[rBound.size() - 1]->unparse()));
-                    }
-                    else
-                    {
-                        unknownLoop = true;
-                        actualDocycle.push_back(1);
-                        loopMultCount[loopMultCount.size() - 1] = 1;
-                        fprintf(file, " **[ATTENTION]**: can't calculate expression << %s >> with variant %d\n", copyOfUnparse(ex->unparse()), analyze_stmt->expr(0)->variant());
-                    }
-                }
-            }	
-        }
-        else if(analyze_stmt->variant() == CONTROL_END)
-        {			
-            if (controlEndsOfForStmt.size() != 0)
-            {
-                if (analyze_stmt == controlEndsOfForStmt.top())
-                {
-                    loopMultCount.pop_back();
-                    symbolsOfForNode.pop_back();
-                    lBound.pop_back();
-                    rBound.pop_back();
-                    actualDocycle.pop_back();
-                    globalStep.pop_back();
-                    controlEndsOfForStmt.pop();
-
-                    if (DVM_DEBUG_LVL > 1)
-                        fprintf(file, "   Return back value of loopMultCount\n");
-                }
-            }
-            else if (controlEndsOfIfStmt.size() != 0)
-            {
-                if (analyze_stmt == controlEndsOfIfStmt.top())
-                    controlEndsOfIfStmt.pop();
-            }
-            else
-            {
-                if (DVM_DEBUG_LVL > 1)
-                    fprintf(file, " **[ATTENTION]**: unknown CONTROL_END in line %d!! It may be end of local \"loop_body\" \n", analyze_stmt->lineNumber());
-            }
-        }
-        else if (analyze_stmt->variant() == IF_NODE || analyze_stmt->variant() == ELSEIF_NODE)// || analyze_stmt->variant() == LOGIF_NODE)
-        {
-            SgExpression *ex = analyze_stmt->expr(0);
-            SgIfStmt *tmpIf = (SgIfStmt*)analyze_stmt;
-
-            if (tmpIf->falseBody())
-            {
-                if (tmpIf->falseBody()->variant() != ELSEIF_NODE)
-                    controlEndsOfIfStmt.push(analyze_stmt->lastNodeOfStmt());
-            }
-            else
-                controlEndsOfIfStmt.push(analyze_stmt->lastNodeOfStmt());
-
-            if(existEqOp(ex))
-            {
-                if (tmpIf->falseBody())
-                {
-                    if (tmpIf->falseBody()->variant() == ELSEIF_NODE)
-                    {
-                        analyze_stmt = tmpIf->falseBody();
-                        continue;
-                    }
-                    else
-                        analyze_stmt = tmpIf->falseBody();
-                }
-                else
-                {
-                    analyze_stmt = tmpIf->lastNodeOfStmt();
-                    controlEndsOfIfStmt.pop();
-                }
-            }				
-        }
-        else
-        {
-            if(DVM_DEBUG_LVL > 1)
-                otherVars.insert(analyze_stmt->variant());
-        }
-        if(DVM_DEBUG_LVL > 1)			
-            fprintf(fileStmts, "%s \n", copyOfUnparse(analyze_stmt->unparse()));
-
-        analyze_stmt = analyze_stmt->lexNext();
-    }	
-    
-    if(DVM_DEBUG_LVL > 1)
-    {
-        for(std::set<int>::iterator t = otherVars.begin(); t != otherVars.end(); t++)
-                fprintf(file, " [INFO] other variant is %d\n", *t);
-
-        fprintf(file, "finish analyze stmts\n");
-        fprintf(fileStmts, "//--------------------------------- end -------------------------------//\n\n");
-
-        fflush(file);
-        fflush(fileStmts);
-    }
-
-    if(!ifBreak)
-    {
-        // <-gpuO1 lvl1> BLOCK 
-        findBest(allStat, best_patterns, dvm_dir_pattern);
-        correctBestPattern(allStat, best_patterns, dvm_dir_pattern);
-        generateOptimalExpressions(allStat, best_patterns, newVars);
-        // end BLOCK
-
-        // <-gpuO1 lvl2> BLOCK
-        /*if (type == NON_ACROSS_TYPE && unknownLoop == false) 
-        {
-            findGroups(allStat, allArrayGroup);
-            correctGroups(allArrayGroup);
-            correctLoopBody(allArrayGroup);
-        }*/
-        // end BLOCK
-        
-        if(DVM_DEBUG_LVL > 1)
-        {
-            fprintf(file, "allStat size %u\n", (unsigned) allStat.size());
-        
-            for(size_t i = 0; i < allStat.size(); ++i)
-            {
-                fprintf(file, " name of array %s\n", allStat[i].name_of_array->identifier());
-                fprintf(file, "  patterns size %u\n", (unsigned) allStat[i].patterns.size());
-                for(size_t k = 0; k < allStat[i].patterns.size(); ++k)
-                {	
-                    if(allStat[i].patterns[k].count_write_op != 0)
-                    {
-                        fprintf(file, "    ex W = %d; ", allStat[i].patterns[k].count_write_op);
-                        fprintf(file, "(%s)\n", copyOfUnparse(allStat[i].patterns[k].symbs->unparse()));
-                    }
-                }
-
-                for(size_t k = 0; k < allStat[i].patterns.size(); ++k)
-                {	
-                    if(allStat[i].patterns[k].count_read_op != 0)
-                    {
-                        fprintf(file, "    ex R = %d; ", allStat[i].patterns[k].count_read_op);
-                        fprintf(file, "(%s)\n", copyOfUnparse(allStat[i].patterns[k].symbs->unparse()));
-                    }
-                }
-
-                if(best_patterns.size() != 0)
-                {
-                    fprintf(file, "  best pattern: ");
-                    for(size_t k = 0; k < best_patterns[i].what.size(); ++k)
-                        fprintf(file, "%d ", best_patterns[i].what[k]);
-
-                    fprintf(file, " with count_of_pattern %d\n",  best_patterns[i].count_of_pattern);
-                }
-            }
-
-            fprintf(file, "scalar_stmts size %u\n", (unsigned) scalar_stmts.size());
-            for(size_t i = 0; i < scalar_stmts.size(); ++i)
-            {
-                fprintf(file, " stmt ");
-                fprintf(file, "%s", copyOfUnparse(scalar_stmts[i]->unparse()));
-            }
-            fprintf(file, "finish analyze stmts\n");
-            fprintf(file, "//--------------------------------- end -------------------------------//\n\n");
-        }
-
-        DVM_DEBUG_LVL = lastDLVL;
-        if(newVars.size() != 0)
-        {
-            printf("  -------- Loop on line %d was optimized ---------- \n", first_do_par->lineNumber());
-            correctPrivateList(ADD);
-        }
-    }
-
-    AnalyzeReturnGpuO1 retStruct;
-    retStruct.allArrayGroup = allArrayGroup;
-    retStruct.allStat = allStat;
-    retStruct.bestPatterns = best_patterns;
-
-    return retStruct;
-}
-
-// optimization of one ACROSS, that is needed. BLOCK start
-
-SgExpression* replaceInEx(std::vector<newInfo> &allNewInfo, std::vector<acrossInfo> &allInfo, SgExpression *ex, SgExpression *parent, int LR)
-{
-    SgExpression *ret = NULL;
-    if (ex->variant() == ARRAY_REF)
-    {
-        char *name = ex->symbol()->identifier();
-        for (size_t i = 0; i < allInfo.size(); ++i)
-        {
-            if (strcmp(name, allInfo[i].nameOfArray) == 0)
-            {
-                SgArrayRefExp *arrayEx = new SgArrayRefExp(*allNewInfo[i].newArray);
-                SgExpression *list = ex->lhs();
-                for (size_t k = 0; k < allInfo[i].dims.size(); ++k)
-                {
-                    if (allInfo[i].dims[k] != 1 && allInfo[i].acrossPos != (int)k)
-                    {
-                        arrayEx->addSubscript(*&list->lhs()->copy());
-                    }
-                    else if (allInfo[i].acrossPos == (int)k)
-                    {
-                        arrayEx->addSubscript(*&list->lhs()->copy() - *new SgVarRefExp(allInfo[i].symbs[k]));
-                    }
-                    list = list->rhs();
-                }
-                if (LR == 1)
-                    parent->setLhs(arrayEx);
-                else if (LR == 2)
-                    parent->setRhs(arrayEx);
-                else
-                    ret = arrayEx;
-                break;
-            }
-        }
-    }
-    else
-    {
-        if (ex->lhs())
-            replaceInEx(allNewInfo, allInfo, ex->lhs(), ex, 1);
-        if (ex->rhs())
-            replaceInEx(allNewInfo, allInfo, ex->rhs(), ex, 2);
-    }
-    return ret;
-}
-
-void replace(std::vector<newInfo> &allNewInfo, std::vector<acrossInfo> &allInfo)
-{
-    SgStatement *body = loop_body;
-    while (body)
-    {
-        if (body->variant() == ASSIGN_STAT)
-        {
-            SgExpression *left, *right;
-            left = replaceInEx(allNewInfo, allInfo, body->expr(0), NULL, 3);
-            right = replaceInEx(allNewInfo, allInfo, body->expr(1), NULL, 3);
-            if (left != NULL && right != NULL)
-            {
-                body->setExpression(0, *left);
-                body->setExpression(1, *right);
-                
-            }
-            else if (left != NULL)
-            {
-                body->setExpression(0, *left);
-            }
-            else if (right != NULL)
-            {
-                body->setExpression(1, *right);
-            }
-        }
-        body = body->lexNext();
-    }
-}
-
-void createSwaps(newInfo &info, acrossInfo &oldInfo, int pos, std::vector<int> idxVal)
-{
-    if (info.dimSize.size() - 1 == (size_t)pos) // last and across
-    {
-        //down
-        for (int i = oldInfo.widthL; i < oldInfo.widthR; ++i)
-        {
-            SgArrayRefExp *arrayEx = new SgArrayRefExp(*info.newArray);
-            SgArrayRefExp *arrayExLast = new SgArrayRefExp(*info.newArray);
-            
-            for (size_t k = 0; k < idxVal.size(); ++k)
-            {
-                arrayEx->addSubscript(*new SgValueExp(idxVal[k]));
-                arrayExLast->addSubscript(*new SgValueExp(idxVal[k]));
-            }
-            arrayEx->addSubscript(*new SgValueExp((int)i));
-            arrayExLast->addSubscript(*new SgValueExp((int)(i + 1)));
-            info.swapsDown.push_back(new SgAssignStmt(*arrayEx, *arrayExLast));
-        }
-
-        //up
-        for (int i = oldInfo.widthR; i > oldInfo.widthL; i--)
-        {
-            SgArrayRefExp *arrayEx = new SgArrayRefExp(*info.newArray);
-            SgArrayRefExp *arrayExLast = new SgArrayRefExp(*info.newArray);
-
-            for (size_t k = 0; k < idxVal.size(); ++k)
-            {
-                arrayEx->addSubscript(*new SgValueExp(idxVal[k]));
-                arrayExLast->addSubscript(*new SgValueExp(idxVal[k]));
-            }
-            arrayEx->addSubscript(*new SgValueExp((int)i));
-            arrayExLast->addSubscript(*new SgValueExp((int)(i - 1)));
-            info.swapsUp.push_back(new SgAssignStmt(*arrayEx, *arrayExLast));
-        }
-    }
-    else
-    {
-        for (int i = 1; i <= info.dimSize[pos]; ++i)
-        {
-            std::vector<int> newIdx = idxVal;
-            newIdx.push_back((int)i);
-            createSwaps(info, oldInfo, pos + 1, newIdx);
-        }
-    }
-}
-
-void createLoadsAndStores(newInfo &info, acrossInfo &oldInfo, int pos, std::vector<int> idxVal)
-{
-    if (info.dimSize.size() - 1 == (size_t)pos) // last and across
-    {		
-        for (int i = oldInfo.widthL; i <= oldInfo.widthR; ++i)
-        {
-            SgArrayRefExp *arrayEx = new SgArrayRefExp(*info.newArray);
-            SgArrayRefExp *oldArrayEx = new SgArrayRefExp(*oldInfo.symbol);
-            int idxValp = 0;
-            for (size_t k = 0; k < oldInfo.dims.size(); ++k)
-            {
-                if (oldInfo.dims[k] == 1)
-                {
-                    if ((int)k == oldInfo.acrossPos)
-                        oldArrayEx->addSubscript(*new SgVarRefExp(oldInfo.symbs[k]) + *new SgValueExp((int)i));
-                    else
-                        oldArrayEx->addSubscript(*new SgVarRefExp(oldInfo.symbs[k]));
-                }
-                else
-                {
-                    oldArrayEx->addSubscript(*new SgValueExp(idxVal[idxValp]));
-                    idxValp++;
-                }
-            }
-
-            for (size_t k = 0; k < idxVal.size(); ++k)
-            {
-                arrayEx->addSubscript(*new SgValueExp(idxVal[k]));
-            }
-            arrayEx->addSubscript(*new SgValueExp((int)i));
-            
-            if (i == oldInfo.widthR)
-            {
-                info.loadsInForPlus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));
-                info.loadsBeforeMinus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));
-            }
-            else if (i == oldInfo.widthL)
-            {
-                info.loadsBeforePlus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));
-                info.loadsInForMinus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));					
-            }
-            else
-            {
-                info.loadsBeforePlus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));
-                info.loadsBeforeMinus.push_back(new SgAssignStmt(*arrayEx, *oldArrayEx));
-            }
-            if (i == 0)
-                info.stores.push_back(new SgAssignStmt(*oldArrayEx, *arrayEx));
-        }
-    }
-    else // non across
-    {
-        for (int i = 1; i <= info.dimSize[pos]; ++i)
-        {			
-            std::vector<int> newIdx = idxVal;
-            newIdx.push_back((int)i);
-            createLoadsAndStores(info, oldInfo, pos + 1, newIdx);
-        }
-    }
-}
-
-SgSymbol* searchOneIdx(SgExpression *ex)
-{
-    SgSymbol *ret = NULL;
-    if (ex->variant() == VAR_REF)
-    {
-        for (size_t i = 0; i < loopVars.size(); ++i)
-        {
-            if (strcmp(loopVars[i]->identifier(), ex->symbol()->identifier()) == 0)
-            {
-                ret = loopVars[i];
-                break;
-            }
-        }
-    }
-    else
-    {
-        if (ex->lhs() && ret == NULL)
-        {
-            ret = searchOneIdx(ex->lhs());
-            if (ret == NULL && ex->rhs())
-                ret = searchOneIdx(ex->rhs());
-        }
-    }
-    return ret;
-}
-
-void searchIdxs(std::vector<acrossInfo> &allInfo, SgExpression *st)
-{
-    if (st->variant() == ARRAY_REF)
-    {
-        for (size_t i = 0; i < allInfo.size(); ++i)
-        {
-            if (strcmp(allInfo[i].nameOfArray, st->symbol()->identifier()) == 0)
-            {
-                int p = 0;
-                SgExpression *list = st->lhs();
-                while (list)
-                {
-                    if (allInfo[i].dims[p] == 0)
-                    {
-                        SgSymbol *stmp = searchOneIdx(list->lhs());
-                        if (stmp != NULL)
-                        {
-                            allInfo[i].dims[p] = 1;
-                            allInfo[i].symbs[p] = stmp;
-                        }
-                    }
-                    list = list->rhs();
-                    p++;
-                }
-                break;
-            }
-        }
-    }
-    else
-    {
-        if (st->lhs())
-            searchIdxs(allInfo, st->lhs());
-        if (st->rhs())
-            searchIdxs(allInfo, st->rhs());
-    }
-}
-
-void optimizeLoopBodyForOne(std::vector<newInfo> &allNewInfo)
-{
-    SgExpression *tmp = dvm_parallel_dir->expr(1);
-    std::vector<acrossInfo> allInfo;
-    bool nextStep;
-
-    while (tmp)
-    {
-        SgExpression *t = tmp->lhs();
-        if (t->variant() == ACROSS_OP)
-        {
-            std::vector<SgExpression *> toAnalyze;
-            if (t->lhs()->variant() == EXPR_LIST)
-                toAnalyze.push_back(t->lhs());
-            else
-            {
-                if (t->lhs()->variant() == DDOT)
-                    toAnalyze.push_back(t->lhs()->rhs());
-
-                if (t->rhs())
-                    if (t->rhs()->variant() == DDOT)
-                        toAnalyze.push_back(t->rhs()->rhs());
-            }
-
-            for (int i = 0; i < toAnalyze.size(); ++i)
-            {
-                t = toAnalyze[i];
-                while (t)
-                {
-                    acrossInfo tmpI;
-                    tmpI.nameOfArray = t->lhs()->symbol()->identifier();
-                    tmpI.symbol = t->lhs()->symbol();
-                    tmpI.allDim = 0;
-                    tmpI.widthL = 0;
-                    tmpI.widthR = 0;
-                    tmpI.acrossPos = 0;
-                    tmpI.acrossNum = 0;
-                    SgExpression *tt = t->lhs()->lhs();
-                    int position = 0;
-                    while (tt)
-                    {
-                        bool here = true;
-                        if (tt->lhs()->lhs()->valueInteger() != 0)
-                        {
-                            tmpI.acrossPos = position;
-                            tmpI.acrossNum++;
-                            tmpI.widthL = (-1) * tt->lhs()->lhs()->valueInteger();
-                            here = false;
-                        }
-                        if (tt->lhs()->rhs()->valueInteger() != 0)
-                        {
-                            tmpI.acrossPos = position;
-                            if (here)
-                                tmpI.acrossNum++;
-                            tmpI.widthR = tt->lhs()->rhs()->valueInteger();
-                        }
-                        position++;
-                        tt = tt->rhs();
-                    }
-                    for (int i = 0; i < position; ++i)
-                    {
-                        tmpI.dims.push_back(0);
-                        tmpI.symbs.push_back(NULL);
-                    }
-                    allInfo.push_back(tmpI);
-
-                    t = t->rhs();
-                }
-            }
-            break;
-        }
-        tmp = tmp->rhs();
-    }
-
-    nextStep = true;
-    for (size_t i = 0; i < allInfo.size(); ++i)
-    {
-        if (allInfo[i].acrossNum > 1)
-        {
-            nextStep = false;
-            break;
-        }
-    }
-
-    if (nextStep)
-    {
-        SgStatement *st = loop_body;
-        loopVars.clear();
-
-        tmp = dvm_parallel_dir->expr(2);
-        while (tmp)
-        {
-            loopVars.push_back(tmp->lhs()->symbol());
-            tmp = tmp->rhs();
-        }
-
-        while (st)
-        {
-            if (st->variant() == ASSIGN_STAT)
-            {
-                searchIdxs(allInfo, st->expr(0));
-                searchIdxs(allInfo, st->expr(1));
-            }
-            st = st->lexNext();
-        }
-
-        for (size_t i = 0; i < allInfo.size(); ++i)
-        {
-            if (allInfo[i].symbs[allInfo[i].acrossPos] == NULL)
-            {
-                nextStep = false;
-                break;
-            }
-        }
-
-        if (nextStep)
-        {
-            for (size_t i = 0; i < allInfo.size(); ++i)
-            {
-                for (size_t k = 0; k < allInfo[i].dims.size(); ++k)
-                {
-                    if (allInfo[i].dims[k] == 0)
-                    {
-                        SgArrayType *tArr = isSgArrayType(allInfo[i].symbol->type());
-                        if (tArr != NULL)
-                        {
-                            SgExpression *dimList =  tArr->getDimList();
-                            if (dimList != NULL)
-                            {
-                                size_t p = 0;
-                                while (dimList && p != k)
-                                {
-                                    p++;
-                                    dimList = dimList->rhs();
-                                }
-                                // ������� ��� DDOT !!
-                                int val = dimList->lhs()->valueInteger();
-                                allInfo[i].dims[k] = val;
-                            }
-                        }
-                    }
-                }
-            }
-
-            for (size_t i = 0; i < allInfo.size(); ++i)
-            {
-                for (size_t k = 0; k < allInfo[i].dims.size(); ++k)
-                {
-                    if (allInfo[i].dims[k] == 0)
-                    {
-                        nextStep = false;
-                        break;
-                    }
-                }
-            }
-
-            if (nextStep)
-            {
-                for (size_t i = 0; i < allInfo.size(); ++i)
-                {
-                    char *newName = new char[strlen(allInfo[i].nameOfArray) + 2];
-                    newName[0] = '\0';
-                    strcat(newName, allInfo[i].nameOfArray);
-                    strcat(newName, "_");
-                    newInfo tmpNewInfo;
-                    tmpNewInfo.newArray = new SgSymbol(VARIABLE_NAME, TestAndCorrectName(newName));
-                    SgArrayType *tpArrNew = new SgArrayType(*allInfo[i].symbol->type());
-                    for (size_t k = 0; k < allInfo[i].dims.size(); ++k)
-                    {
-                        // �������� ��� DDOT
-                        if (allInfo[i].dims[k] != 1)
-                        {
-                            tpArrNew->addDimension(new SgValueExp(allInfo[i].dims[k]));
-                            tmpNewInfo.dimSize.push_back(allInfo[i].dims[k]);
-                        }
-                    }
-
-                    SgExprListExp *ex = new SgExprListExp(DDOT);
-                    ex->setLhs(*new SgValueExp(allInfo[i].widthL));
-                    ex->setRhs(*new SgValueExp(allInfo[i].widthR));
-                    tpArrNew->addDimension(ex);
-                    tmpNewInfo.newArray->setType(tpArrNew);
-
-                    tmpNewInfo.dimSize.push_back(abs(allInfo[i].widthR - allInfo[i].widthL) + 1);
-                    allNewInfo.push_back(tmpNewInfo);
-                }
-
-                //create loads and stores
-                // �������� ��� DDOT
-                for (size_t i = 0; i < allNewInfo.size(); ++i)
-                {
-                    std::vector<int> tmp;
-                    createLoadsAndStores(allNewInfo[i], allInfo[i], 0, tmp);
-                    createSwaps(allNewInfo[i], allInfo[i], 0, tmp);
-                }
-
-                replace(allNewInfo, allInfo);
-                for (size_t i = 0; i < allNewInfo.size(); ++i)
-                    newVars.push_back(allNewInfo[i].newArray);
-                if (newVars.size() != 0)
-                {
-                    correctPrivateList(ADD);
-                    printf("  -------- Loop on line %d was optimized ---------- \n", first_do_par->lineNumber());
-                }
-                // TMP PRINT
-                /*printf("plus before assigns\n");
-                for (size_t i = 0; i < allNewInfo[0].loadsBeforePlus.size(); ++i)
-                {
-                    allNewInfo[0].loadsBeforePlus[i]->unparsestdout();
-                }
-                printf("minus before assigns\n");
-                for (size_t i = 0; i < allNewInfo[0].loadsBeforeMinus.size(); ++i)
-                {
-                    allNewInfo[0].loadsBeforeMinus[i]->unparsestdout();
-                }
-                printf("plus in FOR assigns\n");
-                for (size_t i = 0; i < allNewInfo[0].loadsInForPlus.size(); ++i)
-                {
-                    allNewInfo[0].loadsInForPlus[i]->unparsestdout();
-                }
-                printf("minus in FOR assigns\n");
-                for (size_t i = 0; i < allNewInfo[0].loadsInForMinus.size(); ++i)
-                {
-                    allNewInfo[0].loadsInForMinus[i]->unparsestdout();
-                }
-                printf("stores assigns\n");
-                for (size_t i = 0; i < allNewInfo[0].stores.size(); ++i)
-                {
-                    allNewInfo[0].stores[i]->unparsestdout();
-                }
-                printf("swaps Down assigns\n");
-                for (size_t i = 0; i < allNewInfo[0].swapsDown.size(); ++i)
-                {
-                    allNewInfo[0].swapsDown[i]->unparsestdout();
-                }
-                printf("swaps Up assigns\n");
-                for (size_t i = 0; i < allNewInfo[0].swapsUp.size(); ++i)
-                {
-                    allNewInfo[0].swapsUp[i]->unparsestdout();
-                }*/
-            }
-        }
-    }
-}
-// BLOCK end
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/aks_loopStructure.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/aks_loopStructure.cpp
deleted file mode 100644
index 08b7aef..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/aks_loopStructure.cpp
+++ /dev/null
@@ -1,615 +0,0 @@
-#include "dvm.h"
-#include "acc_data.h"
-#include "aks_structs.h"
-#include "aks_loopStructure.h"
-
-extern SgStatement *dvm_parallel_dir;
-extern SgStatement* AssignStatement(SgExpression &lhs, SgExpression &rhs);
-
-using namespace std;
-
-// ---------------------------------------------------------------------- // Access
-
-Access::Access(SgExpression *_exp, Array *_parent)
-{
-    exp = _exp;
-    expAcc = copyOfUnparse(exp->unparse());
-    operation[0] = operation[1] = 0;
-    parentArray = _parent;
-}
-
-// only one idx  in one dimention in exp
-void Access::matchLoopIdxs(vector<SgSymbol*> &symbols)
-{
-    SgExpression *tmp = exp;
-    int idx = 0;
-    
-    if (alignOnLoop.size() == 0)
-        alignOnLoop = vector<int>(parentArray->getDimNum());
-
-    while (tmp)
-    {
-        for (unsigned i = 0; i < symbols.size(); ++i)
-        {
-            alignOnLoop[idx] = -1;
-            if (matchRecursion(tmp->lhs(), symbols[i]))
-            {
-                alignOnLoop[idx] = i;
-                break;
-            }
-        }
-        idx++;
-        tmp = tmp->rhs();
-    }
-}
-
-bool Access::matchRecursion(SgExpression *_exp, SgSymbol *symb)
-{
-    bool retVal = false;
-
-    SgExpression *left = _exp->lhs();
-    SgExpression *right = _exp->rhs();
-
-    if (_exp->variant() != VAR_REF)
-    {
-        if (left)
-            retVal = retVal || matchRecursion(left, symb);
-        if (right)
-            retVal = retVal || matchRecursion(right, symb);
-    }
-    else
-    {
-        SgSymbol *s = _exp->symbol();
-        if (strcmp(s->identifier(), symb->identifier()) == 0)
-            retVal = true;
-    }
-    return retVal;
-}
-
-void Access::setExp(char* _exp)             { expAcc = _exp; }
-void Access::setExp(SgExpression *_exp)     { exp = _exp; }
-char* Access::getExpChar()                  { return expAcc; }
-SgExpression* Access::getExp()              { return exp; }
-void Access::incOperW()                     { operation[1]++; }
-void Access::incOperR()                     { operation[0]++; }
-Array* Access::getParentArray()             { return parentArray; }
-void Access::setParentArray(Array *_parent) { parentArray = _parent; }
-std::vector<int>* Access::getAlignOnLoop()  { return &alignOnLoop; }
-
-// ---------------------------------------------------------------------- // Array
-
-Array::Array(int _dim, char *_name, Loop *_parent)
-{
-    dimNum = _dim;
-    name = _name;
-    parentLoop = _parent;
-    acrossType = 0;
-}
-
-Array::Array(char *_name, Loop *_parent)
-{
-    name = _name;
-    parentLoop = _parent;
-    acrossType = 0;
-}
-
-Access* Array::getAccess(char* _expAcc)
-{
-    int idx = -1;
-    for (unsigned i = 0; i < accesses.size(); ++i)
-    {
-        if (strcmp(_expAcc, accesses[i]->getExpChar()) == 0)
-        {
-            idx = i;
-            break;
-        }
-    }
-    if (idx == -1)
-        return NULL;
-    else
-        return accesses[idx];
-}
-
-void Array::analyzeAcrDims()
-{
-    SgExpression *tmp = dvm_parallel_dir->expr(1);
-    bool fieled = false;
-    while (tmp)
-    {
-        SgExpression *t = tmp->lhs();
-        unsigned numberOfAcr = 0;
-        if (t->variant() == ACROSS_OP)
-        {
-            t = t->lhs();
-            while (t)
-            {
-                if (strcmp(name, t->lhs()->symbol()->identifier()) == 0)
-                {
-                    fieled = true;
-                    SgExpression *tt = t->lhs()->lhs();
-                    while (tt)
-                    {
-                        bool acrossYes = false;
-                        if (tt->lhs()->lhs()->valueInteger() != 0)
-                            acrossYes = true;
-                        if (tt->lhs()->rhs()->valueInteger() != 0)
-                            acrossYes = true;
-
-                        if (acrossYes)
-                        {
-                            acrossDims.push_back(1);
-                            numberOfAcr++;
-                        }
-                        else
-                            acrossDims.push_back(0);
-                        tt = tt->rhs();
-                    }
-                }
-                t = t->rhs();
-            }
-        }
-        if (numberOfAcr != 0)
-            acrossType = (1 << numberOfAcr) - 1;
-        tmp = tmp->rhs();
-    }
-
-    if (fieled == false)
-    {
-        for (int i = 0; i < dimNum; ++i)
-            acrossDims.push_back(-1);
-    }
-
-    if (abs(dimNum - parentLoop->getLoopDim()))
-    {
-        for (int i = 0; i < abs(dimNum - parentLoop->getLoopDim()); i++)
-            acrossDims.push_back(-1);
-    }
-
-}
-
-void Array::analyzeAlignOnLoop()
-{
-    alignOnLoop = std::vector<int>(dimNum);
-    for (int i = 0; i < dimNum; ++i)
-        alignOnLoop[i] = -1;
-
-    if (accesses.size() > 0)
-    {
-
-        for (unsigned i = 0; i < accesses.size(); ++i)
-        {
-            if (accesses[i]->getAlignOnLoop()->size() == 0)
-                accesses[i]->matchLoopIdxs(*parentLoop->getSymbols());
-        }
-
-        int *tmp = new int[dimNum];
-        for (int i = 0; i < dimNum; ++i)
-            tmp[i] = (*(accesses[0]->getAlignOnLoop()))[i];
-
-        bool eq = true;
-        for (unsigned i = 1; i < accesses.size(); ++i)
-        {
-            bool ok = true;
-            for (int k = 0; k < dimNum; ++k)
-            {
-                if (tmp[k] != (*(accesses[i]->getAlignOnLoop()))[k])
-                {
-                    ok = false;
-                    break;
-                }
-            }
-
-            if (!ok)
-            {
-                eq = false;
-                break;
-            }
-        }
-
-        if (eq)
-        {
-            for (int i = 0; i < dimNum; ++i)
-                alignOnLoop[i] = tmp[i];
-        }
-    }
-}
-
-void Array::analyzeTrDims()
-{
-    int dimParLoop = parentLoop->getLoopDim();
-    
-    int idxAcrossSymb1 = -1;
-    int idxAcrossSymb2 = -1;
-
-    // all for's of Loop with across
-    if (dimParLoop > 1 && parentLoop->getAcrType() > 1)
-    {
-        if (parentLoop->getAcrType() == dimParLoop)
-        {
-            idxAcrossSymb1 = dimParLoop - 1;
-            idxAcrossSymb2 = dimParLoop - 2;
-        }
-        else
-        {
-            int t = 0;
-            for (int p = (int)(acrossDims.size() - 1); p >= 0 && t != 2; --p)
-            {
-                if (acrossDims[p] == 1)
-                {
-                    idxAcrossSymb1 = p;
-                    t++;
-                }
-            }
-        }
-
-        int idxInArray1 = -1;
-        int idxInArray2 = -1;
-        for (unsigned i = 0; i < alignOnLoop.size(); ++i)
-        {
-            if (alignOnLoop[i] == idxAcrossSymb1)
-                idxInArray1 = i;
-            else if (alignOnLoop[i] == idxAcrossSymb2)
-                idxInArray2 = i;
-        }
-
-        if (idxInArray1 != -1 && idxInArray2 != -1)
-        {
-            // inverse idxInArray and count from "1"
-            idxInArray1 = dimNum - idxInArray1;
-            idxInArray2 = dimNum - idxInArray2;
-        }
-
-        addTfmDim(idxInArray1);
-        addTfmDim(idxInArray2);
-    }
-}
-
-SgSymbol* Array::findAccess(SgExpression *_exp, char *&_charEx)
-{
-    SgSymbol *retVal = NULL;
-    char *retStr = new char[1024]; // WARNING!! may be segfault
-    SgExpression *tmp = _exp;
-
-    retStr[0] = '\0';
-    int out = 0;
-    int idx = 0;
-    while (tmp && out != 2)
-    {
-        if (dimNum - idx == transformDims[0] || dimNum - idx == transformDims[1])
-        {
-            strcat(retStr, UnparseExpr(tmp->lhs()));
-            strcat(retStr, "_");
-            out++;
-        }
-        idx++;
-        tmp = tmp->rhs();
-    }
-
-    for (unsigned i = 0; i < charEx.size(); ++i)
-    {
-        if (strcmp(charEx[i], retStr) == 0)
-        {
-            retVal = coefInAccess[i];
-            break;
-        }
-    }
-
-    if (retVal == NULL)
-    {
-        _charEx = new char[strlen(retStr) + 1];
-        _charEx[0] = '\0';
-        strcat(_charEx, retStr);
-    }
-    delete []retStr;
-    return retVal;
-}
-
-void Array::addNewCoef(SgExpression *_exp, char *_charEx, SgSymbol* _symb)
-{	
-    SgExpression *tmp = _exp;
-    
-    int out = 0;
-    int idx = 0;
-    while (tmp && out != 2)
-    {
-        if (dimNum - idx == transformDims[0])
-            firstEx.push_back(tmp->lhs());
-        else if (dimNum - idx == transformDims[1])
-            secondEx.push_back(tmp->lhs());
-        idx++;
-        tmp = tmp->rhs();
-    }
-
-    charEx.push_back(_charEx);
-    coefInAccess.push_back(_symb);
-}
-
-void Array::generateAssigns(SgVarRefExp *offsetX, SgVarRefExp *offsetY, SgVarRefExp *Rx, SgVarRefExp *Ry, SgVarRefExp *slash)
-{
-    if (ifCalls.size() == 0 && elseCalls.size() == 0 && zeroSt.size() == 0)
-    {
-        for (unsigned i = 0; i < coefInAccess.size(); ++i)
-        {
-            zeroSt.push_back(AssignStatement(*new SgVarRefExp(coefInAccess[i]->copy()), *new SgValueExp(0)));
-            SgFunctionCallExp *funcCallExpIf, *funcCallExpElse;
-
-            funcCallExpIf = new SgFunctionCallExp(*(new SgSymbol(FUNCTION_NAME, funcDvmhConvXYname)));
-            funcCallExpElse = new SgFunctionCallExp(*(new SgSymbol(FUNCTION_NAME, funcDvmhConvXYname)));
-
-            funcCallExpIf->addArg(firstEx[i]->copy() - *offsetX);
-            funcCallExpIf->addArg(secondEx[i]->copy() - *offsetY);
-            funcCallExpIf->addArg(*Rx);
-            funcCallExpIf->addArg(*Ry);
-            funcCallExpIf->addArg(*slash);
-            funcCallExpIf->addArg(*new SgVarRefExp(coefInAccess[i]->copy()));
-
-            funcCallExpElse->addArg(secondEx[i]->copy() - *offsetX);
-            funcCallExpElse->addArg(firstEx[i]->copy() - *offsetY);
-            funcCallExpElse->addArg(*Rx);
-            funcCallExpElse->addArg(*Ry);
-            funcCallExpElse->addArg(*slash);
-            funcCallExpElse->addArg(*new SgVarRefExp(coefInAccess[i]->copy()));
-
-            ifCalls.push_back(funcCallExpIf);
-            elseCalls.push_back(funcCallExpElse);
-        }
-    }
-}
-
-void Array::setDimNum(int _num)					 { dimNum = _num; }
-int Array::getDimNum()							 { return dimNum; }
-Loop* Array::getParentLoop()					 { return parentLoop; }
-void Array::setParentLoop(Loop *_loop)			 { parentLoop = _loop; }
-vector<int>* Array::getAcrDims()				 { return &acrossDims; }
-vector<int>* Array::getAlignOnLoop()			 { return &alignOnLoop; }
-void Array::addTfmDim(int _dim)					 { transformDims.push_back(_dim); }
-vector<int>* Array::getTfmDims()				 { return &transformDims; }
-void Array::addAccess(Access* _newAccess)		 { accesses.push_back(_newAccess); }
-vector<Access*>* Array::getAccesses()			 { return &accesses; }
-void Array::setArrayName(char* _name)			 { name = _name; }
-char* Array::getArrayName()						 { return name; }
-int Array::getAcrType()							 { return acrossType; }
-void Array::setAcrType(int _type)				 { acrossType = _type; }
-vector<SgFunctionCallExp*>* Array::getIfCals()   { return &ifCalls; }
-vector<SgFunctionCallExp*>* Array::getElseCals() { return &elseCalls; }
-vector<SgStatement*>* Array::getZeroSt()         { return &zeroSt; }
-vector<SgSymbol* >* Array::getCoefInAccess()     { return  &coefInAccess; }
-// ---------------------------------------------------------------------- // Loop
-
-Loop::Loop(int _line)
-{
-    line = _line;
-    acrossType = 0;
-    loopDim = 0;
-}
-
-Loop::Loop(int _line, SgStatement *_body)
-{
-    line = _line;
-    loopBody = _body;
-    acrossType = 0;
-    loopDim = 0;
-}
-
-Loop::Loop(int _acrType, int _line, SgStatement *_body)
-{
-    line = _line;
-    loopBody = _body;
-    acrossType = _acrType;
-    loopDim = 0;
-}
-
-Loop::Loop(int _line, SgStatement *_body, bool withAnalyze)
-{
-    line = _line;
-    loopBody = _body;
-    acrossType = 0;
-    loopDim = 0;
-
-    if (withAnalyze)
-        analyzeLoopBody();
-}
-
-void Loop::analyzeLoopBody()
-{
-    // create info of array
-    SgStatement *stmt = loopBody;
-    while (stmt)
-    {
-        if (stmt->variant() == ASSIGN_STAT)
-        {
-            SgExpression *exL = stmt->expr(0);
-            SgExpression *exR = stmt->expr(1);
-
-            if (exL)
-                analyzeAssignOp(exL, 1);
-            if (exR)
-                analyzeAssignOp(exR, 0);
-        }
-        stmt = stmt->lexNext();
-    }
-
-    // create idxs info
-    SgExpression *par_dir = dvm_parallel_dir->expr(2);
-    while (par_dir)
-    {
-        symbols.push_back(par_dir->lhs()->symbol());
-        par_dir = par_dir->rhs();
-    }
-    loopDim = symbols.size();
-
-    // create private list
-    SgExpression *tmp = dvm_parallel_dir->expr(1);
-    while (tmp)
-    {
-        SgExpression *t = tmp->lhs();
-        if (t->variant() == ACC_PRIVATE_OP)
-        {
-            t = t->lhs();
-            while (t)
-            {
-                if (isSgArrayType(t->lhs()->symbol()->type()))
-                    privateList.push_back(copyOfUnparse(t->lhs()->symbol()->identifier()));
-                t = t->rhs();
-            }
-        }
-        tmp = tmp->rhs();
-    }
-
-    // analyze acrossType and acrossDims in all arrays
-    for (unsigned i = 0; i < arrays.size(); ++i)
-    {
-        if ( !isArrayInPrivate(arrays[i]->getArrayName()) )
-        {
-            arrays[i]->analyzeAcrDims();
-            arrays[i]->analyzeAlignOnLoop();
-        }
-    }
-
-    analyzeAcrossType();
-
-    // analyze transformDims in all arrays
-    if (acrossType > 1)
-    {
-        for (unsigned i = 0; i < arrays.size(); ++i)
-        {
-            if (!isArrayInPrivate(arrays[i]->getArrayName()))
-                arrays[i]->analyzeTrDims();
-        }
-    }
-}
-
-void Loop::analyzeAssignOp(SgExpression *_exp, int oper)
-{
-    if (_exp->variant() != ARRAY_REF)
-    {
-        if (_exp->lhs())
-            analyzeAssignOp(_exp->lhs(), oper);
-        if (_exp->rhs())
-            analyzeAssignOp(_exp->rhs(), oper);
-    }
-    else
-    {
-        SgSymbol *arrName = _exp->symbol();
-        if (isSgArrayType(arrName->type())) // if array ref
-        {
-            int idx;
-            Array *newArray = getArray(arrName->identifier(), &idx);
-            if (newArray == NULL)
-            {				
-                Array *nArr = new Array(arrName->identifier(), this);
-                Access *nAcc = new Access(_exp->lhs(), nArr);
-
-                nArr->setDimNum(isSgArrayType(arrName->type())->dimension());
-                nArr->addAccess(nAcc);
-                addArray(nArr);
-
-                if (oper == 1)
-                    nAcc->incOperW();
-                else if (oper == 0)
-                    nAcc->incOperR();
-            }
-            else
-            {
-                char *strAcc = copyOfUnparse(_exp->lhs()->unparse());
-                Access *tAcc = newArray->getAccess(strAcc);
-
-                if (tAcc == NULL)
-                {
-                    tAcc = new Access(_exp->lhs(), newArray);
-                    newArray->addAccess(tAcc);
-                }
-
-                if (oper == 1)
-                    tAcc->incOperW();
-                else if (oper == 0)
-                    tAcc->incOperR();
-            }
-        }
-    }
-}
-
-Array* Loop::getArray(char *name, int *_idx)
-{
-    int idx = -1;
-    for (unsigned i = 0; i < arrays.size(); ++i)
-    {
-        if (strcmp(name, arrays[i]->getArrayName()) == 0)
-        {
-            idx = i;
-            break;
-        }
-    }
-    _idx[0] = idx;
-    if (idx == -1)
-        return NULL;
-    else
-        return arrays[idx];
-}
-
-Array* Loop::getArray(char *name)
-{
-    int idx = -1;
-    for (unsigned i = 0; i < arrays.size(); ++i)
-    {
-        if (strcmp(name, arrays[i]->getArrayName()) == 0)
-        {
-            idx = i;
-            break;
-        }
-    }
-    
-    if (idx == -1)
-        return NULL;
-    else
-        return arrays[idx];
-}
-
-void Loop::analyzeAcrossType()
-{
-    for (int i = 0; i < loopDim; ++i)
-        acrDims.push_back(-1);
-
-    for (unsigned i = 0; i < arrays.size(); ++i)
-    {
-        std::vector<int>* tArrAcrDims = arrays[i]->getAcrDims();
-        std::vector<int>* tArrAlign = arrays[i]->getAlignOnLoop();
-
-        for (unsigned k = 0; k < tArrAlign->size(); ++k)
-        {
-            if ((*tArrAlign)[k] != -1)
-                acrDims[(*tArrAlign)[k]] = MAX(acrDims[(*tArrAlign)[k]], (*tArrAcrDims)[(*tArrAlign)[k]]);
-        }
-    }
-    
-    acrossType = 0;
-    for (int i = 0; i < loopDim; ++i)
-    {
-        if (acrDims[i] != -1)
-            acrossType++;
-    }
-
-}
-
-bool Loop::isArrayInPrivate(char *name)
-{
-    bool retVal = false;
-    for (unsigned i = 0; i < privateList.size(); ++i)
-    {
-        if (strcmp(name, privateList[i]) == 0)
-        {
-            retVal = true;
-            break;
-        }
-    }
-    return retVal;
-}
-
-void Loop::addArray(Array *_array)    { arrays.push_back(_array); }
-void Loop::setLine(int _line)         { line = _line;             }
-int Loop::getLine()                   { return line;              }
-void Loop::setAcrType(int _type)      { acrossType = _type;       }
-int Loop::getAcrType()                { return acrossType;        }
-vector<Array*>* Loop::getArrays()     { return &arrays;           }
-vector<SgSymbol*>* Loop::getSymbols() { return &symbols;          }
-int Loop::getLoopDim()                { return loopDim;           }
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/aks_structs.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/aks_structs.cpp
deleted file mode 100644
index ab4da20..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/aks_structs.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-#include "dvm.h"
-#include "aks_structs.h"
-#include <vector>
-#include <map>
-#include <string>
-
-using std::vector;
-using std::string;
-using std::map;
-
-#define DEBUG_LV1 true
-#if 1
-std::ostream &out = std::cout;
-#else
-std::ofstream out("_log_debug_info.txt");
-#endif
-
-extern SgStatement *dvm_parallel_dir;
-
-SgExpression* findDirect(SgExpression *inExpr, int DIR)
-{
-    SgExpression *temp = NULL;
-    if (inExpr)
-    {
-        if (inExpr->variant() == DIR)
-            return inExpr;
-        else
-        {
-            if (inExpr->lhs())
-                temp = findDirect(inExpr->lhs(), DIR);
-
-            if(temp == NULL && inExpr->rhs())
-                temp = findDirect(inExpr->rhs(), DIR);
-        }
-    }
-    return temp;
-}
-
-static vector<SgSymbol*> fillDataOfArray(SgExpression* on, int& dimInPar)
-{
-    dimInPar = 0;
-    SgExpression* temp = on;
-    while (temp)
-    {
-        dimInPar++;
-        temp = temp->rhs();
-    }
-
-    vector<SgSymbol*> symbInPar(dimInPar);
-    temp = on;
-    for (int i = 0; i < dimInPar; ++i)
-    {
-        symbInPar[i] = temp->lhs()->symbol();
-        temp = temp->rhs();
-    }
-    return symbInPar;
-}
-
-static void printError()
-{
-    err("internal error in across", 424, first_do_par);
-    exit(-1);
-}
-
-static vector<SageArrayIdxs> GetIdxInParDir(const map<string, SgExpression*>& on, SgExpression *across, bool tie = false)
-{
-    vector<SageArrayIdxs> ret;
-
-    int dimInPar = 0;
-    vector<SgSymbol*> symbInPar;
-    vector<SgExpression*> toAnalyze;
-
-    if (across->lhs()->variant() == EXPR_LIST)
-        toAnalyze.push_back(across->lhs());
-    else
-    {
-        if (across->lhs()->variant() == DDOT)
-            toAnalyze.push_back(across->lhs()->rhs());
-        if (across->rhs())
-            if (across->rhs()->variant() == DDOT)
-                toAnalyze.push_back(across->rhs()->rhs());
-    }
-
-    for (int i = 0; i < toAnalyze.size(); ++i)
-    {
-        across = toAnalyze[i];
-        while (across)
-        {
-            if (symbInPar.size() == 0)
-            {
-                if (on.size() == 0)
-                    printError();
-                else if (on.size() == 1)
-                    symbInPar = fillDataOfArray(on.begin()->second, dimInPar);
-            }
-
-            SgExpression *t = across->lhs();
-            int dim = 0;
-
-            if (tie)
-            {
-                if (t->variant() == ARRAY_REF)
-                {
-                    if (on.find(t->symbol()->identifier()) == on.end())
-                        printError();
-                    else
-                        symbInPar = fillDataOfArray(on.find(t->symbol()->identifier())->second, dimInPar);
-                }
-                else if (t->variant() == ARRAY_OP)
-                {
-                    if (on.find(t->lhs()->symbol()->identifier()) == on.end())
-                        printError();
-                    else
-                        symbInPar = fillDataOfArray(on.find(t->lhs()->symbol()->identifier())->second, dimInPar);
-                }
-            }
-
-            if (t->variant() == ARRAY_REF)
-                t = t->lhs();
-            else if (t->variant() == ARRAY_OP)
-                t = t->lhs()->lhs();
-            else
-            {
-                if (DEBUG_LV1)
-                    out << "!!! unknown variant in ACROSS dir: " << t->variant() << std::endl;
-            }
-
-            SgExpression *tmp = t;
-            while (tmp)
-            {
-                dim++;
-                tmp = tmp->rhs();
-            }
-
-            SageArrayIdxs act;
-
-            act.symb.resize(dim);
-            act.dim = dim;
-            for (int i = 0; i < dim; ++i)
-            {
-                act.symb[i].across_left = t->lhs()->lhs()->valueInteger();
-                act.symb[i].across_right = t->lhs()->rhs()->valueInteger();
-                if (act.symb[i].across_left != 0 || act.symb[i].across_right != 0)
-                    act.symb[i].symb = symbInPar[i];
-                else if (i < dimInPar)
-                    act.symb[i].symb = symbInPar[i];
-                else
-                    act.symb[i].symb = NULL;
-                t = t->rhs();
-            }
-
-            ret.push_back(act);
-            across = across->rhs();
-        }
-    }
-
-    return ret;
-}
-
-SageAcrossInfo GetLoopsWithParAndAcrDir()
-{
-    SageAcrossInfo retVal;
-    SgStatement *temp = dvm_parallel_dir;
-
-    if (temp->variant() == DVM_PARALLEL_ON_DIR)
-    {
-        SgExpression *t = findDirect(temp->expr(1), ACROSS_OP);
-        SgExpression *tie = findDirect(temp->expr(1), ACC_TIE_OP);
-
-        map<string, SgExpression*> arrays;
-        if (t != NULL)
-        {
-            if (temp->expr(0) && temp->expr(0)->lhs())
-            {
-                arrays[temp->expr(0)->symbol()->identifier()] = temp->expr(0)->lhs();
-                retVal.idxs = GetIdxInParDir(arrays, t);
-            }
-            else if (tie)
-            {
-                SgExpression* list = tie->lhs();
-                while (list)
-                {
-                    arrays[list->lhs()->symbol()->identifier()] = list->lhs()->lhs();
-                    list = list->rhs();
-                }
-                retVal.idxs = GetIdxInParDir(arrays, t, true);
-            }
-            else
-                printError();
-        }
-    }
-    return retVal;
-}
-
-vector<SageSymbols> GetSymbInParalell(SgExpression *first)
-{
-    vector<SageSymbols> retval;
-    while(first)
-    {
-        SageSymbols q(first->lhs()->symbol(), -1, 0, 0);
-        retval.push_back(q);
-
-        first = first->rhs();
-    }
-    return retval;
-}
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/calls.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/calls.cpp
deleted file mode 100644
index bd37e4c..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/calls.cpp
+++ /dev/null
@@ -1,2589 +0,0 @@
-/*********************************************************************/
-/*  Fortran DVM+OpenMP+ACC                                           */
-/*                                                                   */
-/*                   Call Site Processing                            */
-/*********************************************************************/
-#include "leak_detector.h"
-
-#include "dvm.h"
-#include "acc_data.h"
-#include "calls.h"
-
-using std::map;
-using std::string;
-using std::vector;
-using std::pair;
-
-//---------------------------------------------------------------------------------
-
-#define NEW  1
-#define STATIC 1
-
-graph_node *cur_node;
-graph_node *node_list;
-int deb_reg = 0;
-int do_dummy = 0;
-int do_stmtfn = 0;
-int gcount = 0;
-int has_generic_interface = 0;
-int in_region = 0;
-int in_routine = 0;
-//-----------------------------------------------------------------------------------------
-graph_node *GraphNode(SgSymbol *s, SgStatement *header_st, int flag_new);
-graph_node *NodeForSymbInGraph(SgSymbol *s, SgStatement *stheader);
-graph_node *NewGraphNode(SgSymbol *s, SgStatement *header_st);
-edge *CreateOutcomingEdge(graph_node *gnode, int inlined);
-edge *CreateIncomingEdge(graph_node *gnode, int inlined);
-edge *NewEdge(graph_node *from, graph_node *to, int inlined);
-int isDummyArgument(SgSymbol *s);
-int isHeaderStmtSymbol(SgSymbol *s);
-int isStatementFunction(SgSymbol *s);
-int isHeaderNode(graph_node *gnode);
-int isDeadNode(graph_node *gnode);
-int isNoBodyNode(graph_node *gnode);
-void InsertPrototypesOfFunctionFromOtherFile(graph_node *node, SgStatement *after);
-void PrototypeOfFunctionFromOtherFile(graph_node *node, SgStatement *after, argument_numbers *arg_numbs);
-void InsertCopiesOfProcedure(graph_node *ndl, SgStatement *after);
-graph_node_list  *addToNodeList(graph_node_list *pnode, graph_node *gnode);
-graph_node_list  *delFromNodeList(graph_node_list *pnode, graph_node *gnode);
-graph_node_list  *isInNodeList(graph_node_list *pnode, graph_node *gnode);
-void PrintGraphNode(graph_node *gnode);
-void PrintGraphNodeWithAllEdges(graph_node *gnode);
-void PrintWholeGraph();
-void PrintWholeGraph_kind_2();
-void BuildingHeaderNodeList();
-void RemovingDeadSubprograms();
-void NoBodySubprograms();
-void DeleteIncomingEdgeFrom(graph_node *gnode, graph_node *from);
-void DeleteOutcomingEdgeTo(graph_node *gnode, graph_node *gto);
-void ScanSymbolTable(SgFile *f);
-void ScanTypeTable(SgFile *f);
-void printSymb(SgSymbol *s);
-void printType(SgType *t);
-void replaceVectorRef(SgExpression *e);
-//-------------------------------------------------------------------------------------
-extern SgExpression *private_list;
-extern map <string, vector<vector<SgType*> > > interfaceProcedures;
-
-void MarkAsUserProcedure(SgSymbol *s)
-{
-    SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) | USER_PROCEDURE_BIT;
-}
-
-void MarkAsExternalProcedure(SgSymbol *s)
-{
-    SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) | EXTERNAL_BIT;
-}
-
-SgSymbol * GetProcedureHeaderSymbol(SgSymbol *s)
-{
-    if (!ATTR_NODE(s))
-        return(NULL);
-    return(GRAPHNODE(s)->symb);
-}
-
-int FromOtherFile(SgSymbol *s)
-{
-    if (!ATTR_NODE(s))
-       return(1);
-    graph_node *gnode = GRAPHNODE(s);
-    if(!gnode->st_header || current_file_id != gnode->file_id)
-       return(1);
-    else
-       return(0);
-} 
-
-int IsInternalProcedure(SgSymbol *s)
-{
-    if (!ATTR_NODE(s))
-        return 0;
-    graph_node *gnode = GRAPHNODE(s);
-    if(gnode->st_header &&  gnode->st_header->controlParent()->variant() != GLOBAL && gnode->st_header->controlParent()->variant() != MODULE_STMT)
-        return 1;
-    else
-        return 0;
-}
-
-SgStatement *hasInterface(SgSymbol *s)
-{
-    return (ATTR_NODE(s) ? GRAPHNODE(s)->st_interface : NULL);
-}
-
-void SaveInterface(SgSymbol *s, SgStatement *interface)
-{
-    if (ATTR_NODE(s) &&  !GRAPHNODE(s)->st_interface)
-        GRAPHNODE(s)->st_interface = interface; 
-}
-
-SgStatement *Interface(SgSymbol *s)
-{
-    SgStatement *interface = hasInterface(s); 
-    if (!interface)    
-        interface = getInterface(s);
-    
-    if (isForCudaRegion() && interface)
-    { 
-        SaveInterface(s,interface); 
-        MarkAsUserProcedure(s);
-    }     
-    return interface;
-}
-
-int findParameterNumber(SgSymbol *s, char *name) 
-{
-    int i;
-    int n = ((SgFunctionSymb *) s)->numberOfParameters();
-    for(i=0; i<n; i++)
-        if(!strcmp(((SgFunctionSymb *) s)->parameter(i)->identifier(), name))
-            return i;
-    return -1;
-}
-
-int isInParameter(SgSymbol *s, int i)
-{
-    return (s && ((SgFunctionSymb *) s)->parameter(i) && (((SgFunctionSymb *) s)->parameter(i)->attributes() & IN_BIT) ? 1 : 0);
-}
-
-int isArrayParameter(SgSymbol *s, int i)
-{
-    return (s && ((SgFunctionSymb *) s)->parameter(i) && (((SgFunctionSymb *) s)->parameter(i)->attributes() & DIMENSION_BIT) ? 1 : 0);
-}
-
-int isArrayParameterWithAssumedShape(SgSymbol *s, int i)
-{
-    return (isArrayParameter(s,i) && AssumedShape(isSgArrayType(((SgFunctionSymb *) s)->parameter(i)->type())->getDimList()));
-}
-
-int isPrivateArrayDummy(SgSymbol *s)
-{
-   int *private_attr = (int *) s->attributeValue(0, DUMMY_PRIVATE_AR);
-   if (!private_attr) 
-       return 0;
-   else
-       return *private_attr;   
-}
- 
-SgSymbol *ProcedureSymbol(SgSymbol *s)
-{
-    if (FromOtherFile(s)) 
-    {  
-        SgStatement *header = Interface(s);
-        return( header ? header->symbol() : NULL);
-    }
-    return (GetProcedureHeaderSymbol(s));
-}
-
-int IsPureProcedure(SgSymbol *s)
-{
-    SgSymbol *sproc = ProcedureSymbol(s);
-    return ( sproc ? sproc->attributes() & PURE_BIT : 0 );
-}
-
-int IsElementalProcedure(SgSymbol *s)
-{
-    SgSymbol *shedr;
-    shedr = GetProcedureHeaderSymbol(s);
-    if (shedr)
-        return(shedr->attributes() & ELEMENTAL_BIT);
-    else
-        return 0;
-}
-
-int IsRecursiveProcedure(SgSymbol *s)
-{
-    SgSymbol *shedr;
-    shedr = GetProcedureHeaderSymbol(s);
-    if (shedr)
-        return(shedr->attributes() & RECURSIVE_BIT);
-    else
-        return 0;
-}
-
-int isUserFunction(SgSymbol *s)
-{
-    return(s->attributes() & USER_PROCEDURE_BIT);
-}
-
-int IsNoBodyProcedure(SgSymbol *s)
-{ 
-    if (!ATTR_NODE(s))
-        return 0;
-    return(GRAPHNODE(s)->st_header == NULL);
-}
-
-void MarkAsRoutine(SgSymbol *s)
-{
-    graph_node *gnode;
-
-    if (!ATTR_NODE(s))
-        return;
-    gnode = GRAPHNODE(s);
-    gnode->is_routine = 1;
-    return;
-}
-
-void MarkAsCalled(SgSymbol *s)
-{
-    graph_node *gnode;
-    edge *gedge;
-
-    if (!ATTR_NODE(s))
-        return;
-    gnode = GRAPHNODE(s);
-    //if (gnode->st_header)   //  for nobody procedure (for intrinsic functions and ...) gnode->st_header== NULL
-    gnode->count++;
-    for (gedge = gnode->to_called; gedge; gedge = gedge->next)
-        MarkAsCalled(gedge->to->symb);
-    return;
-
-}
-
-void MarkPrivateArgumentsOfRoutine(SgSymbol *s, SgExpression *private_args)
-{
-     SgExpression *el; 
-     for (el=private_args; el; el=el->rhs())
-     {
-          SgSymbol *arg = el->lhs()->symbol();
-          if (IS_ARRAY(arg) && !IS_DVM_ARRAY(arg))
-          {
-              int i = findParameterNumber(s,arg->identifier());
-              if (i>=0)
-                  addArgumentNumber(findParameterNumber(s,arg->identifier()), s); 
-          }    
-     } 
-}
-
-void MakeFunctionCopy(SgSymbol *s)
-{
-    SgSymbol *s_header;
-    graph_node *gnode;
-
-    if (!ATTR_NODE(s))
-        return;
-    GRAPHNODE(s)->count++;
-
-
-    gnode = GRAPHNODE(s);
-    s_header = gnode->symb;
-    gnode->count++;
-
-    /*
-      if(!gnode->st_copy)
-      {   printf("make copy of %s\n",s_header->identifier());
-      gnode->st_copy = s_header->copySubprogram(*mod_gpu->lexNext()).body();
-      }
-      */
-    //s_copy = &s_header->copySubprogram(*mod_gpu);  *mod_gpu->lexNext()
-    //gnode->st_copy = s_header->copySubprogram(*mod_gpu).body(); 
-    //gnode->st_copy->unparsestdout();
-    //HeaderStatement(&s_header->copySubprogram(*mod_gpu)); //(s_copy); //(s_header->copySubprogram(*mod_gpu)); 
-}
-
-SgStatement *HeaderStatement(SgSymbol *s)
-{
-    return(s->body());
-}
-
-
-void InsertCalledProcedureCopies()
-{
-    graph_node *ndl;
-    int n = 0;
-    if (!mod_gpu)
-        return;
-
-    SgStatement *after = mod_gpu->lexNext();
-    SgStatement *first_kernel_const = after->lexNext();
-
-    for (ndl = node_list; ndl; ndl = ndl->next)
-        if (ndl->count)
-        {
-            if (ndl->st_header && current_file_id == ndl->file_id)  //procedure from current_file
-            {
-                InsertCopiesOfProcedure(ndl, after);
-                n++;
-            }
-            else     //procedure from other file
-             {
-                InsertPrototypesOfFunctionFromOtherFile(ndl,after);
-             }
-
-            ndl->count = 0;
-            ndl->st_interface = NULL;
-            //ndl->st_copy = NULL;
-        }
-       
-    if (options.isOn(C_CUDA) && mod_gpu->lexNext()->variant() == COMMENT_STAT)
-        mod_gpu->lexNext()->extractStmt(); //extracting empty statement (COMMENT_STAT) 
-
-    if (options.isOn(RTC) && options.isOn(C_CUDA) && n != 0)
-        ACC_RTC_AddFunctionsToKernelConsts(first_kernel_const);
-    cuda_functions = n;
-}
-
-SgSymbol* getReturnSymbol(SgStatement *st_header, SgSymbol *s)
-{
-    if (st_header->expr(0) == NULL)
-        return s;
-    else
-        return st_header->expr(0)->symbol();    
-}
-
-void replaceAttribute(SgStatement *header)
-{
-        SgExpression *e = new SgExpression(ACC_ATTRIBUTES_OP, new SgExpression(ACC_DEVICE_OP), NULL, NULL);
-        header->setExpression(2, *e);
-}
-
-int isInterfaceStatement(SgStatement *stmt)
-{
-    if (stmt->variant() == INTERFACE_STMT || stmt->variant() == INTERFACE_ASSIGNMENT || stmt->variant() == INTERFACE_OPERATOR)
-	return 1; 
-    return 0;	
-}
-
-void ReplaceInterfaceBlocks(SgStatement *header)
-{
-    SgStatement *last = header->lastNodeOfStmt();
-    SgStatement *stmt;
-    for (stmt=header->lexNext(); stmt && stmt!=last; stmt=stmt->lexNext())
-    {   
-        if(isSgExecutableStatement(stmt))
-            return;
-        if(stmt->variant() == INTERFACE_STMT || stmt->variant() == INTERFACE_ASSIGNMENT || stmt->variant() == INTERFACE_OPERATOR)
-	{   
-            SgStatement *st_end = stmt->lastNodeOfStmt(); // END INTERFACE
-            stmt = stmt->lexNext();
-            while(stmt!=st_end)
-            {
-               if(stmt->variant() == FUNC_HEDR || stmt->variant() == PROC_HEDR )
-               {
-                   replaceAttribute(stmt);
-                   stmt = stmt->lastNodeOfStmt()->lexNext();
-               }
-               else
-                   stmt = stmt->lexNext();
-            }                                    
-        }           
-    } 
-}
-
-
-int HasDerivedTypeVariables(SgStatement *header)
-{
-    SgSymbol *s;
-    SgSymbol *s_last = LastSymbolOfFunction(header);
-    
-    for (s = header->symbol()->next(); s != s_last->next(); s = s->next())
-    {                  
-        if( s->type() && s->type()->variant()==T_DERIVED_TYPE)     
-        {  // !!! not implemented
-           err_p("Derived type variables", header->symbol()->identifier(), 999);
-           return 1;
-        }
-    }
-    return 0;
-}
-
-argument_numbers *GetFirstLenPlus(argument_numbers *source, int source_len, int list_len)
-{
- // copy first (list_len+1) elements of source
-    if (list_len == source_len)
-        return NULL;
-    argument_numbers *cur_list, *source_list, *new_list, *new_elem;
-    new_list = new argument_numbers; 
-    new_list->number = source->number;
-    new_list->next = NULL;
-    int i;
-    for (i=2, cur_list=new_list, source_list = source->next; i<=list_len+1; i++, source_list = source_list->next)
-    {   
-            new_elem  = new argument_numbers; 
-            new_elem->number = source_list->number; 
-            new_elem->next=NULL;
-            cur_list->next = new_elem;
-            cur_list = new_elem;
-    }
-    return new_list;
-}
-
-argument_numbers *elementByValue(int numb, argument_numbers *nlist)
-{
-    for (; nlist; nlist=nlist->next)
-        if (nlist->number == numb)
-            return nlist;
-    return NULL;
-}
-
-argument_numbers *element(int n, argument_numbers *nlist)
-{
-    for (int i=1; nlist; nlist=nlist->next, i++)
-        if (i == n)
-            return nlist;
-    return NULL;
-}
-
-int numberOfElements(argument_numbers *nlist)
-{
-    int i;
-    for (i=0; nlist; nlist=nlist->next, i++)
-         ;
-    return i;
-}
-
-void printValueList(argument_numbers *nlist)
-{
-    printf(" (");
-    for (; nlist; nlist=nlist->next)
-         printf("%d ",nlist->number);
-    printf(")  ");
-}  
-
-argument_numbers *GetNextWithChange(argument_numbers *source, int source_len, argument_numbers *nlist, int list_len)
-{
-    int i;
-    argument_numbers *elem, *source_elem;
-    for (i=1, elem=nlist; elem; i++, elem=elem->next)
-        if ( elem->number == (source_elem=element(source_len+i-list_len, source))->number )
-            break;
-
-    if (i == 1) return NULL;
-    elem = element(i-1, nlist); //element with serial number i-1
-    int numb = elem->number;
-    source_elem = elementByValue(numb, source)->next;
-    for (int j=i-1; j<=list_len; j++, elem=elem->next, source_elem=source_elem->next)
-        elem->number = source_elem->number; 
-
-    return nlist;
-}
-
-argument_numbers *GetNextNumberList(argument_numbers *source, argument_numbers *nlist)
-{
-    if (!source) return NULL;
-    if (!nlist)
-    {
-        nlist = new argument_numbers;
-        nlist->next = NULL;
-        nlist->number = source->number; 
-        return nlist;
-    }
-    int source_len = numberOfElements(source);
-    int list_len = numberOfElements(nlist);
-    argument_numbers * last_elem = element(list_len, nlist); 
-    argument_numbers *last_in_source = element(source_len, source);  
-
-    if (list_len == source_len) return NULL;
-
-    argument_numbers *elem_in_source = elementByValue(last_elem->number, source);
-    if (elem_in_source != last_in_source)
-    {   //get next in row
-        last_elem->number = elem_in_source->next->number;
-        return nlist; 
-    }
-    else if ((nlist = GetNextWithChange(source, source_len, nlist, list_len)))
-        return nlist;
-    else
-        return GetFirstLenPlus(source, source_len, list_len);
-}
-
-argument_numbers *correctArgList(argument_numbers *arg_numbs, SgStatement *st_header)
-{
-     SgSymbol *s = st_header->symbol();
-     int i;
-    
-     argument_numbers *numb_list=NULL, *elem;
-     for (i=0; arg_numbs; arg_numbs=arg_numbs->next, i++)
-     {      
-         if ( !isArrayParameterWithAssumedShape(s, arg_numbs->number) )
-         {       
-                 elem = new argument_numbers;
-                 elem->number = arg_numbs->number;
-
-             if (numb_list)
-             {  
-                 elem->next = numb_list;
-                 numb_list =elem;
-             }
-             else 
-                 elem->next = NULL;
-                 numb_list = elem;
-         } 
-     }        
-     return numb_list;
-}
-
-void InsertCopiesOfProcedure(graph_node *ndl, SgStatement *after)
-{
-    //insert copies of procedure after statement 'after'
-    argument_numbers *numb_list = NULL;
-    ndl->st_copy = InsertProcedureCopy(ndl->st_header, ndl->st_header->symbol(), ndl->is_routine, numb_list, after);
-    ndl->st_copy_first = ndl->st_copy;
-
-    if (ndl->arg_numbs)
-    {
-        argument_numbers *arg_numbs = correctArgList(ndl->arg_numbs, ndl->st_header);
-        while ((numb_list = GetNextNumberList(arg_numbs, numb_list)))
-            ndl->st_copy = InsertProcedureCopy(ndl->st_header, ndl->st_header->symbol(), ndl->is_routine, numb_list, after);       
-    }    
-}
-
-SgExpression *PrivateArrayDummyList(SgStatement *new_header, argument_numbers *arg_numbs)
-{
-    SgSymbol *s = new_header->symbol();
-    SgExpression *pList = NULL;
-    SgExpression *ae;
-    int *id;
-    int n = ((SgFunctionSymb *)s)->numberOfParameters();
-    for (int i = 0; i < n; i++)
-    {
-        SgSymbol *sarg = ((SgFunctionSymb *)s)->parameter(i);
-        if (isArrayParameterWithAssumedShape(s, i))
-        {
-            id = new int;
-            *id = 1;
-        } 
-        else if (arg_numbs && elementByValue(i, arg_numbs)) 
-        { 
-            id = new int;
-            *id = 2;
-        }
-        else
-            continue;
-        sarg->addAttribute(DUMMY_PRIVATE_AR, (void *)id, sizeof(int));
-        ae =  new SgArrayRefExp(*sarg);
-        ae ->setType(sarg->type());
-        pList = AddListToList(pList, new SgExprListExp(*ae));       
-    }
-    return pList;
-}
-
-SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is_routine, argument_numbers *arg_numbs, SgStatement *after)
-{    //InsertProcedureCopy(ndl->st_header, ndl->st_header->symbol(), ndl->is_routine, after)
-    //insert copy of procedure after statement 'after'
-    SgStatement *new_header, *end_st;
-    SgSymbol *new_sproc = &sproc->copySubprogram(*after);
-    new_header = after->lexNext(); // new procedure header  //new_sproc->body()
-    SYMB_SCOPE(new_sproc->thesymb) = mod_gpu->thebif;
-    new_header->setControlParent(mod_gpu);
-    SgSymbol *returnSymbol = getReturnSymbol(new_header, new_sproc);
-
-    if (options.isOn(C_CUDA))
-    {
-        RenamingNewProcedureVariables(new_sproc); // to avoid conflicts with C language keywords
-        int flagHasDerivedTypeVariables = HasDerivedTypeVariables(new_header); 
-       
-        end_st = new_header->lastNodeOfStmt();
-     
-        private_list =  PrivateArrayDummyList(new_header,arg_numbs);
-        ConvertArrayReferences(new_header->lexNext(), end_st);
-       
-        TranslateProcedureHeader_To_C(new_header,arg_numbs);
-
-        // extract specification statements and add local arrays to private_list
-        ExtractDeclarationStatements(new_header); 
-
-        SgSymbol *s_last = LastSymbolOfFunction(new_header);
-        if (sproc->variant() == FUNCTION_NAME)
-        {  
-            SgSymbol *sfun = &new_sproc->copy();
-            new_header->expr(0)->setSymbol(sfun); //fe->setSymbol(sfun);
-            SYMB_IDENT(new_sproc->thesymb) = FunctionResultIdentifier(new_sproc);
-           
-            InsertReturnBeforeEnd(new_header, end_st);
-        }
-        swapDimentionsInprivateList();
-
-        Translate_Fortran_To_C(new_header, end_st, 0, st_header);
-        cur_func = after;
-        if (sproc->variant() == FUNCTION_NAME)
-        {   
-            new_header->insertStmtAfter(*Declaration_Statement(new_sproc), *new_header);
-            ChangeReturnStmts(new_header, end_st, returnSymbol);
-        }
-       
-        if(!flagHasDerivedTypeVariables) //!!! derived data type is not supported          
-            MakeFunctionDeclarations(new_header, s_last);
-       
-        newVars.clear();
-        private_list = NULL;
-        // generate prototype of function and insert it before 'after'
-        if (options.isOn(RTC) == false)
-            doPrototype(new_header, mod_gpu, is_routine ? !STATIC : STATIC);
-
-    }
-    else       //Fortran Cuda
-    {
-        replaceAttribute(new_header);
-        new_header->addComment("\n");  // add comment (empty line) to new procedure header
-        ReplaceInterfaceBlocks(new_header);
-    }
-
-    return(new_header);
-}
-
-SgStatement *FunctionPrototype(SgSymbol *sf)
-{                                  
-    SgExpression *fref = new SgFunctionRefExp(*sf);
-    fref->setSymbol(*sf);
-    fref->setType(*sf->type());
-    SgStatement *st = new SgStatement(VAR_DECL);
-    st->setExpression(0, *new SgExprListExp(*fref));
-
-    return (st);
-}
-
-
-void doPrototype(SgStatement *func_hedr, SgStatement *block_header, int static_flag)
-{
-    SgSymbol *sf = func_hedr->expr(0)->symbol();
-    SgStatement *st = FunctionPrototype(sf);
-    if (func_hedr->expr(0)->lhs())
-        st->expr(0)->lhs()->setLhs(func_hedr->expr(0)->lhs()->copy());
-    st->addDeclSpec(BIT_CUDA_DEVICE);
-    if (static_flag)
-        st->addDeclSpec(BIT_STATIC);
-
-    block_header->insertStmtAfter(*st, *block_header);        //before->insertStmtAfter(*st,*before->controlParent());
-}
-
-SgStatement  *TranslateProcedureHeader_To_C(SgStatement *new_header, argument_numbers *arg_numbs)
-{
-    SgSymbol *new_sproc =  new_header->symbol();
-    SgFunctionRefExp *fe = new SgFunctionRefExp(*new_sproc);
-    fe->setSymbol(*new_sproc);
-    new_header->setExpression(0, *fe);
-
-    SgSymbol *returnSymbol = getReturnSymbol(new_header, new_sproc);
-
-    if (new_sproc->variant() == PROCEDURE_NAME)
-        new_sproc->setType(C_VoidType());
-    else                     // FUNCTION_NAME
-    {
-       //new_sproc->setType(C_Type(new_sproc->type()));
-        new_sproc->setType(C_Type(returnSymbol->type()));
-    }
-    fe->setType(new_sproc->type());
-    fe->setLhs(FunctionDummyList(new_sproc, new_header, arg_numbs));
-    BIF_LL3(new_header->thebif) = NULL; 
-    new_header->addDeclSpec(BIT_CUDA_DEVICE);
-    new_header->setVariant(FUNC_HEDR); 
-
-    return new_header;
-}
-
-void InsertPrototypesOfFunctionFromOtherFile(graph_node *node, SgStatement *after)
-{
-    if (options.isOn(RTC)) return;
-    //insert prototypes of procedure after statement 'after'
-    argument_numbers *numb_list = NULL;
-    PrototypeOfFunctionFromOtherFile(node, after, numb_list);
-
-    if (node->arg_numbs)
-    {
-        argument_numbers *arg_numbs = correctArgList(node->arg_numbs, node->st_header);
-        while ((numb_list = GetNextNumberList(arg_numbs, numb_list)))
-            PrototypeOfFunctionFromOtherFile(node, after, numb_list);
-    }    
-}
-
-void PrototypeOfFunctionFromOtherFile(graph_node *node, SgStatement *after, argument_numbers *arg_numbs)
-{
-    if (options.isOn(RTC)) return;
-    if(!node->st_interface) return;
-
-    SgStatement *interface = node->st_interface;
-    //SgSymbol *sproc = interface->symbol()
-    //SgSymbol *new_sproc = new SgSymbol(sproc->variant(), sproc->identifier(), sproc->type(), current_file->firstStatement(),);
-
-    SgSymbol *sh = &(interface->symbol()->copyLevel1());     
-    SYMB_SCOPE(sh->thesymb) = current_file->firstStatement()->thebif;
-    SgStatement *new_hedr = &(interface->copy()); 
-    new_hedr->setSymbol(*sh);
-    TranslateProcedureHeader_To_C(new_hedr, arg_numbs);
-    doPrototype(new_hedr, mod_gpu, !STATIC);
-
-    //current_file->firstStatement()->insertStmtAfter(*new_hedr, *current_file->firstStatement()); 
-    //SYMB_FUNC_HEDR(sh->thesymb) = new_hedr->thebif; 
-
-
-    //node->st_interface->setLexNext(*node->st_interface->lastNodeOfStmt());
-    //SgStatement *hedr_st = InsertProcedureCopy(node->st_interface, node->st_interface->symbol(), after);
-    //hedr_st->extractStmt();
-    node->st_interface = NULL;
-    return;
-}
-
-SgExpression *FunctionDummyList(SgSymbol *s, SgStatement *st_header, argument_numbers *arg_numbs)
-{
-    SgExpression *arg_list = NULL, *ae = NULL;
-
-    int n = ((SgFunctionSymb *)s)->numberOfParameters();
-    //insert at 0-th position inf-argument
-    //check for optional arguments, if some argunemt exist with optional then add argument-mask
-    
-    //int useOption = false;
-    //for (i = 0; i < n; i++)
-    //{
-    //    useOption |= ((SgFunctionSymb *)s)->parameter(i)->attributes() & OPTIONAL_BIT;
-    //}
-    //if(useOption)
-    //{
-    //    std::string nameForArgsInfo = "arg_info";   // name for new arguments 
-    //    SgSymbol* argInfo = new SgSymbol(VARIABLE_NAME,nameForArgsInfo.c_str());
-    //    argInfo->setType(C_LongType());
-    //    ae = new SgVarRefExp(argInfo);
-    //    ae = new SgExprListExp(*ae);
-    //    arg_list = AddListToList(arg_list, ae);
-    //}
-
-    for (int i = 0; i < n; i++)
-    {
-        SgSymbol *sarg = ((SgFunctionSymb *)s)->parameter(i);
-
-        if (!isSgArrayType(sarg->type()))
-        {
-            sarg->setType(C_Type(sarg->type()));
-            if (sarg->attributes() & OPTIONAL_BIT)
-            {
-                sarg->setType(new SgDerivedTemplateType(new SgTypeRefExp(*sarg->type()), new SgSymbol(TYPE_NAME, "optArg")));
-            }
-            ae = new SgVarRefExp(sarg);
-            //ae->setType(C_ReferenceType(sarg->type()));
-            if (sarg->attributes() & IN_BIT)
-                ae = new SgExprListExp(*ae);
-            else
-                ae = new SgExprListExp(SgAddrOp(*ae));
-            arg_list = AddListToList(arg_list, ae);
-
-        }
-        else
-        {
-            int needChanged = true;
-            SgArrayType* arrT = (SgArrayType*)sarg->type();
-            int dims = arrT->dimension();
-            SgExpression *dimList = arrT->getDimList();
-            
-            while (dimList)
-            {
-                if (dimList->lhs()->variant() != DDOT)
-                {
-                    needChanged = false;
-                    break;
-                }
-                else if (dimList->lhs()->rhs())
-                {
-                    needChanged = false;
-                    break;
-                }
-                dimList = dimList->rhs();
-            }
-            int rank =  Rank(sarg);
-            SgType *ar_type = sarg->type();
-            SgType *tbase = C_Type(sarg->type()->baseType());
-            SgType *t = C_PointerType(tbase);
-            SgSymbol *new_arg = &sarg->copy();//new SgVariableSymb(sarg->identifier(), *t, *st_header);
-            //new_arg->thesymb->entry.var_decl.local = IO; // is new dummy argument
-            new_arg->setType(t);
-            ae = new SgVarRefExp(new_arg);
-            //ae->setType(t);
-
-            if (needChanged)
-            {                                        
-                    SgExpression *ce = new SgExprListExp(*new SgTypeRefExp(*tbase));
-                    SgDerivedTemplateType *tpc = new SgDerivedTemplateType(ce, private_array_class); 
-                    tpc->addArg(new SgValueExp(rank));
-                    new_arg->setType(tpc);
-                    //int *id = new int;
-                    //*id = 1;
-                    //sarg->addAttribute(DUMMY_PRIVATE_AR, (void *)id, sizeof(int));
-                    ae = &SgAddrOp(*new SgVarRefExp(new_arg));                              
-                //}
-                //else
-                //{                   else
-
-                //    sarg->setType(new SgDerivedTemplateType(new SgTypeRefExp(*t), new SgSymbol(TYPE_NAME, "s_array")));
-                //    ae = new SgVarRefExp(sarg);
-                //}
-                ae = new SgExprListExp(*ae);
-                arg_list = AddListToList(arg_list, ae);
-                continue;
-            }
-
-            if (arg_numbs && elementByValue(i, arg_numbs)) 
-            {        
-                     //SgType *tp = C_Type(sarg->type()->baseType()); 
-                     t = C_PointerType(C_VoidType());
-                     SgSymbol *sp = new SgSymbol(VARIABLE_NAME, PointerNameForPrivateArray(sarg), *t, *st_header);
-                     //sp->thesymb->entry.var_decl.local = IO;
-                     SgSymbol **symb = new (SgSymbol *);
-                     *symb= sarg;
-                     sp->addAttribute(FUNCTION_AR_DUMMY, (void*) symb, sizeof(SgSymbol *));
-                     ae->setSymbol(*sp);
-                     //ae->setType(t);
-                     //sarg->setType(ar_type);  // restoration of argument type
-                     //int *id = new int;
-                     //*id = 2;
-                     //sarg->addAttribute(DUMMY_PRIVATE_AR, (void *)id, sizeof(int));
-
-                                          //ae->setType(C_ReferenceType(t));
-                     //ae = new SgPointerDerefExp(*ae);
-                     //ae = new SgCastExp(*C_PointerType(C_VoidType()), *ae);
-                     //arg_list = AddListToList(                    int *id = new int;
-                     //continue;
-
-                     //ae = new SgCastExp(*C_PointerType( t), *new SgVarRefExp(sp));
-                    // ae = new SgVarRefExp(sp);
-                     //ae = new SgExprListExp(*ae); 
-                     //arg_list = AddListToList(arg_list, ae);
-                     //continue;
-
-            }
-                            
-            //sarg->setType(t);
-            //ae = new SgVarRefExp(sarg);
-            //ae->setType(t);
-
-            ae->setType(C_ReferenceType(t));//(sarg->type())); //t
-            ae = new SgExprListExp(*new SgPointerDerefExp(*ae));
-            arg_list = AddListToList(arg_list, ae);
-            //SgSymbol *arr_info = new SgSymbol(VAR_REF, ("inf_" + std::string(sarg->identifier())).c_str());
-            //arr_info->setType(C_PointerType(C_Type(new SgType(T_INT))));
-            //ae = new SgVarRefExp(arr_info);
-            //ae = new SgExprListExp(*new SgPointerDerefExp(*ae));
-            //arg_list = AddListToList(arg_list, ae);
-        }
-    }
-    return (arg_list);
-}
-
-char *FunctionResultIdentifier(SgSymbol *sfun)
-{
-    char *name;
-    name = (char *)malloc((unsigned)(strlen(sfun->identifier()) + 4 + 1));
-    sprintf(name, "%s_res", sfun->identifier());
-    return(NameCheck(name, sfun));
-}
-
-SgSymbol *isSameNameInProcedure(char *name, SgSymbol *sfun)
-{
-    SgSymbol *s;
-    for (s = sfun->next(); s; s = s->next())
-    if (!strcmp(s->identifier(), name))
-        return(s);
-    return(NULL);
-}
-
-char *NameCheck(char *name, SgSymbol *sfun)
-{
-    SgSymbol *s;
-    while ((s = isSameNameInProcedure(name, sfun)) != 0)
-    {
-        name = (char *)malloc((unsigned)(strlen(name) + 2));
-        sprintf(name, "%s_", s->identifier());
-    }
-    return(name);
-}
-
-void InsertReturnBeforeEnd(SgStatement *new_header, SgStatement *end_st)
-{
-    SgStatement *prev = end_st->lexPrev();
-    if (prev->variant() == RETURN_STAT)
-        return;
-    prev->insertStmtAfter(*new SgStatement(RETURN_STAT), *new_header);
-}
-
-void ChangeReturnStmts(SgStatement *new_header, SgStatement *end_st, SgSymbol *sres)
-{
-    SgStatement *stmt;
-    for (stmt = new_header->lexNext(); stmt != end_st; stmt = stmt->lexNext())
-    if (stmt->variant() == RETURN_STAT)
-        stmt->setExpression(0, *new SgVarRefExp(sres));
-
-}
-
-template<typename callStatType>
-static void createIntefacePrototype(callStatType *funcDecl)
-{
-    string funcName = funcDecl->name().identifier();
-    const int parNum = funcDecl->numberOfParameters();
-    vector<SgType*> prototype(parNum);
-    for (int i = 0; i < parNum; ++i)
-    {
-        SgSymbol *par = funcDecl->parameter(i);
-        SgType *type = par->type();
-        prototype[i] = type;
-    }
-    map <string, vector<vector<SgType*> > >::iterator it = interfaceProcedures.find(funcName);
-    if (it == interfaceProcedures.end())
-    {
-        vector<vector<SgType*> > prototypes = vector<vector<SgType*> >();
-        prototypes.push_back(prototype);
-
-        interfaceProcedures.insert(it, make_pair(funcName, prototypes));
-    }
-    else
-        it->second.push_back(prototype);
-}
-
-bool CreateIntefacePrototype(SgStatement *header)
-{
-    bool retVal = true;
-    if (header->variant() == FUNC_HEDR)
-    {        
-        SgFuncHedrStmt *funcDecl = isSgFuncHedrStmt(header);        
-        if (funcDecl)
-            createIntefacePrototype(funcDecl);
-        else
-            retVal = false;
-    }
-    else if (header->variant() == PROC_HEDR)
-    {
-        SgProcHedrStmt *procDecl = isSgProcHedrStmt(header);
-        if (procDecl)
-            createIntefacePrototype(procDecl);
-        else
-            retVal = false;
-    }
-    else
-        retVal = false;
-
-    return retVal;
-}
-
-void ExtractDeclarationStatements(SgStatement *header)
-{
-    SgStatement *cur_st;
-    SgStatement *stmt = header->lexNext();
-    SgExprListExp *e;
-    SgExpression *list, *it;
-
-    if(stmt->variant()==CONTROL_END)
-        return;
-
-    while (stmt && (!isSgExecutableStatement(stmt) || stmt->variant()==ACC_ROUTINE_DIR)) //is Fortran specification statement or ROUTINE directive
-    {
-        cur_st = stmt;     
-        stmt = stmt->lexNext();
-        if (cur_st->variant() == INTERFACE_STMT || cur_st->variant() == INTERFACE_ASSIGNMENT || cur_st->variant() == INTERFACE_OPERATOR)
-        {
-            SgStatement *last = cur_st->lastNodeOfStmt();
-            SgStatement *start = cur_st;
-            while (start != last)
-            {
-                // save prototypes of FUNC and PROC 
-                if (start->variant() == FUNC_HEDR)
-                {
-                    SgFuncHedrStmt *funcDecl = isSgFuncHedrStmt(start);
-                    if (funcDecl)
-                    {
-                        createIntefacePrototype(funcDecl);
-                        start = funcDecl->lastNodeOfStmt();
-                    }
-                }
-                else if (start->variant() == PROC_HEDR)
-                {
-                    SgProcHedrStmt *procDecl = isSgProcHedrStmt(start);
-                    if (procDecl)
-                    {
-                        createIntefacePrototype(procDecl);
-                        start = procDecl->lastNodeOfStmt();
-                    }
-                }
-                start = start->lexNext();
-            }
-            stmt = cur_st->lastNodeOfStmt()->lexNext();
-            cur_st->extractStmt();
-            continue;
-        }
-        if(cur_st->variant()==STRUCT_DECL) 
-        {
-            stmt = cur_st->lastNodeOfStmt()->lexNext();
-            cur_st->extractStmt();
-            continue;
-        }
-        //if(cur_st->variant()==IMPL_DECL || cur_st->variant()==DATA_DECL || cur_st->variant()==USE_STMT || cur_st->variant()==FORMAT_STAT || cur_st->variant()==ENTRY_STAT || cur_st->variant()==COMM_STAT || cur_st->variant()==STMTFN_STAT )
-        if(!isSgVarDeclStmt(cur_st) && !isSgVarListDeclStmt(cur_st))
-        {
-            cur_st->extractStmt(); 
-            continue;     
-        }
-
-        list = cur_st->expr(0);
-        for(; list; list = list->rhs())
-        {
-            if(IS_DUMMY(list->lhs()->symbol()) || !isSgArrayType(list->lhs()->symbol()->type()))
-                continue;
-            //add local array in private list
-            e = new SgExprListExp(*new SgVarRefExp(*list->lhs()->symbol()));
-            e->setRhs(private_list);
-            private_list = e;
-        }        
-        cur_st->extractStmt();
-    }
-}
-
-/*
-std::string ArrParametrs(SgSymbol* arr)
-{
-    return ("inf_" + std::string(arr->identifier())).c_str();
-}
-SgExpression* InheritUpperBound(SgSymbol* arr, int i)
-{
-    SgExpression *dim = ((SgArrayType *)(arr->type()))->sizeInDim(i);
-    SgExpression *lb = dim->lhs();
-    SgExpression *ub = dim->rhs();
-    if(dim->variant() != DDOT || ub != NULL)
-    {
-        return UpperBound(arr,i);
-    }
-    if(lb == NULL)
-    {
-        return  &(*(new SgArrayRefExp(*new SgSymbol(VARIABLE_NAME, ArrParametrs(arr).c_str()), *new SgValueExp((i-1)+7)))
-            - *(new SgArrayRefExp(*new SgSymbol(VARIABLE_NAME,  ArrParametrs(arr).c_str()), *new SgValueExp(i-1)))
-            + *new SgValueExp(1)) ; 
-    }
-    else if(1)
-    {
-        return  &(*(new SgArrayRefExp(*new SgSymbol(VARIABLE_NAME, ArrParametrs(arr).c_str()), *new SgValueExp((i-1)+7)))
-            - *(new SgArrayRefExp(*new SgSymbol(VARIABLE_NAME,  ArrParametrs(arr).c_str()), *new SgValueExp(i-1)))
-            + *lb) ;
-    }
-
-}
-SgExpression* InheritLowerBound(SgSymbol* arr, int i)
-{
-    SgExpression *dim = ((SgArrayType *)(arr->type()))->sizeInDim(i);
-    SgExpression *lb = dim->lhs();
-    SgExpression *ub = dim->rhs();
-    if(dim->variant() != DDOT || ub != NULL)
-    {
-        return UpperBound(arr,i);
-    }
-    if(lb == NULL)
-    {
-        return new SgValueExp(1) ; 
-    }
-    else
-    {
-        return lb;
-    }
-
-}
-*/
-void CorrectSubscript(SgExpression *e)
-{
-    int dims = ((SgArrayType *)(e->symbol()->type()))->dimension();
-    std::deque<std::pair<SgExpression*, SgExpression*> > koefs;
-//    SgExpression *infUpperBound = NULL;                ;
-//    SgExpression *infLowerBound = NULL;
-    SgExpression *tmp = e->lhs();
-    if (tmp == NULL)
-    {
-        return;
-    }
-    for (int i = 0; i < dims; ++i)
-    {
-        SgExpression *dimsize = ((SgArrayType *)(e->symbol()->type()))->sizeInDim(i);
-        if (dimsize->variant() == STAR_RANGE)
-        {
-            break;
-        }
-    }
-    for (int i = 0; i < dims; ++i)
-    {
-        std::pair<SgExpression*, SgExpression*> tmp_pair;
-        SgExpression * koef = new SgValueExp(1);
-        SgExpression *dimsize = ((SgArrayType *)(e->symbol()->type()))->sizeInDim(i);
-        SgExpression *check = dimsize->lhs();
-        for (int j = 0; j < i; ++j)
-        {
-//            SgExpression *dimsize = ((SgArrayType *)(e->symbol()->type()))->sizeInDim(j);
-//            if (isSgSubscriptExp(dimsize) && !dimsize->rhs())
-//            {
-//                infLowerBound = (new SgArrayRefExp(*new SgSymbol(VARIABLE_NAME, ArrParametrs(e->symbol()).c_str()), *new SgValueExp(j)));
-//                infUpperBound = (new SgArrayRefExp(*new SgSymbol(VARIABLE_NAME, ArrParametrs(e->symbol()).c_str()), *new SgValueExp(j+7)));
-//
-//                koef = Calculate(&(*koef * (*infUpperBound - *infLowerBound + *new SgValueExp(1))));
-//
-//            }
-//            else
-//            {
-            SgExpression * up = UpperBound(e->symbol(), j);
-            if(up->variant() == FUNC_CALL)
-            {
-                up = new SgExpression(RECORD_REF);
-                up->setLhs(new SgVarRefExp(e->symbol()));
-                //up->setRhs(new SgVarRefExp(*new SgSymbol(FIELD_NAME,(std::string("ub[")+std::to_string(j)+std::string("]")).c_str())));
-                up->setRhs(new SgFunctionCallExp(*new SgSymbol(MEMBER_FUNC,"ub"), *new SgExprListExp(*new SgValueExp(j))));
-            }
-            SgExpression * low = LowerBound(e->symbol(), j);
-            koef = Calculate(&(*koef * (*up - *LowerBound(e->symbol(), j) + *new SgValueExp(1))));
-//            }
-        }
-        tmp_pair.first = koef;
-
-        tmp_pair.second = Calculate(&(*tmp->lhs() - *LowerBound(e->symbol(), i)));
-        tmp = tmp->rhs();
-        koefs.push_back(tmp_pair);
-
-    }
-    SgExpression *line = koefs.front().second;
-    koefs.pop_front();
-    tmp = e->lhs();
-    for (int i = 0; i < dims - 1; ++i)
-    {
-        line = &(*koefs.front().second * *koefs.front().first + *line);
-        koefs.pop_front();
-        tmp = tmp->rhs();
-    }
-    e->setLhs((new SgExprListExp(*line)));
-}
-
-void replaceArgument(SgSymbol *fsym, SgExpression *arg, int i)
-{
-     if (isSgArrayRefExp(arg) && !arg->lhs()) //argument is  whole array (array name)
-     {
-         if (fsym && isPrivateArrayDummy(arg->symbol()) && !isArrayParameterWithAssumedShape(ProcedureSymbol(fsym),i))
-             arg->setLhs(FirstArrayElementSubscriptsOfPrivateArray(arg->symbol()));            
-         return;
-     }
-     replaceVectorRef(arg);
-     return;
-}
-
-void replaceArgumentList(SgSymbol *fsym, SgExpression *arg_list)
-{
-     if (!arg_list) return;
-     int i;
-     SgExpression *el;
-     for (el=arg_list, i=0; el; el=el->rhs(),i++)
-         replaceArgument(fsym, el->lhs(), i);
-}
-
-void replaceVectorRef(SgExpression *e)
-{
-    SgType *type;
-    if (e == NULL)
-        return;
-    if (isSgArrayRefExp(e))
-    {
-        type = isSgArrayType(e->symbol()->type());
-        if (IS_DUMMY(e->symbol()) && type)
-        {
-            if (!isPrivateArrayDummy(e->symbol()))  //isPrivate(e->symbol()->identifier())
-                CorrectSubscript(e);
-        }
-        return;
-    }
-    if (isSgFunctionCallExp(e))
-    {
-        replaceArgumentList(e->symbol(),e->lhs());
-        return;
-    }
-    replaceVectorRef(e->lhs());
-    replaceVectorRef(e->rhs());
-}
-
-void ConvertArrayReferences(SgStatement *first, SgStatement *last)
-{
-    SgStatement *st;
-    for (st = first; st != last; st = st->lexNext())
-    {
-        if (isInterfaceStatement(st))
-        {
-            st = st->lastNodeOfStmt();
-            continue;
-        }
-        if (st->variant() == PROC_STAT) // call statement
-        {
-            replaceArgumentList(st->symbol(), st->expr(0));
-            continue; 
-        }
-        if (st->expr(0))
-            replaceVectorRef(st->expr(0));
-        if (st->expr(1))
-            replaceVectorRef(st->expr(1));
-        if (st->expr(2))
-            replaceVectorRef(st->expr(2));
-    }
-}
-
-void convertArrayDecl(SgSymbol* s)
-{
-    SgExprListExp *resDims, *tmp; 
-    std::stack<SgExpression*>dims;
-    if(isSgArrayType(s->type()))    
-    {
-        SgExpression *dimList = isSgArrayType(s->type())->getDimList();
-        while (dimList)
-        {
-            if(dimList->lhs()->variant() == DDOT)
-            {
-                dims.push(Calculate(&(*(dimList->lhs()->rhs()) - *(dimList->lhs()->lhs()) + *new SgValueExp(1))));
-            }
-            else
-            {       
-                dims.push(Calculate(&(*(dimList->lhs()))));
-            }
-            dimList = dimList->rhs();
-        }
-        SgType* t = C_Type(isSgArrayType(s->type())->baseType());
-        SgArrayType *arr = new SgArrayType(*t); 
-        while (!dims.empty())
-        {
-            arr->addDimension(dims.top());
-            dims.pop();
-        }
-        s->setType(arr);
-    }
-
-
-}
-
-void MakeFunctionDeclarations(SgStatement *header, SgSymbol *s_last)
-{
-    SgSymbol *s;
-    SgStatement *cur_stat = header;
-    SgStatement *st;
-    SgExpression *el;
-    char* name = header->expr(0)->symbol()->identifier();
-
-    for (s = header->symbol()->next(); s != s_last->next(); s = s->next())
-    {
-        if (isSgFunctionSymb(s) != NULL)
-            continue;
-
-        int flags = s->attributes();
-
-        if (IS_DUMMY(s))
-        {             
-            if (flags & (IN_BIT | OUT_BIT | INOUT_BIT))
-                ;
-            else if(!options.isOn(NO_PURE_FUNC))
-                err_p("Dummy argument need to have INTENT attribute in PURE procedure", name, 617);
-            continue;
-        }
-
-        if (flags & SAVE_BIT)
-            err_p("SAVE not be used in PURE procedure", name, 618);
-        if (flags & COMMON_BIT)
-            err_p("COMMON not be used in PURE procedure", name, 619);
-
-        if (s->scope() != header)
-        {    
-            //printf("%s: %d \n",s->identifier(),s->scope()->variant());  //printf("%s: %d %s \n",s->identifier(),s->scope()->variant(),s->scope()->symbol()->identifier());
-            continue;
-        }
-       
-        SgSymbol **sarg = (SgSymbol **) s->attributeValue(0, FUNCTION_AR_DUMMY);
-        if (sarg)  // pointer for PrivateArray class object
-        {
-            SgExpression *elist = NULL;
-            int rank = Rank(*sarg);
-            if (rank > 1)
-                for (int i=rank-1; i; i--)
-                    elist = AddListToList(elist, new SgExprListExp(*Calculate(ArrayDimSize(*sarg,i))));
-            makeClassObjectDeclaration(*sarg, s, header, C_UnsignedLongLongType(), elist, 1); //makeSymbolDeclaration(s);  //MakePrivateArrayDeclaration(*sarg, s);
-            continue;
-        }
-        if (!isSgArrayType(s->type()))  //scalar variable
-            s->setType(C_Type(s->type()));
-        else
-            continue;
-         
-        if (isSgConstantSymb(s))
-        {   
-            SgExpression *ce = ((SgConstantSymb *)s)->constantValue();            
-            convertExpr(ce, ce);
-            st = makeSymbolDeclarationWithInit(s, ce);
-            st->addDeclSpec(BIT_CONST);
-        }
-        else  if(isSgVariableSymb(s))
-            st = makeSymbolDeclaration(s);         //st = Declaration_Statement(s);
-        else
-            continue;
-        cur_stat->insertStmtAfter(*st);
-        cur_stat = st;
-    }
-
-    for (el = private_list; el; el = el->rhs())
-    {
-        if (IS_DUMMY(el->lhs()->symbol())) return;  
-        convertArrayDecl(el->lhs()->symbol());
-        st = makeSymbolDeclaration(el->lhs()->symbol());
-        cur_stat->insertStmtAfter(*st);
-        cur_stat = st;
-    }
-}
-
-SgSymbol *LastSymbolOfFunction(SgStatement *header)
-{
-    SgSymbol *s = header->symbol();
-    while (s->next())
-    {   //printf("       %s: %d %s\n", s->next()->identifier(),s->next()->scope()->variant(), s->next()->scope()->symbol() ? s->next()->scope()->symbol()->identifier() : "N");
-        s = s->next();
-    }
-    return(s);
-}
-
-
-//---------------------------------------------------------------------------------------
-void ProjectStructure(SgProject &project)
-{
-    int n = project.numberOfFiles();
-    SgFile *file;
-    int i;
-     
-    // building program structure 
-    // looking through the file list of project (first time)
-    for (i = n - 1; i >= 0; i--)
-    {
-        file = &(project.file(i));
-        current_file = file;
-        current_file_id = i;
-        FileStructure(file);
-        //printf("%s %d\n",project.fileName(i),i);  PrintWholeGraph();   
-    }
-    for (i = n - 1; i >= 0; i--)
-    {
-        file = &(project.file(i));
-        current_file = file;
-        current_file_id = i;
-        doCallGraph(file);
-    }
-    //ScanSymbolTable(file); 
-    //PrintWholeGraph();
-}
-
-void FileStructure(SgFile *file)
-{// looking through the file and creating graph node for header of each program unit 
-    SgStatement *stat;
-
-    // grab the first statement in the file.
-    stat = file->firstStatement(); // file header   
-    for (stat = stat->lexNext(); stat; stat = stat->lexNext())
-    {
-        if (stat->variant() == INTERFACE_STMT || stat->variant() == INTERFACE_ASSIGNMENT || stat->variant() == INTERFACE_OPERATOR)
-        {
-            stat = stat->lastNodeOfStmt(); //InterfaceBlock(stat);  
-            continue;
-        }
-
-        if (stat->variant() == FUNC_HEDR || stat->variant() == PROC_HEDR || stat->variant() == PROG_HEDR || stat->variant() == MODULE_STMT)
-        {                                      //printf("%d %s \n",stat->lineNumber(),stat->symbol()->identifier());
-            //creating graph node for header of function (procedure, program)
-            cur_node = GraphNode(stat->symbol(), stat, NEW);
-
-        }
-
-    }
-
-}
-
-void ReplaceGenericInterfaceBlocks(SgStatement *hedr, SgStatement *end_of_unit)
-{
-    SgStatement *stmt;
-    //SgSymbol *symb = NULL;
-    for (stmt = hedr->lexNext(); stmt != end_of_unit; stmt = stmt->lastNodeOfStmt()->lexNext())
-    {
-        if(stmt->variant() == INTERFACE_STMT && stmt->symbol())
-            BIF_SYMB(stmt->thebif) = NULL; 
-        if(stmt->variant() == FUNC_HEDR || stmt->variant() == PROC_HEDR )
-            stmt = stmt->lexNext();
-    }
-}
-
-
-void doCallGraph(SgFile *file)
-{// scanning the file to search procedure calls
-    SgStatement *stat = NULL, *end_of_unit = NULL;
-    //char *func_name;  
-    //int *ir;
-    //int has_main_program_unit = 0;
-
-    // grab the first statement in the file.
-    stat = file->firstStatement(); // file header  
-	for (stat = stat->lexNext(); stat; stat = end_of_unit->lexNext())
-        {
-             has_generic_interface = 0;
-	     end_of_unit = ProgramUnit(stat);
-             if (has_generic_interface)
-                 ReplaceGenericInterfaceBlocks(stat,end_of_unit);
-        }
-    // add the attribute (last statement of file) to first statement of file
-    SgStatement **last = new (SgStatement *);
-#if __SPF
-    addToCollection(__LINE__, __FILE__, last, 1);
-#endif
-    *last = end_of_unit;
-    file->firstStatement()->addAttribute(LAST_STATEMENT, (void*)last, sizeof(SgStatement *));
-
-}
-
-SgStatement *ProgramUnit(SgStatement *first)
-{
-    SgStatement *stat, *end_of_unit;
-
-    // program unit: main program, external subprogram, module or block data
-    for (stat = first; stat; stat = end_of_unit->lexNext())
-    {
-        //end of program unit with CONTAINS statement
-        if (stat->variant() == CONTROL_END)
-        {
-            if (stat->controlParent() == first)  //end of program unit with CONTAINS statement
-                return(stat);
-            else
-            {
-                end_of_unit = stat;
-                continue;
-            }
-        }
-        if (stat->variant() == BLOCK_DATA) //BLOCK_DATA header 
-            return(stat->lastNodeOfStmt());
-
-        // PROGRAM, SUBROUTINE, FUNCTION  or MODULE header
-
-        //scanning the Symbols Table of the function 
-        //     ScanSymbTable(func->symbol(), (f->functions(i+1))->symbol());
-
-        end_of_unit = Subprogram(stat);  // end_of unit may be END or CONTAINS statement
-        //printf("---%d  %d %s \n",stat->lineNumber(),end_of_unit->lineNumber(),stat->symbol()->identifier());
-        GRAPHNODE(stat->symbol())->st_last = end_of_unit;
-        if (end_of_unit->variant() == CONTROL_END && end_of_unit->controlParent() == first) //end of program unit without CONTAINS statement  
-            return(end_of_unit);
-    }
-    return NULL;
-}
-
-SgStatement *Subprogram(SgStatement *func)
-{
-    // Build a directed acyclic call multigrahp (call DAMG) 
-    // which represents calls between routines of the program
-
-    SgStatement *stmt, *last, *first;
-
-
-    DECL(func->symbol()) = 1;
-    HEDR(func->symbol()) = func->thebif;
-    cur_func = func;
-    in_routine = 0;
-    //if( func->variant() == PROG_HEDR)
-    //   PROGRAM_HEADER(func->symbol()) = func->thebif;
-
-    // determing graph node for header of function (procedure, program)
-    cur_node = ATTR_NODE(func->symbol()) ? GRAPHNODE(func->symbol()) : GraphNode(func->symbol(), func, 0);
-
-    first = func->lexNext();
-    //printf("\n%s  header_id= %d \n", func->symbol()->identifier(), func->symbol()->id());
-    //!!!debug
-    //if(fsymb)
-    //printf("\n%s   %s \n", header(func->variant()),fsymb->identifier()); 
-    //else {
-    //printf("Function name error  \n");
-    //return;
-    //}
-
-    last = func->lastNodeOfStmt();
-
-    // follow the statements of the function in lexical order
-    // until last statement
-    for (stmt = first; stmt && (stmt != last); stmt = stmt->lexNext())
-    {   
-        switch (stmt->variant()) {
-
-        case CONTAINS_STMT:
-            last = stmt;
-            goto END_;
-            break;
-
-        case ENTRY_STAT:
-            // !!!!!!!
-            break;
-
-        case DATA_DECL:
-        case CONTROL_END:
-        case STOP_STAT:
-        case PAUSE_NODE:
-        case GOTO_NODE:             // GO TO             
-            break;
-        case ACC_ROUTINE_DIR:
-            in_routine = 1;
-            break; 
-        case VAR_DECL:
-        case SWITCH_NODE:           // SELECT CASE ...
-        case ARITHIF_NODE:          // Arithmetical IF
-        case IF_NODE:               // IF... THEN
-        case WHILE_NODE:            // DO WHILE (...) 
-        case CASE_NODE:             // CASE ...
-        case ELSEIF_NODE:           // ELSE IF...
-        case LOGIF_NODE:            // Logical IF
-            FunctionCallSearch(stmt->expr(0));
-            break;
-        case STMTFN_STAT:
-            DECL(stmt->expr(0)->symbol()) = 2;
-            break;
-        case COMGOTO_NODE:          // Computed GO TO
-        case OPEN_STAT:
-        case CLOSE_STAT:
-        case INQUIRE_STAT:
-        case BACKSPACE_STAT:
-        case ENDFILE_STAT:
-        case REWIND_STAT:
-            FunctionCallSearch(stmt->expr(1));
-            break;
-
-        case PROC_STAT:  {           // CALL
-                             SgExpression *el;
-                             int inlined;
-                             //printf("\n%s  call_id= %d \n", stmt->symbol()->identifier(), stmt->symbol()->id());
-                             //!!!temporary
-                             //inlined = (func->variant() == PROG_HEDR) ? 0 : 1;
-                             inlined = 1;
-                             Call_Site(stmt->symbol(), inlined, stmt, NULL);
-                             // looking through the arguments list
-                             for (el = stmt->expr(0); el; el = el->rhs())
-                                 Arg_FunctionCallSearch(el->lhs());   // argument
-        }
-            break;
-
-        case ASSIGN_STAT:             // Assign statement
-        case WRITE_STAT:
-        case READ_STAT:
-        case PRINT_STAT:
-        case FOR_NODE:
-            FunctionCallSearch(stmt->expr(0));   // left part
-            FunctionCallSearch(stmt->expr(1));   // right part
-            break;
-        case ACC_REGION_DIR:
-            in_region++;
-            break; 
-        case ACC_END_REGION_DIR:
-            in_region--;
-            break;
-        default:
-            FunctionCallSearch(stmt->expr(0));
-            FunctionCallSearch(stmt->expr(1));
-            FunctionCallSearch(stmt->expr(2));
-            break;
-        }
-
-    } // end of processing statement/directive 
-
-END_:
-    // for debugging
-    if (deb_reg > 1)
-        PrintGraphNode(cur_node);
-    in_routine = 0;
-    return(last);
-
-}
-
-void FunctionCallSearch(SgExpression *e)
-{
-    SgExpression *el;
-    if (!e)
-        return;
-
-    if (isSgFunctionCallExp(e)) {
-        Call_Site(e->symbol(), 1, NULL, e);
-        for (el = e->lhs(); el; el = el->rhs())
-            Arg_FunctionCallSearch(el->lhs());
-        return;
-    }
-    FunctionCallSearch(e->lhs());
-    FunctionCallSearch(e->rhs());
-    return;
-}
-
-void Arg_FunctionCallSearch(SgExpression *e)
-{
-    FunctionCallSearch(e);
-    return;
-}
-
-void FunctionCallSearch_Left(SgExpression *e)
-{
-    FunctionCallSearch(e);
-}
-
-int isAsterDummy(SgSymbol *s)
-{
-    if (!s) return 0;
-    if (!strcmp(s->identifier(),"*")) return 1;
-    return 0;
-}
-
-SgExpression * TypeKindExpr(SgType *t)
-{
-    SgExpression *len;
-    SgExpression *selector;
-    if(!t) return (NULL);
-    len = t->length(); 
-    selector = t->selector(); 
-    //printf("\nTypeSize");
-    //printf("\nranges:"); if(len) len->unparsestdout();
-    //printf("\nkind_len:");  if(selector) selector->unparsestdout();
-
-    //the number of bytes is not specified in type declaration statement
-    if (!len && !selector) 
-        return (new SgValueExp(IntrinsicTypeSize(t)));
-    if (t->variant() != T_STRING) // numeric types
-    {
-        if (len && !selector)   //INTEGER*2,REAL*8,CHARACTER*(N+1)
-            return(Calculate(len));
-        else
-            return(Calculate(selector->lhs() ? selector->lhs() : selector)); //specified kind:INT_VAL for literal constants or KIND_OP 
-    }
-    else  //  character (T_STRING)
-    {
-        if (!selector->lhs())  // for literal constants 1_"xxx"
-            return(Calculate(selector));
-        else if (selector->variant() == KIND_OP)
-            return(Calculate(selector->lhs()));
-        else if (selector->variant() == LENGTH_OP)
-            return(new SgValueExp(IntrinsicTypeSize(t)));
-        else if (selector->lhs()->variant()==KIND_OP)   
-            return(Calculate(selector->lhs()));
-        else if (selector->rhs()->variant()==KIND_OP)   
-            return(Calculate(selector->rhs()));
-    }
-    return (NULL);
-}
-
-int CompareKind(SgType *type_arg, SgType *type_dummy)
-{  
-    int kind1=-1, kind2=-1;
-    SgExpression *e1 = TypeKindExpr(type_dummy); 
-    if (e1 && e1->isInteger())
-        kind1 = e1->valueInteger();
-
-    SgExpression *e2 = TypeKindExpr(type_arg);  
-    if (e2 && e2->isInteger())
-        kind2 = e2->valueInteger();
-
-    if (kind1>=0 && kind1 == kind2)
-        return 1;
-    else 
-        return 0;
-}
-
-int  CompareTypeKindRank (SgExpression *e, SgSymbol *dummy)
-{
-    if (!dummy) return 0;
-    if (e->variant() == ARRAY_OP)
-       CompareTypeKindRank (e->lhs(), dummy);
-    //if (isSgRecordRefExp(e))
-    //    CompareTypeKindRank (RightMostField(e), dummy); 
-    if (!e->type() && !dummy->type()) 
-         return 1;
-    else if (!e->type())
-         return 0;
-    else if (!dummy->type())
-         return 0;
-
-    SgArrayType *artype_dummy = isSgArrayType(dummy->type());
-    SgArrayType *artype_arg   = isSgArrayType(e->type());
-    if (artype_dummy != 0 && artype_arg != 0)
-    {
-       if (TYPE_DIM(artype_dummy->thetype) != TYPE_DIM(artype_arg->thetype))  //dimension() method cannot be used
-           return 0; 
-    } 
-    else if (artype_dummy == 0 && artype_arg == 0)
-       ;
-    else
-       return 0;
-    SgType *type_arg = artype_arg ? artype_arg->baseType() : e->type();
-    SgType *type_dummy = artype_dummy ? artype_dummy->baseType() : dummy->type();
-    
-    if (type_dummy->variant() == T_DERIVED_TYPE && type_arg->variant() == T_DERIVED_TYPE)
-    {
-        if (!strcmp(ORIGINAL_SYMBOL(type_dummy->symbol())->identifier(), ORIGINAL_SYMBOL(type_arg->symbol())->identifier())) 
-            return 1;
-        else
-            return 0;
-    }
-    else if (type_dummy->variant() == T_DERIVED_TYPE || type_arg->variant() == T_DERIVED_TYPE)
-        return 0;
-    if (type_dummy->variant() == T_STRING)
-    { 
-        if( type_arg->variant() == T_STRING)
-            return 1;
-        else
-            return 0; 
-    }    
-    if ( type_dummy->variant() == T_COMPLEX || type_dummy->variant() == T_DCOMPLEX)
-        if ( type_arg->variant() == T_COMPLEX || type_arg->variant() == T_DCOMPLEX)
-            return (CompareKind(type_arg, type_dummy));
-        else
-            return 0;
-    if (type_dummy->variant() == T_FLOAT || type_dummy->variant() == T_DOUBLE)
-        if (type_arg->variant() == T_FLOAT ||   type_arg->variant() == T_DOUBLE)
-            return (CompareKind(type_arg,type_dummy));
-        else
-            return 0;
-    if (type_arg->variant() != type_dummy->variant()) 
-        return 0;
-    
-    return (CompareKind(type_arg,type_dummy));
-}
-
-int CompareArgDummy(SgExpression *e, int i, SgSymbol *symb)
-{    
-    if (i == -1) return 0;
-    if (e->variant() == KEYWORD_ARG) 
-        CompareArgDummy(e->rhs(), findParameterNumber(symb, NODE_STR(e->lhs()->thellnd)), symb);
-    //if((((SgFunctionSymb *) symb)->parameter(i))->attributes() & OPTIONAL_BIT ) return 1;
-    if (e->variant() == LABEL_ARG) return isAsterDummy(((SgFunctionSymb *) symb)->parameter(i)); //!!! illegal
-    return (CompareTypeKindRank(e, ((SgFunctionSymb *) symb)->parameter(i) ));
-}
-
-int CompareArguments(SgSymbol *symb, SgExpression *arg_list)
-{
-    SgExpression *el, *e;
-    int i;   
-    for (el = arg_list, i = 0; el; el = el->rhs(), i++)
-        if (!CompareArgDummy(el->lhs(), i, symb))
-            return 0;
-    return 1;    
-}
-
-SgStatement *getInterfaceInScope(SgSymbol *s, SgStatement *func)
-{
-    enum { SEARCH_INTERFACE, CHECK_INTERFACE, FIND_NAME };
-
-    SgStatement *searchStmt = func->lexNext();
-    SgStatement *tmp;
-    const char *funcName = s->identifier();
-    const char *toCmp;
-
-    int mode = SEARCH_INTERFACE;
-    //search interface in the specification part of a program unit
-    while (searchStmt && (!isSgExecutableStatement(searchStmt) || isDvmSpecification(searchStmt)))
-    {
-        switch (mode)
-        {
-        case SEARCH_INTERFACE:
-            if (searchStmt->variant() != INTERFACE_STMT)
-                searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-            else
-                mode = CHECK_INTERFACE;
-            break;
-        case CHECK_INTERFACE:
-            if (searchStmt->symbol())
-                toCmp = searchStmt->symbol()->identifier();
-            else
-                toCmp = "";
-
-            if (searchStmt->symbol() && strcmp(toCmp, funcName) != 0)
-            {
-                searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-                mode = SEARCH_INTERFACE;
-            }
-            else
-            {
-                if(searchStmt->symbol())
-                {
-                    return searchStmt;
-                }
-                else
-                {
-                    mode = FIND_NAME;
-                    searchStmt = searchStmt->lexNext();
-                }
-            }
-            break;
-        case FIND_NAME:
-            if (searchStmt->variant() == FUNC_HEDR || searchStmt->variant() == PROC_HEDR)
-            {
-                if (!strcmp(searchStmt->symbol()->identifier(), funcName))
-                    return searchStmt;
-                else
-                    searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-            }
-            else if (searchStmt->variant() == MODULE_PROC_STMT)
-                searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-
-            if (searchStmt->variant() == CONTROL_END) // end of interface block
-            {
-                mode = SEARCH_INTERFACE;
-                searchStmt = searchStmt->lexNext();
-            }
-            break;
-        }
-    }
-    return NULL;
-}
-
-SgStatement *getInterface(SgSymbol *s)
-{
-    SgStatement *func = cur_func;
-    SgStatement *interface_st = NULL;
-    while (func->variant() != GLOBAL)
-    {
-        if (interface_st = getInterfaceInScope(s, func))
-            return interface_st;
-        else
-            func = func->controlParent();
-    }
-    return interface_st;
-}
-
-int CompareModuleProcedureName(SgExpression *name_list, SgSymbol *symb)
-{
-    SgExpression *el;
-    for (el=name_list; el; el=el->rhs())
-         if (!strcmp(el->lhs()->symbol()->identifier(), symb->identifier()))
-             return 1;
-    return 0;
-} 
-
-SgStatement *SearchModuleProcedure(SgExpression *name_list, SgExpression *arg_list, SgStatement *module_st)
-{
-    SgStatement *stmt = module_st->lexNext();
-    while (stmt->variant() != CONTAINS_STMT && stmt->variant() != CONTROL_END )
-        stmt = stmt->lastNodeOfStmt()->lexNext(); 
-    if (stmt->variant() == CONTROL_END)
-        return NULL;
-    SgStatement *last = module_st->lastNodeOfStmt();
-    for (stmt=stmt->lexNext(); stmt != last; stmt = stmt->lastNodeOfStmt()->lexNext())
-    {   
-        if (CompareModuleProcedureName(name_list, stmt->symbol()) && CompareArguments(stmt->symbol(),arg_list))
-            return stmt;
-        else
-            continue;
-    }
-    return NULL;
-}
-
-SgStatement *getGenericInterfaceInScope(SgSymbol *s, SgExpression *arg_list, SgStatement *func)
-{
-    enum { SEARCH_INTERFACE, CHECK_INTERFACE, FIND_NAME };
-
-    SgStatement *searchStmt = func->lexNext();
-    SgStatement *tmp;
-    const char *funcName = s->identifier();
-    const char *toCmp;
-
-    int mode = SEARCH_INTERFACE;
-    //search interface in the specification part of a program unit 
-    while (searchStmt && (!isSgExecutableStatement(searchStmt) || isDvmSpecification(searchStmt)))
-    {
-        switch (mode)
-        {
-        case SEARCH_INTERFACE:
-            if (searchStmt->variant() != INTERFACE_STMT)
-                searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-            else
-                mode = CHECK_INTERFACE;
-            break;
-        case CHECK_INTERFACE:
-            if (searchStmt->symbol())
-                toCmp = searchStmt->symbol()->identifier();
-            else
-                toCmp = "";
-
-            if (searchStmt->symbol() && !strcmp(toCmp, funcName))
-            {
-                mode = FIND_NAME;
-                searchStmt = searchStmt->lexNext();
-            }
-            else
-            {
-                searchStmt = searchStmt->lastNodeOfStmt()->lexNext();
-                mode = SEARCH_INTERFACE;
-            }
-            break;
-        case FIND_NAME:
-            if (searchStmt->variant() == FUNC_HEDR || searchStmt->variant() == PROC_HEDR)
-            {
-                if (CompareArguments(searchStmt->symbol(), arg_list))
-                    return searchStmt;
-                else
-                    searchStmt = searchStmt->lastNodeOfStmt()->lexNext();   
-            }
-            else if (searchStmt->variant() == MODULE_PROC_STMT)
-            {    
-                SgStatement *module_proc = SearchModuleProcedure(searchStmt->expr(0), arg_list, func->variant()==MODULE_STMT ? func : ORIGINAL_SYMBOL(searchStmt->expr(0)->symbol())->scope());
-                if (module_proc)
-                    return module_proc;
-                else                 
-                    searchStmt = searchStmt->lexNext();
-            }
-            if (searchStmt->variant() == CONTROL_END)  // end of interface block
-            {   
-                mode = SEARCH_INTERFACE;
-                searchStmt = searchStmt->lexNext();
-            }
-            break;
-        }
-    }
-    return NULL;
-}
-
-SgStatement *getGenericInterface(SgSymbol *s, SgExpression *arg_list)
-{
-    SgStatement *func = IS_BY_USE(s) ? ORIGINAL_SYMBOL(s)->scope() : cur_func;   
-    SgStatement *interface_st = NULL;
-    while (func->variant() != GLOBAL)
-    {
-        if (interface_st = getGenericInterfaceInScope(s, arg_list, func))
-            return interface_st;
-        else
-            func = func->controlParent();
-    }                                                   
-    return interface_st;
-}
-
-void Call_Site(SgSymbol *s, int inlined, SgStatement *stat, SgExpression *e)
-{
-    graph_node * gnode, *node_by_attr = NULL;
-    SgSymbol *s_new = s;
-    SgStatement *interface_st = NULL;
-    //printf("\n%s  id= %d type= %d\n", s->identifier(), s->id(), s->type() ? s->type()->variant() : 0);
-    if (!do_dummy  && isDummyArgument(s)) return;
-    if (!do_stmtfn && isStatementFunction(s)) return;
-    // if(isIntrinsicFunction(s)) return; 
-    //printf("\nLINE %d", cur_st->lineNumber());
-    
-    if(s->variant() == INTERFACE_NAME && (in_region || in_routine))
-    {
-        //printf("INTERFACE_NAME %s\n",s->identifier());
-        interface_st = getGenericInterface(s, stat ? stat->expr(0) : e->lhs());
-        SgSymbol *s_gen  = s;
-        if(!interface_st)
-        {
-           Error("No interface found for the procedure %s", s->identifier(), 661, cur_func); 
-           return;
-        }
-        s = interface_st->symbol();
-        has_generic_interface = 1;
-        if (stat)
-            stat->setSymbol(*s);
-        else
-            e->setSymbol(*s); 
-        MarkAsUserProcedure(s);
-        MarkAsExternalProcedure(s);    
-    }
-
-    if (ATTR_NODE(s))
-        node_by_attr = GRAPHNODE(s);
-    gnode = GraphNode(s, NULL, 0);
-    CreateOutcomingEdge(gnode, inlined); // for node 'cur_node' edge: [cur_node]-> gnode
-    CreateIncomingEdge(gnode, inlined); // for node 'gnode'    edge:  cur_node ->[gnode]
-    if(node_by_attr && gnode != node_by_attr)
-    {
-        s_new = &s->copy(); 
-        if (stat)
-            stat->setSymbol(*s_new);
-        else
-            e->setSymbol(*s_new); 
-        graph_node **pnode = new (graph_node *);
-        *pnode = gnode; 
-        s_new->addAttribute(GRAPH_NODE, (void*)pnode, sizeof(graph_node *));
-    }
-    if (gnode->st_header)
-        MarkAsUserProcedure(s_new);
-    else if (in_routine && (interface_st || (interface_st = getInterface(s_new)))) 
-    {    
-        SaveInterface(s_new, interface_st); 
-        MarkAsUserProcedure(s_new); 
-    }  
-    //printf(" call site on line %d: %d %s: %d %d\n", stat ? stat->lineNumber() : 0, ATTR_NODE(s_new) ? GRAPHNODE(s_new)->id : -1, s_new->identifier(), s_new->id(), s->id());  
-}
-
-graph_node *GraphNode(SgSymbol *s, SgStatement *header_st, int flag_new)
-{
-    graph_node * gnode;
-    graph_node **pnode = new (graph_node *);
-
-#if __SPF
-    addToCollection(__LINE__, __FILE__, pnode, 1);
-#endif
-
-    gnode = flag_new == NEW ? NULL : NodeForSymbInGraph(s, header_st);
-    if (!gnode)
-        gnode = NewGraphNode(s, header_st);
-
-    *pnode = gnode;
-    if (!ATTR_NODE(s)){
-        s->addAttribute(GRAPH_NODE, (void*)pnode, sizeof(graph_node *));
-        if (deb_reg > 1)
-            printf("\n attribute NODE[%d] for %s[%d]\n", GRAPHNODE(s)->id, s->identifier(), s->id());
-    }
-    return(gnode);
-}
-
-graph_node *SearchOriginalSymbolNode(SgSymbol *s, graph_node *first_node)
-{
-    graph_node *ndl;
-    SgSymbol * s_origin = ORIGINAL_SYMBOL(s);
-    for (ndl = first_node; ndl->same_name_next; ndl = ndl->same_name_next) 
-        if (ndl->file_id == current_file_id && ndl->symb->scope() == s_origin->scope())
-            return (ndl);
-    return (ndl);
-}
-
-graph_node *SearchInternalProcedureName(SgSymbol *s, SgStatement *proc_scope, graph_node *first_node)
-{
-    graph_node *ndl;
-    for (ndl = first_node; ndl->same_name_next; ndl = ndl->same_name_next) 
-    {
-        if (ndl->type != 2) continue; // is not internal procedure
-        if (ndl->file_id == current_file_id && ndl->symb->scope() == proc_scope)  
-            return (ndl);
-        else
-            continue;
-    }
-    if (ndl->type == 2 && ndl->file_id == current_file_id && ndl->symb->scope() == proc_scope) 
-        return (ndl);
-    else
-        return (NULL);
-
-}
-
-graph_node *SearchExternalProcedureName(graph_node *first_node)
-{
-    graph_node *ndl;
-    for (ndl = first_node; ndl->same_name_next; ndl = ndl->same_name_next) 
-        if (ndl->type == 1)
-            return (ndl);
-    if (ndl->type == 1)
-        return (ndl);
-    else
-        return (NULL);  
-}
-
-graph_node *NodeForSymbInGraph(SgSymbol *s, SgStatement *stheader)
-{
-    graph_node *ndl, *node=NULL;
-    for (ndl = node_list; ndl; ndl = ndl->next) {
-        
-        if (!strcmp(ndl->name, ORIGINAL_SYMBOL(s)->identifier()))
-        {
-            if(ndl->same_name_next)
-            {
-                if(IS_BY_USE(s))
-                {
-                    node = SearchOriginalSymbolNode(s, ndl);
-                    return (node);
-                }
-                if( s->attributes() & EXTERNAL_BIT || getInterface(s))
-                {
-                    node = SearchExternalProcedureName(ndl); 
-                    return (node); 
-                }
-                if (cur_func->controlParent()->variant() == GLOBAL)
-                    node =  SearchInternalProcedureName(s, cur_func, ndl);
-                else if (cur_func->controlParent()->variant() == MODULE_STMT)
-                {
-                    node =  SearchInternalProcedureName(s, cur_func, ndl);
-                    if (!node)
-                        node =  SearchInternalProcedureName(s, cur_func->controlParent(), ndl);
-                }
-                if (!node)
-                    node = SearchExternalProcedureName(ndl); 
-            } 
-            else
-                node = ndl;
-          
-            return(node);
-        }
-    }
-    return(NULL);
-}
-
-graph_node *SameNameNode(char *name)
-{
-    graph_node *ndl;
-    for (ndl = node_list->next; ndl; ndl = ndl->next)       
-        if (!strcmp(ndl->name, name))
-            return(ndl);
-    return (NULL);
-}
-
-graph_node *NewGraphNode(SgSymbol *s, SgStatement *header_st)
-{
-    graph_node * gnode;
-
-    gnode = new graph_node;
-    gnode->id = ++gcount;
-    gnode->next = node_list;
-    node_list = gnode;
-    gnode->same_name_next = SameNameNode(s->identifier());
-    if (gnode->same_name_next)
-        gnode->samenamed = gnode->same_name_next->samenamed = 1;        
-    gnode->file = header_st ? current_file : NULL;
-    gnode->file_id = header_st ? current_file_id : -1;
-    gnode->st_header = header_st;
-    gnode->symb = s;
-    gnode->name = new char[strlen(s->identifier()) + 1];
-#if __SPF
-    addToCollection(__LINE__, __FILE__, gnode->name, 2);
-#endif
-    strcpy(gnode->name, s->identifier());
-    gnode->to_called = NULL;
-    gnode->from_calling = NULL;
-    if (header_st && (header_st->variant() == FUNC_HEDR || header_st->variant() == PROC_HEDR))
-    {
-        if (header_st->controlParent()->variant() == MODULE_STMT)
-            gnode->type = 3;
-        else if (header_st->controlParent()->variant() == GLOBAL)
-            gnode->type = 1;
-        else
-            gnode->type = 2;
-    }
-    else
-        gnode->type = 0;
-    if (header_st && header_st->expr(2))
-    {
-        if (header_st->expr(2)->variant() == PURE_OP)
-            SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) | PURE_BIT;
-        else if (header_st->expr(2)->variant() == ELEMENTAL_OP)
-            SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) | ELEMENTAL_BIT;
-    }
-    gnode->split = 0;
-    gnode->tmplt = 0;
-    gnode->clone = 0;
-    gnode->count = 0;
-    gnode->is_routine = 0;
-    gnode->st_interface = NULL;  
-    gnode->arg_numbs = NULL;  
-    //printf("%s --- %d %d\n",gnode->name,gnode->id,gnode->type);
-    return(gnode);
-}
-
-edge *CreateOutcomingEdge(graph_node *gnode, int inlined)
-{
-    edge *out_edge, *edgl;
-    //SgSymbol *sunit;
-    //sunit = cur_func->symbol();
-
-    // testing outcoming edge list of current (calling) routine graph-node: cur_node 
-    for (edgl = cur_node->to_called; edgl; edgl = edgl->next)
-    if ((edgl->to->symb == gnode->symb) && (edgl->inlined == inlined)) //there is outcoming edge: [cur_node]->gnode 
-        return(edgl);
-    // creating new edge: [cur_node]->gnode 
-    out_edge = NewEdge(NULL, gnode, inlined);   //NULL -> cur_node
-    out_edge->next = cur_node->to_called;
-    cur_node->to_called = out_edge;
-    return(out_edge);
-}
-
-edge *CreateIncomingEdge(graph_node *gnode, int inlined)
-{
-    edge *in_edge, *edgl;
-    //SgSymbol *sunit;
-    //sunit = cur_func->symbol();
-
-    // testing incoming edge list of called routine graph-node: gnode 
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next)
-    if ((edgl->from->symb == cur_node->symb) && (edgl->inlined == inlined)) //there is incoming edge: : cur_node->[gnode] 
-        return(edgl);
-    // creating new edge: cur_node->[gnode]
-    in_edge = NewEdge(cur_node, NULL, inlined);   //NULL -> gnode
-    in_edge->next = gnode->from_calling;
-    gnode->from_calling = in_edge;
-    return(in_edge);
-}
-
-edge *NewEdge(graph_node *from, graph_node *to, int inlined)
-{
-    edge *nedg;
-    nedg = new edge;
-    nedg->from = from;
-    nedg->to = to;
-    nedg->inlined = inlined;
-    return(nedg);
-}
-
-/**********************************************************************/
-
-/*    Testing and Help Functions                                      */
-
-/**********************************************************************/
-
-
-int isDummyArgument(SgSymbol *s)
-{
-    if (s->thesymb->entry.var_decl.local == IO)  // is dummy argument
-        return(1);
-    else
-        return(0);
-}
-
-int isHeaderStmtSymbol(SgSymbol *s)
-{
-    return(DECL(s) == 1 && (s->variant() == FUNCTION_NAME || s->variant() == PROCEDURE_NAME || s->variant() == PROGRAM_NAME));
-}
-
-int isStatementFunction(SgSymbol *s)
-{
-    if (DECL(s) == 2)
-        //if(s->scope() == cur_func && s->variant()==FUNCTION_NAME) 
-        return (1); //is statement function symbol
-    else return (0);
-}
-
-int isHeaderNode(graph_node *gnode)
-{
-    //header node represent a "top level" routine:
-    //main program, or any subprogram which was called 
-    //without inline expansion somewhere in the original program 
-    edge * edgl;
-    if (gnode->symb->variant() == PROGRAM_NAME)
-        return(1);
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next)
-    if (!edgl->inlined) return(1);
-    return(0);
-}
-
-int isDeadNode(graph_node *gnode)
-{
-    // dead node represent a "dead" routine:
-    // a subprogram which was not called
-    if (gnode->from_calling || gnode->symb->variant() == PROGRAM_NAME)
-        return(0);
-    else
-        return(1);
-}
-
-int isNoBodyNode(graph_node *gnode)
-{
-    // nobody node represent a "nobody" routine: intrinsic or absent
-
-    if (gnode->st_header)
-        return(0);
-    else
-        return(1);
-}
-
-
-graph_node_list  *addToNodeList(graph_node_list *pnode, graph_node *gnode)
-{
-    // adding the node to the beginning of node list 
-    // pnode-> gnode -> gnode-> ... -> gnode     
-    graph_node_list * ndl;
-    if (!pnode) {
-        pnode = new graph_node_list;
-        pnode->node = gnode;
-        pnode->next = NULL;
-    }
-    else {
-        ndl = new graph_node_list;
-        ndl->node = gnode;
-        ndl->next = pnode;
-        pnode = ndl;
-    }
-    return (pnode);
-}
-
-graph_node_list  *delFromNodeList(graph_node_list *pnode, graph_node *gnode)
-{
-    // deleting the node from the node list 
-
-    graph_node_list * ndl, *l;
-    if (!pnode) return (NULL);
-    if (pnode->node == gnode) return(pnode->next);
-    l = pnode;
-    for (ndl = pnode->next; ndl; ndl = ndl->next)
-    {
-        if (ndl->node == gnode)
-        {
-            l->next = ndl->next;
-            return(pnode);
-        }
-        else
-            l = ndl;
-    }
-    return (pnode);
-}
-
-graph_node_list  *isInNodeList(graph_node_list *pnode, graph_node *gnode)
-{
-    // testing: is there node in the node list 
-
-    graph_node_list * ndl;
-    if (!pnode) return (NULL);
-    for (ndl = pnode; ndl; ndl = ndl->next)
-    {
-        if (ndl->node == gnode)
-            return(ndl);
-    }
-    return (NULL);
-}
-
-void addArgumentNumber(int i, SgSymbol *s)
-{
-    if (!ATTR_NODE(s))
-        return;
-    graph_node *gnode = GRAPHNODE(s); 
-    argument_numbers *nl;   
-    for (nl=gnode->arg_numbs; nl; nl=nl->next)
-        if(i == nl->number) return;
-    nl = new argument_numbers;
-    nl->number = i;
-    if (gnode->arg_numbs)
-    {
-        nl->next = gnode->arg_numbs;
-        gnode->arg_numbs = nl;
-    } 
-    else
-        gnode->arg_numbs = nl;
-}
-
-void PrintGraphNode(graph_node *gnode)
-{
-    edge * edgl;
-    printf("\n%s(%d)[%d]  ->   ", gnode->name, gnode->symb->id(), gnode->id);
-    for (edgl = gnode->to_called; edgl; edgl = edgl->next)
-        printf("   %s(%d)", edgl->to->name, edgl->to->symb->id());
-}
-
-void PrintGraphNodeWithAllEdges(graph_node *gnode)
-{
-    edge * edgl;
-    printf("\n");
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next)
-        printf("   %s(%d)", edgl->from->name, edgl->from->symb->id());
-    if (!gnode->from_calling)
-        printf("          ");
-    printf("   ->%s(%d)->   ", gnode->name, gnode->symb->id());
-    for (edgl = gnode->to_called; edgl; edgl = edgl->next)
-        printf("   %s(%d)", edgl->to->name, edgl->to->symb->id());
-}
-
-void PrintWholeGraph()
-{
-    graph_node *ndl;
-    printf("\n%s\n", "C a l l  G r a p h");
-    for (ndl = node_list; ndl; ndl = ndl->next)
-        PrintGraphNode(ndl);
-    printf("\n");
-}
-
-void PrintWholeGraph_kind_2()
-{
-    graph_node *ndl;
-    printf("\n%s\n", "C a l l  G r a p h  2");
-    for (ndl = node_list; ndl; ndl = ndl->next)
-        PrintGraphNodeWithAllEdges(ndl);
-    printf("\n");
-}
-
-
-void DeleteIncomingEdgeFrom(graph_node *gnode, graph_node *from)
-{
-    // deleting edge that is incoming to node 'gnode' from node 'from' 
-    edge *edgl, *ledge;
-    ledge = NULL;
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next) {
-        if (edgl->from == from) {
-            if (deb_reg > 1)
-                printf("\n%s(%d)-%s(%d) edge dead  ", from->name, from->symb->id(), gnode->name, gnode->symb->id());
-
-            if (ledge)
-                ledge->next = edgl->next;
-            else
-                gnode->from_calling = edgl->next;
-        }
-        else
-            ledge = edgl;
-    }
-}
-
-void DeleteOutcomingEdgeTo(graph_node *gnode, graph_node *gto)
-{
-    // deleting edge that is outcoming from node 'gnode' to node 'gto' 
-    edge *edgl, *ledge;
-    ledge = NULL;
-    for (edgl = gnode->to_called; edgl; edgl = edgl->next) {
-        if (edgl->to == gto) {
-            if (deb_reg > 1)
-                printf("\n%s(%d)-%s(%d) edge empty  ", gnode->name, gnode->symb->id(), gto->name, gto->symb->id());
-
-            if (ledge)
-                ledge->next = edgl->next;
-            else
-                gnode->to_called = edgl->next;
-        }
-        else
-            ledge = edgl;
-    }
-}
-
-void ScanSymbolTable(SgFile *f)
-{
-    SgSymbol *s;
-    for (s = f->firstSymbol(); s; s = s->next())
-        //if(isHeaderStmtSymbol(s))
-        printSymb(s);
-}
-
-void ScanTypeTable(SgFile *f)
-{
-    SgType *t;
-    for (t = f->firstType(); t; t = t->next())
-    {   // printf("TYPE[%d] : ", t->id());
-        printType(t);
-    }
-}
-
-void ReseatEdges(graph_node *gnode, graph_node *newnode)
-{//reseat all edges representing inlined calls to gnode to point to newnode 
-    edge *edgl, *tol, *ledge, *curedg;
-    graph_node *from;
-    ledge = NULL;
-    // for(edgl=gnode->from_calling; edgl; edgl=edgl->next)
-    // looking through the incoming edge list of gnode
-    edgl = gnode->from_calling;
-    while (edgl)
-    {
-        if (edgl->inlined)
-        {
-            from = edgl->from;
-            // reseating outcoming edge to 'gnode' to point to 'newnode'
-            for (tol = from->to_called; tol; tol = tol->next)
-            if (tol->to == gnode && tol->inlined)
-            {
-                tol->to = newnode; break;
-            }
-            // removing "inlined" incoming edge of gnode
-            if (ledge)
-                ledge->next = edgl->next;
-            else
-                gnode->from_calling = edgl->next;
-
-            curedg = edgl;    // set curedg to point at removed edge  
-            edgl = edgl->next;  // to next node of list
-
-            // adding removed edge  to 'newnode' 
-            curedg->next = newnode->from_calling;
-            newnode->from_calling = curedg;
-
-        }
-        else
-        {
-            ledge = edgl;
-            edgl = edgl->next;
-        }
-    } //end while  
-}
-
-void CopyOutcomingEdges(graph_node *gnode, graph_node *gnew)
-{
-    edge *out_edge, *in_edge, *edgl;
-    graph_node *s;
-    // looking through the outcoming edge list of gnode
-    for (edgl = gnode->to_called; edgl; edgl = edgl->next)
-    {
-        s = edgl->to; // successor of gnode
-        // creating new edge of gnew (copy of edgl)
-        out_edge = NewEdge(NULL, edgl->to, edgl->inlined);
-        out_edge->next = gnew->to_called;
-        gnew->to_called = out_edge;
-        // creating new edge of  s (successor  of gnode)
-        in_edge = NewEdge(gnew, NULL, edgl->inlined);
-        in_edge->next = s->from_calling;
-        s->from_calling = in_edge;
-    }
-    return;
-}
-
-void CopyIncomingEdges(graph_node *gnode, graph_node *gnew)
-{
-    edge *in_edge, *out_edge, *edgl;
-    graph_node *p;
-    // looking through the incoming edge list of gnode
-    for (edgl = gnode->from_calling; edgl; edgl = edgl->next)
-    {
-        p = edgl->from; // predecessor of gnode
-        // creating new edge of gnew (copy of edgl) 
-        in_edge = NewEdge(edgl->from, NULL, edgl->inlined);
-        in_edge->next = gnew->from_calling;
-        gnew->from_calling = in_edge;
-        // creating new edge of p (predecessor of gnode)
-        out_edge = NewEdge(NULL, gnew, edgl->inlined);
-        out_edge->next = p->to_called;
-        p->to_called = out_edge;
-
-    }
-    return;
-}
-
-void printSymb(SgSymbol *s)
-{
-    const char *head;
-    head = isHeaderStmtSymbol(s) ? "HEADER  " : "        ";
-    printf("SYMB[%3d]  scope=STMT[%3d] : %s    %s", s->id(), (s->scope()) ? (s->scope())->id() : -1, s->identifier(), head);
-    printType(s->type());
-    if(s->variant() == CONST_NAME)
-    {
-       printf(" CONST_NAME ");
-       if(IS_BY_USE(s))
-          printf(" BY_USE");
-       printf("\n");
-       return;
-    }
-    if(IS_BY_USE(s))
-       printf(" BY_USE %s", ORIGINAL_SYMBOL(s)->scope()->symbol()->identifier());
-    if(ATTR_NODE(s))
-       printf(" GRAPHNODE %d", GRAPHNODE(s)->id);
-    printf("\n");
-}
-
-void printType(SgType *t)
-{
-    SgArrayType *arrayt;
-
-    if (!t) {
-        printf("no type "); return;
-    }
-    else   printf("TYPE[%d]:", t->id());
-    if ((arrayt = isSgArrayType(t)) != 0)
-    {
-        SgExpression *e = arrayt->getDimList();
-        if (!e)
-            printf(" dimension() ");
-        else
-            printf(" dimension(%s) ", UnparseExpr(arrayt->getDimList()));
-        /*
-          int i;
-          int n = arrayt->dimension();
-          printf("dimension(");
-          for(i = 0; i < n; i++)
-          { if(arrayt->sizeInDim(i))
-          { printf("%s", UnparseExpr(arrayt->sizeInDim(i))); //(arrayt->sizeInDim(i))->unparsestdout();
-          if(i < n-1)  printf(", ");
-          }
-          }
-          printf(") ");
-          */
-    }
-    else
-    {
-        switch (t->variant())
-        {
-        case  T_INT:      printf("integer "); break;
-        case  T_FLOAT:    printf("real "); break;
-        case  T_DOUBLE:   printf("double precision "); break;
-        case  T_CHAR:     printf("character "); break;
-        case  T_STRING:   printf("Character ");
-            UnparseLLND(TYPE_RANGES(t->thetype));
-            /*if(t->length()) printf("[%d]",t->length()->variant());*/
-            /*((SgArrayType *) t)->getDimList()->unparsestdout();*/
-            break;
-        case  T_BOOL:     printf("logical "); break;
-        case  T_COMPLEX:  printf("complex "); break;
-        case  T_DCOMPLEX:  printf("double complex "); break;
-
-        default: break;
-        }
-    }
-
-    if (t->hasBaseType())
-    {
-        printf("of ");
-        printType(t->baseType());
-    }
-}
-
-#undef NEW
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/checkpoint.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/checkpoint.cpp
deleted file mode 100644
index 2cc19dc..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/checkpoint.cpp
+++ /dev/null
@@ -1,552 +0,0 @@
-#include "dvm.h"
-#include <stdexcept>
-
-class Checkpoint {
-  char *cpName; // checkpoint name
-  char *serviceFilename; // service file name
-  std::vector<SgExpression *> filenames; // filenames used for checkpointing
-  SgExprListExp *variables; // variables list
-  char defaultIOMode[5];
-  
-  static const char SERVICE_FILE_SUFFIX[10];
-  
-  SgSymbol *serviceUnitSymbol;
-  SgSymbol *writeUnitSymbol;
-  SgSymbol *currentFileSymbol;
-  SgSymbol *lastFileSymbol;
-  
-  SgLabel *emptyServiceFileLabel;
-  SgLabel *notExistingServiceFileLabel;
-  
-public:
-  Checkpoint(char *cpName, std::vector<SgExpression *> filenames, SgExprListExp *variables, SgExpression *cpMode) {
-    defaultIOMode[0] = 0;
-    this->cpName = new char[strlen(cpName) + 1];
-    strcpy(this->cpName, cpName);
-    this->serviceFilename = new char[strlen(cpName) + strlen(SERVICE_FILE_SUFFIX) + 1];
-    strcpy(this->serviceFilename, cpName);
-    strcat(this->serviceFilename, SERVICE_FILE_SUFFIX);
-    this->filenames = filenames;
-    this->variables = variables;
-    
-    if (cpMode) {
-      if (cpMode->variant() == ACC_LOCAL_OP) strcpy(defaultIOMode, "l");
-      else if (cpMode->variant() == PARALLEL_OP) strcpy(defaultIOMode, "p");
-      else throw new std::runtime_error("Unknown type of checkpoint mode");
-    }
-    else strcpy(defaultIOMode, "p");
-  }
-  
-  void getNewLabels(int variant) {
-    this->emptyServiceFileLabel = GetLabel();
-    if (variant == WRITE_STAT) this->notExistingServiceFileLabel = GetLabel();
-  }
-  
-  SgSymbol *getServiceUnitSymbol() {
-    return this->serviceUnitSymbol;
-  }
-  
-  SgSymbol *getWriteUnitSymbol() {
-    return this->writeUnitSymbol;
-  }
-  
-  SgSymbol *getCurrentFileSymbol() {
-    return this->currentFileSymbol;
-  }
-  
-  SgSymbol *getLastFileSymbol() {
-    return this->lastFileSymbol;
-  }
-  
-  void defineVariables();
-  void createEmptyLastFilenameAssign();
-  void createSaveFilenamesStatement();
-  void createOpenServiceFileBeforeCp(int variant);
-  void createReadServiceFileStatement(int variant);
-  void createCloseServiceFileStatement(bool useLabel);
-  void createCloseWriteFileStatement();
-  void createOpenWriteFileStatement(bool isAsync);
-  void createWriteOrReadStatement(int variant);
-  void createWriteServiceFileStatement();
-  void createOpenReadFileStatement();
-  void createCheckFilenameStatement();
-  void createOpenServiceFileAfterCp();
-  void getNextFileStmt();
-  void createSaveAsyncUnitStatement();
-  void createCpWaitStatement(SgVarRefExp *statusVarRef);
-  
-};
-
-const char Checkpoint::SERVICE_FILE_SUFFIX[10] = ".info.dat";
-
-struct stringLessComparator {
-  bool operator()(const char *a, const char *b) const {
-    return strcmp(a, b) < 0;
-  }
-};
-
-std::map<char *, Checkpoint *, stringLessComparator> checkpointMap;
-
-void insertContinueStatement() {
-  SgContinueStmt &continueStatement = *new SgContinueStmt();
-  cur_st->lastNodeOfStmt()->insertStmtAfter(continueStatement, *cur_st->controlParent());
-  cur_st = &continueStatement;
-}
-
-/* adds new checkpoint to checkpointMap
- example: !DVM$ CP_CREATE CP1, VARLIST(IT, B), FILES('jac_%02d.cp0','jac_%02d.cp1') [PARALLEL | LOCAL]
- */
-void CP_Create_Statement(SgStatement *stmt, int error_msg)
-{
-  if (!options.isOn(IO_RTS)) {
-    if (error_msg) warn("Checkpoints aren't supported without iO_RTS option", 462, stmt);
-  }
-  SgVarRefExp *cpNameExpr = isSgVarRefExp(stmt->expr(0));
-  if (!cpNameExpr) return;
-  char *cpName = cpNameExpr->symbol()->identifier();
-  
-  SgExprListExp *variablesExpr = isSgExprListExp(stmt->expr(1));
-  
-  SgExpression *filenamesAndCpModeExpr = stmt->expr(2);
-  SgExprListExp *filenamesExpr = NULL;
-  SgExpression *cpMode = NULL;
-  std::vector<SgExpression *> filenames;
-  if (isSgExprListExp(filenamesAndCpModeExpr)) {
-    filenamesExpr = isSgExprListExp(filenamesAndCpModeExpr);
-  }
-  else if (filenamesAndCpModeExpr->variant() == ARRAY_OP) {
-    filenamesExpr = isSgExprListExp(filenamesAndCpModeExpr->lhs());
-    cpMode = filenamesAndCpModeExpr->rhs();
-  }
-  // else syntax error, no need to check
-  
-  for (int i = 0; i < filenamesExpr->length(); ++i) {
-    SgValueExp *filename = isSgValueExp(filenamesExpr->elem(i));
-    if (!filename) {
-      if (error_msg) {
-        err("Every filename in CP_CREATE statement should be character constant value", 463, stmt);
-      }
-      return;
-    }
-    size_t currentFilenameLength = strlen(filename->stringValue());
-    if (currentFilenameLength >= 99) {
-      if (error_msg) {
-        err("Filename in CP_CREATE cannot be longer than 100 characters", 464, stmt);
-      }
-      return;
-    }
-    filenames.push_back(filenamesExpr->elem(i));
-  }
-  try {
-    Checkpoint *checkpoint = new Checkpoint(cpName, filenames, variablesExpr, cpMode);
-    checkpoint->defineVariables();
-    if (checkpointMap.find(cpName) != checkpointMap.end()) {
-      if (error_msg) {
-        Error("Checkpoint with name %s already exists", cpName, 465, stmt);
-      }
-      return;
-    }
-    checkpointMap[cpName] = checkpoint;
-    checkpoint->createSaveFilenamesStatement();
-    checkpoint->createEmptyLastFilenameAssign();
-  }
-  catch(std::runtime_error error) {
-    if (error_msg) {
-      err(error.what(), 0, stmt);
-    }
-    return;
-  }
-  
-}
-
-/* fixme: delete from here! use the only enum for io.cpp and checkpoint.cpp */
-enum {UNIT_IO, ACCESS_IO, ACTION_IO, ASYNC_IO, BLANK_IO, DECIMAL_IO, DELIM_IO, ENCODING_IO, ERR_IO, FILE_IO,
-  FORM_IO, IOSTAT_IO, IOMSG_IO, NEWUNIT_IO, PAD_IO, POSITION_IO, RECL_IO, ROUND_IO, SIGN_IO, STATUS_IO, DVM_MODE_IO, NUMB__CL };
-enum { UNIT_RW, FMT_RW, NML_RW, ADVANCE_RW, ASYNC_RW, BLANK_RW, DECIMAL_RW, DELIM_RW, END_RW, EOR_RW, ERR_RW, ID_RW,
-  IOMSG_RW, IOSTAT_RW, PAD_RW, POS_RW, REC_RW, ROUND_RW, SIGN_RW, SIZE_RW, NUMB__RW };
-
-void Checkpoint::defineVariables() {
-  
-  const int varLength =  300; //(int) (20 + strlen(this->cpName));
-  char serviceUnitVarName[varLength];
-  strcpy(serviceUnitVarName, "dvmh_service_unit_");
-  strcat(serviceUnitVarName, this->cpName);
-  
-  char writeUnitVarName[varLength];
-  strcpy(writeUnitVarName, "dvmh_write_unit_");
-  strcat(writeUnitVarName, this->cpName);
-  
-  char currentFileVarName[varLength];
-  strcpy(currentFileVarName, "dvmh_current_file_");
-  strcat(currentFileVarName, this->cpName);
-  
-  char lastFileVarName[varLength];
-  strcpy(lastFileVarName, "dvmh_last_file_");
-  strcat(lastFileVarName, this->cpName);
-  
-  this->serviceUnitSymbol = new SgSymbol(VARIABLE_NAME, serviceUnitVarName);
-  this->serviceUnitSymbol->setType(SgTypeInt());
-  this->writeUnitSymbol = new SgSymbol(VARIABLE_NAME, writeUnitVarName);
-  this->writeUnitSymbol->setType(SgTypeInt());
-  
-  SgStringLengthExp *lengthExpr = new SgStringLengthExp(*new SgValueExp(100));
-  SgType *stringType = new SgType(T_STRING, lengthExpr, SgTypeChar());
-  
-  this->currentFileSymbol = new SgSymbol(VARIABLE_NAME, currentFileVarName);
-  this->currentFileSymbol->setType(stringType);
-  
-  this->lastFileSymbol = new SgSymbol(VARIABLE_NAME, lastFileVarName);
-  this->lastFileSymbol->setType(stringType);
-  
-  /* declare these variables for testing */
-  cur_func->insertStmtAfter(*serviceUnitSymbol->makeVarDeclStmt());
-  cur_func->insertStmtAfter(*writeUnitSymbol->makeVarDeclStmt());
-  cur_func->insertStmtAfter(*currentFileSymbol->makeVarDeclStmt());
-  cur_func->insertStmtAfter(*lastFileSymbol->makeVarDeclStmt());
-  
-}
-
-void Checkpoint::createSaveFilenamesStatement() {
-  
-  /* generates dvmh_cp_save_filenames call:
-   dvmh_cp_save_filenames(checkpoint_name, files_count, filename1, filename2, ...)
-   */
-  
-  SgStatement *stmt = SaveCheckpointFilenames(new SgValueExp(this->cpName), this->filenames);
-  SgStatement *cpCreateDir = cur_st;
-  cur_st->insertStmtAfter(*stmt, *cur_st->controlParent());
-  cur_st = stmt;
-  cpCreateDir->extractStmt();
-}
-
-void Checkpoint::createEmptyLastFilenameAssign() {
-  /*
-   initialization dvmh_last_file variable. generating dvmh_last_file = ''&
-   */
-  SgVarRefExp *lastFilename = new SgVarRefExp(this->lastFileSymbol);
-  SgValueExp *emptyString = new SgValueExp("");
-  doAssignTo_After(lastFilename, emptyString);
-}
-
-void Checkpoint::createOpenServiceFileBeforeCp(int variant) {
-  /* statement to be generated:
-   open(newunit=service_unt, file=service_filename,
-   access='stream', status='old', err=err_label, position='rewind', action='read')
-   */
-  
-  SgExpression *ioc[NUMB__CL];
-  for (int i = 0; i < NUMB__CL; ++i) {
-    ioc[i] = NULL;
-  }
-
-  ioc[NEWUNIT_IO] = new SgVarRefExp(this->serviceUnitSymbol);
-  ioc[ACCESS_IO] = new SgValueExp("STREAM");
-  ioc[ACTION_IO] = new SgValueExp("READ");
-  ioc[FILE_IO] = new SgValueExp(serviceFilename);
-  ioc[POSITION_IO] = new SgValueExp("REWIND"); // for reading file
-  ioc[STATUS_IO] = new SgValueExp("OLD");
-  
-  // if service file is opened for reading, error should occur.
-  // if it is opened for saving checkpoint, not existing file is normal
-  if (variant == WRITE_STAT) ioc[ERR_IO] = new SgLabelRefExp(*this->notExistingServiceFileLabel);
-  
-  insertContinueStatement();
-  Dvmh_Open(ioc, defaultIOMode);
-}
-
-void Checkpoint::createOpenServiceFileAfterCp() {
-  /* statement to be generated:
-   open(newunit=service_unt, file=serviceFileName, access='stream', position='rewind', action='write')
-   */
-  
-  SgExpression *ioc[NUMB__CL];
-  for (int i = 0; i < NUMB__CL; ++i) {
-    ioc[i] = NULL;
-  }
-  
-  ioc[NEWUNIT_IO] = new SgVarRefExp(this->serviceUnitSymbol);
-  ioc[ACCESS_IO] = new SgValueExp("STREAM");
-  ioc[ACTION_IO] = new SgValueExp("WRITE");
-  ioc[FILE_IO] = new SgValueExp(this->serviceFilename);
-  ioc[POSITION_IO] = new SgValueExp("REWIND");
-  ioc[STATUS_IO] = new SgValueExp("OLD");
-  
-  insertContinueStatement();
-  Dvmh_Open(ioc, defaultIOMode);
-}
-
-void Checkpoint::createReadServiceFileStatement(int variant) {
-  /* statement to be generated:
-   read(unit = service_unt, end=200) last_filename
-   end argument is used only for writing checkpoint.
-   */
-  
-  SgExpression *ioc[NUMB__RW];
-  for (int i = 0; i < NUMB__RW; ++i) {
-    ioc[i] = NULL;
-  }
-  
-  ioc[UNIT_RW] = new SgVarRefExp(this->serviceUnitSymbol);
-  SgLabelRefExp *endLabelRef = new SgLabelRefExp(*this->emptyServiceFileLabel);
-  ioc[END_RW] = endLabelRef;
-  
-  SgVarRefExp &lastFilenameExpr = *new SgVarRefExp(this->lastFileSymbol);
-  SgExprListExp &itemsToRead = *new SgExprListExp(lastFilenameExpr);
-  
-  SgExprListExp &specList = *new SgExprListExp();
-  
-  SgSpecPairExp &specPairUnit = *new SgSpecPairExp(*new SgValueExp("unit"), *new SgVarRefExp(this->serviceUnitSymbol));
-  specList.append(specPairUnit);
-  if (variant == WRITE_STAT) {
-    SgSpecPairExp &specPairEnd = *new SgSpecPairExp(*new SgValueExp("end"), *endLabelRef);
-    specList.append(specPairEnd);
-  }
-  
-  SgInputOutputStmt *ioStatement = new SgInputOutputStmt(READ_STAT, specList, itemsToRead);
-  
-  insertContinueStatement();
-  Dvmh_ReadWrite(ioc, ioStatement);
-  
-}
-
-void Checkpoint::createWriteServiceFileStatement() {
-  /* statement to be generated:
-   write(unit = service_unt) current_filename
-   */
-  SgExpression *ioc[NUMB__RW];
-  for (int i = 0; i < NUMB__RW; ++i) {
-    ioc[i] = NULL;
-  }
-  
-  ioc[UNIT_RW] = new SgVarRefExp(this->serviceUnitSymbol);
-  
-  SgVarRefExp &currentFileExpr = *new SgVarRefExp(this->currentFileSymbol);
-  SgExprListExp &itemsToWrite = *new SgExprListExp(currentFileExpr);
-  
-  SgSpecPairExp &specPairUnit = *new SgSpecPairExp(*new SgValueExp("unit"), *new SgVarRefExp(this->serviceUnitSymbol));
-  SgExprListExp &specList = *new SgExprListExp();
-  specList.append(specPairUnit);
-  SgInputOutputStmt *ioStatement = new SgInputOutputStmt(WRITE_STAT, specList, itemsToWrite);
-  
-  insertContinueStatement();
-  Dvmh_ReadWrite(ioc, ioStatement);
-  
-}
-
-void Checkpoint::createCloseServiceFileStatement(bool useLabel) {
-  /* statement to generate:
-   [label]  close(unit = service_unit)
-   */
-  
-  SgExpression *ioc[NUMB__CL];
-  for (int i = 0; i < NUMB__CL; ++i)
-    ioc[i] = NULL;
-  ioc[UNIT_IO] = new SgVarRefExp(this->serviceUnitSymbol);
-  
-  insertContinueStatement();
-  Dvmh_Close(ioc);
-  
-  if (useLabel) cur_st->setLabel(*this->emptyServiceFileLabel);
-  
-}
-
-void Checkpoint::getNextFileStmt() {
-  
-  SgStatement *getNextFilenameStmt =
-  GetNextFilename(new SgValueExp(this->cpName),
-                  new SgVarRefExp(this->lastFileSymbol),
-                  new SgVarRefExp(this->currentFileSymbol));
-  doCallAfter(getNextFilenameStmt);
-  cur_st->setLabel(*this->notExistingServiceFileLabel);
-}
-
-void Checkpoint::createCloseWriteFileStatement() {
-  /* statement to generate:
-    close(unit = write_unit)
-   */
-  
-  SgExpression *ioc[NUMB__CL];
-  for (int i = 0; i < NUMB__CL; ++i)
-    ioc[i] = NULL;
-  ioc[UNIT_IO] = new SgVarRefExp(this->writeUnitSymbol);
-  
-  insertContinueStatement();
-  Dvmh_Close(ioc);
-  
-}
-
-void Checkpoint::createOpenReadFileStatement() {
-  /* statement to be generated:
-   open(newunit = write_unt, file=last_filename, access='stream', status='old')
-   */
-  SgExpression *ioc[NUMB__CL];
-  for (int i = 0; i < NUMB__CL; ++i) {
-    ioc[i] = NULL;
-  }
-  
-  ioc[NEWUNIT_IO] = new SgVarRefExp(this->writeUnitSymbol);
-  ioc[FILE_IO] = new SgVarRefExp(this->lastFileSymbol);
-  ioc[ACCESS_IO] = new SgValueExp("STREAM");
-  ioc[STATUS_IO] = new SgValueExp("OLD");
-  
-  insertContinueStatement();
-  Dvmh_Open(ioc, defaultIOMode);
-  
-}
-
-void Checkpoint::createOpenWriteFileStatement(bool isAsync) {
-  /* statement to be generated:
-   open(newunit = write_unt, file=current_filename, access='stream', status='replace', dvmIoMode = defaultIOMode[+s])
-   */
-  SgExpression *ioc[NUMB__CL];
-  for (int i = 0; i < NUMB__CL; ++i) {
-    ioc[i] = NULL;
-  }
-  
-  ioc[NEWUNIT_IO] = new SgVarRefExp(this->writeUnitSymbol);
-  ioc[FILE_IO] = new SgVarRefExp(this->currentFileSymbol);
-  ioc[ACCESS_IO] = new SgValueExp("STREAM");
-  ioc[STATUS_IO] = new SgValueExp("REPLACE");
-  ioc[ACTION_IO] = new SgValueExp("WRITE");
-  
-  insertContinueStatement();
-  char *ioMode = new char[5];
-  strcpy(ioMode, defaultIOMode);
-  if (isAsync) strcat(ioMode, "s");
-  Dvmh_Open(ioc, ioMode);
-  
-}
-
-void Checkpoint::createWriteOrReadStatement(int variant) {
-  SgExpression *ioc[NUMB__RW];
-  for (int i = 0; i < NUMB__RW; ++i) {
-    ioc[i] = NULL;
-  }
-  
-  ioc[UNIT_RW] = new SgVarRefExp(this->writeUnitSymbol);
-  
-  SgSpecPairExp &specPairUnit = *new SgSpecPairExp(*new SgValueExp("unit"), *new SgVarRefExp(this->writeUnitSymbol));
-  SgExprListExp &specList = *new SgExprListExp();
-  specList.append(specPairUnit);
-  SgInputOutputStmt *ioStatement = new SgInputOutputStmt(variant, specList, *this->variables);
-  
-  insertContinueStatement();
-  Dvmh_ReadWrite(ioc, ioStatement);
-  
-}
-
-void Checkpoint::createCheckFilenameStatement() {
-  /* checks that filename was in current checkpoint declaration.
-   generates dvmh_cp_check_filename(checkpoint_name, filename)
-   */
-  SgValueExp *cpNameExpr = new SgValueExp(this->cpName);
-  SgVarRefExp *lastFileExpr = new SgVarRefExp(this->lastFileSymbol);
-  SgStatement *checkFileStatement = CheckFilename(cpNameExpr, lastFileExpr);
-  cur_st->insertStmtAfter(*checkFileStatement, *cur_st->controlParent());
-  cur_st = checkFileStatement;
-  
-}
-
-void Checkpoint::createSaveAsyncUnitStatement() {
-  /* saves unit when cp_save is used in async mode
-   generates dvmh_cp_save_async_unit(checkpoint_name, filename, unit)
-   */
-  SgValueExp *cpName = new SgValueExp(this->cpName);
-  SgVarRefExp *currentFileExpr = new SgVarRefExp(this->currentFileSymbol);
-  SgVarRefExp *writeUnitRef = new SgVarRefExp(this->writeUnitSymbol);
-  
-  SgStatement *cpSaveAsyncUnit = CpSaveAsyncUnit(cpName, currentFileExpr, writeUnitRef);
-  cur_st->insertStmtAfter(*cpSaveAsyncUnit, *cur_st->controlParent());
-  cur_st = cpSaveAsyncUnit;
-
-}
-
-void Checkpoint::createCpWaitStatement(SgVarRefExp *statusVarRef) {
-  /* wait for all files to finish async saving and closing them
-   generates dvmh_cp_wait(checkpoint_name, status_var)
-   */
-  SgStatement *initialCpWait = cur_st;
-  SgStatement *cpWaitStmt = CpWait(new SgValueExp(this->cpName), statusVarRef);
-  cur_st->insertStmtAfter(*cpWaitStmt);
-  cur_st = cpWaitStmt;
-  initialCpWait->extractStmt();
-}
-
-Checkpoint *getCheckpoint(SgStatement *stmt, int error_msg) {
-  SgVarRefExp *checkpointVarRef = isSgVarRefExp(stmt->expr(0));
-  char *checkpointName = new char[strlen(checkpointVarRef->symbol()->identifier()) + 1];
-  strcpy(checkpointName, checkpointVarRef->symbol()->identifier());
-  std::map<char *, Checkpoint *>::iterator checkpointIt = checkpointMap.find(checkpointName);
-  if (checkpointIt == checkpointMap.end()) {
-    if (error_msg) {
-      Error("No created checkpoint with name %s found", checkpointName, 466, stmt);
-    }
-    return NULL;
-  }
-  return checkpointIt->second;
-}
-
-void CP_Save_Statement(SgStatement *stmt, int error_msg) {
-  
-  /*
-   stmt->variant() == DVM_CP_SAVE_DIR
-   stmt->expr(0) – имя-контр-точки
-   stmt->expr(1) –  NULL или variant == ACC_ASYNC_OP
-   */
-  Checkpoint *checkpoint = getCheckpoint(stmt, error_msg);
-  if (!checkpoint) return;
-  
-  bool isAsync = (stmt->expr(1) != NULL && stmt->expr(1)->variant() == ACC_ASYNC_OP);
-  
-  checkpoint->getNewLabels(WRITE_STAT);
-  
-  checkpoint->createOpenServiceFileBeforeCp(WRITE_STAT);
-  checkpoint->createReadServiceFileStatement(WRITE_STAT);
-  checkpoint->createCloseServiceFileStatement(true);
-  
-  checkpoint->getNextFileStmt();
-  
-  checkpoint->createOpenWriteFileStatement(isAsync);
-  if (isAsync) checkpoint->createSaveAsyncUnitStatement();
-  checkpoint->createWriteOrReadStatement(WRITE_STAT);
-  if (!isAsync) checkpoint->createCloseWriteFileStatement();
-  
-  checkpoint->createOpenServiceFileAfterCp();
-  checkpoint->createWriteServiceFileStatement();
-  checkpoint->createCloseServiceFileStatement(false);
-  
-}
-
-void CP_Load_Statement(SgStatement *stmt, int error_msg) {
-  Checkpoint *checkpoint = getCheckpoint(stmt, error_msg);
-  if (!checkpoint) return;
-  
-  checkpoint->getNewLabels(READ_STAT);
-  
-  checkpoint->createOpenServiceFileBeforeCp(READ_STAT);
-  checkpoint->createReadServiceFileStatement(READ_STAT);
-  checkpoint->createCloseServiceFileStatement(true);
-  
-  checkpoint->createCheckFilenameStatement();
-  
-  checkpoint->createOpenReadFileStatement();
-  checkpoint->createWriteOrReadStatement(READ_STAT);
-  checkpoint->createCloseWriteFileStatement();
-  
-}
-
-void CP_Wait(SgStatement *stmt, int error_msg) {
-  Checkpoint *checkpoint = getCheckpoint(stmt, error_msg);
-  if (!checkpoint) return;
-  
-  SgVarRefExp *statusVarRef = isSgVarRefExp(stmt->expr(1));
-  if (!statusVarRef || !(statusVarRef->symbol()->type()->variant() == T_INT)) {
-    if (error_msg)
-      err("Wrong type of STATUS argument in CP_WAIT-statement", 467, stmt);
-    return;
-  }
-  
-  checkpoint->createCpWaitStatement(statusVarRef);
-  
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/debug.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/debug.cpp
deleted file mode 100644
index e5ebf57..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/debug.cpp
+++ /dev/null
@@ -1,1181 +0,0 @@
-/**************************************************************\
-* Fortran DVM                                                  * 
-*                                                              *
-*   Generating statements and restructuring program for        *
-*            Debugger and Performance Analyzer                 *
-\**************************************************************/
-
-#include "dvm.h"
-extern int   is_heap_ref;
-
-/***************************************************************\
- *         Debugging mode functions                            *
-\***************************************************************/ 
-void D_AddToDoList (int Nloop, int Nline, SgLabel *lab, SgSymbol *var)
-{D_do_list *doel;
-//adding element to D_do_list correcponding current loop
-  if(!cur_do) { //list is empty
-     cur_do = new D_do_list;
-     cur_do->No = Nloop;
-     cur_do->num_line = Nline;
-     cur_do->end_lab = lab;
-     cur_do->do_var = var;
-     cur_do->next = NULL;
-  } else if (!free_list) {  //list of free elements is empty, creating new element
-     doel =  new D_do_list;
-     doel->No = Nloop;
-     doel->num_line = Nline;
-     doel->end_lab = lab;
-     doel->do_var = var;
-     doel->next = cur_do;
-     cur_do = doel;
-  }
-    else {  // taking free element
-     doel = free_list;
-     free_list = free_list->next;
-     doel->No = Nloop;
-     doel->num_line = Nline;
-     doel->end_lab = lab;
-     doel->do_var = var;
-     doel->next = cur_do;
-     cur_do = doel;
-   }
-}
-
-void D_DelFromDoList ()
-{D_do_list *doel;
-   if(!cur_do)  //list is empty
-     return;
-   doel = cur_do;
-   cur_do = cur_do->next;
-   doel->next = free_list;
-   free_list = doel; 
-}
-
-void ArrayRegistration ()
-{ symb_list *sl;
-  SgSymbol *ar;
-  int count;
-  count = 0;
-  registration_array = CreateRegistrationArraySymbol();
-  for(sl=registration; sl; sl=sl->next) {
-     ar = sl->symb;
-     if(IN_MODULE){
-       int *index = new int;
-       count_reg++;
-       *index = count_reg; 
-       ar->addAttribute(DEBUG_AR_INDEX,(void*) index, sizeof(int));
-     }
-     Registrate_Ar(ar); 
-
-  }      
-}
-
-void AllocatableArrayRegistration (SgStatement *stmt)
-{SgExpression *alce,*al;
- //SgSymbol *ar;
- 
- LINE_NUMBER_AFTER(stmt,stmt);
-
- for(al=stmt->expr(0); al; al=al->rhs()) {
-   alce = al->lhs(); //allocation
-   if(isSgRecordRefExp(alce)) 
-     alce = RightMostField(alce);
-   //ar = alce->symbol();
-   Registrate_Allocatable(alce,stmt);
- }
-}
-
-void Registrate_Ar(SgSymbol *ar)
-{ SgExpression *ehead, *size_array;
-  SgStatement *if_st,*savest;   
-  int ia,idvm;
-  idvm=ndvm;
-  savest = where; 
-  ia = ar->attributes(); 
-  if(!VarType(ar) || (ia & INHERIT_BIT) || (ia & HEAP_BIT) || IS_POINTER(ar) || IS_DUMMY(ar) || (ia & ALLOCATABLE_BIT) || (ia & POINTER_BIT) || (IN_COMMON(ar) && (ar->scope()->variant() != PROG_HEDR)) ||  (!strcmp(ar->identifier(),"heap")) )
-       return;
-  if(ALIGN_RULE_INDEX(ar))  return;  
-
-  if(ORIGINAL_SYMBOL(ar)->scope()->variant() == MODULE_STMT) {
-    if_st = doIfThenConstrWithArElem (registration_array,DEBUG_INDEX(ar));
-    where = if_st->lexNext();  // reffer to ENDIF statement   
-  }
-  ehead = HEADER(ar) ?  GetAddresDVM(HeaderRefInd(ar,1)) : GetAddresMem(FirstArrayElement(ar));
-  size_array = doSizeArray(ar, NULL); 
-  InsertNewStatementBefore( D_RegistrateArray(Rank(ar),VarType(ar), ehead, size_array,
- new SgArrayRefExp(*ar)),where);
-  SET_DVM(idvm);
-  where = savest;
-  return;
-}
-
-void Registrate_Allocatable(SgExpression *alce, SgStatement *stmt)
-{SgSymbol *ar;
- SgExpression *ehead, *size_array;
- SgStatement *savest; 
- int idvm;
-
- idvm=ndvm;
- savest = where;  
- ar = alce->symbol();
-
- if(VarType(ar)) {
-   ehead = GetAddresMem(FirstArrayElement(ar));
-   size_array = dvm_array_ref();     // SizeArray reference
-   InsertNewStatementAfter( D_RegistrateArray(Rank(ar),VarType(ar), ehead, size_array, new SgArrayRefExp(*ar)),cur_st,stmt->controlParent());
-   where = cur_st;
-   doSizeAllocArray(ar,alce,stmt,RTS1);
-   cur_st=cur_st->lexNext(); // call registration function drarr()
- }
- SET_DVM(idvm);
- where = savest;
- return;
-}
-
-void AllocArrayRegistration( SgStatement *stmt)
-{SgSymbol *p;
- SgStatement *stat;
- SgExpression *size_array,*array_adr,*desc,*heap;
- int rank,type,idvm;
- stat = where; //store value of  where
- idvm = ndvm;
- where = stmt;
- p = stmt->expr(0)->symbol();
- if(!IS_POINTER(p))
-    return;
- 
- if(!stmt->expr(1)->lhs()) {// empty argument list of allocate function call
-      err("Wrong argument list of ALLOCATE function call", 262, stmt);
-      return;
-  }
- if(!stmt->expr(1)->lhs()->rhs()) {// argument list length < 2
-        //err("Wrong argument list of ALLOCATE function call", 262, stmt);
-      return;
-  }
- heap =  stmt->expr(1)->lhs()->rhs()->lhs(); //heap array reference
- if(!heap  || !isSgArrayRefExp(heap) || heap->lhs())
-    return;
- rank =  PointerRank(p);
-
- desc = stmt->expr(1)->lhs()->lhs(); //descriptor array reference
- array_adr =  new SgArrayRefExp(*heap->symbol(),*(stmt->expr(0)));
- size_array = ReverseDim(desc,rank); 
- type = TestType(PointerType(p));
- if(type) {
-    InsertNewStatementAfter(D_RegistrateArray(rank, type, GetAddresMem(array_adr),size_array,stmt->expr(0) ) ,where,where->controlParent());
-    LINE_NUMBER_AFTER(where,where);
- } 
- SET_DVM(idvm);
- where = stat; //restore where
-}
-
-
-void RegistrateAllocArray( stmt_list *alloc_st)
-{SgSymbol *p,*heap;
- SgStatement *stmt,*stat;
- stmt_list *stl;
- SgExpression *size_array,*array_adr,*desc;
- int rank,type,idvm;
- stat = where; //store value of  where
- SET_DVM(ndvm);
- idvm = ndvm = maxdvm+1;
- for (stl=alloc_st; stl; stl=stl->next) {
-    stmt = stl->st;
-    where = stmt;
-    p = stmt->expr(0)->symbol();
-    if(!IS_POINTER(p))
-      continue;
-    heap = HeapForPointer(p);
-    if(!heap)
-      continue;
-    rank =  PointerRank(p);
-    desc = stmt->expr(1)->lhs()->lhs(); //descriptor array reference
-    array_adr =  new SgArrayRefExp(*heap,*(stmt->expr(0)));
-    size_array = ReverseDim(desc,rank); 
-    type = TestType(PointerType(p));
-    if(type)
-      InsertNewStatementAfter(D_RegistrateArray(rank, type, GetAddresMem(array_adr),size_array,stmt->expr(0) ) ,where,where->controlParent());
-    SET_DVM(idvm);
- }
- where = stat; //restore where
-}
-
-
-int isDoVar(SgSymbol *s)
-{
- return(SYMB_ATTR(s->thesymb) & DO_VAR_BIT); 
-}
-
-void SetDoVar(SgSymbol *s)
-{
- SYMB_ATTR(s->thesymb)=SYMB_ATTR(s->thesymb) | DO_VAR_BIT;
-}
-
-void OffDoVar(SgSymbol *s)
-{
- SYMB_ATTR(s->thesymb)=SYMB_ATTR(s->thesymb) & (~ DO_VAR_BIT);
-}
-
-void D_ReplaceDoLab(SgLabel *lab, SgLabel *newlab)
-{D_do_list *dol;
- dol = cur_do;
- while(LABEL_STMTNO(dol->end_lab->thelabel) == LABEL_STMTNO(lab->thelabel)) {
-    dol->end_lab = newlab;
-    dol = dol->next;
- }     
-}
-
-void  DebugVarArrayRef(SgExpression *e,SgStatement *stmt)
-{  SgSymbol *ar;
-  //int ind;
-  SgExpression *el, *ehead, *rme, *ea;
-  //int *h;
-
-  if(!e)
-    return;
-
-  if(isSgVarRefExp(e)) {
-    if(isDoVar(e->symbol())) //do variable is not traced
-        return;
-    if(level_debug == 4)
-      if(e->symbol()->variant()==VARIABLE_NAME && VarType(e->symbol())) //&& e->symbol()->type()->variant() != T_STRING  && e->symbol()->type()->variant() != T_DERIVED_TYPE)
-        InsertNewStatementBefore(D_LoadVar(e,VarType(e->symbol()), ConstRef(0),e),stmt);
-     return;
-  }
-
-  if(isSgArrayRefExp(e)) {     // array element, array section, whole array
-    ea = & (e->copy()); 
-    for(el=e->lhs(); el; el=el->rhs())
-       DebugVarArrayRef(el->lhs(),stmt);
-
-    if(isSgArrayType(e->type())) // array section, whole array
-      return;
-
-    ar = e -> symbol();
-    if(HEADER(ar)) { //distributed array reference
-      //ind = *h;  
-         if((rme=isRemAccessRef(e))){ //is remote data
-            rem_var * rv;
-            rv = (rem_var *)rme->attributeValue(0,REMOTE_VARIABLE);
-            if((rv->ncolon == 0) && (rv->amv == -1 )) 
-              ehead = ConstRef(0);
-            else
-              ehead = GetAddresDVM((rv->amv != 1 ) ? DVM000(rv->index) : HeaderRefInd(ar,rv->index ));
-        } else
-              ehead = GetAddresDVM(HeaderRefInd(ar,1));
-	 // ea = & (e->copy());  
-       DistArrayRef(e,0,stmt);
-       if(level_debug == 4 || level_debug == 2)
-         if(ar->variant()==VARIABLE_NAME && VarType(ar)){
-           if(hpf_ind)
-             InsertNewStatementBefore(D_LoadVar(e,VarType(ar), HPF000(hpf_ind), ea),stmt);
-           else
-             InsertNewStatementBefore(D_LoadVar(e,VarType(ar), ehead, ea),stmt);
-         }
-    } 
-    else 
-      if(level_debug == 4 || level_debug == 2 && IS_DVM_ARRAY(ar)) 
-        if(ar->variant()==VARIABLE_NAME && VarType(ar)){
-             //InsertNewStatementBefore(D_LoadVar(e,VarType(ar), ConstRef(0), ea),stmt);
-          ehead = GetAddresMem(FirstArrayElement(ar));
-          InsertNewStatementBefore(D_LoadVar(e,VarType(ar), ehead, ea),stmt);
-	}
-    return; 
-  }
- 
-  if(isSgFunctionCallExp(e)) {
-                        //if(!e->lhs())
-                        //argument list is absent
-    ReplaceFuncCall(e);
-    for(el=e->lhs(); el; el=el->rhs())
-      DebugArg_VarArrayRef(el,stmt);
-    return;
-  } 
-  if(isSgRecordRefExp(e) && !only_debug){
-     ChangeDistArrayRef(e);
-     return;
-  }
-  DebugVarArrayRef(e->lhs(),stmt); 
-  DebugVarArrayRef(e->rhs(),stmt); 
-  return;
-}
-
-void  DebugVarArrayRef_Left(SgExpression *e,SgStatement *stmt,SgStatement *stcur)
-{ SgExpression *el,*ea;
-  SgSymbol *ar;
- 
-  if(isSgVarRefExp(e)) {  //variable
-    if(isDoVar(e->symbol())) //do variable is not traced
-        return;
-    if(level_debug > 2)
-      /*if(e->symbol()->type()->variant() != T_STRING &&  e->symbol()->type()->variant() != T_COMPLEX &&  e->symbol()->type()->variant() != T_DCOMPLEX) { */
-      //if(e->symbol()->type()->variant() != T_STRING) {
-      //variant of scalar variable reference, that has type T_STRING, is  ARRAY_REF 
-      if(e->symbol()->variant()==VARIABLE_NAME && VarType(e->symbol())) {
-	//InsertNewStatementBefore(D_PrStorVar(e,VarType(e->symbol()), ConstRef(0), e),stmt); /*28.03.03*/
-        InsertNewStatementAfter (D_PrStorVar(e,VarType(e->symbol()), ConstRef(0), e),stcur,stmt->controlParent());
-        InsertNewStatementAfter (D_StorVar(),stmt,stmt->controlParent());
-        InsertNewStatementAfter (Addres(e),stmt,stmt->controlParent()); 
-    }                                     //inserting before and after assignment statement
-    
-    //stmt->insertStmtAfter (*D_StorVar(e,VarType(e->symbol()), new SgValueExp(0))); 
-    //InsertNewStatementBefore(D_StorVar(e,VarType(e->symbol()), new SgValueExp(0)),stmt);
-     return;
-  }
- 
-  if(isSgArrayRefExp(e)) {  // array element, array section, whole array
-    ea = &e->copy();
-    for(el=e->lhs(); el; el=el->rhs()) //looking through the subscript list
-       DebugVarArrayRef(el->lhs(),stmt);
-    if(isSgArrayType(e->type())) // array section, whole array
-      return;   
-    ar = e->symbol(); //array symbol
-    if(HEADER(ar)) {
-      //ea = &e->copy();
-      DistArrayRef(e,1,stmt); // 1 - modified variable
-      /*if(ar->variant()==VARIABLE_NAME && e->type()->variant() != T_STRING &&  e->type()->variant() != T_COMPLEX &&  e->type()->variant() != T_DCOMPLEX){*/
-      //!!! variant of scalar variable reference, that has type T_STRING, is  ARRAY_REF 
-      if(ar->variant()==VARIABLE_NAME  && VarType(ar)) {
-      InsertNewStatementAfter(D_PrStorVar(e,VarType(ar),GetAddresDVM(HeaderRefInd(ar,1)), ea),stcur,stmt->controlParent());
-      InsertNewStatementAfter(D_StorVar(),stmt,stmt->controlParent());
-      }                                  //inserting before and after assignment statement
-    }
-    else
-      if(level_debug > 2 || level_debug > 0 && IS_DVM_ARRAY(ar)) 
-        if(ar->variant()==VARIABLE_NAME && VarType(ar)) {
-          InsertNewStatementAfter(D_PrStorVar(e,VarType(ar),GetAddresMem(FirstArrayElement(ar)), ea),stcur,stmt->controlParent());
-          InsertNewStatementAfter(D_StorVar(),stmt,stmt->controlParent());
-        }                                 //inserting before and after assignment statement
-      
-  
-    return;
-  }
-   
- if(e->variant()==ARRAY_OP){ //substring
-      DebugVarArrayRef(e->lhs()->lhs(),stmt);
-      DebugVarArrayRef(e->rhs(),stmt);
-      return;
-  }   
- if(!only_debug) ChangeDistArrayRef_Left(e);        
-  return;
-}
-
-void CheckVarArrayRef(SgExpression *e, SgStatement *stmt, SgExpression *epr)
-{
-  if(isSgVarRefExp(e) || isSgArrayRefExp(e) ) {  //variable
-
-      if(e->symbol()->type()->variant() != T_STRING) {
-        InsertNewStatementAfter(D_PrStorVar(e,VarType(e->symbol()), ConstRef(0), epr),stmt,stmt->controlParent());
-        InsertNewStatementAfter (D_StorVar(),cur_st,stmt->controlParent());
-
-        //InsertNewStatementAfter (Addres(e),stmt,stmt->controlParent()); 
-    }                                     //inserting before and after assignment statement
-    
-     return;
-  }
-  //f(isSgArrayRefExp(e))  return;
-  return;
-}
-
-void  DebugArg_VarArrayRef(SgExpression *ele,SgStatement *stmt)
-{  SgSymbol *ar;
-  SgExpression *el, *e;
- e = ele->lhs();
- if(!e)
-    return;
- if(isSgKeywordArgExp(e))
-   e = e->rhs();
-  if(isSgVarRefExp(e)) {
-    if(isDoVar(e->symbol())) //do variable is not traced
-        return;
-    if(e->symbol()->variant()!=VARIABLE_NAME) //argument is function name
-      return;
-  //if((stmt->variant() == LOGIF_NODE) || (stmt->variant() == IF_NODE) || (stmt->variant() == ELSEIF_NODE) || (stmt->variant() == ARITHIF_NODE))
-  //      return;  
-  //  InsertNewStatementBefore(D_InOutVar(e,VarType(e->symbol()), new SgValueExp(0)),stmt); 
-  //  InsertNewStatementAfter (D_InOutVar(e,VarType(e->symbol()), new SgValueExp(0)),stmt,stmt->controlParent()); 
-    
-  return;
-   } 
-  if(e->variant()==ARRAY_OP){ //substring
-      DebugVarArrayRef(e->lhs()->lhs(),stmt);
-      DebugVarArrayRef(e->rhs(),stmt);
-  }
- if(isSgArrayRefExp(e)) {
-   if(!(e->lhs())) // argument is whole array (array name)
-       return;
-   el=e->lhs()->lhs();  //first subscript of argument
-   //testing: is first subscript of ArrayRef a POINTER 
-   if((isSgVarRefExp(el) || isSgArrayRefExp(el)) && IS_POINTER(el->symbol())){
-     DebugVarArrayRef(el->lhs(),stmt);
-     if(!only_debug) {   
-      if(!strcmp(e->symbol()->identifier(),"heap") || (e->symbol()->attributes() & HEAP_BIT))
-          is_heap_ref = 1;
-        else
-          Error("Illegal POINTER reference: '%s'", el->symbol()->identifier(),138,stmt); 
-        if(e->lhs()->rhs())  //there are other subscripts
-          Error("Illegal POINTER reference: '%s'", el->symbol()->identifier(),138,stmt);
-        if(HEADER(e->symbol()))
-          Error("Illegal POINTER reference: '%s'", el->symbol()->identifier(),138,stmt);
-
-        e->setSymbol(*heapdvm); //replace ArrayRef: A(P)=>HEAP00(P) or A(P(I))=>HEAP00(P(I))
-            //ele->setLhs(PointerHeaderRef(el,1));  
-                          //replace  ArrayRef by PointerRef: A(P)=>P(1) orA(P(I))=>P(1,I)  
-     }
-  /*
-     else  {  //only_debug 
-      if(!strcmp(e->symbol()->identifier(),"heap") || (e->symbol()->attributes() & HEAP_BIT))
-         heap_point = HeapList(heap_point,e->symbol(),el->symbol());
-     }    
-   */
-     return;
-   }    
-
-   for(el=e->lhs(); el; el=el->rhs())
-       DebugVarArrayRef(el->lhs(),stmt);
-   ar = e->symbol();
-   if(HEADER(ar)) {
-      DistArrayRef(e,0,stmt);
-     // if((stmt->variant() == LOGIF_NODE) || (stmt->variant() == IF_NODE) || (stmt->variant() == ELSEIF_NODE) || (stmt->variant() == ARITHIF_NODE))
-     //   return; 
-     //!!! insert test for remote data as in DebugVarArrayRef 
-    //  InsertNewStatementBefore(D_InOutVar(e,VarType(ar), HeaderRef(ar)),stmt);
-    //  InsertNewStatementAfter (D_InOutVar(e,VarType(ar), HeaderRef(ar)),stmt,stmt->controlParent()); 
-   }
-     // else { 
-     //  if((stmt->variant() == LOGIF_NODE) || (stmt->variant() == IF_NODE) || (stmt->variant() == ELSEIF_NODE) || (stmt->variant() == ARITHIF_NODE))
-     //     return;  
-     // InsertNewStatementBefore(D_InOutVar(e,VarType(ar), new SgValueExp(0)),stmt); 
-     // InsertNewStatementAfter (D_InOutVar(e,VarType(ar), new SgValueExp(0)),stmt,stmt->controlParent());
-     // }   
-   return;
- } 
-  DebugVarArrayRef(e,stmt);
-  return;
-}
-
-void DebugExpression(SgExpression *e, SgStatement *stmt)
-{
-    SgStatement *stif,*st1; 
-    SgExpression *el;             
-    st1=stmt->lexPrev(); 
-    if(isSgCallStmt(stmt))
-        // looking through the arguments list
-        for(el=stmt->expr(0); el; el=el->rhs())            
-            DebugArg_VarArrayRef(el,stmt);   // argument        
-    else  
-        DebugVarArrayRef(e,stmt);
-    st1 = st1->lexNext() ;
-    if(st1 != stmt){
-        if(dbg_if_regim){
-            InsertNewStatementBefore(stif=CreateIfThenConstr(DebugIfCondition(), NULL),st1);  
-            TransferBlockIntoIfConstr(stif,stif->lexNext()->lexNext(),stmt);
-	}
-        LINE_NUMBER_BEFORE(stmt,st1);
-    }	
-}
-
-void DebugAssignStatement(SgStatement *stmt)
-{
-    SgStatement *stcur,  *after_st = NULL, *stmt1;
-    if(dbg_if_regim)                        
-        after_st=ReplaceStmt_By_IfThenConstr(stmt, DebugIfCondition());
-
-    LINE_NUMBER_STL_BEFORE(stcur,stmt,stmt); 
-    DebugVarArrayRef_Left(stmt->expr(0),stmt,stcur);   // left part
-    DebugVarArrayRef(stmt->expr(1),stmt);   // right part 
-
-    if(dbg_if_regim){
-        stmt1 = stmt->lexNext();
-        if(stmt1->variant() != CONTROL_END) {
-            TransferStmtAfter(stmt1,after_st);
-            ReplaceStmt_By_IfThenConstr(stmt1, DebugIfCondition());
-            while( stmt->lexNext()->variant() != CONTROL_END ) 
-                TransferStmtAfter(stmt->lexNext(),stmt1);
-        }
-        TransferStmtAfter(stmt,after_st);
-        cur_st = stmt1->lexNext();
-    }
-}
-
-void  DebugLoop(SgStatement *stmt)
-{int No;
- SetDoVar(stmt->symbol());
- LINE_NUMBER_BEFORE(stmt,stmt);
- DebugVarArrayRef(stmt->expr(0),stmt);
- DebugVarArrayRef(stmt->expr(1),stmt); 
- No =++Dloop_No; 
- AddAttrLoopNumber(No,stmt);
- InsertNewStatementBefore(D_Begsl(No),stmt); 
-
- if(dbg_if_regim) {
-   SgStatement *stnew,*if_stmt;
-   stnew = D_Iter(stmt->symbol(),LoopVarType(stmt->symbol(),stmt));
-   if_stmt = new SgLogIfStmt(*DebugIfCondition(),*stnew);
-   InsertNewStatementAfter(if_stmt,stmt,stmt);
-   (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF 
- } else
-   InsertNewStatementAfter(D_Iter(stmt->symbol(),LoopVarType(stmt->symbol(),stmt)),stmt,stmt);
-
- /*
- SetDoVar(stmt->symbol());
- InsertNewStatementBefore(D_Lnumb(stmt->lineNumber()),stmt);
- No =++Dloop_No; 
- AddAttrLoopNumber(No,stmt);
- InsertNewStatementBefore(D_Begsl(No),stmt); 
- InsertNewStatementAfter(D_Iter(stmt->symbol()),stmt,stmt);
- */
-
- /**
- // generating Logical IF statement:
-       // begin_lab  IF (dosl(No,Init,Last,Step) .EQ. 0) GO TO end_lab
-       // and inserting it before  loop 
-       stn = stmt->lexPrev();
-       LINE_NUMBER_AFTER(stmt,stn);
-       begin_lab = GetLabel();
-       stn->lexNext()-> setLabel(*begin_lab); 
-       end_lab   = GetLabel();
-       dopl = (dvm_debug && dbg_if_regim) ? doPLmb(iplp) : doLoop(iplp);
-       if_stmt = new SgLogIfStmt(SgEqOp(*dopl , c0), *new SgGotoStmt(*end_lab));
- 
-          cur_st->insertStmtAfter(*if_stmt);
-     
-          (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF
-                                                            // (error Sage)
- **/      
- if(dbg_if_regim)  
- {SgStatement *stwhile;
-  SgForStmt *stdo;
- int iout;
- stdo = (SgForStmt *) stmt;
- iout=ndvm; 
- doAssignStmtBefore(stdo->start(),stmt);
- doAssignStmtBefore(stdo->end(), stmt);
- doAssignStmtBefore((stdo->step()) ? stdo->step() : new SgValueExp(1),stmt);
- stwhile = new SgWhileStmt(WHILE_NODE);
- stwhile->setExpression(0,SgEqOp(*doSL(No,iout) , *new SgValueExp(1)) );//0->1
- stmt->insertStmtBefore(*stwhile); 
- stdo->setStart(*DVM000(iout));   
- stdo->setEnd(*DVM000(iout+1));   
- }  
-  
-}
-
-void  DebugTaskRegion(SgStatement *stmt)
-{int ino;
- taskreg_No =++Dloop_No;
- //AddAttrLoopNumber(No,stmt);
- LINE_NUMBER_AFTER(stmt,stmt); 
- ino = ndvm; 
- doAssignStmtAfter(new SgValueExp(taskreg_No)); FREE_DVM(1);
- InsertNewStatementAfter(D_Begtr(ino),cur_st,stmt->controlParent()); 
-}
-
-void CloseTaskRegion(SgStatement *tr_st,SgStatement *stmt)
-{
- if(!tr_st) return;
- LINE_NUMBER_AFTER(stmt,stmt); 
- InsertNewStatementAfter( D_Endl(taskreg_No,tr_st->lineNumber()),cur_st,stmt->controlParent()); 
-}
-
-void  DebugParLoop(SgStatement *stmt,int rank, int iinit)
-{
- pardo_No = ++Dloop_No;
- LINE_NUMBER_AFTER_WITH_CP(par_do,stmt,par_do->controlParent());   
- InsertNewStatementAfter(D_Begpl(pardo_No,rank,iinit),cur_st,cur_st->controlParent());
-           
-}
-
-SgStatement *CloseLoop(SgStatement *stmt)
-{//generates and insertes debugging statements for closing all sequential loops of nest:
- // call dendl(...)
- //stmt is last statement of loop nest (DO statements with the same label)
- //returns last statement of outer most sequential loop  of resturtured loop nest
- SgStatement *stat, *parent, *lst, *dst, *est;
- //SgForStmt *do_st;
- int No,Ni;
-
- parent=stmt->controlParent();
- cur_st = lst = stmt;
- if(parent->symbol())
-   OffDoVar(parent->symbol());
- if(parent->variant()==WHILE_NODE) {
-   if(stmt->lineNumber()) {
-     LINE_NUMBER_AFTER_WITH_CP(stmt,cur_st,parent->controlParent());
-   }
-   seq_loop_nest=1;
-   stat = new SgStatement(CONT_STAT);
-   InsertNewStatementAfter(stat,cur_st,parent->controlParent());
- }
- else if((No=LoopNumber(parent)) != 0){
-   if(stmt->lineNumber()) {
-     LINE_NUMBER_AFTER_WITH_CP(stmt,cur_st,parent->controlParent());
-   }
-   seq_loop_nest=1;
-   stat = D_Endl(No,parent->lineNumber());  
-   InsertNewStatementAfter(stat,cur_st,parent->controlParent());
-   dst = cur_st; 
-   est = NULL;
-   if( perf_analysis && (Ni = IntervalNumber(parent)) != 0){
-     close_loop_interval = close_loop_interval - 1;
-     InsertNewStatementAfter(St_Enloop(Ni,parent->lineNumber()),cur_st,parent->controlParent());
-     est = cur_st;
-   }
-
-   ReplaceGoToInsideLoop(parent,lst,dst,est);
-
-   if(dbg_if_regim){
-     SgWhileStmt *stwhile;
-     stwhile=(SgWhileStmt *) parent->lexPrev();
-     parent->extractStmt();
-     stwhile->replaceBody(*parent);
-     //cur_st=stmt->lexNext(); //ENDDO
-     lst=stmt->lexNext(); //ENDDO
-     parent=stwhile;
-   }  
- }
- if(!stmt->label()) //DO construct without label
-   return(lst);
- //looking through the loop nest with the same label
- parent = parent->controlParent();
- while((parent->variant()==FOR_NODE || parent->variant()==WHILE_NODE) && BIF_LABEL_USE(parent->thebif)  && ( LABEL_STMTNO(BIF_LABEL_USE(parent->thebif))==LABEL_STMTNO(stmt->label()->thelabel)))
-//while((do_st=isSgForStmt(parent)) && do_st->endOfLoop() && ( LABEL_STMTNO(do_st->endOfLoop()->thelabel)==LABEL_STMTNO(stmt->label()->thelabel)))
- { 
-   if(parent->variant()==WHILE_NODE) {
-     seq_loop_nest=1;
-     cur_st=ReplaceDoLabel(cur_st,GetLabel());
-     lst = cur_st;
-     stat = new SgStatement(CONT_STAT);
-     InsertNewStatementAfter(stat,cur_st,parent->controlParent());
-     parent = parent->controlParent();
-     continue;
-   }
-   else if((No=LoopNumber(parent)) != 0){
-     seq_loop_nest=1;
-     OffDoVar(parent->symbol());
-     ReplaceDoLabel(cur_st,GetLabel());
-     lst = cur_st->lexNext();
-     stat = D_Endl(No,parent->lineNumber()); 
-     dst = lst;
-     InsertNewStatementAfter(stat,cur_st->lexNext(),parent->controlParent());
-     dst = dst->lexNext();
-     est = NULL;
-     if(perf_analysis && (Ni=IntervalNumber(parent)) != 0){
-       close_loop_interval = close_loop_interval - 1;
-       InsertNewStatementAfter(St_Enloop(Ni,parent->lineNumber()),cur_st,parent->controlParent());
-       est = cur_st;
-     }
-     ReplaceGoToInsideLoop(parent,lst,dst,est);
-
-   }
-   else
-     break;
-
-   if(dbg_if_regim){
-     SgWhileStmt *stwhile;
-     stwhile=(SgWhileStmt *) parent->lexPrev();
-     parent->extractStmt();
-     stwhile->replaceBody(*parent);
-     //cur_st=stmt->lexNext(); //ENDDO
-     lst=stmt->lexNext(); //ENDDO
-     parent=stwhile;
-   }  
-   parent = parent->controlParent();
- }
-
- /*
- for(parent = parent->controlParent();
-  ((do_st=isSgForStmt(parent)) && LABEL_STMTNO(do_st->endOfLoop()->thelabel)==LABEL_STMTNO(stmt->label()->thelabel));
-                  parent = parent->controlParent()) {
-   OffDoVar(parent->symbol());
-   if(No=LoopNumber(parent)){
-     ReplaceDoLabel(cur_st,GetLabel());
-     stat = D_Endl(No,parent->lineNumber());
-     InsertNewStatementAfter(stat,cur_st->lexNext(),parent->controlParent());
-   }
- } 
- */ 
- 
- return (lst); 
-}
-
-void FreeDoList()
-{int Numlab;
- Numlab =LABEL_STMTNO(cur_do->end_lab->thelabel);
- while(cur_do && LABEL_STMTNO(cur_do->end_lab->thelabel) == Numlab)
-   D_DelFromDoList ();   
-}
-
-void OpenParLoop(SgStatement *dost)
-{SgStatement *st;
- st = cur_st;//save cur_st
- SetDoVar(dost->symbol());
- InsertNewStatementAfter(D_Iter(dost->symbol(),LoopVarType(dost->symbol(),dost)),dost,dost);
- cur_st = st; //resave cur_st
-}
-
-void OpenParLoop_Inter(SgStatement *dost, int ind, int indtp, SgSymbol *do_var[],int ndo)
-{SgStatement *st;
- int i;
- st = cur_st;//save cur_st
- cur_st = dost;
-
- if(dbg_if_regim) {
-   SgStatement *stnew;
-   stnew = CreateIfThenConstr(DebugIfCondition(),D_Iter_I(ind,indtp));
-   InsertNewStatementAfter(stnew,dost,dost);
-   for(i=0; i<ndo; i++)
-     doAssignTo_After(DVM000(ind+i),GetAddres(do_var[i]));
-   cur_st = st; //resave cur_st
-   return;
- } 
-
- for(i=0; i<ndo; i++)
-   doAssignTo_After(DVM000(ind+i),GetAddres(do_var[i]));
- InsertNewStatementAfter(D_Iter_I(ind,indtp),cur_st,dost);
- 
- cur_st = st; //resave cur_st
-}
-
-void CloseParLoop(SgStatement *dostmt,SgStatement *stmt,SgStatement *end_stmt)
-{SgStatement *st;
- SgForStmt *do_st;
- SgLabel *do_lab;
- int end_line_num = end_stmt->lineNumber();
- if (end_line_num)
- {  
-    LINE_NUMBER_AFTER_WITH_CP(end_stmt, stmt, par_do->controlParent());
- }
- 
- InsertNewStatementAfter( D_Endl(pardo_No,par_do->lineNumber()),cur_st,par_do->controlParent());
- OffDoVar(dostmt->symbol());
- do_lab=((SgForStmt *)dostmt)->endOfLoop();
- if(!do_lab) //DO statement 'dostmt' without label
-     return;
- //looking through the loop nest with the same label
- for(st = dostmt->controlParent();
-  ((do_st=isSgForStmt(st)) && do_st->endOfLoop() && LABEL_STMTNO(do_st->endOfLoop()->thelabel) == LABEL_STMTNO(do_lab->thelabel));
-                  st = st->controlParent()) 
-   OffDoVar(st->symbol());
- //DeleteGoToFromList(par_do);
-}
-
-void  CloseDoInParLoop(SgStatement *end_stmt)
-{ //on debug regim end_stmt may not be logical IF 
-  SgStatement *lst; 
-  if(LoopNumber(end_stmt->controlParent()) || end_stmt->controlParent()->variant()==WHILE_NODE) {
-                    //most inner loop in parallel loop nest is not parallel
-    seq_loop_nest=0;
-    lst=CloseLoop(end_stmt); //close all inner non-parallel loops
-    //ReplaceDoNestLabel_Above(cur_st,cur_st->lexPrev()->controlParent(),GetLabel());
-    if(seq_loop_nest)
-      ReplaceParDoNestLabel(cur_st,lst->controlParent(),GetLabel());
-                       //replace label and insert CONTINUE with new label for parallel nest
-    cur_st = cur_st->lexNext(); //last inserted statement == last statement of parallel nest
-  }  
-}
-
-void AddAttrLoopNumber(int No,SgStatement *stmt)
-{int *loop_No = new int;
- *loop_No = No;
- stmt->addAttribute(LOOP_NUMBER, (void*) loop_No, sizeof(int));
-}
-
-int LoopNumber(SgStatement *stmt)
-{int *no;
- no=(int*)(stmt)->attributeValue(0,LOOP_NUMBER);
- if(no)
-   return(*no);
- else
-   return(0);
-}
-
-int hasGoToIn(SgStatement *parent,SgLabel *lab_after)
-{ //stmt_list *gotol;
-
- for (; goto_list && goto_list->st->lineNumber() > parent->lineNumber() ; goto_list = delFromStmtList(goto_list))
-   if( ToThisLabel(goto_list->st,lab_after))
-     return(1);
- return(0);
-}
-
-int ToThisLabel(SgStatement *gost, SgLabel *lab_after)
-{
-  return (LABEL_STMTNO(((SgGotoStmt *)gost)->branchLabel()->thelabel) == LABEL_STMTNO(lab_after->thelabel) );
-}
-
-/*
-void  ReplaceGoToLabelInsideLoop(SgStatement *parent,SgLabel *lab_after,SgLabel *new_lab)
-
-{ for (; goto_list && goto_list->st->lineNumber() > parent->lineNumber() ; goto_list = delFromStmtList(goto_list))
-   if( ToThisLabel(goto_list->st,lab_after))      
-     NODE_LABEL(goto_list->st->expr(2)->thellnd)= new_lab->thelabel;
-                                                   //replace the label in GOTO statement
-}
-*/
-
-void  ReplaceGoToLabelInsideLoop(SgStatement *parent,SgStatement *lst, SgLabel *lab_after)
-{ printf("replace label\n");
- if(lab_after && hasGoToIn(parent,lab_after)){
- SgLabel *new_lab;
- new_lab = GetLabel();  
- (lst->lexNext())->setLabel(*new_lab);
- for (; goto_list && goto_list->st->lineNumber() > parent->lineNumber() ; goto_list = delFromStmtList(goto_list))
-   if( ToThisLabel(goto_list->st,lab_after))      
-     NODE_LABEL(goto_list->st->expr(2)->thellnd)= new_lab->thelabel;
-                                                   //replace the label in GOTO statement
- }
-}
-
-void  ReplaceGoToInsideLoop(SgStatement *dost,SgStatement *endst, SgStatement *dst, SgStatement *est)
-{ //dost - do-statement, endst - last statement of do-loop   
- stmt_list *gol, *prevl;
- SgLabel *golab;
- int branch_line_num; //line number of statement to that goto points
- 
- for (gol= goto_list, prevl = NULL; gol && gol->st->lineNumber() > dost->lineNumber() ; gol = gol->next)  
- { 
-   if(gol->st->variant() == ARITHIF_NODE)
-   {   ReplaceArithIF(gol); goto DELETE_; }
-   if(gol->st->variant() == COMGOTO_NODE)
-   {   ReplaceComputedGoTo(gol); goto DELETE_; }
-
-   if(gol->st->variant() == GOTO_NODE)
-   {
-      golab=((SgGotoStmt *)(gol->st))->branchLabel();      
-      branch_line_num=LineNumberOfStmtWithLabel(golab);
-   }   else
-      branch_line_num = 0;   //for case gol->st is RETURN or EXIT
-   if(branch_line_num <= dost->lineNumber() || branch_line_num > endst->lineNumber()) //label outside loop
-   { //inserting statements for end of loop (call of dendl,eloop) before goto 
-     InsertStmtsBeforeGoTo(gol->st,dst,est);
-     if(gol->st->variant()!=EXIT_STMT)
-     { prevl = gol;
-       continue;
-     }
-   }
-DELETE_:
-    {//deleting current element (gol) from goto_list
-     if(prevl)
-       prevl->next = gol->next;
-     else
-       goto_list = goto_list->next; 
-    }
- }  
-}
-
-void AddDebugGotoAttribute(SgStatement *gotost,SgStatement *lnumst)
-{  SgStatement **dbgst = new (SgStatement *);
-    *dbgst = lnumst;
-    gotost->addAttribute(DEBUG_GOTO, (void *) dbgst, sizeof(SgStatement *)); 
-} 
-
-
-void InsertStmtsBeforeGoTo(SgStatement *gotost, SgStatement *dst, SgStatement *est)
-{SgStatement *lnumst, *save;
- SgStatement **st;
- save=cur_st;
- if(!(st=DEBUG_STMTS_FOR_GOTO(gotost)))  //goto has not attribute (LINE_NUMBER is not yet inserted )
- {  
-    LINE_NUMBER_STL_BEFORE(lnumst,gotost,gotost);
-    AddDebugGotoAttribute(gotost,lnumst); 
-    cur_st = lnumst;
- } else
-    cur_st = *st;
-
- if(dst)
-    InsertNewStatementAfter( &(dst->copy()),cur_st,cur_st->controlParent());
-  
- if(est)
-    InsertNewStatementAfter( &(est->copy()),cur_st,cur_st->controlParent());
-  
- *DEBUG_STMTS_FOR_GOTO(gotost) = cur_st;
- cur_st = save;
-} 
-
-SgStatement *StmtWithLabel(SgLabel *lab)
-{return (BfndMapping(LABEL_BODY(lab->thelabel)));
-}
-
-int LineNumberOfStmtWithLabel(SgLabel *lab)
-{return (BIF_LINE(LABEL_BODY(lab->thelabel)));
-}
-
-void DeleteGoToFromList(SgStatement *stmt)
-{
- for(; goto_list && goto_list->st->lineNumber() > stmt->lineNumber() ; goto_list = delFromStmtList(goto_list)) //deleting from list goto statements appearing inside parallel loop
-   ;
-}
-/***************************************************************\
- *         Performance analyzing  mode functions               *
-\***************************************************************/                        
-int OpenInterval(SgStatement *stmt)
-{
-  interval_list *fr = new interval_list;
-  fr->prev = NULL;
-  fr->No = ++nfrag;
-  fr->begin_st = stmt;
-  if(!St_frag) 
-    St_frag = fr;
-  else {
-    fr->prev = St_frag;
-    St_frag = fr;
-  } 
-  return (nfrag);
-}
-
-int CloseInterval()
-{int nline;
-  if(!St_frag) 
-    return(0); 
-  //DeleteGoToFromList( St_frag->begin_st);
-  nline = St_frag->begin_st->lineNumber();
-  St_frag = St_frag->prev;
-  return (nline);
-  
-}
-
-void ExitInterval(SgStatement *stmt)
-{
-   interval_list *current_interval = St_frag;
-   SgExpression *el;                                
-   LINE_NUMBER_AFTER(stmt,stmt);
-   for(el=stmt->expr(0); el; el=el->rhs())
-   {               
-      if(ExpCompare(el->lhs(),current_interval->begin_st->expr(0)))
-      {
-         InsertNewStatementAfter(St_Einter(current_interval->No,current_interval->begin_st->lineNumber()), cur_st, stmt->controlParent());            
-         current_interval = current_interval->prev; 
-      }
-      else
-      {
-         err("Illegal interval number", 635, stmt);
-         break;
-      }
-   }
-}
-
-void OverLoopAnalyse(SgStatement *func)
-{SgStatement *st;
-//St_loop_first = NULL;
-//St_loop_last  = NULL;
-  for(st=par_do->controlParent(); st!=func; st=st->controlParent()) {
-    if(st->variant() == FOR_NODE || st->variant() == WHILE_NODE )
-       SeqLoopBegin(st);
-    else
-       continue;   
-  }
-  //St_loop_first->prev = St_frag;
-  //St_frag = St_loop_last;
-  //close_loop_interval = 1;
-}
-
-void   FormLoopIntList(SgStatement *st)
-{
-  interval_list *fr = new interval_list;
-  fr->prev = NULL;
-  fr->No = ++nfrag;
-  fr->begin_st = st;
-  if(!St_loop_last){ 
-    St_loop_last  = fr;
-    St_loop_first = fr;
-  }
-  else {
-     St_loop_first->prev = fr;
-     St_loop_first = fr;
-  } 
-}
-
-int IntervalNumber(SgStatement *stmt)
-{int *no;
- no=(int*)(stmt)->attributeValue(0,LOOP_INTERVAL_NUMBER);
- if(no)
-   return(*no);
- else
-   return(0);
-}
-
-void   SeqLoopBegin(SgStatement *st)
-{
-  if( !IntervalNumber(st)){
-     AddAttrIntervalNumber(st);
-     close_loop_interval = close_loop_interval + 1;
-     LINE_NUMBER_BEFORE(st,st);
-     InsertNewStatementBefore(St_Bsloop(nfrag),st);
-  }   
-}
-
-void AddAttrIntervalNumber(SgStatement *stmt)
-{int *int_No = new int;
- *int_No = ++nfrag;
- stmt->addAttribute(LOOP_INTERVAL_NUMBER, (void*) int_No, sizeof(int));
-}
-
-SgStatement *SeqLoopEnd(SgStatement *end_stmt,SgStatement *stmt)
-{int Ni,ind;
- SgStatement *parent,*lst, *est; 
- //SgLabel *lab_after;
-  parent = end_stmt->controlParent();
-  cur_st = lst = stmt; 
-  //lab_after =  stmt->lexNext()->lineNumber() ? stmt->lexNext()->label() :  stmt->lexNext()->lexNext()->label(); //there is (not) inserted CONTINUE statement by ReplaceDoNestLabel_Above
-  if( (Ni = IntervalNumber(parent)) != 0){
-    close_loop_interval = close_loop_interval - 1;
-    InsertNewStatementAfter(St_Enloop(Ni,parent->lineNumber()),stmt,parent->controlParent());
-    est = cur_st;
-    //ReplaceGoToLabelInsideLoop(parent,lst,lab_after);
-    ReplaceGoToInsideLoop(parent,end_stmt,NULL,est);   
-  }
- else
-   InsertNewStatementAfter(new SgStatement(CONT_STAT),stmt,parent->controlParent());
-
- if(!end_stmt->label()) // ENDDO is end of DO constuct
-   return(lst);
- parent = parent->controlParent();
- while((parent->variant()==FOR_NODE || parent->variant()==WHILE_NODE)
-    && BIF_LABEL_USE(parent->thebif)
-    && ( LABEL_STMTNO(BIF_LABEL_USE(parent->thebif))==LABEL_STMTNO(end_stmt->label()->thelabel))) {
-
-   if(parent->variant()==WHILE_NODE) {
-     cur_st=ReplaceDoLabel(cur_st,GetLabel());
-     lst = cur_st;
-     InsertNewStatementAfter(new SgStatement(CONT_STAT),cur_st,parent->controlParent());
-     parent = parent->controlParent();
-     continue;
-   }
-  
-   else if((Ni=IntervalNumber(parent)) != 0){
-     close_loop_interval = close_loop_interval - 1;
-     ReplaceDoLabel(cur_st,GetLabel());
-     lst = cur_st->lexNext();
-     InsertNewStatementAfter(St_Enloop(Ni,parent->lineNumber()),lst, parent->controlParent());
-     est = cur_st;
-     ReplaceGoToInsideLoop(parent,lst,NULL,est);
-   }
-   else
-     break;
-  parent = parent->controlParent();
- }
- return (lst);
-}
-
-SgExpression *Value(SgExpression *e)
-{int val = FICT_INT;
- return(e ? e : new SgValueExp(val));
-}
-
-SgExpression *Value_F95(SgExpression *e)
-{
- if(!e)
-    return(ConstRef_F95(FICT_INT)); 
- else if(e && e->variant()==INT_VAL)  
-    return(ConstRef_F95(e->valueInteger()));
- else
-    return(TypeFunction(SgTypeInt(),e,len_DvmType ? new SgValueExp(len_DvmType) : NULL));   
- 
-}
-
-void  SeqLoopEndInParLoop(SgStatement *end_stmt,SgStatement *stmt)
-{ // closing sequential loop intervals in parallel loop nest
-  //and restructuring loop nest
-  SgStatement *lst; 
-  if(IntervalNumber(end_stmt->controlParent()) || end_stmt->controlParent()->variant()==WHILE_NODE) {
-                    //most inner loop in parallel loop nest is not parallel
-    lst=SeqLoopEnd(end_stmt,stmt); //close all inner non-parallel loop intervals
-    ReplaceDoNestLabel_Above(cur_st,lst->controlParent(),GetLabel());
-                        //replace label and insert CONTINUE with new label for parallel nest
-    cur_st = cur_st->lexNext(); //last inserted statement == last statement of parallel nest
-  }  
-}
-
-void  SkipParLoopNest(SgStatement *stmt)
-{ SgExpression *dovar;
-  int i,nloop;
-  SgStatement *st,*stl;
-  stl = stmt;
-  i = nloop = 0;
-  // looking through the do_variables list
-  for(dovar=stmt->expr(2); dovar; dovar=dovar->rhs())
-        nloop++;
-  // looking through the loop nest 
-  for(st=par_do; i<nloop && isSgForStmt(st); st=st->lexNext(),i++)
-     stl = st; 
-  cur_st = stl;
-}
-
-heap_pointer_list *HeapList(heap_pointer_list *heap_point, SgSymbol *sheap,SgSymbol *sp)
-{ heap_pointer_list *l;
-  if(!heap_point) {
-     heap_point = new heap_pointer_list;
-     heap_point->symb_p = sp;
-     heap_point->symb_heap = sheap;
-     heap_point->next = NULL;
-  } else {
-     for(l=heap_point; l; l=l->next)
-        if(l->symb_p == sp)
-           return(heap_point);       
-     l = new heap_pointer_list;
-     l->symb_p = sp;
-     l->symb_heap = sheap;
-     l->next = heap_point;
-     heap_point = l;
-  }
-  return(heap_point);
-}
-
-SgSymbol *HeapForPointer(SgSymbol *p)
-{heap_pointer_list *l;
- SgSymbol *heap = NULL;
-  for(l=heap_point; l; l=l->next)
-    if(l->symb_p == p){
-          heap = l->symb_heap;
-          break;
-    }
- return(heap);
-}
-
-SgStatement *Check(SgStatement *stmt)
-{ SgExpression *cl, *vl, *en, *esym,*eop;
- SgSymbol *s;
- //int level;
-  cl = stmt->expr(1); //control list
-  vl = stmt->expr(0); //variable list
-  en = cl ? cl->lhs() : new SgValueExp(stmt->lineNumber());
-  en = (en->rhs()) ? en->rhs() : en; // variant is KEYWORD_ARG
-  LINE_NUMBER_NEXP_AFTER(en,stmt,stmt->controlParent());
-  //for(; cl; cl=cl->rhs())
-
-  for(; vl; vl=vl->rhs()) {
-    s = vl->lhs()->symbol();
-    eop = vl->lhs();
-    if(s->type()->variant() == T_ARRAY && eop->type()->variant() == T_ARRAY) { //!!!calculating SUMMA
-      if(!isSgArrayRefExp(eop) || eop->lhs()) {
-	Error("Illegal argument: %s",s->identifier(),334,stmt);
-        continue;
-      }
-       if(!check_sum) 
-           check_sum = CheckSummaSymbol();
-       eop = new SgVarRefExp(check_sum);
-       if(HEADER(s)){ 
-	 doAssignStmtAfter(SummaOfDistrArray(HeaderRef(s), eop));
-         FREE_DVM(1);
-       }
-       else {
-         SgExpression *size_array;
-         SgStatement *save_st;
-         int ind;
-         ind = ndvm;
-         doAssignStmtAfter(SummaOfArray(FirstArrayElement(s),Rank(s),DVM000(ind+1),VarType_RTS(s), eop));
-         save_st = cur_st; where = cur_st;
-         size_array = doSizeArray(s,stmt);
-         cur_st = save_st;
-         SET_DVM(ind);
-       }
-    }    
-    esym = vl->lhs(); //variable reference
-    CheckVarArrayRef(eop,cur_st,esym);
-  }
-  return(cur_st);
-}
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/dvm.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/dvm.cpp
deleted file mode 100644
index edab431..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/dvm.cpp
+++ /dev/null
@@ -1,14930 +0,0 @@
- 
-/*********************************************************************/
-/*                   Fortran DVM  V.5    2011   (DVM+OpenMP+ACC)     */
-/*********************************************************************/ 
-
-#include <stdio.h>
-#include <string.h>
-
-#define IN_DVM_
-#include "dvm.h"
-#undef IN_DVM_
-
-#include "libSageOMP.h"
-
-
-const char *name_loop_var[MAX_DIMS+1] = {"idvm00","idvm01","idvm02","idvm03", "idvm04","idvm05","idvm06","idvm07","idvm08","idvm09","idvm10","idvm11","idvm12","idvm13","idvm14","idvm15"};  
-const char *name_bufIO[Ntp] = {"i000io","r000io", "d000io","c000io","l000io","dc00io","ch00io","i100io","i200io","i800io","l100io","l200io","l800io"};
-SgSymbol *rmbuf[Ntp];
-const char *name_rmbuf[Ntp] = {"i000bf","r000bf", "d000bf","c000bf","l000bf","dc00bf","ch00bf","i100bf","i200bf","i800bf","l100bf","l200bf","l800bf"};
-SgSymbol *dvmcommon, *dvmcommon_ch;
-SgSymbol *heapcommon;
-SgSymbol *redcommon;
-SgSymbol *dbgcommon;
-int lineno;  // number of line in file
-SgStatement *first_exec; // first executable statement in procedure
-int nproc,ndis,nblock,ndim, nblock_all;
-SgVariableSymb *mem_symb[Ntp]; 
-int mem_use[Ntp];
-
-int lab;  // current label  
-//SgExpression * size_array, *array_handle, *align_template;
-//SgExpression * axis_array, *coeff_array, *const_array;
-//SgExpression *rml; //remote-variable list of REMOTE_ACCESS directive
-
-int inasynchr; //set to 1 in the range of ASYNCHRONOUS
-symb_list *dsym;  //distributed array symbol list
-group_name_list *grname;  //shadow/reduction group name list
-int v_print = 0; //set to 1 by -v flag
-int warn_all = 0; //set to 1 by -w flag
-int own_exe;
-symb_list *redvar_list;
-int pointer_in_tree; //set to 1 if there is a POINTER in alignment tree
-                     //used by GenDistArray and GenAlignArray 
-symb_list *proc_symb;//processor array symbol list
-symb_list *task_symb;//task array symbol list
-symb_list * consistent_symb;// consistent array symbol list
-symb_list *async_symb;// ASYNCID symbol list
-symb_list *loc_templ_symb;// local TEMPLATE symbol list
-symb_list *index_symb;// INDEX_DELTA variable list (code optimization)
-int in_task_region;//set to 1 in the range of TASK_REGION
-int task_ind; //current task index is storing in dvm000(task_ind)
-int in_task; //set to 1 in the range of ON directive
-SgSymbol *task_array;// current task array symbol pointer 
-SgLabel *task_lab; 
-SgStatement *task_do;
-SgStatement * task_region_st;
-fragment_list *cur_fragment = NULL; //current fragment number (used in debuging directives)
-SgExpression *heap_ar_decl;
-int   is_heap_ref;
-int heap_size; //calculated size of array HEAP(volume of memory for all pointer headers)
-stmt_list * pref_st; //list of PREFETCH directive in procedure
-int maxbuf = 5; //maximal number of remote group  buffers for given array
-int gen_block, mult_block;
-SgExpression *async_id;
-SgExpression *struct_component;
-SgSymbol *file_var_s;
-int nloopred; //counter of parallel loops with reduction group
-int nloopcons; //counter of parallel loops with consistent group
-stmt_list *wait_list; // list of REDUCTION_WAIT directives
-int task_ps = 0;
-int opt_base, opt_loop_range; //set on by compiler options (code optimization options)
-SgExpression *sum_dvm = NULL;
-int dvm_const_ref;
-int unparse_functions;
-int privateall = 0;
-
-extern SgStatement *parallel_dir;
-extern int iacross;
-
-extern "C" int out_free_form;
-extern "C" int out_upper_case;
-extern "C" int out_line_unlimit;
-extern "C" int out_line_length;
-extern "C" PTR_SYMB last_file_symbol;
-
-Options options;
-
-//
-//-----------------------------------------------------------------------
-// FOR DEBUGGING
-//#include "dump_info.C"
-//-----------------------------------------------------------------------
-
-#if __SPF_BUILT_IN_FDVM
-int convert_file(int argc, char* argv[], const char* proj_name)
-#else
-int main(int argc, char *argv[])
-#endif
-{
-    FILE *fout = NULL;
-    FILE *fout_cuf = NULL, *fout_C_cu = NULL, *fout_info = NULL; /*ACC*/
-    const char *fout_name = NULL;
-    char *fout_name_cuf;     /*ACC*/
-    char *fout_name_C_cu;    /*ACC*/
-    char *fout_name_info_C;  /*ACC*/
-
-#ifndef __SPF_BUILT_IN_FDVM
-    const char *proj_name = "dvm.proj";
-#endif
-    char *source_name;
-    int level, hpf, openmp, isz, dvm_type_size;
-    int a_mode = 0;
-
-    // initialisation
-    initialize();
-
-    openmp = hpf = 0; dvm_type_size = 0;
-
-    argv++;
-    while ((argc > 1) && (*argv)[0] == '-')
-    {
-        if ((*argv)[1] == 'o' && ((*argv)[2] == '\0')) {
-            fout_name = argv[1];
-            argv++;
-            argc--;
-        }
-        else if ((*argv)[1] == 'a' && ((*argv)[2] == '\0')) {
-            proj_name = argv[1];
-            argv++;
-            argc--;
-            a_mode = 1;
-        }
-        else if (!strcmp(argv[0], "-dc"))
-            check_regim = 1;
-        else if (!strcmp(argv[0], "-dbif1"))
-            dbg_if_regim = 1;
-        else if (!strcmp(argv[0], "-dbif2"))
-            dbg_if_regim = 2;
-        else if (!strcmp(argv[0], "-speedL0")) /* for dedugging ACROSS-scheme */
-            options.setOn(SPEED_TEST_L0);          /*ACC*/
-        else if (!strcmp(argv[0], "-speedL1")) /* for dedugging ACROSS-scheme */
-            options.setOn(SPEED_TEST_L1);          /*ACC*/
-        else if (!strcmp(argv[0], "-dmpi"))
-            deb_mpi = 1;
-        else if (!strcmp(argv[0], "-dnoind"))
-            d_no_index = 1;
-        else if (!strcmp(argv[0], "-dperf")) {
-            debug_regim = 1;
-            omp_debug = DPERF;
-        }
-        else if (!strcmp(argv[0], "-dvmLoopAnalysisEC"))   /*ACC*/
-        {
-            options.setOn(LOOP_ANALYSIS);
-            options.setOn(OPT_EXP_COMP);
-        }
-        else if (!strcmp(argv[0], "-dvmIrregAnalysis"))   /*ACC*/
-        {
-            options.setOn(LOOP_ANALYSIS);
-            options.setOn(OPT_EXP_COMP);
-            options.setOn(GPU_IRR_ACC);
-        }
-        else if (!strcmp(argv[0], "-dvmLoopAnalysis"))   /*ACC*/
-            options.setOn(LOOP_ANALYSIS);
-        else if (!strcmp(argv[0], "-dvmPrivateAnalysis"))   /*ACC*/
-            options.setOn(PRIVATE_ANALYSIS);
-        else if ((*argv)[1] == 'd') {
-            switch ((*argv)[2]) {
-            case '0':  level = 0; break;
-            case '1':  level = 1; omp_debug = D1; /*OMP*/ break;
-            case '2':  level = 2; omp_debug = D2; /*OMP*/ break;
-            case '3':  level = 3; omp_debug = D3; /*OMP*/ break;
-            case '4':  level = 4; omp_debug = D4; /*OMP*/ break;
-            case '5':  level = 5; omp_debug = D5; /*OMP*/ break;
-                /* case '5':  level = -1; many_files=1; break;*/
-            default:  level = -1;
-            }
-            if (level > 0)
-                debug_regim = 1;
-            if ((*argv)[3] == '\0')
-                AddToFragmentList(0, 0, level, -1);
-            else if ((*argv)[3] == ':')
-                FragmentList(*argv + 4, level, -1);
-        }
-        else if ((*argv)[1] == 'e') {
-            switch ((*argv)[2]) {
-            case '0':  level = 0; break;
-            case '1':  level = 1; break;
-            case '2':  level = 2; break;
-            case '3':  level = 3; break;
-            case '4':  level = 4; break;
-			case 'm':  omp_perf = 1; break;
-            default:  level = -1;
-            }
-            if ((*argv)[3] == '\0')
-                AddToFragmentList(0, 0, -1, level);
-            else if ((*argv)[3] == ':')
-                FragmentList(*argv + 4, -1, level);
-        }
-        else if (!strcmp(argv[0], "-spf"))
-        {  
-            (void)fprintf(stderr, "Illegal option -spf \n");
-            return 1;
-        }           
-        else if (!strcmp(argv[0], "-p")) {
-            only_debug = 0; hpf = 0;
-        }
-        else if (!strcmp(argv[0], "-s")) {
-            only_debug = 1; hpf = 0;
-        }
-        else if (!strcmp(argv[0], "-v"))
-            v_print = 1;
-        else if (!strcmp(argv[0], "-w"))
-            warn_all = 1;
-        else if (!strcmp(argv[0], "-bind0"))
-            bind_ = 0;
-        else if (!strcmp(argv[0], "-bind1"))
-            bind_ = 1;
-        else if (!strcmp(argv[0], "-t8"))
-            dvm_type_size = 8;
-        else if (!strcmp(argv[0], "-t4"))
-            dvm_type_size = 4;
-        else if (!strcmp(argv[0], "-r8"))
-            default_real_size = 8;
-        else if (!strcmp(argv[0], "-i8"))
-            default_integer_size = 8;
-        else if (!strcmp(argv[0], "-hpf") || !strcmp(argv[0], "-hpf1") || !strcmp(argv[0], "-hpf2"))
-            hpf = 1;
-        else if (!strcmp(argv[0], "-mp")) {
-            OMP_program = 1; /*OMP*/
-            openmp = 1;
-        }
-        //else if (!strcmp(argv[0],"-ta")) 
-        //  ACC_program = 1;      
-        else if (!strcmp(argv[0], "-noH"))
-            ACC_program = 0;
-        else if (!strcmp(argv[0], "-noCudaType"))  /*ACC*/
-            undefined_Tcuda = 1;
-        else if (!strcmp(argv[0], "-noCuda"))
-            options.setOn(NO_CUDA);                /*ACC*/
-        else if (!strcmp(argv[0], "-noPureFunc"))
-            options.setOn(NO_PURE_FUNC);           /*ACC*/
-        else if (!strcmp(argv[0], "-C_Cuda"))      /*ACC*/
-            options.setOn(C_CUDA);
-        else if (!strcmp(argv[0], "-FTN_Cuda") || !strcmp(argv[0], "-F_Cuda"))    /*ACC*/
-            options.setOff(C_CUDA);
-        else if (!strcmp(argv[0], "-no_blocks_info") || !strcmp(argv[0], "-noBI"))
-            options.setOn(NO_BL_INFO);             /*ACC*/
-        else if (!strcmp(argv[0], "-cacheIdx"))
-            options.setOff(NO_BL_INFO);            /*ACC*/
-        else if (!strcmp(argv[0], "-Ohost"))       /*ACC*/
-            options.setOn(O_HOST);
-        else if (!strcmp(argv[0], "-noOhost"))     /*ACC*/
-            options.setOff(O_HOST);
-        else if (!strcmp(argv[0], "-Opl2"))        /*ACC*/
-        {  
-            parloop_by_handler = 2;
-            options.setOn(O_HOST);
-            options.setOn(O_PL2);
-           // options.setOn(NO_CUDA);
-        }
-        else if (!strcmp(argv[0], "-Opl"))         /*ACC*/
-        {
-            parloop_by_handler = 1;
-            options.setOn(O_PL);
-        }
-       else if (!strcmp(argv[0], "-oneThread"))   /*ACC*/
-            options.setOn(ONE_THREAD);
-        else if (!strcmp(argv[0], "-noTfm"))       /*ACC*/
-            options.setOff(AUTO_TFM);
-        else if (!strcmp(argv[0], "-autoTfm"))     /*ACC*/
-            options.setOn(AUTO_TFM);
-        else if (!strcmp(argv[0], "-gpuO0"))       /*ACC*/
-            options.setOn(GPU_O0);
-        else if (!strcmp(argv[0], "-gpuO1"))       /*ACC*/
-            options.setOn(GPU_O1);
-        else if (!strcmp(argv[0], "-rtc"))         /*ACC*/
-            options.setOn(RTC);  //for NVRTC compilation and execution
-        else if (!strcmp(argv[0], "-ffo"))
-            out_free_form = 1;
-        else if (!strcmp(argv[0], "-upcase"))  
-            out_upper_case = 1;
-        else if (!strcmp(argv[0], "-noLimitLine"))  
-            out_line_unlimit = 1; 
-        else if (!strcmp(argv[0], "-uniForm"))
-        {
-            out_free_form = 1;
-            out_line_length = 72;
-        }
-        else if (!strcmp(argv[0], "-noRemote"))  
-            options.setOn(NO_REMOTE); 
-        else if (!strcmp(argv[0], "-lgstd"))
-        {
-            (void)fprintf(stderr, "Illegal option -lgstd \n");
-            return 1;
-        }
-        else if (!strcmp(argv[0], "-byFunUnparse"))
-            unparse_functions = 1;
-        else if (!strncmp(argv[0], "-bufio", 6)) {
-            if ((*argv)[6] != '\0' && (isz = is_integer_value(*argv + 6)))
-                IOBufSize = isz;
-        }
-        else if (!strncmp(argv[0], "-bufUnparser", 12)) {
-            if ((*argv)[12] != '\0' && (isz = is_integer_value(*argv + 12)))
-                UnparserBufSize = isz * 1024 * 1024;
-        }
-        else if (!strcmp(argv[0], "-bigPrivates")) /*ACC*/
-            options.setOn(BIG_PRIVATES);
-        else if (!strcmp(argv[0], "-ioRTS"))
-            options.setOn(IO_RTS);
-        else if (!strcmp(argv[0], "-read_all"))
-            options.setOn(READ_ALL);
-        else if (!strcmp(argv[0], "-Obase"))
-            opt_base = 1;
-        else if (!strcmp(argv[0], "-Oloop_range"))
-            opt_loop_range = 1;
-        else if ((*argv)[1] == 'H') {
-            if ((*argv)[2] == 's' && (*argv)[3] == 'h' && (*argv)[4] == 'w') {
-                if ((*argv)[5] != '\0' && (all_sh_width = is_integer_value(*argv + 5)))
-                    ;
-            }
-            else if (!strcmp(*argv + 2, "nora"))
-                no_rma = 1;
-            else if (!strcmp(*argv + 2, "oneq"))
-                one_inquiry = 1;
-            else if (!strcmp(*argv + 2, "onlyl"))
-                only_local = 1;
-        }
-        else if (!strncmp(argv[0], "-collapse", 9))
-            if ((*argv)[9] != '\0' && (collapse_loop_count = is_integer_value(*argv + 9)));
-        argc--;
-        argv++;
-    }
-
-    // Check options combinations
-    options.checkCombinations();
-
-    if (isHPFprogram(source_name = *argv)) {
-        HPF_program = 1;
-        hpf = 0;
-    }
-    if (hpf) 
-        return 0;  
-
-    // definition of DvmType size: len_DvmType 
-    // len_DvmType==0, if DvmType-size == default_integer_size == 4 
-    if (bind_ == 1)
-        len_DvmType = 8;  //sizeof(long) == 8
-    if (dvm_type_size)
-        len_DvmType = dvm_type_size;
-    if (len_DvmType == 0 && default_integer_size == 8)
-        len_DvmType = 4;
-
-    if (ACC_program && debug_regim && !only_debug)
-    {
-        (void)fprintf(stderr, "Warning: -noH option is set to debug mode\n");
-        ACC_program = 0;
-    }
-    if (parloop_by_handler>0 && debug_regim)
-    {
-        (void)fprintf(stderr, "Warning: -Opl/Opl2 option is ignored in debug mode\n");
-        parloop_by_handler = 0;
-        options.setOff(O_PL);
-        options.setOff(O_PL2);
-    }
-
-    if (openmp && ACC_program)
-    {
-        (void)fprintf(stderr, "Warning: -noH option is set to -mp mode\n");
-        ACC_program = 0;
-    }    
-    if (parloop_by_handler == 2 && !options.isOn(O_HOST))
-    {   
-        (void)fprintf(stderr, "Warning: -Ohost option is set to -Opl2 mode\n");
-        options.setOn(O_HOST);          
-    }
-    if(out_free_form == 1 && out_line_length == 72 && out_line_unlimit == 1)
-    {
-        (void)fprintf(stderr, "Warning: -noLimitLine and -uniForm options are incompatible; -noLimitLine option is ignored\n");
-        out_line_unlimit = 0;
-    }
-    if (v_print)
-        (void)fprintf(stderr, "<<<<<  Translating  >>>>>\n");
-
-    //------------------------------------------------------------------------------
-    
-    SgProject project(proj_name);
-    SgFile *file;
-    addNumberOfFileToAttribute(&project);
-
-    //----------------------------
-    ProjectStructure(project);
-    Private_Vars_Project_Analyzer();
-    //----------------------------
-   
-    initVariantNames();           //for project
-    initIntrinsicFunctionNames(); //for project
-    initSupportedVars(); // for project, acc_f2c.cpp
-    initF2C_FunctionCalls(); // for project, acc_f2c.cpp
-    for(int id=project.numberOfFiles()-1; id >= 0; id--)
-    {  
-        file = &(project.file(id));  //file->unparsestdout();
-        fin_name = new char[strlen(project.fileName(id))+2];
-        sprintf(fin_name, "%s%s", project.fileName(id), " ");        
-        //fin_name = strcat(project.fileName(0)," "); 
-        // for call of function 'tpoint' 
-        //added one symbol to input-file name
-        //printf("%s",fin_name); //!!! debug
-        if(!fout_name)
-            fout_name = doOutFileName(file->filename()); 
-        else if (fout_name && source_name && !strcmp(source_name, fout_name))
-        {
-            (void)fprintf(stderr, "Output file has the same name as source file\n");
-            return 1;
-        }
-
-        //printf("%s\n", fout_name);///!!! debug
-        fout_name_cuf = ChangeFtoCuf(fout_name);         /*ACC*/
-        fout_name_C_cu = ChangeFto_C_Cu(fout_name);      /*ACC*/
-        fout_name_info_C = ChangeFto_info_C(fout_name);  /*ACC*/
-
-        //set the last symbol of file
-        last_file_symbol = file->filept->cur_symb; //for low_level.c  and not only
-        initLibNames();   //for every file
-        InitDVM(file);    //for every file
-        current_file = file;   // global variable (used in SgTypeComplex)
-        max_lab = getLastLabelId();
-
-        if (dbg_if_regim) 
-            GetLabel(); //set maxlabval=90000
-        /*
-           printf("Labels:\n");
-           printf("first:%d  max: %d \n",firstLabel(file)->thelabel->stateno, getLastLabelId());
-           for(int num=1; num<=getLastLabelId(); num++)
-           if(isLabel(num))
-           printf("%d is label\n",num);
-           else
-           printf("%d isn't label\n",num);
-           
-         */
-
-        if (openmp) { /*OMP*/
-            if (debug_regim > 0) /*OMP*/
-                InstrumentForOpenMPDebug(file); /*OMP*/            
-            else /*OMP*/
-                TranslateFileOpenMPDVM(file); /*OMP*/            
-        }
-        else 
-            TranslateFileDVM(file);
-        /* DEBUG */
-        /* {FILE *fout; fout = fopen("out.out","w"); file->unparse(fout);} */
-        /*       classifyStatements(file);
-               printf("**************************************************\n");
-               printf("**** Expression Table ****************************\n");
-               printf("**************************************************\n");
-               classifyExpressions(file);
-               printf("**************************************************\n");
-               printf("**** Symbol  Table *******************************\n");
-               printf("**************************************************\n");
-               classifySymbols(file);
-               printf("**************************************************\n");
-               */
-        /*  end DEBUG */
-
-        // file->unparsestdout();
-
-        if (err_cnt) {
-            (void)fprintf(stderr, "%d error(s)\n", err_cnt);
-            //!!! exit(1);
-            return 1;
-        }
-        //file->saveDepFile("dvm.dep");
-        //DVMFileUnparse(file);
-        //file->saveDepFile("f.dep");
-        
-        if (!fout_name) { //outfile is not specified, output result to stdout
-            file->unparsestdout();
-            return 0;
-        }
-
-        //writing result of converting into file
-        if ((fout = fopen(fout_name, "w")) == NULL) {
-            (void)fprintf(stderr, "Can't open file %s for write\n", fout_name);
-            return 1;
-        }
-
-        if (GeneratedForCuda())  /*ACC*/
-        {
-            if ((fout_C_cu = fopen(fout_name_C_cu, "w")) == NULL) {
-                (void)fprintf(stderr, "Can't open file %s for write\n", fout_name_C_cu);
-                return 1;
-            }
-
-            if (!options.isOn(C_CUDA))
-            {
-                if ((fout_cuf = fopen(fout_name_cuf, "w")) == NULL) {
-                    (void)fprintf(stderr, "Can't open file %s for write\n", fout_name_cuf);
-                    return 1;
-                }
-            }
-
-            if ((fout_info = fopen(fout_name_info_C, "w")) == NULL) {
-                (void)fprintf(stderr, "Can't open file %s for write\n", fout_name_info_C);
-                return 1;
-            }            
-        }
-
-       
-        if (v_print)
-            (void)fprintf(stderr, "<<<<<  Unparsing   %s  >>>>>\n", fout_name);
-        if (mod_gpu) /*ACC*/
-            UnparseTo_CufAndCu_Files(file, fout_cuf, fout_C_cu, fout_info);
-
-        if (unparse_functions)
-            UnparseFunctionsOfFile(file, fout);
-        else if (UnparserBufSize)
-            //UnparseProgram_ThroughAllocBuf(fout,file->filept,UnparserBufSize);
-            file->unparseS(fout, UnparserBufSize);
-        else
-            file->unparse(fout);
-
-        if ((fclose(fout)) < 0) {
-            (void)fprintf(stderr, "Could not close %s\n", fout_name);
-            return 1;
-        }
-
-        if (GeneratedForCuda())  /*ACC*/
-        {
-            if ((fclose(fout_C_cu)) < 0) {
-                (void)fprintf(stderr, "Could not close %s\n", fout_name_C_cu);
-                return 1;
-            }
-
-            if (!options.isOn(C_CUDA))
-            {
-                if ((fclose(fout_cuf)) < 0) {
-                    (void)fprintf(stderr, "Could not close %s\n", fout_name_cuf);
-                    return 1;
-                }
-            }
-
-            if ((fclose(fout_info)) < 0) {
-                (void)fprintf(stderr, "Could not close %s\n", fout_name_info_C);
-                return 1;
-            }
-        }
-
-        fout_name = NULL;
-    }
-
-    if (v_print)
-        (void)fprintf(stderr, "\n*****  Done  *****\n");
-    return 0;
-}
-
-void initialize()
-{
-    int i;
-    Dloop_No = 0;
-    nfrag = 0; //counter of intervals for performance analizer 
-    St_frag = 0;
-    St_loop_first = 0;
-    St_loop_last = 0;
-    close_loop_interval = 0;
-    len_int = 0;
-    len_DvmType = 0;
-    if (sizeof(long) == 8)   //default rule for bind, set by options -bind0,-bind1
-        bind_ = 1;
-    else
-        bind_ = 0;
-    perf_analysis = 0; //set to 1 by -e1
-	omp_perf = 0; //set to 1 by -emp
-    dvm_debug = 0;      //set to 1 by -d1  or -d2 or -d3 or -d4 flag
-    only_debug = 0;     //set to 1 by -s flag
-    level_debug = 0;    //set to 1 by -d1, to 2 by -d2, ...
-    debug_fragment = NULL;
-    perf_fragment = NULL;
-    debug_regim = 0;
-    dbg_if_regim = 0;
-    check_regim = 0; //set by option -dc
-    deb_mpi = 0;    //set by option -dmpi
-    d_no_index = 0;   //set by option -dnoind
-    IOBufSize = SIZE_IO_BUF;
-    HPF_program = 0;
-    many_files = 1; /*29.06.01*/
-    iacross = 0;     //for HPF_program
-    irg = 0;         //for HPF_program
-    redgref = NULL;  //for HPF_program
-    idebrg = 0;      //for HPF_program
-    iconsg = 0;
-    consgref = NULL;
-    idebcg = 0;
-    all_sh_width = no_rma = one_inquiry = only_local = 0;
-    opt_base = 0;
-    opt_loop_range = 0;
-    in_interface = 0;
-    out_free_form = 0;
-    out_upper_case = 0;
-    out_line_unlimit = 0;
-    out_line_length = 132; 
-    default_integer_size = 4;
-    default_real_size = 4;
-    unparse_functions = 0; //set to 1 by option -byFunUnparse
-    for (i = 0; i < Ndev; i++)      /*ACC*/
-        device_flag[i] = 0;     // set by option and by TARGETS clause  of REGION directive
-    ACC_program = 1;            /*ACC*/
-    region_debug = 0;           /*ACC*/
-    region_compare = 0;         /*ACC*/
-    undefined_Tcuda = 0;        /*ACC*/
-    options.setOn(C_CUDA);      /*ACC*/
-    options.setOn(NO_BL_INFO);  /*ACC*/
-    options.setOn(O_HOST);      /*ACC*/
-    parloop_by_handler = 0;     /*ACC*/
-    collapse_loop_count = 0;    /*ACC*/
-    cuda_functions = 0;         /*ACC*/
-    err_cnt = 0;
-}
-
-SgSymbol *LastSymbolOfFile(SgFile *f)
-{ SgSymbol *s;
-  s = f->firstSymbol();
-  while(s->next())
-    s = s->next();
-
-  return s;
-}
-
-char *doOutFileName(const char *fdeb_name)
-{
-    char *name;
-    int i;
-
-    name = (char *)malloc((unsigned)(strlen(fdeb_name) + 5 + 2 + 1));
-    strcpy(name, fdeb_name);
-    for (i = strlen(name) - 1; i >= 0; i--)
-    {
-        if (name[i] == '.')
-            break;
-    }
-    strcpy(name + i, ".DVMH.f");
-    return(name);
-}
-
-int isHPFprogram(char *filename)
-{
-   int    i;
-  
-   if (!filename)
-     return (0);
-   
-   for (i = strlen(filename)-1 ; i >= 0 ; i --)
-   {
-        if ( filename[i] == '.' ) 
-             break;
-   }
-
-   //if (i>=0 && !strcmp(&(filename[i+1]),"hpf"))
-     if(i>=0 && (filename[i+1] == 'h' || filename[i+1] =='H') && (filename[i+2] == 'p' || filename[i+2] =='P') && (filename[i+3] == 'f' || filename[i+3] =='F'))
-     return(1);  
- else
-     return(0);
-}
-
-void initVariantNames(){
-   for(int i = 0; i < MAXTAGS; i++) tag[i] = NULL;
-/*!!!*/
-#include "tag.h"
-}
-
-void initLibNames(){
-   for(int i = 0; i < MAX_LIBFUN_NUM; i++) {
-       fdvm[i] = NULL;
-       name_dvm[i] =  NULL;
-   }
-#include "libdvm.h" 
-}
-
-void initMask(){
-  for(int i = 0; i < MAX_LIBFUN_NUM; i++) {
-       fmask[i] = 0;
-  }
-}
-
-void InitDVM( SgFile *f) {
-  SgStatement *fst;
-  int i;
-  fst = f->firstStatement();    //fst -> File header
-  // Initialize COMMON names
-  dvmcommon = new SgSymbol(VARIABLE_NAME,"mem000",*fst);//DEFAULT variant is right for COMMON
-                                                  //but Sage don't want to create such symbol
-  dvmcommon_ch = new SgSymbol(VARIABLE_NAME,"mch000",*fst);
-  heapcommon = new SgSymbol(VARIABLE_NAME,"heap00",*fst);
-  dbgcommon = new SgSymbol(VARIABLE_NAME,"dbg000",*fst);
-
-// Initialize the functions symbols (for  LibDVM functions)
-  for (i=0; name_dvm[i] && i<MAX_LIBFUN_NUM; i++) {
-     fdvm[i] = new SgFunctionSymb(FUNCTION_NAME, name_dvm[i], *SgTypeInt(), *fst);
-     // printf("name_dvm[%d] = %s\n", i , name_dvm[i]);
-  }
-
-  return;
-}
-
-void initF90Names() {
-   for(int i = 0; i < NUM__F90; i++) 
-      f90[i] = NULL; 
-}
-
-SgType * SgTypeComplex(SgFile *f)
-{
-  SgType *t;
-  for(t=f->firstType(); t; t=t->next())
-     if(t->variant()==T_COMPLEX)
-       return(t);
- 
-  return(new SgType(T_COMPLEX));
-}
-
-SgType * SgTypeDoubleComplex(SgFile *f)
-{
-  SgType *t;
-  for(t=f->firstType(); t; t=t->next())
-     if(t->variant()==T_DCOMPLEX)
-       return(t);
- 
-  return(new SgType(T_DCOMPLEX));
-}
-
-int MemoryUse()
-{
-  int i;
-  for(i=0; i<Ntp; i++)
-     if(mem_use[i] != 0 )
-        return(1);
-  return(0);
-}
- 
-void TempVarDVM(SgStatement * func ) {
-
-  int i;   
-  SgValueExp N(100),M1(1),M0(0), MB(64);
-  SgExpression  *MS;
-  //SgSubscriptExp M00(M0,M0); 
-  // SgExpression *M00(DDOT,&M0,&M0,NULL);
-  SgExpression  *M00 =  new SgExpression(DDOT,&M0.copy(),&MB.copy(),NULL); 
-  SgExpression *le = NULL ;
-  SgArrayType *typearray;
-
-  typearray = new SgArrayType(*SgTypeInt());  
-  dvmbuf = new SgVariableSymb("dvm000", *typearray, *func);
-  typearray = new SgArrayType(*SgTypeInt());
-  hpfbuf = new SgVariableSymb("hpf000", *typearray, *func); 
-
-  Iconst[0] = new SgConstantSymb("dvm0c0", *func, *new SgValueExp(0));
-  Iconst[1] = new SgConstantSymb("dvm0c1", *func, *new SgValueExp(1));
-  Iconst[2] = new SgConstantSymb("dvm0c2", *func, *new SgValueExp(2));
-  Iconst[3] = new SgConstantSymb("dvm0c3", *func, *new SgValueExp(3));
-  Iconst[4] = new SgConstantSymb("dvm0c4", *func, *new SgValueExp(4));
-  Iconst[5] = new SgConstantSymb("dvm0c5", *func, *new SgValueExp(5));
-  Iconst[6] = new SgConstantSymb("dvm0c6", *func, *new SgValueExp(6));
-  Iconst[7] = new SgConstantSymb("dvm0c7", *func, *new SgValueExp(7));
-  Iconst[8] = new SgConstantSymb("dvm0c8", *func, *new SgValueExp(8));
-  Iconst[9] = new SgConstantSymb("dvm0c9", *func, *new SgValueExp(9));
-
-  if(debug_regim)
-    dbg_var =  new SgVariableSymb("dbgvar00", *SgTypeInt(), *func);
-
-  if(only_debug)
-     return;
- 
-  typearray = new SgArrayType(*SgTypeFloat());
-  typearray-> addRange(*M00);
-  Rmem = mem_symb[Real] =   new SgVariableSymb("r0000m", *typearray, *func);
-  //Rmem-> declareTheSymbol(*func);
-  typearray = new SgArrayType(*SgTypeDouble());
-  typearray-> addRange(*M00);
-  Dmem = mem_symb[Double] =  new SgVariableSymb("d0000m", *typearray, *func);
-  //Dmem-> declareTheSymbol(*func);
-  typearray = new SgArrayType(*SgTypeInt());
-  typearray-> addRange(*M00);
-  Imem = mem_symb[Integer] = new SgVariableSymb("i0000m", *typearray, *func);
-  //Imem-> declareTheSymbol(*func);
-  typearray = new SgArrayType(*SgTypeBool());
-  typearray-> addRange(*M00);
-  Lmem = mem_symb[Logical] = new SgVariableSymb("l0000m", *typearray, *func);
-  //Lmem-> declareTheSymbol(*func);
-//!!!!!!!
-  typearray = new SgArrayType(* SgTypeComplex(current_file));
-  typearray-> addRange(*M00);
-  Cmem = mem_symb[Complex] = new SgVariableSymb("c0000m", *typearray, *func);
-  typearray = new SgArrayType(* SgTypeDoubleComplex(current_file));
-  typearray-> addRange(*M00);
-  DCmem = mem_symb[DComplex] =  new SgVariableSymb("dc000m", *typearray, *func);
-  typearray = new SgArrayType(*SgTypeChar());
-  typearray-> addRange(*M00);
-  Chmem = mem_symb[Character] = new SgVariableSymb("ch000m", *typearray, *func);
-//---------
-  le= new SgExpression(LEN_OP);
-  le->setLhs(new SgValueExp(1));
-  SgType *tint1 = new SgType(T_INT, le, NULL);
-  le= new SgExpression(LEN_OP);
-  le->setLhs(new SgValueExp(2));
-  SgType *tint2 = new SgType(T_INT, le, NULL);
-  le= new SgExpression(LEN_OP);
-  le->setLhs(new SgValueExp(8));
-  SgType *tint8 = new SgType(T_INT, le, NULL);
-//----------
-  typearray = new SgArrayType(*tint1);
-  typearray-> addRange(*M00);
-  mem_symb[Integer_1] = new SgVariableSymb("i000m1", *typearray, *func); 
-  typearray = new SgArrayType(*tint2);
-  typearray-> addRange(*M00);
-  mem_symb[Integer_2] = new SgVariableSymb("i000m2", *typearray, *func); 
-  typearray = new SgArrayType(*tint8);
-  typearray-> addRange(*M00);
-  mem_symb[Integer_8] = new SgVariableSymb("i000m8", *typearray, *func); 
-//---------
-  le= new SgExpression(LEN_OP);
-  le->setLhs(new SgValueExp(1));
-  SgType *tlog1 = new SgType(T_BOOL, le, NULL);
-  le= new SgExpression(LEN_OP);
-  le->setLhs(new SgValueExp(2));
-  SgType *tlog2 = new SgType(T_BOOL, le, NULL);
-  le= new SgExpression(LEN_OP);
-  le->setLhs(new SgValueExp(8));
-  SgType *tlog8 = new SgType(T_BOOL, le, NULL);
-//----------
-  typearray = new SgArrayType(*tlog1);
-  typearray-> addRange(*M00);
-  mem_symb[Logical_1] = new SgVariableSymb("l000m1", *typearray, *func); 
-  typearray = new SgArrayType(*tlog2);
-  typearray-> addRange(*M00);
-  mem_symb[Logical_2] = new SgVariableSymb("l000m2", *typearray, *func); 
-  typearray = new SgArrayType(*tlog8);
-  typearray-> addRange(*M00);
-  mem_symb[Logical_8] = new SgVariableSymb("l000m8", *typearray, *func); 
-  
-  for(i=0; i<8; i++)
-    loop_var[i] = new SgVariableSymb(name_loop_var[i], *SgTypeInt(), *func);
-
-  MS = new SgValueExp(IOBufSize);
-  typearray = new SgArrayType(*SgTypeInt());
-  typearray-> addRange(*MS);
-  bufIO[Integer] =   new SgVariableSymb(name_bufIO[Integer], *typearray, *func);
-  typearray = new SgArrayType(*SgTypeFloat());
-  typearray-> addRange(*MS);
-  bufIO[Real] =      new SgVariableSymb(name_bufIO[Real], *typearray, *func);
-  typearray = new SgArrayType(*SgTypeDouble());
-  typearray-> addRange(*MS);
-  bufIO[Double] =    new SgVariableSymb(name_bufIO[Double], *typearray, *func);
-  typearray = new SgArrayType(* SgTypeComplex(current_file));
-  typearray-> addRange(*MS);
-  bufIO[Complex] =   new SgVariableSymb(name_bufIO[Complex], *typearray, *func);
-  typearray = new SgArrayType(*SgTypeBool());
-  typearray-> addRange(*MS);
-  bufIO[Logical] =   new SgVariableSymb(name_bufIO[Logical], *typearray, *func);
-  typearray = new SgArrayType(* SgTypeDoubleComplex(current_file));
-  typearray-> addRange(*MS);
-  bufIO[DComplex] =  new SgVariableSymb(name_bufIO[DComplex], *typearray, *func);
-  typearray = new SgArrayType(* new SgType(T_STRING));
-  typearray-> addRange(*MS);
-  bufIO[Character] = new SgVariableSymb(name_bufIO[Character], *typearray, *func);
-  typearray = new SgArrayType(*tint1);
-  typearray-> addRange(*MS);
-  bufIO[Integer_1] = new SgVariableSymb(name_bufIO[Integer_1], *typearray, *func); 
-  typearray = new SgArrayType(*tint2);
-  typearray-> addRange(*MS);
-  bufIO[Integer_2] = new SgVariableSymb(name_bufIO[Integer_2], *typearray, *func); 
-  typearray = new SgArrayType(*tint8);
-  typearray-> addRange(*MS);
-  bufIO[Integer_8] = new SgVariableSymb(name_bufIO[Integer_8], *typearray, *func); 
-  typearray = new SgArrayType(*tlog1);
-  typearray-> addRange(*MS);
-  bufIO[Logical_1] = new SgVariableSymb(name_bufIO[Logical_1], *typearray, *func); 
-  typearray = new SgArrayType(*tlog2);
-  typearray-> addRange(*MS);
-  bufIO[Logical_2] = new SgVariableSymb(name_bufIO[Logical_2], *typearray, *func); 
-  typearray = new SgArrayType(*tlog8);
-  typearray-> addRange(*MS);
-  bufIO[Logical_8] = new SgVariableSymb(name_bufIO[Logical_8], *typearray, *func); 
-
-  typearray = new SgArrayType(*SgTypeInt());
-  rmbuf[Integer] =   new SgVariableSymb(name_rmbuf[Integer], *typearray, *func);
-  typearray = new SgArrayType(*SgTypeFloat());
-  rmbuf[Real] =      new SgVariableSymb(name_rmbuf[Real], *typearray, *func);
-  typearray = new SgArrayType(*SgTypeDouble());
-  rmbuf[Double] =    new SgVariableSymb(name_rmbuf[Double], *typearray, *func);
-  typearray = new SgArrayType(* SgTypeComplex(current_file));
-  rmbuf[Complex] =   new SgVariableSymb(name_rmbuf[Complex], *typearray, *func);
-  typearray = new SgArrayType(*SgTypeBool());
-  rmbuf[Logical] =   new SgVariableSymb(name_rmbuf[Logical], *typearray, *func);
-  typearray = new SgArrayType(* SgTypeDoubleComplex(current_file));
-  rmbuf[DComplex] =  new SgVariableSymb(name_rmbuf[DComplex], *typearray, *func);
-  typearray = new SgArrayType(* new SgType(T_STRING));
-  rmbuf[Character] = new SgVariableSymb(name_rmbuf[Character], *typearray, *func);
-  typearray = new SgArrayType(*tint1);
-  rmbuf[Integer_1] = new SgVariableSymb(name_rmbuf[Integer_1], *typearray, *func); 
-  typearray = new SgArrayType(*tint2);
-  rmbuf[Integer_2] = new SgVariableSymb(name_rmbuf[Integer_2], *typearray, *func); 
-  typearray = new SgArrayType(*tint8);
-  rmbuf[Integer_8] = new SgVariableSymb(name_rmbuf[Integer_8], *typearray, *func); 
-  typearray = new SgArrayType(*tlog1);
-  rmbuf[Logical_1] = new SgVariableSymb(name_rmbuf[Logical_1], *typearray, *func); 
-  typearray = new SgArrayType(*tlog2);
-  rmbuf[Logical_2] = new SgVariableSymb(name_rmbuf[Logical_2], *typearray, *func); 
-  typearray = new SgArrayType(*tlog8);
-  rmbuf[Logical_8] = new SgVariableSymb(name_rmbuf[Logical_8], *typearray, *func); 
-
-  typearray = new SgArrayType(*SgTypeInt());
-  heapdvm = new SgVariableSymb("heap00", *typearray, *func);
-
-  Pipe = new SgVariableSymb("pipe00", *SgTypeDouble(), *func);
-  
-     return;
-}
-
-char* FileNameVar(int i)
-{ char *name;
- name = new char[80];
- sprintf(name,"%s%d","filenm00",i); 
- return(name);
-}
-
-char* RedGroupVarName(SgSymbol *gr)
-{ char *name;
- name = new char[80];
- sprintf(name,"%s%s",gr->identifier(),"00"); 
- return(name);
-}
-
-char* ModuleProcName(SgSymbol *smod)
-{ char *name;
- name = new char[80];
- sprintf(name,"dvm_%s",smod->identifier()); 
- return(name);
-}
-
-SgSymbol* BaseSymbol(SgSymbol *ar)
-{ char *name;
- SgSymbol *sbs, *base;
- SgArrayType *typearray;
- SgValueExp M0(0), MB(64);
- SgExpression  *M00 =  new SgExpression(DDOT,&M0.copy(),&MB.copy(),NULL); 
- name = new char[80];
- base = baseMemory(ar->type()->baseType());
- //strncpy(name,base->identifier(),5);
- //strcat (name,ar->identifier());
- sprintf(name,"%.4s_%s",base->identifier(),ar->identifier());
- typearray = new SgArrayType(*ar->type()->baseType());
- typearray-> addRange(*M00);
- sbs = new SgVariableSymb(name, *typearray, *cur_func); 
- return(sbs);
-}
-
-SgSymbol* IndexSymbol(SgSymbol *si)
-{ char *name;
- SgSymbol *sn;
- name = new char[80];
- sprintf(name,"%s__d",si->identifier()); 
- sn = new SgVariableSymb(name, *si->type(), *cur_func); 
- return(sn);
-}
-
-SgSymbol* InitLoopSymbol(SgSymbol *si,SgType *t)
-{ char *name;
- SgSymbol *sn;
- name = new char[80];
- sprintf(name,"%s__init",si->identifier()); 
- sn = new SgVariableSymb(name, *t, *cur_func); 
- return(sn);
-}
-
-SgSymbol* DerivedTypeBaseSymbol(SgSymbol *stype,SgType *t)
-{
- char *name;
- SgSymbol *sn;
- SgArrayType *typearray;
- SgValueExp M0(0), MB(64);
- SgExpression  *M00 =  new SgExpression(DDOT,&M0.copy(),&MB.copy(),NULL); 
- name = new char[80];
- sprintf(name,"%s0000m",stype->identifier()); 
- typearray = new SgArrayType(*t);
- typearray-> addRange(*M00);
- sn = new SgVariableSymb(name, *typearray, *cur_func);
- return(sn);
-}
-
-SgSymbol* CommonSymbol(SgSymbol *stype)
-{ char *name;
- name = new char[80];
- sprintf(name,"mem000%s",stype->identifier()); 
- return(new SgSymbol(VARIABLE_NAME,name,*cur_func->controlParent()));
-}
-
-SgSymbol *CheckSummaSymbol()
-{ 
- return(new SgVariableSymb("check_sum00",*SgTypeDouble(),*cur_func));
-}
-
-SgSymbol *DebugGoToSymbol(SgType *t)
-{char *name;
- SgSymbol *sn;
- name = new char[80];
- sprintf(name,"dbv_goto00%d",++nifvar);
- sn = new SgVariableSymb(name,*t,*cur_func);
- if_goto = AddToSymbList(if_goto, sn); 
- return(sn);
-}
-
-
-SgSymbol *TaskAMVSymbol(SgSymbol *s)
-{ char *name;
- name = (char *) malloc((unsigned)(strlen(s->identifier())+5)); 
- sprintf(name,"%s_amv",s->identifier()); 
- return(new SgSymbol(VARIABLE_NAME,name,*cur_func));
-}
-
-SgSymbol *TaskIndSymbol(SgSymbol *s)
-{ char *name;
- name = (char *) malloc((unsigned)(strlen(s->identifier())+3)); 
- sprintf(name,"i_%s",s->identifier()); 
- return(new SgVariableSymb(name,*SgTypeInt(),*cur_func));
-}
-
-SgSymbol *TaskRenumArraySymbol(SgSymbol *s)
-{ char *name;
- name = (char *) malloc((unsigned)(strlen(s->identifier())+7)); 
- sprintf(name,"renum_%s",s->identifier()); 
- return(new SgVariableSymb(name,*(s->type()),*cur_func));
-}
-
-SgSymbol *TaskLPsArraySymbol(SgSymbol *s)
-{ char *name;
- name = (char *) malloc((unsigned)(strlen(s->identifier())+5)); 
- sprintf(name,"lps_%s",s->identifier()); 
- return(new SgVariableSymb(name,*(s->type()),*cur_func));
-}
-
-SgSymbol *TaskHPsArraySymbol(SgSymbol *s)
-{ char *name;
- name = (char *) malloc((unsigned)(strlen(s->identifier())+5)); 
- sprintf(name,"hps_%s",s->identifier()); 
- return(new SgVariableSymb(name,*(s->type()),*cur_func));
-}
-
-SgSymbol * CreateRegistrationArraySymbol()
-{
- SgSymbol *sn;
- SgArrayType *typearray;
- char *ident = cur_func->symbol()->identifier(); //Module identifier
- char *name = new char[10+strlen(ident)];
- sprintf(name,"deb_%s_dvm",ident); 
- typearray = new SgArrayType(*SgTypeInt());
- sn = new SgVariableSymb(name, *typearray, *cur_func);
- return(sn);
-}
-
-void CreateCoeffs(coeffs* scoef,SgSymbol *ar)
-{int i,r,i0;
- char *name;
- r=Rank(ar);
- i0 = opt_base ? 1 : 2;
- if(opt_loop_range) i0=0;
- for(i=i0;i<=r+2;i++){
-   name = new char[strlen(ar->identifier()) + 6];
-   sprintf(name,"%s%s%d", ar->identifier(),"000",i); 
-   scoef->sc[i] =  new SgVariableSymb(name, *SgTypeInt(), *cur_func); 
-   //printf("%s",(scoef->sc[i])->identifier());
- }
-  scoef->use = 0;
- if(IN_MODULE && !IS_TEMPLATE(ar))
-     scoef->use = 1;
-}
-
-SgSymbol *CreateConsistentHeaderSymb(SgSymbol *ar)
-{
- char *name;
- name = new char[80];
- SgArrayType *typearray;
- //SgValueExp M1(1);
- name = new char[80];
- sprintf(name,"%s%s",ar->identifier(),"000");
- typearray = new SgArrayType(*SgTypeInt());
- //typearray-> addRange(M1);
- return( new SgVariableSymb(name, *typearray, *cur_func));   
-}
-
-SgSymbol *IOstatSymbol()
-{
-  if(!IOstat)
-    IOstat = new SgSymbol(VARIABLE_NAME, "iostat_dvm", *SgTypeInt(), *cur_func); 
-  return (IOstat);
-}
-
-SgStatement  *doPublicStmtForDvmModuleProcedure(SgSymbol *smod)
-{
-  mod_attr *attrm;
-  SgStatement *st = NULL;
-  
-  if((attrm=DVM_PROC_IN_MODULE(smod)) && attrm->symb){
-    st = new SgStatement(PUBLIC_STMT);
-    st->setExpression(0, *new SgExprListExp(*new SgVarRefExp(*attrm->symb)));
-  }
-  return (st);
-}
-
-void DeclareVariableWithInitialization (SgSymbol *sym, SgType *type, SgStatement *lstat)
-{
-            if(!sym) return;
-            SgStatement *decl_st = sym->makeVarDeclStmt();
-            SgExpression *eeq = DVMVarInitialization(decl_st->expr(0)->lhs());
-            decl_st->expr(0)->setLhs(eeq);
-            if (type)
-                decl_st->expr(1)->setType(type); 
-            decl_st->setVariant(VAR_DECL_90);
-            lstat -> insertStmtAfter(*decl_st);
-}
-
-void DeclareVarDVM(SgStatement *lstat, SgStatement *lstat2)
-{
-//lstat is not equal lstat2 only for MODULE:
-//lstat2 is header of generated module procedure dvm_<module_name>
-//some generated specification statements are inserted in specification part
-//of module and other are inserted in module procedure
-
- SgArrayType *typearray;
- SgStatement *equiv, *st,*st1,*com, *st_next;
- SgExpression *em[Ntp], *eeq, *ed;
- SgValueExp c1(1),c0(0);
- SgExprListExp *el, *eel;
- int i=0;
- int j;
- SgType *tlen = NULL;
- if(len_DvmType) {
-      SgExpression *le;
-      le = new SgExpression(LEN_OP);
-      le->setLhs(new SgValueExp(len_DvmType));
-      tlen = new SgType(T_INT, le, SgTypeInt());
- } 
-
- st_next = lstat->lexNext();
-
- if(in_interface) goto HEADERS_; //only array header declaration is created in interface body of interface block
-
- // create DATA statement for SAVE groups: DATA gref(1)/0/ gred/0/...
- if(grname && !IN_MODULE) { //group name list is not empty
-   group_name_list *sl;
-   char *data_str= new char[4000];
-   int i =0; 
-   sprintf(data_str,"data "); 
-   for(sl=grname; sl; sl=sl->next)                                           
-     if(IS_SAVE(sl->symb)) {
-       i++;
-       if (sl->symb->variant() == REF_GROUP_NAME){
-         strcat(data_str,sl->symb->identifier());
-         strcat(data_str,"(1)/0/ "); 
-       } else {
-         strcat(data_str,sl->symb->identifier());
-         strcat(data_str,"/0/ ");  
-       }
-     }         
-   if(i) {
-   st = new SgStatement(DATA_DECL);// creates DATA statement
-   SgExpression  *es = new SgExpression(STMT_STR);
-   NODE_STR(es->thellnd) = data_str;    //e->thellnd->entry.string_val = data_str;
-   st -> setExpression(0,*es); 
-   lstat -> insertStmtAfter(*st);  
-   }
- } 
-
-
- // inserting in main program SAVE statement (without list): for OpenMP translation 
- if(IN_MAIN_PROGRAM && !saveall)
-    lstat -> insertStmtAfter(*new SgStatement(SAVE_DECL)); 
-
- if (!only_debug) {
-  // declare  array bases for DVM-arrays
-  if(opt_base && !HPF_program  && dsym) {
-   symb_list *sl;
-   coeffs *c;
-   for(sl=dsym; sl; sl=sl->next) {
-     if(IS_TEMPLATE(sl->symb))
-         continue;
-     c = ((coeffs *) sl->symb-> attributeValue(0,ARRAY_COEF));
-     if(!c->use) 
-       continue;
-     st =   (*ARRAY_BASE_SYMBOL(sl->symb))->makeVarDeclStmt(); 
-     lstat -> insertStmtAfter(*st);
-   }
-  }
- 
- // create DATA statement for SAVE array headers: DATA a(1)/0/ b(1)/0/...
-  if(dsym && !IN_MODULE) { //distributed objects list is not empty
-   symb_list *sl;
-   char *data_str= new char[4000];
-   int i =0;                                                                       
-   sprintf(data_str,"data ");
-   for(sl=dsym; sl; sl=sl->next) {
-     if(IS_SAVE(sl->symb)) {
-        i++;
-        /*   if (i==5) {
-          strcat(data_str, "\n     +     ");
-           i=1;
-        }
-        */
-       strcat(data_str,sl->symb->identifier());
-       strcat(data_str,"(1)/0/ ");
-	// sprintf(data_str, "%s%s(1)/0/",data_str,sl->symb->identifier());  
-     }         
-   }
-   // strcat(data_str,"\n");
-   if(i) {
-   st = new SgStatement(DATA_DECL);// creates DATA statement
-   SgExpression  *es = new SgExpression(STMT_STR);
-     // e = new SgValueExp(data_str);
-     // NODE_STR(es->thellnd) = NODE_STR(e->thellnd);
-   NODE_STR(es->thellnd) = data_str;    //e->thellnd->entry.string_val = data_str;
-   st -> setExpression(0,*es); 
-   lstat -> insertStmtAfter(*st);  
-   }
-   }
- 
- // declaring DVM do-variables
-  for(j=0; j<nio;  j++) {
-          // loop_var[j] -> declareTheSymbol(*func);
-     st = loop_var[j] ->makeVarDeclStmt();
-
-     lstat2 -> insertStmtAfter(*st);
-  }
- 
- // declaring DVM memory variables
-  st1 = lstat2->lexNext();
-  
-  if(MemoryUse())  
-                          //if (mem_use[Integer] || mem_use[Real] || mem_use[Double] || mem_use[Complex] || mem_use[Logical] ||  mem_use[DComplex] || mem_use[Character])
-     mem_use[Integer] =  mem_use[Double] = 1; //DVM-COMMON-blocks must have the same length 
-  else
-      if(IN_MAIN_PROGRAM)                                 
-         mem_use[Integer] =  mem_use[Double] = 1;   //in MAIN-program DVM-COMMON must be always
- 
-  for(j=0,i=0; j<Ntp; j++)
-     if(mem_use[j] != 0)
-     {
-        st = mem_symb[j]->makeVarDeclStmt();
-        lstat2 -> insertStmtAfter(*st);
-        em[j] = new SgArrayRefExp(*mem_symb[j]);
-        i++;
-     }   
- 
-  if(i>1) {
-    // generating EQUIVALENCE statement
-    // EQUIVALENCE (Imem(0), Rmem(0),...,Lmem(0)) 
- 
-    j=0;
-    while (!mem_use[j])
-       j++;
-    el = new SgExprListExp(*em[j]);
-    for(j=j+1; j<Ntp; j++){
-       if(mem_use[j]) {
-            //el->append(*em[j]);
-         eel = new SgExprListExp(*em[j]);
-         eel->setRhs(*el);
-         el = eel;
-       }
-    }
-    eeq = new SgExpression (EQUI_LIST);
-    eeq -> setLhs(*el);
-    equiv = new SgStatement(EQUI_STAT);
-    equiv->setExpression(0,*eeq);
-    st1->insertStmtBefore(*equiv);
-  }
-
- // declaring DVM memory variable of type CHARACTER in MAIN-program
- // in MAIN-program DVM-COMMON must be always declared character array ch000m(0:1)
-   if(IN_MAIN_PROGRAM && !mem_use[Character]) { 
-     st = Chmem ->makeVarDeclStmt();
-     lstat -> insertStmtAfter(*st);
-  } 
-
-
- // declaring COMMON block for DVM memory variables
-  if(i) {
-     el = new SgExprListExp(* new SgArrayRefExp(*Imem));
-     eeq = new SgExpression (COMM_LIST);
-     eeq -> setSymbol(*dvmcommon);
-     eeq -> setLhs(*el);
-     com = new SgStatement(COMM_STAT);
-     com->setExpression(0,*eeq);
-     st1->insertStmtBefore(*com);
-  }      
-/*  if(mem_use[Character]) {
-     el = new SgExprListExp(* new SgArrayRefExp(*Chmem));
-     eeq = new SgExpression (COMM_LIST);
-     eeq -> setSymbol(*dvmcommon_ch);
-     eeq -> setLhs(*el);
-     com = new SgStatement(COMM_STAT);
-     com->setExpression(0,*eeq);
-     st1->insertStmtBefore(*com);     
-  }
-*/
- // declaring DVM memory variable of derived type
-  if(mem_use_structure){
-    base_list *el;
-    SgExpression *e;
-    for(el=mem_use_structure;el;el=el->next) {     
-      st = el->base_symbol ->makeVarDeclStmt();
-      lstat2 -> insertStmtAfter(*st);
-            
- // declaring COMMON block for DVM memory variables of derived type
-  
-     e = new SgExprListExp(* new SgArrayRefExp(*el->base_symbol));
-     eeq = new SgExpression (COMM_LIST);
-     eeq -> setSymbol(*CommonSymbol(el->type_symbol));
-     eeq -> setLhs(*e);
-     com = new SgStatement(COMM_STAT);
-     com->setExpression(0,*eeq);
-     st1->insertStmtBefore(*com);
-    }
-  }      
-
-
- // declaring buffer variables for remote access
-  for(i=0; i<Ntp; i++) 
-    if(rmbuf_size[i]) {
-      typearray = isSgArrayType(rmbuf[i]->type());
-      typearray-> addRange(* new SgValueExp(rmbuf_size[i]));
-      //rmbuf[i]-> declareTheSymbol(*func);
-      st = rmbuf[i] ->makeVarDeclStmt();
-      lstat -> insertStmtAfter(*st);
-    }
-
- // declaring DVM buffer variables for Input/Output
-  st1 = lstat->lexNext();
-  i=0;
-  for (j=0; j<Ntp; j++)
-     if(buf_use[j]){
-       //bufIO[j]-> declareTheSymbol(*func);
-       st = bufIO[j] ->makeVarDeclStmt();
-       lstat -> insertStmtAfter(*st);
-       em[j] = new SgArrayRefExp(*bufIO[j]);
-       i++;
-     }
-  
-  if(i && !buf_use[0]) { //declare integer I/O buffer always
-     buf_use[0] = 1;
-     st = bufIO[0] ->makeVarDeclStmt();
-     lstat -> insertStmtAfter(*st);
-     em[0] = new SgArrayRefExp(*bufIO[0]);
-     i++;  
-  } 
-   
-  if(i>1) {
-    // generating EQUIVALENCE statement
-    // EQUIVALENCE (i000io(1), r000io(1),...,l000io(1))
-    //              bufIO[0]   bufIO[1]      bufIO[4]
-    j=0;
-    while (!buf_use[j])
-       j++;
-    el = new SgExprListExp(*em[j]);
-    for(j=j+1; j<Ntp; j++){
-       if(buf_use[j]) {
-         eel = new SgExprListExp(*em[j]);
-         eel->setRhs(*el);
-         el = eel;
-         // el->append(*em[j]);
-       }
-    }
-    eeq = new SgExpression (EQUI_LIST);
-    eeq -> setLhs(*el);
-    equiv = new SgStatement(EQUI_STAT);
-    equiv->setExpression(0,*eeq);
-    st1->insertStmtBefore(*equiv);
-  }
-
-// declaring buffer HEAP for headers of dynamic arrays
-  if(heap_ar_decl && heap_size){
-    typearray = isSgArrayType(heapdvm->type());
-    typearray-> addRange(* new SgValueExp(heap_size));
-    st = heapdvm ->makeVarDeclStmt();
-      //st =fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-      //heap_ar_decl->setLhs(new SgExprListExp(new SgValueExp(heap_size)));
-      //(heap_ar_decl->lhs())->setRhs(NULL); 
-      //st -> setExpression(0,*new SgExprListExp(*heap_ar_decl)); 
-    if(len_DvmType)
-     st->expr(1)->setType(tlen); 
-    lstat -> insertStmtAfter(*st);
-// declaring COMMON block for headers of dynamic arrays
-     el = new SgExprListExp(* new SgArrayRefExp(*heapdvm));
-     eeq = new SgExpression (COMM_LIST);
-     eeq -> setSymbol(*heapcommon);
-     eeq -> setLhs(*el);
-     com = new SgStatement(COMM_STAT);
-     com->setExpression(0,*eeq);
-     lstat->insertStmtAfter(*com);            
-  }
-// declaring SAVE variables for SAVE-arrays used in REGION     
-  DeclareDataRegionSaveVariables(lstat, tlen); /*ACC*/
-
-} //endif !only_debug
-
-// declaring dvm-procedure for module as public
-   if(IN_MODULE && privateall && (st=doPublicStmtForDvmModuleProcedure(cur_func->symbol())))
-     lstat->insertStmtAfter(*st);
-
-// declaring variable for new IOSTAT specifier of Input/Output statement (if END=,ERR=,EOR= are replaced with IOSTAT=)
-  if(IOstat) 
-  {
-     st = IOstat ->makeVarDeclStmt();
-     lstat -> insertStmtAfter(*st);    
-  }
-
-// declare  mask for registration (only in module)
-   if(debug_regim && count_reg ) {
-     typearray = isSgArrayType(registration_array->type());
-     typearray-> addRange(* new SgValueExp(count_reg));  
-     st = registration_array ->makeVarDeclStmt();
-     eeq = DVMVarInitialization(st->expr(0)->lhs());
-     st->expr(0)->setLhs(eeq);
-     if(len_DvmType)
-     st->expr(1)->setType(tlen); 
-     st->setVariant(VAR_DECL_90);
-     lstat -> insertStmtAfter(*st);       
-   }
-
-// generate PARAMETER statement
-
- if(dvm_const_ref == 1) { 
-   st= new SgStatement(PARAM_DECL);   
-   el = NULL;
-   for(j=0; j<10; j++) {
-      eel =   new SgExprListExp(* new SgRefExp(CONST_REF, *Iconst[j]));
-      eel->setRhs(el);
-      el = eel;     
-   }   
-   st->setExpression(0,*el);
-   lstat2 -> insertStmtAfter(*st);
-
-// declare constants as INTEGER        
-   st = fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-   el = NULL;
-  
-  for(j=0; j<10; j++) {
-      eel =   new SgExprListExp(* new SgVarRefExp(Iconst[j]));
-      eel->setRhs(el);
-      el = eel;     
-   }
-  st -> setExpression(0,*el); 
-  if(len_DvmType)
-     st->expr(1)->setType(tlen); 
-  lstat2 -> insertStmtAfter(*st);
- }
-
-// declare  group names as INTEGER
-   if(grname) {
-   group_name_list *sl;
-   st =fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-   el = NULL;
-   for(sl=grname; sl; sl=sl->next) {
-      if (sl->symb->variant() == REF_GROUP_NAME)
-        eeq =  new SgArrayRefExp(*(sl->symb),*new SgValueExp(3));
-      else 
-        eeq =  new SgVarRefExp(*(sl->symb));
-      if(IN_MODULE)
-        eeq = DVMVarInitialization(eeq);
-      eel =   new SgExprListExp(* eeq);
-      eel->setRhs(el);
-      el = eel;
-   }
-   st -> setExpression(0,*el);
-   if(len_DvmType)
-     st->expr(1)->setType(tlen);  
-   if(IN_MODULE)
-     st->setVariant(VAR_DECL_90);
-   lstat -> insertStmtAfter(*st);
-
- 
-// declare common blocks for remote references groups
-   for(sl=grname; sl; sl=sl->next) 
-     if (sl->symb->variant() == REF_GROUP_NAME) {
-     el = new SgExprListExp(* new SgArrayRefExp(*(sl->symb)));
-     eeq = new SgExpression (COMM_LIST);
-     eeq -> setSymbol(*(sl->symb));
-     eeq -> setLhs(*el);
-     com = new SgStatement(COMM_STAT);
-     com->setExpression(0,*eeq);
-     st->insertStmtAfter(*com);
-   }
-
-// declare variables  for reduction groups and consistent groups
-  st =fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-   el = NULL;
-   for(sl=grname; sl; sl=sl->next) {
-     if (sl->symb->variant() == REDUCTION_GROUP_NAME || sl->symb->variant() == CONSISTENT_GROUP_NAME) {
-        SgSymbol *rgv;
-        int nl;
-        nl = sl->symb->variant() == REDUCTION_GROUP_NAME ? nloopred : nloopcons;
-        rgv = * ((SgSymbol **) (sl->symb)-> attributeValue(0,RED_GROUP_VAR)); 
-        ed = new SgExpression(DDOT,new SgValueExp(0),new SgValueExp(nl),NULL);
-        eeq =  new SgArrayRefExp(*rgv,*ed);
-        if(IN_MODULE)
-          eeq = DVMVarInitialization(eeq);
-        //eeq =  new SgArrayRefExp(*rgv,*new SgValueExp(nloopred));
-        eel =   new SgExprListExp(* eeq);
-        eel->setRhs(el);
-        el = eel;
-     }
-   }
-   if(el) {
-    st -> setExpression(0,*el);
-    if(len_DvmType)
-      st->expr(1)->setType(tlen); 
-    if(IN_MODULE)
-      st->setVariant(VAR_DECL_90);
-    lstat -> insertStmtAfter(*st);
-   } 
-}
-// declare common block for reduction variables
-   if(redvar_list && !only_debug) {
-     symb_list *sl;
-     char * ncom = new char[100];
-     char * f_name;
-     el = NULL;
-     redvar_list = SortingBySize(redvar_list);
-     for(sl=redvar_list; sl; sl=sl->next)
-       if (CURRENT_SCOPE(sl->symb) && !IS_ARRAY(sl->symb) && !IN_COMMON(sl->symb) && !IN_DATA(sl->symb) && !IS_DUMMY(sl->symb) && !IS_SAVE(sl->symb) && !IN_EQUIVALENCE(sl->symb) && strcmp(sl->symb->identifier(),cur_func->symbol()->identifier()) && (cur_func->expr(0) ? sl->symb != cur_func->expr(0)->symbol() : 1)) { 
-         eel = new SgExprListExp(* new SgVarRefExp(*(sl->symb)));
-         el = (SgExprListExp*) AddListToList(el,eel);
-       }
-     if (el){
-       f_name = cur_func->symbol()->identifier();
-       if(f_name[0]=='_') //main program unit without name: sage-name == _MAIN
-         f_name=f_name+1;
-       sprintf(ncom,"%s%s", f_name,"dvm");
-       st = cur_func->symbol()->scope();
-       redcommon = new SgSymbol(VARIABLE_NAME,ncom,*st);
-       eeq = new SgExpression (COMM_LIST);
-       eeq -> setSymbol(*redcommon);
-       eeq -> setLhs(*el);
-       com = new SgStatement(COMM_STAT);
-       com->setExpression(0,*eeq);
-       lstat->insertStmtAfter(*com);  
-     }     
-   }
-
-// declare processor array names as INTEGER
-   if(proc_symb) {
-   symb_list *sl;
-   st =fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-   el = NULL;
-   for(sl=proc_symb; sl; sl=sl->next) {
-      eel =   new SgExprListExp(* new SgVarRefExp(*(sl->symb)));
-      eel->setRhs(el);
-      el = eel;
-   }
-   st -> setExpression(0,*el);
-   if(len_DvmType)
-     st->expr(1)->setType(tlen);  
-   lstat -> insertStmtAfter(*st);
-   }
-
-// declare index variables (optimization code)
-   if(index_symb) {
-   symb_list *sl;
-   for(sl=index_symb; sl; sl=sl->next) {
-     st =   sl->symb->makeVarDeclStmt(); 
-     lstat -> insertStmtAfter(*st);
-   }
-   }
-
-// declare  task arrays as INTEGER
-   if(task_symb){
-   symb_list *sl;
-   SgArrayType *artype;
-   st =fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-   el = NULL;
-   for(sl=task_symb; sl; sl=sl->next) {
-      artype = isSgArrayType(sl->symb->type());
-      eel = new SgExprListExp(* new SgArrayRefExp(*(sl->symb),*new SgValueExp(2),*artype->sizeInDim(0)));
-      eel->setRhs(el);
-      el = eel;
-      eel = new SgExprListExp(*new SgVarRefExp(TASK_SYMBOL(sl->symb))); // symbol for TASK AMview
-      eel->setRhs(el);
-      el = eel;
-   }
-   st -> setExpression(0,*el);
-   if(len_DvmType)
-     st->expr(1)->setType(tlen);  
-   lstat -> insertStmtAfter(*st);
-             //SgSymbol *s= TASK_IND_VAR(task_symb->symb);
-   st = fdvm[0]->makeVarDeclStmt();
-   el = NULL;
-   for(sl=task_symb; sl; sl=sl->next) {
-      artype = isSgArrayType(sl->symb->type());
-      eel = new SgExprListExp(* new SgArrayRefExp(*TASK_RENUM_ARRAY(sl->symb),*artype->sizeInDim(0)));
-      eel->setRhs(el);
-      el = eel;
-      if(TASK_AUTO(sl->symb))
-      {
-      eel = new SgExprListExp(* new SgArrayRefExp(*TASK_HPS_ARRAY(sl->symb),*artype->sizeInDim(0)));
-      eel->setRhs(el);
-      el = eel;
-      eel = new SgExprListExp(* new SgArrayRefExp(*TASK_LPS_ARRAY(sl->symb),*artype->sizeInDim(0)));
-      eel->setRhs(el);
-      el = eel;
-      }
-      //eel = new SgExprListExp(*new SgVarRefExp(TASK_IND_VAR(sl->symb))); // symbol for TASK index variable
-      //eel->setRhs(el);
-      //el = eel;
-   }
-   st -> setExpression(0,*el);
-   if(len_DvmType)
-     st->expr(1)->setType(tlen);  
-   lstat -> insertStmtAfter(*st);
-
-   }
-
-// declare  ASYNCID as INTEGER
-   if(async_symb){
-   symb_list *sl;
-   SgArrayType *artype;
-   //SgArrayRefExp *ae;
-   st =fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-   el = NULL;
-   for(sl=async_symb; sl; sl=sl->next) {
-     //eel = new SgExprListExp(* new SgArrayRefExp(*(sl->symb),*new SgValueExp(ASYNCID_NUMB)));
-       //eeq = new SgArrayRefExp(*(sl->symb),*new SgValueExp(ASYNCID_NUMB));
-      eeq = new SgArrayRefExp(*(sl->symb));
-      artype = isSgArrayType(sl->symb->type());
-      if(artype) 
-	 eeq->setLhs(artype->getDimList());  //add dimensions of array
-      else
-	 eeq->setLhs(new SgValueExp(ASYNCID_NUMB));
-      if(IN_MODULE)
-        eeq = DVMVarInitialization(eeq);
-      eel = new SgExprListExp(*eeq);
-      eel->setRhs(el);
-      el = eel;
-   }
-   st -> setExpression(0,*el);
-   if(len_DvmType)
-     st->expr(1)->setType(tlen);  
-   if(IN_MODULE)
-     st->setVariant(VAR_DECL_90);
-   lstat -> insertStmtAfter(*st);
-   
-
-// declare common blocks for ASYNCID variables 
-   for(sl=async_symb; sl; sl=sl->next) {
-    if(IN_COMMON(sl->symb)) {
-     el = new SgExprListExp(* new SgArrayRefExp(*(sl->symb)));
-     eeq = new SgExpression (COMM_LIST);
-     eeq -> setSymbol(*(sl->symb));
-     eeq -> setLhs(*el);
-     com = new SgStatement(COMM_STAT);
-     com->setExpression(0,*eeq);
-     st->insertStmtAfter(*com);
-    }
-   }
-  }
-
-// declare  scalar variables for copying array header elements used for referencing array  
-   if(!HPF_program && dsym ) {
-   symb_list *sl;
-   coeffs * c;
-   int i,rank,i0;
-   SgExpression *eepub, *lpub=NULL;
-   st =fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-   el = NULL;
-   for(sl=dsym; sl; sl=sl->next) {
-     c = ((coeffs *) sl->symb-> attributeValue(0,ARRAY_COEF));
-     if(IS_TEMPLATE(sl->symb) || !c->use) 
-       continue;
-     int flag_public = IN_MODULE && privateall && sl->symb->attributes() & PUBLIC_BIT ? 1 : 0;
-     rank=Rank(sl->symb);
-     i0 = opt_base ? 1 : 2;
-     if(opt_loop_range) i0=0;
-     for(i=i0;i<=rank;i++){
-       eel = new SgExprListExp(* new SgVarRefExp(*(c->sc[i])));
-       eepub = flag_public ? &eel->copy() : NULL;
-       eel->setRhs(el);
-       el = eel;
-       if(flag_public)
-       {         
-         eepub->setRhs(lpub);
-         lpub = eepub;
-       }
-     } 
-     eel = new SgExprListExp(* new SgVarRefExp(*(c->sc[rank+2])));
-     eepub = flag_public ? &eel->copy() : NULL;
-     eel->setRhs(el);
-     el = eel;
-     if(flag_public)
-     {
-       eepub->setRhs(lpub);
-       lpub = eepub;
-     }
-
-   }
-   if(el){
-     st -> setExpression(0,*el);
-     if(len_DvmType)
-       st->expr(1)->setType(tlen);  
-     lstat -> insertStmtAfter(*st);
-   }
-   if(lpub){
-     st = new SgStatement(PUBLIC_STMT);
-     st->setExpression(0,*lpub);
-     lstat -> insertStmtAfter(*st);
-   }
-   }
-
-
-// declare  Pipeline variable for ACROSS implementation
-   if(pipeline){
-     st = Pipe->makeVarDeclStmt();
-     lstat -> insertStmtAfter(*st);
-   }
-
-// declare  Debug variable for -dbif regim
-   if(dbg_if_regim && dbg_var && !IN_MODULE) {
-      st = dbg_var->makeVarDeclStmt();
-     lstat -> insertStmtAfter(*st);
-  
-// declaring COMMON block for Debug variable
-  
-     el = new SgExprListExp(* new SgVarRefExp(*dbg_var));
-     eeq = new SgExpression (COMM_LIST);
-     eeq -> setSymbol(*dbgcommon);
-     eeq -> setLhs(*el);
-     com = new SgStatement(COMM_STAT);
-     com->setExpression(0,*eeq);
-     lstat->insertStmtAfter(*com);
-  }      
-
-
-// declare  CheckSumma variable for -dc regim
-   if(check_sum){
-     st = check_sum->makeVarDeclStmt();
-     lstat -> insertStmtAfter(*st);
-   }
-
-// declare  FileNameVariables
-   if(fnlist){
-   filename_list *sl;
-   for(sl=fnlist; sl; sl=sl->next) {
-     st =sl->fns->makeVarDeclStmt();//character variables
-     
-     st->expr(0)->setLhs(FileNameInitialization(st->expr(0)->lhs(),sl->name));     
-     st->setVariant(VAR_DECL_90);
-     
-     lstat2 -> insertStmtAfter(*st);
-   }
-   }
-
-// declare  CONSISTENT array headers as INTEGER
-   if(consistent_symb) {
-   symb_list *sl;
-   SgExpression *ea;
-   st =fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-
-   el = NULL;
-   for(sl=consistent_symb; sl; sl=sl->next) {
-  
-     /* if(IN_COMMON(sl->symb) && cur_func->variant() != PROG_HEDR)
-	continue;*/ /*25.03.03*/
-      ea = new SgArrayRefExp(*(CONSISTENT_HEADER(sl->symb)),*new SgValueExp(HSIZE(Rank(sl->symb))));
-      ea->setType(*SgTypeInt());       
-      eel =   new SgExprListExp(*ea);
-      eel->setRhs(el);
-      el = eel;
-   }
-   if(el) {
-   st -> setExpression(0,*el); 
-   if(len_DvmType)
-     st->expr(1)->setType(tlen); 
-   lstat -> insertStmtAfter(*st);
-   }
-   }
-
-// declare variables for saving conditional expression for Arithmetic IF and Computed GO TO
-// for regim of debugging and performance analysing
-   if(if_goto) {
-   symb_list *sl;
-   for(sl=if_goto; sl; sl=sl->next)
-     {st = (sl->symb)->makeVarDeclStmt();
-      lstat -> insertStmtAfter(*st);
-     }
-   }
- 
- HEADERS_:     //begin generating for interface block 
-
-// declare  array headers as INTEGER
-   if(dsym) {
-   symb_list *sl;
-   SgExpression *ea,*ehs;
-   st =fdvm[0]->makeVarDeclStmt();// creates INTEGER name, then name is removed
-   el = NULL;
-   for(sl=dsym; sl; sl=sl->next) {
-        if(IS_BY_USE(sl->symb)) continue;
-         //if(!isSgArrayType(sl->symb->type())) //for POINTER       
-         // sl->symb ->setType(* new SgArrayType(*SgTypeInt()));
-      ///if(IS_TEMPLATE(sl->symb) && !RTS2_OBJECT(sl->symb)) { 
-      ///     ea = new SgVarRefExp(*(sl->symb));
-	
-      ///} else {
-        ehs = IS_POINTER_F90(sl->symb) ? new SgExpression(DDOT) : new SgValueExp(HEADER_SIZE(sl->symb));
-        ea = new SgArrayRefExp(*(sl->symb),*ehs);
-        if(IS_POINTER(sl->symb) && (sl->symb->attributes() & DIMENSION_BIT)) { //array of POINTER
-          SgArrayType *artype;
-          artype = isSgArrayType(sl->symb->type());
-          if(artype) 
-            (ea->lhs())->setRhs(artype->getDimList());  //add dimensions of array
-        }  
-      ///}
-            //TYPE_BASE(sl->symb->type()->thetype) = SgTypeInt()->thetype;
-      ea->setType(*SgTypeInt()); 
-      if(IN_MODULE && !IS_POINTER_F90(sl->symb))
-        ea = DVMVarInitialization(ea);
-      eel =   new SgExprListExp(*ea);
-      eel->setRhs(el);
-      el = eel;
-   }
-   if(el) {
-     st -> setExpression(0,*el); 
-     if(len_DvmType)
-       st->expr(1)->setType(tlen); 
-     if(IN_MODULE)
-       st->setVariant(VAR_DECL_90);
-     lstat -> insertStmtAfter(*st);   
-   }
- 
-  }
-
-//declare Common-blocks for TEMPLATE with attribute COMMON
-  {   
-   symb_list *sl;
-   for(sl=dsym; sl; sl=sl->next) {
-     if(IS_TEMPLATE(sl->symb) && IN_COMMON(sl->symb)) {     
-       el = new SgExprListExp(* new SgVarRefExp(*(sl->symb)));
-       eeq = new SgExpression (COMM_LIST);
-       eeq -> setSymbol(*(sl->symb));
-       eeq -> setLhs(*el);
-       com = new SgStatement(COMM_STAT);
-       com->setExpression(0,*eeq);
-       st->insertStmtAfter(*com);
-     }     
-   }
-  }
-// end of declaration generating for interface block
-   if(in_interface) return; 
-
-// declare array hpf000(N), N = maxhpf
-  if(HPF_program && maxhpf != 0) {    
-  typearray = isSgArrayType(hpfbuf->type());
-  typearray-> addRange(* new SgValueExp(maxhpf));
-  st = hpfbuf ->makeVarDeclStmt();
-  if(len_DvmType)
-    st->expr(1)->setType(tlen); 
-  lstat2 -> insertStmtAfter(*st);
- }
-
-// declare array dvm000(N), N = maxdvm
- if(cur_func->variant() == PROG_HEDR || !(maxdvm <= 3 && fmask[RTLINI] == 0 && fmask[BEGBL] == 0 && fmask[FNAME] == 0 && fmask[GETVM] == 0 && fmask[GETAM] == 0 && fmask[DVMLF] == 0)) {      
-  typearray = isSgArrayType(dvmbuf->type());
-  typearray-> addRange(* new SgValueExp(maxdvm));
-  //dvmbuf-> declareTheSymbol(*func);
-  st = dvmbuf ->makeVarDeclStmt();
-  if(len_DvmType)
-    st->expr(1)->setType(tlen); 
-  lstat2 -> insertStmtAfter(*st);
- }
-
-// declare LibDVM functions as INTEGER
-  i=0; 
-  while ( (i<MAX_LIBFUN_NUM) && (fmask[i] != 1) ) //looking for first element of fmask[] equal to 1
-      i++; 
-   if(i == MAX_LIBFUN_NUM) goto EXTERN_; 
-   st = fdvm[i]->makeVarDeclStmt();
-   el = isSgExprListExp(st->expr(0));
-                       //   el = new SgExprListExp(* new SgVarRefExp(fdvm[0]));
-   for(j=i+1; fdvm[j] && j<MAX_LIBFUN_NUM ; j++) {
-     if(fmask[j] == 1) {
-      eel =   new SgExprListExp(* new SgVarRefExp(fdvm[j]));
-      eel->setRhs(*el);
-      el = eel;
-      //el->append (* em[0]);
-     }
-   }
-   st -> setExpression(0,*el); 
-   if(len_DvmType)
-     st->expr(1)->setType(tlen); 
-
-   lstat2 -> insertStmtAfter(*st);
-
-// declare LibDVM subroutines as EXTERNAL
-EXTERN_:
-  i=0; 
-  while ( (i<MAX_LIBFUN_NUM) && (fmask[i] != 2) ) //looking for first element of fmask[] equal to 2
-      i++; 
-   if(i == MAX_LIBFUN_NUM)   goto GPU_; 
-   st = new SgStatement(EXTERN_STAT);
-   el = new SgExprListExp(* new SgVarRefExp(fdvm[i]));
-   for(j=i+1; fdvm[j] && j<MAX_LIBFUN_NUM ; j++) {
-     if(fmask[j] == 2) {
-      eel =   new SgExprListExp(* new SgVarRefExp(fdvm[j]));
-      eel->setRhs(*el);
-      el = eel;
-     }
-   }
-   st -> setExpression(0,*el); 
-
-   lstat2 -> insertStmtAfter(*st);
-
-GPU_:  
-// declare GPU objects
-   if(!IN_MODULE)   
-     DeclareVarGPU(lstat,tlen);  /*ACC*/
-// add comment
-   if(lstat->lexNext() != st_next)
-    (lstat->lexNext())->setComments("! DVMH declarations \n");
-}
-
-void TranslateFileDVM(SgFile *f)
-{
-   SgStatement *func,*stat,*end_of_source_file;
-   SgStatement *end_of_unit;  // last node (END or CONTAINS statement) of program unit
-
-                
-   InitializeACC();
-
-// grab the first statement in the file.
-   stat = f->firstStatement(); // file header
-//last statement of file 
-   end_of_source_file = FILE_LAST_STATEMENT(stat) ? *FILE_LAST_STATEMENT(stat) : lastStmtOfFile(f); 
-// add empty-statement to insert generated procedures at the end of file (after that)  
-   end_of_source_file->insertStmtAfter( *new SgStatement(COMMENT_STAT),*stat);
-   end_of_source_file = end_of_source_file->lexNext();
-   if(ACC_program || parloop_by_handler)
-     end_of_source_file->addComment("!-----------------------------------------------------------------------\n"); 
-  
-                     //numfun = f->numberOfFunctions(); //  number of functions
-// function is program unit accept BLOCKDATA and MODULE (F90),i.e. 
-// PROGRAM, SUBROUTINE, FUNCTION
-   if(debug_fragment || perf_fragment) // is debugging or performance analizing regime specified ?
-     BeginDebugFragment(0,NULL);// begin the fragment with number 0 (involving whole file(program) 
-                    //for(i = 0; i < numfun; i++) { 
-                    //   func = f -> functions(i);
-  
-   for(stat=stat->lexNext(); stat!=end_of_source_file; stat=end_of_unit->lexNext()) 
-   {
-     if(stat->variant() == CONTROL_END) {  //end of procedure or module with CONTAINS statement  
-       end_of_unit = stat; 
-       continue;
-     }
-
-     if( stat->variant() == BLOCK_DATA){//BLOCK_DATA header 
-       TransBlockData(stat, end_of_unit); //replacing variant VAR_DECL with VAR_DECL_90 for declaration statement with initialisation
-       continue;
-     }
-     // PROGRAM, SUBROUTINE, FUNCTION header
-     func = stat; 
-     cur_func = stat;
-    
-        //scanning the Symbols Table of the function 
-        //     ScanSymbTable(func->symbol(), (f->functions(i+1))->symbol());
-
-    
-     // translating the program unit (procedure, module)
-     if(only_debug)
-        InsertDebugStat(func, end_of_unit);
-     else
-        TransFunc(func, end_of_unit);
-        
-   }
-  
-   if(ACC_program)
-   { InsertCalledProcedureCopies();
-     AddExternStmtToBlock_C();
-     GenerateEndIfDir();
-     GenerateDeclarationDir(); 
-     GenerateStmtsForInfoFile();  
-   }
-}
-
-
-void TransFunc(SgStatement *func,SgStatement* &end_of_unit) {
-  SgStatement *stmt,*last,*rmout, *data_stf, *first, *first_dvm_exec, *last_spec, *stam, *last_dvm_entry, *lentry = NULL;
-  SgStatement *st_newv = NULL;// for NEW_VALUE directives
-  SgExpression *e;
-  SgStatement *task_region_parent = NULL, *on_stmt = NULL, *mod_proc, *begbl = NULL, *dvmh_init_st=NULL;
-  SgStatement *copy_proc = NULL;
-  SgStatement *has_contains = NULL;
-  SgLabel *lab_exec;
-
-  int i;
-  int begin_block;
-  distribute_list *distr =  NULL;
-  distribute_list *dsl,*distr_last = NULL;
-  align *pal = NULL;
-  align *node, *root = NULL;
-  stmt_list *pstmt = NULL;
-  int inherit_is = 0;  
-  int contains[2];
-  int in_on = 0;
-  char io_modes_str[4] = "\0";
-
-  //initialization
-  dsym = NULL;
-  grname = NULL;
-  saveall = 0;
-  maxdvm = 0;
-  maxhpf = 0;
-  count_reg = 0;
-  initMask();
-  data_stf = NULL;
-  loc_distr = 0;
-  begin_block = 0;
-  goto_list = NULL;
-  proc_symb = NULL;
-  task_symb = NULL;
-  consistent_symb = NULL;
-  async_symb = NULL;
-  check_sum = NULL;
-  loc_templ_symb=NULL;
-  index_symb = NULL;
-  nio = 0;
-  task_do = NULL;
-  for (i=0; i<Ntp; i++)
-  {  mem_use[i] = 0;
-     mem_symb[i] = NULL;
-  }
-  mem_use_structure = NULL;
-  heap_ar_decl = NULL;
-  is_heap_ref = 0;
-  //heap_size = 1;
-  heap_size = 0;
-  pref_st = NULL;
-  pipeline = 0;  
-  registration = NULL;
-  filename_num = 0;
-  fnlist = NULL;
-  nloopred = 0;
-  nloopcons = 0;
-  wait_list = NULL;
-  SIZE_function = NULL;
-  dvm_const_ref = 0;
-  in_interface = 0;
-  mod_proc = NULL;
-  if_goto = NULL;
-  nifvar = 0;
-  entry_list = NULL;
-  dbif_cond = 0;
-  dbif_not_cond = 0;
-  last_dvm_entry = NULL;
-  allocated_list = NULL;
-  privateall = 0;
-  //if(ACC_program)
-  InitializeInFuncACC();
-  all_replicated = isInternalOrModuleProcedure(func) ? 0 : 1;
-  //Private_Vars_Function_Analyzer(func);
-  TempVarDVM(func);
-  initF90Names();
-  first = func->lexNext();
-    //!!!debug
-    //if(fsymb)
-    //printf("\n%s   %s \n", header(func->variant()),fsymb->identifier()); 
-    //else {
-    //printf("Function name error  \n");
-    //return;
-    //}
- //get the last node of the program unit(function) 
-  last = func->lastNodeOfStmt();
-  end_of_unit = last;
-  if(!(last->variant() == CONTROL_END))
-     printf(" END Statement is absent\n");
-/*
-  fsymb = func->symbol();
-  if((func->variant() == PROG_HEDR) && !strcmp(fsymb->identifier(),"_MAIN")){ 
-     progsymb = new SgFunctionSymb(PROGRAM_NAME, "MAIN", *SgTypeInt(), *current_file->firstStatement() );
-     func->setSymbol(*progsymb);
-  }
-*/
-
-//**********************************************************************
-//           Specification Directives Processing 
-//**********************************************************************
-// follow the statements of the function in lexical order
-// until first executable statement
-  for (stmt = first; stmt && (stmt != last); stmt = stmt->lexNext()) {
-               //printf("statement %d %s\n",stmt->lineNumber(),stmt->fileName());
-    
-    if (!isSgExecutableStatement(stmt)) //is Fortran specification statement
-// isSgExecutableStatement: 
-//               FALSE  -  for specification statement of Fortan 90
-//               TRUE   -  for executable statement of Fortan 90 and
-//                         all directives of F-DVM 
-      {
-	 //!!!debug
-           //printVariantName(stmt->variant()); //for debug
-           //printf("\n");
-
-        //discovering distributed arrays in COMMON-blocks
-        if(stmt->variant()==COMM_STAT) {
-          DeleteShapeSpecDAr(stmt);
-
-          if( !DeleteHeapFromList(stmt) ) { //common list is empty
-             stmt=stmt->lexPrev();
-             stmt->lexNext()->extractStmt(); //deleting the statement
-          } 
-          continue; 
-	}  
-	// analizing SAVE statement
-	if(stmt->variant()==SAVE_DECL) { 
-           if (!stmt->expr(0))  //SAVE without name-list
-             saveall = 1;
-           else if(IN_MAIN_PROGRAM)
-             pstmt = addToStmtList(pstmt, stmt);   //for extracting and replacing by SAVE without list
-           continue;
-        }
-        // deleting SAVE-attribute from Type Declaration Statement (for replacing by SAVE without list)
-        if(IN_MAIN_PROGRAM && isSgVarDeclStmt(stmt))          
-             DeleteSaveAttribute(stmt);
-
-	if(IN_MODULE && stmt->variant() == PRIVATE_STMT && !stmt->expr(0))
-             privateall = 1; 
-
-        // deleting distributed arrays from variable list of declaration
-        // statement and testing are there any group names
-        if( isSgVarDeclStmt(stmt) || isSgVarListDeclStmt(stmt)) {
-           
-           if( !DeleteDArFromList(stmt) ) { //variable list is empty
-             stmt=stmt->lexPrev();
-             stmt->lexNext()->extractStmt(); //deleting the statement
-           }
-           continue;
-        }
- 
-        if((stmt->variant() == DATA_DECL) || (stmt->variant() == STMTFN_STAT)) {
-	  if(stmt->variant() == STMTFN_STAT && stmt->expr(0) && stmt->expr(0)->symbol() && ((!strcmp(stmt->expr(0)->symbol()->identifier(),"number_of_processors")) || (!strcmp(stmt->expr(0)->symbol()->identifier(),"processors_rank")) || (!strcmp(stmt->expr(0)->symbol()->identifier(),"processors_size")))){
-             stmt=stmt->lexPrev();
-             stmt->lexNext()->extractStmt(); 
-                           //deleting the statement-function declaration named 
-	                   //  NUMBER_OF_PROCESSORS or PROCESSORS_RANK or PROCESSORS_SIZE 
-             continue;
-          } 
-          if(stmt->variant()==STMTFN_STAT)
-            DECL(stmt->expr(0)->symbol()) = 2;     //flag of statement function name
-
-          if(!data_stf)
-            data_stf = stmt; //first statement in data-or-function statement part 
-          continue; 
-        }   
-        if (stmt->variant() == ENTRY_STAT) {
-	     //err("ENTRY statement is not permitted in FDVM", stmt);  
-          warn("ENTRY among specification statements", 81,stmt);  
-          continue;
-        }
-        if(stmt->variant() == INTERFACE_STMT || stmt->variant() == INTERFACE_ASSIGNMENT || stmt->variant() == INTERFACE_OPERATOR){
-          stmt = InterfaceBlock(stmt);  //stmt->lastNodeOfStmt();
-          continue;
-	}
-
-        if( stmt->variant() == USE_STMT) {
-          all_replicated=0; 
-          if(stmt->lexPrev() != func && stmt->lexPrev()->variant()!=USE_STMT) 
-            err("Misplaced USE statement", 639, stmt); 
-          UpdateUseListWithDvmArrays(stmt);
-          continue;
-        }
-
-	if(stmt->variant() == STRUCT_DECL){
-          StructureProcessing(stmt);
-          stmt=stmt->lastNodeOfStmt();
-          continue;
-        }
-
-        continue;             
-      }
-
-    if ((stmt->variant() == FORMAT_STAT))        // || (stmt->variant() == DATA_DECL))
-       {// printf("  ");
-	 // printVariantName(stmt->variant()); //for debug
-         //printf("\n");
-         continue;
-       }
-    
-
-// processing the DVM Specification Directives
-
-    //including the DVM specification directive to list of these directives
-      pstmt = addToStmtList(pstmt, stmt); 
-    
-    switch(stmt->variant()) {
-       case(ACC_ROUTINE_DIR):
-           ACC_ROUTINE_Directive(stmt); 
-           continue;
-       case(ACC_DECLARE_DIR):
-           ACC_DECLARE_Directive(stmt); 
-           continue;
-       case(HPF_TEMPLATE_STAT):
-           if(IN_MODULE && stmt->expr(1))
-              err("Illegal directive in module",632,stmt);
-           TemplateDeclarationTest(stmt);
-           continue;
-       case(HPF_PROCESSORS_STAT):
-         //!!!for debug
-	 // printf("CDVM$    ");
-         //  printVariantName(stmt->variant()); 
-         //  printf("\n");
-         //
-           continue;
-     case(DVM_DYNAMIC_DIR):
-          {SgExpression *el;
-           SgSymbol *ar;
-           for(el = stmt->expr(0); el; el=el->rhs()){ // array name list
-               ar = el->lhs()->symbol();  //array name
-               //if(!(ar->attributes() & ALIGN_BIT) && !(ar->attributes() & DISTRIBUTE_BIT) && !(ar->attributes() & INHERIT_BIT))
-		 // SYMB_ATTR(ar->thesymb)= SYMB_ATTR(ar->thesymb) | POSTPONE_BIT;
-	   }
-           all_replicated = 0;
-          }
-           continue;
-       case(DVM_SHADOW_DIR):
-           {SgExpression *el;
-            SgExpression **she = new (SgExpression *);
-            SgSymbol *ar;
-            int nw=0;
-         // calculate lengh of shadow_list
-            for(el = stmt->expr(1); el; el=el->rhs())
-               nw++;
-           *she = stmt->expr(1);
-           for(el = stmt->expr(0); el; el=el->rhs()){ // array name list
-               ar = el->lhs()->symbol();  //array name
-               ar->addAttribute(SHADOW_WIDTH, (void *) she, sizeof(SgExpression *));
-	       /*   if(nw<Rank(ar)) 
-                 Warning("Length of shadow-spec-list is smaller than the rank of array '%s'", ar->identifier(), stmt);   
-		*/ 
-               if (nw!=Rank(ar)) // wrong shadow width list
-                Error("Length of shadow-edge-list is not equal to the rank of array '%s'", ar->identifier(), 88, stmt);
-	   }
-           }   
-//!!!for debug
-           //printf("CDVM$    ");
-           //printVariantName(stmt->variant()); 
-           // printf("\n");
-//
-           continue;
-
-       case(DVM_TASK_DIR): 
-           {SgExpression * sl; 
-	    for(sl=stmt->expr(0); sl; sl = sl->rhs()) 
-              task_symb=AddToSymbList(task_symb, sl->lhs()->symbol()); 
-           }
-            continue;
-
-      case(DVM_CONSISTENT_DIR): 
-           {SgExpression * sl; 
-	    for(sl=stmt->expr(0); sl; sl = sl->rhs()) {
-              SgSymbol **header = new (SgSymbol *); 
-              consistent_symb=AddToSymbList(consistent_symb, sl->lhs()->symbol());
-              *header= CreateConsistentHeaderSymb(sl->lhs()->symbol());
-              // adding the attribute (CONSISTENT_ARRAY_HEADER) to distributed array symbol
-              sl->lhs()->symbol()->addAttribute(CONSISTENT_ARRAY_HEADER, (void*) header, sizeof(SgSymbol *));
-            } 
-           }
-            continue;
-
-       case(DVM_INDIRECT_GROUP_DIR):
-       case(DVM_REMOTE_GROUP_DIR):
-           {SgExpression * sl; 
-            if(options.isOn(NO_REMOTE))
-               continue;
-            if(INTERFACE_RTS2)
-               err("Illegal directive in -Opl2 mode. Asynchronous operations are not supported in this mode", 649, stmt);    
-	    for(sl=stmt->expr(0); sl; sl = sl->rhs()){
-               SgArrayType *artype;
-               artype = new SgArrayType(*SgTypeInt());  
-               artype->addRange(*new SgValueExp(3));
-               sl->lhs()->symbol()->setType(artype);
-               AddToGroupNameList(sl->lhs()->symbol()); 
-            }
-           }
-            continue;
-
-       case DVM_CONSISTENT_GROUP_DIR:
-       case DVM_REDUCTION_GROUP_DIR:
-            if(INTERFACE_RTS2)
-               err("Illegal directive in -Opl2 mode. Asynchronous operations are not supported in this mode", 649, stmt);    
-	   {SgExpression * sl; 
-	    for(sl=stmt->expr(0); sl; sl = sl->rhs())
-               AddToGroupNameList(sl->lhs()->symbol()); 
-           }
-            continue;
-      
-       case(DVM_INHERIT_DIR): 
-          {SgExpression * sl; 
-            inherit_is = 1; all_replicated = 0;
-	    for(sl=stmt->expr(0); sl; sl = sl->rhs()){
-              if(IS_DUMMY(sl->lhs()->symbol()))
-                ArrayHeader(sl->lhs()->symbol(),1);
-              else 
-                Error("Inconsistent declaration of identifier '%s'",sl->lhs()->symbol()->identifier(),16,stmt);
-            }
-          }
-            continue;
-
- ALIGN:
-       case(DVM_ALIGN_DIR): // adding the alignees and the align_base to
-                            // the Align_Tree_List
-         { SgSymbol *base, *alignee;
-           SgExpression *eal;
-           algn_attr *attr_base, *attr_alignee;
-           //dvm = 1;
-           attr_base = attr_alignee = NULL;
-           if(stmt->expr(2)){
-             base = (stmt->expr(2)->variant()==ARRAY_OP) ? (stmt->expr(2))->rhs()->symbol()                                                          :  (stmt->expr(2))->symbol();
-                                                   // align_base symbol
-             attr_base = (algn_attr *) base->attributeValue(0,ALIGN_TREE);
-           }
-           else 
-             base = NULL;
-           for(eal=stmt->expr(0); eal; eal=eal->rhs()) {
-                                              //scanning the alignees list 
-                                              // (eal - SgExprListExp)
-              alignee = (eal->lhs())->symbol();
-              if(alignee->attributes() & EQUIVALENCE_BIT)
-                 Error("DVM-array cannot be specified in EQUIVALENCE statement: %s", alignee->identifier(),341,stmt);
-              if(alignee == base)
-              {  Error("'%s' is aligned with itself", alignee->identifier(), 266,stmt);
-                 continue;
-              } 
-              if(stmt->expr(1) && IN_MODULE && IS_ALLOCATABLE_POINTER(alignee))
-                Error("Inconsistent declaration of identifier '%s'", alignee->identifier(), 16,stmt);
-              attr_alignee=(algn_attr *) alignee->attributeValue(0,ALIGN_TREE);
-              if(stmt->expr(2) && (stmt->expr(2)->variant()==ARRAY_OP) && !IS_DUMMY(alignee))
-	        Error("Inconsistent declaration of identifier '%s'", alignee->identifier(), 16,stmt);
-              if(!stmt->expr(1) && ! stmt->expr(2)) {
-                SYMB_ATTR(alignee->thesymb)= SYMB_ATTR(alignee->thesymb) | POSTPONE_BIT;
-                if(!attr_alignee){
-                // creating new node for the alignee
-                 node = new align; 
-                 node->symb = alignee;
-                 node->next = pal;
-                 node->alignees = NULL;
-                 node->align_stmt = stmt;
-                 pal = node;
-                // adding the attribute (ALIGN_TREE) to the alignee symbol
-                 attr_alignee = new algn_attr;
-                 attr_alignee->type = NODE;
-                 attr_alignee->ref  = node;     
-                 alignee->addAttribute(ALIGN_TREE, (void *) attr_alignee,                                                            sizeof(algn_attr));
-               } else 
-                 if(attr_alignee->type == NODE) {
-                   Err_g("Duplicate aligning of the array '%s'",alignee->identifier(),82);
-                   continue;
-                 }
-                node= attr_alignee->ref;
-                node->align_stmt = stmt; 
-                continue;
-                 
-	      }  
-              if (!pal || (!attr_base && !attr_alignee))  {
-                 // creating new tree with root for align_base
-                 node = new align; // creating new node for the alignee
-                 node->symb = alignee;
-                 node->next = NULL;
-                 node->alignees = NULL;
-                 node->align_stmt = stmt;
-                 root = new align; // creating new node for the base (root)
-                 root->symb = base;
-                 root->next = pal;
-                 root->alignees = node;
-                 root->align_stmt = NULL;
-                 pal = root; // pal points to this tree
-      
-                 // adding the attribute (ALIGN_TREE) to the base symbol
-                 attr_base = new algn_attr;
-                 attr_base->type = ROOT;
-                 attr_base->ref  = root;     
-                 base->addAttribute(ALIGN_TREE, (void *) attr_base,                                                                  sizeof(algn_attr));
-//for debug
-               //printf("Attribute ALIGN_TREE of %s : type = %d\n",         base->identifier(), ((algn_attr*) base->attributeValue(0,ALIGN_TREE))->type);                 
-                 // adding the attribute (ALIGN_TREE) to the alignee symbol
-                 attr_alignee = new algn_attr;
-                 attr_alignee->type = NODE;
-                 attr_alignee->ref  = node;     
-                 alignee->addAttribute(ALIGN_TREE, (void *) attr_alignee,                                                            sizeof(algn_attr));
-//for debug
-               //printf("Attribute ALIGN_TREE of %s : type = %d\n", alignee->identifier(), ((algn_attr*) alignee->attributeValue(0,ALIGN_TREE))->type);
-              } 
-              else if (!attr_alignee && attr_base) {
-                 // creating new node for the alignee and
-                 // adding it to  alignees_list of the node for align_base 
-                 root = ((algn_attr*) base->attributeValue(0,ALIGN_TREE))->ref;
-                 node = new align; // creating new node for the alignee
-                 node->symb = alignee;
-                 node->next = root->alignees;
-                 node->alignees = NULL;
-                 node->align_stmt = stmt;
-                 root->alignees = node;  // adding it to  alignees_list of
-                                         // the node for align_base
-                 // adding the attribute (ALIGN_TREE) to the alignee symbol
-                 attr_alignee = new algn_attr;
-                 attr_alignee->type = NODE;
-                 attr_alignee->ref  = node;     
-                 alignee->addAttribute(ALIGN_TREE, (void *) attr_alignee,                                                            sizeof(algn_attr));
-//for debug
-               //printf("Attribute ALIGN_TREE of %s : type = %d\n", alignee->identifier(), ((algn_attr*) alignee->attributeValue(0,ALIGN_TREE))->type);
-              } 
-              else if (attr_alignee && !attr_base) {
-
-                 if(attr_alignee->type == NODE) {
-                   Err_g("Duplicate aligning of the array '%s'",                                                               alignee->identifier(),82);
-                   continue;
-                 }
-                 // creating new node for align_base,   
-                 // adding a tree for the alignee to alignees_list of it
-
-                 node=((algn_attr*) alignee->attributeValue(0,ALIGN_TREE))->ref;
-                 // deleting tree for the alignee from Align_Tree_List
-                 if (pal == node)
-                    pal = node->next;
-                 else
-                    for(root=pal ; root->next != node; root=root->next)
-                 ; 
-                 root->next = node->next;
-       
-                 root = new align; // creating new node for the base (root)
-                 root->symb = base;
-                 root->next = pal;
-                 root->alignees = node;
-                 root->align_stmt = NULL;                 
-                 node->align_stmt = stmt; // setting the field 'align_stmt' 
-                                          // of the node for alignee
-                 node->next = NULL; // setting off 'next' field of the node
-                                    //for alignee
-                 pal = root; // pal points to new tree
-                // adding the attribute (ALIGN_TREE) to the base symbol
-                 attr_base = new algn_attr;
-                 attr_base->type = ROOT;
-                 attr_base->ref  = root;     
-                 base->addAttribute(ALIGN_TREE, (void *) attr_base,                                                                  sizeof(algn_attr));
-//for debug
-               //printf("Attribute ALIGN_TREE of %s : type = %d\n", base->identifier(), ((algn_attr*) base->attributeValue(0,ALIGN_TREE))->type);       
-                 // changing field 'type'of the attribute (ALIGN_TREE)
-                 // of the alignee symbol
-                    attr_alignee->type = NODE;
-//for debug
-               //printf("Attribute ALIGN_TREE of %s : type = %d\n", alignee->identifier(), ((algn_attr*) alignee->attributeValue(0,ALIGN_TREE))->type);
-        
-             }
-             else if (attr_alignee && attr_base) {
-
-	       if(attr_alignee->type == NODE) {
-                   Err_g("Duplicate aligning of the array '%s'",                                                                 alignee->identifier(),82);
-                   continue;
-               }
-                //testing: is a node for align_base the node of alignee tree  
-                // ...
-                 // adding a tree for the alignee to alignees_list
-                 // of the node for align_base
-                 node=((algn_attr*) alignee->attributeValue(0,ALIGN_TREE))->ref;                 
-                 // deleting tree for the alignee from Align_Tree_List
-                 if (pal == node)
-                    pal = node->next;
-                 else
-                    for(root=pal ; root->next != node; root=root->next)
-                 ; 
-                 root->next = node->next;
-                    
-                 root = ((algn_attr*) base->attributeValue(0,ALIGN_TREE))->ref;
-                 node->align_stmt = stmt;
-                 node->next = root->alignees;
-                 root->alignees = node;
-
-                 // changing field 'type'of the attribute (ALIGN_TREE)
-                 // of the alignee symbol
-                    attr_alignee->type = NODE;
-//for debug
-               //printf("Attribute ALIGN_TREE of %s : type = %d\n", alignee->identifier(), ((algn_attr*) alignee->attributeValue(0,ALIGN_TREE))->type);
-             }                
-
-           }             
-        }
-//!!!for debug
-           //printf("CDVM$    ");
-           //printVariantName(stmt->variant()); 
-           //printf("\n");
-//
-           continue;
-
- DISTR:
-       case(DVM_DISTRIBUTE_DIR): // adding the statement to the Distribute
-                                 // directive list          
-           //dvm = 1;
-           if (!distr) {
-              distr = new distribute_list;
-              distr->stdis = stmt;
-              distr->next =  NULL;
-              distr_last = distr;
-           } else {
-              dsl = new distribute_list;
-              dsl->stdis = stmt;
-              dsl->next = NULL;
-              distr_last->next = dsl;
-              distr_last = dsl;
-           }
-//!!!for debug
-           //printf("CDVM$    ");
-           //printVariantName(stmt->variant()); 
-           //printf("\n");
-//
-           DistributeArrayList(stmt); //adding the attribute DISTRIBUTE_ to distribute-array symbol
-           continue;
-       case(DVM_POINTER_DIR):
-           {SgExpression *el;
-            SgStatement **pst = new (SgStatement *);
-
-            SgSymbol *sym;
-            int *index;
-            *pst = stmt;
-            for(el = stmt->expr(0); el; el=el->rhs()){ //  name list
-               sym = el->lhs()->symbol();  // name
-               sym->addAttribute(POINTER_, (void *) pst,                                                                  sizeof(SgStatement *));  
-               if((sym->type()->variant() != T_INT) && (sym->type()->variant() != T_ARRAY))
-                 Error("POINTER '%s' is not integer variable",sym->identifier(),83,stmt); 
-               if( (sym->type()->variant() == T_ARRAY) && (sym->type()->baseType()->variant() != T_INT))
-                 Error("POINTER '%s' is not integer variable",sym->identifier(),83,stmt); 
-               //if(IS_DUMMY(sym) || IN_COMMON(sym))
-               if(IS_DUMMY(sym))
-                  Error("Inconsistent declaration of identifier '%s' ",sym->identifier(),16,stmt); 
-               if(IS_SAVE(sym))
-                  Error("POINTER may not have SAVE attribute: %s",sym->identifier(),84,stmt); 
-           /*
-               if(!IS_DVM_ARRAY(sym)) 
-                  Error("POINTER '%s' is not distributed object",sym->identifier(), 85,stmt);
-	   */
-               if(!IS_DVM_ARRAY(sym)) 
-                    // AddDistSymbList(sym);
-                 ArrayHeader(sym,0);
-                 index = new int;
-                 *index = heap_size+1;
-                 // adding the attribute (HEAP_INDEX) to POINTER symbol
-                 sym->addAttribute(HEAP_INDEX, (void *) index, sizeof(int));  
-                 heap_size = heap_size + HEADER_SIZE(sym)*NumberOfElements(sym,stmt,1);                
-	   }
-           }   
-//!!!for debug
-           //printf("CDVM$    ");
-           //printVariantName(stmt->variant()); 
-           // printf("\n");
-//
-           continue;
- 
-       case (DVM_HEAP_DIR):
-           heap_ar_decl = new SgArrayRefExp(*heapdvm);
-           continue;
-
-       case (DVM_ASYNCID_DIR):
-           {SgExpression * sl; 
-            SgArrayType *artype;
-	    for(sl=stmt->expr(0); sl; sl = sl->rhs()) {              
-               artype = new SgArrayType(*SgTypeInt());  
-               artype->addRange(*new SgValueExp(ASYNCID_NUMB));
-               if(sl->lhs()->lhs()) //array specification
-                   artype->addRange(*(sl->lhs()->lhs()));
-               sl->lhs()->symbol()->setType(artype);
-                async_symb=AddToSymbList(async_symb, sl->lhs()->symbol());
-                if(stmt->expr(1)) // ASYNCID,COMMON:: name-list
-                  SYMB_ATTR(sl->lhs()->symbol()->thesymb)= SYMB_ATTR(sl->lhs()->symbol()->thesymb) | COMMON_BIT;
-	    } 
-           }
-           continue;
-
-       case (DVM_VAR_DECL):
-          { SgExpression *el,*eol,*eda;
-            SgSymbol *symb;
-            int i, nattrs[8]; 
-            for(i=0; i<8; i++)
-               nattrs[i] = 0;
-            eda = NULL;
-            //testing obgect list	    
-	    isListOfArrays(stmt->expr(0),stmt);
-
-            for(el = stmt->expr(2); el; el=el->rhs()) // attribute list
-	      switch(el->lhs()->variant()) {
-	          case (ALIGN_OP):
-                      nattrs[0]++;
-                      eda = el->lhs();
-                      break;
-                  case (DISTRIBUTE_OP): 
-                      nattrs[1]++;
-                      eda = el->lhs();
-                      break; 
-                  case (TEMPLATE_OP): 
-                      nattrs[2]++;
-                      TemplateDeclarationTest(stmt);
-                      break;  
-                  case (PROCESSORS_OP): 
-                      nattrs[3]++;
-                      break;
-                  case (DIMENSION_OP): 
-                      nattrs[4]++;
-                      for(eol=stmt->expr(0); eol; eol=eol->rhs()) { //testing object list
-                        symb=eol->lhs()->symbol();
-                        if(!( (symb->attributes() & TEMPLATE_BIT) ||  (symb->attributes() & PROCESSORS_BIT)))
-                          Error("Object '%s' has neither TEMPLATE nor PROCESSORS attribute",symb->identifier(), 86,stmt);                 
-                      }
-                      //testing shape specification (el->lhs()->lhs()) : each expression                           is specification expression 
-                   if((el->lhs()->lhs()) && (! TestShapeSpec(el->lhs()->lhs())))
-                        err("Illegal shape specification in DIMENSION attribute",87,stmt);  
-                      break; 
-                  case (DYNAMIC_OP): 
-                      nattrs[5]++;
-                      break;       
-                  case (SHADOW_OP): 
-                      {SgExpression *eln;
-                       SgExpression **she = new (SgExpression *);
-                       SgSymbol *ar;
-                       int nw=0;
-
-                       nattrs[6]++;
-
-                       // calculate lengh of shadow_list
-                       for(eln = el->lhs()->lhs() ; eln; eln=eln->rhs())
-                           nw++;
-                       *she = el->lhs()->lhs(); //shadow specification
-                       for(eln = stmt->expr(0); eln; eln=eln->rhs()){ // array name list
-                          ar = eln->lhs()->symbol();  //array name
-                          ar->addAttribute(SHADOW_WIDTH, (void *) she,                                                                  sizeof(SgExpression *)); 
-			  /* if(nw<Rank(ar)) 
-                            Warning("Length of shadow-spec-list is smaller than the rank of array '%s'", ar->identifier(), stmt);   
-			   */
-                          if (nw!=Rank(ar)) // wrong shadow width list
-                            Error("Length of shadow-edge-list is not equal to the rank of array '%s'", ar->identifier(), 88,stmt);
-                       }     
-                       break;   
-                      }
-                  case (COMMON_OP): 
-                      nattrs[7]++;
-                      break;                           
-	      }
-              for(i=0; i<8; i++)
-               if( nattrs[i]>1)
-                 Error("%s attribute appears more than once in the combined-directive", AttrName(i), 89, stmt);
-	      if(eda)
-                if(eda->variant() == ALIGN_OP){
-                      stmt->setVariant(DVM_ALIGN_DIR);
-                      if(! eda->lhs())
-                         BIF_LL2(stmt->thebif)= NULL;
-                      else
-                         BIF_LL2(stmt->thebif)= eda->lhs()->thellnd;
-                      if(! eda->rhs())
-                         BIF_LL3(stmt->thebif)= NULL;
-                      else
-                         BIF_LL3(stmt->thebif)= eda->rhs()->thellnd;
-                      //stmt->setExpression(1,*eda->lhs());
-                      //stmt->setExpression(2,*eda->rhs());
-                      goto ALIGN; 
-                }
-                else {
-                      stmt->setVariant(DVM_DISTRIBUTE_DIR);
-                      if(! eda->lhs())
-                         BIF_LL2(stmt->thebif)=NULL;
-                      else
-                         BIF_LL2(stmt->thebif)= eda->lhs()->thellnd;
-                      if(! eda->rhs())
-                         BIF_LL3(stmt->thebif)= NULL;
-                      else
-                         BIF_LL3(stmt->thebif)= eda->rhs()->thellnd;
-                      //stmt->setExpression(1,*eda->lhs());
-                      //stmt->setExpression(2,*eda->rhs());
-                      if( eda->symbol())
-                         stmt->setSymbol(*eda->symbol());
-                      goto DISTR; 
-                }
-          }
-           continue; 
- 
-    }
-
-
-// all declaration statements are processed,
-// current statement is executable (F77/DVM)
-
-    break;
-  }
-  // checking semantics of DECLARE directives
-  testDeclareDirectives(stmt);
-
-  if(pstmt && (stmt != last))
-    pstmt = pstmt->next; //deleting first executable statement from 
-                         // DVM Specification Directive List  
-
-//**********************************************************************
-//              LibDVM References Generation
-//           for distributed and aligned arrays
-//**********************************************************************
-
-  //TempVarDVM(func);
-  first_exec = stmt; // first executable statement
-
-// testing procedure (-dbif2 regim)
-  if(debug_regim && dbg_if_regim>1 && ((func->variant() == PROC_HEDR) || (func->variant() == FUNC_HEDR)) && !pstmt && !isInternalOrModuleProcedure(func) && !lookForDVMdirectivesInBlock(first_exec,func->lastNodeOfStmt(),contains) && !contains[0] && !contains[1])
-     copy_proc = CreateCopyOfExecPartOfProcedure();  
-
-  lab_exec = first_exec->label(); // store the label of first ececutable statement 
-  BIF_LABEL(first_exec->thebif) = NULL;
-  last_spec = first_exec->lexPrev();//may be extracted after
-  where = first_exec; //before first executable statement will be inserted new statements
-  stam = NULL;
-  if(grname)
-     CreateRedGroupVars();
-
-  ndvm = 1; // ndvm is number of first free element of array "dvm000"
-  nhpf = 1; // nhpf is number of first free element of array "hpf000"
-
-//generating "dummy" assign statement (always it is deleted)
-// dvm000(1) = fname(file_name)
-//function 'fname' tells the name of source file to DVM run-time system
-  InsertNewStatementBefore(D_Fname(),first_exec);
-  first_dvm_exec = last_spec->lexNext(); //first DVM function call
-
-  if(IN_MODULE){
-     if(TestDVMDirectivesInModule(pstmt) || TestUseStmts() || debug_regim) {
-       mod_proc = CreateModuleProcedure(cur_func,first_exec,has_contains);
-       where = mod_proc->lexNext();
-       end_of_unit = where;
-     } else {
-       first_dvm_exec = last_spec->lexNext();
-       goto EXEC_PART_;
-     }
-  }
-
-  if(HPF_program) 
-     first_hpf_exec = first_dvm_exec;
-
-  if(func->variant() == PROG_HEDR)  { // MAIN-program
-//generating a call statement:
-// call dvmlf(line_number_of_first_executable_statement,source-file-name)
-      LINE_NUMBER_BEFORE(first_exec,first_exec);
-//generating function call  ftcntr(...)
-//function 'ftcntr' checks Fortran and C data type compatibility
-      TypeControl_New();  
-//generating the function call which initializes the control structures of DVM run-time system,
-//   it's inserted in MAIN program) 
-// dvm000(1) = <flag>
-// call dvmh_init(dvm000(1))
-       dvmh_init_st = RTL_GPU_Init();
-       if(!task_symb)  // !!! added the condition temporarily 
-       {
-         BeginBlock_H();
-         begin_block = 1;
-         begbl = cur_st;
-       }
-       if(dbg_if_regim)
-         InitDebugVar();              
-  }
-
-  else if(func->variant() == MODULE_STMT)  // Module
-    ndvm++; 
-  else
-// generating assign statement
-// dvm000(1) = BegBl()
-// ( function BegBl defines the begin of object localisation block) 
-    if(distr || task_symb || TestDVMDirectivesInProcedure(pstmt)) { 
-       BeginBlock_H();
-       begin_block = 1;
-       begbl = cur_st;
-    }  
-    else
-       ndvm++; 
-
-//generating  assign statement
-// dvm000(2) = GetAM()
-//(function GetAM  creates initial abstract machine)
-//and  assign statement
-// dvm000(3) = GetPS(AMRef)
-//(function GetPS returns virtual machine reference, on what abstract
-// machine is mapped)
-  stam = NULL;
-
-  ndvm = 4; // 3 first elements are reserved 
-
-//generating call (module procedure) and/or assign statements for USE statements
-  GenForUseStmts(func,where);
-
-//Creating (reconfiguring) processor systems
-  ReconfPS(pstmt);
-
-//Creating task arrays
-   if(task_symb){
-     symb_list *tl; 
-     for(tl=task_symb; tl; tl=tl->next) ///looking through the task symbol list
-       CreateTaskArray(tl->symb);   
-   }
-//Initializing  groups 
-   if(grname && !IN_MODULE) 
-       InitGroups();
-   
-//Initializing HEAP counter
-   if(heap_size != 0 ) //there are declared POINTER variables 
-     if( !heap_ar_decl )
-      Err_g("Missing %s declaration", "HEAP", 91);
-   // else
-      //generating assign statement: HEAP(1) = 2
-   // InitHeap(heap_ar_decl->symbol());
-//Initializing ASYNCID counter
-   if(!IN_MODULE)
-     //if(IN_MAIN_PROGRAM)   // (27.01.05)
-       InitAsyncid();
-//Creating CONSISTENT arrays
-  /*  if(consistent_symb){
-       symb_list *cl; 
-       for(cl=consistent_symb; cl; cl=cl->next) ///looking through the consistent array symbol list
-         CreateConsistentArray(cl->symb);   
-   }*/
-//Looking through the Distibute Directive List
-   for(dsl=distr; dsl; dsl=dsl->next) {  
-     SgExpression *target,*ps = NULL;
-     int idis; // DisRuleArray index 
-     SgSymbol *das;
-     int no_rules;
-     no_rules = 1;
-     for(e=dsl->stdis->expr(0); e; e=e->rhs()){//are there in dist-name-list array-name 
-                                               //that is not a dummy, a pointer, and
-                                               //a COMMON-block element in procedure                         
-        das = (e->lhs())->symbol();
-        if( !IS_DUMMY(das) && !IS_POINTER(das) && !(IN_COMMON(das) &&  (das->scope()->variant() != PROG_HEDR)) && !IS_ALLOCATABLE_POINTER(das)){
-           no_rules = 0; ps = NULL;
-           break;
-        }
-     } 
-     
-     SgExpression *distr_rule_list = doDisRules(dsl->stdis,no_rules,idis);
-     nproc = 0;
-     target = hasOntoClause(dsl->stdis);
-     if( target )  { //is there ONTO_clause 
-       nproc = RankOfSection(target);
-       if(dsl->stdis->expr(1) && nblock && nproc && (nblock > nproc))
-          Error("The number of BLOCK/GENBLOCK elements of dist-format-list is greater than the rank of PROCESSORS '%s'  ", target->symbol()->identifier(),90,dsl->stdis);
-     } 
-     /*  if(dsl->stdis->expr(1) && nblock && (nblock != nblock_all))
-          err("The number of BLOCK elements of dist-format-list must be the same in all  DISTRIBUTE  and REDISTRIBUTE directives", dsl->stdis);*/
-	 
-     if(!no_rules)
-       ps = PSReference(dsl->stdis);
-
-//looking through the dist_name_list
-     for(e=dsl->stdis->expr(0); e; e=e->rhs()) {
-        das = (e->lhs())->symbol(); // distribute array symbol
-        	/*  if(dsl->stdis->expr(2) && !IS_DUMMY(das))
-	            Error("'%s' is not a dummy argument", das->identifier(),dsl->stdis);
-                 */
-        int is_global_template_in_procedure =  IS_TEMPLATE(das) && IN_COMMON(das) && !IN_MAIN_PROGRAM;
-        if(!dsl->stdis->expr(1) && !is_global_template_in_procedure)
-	  SYMB_ATTR(das->thesymb)= SYMB_ATTR(das->thesymb) | POSTPONE_BIT;
-                /*if(IS_POINTER(das) && (das->attributes() & DIMENSION_BIT))
-	             Error("Distributee '%s' with POINTER attribute is not a scalar variable", das->identifier(),dsl->stdis);
-                 */
-                
-        // creating LibDVM function calls for distributed array and its Align Tree
-
-        //GenDistArray(das,idis,dis_rules,ps,dsl->stdis);    
-        GenDistArray(das,idis,distr_rule_list,ps,dsl->stdis);      
-     }
-
-   }
-  
-  //Looking through the Align Tree List
-   for(root=pal; root; root=root->next) {
-     if(!( root->symb->attributes() & DISTRIBUTE_BIT) && !( root->symb->attributes() & ALIGN_BIT) && !( root->symb->attributes() & INHERIT_BIT) && !( root->symb->attributes() & POSTPONE_BIT))
-        Err_g("Alignment tree root '%s' is not distributed", root->symb->identifier(),92);
-     if(( root->symb->attributes() & POSTPONE_BIT) && !( root->symb->attributes() & DISTRIBUTE_BIT) && CURRENT_SCOPE(root->symb) ) {
-        GenAlignArray(root,NULL,0,NULL,0);
-        AlignTree(root);
-     }
-     if( (root->symb->attributes() & INHERIT_BIT) || !CURRENT_SCOPE(root->symb) ) 
-        AlignTree(root);
-     
-   }
-
-  if(debug_regim && registration)  {       // registrating arrays for debugger
-    LINE_NUMBER_BEFORE(func,where);   //(first_exec,where);
-    ArrayRegistration();
-  }
-// testing procedure
-//  if(dvm_debug && dbg_if_regim>1 && ((func->variant() == PROC_HEDR) || (func->variant() == FUNC_HEDR)) && !pstmt)// && !hasParallelDir(first_exec,func))
-//    copy_proc=1;
- 
-  for(;pstmt; pstmt= pstmt->next)
-     Extract_Stmt(pstmt->st);// extracting  DVM Specification Directives
-
-  if(!loc_distr && !task_symb && !proc_symb && !IN_MAIN_PROGRAM) {
-                                       //there are no local distributed arrays 
-                                       //no task array , no asinc and no processor array
-    if(begin_block){
-      begbl->extractStmt(); //extract dvmh_scope_start /*begbl()*/ call
-      begin_block = 0;
-      fmask[SCOPE_START] = 0;  //fmask[BEGBL] = 0; 
-    } 
-    if(!loc_templ_symb && stam) {   
-      stam->lexNext()->extractStmt();   //extract getps() call 
-      stam->extractStmt();              //extract getam() call
-      fmask[GETAM] = 0; fmask[GETVM] = 0; 
-    }  
-  }
-
-  if(begin_block && !IN_MAIN_PROGRAM) {    
-      LINE_NUMBER_BEFORE(first_exec,begbl);
-  }
- 
-  if(lab_exec)
-      first_exec-> setLabel(*lab_exec);  //restore label of first executable statement
-
-  last_dvm_entry = first_exec->lexPrev();
-
-  if(copy_proc)  
-     InsertCopyOfExecPartOfProcedure(copy_proc);  
-
-//**********************************************************************
-//           Executable Directives Processing 
-//**********************************************************************
-
-EXEC_PART_:
-  for (i=0; i<Ntp; i++)
-    buf_use[i] = rmbuf_size[i]= 0; 
-  IOstat = NULL;
-  inparloop = 0; 
-  inasynchr = 0;
-  own_exe = 0;
-  redvar_list = NULL;
-  rma =NULL;
-  in_task_region = 0;
-  task_ind = 0;
-  in_task=0;
-  task_lab = NULL;
-  dvm_ar= NULL;
-
-  if(IN_MODULE) { 
-    if(!mod_proc && first_exec->variant() == CONTAINS_STMT) 
-         end_of_unit = has_contains = first_exec;
-           //else if(mod_proc) 
-           //   mod_proc = MayBeDeleteModuleProc(mod_proc,end_of_unit); 
-    goto END_;
-  }
-
-//follow the executable statements in lexical order until last statement
-// of the function
-  for(stmt=first_exec; stmt ; stmt=stmt->lexNext()) {
-    cur_st = stmt;     //printf("executable statement %d %s\n",stmt->lineNumber(),stmt->fileName());
-   
-    while(rma && rma->rmout == stmt)//current statement is out of scope REMOTE_ACCESS directive
-       RemoteAccessEnd();
-
-    if(isACCdirective(stmt))     /*ACC*/
-    { pstmt = addToStmtList(pstmt, stmt);    
-      stmt = ACC_Directive(stmt);            
-      continue;
-    }  
-
-    if(IN_COMPUTE_REGION && IN_STATEMENT_GROUP(stmt)) /*ACC*/
-    {  
-       stmt = ACC_CreateStatementGroup(stmt); 
-       continue;
-    }
-    switch(stmt->variant()) {
-       case CONTROL_END:
-            if(stmt == last) {
-              EndOfProgramUnit(stmt, func, begin_block);
-              goto END_;            
-            }            
-            break;
-
-       case CONTAINS_STMT:
-            has_contains = end_of_unit = stmt;
-            EndOfProgramUnit(stmt, func, begin_block);
-            goto END_;
-            break;
-       case RETURN_STAT:
-            EndOfProgramUnit(stmt, func, begin_block);
-            if(dvm_debug || perf_analysis ) 
-            { // RETURN statement is added to list for debugging (exit the loop)       
-              goto_list = addToStmtList(goto_list, stmt);
-              if(begin_block)
-                AddDebugGotoAttribute(stmt,stmt->lexPrev()->lexPrev()); //to insert statements for debugging before call endbl() inserted before RETURN
-            } 
-            if(stmt->lexNext() == last) 
-                goto END_;  
-            if(stmt->lexNext()->variant() == CONTAINS_STMT){ 
-                has_contains = end_of_unit = stmt->lexNext();                
-                goto END_;  
-            }
-            break;
-       case STOP_STAT:
-            if(begin_block && func->variant() != PROG_HEDR)
-               EndBlock_H(stmt); 
-            if(stmt->expr(0)){
-               SgStatement *print_st;
-               InsertNewStatementBefore(print_st=PrintStat(stmt->expr(0)),stmt);
-               ReplaceByIfStmt(print_st);
-            } 
-            RTLExit(stmt);
-            if(stmt->lexNext() == last)
-               goto END_;
-            break;
-       case PAUSE_NODE: 
-            err("PAUSE statement is not permitted in FDVM", 93,stmt); 
-            break; 
-       case EXIT_STMT:
-            //if(dvm_debug || perf_analysis ) 
-              // EXIT statement is added to list for debugging (exit the loop)       
-              //goto_list = addToStmtList(goto_list, stmt);
-            break;
-       case ENTRY_STAT: 
-	     if(distr) {
-               warn("ENTRY of program unit distributed arrays are in",169,stmt); 
-	      // err("ENTRY statement is not permitted in FDVM", stmt);
-             } 
-             GoRoundEntry(stmt);
-              //BeginBlockForEntry(stmt);
-             entry_list=addToStmtList(entry_list,stmt);
-             
-            break;  
-
-       case SWITCH_NODE:           // SELECT CASE ...
-       case ARITHIF_NODE:          // Arithmetical IF
-       case IF_NODE:               // IF... THEN
-       case WHILE_NODE:            // DO WHILE (...) 
-            if(HPF_program && !inparloop){
-              first_time = 1;
-              SearchDistArrayRef(stmt->expr(0),stmt);
-              cur_st = stmt;
-            }
-	    if(dvm_debug)
-              DebugExpression(stmt->expr(0),stmt); 
-            else          
-              ChangeDistArrayRef(stmt->expr(0));
-
-            if((dvm_debug || perf_analysis) && stmt->variant()==ARITHIF_NODE ) 
-              goto_list = addToStmtList(goto_list, stmt);          
-
-            break;
-       
-       case CASE_NODE:             // CASE ...
-       case ELSEIF_NODE:           // ELSE IF...
-            if(HPF_program && !inparloop){
-              first_time = 1;
-              SearchDistArrayRef(stmt->expr(0),stmt);
-              cur_st = stmt;
-            }
-            ChangeDistArrayRef(stmt->expr(0));
-            break; 
-
-       case LOGIF_NODE:            // Logical IF 
-            if( !stmt->lineNumber()) {//inserted statement
-              stmt = stmt->lexNext();
-              break; 
-            } 
-            if(HPF_program) {
-              if(!inparloop){ //outside the range of parallel loop
-                ReplaceContext(stmt);
-                first_time = 1;
-                SearchDistArrayRef(stmt->expr(0),stmt); //look for distributed array elements
-                cur_st = stmt;
-              } else         //inside the range of parallel loop
-                IsLIFReductionOp(stmt, indep_st->expr(0) ? indep_st->expr(0)->lhs() : indep_st->expr(0));                                           //look for reduction operator
-            }
-	    if(dvm_debug) {
-              ReplaceContext(stmt);
-              DebugExpression(stmt->expr(0),stmt);	
-            } else {
-              ChangeDistArrayRef(stmt->expr(0));
-              if(perf_analysis && IsGoToStatement(stmt->lexNext()))
-                ReplaceContext(stmt);
-            }
-            continue; // to next statement
-
-
-       case FORALL_STAT:          // FORALL statement
-            {SgSymbol *do_var; 
-	    SgExpression *el,*ei,*etriplet,*ec;
-            el=stmt->expr(0); //list of loop indexes
-            for(el= stmt->expr(0); el; el=el->rhs()){
-               ei=el->lhs(); //expression: i=l:u:s
-               etriplet= ei->lhs();//l:u:s
-               do_var=ei->symbol();//do-variable
-               //printf("%s=",do_var->identifier());
-               
-               //etriplet->unparsestdout();
-               //printf("  ");
-             }
-            ec=stmt->expr(1); // conditional expression
-            //ec->unparsestdout();
-         
-            }
-            stmt=stmt->lexNext();//  statement that is a part of FORALL statement         
-            break;
-            // continue; 
-       case GOTO_NODE:          // GO TO
-            if((dvm_debug || perf_analysis) && stmt->lineNumber() ) 
-              goto_list = addToStmtList(goto_list, stmt);          
-            break;
-
-       case COMGOTO_NODE:          // Computed GO TO
-            if(HPF_program && !inparloop){
-               ReplaceContext(stmt);
-               first_time = 1;
-               SearchDistArrayRef(stmt->expr(1),stmt);
-               cur_st = stmt;
-            }
-            if(dvm_debug) {
-              ReplaceContext(stmt);
-              DebugExpression(stmt->expr(1),stmt);
-            } else 
-            {  ChangeDistArrayRef(stmt->expr(1));
-               if (perf_analysis ) 
-                 ReplaceContext(stmt); 
-            }
-            if(dvm_debug || perf_analysis ) 
-              goto_list = addToStmtList(goto_list, stmt);          
-            break;
-
-       case ASSIGN_STAT:             // Assign statement  
-	  { SgSymbol *s;
-            if(inasynchr && !INTERFACE_RTS2) { //inside the range  of ASYNCHRONOUS construct
-              if(ArrayAssignment(stmt)) { //Fortran 90
-                AsynchronousCopy(stmt);                 
-              } 
-	      pstmt = addToStmtList(pstmt, stmt); // add to list of extracted statements
-              stmt=cur_st;
-              break;
-            }
-            if( !stmt->lineNumber()) //inserted debug statement
-                break;   
-
-           if((s=stmt->expr(0)->symbol()) && IS_POINTER(s)){ // left part variable is POINTER
-             if(isSgFunctionCallExp(stmt->expr(1)) && !strcmp(stmt->expr(1)->symbol()->identifier(),"allocate")){
-               if(inparloop)
-                 err("Illegal statement in the range of parallel loop", 94, stmt);
-               AllocateArray(stmt,distr); 
-               if(stmt != cur_st){//stmt == cur_st in error situation
-                 Extract_Stmt(stmt);
-                 stmt=cur_st;
-               } 
-
-             } else if( (isSgVarRefExp(stmt->expr(1)) || isSgArrayRefExp(stmt->expr(1))) && stmt->expr(1)->symbol() && IS_POINTER(stmt->expr(1)->symbol())) {
-               AssignPointer(stmt);
-               if(stmt != cur_st){
-                 Extract_Stmt(stmt);
-                 stmt=cur_st;
-               } 
-
-             } else 
-               err("Only a value of ALLOCATE function or other POINTER may be assigned to a POINTER",95,stmt);
-      
-             break;
-	   } 
-            if(HPF_program){
-              if(!inparloop){ //outside the range of parallel loop
-                ReplaceContext(stmt);
-                first_time = 1;
-                SearchDistArrayRef(stmt->expr(1),stmt); //look for distributed array elements
-                cur_st = stmt;
-              } else //inside the range of parallel loop
-                IsReductionOp(stmt,indep_st->expr(0) ? indep_st->expr(0)->lhs() : indep_st->expr(0));                                               //look for reduction operator
-            } 
-                     /*  if(own_exe) { // "owner executes" rule
-                           ReplaceContext(stmt);
-                           ReplaceAssignByIf(stmt);
-                         } else */
-            if(!inparloop && isDistObject(stmt->expr(0))){
-              if( !isSgArrayType(stmt->expr(0)->type())){ //array element
-                if(all_replicated == 0){ // not all arrays in procedure are replicated
-                   ReplaceContext(stmt);
-                   
-                   
-                   if(!in_on) {
-                     LINE_NUMBER_BEFORE(stmt,stmt);
-                     ReplaceAssignByIf(stmt);
-                   }
-                   //own_exe = 1;
-                   if(warn_all)
-                     warn("Owner-computes rule", 139, stmt);
-                    //warn("Assignment of distributed array element outside the range of parallel loop: owner executes", stmt);  
-                } 
-                own_exe = 1;
-              }
-              else { //array section
-                if(DistrArrayAssign(stmt)) { 
-                  pstmt = addToStmtList(pstmt, stmt); // add to list of extracted statements
-                  stmt=cur_st;
-                  break;
-                }
-              }
-     	    }
-
-            if(!inparloop && AssignDistrArray(stmt)) {
-                  pstmt = addToStmtList(pstmt, stmt); // add to list of extracted statements
-                  stmt=cur_st;
-                  break;
-                 }                
-
-	    // if(inparloop && !TestLeftPart(new_red_var_list, stmt->expr(0)))
-	    //  Error("Illegal assignment in the range of parallel loop",stmt); 
-
-                       
-            if(dvm_debug) { 
-              SgStatement *where_st, *stmt1, *stparent;
-              where_st=stmt->lexNext();  
-              ReplaceContext(stmt);
-              DebugAssignStatement(stmt);
-
-              if(own_exe && !in_on) { //declaring omitted block
-                 where_st = where_st->lexPrev();
-                 stmt1 = dbg_if_regim ?  CreateIfThenConstr(DebugIfCondition(),D_Skpbl())  : D_Skpbl();
-                 stparent = (all_replicated == 0) ? stmt->controlParent()->controlParent() : stmt->controlParent();
-                 InsertNewStatementAfter(stmt1,where_st,stparent);
-              } 
-              stmt = cur_st;   
-            } else { 
-              ChangeDistArrayRef_Left(stmt->expr(0));   // left part
-              ChangeDistArrayRef(stmt->expr(1));   // right part
-            }
-            own_exe =0;
-          }
-            break;
-
-       case PROC_STAT:             // CALL            
-            if( !stmt->lineNumber()) //inserted debug statement
-               break; 
-            if(HPF_program && !inparloop){
-               ReplaceContext(stmt);
-               first_time = 1;
-               SearchDistArrayRef(stmt->expr(0),stmt);
-               cur_st = stmt;
-            }
-            if(dvm_debug){ 
-               ReplaceContext(stmt);
-               DebugExpression(NULL,stmt);
-            } else {
-               // looking through the arguments list
-               SgExpression * el;
-               int i;
-               for(el=stmt->expr(0),i=0; el; el=el->rhs(),i++)            
-                  ChangeArg_DistArrayRef(el,stmt->symbol(),i);   // argument
-            }            
-            break;
-       case ALLOCATE_STMT: 
-            ALLOCATEf90_arrays(stmt,distr);
-            if(!stmt->expr(0)){
-               cur_st=stmt->lexPrev();
-               Extract_Stmt(stmt);
-               stmt=cur_st;  
-            } else 
-            {  cur_st = stmt;
-               if(debug_regim) 
-                  AllocatableArrayRegistration(stmt);
-               EnterDataRegionForAllocated(stmt); /*ACC*/
-               stmt=cur_st;
-            }            
-            break;
-       case DEALLOCATE_STMT:
-            DEALLOCATEf90_arrays(stmt);
-            if(!stmt->expr(0)){
-               Extract_Stmt(stmt);
-               stmt=cur_st;  
-            }
-            break;
-       case DVM_PARALLEL_ON_DIR:
-            if(!TestParallelWithoutOn(stmt,1))
-            {
-              pstmt = addToStmtList(pstmt, stmt); 
-              break;
-            } 
-
-	    if(inparloop){
-              err("Nested PARALLEL directives are not permitted", 96, stmt); 
-              break;
-            }                     
-                          //!!!acc printf("parallel on %d region %d\n",stmt->lineNumber(), cur_region);
-
-            par_do = stmt->lexNext();// first DO statement of parallel loop
-
-            while(isOmpDir (par_do))      // || isACCdirective(par_do) 
-            { cur_st = par_do;
-              par_do=par_do->lexNext();               
-            }  
-            if(!isSgForStmt(par_do)) {
-              err("PARALLEL directive must be followed by DO statement",97,stmt); //directive is ignored
-              break;
-            } 
-            inparloop = 1;
-            if(!ParallelLoop(stmt))// error in PARALLEL directive
-                 inparloop = 0;   
-            
-            pstmt = addToStmtList(pstmt, stmt); // add to list of extracted statements       
-                                 //Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;
-                   // setting stmt on last DO statement of parallel loop nest
-            break;
-
-     case HPF_INDEPENDENT_DIR:
-            if(inparloop){
-              //illegal nested INDEPENDENT directive is ignored
-              pstmt = addToStmtList(pstmt, stmt); //including the HPF directive to list
-              break;
-            }  
-            indep_st = stmt; // INDEPENDENT directive 
-            par_do = stmt->lexNext();// first DO statement of parallel loop 
-            if(!isSgForStmt(par_do)) {
-              err("INDEPENDENT directive must be followed by DO statement",97,stmt); 
-                                                                     //directive is ignored
-              break;
-            } 
-            inparloop = 1;
-            IEXLoopAnalyse(func);
-            if(!IndependentLoop(stmt))// error in INDEPENDENT directive
-                 inparloop = 0;   
-	                     
-	         
-            //including the HPF directive to list
-            pstmt = addToStmtList(pstmt, stmt); 
-            stmt = cur_st; // setting stmt on last DO statement of parallel loop nest
-            break;  
-
-     case DVM_SHADOW_GROUP_DIR:
-           {
-            SgSymbol *s;
-            SgExpression *gref;
-            if(INTERFACE_RTS2)
-               err("Illegal directive in -Opl2 mode. Asynchronous operations are not supported in this mode", 649, stmt);  
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98, stmt);  
-            LINE_NUMBER_AFTER(stmt,stmt); //for tracing set on global variable of LibDVM  
-            s = stmt->symbol();
-            AddToGroupNameList (s);
-            gref = new SgVarRefExp(s);
-            CreateBoundGroup(gref);  
-            //s -> addAttribute(SHADOW_GROUP_IND, (void *) index, sizeof(int)); 
-            ShadowList(stmt->expr(0), stmt, gref);
-           }
-            Extract_Stmt(stmt); // extracting DVM-directive
-            stmt = cur_st;//setting stmt on last inserted statement 
-            break;
-
-       case DVM_SHADOW_START_DIR:
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt);  
-            LINE_NUMBER_AFTER(stmt,stmt); //for tracing set on global variable of LibDVM
-            if(ACC_program)      /*ACC*/
-              // generating call statement ( in and out compute region):
-              //  call dvmh_shadow_renew( BoundGroupRef)              
-              doCallAfter(ShadowRenew_H(new SgVarRefExp(stmt->symbol()) ));  
-           
-            doCallAfter(StartBound(new SgVarRefExp(stmt->symbol())));        
-            Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;//setting stmt on  inserted statement 
-            break;
-
-       case DVM_SHADOW_WAIT_DIR:
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt);  
-            LINE_NUMBER_AFTER(stmt,stmt); //for tracing set on global variable of LibDVM  
-            doCallAfter(WaitBound(new SgVarRefExp(stmt->symbol()))); 
-            Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;//setting stmt on  inserted statement 
-            break;
- 
-       case DVM_REDUCTION_START_DIR:
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt);  
-            LINE_NUMBER_AFTER(stmt,stmt); //for tracing set on global variable of LibDVM  
-            doCallAfter(StartRed(new SgVarRefExp(stmt->symbol())));        
-            Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;//setting stmt on  inserted statement 
-            break;
-
-       case DVM_REDUCTION_WAIT_DIR:
-	   {SgExpression *rg = new SgVarRefExp(stmt->symbol());
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt);  
-            LINE_NUMBER_AFTER(stmt,stmt); //for tracing set on global variable of LibDVM  
-            doCallAfter(WaitRed(rg)); 
-            if(dvm_debug)             
-              doCallAfter( D_CalcRG(DebReductionGroup( rg->symbol())));
-            
-            doCallAfter(DeleteObject_H(rg)); 
-            doAssignTo_After(rg, new SgValueExp(0));
-            if(debug_regim)
-              doCallAfter( D_DelRG(DebReductionGroup( rg->symbol())));              
-	   }
-              //Extract_Stmt(stmt); // extracting DVM-directive
-            wait_list = addToStmtList(wait_list, stmt); 
-            pstmt = addToStmtList(pstmt, stmt);            
-            stmt = cur_st;//setting stmt on last inserted statement                   
-            break;
-
-
-       case DVM_CONSISTENT_START_DIR:
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt);  
-            LINE_NUMBER_AFTER(stmt,stmt); //for tracing set on global variable of LibDVM  
-            doAssignStmtAfter(StartConsGroup(new SgVarRefExp(stmt->symbol())));        
-            Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;//setting stmt on  inserted statement 
-            break;
-
-       case DVM_CONSISTENT_WAIT_DIR:
-	   {SgExpression *rg = new SgVarRefExp(stmt->symbol());
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt);  
-            LINE_NUMBER_AFTER(stmt,stmt); //for tracing set on global variable of LibDVM  
-            doAssignStmtAfter(WaitConsGroup(rg)); 
-            //if(dvm_debug)             
-              //doAssignStmtAfter( D_CalcRG(DebReductionGroup( rg->symbol())));
-            if(cur_st->controlParent()->variant() != PROG_HEDR){
-              doCallAfter(DeleteObject_H(rg)); 
-              doAssignTo_After(rg, new SgValueExp(0));
-            }  
-            //if(debug_regim)
-              //doAssignStmtAfter( D_DelRG(DebReductionGroup( rg->symbol())));              
-	   }
-            wait_list = addToStmtList(wait_list, stmt); 
-            pstmt = addToStmtList(pstmt, stmt);            
-            stmt = cur_st;//setting stmt on last inserted statement                   
-            break;
-
-       case DVM_REMOTE_ACCESS_DIR:
-	    if(inparloop) {
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-              break;
-            }
-            ReplaceContext(stmt->lexNext());
-            switch(stmt->lexNext()->variant()) {
-	            case LOGIF_NODE:
-                        rmout = stmt->lexNext()->lexNext()->lexNext(); 
-                        break;
-	            case SWITCH_NODE:
-                        rmout = stmt->lexNext()->lastNodeOfStmt()->lexNext();
-                        break;
-	            case IF_NODE:
-                        rmout = lastStmtOfIf(stmt->lexNext())->lexNext();
-                        break;
-	            case CASE_NODE:
-                    case ELSEIF_NODE:          
-                        err("Misplaced REMOTE_ACCESS directive", 99,stmt);
-                        rmout = stmt->lexNext()->lexNext();
-                        break;
-                    case FOR_NODE:
-                        rmout = lastStmtOfDo(stmt->lexNext())->lexNext();
-                        break;
-                    case WHILE_NODE:
-                        rmout = lastStmtOfDo(stmt->lexNext())->lexNext();
-                        break;
-		    case DVM_PARALLEL_ON_DIR:
-                        rmout = lastStmtOfDo(stmt->lexNext()->lexNext())->lexNext();
-                        break;
-	            default:
-                        rmout = stmt->lexNext()->lexNext();
-                        break;
-            }
-            //adding new element to remote_access directive/clause list
-            AddRemoteAccess(stmt->expr(0),rmout); 
-            LINE_NUMBER_STL_BEFORE(cur_st,stmt,stmt->lexNext()); // moving the label of next statement
-	    // looking through the remote variable list
-            RemoteVariableList(stmt->symbol(),stmt->expr(0),stmt);
-            
-            Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;        
-            break;
- 
-      case DVM_NEW_VALUE_DIR:
-            if((stmt->lexNext()->variant()==DVM_REDISTRIBUTE_DIR) ||                           (stmt->lexNext()->variant()==DVM_REALIGN_DIR))
-               st_newv = stmt;
-            else
-               err("NEW_VALUE directive must be followed by REDISTRIBUTE or REALIGN directive", 146,stmt);
-            break; 
- 
-       case DVM_REALIGN_DIR:           
-	    if(inparloop){
-              err("The directive is inside the range of PARALLEL loop", 98,stmt);
-              st_newv = 0;  
-              break;
-            } else {
-            int iaxis; // AxisArray index 
-            int nr,new_sign,ia; 
-            SgSymbol *als,*tgs;
-
-            where = stmt;  //for inserting before current directive                   
-            iaxis = ndvm;
-            ia = 0;
-            //sta = NULL;
-	    // new_val = isSgExprListExp(stmt->expr(2)) ? (stmt->expr(2)->rhs()->lhs()) :                                                               (SgExpression *) NULL;
- 
-            tgs = isSgExprListExp(stmt->expr(2)) ? (stmt->expr(2))->lhs()->symbol() :                                                            (stmt->expr(2))->symbol();
-            if(!HEADER(tgs))    
-               Error("'%s' isn't distributed array", tgs->identifier(), 72,stmt);
-           
-            new_sign = 0;
-            if(st_newv)
-                  new_sign = 1; // NEW_VALUE without variable list
-            //looking through the alignee_list
-            for(e=stmt->expr(0); e; e=e->rhs()) {
-               als = (e->lhs())->symbol(); // realigned array symbol
-                           //nr = doAlignRule(als, stmt, ia);
-               SgExpression *align_rule_list = doAlignRules(als, stmt, ia, nr);
-	       /* 
-                *if(sta) // is not first list element
-                * for(i=0;i<2*nr;i++) 
-                *     Extract_Stmt(sta->lexNext());//extracting axis and coeff 
-                *                                  //assignment statements
-		*/
-          
-	     /*   
-              * if(new_val) 
-              *   if(!new_val->lhs()) // NEW_VALUE without variable list
-              *       new_sign = 1;
-              *   else
-              *     for(env=new_val->lhs(); env; env=env->rhs()) {
-              *       symb=env->lhs()->symbol();
-              *       if(symb==als) {
-              *          new_sign = 1;
-              *          break;
-              *       }   
-              *   }
-	      */  
-              LINE_NUMBER_AFTER(stmt,cur_st);// doAssignStmt in doAlignRule resets cur_st
-	      //all inserted statements for REALIGN directive appear before it         
-              RealignArray(als,tgs,iaxis,nr,align_rule_list,new_sign,stmt);
-                     // doAssignStmt(RealignArr(DistObjectRef(als),DistObjectRef(stmt->expr(2)->symbol()),iaxis,iaxis+nr,iaxis+2*nr,new_sign));
-              
-              ia = iaxis;
-              
-            }
-            SET_DVM(iaxis);
-            
-            }
-
-            Extract_Stmt(stmt); // extracting REALIGN directive 
-            if(st_newv)          
-              Extract_Stmt(st_newv); //extracting preceeding NEW_VALUE directive    
-            stmt = cur_st;//setting stmt on last inserted statement        
-            st_newv = 0;              
-            break;
-	    
-       case DVM_REDISTRIBUTE_DIR:
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt);    
-            else {
-            int idis; // DisRuleArray index 
-            int new_sign,isave; 
-            SgSymbol *das;
-            SgExpression *target,*ps;
-	       // new_val = hasNewValueClause(stmt);
-            nproc = 0; 
-            isave = ndvm;
-            where = stmt; //for inserting before current directive 
-            LINE_NUMBER_BEFORE(stmt,stmt);
-            SgExpression *distr_rule_list = doDisRules(stmt,0,idis);  
-            target = hasOntoClause(stmt);
-            if ( target ) { //is there ONTO_clause   
-              nproc=RankOfSection(target); // rank of Processors
-              if(nblock && nproc && nblock > nproc)
-                Error("The number of BLOCK/GENBLOCK elements of dist-format-list is greater than the rank of PROCESSORS '%s'", target->symbol()->identifier(),90,stmt);
-            }
-            ps = PSReference(stmt);
-              //LINE_NUMBER_AFTER(stmt,cur_st);// doAssignStmt in doDisRuleArrays resets cur_st
-	      //all inserted statements for REDISTRIBUTE directive appear before it   
-            new_sign = 0;
-            if(st_newv)
-                  new_sign = 1; // NEW_VALUE without variable list    
-            //looking through the dist_name_list
-            for(e=stmt->expr(0); e; e=e->rhs()) {
-               das = (e->lhs())->symbol(); // distribute array symbol
-               // for debug
-               //printf("%s\n ", das->identifier());
-               //
-               //new_sign = 0;
-               //if(new_val) 
-               //  if(!new_val->lhs()) // NEW_VALUE without variable list
-               //      new_sign = 1;
-               //  else
-               //    for(env=new_val->lhs(); env; env=env->rhs()) {
-               //      symb=env->lhs()->symbol();
-               //      if(symb==das) {
-               //         new_sign = 1;
-               //         break;
-               //      }   
-               //  }
-               // if(Rank(das)!=ndis)
-               //   Error("Length of dist-format-list is not equal the rank of %s  ", das->identifier(),stmt);
-         
-               // creating LibDVM function calls for redistributing array
-               
-               RedistributeArray(das,idis,distr_rule_list,ps,new_sign,e->lhs(),stmt);
-            
-            }
-            
-            SET_DVM(isave);
-            Extract_Stmt(stmt); // extracting REDISTRIBUTE directive 
-            if(st_newv)          
-              Extract_Stmt(st_newv); //extracting preceeding NEW_VALUE directive    
-            stmt = cur_st;//setting stmt on last inserted statement
-               
-            }        
-            st_newv = 0;  
-	    break;
-
-       case DVM_LOCALIZE_DIR:
-          { 
-            int iaxis;
-            int rank=Rank(stmt->expr(1)->symbol());
-            SgExpression *ei;    
-            if(!INTERFACE_RTS2)
-            {
-               warn("LOCALIZE directive is ignored, -Opl2 option should be specified",621,stmt);
-               pstmt = addToStmtList(pstmt, stmt);
-               break;
-            }
-            LINE_NUMBER_AFTER(stmt,stmt);
-            for(ei=stmt->expr(1)->lhs(),iaxis=rank; ei; ei=ei->rhs(),iaxis--)
-               if(ei->lhs()->variant() == DDOT)
-                  break; 
-
-            if( HEADER(stmt->expr(0)->symbol()) && HEADER(stmt->expr(1)->symbol()) )  
-	    {
-                 doCallAfter(IndirectLocalize(HeaderRef(stmt->expr(0)->symbol()),HeaderRef(stmt->expr(1)->symbol()),iaxis));
-                 Extract_Stmt(stmt);
-            } 
-            if( !HEADER( stmt->expr(0)->symbol()) )
-                 Error("'%s' is not distributed array", stmt->expr(0)->symbol()->identifier(),72,stmt);
-            if( !HEADER( stmt->expr(1)->symbol()) )
-                 Error("'%s' is not distributed array", stmt->expr(1)->symbol()->identifier(),72,stmt);
-
-            stmt = cur_st;
-            break;
-          }
-           
-       case DVM_SHADOW_ADD_DIR:
-            if(!INTERFACE_RTS2)
-            {
-               warn("SHADOW_ADD directive is ignored, -Opl2 option should be specified",621,stmt);
-               pstmt = addToStmtList(pstmt, stmt);
-               break;
-            }
-            LINE_NUMBER_AFTER(stmt,stmt);
-            Shadow_Add_Directive(stmt);
-            Extract_Stmt(stmt);
-            stmt = cur_st;
-            break;
-            
-//Debugging Directive
-      case DVM_INTERVAL_DIR:
-	  if (perf_analysis > 1){
-            //generating call to 'binter' function of performance analizer
-	    // (begin of user interval)
-            
-            LINE_NUMBER_AFTER(stmt,stmt);
-            InsertNewStatementAfter(St_Binter(OpenInterval(stmt),Value_F95(stmt->expr(0))), cur_st,cur_st->controlParent());       
-          }
-          pstmt = addToStmtList(pstmt, stmt);  //including the DVM  directive to list
-          stmt = cur_st;
-          break;
-
-      case DVM_ENDINTERVAL_DIR:
-          if (perf_analysis > 1){
-            //generating call to 'einter' function of performance analizer
-	    // (end of user interval)
-            
-            if(!St_frag){
-              err("Unmatched directive",182,stmt);
-              break;
-            }
-            if(St_frag && St_frag->begin_st &&  (St_frag->begin_st->controlParent() != stmt->controlParent()))
-                err("Misplaced directive",103,stmt); //interval must be a block
-	    LINE_NUMBER_AFTER(stmt,stmt);
-            InsertNewStatementAfter(St_Einter(INTERVAL_NUMBER,INTERVAL_LINE), cur_st, stmt->controlParent());
-            CloseInterval();
-            Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;
-          }
-          else
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);  
-          break;
-
-      case DVM_EXIT_INTERVAL_DIR:
-          if (perf_analysis > 1){
-            //generating calls to 'einter' function of performance analizer
-	    // (exit from user intervals)
-            
-            if(!St_frag){
-              err("Misplaced directive",103,stmt);
-              break;
-            }
-            ExitInterval(stmt);
-            Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;
-          }
-          else
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);  
-          break;
-
-       case DVM_MAP_DIR:
-	 {  int ind;
-            SgExpression *ps,*am,*index;
-            SgSymbol *s_tsk;
-            if(inparloop){
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-              break;
-            }
-            LINE_NUMBER_BEFORE(stmt,stmt);
-            where = stmt; //for inserting before current directive 
-            ind = ndvm;
-            s_tsk = stmt->expr(0)->symbol();
-            if(!stmt->expr(2))  // MAP ... ONTO ...
-            { index = Calculate(stmt->expr(0)->lhs()->lhs());
-              if(!isSgValueExp(index) && !isSgVarRefExp(index))
-              {  doAssignStmt(index);
-                 index = DVM000(ind);
-              }
-              PSReference(stmt);
-              ps =  new SgArrayRefExp(*s_tsk,*new SgValueExp(1),*index);
-              cur_st->setExpression(0,*ps);
-              am = new SgArrayRefExp(*s_tsk,*new SgValueExp(2),*index);
-              doCallStmt(MapAM(am,ps));
-              SET_DVM(ind);
-            } else            //  MAP ... BY ...
-            { SgExpression *section, *ev_tsk, *e_count;
-              SgSymbol *s_ind;
-              int ips,i_size, i_lps, ic;
-              SgStatement *dost;
-              s_tsk->addAttribute(TSK_AUTO, (void*) 1, 0);
-              section = stmt->expr(0)->lhs();
-              i_size = ndvm;
-              doAssignStmt(GetSize(ParentPS(),0));
-              // pr = psview(PSRef, rank, SizeArray, StaticSign)
-              ips = ndvm;              
-              doAssignStmt(Reconf(DVM000(i_size), 1, 0));
-              s_ind = loop_var[0]; //TASK_IND_VAR(s_tsk);  
-              ev_tsk = new SgVarRefExp(s_ind);
-              ic = ndvm;
-              e_count = CountOfTasks(stmt);
-              doAssignStmt(e_count);           
-              TestParamType(stmt);               
-              doCallStmt(MapTasks(DVM000(ic),DVM000(i_size),new SgVarRefExp(stmt->expr(2)->symbol()),new SgVarRefExp(TASK_LPS_ARRAY(s_tsk)),new SgVarRefExp(TASK_HPS_ARRAY(s_tsk)),new SgVarRefExp(TASK_RENUM_ARRAY(s_tsk)))); 
-              ps =  new SgArrayRefExp(*s_tsk,*new SgValueExp(1),*ev_tsk);
-              am =  new SgArrayRefExp(*s_tsk,*new SgValueExp(2),*ev_tsk);
-              dost = new SgForStmt(*s_ind,*new SgValueExp(1),*e_count,*MapAM(am,ps));
-              where->insertStmtBefore(*dost);   
-              cur_st = dost;
-              i_lps = ndvm;
-              doAssignStmtAfter( &(*new SgArrayRefExp(*TASK_LPS_ARRAY(s_tsk),*ev_tsk) - *new SgValueExp(1)) );
-              doAssignStmtAfter( &(*new SgArrayRefExp(*TASK_HPS_ARRAY(s_tsk),*ev_tsk) - *new SgValueExp(1)) );
-              doAssignTo_After(ps, CrtPS(DVM000(ips), i_lps, i_lps+1, 0) );
-              cur_st = dost->lastNodeOfStmt(); 
-              SET_DVM(i_size);  
-            }
-            Extract_Stmt(stmt); // extracting DVM-directive 
-            stmt = cur_st;  
-	 }
-            break; 
-
-       case DVM_TASK_REGION_DIR:
-	    if(in_task_region++) {
-              err("Nested TASK_REGION  are not permitted", 100,stmt);
-              break;
-            }  
-            if(inparloop){
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-              break;
-            }    
-            if((stmt->lexNext()->variant() != DVM_ON_DIR) && (stmt->lexNext()->variant() != DVM_END_TASK_REGION_DIR) &&  (stmt->lexNext()->variant() != DVM_PARALLEL_TASK_DIR))
-              err("Statement is outside of on-block",101,stmt->lexNext()); 
-            LINE_NUMBER_AFTER(stmt,stmt);
-            //if(stmt->expr(0))
-	     Reduction_Task_Region(stmt);
-            //if(stmt->expr(1))
-	     Consistent_Task_Region(stmt);
-            task_region_st = stmt;
-            task_region_parent = stmt->controlParent(); //to test nesting blocks
-            task_lab = (SgLabel *) NULL;
-            task_ind = ndvm++; 
-            if(dvm_debug)
-                DebugTaskRegion(stmt);                 
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);
-            stmt = cur_st;      
-            break;
-
-       case DVM_END_TASK_REGION_DIR:
-	    if(!in_task_region--) {
-              err("No matching TASK_REGION", 102,stmt); 
-              break;
-            }             
-            if(inparloop){
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-              break;
-            } 
-            if(stmt->controlParent() != task_region_parent) //test of nesting blocks
-              err("Misplaced directive",103,stmt);
-            LINE_NUMBER_AFTER(stmt,stmt);
-            if(dvm_debug)
-                CloseTaskRegion(task_region_st,stmt); 
-            EndReduction_Task_Region(stmt);
-            EndConsistent_Task_Region(stmt);
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);  
-            stmt = cur_st; 
-            break;
-   
-       case DVM_ON_DIR: 
-            if(in_task++) {
-              err("Nested ON-blocks are not permitted", 104,stmt); 
-              break;
-            }
-    
-            if(inparloop){
-              err("The directive is inside the range of PARALLEL loop",98, stmt); 
-              break;
-            } 
-
-            if(!isSgArrayRefExp(stmt->expr(0)) || !stmt->expr(0)->symbol()) {
-              err("Syntax error",14, stmt); 
-              break;
-            } 
-
-            on_stmt = stmt;                                                            
-            if(HEADER(stmt->expr(0)->symbol())) // ON <dvm-array-element> construct
-            { 
-              LINE_NUMBER_BEFORE(stmt,stmt);
-              in_on++;  
-              break;
-            }
-            // ON <task-array-element> construct
-            if(!in_task_region)
-              err("ON directive is outside of the task region", 105,stmt); 
-            if( stmt->expr(0)->symbol()->attributes() & TASK_BIT)
-            {
-	      LINE_NUMBER_AFTER(stmt,stmt); 
-              task_lab = GetLabel();    
-              StartTask(stmt);
-              pstmt = addToStmtList(pstmt, stmt); 
-              stmt = cur_st;
-            } 
-            else 
-              Error("'%s' is not task array", stmt->expr(0)->symbol()->identifier(),77,stmt);
-            break;
-
-       case DVM_END_ON_DIR:
-            if(!in_task) {
-              err("No matching ON directive", 106,stmt); 
-              break;
-            } else
-              in_task--;
-            if(in_task)  //nested ON constructs
-               break;  
-            
-            if(inparloop){
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-              break;
-            }  
-            if(on_stmt && stmt->controlParent() != on_stmt->controlParent())
-              err("Misplaced directive",103,stmt);
-            if(in_on) // end of ON <dvm-array-element> construct
-            {
-               ReplaceOnByIf(on_stmt,stmt);
-               Extract_Stmt(on_stmt); // extracting DVM-directive (ON) 
-               in_on--; 
-
-               if(dvm_debug)
-               {
-                  SgStatement *std = dbg_if_regim ?  CreateIfThenConstr(DebugIfCondition(),D_Skpbl())  : D_Skpbl();
-                  InsertNewStatementAfter(std,stmt,stmt->controlParent());
-                  cur_st = lastStmtOf(std);     
-               }          
-               Extract_Stmt(stmt);  // extracting DVM-directive (END_ON)
-               stmt = cur_st;
-               break;
-            }
-            //end of ON <task-array-element> construct
-            if((stmt->lexNext()->variant() != DVM_ON_DIR) && (stmt->lexNext()->variant() != DVM_END_TASK_REGION_DIR))
-              err("Statement is outside of on-block",101,stmt->lexNext());  
-            LINE_NUMBER_AFTER(stmt,stmt);
-            doCallAfter(StopAM());
-            InsertNewStatementAfter(new SgStatement(CONT_STAT),cur_st,stmt->controlParent());
-            if(task_lab)
-              cur_st->setLabel(*task_lab);
-            FREE_DVM(1);   
-            Extract_Stmt(stmt);// extracting DVM-directive (END_ON)   
-            stmt = cur_st;
-            break;
-  
-       case DVM_RESET_DIR:
-            if(inparloop){
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-              break;
-            } 
-            if(options.isOn(NO_REMOTE)) {
-              pstmt = addToStmtList(pstmt, stmt);
-              break;
-            }
-            LINE_NUMBER_AFTER(stmt,stmt);    
-            doCallAfter(DeleteObject_H(GROUP_REF(stmt->symbol(),1)));               
-            doAssignTo_After(GROUP_REF(stmt->symbol(),1),new SgValueExp(0));
-            Extract_Stmt(stmt);// extracting DVM-directive   
-            stmt = cur_st;
-            break;
-
-       case DVM_PREFETCH_DIR: 
-            if(inparloop){
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-              break;
-            } 
-            if(options.isOn(NO_REMOTE)) {
-              pstmt = addToStmtList(pstmt, stmt);
-              break;
-            }
-            if(INTERFACE_RTS2)
-               err("Illegal directive in -Opl2 mode. Asynchronous operations are not supported in this mode", 649, stmt);    
-
-            {SgStatement *if_st,*endif_st;
-            pref_st = addToStmtList(pref_st, stmt);//add to list of PREFETCH directive
-            if_st = doIfThenConstrForPrefetch(stmt);
-            cur_st = if_st->lexNext()->lexNext();//ELSE IF
-            endif_st = cur_st->lexNext()->lexNext(); //END IF
-            doAssignStmtAfter((stmt->symbol()->attributes() & INDIRECT_BIT) ?  LoadIG(stmt->symbol()) : LoadBG(GROUP_REF(stmt->symbol(),1)));            
-            doAssignTo_After(GROUP_REF(stmt->symbol(),3),new SgValueExp(1));
-            cur_st = if_st;//IF THEN
-            doAssignTo_After(GROUP_REF(stmt->symbol(),1),(stmt->symbol()->attributes() & INDIRECT_BIT) ? CreateIG(0,1) :  CreateBG(0,1));
-            LINE_NUMBER_AFTER(stmt,stmt); 
-            Extract_Stmt(stmt);// extracting DVM-directive   
-            stmt = endif_st;
-            }
-            break;
-
-	    /* case DVM_INDIRECT_ACCESS_DIR:*/ 
-/*
-     case DVM_OWN_DIR: 
-	   if(inparloop){
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-              break;
-            } 
-            if(stmt->lexNext()->variant() == ASSIGN_STAT) 
-               own_exe = 1;
-            else
-               err("OWN directive must precede an assignment statement",stmt);
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt); 
-	  
-            break;
-   */   
-       case DVM_PARALLEL_TASK_DIR: 
-	  {  //SgForStmt *stdo;
-            SgExpression *el;
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt);  
-            if(!in_task_region)
-              err("Parallel-task-loop directive is outside of the task region", 107,stmt); 
-            if(in_task++) {
-              err("Nested ON-blocks are not permitted", 104,stmt); 
-              break;
-            } 
-               //stdo = isSgForStmt(stmt->lexNext());
-            if(! isSgForStmt(stmt->lexNext())){
-              err(" PARALLEL directive must be followed by DO statement",97,stmt);
-                                                                   //directive is ignored  
-              break;
-            }    
-            for(el=stmt->expr(1); el; el=el->rhs()) {
-               if(el->lhs()->variant() != ACC_PRIVATE_OP)
-                 err("Illegal clause",150,stmt); 
-               break;
-            }          
-            task_do = stmt->lexNext();       
-            LINE_NUMBER_AFTER(stmt,stmt);
-            cur_st = task_do;
-            task_lab = GetLabel();//stdo->endOfLoop()
-            // task_do_ind = <renum_array>(loop_var_ind)
-            doAssignTo_After(new SgVarRefExp(task_do->symbol()),new SgArrayRefExp(*TASK_RENUM_ARRAY(stmt->expr(0)->symbol()),*new SgVarRefExp(loop_var[0])));     
-            task_do->setSymbol(*loop_var[0]);              
-            StartTask(stmt);   
-            pstmt = addToStmtList(pstmt, stmt); 
-            //Extract_Stmt(stmt);// extracting DVM-directive 
-            //stmt = cur_st;
-	 }
-            break;
-
-       case DVM_ASYNCWAIT_DIR:	    
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98, stmt);
-            if(INTERFACE_RTS2)
-              warn("Illegal directive/statement in -Opl2 mode. Asynchronous execution is replaced by a synchronous.", 649, stmt);  
-            else
-            {   
-              LINE_NUMBER_AFTER(stmt,stmt); //for tracing set on global variable of LibDVM  
-              AsyncCopyWait(stmt->expr(0));	                             
-            }  
-            pstmt = addToStmtList(pstmt, stmt); 
-            stmt = cur_st;//setting stmt on last inserted statement                  
-            break;
-
-       case DVM_ASYNCHRONOUS_DIR:
-            AnalyzeAsynchronousBlock(stmt); //analysis of ASYNCHRONOUS_ENDASYNCHRONOUS block
-            inasynchr++;
-            async_id = stmt->expr(0);
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop",98, stmt);
-            if(INTERFACE_RTS2)
-              warn("Illegal directive/statement in -Opl2 mode. Asynchronous execution is replaced by a synchronous.", 649, stmt);
-            pstmt = addToStmtList(pstmt, stmt);  
-            break;
-
-       case DVM_ENDASYNCHRONOUS_DIR:
-            inasynchr--;
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop",98, stmt);      
-            pstmt = addToStmtList(pstmt, stmt); 
-            break;
-
-       case DVM_F90_DIR:
-	    if(inparloop) {
-              err("The directive is inside the range of PARALLEL loop",98, stmt); 
-              break;
-            }  
-            if(!inasynchr)
-               err("Misplaced directive",103,stmt);
-            AsynchronousCopy(stmt);
-            pstmt = addToStmtList(pstmt, stmt); 
-            stmt=cur_st; 
-            break;
-
-       case DVM_TEMPLATE_CREATE_DIR:
-            LINE_NUMBER_BEFORE(stmt,stmt);
-            Template_Create(stmt);
-            pstmt = addToStmtList(pstmt, stmt);             
-            stmt = cur_st;
-            break;
-
-       case DVM_TEMPLATE_DELETE_DIR:
-            LINE_NUMBER_BEFORE(stmt,stmt);
-            Template_Delete(stmt);
-            pstmt = addToStmtList(pstmt, stmt);
-            stmt = cur_st;
-            break;
-
-       case DVM_TRACEON_DIR:
-            InsertNewStatementAfter(new SgCallStmt(*fdvm[TRON]),stmt,stmt->controlParent());
-            LINE_NUMBER_AFTER(stmt,stmt); 
-            Extract_Stmt(stmt);// extracting DVM-directive             
-            stmt = cur_st;
-            break;
-
-       case DVM_TRACEOFF_DIR:  
-            InsertNewStatementAfter(new SgCallStmt(*fdvm[TROFF]),stmt,stmt->controlParent()); 
-            LINE_NUMBER_AFTER(stmt,stmt); 
-            Extract_Stmt(stmt);// extracting DVM-directive 
-            stmt = cur_st;
-            break;
-
-       case DVM_BARRIER_DIR:
-            doAssignStmtAfter(Barrier()); 
-            FREE_DVM(1);
-            LINE_NUMBER_AFTER(stmt,stmt);
-            Extract_Stmt(stmt);// extracting DVM-directive             
-            stmt = cur_st;
-            break;
-
-       case DVM_CHECK_DIR:
-	    if(check_regim) {
-              cur_st = Check(stmt);  
-              Extract_Stmt(stmt); // extracting DVM-directive            
-              stmt = cur_st;
-            } else
-              pstmt = addToStmtList(pstmt, stmt);     
-            break;
-
-       case DVM_DEBUG_DIR:
-         { int num;
-	 /*
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-	 */ 
-            if((stmt->expr(0)->variant() != INT_VAL) || (num=stmt->expr(0)->valueInteger())<= 0)
-              err("Illegal fragment number",181,stmt);  
-            else  if(debug_fragment || perf_fragment)
-              BeginDebugFragment(num,stmt);
-            
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);  
-	 }
-            break;
-       case DVM_ENDDEBUG_DIR: 
-	 { int num;
-         /*
-            if(inparloop)
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-	 */ 	  
-            if((stmt->expr(0)->variant() != INT_VAL) || (num=stmt->expr(0)->valueInteger())<= 0)
-              err("Illegal fragment number",181,stmt);   
-            else if((debug_fragment || perf_fragment) && ((cur_fragment && cur_fragment->No != num) || !cur_fragment))
-              err("Unmatched directive",182,stmt);
-            else {
-             if(cur_fragment && cur_fragment->begin_st && (stmt->controlParent() != cur_fragment->begin_st->controlParent()))
-	       err("Misplaced directive",103,stmt); //fragment must be a block
-             EndDebugFragment(num);
-	    }
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt); 
-	 } 
-            break;
-
-       case DVM_IO_MODE_DIR:
-            IoModeDirective(stmt,io_modes_str,WITH_ERR_MSG);
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt); 
-	    break;
-       case OPEN_STAT:
-            Open_Statement(stmt,io_modes_str,WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-       case CLOSE_STAT:
-            Close_Statement(stmt,WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-       case INQUIRE_STAT:
-            Inquiry_Statement(stmt,WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-       case BACKSPACE_STAT:
-       case ENDFILE_STAT:
-       case REWIND_STAT:
-            FilePosition_Statement(stmt,WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-       case WRITE_STAT:
-       case READ_STAT:
-	    ReadWrite_Statement(stmt, WITH_ERR_MSG);
-	    stmt = cur_st;
-            break;
-       case PRINT_STAT:
-            Any_IO_Statement(stmt);
-            ReadWritePrint_Statement(stmt,WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-
-       case DVM_CP_CREATE_DIR:     /*Check Point*/
-            CP_Create_Statement(stmt, WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-       case DVM_CP_SAVE_DIR:
-            CP_Save_Statement(stmt, WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-       case DVM_CP_LOAD_DIR:
-            CP_Load_Statement(stmt, WITH_ERR_MSG);
-            stmt = cur_st;
-            break;                 
-      case DVM_CP_WAIT_DIR:
-            CP_Wait(stmt, WITH_ERR_MSG);
-            stmt = cur_st;
-            break;                /*Check Point*/
-           
-       case FOR_NODE:
-             if(HPF_program)
-                SetDoVar(stmt->symbol());
-	     if(perf_analysis == 4 && !IN_COMPUTE_REGION)
-                SeqLoopBegin(stmt);
-             if(dvm_debug) 
-       	        DebugLoop(stmt);
-             else
-             { 
-                ChangeDistArrayRef(stmt->expr(0));
-                ChangeDistArrayRef(stmt->expr(1));
-             }
-       default:
-            break;      
-    }
-    
-   // analyzing of loop end statement
-    {
-      SgStatement *end_stmt;
-      end_stmt = isSgLogIfStmt(stmt->controlParent()) ? stmt->controlParent() : stmt; 
-      if(inparloop && isParallelLoopEndStmt(end_stmt,par_do))
-                           
-      { //stmt is last statement of parallel loop or is body of logical IF , which
-        // is last statement 
-        EndOfParallelLoopNest(stmt,end_stmt,par_do,func); 
-        inparloop = 0;  // end of parallel loop nest        
-        stmt = cur_st;
-        //SET_DVM(iplp);
-        continue;
-      } // end of processing last statement of parallel loop
-                                                            //printf("!!! end parallel loop %d\n",end_stmt->lineNumber());  
-      if(HPF_program && isDoEndStmt(end_stmt))
-        OffDoVarsOfNest(end_stmt); 
-  
-      if(task_do &&  isDoEndStmt(end_stmt) && end_stmt->controlParent() == task_do){
-        SgStatement *st;
-        st=ReplaceDoLabel(end_stmt,task_lab);
-        if(st) {
-          BIF_LABEL(st->thebif) = NULL;
-          stmt = st;
-          InsertNewStatementBefore (StopAM(),st);
-          st->setLabel(*task_lab);
-
-        } else {//ENDDO
-          InsertNewStatementBefore (StopAM(),stmt);
-        }
-        in_task--;   
-      }
-  
-      if(dvm_debug){
-        if( isDoEndStmt_f90(stmt)) {
-           //on debug regim logical IF may not be end of loop
-          CloseLoop(stmt);
-          stmt = cur_st;
-        }  
-      }
-      else if(perf_analysis && close_loop_interval)
-        if(isDoEndStmt_f90(end_stmt)){
-          SeqLoopEnd(end_stmt,stmt);
-          stmt = cur_st; 
-        }
-  
-    } // end of processing last statement of loop nest
-
-  } // end of processing executable statement/directive 
-  
-END_: // end of program unit     
- //checking: is in program unit any enclosed DVM-construct? 
-   if(in_task_region)
-      err("Missing ENDTASK_REGION directive",108,stmt); 
-   if(in_task)
-      err("Missing ENDON directive",109,stmt); 
-//checking: is in program unit any enclosed ACC-construct? /*ACC*/
-   if(cur_region)   /*ACC*/
-   {  if( cur_region->is_data)
-         err("Missing END DATA REGION directive",602,stmt);
-      else
-         err("Missing END REGION directive",603,stmt);
-   }
-
-// for declaring dvm000(N) is used maximal value of ndvm
-  SET_DVM(ndvm);
-  cur_st =  first_dvm_exec;
-  if(last_dvm_entry)
-    lentry = last_dvm_entry->lexNext(); // lentry - statement following first_dvm_exec or last generated dvm-initialization statement(before first_exec)
-                                        // before first_exec may be new statements generated for first_exec 
-    if(!IN_MODULE) {
-    if(has_contains)
-      MarkCoeffsAsUsed();
-    InitBaseCoeffs();
-    InitRemoteGroups();
-    InitShadowGroups();
-    InitRedGroupVariables();
-    WaitDirList();
-    if(IN_MAIN_PROGRAM)
-      EnterDataRegionForVariablesInMainProgram(begin_block ? begbl : dvmh_init_st);            /*ACC*/
-    else
-      EnterDataRegionForLocalVariables(begin_block ? begbl : cur_st, first_exec, begin_block); /*ACC*/ 
-    DoStmtsForENTRY(first_dvm_exec,lentry); // copy the previously generated statements for each ENTRY
-                                            // except for statements generated for the first executable statement if it is DVM-directive
-    UnregisterVariables(begin_block); // close data region before exit from the procedure
- 
-    fmask[FNAME] = 0;
-    stmt = data_stf ? data_stf->lexPrev() : first_dvm_exec->lexPrev();
-    DeclareVarDVM(stmt,stmt); 
-    CheckInrinsicNames();
-
-  } else {
-    if(mod_proc){
-      cur_st = end_of_unit->lexPrev();
-      InitBaseCoeffs();
-      MayBeDeleteModuleProc(mod_proc,end_of_unit); 
-    }
-    fmask[FNAME] = 0;
-    nloopred = nloopcons = MAX_RED_VAR_SIZE;
-    stmt= mod_proc ? has_contains->lexPrev() : first_dvm_exec->lexPrev();
-    DeclareVarDVM(stmt, (mod_proc ? mod_proc : stmt)); 
-  }
-                      
- Extract_Stmt(first_dvm_exec);  //extract fname() call
- for(;pstmt; pstmt= pstmt->next)
-     Extract_Stmt(pstmt->st);// extracting  DVM Directives and 
-                             //statements (inside the range of ASYNCHRONOUS construct)
- if(ACC_program==0 && debug_regim) 
-     if(cur_func->expr(2) && cur_func->expr(2)->variant() == PURE_OP)
-        cur_func->setExpression(2, NULL);    // removing  PURE attribute from procedure header
- return; 
-}
-
-
-int DeleteDArFromList(SgStatement *stmt)
-{ SgExpression *el,*preve,*pl,*opl,*dvm_list, *dvml;
-  SgSymbol * s;
-  int ia,is_assign; 
-
-	 if(stmt->variant() == SAVE_DECL || stmt->variant() == OPTIONAL_STMT || stmt->variant() == PRIVATE_STMT || stmt->variant() == PUBLIC_STMT)   //|| stmt->variant() == INTENT_STMT deleted 28.06.21
-	    return(1); 
-          
-          pl =  stmt->expr(0); 
-          preve = 0;
-          is_assign = 0;  
-          dvm_list = NULL;
-          for(el=stmt->expr(0); el; el=el->rhs()) {
-              if(el->lhs()->variant() == ASSGN_OP || el->lhs()->variant() == POINTST_OP) is_assign = 1;//with initial value
-              s = el->lhs()->symbol();
-              if(s) {
-                if((debug_regim || IN_MAIN_PROGRAM) && !in_interface && IS_ARRAY(s) )
-                    registration = AddNewToSymbList( registration, s); 
-                if(!strcmp(s->identifier(),"heap") && el->lhs()->lhs())
-		    //  heap_ar_decl = el->lhs();
-		    //heap_ar_decl->setSymbol(*heapdvm);
-                  heap_ar_decl = new SgArrayRefExp(*heapdvm);
-		    // heap_ar_decl = el->lhs()->lhs(); 
-                ia = s->attributes();
-                if(IS_GROUP_NAME(s))
-                  Error("Inconsistent declaration of identifier: %s",s->identifier(),16,stmt);
-                                
-                if(((ia & DISTRIBUTE_BIT) || (ia & ALIGN_BIT) || (ia & INHERIT_BIT)) &&  !(ia & DVM_POINTER_BIT)  || (ia & HEAP_BIT) || !strcmp(s->identifier(),"heap") ){
-                   el->lhs()->setLhs(NULL);
-		   if(stmt->variant() == POINTER_STMT || stmt->variant() == TARGET_STMT || stmt->variant() == STATIC_STMT)
-                      continue;
-                   dvml = new SgExprListExp(el->lhs()->copy());     
-		   dvml->setRhs(dvm_list);
-                   dvm_list = dvml;
-
-                   if(preve)
-                         preve->setRhs( el->rhs());
-                   else
-                         pl = el->rhs();
-                }
-                else
-                   preve = el;
-              }
-              else
-                 preve = el;
-          }
-          if(stmt->variant() == VAR_DECL && dvm_list) {	   
-            for( opl = stmt->expr(2); opl; opl=opl->rhs()) //looking through the option list and generating new statements
-              NewSpecificationStatement(opl->lhs(),dvm_list,stmt);
-          }
-          if(is_assign && stmt->variant() == VAR_DECL && !stmt->expr(2))
-            stmt->setVariant(VAR_DECL_90);
-           
-          if(pl) { 
-            stmt->setExpression(0, *pl);
-            return (1);
-          }
-          else // variable list is empty
-            return (0);
-         
-}        
-
-
-int DeleteHeapFromList(SgStatement *stmt)
-{ SgExpression *el,*ec,*preve,*pl, *prcl, *cl;
-  SgSymbol * s;
-  int ia;
-  // stmt is COMMON statement
-    prcl = NULL;
-    cl = stmt->expr(0); 
-    for(ec=stmt->expr(0); ec; ec=ec->rhs()) {// looking through COMM_LIST
-       pl = ec->lhs();
-       preve = NULL;  
-          for(el=ec->lhs(); el; el=el->rhs()) {  
-              s = el->lhs()->symbol();
-              if(s) {
-                ia = s->attributes();   
-                if( (ia & HEAP_BIT) || !strcmp(s->identifier(),"heap") ){
-                   if(preve)
-                     preve->setRhs( el->rhs());                      
-                   else
-                     pl = el->rhs();
-                }
-                else
-                   preve = el;
-              }
-              else
-                preve = el;
-          } //end of loop el
-          if(pl) {
-            ec->setLhs(pl);
-            prcl = ec;
-          }
-          else {// common variable list is empty
-            if(prcl)
-               prcl->setRhs(ec->rhs());
-            else
-               cl = ec->rhs();
-          }
-    }   
-    if(cl) {
-      stmt->setExpression(0, *cl);
-      return(1); 
-    }
-    else // COMM_LIST is empty
-      return(0);
-}        
-
-void NewSpecificationStatement(SgExpression *op, SgExpression *dvm_list, SgStatement *stmt)
-{SgStatement *st;
-	      switch(op->variant()){
-                case PUBLIC_OP:
-		  st = new SgStatement(PUBLIC_STMT);
-                  break;
-	        case PRIVATE_OP:
-		  st = new SgStatement(PRIVATE_STMT);
-                  break;
-// 28.06.21 
-//              case IN_OP:
-//	        case OUT_OP:
-//	        case INOUT_OP:
-//		  st = new SgStatement(INTENT_STMT);
-//                st->setExpression(1, op->copy());
-//                break;
-                case SAVE_OP:
-		  st = new SgStatement(SAVE_DECL);
-                  break;
-                case OPTIONAL_OP:
-		  st = new SgStatement(OPTIONAL_STMT);
-                  break;
-                case POINTER_OP:
-		  st = new SgStatement(POINTER_STMT);
-                  break;
-                case TARGET_OP:
-		  st = new SgStatement(TARGET_STMT);
-                  break;
-                case STATIC_OP:
-		  st = new SgStatement(STATIC_STMT);
-                  break;
-	      default: st = NULL;
-              }                  
-              if(st){
-                st->setExpression(0,*dvm_list);
-                stmt->insertStmtBefore(*st, *stmt->controlParent());
-              }
-} 
-             
-int DeferredShape(SgExpression *eShape)
-{
-   SgExpression *el;
-   SgSubscriptExp *sbe;
-   for(el=eShape; el; el=el->rhs())
-   { 
-      if ((sbe=isSgSubscriptExp(el->lhs())) != NULL && !sbe->ubound() && !sbe->lbound()) 
-            continue;
-      else
-            return 0;
-    }              
-    return 1;
-}
-
-void TemplateDeclarationTest(SgStatement *stmt)
-{
-   SgExpression *eol;
-   SgSymbol *symb;
-   for(eol=stmt->expr(0); eol; eol=eol->rhs()) { //testing object list
-      symb=eol->lhs()->symbol();
-      if(IS_DUMMY(symb))
-         Error("Template may not be a dummy argument: %s",symb->identifier(), 80,stmt); 
-      if(DeferredShape(eol->lhs()->lhs()))
-         symb->addAttribute(DEFERRED_SHAPE,(void*)1,0);                      
-      if(IN_COMMON(symb) && IN_MODULE)
-      {
-         SYMB_ATTR(symb->thesymb) =  SYMB_ATTR(symb->thesymb) & (~COMMON_BIT);
-         Warning("COMMON attribute is ignored: %s",symb->identifier(), 641,stmt);
-      }  
-   }
-}
-
-void  CreateArray_RTS2(SgSymbol *das, int indh, SgStatement *stdis) 
-{
- int rank = Rank(das);
- SgExpression *shape_list  = DEFERRED_SHAPE_TEMPLATE(das) ? NULL : doDvmShapeList(das,stdis); 
- if(IS_TEMPLATE(das))
- {
-      // adding to the Template_array Symbol the attribute (ARRAY_HEADER) 
-      // with integer value "indh"  //"iamv" 
-      ArrayHeader(das,indh);  // or 2
-      SgExpression *array_header = HeaderRef(das);
-      das->addAttribute(RTS2_CREATED, (void*) 1, 0);
-      if(!DEFERRED_SHAPE_TEMPLATE(das)) 
-         doCallStmt(DvmhTemplateCreate(das,array_header,rank,shape_list));
- }      
-  else
- {
-      // create dvm-array
-      ArrayHeader(das,indh); 
-      SgExpression *array_header = HeaderRef(das);
-      SgExpression *shadow_list = DeclaredShadowWidths(das);
-      doCallStmt(DvmhArrayCreate(das,array_header,rank,ListUnion(shape_list,shadow_list)));
-      if(!HAS_SAVE_ATTR(das) && !IN_MODULE)
-         doCallStmt(ScopeInsert(array_header));        
-  }
-}
-
-void GenDistArray (SgSymbol *das, int idisars, SgExpression *distr_rule_list, SgExpression *ps, SgStatement *stdis) {
-
-  int iamv,rank,iaxis,ileft,iright,ifst,indh;
-  SgExpression *am_view = NULL, *array_header, *size_array;
-                
-  int ia,sign,re_sign,postponed_root;
-  SgStatement *savest;
-
-  savest = where; 
-  ifst = ndvm;
-  pointer_in_tree = 0;
-  postponed_root = 0;
-  indh = 1;
-
-  if(IS_POINTER(das)) { //is POINTER 
-     ArrayHeader(das,0);
-     loc_distr = 1;  // POINTER is local object   
-     goto TREE_;
-  }
-  if(IS_ALLOCATABLE(das)) { // ALLOCATABLE
-     ArrayHeader(das,-2);
-     loc_distr = 1;  // ALLOCATABLE is local object   
-     goto TREE_;
-  }
-
-  if(IS_DUMMY(das)) { //is dummy argument
-     ArrayHeader(das,1);
-     //ReplaceArrayBounds(das);
-     goto TREE_;
-  }
-  if(IS_POINTER_F90(das)) { // POINTER F90
-     ArrayHeader(das,-2);
-     if(!IS_DUMMY(das))
-	 loc_distr = 1;
-     goto TREE_;
-  }
-  if(IN_COMMON(das)) //  COMMON-block element or TEMPLATE_COMMON
-    if(das->scope()->variant() != PROG_HEDR) { // is not in MAIN-program
-                 //if(stdis->controlParent()->variant() != PROG_HEDR)
-      
-      if(IS_TEMPLATE(das))
-      { 
-        if(idisars == -1) { //interface of RTS2
-          das->addAttribute(RTS2_CREATED, (void*) 1, 0);
-         // ArrayHeader(das,1);
-        } //else
-        ArrayHeader(das,2);
-      } else
-        ArrayHeader(das,1);  
-      goto TREE_;
-    } 
-  //if(DEFERRED_SHAPE_TEMPLATE(das)
-
-  if((das->attributes() & SAVE_BIT) || (saveall && (!IN_COMMON(das)))
- || ORIGINAL_SYMBOL(das)->scope()->variant() == MODULE_STMT) {
-    SgStatement *if_st;   
-    if_st = doIfThenConstr(das);
-    //first_exec = if_st->lexNext();  // reffer to ENDIF statement 
-    where = if_st->lexNext();  // reffer to ENDIF statement   
-  }       
-
-  LINE_NUMBER_BEFORE(stdis,where); // for tracing set the global variable of LibDVM to
-                                        // line number of statement(stdis) 
-  ia = das->attributes();
-      //if(ia & DYNAMIC_BIT && IS_SAVE(das)) 
-      //    Error ("Saved object may not have the DYNAMIC attribute: %s", das->identifier(), 111,stdis);
- 
-  rank = Rank(das);
-  if(ndis && rank && rank != ndis)
-      Error ("Rank of  array %s  is not equal to the length of the dist_format_list", das->identifier(), 110,stdis);
-
-  if((ia & SAVE_BIT) || saveall || IN_MODULE)
-     sign = 1;
-  else
-     sign = 0; 
-  if(ia & TEMPLATE_BIT) { //!!! must be changed
-     if(ia & ALIGN_BASE_BIT)
-       sign = 1; 
-     else { //template  is not used in ALIGN or REALIGN directive
-            //(is used  only in parallel directive)
-       sign = 2;
-       loc_templ_symb=AddToSymbList(loc_templ_symb,das);
-     }
-  }
-  if(ia & POSTPONE_BIT)
-    indh = -1;
-  
-  if(idisars == -1) { //interface of RTS2
-    CreateArray_RTS2(das,indh,stdis);
-    // distribute dvm-array 
-    if(!(ia & POSTPONE_BIT))  //distr_rule_list!=NULL
-       doCallStmt(DvmhDistribute(das,rank,distr_rule_list));
-    where = savest;
-    goto TREE_;
-  }
-                     // interface of RTS1
-  if(DEFERRED_SHAPE_TEMPLATE(das))
-  { 
-    iamv = ndvm; ifst = iamv+1;
-    ArrayHeader(das,iamv);
-    doAssignStmt(new SgValueExp(0));
-    doAssignTo(HeaderRef(das),DVM000(iamv)); // t = AMViewRef
-    where = savest;
-    goto TREE_;
-  }      
-
-// dvm000(i) = crtamv(AMRef, rank, SizeArray, StaticSign)
-// crtamv() creates current Abstract_Machine view 
-  size_array = doSizeArray(das,stdis); 
-  if(!rank)  //distributee is not array
-    size_array = new SgValueExp(0); // for continuing translation of procedure 
-
-  iamv = ndvm; ifst = iamv+1; 
-  if(ia & POSTPONE_BIT){
-    //indh = -1;
-    if(ia & TEMPLATE_BIT)
-      //dvm000(i) = 0; (AMViewRef = 0) 
-      doAssignStmt(new SgValueExp(0));
-    else 
-      ifst = ndvm; 
-  } else {
-    am_view = LeftPart_AssignStmt(CreateAMView(size_array, rank, sign));
-    if(mult_block)
-      doAssignStmt(MultBlock(am_view, mult_block, ndis));
-    //dvm000(i) = genbli(PSRef, AMViewRef, AxisWeightArray, AxisCount) 
-    // genbli sets on the weights of elements of processor system 
-    if(gen_block == 1) 
-      doAssignStmt(GenBlock(ps,am_view, idisars+2*nblock,nblock));
-    if(gen_block == 2) 
-      doAssignStmt(WeightBlock(ps,am_view, idisars+2*nblock, idisars+3*nblock,nblock));
-    //dvm000(i) = DisAM(AMViewRef, PSRef, ParamCount, AxisArray,DistrParamArray) 
-    // DisAM distributes resourses of parent (current) AM between children     
-    doAssignStmt(DistributeAM(am_view, ps, nblock, idisars, idisars+nblock));
-    if(mult_block)
-      doAssignStmt(MultBlock(am_view, mult_block, 0));
-  }  
- 
-//if distributed object isn't template then
-// 1) create distribute array (CrtDa)
-// 2) align distribute array with AM view:
-//    align (i1,...,ik) with AM(i1,...,ik):: dist_array
-
-
-  if(! (ia & TEMPLATE_BIT)) {
-      // dvm000(i) = CrtDA (ArrayHeader,Base,Rank,TypeSize,SizeArray,
-      //                StaticSign,ReDistrSign, LeftBSizeArray,RightBSizeArray)
-      // function CrtDA creates system structures, dosn't allocate array
- 
-      ArrayHeader(das,indh); 
-      array_header = HeaderRef(das);
-      //creating LeftBSizeArray and RightBSizeArray
-      ileft = ndvm;
-      iright = BoundSizeArrays(das);
-      if(ia & DYNAMIC_BIT) 
-          re_sign = 3;
-      else
-          re_sign = 0;  
-
-      StoreLowerBoundsPlus(das,NULL);
-         
-      doAssignStmt(CreateDistArray(das,array_header,size_array,rank,ileft,iright,sign,re_sign));
-       
-      //ndvm--; // CrtDa result is exit code, test and free
-
-      if(!(ia & POSTPONE_BIT)) {
-
-      // dvm000(i) = AlgnDA (ArrayHandle,AMViewHandle,
-      //                               Axis Array,Coeff Array),Const Array)
-      //function AlgnDA alignes the array according to aligning template
-      //actually AlgnDA distributes aligned array elements between virtual
-      //processors 
-      iaxis = ndvm;
-      doAlignRule_1(rank);
-            //     doAlignRule_1(axis_array,coeff_array,const_array);
-      doAssignStmt(AlignArray(array_header, am_view, iaxis, iaxis+rank, iaxis+2*rank));
-       
-           // AlgnDA result is exit code, isn't used */
-           // axis_array, coeff_array and const_array arn't used more
-      }
-       SET_DVM(ileft);
-    
-       //doAssignTo(header_ref(das,rank+2),HeaderNplus1(das));
-                                                   // calculating HEADER(rank+1) 
-  }
-  else
-
-     // adding to the Template_array Symbol the attribute (ARRAY_HEADER) 
-     // with integer value "iamv"
-    { 
-      ArrayHeader(das,iamv);
-      doAssignTo(HeaderRef(das),DVM000(iamv)); // t = AMViewRef
-      if(IN_COMMON(das))
-        StoreLowerBoundsPlus(das,NULL);
-    }      
-  where = savest; //first_exec;
- 
-TREE_: 
-// Looking through the Align Tree of distributed array
-   if(das->numberOfAttributes(ALIGN_TREE)) {//there are any align statements
-   algn_attr * attr;
-   align * root;
-  
-   postponed_root = (das->attributes() & POSTPONE_BIT);
-   attr = (algn_attr *) das->attributeValue(0,ALIGN_TREE);
-   root = attr->ref; // reference to root of align tree
-              // test: attr->type == ROOT ????
-              //   for(node=root->alignees; node; node=node->next) 
-   AlignTree(root);
-   }
-   if(!pointer_in_tree && !postponed_root) // there are not any allocatable aligned arrays in alignment_tree
-     {SET_DVM(ifst);}
-//end GenDistArray
-}
-
-/*
-void  RedistributeArray_RTS2(das,headref,*distr_rule_list,stdis)
-{
-  if(ia & POSTPONE_BIT) {
-    SgStatement *if_st,*end_if;  
-    SgExpression *size_array;  
-    int iaxis;
-    int iamv = INDEX(das);
-    if_st = doIfThenConstrForRedis(headref,stdis,iamv);
-    where = end_if = if_st->lexNext()->lexNext();  // reffer to ENDIF statement
-
-    int ia = das->attributes();
-    int rank = Rank(das);
- 
-    // distribute dvm-array 
-    if(distr_rule_list!=NULL) 
-       doCallStmt(DvmhDistribute(das,rank,distr_rule_list));
-  }
-  else {
-  
-
-  }
-}
-*/
-
-void RedistributeArray(SgSymbol *das, int idisars, SgExpression *distr_rule_list, SgExpression *ps, int sign, SgExpression *dasref, SgStatement *stdis) 
-{ int rank,ia;
-  SgExpression *headref, *stre;
-  rank = Rank(das);
-  headref = IS_POINTER(das) ?  PointerHeaderRef(dasref,1) : HeaderRef(das);
-  if(isSgRecordRefExp(dasref))
-  { stre = & (dasref->copy());
-    stre-> setLhs(headref);
-    headref = stre;
-  }
-  if(rank && rank != ndis)
-      Error ("Rank of array '%s' isn't equal to the length of the dist_format_list",das->identifier(), 110,stdis);
-
-  ia=das->attributes();
-  if(!(ia & DYNAMIC_BIT) && !(ia & POSTPONE_BIT))
-      Error (" '%s' hasn't the DYNAMIC attribute",das->identifier(), 113,stdis);
-  if(!(ia & DISTRIBUTE_BIT) && !(ia & INHERIT_BIT))
-      Error (" '%s' does not appear in DISTRIBUTE/INHERIT directive ",das->identifier(), 114,stdis);
-  if(ia & ALIGN_BIT)
-      Error ("A distributee may not have the ALIGN attribute: %s",das->identifier(), 54, stdis);
-  if(!HEADER(das)) {   
-     Error("'%s' isn't distributed array", das->identifier(), 72,stdis); 
-     return;
-  } 
-
-  if(idisars==-1)  // indirect distribution => interface of RTS2
-  {
-    //RedistributeArray_RTS2(das,headref,distr_rule_list,stdis);
-    doCallStmt(DvmhRedistribute(das,rank,distr_rule_list));
-    doAssignTo(HeaderRefInd(das,HEADER_SIZE(das)),new SgValueExp(1));   // Header(HEADER_SIZE) = 1 => the array has been distributed already 
-    return;
-  } 
-
-  if(ia & POSTPONE_BIT){
-    SgStatement *if_st,*end_if;  
-    SgExpression * size_array, *am_view, *amvref, *headref_flag;  
-    int i1,st_sign,iaxis,iamv;
-    iamv = INDEX(das);
-    if(ia & TEMPLATE_BIT) //TEMPLATE   ( iamv>1 )
-      headref_flag = headref;
-    else
-      headref_flag = IS_POINTER(das) ? PointerHeaderRef(dasref,HEADER_SIZE(das)) : HeaderRefInd(das,HEADER_SIZE(das));
-    if_st = doIfThenConstrForRedis(headref_flag,stdis,iamv); /*08.05.17*/
-    where = end_if = if_st->lexNext()->lexNext();  // reffer to ENDIF statement
-    i1 = ndvm;
-    if(ACC_program || parloop_by_handler)                   /*ACC*/
-       where->insertStmtBefore(*Redistribute_H(headref,sign),*where->controlParent());
-    amvref =   (ia & TEMPLATE_BIT) ? headref : GetAMView( headref); 
-    //inserting after ELSE 
-    if(mult_block)
-      doAssignStmt(MultBlock(amvref, mult_block, ndis));
-    //dvm000(i) = genbli(PSRef, AMViewRef, AxisWeightArray, AxisCount) 
-    // genbli sets on the weights of processor system elements
-    if(gen_block == 1) 
-      doAssignStmt(GenBlock(ps,amvref, idisars+2*nblock,nblock)); 
-    if(gen_block == 2) 
-      doAssignStmt(WeightBlock(ps,amvref,idisars+2*nblock,idisars+3*nblock,nblock));  
-    doCallStmt(RedistributeAM(headref, ps, nblock,idisars,sign));
-    if(mult_block)
-      doAssignStmt(MultBlock(amvref, mult_block, 0));
-    where = if_st->lexNext();  // reffer to ELSE statement 
-    //inserting after IF (...) THEN 
-    if (DEFERRED_SHAPE_TEMPLATE(das))
-      am_view = DVM000(INDEX(das));
-    else
-    {  
-      if(ia & TEMPLATE_BIT)
-        size_array = doSizeArray(das,stdis);
-      else
-        size_array = doSizeArrayQuery( IS_POINTER(das) ? headref : HeaderRefInd(das,1),rank); 
-      if(!rank)  //distributee is not array
-        size_array = new SgValueExp(0); // for continuing translation of procedure 
- 
-      // dvm000(i) = crtamv(AMRef, rank, SizeArray, StaticSign)
-      //crtamv creates current Abstract_Machine view 
-
-      if((ia & SAVE_BIT) || saveall || IN_COMMON(das) || das->scope() != cur_func || IS_BY_USE(das) )
-        st_sign = 1;
-      else
-        st_sign = 0; 
-      if(iamv <= 1) // is not TEMPLATE
-        iamv = ndvm++;
-      am_view = DVM000(iamv);
-      doAssignTo(am_view,CreateAMView(size_array, rank, st_sign));
-    }
-
-    if(mult_block)
-      doAssignStmt(MultBlock(am_view, mult_block, ndis));
-    //dvm000(i) = genbli(PSRef, AMViewRef, AxisWeightArray, AxisCount) 
-    // genbli sets on the weights of elements of processor system 
-    if(gen_block == 1) 
-      doAssignStmt(GenBlock(ps,am_view, idisars+2*nblock,nblock));
-    if(gen_block == 2) 
-      doAssignStmt(WeightBlock(ps,am_view, idisars+2*nblock, idisars+3*nblock,nblock));  
-    //dvm000(i) = DisAM(AMViewRef, PSRef, ParamCount, AxisArray,DistrParamArray) 
-    // DisAM distributes resourses of parent (current) AM between children   
-    doAssignStmt(DistributeAM(am_view,ps,nblock,idisars,idisars+nblock)); 
-    if(mult_block)
-      doAssignStmt(MultBlock(am_view, mult_block, 0));  
-    if (!(ia & TEMPLATE_BIT)) {
-      // dvm000(i) = AlgnDA (ArrayHandle,AMViewHandle,
-      //                               Axis Array,Coeff Array,Const Array)
-      //function AlgnDA alignes the array according to aligning template
-      //actually AlgnDA distributes aligned array elements between virtual
-      //processors 
-      iaxis = ndvm;
-      doAlignRule_1(rank);
-      doAssignStmt(AlignArray( headref, am_view, iaxis, iaxis+rank, iaxis+2*rank));
-      doAssignTo(headref_flag, new SgValueExp(1));  // Header(HEADER_SIZE) == 1 => the array has been distributed already 
-    } else
-      doAssignTo(headref,am_view); // t = AMViewRef
-    //  Looking through the Align Tree of distributed array
-    if(das->numberOfAttributes(ALIGN_TREE) && !IS_ALLOCATABLE_POINTER(das)) {//there are any align statements
-      algn_attr * attr;
-      align * root;
-      attr = (algn_attr *) das->attributeValue(0,ALIGN_TREE);
-      root = attr->ref; // reference to the root of align tree    
-      AlignTreeAlloc(root,stdis);
-    }
-    SET_DVM(i1);
-    cur_st = end_if;  //  => where   10.12.12 ;
-    where = stdis;    //10.12.12
-  }
-  else {
-    SgExpression *amvref;  
-    
-    if(ACC_program || parloop_by_handler)                   /*ACC*/
-       where->insertStmtBefore(*Redistribute_H(headref,sign),*where->controlParent());
-
-    amvref =   (ia & TEMPLATE_BIT) ? headref : GetAMView( headref); 
-    if(mult_block)
-      doAssignStmt(MultBlock(amvref, mult_block, ndis));
-    if(gen_block == 1) 
-      // genbli sets on the weights of processor system elements
-      doAssignStmt(GenBlock(ps,amvref, idisars+2*nblock,nblock));  
-    if(gen_block == 2) 
-      doAssignStmt(WeightBlock(ps,amvref,idisars+2*nblock,idisars+3*nblock,nblock)); 
-    doCallStmt(RedistributeAM(headref,ps,nblock,idisars,sign));
-    //doAssignTo_After(header_ref(das,rank+2),HeaderNplus1(das));
-                                                   // calculating HEADER(rank+1) 
-    if(mult_block)
-      doAssignStmt(MultBlock(amvref, mult_block, 0)); 
-  }
-}
-
-void AlignTree( align *root) {
-    align *node; 
-    int nr,iaxis,ia;
-    SgStatement *stalgn;
-    int pointer_is;
-    stalgn = NULL;
-    pointer_is = 0;
-    iaxis = 0;
-    for(node=root->alignees; node; node=node->next) {
-       if (stalgn != node->align_stmt) {
-	 if(IN_COMMON(node->symb) && (node->symb->scope()->variant() != PROG_HEDR) || !CURRENT_SCOPE(node->symb))
-	 { stalgn = NULL; ia = -1;}
-         else { 
-         stalgn = node->align_stmt;
-         iaxis = ndvm; ia = 0;
-         }
-       }
-       else if(!INDEX(root->symb) || pointer_is || (INDEX(root->symb)==-1))
-       { iaxis = ndvm; ia = 0;}
-       else
-         ia = iaxis;
-       if(IS_ALLOCATABLE(node->symb) || (IS_ALLOCATABLE(root->symb) && CURRENT_SCOPE(root->symb)))
-         ia = -2;  //doAlignRule is empty: align rules are not generated
-       if(IS_POINTER_F90(node->symb) || (IS_POINTER_F90(root->symb) && !IS_DUMMY(root->symb) && CURRENT_SCOPE(root->symb)))
-	  ia = -2; //doAlignRule is empty: align rules are not generated
-       SgExpression *align_rule_list = doAlignRules(node->symb,node->align_stmt,ia,nr);// creating axis_array,
-                                                                                       // coeff_array and  const_array
-       GenAlignArray(node,root, nr, align_rule_list, iaxis);
-       pointer_is =  IS_POINTER(node->symb) || IS_ALLOCATABLE_POINTER(node->symb);
-       AlignTree(node);
-    } 
-}
-
-
-void    GenAlignArray(align *node, align *root, int nr, SgExpression *align_rule_list, int iaxis) {
-
-// 1) creates Distribute Array for "node"
-// 2) alignes Distribute Array with Distribute Array for "root" or with Template 
-
-// To array symbol added attribute ARRAY_HEADER (by function ArrayHeader):
-//    0, for DVM-pointer
-//   -1, for array with postponed allignment and for array allined with one or DVM-pointer 
-//   -2, for ALLOCATABLE array
-//    1, for other arrays
-
-  int rank,ileft,iright,isize;
-  int sign,re_sign,ia,indh;
-  SgSymbol *als;
-  SgExpression *array_header,*size_array;
-  SgStatement *savest;
-  //st = first_exec;   // store first_exec
-  savest = where;
-  als = node->symb;
-  ia = als->attributes();
- 
-  // for debug
-  //printf("%s\n", als->identifier());
-  //
-    
-  if(IS_POINTER(als)) { //alignee  is POINTER   
-   
-     int *index = new int [2];
-     *index = iaxis;
-     *(index+1) = nr;
-     als-> addAttribute(ALIGN_RULE, (void*) index, 2*sizeof(int)); 
- 
-     ArrayHeader(als,0);
-     loc_distr = 1; //POINTER is local object
-     pointer_in_tree = 1;
-     return;
-  }
-  if(IS_ALLOCATABLE(als)) { //alignee  is ALLOCATABLE array   
-   
-   //  int *index = new int [2];
-   //  *index = 0; //iaxis;
-   //  *(index+1) = nr;
-   //  als-> addAttribute(ALIGN_RULE, (void*) index, 2*sizeof(int)); 
- 
-     ArrayHeader(als,-2);
-     loc_distr = 1; //ALLOCATABLE array is local object
-     pointer_in_tree = 1;
-     return;
-  }
-  if(IS_POINTER_F90(als)) { // POINTER F90
-   if(IS_DUMMY(als))
-     ArrayHeader(als,1);
-   else{
-     ArrayHeader(als,-2);
-     pointer_in_tree = 1;
-	 loc_distr = 1;
-   }
-   return;
-  }
-
-  if(root){    
-    indh = INDEX(root->symb);
-    if(CURRENT_SCOPE(root->symb) && ((indh == 0) || (indh == -1)  || ((indh > 1) && (root->symb->attributes() & POSTPONE_BIT)))) {
-                        //align-target is allocatable array: it is aligned directly
-                        // or indirectly with POINTER 
-                        //or
-                        //align-target is "postponed" array:it is aligned directly
-                        // or indirectly with array having  POSTPONE_BIT attribute 
-                        // or
-                        // align-target is TEMPLATE with POSTPONE_BIT
-     int *index = new int [2];
-     *index = iaxis;
-     *(index+1) = nr;
-     als-> addAttribute(ALIGN_RULE, (void*) index, 2*sizeof(int)); 
- 
-     ArrayHeader(als,-1);
-     indh = -1; 
-    } else 
-     ArrayHeader(als,1);
-
-    if(root && IS_ALLOCATABLE(root->symb) && CURRENT_SCOPE(root->symb)) {
-      Error("Array '%s' may not be alligned with ALLOCATABLE array",als->identifier(),401,node->align_stmt); 
-      return;  
-    }
- 
-  } else {
-     ArrayHeader(als,-1); // with POSTPONE_BIT
-     indh = 1;
-  }
-  
-
-  if(IS_TEMPLATE(als)){
-    Error("Template '%s' appears as an alignee",als->identifier(),116,node->align_stmt);
-    return;
-  }
-  if(IS_DUMMY(als)) { //alignee is dummy argument
-    if(!root) return;
-    if(!IS_DUMMY(root->symb)){ // align-target is local array
-       if(!IN_COMMON(root->symb) && CURRENT_SCOPE(root->symb))
-        Error("Dummy argument '%s' is aligned with a local array", als->identifier(),117, node->align_stmt);
-    }
-    else
-       if(warn_all)
-         warn("Associated actual arguments must be aligned",177,node->align_stmt);
-    return;
-  }
-
-  if(IN_COMMON(als)){ //  COMMON-block element
-    if(root && !IN_COMMON(root->symb) && (root->symb->scope()->variant() != PROG_HEDR)) {
-                         //align-target is not in COMMON and its scope is not MAIN-program
-      Error("Aligned array '%s' is in COMMON  but align-target is not", als->identifier(),  118,node->align_stmt);
-      return;
-    }
-    if(als->scope()->variant() != PROG_HEDR)  // is not in MAIN-program
-      return;
-  }
-  if(indh <= 0 && root && CURRENT_SCOPE(root->symb)) //align-target is allocatable  or "postponed" array /podd 31.05.08/
-    return;
-
-  if(IS_SAVE(als)) {  // has SAVE attribute
-    if(root && !IS_TEMPLATE(root->symb) && !IN_COMMON(root->symb) && !HAS_SAVE_ATTR(root->symb) && CURRENT_SCOPE(root->symb) ) {
-      Error("Aligned array '%s' has SAVE attribute but align-target has not", als->identifier(),119,node->align_stmt);
-      return;
-    }
-  } 
-  if(IS_SAVE(als) || ORIGINAL_SYMBOL(als)->scope()->variant() == MODULE_STMT) {
-    SgStatement *ifst;   
-    ifst = doIfThenConstr(als);
-    //first_exec = ifst->lexNext();  // reffer to ENDIF statement  
-    where = ifst->lexNext();  // reffer to ENDIF statement   
-  }      
-  LINE_NUMBER_BEFORE(node->align_stmt,where); 
-                                        // for tracing set the global variable of LibDVM to
-                                        // line number of ALIGN directive 
-
-  array_header = HeaderRef(als);
-  rank = Rank(als);
-
-  if(INTERFACE_RTS2) { //interface of RTS2
-
-    doCallStmt(DvmhArrayCreate(als,array_header,rank,ListUnion(doDvmShapeList(als,node->align_stmt),DeclaredShadowWidths(als))));
-    if(!HAS_SAVE_ATTR(als) && !IN_MODULE) 
-      doCallStmt(ScopeInsert(array_header));
-    if(!(ia & POSTPONE_BIT) && align_rule_list)
-      doCallStmt(DvmhAlign(als,root->symb,nr,align_rule_list));
-    where = savest;
-    return;
-  }
-                       // interface of RTS1
-  isize = ndvm;
-  size_array = doSizeArray(als, node->align_stmt );
-  ileft = ndvm;
-  iright= BoundSizeArrays(als);
-  if((ia & SAVE_BIT) || saveall || IN_MODULE)
-     sign = 1;
-  else
-     sign = 0;  
-
-  if(ia & DYNAMIC_BIT){
-  /*
-    if( IS_SAVE(als))
-       Error ("Saved object may not have the DYNAMIC attribute: %s", als->identifier(), 111,node->align_stmt);
-    
-    if(IN_COMMON(als))
-       Error ("Object in COMMON  may not have the DYNAMIC attribute: %s", als->identifier(), 112,node->align_stmt);
-  */
-     re_sign = 2;
-  }
-   else if(ia & POSTPONE_BIT) 
-     re_sign = 2;
-   else
-     re_sign = 0;  
-  // aligned array may not be redisributed 
-
-  StoreLowerBoundsPlus(als,NULL);
-  // dvm000(i) = CrtDA (ArrayHeader,Base,Rank,TypeSize,SizeArray,
-  //                StaticSign,ReDistrSign, LeftBSizeArray,RightBSizeArray) 
-  // function CrtDA creates system structures, dosn't allocate array    
-  doAssignStmt(CreateDistArray(als, array_header, size_array,rank,ileft,iright,sign,re_sign));  
- /* ndvm--; // CrtDa result is exit code, test and free  */
-
-  if(!(ia & POSTPONE_BIT)) { 
-  // dvm000(i) = AlgnDA (ArrayHeader,PatternRef,
-  //                               Axis Array,Coeff Array,Const Array)
-  doAssignStmt(AlignArray(array_header,HeaderRef(root->symb),
-                              iaxis, iaxis+nr,iaxis+2*nr));
-  //doAssignTo(header_ref(als,rank+2),HeaderNplus1(als));//calculating HEADER(rank+1)
-  }
-  SET_DVM(isize);  
-  //first_exec = st; //restore first_exec
-  where = savest; //first_exec;   
-}
-
-void RealignArray(SgSymbol *als, SgSymbol *tgs, int iaxis, int nr, SgExpression *align_rule_list, int new_sign, SgStatement *stal) 
-{ int ia,iamv;
-  SgStatement *if_st;
-  SgExpression *header_flag = HeaderRefInd(als,HEADER_SIZE(als));
-
-  ia=als->attributes();
-  if(!(ia & DYNAMIC_BIT) &&  !(ia & POSTPONE_BIT))
-      Error (" '%s' hasn't the DYNAMIC attribute",als->identifier(), 113,stal);
-  if(!(ia & ALIGN_BIT)  && !(ia & INHERIT_BIT))
-      Error (" '%s' does not appear in ALIGN or INHERIT directive ",als->identifier(),120, stal);
-  if(ia & DISTRIBUTE_BIT)
-      Error ("An alignee may not have the DISTRIBUTE attribute: %s",als->identifier(), 57,  stal);
-  if(!HEADER(als)) {   
-      Error("%s isn't distributed array", als->identifier(), 72,stal); 
-      return;
-  } 
-  if(!HEADER(tgs))    
-    return;
-  if(INTERFACE_RTS2)
-  {
-    doCallAfter(DvmhRealign(HeaderRef(als),new_sign,HeaderRef(tgs),nr,align_rule_list));
-    return; 
-  }
-  iamv = ndvm;
-  if(ACC_program || parloop_by_handler)              /*ACC*/
-  { if( !(ia & POSTPONE_BIT) )
-      doCallAfter(Realign_H(HeaderRef(als),new_sign));
-    else {      
-      if_st = doIfThenConstrForRealign(header_flag,cur_st,0); 
-      cur_st = if_st;
-      doCallAfter(Realign_H(HeaderRef(als),new_sign));
-      cur_st = if_st->lexNext()->lexNext(); //ENDIF statement 
-    }
-  }
-  doCallAfter(RealignArr(HeaderRef(als),HeaderRef(tgs),iaxis,iaxis+nr,iaxis+2*nr,new_sign));
-  
-
-  if(ia & POSTPONE_BIT) {
-      if_st = doIfThenConstrForRealign(header_flag,cur_st,1);
-      where = if_st->lexNext();  // reffer to ENDIF statement
-      algn_attr *attr = (algn_attr *) als->attributeValue(0,ALIGN_TREE);
-      align  *root = attr->ref; // reference to the root of align tree    
-      if( !(ia & ALLOCATABLE_BIT) && !(ia & POINTER_BIT) && root->alignees)
-        //  Looking through the Align Tree of array      
-        AlignTreeAlloc(root,stal);
-      doAssignTo(header_flag, new SgValueExp(1));
-      SET_DVM(iamv);
-      cur_st = where;// ENDIF statement
-      where = stal;    //11.12.12
-  }
-}
-
-void ALLOCATEf90_arrays(SgStatement *stmt, distribute_list *distr)
-{SgExpression *alce,*al, *new_list, *apr;
- SgSymbol *ar;
- int dvm_flag = 0;
- where = stmt;
- ReplaceContext(stmt); 
- //LINE_NUMBER_BEFORE(stmt,stmt);  /*26.10.17*/
- if(stmt->hasLabel())              /*26.10.17*/
-   InsertNewStatementBefore(new SgStatement(CONT_STAT),stmt);  // lab  CONTINUE
- SgStatement *prev = stmt->lexPrev();
- new_list = stmt->expr(0); apr = NULL;
- for(al=stmt->expr(0); al; al=al->rhs()) {
-   alce = al->lhs(); //allocation
-   
-   if(isSgRecordRefExp(alce)) 
-   {  struct_component = alce;
-      alce = RightMostField(alce);
-   }  else
-      struct_component = NULL;
-   ar = alce->symbol();
-   //ar = (isSgRecordRefExp(alce)) ? RightMostField(alce)->symbol() : alce->symbol();
-   if(!IS_ALLOCATABLE_POINTER(ar)) {
-      Error("An allocate/deallocate object must have the ALLOCATABLE or POINTER attribute: %s",ar->identifier(),287,stmt);
-      continue;
-   }
-   if(only_debug)
-      return;
-   if(ar->attributes() & DISTRIBUTE_BIT) {
-    //determine corresponding DISTRIBUTE statement
-     SgStatement *dist_st = (DISTRIBUTE_DIRECTIVE(ar)) ? *(DISTRIBUTE_DIRECTIVE(ar)) : NULL;
-     if(ar->attributes() & POINTER_BIT) 
-       AllocatePointerHeader(ar,stmt);
-     if(struct_component)
-       ALLOCATEStructureComponent(ar,struct_component,alce,stmt);  
-    //allocate distributed array
-     if(dist_st)
-       ALLOCATEf90DistArray(ar,alce,dist_st,stmt);
-    //delete from list of ALLOCATE statement 
-     if(apr)
-        apr->setRhs(al->rhs());
-     else
-        new_list = al->rhs();
-     dvm_flag = 1;
-   }
-       
-   else if(ar->attributes() & ALIGN_BIT) {
-     if(ar->attributes() & POINTER_BIT) 
-       AllocatePointerHeader(ar,stmt);
-    //allocate aligned array  
-     if(struct_component)
-       ALLOCATEStructureComponent(ar,struct_component,alce,stmt);  
-     else
-       AllocateAlignArray(ar,alce,stmt);
-    //delete from list of ALLOCATE statement 
-     if(apr)
-        apr->setRhs(al->rhs());
-     else
-        new_list = al->rhs(); 
-     dvm_flag = 1;   
-   }
-   else
-     apr = al;    
- }
-  //replace allocation-list of ALLOCATE statement  by new_list
-  //stmt->setExression(0,new_list);
-  if(new_list)
-    BIF_LL1(stmt->thebif)= new_list->thellnd;
-  else
-    BIF_LL1(stmt->thebif)= NULL;
-
-  if(dvm_flag)
-    LINE_NUMBER_AFTER_WITH_CP(stmt,prev,stmt->controlParent());  /*26.10.17*/
-  return;
-}
-
-void AllocatePointerHeader(SgSymbol *ar,SgStatement *stmt)
-{SgStatement *alst;
- SgExpression *headerRef, *structRef;
- alst = new SgStatement(ALLOCATE_STMT);
- headerRef = new SgArrayRefExp(*ar,*new SgValueExp(HEADER_SIZE(ar)));
- if(ar->variant() == FIELD_NAME)
- {    structRef = &(struct_component->copy());
-	  structRef->setRhs(headerRef);
-	  headerRef = structRef;
- }
- alst->setExpression(0, *new SgExprListExp(*headerRef));
-    //alst->setExpression(0, *new SgExprListExp(*new SgArrayRefExp(*ar,*new SgValueExp(HEADER_SIZE(ar)))));
- InsertNewStatementBefore(alst,stmt); 
-}
-
-void DEALLOCATEf90_arrays(SgStatement *stmt)
-{SgExpression *al, *new_list, *apr;
- SgSymbol *ar;
- SgStatement *prev;
- int dvm_flag = 0;
- 
- ReplaceContext(stmt);  
- //LINE_NUMBER_BEFORE(stmt,stmt);  /*26.10.17*/
- if(stmt->hasLabel())              /*26.10.17*/
-   InsertNewStatementBefore(new SgStatement(CONT_STAT),stmt);  // lab  CONTINUE
- cur_st = prev = stmt->lexPrev();
- new_list = stmt->expr(0); apr = NULL;
- for(al=stmt->expr(0); al; al=al->rhs()) {
-   ar = (isSgRecordRefExp(al->lhs())) ? RightMostField(al->lhs())->symbol() : al->lhs()->symbol();
-   if(!IS_ALLOCATABLE_POINTER(ar)) {
-      Error("An allocate/deallocate object must have the ALLOCATABLE or POINTER attribute: %s",ar->identifier(),287,stmt);
-      continue;
-   }
-   if(ar->variant()==FIELD_NAME && IS_DVM_ARRAY(ar))
-   { SgExpression *structRef, *headerRef;
-       headerRef = new SgArrayRefExp(*ar,*new SgValueExp(1));
-       structRef = &(al->lhs()->copy());
-       structRef->setRhs(headerRef);
-       headerRef = structRef; 
-       InsertNewStatementAfter(DeleteObject_H(headerRef),cur_st,stmt->controlParent()); /*26.10.17*/
-       dvm_flag = 1;
-           //doCallAfter(DeleteObject_H(headerRef));
-           //if(ACC_program)    /*ACC*/
-               //InsertNewStatementAfter(DestroyArray(headerRef),cur_st,stmt->controlParent());
-         
-       apr = al;
-       continue;
-   }
-   if(HEADER(ar)) {
-       InsertNewStatementAfter(DeleteObject_H(HeaderRefInd(ar,1)),cur_st,stmt->controlParent()); /*26.10.17*/  
-       dvm_flag = 1;
-           //if(ACC_program)      /*ACC*/
-               //InsertNewStatementAfter(DestroyArray(HeaderRefInd(ar,1)),cur_st,stmt->controlParent());
-           //FREE_DVM(1);
-           //doCallAfter(DeleteObject_H(HeaderRefInd(ar,1)));
-
-     if(IS_POINTER_F90(ar)){
-      apr = al;
-      continue;
-     }
-     if(apr)
-        apr->setRhs(al->rhs());
-     else
-        new_list = al->rhs();
-
-   } else
-   { apr = al;
-     if(ACC_program)    /*ACC*/
-       InsertNewStatementAfter(DataExit(&al->lhs()->copy(),0),cur_st,stmt->controlParent()); /*26.10.17*/
-          //if(ACC_program)    /*ACC*/
-              // InsertNewStatementAfter(DestroyScalar(&al->lhs()->copy()),cur_st,stmt->controlParent());
-         //doCallAfter(DataExit(&al->lhs()->copy(),0)); /*ACC*/
-   }
- }
-  //replace deallocation-list of DEALLOCATE statement  by new_list
-  if(new_list)
-    BIF_LL1(stmt->thebif)= new_list->thellnd;
-  else
-    BIF_LL1(stmt->thebif)= NULL;
-
-  if(dvm_flag)
-    LINE_NUMBER_AFTER_WITH_CP(stmt,prev,stmt->controlParent());  /*26.10.17*/
-  return; 
-}
-
-
-void AllocateArray(SgStatement *stmt, distribute_list *distr)
-{ SgExpression *desc;
-  SgSymbol *p;
-  if(!stmt->expr(1)->lhs()) {// empty argument list of allocate function call
-      err("Wrong argument list of ALLOCATE function call", 262, stmt);
-      return;
-  }
-  desc = stmt->expr(1)->lhs()->lhs(); //descriptor array reference
-  if(!isSgArrayRefExp(desc) || !desc->symbol() || (desc->symbol()->type()->baseType()->variant() != T_INT) || IS_POINTER(desc->symbol()) || IS_DVM_ARRAY(desc->symbol()))
-  {
-    err("Descriptor array error", 122, stmt);
-    return;
-  }
-  if(desc->lhs())
-     ChangeDistArrayRef(desc);
-
-  where = stmt;
-  p = stmt->expr(0)->symbol(); // pointer in left part
-  /*if (p->attributes() & DIMENSION_BIT)
-     Error("POINTER in left part has DIMENSION attribute: %s",p->identifier(),stmt);*/
-  if(p->attributes() & DISTRIBUTE_BIT) {
-    //determine corresponding DISTRIBUTE statement
-     SgStatement *dist_st;
-     SgExpression *el;
-     distribute_list *dsl;
-     dist_st = NULL;
-     for(dsl=distr; dsl && !dist_st; dsl=dsl->next)
-     for(el=dsl->stdis->expr(0); el; el=el->rhs())
-       if(el->lhs()->symbol() == p) {
-         dist_st = dsl->stdis;
-         break;
-       }
-    //allocate distributed array
-     ReplaceContext(stmt);   
-     AllocateDistArray(p,desc,dist_st,stmt);
-     return;
-  }
-
-  if(p->attributes() & ALIGN_BIT) {
-    //allocate aligned array
-    ReplaceContext(stmt);   
-    AllocateAlignArray(p,desc,stmt);
-    return;
-  }
-
-  Error("POINTER '%s' is not distributed object",p->identifier(), 85,stmt);
-  return;
-}
-
-void   AllocateDistArray(SgSymbol *p, SgExpression *desc, SgStatement *stdis, SgStatement *stmt) {
-
-  int iamv,rank,iaxis,ileft,iright,ifst;
-  SgExpression  *array_header, *size_array, *ps, *arglist, *lbound;  
-  //SgSymbol *sheap;          
-  int ia,sign,re_sign;
-  int idisars;
- 
-  ifst = ndvm;
-   // if(IS_DUMMY(p) || IN_COMMON(p)) { //is dummy argument or  COMMON-block element
-   //    return;
-   //}
-  LINE_NUMBER_BEFORE(stmt,stmt); // for tracing set the global variable of LibDVM to
-                                 // line number of statement(stmt)
-  SgExpression *distr_rule_list = doDisRules(stdis,0,idisars);
-    //idisars = doDisRuleArrays(stdis,0,NULL);
-  if(idisars == -1)
-      Error ("INDIRECT/DERIVED format is not permitted for pointer %s", p->identifier(), 626,stdis);
-  rank = PointerRank(p);
-  if(ndis && rank && rank != ndis)
-      Error ("Rank of pointer %s  is not equal to  the length of the dist_format_list", p->identifier(), 123,stdis);
- 
- // dvm000(i) = CrtAMV(AMRef, rank, SizeArray, StaticSign)
- //CrtAMV creates current Abstract_Machine view 
-  ia = p->attributes();
-  size_array = ReverseDim(desc,rank); 
-  if((ia & SAVE_BIT) || saveall || (ia & COMMON_BIT))
-     sign = 1;
-  else
-     sign = 0;  
-  iamv = ndvm;  /* ifst = iamv+1; */
-  if(!(ia & POSTPONE_BIT)){
-    doAssignStmt(CreateAMView(size_array, rank, sign));
-
-    ps = PSReference(stdis);
-    if(mult_block)
-      doAssignStmt(MultBlock(DVM000(iamv), mult_block, ndis));
-    //dvm000(i) = genbli(PSRef, AMViewRef, AxisWeightArray, AxisCount) 
-    // genbli sets on the weights of elements of processor system 
-    if(gen_block == 1) 
-     doAssignStmt(GenBlock(ps,DVM000(iamv), idisars+2*nblock,nblock));
-    if(gen_block == 2) 
-     doAssignStmt(WeightBlock(ps,DVM000(iamv),idisars+2*nblock, idisars+3*nblock,nblock));
-    //dvm000(i) = DisAM(AMViewRef, PSRef, ParamCount, AxisArray,DistrParamArray) 
-    // DisAM distributes resourses of parent (current) AM between children     
-    doAssignStmt(DistributeAM(DVM000(iamv),ps,nblock,idisars,idisars+nblock));  
-    if(mult_block)
-     doAssignStmt(MultBlock(DVM000(iamv), mult_block, 0));     
-  }
-   
- // dvm000(i) = CrtDA (ArrayHeader,Base,Rank,TypeSize,SizeArray,
- //                StaticSign,ReDistrSign, LeftBSizeArray,RightBSizeArray)
- // function CrtDA creates system structures, doesn't allocate array
-
-      //sheap = heap_ar_decl ? heap_ar_decl->symbol() : p;//heap_ar_decl == NULL is user error
-      //doAssignTo(stmt->expr(0), ARRAY_ELEMENT(sheap,1)); 
-                                                  // P = HEAP(1) or P(I) = HEAP(1)
-      if(!stmt->expr(0)->lhs()) // case P
-        doAssignTo(stmt->expr(0), new SgValueExp(POINTER_INDEX(p))); 
-                                                  // P = <heap-index> or P(I) = <heap-index>
-      else {                   // case P(I,...)
-        doAssignTo(stmt->expr(0), HeapIndex(stmt)); 
-      }  
-      array_header =  PointerHeaderRef(stmt->expr(0),1);
-      //doAssignTo( ARRAY_ELEMENT(sheap, 1), &(* ARRAY_ELEMENT(sheap, 1) + *new SgValueExp(HEADER_SIZE(p))));                            
-                       //HEAP(1) = HEAP(1) + <header_size>
-      //doLogIfForHeap(sheap, heap_size);
-
-      //creating LeftBSizeArray and RightBSizeArray
-      ileft = ndvm;
-      iright = BoundSizeArrays(p);
-      if(ia & DYNAMIC_BIT)
-        re_sign = 3;
-      else
-        re_sign = 0;  
-      arglist= stmt->expr(1)->lhs();
-      lbound=0;
-      if(arglist->rhs() && arglist->rhs()->rhs() && arglist->rhs()->rhs()->rhs() ) {//there are 3-nd and 4-nd argument of ALLOCATE function call
-        SgExpression *heap;
-        lbound =  arglist->rhs()->rhs()->lhs();  //lower bound array reference ??
-        heap   =  arglist->rhs()->lhs();   //heap array reference ??
-        if(heap  && isSgArrayRefExp(heap) && !heap->lhs() && lbound  && isSgArrayRefExp(lbound)) 
-             ;
-        else
-          lbound = 0;
-      }
-      if(!lbound)
-        StoreLowerBoundsPlus(p,stmt->expr(0));
-      else
-        StoreLowerBoundsPlusFromAllocate(p,stmt->expr(0),lbound);
-      doAssignStmt(CreateDistArray(p,array_header,size_array,rank,ileft,iright,sign,re_sign));
-      if(debug_regim && TestType(PointerType(p))) {
-        SgExpression *heap;
-	if(stmt->expr(1)->lhs()->rhs()) {//there is 2-nd argument of ALLOCATE function call
-           heap =  stmt->expr(1)->lhs()->rhs()->lhs(); //heap array reference
-           if(heap  && isSgArrayRefExp(heap) && !heap->lhs())
-             InsertNewStatementBefore(D_RegistrateArray(rank, TestType(PointerType(p)), GetAddresDVM(array_header),size_array,stmt->expr(0) ) ,stmt);
-	}
-      }
-      if(ia & POSTPONE_BIT)
-	{ SET_DVM(ifst); return;}
-      // dvm000(i) = AlgnDA (ArrayHandle,AMViewHandle,
-      //                               Axis Array,Coeff Array),Const Array)
-      //function AlgnDA alignes the array according to aligning template
-      //actually AlgnDA distributes aligned array elements between virtual
-      //processors 
-      iaxis = ndvm;
-      doAlignRule_1(rank);
-      //             doAlignRule_1(axis_array,coeff_array,const_array);
-      doAssignStmt(AlignArray(array_header, DVM000(iamv), iaxis, iaxis+rank,                                                                 iaxis+2*rank));
-       // axis_array, coeff_array and const_array arn't used more
-       SET_DVM(ileft);
-
-       // doAssignTo(header_ref(p,rank+2),HeaderNplus1(p));
-                                                   // calculating HEADER(rank+1) 
-    
-   
-// Looking through the Align Tree of distributed array
-   //algn_attr * attr;
-   //align * root;
-   if(p->numberOfAttributes(ALIGN_TREE)) {//there are any align statements
-   algn_attr * attr;
-   align * root;
-   attr = (algn_attr *) p->attributeValue(0,ALIGN_TREE);
-   root = attr->ref; // reference to root of align tree
-    
-   AlignTreeAlloc(root,stmt);
-   }
-
-   SET_DVM(ifst);
-}
-
-void   ALLOCATEf90DistArray(SgSymbol *p, SgExpression *desc, SgStatement *stdis, SgStatement *stmt) {
-
-  int iamv,rank,iaxis,ileft,iright,ifst;
-  SgExpression  *array_header, *size_array, *ps;            
-  int ia,sign,re_sign;
-  int idisars;
-  SgType *type;
-/*  
- if(p->variant() == FIELD_NAME)
- { SgExpression  *structRef ;
-   structRef = &(struct_component->copy());
-   array_header = new SgArrayRefExp(*p,*new SgValueExp(HEADER_SIZE(p)));
-   structRef->setRhs(array_header); 
-   array_header = structRef;
-   
- } else
- */
-  if(!HEADER(p)) return; 
-  ifst = ndvm;
-
-       //idisars = doDisRuleArrays(stdis,0,NULL);
-  SgExpression *distr_rule_list = doDisRules(stdis,0,idisars);
-  rank = Rank(p);
-  if(ndis && rank && rank != ndis)
-      Error ("Rank of array %s is not equal to  the length of the dist_format_list", p->identifier(), 110,stdis);
-  type = p->type();
-  size_array = doSizeAllocArray(p,desc,stmt,(idisars==-1 ? RTS2 : RTS1)); 
-  array_header =  HeaderRef(p);
-  ia = p->attributes();
-
-  if(idisars == -1) //interface of RTS2
-  {
-    SgExpression *shadow_list = DeclaredShadowWidths(p);
-    doCallStmt(DvmhArrayCreate(p,array_header,rank,ListUnion(size_array,shadow_list)));
-    //doCallStmt(ScopeInsert(array_header));            
-    if(!(ia & POSTPONE_BIT))  //distr_rule_list!=NULL
-      doCallStmt(DvmhDistribute(p,rank,distr_rule_list)); // distribute dvm-array 
-    SET_DVM(ifst);
-    return;   
-  } 
-
- // dvm000(i) = crtamv(AMRef, rank, SizeArray, StaticSign)
- // crtamv function creates current Abstract_Machine view  
-  if((ia & SAVE_BIT) || saveall || (ia & COMMON_BIT) || p->scope()!=cur_func || IS_BY_USE(p))
-    sign = 1;
-  else
-    sign = 0;  
-  iamv = ndvm; 
-  if(!(ia & POSTPONE_BIT)){
-    doAssignStmt(CreateAMView(size_array, rank, sign));
-    ps = PSReference(stdis);
-    if(mult_block)
-      doAssignStmt(MultBlock(DVM000(iamv), mult_block, ndis));  
-    //dvm000(i) = genbli(PSRef, AMViewRef, AxisWeightArray, AxisCount) 
-    // genbli sets on the weights of elements of processor system 
-    if(gen_block == 1) 
-      doAssignStmt(GenBlock(ps,DVM000(iamv), idisars+2*nblock,nblock));
-    if(gen_block == 2) 
-      doAssignStmt(WeightBlock(ps,DVM000(iamv),idisars+2*nblock, idisars+3*nblock,nblock));
-    //dvm000(i) = DisAM(AMViewRef, PSRef, ParamCount, AxisArray,DistrParamArray) 
-    // DisAM distributes resourses of parent (current) AM between children     
-    doAssignStmt(DistributeAM(DVM000(iamv),ps,nblock,idisars,idisars+nblock));
-    if(mult_block)
-      doAssignStmt(MultBlock(DVM000(iamv), mult_block, 0));       
-  }
-   
-  // dvm000(i) = CrtDA (ArrayHeader,Base,Rank,TypeSize,SizeArray,
-  //                StaticSign,ReDistrSign, LeftBSizeArray,RightBSizeArray)
-  // function CrtDA creates system structures, doesn't allocate array
-
-  //creating LeftBSizeArray and RightBSizeArray
-  ileft = ndvm;
-  iright = BoundSizeArrays(p);
-  if(ia & DYNAMIC_BIT)
-      re_sign = 3;
-  else
-      re_sign = 0;
-  
-  StoreLowerBoundsPlusOfAllocatable(p,desc);
-
-  doAssignStmt(CreateDistArray(p,array_header,size_array,rank,ileft,iright,sign,re_sign));
-  if(debug_regim && TestType(type)) 
-      InsertNewStatementBefore(D_RegistrateArray(rank, TestType(type), GetAddresDVM(HeaderRefInd(p,1)),size_array,new SgVarRefExp(p)) ,stmt);
-
-  if(ia & POSTPONE_BIT)
-    { SET_DVM(ifst); return;}
-
-  // dvm000(i) = AlgnDA (ArrayHandle,AMViewHandle,
-  //                               Axis Array,Coeff Array),Const Array)
-  //function AlgnDA alignes the array according to aligning template
-  //actually AlgnDA distributes aligned array elements between virtual processors
- 
-  iaxis = ndvm;
-  doAlignRule_1(rank);
-  doAssignStmt(AlignArray(array_header, DVM000(iamv), iaxis, iaxis+rank, iaxis+2*rank));    
-
-  SET_DVM(ifst);
-}
-
-void   ALLOCATEStructureComponent(SgSymbol *p, SgExpression *struct_e, SgExpression *desc, SgStatement *stmt) {
-
-  int rank,ileft,iright,ifst;
-  SgExpression  *array_header, *size_array;            
-  int ia,sign,re_sign;
-  SgType *type;
-  SgExpression  *structRef, *struct_ , *struct_comp;
- // p->variant() == FIELD_NAME
-  
-  structRef = &(struct_e->copy());
-  array_header = new SgArrayRefExp(*p, *new SgValueExp(1)); //*new SgValueExp(HEADER_SIZE(p)));
-  structRef->setRhs(array_header); 
-  array_header = structRef;
-  ifst = ndvm;
-  rank = Rank(p);
-  type = p->type();
-  size_array = doSizeAllocArray(p,desc,stmt,(INTERFACE_RTS2 ? RTS2:RTS1)); 
-  if( INTERFACE_RTS2 ) // interface of RTS2
-  {
-      doCallStmt(DvmhArrayCreate(p,array_header,rank,ListUnion(size_array,DeclaredShadowWidths(p)))); 
-      //doCallStmt(ScopeInsert(array_header));           
-      return;    
-  }
-                       //interface of RTS1
-  SgSymbol *s_struct = LeftMostField(struct_e)->symbol();
-  ia = s_struct->attributes();
-  if((ia & SAVE_BIT) || saveall || (ia & COMMON_BIT) || s_struct->scope()!=cur_func || IS_BY_USE(s_struct))
-     sign = 1;
-  else
-     sign = 0;  
-   
-  // dvm000(i) = CrtDA (ArrayHeader,Base,Rank,TypeSize,SizeArray,
-  //                StaticSign,ReDistrSign, LeftBSizeArray,RightBSizeArray)
-  // function CrtDA creates system structures, doesn't allocate array
-
-  //creating LeftBSizeArray and RightBSizeArray
-  ileft = ndvm;
-  iright = BoundSizeArrays(p);
-  if(p->attributes() & DYNAMIC_BIT)
-      re_sign = 3;
-  else
-      re_sign = 0;
-  
-  struct_ = &(struct_e->copy());
-  struct_ ->setRhs(NULL);    
-  StoreLowerBoundsPlusOfAllocatableComponent(p,desc,struct_);
-
-  doAssignStmt(CreateDistArray(p,array_header,size_array,rank,ileft,iright,sign,re_sign));
-  struct_comp = &(struct_->copy());
-  struct_comp->setRhs(new SgArrayRefExp(*p));
-  if(debug_regim && TestType(type)) 
-      InsertNewStatementBefore(D_RegistrateArray(rank, TestType(type), GetAddresDVM(header_ref_in_structure(p,1,struct_)),size_array,struct_comp) ,stmt);
-
-  SET_DVM(ifst);
-  return;
-}
-
-
-void AlignTreeAlloc( align *root,SgStatement *stmt) {
-    align *node; 
-    int nr,iaxis=-1,ia,*ix;
-    SgStatement *stalgn;
-    SgExpression *align_rule_list=NULL;
-    stalgn = NULL;
- 
-    for(node=root->alignees; node; node=node->next) {
-       if(IS_POINTER(node->symb)) //node is pointer must not be allocated
-         continue;
-       ix = ALIGN_RULE_INDEX(node->symb);
-       if(ix)
-         {iaxis = *ix; nr = *(++ix);}
-       else {
-         if (stalgn != node->align_stmt) {
-           stalgn = node->align_stmt;
-           iaxis = ndvm; ia = 0;
-         }
-         else
-           ia = iaxis;
-         align_rule_list = doAlignRules(node->symb,node->align_stmt,ia,nr);// creating axis_array,
-       }                                          // coeff_array and  const_array
-    
-       AlignAllocArray(node,root, nr, iaxis, NULL, stmt);
-       AlignTreeAlloc(node,stmt);
-    } 
-}
-align *CopyAlignTreeNode(SgSymbol *ar)
-{
-     algn_attr * attr;
-     align  *node, *node_copy;
-     SgStatement *algn_st;
-   
-     attr = (algn_attr *)  ORIGINAL_SYMBOL(ar)->attributeValue(0,ALIGN_TREE);
-     node = attr->ref; // reference to root of align tree
-     node_copy = new align;
-     node_copy->symb = ar;
-     node_copy->align_stmt = node->align_stmt; 
-     //algn_st = node->align_stmt;
-     return(node_copy);
-}
-
-void   AllocateAlignArray(SgSymbol *p, SgExpression *desc, SgStatement *stmt) {
- int nr=0,iaxis=0,*ix=NULL,ifst=0;
- SgStatement *algn_st;
- SgSymbol *base, *pb;
- SgExpression *align_rule_list;
- align *node,*root=NULL, *node_copy;
- ifst = ndvm; 
- pb = ORIGINAL_SYMBOL(p);
- if(!pb->attributeValue(0,ALIGN_TREE))
-    return;
- node = ((algn_attr *) pb->attributeValue(0,ALIGN_TREE))->ref;
- algn_st = node->align_stmt;
- node_copy = IS_BY_USE(p) ? CopyAlignTreeNode(p) : node;
- if(algn_st->expr(2)){
-   base = (algn_st->expr(2)->variant()==ARRAY_OP) ? (algn_st->expr(2))->rhs()->symbol() : (algn_st->expr(2))->symbol();// align_base symbol
-   root = ((algn_attr *) base->attributeValue(0,ALIGN_TREE))->ref;
- }
- if(IS_ALLOCATABLE_POINTER(p)){
-   AlignAllocArray(node_copy,root,0,0,desc,stmt);
-   return;
- } 
-/* 
- if(!algn_st->expr(2)){ //postponed aligning
-   root = NULL;
-   if(IS_ALLOCATABLE_POINTER(p)){
-     AlignAllocArray(node,root,0,0,desc,stmt);
-     return;
-   } 
- }
- else {
- base = (algn_st->expr(2)->variant()==ARRAY_OP) ? (algn_st->expr(2))->rhs()->symbol() : (algn_st->expr(2))->symbol();// align_base symbol
- root = ((algn_attr *) base->attributeValue(0,ALIGN_TREE))->ref;
-  
- if(IS_ALLOCATABLE_POINTER(p)){
-   AlignAllocArray(node,root,0,0,desc,stmt);
-   return;
- } 
-*/
- if(root) {
-   LINE_NUMBER_BEFORE(stmt,stmt); // for tracing set the global variable of LibDVM to
-                                // line number of statement(stmt)
-   ix = ALIGN_RULE_INDEX(p);
-   if(ix)
-      {iaxis = *ix; nr = *(++ix);}
-   else {
-     iaxis = ndvm;
-     align_rule_list = doAlignRules(p,algn_st,0,nr);
-   }
- }
- //sheap = heap_ar_decl ? heap_ar_decl->symbol() : p;//heap_ar_decl == NULL is user error
- //doAssignTo(stmt->expr(0), ARRAY_ELEMENT(sheap,1)); 
-                                    // P = HEAP(1) or P(I) = HEAP(1)
- if(!stmt->expr(0)->lhs())     // case P
-        doAssignTo(stmt->expr(0), new SgValueExp(POINTER_INDEX(p))); 
-                                                  // P = <heap-index> or P(I) = <heap-index>
-      else {                   // case P(I,...)
-        doAssignTo(stmt->expr(0), HeapIndex(stmt)); 
-      }  
- //doAssignTo( ARRAY_ELEMENT(sheap, 1), &(* ARRAY_ELEMENT(sheap, 1) + *new SgValueExp(HEADER_SIZE(p))));                       
-              //HEAP(1) = HEAP(1) + <header_size>
- //doLogIfForHeap(sheap, heap_size);  //IF(HEAP(1) > heap_size) STOP 'HEAP limit is exceeded'
-
- AlignAllocArray(node,root,nr,iaxis,desc,stmt);
- AlignTreeAlloc(node,stmt);
- SET_DVM(ifst);
-}
-
-void    AlignAllocArray(align *node, align *root, int nr, int iaxis,SgExpression *desc, SgStatement *stmt) {
-
-// 1) creates Distributed Array for "node"
-// 2) alignes Distributed Array with Distributed Array for "root" or with
-//    Template 
-  
-  int rank,ileft,iright,isize;
-  int sign,re_sign,ia;
-  SgSymbol *als;
-  SgExpression *array_header,*size_array,*pref, *arglist, *lbound;
-  SgExpression *align_rule_list;
-  SgType *type;
- 
-  als = node->symb;
-  ia = als->attributes();
- 
-  if(!HEADER(ORIGINAL_SYMBOL(als))){
-    Error("Array '%s' may not be allocated", als->identifier(),124,node->align_stmt);
-    return;
-  }
-  if(IS_TEMPLATE(als) || IS_DUMMY(als) || (IN_COMMON(als) && !IS_POINTER(als) && !IS_ALLOCATABLE_POINTER(als)))
-    return;    
-
-  if(IS_SAVE(als)) {  // has SAVE attribute    
-    if(root && !IS_TEMPLATE(root->symb) && !IN_COMMON(root->symb) && !HAS_SAVE_ATTR(root->symb) && CURRENT_SCOPE(root->symb) ) {
-      Error("Aligned array '%s' has SAVE attribute but align-target has not", als->identifier(),119,node->align_stmt);
-      return;
-    }
-    SgStatement *ifst;   
-    ifst = doIfThenConstr(als);
-    where = ifst->lexNext();  // reffer to ENDIF statement   
-  }      
-  LINE_NUMBER_BEFORE(stmt,where); 
-  rank = Rank(als);
-
-  if(INTERFACE_RTS2) { //interface of RTS2
-    size_array = NULL;
-    array_header = HeaderRef(als);
-    if(IS_ALLOCATABLE_POINTER(als))  
-      size_array = doSizeAllocArray(als, desc, stmt, RTS2);
-    else if(!IS_POINTER(als))
-      size_array = doDvmShapeList(als,node->align_stmt);  
-    doCallStmt(DvmhArrayCreate(als,array_header,rank,ListUnion(size_array,DeclaredShadowWidths(als))));
-    //doCallStmt(ScopeInsert(array_header));
-    align_rule_list = root ? doAlignRules(node->symb,node->align_stmt,0,nr) : NULL;
-    if( root && align_rule_list)     //!(ia & POSTPONE_BIT) 
-      doCallStmt(DvmhAlign(als,root->symb,nr,align_rule_list));
-    if(IS_SAVE(als))
-      where = where->lexNext();
-    return;
-  }
-                      //interface of RTS1
-  isize = ndvm;
-  if(IS_POINTER(als)){
-    size_array = ReverseDim(desc,rank);
-    pref = where->expr(0);
-    array_header =  PointerHeaderRef(pref,1);
-    type = PointerType(als);
-  } else if(IS_ALLOCATABLE_POINTER(als)) {
-    size_array = doSizeAllocArray(als, desc, stmt, RTS1);
-    pref = NULL;
-    array_header = HeaderRef(als);    
-    type = als->type();
-  } else {
-    size_array = doSizeArray(als, node->align_stmt );
-    pref = NULL;
-    array_header = HeaderRef(als);
-    type = als->type();
-  }
- 
-  ileft = ndvm;
-  iright= BoundSizeArrays(als);
-  if((ia & SAVE_BIT) || saveall || (ia & COMMON_BIT) || als->scope()!=cur_func || IS_BY_USE(als))
-     sign = 1;
-  else
-     sign = 0;  
-
-  if(ia & DYNAMIC_BIT)
-     re_sign = 2;
-   else
-     re_sign = 0;  
-  //re_sign = 0; aligned array may not be redisributed 
-  if(IS_ALLOCATABLE_POINTER(als)) {
-      StoreLowerBoundsPlusOfAllocatable(als,desc);
-      iaxis = ndvm;
-      if(root)  //!(ia & POSTPONE_BIT)       
-        align_rule_list = doAlignRules(node->symb,node->align_stmt,0,nr); //nr = doAlignRule(als,node->align_stmt,0);
-  }
-  else {
-      arglist= stmt->expr(1)->lhs();
-      lbound=0;
-      if(arglist->rhs() && arglist->rhs()->rhs() && arglist->rhs()->rhs()->rhs() ) {//there are 3-nd and 4-nd argument of ALLOCATE function call
-        SgExpression *heap;
-        lbound =  arglist->rhs()->rhs()->lhs();  //lower bound array reference ??
-        heap   =  arglist->rhs()->lhs();   //heap array reference ??
-        if(heap  && isSgArrayRefExp(heap) && !heap->lhs() && lbound  && isSgArrayRefExp(lbound)) 
-             ;
-        else
-          lbound = 0;
-      }
-      if(!lbound)
-        StoreLowerBoundsPlus(als,pref);
-      else
-        StoreLowerBoundsPlusFromAllocate(als,pref,lbound);
-}
-
-  // dvm000(i) = CrtDA (ArrayHeader,Base,Rank,TypeSize,SizeArray,
-  //                StaticSign,ReDistrSign, LeftBSizeArray,RightBSizeArray) 
-  // function CrtDA creates system structures, dosn't allocate array    
-  doAssignStmt(CreateDistArray(als, array_header, size_array,rank,ileft,iright,sign,re_sign)); 
-  if( debug_regim  && TestType(type)) {
-     if(IS_POINTER(als) ){ 
-        SgExpression *heap;
-	if(stmt->expr(1)->lhs()->rhs()) {//there is 2-nd argument of ALLOCATE function call
-           heap =  stmt->expr(1)->lhs()->rhs()->lhs(); //heap array reference
-           if(heap  && isSgArrayRefExp(heap) && !heap->lhs())
-             InsertNewStatementBefore(D_RegistrateArray(rank, TestType(PointerType(als)), GetAddresDVM(array_header),size_array,stmt->expr(0) ) ,stmt);
-        }
-     } else if(IS_ALLOCATABLE_POINTER(als))
-             InsertNewStatementBefore(D_RegistrateArray(rank, TestType(type), GetAddresDVM(HeaderRefInd(als,1)),size_array,new SgVarRefExp(als)),stmt);
-       else
-             InsertNewStatementBefore(D_RegistrateArray(rank, TestType(type), GetAddresDVM(HeaderRefInd(als,1)),size_array,new SgVarRefExp(als)),where);
-  }
-  if(root) // non postponed aligning ((ia & POSTPONE_BIT)==0)
-
-    // dvm000(i) = AlgnDA (ArrayHeader,PatternRef,
-    //                               Axis Array,Coeff Array,Const Array)
-    doAssignStmt(AlignArray(array_header,HeaderRef(root->symb),
-                              iaxis, iaxis+nr,iaxis+2*nr));
-
-    //doAssignTo(header_ref(als,rank+2),HeaderNplus1(als));//calculating HEADER(rank+1)
-  SET_DVM(isize);
-  if(IS_SAVE(als))
-    where = where->lexNext();  
-}
-
-void    PostponedAlignArray(align *node, align *root, int nr, int iaxis) {
-
-// 1) creates Distributed Array for "node"
-// 2) alignes Distributed Array with Distributed Array for "root" 
-  
-  int rank,ileft,iright,isize;
-  int sign,re_sign,ia;
-  SgSymbol *als;
-  SgExpression *array_header,*size_array;
- 
-  als = node->symb;
-  ia = als->attributes();
- 
-  if(!HEADER(als)){
-    Error("Array '%s' may not be aligned", als->identifier(),125,node->align_stmt);
-    return;
-  }
-  if(IS_TEMPLATE(als) || IS_DUMMY(als) || IN_COMMON(als))
-    return;    
-
-  if(IS_SAVE(als)) {  // has SAVE attribute
-    if(root && !IS_TEMPLATE(root->symb) && !IN_COMMON(root->symb) && !HAS_SAVE_ATTR(root->symb) && CURRENT_SCOPE(root->symb) ) {
-      Error("Aligned array '%s' has SAVE attribute but align-target has not", als->identifier(),119,node->align_stmt);
-      return;
-    }
-    SgStatement *ifst;   
-    ifst = doIfThenConstr(als);
-    where = ifst->lexNext();  // reffer to ENDIF statement   
-  }      
-  LINE_NUMBER_BEFORE(node->align_stmt,where); 
-                                        // for tracing set the global variable of LibDVM to
-                                        // line number of ALIGN directive 
-  array_header = HeaderRef(als);
-  isize = ndvm;
-  size_array = doSizeArray(als, node->align_stmt );
-  rank = Rank(als);
-  ileft = ndvm;
-  iright= BoundSizeArrays(als);
-  if((ia & SAVE_BIT) || saveall)
-     sign = 1;
-  else
-     sign = 0;  
-
-  if(ia & DYNAMIC_BIT)
-     re_sign = 2;
-   else
-     re_sign = 0;  
-
-  StoreLowerBoundsPlus(als,NULL);
-
-  // dvm000(i) = CrtDA (ArrayHeader,Base,Rank,TypeSize,SizeArray,
-  //                StaticSign,ReDistrSign, LeftBSizeArray,RightBSizeArray) 
-  // function CrtDA creates system structures, dosn't allocate array    
-  doAssignStmt(CreateDistArray(als, array_header, size_array,rank,ileft,iright,sign,re_sign)); 
-
-  // dvm000(i) = AlgnDA (ArrayHeader,PatternRef,
-  //                               Axis Array,Coeff Array,Const Array)
-  doAssignStmt(AlignArray(array_header,HeaderRef(root->symb),
-                              iaxis, iaxis+nr,iaxis+2*nr));
-  SET_DVM(isize);
-  if(IS_SAVE(als))
-    where = where->lexNext();  
-}
-
-void Template_Create(SgStatement *stmt)
-{
-   SgExpression *el;
-   int isave = ndvm;
-   for(el = stmt->expr(0); el; el=el->rhs())
-   {
-      if(isSgArrayRefExp(el->lhs()))
-      {  
-         SgSymbol *s = el->lhs()->symbol();
-         int rank = Rank(s);
-         if(!HEADER(s))
-         {
-            Error("'%s' has not DISTRIBUTE attribute ", s->identifier(), 637,stmt); 
-            continue;
-         } 
-         if(!(s->attributes() & POSTPONE_BIT))
-         {
-            Error("Template '%s' has no postponed distribution", s->identifier(), 638,stmt); 
-            continue;
-         } 
-         if(!DEFERRED_SHAPE_TEMPLATE(s))
-         {
-            Error("Template '%s' has no deferred shape", s->identifier(), 640,stmt); 
-            continue;
-         }         
-         where = stmt;
-         SgExpression *size_array = doSizeAllocArray(s, el->lhs(), stmt, (INTERFACE_RTS2 ? RTS2 : RTS1));
-         cur_st = stmt;
-         if(INTERFACE_RTS2)
-         {
-            doCallAfter(DvmhTemplateCreate(s,HeaderRef(s),rank,size_array));
-            //doCallAfter(ScopeInsert(HeaderRef(s)));
-         }
-         else
-         {
-            doAssignTo_After(DVM000(INDEX(s)),CreateAMView(size_array, rank, 1));
-            where = cur_st; 
-            StoreLowerBoundsPlusOfAllocatable(s,el->lhs());
-         }
-      }
-      else
-      {
-         err("Illegal element of list",636,stmt);
-         continue;
-      }
-   }
-   SET_DVM(isave);
-}
-
-void Template_Delete(SgStatement *stmt)
-{
-   SgExpression *el;
-   for(el = stmt->expr(0); el; el=el->rhs())
-   {
-      if(isSgArrayRefExp(el->lhs()))
-      {  
-         SgSymbol *s = el->lhs()->symbol();
-         if(!HEADER(s))
-         {
-            Error("'%s' has not DISTRIBUTE attribute ", s->identifier(), 637,stmt); 
-            continue;
-         } 
-         if(!DEFERRED_SHAPE_TEMPLATE(s))
-         {
-            Error("Template '%s' has no deferred shape", s->identifier(), 640,stmt); 
-            continue;
-         }  
- 
-         doCallAfter(DeleteObject_H(HeaderRef(s)));
-      }
-      else
-      {
-         err("Illegal element of list",636,stmt);
-         continue;
-      }
-   }
-}   
-
-SgExpression * dvm_array_ref () {
-// creates array reference: dvm000(i) , i - index of first free element
-   SgValueExp * index = new SgValueExp(ndvm);
-   return( new SgArrayRefExp(*dvmbuf, *index));
-}
-
-SgExpression * dvm_ref (int n) {
-// creates array reference: dvm000(n) 
-   SgValueExp * index = new SgValueExp(n);
-   return( new SgArrayRefExp(*dvmbuf, *index));
-}
-
-
-void Align_Tree(align *root) {
-  align *p;
-  if (!root) 
-     return;
-
-// looking through alignees of the root
-  for(p=root->alignees; p; p=p->next)
-  {
-   //printf(" %s is aligned with %s (statement at line %d)\n", p->symb->identifier(), root->symb->identifier(), p->align_stmt->lineNumber());
-     Align_Tree(p);
-   }
-  return;
-}
-
-stmt_list  *addToStmtList(stmt_list *pstmt, SgStatement *stat)
-{
-// adding the statement to the beginning of statement list 
-// pstmt-> stat -> stmt-> ... -> stmt     
-    stmt_list * stl; 
-    if (!pstmt) {
-              pstmt = new stmt_list;
-              pstmt->st = stat;
-              pstmt->next =  NULL;
-           } else {
-              stl = new stmt_list;
-              stl->st = stat;
-              stl->next = pstmt;
-              pstmt = stl;
-           }
-   return (pstmt);
-}
-
-stmt_list  *delFromStmtList(stmt_list *pstmt)
-{
-// deletinging last statement from the statement list 
-// pstmt-> stat -> stmt-> ... -> stmt
-    pstmt = pstmt->next;     
-    return (pstmt);
-}
-
-void RenamingDvmArraysByUse(SgStatement *stmt)
-{
-   SgSymbol *ar;
-  SgExpression *e = stmt->expr(0), *el;
-  
-  if(e && e->variant()==ONLY_NODE)
-    e = e->lhs();
-  for(el=e; el; el=el->rhs())
-  {
-    ar = el->lhs()->lhs()->symbol(); 
-    if(!IS_DVM_ARRAY(ar)) continue;
-    // if(el->lhs()->rhs())
-    if(strcmp(ar->identifier(),ORIGINAL_SYMBOL(ar)->identifier())) //case of renaming in a use statement
-    {  //printf("%s  %s  SCOPE: %s\n", ar->identifier(),ORIGINAL_SYMBOL(ar)->identifier(),ar->scope()->symbol()->identifier());
-      //adding the distributed array symbol 'ar' to symb_list 'dsym'
-      if(!(ar->attributes() & DVM_POINTER_BIT))
-        AddDistSymbList(ar);
-      // creating variables used for optimisation array references in parallel loop
-      coeffs *scoef  = new coeffs;
-      CreateCoeffs(scoef,ar);
-      // adding the attribute (ARRAY_COEF) to distributed array symbol
-      ar->addAttribute(ARRAY_COEF, (void*) scoef, sizeof(coeffs));
-    }
-  }
-}
-
-void ArrayHeader (SgSymbol *ar,int ind)
-{
-// creating  header of distributed array: HEADER(0:N+1),
-// N - rank of array
-  // Rank+1 elements for DVM system
-  // and 1 element for F_DVM
-
-  int *index = new int;
-  int * count = new int;
-  coeffs *scoef  = new coeffs;
-  SgSymbol **base = new (SgSymbol *);
-  SgType *btype;
-  
-  if(IS_BY_USE(ar)) 
-     return;
-  
-  if(HEADER(ar)) {
-     Err_g("Illegal aligning of '%s'", ar->identifier(),126);
-     return;
-  }
-  btype = Base_Type(ar->type());
-
- /*  
-  if(btype->variant() == T_STRING)
-     Err_g("Illegal type of '%s'", ar->identifier(),141);
- */ /* podd 13.01.12 */
-
-  if( ar->attributes() & DATA_BIT )
-    Err_g("Distributed object may not be initialized (in DATA statement): %s", ar->identifier(), 265);
-  if(!(ar->attributes() & DIMENSION_BIT) && !(ar->attributes() &  DVM_POINTER_BIT))
-      Err_g("Distributed object '%s' is not array", ar->identifier(),127); 
-  if(ar->attributes() & DVM_POINTER_BIT)
-    //TypeMemory(PointerType(ar)); // marking  type memory use 
-    TypeMemory(SgTypeInt()); // marking  type memory use  
-  else if(!(ar->attributes() & TEMPLATE_BIT) )  //ind == 1 
-  {  
-     TypeMemory(btype); // marking  type memory use
-     if(TypeIndex(btype) == -1 &&  btype->variant()!=T_DERIVED_TYPE)
-                  //if(TypeSize(btype) != TypeSize(baseMemory(btype)->type()->baseType()))
-        Err_g("Illegal type of '%s'", ar->identifier(),141);
-  } 
-//adding the distributed array symbol 'ar' to symb_list 'dsym'
- if(!(ar->attributes() & DVM_POINTER_BIT))
-   AddDistSymbList(ar);
-
-
- *index = ind;
-// adding the attribute (ARRAY_HEADER) to distributed array symbol
-  ar->addAttribute(ARRAY_HEADER, (void*) index, sizeof(int));
- *count = 0;
-// adding the attribute (BUFFER_COUNT) to distributed array symbol
-// counter of remote group buffers
-  ar->addAttribute(BUFFER_COUNT, (void*) count, sizeof(int));
-// creating variables used for optimisation array references in parallel loop
-  CreateCoeffs(scoef,ar);
-// adding the attribute (ARRAY_COEF) to distributed array symbol
-  ar->addAttribute(ARRAY_COEF, (void*) scoef, sizeof(coeffs));
-//creating base variable 
-  if(opt_base) {
- *base= BaseSymbol(ar);
-// adding the attribute (ARRAY_BASE) to distributed array symbol
-  ar->addAttribute(ARRAY_BASE, (void*) base, sizeof(SgSymbol *));
-  }
-}
-
-int Rank (SgSymbol *s)
-{
-  SgArrayType *artype;
-  if(IS_POINTER(s))
-    return(PointerRank(s));
-  artype=isSgArrayType(s->type());
-  if(artype)
-    return (artype->dimension());
-  else
-    return (0);
-}
-
-SgExpression *doSizeArrayQuery(SgExpression *headref,int rank) 
-{int ind,i;
-  ind = ndvm;
-  for(i=1; i<=rank ; i++) 
-    doAssignStmt(GetSize(headref,i));
-  return(DVM000(ind));
-}
-
-SgExpression *doDvmShapeList(SgSymbol *ar, SgStatement *st)   /* RTS2 */
-{
-  SgExpression *l_bound, *u_bound, *pe, *result=NULL;
-  SgSubscriptExp *sbe;
-  SgValueExp c1(1);
-  SgArrayType *artype;
-  int i;
-  artype = isSgArrayType(ar->type());
-  if((! artype) || (!(ar->attributes() & DIMENSION_BIT)))  {//isn't array
-    ndim = 0;
-    return (NULL); 
-  }
-  ndim = artype->dimension();
-  for(i=0; i<ndim ; i++) {   
-    pe = artype->sizeInDim(i);
-    if ((sbe=isSgSubscriptExp(pe)) != NULL) {
-
-      if(!sbe->ubound()) {
-         Error("Illegal array shape: %s",ar->identifier(), 162,st);
-         u_bound = &(c1.copy());
-      }    
-      else if(sbe->ubound()->variant() == STAR_RANGE) {// ubound = *
-	 Error("Assumed-size array: %s",ar->identifier(), 162,st);
-         u_bound = &(c1.copy());
-      } 
-      else 
-         u_bound =  &((sbe->ubound())->copy());
-      if(sbe->lbound())
-         l_bound = &((sbe->lbound())->copy());     
-      else  if(sbe->ubound())
-         l_bound = &(c1.copy());  
-      else {
-         Error("Illegal array shape: %s",ar->identifier(), 162,st);
-         l_bound = &(c1.copy());  
-      }
-    }
-    else {
-         if(pe->variant() == STAR_RANGE) // dim=ubound = *
-	    Error("Assumed-size array: %s",ar->identifier(),162,st); 
-         u_bound = &(pe->copy());
-         l_bound = &(c1.copy());    
-    }
-    //reversing dimensions for LibDVM
-    result = AddElementToList(result, DvmType_Ref(Calculate(u_bound)));
-    result = AddElementToList(result, DvmType_Ref(Calculate(l_bound)));
-  }
-  return(result);
-}
-
-SgExpression *doShapeList(SgSymbol *ar, SgStatement *st)   /* RTS2 */
-{
-  SgExpression *l_bound, *u_bound, *pe, *result=NULL;
-  SgSubscriptExp *sbe;
-  SgValueExp c1(1);
-  SgArrayType *artype;
-  int i;
-  artype = isSgArrayType(ar->type());
-  if((! artype) || (!(ar->attributes() & DIMENSION_BIT)))  {//isn't array
-    ndim = 0;
-    return (NULL); 
-  }
-  ndim = artype->dimension();
-  for(i=0; i<ndim ; i++) {   
-
-    pe = artype->sizeInDim(i);
-    if(IS_BY_USE(ar)) {
-         u_bound = UBOUNDFunction(ar,i+1);
-         l_bound = LBOUNDFunction(ar,i+1);  
-    }
-    else if ((sbe=isSgSubscriptExp(pe)) != NULL) {
-      if(sbe->ubound() && (sbe->ubound()->variant() == INT_VAL || sbe->ubound()->variant() == CONST_REF) && (!sbe->lbound() || sbe->lbound() && (sbe->lbound()->variant() == INT_VAL || sbe->lbound()->variant() == CONST_REF))) {
-         u_bound =  &((sbe->ubound())->copy());
-         if(sbe->lbound())
-           l_bound = &((sbe->lbound())->copy());     
-         else  
-           l_bound = &(c1.copy());     
-      }
-      else {
-         if(sbe->ubound() && sbe->ubound()->variant() == STAR_RANGE) {
-           if(st->variant()==DVM_PARALLEL_ON_DIR )
-             Error("Assumed-size array in parallel loop: %s",ar->identifier(), 162,st);
-           else if( st->variant()==ACC_REGION_DIR)
-             Error("Assumed-size array in region: %s",ar->identifier(), 162,st);
-           else
-             Error("Assumed-size array: %s",ar->identifier(), 162,st);
-         }
-         u_bound = UBOUNDFunction(ar,i+1);
-         l_bound = LBOUNDFunction(ar,i+1);  
-      }
-    }
-    else
-    {
-       if(pe->variant() == INT_VAL || pe->variant() == CONST_REF) {
-         u_bound = &(pe->copy());
-         l_bound = &(c1.copy());    
-       }
-       else {
-         if(pe->variant() == STAR_RANGE) {
-           if(st->variant()==DVM_PARALLEL_ON_DIR )
-             Error("Assumed-size array in parallel loop: %s",ar->identifier(), 162,st);
-           else if( st->variant()==ACC_REGION_DIR)
-             Error("Assumed-size array in region: %s",ar->identifier(), 162,st);
-           else
-             Error("Assumed-size array: %s",ar->identifier(), 162,st);
-         }
-         u_bound = UBOUNDFunction(ar,i+1);
-         l_bound = LBOUNDFunction(ar,i+1);  
-       }  
-    }
-    //reversing dimensions for LibDVM
-    result = AddElementToList(result, DvmType_Ref(u_bound));
-    result = AddElementToList(result, DvmType_Ref(l_bound));
-
-  }  
-  return(result);
-}
-
-
-SgExpression * doSizeFunctionArray(SgSymbol *ar, SgStatement *st)
-{
-  SgExpression *esize, *pe, *result;
-  SgSubscriptExp *sbe;
-  SgValueExp c1(1);
-  SgArrayType *artype;
-  int i,n;
-
-//allocating SizeArray and setting on it
-  result = dvm_array_ref();     // SizeArray reference
-  artype = isSgArrayType(ar->type());
-  if((! artype) || (!(ar->attributes() & DIMENSION_BIT)))  {//isn't array
-    ndim = 0;
-    return (result);
-  }
-  ndim =  n = artype->dimension();
-  for(i=n-1; i>=0 ; i--) {   //reversing dimensions for LibDVM
-    pe = artype->sizeInDim(i);
-    if ((sbe=isSgSubscriptExp(pe)) != NULL) {
-      if(!sbe->ubound())           
-        esize = SizeFunction(ar,i+1);
-      else if(sbe->ubound()->variant() == STAR_RANGE) {// ubound = *
-	Error("Assumed-size array: %s",ar->identifier(), 162,st);
-        esize = SizeFunction(ar,i+1);
-      }
-      else 
-        if(sbe->lbound())
-          esize = &(((sbe->ubound())->copy()) - ((sbe->lbound())->copy()) + c1);
-        else
-          esize = &((sbe->ubound())->copy());      
-    }
-    else 
-    {
-      if(pe->variant() == STAR_RANGE) // dim=ubound = *
-	Error("Assumed-size array: %s",ar->identifier(),162,st); 
-      esize = &(pe->copy());
-    }
-
-// dvm000(N+j) = size_in_dimension_(n-j)
-    esize = Calculate( esize);
-    if(esize->variant()!=INT_VAL)
-      esize = SizeFunction(ar,i+1);
-    doAssignStmt(esize);
-   }
-   return (result);
-}
-
-
-SgExpression * doSizeArray(SgSymbol *ar, SgStatement *st)
-{
-  SgExpression *esize, *pe, *result;
-  SgSubscriptExp *sbe;
-  SgValueExp c1(1);
-  SgArrayType *artype;
-  int i,n;
-
-//allocating SizeArray and setting on it
-  result = dvm_array_ref();     // SizeArray reference
-  artype = isSgArrayType(ar->type());
-  if((! artype) || (!(ar->attributes() & DIMENSION_BIT)))  {//isn't array
-    ndim = 0;
-    //Error (" Distributed object %s isn't declared as array\n", ar->identifier(),st);
-    return (result);
-  }
-  ndim =  n = artype->dimension();
-  for(i=n-1; i>=0 ; i--) {   //reversing dimensions for LibDVM
-    pe = artype->sizeInDim(i);
-    if ((sbe=isSgSubscriptExp(pe)) != NULL) {
-
-      if(!sbe->ubound()) {
-          Error("Illegal array shape: %s",ar->identifier(), 162,st);
-          esize = &(c1.copy()); //SizeFunction(ar,i+1);
-      }
-      else if(sbe->ubound()->variant() == STAR_RANGE) {// ubound = *
-	  Error("Assumed-size array: %s",ar->identifier(), 162,st);
-          esize = &(sbe->ubound()->copy());
-      } 
-      else 
-          if(sbe->lbound())
-             esize = &(((sbe->ubound())->copy()) - ((sbe->lbound())->copy()) + c1);
-          else
-             esize = &((sbe->ubound())->copy());      
-    }
-    else {
-       if(pe->variant() == STAR_RANGE) // dim=ubound = *
-	  Error("Assumed-size array: %s",ar->identifier(),162,st); 
-       esize = &(pe->copy());
-    }
-
-// dvm000(N+j) = size_in_dimension_(n-j)
-    doAssignStmt(Calculate( esize));
-   }
-   return (result);
-}
-
-SgExpression * doSizeArrayD(SgSymbol *ar, SgStatement *st)
-{
-  SgExpression *esize, *pe, *result;
-  SgSubscriptExp *sbe;
-  SgValueExp c1(1);
-  SgArrayType *artype;
-  int i,n;
-  if(st)
-    ;
-//allocating SizeArray and setting on it
-  result = dvm_array_ref();     // SizeArray reference
-  artype = isSgArrayType(ar->type());
-  if((! artype) || (!(ar->attributes() & DIMENSION_BIT)))  {//isn't array
-    ndim = 0;
-    //Error (" Distributed object %s isn't declared as array\n", ar->identifier(),st);
-    return (result);
-  }
-  ndim =  n = artype->dimension();
-  for(i=0; i<n; i++) { //direct order of dimensions
-    pe = artype->sizeInDim(i);
-    if ((sbe=isSgSubscriptExp(pe)) != NULL)
-      esize = &(((sbe->ubound())->copy()) - ((sbe->lbound())->copy()) + c1);
-    else
-// !!! test : ubound = *
-      esize = &(pe->copy());
-// dvm000(N+j) = size_in_dimension(j)
-    doAssignStmt(Calculate( esize));
-  }
-   return (result);
-}
-
-SgExpression * doSizeAllocArray(SgSymbol *ar, SgExpression *desc, SgStatement *st, int RTS_flag)
-{
-  SgExpression *pe, *result, *size[MAX_DIMS], *el;
-  SgSubscriptExp *sbe;
-  SgValueExp c1(1);
-  SgArrayType *artype;
-  int i,n;
-
-//allocating SizeArray and setting on it
-  result = RTS_flag == 1 ? dvm_array_ref() : NULL;     // SizeArray reference/Shape list
-  artype = isSgArrayType(ar->type());
-  if((! artype) || (!(ar->attributes() & DIMENSION_BIT)))  {//isn't array
-    ndim = 0;
-    return (result);
-  }
-  ndim =  artype->dimension();
-  if(!desc->lhs())
-    Error("No allocaton specifications for %s",ar->identifier(),293,st);
-  if(!TestMaxDims(desc->lhs(), ar, st))
-    return(result);
-  for(el=desc->lhs(),n=0; el; el=el->rhs(),n++){
-   pe = el->lhs();
-   if((sbe=isSgSubscriptExp(pe)) != NULL)
-   { 
-     if(RTS_flag == RTS1)
-       size[n] = &(((sbe->ubound())->copy()) - ((sbe->lbound())->copy()) + c1);
-     else //RTS2
-     {
-       result = AddElementToList(result, DvmType_Ref(Calculate(sbe->ubound())));
-       result = AddElementToList(result, DvmType_Ref(Calculate(sbe->lbound())));     
-     }  
-   }
-   else
-     if(RTS_flag == RTS1)
-       size[n] = &(pe->copy());
-     else //RTS2
-     {
-       result = AddElementToList(result, DvmType_Ref(Calculate(pe)));
-       result = AddElementToList(result, DvmType_Ref(Calculate(&c1)));     
-     }  
-
-  }
-  if(ndim != n)
-    Error("Rank of array '%s' is not equal the length of allocation-specification-list",ar->identifier(),292,st);
-  if(RTS_flag == RTS1)
-  {
-     for(i=n-1; i>=0 ; i--)    //reversing dimensions for LibDVM
-        doAssignStmt(Calculate( size[i]));
-  }
-  return (result);
-}
-
-
-SgExpression * ArrayDimSize(SgSymbol *ar, int i)
-{
-// i= 1,...,Rank
-  SgExpression *esize,*pe;
-  SgSubscriptExp *sbe;
-  SgValueExp c1(1);
-  SgArrayType *artype;
-
-   if(IS_POINTER(ar))
-     return(UpperBound(ar,i-1)); // lower bound = 1
-
-   if(!(ar->attributes() & DIMENSION_BIT)){// Error isn't array
-      ndim = 0;
-      return (NULL);
-  }
-   artype = isSgArrayType(ar->type());
-   /*
-          if(! artype)   { // Error: isn't array
-            ndim = 0;
-            return (NULL);
-          }
-  */
-    pe = artype->sizeInDim(i-1);
-    if ((sbe=isSgSubscriptExp(pe)) != NULL){
-      if(!sbe->ubound())
-          esize = SizeFunction(ar,i);
-      else if(sbe->ubound()->variant() == STAR_RANGE) {// ubound = *
-	//Error("Assumed-size array: %s",ar->identifier(),cur_st);
-          esize = &(sbe->ubound()->copy());
-      } 
-      else 
-        if(sbe->lbound())
-          esize = &(((sbe->ubound())->copy()) - ((sbe->lbound())->copy()) + c1);
-        else
-          esize = &((sbe->ubound())->copy());      
-    }
-    else
-      //if(pe->variant() == STAR_RANGE) // dim=ubound = *
-	// Error("Assumed-size array: %s",ar->identifier(),cur_st); 
-         esize = &(pe->copy());
-
-   return (esize);
-}
-
-
-SgSymbol * baseMemory(SgType *t) 
-{
-  TypeMemory(t);   //14.03.03
-  if(t->variant() == T_DERIVED_TYPE)
-     return  baseMemoryOfDerivedType(t) ;
-  int Tind = TypeIndex(t);  //21.04.15
-  if(Tind != -1)
-     return  mem_symb[Tind] ;
-  else
-  {  //Err_g ("There is not dvm-base for array %s", " ", 616); 
-     return  mem_symb[Integer] ;
-  }   
-   
-}
-
-SgSymbol *baseMemoryOfDerivedType(SgType *t)
-{SgSymbol *stype;
- base_list *el;
- stype = t->symbol();
- for(el=mem_use_structure; el; el = el->next)
-   if(el->type_symbol == stype)  return(el->base_symbol);
- Error("Can not define base memory symbol for %s",stype->identifier(),333,cur_st);
- return(Imem);//error
-}
-
-void TypeMemory(SgType *t) 
-{
-  if(t->variant() == T_DERIVED_TYPE)
-     DerivedTypeMemory(t);
-  int tInd = TypeIndex(t);
-  
-  if(tInd != -1) 
-     mem_use[tInd] = 1;
-                      
-}
-
-void DerivedTypeMemory(SgType *t)
-{SgSymbol *stype;
- base_list *el;
-
- stype = t->symbol();
- for(el=mem_use_structure; el; el = el->next)
- {  if(el->type_symbol == stype) 
-    {  if(!el->base_symbol)
-          el->base_symbol = DerivedTypeBaseSymbol(stype,t);
-       return;
-    }
- }
- el = new base_list;
- el->type_symbol = stype;
- el->base_symbol = DerivedTypeBaseSymbol(stype,t);
- el->gpu_symbol = NULL;
- el->next=mem_use_structure;
- mem_use_structure = el; 
-}
-
-int IntrinsicTypeSize(SgType *t)
-{
-    switch(t->variant()) {
-      case T_INT:
-      case T_BOOL:     return (len_int ?  len_int  : default_integer_size);
-      case T_FLOAT:    return (len_int ?  len_int  : default_real_size);
-      case T_COMPLEX:  return (len_int ? 2*len_int : 2*default_real_size);
-      case T_DOUBLE:   return (len_int ? 2*len_int : 8);
-
-      case T_DCOMPLEX: return(16);
-
-      case T_STRING:                     
-      case T_CHAR:
-                       return(1);
-      default:
-                       return(0);
-    }
-}
-
-//SAPFOR has the same function without modification, 28.09.2021
-SgExpression * TypeLengthExpr(SgType *t)
-{
-  SgExpression *len;
-  SgExpression *selector;
-  if(t->variant() == T_DERIVED_TYPE) return(new SgValueExp(StructureSize(t->symbol())));
-  len = TYPE_RANGES(t->thetype) ? t->length() : NULL;
-  selector = TYPE_KIND_LEN(t->thetype) ? t->selector() : NULL;
-     // printf("\nTypeSize");
-     // printf("\nranges:"); if(len) len->unparsestdout();
-     // printf("\nkind_len:");  if(selector) selector->unparsestdout();
-  if(!len && !selector) //the number of bytes is not specified in type declaration statement
-    return (new SgValueExp(IntrinsicTypeSize(t)));
-  else if(len && !selector)   //INTEGER*2,REAL*8,CHARACTER*(N+1)
-    return(Calculate(len));
-  else
-    return(Calculate(LengthOfKindExpr(t, selector, len))); //specified kind or/and len
-}
-
-//SAPFOR has the same function without modification, 28.09.2021
-SgExpression *LengthOfKindExpr(SgType *t, SgExpression *se, SgExpression *le)
-{
-  switch(t->variant()) {
-      case T_INT:
-      case T_FLOAT:
-      case T_BOOL:
-      case T_DOUBLE:
-             return(se->lhs());
-      case T_COMPLEX:
-      case T_DCOMPLEX:
-             return(&(*new SgValueExp(2) * (*(se->lhs()))));
-      case T_CHAR:
-      case T_STRING:
-	{   SgExpression *length, *kind;	    
-	    if(se->rhs() && se->rhs()->variant() == LENGTH_OP ) {
-              length = se->rhs()->lhs();
-              kind   = se->lhs()->lhs(); 
-            }
-            else if(se->rhs() && se->rhs()->variant() != LENGTH_OP){
-              length = se->lhs()->lhs();
-              kind   = se->rhs()->lhs(); 
-            } 
-            else {
-              length = se->lhs();
-              kind = NULL;
-            }
-            length = le ? le : length;
-            if(kind)
-               return(&(*length * (*kind)));
-              //return(Calculate(length)->valueInteger() * Calculate(kind)->valueInteger());
-            else
-               return(length);
-              //return(Calculate(length)->valueInteger());
-
-	    /*length = se->rhs() ? (se->rhs()->variant() == LENGTH_OP ? se->rhs()->lhs() : se->lhs()->lhs()) : se->lhs();
-	    length = le ? le : length;
-            if(se->rhs()) // specified KIND and LEN
-              return((se->lhs()->lhs()->valueInteger()) * (se->rhs()->lhs()->valueInteger()) ); //kind*len
-            else
-	    return(se->lhs()->valueInteger()); */ 
-        }
- 
-      default:   
-              return(NULL);
-  }
-}
-
-int TypeSize(SgType *t) 
-{
-  SgExpression *le;
-  int len;
-  if(IS_INTRINSIC_TYPE(t))            return (IntrinsicTypeSize(t));
-  if(t->variant() == T_DERIVED_TYPE)  return (StructureSize(t->symbol()));
-  if((len = NumericTypeLength(t)))    return(len);
-  le = TypeLengthExpr(t);
-  if(le->isInteger()){
-    len = le->valueInteger();
-    len = len < 0 ? 0 : len; //according to standard F90
-  } else
-    len = -1; //may be error situation
-  return(len);
-}
-
-SgExpression *StringLengthExpr(SgType *t, SgSymbol *s)
-{ SgExpression *le;
- le = TypeLengthExpr(t);
- if (isSgKeywordValExp(le))
-    le = LENFunction(s);
- if (le->lhs() && isSgKeywordValExp(le->lhs()))
-    le->setLhs(LENFunction(s));
- return(le);
-}
-
-int NumericTypeLength(SgType *t)
-{ SgExpression *le;
-  SgValueExp *ve;
- if(t->variant() == T_STRING)   return (0);
- if(TYPE_RANGES(t->thetype)){
-   le = t->length();
-   if((ve =isSgValueExp(le)))
-      return (ve->intValue());
-   else
-      return (0);
- }
- if(TYPE_KIND_LEN(t->thetype) ) {
-   le = t->selector()->lhs();
-   if((ve=isSgValueExp(le)))
-     if(t->variant() == T_COMPLEX || t->variant() == T_DCOMPLEX)
-       return (2*ve->intValue());
-     else
-       return (ve->intValue());
-   else
-      return (0);
- } 
-   return(0);
-}
-
-int StructureSize(SgSymbol *s)
-{ //SgClassSymb *sc;
-  //SgFieldSymb *sf;
-  SgSymbol *sf;
-  //SgType *type;
-  // SgExpression *le; 
-  int n;
-  int size;
-  size = 0;
-    //n = ((SgClassSymb *) s)->numberOfFields();
-    //for(i=0;i<n;i++) {
-    //for(sf=((SgClassType *)(s->type()))->fieldSymb(1);sf;sf=((SgFieldSymb *)sf)->nextField()){
-  for(sf=FirstTypeField(s->type());sf;sf=((SgFieldSymb *)sf)->nextField()){
-
-    //sf = sc->field(i); 
-   if(IS_POINTER_F90(sf))
-   { size = size + DVMTypeLength();
-     continue;
-   }    
-   if(isSgArrayType(sf->type())) { 
-     //le= ArrayLength(sf,cur_st,1);
-     //if (le->isInteger())
-     //  size = size + le->valueInteger();
-     n= NumberOfElements(sf,cur_st,2);//ArrayLength(sf,cur_st,1);
-     if (n != 0)
-       size = size + n*TypeSize(sf->type()->baseType());
-     else 
-       Error("Can't calulate structure size: %s", s->identifier(),294,cur_st);    
-   }
-   else  
-     size = size + TypeSize(sf->type()); 
-  }
-
-  return(size);
-}
-
-SgSymbol *FirstTypeField(SgType *t)
-{return(SymbMapping(TYPE_COLL_FIRST_FIELD(t->thetype)));}
-
-
-
-int DVMTypeLength()
-{return( len_DvmType ? len_DvmType : TypeSize(SgTypeInt()));}
-
-
-int CharLength(SgType *t)
-{
- if(!TYPE_RANGES(t->thetype))
-    return(1); // CHARACTER (without len, default len=1)
- 
- return(ReplaceParameter( &(t->length()->copy()) )->valueInteger() );
- //return(ReplaceParameter( (new SgExpression(TYPE_RANGES(t->thetype)))->lhs() )->valueInteger() );
-}
-
-
-int TypeIndex(SgType *t) 
-{
-  if(!t) return -1;
-  int Tsize = TypeSize(t); 
-  switch(t->variant()) {
-     case T_INT:     if(Tsize==4)
-                        return (Integer);                      
-                     else if (Tsize==1)
-                        return (Integer_1);
-                     else if (Tsize==2)
-                        return (Integer_2);
-                     else if (Tsize==8)
-                        return (Integer_8);
-                     else
-                        break;
-     case T_FLOAT:   if(Tsize == 4)
-                        return (Real); 
-                     else if(Tsize == 8)	               
-                        return (Double);
-                     else
-                        break;
-     case T_DOUBLE:     return (Double);
-     case T_COMPLEX: if(Tsize == 8)
-                        return (Complex); 
-                     else if(Tsize == 16)		         
-                        return (DComplex);
-                     else
-                        break;
-     case T_DCOMPLEX:   return (DComplex);
-     case T_BOOL:    if(Tsize==4)
-                        return (Logical); 
-                     else if(Tsize==1)
-                        return (Logical_1);
-                     else if (Tsize==2)
-                        return (Logical_2);
-                     else if (Tsize==8)
-                        return (Logical_8);
-                     else
-                        break;
-     case T_STRING:  if(Tsize==1)
-                        return (Character); /*13.01.12*/
-                     else
-                        break;  
-     default:           break;
-  }
-  
-  return (-1);
-}
-
-int CompareTypes(SgType *t1,SgType *t2)
-
-{
-  if(!t1 || !t2) return(1);
-  if(TypeIndex(t1) >= 0 )
-     if( TypeIndex(t1)==TypeIndex(t2) )
-        return(1);
-     else
-        return(0);
-  if(t1->variant() == T_DERIVED_TYPE )
-     if(t2->variant() == T_DERIVED_TYPE && !strcmp(t1->symbol()->identifier(), t2->symbol()->identifier()))
-        return(1);
-     else
-        return(0);
-  if(TypeIndex(t1)==-1 && TypeIndex(t2)==-1)
-     return(1);
-  else
-     return(0);
-  return(0);
-}
-
-int BoundSizeArrays (SgSymbol *das)
-// returns dvm-index of RightBSizeArray
-{
- int iright;
- int i,nw,rank,width;
- SgExpression *wl,*ew, *lbound[MAX_DIMS], *ubound[MAX_DIMS], *she;
-
- rank = Rank(das);
- if(SHADOW_(das)) { // there is SHADOW directive, i.e. shadow  widths are
-                    // specified
-   iright = 0;
-   she = *SHADOW_(das);
-   if(!TestMaxDims(she,das,0)) return(0);
-   for(wl = she,i=0; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     if(ew->variant() == DDOT){
-       lbound[i] = &(ew->lhs())->copy();//left bound 
-       ubound[i] = &(ew->rhs())->copy();//right bound 
-     } else {
-       lbound[i] = &(ew->copy());//left bound == right bound
-       ubound[i] = &(ew->copy());
-     }
-   }
-   nw = i;
- 
-   if(nw<rank) 
-     for(; i<rank; i++) {      
-       lbound[i] = new SgValueExp(1); // by default, bound width = 1
-       ubound[i] = new SgValueExp(1);
-     }
-   
-  if (nw != rank) // wrong shadow width list
-     return(0);
-  
- } else {//  shadow  widths are not  specified in program
-     if(HPF_program && all_sh_width) // shadow width is specified by option -Hshw 
-        width = all_sh_width;        // for all arrays of HPF program
-     else
-        width = 1; //by default shadow width = 1
-     for(i=0; i<rank; i++) {      
-        lbound[i] = new SgValueExp(width); 
-     }
-     iright=ndvm;
- }
- for(i=rank-1;i>=0; i--)
-     doAssignStmt(lbound[i]);
- if(!iright) { // shadow widths are specified in program
-  iright = ndvm;
-  for(i=rank-1;i>=0; i--)
-     doAssignStmt(ubound[i]);
- }
-  return(iright);
-}
-
-void TestWeightArray(SgExpression *efm, SgStatement *st)
-{
-  SgArrayType *artype;
-  if(VarType_RTS(efm->symbol())!=4) //DOUBLE PRECISION
-    Error("Illegal type of '%s'",efm->symbol()->identifier(),141,st);
-
-  artype = isSgArrayType(efm->symbol()->type());
-  if(! artype || !artype->getDimList())   //isn't array
-  {
-    Error ("'%s' isn't array", efm->symbol()->identifier(),66,st);
-    return;
-  }
-  
-  if(artype->dimension() != 1)
-  {
-    Error ("Illegal rank of '%s'", efm->symbol()->identifier(),76,st);
-    return;
-  } 
-  SgExpression *arsize = Calculate(artype->sizeInDim(0));
-  if(arsize->variant() == INT_VAL)
-  {
-    SgExpression *nblock = Calculate(efm->lhs());
-    if(nblock->variant() == INT_VAL)
-    {
-      if(((SgValueExp *)arsize)->intValue() < ((SgValueExp *)nblock)->intValue())
-      { 
-        Error("Illegal array size of '%s'",efm->symbol()->identifier(),340,st);
-        return;
-      }      
-    }
-  } 
-}
-
-SgExpression *AddElementToList(SgExpression *list, SgExpression *e)
-{
-  SgExpression *el = new SgExprListExp(*e);
-     el->setRhs(list);
-     return (el);
-}
-
-SgExpression *ListUnion(SgExpression *list1, SgExpression *list2)
-{
-  SgExpression *el1=list1, *el2=list2,*result=list1;
-  for( ; el1 && el2; el1=list1,el2=list2)
-  {
-     list1=list1->rhs()->rhs();
-     list2=list2->rhs()->rhs();     
-     el2->rhs()->setRhs(list1);
-     el1->rhs()->setRhs(el2);
-  }
-     return (result);
-}
-
-int isInterfaceRTS2(SgStatement *stdis)
-{
-  SgExpression *e, *efm;
-  for(e=stdis->expr(1); e; e = e->rhs()) {
-     efm = e->lhs(); //dist_format expression
-     
-     if(efm->variant() == INDIRECT_OP)
-     {
-        if(stdis->expr(2))
-        {
-           err("ONTO/NEW_VALUE clause is not supported",625,stdis);
-           return(0);
-        }
-        if(parloop_by_handler == 2)       
-           return(1);
-        else
-        {
-           err("Indirect/Derived distribution, -Opl2 option should be specified",624,stdis);
-           return(0);
-        } 
-     }
-  }
-  return(parloop_by_handler==2 ? 1 : 0);
-}
-
-SgExpression *doDisRules(SgStatement *stdis, int aster, int &idis) {
-
-  SgExpression **dis_rules,*distr_list[1]; // DisRule's list
-   
-  dis_rules = isInterfaceRTS2(stdis) ? distr_list : NULL;    
-  idis = doDisRuleArrays(stdis, aster, dis_rules); 
-  return (idis==-1 ? *dis_rules : NULL);
-}
-
-int doDisRuleArrays (SgStatement *stdis, int aster, SgExpression **distr_list ) {
-
-  SgExpression *e, *efm, *ed, *nblk[MAX_DIMS], *dist_format, *multiple[MAX_DIMS], *numb[MAX_DIMS];
-  SgSymbol *genbl[MAX_DIMS];
-  int iaxis, i, axis[MAX_DIMS], param[MAX_DIMS], tp, mps_axis;
-  SgValueExp M1(1);
-//looking through the dist_format_list and
-// creating AxisArray and DistrParamArray
-  ndis = 0;
-  nblock = 0;
-  gen_block = 0;
-  mult_block = 0;
-  mps_axis = 0;
-  iaxis = ndvm;
-  if(distr_list)
-     *distr_list = NULL;
-  dist_format = stdis->expr(1);
-  if(!dist_format){ //dist_format list is absent
-    all_replicated=0;
-    return(distr_list ? -1 : iaxis);
-  }
-  for(i=0; i<MAX_DIMS; i++) 
-     numb[i] = NULL;
-  for(e=dist_format; e; e = e->rhs()) {
-     efm = e->lhs(); //dist_format expression
-     if(ndis==MAX_DIMS)
-     {
-        err("Too many dimensions",43,stdis); 
-        break;
-     }
-     ndis++;
-     if(efm->variant() == BLOCK_OP) {
-        nblock++;
-        mps_axis++;
-        if(!( efm->symbol() ) ) // case: BLOCK or MULT_BLOCK                               
-        {
-           if( !efm->rhs() ) // case: BLOCK 
-           {
-              if(distr_list)
-                 *distr_list = AddElementToList(*distr_list,DvmhBlock(mps_axis)); 
-                              
-	      multiple[ndis-1] = &M1;
-           }
-           else {            // case: MULT_BLOCK (k)
-              if(distr_list)
-                 *distr_list = AddElementToList(*distr_list,DvmhMultBlock(mps_axis, DVM000(iaxis+ndis-1))); 
-              multiple[ndis-1] = numb[ndis-1] = efm->rhs();
-              mult_block = 1;              
-          }  
-          axis[ndis-1]  = ndis;
-          param[ndis-1] = 0;
-          genbl[ndis-1] = NULL;
-        }
-        else if (!efm->lhs())   // case: GEN_BLOCK  
-	{ if( gen_block == 2 ) // there is WGT_BLOCK in format-list
-            err("GEN_BLOCK and WGT_BLOCK in format-list",129,stdis);
-          else 
-            gen_block = 1;
-          if(distr_list)
-            *distr_list = AddElementToList(*distr_list,DvmhGenBlock(mps_axis, efm->symbol())); 
-          multiple[ndis-1] = &M1;
-          axis[ndis-1]  = ndis;
-          param[ndis-1] = 0;
-          genbl[ndis-1] = efm->symbol();
-          tp = VarType_RTS(efm->symbol());
-          if((bind_ == 0 && tp != 2 && tp != 1) || (bind_ == 1 && tp != 1)) //INTEGER
-            Error("Illegal type of '%s'",efm->symbol()->identifier(),141,stdis);
-          SgArrayType *artype=isSgArrayType(efm->symbol()->type()); 
-          if( !artype || !artype->getDimList() )
-            Error("'%s' isn't array",efm->symbol()->identifier(),66,stdis);
-        } 
-        else                    // case: WGT_BLOCK 
-        { if( gen_block == 1 ) // there is GEN_BLOCK in format-list
-            err("GEN_BLOCK and WGT_BLOCK in format-list",129,stdis);
-          else 
-            gen_block = 2;
-          if(distr_list)
-            *distr_list = AddElementToList(*distr_list,DvmhWgtBlock(mps_axis, efm->symbol(),DVM000(iaxis+ndis-1))); 
-          multiple[ndis-1] = &M1;
-          axis[ndis-1]  = ndis;
-          param[ndis-1] = 0;
-          genbl[ndis-1] = efm->symbol();
-          nblk[ndis-1]  = numb[ndis-1] = efm->lhs();
-
-          TestWeightArray(efm,stdis);
-        }               
-       /* else if ((efm->lhs())->variant() == SPEC_PAIR)
-        *                       //there is one operand (variant==SPEC_PAIR)
-        *                       // case: BLOCK(SHADOW=...)
-        *{
-        *  efm = (efm->lhs())->rhs();
-        *
-        *} else          //there is one operand (variant==CONS)
-        *                 // case: BLOCK(LOW_SHADOW=...,HIGH_SHADOW=...)
-        *     {  }
-        */
-     } else if(efm->variant() == INDIRECT_OP)
-     {
-        mps_axis++;
-        if(distr_list)
-        {
-           if(efm->symbol())  // case INDIRECT(map)
-              *distr_list = AddElementToList(*distr_list,DvmhIndirect(mps_axis, efm->symbol()));
-           else               // case  DERIVED(...)
-           {
-              SgExpression *eFunc[2];
-              SgExpression *edrv = efm->lhs(); // efm->lhs()->variant()  == DERIVED_OP
-              DerivedSpecification(edrv, stdis, eFunc);
-              *distr_list = AddElementToList(*distr_list,DvmhDerived(mps_axis, DvmhDerivedRhs(edrv->rhs()),eFunc[0],eFunc[1]));
-           }
-        }
-     } else        // variant ==KEYWORD_VAL  ("*")
-       {  axis[ndis-1] = 0;  
-          multiple[ndis-1] = &M1; 
-          if(distr_list)
-            *distr_list = AddElementToList(*distr_list,DvmhReplicated()); 
-       }
-  }
-
-  if( gen_block == 1 && mult_block) // there are GEN_BLOCK and MULT_BLOCK in format-list
-    err("GEN_BLOCK and MULT_BLOCK in format-list",129,stdis);
-
-  if(!nblock_all && dist_format)
-    nblock_all = nblock;
-
-  if(nblock)
-    all_replicated=0;
-
-  if(aster)  // dummy arguments  inherit distribution
-     return(distr_list ? -1 : iaxis);
-
-  if(distr_list)
-  { 
-    for(i=0; i<ndis; i++) {
-     if(numb[i]) 
-        doAssignTo(DVM000(iaxis+i),numb[i]);
-    }
-    return(-1);
-  } 
-  
-  for(i=0; i<ndis; i++) {
-     if(axis[i]) // axis[i] != 0
-        doAssignStmt(new SgValueExp(ndis - axis[i] + 1));
-  }
-  for(i=0; i<ndis; i++) {
-     if(axis[i]) // axis[i] != 0
-        doAssignStmt(new SgValueExp(param[i]));
-  }
-  if(gen_block == 1 || gen_block == 2)
-    for(i=0; i<ndis; i++) {
-      if(axis[i])  // axis[i] != 0
-        doAssignStmt(genbl[i] ? GetAddresMem(new SgArrayRefExp(*genbl[i], *Exprn(LowerBound(genbl[i],0)))) : ConstRef(0));      
-    }
-  if(gen_block == 2)
-    for(i=0; i<ndis; i++) {
-      if(axis[i])  // axis[i] != 0
-        doAssignStmt(genbl[i] ? nblk[i] : ConstRef(0));      
-    }
-  if(mult_block)
-  { mult_block = ndvm;
-    for(i=ndis-1; i>=0; i--) 
-        doAssignStmt(&(multiple[i]->copy()));   
-  }
-
-  if(!nblock) //replication ("*") in all dimensions
-        doAssignStmt(new SgValueExp(0));
-
-  return (iaxis);
-}
-
-void doAlignRule_1 (int rank)
-// (SgExpression **p_axis,
-//                    SgExpression **p_coeff, SgExpression **p_const) 
-{ int i;
-  SgValueExp *num;
-  SgValueExp c1(1),c0(0);
- // creating axis_array 
-//  axis_array = dvm_array_ref();  // dvm000(ndvm)
-  for(i=1; i<=rank; i++) {
-     num = new SgValueExp (i);
-     doAssignStmt(num);            // AxisArray(i)=i 
-  }
- // creating coeff_array 
- // coeff_array =  dvm_array_ref();  // dvm000(ndvm)      
-  for(i=1; i<=rank; i++) 
-     doAssignStmt(&c1.copy());     // CoeffArray(i)=1 
-  // creating const_array 
-  //const_array =  dvm_array_ref();  // dvm000(ndvm)      
-  for(i=1; i<=rank; i++) 
-     doAssignStmt(&c0.copy());     // ConstArray(i)=0 
-}  
-
-int doAlignRule (SgSymbol *alignee, SgStatement *algn_st, int iaxis)
-// creating axis_array, coeff_array and  const_array 
-// returns length of align_source_list (dimension_identifier_list)
-// (SgExpression **p_axis,
-//                    SgExpression **p_coeff, SgExpression **p_const) 
-{ int i,j,rank,ni,nt,ia,num, use[MAX_DIMS];
-    //algn_attr *attr;
-    //SgStatement *algn_st;
-  SgExpression * el,*e,*ei,*elbi,*elbb;
-  SgSymbol *dim_ident[MAX_DIMS],*align_base;
-  SgExpression *axis[MAX_DIMS], *coef[MAX_DIMS], *cons[MAX_DIMS], *et;
-  SgValueExp c1(1),c0(0),cM1(-1);
-  int num_dim[MAX_DIMS], ncolon, ntriplet;
-  for(i=0;i<MAX_DIMS;i++)
-     num_dim[i]=0;
-
-  rank = Rank(alignee);    // rank of aligned array
-     //algn_st = node->align_stmt; // align statement
- 
-  if(iaxis == -2) return(rank);//for ALLOCATABLE array in specification part 
-                               //can't generate align rules because there is not declared array shape
-
-  ni = 0; //counter of elements in align_source_list(dimension_identifier_list)
-  ncolon = 0; //counter of elements ':'in align_source_list
-  if(!algn_st->expr(1))  //align_source_list is absent
-    for(;ni<rank;ni++,ncolon++) {
-       num_dim[ncolon] = ni;
-       dim_ident[ni] = NULL;   
-       use[ni] = 0;  
-    }
-  //looking through the align_source_list (dimension_identifier_list)
-  for(el=algn_st->expr(1); el; el=el->rhs())   {
-     if(ni==MAX_DIMS) {
-        err("Illegal align-source-list",633,algn_st); 
-        break;
-     }
-     if(isSgVarRefExp(el->lhs())) {  // dimension identifier
-       if(el->lhs()->symbol()->attributes() & PARAMETER_BIT)
-         Error("The align-dummy %s isn't a scalar integer variable",el->lhs()->symbol()->identifier(), 62,algn_st);
-       dim_ident[ni] = (el->lhs())->symbol();
-     } 
-     else if (el->lhs()->variant() == DDOT) {   // ':'
-             num_dim[ncolon++] = ni;
-             dim_ident[ni] = NULL;
-     }
-     else                           // "*"
-             dim_ident[ni] = NULL;         
-     use[ni] = 0;
-
-     ni++;
-  }
-  if(rank && rank != ni)
-    Error ("Rank of aligned array %s isn't equal to the length of align-source-list", alignee->identifier(),128,algn_st);
-
-  ia = alignee->attributes();
-  if(ia & DISTRIBUTE_BIT) 
-    Error ("An alignee may not have the DISTRIBUTE attribute: %s", alignee->identifier(),57,algn_st);
-
-  et =(algn_st->expr(2)->variant()==ARRAY_OP) ? (algn_st->expr(2))->rhs() : algn_st->expr(2);
-  align_base = et->symbol();
-
-  nt = 0;//counter of elements in align_subscript_list
-  ntriplet = 0; //counter of triplets in align_subscript_list
-  if(! et->lhs())  //align_subscript_list is absent
-    for( ; nt<Rank(align_base); nt++,ntriplet++) {
-       axis[nt] = new SgValueExp(ni-num_dim[ntriplet]);
-       coef[nt] = new SgValueExp(1);
-       cons[nt] =  &(*Exprn(LowerBound(align_base,nt)) -
-                    (*Exprn( LowerBound(alignee,num_dim[ntriplet])))); 
-  } 
- //looking through the align_subscript_list 
-  for(el=et->lhs(); el; el=el->rhs())   {
-     if(nt==MAX_DIMS) {
-        err("Illegal align-subscript-list",634,algn_st); 
-        break;
-     }
-     e = el->lhs();  //subscript expression
-     if(e->variant()==KEYWORD_VAL) {  // "*"
-       axis[nt] = & cM1.copy();
-       coef[nt] = & c0.copy();
-       cons[nt] = & c0.copy();   
-     }
-     else if (e->variant()==DDOT) { // triplet
-       axis[nt] = new SgValueExp(ni-num_dim[ntriplet]);
-       coef[nt] = (e->lhs() && e->lhs()->variant()==DDOT) ? & e->rhs()->copy() :
-                                                            new SgValueExp(1);
-       //elbi = Exprn( LowerBound(alignee,num_dim[ntriplet]));
-       //if (e->lhs() && e->lhs()->variant()==DDOT)
-       //  elbi = &(coef[nt]->copy()* (*elbi));
-       //else
-       //   elbi = NULL;
-       elbb = Exprn(LowerBound(align_base,nt)); 
-       if  (e->lhs()) 
-          if(e->lhs()->variant()!=DDOT)
-             cons[nt] = &(e->lhs()->copy() - (*elbb));
-          else if (e->lhs()->lhs())
-             cons[nt] = &(e->lhs()->lhs()->copy() - (*elbb));
-          else
-             cons[nt] = & c0.copy();
-       else
-             cons[nt] = & c0.copy();
-       //cons[nt] = &(*elbb - *elbi);  
-     
-       ntriplet++;  
-     }
-     else  {  // expression
-       num = AxisNumOfDummyInExpr(e, dim_ident, ni, &ei, use, algn_st);
-       //ei->unparsestdout();
-       //printf("\nnum = %d\n", num);
-       if (num<=0)   {
-       axis[nt]  = & c0.copy();
-       coef[nt] = & c0.copy();
-       elbb = LowerBound(align_base,nt);
-       if(elbb)
-         cons[nt] = & (e->copy() - (elbb->copy()));
-                  // correcting const with lower bound of align-base array 
-       else // error situation : rank of align-base less than list length
-         cons[nt] = & (e->copy()); 
-       }
-       else {
-       axis[nt] = new SgValueExp(ni-num+1); // reversing numbering
-       CoeffConst(e, ei,&coef[nt], &cons[nt]);  
-       if(!iaxis) TestReverse(coef[nt],algn_st); 
-       if(!coef[nt]) {
-         if(!iaxis) err("Wrong align-subscript expression", 130,algn_st);
-         coef[nt] = & c0.copy();
-         cons[nt] = & c0.copy();   
-       }
-       else {
-       // correcting const with lower bound of alignee and align-base arrays 
-        elbb = LowerBound(align_base,nt);
-        elbi = LowerBound(alignee,num-1);
-        if(elbb  && elbi)   
-          cons[nt] = &(*cons[nt] + (*coef[nt] * (elbi->copy())) - (elbb->copy()));  
-        }        
-       }
-     }
-    
-     nt++;
-  }
-  ia = align_base->attributes();
-  if(!iaxis) {
-    if(!(ia & DIMENSION_BIT) && !IS_POINTER(align_base)) 
-      Error ("Align-target %s isn't declared as array",align_base->identifier(),61,algn_st);
-    else
-    if(Rank(align_base) != nt) 
-      Error ("Rank of align-target %s isn't equal to the length of align_subscript-list", align_base->identifier(),132,algn_st);
-    if(ntriplet != ncolon)
-       err ("The number of colons in align-source-list isn't equal to the number of subscript-triplets",131,algn_st);
-    // setting on arrays with reversing
-    for(i=nt-1; i>=0; i--)
-      doAssignStmt(axis[i]);
-    for(i=nt-1; i>=0; i--)
-      doAssignStmt(ReplaceFuncCall(coef[i]));
-    for(i=nt-1; i>=0; i--)
-      doAssignStmt(Calculate(cons[i]));
-  }
-  else  if(iaxis == -1)
-    return(nt);
-  else { 
-    j = iaxis + 2*nt;
-    for(i=nt-1; i>=0; i--)
-      doAssignTo(DVM000(j++),Calculate(cons[i]));
-  } 
-  
-  return(nt);  
-}
-
-
-int doAlignRuleArrays (SgSymbol *alignee, SgStatement *algn_st, int iaxis, SgExpression *axis[], SgExpression *coef[],SgExpression *cons[], int interface )
-// creating axis_array, coeff_array and  const_array 
-// returns length of align_source_list (dimension_identifier_list)
-// (SgExpression **p_axis,
-//                    SgExpression **p_coeff, SgExpression **p_const) 
-{ int i,j,rank,ni,nt,ia,num, use[MAX_DIMS];
-    //algn_attr *attr;
-    //SgStatement *algn_st;
-  SgExpression * el,*e,*ei,*elbi,*elbb;
-  SgSymbol *dim_ident[MAX_DIMS],*align_base;
-  SgExpression *et;
-  SgValueExp c1(1),c0(0),cM1(-1);
-  int num_dim[MAX_DIMS], ncolon, ntriplet;
-  for(i=0;i<MAX_DIMS;i++)
-     num_dim[i]=0;
-
-  rank = Rank(alignee);    // rank of aligned array
- 
-  if(iaxis == -2) return(rank);//for ALLOCATABLE array in specification part 
-                               //can't generate align rules because there is not declared array shape
-
-  ni = 0; //counter of elements in align_source_list(dimension_identifier_list)
-  ncolon = 0; //counter of elements ':'in align_source_list
-  if(!algn_st->expr(1))  //align_source_list is absent
-    for(;ni<rank;ni++,ncolon++) {
-       num_dim[ncolon] = ni;
-       dim_ident[ni] = NULL;   
-       use[ni] = 0;  
-    }
-  //looking through the align_source_list (dimension_identifier_list)
-  for(el=algn_st->expr(1); el; el=el->rhs())   {
-     if(ni==MAX_DIMS) {
-        err("Illegal align-source-list",633,algn_st); 
-        break;
-     }
-     if(isSgVarRefExp(el->lhs())) {  // dimension identifier
-       if(el->lhs()->symbol()->attributes() & PARAMETER_BIT)
-         Error("The align-dummy %s isn't a scalar integer variable",el->lhs()->symbol()->identifier(), 62,algn_st);
-       dim_ident[ni] = (el->lhs())->symbol();
-     } 
-     else if (el->lhs()->variant() == DDOT) {   // ':'
-             num_dim[ncolon++] = ni;
-             dim_ident[ni] = NULL;
-     }
-     else                           // "*"
-             dim_ident[ni] = NULL;         
-     use[ni] = 0;
-
-     ni++;
-  }
-  if(rank && rank != ni)
-    Error ("Rank of aligned array %s isn't equal to the length of align-source-list", alignee->identifier(),128,algn_st);
-
-  ia = alignee->attributes();
-  if(ia & DISTRIBUTE_BIT) 
-    Error ("An alignee may not have the DISTRIBUTE attribute: %s", alignee->identifier(),57,algn_st);
-
-  et =(algn_st->expr(2)->variant()==ARRAY_OP) ? (algn_st->expr(2))->rhs() : algn_st->expr(2);
-  align_base = et->symbol();
-
-  nt = 0;//counter of elements in align_subscript_list
-  ntriplet = 0; //counter of triplets in align_subscript_list
-  if(! et->lhs())  //align_source_list is absent
-    for( ; nt<Rank(align_base); nt++,ntriplet++) {
-       axis[nt] = new SgValueExp(ni-num_dim[ntriplet]);
-       coef[nt] = new SgValueExp(1);
-       cons[nt] = interface == RTS2 ? new SgValueExp(0) : &(*Exprn(LowerBound(align_base,nt)) -
-                    (*Exprn( LowerBound(alignee,num_dim[ntriplet])))); 
-  } 
- //looking through the align_subscript_list 
-  for(el=et->lhs(); el; el=el->rhs())   {
-     if(nt==MAX_DIMS) {
-        err("Illegal align-subscript-list",634,algn_st); 
-        break;
-     }
-     e = el->lhs();  //subscript expression
-     if(e->variant()==KEYWORD_VAL) {  // "*"
-       axis[nt] = & cM1.copy();
-       coef[nt] = & c0.copy();
-       cons[nt] = & c0.copy();   
-     }
-     else if (e->variant()==DDOT) { // triplet
-       axis[nt] = new SgValueExp(ni-num_dim[ntriplet]);
-       coef[nt] = (e->lhs() && e->lhs()->variant()==DDOT) ? & e->rhs()->copy() :
-                                                            new SgValueExp(1);
-       elbb = Exprn(LowerBound(align_base,nt)); 
-       if  (e->lhs()) 
-          if(e->lhs()->variant()!=DDOT)
-             cons[nt] = interface == RTS2 ? &(e->lhs()->copy()) : &(e->lhs()->copy() - (*elbb));
-          else if (e->lhs()->lhs())
-             cons[nt] = interface == RTS2 ? &(e->lhs()->lhs()->copy()) : &(e->lhs()->lhs()->copy() - (*elbb));
-          else
-             cons[nt] = & c0.copy();
-       else
-             cons[nt] = & c0.copy();  
-     
-       ntriplet++;  
-     }
-     else  {  // expression
-       num = AxisNumOfDummyInExpr(e, dim_ident, ni, &ei, use, algn_st);
-            //ei->unparsestdout();
-            //printf("\nnum = %d\n", num);
-       if (num<=0)   {
-          axis[nt] = & c0.copy();
-          coef[nt] = & c0.copy();
-          cons[nt] = & (e->copy()); 
-          if(interface != RTS2 && (elbb = LowerBound(align_base,nt)) )
-             cons[nt] = & (*cons[nt] - (elbb->copy()));
-                  // correcting const with lower bound of align-base array 
-                  // elbb==NULL is error situation : rank of align-base less than list length
-            
-       }
-       else {
-          axis[nt] = new SgValueExp(ni-num+1); // reversing numbering
-          CoeffConst(e, ei,&coef[nt], &cons[nt]);  
-          if(!iaxis) TestReverse(coef[nt],algn_st); 
-          if(!coef[nt]) {
-             if(!iaxis) err("Wrong align-subscript expression", 130,algn_st);
-             coef[nt] = & c0.copy();
-             cons[nt] = & c0.copy();   
-          }
-          else {
-          // correcting const with lower bound of alignee and align-base arrays 
-           elbb = LowerBound(align_base,nt);
-           elbi = LowerBound(alignee,num-1);
-           if(interface != RTS2 && elbb  && elbi)   
-              cons[nt] = &(*cons[nt] + (*coef[nt] * (elbi->copy())) - (elbb->copy()));  
-          }        
-       }
-     }
-    
-     nt++;
-  }
-  ia = align_base->attributes();
-  if(!iaxis) {
-    if(!(ia & DIMENSION_BIT) && !IS_POINTER(align_base)) 
-      Error ("Align-target %s isn't declared as array",align_base->identifier(),61,algn_st);
-    else
-    if(Rank(align_base) != nt) 
-      Error ("Rank of align-target %s isn't equal to the length of align_subscript-list", align_base->identifier(),132,algn_st);
-    if(ntriplet != ncolon)
-       err ("The number of colons in align-source-list isn't equal to the number of subscript-triplets",131,algn_st);
-  }
-    return (nt);
-}
-
-int TestExprArray(SgExpression *e[], int n)
-{
-  int i;
-  for(i=0; i<n; i++)
-     if(isSgValueExp(e[i]) || isSgVarRefExp(e[i]) || e[i]->variant()==CONST_REF)
-        continue;
-     else
-        return (0);
-  return (1);
-}
-
-SgExpression *doAlignRules (SgSymbol *alignee, SgStatement *algn_st, int iaxis, int &nt)
-{
-  SgExpression *axis[MAX_DIMS],
-               *coef[MAX_DIMS],
-               *cons[MAX_DIMS];
-  SgExpression *el, *e, *alignment_list = NULL;
-  int i,j; 
-  nt = doAlignRuleArrays (alignee, algn_st, iaxis, axis, coef, cons, INTERFACE_RTS2 ? RTS2 : RTS1);
-  if(iaxis == -1 || iaxis == -2)
-     return(NULL);
-  if(INTERFACE_RTS2) {
-     int flag_coef = TestExprArray(coef,nt);
-     int flag_cons = TestExprArray(cons,nt);
-     int j1 = ndvm, j2;
-     if(!iaxis) {     
-        if(!flag_coef)
-           for(i=nt-1; i>=0; i--)
-              doAssignStmt(ReplaceFuncCall(coef[i]));
-        j2 = ndvm;
-        if(!flag_cons)
-           for(i=nt-1; i>=0; i--)
-              doAssignStmt(Calculate(cons[i]));
-     } else { 
-        j1=iaxis; 
-        j2=flag_coef ? iaxis : iaxis+nt;
-     }
-     for(int i=0; i<nt; i++)
-     {          
-        e = AlignmentLinear(axis[i],flag_coef ? coef[i] : DVM000(j1++),flag_cons ? cons[i] : DVM000(j2++));        
-                  //e = AlignmentLinear(axis[i],ReplaceFuncCall(coef[i]),cons[i]);   //Calculate(cons[i])    
-        (el = new SgExprListExp(*e))->setRhs(alignment_list);
-        alignment_list = el;        
-     }
-     return (alignment_list);
-  }
-  if(!iaxis) {
-    // setting on arrays with reversing
-    for(i=nt-1; i>=0; i--)
-      doAssignStmt(axis[i]);
-    for(i=nt-1; i>=0; i--)
-      doAssignStmt(ReplaceFuncCall(coef[i]));
-    for(i=nt-1; i>=0; i--)
-      doAssignStmt(Calculate(cons[i]));
-  }
-  else {
-    j = iaxis + 2*nt;
-    for(i=nt-1; i>=0; i--)
-      doAssignTo(DVM000(j++),Calculate(cons[i]));
-  } 
-  
-  return(NULL);  
-
-}
-
-SgExpression * Exprn(SgExpression *e)
-{return((!e) ? new SgValueExp(0) : & e->copy());}
-
-int AxisNumOfDummyInExpr (SgExpression *e, SgSymbol *dim_ident[], int ni,                             SgExpression **eref, int use[], SgStatement *st)
-{
-  SgSymbol *symb;
-  SgExpression * e1; 
-  int i,i1,i2;
-  *eref = NULL;
-  if (!e) 
-    return(0);
-  if(isSgVarRefExp(e))  {
-    symb = e->symbol();
-    for(i=0; i<ni; i++) {
-       if(dim_ident[i]==NULL)
-         continue;
-       if(dim_ident[i]==symb)  {
-         *eref = e;
-         if (use[i] == 1)
-           if(st && st->variant() == DVM_PARALLEL_ON_DIR)
-             Error("More one occurance of do-variable '%s'  in iteration-align-subscript-list", symb->identifier(),133, st);
-           else if(st)
-             Error("More one occurance of align_dummy '%s' in align-subscript-list", symb->identifier(), 134,st);
-           use[i]++;
-         return(i+1);
-       }
-    }
-    return (0);
-  }
-  i1 = AxisNumOfDummyInExpr(e->lhs(), dim_ident, ni, eref, use, st);
-  e1 = *eref;
-  i2 = AxisNumOfDummyInExpr(e->rhs(), dim_ident, ni, eref, use, st);
-  if((i1==-1)||(i2==-1))  return(-1);
-  if(i1 && i2)  {
-    if(st && st->variant() == DVM_PARALLEL_ON_DIR)
-      err("More one occurance of a do-variable in do-variable-use expression", 135,st);
-    else if (st)  
-      err("More one occurance of an align_dummy in align-subscript expression", 136,st);
-    return(-1);
-  }
-  if(i1) *eref = e1;
-  return(i1 ? i1 : i2);
-}
-
-void CoeffConst(SgExpression *e, SgExpression *ei,                                          SgExpression **pcoef, SgExpression **pcons)
-//  ei == I;  e == a * I + b 
-// result: *pcoef = a, *pcons = b
-{
-  SgValueExp c1(1), c0(0), cM1(-1);
-  switch(e->variant()) {
-       case VAR_REF:                // I                            
-                       *pcoef = & c1.copy();
-                       *pcons = & c0.copy();
-                       break;
-       case UNARY_ADD_OP:                // +I  
-                       if(e->lhs()==ei) {                           
-                       *pcoef = & c1.copy();
-                       *pcons = & c0.copy();
-                       }
-                       else
-                       *pcoef = NULL;
-                       break;
-       case MINUS_OP:                // -I  
-                       if(e->lhs()==ei) {                            
-                       *pcoef = & cM1.copy();
-                       *pcons = & c0.copy();
-		       }
-                       else
-                       *pcoef = NULL;
-                       break;
-                       
-       case MULT_OP:                // a * I
-                       if (e->lhs()==ei) 
-                       *pcoef = &(e->rhs())->copy(); 
-                       else if (e->rhs()==ei)
-                       *pcoef = &(e->lhs())->copy() ;
-                       else 
-                       *pcoef = NULL;
-                       *pcons = & c0.copy();
-                       break;
-       case DIV_OP :               // I / a
-                       if(e->rhs()==ei) 
-                         *pcoef = NULL;  // Error
-                       else {
-                         *pcoef = & (c1.copy() / (e->rhs())->copy());
-                         *pcons = & c0.copy();
-                       }
-                       break;
-       case ADD_OP :               
-                       if(e->lhs()==ei) {                  // I + b
-                         *pcoef = & c1.copy();
-                         *pcons = & (e->rhs())->copy();     
-
-                       } else  if(e->rhs()==ei) {          // b + I
-                         *pcoef = & c1.copy();
-                         *pcons = & (e->lhs())->copy();                                            
-                       } else if (((e->lhs())->lhs()==ei)){ // I * a + b
-                         if(e->lhs()->variant() == MULT_OP){
-                         *pcons = & (e->rhs())->copy();
-                         *pcoef = & ((e->lhs())->rhs())->copy();
-                         }
-                         else if(e->lhs()->variant() == MINUS_OP){
-                         *pcons = & (e->rhs())->copy();
-                         *pcoef = & cM1.copy();
-                         }                        
-                         else
-                         *pcoef = NULL;
-                       
-                       } else if (((e->lhs())->rhs()==ei)){ // a * I + b
-                         if(e->lhs()->variant() == MULT_OP){
-                         *pcons = & (e->rhs())->copy();
-                         *pcoef = & ((e->lhs())->lhs())->copy();
-                         }
-                         else
-                         *pcoef = NULL;
-                       
-                       } else if (((e->rhs())->lhs()==ei)){ // b + I * a
-                         if(e->rhs()->variant() == MULT_OP){ 
-                         *pcons = & (e->lhs())->copy();
-                         *pcoef = & ((e->rhs())->rhs())->copy();
-                         } 
-                         else if(e->rhs()->variant() == MINUS_OP){
-                         *pcons = & (e->lhs())->copy();
-                         *pcoef = & cM1.copy();
-                         }                        
-                         else
-                         *pcoef = NULL;                    
-
-                       } else if (((e->rhs())->rhs()==ei)){ // b + a * I
-                         if(e->rhs()->variant() == MULT_OP){  
-                         *pcons = & (e->lhs())->copy();
-                         *pcoef = & ((e->rhs())->lhs())->copy();
-                         } 
-                       }
-                         else
-                         *pcoef = NULL;
-                       break;
-      case SUBT_OP :               
-                       if(e->lhs()==ei) {                  // I - b
-                         *pcoef = & c1.copy();
-                         *pcons = & SgUMinusOp((e->rhs())->copy());     
-
-                       } else  if(e->rhs()==ei) {          // b - I
-                         *pcoef = & cM1.copy();
-                         *pcons = & (e->lhs())->copy();                                            
-                       } else if (((e->lhs())->lhs()==ei)){ // I * a - b
-                         if(e->lhs()->variant() == MULT_OP){
-                         *pcons = & SgUMinusOp((e->rhs())->copy());
-                         *pcoef = & ((e->lhs())->rhs())->copy();
-                         }
-                         else if(e->lhs()->variant() == MINUS_OP){
-                         *pcons = & SgUMinusOp((e->rhs())->copy());
-                         *pcoef = & cM1.copy();
-                         }                       
-                         else
-                         *pcoef = NULL;
-
-                       } else if (((e->lhs())->rhs()==ei)){ // a * I - b
-                         if(e->lhs()->variant() == MULT_OP){
-                         *pcons = & SgUMinusOp((e->rhs())->copy());
-                         *pcoef = & ((e->lhs())->lhs())->copy();
-                         }
-                         else
-                         *pcoef = NULL;
-
-                       } else if (((e->rhs())->lhs()==ei)){ // b - I * a
-                         if(e->rhs()->variant() == MULT_OP){  
-                         *pcons = & (e->lhs())->copy();
-                         *pcoef = & SgUMinusOp(((e->rhs())->rhs())->copy());
-                         }
-                         else
-                         *pcoef = NULL; 
-
-                       } else if (((e->rhs())->rhs()==ei)){ // b - a * I 
-                         if(e->rhs()->variant() == MULT_OP){  
-                         *pcons = & (e->lhs())->copy();
-                         *pcoef = & SgUMinusOp(((e->rhs())->lhs())->copy());
-                         }
-                       } 
-                         else
-                         *pcoef = NULL;
-                       break;
-       default:
-                       *pcoef = NULL;
-                       break; 
-                          
-  }
-}
-//-----------------------------------------------------------------------
-SgExpression *SearchDistArrayField(SgExpression *e)   
-{
-  SgExpression *el = e;
-  while( isSgRecordRefExp(el))
-  {
-     if(isSgArrayRefExp(el->rhs()))
-       ChangeDistArrayRef(el->rhs()->lhs()); // subscript list 
-     if(el->rhs()->symbol() && (el->rhs()->symbol()->attributes() & DISTRIBUTE_BIT || el->rhs()->symbol()->attributes() & ALIGN_BIT))
-       return el;
-     else
-       el = el->lhs();
-  }
-  if(el->symbol() && (el->symbol()->attributes() & DISTRIBUTE_BIT || el->symbol()->attributes() & ALIGN_BIT))
-    return el;
-  else
-    return NULL; 
-}
-
-void ChangeDistArrayRef(SgExpression *e)
-{ 
-  SgExpression *el;
- 
-  if(!e)
-     return;
-  if( e->variant() != BOOL_VAL && e->variant() != INT_VAL && e->symbol() &&  IS_GROUP_NAME(e->symbol()))
-     Error("Illegal group name use: '%s'",e->symbol()->identifier(),137,cur_st);
-  
-  if(opt_loop_range && inparloop && isSgVarRefExp(e) && INDEX_SYMBOL(e->symbol())) {
-     ChangeIndexRefBySum(e);  
-     return;
-  }
-  if(isSgArrayRefExp(e)) {
-     if(opt_loop_range && inparloop && (sum_dvm=TestDVMArrayRef(e)))
-        ;
-     else
-        for(el=e->lhs(); el; el=el->rhs())
-           ChangeDistArrayRef(el->lhs());
- /*   
-    if(HEADER( e -> symbol()) && !isPrivateInRegion(e -> symbol())   //is distributed array reference not private in loop of region
-       || IN_COMPUTE_REGION && HEADER_OF_REPLICATED(e -> symbol()) )   //or is array reference in compute region                                               
-       DistArrayRef(e,0,cur_st); //replace distributed array reference      
- */
- /*  
-    if (   IN_COMPUTE_REGION && is_acc_array(e->symbol())  
-       || !IN_COMPUTE_REGION && HEADER(e->symbol()) )
-       DistArrayRef(e,0,cur_st); //replace dvm-array reference 
- */
-
-     if ( HEADER( e -> symbol())  
-        || (IN_COMPUTE_REGION || inparloop && parloop_by_handler) && DUMMY_FOR_ARRAY(e -> symbol()) && isIn_acc_array_list(*DUMMY_FOR_ARRAY(e -> symbol()))  )
-        DistArrayRef(e,0,cur_st); //replace dvm-array reference if required  
-     return;
-  }
-  if(isSgFunctionCallExp(e)) {
-     int i;
-     ReplaceFuncCall(e);
-     for(el=e->lhs(), i=0; el; el=el->rhs(),i++)
-        ChangeArg_DistArrayRef(el,e->symbol(),i);
-     return;
-  } 
-
-  if(isSgRecordRefExp(e)) { 
-     SgExpression *eleft = SearchDistArrayField(e); //from right to left  
-     if(eleft)
-        DistArrayRef(eleft,0,cur_st);
-     return;
-  }
-    
-  ChangeDistArrayRef(e->lhs());
-  ChangeDistArrayRef(e->rhs());
-  return;
-}
-
-void ChangeDistArrayRef_Left(SgExpression *e)
-{ 
-  SgExpression *el;
- 
-  if(!e)
-     return;
-  
-  if( e->symbol() &&  IS_GROUP_NAME(e->symbol()))
-     Error("Illegal group name use: '%s'",e->symbol()->identifier(),137,cur_st);
-   
-  if(isSgArrayRefExp(e)) {
-     if(opt_loop_range && inparloop && (sum_dvm=TestDVMArrayRef(e)))
-        ;
-     else
-        for(el=e->lhs(); el; el=el->rhs())
-           ChangeDistArrayRef(el->lhs());
-/*
-    if(HEADER( e -> symbol()) && !isPrivateInRegion(e -> symbol()) //is distributed array reference not private in loop of region
-      || IN_COMPUTE_REGION && HEADER_OF_REPLICATED(e -> symbol()))  //or is array reference in compute region          
- 
-      DistArrayRef(e,1,cur_st);//replace distributed array reference (1 -modified variable) 
-*/
-/*    
-     if (   IN_COMPUTE_REGION && is_acc_array(e->symbol())  
-        || !IN_COMPUTE_REGION && HEADER(e->symbol()) )
-        DistArrayRef(e,0,cur_st); //replace dvm-array reference 
-*/
-     if  ( HEADER( e -> symbol())  
-        || (IN_COMPUTE_REGION || inparloop && parloop_by_handler) && DUMMY_FOR_ARRAY(e -> symbol()) && isIn_acc_array_list(*DUMMY_FOR_ARRAY(e -> symbol()))  )
-        DistArrayRef(e,1,cur_st); //replace dvm-array reference if required  
-           
-     return;
-  }
-
-  if(isSgRecordRefExp(e)) { 
-     SgExpression *eleft = SearchDistArrayField(e); //from right to left  
-     if(eleft)
-        DistArrayRef(eleft,0,cur_st);
-     return;
-  }
-
-  // e->variant()==ARRAY_OP //substring     
-  ChangeDistArrayRef_Left(e->lhs());
-  ChangeDistArrayRef(e->rhs());
-             
-  return;
-}
-
-void ChangeArg_DistArrayRef(SgExpression *ele, SgSymbol *fsym, int i)
-{//ele is SgExprListExp
-  SgExpression  *el, *e;
-  e = ele->lhs();
-  if(!e)
-    return;
- if(isSgKeywordArgExp(e))
-   e = e->rhs();
-
- if(isSgArrayRefExp(e)) {
-
-    if(!e->lhs()){ //argument is  whole array (array name)
-                 // no changes are required  because  array header name is       
-                 // the same as array name  
-      if(IS_POINTER(e->symbol()))
-        Error("Illegal POINTER reference: '%s'",e->symbol()->identifier(),138,cur_st);
-      if((inparloop && parloop_by_handler || IN_COMPUTE_REGION) ) 
-      {
-        if(DUMMY_FOR_ARRAY(e->symbol()) && isIn_acc_array_list(*DUMMY_FOR_ARRAY(e ->symbol())) )   
-        {  e->setLhs(FirstArrayElementSubscriptsForHandler(e->symbol()));
-                                        //changed by first array element reference
-           if(!for_host)
-             DistArrayRef(e,0,cur_st);  
-        }
-        else if(options.isOn(C_CUDA) && for_kernel && isPrivate(e->symbol())) // && PrivateArrayClassUse(sizeOfPrivateArraysInBytes())))
-        {   
-           if(fsym && !isArrayParameterWithAssumedShape(ProcedureSymbol(fsym),i))
-             e->setLhs(FirstArrayElementSubscriptsOfPrivateArray(e->symbol()));            
-        }  
-      }
-      if(HEADER(e->symbol()) && for_host)
-        e->setSymbol(*HeaderSymbolForHandler(e->symbol())); 
-       
-      return;                                                                 
-    }
-    el=e->lhs()->lhs();  //first subscript of argument
-    //testing: is first subscript of ArrayRef a POINTER 
-    if((isSgVarRefExp(el) || isSgArrayRefExp(el)) && IS_POINTER(el->symbol())) {
-        ChangeDistArrayRef(el->lhs()); 
-	                 // ele->setLhs(PointerHeaderRef(el,1));
-                        //replace  ArrayRef by PointerRef: A(P)=>P(1) or A(P(I)) => P(1,I) 
-        if(!strcmp(e->symbol()->identifier(),"heap") || (e->symbol()->attributes() & HEAP_BIT))
-          is_heap_ref = 1;
-        else
-          Error("Illegal POINTER reference: '%s'", el->symbol()->identifier(),138,cur_st);
-        if(e->lhs()->rhs())  //there are other subscripts
-          Error("Illegal POINTER reference: '%s'", el->symbol()->identifier(),138,cur_st);
-        if(HEADER(e->symbol()))
-          Error("Illegal POINTER reference: '%s'", el->symbol()->identifier(),138,cur_st);
-
-        e->setSymbol(*heapdvm); //replace ArrayRef: A(P)=>HEAP00(P) or A(P(I))=>HEAP00(P(I)) 
-        return;
-    } 
- }
- if(isSgRecordRefExp(e) && isSgArrayRefExp(e->rhs()) && (e->rhs()->symbol()->attributes() & DISTRIBUTE_BIT || e->rhs()->symbol()->attributes() & ALIGN_BIT)
- && !e->rhs()->lhs()) {
-    ChangeDistArrayRef(e->lhs());
-    return;
- }
-
- ChangeDistArrayRef(e); 
-   
- return;
-}
-
-SgExpression *ToInt(SgExpression *e)
-{ if(!e) return(e);
-  return( e->type() && e->type()->variant()==T_INT) ? e : TypeFunction(SgTypeInt(),e,NULL);
-}
-
-SgExpression *LinearForm (SgSymbol *ar,  SgExpression *el, SgExpression *erec)
-{
-  int j,n;
-  SgExpression *elin,*e;
-// el - subscript list (I1,I2,...In), n - rank of array (ar)
-// ind - index of array header in dvm000
-// generating                         
-// [Header(n) +]
-//                               n   
-//         Header(n+1) +  I1 + SUMMA(Header(n-k+1) * Ik)
-//                              k=2
-//or for Cuda kernel
-//           n   
-//         SUMMA(Header(n-k+1) * Ik)
-//          k=1
-
-// Header(0:n+1) - distributed array descriptor
- 
-    n = Rank(ar);
-    if(!el)     // there aren't any subscripts
-      return( coef_ref(ar,n+1,erec) ); //Header(n) 
-                                               
-    if(for_kernel)           /*ACC*/           
-      elin = NULL;                             
-    else if(opt_loop_range && inparloop && sum_dvm)
-              //   elin = sum_dvm;
-      elin = coef_ref(ar,0,erec);
-    else       
-      elin = coef_ref(ar,n+2,erec);                                    //   Header(n+1)   
-    e = ToInt(el->lhs());
-    if (for_kernel && options.isOn(AUTO_TFM))   /*ACC*/
-      e = &(*coef_ref(ar,n+1,erec) * (*e));                            //  + Header(n)*I1  for loop Cuda-kernel
-                                                                       // or
-    elin = elin ? &(*elin + *e) : e;                                   //  + I1  
-    j =  n ;
-    for(e=el->rhs(); e && j; e=e->rhs(),j--) {
-      if(j>=2) //there is coef_ref(ar,j)
-        elin = &(*elin + (*coef_ref(ar,j,erec) * (*ToInt(e->lhs())))); //  + Header(n-k+1)*Ik
-    }
-     
-    if(ACROSS_MOD_IN_KERNEL && (e=analyzeArrayIndxs(ar,el)))   /*ACC*/
-      elin = &(*elin + *e); 
- 
-    if(n && j != 1)
-        Error("Wrong number of subscripts specified for '%s'", ar->identifier(),175,cur_st);
-    return(elin);
-}
-
-SgExpression *LinearFormB (SgSymbol *ar, int ihead, int n,  SgExpression *el)
-{
-  int j;
-  SgExpression *elin,*e;
-// el - subscript list (I1,I2,...In), n - rank of array (ar)
-// generating                         
-// [Header(n) +]
-//                               n   
-//         Header(n+1) +  I1 + SUMMA(Header(n-k+1) * Ik)
-//                              k=2
-// Header(0:n+1) - distributed array descriptor
-    if(n == 0)
-      return( header_rf(ar,ihead,2) ); //Header(1) 
-    if(!el)      // there aren't any subscripts     
-      return( header_rf(ar,ihead,n+1) ); //Header(n)
- 
-    elin = header_rf(ar,ihead,n+2);                                    //    Header(n+1)
-    e = ToInt(el->lhs());
-    elin = &(*elin + *e);                                              //  + I1
-    j =  n ;
-    for(e=el->rhs(); e && j; e=e->rhs(),j--)
-      elin = &(*elin + (*header_rf(ar,ihead,j) * (*ToInt(e->lhs()))));//+ Header(n-k+1)*Ik
-  
-    return(elin);
-}
-/*
-SgExpression *LinearFormB (SgSymbol *ar, int ihead, int n,  SgExpression *el)
-{
-  int j;
-  SgExpression *elin,*e;
-// el - subscript list (I1,I2,...In), n - rank of array (ar)
-// generating                         
-// [Header(n) +]
-//                               n   
-//         Header(n+1) +  I1 + SUMMA(Header(n-k+1) * Ik)
-//                              k=2
-// Header(0:n+1) - distributed array descriptor
-
-    if(n == 0)
-      return( header_rf(ar,ihead,2) ); //Header(1) 
-    if(!el)      // there aren't any subscripts     
-      return( header_rf(ar,ihead,n+1) ); //Header(n)
-    if(IN_COMPUTE_REGION)         //ACC
-      elin = for_kernel ? NULL : coef_ref(ar,n+2); //ACC
-    else                                                           //    Header(n+1)
-      elin = header_rf(ar,ihead,n+2);             
-    e = el->lhs();
-    elin = elin ? &(*elin + *e) : e;                               //  + I1
-    j =  n ;
-    for(e=el->rhs(); e && j; e=e->rhs(),j--)
-      if(IN_COMPUTE_REGION)     //ACC
-         elin = &(*elin + (*coef_ref(ar,j) * (*e->lhs())));        
-      else                                                          //+ Header(n-k+1)*Ik
-         elin = &(*elin + (*header_rf(ar,ihead,j) * (*e->lhs()))); 
-  
-    return(elin);
-}
-*/
-
-SgExpression *LinearFormB_for_ComputeRegion (SgSymbol *ar, int n,  SgExpression *el)
-{ /*ACC*/
-  int j;
-  SgExpression *elin,*e;
-
-// el - subscript list (I1,I2,...In), n - rank of remote access buffer (ar)
-// generating                         
-// [Header(n) +]
-//                               n   
-//         Header(n+1) +  I1 + SUMMA(Header(n-k+1) * Ik)
-//                              k=2
-// Header(0:n+1) - distributed array descriptor
-//
-// for CUDA-kernel
-//                               n   
-//                             SUMMA(Header(n-k+1) * Ik)
-//                              k=1
-
-    if(n == 0)
-    { if(for_kernel )   /*ACC*/
-        return( new SgValueExp(0) );                               // 0     
-      else
-        return( coef_ref(ar,2) );                                  // Header(1) - offset
-    }
-
-    if(!el)      // there aren't any subscripts     
-      return( coef_ref(ar,n+1) ); //Header(n)
-   
-    elin = for_kernel ? NULL : coef_ref(ar,n+2);                   //    Header(n+1)
-    e = ToInt(el->lhs());
-    if (for_kernel && options.isOn(AUTO_TFM))     /*ACC*/
-      e = &(*coef_ref(ar,n+1) * (*e));                             //    Header(n)*I1  for loop Cuda-kernel
-                                                                   // or
-    elin = elin ? &(*elin + *e) : e;                               //  [+] I1
-    j =  n ;
-    for(e=el->rhs(); e && j; e=e->rhs(),j--)
-        elin = &(*elin + (*coef_ref(ar,j) * (*ToInt(e->lhs()))));  // +  Header(n-k+1)*Ik
-
-    if(ACROSS_MOD_IN_KERNEL && (e=analyzeArrayIndxs(ar,el)))    /*ACC*/
-      elin = &(*elin + *e);  
-  
-    return(elin);
-}
-
-
-SgExpression * head_ref (SgSymbol *ar, int n) {
-// creates array header reference 
-       SgValueExp *index = new SgValueExp(n);
-       if(ar->thesymb->entry.var_decl.local == IO)  // is dummy argument
-          return( new SgArrayRefExp(*ar, *new SgValueExp(1)));
-       else 
-          return( new SgArrayRefExp(*dvmbuf, *index));
-}
-
-SgExpression * header_section (SgSymbol *ar, int n1, int n2) {      
-       return(new SgArrayRefExp(*ar, *new SgExpression(DDOT, new SgValueExp(n1), new SgValueExp(n2))));
-}
-
-SgExpression * header_ref (SgSymbol *ar, int n) {
-// creates array header reference: Header(n-1) 
-// Header(0:n+1) - distributed array descriptor
-      // int ind; 
-       return( new SgArrayRefExp(*ar, *new SgValueExp(n)));
-    /*
-       if(!HEADER(ar))
-           return(NULL);
-       ind = INDEX(ar);
-       if(ind==1) //is not template
-          return( new SgArrayRefExp(*ar, *new SgValueExp(n)));
-       else
-          return( new SgArrayRefExp(*dvmbuf, *new SgValueExp(ind+n-1)));
-
-    */
-}
-
-SgExpression * header_section_in_structure (SgSymbol *ar, int n1, int n2, SgExpression *struct_) {
-// creates  reference of header section
-
-  SgExpression *estr;
-       estr = &(struct_->copy());
-       estr->setRhs(new SgArrayRefExp(*ar, *new SgExpression(DDOT, new SgValueExp(n1), new SgValueExp(n2))));
-       return(estr);
-}
-
-SgExpression * header_ref_in_structure (SgSymbol *ar, int n, SgExpression *struct_) {
-// creates array header reference: Header(n-1) 
-// Header(0:n+1) - distributed array descriptor
-  SgExpression *estr;
-       estr = &(struct_->copy());
-       estr->setRhs(new SgArrayRefExp(*ar, *new SgValueExp(n)));
-       return(estr);
-       //return( new SgArrayRefExp(*ar, *new SgValueExp(n)));
-}
-
-coeffs *DvmArrayCoefficients(SgSymbol *ar)
-{
-     if(!ar->attributeValue(0,ARRAY_COEF))  //BY USE
-     {
-        coeffs *c_new = new coeffs;
-        CreateCoeffs(c_new,ar);
-        ar->addAttribute(ARRAY_COEF, (void*) c_new, sizeof(coeffs));
-     }
-     return (coeffs *) ar->attributeValue(0,ARRAY_COEF); 
-}
-
-SgExpression * coef_ref (SgSymbol *ar, int n) {
-// creates cofficient for dvm-array addressing
-//array header reference Header(n)  or its copy reference
-// Header(0:n+1) - distributed array descriptor
-  if(inparloop && !HPF_program || for_kernel) { /*ACC*/
-     coeffs * scoef;
-     scoef = AR_COEFFICIENTS(ar); //(coeffs *) ar->attributeValue(0,ARRAY_COEF);
-     dvm_ar= AddNewToSymbList(dvm_ar,ar);
-     scoef->use = 1;
-     return (new SgVarRefExp(*(scoef->sc[n]))); //!!!must be 2<= n <=Rank(ar)+2
-     
-  } else    
-     return( new SgArrayRefExp(*ar, *new SgValueExp(n)));
-}
-
-SgExpression * coef_ref (SgSymbol *ar, int n, SgExpression *erec) {
-// creates cofficient for dvm-array addressing
-//array header reference Header(n)  or its copy reference
-// Header(0:n+1) - distributed array descriptor
-  if(erec) {
-     SgExpression *e = new SgExpression(RECORD_REF);
-     e->setLhs(erec);
-     e->setRhs( new SgArrayRefExp(*ar, *new SgValueExp(n)));
-     return( e );
-  }
-  if(inparloop && !HPF_program || for_kernel) { /*ACC*/
-     coeffs * scoef;
-     scoef = AR_COEFFICIENTS(ar); //(coeffs *) ar->attributeValue(0,ARRAY_COEF);
-     dvm_ar= AddNewToSymbList(dvm_ar,ar);
-     scoef->use = 1;
-     return (new SgVarRefExp(*(scoef->sc[n]))); //!!!must be 2<= n <=Rank(ar)+2
-     
-  } else    
-     return( new SgArrayRefExp(*ar, *new SgValueExp(n)));
-}
-
-SgExpression * header_rf (SgSymbol *ar, int ihead, int n) {
-// creates array header reference: Header(n-1) 
-// Header(0:r+1) - distributed array descriptor
-       //int ind; 
-       if(!ar)
-          return( new SgArrayRefExp(*dvmbuf, *new SgValueExp(ihead+n-1)));
-       else //(may be hpfbuf in HPF_program)
-          return( new SgArrayRefExp(*ar, *new SgValueExp(ihead+n-1)));
- 
-       //if(!HEADER(ar))
-         // return(NULL);
-       //ind = INDEX(ar);
-       //if(ind==1) //is not template
-         // return( new SgArrayRefExp(*ar, *new SgValueExp(n)));
-       //else
-         // return( new SgArrayRefExp(*dvmbuf, *new SgValueExp(ind+n-1)));
-}
-
-SgExpression * acc_header_rf (SgSymbol *ar, int ihead, int n) {
-// creates array header reference: Header(n-1) 
-// Header(0:r+1) - distributed array descriptor
-        
-       if(!ar)
-          return( new SgArrayRefExp(*dvmbuf, *new SgValueExp(ihead+n-1)));
-       else //(may be hpfbuf in HPF_program)
-          return( new SgArrayRefExp(*ar, *new SgValueExp(ihead+n-1)));
- 
-}
-
-
-SgExpression * HeaderRef (SgSymbol *ar) {
-// creates array header reference 
-       int ind; 
-       if(!HEADER(ar))
-           return(NULL);
-       ind = INDEX(ar);
-       if (ind == 0)   // is pointer
-          return(PointerHeaderRef(new SgVarRefExp(ar),1));
-       else ///if(ind<=1 || INTERFACE_RTS2) //is not template or interface of RTS2
-         return( new SgArrayRefExp(*ar, *new SgValueExp(1)) ); /*10.03.03*/
-          /*return( new SgArrayRefExp(*ar)); */
-       ///else            //is template in RTS1
-       ///  return( new SgVarRefExp(*ar) );
-	 //return( new SgArrayRefExp(*dvmbuf, *new SgValueExp(ind)));
-}
-
-SgExpression *HeaderRefInd(SgSymbol *ar, int n) {
-       int ind;
-       if(!HEADER(ar))
-         return (NULL);
-       ind = INDEX(ar);
-       if (ind == 0)   // is pointer
-         return(PointerHeaderRef(new SgVarRefExp(ar),n));
-       else if(ind<=1) //is not template
-         return(new SgArrayRefExp(*ar, *new SgValueExp(n)));
-       else            //is template
-         return(new SgArrayRefExp(*dvmbuf, *new SgValueExp(ind+n-1)));
-}
-
-/*
-SgExpression * DistObjectRef (SgSymbol *ar) {
-//!!! temporary
-// creates distributed object  reference
- int ind;
- ind = INDEX(ar);
- return(head_ref(ar,ind));
-}
-*/
-
-SgExpression *HeaderNplus1(SgSymbol * ar)   
-{
-//                                   n
-// Header(n+1) = Header(n) -  L1 - SUMMA(Header(n-i+1) * Li)
-//                                  i=2   
-  SgArrayType *artype;
-  SgExpression *ehead,*e;
-  SgSubscriptExp *sbe;
-  int i,n,ind;
-
-  if(IS_POINTER(ar)){
-    // Li=1, i=1,n
-    ind = n = PointerRank(ar);
-    ehead =  &(*header_ref(ar,ind+1) - (*new SgValueExp(1)));
-    for(; ind>=2; ind--)
-       ehead = & (*ehead - (*header_ref(ar,ind)));  
-    return(ehead);
-  }
-     
-  artype = isSgArrayType(ar->type());
-  if(!artype) // error
-    return(new SgValueExp(0)); //  for continuing translation of procedure 
-  n=artype->dimension();
-  if(!n) // error
-    return(new SgValueExp(0)); //  for continuing translation of procedure 
-  ind = n;
-  ehead = &(*header_ref(ar,ind+1) -  LowerBound(ar,0)->copy());
-  for(i=2; i<=n; i++,ind--) {
-     e = artype->sizeInDim(i-1);
-     if((sbe=isSgSubscriptExp(e)) != NULL)
-       ehead = & (*ehead - (*header_ref(ar,ind) *
-                                                (sbe->lbound()->copy())));
-     else
-        ehead = & (*ehead - (*header_ref(ar,ind))); // by default Li=1
-  }
-      //ehead =  & SgUMinusOp(*ehead);
-  return(ehead);
-}
-/*
-SgExpression *BufferHeaderNplus1(SgExpression * rme, int n, int ihead)   
-{
-//                                   n
-// Header(n+1) = Header(n) -  L1 - SUMMA(Header(n-i+1) * Li)
-//                                  i=2   
-  SgArrayType *artype;
-  SgExpression *ehead,*e,*el;
-  // SgSubscriptExp *sbe;
-  SgSymbol *ar;
-  int i,ind;
-   ar = rme->symbol();
-  if(!(ar->attributes() & DIMENSION_BIT)){// for continuing translation
-      return (new SgValueExp(0));
-  }
-   artype = isSgArrayType(ar->type());
-   if(!artype) // error
-     return(new SgValueExp(0)); //  for continuing translation of procedure 
-
-  ind = n;
-  i=0;
-  for (el=rme->lhs(); el; el=el->rhs()) //looking through the index list until first ':'element
-    if(el->lhs()->variant() == DDOT)
-      break;
-    else
-      i++; 
- if(!(e=LowerBound(ar,i)))
-    return(new SgValueExp(0)); //  for continuing translation of procedure  
- else
-  ehead = &(* DVM000(ihead+ind) -  e->copy());
-  
- for (el=el->rhs(),i++; el; el=el->rhs(),i++) //continue looking through the index list
-   if(el->lhs()->variant() == DDOT) {
-     ind--;
-     e = artype->sizeInDim(i);
-     if(e && e->variant() == DDOT && e->lhs())
-       ehead = & (*ehead - (*DVM000(ihead+ind) *
-                                                (e->lhs()->copy())));
-     else
-        ehead = & (*ehead - (*DVM000(ihead+ind))); // by default Li=1
-   }
-
-  return(ehead);
-}
-*/
-
-SgExpression *BufferHeaderNplus1(SgExpression * rme, int n, int ihead,SgSymbol *ar)   
-{
-//                                      n
-// Header(n+1) = Header(n) -  L1*S1 - SUMMA(Header(n-i+1) * Li * Si)
-//                                     i=2   
-// Si = 1, if i-th remote subscript is ':', else Si = 0 
-// Li = lower bound of i-th array dimension if ':',  Li = Header(2*n-i+3) - minimum of
-// of lower bound and upper bound of corresponding do-variable,if a*i+b 
-  SgArrayType *artype;
-  SgExpression *ehead,*e,*el;
- 
-  SgSymbol *array;
-  int i,ind,j;
-  array = rme->symbol();
-  if(!(array->attributes() & DIMENSION_BIT)){// for continuing translation
-      return (new SgValueExp(0));
-  }
-   artype = isSgArrayType(array->type());
-   if(!artype) // error
-     return(new SgValueExp(0)); //  for continuing translation of procedure 
-
-  ind = n+1; 
-  ehead =  header_rf(ar,ihead,ind);
-
-  if(!rme->lhs()) {  // buffer is equal to whole array
-    ehead = &(*ehead -  *Exprn(LowerBound(array,0)));
-    for(i=1,ind=n;ind>1;ind--,i++){
-       e = artype->sizeInDim(i);
-       if(e && e->variant() == DDOT && e->lhs())
-         ehead = & (*ehead - (*header_rf(ar,ihead,ind) *
-                                                  (LowerBound(array,i)->copy())));
-       else
-         ehead = & (*ehead - (*header_rf(ar,ihead,ind))); // by default Li=1
-    }
-    return(ehead);
-  }
-
-  i=0; j=0;
-  for (el=rme->lhs(); el; el=el->rhs()) //looking through the index list until first ':' or do-variable-use element
-    if((el->lhs()->variant() == DDOT) || IS_DO_VARIABLE_USE(el->lhs()))
-      {j = 1; break;}
-    else
-      i++; 
- if(j == 0) //buffer is of one element
-   return(ehead);  
- if( el->lhs()->variant() == DDOT)// :
-  if(!(e=LowerBound(array,i)))
-    return(new SgValueExp(0)); //  for continuing translation of procedure  
-  else
-    ehead = &(*ehead -  e->copy());
- else //a*i+b
-    ehead = &(*ehead -  (*header_rf(ar,ihead,ind+n+1)));
- for (el=el->rhs(),i++; el; el=el->rhs(),i++) //continue looking through the index list
-   if(el->lhs()->variant() == DDOT)  {
-       ind--; 
-       e = artype->sizeInDim(i);
-       if(e && e->variant() == DDOT && e->lhs())
-         ehead = & (*ehead - (*header_rf(ar,ihead,ind) *
-                                                  (LowerBound(array,i)->copy())));
-       else
-         ehead = & (*ehead - (*header_rf(ar,ihead,ind))); // by default Li=1
-   }
-   else if( IS_DO_VARIABLE_USE(el->lhs())){
-       ind--; 
-       ehead = & (*ehead - (*header_rf(ar,ihead,ind) * (*header_rf(ar,ihead,ind+n+1))));
-   }
-  return(ehead);
-}
-
-
-
-SgExpression *BufferHeader4(SgExpression * rme, int ihead) 
-{//temporary
- if(rme)
-   return(DVM000(ihead+2));
- else
-   return(NULL);
-}
-
-SgExpression *LowerBound(SgSymbol *ar, int i)
-// lower bound of i-nd dimension of array ar (i= 0,...,Rank(ar)-1)
-{
-  SgArrayType *artype;
-  SgExpression *e;
-  SgSubscriptExp *sbe;
-  if(IS_POINTER(ar))
-    return(new SgValueExp(1));
-  artype = isSgArrayType(ar->type());
-  if(!artype)
-    return(NULL);
-  e = artype->sizeInDim(i);
-  if(!e) 
-    return(NULL);
-  if((sbe=isSgSubscriptExp(e)) != NULL) {
-    if(sbe->lbound())
-      return(IS_BY_USE(ar) ? Calculate(sbe->lbound()) : sbe->lbound());
-    else if(IS_ALLOCATABLE_POINTER(ar) || IS_TEMPLATE(ar)) {       
-      if(HEADER(ar))
-        return(header_ref(ar,Rank(ar)+3+i));
-      else
-        return(LBOUNDFunction(ar,i+1));
-    }
-    else
-      return(new SgValueExp(1)); 
-  }
-  else
-    return(new SgValueExp(1));  // by default lower bound = 1      
-}         
-
-SgExpression *UpperBound(SgSymbol *ar, int i)
-// upper bound of i-nd dimension of array ar (i= 0,...,Rank(ar)-1)
-{
-  SgArrayType *artype;
-  SgExpression *e;
-  SgSubscriptExp *sbe;
-  int ri;   //06.11.09
-  ri = Rank(ar) - i;
-  if(IS_POINTER(ar))
-    return(GetSize(HeaderRefInd(ar,1), ri)); //i+1));  6.11.09
-  artype = isSgArrayType(ar->type());
-  if(!artype)
-    return(NULL);
-  e = artype->sizeInDim(i);
-  if(!e) 
-    return(NULL);
-  if((sbe=isSgSubscriptExp(e)) != NULL){
-    if(sbe->ubound())
-      return(IS_BY_USE(ar) ? Calculate(sbe->ubound()) : sbe->ubound());
-    else if(HEADER(ar))
-              //return(&(*GetSize(HeaderRefInd(ar,1),i+1)-*HeaderRefInd(ar,Rank(ar)+3+i)+*new SgValueExp(1))); 06.11.09
-      return(&(*GetSize(HeaderRefInd(ar,1),ri)+*HeaderRefInd(ar,Rank(ar)+3+i)-*new SgValueExp(1)));
-    else
-      return(UBOUNDFunction(ar,i+1));
-  }
-  else
-    return(e);  
-// !!!! test case "*"
-}     
-
-void ShadowList (SgExpression *el, SgStatement *st, SgExpression *gref)
-{
-  int corner;
-  int  ileft,iright;
-  //int ibsize = 0;
-  SgExpression *es, *ear, *head, *shlist[1]; 
-  SgSymbol *ar;
-  // looking through the array_with_shadow_list
-  for(es = el; es; es = es->rhs()) {
-     ear = es->lhs(); // array_with_shadow (variant:ARRAY_REF or ARRAY_OP)
-     if(ear->variant() == ARRAY_OP) {
-        corner = 1;
-        ear = ear->lhs();   
-     }
-     else
-        corner = 0;
-     ar = ear->symbol();
-     if(HEADER(ar))
-       head = HeaderRef(ar);
-     else {
-       Error("'%s' isn't distributed array", ar->identifier(),72, st);
-       return;
-     }
-     if(gref)  //interface of RTS1
-     {
-        if(ear->lhs()){
-           ileft = ndvm;  
-           iright = doShadSizeArrays(ear->lhs(), ear->symbol(), st, NULL);
-        } else
-            ileft=iright= doShadSizeArrayM1(ar,NULL);
- 
-        doCallAfter(InsertArrayBound(gref, head, ileft, iright, corner));
-         
-     } else  //interface of RTS2
-     {
-        if(ear->lhs()) 
-        { 
-           doShadSizeArrays(ear->lhs(), ear->symbol(), st, shlist);
-           if(*shlist)
-             doCallAfter(ShadowRenew_H2(head,corner,Rank(ar),*shlist));   
-           //doCallAfter(ShadowRenew_H2(Register_Array_H2(head),corner,Rank(ar),*shlist));   
-        }
-        else
-           doCallAfter(ShadowRenew_H2(head,corner,0,NULL));  
-           //doCallAfter(ShadowRenew_H2(Register_Array_H2(head),corner,0,NULL));          
-     }
-  }
-}
-
-int doShadSizeArrayM1(SgSymbol *ar, SgExpression **shlist)
-{
- int n,i;
- int ileft;
- n = Rank(ar);
- if(!shlist)
- { 
-    ileft = ndvm;
-    for(i=0; i<n; i++)
-       doAssignStmtAfter(new SgValueExp(-1));  
-    return(ileft);
- }
- *shlist = NULL;
- for(i=0; i<2*n; i++)
-    *shlist = AddListToList(*shlist,new SgExprListExp(*ConstRef_F95(-1)));
-// *shlist = AddListToList(*shlist,&(*shlist)->copy());
- return (0); 
-}
-  
-int doShadSizeArrays(SgExpression *shl, SgSymbol *ar, SgStatement *st, SgExpression **shlist) 
-{
- int rank,nw;
- int i=0,iright=0,j=0;
- SgExpression *wl,*ew,*lbound[MAX_DIMS], *ubound[MAX_DIMS];
- rank = Rank(ar);
- if(!TestMaxDims(shl,ar,st)) 
-     return (0);
- for(wl = shl; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     if(ew->variant() == SHADOW_NAMES_OP) {
-       lbound[i] = new SgValueExp(0); 
-       ubound[i] = new SgValueExp(0);
-       j++;
-       if(!shlist)  //interface of RTS1
-         Error("Illegal shadow width specification of array '%s'", ar->identifier(), 56, st); 
-       else        //interface of RTS2 
-         ShadowNames(ar,rank-i,ew->lhs());               
-     }
-     else if(ew->variant() == DDOT) {
-       lbound[i] = &(ew->lhs())->copy();//left bound 
-       ubound[i] = &(ew->rhs())->copy();//right bound 
-     } else {
-       lbound[i] = &(ew->copy());//left bound == right bound
-       ubound[i] = &(ew->copy());
-     }
- }
-  nw = i; 
-  TestShadowWidths(ar, lbound, ubound, nw, st);
-  if (nw != rank) {// wrong shadow width list length
-     Error("Length of shadow-edge-list is not equal to the rank of array '%s'", ar->identifier(), 88, st); 
-     return(0);
-  }
-  if(shlist && j==i)  //interface of RTS2 
-  {
-    *shlist = NULL;
-    return(0);
-  }
-  if(!shlist) //interface of RTS1 
-  {
-     for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(lbound[i]);
-     iright = ndvm;
-     for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(ubound[i]);      
-  } else     //interface of RTS2
-  {
-     *shlist = NULL; 
-     for(i=rank-1;i>=0; i--)
-     { 
-        *shlist = AddListToList(*shlist,new SgExprListExp(*DvmType_Ref(lbound[i])) );
-        *shlist = AddListToList(*shlist,new SgExprListExp(*DvmType_Ref(ubound[i])) );
-     }
-  }
-  return(iright);
-}
-
-void ShadowNames(SgSymbol *ar, int axis, SgExpression *shadow_name_list)
-{
- SgExpression *nml;
- SgExpression *head=HeaderRef(ar);
- if(!head) return;
- for(nml = shadow_name_list; nml; nml = nml->rhs())   
-   doCallAfter(IndirectShadowRenew(head,axis,nml->lhs()));
-}
-
-void TestShadowWidths(SgSymbol *ar, SgExpression * lbound[], SgExpression * ubound[], int nw, SgStatement *st)
-  //compare shadow widths with that specified for array 'ar' in SHADOW directive
-  // or SHADOW attribute of combined directive
-{SgExpression *lw[MAX_DIMS], *uw[MAX_DIMS],**pe,*wl,*ew;
- int i,n;
- pe=SHADOW_(ar);
- if(pe){ //distributed array has SHADOW attribute
- //looking through the shadow width list of SHADOW directive/attribute 
-   if(!TestMaxDims(*pe,ar,0)) return;
-   for(wl = *pe, i=0; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     if(ew->variant() == DDOT){
-       lw[i] = ew->lhs();//left bound 
-       uw[i] = ew->rhs();//right bound 
-     }
-     else {
-       lw[i] = ew;//left bound == right bound
-       uw[i] = ew;
-     }
-   }
-   n = i;
-   for(i=0; i<nw && i<n; i++){
-     if(lbound[i]->isInteger() && lw[i]->isInteger() && lbound[i]->valueInteger() > lw[i]->valueInteger() )
-       Error("Low shadow width  of  '%s' is greater than the corresponding one specified in SHADOW directive", ar->identifier(), 142,st); 
-     if(ubound[i]->isInteger() && uw[i]->isInteger() && ubound[i]->valueInteger() > uw[i]->valueInteger() )
-       Error("High shadow width  of  '%s' is greater than the corresponding one specified in SHADOW directive", ar->identifier(), 143,st); 
-   }
- }
- else  {//by default shadow width = 1
-   if(!IS_DUMMY(ar) && HEADER(ar))     
-     for(i=0; i<nw; i++){
-       if(lbound[i]->isInteger() && lbound[i]->valueInteger() > 1 )
-         Error("Low shadow width  of  '%s' is greater than 1", ar->identifier(), 144,st); 
-       if(ubound[i]->isInteger() && ubound[i]->valueInteger() > 1 )
-         Error("High shadow width  of  '%s' is greater than 1", ar->identifier(), 145,st);
-    }
- }
-} 
-
-SgExpression *DeclaredShadowWidths(SgSymbol *ar)
-{
-  SgExpression **pe,*wl,*ew, *shlist=NULL;
-  int i;
-  pe=SHADOW_(ar);
-  if(pe) //distributed array has SHADOW attribute
-  {
-     //looking through the shadow width list of SHADOW directive/attribute 
-     for(wl = *pe, i=0; wl; wl = wl->rhs(),i++) {
-        ew = wl->lhs();
-        if(ew->variant() == DDOT){
-          shlist = AddElementToList(shlist, DvmType_Ref(ew->rhs()));
-          shlist = AddElementToList(shlist, DvmType_Ref(ew->lhs()));
-        }
-        else {
-          shlist = AddElementToList(shlist, DvmType_Ref(ew));
-          shlist = AddElementToList(shlist, DvmType_Ref(ew));
-        }
-     }
-  }
-  else  //by default shadow width = 1
-  {
-     int rank = Rank(ar);
-     for (i=0; i<rank; i++) { 
-          shlist = AddElementToList(shlist, ConstRef_F95(1));
-          shlist = AddElementToList(shlist, ConstRef_F95(1));
-     }
-  }
-  return(shlist);
-} 
-
-
-void ShadowComp (SgExpression *ear, SgStatement *st, int ilh)
-{
-  int  ileft,iright;
-  SgExpression *head,*shlist[1];
-  SgSymbol *ar;
-    
-     // array_with_shadow (variant:ARRAY_REF)
-     ar = ear->symbol();
-     if(HEADER(ar))
-        head = HeaderRef(ar);
-     else {
-        Error("'%s' isn't distributed array", ar->identifier(),72, st);
-        return;
-     }
-     if(st->expr(0)->symbol() != ar){ 
-        Error("Illegal array in SHADOW_COMPUTE clause: %s", ar->identifier(),264, st);
-     }
-     if(!ilh)  //interface of RTS1
-     {
-        if(ear->lhs()){
-           ileft = ndvm;  
-           iright = doShadSizeArrays(ear->lhs(), ar, st, NULL);
-        } else
-           ileft=iright= doShadSizeArrayM1(ar, NULL);
-        doCallAfter(AddBoundShadow(head, ileft, iright));
-  
-     } else    //interface of RTS2
-        if(ear->lhs()){
-           doShadSizeArrays(ear->lhs(), ar, st, shlist);     
-           doCallAfter(ShadowCompute(ilh,head,Rank(ar),*shlist));
-           //doCallAfter(ShadowCompute(ilh,Register_Array_H2(head),Rank(ar),*shlist));
-        } else
-           doCallAfter(ShadowCompute(ilh,head,0,NULL));
-           //doCallAfter(ShadowCompute(ilh,Register_Array_H2(head),0,NULL));
-}
-
-symb_list *DerivedRhsAnalysis(SgExpression *derived_op,SgStatement *stmt, int &nd)
-{
-  SgExpression *el;
-  symb_list *dummy_list = NULL;
-  SgSymbol *s_dummy = NULL;
-  nd = 0;
-  // looking through the rhs of derived_op ( WITH target_spec )
-  for(el=derived_op->rhs()->lhs();el;el=el->rhs())
-  {
-     if(el->lhs()->variant() == DUMMY_REF) // @align-dummy[ + shadow-name ]...
-     {
-        s_dummy = el->lhs()->symbol();
-        dummy_list = AddNewToSymbList(dummy_list,s_dummy);
-        nd++;
-     }
-  }
-/*
-  if(!s_dummy)  //???
-    err("Illegal DERIVED/SHADOW_ADD specification", 629, stmt);
-*/
-  //reversing dummy_list
-  symb_list *sl = NULL;
-  for( ; dummy_list; dummy_list=dummy_list->next)
-     sl= AddNewToSymbList(sl,dummy_list->symb);
-  return (sl); //(dummy_list);
-}
-
-int is_derived_dummy(SgSymbol *s, symb_list *dummy_list)
-{
-  symb_list *sl;
-  for(sl=dummy_list; sl; sl=sl->next)
-     if(s == sl->symb)  return 1;
-  return 0;
-}
-
-symb_list *DerivedElementAnalysis(SgExpression *e, symb_list *dummy_list, symb_list *arg_list, SgStatement *stmt)
-{
-  if(!e)
-     return (arg_list);
-  if(isSgValueExp(e))
-     return (arg_list);
-
-  if(isSgVarRefExp(e) && !is_derived_dummy(e->symbol(),dummy_list) || e->variant() == CONST_REF)
-  {
-     arg_list = AddNewToSymbList(arg_list,e->symbol());
-     return (arg_list); 
-  }
-
-  if(isSgArrayRefExp(e) )  //!!! look trough the tree
-  {
-     if(HEADER(e->symbol()))
-        arg_list = AddNewToSymbList(arg_list,e->symbol());
-     else
-        Error("Illegal use of array '%s' in DERIVED/SHADOW_ADD, not implemented yet",e->symbol()->identifier(), 629, stmt);      
-     arg_list = DerivedElementAnalysis(e->lhs(), dummy_list, arg_list, stmt);
-     return (arg_list);
-  }
-  
-  arg_list = DerivedElementAnalysis(e->lhs(), dummy_list, arg_list, stmt);   
-  arg_list = DerivedElementAnalysis(e->rhs(), dummy_list, arg_list, stmt);
-  return (arg_list);   
-}
-
-symb_list *DerivedLhsAnalysis(SgExpression *derived_op, symb_list *dummy_list, SgStatement *stmt)
-{
-  SgExpression *el,*e;
-  symb_list *arg_list = NULL, *sl;
-  SgExpression *elhs = derived_op->lhs(); //derived_elem_list
-  // looking through the lhs of derived_op (derived_elem_list)
-  
-  for(el=elhs; el; el=el->rhs())
-  {
-     e = el->lhs();  // derived_elem
-     arg_list = DerivedElementAnalysis(e, dummy_list, arg_list, stmt);
-  }
-  return (arg_list);   
-}
-
-SgExpression *FillerActualArgumentList(symb_list *paramList, int &nArg)
-{
-  SgExpression *arg_expr_list = NULL;
-  symb_list *sl;
-  nArg = 0;
-  for (sl = paramList; sl; sl=sl->next)
-  { 
-     if(isSgArrayType(sl->symb->type()))
-     {  
-        if(!HEADER(sl->symb)) 
-          continue; 
-        arg_expr_list = AddListToList(arg_expr_list,new SgExprListExp(*new SgArrayRefExp(*sl->symb)));
-        arg_expr_list = AddListToList(arg_expr_list,ElementOfAddrArgumentList(sl->symb));
-        nArg+=2;
-     }
-     else
-     {
-        arg_expr_list = AddListToList(arg_expr_list,new SgExprListExp(*new SgVarRefExp(*sl->symb)));
-        nArg++;
-     }
-  }
-  return arg_expr_list;
-}
-
-void DerivedSpecification(SgExpression *edrv, SgStatement *stmt, SgExpression *eFunc[])
-{
-  int narg = 0, nd = 0;
-  symb_list *dummy_list   = DerivedRhsAnalysis(edrv,stmt,nd);
-  symb_list *paramList    = DerivedLhsAnalysis(edrv,dummy_list,stmt); 
-  SgSymbol *sf_counter    = IndirectFunctionSymbol(stmt,"counter");
-  SgSymbol *sf_filler     = IndirectFunctionSymbol(stmt,"filler");
-  SgStatement *st_counter = CreateIndirectDistributionProcedure(sf_counter, paramList, dummy_list, edrv->lhs(), 0);
-  SgStatement *st_filler  = CreateIndirectDistributionProcedure(sf_filler,  paramList, dummy_list, edrv->lhs(), 1);
-  st_counter->addComment(Indirect_ProcedureComment(stmt->lineNumber())); 
-  SgExpression *argument_list = FillerActualArgumentList(paramList,narg);  
-  eFunc[0] = HandlerFunc (sf_counter, narg, argument_list);  // counter function
-  eFunc[1] = HandlerFunc (sf_filler,  narg, argument_list ? &argument_list->copy() : NULL); // filler function
-  return;
-}
-
-void Shadow_Add_Directive(SgStatement *stmt)
-{
-  int n,iaxis;
-  SgExpression *el,*edrv;
-  for (el=stmt->expr(2),n=0; el; el=el->rhs(),n++)
-     ; //el->setLhs(HeaderRef(el->lhs()->symbol()));HederRef() for each element of el->lhs()
-  int rank = Rank(stmt->expr(0)->symbol());
-  for (el=stmt->expr(0)->lhs(),iaxis=rank; el; el=el->rhs(),iaxis--)
-     if(el->lhs()->variant()==DERIVED_OP) 
-     { 
-        edrv = el->lhs();    
-        break;
-     }
-  SgExpression *eFunc[2];
-  DerivedSpecification(edrv, stmt, eFunc);
-  doCallAfter(ShadowAdd(HeaderRef(stmt->expr(0)->symbol()),iaxis,DvmhDerivedRhs(edrv->rhs()),eFunc[0],eFunc[1],stmt->expr(1),n,stmt->expr(2)));
-  return;
-} 
-
-int doAlignIteration(SgStatement *stat, SgExpression *aref)
-{
-  SgExpression *axis[MAX_LOOP_LEVEL],
-               *coef[MAX_LOOP_LEVEL],
-               *cons[MAX_LOOP_LEVEL];
-  int i;
-  int nt = Alignment(stat,aref,axis,coef,cons,0);
-  // setting on arrays
-  for(i=nt-1; i>=0; i--)
-     doAssignStmtAfter(axis[i]);
-  for(i=nt-1; i>=0; i--)
-     doAssignStmtAfter(ReplaceFuncCall(coef[i]));
-  for(i=nt-1; i>=0; i--)
-     doAssignStmtAfter(Calculate(cons[i]));
-  return(nt);   
-}
-
-int Alignment(SgStatement *stat, SgExpression *aref, SgExpression *axis[], SgExpression *coef[], SgExpression *cons[],int interface)
-// creating axis_array, coeff_array and  const_array 
-// returns the number of elements in align_iteration_list
-
-{ int i,ni,nt,num, use[MAX_LOOP_LEVEL];
-  SgExpression * el,*e,*ei,*elbb, *es;
-  SgSymbol *l_var[MAX_LOOP_LEVEL], *ar;
-  SgValueExp c1(1),c0(0),cM1(-1);
-  
- 
-  ni = 0; //counter of elements in loop_control_variable_list
-  //looking through the loop_control_variable_list 
-  for(el=stat->expr(2); el; el=el->rhs())   {
-       l_var[ni] = (el->lhs())->symbol(); 
-       use[ni] = 0;
-       ni++;
-  }
-  es = aref ? aref : stat->expr(0);
-  ar = es->symbol();    // array  
-   
-  //looking through the align_iteration_list 
-  nt = 0;          //counter of elements in align_iteration_list
-  for(el=es->lhs(); el; el=el->rhs())   {
-     e = el->lhs();  //subscript expression
-     if(e->variant()==KEYWORD_VAL || e->variant()==DDOT) {  // "*" or ":"
-       axis[nt] = & cM1.copy();
-       coef[nt] = & c0.copy();
-       cons[nt] = & c0.copy();   
-     }
-     
-     else  {  // expression
-       num = AxisNumOfDummyInExpr(e, l_var, ni, &ei, use, stat);
-       //printf("\nnum = %d\n", num);
-       if (num<=0)   {
-         axis[nt] = & c0.copy();
-         coef[nt] = & c0.copy();
-         cons[nt] = & (e->copy()); 
-         if((elbb = LowerBound(ar,nt)) != NULL && interface != 2)
-           cons[nt] = & (*cons[nt] - (elbb->copy()));
-                        // correcting const with lower bound of array, if interface != 2
-       }                
-       else {
-         axis[nt] = new SgValueExp(num); 
-         CoeffConst(e, ei, &coef[nt], &cons[nt]); 
-         if(interface != 2)
-           TestReverse(coef[nt],stat);     
-         if(!coef[nt]){
-           err("Wrong iteration-align-subscript in PARALLEL", 160,stat);
-           coef[nt] = & c0.copy();
-           cons[nt] = & c0.copy();
-         }  
-         else 
-         // correcting const with lower bound of array, if interface != 2
-           if((elbb = LowerBound(ar,nt)) != NULL  && interface != 2 )
-             cons[nt] = &(*cons[nt]  - (elbb->copy()));
-       }       
-     }
-       
-     nt++;
-  }
-  
-  if(Rank(ar) &&  Rank(ar) != nt) 
-    Error("Rank of array '%s' isn't equal to the length of iteration-align-subscript-list", ar->identifier(), 161,stat);
-
-  return(nt);  
-}
-
-int DefineLoopNumberForDimension(SgStatement * stat, SgExpression *ear, int loop_num[])
-{ int ni,nt,num,i, use[MAX_LOOP_LEVEL];
-  SgExpression * el,*e,*ei;
-  SgSymbol *l_var[MAX_LOOP_LEVEL], *ar;
-  if(!ear) return 0;
-  for(i=MAX_DIMS-1; i; i--)
-     loop_num[i] = 0; 
-  ni = 0; //counter of elements in loop_control_variable_list
-  //looking through the loop_control_variable_list 
-  for(el=stat->expr(2); el; el=el->rhs())   {
-       l_var[ni] = (el->lhs())->symbol(); 
-       use[ni] = 0;
-       ni++;
-  }
-                  //ar = stat->expr(0)->symbol();    // array  
-  ar = ear->symbol(); // array  
-  //looking through the align_iteration_list 
-  nt = 0;          //counter of elements in align_iteration_list
-  for(el=ear->lhs(); el; el=el->rhs())   {
-     e = el->lhs();  //subscript expression
-     if(e->variant()==KEYWORD_VAL) {  // "*"
-       loop_num[nt] = 0; // -1;
-
-  }
-     
-     else  {  // expression
-       num = AxisNumOfDummyInExpr(e, l_var, ni, &ei, use, stat);
-       //printf("\nnum = %d\n", num);
-       if (num<=0)   
-         loop_num[nt] = 0;
-       else 
-         loop_num[nt] = num;      
-     }
-       
-     nt++;
-  }
-  
- 
-  return(nt);  
-}
-
-int RedFuncNumber(SgExpression *kwe)
-{
-  char *red_name;
-  //PTR_LLND thellnd;
-  red_name   = ((SgKeywordValExp *) kwe)->value();
-//  red_name  = NODE_STRING_POINTER(kwe->thellnd);
-  if(!strcmp(red_name, "sum"))
-    return(1);
-  if(!strcmp(red_name, "product"))
-    return(2);
-  if(!strcmp(red_name, "max"))
-    return(3);
-  if(!strcmp(red_name, "min"))
-    return(4);
-  if(!strcmp(red_name, "and"))
-    return(5);
-  if(!strcmp(red_name, "or"))
-    return(6);
-  if(!strcmp(red_name, "neqv"))
-    return(7);
-  if(!strcmp(red_name, "eqv"))
-    return(8);
-  if(!strcmp(red_name, "maxloc"))
-    return(9);
-  if(!strcmp(red_name, "minloc"))
-    return(10);
-
-  return(0);
-}
-
-int RedFuncNumber_2(int num)
-{  //MAXLOC: 9=>11, MINLOC: 10=>12
-  return(num>8 ? num+2 : num);
-}
-
-int VarType_RTS(SgSymbol *var)
-{int t;
- t=TestType(var->type());
- if(t==7) //LOGICAL
-   t=(bind_==0) ? 2 : 1;  //there is not LOGICAL type in RTS
- return(t);  
-}
-
-int VarType(SgSymbol *var)
-{ if(IS_POINTER_F90(var) )
-     return(0);
-  else
-     return (TestType(var->type())); 
-}
-
-int TestType_DVMH(SgType *type)
-{ 
-  if(!type)
-    return(-1);
-  
-  SgArrayType *artype = isSgArrayType(type);
-  if(artype)
-    type = artype->baseType();
-  switch(type->variant()) 
-  {
-        case T_BOOL:     
-        case T_INT:        return(1);
-                        
-  
-        case T_FLOAT:    
-        case T_DOUBLE:     return(3);
-                        
-
-        case T_COMPLEX:  
-        case T_DCOMPLEX:   return(5);
-                       
-
-        default:           return(-1);
-  }
-
-}
-
-int TestType_RTS(SgType *type)
-{ int t;
- t=TestType(type);
- if(t==7) //LOGICAL
-   t=(bind_==0) ? 2 : 1;  //there is not LOGICAL type in RTS
-  return (t);
-}
-
-int TestType(SgType *type)
-{ int len;
-  SgArrayType *artype;
-
-  if(!type)
-    return(0);
-  
-  artype=isSgArrayType(type);
-  if(artype)
-    type = artype->baseType();
-  len = TypeSize(type); /*16.04.04*/
-      //len = IS_INTRINSIC_TYPE(type) ? 0 : TypeSize(type);
-      //len = (TYPE_RANGES(type->thetype)) ? type->length()->valueInteger() : 0; 14.03.03
-  if(bind_ == 0)
-  switch(type->variant()) {
-        case T_BOOL:    if     (len == 4) return(7); /*14.11.06 type LOGICAL was introduced in debuger*/
-                        else              return(0); 
-
-        case T_INT:     if     (len == 4) return(1); /*3.11.06  2 => 1 */
-                        else              return(0);
-  
-        case T_FLOAT:   if     (len == 8) return(4);
-                        else if(len == 4) return(3);
-                        else              return(0);
- 
-        case T_DOUBLE:  if     (len == 8) return(4);
-                        else              return(0); 
-
-        case T_COMPLEX: if     (len ==16) return(6);
-                        else if(len == 8) return(5);
-                        else              return(0);
- 
-        case T_DCOMPLEX:if     (len ==16) return(6);
-                        else   return(0);
-
-        default:        return(0);
-  }
-  if(bind_ == 1)
-  switch(type->variant()) {
-        case T_BOOL:    if     (len == 8) return(2);
-                        else if(len == 4) return(7); /*14.11.06 type LOGICAL was introduced in debuger*/ 
-                        else              return(0); 
-        case T_INT:     if     (len == 8) return(2);
-                        else if(len == 4) return(1);
-                        else              return(0);  
-        case T_FLOAT:   if     (len == 8) return(4);
-                        else if(len == 4) return(3);
-                        else              return(0); 
-        case T_DOUBLE:  if     (len == 8) return(4);
-                        else              return(0); 
-
-        case T_COMPLEX: if     (len ==16) return(6);
-                        else if(len == 8) return(5);
-                        else              return(0); 
-        case T_DCOMPLEX:if     (len ==16) return(6);
-                        else   return(0);
-        default:        return(0);
-  }
-  return(0);
-}
-
-/*RTS2*/
-#define rt_UNKNOWN (-1)
-#define rt_CHAR 0
-#define rt_INT 1
-#define rt_LONG 2
-#define rt_FLOAT 3
-#define rt_DOUBLE 4
-#define rt_FLOAT_COMPLEX 5
-#define rt_DOUBLE_COMPLEX 6
-#define rt_LOGICAL 7
-#define rt_LLONG 8
-#define rt_UCHAR 9
-#define rt_UINT 10
-#define rt_ULONG 11
-#define rt_ULLONG 12
-#define rt_SHORT 13
-#define rt_USHORT 14
-
-int TestType_RTS2(SgType *type)
-{ int len;
-  SgArrayType *artype;
-
-  if(!type)
-    return(rt_UNKNOWN);
-  
-  artype=isSgArrayType(type);
-  if(artype)
-    type = artype->baseType();
-  len = TypeSize(type); 
-  if(bind_ == 0)
-  switch(type->variant()) {
-        case T_BOOL:    if     (len == 4) return(rt_LOGICAL);
-                        else if(len == 2) return(rt_USHORT); 
-                        else if(len == 1) return(rt_CHAR); 
-                        else              return(rt_UNKNOWN); 
-
-        case T_INT:     if     (len == 4) return(rt_INT); 
-                        else if(len == 2) return(rt_SHORT);
-                        else if(len == 1) return(rt_CHAR);
-                        else              return(rt_UNKNOWN);
-  
-        case T_FLOAT:   if     (len == 8) return(rt_DOUBLE);
-                        else if(len == 4) return(rt_FLOAT);
-                        else              return(rt_UNKNOWN);
- 
-        case T_DOUBLE:  if     (len == 8) return(rt_DOUBLE);
-                        else              return(rt_UNKNOWN); 
-
-        case T_COMPLEX: if     (len ==16) return(rt_DOUBLE_COMPLEX);
-                        else if(len == 8) return(rt_FLOAT_COMPLEX);
-                        else              return(rt_UNKNOWN);
- 
-        case T_DCOMPLEX:if     (len ==16) return(rt_DOUBLE_COMPLEX);
-                        else   return(rt_UNKNOWN);
-        case T_STRING:
-        case T_CHAR:    if     (len == 1) return(rt_CHAR);
-                        else   return(rt_UNKNOWN);
-
-        default:        return(rt_UNKNOWN);
-  }
-  if(bind_ == 1)
-  switch(type->variant()) {
-
-        case T_BOOL:    if     (len == 8) return(rt_ULONG);
-                        else if(len == 4) return(rt_LOGICAL);
-                        else if(len == 2) return(rt_USHORT);
-                        else if(len == 1) return(rt_CHAR); 
-                        else              return(rt_UNKNOWN); 
-        case T_INT:     if     (len == 8) return(rt_LONG);
-                        else if(len == 4) return(rt_INT);
-                        else if(len == 2) return(rt_SHORT);
-                        else if(len == 1) return(rt_CHAR);
-                        else              return(rt_UNKNOWN);  
-        case T_FLOAT:   if     (len == 8) return(rt_DOUBLE);
-                        else if(len == 4) return(rt_FLOAT);
-                        else              return(rt_UNKNOWN); 
-        case T_DOUBLE:  if     (len == 8) return(rt_DOUBLE);
-                        else              return(rt_UNKNOWN); 
-
-        case T_COMPLEX: if     (len ==16) return(rt_DOUBLE_COMPLEX);
-                        else if(len == 8) return(rt_FLOAT_COMPLEX);
-                        else              return(rt_UNKNOWN); 
-        case T_DCOMPLEX:if     (len ==16) return(rt_DOUBLE_COMPLEX);
-                        else   return(rt_UNKNOWN);
-        case T_STRING:
-        case T_CHAR:    if     (len == 1) return(rt_CHAR);
-                        else   return(rt_UNKNOWN);
-
-        default:        return(rt_UNKNOWN);
-  }
-  return(rt_UNKNOWN);
-}
-
-SgExpression *TypeSize_RTS2(SgType *type)
-{
-  SgArrayType *artype=isSgArrayType(type);
-  if(artype)
-    type = artype->baseType();
-  int it = TestType_RTS2(type);
-  SgExpression *ts = it >= 0 ? &SgUMinusOp(*ConstRef(it)) : ConstRef_F95(TypeSize(type));
-  return(ts);
-}
-
-int DVMType()
-{return(2);}
-
-int NameIndex(SgType *type)
-{int len;
-   len = TypeSize(type);   //IS_INTRINSIC_TYPE(type) ? 0 : TypeSize(type);                          
-   switch ( type->variant()) {
-      case T_INT:      return (GETAI);
-      case T_FLOAT:    return((len == 8) ? GETAD : GETAF); 
-      case T_BOOL:     return (GETAL);
-      case T_DOUBLE:   return (GETAD);
-      case T_COMPLEX:  return (GETAC);
-      case T_DCOMPLEX: return (GETAC);
-      case T_STRING:   return (GETACH);
-      case T_CHAR:     return (GETACH);
-      default:         return (GETAI);
-      }
-}
-
-SgType *Base_Type(SgType *type)
-{ return ( isSgArrayType(type) ? type->baseType() : type);}
- 
-void doLoopStmt(SgStatement *st)
-{
- SgStatement *dost, *contst;
- SgValueExp c1(1);
- SgLabel *loop_lab; 
- SgSymbol *sio;
- int i;
-//!!!
- nio = 3;
-//!!!
- sio = st->expr(0)->lhs()->symbol();
- buf_use[TypeIndex(sio->type()->baseType())] = 1;
-// SgSymbol * dovar = new SgVariableSymb("IDVM01",*SgTypeInt(), *func);
- loop_lab = GetLabel();
- contst = new SgStatement(CONT_STAT);
- dost= new SgForStmt(*loop_var[0], c1.copy(), c1.copy(), c1.copy(), *contst);
- BIF_LABEL_USE(dost->thebif) = loop_lab->thelabel;
- (dost->lexNext())->setLabel(*loop_lab); 
- for(i=1; i<3; i++){
-   dost= new SgForStmt(*loop_var[i], c1.copy(), c1.copy(), c1.copy(), 
-                                               *dost);
-   BIF_LABEL_USE(dost->thebif) = loop_lab->thelabel;
- }
-
- st->insertStmtAfter(*dost);
- for(i=0; i<3; i++)
-  contst->lexNext()->extractStmt(); 
-    //dost->lexNext()->lexNext()->lexNext()->extractStmt();
-    //dost->lexNext()->lexNext()->lexNext()->extractStmt();
-
-     // generating the construction IF () THEN <   > ELSE <   > ENDIF 
-     // and then insert it before CONTINUE statement
- /*  SgStatement *if_stmt =new SgIfStmt(*(current->controlParent())->expr(0)                                , *current);
-      contst -> insertStmtBefore(*if_stmt);
- */
- cur_st = contst;
-} 
-
-SgExpression *ReplaceParameter(SgExpression *e)
-{
-  if(!e)
-    return(e);
-  if(e->variant() == CONST_REF) {
-     SgConstantSymb * sc =  isSgConstantSymb(e->symbol());
-     if(!sc->constantValue())
-     {  Err_g("An initialization expression is missing: %s",sc->identifier(),267);
-        return(e);
-     }
-     return(ReplaceParameter(&(sc->constantValue()->copy())));
-  }
-  e->setLhs(ReplaceParameter(e->lhs()));
-  e->setRhs(ReplaceParameter(e->rhs()));
-  return(e);
-}
-
-SgExpression *ReplaceFuncCall(SgExpression *e)
-{
-  if(!e)
-    return(e);
-  if(isSgFunctionCallExp(e) && e->symbol()) {//function call
-     if( !e->lhs()  && (!strcmp(e->symbol()->identifier(),"number_of_processors") || !strcmp(e->symbol()->identifier(),"actual_num_procs") || !strcmp(e->symbol()->identifier(),"number_of_nodes"))) {             //NUMBER_OF_PROCESSORS() or                                                         // ACTUAL_NUM_PROCS() or NUMBER_OF_NODES()
-    SgExprListExp *el1,*el2;
-    if(!strcmp(e->symbol()->identifier(),"number_of_processors"))
-      el1 = new SgExprListExp(*ParentPS());
-    else
-      el1 = new SgExprListExp(*CurrentPS());
-    el2 = new SgExprListExp(*ConstRef(0));
-    e->setSymbol(fdvm[GETSIZ]);
-    fmask[GETSIZ] = 1;
-    el1->setRhs(el2);
-    e->setLhs(el1);
-    return(e);
-    }
-
-   if( !e->lhs() && (!strcmp(e->symbol()->identifier(),"processors_rank"))) {
-                                                                //PROCESSORS_RANK()
-    SgExprListExp *el1;
-    el1 = new SgExprListExp(*ParentPS());
-    e->setSymbol(fdvm[GETRNK]);
-    fmask[GETRNK] = 1;
-    e->setLhs(el1);
-    return(e);
-    }
-
-   if(!strcmp(e->symbol()->identifier(),"processors_size")) {
-                                                               //PROCESSORS_SIZE()
-    SgExprListExp *el1;
-    el1 = new SgExprListExp(*ParentPS());
-    e->setSymbol(fdvm[GETSIZ]);
-    fmask[GETSIZ] = 1;
-    el1->setRhs(*(e->lhs())+(*ConstRef(0)));  //el1->setRhs(e->lhs());
-    e->setLhs(el1);
-    return(e);
-   }
-  }
-  e->setLhs(ReplaceFuncCall(e->lhs()));
-  e->setRhs(ReplaceFuncCall(e->rhs()));
-  return(e);
-}
-
-SgExpression *Calculate(SgExpression *e)
-{ SgExpression *er;
-   er  = ReplaceParameter( &(e->copy())); 
-   if(er->isInteger())
-      return( new SgValueExp(er->valueInteger()));
-    else
-      return(ReplaceFuncCall(e));
-}
-
-int ExpCompare(SgExpression *e1, SgExpression *e2)
-{//compares two expressions
-// returns 1 if they are textually identical
-  if(!e1 && !e2) // both expressions are null
-      return(1);
-  if(!e1 || !e2) // one of them is null
-      return(0);
-  if(e1->variant() != e2->variant()) // variants are not equal
-      return(0);
-  switch (e1->variant()) {
-      case INT_VAL: 
-          return(NODE_IV(e1->thellnd) == NODE_IV(e2->thellnd));
-      case BOOL_VAL:
-          return(NODE_BOOL_CST(e1->thellnd) == NODE_BOOL_CST(e2->thellnd)); 
-      case FLOAT_VAL: 
-      case DOUBLE_VAL:  
-      case CHAR_VAL:
-      case STRING_VAL: 
-	  return(!strcmp(NODE_STR(e1->thellnd),NODE_STR(e2->thellnd)));
-      case COMPLEX_VAL:
-          return(ExpCompare(e1->lhs(),e2->lhs()) && ExpCompare (e1->rhs(),e2->rhs()));   
-      case CONST_REF:
-      case VAR_REF:
-          return(e1->symbol() == e2->symbol());
-      case ARRAY_REF:
-      case FUNC_CALL:
-          if(e1->symbol() == e2->symbol())
-            return(ExpCompare(e1->lhs(),e2->lhs())); // compares subscript/argument lists
-          else
-            return(0);
-      case EXPR_LIST:
-	 {SgExpression *el1,*el2;
-          for(el1=e1,el2=e2; el1&&el2; el1=el1->rhs(),el2=el2->rhs())
-	     if(!ExpCompare(el1->lhs(),el2->lhs()))  // the corresponding elements of lists are not identical
-               return(0);
-          if(el1 || el2) //one list is shorter than other
-             return(0);
-          else
-             return(1);
-	 } 
-      case MINUS_OP:  //unary operations
-      case NOT_OP:
-	  return(ExpCompare(e1->lhs(),e2->lhs())); // compares operands    
-      default:
-          return(ExpCompare(e1->lhs(),e2->lhs()) && ExpCompare (e1->rhs(),e2->rhs())); 
-  }
-}
-
-int RemAccessRefCompare(SgExpression *e1, SgExpression *e2)
-{ // returns 1 if e2 ArrayRef in current statement is identical the e1 ArrayREf in precedent REMOTE_ACCESS statement  
-  SgExpression *el1, *el2; 
-  if(!e1) // for error situation in REMOTE_ACCESS
-      return(0);
- 
-  if(e1->variant() != e2->variant()) // variants are not equal ( for error situation in REMOTE_ACCESS)
-      return(0);
-
-  if(e1->symbol() != e2->symbol()) //different array references 
-    return(0);
-  
-  if(!e1->lhs()) // whole array in REMOTE_ACCESS
-    return(1);
-
-  for(el1=e1->lhs(),el2=e2->lhs(); el1&&el2; el1=el1->rhs(),el2=el2->rhs()) //compares subscript lists
-     if(el1->lhs()->variant() == DDOT) // is ':' element
-        ;
-     else
-       if(!ExpCompare(el1->lhs(),el2->lhs())) // corresponding subscript expressions are not identical
-            return(0);
-  if(el1 || el2) //one list is shorter than other
-       return(0);
-  else
-       return(1); 
-}   
-
-SgExpression * isRemAccessRef(SgExpression *e)
-  //returns remote-variable  with which array reference 'e' consides  or NULL        
-{SgExpression *el;
- rem_acc *r;
- if(HPF_program && !inparloop){
-   //rem_var *rv = (rem_var *) e->attributeValue(0,REMOTE_VARIABLE) ;
-    if( e->attributeValue(0,REMOTE_VARIABLE))
-      return(e);
-    else
-      return(NULL);
- }
-//looking through the remote-access directive/clause list
- for(r=rma; r; r=r->next)
-//looking through the remote-variable list
-   for(el=r->rml; el; el=el->rhs()) 
-      if(el->lhs()->attributeValue(0,REMOTE_VARIABLE) && RemAccessRefCompare(el->lhs(), e))
-        return(el->lhs());
- return(NULL);
-}
-
-void ChangeRemAccRef(SgExpression *e, SgExpression *rve)
-//changes remote-access reference by special buffer reference (multiplicated array i.e.DISTRIBUTE(*,*,...,*))
-// remote-variable attribute saves information about this buffer array
-{rem_var *rv = (rem_var *) rve->attributeValue(0,REMOTE_VARIABLE) ;
- SgExpression *p = NULL;
- SgExpression *el1, *el2,**dov;
- SgSymbol *ar;
-
-ar = e->symbol();
-if(rv->ncolon) { //there are ':'elements in index list of remote variable
-  //looking through the subscript and index lists 
-  for(el1=rve->lhs(),el2=e->lhs(); el1 && el2; el1=el1->rhs(),el2=el2->rhs())
-     if(el1->lhs()->variant() == DDOT) // ':'
-          p=el2;
-     else if((dov=IS_DO_VARIABLE_USE(el1->lhs()))){ //do-variable-use
-          el2->setLhs(*dov);
-          p=el2;
-     }
-     else   
-        //delete corresponding subscript in remote_access reference
-        if(!p)
-          e->setLhs(el2->rhs());
-        else
-          p->setRhs(el2->rhs());
-
-  if(for_kernel || for_host)
-  {
-     if(rv->buffer) 
-        e->setSymbol(rv->buffer);                                    /*ACC*/
-  }
-  else 
-     e->setSymbol(baseMemory(ar->type()->baseType()));
-  if(for_host)                                                    /*ACC*/
-     return;    // is not linearized
-  
-  if(IN_COMPUTE_REGION || inparloop && parloop_by_handler)
-  {
-      if(rv->buffer)
-         (e->lhs())->setLhs(*LinearFormB_for_ComputeRegion (rv->buffer, rv->ncolon, e->lhs()));  /*ACC*/  
-  }
-  else 
-      (e->lhs())->setLhs(*LinearFormB(((rv->amv == 1) ? ar : (SgSymbol *) NULL), rv->index, rv->ncolon, e->lhs()));
-  (e->lhs())->setRhs(NULL);
-}
-else {
-  if(rv->amv == -1) 
-  {
-    int tInt = TypeIndex(e->symbol()->type()->baseType());
-    if(tInt != -1)
-       e->setSymbol(rmbuf[tInt]);
-    e->setLhs(new SgExprListExp(*new SgValueExp(rv->index)));
-  }
-  else {
-    if(for_kernel || for_host) 
-    {
-      if(rv->buffer)  
-         e->setSymbol(rv->buffer);                                   /*ACC*/
-    }
-    else 
-      e->setSymbol(baseMemory(ar->type()->baseType()));
-    if(for_host)
-    {                                                             /*ACC*/
-      e->setLhs (*new SgExprListExp(*new SgValueExp(0)));       
-      return;
-    }
-    if(IN_COMPUTE_REGION || inparloop && parloop_by_handler)
-    { 
-       if(rv->buffer)
-          (e->lhs())->setLhs(*LinearFormB_for_ComputeRegion (rv->buffer, rv->ncolon, NULL));  /*ACC*/
-    }
-    else 
-       (e->lhs())->setLhs(*LinearFormB(((rv->amv == 1) ? ar : (SgSymbol *) NULL), rv->index, rv->ncolon, NULL));    
-    (e->lhs())->setRhs(NULL);
-  }
-}
-return;
-}
-
-int CreateBufferArray (int rank, SgExpression *rme, int *amview, SgStatement *stmt)
-{int ihead,isize,i,j,iamv,ileft,idis;
- SgExpression *es,*esz[MAX_DIMS], *elb[MAX_DIMS];
- ihead = ndvm; // allocating array header for buffer array
- ndvm+=2*rank+2;
- iamv = *amview =  ndvm++; 
- for(es=rme->lhs(),i=0,j=0; es; es=es->rhs(),i++) //looking through the index list 
-     if(es->lhs()->variant() == DDOT) {
-        //determination of dimension size
-        esz[j] = ArrayDimSize(rme->symbol(),i+1);
-        if(esz[j] && esz[j]->variant()==STAR_RANGE)
-          Error("Assumed-size array: %s",rme->symbol()->identifier(),162,stmt);
-        if(!esz[j]) //esz[j] == NULL (error situation)
-	  esz[j] = new SgValueExp(1);  //for continuing traslation
-        else
-          esz[j] = Calculate(esz[j]);
-        elb[j] =  header_ref(rme->symbol(),Rank(rme->symbol())+i+3);
-                        // Exprn(LowerBound(rme->symbol(),i));                                
-        j++;
-     }
- isize = ndvm; 
- for(j=rank; j; j--) //creating Size Array
-   doAssignStmtAfter(esz[j-1]); 
- 
- /*generating function call:CrtAMV(AMRef,Rank,SizeArray,StaticSign)*/        
- doAssignTo_After(DVM000(iamv),CreateAMView(DVM000(isize),rank,0)); //creating the representation of abstact machine
- 
- idis = ndvm; 
- for(j=rank; j; j--) //creating DisRule Array for DISTRIBUTE(*,*,...,*)
-   doAssignStmtAfter(new SgValueExp(0));
- /*generating function call:DisAM(AMViewRef,PSRef,ParamCount, AxisArray, DistrParamArray)*/        
- doAssignStmtAfter(DistributeAM(DVM000(iamv),CurrentPS(),rank,idis,idis));//distributing
- 
- 
-  ileft = ndvm;
-  for(j=rank; j; j--) //creating LeftShSizeArray == RightShSizeArray  = {0,..,0} 
-    doAssignStmtAfter(new SgValueExp(0));
-
-  for(j=0; j<rank; j++) //storing lower bounds
-    doAssignTo_After(DVM000(ihead+rank+2+j),elb[j]); 
-
-  /*generating call:CrtDA(ArrayHeader,Base,Rank,TypeSize,SizeArray,StaticSign,ReDistrSign,LeftShSizeArr,RightShSizeAr)*/  
-   doAssignStmtAfter(CreateDistArray(rme->symbol(),DVM000(ihead),DVM000(isize),rank,ileft,ileft,0,0));
-                                               //creating distributed array ("replicated")  
-                
-
-    ndvm = isize;
-   for(j=1; j<=rank; j++) //creating AxisArray = {1,2,..,rank} 
-       doAssignStmtAfter(new SgValueExp(j));
-
-    ndvm = idis;
-    for(j=rank; j; j--) //creating CoeffArray  = {1,1,...,1}
-       doAssignStmtAfter(new SgValueExp(1)); 
-   
-     //ConstArray = {0,0,...,0}  
-
-   /*generating call:AlnDa(ArrayHeader,AMViewRef,AxisArray,CoefArray,ConstArray)*/ 
-   doAssignStmtAfter(AlignArray(DVM000(ihead),DVM000(iamv),isize,idis,ileft));//aligning
-   
-
-   //doAssignTo_After(DVM000(ihead+rank+1),BufferHeaderNplus1(rme,rank,ihead));
-                                                   // calculating HEADER(rank+1) 
- SET_DVM(isize);
- return(ihead);
-}
-
-void CopyToBuffer(int rank,  int ibuf, SgExpression *rme)
-{  int itype,iindex,i,j,from_init,to_init;
-  SgExpression *es,*ei[MAX_DIMS],*el[MAX_DIMS],*head;
-  SgValueExp MM1(-1); 
-
-  if(!rank) { // copying one element of distributed array to buffer 
-  itype = TypeIndex(rme->symbol()->type()->baseType());
-  if(itype == -1) 
-    itype = 0;
-  SgExpression *are = new SgArrayRefExp(*rmbuf[itype],*new SgValueExp(ibuf));//buffer reference
-
-  for(es=rme->lhs(),i=0; es; es=es->rhs(),i++){ //looking through the index list    
-    ei[i] =  &( es->lhs()->copy() - *Exprn( LowerBound(rme->symbol(),i)));
-  }
-  iindex = ndvm;
-  for(j=i; j; j--)
-      doAssignStmtAfter(ei[j-1]); 
-  
-  if((head=HeaderRef(rme->symbol())) != NULL) // NULL if array is not distributed (error)
-    doAssignStmtAfter(ReadWriteElement(head,are,iindex));
-
-  if(dvm_debug)
-    InsertNewStatementAfter(D_RmBuf(head,GetAddresMem(are),0,iindex),cur_st,cur_st->controlParent());
-  
-  SET_DVM(iindex);
-  return;
-  }
-  //copying section of distributed array to buffer array
- 
- for(es=rme->lhs(),i=0; es; es=es->rhs(),i++)  {//looking through the index list    
-    if(es->lhs()->variant() != DDOT)    
-      ei[i] =  &( es->lhs()->copy() - * Exprn(LowerBound(rme->symbol(),i))); //init index   
-    else
-       ei[i] =& MM1.copy(); // -1
-    el[i] = & ei[i]->copy(); //last index
- }
- from_init = ndvm;
- for(j=i; j; j--)
-      doAssignStmtAfter(ei[j-1]); 
- for(j=i; j; j--)
-      doAssignStmtAfter(el[j-1]); 
- to_init = ndvm;
- for(j=rank; j; j-- ) 
-      doAssignStmtAfter(& MM1.copy()); 
-
- if((head=HeaderRef(rme->symbol())) != NULL) // NULL if array is not distributed (error)
-    doAssignStmtAfter(ArrayCopy(head, from_init, from_init+i, from_init, DVM000(ibuf), to_init, to_init, to_init, 0));
- if(dvm_debug)
-    InsertNewStatementAfter(D_RmBuf(head,GetAddresMem(DVM000(ibuf)),i,from_init),cur_st,cur_st->controlParent());
-
- SET_DVM(from_init);
- return;
-}
-
-void RemoteAccessDirective(SgStatement *stmt)
-{SgStatement *rmout;
- 	    if(inparloop) {
-              err("The directive is inside the range of PARALLEL loop", 98,stmt); 
-              return;
-            }
-            ReplaceContext(stmt->lexNext());
-            switch(stmt->lexNext()->variant()) {
-	            case LOGIF_NODE:
-                        rmout = stmt->lexNext()->lexNext()->lexNext(); 
-                        break;
-	            case SWITCH_NODE:
-                        rmout = stmt->lexNext()->lastNodeOfStmt()->lexNext();
-                        break;
-	            case IF_NODE:
-                        rmout = lastStmtOfIf(stmt->lexNext())->lexNext();
-                        break;
-	            case CASE_NODE:
-                    case ELSEIF_NODE:          
-                        err("Misplaced REMOTE_ACCESS directive", 99,stmt);
-                        rmout = stmt->lexNext()->lexNext();
-                        break;
-                    case FOR_NODE:
-                    case WHILE_NODE:
-                        rmout = lastStmtOfDo(stmt->lexNext())->lexNext();
-                        break;
-		    case DVM_PARALLEL_ON_DIR:
-                        rmout = lastStmtOfDo(stmt->lexNext()->lexNext())->lexNext();
-                        break;
-	            default:
-                        rmout = stmt->lexNext()->lexNext();
-                        break;
-              }
-            // adding new element to remote_access directive/clause list
-            AddRemoteAccess(stmt->expr(0),rmout); 
-
-            LINE_NUMBER_AFTER(stmt,stmt); //for tracing
- 
-	    // looking through the remote variable list
-	                   
-            RemoteVariableList(stmt->symbol(),stmt->expr(0),stmt);            
-}
-
-SgExpression *AlignmentListForRemoteDir(int nt, SgExpression *axis[], SgExpression *coef[], SgExpression *cons[])
-{ // case of RTS2 interface
-   SgExpression *arglist=NULL, *el, *e;
-
-   for(int i=0; i<nt; i++)
-   {         
-      e = AlignmentLinear(axis[i],ReplaceFuncCall(coef[i]),cons[i]);     
-      (el = new SgExprListExp(*e))->setRhs(arglist);
-      arglist = el;
-   }
-   (el = new SgExprListExp(*ConstRef(nt)))->setRhs(arglist);  // add rank to axis list
-   arglist = el;
-   return arglist;
-}
-
-void RemoteVariableList1(SgSymbol *group,SgExpression *rml, SgStatement *stmt)
-{ SgStatement *if_st,*end_st = NULL;
-  SgExpression *el, *es;
-  int nc; //counter of ':' elements of remote-index-list
-  int n;  //counter of  elements of remote-index-list
-  int rank;  //rank of remote variable
-  int ibuf = 0; 
-  int iamv =-1;
-  if(group){
-     if_st =  doIfThenConstrForRemAcc(group,cur_st);
-     end_st = cur_st; //END IF
-     cur_st = if_st;
-  }
-  for(el=rml; el; el= el->rhs()) {  
-       if(!HEADER(el->lhs()->symbol()))  //if non-distributed array occurs
-               Error("'%s' is not distributed array",el->lhs()->symbol()->identifier(),72,stmt);
-	n = 0;           
-        nc = 0;
-        // looking through the index list of remote variable
-        for(es=el->lhs()->lhs(); es; es= es->rhs(),n++)  
-            if(es->lhs()->variant() == DDOT)
-               nc++;
-        if((rank=Rank(el->lhs()->symbol())) && rank != n)
-             Error("Length of remote-index-list is not equal to the rank of remote variable",el->lhs()->symbol()->identifier(),165,stmt);
-        else
-	  if (nc) {
-                 ibuf = CreateBufferArray(nc,el->lhs(),&iamv, stmt);//creating replicated array
-                 //copying to Buffer Array
-                 CopyToBuffer(nc, ibuf, el->lhs());
-	          }
-          else    {
-                 ibuf = ++rma->rmbuf_use[TypeIndex(el->lhs()->symbol()->type()->baseType())];
-                 //copying to buffer
-                 CopyToBuffer(nc, ibuf, el->lhs());
-                  }  
-        //adding attribute REMOTE_VARIABLE 
-        rem_var *remv = new rem_var;
-        remv->ncolon = nc;
-
-        remv->index = ibuf;
-        remv->amv   = iamv;
-	(el->lhs())->addAttribute(REMOTE_VARIABLE,(void *) remv, sizeof(rem_var));  
-  }
- if(group)
-   //  cur_st = if_st->lastNodeOfStmt();
-       cur_st = end_st;
-}
-
-void RemoteVariableList(SgSymbol *group, SgExpression *rml, SgStatement *stmt)
-{ SgStatement *if_st,*end_st = NULL; 
-  SgExpression *el, *es,*coef[MAX_DIMS],*cons[MAX_DIMS],*axis[MAX_DIMS], *do_var;  
-  SgExpression  *ind_deb[MAX_DIMS];
-  int nc; //counter of ':' or do-var-use elements of remote-index-list
-  int n;  //counter of  elements of remote-index-list
-  int rank;  //rank of remote variable
-  int num,use[MAX_DIMS];   
-  int i,j,st_sign,iaxis,ideb=-1;
-  SgSymbol *dim_ident[MAX_DIMS],*ar;
-  int ibuf = 0; 
-  int iamv =0;
-  int err_subscript = 0;
-  SgValueExp c0(0),cm1(-1),c1(1);
-  st_sign = 0;
-
-  if(options.isOn(NO_REMOTE))
-     return;    
-  if(IN_COMPUTE_REGION && group)
-     err("Asynchronous REMOTE_ACCESS clause in compute region",574,stmt);
-  if(group && parloop_by_handler == 2 && stmt->variant() != DVM_PARALLEL_ON_DIR ) { // case of REMOTE_ACCESS directive
-     err("Illegal directive in -Opl2 mode. Asynchronous operations are not supported in this mode", 649, stmt);
-     group = NULL;
-  } 
-  if(group){
-     if_st =  doIfThenConstrForRemAcc(group,cur_st);
-     end_st = cur_st; //END IF
-     cur_st = if_st;
-     st_sign = 1;
-  }
-  if(stmt->variant() == DVM_PARALLEL_ON_DIR)
-    for(el=stmt->expr(2),i=0; el; el= el->rhs(),i++){ //do-variable list
-      //use[i] = 0;
-      dim_ident[i] = el->lhs()->symbol();
-    }
-  else
-     i = 0;
-      
-  for(el=rml; el; el= el->rhs()) {  
-        if(!HEADER(el->lhs()->symbol())) { //if non-distributed array occurs
-            Error("'%s' isn't distributed array",el->lhs()->symbol()->identifier(),72,stmt);
-            doAssignStmtAfter(&c0); 
-            continue;
-        }
-	n = 0;           
-        nc = 0;
-        err_subscript = 0;
-        for(j=0; j<i;j++)
-          use[j] = 0; 
-        if(!TestMaxDims(el->lhs()->lhs(),el->lhs()->symbol(),stmt)) continue;  
-        // looking through the index list of remote variable
-        for(es=el->lhs()->lhs(); es; es= es->rhs(),n++)  
-	  if(es->lhs()->variant() == DDOT){
-             axis[n]    = &cm1.copy();
-             coef[n]    = &c0.copy(); 
-             cons[n]    = &c0.copy(); 
-             ind_deb[n] = &cm1.copy();
-             //init[n]  = &c0.copy(); 
-             //last[n]  = &c0.copy();
-             //step[n]  = &c0.copy();
-             //dim[nc]    = es->lhs();        /*ACC*/
-             //dim_num[nc]= n;                /*ACC*/
-             nc++;
-          }
-          else if ((stmt->variant() == DVM_PARALLEL_ON_DIR) && (do_var=isDoVarUse(es->lhs(),use,dim_ident,i,&num,stmt))) {
-             CoeffConst(es->lhs(), do_var, &coef[n], &cons[n]);
-             axis[n] = new SgValueExp(num); 
-             TestReverse(coef[n],stmt);
-             //dim[nc]    = es->lhs();        /*ACC*/
-             //dim_num[nc]= n;                /*ACC*/
-             nc++; 
-             if(!coef[n]) {
-                 err("Wrong regular subscript expression", 164,stmt);
-                 err_subscript++; 
-                 coef[n]  = &c0.copy();
-                 cons[n]  = &c0.copy(); 
-                 ind_deb[n] = &c0.copy();
-                 //init[n]  = &c0.copy(); 
-                 //last[n]  = &c0.copy();
-                 //step[n]  = &c0.copy();
-             } else {
-            // correcting const with lower bound of corresponding array dimension
-             cons[n]  = &(*cons[n] - *Exprn( LowerBound(el->lhs()->symbol(),n))); 
-             ind_deb[n] = &cm1.copy();
-                //init[n]  = &(init_do[num-1]->copy());
-                //last[n]  = &(last_do[num-1]->copy());   
-                //step[n]  = &(step_do[num-1]->copy());
-             //adding attribute DO_VARIABLE_USE to regular subscript expression 
-             SgExpression **dov = new (SgExpression *);
-             *dov = do_var;
-	     (es->lhs())->addAttribute(DO_VARIABLE_USE,(void *) dov, sizeof(SgExpression *));  
-             }
-    
-          } else {
-             axis[n]  = &c0.copy();
-             coef[n]  = &c0.copy();
-             cons[n]  = parloop_by_handler == 2 ? &es->lhs()->copy() : &(es->lhs()->copy() - *Exprn( LowerBound(el->lhs()->symbol(),n))) ;
-             ind_deb[n] = &(cons[n]->copy());
-             //init[n]  = &c0.copy(); 
-             //last[n]  = &c0.copy();
-             //step[n]  = &c0.copy(); 
-          }
-        rank=Rank(el->lhs()->symbol());
-        if(n && rank && rank != n) {
-             Error("Length of remote-subscript-list is not equal to the rank of remote variable",el->lhs()->symbol()->identifier(),165,stmt);
-             continue;
-        }
-        if(err_subscript) continue;   //there is illegal subscript
-        if(!n) {//remote-subscript-list is absent (whole array is remote data)
-          for (; n<=rank-1; n++) {
-             axis[n]  = &cm1.copy();
-             coef[n]  = &c0.copy(); 
-             cons[n]  = &c0.copy();
-             ind_deb[n] = &cm1.copy(); 
-	      //init[n]  = &c0.copy(); 
-	      //last[n]  = &c0.copy();
-              //step[n]  = &c0.copy();
-             //dim[n]    = new SgExpression(DDOT); /*ACC*/
-             //dim_num[n]= n;                      /*ACC*/ 
-          } 
-          nc = rank;
-        }
-          // allocating array header for buffer array
-	  if(group){
-             int nbuf;
-             nbuf = BUFFER_INDEX(el->lhs()->symbol());
-             if(nbuf == maxbuf)
-               err("Buffer limit exceeded",183,stmt);
-             ibuf = 2*(nbuf+1)*(rank+1) + 2;
-             BUFFER_COUNT_PLUS_1(el->lhs()->symbol())
-	     // buffer_head = HeaderRefInd(el->lhs()->symbol(),ibuf);
-             ar = el->lhs()->symbol(); 
-          } else {
-             ibuf = ndvm; 
-             if(nc)
-               ndvm+=2*nc+2;
-             else
-               ndvm+=4;
-             //buffer_head = DVM000(ibuf);
-             ar = NULL;
-          }
-          // adding attribute REMOTE_VARIABLE 
-          rem_var *remv = new rem_var;
-          remv->ncolon = nc;
-          remv->index = ibuf;
-          remv->amv   = group ? 1 : iamv;
-          remv->buffer = NULL;               /*ACC*/
-
-	  (el->lhs())->addAttribute(REMOTE_VARIABLE,(void *) remv, sizeof(rem_var));
-
-	  // case of RTS2-interface 
-          if(parloop_by_handler==2)  {
-             if(stmt->variant() != DVM_PARALLEL_ON_DIR) {
-                doCallAfter(RemoteAccess_H2(header_rf(ar,ibuf,1), el->lhs()->symbol(), HeaderRef(el->lhs()->symbol()), AlignmentListForRemoteDir(n,axis,coef,cons)));
-             }
-             continue;            
-          }     
-	  // creating buffer for remote elements of array 
-          iaxis = ndvm;
-          if (stmt->variant() == DVM_PARALLEL_ON_DIR) {
-            for(j=n-1; j>=0; j--)
-              doAssignStmtAfter(axis[j]);       
-            for(j=n-1; j>=0; j--)
-              doAssignStmtAfter(ReplaceFuncCall(coef[j]));
-            for(j=n-1; j>=0; j--)
-              doAssignStmtAfter(Calculate(cons[j]));
-	        /*
-                     for(j=n-1; j>=0; j--)
-                        doAssignStmtAfter(ReplaceFuncCall(init[j]));
-                     for(j=n-1; j>=0; j--)
-                        doAssignStmtAfter(ReplaceFuncCall(last[j]));
-                     for(j=n-1; j>=0; j--)
-                        doAssignStmtAfter(ReplaceFuncCall(step[j]));
-	         */
-            doCallAfter(CreateRemBuf( HeaderRef(el->lhs()->symbol()), header_rf(ar,ibuf,1), st_sign,iplp,iaxis,iaxis+n,iaxis+2*n));
-          } else {
-            ideb = ndvm;
-            for(j=n-1; j>=0; j--)
-              doAssignStmtAfter(Calculate(ind_deb[j]));
-            doCallAfter(CreateRemBufP( HeaderRef(el->lhs()->symbol()), header_rf(ar,ibuf,1), st_sign,ConstRef(0),ideb));
-          }
-                           //if(nc)
-                           //  doAssignTo_After(header_rf(ar,ibuf,nc+2),BufferHeaderNplus1(el->lhs(),nc,ibuf,ar));
-                                                   // calculating HEADER(nc+1) 
-                           //if(IN_COMPUTE_REGION)    /*ACC*/
-                           //   ACC_StoreLowerBoundsOfDvmBuffer(el->lhs()->symbol(), dim, dim_num, nc, ibuf, stmt);
-
-          if(ACC_program)    /*ACC*/                     
-            ACC_Before_Loadrb(header_rf(ar,ibuf,1));
-
-          // loading the buffer
-          doCallAfter(LoadRemBuf( header_rf(ar,ibuf,1)));        
-          // waiting completion of loading the buffer
-          doCallAfter(WaitRemBuf( header_rf(ar,ibuf,1)));
-
-          if(IN_COMPUTE_REGION)  /*ACC*/
-            ACC_Region_After_Waitrb(header_rf(ar,ibuf,1));
-          if(group)
-          //inserting buffer in group
-            doAssignStmtAfter(InsertRemBuf(GROUP_REF(group,1), header_rf(ar,ibuf,1)));
-          if(dvm_debug) {
-            if (stmt->variant() == DVM_PARALLEL_ON_DIR) {
-              ideb = ndvm;
-              for(j=n-1; j>=0; j--)
-                doAssignStmtAfter(ReplaceFuncCall(ind_deb[j]));
-            }
-            InsertNewStatementAfter(D_RmBuf( HeaderRef(el->lhs()->symbol()),GetAddresDVM( header_rf(ar,ibuf,1)),n,ideb),cur_st,cur_st->controlParent());
-          }
-	  //SET_DVM(iaxis); //11.02.25	  
-  }
-
-  if(group) {
-       cur_st = cur_st->lexNext()->lexNext();//IF THEN after ELSE
-       doAssignStmtAfter(WaitBG(GROUP_REF(group,1)));
-       FREE_DVM(1);
-	 //cur_st = if_st->lastNodeOfStmt();
-       cur_st = end_st;
-  }
-}
-
-void IndirectList(SgSymbol *group, SgExpression *rml, SgStatement *stmt)
-{ SgStatement *if_st,*end_st = NULL; 
-  SgExpression *el, *es,*cons[MAX_DIMS];
-  SgSymbol *mehead;
-  int nc; //counter of indirect access dimensions
-  int n;  //counter of  elements of indirect-subscript-list
-  int rank;  //rank of remote variable
-  int j,st_sign,icons;
-  SgSymbol *dim_ident;
-  int ibuf = 0; 
-  int iamv =0;
-  SgValueExp c0(0),cm1(-1),c1(1);
-  st_sign = 0;
-  if(group){
-     if_st =  doIfThenConstrForRemAcc(group,cur_st);
-     end_st = cur_st; //END IF
-     cur_st = if_st;
-     st_sign = 1;
-  }
-  dim_ident = stmt->expr(2)->lhs()->symbol();  //do-variable 
-  for(el=rml; el; el= el->rhs()) {  
-        if(!HEADER(el->lhs()->symbol()))  //if non-distributed array occurs
-             Error("'%s' isn't distributed array",el->lhs()->symbol()->identifier(),72,stmt);
-	n = 0;           
-        nc = 0;
-        // looking through the index list of remote variable
-        for(es=el->lhs()->lhs(); es; es= es->rhs(),n++)  
-          if ((mehead = isIndirectSubscript(es->lhs(),dim_ident,stmt))) {
-             nc++; 
-             cons[n]  =   & SgUMinusOp(*Exprn( LowerBound(el->lhs()->symbol(),n))); 
-             //adding attribute INDIRECT_SUBSCRIPT to irregular subscript expression 
-             SgSymbol **me = new (SgSymbol *);
-             *me = mehead;
-	     (es->lhs())->addAttribute(INDIRECT_SUBSCRIPT,(void *) me, sizeof(SgSymbol *));      
-          } else 
-             cons[n]  = &(es->lhs()->copy() - *Exprn( LowerBound(el->lhs()->symbol(),n))) ;
-          
-        if((rank=Rank(el->lhs()->symbol())) && rank != n) {
-             Error("Length of indirect-subscript-list is not equal to the rank of remote variable",el->lhs()->symbol()->identifier(),302,stmt);
-             continue;
-        }
-          
-          // allocating array header for buffer array
-          ibuf = ndvm; 
-          ndvm+=+4;
-          if(!mehead || (nc > 1)){
-            // err("Illegal indirect reference",stmt);
-             return;
-          }
-	  // creating buffer for indirect access elements of array  
-          icons = ndvm;       
-          for(j=n-1; j>=0; j--)
-             doAssignStmtAfter(Calculate(cons[j]));
-          doAssignStmtAfter(CreateIndBuf( HeaderRef(el->lhs()->symbol()), DVM000(ibuf), st_sign,HeaderRef(mehead),icons));
-          doAssignTo_After(DVM000(ibuf+3),BufferHeader4(el->lhs(),ibuf));
-                                                   // calculating HEADER(nc+1) 
-          // loading the buffer
-          doAssignStmtAfter(LoadIndBuf(DVM000(ibuf)));
-          if(group)
-          //inserting buffer in group
-            doAssignStmtAfter(InsertIndBuf(group,DVM000(ibuf)));
-          // waiting completion of loading the buffer
-          doAssignStmtAfter(WaitIndBuf(DVM000(ibuf)));
-          if(dvm_debug)
-            InsertNewStatementAfter(D_RmBuf( HeaderRef(el->lhs()->symbol()),GetAddresMem(DVM000(ibuf)),n,icons),cur_st,cur_st->controlParent());
-	  SET_DVM(icons);
-        //adding attribute REMOTE_VARIABLE 
-        rem_var *remv = new rem_var;
-        remv->ncolon = nc;
-
-        remv->index = ibuf;
-        remv->amv   = iamv;
-	(el->lhs())->addAttribute(REMOTE_VARIABLE,(void *) remv, sizeof(rem_var));
-	  
-  }
- if(group) {
-       cur_st = cur_st->lexNext()->lexNext();//IF THEN after ELSE
-       doAssignStmtAfter(WaitIG(group));
-       FREE_DVM(1);
-	 //cur_st = if_st->lastNodeOfStmt();
-       cur_st = end_st;
- }
-}
-
-
-
-void DeleteBuffers(SgExpression *rml)
-{ SgExpression *el;
-  rem_var *remv;
-  SgStatement *current = cur_st;//store value of cur_st
-  SgLabel *lab;
-  //cur_st = cur_st->lexPrev();
-  for(el=rml; el; el= el->rhs()) {  //looking through the remote variable list
-     remv = (rem_var *) (el->lhs())->attributeValue(0,REMOTE_VARIABLE); 
-   /*   if(remv->ncolon) {
-      doAssignStmtBefore(DeleteObject(DVM000(remv->index)),current);//delete distributed array
-      doAssignStmtBefore(DeleteObject(DVM000(remv->amv)),current);//delete abstract machine view  
-      FREE_DVM(2); 
-      }
-   */
-     if(remv && remv->amv == 0){ //buffer is not included in named group
-       current->insertStmtBefore(*DeleteObject_H(header_rf((SgSymbol *) NULL,remv->index,1)),*current->controlParent());
-     }
-  }
-  cur_st = current; //restore cur_st
-}
-
-void RemoteAccessEnd()
-{int i;
- for (i=0; i<Ntp; i++) // calculating number of used scalar buffers of different type
-    rmbuf_size[i] =(rmbuf_size[i] < rma->rmbuf_use[i]) ? rma->rmbuf_use[i] : rmbuf_size[i];                                                                         //maximum         
- if(rma->rmout)  // REMOTE_ACCESS directive (not clause)   
-   DeleteBuffers(rma->rml); //deleting array buffers
- DelRemoteAccess(); //deletes element from remote_access directive/clause list
-                    //and concurently frees scalar buffers
-      
-}   
-
-void AddRemoteAccess(SgExpression *rml, SgStatement *rmout)
-{int i;
- rem_acc *elem = new rem_acc;
- elem->rml = rml;
- elem->rmout = rmout;
- if(!rma) {// first element
-   elem->next = NULL;
-   for(i=0; i<Ntp; i++)
-      elem->rmbuf_use[i] = 0;
- }
- else {
-   elem->next = rma;
-   for(i=0; i<Ntp; i++)
-      elem->rmbuf_use[i] = rma->rmbuf_use[i];
- }
- rma = elem;
-}
-
-void DelRemoteAccess()
-{
- if(rma)
-   rma = rma->next;
-}
-
-SgExpression *isSpecialFormExp(SgExpression *e,int i,int ind,SgExpression *vpart[],SgSymbol *do_var[])
-{
-  if(e->variant()==ADD_OP){
-   if(isInvariantPart(e->lhs()) && isDependentPart(e->rhs(),do_var)) {
-     vpart[i] = RenewSpecExp(e->rhs(),e->lhs()->valueInteger(),ind);
-     return(e->lhs());
-   }
-  if(isInvariantPart(e->rhs()) && isDependentPart(e->lhs(),do_var)) {
-     vpart[i] = RenewSpecExp(e->lhs(),e->rhs()->valueInteger(),ind);
-     return(e->rhs());
-   }
-  }
-  if(isDependentPart(e,do_var)){
-    vpart[i] = RenewSpecExp(e,0,ind);
-    return(new SgValueExp(0));
-  }
- return(NULL); 
-}
-
-int isInvariantPart(SgExpression *e)
-  { return(e->isInteger());}
-
-int isDependentPart(SgExpression *e,SgSymbol *do_var[])
-{//!!! temporaly
- if(do_var[0])
-   ;
- if(isSgFunctionCallExp(e)){
-   if(!strcmp(e->symbol()->identifier(),"mod") && (e->lhs()->lhs()->variant()==ADD_OP))
-      return(1);
- }
- return(0);
-}
-
-SgExpression *RenewSpecExp(SgExpression *e, int cnst, int ind)
-{ if(cnst % 2)
- ( e->lhs())->setLhs(*DVM000(ind) + (*new SgValueExp(cnst % 2)) + (*e->lhs()->lhs()));
-  else
- ( e->lhs())->setLhs(*DVM000(ind) + (*e->lhs()->lhs()));
- return(e);
-}
-
-int isDistObject(SgExpression *e)
-{
-  if(!e)
-    return(0);
-  if(isSgArrayRefExp(e)) 
-     if(HEADER(e->symbol()))
-       return(1);
-  if(e->variant() == ARRAY_OP)
-     return(isDistObject(e->lhs()));
-  return(0);
-} 
-
-int isListOfArrays(SgExpression *e, SgStatement *st)
-{SgExpression *el;
- int test = 0;
- for(el=e; el; el = el->rhs()) {
-   if(!(el->lhs()->symbol()->attributes() & DIMENSION_BIT) && !IS_POINTER(el->lhs()->symbol())) {
-      Error("'%s' is not array",el->lhs()->symbol()->identifier(), 66,st);   
-      test = 1;
-   }
-
-   if( el->lhs()->lhs() && !((el->lhs()->symbol()->attributes() & TEMPLATE_BIT) || (el->lhs()->symbol()->attributes() & PROCESSORS_BIT)))
-      Error("Shape specification is not permitted: %s", el->lhs()->symbol()->identifier(), 263, st);
- }
- return(test);  
-}
-
-char * AttrName(int i)
-{ switch (i) {
-        case 0: return("ALIGN");
-        case 1: return("DISTRIBUTE");
-        case 2: return("TEMPLATE");
-        case 3: return("PROCESSORS");
-        case 4: return("DIMENSION");
-        case 5: return("DYNAMIC");
-        case 6: return("SHADOW");
-        case 7: return("COMMON");
-        default: return("NONE");
-  }
-}
-
-int TestShapeSpec(SgExpression *e)
-{//temporary
- return(isSgValueExp(e)? 1 : 1);
-}
-
-void AddToGroupNameList (SgSymbol *s)
-{group_name_list *gs;
-//adding the  symbol 's' to group_name_list
-  if(!grname) {
-     grname = new group_name_list;
-     grname->symb = s;
-     grname->next = NULL;
-  } else {
-     for(gs=grname; gs; gs=gs->next)
-        if(gs->symb == s)
-          return;
-     gs = new group_name_list;
-     gs->symb = s;
-     gs->next = grname;
-     grname = gs;
-  }
-}
-
-symb_list  *AddToSymbList ( symb_list *ls, SgSymbol *s)
-{symb_list *l;
-//adding the symbol 's' to symb_list 'ls'
-  if(!ls) {
-     ls = new symb_list;
-     ls->symb = s;
-     ls->next = NULL;
-  } else {
-       /*
-          for(l=ls; l; l=l->next)
-            if(l->symb == s)
-              return;
-       */
-     l = new symb_list;
-     l->symb = s;
-     l->next = ls;
-     ls = l;
-  }
-  return(ls);
-}
-
-symb_list  *AddNewToSymbList ( symb_list *ls, SgSymbol *s)
-{symb_list *l;
-//adding the symbol 's' to symb_list 'ls'
-  if(!ls) {
-     ls = new symb_list;
-     ls->symb = s;
-     ls->next = NULL;
-  } else {
-     for(l=ls; l; l=l->next)
-        if(l->symb == s)
-           return(ls);       
-     l = new symb_list;
-     l->symb = s;
-     l->next = ls;
-     ls = l;
-  }
-  return(ls);
-}
-
-symb_list  *AddNewToSymbListEnd ( symb_list *ls, SgSymbol *s)
-{symb_list *l, *lprev;
-//adding the symbol 's' to symb_list 'ls'
-  if(!ls) {
-     ls = new symb_list;
-     ls->symb = s;
-     ls->next = NULL;
-  } else {
-     for(l=ls; l; lprev=l, l=l->next)
-        if(l->symb == s)
-           return(ls);        
-     l = new symb_list;
-     l->symb = s;
-     l->next = NULL;
-     lprev->next = l;
-  }
-  return(ls);
-}
-
-symb_list  *MergeSymbList(symb_list *ls1, symb_list *ls2)
-{
-  symb_list *l =ls1;
-  if(!ls1)
-     return (ls2);
-  while(l->next)
-     l = l->next;
-  l->next = ls2;
-  return ls1;
-}
-
-symb_list *CopySymbList(symb_list *ls)
-{
-  symb_list *l=NULL, *el, *cp=NULL;
-  while(ls)
-  {
-    el = new symb_list;
-    el->symb = ls->symb;
-    el->next = NULL;
-    if(l)
-      l->next  = el;
-    else
-      cp = el;
-    l = el;
-    ls = ls->next;
-  }
-  return cp;
-}
-
-void DeleteSymbList(symb_list *ls)
-{symb_list *l;
-
-  while(ls)
-  { l = ls;
-    ls =ls->next;
-    delete l;
-  }
-}
-
-filename_list  *AddToFileNameList ( char *s)
-{filename_list *ls;
- SgType *tch;
- SgExpression *le;
- int length;
-//adding the name 's' to filename_list 'ls'
-  if(!fnlist) {
-     ls = new filename_list;
-     ls->name = s;
-     ls->next = NULL;
-     le = new SgExpression(LEN_OP);
-     length = strlen(s)+1;
-     le->setLhs(new SgValueExp(length));
-     tch = new SgType(T_STRING,le,SgTypeChar());
-     ls->fns  =  new SgVariableSymb(FileNameVar(++filename_num), *tch, *cur_func);
-     fnlist   = ls; 
-  } else {
-     for(ls=fnlist; ls; ls=ls->next)
-        if(ls->name == s)
-           return(ls);       
-     ls = new filename_list;
-     ls->name = s;
-     ls->next = fnlist;
-     le = new SgExpression(LEN_OP);
-     length = strlen(s)+1;
-     le->setLhs(new SgValueExp(length));
-     tch = new SgType(T_STRING,le,SgTypeChar());
-     ls->fns  =  new SgVariableSymb(FileNameVar(++filename_num), *tch, *cur_func);
-     fnlist   = ls; 
-  }
-  return(ls);
-}
-
-filename_list  *AddToFileNameList(const char *s_in)
-{
-    char *s = new char[strlen(s_in) + 1];
-    strcpy(s, s_in);
-
-    filename_list *ls;
-    SgType *tch;
-    SgExpression *le;
-    int length;
-    //adding the name 's' to filename_list 'ls'
-    if (!fnlist) {
-        ls = new filename_list;
-        ls->name = s;
-        ls->next = NULL;
-        le = new SgExpression(LEN_OP);
-        length = strlen(s) + 1;
-        le->setLhs(new SgValueExp(length));
-        tch = new SgType(T_STRING, le, SgTypeChar());
-        ls->fns = new SgVariableSymb(FileNameVar(++filename_num), *tch, *cur_func);
-        fnlist = ls;
-    }
-    else {
-        for (ls = fnlist; ls; ls = ls->next)
-        if (ls->name == s)
-            return(ls);
-        ls = new filename_list;
-        ls->name = s;
-        ls->next = fnlist;
-        le = new SgExpression(LEN_OP);
-        length = strlen(s) + 1;
-        le->setLhs(new SgValueExp(length));
-        tch = new SgType(T_STRING, le, SgTypeChar());
-        ls->fns = new SgVariableSymb(FileNameVar(++filename_num), *tch, *cur_func);
-        fnlist = ls;
-    }
-    return(ls);
-}
-
-void InsertDebugStat(SgStatement *func, SgStatement* &end_of_unit) 
-{
-   SgStatement *stmt,*last, *data_stf, *first,*first_dvm_exec,*last_spec,*last_dvm_entry, *lentry = NULL;
-   SgStatement *mod_proc;
-   SgStatement *copy_proc = NULL;
-   SgStatement *has_contains = NULL;
-   SgLabel *lab_exec;
-   stmt_list *pstmt = NULL;
-   int contains[2];
-   int in_on=0;
-
-  //initialization
-  dsym = NULL;
-  grname = NULL;
-  saveall = 0;
-  maxdvm = 0;
-  maxhpf = 0;
-  count_reg = 0;
-  initMask();
-  data_stf = NULL;
-  inparloop = 0;
-  inasynchr = 0;
-  redvar_list = NULL;
-  goto_list = NULL;
-  proc_symb = NULL; 
-  task_symb = NULL; 
-  consistent_symb = NULL; 
-  async_symb=NULL;
-  check_sum = NULL;
-  loc_templ_symb=NULL; 
-  index_symb = NULL;
-  in_task_region = 0;
-  task_ind = 0;
-  in_task = 0;
-  task_lab = NULL;
-  pref_st = NULL;
-  pipeline = 0;
-  registration = NULL;
-  filename_num = 0;
-  fnlist = NULL;
-  nloopred = 0;
-  nloopcons = 0;
-  wait_list = NULL;
-  SIZE_function = NULL;  
-  dvm_const_ref = 0;
-  in_interface = 0;
-  mod_proc = NULL;
-  if_goto = NULL;
-  nifvar = 0;
-  entry_list = NULL;
-  dbif_cond = 0;
-  dbif_not_cond = 0;
-  last_dvm_entry = NULL;
-  all_replicated = 0; 
-  IOstat = NULL;
-  privateall = 0;
-
-  TempVarDVM(func);
-  initF90Names();
-
-  first = func->lexNext();
- //get the last node of the program unit(function) 
-  last = func->lastNodeOfStmt();
-  end_of_unit = last;
-  if(!(last->variant() == CONTROL_END))
-     printf(" END Statement is absent\n");
-//**********************************************************************
-//           Specification Directives Processing 
-//**********************************************************************
-// follow the statements of the function in lexical order
-// until first executable statement
-  for (stmt = first; stmt && (stmt != last); stmt = stmt->lexNext()) {
-    if (!isSgExecutableStatement(stmt)) //is Fortran specification statement
-// isSgExecutableStatement: 
-//               FALSE  -  for specification statement of Fortan 90
-//               TRUE   -  for executable statement of Fortan 90 
-    {
-	                  //!!!debug
-                          //  printVariantName(stmt->variant()); 
-                          //  printf("\n");
-                          //  printf("%s  %d\n",stmt->lineNumber(),
-      // analizing SAVE statement
-      if(stmt->variant()==SAVE_DECL) { 
-           if (!stmt->expr(0))  //SAVE without name-list
-             saveall = 1;
-           else if(IN_MAIN_PROGRAM)
-            pstmt = addToStmtList(pstmt, stmt);   //for extracting and replacing by SAVE without list
-           continue;
-      }
-      // deleting SAVE-attribute from Type Declaration Statement (for replacing by SAVE without list)
-      if(IN_MAIN_PROGRAM && isSgVarDeclStmt(stmt))          
-          DeleteSaveAttribute(stmt);
-
-      if(IN_MODULE && stmt->variant() == PRIVATE_STMT && !stmt->expr(0))
-             privateall = 1; 
-
-      if(debug_regim) {
-        if(stmt->variant()==COMM_STAT) {
-          SgExpression *ec, *el;
-          SgSymbol *sc; 
-	  for(ec=stmt->expr(0); ec; ec=ec->rhs()) // looking through COMM_LIST
-	    for(el=ec->lhs(); el; el=el->rhs()) {  
-              sc = el->lhs()->symbol();
-              if(sc){
-                 SYMB_ATTR(sc->thesymb)= SYMB_ATTR(sc->thesymb) | COMMON_BIT;
-                 if(IS_ARRAY(sc))
-                    registration = AddNewToSymbList( registration, sc); 
-              }        
-	    }  
-          continue; 
-	}   
-
-        // registrating  arrays from variable list of declaration statement
-        if( isSgVarDeclStmt(stmt) || isSgVarListDeclStmt(stmt)) {
-           RegistrationList(stmt);
-           continue;
-        }
-      }
-
-
-      if(isSgVarDeclStmt(stmt)) VarDeclaration(stmt);// for analizing object list and changing variant of declaration statement by VAR_DECL_90
-      if((stmt->variant() == DATA_DECL) || (stmt->variant() == STMTFN_STAT)) {
-          if(stmt->variant()==STMTFN_STAT)
-            DECL(stmt->expr(0)->symbol()) = 2;     //flag of statement function name
- 
-          if(!data_stf)
-            data_stf = stmt; //first statement in data-or-function statement part 
-	  continue;
-      }
-
-      if(stmt->variant() == INTERFACE_STMT || stmt->variant() == INTERFACE_ASSIGNMENT || stmt->variant() == INTERFACE_OPERATOR) {
-	  stmt = InterfaceBlock(stmt); //stmt= stmt->lastNodeOfStmt();  
-          continue;
-      }
-
-        if( stmt->variant() == USE_STMT) { 
-          if(stmt->lexPrev() != func && stmt->lexPrev()->variant()!=USE_STMT) 
-            err("Misplaced USE statement", 639, stmt);      
-          continue;     
-        }
-	if(stmt->variant() == STRUCT_DECL){
-          StructureProcessing(stmt);
-          stmt=stmt->lastNodeOfStmt();
-          continue;
-        }
-  
-        continue;
-      }
-    if ((stmt->variant() == FORMAT_STAT))        
-       {
-         continue;
-       }  
- 
-
-// processing the DVM Specification Directives
-
-    switch(stmt->variant()) {
-      case DVM_REDUCTION_GROUP_DIR:
-	     //if (dvm_debug)
-          if (debug_regim)
-	   {SgExpression * sl; 
-            for(sl=stmt->expr(0); sl; sl = sl->rhs())
-               AddToGroupNameList(sl->lhs()->symbol()); 
-           } 
-           //including the DVM specification directive to list
-           pstmt = addToStmtList(pstmt, stmt); 
-           continue;
-
-       case(DVM_INDIRECT_GROUP_DIR):
-       case(DVM_REMOTE_GROUP_DIR):
-           if (debug_regim && !options.isOn(NO_REMOTE))
-           {SgExpression * sl; 
-	    for(sl=stmt->expr(0); sl; sl = sl->rhs()){
-               SgArrayType *artype;
-               artype = new SgArrayType(*SgTypeInt());  
-               artype->addRange(*new SgValueExp(3));
-               sl->lhs()->symbol()->setType(artype);
-               AddToGroupNameList(sl->lhs()->symbol()); 
-           }
-           }
-           //including the DVM specification directive to list
-           pstmt = addToStmtList(pstmt, stmt); 
-            continue;       
-       case(DVM_POINTER_DIR):
-           if(debug_regim)
-           {SgExpression *el;
-            SgStatement **pst = new (SgStatement *);
-            SgSymbol *sym;
-            *pst = stmt;
-            for(el = stmt->expr(0); el; el=el->rhs()){ //  name list
-               sym = el->lhs()->symbol();  // name
-               sym->addAttribute(POINTER_, (void *) pst,                                                                  sizeof(SgStatement *)); 
-            }
-	   }
-           //including the DVM specification directive to list
-           pstmt = addToStmtList(pstmt, stmt); 
-           continue;
-       case(ACC_ROUTINE_DIR):
-       case(ACC_DECLARE_DIR):    
-       case(HPF_PROCESSORS_STAT):
-       case(HPF_TEMPLATE_STAT):
-       case(DVM_DYNAMIC_DIR):
-       case(DVM_SHADOW_DIR):
-       case(DVM_ALIGN_DIR):
-       case(DVM_DISTRIBUTE_DIR):
-       case(DVM_VAR_DECL):
-       case(DVM_TASK_DIR): 
-       case(DVM_INHERIT_DIR): 
-       case(DVM_HEAP_DIR):
-       case(DVM_ASYNCID_DIR): 
-       case(DVM_CONSISTENT_DIR):
-       case(DVM_CONSISTENT_GROUP_DIR):
-           //including the DVM specification directive to list
-           pstmt = addToStmtList(pstmt, stmt); 
-           continue;
-    }     
-// all declaration statements are processed,
-// current statement is executable (F77/DVM)
-    break;
-  }   
-
-  //TempVarDVM(func);
-
-  for(;pstmt; pstmt= pstmt->next)
-  Extract_Stmt(pstmt->st);// extracting  DVM Specification Directives
-
-  first_exec = stmt; // first executable statement
- 
-  // testing procedure (-dbif2 regim)
-  if(debug_regim && dbg_if_regim>1 && ((func->variant() == PROC_HEDR) || (func->variant() == FUNC_HEDR)) && !pstmt && !isInternalOrModuleProcedure(func) && !lookForDVMdirectivesInBlock(first_exec,func->lastNodeOfStmt(),contains) && !contains[0] && !contains[1])
-     copy_proc = CreateCopyOfExecPartOfProcedure();  
-
-  lab_exec = first_exec->label(); // store the label of first ececutable statement 
-  BIF_LABEL(first_exec->thebif) = NULL;
-  last_spec = stmt->lexPrev();
-  where = first_exec;
-  ndvm = 1; // ndvm is number of first free element of array "dvm000"
-  nhpf = 1; // nhpf is number of first free element of array "hpf000"
-
-//generating assign statement
-// dvm000(1) = fname(file_name)
-//function 'fname' tells the name of source file to DVM run-time system
-  InsertNewStatementBefore(D_Fname(),first_exec);
-
- first_dvm_exec = last_spec->lexNext(); //first DVM function call
- if(IN_MODULE){
-     if(debug_regim ) {
-       mod_proc = CreateModuleProcedure(cur_func,first_exec,has_contains);
-       where = mod_proc->lexNext();
-       end_of_unit = where;
-     } else {
-       first_dvm_exec = last_spec->lexNext();
-       goto EXEC_PART_;
-     }
-  }
- 
-  if(func->variant() == PROG_HEDR)  { // MAIN-program
-//generating a call  statement
-// call dvmlf(line_number_of_first_executable_statement,source-file-name)
-      LINE_NUMBER_STL_BEFORE(cur_st,first_exec,first_exec);
-//generating the function call which initializes the control structures of DVM run-time system,
-//   it's inserted in MAIN program) 
-// dvm000(1) = <flag>
-// call dvmh_init(dvm000(1))
-       RTL_GPU_Init();
-       if(dbg_if_regim)
-         InitDebugVar();       
-  }
- 
- ndvm = 4;
-        // first_dvm_exec = last_spec->lexNext(); //first DVM function call
- nio = 0;
-//generating call (module procedure) and/or assign statements for USE statements
- GenForUseStmts(func,where);
-
- if(debug_regim && grname) {
-    if(!IN_MODULE)
-      InitGroups();
-    CreateRedGroupVars();
- }
- if(debug_regim && registration) {
-    LINE_NUMBER_BEFORE(cur_func,where); //(first_exec,first_exec);
-    ArrayRegistration(); // before array registration number of cur_func line
-                         // must be put to debugger
- }
- if(lab_exec)
-      first_exec-> setLabel(*lab_exec);  //restore label of first executable statement
-  
- last_dvm_entry = first_exec->lexPrev();
-
- if(copy_proc)  
-     InsertCopyOfExecPartOfProcedure(copy_proc);  
-
- EXEC_PART_:
-
-  if(IN_MODULE) { 
-    if(!mod_proc && first_exec->variant() == CONTAINS_STMT) 
-         end_of_unit = has_contains = first_exec;
-    goto END_;
-  }
-
-//follow the executable statements in lexical order until last statement
-// of the function
-  for(stmt=first_exec; stmt ; stmt=stmt->lexNext()) {
-    cur_st = stmt;
-    if(isACCdirective(stmt))
-    { pstmt = addToStmtList(pstmt, stmt);
-      continue;
-    }
-    switch(stmt->variant()) {
-       case CONTROL_END:
-            if(stmt == last) {
-              if(func->variant() == PROG_HEDR)  // for MAIN program
-                RTLExit(stmt);
-              goto END_;            
-            }
-            break;
-       case CONTAINS_STMT:
-            if(func->variant() == PROG_HEDR)  // for MAIN program
-                RTLExit(stmt);
-            has_contains = end_of_unit = stmt;
-            goto END_;            
-            break;
-       case RETURN_STAT:
-            if(dvm_debug || perf_analysis ) 
-              goto_list = addToStmtList(goto_list, stmt); 
-         
-            if(stmt->lexNext() == last) 
-                goto END_;  
-            break;
-       case STOP_STAT:
-            if(stmt->expr(0)){
-               SgStatement *print_st;
-               InsertNewStatementBefore(print_st=PrintStat(stmt->expr(0)),stmt);
-               ReplaceByIfStmt(print_st);
-            } 
-            RTLExit(stmt);
-            if(stmt->lexNext() == last)
-               goto END_;
-            break;
-       /*
-       case PAUSE_NODE: 
-            err("PAUSE statement is not permitted in FDVM", 93,stmt); 
-            break;
-       case ENTRY_STAT: 
-            if(debug)
-              err("ENTRY statement is not permitted in FDVM", stmt); 
-            break;
-       */
-       case EXIT_STMT:
-            //if(dvm_debug || perf_analysis ) 
-              // EXIT statement is added to list for debugging (exit the loop)       
-             // goto_list = addToStmtList(goto_list, stmt);
-            break;
-
-       case ENTRY_STAT: 
-             GoRoundEntry(stmt);
-              //BeginBlockForEntry(stmt);
-             entry_list=addToStmtList(entry_list,stmt);             
-            break;  
-
-       case SWITCH_NODE:           // SELECT CASE ... 
-       case ARITHIF_NODE:          // Arithmetical IF
-       case IF_NODE:               // IF... THEN
-       case WHILE_NODE:            // DO WHILE (...)
-	    /*case ELSEIF_NODE:           // ELSE IF...*/ 
-	    if(dvm_debug)
-              DebugExpression(stmt->expr(0),stmt);
-            if((dvm_debug || perf_analysis) && stmt->variant()==ARITHIF_NODE ) 
-              goto_list = addToStmtList(goto_list, stmt);            
-            break;
-
-       case LOGIF_NODE:            // Logical IF 
-            if( !stmt->lineNumber()) {//inserted statement
-               stmt = stmt->lexNext();
-               break; 
-            } 
-            if(dvm_debug){
-              if(HPF_program && inparloop)
-                IsLIFReductionOp(stmt, indep_st->expr(0) ? indep_st->expr(0)->lhs() : indep_st->expr(0));                                           //look for reduction operator
-              ReplaceContext(stmt);
-              DebugExpression(stmt->expr(0),stmt);
-	    }
-            else if(perf_analysis && IsGoToStatement(stmt->lexNext()))
-              ReplaceContext(stmt);
-
-            continue; // to next statement
-       case FORALL_STAT:          // FORALL statement
-            stmt=stmt->lexNext();//  statement that is a part of FORALL statement         
-            break;
-
-       case GOTO_NODE:          // GO TO
-            if((dvm_debug || perf_analysis) && stmt->lineNumber() ) 
-              goto_list = addToStmtList(goto_list, stmt);          
-            break;
-       case COMGOTO_NODE:          // Computed GO TO
-            if(dvm_debug){
-              ReplaceContext(stmt);
-              DebugExpression(stmt->expr(1),stmt);
-             } else if(perf_analysis)
-              ReplaceContext(stmt);
-            if( dvm_debug || perf_analysis ) 
-              goto_list = addToStmtList(goto_list, stmt);          
-            break;
-
-       case ASSIGN_STAT:             // Assign statement 
-	   {SgSymbol *s;
-            if(!stmt->lineNumber())  //inserted debug statement
-              break;
-            s=stmt->expr(0)->symbol();
-            if(s && IS_POINTER(s)){ // left part variable is POINTER
-             if(isSgFunctionCallExp(stmt->expr(1)) && !strcmp(stmt->expr(1)->symbol()->identifier(),"allocate")){
-               if(inparloop)
-                 err("Illegal statement in the range of parallel loop",94,stmt);
-               if(debug_regim)
-		   //alloc_st = addToStmtList(alloc_st, stmt);
-                 AllocArrayRegistration(stmt);
-              
-             } else if( (isSgVarRefExp(stmt->expr(1)) || isSgArrayRefExp(stmt->expr(1))) && stmt->expr(1)->symbol() && IS_POINTER(stmt->expr(1)->symbol())) {
-                ;
-             } else 
-               err("Only a value of ALLOCATE function or other POINTER may be assigned to a POINTER",95,stmt);
-
-             break;
-	   }
-
-           if(s && !inparloop && IS_DVM_ARRAY(s) && DistrArrayAssign(stmt))
-              break;
-           if(s && !inparloop && AssignDistrArray(stmt))
-              break;
-    
-            if(dvm_debug){ 
-              SgStatement *stcur, *after_st = NULL, *stmt1; 
-              if(HPF_program && inparloop)
-                IsReductionOp(stmt,indep_st->expr(0) ? indep_st->expr(0)->lhs() : indep_st->expr(0));                                               //look for reduction operator
-              ReplaceContext(stmt);
-              DebugAssignStatement(stmt);
-
-              if(own_exe) //"owner executes" rule
-                InsertNewStatementAfter(D_Skpbl(),cur_st,cur_st->controlParent()); 
-	      else if(!inparloop && !in_on && stmt->expr(0)->symbol() && IS_DVM_ARRAY(stmt->expr(0)->symbol()))
-                InsertNewStatementAfter(D_Skpbl(),cur_st,cur_st->controlParent());  
-              own_exe = 0;
-              stmt = cur_st; 
-            }
-	 }
-
-            break;
-
-       case PROC_STAT:             // CALL
-            if(!stmt->lineNumber())  //inserted debug statement
-              break;
-            if(dvm_debug){
-              ReplaceContext(stmt);
-              DebugExpression(NULL,stmt);
-            }    
-            break;
-
-       case ALLOCATE_STMT:
-            if(debug_regim) {
-               AllocatableArrayRegistration(stmt);
-               stmt=cur_st;
-            }
-            break;
- 
-       case DEALLOCATE_STMT:
-            break; 
-       case FOR_NODE:
-	    if (perf_analysis == 4)
-              SeqLoopBegin(stmt);
-            if(dvm_debug) 
-	      DebugLoop(stmt);          
-            break;
-
-        case DVM_PARALLEL_ON_DIR:
-             if(!TestParallelWithoutOn(stmt,0))
-             {
-               pstmt = addToStmtList(pstmt, stmt); 
-               break;
-             } 
-
-             if(debug_regim && !dvm_debug)
-               Reduction_Debug(stmt);
-             par_do = stmt->lexNext(); // first DO statement of parallel loop 
-             while( isOmpDir (par_do))  //|| isACCdirective(par_do) 
-             { cur_st = par_do;
-               par_do=par_do->lexNext();               
-             }  
-
-             if(!isSgForStmt(par_do) && (dvm_debug || perf_analysis && perf_analysis != 2)) { 
-                                        //directive is ignored
-               err("PARALLEL directive must be followed by DO statement",97,stmt);                                                                     
-               break; 
-             }  
-
-	     if(dvm_debug){ //debugging mode
-               if(inparloop){
-                 err("Nested PARALLEL directives are not permitted", 96,stmt);
-                 break;
-               }
-                     
-               inparloop = 1;
-               if(!ParallelLoop_Debug(stmt)) // error in PARALLEL directive
-                 inparloop = 0;                  
-	     
-               Extract_Stmt(stmt); // extracting DVM-directive           
-               stmt = cur_st;
-                  // setting stmt on last DO statement of parallel loop nest
-	     }
-
-	     else if(perf_analysis && perf_analysis != 2) {
-               inparloop = 1;
-               
-               //generating call to 'bploop' function of performance analizer
-	       // (begin of parallel interval)
-               LINE_NUMBER_AFTER(stmt,stmt);
-               InsertNewStatementAfter(St_Bploop(OpenInterval(stmt)), cur_st,stmt->controlParent());
-             
-               if(perf_analysis == 4)
-                 SkipParLoopNest(stmt); 
-               Extract_Stmt(stmt); // extracting DVM-directive           
-               stmt = cur_st;
-             } 
-             else // dvm_debug == 0 && perf_analysis == 0 or 2, i.e. standard mode
-               //including the DVM  directive to list
-               pstmt = addToStmtList(pstmt, stmt);   
-             break;
-
-       case HPF_INDEPENDENT_DIR:
-             if(dvm_debug){ //debugging mode
-               if(inparloop){
-                //illegal nested INDEPENDENT directive is ignored
-                pstmt = addToStmtList(pstmt, stmt); //including the HPF directive to list
-                break;
-               }                     
-               par_do = stmt->lexNext();// first DO statement of parallel loop 
-               indep_st = stmt; 
-               if(!isSgForStmt(par_do)) {
-                  err("INDEPENDENT directive must be followed by DO statement",97,stmt);
-                                                                  //directive is ignored 
-                  break; 
-               }  
-               inparloop = 1;
-               IEXLoopAnalyse(func);
-               if(!IndependentLoop_Debug(stmt)) // error in INDEPENDENT directive
-                   inparloop = 0;                  	               
-	     }
-
-	     else if(perf_analysis && perf_analysis != 2) {
-               inparloop = 1;
-               par_do = stmt->lexNext();// first DO statement of parallel loop
-               indep_st = stmt; 
-               //generating call to 'bploop' function of performance analizer
-	       // (begin of parallel interval)
-               LINE_NUMBER_AFTER(stmt,stmt);
-               InsertNewStatementAfter(St_Bploop(OpenInterval(stmt)), cur_st,stmt->controlParent());            
-               SkipIndepLoopNest(stmt);         
-             } 
-             else {// dvm_debug == 0 && perf_analysis == 0 or 2, i.e. standard mode 
-               par_do = stmt->lexNext();// first DO statement of parallel loop 
-	       SkipIndepLoopNest(stmt); //  to extract nested INDEPENDENT directives
-             }
-             //including the HPF  directive to list
-             pstmt = addToStmtList(pstmt, stmt); 
-             stmt = cur_st; // setting stmt on last DO statement of parallel loop nest
-             break;
-
-       case DVM_REDUCTION_WAIT_DIR:
-	    if(debug_regim) {
-	      
-	      SgExpression *rg = new SgVarRefExp(stmt->symbol());
-              LINE_NUMBER_AFTER(stmt,stmt);
-              doCallAfter(DeleteObject_H(rg)); 
-              doAssignTo_After(rg, new SgValueExp(0)); 	   
-                  //Extract_Stmt(stmt); // extracting DVM-directive  
-              doCallAfter( D_DelRG(DebReductionGroup( rg->symbol())));               
-            }
-            wait_list = addToStmtList(wait_list, stmt); 
-            pstmt = addToStmtList(pstmt, stmt); 
-            stmt = cur_st;//setting stmt on last inserted statement       
-            break;
-       case DVM_ASYNCHRONOUS_DIR:
-	    dvm_debug=0;
-            pstmt = addToStmtList(pstmt, stmt); 
-            break;
-       case DVM_ENDASYNCHRONOUS_DIR:
-	    dvm_debug=(cur_fragment && cur_fragment->dlevel)? 1 : 0;
-	    pstmt = addToStmtList(pstmt, stmt); 
-            break;
-       case DVM_REDUCTION_START_DIR: 
-       case DVM_SHADOW_GROUP_DIR:
-       case DVM_SHADOW_START_DIR:      
-       case DVM_SHADOW_WAIT_DIR:
-       case DVM_REMOTE_ACCESS_DIR:     
-       case DVM_NEW_VALUE_DIR:  
-       case DVM_REALIGN_DIR:
-       case DVM_REDISTRIBUTE_DIR: 
-       case DVM_ASYNCWAIT_DIR:
-       case DVM_F90_DIR:
-       case DVM_CONSISTENT_START_DIR: 
-       case DVM_CONSISTENT_WAIT_DIR: 
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt); 
-            break;
-
-//Debugging Directive
-      case DVM_INTERVAL_DIR:
-	  if (perf_analysis > 1){
-            //generating call to 'binter' function of performance analizer
-	    // (begin of user interval)
-            
-            LINE_NUMBER_AFTER(stmt,stmt);
-            InsertNewStatementAfter(St_Binter(OpenInterval(stmt),Value_F95(stmt->expr(0))), cur_st,cur_st->controlParent()); 
-          }
-          pstmt = addToStmtList(pstmt, stmt);  //including the DVM  directive to list
-          stmt = cur_st; 
-          break;
-
-      case DVM_ENDINTERVAL_DIR:
-          if (perf_analysis > 1){
-            //generating call to 'einter' function of performance analizer
-	    // (end of user interval)
-            
-            if(!St_frag){
-              err("Unmatched directive",182,stmt);
-              break;
-            }
-            if(St_frag && St_frag->begin_st &&  (St_frag->begin_st->controlParent() != stmt->controlParent()))
-                err("Misplaced directive",103,stmt); //interval must be a block
-	    LINE_NUMBER_AFTER(stmt,stmt);
-            InsertNewStatementAfter(St_Einter(INTERVAL_NUMBER,INTERVAL_LINE), cur_st, stmt->controlParent());
-            CloseInterval();
-            Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;
-          }
-          else
-            pstmt = addToStmtList(pstmt, stmt); //including the DVM  directive to list 
-          break;
-
-      case DVM_EXIT_INTERVAL_DIR:
-          if (perf_analysis > 1){
-            //generating calls to 'einter' function of performance analizer
-	    // (exit from user intervals)
-            
-            if(!St_frag){
-              err("Misplaced directive",103,stmt);
-              break;
-            }
-            ExitInterval(stmt);
-            Extract_Stmt(stmt); // extracting DVM-directive           
-            stmt = cur_st;
-          }
-          else
-            pstmt = addToStmtList(pstmt, stmt);  //including the DVM  directive to list
-            break;
-
-       case DVM_OWN_DIR: 
-            if(dvm_debug && stmt->lexNext()->variant() == ASSIGN_STAT) 
-               own_exe = 1;
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);  
-            break;
-       case DVM_DEBUG_DIR:
-         { int num;
-            if((stmt->expr(0)->variant() != INT_VAL) || (num=stmt->expr(0)->valueInteger())<= 0)
-              err("Illegal fragment number",181,stmt);  
-            else  if(debug_fragment || perf_fragment)
-              BeginDebugFragment(num,stmt);
-            
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);  
-	 }
-            break;
-
-       case DVM_ENDDEBUG_DIR: 
-	 { int num; 
-            if((stmt->expr(0)->variant() != INT_VAL) || (num=stmt->expr(0)->valueInteger())<= 0)
-              err("Illegal fragment number",181,stmt);   
-            else if((cur_fragment && cur_fragment->No != num) || !cur_fragment && (debug_fragment || perf_fragment))
-              err("Unmatched directive",182,stmt);
-            else {
-             if(cur_fragment && cur_fragment->begin_st && (stmt->controlParent() != cur_fragment->begin_st->controlParent()))
-                                                               //test of nesting blocks
-               err("Misplaced directive",103,stmt); 
-             EndDebugFragment(num);
-	    }
- 
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt); 
-	 } 
-            break;
-
-       case DVM_TRACEON_DIR:
-            InsertNewStatementAfter(new SgCallStmt(*fdvm[TRON]),stmt,stmt->controlParent()); 
-            Extract_Stmt(stmt);// extracting DVM-directive 
-            stmt = cur_st;
-            break;
-
-       case DVM_TRACEOFF_DIR:  
-            InsertNewStatementAfter(new SgCallStmt(*fdvm[TROFF]),stmt,stmt->controlParent());  
-            Extract_Stmt(stmt);// extracting DVM-directive 
-            stmt = cur_st;
-            break;
-
-       case DVM_BARRIER_DIR:
-            doAssignStmtAfter(Barrier()); 
-            FREE_DVM(1);
-            LINE_NUMBER_AFTER(stmt,stmt);
-            Extract_Stmt(stmt);// extracting DVM-directive             
-            stmt = cur_st;
-            break;
-
-       case DVM_CHECK_DIR:
-	    if(check_regim) {
-              cur_st = Check(stmt);  
-              Extract_Stmt(stmt); // extracting DVM-directive            
-              stmt = cur_st;
-            } else
-              pstmt = addToStmtList(pstmt, stmt);     
-            break;
-
-      case DVM_TASK_REGION_DIR:
-          task_region_st = stmt;
-          in_task_region++; 
-	  if(dvm_debug){	
-            //task_region_st = stmt;
-            //task_region_parent = stmt->controlParent(); //to test nesting blocks
-            //task_lab = (SgLabel *) NULL;
-            task_ind = ndvm++; 
-            DebugTaskRegion(stmt);
-	  }                
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);
-            stmt = cur_st;   
-            break;
-          
-      case DVM_END_TASK_REGION_DIR:
-          if(dvm_debug)
-                CloseTaskRegion(task_region_st,stmt); 
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);  
-            stmt = cur_st; 
-            in_task_region--;
-            break;     
-      case DVM_ON_DIR: 
-          if(dvm_debug) {
-            if( stmt->expr(0)->symbol() && IS_DVM_ARRAY(stmt->expr(0)->symbol()))
-              in_on++;
-	    else if(in_task_region) {
-              LINE_NUMBER_AFTER(stmt,stmt);
-              doAssignTo_After(DVM000(task_ind),ReplaceFuncCall(stmt->expr(0)->lhs()->lhs()));
-              InsertNewStatementAfter(D_Iter_ON(task_ind,TypeDVM()),cur_st,stmt->controlParent());
-	    }
-          }
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);  
-            stmt = cur_st; 
-            break;  
-       case DVM_END_ON_DIR:
-           pstmt = addToStmtList(pstmt, stmt);
-           if(dvm_debug && in_on) { 
-             SgStatement *std = dbg_if_regim ?  CreateIfThenConstr(DebugIfCondition(),D_Skpbl())  : D_Skpbl();             
-             InsertNewStatementAfter(std,stmt,stmt->controlParent());
-             stmt =lastStmtOf(std);  
-             in_on--;
-           }
-            break;
-                 
-	 /* case DVM_INDIRECT_ACCESS_DIR: */
-       case DVM_MAP_DIR:    
-       case DVM_RESET_DIR:
-       case DVM_PREFETCH_DIR:  
-       case DVM_PARALLEL_TASK_DIR:
-       case DVM_LOCALIZE_DIR:
-       case DVM_SHADOW_ADD_DIR: 
-       case DVM_IO_MODE_DIR:
-       case DVM_TEMPLATE_CREATE_DIR:
-       case DVM_TEMPLATE_DELETE_DIR:    
-            //including the DVM  directive to list
-            pstmt = addToStmtList(pstmt, stmt);  
-            break;
-//Input/Output statements
-       case OPEN_STAT:
-       case CLOSE_STAT:
-       case INQUIRE_STAT:
-       case BACKSPACE_STAT:
-       case ENDFILE_STAT:
-       case REWIND_STAT:
-       case WRITE_STAT:
-       case READ_STAT:
-       case PRINT_STAT:
-            if(perf_analysis)  
-              stmt = Any_IO_Statement(stmt); 
-            break;
-       case DVM_CP_CREATE_DIR:  /*Chek Point*/
-            CP_Create_Statement(stmt, WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-       case DVM_CP_SAVE_DIR:
-            CP_Save_Statement(stmt, WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-       case DVM_CP_LOAD_DIR:
-            CP_Load_Statement(stmt, WITH_ERR_MSG);
-            stmt = cur_st;
-            break;
-      case DVM_CP_WAIT_DIR:
-            CP_Wait(stmt, WITH_ERR_MSG);
-            stmt = cur_st;
-            break;            /*Chek Point*/
-
-       default:
-            break;     
-    }
-
-  { SgStatement  *end_stmt; 
-  end_stmt = isSgLogIfStmt(stmt->controlParent()) ? stmt->controlParent() : stmt;
-
-  if(inparloop && isParallelLoopEndStmt(end_stmt,par_do))  { // is last statement of parallel loop
-       SgStatement *go_stmt = NULL;  
-       inparloop = 0;  // closing parallel loop nest
-       //replacing the label of DO statements locating  above parallel loop  in nest,
-       // which is ended by stmt,
-       // by new label and inserting CONTINUE with this label 
-       ReplaceDoNestLabel_Above(end_stmt, par_do, GetLabel());
-       if(debug_regim && HPF_program)
-         INDReductionDebug();
-       if(dvm_debug) { 
-         CloseDoInParLoop(end_stmt); //on debug regim end_stmt==stmt
-         end_stmt = cur_st;
-         if(dbg_if_regim) {
-           // generating GO TO statement:  GO TO begin_lab
-           // and inserting it after last statement of parallel loop nest 
-           go_stmt = new SgGotoStmt(*begin_lab);
-           cur_st->insertStmtAfter(*go_stmt,*par_do->controlParent());
-           cur_st = go_stmt; // GO TO statement
-         }
-	 // generating call statement : call dendl(...)
-         CloseParLoop(end_stmt->controlParent(),cur_st,end_stmt);
-         if(dbg_if_regim) 
-           //setting label of ending parallel loop nest
-           (go_stmt->lexNext())->setLabel(*end_lab);
-         if(irg) {
-           // generating statement:
-           //  call dvmh_delete_object(RedGroupRef)     // dvm000(i) = delobj(RedGroupRef)
-           doCallAfter(DeleteObject_H(redgref));
-           if(idebrg)
-              doCallAfter( D_DelRG(DVM000(idebrg)));   
-         } 
-       } else  if(perf_analysis == 4)
-         SeqLoopEndInParLoop(end_stmt,stmt);
-
-       if(perf_analysis && perf_analysis != 2) {
-         // generating call eloop(...) - end of parallel interval
-         //(performance analyzer function)
-         InsertNewStatementAfter(St_Enloop(INTERVAL_NUMBER,INTERVAL_LINE),cur_st,cur_st->controlParent());
-         CloseInterval();
-         if(perf_analysis != 4)
-           OverLoopAnalyse(func);
-      }
-
-      stmt = cur_st;
-      if(dvm_debug)
-        {SET_DVM(iplp);}
-      continue;
-  }    
-  
-  if(isDoEndStmt_f90(end_stmt)) {
-    if(dvm_debug)
-      CloseLoop(stmt); // on debug regim stmt=end_stmt 
-    else if (perf_analysis && close_loop_interval)
-      SeqLoopEnd(end_stmt,stmt);
-    stmt = cur_st; 
-   }
-  }
- }  
-  
-END_:      
-
- // for declaring dvm000(N) is used maximal value of ndvm
-  SET_DVM(ndvm); 
-  cur_st =  first_dvm_exec;
-  if(last_dvm_entry)
-    lentry = last_dvm_entry->lexNext();
-  if(!IN_MODULE) { 
-    InitRemoteGroups();
-    //InitFileNameVariables();
-    if(debug_regim) {
-      InitRedGroupVariables();
-      WaitDirList();
-    }
-    DoStmtsForENTRY(first_dvm_exec,lentry);
-    fmask[FNAME] = 0;
-    stmt = data_stf ? data_stf->lexPrev() : first_dvm_exec->lexPrev();
-    DeclareVarDVM(stmt,stmt);
-    CheckInrinsicNames();
-  } else {
-    if(mod_proc)
-      MayBeDeleteModuleProc(mod_proc,end_of_unit);
-    fmask[FNAME] = 0;     
-    nloopred = nloopcons = MAX_RED_VAR_SIZE;
-    stmt= mod_proc ? has_contains->lexPrev() : first_dvm_exec->lexPrev();
-    DeclareVarDVM(stmt, (mod_proc ? mod_proc : stmt));  
-  }
-  first_dvm_exec->extractStmt();   //extract fname() call 
-  for(;pstmt; pstmt= pstmt->next)
-     Extract_Stmt(pstmt->st);// extracting  DVM+ACC  Directives  
-  if(debug_regim) 
-     if(cur_func->expr(2) && cur_func->expr(2)->variant()==PURE_OP)
-        cur_func->setExpression(2, NULL);   // removing  PURE attribute from procedure header
-  return; 
-}
-
-void VarDVM(SgStatement * func )
- { SgArrayType *typearray;
- typearray =new SgArrayType(*SgTypeInt()); //typearray-> addRange(N);
- dvmbuf = new SgVariableSymb("dvm000", *typearray, *func);
- }
-
-void  RegistrateArg(SgExpression *ele)
-{ 
-  SgExpression *el, *e;
-  e = ele->lhs(); //argument
- if(!e)
-    return;
- 
- if(isSgArrayRefExp(e)) {
-   if(!(e->lhs())) // argument is whole array (array name)
-       return;
-   el=e->lhs()->lhs();  //first subscript of argument
-   //testing: is first subscript of ArrayRef a POINTER 
-   if((isSgVarRefExp(el) || isSgArrayRefExp(el)) && IS_POINTER(el->symbol())){
-      if(!strcmp(e->symbol()->identifier(),"heap") || (e->symbol()->attributes() & HEAP_BIT))
-         heap_point = HeapList(heap_point,e->symbol(),el->symbol());
-   }      
- }   
- return;
-}
-
-SgExpression *CalcLinearForm(SgSymbol *ar, SgExpression *el, SgExpression *erec)
-{
-  int i;
-  SgExpression *ei, *index_list=NULL, *head_ref;
-  for(i=0; el; el=el->rhs(),i++) 
-  { 
-     ei = &(el->lhs()->copy()); 
-     ei = new SgExprListExp(*DvmType_Ref(ei)); 
-     ei->setRhs(index_list);
-     index_list = ei;
-  }
-  
-  if(erec) {
-     head_ref = new SgExpression(RECORD_REF);
-     head_ref->setLhs(erec);
-     head_ref->setRhs( new SgArrayRefExp(*ar, *new SgValueExp(1)));
-  }
-  else
-     head_ref = HeaderRef(ar);
-  return (CalculateLinear(head_ref,i,index_list));
-
-}
-
-void DistArrayRef(SgExpression *e, int modified, SgStatement *st)
-{ SgSymbol *ar;
-  SgExpression *rme, *erec=NULL;
-  int *h;
-  int is_record_ref = 0;
-         //replace distributed array reference A(I1,I2,...,In) by
-         //                                 n   
-         // <memory>( Header(n+1) +  I1 + SUMMA(Header(n-k+1) * Ik))
-         //                                k=2                    
-         // <memory> is I0000M  if A  is of type integer 
-         //             R0000M  if A  is of type real 
-         //             D0000M  if A  is of type double precision 
-         //             C0000M  if A  is of type complex
-         //             L0000M  if A  is of type logical 
-
-         // modified == 1 for variable in left part of assign statement
-  
-  hpf_ind = 0;
-  if (isSgRecordRefExp(e)) {
-     erec = e->lhs(); 
-     e->setType(e->rhs()->type()); 
-     NODE_CODE(e->thellnd) = ARRAY_REF;    
-     ar = e->rhs()->symbol();
-     e->setLhs(e->rhs()->lhs()); 
-     e->setSymbol(ar);
-     is_record_ref = 1;
-  } 
-  else
-     ar = e -> symbol();  
-  if(IS_POINTER(ar)){
-     Error("Illegal POINTER reference: '%s'",ar->identifier(),138,st); 
-     return;
-  }                                       
-  h = HEADER(ar);
-  if(h && isSgArrayType(e->type()))
-  {  Error("Illegal distributed array reference: %s",ar->identifier(),335,st); 
-     return;
-  }
-
-  if(h || is_record_ref) { //distributed array reference    
-    if(!is_record_ref && *h > 1)
-         Error("Illegal template reference: '%s'",ar->identifier(),167,st);
-    if(HPF_program && inparloop && modified && !IND_target)
-       IND_target = IND_ModifiedDistArrayRef(e,st);
-    if(HPF_program && inparloop && !modified ) {
-       if(!IND_target_R)
-           IND_target_R = IND_ModifiedDistArrayRef(e,st);
-       IND_UsedDistArrayRef(e,st);
-       return;
-    }
-    if(!modified && !is_record_ref && (rma || HPF_program) && (rme=isRemAccessRef(e))) 
-                                                       // is remote variable reference
-         ChangeRemAccRef(e,rme);
-      
-    else {   
-         /*	if(!inparloop && !own_exe) 
-          Error("Distributed array element reference outside the range of parallel loop: '%s'",ar->identifier(),cur_st);  */
-
-      if(isPrivateInRegion(ar))  //private array in loop of region
-        return;  // array reference is not changed !!!
-      if(for_host)       //if(IN_COMPUTE_REGION && inparloop && !for_kernel && options.isOn(O_HOST) )
-        return;  // array reference is not changed !!!
-      if(for_kernel)   /*ACC*/
-        ;
-      else if(opt_base && inparloop && !HPF_program)
-        e->setSymbol( *ARRAY_BASE_SYMBOL(ar)); 
-      else
-        e->setSymbol(baseMemory(ar->type()->baseType()));  
-      if(!e->lhs())
-        Error("No subscripts: %s", ar->identifier(),171,st);
-      else { 
-        (e->lhs())->setLhs( (INTERFACE_RTS2 && !inparloop) ? *CalcLinearForm(ar,e->lhs(),erec) : *LinearForm(ar,e->lhs(),erec));
-        (e->lhs())->setRhs(NULL); 
-           } 
-    } 
-  /*ACC*/
-  } else   { // replicated array in region   
-      if(for_host)       
-        return;  // array reference is not changed !!!    
-      if(!for_kernel)   /*ACC*/
-        e->setSymbol(baseMemory(ar->type()->baseType()));  
-      if(!e->lhs())
-        Error("No subscripts: %s", ar->identifier(),171,st);
-      else    
-      { if(DUMMY_FOR_ARRAY(ar) && *DUMMY_FOR_ARRAY(ar)!=NULL)  // for case of syntax error in PARALLEL directive 
-        { (e->lhs())->setLhs(*LinearForm(*DUMMY_FOR_ARRAY(ar),e->lhs(),NULL));
-          (e->lhs())->setRhs(NULL);
-        } 
-      } 
-    
-  }
-
-} 
-
-
-void GoRoundEntry(SgStatement *stmt)
-{SgLabel *lab;
-if((stmt->lexPrev()->variant() == RETURN_STAT) || (stmt->lexPrev()->variant() == STOP_STAT) ||(stmt->lexPrev()->variant() == GOTO_NODE)) // going round is 
-   return;
-
-if(!(lab=stmt->lexNext()->label())) {//next statement has not label 
-    lab = GetLabel();
-    (stmt->lexNext())->setLabel(*lab); 
-}
-stmt->insertStmtBefore(* new SgGotoStmt(*lab));
-return;
-}
-void BeginBlockForEntry(SgStatement *stmt)
-{if(stmt)
-    return;
- return;
-}
-int TestLeftPart(symb_list *new_red_var_list, SgExpression *le)
-{symb_list *ls;
-  if(!le)
-    return(0);
-  if(isDistObject(le))
-    return(1);
-  if(le->variant() == ARRAY_OP)
-    return(TestLeftPart(new_red_var_list,le->lhs()));
-  if(le->symbol()){
-    for(ls= new_red_var_list; ls; ls=ls->next)
-       if( le->symbol() == ls->symb)
-         return(1);
-    return(0); 
-  }   
-  else
-   return(0);
-}
-int isInSymbList(symb_list *ls,SgSymbol *s)
-{symb_list *l;
- for(l=ls; l; l=l->next)
-    if(s == l->symb)
-       return(1);
- return(0); 
-}
-
-void TestReverse(SgExpression *e,SgStatement *st)
-{
- if(e && e->isInteger() && (e->valueInteger() < 0))
-     err("Reverse is not supported",163,st);
- return;
-} 
-
-void LineNumber(SgStatement *st)
-{st->insertStmtAfter(*D_Lnumb(st->lineNumber()),*st->controlParent());}
-
-
-int PointerRank(SgSymbol *p)
-{int rank ;
- SgExpression *el;
- rank = 0;
- for(el= (*POINTER_DIR(p))->expr(1); el; el=el->rhs())
-    rank++;
- return (rank);
-}
-
-SgType * PointerType(SgSymbol *p)
-{return( (*POINTER_DIR(p))->expr(2)->type());}
-
-void AssignPointer(SgStatement *ass)
-{int r;
- SgSymbol *pl, *pr;
- //SgExpression *head_new, *head;
- //ifst=ndvm;
- pl = ass->expr(0)->symbol();
- pr = ass->expr(1)->symbol();
- /* if(IS_DVM_ARRAY(pl))
-    Error("POINTER '%s' in left part of assign statement has DISTRIBUTE or ALIGN attribute",pl->identifier(), 172,ass);*//*28.12.99*/
- /* if(!IS_DVM_ARRAY(pr))
-   Error("POINTER '%s' in right part of assign statement has not DISTRIBUTE or ALIGN attribute",pr->identifier(), ass);*/
- r = PointerRank(pl);
- if(PointerRank(pr) != r)
-   err("Pointers are of different rank", 173,ass);
- if(PointerType(pr) != PointerType(pl))
-   err("Pointers are of different type", 174,ass);
- TestArrayRef(ass->expr(0),ass);
- TestArrayRef(ass->expr(1),ass);
-
- /*LINE_NUMBER_AFTER(ass,ass);*/
- /*
-    head_new = (ass->expr(0)->lhs()) ? AddFirstSubscript(ass->expr(0),new SgValueExp(1)) : HeaderRefInd(pl,1); 
-     head     = (ass->expr(1)->lhs()) ? AddFirstSubscript(ass->expr(1),new SgValueExp(1)) : HeaderRefInd(pr,1); 
-    doAssignStmtAfter(AddHeader(head_new,head));
- */
- /* 
- doAssignStmtAfter(AddHeader(PointerHeaderRef(ass->expr(0),1),PointerHeaderRef(ass->expr(1),1)));
- CopyHeader(ass->expr(0),ass->expr(1),r);
- SET_DVM(ifst);
- */
- return;
-}
-
-void AddFirstSubscript(SgExpression *ea, SgExpression *ei)
-{SgExpression *el,*efirst;
- if(!ei || !ea)
-   return;
- el = ea->lhs();
- efirst = new SgExprListExp(*ei);
- efirst -> setRhs(el);
- ea -> setLhs(efirst);
-}
-/*
-SgExpression * PointerHeaderRef(SgExpression *pe, int ind)
-  // P => P(ind)
-  // P(i,j,...) => P(ind,i,j,...)
-{SgSymbol *p;
- if(!(p=pe->symbol()))
-    return (pe);
- if(p->attributes() & DIMENSION_BIT){ // POINTER p declared as array
-    SgExpression *ef,*cpe;
-    if(!pe->lhs())
-     return (pe);
-    cpe = & (pe->copy());
-    ef = new SgExprListExp(* new SgValueExp(ind));
-    ef->setRhs(cpe->lhs());
-    cpe->setLhs(ef);
-    return(cpe);
- }
- else
-    return(HeaderRefInd(p,ind));
-}
-*/
-
-SgExpression * PointerHeaderRef(SgExpression *pe, int ind)
-  // P => HEAP(P+ind-1)
-  // P(i,j,...) => HEAP(P(i,j,...)+ind-1)
-{ SgExpression *ef,*cpe;
- if(!(pe->symbol()))
-    return (pe); 
- if(!heap_ar_decl)
-   return(pe);  //error: HEAP isn't declared
- cpe = new SgArrayRefExp(*heap_ar_decl->symbol());
- ef = (ind == 1) ? new SgExprListExp(pe->copy()) : new SgExprListExp(pe->copy()+(*new SgValueExp(ind-1)));
- cpe->setLhs(ef);
- return(cpe);
-} 
-
-
-void CopyHeader(SgExpression *ple, SgExpression *pre, int rank)
-{    //int i;
-     // for(i=0; i<rank; i++)
-     // doAssignTo_After(PointerHeaderRef(ple,rank+2+i), PointerHeaderRef(pre,rank+2+i));
- doAssignTo_After(PointerHeaderRef(ple,rank+2), PointerHeaderRef(pre,rank+2));
-     //for(i=0; i<rank; i++)
-     // doAssignTo_After(PointerHeaderRef(ple,rank+2+i), new SgValueExp(1));
-}
-
-int TestArrayRef(SgExpression *e, SgStatement *stmt)
-{SgSymbol *s;
- if(!(s=e->symbol()))
-    return (0);
- if((s->attributes() & DIMENSION_BIT) && !e->lhs()) { // s  declared as array
-    Error("No subscripts: %s", s->identifier(),171,stmt);
-    return(0);
- } 
- return(1);
-}
-
-void AddDistSymbList(SgSymbol *s)
-{  symb_list *ds;
-  if(!dsym) {
-     dsym = new symb_list;
-     dsym->symb = s;
-     dsym->next = NULL;
-  } else {
-     ds = new symb_list;
-     ds->symb = s;
-     ds->next = dsym;
-     dsym = ds;
-  }
-}
-
-void StoreLowerBoundsPlus(SgSymbol *ar,SgExpression *arref)
-// generating assign statements to
-//store lower bounds of array in Header(rank+3:2*rank+2)
-//and to initialize counter of remote access buffers:  HEADER(2*rank+3) = 2*rank+4
-//and to set the flag to 0: array is not distributed yet
-{int i,rank;
- SgExpression *le;
- rank = Rank(ar);
- if(!IS_TEMPLATE(ar) && !IS_POINTER(ar))
-   doAssignTo(header_section(ar,2,rank+1), new SgValueExp(1)); // coefficient's initialization
-
- for(i=0;i<rank;i++) {
-   le = IS_POINTER(ar) ? new SgValueExp(1) : Exprn( LowerBound(ar,i));
-   doAssignTo(!arref ? header_ref(ar,rank+3+i) : PointerHeaderRef(arref,rank+3+i), le) ; 
- }
- if(!IS_TEMPLATE(ar)) {
-   doAssignTo(!arref ? header_ref(ar,HSIZE(rank)+1) : PointerHeaderRef(arref,HSIZE(rank)+1), new SgValueExp(HSIZE(rank)+2));
-                          // initializing HEADER(2*rank+3) - counter of remote access buffers
-   if(ar->attributes() & POSTPONE_BIT)
-     doAssignTo(!arref ? header_ref(ar,HEADER_SIZE(ar)) : PointerHeaderRef(arref,HEADER_SIZE(ar)), new SgValueExp(0));  
-                          // HEADER(HEADER_SIZE) = 0 => the array is not distributed yet 
- } 
-}
-
-void StoreLowerBoundsPlusFromAllocate(SgSymbol *ar,SgExpression *arref,SgExpression *lbound)
-// generating assign statements to
-//store lower bounds of array in Header(rank+3:2*rank+2)
-//and to initialize counter of remote access buffers:  HEADER(2*rank+3) = 2*rank+4
-//and to set the flag to 0: array is not distributed yet
-{int i,rank;
- SgExpression *le;
- rank = Rank(ar);
- for(i=0;i<rank;i++) {
-   le = &(lbound->copy());
-   if(lbound->lhs())
-       le->lhs()->setLhs(Calculate(&(lbound->lhs()->lhs()->copy()+ *new SgValueExp(i))));
-    else
-       le->setLhs(new SgExprListExp(*new SgValueExp(i+1)));
-   
-   doAssignTo(!arref ? header_ref(ar,rank+3+i) : PointerHeaderRef(arref,rank+3+i), le) ; 
-  }
- if(!IS_TEMPLATE(ar)) {
-   doAssignTo(!arref ? header_ref(ar,HSIZE(rank)+1) : PointerHeaderRef(arref,HSIZE(rank)+1),     new SgValueExp(HSIZE(rank)+2));
-                          // initializing HEADER(2*rank+3) - counter of remote access buffers
-   if(ar->attributes() & POSTPONE_BIT)
-     doAssignTo(!arref ? header_ref(ar,HEADER_SIZE(ar)) : PointerHeaderRef(arref,HEADER_SIZE(ar)), new SgValueExp(0));  
-                          // HEADER(HEADER_SIZE) = 0 => the array is not distributed yet  
- }
-}
-
-
-void StoreLowerBoundsPlusOfAllocatable(SgSymbol *ar,SgExpression *desc)
-// generating assign statements to
-//store lower bounds of ALLOCATABLE array in Header(rank+3:2*rank+2)
-//and to initialize counter of remote access buffers:  HEADER(2*rank+3) = 2*rank+4
-//and to set the flag to 0: array is not distributed yet
-{int i,rank;
- SgExpression *le,*el;
- rank = Rank(ar);
- doAssignTo(header_section(ar,2,rank+1), new SgValueExp(1)); // coefficient's initialization 
- for(i=0,el=desc->lhs();el;i++,el=el->rhs()) {
-   le = (el->lhs()->variant() == DDOT) ? &el->lhs()->lhs()->copy() : new SgValueExp(1)  ;
-   doAssignTo(header_ref(ar,rank+3+i), le) ; 
-  }
- if(!IS_TEMPLATE(ar)) {
-   doAssignTo(header_ref(ar,HSIZE(rank)+1),  new SgValueExp(HSIZE(rank)+2));
-                          // initializing HEADER(2*rank+3) - counter of remote access buffers
-   if(ar->attributes() & POSTPONE_BIT)
-     doAssignTo(header_ref(ar,HEADER_SIZE(ar)), new SgValueExp(0));  
-                          // HEADER(HEADER_SIZE) = 0 => the array is not distributed yet 
- } 
-}
-
-
-void StoreLowerBoundsPlusOfAllocatableComponent(SgSymbol *ar,SgExpression *desc, SgExpression *struct_)
-// generating assign statements to
-//store lower bounds of ALLOCATABLE array in Header(rank+3:2*rank+2)
-//and to initialize counter of remote access buffers:  HEADER(2*rank+3) = 2*rank+4
-//and to set the flag to 0: array is not distributed yet
-{int i,rank;
- SgExpression *le,*el;
- rank = Rank(ar);
- doAssignTo(header_section_in_structure(ar,2,rank+1,struct_), new SgValueExp(1)); // coefficient's initialization
-
- for(i=0,el=desc->lhs();el;i++,el=el->rhs()) {
-   le = (el->lhs()->variant() == DDOT) ? &el->lhs()->lhs()->copy() : new SgValueExp(1)  ;
-   doAssignTo(header_ref_in_structure(ar,rank+3+i,struct_), le) ; 
-  }
- doAssignTo(header_ref_in_structure(ar,HSIZE(rank)+1,struct_),  new SgValueExp(HSIZE(rank)+2));
-                          // initializing HEADER(2*rank+3) - counter of remote access buffers
- if(ar->attributes() & POSTPONE_BIT)
-   doAssignTo(header_ref_in_structure(ar,HEADER_SIZE(ar),struct_), new SgValueExp(0));  
-                          // HEADER(HEADER_SIZE) = 0 => the array is not distributed yet  
-
-}
-
-void ReplaceLowerBound(SgSymbol *ar, int i)
-//replace i-th lower bound of array 'ar' with Header(rank+3+i) reference in Symbol Table
-// Li : Ui =>  Header(rank+3+i) : Ui
-//i=0,...,rank-1
-{SgExpression *e;
- SgArrayType *artype;
- artype = isSgArrayType(ar->type());
- if(artype) {
-   e = artype->sizeInDim(i);
-   if(e->lhs() && e->rhs()) // Li : Ui
-     if(!(ReplaceParameter(&e->lhs()->copy())->isInteger()))
-       e->setLhs(header_ref(ar,Rank(ar)+3+i));
- }
-}
-
-void ReplaceArrayBounds(SgSymbol *ar) 
-{int i,rank;
- rank = Rank(ar);
- if( IS_DUMMY(ar))
-   for(i=0; i<rank; i++)
-       ReplaceLowerBound(ar,i); 
-}
-
-void StoreOneBounds(SgSymbol *ar)
-// generating assign statements:
-// Header(2*rank+3 +i) = 1, i=0,...,rank-1
-{int i,rank;
- rank = Rank(ar);
- for(i=0;i<rank;i++)
-   doAssignTo(header_ref(ar,rank+3+i), new SgValueExp(1)); 
-}
-
-SgExpression *ConstRef(int ic)
-{
- dvm_const_ref = 1; 
- if(ic>9){
-   if(ic == 16)
-      return(&(*new SgVarRefExp(Iconst[8])+(*new SgVarRefExp(Iconst[8]))));
-   else if(ic-9 < 10)
-      return(&(*new SgVarRefExp(Iconst[ic-9])+(*new SgVarRefExp(Iconst[9]))));
-   else
-      return(&(*new SgVarRefExp(Iconst[9])+(*new SgValueExp(ic-9))));
-     // err("Compiler bug. Integer constant > 9", 0,cur_st);
-   return(new SgValueExp(ic)); 
- }
- return(new SgVarRefExp(Iconst[ic]));
-}
-
-SgExpression *SignConstRef(int ic)
-{SgExpression *res;
- res = (ic < 0) ? &SgUMinusOp(*ConstRef(-ic)) : ConstRef(ic); 
- return(res);
-} 
-
-void TestParamType(SgStatement *stmt)
-{SgType *t;
- t = stmt->expr(2)->symbol()->type();
- if(isSgArrayType(t) && (t->baseType()->variant() == T_FLOAT && TypeSize(t->baseType())==8 || t->baseType()->variant() == T_DOUBLE) && Rank(stmt->expr(2)->symbol())==2)
-   return ;
- Error("Illegal type of parameter array '%s'",stmt->expr(2)->symbol()->identifier(),615,stmt);
-} 
-
-SgExpression *CountOfTasks(SgStatement *st)
-{SgExpression *e;
-  e = st->expr(0)->lhs()->lhs();  
-  if(e->variant()==DDOT && !e->lhs() && !e->rhs()) //whole task's array
-      return(ReplaceFuncCall(ArrayDimSize(st->expr(0)->symbol(),1)));
-  else //section of task's array
-  {   err("Section/element of task array. Not implemented yet.",614,st);
-      return(new SgValueExp(0));
-  } 
-}
-
-void ReconfPS( stmt_list *pstmt)
-{ int rank;
-  SgSymbol *pr;
-  SgExpression *size_array, *le;
-  stmt_list *lst;
-  //looking through the DVM specification directive (pstmt) 
-  for(lst=pstmt; lst; lst=lst->next)
-    if(lst->st->variant() == HPF_PROCESSORS_STAT)       
-      for (le=lst->st->expr(0); le; le = le->rhs()) { //looking through the processor list
-         pr= le->lhs()->symbol();
-         proc_symb = AddToSymbList(proc_symb, pr);
-         LINE_NUMBER_BEFORE(lst->st,where);
-                                   // for tracing set the global variable of LibDVM to
-                                  // line number of directive PROCESSORS
-         rank = Rank(pr);
-         if(!rank) { // is not array  P => P(1)
-           size_array = dvm_array_ref();
-           doAssignStmt(new SgValueExp(1));
-           rank = 1;
-         } else   
-           size_array = doSizeArrayD(pr,lst->st); 
-
-         // pr = reconf(PSRef, rank, SizeArray, StaticSign)
-         // reconf() creates processor system
-         doAssignTo(new SgVarRefExp(pr),Reconf(size_array, rank, 0));
-      }
-}
-
-SgExpression *CurrentPS ()
-{SgExpression *ps;
-  if(in_task_region)
-     ps = new SgArrayRefExp(*task_array, *new SgValueExp(1),*DVM000(task_ind)); 
-  /* else if(fmask[GETAM] == 0) // not GETVM but GETAM !!
-     ps = GetProcSys(ConstRef(0));  //ConstRef(0); constant = 0
-  else
-     ps =  DVM000(3); 
-   */
-  else 
-    ps = ConstRef(0); 
-  return(ps);
- 
-}
-
-SgExpression *CurrentAM ()
-{SgExpression *am;
-  am = ConstRef(0); //DVM000(2); //ConstRef(0); //GetAM(); 
-  return(am);
-}
-
-SgExpression *ParentPS ()
-{ return( GetProcSys(&SgUMinusOp(*ConstRef(1))));} 
-
-SgExpression *PSReference(SgStatement *st)
-{SgExpression *target,*es,*le[MAX_DIMS],*re[MAX_DIMS];
- SgValueExp c1(1);
- int ile,ips,rank,j,i;
-
- target =  (st->variant() == DVM_MAP_DIR) ? st->expr(1) : st->expr(2);
- if(!target)
-   return( CurrentPS());
- /*
- if(st->variant() == DVM_REDISTRIBUTE_DIR){
-    target = target->lhs(); 
-    if(target->variant() == NEW_VALUE_OP)
-       return( CurrentPS());
- }
- */
- if(target->symbol()->attributes()  & PROCESSORS_BIT){
-    if(!target->lhs())
-       return(target);
-      // return( new SgVarRefExp(target->symbol()));
-    
-    for(es=target->lhs(),j=0; es; es=es->rhs(),j++){ //looking through the subscript list
-       if(j==MAX_DIMS) {
-            Error("Too many dimensions specified for %s", target->symbol()->identifier(),43,st);
-            break;
-       }  
-       if(es->lhs()->variant() == DDOT) {
-         //determination of dimension bounds
-         if(!es->lhs()->lhs() && !es->lhs()->rhs()){ 
-            le[j] = new SgValueExp(0);
-            re[j] = &(*Exprn(UpperBound(target->symbol(),j)) - *Exprn(LowerBound(target->symbol(),j)));
-         } else if(!es->lhs()->lhs()  && es->lhs()->rhs()) {
-            le[j] = new SgValueExp(0);
-            re[j] = &(*es->lhs()->rhs() - *Exprn(LowerBound(target->symbol(),j)));
-         } else if(es->lhs()->lhs()  && !es->lhs()->rhs()) {
-            le[j] = &(*es->lhs()->lhs() - *Exprn(LowerBound(target->symbol(),j)));
-            re[j] = &(*Exprn(UpperBound(target->symbol(),j)) - *Exprn(LowerBound(target->symbol(),j)));
-         } else if(es->lhs()->lhs()  && es->lhs()->rhs()) {
-            le[j] = &(*es->lhs()->lhs() - *Exprn(LowerBound(target->symbol(),j)));
-            re[j] = &(*es->lhs()->rhs() - *Exprn(LowerBound(target->symbol(),j)));
-         }
-       } else {
-            le[j] = &(*es->lhs() - *Exprn(LowerBound(target->symbol(),j)));
-            re[j] = &le[j]->copy();
-       }
-    }
-    rank = Rank(target->symbol());
-    if(rank && rank != j)
-      Error("Wrong  number of subscripts specified for %s", target->symbol()->identifier(),140,st);   
-
-    ile = ndvm; 
-    for(i=0; i<j; i++) //creating Size Array
-      doAssignStmt(Calculate(le[i])); 
-    for(i=0; i<j; i++) //creating Size Array
-      doAssignStmt(Calculate(re[i])); 
-    ips = ndvm;
-    doAssignStmt(CrtPS(new SgArrayRefExp(*target->symbol()), ile, ile+j, 0));
-    return (DVM000(ips));
- } 
-
- if(target->symbol()->attributes()  & TASK_BIT)     
-   return(TaskPS(target,st));
- return( CurrentPS());
-}
-
-SgExpression *TaskPS(SgExpression *target,SgStatement *st)
-{
-  if(!target->lhs() || target->lhs()->rhs()) //there are no subscript or >1
-      Error("Wrong  number of subscripts specified for  %s", target->symbol()->identifier(),140,st);  
-  return( new SgArrayRefExp(*target->symbol(), *new SgValueExp(1),*target->lhs()->lhs()));
-}
-
-SgExpression *hasNewValueClause(SgStatement *stdis)
-{SgExpression *e;
-  e = stdis->expr(2); 
-  if(!e) // NEW_VALUE clause is absent
-     return (e);
-  e = e->lhs();
-  if(e->variant() == NEW_VALUE_OP)
-     return(e);
-  else if(e->rhs())
-     return(e->rhs()->lhs());
-  return(NULL);
-}
-
-SgExpression *hasOntoClause(SgStatement *stdis)
-{SgExpression *target;
- SgSymbol *tsymb;
-  target = stdis->expr(2); 
-  if(!target) //ONTO clause is absent
-     return (target);
-  if(isSgExprListExp(target)){
-     target = target->lhs();
-     if(target->variant() == NEW_VALUE_OP)
-     return(NULL);
-  }
-  tsymb = target->symbol();
-  if(!(tsymb->attributes() & DIMENSION_BIT))
-       Error("'%s' isn't array",tsymb->identifier(),66,stdis);
-  if(stdis->variant() == DVM_DISTRIBUTE_DIR){
-    if(!(tsymb->attributes() & PROCESSORS_BIT))
-       Error("'%s' hasn't PROCESSORS attribute",tsymb->identifier(),176,stdis);
-  }  else  // REDISTRIBUTE directive 
-       if(!(tsymb->attributes() & PROCESSORS_BIT) && !(tsymb->attributes() & TASK_BIT))
-          Error("'%s' hasn't PROCESSORS/TASK attribute",tsymb->identifier(),176,stdis); 
-  return(target);     
-}
-
-int RankOfSection(SgExpression *are)
-{int rank;
-// SgExpression *el;
-//int ndim;
- if(!are)
-   return(0);
- if(are->symbol()->attributes() & TASK_BIT)
-   return(0);
- rank = Rank(are->symbol());
- if(!are->lhs()) 
-    return(rank ? rank : 1 );
-
- return (rank);
- /*for(el=are->lhs(),ndim=0; el; el = el->rhs(), ndim++)
-     ; 
- return(ndim <= rank ? ndim : rank); 
- */
-}
-
-void   CreateTaskArray(SgSymbol *ts)
-{int isize,iamv;
- SgExpression *le,*re, *e;
- SgArrayType *artype;
- SgSymbol **tsk_amv = new (SgSymbol *);
- SgSymbol **tsk_ind = new (SgSymbol *);
- SgSymbol **tsk_renum_array = new (SgSymbol *);
- SgSymbol **tsk_lps = new (SgSymbol *);
- SgSymbol **tsk_hps = new (SgSymbol *);
-
- isize = ndvm++;
- SgStatement *dost,*as;
- nio = (nio < 1 ) ? 1: nio;
- artype = isSgArrayType(ts->type());
- doAssignTo(DVM000(isize),ReplaceFuncCall(&artype->sizeInDim(0)->copy()));
- iamv = ndvm; 
- task_ps=iamv;
-                    //doAssignStmt(CreateAMView(DVM000(isize), 1, 0));
- *tsk_amv = TaskAMVSymbol(ts);
- doAssignTo(new SgVarRefExp(*tsk_amv),CreateAMView(DVM000(isize), 1, 0));
-                    //loop_lab = GetLabel();
- le = new SgArrayRefExp(*ts,*new SgValueExp(2),*new SgVarRefExp(loop_var[0]));
- *tsk_renum_array = TaskRenumArraySymbol(ts);
- e = &(*new SgArrayRefExp(**tsk_renum_array,*new SgVarRefExp(loop_var[0])) - *new SgValueExp(1));
- re = GetAMR(new SgVarRefExp(*tsk_amv),e);
- as = new SgAssignStmt(*le,*re);
- dost= new SgForStmt(loop_var[0], new SgValueExp(1), DVM000(isize), new SgValueExp(1), as);
-                    //BIF_LABEL_USE(dost->thebif) = loop_lab->thelabel;
-                    //as->setLabel(*loop_lab); 
- where->insertStmtBefore(*dost,*where->controlParent());
-                    //as->lexNext()->extractStmt();
-                    //le = DVM000(iamv+1);
-                    //re = &(*new SgVarRefExp(loop_var[0]) - *new SgValueExp(1)); //dvm000(...)=i-1
- /* initializing renumeration array */
- le = new SgArrayRefExp(**tsk_renum_array,*new SgVarRefExp(loop_var[0]));
- re = new SgVarRefExp(loop_var[0]);
- as->insertStmtBefore(*new SgAssignStmt(*le,*re));
- //SET_DVM(isize); 
-              // index = new int;
-             // *index = task_ps;
-            // adding the attribute (TASK_INDEX) to TASK symbol
-           //   ts->addAttribute(TASK_INDEX, (void *) index, sizeof(int));
- // adding the attribute (TSK_SYMBOL) to TASK symbol  
-   ts->addAttribute(TSK_SYMBOL, (void*) tsk_amv, sizeof(SgSymbol *));
- *tsk_ind = TaskIndSymbol(ts);
- // adding the attribute (TSK_IND_VAR) to TASK symbol  
-   ts->addAttribute(TSK_IND_VAR, (void*) tsk_ind, sizeof(SgSymbol *));
-
- // adding the attribute (TSK_RENUM_ARRAY) to TASK symbol  
-   ts->addAttribute(TSK_RENUM_ARRAY, (void*) tsk_renum_array, sizeof(SgSymbol *));
- *tsk_lps = TaskLPsArraySymbol(ts);
- // adding the attribute (TSK_LPS_ARRAY) to TASK symbol  
-   ts->addAttribute(TSK_LPS_ARRAY, (void*) tsk_lps, sizeof(SgSymbol *));
- *tsk_hps = TaskHPsArraySymbol(ts);
- // adding the attribute (TSK_HPS_ARRAY) to TASK symbol  
-   ts->addAttribute(TSK_HPS_ARRAY, (void*) tsk_hps, sizeof(SgSymbol *));         
- return;
-}
-
-int LoopVarType(SgSymbol *var,SgStatement *st)
-{ int len;
-  SgType *type;
- 
-  type = var->type();
-  if(!type)
-    return(0);
-    len =  TypeSize(type);    /*16.04.04 */
-     /*len = IS_INTRINSIC_TYPE(type) ? 0 : TypeSize(type);*/
-    //len = (TYPE_RANGES(type->thetype)) ? type->length()->valueInteger() : 0; 14.03.03
-  if(bind_ == 0)
-    switch(type->variant()) {
-        case T_INT:    return((len == 2) ? 2 : 0); // (long = int)
-        default:    
-                     { Error("Illegal type of do-variable '%s'",var->identifier(),178,st);
-                       return(0);
-                     }
-    }
-  if(bind_ == 1)
-    switch(type->variant()) {
-        case T_INT:    if     (len == 8) return(0);
-                       else if(len == 2) return(2);
-                       else              return(1);
-    
-        default:     { Error("Illegal type of do-variable '%s'",var->identifier(),178,st);
-                       return(0);
-                     }
-    }
-  return(0);
-}
-
-int LocVarType(SgSymbol *var,SgStatement *st)
-{ int len;
-  SgType *type;
-  if(!var)
-    return(0);
-  type = var->type();
-  if(!type)
-    return(0);
-  if (isSgArrayType(type))
-    type = type->baseType();
-  len =  TypeSize(type);    /*16.04.04 */
-  if(bind_ == 0)
-    switch(type->variant()) {
-        case T_INT:  if(len == 4)      return(0);  // (long = int)
-                     else if(len == 2) return(2);
-                     else if(len == 1) return(3);
-                     else
-                     { err("Wrong operand of MAXLOC/MINLOC",149,st);
-                       return(0);
-                     }
-                         
-        default:    
-                     { err("Wrong operand of MAXLOC/MINLOC",149,st);
-                       return(0);
-                     }
-    }
-  if(bind_ == 1)
-    switch(type->variant()) {
-        case T_INT:    if     (len == 8) return(0);
-                       else if(len == 4) return(1);
-                       else if(len == 2) return(2);
-                       else if(len == 1) return(3);
-                       else             
-                       { err("Wrong operand of MAXLOC/MINLOC",149,st);
-                         return(0);
-                       }
-        default:     { err("Wrong operand of MAXLOC/MINLOC",149,st);
-                       return(0);
-                     }
-    }
-  return(0);
-}
-
-
-int TypeDVM()
-{return(0);}
-
-void StartTask(SgStatement *stmt)
-{SgStatement *if_stmt, *st;
- SgExpression *ei;
- ei = stmt->expr(0)->lhs()->lhs();
- doAssignTo_After(DVM000(task_ind),ReplaceFuncCall(ei));
- if(!isSgVarRefExp(ei) && !isSgValueExp(ei))
-    ei = DVM000(task_ind); 
- st =  (stmt->variant()==DVM_ON_DIR) ? new SgGotoStmt(*task_lab) : new SgStatement(CYCLE_STMT);
- if_stmt =  new SgLogIfStmt(SgEqOp(*RunAM(new SgArrayRefExp(*(stmt->expr(0)->symbol()),
-*new SgValueExp(2),*ei)),*new SgValueExp(0) ),*st);
-  cur_st->insertStmtAfter(*if_stmt);
-  cur_st = if_stmt->lexNext(); // CYCLE statement or GOTO statement
-  (cur_st->lexNext())-> extractStmt(); //extract ENDIF
-  if(dvm_debug)
-     if( stmt->variant()==DVM_ON_DIR) 
-       InsertNewStatementAfter(D_Iter_ON(task_ind,TypeDVM()),cur_st,stmt->controlParent());
- 
- return;
-}
-
-void InitGroups()
-{  group_name_list *sl;
-   for(sl=grname; sl; sl=sl->next)
-     if(!IS_SAVE(sl->symb))  
-     /* if (sl->symb->variant() == REF_GROUP_NAME){
-        doAssignTo(new SgArrayRefExp(*sl->symb,*new SgValueExp(1)),new SgValueExp(0));
-        doAssignTo(new SgArrayRefExp(*sl->symb,*new SgValueExp(2)),new SgValueExp(0));
-        doAssignTo(new SgArrayRefExp(*sl->symb,*new SgValueExp(3)),new SgValueExp(0));
-      } else  */
-        if (sl->symb->variant() == REDUCTION_GROUP_NAME || sl->symb->variant() == CONSISTENT_GROUP_NAME) 
-          doAssignTo(new SgVarRefExp(*sl->symb),new SgValueExp(0));
-        
-}  
-void CreateRedGroupVars()
-{  group_name_list *sl;
-   SgSymbol *rgs;
-
-   for(sl=grname; sl; sl=sl->next)
-        //if(!IS_SAVE(sl->symb))  ??? 
-     if (sl->symb->variant() == REDUCTION_GROUP_NAME || sl->symb->variant() == CONSISTENT_GROUP_NAME) {
-         SgSymbol **ss = new (SgSymbol *);
-         rgs = new SgVariableSymb(RedGroupVarName(sl->symb), *new SgArrayType(*SgTypeInt()), *cur_func); 
-         *ss = rgs;
-         (sl->symb)->addAttribute( RED_GROUP_VAR, (void *) ss, sizeof(SgSymbol *));
-     }    
-}  
-
-void InitShadowGroups()
-{  group_name_list *sl;
-   for(sl=grname; sl; sl=sl->next)
-     if(!IS_SAVE(sl->symb))  
-        if (sl->symb->variant() == SHADOW_GROUP_NAME)
-          doAssignTo_After(new SgVarRefExp(*sl->symb),new SgValueExp(0));        
-}  
-
-
-void InitRemoteGroups()
-{stmt_list *stl;
-for(stl=pref_st; stl; stl=stl->next) {
-doAssignTo_After(new SgArrayRefExp(*stl->st->symbol(),*new SgValueExp(1)),new SgValueExp(0));
-doAssignTo_After(new SgArrayRefExp(*stl->st->symbol(),*new SgValueExp(2)),new SgValueExp(0));
-doAssignTo_After(new SgArrayRefExp(*stl->st->symbol(),*new SgValueExp(3)),new SgValueExp(0));
-}  
-}
-
-
-void InitRedGroupVariables()
-{group_name_list *gl;
- int i,nl;
- SgSymbol *rgv;
- for(gl=grname; gl; gl=gl->next) 
-  if (gl->symb->variant() == REDUCTION_GROUP_NAME  || gl->symb->variant() == CONSISTENT_GROUP_NAME) {
-    rgv = * ((SgSymbol **) (gl->symb)-> attributeValue(0,RED_GROUP_VAR)); 
-    nl = gl->symb->variant() == REDUCTION_GROUP_NAME ? nloopred : nloopcons;
-    for(i=nl; i; i--)
-      doAssignTo_After(new SgArrayRefExp(*rgv,*new SgValueExp(i)),new SgValueExp(0));
-  }
-}
-
-void WaitDirList()
-{stmt_list *stl;
- SgStatement *stat;
- SgSymbol *rgv, *rg;
- int i,nl;
- stat = cur_st;
- for(stl=wait_list; stl; stl=stl->next) {
-  cur_st = stl->st;
-  rg = ORIGINAL_SYMBOL(stl->st->symbol());
-  rgv = * ((SgSymbol **) rg -> attributeValue(0,RED_GROUP_VAR)); 
-  nl =(cur_st ->variant() == DVM_CONSISTENT_WAIT_DIR) ? ((cur_st->controlParent()->variant() == PROG_HEDR) ? 0 : nloopcons) : nloopred;
-  for(i=nl; i; i--)
-    doAssignTo_After(new SgArrayRefExp(*rgv,*new SgValueExp(i)),new SgValueExp(0));
-}
- cur_st = stat;
-}
-
-void InitDebugVar()
-{SgStatement *stcall;
- int flag;
-if(!dbg_var) return;
-flag = (only_debug) ? 0 : 1;
-doAssignTo_After(new SgVarRefExp(*dbg_var),new SgValueExp(dbg_if_regim));
- cur_st->insertStmtAfter(*(stcall=D_PutDebugVarAdr(dbg_var,flag)));
- cur_st = stcall;
-}
-
-void InitFileNameVariables()
-{  filename_list *sl;
-   SgExpression *lenexp,*e;
-   int length;
-   SgFunctionSymb *fs = new SgFunctionSymb(FUNCTION_NAME, "char", *SgTypeChar(), *cur_func->controlParent());
-   SgFunctionCallExp *fcall =  new SgFunctionCallExp(*fs);
-   fcall->addArg(* new SgValueExp(0));
-   if(filename_num>1 && cur_func->variant() != PROG_HEDR) {
-     file_var_s = new SgVariableSymb(FileNameVar(0), *SgTypeInt(), *cur_func);
-     cur_st = doIfForFileVariables(file_var_s);
-   }
-   for(sl=fnlist; sl; sl=sl->next){
-      length = strlen(sl->name)+1;
-      lenexp = new SgValueExp(length);
-      e =  new SgExpression(ARRAY_OP);
-      e->setLhs(new SgVarRefExp(*sl->fns));
-      e->setRhs(new SgExpression(DDOT,lenexp,lenexp,(SgSymbol *)NULL));
-      doAssignTo_After( e, fcall);  
-   }  
-   if(filename_num>1 && cur_func->variant() != PROG_HEDR){
-     doAssignTo_After( new SgVarRefExp(*file_var_s), new SgValueExp(1));  
-     cur_st = cur_st->lexNext();  
-   }  
-}  
-
-
-void InitHeap(SgSymbol *heap)
-//generating assign statement: HEAP(1) = 2
-{  doAssignTo(ARRAY_ELEMENT(heap,1), new SgValueExp(2)); }
-
-void InitAsyncid()
-{symb_list *sl;
- for(sl=async_symb; sl; sl=sl->next)
-  //generating assign statement: ASINCID(1) = 1 
-   if((IN_COMMON(sl->symb) && IN_MAIN_PROGRAM) || !IN_COMMON(sl->symb))
-     doAssignTo(ARRAY_ELEMENT(sl->symb,1), new SgValueExp(1));
- }
-
-SgExpression * isDoVarUse (SgExpression *e, int use[], SgSymbol *ident[], int ni, int *num, SgStatement *st)
-{
- SgExpression *ei;
- *num =  AxisNumOfDummyInExpr(e, ident, ni, &ei, use, st);
- if (*num<=0) 
-   return(NULL);
- return(ei);
-}
-
-SgSymbol* isIndirectSubscript (SgExpression *e, SgSymbol *ident, SgStatement *st)
-{//temporary
- if(e && ident && st)
-   return(NULL);
- return(NULL);
-}
-
-
-/*
-void InsertRedVarsInGroup(SgExpression *redgref,int irv,int nred)
-{int i;
- for(i=irv+nred-1; i>=irv; i--)
-   doAssignStmtAfter(InsertRedVar(redgref,i,iplp));
-}
-*/
-
-/*
-void BeginDebugFragment(int num,SgStatement *stmt)
-{fragment_list *curfr;
- fragment_list_in *fr;
-
-// searhing frament
-  fr=debug_fragment;
-//looking through the fragment list of command line
-  while(fr && (fr->N1 >  num || fr->N2 < num) ) 
-          fr=fr->next;
-  if (fr){ //fragment with number 'num' is  found (N1 <= num <= N2)
-        if(fr->dlevel){
-               dvm_debug = 1;
-               level_debug = fr->dlevel;
-        }                
-        if(fr->elevel)
-               perf_analysis = fr->elevel;
-        curfr = new fragment_list;
-        curfr->No = num;
-        if(fr->dlevel) 
-            curfr->dlevel = fr->dlevel;
-        else
-            curfr->dlevel = cur_fragment ? cur_fragment->dlevel : 0;
-        if(fr->elevel) 
-            curfr->elevel = fr->elevel;
-        else
-            curfr->elevel = cur_fragment ? cur_fragment->elevel : 0;
-        curfr->next = cur_fragment; 
-        cur_fragment = curfr;   
-  } else {//fragment with number 'num' is not found
-        curfr = new fragment_list;
-        curfr->No = num;
-        curfr->dlevel = cur_fragment ? cur_fragment->dlevel : 0;
-        curfr->elevel = cur_fragment ? cur_fragment->elevel : 0;
-        curfr->next = cur_fragment; 
-        cur_fragment = curfr;  
-  } 
-   return;
-}
-
-void BeginDebugFragment(int num, SgStatement *stmt)
-{fragment_list *curfr;
- fragment_list_in *fr;
- int max_dlevel,max_elevel,is_max;
-//determing maximal level
-  if(stmt)
-    is_max = MaxLevels(stmt,&max_dlevel,&max_elevel); 
-  else 
-    is_max =0;
-  
-// searhing fragment 
-  fr=debug_fragment;
-//looking through the fragment list of command line
-  while(fr && (fr->N1 >  num || fr->N2 < num) ) 
-          fr=fr->next;
-  if (fr){ //fragment with number 'num' is  found (N1 <= num <= N2)
-        if(fr->dlevel){
-            if(fr->dlevel == -1){
-               dvm_debug = 0;
-               level_debug = 0;
-	    } else {        
-               dvm_debug = 1;
-               level_debug = MinLevel(fr->dlevel,max_dlevel,is_max);
-            }
-        }                
-        if(fr->elevel)
-            if(fr->elevel == -1)  
-               perf_analysis = 0;
-            else
-               perf_analysis = MinLevel(fr->elevel,max_elevel,is_max);
-        curfr = new fragment_list;
-        curfr->No = num;
-        curfr->dlevel = level_debug;
-        curfr->elevel = perf_analysis;
-        curfr->next = cur_fragment; 
-        cur_fragment = curfr;   
-  } else {//fragment with number 'num' is not found
-        curfr = new fragment_list;
-        curfr->No = num;
-        curfr->dlevel = cur_fragment ? MinLevel(cur_fragment->dlevel,max_dlevel,is_max) : 0;
-        curfr->elevel = cur_fragment ? MinLevel(cur_fragment->elevel,max_elevel,is_max) : 0;
-        curfr->next = cur_fragment; 
-        cur_fragment = curfr; 
-        perf_analysis =  curfr->elevel;
-	level_debug =  curfr->dlevel;
-	dvm_debug = level_debug ? 1 : 0; 
-  } 
-   return;
-}
-*/
-
-void BeginDebugFragment(int num, SgStatement *stmt)
-{
-    fragment_list *curfr;
-    fragment_list_in *fr;
-    int max_dlevel, max_elevel, is_max, d_current, e_current, spec_dlevel, spec_elevel;
-    //determing maximal level of debugging and performance analyzing
-    if (stmt)
-        is_max = MaxLevels(stmt, &max_dlevel, &max_elevel);
-    else
-    {
-        is_max = 0;
-        max_dlevel = max_elevel = 4;
-    }
-
-    // level specified for surrounding fragment
-    d_current = cur_fragment ? cur_fragment->dlevel_spec : 0;
-    e_current = cur_fragment ? cur_fragment->elevel_spec : 0;
-
-    // searhing fragment in 2 lists
-    fr = debug_fragment;
-    //looking through the fragment list specified for debugging (-d) in  command line
-    while (fr && (fr->N1 > num || fr->N2 < num))
-        fr = fr->next;
-    if (fr) //fragment with number 'num' is  found (N1 <= num <= N2)
-        spec_dlevel = fr->level;
-    else
-        spec_dlevel = d_current;
-
-    fr = perf_fragment;
-    //looking through the fragment list specified for performance analyze (-e) in  command line
-    while (fr && (fr->N1 > num || fr->N2 < num))
-        fr = fr->next;
-    if (fr) //fragment with number 'num' is  found (N1 <= num <= N2)
-        spec_elevel = fr->level;
-    else
-        spec_elevel = e_current;
-    level_debug = MinLevel(spec_dlevel, max_dlevel, is_max);
-    dvm_debug = level_debug ? 1 : 0;
-    perf_analysis = MinLevel(spec_elevel, max_elevel, is_max);
-    curfr = new fragment_list;
-    curfr->No = num;
-    curfr->begin_st = stmt;
-    curfr->dlevel = level_debug;
-    curfr->elevel = perf_analysis;
-    curfr->dlevel_spec = spec_dlevel;
-    curfr->elevel_spec = spec_elevel;
-    curfr->next = cur_fragment;
-    cur_fragment = curfr; 
-}
-
-int MinLevel(int level, int max, int is_max)
-{
-    if (is_max)
-        return((level > max) ? max : level);
-    else
-        return(level);
-}
-
-int MaxLevels(SgStatement *stmt,int *max_dlevel,int *max_elevel)
-{ SgExpression *el,*ee;
-  SgKeywordValExp *kwe;
-  int n,is_max;
-  *max_dlevel = 4;
-  *max_elevel = 4;
-  is_max =0;
-  for(el=stmt->expr(1); el; el = el->rhs()) {
-       ee = el->lhs();
-       kwe = isSgKeywordValExp(ee->lhs());   
-       if (!strcmp(kwe->value(),"d")) {
-            if((ee->rhs()->variant() != INT_VAL) || (n=ee->rhs()->valueInteger()) < 0)
-              err("Illegal debug parameter",303,stmt);
-            else
-	      {*max_dlevel = n; is_max = 1;}
-       }
-       else if (!strcmp(kwe->value(),"e")) {
-            if((ee->rhs()->variant() != INT_VAL)  || (n=ee->rhs()->valueInteger()) < 0)
-              err("Illegal debug parameter",303,stmt);
-            else
-	      {*max_elevel = n; is_max = 1;}
-       }
-  }
-  return(is_max);
-}
-
-void EndDebugFragment(int num)
-{ if(!cur_fragment || cur_fragment->No != num) return;
-  cur_fragment =  cur_fragment->next; 
-  level_debug = cur_fragment->dlevel;
-  dvm_debug = level_debug ? 1 : 0; 
-  perf_analysis = cur_fragment->elevel;
-}
-
-SgExpression *PointerArrElem(SgSymbol *p,SgStatement *stdis)
-{
- SgExpression *el;
- for (el = stdis->expr(0); el; el = el->rhs())
-  if(el->lhs()->symbol() == p)
-    return(el->lhs());
- return(NULL);
-}
-
-SgExpression *ReverseDim(SgExpression *desc,int rank)
-{int i,ind;
-SgExpression *e,*de;
- ind = ndvm;
- e = desc->lhs();   
- for(i= rank-1; i>=0; i--){
-    de = &(desc->copy());
-    if(e) 
-       de->lhs()->setLhs(Calculate(&(e->lhs()->copy()+ *new SgValueExp(i))));
-    else
-       de->setLhs(new SgExprListExp(*new SgValueExp(i+1)));
-    doAssignStmt(de);
- }
-return(DVM000(ind));
-}
-/*
-SgExpression *DoSubscriptList(SgExpression *are,int ind)
-{return(new SgExprListExp(*new SgValueExp(ind)));}
- */
-
-void EndReduction_Task_Region(SgStatement *stmt)
-{
-     if(!stmt) return;     
-   // actualizing of reduction variables
-       if(redgrefts)
-         ReductionVarsStart(task_red_list);
-
-        if(irgts) {
-         // generating call statement:
-         //  call strtrd(RedGroupRef)
-         doCallAfter(StartRed(redgrefts));
-
-         // generating call statement:
-         //  call waitrd(RedGroupRef)
-         doCallAfter(WaitRed(redgrefts));
-         /*ReductionVarsWait(red_list);*/
-	       //if(idebrg){
-               // if(dvm_debug)
-               //     doAssignStmtAfter( D_CalcRG(DVM000(idebrg)));
-               // doAssignStmtAfter( D_DelRG (DVM000(idebrg)));
-               // }
-         // generating assign statement:
-         //  dvm000(i) = delobj(RedGroupRef)
-         doCallAfter(DeleteObject_H(redgrefts));
-       }
-}
-
-
-void Reduction_Task_Region(SgStatement *stmt)
-{SgExpression  *e;
- SgStatement  *st2, *st3;
-
-   irgts=0;
-   redgrefts=NULL;
-   e=stmt->expr(0);
-   if(!e) return;
-   task_red_list = e->lhs();
-   if(  e->symbol()){
-      redgrefts = new SgVarRefExp(e->symbol());
-      doIfForReduction(redgrefts,0);
-      nloopred++;
-      //stcg = doIfForCreateReduction( e->symbol(),nloopcons,0);
-      st2 = doIfForCreateReduction( redgrefts->symbol(),nloopred,1);      
-      st3 = cur_st;
-      cur_st = st2;
-      ReductionList(task_red_list,redgrefts,stmt,st2,st2,0);
-      cur_st = st3;      
-      InsertNewStatementAfter( new SgAssignStmt(*DVM000(ndvm),*new SgValueExp(0)),cur_st,cur_st->controlParent()); 
-
-    } else {
-      irgts = ndvm; 
-      redgrefts = DVM000(irgts);
-      doAssignStmtAfter(CreateReductionGroup());
-                  //!!!??? if(debug_regim){
-                  //  idebcg = ndvm; 
-                  //  doAssignStmtAfter( D_CreateDebRedGroup());
-                  //}
-      
-      ReductionList(task_red_list,redgrefts,stmt,cur_st,cur_st,0); 
-    }  
-}
-
-
-int NumberOfElements(SgSymbol *sym, SgStatement *stmt, int err)
-{int i,rank,nm;
- SgExpression *esize,*numb,*pe;
- SgArrayType *artype;
- SgValueExp c1(1);
- SgSubscriptExp *sbe;
- artype=isSgArrayType(sym->type());
- if(artype)
-   rank = artype->dimension();//array
- else
-    return(1);  //scalar variable
- numb = &c1;
- for(i=1; i<=rank; i++) { //array
-    //calculating size of i-th dimension
-    pe = artype->sizeInDim(i-1);
-    if ((sbe=isSgSubscriptExp(pe)) != NULL){ // [lbound] : [ubound]
-
-      if(err && !sbe->ubound()){ // [lbound] :
-         Error("Assumed-shape or deffered-shape array: %s",sym->identifier(), 295, stmt);
-         esize = &(pe->copy()); 
-      }
-      else if(err && sbe->ubound()->variant() == STAR_RANGE) // ubound = *
-	 Error("Assumed-size array: %s",sym->identifier(), 162, stmt);
-      
-      esize = &(((sbe->ubound())->copy()) - (sbe->lbound() ? (sbe->lbound())->copy() : c1 ) + c1); 
-      
-    } else { // ubound
-      if(err && pe->variant() == STAR_RANGE) // dim=ubound = *
-	 Error("Assumed-size array: %s",sym->identifier(), 162, stmt); 
-      esize = &(pe->copy());
-    }
-    if(esize)
-      numb = &(*numb * (*esize));    
- }
- numb = ReplaceParameter(numb); 
- if (numb->isInteger()) // calculating length if it is possible
-    nm = numb->valueInteger(); 
- else 
-   { Error("Can't calculate array length: %s",sym->identifier(),194,stmt); 
-     nm = 1;
-     if(err == 2) nm=0;
-   }
- return(nm);
- }
-
-
-SgExpression * HeapIndex(SgStatement *st)
-{SgSymbol *s;
- SgExpression *e;
- SgArrayType *artype;
- int rank;
- s = st->expr(0)->symbol();
- artype=isSgArrayType(s->type());
- if(!artype)
-   return(new SgValueExp(POINTER_INDEX(s))); 
- 
- rank = artype->dimension();
- 
- if(rank == 1) {
-   e =&(*new SgValueExp(POINTER_INDEX(s)) + (*st->expr(0)->lhs()->lhs() - *LowerBoundOfDimension(artype,0))* ( *new SgValueExp(HEADER_SIZE(s))));
-   return(e);
- }
- return(new SgValueExp(POINTER_INDEX(s)));
-}
- 
-SgExpression * LowerBoundOfDimension(SgArrayType *artype, int i)
-{ SgExpression *e,*eb;
-  SgSubscriptExp *sbe;
-  e = artype->sizeInDim(i);
-  if(!e) // pointer declaration error 
-    return(new SgValueExp(1)); 
-  if((sbe=isSgSubscriptExp(e)) != NULL)
-    eb = & (sbe->lbound()->copy());
-  else
-    eb = new SgValueExp(1);  // by default lower bound = 1  
-  return(eb);
-}
-
-
-
-SgExpression *AsyncArrayElement(SgExpression *asc, SgExpression *ei)
-{SgArrayRefExp *e;
-    e = new SgArrayRefExp(*ORIGINAL_SYMBOL(asc->symbol()),*ei);
-    if(asc->lhs())
-      e->addSubscript(asc->lhs()->copy());
-    return(e);
-}
-
-void AsyncCopyWait(SgExpression * asc)
-{SgForStmt *dost;
- SgStatement *as,*st;
- SgExpression *eas;
- SgLabel *loop_lab;
- int i;
- st = cur_st;
- 
- //doAssignTo_After(ARRAY_ELEMENT(asc,1),new SgValueExp(1));
- doAssignTo_After(AsyncArrayElement(asc,new SgValueExp(1)),new SgValueExp(1));
- nio = (nio <1) ? 1 : nio;  
- //eas = new SgArrayRefExp(*asc,*new SgVarRefExp(*loop_var[0]));
- eas = AsyncArrayElement(asc, new SgVarRefExp(*loop_var[0]));
- i = ndvm++;
- loop_lab = GetLabel();
- as = new SgAssignStmt(*DVM000(i),*WaitCopy(eas));
- //dost= new SgForStmt(loop_var[0], new SgValueExp(2), ARRAY_ELEMENT(asc,1), new SgValueExp(1), as);
- dost= new SgForStmt(loop_var[0], new SgValueExp(2), AsyncArrayElement(asc,new SgValueExp(1)), new SgValueExp(1), as);
- BIF_LABEL_USE(dost->thebif) = loop_lab->thelabel;
- as->setLabel(*loop_lab); 
- InsertNewStatementAfter(dost, st, st->controlParent());
- as->lexNext()->extractStmt();
- cur_st = as;
- 
- SET_DVM(i);
-}
-
-int isWholeArray(SgExpression *ae)
-{
-    if(!isSgArrayRefExp(ae))
-        return (0);
-    for(SgExpression *el=ae->lhs(); el; el=el->rhs())
-    {
-        if(el->lhs()->variant() != DDOT)
-            return (0);
-        if(el->lhs()->lhs() || el->lhs()->rhs())
-            return (0);
-        continue;
-    }
-    return (1);
-}
- 
-int DistrArrayAssign(SgStatement *stmt)
-{SgExpression *le,*re,*headl,*headr;
- int to_init,rl,from_init,rr,dvm_ind,left_whole,right_whole;
- SgSymbol *ar;
- SgType *typel,*typer;
-  
- re = stmt->expr(1);
- le = stmt->expr(0);
- if(!isSgArrayRefExp(le)) 
-     return(0);
- if(!isSgArrayType(le->type()))
-     return(0);
- if(isSgArrayType(re->type()))
-   if(!isSgArrayRefExp(re))
-     return(0);
-   else
- // assignment statement of kind: <dvm_array_section> = <array_section>
-   { 
-     if(only_debug)
-       return(1);
-     left_whole  = !le->lhs();
-     right_whole = !re->lhs();
-     CANCEL_RTS2_MODE;  // switch to basic RTS interface
-     ChangeDistArrayRef(le->lhs());   //replacing dvm-array references in subscript list
-     ChangeDistArrayRef(re->lhs());
-     LINE_NUMBER_BEFORE(stmt,stmt);
-     cur_st = stmt;
-     dvm_ind = 0;
-     ar = le->symbol();
-     rl = Rank(ar);
-     typel = ar->type()->baseType();
-     headl = HeaderRef(ar);
-     
-     SgExpression *left_section_list = ArraySection(le,ar,rl,stmt,to_init);
-     ar = re->symbol();
-     typer = ar->type()->baseType();
-     if(!CompareTypes(typel,typer))
-        err("Different types of left and right side",620,stmt);
-     rr = Rank(ar);
-     headr = HeaderRef(ar);
-     if(!headr)
-     {         //Warning("'%s' isn't distributed array", ar->identifier(), 72,stmt);
-      /*
-        if(re->lhs())  // section
-        { dvm_ind = HeaderForNonDvmArray(ar,stmt);
-          headr = DVM000(dvm_ind);
-        } else         // whole array
-          headr = FirstElementOfSection(re);
-      */ 
-        dvm_ind = HeaderForNonDvmArray(ar,stmt);
-        headr = DVM000(dvm_ind); 
-     }
-     SgExpression *right_section_list  = ArraySection(re,ar,rr,stmt,from_init);  
-     if(INTERFACE_RTS2)
-     {  
-        if(left_whole && right_whole)  // whole-array = whole-array
-           doCallAfter(DvmhArrayCopyWhole(headr,headl));
-        else
-           doCallAfter(DvmhArrayCopy(headr,rr,right_section_list,headl,rl,left_section_list));
-     }
-     else
-        doAssignStmtAfter(ArrayCopy(headr, from_init, from_init+rr, from_init+2*rr, headl, to_init, to_init+rl, to_init+2*rl, 0));
-     if(dvm_ind)
-        doCallAfter(DeleteObject_H(DVM000(dvm_ind)));
-     SET_DVM(to_init); 
-     RESUMPTION_RTS2_MODE; // return to RTS2 interface   
-     return(1);
-   }
-  
- // assignment statement of kind: <dvm_array_section> = <scalar_expression>
- if(only_debug)
-     return(1);
- CANCEL_RTS2_MODE;  // switch to basic RTS interface
- if(INTERFACE_RTS2 && !isWholeArray(stmt->expr(0)))
-     err("Illegal array statement in -Opl2 mode", 642, stmt);
-
- ChangeDistArrayRef(stmt->expr(0)->lhs());   //replacing dvm-array references in subscript list
- ChangeDistArrayRef(stmt->expr(1));
-
- LINE_NUMBER_BEFORE(stmt,stmt);
- cur_st = stmt;
- ar = le->symbol();
- rl = Rank(ar);
- headl = HeaderRef(ar);
- typel = ar->type()->baseType();
- headr = TypeFunction(typel,re,KINDFunction(new SgArrayRefExp(*baseMemory(ar->type()->baseType()))));
- SgExpression *left_section_list  = ArraySection(le,ar,rl,stmt,to_init);
- if(INTERFACE_RTS2)
-     doCallAfter(DvmhArraySetValue(headl,headr));
- else  
-     doAssignStmtAfter(ArrayCopy(headr, to_init, to_init, to_init, headl, to_init, to_init+rl, to_init+2*rl, -1));
- SET_DVM(to_init);
- RESUMPTION_RTS2_MODE;  // return to RTS2 interface
- return(1);
-}
-
-int AssignDistrArray(SgStatement *stmt)
-{SgExpression *le,*re,*headl,*headr;
- int to_init,rl,from_init,rr,dvm_ind,left_whole,right_whole;
- SgSymbol *ar;
- SgType *typel,*typer; 
-    re = stmt->expr(1);
-    le = stmt->expr(0);
-    if(!isSgArrayRefExp(le) || !isSgArrayType(le->type())) 
-      return(0);
-    if(!isSgArrayRefExp(re) || !isSgArrayType(re->type()) || !IS_DVM_ARRAY(re->symbol()))
-      return(0);
-
- // assignment statement of kind: <array_section> = <dvm_array_section>
-    if(only_debug)
-       return(1);
-     CANCEL_RTS2_MODE;  // switch to basic RTS interface
-     left_whole  = !le->lhs();
-     right_whole = !re->lhs();
-
-     ChangeDistArrayRef(stmt->expr(0)->lhs());   //replacing dvm-array references in subscript list
-     ChangeDistArrayRef(stmt->expr(1)->lhs());
-     
-     LINE_NUMBER_BEFORE(stmt,stmt); //LINE_NUMBER_AFTER(stmt,stmt);
-     cur_st = stmt;
-     ar = le->symbol();
-     typel = ar->type()->baseType();
-                      //Warning("'%s' isn't distributed array", ar->identifier(), 72,stmt);
-     rl = Rank(ar);
-   /*
-     if(le->lhs())  // section
-     { dvm_ind = HeaderForNonDvmArray(ar,stmt);
-       headl = DVM000(dvm_ind);
-     } else         // whole array
-     { dvm_ind = 0; 
-       headl = FirstElementOfSection(le); 
-     }
-   */
-     dvm_ind = HeaderForNonDvmArray(ar,stmt);
-     headl = DVM000(dvm_ind);
-     SgExpression *left_section_list  = ArraySection(le,ar,rl,stmt,to_init);
-     ar = re->symbol();
-     typer = ar->type()->baseType();
-     rr = Rank(ar);
-     headr = HeaderRef(ar);
-     if(!headr) { // if there is error of dvm-array specification, header is not created
-        RESUMPTION_RTS2_MODE;  // return to RTS2 interface
-        return(0);
-     }
-     if(!CompareTypes(typel,typer))
-        err("Different types of left and right side",620,stmt);
-
-     SgExpression *right_section_list  = ArraySection(re,ar,rr,stmt,from_init);
-     if(INTERFACE_RTS2)
-     {  
-        if(left_whole && right_whole)  // whole-array = whole-array
-           doCallAfter(DvmhArrayCopyWhole(headr,headl));
-        else
-           doCallAfter(DvmhArrayCopy(headr,rr,right_section_list,headl,rl,left_section_list));
-     }
-     else
-        doAssignStmtAfter(ArrayCopy(headr, from_init, from_init+rr, from_init+2*rr, headl, to_init, to_init+rl, to_init+2*rl, 0));   
-
-     if(dvm_ind)
-        doCallAfter(DeleteObject_H(DVM000(dvm_ind)));
-        
-     SET_DVM(dvm_ind ? dvm_ind : to_init) ;   //SET_DVM(to_init);
-     RESUMPTION_RTS2_MODE; // return to RTS2 interface
-     return(1);
-}
-
-SgExpression *ArraySection(SgExpression *are, SgSymbol *ar, int rank, SgStatement *stmt, int &init)
-{
- SgExpression *el,*einit[MAX_DIMS],*elast[MAX_DIMS],*estep[MAX_DIMS];
- SgExpression *section_list = NULL;
- int i,j;
- init = ndvm;
- if(!are->lhs()) { //MakeSection(are); // A => A(:,:, ...,:)
-   if(INTERFACE_RTS2)
-      MakeSection(are);  // A => A(:,:, ...,:)
-   else {
-      for(j=rank; j; j--)
-         doAssignStmtAfter(Calculate(new SgValueExp(-1)));
-      ndvm += 2*rank;
-      return (section_list);//return(init);
-   }
- }
- if(!TestMaxDims(are->lhs(),ar,stmt)) return(0);
- for(el=are->lhs(),i=0; el; el=el->rhs(),i++)    
-    Triplet(el->lhs(),ar,i, einit,elast,estep); 
- if(i != rank){
-    Error("Wrong number of subscripts specified for '%s'",ar->identifier(),140 ,stmt);
-    //return (0);
- }
- if(INTERFACE_RTS2) 
-    for(j=0; j<i; j++) //reversing dimensions for LibDVM
-    {
-       section_list = AddElementToList(section_list, DvmType_Ref(estep[j]));
-       section_list = AddElementToList(section_list, DvmType_Ref(elast[j]));
-       section_list = AddElementToList(section_list, DvmType_Ref(einit[j]));
-    }
- else {
-    for(j=i; j; j--)
-       doAssignStmtAfter(Calculate(einit[j-1])); 
-    for(j=i; j; j--)
-       doAssignStmtAfter(Calculate(elast[j-1])); 
-    for(j=i; j; j--)
-       doAssignStmtAfter(estep[j-1]);
- }  
- return (section_list); //return(init);
-}
-
-void AsynchronousCopy(SgStatement *stmt)
-{SgExpression *le,*re,*el,*einit[MAX_DIMS],*elast[MAX_DIMS],*estep[MAX_DIMS],*headl,*headr,*flag,*ec;
- int j,i,from_init,to_init,rl,rr;
- SgSymbol *ar,*ar1;
- SgType *typel,*typer;
- if(!async_id)
-     return;
- LINE_NUMBER_BEFORE(stmt,stmt);   //moving the label if present
- ec =  AsyncArrayElement(async_id, new SgValueExp(1));
- flag = AsyncArrayElement(async_id, ec);
- doAssignTo_After(ec, &(*ec + (*new SgValueExp(1))));
-
- re = stmt->expr(1);
- if(!isSgArrayRefExp(re)) {
-     err("Illegal statement in ASYNCHRONOS_ENDASYNCHRONOUS block",901,stmt);
-     return;
- }
- 
- ar = re->symbol();
- typer = ar->type()->baseType();
- ar1=ar;
- rr = Rank(ar);
- headr = HeaderRef(ar);
- if(!TestMaxDims(re->lhs(),ar,stmt)) return;
- if(!re->lhs()) MakeSection(re); // A => A(:,:, ...,:)
- for(el=re->lhs(),i=0; el; el=el->rhs(),i++)    
-    Triplet(el->lhs(),ar,i, einit,elast,estep);
- if(i != rr){
-    Error("Wrong number of subscripts specified for '%s'",ar->identifier(),140 ,stmt);
-    return;
- }
- from_init = ndvm;
- for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(einit[j-1])); 
- for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(elast[j-1])); 
- for(j=i; j; j--)
-      doAssignStmtAfter(estep[j-1]); 
-
- le = stmt->expr(0);
- if(!isSgArrayRefExp(le)) {
-     err("Illegal statement in ASYNCHRONOS_ENDASYNCHRONOUS block",901,stmt);
-     return;
- }
- ar = le->symbol();
- rl = Rank(ar);
- typel = ar->type()->baseType();
- if(!CompareTypes(typel,typer))
-    err("Different types of left and right side",620,stmt);
- headl = HeaderRef(ar);
- if(!TestMaxDims(le->lhs(),ar,stmt)) return;
- if(!le->lhs()) MakeSection(le); // A => A(:,:, ...,:)
- for(el=le->lhs(),i=0; el; el=el->rhs(),i++)    
-    Triplet(el->lhs(),ar,i, einit,elast,estep);
- if(i != rl){
-    Error("Wrong number of subscripts specified for '%s'",ar->identifier(),140 ,stmt);
-    return;
- }
- to_init = ndvm;
- for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(einit[j-1])); 
- for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(elast[j-1])); 
- for(j=i; j; j--)
-      doAssignStmtAfter(estep[j-1]); 
-
- if(!headr && !headl) {
-     err("Both arrays  are not distributed", 297,stmt); 
-     return;
- } else if(!headr) {
-     Warning("'%s' isn't distributed array", ar1->identifier(), 72,stmt);
-     headr = FirstElementOfSection(re); 
- } else if(!headl) {
-     Warning("'%s' isn't distributed array", ar->identifier(), 72,stmt);
-     headl = FirstElementOfSection(le);
- }
-
- doAssignStmtAfter(AsyncArrayCopy(headr, from_init, from_init+rr, from_init+2*rr, headl, to_init, to_init+rl, to_init+2*rl, 0, flag));
-
- SET_DVM(from_init);
-}
-
-void Triplet(SgExpression *e,SgSymbol *ar,int i, SgExpression *einit[],SgExpression *elast[],SgExpression *estep[])
-{SgValueExp c1(1),c0(0);
-
-  if(e->variant() != DDOT) { //is not triplet
-      einit[i] =  INTERFACE_RTS2 ? e : &(*e-*Exprn(LowerBound(ar,i)));
-      elast[i] =  einit[i];
-      estep[i] =  &c1.copy();
-      return;
-  }
-  // is triplet
-
-  if(e->lhs() && e->lhs()->variant() == DDOT) { // there is step
-      estep[i] = e->rhs();
-      e  = e->lhs();    
-  } else
-      estep[i] =  &c1.copy();
-  if (!e->lhs()) 
-      einit[i] =  INTERFACE_RTS2 ? ConstRef_F95(-2147483648) : &c0.copy();
-  else
-      einit[i] =  INTERFACE_RTS2 ? e->lhs() : &(*(e->lhs())-*Exprn(LowerBound(ar,i)));
-  if (!e->rhs())
-      elast[i] =  INTERFACE_RTS2 ? ConstRef_F95(-2147483648) : &(*Exprn(UpperBound(ar,i))-*Exprn(LowerBound(ar,i)));
-  else
-      elast[i] =  INTERFACE_RTS2 ? e->rhs() : &(*(e->rhs())-*Exprn(LowerBound(ar,i)));   
-  
- return;
-}
-
-void LowerBoundInTriplet(SgExpression *e,SgSymbol *ar,int i, SgExpression *einit[])
-{
-   SgValueExp c1(1),c0(0);
-   if(e->variant() != DDOT) { //is not triplet
-      einit[i] = &(e->copy());
-      return;
-   }
-   // is triplet
-   if(e->lhs() && e->lhs()->variant() == DDOT)  // there is step
-      e = e->lhs(); 
-   e = e->lhs();   
-   if (!e) 
-    einit[i] = Exprn(LowerBound(ar,i)); //new SgValueExp(1);
-   else
-    einit[i] = &(e->copy());
-   return;
-}
-                                              
-
-void UpperBoundInTriplet(SgExpression *e,SgSymbol *ar,int i, SgExpression *einit[])
-{
-   //SgValueExp c1(1),c0(0);
-   if(e->variant() != DDOT) { //is not triplet
-      einit[i] = &(e->copy());
-      return;
-   }
-   // is triplet
-   if(e->lhs() && e->lhs()->variant() == DDOT)  // there is step
-      e = e->lhs(); 
-   e = e->rhs();   
-   if (!e) 
-    einit[i] = Exprn(UpperBound(ar,i)); 
-   else
-    einit[i] = &(e->copy());
-   return;
-}
-                                              
- 
-int doSectionIndex(SgExpression *esec, SgSymbol *ar, SgStatement *st, int idv[], int ileft, SgExpression *lrec[], SgExpression *rrec[])
-{int i, j, rank, isec, ilow, ihi;
- SgExpression *el,*einit[MAX_DIMS],*elast[MAX_DIMS],*estep[MAX_DIMS];
- SgValueExp cM1(-1);
- rank = Rank(ar);
- isec = ndvm;
- for(j=rank; j; j--)
-   doAssignStmtAfter(&cM1); 
- if(! esec->lhs()) { //no array section
-   idv[0] = isec;
-   idv[1] = idv[0];
- } else {
-   if(!TestMaxDims(esec->lhs(),ar,st)) return (0);
-   for(el=esec->lhs(),i=0; el; el=el->rhs(),i++) //looking through the section index list  
-      Triplet(el->lhs(),ar,i, einit,elast,estep);
-   if(i != rank){
-      Error("Wrong number of subscripts specified for '%s'",ar->identifier(),140 ,st);
-      return(0);
-   }
- 
-   for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(einit[j-1])); 
-   for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(elast[j-1])); 
-
-   idv[0] = isec+rank;
-   idv[1] = isec+2*rank;
- }
- if(!esec->rhs()){
-    idv[2] = isec;
-    idv[3] = ileft; 
-    idv[4] = isec;
-    idv[5] = ileft+rank;
-    return(1); 
- }
- ilow=ndvm;
- if(!esec->rhs()->lhs()) {//no low shadow section
-   idv[2] = isec;
-   idv[3] = ileft; 
- } else {
-   if(!TestMaxDims(esec->rhs()->lhs(),ar,st)) return (0); 
-   for(el=esec->rhs()->lhs(),i=0; el; el=el->rhs(),i++)//looking through the section index list  
-      ShadowSectionTriplet(el->lhs(), i, einit,elast,estep,lrec,rrec,0);
-   if(i != rank){
-      Error("Wrong number of subscripts specified for '%s'",ar->identifier(),140 ,st);
-      return(0);
-   }
- 
-   for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(einit[j-1])); 
-   for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(elast[j-1])); 
-
-   idv[2] = ilow;
-   idv[3] = ilow+rank;
- }
- ihi=ndvm;
- if(!esec->rhs()->rhs()) {//no high shadow section
-   idv[4] = isec;
-   idv[5] = ileft+rank; 
- } else { 
-   if(!TestMaxDims(esec->rhs()->rhs(),ar,st)) return (0);
-   for(el=esec->rhs()->rhs(),i=0; el; el=el->rhs(),i++)//looking through the section index list  
-      ShadowSectionTriplet(el->lhs(), i, einit,elast,estep,lrec,rrec,1);
-   if(i != rank){
-      Error("Wrong number of subscripts specified for '%s'",ar->identifier(),140 ,st);
-      return(0);
-   }
- 
-   for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(einit[j-1])); 
-   for(j=i; j; j--)
-      doAssignStmtAfter(Calculate(elast[j-1])); 
-
-   idv[4] = ihi;
-   idv[5] = ihi+rank;
- } 
- return(1);
-}
-
-void ShadowSectionTriplet(SgExpression *e, int i, SgExpression *einit[], SgExpression *elast[], SgExpression *estep[],  SgExpression *lrec[], SgExpression *rrec[], int flag)
-{SgValueExp c1(1),c0(0),cM1(-1);
-
-  if(e->variant() != DDOT) { //is not triplet
-      einit[i] = &(*e-c1.copy());
-      elast[i] =  einit[i];
-      estep[i] = &c1.copy();
-      return; 
-  } 
-  // is triplet
-
-  if(e->lhs() && e->lhs()->variant() == DDOT) { // there is step
-      estep[i] = e->rhs();
-      e  = e->lhs();    
-  } else
-      estep[i] = &c1.copy();
-
-  if(!e->lhs() && !e->rhs()) {
-      einit[i] =  &cM1.copy();
-      elast[i] = (flag == 0 )? lrec[i] : rrec[i];
-      return;
-  }
-  if(!e->lhs())
-      einit[i] =  &c0.copy();
-  else
-      einit[i] =  &(*(e->lhs())- c1.copy());
-  if (!e->rhs())
-      elast[i] =   &(((flag == 0 )? *lrec[i] : *rrec[i]) -  c1.copy());
-  else
-      elast[i] =  &(*(e->rhs()) - c1.copy());
-  
- return;
-}
-
-void DeleteShadowGroups(SgStatement *stmt)
-{  group_name_list *sl;
-   //int i;
-   //i=0;
-   for(sl=grname; sl; sl=sl->next)
-                      //if(!IS_SAVE(sl->symb))    /*podd 18.09.07*/  
-       if (sl->symb->variant() == SHADOW_GROUP_NAME){
-          //if(i == 0)
-	    //{ LINE_NUMBER_BEFORE(stmt,stmt);}
-          //i++;
-          doIfForDelete(sl->symb,stmt);  
-       }             
-}  
-
-void DeleteLocTemplate(SgStatement *stmt)
-{symb_list *sl;
- SgExpression *e;
- //if(loc_templ_symb)
-   //{ LINE_NUMBER_BEFORE(stmt,stmt);}
- for(sl=loc_templ_symb; sl; sl=sl->next){
-    e =  HeaderRef(sl->symb);
-    if(e)
-      InsertNewStatementBefore(DeleteObject_H(e),stmt);
- }         
-}
-
-void RegistrationList(SgStatement *stmt)
-{ SgExpression *el;
-  SgSymbol * s;
-  int is_assign;
-    is_assign =0;           
-    for(el=stmt->expr(0); el; el=el->rhs()) {
-        if(el->lhs()->variant() == ASSGN_OP || el->lhs()->variant() == POINTST_OP) is_assign = 1;//with initial value
-        s = el->lhs()->symbol();
-        if(debug_regim && s && IS_ARRAY(s)) 
-             registration = AddNewToSymbList( registration, s);        
-    }
-    if(is_assign && stmt->variant() == VAR_DECL && !stmt->expr(2))
-       stmt->setVariant(VAR_DECL_90);
-    return;         
-}        
-
-SgExpression *DebReductionGroup(SgSymbol *gs)
-{
-    SgSymbol *rgv;
-    SgExpression *rgvref;
-    rgv = * ((SgSymbol **) (ORIGINAL_SYMBOL(gs)) -> attributeValue(0,RED_GROUP_VAR));
-    rgvref = new SgArrayRefExp(*rgv,*new SgValueExp(0)); 
-    return(rgvref);
-}
-
-void EndOfProgramUnit(SgStatement *stmt, SgStatement *func, int begin_block)
-{
-              if(func->variant() == PROG_HEDR) {  // for MAIN program
-                SgStatement *where_st = stmt;
-                if(begin_block)
-                  where_st = EndBlock_H(stmt); 
-                ExitDataRegionForVariablesInMainProgram(where_st); /*ACC*/         
-                RTLExit(stmt);
-              }              
-              else if (func->variant() == PROC_HEDR || func->variant() == FUNC_HEDR) {
-                SgStatement *stat = stmt;                                
-                if(begin_block)
-                  stat = EndBlock_H(stmt);                
-                else
-                  DeleteShadowGroups(stmt);
-                if(loc_templ_symb) 
-                  DeleteLocTemplate(stmt);
-                acc_return_list = addToStmtList(acc_return_list,stat); //save the point to insert RTSH-calls:dvmh_data_exit                
-              }
-}
-void InitBaseCoeffs()
-{
-   if(opt_base && !HPF_program && dsym) {
-     symb_list *sl;
-     coeffs * c;
-     SgExpression *e,*el;
-     SgType *t;
-     for(sl=dsym; sl; sl=sl->next) {
-     c = AR_COEFFICIENTS(sl->symb); //((coeffs *) sl->symb-> attributeValue(0,ARRAY_COEF));
-     if(!c->use) 
-       continue;
-     e = new SgVarRefExp(*(c->sc[1]));
-     t = sl->symb->type()->baseType();
-     el = &((*GetAddresMem( new SgArrayRefExp(*baseMemory(t),*new SgValueExp(0))) - *GetAddresMem( new SgArrayRefExp(**ARRAY_BASE_SYMBOL(sl->symb),*new SgValueExp(0)))) / *new SgValueExp(TypeSize(t)));
-     
-     doAssignTo_After(e, el); 
-     //     rank=Rank(sl->symb);
-     //for(i=1;i<=rank;i++){
-     //  eel = new SgExprListExp(* new SgVarRefExp(*(c->sc[1])));
-     }
-   }
-}
-
-void CreateIndexVariables(SgExpression *dol)
-{SgExpression *dovar;
-// looking through the do_variables list
- for(dovar=dol; dovar; dovar=dovar->rhs())
-   if(!(INDEX_SYMBOL(dovar->lhs()->symbol()))){
-        SgSymbol **s = new (SgSymbol *);
-        //creating new variable
-        *s = IndexSymbol(dovar->lhs()->symbol());
-       // adding the attribute (INDEX_DELTA) to do-variable symbol
-        (dovar->lhs()->symbol())->addAttribute(INDEX_DELTA, (void*) s, sizeof(SgSymbol *)); 
-        index_symb = AddToSymbList(index_symb,*s);
-   }    
-}
-
-void  doAssignIndexVar(SgExpression *dol,int iout, SgExpression *init[])
-{SgExpression *dovar;
- int i;
-// looking through the do_variables list
- for(dovar=dol,i=0; dovar; dovar=dovar->rhs(),i++){
-   if(INDEX_SYMBOL(dovar->lhs()->symbol())) 
-    doAssignTo_After(new SgVarRefExp(*INDEX_SYMBOL(dovar->lhs()->symbol())),&(*DVM000(iout+i) - init[i]->copy())); 
-}
-}
-
-SgExpression *TestDVMArrayRef(SgExpression *e)
-{SgExpression *dovar, *vl, *ei, *el, *coeff, *cons, *eop;
- SgSymbol *dim_ident[MAX_DIMS];
- int i,j,k,n,num,use[MAX_DIMS],is;
- sum_dvm = NULL;
- is = isInSymbList(dvm_ar,e->symbol());
-    
- if(!HEADER(e->symbol())) return(NULL);
- n = Rank(e->symbol());
- sum_dvm = coef_ref(e->symbol(),n+2);
- vl = parallel_dir->expr(2); // do_variables list of PARALLEL directive
- for(dovar=vl,i=0; dovar; dovar=dovar->rhs(),i++){
-   dim_ident[i] = dovar->lhs()->symbol();
-   //fprintf(stderr,"%s\n",dovar->lhs()->symbol()->identifier());
-   use[i] = 0;
- }
- //fprintf(stderr,"%d\n",i);
- for(el=e->lhs(),k=n+1;el;el=el->rhs(),k--){
-   //fprintf(stderr,"%d\n",k);
-   for(j=0;j<i;j++)
-     use[j] = 0;
-   num=AxisNumOfDummyInExpr(el->lhs(),dim_ident,i,&ei,use,NULL);
-   //fprintf(stderr,"num%d\n",num);
-   if(num<0){
-    Warning("Maybe incorrect subscript of DVM-array reference: %s",e->symbol()->identifier(),332,cur_st);
-    return(NULL);
-   }
-   if(num == 0) continue;
-   CoeffConst(el->lhs(),ei,&coeff,&cons);
-   if(!coeff){
-      Warning("Maybe incorrect subscript of DVM-array reference: %s",e->symbol()->identifier(),332,cur_st);
-      return(NULL);
-   }
-   eop = new SgVarRefExp(*INDEX_SYMBOL(dim_ident[num-1]));
-  
-   if(k!=(n+1)){
-     eop = &((*coef_ref(e->symbol(),k))* (*eop));
-     //  fprintf(stderr,"%d\n",k);
-   }
-   if(coeff->isInteger() && coeff->valueInteger() == 1)
-     {;} 
-   else
-     eop = &((coeff->copy()) *(*eop));  
-   sum_dvm = &(*sum_dvm + (*eop) );
-
- }
- //do_var=isDoVarUse(es->lhs(),use,dim_ident,i,&num,par_st)
- //*num =  AxisNumOfDummyInExpr(e, ident, ni, &ei, use, cur_st);
- //if (*num<=0) 
- //  return(NULL);
- //return(ei);
- //sum_dvm->unparsestdout();
- //eop->unparsestdout();
- //fprintf(stderr,"%s%d\n",e->symbol()->identifier(),k);
-
-   if(!is) ChangeArrayCoeff(e->symbol());
- return(sum_dvm);
-}
-
-
-void ChangeIndexRefBySum(SgExpression *ve)
-{
- SgSymbol *is,*s;
- is = *INDEX_SYMBOL(ve->symbol());
- s = ve->symbol();
- NODE_CODE(ve->thellnd) = ADD_OP;
- //ve->setVariant(ADD_OP);
- ve->setLhs(*new SgVarRefExp(*s));
- //ve->setLhs(ve->copy());
- //ve->setLhs(*new SgValueExp(1));
- ve->setRhs(*new SgVarRefExp(is));
- ve->setSymbol((SgSymbol*) NULL);
- //NODE_SYMB(ve->thellnd) = NULL;  
-}
-
-void ChangeArrayCoeff(SgSymbol *ar)
-{
-
- InsertNewStatementBefore(new SgAssignStmt(*coef_ref(ar,0),*sum_dvm),first_do_par);
-
-}
-
-
-SgSymbol *CreateInitLoopVar(SgSymbol *dovar, SgSymbol *init)
-{   
-   if(INIT_LOOP_VAR(dovar)) 
-      return( *INIT_LOOP_VAR(dovar));
-   else {
-        SgSymbol **s = new (SgSymbol *);
-        //creating new variable
-        *s = InitLoopSymbol(dovar,init->type());
-       // adding the attribute (INIT_LOOP) to do-variable symbol
-        dovar->addAttribute(INIT_LOOP, (void*) s, sizeof(SgSymbol *)); 
-        index_symb = AddToSymbList(index_symb,*s);
-        return(*s);
-   } 
-}
-
-
-void ConsistentArrayList  (SgExpression *el,SgExpression *gref, SgStatement *st, SgStatement *stmt1, SgStatement *stmt2)
-{ SgStatement *last,*last1;
-  SgExpression  *er, *ev, *header = NULL,*size_array;
-  int  nr, ia=-1, sign, re_sign,renew_sign,iaxis,rank;
-  SgSymbol *var; 
-//  SgValueExp c0(0),c1(1);
-  last = stmt2; last1 = stmt1;
-  //looking through the consistent array list
-  for(er = el; er; er=er->rhs()) {
-     ev = er->lhs(); // consistent array reference
-     var = ev->symbol();
-
-   /*  if(st->variant() == DVM_CONSISTENT_GROUP_DIR){
-       red_group_var_list=AddToSymbList(red_group_var_list,var);
-       if(loc_var->symbol())
-         red_group_var_list =AddToSymbList(red_group_var_list,loc_var->symbol());                  
-     }    
-     else{
-        new_red_var_list=AddToSymbList(new_red_var_list,var);
-       if(loc_var->symbol())
-         new_red_var_list =AddToSymbList(new_red_var_list,loc_var->symbol()); 
-     }
-    */
-  
-     if(var) 
-       ia = var->attributes();
-    
-     if( isSgArrayRefExp(ev)) {
-           
-         if((ia & DISTRIBUTE_BIT) ||(ia & ALIGN_BIT)|| (ia & INHERIT_BIT))      //06.12.12
-         {   Error("Illegal object '%s' in CONSISTENT clause ", var->identifier(), 399,st);
-                                      //  Error("'%s' is distributed array", var->identifier(), 148,st);
-             continue;
-         }                              
-
-         else if(!(ia & CONSISTENT_BIT) )                                      // 06.12.12    && !(ia & DISTRIBUTE_BIT) && !(ia & ALIGN_BIT) && !(ia & INHERIT_BIT)){
-         {   Error("Illegal object '%s' in CONSISTENT clause ", var->identifier(), 399,st);             
-             continue;
-         }
-         
-     } else {
-        err("Illegal object in CONSISTENT clause ", 399,st);
-                    //err("Wrong consistent array",151,st); //??? error number 
-        continue;
-     }
-
-     if(stmt1 != stmt2) 
-       cur_st = last1;
-
-     if(!only_debug) {
-        header = new SgArrayRefExp(*(CONSISTENT_HEADER(var)),*new SgValueExp(1));   //HeaderRef(var);
-        rank = Rank(var);
-        if(IN_COMPUTE_REGION || inparloop && parloop_by_handler)    /*ACC*/
-        { int i;
-          for(i=0;i<rank;i++) 
-             doAssignTo_After(header_ref(header->symbol(),rank+3+i) , Exprn( LowerBound(var,i))) ;     
-        }
-        size_array = DVM000(ndvm);
-
-        sign = 1;
-        re_sign = 0;  // aligned array may not be redisributed 
-
-       // call crtraf (ArrayHeader,ExtHdrSign,Base,Rank,TypeSize,SizeArray, StaticSign, ReDistrSign, Memory)  
-
-       doCallAfter(CreateDvmArrayHeader(var, header, size_array, rank, sign, re_sign)); 
-       where = cur_st;
-       doSizeFunctionArray(var,st); 
-       cur_st = where;
-     }
-
-     //if(debug_regim) {
-     //  debgref = idebrg ? DVM000(idebrg) : DebReductionGroup(gref->symbol());
-     //  doAssignStmtAfter(D_InsRedVar(debgref,num_red,ev,ntype,ilen, loc_var, ilen+1,locindtype));
-     //}
-
-     last1 = cur_st;
-
-     if(stmt1 != stmt2) 
-         cur_st = last;
-     renew_sign = 0; //????
-     if(!only_debug){
-       iaxis = ndvm;
-       //insert  array into consistent group
-       if(st->variant() == DVM_TASK_REGION_DIR){
-          doAxisTask(st,ev);
-            //doAssignStmtAfter(IncludeConsistentTask(gref,header,DVM000(PS_INDEX(st->symbol())),iaxis,re_sign));  
-          doAssignStmtAfter(IncludeConsistentTask(gref,header,new SgVarRefExp(TASK_SYMBOL(st->symbol())),iaxis,re_sign));  
-
-       }
-       else {//DVM_PARALLEL_ON_DIR
-         nr = doAlignIteration(st, ev);
-         doAssignStmtAfter(InsertConsGroup(gref,header,iplp,iaxis, iaxis+nr, iaxis+2*nr,re_sign));     
-       }
-     }
-     last = cur_st;
-  }   
-  
-   return;
-}     
-
-void ConsistentArraysStart  (SgExpression *el)
-{ 
-  SgExpression  *er, *ev; 
-
-  //looking through the consistent array list
-  for(er = el; er; er=er->rhs()) {
-     ev = er->lhs();    //  consistent array reference
-               
-        if(isSgArrayRefExp(ev) && !IS_DVM_ARRAY(ev->symbol())) {        
-             doAssignStmtAfter(GetAddresMem(FirstArrayElement(ev->symbol()))) ;
-             FREE_DVM(1);  
-        }
-  }   
-}    
-
-void Consistent_Task_Region(SgStatement *stmt)
-{SgExpression  *e;
- SgStatement  *st2, *st3;
-
-   iconsgts=0;
-   consgrefts=NULL;
-   e=stmt->expr(1);
-   if(!e) return;
-   task_cons_list = e->lhs();
-   if(  e->symbol()){
-      consgrefts = new SgVarRefExp(e->symbol());
-      doIfForConsistent(consgrefts);
-      nloopcons++;
-      //stcg = doIfForCreateReduction( e->symbol(),nloopcons,0);
-      st2 = doIfForCreateReduction( consgrefts->symbol(),nloopcons,1);
-      //stcg = st2;
-      st3 = cur_st;
-      cur_st = st2;
-      ConsistentArrayList(task_cons_list,consgrefts,stmt,st2,st2);
-      cur_st = st3;
-      InsertNewStatementAfter( new SgAssignStmt(*DVM000(ndvm),*new SgValueExp(0)),cur_st,cur_st->controlParent()); 
-
-    } else {
-      iconsgts = ndvm; 
-      consgrefts = DVM000(iconsgts);
-      doAssignStmtAfter(CreateConsGroup(1,1));
-                  //!!!??? if(debug_regim){
-                  //  idebcg = ndvm; 
-                  //  doAssignStmtAfter( D_CreateDebRedGroup());
-                  //}
-      //stcg = cur_st;//store current statement
-      ConsistentArrayList(task_cons_list,consgrefts,stmt,cur_st,cur_st); 
-    }  
-}
-
-void EndConsistent_Task_Region(SgStatement *stmt)
-{
-       if(!stmt) return;     
-       //LINE_NUMBER_AFTER(stmt,stmt);
-   // actualizing of consistent arrays
-       if(consgrefts)
-         ConsistentArraysStart(task_cons_list);
-
-       if(!iconsgts) return;
-
-       //there is synchronous CONSISTENT clause in TASK_REGION
-         // generating assign statement:
-         //  dvm000(i) = strtcg(ConsistGroupRef)
-         doAssignStmtAfter(StartConsGroup(consgrefts));
-
-         // generating assign statement:
-         //  dvm000(i) = waitcg(ConsistGroupRef)
-         doAssignStmtAfter(WaitConsGroup(consgrefts));
-         
-    	   //if(idebcg){
-             //if(dvm_debug)
-             //  doAssignStmtAfter( D_CalcRG(DVM000(idebrg)));
-             //doAssignStmtAfter( D_DelRG (DVM000(idebrg)));
-           //}
-
-         // generating statement:
-         //  call dvmh_delete_object(ConsistGroupRef)     //dvm000(i) = delobj(ConsistGroupRef)
-         doCallAfter(DeleteObject_H(consgrefts));
-}
-
-void doAxisTask(SgStatement *st, SgExpression *eref)
-{int i,iaxis=-1;
- SgExpression *el;
- SgSymbol *ar;
- ar = eref->symbol();
- for(el=eref->lhs(),i=0; el; el=el->rhs(),i++)
-    if(el->lhs()->variant() !=DDOT)
-       iaxis = i;
- if(i != Rank(ar))
-   Error("Rank of array '%s' isn't equal to the length of subscript list", ar->identifier(), 161,st);
- doAssignStmtAfter(new SgValueExp(i-iaxis));
- return;
-}
-
-
-void TransBlockData(SgStatement *hedr,SgStatement* &end_of_unit)
-{SgStatement* stmt;
- end_of_unit = hedr->lastNodeOfStmt();
- for (stmt = hedr; stmt && (stmt != end_of_unit); stmt = stmt->lexNext()) 
-    if(isSgVarDeclStmt(stmt)) VarDeclaration(stmt);
-        // analizing object list and replacing variant of declaration statement with initialisation by VAR_DECL_90 
-}
-
-void VarDeclaration(SgStatement *stmt)
-{ SgExpression *el;
-  int is_assign;
-    is_assign =0;           
-    for(el=stmt->expr(0); el; el=el->rhs()) {
-        if(el->lhs()->variant() == ASSGN_OP || el->lhs()->variant() == POINTST_OP) is_assign = 1;//with initial value
-    }
-    if(is_assign && stmt->variant() == VAR_DECL && !stmt->expr(2))
-       stmt->setVariant(VAR_DECL_90);
-    return;         
-}        
-
-SgExpression *LeftMostField(SgExpression *e)
-{SgExpression *ef;
- ef = e;
- while(ef->variant() == RECORD_REF)
-   ef = ef->lhs();
- return(ef);
-}
-
-SgExpression *RightMostField(SgExpression *e)
-{return(e->rhs());}
-
-SgStatement *InterfaceBlock(SgStatement *hedr)
-{ SgStatement *stmt;
- in_interface++;
- for(stmt=hedr->lexNext(); stmt->variant()!=CONTROL_END; stmt=stmt->lexNext())
- {
-   if(stmt->variant() == FUNC_HEDR || stmt->variant() == PROC_HEDR) //may be module procedure statement
-     stmt = InterfaceBody(stmt);
-   else if(stmt->variant() != MODULE_PROC_STMT)
-     err("Misplaced directive/statement", 103, stmt);     
- }
- //if(stmt->controlParent() != hedr)
- //  Error("Illegal END statement");
-
- in_interface--;
- return(stmt);
-}
-
-SgStatement *InterfaceBody(SgStatement *hedr)
-{ 
- SgStatement *stmt, *last, *dvm_pred;
- symb_list *distsym;
- SgSymbol *s = hedr->symbol();
- distsym = NULL;
- dvm_pred = NULL;
- 
- if (hedr->expr(2))
- {
-    if (hedr->expr(2)->variant() == PURE_OP)
-       SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) | PURE_BIT;
-   
-    else if (hedr->expr(2)->variant() == ELEMENTAL_OP)
-       SYMB_ATTR(s->thesymb) = SYMB_ATTR(s->thesymb) | ELEMENTAL_BIT;
- }
- last = hedr->lastNodeOfStmt();
- 
- for(stmt=hedr->lexNext(); stmt; stmt=stmt->lexNext()) {
-    if(dvm_pred)
-       Extract_Stmt(dvm_pred); // deleting preceding DVM-directive
-    if(stmt == last) break;   //end of interface body
-    dvm_pred = NULL;
-
-    if (!isSgExecutableStatement(stmt)) {//is Fortran specification statement
-	
-      if(only_debug){
-          if(isSgVarDeclStmt(stmt)) VarDeclaration(stmt);// for analizing object list and replacing variant of statement
-          continue;
-      } 
-        //discovering distributed arrays in COMMON-blocks
-        if(stmt->variant()==COMM_STAT) {
-	
-           DeleteShapeSpecDAr(stmt);
-           if( !DeleteHeapFromList(stmt) ) { //common list is empty
-             stmt=stmt->lexPrev();
-             stmt->lexNext()->extractStmt(); //deleting the statement
-           } 
-          continue; 
-	}  
-    
-        // deleting distributed arrays from variable list of declaration
-        // statement and testing are there any group names
-        if( isSgVarDeclStmt(stmt) || isSgVarListDeclStmt(stmt)) {
-           
-           if( !DeleteDArFromList(stmt) ) { //variable list is empty
-             stmt=stmt->lexPrev();
-             stmt->lexNext()->extractStmt(); //deleting the statement
-           }
-           continue;
-	} 
- 
-        if(stmt->variant() == STMTFN_STAT) {
-	   if(stmt->expr(0) && stmt->expr(0)->symbol() && ((!strcmp(stmt->expr(0)->symbol()->identifier(),"number_of_processors")) || (!strcmp(stmt->expr(0)->symbol()->identifier(),"processors_rank")) || (!strcmp(stmt->expr(0)->symbol()->identifier(),"processors_size")))){
-             stmt=stmt->lexPrev();
-             stmt->lexNext()->extractStmt(); 
-                           //deleting the statement-function declaration named 
-	                   //  NUMBER_OF_PROCESSORS or PROCESSORS_RANK or PROCESSORS_SIZE 
-           }
-           continue; 
-        }
-   
-        if (stmt->variant() == ENTRY_STAT) {  
-          warn("ENTRY among specification statements", 81,stmt);  
-          continue;
-        }
-
-        if(stmt->variant() == INTERFACE_STMT || stmt->variant() == INTERFACE_ASSIGNMENT || stmt->variant() == INTERFACE_OPERATOR){
-          stmt=InterfaceBlock(stmt); 
-          continue;
-	}
-
-	if(stmt->variant() == STRUCT_DECL){
-          stmt=stmt->lastNodeOfStmt();
-          continue;
-        }
-
-        if( stmt->variant() == USE_STMT || stmt->variant() == DATA_DECL)       
-          continue;
-
-        continue;             
-     } // end of if(!isSgExecutable...
-     
-    if ((stmt->variant() == FORMAT_STAT))     
-         continue;
-           
-// processing the DVM Specification Directives
-
-    switch(stmt->variant()) {
-
-      case (DVM_VAR_DECL):
-          { SgExpression *el;
-	    int eda;
-	    eda = 0;
-            for(el = stmt->expr(2); el; el=el->rhs()) // looking through the attribute list
-	      switch(el->lhs()->variant()) {
-	          case (ALIGN_OP):
-                  case (DISTRIBUTE_OP): 
-		     eda = 1; 
-		     break;
-	          default:
-                     break;
-	      }
-	    if(eda == 0){
-              dvm_pred = stmt; 
-              continue;
-            }
-	  }
-       case (DVM_INHERIT_DIR): 
-       case (DVM_ALIGN_DIR): 
-       case (DVM_DISTRIBUTE_DIR):
-         { 
-           SgExpression *sl; 
-           for(sl=stmt->expr(0); sl; sl=sl->rhs())  //scanning the alignees list  
-              if(!IS_POINTER(sl->lhs()->symbol()))        
-                distsym = AddNewToSymbList(distsym,sl->lhs()->symbol());
-         }
-           dvm_pred = stmt; 
-	   continue;
-       case (ACC_ROUTINE_DIR):
-           ACC_ROUTINE_Directive(stmt);
-           dvm_pred = stmt;  
-           continue;
-
-       case (HPF_TEMPLATE_STAT):
-       case (HPF_PROCESSORS_STAT):
-       case (DVM_DYNAMIC_DIR):
-       case (DVM_SHADOW_DIR):  
-       case (DVM_TASK_DIR): 
-       case (DVM_CONSISTENT_DIR): 
-       case (DVM_INDIRECT_GROUP_DIR):
-       case (DVM_REMOTE_GROUP_DIR):
-       case (DVM_CONSISTENT_GROUP_DIR):
-       case (DVM_REDUCTION_GROUP_DIR):
-       case (DVM_POINTER_DIR): 
-       case (DVM_HEAP_DIR):
-       case (DVM_ASYNCID_DIR):
-       case (ACC_DECLARE_DIR):
-	   dvm_pred = stmt;  
-       default:
-	   continue; 
-    }
-
-    break;
- } //end of loop
-
- if(!only_debug)
-    DeclareVarDVMForInterface(stmt->lexPrev(),distsym);
- return(stmt);
-}
-
-void DeleteShapeSpecDAr(SgStatement *stmt)
-{
-          SgExpression *ec, *el;
-          SgSymbol *sc; 
-	  for(ec=stmt->expr(0); ec; ec=ec->rhs()) // looking through COMM_LIST
-	    for(el=ec->lhs(); el; el=el->rhs()) {  
-              sc = el->lhs()->symbol();
-              if(sc && ((sc->attributes() & ALIGN_BIT) || (sc->attributes() & DISTRIBUTE_BIT)) )
-                 el->lhs()->setLhs(NULL);  
-              if(sc && !in_interface) {
-                 SYMB_ATTR(sc->thesymb)= SYMB_ATTR(sc->thesymb) | COMMON_BIT;
-                 if((debug_regim || IN_MAIN_PROGRAM) &&  IS_ARRAY(sc) )
-                    registration = AddNewToSymbList( registration, sc); 
-              
-                 if( !strcmp(sc->identifier(),"heap"))
-                    heap_ar_decl = new SgArrayRefExp(*heapdvm); 
-              }      
-              if(sc && (sc->attributes() & TEMPLATE_BIT))
-                 Error("Template '%s' is in COMMON",sc->identifier(),79,stmt);                         
-           }  
-}
-
-void DeclareVarDVMForInterface(SgStatement *lstat, symb_list *distsymb)
-{symb_list *save;
- if(!distsymb) return;
- save = dsym; //save global variable 'dsym' - list of distributed arrays for procedure
- dsym = distsymb;
- DeclareVarDVM(lstat,lstat);
- dsym = save; //resave global variable 'dsym'
-}
-
-SgExpression  *DVMVarInitialization(SgExpression *es)
-{SgExpression *einit, *er;
- switch(es->symbol()->variant()) { //initialization expression
-   case ASYNC_ID:   einit = new SgValueExp(1);  //new SgExpExpression(CONSTRUCTOR_REF); //SgConstExp
-                    break;
-   default:         einit = new SgValueExp(0);
-                    break;
- } 
- er = new SgExpression(ASSGN_OP,es,einit,NULL); 
- return(er);
-}
-
-SgExpression  *FileNameInitialization(SgExpression *es,char *name)
-{SgExpression *einit, *er;
- einit = new SgExpression(CONCAT_OP,new SgValueExp(name),CHARFunction(0),NULL); 
- er = new SgExpression(ASSGN_OP,es,einit,NULL); 
- return(er);
-}
-
-SgStatement *CreateModuleProcedure(SgStatement *mod_hedr, SgStatement *lst, SgStatement* &has_contains)
- { mod_attr *attrmod;
-   SgStatement *last;
-   SgStatement *st_end ;
-   SgStatement *st;
-   SgSymbol *smod; 
-
-     attrmod = new mod_attr;
-     attrmod->symb = NULL;
-     mod_hedr->symbol()->addAttribute(MODULE_STR, (void *) attrmod, sizeof(mod_attr));
-
-     //  if(mod_hedr->lexNext()->variant() != USE_STMT && !dsym && !task_symb && !proc_symb)
-     //       return(NULL);
-
-     smod = new SgSymbol(PROCEDURE_NAME, ModuleProcName(mod_hedr->symbol()), *mod_hedr);           
-     attrmod->symb = smod;
-     st = new SgStatement(PROC_HEDR);
-     st->setSymbol(*smod);
-     st_end = new SgStatement(CONTROL_END);
-     
-     if(lst->variant() != CONTAINS_STMT) {
-        last = new SgStatement(CONTAINS_STMT);
-        lst-> insertStmtBefore(*last);
-     } else
-        last = lst;
-     has_contains = last;
-     //last = (lst->variant() == CONTAINS_STMT) ? lst->lexNext() : lst;
-     last->insertStmtAfter(*st);
-     st->insertStmtAfter(*st_end);
-     return(st);
-  }
-   
-void GenForUseStmts(SgStatement *hedr,SgStatement *where_st)
-{SgStatement *stmt;
-  for(stmt=hedr->lexNext();stmt->variant() == USE_STMT;stmt=stmt->lexNext()){
-     GenCallForUSE(stmt,where_st);
- /*  
-   if(!(stmt->expr(0)))
-       GenCallForUSE(stmt,where_st);
-     else if(stmt->expr(0)->variant() == ONLY_NODE)
-       GenForUseList(stmt->expr(0)->lhs(),stmt,where_st);
-     else {
-       GenForUseList(stmt->expr(0),stmt,where_st);
-       GenCallForUSE(stmt,where_st);
-     }
- */
-  }
-  
-}
-
-void GenForUseList(SgExpression *ul,SgStatement *stmt, SgStatement *where_st)
-{SgExpression *el, *e;
- 
- for(el=ul; el; el=el->rhs()){
-   e = el->lhs();
-   if(e->variant() == RENAME_NODE){
-      e = e->lhs();    //new symbol reference
-   }
-   if(!only_debug && IS_DVM_ARRAY(e->symbol()))
-     GenDVMArray(e->symbol(),stmt,where_st); 
-   if(debug_regim && IS_ARRAY(e->symbol()))
-     Registrate_Ar(e->symbol());
- }
-}
-
-void GenDVMArray(SgSymbol *ar, SgStatement *stmt, SgStatement *where_st)
-{SgStatement *savest;
-//SgExpression *dce;
-// SgArrayType *artype;
- savest = where;
- where = where_st;
- //generating
- 
- /*
- dce = new SgArrayRefExp(*ar);
- artype = isSgArrayType(ar->type());
- dce->setLhs(artype->getDimList()->copy());
-
-  if(ar->attributes() & POINTER_BIT) 
-     AllocatePointerHeader(ar,where_st);
- */
- if( IS_POINTER(ar) || (IN_COMMON(ar) &&  (ar->scope()->variant() != PROG_HEDR)) || IS_ALLOCATABLE_POINTER(ar))
-	   return;
- if(ar->attributes() & DISTRIBUTE_BIT) {
-    //determine corresponding DISTRIBUTE statement
-     SgStatement *dist_st = *(DISTRIBUTE_DIRECTIVE(ar));
-    //create distributed array
-     int idis;
-     SgExpression *distr_rule_list = doDisRules(dist_st,0,idis);
-     SgExpression *ps = PSReference(dist_st); 
-     GenDistArray(ar,idis,distr_rule_list,ps,dist_st);
-   }
-       
-   else if(ar->attributes() & ALIGN_BIT) {
-    //create aligned array  
-     int nr,iaxis; 
-     algn_attr * attr;
-     align * root, *node,*node_copy, *root_copy = NULL;
-     SgStatement *algn_st;
-     SgSymbol *base;
-     attr = (algn_attr *)  ORIGINAL_SYMBOL(ar)->attributeValue(0,ALIGN_TREE);
-     node = attr->ref; // reference to root of align tree
-     node_copy = new align;
-     node_copy->symb = ar;
-     node_copy->align_stmt = node->align_stmt; 
-     algn_st = node->align_stmt;
-     if(!algn_st->expr(2)) //postponed aligning
-       root = NULL;
-     else {
-       base = (algn_st->expr(2)->variant()==ARRAY_OP) ? (algn_st->expr(2))->rhs()->symbol() :                                                  (algn_st->expr(2))->symbol();// align_base symbol
-       root = ((algn_attr *) ORIGINAL_SYMBOL(base)->attributeValue(0,ALIGN_TREE))->ref;
-       root_copy = new align;
-       root_copy->symb = Rename(base,stmt);
-       root_copy->align_stmt = root->align_stmt;
-     }
-     iaxis = ndvm;
-     SgExpression *align_rule_list = doAlignRules(ar,node->align_stmt,0,nr);// creating axis_array, coeff_array and  const_array
-     GenAlignArray(node_copy,root_copy, nr, align_rule_list, iaxis);
-     /* AllocateAlignArray(ar,dce,stmt);*/
-   }
- loc_distr = 0;
- pointer_in_tree = 0;
- where = savest;
-}
-
-SgSymbol *Rename(SgSymbol *ar, SgStatement *stmt)
-{SgExpression *el, *e, *eold;
-
- for(el=stmt->expr(0);el;el=el->rhs()){
-    e = el->lhs(); eold = NULL;
-   if(e->variant() == RENAME_NODE){
-      e = e->lhs();    //new symbol reference
-      eold = el->lhs()->rhs(); //old symbol reference
-   }
-//   if(eold && ORIGINAL_SYMBOL(eold->symbol()) == ORIGINAL_SYMBOL(ar))
-   if(eold && !strcmp(eold->symbol()->identifier(),ar->identifier()))
-     return(e->symbol());     
- }
- return(ar);
-}
-
-void AddAttributeToLastElement(SgExpression *use_list)
-{
-  SgExpression *el = use_list;
-  while(el && el->rhs())
-    el = el->rhs();
-  el->addAttribute(END_OF_USE_LIST, (void*) 1, 0); 
-}
-
-void UpdateUseListWithDvmArrays(SgStatement *use_stmt)
-{
-  SgExpression *el, *coeff_list=NULL;
-  SgExpression *use_list = use_stmt->expr(0);
-  SgSymbol *s,*sloc;
-  int i,r,i0;
-  i0 = opt_base ? 1 : 2;
-  if(opt_loop_range) i0=0;
-  
-  if(use_list && use_list->variant()==ONLY_NODE)
-    use_list = use_list->lhs();
-  if(use_list)
-    AddAttributeToLastElement(use_list);
-  for(el=use_list; el; el=el->rhs())
-  { 
-    // el->lhs()->variant() is RENAME_NODE
-    sloc = el->lhs()->lhs()->symbol(); // local symbol
-    if(!IS_DVM_ARRAY(sloc)) continue;
-    r = Rank(sloc);
-    if(el->lhs()->rhs())      // use symbol reference in renaming_op: local_symbol=>use_symbol
-    {  
-       s = el->lhs()->rhs()->symbol();    //use symbol
-       if(strcmp(sloc->identifier(),s->identifier()))  // different names
-       {
-       // creating variables used for optimisation array references in parallel loop (linearization coefficients)
-         coeffs *c_new  = new coeffs;
-         CreateCoeffs(c_new,sloc);
-       // adding the attribute (ARRAY_COEF) to distributed array symbol
-         sloc->addAttribute(ARRAY_COEF, (void*) c_new, sizeof(coeffs));
-       // add  renaming_op for all coefficients (2:rank+2) to use_list: coeff_of_sloc=>coeff_of_s         
-         coeffs *c_use  =  AR_COEFFICIENTS(s);
-         for(i=i0;i<=r+2;i++)
-           if(i != r+1)
-           {
-             SgExpression *rename = new SgExpression(RENAME_NODE, new SgVarRefExp(c_new->sc[i]), new SgVarRefExp(c_use->sc[i]), NULL);
-             coeff_list = AddListToList(coeff_list,new SgExprListExp(*rename));
-           }         
-       }
-    } else
-    {
-       // add cofficients of use_symbol to use_list
-       s = el->lhs()->symbol(); //use symbol
-       coeffs *c_use  =  AR_COEFFICIENTS(s);
-       for(i=i0;i<=r+2;i++)
-         if(i != r+1) 
-           coeff_list = AddListToList(coeff_list,new SgExprListExp(*new SgVarRefExp(c_use->sc[i])));
-    }
-  }
-    if(coeff_list)
-       AddListToList(use_list,coeff_list);
-}
-       
-void updateUseStatementWithOnly(SgStatement *st_use, SgSymbol *s_func)
-{ // add name of s_func to only-list of USE statement
-  SgExpression *clause = st_use->expr(0);
-  if(clause && clause->variant() == ONLY_NODE)
-  {
-     SgExpression *el = new SgExprListExp(*new SgVarRefExp(s_func));
-     if(clause->lhs())  // only-list is not empty
-       AddListToList(clause->lhs(), el);
-     else
-       clause->setLhs(el);
-  }
-}
-
-void GenCallForUSE(SgStatement *hedr,SgStatement *where_st)
-{SgSymbol *smod;
- SgStatement *call;
- mod_attr *attrm;
-  smod = hedr->symbol();
-  if((attrm=DVM_PROC_IN_MODULE(smod)) && attrm->symb){
-       call = new SgCallStmt(*attrm->symb);
-       where_st->insertStmtBefore(*call);
-       updateUseStatementWithOnly(hedr,attrm->symb); // add dvm-module-procedure name to only-list
-  }
-}
-
-SgStatement *MayBeDeleteModuleProc(SgStatement *mod_proc,SgStatement *end_mod)
-{ mod_attr *attrm;
-                   //mod_proc->unparsestdout(); 
-                    //printf("-----%d  %d\n",end_mod->lexPrev()->variant(),end_mod->variant()); end_mod->unparsestdout(); 
- if(!isSgExecutableStatement(end_mod->lexPrev()) || mod_proc->lexNext()==end_mod ) {// there are not executable statements in module procedure
-   attrm=DVM_PROC_IN_MODULE(cur_func->symbol()) ;
-   attrm->symb=NULL; // deleting module procedure reference in attribute
-            //deleting module procedure
-           //for(stmt=mod_proc->lexNext(),prev=mod_proc; stmt!=end_mod->lexNext(); stmt=stmt->lexNext())
-           //{  prev->extractStmt(); prev = stmt; }
-           //end_mod->extractStmt();
-           //return(NULL);
- }  
- return(mod_proc);
-}
-
-int TestDVMDirectivesInModule(stmt_list *pstmt)
-{stmt_list *stmt;
- int flag;
- flag = 0;
-  for(stmt=pstmt; stmt; stmt=stmt->next) {
-     switch(stmt->st->variant()) {
-        //case HPF_TEMPLATE_STAT:
-        case DVM_ALIGN_DIR:
-        case DVM_DISTRIBUTE_DIR:
-        case HPF_PROCESSORS_STAT:
-        case DVM_VAR_DECL:
-        case DVM_TASK_DIR:
-             flag = 1;
-             break;
-        default:
-             break;
-     }
-  }  
- return(flag);
-}
-
-int TestDVMDirectivesInProcedure(stmt_list *pstmt)
-{stmt_list *stmt;
- for(stmt=pstmt; stmt; stmt=stmt->next) {
-    if(stmt->st->variant() != DVM_INHERIT_DIR)
-       return( 1 );
- }
- return ( 0 );
-}
-
-int TestUseStmts()
-{SgStatement *stmt;
- mod_attr *attrm;
- int flag;
-  flag =0;
-  //looking through the USE statements
-  for(stmt=cur_func->lexNext();stmt->variant() == USE_STMT;stmt=stmt->lexNext()){
-    if((attrm=DVM_PROC_IN_MODULE(stmt->symbol())) && attrm->symb) //module has DVM-module-procedure
-          flag =1;
-  }
-  return(flag);
-}
-
-int ArrayAssignment(SgStatement *stmt)
-{
-  if(isSgArrayRefExp(stmt->expr(0)) || isSgArrayType(stmt->expr(0)->type()))
-    return(1);
-  else
-    return(0);
-}
-
-int DVMArrayAssignment(SgStatement *stmt)
-{
-  if(HEADER(stmt->expr(0)->symbol()) && isSgArrayType(stmt->expr(0)->type()))
-    return(1);
-  else
-    return(0);
-}
-
-void MakeSection(SgExpression *are)
-{int n;
- SgArrayRefExp *ae;   
- if(!(ae=isSgArrayRefExp(are))) return;
- for(n = Rank(are->symbol()); n; n--)
-   ae->addSubscript(*new SgExpression(DDOT));  
-}
-
-void  DistributeArrayList(SgStatement *stdis)
-{SgExpression *el;
- SgSymbol *das;
- SgStatement **dst = new (SgStatement *);
-
-    *dst = stdis;
-    for(el=stdis->expr(0); el; el=el->rhs()){                   
-        das = el->lhs()->symbol();
-        das->addAttribute(DISTRIBUTE_, (void *) dst, sizeof(SgStatement *)); 
-        if(das->attributes() & EQUIVALENCE_BIT)
-           Error("DVM-array cannot be specified in EQUIVALENCE statement: %s", das->identifier(),341,stdis);
-    }
-}
-
-SgExpression *DebugIfCondition()
-{ if(!dbif_cond)
-    dbif_cond=&SgEqOp(*new SgVarRefExp(*dbg_var), *new SgValueExp(1));
-  return(dbif_cond);
-}
-/*
-SgExpression *DebugIfCondition()
-{return(&SgEqOp(*new SgVarRefExp(*dbg_var), *new SgValueExp(1)));}
-*/
-
-SgExpression *DebugIfNotCondition()
-{ if(!dbif_not_cond)
-    dbif_not_cond=&SgEqOp(*new SgVarRefExp(*dbg_var), *new SgValueExp(0));
-  return(dbif_not_cond);
-}
-/*
-SgExpression *DebugIfNotCondition()
-{return(&SgEqOp(*new SgVarRefExp(*dbg_var), *new SgValueExp(0)));}
-*/
-
-SgStatement *LastStatementOfDoNest(SgStatement *first_do)
-{SgStatement *last;
-    last=first_do->lastNodeOfStmt();
-    if(last->variant() == FOR_NODE || last->variant() == WHILE_NODE )
-       last=LastStatementOfDoNest(last);
-     
- return(last);
-}
-
-void TranslateBlock (SgStatement *stat)
-{  
-   TranslateFromTo(stat,lastStmtOf(stat),0); //0 - without error messages 
-}
-
-/*
-void TranslateBlock (SgStatement *stat)
-SgStatement *stmt, *last, *next;
-// last is the statement following last statement of block  
-    
- last = lastStmtOf(stat);  //podd 03.06.14  stat->lastNodeOfStmt();
-                           //if (last->variant() == LOGIF_NODE)   
-                           //  last =last->lexNext();  
- //last =last->lexNext();    
-*/
-
-void TranslateFromTo(SgStatement *first, SgStatement *last, int error_msg)
-//TranslateBlock (SgStatement *stat)
-{SgStatement *stmt, *out, *next;
- SgLabel *lab_on;
- SgStatement *in_on = NULL;
- char io_modes_str[4] = "\0";
- out =last->lexNext();      
- if(only_debug) goto SEQ_PROG;
-  
- for(stmt=first; stmt!=out; stmt=next) {
-    cur_st = stmt;                             //printf("TranslateBlock %d  %d\n",stmt->lineNumber(), stmt->variant());
-    next = stmt->lexNext();  
-    switch(stmt->variant()) {
-       case CONTROL_END:
-       case CONTAINS_STMT:
-       case RETURN_STAT:     
-       case STOP_STAT:            
-       case PAUSE_NODE: 
-       case ENTRY_STAT: 
-            break;
-
-       case SWITCH_NODE:           // SELECT CASE ...
-       case ARITHIF_NODE:          // Arithmetical IF
-       case IF_NODE:               // IF... THEN
-       case WHILE_NODE:            // DO WHILE (...)
-       case CASE_NODE:             // CASE ...
-       case ELSEIF_NODE:           // ELSE IF... 
-            ChangeDistArrayRef(stmt->expr(0));
-            break; 
-      
-       case LOGIF_NODE:            // Logical IF 
-                     
-            ChangeDistArrayRef(stmt->expr(0));
-            break;  //continue; // to next statement
-
-       case FORALL_STAT:           // FORALL statement
-               //stmt=stmt->lexNext(); //  statement that is a part of FORALL statement         
-            break;
-               // continue; 
-
-       case GOTO_NODE:             // GO TO
-            break;
-
-       case COMGOTO_NODE:          // Computed GO TO
-            ChangeDistArrayRef(stmt->expr(1));
-            break;
-
-       case ASSIGN_STAT:           // Assign statement
-            if(IN_COMPUTE_REGION && !inparloop && !in_on) /*ACC*/
-                 TestDvmObjectAssign(stmt);    
-            ChangeDistArrayRef_Left(stmt->expr(0));   // left part
-            ChangeDistArrayRef(stmt->expr(1));   // right part
-            break;
-
-       case PROC_STAT:             // CALL
-           {SgExpression *el;
-            int i; 
-            // looking through the arguments list
-            for(el=stmt->expr(0), i=0; el; el=el->rhs(), i++)            
-              ChangeArg_DistArrayRef(el, stmt->symbol(), i);   // argument
-            }            
-            break;
-
-       case ALLOCATE_STMT:
-            if(!IN_COMPUTE_REGION) 
-            { AllocatableArrayRegistration(stmt);
-              //stmt=cur_st;
-            }
-            break;
-           
-       case DEALLOCATE_STMT:
-            break; 
-
-       case DVM_IO_MODE_DIR:
-            IoModeDirective(stmt,io_modes_str,error_msg);
-            Extract_Stmt(stmt); // extracting DVM-directive
-	    break;
- 
-       case OPEN_STAT:
-            Open_Statement(stmt,io_modes_str,error_msg);
-            break;  
-       case CLOSE_STAT:
-            Close_Statement(stmt,error_msg);
-            break; //continue;   
-       case INQUIRE_STAT:  
-            Inquiry_Statement(stmt,error_msg);
-            break;  
-       case BACKSPACE_STAT:
-       case ENDFILE_STAT:
-       case REWIND_STAT:
-            FilePosition_Statement(stmt, error_msg);
-            break;
-       case WRITE_STAT:
-       case READ_STAT:
-	    ReadWrite_Statement(stmt, error_msg);
-            break;
-       case PRINT_STAT:
-            Any_IO_Statement(stmt);
-            ReadWritePrint_Statement(stmt, error_msg);
-            break;
-       case DVM_CP_CREATE_DIR:      /*Check Point*/
-            CP_Create_Statement(stmt, error_msg);
-            break;
-       case DVM_CP_SAVE_DIR:
-            CP_Save_Statement(stmt, error_msg);
-            break;
-       case DVM_CP_LOAD_DIR:
-            CP_Load_Statement(stmt, error_msg);
-            break;
-       case DVM_CP_WAIT_DIR:
-            CP_Wait(stmt, error_msg);
-            break;                   /*Check Point*/
-       case FOR_NODE:
-            ChangeDistArrayRef(stmt->expr(0));
-            ChangeDistArrayRef(stmt->expr(1));
-            break;
-       case DVM_ON_DIR:
-            if(stmt->expr(0)->symbol() && HEADER(stmt->expr(0)->symbol())) 
-               in_on = stmt;                 
-            break;
-       case DVM_END_ON_DIR:
-            if(in_on)
-            {
-               ReplaceOnByIf(in_on,stmt);
-               Extract_Stmt(in_on); // extracting DVM-directive (ON) 
-               in_on = NULL;  
-            }           
-            Extract_Stmt(stmt);  // extracting DVM-directive (END_ON)
-
-            break;
-       default:                         
-            break;      
-    }
-   }
-  return; /* podd 07.06.11*/
-
-SEQ_PROG:
- for(stmt=first; stmt!=out ; stmt=stmt->lexNext()) {
-    cur_st = stmt;
-    switch(stmt->variant()) {
-       case ALLOCATE_STMT:            
-            AllocatableArrayRegistration(stmt);
-            stmt=cur_st;           
-            break;           
-       case WRITE_STAT:
-       case READ_STAT:
-       case PRINT_STAT: 
-            if(perf_analysis) 
-              stmt = Any_IO_Statement(stmt);
-            break;
-
-       default:                         
-            break;      
-    }
-  }
-
-}
-
-SgStatement *CreateCopyOfExecPartOfProcedure()
-{ 
-  if(!debug_regim || dbg_if_regim <= 1) return(NULL);
-  
-  return( cur_func->copyPtr() );
-}
-
-
-void  InsertCopyOfExecPartOfProcedure(SgStatement *stc)
-{ SgStatement *stmt, *stend, *ifst, *cur;
-     // cur = new SgStatement(DVM_DEBUG_DIR);
-  ifst = new SgIfStmt(*DebugIfNotCondition(), *new SgStatement(CONT_STAT));
-  first_exec->insertStmtBefore(*ifst,*first_exec->controlParent()); 
-  stend=stc->lastNodeOfStmt();
-  stmt = stend->lexPrev();
-  if(stmt->variant()!=RETURN_STAT)
-     stmt->insertStmtAfter(*new SgStatement(RETURN_STAT),*stend->controlParent());
-
-  for(stmt=stc; !isSgExecutableStatement(stmt); stmt=stmt->lexNext())
-   {;}
-  
-  cur = ifst->lexNext();
-  cur->insertStmtAfter(*stmt);
-  cur->extractStmt();
-  TranslateBlock(ifst);
-
-     // for(stmt=first_exec; stmt != stend; stmt=stmt->nextInChildList())  
-     //stmt=BLOB_VALUE(BLOB_NEXT(BIF_BLOB1(stmt->thebif)))
-     // {  stc = stmt->copyPtr();
-}
-
-int lookForDVMdirectivesInBlock(SgStatement *first,SgStatement *last,int contains[] )
-{ SgStatement *stmt;
-  int dvm_dir=0;
-  contains[0]=0; 
-  contains[1]=0;  
-  for(stmt=first; stmt ; stmt=stmt->lexNext()) {
-    switch(stmt->variant()) {
-       case CONTAINS_STMT:
-       case ENTRY_STAT:
-            contains[0]=1;
-            goto END__;            
-            break;
-
-       case DVM_PARALLEL_ON_DIR:
-
-       case DVM_ASYNCHRONOUS_DIR:
-       case DVM_ENDASYNCHRONOUS_DIR:
-       case DVM_REDUCTION_START_DIR:
-       case DVM_REDUCTION_WAIT_DIR: 
-       case DVM_SHADOW_GROUP_DIR:
-       case DVM_SHADOW_START_DIR:      
-       case DVM_SHADOW_WAIT_DIR:
-       case DVM_REMOTE_ACCESS_DIR:     
-       case DVM_NEW_VALUE_DIR:  
-       case DVM_REALIGN_DIR:
-       case DVM_REDISTRIBUTE_DIR: 
-       case DVM_ASYNCWAIT_DIR:
-       case DVM_F90_DIR:
-       case DVM_CONSISTENT_START_DIR: 
-       case DVM_CONSISTENT_WAIT_DIR:
-
-       case DVM_INTERVAL_DIR:
-       case DVM_ENDINTERVAL_DIR:
-       case DVM_OWN_DIR: 
-       case DVM_DEBUG_DIR:
-       case DVM_ENDDEBUG_DIR:
-       case DVM_TRACEON_DIR:
-       case DVM_TRACEOFF_DIR:
-       case DVM_BARRIER_DIR:
-       case DVM_CHECK_DIR:
-
-       case DVM_TASK_REGION_DIR:	          
-       case DVM_END_TASK_REGION_DIR:
-       case DVM_ON_DIR: 
-       case DVM_END_ON_DIR:                
-       case DVM_MAP_DIR:     
-       case DVM_RESET_DIR:
-       case DVM_PREFETCH_DIR:  
-       case DVM_PARALLEL_TASK_DIR:
-       case DVM_IO_MODE_DIR: 
-       case DVM_LOCALIZE_DIR:
-       case DVM_SHADOW_ADD_DIR: 
-       case DVM_TEMPLATE_CREATE_DIR:  
-       case DVM_TEMPLATE_DELETE_DIR:
-            dvm_dir = 1; 
-            break;
-
-       case OPEN_STAT:
-       case CLOSE_STAT:
-       case INQUIRE_STAT:
-       case BACKSPACE_STAT:
-       case ENDFILE_STAT:
-       case REWIND_STAT:
-            contains[1]=1;
-            break;
-       default:
-            if(isACCdirective(stmt))     /*ACC*/
-              dvm_dir = 1; 
-            break;     
-    }
-   if(stmt == last) break;
-  }
-END__:
- return(dvm_dir);  
-}
-
-int IsGoToStatement(SgStatement *stmt)
-{int vrnt;
- vrnt=stmt->variant();
- return(vrnt==GOTO_NODE || vrnt==COMGOTO_NODE || vrnt==ARITHIF_NODE);
-}
-
-void CopyDvmBegin(SgStatement *entry, SgStatement *first_dvm_exec, SgStatement *last)
-{ SgStatement *stmt, *current, *cpst;
-  current = entry;
-  for(stmt=first_dvm_exec->lexNext(); stmt && stmt != last; stmt=stmt->lexNext())
-  {   
-    cpst = &(stmt->copy());
-    current->insertStmtAfter(*cpst); 
-    current = cpst;
-  }
-}
-
-void DoStmtsForENTRY(SgStatement *first_dvm_exec, SgStatement *last_dvm_entry)
-{stmt_list *stl;
- for(stl=entry_list; stl; stl=stl->next)
-  CopyDvmBegin(stl->st,first_dvm_exec,last_dvm_entry);
-}
-
-void UnparseFunctionsOfFile(SgFile *f,FILE *fout)
-{
-  SgStatement *stat,*stmt;
-       //int i,numfun;
-       //int i;
-       //i=0;
-       //printf("Unparse Functions\n");
-// grab the first statement in the file.
-  stat = f->firstStatement(); // file header 
-       //numfun = f->numberOfFunctions(); //  number of functions
-       // function is program unit accept BLOCKDATA and MODULE (F90),i.e. 
-       // PROGRAM, SUBROUTINE, FUNCTION
-       // for(i = 0; i < numfun; i++) { 
-       //   func = f -> functions(i);
-   for( stmt=stat->lexNext();stmt;stmt=stmt->lexNext())
-   {   //printf("function %d: %s \n", i++,stmt->symbol()->identifier()); 
-     fprintf(fout,"%s",UnparseBif_Char(stmt->thebif,FORTRAN_LANG)); //or C_LANG
-       //printf("end function %d \n", i);
-       //i++;
-     stmt=stmt->lastNodeOfStmt();
-   }  
-}
-
-void StructureProcessing(SgStatement *stmt)
-{ SgStatement *st,*vd, *next_st;
-  
-  next_st=stmt->lexNext(); 
-  while(next_st)
-  {  st = next_st;
-     //printf("%d",st->lineNumber());
-     next_st=next_st->lexNext();
-     //printf(" : %d\n",next_st->lineNumber());
-     switch(st->variant()) 
-     { case(VAR_DECL):
-         if(only_debug)
-         {
-           VarDeclaration(st);
-           break;
-         }
-         vd=st; 
-         while(vd)
-           vd=ProcessVarDecl(vd);
-         break;;
-       case(CONTROL_END):
-         return;
-       case(DVM_SHADOW_DIR):
-           {SgExpression *el;
-            SgExpression **she = new (SgExpression *);
-            SgSymbol *ar;
-            int nw=0;
-            if(only_debug)
-            {
-               st->extractStmt();
-               break;
-            }
-            // calculate lengh of shadow_list
-            for(el = st->expr(1); el; el=el->rhs())
-               nw++;
-            *she = st->expr(1);
-            for(el = st->expr(0); el; el=el->rhs()){ // array name list
-               ar = el->lhs()->symbol();  //array name
-               ar->addAttribute(SHADOW_WIDTH, (void *) she,                                                                  sizeof(SgExpression *));
-               if (nw!=Rank(ar)) // wrong shadow width list
-                Error("Length of shadow-edge-list is not equal to the rank of array '%s'", ar->identifier(), 88, st);
-	    }
-            st->extractStmt();
-            break; 
-
-           }   
-
-       case(DVM_DISTRIBUTE_DIR):
-            if( !only_debug && (st->expr(1) || st->expr(2)))
-              err("Only a distribute-directive of kind DISTRIBUTE:: is permitted in a derived type definition",337,st);   
-            st->extractStmt();
-            break; 
-
-       case(DVM_ALIGN_DIR):
-            if(!only_debug && (st->expr(1) || st->expr(2)))
-              err("Only an align-directive of kind ALIGN:: is permitted in a derived type definition",337,st);   
-            st->extractStmt();
-            break; 
-
-       case(DVM_VAR_DECL):
-           { SgExpression *el;
-             if(only_debug)
-             {
-                st->extractStmt();
-                break;
-             }
-         
-             for(el = st->expr(2); el; el=el->rhs()) // attribute list
-	      switch(el->lhs()->variant()) {
-	          case (ALIGN_OP):
-                        if(el->lhs()->lhs() || el->lhs()->rhs())
-                          err("Only an align-directive of kind ALIGN:: is permitted in a derived type definition",337,st);   
-                        break;
-                  case (DISTRIBUTE_OP):
-                        if(el->lhs()->lhs() || el->lhs()->rhs())
-                          err("Only a distribute-directive of kind DISTRIBUTE:: is permitted in a derived type definition",337,st);   
-                        break;
-                  case (SHADOW_OP):
-                       {SgExpression *eln;
-                        SgExpression **she = new (SgExpression *);
-                        SgSymbol *ar;
-                        int nw=0;
-                        // calculate lengh of shadow_list
-                        for(eln = el->lhs()->lhs() ; eln; eln=eln->rhs())
-                           nw++;
-                        *she = el->lhs()->lhs(); //shadow specification
-                        for(eln = st->expr(0); eln; eln=eln->rhs()){ // array name list
-                          ar = eln->lhs()->symbol();  //array name
-                          ar->addAttribute(SHADOW_WIDTH, (void *) she,                                                                  sizeof(SgExpression *)); 
-                          if (nw!=Rank(ar)) // wrong shadow width list
-                            Error("Length of shadow-edge-list is not equal to the rank of array '%s'", ar->identifier(), 88,st);
-                        }
-                        break;                               
-                       }
-                  case (DYNAMIC_OP):
-                  default: 
-                      break;        
-              }
-              st->extractStmt();
-              break;
-           } 
-       case(DVM_DYNAMIC_DIR):
-         st->extractStmt();
-         break; 
-       default:
-         break;  
-     }
-  }
-  
-}  
-
-SgStatement *ProcessVarDecl(SgStatement *vd)
-{ SgExpression *el, *elb, *e, *e2;
-  SgSymbol *s;
-  SgType *t;
-  SgStatement *std;
-  int ia;
-  el=vd->expr(0);
-  elb=NULL;
-  while(el)
-  {
-     s = el->lhs()->symbol();
-     if(!s) s=el->lhs()->lhs()->symbol(); // there is initialisation:POINTST_OP/ASSGN_OP
-     if(!s) return(NULL);     
-     ia = s->attributes();
-     if(!(ia & DISTRIBUTE_BIT) && !(ia & ALIGN_BIT))
-     { elb=el;  
-       el=el->rhs();
-     } else
-       break;
-  }
-  if(!el) 
-  {
-    VarDeclaration(vd);
-    return(NULL); 
-  }
-  if(elb)
-  { elb->setRhs(NULL);
-    std = &(vd->copy());
-    std->setExpression(0,*vd->expr(0));
-    vd->insertStmtBefore(*std);
-    VarDeclaration(std);
-  } 
-  
-  if(!(ia & POINTER_BIT))
-         //Error("Inconsistent declaration of identifier '%s'",s->identifier(),16,vd); 
-     Warning("DISTRIBUTE or ALIGN attribute dictates POINTER attribute  '%s'",s->identifier(),336,vd); 
-  //create new statement for s and insert before statement vd
-         // new SgVarDeclStmt(SgExpression &varRefValList, SgExpression &attributeList, SgType &type);
-   e = el->lhs()->symbol() ? el->lhs() : el->lhs()->lhs();
-   e=new SgExprListExp(e->copy());
-   e->lhs()->setLhs(new SgExpression(DDOT));
-           //e->setRhs(NULL);
-   e2= new SgExprListExp(*new SgExpression(POINTER_OP));
-   if(len_DvmType) 
-   {  SgExpression *le;
-      le = new SgExpression(LEN_OP);
-      le->setLhs(new SgValueExp(len_DvmType));
-      t = new SgType(T_INT, le, SgTypeInt());
-
-   } else
-       t = SgTypeInt();
-
-   std = new SgVarDeclStmt(*e,*e2,*t);
-   vd->insertStmtBefore(*std);
-   if(el->rhs())
-   {  vd->setExpression(0,*(el->rhs()));
-      return(vd);
-   } else
-   {  vd->extractStmt();
-      return(NULL);
-   }
-}
-
-void MarkCoeffsAsUsed()
-{    symb_list *sl;
-     coeffs * c;
-     for(sl=dsym; sl; sl=sl->next) 
-     {   c = AR_COEFFICIENTS(sl->symb); //((coeffs *) sl->symb-> attributeValue(0,ARRAY_COEF));
-         c->use = 1;
-     } 
-}
-
-int isInternalOrModuleProcedure(SgStatement *header_st)
-{
- if((header_st->variant()==FUNC_HEDR || header_st->variant()==PROC_HEDR) &&
-    (header_st->controlParent()->variant() == MODULE_STMT || header_st->controlParent()->variant() != GLOBAL) )
-    return 1;
- else 
-    return 0;
-
-}
-
-int TestMaxDims(SgExpression *list, SgSymbol *ar, SgStatement *stmt)
-{
-   int ndim = 0;
-   SgExpression *el;
-   for( el=list; el; el=el->rhs())
-      ndim++; 
-   if(ndim>MAX_DIMS)
-   {
-      if(stmt)
-         Error("Too many dimensions specified for '%s'",ar->identifier(),43,stmt); 
-      return 0;
-   }
-   else
-      return 1;      
-}
-
-
-void AnalyzeAsynchronousBlock(SgStatement *dir)
-{
-   SgStatement *st,*end_dir=NULL, *stmt;
-   int contains[2];
-   int f90_dir_flag = 0; 
-   if(dir->lexNext()->variant()==DVM_F90_DIR )
-      f90_dir_flag = 1;
-
-   SgStatement *end_of_func = cur_func->lastNodeOfStmt();
-   st = dir->lexNext();
-   while(st != end_of_func)
-   {
-      if(st->variant() == DVM_ENDASYNCHRONOUS_DIR)
-      {
-         end_dir = st;
-         break;
-      }
-      else
-         st = st->lexNext(); 
-   } 
-   if(!end_dir) 
-   {
-      err("Missing END ASYNCHRONOUS directive", 108, st); 
-      return;
-   } 
-   
-   st = dir->lexNext();
-   
-   if(f90_dir_flag) 
-   {
-      while (st->variant() == DVM_F90_DIR) 
-         st = st->lexNext();
-      if(!lookForDVMdirectivesInBlock(st, end_dir, contains ) || contains[0] || contains[1])
-         err("ASYNCHRONOS_ENDASYNCHRONOUS block contains illegal dvm-directive/statement", 901, dir);
-      
-      stmt = st;
-      while(stmt != end_dir)
-      {
-         st = stmt;
-         stmt = lastStmtOf(stmt)->lexNext();
-         st->extractStmt();
-      }
-   } 
-   else
-   {     
-      for(; st != end_dir; st=st->lexNext() )
-         if(st->variant() != ASSIGN_STAT || !isSgArrayRefExp(st->expr(0)) || !isSgArrayRefExp(st->expr(1)))                
-            err("Illegal statement/directive in ASYNCHRONOS_ENDASYNCHRONOUS block", 901, st);         
-   }
-   return;
-}
-
-void Renaming(char *name, SgSymbol *s) 
-{   
-   SYMB_IDENT(s->thesymb) = name;
-}
-
-void AddRenameNodeToUseList(SgSymbol *s)
-{
-   SgSymbol *smod = ORIGINAL_SYMBOL(s)->scope()->symbol(); //module symbol
-   SgStatement *st, *st_use=NULL, *st_use_only=NULL;
-   SgExpression *el_use_only=NULL;
-   for(st=cur_func->lexNext(); st->variant()==USE_STMT; st=st->lexNext())
-   {  
-      if(st->symbol() != smod)
-         continue;
-      if(!st->expr(0))
-      {
-         st_use = st;
-         continue;
-      }
-      SgExpression *el=st->expr(0);
-      if(el->variant()==ONLY_NODE)               
-         for(el = el->lhs(); el; el=el->rhs())
-         {   
-            if(el->lhs()->symbol() && el->lhs()->symbol()==ORIGINAL_SYMBOL(s))
-            {   
-               st_use_only = st;  el_use_only=el;
-               break;
-            }
-         }        
-      else
-         st_use = st;  
-   }
-   SgExpression *er =  new SgExpression(RENAME_NODE, new SgVarRefExp(s), new SgVarRefExp(ORIGINAL_SYMBOL(s)));
-   if(st_use_only)
-      el_use_only->setLhs(er);
-   else if(st_use)            
-      st_use->setExpression(0, AddElementToList(st_use->expr(0),er));
-}
-
-void CheckInrinsicNames()
-{
-   int i;
-   SgSymbol *s = NULL;
-
-   for(i=0; i<NUM__F90; i++)
-   {         
-      if(!f90[i]) 
-         continue; 
-      s = isNameConcurrence(f90[i]->identifier(), cur_func);
-      if(!s) 
-         continue;
-      if(IS_BY_USE(s))
-      {             
-         if(!strcmp(s->identifier(),ORIGINAL_SYMBOL(s)->identifier()))
-            AddRenameNodeToUseList(s);
-         Renaming(Check_Correct_Name(s->identifier()),s);
-         break;
-      }
-      switch (s->variant())
-      {
-         case DEFAULT:
-         case MODULE_NAME:
-         case REF_GROUP_NAME:	
-            Error("Object named '%s' should be renamed", s->identifier(), 662, cur_func);
-            break;
-         case FUNCTION_NAME:
-         case ROUTINE_NAME:
-         case PROCEDURE_NAME:
-         case PROGRAM_NAME:
-            if(s->attributes() & INTRINSIC_BIT)
-               ;
-            else if(DECL(s)==2) // statement function 
-               Renaming(Check_Correct_Name(s->identifier()),s); 
-            else
-               Err_g("Object named '%s' should be renamed or declared as INTRINSIC", s->identifier(), 662);
-            break;
-    
-         case SHADOW_GROUP_NAME:	
-         case REDUCTION_GROUP_NAME:	        
-         case ASYNC_ID:		
-         case CONSISTENT_GROUP_NAME:
-         case CONSTRUCT_NAME:
-         case INTERFACE_NAME:
-         case NAMELIST_NAME:
-         case TYPE_NAME: 
-         case CONST_NAME:
-            Renaming(Check_Correct_Name(s->identifier()),s);
-            break;
-         case VARIABLE_NAME:
-         case LABEL_VAR:
-            if(IS_DUMMY(s))
-               Err_g("Object named '%s' should be renamed", s->identifier(), 662);
-            else
-               Renaming(Check_Correct_Name(s->identifier()),s);
-            break;  
-         case FIELD_NAME: 
-            break;           
-         default:
-            break;        
-      }
-
-   }
-}
-
-int DvmArrayRefInExpr (SgExpression *e)
-{
-    if (!e) return 0;
-    if (isSgArrayRefExp(e) && HEADER(e->symbol()))
-        return 1;
-    if (DvmArrayRefInExpr(e->lhs()) || DvmArrayRefInExpr(e->rhs()))
-        return 1;
-    else
-        return 0;
-}
-
-int DvmArrayRefInConstruct (SgStatement *stat)
-{ // stat - FORALL or WHERE statement/construct 
-    SgStatement *out_st = lastStmtOf(stat)->lexNext();
-    SgStatement *st;
-    for (st = stat; st != out_st; st = st->lexNext())
-    {
-        if (DvmArrayRefInExpr(stat->expr(0)) || DvmArrayRefInExpr(stat->expr(1)) || DvmArrayRefInExpr(stat->expr(2)))
-            return 1;
-    }
-    return 0;    
-}
-
-symb_list *SortingBySize(symb_list *redvar_list)
-{//variables of 8 bytes are placed at the beginning of the redvar_list
-    SgSymbol *sym;
-    symb_list *sl, *sl_prev;
-    SgType *type;
-    for(sl=redvar_list, sl_prev=sl; sl; sl_prev=sl, sl=sl->next)
-    {     
-        type = isSgArrayType(sl->symb->type()) ? sl->symb->type()->baseType() : sl->symb->type();
-        if(TypeSize(type) != 8) continue;
-        if(sl==redvar_list)  continue;
-        sl_prev->next=sl->next;
-        sl->next=redvar_list;
-        redvar_list=sl;
-        sl=sl_prev;                 
-    }
-    return redvar_list;
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/funcall.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/funcall.cpp
deleted file mode 100644
index 68d9ee8..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/funcall.cpp
+++ /dev/null
@@ -1,4999 +0,0 @@
-
-/**************************************************************\
-* Fortran DVM                                                  * 
-*                                                              *
-*              Generating LibDVM Function Calls               *
-\**************************************************************/
-
-#include "dvm.h"
-
-
-/**************************************************************\
-*       Run_Time Library initialization and completion        *
-\**************************************************************/
-void RTLInit ()
-{    
-//generating assign statement
-// dvm000(1) = linit(InitParam)
-// (standart initialization : InitParam = 0)
-// and inserting it before first executable statemen
-    SgFunctionCallExp *fe   = new SgFunctionCallExp(*fdvm[RTLINI]);
-    fmask[RTLINI] = 1;
-    if(deb_mpi)
-      fe->addArg(*ConstRef(2));
-    else
-      fe->addArg(*ConstRef(0)); 
-    doAssignStmt(fe);
-    //ndvm--;         // the result of RTLIni isn't used
-    return;
-}
-
-void RTLExit (SgStatement *st  )
-
-{ 
-//generating CALL statement to close all opened files: clfdvm()
-//and inserting it before statement 'st'
-   LINE_NUMBER_BEFORE(st,st);
-   InsertNewStatementBefore(CloseFiles(),st);
-   if(INTERFACE_RTS2)
-      // call dvmh_exit(ExitCode)
-      InsertNewStatementBefore(Exit_2(0),st);
-   else
-   {
-      //generating call statement
-      // call dvmh_finish()     
-      InsertNewStatementBefore(RTL_GPU_Finish(),st);
-      //generating call statement
-      // call lexit(UsersRes)
-      // UsersRes - result of ending user's program
-      // !!! temporary :     0 
-      // and inserting it before statement 'st'
-      SgCallStmt *call = new SgCallStmt(*fdvm[RTLEXI]);
-      fmask[RTLEXI] = 2;
-      call->addArg(*ConstRef(0));
-      InsertNewStatementBefore(call,st);
-    }
-    return;
-}
-/**************************************************************\
-*       Checking Fortran and C data type compatibility        *
-\**************************************************************/
-void TypeControl()
-{  int n ;
-  SgCallStmt *call = new SgCallStmt(*fdvm[TPCNTR]);
-   /*SgFunctionCallExp *fe =  new SgFunctionCallExp(*fdvm[TPCNTR]);*/
-   fmask[TPCNTR] = 2;
-   n = (bind_ == 1 ) ? 6 : 5;
-//generating assign statement for arguments of 'tpcntr' function
-    doAssignStmt(ConstRef(n)); //Number of types
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Imem,*new SgValueExp(0))));
-    TypeMemory(SgTypeInt());
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Lmem,*new SgValueExp(0))));
-    TypeMemory(SgTypeBool());
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Rmem,*new SgValueExp(0))));
-    TypeMemory(SgTypeFloat());
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Dmem,*new SgValueExp(0))));
-    TypeMemory(SgTypeDouble());
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Chmem,*new SgValueExp(0))));
-    TypeMemory(SgTypeChar());
-    if(bind_ == 1)
-       doAssignStmt(GetAddresMem( new SgArrayRefExp(*dvmbuf,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Imem,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Lmem,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Rmem,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Dmem,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Chmem,*new SgValueExp(1))));
-    if(bind_ == 1)
-       doAssignStmt(GetAddresMem( new SgArrayRefExp(*dvmbuf,*new SgValueExp(2))));
-    doAssignStmt(ConstRef(TypeSize(SgTypeInt())));
-    doAssignStmt(ConstRef(TypeSize(SgTypeBool())));
-    doAssignStmt(ConstRef(TypeSize(SgTypeFloat())));
-    doAssignStmt(ConstRef(TypeSize(SgTypeDouble())));
-    doAssignStmt(ConstRef(TypeSize(SgTypeChar())));
-    if(bind_ == 1)
-       doAssignStmt(ConstRef( DVMTypeLength()));
-    doAssignStmt(ConstRef(VarType_RTS(Imem)));
-    doAssignStmt(ConstRef(VarType_RTS(Lmem)));
-    doAssignStmt(ConstRef(VarType_RTS(Rmem)));
-    doAssignStmt(ConstRef(VarType_RTS(Dmem)));
-    doAssignStmt(ConstRef(5));
-    if(bind_ == 1)
-       doAssignStmt(ConstRef( DVMType()));
-//generating assign statement
-// and inserting it before first executable statement
-// dvm000(i) = tpcntr(Number,FirstAddr[],NextAddr[],Len[],Type[])
-    call -> addArg(*DVM000(1));  
-    call -> addArg(*DVM000(2)); 
-    call -> addArg(*DVM000(2+n)); 
-    call -> addArg(*DVM000(2+2*n));  
-    call -> addArg(*DVM000(2+3*n)); 
-    where->insertStmtBefore(*call,*where->controlParent());
-                                   //inserting 'call' statement before 'where'  statement 
-    cur_st = call;     
-    /*doAssignStmt(fe);*/
-    SET_DVM(1);
-    return;
-}
-
-void TypeControl_New()
-{  int n, k ;
-                  /*  SgFunctionCallExp *fe =  new SgFunctionCallExp(*fdvm[TPCNTR]);*/ /*18.02.03*/
-   SgCallStmt *call = new SgCallStmt(*fdvm[FTCNTR]);
-      fmask[FTCNTR] = 2;
-   n = (bind_ == 1 ) ? 6 : 5;
-//generating assign statement for arguments of 'ftcntr' function
-    doAssignStmt(ConstRef(n)); //Number of types
-    if(bind_ == 1)
-      doAssignStmt(GetAddresMem( new SgArrayRefExp(*dvmbuf,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Imem,*new SgValueExp(0))));
-    TypeMemory(SgTypeInt());
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Lmem,*new SgValueExp(0))));
-    TypeMemory(SgTypeBool());
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Rmem,*new SgValueExp(0))));
-    TypeMemory(SgTypeFloat());
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Dmem,*new SgValueExp(0))));
-    TypeMemory(SgTypeDouble());
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Chmem,*new SgValueExp(0))));
-    TypeMemory(SgTypeChar());
-    /*if(bind_ == 1)
-      doAssignStmt(GetAddresMem( new SgArrayRefExp(*dvmbuf,*new SgValueExp(1))));*/
-    if(bind_ == 1)
-       doAssignStmt(GetAddresMem( new SgArrayRefExp(*dvmbuf,*new SgValueExp(2))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Imem,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Lmem,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Rmem,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Dmem,*new SgValueExp(1))));
-    doAssignStmt(GetAddresMem( new SgArrayRefExp(*Chmem,*new SgValueExp(1))));
-    /*if(bind_ == 1)
-      doAssignStmt(GetAddresMem( new SgArrayRefExp(*dvmbuf,*new SgValueExp(2))));*/
-    if(bind_ == 1)
-      doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(0)),new SgValueExp(DVMTypeLength())); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(1)),new SgValueExp(TypeSize(SgTypeInt()))); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(2)),new SgValueExp(TypeSize(SgTypeBool()))); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(3)),new SgValueExp(TypeSize(SgTypeFloat()))); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(4)),new SgValueExp(TypeSize(SgTypeDouble()))); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(5)),new SgValueExp(TypeSize(SgTypeChar()))); 
-//    doAssignStmt(ConstRef(TypeSize(SgTypeInt())));
-//    doAssignStmt(ConstRef(TypeSize(SgTypeBool())));
-//    doAssignStmt(ConstRef(TypeSize(SgTypeFloat())));
-//    doAssignStmt(ConstRef(TypeSize(SgTypeDouble())));
-//    doAssignStmt(ConstRef(TypeSize(SgTypeChar())));
-    /*if(bind_ == 1)
-        doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(6)),new SgValueExp(DVMTypeLength()));*/ 
-//       doAssignStmt(ConstRef( DVMTypeLength()));
-    if(bind_ == 1)
-      doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(10)),new SgValueExp(DVMType())); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(11)),new SgValueExp(VarType_RTS(Imem))); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(12)),new SgValueExp(VarType_RTS(Lmem))); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(13)),new SgValueExp(VarType_RTS(Rmem))); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(14)),new SgValueExp(VarType_RTS(Dmem))); 
-    doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(15)),new SgValueExp(5)); 
-
-//    doAssignStmt(ConstRef(VarType(Imem)));
-//    doAssignStmt(ConstRef(VarType(Lmem)));
-//    doAssignStmt(ConstRef(VarType(Rmem)));
-//    doAssignStmt(ConstRef(VarType(Dmem)));
-//    doAssignStmt(ConstRef(5));
-    /* if(bind_ == 1)
-       doAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(16)),new SgValueExp(DVMType())); */
-
-//       doAssignStmt(ConstRef( DVMType()));
-//generating assign statement
-// and inserting it before first executable statement
-// dvm000(i) = tpcntr(Number,FirstAddr[],NextAddr[],Len[],Type[])
-    //fe -> addArg(*new SgValueExp(n)); //(*DVM000(1));  
-    //fe -> addArg(*DVM000(2)); 
-    //fe -> addArg(*DVM000(2+n)); 
-    //fe -> addArg(*DVM000(2+2*n));  
-    //fe -> addArg(*DVM000(2+3*n));    
-    //doAssignStmt(fe);
-    k = (bind_ == 1 ) ? 0 : 1;
-    call -> addArg(*new SgValueExp(n)); //(*DVM000(1));  
-    call -> addArg(*DVM000(2)); 
-    call -> addArg(*DVM000(2+n)); 
-    call -> addArg(*new SgArrayRefExp(*Imem,*new SgValueExp(k)));  
-    call -> addArg(*new SgArrayRefExp(*Imem,*new SgValueExp(k+10)));
-//    call -> addArg(*DVM000(2+2*n));  
-//    call -> addArg(*DVM000(2+3*n));
-    where->insertStmtBefore(*call,*where->controlParent());
-                                   //inserting 'call' statement before 'where'  statement 
-    cur_st = call;       
-    SET_DVM(1);
-    return;
-}
-/**************************************************************\
-*       Requesting processor system                           *
-\**************************************************************/
-void GetVM ()
-{ 
-    SgFunctionCallExp *fe =  new SgFunctionCallExp(*fdvm[GETVM]);
-    fmask[GETVM] = 1;
-//generating assign statement
-// and inserting it before first executable statement
-// dvm000(3) = getps(AMRef)
-    fe -> addArg(*DVM000(2));  // dvm000(2) - AMReference
-    doAssignStmt(fe);
-    return;
-    /*
-// generating assign statement
-// and inserting it before first executable statement
-// dvm000(3) = 0 //PSRef == 0 means current processor system
-    doAssignStmt(new SgValueExp(0));
-    return;
-    */
-}
-
-SgExpression * GetProcSys (SgExpression * amref)
-{ 
-    SgFunctionCallExp *fe =  new SgFunctionCallExp(*fdvm[GETVM]);
-    fmask[GETVM] = 1;
-//generating function call: getps(AMRef)
-    fe -> addArg(*amref);  // AMReference
-    return(fe);
-}
-
-
-SgExpression *Reconf(SgExpression *size_array, int rank, int sign)
-{
-  SgFunctionCallExp *fe;
-  //  SgValueExp dPS(3);
-  
-// generating function call:
-//                          psview(PSRef, rank, SizeArray, StaticSign) 
-  fe = new SgFunctionCallExp(*fdvm[PSVIEW]);
-  fmask[PSVIEW] = 1;
-  fe->addArg(*CurrentPS()); //DVM000(3);//dvm000(3) - current processor system reference
-  fe -> addArg(*ConstRef(rank));// Rank
-  fe -> addArg(*size_array);  // SizeArray
-  fe -> addArg(*ConstRef(sign)); // StaticSign
-  return(fe);
-}
-
-SgExpression *CrtPS(SgExpression *psref, int ii, int il, int sign)
-{
-  SgFunctionCallExp *fe;
-  
-// generating function call:
-//                          crtps(PSRef,  InitIndexArray[], LastIndexArray[], StaticSign) 
-  fe = new SgFunctionCallExp(*fdvm[CRTPS]);
-  fmask[CRTPS] = 1;
-  fe->addArg(*psref);            // PSRef
-  fe -> addArg(*DVM000(ii));     // InitIndexArray
-  fe -> addArg(*DVM000(il));     // LastIndexArray
-  fe -> addArg(*ConstRef(sign)); // StaticSign
-  return(fe);
-}
-/**************************************************************\
-*                         Program blocks                      *
-\**************************************************************/
-int BeginBlock ()
-{   int ib;
-    SgExpression *re = new SgFunctionCallExp(*fdvm[BEGBL]);
-    fmask[BEGBL] = 1; 
-//generating assign statement
-// dvm000(1) = BegBl()
-// and inserting it before first executable statement
-    ib = ndvm;
-    doAssignStmt(re);
-    return(ib);
-}
-
-void BeginBlock_H ()
-{ 
-//inserting Subroutine Call: dvmh_scope_start() 
-    doCallStmt(ScopeStart());
-    return;
-}
-
-SgStatement *EndBlock_H (SgStatement * st)
-{  
-    SgStatement *call = ScopeEnd();
-    LINE_NUMBER_BEFORE(st,st);
-//inserting Subroutine Call: dvmh_scope_end()
-//before 'st' statement      
-    InsertNewStatementBefore(call,st);
-    return(call);
-}
-
-void EndBlock (SgStatement * st)
-{  
-//generating assign statement
-// dvm000(i) = EndBl(BlockRef)
-// and inserting it before current statement
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[ENDBL]);
-  fmask[ENDBL] = 1;
-  //fe -> addArg(* DVM000(1)); 
-   LINE_NUMBER_BEFORE(st,st);
-   doAssignStmtBefore(fe,st); 
-    return;
-}
-
-SgExpression * EndBl(int n)
-{ 
-//generating Function Call:
-//                           EndBl(BlockRef)
- 
- SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[ENDBL]);
-  fmask[ENDBL] = 1;
-  fe->addArg(*DVM000(n));
-  return(fe);
-}
-
-/**************************************************************\
-*            Abstract machine creating and mapping             *
-\**************************************************************/
-void Get_AM ()
-{ 
-    SgExpression *re =  new SgFunctionCallExp(*fdvm[GETAM]);
-    fmask[GETAM] = 1;
-//generating assign statement
-// and inserting it before first executable statement
-// dvm000(2) = GetAM()
-    doAssignStmt(re);
-    return;
-}
-
-SgExpression *GetAM ()
-{ 
-    SgExpression *re =  new SgFunctionCallExp(*fdvm[GETAM]);
-    fmask[GETAM] = 1;
-//generating function call: GetAM()
-    return(re);
-}
-
-SgExpression *CreateAMView(SgExpression *size_array, int rank, int sign) {
-  SgFunctionCallExp *fe;
-  SgValueExp dAM(2);
-  //SgArrayType *artype;
-  SgExpression *arg;
-  //algn_attr *atrAT;
-  if(sign != 2)
-    loc_distr = 1;
-  else
-    sign = 1;
-// generating function call:
-//                          CrtAMV(AMRef, rank, SizeArray, StaticSign) 
-  fe = new SgFunctionCallExp(*fdvm[CRTAMV]);
-  fmask[CRTAMV] = 1;
-  arg = CurrentAM(); //new SgArrayRefExp(*dvmbuf, dAM); //dvm000(2) - AMRef
-  fe->addArg(*arg);
-
-
-    arg = ConstRef(rank); // Rank
-    fe -> addArg(*arg);
-    fe -> addArg(*size_array);  // SizeArray
-    fe -> addArg(*ConstRef(sign)); // StaticSign
-    return(fe);
-}
-
-SgExpression * DistributeAM (SgExpression *amv, SgExpression *psref, int count, int idisars, int iparam) {
-// creating function call:
-//             DisAM(AMViewRef,PSRef, ParamCount,AxisArray, DistrParamArray)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[DISAM]); // DisAM function call
-  fmask[DISAM] = 1;
-  fe->addArg( amv->copy());
-  fe->addArg( * psref);  // PSRef
-  fe->addArg( * ConstRef (count));
-  fe->addArg( * DVM000(idisars));
-  fe->addArg( * DVM000(iparam));
-  return(fe);
-}
-
-SgStatement *RedistributeAM(SgExpression *ref, SgExpression *psref, int count, int idisars,int sign) {
-// creating subroutine call:
-//      redis(AMViewRef,PSRef, ParamCount,AxisArray, DistrParamArray, NewSign)
-  SgCallStmt *call = new SgCallStmt(*fdvm[RDISAM]);        
-  fmask[RDISAM] = 2;
-  call->addArg( ref->copy());
-  call->addArg( * psref );  // PSRef 
-  /*fe->addArg( * ConstRef(0)); */ // current PSRef
-  call->addArg( * ConstRef (count));
-  call->addArg( * DVM000(idisars));
-  call->addArg( * DVM000(idisars+count));
-  call->addArg( * ConstRef(sign));
-  return(call);
-}
-
-SgExpression *GetAMView(SgExpression *headref)
- { SgFunctionCallExp *fe;
-// creating function call:
-//             getamv(HeaderRef)
- fe = new SgFunctionCallExp(*fdvm[GETAMV]);
- fmask[GETAMV] = 1;
- fe->addArg(* headref);
- return(fe);
-}
-
-SgExpression *GetAMR(SgExpression *amvref, SgExpression *index)
- { SgFunctionCallExp *fe;
-// creating function call:
-//             getamr(AMViewRef,IndexArray)
- fe = new SgFunctionCallExp(*fdvm[GETAMR]);
- fmask[GETAMR] = 1;
- fe->addArg(* amvref);
- fe->addArg(* index);
- return(fe);
-}
-
-SgExpression * GenBlock (SgExpression *psref, SgExpression *amv, int iweight, int icount)
- {
-// creating function call:
-//             genbli(PSRef,AMViewRef, AxisWeightArray, AxisCount)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[GENBLI]); // genbli function call
-  fmask[GENBLI] = 1;
-  fe->addArg( * psref);  // PSRef
-  fe->addArg( amv->copy() );
-  fe->addArg( * DVM000(iweight));
-  fe->addArg( * ConstRef(icount));
-  return(fe);
-}
-
-SgExpression * WeightBlock(SgExpression *psref, SgExpression *amv, int iweight, int iwnumb,  int icount)
- {
-// creating function call:
-//             setelw(PSRef,AMViewRef, LoadWeightArray, WeightNumberArray,Count)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[SETELW]); // setelw() function call
-  fmask[SETELW] = 1;
-  fe->addArg( * psref);  // PSRef
-  fe->addArg( amv->copy() );
-  fe->addArg( * DVM000(iweight));
-  fe->addArg( * DVM000(iwnumb));
-  fe->addArg( * ConstRef(icount));
-  return(fe);
-}
-
-SgExpression * MultBlock (SgExpression *amv, int iaxisdiv, int n)
- {
-// creating function call:
-//             blkdiv(AMViewRef, AxisDivArray, AMVAxisCount)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[BLKDIV]); // blkdiv function call
-  fmask[BLKDIV] = 1;
- 
-  fe->addArg( amv->copy() );
-  fe->addArg( * DVM000(iaxisdiv));
-  fe->addArg( * ConstRef(n));
-  return(fe);
-}
-/**************************************************************\
-*            Distributed array creating and mapping           *
-\**************************************************************/
-SgExpression *CreateDistArray(SgSymbol *das, SgExpression *array_header,                     SgExpression *size_array, int rank, int ileft, int iright,                  int sign, int re_sign) 
-{
-// creates function call:
-//          CrtDA (ArrayHeader,ExtHdrSign,Base,Rank,TypeSize,SizeArray,
-//                 StaticSign, ReDistrSign, LeftBSizeArray,RightBSizeArray)  
-  SgFunctionCallExp *fe;
-  SgExpression *arg;
-  SgType *t;
-  loc_distr =1;
-  if(IS_POINTER(das))
-    t = PointerType(das);
-  else
-    t = (das->type())->baseType();
-  if(t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING){
-    fe = new SgFunctionCallExp(*fdvm[CRTDA]); // crtda function call
-    fmask[CRTDA] = 1;
-  } else {
-    fe = new SgFunctionCallExp(*fdvm[CRTDA9]); // crtda9 function call
-    fmask[CRTDA9] = 1;
-  }
-  fe->addArg(* array_header);
-  fe->addArg(*ConstRef(1)); //ExtHdrSign = 1 for Fortran
-  arg = (t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING ) ? new SgArrayRefExp(*baseMemory(SgTypeInt())) : GetAddresMem(new SgArrayRefExp(*baseMemory(t))) ;  //SgArrayRefExp(*baseMemory(t))
-  //TypeMemory(t); // marking this type memory use
-  fe->addArg(*arg); //Base
-  arg = ConstRef(rank);
-  fe->addArg(*arg); //Rank
-  arg = ConstRef(TypeSize(t));
-  //arg = (t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING )? &SgUMinusOp(*ConstRef( TestType_RTS(t))) : ConstRef(TypeSize(t));
-  fe->addArg(*arg); //TypeSize
-  fe->addArg(size_array->copy()); //Size_array
-  fe->addArg(*ConstRef(sign)); //StaticSign
-  fe->addArg(*ConstRef(re_sign));  // ReDistrSign 
-  fe->addArg(*DVM000(ileft));
-  fe->addArg(*DVM000(iright));
-  return(fe);
-}
-
-SgExpression *AlignArray (SgExpression *array_handle,
-                          SgExpression *template_handle,
-                          int iaxis, 
-                          int icoeff,  
-                          int iconst) 
-//creating function call:
-//  AlgnDA (ArrayHeader, PatternRef, AxisArray, CoeffArray, ConstArray)
-{
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[ALGNDA]); // AlgnDA function call
-  fmask[ALGNDA] =  1;
-  fe->addArg( array_handle->copy());
-  fe->addArg( template_handle->copy());
-  fe->addArg( *dvm_ref(iaxis));
-  fe->addArg( *dvm_ref(icoeff));
-  fe->addArg( *dvm_ref(iconst));
-  return(fe);
-} 
-
-SgStatement *RealignArr (SgExpression *array_header,
-                          SgExpression *pattern_ref,
-                          int iaxis, 
-                          int icoeff,  
-                          int iconst,
-                          int new_sign ) 
-//creating subroutine call:
-// realn (ArrayHeader, PatternRef, AxisArray, CoeffArray, ConstArray, NewSign)
-{
-  SgCallStmt *call = new SgCallStmt(*fdvm[REALGN]);
-  fmask[REALGN] = 2;
-  call->addArg( array_header->copy());
-  call->addArg( pattern_ref->copy());
-  call->addArg( *dvm_ref(iaxis));
-  call->addArg( *dvm_ref(icoeff));
-  call->addArg( *dvm_ref(iconst));
-  call->addArg( *ConstRef(new_sign));
-  return(call);
-}
-
-/**************************************************************\
-*            CONSISTENT(replicated) array creating             *
-\**************************************************************/
-SgExpression *CreateConsistArray(SgSymbol *cas, SgExpression *array_header, SgExpression *size_array, int rank,  int sign, int re_sign) 
-{
-// creates function call:
-//       crtraf or  crtra9 (ArrayHeader,ExtHdrSign,Base,Rank,TypeSize,SizeArray, StaticSign, ReDistrSign, Memory) 
-//           
-  SgFunctionCallExp *fe;
-  SgExpression *arg;
-  SgType *t;
-  loc_distr =1;
-  
-  t = (cas->type())->baseType();
-    if(t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING){  
-    fe = new SgFunctionCallExp(*fdvm[CRTRDA]); // crtraf function call
-    fmask[CRTRDA] = 1;
-  } else {
-    fe = new SgFunctionCallExp(*fdvm[CRTRA9]); // crtra9 function call
-    fmask[CRTRA9] = 1;
-  }
-  fe->addArg(* array_header);
-  fe->addArg(*ConstRef(0)); //ExtHdrSign = 0 for consistent array
-  //fe->addArg(*ConstRef(1)); //ExtHdrSign = 1 for Fortran
-  arg = (t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING) ? new SgArrayRefExp(*cas) : GetAddresMem(new SgArrayRefExp(*baseMemory(t)));//new SgArrayRefExp(*Imem); SgArrayRefExp(*baseMemory(t))
-  //TypeMemory(t); // marking this type memory use
-  fe->addArg(*arg); //Base
-  arg = ConstRef(rank);
-  fe->addArg(*arg); //Rank
-  arg = (t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING) ? &SgUMinusOp(*ConstRef( TestType_RTS(t))) : ConstRef(TypeSize(t));
-  //arg = ConstRef(TypeSize(t));
-  fe->addArg(*arg); //TypeSize
-  fe->addArg(size_array->copy()); //Size_array
-  fe->addArg(*ConstRef(sign)); //StaticSign
-  fe->addArg(*ConstRef(re_sign));  // ReDistrSign 
-  arg= new SgArrayRefExp(*cas);
-  fe->addArg(*GetAddresMem(arg));
-  return(fe);
-}
-
-SgStatement *CreateDvmArrayHeader(SgSymbol *cas, SgExpression *array_header, SgExpression *size_array, int rank,  int sign, int re_sign) 
-{
-// creates subroutine call:
-//       crtraf or  crtra9 (ArrayHeader,ExtHdrSign,Base,Rank,TypeSize,SizeArray, StaticSign, ReDistrSign, Memory) 
-//           
-  SgCallStmt *call;
-  SgExpression *arg;
-  SgType *t;
-  int test_type;
-  loc_distr =1;
-  
-  t = (cas->type())->baseType();
-  test_type = TestType_RTS(t);
-  if(test_type) {  
-    call = new SgCallStmt(*fdvm[CRTRDA]); // crtraf function call
-    fmask[CRTRDA] = 2;
-  } else {
-    call = new SgCallStmt(*fdvm[CRTRA9]); // crtra9 function call
-    fmask[CRTRA9] = 2;
-  }
-  call->addArg(* array_header);
-  if(!IN_COMPUTE_REGION && !parloop_by_handler)
-    call->addArg(*ConstRef(0));     //ExtHdrSign = 0 for consistent array
-  else
-    call->addArg(*ConstRef(1));     //ExtHdrSign = 1 for dvm array in region
-  arg = (test_type) ? (HEADER_OF_REPLICATED(cas) ? new SgArrayRefExp(*baseMemory(t)) : new SgArrayRefExp(*cas)) : GetAddresMem(new SgArrayRefExp(*baseMemory(t)));//new SgArrayRefExp(*Imem); SgArrayRefExp(*baseMemory(t))
-  call->addArg(*arg);               //Base
-  arg = ConstRef(rank);
-  call->addArg(*arg);               //Rank
-  arg = (test_type) ? &SgUMinusOp(*ConstRef(test_type)) : ConstRef(TypeSize(t));
-  
-  call->addArg(*arg);               //TypeSize
-  call->addArg(size_array->copy()); //Size_array
-  call->addArg(*ConstRef(sign));    //StaticSign
-  call->addArg(*ConstRef(re_sign)); // ReDistrSign 
-  arg = new SgArrayRefExp(*cas);
-  call->addArg(*GetAddresMem(arg)); // Memory
-  return(call);
-}
-
-/**************************************************************\
-*              Parallel Loop Defining                         *
-\**************************************************************/
-/*
-int CreateParLoop(int rank)
-{
-//generating assign statement:
-// dvm000(i) = crtpl( Rank)
-// return: i - index in "dvm000" array for LoopRef 
-  int il; 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CRTPLP]);
-  fmask[CRTPLP] = 1;
-  fe -> addArg( * ConstRef(rank));
-  il = ndvm;
-  doAssignStmtAfter(fe);
-  return(il);
-}
-*/
-SgExpression *CreateParLoop(int rank)
-{     
-//generating Function Call:
-//                         crtpl( Rank)
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CRTPLP]);
-  fmask[CRTPLP] = 1;
-  fe -> addArg( * ConstRef(rank));
-  return(fe);
-}
-
-
-SgExpression *doLoop(int iloopref)
-{
-//generating Function Call:
-//                           dopl(LoopRef)
- 
- SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[DOLOOP]);
-  fmask[DOLOOP] = 1;
-  fe->addArg(*DVM000(iloopref));
-  return(fe);
-}
-
-
-SgStatement * BeginParLoop (int iloopref,SgExpression *header, int rank, int iaxis, int nr, int iinp, int iout)
-{
-//creating subroutine call:
-//   mappl(LoopRef, PatternRef, AxisArray[], CoefArray[], ConstArray[],
-//          LoopVarAdrArray[], LoopVarTypeArray[], InpInitIndexArray[], InpLastIndexArray[],
-//          InpStepArray[], 
-//          OutInitIndexArray[], OutLastIndexArray[], OutStepArray[])
-  
-  SgCallStmt *call= new SgCallStmt(*fdvm[BEGPLP]);
-  fmask[BEGPLP] = 2;
-  call->addArg(*DVM000(iloopref));
-  call->addArg(*header);
-  call->addArg(*DVM000(iaxis));
-  call->addArg(*DVM000(iaxis+nr));
-  call->addArg(*DVM000(iaxis+2*nr));
-  call->addArg(*DVM000(iinp));
-  call->addArg(*DVM000(iinp+rank));
-  call->addArg(*DVM000(iinp+2*rank));
-  call->addArg(*DVM000(iinp+3*rank));
-  call->addArg(*DVM000(iinp+4*rank));
-  call->addArg(*DVM000(iout));
-  call->addArg(*DVM000(iout+rank));
-  call->addArg(*DVM000(iout+2*rank));
-  return(call);
-}
-
-SgStatement *EndParLoop(int iloopref)
-{
-//generating Subroutine Call:
-//                           EndPL(LoopRef)
-
-  SgCallStmt *call= new SgCallStmt(*fdvm[ENDPLP]); 
-  fmask[ENDPLP] = 2;                               
-  call->addArg(*DVM000(iloopref));
-  return(call);
-}
-
-SgStatement *BoundFirst(int iloopref, SgExpression *gref)
-{
-//generating Subroutine Call:
-//                           exfrst(LoopRef,BoundGroupRef)
- 
-  SgCallStmt *call= new SgCallStmt(*fdvm[BFIRST]); 
-  fmask[BFIRST] = 2;
-  call->addArg(*DVM000(iloopref));
-  call->addArg(gref->copy());
-  return(call);
-}
-
-SgStatement *BoundLast(int iloopref, SgExpression *gref)
-{
-//generating Subroutine Call:
-//                           imlast(LoopRef,BoundGroupRef)
- 
-  SgCallStmt *call= new SgCallStmt(*fdvm[BLAST]); 
-  fmask[BLAST] = 2;
-  call->addArg(*DVM000(iloopref));
-  call->addArg(gref->copy());
-  return(call);
-}
- 
-/**************************************************************\
-*                        Reduction                             *
-\**************************************************************/
-SgExpression * CreateReductionGroup()
-{
-//generating function call:
-//                             CrtRG(StaticSign,DelRVSign)
-  
-  //int ig;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CRTRG]);
-  fmask[CRTRG] = 1;
-  fe->addArg(* ConstRef(1)); //StaticSign = 1
-  fe->addArg(* ConstRef(1)); //DelRVSign = 1
-  //ig = ndvm;
-  //doAssignTo_After(gref,fe);
-  return(fe);
-}
-
-SgExpression *ReductionVar(int num_red, SgExpression *red_array, int ntype, int length, SgExpression *loc_array, int loc_length, int sign)
-{
-//generating function call:
-//                        crtrdf(RedFuncNumb, RedArray, RedArrayType, RedArrayLength,                                         LocArray, LocElmLength, StaticSign)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[REDVARF]);
-  fmask[REDVARF] = 1;
-    //fe = new SgFunctionCallExp(*fdvm[REDVAR]);
-    //fmask[REDVAR] = 1;
-  fe->addArg(*ConstRef(num_red));
-  fe->addArg(*GetAddresMem(red_array));
-    //fe->addArg(red_array->copy()); //!!!It must be: *GetAddresMem(red_array)
-  fe->addArg(*ConstRef(ntype));
-  fe->addArg(*DVM000(length));
-  fe->addArg(loc_array->copy());
-  fe->addArg(*DVM000(loc_length));
-  fe->addArg(*ConstRef(sign));
-  return(fe);
-}
-
-SgStatement *InsertRedVar(SgExpression *gref, int irv, int iplp)
-{
-//creating subroutine call:
-//                       insred(RedGroupRef, RedVarRef, PSSpaceRef, RenewSign)
-  SgCallStmt *call = new SgCallStmt(*fdvm[INSRV]); 
-  fmask[INSRV] = 2;
-  call->addArg(gref->copy());
-  call->addArg(*dvm_ref(irv));
-  if(iplp)
-    call->addArg(*dvm_ref(iplp));
-  else
-    call->addArg(*ConstRef(0));
-  call->addArg(*ConstRef(0));
-  return(call);
-}
-
-SgExpression *LocIndType(int irv, int type)
-{
-//creating function call:
-//                       lindtp(RedVarRef, LocIndType)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[LINDTP]);
-  fmask[LINDTP] = 1;
-  fe->addArg(*DVM000(irv));
-  fe->addArg(*ConstRef(type));
-  return(fe);
-}
-
-SgStatement *LoopReduction(int ilh, int num_red, SgExpression *red_array, int ntype, SgExpression *length, SgExpression *loc_array, SgExpression *loc_length)
-{//creating Subroutine Call:
- //        dvmh_loop_reduction(const DvmType *pCurLoop, const DvmType *pRedType, void *arrayAddr, const DvmType *pVarType, const DvmType *pArrayLength,
- //                             void *locAddr, const DvmType *pLocSize)
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_RED]);  
-  fmask[LOOP_RED] = 2;  
-  call->addArg(*DVM000(ilh));
-  call->addArg(*ConstRef(num_red));
-  call->addArg(red_array->copy());     //GetAddresMem(red_array)
-  call->addArg(*ConstRef(ntype));
-  call->addArg(*DvmType_Ref(length));
-  call->addArg(loc_array->copy());
-  call->addArg(*DvmType_Ref(loc_length));
-  return(call);
-}
-
-SgExpression *SaveRedVars(SgExpression *gref)
-{
-//creating function call:
-//                        SaveRV(RedGroupRef)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[SAVERV]);
-  fmask[SAVERV] = 1;
-  fe->addArg(gref->copy());
-  return(fe);
-}
-
-SgStatement *StartRed(SgExpression *gref)
-{
-//creating subroutine call:
-//                        strtrd(RedGroupRef)
-  SgCallStmt *call = new SgCallStmt(*fdvm[STARTR]);
-  fmask[STARTR] = 2;
-  call->addArg(gref->copy());
-  return(call);
-}
-
-SgStatement *WaitRed(SgExpression *gref)
-{
-//creating subroutine call:
-//                        waitrd(RedGroupRef)
-  SgCallStmt *call = new SgCallStmt(*fdvm[WAITR]);
-  fmask[WAITR] = 2;
-  call->addArg(gref->copy());
-  return(call);
-}
-
-SgExpression *DelRG(SgExpression *gref)
-{
-//creating function call:
-//                        DelRG(RedGroupRef)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[DELRG]);
-  fmask[DELRG] = 1;
-  fe->addArg(gref->copy());
-  return(fe);
-}
-
-/**************************************************************\
-*                   Shadow edge operations                     *
-\**************************************************************/
-void  CreateBoundGroup(SgExpression *gref)
-{
-//generating assign statement:
-// dvm000(i) = crtshg(StaticSign)
-  int st_sign; 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CRTSHG]);
-  fmask[CRTSHG] = 1;
-  st_sign = (HPF_program && one_inquiry) ? 1 : 0;
-  //StaticSign = 1 if -Honeq option is specified for HPF program,  
-  //StaticSign = 0 if other
-  fe->addArg(* ConstRef(st_sign)); 
-  //ibg = ndvm;
-  doAssignTo_After(gref,fe);
-  return;
-}
-
-SgStatement *InsertArrayBound(SgExpression *gref, SgExpression *head, int ileft, int iright, int corner) 
-{
-//creating subroutine call:
-//                inssh(BounddGroupRef, ArrayHeader[], LeftBSize[], RightBSize[],CornerSign)
-  SgCallStmt *call = new SgCallStmt(*fdvm[DATOSHG]);
-  fmask[DATOSHG] = 2;
-  call->addArg(gref->copy());
-  call->addArg(*head);
-  call->addArg(*DVM000(ileft));
-  call->addArg(*DVM000(iright));
-  call->addArg(*ConstRef(corner));
-  return(call);
-}
-
-SgStatement *InsertArrayBoundDep(SgExpression *gref, SgExpression *head, int ileft, int iright, int max, int ishsign)
-{
-//creating subroutine call:
-//             insshd(BounddGroupRef, ArrayHeader[], LeftBSize[], RightBSize[],MaxShadowCount,ShadowSignArray[])
-  SgCallStmt *call = new SgCallStmt(*fdvm[INSSHD]);
-  fmask[INSSHD] = 2;
-  call->addArg(gref->copy());
-  call->addArg(*head);
-  call->addArg(*DVM000(ileft));
-  call->addArg(*DVM000(iright));
-  call->addArg(*ConstRef(max));
-  call->addArg(*DVM000(ishsign));
-  return(call);
-}
-
-SgStatement *InsertArrayBoundSec(SgExpression *gref, SgExpression *head, int ilsec, int irsec, int iilowshs, int illowshs, int iihishs,int ilhishs, int max, int ishsign)
-{
-//creating subroutine call:
-//        incshd(BounddGroupRef, ArrayHeader[], InitDimIndex[], LastDimIndex[],InitLowShdIndex[],
-//               LastLowShdIndex[], InitHiShdIndex[], LastHiShdIndex[],LeftBSize[], RightBSize[],MaxShadowCount,ShadowSignArray[])
-  SgCallStmt *call = new SgCallStmt(*fdvm[INCSHD]);
-  fmask[INCSHD] = 2;
-  call->addArg(gref->copy());
-  call->addArg(*head);
-  call->addArg(*DVM000(ilsec));
-  call->addArg(*DVM000(irsec));
-  call->addArg(*DVM000(iilowshs));
-  call->addArg(*DVM000(illowshs));
-  call->addArg(*DVM000(iihishs));
-  call->addArg(*DVM000(ilhishs));
-  call->addArg(*ConstRef(max));
-  call->addArg(*DVM000(ishsign));
-  return(call);
-}
-
-
-SgStatement *AddBound( )
-{
-//creating subroutine call:
-//                        addbnd()
-  SgCallStmt *call = new SgCallStmt(*fdvm[ADDBND]);
-  fmask[ADDBND] = 2;
-  return(call);
-}
-
-SgStatement *AddBoundShadow(SgExpression *head,int ileft,int iright )
-{
-//creating subroutine call:
-//                        addshd( ArrayHeader[], LeftBSize[], RightBSize[])
-  SgCallStmt *call = new SgCallStmt(*fdvm[ADDSHD]);
-  fmask[ADDSHD] = 2;
-  call->addArg(*head);
-  call->addArg(*DVM000(ileft));
-  call->addArg(*DVM000(iright));
-  return(call);
-}
-
-SgStatement *StartBound(SgExpression *gref)
-{
-//creating subroutine call:
-//                        strtsh(BoundGroupRef)
-  SgCallStmt *call = new SgCallStmt(*fdvm[STARTSH]);
-  fmask[STARTSH] = 2;
-  call->addArg(gref->copy());
-  return(call);
-}
-
-SgStatement *WaitBound(SgExpression *gref)
-{
-//creating subroutine call:
-//                        waitsh(BoundGroupRef)
-  SgCallStmt *call = new SgCallStmt(*fdvm[WAITSH]);
-  fmask[WAITSH] = 2;
-  call->addArg(gref->copy());
-  return(call);
-}
-
-SgStatement *SendBound(SgExpression *gref)
-{
-//creating subroutine call:
-//                        sendsh(BoundGroupRef)
-  SgCallStmt *call = new SgCallStmt(*fdvm[SENDSH]);
-  fmask[SENDSH] = 2;
-  call->addArg(gref->copy());
-  return(call);
-}
-
-SgStatement *ReceiveBound(SgExpression *gref)
-{
-//creating subroutine call:
-//                        recvsh(BoundGroupRef)
-  SgCallStmt *call = new SgCallStmt(*fdvm[RECVSH]);
-  fmask[RECVSH] = 2;
-  call->addArg(gref->copy());
-  return(call);
-}
-
-SgStatement *InitAcross(int acrtype,SgExpression *oldg, SgExpression *newg) 
-{
-//creating subroutine call:
-//               across(AcrossType,OldShadowGroupRef,NewShadowGroupRef,GroupNumber)
-  SgCallStmt *call = new SgCallStmt(*fdvm[ACROSS]);
-  fmask[ACROSS] = 2;
-  call->addArg(*ConstRef(acrtype));
-  call->addArg(*oldg);
-  call->addArg(*newg);
-  call->addArg(*new SgVarRefExp(Pipe));
-  return(call);
-}
-
-
-SgExpression *DelBG(SgExpression *gref)
-{
-//creating function call:
-//                        DelShG(BoundGroupRef)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[DELSHG]);
-  fmask[DELSHG] = 1;
-  fe->addArg(gref->copy());
-  return(fe);
-}
-
-/**************************************************************\
-*              Copying  distributed arrays                    *
-\**************************************************************/
-SgExpression *DA_CopyTo_A(SgExpression *head, SgExpression *toar, int init_ind,                                 int last_ind, int step_ind, int regim)
-{
-//generating Function Call:
-// ArrCpy(ArrayHeader,FromInitIndexArray,FromLastIndexArray,FromStepArray,
-//        Array, ToInitIndexArray, ToLastIndexArray, ToStepArray, CopyRegim)
- 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[ARRCPY]);
- fmask[ARRCPY] = 1;
-  fe->addArg(head->copy());
-  fe->addArg(*DVM000(init_ind));
-  fe->addArg(*DVM000(last_ind));
-  fe->addArg(*DVM000(step_ind));
-
-  fe->addArg(toar->copy());
-  fe->addArg(*DVM000(init_ind)); //is ignored for CopyRegim=2
-  fe->addArg(*DVM000(last_ind)); //is ignored for CopyRegim=2
-  fe->addArg(*DVM000(step_ind)); //is ignored for CopyRegim=2
-
-  fe->addArg(* ConstRef(regim)); // CopyRegim
-  return(fe);
-}
-
-SgExpression *A_CopyTo_DA( SgExpression *fromar, SgExpression *head, int init_ind,                                 int last_ind, int step_ind, int regim)
-{
-//generating Function Call:
-// ArrCpy(Array, FromInitIndexArray,FromLastIndexArray,FromStepArray,
-//  ArrayHeader, ToInitIndexArray, ToLastIndexArray, ToStepArray, CopyRegim)
- 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[ARRCPY]);
- fmask[ARRCPY] = 1;
-
-  fe->addArg(fromar->copy());
-  fe->addArg(*DVM000(init_ind)); //is ignored for CopyRegim=2
-  fe->addArg(*DVM000(last_ind)); //is ignored for CopyRegim=2
-  fe->addArg(*DVM000(step_ind)); //is ignored for CopyRegim=2
-
-  fe->addArg(head->copy());
-  fe->addArg(*DVM000(init_ind));
-  fe->addArg(*DVM000(last_ind));
-  fe->addArg(*DVM000(step_ind));
-
-  fe->addArg(* ConstRef(regim)); // CopyRegim
-  return(fe);
-}
-
-SgExpression *ArrayCopy(SgExpression *from_are, int from_init, int from_last, int from_step, SgExpression *to_are, int to_init, int to_last, int to_step, int regim)
-{
-//generating Function Call:
-// ArrCpy(ArrayHeader,FromInitIndexArray,FromLastIndexArray,FromStepArray,
-//        Array, ToInitIndexArray, ToLastIndexArray, ToStepArray, CopyRegim)
- 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[ARRCPY]);
- fmask[ARRCPY] = 1;
-
-  fe->addArg(from_are->copy());
-  fe->addArg(*DVM000(from_init));
-  fe->addArg(*DVM000(from_last));
-  fe->addArg(*DVM000(from_step));
-
-  fe->addArg(to_are->copy());
-  fe->addArg(*DVM000(to_init)); 
-  fe->addArg(*DVM000(to_last)); 
-  fe->addArg(*DVM000(to_step)); 
-
-  fe->addArg(* SignConstRef (regim)); // CopyRegim
-
-  return(fe);
-}
-
-SgExpression *ReadWriteElement(SgExpression *from, SgExpression *to, int ind) 
-{
-//generating Function Call:
-//                        rwelm(FromArrayHeader, To, IndexArray);
- 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[RWELMF]);
- fmask[RWELMF] = 1;
-   //SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[RWELM]);
-   //fmask[RWELM] = 1;
-
-  fe->addArg(from->copy());
-  fe->addArg(*GetAddresMem(to));
-    //fe->addArg(to->copy());//!!!it must be: *GetAddresMem(to)
-  fe->addArg(*DVM000(ind));
-  return(fe);
-}   
-
-SgExpression *AsyncArrayCopy(SgExpression *from_are, int from_init, int from_last, int from_step, SgExpression *to_are, int to_init, int to_last, int to_step, int regim, SgExpression *flag)
-{
-//generating Function Call:
-// aarrcp(ArrayHeader,FromInitIndexArray,FromLastIndexArray,FromStepArray,
-//        Array, ToInitIndexArray, ToLastIndexArray, ToStepArray, CopyRegim,CopyFlag)
- 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[AARRCP]);
- fmask[AARRCP] = 1;
-
-  fe->addArg(from_are->copy());
-  fe->addArg(*DVM000(from_init));
-  fe->addArg(*DVM000(from_last));
-  fe->addArg(*DVM000(from_step));
-
-  fe->addArg(to_are->copy());
-  fe->addArg(*DVM000(to_init)); 
-  fe->addArg(*DVM000(to_last)); 
-  fe->addArg(*DVM000(to_step)); 
-
-  fe->addArg(* SignConstRef (regim)); // CopyRegim
-  fe->addArg(flag->copy());
-  return(fe);
-}
-
-SgExpression *WaitCopy(SgExpression *flag)
-{
-//creating function call:
-//                        waitcp(CopyFlag)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[WAITCP]);
-  fmask[WAITCP] = 1;
-  fe->addArg(flag->copy());
-  return(fe);
-}
-
-/**************************************************************\
-*                     Tasking                                   *
-\**************************************************************/
-SgStatement *MapAM(SgExpression *am, SgExpression *ps)
-{
-//generating Subroutine Call:
-//                           mapam(AMRef,PSRef)
-//creating task (mapping abstract mashine)
- SgCallStmt *call = new SgCallStmt(*fdvm[MAPAM]);
- fmask[MAPAM] = 2;
-  
-  call->addArg(*am);
-  call->addArg(*ps);
-  return(call);
-}
-
-SgExpression *RunAM(SgExpression *am)
-{
-//generating Function Call:
-//                           runam(AMRef)
-//starting task 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[RUNAM]);
- fmask[RUNAM] = 1;
-  
-  fe->addArg(*am);
-  return(fe);
-}
-
-SgStatement *StopAM()
-{
-//generating Subroutine Call:
-//                           stopam()
-//stoping task 
- SgCallStmt *call = new SgCallStmt(*fdvm[STOPAM]);
- fmask[STOPAM] = 2;  
- return(call);
-}
-
-SgStatement  *MapTasks(SgExpression *taskCount,SgExpression *procCount,SgExpression *params,SgExpression *low_proc,SgExpression *high_proc,SgExpression *renum)
-{
-//generating Subroutine Call:
-//                           map_tasks(long taskCount,long procCount,double params,long low_proc,long high_proc,long renum) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[MAP_TASKS]);  
-  fmask[MAP_TASKS] = 2;  
-  call -> addArg(*taskCount);
-  call -> addArg(*procCount);
-  call -> addArg(*params);
-  call -> addArg(*low_proc);
-  call -> addArg(*high_proc);
-  call -> addArg(*renum);
-  return(call);
-} 
-/**************************************************************\
-*                      Remote access                           *
-\**************************************************************/
-/*
-SgExpression *LoadBG(SgSymbol *group)
-{
-//generating Function Call:
-//                           loadbg(GroupRef,RenewSign)
-//loading buffers of group 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[LOADBG]); 
- fmask[LOADBG] = 1;
- 
-  fe->addArg(*GROUP_REF(group,1));
-  fe->addArg(*ConstRef(1));
-  return(fe);
-}
-
-SgExpression *WaitBG(SgSymbol *group)
-{
-//generating Function Call:
-//                           waitbg(GroupRef) 
-//waiting of completion of loading buffers of the group
-  SgFunctionCallExp *fe  = new SgFunctionCallExp(*fdvm[WAITBG]);
-  fmask[WAITBG] = 1;
-
-  fe->addArg(*GROUP_REF(group,1));
-  return(fe);
-}
-*/
-
-SgExpression *LoadBG(SgExpression *gref)
-{
-//generating Function Call:
-//                           loadbg(GroupRef,RenewSign)
-//loading buffers of group 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[LOADBG]); 
- fmask[LOADBG] = 1;
- 
-  fe->addArg(*gref);
-  fe->addArg(*ConstRef(1));
-  return(fe);
-}
-
-SgExpression *WaitBG(SgExpression *gref)
-{
-//generating Function Call:
-//                           waitbg(GroupRef) 
-//waiting of completion of loading buffers of the group
-  SgFunctionCallExp *fe  = new SgFunctionCallExp(*fdvm[WAITBG]);
-  fmask[WAITBG] = 1;
-
-  fe->addArg(*gref);
-  return(fe);
-}
-
-SgExpression *CreateBG(int st_sign,int del_sign)
-{
-//generating Function Call:
-//                         crtbg(StaticSign,DelBufSign)
-//creating group of buffers 
-  SgFunctionCallExp *fe  = new SgFunctionCallExp(*fdvm[CRTBG]);
-  fmask[CRTBG] = 1;
-  
-  fe->addArg(*ConstRef(st_sign));
-  fe->addArg(*ConstRef(del_sign));
-  return(fe);
-}
-/*
-SgExpression *InsertRemBuf(SgSymbol *group, SgExpression *buf)
-{
-//generating Function Call:
-//                           insrb(GroupRef,BufferHeader[])
-//inserting buffer in the group
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[INSRB]);
- fmask[INSRB] = 1;
-  
-  fe->addArg(*GROUP_REF(group,1));
-  fe->addArg(*buf);
-  return(fe);
-}
-*/
-
-SgExpression *InsertRemBuf(SgExpression *gref, SgExpression *buf)
-{
-//generating Function Call:
-//                           insrb(GroupRef,BufferHeader[])
-//inserting buffer in the group
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[INSRB]);
- fmask[INSRB] = 1;
-  
-  fe->addArg(*gref);
-  fe->addArg(*buf);
-  return(fe);
-}
-
-SgStatement *CreateRemBuf(SgExpression *header,SgExpression *buffer,int st_sign,int iplp,int iaxis,int icoeff,int iconst)
-{
-//generating Subroutine Call:
-// crtrbl(ArrayHeader[],BufferHeader[], Base,StaticSign,LoopRef, AxisArray[],CoeffArray[],ConstArray[], )
-//creating buffer for remote data
-// SgSymbol *sbase;
-  SgCallStmt *call = new SgCallStmt(*fdvm[CRTRB]);
-  fmask[CRTRB] = 2;
-  call->addArg(*header);
-  call->addArg(*buffer);
-  //sbase = (header->symbol()->type()->baseType()->variant() == T_STRING) ? Chmem : Imem;  /* podd 14.01.12 */
-  //fe->addArg(* new SgArrayRefExp(*sbase)); //Base
-  call->addArg(* new SgArrayRefExp(*Imem)); //Base
-  call->addArg(*ConstRef(st_sign));
-  call->addArg(*DVM000(iplp));
-  call->addArg(*DVM000(iaxis));
-  call->addArg(*DVM000(icoeff));
-  call->addArg(*DVM000(iconst));
-
-  return(call);
-}
-/*
-SgExpression *CreateRemBuf(SgExpression *header,SgExpression *buffer,int st_sign,int icoeff,int iconst,int iinit,int ilast,int istep)
-{
-//generating Function Call:
-// crtrbl(ArrayHeader[],BufferHeader[], Base,StaticSign,CoeffArray[],ConstArray[],
-//       InitIndexArray[],LastIndexArray[],StepArray[])
-//creating buffer for remote data
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CRTRB]);
- fmask[CRTRB] = 1;
-  fe->addArg(*header);
-  fe->addArg(*buffer);  
-  fe->addArg(* new SgArrayRefExp(*Imem)); //Base
-  fe->addArg(*ConstRef(st_sign));
-  fe->addArg(*DVM000(icoeff));
-  fe->addArg(*DVM000(iconst));
-  fe->addArg(*DVM000(iinit));
-  fe->addArg(*DVM000(ilast));
-  fe->addArg(*DVM000(istep));
-  return(fe);
-}
-*/
-
-SgStatement *CreateRemBufP(SgExpression *header,SgExpression *buffer,int st_sign,SgExpression *psref,int icoord)
-{
-//generating Subroutine Call:
-// crtrbp(ArrayHeader[],BufferHeader[], Base,StaticSign,LoopRef, AxisArray[],CoeffArray[],
-//       ConstArray[], )
-//creating buffer for remote data
-  SgCallStmt *call = new SgCallStmt(*fdvm[CRTRBP]);
-// SgSymbol *sbase;
-  fmask[CRTRBP] = 2;
-  call->addArg(*header);
-  call->addArg(*buffer);
-  //sbase = (header->symbol()->type()->baseType()->variant() == T_STRING) ? Chmem : Imem; /* podd 14.01.12 */ 
-  //fe->addArg(* new SgArrayRefExp(*sbase)); //Base
-  call->addArg(* new SgArrayRefExp(*Imem));  //Base
-  call->addArg(*ConstRef(st_sign));
-  call->addArg(*psref);
-  call->addArg(*DVM000(icoord));
-  return(call);
-}
-
-SgStatement *LoadRemBuf(SgExpression *buf)
-{
-//generating Subroutine Call:
-//                           loadrb(BufferHeader,RenewSign)
-//loading buffer
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOADRB]);
-  fmask[LOADRB] = 2;
-  
-  call->addArg(*buf);
-  call->addArg(*ConstRef(0));
-  return(call);
-}
-
-SgStatement *WaitRemBuf(SgExpression *buf)
-{
-//generating Subroutine Call:
-//                           waitrb(BufferHeader)
-//waiting completion of loading buffer
-  SgCallStmt *call = new SgCallStmt(*fdvm[WAITRB]);
-  fmask[WAITRB] = 2;
-  
-  call->addArg(*buf);
-  return(call);
-}
-/*
-SgExpression *DelRemBuf(SgExpression *buf)
-{
-//generating Function Call:
-//                           delrb(BufferHeader)
-//deleting buffer
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DELRB]);
- fmask[DELRB] = 1;
-  
-  fe->addArg(*buf);
-  return(fe);
-}
-*/
-
-
-/**************************************************************\
-*  Inquiry about the kind of distributed array element access  *
-*                ( for HPF program)                            *                   
-\**************************************************************/
-SgExpression *RemoteAccessKind(SgExpression *header,SgExpression *buffer,int st_sign,int iplp,int iaxis,int icoeff,int iconst,int ilsh,int ihsh)
-{
-//generating Function Call:
-// rmkind(ArrayHeader[],BufferHeader[], Base,StaticSign,LoopRef, AxisArray[],CoeffArray[],
-//        ConstArray[], LowShadowArray[],HiShadowArray[])
-//determinating data access kind: 1 - local, 2 - shadow, 3 - remote
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[RMKIND]);
- fmask[RMKIND] = 1;
-  fe->addArg(*header);
-  fe->addArg(*buffer);  
-  fe->addArg(* new SgArrayRefExp(*Imem)); //Base
-  fe->addArg(*ConstRef(st_sign));
-  fe->addArg(*DVM000(iplp));
-  fe->addArg(*DVM000(iaxis));
-  fe->addArg(*DVM000(icoeff));
-  fe->addArg(*DVM000(iconst));
-  fe->addArg(*DVM000(ilsh));
-  fe->addArg(*DVM000(ihsh));
-
-  return(fe);
-}
-/**************************************************************\
-*                      Indirect access                         *
-\**************************************************************/
-SgExpression *LoadIG(SgSymbol *group)
-{
-//generating Function Call:
-//                           loadig(GroupRef)
-//loading buffers of group 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[LOADIG]);
- fmask[LOADIG] = 1;
-  
-  fe->addArg(*GROUP_REF(group,1));
-  return(fe);
-}
-
-SgExpression *WaitIG(SgSymbol *group)
-{
-//generating Function Call:
-//                           waitig(GroupRef)
-//waiting of completion of loading buffers of the group
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[WAITIG]);
- fmask[WAITIG] = 1;
-  
-  fe->addArg(*GROUP_REF(group,1));
-  return(fe);
-}
-
-SgExpression *CreateIG(int st_sign,int del_sign)
-{
-//generating Function Call:
-//                           crtig(StaticSign,DelBufSign)
-//creating group of buffers 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CRTIG]);
- fmask[CRTIG] = 1;
-  
-  fe->addArg(*ConstRef(st_sign));
-  fe->addArg(*ConstRef(del_sign));
-  return(fe);
-}
-
-SgExpression *InsertIndBuf(SgSymbol *group, SgExpression *buf)
-{
-//generating Function Call:
-//                           insib(GroupRef,BufferHeader[])
-//inserting buffer in the group
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[INSIB]);
- fmask[INSIB] = 1;
-  
-  fe->addArg(*GROUP_REF(group,1));
-  fe->addArg(*buf);
-  return(fe);
-}
-
-SgExpression *CreateIndBuf(SgExpression *header,SgExpression *buffer,int st_sign,SgExpression *mehead, int iconst)
-{
-//generating Function Call:
-// crtib(ArrayHeader[],BufferHeader[], Base,StaticSign,MEHeader[],ConstArray[])
-
-//creating buffer for indirect access data
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CRTIB]);
- fmask[CRTIB] = 1;
-  fe->addArg(*header);
-  fe->addArg(*buffer);  
-  fe->addArg(* new SgArrayRefExp(*Imem)); //Base
-  fe->addArg(*ConstRef(st_sign));
-  fe->addArg(*mehead);
-  fe->addArg(*DVM000(iconst));
-  return(fe);
-}
-
-SgExpression *LoadIndBuf(SgExpression *buf)
-{
-//generating Function Call:
-//                           loadib(BufferHeader)
-//loading buffer
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[LOADIB]);
- fmask[LOADIB] = 1;
-  
-  fe->addArg(*buf);
-  return(fe);
-}
-
-SgExpression *WaitIndBuf(SgExpression *buf)
-{
-//generating Function Call:
-//                           waitib(BufferHeader)
-//waiting completion of loading buffer
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[WAITIB]);
- fmask[WAITIB] = 1;
-  
-  fe->addArg(*buf);
-  return(fe);
-}
-/*
-SgExpression *DelIndBuf(SgExpression *buf)
-{
-//generating Function Call:
-//                           delib(BufferHeader)
-//deleting buffer
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DELIB]);
- fmask[DELIB] = 1;
-  
-  fe->addArg(*buf);
-  return(fe);
-}
-*/
-
-/**************************************************************\
-*                      Getting array into consistent state     *
-\**************************************************************/
-
-SgExpression *StartConsistent(SgExpression *header,int iplp,int iaxis,int icoeff,int iconst,int re_sign)
-{
-//generating Function Call:
-// strtac(ArrayHeader[],LoopRef, AxisArray[],CoeffArray[], ConstArray[], RenewSign )
-//      
-//start to get array into consistent state
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[STRTAC]);
- fmask[STRTAC] = 1;
-  fe->addArg(*header); 
-  fe->addArg(*DVM000(iplp));
-  fe->addArg(*DVM000(iaxis));
-  fe->addArg(*DVM000(icoeff));
-  fe->addArg(*DVM000(iconst));
-  fe->addArg(*ConstRef(re_sign));
-
-  return(fe);
-}
-
-SgExpression *WaitConsistent(SgExpression *header)
-{
-//generating Function Call:
-// waitac(ArrayHeader)
-//      
-//wait to get array into consistent state
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[WAITAC]);
- fmask[WAITAC] = 1;
-  fe->addArg(*header); 
-
-  return(fe);
-}
-
-SgExpression *FreeConsistent(SgExpression *header)
-{
-//generating Function Call:
-// rstrda(ArrayHeader)
-//      
-//free memory of consistent array 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[RSTRDA]);
- fmask[RSTRDA] = 1;
-  fe->addArg(*header); 
-
-  return(fe);
-}
-
-SgExpression *CreateConsGroup(int st_sign,int del_sign)
-{
-//generating Function Call:
-//                         crtcg(StaticSign,DelArraySign)
-//creating group of consistent arrays 
-  SgFunctionCallExp *fe  = new SgFunctionCallExp(*fdvm[CRTCG]);
-  fmask[CRTCG] = 1;
-  
-  fe->addArg(*ConstRef(st_sign));
-  fe->addArg(*ConstRef(del_sign));
-  return(fe);
-}
-
-
-SgExpression *InsertConsGroup(SgExpression *gref,SgExpression *header,int iplp,int iaxis,int icoeff,int iconst,int re_sign)
-{
-//generating Function Call:
-// inscg(GroupRef,ArrayHeader[],LoopRef, AxisArray[],CoeffArray[], ConstArray[],RenewSign )
-//      
-//insert  array into consistent group
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[INSCG]);
- fmask[INSCG] = 1;
-  fe->addArg(*gref);
-  fe->addArg(*header); 
-  fe->addArg(*DVM000(iplp));
-  fe->addArg(*DVM000(iaxis));
-  fe->addArg(*DVM000(icoeff));
-  fe->addArg(*DVM000(iconst));
-  fe->addArg(*ConstRef(re_sign));
-  return(fe);
-}
-
-SgExpression *ExstractConsGroup(SgExpression *gref, int del_sign)
-{
-//generating Function Call:
-//                         rstcg(GroupRef,DelArraySign)
-//extracting all  consistent arrays from group 
-  SgFunctionCallExp *fe  = new SgFunctionCallExp(*fdvm[RSTCG]);
-  fmask[RSTCG] = 1;
-  
-  fe->addArg(*gref);
-  fe->addArg(*ConstRef(del_sign));
-  return(fe);
-}
-
-SgExpression *StartConsGroup(SgExpression *gref)
-{
-//generating Function Call:
-//                           strtcg(GroupRef) 
-//starting of getting group of arrays into consistent state
-  SgFunctionCallExp *fe  = new SgFunctionCallExp(*fdvm[STRTCG]);
-  fmask[STRTCG] = 1;
-
-  fe->addArg(*gref);
-  return(fe);
-}
-
-SgExpression *WaitConsGroup(SgExpression *gref)
-{
-//generating Function Call:
-//                           waitcg(GroupRef) 
-//waiting completion of getting group of arrays into consistent state
-  SgFunctionCallExp *fe  = new SgFunctionCallExp(*fdvm[WAITCG]);
-  fmask[WAITCG] = 1;
-
-  fe->addArg(*gref);
-  return(fe);
-}
-
-/**************************************************************\
-*        Getting array into consistent state in Task_Region    *
-\**************************************************************/
-SgExpression *TaskConsistent(SgExpression *header,SgExpression *amvref, int iaxis, int re_sign)
-{
-//generating Function Call:
-// consda(ArrayHeader,AMViewRef,ArrayAxis,RenewSign)
-//      
-//start to get array into consistent state in Task_Region
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CONSDA]);
- fmask[CONSDA] = 1;
-  fe->addArg(*header); 
-  fe->addArg(*amvref); //copy?? 
-  fe->addArg(*DVM000(iaxis));
-  fe->addArg(*ConstRef(re_sign));
-  return(fe);
-}
-
-SgExpression *IncludeConsistentTask(SgExpression *gref,SgExpression *header,SgExpression *amvref, int iaxis,int re_sign)
-{
-//generating Function Call:
-// inclcg(GroupRef,ArrayHeader,AMViewRef,ArrayAxis)
-//      
-//include array into consistent group in Task_Region
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[INCLCG]);
- fmask[INCLCG] = 1;
-  fe->addArg(*gref); 
-  fe->addArg(*header); 
-  fe->addArg(*amvref); //copy?? 
-  fe->addArg(*DVM000(iaxis));
-  fe->addArg(*ConstRef(re_sign));
-  return(fe);
-}
-
-/**************************************************************\
-*                      Special ACROSS                         *
-\**************************************************************/
-
-SgExpression *DVM_Receive(int iplp,SgExpression *mem,int t,int is)
-{
-//generating Function Call:
-//                           dvm_rm(LoopRef,MemAddr,ElmType,ElmNumber)
-
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMRM]);
- fmask[DVMRM] = 1;
-  fe->addArg(*DVM000(iplp));
-  fe->addArg(*mem);
-  fe->addArg(*ConstRef(t));
-  fe->addArg(*DVM000(is));
-  return(fe);
-}
-
-SgExpression *DVM_Send(int iplp,SgExpression *mem,int t,int is)
-{
-//generating Function Call:
-//                           dvm_sm(LoopRef,MemAddr,ElmType,ElmNumber)
-
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMSM]);
- fmask[DVMSM] = 1;
-  fe->addArg(*DVM000(iplp));
-  fe->addArg(*mem);
-  fe->addArg(*ConstRef(t));
-  fe->addArg(*DVM000(is));
-  return(fe);
-}
-
-
-/**************************************************************\
-*                      Miscellaneous functions                 *
-\**************************************************************/
-SgExpression *GetRank(int iref)
-{
-//generating Function Call:
-//                           GetRnk(ObjectRef)
-// requesting rank of object
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GETRNK]);
- fmask[GETRNK] = 1;
-  fe->addArg(*DVM000(iref));
-  return(fe);
-}
-
-SgExpression *GetSize(SgExpression *ref,int axis)
-{
-//generating Function Call:
-//                           GetSiz(ObjectRef, Axis)
- 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GETSIZ]);
- fmask[GETSIZ] = 1;
-  fe->addArg(*ref);
-  fe->addArg(* ConstRef (axis));
-  return(fe);
-}
-
-SgExpression * TestIOProcessor ()
-{ 
-// creates function call:      TstIOP()
-    fmask[TSTIOP] = 1;
-    return( new SgFunctionCallExp(*fdvm[TSTIOP]));
-}
-
-SgExpression *DeleteObject(SgExpression *objref) 
-{
-//generating Function Call:
-//                        delobj(ObjectRef)
- 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DELOBJ]);
- fmask[DELOBJ] = 1;
-
-  fe->addArg(objref->copy());
- 
-  return(fe);
-}   
-
-SgExpression *TestElement(SgExpression *head, int ind) 
-{
-//generating Function Call:
-//                        tstelm(ArrayHeader, IndexArray);
- 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[TSTELM]);
- fmask[TSTELM] = 1;
-
-  fe->addArg(head->copy());
-  fe->addArg(*DVM000(ind));
-  return(fe);
-}    
-
-SgStatement *SendMemory(int icount, int inda, int indl) 
-{
-//generating Subroutine Call:
-//                     call   srmem (MemoryCount, StartAddrArray, LengthArray);
- send =1;
-
- SgCallStmt *call = new SgCallStmt(*fdvm[SRMEM]);
- fmask[SRMEM] = 2;
-
-  call->addArg(*ConstRef_F95(icount)); //addArg(*DVM000(icount));
-  call->addArg(*DVM000(inda));
-  call->addArg(*DVM000(indl));
-  return(call);
-}      
-
-SgExpression *GetAddres(SgSymbol * var)
-{
-//generating Function Call:
-//                           GetAdr(Var)
-
- SgFunctionCallExp *fe;
- int ind;
- // ind = GETADR;
-  ind = NameIndex(Base_Type(var->type()));
-  fe = new SgFunctionCallExp(*fdvm[ind]);
-  fmask[ind] = 1;
-  fe->addArg(* new SgVarRefExp (* var));
-  return(fe);
-}
-
-SgExpression *GetAddresMem(SgExpression * em)
-{
-//generating Function Call:
-//                           GetAdr(Var)
- 
- SgFunctionCallExp *fe;
- int ind;
- //  ind = GETADR;
-  ind = NameIndex(Base_Type(em->type())); 
-  fe = new SgFunctionCallExp(*fdvm[ind]);
-  fmask[ind] = 1;
-  fe->addArg(em->copy());
-  return(fe);
-}
-
-SgStatement *Addres(SgExpression * em)
-{
-//generating assign statement:
-//                   dvm000(ndvm)= GetAdr(Var)
- 
- SgFunctionCallExp *fe;
- int ind;
-  ind = NameIndex(Base_Type(em->type())); 
-  fe = new SgFunctionCallExp(*fdvm[ind]);
-  fmask[ind] = 1;
-  fe->addArg(em->copy());
-  ndvm++;
-  FREE_DVM(1);
-  return(new SgAssignStmt(*DVM000(ndvm),*fe));
-}
-
-SgExpression *GetAddresDVM(SgExpression * em)
-{
-//generating Function Call:
-//                           GetAdr(Var)
- 
- SgFunctionCallExp *fe;
- int ind;
- //  ind = GETADR;
-  ind = NameIndex(SgTypeInt()); //argument type of DVM-Lib functions (headers and others)
-  fe = new SgFunctionCallExp(*fdvm[ind]);
-  fmask[ind] = 1;
-  fe->addArg(em->copy());
-  return(fe);
-}
-
-
-SgStatement *CloseFiles() 
-{
-//generating Subroutine Call:  clfdvm()                          
-
- SgCallStmt *call = new SgCallStmt(*fdvm[CLFDVM]);
- fmask[CLFDVM] = 2;     
-  return(call);
-}
-
-SgExpression *AddHeader(SgExpression *head_new,SgExpression *head )
-{
-//generating Function Call:  addhdr(NewHeadRef, Headref) 
-
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[ADDHDR]);
- fmask[ADDHDR] =1;
- fe->addArg(*head_new);
- fe->addArg(*head);
- return(fe);
-}   
-/*
-SgExpression *TypeControl(int n, int iadr)
-{
-//generating Function Call:  tpcntr(Numb,FirstAddr[],NextAddr[],Len[],Type[]) 
-
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[TPCNTR]);
- fmask[TPCNTR] =1;
- fe->addArg(*ConstRef(n));
- fe->addArg(*DVM000(iadr));
- fe->addArg(*DVM000(iadr+n));
- fe->addArg(*DVM000(iadr+2*n));
- fe->addArg(*DVM000(iadr+3*n));
- return(fe);
-}   
-*/
-
-SgExpression *Barrier()
-{
-//generating Function Call:
-//                           bsynch()
-//stoping task 
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[BARRIER]);
- fmask[BARRIER] = 1;  
- return(fe);
-}
-/**************************************************************\
-*                    Debugger functions                        *
-\**************************************************************/
-SgStatement *D_RegistrateArray(int rank, int type, SgExpression *headref,  SgExpression *size_array,SgExpression *arref) 
-{
-//generating Subroutine Call: drarr(Rank,Type,Addr,Size_array,Operand)                       
-  SgCallStmt *call = new SgCallStmt(*fdvm[DRARR]);
-  fmask[DRARR] = 2;
-  call->addArg(*ConstRef(rank));
-  call->addArg(*ConstRef(type));
-  call->addArg(*headref);
-  call->addArg(*size_array);
-  call->addArg(*new SgValueExp(UnparseExpr(arref)));
-  return(call);
-}   
-
-SgStatement *D_LoadVar(SgExpression *vref, int type, SgExpression *headref, SgExpression *opref) 
-{
-//generating Subroutine Call: dldv(TypePtr,Addr,Handle,Operand)                       
- 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DLOADV]);
-  fmask[DLOADV] = 2;
-  call->addArg(*ConstRef(type));
-  call->addArg(*GetAddresMem(vref));
-  call->addArg(*headref);
-  call->addArg(*new SgValueExp(UnparseExpr(opref)));
-  return(call);
-/*
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DLOADV]);
- fmask[DLOADV] = 1;
-  fe->addArg(*ConstRef(type));
-  fe->addArg(*GetAddresMem(vref));
-  fe->addArg(*headref);
-  fe->addArg(*new SgValueExp(UnparseExpr(opref)));
-  ndvm++;
-  FREE_DVM(1);
-  return(new SgAssignStmt(*DVM000(ndvm),*fe));
-*/
-}   
-
-SgStatement *D_LoadVar2(SgExpression *vref, int type, SgExpression *headref, SgExpression *opref) 
-{
-//generating Subroutine Call: dldv2(TypePtr,Addr,Handle,Operand)                       
-
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DLOAD2]);
- fmask[DLOAD2] = 1;
-  fe->addArg(*ConstRef(type));
-  fe->addArg(*GetAddresMem(vref));
-  fe->addArg(*headref);
-  fe->addArg(*new SgValueExp(UnparseExpr(opref)));
-  ndvm++;
-  FREE_DVM(1);
-  return(new SgAssignStmt(*DVM000(ndvm),*fe));
-}   
-
-SgStatement *D_StorVar() 
-{
-//generating Subroutine Call:  dstv()                          
-
- SgCallStmt *call = new SgCallStmt(*fdvm[DSTORV]);
- fmask[DSTORV] = 2;
-  return(call);
-/*
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DSTORV]);
- fmask[DSTORV] = 1;
-  ndvm++;
-  FREE_DVM(1);
-  return(new SgAssignStmt(*DVM000(ndvm),*fe));
-*/
-}
-
-SgStatement *D_PrStorVar(SgExpression *vref, int type, SgExpression *headref, SgExpression *opref) 
-{
-//generating Subroutine Call:  dprstv(TypePtr,Addr,Handle,Operand)                          
-  SgCallStmt *call = new SgCallStmt(*fdvm[DPRSTV]);
-  fmask[DPRSTV] = 2;
-  call->addArg(*ConstRef(type));
-  call->addArg(*GetAddresMem(vref));
-  call->addArg(*headref);
-  call->addArg(*new SgValueExp(UnparseExpr(opref)));
-  return(call);
-
-/*
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DPRSTV]);
- fmask[DPRSTV] = 1;
-  fe->addArg(*ConstRef(type));
-  fe->addArg(*GetAddresMem(vref));
-  fe->addArg(*headref);
-  fe->addArg(*new SgValueExp(UnparseExpr(opref)));
-  ndvm++;
-  FREE_DVM(1);
-  return(new SgAssignStmt(*DVM000(ndvm),*fe));
-*/
-}
-
-SgStatement *D_InOutVar(SgExpression *vref, int type, SgExpression *headref) 
-{
-//generating Subroutine Call: dinout(TypePtr,Addr,Handle)                       
-/* 
- SgCallStmt *call = new SgCallStmt(*fdvm[DINOUT]);
-         //fmask[DINOUT] = 1;
-  call->addArg(*ConstRef(type));
-  call->addArg(*GetAddresMem(vref));
-  call->addArg(*headref);
-  return(call);
-*/
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DINOUT]);
- fmask[DINOUT] = 1;
-  fe->addArg(*ConstRef(type));
-  fe->addArg(*GetAddresMem(vref));
-  fe->addArg(*headref); 
-  ndvm++;
-  FREE_DVM(1);
-  return(new SgAssignStmt(*DVM000(ndvm),*fe));
-}   
-
-SgStatement *D_Fname()
-{
-//generating Subroutine Call:  fname(FileName) 
-/*
-  SgCallStmt *call = new SgCallStmt(*fdvm[FNAME]);
-  call->addArg(*new SgValueExp(fin_name));
-  return(call);
-*/
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[FNAME]);
- fmask[FNAME] =1;
-  fe->addArg(*new SgValueExp(fin_name));
-  ndvm++;
-  FREE_DVM(1);
-  return(new SgAssignStmt(*DVM000(ndvm),*fe));
-}   
-
-SgStatement *D_Lnumb(int num_line)
-{
-//generating Subroutine Call:  lnumb(LineNumber) 
-/*
-  SgCallStmt *call = new SgCallStmt(*fdvm[LNUMB]);
-  call->addArg(*new SgValueExp(num_line));
-  return(call);
-*/
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[LNUMB]);
- fmask[LNUMB] =1;
- fe->addArg(*DVM000(num_line));
-  ndvm++;
-  FREE_DVM(1);
- return(new SgAssignStmt(*DVM000(ndvm),*fe));
-}   
-
-SgStatement *D_FileLine(int num_line, SgStatement *stmt)
-{
-//generating Subroutine Call:  dvmlf(LineNumber,FileName) 
-
-  //char *fname;
- filename_list *fn;
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMLF]);
- fmask[DVMLF] =1;
- fe->addArg(*DVM000(num_line));
- fn = AddToFileNameList(stmt->fileName());
- //fname= new char[80];
- //sprintf(fname,"%s%s",stmt->fileName()," ");
- //fe->addArg(* new SgValueExp(fname));
-  fe->addArg(* new SgVarRefExp(fn->fns));
-  ndvm++;
-  FREE_DVM(1);
- return(new SgAssignStmt(*DVM000(ndvm),*fe));
-}   
-
-SgStatement *D_DummyFileLine(int num_line, const char *fname)
-{
-//generating Subroutine Call:  dvmlf(LineNumber,FileName) 
-
- filename_list *fn;
- SgCallStmt *call = new SgCallStmt(*fdvm[DVMLF]);
- fmask[DVMLF] =2;
- call->addArg(*DVM000(num_line));
- fn = AddToFileNameList(fname);
- call->addArg(* new SgVarRefExp(fn->fns));
- ndvm++;
- FREE_DVM(1);
- return(call);
-}   
-
-SgStatement *D_FileLineConst(int line, SgStatement *stmt)
-{
-//generating Subroutine Call:  call dvmlf(LineNumber,FileName) 
-
- filename_list *fn;
- SgCallStmt *call = new SgCallStmt(*fdvm[DVMLF]);
- fmask[DVMLF] =2;
- call->addArg(*ConstRef_F95(line));
- fn = AddToFileNameList(baseFileName(stmt->fileName()));
- call->addArg(* new SgVarRefExp(fn->fns));
- return(call);
-}   
-
-
-SgStatement *D_Begpl(int num_loop,int rank,int iinit)
-{
-//generating Subroutine Call:  dbegpl(Rank,No,InitArray,LastArray,StepArray) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DBEGPL]);
-  fmask[DBEGPL] = 2;
-  call->addArg(*ConstRef(rank));
-  call->addArg(*ConstRef_F95(num_loop));//addArg(*DVM000(num_loop));
-  call->addArg(*DVM000(iinit));
-  call->addArg(*DVM000(iinit+rank));
-  call->addArg(*DVM000(iinit+2*rank));
-  return(call);
-}   
-
-SgStatement *D_Begsl(int num_loop)
-{
-//generating Subroutine Call:  dbegsl(No) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DBEGSL]);
-  fmask[DBEGSL] = 2;
-  call->addArg(*ConstRef_F95(num_loop)); //addArg(*DVM000(num_loop));
-  return(call);
-}   
-
-SgStatement *D_Begtr(int num_treg)
-{
-//generating Subroutine Call:  dbegtr(No) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DBEGTR]);
-  fmask[DBEGTR] = 2;
-  call->addArg(*DVM000(num_treg));
-  return(call);
-}   
-
-SgExpression *doPLmb(int iloopref, int ino)
-{ 
-//generating Function Call:
-//                           doplmb(LoopRef,No)
- 
- SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[DOPLMB]);
-  fmask[DOPLMB] = 1;
-  fe->addArg(*DVM000(iloopref));
-  fe->addArg(*DVM000(ino));
-  return(fe);
-}
-
-SgExpression *doPLmbSEQ(int ino, int rank, int iout)
-{
-//generating Function Call:
-//                           doplmbseq(No, Rank, OutInit[], OutLast[], OutStep[])
- 
- SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[DOPLSEQ]);
-  fmask[DOPLSEQ] = 1;
-  fe->addArg(*DVM000(ino));
-  fe->addArg(* ConstRef(rank));
-  fe->addArg(*DVM000(iout));
-  fe->addArg(*DVM000(iout+rank));
-  fe->addArg(*DVM000(iout+2*rank));
-  return(fe);
-}
-
-
-SgExpression *doSL(int num_loop,int iout)
-{ 
-//generating Function Call:
-//                           dosl(No, OutInit, OutLast, OutStep)
- 
- SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[DOSL]);
-  fmask[DOSL] = 1;
-  fe->addArg(*ConstRef_F95(num_loop)); //addArg(*DVM000(num_loop));
-  fe->addArg(*DVM000(iout));
-  fe->addArg(*DVM000(iout+1));
-  fe->addArg(*DVM000(iout+2));
-  return(fe);
-}
-
-
-SgStatement *D_Skpbl()
-{
-//generating Subroutine Call:  dskpbl() 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DSKPBL]);
-  fmask[DSKPBL] = 2;
-  return(call);
-}   
-
-SgStatement *D_Endl(int num_loop, int begin_line )
-{
-//generating Subroutine Call:  dendl(No,Line) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DENDL]);
-  fmask[DENDL] = 2;
-  call->addArg(*ConstRef_F95(num_loop));   //addArg(*DVM000(num_loop));
-  call->addArg(*ConstRef_F95(begin_line)); //addArg(*DVM000(begin_line));
-  return(call);
-}   
-
-SgStatement *D_Iter(SgSymbol *do_var, int type)
-{
-//generating Subroutine Call:  diter(Index,TypeIndex) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DITER]);
-  fmask[DITER] = 2;
-  call->addArg(*GetAddres(do_var));
-  call->addArg(*ConstRef(type));
-  return(call);
-}   
-
-SgStatement *D_Iter_I(int ind, int indtp)
-{
-//generating Subroutine Call:  diter(IndexArray,TypeIndexArray) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DITER]);
-  fmask[DITER] = 2;
-  call->addArg(*DVM000(ind));
-  call->addArg(*DVM000(indtp));
-  return(call);
-}   
-
-SgStatement *D_Iter_ON(int ind, int type)
-{
-//generating Subroutine Call:  diter(Index,TypeIndex) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DITER]);
-  fmask[DITER] = 2;
-  call->addArg(*GetAddresMem(DVM000(ind)));
-  call->addArg(*ConstRef(type));
-  return(call);
-}   
-
-SgStatement *D_RmBuf(SgExpression *source_headref, SgExpression *buf_headref, int rank, int index) 
-{
-//generating Subroutine Call:  drmbuf(Src,RmtBuff,Rank,Index)                          
- 
- SgCallStmt *call = new SgCallStmt(*fdvm[DRMBUF]);
- fmask[DRMBUF] = 2;
-  call->addArg(*source_headref );
-  call->addArg(*buf_headref);
-  call->addArg(* ConstRef(rank));
-  call->addArg(* DVM000(index));
-  return(call);
-}
-
-SgStatement *D_Read(SgExpression *adr) 
-{
-//generating Subroutine Call:
-//                        dread(Addr);
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DREAD]);
-  fmask[DREAD] = 2;
-  call->addArg(*adr);
-  return(call);
-}      
-
-SgStatement *D_ReadA(SgExpression *adr,int indel, int icount) 
-{
-//generating Subroutine Call:
-//                        dreada(StartArrayAddr, ElemLength, ArrayLength);
-  SgCallStmt *call = new SgCallStmt(*fdvm[DREADA]);
-  fmask[DREADA] = 2;
-  call->addArg(*adr);
-  call->addArg(*DVM000(indel));
-  call->addArg(*DVM000(icount));
-  return(call);
-}    
-
-SgExpression * D_CreateDebRedGroup()
-{
-//generating function call:
-//                             dcrtrg()
-  
-  //int ig;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DCRRG]);
-  fmask[DCRRG] = 1;
-  return(fe);
-}
-
-SgStatement *D_InsRedVar(SgExpression *dgref,int num_red, SgExpression *red_array, int ntype, int length, SgExpression *loc_array, int loc_length, int locindtype)
-{
-//generating subroutine call:
-//                 dinsrd(DebRedGroupref, RedFuncNumb, RedArray, RedArrayType, RedArrayLength, LocArray, LocElmLength, LocIndType)
-  SgCallStmt *call = new SgCallStmt(*fdvm[DINSRD]);
-  fmask[DINSRD] = 2;
- 
-  call->addArg(dgref->copy());
-  call->addArg(*ConstRef(num_red));
-  call->addArg(*GetAddresMem(red_array));
-  call->addArg(*ConstRef(ntype));
-  call->addArg(*DVM000(length));
-  call->addArg(loc_array->copy());
-  call->addArg(*DVM000(loc_length));
-  call->addArg(*ConstRef(locindtype));
-  return(call);
-}
-
-SgExpression *D_SaveRG(SgExpression *dgref)
-{
-//creating function call:
-//                        dsavrg(DebRedGroupRef)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[DSAVRG]);
-  fmask[DSAVRG] = 1;
-  fe->addArg(dgref->copy());
-  return(fe);
-}
-
-SgStatement *D_CalcRG(SgExpression *dgref)
-{
-//creating subroutine call:
-//                        dclcrg(DebRedGroupRef)
-  SgCallStmt *call = new SgCallStmt(*fdvm[DCLCRG]);
-  fmask[DCLCRG] = 2;
-  call->addArg(dgref->copy());
-  return(call);
-}
-
-SgStatement *D_DelRG(SgExpression *dgref)
-{
-//creating subroutine call:
-//                        ddelrg(DebRedGroupRef)
-  SgCallStmt *call = new SgCallStmt(*fdvm[DDLRG]);
-  fmask[DDLRG] = 2;
-  call->addArg(dgref->copy());
-  return(call);
-}
-
-SgExpression *SummaOfDistrArray(SgExpression *headref, SgExpression *sumvarref)
-{
-//creating function call:
-//                        dacsum(HeaderArrayRef,CheckSum)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[DACSUM]);
-  fmask[DACSUM] = 1;
-  fe->addArg(*headref);
-  fe->addArg(*sumvarref);
-  return(fe);
-}
-
-SgExpression *SummaOfArray(SgExpression *are, int rank, SgExpression *size, int ntype,SgExpression *sumvarref)
-{
-//creating function call:
-//                        arcsf(addrMem,Rank,SizeArray[],Type,CheckSum)
-  SgFunctionCallExp *fe;
-  fe = new SgFunctionCallExp(*fdvm[ARCSF]);
-  fmask[ARCSF] = 1;
-  fe->addArg(*GetAddresMem(are));
-  fe->addArg(*ConstRef(rank));
-  fe->addArg(*size);
-  fe->addArg(*ConstRef(ntype));
-  fe->addArg(*sumvarref);
-  return(fe);
-}
-  
-SgStatement *D_PutDebugVarAdr(SgSymbol *dbg_var, int flag)
-{
-//generating Subroutine Call:  dvtr(dbgvar,flag) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVTR]);
-  fmask[DVTR] = 2;
-  call->addArg(*new SgVarRefExp(*dbg_var));
-  call->addArg(*new SgValueExp(flag));
-  return(call);
-}   
-/**************************************************************\
-*              Performance Analyzer functins                   *
-\**************************************************************/
-SgStatement *St_Binter(int num_fragment, SgExpression *valvar)  //(int num_fragment, int valvar)
-{
-//generating Subroutine Call:  binter(nfrag, valvar) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[BINTER]);
-  fmask[BINTER] = 2;
-  call->addArg(*ConstRef_F95(num_fragment));                    //(*DVM000(num_fragment));
-  call->addArg(*valvar);                                       //(* DVM000(valvar));
-  return(call);
-}   
-
-SgStatement *St_Einter(int num_fragment,int begin_line)
-{
-//generating Subroutine Call:  einter(nfrag,nline) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[EINTER]);
-  fmask[EINTER] = 2;
-  call->addArg(*ConstRef_F95(num_fragment));                        //(*DVM000(num_fragment));
-  call->addArg(*ConstRef_F95(begin_line));                          // (*DVM000(begin_line));
-  return(call);
-}   
-
-SgStatement *St_Bsloop(int num_fragment)
-{
-//generating Subroutine Call:  bsloop(nfrag) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[BSLOOP]);
-  fmask[BSLOOP] = 2;
-  call->addArg(*ConstRef_F95(num_fragment)); //addArg(*DVM000(num_fragment));
-  return(call);
-}   
-
-
-SgStatement *St_Bploop(int num_fragment)
-{
-//generating Subroutine Call:  bploop(nfrag) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[BPLOOP]);
-  fmask[BPLOOP] = 2;
-  call->addArg(*ConstRef_F95(num_fragment)); //addArg(*DVM000(num_fragment));
-  return(call);
-}   
-
-SgStatement *St_Enloop(int num_fragment,int begin_line)
-{
-//generating Subroutine Call:  enloop(nfrag,nline) 
-  SgCallStmt *call = new SgCallStmt(*fdvm[ENLOOP]);
-  fmask[ENLOOP] = 2;
-  call->addArg(*ConstRef_F95(num_fragment));//addArg(*DVM000(num_fragment));
-  call->addArg(*ConstRef_F95(begin_line));  //addArg(*DVM000(begin_line));
-  return(call);
-} 
-
-SgStatement *St_Biof()
-{
-//generating Subroutine Call:  biof() 
-  SgCallStmt *call = new SgCallStmt(*fdvm[BIOF]);
-  fmask[BIOF] = 2;
-  return(call);
-} 
-
-SgStatement *St_Eiof()
-{
-//generating Subroutine Call:  eiof() 
-  SgCallStmt *call = new SgCallStmt(*fdvm[EIOF]);
-  fmask[EIOF] = 2;
-  return(call);
-}              
-
-
-
-/**************************************************************\
-*              FORTRAN 90 functins                             *
-\**************************************************************/
-
-SgExpression *SizeFunction(SgSymbol *ar, int i)
-{//SgSymbol *symb_SIZE;
- SgFunctionCallExp *fe;
- if(!HEADER(ar)) { 
-// generating function call: SIZE(ARRAY, DIM)
-   if(!f90[SIZE])     //(!SIZE_function)
-     f90[SIZE] = new SgFunctionSymb(FUNCTION_NAME, "size", *SgTypeInt(), *cur_func); 
-   fe = new SgFunctionCallExp(*f90[SIZE]);
-   fe -> addArg(*new SgArrayRefExp(*ar));//array
-   if(i != 0) 
-     fe -> addArg(*new SgValueExp(i));  // dimension number 
-   return(fe);
-  } else
-   return(GetSize(HeaderRefInd(ar,1),Rank(ar)-i+1));
-}
-
-SgExpression *SizeFunctionWithKind(SgSymbol *ar, int i, int kind)
-{//SgSymbol *symb_SIZE;
- SgFunctionCallExp *fe;
- if(!HEADER(ar)) { 
-// generating function call: SIZE(ARRAY, DIM)
-   if(!f90[SIZE])     //(!SIZE_function)
-     f90[SIZE] = new SgFunctionSymb(FUNCTION_NAME, "size", *SgTypeInt(), *cur_func); 
-   fe = new SgFunctionCallExp(*f90[SIZE]);
-   fe -> addArg(*new SgArrayRefExp(*ar));//array
-   if(i != 0) 
-     fe -> addArg(*new SgValueExp(i));  // dimension number 
-   if(kind != 0) 
-     fe -> addArg(*new SgExpression(KIND_OP,new SgValueExp(kind),NULL,NULL));  // kind of type for result 
-
-   return(fe);
-  } else
-   return(GetSize(HeaderRefInd(ar,1),Rank(ar)-i+1));
-}
-
-SgExpression *LBOUNDFunction(SgSymbol *ar, int i)
-{//SgSymbol *symb_SIZE;
- SgFunctionCallExp *fe;  
-// generating function call: LBOUND(ARRAY, DIM)
-  if(!f90[LBOUND])   
-    f90[LBOUND] = new SgFunctionSymb(FUNCTION_NAME, "lbound", *SgTypeInt(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[LBOUND]);
-  fe -> addArg(*new SgArrayRefExp(*ar));//array
-  if(i != 0) 
-  fe -> addArg(*new SgValueExp(i));  // dimension number
- 
-   return(fe);
-}
-
-SgExpression *UBOUNDFunction(SgSymbol *ar, int i)
-{//SgSymbol *symb_SIZE;
- SgFunctionCallExp *fe;  
-// generating function call: UBOUND(ARRAY, DIM)
-  if(!f90[UBOUND])   
-    f90[UBOUND] = new SgFunctionSymb(FUNCTION_NAME, "ubound", *SgTypeInt(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[UBOUND]);
-  fe -> addArg(*new SgArrayRefExp(*ar));//array
-  if(i != 0) 
-  fe -> addArg(*new SgValueExp(i));  // dimension number
- 
-   return(fe);
-}
-
-SgExpression *LENFunction(SgSymbol *string)
-{
- SgFunctionCallExp *fe;  
-// generating function call: LEN(STRING)
-  if(!f90[LEN])   
-    f90[LEN] = new SgFunctionSymb(FUNCTION_NAME, "len", *SgTypeInt(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[LEN]);
-  fe -> addArg(*new SgVarRefExp(*string));//string
-
-   return(fe);
-}
-
-SgExpression *CHARFunction(int i)
-{
- SgFunctionCallExp *fe;  
-// generating function call: CHAR(I)
-  if(!f90[CHAR])   
-    f90[CHAR] = new SgFunctionSymb(FUNCTION_NAME, "char", *SgTypeChar(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[CHAR]);
-  fe -> addArg(*new SgValueExp(i));
-
-   return(fe);
-}
-
-SgExpression *TypeFunction(SgType *t, SgExpression *e, SgExpression *ke)
-{int i = -1;
- SgFunctionCallExp *fe;
- SgExpression *kke;
-  
-// generating function call: INT(e,KIND(ke)), REAL(e,KIND(ke)),...
-  switch(t->variant()) {
-      case T_INT:      if(!f90[F_INT])   
-                         f90[F_INT] = new SgFunctionSymb(FUNCTION_NAME, "int", *SgTypeInt(), *cur_func); 
-                       i = F_INT;
-                       break;
-
-      case T_BOOL:     if(!f90[F_LOGICAL])   
-                         f90[F_LOGICAL] = new SgFunctionSymb(FUNCTION_NAME, "logical", *SgTypeBool(), *cur_func); 
-                       i = F_LOGICAL;
-                       break;
-      case T_FLOAT:    
-      case T_DOUBLE:   if(!f90[F_REAL])   
-                         f90[F_REAL] = new SgFunctionSymb(FUNCTION_NAME, "real", *SgTypeFloat(), *cur_func); 
-                       i = F_REAL;
-                       break;
-
-      case T_COMPLEX:  
-      case T_DCOMPLEX: if(!f90[F_CMPLX])   
-                         f90[F_CMPLX] = new SgFunctionSymb(FUNCTION_NAME, "cmplx", *SgTypeComplex(current_file), *cur_func); 
-                       i = F_CMPLX;
-                       break;
-
-      case T_STRING:   
-      case T_CHAR:     if(!f90[F_CHAR])   
-                         f90[F_CHAR] = new SgFunctionSymb(FUNCTION_NAME, "char", *SgTypeChar(), *cur_func); 
-                       i = F_CHAR; 
-                       break;
-
-
-      default:         break;       
-  }
-  fe = new SgFunctionCallExp(*f90[i]);
-  fe -> addArg(e->copy());
-  if(ke)
-  {  kke = (i==F_CMPLX) ? new SgKeywordArgExp("kind",*ke) : ke;    
-     fe -> addArg(*kke);
-  }
-  return(fe);
-}
-
-SgExpression *KINDFunction(SgExpression *arg)
-{
- SgFunctionCallExp *fe;  
-// generating function call: KIND(arg)
-  if(!f90[KIND])   
-    f90[KIND] = new SgFunctionSymb(FUNCTION_NAME, "kind", *SgTypeInt(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[KIND]);
-  fe -> addArg(*arg);
-
-   return(fe);
-}
-
-SgExpression *MaxFunction(SgExpression *arg1,SgExpression *arg2)
-{
- SgFunctionCallExp *fe;  
-// generating function call: MAX(arg1,arg2)
-  if(!f90[MAX_])
-      //f90[MAX_] = new SgFunctionSymb(FUNCTION_NAME);   
-    f90[MAX_] = new SgFunctionSymb(FUNCTION_NAME, "max", *SgTypeInt(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[MAX_]);
-  fe -> addArg(*arg1);
-  fe -> addArg(*arg2);
-
-   return(fe);
-}
-
-SgExpression *MinFunction(SgExpression *arg1,SgExpression *arg2)
-{
- SgFunctionCallExp *fe;  
-// generating function call: MIN(arg1,arg2)
-  if(!f90[MIN_])
-       
-    f90[MIN_] = new SgFunctionSymb(FUNCTION_NAME, "min", *SgTypeInt(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[MIN_]);
-  fe -> addArg(*arg1);
-  fe -> addArg(*arg2);
-
-   return(fe);
-}
-
-SgExpression *IandFunction(SgExpression *arg1,SgExpression *arg2)
-{
- SgFunctionCallExp *fe;  
-// generating function call: IAND(arg1,arg2)
-  if(!f90[IAND_])
-       
-    f90[IAND_] = new SgFunctionSymb(FUNCTION_NAME, "iand", *SgTypeInt(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[IAND_]);
-  fe -> addArg(*arg1);
-  fe -> addArg(*arg2);
-
-   return(fe);
-}
-
-SgExpression *IorFunction(SgExpression *arg1,SgExpression *arg2)
-{
- SgFunctionCallExp *fe;  
-// generating function call: IOR(arg1,arg2)
-  if(!f90[IOR_])
-       
-    f90[IOR_] = new SgFunctionSymb(FUNCTION_NAME, "ior", *SgTypeInt(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[IOR_]);
-  fe -> addArg(*arg1);
-  fe -> addArg(*arg2);
-
-   return(fe);
-}
-
-SgExpression *AllocatedFunction(SgExpression *arg)
-{
- SgFunctionCallExp *fe;  
-// generating function call: ALLOCATED(arg)
-  if(!f90[ALLOCATED_])
-       
-    f90[ALLOCATED_] = new SgFunctionSymb(FUNCTION_NAME, "allocated", *SgTypeBool(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[ALLOCATED_]);
-  fe -> addArg(*arg);
-
-   return(fe);
-}
-
-SgExpression *AssociatedFunction(SgExpression *arg)
-{
- SgFunctionCallExp *fe;  
-// generating function call: ASSOCIATED(arg)
-  if(!f90[ASSOCIATED_])
-       
-    f90[ASSOCIATED_] = new SgFunctionSymb(FUNCTION_NAME, "associated", *SgTypeBool(), *cur_func); 
-  fe = new SgFunctionCallExp(*f90[ASSOCIATED_]);
-  fe -> addArg(*arg);
-
-   return(fe);
-}
-
-/**************************************************************\
-*                      C  functins                             *
-\**************************************************************/
-
-SgExpression *mallocFunction(SgExpression *arg, SgStatement *scope)
-{
- SgFunctionCallExp *fe;  
-// generating function call:
-//                             malloc(arg)
-        
-  SgSymbol *sf = new SgFunctionSymb(FUNCTION_NAME, "malloc", *C_PointerType(C_VoidType()), *scope); 
-  fe = new SgFunctionCallExp(*sf);
-  fe -> addArg(*arg);
-
-   return(fe);
-}
-
-SgExpression *freeFunction(SgExpression *arg, SgStatement *scope)
-{
- SgFunctionCallExp *fe;  
-// generating function call:
-//                             free(arg)
-        
-  SgSymbol *sf = new SgFunctionSymb(FUNCTION_NAME, "free", *C_VoidType(), *scope); 
-  fe = new SgFunctionCallExp(*sf);
-  fe -> addArg(*arg);
-
-   return(fe);
-}
-
-
-/**************************************************************\
-* ACC                                                          *
-*              Generating RTS2 Function Calls                  *
-\**************************************************************/
-
-SgStatement *RTL_GPU_Init()
-{// generating subroutine call: call dvmh_init(DvmType *flagsRef)
-//  flags: 1 - Fortran, 2 - without regions (-noH),
-//         4 - sequential program (-s), 8 - OpenMP will be used.
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_INIT]);
-  fmask[DVMH_INIT] = 2;
-  call -> addArg(*DVM000(ndvm));
-  if(!only_debug && (ACC_program || parloop_by_handler))
-    call -> addComment(OpenMpComment_InitFlags(ndvm));
- 
-  int flag = 1;
-  if(only_debug)
-             flag = flag + 4;
-  else if(!ACC_program)
-             flag = flag + 2;
-  doAssignStmtAfter(new SgValueExp(flag));        
-  FREE_DVM(1); 
-  doCallAfter(call);
-  return(call);
-}
-
-SgStatement *Exit_2(int code)
-{// generating subroutine call: call dvmh_exit(const DvmType *pExitCode)
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_EXIT]);
-  fmask[DVMH_EXIT] = 2;
-  call -> addArg(*ConstRef(code)); 
-  return(call);
-}
-
-SgStatement *RTL_GPU_Finish()
-{// generating subroutine call: call dvmh_finish()
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_FINISH]);
-  fmask[DVMH_FINISH] = 2;
-  return(call);
-}
-
-SgStatement *Init_Cuda()
-{// generating subroutine call: call init_cuda()
-  SgCallStmt *call = new SgCallStmt(*fdvm[INIT_CUDA]);
-  fmask[INIT_CUDA] = 2;
-  cur_st->insertStmtAfter(*call,*cur_st->controlParent());
-  cur_st = call;
-  return(call);
-}
-
-SgExpression *RegionCreate(int flag)
-{ // generating function call: region_create(FlagsRef)  or dvmh_region_create (when RTS2 is used)
-  int fNum = INTERFACE_RTS2 ? REG_CREATE_2 : REG_CREATE;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]); 
-  fmask[fNum] = 1;
-
-  if(flag==0) 
-    fe->addArg(*ConstRef(flag));
-  else
-  { SgSymbol *symb;
-    symb = region_const[flag]; 
-    fe->addArg(*new SgVarRefExp(*symb));    
-  }
-  return(fe);
-}
-
-SgStatement *StartRegion(int irgn)
-{ // generating Subroutine call:  region_inner_start(DvmhRegionRef)
-  SgCallStmt *call = new SgCallStmt(*fdvm[REG_START]);
-  fmask[REG_START] = 2;
-  call -> addArg(*DVM000(irgn));
-  return(call);
-}
-
-SgStatement *RegionForDevices(int irgn, SgExpression *devices)
-{ // generating Subroutine call:  region_execute_on_targets(DvmType *curRegion, DvmType *deviceTypes)  
-  // or  for RTS2
-  //                         dvmh_region_execute_on_targets(DvmType *curRegion, DvmType *deviceTypes)
-  int fNum = INTERFACE_RTS2 ? REG_DEVICES_2 : REG_DEVICES;
-  SgCallStmt *call = new SgCallStmt(*fdvm[fNum]);  
-  fmask[fNum] = 2;
- 
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*devices);
-  return(call);
-}
-
-/*
-SgExpression *RegistrateDataRegion()
-{ // generating function call: crt_data_region_gpu()
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DATAREG_GPU]);
-  fmask[DATAREG_GPU] = 1;
-  return(fe);
-}
-*/
-
-SgStatement *EndRegion(int irgn)
-{ // generating Subroutine call:  region_end(DvmhRegionRef) or dvmh_region_end (when RTS2 is used)
-  int fNum = INTERFACE_RTS2 ? REG_END_2 : REG_END;
-  SgCallStmt *call = new SgCallStmt(*fdvm[fNum]);  
-  fmask[fNum] = 2;
-
-  call -> addArg(*DVM000(irgn));
-  return(call);
-}
-
-/*
-SgStatement *UnRegistrateDataRegion(int n)
-{ // generating Subroutine call:  end_data_region_gpu(InOutDataRegionGpu)
-  SgCallStmt *call = new SgCallStmt(*fdvm[ENDDATAREG_GPU]);
-  fmask[ENDDATAREG_GPU] = 2;
-  call -> addArg(*GPU000(n));
-  return(call);
-}
-*/
-/*
-SgStatement *RegistrateDVMArray(SgSymbol *ar,int ireg,int inflag,int outflag)
-{  //generating Subroutine Call:  
-   //    crtda_gpu(InRegionGpu, InDvmArray[], OutDvmGpuArray[], InDeviceBaseAddr, InCopyinFlag, InCopyoutFlag) 
-  SgExpression *gpubase;
-  SgCallStmt *call = new SgCallStmt(*fdvm[CRTDA_GPU]);  
-  fmask[CRTDA_GPU] = 2;
-  
-  gpubase = new SgArrayRefExp(*baseGpuMemory(ar->type()->baseType()));
-  call -> addArg(*GPU000(ireg));
-  call -> addArg(*HeaderRef(ar));
-  call -> addArg(*GpuHeaderRef(ar));
-  call -> addArg(*gpubase);
-  call -> addArg(*ConstRef(inflag));
-  call -> addArg(*ConstRef(outflag));
-  
-  return(call);
-}
-*/
-
-SgStatement *RegisterScalar(int irgn,SgSymbol *c_intent,SgSymbol *s)
-{  //generating Subroutine Call:  
-   //    region_register_scalar(DvmhRegionRef, intentRef, addr, sizeRef, varType) 
-  int ntype;
-  SgCallStmt *call = new SgCallStmt(*fdvm[RGSTR_SCALAR]);  
-  fmask[RGSTR_SCALAR] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*new SgVarRefExp(c_intent));
-  call -> addArg(*new SgVarRefExp(s));
-  if(isSgArrayType(s->type()))
-     call -> addArg(*TypeFunction(SgTypeInt(),ArrayLength(s,cur_region->region_dir,0), new SgValueExp(DVMTypeLength())));
-  else
-     call -> addArg(*ConstRef_F95(TypeSize(s->type())));
-  ntype = VarType_RTS(s);  // as for reduction variables
-  ntype = ntype ? ntype : -1;  // unknown type
-  call -> addArg(*ConstRef_F95(ntype) );
-  return(call);
-}
-
-SgStatement *RegionRegisterScalar(int irgn,SgSymbol *c_intent,SgSymbol *s)
-{  //generating Subroutine Call:  
-   //    dvmh_region_register_scalar(const DvmType *pCurRegion, const DvmType *pIntent, const void *addr, const DvmType *pTypeSize,const DvmType *pVarNameStr) 
-  int ntype;
-  SgCallStmt *call = new SgCallStmt(*fdvm[RGSTR_SCALAR_2]);  
-  fmask[RGSTR_SCALAR_2] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*new SgVarRefExp(c_intent));
-  call -> addArg(*new SgVarRefExp(s));
-  call -> addArg(*TypeSize_RTS2(s->type()));
-  call -> addArg(*DvmhString(new SgValueExp(s->identifier())));
-  return(call);
-}
-
-SgStatement *RegisterSubArray(int irgn, SgSymbol *c_intent, SgSymbol *ar, int ilow, int ihigh)
-{  //generating Subroutine Call:  
-   //    region_register_subarray(DvmhRegionRef, intentRef, dvmDesc[], lowIndex[], highIndex[], elemType) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[RGSTR_SUBARRAY]);  
-  fmask[RGSTR_SUBARRAY] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*new SgVarRefExp(c_intent));
-  if(HEADER(ar)) //DVM-array
-    call -> addArg(*HeaderRef(ar));
-  else // replicated array
-    call -> addArg(*DVM000(*HEADER_OF_REPLICATED(ar)));
-  call -> addArg(*DVM000(ilow));
-  call -> addArg(*DVM000(ihigh));
-  call -> addArg(*ConstRef_F95( TestType_DVMH(ar->type())));
-  return(call);
-}
-
-SgStatement *RegionRegisterSubArray(int irgn, SgSymbol *c_intent, SgSymbol *ar, SgExpression *index_list)
-{  //generating Subroutine Call:  
-   //    dvmh_region_register_subarray(const DvmType *pCurRegion, const DvmType *pIntent, const DvmType dvmDesc[], const DvmType *pVarNameStr,
-   //                                  const DvmType *pRank, /* const DvmType *pIndexLow, const DvmType *pIndexHigh */... ) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[RGSTR_SUBARRAY_2]);  
-  fmask[RGSTR_SUBARRAY_2] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*new SgVarRefExp(c_intent));
-  if(HEADER(ar)) //DVM-array
-    call -> addArg(*HeaderRef(ar));
-  else // replicated array
-    call -> addArg(*DVM000(*HEADER_OF_REPLICATED(ar)));
-  call->addArg(*DvmhString(new SgValueExp(ar->identifier())));
-  call -> addArg(*ConstRef_F95(Rank(ar)));
-  call -> addArg(*index_list);
-  return(call);
-}
-
-SgStatement *RegisterArray(int irgn, SgSymbol *c_intent, SgSymbol *ar)
-{  //generating Subroutine Call:  
-   //    region_register_array(DvmhRegionRef, intentRef, dvmDesc[], elemType) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[RGSTR_ARRAY]);  
-  fmask[RGSTR_ARRAY] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*new SgVarRefExp(c_intent));
-  if(HEADER(ar)) //DVM-array or TEMPLATE
-    call -> addArg(*HeaderRef(ar));
-  else // replicated array
-    call -> addArg(*DVM000(*HEADER_OF_REPLICATED(ar)));
-  call -> addArg(*ConstRef_F95( TestType_DVMH(ar->type())));
-  return(call);
-}
-
-SgStatement *RegionRegisterArray(int irgn, SgSymbol *c_intent, SgSymbol *ar)
-{  //generating Subroutine Call:  
-   //    dvmh_region_register_array(const DvmType *pCurRegion, const DvmType *pIntent, const DvmType dvmDesc[], const DvmType *pVarNameStr) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[RGSTR_ARRAY_2]);  
-  fmask[RGSTR_ARRAY_2] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*new SgVarRefExp(c_intent));
-  if(HEADER(ar)) //DVM-array or TEMPLATE
-    call -> addArg(*HeaderRef(ar));
-  else // replicated array
-    call -> addArg(*DVM000(*HEADER_OF_REPLICATED(ar)));
-  call -> addArg(*DvmhString(new SgValueExp(ar->identifier())));
-  return(call);
-}
-
-SgStatement *Dvmh_Line(int line, SgStatement *stmt) 
-{ // generating Subroutine call:
-  //                   dvmh_line(const DvmType *pLineNumber, const DvmType *pFileNameStr)
-
- filename_list *fn;
- SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_LINE]);
- fmask[DVMH_LINE] =2;
- call->addArg(*ConstRef_F95(line));
- fn = AddToFileNameList(baseFileName(stmt->fileName()));
- call->addArg(*DvmhString(new SgVarRefExp(fn->fns)));
- return(call);
-}   
-
-
-SgExpression *DvmhString(SgExpression *s) 
-{  
-  // generating function call:  dvmh_string(const char s[])
-  
-  fmask[STRING] = 1;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[STRING]);
-  fe->addArg(*s);
-  return fe; 
-}
-
-
-SgExpression *DvmhStringVariable(SgExpression *v) 
-{  
-  // generates function call: dvmh_string_variable (char s[])
-  
-  fmask[STRING_VAR] = 1;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[STRING_VAR]);
-  fe->addArg(*v);
-  return fe;
-  
-}
-
-SgExpression *DvmhVariable(SgExpression *v) 
-{  
-  // generates function call:  dvmh_get_addr(void *pVariable)
-  
-  fmask[GET_ADDR] = 1;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GET_ADDR]);
-  fe->addArg(*v);
-  return fe;
-  
-}
-
-SgExpression *HasElement(SgExpression *ar_header, int n, SgExpression *index_list)
-{
-  // generates function call:  
-  //               dvmh_has_element(const DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pIndex */...);  
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMH_HAS_ELEMENT]);
-  fmask[DVMH_HAS_ELEMENT] = 1;
-  fe->addArg(*ar_header);
-  fe->addArg(*ConstRef_F95(n));
-  AddListToList(fe->lhs(),index_list);  
-  return fe;
-
-}
-
-SgExpression *CalculateLinear(SgExpression *ar_header, int n, SgExpression *index_list)
-{
-  // generates function call:  
-  //              dvmh_calc_linear(const DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pGlobalIndex */...);
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CALC_LINEAR]);
-  fmask[CALC_LINEAR] = 1;
-  fe->addArg(*ar_header);
-  fe->addArg(*ConstRef_F95(n));
-  AddListToList(fe->lhs(),index_list);  
-  return fe;
-
-}
-
-SgStatement *SaveCheckpointFilenames(SgExpression *cpName, std::vector<SgExpression *> filenames) {
-  fmask[CP_SAVE_FILENAMES] = 2;
-  SgCallStmt *callStmt = new SgCallStmt(*fdvm[CP_SAVE_FILENAMES]);
-  callStmt->addArg(*DvmhString(cpName));
-  
-  SgExpression *filenamesLength = DvmType_Ref(new SgValueExp((int) filenames.size()));
-  callStmt->addArg(*filenamesLength);
-  
-  std::vector<SgExpression *>::iterator it = filenames.begin();
-  for (; it != filenames.end(); it++) {
-    callStmt->addArg(*DvmhString(*it));
-  }
-  return callStmt;
-}
-
-
-SgStatement *CheckFilename(SgExpression *cpName, SgExpression *filename) {
-  fmask[CP_CHECK_FILENAME] = 2;
-  SgCallStmt *callStmt = new SgCallStmt(*fdvm[CP_CHECK_FILENAME]);
-  callStmt->addArg(*DvmhString(cpName));
-  callStmt->addArg(*DvmhString(filename));
-  
-  return callStmt;
-  
-}
-
-SgStatement *CpWait(SgExpression *cpName, SgExpression *statusVar) {
-  fmask[CP_WAIT] = 2;
-  SgCallStmt *callStmt = new SgCallStmt(*fdvm[CP_WAIT]);
-  callStmt->addArg(*DvmhString(cpName));
-  callStmt->addArg(*DvmhVariable(statusVar));
-  return callStmt;
-}
-
-SgStatement *CpSaveAsyncUnit(SgExpression *cpName, SgExpression *file, SgExpression *unit) {
-  fmask[CP_SAVE_ASYNC_UNIT] = 2;
-  SgCallStmt *callStmt = new SgCallStmt(*fdvm[CP_SAVE_ASYNC_UNIT]);
-  callStmt->addArg(*DvmhString(cpName));
-  callStmt->addArg(*DvmhString(file));
-  callStmt->addArg(*DvmType_Ref(unit));
-  return callStmt;
-}
-
-SgStatement *GetNextFilename(SgExpression *cpName, SgExpression *lastFile, SgExpression *currentFile) {
-  fmask[CP_NEXT_FILENAME] = 2;
-  SgCallStmt *callStmt = new SgCallStmt(*fdvm[CP_NEXT_FILENAME]);
-  callStmt->addArg(*DvmhString(cpName));
-  callStmt->addArg(*DvmhString(lastFile));
-  callStmt->addArg(*DvmhStringVariable(currentFile));
-  
-  return callStmt;
-}
-
-/*
-SgStatement *RegisterBufferArray(int irgn, SgSymbol *c_intent, SgExpression *bufref, int ilow, int ihigh)
-{  //generating Subroutine Call:  
-   //    region_register_subarray(DvmhRegionRef, intentRef, dvmDesc[], lowIndex[], highIndex[]) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[RGSTR_SUBARRAY]);  
-  fmask[RGSTR_SUBARRAY] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*new SgVarRefExp(c_intent));
-  call -> addArg(*bufref);
-  call -> addArg(*DVM000(ilow));
-  call -> addArg(*DVM000(ihigh));
-  return(call);
-}
-*/
-
-SgStatement *SetArrayName(int irgn, SgSymbol *ar)
-{  //generating Subroutine Call:  
-   //   region_set_name_array(DvmhRegionRef *regionRef, long dvmDesc[], const char *name) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[SET_NAME_ARRAY]);  
-  fmask[SET_NAME_ARRAY] = 2;
-  
-  call -> addArg(*DVM000(irgn));
- 
-  if(HEADER(ar)) //DVM-array
-    call -> addArg(*HeaderRef(ar));
-  else // replicated array
-    call -> addArg(*DVM000(*HEADER_OF_REPLICATED(ar)));
-  call -> addArg(*new SgValueExp(ar->identifier()));
-  return(call);
-}
-
-SgStatement *SetVariableName(int irgn, SgSymbol *var)
-{  //generating Subroutine Call:  
-   //   region_set_name_variable(DvmhRegionRef *regionRef, void *addr, const char *name) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[SET_NAME_VAR]);  
-  fmask[SET_NAME_VAR] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(* new SgVarRefExp(var));
-  call -> addArg(*new SgValueExp(var->identifier()));
-  return(call);
-}
-
-SgStatement *RegionBeforeLoadrb(SgExpression *bufref)
-{  //generating Subroutine Call:  
-   //    dvmh_remote_access( dvmDesc[]) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[BEFORE_LOADRB]);  
-  fmask[BEFORE_LOADRB] = 2;
-  
-  call -> addArg(*bufref);
-  return(call);
-}
-
-SgStatement *RegionAfterWaitrb(int irgn, SgExpression *bufref)
-{  //generating Subroutine Call:  
-   //    region_after_waitrb(DvmhRegionRef, dvmDesc[]) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[REG_WAITRB]);  
-  fmask[REG_WAITRB] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*bufref);
-  return(call);
-}
-
-SgStatement *RegionDestroyRb(int irgn, SgExpression *bufref)
-{  //generating Subroutine Call:  
-   //    region_destroy_rb(DvmhRegionRef, dvmDesc[]) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[REG_DESTROY_RB]);  
-  fmask[REG_DESTROY_RB] = 2;
-  
-  call -> addArg(*DVM000(irgn));
-  call -> addArg(*bufref);
-  return(call);
-}
-
-SgStatement *ActualScalar(SgSymbol *s)
-{  //generating Subroutine Call:  
-   //    dvmh_actual_variable(addr) 
-   //  or when RTS2 is used
-   //    dvmh_actual_variable2(const void *addr)
-  int fNum = INTERFACE_RTS2 ? ACTUAL_SCALAR_2 : ACTUAL_SCALAR;
-  SgCallStmt *call = new SgCallStmt(*fdvm[fNum]);  
-  fmask[fNum] = 2;
-  
-  call -> addArg(*new SgVarRefExp(s));
-  
-  return(call);
-}
-
-SgStatement *ActualSubVariable(SgSymbol *s, int ilow, int ihigh)
-{  //generating Subroutine Call:  
-   //    dvmh_actual_subvariable(addr, lowIndex[], highIndex[]) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[ACTUAL_SUBVAR]);  
-  fmask[ACTUAL_SUBVAR] = 2;
-  
-  call -> addArg(*new SgVarRefExp(s));
-  call -> addArg(*DVM000(ilow));
-  call -> addArg(*DVM000(ihigh));
-  
-  return(call);
-}
-
-SgStatement *ActualSubVariable_2(SgSymbol *s, int rank, SgExpression *index_list)
-{  //generating Subroutine Call:  
-   //    dvmh_actual_subvariable2(const void *addr, const DvmType *pRank, /* const DvmType *pIndexLow, const DvmType *pIndexHigh */...)
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[ACTUAL_SUBVAR_2]);  
-  fmask[ACTUAL_SUBVAR_2] = 2;
-  
-  call -> addArg(*new SgVarRefExp(s));
-  call -> addArg(*ConstRef(rank));
-  AddListToList(call->expr(0),index_list);    
-  return(call);
-}
-
-
-SgStatement *ActualSubArray(SgSymbol *ar, int ilow, int ihigh)
-{  //generating Subroutine Call:  
-   //    dvmh_actual_subarray(dvmDesc[], lowIndex[], highIndex[]) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[ACTUAL_SUBARRAY]);  
-  fmask[ACTUAL_SUBARRAY] = 2;
-  
-  call -> addArg(*HeaderRef(ar));
-  call -> addArg(*DVM000(ilow));
-  call -> addArg(*DVM000(ihigh));
-  return(call);
-}
-
-SgStatement *ActualSubArray_2(SgSymbol *ar, int rank, SgExpression *index_list)
-{  //generating Subroutine Call:  
-   //    dvmh_actual_subarray2(const DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pIndexLow, const DvmType *pIndexHigh */...) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[ACTUAL_SUBARRAY_2]);  
-  fmask[ACTUAL_SUBARRAY_2] = 2;
-  
-  call -> addArg(*HeaderRef(ar));
-  call -> addArg(*ConstRef(rank));
-  AddListToList(call->expr(0),index_list);
-  return(call);
-}
-
-SgStatement *ActualArray(SgSymbol *ar)
-{  //generating Subroutine Call:  
-   //    dvmh_actual_array(dvmDesc[]) 
-   //  or when RTS2 is used
-   //    dvmh_actual_array2(const DvmType dvmDesc[])
-  int fNum = INTERFACE_RTS2 ? ACTUAL_ARRAY_2 : ACTUAL_ARRAY;
-  SgCallStmt *call = new SgCallStmt(*fdvm[fNum]);  
-  fmask[fNum] = 2;
-  
-  call -> addArg(*HeaderRef(ar));
-  return(call);
-}
-
-SgStatement *ActualAll()
-{  //generating Subroutine Call:  
-   //    dvmh_actual_all() 
-   //  or when RTS2 is used
-   //    dvmh_actual_all2() 
-  int fNum = INTERFACE_RTS2 ? ACTUAL_ALL_2 : ACTUAL_ALL;
-  SgCallStmt *call = new SgCallStmt(*fdvm[fNum]);  
-  fmask[fNum] = 2;
-  return(call);
-}
-
-SgStatement *GetActualScalar(SgSymbol *s)
-{  //generating Subroutine Call:  
-   //    dvmh_get_actual_variable(addr) 
-   //  or when RTS2 is used
-   //    dvmh_get_actual_variable2(void *addr)
-  int fNum = INTERFACE_RTS2 ? GET_ACTUAL_SCALAR_2 : GET_ACTUAL_SCALAR;
-  SgCallStmt *call = new SgCallStmt(*fdvm[fNum]);  
-  fmask[fNum] = 2;
-  
-  call -> addArg(*new SgVarRefExp(s));
-  
-  return(call);
-}
-
-SgStatement *GetActualSubVariable(SgSymbol *s, int ilow, int ihigh)
-{  //generating Subroutine Call:  
-   //    dvmh_get_actual_subvariable(addr, lowIndex[], highIndex[]) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[GET_ACTUAL_SUBVAR]);  
-  fmask[GET_ACTUAL_SUBVAR] = 2;
-  
-  call -> addArg(*new SgVarRefExp(s));
-  call -> addArg(*DVM000(ilow));
-  call -> addArg(*DVM000(ihigh));
- 
-  return(call);
-}
-
-SgStatement *GetActualSubVariable_2(SgSymbol *s, int rank, SgExpression *index_list)
-{  //generating Subroutine Call:  
-   //    dvmh_get_actual_subvariable2(void *addr, const DvmType *pRank, /* const DvmType *pIndexLow, const DvmType *pIndexHigh */...); 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[GET_ACTUAL_SUBVAR_2]);  
-  fmask[GET_ACTUAL_SUBVAR_2] = 2;
-  
-  call -> addArg(*new SgVarRefExp(s));
-  call -> addArg(*ConstRef(rank));
-  AddListToList(call->expr(0),index_list);  
-  return(call);
-}
-
-SgStatement *GetActualSubArray(SgSymbol *ar, int ilow, int ihigh)
-{  //generating Subroutine Call:  
-   //    dvmh_get_actual_subarray(dvmDesc[], lowIndex[], highIndex[]) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[GET_ACTUAL_SUBARRAY]);  
-  fmask[GET_ACTUAL_SUBARRAY] = 2;
-  
-  call -> addArg(*HeaderRef(ar));
-  call -> addArg(*DVM000(ilow));
-  call -> addArg(*DVM000(ihigh));
-  return(call);
-}
-
-SgStatement *GetActualSubArray_2(SgSymbol *ar, int rank, SgExpression *index_list)
-{  //generating Subroutine Call:  
-   //    dvmh_get_actual_subarray2_(const DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pIndexLow, const DvmType *pIndexHigh */...)
-  SgCallStmt *call = new SgCallStmt(*fdvm[GET_ACTUAL_SUBARR_2]);  
-  fmask[GET_ACTUAL_SUBARR_2] = 2;
-  
-  call -> addArg(*HeaderRef(ar));
-  call -> addArg(*ConstRef(rank));
-  AddListToList(call->expr(0),index_list);  
-  return(call);
-}
-
-SgStatement *GetActualArray(SgExpression *objref)
-{  //generating Subroutine Call:  
-   //    dvmh_get_actual_array(dvmDesc[])
-   //  or when RTS2 is used
-   //    dvmh_get_actual_array2(const DvmType dvmDesc[]) 
-  int fNum = INTERFACE_RTS2 ? GET_ACTUAL_ARR_2 : GET_ACTUAL_ARRAY; 
-  SgCallStmt *call = new SgCallStmt(*fdvm[fNum]);  
-  fmask[fNum] = 2;
-  
-  call -> addArg(*objref); //(*HeaderRef(ar));
-  return(call);
-}
-
-SgStatement *GetActualAll()
-{  //generating Subroutine Call:  
-   //    dvmh_get_actual_all() 
-   //  or when RTS2 is used
-   //    dvmh_get_actual_all2()
-  int fNum = INTERFACE_RTS2 ? GET_ACTUAL_ALL_2 : GET_ACTUAL_ALL;
-  SgCallStmt *call = new SgCallStmt(*fdvm[fNum]);  
-  fmask[fNum] = 2;
-
-  return(call);
-}
-
-SgStatement *DestroyArray(SgExpression *objref)
-{  //generating Subroutine Call:  
-   //    dvmh_destroy_array(dvmDesc[]) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DESTROY_ARRAY]);  
-  fmask[DESTROY_ARRAY] = 2;
-  
-  call -> addArg(*objref); //(*HeaderRef(ar));
-  return(call);
-}
-
-SgStatement *DestroyScalar(SgExpression *objref)
-{  //generating Subroutine Call:  
-   //    dvmh_destroy_variable(addr) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DESTROY_SCALAR]);  
-  fmask[DESTROY_SCALAR] = 2;
-  
-  call -> addArg(*objref);
-  return(call);
-}
-
-SgStatement *DeleteObject_H(SgExpression *objref) 
-{
-//generating Subroutine Call:
-//        dvmh_delete_object(ObjectRef)
- 
- SgCallStmt *call = new SgCallStmt(*fdvm[DELETE_OBJECT]);
- fmask[DELETE_OBJECT] = 2;
-
- call->addArg(objref->copy());
- 
- return(call);
-}   
-
-SgStatement *ForgetHeader(SgExpression *objref) 
-{
-//generating Subroutine Call:
-//        dvmh_forget_header(DvmType dvmDesc[])
- 
- SgCallStmt *call = new SgCallStmt(*fdvm[FORGET_HEADER]);
- fmask[FORGET_HEADER] = 2;
-
- call->addArg(*objref);
- 
- return(call);
-}   
-
-
-SgStatement *ScopeStart() 
-{
-//generating Subroutine Call:
-//        dvmh_scope_start()
- 
- SgCallStmt *call = new SgCallStmt(*fdvm[SCOPE_START]);
- fmask[SCOPE_START] = 2;
- 
- return(call);
-}   
-
-SgStatement *ScopeEnd() 
-{
-//generating Subroutine Call:
-//        dvmh_scope_end()
- 
- SgCallStmt *call = new SgCallStmt(*fdvm[SCOPE_END]);
- fmask[SCOPE_END] = 2;
- 
- return(call);
-}
- 
-SgStatement *ScopeInsert(SgExpression *objref) 
-{
-//generating Subroutine Call:
-//        dvmh_scope_insert(dvmDesc[])
- 
- SgCallStmt *call = new SgCallStmt(*fdvm[SCOPE_INSERT]);
- fmask[SCOPE_INSERT] = 2;
- call -> addArg(*objref); 
- return(call);
-}   
-  
-
-SgStatement *DataEnter(SgExpression *objref, SgExpression *esize)
-{  //generating Subroutine Call:  
-   //    dvmh_data_enter(addr,size) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DATA_ENTER]);  
-  fmask[DATA_ENTER] = 2;
-  
-  call -> addArg(*objref);
-  call -> addArg(*esize);
-  return(call);
-}
-
-SgStatement *DataExit(SgExpression *objref, int saveFlag)
-{  //generating Subroutine Call:  
-   //    dvmh_data_exit(addr,saveFlag) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DATA_EXIT]);  
-  fmask[DATA_EXIT] = 2;
-  
-  call -> addArg(*objref);
-  call -> addArg(*ConstRef(saveFlag));
-  return(call);
-}
-
-
-SgStatement *Redistribute_H(SgExpression *objref, int new_sign)
-{  //generating Subroutine Call:  
-   //    dvmh_redistribute(dvmDesc[], newValueFlagRef) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_REDISTRIBUTE]);  
-  fmask[DVMH_REDISTRIBUTE] = 2;
-  
-  call -> addArg(*objref); //(*HeaderRef(ar));
-  call -> addArg(*ConstRef(new_sign));
-  return(call);
-}
-
-SgStatement *Realign_H(SgExpression *objref, int new_sign)
-{  //generating Subroutine Call:  
-   //    dvmh_align(dvmDesc[], newValueFlagRef) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_REALIGN]);  
-  fmask[DVMH_REALIGN] = 2;
-  
-  call -> addArg(*objref); //(*HeaderRef(ar));
-  call -> addArg(*ConstRef(new_sign));
-  return(call);
-}
-
-
-SgStatement *HandleConsistent(SgExpression *gref)
-{
-//generating Subroutine Call:
-//                           dvmh_handle_consistent(DvmhRegionRef,DvmhConsistGroupRef) 
-
-  SgCallStmt *call  = new SgCallStmt(*fdvm[HANDLE_CONSIST]);
-  fmask[HANDLE_CONSIST] = 2;
-  call->addArg(cur_region ? *DVM000(cur_region->No) : *ConstRef_F95(0));
-  call->addArg(*gref);
-  return(call);
-}
-
-SgStatement *RemoteAccess_H2 (SgExpression *buf_hedr, SgSymbol *ar, SgExpression *ar_hedr, SgExpression *axis_list)
-{// generating subroutine call: dvmh_remote_access2 (DvmType rmaDesc[], const void *baseAddr, const DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pAlignmentHelper */...)
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_REMOTE2]);
-  fmask[DVMH_REMOTE2] = 2;
-  call->addArg(*buf_hedr);
-  SgType *t = (isSgArrayType(ar->type())) ? ar->type()->baseType() : ar->type();
-  SgExpression *base = (t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING ) ? new SgArrayRefExp(*baseMemory(SgTypeInt())) : new SgArrayRefExp(*baseMemory(t));   
-  call->addArg(*base);
-  call->addArg(*ar_hedr);
-  AddListToList(call->expr(0), axis_list);
-  return(call);
-}
-
-/*
-SgExpression *RegistrateLoop_GPU(int irgn,int iplp,int flag_first,int flag_last)
-{ // generating function call: crtpl_gpu(region_ref, dvm_parloop_ref, flag_first, flag_last)
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CRTPL_GPU]);
-  fmask[CRTPL_GPU] = 1;
-  fe->addArg(*GPU000(irgn));
-  fe->addArg(*DVM000(iplp));
-  fe->addArg(*ConstRef(flag_first));
-  fe->addArg(*ConstRef(flag_last ));
-  return(fe);
-}
-*/
-//------------------------- Parallel loop --------------------------------------------------
-
-SgExpression *LoopCreate_H(int irgn,int iplp)
-{ // generating function call: loop_create(DvmhRegionRef, dvm_loop_ref(InDvmLoop))
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[LOOP_CREATE]);
-  fmask[LOOP_CREATE] = 1;
-  if(irgn)
-    fe->addArg(*DVM000(irgn));
-  else
-    fe->addArg(*ConstRef(0));
-  if(iplp)
-    fe->addArg(*DVM000(iplp));
-  else
-    fe->addArg(*ConstRef(0)); 
-  return(fe);
-}
-
-SgExpression *LoopCreate_H2(int nloop, SgExpression *paramList)
-{ // generating function call: dvmh_loop_create(const DvmType *pCurRegion, const DvmType *pRank, /* const DvmType *pStart, const DvmType *pEnd, const DvmType *pStep */...)
- 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[LOOP_CREATE_2]);
-  fmask[LOOP_CREATE_2] = 1;
-  fe->addArg(cur_region ? *DVM000(cur_region->No) : *ConstRef_F95(0));
-  fe->addArg(*ConstRef(nloop)); 
-  AddListToList(fe->lhs(),paramList);  
-  return(fe);
-}
-
-SgExpression *LoopCreate_H2(SgExpression &paramList)
-{ // generating function call: dvmh_loop_create(const DvmType *pCurRegion, const DvmType *pRank, /* const DvmType *pStart, const DvmType *pEnd, const DvmType *pStep */...)
- 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[LOOP_CREATE_2],paramList);
-  fmask[LOOP_CREATE_2] = 1;
-  
-  return(fe);
-}
-
-SgStatement *LoopMap(int ilh, SgExpression *desc, int rank, SgExpression *paramList)
-{ // generating subroutine call: dvmh_loop_map(const DvmType *pCurLoop, const DvmType templDesc[], const DvmType *pTemplRank, /* const DvmType *pAlignmentHelper */...);
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_MAP]);
-  fmask[LOOP_MAP] = 2;
-  call->addArg(*DVM000(ilh));
-  call->addArg(*desc);
-  call->addArg(*ConstRef(rank));
-  AddListToList(call->expr(0),paramList);  
-  return(call);
-}
-
-SgStatement *LoopMap(SgExpression &paramList)
-{ // generating subroutine call: dvmh_loop_map(const DvmType *pCurLoop, const DvmType templDesc[], const DvmType *pTemplRank, /* const DvmType *pAlignmentHelper */...);
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_MAP],paramList);
-  fmask[LOOP_MAP] = 2;
-  
-  return(call);
-}
-
-SgExpression *AlignmentLinear(SgExpression *axis,SgExpression *multiplier,SgExpression *summand)
-{ // generating function call: 
-  //                 DvmType dvmh_alignment_linear(const DvmType *pAxis, const DvmType *pMultiplier, const DvmType *pSummand) 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[ALIGN_LINEAR]);
-  fmask[ALIGN_LINEAR] = 1;
- 
-  fe->addArg(*DvmType_Ref(axis));
-  fe->addArg(*DvmType_Ref(multiplier));
-  fe->addArg(*DvmType_Ref(summand)); 
-  return(fe);
-}
-
-SgExpression *Register_Array_H2(SgExpression *ehead)
-{ // generating function call: : DvmType dvmh_register_array(DvmType dvmDesc[])
-  // DvmDesc -  dvm-array header
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[REGISTER_ARR]);
-  fmask[REGISTER_ARR] = 1;
-  fe->addArg(*ehead);
-  return(fe);
-}
-
-SgStatement *LoopStart_H(int il)
-{ // generating subroutine call: loop_start(DvmhLoopRef)
-  // DvmhLoopRef - result of loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_START]);
-  fmask[LOOP_START] = 2;
-  call->addArg(*DVM000(il));
-  return(call);
-}
-
-SgStatement *LoopEnd_H(int il)
-{ // generating subroutine call: loop_end(DvmhLoopRef)
-  // DvmhLoopRef - result of loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_END]);
-  fmask[LOOP_END] = 2;
-  call->addArg(*DVM000(il));
-  return(call);
-}
-
-SgStatement *LoopPerform_H(int il)
-{ // generating subroutine call: loop_perform(DvmhLoopRef)
-  // DvmhLoopRef - result of loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_PERFORM]);
-  fmask[LOOP_PERFORM] = 2;
-  call->addArg(*DVM000(il));
-  return(call);
-}
-
-SgStatement *LoopPerform_H2(int il)
-{ // generating subroutine call: dvmh_loop_perform(DvmhLoopRef)
-  // DvmhLoopRef - result of dvmh_loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_PERFORM_2]);
-  fmask[LOOP_PERFORM_2] = 2;
-  call->addArg(*DVM000(il));
-  return(call);
-}
-
-SgStatement *RegisterHandler_H(int il,SgSymbol *dev_const, SgExpression *flag, SgSymbol *sfun,int bcount,int parcount)
-{ // generating subroutine call: loop_register_handler(DvmhLoopRef,deviceTypeRef,flagsRef,FuncRef,basesCount,paramCount,Params...)
-  // DvmhLoopRef - result of loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[REG_HANDLER]);
-  fmask[REG_HANDLER] = 2;
-  call->addArg(*DVM000(il));
-  call->addArg(* new SgVarRefExp(dev_const));
-  call->addArg(* flag);  
-  call->addArg(* new SgVarRefExp(sfun));
-  call->addArg(* ConstRef(bcount));
-  call->addArg(* ConstRef(parcount));
-  return(call);
-}
-
-SgStatement *RegisterHandler_H2(int il,SgSymbol *dev_const, SgExpression *flag, SgExpression *efun)
-{ // generating subroutine call: dvmh_loop_register_handler(const DvmType *pCurLoop, const DvmType *pDeviceType, const DvmType *pHandlerType, const DvmType *pHandlerHelper)
-
-  // DvmhLoopRef - result of dvmh_loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[REG_HANDLER_2]);
-  fmask[REG_HANDLER_2] = 2;
-  call->addArg(*DVM000(il));
-  call->addArg(* new SgVarRefExp(dev_const));
-  call->addArg(* flag);  
-  call->addArg(* efun);
-  return(call);
-}
-
-SgExpression *HandlerFunc(SgSymbol *sfun, int paramCount, SgExpression *arg_list)
-{ // generating function call:
-  //               DvmType dvmh_handler_func(DvmHandlerFunc handlerFunc, const DvmType *pCustomParamCount, /* void *param */...)
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[HANDLER_FUNC]);
-  fmask[HANDLER_FUNC] = 1;
-  fe->addArg(* new SgVarRefExp(sfun));
-  fe->addArg(* ConstRef(paramCount));
-  AddListToList(fe->lhs(), arg_list);
-  return(fe);
-}
-
-/*
-SgExpression *Loop_GPU(int il)
-{ // generating function call: startpl_gpu(gpu_parloop_ref)
-  // gpu_parloop_ref - result of crtpl_gpu()
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[LOOP_GPU]);
-  fmask[LOOP_GPU] = 1;
-  fe->addArg(*GPU000(il));
-  fe->addArg(*new SgVarRefExp(s_blocks));
-  fe->addArg(*new SgVarRefExp(s_threads));
-  fe->addArg(*new SgArrayRefExp(*baseGpuMemory(IndexType())));
-  fe->addArg(*new SgVarRefExp(s_blocks_off));
-  return(fe);
-}
-*/
-/*
-SgExpression *StartShadow_GPU(int irgn,SgExpression *gref)
-{ // generating function call: strtsh_gpu(ComputeRegionRef, BoundGroupRef)
-  SgFunctionCallExp *fe= new SgFunctionCallExp(*fdvm[STRTSH_GPU]);
-  fmask[STRTSH_GPU] = 1;
-  fe->addArg(*GPU000(irgn));
-  fe->addArg(gref->copy());
-  return(fe);
-}
-*/
-
-SgExpression *GetActualEdges_H(SgExpression *gref)
-{ // generating function call: dvmh_get_actual_edges(ShadowGroupRef)
-  SgFunctionCallExp *fe= new SgFunctionCallExp(*fdvm[GET_ACTUAL_EDGES]);
-  fmask[GET_ACTUAL_EDGES] = 1;
- 
-  fe->addArg(gref->copy());
-  return(fe);
-}
-
-/*
-SgStatement *DoneShadow_GPU(int ish)
-{// generating subroutine call: donesh_gpu(gpu_ShagowRef) 
- // gpu_ShagowRef - result of strtsh_gpu() 
-  SgCallStmt *call = new SgCallStmt(*fdvm[DONESH_GPU]);
-  fmask[DONESH_GPU] = 2;
-  call->addArg(*GPU000(ish));
-  return(call);
-}
-*/
-
-SgStatement *SetCudaBlock_H(int il, int ib)
-{// generating subroutine call: loop_set_cuda_block(DvmhLoopRef,XRef,YRef,ZRef) 
-  // DvmhLoopRef - result of loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[CUDA_BLOCK]);
-  fmask[CUDA_BLOCK] = 2;
-  call->addArg(*DVM000(il));
-  call->addArg(*DVM000(ib));
-  call->addArg(*DVM000(ib+1));
-  call->addArg(*DVM000(ib+2));
-  return(call);
-}
-
-SgStatement *SetCudaBlock_H2(int il, SgExpression *X, SgExpression *Y, SgExpression *Z )
-{// generating subroutine call: dvmh_loop_set_cuda_block(DvmhLoopRef,XRef,YRef,ZRef) 
-  // DvmhLoopRef - result of dvmh_loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[CUDA_BLOCK_2]);
-  fmask[CUDA_BLOCK_2] = 2;
-  call->addArg(*DVM000(il));
-  call->addArg(*DvmType_Ref(X));
-  call->addArg(*DvmType_Ref(Y));
-  call->addArg(*DvmType_Ref(Z));
-  return(call);
-}
-
-SgStatement *Correspondence_H (int il, SgExpression *hedr, SgExpression *axis_list)
-{// generating subroutine call: dvmh_loop_array_correspondence(const DvmType *pCurLoop, const DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pLoopAxis */...) 
- // DvmhLoopRef - result of dvmh_loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[CORRESPONDENCE]);
-  fmask[CORRESPONDENCE] = 2;
-  call->addArg(*DVM000(il));
-  call->addArg(*hedr);
-  AddListToList(call->expr(0), axis_list);
-  return(call);
-}
-
-SgStatement *Consistent_H (int il, SgExpression *hedr, SgExpression *axis_list)
-{// generating subroutine call: dvmh_loop_consistent_(const DvmType *pCurLoop, const DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pAlignmentHelper */...)
- // DvmhLoopRef - result of dvmh_loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_CONSISTENT]);
-  fmask[LOOP_CONSISTENT] = 2;
-  call->addArg(*DVM000(il));
-  call->addArg(*hedr);
-  AddListToList(call->expr(0), axis_list);
-  return(call);
-}
-
-SgStatement *LoopRemoteAccess_H (int il, SgExpression *hedr, SgSymbol *ar, SgExpression *axis_list)
-{// generating subroutine call: dvmh_loop_remote_access_(const DvmType *pCurLoop, const DvmType dvmDesc[], const void *baseAddr, const DvmType *pRank, /* const DvmType *pAlignmentHelper */...)
- // DvmhLoopRef - result of dvmh_loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_REMOTE]);
-  fmask[LOOP_REMOTE] = 2;
-  call->addArg(*DVM000(il));
-  call->addArg(*hedr);
-  SgType *t = (isSgArrayType(ar->type())) ? ar->type()->baseType() : ar->type();
-  SgExpression *base = (t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING ) ? new SgArrayRefExp(*baseMemory(SgTypeInt())) : new SgArrayRefExp(*baseMemory(t));   
-  call->addArg(*base);
-  AddListToList(call->expr(0), axis_list);
-  return(call);
-}
-
-SgStatement *ShadowRenew_H(SgExpression *gref)
-{// generating subroutine call: dvmh_shadow_renew(ShadowGroupRef) 
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[SHADOW_RENEW]);
-  fmask[SHADOW_RENEW] = 2;
-
-  call->addArg(gref->copy());
-  return(call);
-}
-
-SgStatement *ShadowRenew_H2(SgExpression *head,int corner,int rank,SgExpression *shlist)
-{// generating subroutine call: 
- //      dvmh_shadow_renew2(const DvmType dvmDesc[], const DvmType *pCornerFlag, const DvmType *pSpecifiedRank,
- //                        /* const DvmType *pShadowLow, const DvmType *pShadowHigh */...);
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[SHADOW_RENEW_2]);
-  fmask[SHADOW_RENEW_2] = 2;
-
-  call->addArg(*head);
-  call->addArg(*ConstRef(corner));
-  call->addArg(*ConstRef(rank));
-  AddListToList(call->expr(0),shlist);
-  return(call);
-}
-
-
-SgStatement *IndirectShadowRenew(SgExpression *head, int axis, SgExpression *shadow_name)
-{// generating subroutine call:
- //      dvmh_indirect_shadow_renew_(const DvmType dvmDesc[], const DvmType *pAxis, const DvmType *pShadowNameStr); 
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[INDIRECT_SH_RENEW]);
-  fmask[INDIRECT_SH_RENEW] = 2;
-
-  call->addArg(*head);
-  call->addArg(*ConstRef(axis));
-  call->addArg(*DvmhString(shadow_name));    //DvmhString(new SgValueExp(name))
-  return(call);
-}
-
-SgStatement *LoopShadowCompute_H(int il,SgExpression *headref)
-{  //generating subroutine call:  loop_shadow_compute(DvmhLoopRef,dvmDesc[]) 
-   // DvmhLoopRef - result of loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[SHADOW_COMPUTE]);  
-  fmask[SHADOW_COMPUTE] = 2;
-  
-  call -> addArg(*DVM000(il));
-  call -> addArg(*headref);               //(*HeaderRef(ar));
-  
-  return(call);
-}
-
-SgStatement *LoopShadowCompute_Array(int il,SgExpression *headref)
-{  //generating subroutine call:  dvmh_loop_shadow_compute_array(const DvmType *pCurLoop, const DvmType dvmDesc[])
-   // DvmhLoopRef - result of dvmh_loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[SHADOW_COMPUTE_AR]);  
-  fmask[SHADOW_COMPUTE_AR] = 2;
-  
-  call -> addArg(*DVM000(il));
-  call -> addArg(*headref);               
-  
-  return(call);
-}
-
-SgStatement *ShadowCompute(int ilh,SgExpression *head,int rank,SgExpression *shlist)
-{// generating subroutine call: 
- //      dvmh_loop_shadow_compute(const DvmType *pCurLoop, const DvmType templDesc[], const DvmType *pSpecifiedRank,
- //                               /* const DvmType *pShadowLow, const DvmType *pShadowHigh */...);
- // DvmhLoopRef - result of dvmh_loop_create()  
-  SgCallStmt *call = new SgCallStmt(*fdvm[SHADOW_COMPUTE_2]);
-  fmask[SHADOW_COMPUTE_2] = 2;
-
-  call->addArg(*DVM000(ilh));
-  call->addArg(*head);
-  call->addArg(*ConstRef(rank));
-  AddListToList(call->expr(0),shlist);
-  return(call);
-}
-
-SgStatement *LoopAcross_H(int il,SgExpression *oldGroup,SgExpression *newGroup)
-{  //generating subroutine call:  loop_across(DvmhLoopRef *InDvmhLoop, ShadowGroupRef *oldGroup, ShadowGroupRef *newGroup) 
-   // DvmhLoopRef - result of loop_create()
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_ACROSS]);  
-  fmask[LOOP_ACROSS] = 2;
-  
-  call -> addArg(*DVM000(il));
-  call -> addArg(*oldGroup);
-  call -> addArg(*newGroup);               
-  
-  return(call);
-}
-
-SgStatement *LoopAcross_H2(int il, int isOut, SgExpression *headref, int rank, SgExpression *shlist)
-{  //generating subroutine call:  
-   //            dvmh_loop_across(const DvmType *pCurLoop, const DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pShadowLow, const DvmType *pShadowHigh */...)
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_ACROSS_2]);  
-  fmask[LOOP_ACROSS_2] = 2;
-  
-  call -> addArg(*DVM000(il));
-  call -> addArg(*ConstRef(isOut));
-  call -> addArg(*headref);
-  call -> addArg(*ConstRef(rank));               
-  AddListToList(call->expr(0),shlist);
-  return(call);
-}
-
-SgExpression *GetStage(SgStatement *first_do,int iplp)
-{// generating function call: dvmh_get_next_stage(LineNumber,FileName,LoopRef,DvmhRegionRef)
- // Loopref - result of crtpl()
- SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GET_STAGE]);
- fmask[GET_STAGE] = 1;
- filename_list *fn = AddToFileNameList(baseFileName(first_do->fileName()));
- fe->addArg(cur_region ? *DVM000(cur_region->No) : *ConstRef_F95(0));
- fe->addArg(*DVM000(iplp));
- fe->addArg(*ConstRef_F95(first_do->lineNumber()));
- fe->addArg(* new SgVarRefExp(fn->fns));
- 
- return(fe);
-}
-
-SgStatement *SetStage(int il, SgExpression *stage)
-{// generating function call: dvmh_loop_set_stage(const DvmType *pCurLoop, const DvmType *pStage)
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_SET_STAGE]);  
-  fmask[DVMH_SET_STAGE] = 2;
-  
-  call -> addArg(*DVM000(il));
-  call -> addArg(*TypeFunction(SgTypeInt(), stage, new SgValueExp(DVMTypeLength())));              
-  
-  return(call);
-
-}
-
-/*
-SgStatement *EndHostExec_GPU(int il)
-{// generating subroutine call: end_host_exec_gpu(gpu_parloop_ref) 
- // gpu_parloop_ref - result of crtpl_gpu() 
-  SgCallStmt *call = new SgCallStmt(*fdvm[ENDHOST_GPU]);
-  fmask[ENDHOST_GPU] = 2;
-  call->addArg(*GPU000(il));
-  return(call);
-}
-*/
-
-SgStatement *CallKernel_GPU(SgSymbol *skernel, SgExpression *blosks_threads)
-{// generating Kernel Call:  
- // loop_<file_name>_<loopNo>(InDeviceBaseAddr1,...,InDeviceBaseAddrN,<coeffs_for_arrays>,<uses_vars>, blocks_off) 
-
- // SgExpression *gpubase;
-  
-  SgCallStmt *call = new SgCallStmt(*skernel);  
-
-  call->setExpression(1,*blosks_threads);
-  //gpubase = new SgArrayRefExp(*baseGpuMemory(ar->type()->baseType()));
-  //call -> addArg(*new SgVarRefExp(s_blocks_off));
-
-  call ->setVariant(ACC_CALL_STMT);
-  return(call);
-}
-
-/*
-SgStatement *InsertRed_GPU(int il,int irv,SgExpression *base,SgExpression *loc_base,SgExpression *offset,SgExpression *loc_offset)
-{// generating subroutine call: insred_gpu_(gpu_parloop_ref, InRedRefPtr, InDeviceArrayBaseAddr, InDeviceLocBaseAddr, AddrType* ArrayOffsetPtr, AddrType *LocOffsetPtr) 
- // InRedRefPtr - result of crtrdf() 
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[INSRED_GPU]);  
-  fmask[INSRED_GPU] = 2;
-  call -> addArg(*GPU000(il));
-  call -> addArg(*DVM000(irv));
-  call -> addArg(*base);
-  if(loc_base)
-    call -> addArg(*loc_base);
-  else
-    call -> addArg(*ConstRef(0));  
-  call -> addArg(*GetAddresMem(offset));
-  if(loc_offset)
-    call -> addArg(*GetAddresMem(loc_offset));
-  else
-    call -> addArg(*ConstRef(0));  
-  return(call);
-}
-*/
-
-SgStatement *LoopInsertReduction_H(int ilh, int irv)
-{// generating subroutine call: loop_insred(DvmhLoopRef, InRedRefPtr) 
- // InRedRefPtr  - result of crtrdf()
- // DvmhLoopRef - result of loop_create() 
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOOP_INSRED]);  
-  fmask[LOOP_INSRED] = 2;
-  call -> addArg(*DVM000(ilh));
-  call -> addArg(*DVM000(irv));
-  return(call);
-}
-
-/*
-SgStatement *UpdateDVMArrayOnHost(SgSymbol *s)
-{
- // generating subroutine call: dvmh_get_actual_whole_(long InOutDvmArray[]) 
- //InOutDvmArray[] - DVM-array header of array 's' 
-  SgCallStmt *call = new SgCallStmt(*fdvm[GET_ACTUAL_WHOLE]);
-  fmask[GET_ACTUAL_WHOLE] = 2;
-  call->addArg(*HeaderRef(s));
-  return(call);
-}
-*/
-
-//--------- Array Copy ----------------------------------------------------------------
-
-SgExpression *DvmhArraySlice(int rank, SgExpression *slice_list)
-{
- // generating function call: 
- //        DvmType dvmh_array_slice_C(DvmType rank, /* DvmType start, DvmType end, DvmType step */...)
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[ARRAY_SLICE]);
-  fmask[ARRAY_SLICE] = 1;
-  fe->addArg(*ConstRef_F95(rank));
-  AddListToList(fe->lhs(), slice_list); //fe->lhs()->setRhs(slice_list); 
-  return(fe);
-}
-
-SgStatement *DvmhArrayCopy( SgExpression *array_header_right, int rank_right, SgExpression *slice_list_right, SgExpression *array_header_left, int rank_left, SgExpression *slice_list_left )
-{
- // generating subroutine call: 
- // dvmh_array_copy (const DvmType srcDvmDesc[], DvmType *pSrcSliceHelper, DvmType dstDvmDesc[], DvmType *pDstSliceHelper)
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[COPY_ARRAY]);
-  fmask[COPY_ARRAY] = 2;
-  call->addArg(*array_header_right);
-  call->addArg(*DvmhArraySlice(rank_right, slice_list_right));
-  call->addArg(*array_header_left);
-  call->addArg(*DvmhArraySlice(rank_left,  slice_list_left));
-  return(call);
-}
-
-
-SgStatement *DvmhArrayCopyWhole( SgExpression *array_header_right, SgExpression *array_header_left )
-{
- // generating subroutine call: 
- //                      dvmh_array_copy_whole(const DvmType srcDvmDesc[], DvmType dstDvmDesc[])
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[COPY_WHOLE]);
-  fmask[COPY_WHOLE] = 2;
-  call->addArg(*array_header_right);
-  call->addArg(*array_header_left);
-  return(call);
-}
-
-SgStatement *DvmhArraySetValue( SgExpression *array_header_left, SgExpression *e_right )
-{
- // generating subroutine call: 
- //                     dvmh_array_set_value_(DvmType dstDvmDesc[], const void *scalarAddr)
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[SET_VALUE]);
-  fmask[SET_VALUE] = 2;
-  call->addArg(*array_header_left);
-  call->addArg(*e_right);
-
-  return(call);
-}
-
-// -------- Distributed array creation ------------------------------------------------
-
-SgStatement *DvmhArrayCreate(SgSymbol *das, SgExpression *array_header, int rank, SgExpression *arglist)
-{ 
- // generating subroutine call:
- //    dvmh_array_create(DvmType dvmDesc[], const void *baseAddr, const DvmType *pRank, const DvmType *pTypeSize,
- //                       \* const DvmType *pSpaceLow, const DvmType *pSpaceHigh, const DvmType *pShadowLow, const DvmType *pShadowHigh *\...)
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[CREATE_ARRAY]);
-  fmask[CREATE_ARRAY] = 2;
-  loc_distr =1;
-
-  call->addArg(*array_header);    //(*HeaderRef(das));
-  SgType *t = IS_POINTER(das) ? PointerType(das) : (das->type())->baseType();
-  SgExpression *base = (t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING ) ? new SgArrayRefExp(*baseMemory(SgTypeInt())) : new SgArrayRefExp(*baseMemory(t));  
-  call->addArg(*base); //Base
-  call->addArg(*ConstRef(rank)); //Rank
-     //int it = TestType_RTS2(t);
-     //SgExpression *ts = it >= 0 ? &SgUMinusOp(*ConstRef(it)) : ConstRef_F95(TypeSize(t));
-     //call->addArg(*ts); //TypeSize 
-                               //(*ConstRef_F95(TypeSize(t)));
-  call->addArg(*TypeSize_RTS2(t)); 
-  AddListToList(call->expr(0),arglist);  
-  return(call);
-}
-
-SgStatement *DvmhTemplateCreate(SgSymbol *das, SgExpression *array_header, int rank, SgExpression *arglist)
-{ 
- // generating subroutine call:
- //    dvmh_template_create(DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pSpaceLow, const DvmType *pSpaceHigh */...);
-  SgCallStmt *call = new SgCallStmt(*fdvm[CREATE_TEMPLATE]);
-  fmask[CREATE_TEMPLATE] = 2;
-  loc_distr = 1;
-
-  call->addArg(*array_header);    //(*HeaderRef(das));
-  call->addArg(*ConstRef(rank)); //Rank
-  AddListToList(call->expr(0),arglist);  
-  return(call);
-}
-
-SgExpression *VarGenHeader(SgExpression *item)
-{
-  // generates function call:
-  //                   dvmh_variable_gen_header(const void *addr, const DvmType *pRank, const DvmType *pTypeSize,
-  //                                          \* const DvmType *pSpaceLow, const DvmType *pSpaceHigh \*...)
-  
-  //	dvmh_variable_gen_header(C, 0_8, int(-rt_FLOAT, 8)) for scalar variables
-  //	dvmh_variable_gen_header(B, 2_8, int(-rt_FLOAT, 8), 1_8, 30_8, 1_8, 40_8) for array of size 40*30
-  
-  fmask[VAR_GEN_HDR] = 1;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[VAR_GEN_HDR]);
-  fe->addArg(*item);
-  
-  int nsubs;
-  if (item->symbol() && isSgArrayType(item->symbol()->type()))
-    nsubs = isSgArrayType(item->symbol()->type())->dimension();
-  else nsubs = 0;
-  fe->addArg(*ConstRef_F95(nsubs));
-  
-  // fe->addArg(*TypeSize_RTS2(item->symbol()->type()));
-  
-  if (item->symbol()) fe->addArg(*TypeSize_RTS2(item->symbol()->type()));
-  else fe->addArg(*TypeSize_RTS2(item->type())); // array expressions don't have symbol
-  
-  if (nsubs) {
-    for (int i = nsubs-1; i >= 0; --i) {
-      fe->addArg(*DvmType_Ref(LowerBound(item->symbol(), i)));
-      fe->addArg(*DvmType_Ref(UpperBound(item->symbol(), i)));
-    }
-  }
-  
-  return fe;
-  
-}
-
-SgStatement *CreateDvmArrayHeader_2(SgSymbol *ar, SgExpression *array_header,  int rank,  SgExpression *shape_list) 
-{
-// creates subroutine call:
-//       dvmh_variable_fill_header(DvmType dvmDesc[], const void *baseAddr, const void *addr, const DvmType *pRank, const DvmType *pTypeSize,/* const DvmType *pSpaceLow, const DvmType *pSpaceHigh */...);
-           
-  SgCallStmt *call = new SgCallStmt(*fdvm[VAR_FILL_HDR]);
-  fmask[VAR_FILL_HDR] = 2;
-
-  call->addArg(*array_header);
-  SgType *t = (isSgArrayType(ar->type())) ? ar->type()->baseType() : ar->type();
-  SgExpression *base = (t->variant() != T_DERIVED_TYPE && t->variant() != T_STRING ) ? new SgArrayRefExp(*baseMemory(SgTypeInt())) : new SgArrayRefExp(*baseMemory(t));   
-  call->addArg(*base);
-  call->addArg(*new SgArrayRefExp(*ar));  
-  call->addArg(*ConstRef(rank)); 
-  call->addArg(*TypeSize_RTS2(t)); 
-  AddListToList(call->expr(0),shape_list);  
-  return(call);
-} 
-
-SgExpression *DvmhReplicated()
-{
-  // generates function call:     DvmType dvmh_distribution_replicated()
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMH_REPLICATED]);
-  fmask[DVMH_REPLICATED] = 1;  
-  return fe;  
-
-}
-
-SgExpression *DvmhBlock(int axis)
-{
-  // generates function call:     DvmType dvmh_distribution_block(DvmType pMpsAxis)
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMH_BLOCK]);
-  fmask[DVMH_BLOCK] = 1;
-  fe->addArg(*ConstRef(axis));  
-  return fe;  
-
-}
-
-SgExpression *DvmhWgtBlock(int axis, SgSymbol *sw, SgExpression *en)
-{
-  // generates function call:
-  //       DvmType dvmh_distribution_wgtblock(DvmType pMpsAxis, const DvmType *pElemType, const void *arrayAddr, const DvmType *pElemCount)
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMH_WGTBLOCK]);
-  fmask[DVMH_WGTBLOCK] = 1;
-  SgType *t = (isSgArrayType(sw->type())) ? sw->type()->baseType() : sw->type();
-  fe->addArg(*ConstRef(axis));  
-  fe->addArg(*ConstRef( TestType_RTS2(t) ));
-  fe->addArg(*new SgArrayRefExp(*sw));
-  fe->addArg(*en);    //DvmType_Ref(en)
-  return fe;  
-
-}
-
-
-SgExpression *DvmhGenBlock(int axis, SgSymbol *sg)
-{
-  // generates function call:
-  //    DvmType dvmh_distribution_genblock(DvmType pMpsAxis, const DvmType *pElemType, const void *arrayAddr)
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMH_GENBLOCK]);
-  fmask[DVMH_GENBLOCK] = 1;
-  SgType *t = (isSgArrayType(sg->type())) ? sg->type()->baseType() : sg->type();
-  fe->addArg(*ConstRef(axis));  
-  fe->addArg(*ConstRef( TestType_RTS2(t)));
-  fe->addArg(*new SgArrayRefExp(*sg));
-  return fe;  
-
-}
-
-SgExpression *DvmhMultBlock(int axis, SgExpression *em)
-{
-  // generates function call:  DvmType dvmh_distribution_multblock(DvmType pMpsAxis, const DvmType *pMultBlock)
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMH_MULTBLOCK]);
-  fmask[DVMH_MULTBLOCK] = 1;
-  fe->addArg(*ConstRef(axis));  
-  fe->addArg(*em); // *DvmType_Ref(em));
-  
-  return fe;  
-
-}
-
-#define rt_UNKNOWN (-1)  /*RTS2*/
-
-SgExpression *DvmhIndirect(int axis, SgSymbol *smap)
-{
-  // generates function call:
-  //      DvmType dvmh_distribution_indirect(DvmType pMpsAxis, const DvmType *pElemType, const void *arrayAddr)
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMH_INDIRECT]);
-  fmask[DVMH_INDIRECT] = 1;
-  SgType *t = (isSgArrayType(smap->type())) ? smap->type()->baseType() : smap->type();
-  fe->addArg(*ConstRef(axis));  
-  fe->addArg(HEADER(smap) ? *SignConstRef(rt_UNKNOWN) : *ConstRef( TestType_RTS2(t)));
-  fe->addArg(*new SgArrayRefExp(*smap));
-  
-  return fe;  
-
-}
-
-SgExpression *DvmhDerived(int axis, SgExpression *derived_rhs, SgExpression *counter_func, SgExpression *filler_func)
-{ //generating function call:
-  //      DvmType dvmh_distribution_derived(DvmType pMpsAxis, const DvmType *pDerivedRhsHelper, const DvmType *pCountingHandlerHelper, const DvmType *pFillingHandlerHelper)  
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DVMH_DERIVED]);
-  fmask[DVMH_DERIVED] = 1;
-  fe->addArg(*ConstRef(axis));    
-  fe->addArg(*derived_rhs);
-  fe->addArg(*counter_func);
-  fe->addArg(*filler_func);
-  return fe;
-}
-
-SgStatement *DvmhDistribute(SgSymbol *das, int rank, SgExpression *distr_list)
-{
- // generating subroutine call:
- //    dvmh_distribute(DvmType dvmDesc[], const DvmType *pRank, 
- //   \* const DvmType *pDistributionHelper *\...);
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_DISTRIBUTE]);
-  fmask[DVMH_DISTRIBUTE] = 2;
-
-  call->addArg(*HeaderRef(das));
-  call->addArg(*ConstRef_F95(rank));
-  AddListToList(call->expr(0),distr_list);
-  return(call);
-}
-
-
-SgStatement *DvmhRedistribute(SgSymbol *das, int rank, SgExpression *distr_list)
-{
- // generating subroutine call:
- //    dvmh_redistribute2(DvmType dvmDesc[], const DvmType *pRank, 
- //   \* const DvmType *pDistributionHelper *\...);
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_REDISTR_2]);
-  fmask[DVMH_REDISTR_2] = 2;
-
-  call->addArg(*HeaderRef(das));
-  call->addArg(*ConstRef_F95(rank));
-  AddListToList(call->expr(0),distr_list);
-  return(call);
-}
-
-
-SgStatement *DvmhAlign(SgSymbol *als, SgSymbol *align_base, int nr, SgExpression *alignment_list)
-{
- // generating subroutine call:
- //                   dvmh_align(DvmType dvmDesc[], const DvmType templDesc[], const DvmType *pTemplRank, 
- //                              \* const DvmType *pAlignmentHelper *\...)
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_ALIGN]);
-  fmask[DVMH_ALIGN] = 2;
-
-  call->addArg(*HeaderRef(als));
-  call->addArg(*HeaderRef(align_base));
-  call->addArg(*ConstRef(nr));  //addArg(*ConstRef_F95(Rank(align_base)));
-  AddListToList(call->expr(0),alignment_list);
-  return(call);
-}
-
-SgStatement *DvmhRealign(SgExpression *objref, int new_sign, SgExpression *pattern_ref, int nr, SgExpression *align_list)
-{  //generating Subroutine Call:  
-   //    dvmh_realign2(dvmDesc[], newValueFlagRef) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[DVMH_REALIGN_2]);  
-  fmask[DVMH_REALIGN_2] = 2;
-  
-  call->addArg(*objref); 
-  call->addArg(*ConstRef(new_sign));
-  call->addArg(*pattern_ref); 
-  call->addArg(*ConstRef(nr));
-  AddListToList(call->expr(0),align_list);   
-  return(call);
-}
-
-SgStatement *IndirectLocalize(SgExpression *ref_array, SgExpression *target_array, int iaxis)
-{  //generating Subroutine Call:  
-   //    dvmh_indirect_localize (const DvmType refDvmDesc[], const DvmType targetDvmDesc[], const DvmType *pTargetAxis) 
-
-  SgCallStmt *call = new SgCallStmt(*fdvm[LOCALIZE]);  
-  fmask[LOCALIZE] = 2;
-  
-  call->addArg(*ref_array); 
-  call->addArg(*target_array); 
-  call->addArg(*ConstRef_F95(iaxis));   
-  return(call);
-}
-
-SgStatement *ShadowAdd(SgExpression *templ, int iaxis, SgExpression *derived_rhs, SgExpression *counter_func, SgExpression *filler_func, SgExpression *shadow_name, int nl, SgExpression *array_list)
-{  //generating Subroutine Call:
-   // dvmh_indirect_shadow_add (DvmType dvmDesc[], const DvmType *pAxis, const DvmType *pDerivedRhsHelper, const DvmType *pCountingHandlerHelper,
-   //     const DvmType *pFillingHandlerHelper, const DvmType *pShadowNameStr, const DvmType *pIncludeCount, /* DvmType dvmDesc[] */...);
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[SHADOW_ADD]);  
-  fmask[SHADOW_ADD] = 2;
-  
-  call->addArg(*templ);
-  call->addArg(*ConstRef_F95(iaxis)); 
-  call->addArg(*derived_rhs);
-  call->addArg(*counter_func);
-  call->addArg(*filler_func);
-  call->addArg(*DvmhString(shadow_name)); 
-  call->addArg(*ConstRef_F95(nl));
-  AddListToList(call->expr(0),array_list);     
-  return(call);
-}
-
-SgExpression *DvmhExprIgnore()
-{
-  // generates function call:  dvmh_derived_rhs_expr_ignore()      
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[EXPR_IGNORE]);
-  fmask[EXPR_IGNORE] = 1;
-  return fe;  
-}
-
-SgExpression *DvmhExprConstant(SgExpression *e)
-{
-  // generates function call:  dvmh_derived_rhs_expr_constant()      
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[EXPR_CONSTANT]);
-  fmask[EXPR_CONSTANT] = 1;
-  fe->addArg(*DvmType_Ref(e));
-  return fe;  
-}
-
-SgExpression *DvmhExprScan(SgExpression *edummy)
-{
-  // generates function call:  dvmh_derived_rhs_expr_scan(const DvmType *pShadowCount, /* const DvmType *pShadowNameStr */...)      
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[EXPR_SCAN]);
-  fmask[EXPR_SCAN] = 1;
-  SgExpression *el = edummy->lhs();
-  SgExpression *eln= NULL;
-  int nsh=0;
-  for(;el;el=el->rhs(),nsh++)
-     eln = AddElementToList(eln,DvmhString(el->lhs()));
-  fe->addArg(*ConstRef_F95(nsh));
-  fe->lhs()->setRhs(eln);
-  return fe;  
-}
-
-SgExpression *DvmhDerivedRhs(SgExpression *erhs)
-{
-  // generates function call: 
-  //   dvmh_derived_rhs(const DvmType templDesc[], const DvmType *pTemplRank, /* const DvmType *pDerivedRhsExprHelper */...);      
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DERIVED_RHS]);
-  fmask[DERIVED_RHS] = 1;
-  fe->addArg(*HeaderRef(erhs->symbol()));
-  SgExpression *el,*e,*eln=NULL;
-  int nr=0;
-  for(el=erhs->lhs();el;el=el->rhs(),nr++)
-  {
-     if(isSgKeywordValExp(el->lhs()))           // "*"
-        e = DvmhExprIgnore();
-     else if(el->lhs()->variant() == DUMMY_REF) // @align-dummy[ + shadow-name ]...
-        e = DvmhExprScan(el->lhs());
-     else                                       // int_expr
-        e = DvmhExprConstant(el->lhs());
-     eln = AddElementToList(eln,e);
-  }
-  fe->addArg(*ConstRef_F95(nr));
-  AddListToList(fe->lhs(),eln);  
-  return fe;  
-}
-
-// -------  Input/Output --------------------------------------------------------------
-
-SgExpression *DvmhConnected(SgExpression *unit, SgExpression *failIfYes) 
-{
-  // generates function call:
-  //               dvmh_ftn_connected(const DvmType *pUnit, const DvmType *pFailIfYes)
-  
-  fmask[FTN_CONNECTED] = 1;
-  
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[FTN_CONNECTED]);
-  fe->addArg(*unit);
-  fe->addArg(*failIfYes);
-  
-  return fe;  
-}
-
-//------ Calls from HOST-procedure(host-handler) for parallel loop --------------------
-
-SgStatement *LoopFillBounds_HH(SgSymbol *loop_s, SgSymbol *sBlow,SgSymbol *sBhigh,SgSymbol *sBstep)
-{// generating subroutine call: loop_fill_bounds(DvmhLoopRef, lowIndex[],highIndex[],stepIndex[]) 
- // DvmhLoopRef - result of loop_create() 
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[FILL_BOUNDS]);  
-  //fmask[FILL_BOUNDS] = 2;
-  call -> addArg(*new SgVarRefExp(loop_s));
-  call -> addArg(* new SgArrayRefExp(*sBlow, *new SgValueExp(1)));
-  call -> addArg(* new SgArrayRefExp(*sBhigh,*new SgValueExp(1)));
-  call -> addArg(* new SgArrayRefExp(*sBstep,*new SgValueExp(1)));
-  return(call);
-}
-
-SgStatement *LoopRedInit_HH(SgSymbol *loop_s, int nred, SgSymbol *sRed,SgSymbol *sLoc)
-{// generating subroutine call: loop_red_init(DvmhLoopRef *InDvmhLoop, DvmType *InRedNum, void *arrayPtr, void *locPtr) 
- // DvmhLoopRef - result of loop_create() 
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[RED_INIT]);  
-  //fmask[RED_INIT] = 2;
-  call -> addArg(*new SgVarRefExp(loop_s));
-  call -> addArg(*ConstRef_F95(nred)); 
-  call -> addArg(* new SgVarRefExp(*sRed));
-  if(sLoc)
-  {  if(isSgArrayType(sLoc->type())) 
-       call -> addArg(*FirstArrayElement(sLoc)); //(* new SgArrayRefExp(*sLoc));
-     else
-       call -> addArg(*new SgVarRefExp(sLoc));
-  }
-  else                  
-    call -> addArg(*ConstRef_F95(0));  
-  return(call);
-}
-
-SgStatement *LoopRedPost_HH(SgSymbol *loop_s, int nred, SgSymbol *sRed,SgSymbol *sLoc)
-{// generating subroutine call: loop_red_post(DvmhLoopRef *InDvmhLoop, DvmType *InRedNum, void *arrayPtr, void *locPtr) 
- // DvmhLoopRef - result of loop_create() 
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[RED_POST]);  
-  //fmask[RED_POST] = 2;
-  call -> addArg(*new SgVarRefExp(loop_s));
-  call -> addArg(*ConstRef_F95(nred)); 
-  call -> addArg(* new SgVarRefExp(*sRed));
-  if(sLoc)
-  {  if(isSgArrayType(sLoc->type())) 
-       call -> addArg(*FirstArrayElement(sLoc)); //(* new SgArrayRefExp(*sLoc));
-     else
-       call -> addArg(*new SgVarRefExp(sLoc));
-  }
-  else
-    call -> addArg(*ConstRef_F95(0));  
-  return(call);
-}
-
-SgExpression *LoopGetSlotCount_HH(SgSymbol *loop_s)
-{// generating function call: loop_get_slot_count(DvmhLoopRef *InDvmhLoop) 
- // DvmhLoopRef - result of loop_create() 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[SLOT_COUNT]);
-  //fmask[SLOT_COUNT] = 1;  
-  fe -> addArg(*new SgVarRefExp(loop_s));
-  return(fe);
-}
-
-SgStatement *FillLocalPart_HH(SgSymbol *loop_s, SgSymbol *shead, SgSymbol *spart)
-{// generating subroutine call: loop_fill_local_part(DvmhLoopRef *InDvmhLoop, long dvmDesc[], IndexType part[])
- 
- // DvmhLoopRef - result of loop_create() 
-  
-  SgCallStmt *call = new SgCallStmt(*fdvm[FILL_LOCAL_PART]);  
-  
-  call -> addArg(*new SgVarRefExp(loop_s));
-  call -> addArg(* new SgArrayRefExp(*shead, *new SgValueExp(1)));
-  call -> addArg(* new SgArrayRefExp(*spart, *new SgValueExp(1)));
-  return(call);
-}
-
-SgStatement *GetRemoteBuf (SgSymbol *loop_s, int n, SgSymbol *s_buf_head)
-{// generating subroutine call: dvmh_loop_get_remote_buf_(const DvmType *pCurLoop, const DvmType *pRmaIndex, DvmType rmaDesc[]);
- 
-  SgCallStmt *call = new SgCallStmt(*fdvm[GET_REMOTE_BUF]);
-  fmask[GET_REMOTE_BUF] = 2;
-  call->addArg(*new SgVarRefExp(loop_s));
-  call->addArg(*ConstRef_F95(n));
-  call->addArg(*new SgArrayRefExp(*s_buf_head));
-  return(call);
-}
-
-//------ Calls from handlers for sequence of statements --------------------
-
-SgExpression *HasLocalElement(SgSymbol *s_loop_ref,SgSymbol *ar, SgSymbol *IndAr)
-{ // generating function call:
-  //                    loop_has_element(DvmhLoopRef *InDvmhLoop, long dvmDesc[], long indexArray[]);
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[HAS_ELEMENT]);
-  fmask[HAS_ELEMENT] = 1;
-  if(!s_loop_ref)
-     s_loop_ref = loop_ref_symb;
-  fe->addArg(* new SgVarRefExp(s_loop_ref));
-                         //if(HEADER(ar)) //DVM-array
-  fe-> addArg(*HeaderRef(ar));
-
-                         //else // replicated array
-                         // call -> addArg(*DVM000(*HEADER_OF_REPLICATED(ar)));
-
-  fe->addArg(* new SgArrayRefExp(*IndAr));
-  return(fe);
-
-}
-
-SgExpression *HasLocalElement_H2(SgSymbol *s_loop_ref, SgSymbol*ar, int n, SgExpression *index_list)
-{ // generating function call:
-  //                    dvmh_loop_has_element_(const DvmType *pCurLoop, const DvmType dvmDesc[], const DvmType *pRank, /* const DvmType *pIndex */...);
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[HAS_ELEMENT_2]);
-  fmask[HAS_ELEMENT_2] = 1;
-  if(!s_loop_ref)
-     s_loop_ref = loop_ref_symb;
-  fe->addArg(* new SgVarRefExp(s_loop_ref));                         
-  fe-> addArg(*HeaderRef(ar));
-  fe->addArg(*ConstRef_F95(n));
-  AddListToList(fe->lhs(),index_list);  
-  
-  return(fe);
-
-}
-
-// ------ Calls from Adapter/Cuda-Handler (C Language) --------------------------------------------------------------
-
-SgExpression *GetNaturalBase(SgSymbol *s_cur_dev,SgSymbol *shead)
-{ // generating function call: dvmh_get_natural_base (DvmType *deviceRef, DvmType dvmDesc[])
-  // or 
-  //                           dvmh_get_natural_base_C(DvmType deviceNum, const DvmType dvmDesc[])
-
-  int fNum = INTERFACE_RTS2 ? GET_BASE_C : GET_BASE;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  if(INTERFACE_RTS2)
-     fe->addArg(* new SgVarRefExp(s_cur_dev));
-  else
-     fe->addArg(SgAddrOp(* new SgVarRefExp(s_cur_dev)));
-  fe->addArg(* new SgArrayRefExp(*shead));
-  return(fe);
-}
-
-SgExpression *GetDeviceAddr(SgSymbol *s_cur_dev,SgSymbol *s_var)
-{ // generating function call: dvmh_get_device_addr (DvmType *deviceRef, void *variable)
-  // or when RTS2 is used
-  //                           dvmh_get_device_addr_C(DvmType deviceNum, const void *addr);
-
-  int fNum = INTERFACE_RTS2 ? GET_DEVICE_ADDR_C : GET_DEVICE_ADDR ;  
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  if(INTERFACE_RTS2)
-     fe->addArg(*new SgVarRefExp(s_cur_dev));
-  else
-     fe->addArg(SgAddrOp(*new SgVarRefExp(s_cur_dev)));
-  fe->addArg(*new SgVarRefExp(*s_var));
-  return(fe);
-}
-
-SgExpression *FillHeader(SgSymbol *s_cur_dev,SgSymbol *sbase,SgSymbol *shead,SgSymbol *sgpuhead)
-{ // generating function call: dvmh_fill_header_(DvmType *deviceRef, void *base, DvmType dvmDesc[], DvmType dvmhDesc[])
-  // or when RTS2 is used
-  //                   DvmType dvmh_fill_header2_(const DvmType *pDeviceNum, const void *baseAddr, const DvmType dvmDesc[], DvmType devHeader[]);     
-
-  int fNum = INTERFACE_RTS2 ? FILL_HEADER_2 : FILL_HEADER ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  
-  fe->addArg(SgAddrOp(*new SgVarRefExp(s_cur_dev)));
-  fe->addArg(* new SgVarRefExp(*sbase));
-  fe->addArg(* new SgArrayRefExp(*shead));
-  fe->addArg(* new SgArrayRefExp(*sgpuhead));
-  return(fe);
-}
-
-SgExpression *FillHeader_Ex(SgSymbol *s_cur_dev,SgSymbol *sbase,SgSymbol *shead,SgSymbol *sgpuhead,SgSymbol *soutType,SgSymbol *sParams)
-{ // generating function call: dvmh_fill_header_ex_(DvmType *deviceRef, void *base, DvmType dvmDesc[], DvmType dvmhDesc[],DvmType *outTypeOfTransformation, DvmType extendedParams[])
-  // or when RTS2 is used    
-  //                   DvmType dvmh_fill_header_ex2_(const DvmType *pDeviceNum, const void *baseAddr, const DvmType dvmDesc[], DvmType devHeader[], DvmType extendedParams[])
-
-  int fNum = INTERFACE_RTS2 ? FILL_HEADER_EX_2 : FILL_HEADER_EX ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  SgExpression *e;  
-  fe->addArg(SgAddrOp(*new SgVarRefExp(s_cur_dev)));
-  fe->addArg(* new SgVarRefExp(*sbase));
-  fe->addArg(* new SgArrayRefExp(*shead));
-  fe->addArg(* new SgArrayRefExp(*sgpuhead));
-  if(!INTERFACE_RTS2)
-     fe->addArg(SgAddrOp(*new SgVarRefExp(soutType)));
-  fe->addArg(* new SgArrayRefExp(*sParams));
-  if(INTERFACE_RTS2)
-     e = &SgAssignOp(*new SgVarRefExp(soutType), *fe);
-
-  return(INTERFACE_RTS2 ? e : fe);
-}
-
-SgExpression *LoopDoCuda(SgSymbol *s_loop_ref,SgSymbol *s_blocks,SgSymbol *s_threads,SgSymbol *s_stream, SgSymbol *s_blocks_info,SgSymbol *s_const)
-{ // generating function call: loop_cuda_do(DvmhLoopRef *InDvmhLoop, dim3 *OutBlocks, void **InOutBlocks, SgExpression *etype)
-  
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DO_CUDA]);
-  
-  fe->addArg(* new SgVarRefExp(s_loop_ref));
-
-  fe->addArg(SgAddrOp(*new SgVarRefExp(*s_blocks)));//(* new SgExpression(ADDRESS_OP,new SgVarRefExp(*s_blocks),NULL);
-  //fe->addArg(* new SgValueExp(0)); //fe->addArg(SgAddrOp(* new SgVarRefExp(*s_threads)));
-  //fe->addArg(* new SgValueExp(0)); //fe->addArg(SgAddrOp(* new SgVarRefExp(*s_stream)));
-  if(s_blocks_info)
-    //fe->addArg(*new SgCastExp(*C_PointerType(C_PointerType(C_VoidType() )), SgAddrOp(* new SgVarRefExp(*s_blocks_info))));
-    fe->addArg(SgAddrOp(* new SgVarRefExp(*s_blocks_info)));
-  else
-    fe->addArg(* new SgValueExp(0));  // for sequence of statements in region
-  fe->addArg(* new SgVarRefExp(s_const));
-  return(fe);
-}
-
-SgFunctionCallExp *CallKernel(SgSymbol *skernel, SgExpression *blosks_threads)
-{// generating Kernel Call:  
- // loop_<file_name>_<loopNo>(InDeviceBaseAddr1,dvmhDesc1[]...,InDeviceBaseAddrN,dvmhDescN[],<uses_vars>,<for_red_vars> ,blocks_info,red_count) 
-    
-  SgExpression *fe = new SgExpression(ACC_CALL_OP);
-  fe->setSymbol(*skernel); 
-  fe->setRhs(*blosks_threads);
-  return((SgFunctionCallExp *)fe);
-}
-
-SgExpression *RegisterReduction(SgSymbol *s_loop_ref, SgSymbol *s_var_num, SgSymbol *s_red, SgSymbol *s_loc)
-{ // generating function call: loop_cuda_register_red(DvmhLoopRef *InDvmhLoop, DvmType InRedNum, void **ArrayPtr, void **LocPtr)
-  // or when RTS2 is used 
-  //                      dvmh_loop_cuda_register_red_C(DvmType curLoop, DvmType redIndex, void **arrayAddrPtr, void **locAddrPtr)
-
-  SgExpression *eloc;
-  int fNum = INTERFACE_RTS2 ? RED_CUDA_C : RED_CUDA ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  if(INTERFACE_RTS2)
-     fe->addArg(SgDerefOp(*new SgVarRefExp(s_loop_ref)));
-  else   
-     fe->addArg(* new SgVarRefExp(s_loop_ref));  
-  fe->addArg(* new SgVarRefExp(s_var_num));  
-  fe->addArg(SgAddrOp(*new SgVarRefExp(*s_red))); 
-  if (s_loc)
-    eloc = &(SgAddrOp(*new SgVarRefExp(*s_loc)));
-  else
-    eloc = new SgValueExp(0);
-  fe->addArg(*eloc); 
-  return( fe);
-}
-
-
-SgExpression *Register_Red(SgSymbol *s_loop_ref, SgSymbol *s_var_num, SgSymbol *s_red_array, SgSymbol *s_loc_array,SgSymbol *s_offset,SgSymbol *s_loc_offset)
-{ // generating function call: loop_cuda_register_red_(DvmhLoopRef *InDvmhLoop, DvmType InRedNumRef,void *InDeviceArrayBaseAddr, void *InDeviceLocBaseAddr,CudaOffsetTypeRef *ArrayOffsetPtr, CudaOffsetTypeRef *LocOffsetPtr)
-
-
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[REGISTER_RED]);
-  
-  fe->addArg(* new SgVarRefExp(s_loop_ref));
- 
-  fe->addArg(SgAddrOp(* new SgVarRefExp(s_var_num)));  
-  fe->addArg(*new SgVarRefExp(*s_red_array));
-  if(s_loc_array)
-    fe->addArg(*new SgVarRefExp(*s_loc_array)); 
-  else
-    fe->addArg(*new SgValueExp(0));
-  fe->addArg(* new SgVarRefExp(s_offset));
-  fe->addArg(* new SgVarRefExp(s_loc_offset));
-  return( fe);
-}
-
-SgExpression *InitReduction(SgSymbol *s_loop_ref,  SgSymbol *s_var_num, SgSymbol *s_red,SgSymbol *s_loc)
-{ // generating function call: loop_red_init_(DvmhLoopRef *InDvmhLoop, Dvmtype *InRedNum, void *arrayPtr, void *locPtr)
-  // or when RTS2 is used  
-  //                      dvmh_loop_red_init_(const DvmType *pCurLoop, const DvmType *pRedIndex, void *arrayAddr, void *locAddr)
-
-  SgExpression *eloc;
-  int fNum = INTERFACE_RTS2 ? RED_INIT_2 : RED_INIT_C ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  
-  fe->addArg(* new SgVarRefExp(s_loop_ref));  
-  fe->addArg(SgAddrOp(* new SgVarRefExp(s_var_num)));
-  fe->addArg(SgAddrOp(* new SgVarRefExp(*s_red)));
-  if (s_loc)
-    eloc = new SgArrayRefExp(*s_loc); //&(SgAddrOp(*new SgVarRefExp(*s_loc)));
-  else
-    eloc = new SgValueExp(0);
-  fe->addArg(*eloc);
-  return(fe);
-}
-
-SgExpression *CudaInitReduction(SgSymbol *s_loop_ref,  SgSymbol *s_var_num,  SgSymbol *s_dev_red,SgSymbol *s_dev_loc) //SgSymbol *s_red,SgSymbol *s_loc,
-{ // generating function call: loop_cuda_red_init_ (DvmhLoopRef *InDvmhLoop, Dvmtype InRedNum, void *arrayPtr, void *locPtr, void **devArrayPtr, void **devLocPtr)
-  // or when RTS2 is used  
-  //                      dvmh_loop_cuda_red_init_C(DvmType curLoop, DvmType redIndex, void **devArrayAddrPtr, void **devLocAddrPtr) 
-
-  SgExpression *eloc;
-  int fNum = INTERFACE_RTS2 ? CUDA_RED_INIT_2 : CUDA_RED_INIT ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  if(INTERFACE_RTS2)
-     fe->addArg(SgDerefOp(*new SgVarRefExp(s_loop_ref)));
-  else   
-     fe->addArg(* new SgVarRefExp(s_loop_ref));
-  fe->addArg(* new SgVarRefExp(s_var_num));
-       //fe->addArg(* new SgVarRefExp(*s_red));
-       //if (s_loc)
-       //  eloc = new SgArrayRefExp(*s_loc); //&(SgAddrOp(*new SgVarRefExp(*s_loc)));
-       //else
-       //  eloc = new SgValueExp(0);
-       //fe->addArg(*eloc);
-  fe->addArg(SgAddrOp(*new SgVarRefExp(s_dev_red)));
-  if (s_dev_loc)
-    eloc = new SgArrayRefExp(*s_dev_loc); //&(SgAddrOp(*new SgVarRefExp(*s_dev_loc)));
-  else
-    eloc = new SgValueExp(0);
-  fe->addArg(*eloc);
-  return(fe);
-}
-
-SgExpression *PrepareReduction(SgSymbol *s_loop_ref,  SgSymbol *s_var_num, SgSymbol *s_count, SgSymbol *s_fill_flag, int fixedCount, int fillFlag)
-{ // generating function call: loop_cuda_red_prepare_(DvmhLoopRef *InDvmhLoop, Dvmtype InRedNumRef, DvmType InCountRef, DvmType InFillFlagRef)
-  // or when RTS2 is used  
-  //                      dvmh_loop_cuda_red_prepare_C(DvmType curLoop, DvmType redIndex, DvmType count, DvmType fillFlag)                                                     
-
-  int fNum = INTERFACE_RTS2 ? RED_PREPARE_C : RED_PREPARE ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  if(INTERFACE_RTS2)
-     fe->addArg(SgDerefOp(*new SgVarRefExp(s_loop_ref)));
-  else   
-     fe->addArg(* new SgVarRefExp(s_loop_ref));
-  fe->addArg(* new SgVarRefExp(s_var_num));
-  if (fixedCount == 0)
-    fe->addArg(* new SgVarRefExp(s_count));
-  else
-    fe->addArg(*new SgValueExp(fixedCount));
-  if (fillFlag == -1)
-    fe->addArg(* new SgVarRefExp(s_fill_flag));
-  else
-    fe->addArg(* new SgValueExp(fillFlag));
-  return(fe);
-}
-
-SgExpression *FinishReduction(SgSymbol *s_loop_ref,  SgSymbol *s_var_num)
-{ // generating function call: loop_red_finish_(DvmhLoopRef *InDvmhLoop, DvmType InRedNumRef)
-  // or when RTS2 is used  
-  //                           dvmh_loop_cuda_red_finish_C(DvmType curLoop, DvmType redIndex)
-
-  int fNum = INTERFACE_RTS2 ? RED_FINISH_C : RED_FINISH ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  if(INTERFACE_RTS2)
-     fe->addArg(SgDerefOp(*new SgVarRefExp(s_loop_ref)));
-  else   
-     fe->addArg(* new SgVarRefExp(s_loop_ref));
-  fe->addArg(* new SgVarRefExp(s_var_num));
-  return(fe);
-}
-
-
-SgExpression *LoopSharedNeeded(SgSymbol *s_loop_ref, SgExpression *ecount)
-{ // generating function call: loop_cuda_shared_needed_(DvmhLoopRef *InDvmhLoop, DvmType *count)
-  
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[SHARED_NEEDED]);
-  
-  fe->addArg(* new SgVarRefExp(s_loop_ref));
-  fe->addArg(*ecount);
-  return(fe);
-}
-
-SgExpression *GetLocalPart(SgSymbol *s_loop_ref, SgSymbol *shead, SgSymbol *s_const)
-{ // generating function call:
-  //             void * loop_cuda_get_local_part (DvmhLoopRef *InDvmhLoop, DvmType dvmDesc[], DvmType indexType);
-  // or when RTS2 is used  
-  //         void *dvmh_loop_cuda_get_local_part_C(DvmType curLoop, const DvmType dvmDesc[], DvmType indexType)
-
-  int fNum = INTERFACE_RTS2 ? GET_LOCAL_PART_C : GET_LOCAL_PART ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  if(INTERFACE_RTS2)
-     fe->addArg(SgDerefOp(*new SgVarRefExp(s_loop_ref)));
-  else   
-     fe->addArg(* new SgVarRefExp(s_loop_ref));  
-  fe->addArg(* new SgArrayRefExp(*shead));
-  fe->addArg(* new SgVarRefExp(s_const));
-  return(fe);
-
-}
-
-SgExpression *GetDeviceNum(SgSymbol *s_loop_ref)
-{ // generating function call:
-  //                       DvmType  loop_get_device_num_ (DvmhLoopRef *InDvmhLoop)
-  // or when RTS2 is used
-  //                       DvmType dvmh_loop_get_device_num_C ( DvmType curLoop)
-  
-  int  fNum = INTERFACE_RTS2 ? GET_DEVICE_NUM_2 : GET_DEVICE_NUM ; 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  if(INTERFACE_RTS2)
-     fe->addArg(SgDerefOp(*new SgVarRefExp(s_loop_ref)));
-  else   
-     fe->addArg(* new SgVarRefExp(s_loop_ref));  
-  return(fe);
-
-}
-
-SgExpression *GetOverallStep(SgSymbol *s_loop_ref)
-{ // generating function call:
-  //                           loop_cuda_get_red_step (DvmhLoopRef *InDvmhLoop)
-                                          //DvmType loop_get_overall_blocks_(DvmhLoopRef *InDvmhLoop)
- 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GET_OVERALL_STEP]);
-  
-  fe->addArg(* new SgVarRefExp(s_loop_ref));
-  
-  return(fe);
-
-}
-
-SgExpression *FillBounds(SgSymbol *loop_s, SgSymbol *sBlow,SgSymbol *sBhigh,SgSymbol *sBstep)
-{// generating function call: 
- //                               loop_fill_bounds_(DvmType *InDvmhLoop, DvmType lowIndex[], DvmType highIndex[], DvmType stepIndex[]) 
- // DvmhLoopRef - result of loop_create()
- // or when RTS2 is used   
- //                          dvmh_loop_fill_bounds_(const DvmType *pCurLoop, DvmType boundsLow[], DvmType boundsHigh[], DvmType loopSteps[]);  
-
-  int fNum = INTERFACE_RTS2 ? FILL_BOUNDS_2 : FILL_BOUNDS_C ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);  
-                             
-  fe -> addArg(* new SgVarRefExp(loop_s));
-  fe -> addArg(* new SgVarRefExp(sBlow));
-  fe -> addArg(* new SgVarRefExp(sBhigh));
-  if(sBstep)
-    fe -> addArg(* new SgVarRefExp(sBstep));
-  else
-    fe -> addArg(* new SgValueExp(0));
-  return(fe);
-}
-
-SgExpression *LoopGetRemoteBuf(SgSymbol *loop_s, int n, SgSymbol *s_buf_head) 
-{// generating function call: dvmh_loop_get_remote_buf_(const DvmType *pCurLoop, const DvmType *pRmaIndex, DvmType rmaDesc[]);
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GET_REMOTE_BUF_C]);
-  fe->addArg(SgDerefOp(*new SgVarRefExp(loop_s)));
-  fe->addArg(*new SgValueExp(n));
-  fe->addArg(*new SgArrayRefExp(*s_buf_head));
-  return(fe);
-}
- 
-SgExpression *RedPost(SgSymbol *loop_s, SgSymbol *s_var_num, SgSymbol *sRed,SgSymbol *sLoc)
-{// generating function call: 
- //                         void  loop_red_post_(DvmhLoopRef *InDvmhLoop, DvmType *InRedNum, void *arrayPtr, void *locPtr) 
- // DvmhLoopRef - result of loop_create() 
- // or when RTS2 is used      
- //                     void dvmh_loop_red_post_(const DvmType *pCurLoop, const DvmType *pRedIndex, const void *arrayAddr, const void *locAddr)   
-
-  int fNum = INTERFACE_RTS2 ? RED_POST_2 : RED_POST_C ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);  
-  
-  fe->addArg(* new SgVarRefExp(loop_s));
-  fe->addArg(SgAddrOp(* new SgVarRefExp(s_var_num)));
-  fe->addArg(SgAddrOp(* new SgVarRefExp(sRed)));
-  if(sLoc)
-    fe -> addArg(*new SgArrayRefExp(*sLoc));
-  else
-    fe -> addArg(*new SgValueExp(0));  
-
-  return(fe);
-}
-
-SgExpression *CudaReplicate(SgSymbol *Addr, SgSymbol *recordSize, SgSymbol *quantity, SgSymbol *devPtr)
-{// generating function call: 
- //                         void dvmh_cuda_replicate_(void *addr, DvmType recordSize, DvmType quantity, void *devPtr) 
- //     
-   
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CUDA_REPLICATE]);  
-  
-  fe->addArg(SgAddrOp(* new SgVarRefExp(Addr)));
-  fe->addArg(* new SgVarRefExp(recordSize));
-  fe->addArg(* new SgVarRefExp(quantity));
-  fe->addArg(* new SgVarRefExp(devPtr));
-
-  return(fe);
-}
-
-SgExpression *GetDependencyMask(SgSymbol *s_loop_ref) 
-{ // generating function call:
-  //                       DvmType loop_get_dependency_mask_(DvmhLoopRef *InDvmhLoop)
-  // or when RTS2 is used   
-  //                  DvmType dvmh_loop_get_dependency_mask_(const DvmType *pCurLoop)
-
-  int fNum = INTERFACE_RTS2 ? GET_DEP_MASK_2 : GET_DEP_MASK ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  
-  fe->addArg(* new SgVarRefExp(s_loop_ref));
-  
-  return(fe);
-
-}
-
-SgExpression *CudaTransform(SgSymbol *s_loop_ref, SgSymbol *s_head, SgSymbol *s_BackFlag, SgSymbol *s_headH, SgSymbol *s_addrParam) 
-{ // generating function call:
-  //                       DvmType loop_cuda_transform_(DvmhLoopRef *InDvmhLoop, DvmType dvmDesc[], DvmhLoopRef *backFlagRef, DvmType dvmhDesc[], DvmType addressingParams[])
- 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CUDA_TRANSFORM]);
-  
-  fe->addArg(* new SgVarRefExp(s_loop_ref));
-  fe->addArg(* new SgArrayRefExp(*s_head));  
-  fe->addArg(SgAddrOp(*new SgVarRefExp(s_BackFlag)));
-  fe->addArg(* new SgArrayRefExp(*s_headH));
-  fe->addArg(* new SgArrayRefExp(*s_addrParam));  
-  return(fe);
-}
-
-SgExpression *CudaAutoTransform(SgSymbol *s_loop_ref, SgSymbol *s_head) 
-{ // generating function call:
-  //                       DvmType loop_cuda_autotransform(DvmhLoopRef *InDvmhLoop, DvmType dvmDesc[])
-  // or when RTS2 is used  
-  //                       DvmType dvmh_loop_autotransform_(const DvmType *pCurLoop, DvmType dvmDesc[])
-
-  int fNum = INTERFACE_RTS2 ? LOOP_AUTOTRANSFORM : CUDA_AUTOTRANSFORM ;
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-  
-  fe->addArg(* new SgVarRefExp(s_loop_ref));
-  fe->addArg(* new SgArrayRefExp(*s_head));  
-  return(fe);
-}
-
-SgExpression *ApplyOffset(SgSymbol *s_head, SgSymbol *s_base, SgSymbol *s_headH) 
-{ // generating function call:
-  //                       dvmh_apply_offset(DvmType dvmDesc[], void *base, DvmType dvmhDesc[])
- 
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[APPLY_OFFSET]);
-  
-  fe->addArg(* new SgArrayRefExp(*s_head));  
-  fe->addArg(* new SgVarRefExp(s_base));
-  fe->addArg(* new SgArrayRefExp(*s_headH)); 
-  return(fe);
-
-}
-
-SgExpression *GetConfig(SgSymbol *s_loop_ref,SgSymbol *s_shared_perThread,SgSymbol *s_regs_perThread,SgSymbol *s_threads,SgSymbol *s_stream, SgSymbol *s_shared_perBlock)
-{ // generating function call: void loop_cuda_get_config_ (DvmhLoopRef *InDvmhLoop, DvmType InSharedPerThread, DvmType InRegsPerThread, dim3 *OutThreads, cudaStream_t *OutStream, DvmType *OutSharedPerBlock)
-  // or when RTS2 is used  
-  //                           dvmh_loop_cuda_get_config_C(DvmType curLoop, DvmType sharedPerThread, DvmType regsPerThread, void *inOutThreads, void *outStream,DvmType *outSharedPerBlock)
-
-  int fNum = INTERFACE_RTS2 ? GET_CONFIG_C : GET_CONFIG ;  
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]);
-
-  if(INTERFACE_RTS2)
-     fe->addArg(SgDerefOp(*new SgVarRefExp(s_loop_ref)));
-  else     
-     fe->addArg(* new SgVarRefExp(s_loop_ref));
-  if(s_shared_perThread)
-    fe->addArg(*new SgVarRefExp(*s_shared_perThread));
-  else
-    fe->addArg(*new SgValueExp(0));
-  if(s_regs_perThread)
-    fe->addArg(*new SgVarRefExp(*s_regs_perThread));
-  else
-    fe->addArg(*new SgValueExp(0));
-
-  fe->addArg(SgAddrOp(* new SgVarRefExp(*s_threads)));
-  fe->addArg(SgAddrOp(* new SgVarRefExp(*s_stream)));
-  if(s_shared_perBlock)
-    fe->addArg(SgAddrOp(* new SgVarRefExp(*s_shared_perBlock)));
-  else
-    fe->addArg(* new SgValueExp(0));  
-  return(fe);
-}
-
-SgExpression *ChangeFilledBounds(SgSymbol *s_low,SgSymbol *s_high,SgSymbol *s_idx, SgSymbol *s_n,SgSymbol *s_dep,SgSymbol *s_type,SgSymbol *s_idxs)
-{// generating function call: 
- //                         void dvmh_change_filled_bounds(DvmType *low, DvmType *high, DvmType *idx, DvmType n, DvmType dep, DvmType type_of_run, DvmType *idxs); 
- //                              dvmh_change_filled_bounds_C(DvmType boundsLow[], DvmType boundsHigh[], DvmType loopSteps[], DvmType rank, DvmType depMask, DvmType idxPerm[])  
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[CHANGE_BOUNDS]);  
-  
-  fe -> addArg(* new SgVarRefExp(s_low));
-  fe -> addArg(* new SgVarRefExp(s_high));
-  fe -> addArg(* new SgVarRefExp(s_idx));
-  fe -> addArg(* new SgVarRefExp(s_n));
-  fe -> addArg(* new SgVarRefExp(s_dep));
-  fe -> addArg(* new SgVarRefExp(s_type));
-  fe -> addArg(* new SgVarRefExp(s_idxs));
-  return(fe);
-}
-
-SgExpression *GuessIndexType(SgSymbol *s_loop_ref)
-{// generating function call: 
- //                         loop_guess_index_type_(DvmhLoopRef *InDvmhLoop) 
- // or when RTS2 is used  
- //                    dvmh_loop_guess_index_type_C(DvmType *curLoop)
-
-  int fNum = INTERFACE_RTS2 ? GUESS_INDEX_TYPE_2 : GUESS_INDEX_TYPE ;  
-  SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[fNum]); 
-  if(INTERFACE_RTS2)
-     fe->addArg(SgDerefOp(*new SgVarRefExp(s_loop_ref)));
-  else   
-     fe->addArg(*new SgVarRefExp(s_loop_ref));  
-  return(fe);
-}
-
-SgExpression *RtcSetLang(SgSymbol *s_loop_ref, const int lang)
-{// generating function call: 
- //                         loop_cuda_rtc_set_lang(DvmType *InDvmhLoop, DvmType lang) 
-
-    SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[RTC_SET_LANG]);
-
-    fe->addArg(*new SgVarRefExp(s_loop_ref));
-    if (lang == 0)
-        fe->addArg(*new SgKeywordValExp("FORTRAN_CUDA"));
-    else if (lang == 1)
-        fe->addArg(*new SgKeywordValExp("C_CUDA")); 
-    else
-        fe->addArg(*new SgKeywordValExp("UNKNOWN_CUDA")); 
-    return(fe);
-}
-
-SgExpression *GetDeviceProp(SgSymbol *s_loop_ref, SgExpression *ep)
-{// generating function call: 
- //                         DvmType loop_cuda_get_device_prop(DvmType *InDvmhLoop, DvmType prop);
-                        
-    SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GET_DEVICE_PROP]);
-
-    fe->addArg(*new SgVarRefExp(s_loop_ref));
-    fe->addArg(*ep);
-    return(fe);
-}
-
-SgExpression *GetMaxBlocks(SgSymbol *s_loop_ref, SgSymbol *s_max_blocks, SgSymbol *s_needed_bytes)
-{// generating function call: 
- //                         DvmType loop_cuda_get_max_blocks(DvmType *InDvmhLoop, DvmType maxBlocks, DvmType neededBytesForBlock) 
-
-    SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GET_MAX_BLOCKS]);
-
-    fe->addArg(*new SgVarRefExp(s_loop_ref));
-    fe->addArg(*new SgVarRefExp(s_max_blocks));
-    fe->addArg(*new SgVarRefExp(s_needed_bytes));
-    return(fe);
-}
-
-SgExpression *GetPrivateArray(SgSymbol *s_loop_ref, SgExpression *e_bytes)
-{// generating function call: 
- //                         DvmType *loop_cuda_get_private_array(DvmType *InDvmhLoop, UDvmType neededBytes)
-
-    SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[GET_PRIVATE_ARR]);
-
-    fe->addArg(*new SgVarRefExp(s_loop_ref));
-    fe->addArg(*e_bytes);
-    return(fe);
-}
-
-SgExpression *DisposePrivateArray(SgSymbol *s_loop_ref, SgSymbol *s_array)
-{// generating function call: 
- //                         void loop_cuda_dispose_private_array(DvmType *InDvmhLoop, void *array)
-
-    SgFunctionCallExp *fe = new SgFunctionCallExp(*fdvm[DISPOSE_PRIVATE_AR]);
-
-    fe->addArg(*new SgVarRefExp(s_loop_ref));
-    fe->addArg(*new SgVarRefExp(s_array));
-    return(fe);
-}
-
-SgExpression* GetWarpSize(SgSymbol* s_loop_ref)
-{// generating function call: 
- //                         int dvmh_get_warp_size(DvmType *InDvmhLoop)
-
-    SgFunctionCallExp* fe = new SgFunctionCallExp(*fdvm[GET_WARP_SIZE]);
-
-    fe->addArg(*new SgVarRefExp(s_loop_ref));
-    return(fe);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/help.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/help.cpp
deleted file mode 100644
index e415a46..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/help.cpp
+++ /dev/null
@@ -1,1070 +0,0 @@
-/**************************************************************\
-* Fortran DVM                                                  *
-*                                                              *
-*            Miscellaneous help routines                       *
-\**************************************************************/
-
-#include "dvm.h"
-#include <ctype.h>
-#include <stdlib.h>
-extern "C" PTR_SYMB last_file_symbol;
-//*************************************************************
-/*
-* Error - formats the error message then call "err" to print it
-*
-* input:
-*	  s - string that specifies the conversion format
-*	  t - string that to be formated according to s
-*        num  - error message number
-*        stmt - pointer to the statement
-*/
-//*************************************************************
-void Error(const char *s, const char *t, int num, SgStatement *stmt)
-
-{
-    char *buff = new char[strlen(t) + strlen(s) + 8];
-    sprintf(buff, s, t);
-    err(buff, num, stmt);
-
-    delete []buff;
-}
-
-/*
-* Err_g - formats and prints the special kind error message (without statement reference)
-*
-* input:
-*	  s - string that specifies the conversion format
-*	  t - string that to be formated according to s
-*        num  - error message number
-*/
-
-void Err_g(const char *s, const char *t, int num)
-
-{
-    char *buff = new char[strlen(t) + strlen(s) + 8];
-    char num3s[4];
-    sprintf(buff, s, t);
-    format_num(num, num3s);
-    err_cnt++;
-    (void)fprintf(stderr, "Error %s in   %s  of %s: %s\n", num3s, cur_func->symbol()->identifier(), cur_func->fileName(), buff);
-    delete []buff;
-}
-
-/*
-* err_p -- prints the special kind error message (with procedure reference)
-*
-* input:
-*	  s - string to be printed out
-*        num  - error message number
-*        name - procedure identifier
-*/
-void err_p(const char *s, const char *name, int num)
-
-{
-    char num3s[4];
-    format_num(num, num3s);
-    err_cnt++;
-    
-    (void)fprintf(stderr, "Error %s in procedure %s: %s \n", num3s, name, s);
-}
-
-/*
-* err -- prints the error message
-*
-* input:
-*	  s - string to be printed out
-*        num  - error message number
-*        stmt - pointer to the statement
-*/
-void err(const char *s, int num, SgStatement *stmt)
-
-{
-    char num3s[4];
-    format_num(num, num3s);
-    err_cnt++;
-    //  printf( "Error on line %d : %s\n", stmt->lineNumber(),  s);
-    (void)fprintf(stderr, "Error %s on line %d of %s: %s\n", num3s, stmt->lineNumber(), stmt->fileName(), s);
-}
-
-/*
-* Warning -- formats a warning message then call "warn" to print it out
-*
-* input:
-*	  s - string that specifies the conversion format
-*	  t - string that to be converted according to s
-*        num  - warning message number
-*        stmt - pointer to the statement
-*/
-void Warning(const char *s, const char *t, int num, SgStatement *stmt)
-{
-    char *buff = new char[strlen(t) + strlen(s) + 8];
-    sprintf(buff, s, t);
-    warn(buff, num, stmt);
-
-    delete []buff;
-}
-
-/*
-* warn -- print the warning message if specified
-*
-* input:
-*	  s - string to be printed
-*        num  - warning message number
-*        stmt - pointer to the statement
-*/
-void warn(const char *s, int num, SgStatement *stmt)
-{
-    char num3s[4];
-    format_num(num, num3s);
-    // printf( "Warning on line %d: %s\n", stmt->lineNumber(), s);
-    (void)fprintf(stderr, "Warning %s on line %d of %s: %s\n", num3s, stmt->lineNumber(), stmt->fileName(), s);
-
-}
-
-void Warn_g(const char *s, const char *t, int num)
-{
-    char *buff = new char[strlen(t) + strlen(s) + 8];
-    char num3s[4];
-    format_num(num, num3s);
-    sprintf(buff, s, t);
-    (void)fprintf(stderr, "Warning %s in   %s  of %s: %s\n", num3s, cur_func->symbol()->identifier(), cur_func->fileName(), buff);
-    delete []buff;
-}
-
-//*********************************************************************
-void printVariantName(int i)
-{
-    if ((i >= 0 && i < MAXTAGS) && tag[i]) 
-        printf("%s", tag[i]);
-    else 
-        printf("not a known node variant");
-}
-//***********************************
-
-//TODO: allocate buffer dynamically!
-#define BUFLEN 500000
-static char buffer[BUFLEN], *bp;
-#define binop(n)	(n >= EQ_OP && n <= NEQV_OP)
-
-static const char *fop_name[] = {
-    " .eq. ",
-    " .lt. ",
-    " .gt. ",
-    " .ne. ",
-    " .le. ",
-    " .ge. ",
-    " + ",
-    " - ",
-    " .or. ",
-    " * ",
-    " / ",
-    "",
-    " .and. ",
-    "**",
-    "",
-    " // ",
-    " .xor. ",
-    " .eqv. ",
-    " .neqv. "
-};
-
-
-/*
-* Precedence table of operators for Fortran
-*/
-static char  precedence[] = {	/* precedence table of the operators */
-    5,		/* .eq. */
-    5,		/* .lt. */
-    5,		/* .gt. */
-    5,		/* .ne. */
-    5,		/* .le. */
-    5,		/* .ge. */
-    3,		/*  +   */
-    3,		/*  -   */
-    8,		/* .or. */
-    2,		/*  *   */
-    2,		/*  /   */
-    0,		/* none */
-    7,		/* .and. */
-    1,		/*  **  */
-    0,		/* none */
-    4,		/*  //  */
-    8,		/* .xor. */
-    9,		/* .eqv. */
-    9		/* .neqv. */
-};
-
-
-/*
-* Type names in ascii form
-*/
-/*static const char *ftype_name[] = {
-    "integer",
-    "real",
-    "double precision",
-    "character",
-    "logical",
-    "character",
-    "gate",
-    "event",
-    "sequence",
-    "",
-    "",
-    "",
-    "",
-    "complex",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "",
-    "double complex"
-};*/
-
-/****************************************************************
-*								*
-*  addstr -- add the string "s" to output buffer		*
-*								*
-*  Input:							*
-*	   s  - the string to be appended to the buffer		*
-*								*
-*  Side effect:						*
-*	   bp - points to where next character will go		*
-*								*
-****************************************************************/
-void addstr(const char *s)
-{
-    while ((*bp = *s++) != 0)
-        bp++;
-}
-
-/****************************************************************
-*								*
-*  unp_llnd -- unparse the given low level node to source	*
-*		string						*
-*								*
-*  Input:							*
-*	   pllnd - low level node to be unparsed		*
-*	   bp (implicitely) - where the output string to be	*
-*		   placed					*
-*								*
-*  Output:							*
-*	   the unparse string where "bp" was pointed to		*
-*								*
-*  Side Effect:						*
-*	   "bp" will be updated to the next character behind	*
-*	   the end of the unparsed string (by "addstr")		*
-*								*
-****************************************************************/
-void unp_llnd(PTR_LLND pllnd)
-{
-    if (pllnd == NULL) 
-        return;
-
-    switch (pllnd->variant)
-    {
-    case INT_VAL:
-    { char sb[64];
-
-    sprintf(sb, "%d", pllnd->entry.ival);
-    addstr(sb);
-    break;
-    }
-    case LABEL_REF:
-    { char sb[64];
-
-    sprintf(sb, "%d", (int)pllnd->entry.label_list.lab_ptr->stateno);
-    addstr(sb);
-    break;
-    }
-    case FLOAT_VAL:
-    case DOUBLE_VAL:
-    case STMT_STR:
-        addstr(pllnd->entry.string_val);
-        break;
-    case STRING_VAL:
-        *bp++ = '\'';
-        addstr(pllnd->entry.string_val);
-        *bp++ = '\'';
-        break;
-    case COMPLEX_VAL:
-        *bp++ = '(';
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        *bp++ = ',';
-        unp_llnd(pllnd->entry.Template.ll_ptr2);
-        *bp++ = ')';
-        break;
-    case KEYWORD_VAL:
-        addstr(pllnd->entry.string_val);
-        break;
-    case KEYWORD_ARG:
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        addstr("=");
-        unp_llnd(pllnd->entry.Template.ll_ptr2);
-        break;
-    case BOOL_VAL:
-        if (pllnd->entry.bval)
-            addstr(".TRUE.");
-        else
-            addstr(".FALSE.");
-        break;
-    case CHAR_VAL:
-        /* if (! in_impli)  */
-        *bp++ = '\'';
-        *bp++ = pllnd->entry.cval;
-        /* if (! in_impli)  */
-        *bp++ = '\'';
-        break;
-    case CONST_REF:
-    case VAR_REF:
-    case ENUM_REF:
-    case TYPE_REF:
-    case INTERFACE_REF:
-        addstr(pllnd->entry.Template.symbol->ident);
-        /* Look out !!!! */
-        /* Purpose unknown. Commented out. */
-        /*
-        if (pllnd->entry.Template.symbol->type->entry.Template.ranges != LLNULL)
-        unp_llnd(pllnd->entry.Template.symbol->type->entry.Template.ranges);
-        */
-        break;
-    case ARRAY_REF:
-        addstr(pllnd->entry.array_ref.symbol->ident);
-        if (pllnd->entry.array_ref.index) {
-            *bp++ = '(';
-            unp_llnd(pllnd->entry.array_ref.index);
-            *bp++ = ')';
-        }
-        break;
-    case ARRAY_OP:
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        *bp++ = '(';
-        unp_llnd(pllnd->entry.Template.ll_ptr2);
-        *bp++ = ')';
-        break;
-    case RECORD_REF:
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        addstr("%");
-        unp_llnd(pllnd->entry.Template.ll_ptr2);
-        break;
-    case STRUCTURE_CONSTRUCTOR:
-        addstr(pllnd->entry.Template.symbol->ident);
-        *bp++ = '(';
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        *bp++ = ')';
-        break;
-    case CONSTRUCTOR_REF:
-        addstr("(/");
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        addstr("/)");
-        break;
-    case ACCESS_REF:
-        unp_llnd(pllnd->entry.access_ref.access);
-        if (pllnd->entry.access_ref.index != NULL) {
-            *bp++ = '(';
-            unp_llnd(pllnd->entry.access_ref.index);
-            *bp++ = ')';
-        }
-        break;
-    case OVERLOADED_CALL:
-        break;
-    case CONS:
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        addstr(",");
-        unp_llnd(pllnd->entry.Template.ll_ptr2);
-        break;
-    case ACCESS:
-        unp_llnd(pllnd->entry.access.array);
-        addstr(", FORALL=(");
-        addstr(pllnd->entry.access.control_var->ident);
-        *bp++ = '=';
-        unp_llnd(pllnd->entry.access.range);
-        *bp++ = ')';
-        break;
-    case IOACCESS:
-        *bp++ = '(';
-        unp_llnd(pllnd->entry.ioaccess.array);
-        addstr(", ");
-        addstr(pllnd->entry.ioaccess.control_var->ident);
-        *bp++ = '=';
-        unp_llnd(pllnd->entry.ioaccess.range);
-        *bp++ = ')';
-        break;
-    case PROC_CALL:
-    case FUNC_CALL:
-        addstr(pllnd->entry.proc.symbol->ident);
-        *bp++ = '(';
-        unp_llnd(pllnd->entry.proc.param_list);
-        *bp++ = ')';
-        break;
-    case EXPR_LIST:
-        unp_llnd(pllnd->entry.list.item);
-        /* if (in_param) {
-        addstr("=");
-        unp_llnd(pllnd->entry.list.item->entry.const_ref.symbol->entry.const_value);
-        }
-        */
-        if (pllnd->entry.list.next) {
-            addstr(",");
-            unp_llnd(pllnd->entry.list.next);
-        }
-        break;
-    case EQUI_LIST:
-        *bp++ = '(';
-        unp_llnd(pllnd->entry.list.item);
-        *bp++ = ')';
-        if (pllnd->entry.list.next) {
-            addstr(", ");
-            unp_llnd(pllnd->entry.list.next);
-        }
-        break;
-    case COMM_LIST:
-    case NAMELIST_LIST:
-        if (pllnd->entry.Template.symbol) {
-            *bp++ = '/';
-            addstr(pllnd->entry.Template.symbol->ident);
-            *bp++ = '/';
-        }
-        unp_llnd(pllnd->entry.list.item);
-        if (pllnd->entry.list.next) {
-            addstr(", ");
-            unp_llnd(pllnd->entry.list.next);
-        }
-        break;
-    case VAR_LIST:
-    case RANGE_LIST:
-    case CONTROL_LIST:
-        unp_llnd(pllnd->entry.list.item);
-        if (pllnd->entry.list.next) {
-            addstr(",");
-            unp_llnd(pllnd->entry.list.next);
-        }
-        break;
-    case DDOT:
-        if (pllnd->entry.binary_op.l_operand)
-            unp_llnd(pllnd->entry.binary_op.l_operand);
-        *bp++ = ':';
-        if (pllnd->entry.binary_op.r_operand)
-            unp_llnd(pllnd->entry.binary_op.r_operand);
-        break;
-    case DEFAULT:
-        addstr("default");
-        break;
-    case DEF_CHOICE:
-    case SEQ:
-        unp_llnd(pllnd->entry.seq.ddot);
-        if (pllnd->entry.seq.stride) {
-            *bp++ = ':';
-            unp_llnd(pllnd->entry.seq.stride);
-        }
-        break;
-    case SPEC_PAIR:
-        unp_llnd(pllnd->entry.spec_pair.sp_label);
-        *bp++ = '=';
-        unp_llnd(pllnd->entry.spec_pair.sp_value);
-        break;
-    case EQ_OP:
-    case LT_OP:
-    case GT_OP:
-    case NOTEQL_OP:
-    case LTEQL_OP:
-    case GTEQL_OP:
-    case ADD_OP:
-    case SUBT_OP:
-    case OR_OP:
-    case MULT_OP:
-    case DIV_OP:
-    case MOD_OP:
-    case AND_OP:
-    case EXP_OP:
-    case CONCAT_OP:
-    {
-                      int i = pllnd->variant - EQ_OP, j;
-                      PTR_LLND p;
-                      int num_paren = 0;
-
-                      p = pllnd->entry.binary_op.l_operand;
-                      j = p->variant;
-                      if (binop(j) && precedence[i] < precedence[j - EQ_OP]) {
-                          num_paren++;
-                          *bp++ = '(';
-                      }
-                      unp_llnd(p);
-                      if (num_paren) {
-                          *bp++ = ')';
-                          num_paren--;
-                      }
-                      addstr(fop_name[i]); /* print the op name */
-                      p = pllnd->entry.binary_op.r_operand;
-                      j = p->variant;
-                      if (binop(j) && precedence[i] <= precedence[j - EQ_OP]) {
-                          num_paren++;
-                          *bp++ = '(';
-                      }
-                      unp_llnd(p);
-                      if (num_paren) {
-                          *bp++ = ')';
-                          num_paren--;
-                      }
-                      break;
-    }
-    case MINUS_OP:
-        addstr(" -(");
-        unp_llnd(pllnd->entry.unary_op.operand);
-        *bp++ = ')';
-        break;
-    case UNARY_ADD_OP:
-        addstr(" +(");
-        unp_llnd(pllnd->entry.unary_op.operand);
-        *bp++ = ')';
-        break;
-    case NOT_OP:
-        addstr(" .not. (");
-        unp_llnd(pllnd->entry.unary_op.operand);
-        *bp++ = ')';
-        break;
-    case PAREN_OP:
-        addstr("(");
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        addstr(")");
-    case ASSGN_OP:
-        addstr("=");
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-    case STAR_RANGE:
-        addstr(" : ");
-        break;
-    case OMP_THREADPRIVATE: /*OMP*/
-        addstr(" / "); /*OMP*/
-        unp_llnd(pllnd->entry.Template.ll_ptr1); /*OMP*/
-        addstr(" / "); /*OMP*/
-        break; /*OMP*/
-        /*	case IMPL_TYPE:
-        pr_ftype_name(pllnd->type, 1);
-        if (pllnd->entry.Template.ll_ptr1 != LLNULL)
-        {
-        addstr("(");
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        addstr(")");
-        }
-        break;
-        */
-        /*
-        case ORDERED_OP :
-        addstr("ordered ");
-        break;
-        case EXTEND_OP :
-        addstr("extended ");
-        break;
-        case MAXPARALLEL_OP:
-        addstr("max parallel = ");
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        break;
-        case PARAMETER_OP :
-        addstr("parameter ");
-        break;
-        case PUBLIC_OP :
-        addstr("public ");
-        break;
-        case PRIVATE_OP :
-        addstr("private ");
-        break;
-        case ALLOCATABLE_OP :
-        addstr("allocatable ");
-        break;
-        case DIMENSION_OP :
-        addstr("dimension (");
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        addstr(")");
-        break;
-        case EXTERNAL_OP :
-        addstr("external ");
-        break;
-        case OPTIONAL_OP :
-        addstr("optional ");
-        break;
-        case IN_OP :
-        addstr("intent (in) ");
-        break;
-        case OUT_OP :
-        addstr("intent (out) ");
-        break;
-        case INOUT_OP :
-        addstr("intent (inout) ");
-        break;
-        case INTRINSIC_OP :
-        addstr("intrinsic ");
-        break;
-        case POINTER_OP :
-        addstr("pointer ");
-        break;
-        case SAVE_OP :
-        addstr("save ");
-        break;
-        case TARGET_OP :
-        addstr("target ");
-        break;
-        */
-    case LEN_OP:
-        addstr("*");
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        break;
-        /*	case TYPE_OP :
-        pr_ftype_name(pllnd->type, 1);
-        unp_llnd(pllnd->type->entry.Template.ranges);
-        break;
-        */
-        /*
-        case ONLY_NODE :
-        addstr("only: ");
-        if (pllnd->entry.Template.ll_ptr1)
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        break;
-        case DEREF_OP :
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        break;
-        case RENAME_NODE :
-        unp_llnd(pllnd->entry.Template.ll_ptr1);
-        addstr("=>");
-        unp_llnd(pllnd->entry.Template.ll_ptr2);
-        break;
-        case VARIABLE_NAME :
-        addstr(pllnd->entry.Template.symbol->ident);
-        break;
-        */
-    default:
-        fprintf(stderr, "Error: unp_llnd -- bad llnd_ptr %d!\n", pllnd->variant);
-        break;
-    }
-}
-
-/****************************************************************
-*								*
-*  funparse_llnd -- unparse the low level node for Fortran	*
-*								*
-*  input:							*
-*	   llnd -- the node to be unparsed			*
-*								*
-*  output:							*
-*	   the unparsed string					*
-*								*
-****************************************************************/
-char* funparse_llnd(PTR_LLND llnd)
-{
-    int len;
-    char *p;
-
-    bp = buffer;	/* reset the buffer pointer */
-    unp_llnd(llnd);
-    /*  *bp++ = '\n'; */
-    *bp++ = '\0';
-    len = (bp - buffer) + 1; /* calculate the string length */
-    p = (char *)malloc(len);	/* allocate space for returned value */
-    strcpy(p, buffer); 	/* copy the buffer for output */
-    *buffer = '\0';
-    return p;
-}
-
-char *UnparseExpr(SgExpression *e)
-{
-    char *buf;
-
-    if (isSgVarRefExp(e) || (isSgArrayRefExp(e) && (!(e->lhs()) || d_no_index)))
-        return (e->symbol()->identifier());
-
-    buf = funparse_llnd(e->thellnd);
-    return buf;
-}
-/*
-char *UnparseExpr(SgExpression *e)
-{char *buf;
-
-int l;
-if(isSgVarRefExp(e) || (isSgArrayRefExp(e) && !(e->lhs())))
-return (e->symbol()->identifier());
-Init_Unparser();
-buf = Tool_Unparse2_LLnode(e->thellnd);
-l = strlen(buf);
-char *ustr = new char[l+1];
-strcpy(ustr,buf);
-//ustr[l]   = ' ';
-//ustr[l+1] = '\0';
-return(ustr);
-}
-*/
-//************************************
-
-const char* header(int i)
-{
-    switch (i) 
-    {
-    case(PROG_HEDR) :
-        return("program");
-    case(PROC_HEDR) :
-        return("subroutine");
-    case(FUNC_HEDR) :
-        return("function");
-    default:
-        return("error");
-    }
-}
-
-SgLabel*  firstLabel(SgFile *f)
-{
-    SetCurrentFileTo(f->filept);
-    SwitchToFile(GetFileNumWithPt(f->filept));
-    return LabelMapping(PROJ_FIRST_LABEL());
-}
-
-int isLabel(int num) 
-{
-    PTR_LABEL lab;
-    for (lab = PROJ_FIRST_LABEL(); lab; lab = LABEL_NEXT(lab))
-    if (num == LABEL_STMTNO(lab))
-        return 1;
-    return 0;
-}
-
-SgLabel* GetLabel()
-{
-    static int lnum = 90000;
-    if (lnum>max_lab)
-        return (new SgLabel(lnum--));
-    while (isLabel(lnum))
-        lnum--;
-    return (new SgLabel(lnum--));
-}
-/*
-int FragmentList(char *l, int level)
-{char ch[10],*str,*p;
-int num;
-D_fragment *fr;
-str = l;
-p = ch;
-cur_num:
-for(; (*str != '\0' &&  *str != ','); str++)
-if(isdigit(*str))
-*p++ = *str;
-else
-return(0);
-*p = '\0';
-num = atoi(p);
-fr = new D_fragment;
-fr->next = NULL;
-fr->No = num;
-if(num == 0) {
-fr->next =  deb[level];
-deb[level] = fr;
-} else
-if(!deb[level]){
-fr->next = NULL;
-deb[level] = fr;
-} else {
-fr->next =  deb[level]->next;
-deb[level] ->next = fr;
-}
-
-if(*str == '\0')
-return(1);
-
-str = str+1;
-goto cur_num;
-
-return(1);
-}
-
-
-int FragmentList(char *l, int dlevel, int elevel)
-{char ch[10],*str,*p;
-int num,num1;
-str = l;
-num1 =0;
-cur_num:
-p = ch;
-if(!isdigit(*str)) return(0);
-for(; (*str != '\0' &&  *str != ',' &&  *str != '-'); str++)
-if(isdigit(*str))
-*p++ = *str;
-else
-//return(0);
-break;
-*p = '\0';
-num = atoi(ch);
-if(*str == '-')
-num1 = num;
-else
-if(num1){
-AddToFragmentList(num1,num,dlevel,elevel);
-num1 =0;
-}
-else
-AddToFragmentList(num,num,dlevel,elevel);
-
-if(*str == '\0')
-return(1);
-if(*str != ',' && *str != '-')
-return(0);
-str = str+1;
-goto cur_num;
-
-}
-*/
-
-int FragmentList(char *l, int dlevel, int elevel)
-{
-    char ch[10], *str, *p;
-    int num, num1;
-    str = l;
-    num1 = 0;
-cur_num:
-    p = ch;
-    if (!isdigit(*str)) return(0);
-    for (; (*str != '\0' && *str != ',' && *str != '-'); str++)
-    if (isdigit(*str))
-        *p++ = *str;
-    else
-        //return(0);
-        break;
-    *p = '\0';
-    num = atoi(ch);
-    if (*str == '-')
-        num1 = num;
-    else
-    if (num1){
-        AddToFragmentList(num1, num, dlevel, elevel);
-        num1 = 0;
-    }
-    else
-        AddToFragmentList(num, num, dlevel, elevel);
-
-    if (*str == '\0')
-        return(1);
-    if (*str != ',' && *str != '-')
-        return(0);
-    str = str + 1;
-    goto cur_num;
-
-}
-/*
-void AddToFragmentList(int num,int dlevel,int elevel)
-{ fragment_list *fr;
-if(dlevel == 0 && elevel == 0)
-return;
-if(!debug_fragment) {
-debug_fragment = new fragment_list;
-debug_fragment->No = num;
-debug_fragment->next = NULL;
-debug_fragment->dlevel = dlevel;
-debug_fragment->elevel = elevel;
-} else {
-for(fr= debug_fragment; fr; fr=fr->next)
-if(fr->No == num) {
-if(dlevel != 0)
-fr->dlevel = dlevel;
-if(elevel != 0)
-fr->elevel = elevel;
-return;
-}
-fr = new fragment_list;
-fr->No = num;
-fr->dlevel = dlevel;
-fr->elevel = elevel;
-fr->next =  debug_fragment;
-debug_fragment = fr;
-}
-return;
-}
-
-void AddToFragmentList(int num1, int num2, int dlevel, int elevel)
-{ fragment_list_in *fr;
-if(dlevel == 0 && elevel == 0)
-return;
-fr = new fragment_list_in;
-fr->N1 = num1;
-fr->N2 = num2;
-fr->dlevel = dlevel;
-fr->elevel = elevel;
-fr->next =  debug_fragment;
-debug_fragment = fr;
-return;
-}
-*/
-
-void AddToFragmentList(int num1, int num2, int dlevel, int elevel)
-{
-    fragment_list_in *fr;
-    if (dlevel == -1 && elevel == -1)
-        return;
-    fr = new fragment_list_in;
-    fr->N1 = num1;
-    fr->N2 = num2;
-    if (elevel == -1) {
-        fr->level = dlevel;
-        fr->next = debug_fragment;
-        debug_fragment = fr;
-    }
-    else {
-        fr->level = elevel;
-        fr->next = perf_fragment;
-        perf_fragment = fr;
-    }
-    return;
-}
-
-/*
-fragment_list_in *AddToFragmentList(int num1, int num2, int level, fragment_list_in *frlist)
-{ fragment_list_in *fr;
-if(level == 0)
-return;
-fr = new fragment_list_in;
-fr->N1 = num1;
-fr->N2 = num2;
-fr->level = level;
-fr->next =  frlist;
-return(fr);
-}
-*/
-
-
-void format_num(int num, char num3s[])
-{
-    if (num>99)
-        sprintf(num3s, "%3d", num);
-    else if (num>9)
-        sprintf(num3s, "0%2d", num);
-    else
-        sprintf(num3s, "00%1d", num);
-}
-
-SgExpression* ConnectList(SgExpression *el1, SgExpression *el2)
-{
-    SgExpression *el;
-    if (!el1)
-        return(el2);
-    if (!el2)
-        return(el1);
-    for (el = el1; el->rhs(); el = el->rhs())
-        ;
-    el->setRhs(el2);
-    return(el1);
-}
-
-int is_integer_value(char *str)
-{
-    char *p;
-    p = str;
-    for (; *str != '\0'; str++)
-    if (!isdigit(*str))
-        return 0;
-    return (atoi(p));
-}
-
-char* SymbListString(symb_list *symbl)
-{
-    symb_list *sl;
-    int len;
-    char *p;
-
-    bp = buffer;	/* reset the buffer pointer */
-    for (sl = symbl; sl; sl = sl->next)
-    {
-        if (sl != symbl)
-            addstr(", ");
-        addstr(sl->symb->identifier());
-    }
-    *bp++ = '\0';
-    len = (bp - buffer) + 1; /* calculate the string length */
-    p = (char *)malloc(len);	/* allocate space for returned value */
-    strcpy(p, buffer); 	/* copy the buffer for output */
-    *buffer = '\0';
-
-    return p;
-}
-
-char * baseFileName(char *name)
-{//removal the path from the filename 'name' 
-   char *p=strrchr(name,'/');
-   if(p)
-      return (p+1);
-   else if(p=strrchr(name,'\\'))
-      return (p+1);
-   else
-      return(name);   
-}
-
-char *to_C_ident(char *name, bool allowFirstDigit)
-{
-  int l = strlen(name);
-  for (int i = 0; i < l; i++) 
-  {
-        char c = name[i];
-        if (!((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || c == '_' || ((i > 0 || allowFirstDigit) && c >= '0' && c <= '9')))
-            name[i] = '_';
-  }
-  return name;
-}
-
-SgSymbol *isNameConcurrence(const char *name, SgStatement *func)
-{
-    SgSymbol *s, *until, *first;
-    until = SymbMapping(last_file_symbol)->next();
-    first = func->symbol();
-    for (s= first; s==first || s && DECL(s) != 1 && s != until; s = s->next())
-    {   
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-/*
-SgSymbol *isNameConcurrence(const char *name, SgStatement *func)
-{
-    return (isSameNameInProgramUnit(name,func));
-}
-*/
-
-SgSymbol *isSameNameInProgramUnit(const char *name,SgStatement *func)
-{
-    SgSymbol *s, *until;
-    SgStatement *last = func->lastNodeOfStmt();
-    while(last && last->variant()==CONTROL_END)
-       last = last->lexNext();
-    if(last && last->symbol())
-       until = last->symbol();
-    else
-       until = SymbMapping(last_file_symbol)->next();
- 
-    for (s= func->symbol(); s && s!=until; s = s->next())
-    {
-        if (s && !strcmp(s->identifier(), name))
-            return(s);
-    }
-    return(NULL);
-}
-
-char *Check_Correct_Name(const char *name)
-{
-    SgSymbol *s = NULL;
-    char *ret = new char[strlen(name) + 1];
-    strcpy(ret,name);
-    while ((s = isSameNameInProgramUnit(ret,cur_func)))
-    {
-        ret = new char[strlen(name) + 2];
-        sprintf(ret, "%s_", s->identifier());
-    }
-    return ret;
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/hpf.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/hpf.cpp
deleted file mode 100644
index d469000..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/hpf.cpp
+++ /dev/null
@@ -1,1698 +0,0 @@
-/**************************************************************\
-* Fortran DVM                                                  * 
-*                                                              *
-*              Translating HPF-program                         *
-\**************************************************************/
-
-#include "dvm.h"
-int hpf_new_var;
-/**************************************************************\
-*       Processing distributed array refference                *
-\**************************************************************/
-/*----------- outside the range of parallel loop -------------*/
-int SearchDistArrayRef(SgExpression *e, SgStatement *stmt)
-{ int res = 0;
-  SgExpression *el,*eleft;
-  if(only_local)   // option -Honlyl is specified:
-     return (res); // all the operands are local in sequential threads
-  //looks  the expression 'e' for distributed array references,
-  // adds the attribute REMOTE_VARIABLE to the reference 
-  //generates statements for loading the values of distributed array elements into buffers
-  if(!e)
-    return (res);
-   
-  if(isSgArrayRefExp(e)) {
-    for(el=e->lhs(); el; el=el->rhs())
-       res = (SearchDistArrayRef(el->lhs(),stmt)) ? 1 : res;
-
-    if(HEADER( e->symbol()) && e->lhs()) {//is distributed array reference with subscripts
-      if(stmt->variant() == ASSIGN_STAT) {
-         eleft = isSgArrayRefExp(stmt->expr(0));//left part of assignment statement
-         if(eleft && eleft->lhs() && RemAccessRefCompare(eleft, e))
-	                        //array reference in right part of assignment statement is 
-	                        //the same as one in left part
-               return(1);
-      }
-       BufferDistArrayRef(e,stmt);
-                          //add attribute(REMOTE_VARIABLE) to  distributed array reference
-       res = 1;
-    }      
-    return(res);
-  }
-
-  res =  SearchDistArrayRef(e->lhs(),stmt);
-  res = (SearchDistArrayRef(e->rhs(),stmt)) ? 1 : res;
-  return(res);
-}
-
-void BufferDistArrayRef(SgExpression *e, SgStatement *stmt)
-{//generating statements for loading the value of distributed array element
- // to  buffer scalar variable and inserting ones before statement 'stmt' 
- //adding attribute REMOTE_VARIABLE to distributed array reference 'e'
-   int r,n,ibuf;
-   SgExpression *el;
-   rem_var *remv = new rem_var;
-   remv->ncolon = 0;
-   remv->index = ibuf = ++rmbuf_size[TypeIndex(e->symbol()->type()->baseType())];
-   remv->amv   = -1;
-   e->addAttribute(REMOTE_VARIABLE,(void *) remv, sizeof(rem_var));
-   r = Rank(e->symbol());
-   for(el=e->lhs(),n=0; el; el = el->rhs(),n++) 
-       ;
-   if(r && n && r != n) {
-   Error("Wrong number of subscripts specified for '%s'",e->symbol()->identifier(),175,stmt);
-   return;
-   }
-   if(first_time) {
-      SgStatement *st,*stw;
-      ReplaceContext(stmt);
-      stw = (stmt->variant() == ELSEIF_NODE) ? stmt->controlParent() : stmt;
-              //loading buffers for statement ELSEIF is performed before statement IF_THEN
-      LINE_NUMBER_STL_BEFORE(st,stmt,stw);
-      cur_st = st;
-      first_time = 0;
-   }
-   CopyToBuffer(0, ibuf, e); //loading buffer for distributed array's element
-   return;	  
-}
-
-/*----------- inside the range of parallel loop --------------*/
-
-SgExpression *IND_ModifiedDistArrayRef(SgExpression *e, SgStatement *st)
-// analyzing distributed array reference:
-// may this reference be used as IND_target? 
-{int i, num, ni, use[MAX_LOOP_NEST], IN_use;
- SgExpression *ei,*el,*es,*ee;
- ni = nIND+nIEX;
- for(i= 0; i<ni; i++)
-   use[i] = 0;
- if(!(e->lhs())) return(NULL); //no subscripts 
- ee = &(e->copy());
- for(el=ee->lhs(); el; el=el->rhs())   {
-   es = el->lhs();  //subscript expression
-   IN_use = 0;
-   num = AxisNumOfDoVarInExpr(es, DoVar, ni, &ei, use, &IN_use, st);
-   if(num<0) return(NULL);
-   if(num>nIEX) {// IND-index is used 
-     if(use[num-1] > 1) {
-       Error("More one occurance of do-variable '%s' in subscript list", DoVar[num-1]->identifier(),251, st);
-       return(NULL);
-     }
-     if(IN_use) //IND-index and IN-index are used 
-       err("More one occurance of a do-variable in subscript expression", 252,st);
-           //err("Illegal subscript expression",253,cur_st); 
-   } else
-     if(IN_use) //IN-index is used
-       el->setLhs(new SgExpression(DDOT));       //(new SgKeywordValExp("*"));
- }
- for(i= nIEX; i<ni; i++)
-    if(use[i] == 0)
-       return(NULL);
- return(ee);
-   //return(&(e->copy()));
-}
-
-void  IND_UsedDistArrayRef(SgExpression *e, SgStatement *st)
-// analyzing the distributed array reference in right part of assignment statement and so on
-// including it in the list IND_refs
-{int i, num, ni, use[MAX_LOOP_NEST], IN_use, nt;
- SgExpression *ei,*el,*es,*ee, *elbb;
- SgValueExp c0(0),cM1(-1);
- IND_ref_list *ref;
- hpf_new_var=0;
- ni = nIND+nIEX;
- for(i= 0; i<ni; i++)
-   use[i] = 0;
- if(!(e->lhs())) return; //no subscripts 
- if(isINDtarget(e)){  // is the same reference as IND_target
-                     // ( reference in left part of assignment statement)
-   IND_DistArrayRef(e, st, NULL);
-   return;
- }
- if((ref=isInINDrefList(e)) != NULL) {// the same reference is in list IND_refs 
-   IND_DistArrayRef(e, st, ref);
-   return;
- }
- // creating new element of list of distributed array references used in parallel loop
- ref = new IND_ref_list;
- ref->next =  IND_refs;
- IND_refs = ref;
- ee = &(e->copy());
- ref->rmref = ee;
- ref->nc = 0;
- ref->ind = 0;
- nt = 0;
- //looking through the subscript list
- for(el=ee->lhs(); el; el=el->rhs(), nt++)   {
-   es = el->lhs();  //subscript expression
-   IN_use = 0;
-   hpf_new_var=0;
-   //determinating kind of subscript expression
-   num = AxisNumOfDoVarInExpr(es, DoVar, ni, &ei, use, &IN_use, st);
-   if(num>nIEX) {// IND-index is used 
-           ref->nc++; 
-     if(IN_use) {//IND-index and IN-index are used : f(IN)
-       //err("More one occurance of a do-variable in subscript expression", 252,st);
-       el->setLhs(new SgExpression(DDOT));  // the subscript is replaced by ':'
-           ref->axis[nt] = & cM1.copy();
-           ref->coef[nt] = & c0.copy();
-           ref->cons[nt] = & c0.copy();  
-     } else { 
-           ref->axis[nt] = new SgValueExp(num-nIEX);  
-       CoeffConst(es, ei, &(ref->coef[nt]), &(ref->cons[nt])); //testing form: a*IND+b
-       if(!ref->coef[nt]){ //f(IND)
-           //err("Illegal subscript expression", 253, stat);
-           el->setLhs(new SgExpression(DDOT));  // the subscript is replaced by ':'
-           ref->axis[nt] = & cM1.copy();
-           ref->coef[nt] = & c0.copy();
-           ref->cons[nt] = & c0.copy();
-       }
-       else //a*IND+b
-         // correcting const with lower bound of array
-         if((elbb = LowerBound(ref->rmref->symbol(),nt)) != NULL)
-           ref->cons[nt] = &(*(ref->cons[nt])  - (elbb->copy()));
-     }  
-   } else // IND-index is not used 
-     if(IN_use || hpf_new_var) {//IN-index is used: f(IN)  or new variable is used
-           el->setLhs(new SgExpression(DDOT));  // the subscript is replaced by ':'
-           ref->axis[nt] = & cM1.copy();
-           ref->coef[nt] = & c0.copy();
-           ref->cons[nt] = & c0.copy(); 
-           ref->nc++;   
-     }  
-     else { // invariant: const,f(IEX)
-           ref->axis[nt] = & c0.copy();
-           ref->coef[nt] = & c0.copy();
-        if((elbb = LowerBound(ref->rmref->symbol(),nt)) != NULL)
-           ref->cons[nt] = & (es->copy() - (elbb->copy()));
-                                   // correcting const with lower bound of array
-        else //error situation
-           ref->cons[nt] = & (es->copy()); 
-     }
- }
-    if(nt < 7)
-           ref->axis[nt] = NULL; 
-
-    IND_DistArrayRef(e, st, ref);
-    return;
-}
-
-int AxisNumOfDoVarInExpr (SgExpression *e, SgSymbol *dovar_ident[], int ni,                             SgExpression **eref, int use[], int *pINuse, SgStatement *st)
-{
-  SgSymbol *symb;
-  SgExpression * e1; 
-  int i,i1,i2;
-  *eref = NULL;
-  if (!e) 
-    return(0);
-  if(isSgVarRefExp(e))  {
-    symb = e->symbol();
-    for(i=0; i<ni; i++) {
-       if(dovar_ident[i]==NULL)
-         continue;
-       if(dovar_ident[i]==symb)  { //is IEX- or IND-index
-         *eref = e;
-         /*
-         if (use[i] == 1 && i>= nIEX) 
-             Error("More one occurance of do-variable '%s' in subscript list", symb->identifier(),251, st);
-	  */
-         use[i]++;
-         return(i+1);
-       } 
-    }
-    if(isDoVar(symb)) // is IN-index
-	   // (symb is not IEX- nor IND-index, but symb is do-variable => symb is IN-index)
-       (*pINuse)++;   
-    if(isNewVar(symb))
-       hpf_new_var=1; 
-    return (0);
-  }
-  i1 = AxisNumOfDoVarInExpr(e->lhs(), dovar_ident, ni, eref, use, pINuse, st);
-  e1 = *eref;
-  i2 = AxisNumOfDoVarInExpr(e->rhs(), dovar_ident, ni, eref, use, pINuse, st);
-  if((i1==-1)||(i2==-1))  return(-1);
-  if(i1 && i1>=nIEX && i2 && i2>=nIEX)  {
-    err("More one occurance of a do-variable in subscript expression", 252,st);
-    return(-1);
-  }
-  if(i1) *eref = e1;
-  return(i1 ? i1 : i2);
-}
-
-int isINDtarget(SgExpression *re)
-{if(RemAccessRefCompare(IND_target, re))
-   return(1);
- else
-   return (0);
-}
-
-IND_ref_list *isInINDrefList(SgExpression *re)
-{IND_ref_list *el;
-             //for(el=IND_refs; el; el=el->next)
-             //el->rmref->unparsestdout(); //?!!!
- for(el=IND_refs; el; el=el->next)
-    if(RemAccessRefCompare(el->rmref, re))
-       return(el);
- return (NULL);
-}
-/*
-void IND_DistArrayRef(SgExpression *e, SgStatement *st)
-{SgSymbol *ar;
-         //replace distributed array reference A(I1,I2,...,In) by
-         //                                     n   
-         // <memory>( HeaderCopy(n+1) +  I1 + SUMMA(HeaderCopy(n-k+1) * Ik))
-         //                                    k=2                    
-         // <memory> is I0000M  if A  is of type integer 
-         //             R0000M  if A  is of type real 
-         //             D0000M  if A  is of type double precision 
-         //             C0000M  if A  is of type complex
-         //             L0000M  if A  is of type logical 
-    ar = e->symbol();
-    e->setSymbol(baseMemory(ar->type()->baseType()));   
-    if(!e->lhs())
-        Error("No subscripts: %s", ar->identifier(),171,st);
-    else {  
-        (e->lhs())->setLhs(*LinearForm(ar,e->lhs()));
-        (e->lhs())->setRhs(NULL); 
-         }  
-} 
-*/
-
-void IND_DistArrayRef(SgExpression *e, SgStatement *st, IND_ref_list *el)
-{SgSymbol *ar;
-         //replace distributed array reference A(I1,I2,...,In) by
-         //                                     n   
-         // <memory>( HeaderCopy(n+1) +  I1 + SUMMA(HeaderCopy(n-k+1) * Ik))
-         //                                    k=2                    
-         // <memory> is I0000M  if A  is of type integer 
-         //             R0000M  if A  is of type real 
-         //             D0000M  if A  is of type double precision 
-         //             C0000M  if A  is of type complex
-         //             L0000M  if A  is of type logical 
- ar = e->symbol();
- if(!el) { // local access reference
-   e->setSymbol(baseMemory(ar->type()->baseType()));   
-   if(!e->lhs())
-        Error("No subscripts: %s", ar->identifier(),171,st);
-   else {  
-        (e->lhs())->setLhs(*LinearForm(ar,e->lhs(),NULL));
-        (e->lhs())->setRhs(NULL); 
-        }  
- } else { 
-   int n, num, k;
-   SgExpression *esl;
-   SgExpression *p = NULL;
-   if(el->ind == 0) {//new reference: allocating header copy
-     el->ind = nhpf;
-     nhpf+=(el->nc)+2;
-   }
-   hpf_ind = el->ind;
-   if(el->nc) { //there are ':' or a*IND+b elements in index list of remote variable
-     for(n = 0; n<7 && el->axis[n]; n++)
-       ;
-     if(n && n != Rank(ar)) {
-       Error("Wrong number of subscripts specified for '%s'", ar->identifier(),175,st);
-       return;
-     }
-     //looking through the subscript and index lists 
-     for(esl=e->lhs(),k=0; esl && k<n; esl=esl->rhs(),k++){
-       num = el->axis[k]->valueInteger();
-       if(num == -1) // ':'
-          p=esl;
-       else if(num > 0){ //do-variable-use: a*IND+b
-          esl->setLhs(new SgVarRefExp(IND_var[num-1])); // replace by IND
-	  /*
-          if(p)  
-            esl->setLhs(new SgVarRefExp(IND_var[num-1])); // replace by IND
-          else  //first non-invariant index
-            if(INTEGER_VALUE(el->coef[k],1) && k == 0) // a == 1
-            esl->setLhs(new SgVarRefExp(IND_var[num-1])); // replace by IND
-            else
-            esl->setLhs(&(*HPF000((el->ind)+(el->nc)-1)*(*new SgVarRefExp(IND_var[num-1]))));
-	                                                  // replace by  HeaderCopy(nc)*IND
-	   */
-          p=esl;
-       }
-       else   
-          //delete corresponding subscript in reference
-          if(!p)
-            e->setLhs(esl->rhs());
-          else
-            p->setRhs(esl->rhs());
-     }
-   } 
-   
-   e->setSymbol(baseMemory(ar->type()->baseType()));
-   num = el->axis[0]->valueInteger();
-   if ((num == 0) || ((num > 0) && !INTEGER_VALUE(el->coef[0], 1)) )//first dimension is b or a*IND+b
-                                                           // where a != 1
-     e->lhs()->setLhs(*HPF000((el->ind)+(el->nc)) * (*e->lhs()->lhs())); 
-                         // first non-invariant index I is replaced  by  HeaderCopy(nc)*I
-   e->setLhs(*LinearFormB(hpfbuf, (el->ind), el->nc, e->lhs()));
- }
-} 
-/**************************************************************\
-*       Processing independent loop nest                       *
-\**************************************************************/
-void SkipIndepLoopNest(SgStatement *stmt)
-{ 
-  SgStatement *st,*stl;
-  stl = stmt; 
-  // looking through the loop nest 
-  for(st=par_do; isSgForStmt(st); st=st->lexNext()){
-     stl = st;
-     if(st->lexNext()->variant() == HPF_INDEPENDENT_DIR)
-       Extract_Stmt(st->lexNext()); //extracting nested INDEPENDENT directive
-     else   
-       break;  
-  }
-  cur_st = stl;
-}
-
-void LookIndepLoopNest(SgStatement *stmt)
-{ int i;
-  SgStatement *st,*stl;
-  stl = stmt; 
-  // looking through the loop nest 
-  for(st=stmt->lexNext(),i = 0; isSgForStmt(st); st=st->lexNext(),i++){
-     stl = st;
-     IND_var[i] = st->symbol(); 
-     if(st->lexNext()->variant() == HPF_INDEPENDENT_DIR)
-       Extract_Stmt(st->lexNext()); //extracting nested INDEPENDENT directive
-     else   
-       break;  
-  }
-  cur_st = stl;
-}
-
-int IndependentLoop(SgStatement *stmt)
-{
-  SgStatement *st, *if_stmt, *stl = NULL;
-  SgStatement *first_do;
-  SgValueExp c0(0);
-  int i, ndo, iout, iinp, ind;
-  SgForStmt *stdo;
-  SgValueExp c1(1);
-  SgExpression *step[MAX_LOOP_LEVEL], 
-               *init[MAX_LOOP_LEVEL],
-               *last[MAX_LOOP_LEVEL],
-               *vpart[MAX_LOOP_LEVEL];
-
-  first_do = stmt -> lexNext();// first DO statement of the loop nest
-  IND_var = DoVar+nIEX;
-  IND_target = NULL;
-  IND_target_R = NULL;
-  IND_refs   = NULL;
-  redl = NULL;
-  irg = 0; idebrg = 0;
-  red_list = NULL;
-  redgref = NULL;
-  //new_red_var_list = NULL;
- 
-//initialization vpart[]
-  for(i=0; i<MAX_LOOP_LEVEL; i++)
-     vpart[i] = NULL;
-//determinating rank of independent loop 
-  for(st=first_do,ndo=0; isSgForStmt(st); st=st->lexNext()) {
-    ndo++;
-    if(st->lexNext()->variant() == HPF_INDEPENDENT_DIR) {
-       if(st->lexNext()->expr(0))
-	 stmt->setExpression(0,*ConnectNewList(stmt->expr(0),st->lexNext()->expr(0)));
-       //stmt->expr(0)->lhs()->unparsestdout();
-       Extract_Stmt(st->lexNext()); //extracting nested INDEPENDENT directive
-    } 
-    else   
-       break;  
-  }
-  /*    if(st->lexNext()->variant() == HPF_INDEPENDENT_DIR)
-       st=st->lexNext();
-     else
-       break;  
-   */
-
-  nIND = ndo;
-// generating assign statement:
-//   dvm000(i) = lnumb(num); // line number of stmt
-  LINE_NUMBER_AFTER(stmt,stmt);
-//generating call to 'bploop' function of performance analizer (begin of parallel interval)
-  if(perf_analysis && perf_analysis != 2)
-  {
-    InsertNewStatementAfter(St_Bploop(OpenInterval(stmt)), cur_st, stmt->controlParent()); //inserting after function call 'lnumb'
-  }
-  ins_st1 = cur_st;
-
-// generating assign statement:
-//   dvm000(iplp) = crtpl(Rank);
-  iplp = ndvm++; 
-  doAssignTo_After(DVM000(iplp), CreateParLoop( ndo)); 
-
-//allocating DebRedGroupRef
-  ndvm++;
-//allocating RedGroupRef
-  ndvm++;
-//allocating OutInitIndexArray,OutLastIndexArray,OutStepArray 
-  iout = iarg = ndvm; 
-  ndvm += 3*ndo;
-
-// looking through the loop nest 
-  for(st=first_do,i=0; i<ndo; st=st->lexNext(),i++) {
-     stdo = isSgForStmt(st);
-     if(!stdo)
-       break;  
-     stl = st;
-     IND_var[i] = stdo->symbol(); 
-     step[i]   = stdo->step();
-     if(!step[i])
-       step[i] = & c1.copy();  // by default: step = 1
-     init[i] = isSpecialFormExp(stdo->start(),i,iout+i,vpart,IND_var);
-     if( init[i] )
-         step[i] = & c1.copy(); 
-      else
-         init[i]   = stdo->start();  
-     last[i]   = stdo->end();  
-    
-     // setting new loop parameters
-     if(vpart[i]) 
-       stdo->setStart(*DVM000(iout+i)+ (*vpart[i]));//special form
-                                                    //step is not replaced
-     else { 
-       stdo->setStart(*DVM000(iout+i));  
-       //stdo->setStep(*DVM000(iout+i+2*ndo));
-     }
-     stdo->setEnd(*DVM000(iout+i+ndo));
-     SetDoVar(stdo->symbol());
-  }
-
-  iinp = ndvm;    
-  if(dvm_debug) 
-     OpenParLoop_Inter(stl,iinp,iinp+ndo,IND_var,ndo);
-
-  // creating LoopVarAddrArray, LoopVarTypeArray,InpInitIndexArray, InpLastIndexArray
-  // and InpStepArray  
-  for(i=0; i<ndo; i++) 
-     doAssignStmtAfter(GetAddres(IND_var[i]));
-  for(i=0; i<ndo; i++)
-     doAssignStmtAfter( new SgValueExp(LoopVarType(IND_var[i],stmt)));
-  for(i=0; i<ndo; i++)
-     doAssignStmtAfter( init[i] );
-  for(i=0; i<ndo; i++)
-     doAssignStmtAfter( last[i] );
-  for(i=0; i<ndo; i++)
-     doAssignStmtAfter( step[i] );
-
- ins_st2 = cur_st; 
- if(dvm_debug) {
-      pardo_line = first_do->lineNumber();
-      DebugParLoop(cur_st,ndo,iinp+2*ndo);
-      /*SET_DVM(iinp+2*ndo); */
-  } 
- /* else
-    { SET_DVM(iinp); } 
- */
-
- // generating Logical IF statement:
-       // begin_lab  IF (DoPL(LoopRef) .EQ. 0) GO TO end_lab
-       // and inserting it before  loop nest
-       begin_lab = GetLabel();
-       end_lab   = GetLabel();
-       if_stmt = new SgLogIfStmt(SgEqOp(*doLoop(iplp) , c0),                                                                *new SgGotoStmt(*end_lab));
-       if_stmt -> setLabel(*begin_lab);
-       cur_st->insertStmtAfter(*if_stmt);
-       (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF
-                                                            // (error Sage)
-       cur_st = stl; // set cur_st on last DO satement of loop nest
-       //cur_st = st->lexPrev();  // set cur_st on last DO satement of loop nest
-        // cur_st = stl->lexNext(); 
-  return(1); //!!!
-}
-
-int IndependentLoop_Debug(SgStatement *stmt)
-{ SgStatement *st, *stl = NULL;
-  SgStatement *first_do;
-  SgValueExp c0(0);
-  int i, ndo, iout, iinp, ind;
-  SgForStmt *stdo;
-  SgValueExp c1(1);
-  SgExpression *step[MAX_LOOP_LEVEL], 
-               *init[MAX_LOOP_LEVEL],
-               *last[MAX_LOOP_LEVEL],
-               *vpart[MAX_LOOP_LEVEL];
-
-  first_do = stmt -> lexNext();// first DO statement of the loop nest
-  IND_var = DoVar+nIEX;
-  IND_target = NULL;
-  IND_target_R = NULL;
-  IND_refs   = NULL;
-  redl = NULL;
-  irg = 0; idebrg = 0;
-  red_list = NULL;
-  redgref = NULL;
-  //new_red_var_list = NULL;
- 
-//determinating rank of independent loop 
-  for(st=first_do,ndo=0; isSgForStmt(st); st=st->lexNext()) {
-    ndo++;
-    if(st->lexNext()->variant() == HPF_INDEPENDENT_DIR) {
-       if(st->lexNext()->expr(0))
-	 stmt->setExpression(0,*ConnectNewList(stmt->expr(0),st->lexNext()->expr(0)));
-       //stmt->expr(0)->lhs()->unparsestdout();
-       Extract_Stmt(st->lexNext()); //extracting nested INDEPENDENT directive
-    } 
-    else   
-       break;  
-  }
-  nIND = ndo;
-// generating assign statement:
-//   dvm000(i) = lnumb(num); // line number of stmt
-  LINE_NUMBER_AFTER(stmt,stmt);
-//generating call to 'bploop' function of performance analizer (begin of parallel interval)
-  if(perf_analysis && perf_analysis != 2)
-  {
-    InsertNewStatementAfter(St_Bploop(OpenInterval(stmt)), cur_st, stmt->controlParent()); //inserting after function call 'lnumb'
-  }
-  ins_st1 = cur_st;
-
-  iplp = 0; 
-
-//allocating DebRedGroupRef
-  ndvm++;
-//allocating RedGroupRef
-  ndvm++;
-
-  iout = iarg = ndvm; 
-  //ndvm += 3*ndo;
-
-//initialization vpart[]
-  for(i=0; i<MAX_LOOP_LEVEL; i++)
-     vpart[i] = NULL;
-// looking through the loop nest 
-  for(st=first_do,i=0; i<ndo; st=st->lexNext(),i++) {
-     stdo = isSgForStmt(st);
-     if(!stdo)
-       break;  
-     stl = st;
-     IND_var[i] = stdo->symbol(); 
-     step[i]   = stdo->step();
-     if(!step[i])
-       step[i] = & c1.copy();  // by default: step = 1
-     init[i] = isSpecialFormExp(stdo->start(),i,iout+i,vpart,IND_var);
-     if( init[i] )
-         step[i] = & c1.copy(); 
-      else
-         init[i]   = stdo->start();  
-     last[i]   = stdo->end();  
-    
-     SetDoVar(stdo->symbol());
-  }
-
-  iplp=iinp = ndvm;        
-  OpenParLoop_Inter(stl,iinp,iinp+ndo,IND_var,ndo);
-
-  // creating LoopVarAddrArray, LoopVarTypeArray,InpInitIndexArray, InpLastIndexArray
-  // and InpStepArray  
-  /*  for(i=0; i<ndo; i++) 
-     doAssignStmtAfter(GetAddres(IND_var[i]));
-  */
-  ndvm +=ndo;
-  for(i=0; i<ndo; i++)
-     doAssignStmtAfter( new SgValueExp(LoopVarType(IND_var[i],stmt)));
-  for(i=0; i<ndo; i++)
-     doAssignStmtAfter( init[i] );
-  for(i=0; i<ndo; i++)
-     doAssignStmtAfter( last[i] );
-  for(i=0; i<ndo; i++)
-     doAssignStmtAfter( step[i] );
-
-  ins_st2 = cur_st; 
-  pardo_line = first_do->lineNumber();
-  DebugParLoop(cur_st,ndo,iinp+2*ndo); 
-  //SET_DVM(iinp+2*nloop);      
-  cur_st = stl; // set cur_st on last DO satement of loop nest    
-  return(1); 
-}
-
-SgExpression *ConnectNewList(SgExpression *el1, SgExpression *el2)
-{// el1 , el2 - NEW specifications of INDEPENDENT directives
- SgExpression *el;
- if(!el1)
-   return(el2);
- if(!el2) 
-   return(el1);
- for(el = el1->lhs(); el->rhs(); el = el->rhs())
-       ;
- el->setRhs(el2->lhs());
- //el1->lhs()->unparsestdout();
- return(el1);
-}
-
-void IEXLoopAnalyse(SgStatement *func)
-{ SgStatement *st;
-  int i;
-  nIEX = 0;
-  IEX_var = DoVar;
-  for(i=0; i<MAX_LOOP_NEST; i++)
-    DoVar[i] = NULL;
-  for(st=par_do->controlParent(); st!=func; st=st->controlParent()) {
-    if(st->variant() == FOR_NODE)
-       IEXLoopBegin(st);
-    else
-       continue;   
-  }
-}
-
-void IEXLoopBegin(SgStatement *st)
-{
- DoVar[nIEX] = st->symbol();
- nIEX++;
-}
-
-void INDLoopBegin()
-{//generating Lib-DVM calls for beginning independent loop
- SgSymbol *spat;
- SgStatement *st;
- int iaxis;
- int nr;//number of aligning rules i.e. length of align-loop-index-list
-  
-  st = cur_st; //store cur_st(pointer to current statement)
-  if(!IND_target)
-     IND_target = IND_target_R;
-  if(! IND_target) {
-    err("No target for independent loop", 254, indep_st);
-    return;
-  }
-  spat = IND_target->symbol();   // target array symbol
-    //printf("INN_target");
-    //IND_target->unparsestdout();
-  /*   for HPF error if IND_target is NULL     
-  if(!HEADER(spat)) {   
-     Error("'%s' isn't distributed array", spat->identifier(), 72,stmt); 
-     return(0);
-  }
-  */
-//creating reduction group
-  if(redl) {
-      irg = iarg-1; 
-      redgref = DVM000(irg);
-      cur_st = ins_st1;
-      doAssignTo_After(redgref, CreateReductionGroup());
-      if(debug_regim){
-        idebrg = iarg-2;
-        doAssignTo_After(DVM000(idebrg), D_CreateDebRedGroup());
-      }     
-      ReductionListIND1();    
-      //ReductionListIND_Err();    
-  }
-
-  cur_st = ins_st2;
-// creating AxisArray, CoeffArray and ConstArray 
-  iaxis = ndvm; 
-  nr = doAlignIterationIND();
-
-// generating assign statement:
-//   dvm000(i) =
-//       mappl(LoopRef, PatternRef, AxisArray[], CoefArray[], ConstArray[],
-//              LoopVarAdrArray[], InpInitIndexArray[], InpLastIndexArray[],
-//              InpStepArray[], 
-//              OutInitIndexArray[], OutLastIndexArray[], OutStepArray[])
-  
-  doCallAfter( BeginParLoop (iplp, HeaderRef(spat), nIND, iaxis, nr, iarg+3*nIND, iarg));
- 
-  if(redgref) 
-    ReductionListIND2(redgref);
-  
-  if(IND_refs)
-    RemoteVariableListIND();
-   
-  cur_st = st; //restore cur_st
-}
-
-void INDReductionDebug()
-{//generating Lib-DVM calls for debugging independent loop (creating reduction group)
- SgStatement *st;
-  
-  st = cur_st; //store cur_st(pointer to current statement)
-
-//creating reduction group
-  if(redl) {
-      irg = iarg-1; 
-      redgref = DVM000(irg);
-      cur_st = ins_st1;
-      doAssignTo_After(redgref, CreateReductionGroup());  
-      if(debug_regim){
-        idebrg = iarg-2;
-        doAssignTo_After( DVM000(idebrg), D_CreateDebRedGroup());
-      }     
-      ReductionListIND1();
-      ReductionListIND2(redgref);   
-      //ReductionListIND_Err();                
-  }
-  cur_st = st; //restore cur_st
-}
-
-int doAlignIterationIND()
-// creating axis_array, coeff_array and  const_array 
-// returns counter of elements in align_iteration_list
-
-{ int i,nt,num, use[MAX_LOOP_LEVEL];
-  SgExpression * el,*e,*ei,*elbb;
-  SgSymbol *ar;
-  SgExpression *axis[MAX_LOOP_LEVEL],
-               *coef[MAX_LOOP_LEVEL],
-               *cons[MAX_LOOP_LEVEL];
-  SgValueExp c1(1),c0(0),cM1(-1);
-  
-  for (i=0; i<MAX_LOOP_LEVEL; i++)
-     use[i] = 0;
-  //ni = nIND;
-  ar = IND_target->symbol();    // array  
-   
-  //looking through the align_iteration_list 
-  nt = 0;          //counter of elements in align_iteration_list
-  for(el=IND_target->lhs(); el; el=el->rhs())   {
-     e = el->lhs();  //subscript expression
-     if(e->variant()==DDOT) {  // ":"
-                            /*if(e->variant()==KEYWORD_VAL) { */ // "*"
-       axis[nt] = & cM1.copy();
-       coef[nt] = & c0.copy();
-       cons[nt] = & c0.copy();   
-     }
-     else  {  // expression
-       num = AxisNumOfDummyInExpr(e, IND_var, nIND, &ei, use, indep_st);
-       if (num<=0)   {
-         axis[nt] = & c0.copy();
-         coef[nt] = & c0.copy();
-         if((elbb = LowerBound(ar,nt)) != NULL)
-           cons[nt] = & (e->copy() - (elbb->copy()));
-                   // correcting const with lower bound of array
-         else //error situation
-           cons[nt] = & (e->copy()); 
-       }
-       else {
-         axis[nt] = new SgValueExp(num); 
-         CoeffConst(e, ei,&coef[nt], &cons[nt]); 
-         TestReverse(coef[nt],indep_st);     
-         if(!coef[nt]){
-           err("Wrong iteration-align-subscript in PARALLEL", 160,indep_st);
-           coef[nt] = & c0.copy();
-           cons[nt] = & c0.copy();
-         }  
-         else 
-         // correcting const with lower bound of array
-           if((elbb = LowerBound(ar,nt)) != NULL)
-             cons[nt] = &(*cons[nt]  - (elbb->copy()));
-       }       
-     }
-    
-     nt++;
-  }
-
-  // setting on arrays
-  for(i=nt-1; i>=0; i--)
-     doAssignStmtAfter(axis[i]);
-  for(i=nt-1; i>=0; i--)
-     doAssignStmtAfter(ReplaceFuncCall(coef[i]));
-  for(i=nt-1; i>=0; i--)
-     doAssignStmtAfter(Calculate(cons[i]));
-  return(nt);  
-}
-
-void ReductionListIND1()
-{ 
-  SgExpression  *ev, *evc, *loc_var,*len, *loclen;
-  int   irv, num_red, ntype,sign, ilen,locindtype;
-  SgSymbol *var; 
-  SgValueExp c0(0),c1(1);
-  reduction_list *er;
-  
-  //looking through the reduction list
-  for(er = redl; er; er=er->next) {
-     loc_var = ConstRef(0);
-     loclen = &c0;
-     locindtype = 0;
-     len =&c1;
-     ev = er->red_var;
-     evc=&(ev->copy());
-     num_red = er->red_op; 
-     if( !num_red) 
-        err("Wrong reduction operation name", 70, indep_st); 
-     var = ev->symbol();
-     if(isSgVarRefExp(ev))
-             ;
-     else if( isSgArrayRefExp(ev)) { 
-               if(!ev->lhs()){ //whole array
-                 if(Rank(var)>1)
-                   Error("Wrong reduction variable '%s'", var->identifier(), 151, indep_st); 
-                 len = ArrayDimSize(var,1); // size of vector
-                 if(!len || len->variant()==STAR_RANGE){
-                   Error("Wrong reduction variable '%s'", var->identifier(), 151, indep_st); 
-                   len = &c1;
-                 }
-                 evc->setLhs(new SgExprListExp(*Exprn(LowerBound(var,0))));
-               }  
-            }
-     else
-        err("Wrong reduction variable",151,indep_st); 
-     ntype = VarType(var); //RedVarType(var)
-     if(!ntype)
-        Error("Wrong type of reduction variable '%s'", var->identifier(), 152,indep_st);
-     sign = 1;
-     ilen = ndvm; // index for RedArrayLength
-     doAssignStmtAfter(len);
-     doAssignStmtAfter(loclen);
-     irv = ndvm; // index for RedVarRef
-     if(! only_debug)
-       doAssignStmtAfter(ReductionVar(num_red,evc,ntype,ilen, loc_var, ilen+1,sign));
-     er->ind = irv;
-     if(debug_regim) {
-       doCallAfter(D_InsRedVar(DVM000(idebrg),num_red,evc,ntype,ilen, loc_var, ilen+1,locindtype));
-     }
-  }   
-     return;
-  }
-
-void ReductionListIND2(SgExpression *gref)
-{ reduction_list *er;
-//looking through the reduction list
-  if(only_debug) return;
-  for(er = redl; er; er=er->next) 
-     doCallAfter(InsertRedVar(gref,er->ind,(only_debug ? 0 : iplp)));
-}
-
-void ReductionListIND_Err()
-{ reduction_list *er;
-//looking through the reduction list
-  for(er = redl; er; er=er->next) 
-     Error("Reduction statement inside the range of INDEPENDENT loop, '%s' is reduction variable", er->red_var->symbol()->identifier(), 255, indep_st);
-}
-
-void OffDoVarsOfNest(SgStatement *end_stmt)
-{ 
-  SgStatement *parent;
-  SgForStmt *do_st;
-  parent = end_stmt->controlParent();
-  OffDoVar(parent->symbol());
-  if(!end_stmt->label()) // ENDDO is end of DO constuct
-    return;
-  parent = parent->controlParent();
-  while((do_st=isSgForStmt(parent)) && do_st->endOfLoop() 
-       && ( LABEL_STMTNO(do_st->endOfLoop()->thelabel)==LABEL_STMTNO(end_stmt->label()->thelabel)))     {
-   OffDoVar(parent->symbol());
-   parent = parent->controlParent();
- }
- return;
-}
-/*
-void  RemoteVariableListIND()
-{ IND_ref_list *el;
-  int ibg,ishg,ikind,ibuf,ishw,iaxis,ideb,iq;
-  SgSymbol *ar, *b;
-  SgExpression *ind_deb[7],*head, *shgref, *bgref;
-  int j, n, buf_size, shw_size, rank, static_sign;
-  SgValueExp c0(0),cm1(-1);
-  SgStatement *if_st,*end_st,*cp, *cp1,*endif_st,*else_st; 
-  
-  if(!IND_refs) return;
- 
-  cp = cp1 = cur_st->controlParent();
-  if( !one_inquiry){
-    ishg = ndvm;  shgref = DVM000(ishg);
-    ibg = ndvm+1; bgref  = DVM000(ibg);
-    doAssignStmtAfter(ConstRef(0)); // dvm000(ishg) = 0
-    doAssignStmtAfter(ConstRef(0)); // dvm000(ibg)  = 0
-    static_sign = 0; 
-  }
-  else {
-    iq   = nhpf++;
-    InitInquiryVar(iq);
-    if_st = doIfThenConstrForIND(HPF000(iq), 0, 1, 0, cur_st, cp);
-    cur_st = if_st;
-    doAssignTo_After(HPF000(iq), ConstRef(1)); // hpf000(iq) = 1 :inquiry has done
-    ishg = nhpf++;  shgref = HPF000(ishg);
-    ibg  = nhpf++; bgref  = HPF000(ibg);
-    doAssignTo_After(shgref, ConstRef(0)); // hpf000(ishg) = 0
-    doAssignTo_After( bgref, ConstRef(0)); // hpf000(ibg)  = 0
-    static_sign = 1; 
-    cp = if_st;
-  }  
-  ikind = ndvm++;
-  //looking through the IND_reference list
-  for(el=IND_refs; el; el=el->next){
-     ar = el->rmref->symbol();
-     rank = Rank(ar); 
-       // looking through the index list of remote variable
-       //for(es= el->rmref->lhs(),n=0; es; es= es->rhs(),n++)
-       //
-     for(n = 0; n<7 && el->axis[n]; n++)
-        if( el->axis[n]->valueInteger() == 0)
-           ind_deb[n] = &(el->cons[n]->copy());
-        else
-           ind_deb[n] = &cm1.copy();
-     //allocating  buffer header (for remote data)  and arrays of shadow widths
-     buf_size = (el->nc) ? 2*(el->nc)+2 : 4; //memory size for buffer
-     if( !one_inquiry){
-       ibuf = ndvm;
-       ndvm+= buf_size;
-       b = dvmbuf; //or NULL
-     } else {
-       ibuf = nhpf;
-       nhpf+= buf_size;
-       b = hpfbuf;
-     }
-     ishw = ndvm;
-     shw_size = 2*rank;
-     //size = (buf_size > shw_size) ? buf_size : shw_size;
-     ndvm+= shw_size;
-     //generating inquiry for kind of data access
-     iaxis = ndvm; 
-     for(j=n-1; j>=0; j--)
-        doAssignStmtAfter(el->axis[j]);       
-     for(j=n-1; j>=0; j--)
-        doAssignStmtAfter(ReplaceFuncCall(el->coef[j]));
-     for(j=n-1; j>=0; j--)
-        doAssignStmtAfter(Calculate(el->cons[j]));
-
-     head = HeaderRef(el->rmref->symbol());
-     doAssignTo_After(DVM000(ikind), RemoteAccessKind(head, header_rf(b,ibuf,1),static_sign,iplp,iaxis,iaxis+n,iaxis+2*n,ishw,ishw+rank));
-     //SET_DVM(ishw);
-     SET_DVM(iaxis); 
-     //generating IF(dvm000(ikind).EQ.3) THEN ...ELSE...ENDIF
-     if_st = doIfThenConstrForIND(DVM000(ikind), 3, 1, 1, cur_st, cp);         
-     end_st = endif_st = if_st->lexNext()->lexNext(); //END IF statement
-     else_st  = if_st->lexNext(); // ELSE statement
-
-     //IF(dvm000(ibg).EQ.0) THEN ...ENDIF
-     //   hpf000(ibg)
-     if_st = doIfThenConstrForIND(bgref, 0, 1, 0, if_st, if_st);
-     cur_st = if_st;
-     doAssignTo_After(bgref,CreateBG(static_sign,1));//creating group of remote data buffer
-     where = else_st;
-     doAssignStmt(InsertRemBuf(bgref, header_rf(b,ibuf,1)));//inserting buffer in group
-     if(dvm_debug) {
-        ideb = ndvm;
-        for(j=n-1; j>=0; j--)
-           doAssignStmt(ReplaceFuncCall(ind_deb[j]));
-        InsertNewStatementBefore(D_RmBuf(head, GetAddresDVM( header_rf(b,ibuf,1)),n,ideb),else_st);
-     }
-     BufferHeaderCopy(b,ibuf, n, el);
-    
-     cur_st = else_st; // generating ELSE body
-     //generating IF(dvm000(ikind).EQ.2) THEN ...ELSE...ENDIF
-     if_st = doIfThenConstrForIND(DVM000(ikind), 2, 1, 0, else_st, else_st);
-     end_st = if_st->lexNext(); //END IF statement 
-     //IF(dvm000(ishg).EQ.0) THEN ...ENDIF
-     //   hpf000(ishg)
-     if_st = doIfThenConstrForIND(shgref, 0, 1, 0, if_st, if_st);
-     cur_st = if_st;
-     CreateBoundGroup(shgref); //creating group of shadow edges
-     where  = end_st;
-     doAssignStmt(InsertArrayBound(shgref, head, ishw, ishw+rank, 1)); //corner = 1 !!!
-                                                                //inserting shadow in group
-     //ishsign = ndvm;
-     //maxsh = doShadowSignArray(el); see DepList(),doDepLengthArrays()
-     //doAssignStmt(InsertArrayBoundDep(shgref, head, ishw, ishw+rank, maxsh, ishsign));
-     cur_st = end_st;
-     ArrayHeaderCopy(n,el);     
- 
-     SET_DVM(ishw);
-     cur_st = endif_st;
-  }
-  if(one_inquiry)
-     cur_st =  cur_st->lexNext();
-  //IF(dvm000(ishg).NE.0) THEN {executing SHADOW group} ENDIF
-  //   hpf000(ishg)
-  if_st =  doIfThenConstrForIND(shgref, 0, 0, 0, cur_st, cp1);
-  end_st = if_st->lexNext(); //END IF statement
-  cur_st = if_st;
-  doAssignStmtAfter(StartBound(shgref));  // starting exchange of shadow edges
-  FREE_DVM(1);
-  doAssignStmtAfter(WaitBound (shgref));// waiting completion of shadow edges exchange
-  FREE_DVM(1);
-  //IF(dvm000(ibg).NE.0) THEN {executing REMOTE group} ENDIF
-  //   hpf000(ibg)
-  if_st =  doIfThenConstrForIND(bgref, 0, 0, 0, end_st, cp1);
-  cur_st = if_st;
-  doAssignStmtAfter(LoadBG(bgref)); // starting load of buffer group
-  FREE_DVM(1);
-  doAssignStmtAfter(WaitBG(bgref));// waiting completion of  buffer group load
-  FREE_DVM(1);
-  
-  if( one_inquiry)
-    {SET_HPF(nhpf);}
-  else 
-    {SET_HPF(1);}
-  return;
-}
-*/
-
-void  RemoteVariableListIND()
-{ IND_ref_list *el;
-  int ibg,ishg,ikind,ibuf,ishw,iaxis,ideb,iq;
-  SgSymbol *ar, *b;
-  SgExpression *ind_deb[7],*head, *shgref, *bgref;
-  int j, n, buf_size, shw_size, rank, static_sign;
-  SgValueExp c0(0),cm1(-1);
-  SgStatement *if_st,*end_st,*cp, *cp1,*endif_st,*else_st; 
-  
-  if(!IND_refs) return;
-
-  cp = cp1 = cur_st->controlParent();
-  if( !one_inquiry){
-    ishg = ndvm;  shgref = DVM000(ishg);
-    ibg = ndvm+1; bgref  = DVM000(ibg);
-    doAssignStmtAfter(ConstRef(0)); // dvm000(ishg) = 0
-    doAssignStmtAfter(ConstRef(0)); // dvm000(ibg)  = 0
-    static_sign = 0; 
-  }
-  else {
-    iq   = nhpf++;
-    InitInquiryVar(iq);
-    if_st = doIfThenConstrForIND(HPF000(iq), 0, 1, 0, cur_st, cp);
-    cur_st = if_st;
-    doAssignTo_After(HPF000(iq), ConstRef(1)); // hpf000(iq) = 1 :inquiry has done
-    ishg = nhpf++;  shgref = HPF000(ishg);
-    ibg  = nhpf++; bgref  = HPF000(ibg);
-    doAssignTo_After(shgref, ConstRef(0)); // hpf000(ishg) = 0
-    doAssignTo_After( bgref, ConstRef(0)); // hpf000(ibg)  = 0
-    static_sign = 1; 
-    cp = if_st;
-  }  
-  ikind = ndvm++;
-  //looking through the IND_reference list
-  for(el=IND_refs; el; el=el->next){
-     ar = el->rmref->symbol();
-     rank = Rank(ar); 
-         // looking through the index list of remote variable
-         //for(es= el->rmref->lhs(),n=0; es; es= es->rhs(),n++)
-         
-     for(n = 0; n<7 && el->axis[n]; n++)
-        if( el->axis[n]->valueInteger() == 0)
-           ind_deb[n] = &(el->cons[n]->copy());
-        else
-           ind_deb[n] = &cm1.copy();
-     //allocating  buffer header (for remote data)  and arrays of shadow widths
-     buf_size = (el->nc) ? 2*(el->nc)+2 : 4; //memory size for buffer
-     if( !one_inquiry){
-       ibuf = ndvm;
-       ndvm+= buf_size;
-       b = dvmbuf; //or NULL
-     } else {
-       ibuf = nhpf;
-       nhpf+= buf_size;
-       b = hpfbuf;
-     }
-     ishw = ndvm;
-     shw_size = 2*rank;
-     //size = (buf_size > shw_size) ? buf_size : shw_size;
-     ndvm+= shw_size;
-     //generating inquiry for kind of data access
-     iaxis = ndvm; 
-     for(j=n-1; j>=0; j--)
-        doAssignStmtAfter(el->axis[j]);       
-     for(j=n-1; j>=0; j--)
-        doAssignStmtAfter(ReplaceFuncCall(el->coef[j]));
-     for(j=n-1; j>=0; j--)
-        doAssignStmtAfter(Calculate(el->cons[j]));
-
-     head = HeaderRef(el->rmref->symbol());
-     doAssignTo_After(DVM000(ikind), RemoteAccessKind(head, header_rf(b,ibuf,1),static_sign,iplp,iaxis,iaxis+n,iaxis+2*n,ishw,ishw+rank));
-     //SET_DVM(ishw);
-     SET_DVM(iaxis); 
-     //generating IF(dvm000(ikind).EQ.4) THEN ...ELSE...ENDIF
-     if_st = doIfThenConstrForIND(DVM000(ikind), 4, 1, 1, cur_st, cp);         
-     end_st = endif_st = if_st->lexNext()->lexNext(); //END IF statement
-     else_st  = if_st->lexNext(); // ELSE statement
-
-     //IF(dvm000(ibg).EQ.0) THEN ...ENDIF
-     //   hpf000(ibg)
-     if_st = doIfThenConstrForIND(bgref, 0, 1, 0, if_st, if_st);
-     cur_st = if_st;
-     doAssignTo_After(bgref,CreateBG(static_sign,1));//creating group of remote data buffer
-     where = else_st;
-     doAssignStmt(InsertRemBuf(bgref, header_rf(b,ibuf,1)));//inserting buffer in group
-     if(dvm_debug) {
-        ideb = ndvm;
-        for(j=n-1; j>=0; j--)
-           doAssignStmt(ReplaceFuncCall(ind_deb[j]));
-        InsertNewStatementBefore(D_RmBuf(head, GetAddresDVM( header_rf(b,ibuf,1)),n,ideb),else_st);
-     }
-     BufferHeaderCopy(b,ibuf, n, el);
-    
-     cur_st = else_st; // generating ELSE body
-     ArrayHeaderCopy(n,el);  
-     //generating IF(dvm000(ikind).NE.1) THEN ...ELSE...ENDIF
-     if_st = doIfThenConstrForIND(DVM000(ikind), 1, 0, 0, else_st, else_st);
-     end_st = if_st->lexNext(); //END IF statement 
-    //generating IF(dvm000(ikind).EQ.2) THEN {corner = 0} ELSE {corner = 1} ENDIF
-     cur_st = doIfThenConstrForIND(DVM000(ikind), 2, 1, 1, if_st, if_st);
-     doCallAfter(InsertArrayBound(shgref, head, ishw, ishw+rank, 0)); 
-                                           //inserting shadow in group with FullShadowSign=0
-     //icorn = ndvm++;
-     //doAssignTo_After(DVM000(icorn),new SgValueExp(0)); //corner = 0     
-     cur_st = cur_st->lexNext(); // ELSE
-     doCallAfter(InsertArrayBound(shgref, head, ishw, ishw+rank, 1)); 
-                                           //inserting shadow in groupwith FullShadowSign=1
-     //doAssignTo_After(DVM000(icorn),new SgValueExp(1)); //corner = 1
-     //IF(dvm000(ishg).EQ.0) THEN ...ENDIF
-     //   hpf000(ishg)
-     if_st = doIfThenConstrForIND(shgref, 0, 1, 0, if_st, if_st);
-     cur_st = if_st;
-     CreateBoundGroup(shgref); //creating group of shadow edges
-     where  = end_st;
-     //doAssignStmt(InsertArrayBound(shgref, head, ishw, ishw+rank, icorn)); 
-                                                                //inserting shadow in group
-     //ishsign = ndvm;
-     //maxsh = doShadowSignArray(el); see DepList(),doDepLengthArrays()
-     //doAssignStmt(InsertArrayBoundDep(shgref, head, ishw, ishw+rank, maxsh, ishsign));
-        //cur_st = end_st;
-        //  ArrayHeaderCopy(n,el);     
- 
-     SET_DVM(ishw);
-     cur_st = endif_st;
-  }
-  if(one_inquiry)
-     cur_st =  cur_st->lexNext();
-  //IF(dvm000(ishg).NE.0) THEN {executing SHADOW group} ENDIF
-  //   hpf000(ishg)
-  if_st =  doIfThenConstrForIND(shgref, 0, 0, 0, cur_st, cp1);
-  end_st = if_st->lexNext(); //END IF statement
-  cur_st = if_st;
-  doCallAfter(StartBound(shgref));  // starting exchange of shadow edges
-  doCallAfter(WaitBound (shgref));// waiting completion of shadow edges exchange
-  //IF(dvm000(ibg).NE.0) THEN {executing REMOTE group} ENDIF
-  //   hpf000(ibg)
-  if_st =  doIfThenConstrForIND(bgref, 0, 0, 0, end_st, cp1);
-  cur_st = if_st;
-  doAssignStmtAfter(LoadBG(bgref)); // starting load of buffer group
-  FREE_DVM(1);
-  doAssignStmtAfter(WaitBG(bgref));// waiting completion of  buffer group load
-  FREE_DVM(1);
-  
-  if( one_inquiry)
-    {SET_HPF(nhpf);}
-  else 
-    {SET_HPF(1);}
-  return;
-}
- 
-
-void InitInquiryVar(int iq)
-{SgStatement *st;
- st = cur_st;//save cur_st
- cur_st = first_hpf_exec;
- doAssignTo_After(HPF000(iq),ConstRef(0));
- cur_st = st; //resave cur_st
-}
-
-/**************************************************************\
-*                 Creating header copy                         *
-*        (calculating coefficients of address expression)      *
-\**************************************************************/
-void BufferHeaderCopy(SgSymbol *b, int ibuf, int n, IND_ref_list *el)
-// n - number of subscripts in array reference
-// hpf000(ihpf)        = getai(dvm000(ibuf))- header address
-// hpf000(ihpf+i)      = dvm000(ibuf+i) i=1,...,rank-1
-// hpf000(ihpf+rank)   = 1
-// hpf000(ihpf+rank+1) = f(dvm000(ibuf+1 : ibuf+2*rank+2)) - calculated 
-
-//
-//       Copy          BufferHeader(rank=3)
-//      _________        _________
-//     | adress  |      |         | 1
-//     |_________|      |_________|
-//     |    *    | <--- |    *    | 2      
-//     |_________|      |_________|
-//     |    *    | <--- |    *    | 3
-//     |_________|      |_________|
-//     |    1    |      |         | 4
-//     |_________|      |_________|
-//     |calculate|      |         | 5
-//     |_________|      |_________| 
-//                      | .  .  . |
-//                      |_________|
-//                      
-{int k,ind,rank;
- rank = el->nc; // rank of BufferArray
- ind = el->ind;
-   doAssignTo(header_rf(hpfbuf,ind,1),GetAddresDVM(header_rf(b,ibuf,1)));
- for(k=2; k<rank+1; k++)
-   doAssignTo(header_rf(hpfbuf,ind,k),header_rf(b,ibuf,k));
- if(rank){
-   doAssignTo(header_rf(hpfbuf,ind,rank+2), INDBufferHeaderNplus1(el,b,n,ibuf));
-   doAssignTo(header_rf(hpfbuf,ind,rank+1), new SgValueExp(1)); 
- } else
-   doAssignTo_After(header_rf(hpfbuf,ind,2),header_rf(b,ibuf,2));
-/*
- for(k=1; k<rank; k++)
-   doAssignTo(HPF000(ind+k),DVM000(ibuf+k));
- if(rank) {
-   doAssignTo(HPF000(ind+rank+1), INDBufferHeaderNplus1(el,n,ibuf));
-   doAssignTo(HPF000(ind+rank), new SgValueExp(1)); 
- }
- else
-   doAssignTo(HPF000(ind+1), DVM000(ibuf+1));
-*/
-}
-
-SgExpression *INDBufferHeaderNplus1(IND_ref_list *rme, SgSymbol *ar, int ni, int ihead)   
-{
-//                                      n
-// Header(n+1) = Header(n) -  L1*S1 - SUMMA(Header(n-i+1) * Li * Si)
-//                                     i=2   
-// Si = 1, if i-th remote subscript is ':', else Si = 0 
-// Li = lower bound of i-th array dimension if ':',  Li = Header(2*n-i+3) - minimum of
-// of lower bound and upper bound of corresponding do-variable,if a*i+b 
-  SgArrayType *artype;
-  SgExpression *ehead,*e;
- 
-  SgSymbol *array;
-  int i,ind,j,n,k;
-  array = rme->rmref->symbol();
-  n = rme->nc;
-  //ar = NULL;
-  if(!(array->attributes() & DIMENSION_BIT)){// for continuing translation
-      return (new SgValueExp(0));
-  }
-   artype = isSgArrayType(array->type());
-   if(!artype) // error
-     return(new SgValueExp(0)); //  for continuing translation of procedure 
-
-  ind = n+1; 
-  ehead =  header_rf(ar,ihead,ind);
-
-  i=0; j=0;
-  for(k = 0; k<ni ; k++)//looking  until first ':' or do-variable-use element
-    if( rme->axis[k]->valueInteger() != 0)
-      {j = 1; break;}
-    else
-      i++; 
- if(j == 0) //buffer is of one element
-   return(ehead);  
- if(rme->axis[k]->valueInteger() == -1) // :
-  if(!(e=LowerBound(array,i)))
-    return(new SgValueExp(0)); //  for continuing translation of procedure  
-  else
-    ehead = &(*ehead -  e->copy());
- else //a*i+b
-    ehead = &(*ehead -  (*header_rf(ar,ihead,ind+n+1)));
- for(k = k+1, i++; k<ni ; k++) //continue looking through the index list
-     if(rme->axis[k]->valueInteger() == -1){
-       ind--; 
-       e = artype->sizeInDim(i);
-       if(e && e->variant() == DDOT && e->lhs())
-         ehead = & (*ehead - (*header_rf(ar,ihead,ind) *
-                                                  (LowerBound(array,i)->copy())));
-       else
-         ehead = & (*ehead - (*header_rf(ar,ihead,ind))); // by default Li=1
-   }
-   else if(rme->axis[k]->valueInteger() > 0){
-       ind--; 
-       ehead = & (*ehead - (*header_rf(ar,ihead,ind) * (*header_rf(ar,ihead,ind+n+1))));
-   }
-  return(ehead);
-}
-
-void  ArrayHeaderCopy(int n, IND_ref_list *el)
-{ int k, i, ind, rank, num;
-  SgSymbol *ar;
-  SgExpression *e;
-  ind = el->ind;
-  rank = el->nc;
-  ar = el->rmref->symbol(); //array symbol
-  doAssignTo_After(HPF000(ind+rank+1),HeaderRefInd(ar,n+2));//HeaderCopy(rank+1)=Header(n+2)
-  num = el->axis[0]->valueInteger();
-  i = rank;
-  if(num == - 1) { // 1-st index is ':'
-      doAssignTo_After(HPF000(ind+rank), new SgValueExp(1));//HeaderCopy(rank) = 1
-      i--;
-  } else {
-    if(num > 0) { // 1-st index is a*IND+b
-      doAssignTo_After(HPF000(ind+rank), el->coef[0]);      //HeaderCopy(rank) = a
-      i--;
-    }
-    if(el->cons[0]->lhs() && !INTEGER_VALUE(el->cons[0]->lhs(),0)) // b != 0
-      doAssignTo_After(HPF000(ind+rank+1), &(*HPF000(ind+rank+1)+(*el->cons[0]->lhs()))); 
-                                     //HeaderCopy(rank+1) = HeaderCopy(rank+1) + b 
-  }
-  for(k=1; k<n; k++){
-    num = el->axis[k]->valueInteger();
-    if(num == - 1) { // k-th index is ':'
-      doAssignTo_After(HPF000(ind+i),HeaderRefInd(ar,n-k+1));//HeaderCopy(i) = Header(k)
-      i--;
-    } else {
-      if(num > 0) { // k-th index is a*IND+b
-        e = INTEGER_VALUE(el->coef[k],1) ? HeaderRefInd(ar,n-k+1) : &(*HeaderRefInd(ar,n-k+1)*(*el->coef[k]));                           
-        doAssignTo_After(HPF000(ind+i), e);        //HeaderCopy(i) = a * Header(k) 
-        i--;
-      }
-      if(el->cons[k]->lhs() && !INTEGER_VALUE(el->cons[k]->lhs(),0)) // b!= 0
-        doAssignTo_After(HPF000(ind+rank+1), &(*HPF000(ind+rank+1)+(*HeaderRefInd(ar,n-k+1)*(*el->cons[k]->lhs()))));    // HeaderCopy(rank+1) = HeaderCopy(rank+1) + b * Header(k)
-    }    
-  }
-  doAssignTo_After(HPF000(ind), GetAddresDVM(HeaderRefInd(ar,1)));
-  return;
-}
-/**************************************************************\
-*       Looking for reduction operation                        *
-\**************************************************************/
-
-int NodeBefore=ASSIGN_STAT;
-int CompareIfReduction(SgExpression *e1, SgExpression *e2)
-{ 
-  if(!e1||!e2)  return(0); 
-  if(e1->variant() != e2->variant())
-      return(0);
-  if(e1->variant() != VAR_REF && e1->variant() != ARRAY_REF)
-      return(0);
-  if(e1->symbol() != e2->symbol())
-    return(0);
-  if(e1->variant() == ARRAY_REF && !ExpCompare(e1->lhs(),e2->lhs()))
-    return(0);
-  return (1);    
-}   
-
-/* Function returns number of reduction operation 			 */
-/* expr_ind is used in order to correspond position of reduction variable*/
-/* if SgExpression e - if-condition 'rv ol er' expr_ind=0		 */
-/* if SgExpression e - if-condition 'er ol rv' expr_ind=1		 */
-/* else expr_ind=0							 */
-int ReductionFuncNumber(SgExpression *e,int expr_ind)
-{
-  switch(e->variant())
-      {
-      case ADD_OP: return (1);
-      case MULT_OP: return (2);
-      case AND_OP: return (5);
-      case OR_OP: return (6);
-      case NEQV_OP: return (7);
-      case EQV_OP: return (8);
-      case XOR_OP: return (0);
-      case FUNC_CALL: {
-                        char *red_name;
-			red_name   = ((e->symbol())->identifier());
-			if(!strcmp(red_name, "max"))
-			    return(3);
-                        if(!strcmp(red_name, "min"))
-			    return(4);
-                      };break;
-      case LT_OP:
-      case LTEQL_OP:  if (expr_ind==0) return (3); /*max*/
-                      else return (4);/*min*/
-      case GT_OP:
-      case GTEQL_OP:  if (expr_ind==0) return (4);
-                      else return (3);		      
-      default:  return (0);
-      }
-return 0;
-}
-
-/* Function checks if pos_red is in newl-list 			 */
-int IsInNewList(SgExpression *pos_red, SgExpression *newl)
-{
-SgExpression *ExprList;
-if (!newl) return 0;
-if (!pos_red) return 0;
-if (pos_red->variant()!=VAR_REF && pos_red->variant()!=ARRAY_REF) return 0;
-for (ExprList=newl;ExprList&&(ExprList->variant()==EXPR_LIST);ExprList=ExprList->rhs())
-    {
-    if ((ExprList->lhs())->variant()==VAR_REF || (ExprList->lhs())->variant()==ARRAY_REF )
-	if (ExprList->lhs()->symbol()==pos_red->symbol())
-	    return 1;
-    }
-return 0;
-}
-/* Function checks if pos_red is already in reduction-list */
-int IsInReductionList(SgExpression *pos_red)
-{
-reduction_list *rlist=redl;
-if (!pos_red) return 0;
-if(pos_red->variant()!=VAR_REF && pos_red->variant()!=ARRAY_REF) return 0;
-for (;rlist;rlist=rlist->next)
-    {
-    if (rlist->red_var)
-	if (rlist->red_var->symbol()==pos_red->symbol())
-	    return 1;
-    }
-return 0;
-}
-
-/* Function checks if pos_red is reduction-variable       *
- * pos_red should be variable, shouldn`t be in newl-list, *
- * pos_red shouldn`t be loop-variable and distribute-array*/
-int IsReductionVariable(SgExpression *pos_red, SgExpression *newl)
-{
-if (!pos_red) return 0;
-
-if (pos_red->variant()!=VAR_REF && pos_red->variant()!=ARRAY_REF)
-    {
-    return 0;
-    }
-if (IsInNewList(pos_red,newl)) 
-    {
-    return 0;
-    }
-if (IS_DISTR_ARRAY(pos_red->symbol())) 
-    {
-    return 0;
-    }
-if (isDoVar(pos_red->symbol())) 
-    {
-    return 0;
-    }
-return 1;
-}
-
-int IsError(SgExpression *pos_red, SgExpression *newl, int variant)
-{
-if (!pos_red) return 0;
-if (IsInNewList(pos_red,newl)) return 0;
-if (variant&&IsReductionVariable(pos_red,newl)) return 0;
-if (IS_DISTR_ARRAY(pos_red->symbol())) return 0;
-return 1;
-}
-
-int FindInExpr(SgExpression *red, SgExpression *expr)
-{
-if(!expr)  return 0;
-if (!red) return 0;
-if (red->variant()!=VAR_REF && red->variant()!=ARRAY_REF) return 0;
-
-if(red->variant()==VAR_REF && red->variant() == expr->variant())  
-  {
-  if (red->symbol()== expr->symbol())
-      return 1;
-  else return 0;
-  }
-
-if(red->variant()==ARRAY_REF && red->variant() == expr->variant())
- { 
-   if (red->symbol() == expr->symbol())
-      return(ExpCompare(red->lhs(),expr->lhs()));
- }
-return (FindInExpr(red,expr->lhs())+FindInExpr(red,expr->rhs()));
-}
-
-
-int IsReductionOp(SgStatement *st, SgExpression *newl)
-{
-reduction_list *rlist;
-int variant=0;
-SgExpression *ExprList1,*ExprList2,*Reduction;
-ExprList1=ExprList2=Reduction=NULL;
-if(st || newl) 
-    {
-    if (st->variant() == ASSIGN_STAT)
-	{
-	ExprList1=st->expr(0);
-	ExprList2=st->expr(1);
-	//ExprList =st->expr(1);
-	if (ExprList2&&(ExprList2->variant() != FUNC_CALL))
-	    {
-	    if (ExprList2->lhs())
-		{
-		/* rv=rv op er */
-		if (CompareIfReduction(ExprList1,ExprList2->lhs()))
-		    {
-		      //  ExprList =ExprList2->rhs();
-		    Reduction=ExprList2->lhs();
-		    variant=11;
-		    }
-    		else 
-		    {
-		    if (ExprList2->rhs())
-			{
-			/* rv=er op rv */
-    			if (CompareIfReduction(ExprList1,ExprList2->rhs()))
-			    {
-			    Reduction=ExprList2->rhs();
-			    //    ExprList =ExprList2->lhs();
-			    variant=12;
-			    }
-			}
-		    }
-		}
-	    }
-	else
-	    {
-	    /* rv=f(rv,er) or rv=f(er,rv) */
-	    char *red_name;
-	    red_name   = ((ExprList2->symbol())->identifier());
-	    if(!strcmp(red_name, "max")||!strcmp(red_name, "min"))
-		{
-		if (ExprList2->lhs()&&((ExprList2->lhs())->variant()==EXPR_LIST))
-		    {
-		    /* rv=f(rv,er) */
-		    if (CompareIfReduction(ExprList1,ExprList2->lhs()->lhs()))
-			{
-			variant=21;
-			Reduction=(ExprList2->lhs())->lhs();
-			// ExprList=(ExprList2->lhs())->rhs();
-			}
-    		    else 
-			{
-			/* rv=f(er,rv) */
-			if (ExprList2->lhs()->rhs()&&CompareIfReduction(ExprList1,ExprList2->lhs()->rhs()->lhs()))
-			    {
-			    variant=22;
-			    Reduction=ExprList2->lhs()->rhs()->lhs();
-			    // ExprList=ExprList2->lhs()->lhs();
-			    }
-			}
-		    }
-		}
-	    if (!variant)
-		{
-		if (IsError(ExprList1,newl,variant))
-		    err("Illegal statement in the range of parallel loop",94,st);
-		return (0);
-		}		    		
-	    }
-	}
-      if (IsError(ExprList1,newl,variant))
-	{
-	/*We need check variant 'if ( rv ol er ) rv = er' or 'if ( er ol rv ) rv = er'*/
-	if (NodeBefore!=LOGIF_NODE)
-	    err("Illegal statement in the range of parallel loop",94,st); 	
-	return (0);
-	}
-      NodeBefore=ASSIGN_STAT;	      
-      if (Reduction&&variant)  
-	{
-	 if (IsReductionVariable(ExprList1,newl))
-	     {
-	     if (IsInReductionList(Reduction)||!ReductionFuncNumber(ExprList2,0))
-	         {
-		 err("Illegal statement in the range of parallel loop",94,st); 	
-		 return (0);
-		 }
-	     rlist= new reduction_list;
-	     if (rlist)
-	         {
-		 if (!redl) rlist->next=NULL;
-		 else rlist->next=redl;
-	         rlist->red_op=ReductionFuncNumber(ExprList2,0);
-                 rlist->red_var=&(Reduction->copy());
-                 if(rlist->red_var->variant() == ARRAY_REF)
-                   rlist->red_var->setLhs(NULL);
-	         redl=rlist;
-	         }
-	     else return 0;
-	     return 1;
-	    }
-	}
-    return 0;	    
-    }
- else
-  return 0;
-}
-
-int IsLIFReductionOp(SgStatement *st, SgExpression *newl)
-{
-SgStatement *assign;
-PTR_BFND abif;
-int variant=0;
-if(st || newl) 
-  {
-  reduction_list *rlist;
-  /*'if ( rv ol er ) rv = er' or 'if ( er ol rv ) rv = er'*/
-  NodeBefore=LOGIF_NODE;
-  if (st&&(st->variant()==LOGIF_NODE))
-      {
-      /* assign = 'rv = er'*/
-      abif= BIF_BLOB1(st->thebif) ? BLOB_VALUE(BIF_BLOB1(st->thebif)):(PTR_BFND)NULL;
-      assign=new SgStatement(abif);
-      if (assign&&(assign->variant()==ASSIGN_STAT))
-          {
-          if (assign->expr(0)&&(assign->expr(0)->variant()==VAR_REF))
-	      if (st->expr(0)&&((st->expr(0)->lhs()->variant()==VAR_REF)||(st->expr(0)->rhs()->variant()==VAR_REF)))
-	          {
-	          if (st->expr(0)->lhs()->variant()==VAR_REF)
-		      {
-		      if (st->expr(0)->lhs()->symbol()==assign->expr(0)->symbol())
-		         if (!FindInExpr(st->expr(0)->lhs(),st->expr(0)->rhs())&&!FindInExpr(st->expr(0)->lhs(),assign->expr(1)))
-			     {
-			     /*if ( rv ol er ) rv = er*/
-			     variant= 31;
-			     /*fprintf(stderr,"variant 31\n");*/
-			     }
-		      }
-		 else if (st->expr(0)->rhs()->symbol()==assign->expr(0)->symbol())
-		         if (!FindInExpr(st->expr(0)->rhs(),st->expr(0)->lhs())&&!FindInExpr(st->expr(0)->rhs(),assign->expr(1)))
-		             { 
-			     /*if ( er ol rv ) rv = er*/
-			     variant= 32;
-			     /*fprintf(stderr,"variant 32\n");*/
-			     }
-		 }
-         if (IsError(assign->expr(0),newl,variant))
-	    {
-	    err("Illegal statement in the range of parallel loop",94,st); 	
-	    return (0);
-	    }
-         if (assign->expr(0)&&variant)  
-	    {
-	     if (IsReductionVariable(assign->expr(0),newl))
-	         {
-	         if (IsInReductionList(assign->expr(0))||!ReductionFuncNumber(st->expr(0),0))
-	             {
-		     err("Illegal statement in the range of parallel loop",94,st); 	
-		     return (0);
-		     }	     
-		 rlist= new reduction_list;
-	         if (rlist)
-	             {
-	             if (!redl) rlist->next=NULL;
-		     else rlist->next=redl;
-		     if (variant==31) rlist->red_op=ReductionFuncNumber(st->expr(0),0);
-	             else rlist->red_op=ReductionFuncNumber(st->expr(0),1);
-                     rlist->red_var=&(assign->expr(0)->copy());
-                     if(rlist->red_var->variant()==ARRAY_REF)
-                        rlist->red_var->setLhs(NULL);
-	             redl=rlist;
-	             }
-	         else return 0;
-		 return 1;
-		}
-	    }
-      return 0;
-          }
-      else return 0;
-      }
-  }
- else
-  return 0;
-return 0;
-}
-
-
-/**************************************************************\
-*                 Miscellaneous functions                      *
-\**************************************************************/
-int isNewVar(SgSymbol *s)
-{SgExpression *enl, *el;
- enl = indep_st->expr(0) ? indep_st->expr(0)->lhs() : indep_st->expr(0);//NEW variable list
- for(el=enl; el; el=el->rhs()) {
-   if(s == el->lhs()->symbol()) // is NEW variable
-      return(1);
- }
- return(0);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/io.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/io.cpp
deleted file mode 100644
index bef53c4..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/io.cpp
+++ /dev/null
@@ -1,2905 +0,0 @@
-/**************************************************************\
-* Fortran DVM                                                  * 
-*                                                              *
-*            Input/Output Statements Processing                *
-\**************************************************************/
- 
-#include "dvm.h"
-#define NO_ERROR_MSG 0
-
-static const char *filePositionArgsStrings[] = { "unit", "fmt", "rec", "err", "iostat", "end", "nml", "eor", "size", "advance", "iomsg" };
-
-// enum for new open/close
-enum {UNIT_IO, ACCESS_IO, ACTION_IO, ASYNC_IO, BLANK_IO, DECIMAL_IO, DELIM_IO, ENCODING_IO, ERR_IO, FILE_IO,
-  FORM_IO, IOSTAT_IO, IOMSG_IO, NEWUNIT_IO, PAD_IO, POSITION_IO, RECL_IO, ROUND_IO, SIGN_IO, STATUS_IO, DVM_MODE_IO, NUMB__CL };
-static const char *openCloseArgStrings[] = { "unit", "access", "action", "async", "blank", "decimal", "delim",
-  "encoding", "err", "file", "form", "iostat", "iomsg", "newunit", "pad", "position", "recl", "round", "sign",
-  "status", "io_mode" };
-
-enum { UNIT_RW, FMT_RW, NML_RW, ADVANCE_RW, ASYNC_RW, BLANK_RW, DECIMAL_RW, DELIM_RW, END_RW, EOR_RW, ERR_RW, ID_RW,
-  IOMSG_RW, IOSTAT_RW, PAD_RW, POS_RW, REC_RW, ROUND_RW, SIGN_RW, SIZE_RW, NUMB__RW };
-static const char *readWriteArgStrings[] = { "unit", "fmt", "nml", "advance", "async", "blank", "decimal", "delim", "end", "eor", "err", "id", "iomsg", "iostat", "pad", "pos", "rec", "round", "sign", "size"};
-
-int Check_ReadWritePrint(SgExpression *ioc[], SgStatement *stmt, int error_msg);
-void Replace_ReadWritePrint( SgExpression *ioc[], SgStatement *stmt);
-
-int TestIOList(SgExpression *iol, SgStatement *stmt, int error_msg)
-{SgExpression *el,*e;
-int tst=1;
-for (el=iol;el;el=el->rhs()) {    
-   e = el->lhs();  // list item
-   ReplaceFuncCall(e); 
-   if(isSgExprListExp(e)) // implicit loop in output list
-     e = e->lhs();
-   if(isSgIOAccessExp(e)) {
-      tst=ImplicitLoopTest(e,stmt,error_msg) ? tst : 0; 
-   }
-   else 
-      tst=IOitemTest(e,stmt,error_msg) ? tst : 0;     
- }
-return (tst);
-}
-
-int ImplicitLoopTest(SgExpression *eim, SgStatement *stmt, int error_msg)
-{int tst =1;
- SgExpression *ell, *e;
- if(isSgExprListExp(eim->lhs()))
-   for (ell = eim->lhs();ell;ell=ell->rhs()){ //looking through item list of implicit loop
-     e = ell->lhs();
-     if(isSgExprListExp(e)) // implicit loop in output list
-       e = e->lhs();
-     if(isSgIOAccessExp(e)){
-       tst=ImplicitLoopTest(e,stmt,error_msg) ? tst : 0; 
-     }
-     else 
-       tst=IOitemTest(e,stmt,error_msg) ? tst : 0;    
-   }
- else
-       tst=IOitemTest(eim->lhs(),stmt,error_msg) ? tst : 0;   
- return(tst);
-}
-
-int IOitemTest(SgExpression *e, SgStatement *stmt, int error_msg)
-{int tst=1;
- if(!e) return(1);
- if(isSgArrayRefExp(e)){
-   if( HEADER(e->symbol())) {
-       if(error_msg)
-         Error("Illegal I/O list item: %s",e->symbol()->identifier(),192,stmt);
-       return (0);
-   } else
-       return(1);
- }
- if(isSgRecordRefExp(e)) { 
-   SgExpression *eleft = SearchDistArrayField(e); //from right to left  
-   if(eleft) {
-       if(error_msg)
-         Error("Illegal I/O list item: %s",isSgRecordRefExp(eleft) ? eleft->rhs()->symbol()->identifier(): eleft->symbol()->identifier(),192,stmt);
-       return (0);
-   } else
-       return(1);
- }
- if(e->variant()  == ARRAY_OP) //substring
-       return(IOitemTest(e->lhs(),stmt,error_msg));
- if(isSgVarRefExp(e) || isSgValueExp(e))
-    return(1);
- tst=IOitemTest(e->lhs(),stmt,error_msg) ? tst : 0;  
- tst=IOitemTest(e->rhs(),stmt,error_msg) ? tst : 0;   
- return(tst);
-}      
-
-SgStatement *Any_IO_Statement(SgStatement *stmt) 
-{ SgStatement *last;
-  ReplaceContext(stmt); 
-  if(!IN_COMPUTE_REGION)
-     LINE_NUMBER_BEFORE(stmt,stmt);
-  SgExpression *ioEnd[3];
-  if(hasEndErrControlSpecifier(stmt, ioEnd))
-     ReplaceStatementWithEndErrSpecifier(stmt,ioEnd);           	    
-  if(perf_analysis){
-     InsertNewStatementBefore(St_Biof(),stmt);
-     InsertNewStatementAfter ((last = St_Eiof()),stmt,stmt->controlParent());
-     cur_st = stmt;
-     return(last); 
-  } 
-  return(stmt);
-}
-
-void IoModeDirective(SgStatement *stmt, char io_modes_str[], int error_msg)
-{
-  SgExprListExp *modes = isSgExprListExp(stmt->expr(0));
-  int imode = 0;
-  if (!options.isOn(IO_RTS)) {
-     if(error_msg)
-        warn("Directive IO_MODE is ignored, -ioRTS option should be specified",623,stmt);
-     return;
-  }
-  for (imode = 0; imode < modes->length(); ++imode) {
-     SgExpression *mode = modes->elem(imode);
-     if (mode->variant() == PARALLEL_OP)
-        io_modes_str[imode] = 'p';
-     else if (mode->variant() == ACC_LOCAL_OP)
-	io_modes_str[imode] = 'l';
-     else if (mode->variant() == ACC_ASYNC_OP)
-	io_modes_str[imode] = 's';
-     else
-        if(error_msg)
-           err("Illegal elements in IO_MODE directive", 460, stmt);
-  }
-  io_modes_str[imode] = '\0';
-  if (stmt->lexNext()->variant() != OPEN_STAT) {
-     if(error_msg)
-        err("Misplaced directive: no OPEN statement after IO_MODE statement", 103, stmt);
-     io_modes_str[0]='\0';
-  }
-}
-
-void Open_Statement(SgStatement *stmt, char io_modes_str[], int error_msg)
-{
-  Any_IO_Statement(stmt);
-  if(options.isOn(IO_RTS) && io_modes_str[0] != '\0')
-     Open_RTS(stmt, io_modes_str, error_msg);
-  else
-     OpenClose(stmt,error_msg);
-}
-
-void Open_RTS(SgStatement* stmt, char* io_modes_str, int error_msg) {
-  SgExpression *ioc[40];
-  int io_err = control_list_open_new(stmt->expr(1), ioc);
-  if(!io_err)
-  {
-	if( error_msg )
-	  err("Illegal elements in control list", 185, stmt);
-	return;
-  }
-  
-  bool suitableForNewIO = checkArgsOpen(ioc, stmt, error_msg, io_modes_str);
-  if (!suitableForNewIO) return;
-  Dvmh_Open(ioc, io_modes_str);
-  io_modes_str[0]='\0';
-}
-
-void Close_Statement(SgStatement *stmt, int error_msg)
-{
-  Any_IO_Statement(stmt);
-  if(options.isOn(IO_RTS))
-     Close_RTS(stmt,error_msg);
-  else
-     OpenClose(stmt,error_msg);
-}
-
-void Close_RTS(SgStatement *stmt, int error_msg)
-{
-  SgExpression *ioc[NUMB__CL];
-  int io_err = control_list_close_new(stmt->expr(1), ioc);
-  if(!io_err)
-  {
-	if( error_msg )
-	{
-	  if (!ioc[UNIT_IO])
-		err("UNIT not specified in close statement", 456, stmt);
-	  else
-		err("Illegal elements in control list", 185, stmt);
-	}
-	return;
-  }
-  
-  bool suitableForNewIO = checkArgsClose(ioc, stmt, error_msg);
-  
-  // generate If construct:
-  //     if (dvmh_ftn_connected (args) then <by_RTS2> else <BY_IO_Fortran> endif
-  SgStatement *ifst = IfConnected(stmt,ioc[UNIT_],suitableForNewIO);
-  SgStatement *last = ifst->lastNodeOfStmt();  //stmt->lexNext();
-  //true body
-  Dvmh_Close(ioc);
-  
-  //false body
-  NewOpenClose(stmt);
-  cur_st = last;
-}
-
-
-void OpenClose(SgStatement *stmt, int error_msg)
-{
-  SgExpression *ioc[NUM__O];  
-  int io_err=control_list_open(stmt->expr(1),ioc); // control_list analisys
-  if(error_msg)
-     Check_Control_IO_Statement(io_err,ioc,stmt,error_msg); 
-  if(!options.isOn(READ_ALL))
-     Replace_IO_Statement(ioc,stmt); 
-  cur_st = stmt;
-  return;
-}
-
-void NewOpenClose(SgStatement *stmt)
-{
-  SgExpression *ioc[NUM__O];  
-  int io_err=control_list_open(stmt->expr(1),ioc); // control_list analisys
-  io_err = Check_Control_IO_Statement(io_err,ioc,stmt,NO_ERROR_MSG);
-  if(io_err)
-     ReplaceByStop(io_err,stmt);
-  else
-     Replace_IO_Statement(ioc,stmt); 
-  return;
-}
-
-void Replace_IO_Statement(SgExpression *ioc[],SgStatement *stmt)
-{
-  cur_st = stmt; 
-  if(ioc[IOSTAT_])  // there is keyed argument IOSTAT 
-     InsertSendIOSTAT(ioc[IOSTAT_]);
-  ReplaceByIfStmt(stmt);     
-}
-
-void ReplaceByStop(int io_err, SgStatement *stmt)
-{
-  SgStatement *new_stmt = new SgStatement(STOP_STAT);
-  stmt->insertStmtAfter(*new_stmt,*stmt->controlParent());
-  char num3s[4];
-  format_num(io_err, num3s);
-  char *buff = new char[strlen(stmt->fileName()) + 75]; 
-  sprintf(buff, "Illegal IO statement, error %s on line %d of %s", num3s,stmt->lineNumber(), stmt->fileName());
-  new_stmt = new SgStatement(PRINT_STAT);
-  new_stmt->setExpression(0,*new SgExprListExp(*new SgValueExp(buff)));
-  SgExpression *ecl = new SgExpression(SPEC_PAIR,new SgKeywordValExp("fmt"),new SgKeywordValExp("*"),NULL);
-  new_stmt->setExpression(1,*new SgExprListExp(*ecl));
-  stmt->insertStmtAfter(*new_stmt,*stmt->controlParent());
-  stmt-> extractStmt(); //extract IO statement
-  return;
-}
-
-int Check_Control_IO_Statement(int io_err, SgExpression *ioc[], SgStatement *stmt, int error_msg)
-{
-  if( !io_err )
-  {
-     if( error_msg ) 
-	err("Illegal elements in control list", 185,stmt);
-     else
-	return (185);
-  }
-  if( ioc[ERR_] )
-  {
-     if( error_msg )
-	err("END= and ERR= specifiers are illegal in FDVM", 186,stmt);
-     else
-        return (186);  
-  }	
-  if( inparloop && (ioc[IOSTAT_] || stmt->variant() == INQUIRE_STAT) || stmt->variant() == READ_STAT) //(stmt->variant() == INQUIRE_STAT &&  ? (SgExpression *) 1 : ioc[IOSTAT_]) && inparloop )
-  {
-     if( error_msg)
-	err("Illegal I/O statement in the range of parallel loop/region", 184,stmt);
-     else
-        return (184);
-  }
-  return(0);
-}
-
-void Inquiry_Statement(SgStatement *stmt, int error_msg)
-{
-  Any_IO_Statement(stmt);
-  if(options.isOn(IO_RTS))
-    ; // Inquiry_RTS(stmt);
-  else
-     Inquiry(stmt,error_msg);
-}
-
-void Inquiry(SgStatement *stmt, int error_msg)
-{
-  SgExpression *ioc[NUM__O+1];
-  int io_err;
-  io_err=control_list_inquire(stmt->expr(1),ioc);  // control list analysis
-  if(error_msg)
-     Check_Control_IO_Statement(io_err,ioc,stmt,error_msg); 
-  cur_st = stmt;
-  InsertSendInquire(ioc);
-  ReplaceByIfStmt(stmt); 
-  cur_st = stmt;            
-}
-
-void FilePosition_Statement(SgStatement *stmt, int error_msg)
-{
-  Any_IO_Statement(stmt);
-  // RTS BACKSPACE isn't implemented!
-  if(options.isOn(IO_RTS))
-	FilePosition_RTS(stmt, error_msg);
-  else
-	FilePosition(stmt,error_msg);
-}
-
-void FilePosition_RTS(SgStatement* stmt, int error_msg) {
-  
-  SgExpression *ioc[NUM__R];
-  int io_err = control_list1(stmt->expr(1), ioc);
-  // FIXME: it would be better to replace this error to control_list1
-  if (!ioc[UNIT_]) {
-    if (error_msg)
-      err("Unit argument not specified in IO-statement", 456, stmt);
-    return;
-  }
-  if(!io_err)
-  {
-	if( error_msg )
-	  err("Illegal elements in control list", 185, stmt);
-	return;
-  }
-  
-  bool suitableForNewIO = checkArgsEnfileRewind(ioc, stmt, error_msg);
-  
-  // generate If construct:
-  //     if (dvmh_ftn_connected (args) then <by_RTS2> else <BY_IO_Fortran> endif
-  SgStatement *ifst = IfConnected(stmt,ioc[UNIT_],suitableForNewIO);
-  SgStatement *last = ifst->lastNodeOfStmt();  //stmt->lexNext();
-  //true body
-  Dvmh_FilePosition(ioc, stmt->variant());
-  
-  //false body
-  NewFilePosition(stmt);  //Replace_IO_Statement(ioc,stmt); 
-  cur_st = last;
-}
-
-
-void FilePosition(SgStatement *stmt, int error_msg)
-{
-  SgExpression *ioc[NUM__R];
-  
-  int io_err;
-  io_err = control_list1(stmt->expr(1),ioc); // control_list analisys
-  if(error_msg)
-     Check_Control_IO_Statement(io_err,ioc,stmt,error_msg); 
-  Replace_IO_Statement(ioc,stmt); 
-  cur_st = stmt;
-  return;
-}
-
-void NewFilePosition(SgStatement *stmt)
-{
-  SgExpression *ioc[NUM__R];
-  int io_err = control_list1(stmt->expr(1),ioc); // control_list analisys
-  io_err = Check_Control_IO_Statement(io_err,ioc,stmt,NO_ERROR_MSG);
-  if(io_err)
-     ReplaceByStop(io_err,stmt);
-  else
-     Replace_IO_Statement(ioc,stmt); 
-  return;
-}
-
-void ReadWrite_Statement(SgStatement *stmt, int error_msg)
-{
-  Any_IO_Statement(stmt);
-  if(options.isOn(IO_RTS))
-    ReadWrite_RTS(stmt,error_msg);
-  else
-    ReadWritePrint_Statement(stmt,error_msg);
-}
-
-void NewReadWritePrint_Statement(SgStatement *stmt)
-{
-  SgExpression *ioc[NUM__R];
-
-  int io_err= IOcontrol(stmt->expr(1),ioc,stmt->variant());  //control_list1(stmt->expr(1),ioc); // control_list analisys
-  io_err = Check_Control_IO_Statement(io_err,ioc,stmt,NO_ERROR_MSG);
-  if(!io_err) 
-     io_err = Check_ReadWritePrint(ioc,stmt,NO_ERROR_MSG); 
-  if(io_err)
-     ReplaceByStop(io_err,stmt);
-  else
-     Replace_ReadWritePrint(ioc, stmt);
-  return;
-}
-
-void ReadWrite_RTS(SgStatement *stmt, int error_msg)
-{
-  SgExpression *ioc[NUMB__RW];
-  int io_err = control_list_rw(stmt->expr(1),ioc);
-  if(!io_err)
-  {
-    if( error_msg ) {
-      if (!ioc[UNIT_RW])
-        err("UNIT not specified in read/write statement", 456, stmt);
-      else
-        err("Illegal elements in control list", 185, stmt);
-    }
-    return;
-  }
-	
-  bool suitableForNewIO = checkArgsRW(ioc, stmt, error_msg);
-	
-  // generate If construct:
-  //     if (dvmh_ftn_connected (args) then <by_RTS2> else <BY_IO_Fortran> endif
-  SgStatement *ifst = IfConnected(stmt,ioc[UNIT_],suitableForNewIO);
-  SgStatement *last = ifst->lastNodeOfStmt();  //stmt->lexNext();
-
-  //true body
-  Dvmh_ReadWrite(ioc, stmt);
-	
-  //false body
-  NewReadWritePrint_Statement(stmt);
-  cur_st = last;
-}
-
-int FixError(const char *str, int ierr, SgSymbol *s, SgStatement *stmt, int error_msg)
-{
-  if(error_msg) { 
-      if(s)
-         Error(str,s->identifier(),ierr,stmt);
-      else
-         err(str,ierr,stmt);
-      return (-1);
-  }
-   else
-      return(ierr);
-}
-
-int Check_ReadWritePrint(SgExpression *ioc[], SgStatement *stmt, int error_msg)
-{
-  if(ioc[END_] || ioc[ERR_] || ioc[EOR_])
-     return FixError("END=, EOR= and ERR= specifiers are illegal in FDVM",186,NULL,stmt,error_msg);
- 
-  if(ioc[UNIT_] && (ioc[UNIT_]->type()->variant() == T_STRING) && ioc[UNIT_]->symbol() && HEADER(ioc[UNIT_]->symbol())) 
-     return FixError("'%s' is distributed array",148,ioc[UNIT_]->symbol(),stmt,error_msg);
-
-  if(ioc[FMT_]) 
-  {            
-     SgKeywordValExp *kwe = isSgKeywordValExp(ioc[FMT_]);
-     if(kwe && strcmp(kwe->value(),"*"))
-        return FixError("Invalid format specification",189,NULL,stmt,error_msg); 
-  } 
-  SgExpression *iol = stmt->expr(0);  //  I/O list     
-  SgExpression *e;
-  if(iol && (e = isSgArrayRefExp(iol->lhs())) &&  (HEADER(iol->lhs()->symbol()))) 
-  {                                 // first item is distributed array refference
-     if (iol->rhs() )  // there are other items in I/O-list
-        return FixError("Illegal I/O list ",190,NULL,stmt,error_msg);
- 
-     //if(ioc[IOSTAT_] ) 
-     //  return FixError("IOSTAT= specifier is illegal in I/O of distributed array", 187,NULL,stmt,error_msg); 
-
-     if(ioc[FMT_] && !isSgKeywordValExp(ioc[FMT_]) || ioc[NML_] ) 
-        return FixError("I/O of distributed array controlled by format specification or NAMELIST is not supported in FDVM", 191,NULL,stmt,error_msg);
-
-     if(ioc[UNIT_] && (ioc[UNIT_]->type()->variant() == T_STRING) && ioc[UNIT_]->symbol()) //I/O to internal file
-        return FixError("'%s' is distributed array",148,e->symbol(),stmt,error_msg);
-
-     if(IN_COMPUTE_REGION && !inparloop && !in_checksection ) 
-        return FixError("Illegal statement in the range of region (not implemented yet)", 576,NULL,stmt,error_msg);
-  }
-  else {
-     if( iol && !TestIOList(iol,stmt,error_msg) && !error_msg) // check I/O list
-        return (192);
-  }
-  return(0);
-}
-
-void Replace_ReadWritePrint( SgExpression *ioc[], SgStatement *stmt)
-// READ, WRITE, PRINT statements
-
-{           
-            SgExpression *e, *iol;
-            int IOtype;
-
-            cur_st = stmt; 
-                       
-            // analizes UNIT specifier                                  
-            if(ioc[UNIT_] && (ioc[UNIT_]->type()->variant() == T_STRING)) {
-               SgKeywordValExp *kwe;  
-               if((kwe=isSgKeywordValExp(ioc[UNIT_])) && (!strcmp(kwe->value(),"*")))
-                                                                       //"*" - system unit
-                   ;
-               else  // I/O to internal file           
-                 return;                 
-	    }   
-            
-            // analizes format specifier and determines type of I/O
-            if(ioc[FMT_]) {
-            
-               SgKeywordValExp *kwe = isSgKeywordValExp(ioc[FMT_]);
-               if(kwe) // Format
-                  if(!strcmp(kwe->value(),"*"))
-                     IOtype = 1; // formatted IO, controlled by IO-list  
-                  else                      
-                     return;   // illegal format specifier ??
-                  
-               else
-                     IOtype = 2; // formatted IO, controlled by format
-                                 // specification or NAMELIST
-            }
-            else
-                     IOtype = 3; // unformatted IO
-            if(ioc[NML_])
-              IOtype = 2; // formatted IO, controlled by  NAMELIST
-
-           //looking through the IO-list
-            iol = stmt->expr(0);
-            if(!iol) {  // input list is absent
-               Replace_IO_Statement(ioc,stmt);  
-               return; 
-            } 
-            if((e = isSgArrayRefExp(iol->lhs())) &&  (HEADER(iol->lhs()->symbol()))) {
-                                  // first item is distributed array refference
-                if (iol->rhs())  // error: there are other items in I/O-list
-                   return;
-                if(!e->lhs() && IOtype != 2)  //whole array and format=* or unformatted  
-                {     
-                       if (ioc[IOSTAT_])  // there is keyed argument IOSTAT 
-                           InsertSendIOSTAT(ioc[IOSTAT_]);
-                           
-                       IO_ThroughBuffer(e->symbol(),stmt,ioc[IOSTAT_]); 
-                }                   
-                   else 
-                       return;    //error
-                   
-             }
-             else { // replicated variable list
-	       if(!TestIOList(iol,stmt,NO_ERROR_MSG))
-                  return;  
-                if (ioc[IOSTAT_] || (stmt->variant() == READ_STAT)) {
-		   
-                   if(stmt->variant() == READ_STAT)
-                      InsertSendInputList(iol,ioc[IOSTAT_],stmt);
-                   else
-                      InsertSendIOSTAT(ioc[IOSTAT_]);
-                }
-                ReplaceByIfStmt(stmt);
-             }
-}
-
-void ReadWritePrint_Statement(SgStatement *stmt, int error_msg)
-// READ, WRITE, PRINT statements
-
-{           SgSymbol *sio;
-            SgExpression *e,*iol;
-            SgExpression *ioc[NUM__R];
-            int IOtype, io_err;
-            cur_st = stmt;
-            send = 0;  
-            // analizes IO control list and sets on ioc[]                       
-            e = stmt->expr(1); // IO control
-            io_err = IOcontrol(e,ioc,stmt->variant());           
-            if(!io_err && error_msg){
-               err("Illegal elements in control list", 185,stmt);
-               return;
-            }
-            if((ioc[END_] || ioc[ERR_] || ioc[EOR_]) && error_msg) {
-               err("END=, EOR= and ERR= specifiers are illegal in FDVM", 186,stmt);
-               return;
-            }
-            
-            if(ioc[UNIT_] && (ioc[UNIT_]->type()->variant() == T_STRING)) {
-               SgKeywordValExp *kwe;
-               if((kwe=isSgKeywordValExp(ioc[UNIT_])) && (!strcmp(kwe->value(),"*")))
-                                                                       //"*" - system unit
-                         ;
-               else { // I/O to internal file           
-                 if(ioc[UNIT_]->symbol() && HEADER(ioc[UNIT_]->symbol()) && error_msg)
-                   Error("'%s' is distributed array", ioc[UNIT_]->symbol()->identifier(),   148,stmt);
-                 if(error_msg)   
-                   TestIOList(stmt->expr(0),stmt,error_msg);
-                     //err("I/O to internal file is not supported in FDVM", stmt);
-                 return;
-               }  
-	    }   
-            
-            // analizes format specifier and determines type of I/O
-            if(ioc[FMT_]) {
-            
-               SgKeywordValExp * kwe;
-               kwe = isSgKeywordValExp(ioc[FMT_]);
-               if(kwe) // Format
-                  if(!strcmp(kwe->value(),"*"))
-                     IOtype = 1; // formatted IO, controlled by IO-list  
-                  else {
-                     IOtype = 0; // illegal format specifier ??
-                     if(error_msg) 
-                       err("Invalid format specification", 189,stmt);
-                     return;
-                  }
-               else
-                     IOtype = 2; // formatted IO, controlled by format
-                                 // specification or NAMELIST
-            }
-            else
-                     IOtype = 3; // unformatted IO
-            if(ioc[NML_])
-              IOtype = 2; // formatted IO, controlled by  NAMELIST
-
-            //Any_IO_Statement(stmt);
-
-           //looking through the IO-list
-            iol = stmt->expr(0);
-            if(!iol) {  // input list is absent 
-              if(stmt->variant() != READ_STAT || !options.isOn(READ_ALL))  
-                Replace_IO_Statement(ioc,stmt);
-              return; 
-            } 
-            if((e = isSgArrayRefExp(iol->lhs())) &&  (HEADER(iol->lhs()->symbol()))) {
-                                  // first item is distributed array refference
-                if (iol->rhs() && error_msg)  {// there are other items in I/O-list
-                  
-                   err("Illegal I/O list ", 190,stmt);  
-                   return;
-                }
-                //if(ioc[IOSTAT_] && error_msg) {
-                //  err("IOSTAT= specifier is illegal in I/O of distributed array", 187,stmt);
-                //   return;
-                // }
-                if(!e->lhs())  //whole array
-                   if(IOtype != 2) { 
-                       sio = e->symbol();           
-                           //buf_use[TypeIndex(sio->type()->baseType())] = 1; 
-                       if (ioc[IOSTAT_])  // there is keyed argument IOSTAT 
-                         InsertSendIOSTAT(ioc[IOSTAT_]);
-                       
-                       IO_ThroughBuffer(sio,stmt,ioc[IOSTAT_]);
-
-                       if(IN_COMPUTE_REGION && !inparloop && !in_checksection && error_msg)   
-                         err("Illegal statement in the range of region (not implemented yet)", 576,stmt); 
-                    }
-                    else {
-                       if( error_msg)
-                         err("I/O of distributed array controlled by format specification or NAMELIST is not supported in FDVM", 191,stmt);
-                         // illegal format specifier for I/O of distributed array
-                       return; 
-                    }
-                else { 
-                   if(error_msg)
-                     err("Illegal I/O list item", 192,stmt);  
-                   return;
-                }   
-             }
-             else { // replicated variable list
-	       if(!TestIOList(iol,stmt,error_msg))
-                  return;  
-               if (stmt->variant() == READ_STAT) {		   
-                  if(!options.isOn(READ_ALL))
-                     InsertSendInputList(iol,ioc[IOSTAT_],stmt);
-               }
-               else if(ioc[IOSTAT_] )
-                     InsertSendIOSTAT(ioc[IOSTAT_]);
-               
-               if(stmt->variant() != READ_STAT || !options.isOn(READ_ALL))   
-                  ReplaceByIfStmt(stmt);
-                //if(IN_COMPUTE_REGION && !in_checksection)
-                //  ChangeDistArrayRef(iol);
-             }
-             if(inparloop && (send || IN_COMPUTE_REGION || parloop_by_handler) && error_msg)
-               err("Illegal I/O statement in the range of parallel loop/region", 184,stmt);
-             
-}
-
-void IO_ThroughBuffer(SgSymbol *ar, SgStatement *stmt, SgExpression *eiostat)
-{
-   SgStatement *dost=NULL, *contst, *ifst, *next;
-   SgExpression *esize,*econd,*iodo, *iolist,*ubound,*are,*d, *eN[8];
-   SgValueExp c1(1),c0(0);
-   SgLabel *loop_lab=NULL; 
-   //SgSymbol *sio;
-   int i,l,rank,s,s0,N[8],itype,imem;
-   int m = -1;
-   int init,last,step;
-   int M=0;
-   cur_st = stmt;
-   next = stmt->lexNext();
-   contst = NULL;
-   imem=ndvm;
-   ReplaceContext(stmt);
-   
-   itype = TypeIndex(ar->type()->baseType());
-   if(itype == -1)  //may be derived type 
-   {
-      Error("Illegal type's array in input-output statement: %s",ar->identifier(),999,stmt);
-      return;
-   } else
-      buf_use[itype] = 1;
-   l = rank = Rank(ar);  
-   s = IOBufSize;  //SIZE_IO_BUF;
-   for(i=1; i<=rank; i++) {
-      //calculating size of i-th dimension
-      esize = ReplaceParameter(ArrayDimSize(ar, i));
-      eN[i] = NULL;
-      if(esize && esize->variant()==STAR_RANGE)
-      {
-         Error("Assumed-size array: %s",ar->identifier(),162,stmt);
-         return;
-      }
-      if(esize->isInteger())
-         N[i] = esize->valueInteger();
-      else 
-        {N[i] = -1; eN[i] = esize;} //!! dummy argument 
-      if((N[i] <= 0) && !eN[i])
-      {
-         Error("Array shape declaration error: '%s'", ar->identifier(),193, stmt);
-         return;
-      }
-   }
-   // calculating s
-   for(i=1; i<=rank; i++) {
-      if(eN[i]) {
-         l=i-1;
-         break;
-      }
-      s0 = s / N[i];
-      if(!s0) { // s0 == 0
-         l = i-1;  
-         break;
-      }
-      else
-         s = s0;
-   }
-   if(l==rank) { // generating assign statement: m = 1
-      // m = ndvm;
-      //doAssignStmtBefore(&c1.copy(),stmt); 
-      M=1;
-   }
-   else
-      m = ndvm++;
-
-   if(l+1 <= rank) {
-     // generating DO statement: DO label idvm01 = 0, N[l+1]-1, s 
-          
-      loop_lab = GetLabel();
-      contst = new SgStatement(CONT_STAT);
-      esize = eN[l+1] ? &(eN[l+1]->copy() - c1.copy()) : new SgValueExp(N[l+1]-1);
-      dost= new SgForStmt(*loop_var[1], c0.copy(), *esize, *new SgValueExp(s), *contst);
-      BIF_LABEL_USE(dost->thebif) = loop_lab->thelabel;
-      (dost->lexNext())->setLabel(*loop_lab); 
- 
-      if(l+2 <= rank)   
-     // generating DO nest:
-     // DO label idvm02 = 0, N[rank]-1
-     // DO label idvm03 = 0, N[rank-1]-1
-     //   .  .  .
-     // DO label idvm0j = 0, N[l+2]-1
-
-                                       //for(i=rank; i>l+1; i--) {  //27.11.09
-      for(i=l+2; i<=rank; i++) {
-         esize = eN[i] ? &(eN[i]->copy() - c1.copy()) : new SgValueExp(N[i]-1);
-         dost= new SgForStmt(*loop_var[rank-i+2], c0.copy(), *esize, *dost);  
-                         
-         BIF_LABEL_USE(dost->thebif) = loop_lab->thelabel;
-      }
-      
-      cur_st->insertStmtAfter(*dost);
-
-      for(i=l+1; i<=rank; i++)
-         contst->lexNext()->extractStmt(); // extracting ENDDO
-
-      if((N[l+1]<0) || (N[l+1]-(N[l+1]/s)*s)) {  
-      // generating the construction
-      // IF (Il+1 + s .LE. Nl+1) THEN 
-      //    m = s
-      // ELSE 
-      //    m = Nl+1 - Il+1
-      // ENDIF 
-      // and then insert it before CONTINUE statement
-         esize = eN[l+1] ? &(eN[l+1]->copy()) : new SgValueExp(N[l+1]);
-         econd = & (( *new SgVarRefExp(*loop_var[1]) + *new SgValueExp(s)) <= *esize);
-         ifst = new SgIfStmt(*econd, *new SgAssignStmt(*DVM000(m),*new SgValueExp(s)), *new SgAssignStmt(*DVM000(m),*esize - *new SgVarRefExp(*loop_var[1])));
-         contst -> insertStmtBefore(*ifst);
-      }
-      else      
-     //dost->insertStmtBefore(*new SgAssignStmt(*DVM000(m),*new SgValueExp(s)));     
-         M=s;
-     //cur_st = ifst;   
-      stmt->extractStmt();
-      contst -> insertStmtBefore(*stmt);
-      // transfering label over D0-statements
-      BIF_LABEL(dost->thebif) = BIF_LABEL(stmt->thebif);
-      BIF_LABEL(stmt->thebif) = NULL;
-     //cur_st = stmt;
-   }
-   // creating implicit loop as element of I/O list:
-   // (BUF(I0), I0= 1,N1*...*Nl*m)
-   ubound = DVM000(m);
-   N[0] = 1; 
-   for(i=1; i<=l; i++)
-      N[0] = N[0] * N[i];
-   if(M)   // M= const
-      ubound = new SgValueExp(N[0]*M);   
-   else {
-      ubound = DVM000(m);
-      if(N[0]  != 1) 
-         ubound = &( *ubound * (*new SgValueExp(N[0])) );   
-   }   
-
-   //   ubound = &( *ubound * (*new SgValueExp(N[0])));   
-   // iodo = new SgExpression(DDOT,&c1.copy(), ubound,NULL);
-   iodo = & SgDDotOp(c1.copy(),*ubound);
-   iodo = new SgExpression(SEQ,iodo,NULL,NULL);
-   iodo = new  SgExpression(IOACCESS,NULL,iodo,loop_var[0]);
-   // iodo = new SgIOAccessExp(*loop_var[0], c1.copy(), *ubound);//Sage error
-   iodo -> setLhs(new SgArrayRefExp(*bufIO[itype], *new SgVarRefExp(*loop_var[0])));
-   iolist = new SgExprListExp(*iodo);
-   // iolist -> setLhs(iodo);
-   // replacing I/O list in source I/O statement
-   stmt -> setExpression(0,*iolist);
-   //generating assign statement
-   //dvm000(i) = ArrCpy(...)
-   are = new SgArrayRefExp(*bufIO[Integer],c1.copy()); //!!! itype=>Integer (bufIO[itype])
-   init = ndvm;
-   //if(l+2 <= rank)
-   for(i=2; i<(rank-l+1);i++ )
-      doAssignStmtBefore(new SgVarRefExp(*loop_var[i]),stmt);
-   if(l+1 <= rank)
-      doAssignStmtBefore(new SgVarRefExp(*loop_var[1]),stmt);
- 
-   for(i=l; i; i-- )
-      doAssignStmtBefore(new SgValueExp(-1),stmt); 
-   last = ndvm;
-   //if(l+2 <= rank) 
-   for(i=2; i<(rank-l+1);i++ )
-      doAssignStmtBefore(new SgVarRefExp(*loop_var[i]),stmt);
-   if(l+1 <= rank) {
-      d = new SgVarRefExp(*loop_var[1]);
-      if(M != 1)  
-         d = (M)? &(*d+(*new SgValueExp(M-1))) : &(*d+(*DVM000(m))-c1.copy()); 
-      doAssignStmtBefore(d,stmt);
-   }
-
-   step = last+rank;
-   if(l+1 <= rank) {
-      ndvm = step + rank - l - 1;
-      doAssignStmtBefore(&c1.copy(),stmt);
-   }
-   ndvm = step+rank;
-   if(stmt->variant() == READ_STAT){ 
-      doAssignStmtAfter (A_CopyTo_DA(are,HeaderRef(ar),init,last,step,2));
-      if(dvm_debug) {
-         if(contst)
-            cur_st = contst;
-         cur_st->insertStmtAfter(*D_Read(GetAddresDVM(HeaderRefInd(ar,1)))); 
-      } 
-   } else
-      doAssignStmtBefore(DA_CopyTo_A(HeaderRef(ar),are,init,last,step,2),stmt);
-   // replace I/O statement by: IF(TstIO().NE.0) I/O-statement 
-   ReplaceByIfStmt(stmt);
-   if(eiostat && dost)
-   {
-      LogIf_to_IfThen(stmt->controlParent());
-      SgLabel *lab_out = GetLabel(); 
-      doIfIOSTAT(eiostat,stmt,new SgGotoStmt(*lab_out));
-      next->setLabel(*lab_out); //next -> send of IOSTAT
-   } 
-
-   //calculating maximal number of used loop variables for I/O
-   nio = (nio < (rank-l+1)) ? (rank-l+1) : nio;
-   SET_DVM(imem);
-} 
-
-int IOcontrol(SgExpression *e, SgExpression *ioc[],int type)
-// analizes IO_control list (e) and sets on ioc[]
-{ SgKeywordValExp *kwe;
-  SgExpression *ee,*el;
-  int i;
-  for(i=NUM__R; i; i--)
-     ioc[i-1] = NULL;
-
-  if(e->variant() == SPEC_PAIR) {
-     if(type == PRINT_STAT)
-        ioc[FMT_] = e->rhs();   
-     else {
-        // ioc[UNIT_] = e->rhs();
-       kwe = isSgKeywordValExp(e->lhs());   
-       if(!kwe)
-          return(0);
-       if     (!strcmp(kwe->value(),"unit"))
-               ioc[UNIT_] = e->rhs();
-       else if (!strcmp(kwe->value(),"fmt")) 
-               ioc[FMT_]  = e->rhs();
-       else
-               return(0);
-     }	       
-     return(1);
-  }
-  
-  if(e->variant() == EXPR_LIST){
-    for(el=e; el; el = el->rhs()) {
-       ee = el->lhs();
-       if(ee->variant() != SPEC_PAIR)
-          return(0); // IO_control list error
-       kwe = isSgKeywordValExp(ee->lhs());   
-       if(!kwe)
-          return(0);
-       if     (!strcmp(kwe->value(),"unit"))
-               ioc[UNIT_] = ee->rhs();
-       else if (!strcmp(kwe->value(),"fmt")) 
-               ioc[FMT_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"nml")) 
-               ioc[NML_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"rec")) 
-               ioc[REC_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"iostat")) 
-               ioc[IOSTAT_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"end")) 
-               ioc[END_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"err")) 
-               ioc[ERR_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"eor")) 
-               ioc[EOR_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"size")) 
-               ioc[SIZE_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"advance")) 
-               ioc[ADVANCE_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"pos")) 
-               ioc[POS_]  = ee->rhs();
-
-       else
-               return(0);
-    }
-    return(1);
-  }    
-  else
-    return(0);
-}    
-
-int control_list_rw(SgExpression *e, SgExpression *ioc[])
-// analizes IO_control list (e) and sets on ioc[]
-{ SgKeywordValExp *kwe;
-  SgExpression *ee,*el;
-  int i;
-  for(i=NUMB__RW; i; i--)
-    ioc[i-1] = NULL;
-  
-  if(e->variant() == SPEC_PAIR) {
-    kwe = isSgKeywordValExp(e->lhs());
-    if (!kwe)
-      return(0);
-    if (!strcmp(kwe->value(),"unit"))
-      ioc[UNIT_RW] = e->rhs();
-    else if (!strcmp(kwe->value(),"fmt"))
-      ioc[FMT_RW]  = e->rhs();
-    else if (!strcmp(kwe->value(), "nml"))
-      ioc[NML_RW] = e->rhs();
-    else
-      return(0);
-    return(1);
-  }
-  
-  if(e->variant() == EXPR_LIST){
-    for(el=e; el; el = el->rhs()) {
-      ee = el->lhs();
-      if(ee->variant() != SPEC_PAIR)
-        return(0); // IO_control list error
-      kwe = isSgKeywordValExp(ee->lhs());
-      if(!kwe)
-        return(0);
-      if     (!strcmp(kwe->value(),"unit"))
-        ioc[UNIT_RW] = ee->rhs();
-      else if (!strcmp(kwe->value(),"fmt"))
-        ioc[FMT_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"nml"))
-        ioc[NML_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"advance"))
-        ioc[ADVANCE_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"async"))
-        ioc[ASYNC_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"blank"))
-        ioc[BLANK_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"decimal"))
-        ioc[DECIMAL_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"delim"))
-        ioc[DELIM_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"end"))
-        ioc[END_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"err"))
-        ioc[ERR_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"eor"))
-        ioc[EOR_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"id"))
-        ioc[ID_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"iomsg"))
-        ioc[IOMSG_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"iostat"))
-        ioc[IOSTAT_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"pad"))
-        ioc[PAD_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"pos"))
-        ioc[POS_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"rec"))
-        ioc[REC_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"round"))
-        ioc[ROUND_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"sign"))
-        ioc[SIGN_RW]  = ee->rhs();
-      else if (!strcmp(kwe->value(),"size"))
-        ioc[SIZE_RW]  = ee->rhs();
-      else
-        return(0);
-    }
-    if (!ioc[UNIT_RW]) return(0);
-    return(1);
-  }
-  else
-    return(0);
-}
-    
-int control_list1(SgExpression *e, SgExpression *ioc[])
-// analizes control list (e) for statements BACKSPACE,REWIND and ENDFILE
-// and sets on ioc[]
-{ SgKeywordValExp *kwe;
-  SgExpression *ee,*el;
-  int i;
-  for(i=NUM__R; i; i--)
-     ioc[i-1] = NULL;
-
-  if(e->variant() == SPEC_PAIR) {
-     ioc[UNIT_] = e->rhs();   
-     return(1);
-  }
-  
-  if(e->variant() == EXPR_LIST){
-    for(el=e; el; el = el->rhs()) {
-       ee = el->lhs();
-       if(ee->variant() != SPEC_PAIR)
-          return(0); // IO_control list error
-       kwe = isSgKeywordValExp(ee->lhs());   
-       if(!kwe)
-          return(0);
-       if     (!strcmp(kwe->value(),"unit"))
-               ioc[UNIT_] = ee->rhs();
-       else if (!strcmp(kwe->value(),"iostat")) 
-               ioc[IOSTAT_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"err")) 
-               ioc[ERR_]  = ee->rhs();
-       //else if (!strcmp(kwe->value(), "iomsg"))
-       //		ioc[IOMSG_] = ee->rhs();
-       else
-               return(0);
-    }
-    return(1);
-  }    
-  else
-    return(0);
-}
-    
-int control_list_inquire (SgExpression *e, SgExpression *ioc[])
-// analizes control list (e)  INQUIRE statement
-// and sets on ioc[]
-{
-  SgKeywordValExp *kwe;
-  int i;
-  for(i=NUM__O+1; i; i--)
-     ioc[i-1] = NULL;
-
-  if(e->variant() == SPEC_PAIR && (kwe=isSgKeywordValExp(e->lhs())) && !strcmp(kwe->value(),"iolength")) {  // case of  INQUIRY (IOLENGTH = ...) outlist
-    ioc[NUM__O] = e->rhs();
-    return (1);   
-  } else  
-    return(control_list_open(e,ioc));  // control_list analisys
-}
-
-int control_list_open(SgExpression *e, SgExpression *ioc[])
-// analizes control list (e) for OPEN,CLOSE and INQUIRE statements
-// and sets on ioc[]
-{ SgKeywordValExp *kwe;
-  SgExpression *ee,*el;
-  int i;
-  for(i=NUM__O; i; i--)
-     ioc[i-1] = NULL;
-
-  if(e->variant() == SPEC_PAIR) {
-     ioc[UNIT_] = e->rhs();   
-     return(1);
-  }
-  if(e->variant() == EXPR_LIST){
-    for(el=e; el; el = el->rhs()) {
-       ee = el->lhs();
-       if(ee->variant() != SPEC_PAIR)
-          return(0); // IO_control list error
-       kwe = isSgKeywordValExp(ee->lhs());   
-       if(!kwe)
-          return(0);
-       if     (!strcmp(kwe->value(),"unit"))
-               ioc[UNIT_] = ee->rhs();
-       else if (!strcmp(kwe->value(),"file")) 
-               ioc[FILE_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"status")) 
-               ioc[STATUS_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"iostat")) 
-               ioc[IOSTAT_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"access")) 
-               ioc[ACCESS_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"err")) 
-               ioc[ERR_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"form")) 
-               ioc[FORM_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"recl")) 
-               ioc[RECL_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"blank")) 
-               ioc[BLANK_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"exist"))
-               ioc[EXIST_] = ee->rhs();
-       else if (!strcmp(kwe->value(),"opened")) 
-               ioc[OPENED_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"number")) 
-               ioc[NUMBER_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"named")) 
-               ioc[NAMED_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"name")) 
-               ioc[NAME_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"sequential")) 
-               ioc[SEQUENTIAL_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"direct")) 
-               ioc[DIRECT_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"nextrec")) 
-               ioc[NEXTREC_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"formatted")) 
-               ioc[FORMATTED_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"unformatted")) 
-               ioc[UNFORMATTED_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"position")) 
-               ioc[POSITION_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"action")) 
-               ioc[ACTION_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"readwrite")) 
-               ioc[READWRITE_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"read")) 
-               ioc[READ_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"write")) 
-               ioc[WRITE_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"delim")) 
-               ioc[DELIM_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"pad")) 
-               ioc[PAD_]  = ee->rhs();
-       else if (!strcmp(kwe->value(),"convert")) 
-               ioc[CONVERT_]  = ee->rhs();
-
-       else
-               return(0);
-    }
-    return(1);
-  }    
-  else
-    return(0);
-}        
-
-void InsertSendIOSTAT(SgExpression * eios)
-{int imem;
- SgType *t;
- imem = ndvm;  
- doAssignStmtAfter(GetAddresMem(eios));
- t = eios->symbol() ? Base_Type(eios->symbol()->type()) : SgTypeInt();//type of IOSTAT var
- doAssignStmtAfter(TypeLengthExpr(t)); //type size
- //doAssignStmtAfter(new SgValueExp(TypeSize(t))); 14.03.03
- doCallAfter(SendMemory(1,imem,imem+1));  //count of memory areas = 1
- if(dvm_debug)
-   InsertNewStatementAfter(D_Read(DVM000(imem)),cur_st,cur_st->controlParent());
- SET_DVM(imem);
-}
-
-void InsertSendInquire(SgExpression * eioc[])
-{int imem,j,i,icount;
- imem = ndvm;
- j=0;
- if(eioc[NUM__O]) {  // case of  INQUIRY (IOLENGTH = ...) outlist
-   j=1;
-   doAssignStmtAfter(GetAddresMem(eioc[NUM__O]));
-   doAssignStmtAfter(TypeLengthExpr(eioc[NUM__O]->type())); 
- }  else {
-   for (i=IOST_;i<ACTION_;i++)    
-     if(eioc[i]) {
-       doAssignStmtAfter(GetAddresMem(eioc[i]));
-       j++;
-     }
-   for (i=IOST_;i<ACTION_;i++)    
-     if(eioc[i])
-       doAssignStmtAfter(TypeLengthExpr(eioc[i]->type())); 
-       //doAssignStmtAfter(new SgValueExp(TypeSize(eioc[i]->type()))); 14.03.03
- }
- if(j) {
-   icount = j;   //count of memory areas
-   doCallAfter(SendMemory(icount,imem,imem+j));
-   if(dvm_debug)
-     for(i=0; i<j; i++)
-       InsertNewStatementAfter(D_Read(DVM000(imem+i)),cur_st,cur_st->controlParent());
- }
- SET_DVM(imem);
-}
-
-int isDependence(SgExpression *e,SgExpression *eprev)
-{
-  if(!e || !eprev)
-    return 0;
-  if(ExpCompare(e, eprev))
-    return 1;
-  return (isDependence(e->lhs(),eprev) || isDependence(e->rhs(),eprev));
-}
-
-int ElementDependence(SgStatement *st_first, SgStatement *st, SgExpression *e)
-{
-  SgStatement *st_next = st_first;
-  for(;st_next != st; st_next=st_next->lexNext())
-     if(isDependence(e,st_next->expr(1)->lhs()->lhs()))   //st_next is dvm000(i)=getai(el), search for dependency between e and el
-       return 1;
-  return 0;
-}
-
-void SendList(SgStatement *st_first, SgExpression *iisize[], int imem, int j0, int nl)
-{
-  SgStatement *st;
-  int i,j;
-  if(j0==nl) return;
-  for(j = j0,st=st_first; j<nl; j++,st = st->lexNext())
-  {  
-     if( j!=j0 && (ElementDependence(st_first,st,st->expr(1)->lhs()->lhs()) || ElementDependence(st_first,st,iisize[j])))
-         break;
-  }
-  cur_st = st->lexPrev();
-  for(i=j0;i<j;i++)
-     doAssignStmtAfter(iisize[i]);
- 
-  doCallAfter(SendMemory(j-j0,imem+j0,imem+nl+j0));
- 
-  SendList(cur_st->lexNext(),iisize,imem,j,nl);
-}
-
-# define MAXLISTLEN  1000
-
-void InsertSendInputList(SgExpression * input_list, SgExpression * io_stat,SgStatement *stmt)
-{int imem,j,i,icount,iel;
- SgExpression *el,*ein,*iisize[MAXLISTLEN],*iinumb[MAXLISTLEN],*iielem[MAXLISTLEN];
- SgType *t;
- SgStatement *st_save = cur_st;
- imp_loop = NULL;
-
- if(dvm_debug)
-   for(i=0;i<MAXLISTLEN;i++)
-     iinumb[i] = NULL;
-
- imem = ndvm;
- j=0; 
- for (el=input_list;el;el=el->rhs()) {    
-   ein = el->lhs();  // input list item
-   if(j== MAXLISTLEN-2)
-     err("Compiler bug (in InsertSendInputList)",0,stmt);
-   if(isSgIOAccessExp(ein)) //implicit loop
-   { if(!SpecialKindImplicitLoop(el->rhs(),ein,&j, iisize, iielem, iinumb, stmt))
-        ImplicitLoop(ein,&j, iisize, iielem, iinumb, stmt); 
-   }   
-   else if(isSgArrayRefExp(ein) && !ein->lhs() && (ein->type()->variant()!=T_STRING)){//whole array 
-      doAssignStmtAfter(GetAddresMem(FirstArrayElement(ein->symbol()))); 
-      iisize[j] = InputItemLength(ein,stmt);
-      if(dvm_debug){      
-        iielem[j] = ElemLength(ein->symbol());
-        iinumb[j] = NumbOfElem(iisize[j], iielem[j]);
-      }
-      j++;
-   }
-   else if(isSgArrayRefExp(ein)  && (ein->type()->variant()==T_ARRAY)){//section of array
-      doAssignStmtAfter(GetAddresMem (ContinuousSection(ein) ? FirstElementOfSection(ein) : FirstArrayElement(ein->symbol()))); 
-      iisize[j] = InputItemLength(ein,stmt);
-      if(dvm_debug){      
-        iielem[j] = ElemLength(ein->symbol());
-        iinumb[j] = NumbOfElem(iisize[j], iielem[j]);
-      }
-      j++;
-   
-   } 
-   else if(isSgRecordRefExp(ein) && ein->type()->variant() == T_ARRAY ) {  //structure reference of ArrayType
-      SgExpression *ein_short = ArrayFieldLast(ein);  
-      doAssignStmtAfter( GetAddresMem( isSgRecordRefExp(ein_short) ? FirstElementOfField(ein_short) : FirstElementOfSection(ein_short) ) );         
-      iisize[j] = InputItemLength(ein_short,stmt);
-      if(dvm_debug){      
-        iielem[j] = ElemLength(isSgRecordRefExp(ein_short) ? RightMostField(ein_short)->symbol() : ein_short->symbol());
-        iinumb[j] = NumbOfElem(iisize[j], iielem[j]);
-      }
-      j++;
-         
-   }
-   else {      
-      doAssignStmtAfter(GetAddresMem(ein->type()->variant()==T_ARRAY ? FirstElementOfSection(ein) : ein)); 
-      iisize[j] = InputItemLength(ein,stmt);
-      j++;      
-   }  
- }
- if(io_stat) {
-     doAssignStmtAfter(GetAddresMem(io_stat));
-     t = io_stat->symbol() ? Base_Type(io_stat->symbol()->type()) : SgTypeInt();//type of IOSTAT var
-     iisize[j] =  TypeLengthExpr(t); //new SgValueExp(TypeSize(t));
-     j++;
- }
-
- SendList(st_save->lexNext(),iisize,imem,0,j); 
-
- if(dvm_debug){
-   for(i=0;i<j;i++)
-     if(iinumb[i] != NULL){ // input list item is array
-       iel = ndvm;
-       doAssignStmtAfter(iielem[i]); 
-       doAssignStmtAfter(iinumb[i]); 
-       InsertNewStatementAfter(D_ReadA(DVM000(imem+i),iel,iel+1),cur_st,cur_st->controlParent());
-       SET_DVM(iel);
-     } else
-       InsertNewStatementAfter(D_Read(DVM000(imem+i)),cur_st,cur_st->controlParent());
- }
- SET_DVM(imem);
-}
-
-int SpecialKindImplicitLoop(SgExpression *el, SgExpression *ein, int *pj, SgExpression *iisize[], SgExpression *iielem[],SgExpression *iinumb[],SgStatement *stmt)
-{
-  SgExpression *ell, *e, *e1, *enumb, *elen, *bounds;
-  SgSymbol *s;
-  SgValueExp c1(1);
-
-  if(el) return(0);  //number of input list items > 1
-  ell = ein->lhs();
-  if(ell->rhs()) return(0); //number of items of implicit loop list
-  e = ell->lhs(); s = e->symbol();
-  bounds = ein->rhs(); 
-  if(bounds->rhs()) return(0);  //step of implicit loop is specified 
-  if(isSgArrayRefExp(e)  && (e->type()->variant()!=T_STRING) && Rank(s)==1 && (isSgVarRefExp(e->lhs()->lhs())) && (e->lhs()->lhs()->symbol() == ein->symbol()) ) {
-    e1 = &(e->copy()); 
-    e1->lhs()->setLhs(bounds->lhs()->lhs()->copy());   
-    doAssignStmtAfter(GetAddresMem(e1)); //initial address of array section
-    enumb = &(bounds->lhs()->rhs()->copy() - bounds->lhs()->lhs()->copy() + c1);
-    elen =  ElemLength(s);
-
-    iisize[*pj] = &(*enumb * (*elen)); //array section length 
-    if(dvm_debug) { 
-       iielem[*pj] = elen; //ElemLength(s);
-       iinumb[*pj] = enumb;
-    }
-    *pj = *pj+1;
-    return (1);   
-  }
-  else
-    return(0);   
-         
-}
-
-void ImplicitLoop(SgExpression *ein, int *pj, SgExpression *iisize[], SgExpression *iielem[],SgExpression *iinumb[],SgStatement *stmt)
-{
-  SgExpression *ell, *e; 
-  for (ell = ein->lhs();ell;ell=ell->rhs()){ //looking through item list of implicit loop
-     e = ell->lhs();
-     if(isSgIOAccessExp(e))
-        ImplicitLoop(e,pj,iisize,iielem,iinumb,stmt); 
-     else {
-         if(isSgArrayRefExp(e)) {
-             SgExpression *e1 ;
-             SgSymbol *ar;
-             int has_aster_or_1;
-
-             if(!e->lhs() && e->type()->variant()==T_STRING) {//character object
-               doAssignStmtAfter(GetAddresMem(e)); 
-               iisize[*pj] = InputItemLength(e,stmt);
-               *pj = *pj+1;   
-               continue;
-             }
-             ar = e->symbol();
-             has_aster_or_1 =  hasAsterOrOneInLastDim(ar); //testing last dimension : * or 1
-             if(! has_aster_or_1) {
-                if(isInSymbList(imp_loop,ar))
-                  continue;
-                else
-                  imp_loop = AddToSymbList(imp_loop,ar);  
-             }
-             e1 = FirstArrayElement(ar);
-             doAssignStmtAfter(GetAddresMem(e1)); //initial array address
-             iisize[*pj] =ArrayLength(ar,stmt,0);// whole array length 
-             if (has_aster_or_1)  //testing last dimension : * or 1
-             {
-                 if (ein->symbol() == lastDimInd(e->lhs()))
-                     iisize[*pj] = CorrectLastOpnd(iisize[*pj], ar, ein->rhs(), stmt);
-                 //correcting whole array length by implicit loop parameters
-                 else
-                     Error("Can not calculate array length: %s", ar->identifier(), 194, stmt);
-             }
-
-             if(dvm_debug) { 
-               iielem[*pj] = ElemLength(ar);
-               iinumb[*pj] = NumbOfElem(iisize[*pj], iielem[*pj]);
-             }
-             *pj = *pj+1;   
-         }
-         else if(e->variant() == ARRAY_OP) {//substring or substring of array element
-             SgExpression *e1 ;
-             if( !e->lhs()->lhs())  //substring 
-             {
-               doAssignStmtAfter(GetAddresMem(e->lhs())); 
-               iisize[*pj] = InputItemLength(e->lhs(),stmt);
-               *pj = *pj+1; 
-               continue;   
-             }
-             //substring of array element  
-             e1 = FirstArrayElement(e->lhs()->symbol());
-             doAssignStmtAfter(GetAddresMem(e1)); //initial array address
-             iisize[*pj] = ArrayLength(e->lhs()->symbol(),stmt,1); // whole array length 
-             *pj = *pj+1;   
-         }     
-         else {
-             doAssignStmtAfter(GetAddresMem(e)); 
-             iisize[*pj] = InputItemLength(e,stmt);
-             *pj = *pj+1;   
-         }
-     }
-  }
-}
-
-/*
- * variant when substring is represented by ARRAY_REF node with 2 operands
- *
-SgExpression * InputItemLength (SgExpression *e, SgStatement *stmt)
-{
- if (isSgVarRefExp(e))
-    return(new SgValueExp(TypeSize(e->type())));  
- if (isSgArrayRefExp(e)) 
-    if(e->type()->variant()!=T_STRING) //whole array or array element of non-character type           
-        if(e->lhs()) //array element
-           return(new SgValueExp(TypeSize(e->symbol()->type()->baseType())));   
-        else  //whole array
-           return(ArrayLength(e->symbol(),stmt,1));   
-    else { //variable, array element, substring or substring of array element of type CHARACTER 
-      if(!(e->lhs())) //variable
-        return(StringLengthExpr(e->symbol()->type(),e->symbol())); 
-       //return(new SgValueExp(CharLength(e->symbol()->type()))); 14.03.03
-     // e = e->lhs()->lhs(); //variant of e->lhs() is EXPR_LIST  
-         
-      if(!(e->rhs()) && (e->lhs()->lhs()->variant() != DDOT)) //array element of type CHARACTER 
-           return(StringLengthExpr(e->symbol()->type()->baseType(),e->symbol()));   
-              //return(new SgValueExp(CharLength(e->symbol()->type()->baseType())));   
-     else
-           return(SubstringLength(e)); 
-   } 
-  return(new SgValueExp(-1)); 
-}
-
-SgExpression *SubstringLength(SgExpression *sub)
-{ //SgSubscriptExp *sbe;
-  SgValueExp c1(1);
-  SgExpression *e,*e1,*e2;
-  SgType *t;
-//err("Sorry, substring length calculating is not jet implemented",cur_st);
-     if(sub->lhs()->lhs()->variant() == DDOT) {  //substring(sub has variant EXPR_LIST)
-        e = sub->lhs()->lhs();     
-        t=sub->symbol()->type();
-     }
-     else { //substring of array element
-        e = sub->rhs();
-        t=sub->symbol()->type()->baseType();
-     } 
-     if(e->lhs())
-        e1 = &(e->lhs()->copy());
-     else  
-        e1 = &(c1.copy());
-
-     if(e->rhs())
-        e2 = &(e->rhs()->copy());
-     else  
-       e2 = StringLengthExpr(t,sub->symbol()); //new SgValueExp(CharLength(t)); 14.03.03
-      return (&(*e2 - *e1 + c1));
-}
-*/
-
-
-SgExpression * InputItemLength (SgExpression *e, SgStatement *stmt)
-{
- if(isSgRecordRefExp(e))
- {   
-     e = RightMostField(e); 
-         //printf("FIELD: %s  %d ",(e->symbol() ? e->symbol()->identifier() : (char *)"----"),(e->type() ? e->type()->variant() : 0));
-         //printf("  LINE   %d IN %s\n" ,stmt->lineNumber(),stmt->fileName() );  
- }
- if (isSgVarRefExp(e))
-   return(TypeLengthExpr(e->type()));  
-      //return(new SgValueExp(TypeSize(e->type()))); 14.03.03 
- if (isSgArrayRefExp(e))
- {
-     if (e->symbol()->type()->variant() == T_STRING) // variable of type CHARACTER
-         return(StringLengthExpr(e->symbol()->type(), e->symbol()));
-     //return(new SgValueExp(CharLength(e->symbol()->type()))); 14.03.03
-     else
-     {
-         if (e->lhs() && !isSgArrayType(e->type())) //array element
-             return(TypeLengthExpr(e->symbol()->type()->baseType()));
-         else if (e->lhs() && isSgArrayType(e->type())) //array section
-             return(ContinuousSection(e) ? SectionLength(e, stmt, 1) : ArrayLength(e->symbol(), stmt, 1));
-         else  //whole array
-             return(ArrayLength(e->symbol(), stmt, 1));
-     }
- }
-
- if (e->variant() == ARRAY_OP) //substring or substring of array element
-           return(SubstringLength(e)); //substring
-
-           return(new SgValueExp(-1)); 
-}
-
-SgExpression *SubstringLength(SgExpression *sub)
-{ //SgSubscriptExp *sbe;
-  SgValueExp c1(1);
-  SgExpression *e,*e1,*e2;
-  SgType *t;
-  
-//err("Sorry, substring length calculating is not jet implemented",cur_st);
-     if(!sub->lhs()->lhs()){  //substring   
-        t=sub->lhs()->symbol()->type();
-        e = sub->rhs()->lhs(); // sub->rhs() has variant EXPR_LIST
-     }
-     else{                   //substring of array element
-        t=sub->lhs()->symbol()->type()->baseType();
-        e = sub->rhs(); 
-     }  
-     if(e->lhs())
-        e1 = &(e->lhs()->copy());
-     else  
-        e1 = &(c1.copy());
-
-     if(e->rhs())
-        e2 = &(e->rhs()->copy());
-     else  
-       e2 = StringLengthExpr(t,sub->lhs()->symbol()); //new SgValueExp(CharLength(t));
-      return (&(*e2 - *e1 + c1));
-}
-
-SgExpression *ArrayLength(SgSymbol *ar, SgStatement *stmt, int err)
-{int i,rank;
- SgExpression *esize,*len; 
-rank = Rank(ar);
-len = TypeLengthExpr(ar->type()->baseType()); //length of one array element
-  //len = new SgValueExp(TypeSize(ar->type()->baseType())); 14.03.03
-for(i=1; i<=rank; i++) {
-    //calculating size of i-th dimension
-    esize = ReplaceParameter(ArrayDimSize(ar, i));
-    if(err && esize && esize->variant()==STAR_RANGE)
-      Error("Assumed-size array: %s",ar->identifier(),162,stmt);
-    if(esize->isInteger())
-      esize = new SgValueExp( esize->valueInteger());
-    if(esize)
-      len = &(*len * (*esize));
-    
-}
-if (len->isInteger()) // calculating length if it is possible
-    len = new SgValueExp( len->valueInteger()); 
-return(len);
-}
-
-SgExpression *SectionLength(SgExpression *ea, SgStatement *stmt, int err)
-{int i,rank;
- SgExpression *esize,*len, *el, *eup[MAX_DIMS], *ein[MAX_DIMS]; 
- //rank = ArraySectionRank(ea);
- rank = Rank(ea->symbol());  
- len = TypeLengthExpr(ea->symbol()->type()->baseType()); //length of one array element
-
-  
- for(i=0,el=ea->lhs(); i<rank && el; i++,el=el->rhs()) {
-    //calculating size of i-th dimension
-    UpperBoundInTriplet(el->lhs(),ea->symbol(),i,eup);
-    LowerBoundInTriplet(el->lhs(),ea->symbol(),i,ein);
-    esize = &(*eup[i] - *ein[i] + *new SgValueExp(1));
-       //if(err && esize && esize->variant()==STAR_RANGE)
-       //  Error("Assumed-size array: %s",ar->identifier(),162,stmt);
-       //if(esize->isInteger())
-       //  esize = new SgValueExp( esize->valueInteger());
-    if(esize)
-      len = &(*len * (*esize));
-    
-}
-     //if (len->isInteger()) // calculating length if it is possible
-     //    len = new SgValueExp( len->valueInteger()); 
-return(len);
-}
-
-SgExpression *ArrayLengthInElems(SgSymbol *ar, SgStatement *stmt, int err)
-{int i,rank;
- SgExpression *esize,*len; 
-rank = Rank(ar);
-len =  new SgValueExp(1);
-for(i=1; i<=rank; i++) {
-    //calculating size of i-th dimension
-    esize = ReplaceParameter(ArrayDimSize(ar, i));
-    if(err && esize && esize->variant()==STAR_RANGE)
-      Error("Assumed-size array: %s",ar->identifier(),162,stmt);
-    if(esize->isInteger())
-      esize = new SgValueExp( esize->valueInteger());
-    if(esize)
-      len = &(*len * (*esize));
-    
-}
-if (len->isInteger()) // calculating length if it is possible
-    len = new SgValueExp( len->valueInteger()); 
-return(len);
-}
-
-SgExpression *NumbOfElem(SgExpression *es,SgExpression *el)
-{SgExpression *e,*e1 = NULL,*ec;
- if(!es)
-   return(NULL);
- if(es->isInteger())
-   return(new SgValueExp( es->valueInteger() / el->valueInteger()));
-                                                           //deleting on length of element
- ec = &es->copy();
- for(e=ec; e->variant() == MULT_OP; e=e->lhs())
-    e1 = e;
- e1->setLhs(new SgValueExp(1)); //replace length of element by 1
- return(ec);
-}
-
-SgExpression *ElemLength(SgSymbol *ar)
-{SgExpression *len;
-len = TypeLengthExpr(ar->type()->baseType()); //length of one array element
-//len = new SgValueExp(TypeSize(ar->type()->baseType()));  14.03.03
- return(len);
-}
-
-SgExpression *CorrectLastOpnd(SgExpression *len, SgSymbol *ar, SgExpression *bounds,SgStatement *stmt)
-{SgExpression *elast;
- SgValueExp c1(1);
- if(!Rank(ar))
-   return(len); //error situation 
- if(!bounds->rhs()){  //step of implicit loop is absent ,by default 1  
-    elast=&(bounds->lhs()->rhs()->copy() - *Exprn(LowerBound(ar,Rank(ar)-1)) + c1);
-                  //upper_bound_of_implicit_loop - lower_bound_of_last_dimension_of_array + 1
-    if (elast->isInteger()) // calculating size if it is possible
-      elast = new SgValueExp( elast->valueInteger()); 
-    if(len->variant() == MULT_OP)       
-      len->setRhs(elast); //replace last multiplicand of array length
-    else
-      len = &(*len * (*elast));//len is the length of array element,it is multiplied by elast
- }
- else // variant == SEQ,there is a step
-    Error("Can not calculate array length: %s", ar->identifier(),194,stmt);
- if (len->isInteger()) // calculating length if it is possible
-   len = new SgValueExp( len->valueInteger()); 
- return(len);
-} 
-            
-SgSymbol *lastDimInd(SgExpression *el)
-{//returns symbol of last subscript expression  if it is variable refference 
- //el - subscript list
- SgExpression *last = NULL;
- for(; el; el=el->rhs()) //search for last subscript
-     last = el->lhs();
- if(isSgVarRefExp(last)) //is variable refference
-    return(last->symbol());
- return(NULL);
-}   
-
-int hasAsterOrOneInLastDim(SgSymbol *ar)
-{//is dummy argument or array in COMMON declared as a(n,n,*) or a(1)
- SgExpression *e;
- SgValueExp *ev;
- int rank;
- rank = Rank(ar);
- if(!rank)
-   return(0);
- e=ArrayDimSize(ar,rank);
- if(e->variant()==STAR_RANGE)  
-   return(1);
- if(rank==1 && (ev = isSgValueExp(e)) && ev->intValue() == 1)
-    return(1);
- return(0);
-}            
-
-SgExpression *FirstArrayElement(SgSymbol *ar)
-{//generating reference AR(L1,...,Ln), where Li - lower bound of i-th dimension
- int i;
- SgExpression *esl, *el, *e;
- el = NULL;
- for (i = Rank(ar); i; i--){
-  esl = new SgExprListExp(*Exprn(LowerBound(ar,i-1)));
-  esl->setRhs(el);
-  el = esl;
- }
-  e = new SgArrayRefExp(*ar);
-  e->setLhs(el);
-  return(e);
-}
-  
-SgExpression *FirstElementOfSection(SgExpression *ea) 
-{SgExpression *el, *ein[MAX_DIMS];
- int i,rank;
- SgExpression *esl, *e;
- SgSymbol * ar;
- ar = ea->symbol();
- rank = Rank(ar);
- if(!ea->lhs()) //whole array
-   return(FirstArrayElement(ar));
-
- for(el=ea->lhs(),i=0; el && i<rank; el=el->rhs(),i++)    
-     LowerBoundInTriplet(el->lhs(),ar,i, ein);
- el = NULL;
- for (i = rank; i; i--){
-   esl = new SgExprListExp(*Exprn(ein[i-1]));
-   esl->setRhs(el);
-   el = esl;
- }
-  e = new SgArrayRefExp(*ar);
-  e->setLhs(el);
-  return(e);
-}
-
-SgExpression *ArrayFieldLast(SgExpression *e)
-{ 
-  while(isSgRecordRefExp(e) && RightMostField(e)->type()->variant() != T_ARRAY)
-      e=e->lhs();
-  //e->unparsestdout(); printf("\n");
-  return(e);
-}
-
-SgExpression *FirstElementOfField(SgExpression *e_RecRef)
-{ 
-  SgExpression *estr = &e_RecRef->copy();
-  estr->setRhs(FirstElementOfSection(RightMostField(estr)) );
-  return (estr);
-}
-
-int ArraySectionRank(SgExpression *ea)
-{SgExpression *el;
- int rank;
- for(el=ea->lhs(),rank=0; el; el=el->rhs()) 
-  if(el->lhs()->variant() == DDOT)
-    rank++;
- return(rank);
-}
-
-int ContinuousSection(SgExpression *ea)
-{ SgExpression *ei;
-
-  ei = ea->lhs();
-  if(ei->lhs()->variant() != DDOT)
-     return(0);
-  while(ei && isColon(ei->lhs()))
-     ei = ei->rhs();
-  if(!ei)      // (:,:,...:)
-     return(1);
-  //if(ei->lhs()->variant() == DDOT && ei->lhs()->lhs()->variant() == DDOT)   //there is step
-  //   return (0);
-  ei = ei->rhs();
-  while(ei && ei->lhs()->variant() != DDOT)
-     ei = ei->rhs();  
-  if(!ei)
-     return(1); 
-  return(0);
-
-}
-
-int isColon(SgExpression *e)
-{
-  if(!e)
-    return(0);
-  if(e->variant() == DDOT && !e->lhs() && !e->rhs())
-    return(1);
-  return(0);
- 
-}
-
-
-int hasEndErrControlSpecifier(SgStatement *stmt, SgExpression *ioEnd[] )
-{
-  SgExpression *el, *ee;
-  SgExpression *e = stmt->expr(1);  //control list
-  ioEnd[0] = ioEnd[1] = ioEnd[2] = NULL; 
-  if(!e) return 0;
-  if(e->variant() == EXPR_LIST){
-    for(el=e; el; el = el->rhs()) {
-       ee = el->lhs();
-       if(ee->variant() != SPEC_PAIR)
-          return 0; // IO_control list error
-       SgKeywordValExp *kwe = isSgKeywordValExp(ee->lhs());   
-       if(!kwe)
-          return 0;
-       if (!strcmp(kwe->value(),"iostat"))        
-               return 0;
-       else if (!strcmp(kwe->value(),"err")) 
-               ioEnd[0]  =  el;  
-       else if (!strcmp(kwe->value(),"end")) 
-               ioEnd[1] =  el; 
-       //else if (!strcmp(kwe->value(),"eor")) 
-       //        ioEnd[2]  = el;  
-       else
-               continue;
-    }
-    if(ioEnd[0] || ioEnd[1] || ioEnd[2])
-       return 1;
-    else
-       return 0;
-  }    
-  else
-    return 0;
-}
-
-void ChangeSpecifierByIOSTAT(SgExpression *e)
-{
-  // e->variant() == SPEC_PAIR
-  e->setLhs( new SgKeywordValExp("iostat"));
-  e->setRhs( new SgVarRefExp(IOstatSymbol()) ) ;
-}
-
-void ChangeControlList(SgStatement *stmt, SgExpression *ioEnd[] )
-{
-  SgExpression *el;
-  // replace one of the specifiers with IOSTAT
-  for(el=stmt->expr(1); el; el=el->rhs())
-     if(el==ioEnd[0] || el==ioEnd[1] || el==ioEnd[2]) 
-     {
-       ChangeSpecifierByIOSTAT(el->lhs());
-       break; 
-     }
-  // delete others 
-  while(el->rhs())  
-  {
-     if(el->rhs()==ioEnd[0] || el->rhs()==ioEnd[1] || el->rhs()==ioEnd[2]) 
-     {
-        el->setRhs(el->rhs()->rhs());
-        continue;
-     }
-     else
-        el=el->rhs();
-  }
-  return; 
-}
-
-void ReplaceStatementWithEndErrSpecifier(SgStatement *stmt, SgExpression *ioEnd[] )
-{ 
-  int i; 
-  for(i=0; i<3; i++)
-     if(ioEnd[i])
-        doLogIfForIOstat(IOstatSymbol(),ioEnd[i]->lhs(),stmt);
-  ChangeControlList(stmt,ioEnd);
-}
-
-/*--------------------------------------------------------------------------------------*/
-/*      RTS2 interface                                                                  */
-/*--------------------------------------------------------------------------------------*/
-
-static inline int strcmpi(const char *s1, const char *s2) {
-  size_t l1 = strlen(s1);
-  size_t l2 = strlen(s2);
-  size_t min_l = (l1 < l2? l1 : l2);
-  char c1, c2;
-  for (size_t i = 0; i < min_l; ++i) {
-	c1 = tolower(s1[i]);
-	c2 = tolower(s2[i]);
-	if (c1 > c2) return 1;
-	else if (c1 < c2) return -1;
-  }
-  if (l1 > min_l) return 1;
-  else if (l2 > min_l) return -1;
-  return 0;
-}
-
-const char *stringValuesOfArgs(int argNumber, SgStatement *stmt) {
-  int variant = stmt->variant();
-  
-  if (variant == OPEN_STAT || variant == CLOSE_STAT) return openCloseArgStrings[argNumber];
-  else if (variant == READ_STAT || variant == WRITE_STAT) return readWriteArgStrings[argNumber];
-  else if (variant == ENDFILE_STAT || variant == REWIND_STAT || variant == BACKSPACE_STAT) return filePositionArgsStrings[argNumber];
-  
-  return NULL;
-};
-
-bool checkDefaultStringArg(SgExpression *arg, const char **possible_values, int count, int i, SgStatement *stmt, int error_msg) {
-  
-  // if default-string arg isn't a value expression, it can't be checked.
-  if (!(arg && isSgValueExp(arg))) return true;
-  SgValueExp *v = isSgValueExp(arg);
-  
-  char *string_val = v->stringValue();
-  for (int string_arg_number = 0; string_arg_number < count; ++string_arg_number)
-     if (!strcmpi(string_val, possible_values[string_arg_number])) return true;
-
-  const char *stringArg = stringValuesOfArgs(i, stmt);
-  if (error_msg)
-     Error("Wrong value of '%s' argument in IO-statement", stringArg, 454, stmt);
-  return false;
-  
-}
-
-bool checkLabelRefArg(SgExpression *arg, SgStatement *stmt, int error_msg) {
-  if (!arg) return true;
-  SgLabelRefExp *lbl = isSgLabelRefExp(arg);
-  if (!lbl) {
-	if (error_msg)
-	  err("Wrong type of label argument", 450, stmt);
-	return false;
-  }
-  return true;
-}
-
-bool checkIntArg(SgExpression *arg, int i, SgStatement *stmt, int error_msg) {
-  if (!arg) return true;
-  SgValueExp *val = isSgValueExp(arg);
-  SgVarRefExp *var = isSgVarRefExp(arg);
-  
-  if (val && val->variant() == INT_VAL) return true;
-  if (var && var->symbol()->type()->variant() == T_INT) return true;
-  if (arg->type()->variant() == T_INT) return true;
-  
-  const char *stringArg = stringValuesOfArgs(i, stmt);
-  if (error_msg)
-    Error("Wrong type of '%s' argument in IO-statement", stringArg, 450, stmt);
-  return false;
-  
-}
-
-bool checkStringArg(SgExpression *arg, int i, SgStatement *stmt, int error_msg) {
-  if (!arg) return true;
-  
-  SgValueExp *val = isSgValueExp(arg);
-  SgArrayRefExp *arr = isSgArrayRefExp(arg);
-  if (val && val->variant() == STRING_VAL) return true;
-  if (arr && arr->symbol()->type()->variant() == T_STRING) return true;
-  if (arg->type()->variant() == T_STRING) return true;
-  
-  const char *stringArg = stringValuesOfArgs(i, stmt);
-  if (error_msg)
-    Error("Wrong type of '%s' argument in IO-statement", stringArg, 450, stmt);
-  return false;
-  
-}
-
-bool checkStringVarArg(SgExpression *arg, int i, SgStatement *stmt, int error_msg) {
-  if (!arg) return true;
-  SgArrayRefExp *arr = isSgArrayRefExp(arg);
-  if (!arr || arr->symbol()->type()->variant() != T_STRING) {
-	const char *stringArg = stringValuesOfArgs(i, stmt);
-	if (error_msg)
-	  Error("Wrong type of '%s' argument in IO-statement", stringArg, 450, stmt);
-	return false;
-  }
-  return true;
-}
-
-bool checkVarRefIntArg(SgExpression *arg, int i, SgStatement *stmt, int error_msg) {
-  if (!arg) return true;
-  SgVarRefExp *var = isSgVarRefExp(arg);
-  
-  if (!var || !(var->symbol()->type()->variant() == T_INT)) {
-	const char *stringArg = stringValuesOfArgs(i, stmt);
-	if (error_msg)
-	  Error("Wrong type of '%s' argument in IO-statement", stringArg, 450, stmt);
-	return false;
-  }
-  return true;
-}
-
-bool checkUnitAndNewUnit(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-  if (ioc[UNIT_IO] && ioc[NEWUNIT_IO]) {
-	if (error_msg)
-	  err("Wrong combination of arguments: both unit and newunit arguments specified", 452, stmt);
-	return false;
-  }
-  if (!ioc[UNIT_IO] && !ioc[NEWUNIT_IO]) {
-	if (error_msg)
-	  err("Neither unit nor newunit specified in OPEN statement", 451, stmt);
-	return false;
-  }
-  return true;
-}
-
-// forbids sequential and direct access
-bool checkAccessArg(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-  // stream access is not a default value, so if access it omitted, there's an error
-  if (!ioc[ACCESS_IO]) {
-	if (error_msg)
-	  err("Only stream access is allowed in parallel IO", 455, stmt);
-	return false;
-  }
-  SgValueExp *access = isSgValueExp(ioc[ACCESS_IO]);
-  if (!access) return true;
-  if (!strcmpi(access->stringValue(), "stream")) return true;
-  
-  if (error_msg)
-	err("Only stream access is allowed in parallel IO", 455, stmt);
-  return false;
-}
-
-// forbids formatted input
-bool checkFormArg(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-  // if access is stream, default form argument value is formatted
-  // if access isn't stream, this stmt is already treated as wrong
-  if (!ioc[FORM_IO]) return true;
-  SgValueExp *form = isSgValueExp(ioc[FORM_IO]);
-  if (!form) return true;
-  if (!strcmpi(form->stringValue(), "unformatted")) return true;
-  
-  if (error_msg)
-	err("Formatted form is not allowed in parallel IO", 455, stmt);
-  return false;
-}
-
-bool checkFormattedArgs(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-	/* if form specifier is omitted, it's considered to be unformatted. */
-  SgExpression *form = ioc[FORM_IO];
-  if (!form || (form && isSgValueExp(form) && !strcmpi(isSgValueExp(form)->stringValue(), "unformatted"))) {
-    if (ioc[BLANK_IO] || ioc[DECIMAL_IO] || ioc[DELIM_IO] || ioc[ENCODING_IO] || ioc[PAD_IO] || ioc[ROUND_IO] || ioc[SIGN_IO])
-    {
-       if (error_msg)
-           err("Formatted arguments used in unformatted IO.", 453, stmt);
-       return false;
-    }
-  }
-  return true;
-}
-
-bool checkStatusArg(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-  if (!ioc[STATUS_IO]) return true;
-  if (!isSgValueExp(ioc[STATUS_IO])) return true;
-  char *string_val = isSgValueExp(ioc[STATUS_IO])->stringValue();
-  
-  if ((!strcmpi(string_val, "new") || !strcmpi(string_val, "replace")) && !ioc[FILE_IO]) {
-	if (error_msg)
-	  err("Wrong combination of arguments: if status argument is \"new\" or \"replace\", file argument shall be specified", 452, stmt);
-	return false;
-  }
-  if (!strcmpi(string_val, "scratch") && ioc[FILE_IO]) {
-	if (error_msg)
-	  err("Wrong combination of arguments: if status argument is \"scratch\", file argument shall not be specified", 452, stmt);
-	return false;
-  }
-  return true;
-  
-}
-
-bool checkDvmModeArg(char const *io_modes_str, SgStatement *stmt, int error_msg) {
-  
-  if (!io_modes_str || !io_modes_str[0]) return true;
-  bool l = false;
-  bool p = false;
-  for (int i = 0; *io_modes_str && i < 3; ++i) {
-	if (io_modes_str[i] == 'l') l = true;
-	else if (io_modes_str[i] == 'p') p = true;
-  }
-  if (l && p) {
-	if (error_msg)
-	  err("Wrong combination of arguments: local and parallel mode simultaneously used", 452, stmt);
-	return false;
-  }
-  return true;
-}
-
-bool checkNewunitArgument(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-	/*
-	 If the NEWUNIT= specifier appears in an OPEN statement, either the FILE= specifier shall appear, or the STATUS= specifier shall appear with a value of SCRATCH. The unit identified by a NEWUNIT value shall not be preconnected.
-	 
-	 newunit ==> (file xor status == 'scratch')
-	 
-	 !(newunit ==> (file xor status == 'scratch'))
-	 !(!newunit || (file xor status == 'scratch'))
-	 newunit && !(file xor status == 'scratch')
-	 
-	 a xor b = (!a^b || a^!b)
-	 
-	 newunit && !( (file && status != 'scratch') || (!file && status == 'scratch') )
-	 newunit && !(file && status != 'scratch') && !(!file && status == 'scratch')
-	 newunit && (!file || status == 'scratch') && (file || status != 'scratch')
-	 
-	 */
-	
-	SgExpression *newunit = ioc[NEWUNIT_IO];
-	SgExpression *file = ioc[FILE_IO];
-	SgExpression *status = ioc[STATUS_IO];
-	
-	bool status_scratch = (status && !isSgValueExp(status)) || (status && isSgValueExp(status) && !strcmpi(isSgValueExp(status)->stringValue(), "scratch"));
-	bool status_not_scratch = !status || (status && isSgValueExp(status) && strcmpi(isSgValueExp(status)->stringValue(), "scratch"));
-	
-	if (newunit && (!file || status_scratch) && (file || status_not_scratch))	{
-		if (error_msg)
-			err("Wrong combination of arguments: newunit argument shall be specified together with either file argument, or with status argument equal to \"scratch\"", 452, stmt);
-		return false;
-	}
-
-	return true;
-	
-}
-
-bool checkFileArg(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-  // FILE ARG If this specifier is omitted and the unit is not connected to a file, the STATUS= specifier shall be specified with a value of SCRATCH
-  // !((file && !unit) -> status='scratch') = ((file && !unit) && !status='scratch')
-  if (isSgVarRefExp(ioc[STATUS_IO])) return true;
-  if (ioc[FILE_IO] && !ioc[UNIT_IO] && ioc[STATUS_IO] && isSgValueExp(ioc[STATUS_IO]) && strcmpi(isSgValueExp(ioc[STATUS_IO])->stringValue(), "scratch")) {
-	if (error_msg)
-	  err("Wrong combination of arguments: file argument specified, unit not specified and status isn't \"scratch\"", 452, stmt);
-	return false;
-  }
-  return true;
-}
-
-bool checkReclArg(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-  
-  /*
-   The value of the RECL= specifier shall be positive.
-   This specifier shall not appear when a file is being connected for stream access.
-   This specifier shall appear when a file is being connected for direct access.
-   */
-  
-  SgExpression *recl = ioc[RECL_IO];
-  SgExpression *access = ioc[ACCESS_IO];
-  
-  if (isSgVarRefExp(recl)) return true;
-  if (recl && isSgValueExp(recl)->intValue() <= 0) {
-	if (error_msg)
-	  err("Wrong value of argument: recl argument should be positive", 455, stmt);
-	return false;
-  }
-  if (isSgVarRefExp(access)) return true;
-  if (recl && access && isSgValueExp(access) && !(strcmpi(isSgValueExp(access)->stringValue(), "stream"))) {
-	if (error_msg)
-	  err("Wrong combination of arguments: recl argument used with stream file", 452, stmt);
-	return false;
-  }
-  if (!recl && access && isSgValueExp(access) && !(strcmpi(isSgValueExp(access)->stringValue(), "direct"))) {
-	if (error_msg)
-	  err("Wrong combination of arguments: recl argument should be used with direct file", 452, stmt);
-	return false;
-  }
-  return true;
-}
-
-bool checkPosArg(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-	// The connection shall be for sequential or stream access.
-	// error if is position is specefied, access is scecified and access is direct
-	SgExpression *access = ioc[ACCESS_IO]; // default is sequantal, so, it's correct if it's omitted
-	if (isSgValueExp(access)) return true;
-	if (ioc[POSITION_IO]  && access && !strcmpi(isSgValueExp(access)->stringValue(), "direct")) {
-		if (error_msg)
-			err("Wrong combination of arguments: position argument may be specified only for direct and sequential access", 452, stmt);
-		return false;
-	}
-	return true;
-}
-
-bool checkArgsClose(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-  
-  bool correct = true;
-  
-  if (!checkIntArg(ioc[UNIT_IO], UNIT_IO, stmt, error_msg)) correct = false;
-  if (!checkLabelRefArg(ioc[ERR_IO], stmt, error_msg)) correct = false;
-  if (!checkVarRefIntArg(ioc[IOSTAT_IO], IOSTAT_IO, stmt, error_msg)) correct = false;
-  if (!checkStringVarArg(ioc[IOMSG_IO], IOMSG_IO, stmt, error_msg)) correct = false;
-  if (!checkStringArg(ioc[STATUS_IO], STATUS_IO, stmt, error_msg)) correct = false;
-  
-  if (!correct) return false;
-  
-  const char *pos_val_status[] = { "keep", "delete" };
-  if (!checkDefaultStringArg(ioc[STATUS_IO], pos_val_status, 2, STATUS_IO, stmt, error_msg)) correct = false;
-  return correct;
-}
-
-bool checkArgsOpen(SgExpression **ioc, SgStatement *stmt, int error_msg, char const *io_modes_str) {
-	
-	// for every argument we should check if it has a correct type
-	// then check some special restricitions
-	// then check that all the arguments have correct values
-	bool correct = true;
-	
-	if (!checkLabelRefArg(ioc[ERR_IO], stmt, error_msg)) correct = false;
-	
-	if (!checkIntArg(ioc[UNIT_IO], UNIT_IO, stmt, error_msg)) correct = false;
-	if (!checkIntArg(ioc[RECL_IO], RECL_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[ACCESS_IO], ACCESS_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[ACTION_IO], ACTION_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[ASYNC_IO], ASYNC_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[BLANK_IO], BLANK_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[DECIMAL_IO], DECIMAL_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[DELIM_IO], DELIM_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[ENCODING_IO], ENCODING_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[FILE_IO], FILE_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[FORM_IO], FORM_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[PAD_IO], PAD_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[POSITION_IO], POSITION_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[ROUND_IO], ROUND_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[SIGN_IO], SIGN_IO, stmt, error_msg)) correct = false;
-	if (!checkStringArg(ioc[STATUS_IO], STATUS_IO, stmt, error_msg)) correct = false;
-	
-	// dvm io mode produces mistake!
-	if (!checkStringArg(ioc[DVM_MODE_IO], DVM_MODE_IO, stmt, error_msg)) correct = false;
-	if (!checkVarRefIntArg(ioc[IOSTAT_IO], IOSTAT_IO, stmt, error_msg)) correct = false;
-	if (!checkVarRefIntArg(ioc[NEWUNIT_IO], NEWUNIT_IO, stmt, error_msg)) correct = false;
-	if (!checkStringVarArg(ioc[IOMSG_IO], IOMSG_IO, stmt, error_msg)) correct = false;
-	
-	if (!correct) return false;
-	
-	/* FILE argument may have any value; it shouldn't checked */
-	const int string_args[14] = { ACCESS_IO, ACTION_IO, ASYNC_IO, BLANK_IO, DECIMAL_IO, DELIM_IO, ENCODING_IO /*, FILE_IO */, FORM_IO, PAD_IO, POSITION_IO, ROUND_IO, SIGN_IO, STATUS_IO, DVM_MODE_IO };
-	
-	const char *pos_val_access[] = { "sequental", "direct", "stream" }; //3
-	const char *pos_val_action[] = { "read", "write", "readwrite"}; //3
-	const char *pos_val_async[] = { "yes", "no"}; // 2
-	const char *pos_val_blank[] = { "null", "zero"}; // 2
-	const char *pos_val_decimal[] = { "comma", "point"}; // 2
-	const char *pos_val_delim[] = { "apostrophe", "quote", "none" }; // 3
-	const char *pos_val_encoding[] = { "utf-8", "default"}; // 2
-	const char *pos_val_form[] = { "formatted", "unformatted"}; // 2
-	const char *pos_val_pad[] = { "yes", "no"}; // 2
-	const char *pos_val_position[] = { "asis", "rewind", "append"}; // 3
-	const char *pos_val_round[] = { "up", "down", "zero", "nearest", "compatible", "processor_defined" }; // 6
-	const char *pos_val_sign[] = { "plus", "suppress", "processor_defined" }; // 3
-	const char *pos_val_status[] = { "old", "new", "replace", "unknown" }; // 4
-	
-	const char **pos_values[] = {pos_val_access, pos_val_action, pos_val_async, pos_val_blank, pos_val_decimal, pos_val_delim, pos_val_encoding,
-	 pos_val_form, pos_val_pad, pos_val_position, pos_val_round, pos_val_sign, pos_val_status };
-	const int arg_count[] = { 3, 3, 2, 2, 2, 3, 2, 2, 2, 3, 6, 3, 4 };
-	
-	for (int i = 0; i < 13; ++i) {
-		if (!checkDefaultStringArg(ioc[string_args[i]], pos_values[i], arg_count[i], string_args[i], stmt, error_msg))
-			correct = false;
-	}
-	
-	if (!checkAccessArg(ioc, stmt, error_msg)) correct = false;
-	if (!checkFormArg(ioc, stmt, error_msg)) correct = false;
-	if (!checkFormattedArgs(ioc, stmt, error_msg)) correct = false;
-	if (!checkPosArg(ioc, stmt, error_msg)) correct = false;
-	if (!checkUnitAndNewUnit(ioc, stmt, error_msg)) correct = false;
-	if (!checkNewunitArgument(ioc, stmt, error_msg)) correct = false;
-	if (!checkReclArg(ioc, stmt, error_msg)) correct = false;
-	if (!checkStatusArg(ioc, stmt, error_msg)) correct = false;
-	
-	if (!checkDvmModeArg(io_modes_str, stmt, error_msg)) correct = false;
-	return correct;
-	
-}
-
-bool checkArgsEnfileRewind(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-	/*
-	 DVMH_API void dvmh_ftn_endfile_(const DvmType *pUnit, const VarRef *pErrFlagRef, const VarRef *pIOStatRef, const StringVarRef *pIOMsg);
-	 DVMH_API void dvmh_ftn_rewind_(const DvmType *pUnit, const VarRef *pErrFlagRef, const VarRef *pIOStatRef, const StringVarRef *pIOMsg);
-	 */
-  bool correct = true;
-  
-  if (stmt->variant() == BACKSPACE_STAT) {
-    if (error_msg)
-      warn("Backspace statement isn't implemented in new IO", 0, stmt); // FIXME: error number
-    correct = false;
-  }
-	
-	if (!checkIntArg(ioc[UNIT_], UNIT_, stmt, error_msg)) correct = false;
-	if (!ioc[UNIT_]) {
-		if (error_msg)
-			err("Unit argument not specified in file position statement", 456, stmt);
-		correct = false;
-	}
-	if (!checkLabelRefArg(ioc[ERR_], stmt, error_msg)) correct = false;
-	if (!checkVarRefIntArg(ioc[IOSTAT_],IOSTAT_, stmt, error_msg)) correct = false;
-	if (!checkStringVarArg(ioc[IOMSG_], IOMSG_, stmt, error_msg)) correct = false;
-	return correct;
-	
-}
-
-bool checkArgsRW(SgExpression **ioc, SgStatement *stmt, int error_msg) {
-	
-	bool correct = true;
-  
-  /* these arguments are forbidden in both new and old IO: blank, delim, decimal, eor, pad, sign */
-  if (ioc[BLANK_RW] || ioc[DELIM_RW] || ioc[DECIMAL_RW] || ioc[EOR_RW] || ioc[PAD_RW] || ioc[SIGN_RW] || ioc[ROUND_RW])
-  {
-    if (error_msg)
-      err("Arguments forbidden in both new and old IO used", 453, stmt); // FIXME: number or error?
-    correct = false;
-  }
-  
-  /* these arguments are forbidden only in new IO, so only warning should be showed */
-  /* these arguments aren't added to argument, so it's unnessecary to care about what will be with them */
-  if (ioc[FMT_RW] || ioc[NML_RW] || ioc[ADVANCE_RW] || ioc[REC_RW] || ioc[SIZE_RW]) {
-    if (error_msg)
-      warn("Arguments not allowed in new IO used", 453, stmt);  // FIXME: number or error?
-    correct = false;
-  }
-
-	checkIntArg(ioc[UNIT_RW], UNIT_RW, stmt, error_msg);
-	
-	if (stmt->variant() == WRITE_STAT && ioc[END_RW]) {
-		if (error_msg)
-			err("Illegal elements in control list", 185, stmt);
-		correct = false;
-	}
-	else if (!checkLabelRefArg(ioc[END_RW], stmt, error_msg)) correct = false;
-	
-	if (!checkLabelRefArg(ioc[ERR_RW], stmt, error_msg)) correct = false;
-	if (!checkVarRefIntArg(ioc[IOSTAT_RW], IOSTAT_RW, stmt, error_msg)) correct = false;
-	if (!checkStringVarArg(ioc[IOMSG_RW], IOMSG_RW, stmt, error_msg)) correct = false;
-	if (!checkIntArg(ioc[POS_RW], POS_RW, stmt, error_msg)) correct = false;
-	
-	SgExprListExp *items = isSgExprListExp(isSgInputOutputStmt(stmt)->itemList());
-	if (items == NULL) {
-    if (ioc[NML_RW]) {
-      if (error_msg)
-        warn("Namelist argument is not supported in new IO", 457, stmt); // FIXME: error number
-      return false; // further checking is unnecceasry, because there's no item to reading/writing
-    }
-    else {
-      if (error_msg)
-        err("Subject for reading/writing not specified", 457, stmt);
-      return false; // further checking is unnecceasry, because there's no item to reading/writing
-    }
-	}
-  
-  if (stmt->variant() == READ_STAT) {
-    for (int i = 0; i < items->length(); ++i) {
-      SgExpression *item = items->elem(i);
-      if (!(item->variant() == VAR_REF || item->variant() == ARRAY_REF || item->variant() == ARRAY_OP)) {
-        if (error_msg)
-          err("Wrong type of argument in IO-statement: reading item is not a variable", 450, stmt);
-        correct = false;
-      }
-    }
-  }
-  /* array expressions are not yet implemented in new IO, but are allowed in old IO */
-  else {
-    for (int i = 0; i < items->length(); ++i) {
-      SgExpression *item = items->elem(i);
-      // forbidding array expressions such as A+B
-      // substrings, array elements and sections are still allowed
-      if (isSgArrayType(item->type()) && !item->symbol()) {
-        if (error_msg)
-          warn("Not implemented item type for writing in new IO: array expressions", 458, stmt);
-        correct = false;
-      }
-    }
-  }
-  
-  return correct;
-}
-
-SgStatement *IfConnected(SgStatement *stmt, SgExpression *unit, bool suitableForNewIO) 
-{
-  // generate If construct:  
-  //     if (dvmh_ftn_connected ( unit,suitableForNewIO ) then
-  //            CONTINUE
-  //     else
-  //            stmt
-  //     endif
-
-	SgValueExp one(1); 
-        SgStatement *cp = stmt->controlParent();
-        cur_st = stmt->lexNext();
-	stmt->extractStmt();
-	SgStatement *trueBody = new SgStatement(CONT_STAT); //CONTINUE statement
-	SgStatement *falseBody = stmt;	
-	SgExpression *failIfYes = suitableForNewIO ? ConstRef(0) : ConstRef(1); // ????????
-        	
-	SgIfStmt *ifst = new SgIfStmt(SgEqOp(*DvmhConnected(DvmType_Ref(unit), failIfYes), one), *trueBody, *falseBody);
-	
-	cur_st->insertStmtBefore(*ifst, *cp);
-	
-	cur_st = trueBody;
-
-       if (stmt-> hasLabel()) {    // IO statement has label
-       // the label of IO statement is transfered on IF statement  
-          BIF_LABEL(stmt->thebif) = NULL; 
-          ifst->setLabel(*stmt->label());  
-       }
-       char *cmnt=stmt-> comments();
-       if (cmnt) {    // IO statement has preceeding comments
-       // the comment of IO statement is transfered on IF statement  
-          BIF_CMNT(stmt->thebif) = NULL;
-          ifst -> setComments(cmnt);
-       }
-
-        return ifst; 
-}
-
-int control_list_open_new(SgExpression *e, SgExpression *ioc[])
-// analizes control list (e) for OPEN
-// and sets on ioc[]
-{ SgKeywordValExp *kwe;
-  SgExpression *ee,*el;
-  int i;
-  for(i=NUMB__CL; i; i--)
-	ioc[i-1] = NULL;
-  
-  if(e->variant() == SPEC_PAIR) {
-	kwe = isSgKeywordValExp(e->lhs());
-	if (!kwe || !strcmp(kwe->value(), "unit"))
-	  ioc[UNIT_IO] = e->rhs();
-	else if (!strcmp(kwe->value(), "newunit"))
-	  ioc[NEWUNIT_IO] = e->rhs();
-	else return 0;
-	
-	return(1);
-  }
-  if(e->variant() == EXPR_LIST){
-	for(el=e; el; el = el->rhs()) {
-	  ee = el->lhs();
-	  if(ee->variant() != SPEC_PAIR)
-		return(0); // IO_control list error
-	  kwe = isSgKeywordValExp(ee->lhs());
-	  if(!kwe)
-		return(0);
-	  if     (!strcmp(kwe->value(),"unit"))
-		ioc[UNIT_IO] = ee->rhs();
-	  else if (!strcmp(kwe->value(),"access"))
-		ioc[ACCESS_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"action"))
-		ioc[ACTION_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"async"))
-		ioc[ASYNC_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"blank"))
-		ioc[BLANK_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"decimal"))
-		ioc[DECIMAL_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"delim"))
-		ioc[DELIM_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"encoding"))
-		ioc[ENCODING_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"file"))
-		ioc[FILE_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"form"))
-		ioc[FORM_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"iostat"))
-		ioc[IOSTAT_IO] = ee->rhs();
-	  else if (!strcmp(kwe->value(),"iomsg"))
-		ioc[IOMSG_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"newunit"))
-		ioc[NEWUNIT_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"pad"))
-		ioc[PAD_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"position"))
-		ioc[POSITION_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"recl"))
-		ioc[RECL_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"round"))
-		ioc[ROUND_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"sign"))
-		ioc[SIGN_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"status"))
-		ioc[STATUS_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"err"))
-		ioc[ERR_IO]  = ee->rhs();
-	  else
-		return(0);
-	}
-	return(1);
-  }
-  else
-	return(0);
-}
-
-int control_list_close_new(SgExpression *e, SgExpression *ioc[])
-// analizes control list (e) for CLOSE
-// and sets on ioc[]
-{ SgKeywordValExp *kwe;
-  SgExpression *ee,*el;
-  int i;
-  for(i=NUMB__CL; i; i--)
-	ioc[i-1] = NULL;
-  
-  if(e->variant() == SPEC_PAIR) {
-	kwe = isSgKeywordValExp(e->lhs());
-	if (!kwe || !strcmp(kwe->value(), "unit"))
-	  ioc[UNIT_IO] = e->rhs();
-	else return 0;
-	return(1);
-  }
-  if(e->variant() == EXPR_LIST){
-	for(el=e; el; el = el->rhs()) {
-	  ee = el->lhs();
-	  if(ee->variant() != SPEC_PAIR)
-		return(0); // IO_control list error
-	  kwe = isSgKeywordValExp(ee->lhs());
-	  if(!kwe)
-		return(0);
-	  if     (!strcmp(kwe->value(),"unit"))
-		ioc[UNIT_IO] = ee->rhs();
-	  else if (!strcmp(kwe->value(),"iostat"))
-		ioc[IOSTAT_IO] = ee->rhs();
-	  else if (!strcmp(kwe->value(),"iomsg"))
-		ioc[IOMSG_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"err"))
-		ioc[ERR_IO]  = ee->rhs();
-	  else if (!strcmp(kwe->value(),"status"))
-		ioc[STATUS_IO]  = ee->rhs();
-	  else
-		return(0);
-	}
-	if (!ioc[UNIT_IO]) return(0);
-	return(1);
-  }
-  else
-	return(0);
-  
-}
-
-
-//enum class ArgType : int { NUMBER = 0, STRING = 1, VAR = 2, STRINGVAR = 3 };
-enum { NUMBER_ARG, STRING_ARG, VAR_ARG, STRING_VAR_ARG };
-  
-int addArgToCall(SgExpression *ioc[], int type, SgCallStmt *call, int arg)
-{
-  if (!ioc[arg])
-	call->addArg(*ConstRef(0));
-  else
-	switch (type) {
-	  case NUMBER_ARG:
-		call->addArg(*DvmType_Ref(ioc[arg]));
-		break;
-	  case STRING_ARG:
-		call->addArg(*DvmhString(ioc[arg]));
-		break;
-	  case VAR_ARG:
-		call->addArg(*DvmhVariable(ioc[arg]));
-		break;
-	  case STRING_VAR_ARG:
-		call->addArg(*DvmhStringVariable(ioc[arg]));
-		break;
-	  default:
-		return 1;
-	}
-  return 0;
-}
-
-int addArgToCalls(SgExpression *ioc[], int type, SgCallStmt **calls, int ncalls, int arg) {
-	
-	if (!ioc[arg])
-		for (int i = 0; i < ncalls; ++i)
-			calls[i]->addArg(*ConstRef(0));
-	else
-		switch (type) {
-			case NUMBER_ARG:
-				for (int i = 0; i < ncalls; ++i)
-					calls[i]->addArg(*DvmType_Ref(ioc[arg]));
-				break;
-			case STRING_ARG:
-				for (int i = 0; i < ncalls; ++i)
-					calls[i]->addArg(*DvmhString(ioc[arg]));
-				break;
-			case VAR_ARG:
-				for (int i = 0; i < ncalls; ++i)
-					calls[i]->addArg(*DvmhVariable(ioc[arg]));
-				break;
-			case STRING_VAR_ARG:
-				for (int i = 0; i < ncalls; ++i)
-					calls[i]->addArg(*DvmhStringVariable(ioc[arg]));
-				break;
-			default:
-			  return 1;
-		}
-	return 0;
-	
-}
-  
-/* for inserting assignment dvm000(index) = 0 after cur_st. insertation is made only if cond = true */
-void OccupyDvm000Elem(SgExpression *cond, int index) {
-  
-  if (cond) {
-	SgValueExp *zero = new SgValueExp(0);
-	SgStatement *ass = new SgAssignStmt (*DVM000(index), *zero);
-	
-	cur_st->lastNodeOfStmt()->insertStmtAfter(*ass, *cur_st->controlParent());
-	cur_st = ass;
-  }
-}
-  
-/* for inserting if statement : if (dvm000(index) .ne. 0  goto  ... */
-void InsertGotoStmt(SgExpression *err, int index) {
-  
-  if (err) {
-	SgValueExp *zero = new SgValueExp(0);
-	SgGotoStmt *gotostmt = new SgGotoStmt(*isSgLabelRefExp(err)->label());
-	SgIfStmt *ifst = new SgIfStmt(SgNeqOp(*DVM000(index), *zero), *gotostmt);
-	
-	cur_st->lastNodeOfStmt()->insertStmtAfter(*ifst, *cur_st->controlParent());
-	cur_st = ifst;
-	
-  }
-}
-
-void addRefArgToCall(SgExpression *ref_arg, SgCallStmt *call) {
-  
-  if (ref_arg) call->addArg(*DvmhVariable(DVM000(ndvm++)));
-  else call->addArg(*ConstRef(0));
-  return;
-}
-
-void addRefArgToCalls(SgExpression *err, SgCallStmt **calls, int ncalls, int *indeces) {
-	for (int i = 0; i < ncalls; ++i) {
-		indeces[i] = ndvm;
-		addRefArgToCall(err, calls[i]);
-	}
-}
-
-
-void Dvmh_Close(SgExpression *ioc[]) {
- 
-  /*
-   DVMH_API void dvmh_ftn_close_(
-   const DvmType *pUnit,
-   const VarRef *pErrFlagRef,
-   const VarRef *pIOStatRef,
-   const StringVarRef *pIOMsg,
-   const StringRef *pStatus);
-   */
-  SgStatement *continue_st = cur_st; //true body of IF construct
-  fmask[FTN_CLOSE] = 2;
-  SgCallStmt *close_call = new SgCallStmt(*fdvm[FTN_CLOSE]);
-  
-  int index_before = ndvm;
-  
-  addArgToCall(ioc, NUMBER_ARG, close_call, UNIT_IO);
-  int index_err = ndvm;
-  addRefArgToCall(ioc[ERR_IO], close_call);
-  int index_iostat = ndvm;
-  addRefArgToCall(ioc[IOSTAT_IO], close_call);
-  addArgToCall(ioc, STRING_VAR_ARG, close_call, IOMSG_IO);
-  addArgToCall(ioc, STRING_ARG, close_call, STATUS_IO);
-  
-  OccupyDvm000Elem(ioc[ERR_IO], index_err);
-  OccupyDvm000Elem(ioc[IOSTAT_IO], index_iostat);
-                 //InsertNewStatementAfter(close_call, cur_st, stmt->controlParent());
-  doCallAfter(close_call);
-  if (ioc[IOSTAT_IO]) doAssignTo_After(ioc[IOSTAT_IO], DVM000(index_iostat));
-  InsertGotoStmt(ioc[ERR_IO], index_err);  
-  continue_st->extractStmt();  
-  SET_DVM(index_before);
-  
-  return;
-}
-
-void Dvmh_Open(SgExpression *ioc[], const char *io_modes_str)
-{
-  /*
-   DVMH_API void dvmh_ftn_open_(
-   const DvmType *pUnit,
-   const StringRef *pAccess,
-   const StringRef *pAction,
-   const StringRef *pAsync,
-   const StringRef *pBlank,
-   const StringRef *pDecimal,
-   const StringRef *pDelim,
-   const StringRef *pEncoding,
-   const StringRef *pFile,
-   const StringRef *pForm,
-   const VarRef *pErrFlagRef,
-   const VarRef *pIOStatRef,
-   const StringVarRef *pIOMsg,
-   const VarRef *pNewUnitRef,
-   const StringRef *pPad,
-   const StringRef *pPosition,
-   const DvmType *pRecl,
-   const StringRef *pRound,
-   const StringRef *pSign,
-   const StringRef *pStatus,
-   const StringRef *pDvmMode); */
-  
-  SgStatement *continue_st = cur_st; //true body of IF construct
-  if (io_modes_str) ioc[DVM_MODE_IO] = new SgValueExp(io_modes_str);
-  
-  int index_before = ndvm;
-  
-  fmask[FTN_OPEN] = 2;
-  SgCallStmt *open_call = new SgCallStmt(*fdvm[FTN_OPEN]);
-  
-  addArgToCall(ioc, NUMBER_ARG, open_call, UNIT_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, ACCESS_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, ACTION_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, ASYNC_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, BLANK_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, DECIMAL_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, DELIM_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, ENCODING_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, FILE_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, FORM_IO);
-  
-  int index_err = ndvm;
-  addRefArgToCall(ioc[ERR_IO], open_call);
-  int index_iostat = ndvm;
-  addRefArgToCall(ioc[IOSTAT_IO], open_call);
-  addArgToCall(ioc, STRING_VAR_ARG, open_call, IOMSG_IO);
-  int index_newunit = ndvm;
-  addRefArgToCall(ioc[NEWUNIT_IO], open_call);
-  
-  addArgToCall(ioc, STRING_ARG, open_call, PAD_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, POSITION_IO);
-  addArgToCall(ioc, NUMBER_ARG, open_call, RECL_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, ROUND_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, SIGN_IO);
-  addArgToCall(ioc, STRING_ARG, open_call, STATUS_IO);
-  
-  addArgToCall(ioc, STRING_ARG, open_call, DVM_MODE_IO);
-  
-  OccupyDvm000Elem(ioc[ERR_IO], index_err);
-  OccupyDvm000Elem(ioc[IOSTAT_IO], index_iostat);
-  OccupyDvm000Elem(ioc[NEWUNIT_IO], index_newunit);
-  doCallAfter(open_call);
-  if (ioc[IOSTAT_IO]) doAssignTo_After(ioc[IOSTAT_IO], DVM000(index_iostat));
-  if (ioc[NEWUNIT_IO]) doAssignTo_After(ioc[NEWUNIT_IO], DVM000(index_newunit));
-  InsertGotoStmt(ioc[ERR_IO], index_err);
-  
-  continue_st->extractStmt();
-  
-  SET_DVM(index_before);
-  
-  return;
-  
-}
-
-void Dvmh_FilePosition(SgExpression *ioc[], int variant) {
-  
-  /*
-   DVMH_API void dvmh_ftn_endfile_(const DvmType *pUnit, const VarRef *pErrFlagRef, const VarRef *pIOStatRef, const StringVarRef *pIOMsg);
-   DVMH_API void dvmh_ftn_rewind_(const DvmType *pUnit, const VarRef *pErrFlagRef, const VarRef *pIOStatRef, const StringVarRef *pIOMsg);
-   */
-  
-  SgStatement *continue_st = cur_st; //true body of IF construct
-  
-  SgCallStmt *call;
-  if (variant == ENDFILE_STAT) {
-	call = new SgCallStmt(*fdvm[FTN_ENDFILE]);
-	fmask[FTN_ENDFILE] = 2;
-  }
-  else {
-	call = new SgCallStmt(*fdvm[FTN_REWIND]);
-	fmask[FTN_REWIND] = 2;
-  }
-  
-  int index_before = ndvm;
-  
-  addArgToCall(ioc, NUMBER_ARG, call, UNIT_);
-  int index_iostat = ndvm;
-  addRefArgToCall(ioc[IOSTAT_], call);
-  int index_err = ndvm;
-
-  addRefArgToCall(ioc[ERR_], call);
-  addArgToCall(ioc, STRING_VAR_ARG, call, IOMSG_);
-	
-  OccupyDvm000Elem(ioc[ERR_], index_err);
-  OccupyDvm000Elem(ioc[IOSTAT_], index_iostat);
-  doCallAfter(call);
-  if (ioc[IOSTAT_]) doAssignTo_After(ioc[IOSTAT_], DVM000(index_iostat));
-  InsertGotoStmt(ioc[ERR_], index_err);
-  
-  continue_st->extractStmt();
-  
-  SET_DVM(index_before);
-  
-  return;
-  
-}
-
-SgExpression *ArrNoSubs(SgExpression *expr) {
-	SgArrayRefExp *arr = isSgArrayRefExp(expr);
-  // second part of conjunction is for excluding characters, that also are ArrayRefExp
-	if (arr && isSgArrayType(expr->symbol()->type()))
-    return new SgArrayRefExp(*arr->symbol());
-	return expr;
-}
-
-void Dvmh_ReadWrite(SgExpression **ioc, SgStatement *stmt) {
-  
-  /*
-   DVMH_API void dvmh_ftn_read_unf_(
-   const DvmType *pUnit,
-   const VarRef *pEndFlagRef,
-   const VarRef *pErrFlagRef,
-   const VarRef *pIOStatRef,
-   const StringVarRef *pIOMsg,
-   const DvmType *pPos,
-   const DvmType dvmDesc[],
-   const DvmType *pSpecifiedFlag,
-   ...);
-   */
-  
-  /* dvmh_ftn_write_unf() different from read by the absence of the flag pEnd.
-   DVMH_API void dvmh_ftn_write_unf_(
-   const DvmType *pUnit,
-   const VarRef *pErrFlagRef,
-   const VarRef *pIOStatRef,
-   const StringVarRef *pIOMsg,
-   const DvmType *pPos,
-   const DvmType dvmDesc[],
-   const DvmType *pSpecifiedRank, ...);
-   */
-  SgStatement *continue_st = cur_st; //true body of IF construct
-  
-  SgInputOutputStmt *io_stmt = isSgInputOutputStmt(stmt);
-  SgExprListExp *items = isSgExprListExp(io_stmt->itemList());
-  
-  if (!items) return; // empty items case. for example, when namelist is used
-  int ncalls = items->length();
-  SgCallStmt *calls[1000]; //ncalls
-  
-  if (stmt->variant() == READ_STAT) {
-    for (int i = 0; i < ncalls; ++i)
-      calls[i] = new SgCallStmt(*fdvm[FTN_READ]);
-    fmask[FTN_READ] = 2;
-  }
-  else {
-    for (int i = 0; i < ncalls; ++i)
-      calls[i] = new SgCallStmt(*fdvm[FTN_WRITE]);
-    fmask[FTN_WRITE] = 2;
-  }
-  
-  int index_before = ndvm;
-  
-  addArgToCalls(ioc, NUMBER_ARG, calls, ncalls, UNIT_RW);
-
-  int *i_endf = new int[ncalls]; 
-  int *i_errf = new int[ncalls]; 
-  
-  if (stmt->variant() == READ_STAT)
-    addRefArgToCalls(ioc[END_RW], calls, ncalls, i_endf);
-  addRefArgToCalls(ioc[ERR_RW], calls, ncalls, i_errf);
-  
-  int *i_iostat = new int[ncalls]; 
-  addRefArgToCalls(ioc[IOSTAT_RW], calls, ncalls, i_iostat);
-  
-  addArgToCalls(ioc, STRING_VAR_ARG, calls, ncalls, IOMSG_RW);
-  addArgToCalls(ioc, NUMBER_ARG, calls, ncalls, POS_RW);
-  
-  /*
-   inserting arguments, describing variables and array
-   for each arument:
-   1) if it is dvm-array, adding sections
-   2) if it is not-dvm array, insert data_enter before and data_exit after and adding sections
-   3) if it is scalar expression, insert only data_enter and data_exit
-   */
-  
-  for (int i_call = 0; i_call < ncalls; ++i_call) {
-    SgExpression *item = items->elem(i_call);
-    
-    // Data_enter inserting and adding VarGenHeader argument for everything, that is not a dvm-array
-    if (!(isSgArrayRefExp(item) && HEADER(item->symbol()))) {
-      doCallAfter(DataEnter(ArrNoSubs(item), ConstRef_F95(0)));
-      calls[i_call]->addArg(*VarGenHeader(ArrNoSubs(item)));
-    }
-    
-    // array reference
-    SgArrayRefExp *arr = isSgArrayRefExp(item);
-    if (arr) {
-      if (arr && HEADER(arr->symbol())) {
-        //	it should be register_array(arr(1)), not register_array(arr)
-        SgExprListExp *new_subs = new SgExprListExp(*new SgValueExp(1));
-        SgArrayRefExp *new_array_ref = new SgArrayRefExp(*arr->symbol(), *new_subs);
-        calls[i_call]->addArg(*Register_Array_H2(new_array_ref));
-      }
-      
-      if (arr->numberOfSubscripts()) {
-        int nsubs = arr->numberOfSubscripts();
-        calls[i_call]->addArg(*ConstRef(nsubs));
-        for (int i = nsubs-1; i >= 0; --i) {
-          SgExpression *lbound;
-          SgExpression *ubound;
-          SgSubscriptExp *sub;
-          // both bounds specified
-          if ((sub = isSgSubscriptExp(arr->subscript(i)))) {
-            lbound = sub->lbound();
-            ubound = sub->ubound();
-            lbound = (lbound? DvmType_Ref(lbound):  ConstRef_F95(-2147483648));
-            ubound = (ubound? DvmType_Ref(ubound):  ConstRef_F95(-2147483648));
-          }
-          // only upper bound specified
-          else {
-            lbound = ubound = DvmType_Ref(arr->subscript(i));
-          }
-          calls[i_call]->addArg(*lbound);
-          calls[i_call]->addArg(*ubound);
-        }
-      }
-      else // array doesn't have subscript or it is an array expression
-        calls[i_call]->addArg(*ConstRef(0));
-    }
-    else // it isn't array, anyhow it should be specified that there's no sections
-      calls[i_call]->addArg(*ConstRef(0));
-  }
-  
-	/* inserting function calling and goto statements in case of error occurring  */
-	for (int i_call = 0; i_call < ncalls; ++i_call) {
-		OccupyDvm000Elem(ioc[END_RW], i_endf[i_call]);
-		OccupyDvm000Elem(ioc[ERR_RW], i_errf[i_call]);
-		OccupyDvm000Elem(ioc[IOSTAT_RW], i_iostat[i_call]);
-		doCallAfter(calls[i_call]);
-		if (ioc[IOSTAT_RW]) doAssignTo_After(ioc[IOSTAT_RW], DVM000(i_iostat[i_call]));
-		InsertGotoStmt(ioc[END_RW], i_endf[i_call]);
-		InsertGotoStmt(ioc[ERR_RW], i_errf[i_call]);
-	}
-	
-	/* for every not-dvm-array item, data_exit should be inserted */
-  SgExpression *item;
-	for (int i_call = 0; i_call < ncalls; ++i_call) {
-		if (items) item = items->elem(i_call);
-		else item = ConstRef(0);
-    if (!(isSgArrayRefExp(item) && HEADER(item->symbol()))) {
-      SgStatement *data_exit = DataExit(ArrNoSubs(ArrNoSubs(item)), 1);
-      cur_st->lastNodeOfStmt()->insertStmtAfter(*data_exit, *cur_st->controlParent());
-      cur_st = data_exit;
-		}
-	}
-	
-	continue_st->extractStmt();
-	
-	SET_DVM(index_before);
-	
-	return;
-}
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/makefile.uni b/projects/dvm_svn/fdvm/trunk/fdvm/makefile.uni
deleted file mode 100644
index 16a8d26..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/makefile.uni
+++ /dev/null
@@ -1,151 +0,0 @@
-#echo#######################################################################
-# Makefile for   Fortran DVM back-end
-#
-#echo#######################################################################
-
-# dvm/fdvm/fdvm/makefile.uni
-
-SAGEROOT = ../Sage
-LIBDIR = ../lib
-BINDIR = ../../bin
-LIBINCLUDE = $(SAGEROOT)/lib/include
-HINCLUDE = $(SAGEROOT)/h
-DVMINCLUDE = ../include
-EXECUTABLES = f_dvm
-
-LOADER = $(LINKER)
-
-INCL = -I. -I$(LIBINCLUDE) -I$(HINCLUDE) -I$(DVMINCLUDE)
-
-CFLAGS = -c $(INCL) -Wall
-LDFLAGS =
-
-LIBS = $(LIBDIR)/libSage++.a $(LIBDIR)/libsage.a $(LIBDIR)/libdb.a
-OBJS = acc.o \
-	   acc_across.o \
-	   acc_across_analyzer.o \
-	   acc_analyzer.o \
-	   acc_data.o \
-	   acc_f2c.o \
-	   acc_f2c_handlers.o \
-	   acc_rtc.o \
-	   acc_utilities.o \
-	   aks_analyzeLoops.o \
-	   aks_structs.o \
-	   calls.o \
-           checkpoint.o \
-	   debug.o \
-	   dvm.o \
-	   funcall.o \
-	   help.o \
-	   hpf.o \
-	   io.o \
-	   omp.o \
-	   ompdebug.o \
-           parloop.o \
-	   stmt.o 
-
-$(BINDIR)/$(EXECUTABLES): $(OBJS)
-	$(LOADER) $(LDFLAGS) -o $(BINDIR)/$(EXECUTABLES) $(OBJS) $(LIBS)
-
-all: $(BINDIR)/$(EXECUTABLES)
-	@echo "****** COMPILING $(EXECUTABLES) DONE ******"
-
-clean:
-	rm -f $(OBJS)
-cleanall:
-	rm -f $(OBJS)
-
-## TODO: create correct dependences
-############################# dependences ############################
-acc.o: acc.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc.cpp
-	
-acc_across.o: acc_across.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/aks_structs.h
-	$(CXX) $(CFLAGS) acc_across.cpp
-
-acc_across_analyzer.o: acc_across_analyzer.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/acc_across_analyzer.h
-	$(CXX) $(CFLAGS) acc_across_analyzer.cpp
-	
-acc_analyzer.o: acc_analyzer.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/acc_analyzer.h
-	$(CXX) $(CFLAGS) acc_analyzer.cpp
-
-acc_data.o: acc_data.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc_data.cpp
-
-acc_f2c.o: acc_f2c.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc_f2c.cpp
-
-acc_f2c_handlers.o: acc_f2c_handlers.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc_f2c_handlers.cpp
-
-acc_rtc.o: acc_rtc.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/acc_data.h
-	$(CXX) $(CFLAGS) acc_rtc.cpp
-	
-acc_utilities.o: acc_utilities.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) acc_utilities.cpp
-	
-aks_analyzeLoops.o: aks_analyzeLoops.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/aks_structs.h
-	$(CXX) $(CFLAGS) aks_analyzeLoops.cpp
-	
-aks_structs.o: aks_structs.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h $(DVMINCLUDE)/aks_structs.h
-	$(CXX) $(CFLAGS) aks_structs.cpp
-
-calls.o: calls.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) calls.cpp
-
-checkpoint.o: checkpoint.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) checkpoint.cpp
-	
-debug.o: debug.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) debug.cpp
-	
-dvm.o: dvm.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) dvm.cpp
-	
-funcall.o: funcall.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) funcall.cpp
-
-help.o: help.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) help.cpp
-
-hpf.o: hpf.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) hpf.cpp
-
-io.o: io.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) io.cpp
-	
-omp.o: omp.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) omp.cpp
-
-ompdebug.o: ompdebug.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) ompdebug.cpp
-
-parloop.o: parloop.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) parloop.cpp
-
-stmt.o: stmt.cpp $(DVMINCLUDE)/fdvm.h $(DVMINCLUDE)/libnum.h $(DVMINCLUDE)/libdvm.h \
-	$(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) stmt.cpp
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/makefile.win b/projects/dvm_svn/fdvm/trunk/fdvm/makefile.win
deleted file mode 100644
index 0bfb732..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/makefile.win
+++ /dev/null
@@ -1,148 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# dvm/fdvm/fdvm/makefile.win
-
-OUTDIR = ..\obj
-BINDIR = ..\..\bin
-LIBDIR = ..\lib
-SAGEROOT =..\Sage
-
-LIBINCLUDE = $(SAGEROOT)\lib\include
-HINCLUDE = $(SAGEROOT)\h
-FDVMINCL = ..\include
-EXECUTABLES = f_dvm
-
-INCL = -I. -I$(LIBINCLUDE) -I$(HINCLUDE) -I$(FDVMINCL)
-
-
-# -w don't issue warning now.
-#CFLAGS=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-#	/Fp"$(OUTDIR)/f_dvm.pch" /YX /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-CFLAGS=/nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-	/Fp"$(OUTDIR)/f_dvm.pch" /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-
-.cpp{$(OUTDIR)/}.obj:
-    $(CXX) $(CFLAGS) $<
-
-LINK=$(LINKER)
- 
-LINK_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-LINK_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-OBJS = $(OUTDIR)/acc.obj \
-	   $(OUTDIR)/acc_across.obj \
-	   $(OUTDIR)/acc_across_analyzer.obj \
-	   $(OUTDIR)/acc_analyzer.obj \
-	   $(OUTDIR)/acc_data.obj \
-	   $(OUTDIR)/acc_f2c.obj \
-	   $(OUTDIR)/acc_f2c_handlers.obj \
-	   $(OUTDIR)/acc_rtc.obj \
-	   $(OUTDIR)/acc_utilities.obj \
-	   $(OUTDIR)/aks_analyzeLoops.obj \
-	   $(OUTDIR)/aks_structs.obj \
-	   $(OUTDIR)/calls.obj \
-           $(OUTDIR)/checkpoint.obj \
-	   $(OUTDIR)/debug.obj \
-	   $(OUTDIR)/dvm.obj \
-	   $(OUTDIR)/funcall.obj \
-	   $(OUTDIR)/help.obj \
-	   $(OUTDIR)/hpf.obj \
-	   $(OUTDIR)/io.obj \
-	   $(OUTDIR)/omp.obj \
-	   $(OUTDIR)/ompdebug.obj \
-           $(OUTDIR)/parloop.obj \
-	   $(OUTDIR)/stmt.obj
-
-LIBS = $(LIBDIR)/libSage++.lib $(LIBDIR)\libsage.lib $(LIBDIR)\libdb.lib 
-
-
-$(BINDIR)/$(EXECUTABLES).exe: $(OBJS)
-	$(LINK) @<<
-	$(LINK_FLAGS) $(OBJS) $(LIBS)  
-<<
-
-all: $(BINDIR)/$(EXECUTABLES).exe
-    @echo "*** COMPILING EXECUTABLE $(EXECUTABLES) DONE"
-
-
-clean:
-
-cleanall:
-
-
-# ***********************************************************
-## TODO: create correct dependences
-acc.obj: acc.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-acc_across.obj: acc_across.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-acc_across_analyzer.obj: acc_across_analyzer.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h $(FDVMINCL)/acc_across_analyzer.h
-
-acc_analyzer.obj: acc_analyzer.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h $(FDVMINCL)/acc_analyzer.h
-
-acc_data.obj: acc_data.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-	
-acc_f2c.obj: acc_f2c.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-	
-acc_f2c_handlers.obj: acc_f2c_handlers.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-acc_rtc.obj: acc_rtc.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-	
-acc_utilities.obj: acc_utilities.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-	
-aks_analyzeLoops.obj: aks_analyzeLoops.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h $(FDVMINCL)/aks_structs.h
-
-aks_structs.obj: aks_structs.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h $(FDVMINCL)/aks_structs.h
-
-calls.obj: calls.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-checkpoint.obj: checkpoint.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-debug.obj: debug.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-dvm.obj: dvm.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-funcall.obj: funcall.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-help.obj: help.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h	 
-
-hpf.obj: hpf.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-io.obj: io.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-omp.obj: omp.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-ompdebug.obj: ompdebug.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-parloop.obj: parloop.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
-
-stmt.obj: stmt.cpp $(FDVMINCL)/fdvm.h $(FDVMINCL)/libnum.h $(FDVMINCL)/libdvm.h \
-	$(FDVMINCL)/dvm.h
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/omp.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/omp.cpp
deleted file mode 100644
index b69aa72..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/omp.cpp
+++ /dev/null
@@ -1,879 +0,0 @@
-#include "dvm.h"
-void AddSharedClauseForDVMVariables (SgStatement *first, SgStatement *last);
-
-int IsPositiveDoStep(SgExpression *step) {
-    int s;
-    if (step == NULL) return (1);
-    if(step->isInteger())
-        s=step->valueInteger();
-    else 
-        s = 0;
-    if(s >= 0)
-        return(1);
-    else
-        return(0);
-}
-
-
-int isOmpDir (SgStatement * st) {
-	if ((BIF_CODE(st->thebif)>800) && (BIF_CODE(st->thebif)<847)) {
-		return 1;
-	}
-	return 0;
-}
-inline int isDvmDir (SgStatement * st) {
-	switch (BIF_CODE(st->thebif)) {
-		case DVM_INTERVAL_DIR:
-		case DVM_ENDINTERVAL_DIR:
-		case DVM_DEBUG_DIR:
-		case DVM_ENDDEBUG_DIR:
-		case DVM_TRACEON_DIR:
-		case DVM_TRACEOFF_DIR:
-		case DVM_PARALLEL_ON_DIR:
-		case DVM_SHADOW_START_DIR:
-		case DVM_SHADOW_GROUP_DIR:
-		case DVM_SHADOW_WAIT_DIR:
-		case DVM_REDUCTION_START_DIR:
-		case DVM_REDUCTION_GROUP_DIR:
-		case DVM_REDUCTION_WAIT_DIR:
-		case DVM_DYNAMIC_DIR:
-		case DVM_ALIGN_DIR:
-		case DVM_REALIGN_DIR:
-		case DVM_REALIGN_NEW_DIR:
-		case DVM_REMOTE_ACCESS_DIR:
-		case HPF_INDEPENDENT_DIR:
-		case DVM_SHADOW_DIR:
-		case DVM_NEW_VALUE_DIR:
-		case DVM_VAR_DECL:
-		case DVM_POINTER_DIR:
-		case HPF_TEMPLATE_STAT:
-		case HPF_ALIGN_STAT:
-		case HPF_PROCESSORS_STAT:
-		case DVM_REDISTRIBUTE_DIR:
-		case DVM_TASK_REGION_DIR:
-		case DVM_END_TASK_REGION_DIR:
-		case DVM_ON_DIR:
-		case DVM_END_ON_DIR:
-		case DVM_TASK_DIR:
-		case DVM_MAP_DIR:
-		case DVM_PARALLEL_TASK_DIR:
-		case DVM_INHERIT_DIR:
-		case DVM_INDIRECT_GROUP_DIR:
-		case DVM_INDIRECT_ACCESS_DIR:
-		case DVM_REMOTE_GROUP_DIR:
-		case DVM_RESET_DIR:
-		case DVM_PREFETCH_DIR:
-		case DVM_OWN_DIR:
-		case DVM_HEAP_DIR:
-		case DVM_ASYNCID_DIR:
-		case DVM_ASYNCHRONOUS_DIR:
-		case DVM_ENDASYNCHRONOUS_DIR:
-		case DVM_ASYNCWAIT_DIR:
-		case DVM_F90_DIR:
-		case DVM_BARRIER_DIR:
-		case DVM_CONSISTENT_GROUP_DIR:
-		case DVM_CONSISTENT_START_DIR:
-		case DVM_CONSISTENT_WAIT_DIR:
-		case DVM_CONSISTENT_DIR:
-		case DVM_CHECK_DIR: return 1; break;
-	}
-	return 0;
-}
-
-int HideOmpStmt (SgStatement * st) {
-	int res=0;
-	SgStatement *prev = st->lexPrev ();
-	SgStatement *next =st->lexNext ();
-	while (prev && (isDvmDir(prev) || isOmpDir(prev))) prev = prev -> lexPrev ();
-	while (next && (isDvmDir(next) || isOmpDir(next))) next = next -> lexNext ();
-	if (prev && next) {
-		int length=st->numberOfAttributes();
-		int i=0;
-		SgAttribute *sa=NULL;
-		res=1;
-		switch (st->variant ()) {
-			case OMP_END_PARALLEL_DO_DIR:
-			case OMP_END_DO_DIR: {
-				for (i=0; i<length; i++) {
-					sa=st->getAttribute(i);
-					prev->addAttribute(sa->getAttributeType(),sa->getAttributeData(),sa->getAttributeSize());
-				}
-				for (i=length; i>0; i--) {
-					st->deleteAttribute(i);
-				} 
-				prev->addAttribute(OMP_STMT_AFTER, (void*) st->copyPtr (), sizeof(SgStatement *));
-				break;
-			}
-			default: {
-				for (i=0; i<length; i++) {
-					sa=st->getAttribute(i);
-					next->addAttribute(sa->getAttributeType(),sa->getAttributeData(),sa->getAttributeSize());
-				}
-				for (i=length; i>0; i--) {
-					st->deleteAttribute(i);
-				} 				
-				next->addAttribute(OMP_STMT_BEFORE, (void*) st->copyPtr (), sizeof(SgStatement *));
-				break;
-			}
-		}        
-	}
-	return res;
-}
-
-void AddAttributeOmp (SgStatement *stmt) {
-	SgStatement *last;
-	if (!stmt) return;
-	last = stmt->lastNodeOfStmt ()->lexNext ();
-	for (SgStatement *st=stmt;st && (st != last); st=st->lexNext ()) {
-		st->addAttribute (OMP_MARK);
-	}
-}
-
-void DelAttributeFromStmt (int type, SgStatement *st) {
-int length=st->numberOfAttributes();
-for (int i=0; i<length; i++) {
-	SgAttribute *sa=NULL;
-	sa = st->getAttribute(i);
-	if (sa->getAttributeType() == type) {
-		st->deleteAttribute(i);
-		break;
-	}
-}
-}
-
-int AddOmpStmt (SgStatement * st) {
-	int res = 0;
-	int length=st->numberOfAttributes(OMP_STMT_BEFORE);
-	int i=0;
-	SgStatement *stmt = NULL;
-	SgStatement *last = st->lastNodeOfStmt ();
-	for (i=0;i<length; i++) {
-	
-		SgAttribute *sa=st->getAttribute(i,OMP_STMT_BEFORE);
-		stmt = ((SgStatement *)sa->getAttributeData());
-		AddAttributeOmp (stmt);
-                if ((st->variant () == FOR_NODE) && (stmt->variant () == ASSIGN_STAT)) {
-                   SgExpression *expr = stmt->expr (1);
-                   if (expr->variant () == FUNC_CALL) {
-                      if (!strcmp(expr->symbol()->identifier(),"min")) {
-                         SgExprListExp *exp = isSgExprListExp(expr->lhs ());
-                         if (exp) {
-                              exp = isSgExprListExp(exp->rhs ());
-                              if (exp) {                             
-                                 SgForStmt *forst = isSgForStmt (st);
-                                 if (forst) {
-					 //TO DO
-					  if ((forst->step () != NULL)&&(forst->step ()->isInteger ())) {
-				            if (forst->step ()->valueInteger ()>0)
-						 exp->setValue (*forst->end () - *forst->start());
-					    else
-						 exp->setValue (*forst->start () - *forst->end());
-					 } else if (forst->step () == NULL) {
-    						 exp->setValue (*forst->end () - *forst->start());	 
-					 } else {
-    					    SgFunctionCallExp *func = new SgFunctionCallExp(*new SgVariableSymb("abs"));
-					    func->addArg(*forst->end () - *forst->start());
-					    exp->setValue (*func);										 
-					 }
-                                 }
-                              }
-                         }                          
-                      }
-                   }                 
-                }
-		st->insertStmtBefore (*stmt);
-	}
-	length=st->numberOfAttributes(OMP_STMT_AFTER);
-	for (i=length; i>0; i--) {
-		SgAttribute *sa=st->getAttribute(i-1,OMP_STMT_AFTER);
-		stmt = ((SgStatement *)sa->getAttributeData());
-		AddAttributeOmp (stmt);
-		last->insertStmtAfter (*stmt);
-		res++;
-	}
-	return res;
-}
-
-SgStatement * GetLexNextIgnoreOMP(SgStatement *st) { 
-	SgStatement *ret=st->lexNext ();
-    if (ret && isOmpDir (ret)) {
-		return GetLexNextIgnoreOMP (ret);
-	}
-	return ret;
-}
-
-int isOmpGetNumThreads(SgExpression *e)
-{
-  int replace = 0;
-  if (e == NULL) return 0;
-  if ((e->variant()==FUNC_CALL) && !strcmp(e->symbol()->identifier(),"omp_get_num_threads")) {
-       NODE_CODE(e->thellnd)=INT_VAL;
-       NODE_TYPE(e->thellnd) =  GetAtomicType(T_INT);
-       NODE_INT_CST_LOW (e->thellnd) = 1;
-       replace = 1;
-  }
-  if((e->variant()==ADD_OP) || (e->variant()==SUBT_OP)){
-        replace = isOmpGetNumThreads (e->rhs());
-	if (!replace) replace = isOmpGetNumThreads (e->lhs());
-   }
-  return replace;
-}
-
-SgExpression * FindSubExpression (SgExpression *expr1,SgExpression *expr2) {
-   SgExpression * res= NULL;
-   if ((expr1 == NULL) || (expr2 == NULL)) return res;
-   if ((expr1->variant () == expr2->variant ()) &&
-       (expr1->lhs () != NULL) &&
-       (expr2->lhs () != NULL) &&
-       (expr1->rhs () != NULL) &&
-       (expr2->rhs () != NULL) &&
-       isSgVarRefExp(expr1->lhs ()) &&
-       isSgVarRefExp(expr1->rhs ()) &&
-       isSgVarRefExp(expr2->lhs ()) &&
-       isSgVarRefExp(expr2->rhs ())) {
-          SgSymbol *expr1_sym1=expr1->lhs ()->symbol ();
-          SgSymbol *expr1_sym2=expr1->rhs ()->symbol ();
-          SgSymbol *expr2_sym1=expr2->lhs ()->symbol ();
-          SgSymbol *expr2_sym2=expr2->rhs ()->symbol ();
-          if (!strcmp (expr1_sym1->identifier(),expr2_sym1->identifier()) && !strcmp (expr1_sym2->identifier(),expr2_sym2->identifier())) return expr1;
-   }
-   res = FindSubExpression(expr1->lhs (), expr2);
-   if (res == NULL) return FindSubExpression(expr1->rhs (), expr2);
-   return res;
-}
-
-SgSymbol *ChangeParallelDir (SgStatement *stmt) {
-   SgExprListExp *exp=isSgExprListExp (stmt->expr(1));
-   int i=0;
-   if (exp == NULL) return NULL;   
-   for (SgExpression *expr=exp->elem(i); i<exp->length(); i++) {
-       if (expr->variant () == ACROSS_OP) {
-           SgStatement *st;
-           SgStatement *loop=GetLexNextIgnoreOMP (stmt);
-           for(st=loop; st && (st != loop->lastNodeOfStmt ()); st=st->lexNext ()) {
-               if (st->variant () == ASSIGN_STAT) {
-                   if (st->lexNext ()->variant () == FOR_NODE) {
-                       SgStatement *forst = st->lexNext ();
-                       int length=forst->numberOfAttributes(OMP_STMT_BEFORE);
-                       int find=0;
-                       for (int i=0; i<length; i++) {
-                           SgAttribute *sa=forst->getAttribute(i,OMP_STMT_BEFORE);
-                           if (((SgStatement *)sa->getAttributeData())->variant () == OMP_DO_DIR) {
-                                find=1; break;
-                           }
-                       }
-                       if (find == 0) return NULL;
-                       SgSymbol *j=st->expr(0)->symbol();
-                       SgSymbol *newj=st->expr(1)->lhs()->symbol();
-                       SgExpression *newj_iam=st->expr(1);
-                       SgExpression *res = FindSubExpression (stmt->expr(0),newj_iam);
-                       if (res != NULL) {                           
-                           NODE_CODE(res->thellnd) = VAR_REF;
-                           res->setSymbol (*j);
-                           delete res->lhs();
-                           delete res->rhs();
-                           res->setLhs (NULL);
-                           res->setRhs (NULL);                           
-                       }
-                       stmt->replaceSymbBySymb(*newj,*j);
-                       loop->setSymbol (*j);
-                       if (HideOmpStmt (st)) st->extractStmt ();
-                       return newj;
-                   }	           
-               }
-               if (isSgForStmt (st)) loop = st;
-           }
-        }        
-   }
-   return NULL; 
-}
-
-void ChangeAccrossOpenMPParam (SgStatement *stmt, SgSymbol *newj, int ub) {
-   SgStatement *st=stmt;
-   SgStatement *loop=NULL;
-   SgValueExp c1(1);
-   if (ub == 0) return;
-   int find=0;
-   for(; st && st->lexNext () && (st != stmt->lastNodeOfStmt ()); st=st->lexNext ()) {
-       if (st->variant ()== FOR_NODE) loop = st;
-       SgStatement * forst=st->lexNext ();
-       int length=forst->numberOfAttributes(OMP_STMT_BEFORE);
-       find=0;
-       for (int i=0; i<length; i++) {
-           SgAttribute *sa=forst->getAttribute(i,OMP_STMT_BEFORE);
-           if (((SgStatement *)sa->getAttributeData())->variant () == OMP_DO_DIR) {
-               find=1; break;
-           }               
-       }       
-       if (find == 1) break;
-   }
-   if ((find==1) && loop && (newj != NULL))  {
-       SgForStmt *accr_do = isSgForStmt(loop);
-       for (;st && (st->lexNext() != NULL) && (st != loop->lastNodeOfStmt ()); st=st->lexNext ())
-       if ((st->lexNext()!= NULL) && (st->lexNext()->lexNext() != NULL)) {
-            SgExpression *expr = new SgVarRefExp (loop->symbol ());
-            SgStatement *stIfStmt = st->lexNext()->lexNext();
-            if (IsPositiveDoStep(accr_do->step())) {
-                *expr = expr->copy() < accr_do->start()->copy() || expr->copy() > accr_do->end()->copy ();
-            } else {
-                *expr = expr->copy() < accr_do->end()->copy() || expr->copy() > accr_do->start()->copy ();
-            }                 
-            if (stIfStmt->lexNext()->variant () == CYCLE_STMT) {
-                SgIfStmt *ifst = isSgIfStmt (stIfStmt);
-                if (ifst != NULL) {
-                    ifst->setExpression (0, *expr);
-                } else {
-                    SgLogIfStmt *logifst = isSgLogIfStmt (stIfStmt);
-                    if (logifst != NULL) {
-                        logifst->setExpression (0, *expr);
-                    }
-                } 
-            }
-       }
-       if (ub == 1) {
-           SgExpression *ind = accr_do->end ();
-           *ind = *ind + *new SgFunctionCallExp(*new SgVariableSymb("OMP_GET_NUM_THREADS")) - c1.copy ();
-           accr_do->setEnd(*ind);  
-       } else if (ub == 2) {
-           SgExpression *ind = accr_do->start ();
-           *ind = *ind + *new SgFunctionCallExp(*new SgVariableSymb("OMP_GET_NUM_THREADS")) - c1.copy ();
-           accr_do->setStart(*ind);  
-       }
-       loop->setSymbol (*newj);
-   }
-}
-
-void ChangeParallelLoopHideOpenmp(SgStatement *stmt)
-{
-  int nloop=0;
-  SgStatement *prev=NULL;
-  SgStatement *st;
-  stmt_list *stmt_to_delete = NULL;
-  for(SgExpression *dovar=stmt->expr(2); dovar; dovar=dovar->rhs()) nloop++;
-  SgStatement *next=stmt->lexNext ();
-  SgStatement *forst, *last;
-  prev=stmt->lexPrev ();
-  if ((next->variant () == OMP_PARALLEL_DO_DIR) ||
-       (next->variant () == OMP_DO_DIR)) {
-       forst = next->lexNext ();
-       if (forst->variant () == FOR_NODE) {
-            forst->addAttribute(OMP_STMT_BEFORE, (void*) next->copyPtr (), sizeof(SgStatement *));
-            stmt_to_delete = addToStmtList(stmt_to_delete, next);
-            last=forst->lastNodeOfStmt ()->lexNext ();
-            if ((last->variant () == OMP_END_PARALLEL_DO_DIR) ||
-               (last->variant () == OMP_END_DO_DIR)) {
-                   forst->addAttribute(OMP_STMT_AFTER, (void*) last->copyPtr (), sizeof(SgStatement *));
-                   stmt_to_delete = addToStmtList(stmt_to_delete, last);
-	    }
-        }
-   } else {
-        if ((prev->variant () == OMP_PARALLEL_DO_DIR) ||
-            (prev->variant () == OMP_DO_DIR)) {
-               forst = next;
-               if (forst->variant () == FOR_NODE) {
-                   forst->addAttribute(OMP_STMT_BEFORE, (void*) prev->copyPtr (), sizeof(SgStatement *));
-                   stmt_to_delete = addToStmtList(stmt_to_delete, prev);
-               }
-               last=forst->lastNodeOfStmt ()->lexNext ();
-               if ((last->variant () == OMP_END_PARALLEL_DO_DIR) ||
-                 (last->variant () == OMP_END_DO_DIR)) {
-                  forst->addAttribute(OMP_STMT_AFTER, (void*) last->copyPtr (), sizeof(SgStatement *));
-                  stmt_to_delete = addToStmtList(stmt_to_delete, last);
-	       }      
-        } else {
-          if (next->variant () == FOR_NODE) {
-             for(st=next, prev=st; st && (nloop>0); st=st->lexNext ()) {
-                if (st->variant () == FOR_NODE) {
-	           if ((prev != st) && (prev->lexNext () != st)) {
-                      for(SgStatement *s=prev->lexNext (); s && (s!= st); s=s->lexNext ()) {
-                         st->addAttribute(OMP_STMT_BEFORE, (void*) s->copyPtr (), sizeof(SgStatement *));
-                         stmt_to_delete = addToStmtList(stmt_to_delete, s);
-                         s=s->lastNodeOfStmt ();
-                      }
-                      SgStatement *last=prev->lastNodeOfStmt();
-                      for(SgStatement *s=st->lastNodeOfStmt()->lexNext (); s && (s!= last); s=s->lexNext ()) {
-                         st->addAttribute(OMP_STMT_AFTER, (void*) s->copyPtr (), sizeof(SgStatement *));
-                         stmt_to_delete = addToStmtList(stmt_to_delete, s);
-                         s=s->lastNodeOfStmt ();
-                      }
-                   }
-                   prev = st;
-                   nloop--;
-                }
-             }
-          }
-      }
-  }
-  for(;stmt_to_delete; stmt_to_delete= stmt_to_delete->next) Extract_Stmt(stmt_to_delete->st);// extracting  OpenMP Directives
-}
-
-void MarkAndReplaceOriginalStmt (SgStatement *func) {
-  SgStatement *stmt = NULL;
-  SgStatement *first = func->lexNext();
-  SgStatement *last = func->lastNodeOfStmt();
-  SgStatement *next = NULL;
-  int res=0;
-  for (stmt = first; stmt && (stmt != last);stmt=stmt->lexNext ()) {
-      if (stmt->hasLabel ()&& (stmt->variant() != FORMAT_STAT)&& (stmt->variant() != CONT_STAT)) {
-            SgStatement *tmp = new SgStatement (CONT_STAT);
-            tmp->setLabel (*stmt->label ());
-            tmp->setlineNumber (stmt->lineNumber());
-            tmp->addAttribute(OMP_MARK);
-            stmt->insertStmtBefore(*tmp, *stmt->controlParent());
-            BIF_LABEL(stmt->thebif)=NULL;
-      }
-      stmt->addAttribute(OMP_MARK);
-      if (stmt->variant () == DVM_PARALLEL_ON_DIR) ChangeParallelLoopHideOpenmp(stmt);
-      continue;      
-      switch (stmt->variant ()) {
-          case OMP_PARALLEL_DO_DIR:
-          case OMP_DO_DIR:
-          case OMP_END_PARALLEL_DO_DIR:
-          case OMP_END_DO_DIR: res=HideOmpStmt (stmt); break;
-          case LOGIF_NODE: LogIf_to_IfThen(stmt); break;
-      }
-      if (res == 0) {
-          stmt = stmt->lexNext();
-      } else {
-          res = 0;
-          next = stmt->lexNext();
-          stmt->extractStmt ();
-          stmt = next;
-      }
-  }
-}
-stmt_list * PushToStmtList(stmt_list *pstmt, SgStatement *stat) {
-   stmt_list *stl; 
-   if (!pstmt) {
-              pstmt = new stmt_list;
-              pstmt->st = stat;
-              pstmt->next =  NULL;
-   } else {
-	      stl = new stmt_list;
-              stl->st = stat;
-              stl->next = pstmt;
-              pstmt = stl;
-   }
-   return (pstmt);
-}
-
-int ValFromStmtList(stmt_list *pstmt) {
-	if (pstmt) {
-		return pstmt->st->variant ();     
-	}
-	return 0;
-}
-
-stmt_list * PopFromStmtList(stmt_list *pstmt) {
-    if (pstmt) {
-        stmt_list *tmp = pstmt;
-        pstmt = pstmt->next;
-        tmp->next = NULL;
-        delete tmp;        
-        return (pstmt);
-    }
-    return NULL;
-}
-
-int isFromOneThread (int variant) {
-    switch (variant) {
-        case OMP_ONETHREAD_DIR:
-		case OMP_DO_DIR:
-		case OMP_SECTIONS_DIR:
-		case OMP_SINGLE_DIR:
-		case OMP_WORKSHARE_DIR:
-		case OMP_PARALLEL_DO_DIR:
-		case OMP_PARALLEL_SECTIONS_DIR:
-		case OMP_PARALLEL_WORKSHARE_DIR:
-		case OMP_MASTER_DIR:
-		case OMP_CRITICAL_DIR:
-        case PROG_HEDR:
-		case OMP_ORDERED_DIR: {
-            return 1; break;
-        }
-        case PROC_HEDR:
-        case FUNC_HEDR:
-        case OMP_PARALLEL_DIR: {
-            return 0; break;
-        }
-        default: {
-            return -1;
-            break;
-        }
-    }
-    return -1;
-}
-
-SgStatement * InsertBeginSynchroStat (SgStatement *current) { /*OMP*/
-	if (isADeclBif(current->variant ())) return NULL;   
-	return current;
-}
-
-int InsertEndSynchroStat (SgStatement *current) { /*OMP*/
-	if (isADeclBif(current->variant ())) return 0;
-	if (current->variant () != CONTROL_END) {
-       	    current->insertStmtAfter(*new SgStatement (OMP_BARRIER_DIR),*current->controlParent()); /*OMP*/
-            //current->insertStmtAfter(*new SgStatement (OMP_END_MASTER_DIR),*current->controlParent()); /*OMP*/
-        } else {
-	        current->lexNext ()->insertStmtBefore(*new SgStatement (OMP_BARRIER_DIR),*current->lexNext ()->controlParent()); /*OMP*/
-       		//current->lexNext ()->insertStmtBefore(*new SgStatement (OMP_END_MASTER_DIR),*current->lexNext ()->controlParent()); /*OMP*/
-	}
-	return 1;
-}
-
-void InsertSynchroBlock (SgStatement *begin, SgStatement *end) {
-        SgStatement *last=end->lexPrev ();
-	SgStatement *barrier = new SgStatement (OMP_BARRIER_DIR);
-	SgStatement *master = new SgStatement (OMP_MASTER_DIR);
-	barrier->addAttribute (OMP_MARK);
-	master->addAttribute (OMP_MARK);
-        if (begin->lexPrev ()->variant () != OMP_BARRIER_DIR) begin->insertStmtBefore(*barrier,*begin->controlParent());
-	begin->insertStmtBefore(*master,*begin->controlParent());
-	barrier = new SgStatement (OMP_BARRIER_DIR);
-	master = new SgStatement (OMP_END_MASTER_DIR);
-	barrier->addAttribute (OMP_MARK);
-	master->addAttribute (OMP_MARK);
-	if (end->lexNext () != NULL) {
-	    if (end->lexNext ()->variant () != OMP_BARRIER_DIR) last->insertStmtAfter(*barrier,*last->controlParent());
-	} else {
-	    last->insertStmtAfter(*barrier,*last->controlParent());
-	}
-	last->insertStmtAfter(*master,*last->controlParent());
-}
-
-SgStatement * InsertCriticalBlock (SgStatement *begin, SgStatement *end) {
-	SgStatement *critical = new SgStatement (OMP_CRITICAL_DIR);
-	critical->setExpression (0,*new SgVarRefExp(new SgSymbol (VARIABLE_NAME,"dvmcritical")));
-	critical->addAttribute (OMP_MARK);
-	begin->insertStmtBefore(*critical,*begin->controlParent());
-	critical = new SgStatement (OMP_END_CRITICAL_DIR);
-	critical->setExpression (0,*new SgVarRefExp(new SgSymbol (VARIABLE_NAME,"dvmcritical")));
-	critical->addAttribute (OMP_MARK);
-	end->insertStmtBefore(*critical,*end->controlParent());
-	return critical;
-}
-
-void MarkParameters (SgStatement *st) {
-	SgExprListExp *list=isSgExprListExp(st->expr(0));
-	if (list!= NULL) {
-		for (int i=0;i<list->length (); i++) {
-			SgExpression *exp=list->elem (i);
-			if (exp->variant ()== CONST_REF) {
-				exp->symbol ()->addAttribute (OMP_MARK);
-			}
-		}
-	}
-}
-
-void AddOpenMPSynchro (SgStatement *func) {
-  SgStatement *stmt = NULL;
-  SgStatement *first = func->lexNext();
-  SgStatement *last = func->lastNodeOfStmt();
-  stmt_list *omp_list = NULL;
-  omp_list = PushToStmtList (omp_list, func);
-  int FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-  SgStatement * SynchroBlockBegin = NULL;
-  for (stmt = first; stmt && (stmt != last); stmt = stmt->lexNext()) {
-      AddOmpStmt (stmt);
-  }
-  for(stmt = first; stmt && (stmt != last); stmt = stmt->lexNext()) {
-      if (stmt->variant () == OMP_ONETHREAD_DIR) {
-            FromOneThread = 1;
-            omp_list = PushToStmtList (omp_list, stmt);
-            continue;
-      }
-	  if (stmt->variant () == PARAM_DECL) {
-		  MarkParameters (stmt);
-		  continue;
-	  }
-      if (isADeclBif(stmt->variant ())) continue;
-      if (isOmpDir (stmt) || stmt->variant () == CONTROL_END || stmt->variant () == CONT_STAT) {
-          switch (stmt->variant ()) {
-                case OMP_END_PARALLEL_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_PARALLEL_DIR) {
-						AddSharedClauseForDVMVariables (omp_list->st, stmt);
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP PARALLEL directive for this $OMP END PARALLEL directive %s", "", 701, stmt);
-                    }
-                    break;
-                }
-                case OMP_END_DO_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_DO_DIR) {
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP DO directive for this $OMP END DO directive %s", "", 702, stmt);
-                    }
-                    break;
-                }
-				case OMP_END_SECTIONS_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_SECTIONS_DIR) {
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP SECTIONS directive for this $OMP END SECTIONS directive %s", "", 703, stmt);
-                    }
-                    break;
-                }
-                case OMP_END_SINGLE_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_SINGLE_DIR) {
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP SINGLE directive for this $OMP END SINGLE directive %s", "", 704, stmt);
-                    }
-                    break;
-                }
-                case OMP_END_WORKSHARE_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_WORKSHARE_DIR) {
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP WORKSHARE directive for this $OMP END WORKSHARE directive %s", "", 705, stmt);
-                    }
-                    break;
-                }
-                case OMP_END_PARALLEL_DO_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_PARALLEL_DO_DIR) {
-						AddSharedClauseForDVMVariables (omp_list->st, stmt);
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP PARALLEL DO directive for this $OMP END PARALLEL DO directive %s", "", 706, stmt);
-                    }
-                    break;
-                }
-                case OMP_END_PARALLEL_SECTIONS_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_PARALLEL_SECTIONS_DIR) {
-						AddSharedClauseForDVMVariables (omp_list->st, stmt);
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP PARALLEL SECTIONS directive for this $OMP END PARALLEL SECTIONS directive %s", "", 707, stmt);
-                    }
-                    break;
-                }
-                 case OMP_END_PARALLEL_WORKSHARE_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_PARALLEL_WORKSHARE_DIR) {
-						AddSharedClauseForDVMVariables (omp_list->st, stmt);
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP PARALLEL WORKSHARE directive for this $OMP END PARALLEL WORKSHARE directive %s", "", 708, stmt);
-                    }
-                    break;
-                }
-                case OMP_END_MASTER_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_MASTER_DIR) {
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP MASTER directive for this $OMP END MASTER directive %s", "", 709, stmt);
-                    }
-                    break;
-                }
-                case OMP_END_CRITICAL_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_CRITICAL_DIR) {
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP CRITICAL directive for this $OMP END CRITICAL directive %s", "", 710, stmt);
-                    }
-                    break;
-                }
-                case OMP_END_ORDERED_DIR: {
-                    if (ValFromStmtList (omp_list) == OMP_ORDERED_DIR) {
-                        omp_list = PopFromStmtList (omp_list);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                    } else {
-                        Error("Can`t find $OMP ORDERED directive for this $OMP END ORDERED directive %s", "", 711, stmt);
-                    }
-                    break;
-                }
-                case OMP_PARALLEL_DIR:
-                case OMP_DO_DIR: 
-                case OMP_SECTIONS_DIR:
-                case OMP_SINGLE_DIR:
-                case OMP_WORKSHARE_DIR:
-                case OMP_PARALLEL_DO_DIR:
-                case OMP_PARALLEL_SECTIONS_DIR:
-                case OMP_PARALLEL_WORKSHARE_DIR:
-                case OMP_MASTER_DIR:
-                case OMP_CRITICAL_DIR:
-                case OMP_ORDERED_DIR: {
-                        omp_list = PushToStmtList (omp_list, stmt);
-                        FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                        break;
-                }
-                case CONT_STAT:
-                case CONTROL_END: {                    
-                    SgStatement *next =stmt->lexNext ();
-                    if (next && (next->variant () == OMP_END_PARALLEL_DO_DIR || next->variant () == OMP_END_DO_DIR)) break;
-                    SgStatement *cp =stmt->controlParent ();
-                    if (cp && cp->variant () == FOR_NODE) {
-                        SgStatement *prev = cp->lexPrev ();
-                        if (prev) {
-                            if (prev->variant () == OMP_DO_DIR) {
-                                if (ValFromStmtList (omp_list) == OMP_DO_DIR) {
-                                    omp_list = PopFromStmtList (omp_list);
-                                    FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                                }
-                                break;
-                            }
-                            if (prev->variant () == OMP_PARALLEL_DO_DIR) {
-                                if (ValFromStmtList (omp_list) == OMP_PARALLEL_DO_DIR) {
- 						            AddSharedClauseForDVMVariables (omp_list->st, stmt);
-                                    omp_list = PopFromStmtList (omp_list);
-                                    FromOneThread = isFromOneThread (ValFromStmtList (omp_list));
-                                }
-                                break;
-                            }
-                        }
-                    }
-                }
-          }
-      }
-      if (stmt->numberOfAttributes(OMP_CRITICAL) != 0) {
-        SgStatement *tmp=stmt;
-        for (; tmp; tmp = tmp->lexNext ()) {
-            if (tmp->numberOfAttributes(OMP_CRITICAL) == 0) break;
-        }
-        if (SynchroBlockBegin == NULL) stmt = InsertCriticalBlock (stmt, tmp);
-        else stmt = tmp->lexPrev ();
-        continue;
-      }
-      if ((stmt->numberOfAttributes(OMP_MARK) == 0) || (stmt->numberOfAttributes(OMP_CRITICAL) != 0)) {
-         if ((SynchroBlockBegin != NULL) || (FromOneThread == 1)) continue;
-         else {
-            SynchroBlockBegin = stmt;
-         }
-      } else {
-         if (SynchroBlockBegin != NULL) {
-            InsertSynchroBlock (SynchroBlockBegin, stmt);
-            SynchroBlockBegin = NULL;
-         }
-      }
-  }
-  if (SynchroBlockBegin != NULL) InsertSynchroBlock (SynchroBlockBegin, last);
-}
-
-SgExprListExp * FindDVMVariableRefsInExpr (SgExpression *expr, SgExprListExp *list)
-{
-  if (expr==NULL)
-    return list;
-  if (expr->variant() == VAR_REF)
-    {
-		SgSymbol *sym = expr->symbol ();
-		if (sym->numberOfAttributes(OMP_MARK) == 0) {
-			if (list != NULL) {
-				if (!list->IsSymbolInExpression (*sym)) list->append (*expr);
-			} else {					
-				list = new SgExprListExp (*expr);
-			}
-		}
-    }
-  if (expr->variant() == ARRAY_REF)
-    {
-		SgSymbol *sym = expr->symbol ();
-		if (sym->numberOfAttributes(OMP_MARK) == 0) {
-			if (list != NULL) {			
-				if (!list->IsSymbolInExpression (*sym)) list->append (*new SgArrayRefExp(*sym));
-			} else {
-				list = new SgExprListExp (*new SgArrayRefExp(*sym));
-			}
-		}
-    }
-  list = FindDVMVariableRefsInExpr(expr->lhs (),list);
-  list = FindDVMVariableRefsInExpr(expr->rhs (),list);
-  return list;
-}
-
-SgExprListExp * FindDVMVariableRefsInStmt (SgStatement *stmt, SgExprListExp *list)
-{
-  if (stmt==NULL)
-    return list;
-  list = FindDVMVariableRefsInExpr(stmt->expr (0),list);
-  list = FindDVMVariableRefsInExpr(stmt->expr (1),list);
-  list = FindDVMVariableRefsInExpr(stmt->expr (2),list);
-  return list;
-}
-
-SgExprListExp * FindDVMVariableRefsInStmts (SgStatement *first, SgStatement *last)
-{
-  SgExprListExp *list = NULL;
-  for (SgStatement * stmt=first; stmt && (stmt != last); stmt=stmt->lexNext ()) {
-	  list = FindDVMVariableRefsInStmt (stmt, list);
-  }
-  return list;
-}
-
-void AddSharedClauseForDVMVariables (SgStatement *first, SgStatement *last)
-{
-  SgExprListExp *list = FindDVMVariableRefsInStmts (first->lexNext (), last);
-  if (list!=NULL) {
-	  switch (first->variant ()) {
-         case OMP_PARALLEL_DIR:
-         case OMP_PARALLEL_DO_DIR:
-         case OMP_PARALLEL_SECTIONS_DIR:
-         case OMP_PARALLEL_WORKSHARE_DIR:
-			 if (first->expr (0)) {
-				 SgExprListExp *ll = isSgExprListExp (first->expr (0));
-				 if (ll) ll->append (* new SgExpression (OMP_SHARED, list,NULL,NULL,NULL));
-			 } else {
-                 first->setExpression (0, *new SgExprListExp (* new SgExpression (OMP_SHARED, list,NULL,NULL,NULL)));
-			 }
-	  }
-  }
-}
-
-
-void TranslateFileOpenMPDVM(SgFile *f)
-{
-  SgStatement *func,*stat;
-  //int i,numfun;
-  SgStatement *end_of_unit; // last node (END or CONTAINS statement ) of program unit
-  
-
-// grab the first statement in the file.
-  stat = f->firstStatement(); // file header 
-  //numfun = f->numberOfFunctions(); //  number of functions
-// function is program unit accept BLOCKDATA and MODULE (F90),i.e. 
-// PROGRAM, SUBROUTINE, FUNCTION
-  if(debug_fragment || perf_fragment) // is debugging or performance analizing regime specified ?
-    BeginDebugFragment(0,NULL);// begin the fragment with number 0 (involving whole file(program) 
-  //for(i = 0; i < numfun; i++) { 
-  //   func = f -> functions(i);
-
-  for (SgSymbol *sym=f->firstSymbol(); sym; sym=sym->next ()) {
-	  sym->addAttribute (OMP_MARK);
-  }
-  for(stat=stat->lexNext(); stat; stat=end_of_unit->lexNext()) {
-    if(stat->variant() == CONTROL_END) {  //end of procedure or module with CONTAINS statement  
-      end_of_unit = stat;  
-      continue;
-    }
-
-    if( stat->variant() == BLOCK_DATA){//BLOCK_DATA header 
-      TransBlockData(stat,end_of_unit); //changing variant VAR_DECL with VAR_DECL_90
-      continue;
-    }
-    // PROGRAM, SUBROUTINE, FUNCTION header
-    func = stat; 
-    cur_func = func;
-    
-        //scanning the Symbols Table of the function 
-        //     ScanSymbTable(func->symbol(), (f->functions(i+1))->symbol());
-
-     
-    // translating the function
-     if(only_debug)
-        InsertDebugStat(func, end_of_unit);
-     else {
-        MarkAndReplaceOriginalStmt (func);
-        TransFunc (func, end_of_unit);
-        AddOpenMPSynchro (func);
-     }
-  }
-}
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/ompdebug.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/ompdebug.cpp
deleted file mode 100644
index dc7b596..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/ompdebug.cpp
+++ /dev/null
@@ -1,3557 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#undef IN_DVM_
-#include "dvm.h"
-#define  Max(a,b) ((a)>(b)?(a):(b))
-
-#define MaxContextBufferLength 4000
-
-struct ref_list {
-    SgExpression *ref;
-    ref_list *next;
-} *ListOfRefs = NULL;
-
-int isIOStmt (SgStatement *st) {
-    switch(st->variant ()){
-        case WRITE_STAT:
-        case PRINT_STAT:
-        case READ_STAT:
-        case OPEN_STAT:
-        case CLOSE_STAT:
-        case ENDFILE_STAT:
-        case BACKSPACE_STAT:
-        case INQUIRE_STAT:
-        case REWIND_STAT:
-        return 1;
-    }
-    return 0;
-}
-
-void IntoArrayRefList (SgExpression *exp) {
-    if (ListOfRefs == NULL) {
-        ListOfRefs = new ref_list;
-        ListOfRefs->ref = exp;
-        ListOfRefs->next = NULL;
-    } else {
-        ref_list *tmp = new ref_list;
-        tmp->ref = exp;
-        tmp->next = ListOfRefs;
-        ListOfRefs = tmp;
-    }
-}
-
-int InArrayRefList (SgExpression *exp) {
-    if (ListOfRefs == NULL) {
-        return 0;
-    } else {
-        for (ref_list *tmp = ListOfRefs; tmp; tmp = tmp->next) {
-            if (ExpCompare(tmp->ref, exp)) return 1;
-        }
-    }
-    return 0;
-}
-
-void ClearArrayRefList () {
-    if (ListOfRefs == NULL) {
-        return;
-    }
-    for (ref_list *tmp=ListOfRefs; ListOfRefs != NULL; ) {    
-        tmp = ListOfRefs;
-        ListOfRefs = ListOfRefs->next;
-        tmp->ref = NULL;
-        tmp->next = NULL;
-        delete tmp;
-    }
-    ListOfRefs = NULL;    
-}
-
-
-void DBGSearchVarsInFunction (SgStatement *func);
-void RegisterSymbol (SgSymbol *sym);
-void RegistrateVariable (SgSymbol *sym);
-void RegisterArray(SgSymbol *sym);
-void RegisterAllocatableArrays(SgStatement *stat);
-void UnregisterAllocatableArrays(SgStatement *stat);
-void RegisterVar(SgSymbol *sym);
-int GenerateCallGetHandle (char * strContextString);
-void InstrumentOmpParallelDir (SgStatement *st,char * strContextString);
-void InstrumentOmpDoDir (SgStatement *st,char * strContextString);
-void InstrumentSerialDoLoop(SgStatement *st, char *strStaticContext);
-void InstrumentAssignStat(SgStatement *st, char *strStaticContext);
-void InstrumentIfStat (SgStatement *st, char *strStaticContext);
-void InstrumentProcStat(SgStatement *st, char *strStaticContext);
-void InstrumentFuncCall (SgStatement *st, SgExpression *exp);
-void InstrumentFunctionBegin(SgStatement *st, char *strStaticContext, SgStatement *func);
-void InstrumentFunctionEnd(SgStatement *st, SgStatement *func);
-void InstrumentGotoStmt(SgStatement *st);
-void InstrumentExitFromLoops (SgStatement *st);
-void InstrumentOmpSingleDir (SgStatement *st, char *strStaticContext);
-void InstrumentOmpCriticalDir (SgStatement *st, char *strStaticContext);
-void InstrumentOmpOrderelDir (SgStatement *st, char *strStaticContext);
-void InstrumentOmpMasterDir (SgStatement *st, char *strStaticContext);
-void InstrumentOmpBarrierDir (SgStatement *st, char *strStaticContext);
-void InstrumentOmpFlushDir (SgStatement *st, char *strStaticContext);
-void InstrumentOmpThreadPrivateDir (SgStatement *st, char *strStaticContext);
-void InstrumentOmpThreadPrivateDir (SgStatement *st, SgStatement *before, char *strStaticContext);
-void InstrumentOmpSectionsDir (SgStatement *st, char *strStaticContext);
-void InstrumentOmpSectionDir (SgStatement *st, char *strStaticContext);
-void InstrumentOmpWorkshareDir (SgStatement *st, char *strStaticContext);
-void InstrumentExitStmt (SgStatement *stat);
-SgStatement *GetLastStatementOfLoop (SgStatement *forst);
-void InstrumentReadVar (SgStatement *st, SgExpression *exp, SgArrayRefExp *var);
-void InstrumentReadArray (SgStatement *st, SgExpression *exp, SgArrayRefExp *var);
-void InstrumentIntervalDir (SgStatement *bst, SgStatement *st, char *strStaticContext);
-void InstrumentIOStmt (SgStatement *st, char *strStaticContext);
-void MarkFormalParameters (SgStatement *st);
-void DeclareExternalProcedures (SgStatement *debug);
-void UpdateIncludeVarsFile(SgStatement *st, const char *input_file);
-void UpdateIncludeInitFile(SgStatement *st, const char *input_file);
-SgExpression *GetOmpAddresMem (SgExpression *exp);
-void FindExternalProcedures (SgStatement *debug);
-void GenerateNowaitPlusBarrier (SgStatement *st);
-void GenerateFileAndLine (SgStatement *st, char *strStaticContext);
-SgStatement *GetFirstExecutableStatement (SgStatement *func);
-SgStatement *GetFirstExecutableNotDebugStatement (SgStatement *func);
-
-int nArrStaticHandleCount = 0; //StaticContextStringsCount
-int nArrHandleCount = 0; //Dynamic
-int nMaxArrHandleCount = 0;
-SgVarRefExp *varThreadID = NULL;
-SgSymbol *symStatMP = NULL;
-SgSymbol *symDynMP = NULL;
-SgStatement *stLastDebug = NULL;
-SgValueExp *C4,*C3,*C2,*C1,*C0, *M1;
-SgVarRefExp *atomic_varref = NULL;
-
-SgSymbol *sym_dbg_init=NULL;
-SgSymbol *sym_dbg_finalize=NULL;
-SgSymbol *symDbgInitHandles=NULL;
-SgSymbol *sym_dbg_get_handle=NULL;
-SgSymbol *sym_dbg_regarr=NULL;
-SgSymbol *sym_dbg_unregarr=NULL;
-SgSymbol *sym_dbg_regvar=NULL;
-SgSymbol *sym_dbg_before_parallel=NULL;
-SgSymbol *sym_dbg_after_parallel=NULL;
-SgSymbol *sym_dbg_parallel_event=NULL;
-SgSymbol *sym_dbg_parallel_event_end=NULL;
-
-SgSymbol *sym_dbg_before_omp_loop=NULL;
-SgSymbol *sym_dbg_after_omp_loop=NULL;
-SgSymbol *sym_dbg_omp_loop_event=NULL;
-
-SgSymbol *sym_dbg_before_loop=NULL;
-SgSymbol *sym_dbg_after_loop=NULL;
-SgSymbol *sym_dbg_loop_event=NULL;
-
-SgSymbol *sym_dbg_write_var_begin=NULL;
-SgSymbol *sym_dbg_write_arr_begin=NULL;
-SgSymbol *sym_dbg_write_var_end=NULL;
-SgSymbol *sym_dbg_write_arr_end=NULL;
-SgSymbol *sym_dbg_read_var=NULL;
-SgSymbol *sym_dbg_read_arr=NULL;
-
-SgSymbol *sym_dbg_regcommon=NULL;
-SgSymbol *sym_dbg_regpararr=NULL;
-SgSymbol *sym_dbg_regparvar=NULL;
-SgSymbol *sym_dbg_get_addr=NULL;
-
-SgSymbol *sym_dbg_before_sections=NULL;
-SgSymbol *sym_dbg_after_sections=NULL;
-SgSymbol *sym_dbg_section_event=NULL;
-SgSymbol *sym_dbg_section_event_end=NULL;
-SgSymbol *sym_dbg_before_single=NULL;
-SgSymbol *sym_dbg_single_event=NULL;
-SgSymbol *sym_dbg_single_event_end=NULL;
-SgSymbol *sym_dbg_after_single=NULL;
-SgSymbol *sym_dbg_before_workshare=NULL;
-SgSymbol *sym_dbg_after_workshare=NULL;
-SgSymbol *sym_dbg_master_begin=NULL;
-SgSymbol *sym_dbg_master_end=NULL;
-SgSymbol *sym_dbg_before_critical=NULL;
-SgSymbol *sym_dbg_critical_event=NULL;
-SgSymbol *sym_dbg_critical_event_end=NULL;
-SgSymbol *sym_dbg_after_critical=NULL;
-SgSymbol *sym_dbg_before_barrier=NULL;
-SgSymbol *sym_dbg_after_barrier=NULL;
-SgSymbol *sym_dbg_before_flush=NULL;
-SgSymbol *sym_dbg_flush_event=NULL;
-SgSymbol *sym_dbg_before_ordered=NULL;
-SgSymbol *sym_dbg_ordered_event=NULL;
-SgSymbol *sym_dbg_after_ordered=NULL;
-SgSymbol *sym_dbg_threadprivate=NULL;
-SgSymbol *sym_dbg_before_funcall=NULL;
-SgSymbol *sym_dbg_funcparvar=NULL;
-SgSymbol *sym_dbg_funcpararr=NULL;
-SgSymbol *sym_dbg_after_funcall=NULL;
-SgSymbol *sym_dbg_funcbegin=NULL;
-SgSymbol *sym_dbg_funcend=NULL;
-SgSymbol *sym_dbg_if_loop_event=NULL;
-SgSymbol *sym_dbg_omp_if_loop_event=NULL;
-SgFunctionSymb *FuncLeftBound = NULL;
-SgFunctionSymb *FuncRightBound = NULL;
-SgSymbol *sym_dbg_interval_begin=NULL;
-SgSymbol *sym_dbg_interval_end=NULL;
-SgSymbol *sym_dbg_before_io=NULL;
-SgSymbol *sym_dbg_after_io=NULL;
-
-int isMainProgram = 0;
-void ConvertLoopWithLabelToEnddoLoop (SgStatement *stat) {
-	SgForStmt *forst = isSgForStmt (stat);       
-	if (forst != NULL) {
-		if (forst->isEnddoLoop()) return;
-		if (!forst->convertLoop()) {    
-			SgStatement *last_st,*lst;
-			last_st= LastStatementOfDoNest(forst);
-			if(last_st != (lst=forst->lastNodeOfStmt()) || last_st->variant()==LOGIF_NODE) {
-				last_st=ReplaceLabelOfDoStmt(forst,last_st, GetLabel());
-				ReplaceDoNestLabel_Above(last_st,forst,GetLabel());
-				forst->convertLoop();
-			}
-		}
-	}
-}
-
-void ComputedGoTo_to_IfGoto (SgStatement *stmt)
-{//GO TO (lab1,lab2,..,labk), <int_expr>
-// is replaced by
-//       [  iv = int_expr     ]
-//          IF ( iv.EQ.1) THEN
-//            GO TO lab1 
-//          ENDIF 
-//          IF ( iv.EQ.2) THEN
-//            GO TO lab2 
-//          ENDIF 
-//           . . .
-//          IF ( iv.EQ.k) THEN
-//            GO TO labk 
-//          ENDIF
-  SgStatement *ass, *ifst;
-  SgLabel *lab_st, *labgo;
-  SgGotoStmt *gost;
-  SgExpression  *cond, *el;
-  SgSymbol *sv;
-  int lnum,i;
-  lnum = stmt->lineNumber();
-  lab_st = stmt->label();
-  if(isSgVarRefExp(stmt->expr(1)))
-  {  sv = stmt->expr(1)->symbol();
-     ass = NULL;
-  }
-  else
-  {  sv = DebugGoToSymbol(stmt->expr(1)->type());
-     ass = new SgAssignStmt (*new SgVarRefExp(sv),*stmt->expr(1));
-     stmt->insertStmtBefore(*ass,*stmt->controlParent());//inserting before stmt
-     if(lab_st)
-       ass-> setLabel(*lab_st);
-     BIF_LINE(ass->thebif) = lnum;
-  }
-  for(el=stmt->expr(0),i=1; el; el=el->rhs(),i++)
-  {
-    labgo = ((SgLabelRefExp *) (el->lhs()))->label();
-    gost = new SgGotoStmt(*labgo);
-    BIF_LINE(gost->thebif) = lnum;
-    cond = &SgEqOp(*new SgVarRefExp(sv), *new SgValueExp(i));
-    ifst = new SgIfStmt( *cond, *gost);
-    stmt->insertStmtBefore(*ifst,*stmt->controlParent());//inserting before stmt 
-
-    if(i==1 && lab_st && !ass ) 
-      ifst-> setLabel(*lab_st);
-  }
-  Extract_Stmt(stmt);
-}
-
-void ArithIF_to_IfGoto(SgStatement *stmt)
-{//IF (expr) lab1,lab2,lab3
-// is replaced by
-//       [  iv = expr        ]
-//          IF ( v.LT.0) THEN
-//            GO TO lab1 
-//          ENDIF 
-//          IF ( v.EQ.0) THEN
-//            GO TO lab2 
-//          ENDIF 
-//          //IF ( v.GT.0) THEN
-//            GO TO lab3
-//          //ENDIF
-  SgStatement *ass, *ifst;
-  SgLabel *lab_st, *labgo;
-  SgGotoStmt *gost;
-  SgExpression *cond;
-  SgSymbol *sv;
-  int lnum;
-
-  lnum = stmt->lineNumber();
-  lab_st = stmt->label(); 
-  if(isSgVarRefExp(stmt->expr(0)))
-  {  sv = stmt->expr(0)->symbol();
-     ass = NULL;
-  }
-  else
-  {  sv = DebugGoToSymbol(stmt->expr(0)->type());
-     ass = new SgAssignStmt (*new SgVarRefExp(sv),*stmt->expr(0));
-     stmt->insertStmtBefore(*ass,*stmt->controlParent());//inserting before stmt
-     if(lab_st)
-       ass-> setLabel(*lab_st);
-  }
-  labgo = ((SgLabelRefExp *) (stmt->expr(1)->lhs()))->label();
-  gost = new SgGotoStmt(*labgo);
-  BIF_LINE(gost->thebif) = lnum;
-  cond = &operator < (*new SgVarRefExp(sv), *new SgValueExp(0));
-  ifst = new SgIfStmt( *cond, *gost);
-  stmt->insertStmtBefore(*ifst,*stmt->controlParent());//inserting before stmt
-  if(lab_st && !ass) 
-     ifst-> setLabel(*lab_st);
-
-  labgo = ((SgLabelRefExp *) (stmt->expr(1)->rhs()->lhs()))->label();
-  gost = new SgGotoStmt(*labgo);
-  BIF_LINE(gost->thebif) = lnum;
-  cond = &SgEqOp(*new SgVarRefExp(sv), *new SgValueExp(0));
-  ifst = new SgIfStmt(*cond, *gost);
-  stmt->insertStmtBefore(*ifst,*stmt->controlParent());//inserting before stmt
-  labgo = ((SgLabelRefExp *) (stmt->expr(1)->rhs()->rhs()->lhs()) )->label();
-  gost = new SgGotoStmt(*labgo);
-  BIF_LINE(gost->thebif) = lnum;
-  stmt->insertStmtBefore(*gost,*stmt->controlParent());//inserting before stmt
-  Extract_Stmt(stmt);
-}
-
-
-void SearchVarAndArrayInExpression(SgStatement *st, SgExpression *exp);
-void RegisterCommonBlock (SgStatement *st, SgStatement *func) {    
-    char *strStaticContext = new char [MaxContextBufferLength];
-    SgExpression *exp = st->expr(0);
-    for (SgExpression *ex=exp; ex; ex=ex->rhs()) {
-        SgExpression *e=ex->lhs ();
-        if (e != NULL) {
-            SgSymbol *sym=ex->symbol();
-            if (strcmp (sym->identifier(),"dbg_stat")&&
-                strcmp (sym->identifier(),"dbg_dyn")&&
-                strcmp (sym->identifier(),"dbg_thread")) {
-			SgCallStmt *fe;
-			SgStatement *stFirst = GetFirstExecutableNotDebugStatement(func);
-			if (stFirst == NULL) continue;
-			if (sym_dbg_regcommon == NULL) sym_dbg_regcommon = new SgSymbol (PROCEDURE_NAME, "dbg_regcommon");
-			fe = new SgCallStmt(*sym_dbg_regcommon);
-			SgArrayRefExp **arrStaticRef = new (SgArrayRefExp *);
-			*arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-			fe->addArg(**arrStaticRef);
-			fe->addArg(*varThreadID);
-			fe->addAttribute(DEBUG_STAT);
-			stFirst->insertStmtBefore(*fe, *stFirst->controlParent());
-			sprintf (strStaticContext, "*type=common_name*file=%s*line1=%d*name1=%s*name2=%s",st->fileName(),st->lineNumber(),sym->identifier(),UnparseExpr (e));
-			GenerateCallGetHandle (strStaticContext);
-            }
-        }
-    }
-    delete strStaticContext;
-}
-void MarkSymbolsInDecl (SgStatement *st) {
-	for (SgExpression *ex=st->expr(2); ex; ex=ex->rhs()) {
-		if (ex != NULL) {
-			SgExprListExp *list = isSgExprListExp (ex);
-			if (list !=NULL){        
-				for (int i=0; i<list->length (); i++) {
-					SgExpression *exp = list->elem(i);
-					if (exp->variant()== SAVE_OP){
-						for (SgExpression *expr=st->expr(0); expr; expr=expr->rhs()) {
-							SgExprListExp *varlist = isSgExprListExp (expr);
-							if (varlist !=NULL){        
-								for (int j=0; j<varlist->length (); j++) {
-									SgExpression *varexp = varlist->elem(j);
-									switch (varexp->variant ()){
-										case ARRAY_REF: 
-										case VAR_REF: varexp->symbol()->addAttribute(SAVE_VAR);
-										break;
-									}
-									
-								}
-							}
-						}
-						break;
-					}
-				}
-			}
-		}
-	}
-}
-
-void MarkSymbolsInCommon (SgStatement *st) {
-    for (SgExpression *ex=st->expr(0); ex; ex=ex->rhs()) {
-        SgExpression *e=ex->lhs ();
-        if (e != NULL) {
-            SgExprListExp *list = isSgExprListExp (e);
-            if (list !=NULL){        
-                for (int i=0; i<list->length (); i++) {
-                    SgExpression *exp = list->elem(i);
-                    switch (exp->variant ()){
-                        case ARRAY_REF: 
-                        case VAR_REF: exp->symbol()->addAttribute(COMMON_VAR);
-                        break;
-                    }
-                }
-            }
-        }
-    }
-}
-
-void MarkFormalParameters (SgStatement *st) {
-    SgFunctionSymb *func = isSgFunctionSymb (st->symbol ());        
-    if (func != NULL) {
-        for (int i=0; i<func->numberOfParameters(); i++) {
-            SgSymbol *sym=func->parameter(i);
-            int *pos = new int;
-            *pos = i+1;
-            switch (sym->variant ()){
-                case VARIABLE_NAME: sym->addAttribute(FORMAL_PARAM,(void*) pos, sizeof(int));                     
-                    break;
-            }
-        }            
-    }
-}
-void MarkSymbolsInSave (SgStatement *st) {
-    SgExprListExp *list = isSgExprListExp (st->expr(0));
-    if (list !=NULL){        
-        for (int i=0; i<list->length (); i++) {
-            SgExpression *exp = list->elem(i);
-            switch (exp->variant ()){
-                case ARRAY_REF: 
-                case VAR_REF: exp->symbol()->addAttribute(SAVE_VAR); 
-                    break;
-            }
-        }            
-    }
-}
-
-int GenerateCallGetHandle (char * strContextString) {
-    if (stLastDebug != NULL) {
-        if (sym_dbg_get_handle == NULL) {
-            sym_dbg_get_handle = new SgSymbol(PROCEDURE_NAME, "dbg_get_handle");
-        }
-        SgCallStmt *fe = new SgCallStmt(*sym_dbg_get_handle);
-        SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-        int nLen = strlen (strContextString);
-        char *strString = new char [MaxContextBufferLength];
-        sprintf (strString,"%d%s**", (nLen+2), strContextString);
-        fe->addArg(*arrStaticRef);
-        fe->addArg(*new SgValueExp(strString));
-        fe->addAttribute(COMMON_VAR);
-        stLastDebug->insertStmtBefore(*fe, *stLastDebug->controlParent());                
-        return ++nArrStaticHandleCount;
-    }
-    return -1;
-}
-
-int GenerateCallGetHandle (char * strContextString, int nArrStaticHandleCount) {
-    if (stLastDebug != NULL) {
-        if (sym_dbg_get_handle == NULL) {
-            sym_dbg_get_handle = new SgSymbol(PROCEDURE_NAME, "dbg_get_handle");
-        }
-        SgCallStmt *fe = new SgCallStmt(*sym_dbg_get_handle);
-        SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-        int nLen = strlen (strContextString);
-        char *strString = new char [MaxContextBufferLength];
-        sprintf (strString,"%d%s**", (nLen+2), strContextString);
-        fe->addArg(*arrStaticRef);
-        fe->addArg(*new SgValueExp(strString));
-        fe->addAttribute(COMMON_VAR);
-        stLastDebug->insertStmtBefore(*fe, *stLastDebug->controlParent());                
-        return nArrStaticHandleCount+1;
-    }
-    return -1;
-}
-
-
-SgStatement *doOmpAssignStmt(SgExpression *re, SgStatement *before) {
-    SgExpression *le;
-    SgValueExp * index;
-    SgStatement *assign;
-    // creating assign statement with right part "re" and inserting it
-    // before first executable statement (after last generated statement)
-    index = new SgValueExp (nArrHandleCount++);
-    le = new SgArrayRefExp(*symDynMP,*index);
-    assign = new SgAssignStmt (*le,*re);
-    assign->addAttribute(DEBUG_STAT);
-    before->insertStmtBefore(*assign,*before->controlParent());
-    nMaxArrHandleCount = Max (nMaxArrHandleCount,nArrHandleCount);
-    return assign;
-}
-
-SgStatement * doOmpAssignTo(SgExpression *le, SgExpression *re, SgStatement *before) {
-  SgStatement *assign = new SgAssignStmt (*le,*re);
-  assign->addAttribute(DEBUG_STAT);
-  before->insertStmtBefore(*assign,*before->controlParent());
-  return assign;
-}
-
-char *ReplaceInExpr(char *val) { // Delete spaces from expression and replace "*" by "\*"
-    int count=0;
-    char *res = NULL;
-    int vallen = strlen(val);
-    for (int i=0; i< vallen; i++) {
-        if (val[i]=='*') count++;
-        if (val[i]==' ') count--;
-    }
-    if (count==0) return val;
-    res = new char [vallen + count + 1];
-    memset(res, 0, vallen + count);
-    for (int i=0,j=0; i< vallen; i++,j++) {
-        if (val[i]!='*') {
-            if (val[i] ==' ') {
-                j--;
-                continue;
-            }
-            res[j]=val[i];
-        } else {
-            res[j++]='\\';
-            res[j]=val[i];
-        }
-    }
-    res[vallen + count]='\0';
-    return res;
-}
-void ConvertElseIFToElse_IF(SgStatement *stat) {
-	stat->setVariant(IF_NODE);
-	addControlEndToStmt(stat->controlParent()->thebif);
-}
-
-char *GenerateContextStringForExpressionList (SgExpression *e){
-    char *result = NULL;
-    int maxlen=0;
-    SgExprListExp *exp = isSgExprListExp (e);
-    if (exp != NULL) {
-        for (int i=0; i<exp->length (); i++) {
-            SgExpression *elem = exp->elem (i);
-            if (elem->variant () == VAR_REF) {
-                maxlen += strlen(elem->symbol()->identifier ()) + 1;
-            } else if (elem->variant () == ARRAY_REF) {
-                maxlen += strlen(UnparseExpr (elem)) + 1;
-            } else if (elem->variant () == OMP_THREADPRIVATE) {
-                maxlen += strlen(elem->lhs ()->symbol()->identifier ()) + 3;
-            } else {
-                fprintf (stderr, "Error: Incorrect member in EXPR_LIST");
-                exit (-1);
-            }
-        }
-        result = new char [maxlen];
-        memset(result, 0, maxlen);
-        for (int i=0; i<exp->length(); i++) {
-            SgExpression *elem = exp->elem (i);
-            if (strlen (result)!=0) {
-                strcat(result,",");
-            } 
-            if (elem->variant () == VAR_REF) {
-                strcat(result,elem->symbol()->identifier ());
-            } else if (elem->variant () == ARRAY_REF) {
-                strcat(result,UnparseExpr (elem));
-            } else if (elem->variant () == OMP_THREADPRIVATE) {
-                strcat(result,"/");
-                strcat(result,elem->lhs ()->symbol()->identifier ());
-                strcat(result,"/");
-            } else {
-                fprintf (stderr, "Error: Incorrect member in EXPR_LIST");
-                exit (-1);
-            }
-        }
-    }
-    if (result == NULL) {
-        result = new char[1];
-        result[0] = '\0';
-    }
-        
-    return result;
-}
-
-void GenerateFileAndLine (SgStatement *st, char *strStaticContext) {
-    sprintf(strStaticContext,"%s*file=%s*line1=%d",strStaticContext,st->fileName(),st->lineNumber());
-}
-
-SgStatement *GetLastDeclarationStatement (SgStatement *func){
-    SgStatement *st = func->lastDeclaration ();
-    for (;st && st->lexNext ();st=st->lexNext ()) {
-        int variant=st->lexNext()->variant ();
-        if (isADeclBif (variant)) continue;
-        else switch (variant) {
-            case COMM_STAT:
-            case SAVE_DECL:
-            case DATA_DECL:
-            case STMTFN_STAT:
-            case ENTRY_STAT:
-            case INTERFACE_STMT:
-            case INTERFACE_ASSIGNMENT:
-            case INTERFACE_OPERATOR:
-            case USE_STMT:
-            case STRUCT_DECL:
-            case FORMAT_STAT:
-            case HPF_TEMPLATE_STAT:
-            case HPF_PROCESSORS_STAT:
-            case DVM_DYNAMIC_DIR:
-            case DVM_SHADOW_DIR:
-            case DVM_TASK_DIR: 
-            case DVM_CONSISTENT_DIR: 
-            case DVM_INDIRECT_GROUP_DIR:
-            case DVM_REMOTE_GROUP_DIR:
-            case DVM_CONSISTENT_GROUP_DIR:
-            case DVM_REDUCTION_GROUP_DIR:
-            case DVM_INHERIT_DIR: 
-            case DVM_ALIGN_DIR:
-            case DVM_DISTRIBUTE_DIR:
-            case DVM_POINTER_DIR:
-            case DVM_HEAP_DIR:
-            case DVM_ASYNCID_DIR:
-            case DVM_VAR_DECL: continue;
-            default: {            
-                return st;
-            }
-        }
-    }
-    return st;
-}
-
-SgStatement *GetFirstExecutableStatement (SgStatement *func){
-    SgStatement *st = func->lastDeclaration ()->lexNext ();
-    for (;st;st=st->lexNext ()) {
-        int variant=st->variant ();
-        if (isADeclBif (variant)) continue;
-        else switch (variant) {
-            case COMM_STAT:
-            case SAVE_DECL:
-            case DATA_DECL:
-            case STMTFN_STAT:
-            case ENTRY_STAT:
-            case INTERFACE_STMT:
-            case INTERFACE_ASSIGNMENT:
-            case INTERFACE_OPERATOR:
-            case USE_STMT:
-            case STRUCT_DECL:
-            case FORMAT_STAT:
-            case HPF_TEMPLATE_STAT:
-            case HPF_PROCESSORS_STAT:
-            case DVM_DYNAMIC_DIR:
-            case DVM_SHADOW_DIR:
-            case DVM_TASK_DIR: 
-            case DVM_CONSISTENT_DIR: 
-            case DVM_INDIRECT_GROUP_DIR:
-            case DVM_REMOTE_GROUP_DIR:
-            case DVM_CONSISTENT_GROUP_DIR:
-            case DVM_REDUCTION_GROUP_DIR:
-            case DVM_INHERIT_DIR: 
-            case DVM_ALIGN_DIR:
-            case DVM_DISTRIBUTE_DIR:
-            case DVM_POINTER_DIR:
-            case DVM_HEAP_DIR:
-            case DVM_ASYNCID_DIR:
-            case DVM_VAR_DECL: continue;
-            default: {
-                return st;
-            }
-        }
-    }
-    return st;
-}
-
-SgStatement *GetFirstExecutableNotDebugStatement (SgStatement *func) {
-    SgStatement *st = func->lastDeclaration ()->lexNext ();
-    for (;st;st=st->lexNext ()) {
-        int variant=st->variant ();
-        if (isADeclBif (variant)) continue;
-        else switch (variant) {
-            case COMM_STAT:
-            case SAVE_DECL:
-            case DATA_DECL:
-            case STMTFN_STAT:
-            case ENTRY_STAT:
-            case INTERFACE_STMT:
-            case INTERFACE_ASSIGNMENT:
-            case INTERFACE_OPERATOR:
-            case USE_STMT:
-            case STRUCT_DECL:
-            case FORMAT_STAT:
-            case HPF_TEMPLATE_STAT:
-            case HPF_PROCESSORS_STAT:
-            case DVM_DYNAMIC_DIR:
-            case DVM_SHADOW_DIR:
-            case DVM_TASK_DIR: 
-            case DVM_CONSISTENT_DIR: 
-            case DVM_INDIRECT_GROUP_DIR:
-            case DVM_REMOTE_GROUP_DIR:
-            case DVM_CONSISTENT_GROUP_DIR:
-            case DVM_REDUCTION_GROUP_DIR:
-            case DVM_INHERIT_DIR: 
-            case DVM_ALIGN_DIR:
-            case DVM_DISTRIBUTE_DIR:
-            case DVM_POINTER_DIR:
-            case DVM_HEAP_DIR:
-            case DVM_ASYNCID_DIR:
-            case DVM_VAR_DECL: continue;
-            default: {
-        	if (st->getAttribute(0,DEBUG_STAT)!=NULL) continue;
-                return st;
-            }
-        }
-    }
-    return st;
-}
-
-
-void GenerateContextStringForClauses (SgExpression *elem, char *strStaticContext) {
-    switch (elem->variant ()) {
-        case OMP_PRIVATE: {
-            strcat(strStaticContext,"*private=");
-            strcat(strStaticContext,GenerateContextStringForExpressionList (elem->lhs ()));
-            break;
-        }
-        case OMP_FIRSTPRIVATE: {
-            strcat(strStaticContext,"*firstprivate=");
-            strcat(strStaticContext,GenerateContextStringForExpressionList (elem->lhs ()));
-            break;
-        }
-        case OMP_LASTPRIVATE: {
-            strcat(strStaticContext,"*lastprivate=");
-            strcat(strStaticContext,GenerateContextStringForExpressionList (elem->lhs ()));
-            break;
-        }
-        case OMP_COPYIN: {
-            strcat(strStaticContext,"*copyin=");
-            strcat(strStaticContext,GenerateContextStringForExpressionList (elem->lhs ()));
-            break;
-        }
-        case OMP_SHARED: {
-            strcat(strStaticContext,"*shared=");
-            strcat(strStaticContext,GenerateContextStringForExpressionList (elem->lhs ()));
-            break;
-        }
-        case OMP_DEFAULT: {                               
-            SgValueExp *val = isSgValueExp (elem->lhs ());
-            if (val != NULL) {
-                strcat(strStaticContext,"*default=");
-                strcat(strStaticContext,NODE_STR(val->thellnd));
-            }
-            break;
-        }
-        case OMP_REDUCTION: {                                
-            SgExprListExp *ex = isSgExprListExp (elem->lhs ());
-            if (ex != NULL) {
-                if (ex->elem(0)->variant() == DDOT) {
-                    strcat(strStaticContext,"*redop=");
-                    strcat(strStaticContext,NODE_STR(ex->elem(0)->lhs()->thellnd));
-                    SgExprListExp *e = isSgExprListExp (ex->elem(0)->rhs());
-                    if (e != NULL) {
-                        strcat(strStaticContext,"*reduction=");
-                        strcat(strStaticContext,GenerateContextStringForExpressionList (e));
-                    }
-                }
-            }
-            break;
-        }
-        case OMP_IF: {
-            char *ifexpr = UnparseExpr (elem->lhs ());
-            if (ifexpr != NULL) {
-                strcat(strStaticContext,"*if=");
-                strcat(strStaticContext,ReplaceInExpr(ifexpr));
-            }
-            break;
-        }
-        case OMP_NUM_THREADS: {
-            char *numthreads = UnparseExpr (elem->lhs ());
-            if (numthreads != NULL) {
-                strcat(strStaticContext,"*num_threads=");
-                strcat(strStaticContext,ReplaceInExpr(numthreads));
-            }
-            break;
-        }
-        case OMP_SCHEDULE: {
-            char *schedule = NULL;
-            if (elem->rhs () != NULL ) schedule = UnparseExpr (elem->rhs ());
-            SgValueExp *val = isSgValueExp (elem->lhs ());
-            if (val != NULL) {
-                strcat(strStaticContext,"*schedule=");
-                strcat(strStaticContext,NODE_STR(val->thellnd));
-            }
-            if (schedule != NULL) {
-                strcat(strStaticContext,"*chunk_size=");
-                strcat(strStaticContext,ReplaceInExpr(schedule));
-            }
-            break;
-        }
-        case OMP_ORDERED: {
-            strcat(strStaticContext,"*ordered=1");
-            break;
-        }
-        case OMP_NOWAIT: {
-            strcat(strStaticContext,"*nowait=1");
-            break;
-        }
-        case OMP_COPYPRIVATE: {
-            strcat(strStaticContext,"*copyprivate=");
-            strcat(strStaticContext,GenerateContextStringForExpressionList (elem->lhs ()));
-            break;
-        }
-    }
-}
-	
-void TempVarOmpDebug(SgStatement * func) {
-    
-    SET_DVM(1);
-    SgValueExp C16(16);
-    SgArrayType *typearray;
-    SgStatement *stFirstExecutableFunc = GetFirstExecutableStatement(func);    
-    typearray = new SgArrayType(*SgTypeInt());
-    typearray = new SgArrayType(*SgTypeFloat());
-    typearray-> addRange(*C2);
-    Rmem = new SgVariableSymb("r0000m", *typearray, *func);
-    stFirstExecutableFunc->insertStmtBefore (*Rmem->makeVarDeclStmt ());
-    typearray = new SgArrayType(*SgTypeDouble());
-    typearray-> addRange(*C2);
-    Dmem = new SgVariableSymb("d0000m", *typearray, *func);
-    stFirstExecutableFunc->insertStmtBefore (*Dmem->makeVarDeclStmt ());
-    typearray = new SgArrayType(*SgTypeInt());
-    typearray-> addRange(C16);
-    Imem = new SgVariableSymb("i0000m", *typearray, *func);
-    stFirstExecutableFunc->insertStmtBefore (*Imem->makeVarDeclStmt ());
-    typearray = new SgArrayType(*SgTypeBool());
-    typearray-> addRange(*C2);
-    Lmem = new SgVariableSymb("l0000m", *typearray, *func);
-    stFirstExecutableFunc->insertStmtBefore (*Lmem->makeVarDeclStmt ());
-    typearray = new SgArrayType(* SgTypeComplex(current_file));
-    typearray-> addRange(*C2);
-    Cmem = new SgVariableSymb("c0000m", *typearray, *func);
-    stFirstExecutableFunc->insertStmtBefore (*Cmem->makeVarDeclStmt ());
-    typearray = new SgArrayType(* SgTypeDoubleComplex(current_file));
-    typearray-> addRange(*C2);
-    DCmem = new SgVariableSymb("dc000m", *typearray, *func);
-    stFirstExecutableFunc->insertStmtBefore (*DCmem->makeVarDeclStmt ());
-    typearray = new SgArrayType(*SgTypeChar());
-    typearray-> addRange(*C2);
-    Chmem = new SgVariableSymb("ch000m", *typearray, *func);
-    stFirstExecutableFunc->insertStmtBefore (*Chmem->makeVarDeclStmt ());
-    return;
-}
-
-void TypeControlOmpDebug(SgStatement *func, SgStatement *before) {
-	int n, k ;    
-	SgCallStmt *call = new SgCallStmt(*new SgFunctionSymb(FUNCTION_NAME, "dbg_type_control", *SgTypeInt(), *func));
-	TempVarOmpDebug(func);
-	nArrHandleCount = 1;
-	n = (bind_ == 1 ) ? 6 : 5;
-	//generating assign statement
-	// and inserting it before first executable statement
-	k = (bind_ == 1 ) ? 1 : 2;
-	call -> addArg(*new SgValueExp(n)); 
-	call -> addArg(*new SgArrayRefExp(*symDynMP,*new SgValueExp(1))); 
-	call -> addArg(*new SgArrayRefExp(*symDynMP,*new SgValueExp(n+1))); 
-	call -> addArg(*new SgArrayRefExp(*Imem,*new SgValueExp(k)));
-	call -> addArg(*new SgArrayRefExp(*Imem,*new SgValueExp(k+10)));
-	if (sym_dbg_init == NULL) sym_dbg_init = new SgSymbol(PROCEDURE_NAME, "dbg_init");
-    SgCallStmt *init = new SgCallStmt(*sym_dbg_init);
-    init->addArg(*varThreadID);
-    init->addAttribute(DEBUG_STAT);
-    before->insertStmtBefore(*init,*before->controlParent());
-    if (sym_dbg_finalize == NULL) sym_dbg_finalize = new SgSymbol(PROCEDURE_NAME, "dbg_finalize");
-    SgCallStmt *finalize = new SgCallStmt(*sym_dbg_finalize);
-    finalize->addAttribute(DEBUG_STAT);
-    func->lastNodeOfStmt ()->insertStmtBefore(*finalize,*func);
-    symDbgInitHandles = new SgSymbol(PROCEDURE_NAME, "dbg_init_handles");
-    init = new SgCallStmt(*symDbgInitHandles);
-    init->addAttribute(DEBUG_STAT);
-    before->insertStmtBefore(*init,*before->controlParent());
-    call->addAttribute(DEBUG_STAT);
-    before->insertStmtBefore(*call,*before->controlParent());
-	if(bind_ == 1)
-		doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*symDynMP,*C1)),call);
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Imem,*C1)),call);	
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Lmem,*C1)),call);	
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Rmem,*C1)),call);	
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Dmem,*C1)),call);
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Chmem,*C1)),call);
-	if(bind_ == 1)
-		doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*symDynMP,*C2)),call);
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Imem,*C2)),call);
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Lmem,*C2)),call);
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Rmem,*C2)),call);
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Dmem,*C2)),call);
-	doOmpAssignStmt(GetOmpAddresMem( new SgArrayRefExp(*Chmem,*C2)),call);
-	if(bind_ == 1)
-		doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(1)),new SgValueExp(DVMTypeLength()),call); 
-	doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(2)),new SgValueExp(TypeSize(SgTypeInt())),call); 
-	doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(3)),new SgValueExp(TypeSize(SgTypeBool())),call); 
-	doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(4)),new SgValueExp(TypeSize(SgTypeFloat())),call); 
-	doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(5)),new SgValueExp(TypeSize(SgTypeDouble())),call); 
-	doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(6)),new SgValueExp(TypeSize(SgTypeChar())),call); 
-	if(bind_ == 1)
-		doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(11)),new SgValueExp(DVMType()),call); 
-    doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(12)),new SgValueExp(VarType_RTS(Imem)),call); 
-    doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(13)),new SgValueExp(VarType_RTS(Lmem)),call); 
-    doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(14)),new SgValueExp(VarType_RTS(Rmem)),call); 
-    doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(15)),new SgValueExp(VarType_RTS(Dmem)),call); 
-    doOmpAssignTo(new SgArrayRefExp(*Imem,*new SgValueExp(16)),new SgValueExp(5),call); 
-	return;
-}
-
-void InstrumentFunctionForOpenMPDebug(SgStatement *func, SgStatement *debug) {
-    SgStatement *stat;
-    SgStatement *stLastFunc = func->lastNodeOfStmt ();
-    SgStatement *stLastSpecFunc = GetLastDeclarationStatement(func);
-    SgStatement *stFirstExecutableFunc = GetFirstExecutableStatement(func);
-    if (func->variant () == PROG_HEDR) {
-        isMainProgram = 1;
-        char *data_str = new char[20];
-        sprintf(data_str,"include 'dbg_vars.h'");
-        SgStatement *st = new SgStatement(DATA_DECL);// creates DATA statement
-        SgExpression *es = new SgExpression(STMT_STR);
-        NODE_STR(es->thellnd) = data_str;
-        st -> setExpression(0,*es); 
-        st->addAttribute(DEBUG_STAT);
-        stLastSpecFunc -> insertStmtAfter(*st);        
-        stLastSpecFunc = st;
-        TypeControlOmpDebug (func, stFirstExecutableFunc);
-    } else {
-     	char *data_str = new char[20];
-    	sprintf(data_str,"include 'dbg_vars.h'"); 
-    	SgStatement *st = new SgStatement(DATA_DECL);// creates DATA statement
-    	SgExpression *es = new SgExpression(STMT_STR);
-    	NODE_STR(es->thellnd) = data_str;
-    	st -> setExpression(0,*es);
-        st->addAttribute(DEBUG_STAT);    
-    	stLastSpecFunc -> insertStmtAfter(*st);
-        stLastSpecFunc = st;
-    }
-    char *strStaticContext = new char [MaxContextBufferLength];
-    for (stat=func; stat && stat != stLastFunc; stat=stat->lexNext ()) {
-        ClearArrayRefList ();
-        if (func->variant () != PROG_HEDR) {
-            if (stat == stLastSpecFunc) {
-                memset(strStaticContext, 0, MaxContextBufferLength);
-                strcat(strStaticContext,"*type=function");         
-                InstrumentFunctionBegin (stat, strStaticContext, func);
-                GenerateCallGetHandle (strStaticContext);
-            }
-        }
-        if (stat->getAttribute(0,DEBUG_STAT)!=NULL) continue;
-		if ((stat->variant () == FORALL_STAT) ||
-			(stat->variant () == OMP_WORKSHARE_DIR)) {
-			stat=stat->lastNodeOfStmt ();
-			continue;
-		}
-        memset(strStaticContext, 0, MaxContextBufferLength);
-        if (stat->hasLabel ()&& (stat->variant() != FORMAT_STAT)&& (stat->variant() != CONT_STAT)) {
-            SgStatement *tmp = new SgStatement (CONT_STAT);
-            tmp->setLabel (*stat->label ());
-            stat->insertStmtBefore(*tmp, *stat->controlParent());
-            BIF_LABEL(stat->thebif)=NULL;
-        }
-        /*if (stat->variant () == ARITHIF_NODE) {		
-            ArithIF_to_IfGoto(stat);		
-            continue;
-        }
-        if (stat->variant () == COMGOTO_NODE) {		
-            ComputedGoTo_to_IfGoto(stat);		
-            continue;
-        }*/
-        if (stat->variant () == COMM_STAT) {
-            if (omp_debug>=D3){
-                RegisterCommonBlock (stat, func);
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_PARALLEL_DIR) {
-            if (omp_debug>=D2){
-                strcat(strStaticContext,"*type=parallel");
-                GenerateFileAndLine (stat, strStaticContext);
-                InstrumentOmpParallelDir (stat, strStaticContext);
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_DO_DIR) {
-            if (omp_debug>=D2){
-                strcat(strStaticContext,"*type=omploop");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpDoDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);            
-            }
-            continue;
-        }
-        if (stat->variant () == DVM_INTERVAL_DIR) {
-            if (omp_debug==DPERF){
-                OpenInterval(stat);
-            }
-            continue;
-        }
-        if (stat->variant () == DVM_ENDINTERVAL_DIR) {
-            if (omp_debug==DPERF){
-                if(!St_frag){
-                     err("Unmatched directive",182,stat);
-                     break;
-                }
-                if(St_frag && St_frag->begin_st &&  (St_frag->begin_st->controlParent() != stat->controlParent()))
-                err("Misplaced directive",103,stat); //interval must be a block
-                strcat(strStaticContext,"*type=interval");            
-                GenerateFileAndLine (St_frag->begin_st, strStaticContext);            
-				InstrumentIntervalDir (St_frag->begin_st, stat, strStaticContext);
-                GenerateCallGetHandle (strStaticContext);
-                CloseInterval();
-            }
-            continue;
-        }
-        if (stat->variant () == FOR_NODE) {
-            if (omp_debug>=D2 && omp_debug!=DPERF){            
-                strcat(strStaticContext,"*type=seqloop");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentSerialDoLoop (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }
-		if (stat->variant()== IF_NODE) {
-			if (omp_debug>=D3) {            
-				strcat(strStaticContext,"*type=file_name");            
-				GenerateFileAndLine (stat, strStaticContext);            
-				InstrumentIfStat (stat, strStaticContext);            
-				GenerateCallGetHandle (strStaticContext);
-			}
-			continue;
-		}
-		if (stat->variant()==ALLOCATE_STMT) {
-			RegisterAllocatableArrays (stat);
-			continue;
-		}
-		if (stat->variant()==DEALLOCATE_STMT) {
-			UnregisterAllocatableArrays (stat);
-			continue;
-		}
-		//NULLIFY_STMT
-		if (stat->variant () == ASSIGN_STAT) {
-			//printf ("%d\n",stat->expr(0)->variant());
-			//if (stat->expr(0)->lhs()&&stat->expr(0)->lhs()->lhs())
-			//	printf ("-%d\n",stat->expr(0)->lhs()->lhs()->variant());
-			if (omp_debug>=D3) {            
-				strcat(strStaticContext,"*type=file_name");            
-				GenerateFileAndLine (stat, strStaticContext);            
-				InstrumentAssignStat (stat, strStaticContext);                            
-			}
-			continue;
-		}
-        if (stat->variant () == PROC_STAT) {                        
-            if (omp_debug>=D2){          
-                strcat(strStaticContext,"*type=func_call");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentProcStat (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_SINGLE_DIR) {
-            if (omp_debug>=D2){
-                strcat(strStaticContext,"*type=single");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpSingleDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_CRITICAL_DIR) {                     
-            if (omp_debug>=D2){            
-                strcat(strStaticContext,"*type=critical");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpCriticalDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_ORDERED_DIR) {                        
-            if (omp_debug>=D2){
-                strcat(strStaticContext,"*type=ordered");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpOrderelDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_MASTER_DIR) {
-            if (omp_debug>=D2){            
-                strcat(strStaticContext,"*type=master");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpMasterDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }
-        if ((stat->variant () == OMP_BARRIER_DIR) || (stat->variant () == DVM_BARRIER_DIR)){                        
-            if (omp_debug>=D2){            
-                strcat(strStaticContext,"*type=barrier");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpBarrierDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);            
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_FLUSH_DIR){                        
-            if (omp_debug>=D2){            
-                strcat(strStaticContext,"*type=flush");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpFlushDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);            
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_THREADPRIVATE_DIR){                        
-            if (omp_debug>=D2){            
-                strcat(strStaticContext,"*type=threadprivate");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpThreadPrivateDir(stat, stFirstExecutableFunc, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_SECTIONS_DIR){                        
-            if (omp_debug>=D2){
-                strcat(strStaticContext,"*type=sections");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpSectionsDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_SECTION_DIR){
-            if (omp_debug>=D2){                        
-                strcat(strStaticContext,"*type=sect_ev");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpSectionDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);            
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_WORKSHARE_DIR){
-            if (omp_debug>=D2){                                                
-                strcat(strStaticContext,"*type=workshare");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentOmpWorkshareDir (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);
-            }
-            continue;
-        }       
-        if ((stat->variant () == EXIT_STMT) ||
-            (stat->variant () == STOP_STAT)) {
-            if (omp_debug>=D2){                                                
-                InstrumentExitFromLoops (stat);            
-                InstrumentExitStmt (stat);
-            }
-            continue;
-        }
-        if (stat->variant () == RETURN_STAT) {
-            if (omp_debug>=D2){                                                            
-                InstrumentExitFromLoops (stat);            
-                InstrumentFunctionEnd (stat, func);
-            }
-            continue;
-        }
-        if (stat->variant () == GOTO_NODE) {                        
-            if (omp_debug>=D2){                                                                            
-                InstrumentGotoStmt (stat);
-            }
-            continue;
-        }
-        if (isIOStmt (stat)){
-            if (omp_debug==DPERF){            
-                strcat(strStaticContext,"*type=io");            
-                GenerateFileAndLine (stat, strStaticContext);            
-                InstrumentIOStmt (stat, strStaticContext);            
-                GenerateCallGetHandle (strStaticContext);            
-            }
-            continue;
-        }
-
-    }
-    if ((stat->variant () == CONTROL_END) && ((stat->controlParent ()->variant () == FUNC_HEDR) || (stat->controlParent ()->variant () == PROC_HEDR))) {
-        if (omp_debug>=D2){
-            InstrumentFunctionEnd (stat, func);
-        }
-    }
-    delete strStaticContext;
-}
-
-void FindOrDeclareOmpDebugVariables (SgStatement *debug) {
-    SgStatement *stat;
-    SgSymbol *symThreadID=NULL;
-    stLastDebug = debug->lastNodeOfStmt ();
-    SgStatement *stLastSpecDebug = GetLastDeclarationStatement(debug);
-    for (stat=debug; stat && (stat != stLastSpecDebug->lexNext ()); stat=stat->lexNext ()) {
-        if (stat->variant () == EXTERN_STAT) {
-                FindExternalProcedures (stat);
-                continue;
-        }
-    	SgVarListDeclStmt *vardecl = isSgVarListDeclStmt (stat);
-     	if (vardecl != NULL) {
-	    for (int i=0; i< vardecl->numberOfSymbols(); i++) {
-    	        SgSymbol *sym = vardecl->symbol(i);
-                if (!strcmp (sym->identifier(),"ithreadid")) {
-                    symThreadID = sym;
-                    continue;
-                }
-                if (!strcmp (sym->identifier(),"dbg_get_addr")) {
-                    sym_dbg_get_addr = sym;
-                    continue;
-                }
-                if (!strcmp (sym->identifier(),"istat_mp")) {
-                    symStatMP = sym;
-                    SgArrayType *ArrStaticHandle = isSgArrayType (sym->type());
-                    if (ArrStaticHandle != NULL) {
-                        if (ArrStaticHandle->dimension() == 1) {
-                            if (ArrStaticHandle->sizeInDim(0)->isInteger ()) {
-                                nArrStaticHandleCount=ArrStaticHandle->sizeInDim(0)->valueInteger ();
-                            }
-                        }
-                    }
-                    continue;
-			    }
-			    if (!strcmp (sym->identifier(),"idyn_mp")) {
-                    symDynMP = sym;
-				    SgArrayType *ArrHandle = isSgArrayType (sym->type());
-				    if (ArrHandle != NULL) {
-    					if (ArrHandle->dimension() == 1) {
-	    					if (ArrHandle->sizeInDim(0)->isInteger ()) {
-		    					nArrHandleCount=ArrHandle->sizeInDim(0)->valueInteger ();
-						    }
-					    }
-				    }
-			    }
-            }
-        } else {
-            SgVarDeclStmt *vardec = isSgVarDeclStmt (stat);
-            if (vardec != NULL) {
-                for (int i=0; i< vardec->numberOfSymbols(); i++) {
-                    SgSymbol *sym = vardec->symbol(i);
-                    if (!strcmp (sym->identifier(),"ithreadid")) {
-                        symThreadID = sym;
-                        continue;
-                    }
-                    if (!strcmp (sym->identifier(),"dbg_get_addr")) {
-                        sym_dbg_get_addr = sym;
-                        continue;
-                    }
-                }
-            }
-        }
-    }
-    if (nArrStaticHandleCount == 0) {
-	    (void)fprintf (stderr, "Error: Array istat_mp in file \"dbg_vars.h\" not found\n");
-	    exit(1);
-    }
-    if (nArrHandleCount == 0) {
-    	(void)fprintf (stderr, "Error: Array idyn_mp in file \"dbg_vars.h\" not found\n");
-	    exit(1);
-    }
-    nMaxArrHandleCount = nArrHandleCount;
-    if (symThreadID == NULL) {
-        SgExprListExp *list = NULL;
-        symThreadID = new SgSymbol(VARIABLE_NAME, "ithreadid");
-        varThreadID = new SgVarRefExp(symThreadID);
-        sym_dbg_get_addr = new SgSymbol(VARIABLE_NAME, "dbg_get_addr");
-        list = new SgExprListExp (*varThreadID);
-        SgType *type = NULL;
-        if (len_DvmType) {
-	        SgExpression *le = new SgExpression(LEN_OP);
-	        le->setLhs(new SgValueExp(8));
-	        type = new SgType(T_INT, le, SgTypeInt());
-        } else {
-        	type = new SgType(T_INT);
-	    }
-        if (symStatMP!=NULL) list->append (*new SgVarRefExp(symStatMP));
-        if (symDynMP!=NULL) list->append (*new SgVarRefExp(symDynMP));
-        if (sym_dbg_get_addr!=NULL) list->append (*new SgVarRefExp(sym_dbg_get_addr));
-        SgVarDeclStmt *vdecl = new SgVarDeclStmt (*list,*type);
-        vdecl->addAttribute(DEBUG_STAT);
-        stLastSpecDebug->insertStmtAfter(*vdecl);
-    } else {
-        varThreadID = new SgVarRefExp(symThreadID);
-    }
-}
-int ompdbgvar=0;
-void Arg_FunctionCallSearch(SgExpression *e, SgStatement *st, SgExpression *parent, int left);
-SgExpression *GenerateTemporaryVariable (SgType *type, SgStatement *stat) {	
-	char *strString = new char [12];
-	sprintf (strString,"dbgomp%d", ompdbgvar++);
-	SgStatement *scope = stat->getScopeForDeclare();
-	SgSymbol *sym = new SgSymbol(VARIABLE_NAME, strString, type, scope);
-	if (type->variant()==T_FLOAT) sym->setType (new SgType (T_DOUBLE));
-	SgExpression *expr = new SgVarRefExp (*sym);
-	SgStatement *stLastSpecDebug = GetLastDeclarationStatement(scope);
-	SgStatement *thrprivate = new SgStatement (OMP_THREADPRIVATE_DIR);
-	thrprivate->setExpression(0, *new SgExprListExp (*expr));
-	thrprivate->setlineNumber(stat->lineNumber());
-	stLastSpecDebug->insertStmtAfter(*thrprivate,*stLastSpecDebug->controlParent());
-	SgStatement *vardecl = sym->makeVarDeclStmt ();
-	sym->addAttribute(SAVE_VAR);
-	vardecl->setlineNumber(stat->lineNumber());
-	SgExprListExp *exprlist = isSgExprListExp(vardecl->expr(2));
-	if (exprlist != NULL) exprlist->append(*new SgAttributeExp(SAVE_OP));
-	else {
-		exprlist = new SgExprListExp (*new SgAttributeExp(SAVE_OP));
-		vardecl->setExpression(2,*exprlist);
-	}
-	stLastSpecDebug->insertStmtAfter(*vardecl);
-	return expr;
-}
-
-void FunctionCallSearch(SgExpression *e, SgStatement *st,SgExpression *parent, int left) 
-{
-  SgExpression *el;
-  if(!e)return;
-  if(isSgFunctionCallExp(e)) {
-	  for(el=e->lhs(); el; el=el->rhs())
-		  Arg_FunctionCallSearch(el->lhs(),st,el,1);
-	  if (parent) {
-		  if (e->symbol()->type()){
-			SgExpression *var=GenerateTemporaryVariable (e->symbol()->type(), st);
-			SgAssignStmt *as=new SgAssignStmt (*var,*e);
-			as->setlineNumber (st->lineNumber());
-			st->insertStmtBefore(*as,*st->controlParent());
-			if (left){
-				parent->setLhs (*var);
-			} else {
-				parent->setRhs (*var);
-			}
-		  }
-	  }
-	  return;
-  }
-  if ((e->variant ()!= ASSGN_OP) && (e->variant ()!= POINTST_OP))
-	FunctionCallSearch(e->lhs(),st,e,1);
-  FunctionCallSearch(e->rhs(),st,e,0);
-  return;
-}
-
-void Arg_FunctionCallSearch(SgExpression *e, SgStatement *st, SgExpression *parent, int left) 
-{ 
-	if (!e->rhs ()) {
-		FunctionCallSearch(e,st,parent,left);
-	} else {
-		if (parent) {
-			if (e->type()) {
-				SgExpression *var=GenerateTemporaryVariable (e->type(), st);
-				SgAssignStmt *as=new SgAssignStmt (*var,*e);
-				as->setlineNumber (st->lineNumber());
-				st->insertStmtBefore(*as,*st->controlParent());
-				if (left){
-					parent->setLhs (*var);
-				} else {
-					parent->setRhs (*var);
-				}
-				FunctionCallSearch(as->expr(0),as,NULL,1);   // left part
-				FunctionCallSearch(as->expr(1),as,NULL,0);   // right part
-			}
-		}
-	}
-	return;
-}
-
-void InstrumentForOpenMPDebug(SgFile *f) {
-    SgStatement *stat, *func=NULL;
-    SgStatement *debug=NULL;
-    stat = f->firstStatement(); // file header 
-    C4=new SgValueExp(4);
-    C3=new SgValueExp(3);
-    C2=new SgValueExp(2);
-    C1=new SgValueExp(1);
-    C0=new SgValueExp(0);
-    M1=new SgValueExp(-1);
-    nfrag = 0 ; //counter of intervals for performance analizer 
-    St_frag = NULL;
-    for(stat=stat->lexNext(); stat; stat=stat->lastNodeOfStmt()->lexNext ()) {
-    	// PROGRAM, SUBROUTINE, FUNCTION header
-    	if (stat->variant () != PROC_HEDR) continue;
-        if(!strcmp(stat->symbol()->identifier(),"dbg_init_handles")) { 
-    		debug = func = stat;
-		    break;
-	    }
-    }
-    if (func == NULL) {
-        (void)fprintf (stderr, "Error: Subroutine DBG_Init_Handles in file \"dbg_init.h\" not found\n");
-        exit(1);
-    }
-    FindOrDeclareOmpDebugVariables (func);
-    stat = f->firstStatement(); // file header
-    for(stat=stat->lexNext(); stat; stat=stat->lexNext ()) {
-        if (!strcmp(stat->fileName(),"dbg_init.h")) {
-            stat=stat->lastNodeOfStmt();
-            continue;
-        }
-        if (stat->variant () == COMM_STAT) {
-            MarkSymbolsInCommon(stat);
-            continue;
-        }
-        if (stat->variant () == SAVE_DECL) {
-            MarkSymbolsInSave(stat);
-            continue;
-        }
-		if (stat->variant () == VAR_DECL) {
-			MarkSymbolsInDecl(stat);
-			continue;
-		}
-		if(stat->variant () == DATA_DECL) {
-            continue;
-        }
-        if ((stat->variant () == PROC_HEDR) ||
-            (stat->variant () == FUNC_HEDR)) {
-                MarkFormalParameters (stat);
-                continue;
-        }
-        if (stat->variant () == FOR_NODE) {
-		ConvertLoopWithLabelToEnddoLoop (stat);
-		continue;
-        }
-		if (stat->variant()== ELSEIF_NODE) {
-			ConvertElseIFToElse_IF(stat);
-		}
-		if (stat->variant () == LOGIF_NODE) {
-			LogIf_to_IfThen(stat);		
-		}
-        if (stat->variant () == OMP_ATOMIC_DIR) {
-            SgStatement *assign = stat->lexNext ();
-            if (atomic_varref == NULL) {
-                atomic_varref = new SgVarRefExp(*new SgSymbol (VARIABLE_NAME, "dbg_atomic"));
-            }
-            stat->setExpression (0, *atomic_varref);
-            stat->setVariant (OMP_CRITICAL_DIR);
-            SgStatement *endst = new SgStatement (OMP_END_CRITICAL_DIR);
-            endst->setlineNumber (stat->lineNumber ());
-            endst->setExpression (0, *atomic_varref);
-            assign->insertStmtAfter (*endst, *stat);
-			SgStatement *tmp = &assign->copy ();
-			tmp->setlineNumber (assign->lineNumber ());
-            assign->insertStmtAfter (*tmp, *stat);
-            assign->extractStmt ();
-            continue;
-        }
-        if (stat->variant () == OMP_PARALLEL_DO_DIR) {
-            stat->setVariant (OMP_PARALLEL_DIR);
-            SgExprListExp *list = NULL;
-            SgExprListExp *parallel_clause = NULL;
-            SgExprListExp *do_clause = NULL;
-            if (stat->expr(0) != NULL) {
-                list = isSgExprListExp (stat->expr(0));
-                for (int i=0; i<list->length (); i++) {
-                    SgExpression *exp = list->elem (i);
-                    switch (exp->variant ()) {
-                        case OMP_SCHEDULE:
-                        case OMP_ORDERED:
-                        case OMP_LASTPRIVATE: {
-                            if (do_clause != NULL) {
-                                do_clause->append (*exp);
-                            } else {
-                                do_clause = new SgExprListExp (*exp);
-                            }
-                            break;
-                        }
-                        default: {
-                            if (parallel_clause != NULL) {
-                                parallel_clause->append (*exp);
-                            } else {
-                                parallel_clause = new SgExprListExp (*exp);
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-            if (parallel_clause != NULL) stat->setExpression (0, *parallel_clause);
-            else BIF_LL1(stat->thebif)=NULL;
-	    ConvertLoopWithLabelToEnddoLoop (stat->lexNext ());
-            SgForStmt *forst= isSgForStmt (stat->lexNext ());
-            if (forst) {
-                SgStatement *last = GetLastStatementOfLoop (forst)->lexNext ();
-                if (last->variant () == OMP_END_PARALLEL_DO_DIR) {
-                    SgStatement * tmp = last;
-                    last=last->lexNext ();
-                    tmp->extractStmt ();
-                } 
-                SgStatement *dodir = new SgStatement (OMP_DO_DIR);
-                if (do_clause != NULL) dodir->setExpression (0, *do_clause);
-                dodir->setlineNumber (stat->lineNumber ());
-                SgStatement *enddodir = new SgStatement (OMP_END_DO_DIR);
-                SgStatement *endparalleldir = new SgStatement (OMP_END_PARALLEL_DIR);
-                enddodir->setlineNumber (last->lineNumber ());
-                endparalleldir->setlineNumber (last->lineNumber ());
-                forst->insertStmtBefore (*dodir, *stat);
-                if (forst->controlParent () != NULL) {
-                    PTR_BLOB bl1,bl2,blob=NULL;
-                    for (bl1 = bl2 = BIF_BLOB1(forst->controlParent()->thebif); (blob == NULL) && bl1; bl1 = BLOB_NEXT (bl1)) {
-                        if (BLOB_VALUE (bl1) == forst->thebif) {
-                            BLOB_NEXT (bl2) = BLOB_NEXT (bl1);
-                            blob=bl1;                            
-                        }
-                        bl2 = bl1;
-                    }
-                    for (bl1 = bl2 = BIF_BLOB2(forst->controlParent()->thebif); (blob == NULL) && bl1; bl1 = BLOB_NEXT (bl1)) {
-                        if (BLOB_VALUE (bl1) == forst->thebif) {
-                            BLOB_NEXT (bl2) = BLOB_NEXT (bl1);
-                            blob=bl1;
-                        }
-                        bl2 = bl1;
-                    }
-                }                
-                appendBfndToList1(forst->thebif, stat->thebif);
-                last->insertStmtBefore (*enddodir, *stat);
-                last->insertStmtBefore (*endparalleldir, *stat);                
-            }
-            continue;
-        }
-        if (stat->variant () == OMP_PARALLEL_SECTIONS_DIR) {
-            stat->setVariant (OMP_SECTIONS_DIR);
-            SgExprListExp *list = NULL;
-            SgExprListExp *parallel_clause = NULL;
-            SgExprListExp *section_clause = NULL;            
-            if (stat->expr(0) != NULL) {
-                list = isSgExprListExp (stat->expr(0));
-                for (int i=0; i<list->length (); i++) {
-                    SgExpression *exp = list->elem (i);
-                    switch (exp->variant ()) {
-                        case OMP_LASTPRIVATE: {
-                            if (section_clause != NULL) {
-                                section_clause->append (*exp);
-                            } else {
-                                section_clause = new SgExprListExp (*exp);
-                            }
-                            break;
-                        }
-                        default: {
-                            if (parallel_clause != NULL) {
-                                parallel_clause->append (*exp);
-                            } else {
-                                parallel_clause = new SgExprListExp (*exp);
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-            SgStatement *last = stat->lastNodeOfStmt ();
-			last->setVariant (OMP_END_SECTIONS_DIR);
-            if (section_clause != NULL) stat->setExpression (0, *section_clause);
-            else BIF_LL1(stat->thebif)=NULL;
-			SgStatement *parallel = new SgStatement (OMP_PARALLEL_DIR);
-            if (parallel_clause != NULL) parallel->setExpression (0, *parallel_clause);
-            parallel->setlineNumber (stat->lineNumber ());
-            SgStatement *endparallel = new SgStatement (OMP_END_PARALLEL_DIR);
-            endparallel->setlineNumber (last->lineNumber ());			
-			stat->insertStmtBefore (*parallel, *stat->controlParent());
-			last->insertStmtAfter (*endparallel, *stat->controlParent());
-			if (stat->controlParent () != NULL) {
-				PTR_BLOB bl1,bl2,blob=NULL;
-				for (bl1 = bl2 = BIF_BLOB1(stat->controlParent()->thebif); (blob == NULL) && bl1; bl1 = BLOB_NEXT (bl1)) {
-					if (BLOB_VALUE (bl1) == stat->thebif) {
-						BLOB_NEXT (bl2) = BLOB_NEXT (bl1);
-						blob=bl1;                            
-					}
-					bl2 = bl1;
-				}
-			}                
-			if (stat->controlParent () != NULL) {
-				PTR_BLOB bl1,bl2,blob=NULL;
-				for (bl1 = bl2 = BIF_BLOB1(stat->controlParent()->thebif); (blob == NULL) && bl1; bl1 = BLOB_NEXT (bl1)) {
-					if (BLOB_VALUE (bl1) == endparallel->thebif) {
-						BLOB_NEXT (bl2) = BLOB_NEXT (bl1);
-						blob=bl1;                            
-					}
-					bl2 = bl1;
-				}
-			}                
-			appendBfndToList1(stat->thebif, parallel->thebif);
-			appendBfndToList1(endparallel->thebif, parallel->thebif);
-			continue;
-        }
-        if (stat->variant () == OMP_PARALLEL_WORKSHARE_DIR) {
-            stat->setVariant (OMP_PARALLEL_DIR);
-            SgExprListExp *list = NULL;
-            SgExprListExp *parallel_clause = NULL;
-            SgExprListExp *workshare_clause = NULL;            
-            if (stat->expr(0) != NULL) {
-                list = isSgExprListExp (stat->expr(0));
-                for (int i=0; i<list->length (); i++) {
-                    SgExpression *exp = list->elem (i);
-                    switch (exp->variant ()) {
-                        case OMP_SCHEDULE:
-                        case OMP_ORDERED:
-                        case OMP_LASTPRIVATE: {
-                            if (workshare_clause != NULL) {
-                                workshare_clause->append (*exp);
-                            } else {
-                                workshare_clause = new SgExprListExp (*exp);
-                            }
-                            break;
-                        }
-                        default: {
-                            if (parallel_clause != NULL) {
-                                parallel_clause->append (*exp);
-                            } else {
-                                parallel_clause = new SgExprListExp (*exp);
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-            SgStatement *last = stat->lastNodeOfStmt ();
-            if (parallel_clause != NULL) stat->setExpression (0, *parallel_clause);
-			else BIF_LL1(stat->thebif)=NULL;
-			SgStatement *workshare = new SgStatement (OMP_WORKSHARE_DIR);
-            if (workshare_clause != NULL) workshare->setExpression (0, *workshare_clause);
-            workshare->setlineNumber (stat->lineNumber ());
-            SgStatement *endworkshare = new SgStatement (OMP_END_WORKSHARE_DIR);
-            endworkshare->setlineNumber (last->lineNumber ());
-            last->setVariant (OMP_END_PARALLEL_DIR);
-            stat->insertStmtAfter (*workshare, *stat);
-            last->insertStmtBefore (*endworkshare, *stat);
-            continue;
-        }
-		if (omp_debug>=D5) {
-			switch (stat->variant()) {
-			   case ENTRY_STAT:
-				   // !!!!!!!
-				   break;
-			   case SWITCH_NODE:           // SELECT CASE ...
-			   case ARITHIF_NODE:          // Arithmetical IF
-			   case IF_NODE:               // IF... THEN
-			   case WHILE_NODE:            // DO WHILE (...) 
-			   case CASE_NODE:             // CASE ...
-			   case ELSEIF_NODE:           // ELSE IF...
-			   case LOGIF_NODE:            // Logical IF
-				   FunctionCallSearch(stat->expr(0),stat,NULL,1);
-				   break; 
-			   case COMGOTO_NODE:          // Computed GO TO
-			   case OPEN_STAT:
-			   case CLOSE_STAT:
-			   case INQUIRE_STAT:
-			   case BACKSPACE_STAT:
-			   case ENDFILE_STAT:
-			   case REWIND_STAT:
-				   FunctionCallSearch(stat->expr(1),stat,NULL,0);
-				   break;
-			   case PROC_STAT:  {           // CALL
-				   SgExpression *el;
-				   // looking through the arguments list
-				    for(el=stat->expr(0); el; el=el->rhs())            
-					   Arg_FunctionCallSearch(el->lhs(),stat,el,1);   // argument
-					}
-					break;
-			   case ASSIGN_STAT:             // Assign statement
-				   FunctionCallSearch(stat->expr(0),stat,NULL,1);   // left part
-				   FunctionCallSearch(stat->expr(1),stat,NULL,0);   // right part
-				   break;
-			   case WRITE_STAT:
-			   case READ_STAT:
-			   case PRINT_STAT:
-			   case FOR_NODE:  
-				   FunctionCallSearch(stat->expr(0),stat,NULL,1);   // left part
-				   FunctionCallSearch(stat->expr(1),stat,NULL,0);   // right part
-				   break;
-			}
-		}
-    }    
-    if (omp_debug>=D3){    
-        for (SgSymbol *sym=f->firstSymbol(); sym; sym=sym->next ()) {        
-            RegisterSymbol (sym);    
-        }
-    }    
-    stat = f->firstStatement(); // file header
-    for(stat=stat->lexNext(); stat; stat=stat->lastNodeOfStmt()->lexNext ()) {
-    	if(strcmp(stat->symbol()->identifier(),"dbg_init_handles")) { 
-        	InstrumentFunctionForOpenMPDebug (stat, func);
-	    }		
-    }    
-    if (symStatMP != NULL) {
-        SgArrayType *type = isSgArrayType (symStatMP->type());
-        if (type != NULL) {
-            if (TYPE_RANGES(type->thetype) != NULL) {
-                if (NODE_OPERAND0(TYPE_RANGES(type->thetype)) != NULL) {
-                    if (NODE_OPERAND0(TYPE_RANGES(type->thetype))->variant == INT_VAL) {
-                        NODE_INT_CST_LOW (NODE_OPERAND0(TYPE_RANGES(type->thetype))) = nArrStaticHandleCount;
-                    }
-                }
-            }
-        }        
-    }
-    if (symDynMP != NULL) {
-        SgArrayType *type = isSgArrayType (symDynMP->type());
-        if (type != NULL) {
-            if (TYPE_RANGES(type->thetype) != NULL) {
-                if (NODE_OPERAND0(TYPE_RANGES(type->thetype)) != NULL) {
-                    if (NODE_OPERAND0(TYPE_RANGES(type->thetype))->variant == INT_VAL) {
-                        NODE_INT_CST_LOW (NODE_OPERAND0(TYPE_RANGES(type->thetype))) = nMaxArrHandleCount;
-                    }
-                }
-            }
-        }        
-    }
-    if (debug != NULL) {        
-        DeclareExternalProcedures (GetLastDeclarationStatement(debug));
-        UpdateIncludeVarsFile(debug, "dbg_vars.h");
-        UpdateIncludeInitFile(debug, "dbg_init.h");
-    }
-}
-
-void RegisterSymbol(SgSymbol *sym) {
-    if (sym->variant ()== VARIABLE_NAME) {
-			RegistrateVariable (sym);
-    }
-}
-
-void DBGSearchVarsInExpression (SgExpression *exp) {
-    if (exp == NULL) return;
-    if (exp->symbol() != NULL) {
-        RegisterSymbol(exp->symbol ());
-    }
-    DBGSearchVarsInExpression (exp->lhs());
-    DBGSearchVarsInExpression (exp->rhs());
-}
-
-void DBGSearchVarsInFunction (SgStatement *func) {
-    return;
-    SgStatement *st;
-    for (st=func; st; st=st->lexNext ()) {
-        if (st->hasSymbol ()) {
-            RegisterSymbol (st->symbol ());
-        } else {
-            for (int i=0; i<3; i++) {
-                DBGSearchVarsInExpression (st->expr(i));
-            }
-        }
-    }
-}
-
-void RegistrateVariable (SgSymbol *sym) {
-    if (sym->type()->variant () == T_ARRAY) {
-			RegisterArray(sym);
-    } else {
-			RegisterVar(sym);
-    }
-}
-
-void RegisterVar (SgSymbol *sym) {
-    SgStatement *stFirst = NULL;
-    SgCallStmt *fe;
-	if (!strcmp (sym->identifier(),"dbg_get_addr")) return;
-    if (!strcmp (sym->identifier(),"ithreadid")) return;
-    if (!strcmp (sym->identifier(),"dbg000")) return; 
-    if (!strcmp (sym->identifier(),"mem000")) return; 
-    if (!strcmp (sym->identifier(),"heap00")) return; 
-    if (!strcmp (sym->identifier(),"dbg_atomic")) return;
-    if (sym->scope () != NULL) {
-        stFirst = GetFirstExecutableNotDebugStatement(sym->scope ());
-    }
-    if (stFirst == NULL) return;
-    SgStatement *stDeclared = sym->declaredInStmt ();
-    if (stDeclared == NULL) stDeclared = stFirst;
-    char *strStaticContext = new char [MaxContextBufferLength];
-    memset(strStaticContext, 0, MaxContextBufferLength);    
-    strcat(strStaticContext,"*type=var_name");
-    GenerateFileAndLine (stDeclared, strStaticContext);// To DO ISINDATA ISINCOMMON ISINSAVE
-    sprintf (strStaticContext,"%s*name1=%s*vtype=%d*isindata=0*isincommon=%d*isinsave=%d",strStaticContext,sym->identifier(),VarType(sym),((sym->getAttribute(0,COMMON_VAR)==NULL)?0:1),((sym->getAttribute(0,SAVE_VAR)==NULL) ? 0:1));    
-    int *pos = new int;
-    pos = ((int *)sym->attributeValue(0,FORMAL_PARAM));
-    if (pos != NULL) {
-        if (sym_dbg_regparvar == NULL) sym_dbg_regparvar = new SgSymbol (PROCEDURE_NAME, "dbg_regparvar");
-        fe = new SgCallStmt(*sym_dbg_regparvar);
-    } else {
-        if (sym_dbg_regvar == NULL) sym_dbg_regvar = new SgSymbol (PROCEDURE_NAME, "dbg_regvar");
-        fe = new SgCallStmt(*sym_dbg_regvar);
-    }
-    SgArrayRefExp **arrStaticRef = new (SgArrayRefExp *);
-    *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(**arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addArg(*new SgVarRefExp(sym));
-    if (pos != NULL) {
-        fe->addArg(*new SgValueExp (*pos));
-    }
-    fe->addAttribute(DEBUG_STAT);
-    stFirst->insertStmtBefore(*fe, *stFirst->controlParent());
-    sym->addAttribute (STATIC_CONTEXT, (void *)arrStaticRef, sizeof(SgArrayRefExp *));
-    GenerateCallGetHandle (strStaticContext);
-}
-
-SgExpression *GetLeftBoundFunction(SgSymbol *ar, int i) {
-	SgFunctionCallExp *fe;  
-	// generating function call: LBOUND(ARRAY, DIM)
-	if(!FuncLeftBound)   
-		FuncLeftBound = new SgFunctionSymb(FUNCTION_NAME, "lbound", *SgTypeInt(), *ar->scope()); 
-	fe = new SgFunctionCallExp(*FuncLeftBound);
-	fe -> addArg(*new SgArrayRefExp(*ar));//array
-	if(i != 0) fe -> addArg(*new SgValueExp(i));  // dimension number
-	return(fe);
-}
-
-SgExpression *GetRightBoundFunction(SgSymbol *ar, int i) {
-	SgFunctionCallExp *fe;  
-	// generating function call: UBOUND(ARRAY, DIM)
-	if(!FuncRightBound) FuncRightBound = new SgFunctionSymb(FUNCTION_NAME, "ubound", *SgTypeInt(), *ar->scope()); 
-	fe = new SgFunctionCallExp(*FuncRightBound);
-	fe -> addArg(*new SgArrayRefExp(*ar));//array
-	if(i != 0) fe -> addArg(*new SgValueExp(i));  // dimension number
-	return(fe);
-}
-
-void RegisterArray (SgSymbol *sym) {    
-	SgStatement *stFirst = NULL;
-	SgCallStmt *fe = NULL;
-	if (IS_ALLOCATABLE_POINTER (sym)) return;
-	if (!strcmp (sym->identifier(),"istat_mp")) return;
-	if (!strcmp (sym->identifier(),"idyn_mp")) return;
-	if (sym->scope () != NULL) {
-		stFirst = GetFirstExecutableNotDebugStatement(sym->scope ());
-	}
-	if (stFirst == NULL) return;
-	SgExpression **arrFirstElement = new (SgExpression *);
-	*arrFirstElement = FirstArrayElement(sym);
-	SgArrayType *arType= isSgArrayType(sym->type());
-	SgExpression *arrLowerSize = NULL;
-	SgExpression *arrUpperSize = NULL;
-	SgStatement *stDeclared = sym->declaredInStmt ();
-	if (stDeclared == NULL) stDeclared = stFirst;
-	char *strStaticContext = new char [MaxContextBufferLength];
-	memset(strStaticContext, 0, MaxContextBufferLength);    
-	strcat(strStaticContext,"*type=arr_name");
-	GenerateFileAndLine (stDeclared, strStaticContext);// To DO ISINDATA ISINCOMMON ISINSAVE
-	sprintf (strStaticContext,"%s*name1=%s*vtype=%d*rank=%d*isindata=0*isincommon=%d*isinsave=%d",strStaticContext,sym->identifier(),VarType(sym),arType->dimension(),((sym->getAttribute(0,COMMON_VAR)==NULL) ? 0:1),((sym->getAttribute(0,SAVE_VAR)==NULL) ? 0:1));
-	nArrHandleCount=1;
-	if (arType != NULL) {
-		for (int i=0; i<arType->dimension(); i++) {
-			SgExpression *exp = arType->sizeInDim(i);
-			SgSubscriptExp *sbe = isSgSubscriptExp(exp);
-			if (sbe != NULL) {
-				if ((sbe->ubound() == NULL)||(sbe->ubound()->variant() == STAR_RANGE)) {
-					sprintf (strStaticContext,"%s*isassumed=1",strStaticContext);
-					if (sbe->lbound() != NULL) {
-						arrUpperSize = sbe->lbound();
-						arrLowerSize = sbe->lbound();
-					} else {
-						Error("Assumed-size array: %s",sym->identifier(), 162, stFirst);
-					}
-				} else {
-					if(sbe->lbound() != NULL) {
-						arrLowerSize = sbe->lbound();
-					} else {
-						arrLowerSize = C1;
-					}
-					if(sbe->ubound() != NULL) {
-						arrUpperSize = sbe->ubound();
-					}
-				}		
-			} else {
-				if(exp->variant() != STAR_RANGE) {// dim=ubound = *
-					arrLowerSize = C1;
-					arrUpperSize = exp;
-				} else {
-					sprintf (strStaticContext,"%s*isassumed=1",strStaticContext);
-					arrUpperSize = C1;
-					arrLowerSize = C1;                        
-				}
-			}
-			doOmpAssignStmt(arrLowerSize, stFirst);
-			doOmpAssignStmt(arrUpperSize, stFirst);
-		}
-		int *pos = new int;
-		pos = ((int *)sym->attributeValue(0,FORMAL_PARAM));
-		if (pos != NULL) {
-			if (sym_dbg_regpararr == NULL) sym_dbg_regpararr = new SgSymbol (PROCEDURE_NAME, "dbg_regpararr");
-			fe = new SgCallStmt(*sym_dbg_regpararr);
-		} else {
-			if (sym_dbg_regarr == NULL) sym_dbg_regarr = new SgSymbol (PROCEDURE_NAME, "dbg_regarr");
-			fe = new SgCallStmt(*sym_dbg_regarr);
-		}
-		SgArrayRefExp **arrStaticRef = new (SgArrayRefExp *);
-		*arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-		SgArrayRefExp *arrDynamicRef = new SgArrayRefExp(*symDynMP,*C1);
-		fe->addArg(**arrStaticRef);
-		fe->addArg(*varThreadID);
-		fe->addArg(*arrDynamicRef);
-		fe->addArg(**arrFirstElement);
-		if (pos != NULL) {
-			fe->addArg(*new SgValueExp (*pos));
-		}
-		fe->addAttribute(DEBUG_STAT);
-		stFirst->insertStmtBefore(*fe, *stFirst->controlParent());
-		sym->addAttribute (STATIC_CONTEXT, (void *)arrStaticRef, sizeof(SgArrayRefExp *));
-		sym->addAttribute (FIRST_ELEM, (void *)arrFirstElement, sizeof(SgExpression *));
-		GenerateCallGetHandle (strStaticContext);
-	}    
-}
-
-void RegisterAllocatableArrays (SgStatement *stat) {    
-	SgCallStmt *fe = NULL;
-	SgExprListExp *list = isSgExprListExp(stat->expr(0));
-	SgStatement *next=stat->lexNext();
-	for (int i=0; i<list->length (); i++) {
-		if (list->elem(i)->variant()==ARRAY_REF) {
-			SgSymbol *sym = list->elem(i)->symbol();
-			SgExprListExp *arrlist = isSgExprListExp(list->elem(i)->lhs ());
-			SgArrayRefExp *leftbound = new SgArrayRefExp (*sym);
-			SgArrayRefExp *rightbound = new SgArrayRefExp (*sym);
-			nArrHandleCount=1;
-			if (arrlist) {
-				for (int j=0;j<arrlist->length();j++) {
-					if (arrlist->elem(j)->variant()==DDOT) {
-						leftbound->addSubscript(*arrlist->elem(j)->lhs());
-						rightbound->addSubscript(*arrlist->elem(j)->rhs());
-						doOmpAssignStmt(arrlist->elem(j)->lhs(), next);
-						doOmpAssignStmt(arrlist->elem(j)->rhs(), next);
-					} else {
-						leftbound->addSubscript(*C1);
-						rightbound->addSubscript(*arrlist->elem(j));
-						doOmpAssignStmt(C1, next);
-						doOmpAssignStmt(arrlist->elem(j), next);
-					}
-				}
-			}
-			SgExpression **arrFirstElement = new (SgExpression *);
-			*arrFirstElement = leftbound;
-			SgArrayType *arType= isSgArrayType(sym->type());
-			//SgStatement *stDeclared = sym->declaredInStmt ();
-			//if (stDeclared == NULL) stDeclared = stat;
-			char *strStaticContext = new char [MaxContextBufferLength];
-			memset(strStaticContext, 0, MaxContextBufferLength);    
-			strcat(strStaticContext,"*type=arr_name");
-			GenerateFileAndLine (stat, strStaticContext);// To DO ISINDATA ISINCOMMON ISINSAVE
-			sprintf (strStaticContext,"%s*name1=%s*vtype=%d*rank=%d*isindata=0*isincommon=%d*isinsave=%d",strStaticContext,sym->identifier(),VarType(sym),arType->dimension(),((sym->getAttribute(0,COMMON_VAR)==NULL) ? 0:1),((sym->getAttribute(0,SAVE_VAR)==NULL) ? 0:1));
-			if (sym_dbg_regarr == NULL) sym_dbg_regarr = new SgSymbol (PROCEDURE_NAME, "dbg_regarr");
-			fe = new SgCallStmt(*sym_dbg_regarr);
-			SgArrayRefExp **arrStaticRef = new (SgArrayRefExp *);
-			*arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-			SgArrayRefExp *arrDynamicRef = new SgArrayRefExp(*symDynMP,*C1);
-			fe->addArg(**arrStaticRef);
-			fe->addArg(*varThreadID);
-			fe->addArg(*arrDynamicRef);
-			fe->addArg(**arrFirstElement);
-			fe->addAttribute(DEBUG_STAT);
-			next->insertStmtBefore(*fe, *next->controlParent());
-			for (int j=0; j<sym->numberOfAttributes();j++) {
-				if ((sym->attributeType(j)==STATIC_CONTEXT) ||
-					(sym->attributeType(j)==FIRST_ELEM))
-					sym->deleteAttribute(j);
-			}
-			sym->addAttribute (STATIC_CONTEXT, (void *)arrStaticRef, sizeof(SgArrayRefExp *));
-			sym->addAttribute (FIRST_ELEM, (void *)arrFirstElement, sizeof(SgExpression *));
-			GenerateCallGetHandle (strStaticContext);
-		}
-	}    
-}
-
-void UnregisterAllocatableArrays (SgStatement *stat) {    
-	SgCallStmt *fe = NULL;
-	SgExprListExp *list = isSgExprListExp(stat->expr(0));
-	for (int i=0; i<list->length (); i++) {
-		if (list->elem(i)->variant()==ARRAY_REF) {
-			SgSymbol *sym = list->elem(i)->symbol();
-			SgExpression **arrFirstElement = NULL;
-			arrFirstElement = new (SgExpression *);
-			arrFirstElement = (SgExpression **) sym->attributeValue(0,FIRST_ELEM);
-			SgArrayType *arType= isSgArrayType(sym->type());
-			char *strStaticContext = new char [MaxContextBufferLength];
-			memset(strStaticContext, 0, MaxContextBufferLength);    
-			strcat(strStaticContext,"*type=arr_name");
-			GenerateFileAndLine (stat, strStaticContext);// To DO ISINDATA ISINCOMMON ISINSAVE
-			sprintf (strStaticContext,"%s*name1=%s*vtype=%d*rank=%d*isindata=0*isincommon=%d*isinsave=%d",strStaticContext,sym->identifier(),VarType(sym),arType->dimension(),((sym->getAttribute(0,COMMON_VAR)==NULL) ? 0:1),((sym->getAttribute(0,SAVE_VAR)==NULL) ? 0:1));
-			if (sym_dbg_unregarr == NULL) sym_dbg_unregarr = new SgSymbol (PROCEDURE_NAME, "dbg_unregarr");
-			fe = new SgCallStmt(*sym_dbg_unregarr);
-			SgArrayRefExp **StatContext =  new (SgArrayRefExp *);
-			StatContext = (SgArrayRefExp **)sym->attributeValue(0,STATIC_CONTEXT);
-			if (StatContext != NULL) {
-				fe->addArg(**StatContext);
-			}
-			fe->addArg(*varThreadID);
-			if (arrFirstElement != NULL) fe->addArg(**arrFirstElement);
-			fe->addAttribute(DEBUG_STAT);
-			stat->insertStmtBefore(*fe, *stat->controlParent());
-			for (int j=0; j<sym->numberOfAttributes();j++) {
-				if ((sym->attributeType(j)==STATIC_CONTEXT) ||
-					(sym->attributeType(j)==FIRST_ELEM))
-					sym->deleteAttribute(j);
-			}
-			GenerateCallGetHandle (strStaticContext);
-		}
-	}    
-}
-
-void InstrumentOmpParallelDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    SgCallStmt *fperf = NULL;
-    if (sym_dbg_before_parallel == NULL) sym_dbg_before_parallel = new SgSymbol (PROCEDURE_NAME, "dbg_before_parallel");
-    if (sym_dbg_after_parallel == NULL) sym_dbg_after_parallel = new SgSymbol (PROCEDURE_NAME, "dbg_after_parallel");
-    if (sym_dbg_parallel_event == NULL) sym_dbg_parallel_event = new SgSymbol (PROCEDURE_NAME, "dbg_parallel_event");
-    if (omp_debug == DPERF) {    
-        if (sym_dbg_interval_begin == NULL) sym_dbg_interval_begin = new SgSymbol (PROCEDURE_NAME, "dbg_interval_begin");
-        if (sym_dbg_interval_end == NULL) sym_dbg_interval_end = new SgSymbol (PROCEDURE_NAME, "dbg_interval_end");
-        if (sym_dbg_parallel_event_end == NULL) sym_dbg_parallel_event_end = new SgSymbol (PROCEDURE_NAME, "dbg_parallel_event_end");
-    }
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_parallel);
-    SgExprListExp *exp = isSgExprListExp (st->expr(0));
-    nArrHandleCount = 1;
-    int nNumThreads = 0;
-    int nIfExpr = 0;
-    if (exp != NULL) {
-        for (int i=0; i<exp->length (); i++) {
-            SgExpression *ex= exp->elem (i);
-            GenerateContextStringForClauses (ex, strStaticContext);
-            if (ex->variant () == OMP_NUM_THREADS){
-                nNumThreads = nArrHandleCount;
-                doOmpAssignStmt (ex->lhs(),st);
-                continue;
-            }
-            if (ex->variant () == OMP_IF) {
-                nIfExpr = nArrHandleCount;
-                doOmpAssignStmt (ex->lhs(),st);
-            }
-        }
-        SgExpression *expStatMPPrivate = new SgExpression (OMP_SHARED);
-        expStatMPPrivate->setLhs (*new SgExprListExp (*new SgVarRefExp(symStatMP)));
-        exp->append (*expStatMPPrivate);
-    }
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-	if (omp_debug == DPERF) {
-		fperf = new SgCallStmt(*sym_dbg_interval_begin);
-		fperf->addArg(*arrStaticRef);
-		fperf->addArg(*varThreadID);
-		fperf->addArg(*new SgValueExp (nArrStaticHandleCount));
-		fperf->addAttribute(DEBUG_STAT);
-	}
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    if (nNumThreads == 0) {
-        fe->addArg(*M1);
-    } else {
-        fe->addArg(*new SgArrayRefExp(*symDynMP,((nNumThreads==1)? *C1:*C2 )));
-    }
-    if (nIfExpr == 0) {
-        fe->addArg(*M1);
-    } else {
-        fe->addArg(*new SgArrayRefExp(*symDynMP,((nIfExpr==1)? *C1:*C2 )));
-    }
-    fe->addAttribute(DEBUG_STAT);
-    if (fperf != NULL) stat->insertStmtBefore(*fperf, *stat->controlParent());
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    fe = new SgCallStmt(*sym_dbg_parallel_event);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    stat=st->lastNodeOfStmt ();
-    if (omp_debug==DPERF) {
-        fe = new SgCallStmt(*sym_dbg_parallel_event_end);
-        fe->addArg(*arrStaticRef);
-        fe->addArg(*varThreadID);
-        fe->addAttribute(DEBUG_STAT);
-        stat->insertStmtBefore(*fe, *stat->controlParent());
-        fperf = new SgCallStmt(*sym_dbg_interval_end);
-        fperf->addArg(*arrStaticRef);
-        fperf->addArg(*varThreadID);
-        fperf->addArg(*new SgValueExp (nArrStaticHandleCount));
-        fperf->addAttribute(DEBUG_STAT);
-    }
-    fe = new SgCallStmt(*sym_dbg_after_parallel);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());
-    stat=stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    if (fperf != NULL) stat->insertStmtBefore(*fperf, *stat->controlParent());
-}
-
-void InstrumentOmpDoDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    SgForStmt *ForStat = isSgForStmt (st->lexNext ());
-    if (ForStat == NULL) {
-        (void)fprintf (stderr, "Error: Incorrect OpenMP loop in %s line %d\n", st->fileName(), st->lineNumber ());
-        exit (-1);
-    }
-    if (ForStat->hasLabel ()) {
-        SgStatement *tmp = new SgStatement (CONT_STAT);
-        tmp->setLabel (*ForStat->label ());
-        st->insertStmtBefore(*tmp, *st->controlParent());
-        BIF_LABEL(ForStat->thebif)=NULL;
-    }
-    if (sym_dbg_before_omp_loop == NULL) sym_dbg_before_omp_loop = new SgSymbol (PROCEDURE_NAME, "dbg_before_omp_loop");
-    if (sym_dbg_after_omp_loop == NULL) sym_dbg_after_omp_loop = new SgSymbol (PROCEDURE_NAME, "dbg_after_omp_loop");
-    if (sym_dbg_omp_loop_event == NULL) sym_dbg_omp_loop_event = new SgSymbol (PROCEDURE_NAME, "dbg_omp_loop_event");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_omp_loop);
-    SgExprListExp *exp = isSgExprListExp (st->expr(0));
-    nArrHandleCount = 1;
-    int nChunk = 0;
-    doOmpAssignStmt(ForStat->start(),st);
-    doOmpAssignStmt(ForStat->end(),st);
-    if (ForStat->step() != NULL) {
-        doOmpAssignStmt(ForStat->step(),st);
-    } else {
-        doOmpAssignStmt(C1,st);
-    }
-    if (exp != NULL) {
-        for (int i=0; i<exp->length (); i++) {
-            SgExpression *ex= exp->elem (i);
-            GenerateContextStringForClauses (ex, strStaticContext);
-            if (ex->variant () == OMP_SCHEDULE) {
-                if (ex->rhs () != NULL) {
-                    doOmpAssignStmt (ex->rhs(),st);
-                    nChunk = 1;
-                }
-            }
-        }
-    }
-    SgArrayRefExp **arrStaticRef = new (SgArrayRefExp *);
-    *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp ((omp_debug != DPERF) ? nArrStaticHandleCount : (nArrStaticHandleCount+1)));
-    fe->addArg(**arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addArg(*new SgArrayRefExp(*symDynMP,*C1));
-    fe->addArg(*new SgArrayRefExp(*symDynMP,*C2));
-    fe->addArg(*new SgArrayRefExp(*symDynMP,*C3));
-    if (nChunk == 0) {
-        fe->addArg(*M1);
-    } else {
-        fe->addArg(*new SgArrayRefExp(*symDynMP,*C4));
-    }
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    fe = new SgCallStmt(*sym_dbg_omp_loop_event);
-    fe->addArg(**arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addArg(*new SgVarRefExp (*ForStat->symbol ()));
-    SgArrayRefExp **StatContext =  new (SgArrayRefExp *);
-    StatContext = (SgArrayRefExp **)ForStat->symbol ()->attributeValue(0,STATIC_CONTEXT);
-    if (StatContext != NULL) {
-        fe->addArg(**StatContext);
-    }
-    stat=ForStat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    if (omp_debug!=DPERF){
-        stat->insertStmtBefore(*fe, *stat->controlParent());
-    }
-    fe = new SgCallStmt(*sym_dbg_after_omp_loop);
-    fe->addArg(**arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=GetLastStatementOfLoop (ForStat);
-    stat = stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    if (stat->variant () == OMP_END_DO_DIR) {
-        stat->lexNext ()->insertStmtBefore(*fe, *stat->controlParent());
-        exp = isSgExprListExp (stat->expr(0));
-        if (exp != NULL) {
-            for (int i=0; i<exp->length (); i++) {
-                GenerateContextStringForClauses (exp->elem (i), strStaticContext);
-            }
-        }
-        if (omp_debug == DPERF) {        
-            GenerateNowaitPlusBarrier (stat);
-        }        
-    } else {
-        stat->insertStmtBefore(*fe, *stat->controlParent());
-        if (omp_debug == DPERF) {
-            SgStatement *enddodir = new SgStatement (OMP_END_DO_DIR);
-            enddodir->setlineNumber (stat->lineNumber());
-            enddodir->addAttribute(DEBUG_STAT);
-            fe->insertStmtBefore(*enddodir,*stat->controlParent());
-            GenerateNowaitPlusBarrier (enddodir);            
-        }
-    }
-    sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());
-    ForStat->addAttribute (STATIC_CONTEXT, (void *)arrStaticRef, sizeof(SgArrayRefExp *));
-}
-
-void InstrumentSerialDoLoop (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    SgForStmt *ForStat = isSgForStmt(st);
-    if (ForStat->hasLabel ()) {
-        SgStatement *tmp = new SgStatement (CONT_STAT);
-        tmp->setLabel (*ForStat->label ());
-        st->insertStmtBefore(*tmp, *st->controlParent());
-        BIF_LABEL(ForStat->thebif)=NULL;
-    }
-    if (sym_dbg_before_loop == NULL) sym_dbg_before_loop = new SgSymbol (PROCEDURE_NAME, "dbg_before_loop");
-    if (sym_dbg_after_loop == NULL) sym_dbg_after_loop = new SgSymbol (PROCEDURE_NAME, "dbg_after_loop");
-    if (sym_dbg_loop_event == NULL) sym_dbg_loop_event = new SgSymbol (PROCEDURE_NAME, "dbg_loop_event");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_loop);
-    isSgExprListExp (st->expr(0));
-    nArrHandleCount = 1;
-    doOmpAssignStmt(ForStat->start(),st);
-    doOmpAssignStmt(ForStat->end(),st);
-    if (ForStat->step() != NULL) {
-        doOmpAssignStmt(ForStat->step(),st);
-    } else {
-        doOmpAssignStmt(C1,st);
-    }    
-    SgArrayRefExp **arrStaticRef = new (SgArrayRefExp *);
-    *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(**arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addArg(*new SgArrayRefExp(*symDynMP,*C1));
-    fe->addArg(*new SgArrayRefExp(*symDynMP,*C2));
-    fe->addArg(*new SgArrayRefExp(*symDynMP,*C3));
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    fe = new SgCallStmt(*sym_dbg_loop_event);
-    fe->addArg(**arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addArg(*new SgVarRefExp (*ForStat->symbol ()));
-    SgArrayRefExp **StatContext =  new (SgArrayRefExp *);
-    StatContext = (SgArrayRefExp **)ForStat->symbol ()->attributeValue(0,STATIC_CONTEXT);
-    if (StatContext != NULL) {
-        fe->addArg(**StatContext);
-    }
-    stat=ForStat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    fe = new SgCallStmt(*sym_dbg_after_loop);
-    fe->addArg(**arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=GetLastStatementOfLoop (ForStat);
-    sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());
-    stat = stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    ForStat->addAttribute (STATIC_CONTEXT, (void *)arrStaticRef, sizeof(SgArrayRefExp *));
-}
-
-void InstrumentOmpSingleDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    if (sym_dbg_before_single == NULL) sym_dbg_before_single = new SgSymbol (PROCEDURE_NAME, "dbg_before_single");
-    if (sym_dbg_after_single == NULL) sym_dbg_after_single = new SgSymbol (PROCEDURE_NAME, "dbg_after_single");
-    if (sym_dbg_single_event == NULL) sym_dbg_single_event = new SgSymbol (PROCEDURE_NAME, "dbg_single_event");
-    if (omp_debug == DPERF) {
-        if (sym_dbg_single_event_end == NULL) sym_dbg_single_event_end = new SgSymbol (PROCEDURE_NAME, "dbg_single_event_end");
-    }
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_single);
-    SgExprListExp *exp = isSgExprListExp (st->expr(0));
-    nArrHandleCount = 1;
-    if (exp != NULL) {
-        for (int i=0; i<exp->length (); i++) {
-            SgExpression *ex= exp->elem (i);
-            GenerateContextStringForClauses (ex, strStaticContext);
-        }
-    }
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp ((omp_debug != DPERF) ? nArrStaticHandleCount : (nArrStaticHandleCount+1)));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    fe = new SgCallStmt(*sym_dbg_single_event);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());        
-    stat=st->lastNodeOfStmt ();        
-    if (omp_debug == DPERF) {            
-        fe = new SgCallStmt(*sym_dbg_single_event_end);
-        fe->addArg(*arrStaticRef);    
-        fe->addArg(*varThreadID);
-        stat->insertStmtBefore(*fe, *stat->controlParent());
-        fe->addAttribute(DEBUG_STAT);
-    }
-    fe = new SgCallStmt(*sym_dbg_after_single);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    exp = isSgExprListExp (stat->expr(0));    
-    if (exp != NULL) {
-        for (int i=0; i<exp->length (); i++) {
-            SgExpression *ex= exp->elem (i);
-            GenerateContextStringForClauses (ex, strStaticContext);
-        }
-    }
-    sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());        
-    stat=stat->lexNext ();
-    if (omp_debug == DPERF) {        
-        GenerateNowaitPlusBarrier (stat->lexPrev());
-    }           
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-}
-
-SgStatement *GetLastStatementOfLoop (SgStatement *forst) {
-    SgStatement *st, *res=NULL;
-    int lbl=-1;
-    if (forst->thebif->entry.for_node.doend !=NULL)
-        lbl=forst->thebif->entry.for_node.doend->stateno;
-    if (forst != NULL){
-        res = forst->lastNodeOfStmt ();
-    }    
-    if (res->variant () == CONTROL_END) {        
-        return res;
-    }
-    for (st=res;st; st=st->lexNext()) {
-        if (st->variant() == CONT_STAT) {
-            if (lbl != 0) {                
-                if (st->hasLabel()) {
-                    if (st->label()->thelabel->stateno == lbl) {
-                        return st;
-                    }
-                }
-            }
-        }
-        if (st->variant() == CONTROL_END) {
-            if (st->controlParent() == forst) {                
-                return st;
-            }
-        }
-    } 
-    return res;
-}
-
-void InstrumentOmpCriticalDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    if (sym_dbg_before_critical == NULL) sym_dbg_before_critical = new SgSymbol (PROCEDURE_NAME, "dbg_before_critical");
-    if (sym_dbg_after_critical == NULL) sym_dbg_after_critical = new SgSymbol (PROCEDURE_NAME, "dbg_after_critical");
-    if (sym_dbg_critical_event == NULL) sym_dbg_critical_event = new SgSymbol (PROCEDURE_NAME, "dbg_critical_event");
-    if (omp_debug == DPERF) {
-        if (sym_dbg_critical_event_end == NULL) sym_dbg_critical_event_end = new SgSymbol (PROCEDURE_NAME, "dbg_critical_event_end");
-    }
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_critical);    
-    nArrHandleCount = 1;
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    fe = new SgCallStmt(*sym_dbg_critical_event);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    stat=st->lastNodeOfStmt ();
-    if (omp_debug==DPERF) {
-        fe = new SgCallStmt(*sym_dbg_critical_event_end);    
-        fe->addArg(*arrStaticRef);    
-        fe->addArg(*varThreadID);
-        fe->addAttribute(DEBUG_STAT);
-        stat->insertStmtBefore(*fe, *stat->controlParent());
-    }
-    fe = new SgCallStmt(*sym_dbg_after_critical);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    if (st->expr(0)!= NULL) {
-        sprintf(strStaticContext,"%s*name1=%s*line2=%d",strStaticContext,UnparseExpr (st->expr(0)),stat->lineNumber());
-    } else {
-        sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());
-    }
-    stat=stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-}
-
-void InstrumentOmpOrderelDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    if (sym_dbg_before_ordered == NULL) sym_dbg_before_ordered = new SgSymbol (PROCEDURE_NAME, "dbg_before_ordered");
-    if (sym_dbg_after_ordered == NULL) sym_dbg_after_ordered = new SgSymbol (PROCEDURE_NAME, "dbg_after_ordered");
-    if (sym_dbg_ordered_event == NULL) sym_dbg_ordered_event = new SgSymbol (PROCEDURE_NAME, "dbg_ordered_event");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_ordered);    
-    nArrHandleCount = 1;
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    fe = new SgCallStmt(*sym_dbg_ordered_event);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    fe = new SgCallStmt(*sym_dbg_after_ordered);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=st->lastNodeOfStmt ();
-    sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());
-    stat=stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-}
-
-void InstrumentOmpMasterDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st->lexNext ();
-    if (sym_dbg_master_begin == NULL) sym_dbg_master_begin = new SgSymbol (PROCEDURE_NAME, "dbg_master_begin");
-    if (sym_dbg_master_end == NULL) sym_dbg_master_end = new SgSymbol (PROCEDURE_NAME, "dbg_master_end");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_master_begin);    
-    nArrHandleCount = 1;
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *st);
-    fe = new SgCallStmt(*sym_dbg_master_end);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);    
-    stat=st->lastNodeOfStmt ();
-    stat->insertStmtBefore(*fe, *st);
-    sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());
-}
-
-void InstrumentOmpBarrierDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st->lexNext ();
-    if (sym_dbg_before_barrier == NULL) sym_dbg_before_barrier = new SgSymbol (PROCEDURE_NAME, "dbg_before_barrier");
-    if (sym_dbg_after_barrier == NULL) sym_dbg_after_barrier = new SgSymbol (PROCEDURE_NAME, "dbg_after_barrier");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_barrier);    
-    nArrHandleCount = 1;
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    st->insertStmtBefore(*fe, *st->controlParent());
-    fe = new SgCallStmt(*sym_dbg_after_barrier);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *st->controlParent());
-}
-
-void InstrumentOmpFlushDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    if (sym_dbg_flush_event == NULL) sym_dbg_flush_event = new SgSymbol (PROCEDURE_NAME, "dbg_flush_event");
-    if (omp_debug == DPERF){
-        if (sym_dbg_before_flush == NULL) sym_dbg_before_flush = new SgSymbol (PROCEDURE_NAME, "dbg_before_flush");
-    }
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    SgCallStmt *fe = NULL;
-    if (omp_debug == DPERF){    
-        fe = new SgCallStmt(*sym_dbg_before_flush);
-        fe->addArg(*arrStaticRef);    
-        fe->addArg(*varThreadID);    
-        fe->addAttribute(DEBUG_STAT);    
-        stat->insertStmtBefore(*fe, *st->controlParent());
-    }
-    fe = new SgCallStmt(*sym_dbg_flush_event);    
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat = st->lexNext ();
-    if (st->expr(0)!= NULL) {
-        sprintf(strStaticContext,"%s*name1=%s",strStaticContext,UnparseExpr (st->expr(0)));
-    }
-    stat->insertStmtBefore(*fe, *st->controlParent());    
-}
-
-void InstrumentIOStmt (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    if (sym_dbg_before_io == NULL) sym_dbg_before_io = new SgSymbol (PROCEDURE_NAME, "dbg_before_io");
-    if (sym_dbg_after_io == NULL) sym_dbg_after_io = new SgSymbol (PROCEDURE_NAME, "dbg_after_io");
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    SgCallStmt *fe = NULL;
-    fe = new SgCallStmt(*sym_dbg_before_io);
-    fe->addArg(*arrStaticRef);    
-    fe->addArg(*varThreadID);    
-    fe->addAttribute(DEBUG_STAT);    
-    stat->insertStmtBefore(*fe, *st->controlParent());
-    fe = new SgCallStmt(*sym_dbg_after_io);    
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat = st->lexNext ();
-    stat->insertStmtBefore(*fe, *st->controlParent());    
-}
-
-void InstrumentIntervalDir (SgStatement *bst, SgStatement *st, char *strStaticContext){
-    SgStatement *stat = bst;
-    if (sym_dbg_interval_begin == NULL) sym_dbg_interval_begin = new SgSymbol (PROCEDURE_NAME, "dbg_interval_begin");
-    if (sym_dbg_interval_end == NULL) sym_dbg_interval_end = new SgSymbol (PROCEDURE_NAME, "dbg_interval_end");
-	SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    SgCallStmt *fe = NULL;
-    fe = new SgCallStmt(*sym_dbg_interval_begin);
-    fe->addArg(*arrStaticRef);    
-    fe->addArg(*varThreadID);    
-    fe->addArg(*new SgValueExp (INTERVAL_NUMBER));
-    fe->addAttribute(DEBUG_STAT);    
-    stat->insertStmtBefore(*fe, *bst->controlParent());
-    stat = st;
-	sprintf(strStaticContext,"%s*line2=%d",strStaticContext,st->lineNumber());
-    fe = new SgCallStmt(*sym_dbg_interval_end);
-    fe->addArg(*arrStaticRef);    
-    fe->addArg(*varThreadID);    
-    fe->addArg(*new SgValueExp (INTERVAL_NUMBER));
-    fe->addAttribute(DEBUG_STAT);    
-    stat->insertStmtBefore(*fe, *st->controlParent());
-}
-
-void InstrumentOmpThreadPrivateDir (SgStatement *st, SgStatement *before, char *strStaticContext) {    
-    if (sym_dbg_threadprivate == NULL) sym_dbg_threadprivate = new SgSymbol (PROCEDURE_NAME, "dbg_threadprivate");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_threadprivate);    
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    if (st->expr(0)!= NULL) {
-        sprintf(strStaticContext,"%s*name1=%s",strStaticContext,UnparseExpr (st->expr(0)));
-    }
-    before->insertStmtBefore(*fe, *before->controlParent());    
-}
-
-void InstrumentOmpSectionsDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    if (sym_dbg_before_sections == NULL) sym_dbg_before_sections = new SgSymbol (PROCEDURE_NAME, "dbg_before_sections");
-    if (sym_dbg_after_sections == NULL) sym_dbg_after_sections = new SgSymbol (PROCEDURE_NAME, "dbg_after_sections");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_sections);
-    SgExprListExp *exp = isSgExprListExp (st->expr(0));
-    nArrHandleCount = 1;
-    if (exp != NULL) {
-        for (int i=0; i<exp->length (); i++) {
-            SgExpression *ex= exp->elem (i);
-            GenerateContextStringForClauses (ex, strStaticContext);
-        }
-    }
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp ((omp_debug != DPERF) ? nArrStaticHandleCount : (nArrStaticHandleCount+1)));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());    
-    fe = new SgCallStmt(*sym_dbg_after_sections);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=st->lastNodeOfStmt ();
-    /*exp = isSgExprListExp (stat->expr(0));    
-    if (exp != NULL) {
-        for (int i=0; i<exp->length (); i++) {
-            SgExpression *ex= exp->elem (i);
-            GenerateContextStringForClauses (ex, strStaticContext);
-        }
-    }
-    sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());*/
-    stat=stat->lexNext ();
-    if (omp_debug == DPERF) {        
-        GenerateNowaitPlusBarrier (stat->lexPrev());
-    }           
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-}
-
-void InstrumentOmpSectionDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st->lexNext ();
-    if (sym_dbg_section_event == NULL) sym_dbg_section_event = new SgSymbol (PROCEDURE_NAME, "dbg_section_event");
-    if (omp_debug == DPERF) {    
-        if (sym_dbg_section_event_end == NULL) sym_dbg_section_event_end = new SgSymbol (PROCEDURE_NAME, "dbg_section_event_end");
-    }
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_section_event);
-    nArrHandleCount = 1;
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());    
-    stat=st->lastNodeOfStmt ();        
-    if (omp_debug == DPERF) {            
-        fe = new SgCallStmt(*sym_dbg_section_event_end);
-        fe->addArg(*arrStaticRef); 
-        fe->addArg(*varThreadID);    
-        fe->addAttribute(DEBUG_STAT);    
-        stat->insertStmtBefore(*fe, *stat->controlParent());        
-    }
-    sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());    
-}
-void InstrumentExitStmt (SgStatement *stat) {
-    if (sym_dbg_finalize == NULL) sym_dbg_finalize = new SgSymbol(PROCEDURE_NAME, "dbg_finalize");
-    SgCallStmt *finalize = new SgCallStmt(*sym_dbg_finalize);
-    finalize->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore (*finalize, *stat->controlParent());
-}
-
-void InstrumentOmpWorkshareDir (SgStatement *st, char *strStaticContext){
-    SgStatement *stat = st;
-    if (sym_dbg_before_workshare == NULL) sym_dbg_before_workshare = new SgSymbol (PROCEDURE_NAME, "dbg_before_workshare");
-    if (sym_dbg_after_workshare == NULL) sym_dbg_after_workshare = new SgSymbol (PROCEDURE_NAME, "dbg_after_workshare");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_workshare);    
-    nArrHandleCount = 1;
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp ((omp_debug != DPERF) ? nArrStaticHandleCount : (nArrStaticHandleCount+1)));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());    
-    fe = new SgCallStmt(*sym_dbg_after_workshare);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=st->lastNodeOfStmt ();
-    SgExprListExp *exp = isSgExprListExp (stat->expr(0));    
-    if (exp != NULL) {
-        for (int i=0; i<exp->length (); i++) {
-            SgExpression *ex= exp->elem (i);
-            GenerateContextStringForClauses (ex, strStaticContext);
-        }
-    }
-    sprintf(strStaticContext,"%s*line2=%d",strStaticContext,stat->lineNumber());
-    stat=stat->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    if (omp_debug == DPERF) {        
-        GenerateNowaitPlusBarrier (stat->lexPrev());
-    }           
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-}
-
-void SearchVarAndArrayInExpression(SgStatement *st, SgExpression *exp, SgArrayRefExp *var) {
-	if (exp == NULL) return;
-	switch (exp->variant()) {
-	case INT_VAL:
-	case LABEL_REF:
-	case FLOAT_VAL:
-	case DOUBLE_VAL:
-	case STMT_STR:
-	case STRING_VAL:
-	case COMPLEX_VAL:
-	case KEYWORD_VAL:
-	case KEYWORD_ARG:
-	case BOOL_VAL:
-	case CHAR_VAL:
-	case CONST_REF:
-	case ENUM_REF:
-	case TYPE_REF:
-	case INTERFACE_REF:
-    case DEFAULT:
-	case DEF_CHOICE	:
-	case SEQ:
-	case SPEC_PAIR:
-	case ACCESS:
-	case IOACCESS:
-    case OVERLOADED_CALL:
-    case ORDERED_OP:
-	case EXTEND_OP:
-	case PARAMETER_OP:
-	case PUBLIC_OP:
-	case PRIVATE_OP:
-	case ALLOCATABLE_OP:
-	case EXTERNAL_OP:
-	case OPTIONAL_OP:
-	case IN_OP:
-	case OUT_OP:
-	case INOUT_OP:
-	case INTRINSIC_OP:
-	case POINTER_OP:
-	case SAVE_OP:
-	case TARGET_OP:
-    case STAR_RANGE:
-	case VARIABLE_NAME:
-		break;
-	case VAR_REF:
-        InstrumentReadVar (st, exp, var);
-		break;
-	case ARRAY_REF:
-        if (exp->symbol ()->type()->variant () == T_ARRAY) {
-            InstrumentReadArray (st, exp, var); 
-        } else {
-            InstrumentReadVar (st, exp, var); /*��� character**/
-        }
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case ARRAY_OP:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		SearchVarAndArrayInExpression(st,exp->rhs (),var);
-		break;
-	case RECORD_REF:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		SearchVarAndArrayInExpression(st,exp->rhs (),var);
-		break;
-	case STRUCTURE_CONSTRUCTOR:
-	case CONSTRUCTOR_REF:
-	case ACCESS_REF:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case CONS:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		SearchVarAndArrayInExpression(st,exp->rhs (),var);
-		break;
-	case PROC_CALL:
-	case FUNC_CALL:
-		InstrumentFuncCall(st,exp);
-		//SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case EXPR_LIST:
-	case EQUI_LIST:
-	case COMM_LIST:
-	case NAMELIST_LIST:
-	case VAR_LIST:
-	case RANGE_LIST:
-	case CONTROL_LIST:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		SearchVarAndArrayInExpression(st,exp->rhs (),var);
-		break;
-	case DDOT:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		SearchVarAndArrayInExpression(st,exp->rhs (),var);
-		break;
-	case EQ_OP:
-	case LT_OP:
-	case GT_OP:
-	case NOTEQL_OP:
-	case LTEQL_OP:
-	case GTEQL_OP:
-	case ADD_OP:
-	case SUBT_OP:
-	case OR_OP:
-	case MULT_OP:
-	case DIV_OP:
-	case MOD_OP:
-	case AND_OP:
-	case EXP_OP:
-	case EQV_OP:
-	case NEQV_OP:
-	case XOR_OP:
-	case CONCAT_OP: {
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		SearchVarAndArrayInExpression(st,exp->rhs (),var);
-		break;
-	}
-	case MINUS_OP:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case UNARY_ADD_OP:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case NOT_OP:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case PAREN_OP:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case ASSGN_OP:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case IMPL_TYPE:
-		if (exp->lhs () != NULL)
-		{
-		     SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		}
-		break;
-	case MAXPARALLEL_OP:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case DIMENSION_OP:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case LEN_OP:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case TYPE_OP:
-		break;
-	case ONLY_NODE:
-		if (exp->lhs ()) SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case DEREF_OP:
-	        SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		break;
-	case RENAME_NODE:
-		SearchVarAndArrayInExpression(st,exp->lhs (),var);
-		SearchVarAndArrayInExpression(st,exp->rhs (),var);
-		break;
-	default:
-		fprintf(stderr,"SearchVarAndArrayInExpression -- bad llnd ptr %d!\n",exp->variant());
-		break;
-	}
-}
-
-void InstrumentAssignStat (SgStatement *st, char *strStaticContext) {
-    SgExpression *exp = st->expr (0);
-    SgStatement *stat=st;
-    if ((exp->variant () != ARRAY_REF)&&(exp->variant () != VAR_REF)) return;
-    SgArrayRefExp **StatContext =  new (SgArrayRefExp *);
-    StatContext = (SgArrayRefExp **)exp->symbol ()->attributeValue(0,STATIC_CONTEXT);
-    if (StatContext == NULL) return;
-    if (sym_dbg_write_var_begin == NULL) sym_dbg_write_var_begin = new SgSymbol (PROCEDURE_NAME, "dbg_write_var_begin");
-    if (sym_dbg_write_arr_begin == NULL) sym_dbg_write_arr_begin = new SgSymbol (PROCEDURE_NAME, "dbg_write_arr_begin");
-    if (sym_dbg_write_arr_end == NULL) sym_dbg_write_arr_end = new SgSymbol (PROCEDURE_NAME, "dbg_write_arr_end");
-    if (sym_dbg_write_var_end == NULL) sym_dbg_write_var_end = new SgSymbol (PROCEDURE_NAME, "dbg_write_var_end");
-    if (sym_dbg_read_arr == NULL) sym_dbg_read_arr = new SgSymbol (PROCEDURE_NAME, "dbg_read_arr");
-    if (sym_dbg_read_var == NULL) sym_dbg_read_var = new SgSymbol (PROCEDURE_NAME, "dbg_read_var");
-    int isArray = (exp->variant () == ARRAY_REF) ? (exp->symbol ()->type()->variant () == T_ARRAY) : 0;    
-    SgCallStmt *fe = new SgCallStmt((isArray ? *sym_dbg_write_arr_begin : *sym_dbg_write_var_begin));
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addArg(*exp);
-    fe->addArg(**StatContext);
-    SgExpression **arrFirstElement = NULL;
-    if (isArray) {
-        arrFirstElement = new (SgExpression *);
-        arrFirstElement = (SgExpression **)exp->symbol ()->attributeValue(0,FIRST_ELEM);
-        if (arrFirstElement != NULL) fe->addArg(**arrFirstElement);
-    }
-    fe->addAttribute(DEBUG_STAT);
-    st->insertStmtBefore(*fe, *st->controlParent());
-    fe = new SgCallStmt((isArray ? *sym_dbg_write_arr_end : *sym_dbg_write_var_end));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addArg(*exp);
-    fe->addArg(**StatContext);
-    if (isArray) {
-        if (arrFirstElement != NULL) fe->addArg(**arrFirstElement);
-    }
-    stat=st->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-	GenerateCallGetHandle (strStaticContext);
-	if (st->expr(0)->lhs ()) {
-        SearchVarAndArrayInExpression (st, st->expr(0)->lhs(),arrStaticRef);
-    }
-    if (st->expr(1)) {
-        SearchVarAndArrayInExpression (st, st->expr(1),arrStaticRef);
-    }
-}
-
-void InstrumentIfStat (SgStatement *st, char *strStaticContext) {
-	SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-	if (sym_dbg_read_arr == NULL) sym_dbg_read_arr = new SgSymbol (PROCEDURE_NAME, "dbg_read_arr");
-	if (sym_dbg_read_var == NULL) sym_dbg_read_var = new SgSymbol (PROCEDURE_NAME, "dbg_read_var");
-	SearchVarAndArrayInExpression (st, st->expr(0),arrStaticRef);
-}
-
-void InstrumentProcStat (SgStatement *st, char *strStaticContext) {
-    //SgExpression *exp = st->expr (0);
-    SgStatement *stat=st;
-    SgCallStmt *f = isSgCallStmt (st);
-    if (f == NULL) return;
-    if (sym_dbg_before_funcall == NULL) sym_dbg_before_funcall = new SgSymbol (PROCEDURE_NAME, "dbg_before_funcall");
-    if (sym_dbg_after_funcall == NULL) sym_dbg_after_funcall = new SgSymbol (PROCEDURE_NAME, "dbg_after_funcall");
-    if (sym_dbg_funcparvar == NULL) sym_dbg_funcparvar = new SgSymbol (PROCEDURE_NAME, "dbg_funcparvar");
-    if (sym_dbg_funcpararr == NULL) sym_dbg_funcpararr = new SgSymbol (PROCEDURE_NAME, "dbg_funcpararr");    
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_funcall);
-    sprintf(strStaticContext,"%s*name1=%s*rank=%d",strStaticContext,stat->symbol ()->identifier (),f->numberOfArgs());
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    st->insertStmtBefore(*fe, *st->controlParent());    
-    fe = new SgCallStmt(*sym_dbg_after_funcall);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=st->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    stat = fe;	
-    for (int i=0; i<f->numberOfArgs(); i++) {
-        SgExpression *par = f->arg(i);
-        if ((par->variant () != ARRAY_REF)&&(par->variant () != VAR_REF)) continue;
-        SgArrayRefExp **StatContext =  new (SgArrayRefExp *);
-        StatContext = (SgArrayRefExp **)par->symbol ()->attributeValue(0,STATIC_CONTEXT);
-        if (StatContext == NULL) continue;
-        int isArray = (par->variant () == ARRAY_REF) ? (par->symbol ()->type()->variant () == T_ARRAY) : 0;
-        fe = new SgCallStmt((isArray ? *sym_dbg_funcpararr : *sym_dbg_funcparvar));
-        fe->addArg(*arrStaticRef);
-        fe->addArg(*varThreadID);
-        fe->addArg(*new SgValueExp(i+1));
-        fe->addArg(*par);
-        fe->addArg(**StatContext);
-        if (isArray) {
-            SgExpression **arrFirstElement = new (SgExpression *);
-            arrFirstElement = (SgExpression **)par->symbol ()->attributeValue(0,FIRST_ELEM);
-            if (arrFirstElement != NULL) fe->addArg(**arrFirstElement);
-        }
-        fe->addArg(*C1);
-        fe->addAttribute(DEBUG_STAT);
-        st->insertStmtBefore(*fe, *st->controlParent());
-        SgStatement *after = fe->copyPtr ();
-        after->addAttribute(DEBUG_STAT);
-        stat->insertStmtBefore(*after, *stat->controlParent());
-    }
-}
-
-void InstrumentFuncCall (SgStatement *st, SgExpression *exp) {
-    SgStatement *stat=st;
-    SgFunctionCallExp *f = isSgFunctionCallExp (exp);
-	if (omp_debug<D2) return;
-    if (f == NULL) return;
-	char *strStaticContext = new char [MaxContextBufferLength];
-	memset(strStaticContext, 0, MaxContextBufferLength);
-	strcat(strStaticContext,"*type=func_call");                            
-	GenerateFileAndLine (stat, strStaticContext);	
-	sprintf(strStaticContext,"%s*name1=%s*rank=%d",strStaticContext,f->funName()->identifier (),f->numberOfArgs());
-	GenerateCallGetHandle (strStaticContext);
-	if (sym_dbg_before_funcall == NULL) sym_dbg_before_funcall = new SgSymbol (PROCEDURE_NAME, "dbg_before_funcall");
-    if (sym_dbg_after_funcall == NULL) sym_dbg_after_funcall = new SgSymbol (PROCEDURE_NAME, "dbg_after_funcall");
-    if (sym_dbg_funcparvar == NULL) sym_dbg_funcparvar = new SgSymbol (PROCEDURE_NAME, "dbg_funcparvar");
-    if (sym_dbg_funcpararr == NULL) sym_dbg_funcpararr = new SgSymbol (PROCEDURE_NAME, "dbg_funcpararr");    
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_before_funcall);
-    SgArrayRefExp *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount-1));
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    st->insertStmtBefore(*fe, *st->controlParent());    
-    fe = new SgCallStmt(*sym_dbg_after_funcall);
-    fe->addArg(*arrStaticRef);
-    fe->addArg(*varThreadID);
-    stat=st->lexNext ();
-    fe->addAttribute(DEBUG_STAT);
-    stat->insertStmtBefore(*fe, *stat->controlParent());
-    stat = fe;
-    for (int i=0; i<f->numberOfArgs(); i++) {
-        SgExpression *par = f->arg(i);
-        if ((par->variant () != ARRAY_REF)&&(par->variant () != VAR_REF)) continue;
-        SgArrayRefExp **StatContext =  new (SgArrayRefExp *);
-        StatContext = (SgArrayRefExp **)par->symbol ()->attributeValue(0,STATIC_CONTEXT);
-        if (StatContext == NULL) continue;
-        int isArray = (par->variant () == ARRAY_REF) ? (par->symbol ()->type()->variant () == T_ARRAY) : 0;
-        fe = new SgCallStmt((isArray ? *sym_dbg_funcpararr : *sym_dbg_funcparvar));
-        fe->addArg(*arrStaticRef);
-        fe->addArg(*varThreadID);
-        fe->addArg(*new SgValueExp(i+1));
-        fe->addArg(*par);
-        fe->addArg(**StatContext);
-        if (isArray) {
-            SgExpression **arrFirstElement = new (SgExpression *);
-            arrFirstElement = (SgExpression **)par->symbol ()->attributeValue(0,FIRST_ELEM);
-            if (arrFirstElement != NULL) fe->addArg(**arrFirstElement);
-        }
-        fe->addArg(*C1);
-        fe->addAttribute(DEBUG_STAT);
-        st->insertStmtBefore(*fe, *st->controlParent());
-        SgStatement *after = fe->copyPtr ();
-        after->addAttribute(DEBUG_STAT);
-        stat->insertStmtBefore(*after, *stat->controlParent());
-    }
-}
-
-
-void InstrumentFunctionBegin (SgStatement *st, char *strStaticContext, SgStatement *func) {
-    //SgExpression *exp = st->expr (0);
-    SgStatement *stat=st->lexNext ();
-    if (sym_dbg_funcbegin == NULL) sym_dbg_funcbegin = new SgSymbol (PROCEDURE_NAME, "dbg_funcbegin");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_funcbegin);
-    if ((func->variant () == PROC_HEDR) || (func->variant () == FUNC_HEDR)) {
-        SgFunctionSymb *funcsym = isSgFunctionSymb (func->symbol ());        
-        if (funcsym == NULL) return;
-        if (func->variant () == FUNC_HEDR)
-            sprintf(strStaticContext,"%s*file=%s*line1=%d*line2=%d*name1=%s*vtype=%d*rank=%d",strStaticContext,func->fileName (),func->lineNumber(),func->lastNodeOfStmt()->lineNumber(),func->symbol ()->identifier (),VarType(funcsym),funcsym->numberOfParameters());
-        else
-            sprintf(strStaticContext,"%s*file=%s*line1=%d*line2=%d*name1=%s*rank=%d",strStaticContext,func->fileName (),func->lineNumber(),func->lastNodeOfStmt()->lineNumber(),func->symbol ()->identifier (),funcsym->numberOfParameters());
-        SgArrayRefExp **arrStaticRef = new (SgArrayRefExp *);
-        *arrStaticRef = new SgArrayRefExp(*symStatMP,*new SgValueExp (nArrStaticHandleCount));
-        func->symbol()->addAttribute (STATIC_CONTEXT, (void *)arrStaticRef, sizeof(SgArrayRefExp *));
-        fe->addArg(**arrStaticRef);
-        fe->addArg(*varThreadID);
-        fe->addAttribute(DEBUG_STAT);
-        stat->insertStmtBefore(*fe, *stat->controlParent());
-    }
-}
-
-void InstrumentFunctionEnd (SgStatement *st, SgStatement *func) {
-    if (sym_dbg_funcend == NULL) sym_dbg_funcend = new SgSymbol (PROCEDURE_NAME, "dbg_funcend");
-    SgCallStmt *fe = new SgCallStmt(*sym_dbg_funcend);
-    SgArrayRefExp **StatContext =  new (SgArrayRefExp *);
-    StatContext = (SgArrayRefExp **)func->symbol ()->attributeValue(0,STATIC_CONTEXT);
-    if (StatContext == NULL) return;
-    fe->addArg(**StatContext);
-    fe->addArg(*varThreadID);
-    fe->addAttribute(DEBUG_STAT);
-    st->insertStmtBefore(*fe, *st->controlParent());
-}
-
-
-void InstrumentReadVar (SgStatement *st, SgExpression *exp, SgArrayRefExp *var) {
-    if (InArrayRefList (exp)) return;
-    SgArrayRefExp **StatContext = new (SgArrayRefExp *);
-    StatContext = ((SgArrayRefExp **)exp->symbol ()->attributeValue(0,STATIC_CONTEXT));
-    if (*StatContext != NULL) {
-        SgCallStmt *fe = new SgCallStmt(*sym_dbg_read_var);
-        fe->addArg(*var);
-        fe->addArg(*varThreadID);
-        fe->addArg(*exp);
-        fe->addArg(**StatContext);
-        fe->addAttribute(DEBUG_STAT);
-        st->insertStmtBefore(*fe, *st->controlParent());
-        IntoArrayRefList (exp);
-    }
-}
-
-void InstrumentReadArray (SgStatement *st, SgExpression *exp, SgArrayRefExp *var) {
-    if (InArrayRefList (exp)) return;
-    SgArrayRefExp **StatContext = new (SgArrayRefExp *);
-    StatContext = (SgArrayRefExp **)exp->symbol ()->attributeValue(0,STATIC_CONTEXT);
-    if (*StatContext != NULL) {        
-        SgExpression **arrFirstElement = new (SgExpression *);
-        arrFirstElement = (SgExpression **)exp->symbol ()->attributeValue(0,FIRST_ELEM);
-        if ((arrFirstElement != NULL) && (*arrFirstElement != NULL)) {
-            SgCallStmt *fe = new SgCallStmt(*sym_dbg_read_arr);
-            fe->addArg(*var);
-            fe->addArg(*varThreadID);
-            fe->addArg(*exp);
-            fe->addArg(**StatContext);            
-            fe->addArg(**arrFirstElement);
-            fe->addAttribute(DEBUG_STAT);
-            st->insertStmtBefore(*fe, *st->controlParent());
-            IntoArrayRefList (exp);
-        }
-    }
-}
-
-void FindExternalProcedures (SgStatement *stat) {
-        if (stat->variant () == EXTERN_STAT) {
-            SgExprListExp *list = isSgExprListExp(stat->expr(0));  
-            for (int i=0; i< list->length ();i++) {
-                SgSymbol *sym=list->elem (i)->symbol ();
-                char *str=sym->identifier ();
-                if (!strcmp (str,"dbg_finalize")) {
-                    sym_dbg_finalize = sym;
-                    sym_dbg_finalize->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_init")) {
-                    sym_dbg_init = sym;
-                    sym_dbg_init->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_get_handle")) {
-                    sym_dbg_get_handle = sym;
-                    sym_dbg_get_handle->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-				if (!strcmp (str,"dbg_regarr")) {
-					sym_dbg_regarr = sym;
-					sym_dbg_regarr->addAttribute (DECLARED_FUNC);
-					continue;		
-				}
-				if (!strcmp (str,"dbg_unregarr")) {
-					sym_dbg_unregarr = sym;
-					sym_dbg_unregarr->addAttribute (DECLARED_FUNC);
-					continue;		
-				}
-                if (!strcmp (str,"dbg_regvar")) {
-                    sym_dbg_regvar = sym;
-                    sym_dbg_regvar->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_parallel")) {
-                    sym_dbg_before_parallel = sym;
-                    sym_dbg_before_parallel->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_parallel")) {
-                    sym_dbg_after_parallel = sym;
-                    sym_dbg_after_parallel->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_parallel_event")) {
-                    sym_dbg_parallel_event = sym;
-                    sym_dbg_parallel_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_parallel_event_end")) {
-                    sym_dbg_parallel_event_end = sym;
-                    sym_dbg_parallel_event_end->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_omp_loop")) {
-                    sym_dbg_before_omp_loop = sym;
-                    sym_dbg_before_omp_loop->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_omp_loop")) {
-                    sym_dbg_after_omp_loop = sym;
-                    sym_dbg_after_omp_loop->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_omp_loop_event")) {
-                    sym_dbg_omp_loop_event = sym;
-                    sym_dbg_omp_loop_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_loop")) {
-                    sym_dbg_before_loop = sym;
-                    sym_dbg_before_loop->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_loop")) {
-                    sym_dbg_after_loop = sym;
-                    sym_dbg_after_loop->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_loop_event")) {
-                    sym_dbg_loop_event = sym;
-                    sym_dbg_loop_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_write_var_begin")) {
-                    sym_dbg_write_var_begin = sym;
-                    sym_dbg_write_var_begin->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_write_arr_begin")) {
-                    sym_dbg_write_arr_begin = sym;
-                    sym_dbg_write_arr_begin->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_write_var_end")) {
-                    sym_dbg_write_var_end = sym;
-                    sym_dbg_write_var_end->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_write_arr_end")) {
-                    sym_dbg_write_arr_end = sym;
-                    sym_dbg_write_arr_end->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_read_arr")) {
-                    sym_dbg_read_arr = sym;
-                    sym_dbg_read_arr->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_read_var")) {
-                    sym_dbg_read_var = sym;
-                    sym_dbg_read_var->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_regpararr")) {
-                    sym_dbg_regpararr = sym;
-                    sym_dbg_regpararr->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_regparvar")) {
-                    sym_dbg_regparvar = sym;
-                    sym_dbg_regparvar->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_regcommon")) {
-                    sym_dbg_regcommon = sym;
-                    sym_dbg_regcommon->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_sections")) {
-                    sym_dbg_before_sections = sym;
-                    sym_dbg_before_sections->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_sections")) {
-                    sym_dbg_after_sections = sym;
-                    sym_dbg_after_sections->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_section_event")) {
-                    sym_dbg_section_event = sym;
-                    sym_dbg_section_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_section_event_end")) {
-                    sym_dbg_section_event_end = sym;
-                    sym_dbg_section_event_end->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_single")) {
-                    sym_dbg_before_single = sym;
-                    sym_dbg_before_single->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_single_event")) {
-                    sym_dbg_single_event = sym;
-                    sym_dbg_single_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_single_event_end")) {
-                    sym_dbg_single_event_end = sym;
-                    sym_dbg_single_event_end->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_single")) {
-                    sym_dbg_after_single = sym;
-                    sym_dbg_after_single->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_workshare")) {
-                    sym_dbg_before_workshare = sym;
-                    sym_dbg_before_workshare->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_workshare")) {
-                    sym_dbg_after_workshare = sym;
-                    sym_dbg_after_workshare->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_master_begin")) {
-                    sym_dbg_master_begin = sym;
-                    sym_dbg_master_begin->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_master_end")) {
-                    sym_dbg_master_end = sym;
-                    sym_dbg_master_end->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_critical")) {
-                    sym_dbg_before_critical = sym;
-                    sym_dbg_before_critical->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_critical_event")) {
-                    sym_dbg_critical_event = sym;
-                    sym_dbg_critical_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }                                
-                if (!strcmp (str,"dbg_critical_event_end")) {
-                    sym_dbg_critical_event_end = sym;
-                    sym_dbg_critical_event_end->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-
-                if (!strcmp (str,"dbg_after_critical")) {
-                    sym_dbg_after_critical = sym;
-                    sym_dbg_after_critical->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_barrier")) {
-                    sym_dbg_before_barrier = sym;
-                    sym_dbg_before_barrier->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_barrier")) {
-                    sym_dbg_after_barrier = sym;
-                    sym_dbg_after_barrier->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_flush_event")) {
-                    sym_dbg_flush_event = sym;
-                    sym_dbg_flush_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_flush")) {
-                    sym_dbg_before_flush = sym;
-                    sym_dbg_before_flush->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_ordered")) {
-                    sym_dbg_before_ordered = sym;
-                    sym_dbg_before_ordered->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_ordered_event")) {
-                    sym_dbg_ordered_event = sym;
-                    sym_dbg_ordered_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_ordered")) {
-                    sym_dbg_after_ordered = sym;
-                    sym_dbg_after_ordered->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_threadprivate")) {
-                    sym_dbg_threadprivate = sym;
-                    sym_dbg_threadprivate->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_funcall")) {
-                    sym_dbg_before_funcall = sym;
-                    sym_dbg_before_funcall->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_funcparvar")) {
-                    sym_dbg_funcparvar = sym;
-                    sym_dbg_funcparvar->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_funcpararr")) {
-                    sym_dbg_funcpararr = sym;
-                    sym_dbg_funcpararr->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_funcall")) {
-                    sym_dbg_after_funcall = sym;
-                    sym_dbg_after_funcall->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_funcbegin")) {
-                    sym_dbg_funcbegin = sym;
-                    sym_dbg_funcbegin->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_funcend")) {
-                    sym_dbg_funcend = sym;
-                    sym_dbg_funcend->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_if_loop_event")) {
-                    sym_dbg_if_loop_event = sym;
-                    sym_dbg_if_loop_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_omp_if_loop_event")) {
-                    sym_dbg_omp_if_loop_event = sym;
-                    sym_dbg_omp_if_loop_event->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_interval_begin")) {
-                    sym_dbg_interval_begin = sym;
-                    sym_dbg_interval_begin->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_interval_end")) {
-                    sym_dbg_interval_end = sym;
-                    sym_dbg_interval_end->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_before_io")) {
-                    sym_dbg_before_io = sym;
-                    sym_dbg_before_io->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-                if (!strcmp (str,"dbg_after_io")) {
-                    sym_dbg_after_io = sym;
-                    sym_dbg_after_io->addAttribute (DECLARED_FUNC);
-                    continue;		
-                }
-            }
-        }
-}
-
-void DeclareExternalProcedures (SgStatement *debug) {
-    SgStatement *decl = new SgStatement(EXTERN_STAT);
-    //SgExprListExp *list = new SgExprListExp(*new SgVarRefExp(*sym_dbg_init));
-    SgExprListExp *list = new SgExprListExp();
-    if ((sym_dbg_init != NULL) && (sym_dbg_init->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_init));
-    if ((sym_dbg_finalize != NULL) && (sym_dbg_finalize->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_finalize));
-    if ((sym_dbg_get_handle != NULL) && (sym_dbg_get_handle->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_get_handle));
-	if ((sym_dbg_regarr != NULL) && (sym_dbg_regarr->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_regarr));
-	if ((sym_dbg_unregarr != NULL) && (sym_dbg_unregarr->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_unregarr));
-    if ((sym_dbg_regvar != NULL) && (sym_dbg_regvar->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_regvar));
-    if ((sym_dbg_before_parallel != NULL) && (sym_dbg_before_parallel->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_parallel));
-    if ((sym_dbg_after_parallel != NULL) && (sym_dbg_after_parallel->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_parallel));
-    if ((sym_dbg_parallel_event != NULL) && (sym_dbg_parallel_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_parallel_event));
-    if ((sym_dbg_parallel_event_end != NULL) && (sym_dbg_parallel_event_end->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_parallel_event_end));
-    if ((sym_dbg_before_omp_loop != NULL) && (sym_dbg_before_omp_loop->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_omp_loop));
-    if ((sym_dbg_after_omp_loop != NULL) && (sym_dbg_after_omp_loop->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_omp_loop));
-    if ((sym_dbg_omp_loop_event != NULL) && (sym_dbg_omp_loop_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_omp_loop_event));
-    if ((sym_dbg_before_loop != NULL) && (sym_dbg_before_loop->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_loop));
-    if ((sym_dbg_after_loop != NULL) && (sym_dbg_after_loop->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_loop));
-    if ((sym_dbg_loop_event != NULL) && (sym_dbg_loop_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_loop_event));
-    if ((sym_dbg_write_var_begin != NULL) && (sym_dbg_write_var_begin->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_write_var_begin));
-    if ((sym_dbg_write_arr_begin != NULL) && (sym_dbg_write_arr_begin->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_write_arr_begin));
-    if ((sym_dbg_write_var_end != NULL) && (sym_dbg_write_var_end->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_write_var_end));
-    if ((sym_dbg_write_arr_end != NULL) && (sym_dbg_write_arr_end->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_write_arr_end));
-    if ((sym_dbg_read_var != NULL) && (sym_dbg_read_var->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_read_var));
-    if ((sym_dbg_read_arr != NULL) && (sym_dbg_read_arr->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_read_arr));
-    if ((sym_dbg_regpararr != NULL) && (sym_dbg_regpararr->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_regpararr));
-    if ((sym_dbg_regparvar != NULL) && (sym_dbg_regparvar->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_regparvar));
-    if ((sym_dbg_regcommon != NULL) && (sym_dbg_regcommon->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_regcommon));
-    if ((sym_dbg_before_sections != NULL) && (sym_dbg_before_sections->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_sections));
-    if ((sym_dbg_after_sections != NULL) && (sym_dbg_after_sections->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_sections));
-    if ((sym_dbg_section_event != NULL) && (sym_dbg_section_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_section_event));
-    if ((sym_dbg_section_event_end != NULL) && (sym_dbg_section_event_end->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_section_event_end));
-    if ((sym_dbg_before_single != NULL) && (sym_dbg_before_single->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_single));
-    if ((sym_dbg_single_event != NULL) && (sym_dbg_single_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_single_event));
-    if ((sym_dbg_single_event_end != NULL) && (sym_dbg_single_event_end->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_single_event_end));
-    if ((sym_dbg_after_single != NULL) && (sym_dbg_after_single->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_single));
-    if ((sym_dbg_before_workshare != NULL) && (sym_dbg_before_workshare->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_workshare));
-    if ((sym_dbg_after_workshare != NULL) && (sym_dbg_after_workshare->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_workshare));
-    if ((sym_dbg_master_begin != NULL) && (sym_dbg_master_begin->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_master_begin));
-    if ((sym_dbg_master_end != NULL) && (sym_dbg_master_end->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_master_end));
-    if ((sym_dbg_before_critical != NULL) && (sym_dbg_before_critical->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_critical));
-    if ((sym_dbg_critical_event != NULL) && (sym_dbg_critical_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_critical_event));
-    if ((sym_dbg_critical_event_end != NULL) && (sym_dbg_critical_event_end->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_critical_event_end));
-    if ((sym_dbg_after_critical != NULL) && (sym_dbg_after_critical->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_critical));
-    if ((sym_dbg_before_barrier != NULL) && (sym_dbg_before_barrier->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_barrier));
-    if ((sym_dbg_after_barrier != NULL) && (sym_dbg_after_barrier->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_barrier));
-    if ((sym_dbg_flush_event != NULL) && (sym_dbg_flush_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_flush_event));
-    if ((sym_dbg_before_flush != NULL) && (sym_dbg_before_flush->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_flush));
-    if ((sym_dbg_before_ordered != NULL) && (sym_dbg_before_ordered->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_ordered));
-    if ((sym_dbg_ordered_event != NULL) && (sym_dbg_ordered_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_ordered_event));
-    if ((sym_dbg_after_ordered != NULL) && (sym_dbg_after_ordered->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_ordered));
-    if ((sym_dbg_threadprivate != NULL) && (sym_dbg_threadprivate->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_threadprivate));
-    if ((sym_dbg_before_funcall != NULL) && (sym_dbg_before_funcall->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_funcall));
-    if ((sym_dbg_after_funcall != NULL) && (sym_dbg_after_funcall->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_funcall));
-    if ((sym_dbg_funcparvar != NULL) && (sym_dbg_funcparvar->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_funcparvar));
-    if ((sym_dbg_funcpararr != NULL) && (sym_dbg_funcpararr->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_funcpararr));
-    if ((sym_dbg_funcbegin != NULL) && (sym_dbg_funcbegin->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_funcbegin));
-    if ((sym_dbg_funcend != NULL) && (sym_dbg_funcend->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_funcend));
-    if ((sym_dbg_if_loop_event != NULL) && (sym_dbg_if_loop_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_if_loop_event));
-    if ((sym_dbg_omp_if_loop_event != NULL) && (sym_dbg_omp_if_loop_event->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_omp_if_loop_event));
-    if ((sym_dbg_before_io != NULL) && (sym_dbg_before_io->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_before_io));
-    if ((sym_dbg_after_io != NULL) && (sym_dbg_after_io->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_after_io));
-    if ((sym_dbg_interval_begin != NULL) && (sym_dbg_interval_begin->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_interval_begin));
-    if ((sym_dbg_interval_end != NULL) && (sym_dbg_interval_end->getAttribute(0,DECLARED_FUNC) == NULL)) list->append(*new SgVarRefExp(*sym_dbg_interval_end));
-
-    if (list->length ()>1) {
-        decl -> setExpression(0,*list->rhs());
-	    debug-> insertStmtBefore(*decl, *debug->controlParent());
-    }
-}
-
-void UpdateIncludeVarsFile(SgStatement *st, const char *input_file) {
-    freopen (input_file,"w",stdout);
-    SgStatement *last = st->lastNodeOfStmt ();
-    for (SgStatement *stat=st->lexNext (); stat && (stat != last); stat=stat->lexNext()) {
-        if (stat->variant () != PROC_STAT) {
-            stat->unparsestdout ();
-        }
-    }
-    fclose (stdout);
-}
-
-void UpdateIncludeInitFile(SgStatement *st, const char *input_file) {    
-    freopen (input_file,"w",stdout);
-    SgStatement *last = st->lastNodeOfStmt ();
-    SgStatement *prev = st;    
-    for (SgStatement *stat=st->lexNext (); stat && (stat != last); stat=prev->lexNext()) {
-        if (stat->variant () != PROC_STAT) {
-            prev->setLexNext (*stat->lexNext());
-            stat->extractStmt ();
-        } else prev = stat;
-    }
-    char *data_str = new char[20];
-    sprintf(data_str,"include 'dbg_vars.h'"); 
-    SgStatement *decl = new SgStatement(DATA_DECL);// creates DATA statement
-    SgExpression *es = new SgExpression(STMT_STR);
-    NODE_STR(es->thellnd) = data_str;
-    decl -> setExpression(0,*es);
-    st->insertStmtAfter (*decl);    
-    st->unparsestdout ();
-    if (isMainProgram == 1) {
-        char *data_str = new char[20];        
-        sprintf(data_str,"include 'dbg_init.h'"); 
-        SgStatement *decl = new SgStatement(DATA_DECL);
-        SgExpression *es = new SgExpression(STMT_STR);
-        NODE_STR(es->thellnd) = data_str;
-        decl -> setExpression(0,*es);
-        last->insertStmtAfter (*decl);
-        data_str = new char[20];
-	    sprintf(data_str,"data ithreadid /-1/"); 
-	    decl = new SgStatement(DATA_DECL);
-	    es = new SgExpression(STMT_STR);
-	    NODE_STR(es->thellnd) = data_str;
-	    decl -> setExpression(0,*es);
-        SgExpression *common = new SgExpression (COMM_LIST);
-        SgSymbol *dbg_thread=new SgSymbol (VARIABLE_NAME,"dbg_thread");
-        common->setSymbol (*dbg_thread);
-        SgVarRefExp *ithreadid = new SgVarRefExp (*new SgSymbol (VARIABLE_NAME,"ithreadid"));
-        common->setLhs (*ithreadid);
-        SgStatement *common_stat= new SgStatement(COMM_STAT);
-        common_stat->setExpression (0, *common);
-        SgStatement *thread = new SgStatement (OMP_THREADPRIVATE_DIR);
-        SgExpression *th = new SgExpression (OMP_THREADPRIVATE);
-        th->setLhs (*new SgExprListExp (*new SgVarRefExp (*dbg_thread)));
-        thread->setExpression (0, *th);
-        SgStatement *BlockData = new SgStatement(BLOCK_DATA);
-        BlockData->setSymbol (*new SgSymbol (VARIABLE_NAME,"dbgthread"));
-        last->insertStmtAfter(*BlockData);
-        last->insertStmtAfter(*new SgStatement(CONTROL_END), *BlockData);
-        last->insertStmtAfter(*decl, *BlockData);
-        last->insertStmtAfter(*thread, *BlockData);
-        last->insertStmtAfter(*common_stat, *BlockData);
-        
-    }
-    st->extractStmtBody ();
-    st->extractStmt ();
-    fclose (stdout);
-}
-SgExpression *GetOmpAddresMem (SgExpression *exp) {
-	SgFunctionCallExp *fe;
-	if (sym_dbg_get_addr == NULL) {
-		sym_dbg_get_addr = new SgSymbol(PROCEDURE_NAME, "dbg_get_addr");
-	}
-	fe = new SgFunctionCallExp(*sym_dbg_get_addr);
-	fe->addArg(exp->copy());
-	return(fe);
-}
-SgStatement * FindOuterLoop(SgStatement *st) {
-    SgStatement *tmp=NULL;
-    SgStatement *res=NULL;
-    for (tmp=st; tmp && (tmp->variant () != GLOBAL); tmp = tmp->controlParent ()) {
-        if (isSgForStmt (tmp)) {
-            res = tmp;
-        }
-    }
-    return res;
-}
-
-int FindLabelInLoop(SgStatement *st, SgLabel *lbl) {
-    SgStatement *tmp=NULL;
-    SgStatement *last=GetLastStatementOfLoop (st);
-    int res=0;
-    if (isSgForStmt(st)) {
-		if (last->hasLabel ()) 
-			if (LABEL_STMTNO(last->label()->thelabel) == LABEL_STMTNO (lbl->thelabel)) return 1;
-        for (tmp=st; tmp && (tmp != last); tmp = tmp->lexNext ()) {
-            if (tmp->hasLabel ())
-                if (LABEL_STMTNO(tmp->label()->thelabel) == LABEL_STMTNO (lbl->thelabel)) return 1;
-        }
-    }
-    return res;
-}
-
-void InstrumentGotoStmt (SgStatement *st) {
-    SgGotoStmt *gotost = isSgGotoStmt (st);
-    if (!gotost) return;
-    SgLabel *lbl = gotost->branchLabel();
-    if (!lbl) return;
-    SgStatement *tmp=NULL;
-    for (tmp=st; tmp && (tmp->variant () != GLOBAL); tmp = tmp->controlParent ()) {
-        if (isSgForStmt (tmp)) {
-            int inparloop = tmp->lexPrev () && (tmp->lexPrev ()->variant () == OMP_DO_DIR);
-            if (!FindLabelInLoop(tmp, lbl)) {
-                SgArrayRefExp **StatContext =  new (SgArrayRefExp *);
-                StatContext = (SgArrayRefExp **)tmp->attributeValue(0,STATIC_CONTEXT);
-                if (StatContext != NULL) {
-                    SgCallStmt *fe = NULL;
-                    if (inparloop) {                         
-                            if (sym_dbg_after_omp_loop == NULL) sym_dbg_after_omp_loop = new SgSymbol (PROCEDURE_NAME, "dbg_after_omp_loop");
-                            fe = new SgCallStmt(*sym_dbg_after_omp_loop);
-                    } else {
-                            if (sym_dbg_after_loop == NULL) sym_dbg_after_loop = new SgSymbol (PROCEDURE_NAME, "dbg_after_loop");
-                            fe = new SgCallStmt(*sym_dbg_after_loop);
-                    }
-                    fe->addArg(**StatContext);
-                    fe->addArg(*varThreadID);    
-                    fe->addAttribute(DEBUG_STAT);
-                    st->insertStmtBefore(*fe, *st->controlParent());
-                }
-            }
-        }
-    }
-}
-
-void InstrumentExitFromLoops (SgStatement *st) {
-    SgStatement *tmp=NULL;
-    for (tmp=st; tmp && (tmp->variant () != GLOBAL); tmp = tmp->controlParent ()) {
-        if (isSgForStmt (tmp)) {
-            int inparloop = tmp->lexPrev () && (tmp->lexPrev ()->variant () == OMP_DO_DIR);
-            SgArrayRefExp **StatContext =  new (SgArrayRefExp *);
-            StatContext = (SgArrayRefExp **)tmp->attributeValue(0,STATIC_CONTEXT);
-            if (StatContext != NULL) {
-                SgCallStmt *fe = NULL;
-                if (inparloop) {                         
-                    if (sym_dbg_after_omp_loop == NULL) sym_dbg_after_omp_loop = new SgSymbol (PROCEDURE_NAME, "dbg_after_omp_loop");
-                    fe = new SgCallStmt(*sym_dbg_after_omp_loop);
-                } else {
-                    if (sym_dbg_after_loop == NULL) sym_dbg_after_loop = new SgSymbol (PROCEDURE_NAME, "dbg_after_loop");
-                    fe = new SgCallStmt(*sym_dbg_after_loop);
-                }
-                fe->addArg(**StatContext);
-                fe->addArg(*varThreadID);    
-                fe->addAttribute(DEBUG_STAT);
-                st->insertStmtBefore(*fe, *st->controlParent());
-            }
-        }
-    }
-}
-void GenerateNowaitPlusBarrier (SgStatement *st) {
-    char *strStaticContext = new char [MaxContextBufferLength];
-    int wasnowaitclause = 0;
-    if ((st->variant () == OMP_END_DO_DIR) ||
-     (st->variant () == OMP_END_SINGLE_DIR)||    
-     (st->variant () == OMP_END_SECTIONS_DIR)||    
-     (st->variant () == OMP_END_WORKSHARE_DIR)){
-        SgExprListExp *exp = isSgExprListExp (st->expr(0));
-        if (exp != NULL) {
-            for (int i=0; i<exp->length (); i++) {
-                if (exp->elem (i)->variant()== OMP_NOWAIT) {
-                       wasnowaitclause = 1; 
-                       break;
-                }
-            }
-            if (wasnowaitclause) {
-                return;
-            }
-            exp->append (*new SgExpression (OMP_NOWAIT));
-        } else {
-            st->setExpression (0, *new SgExprListExp(*new SgExpression(OMP_NOWAIT)));
-        }
-    }
-    SgStatement *next = st->lexNext ();
-    SgStatement *stat = new SgStatement (OMP_BARRIER_DIR);
-    stat->addAttribute(DEBUG_STAT);
-    stat->setlineNumber (st->lineNumber ());
-    next->insertStmtBefore(*stat, *next->controlParent());
-    memset(strStaticContext, 0, MaxContextBufferLength);
-    strcat(strStaticContext,"*type=barrier");            
-    GenerateFileAndLine (stat, strStaticContext);            
-    InstrumentOmpBarrierDir (stat, strStaticContext);            
-    GenerateCallGetHandle (strStaticContext);
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/parloop.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/parloop.cpp
deleted file mode 100644
index e859f4f..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/parloop.cpp
+++ /dev/null
@@ -1,2587 +0,0 @@
-/*********************************************************************/
-/*  Fortran DVM+OpenMP+ACC                                           */
-/*                                                                   */
-/*                   Parallel Loop Processing                        */
-/*********************************************************************/
-
-#include "dvm.h"
-
-SgStatement *parallel_dir;
-SgExpression *spec_accr; 
-int iacross;
-symb_list *newvar_list;
-#define IN_  0 
-#define OUT_ 1 
-
-extern int nloopred; //counter of parallel loops with reduction group
-extern int nloopcons; //counter of parallel loops with consistent group
-extern int opt_base, opt_loop_range; //set on by compiler options (code optimization options)
-extern symb_list *redvar_list;
-
-int ParallelLoop(SgStatement *stmt)
-{
-  SgSymbol     *do_var[MAX_LOOP_LEVEL];
-  SgExpression *step[MAX_LOOP_LEVEL], 
-               *init[MAX_LOOP_LEVEL],
-               *last[MAX_LOOP_LEVEL],
-               *vpart[MAX_LOOP_LEVEL];
-  SgExpression *dovar;
-  SgValueExp c1(1);
-  int i=0, nloop=0, ndo=0, iout;
-  SgStatement *stl, *st, *first_do;
-  SgForStmt *stdo;
-  int ub; /*OMP*/
-  SgSymbol  *newj = NULL; /*OMP*/
-  SgExpression *clause[13] = {NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL};
-
-  // initialize global variables
-  parallel_dir = stmt;
-  redgref = NULL;
-  red_list = NULL;
-  irg=0; idebrg=0;
-  iconsg=0; idebcg=0;
-  consgref = NULL;
-  iacross = 0;
-  newvar_list = NULL;
-
-  ub = 0; /*OMP*/
-  if (!OMP_program) {/*OMP*/
-     first_do = stmt -> lexNext();// first DO statement of the loop nest
-  } else {
-     first_do = GetLexNextIgnoreOMP(stmt);// first DO statement of the loop nest /*OMP*/
-     newj = ChangeParallelDir (stmt);
-  }
-  
-//analysis of clauses
-  CheckClauses(stmt,clause);
-
-  int interface = 0; /*ACC*/
-//interface selection: 0 - RTS1, 1- RTS1+RTS2(by handler), 2 - RTS2(by handler)
-  if(IN_COMPUTE_REGION || parloop_by_handler) 
-     interface = 1; 
-  if(parloop_by_handler == 2) {  
-     interface = WhatInterface(stmt);
-     if(interface == 1)
-        err("Illegal clause",150,stmt );
-  }  
-//initialization vpart[]
-  for(i=0; i<MAX_LOOP_LEVEL; i++)
-     vpart[i] = NULL;
-  
-//looking through the do_variables list
-  if(opt_loop_range) CreateIndexVariables(stmt->expr(2));
-  for(dovar=stmt->expr(2); dovar; dovar=dovar->rhs())
-     nloop++;
-
-  LINE_NUMBER_AFTER(stmt,stmt); // line number of PARALLEL directive
-  TransferLabelFromTo(first_do, stmt->lexNext());
-//generating call to 'bploop' function of performance analizer (begin of parallel interval)
-  if(perf_analysis && perf_analysis != 2)
-     InsertNewStatementAfter(St_Bploop(OpenInterval(stmt)), cur_st, stmt->controlParent()); //inserting after function call 'lnumb'
-
-  //par_st = cur_st;
-
-//renewing loop-header's variables (used in start-expr, end-expr, step-expr)
-  if(IN_COMPUTE_REGION || parloop_by_handler)      /*ACC*/
-     ACC_RenewParLoopHeaderVars(first_do,nloop);
- 
-//allocating LoopRef and OutInitIndexArray,OutLastIndexArray,OutStepArray 
-  iplp = ndvm++;
-  iout = ndvm; 
-  if(interface != 2)
-     ndvm += 3*nloop;
-   
-//looking through the loop nest 
-  for(st=first_do,stl=NULL,i=0; i<nloop; st=st->lexNext(),i++) {
-     stdo = isSgForStmt(st);
-     if(!stdo)
-       break;     
-     else if( stl && !TightlyNestedLoops_Test(stl,st))
-       err("Non-tightly-nested loops",339,st);       
-        
-     stl = st;
-       //if(opt_loop_range) {
-     ChangeDistArrayRef(stdo->start());
-     ChangeDistArrayRef(stdo->end());
-     ChangeDistArrayRef(stdo->step());
-       // }
-     do_var[i] = stdo->symbol(); 
-     step[i]   = stdo->step();
-     if(!step[i])
-       step[i] = & c1.copy();  // by default: step = 1
-     init[i] = isSpecialFormExp(stdo->start(),i,iout+i,vpart,do_var);
-     if( init[i] )
-         step[i] = & c1.copy(); 
-      else
-         init[i]   = stdo->start();
-  
-     last[i]   = stdo->end();  
-    
-     if (OMP_program) {/*OMP*/      
-         if (newj != NULL) {/*OMP*/
-             if (ub == 0) {/*OMP*/
-                 if (isOmpGetNumThreads(last[i])) ub=1;/*OMP*/
-                 if (ub == 0) {/*OMP*/
-                     isOmpGetNumThreads(init[i]);/*OMP*/
-                     ub=2;/*OMP*/
-                 }/*OMP*/
-             }  /*OMP*/
-         } /*OMP*/
-     } /*OMP*/    
-     // setting new loop parameters
-     if(!opt_loop_range) {
-        if(vpart[i]) 
-           stdo->setStart(*DVM000(iout+i)+ (*vpart[i]));//special form
-                                                       //step is not replaced
-        else { 
-           stdo->setStart(*DVM000(iout+i));         
-        }
-        stdo->setEnd(*DVM000(iout+i+nloop));
-     }
-     else
-        stdo->setEnd(*DVM000(iout+i+nloop) - *new SgVarRefExp(*INDEX_SYMBOL(do_var[i])));    
-
-     if(dvm_debug) 
-        SetDoVar(stdo->symbol());      
-  }
-
-  ndo = i; 
-
-// test whether the PARALLEL directive is correct
-  if( !TestParallelDirective(stmt, nloop, ndo, first_do) )
-     return(0);    // directive is ignored
-
-  if(interface == 2)
-     Interface_2(stmt,clause,init,last,step,nloop,ndo,first_do); //,iout,stl,newj,ub);
-  else
-     Interface_1(stmt,clause,do_var,init,last,step,nloop,ndo,first_do,iplp,iout,stl,newj,ub);
-
-  cur_st = st->lexPrev();  // set cur_st on last DO satement of loop nest
-        // cur_st = stl->lexNext(); 
-
-  return(1);
-  
-}
-
-void CopyHeaderElems(SgStatement *st_after)
-{symb_list *sl;
- SgStatement *stat;
- SgExpression *e;
- int i,rank;
- coeffs *c;
- stat=cur_st;
- cur_st= st_after; //par_st;
- for(sl=dvm_ar;sl;sl=sl->next) {
-    c = AR_COEFFICIENTS(sl->symb); //((coeffs *) sl->symb-> attributeValue(0,ARRAY_COEF));
-    
-    rank=Rank(sl->symb);
-    for(i=2;i<=rank;i++)
-       doAssignTo_After(new SgVarRefExp(*(c->sc[i])), header_ref(sl->symb,i));
-    e = opt_base ? (&(*header_ref(sl->symb,rank+2) + * new SgVarRefExp(*(c->sc[1])))) :  header_ref(sl->symb,rank+2);
-    doAssignTo_After(new SgVarRefExp(*(c->sc[rank+2])), e);
-    //doAssignTo_After(new SgVarRefExp(*(c->sc[rank+2])), header_ref(sl->symb,rank+2));
- }
- cur_st=stat;
- //dvm_ar=NULL;
-}
-
-void EndOfParallelLoopNest(SgStatement *stmt, SgStatement *end_stmt, SgStatement *par_do,SgStatement *func)
-
-{ //stmt is last statement of parallel loop or is body of logical IF , which
-  // is last statement
-       SgStatement *go_stmt;
-   
-       if(HPF_program) {
-                                 //first_hpf_exec = first_dvm_exec;
-          INDLoopBegin(); 
-          OffDoVarsOfNest(end_stmt); 
-       } else if(!IN_COMPUTE_REGION && !parloop_by_handler) {     /*ACC*/   
-          CopyHeaderElems(parallel_dir->lexNext());
-          dvm_ar=NULL;
-       }
-               
-       // replacing the label of DO statements locating  above parallel loop  in nest,
-       // which is ended by stmt(or stmt->controlParent()),
-       // by new label and inserting CONTINUE with this label 
-       ReplaceDoNestLabel_Above(end_stmt, par_do, GetLabel());
-
-       if(dvm_debug) {
-          CloseDoInParLoop(end_stmt); //on debug regim end_stmt==stmt
-          end_stmt = cur_st; 
-       } else if(perf_analysis == 4 && !IN_COMPUTE_REGION && !parloop_by_handler) { // RTS calls can not be inserted into the handler     
-          SeqLoopEndInParLoop(end_stmt,stmt);
-          end_stmt = cur_st; 
-       }
-       if(!IN_COMPUTE_REGION && !parloop_by_handler) {
-       // generating GO TO statement:  GO TO begin_lab
-       // and inserting it after last statement of parallel loop nest 
-          go_stmt = new SgGotoStmt(*begin_lab);     
-          go_stmt->addAttribute (OMP_MARK); /*OMP*/
-          cur_st->insertStmtAfter(*go_stmt,*par_do->controlParent());
-          cur_st = go_stmt; // GO TO statement
-          SgStatement *continue_stat = new SgStatement(CONT_STAT); /*OMP*/      
-          continue_stat->addAttribute (OMP_MARK); /*OMP*/
-          InsertNewStatementAfter( continue_stat,cur_st,cur_st->controlParent()); /*OMP*/     
-       }          
-       if(dvm_debug) {
-       // generating call statement : call dendl(...)
-          CloseParLoop(end_stmt->controlParent(),cur_st,end_stmt);
-       }
-       if(!dvm_debug && stmt->lineNumber())
-       {
-          LINE_NUMBER_AFTER_WITH_CP(stmt,cur_st,par_do->controlParent());
-       }  
-       // generating statements for special ACROSS:
-       if(iacross == -1){
-          SendArray(spec_accr);
-          iacross = 0;
-       }
-       if(IN_COMPUTE_REGION)  /*ACC*/
-       // generating call statement to unregister remote_access buffers: 
-       // call dvmh_destroy_array(...)  
-          ACC_UnregisterDvmBuffers();
-       if(parloop_by_handler != 2 || (parloop_by_handler==2 && WhatInterface(parallel_dir) != 2))   
-       // generating call statement:
-       //  call endpl(LoopRef)
-          doCallAfter(EndParLoop(iplp));
-
-       // generating statements for ACROSS:
-       if(iacross){
-          doCallAfter(SendBound(DVM000(iacross)));
-          doCallAfter(WaitBound(DVM000(iacross)));
-          doCallAfter(DeleteObject_H (DVM000(iacross)));
-       }
-       // actualizing of reduction variables
-       if(redgref)
-          ReductionVarsStart(red_list);
-     
-       if(irg) {//there is synchronous REDUCTION clause in PARALLEL
-          // generating call statement:
-          //  call strtrd(RedGroupRef)
-          doCallAfter(StartRed(redgref));
-
-          // generating call statement:
-          //  call waitrd(RedGroupRef)
-          doCallAfter(WaitRed(redgref));
-     
-          if(IN_COMPUTE_REGION || parloop_by_handler)       /*ACC*/   
-             ACC_ReductionVarsAreActual();
-           
-	  if(idebrg){
-             if(dvm_debug)
-               doCallAfter( D_CalcRG(DVM000(idebrg)));
-             doCallAfter( D_DelRG (DVM000(idebrg)));
-          }
-          // generating statement:
-          //  call dvmh_delete_object(RedGroupRef)     //dvm000(i) = delobj(RedGroupRef)
-          doCallAfter(DeleteObject_H(redgref));
-       }
-
-       // actualizing of consistent arrays
-       if(consgref)
-          ConsistentArraysStart(cons_list);
-
-       if(iconsg) {//there is synchronous CONSISTENT clause in PARALLEL
-         if(IN_COMPUTE_REGION)    /*ACC*/        
-         // generating call statement:
-         //  call dvmh_handle_consistent(ConsistGroupRef)
-            doCallAfter(HandleConsistent(consgref));    
-         // generating assign statement:
-         //  dvm000(i) = strtcg(ConsistGroupRef)
-         doAssignStmtAfter(StartConsGroup(consgref));
-
-         // generating statement:
-         //  dvm000(i) = waitcg(ConsistGroupRef)
-         doAssignStmtAfter(WaitConsGroup(consgref));
-         
-         // generating statement:
-         //  call dvmh_delete_object(ConsistGroupRef)   //dvm000(i) = delobj(ConsistGroupRef)
-         doCallAfter(DeleteObject_H(consgref));
-       }
-
-        // generating call eloop(...) - end of parallel interval
-        // (performance analyzer function)
-       if(perf_analysis && perf_analysis != 2) {
-         InsertNewStatementAfter(St_Enloop(INTERVAL_NUMBER,INTERVAL_LINE),cur_st,cur_st->controlParent());
-         CloseInterval();
-         if(perf_analysis != 4)
-           OverLoopAnalyse(func);
-       }
-       if(!IN_COMPUTE_REGION && !parloop_by_handler) {
-       // setting label of ending parallel loop nest
-       if(!go_stmt->lexNext()->label())
-         (go_stmt->lexNext())->setLabel(*end_lab);
-       else                
-         go_stmt->insertStmtAfter(*ContinueWithLabel(end_lab), *go_stmt->controlParent());
-       }
-       // implementing parallel loop nest in compute region:
-       // generating host- and cuda-handlers and cuda kernel for loop body
-       if(IN_COMPUTE_REGION || parloop_by_handler)          /*ACC*/ 
-       {   ACC_ParallelLoopEnd(par_do);
-           if(!IN_COMPUTE_REGION)
-             DeleteNonDvmArrays();     
-       }
-           
-       //completing REMOTE_ACCESS 
-       if(rma && !rma->rmout) 
-          RemoteAccessEnd();
-          
-       SET_DVM(iplp);
-
-} 
-
-
-
-void CheckClauses(SgStatement *stmt, SgExpression *clause[])
-{
-   SgExpression *el,*e; 
-// looking through the specification list
-  for(el=stmt->expr(1); el; el=el->rhs()) {
-     e = el->lhs();            // specification
-     switch (e->variant()) {
-           case NEW_SPEC_OP:
-	     if(!clause[NEW_]){
-                clause[NEW_] = e;
-             }  else
-                err("Double NEW clause",153,stmt);
-                break;
-           case REDUCTION_OP:
-	     if(!clause[REDUCTION_]){
-                clause[REDUCTION_] = e;
-             }  else
-                err("Double REDUCTION clause",154,stmt);
-                break;
-                 
-           case SHADOW_RENEW_OP:
-	     if(!clause[SHADOW_RENEW_] && !clause[SHADOW_START_] && !clause[SHADOW_START_]){
-                clause[SHADOW_RENEW_] = e;
-             }  else
-                err("Double shadow-renew-clause",155,stmt);
-                break;
-
-           case SHADOW_START_OP:
-	     if(!clause[SHADOW_RENEW_] && !clause[SHADOW_START_] && !clause[SHADOW_START_]){
-                clause[SHADOW_START_] = e;
-             }  else
-                err("Double shadow-renew-clause",155,stmt);
-                break;
-
-           case SHADOW_WAIT_OP:
-	     if(!clause[SHADOW_RENEW_] && !clause[SHADOW_START_] && !clause[SHADOW_START_]){
-                clause[SHADOW_WAIT_] = e;
-             }  else
-                err("Double shadow-renew-clause",155,stmt);
-                break;
-
-           case SHADOW_COMP_OP:
-	     if(!clause[SHADOW_COMPUTE_]){
-                clause[SHADOW_COMPUTE_] = e;
-             }  else
-                err("Double SHADOW_COMPUTE clause",155,stmt);
-                break;
-
-           case REMOTE_ACCESS_OP:
-	     if(!clause[REMOTE_ACCESS_]){
-                clause[REMOTE_ACCESS_] = e;
-             }  else
-                err("Double REMOTE_ACCESS clause",156,stmt);
-                break;
-
-           case CONSISTENT_OP:
-	     if(!clause[CONSISTENT_]){
-                clause[CONSISTENT_] = e;
-             }  else
-                err("Double CONSISTENT clause",296,stmt);       
-                break;
-  
-           case STAGE_OP:
-	     if(!clause[STAGE_]){
-                clause[STAGE_] = e;
-             }  else
-                err("Double STAGE clause",298,stmt);
-                break; 
-
-           case ACC_PRIVATE_OP:
-	     if(!clause[PRIVATE_]){
-                clause[PRIVATE_] = e;
-             }  else
-                err("Double PRIVATE clause",607,stmt);
-                break; 
-
-           case ACC_CUDA_BLOCK_OP:
-	     if(!clause[CUDA_BLOCK_]){
-                clause[CUDA_BLOCK_] = e;
-             }  else
-                err("Double CUDA_BLOCK clause",608,stmt);
-                break; 
-
-           case ACC_TIE_OP:
-	     if(!clause[TIE_]){
-                clause[TIE_] = e;
-             }  else
-                err("Double TIE clause",608,stmt);
-                break; 
-
-           case ACROSS_OP:
-	     if(!clause[ACROSS_]){
-                clause[ACROSS_] = e;
-             }  else
-                err("Double ACROSS clause",157,stmt);       
-                break;  
-     }
-  }      
-   
-  if(clause[SHADOW_COMPUTE_] && clause[REDUCTION_])
-     err("Inconsistent clauses: SHADOW_COMPUTE and REDUCTION",443,stmt);
-
-  if(IN_COMPUTE_REGION && ( clause[SHADOW_START_] || clause[SHADOW_WAIT_] || clause[CONSISTENT_] && clause[CONSISTENT_]->symbol() || clause[REMOTE_ACCESS_] && clause[REMOTE_ACCESS_]->symbol()))
-     err("Illegal clause of PARALLEL directive in region (SHADOW_START,SHADOW_WAIT,asynchronous CONSISTENT or asynchronous REMOTE_ACCESS)",445,stmt);       
-
-}
-
-int WhatInterface(SgStatement *stmt)
-{
-   SgExpression *el,*e;
-// undistributed parallel loop
-   if(!stmt->expr(0))
-      return(2);
-// is mapped on template? 
-   //if(stmt->expr(0)->symbol()->attributes() & TEMPLATE_BIT)
-   //   return (1); 
-// looking through the specification list of PARALLEL directive
-   for(el=stmt->expr(1); el; el=el->rhs()) {
-      e = el->lhs();            // specification
-      switch (e->variant()) {
-           case ACC_PRIVATE_OP:
-           case ACC_CUDA_BLOCK_OP:
-           case SHADOW_RENEW_OP:
-           case SHADOW_COMP_OP:
-           case ACROSS_OP:
-           case ACC_TIE_OP:
-           case CONSISTENT_OP: 
-           case STAGE_OP:
-           case REMOTE_ACCESS_OP:
-                if(e->symbol()) // asynchronous REMOTE_ACCESS
-                  return(1);
-                else
-                  break;
-           case REDUCTION_OP:
-                if(TestReductionClause(e))
-                  break;
-                else
-                  return(1);
-           default:
-                return (1);
-      }
-   }
-   return (2);
-}
-
-int areIllegalClauses(SgStatement *stmt)
-{ 
-  SgExpression *el;
-  for(el=stmt->expr(1); el; el=el->rhs()) 
-    if(el->lhs()->variant() != REDUCTION_OP && el->lhs()->variant() != ACC_PRIVATE_OP && el->lhs()->variant() != ACC_CUDA_BLOCK_OP && el->lhs()->variant() != ACROSS_OP && el->lhs()->variant() != ACC_TIE_OP)
-      return 1;
-  return 0;                 
-}          
-
-int TestParallelWithoutOn(SgStatement *stmt, int flag)
-{
-  if(!stmt->expr(0) && parloop_by_handler != 2) //undistributed parallel loop
-  {
-     if(flag)
-        warn("PARALLEL directive is ignored, -Opl2 option should be specified",621,stmt);
-     return(0);
-  } else
-     return (1);         
-}
-
-int TestParallelDirective(SgStatement *stmt, int nloop, int ndo, SgStatement *first_do)
-{ // stmt - PARALLEL directive; nloop - number of items in the do-variable list of directive;
-  // ndo - number of loops (do-statements) in the nest
-  SgExpression *dovar;  
-  SgStatement *st;
-  int flag_err=1; //flag of an error message
-   
-  if(!nloop)  // not determined yet (AnalyzeRegion())
-  {  flag_err = 0;
-     // first DO statement of the loop nest   
-     first_do = OMP_program ? GetLexNextIgnoreOMP(stmt) : stmt->lexNext();   
-     //looking through the do_variable list of directive
-     for(dovar=stmt->expr(2); dovar; dovar=dovar->rhs())
-        nloop++;
- 
-     //looking through the loop nest 
-     for(st=first_do,ndo=0; ndo<nloop; st=st->lexNext(),ndo++) 
-     {     
-        if(!isSgForStmt(st))
-           break;     
-     }
-  }
-
-  if(ndo == 0) {
-    if(flag_err)
-      err("Directive PARALLEL must be followed by DO statement", 97, stmt); 
-    return(0);
-  }
-
-  if(nloop > ndo) { 
-    if(flag_err) 
-      err("Length of do-variable list in  PARALLEL directive is greater than the number of nested DO statements", 158,stmt);
-    return(0);
-  }
-
-  for(st=first_do,dovar=stmt->expr(2); dovar; st=st->lexNext(),dovar=dovar->rhs()) 
-  { 
-    if(dovar->lhs()->symbol() != st->symbol()) {
-      if(flag_err)
-        err("Illegal do-variable list in PARALLEL directive",159,stmt);      
-      return(0);
-    }     
-  }
-
-  if(!stmt->expr(0) && areIllegalClauses(stmt)) //undistributed parallel loop
-  {
-    if(flag_err)
-      err("Illegal clause",150,stmt );
-    return(0);
-       
-  }
-
-  if(!only_debug && stmt->expr(0) && !HEADER(stmt->expr(0)->symbol())) {
-     if(flag_err)   
-       Error("'%s' isn't distributed array", stmt->expr(0)->symbol()->identifier(), 72,stmt); 
-     return(0);
-  }
-
-  return(1);
-}
-
-int doParallelLoopByHandler(int iplp, SgStatement *first, SgExpression *clause[], SgExpression *oldGroup, SgExpression *newGroup,SgExpression *oldGroup2, SgExpression *newGroup2)
-{ /*ACC*/
-    int ilh = ndvm;    
-    LINE_NUMBER_AFTER(first,cur_st);      
-    cur_st->addComment(ParallelLoopComment(first->lineNumber()));    
-    doAssignStmtAfter(LoopCreate_H(cur_region ? cur_region->No : 0, iplp));       
-    if (clause[REDUCTION_])  //there is REDUCTION clause in parallel loop
-        InsertReductions_H(clause[REDUCTION_]->lhs(), ilh);
-
-    if (clause[CUDA_BLOCK_])  //there is CUDA_BLOCK clause
-    {
-        int ib;
-        ib = ndvm;
-        CudaBlockSize(clause[CUDA_BLOCK_]->lhs());
-        InsertNewStatementAfter(SetCudaBlock_H(ilh, ib), cur_st, cur_st->controlParent());
-    }
-
-    if (clause[TIE_])  //there is TIE clause
-    {
-        SgExpression *el;
-        for (el=clause[TIE_]->lhs(); el; el=el->rhs())
-            InsertNewStatementAfter(Correspondence_H(ilh, HeaderForArrayInParallelDir(el->lhs()->symbol(),parallel_dir,1), AxisList(parallel_dir,el->lhs())), cur_st, cur_st->controlParent());
-    }
-
-    if (oldGroup) // loop with ACROSS clause
-        InsertNewStatementAfter(LoopAcross_H(ilh, oldGroup, newGroup), cur_st, cur_st->controlParent());
-
-    if (oldGroup2) // loop with ACROSS clause
-        InsertNewStatementAfter(LoopAcross_H(ilh, oldGroup2, newGroup2), cur_st, cur_st->controlParent());
-        
-    return(ilh);
-}
-
-void Interface_1(SgStatement *stmt,SgExpression *clause[],SgSymbol *do_var[],SgExpression *init[],SgExpression *last[],SgExpression *step[],int nloop,int ndo,SgStatement *first_do,int iplp,int iout,SgStatement *stl,SgSymbol *newj,int ub)
-{  
-  SgStatement *stc,*if_stmt=NULL,*st2=NULL,*st3=NULL;
-  SgStatement *stdeb = NULL,*stat = NULL,*stg = NULL,*stcg = NULL;
-  SgValueExp c0(0),c1(1);
-  SgExpression *stage=NULL,*dopl=NULL,*dovar,*head;
-  SgExpression *oldGroup = NULL, *newGroup=NULL;  /*ACC*/
-  SgExpression *oldGroup2 = NULL, *newGroup2=NULL; /*ACC*/  
-  SgSymbol  *spat;
-  int all_positive_step=-1;
-  int iacrg=-1,iinp;
-  int iaxis,i, isg = 0;
-  int nr; //number of aligning rules i.e. length of align-loop-index-list 
-  int ag[3] = {0, 0, 0};
-  int        step_mask[MAX_LOOP_LEVEL],
-             loop_num[MAX_DIMS];
-
-
-  stc = cur_st;  // saving
-  // generating assign statement:
-  //   dvm000(iplp) = crtpl(Rank);
-                   //iplp = CreateParLoop( nloop); 
-  doAssignTo_After(DVM000(iplp),CreateParLoop(nloop));
-
-  if(dvm_debug && dbg_if_regim>1) {  //copy loop nest
-     SgStatement *last_st,*lst;
-     last_st= LastStatementOfDoNest(first_do);
-     if(last_st != (lst=first_do->lastNodeOfStmt()) || last_st->variant()==LOGIF_NODE) 
-     { last_st=ReplaceLabelOfDoStmt(first_do,last_st, GetLabel());
-       ReplaceDoNestLabel_Above(last_st,first_do,GetLabel());
-     }
-     stdeb=first_do->copyPtr();         
-  }
-  //---------------------------------------------------------------------------
-  // processing specifications/clauses
-
-     if(clause[NEW_])
-        NewVarList(clause[NEW_]->lhs(),stmt);
-
-     if(clause[REDUCTION_])
-     {
-        red_list = clause[REDUCTION_]->lhs();
-        stat = cur_st; //store current statement    
-        cur_st = stc; //insert statements for creating reduction group 
-		      //before CrtPL i.e. before creating parallel loop             
-        if( clause[REDUCTION_]->symbol()) {
-           redgref = new SgVarRefExp(clause[REDUCTION_]->symbol());
-           doIfForReduction(redgref,1);
-           nloopred++;
-           stg = doIfForCreateReduction( clause[REDUCTION_]->symbol(),nloopred,0);
-        } else {
-           irg = ndvm; 
-           redgref = DVM000(irg);
-           doAssignStmtAfter(CreateReductionGroup());
-           if(debug_regim){
-              idebrg = ndvm; 
-              doAssignStmtAfter( D_CreateDebRedGroup());
-           }
-           stg = cur_st;//store current statement
-        }   
-        cur_st = stat; // restore cur_st 
-
-     }
-     if(clause[SHADOW_RENEW_])
-     {
-        isg = ndvm++;// index for BoundGroupRef
-        CreateBoundGroup(DVM000(isg));  
-        //looking through the array_with_shadow_list
-        ShadowList(clause[SHADOW_RENEW_]->lhs(), stmt, DVM000(isg));
-        if(ACC_program)      /*ACC*/
-        {// generating call statement ( in and out compute region):
-         //  call dvmh_shadow_renew( BoundGroupRef)
-              
-           doCallAfter(ShadowRenew_H(DVM000(isg)));   //(GPU000(ish_gpu),StartShadow_GPU(cur_region->No,DVM000(isg)));
-        }
-         // generating assign statement:
-         //  dvm000(i) = strtsh(BoundGroupRef)
-        doCallAfter(StartBound(DVM000(isg)));
-     }
-
-     if(clause[SHADOW_START_])      //sh_start
-     { 
-        SgExpression *sh_start = new SgVarRefExp(clause[SHADOW_START_]->symbol());
-        if(ACC_program)      /*ACC*/
-        {// generating call statement ( in and out compute region):
-         //  call dvmh_shadow_renew( BoundGroupRef)              
-           doCallAfter(ShadowRenew_H(sh_start));   
-        }
-        // generating assign statement:
-        //   dvm000(i) = exfrst(LoopRef,BounGroupRef)
-        doCallAfter(BoundFirst(iplp,sh_start));
-     }
-
-     if(clause[SHADOW_WAIT_])        //sh_wait
-     // generating assign statement:
-     //   dvm000(i) = imlast(LoopRef,BounGroupRef)
-        doCallAfter(BoundLast(iplp,new SgVarRefExp(clause[SHADOW_WAIT_]->symbol())));
-
-     if(clause[SHADOW_COMPUTE_])
-     {
-        if( (clause[SHADOW_COMPUTE_]->lhs()))
-	   ShadowComp(clause[SHADOW_COMPUTE_]->lhs(),stmt,0);
-        else 
-           doCallAfter(AddBound());             
-     }
-     if(clause[REMOTE_ACCESS_])
-     {
-        //adding new element to remote_access directive/clause list
-        AddRemoteAccess(clause[REMOTE_ACCESS_]->lhs(),NULL);        
-     }
-     if(clause[CONSISTENT_])
-     {
-        SgExpression *e = clause[CONSISTENT_];
-        cons_list = e->lhs();
-        stat = cur_st; //store current statement    
-        cur_st = stc; //insert statements for creating reduction group 
-		     //before CrtPL i.e. before creating parallel loop             
-        if(  e->symbol()){
-           consgref = new SgVarRefExp(e->symbol());
-           doIfForConsistent(consgref);
-           nloopcons++;
-           stcg = doIfForCreateReduction( e->symbol(),nloopcons,0);
-        } else {
-           iconsg = ndvm; 
-           consgref = DVM000(iconsg);
-           doAssignStmtAfter(CreateConsGroup(1,1));
-                  //!!!??? if(debug_regim){
-                  //  idebcg = ndvm; 
-                  //  doAssignStmtAfter( D_CreateDebRedGroup());
-                  //}
-           stcg = cur_st;//store current statement
-        }  
-        cur_st = stat; // restore cur_st 
-     }
-
-     if(clause[STAGE_])
-     {  
-        if( clause[STAGE_]->lhs()->variant()==MINUS_OP && INTEGER_VALUE(clause[STAGE_]->lhs()->lhs(),1) ) //STAGE(-1)
-           stage = IN_COMPUTE_REGION ? GetStage(first_do,iplp) : &c0.copy(); 
-        else
-           stage = ReplaceFuncCall(clause[STAGE_]->lhs());
-     }
-
-     if (clause[TIE_])     
-        for (SgExpression *el=clause[TIE_]->lhs(); el; el=el->rhs())  //list of tied arrays     
-           AxisList(stmt, el->lhs());    //for testing
-
-     if(clause[ACROSS_])
-     { 
-        int not_in=0;
-        SgExpression *e_spec[2];
-        SgExpression *e = clause[ACROSS_];
-        int all_steps = Analyze_DO_steps(step,step_mask,ndo);
-        InOutAcross(e,e_spec,stmt);
-        SgExpression *in_spec =e_spec[IN_];
-        SgExpression *out_spec=e_spec[OUT_];
-        if(not_in && in_spec && !out_spec) { // old implementation
-           stat = cur_st;//store current statement    
-           cur_st = stc; //insert statements for creating shadow group 
-		         //before CrtPL i.e. before creating parallel loop   
-           iacross = ndvm++;// index for ShadowGroupRef
-           //looking through the dependent_array_list
-           if(DepList(e->lhs(), stmt, DVM000(iacross),ANTIDEP)){
-              doCallAfter(StartBound(DVM000(iacross)));
-              doCallAfter(WaitBound(DVM000(iacross)));
-              doAssignStmtAfter(DeleteObject(DVM000(iacross)));
-              SET_DVM(iacross+1); 
-           }
-           if(DepList(e->lhs(), stmt, DVM000(iacross),FLOWDEP)){
-              doCallAfter(ReceiveBound(DVM000(iacross)));
-              doCallAfter(WaitBound(DVM000(iacross)));
-              SET_DVM(iacross+1);
-           } else {
-              if (iacross == -1)
-                 spec_accr = e->lhs();
-              else
-                 iacross =  0;
-           }
-           cur_st = stat; // restore cur_st 
-        } else  {// new implementation
-           iacrg=ndvm; ndvm+=3;
-           if(IN_COMPUTE_REGION || parloop_by_handler)
-              ndvm+=3;   
-           CreateShadowGroupsForAccross(in_spec,out_spec,stmt,ACC_GroupRef(iacrg),ACC_GroupRef(iacrg+1),ACC_GroupRef(iacrg+2),ag,all_steps,step_mask,(clause[TIE_] ? clause[TIE_]->lhs() : NULL) ); 
-          /*                                    
-           if(all_positive_step) //(PositiveDoStep(step,ndo))
-              CreateShadowGroupsForAccross(in_spec,out_spec,stmt,ACC_GroupRef(iacrg),ACC_GroupRef(iacrg+1),ACC_GroupRef(iacrg+2),ag,all_positive_step,loop_num);
-           else {
-              //ag[1] = -1;              
-              if(out_spec  || in_spec->rhs() ) 
-               //if(in_spec->rhs()) in_spec->rhs()->unparsestdout();     
-                 err("Illegal ACROSS clause",444,stmt); 
-              else if (stmt->expr(0)->symbol()  != (in_spec->lhs()->variant() == ARRAY_OP ? in_spec->lhs()->lhs()->symbol() : in_spec->lhs()->symbol()))
-                 Error("The base array '%s' should be specified in ACROSS clause", stmt->expr(0)->symbol()->identifier(), 256, stmt); 
-              DefineLoopNumberForNegStep(step_mask,DefineLoopNumberForDimension(stmt,loop_num),loop_num);
-              CreateShadowGroupsForAccrossNeg(in_spec,stmt,ACC_GroupRef(iacrg),ACC_GroupRef(iacrg+2),ag,all_positive_step,loop_num);
-              //k=ag[2]; ag[2] = ag[0]; ag[0] = k;   
-                            
-           }  */                
-        }
-     }
-
-//------------------------------------------------------------------------------
-
-  iinp = ndvm;    
-  if(dvm_debug) 
-     OpenParLoop_Inter(stl,iinp,iinp+nloop,do_var,nloop);
-// creating LoopVarAddrArray, LoopVarTypeArray,InpInitIndexArray, InpLastIndexArray
-// and InpStepArray  
-  for(i=0,dovar=stmt->expr(2); i<nloop; i++,dovar=dovar->rhs()) 
-     doAssignStmtAfter(GetAddres(do_var[i]));
-  
-  for(i=0; i<nloop; i++)
-     doAssignStmtAfter( new SgValueExp(LoopVarType(do_var[i],stmt)));
-  for(i=0; i<nloop; i++)
-     doAssignStmtAfter( init[i] );
-  for(i=0; i<nloop; i++)
-     doAssignStmtAfter( last[i] );
-  for(i=0; i<nloop; i++)
-     doAssignStmtAfter( step[i] );
-
-// creating AxisArray, CoeffArray and ConstArray 
-  spat = (stmt->expr(0))->symbol();   // target array symbol
-  head = HeaderRef(spat);
-  iaxis = ndvm; 
-  nr = doAlignIteration(stmt,NULL);
-
-  if(isg) {
-         // generating assign statement:
-         //  dvm000(i) = waitsh(BoundGroupRef)
-         doCallAfter(WaitBound(DVM000(isg)));
-          }
-     
-// generating assign statement:
-//   dvm000(i) =
-//       mappl(LoopRef, PatternRef, AxisArray[], CoefArray[], ConstArray[],
-//              LoopVarAdrArray[], InpInitIndexArray[], InpLastIndexArray[],
-//              InpStepArray[], 
-//              OutInitIndexArray[], OutLastIndexArray[], OutStepArray[])
-  
-  doCallAfter( BeginParLoop (iplp, head, nloop, iaxis, nr, iinp, iout));
-
-  if(redgref) {
-    if(!irg) {
-        st2 = doIfForCreateReduction( redgref->symbol(),nloopred,1);
-        st3 = cur_st;
-        ReductionList(red_list,redgref,stmt,stg,st2,0);
-        cur_st = st3;
-        InsertNewStatementAfter( new SgAssignStmt(*DVM000(ndvm),*new SgValueExp(0)),cur_st,cur_st->controlParent());
-    } else  
-        ReductionList(red_list,redgref,stmt,stg,cur_st,0); 
-  }
-
-  if(consgref) {
-    if(!iconsg) {
-        st2 = doIfForCreateReduction( consgref->symbol(),nloopcons,1);
-        st3 = cur_st;
-        ConsistentArrayList(cons_list,consgref,stmt,stcg,st2);
-        cur_st = st3;
-        InsertNewStatementAfter( new SgAssignStmt(*DVM000(ndvm),*new SgValueExp(0)),cur_st,cur_st->controlParent());
-    } else  
-        ConsistentArrayList(cons_list,consgref,stmt,stcg,cur_st);      
-  }
-
-  if(clause[REMOTE_ACCESS_])  //rvle
-    RemoteVariableList(clause[REMOTE_ACCESS_]->symbol(), clause[REMOTE_ACCESS_]->lhs(), stmt);
-
-  if(iacross == -1)
-    ReceiveArray(spec_accr,stmt);
-
-  if(clause[ACROSS_] && !clause[STAGE_])    // there is ACROSS clause and is not STAGE clause
-       stage = &c0.copy(); //IN_COMPUTE_REGION ? GetStage(first_do,iplp) : &c0.copy();
-      
-  if(all_positive_step) {
-  if(ag[0]) {
-       pipeline=1;
-       doAssignTo_After(new SgVarRefExp(Pipe), stage);
-                                   
-       if(ACC_program && ag[2])      /*ACC*/
-       // generating call statement ( in and out compute region):
-       //  call dvmh_shadow_renew( BoundGroupRef)              
-         doCallAfter(ShadowRenew_H (DVM000(iacrg+2) ));   
-       doCallAfter(InitAcross(0,(ag[2] ? DVM000(iacrg+2) : ConstRef(0)),DVM000(iacrg)));
-       if(IN_COMPUTE_REGION || parloop_by_handler)
-       { oldGroup = ag[2] ? DVM000(iacrg+5) : ConstRef(0); /*ACC*/
-         newGroup = DVM000(iacrg+3);                       /*ACC*/
-       }
-     if(ag[1]) {                                        
-       doCallAfter(InitAcross(1,  ConstRef(0),  DVM000(iacrg+1)));
-       if(IN_COMPUTE_REGION || parloop_by_handler)
-       { oldGroup2 =  ConstRef(0);                         /*ACC*/
-         newGroup2 =  DVM000(iacrg+4);                      /*ACC*/
-       }
-      } 
-  } 
-  else {
-    if(ag[1]){
-       pipeline=1; 
-       doAssignTo_After(new SgVarRefExp(Pipe), stage);    
-         
-       if(ACC_program && ag[2])                          /*ACC*/
-       // generating call statement ( in and out compute region):
-       //  call dvmh_shadow_renew( BoundGroupRef)              
-         doCallAfter(ShadowRenew_H (DVM000(iacrg+2) ));   
-
-       doCallAfter(InitAcross(1,(ag[2] ? DVM000(iacrg+2) : ConstRef(0)),DVM000(iacrg+1)));
-       if(IN_COMPUTE_REGION || parloop_by_handler)        
-       { oldGroup = ag[2] ? DVM000(iacrg+5) : ConstRef(0); /*ACC*/
-         newGroup = DVM000(iacrg+4);                       /*ACC*/
-       }
-    } 
-    else if(ag[2]){
-       //err("SHADOW_RENEW clause is required",...,stmt);
-       pipeline=1; 
-       doAssignTo_After(new SgVarRefExp(Pipe), stage);    
-       if(ACC_program)      /*ACC*/
-       // generating call statement ( in and out compute region):
-       //  call dvmh_shadow_renew( BoundGroupRef)              
-         doCallAfter(ShadowRenew_H (DVM000(iacrg+2) ));   
-       //doCallAfter(StartBound(DVM000(iacrg+2)));              /*09.12.19*/
-       //doCallAfter(WaitBound (DVM000(iacrg+2)));              /*09.12.19*/
-       doCallAfter(InitAcross(1,DVM000(iacrg+2), ConstRef(0))); /*09.12.19*/
-       if(IN_COMPUTE_REGION || parloop_by_handler)        
-       { oldGroup = DVM000(iacrg+5);                      /*ACC*/
-         newGroup = ConstRef(0);                          /*ACC*/
-       }
-    }
-  } 
-  } else{ //there is negative loop step
-       if(ag[0]  || ag[2]) {
-       pipeline=1;
-       doAssignTo_After(new SgVarRefExp(Pipe), stage);
-                                   
-       if(ACC_program && ag[2])      /*ACC*/
-       // generating call statement ( in and out compute region):
-       //  call dvmh_shadow_renew( BoundGroupRef)              
-         doCallAfter(ShadowRenew_H (DVM000(iacrg+2) ));   
-       doCallAfter(InitAcross(0,(ag[2] ? DVM000(iacrg+2) : ConstRef(0)),(ag[0] ? DVM000(iacrg) : ConstRef(0))));        
-       if(IN_COMPUTE_REGION || parloop_by_handler)      
-       { oldGroup = ag[2] ? DVM000(iacrg+5) : ConstRef(0); /*ACC*/
-         newGroup = ag[0] ? DVM000(iacrg+3) : ConstRef(0); /*ACC*/
-       }
-    }
-  }
-  if(dvm_debug) {
-      pardo_line = first_do->lineNumber();
-      DebugParLoop(cur_st,nloop,iinp+2*nloop);
-  } 
- 
-  StoreLoopPar(init,nloop,iout,NULL);
-  StoreLoopPar(last,nloop,iout+nloop,NULL);
-
-  if(opt_loop_range) ChangeLoopInitPar(first_do,nloop,init,stmt->lexNext());//must be after StoreLoopPar
-
-  if (OMP_program == 1) { /*OMP*/
-	  if (clause[ACROSS_]) { /*OMP*/
-	      ChangeAccrossOpenMPParam (first_do,newj,ub); /*OMP*/
-	  } /*OMP*/
-  } /*OMP*/
-
-
-  if(!IN_COMPUTE_REGION && !parloop_by_handler)
-  {
-   // generating Logical IF statement:
-       // begin_lab  IF (DoPL(LoopRef) .EQ. 0) GO TO end_lab
-       // and inserting it before  loop nest
-       SgStatement *stn = cur_st;
-       SgStatement *continue_stat = new SgStatement(CONT_STAT); /*OMP*/
-       continue_stat->addAttribute (OMP_MARK);
-       InsertNewStatementAfter(continue_stat,cur_st,cur_st->controlParent()); /*OMP*/
-       LINE_NUMBER_AFTER(first_do,cur_st);
-       begin_lab = GetLabel();
-       stn->lexNext()-> setLabel(*begin_lab); 
-       end_lab   = GetLabel();
-       if(dvm_debug && dbg_if_regim)
-       {
-           int ino;
-	   ino = ndvm;
-           doAssignStmtAfter(new SgValueExp(pardo_No)); 
-           dopl = doPLmb(iplp,ino);
-       } else
-         dopl =  doLoop(iplp);
-                     //if_stmt = new SgLogIfStmt(SgEqOp(*dopl , c0), *new SgGotoStmt(*end_lab));
-                     //if_stmt -> setLabel(*begin_lab); /*29.06.01*/
-                     //          BIF_LABEL(stmt->thebif) = NULL;  
-       doAssignStmtAfter(dopl);  // podd 17.05.11 (doLoop(iplp));/*OMP*/
-       SgGotoStmt *go=new SgGotoStmt(*end_lab);/*OMP*/
-       go->addAttribute (OMP_MARK);/*OMP*/
-       if_stmt = new SgLogIfStmt(SgEqOp(*DVM000(ndvm-1), c0), *go);/*OMP*/
-       if_stmt->addAttribute (OMP_MARK);/*OMP*/
-                     //if_stmt = new SgLogIfStmt(SgEqOp(*dopl , c0), *new SgGotoStmt(*end_lab));
-                     //cur_st->insertStmtAfter(*if_stmt);
-       InsertNewStatementAfter (if_stmt, cur_st, cur_st->controlParent ());/*OMP*/
-       if(opt_loop_range) 
-       {
-            cur_st=if_stmt->lexNext()->lexNext();
-            doAssignIndexVar(stmt->expr(2),iout,init);   
-       }          
-       (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF
-                                                               // (error Sage)
-  } 
-       	      
-  if(IN_COMPUTE_REGION || parloop_by_handler)      /*ACC*/
-  {    int ilh = doParallelLoopByHandler(iplp, first_do, clause, oldGroup, newGroup,oldGroup2, newGroup2); 
-       ACC_CreateParallelLoop(ilh,first_do,nloop,stmt,clause,1);
-  }
-
-  if(dvm_debug && dbg_if_regim>1) 
-  {
-          SgStatement *ifst = new SgIfStmt(*DebugIfNotCondition(), *stdeb); //*new SgStatement(CONT_STAT));// *stdeb); //, *new SgStatement(CONT_STAT));
-           
-          (if_stmt->lexNext())->insertStmtAfter(*ifst,*if_stmt->controlParent());
-
-          // generating GO TO statement:  GO TO begin_lab
-          // and inserting it after last statement of parallel loop nest copy
-                // InsertNewStatementBefore(new SgGotoStmt(*begin_lab),ifst->lastNodeOfStmt());
-                //(ifst->lastNodeOfStmt())->insertStmtBefore(*new SgGotoStmt(*begin_lab),*ifst);
-                //InsertNewStatementAfter(new SgGotoStmt(*begin_lab),stdeb->lastNodeOfStmt(),ifst);
-          (stdeb->lastNodeOfStmt())->insertStmtAfter(*new SgGotoStmt(*begin_lab),*ifst);
-          TranslateBlock(stdeb);          
-   } 
-
-}
-
-void ChangeLoopInitPar(SgStatement*first_do,int nloop,SgExpression *do_init[],SgStatement *after)
-{ SgStatement *stat, *st;
-  SgForStmt *stdo;
-  SgSymbol *s,*do_var, *s_start;
-  SgExpression *init;
-  int i;
-  stat=cur_st;
-  cur_st=after;
-
-  for(st=first_do,i=0; i<nloop; st=st->lexNext(),i++) {
-    stdo = isSgForStmt(st);
-    if(!stdo) break;  
-    do_var = stdo->symbol();     
-    init   = stdo->start();
-//   for(i=0; i<n; i++) 
-    if(isSgVarRefExp(init)) {
-      s = init->symbol();
-      if(s && isInSymbList(newvar_list,s)){
-        s_start = CreateInitLoopVar(do_var,s);
-        doAssignTo_After(new SgVarRefExp(s_start),&(init->copy()));
-        stdo->setStart(*new SgVarRefExp(s_start));
-        do_init[i] = stdo->start(); 
-      }
-    }
-  }
-  cur_st=stat;
-}
-
-int PositiveDoStep(SgExpression *step[], int i)
-{int s;
- SgExpression *es;
- if(step[i]->isInteger())
-    s=step[i]->valueInteger();
- else if((es=Calculate(step[i]))->isInteger())
-    s= es->valueInteger();
- else
- { err("Non constant step in parallel loop nest with ACROSS clause",613,par_do);
-   s =0;
- } 
- if(s >= 0)
-    return(1);
- else
-    return(0);
-
-}
-
-int Analyze_DO_steps(SgExpression *step[], int step_mask[],int ndo)
-{ int s,i;
- s=1;
- for(i=0; i<ndo; i++) {
-    step_mask[i] = PositiveDoStep(step, i);
-    s = s && step_mask[i];
- }
-  if(s) return(1);
-  s = -1;
-  for(i=0; i<ndo; i++)  
-     if(step_mask[i] > 0)
-        return (0);
-  return (-1);
-}
-
-void InOutAcross(SgExpression *e, SgExpression* e_spec[], SgStatement *stmt)
-{    
-   e_spec[IN_] = NULL;
-   e_spec[OUT_]= NULL;
-   InOutSpecification(e->lhs(), e_spec);
-   InOutSpecification(e->rhs(), e_spec);
-   if(e->lhs() && e->rhs() && (e_spec[IN_] == NULL || e_spec[OUT_] == NULL))
-      err("Double IN/OUT specification in ACROSS clause",257 ,stmt); 
-}
-
-void InOutSpecification(SgExpression *ea,SgExpression* e_spec[])
-{
-           SgKeywordValExp *kwe;
-                 
-           if(!ea) return;
-           if(ea->variant() != DDOT) { 
-              e_spec[IN_] = ea; 
-           } else {
-              if((kwe=isSgKeywordValExp(ea->lhs())) && (!strcmp(kwe->value(),"in")))
-                     e_spec[IN_]  = ea->rhs();
-              else           
-                     e_spec[OUT_] = ea->rhs();
-           }            
-}
-
-void CreateShadowGroupsForAccross(SgExpression *in_spec,SgExpression *out_spec,SgStatement * stmt,SgExpression *gleft,SgExpression *g,SgExpression *gright,int ag[],int all_steps,int step_mask[],SgExpression *tie_list)
-{
-  RecurList(in_spec, stmt,gleft, ag,0,all_steps,step_mask,tie_list); 
-  RecurList(out_spec,stmt,gleft, ag,0,all_steps,step_mask,tie_list);
-  RecurList(in_spec, stmt,gright,ag,2,all_steps,step_mask,tie_list); 
-  RecurList(out_spec,stmt,gright,ag,2,all_steps,step_mask,tie_list); 
-  if(ag[1] == -1)
-     ag[1] = 0;
-  else
-     RecurList(out_spec,stmt,g,ag,1,all_steps,step_mask,tie_list); 
-}
-
-void DefineLoopNumberForNegStep(int step_mask[], int n,int loop_num[])
-{int i;
- for(i=0;i<n;i++)
-   if(loop_num[i] > 0)
-     if(step_mask[loop_num[i]-1] > 0)
-       loop_num[i] = 0;
-}
-
-void DefineStepSignForDimension( int step_mask[], int n, int loop_num[], int sign[] )
-{int i;
-  for(i=0; i<MAX_DIMS; i++)
-    sign[i] = 0; 
-  for(i=0;i<n;i++)
-    if(loop_num[i] > 0)
-      sign[i] = step_mask[loop_num[i]-1] > 0 ? 1 : -1;
-}
-
-/*
-void CreateShadowGroupsForAccrossNeg(SgExpression *in_spec, SgStatement * stmt, SgExpression *gleft,SgExpression *gright,int ag[],int all_positive_step,int loop_num[])
-{
-  RecurList(in_spec, stmt,gleft, ag,0,all_positive_step,loop_num);
- // RecurList(out_spec,stmt,gleft, ag,0);
-  RecurList(in_spec, stmt,gright,ag,2,all_positive_step,loop_num);
- // RecurList(out_spec,stmt,gright,ag,2);
-  if(ag[1] == -1)
-     ag[1] = 0;
- // else
- //    RecurList(out_spec,stmt,g,ag,1); 
-}
-*/
-
-SgExpression *FindArrayRefWithLoopIndexes(SgSymbol *ar, SgStatement *st, SgExpression *tie_list)
-{
-  SgExpression *arr_ref = NULL;
-  if( ar == st->expr(0)->symbol())
-    arr_ref =  st->expr(0);
-  else  
-    arr_ref = tie_list ? isInTieList(ar, tie_list) : NULL;
-  if(!arr_ref)
-    Error("Array from ACROSS clause should be specified in TIE clause: %s", ar->identifier(), 648, st);
-  return arr_ref;
-}
-
-int RecurList (SgExpression *el, SgStatement *st, SgExpression *gref, int *ag, int gnum,int all_steps,int step_mask[],SgExpression *tie_list)
-{ SgValueExp c1(1);
-  int rank,ndep;
-  int  ileft,idv[6];
-  SgExpression *es, *ear, *head, *esec, *esc, *lrec[MAX_DIMS], *rrec[MAX_DIMS], *gref_acc = NULL;
-  SgSymbol *ar;
-  int loop_num[MAX_DIMS], sign[MAX_DIMS];
-  //int nel = 0;
-
-  // looking through the dependent_array_list
-  for(es = el; es; es = es->rhs()) {
-    if( es->lhs()->variant() == ARRAY_OP){
-      ear = es->lhs()->lhs();
-      esec= es->lhs()->rhs();
-      //corner = 1;
-    } else {
-      ear = es->lhs(); // dependent_array 
-      esec = NULL;
-      //corner = 0;
-      if(!ear->lhs()){ //whole array
-        iacross = -1;
-        return(0);
-      }
-    }
-     ar = ear->symbol();
-     if(HEADER(ar))
-       head = HeaderRef(ar);
-     else 
-     {
-       Error("'%s' isn't distributed array", ar->identifier(), 72,st);
-       return(0);
-     }
-     rank = Rank(ar);
-     ileft = ndvm;   
-     if(!all_steps) 
-       DefineStepSignForDimension(step_mask, DefineLoopNumberForDimension(st, FindArrayRefWithLoopIndexes(ar,st,tie_list), loop_num), loop_num, sign); 
-     ndep = doRecurLengthArrays(ear->lhs(), ear->symbol(), st, gnum, all_steps, sign); 
-     if(!ndep) continue;
-     if(GROUP_INDEX(gref))
-       gref_acc=DVM000(*GROUP_INDEX(gref));
-     ag[gnum]++;
-     if(ag[gnum] == 1)
-     { CreateBoundGroup(gref);        
-       if( (IN_COMPUTE_REGION || parloop_by_handler) && GROUP_INDEX(gref) )  /*ACC*/
-          CreateBoundGroup(gref_acc);
-     }
-
-     if(!esec)
-     { doCallAfter(InsertArrayBoundDep(gref, head, ileft, ileft+rank, 1, ileft+2*rank));
-       if( (IN_COMPUTE_REGION || parloop_by_handler) && GROUP_INDEX(gref) )  /*ACC*/
-          doCallAfter(InsertArrayBoundDep(gref_acc, head, ileft, ileft+rank, 1, ileft+2*rank));
-     }
-     else {
-       if(!Recurrences(ear->lhs(),lrec,rrec,MAX_DIMS))
-          err("Recurrence list is not specified", 261, st);
-       for(esc=esec; esc; esc=esc->rhs()) {
-          doSectionIndex(esc->lhs(), ear->symbol(), st, idv, ileft, lrec, rrec);
-          doCallAfter(InsertArrayBoundSec(gref, head, idv[0],idv[1],idv[2], idv[3],idv[4], idv[5], 1, ileft+2*rank));  
-          if( (IN_COMPUTE_REGION || parloop_by_handler) && GROUP_INDEX(gref) )  /*ACC*/
-            doCallAfter(InsertArrayBoundSec(gref_acc, head, idv[0],idv[1],idv[2], idv[3],idv[4], idv[5], 1, ileft+2*rank));    
-       }
-
-     }     
-  }
-  return(ag[gnum]);
-}
-
-int doRecurLengthArrays(SgExpression *shl, SgSymbol *ar, SgStatement *st, int rtype, int all_steps,int sign[])
-{SgValueExp c0(0),c1(1),cM1(-1),c3(3), c5(5);
- int rank,nw,nnl,positive=0;
- int i=0;
- nnl = 0;
- SgExpression *wl,*ew, *bound[MAX_DIMS],*null[MAX_DIMS],*shsign[MAX_DIMS],*eneg;
- rank = Rank(ar);
- if(!shl)  //without dependence-list ,
-           // by default dependence length is equal to the maximal size of shadow edge
-   for(i=rank-1,nnl=1; i>=0; i--) {
-        bound[i]  = &cM1;
-        null[i]   = &c0;
-        shsign[i] = &c3;
-   }
- if(!TestMaxDims(shl,ar,st))
-     return(0);
- for(wl = shl; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     positive = (all_steps == 1 || all_steps == 0 && sign[i] >= 0) ? 1 : 0;
-     if(rtype > 0) {
-       if(positive)  
-         bound[i] = &(ew->rhs())->copy();//right bound 
-       else 
-         bound[i] = &(ew->lhs())->copy();//left bound
-         
-     } 
-     else {
-      if(positive)   
-         bound[i] = &(ew->lhs())->copy();//left bound
-       else
-         bound[i] = &(ew->rhs())->copy();//right bound
-     }  
-     null[i] = &c0;
-     if(bound[i]->variant() != INT_VAL) {
-         Error("Wrong dependence length of distributed array '%s'",ar->identifier(),179,st);
-         shsign[i] = &c1;
-     }
-     else if(bound[i]->valueInteger() != 0) {           
-             nnl++;
-             if(positive) 
-                 shsign[i] = (rtype > 0) ?  &c5 : &c3;
-             else {
-                 shsign[i] = (rtype > 0) ?  &c3 : &c5; 
-                 eneg = null[i] ;
-                 null[i] = bound[i];
-                 bound[i] = eneg;
-             }
-     }    else
-               shsign[i] = &c1;
- }
-  nw = i; 
-
-  if (rank && (nw != rank) ) {// wrong dependence length list length
-    if(rtype == 0)
-    Error("Wrong dependence length list of distributed array '%s'", ar->identifier(),180,st); 
-    return(0);
-  }
-  if(!nnl) return(0);
-  if(rtype > 0){
-    TestShadowWidths(ar, null, bound, nw, st);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(null[i]);   
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(bound[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(shsign[i]);
-  }
-  else {
-    TestShadowWidths(ar, bound, null, nw, st);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(bound[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(null[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(shsign[i]);
-  }
-  return(nnl);
-}
-
-/* according Language Description (by dependence length)
-int doRecurLengthArrays(SgExpression *shl, SgSymbol *ar, SgStatement *st, int rtype,int all_positive_step,int loop_num[])
-{SgValueExp c0(0),c1(1),cM1(-1),c3(3), c5(5);
- int rank,nw,nnl,flag;
- int i=0;
- nnl = 0;
- SgExpression *wl,*ew, *bound[MAX_DIMS],*null[MAX_DIMS],*shsign[MAX_DIMS],*eneg;
- rank = Rank(ar);
- if(!shl)  //without dependence-list ,
-           // by default dependence length is equal to the maximal size of shadow edge
-   for(i=rank-1,nnl=1; i>=0; i--){
-        bound[i]  = &cM1;
-        null[i]   = &c0;
-        shsign[i] = &c3;
-   }
- if(!TestMaxDims(shl,ar,st))
-     return(0);
- for(wl = shl; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     flag = all_positive_step ? 0 : loop_num[i];
-     if(rtype > 0) {
-                      //if(!flag)  
-         bound[i] = &(ew->rhs())->copy();//right bound 
-                      //else 
-                      //  bound[i] = &(ew->lhs())->copy();//left bound
-         
-     } 
-     else {
-                     //if(!flag) 
-         bound[i] = &(ew->lhs())->copy();//left bound
-                     //else
-                     //  bound[i] = &(ew->rhs())->copy();//right bound
-     }  
-     null[i] = &c0;
-     if(bound[i]->variant() != INT_VAL) {
-         Error("Wrong dependence length of distributed array '%s'",ar->identifier(),179,st);
-         shsign[i] = &c1;
-     }
-     else if(bound[i]->valueInteger() != 0) {           
-             nnl++;
-             if(!flag)
-                 shsign[i] = (rtype > 0) ?  &c5 : &c3;
-             else {
-                 shsign[i] = (rtype > 0) ?  &c3 : &c5; 
-                 eneg = null[i] ;
-                 null[i] = bound[i];
-                 bound[i] = eneg;
-             }
-     }    else
-               shsign[i] = &c1;
- }
-  nw = i; 
-
-  if (rank && (nw != rank) ) {// wrong dependence length list length
-    if(rtype == 0)
-    Error("Wrong dependence length list of distributed array '%s'", ar->identifier(),180,st); 
-    return(0);
-  }
-  if(!nnl) return(0);
-  if(rtype > 0){
-    TestShadowWidths(ar, null, bound, nw, st);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(null[i]);   
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(bound[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(shsign[i]);
-  }
-  else {
-    TestShadowWidths(ar, bound, null, nw, st);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(bound[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(null[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(shsign[i]);
-  }
-  return(nnl);
-}
-*/
-
-int Recurrences(SgExpression *shl, SgExpression *lrec[], SgExpression *rrec[],int n)
-{SgValueExp c0(0),c1(1);
- int i;
- SgExpression *wl,*ew;
- if(!shl) //without recurrence list
-    return(0);
- for(i=n; i;i--){
-     rrec[i-1] = &c0.copy();
-     lrec[i-1] = &c0.copy();
- }
-  for(wl = shl,i=0; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     rrec[i] = &(ew->rhs())->copy();//right bound 
-     lrec[i] = &(ew->lhs())->copy();//left bound
-} 
- return(i);
-}
-
-int DepList (SgExpression *el, SgStatement *st, SgExpression *gref, int dep)
-{ SgValueExp c1(1);
-  int corner,rank,ndep;
-  int  ileft;
-  SgExpression *es, *ear, *head;
-  SgSymbol *ar;
-  int nel = 0;
-  // looking through the dependent_array_list
-  for(es = el; es; es = es->rhs()) {
-    if( es->lhs()->variant() == ARRAY_OP){
-      ear = es->lhs()->lhs();
-      corner = 1;
-    } else {
-      ear = es->lhs(); // dependent_array 
-      corner = 0;
-      if(!ear->lhs()){ //whole array
-        iacross = -1;
-        return(0);
-      }
-    }
-     ar = ear->symbol();
-     if(HEADER(ar))
-       head = HeaderRef(ar);
-     else {
-       Error("'%s' isn't distributed array", ar->identifier(), 72,st);
-       return(0);
-     }
-     rank = Rank(ar);
-     ileft = ndvm;  
-     ndep = doDepLengthArrays(ear->lhs(), ear->symbol(), st,dep);
-     if(!ndep) continue;
-     nel++;
-     if(nel == 1)
-       CreateBoundGroup(gref);
-     if(dep == ANTIDEP)
-       doCallAfter(InsertArrayBound(gref, head, ileft, ileft+rank, corner));  
-     else 
-       doCallAfter(InsertArrayBoundDep(gref, head, ileft, ileft+rank,(corner ? rank : 1), ileft+2*rank));       
-  }
-  return(nel);
-}
-/*
-int doDepLengthArrays(SgExpression *shl, SgSymbol *ar, SgStatement *st, int dep)
-{SgValueExp c0(0);
- int rank,iright,nw,nnl;
- int i=0;
- SgExpression *wl,*ew, *lbound[7], *ubound[7];
- rank = Rank(ar);
- nnl = 0;
- for(wl = shl; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     if(dep == ANTIDEP){
-       lbound[i] = &c0;                 //left bound 
-       ubound[i] = &(ew->rhs())->copy();//right bound 
-       if(ubound[i]->variant() != INT_VAL)
-        Error("Wrong dependence length of distributed array '%s'",ar->identifier(),179,st);
-       else if(ubound[i]->valueInteger() != 0)
-         nnl++;    
-     } else {
-       lbound[i] = &(ew->lhs())->copy();//left bound
-       ubound[i] = &c0;                 //right bound 
-       if(lbound[i]->variant() != INT_VAL)
-        Error("Wrong dependence length of distributed array '%s'",ar->identifier(),179,st);
-       else if(lbound[i]->valueInteger() != 0)
-         nnl++; 
-     }
-  }
-  nw = i; 
-  TestShadowWidths(ar, lbound, ubound, nw, st);
-  if (rank && (nw != rank)) {// wrong shadow width list length
-     Error("Length of shadow-edge-list is not equal to  the rank of array '%s'",ar->identifier(),88,st); 
-     return(0);
-  }
-  if(dep == ANTIDEP)
-  for(i=rank-1;i>=0; i--)
-     doAssignStmtAfter(lbound[i]);
-  iright = 0;
-  if(nnl)
-    iright = ndvm;
-    for(i=rank-1;i>=0; i--)
-      doAssignStmtAfter(ubound[i]);
-  return(iright);
-
-}
-*/
-
-int doDepLengthArrays(SgExpression *shl, SgSymbol *ar, SgStatement *st, int dep)
-{SgValueExp c0(0),c1(1),cM1(-1),c3(3);
- int rank,nw,nnl;
- int i=0;
- nnl = 0;
- SgExpression *wl,*ew, *bound[MAX_DIMS],*null[MAX_DIMS],*shsign[MAX_DIMS];
- rank = Rank(ar);
- if(!shl)  //without dependence-list ,
-           // by default dependence length is equal to the maximal size of shadow edge
-   for(i=rank-1,nnl=1; i>=0; i--){
-        bound[i]  = &cM1;
-        null[i]   = &c0;
-        shsign[i] = &c3;
-   }
- if(!TestMaxDims(shl,ar,st))
-     return(0);  
- for(wl = shl; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     if(dep == ANTIDEP)
-       bound[i] = &(ew->rhs())->copy();//right bound 
-     else
-       bound[i] = &(ew->lhs())->copy();//left bound
-     null[i] = &c0;
-     if(bound[i]->variant() != INT_VAL) {
-         Error("Wrong dependence length of distributed array '%s'",ar->identifier(),179,st);
-         shsign[i] = &c1;
-     } 
-     else if(bound[i]->valueInteger() != 0) {
-             nnl++;
-             shsign[i] = &c3;
-     }    else
-             shsign[i] = &c1;
- }
-  nw = i; 
-
-  if (rank && (nw != rank)) {// wrong dependence length list length
-    if(dep == ANTIDEP)
-    Error("Wrong dependence length list of distributed array '%s'", ar->identifier(),180,st); 
-     return(0);
-  }
-  if(!nnl) return(0);
-  if(dep == ANTIDEP){
-    TestShadowWidths(ar, null, bound, nw, st);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(null[i]);   
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(bound[i]);
-  }
-  else {
-    TestShadowWidths(ar, bound, null, nw, st);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(bound[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(null[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(shsign[i]);
-  }
-  return(nnl);
-}
-
-/*
-int doDepLengthArrays(SgExpression *shl, SgSymbol *ar, SgStatement *st, int dep, int *maxn)
-{SgValueExp c0(0),c1(1),cM1(-1);
- int rank,nw,nnl,nsh;
- int i=0;
- nnl = 0;
- nsh = 0;
- SgExpression *wl,*ew, *bound[7],*null[7],*shsign[7];
- rank = Rank(ar);
- if(!shl)  //without dependence-list ,
-           // by default dependence length is equal to the maximal size of shadow edge
-   for(i=rank-1,nnl=1; i>=0; i--){
-        bound[i]  = &cM1;
-        null[i]   = &c0;
-        shsign[i] = new SgValueExp(7);
-   }
-  
- for(wl = shl; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     if(dep == ANTIDEP){
-       bound[i] = &(ew->rhs())->copy();//right bound 
-       null[i] = &c0;
-     }
-     else {
-       bound[i] = &(ew->lhs())->copy();//left bound
-       null[i] =  &(ew->rhs())->copy();//right bound 
-     }
-     if(bound[i]->variant() != INT_VAL)
-         Error("Wrong dependence length of distributed array '%s'",ar->identifier(),179,st);
-     else if(bound[i]->valueInteger() != 0) {
-             nnl++; nsh++;
-             shsign[i] = new SgValueExp(7);
-     }    else if(null[i]->valueInteger() != 0){
-             shsign[i] = new SgValueExp(5);
-             nsh++;
-     }    else
-             shsign[i] = &c1;
-     null[i]   = &c0;
- }
-  nw = i; 
-  *maxn = nsh;
-  if (rank && (nw != rank) && (dep == ANTIDEP)) {// wrong dependence length list length
-     Error("Wrong dependence length list of distributed array '%s'", ar->identifier(),180,st); 
-     return(0);
-  }
-  if(!nnl) return(0);
-  if(dep == ANTIDEP){
-    TestShadowWidths(ar, null, bound, nw, st);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(null[i]);   
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(bound[i]);
-  }
-  else {
-    TestShadowWidths(ar, bound, null, nw, st);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(bound[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(null[i]);
-    for(i=rank-1;i>=0; i--)
-        doAssignStmtAfter(shsign[i]);
-  }
-  return(nnl);
-}
-*/
-
-SgExpression *doLowHighList(SgExpression *shl, SgSymbol *ar, SgStatement *st)
-{
-  SgValueExp c1(1);
-  int nw, i;
-  SgExpression *wl, *ew, *lbound[MAX_DIMS], *hbound[MAX_DIMS];
-  int rank = Rank(ar);
-  if(!TestMaxDims(shl,ar,st))
-     return(NULL);
-  for(wl = shl,i=0; wl; wl = wl->rhs(),i++) {
-     ew = wl->lhs();
-     lbound[i] = &(ew->lhs())->copy(); 
-     hbound[i] = &(ew->rhs())->copy();
-     
-     if(lbound[i]->variant() != INT_VAL || hbound[i]->variant() != INT_VAL) {
-        Error("Wrong dependence length of distributed array '%s'",ar->identifier(), 179, st);
-        lbound[i] = hbound[i] = &c1;
-     }
-  }
-
-  nw = i; 
-
-  if (rank && (nw != rank) ) 
-     Error("Wrong dependence length list of distributed array '%s'", ar->identifier(), 180, st); 
-
-  TestShadowWidths(ar, lbound, hbound, nw, st);
-  
-  SgExpression *shlist = NULL; 
-  for(i=0; i<nw; i++)
-  { 
-     shlist = AddElementToList(shlist, DvmType_Ref(hbound[i]));
-     shlist = AddElementToList(shlist, DvmType_Ref(lbound[i]));
-  }
-
-  return( shlist );
-}
-
-SgExpression  *isInTieList(SgSymbol *ar, SgExpression *tie_list)
-{
-  SgExpression *el;
-  for(el=tie_list; el; el=el->rhs())
-  {
-    if(el->lhs()->symbol() && el->lhs()->symbol() == ar)
-      return (el->lhs());
-    else
-      continue;
-  }
-  return NULL;
-}
-
-void AcrossList(int ilh, int isOut, SgExpression *el, SgStatement *st, SgExpression *tie_clause)
-{ 
-  SgExpression *es, *ear, *head=NULL;  
-  
-  // looking through the dependent_array_list
-  for(es = el; es; es = es->rhs()) {
-    
-    if( es->lhs()->variant() == ARRAY_OP){
-      ear = es->lhs()->lhs();
-      err("SECTION  specification is not permitted", 643, st);
-    } else {
-      ear = es->lhs(); 
-      if(!ear->lhs()) { //whole array
-        Error("Dependence list is not specified for %s", ear->symbol()->identifier(), 644, st);
-        continue;
-      }
-    }
-    SgSymbol *ar = ear->symbol();
-
-    if(!st->expr(0) && (!tie_clause || !isInTieList(ar,tie_clause->lhs())))
-      Error("Array from ACROSS clause should be specified in TIE clause: %s", ar->identifier(), 648, st);
-    
-    SgExpression *head = HeaderForArrayInParallelDir(ar, st, 1);
-    doCallAfter(LoopAcross_H2(ilh, isOut, head, Rank(ar), doLowHighList(ear->lhs(), ar, st)));  
-  }
-}
-
-void StoreLoopPar(SgExpression *par[], int n, int ind, SgStatement*stl)
-{ SgStatement *stat = NULL;
-  SgSymbol*s;
-  int i;
- if(!newvar_list) return;
- if(stl) {
-   stat=cur_st;
-   cur_st=stl;
- }
-  for(i=0; i<n; i++) 
-    if(isSgVarRefExp(par[i])) {
-      s = par[i]->symbol();
-      if(s && isInSymbList(newvar_list,s))
-        doAssignTo_After(&(par[i]->copy()),DVM000(ind+i));
-    }
-  if(stl)
-    cur_st=stat;
-}
-
-void TestReductionList (SgExpression *el, SgStatement *st)
-{
-  SgExpression  *er, *ev, *ered, *loc_var;
-  symb_list *rv_list=NULL;
-  for(er = el; er; er=er->rhs()) {
-     ered = er->lhs();    //  reduction
-     ev = ered->rhs();    // reduction variable reference
-     loc_var=NULL;
-     if(isSgExprListExp(ev)) { // MAXLOC,MINLOC
-       ev = ev->lhs();
-       loc_var = ered->rhs()->rhs()->lhs();  
-     } 
-     if(!ev->symbol()) continue;
-     if(isInSymbList(rv_list,ev->symbol()) )
-       Error("Reuse of '%s' in REDUCTION clause", ev->symbol()->identifier(), 663, st );
-     else
-       rv_list = AddToSymbList(rv_list,ev->symbol());
-     if(!loc_var || !loc_var->symbol()) continue;
-     if(isInSymbList(rv_list,loc_var->symbol()) )
-       Error("Reuse of '%s' in REDUCTION clause", loc_var->symbol()->identifier(), 663, st ); 
-     else
-       rv_list = AddToSymbList(rv_list,loc_var->symbol());
-  }
-}
-
-void ReductionList  (SgExpression *el,SgExpression *gref, SgStatement *st, SgStatement *stmt1, SgStatement *stmt2, int ilh2)
-{ SgStatement *last,*last1;
-  SgExpression  *er, *ev, *ered, *loc_var,*len, *loclen, *debgref;
-  int   irv, irf, num_red, ia, ntype,sign, num, locindtype;
-  int itsk = 0, ilen = 0;
-  SgSymbol *var; 
-  SgValueExp c0(0),c1(1);
-
-  TestReductionList (el, st); // double use check
-  last = stmt2; last1 = stmt1;
-
-  //looking through the reduction list
-  for(er = el; er; er=er->rhs()) {
-     ered = er->lhs();    //  reduction
-     ev = ered->rhs(); // reduction variable reference
-     if(!isSgVarRefExp(ev) && !isSgArrayRefExp(ev) && !isSgExprListExp(ev))
-     {   err("Wrong reduction variable",151,st);
-         continue;
-     }
-     loc_var = ConstRef(0);
-     loclen = &c0;
-     locindtype = 0;
-     len =&c1;
-     num=num_red=RedFuncNumber(ered->lhs()); 
-     if( !num_red) 
-        err("Wrong reduction operation name", 70,st);
-       /* 
-        if(num_red == 8)  //EQV
-        err("Reduction function EQV is not supported now",st); 
-       */
-     if(num_red > 8) { // MAXLOC => 9,MINLOC =>10
-        num_red -= 6; // MAX => 3,MIN =>4
-       // change loc_array       
-        ev = ered->rhs()->lhs(); // reduction variable reference 
-        if( !ered->rhs()->rhs() || !ered->rhs()->rhs()->rhs() || ered->rhs()->rhs()->rhs()->rhs()){
-                                       //the number of operands is not equal to 3
-          err("Illegal operand list of MAXLOC/MINLOC",147,st);
-          continue;
-        }
-        loc_var = ered->rhs()->rhs()->lhs();        //location variable reference
-        loclen = ered->rhs()->rhs()->rhs()->lhs(); //the number of coordinates
-        if(isSgVarRefExp(loc_var))
-	    loclen =  TypeLengthExpr(loc_var->type()); //14.03.03 new SgValueExp(TypeSize(loc_var->type())); 
-        else if( isSgArrayRefExp(loc_var)) {
-            ia = loc_var->symbol()->attributes();
-            if((ia & DISTRIBUTE_BIT) ||(ia & ALIGN_BIT) || (ia & INHERIT_BIT))
-               Error("'%s' is distributed array", loc_var->symbol()->identifier(), 148,st); 
-	 /*
-            if(!loc_var->lhs()){ //whole array
-              if(Rank(loc_var->symbol())>1)
-                Error("Wrong operand of MAXLOC/MINLOC: %s",loc_var->symbol()->identifier(), 149,st);
-              loclen = ArrayDimSize(loc_var->symbol(),1); // size of vector in elements
-              if(!loclen || loclen->variant()==STAR_RANGE){
-                Error("Wrong operand of MAXLOC/MINLOC: %s",loc_var->symbol()->identifier(), st); 
-                loclen = &c0;
-              }
-              else
-                loclen = &((*ArrayDimSize(loc_var->symbol(),1)) * (*new SgValueExp(TypeSize(loc_var->symbol()->type()->baseType())))) ; // size of vector in bytes 
-	    }
-	 */   
-            loclen = &(*loclen * (*TypeLengthExpr(loc_var->symbol()->type()->baseType()))) ; // size of vector in bytes       
-        	//loclen = &(*loclen * (*new SgValueExp(TypeSize(loc_var->symbol()->type()->baseType())))) ; 14.03.03
-	}		   
-        else        
-            err("Wrong operand of MAXLOC/MINLOC",149,st); 
-     }
-     var = ev->symbol();
-     ia = var->attributes();
-     if(isSgVarRefExp(ev))  
-           redvar_list= AddNewToSymbList(redvar_list,var); 
-     else if( isSgArrayRefExp(ev)) {
-           
-             //if((ia & DISTRIBUTE_BIT) ||(ia & ALIGN_BIT)|| (ia & INHERIT_BIT))
-             //  Error("'%s' is distributed array", var->identifier(), 148,st);
-              
-           if(!ev->lhs()){ //whole array
-              len = ArrayLengthInElems(var,st,1); //size of array 
-              ev  = FirstArrayElement(var);  
-              if((ia & DISTRIBUTE_BIT) ||(ia & ALIGN_BIT)|| (ia & INHERIT_BIT))
-              { if(!only_debug) 
-                   ev = HeaderRefInd(var,1); 
-              }
-           }  
-     }
-     else
-        err("Wrong reduction variable",151,st); 
-     ntype = VarType_RTS(var);  //RedVarType
-     if(!ntype)
-        Error("Wrong type of reduction variable '%s'", var->identifier(), 152,st);
-
-     sign = 1;
-     if(stmt1 != stmt2) 
-       cur_st = last1;
-     if(gref)   // interface of RTS1
-     {  ilen = ndvm; // index for RedArrayLength
-        doAssignStmtAfter(len);
-        doAssignStmtAfter(loclen);
-     }
-     if(num > 8 && loc_var->symbol()) //MAXLOC,MINLOC
-       locindtype =  LocVarType(loc_var->symbol(),st);
-
-     irv = ndvm; // index for RedVarRef
-     if(!only_debug) {
-       if(IN_COMPUTE_REGION || inparloop && parloop_by_handler)    /*ACC*/
-       { 
-         if(ilh2)  // interface of RTS2
-         {  
-            doCallAfter(LoopReduction(ilh2,RedFuncNumber_2(num),ev,ntype,len,loc_var,loclen));
-            continue;
-         }
-         int *index = new int;
-         *index = irv;
-         // adding the attribute (REDVAR_INDEX) to expression for reduction operation
-          ered->addAttribute(REDVAR_INDEX, (void *) index, sizeof(int)); 
-
-         doCallAfter (GetActualScalar(var));
-         if(num > 8 && loc_var->symbol())
-           doCallAfter (GetActualScalar(loc_var->symbol()));
-       }
-       doAssignStmtAfter(ReductionVar(num_red,ev,ntype,ilen, loc_var, ilen+1,sign));       
-       if(num > 8 && loc_var->symbol()) {//MAXLOC,MINLOC
-         doAssignStmtAfter(LocIndType(irv, locindtype)); //LocVarType(loc_var->symbol(),st)));        
-       }  
-     }
-     if(debug_regim && st->variant()!=DVM_TASK_REGION_DIR) {
-       debgref = idebrg ? DVM000(idebrg) : DebReductionGroup(gref->symbol());
-       doCallAfter(D_InsRedVar(debgref,num_red,ev,ntype,ilen, loc_var, ilen+1,locindtype));
-     }
-     last1 = cur_st;
-     if(stmt1 != stmt2) 
-         cur_st = last;
-     if(!only_debug){
-       if(!itsk && st->variant()==DVM_TASK_REGION_DIR){
-         itsk = ndvm;
-         doAssignStmtAfter(new SgVarRefExp(TASK_SYMBOL(st->symbol())));
-       }
-       irf = (st->variant()==DVM_TASK_REGION_DIR) ? itsk : iplp;
-       doCallAfter(InsertRedVar(gref,irv,irf));
-     }
-     last = cur_st;
-  }   
-  /*  if(! only_debug)  
-   *     doAssignStmtAfter(SaveRedVars(gref));
-   */
-   return;
-}     
-
-void ReductionVarsStart  (SgExpression *el)
-{ 
-  SgExpression  *er, *ev, *ered;
-  int    num_red; 
-
-  //looking through the reduction list
-  for(er = el; er; er=er->rhs()) {
-     ered = er->lhs();    //  reduction
-     num_red=RedFuncNumber(ered->lhs()); 
-     if(num_red <= 8) { 
-        ev = ered->rhs();    // reduction variable reference
-        if(isSgVarRefExp(ev)){
-             doAssignStmtAfter(GetAddresMem(ev)) ;
-             FREE_DVM(1);
-        }
-        if(isSgArrayRefExp(ev) && !IS_DVM_ARRAY(ev->symbol())) {
-          if(!ev->lhs()) {//whole array
-             doAssignStmtAfter(GetAddresMem(FirstArrayElement(ev->symbol()))) ;
-             FREE_DVM(1);  
-	  }
-          else {
-             doAssignStmtAfter(GetAddresMem(ev)) ;
-             FREE_DVM(1);
-          }   
-        }
-     } else  { // MAXLOC => 9,MINLOC =>10
-        ev = ered->rhs()->lhs(); // reduction variable reference
-        if(isSgVarRefExp(ev)){
-             doAssignStmtAfter(GetAddresMem(ev)) ;
-             FREE_DVM(1);
-        }
-        if(isSgArrayRefExp(ev) && !IS_DVM_ARRAY(ev->symbol())) {
-          if(!ev->lhs()) {//whole array
-             doAssignStmtAfter(GetAddresMem(FirstArrayElement(ev->symbol()))) ;
-             FREE_DVM(1);  
-	  }
-          else {
-             doAssignStmtAfter(GetAddresMem(ev)) ;
-             FREE_DVM(1);
-          }   
-        }
-     /*
-        if( ered->rhs()->rhs()->rhs()){ //there are >1 location variables
-          ind = *((int*)(ered)->attributeValue(0,LOC_ARR));
-          for ( ind_var_list = ered->rhs()->rhs(),ind_num=0; ind_var_list; ind_var_list=ind_var_list->rhs(), ind_num++)
-            doAssignTo_After(DVM000(ind+ind_num),ind_var_list->lhs()) ;
-        } else
-     */
-	if(ered->rhs()->rhs() && isSgVarRefExp( ered->rhs()->rhs()->lhs())){
-                                                                       //location variable
-            doAssignStmtAfter(GetAddresMem( ered->rhs()->rhs()->lhs())) ;
-            FREE_DVM(1);
-	}  
-	if(ered->rhs()->rhs() && isSgArrayRefExp( ered->rhs()->rhs()->lhs()) && !IS_DVM_ARRAY(ered->rhs()->rhs()->lhs()->symbol())){ //location array
- 
-          if(!( ered->rhs()->rhs()->lhs())->lhs()) {//whole array
-            doAssignStmtAfter(GetAddresMem(FirstArrayElement((ered->rhs()->rhs()->lhs())->symbol()))) ;
-            FREE_DVM(1);
-	  } else {
-            doAssignStmtAfter(GetAddresMem( ered->rhs()->rhs()->lhs())) ;
-            FREE_DVM(1);
-	  }
-	}
-	
-     }
-  }   
-  if(redl) {// for HPF_program
-    reduction_list *erl;  
-    for(erl = redl; erl; erl=erl->next) {
-      num_red=erl->red_op;     
-      ev = erl->red_var; // reduction variable reference  
-      if(isSgVarRefExp(ev)){
-          doAssignStmtAfter(GetAddresMem(ev)) ;
-          FREE_DVM(1);
-      }   
-    }  
-  }       
-}    
-/*
-void ReductionVarsWait  (SgExpression *el)
-{ int ind;
-  SgExpression  *er, *ered, *ind_var_list;
-  int    num_red, ind_num; 
-  //looking through the reduction list
-  for(er = el; er; er=er->rhs()) {
-     ered = er->lhs();    //  reduction
-     num_red=RedFuncNumber(ered->lhs()); 
-     if((num_red > 8) && ( ered->rhs()->rhs()->rhs())){ // MAXLOC => 9,MINLOC =>10 and
-                                                        //there are >1 location variables
-        ind = *((int*)(ered)->attributeValue(0,LOC_ARR));
-        for ( ind_var_list = ered->rhs()->rhs(),ind_num=0; ind_var_list; ind_var_list=ind_var_list->rhs(), ind_num++)
-          doAssignTo_After(ind_var_list->lhs(),DVM000(ind+ind_num)) ;
-       } 
-      
-  }
-     
-}    
-*/
-
-int LocElemNumber(SgExpression *en)
-{
-    SgExpression *ec;
-    int n;
-    n = 0;
-    ec = Calculate(en);
-    if (ec->isInteger())
-        n = ec->valueInteger();
-    else
-        err("Can not calculate number of elements in location array", 595, parallel_dir);
-    return(n);
-}
-
-void    InsertReductions_H(SgExpression *red_op_list, int ilh)
-{
-    SgStatement *last;
-    SgExpression  *er, *ev, *ered, *loc_var, *en;
-    int   irv, num_red, num;
-    SgType *type, *loc_type;
-
-    last = NULL;
-    if (!irg && IN_COMPUTE_REGION)
-        err("Asynchronous reduction is not implemented yet for GPU", 596, parallel_dir);
-    //looking through the reduction_op_list
-    for (er = red_op_list; er; er = er->rhs())
-    {
-        ered = er->lhs();    //  reduction  (variant==ARRAY_OP)
-        irv = IND_REDVAR(ered);
-        ev = ered->rhs(); // reduction variable reference for reduction operations except MINLOC,MAXLOC 
-        num = num_red = RedFuncNumber(ered->lhs());
-        if (num > 8)   // MAXLOC => 9,MINLOC =>10
-        {
-            num_red -= 6; // MAX => 3,MIN =>4      
-            ev = ered->rhs()->lhs(); // reduction variable reference        
-            loc_var = ered->rhs()->rhs()->lhs();        //location array reference
-            if (loc_var->lhs())  // array element reference, it must be array name
-                Error("Wrong operand of MAXLOC/MINLOC: %s", loc_var->symbol()->identifier(), 149, parallel_dir);
-            en = ered->rhs()->rhs()->rhs()->lhs(); // number of elements in location array
-            loc_el_num = LocElemNumber(en);
-            loc_type = loc_var->symbol()->type();
-        }
-
-        type = ev->symbol()->type();
-        if (isSgArrayType(type))
-        {
-            if (isSgArrayRefExp(ev) && !ev->lhs() && !HEADER(ev->symbol())) // whole one-dimensional array
-                ;
-            else
-                Error("Reduction variable %s is array (array element), not implemented yet", ev->symbol()->identifier(), 597, parallel_dir);
-            type = type->baseType();
-        }
-
-        //if((nr =TestType(type)) == 5 || nr == 6)  // COMPLEX or DCOMPLEX
-        //   Error("Illegal type of reduction variable %s, not implemented yet for GPU",ev->symbol()->identifier(),592,parallel_dir);
-
-        InsertNewStatementAfter(LoopInsertReduction_H(ilh, irv), cur_st, cur_st->controlParent());
-
-    }
-}
-
-void NewVarList(SgExpression *nl,SgStatement *stmt)
-{SgExpression *el,*e;
-  for(el=nl; el;el=el->rhs()){
-     e=el->lhs();
-     if(e->symbol()){
-        newvar_list=AddToSymbList(newvar_list,e->symbol());
-        //testing
-        if(IS_DUMMY(e->symbol()) || IS_SAVE(e->symbol()) || IN_COMMON(e->symbol()))
-	  Error("Illegal variable in new-clause: %s",e->symbol()->identifier(),168,stmt); // variable in NEW clause may not be dummy argument, have the SAVE attribute,occur in a COMMON block        
-     }
-  } 
-}
-
-void ReceiveArray(SgExpression *spec_accr,SgStatement *parst)
-{SgExpression *es,*el;
- SgSymbol *ar;
- int is,tp;
- // looking through the array_list
-  for(es = spec_accr; es; es = es->rhs()) {
-     ar =  es->lhs()->symbol();
-     switch(ar->type()->baseType()->variant()) {
-      case T_INT:     tp = 1; break;
-      case T_FLOAT:   tp = 3; break;
-      case T_DOUBLE:  tp = 4; break;
-      case T_BOOL:    tp = 1; break;
-      case T_COMPLEX: tp = 6; break;
-      case T_DCOMPLEX: tp = 8; break;
-      default:        tp = 0; break;
-     }
-     is = ndvm;
-     if(tp == 6 || tp == 8){
-       doAssignStmtAfter(&(*ArrayLengthInElems(ar,parst,1)*(*new SgValueExp(2))));
-       tp = tp/2;
-     } else
-       doAssignStmtAfter(ArrayLengthInElems(ar,parst,1));
-     el = FirstArrayElement(ar);
-     if(HEADER(ar))
-       DistArrayRef(el,0,parst);
-     doAssignStmtAfter(DVM_Receive(iplp,GetAddresMem(el),tp,is));
- 
-  }
-}
-
-void SendArray(SgExpression *spec_accr)
-{SgExpression *es,*el;
- SgSymbol *ar;
- int is,tp;
- // looking through the array_list
-  for(es = spec_accr; es; es = es->rhs()) {
-     ar =  es->lhs()->symbol();
-     switch(ar->type()->baseType()->variant()) {
-      case T_INT:     tp = 1; break;
-      case T_FLOAT:   tp = 3; break;
-      case T_DOUBLE:  tp = 4; break;
-      case T_BOOL:    tp = 1; break;
-      case T_COMPLEX: tp = 6; break;
-      case T_DCOMPLEX: tp = 8; break;
-      default:        tp = 0; break;
-     }
-     is = ndvm;
-     if(tp == 6 || tp == 8){
-         doAssignStmtAfter(&(*ArrayLengthInElems(ar,cur_st,0)*(*new SgValueExp(2))));
-         tp = tp/2;
-     } else
-         doAssignStmtAfter(ArrayLengthInElems(ar,cur_st,0));
-     el = FirstArrayElement(ar);
-     if(HEADER(ar))
-       DistArrayRef(el,0,cur_st);
-     doAssignStmtAfter(DVM_Send(iplp,GetAddresMem(el),tp,is));
- 
-  }
-}
-
-void  CudaBlockSize(SgExpression *cuda_block_list)
-{
-    SgExpression *el;
-    el = cuda_block_list;
-    if (!el)  return;
-    doAssignStmtAfter(el->lhs());
-    el = el->rhs();
-    if (el)
-        doAssignStmtAfter(el->lhs());
-    else
-    {
-        doAssignStmtAfter(new SgValueExp(1));  //by default sizeY = 1
-        doAssignStmtAfter(new SgValueExp(1));  //by default sizeZ = 1
-        return;
-    }
-    el = el->rhs();
-    if (el)
-        doAssignStmtAfter(el->lhs());
-    else
-        doAssignStmtAfter(new SgValueExp(1));  //by default sizeZ = 1
-}
-
-void  CudaBlockSize(SgExpression *cuda_block_list,SgExpression *esize[])
-{
-    SgExpression *el;
-    el = cuda_block_list;
-    esize[0] = el->lhs();
-    el = el->rhs();
-    if (el)
-        esize[1] = el->lhs();
-    else
-    {
-        esize[1] = new SgValueExp(1);  //by default sizeY = 1
-        esize[2] = new SgValueExp(1);  //by default sizeZ = 1
-        return;
-    }
-    el = el->rhs();
-    if (el)
-        esize[2] = el->lhs();
-    else
-        esize[2] = new SgValueExp(1);  //by default sizeZ = 1
-}
-
-//***********************************************************************************************
-//  Interface of RTS2
-//***********************************************************************************************
-int TestReductionClause(SgExpression *e)
-{         
-   if( e->symbol()) // asynchronous reduction
-      return 0;
-   SgExpression *er, *ev;
-   for(er = e->lhs(); er; er=er->rhs()) 
-   {
-     ev = er->lhs()->rhs();    // reduction variable reference
-     if(isSgArrayRefExp(ev) && HEADER(ev->symbol()) ) 
-        return 0;
-     if(isSgExprListExp(ev) && HEADER(ev->lhs()->symbol()) )   //MAXLOC,MINLOC
-        return 0;
-   }
-   return 1;     
-}
-
-int CreateParallelLoopByHandler_H2(SgExpression *init[], SgExpression *last[], SgExpression *step[], int nloop)
-{ SgExpression *e=NULL,*el,*arglist=NULL;
- // generate call dvmh_loop_create(const DvmType *pCurRegion, const DvmType *pRank, /* const DvmType *pStart, const DvmType *pEnd, const DvmType *pStep */...)
-   for(int i=nloop-1; i>=0; i--)
-   {   
-      e =  len_DvmType ? TypeFunction(SgTypeInt(),step[i],new SgValueExp(len_DvmType) ) : step[i];
-      (el = new SgExprListExp(*e))->setRhs(arglist);           
-      arglist = el; 
-      e =  len_DvmType ? TypeFunction(SgTypeInt(),last[i],new SgValueExp(len_DvmType) ) : last[i];
-      (el = new SgExprListExp(*e))->setRhs(arglist);           
-      arglist = el; 
-      e =  len_DvmType ? TypeFunction(SgTypeInt(),init[i],new SgValueExp(len_DvmType) ) : init[i];
-      (el = new SgExprListExp(*e))->setRhs(arglist);           
-      arglist = el; 
-   }
-   int ilh = ndvm;
-   doAssignStmtAfter(LoopCreate_H2(nloop,arglist));
-   return(ilh);
-}
-
-SgExpression *AxisList(SgStatement *stmt, SgExpression *tied_array_ref)
-{
-   SgExpression *axis[MAX_LOOP_LEVEL],
-                *coef[MAX_LOOP_LEVEL],
-                *cons[MAX_LOOP_LEVEL];
-   SgExpression *arglist=NULL, *el, *e, *c;
-
-   int nt = Alignment(stmt,tied_array_ref,axis,coef,cons,2); // 2 - interface of RTS2
-   for(int i=0; i<nt; i++)
-   {  
-      c = Calculate(coef[i]);
-      if(c && c->isInteger() && (c->valueInteger() < 0))
-         e =  & SgUMinusOp(*DvmType_Ref(axis[i]));
-      else
-         e =  DvmType_Ref(axis[i]);  
-      (el = new SgExprListExp(*e))->setRhs(arglist);
-      arglist = el;
-   }
-   (el = new SgExprListExp(*ConstRef(nt)))->setRhs(arglist);  // add rank to axis list
-   arglist = el;
-   return arglist;
-}
-
-SgExpression *ArrayRefAddition(SgExpression *aref)
-{
-   if(!aref->lhs())   // without subscript list
-   {
-      // A => A(:,:,...,:)
-      SgExpression *arlist = NULL; 
-      int n = Rank(aref->symbol());
-      while(n--)
-         arlist = AddListToList(arlist, new SgExprListExp(*new SgExpression(DDOT)));
-    
-      aref->setLhs(arlist);
-   }
-   return aref;
-}
-
-SgExpression *MappingList(SgStatement *stmt, SgExpression *aref)
-{
-   SgExpression *axis[MAX_LOOP_LEVEL],
-                *coef[MAX_LOOP_LEVEL],
-                *cons[MAX_LOOP_LEVEL];
-   SgExpression *arglist=NULL, *el, *e;
-
-   int nt = Alignment(stmt,aref,axis,coef,cons,2); // 2 - interface of RTS2
-   for(int i=0; i<nt; i++)
-   {         
-      e = AlignmentLinear(axis[i],ReplaceFuncCall(coef[i]),cons[i]);   //Calculate(cons[i])    
-      (el = new SgExprListExp(*e))->setRhs(arglist);
-      arglist = el;
-   }
-   (el = new SgExprListExp(*ConstRef(nt)))->setRhs(arglist);  // add rank to axis list
-   arglist = el;
-   return arglist;
-}
-
-
-void MappingParallelLoop(SgStatement *stmt, int ilh )
-{
-   SgExpression *axis[MAX_LOOP_LEVEL],
-                *coef[MAX_LOOP_LEVEL],
-                *cons[MAX_LOOP_LEVEL];
-   SgExpression *arglist=NULL, *el, *e;
-
-   if(!stmt->expr(0))   // undistributed parallel loop
-      return;
-   int nt = Alignment(stmt,NULL,axis,coef,cons,2); // 2 - interface of RTS2
-   for(int i=0; i<nt; i++)
-   {         
-      e = AlignmentLinear(axis[i],ReplaceFuncCall(coef[i]),cons[i]);   //Calculate(cons[i])    
-      (el = new SgExprListExp(*e))->setRhs(arglist);
-      arglist = el;
-   }
-   SgExpression *desc = HeaderRef(stmt->expr(0)->symbol()); //Register_Array_H2(HeaderRef(stmt->expr(0)->symbol())); //!!! temporary
-   doCallAfter(LoopMap(ilh,desc,nt,arglist));
-}
-
-void Interface_2(SgStatement *stmt,SgExpression *clause[],SgExpression *init[],SgExpression *last[],SgExpression *step[],int nloop,int ndo,SgStatement *first_do) //int iout,SgStatement *stl,SgSymbol *newj,int ub))
-{ 
-  if (clause[SHADOW_RENEW_])  //there is SHADOW_RENEW clause
-     ShadowList(clause[SHADOW_RENEW_]->lhs(), stmt, NULL);
-                                       
-  // create loop
-  int ilh = CreateParallelLoopByHandler_H2(init, last, step, nloop);
-  MappingParallelLoop(stmt, ilh);
-  //--------------------------------------------------------------------------- 
-  // processing specifications/clauses
-  // 
-  if (clause[CUDA_BLOCK_])  //there is CUDA_BLOCK clause
-  {
-     SgExpression *eSize[3];
-     CudaBlockSize(clause[CUDA_BLOCK_]->lhs(), eSize);
-     doCallAfter(SetCudaBlock_H2(ilh, eSize[0], eSize[1], eSize[2]));
-  }
-  if (clause[TIE_])  //there is TIE clause     
-     for (SgExpression *el=clause[TIE_]->lhs(); el; el=el->rhs())  //list of tied arrays
-     {
-        SgExpression *head = HeaderForArrayInParallelDir(el->lhs()->symbol(), stmt, 1);
-        doCallAfter(Correspondence_H(ilh, head, AxisList(stmt, el->lhs())));
-     }  
-  if (clause[CONSISTENT_])  //there is CONSISTENT clause
-     for (SgExpression *el = clause[CONSISTENT_]->lhs(); el; el=el->rhs())
-     {
-        SgExpression *head =  HeaderForArrayInParallelDir(el->lhs()->symbol(), stmt, 0);
-        InsertNewStatementAfter(Consistent_H(ilh, head, MappingList(stmt, el->lhs())), cur_st, cur_st->controlParent());
-     }
-  if (clause[REMOTE_ACCESS_])  //there is REMOTE_ACCESS clause
-  {     int nbuf=1;
-        //adding new element to remote_access directive/clause list
-        AddRemoteAccess(clause[REMOTE_ACCESS_]->lhs(),NULL);        
-        RemoteVariableList(clause[REMOTE_ACCESS_]->symbol(), clause[REMOTE_ACCESS_]->lhs(), stmt);
-
-        for (SgExpression *el=clause[REMOTE_ACCESS_]->lhs(); el; el=el->rhs(),nbuf++)
-        {   
-            SgExpression *head = HeaderForArrayInParallelDir(el->lhs()->symbol(), stmt, 0); 
-            InsertNewStatementAfter(LoopRemoteAccess_H(ilh, head, el->lhs()->symbol(), MappingList(stmt, ArrayRefAddition(el->lhs()))), cur_st, cur_st->controlParent());
-        }
-  }
-
-  if (clause[SHADOW_COMPUTE_]) //there is SHADOW_COMPUTE clause
-  {
-     if ( (clause[SHADOW_COMPUTE_]->lhs()))
-	ShadowComp(clause[SHADOW_COMPUTE_]->lhs(),stmt,ilh);
-     else 
-        doCallAfter(ShadowCompute(ilh,HeaderRef(stmt->expr(0)->symbol()),0,NULL));          
-        //doCallAfter(ShadowCompute(ilh,Register_Array_H2(HeaderRef(stmt->expr(0)->symbol())),0,NULL));                 
-  }
-  if (clause[REDUCTION_])  //there is REDUCTION clause
-  {
-     red_list = clause[REDUCTION_]->lhs();
-     ReductionList(red_list,NULL,stmt,cur_st,cur_st,ilh);
-  }
-  if (clause[ACROSS_])  //there is ACROSS clause
-  {
-     SgExpression *e_spec[2];
-     InOutAcross(clause[ACROSS_],e_spec,stmt);
-     if (e_spec[IN_])
-        AcrossList(ilh,IN_, e_spec[IN_], stmt, clause[TIE_]);
-     if (e_spec[OUT_])
-        AcrossList(ilh,OUT_,e_spec[OUT_],stmt, clause[TIE_]);
-  }
-  if (clause[STAGE_] && !(clause[STAGE_]->lhs()->variant()==MINUS_OP && INTEGER_VALUE(clause[STAGE_]->lhs()->lhs(),1)))  //there is STAGE clause and is not STAGE(-1)
-      
-      doCallAfter(SetStage(ilh, clause[STAGE_]->lhs()));
-
-  //---------------------------------------------------------------------------
-  LINE_NUMBER_AFTER(first_do,cur_st);      
-  cur_st->addComment(ParallelLoopComment(first_do->lineNumber()));    
-
-  ACC_CreateParallelLoop(ilh,first_do,nloop,stmt,clause,2);  //oldGroup,newGroup,oldGroup2,newGroup2
-}
-//************************************************************************************************
-
-int ParallelLoop_Debug(SgStatement *stmt)
-{
-  SgStatement *st,*stl = NULL,*stg, *st3;
-  SgStatement *first_do, *stdeb = NULL;
-  SgValueExp c0(0);
-  int i,nloop,ndo, iinp,iout,ind, mred;
-   
-  SgForStmt *stdo;
-  SgValueExp c1(1);
-  
-  SgExpression *step[MAX_LOOP_LEVEL], 
-               *init[MAX_LOOP_LEVEL],
-               *last[MAX_LOOP_LEVEL],
-               *vpart[MAX_LOOP_LEVEL];
-  SgSymbol     *do_var[MAX_LOOP_LEVEL];
-  
-  SgExpression *vl, *dovar, *e, *el;
-
-  if (!OMP_program) {/*OMP*/
-	 first_do = stmt -> lexNext();// first DO statement of the loop nest
-  } else {
-      first_do = GetLexNextIgnoreOMP(stmt);// first DO statement of the loop nest /*OMP*/
-  }
-  newvar_list = NULL;
-  redgref = NULL; red_list = NULL; irg = 0; idebrg = 0; mred =0;
-  LINE_NUMBER_AFTER(stmt,stmt);
-  TransferLabelFromTo(first_do, stmt->lexNext());
-
- //generating call to 'bploop' function of performance analizer (begin of parallel interval)
-  if(perf_analysis && perf_analysis != 2) 
-    InsertNewStatementAfter(St_Bploop(OpenInterval(stmt)), cur_st, stmt->controlParent()); //inserting after function call 'lnumb'
-  
-  iplp = 0;
-  ndo = i = nloop = 0;
-  // looking through the do_variables list
-  vl = stmt->expr(2); // do_variables list
-  for(dovar=vl; dovar; dovar=dovar->rhs())
-        nloop++;
-
-  // looking through the specification list
-  for(el=stmt->expr(1); el; el=el->rhs()) {
-     e = el->lhs();            // specification
-     switch (e->variant()) {       
-           case REDUCTION_OP:  
-                if(mred !=0) break;
-                mred = 1;
-                red_list = e->lhs();      
-                if(  e->symbol()){
-		  redgref = new SgVarRefExp(e->symbol());
-                  doIfForReduction(redgref,1);
-                  nloopred++;
-                  stg = doIfForCreateReduction( e->symbol(),nloopred,1);
-                  //cur_st->setControlParent(stmt->controlParent()); //to insert correctly next statements
-                  st3 = cur_st;
-                  cur_st = stg;
-                 //looking through the reduction list
-                  ReductionList(red_list,redgref, stmt, cur_st, cur_st, 0); 
-                  cur_st = st3;
-                  InsertNewStatementAfter( new SgAssignStmt(*DVM000(ndvm),*new SgValueExp(0)),cur_st,cur_st->controlParent()); 
-               
-                } else {
-                  irg = ndvm; 
-                  redgref = DVM000(irg);
-                  doAssignStmtAfter(CreateReductionGroup());
-                  idebrg = ndvm; 
-                  doAssignStmtAfter( D_CreateDebRedGroup());
-                  //looking through the reduction list
-                  ReductionList(red_list,redgref, stmt, cur_st, cur_st, 0); 
-                }
-                break; 
-        
-           case CONSISTENT_OP:                                         
-           case NEW_SPEC_OP:       
-           case SHADOW_RENEW_OP: 
-           case SHADOW_COMP_OP:        
-           case SHADOW_START_OP:
-           case SHADOW_WAIT_OP:
-           case REMOTE_ACCESS_OP:  
-           case INDIRECT_ACCESS_OP:
-           case STAGE_OP:
-           case ACROSS_OP:          
-                break;  
-     }
-  }       
-
-  iout = ndvm; 
-  //initialization vpart[]
-  for(i=0; i<MAX_LOOP_LEVEL; i++)
-     vpart[i] = NULL;
-  i = 0; 
-  // looking through the loop nest 
-  for(st=first_do; i<nloop; st=st->lexNext(),i++) {
-     stdo = isSgForStmt(st);
-     if(!stdo)
-       break; 
-     stl = st; 
-     step[i]   = stdo->step();
-     if(!step[i])
-       step[i] = & c1.copy();  // by default: step = 1
-     init[i]=isSpecialFormExp(&stdo->start()->copy(),i,iout+i,vpart,do_var);
-     if(init[i])
-         step[i] = & c1.copy(); 
-       else
-         init[i]   = stdo->start();
-        
-  
-     last[i]   = stdo->end();  
- 
-     if(dbg_if_regim) {// setting new loop parameters
-       if(vpart[i]) 
-         stdo->setStart(*DVM000(iout+i)+ (*vpart[i]));//special form
-                                                    //step is not replaced
-       else  
-         stdo->setStart(*DVM000(iout+i));  
-       
-       stdo->setEnd(*DVM000(iout+i+nloop));
-     }
-
-     do_var[i] = stdo->symbol(); 
-     SetDoVar(stdo->symbol());  
-             
-  }
-  ndo = i;  
-
-  // test whether the directive is correct
-  if( !TestParallelDirective(stmt, nloop, ndo, first_do))
-     return(0);    // directive is ignored
-  
-  if(dbg_if_regim>1) {  //copy loop nest
-    SgStatement *last_st,*lst;
-    last_st= LastStatementOfDoNest(first_do);
-    if(last_st != (lst=first_do->lastNodeOfStmt()) || last_st->variant()==LOGIF_NODE) 
-     { last_st=ReplaceLabelOfDoStmt(first_do,last_st, GetLabel());
-       ReplaceDoNestLabel_Above(last_st,first_do,GetLabel());
-     }
-    stdeb=first_do->copyPtr();         
-  }
-
-
-  for(i=0; i<nloop; i++)
-     doAssignStmtAfter( init[i] );
-  for(i=0; i<nloop; i++)
-     doAssignStmtAfter( last[i] );
-  for(i=0; i<nloop; i++)
-     doAssignStmtAfter( step[i] );
-  
-  iplp = iout;
-  iinp = ndvm;     
-  OpenParLoop_Inter(stl,iinp,iinp+nloop,do_var,nloop);
-  // creating LoopVarTypeArray
-  ndvm += nloop;
-  for(i=0; i<nloop; i++)
-     doAssignStmtAfter( new SgValueExp(LoopVarType(do_var[i],stmt)));
-     
-  pardo_line = first_do->lineNumber();
-  DebugParLoop(cur_st,nloop,iout); //DebugParLoop(cur_st,nloop,iinp+2*nloop); 
-
-
-  if(dbg_if_regim){ // generating Logical IF statement:
-       // begin_lab  IF (doplmbseq(...) .EQ. 0) GO TO end_lab
-       // and inserting it before  loop nest
-       int ino;
-       SgExpression *dopl;
-       SgStatement *stn, *if_stmt;
-       stn = cur_st;
-       LINE_NUMBER_AFTER(first_do,cur_st);
-       begin_lab = GetLabel();
-       stn->lexNext()-> setLabel(*begin_lab); 
-       end_lab   = GetLabel();
-
-       ino = ndvm;
-       doAssignStmtAfter(new SgValueExp(pardo_No)); 
-       dopl = doPLmbSEQ(ino, nloop, iout);
-
-       if_stmt = new SgLogIfStmt(SgEqOp(*dopl , c0), *new SgGotoStmt(*end_lab));
-       cur_st->insertStmtAfter(*if_stmt);
-       (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF
-                                                            // (error Sage)
-  
-
-       if(dbg_if_regim>1) {
-           SgStatement *ifst;
-           ifst = new SgIfStmt(*DebugIfNotCondition(), *stdeb);
-           
-           (if_stmt->lexNext())->insertStmtAfter(*ifst,*if_stmt->controlParent());
-
-          // generating GO TO statement:  GO TO begin_lab
-          // and inserting it after last statement of parallel loop nest copy
-          (stdeb->lastNodeOfStmt())->insertStmtAfter(*new SgGotoStmt(*begin_lab),*ifst);
-          TranslateBlock(stdeb);          
-       }
-  }
-
-  cur_st = stl->lexNext();
-      //cur_st = st->lexPrev();  // set cur_st on last DO satement of loop nest
-  return(1);  
-}
-
-int Reduction_Debug(SgStatement *stmt)
-{
-  int  mred;
-  SgExpression  *e, *el;
-  SgStatement *stg,*st3;
-  redgref = NULL; irg = 0; idebrg = 0; mred =0;
-  LINE_NUMBER_BEFORE(stmt,stmt);
-  cur_st = stmt->lexPrev();
-  // looking through the specification list
-  for(el=stmt->expr(1); el; el=el->rhs()) {
-     e = el->lhs();            // specification
-     if (e->variant() == REDUCTION_OP) {       
-                if(mred !=0) break;
-                mred = 1;
-                red_list = e->lhs();         
-                if(  e->symbol()){
-		  redgref = new SgVarRefExp(e->symbol());
-                  doIfForReduction(redgref,1);
-                  nloopred++;
-                  stg = doIfForCreateReduction( e->symbol(),nloopred,1);
-                  st3 = cur_st;
-                  cur_st = stg;
-                 //looking through the reduction list
-                  ReductionList(red_list,redgref, stmt, cur_st, cur_st, 0); 
-                  cur_st = st3;
-                } else {
-                  irg = ndvm; 
-                  redgref = DVM000(irg);
-                  doAssignStmtAfter(CreateReductionGroup());
-                  idebrg = ndvm; 
-                  doAssignStmtAfter( D_CreateDebRedGroup());
-                  //looking through the reduction list
-                  ReductionList(red_list,redgref, stmt, cur_st, cur_st, 0); 
-                }                                                      
-        
-     }
-  }    
- return(0);   
-}
diff --git a/projects/dvm_svn/fdvm/trunk/fdvm/stmt.cpp b/projects/dvm_svn/fdvm/trunk/fdvm/stmt.cpp
deleted file mode 100644
index 59cb720..0000000
--- a/projects/dvm_svn/fdvm/trunk/fdvm/stmt.cpp
+++ /dev/null
@@ -1,1583 +0,0 @@
-/**************************************************************\
-* Fortran DVM                                                  * 
-*                                                              *
-*   Creating and Inserting New Statement in the Program        *
-*           Restructuring Program                              *
-\**************************************************************/
-
-#include "dvm.h"
-
-void doAssignStmt (SgExpression *re) {
-  SgExpression *le;
-  SgValueExp * index;
-  SgStatement *ass;
-// creating assign statement with right part "re" and inserting it
-// before first executable statement (after last generated statement)
-  index = new SgValueExp (ndvm++);
-  le = new SgArrayRefExp(*dvmbuf,*index);
-  ass = new SgAssignStmt (*le,*re);
-// for debug
-//    ass->unparsestdout();
-//
-  where->insertStmtBefore(*ass,*where->controlParent());
-                                   //inserting 'ass' statement before 'where'  statement 
-  cur_st = ass;                                   
-  }
-
-SgExpression * LeftPart_AssignStmt (SgExpression *re) {
-// creating assign statement with right part "re" and inserting it
-// before first executable statement (after last generated statement);
-// returns left part of this statement
-  SgExpression *le;
-  SgValueExp * index;
-  SgStatement *ass;
-  index = new SgValueExp (ndvm++);
-  le = new SgArrayRefExp(*dvmbuf,*index);
-  ass = new SgAssignStmt (*le,*re);
-// for debug
-//    ass->unparsestdout();
-//
-  where->insertStmtBefore(*ass,*where->controlParent());
-                                    //inserting 'ass' statement before 'where'  statement 
-  cur_st = ass;  
-  return(le);
-  }
-
-
-void doAssignTo (SgExpression *le, SgExpression *re) {
-  SgStatement *ass;
-// creating assign statement with right part "re" and
-// left part "le" and inserting it
-// before first executable statement (after last generated statement)
-  ass = new SgAssignStmt (*le,*re);
-// for debug
-//    ass->unparsestdout();
-//
-  where->insertStmtBefore(*ass,*where->controlParent());
-                                  //inserting 'ass' statement before 'where'  statement 
-  cur_st = ass;
-  }
-
-void doAssignTo_After (SgExpression *le, SgExpression *re) {
-  SgStatement *ass;
-// creating assign statement with right part "re" and
-// left part "le" and inserting it
-// after last generated statement
-  ass = new SgAssignStmt (*le,*re);
-
-  cur_st->insertStmtAfter(*ass);//inserting after 
-                                //current statement 
-  cur_st = ass;
-  }
-
-void doAssignStmtAfter (SgExpression *re) {
-  SgExpression *le;
-  SgValueExp * index;
-  SgStatement *ass;
-// creating assign statement with right part "re" and inserting it
-// after current statement (after last generated statement)
-  index = new SgValueExp (ndvm++);
-  le = new SgArrayRefExp(*dvmbuf,*index);
-  ass = new SgAssignStmt (*le,*re);
-// for debug
-//    ass->unparsestdout();
-//
-  cur_st->insertStmtAfter(*ass);//inserting after current statement
-  cur_st = ass;                                   
- 
-  }
-void doAssignStmtBefore (SgExpression *re, SgStatement *current) {
-  SgExpression *le;
-  SgValueExp * index;
-  SgStatement *ass,*st;
-// creating assign statement with right part "re" and inserting it
-// before current statement 
-  index = new SgValueExp (ndvm++);
-  le = new SgArrayRefExp(*dvmbuf,*index);
-  ass = new SgAssignStmt (*le,*re);
-// for debug
-//    ass->unparsestdout();
-//
-  st = current->controlParent(); 
-  if(st->variant() == LOGIF_NODE)  { // Logical IF
-     // change by construction IF () THEN <current> ENDIF and
-     // then insert assign  statement before current statement
-     st->setVariant(IF_NODE);
-     current->insertStmtAfter(* new SgStatement(CONTROL_END));
-         //printVariantName( (current->lexNext())->variant());
-     st-> insertStmtAfter(*ass);
-     return;   
-   }
-
-  if (current-> hasLabel() && current->variant() != FORMAT_STAT && current->variant() != DATA_DECL && current->variant()  != ENTRY_STAT)    { //current statement has label
-    //insert assign statement before current and set on it the label of current
-     SgLabel *lab;
-     lab = current->label(); 
-     BIF_LABEL(current->thebif) = NULL;
-     current->insertStmtBefore(*ass,*current->controlParent());//inserting before current statement
-     ass-> setLabel(*lab);
-     return;
-   }  
-  current->insertStmtBefore(*ass,*current->controlParent());//inserting before current statement 
-  }
-
-void doCallAfter(SgStatement *call)
-{
-  cur_st->insertStmtAfter(*call);//inserting call statement after current statement
-  cur_st = call;                                   
-}
-
-void doCallStmt(SgStatement *call)
-{
-  where->insertStmtBefore(*call,*where->controlParent());//inserting call statement before 'where' statement
-  cur_st = call;                                   
-}
-
-
-void Extract_Stmt(SgStatement *st)
-{ char *st1_comment,*st2_comment, *pt;
-  if(!st) return; 
-// save comment (add to next statement)
-  st1_comment = st->comments();
-  if(st1_comment && st->lexNext())
-  { st2_comment = st->lexNext()->comments();
-    if(!st2_comment)
-      st->lexNext()->addComment(st1_comment); 
-      
-    
-    else
-    { 
-            //st->addComment(st2_comment);
-            //st->lexNext()->setComments(st->comments());
-      pt = (char *) malloc(strlen(st1_comment) + strlen(st2_comment) +1);
-      sprintf(pt,"%s%s",st1_comment,st2_comment);
-      CMNT_STRING(BIF_CMNT(st->lexNext()->thebif)) = pt;
-    }
-  }   
-  
-// extract
-  st-> extractStmt();
-
-}
-
-void InsertNewStatementAfter (SgStatement *stat, SgStatement *current, SgStatement *cp)
-{SgStatement *st;
- st = current;
- if(current->variant() == LOGIF_NODE)   // Logical IF
-    st = current->lexNext();
- if(cp->variant() == LOGIF_NODE) 
-   LogIf_to_IfThen(cp);
- st->insertStmtAfter(*stat,*cp);
- cur_st = stat;
-}
-
-void InsertNewStatementBefore (SgStatement *stat, SgStatement *current) {
-  //SgExpression *le;
-  //SgValueExp * index;
-  SgStatement *st;
-
-  st = current->controlParent(); 
-  if(st->variant() == LOGIF_NODE)  { // Logical IF
-     // change by construction IF () THEN <current> ENDIF and
-     // then insert statement before current statement
-     st->setVariant(IF_NODE);
-     SgStatement *control = new SgStatement(CONTROL_END);/*OMP*/
-     if (current->numberOfAttributes(OMP_MARK) > 0) {/*OMP*/
-        control->addAttribute (OMP_MARK);/*OMP*/
-     }/*OMP*/
-     current->insertStmtAfter(*control);
-     st-> insertStmtAfter(*stat);
-     return;   
-   }
-
-  if (current-> hasLabel() && current->variant() != FORMAT_STAT && current->variant() != DATA_DECL && current->variant()  != ENTRY_STAT)    { //current statement has label
-    //insert statement before current and set on it the label of current
-     SgLabel *lab;
-     lab = current->label(); 
-     BIF_LABEL(current->thebif) = NULL;
-     current->insertStmtBefore(*stat,*current->controlParent());//inserting before current statement
-     stat-> setLabel(*lab);
-     return;
-   }  
-  current->insertStmtBefore(*stat,*current->controlParent());//inserting before current statement 
-  }
-
-void ReplaceByIfStmt(SgStatement *stmt)
-{ SgStatement *if_stmt, *cp;
-  SgLabel *lab = NULL;
-  char * cmnt=NULL;
-
-  ChangeDistArrayRef(stmt->expr(0)); /*24.06.14 podd*/
-  ChangeDistArrayRef(stmt->expr(1)); /*24.06.14 podd*/
-
-  // testing: is control parent  Logical IF statement
-  if_stmt = stmt->controlParent(); 
-  if((if_stmt->variant() == LOGIF_NODE))  {
-      if_stmt->setExpression(0,               
-                 (*(if_stmt->expr(0))) && SgNeqOp(*TestIOProcessor(),                                                         *new SgValueExp(0) ));
-                 // adding condition: TstIO()
-      return;
-  }
-
-  if (stmt-> hasLabel()) {    // PRINT statement has label
-    // set on new if-statement  the label of current statement 
-      lab = stmt->label(); 
-      BIF_LABEL(stmt->thebif) = NULL;   
-  }
-  cmnt=stmt-> comments();
-  if (cmnt)    // PRINT has preceeding comments 
-      BIF_CMNT(stmt->thebif) = NULL;
-
-  cur_st =  stmt->lexNext();
-  //cur_st =  stmt->lexPrev();
-  cp = stmt->controlParent();
-  stmt->extractStmt(); 
-  if_stmt =  new SgLogIfStmt(SgNeqOp(*TestIOProcessor(), *new SgValueExp(0) ), *stmt);
-  cur_st->insertStmtBefore(*if_stmt, *cp);
-  cur_st = if_stmt->lexNext(); // PRINT statement
-  if (cur_st->numberOfAttributes(OMP_MARK) > 0) {/*OMP*/
-    DelAttributeFromStmt (OMP_MARK, cur_st);/*OMP*/
-    //if_stmt->addAttribute (OMP_MARK);/*OMP*/
-  }/*OMP*/
-  (cur_st->lexNext())-> extractStmt(); //extract ENDIF (error Sage
-  if(lab)
-      if_stmt -> setLabel(*lab);
-  if(cmnt)
-      if_stmt -> setComments(cmnt);
-  return;
-}
-
-SgStatement *ReplaceStmt_By_IfThenConstr(SgStatement *stmt,SgExpression *econd)
-{ SgStatement *ifst, *cp, *curst;
-  SgLabel *lab = NULL;
-//  replace  <statement>
-// by construction:  IF  ( <condition> ) THEN
-//                         <statement> 
-//                   ENDIF
-
-  if (stmt-> hasLabel()) {    // statement has label
-    // set on new if-statement  the label of current statement 
-      lab = stmt->label(); 
-      BIF_LABEL(stmt->thebif) = NULL;   
-  }
- 
-  curst =  stmt->lexNext();
-  
-  cp = stmt->controlParent();
-  stmt->extractStmt(); 
-
- ifst = new SgIfStmt( *econd, *stmt);
- curst->insertStmtBefore(*ifst, *cp);
- 
- if (curst->numberOfAttributes(OMP_MARK) > 0) {/*OMP*/
-    ifst->addAttribute (OMP_MARK);/*OMP*/
-    ifst->lexNext()->lexNext()->addAttribute (OMP_MARK);/*OMP*/
-  }/*OMP*/
-  if(lab)
-      ifst -> setLabel(*lab);
- 
- return(ifst->lexNext()->lexNext());// ENDIF
-}
-
-SgStatement *CreateIfThenConstr(SgExpression *cond, SgStatement *st)
-{SgStatement *ifst;
-
-// creating
-//          IF ( cond ) THEN
-//            <statement-st-or-CONTINUE>
-//          ENDIF 
- st = st ? st : new SgStatement(CONT_STAT);
- ifst = new SgIfStmt( *cond, *st);
- return(ifst);
-}
-
-void ReplaceAssignByIf(SgStatement *stmt)
-{ SgStatement *if_stmt, *cp;
-  SgLabel *lab = NULL;
-  char * cmnt=NULL;
-  SgSymbol *ar = NULL;
-  SgExpression *el = NULL,*ei[MAX_DIMS];
-  SgExpression *condition=NULL, *index_list=NULL;  
-  int iind,i,j,k;
-  if(isSgArrayRefExp(stmt->expr(0))) { 
-     ar = stmt->expr(0)->symbol();
-     el = stmt->expr(0)->lhs(); //index list
-  }
-  if(stmt->expr(0)->variant() == ARRAY_OP){
-     ar = stmt->expr(0)->lhs()->symbol();
-     el = stmt->expr(0)->lhs()->lhs(); //index list
-  }
-  if (!el || !TestMaxDims(el,ar,stmt)) //error situation: no subscripts or the number of subscripts > MAX_DIMS
-     return; 
-  
-  if (stmt-> hasLabel()) {    // assign statement has label
-    // set on new if-statement  the label of current statement 
-     lab = stmt->label(); 
-     BIF_LABEL(stmt->thebif) = NULL;   
-  }
-  cmnt=stmt-> comments();
-  if (cmnt)    // statement has preceeding comments 
-     BIF_CMNT(stmt->thebif) = NULL;
-    
-  for(i=0;el;el=el->rhs(),i++) 
-  {  ei[i] = &(el->lhs()->copy());       
-     ChangeDistArrayRef(ei[i]);
-     if(!IN_COMPUTE_REGION && !INTERFACE_RTS2)  
-        ei[i] = &(*ei[i]- *Exprn(LowerBound(ar,i)));
-  } 
-  iind = ndvm;
-
-  where = stmt;
-
-  if(for_kernel)  /*ACC*/
-     cur_st = stmt->lexPrev(); /*ACC*/
-  else if(INTERFACE_RTS2)
-  { 
-     cur_st = stmt->lexPrev();     
-     for(j=i; j; j--) 
-        index_list= AddListToList(index_list,new SgExprListExp(*DvmType_Ref(ei[j-1])));
-  }
-  else 
-  {
-//    if(IN_COMPUTE_REGION )                      /*ACC*/
-//        doAssignTo(VECTOR_REF(indexArraySymbol(ar),1),ei[i-1]);  /*ACC*/
-//     else
-//        doAssignStmt(ei[i-1]);          
-//     cur_st->addAttribute (OMP_CRITICAL); /*OMP*/
-//     if(lab)
-//        cur_st -> setLabel(*lab);
-     
-     for(j=i,k=1; j; j--) 
-     {  if(IN_COMPUTE_REGION)   /*ACC*/
-           doAssignTo(VECTOR_REF(indexArraySymbol(ar),k++),ei[j-1]);/*ACC*/ 
-        else 
-           doAssignStmtAfter(ei[j-1]);
-        if(lab && k==1)
-           cur_st -> setLabel(*lab);
-        cur_st->addAttribute (OMP_CRITICAL); /*OMP*/     
-     }
-      
-  } 
-  cp = stmt->controlParent(); /*ACC*/ 
-  stmt->extractStmt();
-  if(IN_COMPUTE_REGION && !for_kernel)       /*ACC*/
-     condition =  & SgNeqOp(INTERFACE_RTS2 ? *HasLocalElement_H2(NULL,ar,i,index_list) : *HasLocalElement(NULL,ar,indexArraySymbol(ar)), *new SgValueExp(0) );
-  else if(for_kernel)                       /*ACC*/
-     condition = LocalityConditionInKernel(ar,ei);    /*ACC*/
-  else
-     condition = & SgNeqOp(INTERFACE_RTS2 ? *HasElement(HeaderRef(ar),i,index_list) : *TestElement(HeaderRef(ar),iind), *new SgValueExp(0) );  
-  if_stmt =  new SgLogIfStmt(*condition,*stmt);
-  stmt->addAttribute (OMP_CRITICAL); /*OMP*/
-  if_stmt->addAttribute (OMP_CRITICAL); /*OMP*/
-  if((for_kernel || INTERFACE_RTS2) && lab)             /*ACC*/
-     if_stmt -> setLabel(*lab);
-
-  cur_st->insertStmtAfter(*if_stmt,*cp);
-  cur_st = if_stmt->lexNext(); // assign statement
-  (cur_st->lexNext())-> extractStmt(); //extract ENDIF (error Sage
-
-  if(cmnt)
-     if_stmt -> setComments(cmnt);
-  
-  SET_DVM(iind);
-  return;
-}
- 
-void ReplaceDoNestLabel(SgStatement *last_st, SgLabel *new_lab)
-//replaces the label of DO statement nest, which is ended by last_st,
-// by new_lab
-//         DO 1 I1 = 1,N1                              DO 99999 I1 = 1,N1
-//         DO 1 I2 = 1,N2                              DO 99999 I2 = 1,N2
-//          .  .   .                                      .  .   .       
-//         DO 1 IK = 1,NK                              DO 99999 IK = 1,NK
-//           . . .                                      .  .   . 
-// 1       statement                              1     statement   
-//                                            99999    CONTINUE
-{SgStatement *parent,*st;
- SgLabel *lab;
- 
- parent = last_st->controlParent();
- lab = last_st->label();
- //change 04.03.08
- //while((do_st=isSgForStmt(parent)) != NULL && do_st->endOfLoop()) {
- while((parent->variant()==FOR_NODE || parent->variant()==WHILE_NODE) && BIF_LABEL_USE(parent->thebif)) {
-    if(LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(BIF_LABEL_USE(parent->thebif))){
-      if(!new_lab)
-        new_lab = GetLabel();
-      BIF_LABEL_USE(parent->thebif) = new_lab->thelabel;
-      parent = parent->controlParent();
-    }
-    else
-      break;
- }
-
- //inserts CONTINUE statement with new_lab as label  
- st = new SgStatement(CONT_STAT);
- st->setLabel(*new_lab);
- // for debug regim
- LABEL_BODY(new_lab->thelabel) = st->thebif;
- BIF_LINE(st->thebif) = (last_st->lineNumber()) ? last_st->lineNumber() : LineNumberOfStmtWithLabel(lab);
- if(last_st->variant() != LOGIF_NODE)
-   //last_st->insertStmtAfter(*st);
-    last_st->insertStmtAfter(*st,*last_st->controlParent());
- else
-     (last_st->lexNext())->insertStmtAfter(*st,*last_st->controlParent());
-    //   st->setControlParent(*last_st->controlParent());
- //printVariantName(last_st->controlParent()->variant());
-
- /*
-//renew global variable 'end_loop_lab' (for parallel loop)
- if(end_loop_lab)
-    if(LABEL_STMTNO(end_loop_lab->thelabel) ==                                                                       LABEL_STMTNO(lab->thelabel))  
-      end_loop_lab = new_lab;
-  */
-}
-
-SgLabel * LabelOfDoStmt(SgStatement *stmt)
-{ if(BIF_LABEL_USE(stmt->thebif))
-    return (LabelMapping(BIF_LABEL_USE(stmt->thebif)));
-  else
-    return(NULL);
-}
-
-void ReplaceDoNestLabel_Above(SgStatement *last_st, SgStatement *from_st,SgLabel *new_lab)
-//replaces the label of DO statements locating  above  'from_st'  in nest,
-// which is ended by 'last_st', by 'new_lab' 
-//         DO 1 I1 = 1,N1                              DO 99999 I1 = 1,N1
-//         DO 1 I2 = 1,N2                              DO 99999 I2 = 1,N2
-//          .  .   .                                      .  .   .       
-//         DO 1 IK = 1,NK                              DO 99999 IK = 1,NK
-// CDVM$   PARALLEL (J1,...,JL) ON A(...) ==>  CDVM$   PARALLEL (J1,...,JL) ON A(...)
-//         DO 1 J1 = 1,N1                              DO 1 J1 = 1,N1
-//         DO 1 J2 = 1,N2                              DO 1 J2 = 1,N2
-//          .  .   .                                       .  .   .          
-//         DO 1 JL = 1,NL                              DO 1 JL = 1,NL
-//           . . .                                      .  .   . 
-// 1       CONTINUE                            1       CONTINUE
-//                                            99999    CONTINUE
-{SgStatement *parent,*st,*par;
- SgLabel *lab;
- int is_above;
- par = parent = from_st->controlParent();
- lab = LabelOfDoStmt(from_st); //((SgForStmt *)from_st)->endOfLoop();
- if(!lab) //DO statement 'from_st' has no label
-   return;
- is_above = 0;
-
- while((parent->variant()==FOR_NODE || parent->variant()==WHILE_NODE) && BIF_LABEL_USE(parent->thebif)) {
-    if(LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(BIF_LABEL_USE(parent->thebif))){
-      if(!new_lab)
-        new_lab = GetLabel();
-      BIF_LABEL_USE(parent->thebif) = new_lab->thelabel;
-      is_above = 1;
-      parent = parent->controlParent();
-    }
-    else
-      break;
- }
-/*
- while((do_st=isSgForStmt(parent)) != NULL  && do_st->endOfLoop()) {
-    if(LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(do_st->endOfLoop()->thelabel)){
-      if(!new_lab)
-        new_lab = GetLabel();
-      BIF_LABEL_USE(do_st->thebif) = new_lab->thelabel;
-      is_above = 1;
-      parent = parent->controlParent();
-    }
-    else
-      break;
- }
- */
-
- //inserts CONTINUE statement with new_lab as label
- if(is_above) { 
-   st = new SgStatement(CONT_STAT);
-   st->setLabel(*new_lab);
-    //for debug regim
-   LABEL_BODY(new_lab->thelabel) = st->thebif;
-   BIF_LINE(st->thebif) = (last_st->lineNumber()) ? last_st->lineNumber() : LineNumberOfStmtWithLabel(lab);
-   if(last_st->variant() != LOGIF_NODE)
-     last_st->insertStmtAfter(*st,*par);
-   else
-     (last_st->lexNext())->insertStmtAfter(*st,*par);
- }
-}
-
-void ReplaceParDoNestLabel(SgStatement *last_st, SgStatement *from_st,SgLabel *new_lab)
-//replaces the label of DO statements locating  above  'from_st'  in nest,
-// which is ended by 'last_st', by 'new_lab' 
-// CDVM$   PARALLEL (I1,...,IL) ON A(...) ==>  CDVM$   PARALLEL (I1,...,IL) ON A(...)
-//         DO 1 I1 = 1,N1                              DO 99999 I1 = 1,N1
-//         DO 1 I2 = 1,N2                              DO 99999 I2 = 1,N2
-//          .  .   .                                      .  .   .       
-//         DO 1 IK = 1,NK                              DO 99999 IK = 1,NK
-//           . . .                                      .  .   . 
-// 1       CONTINUE                           99999       CONTINUE
-//                                            
-{SgStatement *parent,*st,*par;
- SgLabel *lab;
- int is_above;
- par = parent = from_st->controlParent();
- lab = LabelOfDoStmt(parent); //((SgForStmt *)parent)->endOfLoop();
- if(!lab) //DO statement  has no label
-   return;
- is_above = 0;
-
-while((parent->variant()==FOR_NODE || parent->variant()==WHILE_NODE) && BIF_LABEL_USE(parent->thebif)) {
-    if(LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(BIF_LABEL_USE(parent->thebif))){
-      if(!new_lab)
-        new_lab = GetLabel();
-      BIF_LABEL_USE(parent->thebif) = new_lab->thelabel;
-      is_above = 1;
-      parent = parent->controlParent();
-    }
-    else
-      break;
- }
-
-/*
- while((do_st=isSgForStmt(parent)) != NULL && do_st->endOfLoop()) {
- if(LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(do_st->endOfLoop()->thelabel)){
-     if(!new_lab)
-        new_lab = GetLabel();
-      BIF_LABEL_USE(do_st->thebif) = new_lab->thelabel;
-      is_above = 1;
-      parent = parent->controlParent();
-    }
-    else
-      break;
- }
-*/
-
- //inserts CONTINUE statement with new_lab as label
- if(is_above) { 
-   st = new SgStatement(CONT_STAT);
-   st->setLabel(*new_lab);
-    //for debug regim
-   LABEL_BODY(new_lab->thelabel) = st->thebif;
-   BIF_LINE(st->thebif) = (last_st->lineNumber()) ? last_st->lineNumber() : LineNumberOfStmtWithLabel(lab);
-   if(last_st->variant() != LOGIF_NODE)
-     last_st->insertStmtAfter(*st,*par);
-   else
-     (last_st->lexNext())->insertStmtAfter(*st,*par);
- }
-}
-
-SgStatement *ReplaceDoLabel(SgStatement *last_st, SgLabel *new_lab)
-//replaces the label of DO statement, which is ended by last_st,
-// by new_lab
-//         DO 1 I = 1,N                              DO 99999 I = 1,N
-//           . . .                                      .  .   . 
-// 1       statement                              1     statement   
-//                                            99999    CONTINUE
-
-{SgStatement *parent, *st;
- SgLabel *lab;
- parent = last_st->controlParent();
- if((parent->variant()==FOR_NODE || parent->variant()==WHILE_NODE) && (lab=LabelOfDoStmt(parent))){
-               //if((do_st=isSgForStmt(parent)) != NULL && (lab=do_st->endOfLoop())){
-      if(!new_lab)
-        new_lab = GetLabel();
-      BIF_LABEL_USE(parent->thebif) = new_lab->thelabel;
- }
- else
-      return(NULL);
-
- //inserts CONTINUE statement with new_lab as label  
- st = new SgStatement(CONT_STAT);
- st->setLabel(*new_lab);
- //for debug regim
- LABEL_BODY(new_lab->thelabel) = st->thebif;
- BIF_LINE(st->thebif) = (last_st->lineNumber()) ? last_st->lineNumber() : LineNumberOfStmtWithLabel(lab);
- if(last_st->variant() != LOGIF_NODE)
-    last_st->insertStmtAfter(*st,*parent);
- else
-    (last_st->lexNext())->insertStmtAfter(*st,*parent);
- return(st);
-}
-
-SgStatement *ReplaceLabelOfDoStmt(SgStatement *first,SgStatement *last_st, SgLabel *new_lab)
-//replaces the label of first DO statement of DO nest, which is ended by last_st,
-// by new_lab
-//         DO 1 I = 1,N                              DO 99999 I = 1,N
-//         DO 1 J = 1,N                              DO 1 J = 1,N
-//           . . .                                      .  .   . 
-// 1       statement                              1     statement   
-//                                             99999    CONTINUE
-
-{SgStatement *parent, *st;
- SgLabel *lab;
- parent = last_st->controlParent();
- if((first->variant()==FOR_NODE || first->variant()==WHILE_NODE) && (lab=LabelOfDoStmt(first))){
-                       //if((do_st=isSgForStmt(first)) != NULL && (lab=do_st->endOfLoop())){
-      if(!new_lab)
-        new_lab = GetLabel();
-      BIF_LABEL_USE(first->thebif) = new_lab->thelabel;
- }
- else
-      return(NULL);
-
- //inserts CONTINUE statement with new_lab as label  
- st = new SgStatement(CONT_STAT);
- st->setLabel(*new_lab);
- //for debug regim
- LABEL_BODY(new_lab->thelabel) = st->thebif;
- BIF_LINE(st->thebif) = (last_st->lineNumber()) ? last_st->lineNumber() : LineNumberOfStmtWithLabel(lab);
- if(last_st->variant() != LOGIF_NODE)
-    last_st->insertStmtAfter(*st,*first);
- else
-    (last_st->lexNext())->insertStmtAfter(*st,*first);
- return(st);
-}
-
-SgStatement *ReplaceBy_DO_ENDDO(SgStatement *first,SgStatement *last_st)
-//replaces  first DO statement of DO nest with label, which is ended by last_st,
-// by DO-ENDDO construct
-//         DO 1 I = 1,N                              DO   I = 1,N
-//         DO 1 J = 1,N                              DO 1 J = 1,N
-//           . . .                                      .  .   . 
-// 1       statement                              1     statement   
-//                                                   ENDDO
-
-{SgStatement *parent, *st;
- SgLabel *lab;
- parent = last_st->controlParent();
- if((first->variant()==FOR_NODE || first->variant()==WHILE_NODE) && (lab=LabelOfDoStmt(first))){
-      BIF_LABEL_USE(first->thebif) = NULL;
- }
- else
-      return(NULL);
-
- //inserts ENDDO statement  
- st = new SgControlEndStmt(); //new SgStatement(CONTROL_END);
-
- //for debug regim
- BIF_LINE(st->thebif) = (last_st->lineNumber()) ? last_st->lineNumber() : LineNumberOfStmtWithLabel(lab);
- if(last_st->variant() != LOGIF_NODE)
-    last_st->insertStmtAfter(*st,*first);
- else
-    (last_st->lexNext())->insertStmtAfter(*st,*first);
- return(st);
-}
-
-void ReplaceContext(SgStatement *stmt)
-{
- if(isDoEndStmt_f90(stmt))
-   ReplaceDoNestLabel(stmt, GetLabel());
- else if(isSgLogIfStmt(stmt->controlParent())) {
-   if(isDoEndStmt_f90(stmt->controlParent()))
-      ReplaceDoNestLabel(stmt->controlParent(),GetLabel());
-   LogIf_to_IfThen(stmt->controlParent());
- } 
-} 
-
-void LogIf_to_IfThen(SgStatement *stmt)
-{
-//replace Logical IF statement: IF ( <condition> ) <statement>
-// by construction:  IF  ( <condition> ) THEN
-//                         <statement> 
-//                   ENDIF
- SgControlEndStmt *control = new SgControlEndStmt();
- stmt->setVariant(IF_NODE);
-(stmt->lexNext())->insertStmtAfter(* control,*stmt);
- if (stmt->numberOfAttributes(OMP_MARK) > 0) {/*OMP*/
-    control->addAttribute (OMP_MARK);/*OMP*/
- }/*OMP*/ 
-}
-
-
-SgStatement *doIfThenConstr(SgSymbol *ar)
-{SgStatement *ifst;
- SgExpression *ea;
-// creating
-//          IF ( ar(1) .EQ. 0) THEN
-//          ENDIF 
- ea = new SgArrayRefExp(*ar, *new SgValueExp(1));  ///IS_TEMPLATE(ar) && !INTERFACE_RTS2 ? new SgArrayRefExp(*ar) : new SgArrayRefExp(*ar, *new SgValueExp(1));
- ifst = new SgIfStmt( SgEqOp(*ea, *new SgValueExp(0)), *new SgStatement(CONT_STAT));
- where->insertStmtBefore(*ifst,*where->controlParent());
- ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
- return(ifst);
-}
-
-SgStatement *doIfThenConstrWithArElem(SgSymbol *ar, int ind)
-{SgStatement *ifst;
-// creating
-//          IF ( ar(ind) .EQ. 0) THEN
-//             ar(ind) = 1;
-//          ENDIF 
- ifst = new SgIfStmt( SgEqOp(*ARRAY_ELEMENT(ar,ind), *new SgValueExp(0)), *new SgAssignStmt(*ARRAY_ELEMENT(ar,ind), *new SgValueExp(1)));
- where->insertStmtBefore(*ifst,*where->controlParent());
-// ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
- return(ifst);
-}
-
-SgStatement *doIfForFileVariables(SgSymbol *s)
-{SgStatement *ifst;
-// creating
-//          IF ( s .EQ. 0) THEN
-//          ENDIF 
- ifst = new SgIfStmt( SgEqOp(*new SgVarRefExp(*s), *new SgValueExp(0)), *new SgStatement(CONT_STAT));
- cur_st->insertStmtAfter(*ifst,*cur_st->controlParent());
- ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
- return(ifst);
-}
-
-SgStatement *doIfThenConstrForRedis(SgExpression *headref, SgStatement *stmt, int index)
-{SgStatement *ifst;
- SgExpression *e;
-// creating
-//          IF ( headref .EQ. 0) THEN  /*08.05.17*/  //IF ( getamv(HeaderRef) .EQ. 0) THEN
-
-//          ELSE
-
-//          ENDIF 
-
- e = headref; /*08.05.17*/ //e = (index>1) ? headref : GetAMView( headref); //TEMPLATE or not
- ifst = new SgIfStmt( SgEqOp(*e, *new SgValueExp(0)), *new SgStatement(CONT_STAT),*new SgStatement(CONT_STAT));
- stmt->insertStmtBefore(*ifst,*stmt->controlParent());      //10.12.12   after=>before
- ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
- ifst->lexNext()->lexNext()->extractStmt(); // extracting second CONTINUE statement
- return(ifst);
-}
-
-SgStatement *doIfThenConstrForRealign(int iamv, SgStatement *stmt, int cond)
-{SgStatement *ifst;
- SgExpression *econd;
-// creating
-//          IF ( dvm000(iamv) .EQ. 0) THEN            or   .NE.
-
-//          ENDIF 
- econd = cond ?  &SgEqOp(*DVM000(iamv), *new SgValueExp(0)) : &SgNeqOp(*DVM000(iamv), *new SgValueExp(0));
- ifst = new SgIfStmt( *econd, *new SgStatement(CONT_STAT));
- stmt->insertStmtAfter(*ifst,*stmt->controlParent());
- ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
- return(ifst);
-}
-
-SgStatement *doIfThenConstrForRealign(SgExpression *headref, SgStatement *stmt, int cond)
-{SgStatement *ifst;
- SgExpression *econd;
-// creating
-//          IF ( headref .EQ. 0) THEN            or   .NE.
-
-//          ENDIF 
-
- econd = cond ?  &SgEqOp(*headref, *new SgValueExp(0)) : &SgNeqOp(*headref, *new SgValueExp(0));
- ifst = new SgIfStmt( *econd, *new SgStatement(CONT_STAT));
- stmt->insertStmtAfter(*ifst,*stmt->controlParent());
- ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
- return(ifst);
-}
-
-SgStatement *doIfThenConstrForPrefetch(SgStatement *stmt)
-{SgStatement *ifst;
-// creating
-//          IF ( GROUP(1) .EQ. 0) THEN
-//               GROUP(2) = 0
-//          ELSE
-//               GROUP(2) = 1
-//          ENDIF 
-
- ifst = new SgIfStmt( SgEqOp(*GROUP_REF(stmt->symbol(),1), *new SgValueExp(0)), *new SgAssignStmt(*GROUP_REF(stmt->symbol(),2),*new SgValueExp(0)),*new SgAssignStmt(*GROUP_REF(stmt->symbol(),2),*new SgValueExp(1)));
- stmt->insertStmtAfter(*ifst,*stmt->controlParent());
- //cur_st = ifst->lexNext()->lexNext()->lexNext()->lexNext();//END IF
- return(ifst);
-}
-
-SgStatement *doIfThenConstrForRemAcc(SgSymbol *group, SgStatement *stmt)
-{SgStatement *ifst, *st;
-// creating
-//          IF ( GROUP(2) .EQ. 0) THEN
-//              
-//          ELSE
-//               IF  ( GROUP(3) .EQ. 1) THEN
-//                 GROUP(3) = 0
-//               ENDIF
-//          ENDIF 
-//          CONTINUE
-
- ifst = new SgIfStmt( SgEqOp(*GROUP_REF(group,2), *new SgValueExp(0)), *new SgStatement(CONT_STAT),*new SgIfStmt( SgEqOp(*GROUP_REF(group,3), *new SgValueExp(1)),*new SgAssignStmt(*GROUP_REF(group,3),*new SgValueExp(0))));
- st=new SgStatement(CONT_STAT);                     //generating and
- stmt->insertStmtAfter(*st,*stmt->controlParent()); //inserting CONTINUE statement
- stmt->insertStmtAfter(*ifst,*stmt->controlParent());
- ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
-   //cur_st = ifst->lexNext()->lexNext();//internal IF THEN
-   //doAssignStmtAfter(WaitBG(group));
-   //FREE_DVM(1);
- //cur_st = cur_st->lexNext()->lexNext()->lexNext();//END IF
-
- cur_st = st;
- return(ifst);
-}
-
-void  doIfForReduction(SgExpression *redgref, int deb)
-{SgStatement *if_stmt;
-// creating
-//          IF ( GROUP .EQ. 0) THEN
-//               GROUP = crtrdf(...)
-//          ENDIF 
- if_stmt =  new SgIfStmt(SgEqOp(*redgref, *new SgValueExp(0) ),*new SgAssignStmt(*redgref,*CreateReductionGroup()));
-  cur_st->insertStmtAfter(*if_stmt, *cur_st->controlParent());
-  cur_st = if_stmt->lexNext();
-  if(debug_regim && deb){
-     doAssignTo_After( DebReductionGroup( redgref->symbol()), D_CreateDebRedGroup());
-  }
-
-  cur_st = cur_st->lexNext(); //END IF
-}
-
-SgStatement *doIfForCreateReduction(SgSymbol *gs, int i, int flag)
-{SgStatement *if_stmt, *st;
- SgSymbol *rgv, *go;
- SgExpression *rgvref;
-// creating
-//          IF ( <red-group-var>(i) .EQ. 0) THEN
-//            [ <red-group-var>(i) = 1 ]   //   if flag == 1
-//          ENDIF 
-//          CONTINUE
- go = ORIGINAL_SYMBOL(gs);
- rgv = * ((SgSymbol **) go -> attributeValue(0,RED_GROUP_VAR));
- rgvref = new SgArrayRefExp(*rgv,*new SgValueExp(i));
- st = flag ? new SgAssignStmt(*rgvref,*new SgValueExp(1)) : new SgStatement(CONT_STAT);
- if_stmt =  new SgIfStmt(SgEqOp(*rgvref, *new SgValueExp(0) ), *st);
-  cur_st->insertStmtAfter(*if_stmt);
-  //cur_st = if_stmt->lexNext()->lexNext(); //END IF
-  st=new SgStatement(CONT_STAT);
-  if_stmt->lexNext()->lexNext()->insertStmtAfter(*st);
-  cur_st = st;
-  if(!flag) 
-    if_stmt->lexNext()->extractStmt(); // extracting CONTINUE statement
-  
-  return(if_stmt);
-}
-
-
-void  doIfForConsistent(SgExpression *gref)
-{SgStatement *if_stmt;
-// creating
-//          IF ( GROUP .EQ. 0) THEN
-//               GROUP = crtcg(...)
-//          ENDIF 
-  if_stmt =  new SgIfStmt(SgEqOp(*gref,*new SgValueExp(0) ),*new SgAssignStmt(*gref,*CreateConsGroup(1,1))); 
-  cur_st->insertStmtAfter(*if_stmt, *cur_st->controlParent());
-  cur_st = if_stmt->lexNext();
-  //if(debug_regim){
-     //doAssignTo_After( DebReductionGroup( gref->symbol()), D_CreateDebRedGroup());
-  //}
-
-  cur_st = cur_st->lexNext(); //END IF
-}
-
-void doLogIfForHeap(SgSymbol *heap, int size)
-{SgStatement *if_stmt,*stop;
- stop = new SgStatement(STOP_STAT);
- stop ->setExpression(0,*new SgValueExp("Error 166: HEAP limit is exceeded"));
- if_stmt = new SgLogIfStmt(*ARRAY_ELEMENT(heap,1) > *new SgValueExp(size+1),*stop);
- cur_st->insertStmtAfter(*if_stmt);
- (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF 
-}
-
-void doLogIfForIOstat(SgSymbol *s, SgExpression *espec, SgStatement *stmt)
-{
-  SgExpression *cond;
-  SgKeywordValExp *kwe = isSgKeywordValExp(espec->lhs());  
-  if (!strcmp(kwe->value(),"err")) 
-     cond = &operator > (*new SgVarRefExp(s), *new SgValueExp(0));
-  else
-     cond = &operator < (*new SgVarRefExp(s), *new SgValueExp(0));
-
-  SgStatement *goto_stmt = new SgGotoStmt(*((SgLabelRefExp *) espec->rhs())->label());
-  SgStatement *if_stmt =  new SgLogIfStmt(*cond,*goto_stmt);  
-  stmt->insertStmtAfter(*if_stmt, *stmt->controlParent());
-  (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF 
-  BIF_LINE(if_stmt->thebif)   = stmt->lineNumber();
-  BIF_LINE(goto_stmt->thebif) = stmt->lineNumber();
-   
-}
-
-void doIfForDelete(SgSymbol *sg, SgStatement *stmt)
-{SgStatement *if_stmt,*delst;
-     //delst = new SgAssignStmt(*DVM000(ndvm++),*DeleteObject(new SgVarRefExp(*sg)));
-     //FREE_DVM(1);
- delst = DeleteObject_H(new SgVarRefExp(*sg)); 
- if_stmt = new SgLogIfStmt(SgNeqOp(*new SgVarRefExp(sg), *new SgValueExp(0)),*delst);
- InsertNewStatementBefore(if_stmt,stmt);
- (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF 
-}
-
-void doLogIfForAllocated(SgExpression *objref, SgStatement *stmt)
-{SgStatement *if_stmt,*call;
- call = DataExit(objref,0); 
- if_stmt = new SgLogIfStmt(*AllocatedFunction(objref),*call);
- InsertNewStatementBefore(if_stmt,stmt);
- (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF 
-}
-
-SgStatement *doIfThenForDataRegion(SgSymbol *symb, SgStatement *stmt, SgStatement *call)
-{
-    SgStatement *ifst = new SgIfStmt( SgEqOp(*new SgVarRefExp(symb), *new SgValueExp(0)), *call); 
-    stmt->insertStmtAfter(*ifst, *stmt->controlParent());
-    call->insertStmtAfter(*new SgAssignStmt(*new SgVarRefExp(symb),*new SgValueExp(1)), *ifst);
-    return (ifst);
-}
-
-void doIfIOSTAT(SgExpression *eiostat, SgStatement *stmt, SgStatement *go_stmt)
-{
- SgExpression *cond =  &operator != (eiostat->copy(), *new SgValueExp(0));
- SgStatement *if_stmt = new SgLogIfStmt(*cond,*go_stmt);
- stmt->insertStmtAfter(*if_stmt,*stmt->controlParent());
- (if_stmt->lexNext()->lexNext()) -> extractStmt(); //extract ENDIF
-}
-
-int isDoEndStmt(SgStatement *stmt)
-{
- SgLabel *lab, *do_lab;
- SgForStmt *parent;
- if(!(lab=stmt->label()) && stmt->variant() != CONTROL_END) //the statement has no label and
-   return(0);                                               //is not ENDDO 
- parent = isSgForStmt(stmt->controlParent());
- if(!parent)  //parent isn't DO statement
-   return(0);
- do_lab = parent->endOfLoop(); // label of loop end or NULL
- if(do_lab) //  DO statement with label
-   if(lab && LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(do_lab->thelabel))
-                           // the statement label is the label of loop end  
-     return(1);
-   else
-     return(0);
- else   //  DO statement without label
-   if(stmt->variant() == CONTROL_END)
-     return(1);
-   else
-     return(0);
-}
-
-int isDoEndStmt_f90(SgStatement *stmt)
-{// loop header may be
- //  DO <label> i=N1,N2,N3  or  DO <label> WHILE ( <condition> )
-
- SgLabel *lab; // *do_lab;
- SgStatement *parent;
- if(!(lab=stmt->label()) && stmt->variant() != CONTROL_END) //the statement has no label and
-   return(0);                                               //is not ENDDO 
- parent = stmt->controlParent();
- if(parent->variant()!=FOR_NODE && parent->variant()!=WHILE_NODE)
-   return(0);
-
- if(BIF_LABEL_USE(parent->thebif)) //  DO statement with label
-   if(lab && LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(BIF_LABEL_USE(parent->thebif)))
-                           // the statement label is the label of loop end  
-     return(1);
-   else
-     return(0);
- else   //  DO statement without label
-   if(stmt->variant() == CONTROL_END)
-     return(1);
-   else
-     return(0);
-}
-
-SgStatement * lastStmtOfDo(SgStatement *stdo)
-{ SgStatement *st;
-// second version  (change 04.03.08) 
-    st = stdo;
-RE: st = st->lastNodeOfStmt();
-    if((st->variant() == FOR_NODE) || (st->variant() == WHILE_NODE))
-          goto RE;
-
-    else if(st->variant() == LOGIF_NODE)
-          return(st->lexNext());
-
-    else
-          return(st);
-  
-
-/*
-  SgLabel *lab;
-  SgForStmt *loop;
-  SgLabel *dolab; 
-  if ((loop = isSgForStmt(stdo)) != NULL)
-    dolab = loop->endOfLoop();
-  else
-    return(NULL);
-  if(do_lab) { //DO statement with label
-    for(st=stdo; st; st = st->lexNext()) 
-      if((lab=st->label()) != NULL) //the statement has label 
-          if(LABEL_STMTNO(lab->thelabel) == LABEL_STMTNO(dolab->thelabel))
-                           // the statement label is the label of loop end 
-             if(st->variant() == LOGIF_NODE)
-                   return(st->lexNext());
-             else
-                   return(st);
-
-  } else  //DO statement without label
-      for(st=stdo; st; st = st->lexNext()) 
-         if(st->variant() == CONTROL_END && st->controlParent() == stdo) 
-            return(st);
-
-  return(NULL); //error situation
-*/
-
-}
-
-SgStatement * lastStmtOfIf(SgStatement *stif)
-{ SgStatement *st;
-// look for endif
-    st = stif;
-RE: st = st->lastNodeOfStmt();
-    if((st->variant() == ELSEIF_NODE) )
-          goto RE;
-    else
-          return(st);
-}
-
-SgStatement * lastStmtOf(SgStatement *st)
-{ SgStatement *last;
-     
-      if(st->variant() == LOGIF_NODE || st->variant() == FORALL_STAT)
-         last = st->lexNext();
-      else if((st->variant() == FOR_NODE) || (st->variant() == WHILE_NODE))
-         last = lastStmtOfDo(st);
-      else if(st->variant() == IF_NODE || st->variant() == ELSEIF_NODE)
-         last = lastStmtOfIf(st); 
-      else
-         last = st->lastNodeOfStmt();
-           
-      return(last); 
-}
-
-SgStatement *lastStmtOfFile(SgFile *f)
-{SgStatement *stmt, *last=NULL;
-
- for(stmt=f->firstStatement(); stmt; stmt=stmt->lexNext())
-    last = stmt;
- return(last);
-}
-
-int isParallelLoopEndStmt(SgStatement *stmt,SgStatement *first_do)
-{
-    SgLabel *do_lab;
-    return( ((do_lab = ((SgForStmt *)first_do)->endOfLoop()) && 
-            stmt->label() && 
-            (LABEL_STMTNO(stmt->label()->thelabel) == LABEL_STMTNO(do_lab->thelabel)) )
-                || 
-            (!do_lab && 
-            (stmt->variant() == CONTROL_END) && 
-            (stmt->controlParent() == first_do))
-          );
-}
-
-int TightlyNestedLoops_Test(SgStatement *prev_do,SgStatement *dost)
-{ SgStatement *end_prev,*end_do; //*next
-  SgLabel *dolab,*prevlab;
-  end_do = lastStmtOfDo(dost);
-  end_prev = lastStmtOfDo(prev_do);
-  prevlab = ((SgForStmt *) prev_do)->endOfLoop();
-  dolab = ((SgForStmt *) dost)->endOfLoop();
-  if(prevlab)
-  {  if(dolab && dolab==prevlab)
-         return 1;
-     else 
-     { if(NextExecStat(end_do)!=end_prev )
-         return 0;
-       else if(end_prev->variant()!=CONT_STAT && end_prev->variant()!=CONTROL_END)
-         return 0;
-       else
-         return 1;
-     }
-  }
-   return(NextExecStat(end_do)==end_prev);
-}
-
-SgStatement *NextExecStat(SgStatement *st)
-{  SgStatement *next;    
-  next = st->lexNext();
-  while( (next && (next->variant() == FORMAT_STAT)) || (next->variant() == DATA_DECL) )
-      next=next->lexNext();
-  return(next);
-}
-
-SgStatement *ContinueWithLabel(SgLabel *lab)
-{SgStatement *st;
- st = new SgStatement(CONT_STAT);
- st->setLabel(*lab);
- return(st);
-}
-
-SgStatement *PrintStat(SgExpression *item)
-{//generates the statement: PRINT *, <item>
- SgStatement *print;
- SgExpression *e1,*e2;
- print = new SgStatement(PRINT_STAT);
- //IO item list
- print->setExpression(0,*new SgExprListExp(*item));
- //control list: *
- e1 = new SgKeywordValExp("fmt");
- e2 = new SgKeywordValExp("*");
- print->setExpression(1,*new SgExpression(SPEC_PAIR, e1, e2, NULL));
-                                    
- return(print);
-}
-
-SgStatement *doIfThenConstrForIND(SgExpression *e, int cnst, int cond, int has_else, SgStatement *stmt, SgStatement *cp) 
-{SgStatement *ifst;
- SgExpression *econd;
-// creating
-//          IF (  e .EQ. cnst)  THEN                cond = 1
-//                  .NE.                            cond = 0
-//        [ ELSE ]                                  has_else = 1
-
-//          ENDIF 
-
- econd = cond ? &SgEqOp(*e, *new SgValueExp(cnst)) : &SgNeqOp(*e, *new SgValueExp(cnst));
- if(has_else) //with ELSE clause
-   ifst = new SgIfStmt(*econd,*new SgStatement(CONT_STAT),*new SgStatement(CONT_STAT));
- else
-   ifst = new SgIfStmt(*econd, *new SgStatement(CONT_STAT));
- stmt->insertStmtAfter(*ifst,*cp);
- ifst->lexNext()->extractStmt(); // extracting CONTINUE statement
- if(has_else)
-  ifst->lexNext()->lexNext()->extractStmt(); // extracting second CONTINUE statement
- return(ifst);
-}
-
-
-SgStatement *ReplaceOnByIf(SgStatement *stmt,SgStatement *end_stmt)
-{ // stmt - ON directive, end_stmt - END ON directive
-  SgStatement *if_stmt, *end_if, *cp;
-  SgLabel *lab = NULL;
-  char * cmnt=NULL;
-  SgSymbol *ar = NULL;
-  SgExpression *el = NULL,*ei[MAX_DIMS];
-  SgExpression *condition=NULL, *index_list=NULL;  
-  int iind,i,j,k;
-  if(isSgArrayRefExp(stmt->expr(0))) { 
-     ar = stmt->expr(0)->symbol();
-     el = stmt->expr(0)->lhs(); //index list
-  }
-  if(stmt->expr(0)->variant() == ARRAY_OP){
-     ar = stmt->expr(0)->lhs()->symbol();
-     el = stmt->expr(0)->lhs()->lhs(); //index list
-  }
-  if (!el || !TestMaxDims(el,ar,stmt)) //error situation: no subscripts or the number of subscripts > MAX_DIMS
-    return NULL; 
-  
-  cmnt=stmt-> comments();
-  if (cmnt)    // statement has preceeding comments 
-      BIF_CMNT(stmt->thebif) = NULL;
-  
-  
-  for(i=0;el;el=el->rhs(),i++) 
-  { ei[i] = &(el->lhs()->copy());       
-    ChangeDistArrayRef(ei[i]);
-    if(!IN_COMPUTE_REGION && !INTERFACE_RTS2)  
-       ei[i] = &(*ei[i]- *Exprn(LowerBound(ar,i)));
-  } 
-   iind = ndvm;
-
-   where = stmt;
-   if(for_kernel)  /*ACC*/
-      cur_st = stmt->lexPrev(); /*ACC*/
-   else if(INTERFACE_RTS2)
-   {
-      cur_st = stmt->lexPrev(); 
-      for(j=i; j; j--) 
-         index_list= AddListToList(index_list,new SgExprListExp(*DvmType_Ref(ei[j-1])));        
-   }
-   else
-   {
-     for(j=i, k=1; j; j--) 
-     {  if(IN_COMPUTE_REGION )   /*ACC*/
-           doAssignTo(VECTOR_REF(indexArraySymbol(ar),k++),ei[j-1]);/*ACC*/ 
-        else 
-           doAssignStmtAfter(ei[j-1]);
-        cur_st->addAttribute (OMP_CRITICAL); /*OMP*/     
-     }      
-   } 
-
-  cp = stmt->controlParent(); /*ACC*/ 
-
-  if(IN_COMPUTE_REGION && !for_kernel)       /*ACC*/
-    condition =  & SgNeqOp(INTERFACE_RTS2 ? *HasLocalElement_H2(NULL,ar,i,index_list) : *HasLocalElement(NULL,ar,indexArraySymbol(ar)), *new SgValueExp(0) );
-  else if(for_kernel)                       /*ACC*/
-    condition = LocalityConditionInKernel(ar,ei);    /*ACC*/
-  else
-    condition = & SgNeqOp(INTERFACE_RTS2 ? *HasElement(HeaderRef(ar),i,index_list) : *TestElement(HeaderRef(ar),iind), *new SgValueExp(0) );
-  if_stmt =  new SgIfStmt(*condition,*new SgStatement(CONT_STAT));
-  if_stmt->addAttribute (OMP_CRITICAL); /*OMP*/
-
-  cur_st->insertStmtAfter(*if_stmt,*cp); 
-               //(cur_st->lexNext())-> extractStmt(); //extract CONTINUE (CONT_STAT)
-               //cur_st = if_stmt->lexNext(); //ENDIF 
-  end_if = if_stmt->lexNext()->lexNext();
-  if(cmnt)
-      if_stmt -> setComments(cmnt);
-  
-  TransferBlockIntoIfConstr(if_stmt,stmt,end_stmt);   
-  SET_DVM(iind);
-  cur_st = end_if; //if_stmt->lexNext(); //ENDIF 
-  return(if_stmt);
-}
-
-void TransferStmtAfter(SgStatement *stmt, SgStatement *where)
-{
- stmt->extractStmt();
- where->insertStmtAfter(*stmt);
-}
-
-void TransferBlockIntoIfConstr(SgStatement *ifst, SgStatement *stmt1, SgStatement *stmt2)
-{SgStatement *st, *where;
-  if(!stmt1 || !stmt2)
-    return;
-  st = stmt1->lexNext();
-  where = ifst->lexNext(); 
-  while(st != stmt2){
-    st->extractStmt();
-    where->insertStmtBefore(*st,*ifst);
-    st=stmt1->lexNext();
-  }
-  where->extractStmt();
-}
-
-void TransferStatementGroup(SgStatement *first_st, SgStatement *last_st, SgStatement *st_end)
-{
-    SgStatement *st, *next;
-   
-    for (st = first_st; IN_STATEMENT_GROUP(st); st = next)
-    {
-            next = lastStmtOf(st)->lexNext();
-            st->extractStmt();
-            st_end->insertStmtBefore(*st, *st_end->controlParent());                          
-    }
-}
-
-void TransferStatementBlock(SgStatement *first_st, SgStatement *out_st, SgStatement *st_end)
-{
-    SgStatement *st, *next;
-   
-    for (st = first_st; st!=out_st; st = next)
-    {
-            next = lastStmtOf(st)->lexNext();
-            st->extractStmt();
-            st_end->insertStmtBefore(*st, *st_end->controlParent());                          
-    }
-}
-
-
-void ReplaceComputedGoTo(stmt_list *gol)
-{//GO TO (lab1,lab2,..,labk), <int_expr>
-// is replaced by
-//       [  iv = int_expr     ]
-//          IF ( iv.EQ.1) THEN
-//            GO TO lab1 
-//          ENDIF 
-//          IF ( iv.EQ.2) THEN
-//            GO TO lab2 
-//          ENDIF 
-//           . . .
-//          IF ( iv.EQ.k) THEN
-//            GO TO labk 
-//          ENDIF
-  stmt_list *gl, *gotol; 
-  SgStatement *ass, *ifst, *stmt;
-  SgLabel *lab_st, *labgo;
-  SgGotoStmt *gost;
-  SgExpression  *cond, *el;
-  SgSymbol *sv;
-  int lnum,i;
-
-  stmt = gol->st;
-  lnum = stmt->lineNumber();
-  lab_st = stmt->label();
-  if(isSgVarRefExp(stmt->expr(1)))
-  {  sv = stmt->expr(1)->symbol();
-     ass = NULL;
-  }
-  else
-  {  sv = DebugGoToSymbol(stmt->expr(1)->type());
-     ass = new SgAssignStmt (*new SgVarRefExp(sv),*stmt->expr(1));
-     stmt->insertStmtBefore(*ass,*stmt->controlParent());//inserting before stmt
-     if(lab_st)
-       ass-> setLabel(*lab_st);
-     BIF_LINE(ass->thebif) = lnum;
-  }
-  gotol = gol->next;
-  for(el=stmt->expr(0),i=1; el; el=el->rhs(),i++)
-  {
-    labgo = ((SgLabelRefExp *) (el->lhs()))->label();
-    gost = new SgGotoStmt(*labgo);
-    BIF_LINE(gost->thebif) = lnum;
-    gl = new stmt_list;
-    gl->st = gost;
-    gl->next = gotol;
-    gotol = gl;
-    cond = &SgEqOp(*new SgVarRefExp(sv), *new SgValueExp(i));
-    ifst = new SgIfStmt( *cond, *gost);
-    stmt->insertStmtBefore(*ifst,*stmt->controlParent());//inserting before stmt 
-
-    if(i==1 && lab_st && !ass ) 
-      ifst-> setLabel(*lab_st);
-  }
-  stmt->extractStmt();
-  gol->next = gotol;
-}
-
-void ReplaceArithIF(stmt_list *gol)
-{//IF (expr) lab1,lab2,lab3
-// is replaced by
-//       [  iv = expr        ]
-//          IF ( v.LT.0) THEN
-//            GO TO lab1 
-//          ENDIF 
-//          IF ( v.EQ.0) THEN
-//            GO TO lab2 
-//          ENDIF 
-//          //IF ( v.GT.0) THEN
-//            GO TO lab3
-//          //ENDIF
-  stmt_list *gl, *gotol;  
-  SgStatement *ass, *ifst, *stmt;
-  SgLabel *lab_st, *labgo;
-  SgGotoStmt *gost;
-  SgExpression *cond;
-  SgSymbol *sv;
-  int lnum;
-
-  stmt = gol->st;
-  lnum = stmt->lineNumber();
-  lab_st = stmt->label(); 
-  if(isSgVarRefExp(stmt->expr(0)))
-  {  sv = stmt->expr(0)->symbol();
-     ass = NULL;
-  }
-  else
-  {  sv = DebugGoToSymbol(stmt->expr(0)->type());
-     ass = new SgAssignStmt (*new SgVarRefExp(sv),*stmt->expr(0));
-     stmt->insertStmtBefore(*ass,*stmt->controlParent());//inserting before stmt
-     if(lab_st)
-       ass-> setLabel(*lab_st);
-  }
-
-  gotol = gol->next;
-  labgo = ((SgLabelRefExp *) (stmt->expr(1)->lhs()))->label();
-  gost = new SgGotoStmt(*labgo);
-  BIF_LINE(gost->thebif) = lnum;
-  gl = new stmt_list;
-  gl->st = gost;
-  gl->next = gotol;
-  gotol = gl;
-  cond = &operator < (*new SgVarRefExp(sv), *new SgValueExp(0));
-  ifst = new SgIfStmt( *cond, *gost);
-  stmt->insertStmtBefore(*ifst,*stmt->controlParent());//inserting before stmt
-  if(lab_st && !ass) 
-     ifst-> setLabel(*lab_st);
-
-  labgo = ((SgLabelRefExp *) (stmt->expr(1)->rhs()->lhs()))->label();
-  gost = new SgGotoStmt(*labgo);
-  BIF_LINE(gost->thebif) = lnum;
-  gl = new stmt_list;
-  gl->st = gost;
-  gl->next = gotol;
-  gotol = gl;
-  cond = &SgEqOp(*new SgVarRefExp(sv), *new SgValueExp(0));
-  ifst = new SgIfStmt(*cond, *gost);
-  stmt->insertStmtBefore(*ifst,*stmt->controlParent());//inserting before stmt
-
-  labgo = ((SgLabelRefExp *) (stmt->expr(1)->rhs()->rhs()->lhs()) )->label();
-  gost = new SgGotoStmt(*labgo);
-  BIF_LINE(gost->thebif) = lnum;
-  gl = new stmt_list;
-  gl->st = gost;
-  gl->next = gotol;
-  gotol = gl;
-  //cond = &operator > (*new SgVarRefExp(sv), *new SgValueExp(0));
-  //ifst = new SgIfStmt( *cond, *gost);
-  //stmt->insertStmtBefore(*ifst,*stmt->controlParent());//inserting before stmt
-  stmt->insertStmtBefore(*gost,*stmt->controlParent());//inserting before stmt
-  stmt->extractStmt();
-  gol->next = gotol;
-}
-
-SgStatement *IncludeLine(char *str)
-{ SgExpression *estr;
-  SgStatement  *incl_line;
-  
-  incl_line = new SgStatement(INCLUDE_LINE);
-  estr = new SgExpression(STMT_STR);
-  NODE_STR(estr->thellnd)= str;   //  for example: "\"dvm.h\"","<malloc.h>" 
-  incl_line->setExpression(0,*estr);
-  return(incl_line);
-}
-
-SgStatement *PreprocessorDirective(char *str)
-{ SgExpression *estr;
-  SgStatement  *pre_dir;
-  
-  pre_dir = new SgStatement(PREPROCESSOR_DIR);
-  estr = new SgExpression(STMT_STR);
-  NODE_STR(estr->thellnd)= str;   //  for example: "#ifdef" 
-  pre_dir->setExpression(0,*estr);
-  return(pre_dir);
-}
-
-SgStatement *PreprocessorDirective(const char *str_in)
-{
-    SgExpression *estr;
-    SgStatement  *pre_dir;
-    char *str = new char[strlen(str_in) + 1];
-    strcpy(str, str_in);
-    
-    pre_dir = new SgStatement(PREPROCESSOR_DIR);
-    estr = new SgExpression(STMT_STR);
-    NODE_STR(estr->thellnd) = str;   //  for example: "#ifdef" 
-    pre_dir->setExpression(0, *estr);
-    return(pre_dir);
-}
-
-SgStatement *ifdef_dir(char *str)
-{ char *dir = new char  [8 + strlen(str)];
-  dir[0] = '\0';
-  strcat(dir,"#ifdef ");
-  strcat(dir,str); 
-  
-  return(PreprocessorDirective(dir));
-}
-
-SgStatement *ifndef_dir(char *str)
-{ char *dir = new char  [9 + strlen(str)];
-  dir[0] = '\0';
-  strcat(dir,"#ifndef ");
-  strcat(dir,str); 
-
-  return(PreprocessorDirective(dir));
-}
-
-SgStatement *endif_dir()
-{  return(PreprocessorDirective("#endif"));}
-
-SgStatement *else_dir()
-{  return(PreprocessorDirective("#else"));}
-
-
-int isExecutableDVMHdirective(SgStatement *stmt)
-{
-    switch(stmt->variant()) {
-      
-       case DVM_PARALLEL_ON_DIR:
-       case DVM_ASYNCHRONOUS_DIR:
-       case DVM_ENDASYNCHRONOUS_DIR:
-       case DVM_REDUCTION_START_DIR:
-       case DVM_REDUCTION_WAIT_DIR: 
-       case DVM_SHADOW_GROUP_DIR:
-       case DVM_SHADOW_START_DIR:      
-       case DVM_SHADOW_WAIT_DIR:
-       case DVM_REMOTE_ACCESS_DIR:     
-       case DVM_NEW_VALUE_DIR:  
-       case DVM_REALIGN_DIR:
-       case DVM_REDISTRIBUTE_DIR: 
-       case DVM_ASYNCWAIT_DIR:
-       case DVM_F90_DIR:
-       case DVM_CONSISTENT_START_DIR: 
-       case DVM_CONSISTENT_WAIT_DIR:
-
-       case DVM_INTERVAL_DIR:
-       case DVM_ENDINTERVAL_DIR:
-       case DVM_EXIT_INTERVAL_DIR:
-       case DVM_OWN_DIR: 
-       case DVM_DEBUG_DIR:
-       case DVM_ENDDEBUG_DIR:
-       case DVM_TRACEON_DIR:
-       case DVM_TRACEOFF_DIR:
-       case DVM_BARRIER_DIR:
-       case DVM_CHECK_DIR:
-
-       case DVM_TASK_REGION_DIR:	          
-       case DVM_END_TASK_REGION_DIR:
-       case DVM_ON_DIR: 
-       case DVM_END_ON_DIR:                
-       case DVM_MAP_DIR:     
-       case DVM_RESET_DIR:
-       case DVM_PREFETCH_DIR:  
-       case DVM_PARALLEL_TASK_DIR: 
- 
-       case ACC_REGION_DIR: 
-       case ACC_END_REGION_DIR:   
-       case ACC_GET_ACTUAL_DIR:
-       case ACC_ACTUAL_DIR:
-       case ACC_CHECKSECTION_DIR:
-       case ACC_END_CHECKSECTION_DIR:
-       case DVM_IO_MODE_DIR:
-       case DVM_SHADOW_ADD_DIR:
-       case DVM_LOCALIZE_DIR:
-       case DVM_CP_CREATE_DIR:
-       case DVM_CP_LOAD_DIR:
-       case DVM_CP_SAVE_DIR:
-       case DVM_CP_WAIT_DIR:
-       case DVM_TEMPLATE_CREATE_DIR:
-       case DVM_TEMPLATE_DELETE_DIR:
-            return 1;
-       default:
-            return 0;
-    }
-
-}
-
-int isDvmSpecification (SgStatement * st) {
-	switch (st->variant()) {
-		case DVM_REDUCTION_GROUP_DIR:
-		case DVM_DYNAMIC_DIR:
-		case DVM_ALIGN_DIR:
-                case DVM_DISTRIBUTE_DIR:
-		case DVM_SHADOW_DIR:
-		case DVM_VAR_DECL:
-		case DVM_POINTER_DIR:
-		case HPF_TEMPLATE_STAT:
-		case HPF_ALIGN_STAT:
-		case HPF_PROCESSORS_STAT:
-		case DVM_TASK_DIR:
-		case DVM_INHERIT_DIR:
-		case DVM_INDIRECT_GROUP_DIR:
-		case DVM_REMOTE_GROUP_DIR:
-		case DVM_HEAP_DIR:
-		case DVM_ASYNCID_DIR:
-		case DVM_CONSISTENT_GROUP_DIR:
-                case DVM_CONSISTENT_DIR:
-                case ACC_ROUTINE_DIR:
-                case ACC_DECLARE_DIR:
-
-		     return 1; break;
-	}
-	return 0;
-}
-
-void DeleteSaveAttribute(SgStatement *stmt)
-{ SgExpression *el = stmt->expr(2);
-  if(!el) return;
-  if( el->lhs()->variant()==SAVE_OP )
-  { 
-    if(!el->rhs()) 
-      BIF_LL3(stmt->thebif) = NULL;
-    else
-      BIF_LL3(stmt->thebif) = el->rhs()->thellnd;
-    return;  
-  }
-  SgExpression *el1 = el; 
-  for(el=el->rhs(); el; el=el->rhs())
-  {  
-     if(el->lhs()->variant()==SAVE_OP)
-     {
-        el1->setRhs(el->rhs());
-        return;
-     }
-  }
-}
-
-void TransferLabelFromTo( SgStatement *from_st, SgStatement *to_st)
-{
-  if(from_st->hasLabel())
-  {   
-    SgLabel *lab = from_st->label(); 
-    BIF_LABEL(from_st->thebif) = NULL;
-    to_st->setLabel(*lab);
-  }
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/include/acc_across_analyzer.h b/projects/dvm_svn/fdvm/trunk/include/acc_across_analyzer.h
deleted file mode 100644
index 77be4ac..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/acc_across_analyzer.h
+++ /dev/null
@@ -1,157 +0,0 @@
-#pragma once
-
-
-struct BasicBlock
-{
-    int index;
-    SgStatement* head;
-    SgStatement* tail;
-    std::vector<int> in, out;// blocks this block takes control from / passes control to
-    std::set<SgStatement*> INrd, OUTrd, INae, OUTae;// reaching definitions and extended available expressions
-    std::map<SgExpression*, std::set<SgExpression*> > INss;// safe substitutes (expression propagation)
-    BasicBlock() : index(-1), head(NULL), tail(NULL) {}
-};
-
-class Access;
-class Array;
-class Loop;
-
-class Access
-{
-private:
-    int blockIndex;
-    SgExpression* expr;
-    std::string str;
-    Array* array;
-    int* alignment;
-
-public:
-    int getBlockIndex() const { return blockIndex; }
-    SgExpression* getSubscripts() { return expr; }
-    int* getAlignment() const { return alignment; }
-
-    Access(SgExpression* subscripts, std::string s, Array* array, int blockIndex) : expr(subscripts), str(s), array(array), blockIndex(blockIndex), alignment(NULL) {}
-
-    void analyze();
-    void getReferences(SgExpression* expr, std::set<SgExpression*>& references, std::map<SgExpression*, std::string>& unparsedRefs, std::map<std::string, SgExpression*>& refs) const;
-
-    ~Access() { delete [] alignment; }
-};
-
-struct TfmInfo
-{
-    std::vector<int> transformDims;
-    std::vector<std::pair<std::string, std::string> > exprs;
-    std::vector<SgSymbol*> coefficients;
-    std::vector<SgExpression*> first;
-    std::vector<SgExpression*> second;
-    std::vector<SgStatement*> zeroSt;
-    std::map<SgStatement*, std::vector<SgFunctionCallExp*> > ifCalls;
-    std::map<SgStatement*, std::vector<SgFunctionCallExp*> > elseCalls;
-};
-
-class Array
-{
-private:
-    SgSymbol* symbol;
-    int dimension;
-    Loop* loop;
-    std::map<std::string, Access*> accesses;
-    int* alignment;
-    std::vector<int> acrossDims;
-    int acrossType;
-
-    TfmInfo tfmInfo;
-
-public:
-    SgSymbol* getSymbol() const { return symbol; }
-    Loop* getLoop() const { return loop; }
-    int getDimension() const { return dimension; }
-    int getAcrossType() const { return acrossType; }
-    void setAcrossType(const int acrossType) { this->acrossType = acrossType; }
-    std::vector<int>& getAcrossDims() { return acrossDims; }    
-    int* getAlignment() const { return alignment; }
-    std::map<std::string, Access*>& getAccesses() { return accesses; }
-    TfmInfo& getTfmInfo() { return tfmInfo; }
-
-    Array(SgSymbol* symbol, int dimension, Loop* loop) : symbol(symbol), dimension(dimension), loop(loop), alignment(NULL), acrossDims(dimension, -1), acrossType(0) {}
-
-    void analyze();
-    void analyzeTransformDimensions();
-    SgSymbol* findAccess(SgExpression* subscripts, std::string& expr);
-    void addCoefficient(SgExpression* subscripts, std::string& expr, SgSymbol* symbol);
-    void generateAssigns(SgVarRefExp* offsetX, SgVarRefExp* offsetY, SgVarRefExp* Rx, SgVarRefExp* Ry, SgVarRefExp* slash);
-
-    ~Array()
-    {
-        delete [] alignment;
-        for (std::map<std::string, Access*>::iterator it = accesses.begin(); it != accesses.end(); ++it)
-            delete it->second;
-    }
-};
-
-class Loop
-{
-private:
-    bool enable_opt;
-    bool irregular_acc_opt;
-    bool do_irreg_opt;
-    std::vector<BasicBlock> blocks;
-    std::map<SgStatement*, int> blockIn;
-
-    enum { ENTRY, EXIT };
-
-    SgStatement* loop_body;
-    int dimension;
-    std::map<SgSymbol*, Array*> arrays;
-    std::set<SgSymbol*> redArrays;
-    int* acrossDims;
-    int acrossType;
-    std::vector<SgSymbol*> symbols;
-    std::set<SgSymbol*> privateList;
-
-    bool IsTargetable(SgStatement* stmt) const;
-    void analyzeAcrossClause();
-    void analyzeAcrossType();
-    void analyzeAssignments(int blockIndex, SgStatement* stmt);
-    void buildCFG();
-    void setupSubstitutes();
-    void analyzeAssignments(SgExpression* ex, const int blockIndex);
-    void analyzeInderectAccess();
-
-public:
-    const std::vector<BasicBlock>& getBlocks() const { return blocks; }
-    const std::map<SgStatement*, int>& getBlockIn() const { return blockIn; }
-    const std::vector<SgSymbol*>& getSymbols() const { return symbols; }
-    int getDimension() const { return dimension; }
-    int getAcrossType() const { return acrossType; }
-    std::map<SgSymbol*, Array*>& getArrays() { return arrays; }
-    std::set<SgSymbol*>& getPrivateList() { return privateList; }
-
-    Loop(SgStatement* loop_body, bool enable_opt, bool irreg_access = false);
-
-    // only for RD/AE analyses, which can be later performed only on statements in loop_body
-    // usage: Loop* loop = new Loop(loop_body_stmt); RDs = loop->RDsAt(stmtI); AEs = loop->AEsAt(stmtJ);
-    // note: only one loop object can exist at a time (lhs, rhs, unparsedLhs, unparsedRhs are global for all methods for simplicity,
-    // probably can be added to Loop class and transferred to Array/Access by pointer/reference, and this constraint will be solved)
-    Loop(SgStatement* loop_body);
-    // get defining statements which reach stmt
-    std::set<SgStatement*> RDsAt(SgStatement* stmt) const;
-    // get statements, rhss of which are available at stmt
-    std::set<SgStatement*> AEsAt(SgStatement* stmt) const;
-
-    void getRPN(SgExpression* expr, std::list<SgExpression*>& rpn) const;
-    void unrollRPN(std::list<SgExpression*>& rpn, std::map<SgExpression*, int>& arity) const;
-    void optimizeRPN(std::list<SgExpression*>& rpn, std::map<SgExpression*, int>& arity, bool unrolled) const;
-    SgExpression* simplify(SgExpression* expr) const;
-    void visualize(const char* scriptName) const;
-
-    bool irregularAnalysisIsOn() const;
-    ~Loop()
-    {
-        delete [] acrossDims;
-        for (std::map<SgSymbol*, Array*>::iterator it = arrays.begin(); it != arrays.end(); ++it)
-            delete it->second;
-    }
-};
-
diff --git a/projects/dvm_svn/fdvm/trunk/include/acc_analyzer.h b/projects/dvm_svn/fdvm/trunk/include/acc_analyzer.h
deleted file mode 100644
index 096626f..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/acc_analyzer.h
+++ /dev/null
@@ -1,1211 +0,0 @@
-#pragma once
-#define ACCAN_DEBUG 0
-
-#define USE_INTRINSIC_DVM_LIST 1
-
-#define PRIVATE_ANALYSIS_NOT_CONDUCTED 650
-#define PRIVATE_ANALYSIS_ADD_VAR 651
-#define PRIVATE_ANALYSIS_REMOVE_VAR 652
-#define PRIVATE_ANALYSIS_NO_RECURSION_ANALYSIS 653
-
-#ifdef __SPF
-extern "C" void printLowLevelWarnings(const char *fileName, const int line, const wchar_t* messageR, const char* messageE, const int group);
-extern "C" void printLowLevelNote(const char *fileName, const int line, const wchar_t *messageR, const char *messageE, const int group);
-
-extern "C" void addToCollection(const int line, const char *file, void *pointer, int type);
-extern "C" void removeFromCollection(void *pointer);
-bool IsPureProcedureACC(SgSymbol* s);
-#endif
-
-struct AnalysedCallsList;
-
-class ControlFlowItem
-{
-    int stmtNo;
-    SgLabel* label;
-    ControlFlowItem *jmp;
-    bool for_jump_flag;
-    SgLabel* label_jump;
-    ControlFlowItem* prev;
-    ControlFlowItem* next;
-    bool leader;
-    int bbno;
-    bool is_parloop_start;
-    SgExpression* private_list;
-    bool is_parloop_end;
-    SgStatement* prl_stmt;
-    AnalysedCallsList* call;
-    SgFunctionCallExp* func;
-    SgExpression* pPl;
-    bool fPl;
-    bool drawn;
-    AnalysedCallsList* thisproc;
-    //int refs;
-    SgStatement* originalStatement;
-    ControlFlowItem* conditionFriend;
-    union
-    {
-        SgStatement *stmt;
-        SgExpression *expr;
-    };
-public:
-    inline ControlFlowItem(AnalysedCallsList* proc) : 
-        stmtNo(-1), label(NULL), jmp(NULL), label_jump(NULL), next(NULL), leader(false), bbno(0), 
-        stmt(NULL), is_parloop_start(false), is_parloop_end(false), private_list(NULL), call(NULL), 
-        func(NULL), thisproc(proc), originalStatement(NULL), for_jump_flag(false), drawn(false),
-        prev(NULL), conditionFriend(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 3);
-#endif
-    }
-
-    inline ControlFlowItem(SgStatement *s, ControlFlowItem *n, AnalysedCallsList* proc, AnalysedCallsList* c = NULL) : 
-        stmtNo(-1), label(s ? s->label() : NULL), jmp(NULL), label_jump(NULL), next(n), leader(false), 
-        bbno(0), stmt(s), is_parloop_start(false), is_parloop_end(false), private_list(NULL), 
-        call(c), func(NULL), thisproc(proc), originalStatement(NULL), for_jump_flag(false), drawn(false),
-        prev(NULL), conditionFriend(NULL)
-    {
-        if (n) {
-            n->prev = this;
-        }
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 3);
-#endif
-    }
-
-    inline ControlFlowItem(SgExpression *e, ControlFlowItem *j, ControlFlowItem *n, SgLabel* l, AnalysedCallsList* proc, bool fjf = false, AnalysedCallsList* c = NULL) :
-        stmtNo(-1), label(l), jmp(j), label_jump(NULL), next(n), leader(false), bbno(0), 
-        expr(e), is_parloop_start(false), is_parloop_end(false), private_list(NULL), call(c), 
-        func(NULL), thisproc(proc), originalStatement(NULL), for_jump_flag(fjf), drawn(false),
-        prev(NULL), conditionFriend(NULL)
-    {
-        if (n) {
-            n->prev = this;
-        }
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 3);
-#endif
-    }
-
-    inline ControlFlowItem(SgExpression *e, SgLabel* j, ControlFlowItem* n, SgLabel* l, AnalysedCallsList* proc, AnalysedCallsList* c = NULL) : 
-        stmtNo(-1), label(l), jmp(NULL), label_jump(j), next(n), leader(false), bbno(0), 
-        expr(e), is_parloop_start(false), is_parloop_end(false), private_list(NULL), call(c), 
-        func(NULL), thisproc(proc), originalStatement(NULL), for_jump_flag(false), drawn(false),
-        prev(NULL), conditionFriend(NULL)
-    {
-        if (n) {
-            n->prev = this;
-        }
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 3);
-#endif
-    }
-
-    inline void setOriginalStatement(SgStatement* s)
-    { originalStatement = s; }
-
-    inline SgStatement* getOriginalStatement()
-    { return originalStatement; }
-
-    inline bool isEnumerated()
-    { return stmtNo >= 0; }
-
-    inline void setBBno(int bb)
-    { bbno = bb; }
-
-    inline int getBBno()
-    { return bbno; }
-
-    inline void AddNextItem(ControlFlowItem *n)
-    { next = n; if (n) n->prev = this; }
-
-    inline void MakeParloopStart()
-    { is_parloop_start = true; }
-
-    inline void MakeParloopEnd()
-    { is_parloop_end = true; }
-
-    inline bool IsParloopStart()
-    { return is_parloop_start; }
-
-    inline bool IsParloopEnd()
-    { return is_parloop_end; }
-
-    inline bool isUnconditionalJump()
-    { return ((jmp != NULL || label_jump != NULL) && expr == NULL); }
-
-    inline SgStatement* getStatement()
-    {
-        if (jmp == NULL)
-            return stmt;
-        else
-            return NULL;
-    }
-
-    inline SgExpression* getExpression()
-    {
-        if (jmp != NULL)
-            return expr;
-        else
-            return NULL;
-    }
-
-    inline ControlFlowItem* getJump()
-    { return jmp; }
-
-    inline ControlFlowItem* getNext()
-    { return next; }
-
-    inline void setLeader()
-    { leader = true; }
-
-    inline unsigned int getStmtNo()
-    { return stmtNo; }
-
-    inline void setStmtNo(unsigned int no)
-    { stmtNo = no; }
-
-    inline int isLeader()
-    { return leader; }
-
-    inline void setLabel(SgLabel* l)
-    { label = l; }
-
-    inline SgLabel* getLabel()
-    { return label; }
-
-    inline void setLabelJump(SgLabel* l)
-    { label_jump = l; }
-
-    inline SgLabel* getLabelJump()
-    { return label_jump; }
-
-    inline void initJump(ControlFlowItem* item)
-    { jmp = item; }
-
-    inline void setPrivateList(SgExpression* p, SgStatement* s, SgExpression* m, bool mf)
-    { private_list = p; prl_stmt = s; pPl = m; fPl = mf; }
-
-    inline SgExpression* getPrivateList()
-    { return private_list; }
-
-    inline SgStatement* getPrivateListStatement()
-    { return prl_stmt; }
-
-    inline SgExpression* getExpressionToModifyPrivateList(bool* rhs)
-    { if (rhs) *rhs = fPl; return pPl; }
-
-    inline AnalysedCallsList* getCall()
-    { return call; }
-
-    inline void setFunctionCall(SgFunctionCallExp* f)
-    { func = f; }
-
-    inline SgFunctionCallExp* getFunctionCall()
-    { return func; }
-
-    inline AnalysedCallsList* getProc()
-    { return thisproc; }
-
-    inline bool IsForJumpFlagSet()
-    { return for_jump_flag; }
-
-    inline bool IsEmptyCFI()
-    { return getStatement() == NULL; }
-
-    inline void SetIsDrawn()
-    { drawn = true; }
-
-    inline void ResetDrawnStatus()
-    { drawn = false; }
-
-    inline bool IsDrawn()
-    { return drawn; }
-
-    inline ControlFlowItem* GetPrev()
-    { return prev; }
-
-    inline void SetConditionFriend(ControlFlowItem* f)
-    { conditionFriend = f; }
-
-    inline ControlFlowItem* GetFriend()
-    { return conditionFriend; }
-
-    int GetLineNumber();
-
-#if ACCAN_DEBUG
-    void printDebugInfo();
-
-#endif
-    ~ControlFlowItem()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-class doLoopItem
-{
-    int label;
-    SgSymbol* name;
-    ControlFlowItem* iter;
-    ControlFlowItem* emptyAfter;
-    bool current;
-    doLoopItem* next;
-    int parallel_depth;
-    SgExpression* prl;
-    SgExpression* pPl;
-    bool plf;
-    SgStatement* prs;
-public:
-    inline doLoopItem(int l, SgSymbol* s, ControlFlowItem* i, ControlFlowItem* e) : 
-        label(l), name(s), iter(i), emptyAfter(e), current(true), next(NULL), parallel_depth(-1)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 4);
-#endif
-    }
-
-    ~doLoopItem()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-    inline void HandleNewItem(doLoopItem* it) { setParallelDepth(it->parallel_depth, it->prl, it->prs, it->pPl, it->plf); }
-    inline void setNext(doLoopItem* n) { next = n; }
-    inline void setNewLabel(int l) { label = l; }
-    inline ControlFlowItem* getSourceForCycle() { return iter; }
-    inline ControlFlowItem* getSourceForExit() { return emptyAfter; }
-    inline SgSymbol* getName() { return name; }
-    inline doLoopItem* getNext() { return next; }
-    inline int getLabel() { return label; }
-
-    inline void setParallelDepth(int k, SgExpression* pl, SgStatement* ps, SgExpression* pPl, bool plf) 
-    { parallel_depth = k; prl = pl; prs = ps; this->pPl = pPl; this->plf = plf; }
-
-    inline SgStatement* GetParallelStatement() { return prs; }
-    inline bool isLastParallel()
-    {
-        if (parallel_depth > 0)
-            return --parallel_depth == 0;
-        return 0;
-    }
-    inline SgExpression* getPrivateList() { return prl; }
-    inline SgExpression* getExpressionToModifyPrivateList(bool* rhs)  { if (rhs) *rhs = plf; return pPl; }
-};
-
-class doLoops
-{
-    doLoopItem* first;
-    doLoopItem* current;
-    
-    doLoopItem* findLoop(SgSymbol*);
-public:
-    inline doLoops() : first(NULL), current(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 5);
-#endif
-    }
-    
-    inline ControlFlowItem* getSourceForCycle() { return current ? current->getSourceForCycle() : NULL; }
-    inline ControlFlowItem* getSourceForCycle(SgSymbol* loop) { return loop ? findLoop(loop)->getSourceForCycle() : getSourceForCycle(); }
-    inline ControlFlowItem* getSourceForExit() { return current ? current->getSourceForExit() : NULL; }
-    inline ControlFlowItem* getSourceForExit(SgSymbol* loop) { return loop ? findLoop(loop)->getSourceForExit() : getSourceForExit(); }
-    inline void setParallelDepth(int k, SgExpression* pl, SgStatement* ps, SgExpression* pPl, bool plf) { current->setParallelDepth(k, pl, ps, pPl, plf); }
-    inline SgStatement* GetParallelStatement() { return current->GetParallelStatement(); }    
-    inline bool isLastParallel() { return current && current->isLastParallel(); }
-    inline SgExpression* getPrivateList() { return current->getPrivateList(); }
-    inline SgExpression* getExpressionToModifyPrivateList(bool* rhs) { return current->getExpressionToModifyPrivateList(rhs); }
-    void addLoop(int l, SgSymbol* s, ControlFlowItem* i, ControlFlowItem* e);
-
-    ControlFlowItem* endLoop(ControlFlowItem* last); 
-    ControlFlowItem* checkStatementForLoopEnding(int label, ControlFlowItem* item);    
-    ~doLoops();
-};
-
-struct LabelCFI
-{
-    int l;
-    ControlFlowItem* item;
-
-    LabelCFI() : item(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 6);
-#endif
-    }
-    ~LabelCFI()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-struct CLAStatementItem
-{
-    SgStatement* stmt;
-    CLAStatementItem* next;
-
-    ~CLAStatementItem();
-    CLAStatementItem* GetLast();
-
-    CLAStatementItem() : stmt(NULL), next(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 7);
-#endif
-    }
-};
-
-enum eVariableType
-{
-    VAR_REF_VAR_EXP,
-    VAR_REF_RECORD_EXP,
-    VAR_REF_ARRAY_EXP
-};
-
-
-#define PRIVATE_GET_LAST_ASSIGN 0
-
-class CVarEntryInfo;
-
-struct VarItem
-{
-    CVarEntryInfo* var;
-    CVarEntryInfo* ov;
-    int file_id;
-    //CLAStatementItem* lastAssignments;
-#if PRIVATE_GET_LAST_ASSIGN
-    std::list<SgStatement*> lastAssignments;
-#endif
-    VarItem* next;
-
-    VarItem() : var(NULL), ov(NULL), next(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 8);
-#endif
-    }
-    ~VarItem()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-class CArrayVarEntryInfo;
-
-class VarSet
-{
-    VarItem* list;
-public:
-    inline VarSet() : list(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 9);
-#endif
-    }
-
-    void addToSet(CVarEntryInfo*, SgStatement*, CVarEntryInfo* ov = NULL);
-    void PossiblyAffectArrayEntry(CArrayVarEntryInfo*);
-    void intersect(VarSet*, bool, bool);
-    void unite(VarSet*, bool);
-    void minus(VarSet*, bool complete = false);
-    void minusFinalize(VarSet*, bool complete = false);
-    bool RecordBelong(CVarEntryInfo*);
-    void LeaveOnlyRecords();
-    void RemoveDoubtfulCommonVars(AnalysedCallsList*);
-    VarItem* GetArrayRef(CArrayVarEntryInfo*);
-    //VarItem* belongs(SgVarRefExp*, bool os = false);
-    VarItem* belongs(const CVarEntryInfo*, bool os = false);
-    VarItem* belongs(SgSymbol*, bool os = false);
-    bool equal(VarSet*);
-    int count();
-    void print();
-    void remove(const CVarEntryInfo*);
-    VarItem* getFirst();
-    ~VarSet();
-    inline bool isEmpty()
-    {
-        return list == NULL;
-    }
-};
-
-struct DoLoopDataItem
-{
-    int file_id;
-    SgStatement* statement;
-    SgExpression* l;
-    SgExpression* r;
-    SgExpression* st;
-    SgSymbol* loop_var;
-    DoLoopDataItem* next;
-
-    DoLoopDataItem() : l(NULL), r(NULL), st(NULL), loop_var(NULL), next(NULL), statement(NULL), file_id(-1)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 10);
-#endif
-    }
-    ~DoLoopDataItem()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-class DoLoopDataList 
-{
-    DoLoopDataItem* list;
-
-public:
-    DoLoopDataList() : list(NULL) 
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 11);
-#endif
-    }
-    void AddLoop(int file_id, SgStatement* st, SgExpression* l, SgExpression* r, SgExpression* step, SgSymbol* lv);
-    DoLoopDataItem* FindLoop(SgStatement* st);
-    ~DoLoopDataList();
-};
-
-struct ArraySubscriptData;
-
-class CVarEntryInfo
-{
-    SgSymbol* symbol;
-    int references;
-
-public:
-    CVarEntryInfo(SgSymbol* s) : symbol(s), references(1) 
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 12);
-#endif
-    }
-
-    virtual ~CVarEntryInfo() 
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-    virtual eVariableType GetVarType() const = 0;
-    virtual CVarEntryInfo* Clone(SgSymbol*) const = 0;
-    virtual CVarEntryInfo* Clone() const = 0;
-    virtual CVarEntryInfo* GetLeftmostParent() = 0;
-    virtual void RegisterUsage(VarSet* def, VarSet* use, SgStatement* st) = 0;
-    virtual void RegisterDefinition(VarSet* def, VarSet* use, SgStatement* st) = 0;
-    SgSymbol* GetSymbol() const { return symbol; }
-    virtual bool operator==(const CVarEntryInfo& rhs) const = 0;
-    void AddReference() { references++; }
-    bool RemoveReference() { return --references == 0; }
-    void SwitchSymbol(SgSymbol* s) { symbol = s; }
-};
-
-class CScalarVarEntryInfo: public CVarEntryInfo
-{
-public:
-    CScalarVarEntryInfo(SgSymbol* s) : CVarEntryInfo(s) 
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 13);
-#endif
-    }
-    ~CScalarVarEntryInfo() 
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-    eVariableType GetVarType() const { return VAR_REF_VAR_EXP; }
-    CVarEntryInfo* Clone(SgSymbol* s) const { return new CScalarVarEntryInfo(s); }
-    CVarEntryInfo* Clone() const { return new CScalarVarEntryInfo(GetSymbol()); }
-    bool operator==(const CVarEntryInfo& rhs) const { return rhs.GetVarType() == VAR_REF_VAR_EXP && rhs.GetSymbol() == GetSymbol(); }
-    CVarEntryInfo* GetLeftmostParent() { return this; }
-    void RegisterUsage(VarSet* def, VarSet* use, SgStatement* st)
-    {
-        if (def == NULL || !def->belongs(this))
-            use->addToSet(this, st);
-    }
-    void RegisterDefinition(VarSet* def, VarSet* use, SgStatement* st) { def->addToSet(this, st); }
-};
-
-class CRecordVarEntryInfo : public CVarEntryInfo
-{
-    CVarEntryInfo* parent;
-public:
-    CRecordVarEntryInfo(SgSymbol* s, CVarEntryInfo* ptr) : CVarEntryInfo(s), parent(ptr) 
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 14);
-#endif
-    }
-
-    ~CRecordVarEntryInfo()
-    {
-#if __SPF
-        removeFromCollection(this);
-        return;
-#endif
-        if (parent->RemoveReference())
-            delete parent;
-    }
-
-    eVariableType GetVarType() const { return VAR_REF_RECORD_EXP; }
-    CVarEntryInfo* Clone(SgSymbol* s) const { return new CRecordVarEntryInfo(s, parent->Clone()); }
-    CVarEntryInfo* Clone() const { return new CRecordVarEntryInfo(GetSymbol(), parent->Clone()); }
-    bool operator==(const CVarEntryInfo& rhs) const { return rhs.GetVarType() == VAR_REF_RECORD_EXP && rhs.GetSymbol() == GetSymbol() &&
-        parent && static_cast<const CRecordVarEntryInfo&>(rhs).parent && *static_cast<const CRecordVarEntryInfo&>(rhs).parent == *parent; }
-    CVarEntryInfo* GetLeftmostParent() { return parent->GetLeftmostParent(); }
-    void RegisterUsage(VarSet* def, VarSet* use, SgStatement* st) 
-    {
-        if (def == NULL || !def->belongs(this))
-            use->addToSet(this, st);
-    }
-    void RegisterDefinition(VarSet* def, VarSet* use, SgStatement* st) { def->addToSet(this, st); }
-};
-
-struct ArraySubscriptData
-{
-    bool defined;
-    int bound_modifiers[2];
-    int step;
-    int coefs[2];
-    DoLoopDataItem *loop;
-    SgExpression *left_bound;
-    SgExpression *right_bound;
-
-    ArraySubscriptData() : loop(NULL), left_bound(NULL), right_bound(NULL) 
-    {
-        defined = false;
-        step = 0;
-        coefs[0] = coefs[1] = 0;
-        bound_modifiers[0] = bound_modifiers[1] = 0;
-        
-        //nowhere allocated 
-/*#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 15);
-#endif*/
-    }
-    ~ArraySubscriptData()
-    { }
-};
-
-class CArrayVarEntryInfo : public CVarEntryInfo
-{
-    int subscripts;
-    bool disabled;
-    std::vector<ArraySubscriptData> data;
-public:
-    CArrayVarEntryInfo(SgSymbol* s, SgArrayRefExp* r);
-    CArrayVarEntryInfo(SgSymbol* s, int sub, int ds, const std::vector<ArraySubscriptData> &d);
-    ~CArrayVarEntryInfo() 
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    } 
-
-    CVarEntryInfo* Clone(SgSymbol* s) const { return new CArrayVarEntryInfo(s, subscripts, disabled, data); }
-    CVarEntryInfo* Clone() const { return new CArrayVarEntryInfo(GetSymbol(), subscripts, disabled, data); }
-    bool operator==(const CVarEntryInfo& rhs) const { return rhs.GetVarType() == VAR_REF_ARRAY_EXP && rhs.GetSymbol() == GetSymbol(); }
-    friend CArrayVarEntryInfo* operator-(const CArrayVarEntryInfo&, const CArrayVarEntryInfo&);
-    friend CArrayVarEntryInfo* operator+(const CArrayVarEntryInfo&, const CArrayVarEntryInfo&);
-    CArrayVarEntryInfo& operator+=(const CArrayVarEntryInfo&);
-    CArrayVarEntryInfo& operator-=(const CArrayVarEntryInfo&);
-    CArrayVarEntryInfo& operator*=(const CArrayVarEntryInfo&);
-    eVariableType GetVarType() const { return VAR_REF_ARRAY_EXP; }
-    CVarEntryInfo* GetLeftmostParent() { return this; }
-    void RegisterUsage(VarSet* def, VarSet* use, SgStatement* st);
-    void RegisterDefinition(VarSet* def, VarSet* use, SgStatement* st);
-    bool HasActiveElements() const;
-    void MakeInactive();
-    void ProcessChangesToUsedEntry(CArrayVarEntryInfo*);
-};
-
-class CBasicBlock;
-class ControlFlowGraph;
-struct AnalysedCallsList;
-class PrivateDelayedItem;
-
-struct BasicBlockItem
-{
-    CBasicBlock* block;
-    bool for_jump_flag;
-    bool cond_value;
-    bool drawn;
-    ControlFlowItem* jmp;
-    BasicBlockItem* next;
-
-    BasicBlockItem() : drawn(false)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 17);
-#endif
-    }
-    ~BasicBlockItem()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-struct CommonVarSet;
-struct ActualDelayedData;
-
-struct CallAnalysisLog
-{
-    AnalysedCallsList* el;
-    int depth;
-    CallAnalysisLog* prev;
-
-    CallAnalysisLog() : el(NULL), prev(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 18);
-#endif
-    }
-    ~CallAnalysisLog()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-struct CExprList
-{
-    SgExpression* entry;
-    CExprList* next;
-
-    CExprList() : entry(NULL), next(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 19);
-#endif
-    }
-    ~CExprList()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-#ifdef __SPF
-class SymbolKey 
-{
-private:
-    SgSymbol *var;
-    std::string varName;
-    bool pointer;
-
-public:
-    SymbolKey(SgSymbol *v): var(v), varName(v->identifier()), pointer(false) 
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 20);
-#endif
-    }
-    SymbolKey(SgSymbol *v, bool isPointer): var(v), varName(v->identifier()), pointer(isPointer) 
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 20);
-#endif
-    }
-    ~SymbolKey()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-    inline const std::string& getVarName() const { return varName; }
-    inline const SgSymbol* getSymbol() const { return var; }
-    inline bool isPointer() const { return pointer; }
-    inline bool operator<(const SymbolKey &rhs) const   { return varName < rhs.varName; }
-    inline bool operator==(const SymbolKey &rhs) const  { return varName == rhs.varName; }
-    inline bool operator==(SgSymbol *rhs) const         { return strcmp(varName.c_str(), rhs->identifier()) == 0; }
-};
-
-class ExpressionValue {
-private:
-    SgExpression *exp;
-    std::string unparsed;
-    SgStatement* from;
-public:
-    ExpressionValue(): exp(NULL), unparsed(""), from(NULL) {}
-    //ExpressionValue(SgExpression *e): exp(e) { unparsed = (e != NULL ? e->unparse() : ""); }
-    ExpressionValue(SgExpression *e, const std::string &unp) : exp(e), unparsed(unp), from(NULL) { }
-    ExpressionValue(SgExpression *e, const std::string &unp, SgStatement* f) : exp(e), unparsed(unp), from(f) { }
-    inline bool unparsedEquals(ExpressionValue &other) const {return unparsed == other.unparsed; }
-    inline bool unparsedEquals(ExpressionValue *other) const {return unparsed == other->unparsed; }
-    inline SgExpression* getExp() const { return exp; }
-    inline const std::string& getUnparsed() const { return unparsed; }
-    inline void setFrom(SgStatement* st) { from = st; }
-    inline SgStatement* getFrom() const { return from; }
-    inline bool operator<(const ExpressionValue &other) const   { return from == other.from ? unparsed < other.unparsed : from < other.from; }
-    inline bool operator==(const ExpressionValue &other) const  { return from == other.from && unparsed == other.unparsed; }
-    inline bool operator==(SgExpression* e) const               { return strcmp(unparsed.c_str(), e->unparse()) == 0; }
-};
-#endif
-
-class CBasicBlock
-{
-    int num;
-    ControlFlowGraph* parent;
-    ControlFlowItem* start;
-    AnalysedCallsList* proc;
-    BasicBlockItem* prev;
-    BasicBlockItem* succ;
-    CBasicBlock* lexNext;
-    CBasicBlock* lexPrev;
-    VarSet* def;
-    VarSet* use;
-    VarSet* old_mrd_out;
-    VarSet* old_mrd_in;
-    VarSet* mrd_in;
-    VarSet* mrd_out;
-    VarSet* old_lv_out;
-    VarSet* old_lv_in;
-    VarSet* lv_in;
-    VarSet* lv_out;
-    CommonVarSet* common_def;
-    CommonVarSet* common_use;
-    bool undef;
-    bool lv_undef;
-    void setDefAndUse();
-    char prev_status;
-    bool temp;
-    void addExprToUse(SgExpression* e, CArrayVarEntryInfo*, CExprList*);
-    void AddOneExpressionToUse(SgExpression*, SgStatement*, CArrayVarEntryInfo*);
-    void AddOneExpressionToDef(SgExpression*, SgStatement*, CArrayVarEntryInfo*);
-    PrivateDelayedItem* privdata;
-    CVarEntryInfo* findentity;
-    std::string visname;
-    std::string visunparse;
-#ifdef __SPF
-    bool varIsPointer(SgSymbol* symbol);
-    void processAssignThroughPointer(SgSymbol *symbol, SgExpression *right, SgStatement *st);
-    void processPointerAssignment(SgSymbol *symbol, SgExpression *right, SgStatement *st);
-    void processReadStat(SgStatement* readSt);
-    void addVarUnknownToGen(SymbolKey var, SgStatement *defSt);
-    
-    std::map <SymbolKey, std::set<SgExpression*>> gen_p;
-    std::set <SymbolKey> kill_p;
-    std::map <SymbolKey, std::set<ExpressionValue*>> in_defs_p;
-    std::map <SymbolKey, std::set<ExpressionValue*>> out_defs_p;
-
-    std::map <SymbolKey, ExpressionValue*> gen;
-    std::set <SymbolKey> kill;
-    std::map <SymbolKey, std::set<ExpressionValue*>> in_defs;
-    std::map <SymbolKey, std::set<ExpressionValue*>> out_defs;
-
-    std::set <ExpressionValue*> e_gen;
-    std::set <ExpressionValue*> e_in;
-    std::set <ExpressionValue*> e_out;
-#endif
-
-public:
-    inline CBasicBlock(bool t, ControlFlowItem* st, int n, ControlFlowGraph* par, AnalysedCallsList* pr) : 
-        temp(t), num(n), start(st), prev(NULL), lexNext(NULL), def(NULL), use(NULL), mrd_in(new VarSet()), mrd_out(new VarSet()), undef(true),
-        lv_in(new VarSet()), lv_out(new VarSet()), lv_undef(false), succ(NULL), lexPrev(NULL), prev_status(-1), parent(par), common_def (NULL), 
-        common_use(NULL), old_mrd_in(NULL), old_mrd_out(NULL), old_lv_in(NULL), old_lv_out(NULL), privdata(NULL), findentity(NULL), proc(pr)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 21);
-#endif
-    }
-
-    ~CBasicBlock();
-    inline CommonVarSet* getCommonDef() { return common_def; }
-    inline CommonVarSet* getCommonUse() { return common_use; }
-    inline void setNext(CBasicBlock* next) { lexNext = next; }
-    inline void setPrev(CBasicBlock* prev) { lexPrev = prev; }
-
-    void addToPrev(CBasicBlock* pr, bool, bool, ControlFlowItem*);
-    void addToSucc(CBasicBlock* su, bool, bool, ControlFlowItem*);
-    VarSet* getDef();
-    VarSet* getUse();
-    VarSet* getMrdIn(bool);
-    VarSet* getMrdOut(bool);
-    VarSet* getLVIn();
-    VarSet* getLVOut();
-    bool stepMrdIn(bool);
-    bool stepMrdOut(bool);
-    bool stepLVIn();
-    bool stepLVOut();
-
-    ControlFlowItem* containsParloopStart();
-    ControlFlowItem* containsParloopEnd();
-
-    ControlFlowItem* getStart();
-    ControlFlowItem* getEnd();
-
-    inline CBasicBlock* getLexNext() { return lexNext; }
-    inline CBasicBlock* getLexPrev() { return lexPrev; }
-    inline BasicBlockItem* getPrev() { return prev; }
-    inline BasicBlockItem* getSucc() { return succ; }
-    inline VarSet* getLiveIn() { return lv_in; }
-    inline int getNum() { return num; }
-    inline void SetDelayedData(PrivateDelayedItem* p) { privdata = p; }
-    inline PrivateDelayedItem* GetDelayedData() { return privdata; }
-
-    void print();
-    void markAsReached();
-    bool hasPrev();
-
-    void ProcessProcedureHeader(bool, SgProcHedrStmt*, void*, const char*);
-    void ProcessIntrinsicProcedure(bool, int narg, void* f, const char*);
-    void ProcessUserProcedure(bool isFun, void* call, AnalysedCallsList* c);
-    void ProcessProcedureWithoutBody(bool, void*, bool);
-    //SgExpression* GetProcedureArgument(bool, void*, int);
-    //int GetNumberOfArguments(bool, void*);
-    SgSymbol* GetProcedureName(bool, void*);
-    void PrivateAnalysisForAllCalls();
-    ActualDelayedData* GetDelayedDataForCall(CallAnalysisLog*);
-    bool IsVarDefinedAfterThisBlock(CVarEntryInfo*, bool);
-    bool ShouldThisBlockBeCheckedAgain(CVarEntryInfo* var) { return findentity && var && *var == *findentity; }
-
-    std::string GetGraphVisDescription();
-    std::string GetGraphVisData();
-    bool IsEmptyBlock();
-    std::string GetEdgesForBlock(std::string name, bool original, std::string);
-
-    void addUniqObjects(std::set<ControlFlowItem*> &pointers) const
-    {
-        for (ControlFlowItem *it = start; it != NULL; it = it->getNext())
-            pointers.insert(it);
-    }
-
-#ifdef __SPF
-    AnalysedCallsList* getProc() { return proc; }
-    void clearGenKill() { gen.clear(); kill.clear(); e_gen.clear(); }
-    void clearGenKillPointers() { gen_p.clear(); kill_p.clear(); }
-    void clearDefs() { in_defs.clear(); out_defs.clear(); e_in.clear(); e_out.clear(); }
-    void clearDefsPointers() { in_defs_p.clear(); out_defs_p.clear(); }
-    void addVarToGen(SymbolKey var, SgExpression* value, SgStatement *defSt);    
-    void addVarToKill(const SymbolKey &key);
-    void checkFuncAndProcCalls(ControlFlowItem* cfi);
-    void adjustGenAndKill(ControlFlowItem* cfi);
-    void adjustGenAndKillP(ControlFlowItem* cfi);
-    std::set<SymbolKey>* getOutVars();
-    void correctInDefsSimple();
-    bool correctInDefsIterative();
-    bool expressionIsAvailable(ExpressionValue* expValue);
-    //const std::map<SymbolKey, std::set<SgExpression*>> getReachedDefinitions(SgStatement* stmt);
-    const std::map<SymbolKey, std::set<ExpressionValue*>> getReachedDefinitionsExt(SgStatement* stmt);
-    void initializeOut();
-    void initializeEOut(std::set<ExpressionValue*>& allEDefs);
-    bool updateEDefs();    
-
-    inline std::map<SymbolKey, std::set<SgExpression*>>* getGenP() { return &gen_p; }
-    inline std::set<SymbolKey>* getKillP() { return &kill_p; }
-    inline void setInDefsP(std::map<SymbolKey, std::set<ExpressionValue*>>* inDefsP) { in_defs_p = *inDefsP; }
-    inline std::map<SymbolKey, std::set<ExpressionValue*>>* getInDefsP() { return &in_defs_p; }
-    inline std::map<SymbolKey, std::set<ExpressionValue*>>* getOutDefsP() { return &out_defs_p; }
-
-    inline std::map<SymbolKey, ExpressionValue*>* getGen() { return &gen; }
-    inline std::set<SymbolKey>* getKill() { return &kill; }
-    inline void setInDefs(std::map<SymbolKey, std::set<ExpressionValue*>>* inDefs) { in_defs = *inDefs; }
-    inline std::map<SymbolKey, std::set<ExpressionValue*>>* getInDefs() { return &in_defs; }
-    inline std::map<SymbolKey, std::set<ExpressionValue*>>* getOutDefs() { return &out_defs; }
-
-    inline std::set<ExpressionValue*>* getEGen() { return &e_gen; }
-    inline std::set<ExpressionValue*>* getEIn() { return &e_in; }
-    inline std::set<ExpressionValue*>* getEOut() { return &e_out; }
-
-#endif
-};
-
-struct CommonVarInfo;
-struct CommonVarSet
-{
-    CommonVarInfo* cvd;
-    CommonVarSet* next;
-
-    CommonVarSet(const CommonVarSet&);
-    CommonVarSet() : cvd(NULL), next(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 22);
-#endif
-    }
-    ~CommonVarSet()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-struct ActualDelayedData;
-class CommonData;
-
-class CallData;
-
-class ControlFlowGraph
-{
-    CBasicBlock* last;
-    CBasicBlock* first;
-    VarSet* def;
-    VarSet* use;
-    VarSet* pri;
-    CommonVarSet* common_def;
-    bool cdf;
-    CommonVarSet* common_use;
-    bool cuf;
-    bool temp;
-    bool main;
-    int refs;
-    bool hasBeenAnalyzed;
-    void liveAnalysis();
-#ifdef __SPF
-    std::set<SymbolKey> pointers;
-#endif
-public:
-    ControlFlowGraph(bool temp, bool main, ControlFlowItem* item, ControlFlowItem* end);
-    ~ControlFlowGraph();
-    VarSet* getPrivate();
-    VarSet* getUse();
-    VarSet* getDef();
-    void privateAnalyzer();
-    bool ProcessOneParallelLoop(ControlFlowItem* lstart, CBasicBlock* of, CBasicBlock*& p, bool);
-    ActualDelayedData* ProcessDelayedPrivates(CommonData*, AnalysedCallsList*, CallAnalysisLog*, void*, bool, int);
-    bool IsMain() { return main; } // change to refs
-    void AddRef() { refs++; }
-    bool RemoveRef() { return refs == 0; }
-    ControlFlowItem* getCFI() { return first->getStart(); }
-    CommonVarSet* getCommonDef() { return common_def; }
-    CommonVarSet* getCommonUse() { return common_use; }
-    inline CBasicBlock* getFirst() { return first; }
-    inline CBasicBlock* getLast() { return last; }
-
-    std::string GetVisualGraph(CallData*);
-    void ResetDrawnStatusForAllItems();
-
-    inline void addCFItoCollection(std::set<ControlFlowItem*> &collection) const
-    {
-        for (CBasicBlock *bb = first; bb != NULL; bb = bb->getLexNext())
-            bb->addUniqObjects(collection);        
-    }
-#ifdef __SPF
-    std::set<SymbolKey>* getPointers() { return &pointers; };
-#endif
-};
-
-struct AnalysedCallsList 
-{
-    SgStatement* header;
-    ControlFlowGraph* graph;
-    bool isIntrinsic;
-    bool isPure;
-    bool isFunction;
-    AnalysedCallsList* next;
-    bool hasBeenAnalysed;
-    bool isCurrent;
-    int file_id;
-
-    AnalysedCallsList(SgStatement* h, bool intr, bool pure, bool fun, const char* name, int fid) :
-        header(h), isIntrinsic(intr), isPure(pure), isFunction(fun), hasBeenAnalysed(false), graph(NULL), funName(name), file_id(fid), next(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 23);
-#endif
-    }
-    ~AnalysedCallsList()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-    bool isArgIn(int num, CArrayVarEntryInfo**);
-    bool isArgOut(int num, CArrayVarEntryInfo**);
-    const char* funName;
-    bool IsIntrinsic() { return isIntrinsic; }
-};
-
-class CommonData;
-class CallData
-{
-    AnalysedCallsList* calls_list;
-    bool recursion_flag;
-public:
-    AnalysedCallsList* getLinkToCall(SgExpression*, SgStatement*, CommonData*);
-    AnalysedCallsList* AddHeader(SgStatement*, bool isFun, SgSymbol* name, int fid);
-    void AssociateGraphWithHeader(SgStatement*, ControlFlowGraph*);
-    AnalysedCallsList* IsHeaderInList(SgStatement*);
-    AnalysedCallsList* GetDataForGraph(ControlFlowGraph*);
-    CallData() 
-    {
-        recursion_flag = false; 
-        calls_list = NULL; 
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 24);
-#endif
-    }
-
-    void printControlFlows();
-    ~CallData();
-};
-
-struct CommonDataItem;
-struct CommonVarInfo
-{
-    CVarEntryInfo* var;
-    bool isPendingLastPrivate;
-    bool isInUse;
-    CommonDataItem* parent;
-    CommonVarInfo* next;
-
-    CommonVarInfo() : var(NULL), parent(NULL), next(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 25);
-#endif
-    }
-    ~CommonVarInfo()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-struct CommonDataItem
-{
-    SgStatement *cb;
-    std::vector<SgExpression*> commonRefs;
-    bool isUsable;
-    bool onlyScalars;
-    std::string name;
-    AnalysedCallsList* proc;
-    AnalysedCallsList* first;
-    CommonVarInfo* info;
-    CommonDataItem* next;
-
-    CommonDataItem() : cb(NULL), proc(NULL), first(NULL), info(NULL), next(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 26);
-#endif
-    }
-
-    ~CommonDataItem()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-class CommonData
-{
-    CommonDataItem* list;
-public:
-    CommonDataItem* getList() { return list; }
-    void RegisterCommonBlock(SgStatement*, AnalysedCallsList*);
-    void MarkEndOfCommon(AnalysedCallsList*);
-    void MarkAsUsed(VarSet*, AnalysedCallsList*);
-    bool CanHaveNonScalarVars(CommonDataItem*);
-    //void ProcessDelayedPrivates(PrivateDelayedItem*);
-    CommonDataItem* IsThisCommonUsedInProcedure(CommonDataItem*, AnalysedCallsList*);
-    CommonDataItem* GetItemForName(const std::string&, AnalysedCallsList*);
-    CommonVarSet* GetCommonsForVarSet(VarSet*, AnalysedCallsList*);
-    CommonDataItem* IsThisCommonVar(VarItem*, AnalysedCallsList*);
-    CommonData() : list(NULL) 
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 27);
-#endif
-    }
-    ~CommonData();
-};
-
-class PrivateDelayedItem
-{
-    VarSet* detected;
-    VarSet* original;
-    VarSet* lp;
-    VarSet* delay;
-    ControlFlowItem* lstart;
-    ControlFlowGraph* graph;
-    PrivateDelayedItem* next;
-    int file_id;
-public:
-    PrivateDelayedItem(VarSet* d, VarSet* o, VarSet* p, ControlFlowItem* l, PrivateDelayedItem* n, ControlFlowGraph* g, VarSet* dl, int fd) : 
-        detected(d), original(o), lp(p), lstart(l), next(n), graph(g), delay(dl), file_id(fd) 
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 28);
-#endif
-    }
-    ~PrivateDelayedItem();
-    void PrintWarnings();
-    void MoveFromPrivateToLastPrivate(CVarEntryInfo*);
-    VarSet* getDetected() { return detected; }
-    VarSet* getDelayed() { return delay; }
-};
-
-#define MAX_ARGS_FOR_INTRINSIC 10
-#define INTRINSIC_IN 1
-#define INTRINSIC_OUT 2
-
-struct IntrinsicParameterData
-{
-    int index;
-    const char* name;
-    unsigned char status;
-};
-
-struct IntrinsicSubroutineData
-{
-    const char* name;
-    int args;
-    IntrinsicParameterData parameters[MAX_ARGS_FOR_INTRINSIC];
-};
-
-struct ActualDelayedData
-{
-    PrivateDelayedItem* original;
-    CommonVarSet* commons;
-    VarSet* buse;
-    ActualDelayedData* next;
-    AnalysedCallsList* call;
-
-    void MoveVarFromPrivateToLastPrivate(CVarEntryInfo*, CommonVarSet*, VarSet*);
-    void RemoveVarFromCommonList(CommonVarSet*);
-
-    ActualDelayedData() : original(NULL), commons(NULL), next(NULL), call(NULL)
-    {
-#if __SPF
-        addToCollection(__LINE__, __FILE__, this, 29);
-#endif
-    }
-    ~ActualDelayedData()
-    {
-#if __SPF
-        removeFromCollection(this);
-#endif
-    }
-};
-
-ControlFlowGraph* GetControlFlowGraphWithCalls(bool, SgStatement*, CallData*, CommonData*);
-void FillCFGSets(ControlFlowGraph*);
-void SetUpVars(CommonData*, CallData*, AnalysedCallsList*, DoLoopDataList*);
-AnalysedCallsList* GetCurrentProcedure();
-int SwitchFile(int);
-
-#if __SPF
-ExpressionValue* allocateExpressionValue(SgExpression*, SgStatement*);
-void deleteAllocatedExpressionValues(int file_id);
-#endif
diff --git a/projects/dvm_svn/fdvm/trunk/include/acc_data.h b/projects/dvm_svn/fdvm/trunk/include/acc_data.h
deleted file mode 100644
index 2d16641..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/acc_data.h
+++ /dev/null
@@ -1,76 +0,0 @@
-#pragma once
-
-#include <cstdio>
-#include <cstdlib>
-#include <ctype.h>
-#include <cmath>
-#include <cstring>
-#include <climits>
-
-#include <iostream>
-#include <list>
-#include <vector>
-#include <stack>
-#include <set>
-#include <map>
-#include <queue>
-#include <deque>
-#include <string>
-#include <iterator>
-#include <algorithm>
-
-#include "dvm.h"
-#include "acc_across_analyzer.h"
-
-extern bool READ;
-extern bool WRITE;
-extern bool dontGenConvertXY;
-extern bool oneCase;
-extern int ACROSS_MOD_IN_KERNEL;
-extern int DVM_DEBUG_LVL;
-extern const int rtTypes[];
-
-extern std::set<std::string> intrinsicF;
-extern std::set<std::string> intrinsicDoubleT;
-extern std::set<std::string> intrinsicFloatT;
-extern std::set<std::string> intrinsicInt4T;
-
-extern std::map<char, const char*> SpecialSymbols;
-extern std::vector <SgFunctionCallExp* > RTC_FCall;
-extern std::vector<SgExpression* > RTC_FArgs;
-extern std::vector<SgFunctionCallExp* > RTC_FKernelArgs;
-extern std::vector<SgSymbol*> newVars;
-
-extern const char *funcDvmhConvXYname;
-extern int number_of_loop_line;
-extern std::stack<SgStatement*> CopyOfBody;
-extern Loop *currentLoop;
-extern unsigned countKernels;
-
-extern SgType *indexType_int, *indexType_long, *indexType_llong;
-extern SgSymbol *s_indexType_int, *s_indexType_long, *s_indexType_llong;
-
-extern const char *declaration_cmnt;
-extern int loc_el_num;
-extern SgStatement *cur_in_mod, *cur_in_kernel;
-extern SgStatement *dvm_parallel_dir, *loop_body;
-extern SgStatement *kernel_st;
-extern SgExpression *private_list, *uses_list, *kernel_index_var_list, *formal_red_grid_list;
-extern struct local_part_list *lpart_list;
-extern SgSymbol *kernel_symb, *s_overall_blocks;
-
-extern SgType *t_dim3;
-extern SgSymbol *s_threadidx, *s_blockidx, *s_blockdim, *s_griddim, *s_blocks_k;
-
-//------ C ----------
-extern SgStatement *block_C, *block_C_Cuda, *info_block;
-extern SgSymbol *s_DvmhLoopRef, *s_cudaStream, *s_cmplx, *s_dcmplx;
-
-enum ACROSS_ANALYZE { RIGHT, LEFT, RESTORE, ADD, ACROSS_TYPE, NON_ACROSS_TYPE };
-enum rt_TYPES { rt_INT, rt_LONG, rt_LLONG };
-enum { _NUL_, _READ_, _WRITE_, _READ_WRITE_ };
-enum VAR_TYPES { EMPTY, INTENT_IN, INTENT_OUT, INTENT_INOUT, INTENT_LOCAL, INTENT_INLOCAL };
-enum { ZERO_, HANDLER_TYPE_PARALLEL, HANDLER_TYPE_MASTER };
-enum RED_TYPES { red_NULL, red_SUM, red_PROD, red_MAX, red_MIN, red_AND, red_OR, 
-                 red_NEQ, red_EQ, red_MAXL, red_MINL, red_SUM_N, red_PROD_N, 
-                 red_MAX_N, red_MIN_N, red_AND_N, red_OR_N, red_NEQ_N, red_EQ_N };
diff --git a/projects/dvm_svn/fdvm/trunk/include/aks_loopStructure.h b/projects/dvm_svn/fdvm/trunk/include/aks_loopStructure.h
deleted file mode 100644
index 1777f0c..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/aks_loopStructure.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#pragma once
-#include <vector>
-
-class Access;
-class Array;
-class Loop;
-class AllLoops;
-
-class Access
-{
-public:
-    Access(SgExpression *_exp, Array *_parent);
-    ~Access() { }
-    void setExp(char* _exp);
-    void setExp(SgExpression *_exp);
-    char* getExpChar();
-    SgExpression* getExp();
-    void incOperW();
-    void incOperR();
-    Array* getParentArray();
-    void setParentArray(Array *_parent);
-    std::vector<int>* getAlignOnLoop();
-
-    void matchLoopIdxs(std::vector<SgSymbol*> &symbols);
-private:
-    char *expAcc;
-    SgExpression *exp;
-    int operation[2];
-    Array *parentArray;
-    std::vector<int> alignOnLoop;
-
-    bool matchRecursion(SgExpression *_exp, SgSymbol *symb);
-};
-
-class Array
-{
-public:
-    Array(int _dim, char *_name, Loop *_parent);
-    Array(char *_name, Loop *_parent);
-    ~Array() { }
-
-    void setDimNum(int _num);
-    int getDimNum();
-    std::vector<int>* getAcrDims();
-    std::vector<int>* getAlignOnLoop();
-    void addTfmDim(int _dim);
-    std::vector<int> *getTfmDims();
-    void addAccess(Access* _newAccess);
-    Access* getAccess(char* _expAcc);
-    std::vector<Access*>* getAccesses();
-    Loop* getParentLoop();
-    void setParentLoop(Loop *_loop);
-    void setArrayName(char* _name);
-    char* getArrayName();
-    int getAcrType();
-    void setAcrType(int _type);
-	std::vector<SgFunctionCallExp*>* getIfCals();
-	std::vector<SgFunctionCallExp*>* getElseCals();
-	std::vector<SgStatement*>* getZeroSt();
-	std::vector<SgSymbol* >* getCoefInAccess();
-
-    void analyzeAcrDims();
-    void analyzeAlignOnLoop();
-    void analyzeTrDims();
-	 
-	// diagTransform
-	SgSymbol* findAccess(SgExpression *_exp, char *&_charEx);
-	void addNewCoef(SgExpression *_exp, char *_charEx, SgSymbol *_symb);
-	void generateAssigns(SgVarRefExp *offsetX, SgVarRefExp *offsetY, SgVarRefExp *Rx, SgVarRefExp *Ry, SgVarRefExp *slash);
-private:
-    int dimNum;
-    int acrossType;
-    std::vector<int> acrossDims;
-    std::vector<int> alignOnLoop;
-    std::vector<int> transformDims;
-    std::vector<Access*> accesses;
-    char *name;
-    Loop *parentLoop;
-	
-	// diagTransform
-	std::vector<SgSymbol* > coefInAccess;
-	std::vector<SgExpression*> firstEx;
-	std::vector<SgExpression*> secondEx;
-	std::vector<char*> charEx;
-	std::vector<SgStatement*> zeroSt;
-	std::vector<SgFunctionCallExp*> ifCalls;
-	std::vector<SgFunctionCallExp*> elseCalls;
-};
-
-class Loop
-{
-public:
-	Loop(int _line, SgStatement *_body, bool withAnalyze);
-    Loop(int _acrType, int _line, SgStatement *_body);
-    Loop(int _line, SgStatement *_body);
-    Loop(int _line);
-    ~Loop() {};
-    void setLine(int _line);
-    int getLine();
-    void setAcrType(int _type);
-    int getAcrType();
-    std::vector<Array*>* getArrays();
-    void addArray(Array *_array);
-    Array* getArray(char *name, int *_idx);
-	Array* getArray(char *name);
-    std::vector<SgSymbol*>* getSymbols();
-	int getLoopDim();
-
-    void analyzeLoopBody();
-    void analyzeAcrossType();
-    bool isArrayInPrivate(char *name);
-    void unroll(int level); // TODO
-private:
-	int loopDim;
-    std::vector<SgSymbol*> symbols;
-    int line;
-    int acrossType;
-    std::vector<Array*> arrays;
-    SgStatement* loopBody;
-    std::vector<char*> privateList;
-	std::vector<int> acrDims;	
-
-    void analyzeAssignOp(SgExpression *_exp, int oper);	
-};
-
-// ---------------------------------------------------------------------- // AllLoops
-class AllLoops
-{
-public:
-    AllLoops() {}
-    ~AllLoops() {}
-    void addLoop(Loop *_loop)        { loops.push_back(_loop); }
-    std::vector<Loop*>* getLoops()   { return &loops;          }
-private:
-    std::vector<Loop*> loops;
-};
diff --git a/projects/dvm_svn/fdvm/trunk/include/aks_structs.h b/projects/dvm_svn/fdvm/trunk/include/aks_structs.h
deleted file mode 100644
index 65f96c2..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/aks_structs.h
+++ /dev/null
@@ -1,207 +0,0 @@
-#pragma once
-#include "acc_data.h"
-
-struct SageSymbols
-{
-    SageSymbols()
-    {
-        across_left = across_right = 0;
-        len = -1;
-        symb = NULL;
-    }
-
-    SageSymbols(SgSymbol* symb, int len, int across_left, int across_right) :
-        symb(symb), len(len), across_left(across_left), across_right(across_right)
-    { }
-
-    SgSymbol *symb;
-    int len;
-    int across_left;
-    int across_right;
-};
-
-struct SageArrayIdxs
-{
-    std::vector<SageSymbols> symb;
-    int dim;
-    int read_write;
-    SgExpression *array_expr;
-};
-
-struct SageAcrossInfo
-{
-    std::vector<SageArrayIdxs> idxs;
-};
-
-struct ArgsForKernel
-{
-    SgStatement *st_header;
-    std::vector<SageSymbols> symb;
-    std::vector<SageSymbols> nSymb;
-    std::vector<SgSymbol*> sizeVars;
-    std::vector<SgSymbol*> acrossS;
-    std::vector<SgSymbol*> notAcrossS;
-    std::vector<SgSymbol*> idxAcross;
-    std::vector<SgSymbol*> idxNotAcross;
-
-    std::vector<SgSymbol*> otherVars;
-    std::vector<char*> arrayNames;
-    std::vector<SgSymbol*> otherVarsForOneTh;
-    std::vector<SgSymbol*> baseIdxsInKer;
-    SgSymbol *cond_;
-    std::vector<SgSymbol*> steps;
-};
-
-/*struct GetXYInfo
-{
-    std::vector<SgExpression*> AllExp;
-    SgSymbol *varName;
-    char *arrayName;
-    long type;
-    int placeF;
-    int placeS;
-};*/
-
-
-/*struct TransformInfo
-{
-std::vector<char *> arrayNames;
-std::vector<int> firstIdxs;
-std::vector<int> secondIdxs;
-bool exist(char *name);
-bool find_in_exprs(SgSymbol*, SgSymbol*, char*, SgExpression*);
-bool find_add(SgSymbol*, SgSymbol*, char*);
-void getIdxs(char*, int&, int&);
-};*/
-
-struct ParamsForAllVariants
-{
-    SgSymbol *s_adapter;
-    SgSymbol *s_kernel_symb;
-    int loopV;
-    int acrossV;
-    int allDims;
-    std::vector<SageSymbols> loopSymb;
-    std::vector<SageSymbols> loopAcrossSymb;
-    char *nameOfNewSAdapter;
-    char *nameOfNewKernelSymb;
-    int type;
-};
-
-struct Bound
-{
-    int L;
-    int R;
-    bool exL;
-    bool exR;
-    bool ifDdot;
-    SgExpression *additionalExpr;
-};
-
-struct BestPattern
-{
-    std::vector<int> what;
-    std::vector<Bound> bounds;
-    SgExpression *bestPatt;
-    int count_of_pattern;
-};
-
-struct Pattern
-{
-    int count_read_op;
-    int count_write_op;
-    SgExpression *symbs;
-};
-
-struct AnalyzeStat
-{
-    SgSymbol *replaceSymbol;
-    int ifHasDim;
-    SgSymbol *name_of_array;
-    SgExpression *ex_name_of_array;
-    std::vector<Pattern> patterns;
-};
-
-
-// <for oprimization>
-struct acrossInfo
-{
-    char *nameOfArray;
-    SgSymbol *symbol;
-    int allDim;
-    int acrossPos;
-    int widthL;
-    int widthR;
-    int acrossNum;
-    std::vector<int> dims;
-    std::vector<SgSymbol*> symbs;
-};
-
-struct newInfo
-{
-    SgSymbol *newArray;
-    std::vector<int> dimSize;
-    std::vector<SgStatement*> loadsBeforePlus;
-    std::vector<SgStatement*> loadsInForPlus;
-    std::vector<SgStatement*> loadsBeforeMinus;
-    std::vector<SgStatement*> loadsInForMinus;
-    std::vector<SgStatement*> stores;
-    std::vector<SgStatement*> swapsDown;
-    std::vector<SgStatement*> swapsUp;
-};
-// end <for oprimization>
-
-// block <gpuO1 lvl 2>
-struct Group
-{
-    char *strOfmain; //
-    SgExpression *mainPattern;
-    std::vector<SgExpression*> inGroup;
-    std::vector<int> len;
-    std::vector<int> sortLen;
-    newInfo replaceInfo; // replace info with all needed loads and swaps for optimization
-};
-
-struct PositionGroup
-{
-    std::map<std::string, SgExpression*> tableReplace; // table of mapping new private variables to distributed arrays for replacing in loop body
-    std::map<std::string, SgSymbol*> tableNewVars; // table of new private variables that is needed to add in cuda kernel
-    int position; // position of fixed variable in distributed loop, index 0 corresponds to the first variable.
-    SgExpression *idxInPos; //
-    std::vector<Group> allPosGr; // all groups of array access patterns with fixed loop variables, which is distributed
-};
-
-struct ArrayGroup
-{
-    SgSymbol *arrayName; // name of distribute array
-    std::vector<PositionGroup> allGroups; // all groups, where one loop variable is fixed
-};
-// end of block <gpuO1 lvl 2>
-
-struct LoopInfo
-{
-    std::vector<SgSymbol*> loopSymbols;
-    std::vector<SgExpression*> lowBounds;
-    std::vector<SgExpression*> highBounds;
-    std::vector<SgExpression*> steps;
-    int lineNumber;
-};
-
-struct ArrayIntents
-{
-    std::vector<SgSymbol*> arrayList;
-    std::vector<int> intent;
-};
-
-struct AnalyzeReturnGpuO1
-{
-    std::vector<AnalyzeStat> allStat;
-    std::vector<BestPattern> bestPatterns;
-    std::vector<ArrayGroup> allArrayGroup;
-};
-
-// functions
-SgExpression* findDirect(SgExpression*, int);
-SageAcrossInfo GetLoopsWithParAndAcrDir();
-std::vector<SageSymbols> GetSymbInParalell(SgExpression*);
-int GetIdxPlaceInParDir(SageSymbols*, SgSymbol*);
diff --git a/projects/dvm_svn/fdvm/trunk/include/calls.h b/projects/dvm_svn/fdvm/trunk/include/calls.h
deleted file mode 100644
index 1a23a13..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/calls.h
+++ /dev/null
@@ -1,74 +0,0 @@
-#pragma once
-
-#ifdef __SPF 
-extern "C" void addToCollection(const int line, const char *file, void *pointer, int type);
-extern "C" void removeFromCollection(void *pointer);
-#endif
-
-struct graph_node {
-    int id;   //a number of node
-    graph_node *next;
-    graph_node *next_header_node; //???
-    graph_node *Inext;
-    graph_node *same_name_next;
-    SgFile *file;
-    int file_id;
-    int header_id;
-    SgStatement *st_header;
-    SgStatement *st_last;
-    SgStatement *st_copy;
-    SgStatement *st_copy_first;
-    SgStatement *st_interface;
-    SgSymbol *symb;              //??? st_header->symbol()
-    char *name;
-    struct edge *to_called;      //outcoming
-    struct edge *from_calling;   //incoming
-    int type;      //flag - type of procedure: 1-external,2-internal,3-module
-    int split;     //flag
-    int tmplt;     //flag
-    int visited;   //flag for partition algorithm
-    int clone;     //flag is clone node
-    int count;     //counter of inline expansions or calls
-    int is_routine;// has ROUTINE attribute - 1, else - 0
-    int samenamed; // flag - there is samenamed symbol 
-    struct argument_numbers *arg_numbs;
-    
-#if __SPF
-    graph_node() { addToCollection(__LINE__, __FILE__, this, 1); }
-    ~graph_node() { removeFromCollection(this); }
-#endif
-};
-
-struct graph_node_list {
-    graph_node_list *next;
-    graph_node *node;
-
-#if __SPF
-    graph_node_list() { addToCollection(__LINE__, __FILE__, this, 1); }
-    ~graph_node_list() { removeFromCollection(this); }
-#endif
-};
-
-struct edge {
-    edge *next;
-    graph_node *from;
-    graph_node *to;
-    int inlined; //1 - inlined, 0 - not inlined
-
-#if __SPF
-    edge() { addToCollection(__LINE__, __FILE__, this, 1); }
-    ~edge() { removeFromCollection(this); }
-#endif
-};
-
-struct edge_list {
-    edge_list *next;
-    edge *edg;
-
-#if __SPF
-    edge_list() { addToCollection(__LINE__, __FILE__, this, 1); }
-    ~edge_list() { removeFromCollection(this); }
-#endif
-};
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/include/dvm.h b/projects/dvm_svn/fdvm/trunk/include/dvm.h
deleted file mode 100644
index 45ed055..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/dvm.h
+++ /dev/null
@@ -1,2386 +0,0 @@
-#pragma once
-#include "user.h"
-#include "aks_structs.h"
-
-#define MAXTAGS 1000
-#include "dvm_tag.h"
-
-#define FORTRAN_LANG 0
-#define C_LANG 1
-
-#define RTS1  1
-#define RTS2  2
-
-#define MAX_DIMS 15  // 15 - Fortran 2008, 7 - Fortran 95, Fortran 2003
-#define MAX_FUN_F90 20
-#define ASYNCID_NUMB 8000
-#define MAX_RED_VAR_SIZE 20
-#define MAX_BLOCKS 65535
-#define NO_ERR_MSG 0
-#define WITH_ERR_MSG 1
-#define SG_FILE_ATTR 99999
-
-/*ACC*/
-#define Ndev 3
-enum{NON,HOST,CUDA};
-
-#define HOST_DEVICE 1
-#define CUDA_DEVICE 2
-
-#define Nregim 3
-
-enum {_ZERO_,REGION_ASYNC,REGION_COMPARE_DEBUG};
-
-const int Ntp = 13;   //number of dvm-base types (RTS1)
-
-#include "libnum.h"
-
-#ifdef IN_DVM_
-#define EXTERN
-#else
-#define EXTERN extern
-#endif
-
-struct distribute_list {
-       distribute_list *next;
-       SgStatement *stdis;
-};
-struct stmt_list {
-       stmt_list *next;
-       SgStatement *st;
-};
-struct dist_symb_list {
-       dist_symb_list *next;
-       SgSymbol *symb;
-};
-struct align {
-       SgSymbol * symb;
-       align * next;
-       align * alignees;
-       SgStatement * align_stmt;
-};
-struct mod_attr{
-       SgSymbol *symb;
-       SgSymbol *symb_list;
-};
-struct algn_attr {
-       int type;
-       align *ref;
-};
-struct rem_var {
-       int index;
-       int amv;
-       int ncolon;
-       SgSymbol *buffer;  /*ACC*/
-};
-struct rem_acc {
-       SgExpression *rml;
-       SgStatement *rmout;
-       int rmbuf_use[Ntp];
-       rem_acc *next;
-};
-struct group_name_list {
-       group_name_list *next;
-       SgSymbol *symb;
-};
-struct symb_list {
-       symb_list *next;
-       SgSymbol *symb;
-};
-
-struct base_list {
-       base_list *next;
-       SgSymbol *type_symbol;
-       SgSymbol *base_symbol;
-       SgSymbol *gpu_symbol;
-};
-struct D_do_list {
-       D_do_list *next;
-       int No;
-       int num_line;
-       SgLabel *end_lab;
-       SgSymbol *do_var;
-};
-struct interval_list {
-       interval_list *prev;
-       int No;
-       SgStatement *begin_st;
-};
-struct D_fragment {
-       D_fragment *next;
-       int No;
-};
-
-struct fragment_list {
-       int No;
-       SgStatement *begin_st;
-       int dlevel;
-       int elevel;
-       int dlevel_spec;
-       int elevel_spec;
-       fragment_list *next;
-};
-struct fragment_list_in {
-       int N1;
-       int N2;
-       int level;
-       fragment_list_in *next;
-};
-struct reduction_list {
-       reduction_list *next;
-       int red_op;
-       SgExpression *red_var;
-       int ind;
-};
-struct IND_ref_list {
-       IND_ref_list *next;
-       SgExpression *rmref;
-       SgExpression *axis[7];
-       SgExpression *coef[7];
-       SgExpression *cons[7];
-       int nc;
-       int ind;
-};
-
-struct coeffs {
-       SgSymbol *sc[MAX_DIMS+2];
-       int use;
-};
-
-struct heap_pointer_list {
-       heap_pointer_list *next;
-       SgSymbol *symb_heap;
-       SgSymbol *symb_p;
-};
-
-struct filename_list {
-       filename_list *next;
-       char *name;
-       SgSymbol *fns;
-};
-struct region_list {
-       int is_data;
-       int No;
-       SgStatement *region_dir;
-       SgStatement *cur_do_dir;
-       int Lnums;
-       int targets;
-       region_list *next;
-};  /*ACC*/
-
-struct reduction_operation_list {
-       SgSymbol *redvar;
-       SgSymbol *locvar;
-       SgExpression *formal_arg;
-       SgExpression *actual_arg;
-       SgExpression *value_arg;
-       SgExpression *dimSize_arg;
-       SgExpression *lowBound_arg;
-       SgSymbol *red_grid;
-       SgSymbol *loc_grid;
-       SgSymbol *red_init;
-       SgSymbol *red_host;
-       SgSymbol *loc_host;
-      /* SgSymbol *red_offset;
-       SgSymbol *loc_offset;
-       SgSymbol *red_base;
-       SgSymbol *loc_base;
-      */
-       int number;
-       int redvar_size;
-       int array_red_size;
-       reduction_operation_list *next;
-};  /*ACC*/
-
-struct use_mode {
-       use_mode *next;
-       int in;
-       int out;
-       int mark;
-}; /*ACC*/
-
-struct local_part_list {
-       SgSymbol *dvm_array;

-       SgSymbol *local_part;
-       local_part_list *next;
-}; /*ACC*/
-
-struct argument_numbers {    // numbers of dummy arguments that correspond to a private array when calling a procedure 
-       argument_numbers *next;
-       int number;
-};  /*ACC*/
-
-const int ROOT = 1;
-const int NODE = 2;
-const int ALIGN_TREE      = 1000;
-const int ARRAY_HEADER    = 1001;
-//const int SHADOW_GROUP_IND = 1002;
-//const int RED_GROUP_DIR = 1003;
-const int SHADOW_WIDTH    = 1004;
-const int REMOTE_VARIABLE = 1005;
-const int POINTER_        = 1006;
-const int LOOP_NUMBER     = 1007;
-const int LOOP_INTERVAL_NUMBER = 1008;
-const int ALIGN_RULE      = 1009;
-const int LOC_ARR         = 1010;
-const int DO_VARIABLE_USE = 1011;
-const int INDIRECT_SUBSCRIPT   = 1012;
-const int BUFFER_COUNT    = 1013;
-const int HEAP_INDEX      = 1014;
-const int ARRAY_COEF      = 1015;
-const int RED_GROUP_VAR   = 1016;
-const int TASK_INDEX      = 1017;
-const int CONSISTENT_ARRAY_HEADER = 1018;
-const int ARRAY_BASE      = 1019;
-const int INDEX_DELTA     = 1020;
-const int INIT_LOOP       = 1021;
-const int MODULE_STR      = 1022;
-const int DISTRIBUTE_     = 1023;
-const int TSK_SYMBOL      = 1024;
-const int DEBUG_AR_INDEX  = 1025;
-const int DEBUG_GOTO      = 1026;
-const int GPU_HEADER        = 1027; /*ACC*/
-const int REDVAR_INDEX      = 1028; /*ACC*/
-const int INTENT_OF_VAR     = 1029; /*ACC*/
-const int STATEMENT_GROUP   = 1030; /*ACC*/
-const int REPLICATED_ARRAY  = 1031; /*ACC*/
-const int DUMMY_ARRAY       = 1032; /*ACC*/
-const int INSERTED_STATEMENT= 1033; /*ACC*/
-const int INDEX_LIST        = 1034; /*ACC*/
-const int ACROSS_GROUP_IND  = 1035; /*ACC*/
-const int DUMMY_ARGUMENT    = 1036; /*ACC*/
-const int TSK_IND_VAR       = 1037;
-const int TSK_RENUM_ARRAY   = 1038;
-const int TSK_LPS_ARRAY     = 1039;
-const int TSK_HPS_ARRAY     = 1040;
-const int TSK_AUTO          = 1041;
-const int GRAPH_NODE        = 1042;
-const int LAST_STATEMENT    = 1043; 
-const int RTC_NOT_REPLACE   = 1044; /*ACC*/
-const int RTC_CALLS         = 1045; /*ACC*/
-const int RTS2_CREATED      = 1046; /*RTS2*/
-const int HANDLER_HEADER    = 1047; /*ACC*/
-const int MODULE_USE        = 1048; /*ACC*/
-const int DEFERRED_SHAPE    = 1049; 
-const int END_OF_USE_LIST   = 1050; /*ACC*/
-const int ROUTINE_ATTR      = 1051; /*ACC*/
-const int DATA_REGION_SYMB  = 1052; /*ACC*/
-const int REMOTE_ACCESS_BUF = 1053; /*ACC*/
-const int L_BOUNDS          = 1054; /*ACC*/
-const int DIM_SIZES         = 1055; /*ACC*/
-const int PRIVATE_ARRAY     = 1056; /*ACC*/
-const int PRIVATE_POINTER   = 1057; /*ACC*/
-const int FUNCTION_AR_DUMMY = 1058; /*ACC*/
-const int DUMMY_PRIVATE_AR  = 1059; /*ACC*/
-const int NULL_SUBSCRIPTS   = 1060; /*ACC*/
-
-const int MAX_LOOP_LEVEL = 20; // 7 - maximal number of loops in parallel loop nest 
-const int MAX_LOOP_NEST = 25;  // maximal number of nested loops
-const int MAX_FILE_NUM = 100;  // maximal number of file reference in procedure
-const int SIZE_IO_BUF = 262144; //4185600;   // IO buffer size in elements
-const int ANTIDEP = 0;
-const int FLOWDEP = 1;
-#define FICT_INT  2000000000            /* -2147483648  0x7FFFFFFFL*/
-
-//enum{ Integer, Real, Double, Complex, Logical, DoubleComplex};
-enum {UNIT_,FMT_,REC_,ERR_,IOSTAT_,END_,NML_,EOR_,SIZE_,ADVANCE_,POS_,IOMSG_, NUM__R};
-enum {U_,FILE_,STATUS_,ER_,IOST_,ACCESS_,FORM_,RECL_,BLANK_,EXIST_,
-OPENED_,NUMBER_,NAMED_,NAME_,SEQUENTIAL_,DIRECT_,NEXTREC_,FORMATTED_,
-UNFORMATTED_,POSITION_,ACTION_,READWRITE_,READ_,WRITE_,DELIM_,PAD_,CONVERT_, NUM__O};
-
-enum {SIZE,LBOUND,UBOUND,LEN,CHAR,KIND,F_INT,F_REAL,F_CHAR,F_LOGICAL,F_CMPLX,MAX_,MIN_,IAND_,IOR_,ALLOCATED_,ASSOCIATED_,NUM__F90}; //intrinsic functions of Fortran 90
-
-enum {NEW_,REDUCTION_,SHADOW_RENEW_,SHADOW_START_,SHADOW_WAIT_,SHADOW_COMPUTE_,REMOTE_ACCESS_,CONSISTENT_,STAGE_,PRIVATE_,CUDA_BLOCK_,ACROSS_,TIE_}; //clauses of PARALLEL directive
-
-
-const int Integer   = 0;
-const int Real      = 1;
-const int Double    = 2;
-const int Complex   = 3;
-const int Logical   = 4;    
-const int DComplex  = 5;
-const int Character = 6;
-const int Integer_1 = 7;
-const int Integer_2 = 8;
-const int Integer_8 = 9;
-const int Logical_1 = 10;
-const int Logical_2 = 11;
-const int Logical_8 = 12;
-
-#define HEADER(A)  ((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,ARRAY_HEADER))
-#define INDEX(A) (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,ARRAY_HEADER)))
-#define DVM000(N)   (new SgArrayRefExp(*dvmbuf, *new SgValueExp(N)))  
-#define SH_GROUP(S)  (*((int *) (S) -> attributeValue(0, SHADOW_GROUP_IND)))
-#define RED_GROUP(S)  (*((int *) (S) -> attributeValue(0, RED_GROUP_IND)))
-#define SHADOW_(A) ((SgExpression **)(ORIGINAL_SYMBOL(A))->attributeValue(0,SHADOW_WIDTH))
-#define POINTER_DIR(A) ((SgStatement **)(ORIGINAL_SYMBOL(A))->attributeValue(0,POINTER_))
-#define DISTRIBUTE_DIRECTIVE(A) ((SgStatement **)(ORIGINAL_SYMBOL(A))->attributeValue(0,DISTRIBUTE_))
-#define ARRAY_BASE_SYMBOL(A) ((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,ARRAY_BASE))
-#define INDEX_SYMBOL(A) ((SgSymbol **)(A)->attributeValue(0,INDEX_DELTA))
-#define INIT_LOOP_VAR(A) ((SgSymbol **)(A)->attributeValue(0,INIT_LOOP))
-#define CONSISTENT_HEADER(A) (*((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,CONSISTENT_ARRAY_HEADER)))
-#define POINTER_INDEX(A) (*((int *)(A)->attributeValue(0,HEAP_INDEX)))
-#define BUFFER_INDEX(A) (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,BUFFER_COUNT)))
-#define BUFFER_COUNT_PLUS_1(A) (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,BUFFER_COUNT))) =  (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,BUFFER_COUNT)))+1;
-#define PS_INDEX(A) (*((int *)(A)->attributeValue(0,TASK_INDEX)))
-#define DEBUG_INDEX(A) (*((int*)(ORIGINAL_SYMBOL(A))->attributeValue(0,DEBUG_AR_INDEX)))
-#define TASK_SYMBOL(A) (*((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,TSK_SYMBOL)))
-#define TASK_IND_VAR(A) (*((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,TSK_IND_VAR)))
-#define TASK_RENUM_ARRAY(A) (*((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,TSK_RENUM_ARRAY)))
-#define TASK_LPS_ARRAY(A) (*((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,TSK_LPS_ARRAY)))
-#define TASK_HPS_ARRAY(A) (*((SgSymbol **)(ORIGINAL_SYMBOL(A))->attributeValue(0,TSK_HPS_ARRAY)))
-#define TASK_AUTO(A) ((A)->attributeValue(0,TSK_AUTO))
-#define RTS2_OBJECT(A) ((A)->attributeValue(0,RTS2_CREATED))
-#define IS_LIST_END(A) ((A)->attributeValue(0,END_OF_USE_LIST))
-/*#define AR_COEFFICIENTS(A)  ( (A)->attributeValue(0,ARRAY_COEF) ?  (coeffs *) (A)->attributeValue(0,ARRAY_COEF) : (coeffs *) (ORIGINAL_SYMBOL(A))->attributeValue(0,ARRAY_COEF))*/
-#define AR_COEFFICIENTS(A)  (DvmArrayCoefficients(A))
-#define MAX_DVM   maxdvm = (maxdvm < ndvm) ? ndvm-1 : maxdvm  
-#define FREE_DVM(A)  maxdvm = (maxdvm < ndvm) ? ndvm-1 : maxdvm;  ndvm-=A  
-#define SET_DVM(A)   maxdvm = (maxdvm < ndvm) ? ndvm-1 : maxdvm;  ndvm=A  
-#define FREE_HPF(A)  maxhpf = (maxhpf < nhpf) ? nhpf-1 : maxhpf;  nhpf-=A  
-#define SET_HPF(A)   maxhpf = (maxhpf < nhpf) ? nhpf-1 : maxhpf;  nhpf=A  
-#define HPF000(N)   (new SgArrayRefExp(*hpfbuf, *new SgValueExp(N)))  
-#define IS_DUMMY(A)  ((A)->thesymb->entry.var_decl.local == IO) 
-#define IS_TEMPLATE(A)  ((A)->attributes() & TEMPLATE_BIT) 
-#define IN_COMMON(A)  ((A)->attributes() & COMMON_BIT) 
-#define IN_DATA(A)  ((A)->attributes() & DATA_BIT) 
-#define IN_EQUIVALENCE(A)  ((A)->attributes() & EQUIVALENCE_BIT) 
-#define IS_ARRAY(A)  ((A)->attributes() & DIMENSION_BIT)
-#define IS_ALLOCATABLE(A)  ((A)->attributes() & ALLOCATABLE_BIT) 
-#define IS_ALLOCATABLE_POINTER(A)  (((A)->attributes() & ALLOCATABLE_BIT) || ((A)->attributes() & POINTER_BIT))
-#define IS_POINTER_F90(A)  ((A)->attributes() & POINTER_BIT) 
-#define CURRENT_SCOPE(A)  (((A)->scope() == cur_func) && ((A)->thesymb->entry.var_decl.local != BY_USE) )
-#define IS_BY_USE(A)  ((A)->thesymb->entry.Template.base_name != 0) 
-/*#define ORIGINAL_SYMBOL(A) (OriginalSymbol(A)) */
-#define ORIGINAL_SYMBOL(A) (IS_BY_USE(A) ? (A)->moduleSymbol() : (A))
-#define IS_SAVE(A) (((A)->attributes() & SAVE_BIT) || (saveall && !IS_TEMPLATE(A) && !IN_COMMON(A) && !IS_DUMMY(A)) )
-#define HAS_SAVE_ATTR(A) (((A)->attributes() & SAVE_BIT ) || saveall )
-#define IS_LOCAL_VAR(A) (CURRENT_SCOPE(A) && !IN_COMMON(A) && !IS_DUMMY(A))
-#define IS_POINTER(A)  ((A)->attributes() & DVM_POINTER_BIT) 
-#define IS_SH_GROUP_NAME(A) ((A)->variant() == SHADOW_GROUP_NAME)
-#define IS_RED_GROUP_NAME(A) ((A)->variant() == REDUCTION_GROUP_NAME)
-#define IS_GROUP_NAME(A) (((A)->variant() == SHADOW_GROUP_NAME) || ((A)->variant() == REDUCTION_GROUP_NAME) || ((A)->variant() == REF_GROUP_NAME)) 
-#define IS_DVM_ARRAY(A)   (((A)->attributes() & DISTRIBUTE_BIT) || ((A)->attributes() & ALIGN_BIT) || ((A)->attributes() & INHERIT_BIT))
-#define IS_DISTR_ARRAY(A) (((A)->attributes() & DISTRIBUTE_BIT) || ((A)->attributes() & ALIGN_BIT) || ((A)->attributes() & INHERIT_BIT))
-#define IN_MODULE (cur_func->variant() == MODULE_STMT)
-#define IN_MAIN_PROGRAM (cur_func->variant() == PROG_HEDR)
-#define DVM_PROC_IN_MODULE(A) ((mod_attr *)(A)->attributeValue(0,MODULE_STR))
-/*
-#define LINE_NUMBER_BEFORE(ST,WHERE)     doAssignStmtBefore(new SgValueExp((ST)->lineNumber()),WHERE); ndvm--; InsertNewStatementBefore(D_Lnumb(ndvm),WHERE)
-#define LINE_NUMBER_STL_BEFORE(STL,ST,WHERE)     doAssignStmtBefore(new SgValueExp((ST)->lineNumber()),WHERE); ndvm--; InsertNewStatementBefore(STL=D_Lnumb(ndvm),WHERE)
-#define LINE_NUMBER_AFTER(ST,WHERE)   InsertNewStatementAfter (D_Lnumb(ndvm),WHERE,(WHERE)->controlParent());  doAssignStmtBefore(new SgValueExp((ST)->lineNumber()),cur_st); ndvm--
-#define LINE_NUMBER_N_AFTER(N,WHERE,CP)  InsertNewStatementAfter(D_Lnumb(ndvm),WHERE,CP);  doAssignStmtBefore(new SgValueExp(N),cur_st); ndvm--
-*/
-/*
-#define LINE_NUMBER_BEFORE(ST,WHERE)     doAssignStmtBefore(new SgValueExp((ST)->lineNumber()),WHERE); ndvm--; InsertNewStatementBefore((many_files ? D_FileLine(ndvm,ST) : D_Lnumb(ndvm)) ,WHERE)
-#define LINE_NUMBER_STL_BEFORE(STL,ST,WHERE)     doAssignStmtBefore(new SgValueExp((ST)->lineNumber()),WHERE); ndvm--; InsertNewStatementBefore(STL= (many_files ? D_FileLine(ndvm,ST) :  D_Lnumb(ndvm)),WHERE)
-#define LINE_NUMBER_AFTER(ST,WHERE)   InsertNewStatementAfter ((many_files ? D_FileLine(ndvm,ST) : D_Lnumb(ndvm)),WHERE,(WHERE)->controlParent());  doAssignStmtBefore(new SgValueExp((ST)->lineNumber()),cur_st); ndvm--
-#define LINE_NUMBER_N_AFTER(N,WHERE,CP)  InsertNewStatementAfter((many_files ? D_FileLine(ndvm,CP): D_Lnumb(ndvm)),WHERE,CP);  doAssignStmtBefore(new SgValueExp(N),cur_st); ndvm--
-*/
-/*
-#define LINE_NUMBER_BEFORE(ST,WHERE)  InsertNewStatementBefore(D_FileLineConst((ST)->lineNumber(),ST),WHERE)
-#define LINE_NUMBER_STL_BEFORE(STL,ST,WHERE)  InsertNewStatementBefore(STL= D_FileLineConst((ST)->lineNumber(),ST),WHERE)
-#define LINE_NUMBER_AFTER(ST,WHERE)             InsertNewStatementAfter (D_FileLineConst((ST)->lineNumber(),ST),WHERE,(WHERE)->controlParent())
-#define LINE_NUMBER_AFTER_WITH_CP(ST,WHERE,CP)  InsertNewStatementAfter (D_FileLineConst((ST)->lineNumber(),ST),WHERE,CP)
-#define LINE_NUMBER_N_AFTER(N,WHERE,CP)  InsertNewStatementAfter(D_FileLineConst(N,CP),WHERE,CP)
-*/
-#define LINE_NUMBER_BEFORE(ST,WHERE)  InsertNewStatementBefore(Dvmh_Line((ST)->lineNumber(),ST),WHERE)
-#define LINE_NUMBER_STL_BEFORE(STL,ST,WHERE)  InsertNewStatementBefore(STL= Dvmh_Line((ST)->lineNumber(),ST),WHERE)
-#define LINE_NUMBER_AFTER(ST,WHERE)             InsertNewStatementAfter (Dvmh_Line((ST)->lineNumber(),ST),WHERE,(WHERE)->controlParent())
-#define LINE_NUMBER_AFTER_WITH_CP(ST,WHERE,CP)  InsertNewStatementAfter (Dvmh_Line((ST)->lineNumber(),ST),WHERE,CP)
-#define LINE_NUMBER_N_AFTER(N,WHERE,CP)  InsertNewStatementAfter(Dvmh_Line(N,CP),WHERE,CP)
-
-#define LINE_NUMBER_NEXP_AFTER(NE,WHERE,CP)  InsertNewStatementAfter(D_DummyFileLine(ndvm,"dvm_check"),WHERE,CP);  doAssignStmtBefore((NE),cur_st); ndvm--
-#define ALIGN_RULE_INDEX(A) ((int*)(A)->attributeValue(0,ALIGN_RULE))
-#define INTERVAL_LINE  (St_frag->begin_st->lineNumber())
-#define INTERVAL_NUMBER  (St_frag->No)
-#define GROUP_REF(S,I) (new SgArrayRefExp(*(S),*new SgValueExp(I)))
-#define IS_DO_VARIABLE_USE(E) ((SgExpression **)(E)->attributeValue(0,DO_VARIABLE_USE))
-#define HEADER_SIZE(A) (2+(maxbuf+1)*2*(Rank(A)+1))
-#define HSIZE(R) (2*R + 2)
-#define ARRAY_ELEMENT(A,I)  (new SgArrayRefExp(*A, *new SgValueExp(I)))
-#define INTEGER_VALUE(E,C) ((E)->variant() == INT_VAL && (E)->valueInteger() == (C))
-#define IS_INTRINSIC_TYPE(T) (!TYPE_RANGES((T)->thetype) && !TYPE_KIND_LEN((T)->thetype) && ((T)->variant() != T_DERIVED_TYPE))
-#define DEBUG_STMTS_FOR_GOTO(ST) ((SgStatement **)(ST)->attributeValue(0,DEBUG_GOTO))
-/* ACC */
-#define HEADER_FOR_GPU(A)  ((SgSymbol**)(A)->attributeValue(0,GPU_HEADER))
-#define FREE_GPU(A)  maxgpu = (maxgpu < ngpu) ? ngpu-1 : maxgpu;  ngpu-=A  
-#define SET_GPU(A)   maxgpu = (maxgpu < ngpu) ? ngpu-1 : maxgpu;  ngpu=A  
-#define GPU000(N)   (new SgArrayRefExp(*gpubuf, *new SgValueExp(N)))  
-#define IN_COMPUTE_REGION  (cur_region && !cur_region->is_data && !in_checksection)
-#define BY_HANDLER  (ACC_program)
-#define IND_REDVAR(A) (*((int *)(A)->attributeValue(0,REDVAR_INDEX)))
-#define SET_NRED(A)   maxred_gpu = (maxred_gpu < nred_gpu) ? nred_gpu-1 : maxred_gpu;  nred_gpu=A
-#define DECL(A)  ((A)->thesymb->decl)
-#define VAR_INTENT(A) (((int *)(A)->attributeValue(0,INTENT_OF_VAR)))
-#define IN_STATEMENT_GROUP(A) ((A)->attributeValue(0,STATEMENT_GROUP))
-#define HEADER_OF_REPLICATED(A) (((int *)(A)->attributeValue(0,REPLICATED_ARRAY)))
-#define DUMMY_FOR_ARRAY(A) ( (SgSymbol **)(A)->attributeValue(0,DUMMY_ARRAY) )
-#define DUMMY_ARG(A)       ( (SgSymbol **)(A)->attributeValue(0,DUMMY_ARGUMENT) )
-#define IS_CONSISTENT(A)  ((A)->attributes() & CONSISTENT_BIT)
-#define IS_INSERTED(A) ((A)->attributeValue(0,INSERTED_STATEMENT))
-#define VECTOR_REF(V,N)   (new SgArrayRefExp(*V, *new SgValueExp(N)))  
-#define INDEX_VECTOR(A) ( (SgSymbol **)(A)->attributeValue(0,INDEX_LIST) )
-#define GROUP_INDEX(A) (((int *)(A)->attributeValue(0,ACROSS_GROUP_IND)))
-#define GRAPHNODE(A) (*((graph_node **)(A)->attributeValue(0,GRAPH_NODE)))
-#define ATTR_NODE(A) ((graph_node **)(A)->attributeValue(0,GRAPH_NODE))
-#define HEDR(A)  ((A)->thesymb->entry.Template.func_hedr)
-#define FILE_LAST_STATEMENT(ST) ((SgStatement **)(ST)->attributeValue(0,LAST_STATEMENT))
-#define CALLED_FUNCTIONS(ST) ((symb_list **)(ST)->attributeValue(0,RTC_CALLS)) 
-#define INTERFACE_RTS2  (parloop_by_handler == 2)
-#define CANCEL_RTS2_MODE    if(parloop_by_handler == 2) parloop_by_handler = -1
-#define RESUMPTION_RTS2_MODE    if(parloop_by_handler == -1) parloop_by_handler = 2
-#define HEADER_FOR_HANDLER(A)  ( (SgSymbol **)(A)->attributeValue(0,HANDLER_HEADER) )
-#define USE_STATEMENTS_ARE_REQUIRED ( (int *) first_do_par->attributeValue(0,MODULE_USE) )
-#define DEFERRED_SHAPE_TEMPLATE(A) ( (ORIGINAL_SYMBOL(A))->attributeValue(0,DEFERRED_SHAPE) )
-#define HAS_ROUTINE_ATTR(A) ((A)->attributeValue(0,ROUTINE_ATTR))
-#define IS_REMOTE_ACCESS_BUFFER(A) ((A)->attributeValue(0,REMOTE_ACCESS_BUF))
-
-EXTERN
-SgFunctionSymb * fdvm [MAX_LIBFUN_NUM];
-EXTERN
-SgFunctionSymb * f90 [NUM__F90];
-EXTERN
-SgFunctionSymb * f90_dvm [NUM__F90];
-EXTERN
-const char * name_dvm [MAX_LIBFUN_NUM];
-EXTERN
-short fmask [MAX_LIBFUN_NUM];
-EXTERN
-SgVariableSymb * dvmbuf,
-               * hpfbuf,
-               * Imem,
-               * Rmem,
-               * Dmem, 
-               * Lmem,
-               * Cmem,
-               * Chmem,
-               * DCmem,
-               * heapdvm,
-               * Pipe;
-
-/*ACC*/
-EXTERN
-SgVariableSymb * gpubuf,
-               * Imem_gpu,
-               * Rmem_gpu,
-               * Dmem_gpu, 
-               * Lmem_gpu,
-               * Cmem_gpu,
-               * Chmem_gpu,
-               * DCmem_gpu;  /*ACC*/
-
-         
-EXTERN SgConstantSymb *Iconst[10];
-EXTERN const char *tag[MAXTAGS];
-EXTERN int max_lab;  // maximal  label in file
-EXTERN int ndvm;  // index for buffer array 'dvm000'	
-EXTERN int maxdvm;  //  size of array 'dvm000' 
-EXTERN int loc_distr;
-EXTERN int send;  //set to 1 if I/O statement require 'send' operation
-EXTERN char *fin_name; //input file name
-EXTERN SgStatement *cur_st;  // current statement  (for inserting)
-EXTERN SgFile *current_file;    //current file
-EXTERN SgStatement *where;//used in doAssignStmt: new statement is inserted before 'where' statement
-EXTERN int nio;
-EXTERN SgSymbol *bufIO[Ntp],*IOstat;
-EXTERN int buf_use[Ntp];
-EXTERN SgSymbol *loop_var[MAX_DIMS+1]; // for generatig DO statements
-EXTERN SgStatement *cur_func;  // current function 
-EXTERN int err_cnt;  // counter of errors in file
-EXTERN int saveall; //= 1 if there is SAVE without name-list in current function(procedure) 
-EXTERN SgStatement *par_do;  // first DO statement of current parallel loop  
-EXTERN int iplp; //dvm000 element number for storing ParLoopRef
-EXTERN int irg;  //dvm000 element number for storing RedGroupRef
-EXTERN int irgts;  //dvm000 element number for storing RedGroupRef(task_region)
-EXTERN int idebrg;  //dvm000 element number for storing DebRedGroupRef
-EXTERN SgExpression *redgref; // reduction group reference
-EXTERN SgExpression *redgrefts; // reduction group reference for TASK_REGION
-EXTERN SgExpression *debredgref; // debug reduction group reference
-EXTERN SgExpression *red_list; // reduction operation list in FDVM program
-EXTERN SgExpression *task_red_list; // reduction operation list (in TASK_REGION directive)
-EXTERN rem_acc *rma; // remote_access directive/clause list
-EXTERN int iconsg;  //dvm000 element number for storing ConsistGroupRef
-EXTERN int iconsgts;  //dvm000 element number for storing ConsistGroupRef(task_region)
-EXTERN int idebcg;  //dvm000 element number for storing DebRedGroupRef
-EXTERN SgExpression *consgref; // consistent group reference
-EXTERN SgExpression *consgrefts; // consistent group reference for TASK_REGION
-EXTERN SgExpression *debconsgref; // debug reduction(consistent) group reference
-EXTERN SgExpression *cons_list; // consistent array list in FDVM program
-EXTERN SgExpression *task_cons_list; // consistent array list (in TASK_REGION directive)
-
-EXTERN SgLabel *end_lab, *begin_lab; //labels for parallel loop nest
-EXTERN D_do_list *cur_do;
-EXTERN D_do_list *free_list;
-EXTERN int Dloop_No;
-EXTERN int pardo_No;
-EXTERN int taskreg_No;
-EXTERN int pardo_line;
-EXTERN int D_end_do;
-EXTERN int nfrag ; //counter of intervals for performance analizer 
-EXTERN interval_list *St_frag ;
-EXTERN interval_list *St_loop_first;
-EXTERN interval_list *St_loop_last;
-EXTERN int perf_analysis ; //set to 1 by -e1
-EXTERN int close_loop_interval;
-EXTERN stmt_list *goto_list, *acc_return_list;
-EXTERN int len_int; //set by option -bind
-EXTERN int len_DvmType;//set by option -t and -bind
-EXTERN int bind_;//set by option -bind
-/*EXTERN D_fragment *deb[5]; //set by option -d and -e*/
-EXTERN int dvm_debug ;   //set to 1 by -d1  or -d2 or -d3 or -d4 flag
-EXTERN int only_debug ;  //set to 1 by -s flag
-EXTERN int level_debug ; //set to 1 by -d1, to 2 by -d2, ...
-EXTERN fragment_list_in *debug_fragment; //set by option -d
-EXTERN fragment_list_in *perf_fragment; //set by option -e
-EXTERN int debug_regim; //set by option -d
-EXTERN int check_regim; //set by option -dc
-EXTERN int dbg_if_regim; //set by option -dbif
-EXTERN int deb_mpi; //set by option -dmpi
-EXTERN int d_no_index; //set by option -dnoind
-EXTERN  int IOBufSize; //set by option -bufio
-EXTERN  int UnparserBufSize; //set by option -bufUnparser
-EXTERN  int collapse_loop_count; //set by option -collapse
-EXTERN SgSymbol *dbg_var;
-EXTERN int HPF_program;
-EXTERN int ACC_program;
-EXTERN int rmbuf_size[Ntp];
-EXTERN int first_time;
-EXTERN SgStatement *indep_st; //first INDEPENDENT directive of loop nest
-EXTERN SgStatement *ins_st1, *ins_st2; // for INDEPENDENT loop
-EXTERN SgSymbol *DoVar[MAX_LOOP_NEST], **IND_var, **IEX_var;
-EXTERN int iarg; // for INDEPENDENT loop
-EXTERN int nIND, nIEX; //the number of INDEPENDENT loops and enclosing loops;
-EXTERN SgExpression *IND_target;
-EXTERN SgExpression *IND_target_R;
-EXTERN IND_ref_list *IND_refs;
-EXTERN reduction_list *redl; // reduction operation list in HPF program
-EXTERN int nhpf;    // index for work array 'hpf000'	
-EXTERN int maxhpf;  //  size of array 'hpf000' 
-EXTERN int all_sh_width, no_rma, one_inquiry, only_local; // //set by option -Hflag
-EXTERN SgStatement *first_hpf_exec;
-EXTERN int hpf_ind;
-EXTERN symb_list *dvm_ar,*registration;
-EXTERN int many_files;
-EXTERN int seq_loop_nest;
-EXTERN int pipeline;
-EXTERN symb_list *imp_loop; //input element list, that are appear in implicit loop
-EXTERN  heap_pointer_list *heap_point;
-EXTERN  filename_list *fnlist;
-EXTERN  int filename_num;
-EXTERN  SgFunctionSymb *SIZE_function;
-EXTERN  int in_interface; //inside the interface block > 0
-EXTERN int inparloop;    //set to 1 in the range of parallel loop
-EXTERN SgSymbol *registration_array;
-EXTERN int count_reg;
-EXTERN SgSymbol *check_sum;
-EXTERN  int default_integer_size,default_real_size ;
-EXTERN  int all_replicated;  //all arrays in procedure are replicated
-EXTERN symb_list *if_goto;
-EXTERN int nifvar;
-EXTERN stmt_list *entry_list;
-EXTERN SgExpression *dbif_cond, *dbif_not_cond;
-EXTERN SgStatement *st_adr, *st_dstv;
-EXTERN base_list *mem_use_structure;
-EXTERN symb_list *sym_gpu; /* list of dvm_array with gpu-copies */ /*ACC*/
-EXTERN region_list *cur_region;    //current region in ACC program /*ACC*/ 
-EXTERN int gpu_mem_use[Ntp];                                       /*ACC*/
-//EXTERN SgSymbol *mem_symb[6],*gpu_mem_symb[6], *k_mem_symb[6];   /*ACC*/
-EXTERN int ngpu;    // index for work array 'gpu000'               /*ACC*/
-EXTERN int nkernel; // counter of kernels                          /*ACC*/	
-EXTERN int maxgpu;  //  size of work  array 'gpu000'               /*ACC*/ 
-//EXTERN SgSymbol *s_blocks,*s_threads,*s_blocks_off;              /*ACC*/
-EXTERN SgSymbol *mod_gpu_symb,*loop_ref_symb;                      /*ACC*/
-EXTERN SgSymbol*index_array_symb;                                  /*ACC*/
-EXTERN SgStatement *if_gpu,*mod_gpu,*created_unit;                 /*ACC*/
-//EXTERN char *fname_gpu[80];                                      /*ACC*/
-EXTERN symb_list *acc_array_list, *acc_arg_array_list;             /*ACC*/
-EXTERN int nred_gpu,maxred_gpu, for_kernel, for_host;              /*ACC*/
-EXTERN int device_flag[Ndev];                                      /*ACC*/
-EXTERN int region_debug; //set by option -dgpu ,-dreg              /*ACC*/
-EXTERN int region_compare; //set by option -dgpu                   /*ACC*/
-EXTERN SgConstantSymb *region_const[Nregim];                       /*ACC*/
-EXTERN SgExpression *cuda_block;                                   /*ACC*/
-EXTERN SgExpression *allocated_list;                               /*ACC*/
-EXTERN SgStatement *first_do_par;                                  /*ACC*/
-EXTERN int in_checksection,undefined_Tcuda, cuda_functions;        /*ACC*/
-EXTERN symb_list *RGname_list;                                     /*ACC*/
-EXTERN int parloop_by_handler; //set to 1 by option -Opl and       /*ACC*/
-                               //    to 2 by option -Opl2
-EXTERN SgSymbol *private_array_class;
-//---------------------------------------------------------------------
-/*  dvm.cpp   */
-void TranslateFileDVM(SgFile *f);
-void TransFunc(SgStatement *func,SgStatement* &end_of_unit) ;
-void InsertDebugStat(SgStatement *func,SgStatement* &end_of_unit) ;
-void DVMFileUnparse(SgFile *f) ;
-void DeclareVarDVM(SgStatement *lstat, SgStatement *lstat2);
-void DeclareVariableWithInitialization (SgSymbol *sym, SgType *type, SgStatement *lstat);
-void doDistFormat(SgExpression *e);
-//void GenDistArray (SgSymbol *das, int idisars, SgExpression **distr_list, SgExpression *ps, SgStatement *stdis);
-void GenDistArray (SgSymbol *das, int idisars, SgExpression *distr_rule_list, SgExpression *ps, SgStatement *stdis);
-SgExpression * doSizeArray(SgSymbol *ar, SgStatement *st);
-SgExpression * doSizeFunctionArray(SgSymbol *ar, SgStatement *st);
-SgExpression *doSizeArrayD(SgSymbol *ar, SgStatement *st);
-SgSymbol * baseMemory(SgType *t);
-int TypeSize(SgType *t);
-int CharLength(SgType *t);
-void TypeMemory(SgType *t);
-int TypeIndex(SgType *t);
-int doDisRuleArrays (SgStatement *stdist, int aster, SgExpression **distr_list);
-SgExpression *doDisRules(SgStatement *stdis, int aster, int &idis);
-void Align_Tree(align *root);
-void AlignTree( align *root);
-void GenAlignArray(align *node, align *root, int nr, SgExpression *align_rule_list, int iaxis);
-void doAlignRule_1 (int rank);
-int doAlignRule (SgSymbol *alignee,SgStatement *algn_st, int iaxis);
-SgExpression *doAlignRules (SgSymbol *alignee, SgStatement *algn_st, int iaxis, int &nt);
-int AxisNumOfDummyInExpr (SgExpression *e, SgSymbol *dim_ident[], int ni,                             SgExpression **eref, int use[], SgStatement *st);
-void CoeffConst(SgExpression *e, SgExpression *ei, SgExpression **pcoef, SgExpression **pcons);
-//void RealignArray(SgSymbol *als, SgSymbol *tgs, int iaxis, int nr, int new_sign, SgStatement *stal);  
-void RealignArray(SgSymbol *als, SgSymbol *tgs, int iaxis, int nr, SgExpression *align_rule_list, int new_sign, SgStatement *stal) ;
-void ArrayHeader(SgSymbol *ar, int ind);
-int Rank(SgSymbol *s);
-SgExpression *dvm_array_ref();
-SgExpression *dvm_ref(int n);
-int DeleteDArFromList(SgStatement *stmt);
-//void ChangeArg_DistArrayRef(SgExpression *e);
-void ChangeArg_DistArrayRef(SgExpression *ele, SgSymbol *fsym, int i);
-void ChangeDistArrayRef(SgExpression *e);
-void ChangeDistArrayRef_Left(SgExpression *e);
-SgExpression *SearchDistArrayField(SgExpression *e);
-SgExpression *ReplaceParameter(SgExpression *e);
-SgExpression *LinearForm (SgSymbol *ar, SgExpression *el, SgExpression *erec);
-SgExpression *LinearFormB (SgSymbol *ar, int ihead, int n, SgExpression *el);
-SgExpression * head_ref (SgSymbol *ar, int n);
-SgExpression * header_ref (SgSymbol *ar, int n);
-SgExpression * header_rf (SgSymbol *ar, int ihead, int n);
-SgExpression * HeaderRef (SgSymbol *ar);
-SgExpression * HeaderRefInd(SgSymbol *ar, int n);
-SgType* SgTypeComplex(SgFile *f);
-SgType* SgTypeDoubleComplex(SgFile *f);
-SgExpression *HeaderNplus1(SgSymbol * ar);   
-SgExpression *BufferHeaderNplus1(SgExpression * rme, int n, int ihead,SgSymbol *ar); 
-SgExpression *LowerBound(SgSymbol *ar, int i);
-SgExpression *UpperBound(SgSymbol *ar, int i);
-int ExpCompare(SgExpression *e1, SgExpression *e2);
-int RedFuncNumber(SgExpression *kwe);
-int RedFuncNumber_2(int num);
-int VarType(SgSymbol *var);
-void ShadowList (SgExpression *el, SgStatement *st,SgExpression *gref );
-int doShadSizeArrayM1(SgSymbol *ar,SgExpression **shlist);
-int doShadSizeArrays(SgExpression *shl, SgSymbol *ar, SgStatement *st, SgExpression **shlist);
-int BoundSizeArrays(SgSymbol *das);
-int NameIndex(SgType *type);
-SgType *Base_Type(SgType *type);
-int doAlignIteration(SgStatement *stat, SgExpression *aref);
-int Alignment(SgStatement *stat, SgExpression *aref, SgExpression *axis[], SgExpression *coef[], SgExpression *cons[],int interface);
-void doLoopStmt(SgStatement *st);
-stmt_list  *addToStmtList(stmt_list *pstmt, SgStatement *stat);
-stmt_list  *delFromStmtList(stmt_list *pstmt);
-SgExpression * ArrayDimSize(SgSymbol *ar, int i);
-void RedistributeArray(SgSymbol *das, int idisars, SgExpression *distr_rule_list, SgExpression *ps, int sign,SgExpression *dasref, SgStatement *stdis); 
-SgExpression * DistObjectRef (SgSymbol *ar); 
-SgStatement *doIfThenConstr(SgSymbol *ar);
-SgExpression *Calculate(SgExpression *e);
-int RemAccessRefCompare(SgExpression *e1, SgExpression *e2);
-void ChangeRemAccRef(SgExpression *e, SgExpression *rve);
-SgExpression *isRemAccessRef(SgExpression *e);
-int CreateBufferArray(int rank, SgExpression *rme, int *amview, SgStatement *stmt);
-void CopyToBuffer(int rank,  int ibuf, SgExpression *rme);
-void RemoteVariableList(SgSymbol *group,SgExpression *rml, SgStatement *stmt);
-void RemoteVariableList1(SgSymbol *group,SgExpression *rml, SgStatement *stmt);
-SgExpression *AlignmentListForRemoteDir(int nt, SgExpression *axis[], SgExpression *coef[], SgExpression *cons[]);
-void DeleteBuffers(SgExpression *rml);
-void AddRemoteAccess(SgExpression *rml, SgStatement *rmout);
-void DelRemoteAccess();
-void RemoteAccessEnd();
-SgExpression *isSpecialFormExp(SgExpression *e,int i,int ind,SgExpression *vpart[],SgSymbol *do_var[]);
-int   isInvariantPart(SgExpression *e);
-int   isDependentPart(SgExpression *e,SgSymbol *do_var[]);
-SgExpression *RenewSpecExp(SgExpression *e, int cnst, int ind);
-int   isDistObject(SgExpression *e);
-SgExpression *Exprn(SgExpression *e);
-int   isListOfArrays(SgExpression *e, SgStatement *st);
-char * AttrName(int i);
-int   TestShapeSpec(SgExpression *e);
-void  AddToGroupNameList (SgSymbol *s);
-symb_list *AddToSymbList( symb_list *ls, SgSymbol *s);
-symb_list *AddNewToSymbList ( symb_list *ls, SgSymbol *s);
-symb_list *AddNewToSymbListEnd ( symb_list *ls, SgSymbol *s);
-symb_list *MergeSymbList(symb_list *ls1, symb_list *ls2);
-symb_list *CopySymbList(symb_list *ls);
-void  DistArrayRef(SgExpression *e, int modified, SgStatement *st);
-void  GoRoundEntry(SgStatement *stmt);
-void  BeginBlockForEntry(SgStatement *stmt);
-int   isInSymbList(symb_list *ls,SgSymbol *s);
-void  NewVarList(SgExpression *nl,SgStatement *stmt);
-void  TestReverse(SgExpression *e,SgStatement *st);
-void  TestShadowWidths(SgSymbol *ar, SgExpression * lbound[], SgExpression * ubound[], int nw, SgStatement *st);
-int   PointerRank(SgSymbol *p);
-SgType * PointerType(SgSymbol *p);
-void  AssignPointer(SgStatement *ass);
-void  AllocateArray(SgStatement *stmt, distribute_list *distr);
-void  AllocateDistArray(SgSymbol *p, SgExpression *desc, SgStatement *stdis, SgStatement *stmt);
-void  AlignTreeAlloc( align *root,SgStatement *stmt);
-void  AllocateAlignArray(SgSymbol *p, SgExpression *desc, SgStatement *stmt);
-void  AlignAllocArray(align *node, align *root, int nr, int iaxis,SgExpression *desc, SgStatement *stmt);
-void  AddFirstSubscript(SgExpression *ea, SgExpression *ei);
-SgExpression * PointerHeaderRef(SgExpression *pe, int ind);
-void  CopyHeader(SgExpression *ple, SgExpression *pre, int rank);
-int   TestArrayRef(SgExpression *e, SgStatement *stmt);
-void  AddDistSymbList(SgSymbol *s);
-void  initialize();
-void  initVariantNames();
-void  initLibNames();
-void  initMask();
-void  InitDVM( SgFile *f);
-void  StoreLowerBoundsPlus(SgSymbol *ar, SgExpression *arref);
-void  StoreLowerBoundsPlusFromAllocate(SgSymbol *ar,SgExpression *arref,SgExpression *lbound);
-void  ReplaceLowerBound(SgSymbol *ar, int i);
-void  ReplaceArrayBounds(SgSymbol *ar) ;
-SgExpression *ConstRef(int ic);
-SgExpression *SignConstRef(int ic);
-int DVMTypeLength();
-void ReconfPS( stmt_list *pstmt);
-SgExpression *CountOfTasks(SgStatement *st);
-void TestParamType(SgStatement *stmt);
-SgExpression *CurrentPS ();
-SgExpression *ParentPS ();
-SgExpression *ReplaceFuncCall(SgExpression *e);
-SgExpression *PSReference(SgStatement *st);
-SgExpression *TaskPS(SgExpression *target,SgStatement *st);
-SgExpression *hasOntoClause(SgStatement *stdis);
-SgExpression *hasNewValueClause(SgStatement *stdis);
-int RankOfSection(SgExpression *are);
-void CreateTaskArray(SgSymbol *ts);
-int LoopVarType(SgSymbol *var,SgStatement *st);
-int LocVarType(SgSymbol *var,SgStatement *st);
-void StartTask(SgStatement *stmt);
-void InitGroups();
-//void InsertRedVarsInGroup(SgExpression *redgref,int irv,int nred);
-SgExpression * isDoVarUse (SgExpression *e, int use[], SgSymbol *ident[], int ni, int *num, SgStatement *st);
-SgSymbol* isIndirectSubscript (SgExpression *e, SgSymbol *ident, SgStatement *st);
-void IndirectList(SgSymbol *group, SgExpression *rml, SgStatement *stmt);
-SgExpression *BufferHeader4(SgExpression * rme, int ihead);
-void BeginDebugFragment(int num, SgStatement *stmt);
-void EndDebugFragment();
-void InitRemoteGroups();
-int MinLevel(int level, int max, int is_max);
-int MaxLevels(SgStatement *stmt,int *max_dlevel,int *max_elevel);
-SgExpression *PointerArrElem(SgSymbol *p,SgStatement *stdis);
-SgExpression *ReverseDim(SgExpression *desc,int rank);
-SgExpression *DoSubscriptList(SgExpression *are,int ind);
-SgExpression *doSizeArrayQuery(SgExpression *headref,int rank);
-int DVMType();
-int NumberOfElements(SgSymbol *ar, SgStatement *stmt, int err);
-void InitHeap(SgSymbol *heap);
-int isHPFprogram(char *filename);
-SgExpression * HeapIndex(SgStatement *st);
-SgExpression * LowerBoundOfDimension(SgArrayType *artype, int i);
-int DeleteHeapFromList(SgStatement *stmt);
-void InitAsyncid();
-void AsyncCopyWait(SgExpression *asc);
-void Triplet(SgExpression *e,SgSymbol *ar,int i, SgExpression *einit[],SgExpression *elast[],SgExpression *estep[]);
-void AsynchronousCopy(SgStatement *stmt);
-void CreateCoeffs(coeffs* scoef,SgSymbol *ar);
-SgExpression * coef_ref (SgSymbol *ar, int n);
-SgExpression * coef_ref (SgSymbol *ar, int n, SgExpression *erec);
-coeffs *DvmArrayCoefficients(SgSymbol *ar);
-void DeleteShadowGroups(SgStatement *stmt);
-void InitShadowGroups();
-int doSectionIndex(SgExpression *esec, SgSymbol *ar, SgStatement *st, int idv[], int ileft, SgExpression *lrec[], SgExpression *rrec[]);
-void ShadowSectionTriplet(SgExpression *e, int i, SgExpression *einit[], SgExpression *elast[], SgExpression *estep[], SgExpression *lrec[], SgExpression *rrec[],  int flag);
-void AddToAligneeList(align *root, align* node);
-void RegistrationList(SgStatement *stmt);
-void  RegistrateArg(SgExpression *ele);
-int TestType(SgType *type);
-filename_list  *AddToFileNameList ( char *s);
-filename_list  *AddToFileNameList(const char *s);
-char* FileNameVar(int i);
-void InitFileNameVariables();
-char* RedGroupVarName(SgSymbol *gr);
-void CreateRedGroupVars();
-void InitRedGroupVariables();
-void WaitDirList();
-int DefineLoopNumberForDimension(SgStatement * stat, SgExpression *ear, int loop_num[]);
-SgExpression *DebReductionGroup(SgSymbol *gs);
-void Reduction_Task_Region(SgStatement *stmt);
-void EndReduction_Task_Region(SgStatement *stmt);
-void DeleteLocTemplate(SgStatement *stmt);
-void ShadowComp (SgExpression *ear, SgStatement *st, int ilh);
-SgSymbol* CreateConsistentHeaderSymb(SgSymbol *ar);
-void EndOfProgramUnit(SgStatement *stmt, SgStatement *func, int begin_block);
-SgSymbol* BaseSymbol(SgSymbol *ar);
-void InitBaseCoeffs();
-void CreateIndexVariables(SgExpression *dol);
-SgSymbol* IndexSymbol(SgSymbol *si);
-void  doAssignIndexVar(SgExpression *dol,int iout, SgExpression *init[]);
-void ChangeIndexRefBySum(SgExpression *ve);
-SgExpression *TestDVMArrayRef(SgExpression *e);
-void ChangeArrayCoeff(SgSymbol *ar);
-SgSymbol *CreateInitLoopVar(SgSymbol *dovar, SgSymbol *init);
-SgSymbol* InitLoopSymbol(SgSymbol *si,SgType *t);
-void DerivedTypeMemory(SgType *t);
-SgSymbol* DerivedTypeBaseSymbol(SgSymbol *stype,SgType *t);
-SgSymbol* CommonSymbol(SgSymbol *stype);
-int StructureSize(SgSymbol *s);
-void ConsistentArrayList  (SgExpression *el,SgExpression *gref, SgStatement *st, SgStatement *stmt1, SgStatement *stmt2);
-void ConsistentArraysStart  (SgExpression *el);
-void EndConsistent_Task_Region(SgStatement *stmt);
-void doAxisTask(SgStatement *st, SgExpression *eref);
-void Consistent_Task_Region(SgStatement *stmt);
-//void TransModule(SgStatement *hedr);
-void TransBlockData(SgStatement *hedr,SgStatement* &end_of_unit);
-void VarDeclaration(SgStatement *stmt);
-void initF90Names();
-void initF90_DvmNames();
-void ALLOCATEf90_arrays(SgStatement *stmt, distribute_list *distr);
-void DEALLOCATEf90_arrays(SgStatement *stmt);
-void ALLOCATEf90DistArray(SgSymbol *p, SgExpression *desc, SgStatement *stdis, SgStatement *stmt);
-SgExpression * doSizeAllocArray(SgSymbol *ar, SgExpression *desc, SgStatement *st, int RTS_flag);
-void StoreLowerBoundsPlusOfAllocatable(SgSymbol *ar,SgExpression *desc);
-SgSymbol *FirstTypeField(SgType *t);
-SgSymbol *baseMemoryOfDerivedType(SgType *t);
-void NewSpecificationStatement(SgExpression *op, SgExpression *dvm_list, SgStatement *stmt);
-void AllocatePointerHeader(SgSymbol *ar,SgStatement *stmt);
-SgExpression *LeftMostField (SgExpression *e);
-SgExpression *RightMostField(SgExpression *e);
-int NumericTypeLength(SgType *t);
-SgExpression *StringLengthExpr(SgType *t, SgSymbol *s);
-SgExpression *LengthOfKindExpr(SgType *t, SgExpression *se, SgExpression *le);
-SgExpression * TypeLengthExpr(SgType *t);
-int IntrinsicTypeSize(SgType *t);
-void DeclareVarDVMForInterface(SgStatement *lstat, symb_list *distsymb);
-void DeleteShapeSpecDAr(SgStatement *stmt);
-SgStatement *InterfaceBody(SgStatement *hedr);
-SgStatement *InterfaceBlock(SgStatement *hedr);
-SgExpression  *DVMVarInitialization(SgExpression *es);
-SgExpression  *FileNameInitialization(SgExpression *es,char *name);
-SgStatement *CreateModuleProcedure(SgStatement *mod_hedr, SgStatement *lst, SgStatement* &has_contains);
-char* ModuleProcName(SgSymbol *smod);
-void GenForUseStmts(SgStatement *hedr,SgStatement *where_st);
-void GenForUseList(SgExpression *ul,SgStatement *stmt, SgStatement *where_st);
-void GenDVMArray(SgSymbol *ar, SgStatement *stmt, SgStatement *where_st);
-void GenCallForUSE(SgStatement *hedr,SgStatement *where_st);
-SgStatement *MayBeDeleteModuleProc(SgStatement *mod_proc,SgStatement *end_mod);
-int TestDVMDirectivesInModule(stmt_list *pstmt);
-int TestDVMDirectivesInProcedure(stmt_list *pstmt);
-int TestUseStmts();
-int ArrayAssignment(SgStatement *stmt);
-void MakeSection(SgExpression *are);
-SgExpression *AsyncArrayElement(SgExpression *asc, SgExpression *ei);
-SgSymbol *OriginalSymbol(SgSymbol *s);
-void DistributeArrayList(SgStatement *stdis);
-SgExpression *CurrentAM();
-SgSymbol *TaskAMVSymbol(SgSymbol *s);
-SgSymbol * CreateRegistrationArraySymbol();
-SgSymbol *Rename(SgSymbol *ar, SgStatement *stmt);
-SgExpression *ArraySection(SgExpression *are, SgSymbol *ar, int rank, SgStatement *stmt, int &init);
-int DistrArrayAssign(SgStatement *stmt);
-int AssignDistrArray(SgStatement *stmt);
-SgSymbol *CheckSummaSymbol();
-SgExpression *DebugIfCondition();
-SgExpression *DebugIfNotCondition();
-void InitDebugVar();
-SgStatement *LastStatementOfDoNest(SgStatement *first_do);
-void TranslateBlock (SgStatement *stat);
-SgStatement *CreateCopyOfExecPartOfProcedure();
-void  InsertCopyOfExecPartOfProcedure(SgStatement *stc);
-int lookForDVMdirectivesInBlock(SgStatement *first,SgStatement *last,int contains[] );
-SgSymbol *DebugGoToSymbol(SgType *t);
-int IsGoToStatement(SgStatement *stmt);
-int VarType_RTS(SgSymbol *var);
-int TestType_RTS(SgType *type);
-void CopyDvmBegin(SgStatement *entry,SgStatement *first_dvm_exec,SgStatement *last_dvm_entry);
-void DoStmtsForENTRY(SgStatement *first_dvm_exec,SgStatement *last_dvm_entry);
-void StructureProcessing(SgStatement *stmt);
-SgStatement *ProcessVarDecl(SgStatement *vd);
-void   ALLOCATEStructureComponent(SgSymbol *p, SgExpression *struct_e, SgExpression *desc, SgStatement *stmt);
-void StoreLowerBoundsPlusOfAllocatableComponent(SgSymbol *ar,SgExpression *desc, SgExpression *struct_);
-SgExpression * header_ref_in_structure (SgSymbol *ar, int n, SgExpression *struct_);
-void MarkCoeffsAsUsed();
-void LowerBoundInTriplet(SgExpression *e,SgSymbol *ar,int i, SgExpression *einit[]);
-void UpperBoundInTriplet(SgExpression *e,SgSymbol *ar,int i, SgExpression *einit[]);
-void DeleteSymbList(symb_list *ls);
-void TranslateFromTo(SgStatement *first, SgStatement *last, int error_msg);
-int isInternalOrModuleProcedure(SgStatement *header_st);
-SgSymbol *LastSymbolOfFile(SgFile *f);
-int TestType_DVMH(SgType *type);
-int TestType_RTS2(SgType *type);
-int CompareTypes(SgType *t1,SgType *t2);
-int isInterfaceRTS2(SgStatement *stdis);
-SgExpression *doDvmShapeList(SgSymbol *ar, SgStatement *st);
-SgExpression *doShapeList(SgSymbol *ar, SgStatement *st);
-SgExpression *AddElementToList(SgExpression *list, SgExpression *e);
-SgExpression *ListUnion(SgExpression *list1, SgExpression *list2);
-SgExpression *TypeSize_RTS2(SgType *type);
-SgExpression *DeclaredShadowWidths(SgSymbol *ar);
-void DerivedSpecification(SgExpression *edrv, SgStatement *stmt, SgExpression *eFunc[]);
-void Shadow_Add_Directive(SgStatement *stmt);
-SgExpression *CalcLinearForm(SgSymbol *ar, SgExpression *el, SgExpression *erec);
-SgSymbol *IOstatSymbol();
-void ShadowNames(SgSymbol *ar, int axis, SgExpression *shadow_name_list);
-int TestMaxDims(SgExpression *list, SgSymbol *ar, SgStatement *stmt);
-void TemplateDeclarationTest(SgStatement *stmt);
-int DeferredShape(SgExpression *eShape);
-void Template_Create(SgStatement *stmt);
-void Template_Delete(SgStatement *stmt);
-//void RenamingDvmArraysByUse(SgStatement *stmt);
-void RemovingDifferentNamesOfVar(SgStatement *first);
-void UpdateUseListWithDvmArrays(SgStatement *use_stmt);
-char *doOutFileName(const char *fdeb_name);
-int isWholeArray(SgExpression *ae);
-void AnalyzeAsynchronousBlock(SgStatement *dir);
-void InitFileNameVars();
-void CheckInrinsicNames();
-int DvmArrayRefInExpr (SgExpression *e);
-int DvmArrayRefInConstruct (SgStatement *stat);
-symb_list *SortingBySize(symb_list *redvar_list);
-
-/*  parloop.cpp */
-int ParallelLoop(SgStatement *stmt);
-int ParallelLoop_Debug(SgStatement *stmt);
-void EndOfParallelLoopNest(SgStatement *stmt, SgStatement *end_stmt, SgStatement *par_do,SgStatement *func);
-int TestParallelDirective(SgStatement *stmt, int nloop, int ndo, SgStatement *first_do);
-int TestParallelWithoutOn(SgStatement *stmt, int flag);
-void CheckClauses(SgStatement *stmt, SgExpression *clause[]);
-void StoreLoopPar(SgExpression *par[], int n, int ind, SgStatement*stl);
-void  NewVarList(SgExpression *nl,SgStatement *stmt);
-void Interface_1(SgStatement *stmt,SgExpression *clause[],SgSymbol *do_var[],SgExpression *init[],SgExpression *last[],SgExpression *step[],int nloop,int ndo,SgStatement *first_do,int iplp,int iout,SgStatement *stl,SgSymbol *newj,int ub);
-void Interface_2(SgStatement *stmt,SgExpression *clause[],SgExpression *init[],SgExpression *last[],SgExpression *step[],int nloop,int ndo,SgStatement *first_do);
-int doParallelLoopByHandler(int iplp, SgStatement *first, SgExpression *clause[], SgExpression *oldGroup, SgExpression *newGroup,SgExpression *oldGroup2, SgExpression *newGroup2);
-int CreateParallelLoopByHandler_H2(SgExpression *init[], SgExpression *last[], SgExpression *step[], int nloop);
-void MappingParallelLoop(SgStatement *stmt, int ilh );
-int WhatInterface(SgStatement *stmt);
-void CopyHeaderElems(SgStatement *st_after);
-void ChangeLoopInitPar(SgStatement*stl,int nloop, SgExpression *do_init[],SgStatement*after);
-int PositiveDoStep(SgExpression *step[], int i);
-int Analyze_DO_steps(SgExpression *step[], int step_mask[],int ndo);
-void CreateShadowGroupsForAccross(SgExpression *in_spec,SgExpression *out_spec,SgStatement * stmt,SgExpression *gleft,SgExpression *g,SgExpression *gright,int ag[],int all_steps,int step_mask[],SgExpression *tie_list);
-int doRecurLengthArrays(SgExpression *shl, SgSymbol *ar, SgStatement *st, int rtype, int all_steps,int sign[]);
-int RecurList (SgExpression *el, SgStatement *st, SgExpression *gref, int *ag,int gnum,int all_steps,int step_mask[],SgExpression *tie_list);
-void DefineLoopNumberForNegStep(int step_mask[], int n,int loop_num[]);
-void DefineStepSignForDimension( int step_mask[], int n, int loop_num[], int sign[] );
-SgExpression *FindArrayRefWithLoopIndexes(SgSymbol *ar, SgStatement *st,SgExpression *tie_list);
-void CreateShadowGroupsForAccrossNeg(SgExpression *in_spec,SgStatement * stmt,SgExpression *gleft,SgExpression *gright,int ag[],int all_positive_step,int loop_num[]);
-int Recurrences(SgExpression *shl, SgExpression *lrec[], SgExpression *rrec[],int n);
-int DepList (SgExpression *el, SgStatement *st, SgExpression *gref, int dep);
-int doDepLengthArrays(SgExpression *shl, SgSymbol *ar, SgStatement *st, int dep);
-void AcrossList(int ilh, int isOut, SgExpression *el, SgStatement *st, SgExpression *tie_clause);
-SgExpression *doLowHighList(SgExpression *shl, SgSymbol *ar, SgStatement *st);
-void ReceiveArray(SgExpression *spec_accr,SgStatement *parst);
-void SendArray(SgExpression *spec_accr);
-void ReductionList  (SgExpression *el,SgExpression *gref, SgStatement *st, SgStatement *stmt1, SgStatement *stmt2, int ilh2);
-void ReductionVarsStart (SgExpression *el);
-void ReductionVarsWait  (SgExpression *el);
-void    InsertReductions_H(SgExpression *red_op_list, int ilh);
-int LocElemNumber(SgExpression *en);
-int Reduction_Debug(SgStatement *stmt);
-int TestReductionClause(SgExpression *e);
-align *CopyAlignTreeNode(SgSymbol *ar);
-void InOutAcross(SgExpression *e, SgExpression* e_spec[], SgStatement *stmt);
-void InOutSpecification(SgExpression *ea, SgExpression* e_spec[]);
-SgExpression *AxisList(SgStatement *stmt, SgExpression *tied_array_ref);
-SgExpression *MappingList(SgStatement *stmt, SgExpression *aref);
-SgExpression *isInTieList(SgSymbol *ar, SgExpression *tie_list);
-SgExpression *FindArrayRef(SgSymbol *ar, SgStatement *st);
-
-/*  acc.cpp */
-SgStatement *RegistrateDVMArray(SgSymbol *ar,int ireg,int inflag,int outflag);
-void RegisterVariablesInRegion(SgExpression *evl, int intent, int irgn);
-int TargetsList(SgExpression *tgs);
-void ACC_ROUTINE_Directive(SgStatement *stmt);
-SgStatement *ACC_REGION_Directive(SgStatement *stmt);
-SgStatement *ACC_END_REGION_Directive(SgStatement *stmt);
-SgStatement *ACC_DATA_REGION_Directive(SgStatement *stmt);
-SgStatement *ACC_END_DATA_REGION_Directive(SgStatement *stmt);
-SgStatement *ACC_DO_Directive(SgStatement *stmt);
-SgStatement *ACC_Directive(SgStatement *stmt);
-int isACCdirective(SgStatement *stmt);
-void NewRegion(SgStatement *stmt, int n, int data_flag);
-void TempVarACC(SgStatement * func );
-SgSymbol* DerivedTypeGpuBaseSymbol(SgSymbol *stype,SgType *t);
-void Gpu_ArrayHeader (SgSymbol *ar,int ind);
-void TypeGpuMemory(SgType *t);
-void DerivedTypeGpuMemory(SgType *t);
-SgSymbol *baseGpuMemory(SgType *t);
-SgSymbol* GpuHeaderSymbol(SgSymbol *ar);
-SgExpression * GpuHeaderRef(SgSymbol *ar) ;
-SgExpression * GpuHeaderRefWithInd(SgSymbol *ar,int i);
-SgSymbol *baseGpuMemoryOfDerivedType(SgType *t);
-void DeclareVarGPU(SgStatement *lstat, SgType *tlen);
-void BlocksThreadsSymbols();
-void AllocateGPUBases(SgStatement *stat);
-void ACC_ParallelLoopEnd(SgStatement *pardo);
-void ACC_CreateParallelLoop(int iplp,SgStatement *first_do,int nloop,SgStatement *par_dir,SgExpression *clause[],int interface);
-SgStatement *doIfThenConstrForLoop_GPU(SgExpression *ref,SgStatement *endhost,SgStatement *dowhile);
-SgSymbol *KernelSymbol(SgStatement *st_do);
-void Blocks_Off_Symbol();
-void InitializeACC();
-void InitializeAcrossACC();
-void InitializeInFuncACC();
-SgSymbol *GPUModuleSymb(SgStatement *global_st);
-void CreateGPUModule();
-char *filenameACC();
-SgSymbol *CudaforSymb(SgStatement *global_st);
-void InsertUseStatementForGpuModule();
-SgStatement *CreateKernelProcedure(SgSymbol *skernel);
-SgStatement *CopyBodyLoopToKernel(SgStatement *first_do);
-SgType *Type_dim3();
-void CudaVars();
-SgExpression *CreateBlocksThreadsSpec(int size, SgSymbol *s_blocks,SgSymbol *s_threads,SgSymbol *s_stream,SgSymbol *s_shared_mem);
-SgExpression *KernelCondition(SgSymbol *sind,SgSymbol *sblock,int level);
-SgExpression *KernelConditionWithDoStep(SgStatement *stdo,SgSymbol *sblock, int level);
-void KernelWorkSymbols();
-SgSymbol *ArraySymbol(char *name,SgType *basetype, SgExpression *range,SgStatement *scope);
-SgSymbol *ArraySymbol(const char *name, SgType *basetype, SgExpression *range, SgStatement *scope);
-SgStatement *Assign_To_ibof(int rank);
-SgExpression *ExpressionForIbof(int rank);
-SgStatement *DoStmt(SgStatement *first_do,int i);
-SgStatement *Assign_To_IndVar(SgStatement *dost, int il, int nloop,SgSymbol *sblock);
-SgExpression *IbaseRef(SgSymbol *base, int ind);
-void CreatePrivateAndUsesVarList();
-SgExpression * AddToVarRefList( SgExpression *list, SgExpression *e);
-SgExpression * AddListToList( SgExpression *list, SgExpression *el);
-void CreateDvmArrayList();
-void CreateRegionVarList();
-void CreateArgumentList();
-int KindOfIndexType();
-void MakeDeclarationsForKernel(SgSymbol *red_count_symb, SgType *idxTypeInKernel);
-void MakeDeclarationsForKernel_On_C(SgType *idxTypeInKernel);
-SgSymbol *K_baseMemory(SgType *t);
-char *ChangeFtoCuf(const char *fout_name);
-char *ChangeFto_C_Cu(const char *fout_name);
-char *ChangeFto_info_C(const char *fout_name);
-char *ChangeFto_cpp(const char *fout_name);
-void UpdateOnHost(SgExpression *el, SgStatement *stmt);
-SgStatement *ACC_UPDATE_Directive(SgStatement *stmt);
-void InsertReductions_GPU(SgExpression *red_op_list,SgStatement *do_while, int loop_ind);
-SgSymbol *Var_Offset_Symbol(SgSymbol *var);
-int    MaxRedVarSize(SgExpression *red_op_list);
-SgExpression *ThreadsGreedSize();
-void InsertDoWhileForRedCount(SgStatement *cp);
-void InsertDoWhileForRedCount_C(SgStatement *cp,SgSymbol *s_threads,SgSymbol *red_count_symb);
-SgSymbol *RedCountSymbol(SgStatement *scope);
-SgSymbol *OverallBlocksSymbol();
-void AddBasesOfReductionVars();
-void AddToRedVarList(SgExpression *ev,int i);
-SgExpression *CreateRedOffsetVarList();
-SgExpression *FindUsesInFormalArgumentList();
-SgSymbol *RedOffsetSymbolInKernel(SgSymbol *s);
-SgSymbol *RedBlockSymbolInKernel(SgSymbol *s,SgType *type);
-void CreateReductionBlocks(SgStatement *stat,int nloop,SgExpression *red_op_list,SgSymbol *red_count_symb);
-SgSymbol *IndVarInKernel(SgSymbol *s);
-void ReductionBlockInKernel(SgStatement *stat,int nloop,SgSymbol *i_var,SgSymbol *j_var,SgExpression *ered, reduction_operation_list *rsl,SgSymbol *red_count_symb,int n);
-void ReductionBlockInKernel_On_C_Cuda(SgStatement*, SgSymbol*, SgExpression*, reduction_operation_list*, SgIfStmt*, SgIfStmt*&, SgIfStmt*&, int&, bool withGridRed = false, bool across = false);
-SgSymbol *SyncthreadsSymbol();
-const char* RedFunctionInKernelC(const int num_red, const unsigned num_E, const unsigned num_IE);
-SgStatement *RedOp_Assign(SgSymbol *i_var, SgSymbol *s_block, SgExpression *ered, SgSymbol *d, int k, SgExpression *ind_list);
-SgExpression *RedVar_Block_Ref(SgSymbol *sblock, SgSymbol *sind);
-SgExpression *RedVar_Block_2D_Ref(SgSymbol *sblock, SgSymbol *sind, SgExpression *redind);
-SgExpression *RedArray_Block_Ref(SgSymbol *sblock, SgSymbol *sind, SgExpression *ind_list);
-SgSymbol *RedOffsetSymbolInKernel_ToList(SgSymbol *s);
-SgType *Type_For_Red_Loc(SgSymbol *redsym, SgSymbol *locsym, SgType *redtype, SgType *loctype);
-SgType *TypeOfRedBlockSymbol(SgExpression *ered);
-SgStatement * MakeStructDecl(SgSymbol *strc);
-void TypeGpuMemoryForArray(SgType *t, int n);
-SgSymbol*GpuBaseSymbolForLocArray(int n);
-SgSymbol*K_GpuBaseSymbolForLocArray(int n);
-SgSymbol *LocArrayBaseGpuMemory(SgType *t,int n);
-SgSymbol *FormalLocationSymbol(SgSymbol *locvar, int i);
-SgExpression *CreateFormalLocationList(SgSymbol *locvar, int numb);
-void Do_Assign_For_Loc_Arrays();
-SgSymbol *RedVarFieldSymb(SgSymbol *s_block);
-SgExpression *RedLocVar_Block_Ref(SgSymbol *sblock, SgSymbol *sind, SgSymbol *d, SgExpression *field);
-SgExpression *LocVarIndex(SgSymbol *sl, int i);
-SgExpression *RedVarIndex(SgSymbol *sl, int i);
-SgStatement *RedOp_If(SgSymbol *i_var, SgSymbol *s_block, SgExpression *ered, SgSymbol *d,int num);
-SgExpression *ConditionForRedBlack(SgExpression *erb);
-void AddFormalArg_For_LocArrays();
-void AddActualArg_For_LocArrays();
-SgExpression *CreateActualLocationList(SgSymbol *locvar, int numb);
-int Create_New_File(char *file_name, SgFile *file, char *fout_name);
-void UnparseTo_CufAndCu_Files(SgFile *f,FILE *fout_cuf, FILE *fout_C_cu, FILE *fout_info);
-void UnparseForDynamicCompilation(FILE *fout_cpp);
-void Create_C_extern_block();
-void Create_info_block();
-SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter);
-SgStatement *Create_C_Adapter_Function(SgSymbol *sadapter, int pos);
-SgStatement *Create_C_Adapter_Function_For_Sequence(SgSymbol *sadapter,SgStatement *first_st);
-void Prototypes();
-void Typedef_Stmts(SgStatement *end_bl);
-SgType *Cuda_Index_Type();
-SgType *DvmhLoopRef_Type();
-SgType *Dvmh_Type();
-SgType * C_VoidType();
-SgType * C_LongType();
-SgType *C_PointerType(SgType *type);
-SgType *C_ReferenceType(SgType *type);
-SgSymbol *AdapterSymbol(SgStatement *st_do);
-SgType *C_Derived_Type(SgSymbol *styp);
-SgStatement *Create_Init_Cuda_Function();
-SgStatement * makeSymbolDeclaration(SgSymbol *s);
-SgStatement * makeSymbolDeclarationWithInit(SgSymbol *s,SgExpression *einit);
-SgStatement * makeExternSymbolDeclaration(SgSymbol *s);
-SgExpression * addDeclExpList(SgSymbol *s,SgExpression *el);
-char *GpuHeaderName(SgSymbol *s) ;
-SgExpression *ThreadsGridSize(SgSymbol *s_threads);
-char *filename_short(SgStatement *st);
-void ChangeAdapterName(SgSymbol *s);
-SgSymbol *HostProcSymbol(SgStatement *st_do);
-SgSymbol *IndirectFunctionSymbol(SgStatement *stmt, char *name);
-void DeviceTypeConsts();
-SgSymbol *DeviceTypeConst(int i);
-char *ParallelLoopComment(int line);
-char *SequenceComment(int line);
-const char *CudaIndexTypeComment();
-SgExpression *ArrayArgumentList();
-SgExpression *BaseArgumentList();
-void  CudaBlockSize(SgExpression *cuda_block_list);
-void  CudaBlockSize(SgExpression *cuda_block_list,SgExpression *esize[]);
-int ListElemNumber(SgExpression *list);
-SgStatement *Create_Host_Across_Loop_Subroutine(SgSymbol *sHostProc);
-SgStatement *Create_Host_Loop_Subroutine_Main(SgSymbol *sHostProc);
-SgStatement *Create_Host_Loop_Subroutine(SgSymbol *sHostProc, int type);
-char * BoundName(SgSymbol *s, int i, int isLower);
-SgSymbol *DummyBoundSymbol(SgSymbol *rv, int i, int isLower, SgStatement *st_hedr);
-SgExpression *CreateDummyBoundListOfArray(SgSymbol *ar, SgSymbol *new_ar, SgStatement *st_hedr);
-SgExpression * DummyListForReductionArrays(SgStatement *st_hedr);
-SgExpression *CreateBaseMemoryList();
-SgExpression *ConstRef_F95(int ic);
-SgExpression *DvmType_Ref(SgExpression *e);
-int ParLoopRank();
-void DeclareArrayCoefficients(SgStatement *after);
-void ReplaceLoopBounds(SgStatement *first_do, int lrank,SgSymbol *s_low_bound, SgSymbol *s_high_bound, SgSymbol *s_step); 
-int NumberOfCoeffs(SgSymbol *sg);
-void    CreateStructuresForReductionInKernel();
-void CompleteStructuresForReductionInKernel();
-SgStatement *CreateLoopKernelProcedure(SgSymbol *skernel);
-int OneSteps(int nl,SgStatement *nest);
-int IConstStep(SgStatement *stdo);
-SgExpression *blocksRef(SgSymbol *sblock, int ind);
-SgType *CudaIndexType();
-int KindOfCudaIndexType();
-SgType *CudaOffsetType();
-void SymbolOfCudaOffsetType();
-void KernelBloksSymbol();
-int IConstStep(SgStatement *stdo);
-SgSymbol *RedGridSymbolInKernel(SgSymbol *s,int n,SgExpression *dimSizeArgs,SgExpression *lowBoundArgs,int is_red_or_loc_var);
-SgStatement *CopyBodyLoopForCudaKernel(SgStatement *first_do, int nloop);
-SgStatement *CreateIfForRedBlack(SgStatement *loop_body, int nloop);
-SgExpression *CreateKernelDummyList(SgSymbol *s_red_count_k, SgType *idxTypeInKernel);
-SgExpression* CreateRedDummyList();
-SgExpression* CreateRedDummyList(SgType* indeTypeInKernel);
-SgExpression *CreateArrayDummyList();
-SgExpression* CreateArrayDummyList(SgType* indexType);
-SgSymbol* KernelDummyVar(SgSymbol* s);
-SgExpression *CoefficientList();
-SgExpression *ArrayRefList();
-SgExpression *UsedValueRef(SgSymbol *susg,SgSymbol *s);
-SgType *C_Type(SgType *type);
-void UsesInPrivateArrayDeclarations(SgExpression *privates);
-SgExpression *UsesList(SgStatement *first,SgStatement *last);
-void RefInExpr(SgExpression *e, int mode);
-SgStatement *InnerMostLoop(SgStatement *dost,int nloop);
-int isPrivate(SgSymbol *s);
-int isReductionVar(SgSymbol *s);
-void    CreateStructuresForReductions(SgExpression *red_op_list); 
-SgExpression *isInUsesList(SgSymbol *s);
-SgExpression *isInUsesListByChar(const char *symb);
-//int isIntrinsicFunction(SgSymbol *sf);
-//int IntrinsicInd(SgSymbol *sf);
-
-void Call(SgSymbol *s, SgExpression *e);
-void Argument(SgExpression *e, int i, SgSymbol *s);
-SgSymbol *FunctionResultVar(SgStatement *func);
-int isParDoIndexVar(SgSymbol *s);
-SgSymbol *IntentConst(int intent);
-int SectionBounds(SgExpression *are);
-SgExpression *SectionBoundsList(SgExpression *are);
-char *RegionComment(int line);
-char *EndRegionComment(int line);
-//SgExpression *DevicesExpr(int targets[]);
-SgExpression *DevicesExpr(int targets);
-SgStatement *ACC_ACTUAL_Directive(SgStatement *stmt);
-SgStatement *ACC_GET_ACTUAL_Directive(SgStatement *stmt);
-void DoPrivateList(SgStatement *par);
-int AnalyzeRegion(SgStatement *reg_dir);
-void MarkArraySymbol(SgSymbol *ar,int mode);
-void RegisterUses(int irgn);
-void RegisterDvmArrays(int irgn);
-int IntentMode(SgSymbol *s);
-int WhatMode(int mode,int mode_new);
-void MarkAsRegistered(SgSymbol *s);
-void HandlerTypeConsts();
-SgSymbol *HandlerTypeConst(int i);
-SgSymbol *RegionRegimConst(int regim);
-int IntStepForHostHandler(SgExpression *dostep );
-SgExpression *IsRedBlack(int nloop);
-void FlagStatement(SgStatement *st);
-SgStatement *ACC_CreateStatementGroup(SgStatement *first_st);
-SgStatement *CopyBlockToKernel(SgStatement *first_st,SgStatement *last_st);
-SgSymbol *isSymbolWithSameNameInTable(SgSymbol *first_in,char *name);
-void ACC_RenewParLoopHeaderVars(SgStatement *first_do, int nloop);
-void RefIn_LoopHeaderExpr(SgExpression *e,SgStatement *dost);
-SgSymbol *RemoteAccessBufferInKernel(SgSymbol *ar,int rank);
-SgSymbol *isSameNameBuffer(char *name,SgExpression *rml);
-SgExpression *RemoteAccessHeaderList();
-void CreateRemoteAccessBuffersUp();
-void CreateRemoteAccessBuffers(SgExpression *rml, int pl_flag);
-coeffs *BufferCoeffs(SgSymbol *sbuf,SgSymbol *ar);
-void AddRemoteAccessBufferList_ToArrayList();
-SgExpression * ExpressionListsUnion(SgExpression *list, SgExpression *alist);
-SgExpression *isInExprList(SgExpression *e,SgExpression *list);
-symb_list *isInSymbList(SgSymbol *s, symb_list *slist);
-symb_list *isInSymbListByChar(SgSymbol *s, symb_list *slist);
-symb_list *SymbolListsUnion(symb_list *slist1, symb_list *slist2);
-void UnregisterVariables(int begin_block);
-int isDestroyable(SgSymbol *s);
-int isLocal(SgSymbol *s);
-//void InsertDestroyBlock(SgStatement *st);
-void ACC_UnregisterDvmBuffers();
-void ACC_RegisterDvmBuffer(SgExpression *bufref, int buffer_rank);
-SgSymbol *isSameNameShared(char *name);
-void Doublet(SgExpression *e,SgSymbol *ar,int i, SgExpression *einit[],SgExpression *elast[]);
-void ACC_StoreLowerBoundsOfDvmBuffer(SgSymbol *s, SgExpression *dim[], int dim_num[], int rank, int ibuf, SgStatement *stmt);
-void ACC_Before_Loadrb(SgExpression *bufref);
-void ACC_Region_After_Waitrb(SgExpression *bufref);
-SgExpression *BufferLowerBound(SgExpression *ei);
-SgExpression *DoStart(SgSymbol *dovar);
-SgExpression *ReplaceIndexRefByLoopLowerBound(SgExpression *e,SgSymbol *dovar,SgExpression *estart);
-SgSymbol *DummyReplicatedArray(SgSymbol *ar,int rank);
-void  doStatementsToPerformByHandler(int ilh, SgSymbol *adapter_symb, SgSymbol *hostproc_symb,int is_parloop,int interface);
-int CreateLoopForSequence(SgStatement *first);
-void ACC_ReductionVarsAreActual();
-SgExpression *DoReductionOperationList(SgStatement *par);
-SgStatement *Create_Empty_Stat();
-void DoHeadersForNonDvmArrays();
-int HeaderForNonDvmArray(SgSymbol *s, SgStatement *stat);
-SgExpression *HeaderForArrayInParallelDir(SgSymbol *ar, SgStatement *st, int err_flag);
-SgSymbol *CreateReplicatedArray(SgSymbol *s);
-void StoreLowerBoundsOfNonDvmArray(SgSymbol *ar);
-void DeleteNonDvmArrays();
-int isIn_acc_array_list(SgSymbol *s);
-void TransferBlockToHostSubroutine(SgStatement *first_st,SgStatement *last_st,SgStatement *st_end);
-SgStatement *Create_Host_Sequence_Subroutine(SgSymbol *sHostProc,SgStatement *first_st,SgStatement *last_st);
-void MarkAsInsertedStatement(SgStatement *st);
-void TestDvmObjectAssign(SgStatement *st);
-void ReplaceAssignByIfForRegion(SgStatement *stmt);
-SgSymbol *indexArraySymbol(SgSymbol *ar);
-int MaxArrayRank();
-SgSymbol *LocalPartSymbolInKernel(SgSymbol *ar);
-SgSymbol *LocalPartArray(SgSymbol *ar);
-SgExpression *LocalityConditionInKernel(SgSymbol *ar, SgExpression *ei[]);
-void MakeDeclarationsInKernel_ForSequence(SgType*);
-SgExpression *CreateKernelDummyList_ForSequence(SgType *idxTypeInKernel);
-SgExpression *CreateLocalPartList();
-SgExpression *CreateLocalPartList(SgType *indeTypeInKernel);
-int isByValue(SgSymbol *s);
-int isInByValueList(SgSymbol *s);
-SgSymbol *GpuScalarAdrSymbolInAdapter(SgSymbol *s, SgStatement *st_hedr);
-int CorrectIntent(SgExpression *e);
-char *TestAndCorrectName(const char *name);
-char *TestAndCorrectName(char *name);
-SgSymbol *isSameNameInLoop(char *name);
-SgSymbol *isSamePrivateVar(char *name);
-SgSymbol *isSameUsedVar(char *name);
-SgSymbol *isSameRedVar(char *name);
-SgSymbol *isSameArray(char *name);
-SgSymbol *isSameIndexVar(char *name);
-SgType * C_LongLongType();
-SgType * C_UnsignedLongLongType();
-SgType * C_DvmType();
-SgType * C_CudaIndexType();
-char *OpenMpComment_HandlerType(int idvm);
-char *OpenMpComment_InitFlags(int idvm);
-void SymbolOfCudaIndexType();
-SgType * C_BaseDvmType();
-SgStatement *CreateLoopKernelFunction_On_C (SgSymbol *skernel);
-SgStatement *Create_C_Kernel_Function(SgSymbol *sF);
-void  CreateBlockForCalculationThreadLoopVariables();
-SgStatement *FunctionCallStatement(SgSymbol *sf );
-SgStatement *AssignStatement(SgExpression *le, SgExpression *re);
-SgStatement *Declaration_Statement(SgSymbol *s );
-char *LoopKernelComment();
-char *SequenceKernelComment(int lineno);
-char *Cuda_LoopHandlerComment();
-char *Cuda_SequenceHandlerComment(int lineno);
-char *Host_LoopHandlerComment();
-char *Host_SequenceHandlerComment(int lineno);
-char *Indirect_ProcedureComment(int lineno);
-void SymbolChange_InBlock(SgSymbol *snew,SgSymbol *sold, SgStatement *first_st,SgStatement *last_st);
-void SymbolChange_InExpr(SgSymbol *snew, SgSymbol *sold, SgExpression *e);
-//void ACC_ShadowCompute(SgExpression *shadow_compute_list, SgStatement *st_shcmp);
-int isOutArray(SgSymbol *s) ;
-void doStatementsForShadowCompute(int ilh, int interface);
-SgSymbol *doDeviceNumVar(SgStatement *st_hedr, SgStatement *st_exec, SgSymbol *s_dev_num,SgSymbol *s_loop_ref);
-char *CommentLine(const char *txt);
-int  WithAcrossClause();
-SgExpression *CreateUsesDummyList();
-SgExpression *ThreadIdxRefExpr(char *xyz);
-SgExpression *ThreadIdxRefExpr(const char *xyz);
-SgExpression *BlockIdxRefExpr(char *xyz);
-SgExpression *BlockIdxRefExpr(const char *xyz);
-SgStatement * CreateKernel_ForSequence(SgSymbol *kernel_symb, SgStatement *first_st, SgStatement *last_st, SgType *idxTypeInKernel);
-SgSymbol *KernelDummyLocalPart(SgSymbol *s);
-SgSymbol *KernelDummyPointerVar(SgSymbol *s);
-SgStatement *CreateLoopKernel(SgSymbol *skernel, SgType *idxTypeInKernel);
-SgStatement *CreateLoopKernel(SgSymbol *skernel, AnalyzeReturnGpuO1 &infoGpuO1, SgType *idxTypeInKernel);
-char * DimSizeName(SgSymbol *s,int i);
-SgExpression *MallocExpr(SgSymbol *var,SgExpression *eldim);
-SgSymbol *FormalDimSizeSymbol(SgSymbol *var, int i);
-SgSymbol *FormalLowBoundSymbol(SgSymbol *var, int i);
-SgExpression *CreateFormalDimSizeList(SgSymbol *var);
-SgExpression *CreateFormalLowBoundList(SgSymbol *var);
-SgExpression * RangeOfRedArray(SgSymbol *s, SgExpression *lowBound, SgExpression *dimSize, int i);
-void ArrayTypeForRedVariableInKernel(SgSymbol *s, SgType *type, SgExpression *dimSizeArgs, SgExpression *lowBoundArgs);
-SgSymbol *RedInitValSymbolInKernel(SgSymbol *s, SgExpression *dimSizeArgs, SgExpression *lowBoundArgs);
-SgSymbol *InitValSymbolForRedInAdapter(SgSymbol *s, SgStatement *st_hedr);
-SgSymbol *IndexSymbolForRedVarInKernel(int i);
-SgExpression *RedVarUpperBound(SgExpression *el,int i);
-SgExpression *CreateIndexVarList(int N);
-SgStatement *doLoopNestForReductionArray(reduction_operation_list *rl, SgStatement *ass);
-SgSymbol *IndexLoopVar(int i);
-SgExpression *SubscriptListOfRedArray(SgSymbol *ar);
-SgSymbol *RedVariableSymbolInKernel(SgSymbol *s, SgExpression *dimSizeArgs, SgExpression *lowBoundArgs);
-SgExpression *DimSizeListOfReductionArrays();
-SgExpression *isConstantBound(SgSymbol *rv, int i, int isLower);
-SgExpression *CreateBoundListOfArray(SgSymbol *ar);
-SgExpression * BoundListOfReductionArrays();
-SgStatement * makeSymbolDeclaration_T(SgStatement *st_hedr);
-void CreateComplexTypeSymbols(SgStatement *st_bl);
-void SaveLineNumbers(SgStatement *stat_copy);
-SgSymbol *SymbolInKernel(SgSymbol *s);
-SgExpression *ToInt(SgExpression *e);
-void ParallelOnList(SgStatement *par);
-SgExpression *ACC_GroupRef(int ind);
-SgExpression *dim3FunctionCall(int i);
-SgType *CudaOffsetTypeRef_Type();
-int IsInLabelList(SgLabel *lab, stmt_list *labeled_list);
-void ReplaceExitCycleGoto(SgStatement *block, SgStatement *stk);
-int IsParDoLabel(SgLabel *lab, int pl_rank);
-int isInLoop(SgStatement *stmt);
-void  ReplaceCaseStatement(SgStatement *first);
-void FormatAndDataStatementExport(SgStatement *par_dir, SgStatement *first_do);
-void AddExternStmtToBlock_C();
-void  GenerateStmtsForInfoFile();
-char *Up_regs_Symbol_Name(SgSymbol *s_regs);
-SgStatement *AssignBlocksSElement(int i,int pl_rank, SgSymbol *s_blocksS,SgSymbol *s_idxL,SgSymbol *s_idxH,SgSymbol *s_step,SgSymbol *s_threads);
-char *IncludeComment(const char *txt);
-char *DefineComment(char *txt);
-void TypeSymbols(SgStatement *end_bl);
-void GenerateEndIfDir();
-void GenerateDeclarationDir();
-SgStatement *Assign_To_cur_blocks(int i, int nloop);
-SgStatement *Assign_To_rest_blocks(int i);
-SgStatement *Assign_To_IndVar2(SgStatement *dost, int i, int nloop);
-SgExpression *KernelCondition2(SgStatement *dost, int level);
-void InsertAssignForReduction(SgStatement *st_where,SgSymbol *s_num_of_red_blocks,SgSymbol *s_fill_flag,SgSymbol *s_overallBlocks, SgSymbol *s_threads, SgSymbol *s_loop_ref);
-void  InsertPrepareReductionCalls(SgStatement *st_where,SgSymbol *s_loop_ref,SgSymbol *s_num_of_red_blocks,SgSymbol *s_fill_flag,SgSymbol *s_red_num);
-void InsertFinishReductionCalls(SgStatement *st_where,SgSymbol *s_loop_ref,SgSymbol *s_red_num);
-SgStatement *IfForHeader(SgSymbol *s_restBlocks, SgSymbol *s_blocks, SgSymbol *s_max_blocks);
-int testLabelUse(SgLabel *lb, int pl_rank, SgStatement *stmt);
-SgExpression * LinearIndex(int ind, int L);
-int TestGroupStatement(SgStatement *first,SgStatement *last);
-int TestOneGroupStatement(SgStatement *stmt);
-void DeclareUsedVars();
-void DeclareInternalPrivateVars();
-void DeclarePrivateVars();
-void DeclarePrivateVars(SgType *idxTypeInKernel);
-void DeclareArrayBases();
-void DeclareArrayCoeffsInKernel(SgType*);
-void DeclareLocalPartVars();
-void DeclareLocalPartVars(SgType*);
-void DeclareDummyArgumentsForReductions(SgSymbol *red_count_symb, SgType*);
-int isPrivateInRegion(SgSymbol *s);
-void DeclareDoVars();
-int is_acc_array(SgSymbol *s);
-SgExpression *CreateArrayAdrList(SgSymbol *header_symb, SgStatement *st_host);
-char *Header_DummyArgName(SgSymbol *s);
-SgExpression *Dimension(SgSymbol *hs, int i, int rank);
-SgSymbol *DummyDvmHeaderSymbol(SgSymbol *ar, SgStatement *st_hedr);
-SgSymbol *DummyDvmArraySymbol(SgSymbol *ar,SgSymbol *header_symb);
-SgSymbol *DummyDvmBufferSymbol(SgSymbol *ar, SgSymbol *header_symb);
-SgExpression *ElementOfAddrArgumentList(SgSymbol *s);
-SgExpression *AddrArgumentList();
-void CompareReductionAndPrivateList();
-void TestPrivateList();
-void doNotForCuda();
-char * DevicesString(int targets);
-int GeneratedForCuda();
-void RefInControlList(SgExpression *eoc[],int n);
-void RefInControlList_Inquire(SgExpression *eoc[],int n);
-void RefInIOList(SgExpression *iol, int mode);
-void RefInImplicitLoop(SgExpression *eim, int mode);
-SgSymbol *dvm000SymbolForHost(int host_dvm, SgStatement *hedr);
-SgExpression *Red_grid_index(SgSymbol *sind);
-SgExpression *BlockDimsProduct();
-SgExpression *LowerShiftForArrays (SgSymbol *ar, int i, int type);
-SgExpression *UpperShiftForArrays (SgSymbol *ar, int i);
-SgExpression *coefProd(int i, SgExpression *ec);
-SgExpression *LinearFormForRedArray (SgSymbol *ar,  SgExpression *el, reduction_operation_list *rsl);
-void CreateCalledFunctionDeclarations(SgStatement *st_hedr);
-void CreateUseStatementsForCalledProcedures(SgStatement *st_hedr);
-void CreateUseStatementsForDerivedTypes(SgStatement *st_hedr);
-void CreateUseStatements(SgStatement *st_hedr);
-SgStatement *CreateHostProcedure(SgSymbol *sHostProc);
-void DeclareCalledFunctions();
-int isForCudaRegion();
-SgSymbol *CudaIndexConst();
-char *CalledProcedureComment(const char *txt, SgSymbol *symb);
-SgSymbol *KernelDummyArray(SgSymbol *s);
-void ConstantSubstitutionInTypeSpec(SgExpression *e);
-int TestLocal(SgExpression *list);
-void EnterDataRegionForLocalVariables(SgStatement *st, SgStatement *first_exec, int begin_block);
-void EnterDataRegionForAllocated(SgStatement *stmt);
-void EnterDataRegion(SgExpression *ale,SgStatement *stmt);
-void EnterDataRegionForVariablesInMainProgram(SgStatement *st);
-void ExitDataRegionForVariablesInMainProgram(SgStatement *st);
-void ExitDataRegion(SgExpression *ale,SgStatement *stmt);
-int  ExitDataRegionForAllocated(SgStatement *st,int begin_block);
-void ExitDataRegionForLocalVariables(SgStatement *st, int is);
-void DeclareDataRegionSaveVariables(SgStatement *lstat, SgType *tlen);
-SgSymbol *DataRegionVar(SgSymbol *symb);
-void ExtractCopy(SgExpression *elist);
-void CleanAllocatedList();
-SgStatement *CreateIndirectDistributionProcedure(SgSymbol *sProc,symb_list *paramList,symb_list *dummy_index_list,SgExpression *derived_elem_list,int flag);
-SgExpression *FirstArrayElementSubscriptsForHandler(SgSymbol *ar);
-SgExpression *FirstArrayElementSubscriptsOfPrivateArray(SgSymbol *s);
-SgSymbol *HeaderSymbolForHandler(SgSymbol *ar);
-void TestRoutineAttribute(SgSymbol *s, SgStatement *routine_interface);
-int LookForRoutineDir(SgStatement *interfaceFunc);
-SgStatement *Interface(SgSymbol *s);
-SgExpression *sizeOfElementInBytes(SgSymbol *symb);
-SgExpression *sizeOfPrivateArraysInBytes();
-SgExpression *ProductOfDimSizeArgs(SgExpression *esizes);
-//void doPrivateArrayList(SgExpression *private_arrays, SgStatement *st_hedr);
-void addPrivateArrayList(SgFunctionCallExp *fcall, SgExpression *private_arrays, SgStatement *st_hedr);
-int TestArrayShape(SgSymbol *ar);
-SgExpression *DimSizeListOfPrivateArrays();
-SgExpression *BoundListOfPrivateArrays();
-SgExpression * DummyListForPrivateArrays(SgStatement *st_hedr);
-SgExpression *CreatePrivateDummyList();
-char *PointerNameForPrivateArray(SgSymbol *symb);
-void GetMemoryForPrivateArrays(SgSymbol *private_first, SgSymbol *s_loop_ref, int nump, SgStatement *st_end, SgStatement *st_hedr, SgExpression *e_totalThreads);
-SgSymbol *LocRedVariableSymbolInKernel(reduction_operation_list *rsl);
-int PrivateArrayClassUse(SgExpression *e_all_private_size);
-SgExpression *CalculateSizeOfPrivateArraysInBytes();
-SgExpression *ElementOfPrivateList(SgSymbol *ar);
-void testDeclareDirectives(SgStatement *first_dvm_exec);
-void ACC_DECLARE_Directive(SgStatement *stmt);
-SgStatement *makeClassObjectDeclaration(SgSymbol *s, SgSymbol *sp, SgStatement *header_st, SgType *idxType, SgExpression *dim_list, int flag_true);
-
-/*   acc_analyzer.cpp   */
-//void Private_Vars_Analyzer(SgStatement *firstSt, SgStatement *lastSt);
-//void Private_Vars_Function_Analyzer(SgStatement* start);
-void Private_Vars_Project_Analyzer();
-void TieList(SgStatement *par);
-symb_list *isNameInSymbList(SgSymbol *s, symb_list *s_list);
-SgSymbol *KernelDummyHeader(SgSymbol *s, SgType *indexTypeInKernel);
-
-/*  hpf.cpp    */ 
-int SearchDistArrayRef(SgExpression *e, SgStatement *stmt);
-void BufferDistArrayRef(SgExpression *e, SgStatement *stmt);
-int IndependentLoop_Debug(SgStatement *stmt);
-int IndependentLoop(SgStatement *stmt);
-void SkipIndepLoopNest(SgStatement *stmt);
-SgExpression *ConnectNewList(SgExpression *el1, SgExpression *el2);
-void IEXLoopAnalyse(SgStatement *func);
-void IEXLoopBegin(SgStatement *st);
-void INDLoopBegin();
-int doAlignIterationIND();
-void ReductionListIND1();
-void ReductionListIND2(SgExpression *gref);
-void ReductionListIND_Err();
-void OffDoVarsOfNest(SgStatement *end_stmt);
-void  IND_UsedDistArrayRef(SgExpression *e, SgStatement *st);
-SgExpression *IND_ModifiedDistArrayRef(SgExpression *e, SgStatement *st);
-void  RemoteVariableListIND();
-void INDReductionDebug();
-int AxisNumOfDoVarInExpr (SgExpression *e, SgSymbol *dovar_ident[], int ni, SgExpression **eref, int use[], int *pINuse, SgStatement *st);
-int isNewVar(SgSymbol *s);
-int isINDtarget(SgExpression *re);
-IND_ref_list *isInINDrefList(SgExpression *re);
-SgExpression *INDBufferHeaderNplus1(IND_ref_list *rme, SgSymbol *ar, int ni, int ihead);
-void IND_DistArrayRef(SgExpression *e, SgStatement *st, IND_ref_list *el);
-void BufferHeaderCopy(SgSymbol *b, int ibuf, int n, IND_ref_list *el);
-void  ArrayHeaderCopy(int n, IND_ref_list *el); 
-void InitInquiryVar(int iq);
-int CompareIfReduction(SgExpression *e1, SgExpression *e2);
-int ReductionFuncNumber(SgExpression *e,int expr_ind);
-int IsInNewList(SgExpression *pos_red, SgExpression *newl);
-int IsInReductionList(SgExpression *pos_red);
-int IsReductionVariable(SgExpression *pos_red, SgExpression *newl);
-int IsError(SgExpression *pos_red, SgExpression *newl, int variant);
-int FindInExpr(SgExpression *red, SgExpression *expr);
-int IsReductionOp(SgStatement *st, SgExpression *newl);
-int IsLIFReductionOp(SgStatement *st, SgExpression *newl);
-
-/*  stmt.cpp    */  
-void doAssignStmt (SgExpression *re);
-void doAssignTo (SgExpression *le, SgExpression *re);
-void doAssignTo_After (SgExpression *le, SgExpression *re);
-SgExpression * LeftPart_AssignStmt (SgExpression *re);
-void doAssignStmtBefore (SgExpression *re, SgStatement *current);
-void doAssignStmtAfter (SgExpression *re);
-void Extract_Stmt(SgStatement *st);
-void InsertNewStatementBefore (SgStatement *stat, SgStatement *current); 
-void InsertNewStatementAfter (SgStatement *stat, SgStatement *current, SgStatement *cp);
-void ReplaceByIfStmt(SgStatement *stmt);
-void ReplaceAssignByIf(SgStatement *stmt);
-int  isDoEndStmt(SgStatement *stmt);
-void ReplaceDoNestLabel(SgStatement *last_st, SgLabel *new_lab);
-void ReplaceDoNestLabel_Above(SgStatement *last_st, SgStatement *from_st,SgLabel *new_lab);
-void ReplaceParDoNestLabel(SgStatement *last_st, SgStatement *from_st,SgLabel *new_lab);
-void ReplaceContext(SgStatement *stmt);
-void LogIf_to_IfThen(SgStatement *stmt);
-SgStatement *ReplaceDoLabel(SgStatement *last_st, SgLabel *new_lab);
-SgStatement *ReplaceLabelOfDoStmt(SgStatement *first,SgStatement *last_st, SgLabel *new_lab);
-int  isParallelLoopEndStmt(SgStatement *stmt,SgStatement *first_do);
-SgStatement * lastStmtOfDo(SgStatement *stdo);
-SgStatement *ContinueWithLabel(SgLabel *lab);
-SgStatement *doIfThenConstrForRedis(SgExpression *headref, SgStatement *stmt, int index);
-SgStatement *doIfThenConstrForRealign(int iamv, SgStatement *stmt, int cond);
-SgStatement *doIfThenConstrForRealign(SgExpression *headref, SgStatement *stmt, int cond);
-SgStatement *doIfThenConstrForPrefetch(SgStatement *stmt);
-SgStatement *doIfThenConstrForRemAcc(SgSymbol *group, SgStatement *stmt);
-void  doIfForReduction(SgExpression *redgref, int deb);
-void  doLogIfForHeap(SgSymbol *heap, int size);
-SgStatement *doIfThenConstrForIND(SgExpression *e, int cnst, int cond, int has_else, SgStatement *stmt, SgStatement *cp);
-SgStatement *PrintStat(SgExpression *item);
-void doIfForDelete(SgSymbol *sg, SgStatement *stmt);
-SgStatement *doIfForFileVariables(SgSymbol *s);
-SgStatement *doIfForCreateReduction(SgSymbol *gs, int i, int flag);
-void  doIfForConsistent(SgExpression *gref);
-SgStatement *doIfThenConstrWithArElem(SgSymbol *ar, int ind);
-SgStatement *ReplaceStmt_By_IfThenConstr(SgStatement *stmt,SgExpression *econd);
-void TransferStmtAfter(SgStatement *stmt, SgStatement *where);
-SgStatement *CreateIfThenConstr(SgExpression *cond, SgStatement *st);
-void TransferBlockIntoIfConstr(SgStatement *ifst, SgStatement *stmt1, SgStatement *stmt2);
-void TransferStatementGroup(SgStatement *first_st, SgStatement *last_st, SgStatement *st_end);
-void ReplaceArithIF(stmt_list *gol);
-void ReplaceComputedGoTo(stmt_list *gol);
-void UnparseFunctionsOfFile(SgFile *f,FILE *fout);
-int isDoEndStmt_f90(SgStatement *stmt);
-SgLabel * LabelOfDoStmt(SgStatement *stmt);
-SgStatement * lastStmtOfIf(SgStatement *stif);
-void doCallAfter(SgStatement *call);
-void doCallStmt(SgStatement *call);
-SgStatement *ReplaceBy_DO_ENDDO(SgStatement *first,SgStatement *last_st);
-SgStatement *IncludeLine(char *str);
-SgStatement *PreprocessorDirective(char *str);
-SgStatement *PreprocessorDirective(const char *str);
-SgStatement *ifdef_dir(char *str);
-SgStatement *ifndef_dir(char *str);
-SgStatement *endif_dir();
-SgStatement *else_dir();
-SgExpression *CalculateArrayBound(SgExpression *edim,SgSymbol *ar, int flag_private);
-void ReplaceArrayBoundsInDeclaration(SgExpression *e);
-int ExplicitShape(SgExpression *eShape);
-int AssumedShape(SgExpression *eShape);
-SgSymbol *ArraySymbolInHostHandler(SgSymbol *ar,SgStatement *scope);
-SgSymbol *DeclareSymbolInHostHandler(SgSymbol *var, SgStatement *st_hedr, SgSymbol *loc_var);
-char *RegisterConstName();
-int TightlyNestedLoops_Test(SgStatement *prev_do, SgStatement *dost);
-SgStatement *NextExecStat(SgStatement *st);
-int isExecutableDVMHdirective(SgStatement *stmt);
-int isDvmSpecification (SgStatement * st);
-SgStatement * lastStmtOf(SgStatement *st);
-SgStatement *lastStmtOfFile(SgFile *f);
-void DeleteSaveAttribute(SgStatement *stmt);
-SgStatement *doIfThenConstrForOnDir(SgStatement *stmt);
-SgStatement *doIfForOnDir(SgStatement *stmt, SgLabel *t_lab);
-SgStatement *ReplaceOnByIf(SgStatement *stmt,SgStatement *end_stmt);
-SgStatement *TestEndOn(SgStatement *stmt);
-void doLogIfForAllocated(SgExpression *objref, SgStatement *stmt);
-void doLogIfForIOstat(SgSymbol *s, SgExpression *espec, SgStatement *stmt);
-SgStatement *doIfThenForDataRegion(SgSymbol *symb, SgStatement *stmt, SgStatement *call);
-void doIfIOSTAT(SgExpression *eiostat, SgStatement *stmt, SgStatement *go_stmt);
-void TransferLabelFromTo( SgStatement *from_st, SgStatement *to_st);
-
-/*  funcall.cpp */
-void Get_AM();
-void GetVM();
-SgExpression *GetAM();
-SgExpression *Reconf(SgExpression *size_array, int rank, int sign);
-int  BeginBlock ();
-void  BeginBlock_H();
-void EndBlock (SgStatement *st);
-SgStatement *EndBlock_H(SgStatement *st);
-SgExpression * EndBl (int n);
-void RTLInit ();
-void RTLExit (SgStatement *st);
-SgExpression * CreateAMView(SgExpression *size_array, int rank, int sign);
-SgExpression * DistributeAM (SgExpression *amv, SgExpression *psref,int count, int idisars, int iparam); 
-SgStatement *RedistributeAM(SgExpression *ref, SgExpression *psref, int count, int idisars,int sign); 
-SgExpression *CreateDistArray(SgSymbol *das, SgExpression *array_header,                             SgExpression *size_array, int rank, int ileft, int iright, int sign, int re_sign) ;
-SgExpression *AlignArray (SgExpression *array_handle,
-                          SgExpression *template_handle,
-                          int iaxis, 
-                          int icoeff,  
-                          int iconst); 
-SgStatement *RealignArr (SgExpression *array_header,
-                          SgExpression *pattern_ref,
-                          int iaxis, 
-                          int icoeff,  
-                          int iconst,
-                          int new_sign ); 
-SgStatement *StartBound(SgExpression *gref);
-SgStatement *WaitBound(SgExpression *gref);
-SgStatement *SendBound(SgExpression *gref);
-SgStatement *ReceiveBound(SgExpression *gref);
-SgExpression *DelBG(SgExpression *gref);
-SgStatement *BoundFirst(int iloopref,SgExpression *gref);
-SgStatement *BoundLast (int iloopref, SgExpression *gref);
-SgExpression *CreateReductionGroup();
-SgExpression *ReductionVar(int num_red, SgExpression *red_array, int ntype, int length, SgExpression *loc_array, int loc_length, int sign);
-SgStatement *LoopReduction(int ilh, int num_red, SgExpression *red_array, int ntype, SgExpression *length, SgExpression *loc_array, SgExpression *loc_length);
-SgStatement *InsertRedVar(SgExpression *gref, int irv, int iplp);
-SgExpression *SaveRedVars(SgExpression *gref);
-SgStatement  *StartRed(SgExpression *gref);
-SgStatement  *WaitRed (SgExpression *gref);
-SgExpression *DelRG(SgExpression *gref);
-SgStatement * BeginParLoop (int iloopref, SgExpression *header, int rank, int iaxis, int nr, int iinp, int iout);
-SgExpression *CreateParLoop(int rank);
-SgStatement  *EndParLoop(int iloopref);
-SgExpression *doLoop(int iloopref);
-SgExpression *GetAddres(SgSymbol * var);
-SgExpression *GetAddresMem(SgExpression * em);
-SgStatement *Addres(SgExpression * em);
-SgExpression *GetAddresDVM(SgExpression * em);
-void  CreateBoundGroup(SgExpression *gref);
-SgStatement *InsertArrayBound(SgExpression *gref, SgExpression *head, int ileft, int iright, int corner) ;
-SgExpression *TestIOProcessor();
-SgExpression *GetRank(int iref);
-SgExpression *GetSize(SgExpression *ref,int axis);
-SgExpression *DA_CopyTo_A(SgExpression *head, SgExpression *toar, int init_ind,                                 int last_ind, int step_ind, int regim);
-SgExpression *A_CopyTo_DA( SgExpression *fromar, SgExpression *head, int init_ind,                                 int last_ind, int step_ind, int regim);
-SgExpression *ArrayCopy(SgExpression *from_are, int from_init, int from_last, int from_step, 
-  SgExpression *to_are, int to_init, int to_last, int to_step, int regim);
-SgExpression *AsyncArrayCopy(SgExpression *from_are,   int from_init,   int from_last,         int from_step, SgExpression *to_are,  int to_init,  int to_last,  int to_step,  int regim,   SgExpression *flag);
-SgExpression *WaitCopy(SgExpression *flag);
-SgExpression *ReadWriteElement(SgExpression *from, SgExpression *to, int ind);  
-SgStatement *SendMemory(int icount, int inda, int indl);
-SgStatement *CloseFiles(); 
-SgExpression *AddHeader(SgExpression *head_new,SgExpression *head );
-SgExpression *DeleteObject(SgExpression *objref); 
-SgExpression *TestElement(SgExpression *head, int ind);
-SgExpression *HasElement(SgExpression *ar_header, int n, SgExpression *index_list);
-SgExpression *CalculateLinear(SgExpression *ar_header, int n, SgExpression *index_list);  
-SgStatement *D_LoadVar(SgExpression *vref,int type,SgExpression *headref,SgExpression *opref); 
-SgStatement *D_LoadVar2(SgExpression *vref, int type, SgExpression *headref, SgExpression *opref) ;
-SgStatement *D_StorVar();
-SgStatement *D_PrStorVar(SgExpression *vref,int type,SgExpression *headref,SgExpression *opref); 
-SgStatement *D_InOutVar(SgExpression *vref, int type, SgExpression *headref);
-SgStatement *D_Lnumb(int num_line);
-SgStatement *D_Fname();
-SgStatement *D_Begpl(int num_loop,int rank,int iinit);
-//SgStatement *D_Begpl(int num_loop);
-SgStatement *D_Begsl(int num_loop);
-SgStatement *D_Begtr(int num_treg);
-SgStatement *D_Skpbl();
-SgStatement *D_Endl(int num_loop,int begin_line);
-SgStatement *D_Iter(SgSymbol *do_var, int type);
-SgStatement *D_Iter_I(int ind, int indtp);
-SgStatement *D_Iter_ON(int ind, int type);
-SgStatement *D_RmBuf(SgExpression *source_headref, SgExpression *buf_headref, int rank, int index) ;
-SgStatement *St_Binter(int num_fragment, SgExpression *valvar);
-SgStatement *St_Einter(int num_fragment,int begin_line);
-SgStatement *St_Bsloop(int num_fragment);
-SgStatement *St_Bploop(int num_fragment);
-SgStatement *St_Enloop(int num_fragment,int begin_line);
-SgStatement *St_Biof();
-SgStatement *St_Eiof();
-SgExpression *CrtPS(SgExpression *psref, int ii, int il, int sign);
-SgExpression *GetAMView(SgExpression *headref);
-SgExpression *GetAMR(SgExpression *amvref, SgExpression *index);
-SgStatement  *MapAM(SgExpression *am, SgExpression *ps);
-SgExpression *RunAM(SgExpression *am);
-SgStatement  *StopAM();
-SgStatement  *MapTasks(SgExpression *taskCount,SgExpression *procCount,SgExpression *params,SgExpression *low_proc,SgExpression *high_proc,SgExpression *renum);
-SgExpression *LoadBG(SgExpression *gref);
-SgExpression *WaitBG(SgExpression *gref);
-SgExpression *CreateBG(int st_sign,int del_sign);
-SgExpression *InsertRemBuf(SgExpression *gref, SgExpression *buf);
-SgStatement *CreateRemBuf(SgExpression *header,SgExpression *buffer,int st_sign,int iplp, int iaxis,int icoeff,int iconst);
-SgExpression *RemoteAccessKind(SgExpression *header,SgExpression *buffer,int st_sign,int iplp,int iaxis,int icoeff,int iconst,int ilsh,int ihsh);
-SgStatement *CreateRemBufP(SgExpression *header,SgExpression *buffer,int st_sign,SgExpression *psref,int icoord);
-SgStatement *LoadRemBuf(SgExpression *buf);
-SgStatement *WaitRemBuf(SgExpression *buf);
-SgExpression *LoadIG(SgSymbol *group);
-SgExpression *WaitIG(SgSymbol *group);
-SgExpression *CreateIG(int st_sign,int del_sign);
-SgExpression *InsertIndBuf(SgSymbol *group, SgExpression *buf);
-SgExpression *CreateIndBuf(SgExpression *header,SgExpression *buffer,int st_sign,SgExpression *mehead,int iconst);
-SgExpression *LoadIndBuf(SgExpression *buf);
-SgExpression *WaitIndBuf(SgExpression *buf);
-SgStatement *InsertArrayBoundDep(SgExpression *gref, SgExpression *head, int ileft, int iright, int max, int ishsign);
-SgExpression *GetProcSys(SgExpression *amref);
-SgExpression * GenBlock   (SgExpression *psref, SgExpression *amv, int iweight, int icount);
-SgExpression * WeightBlock(SgExpression *psref, SgExpression *amv, int iweight, int iwnumb, int icount);
-SgExpression * MultBlock (SgExpression *amv, int iaxisdiv, int n);
-void TypeControl();
-void TypeControl_New();
-SgStatement *D_Read(SgExpression *adr) ;
-SgStatement *D_ReadA(SgExpression *adr,int indel, int icount) ;
-SgExpression *LocIndType(int irv, int type);
-SgExpression *DVM_Receive(int iplp,SgExpression *mem,int t,int is);
-SgExpression *DVM_Send(int iplp,SgExpression *mem,int t,int is);
-SgStatement *InitAcross(int acrtype,SgExpression *oldg, SgExpression *newg);
-SgStatement *D_FileLine(int num_line, SgStatement *stmt);
-SgStatement *D_DummyFileLine(int num_line, const char *fname);
-SgStatement *AddBound( );
-SgStatement *InsertArrayBoundSec(SgExpression *gref, SgExpression *head, int ilsec, int irsec, int iilowshs, int illowshs, int iihishs,int ilhishs, int max, int ishsign);
-SgStatement *D_RegistrateArray(int rank, int type, SgExpression *headref,  SgExpression *size_array,SgExpression *arref);
-SgExpression *D_CreateDebRedGroup();
-SgStatement *D_InsRedVar(SgExpression *dgref,int num_red, SgExpression *red_array, int ntype, int length, SgExpression *loc_array, int loc_length, int locindtype);
-SgExpression *D_SaveRG(SgExpression *dgref);
-SgStatement *D_CalcRG(SgExpression *dgref);
-SgStatement *D_DelRG(SgExpression *dgref);
-SgStatement *AddBoundShadow(SgExpression *head,int ileft,int iright );
-SgExpression *CreateConsistArray(SgSymbol *cas, SgExpression *array_header, SgExpression *size_array, int rank,  int sign, int re_sign);
-SgExpression *FreeConsistent(SgExpression *header);
-SgExpression *StartConsistent(SgExpression *header,int iplp,int iaxis,int icoeff,int iconst,int re_sign);
-SgExpression *WaitConsistent(SgExpression *header);
-SgExpression *CreateConsGroup(int st_sign,int del_sign);
-SgExpression *WaitConsGroup(SgExpression *gref);
-SgExpression *StartConsGroup(SgExpression *gref);
-SgExpression *InsertConsGroup(SgExpression *gref,SgExpression *header,int iplp,int iaxis,int icoeff,int iconst,int re_sign);
-SgExpression *TaskConsistent(SgExpression *header,SgExpression *amvref, int iaxis);
-SgExpression *IncludeConsistentTask(SgExpression *gref,SgExpression *header,SgExpression *amvref, int iaxis,int re_sign);
-SgExpression *ExstractConsGroup(SgExpression *gref, int del_sign);
-
-SgExpression *SizeFunction(SgSymbol *ar, int i);
-SgExpression *SizeFunctionWithKind(SgSymbol *ar, int i, int kind);
-SgExpression *LBOUNDFunction(SgSymbol *ar, int i);
-SgExpression *UBOUNDFunction(SgSymbol *ar, int i);
-SgExpression *LENFunction(SgSymbol *string);
-SgExpression *CHARFunction(int i);
-SgExpression *KINDFunction(SgExpression *arg);
-SgExpression *MaxFunction(SgExpression *arg1,SgExpression *arg2);
-SgExpression *MinFunction(SgExpression *arg1,SgExpression *arg2);
-SgExpression *IandFunction(SgExpression *arg1,SgExpression *arg2);
-SgExpression *IorFunction(SgExpression *arg1,SgExpression *arg2);
-SgExpression *AllocatedFunction(SgExpression *arg);
-SgExpression *AssociatedFunction(SgExpression *arg);
-SgExpression *TypeFunction(SgType *t, SgExpression *e, SgExpression *ke);
-SgExpression *SummaOfDistrArray(SgExpression *headref, SgExpression *sumvarref);
-SgExpression *SummaOfArray(SgExpression *are, int rank, SgExpression *size, int ntype,SgExpression *sumvarref);
-SgExpression *doPLmb(int iloopref,int ino);
-SgExpression *doSL(int num_loop,int iout);
-SgExpression *doPLmbSEQ(int ino, int rank, int iout);
-SgStatement *D_PutDebugVarAdr(SgSymbol *dbg_var, int flag);
-SgExpression *RegionCreate(int flag);
-SgExpression *RegistrateDataRegion();
-SgStatement *RegisterScalar(int irgn,SgSymbol *c_intent,SgSymbol *s);
-SgStatement *RegionRegisterScalar(int irgn,SgSymbol *c_intent,SgSymbol *s);
-SgStatement *RegisterSubArray(int irgn, SgSymbol *c_intent, SgSymbol *ar, int ilow, int ihigh);
-SgStatement *RegionRegisterSubArray(int irgn, SgSymbol *c_intent, SgSymbol *ar, SgExpression *index_list);
-SgStatement *RegisterArray(int irgn, SgSymbol *c_intent, SgSymbol *ar);
-SgStatement *RegionRegisterArray(int irgn, SgSymbol *c_intent, SgSymbol *ar);
-SgStatement *RegisterBufferArray(int irgn, SgSymbol *c_intent, SgExpression *bufref, int ilow, int ihigh);
-SgStatement *ActualScalar(SgSymbol *s);
-SgStatement *ActualSubArray(SgSymbol *ar, int ilow, int ihigh);
-SgStatement *ActualSubArray_2(SgSymbol *ar, int rank, SgExpression *index_list);
-SgStatement *ActualSubVariable(SgSymbol *s, int ilow, int ihigh);
-SgStatement *ActualSubVariable_2(SgSymbol *s, int rank, SgExpression *index_list);
-SgStatement *GetActualScalar(SgSymbol *s);
-SgStatement *GetActualSubArray(SgSymbol *ar, int ilow, int ihigh);
-SgStatement *GetActualSubArray_2(SgSymbol *ar, int rank, SgExpression *index_list);
-SgStatement *DestroyArray(SgExpression *objref);
-SgStatement *DestroyScalar(SgExpression *objref);
-SgStatement *RegistrateDVMArray(int ireg,SgExpression *header,SgExpression *gpuheader, SgExpression *gpubase,int inflag,int outflag);
-SgStatement *EndRegion(int n);
-SgStatement *UnRegistrateDataRegion(int n);
-SgStatement *RTL_GPU_Init();
-SgStatement *RTL_GPU_Finish();
-SgStatement *Exit_2(int code);
-SgStatement *Init_Cuda();
-//SgExpression *RegistrateLoop_GPU(int irgn,int iplp,int flag_first,int flag_last);
-//SgExpression *StartLoop_GPU(int il);
-SgExpression *LoopCreate_H(int irgn,int iplp);
-SgExpression *LoopCreate_H2(int nloop, SgExpression *paramList);
-SgExpression *LoopCreate_H2(SgExpression &paramList);
-SgStatement *LoopMap(int ilh, SgExpression *desc, int rank, SgExpression *paramList);  
-SgStatement *LoopMap(SgExpression &paramList);
-SgExpression *AlignmentLinear(SgExpression *axis,SgExpression *multiplier,SgExpression *summand);
-SgStatement *LoopStart_H(int il);
-SgStatement *LoopEnd_H(int il);
-SgStatement *LoopPerform_H(int il);
-SgStatement *LoopPerform_H2(int il);
-SgExpression *Loop_GPU(int il);
-SgType *IndexType();
-SgStatement *CallKernel_GPU(SgSymbol *skernel, SgExpression *blosks_threads);
-//SgExpression *StartShadow_GPU(int irgn,SgExpression *gref);
-SgExpression *GetActualEdges_H(SgExpression *gref);
-//SgStatement *DoneShadow_GPU(int ish);
-SgStatement *ShadowRenew_H(SgExpression *gref);
-SgStatement *ShadowRenew_H2(SgExpression *head,int corner,int rank,SgExpression *shlist);
-SgStatement *IndirectShadowRenew(SgExpression *head, int axis, SgExpression *shadow_name);
-SgStatement *EndHostExec_GPU(int il);
-SgStatement *UpdateDVMArrayOnHost(SgSymbol *s);
-SgStatement *InsertRed_GPU(int il,int irv,SgExpression *base,SgExpression *loc_base,SgExpression *offset,SgExpression *loc_offset);
-SgExpression *GetNaturalBase(SgSymbol *s_cur_dev,SgSymbol *shead); /* C */
-SgExpression *FillHeader(SgSymbol *s_cur_dev,SgSymbol *sbase,SgSymbol *shead,SgSymbol *sgpuhead);/* C */
-SgExpression *FillHeader_Ex(SgSymbol *s_cur_dev,SgSymbol *sbase,SgSymbol *shead,SgSymbol *sgpuhead,SgSymbol *soutType,SgSymbol *sParams);
-SgExpression *LoopDoCuda(SgSymbol *s_loop_ref,SgSymbol *s_blocks,SgSymbol *s_threads,SgSymbol *s_stream, SgSymbol *s_blocks_info,SgSymbol *s_const);
-SgFunctionCallExp *CallKernel(SgSymbol *skernel, SgExpression *blosks_threads);
-SgExpression *RegisterReduction(SgSymbol *s_loop_ref, SgSymbol *s_var_num, SgSymbol *s_red,SgSymbol *s_loc);
-SgExpression *InitReduction(SgSymbol *s_loop_ref, SgSymbol *s_var_num, SgSymbol *s_red,SgSymbol *s_loc);
-SgExpression *LoopSharedNeeded(SgSymbol *s_loop_ref, SgExpression *ecount);
-SgExpression *GetDeviceAddr(SgSymbol *s_cur_dev,SgSymbol *s_var);
-SgStatement *RegisterHandler_H(int il,SgSymbol *dev_const, SgExpression *flag, SgSymbol *sfun,int bcount,int parcount); /* OpenMP */
-SgStatement *RegisterHandler_H2(int il,SgSymbol *dev_const, SgExpression *flag, SgExpression *efun);
-SgStatement *SetCudaBlock_H(int il, int ib);
-SgStatement *SetCudaBlock_H2(int il, SgExpression *X, SgExpression *Y, SgExpression *Z );
-SgStatement *LoopInsertReduction_H(int ilh,int irv);
-SgStatement *LoopRedInit_HH(SgSymbol *loop_s, int nred, SgSymbol *sRed,SgSymbol *sLoc);
-SgStatement *LoopRedPost_HH(SgSymbol *loop_s, int nred, SgSymbol *sRed,SgSymbol *sLoc);
-SgStatement *LoopFillBounds_HH(SgSymbol *loop_s, SgSymbol *sBlow,SgSymbol *sBhigh,SgSymbol *sBstep);
-SgExpression *LoopGetSlotCount_HH(SgSymbol *loop_s);
-SgStatement *RegionForDevices(int irgn,SgExpression *devices);
-SgStatement *StartRegion(int irgn);
-SgStatement *RegionDestroyRb(int irgn, SgExpression *bufref);
-SgStatement *RegionAfterWaitrb(int irgn, SgExpression *bufref);
-SgStatement *RegionBeforeLoadrb(SgExpression *bufref);
-SgStatement *ActualArray(SgSymbol *ar);
-SgStatement *GetActualArray(SgExpression *objref);
-SgStatement *GetActualSubVariable(SgSymbol *s, int ilow, int ihigh);
-SgStatement *GetActualSubVariable_2(SgSymbol *s, int rank, SgExpression *index_list);
-SgStatement *CreateDvmArrayHeader(SgSymbol *cas, SgExpression *array_header, SgExpression *size_array, int rank,  int sign, int re_sign) ;
-SgStatement *HandleConsistent(SgExpression *gref);
-SgExpression *HasLocalElement(SgSymbol *s_loop_ref,SgSymbol *ar, SgSymbol *IndAr);
-SgExpression *HasLocalElement_H2(SgSymbol *s_loop_ref, SgSymbol*ar, int n, SgExpression *index_list);
-SgExpression *GetLocalPart(SgSymbol *s_loop_ref, SgSymbol *shead, SgSymbol *s_const);
-SgStatement *FillLocalPart_HH(SgSymbol *loop_s, SgSymbol *shead, SgSymbol *spart);
-SgStatement *SetVariableName(int irgn, SgSymbol *var);
-SgStatement *SetArrayName(int irgn, SgSymbol *ar);
-SgStatement *LoopShadowCompute_H(int il,SgExpression *headref);
-SgStatement *LoopShadowCompute_Array(int il,SgExpression *headref);
-SgStatement *ShadowCompute(int ilh,SgExpression *head,int rank,SgExpression *shlist);
-SgStatement *ActualAll();
-SgStatement *GetActualAll();
-SgStatement *Redistribute_H(SgExpression *objref,int new_sign);
-SgStatement *Realign_H(SgExpression *objref, int new_sign);
-SgExpression *GetOverallStep(SgSymbol *s_loop_ref);
-SgExpression *GetDeviceNum(SgSymbol *s_loop_ref);
-SgExpression *FillBounds(SgSymbol *loop_s, SgSymbol *sBlow,SgSymbol *sBhigh,SgSymbol *sBstep);
-SgExpression *LoopGetRemoteBuf(SgSymbol *loop_s, int n, SgSymbol *s_buf_head);
-SgExpression *mallocFunction(SgExpression *arg, SgStatement *scope);
-SgExpression *freeFunction(SgExpression *arg, SgStatement *scope);
-SgExpression *RedPost(SgSymbol *loop_s, SgSymbol *s_var_num, SgSymbol *sRed,SgSymbol *sLoc);
-SgExpression *CudaInitReduction(SgSymbol *s_loop_ref,  SgSymbol *s_var_num, SgSymbol *s_dev_red, SgSymbol *s_dev_loc);
-SgExpression *CudaReplicate(SgSymbol *Addr, SgSymbol *recordSize, SgSymbol *quantity, SgSymbol *devPtr);
-SgStatement *LoopAcross_H(int il,SgExpression *oldGroup,SgExpression *newGroup);
-SgStatement *LoopAcross_H2(int il, int isOut, SgExpression *headref, int rank, SgExpression *shlist);
-SgExpression *GetDependencyMask(SgSymbol *s_loop_ref) ;
-SgExpression *CudaTransform(SgSymbol *s_loop_ref, SgSymbol *s_head, SgSymbol *s_BackFlag, SgSymbol *s_headH, SgSymbol *s_addrParam); 
-SgExpression *CudaAutoTransform(SgSymbol *s_loop_ref, SgSymbol *s_head);
-SgExpression *ApplyOffset(SgSymbol *s_head, SgSymbol *s_base, SgSymbol *s_headH) ;
-SgExpression *GetConfig(SgSymbol *s_loop_ref,SgSymbol *s_shared_perThread,SgSymbol *s_regs_perThread,SgSymbol *s_threads,SgSymbol *s_stream, SgSymbol *s_shared_perBlock);
-SgExpression *PrepareReduction(SgSymbol *s_loop_ref,  SgSymbol *s_var_num, SgSymbol *s_count, SgSymbol *s_fill_flag, int fixedCount = 0, int fillFlag = -1);
-SgExpression *FinishReduction(SgSymbol *s_loop_ref,  SgSymbol *s_var_num);
-SgExpression *Register_Red(SgSymbol *s_loop_ref, SgSymbol *s_var_num, SgSymbol *s_red_array, SgSymbol *s_loc_array,SgSymbol *s_offset,SgSymbol *s_loc_offset);
-SgExpression *ChangeFilledBounds(SgSymbol *s_low,SgSymbol *s_high,SgSymbol *s_idx, SgSymbol *s_n,SgSymbol *s_dep,SgSymbol *s_type,SgSymbol *s_idxs);
-SgStatement *D_FileLineConst(int line, SgStatement *stmt);
-SgExpression *GetStage(SgStatement *first_do, int iplp);
-SgStatement *SetStage(int il, SgExpression *stage);
-SgExpression *GuessIndexType(SgSymbol *s_loop_ref);
-SgExpression *RtcSetLang(SgSymbol *s_loop_ref, const int lang);
-SgStatement *DeleteObject_H(SgExpression *objref);
-SgStatement *DataEnter(SgExpression *objref,SgExpression *esize);
-SgStatement *DataExit(SgExpression *objref, int saveFlag);
-SgStatement *ScopeInsert(SgExpression *objref);
-SgStatement *ScopeStart();
-SgStatement *ScopeEnd();
-SgExpression *HandlerFunc(SgSymbol *sfun, int paramCount, SgExpression *arg_list);
-SgExpression *Register_Array_H2(SgExpression *ehead);
-SgExpression *DvmhString(SgExpression *s);
-SgExpression *DvmhConnected(SgExpression *unit, SgExpression *failIfYes);
-SgExpression *DvmhStringVariable(SgExpression *v); 
-SgExpression *DvmhVariable(SgExpression *v);
-SgExpression *VarGenHeader(SgExpression *item); 
-SgStatement *SaveCheckpointFilenames(SgExpression *cpName, std::vector<SgExpression *> filenames);
-SgStatement *CheckFilename(SgExpression *cpName, SgExpression *filename);
-SgStatement *GetNextFilename(SgExpression *cpName, SgExpression *lastFile, SgExpression *currentFile);
-SgStatement *CpWait(SgExpression *cpName, SgExpression *statusVar);
-SgStatement *CpSaveAsyncUnit(SgExpression *cpName, SgExpression *file, SgExpression *unit);
-SgStatement *Dvmh_Line(int line, SgStatement *stmt);
-SgStatement *DvmhArrayCreate(SgSymbol *das, SgExpression *array_header, int rank, SgExpression *arglist);
-SgStatement *DvmhTemplateCreate(SgSymbol *das, SgExpression *array_header, int rank, SgExpression *arglist);
-SgExpression *DvmhReplicated();
-SgExpression *DvmhBlock(int axis);
-SgExpression *DvmhWgtBlock(int axis, SgSymbol *sw, SgExpression *en);
-SgExpression *DvmhGenBlock(int axis, SgSymbol *sg);
-SgExpression *DvmhMultBlock(int axis, SgExpression *em);
-SgExpression *DvmhIndirect(int axis, SgSymbol *smap);
-SgExpression *DvmhDerived(int axis, SgExpression *derived_rhs, SgExpression *counter_func, SgExpression *filler_func);
-SgStatement *DvmhDistribute(SgSymbol *das, int rank, SgExpression *distr_list);
-SgStatement *DvmhRedistribute(SgSymbol *das, int rank, SgExpression *distr_list);
-SgStatement *DvmhAlign(SgSymbol *als, SgSymbol *align_base, int nr, SgExpression *alignment_list);
-SgStatement *DvmhRealign(SgExpression *objref, int new_sign, SgExpression *pattern_ref, int nr, SgExpression *align_list);
-SgStatement *IndirectLocalize(SgExpression *ref_array, SgExpression *target_array, int iaxis);
-SgExpression *DvmhExprScan(SgExpression *edummy);
-SgExpression *DvmhExprConstant(SgExpression *e);
-SgExpression *DvmhExprIgnore();
-SgExpression *DvmhDerivedRhs(SgExpression *erhs);
-SgStatement *ShadowAdd(SgExpression *templ, int iaxis, SgExpression *derived_rhs, SgExpression *counter_func, SgExpression *filler_func, SgExpression *shadow_name, int nl, SgExpression *array_list);
-SgStatement *CreateDvmArrayHeader_2(SgSymbol *ar, SgExpression *array_header,  int rank,  SgExpression *shape_list);
-SgStatement *ForgetHeader(SgExpression *objref);
-SgExpression *DvmhArraySlice(int rank, SgExpression *slice_list);
-SgStatement *DvmhArrayCopy( SgExpression *array_header_right, int rank_right, SgExpression *slice_list_right, SgExpression *array_header_left, int rank_left, SgExpression *slice_list_left );
-SgStatement *DvmhArrayCopyWhole( SgExpression *array_header_right, SgExpression *array_header_left );
-SgStatement *Correspondence_H (int il, SgExpression *hedr, SgExpression *axis_list);
-SgStatement *DvmhArraySetValue( SgExpression *array_header_left, SgExpression *e_right );
-SgStatement *Consistent_H (int il, SgExpression *hedr, SgExpression *axis_list);
-SgStatement *LoopRemoteAccess_H (int il, SgExpression *hedr, SgSymbol *ar, SgExpression *axis_list);
-SgStatement *RemoteAccess_H2 (SgExpression *buf_hedr, SgSymbol *ar, SgExpression *ar_hedr, SgExpression *axis_list);
-SgStatement *GetRemoteBuf (SgSymbol *loop_s, int n, SgSymbol *s_buf_head);
-SgExpression *GetDeviceProp(SgSymbol *s_loop_ref, SgExpression *ep);
-SgExpression *GetMaxBlocks(SgSymbol *s_loop_ref, SgSymbol *s_max_blocks, SgSymbol *s_needed_bytes);
-SgExpression *GetPrivateArray(SgSymbol *s_loop_ref, SgExpression *e_bytes);
-SgExpression *DisposePrivateArray(SgSymbol *s_loop_ref, SgSymbol *s_array);
-SgExpression* GetWarpSize(SgSymbol* s_loop_ref);
-
-/*  io.cpp      */
-void IO_ThroughBuffer(SgSymbol *ar, SgStatement *stmt, SgExpression *eiostat);
-int  IOcontrol(SgExpression *e, SgExpression *ioc[],int type);
-int  control_list1(SgExpression *e, SgExpression *ioc[]);
-int  control_list_open(SgExpression *e, SgExpression *ioc[]);
-int  control_list_inquire (SgExpression *e, SgExpression *ioc[]);
-int  control_list_rw(SgExpression *e, SgExpression *ioc[]);
-void InsertSendInputList(SgExpression *input_list, SgExpression * io_stat,SgStatement *stmt);
-void InsertSendIOSTAT(SgExpression * eios);
-void InsertSendInquire(SgExpression * eioc[]);
-void ImplicitLoop(SgExpression *ein, int *pj, SgExpression *iisize[], SgExpression *iielem[],SgExpression *iinumb[], SgStatement *stmt);
-SgExpression * InputItemLength (SgExpression *e, SgStatement *stmt);
-SgExpression *SubstringLength(SgExpression *sub);
-SgExpression *ArrayLength(SgSymbol *ar, SgStatement *stmt, int err);
-SgExpression *ArrayLengthInElems(SgSymbol *ar, SgStatement *stmt, int err);
-SgExpression *ElemLength(SgSymbol *ar);
-SgExpression *NumbOfElem(SgExpression *es,SgExpression *el);
-int  TestIOList(SgExpression *iol,SgStatement *stmt,int error_msg);
-int  ImplicitLoopTest(SgExpression *eim,SgStatement *stmt,int error_msg);
-int  IOitemTest(SgExpression *e,SgStatement *stmt,int error_msg);
-SgExpression *CorrectLastOpnd(SgExpression *len, SgSymbol *ar, SgExpression *bounds,SgStatement *stmt);
-int   hasAsterOrOneInLastDim(SgSymbol *ar);
-SgSymbol *lastDimInd(SgExpression *el);
-SgExpression *FirstArrayElement(SgSymbol *ar);
-SgExpression *Barrier();
-int SpecialKindImplicitLoop(SgExpression *el, SgExpression *ein, int *pj, SgExpression *iisize[], SgExpression *iielem[],SgExpression *iinumb[],SgStatement *stmt);
-SgExpression *FirstArrayElementOfSection(SgSymbol *ar,SgExpression *einit[]);
-SgExpression *FirstElementOfSection(SgExpression *ea);
-int ArraySectionRank(SgExpression *ea);
-int ContinuousSection(SgExpression *ea);
-SgExpression *SectionLength(SgExpression *ea, SgStatement *stmt, int err);
-int isColon(SgExpression *e);
-int ContinuousSection(SgExpression *ea);
-SgStatement *Any_IO_Statement(SgStatement *stmt);
-void IoModeDirective(SgStatement *stmt, char io_modes_str[], int error_msg);
-void Open_Statement(SgStatement *stmt, char io_modes_str[], int error_msg);
-void Close_Statement(SgStatement *stmt, int error_msg);
-void Inquiry_Statement(SgStatement *stmt, int error_msg);
-void FilePosition_Statement(SgStatement *stmt, int error_msg);
-void ReadWritePrint_Statement(SgStatement *stmt, int error_msg);
-void ReadWrite_Statement(SgStatement *stmt, int error_msg);
-void Close_RTS(SgStatement *stmt,int error_msg);
-void Open_RTS(SgStatement* stmt, char* io_modes_str, int error_msg);
-void FilePosition_RTS(SgStatement* stmt, int error_msg);
-void ReadWrite_RTS(SgStatement *stmt, int error_msg);
-void OpenClose(SgStatement *stmt, int error_msg);
-void NewOpenClose(SgStatement *stmt);
-void NewFilePosition(SgStatement *stmt);
-void Replace_IO_Statement(SgExpression *ioc[],SgStatement *stmt);
-void ReplaceByStop(int io_err, SgStatement *stmt);
-int Check_Control_IO_Statement(int io_err, SgExpression *ioc[], SgStatement *stmt, int error_msg);
-void FilePosition(SgStatement *stmt, int error_msg);
-void NewFilePosition(SgStatement *stmt);
-void Inquiry(SgStatement *stmt, int error_msg);
-SgStatement *IfConnected(SgStatement *stmt, SgExpression *unit, bool suitableForNewIO);
-int control_list_oc_new(SgExpression *e, SgExpression *ioc[]);
-void Dvmh_Close(SgExpression *ioc[]);
-void Dvmh_Open(SgExpression *ioc[], const char *io_modes_str);
-void Dvmh_FilePosition(SgExpression *ioc[], int variant);
-void Dvmh_ReadWrite(SgExpression **ioc, SgStatement *stmt);
-void InsertGotoStmt(SgExpression *err, int index);
-void OccupyDvm000Elem(SgExpression *cond, int index);
-int control_list_close_new(SgExpression *e, SgExpression *ioc[]);
-int control_list_open_new(SgExpression *e, SgExpression *ioc[]);
-bool checkArgsClose(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkArgsOpen(SgExpression **ioc, SgStatement *stmt, int error_msg, char const *io_modes_str);
-bool checkArgsEnfileRewind(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkArgsRW(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkVarRefIntArg(SgExpression *arg, int i, SgStatement *stmt, int error_msg);
-bool checkStringVarArg(SgExpression *arg, int i, SgStatement *stmt, int error_msg);
-bool checkStringArg(SgExpression *arg, int i, SgStatement *stmt, int error_msg);
-bool checkIntArg(SgExpression *arg, int i, SgStatement *stmt, int error_msg);
-bool checkLabelRefArg(SgExpression *arg, SgStatement *stmt, int error_msg);
-bool checkDefaultStringArg(SgExpression *arg, const char **possible_values, int count, int i, SgStatement *stmt, int error_msg);
-bool checkAccessArg(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkFormArg(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkFormattedArgs(SgExpression **ioc, SgStatement *stmt, int error_msg);
-//bool checkFileArg(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkPosArg(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkUnitAndNewunitArg(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkNewunitArg(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkReclArg(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkStatusArg(SgExpression **ioc, SgStatement *stmt, int error_msg);
-bool checkDvmModeArg(char const *io_modes_str, SgStatement *stmt, int error_msg);
-const char *stringValuesOfArgs(int argNumber, SgStatement *stmt);
-int FixError(const char *str, int ierr, SgSymbol *s, SgStatement *stmt, int error_msg);
-SgExpression *ArrayFieldLast(SgExpression *e);
-SgExpression *FirstElementOfField(SgExpression *e_RecRef);
-int hasEndErrControlSpecifier(SgStatement *stmt, SgExpression *ioEnd[] );
-void ChangeSpecifierByIOSTAT(SgExpression *e);
-void ChangeControlList(SgStatement *stmt, SgExpression *ioEnd[] );
-void ReplaceStatementWithEndErrSpecifier(SgStatement *stmt, SgExpression *ioEnd[] );
-
-/* checkpoint.cpp */
-void CP_Create_Statement(SgStatement *st, int error_msg);
-void CP_Save_Statement(SgStatement *st, int error_msg);
-void CP_Load_Statement(SgStatement *st, int error_msg);
-void CP_Wait(SgStatement *stmt, int error_msg);
-
-/*  debug.cpp   */
-void D_AddToDoList (int Nloop, int Nline, SgLabel *lab, SgSymbol *var);
-void D_DelFromDoList ();
-SgStatement *CloseLoop(SgStatement *stmt);
-int  isDoVar(SgSymbol *s);
-void SetDoVar(SgSymbol *s);
-void OffDoVar(SgSymbol *s);
-void FreeDoList();  
-void OpenParLoop(SgStatement *dost);
-void OpenParLoop_Inter(SgStatement *dost,int ind, int indtp,SgSymbol *do_var[],int ndo);
-void CloseParLoop(SgStatement *dostmt,SgStatement *stmt,SgStatement *end_stmt);
-void CloseDoInParLoop(SgStatement *end_stmt);
-void AddAttrLoopNumber(int No,SgStatement *stmt);
-int  LoopNumber(SgStatement *stmt);
-SgExpression *Value(SgExpression *e);
-SgExpression *Value_F95(SgExpression *e);
-void LineNumber(SgStatement *st);
-int  OpenInterval (SgStatement *stmt);
-int  CloseInterval();
-void ExitInterval(SgStatement *stmt);
-void OverLoopAnalyse(SgStatement *func);
-void FormLoopIntList(SgStatement *st);
-int  IntervalNumber(SgStatement *stmt);
-void SeqLoopBegin(SgStatement *st);
-void AddAttrIntervalNumber(SgStatement *stmt);
-SgStatement *SeqLoopEnd(SgStatement *end_stmt,SgStatement *stmt);
-void SeqLoopEndInParLoop(SgStatement *end_stmt,SgStatement *stmt);
-void SkipParLoopNest(SgStatement *stmt);
-int hasGoToIn(SgStatement *parent,SgLabel *lab_after);
-int ToThisLabel(SgStatement *gost, SgLabel *lab_after);
-void  ReplaceGoToLabelInsideLoop(SgStatement *parent,SgStatement *lst, SgLabel *lab_after);
-void  ReplaceGoToInsideLoop(SgStatement *dost,SgStatement *endst, SgStatement *dst, SgStatement *est);
-void DeleteGoToFromList(SgStatement *stmt);
-void BeginDebugFragment(int num);
-void EndDebugFragment(int num);
-void  DebugTaskRegion(SgStatement *stmt);
-void CloseTaskRegion(SgStatement *tr_st,SgStatement *stmt);
-int TypeDVM();
-void ArrayRegistration ();
-heap_pointer_list *HeapList(heap_pointer_list *heap_point, SgSymbol *sheap,SgSymbol *sp);
-SgSymbol *HeapForPointer(SgSymbol *p);
-void RegistrateAllocArray( stmt_list *alloc_st);
-void AllocArrayRegistration( SgStatement *stmt);
-SgStatement *Check(SgStatement *stmt);
-void Registrate_Ar(SgSymbol *ar);
-void Registrate_Allocatable(SgExpression *alce, SgStatement *stmt);
-void AllocatableArrayRegistration (SgStatement *stmt);
-void InsertStmtsBeforeGoTo(SgStatement *gotost, SgStatement *dst, SgStatement *est);
-SgStatement *StmtWithLabel(SgLabel *lab);
-int LineNumberOfStmtWithLabel(SgLabel *lab);
-void AddDebugGotoAttribute(SgStatement *gotost,SgStatement *lnumst);
-void  DebugVarArrayRef(SgExpression *e,SgStatement *stmt);
-void  DebugVarArrayRef_Left(SgExpression *e,SgStatement *stmt,SgStatement *stcur);
-void  DebugArg_VarArrayRef(SgExpression *e,SgStatement *stmt);
-void CheckVarArrayRef(SgExpression *e, SgStatement *stmt, SgExpression *epr);
-void  DebugLoop(SgStatement *stmt);
-void  DebugParLoop(SgStatement *stmt,int rank, int iinp);
-void DebugExpression(SgExpression *e, SgStatement *stmt);
-void DebugAssignStatement(SgStatement *stmt);
-
-/*  help.cpp */
-SgLabel *  firstLabel(SgFile *f);
-int isLabel(int num) ;
-SgLabel * GetLabel();
-const char * header (int i);
-char *UnparseExpr(SgExpression *e) ;
-void printVariantName(int i);
-int FragmentList(char *l, int dlevel, int elevel);
-void AddToFragmentList(int num1, int num2,int dlevel,int elevel);
-void Error(const char *s, const char *t, int num, SgStatement *stmt);
-void err(const char *s, int num, SgStatement *stmt);
-void Err_g(const char *s, const char *t, int num);
-void err_p(const char *s, const char *name, int num);
-void Warning(const char *s, const char *t, int num, SgStatement *stmt);
-void warn(const char *s, int num, SgStatement *stmt);
-void Warn_g(const char *s, const char *t, int num);
-void errN(const char *s, int num, SgStatement *stmt);
-void format_num (int num, char num3s[]);
-SgExpression *ConnectList(SgExpression *el1, SgExpression *el2);
-int is_integer_value(char *str);
-char *SymbListString(symb_list *symbl);
-char *baseFileName(char *name);
-SgSymbol *isSameNameInProgramUnit(const char *name,SgStatement *func);
-SgSymbol *isNameConcurrence(const char *name, SgStatement *func);
-char *Check_Correct_Name(const char *name);
-
-/* acc_f2c.cpp */
-void Translate_Fortran_To_C(SgStatement *stat, SgStatement *last, std::vector <std::stack <SgStatement*> > &, int);
-void Translate_Fortran_To_C(SgStatement *stat, SgStatement *last, int countOfCopy, SgStatement *st_header);
-SgStatement* Translate_Fortran_To_C(SgStatement* Stmt, bool isSapforConv = false);
-SgSymbol* createNewFunctionSymbol(const char *name);
-void swapDimentionsInprivateList(void);
-void swapDimentionsInprivateList(SgExpression *pList);
-void createNewFCall(SgExpression*, SgExpression*&, const char*, int);
-SgFunctionCallExp* createNewFCall(const char *name);
-void convertExpr(SgExpression*, SgExpression*&);
-void initSupportedVars(void);
-void initF2C_FunctionCalls(void);
-void initIntrinsicFunctionNames();
-void ChangeSymbolName(SgSymbol *symb);
-void RenamingNewProcedureVariables(SgSymbol *proc_name);
-SgSymbol *hasSameNameAsSource(SgSymbol *symb);
-void RenamingCudaFunctionVariables(SgStatement *first, SgSymbol *k_symb, int replace_flag);
-void replaceVariableSymbSameNameInStatements(SgStatement *first, SgStatement *last, SgSymbol *symb, SgSymbol *s_new, int replace_flag);
-void RenamingCalledProcedureSymbols(SgStatement *header, SgStatement *copy_header);
-void RenamingCalledProcedureSymbolsInKernel(SgSymbol *first_symb);
-
-/* acc_across.cpp */
-ArgsForKernel *Create_C_Adapter_Function_Across(SgSymbol *sadapter);
-SgStatement *CreateLoopKernelAcross(SgSymbol*, ArgsForKernel*, SgType*);
-SgStatement *CreateLoopKernelAcross(SgSymbol*, ArgsForKernel*, int, SgType*);
-
-/* acc_index_analyzer.cpp */
-SgExpression* analyzeArrayIndxs(SgSymbol *array, SgExpression *listIdx);
-
-/* aks_analyzeLoops.cpp */
-AnalyzeReturnGpuO1 analyzeLoopBody(int type);
-
-/* acc_rtc.cpp */
-void ACC_RTC_AddCalledProcedureComment(SgSymbol *symbK);
-void ACC_RTC_CompleteAllParams();
-void ACC_RTC_ConvertCudaKernel(SgStatement *cuda_kernel, const char *kernelName);
-char* _RTC_convertUnparse(const char* inBuf);
-symb_list *ACC_RTC_ExpandCallList(symb_list *call_list);
-char *_RTC_PrototypesForKernel(symb_list *call_list);
-void ACC_RTC_AddFunctionsToKernelConsts(SgStatement *first_kernel_const);
-void _RTC_UnparsedFunctionsToKernelConst(SgStatement *stmt);
-
-
-/* acc_utilities.cpp */
-char* copyOfUnparse(const char *strUp);
-char* aks_strupr(const char *str);
-char* aks_strlowr(const char *str);
-void correctPrivateList(int flag);
-SgType *indexTypeInKernel(int rt_Type);
-SgFunctionCallExp *cudaKernelCall(SgSymbol *skernel, SgExpression *specs, SgExpression *args);
-void DeclareDoVars(SgType *indexType);
-SgStatement* createKernelCallsInCudaHandler(SgFunctionCallExp *baseFunc, SgSymbol *s_loop_ref, SgSymbol *idxTypeInKernel, SgSymbol *s_blocks);
-int isIntrinsicFunctionName(const char *name);
-void addNumberOfFileToAttribute(SgProject *project);
-int getIntrinsicFunctionTypeSize(const char* name);
-void recExpressionPrintFdvm(SgExpression* exp);
-
-/* calls.cpp */
-void ProjectStructure(SgProject &project);
-void FileStructure(SgFile *file);
-void doCallGraph(SgFile *file);
-SgStatement *ProgramUnit(SgStatement *first);
-SgStatement *Subprogram(SgStatement *func);
-void FunctionCallSearch(SgExpression *e);
-void Arg_FunctionCallSearch(SgExpression *e) ;
-void FunctionCallSearch_Left(SgExpression *e);
-void Call_Site (SgSymbol *s, int inlined, SgStatement *stat, SgExpression *e);
-SgSymbol * GetProcedureHeaderSymbol(SgSymbol *s);
-void MarkAsRoutine(SgSymbol *s);
-void MarkAsCalled(SgSymbol *s);
-void MarkPrivateArgumentsOfRoutine(SgSymbol *s, SgExpression *private_args);
-void MarkAsUserProcedure(SgSymbol *s);
-void MarkAsExternalProcedure(SgSymbol *s);
-void MakeFunctionCopy(SgSymbol *s);
-SgStatement *HeaderStatement(SgSymbol *s);
-void InsertCalledProcedureCopies();
-SgStatement *InsertProcedureCopy(SgStatement *st_header, SgSymbol *sproc, int is_routine, argument_numbers *arg_numbs, SgStatement *after);
-int FromOtherFile(SgSymbol *s);
-int findParameterNumber(SgSymbol *s, char *name); 
-int isInParameter(SgSymbol *s, int i);
-SgSymbol *ProcedureSymbol(SgSymbol *s);
-int IsPureProcedure(SgSymbol *s);
-int IsElementalProcedure(SgSymbol *s);
-int IsRecursiveProcedure(SgSymbol *s);
-int IsNoBodyProcedure(SgSymbol *s);
-int isUserFunction(SgSymbol *s);
-int IsInternalProcedure(SgSymbol *s);
-int isArrayParameter(SgSymbol *s, int i);
-int isArrayParameterWithAssumedShape(SgSymbol *s, int i);
-SgExpression *FunctionDummyList(SgSymbol *s, SgStatement *st_header, argument_numbers *arg_numbs);
-char *FunctionResultIdentifier(SgSymbol *sfun);
-SgSymbol *isSameNameInProcedure(char *name, SgSymbol *sfun);
-char *NameCheck(char *name, SgSymbol *sfun);
-void InsertReturnBeforeEnd(SgStatement *new_header, SgStatement *end_st);
-void ChangeReturnStmts(SgStatement *new_header, SgStatement *end_st, SgSymbol *sres);
-void ExtractDeclarationStatements(SgStatement *header);
-void MakeFunctionDeclarations(SgStatement *header, SgSymbol *s_last);
-SgSymbol *LastSymbolOfFunction(SgStatement *header);
-void ConvertArrayReferences(SgStatement *first, SgStatement *last);
-void doPrototype(SgStatement *func_hedr, SgStatement *block_header, int static_flag);
-SgStatement *FunctionPrototype(SgSymbol *sf);
-bool CreateIntefacePrototype(SgStatement *header);
-SgStatement *hasInterface(SgSymbol *s);
-void SaveInterface(SgSymbol *s, SgStatement *interface);
-SgStatement  *TranslateProcedureHeader_To_C(SgStatement *new_header, argument_numbers *arg_numbs);
-SgStatement *getInterface(SgSymbol *s);
-SgStatement *getGenericInterface(SgSymbol *s, SgExpression *arg_list);
-int CompareKind(SgType* type_arg, SgType* type_dummy);
-SgExpression* TypeKindExpr(SgType* t);
-SgFunctionSymb *SymbolForIntrinsicFunction(const char *name, int i, SgType *tp, SgStatement *func);
-void addArgumentNumber(int i, SgSymbol *s);
-argument_numbers *GetNextNumberList(argument_numbers *source, argument_numbers *list);
-int isPrivateArrayDummy(SgSymbol *s);
-//-----------------------------------------------------------------------
-extern "C" char* funparse_bfnd(...);
-extern "C" char* Tool_Unparse2_LLnode(...);
-extern "C" void Init_Unparser(...);
-extern "C" char* UnparseBif_Char(...);
-//extern "C" void UnparseProgram_ThroughAllocBuf(...);
-extern "C" PTR_BFND duplicateStmtsFromTo(...);
-
-/*OMP*/
-const int COMMON_VAR = 1027; /*OMP*/
-const int SAVE_VAR = 1028; /*OMP*/
-const int STATIC_CONTEXT = 1029; /*OMP*/
-const int DEBUG_STAT = 1030; /*OMP*/
-const int FIRST_ELEM = 1031; /*OMP*/
-const int FORMAL_PARAM = 1032; /*OMP*/
-const int DECLARED_FUNC = 1033; /*OMP*/
-const int DEBUG_LINE = 1034; /*OMP*/
-EXTERN int OMP_program; /*OMP*/
-EXTERN int omp_debug;   //set to 1 by -d1  or -d2 or -d3 or -d4 flag
-EXTERN int omp_perf;   //set to 1 by -emp flag
-#define D1 1
-#define D2 2
-#define DPERF 4
-#define D3 8
-#define D4 16
-#define D5 32
-/*Attributes for omp statements*/
-const int OMP_STMT_BEFORE = 2000; /*OMP*/
-const int OMP_STMT_AFTER = 2001; /*OMP*/
-const int OMP_MARK = 2002; /*OMP*/
-const int OMP_NEXT = 2003; /*OMP*/
-const int OMP_CRITICAL = 2004; /*OMP*/
-int isOmpGetNumThreads(SgExpression *); /*OMP*/
-SgStatement * GetLexNextIgnoreOMP(SgStatement *st); /*OMP*/
-SgSymbol *ChangeParallelDir (SgStatement *stmt); /*OMP*/
-void ChangeAccrossOpenMPParam (SgStatement *stmt, SgSymbol *newj, int ub); /*OMP*/
-void MarkOriginalStmt (SgStatement *func); /*OMP*/
-void TranslateFileOpenMPDVM(SgFile *f); /*OMP*/
-void DelAttributeFromStmt (int type, SgStatement *st); /*OMP*/
-int isOmpDir (SgStatement * st); /*OMP*/
-void ConvertLoopWithLabelToEnddoLoop (SgStatement *stat); /*OMP*/
-#define BIT_OPENMP    1024*128*128     /* OpenMP Fortran */
-
-// options on FDVM converter
-enum OPTIONS {
-    AUTO_TFM = 0, ONE_THREAD, SPEED_TEST_L0, SPEED_TEST_L1, GPU_O0, GPU_O1, RTC, C_CUDA, OPT_EXP_COMP,
-    O_HOST, NO_CUDA, NO_BL_INFO, LOOP_ANALYSIS, PRIVATE_ANALYSIS, IO_RTS, READ_ALL, NO_REMOTE, NO_PURE_FUNC, 
-    GPU_IRR_ACC, O_PL, O_PL2, BIG_PRIVATES, NUM_OPT};
-// ONE_THREAD - compile one thread CUDA-kernels only for across (TODO for all CUDA-kernels)
-// SPEED_TEST_L0, SPEED_TEST_L1 - debug options for speed testof CUDA-kernels for across
-// RTC - enable CUDA run-time compilation of all CUDA-kernels
-// C_CUDA - enable Fortran to C convertation on CUDA-kernels
-// OPT_EXP_COMP - compute expressions on loop analysis, it enables LOOP_ANALYSIS
-// O_HOST - enable procedure optimizations for CPU
-// NO_CUDA - dont generate CUDA-kernels
-// NO_BL_INFO (depricated) - dont generate block information for CUDA-kernels's grid 
-// LOOP_ANALYSIS - enable loop analysis for all parallel loops (default: only for across parallel loops)
-// PRIVATE_ANALYSIS - enable private analysis for all parallel loops
-// IO_RTS - enable new interface for parallel IO operations on DVMH programs
-// READ_ALL - READ statement execution by all processes
-// NO_REMOTE - ignore REMOTE_ACCESS specifications (compilation mode for single processor execution)
-// NUM_OPT - it is not an option, it is a maximum value of enum
-
-class Options
-{
-private:
-    bool states[NUM_OPT];
-    int values[NUM_OPT];
-    bool freezed;
-public:
-    Options()
-    {
-        for (int i = 0; i < NUM_OPT; ++i)
-        {
-            states[i] = false;
-            values[i] = -1;
-        }
-        freezed = false;
-    }
-    void setOn(const OPTIONS opt) 
-    { 
-        if (!freezed)
-            states[opt] = true; 
-    }
-    void setOff(const OPTIONS opt) 
-    {
-        if (!freezed) {
-            states[opt] = false;
-            values[opt] = -1;
-        }
-    }
-    void setValue(const OPTIONS opt, const int val) 
-    { 
-        if (!freezed) {
-            states[opt] = true;
-            values[opt] = val;
-        }
-    }
-
-    bool isOn(const OPTIONS opt) const    { return states[opt]; }
-    int getValue(const OPTIONS opt) const { return values[opt]; }
-
-    void checkCombinations()
-    {
-        if (states[SPEED_TEST_L1])
-            states[SPEED_TEST_L0] = true;
-        // TODO: add warning
-        if (states[ONE_THREAD])
-            states[AUTO_TFM] = false;
-
-        if (states[GPU_O0]) {
-            fprintf(stderr, "switch off -gpuO0 option, this is not implemented yet\n");
-            states[GPU_O0] = false;
-        }
-
-        if (states[GPU_IRR_ACC])
-        {
-            if (states[NO_CUDA] || !states[NO_BL_INFO])
-            {
-                states[LOOP_ANALYSIS] = false;
-                states[OPT_EXP_COMP] = false;
-                states[GPU_IRR_ACC] = false;
-                if (states[NO_CUDA])
-                    fprintf(stderr, "switch off -dvmIrregAnalysis option because -noCuda option is on\n");
-                else
-                    fprintf(stderr, "switch off -dvmIrregAnalysis option because -noBI option is off\n");
-            }
-            else
-            {
-                states[LOOP_ANALYSIS] = true;
-                states[OPT_EXP_COMP] = true;
-            }
-        }
-
-       // if (states[O_PL2])
-       //     states[O_HOST] = true;
-
-        //freeze all changes after initialization
-        freezed = true;
-    }
-};
-
-extern Options options;
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/include/dvm_tag.h b/projects/dvm_svn/fdvm/trunk/include/dvm_tag.h
deleted file mode 100644
index 50a7dde..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/dvm_tag.h
+++ /dev/null
@@ -1,160 +0,0 @@
-#define HPF_TEMPLATE_STAT            296
-#define HPF_ALIGN_STAT               297
-#define HPF_PROCESSORS_STAT	     298
-#define DVM_DISTRIBUTE_DIR           277
-#define DVM_REDISTRIBUTE_DIR         299
-#define DVM_PARALLEL_ON_DIR          211
-#define DVM_SHADOW_START_DIR         212
-#define DVM_SHADOW_GROUP_DIR         213
-#define DVM_SHADOW_WAIT_DIR          214
-#define DVM_REDUCTION_START_DIR      215
-#define DVM_REDUCTION_GROUP_DIR      216
-#define DVM_REDUCTION_WAIT_DIR       217
-#define DVM_DYNAMIC_DIR              218
-#define DVM_ALIGN_DIR                219 
-#define DVM_REALIGN_DIR              220 
-#define DVM_REALIGN_NEW_DIR          221  
-#define DVM_REMOTE_ACCESS_DIR        222  
-#define HPF_INDEPENDENT_DIR          223 
-#define DVM_SHADOW_DIR               224 
-#define DVM_NEW_VALUE_DIR            247
-#define DVM_VAR_DECL           	     248
-#define DVM_POINTER_DIR              249
-#define DVM_DEBUG_DIR	      	     146  
-#define DVM_ENDDEBUG_DIR	     147  
-#define DVM_TRACEON_DIR		     148  
-#define DVM_TRACEOFF_DIR	     149       
-#define DVM_INTERVAL_DIR	     128  
-#define DVM_ENDINTERVAL_DIR	     129
-#define DVM_TASK_REGION_DIR 	     605	
-#define DVM_END_TASK_REGION_DIR      606	
-#define DVM_ON_DIR  		     607	
-#define DVM_END_ON_DIR		     608	
-#define DVM_TASK_DIR                 609	
-#define DVM_MAP_DIR 		     610	
-#define DVM_PARALLEL_TASK_DIR	     611	
-#define DVM_INHERIT_DIR		     612
-#define DVM_INDIRECT_GROUP_DIR	     613	
-#define DVM_INDIRECT_ACCESS_DIR      614	
-#define DVM_REMOTE_GROUP_DIR         615	
-#define DVM_RESET_DIR		     616	
-#define DVM_PREFETCH_DIR	     617	
-#define DVM_OWN_DIR		     618	
-#define DVM_HEAP_DIR		     619	
-#define DVM_ASYNCID_DIR		     620	
-#define DVM_ASYNCHRONOUS_DIR	     621	
-#define DVM_ENDASYNCHRONOUS_DIR	     622	
-#define DVM_ASYNCWAIT_DIR	     623	
-#define DVM_F90_DIR		     624 
-#define DVM_BARRIER_DIR		     625
-#define FORALL_STAT                  626
-#define DVM_CONSISTENT_GROUP_DIR     627	
-#define DVM_CONSISTENT_START_DIR     628	
-#define DVM_CONSISTENT_WAIT_DIR      629	
-#define DVM_CONSISTENT_DIR           630
-#define DVM_CHECK_DIR                631
-#define DVM_IO_MODE_DIR              632
-#define DVM_LOCALIZE_DIR             633    
-#define DVM_SHADOW_ADD_DIR           634    
-#define DVM_CP_CREATE_DIR            635
-#define DVM_CP_LOAD_DIR              636
-#define DVM_CP_SAVE_DIR              637	
-#define DVM_CP_WAIT_DIR              638
-#define DVM_EXIT_INTERVAL_DIR	     639
-#define DVM_TEMPLATE_CREATE_DIR	     640 
-#define DVM_TEMPLATE_DELETE_DIR	     641 
-#define PRIVATE_AR_DECL              642         		   
-#define BLOCK_OP           705
-#define NEW_SPEC_OP        706
-#define REDUCTION_OP       707
-#define SHADOW_RENEW_OP    708
-#define SHADOW_START_OP    709
-#define SHADOW_WAIT_OP     710
-#define DIAG_OP            711
-#define REMOTE_ACCESS_OP   712
-#define TEMPLATE_OP        713     
-#define PROCESSORS_OP      714     
-#define DYNAMIC_OP         715     
-#define ALIGN_OP           716     
-#define DISTRIBUTE_OP      717     
-#define SHADOW_OP          718 
-#define INDIRECT_ACCESS_OP 719
-#define ACROSS_OP          720  
-#define NEW_VALUE_OP       721 
-#define SHADOW_COMP_OP     722  
-#define STAGE_OP           723  
-#define FORALL_OP          724
-#define CONSISTENT_OP      725
-#define PARALLEL_OP        737      
-#define INDIRECT_OP        738     
-#define DERIVED_OP         739     
-#define DUMMY_REF          740     
-#define COMMON_OP          741
-#define SHADOW_NAMES_OP    742
-          
-#define SHADOW_GROUP_NAME     523
-#define REDUCTION_GROUP_NAME  524
-#define REF_GROUP_NAME        525      
-#define ASYNC_ID	      526
-#define CONSISTENT_GROUP_NAME 527 
-
-#define ACC_REGION_DIR        	         900     /* ACC Fortran */
-#define ACC_END_REGION_DIR               901     /* ACC Fortran */
-#define ACC_CALL_STMT                    907     /* ACC Fortran */
-#define ACC_KERNEL_HEDR                  908     /* ACC Fortran */
-#define ACC_GET_ACTUAL_DIR               909     /* ACC Fortran */
-#define ACC_ACTUAL_DIR                   910     /* ACC Fortran */
-#define ACC_CHECKSECTION_DIR             911     /* ACC Fortran */
-#define ACC_END_CHECKSECTION_DIR         912     /* ACC Fortran */
-#define ACC_ROUTINE_DIR                  913     /* ACC Fortran */
-#define ACC_DECLARE_DIR                  914     /* ACC Fortran */
-
-#define ACC_TIE_OP                       930     /* ACC Fortran */                            
-#define ACC_INLOCAL_OP                   931     /* ACC Fortran */
-#define ACC_INOUT_OP                     932     /* ACC Fortran */
-#define ACC_IN_OP                        933     /* ACC Fortran */
-#define ACC_OUT_OP                       934     /* ACC Fortran */
-#define ACC_LOCAL_OP                     935     /* ACC Fortran */
-#define ACC_PRIVATE_OP                   936     /* ACC Fortran */
-#define ACC_DEVICE_OP                    937     /* ACC Fortran */
-#define ACC_CUDA_OP                      938     /* ACC Fortran */
-#define ACC_HOST_OP                      939     /* ACC Fortran */
-
-#define ACC_GLOBAL_OP                    940     /* ACC Fortran */ 
-#define ACC_ATTRIBUTES_OP                941     /* ACC Fortran */
-#define ACC_VALUE_OP                     942     /* ACC Fortran */
-#define ACC_SHARED_OP                    943     /* ACC Fortran */
-#define ACC_CONSTANT_OP                  944     /* ACC Fortran */
-#define ACC_USES_OP                      945     /* ACC Fortran */
-#define ACC_CALL_OP                      946     /* ACC Fortran */
-#define ACC_CUDA_BLOCK_OP                947     /* ACC Fortran */
-
-#define ACC_TARGETS_OP                   948     /* ACC Fortran */
-#define ACC_ASYNC_OP                     949     /* ACC Fortran */
-
-#define SPF_ANALYSIS_DIR                 950     /* SAPFOR */
-#define SPF_PARALLEL_DIR                 951     /* SAPFOR */
-#define SPF_TRANSFORM_DIR                952     /* SAPFOR */
-#define SPF_NOINLINE_OP                  953     /* SAPFOR */
-#define SPF_PARALLEL_REG_DIR             954     /* SAPFOR */
-#define SPF_END_PARALLEL_REG_DIR         955     /* SAPFOR */
-#define SPF_REGION_NAME                  956     /* SAPFOR */
-#define SPF_EXPAND_OP                    957     /* SAPFOR */
-#define SPF_FISSION_OP                   958     /* SAPFOR */ 
-#define SPF_SHRINK_OP                    959     /* SAPFOR */
-#define SPF_CHECPOINT_DIR                960     /* SAPFOR */
-#define SPF_TYPE_OP                      961     /* SAPFOR */
-#define SPF_VARLIST_OP                   962     /* SAPFOR */
-#define SPF_EXCEPT_OP                    963     /* SAPFOR */
-#define SPF_FILES_COUNT_OP               964     /* SAPFOR */
-#define SPF_INTERVAL_OP                  965     /* SAPFOR */
-#define SPF_TIME_OP                      966     /* SAPFOR */
-#define SPF_ITER_OP                      967     /* SAPFOR */
-#define SPF_FLEXIBLE_OP                  968     /* SAPFOR */
-#define SPF_PARAMETER_OP                 969     /* SAPFOR */
-#define SPF_CODE_COVERAGE_OP             970     /* SAPFOR */
-#define SPF_UNROLL_OP                    971     /* SAPFOR */
-#define SPF_COVER_OP                     972     /* SAPFOR */
-#define SPF_MERGE_OP                     973     /* SAPFOR */
-#define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
-#define SPF_WEIGHT_OP                    975     /* SAPFOR */
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/include/extern.h b/projects/dvm_svn/fdvm/trunk/include/extern.h
deleted file mode 100644
index d749658..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/extern.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#include "db.h"
-
-extern char *infname;
-extern char yytext[];
-extern int yyleng;
-extern int errline;
-extern int needkwd;
-extern int implkwd;
-extern int optkwd;
-extern int opt_kwd_;
-extern int opt_in_out;
-extern int as_op_kwd_;
-extern int opt_kwd_hedr;
-extern int opt_kwd_r;
-extern int optcorner;
-extern int optcall;
-extern int opt_l_s;
-extern int colon_flag;
-extern int inioctl;
-extern int shiftcase;
-extern int nowarnflag;
-extern int nwarn;
-extern int errcnt;
-extern int yylineno;
-extern int mod_offset;
-extern int num_files;
-
-extern int parstate;
-extern int procclass;
-extern long procleng;
-extern int nentry;
-extern int blklevel;
-extern int undeftype;
-extern int dorange;
-extern char intonly;
-extern PTR_TYPE global_unknown;
-extern PTR_FNAME head_file, cur_thread_file;
-extern PTR_FILE fi;
-
-char	*copyn(), *copys();
-
-#define INLOOP(x) ((LOOP_NODE <= x) && (x <= WHILE_NODE))
-
-#define NEW_SCOPE(x) ((x->variant == FORALL_NODE)|| \
-		      (x->variant == CDOALL_NODE)|| \
-		      (x->variant == SDOALL_NODE)|| \
-		      (x->variant == DOACROSS_NODE)|| \
-		      (x->variant == CDOACROSS_NODE)|| \
-		      (x->variant == FOR_NODE))
-
-extern int is_openmp_stmt; /*OMP*/
-extern int operator_slash; /*OMP*/
-#define BIT_OPENMP    1024*128*128     /* OpenMP Fortran */
diff --git a/projects/dvm_svn/fdvm/trunk/include/fdvm.h b/projects/dvm_svn/fdvm/trunk/include/fdvm.h
deleted file mode 100644
index e3f8293..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/fdvm.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/* The following 16 different options are used to
-   declare variables are as follows:
-   ( stored in symptr->attr )                      */
-
-#define ALLOCATABLE_BIT		1
-#define DIMENSION_BIT		2
-#define INHERIT_BIT		4
-#define EXTERNAL_BIT		8
-#define IN_BIT			16
-#define INOUT_BIT	        32
-#define INTRINSIC_BIT	        64
-#define OPTIONAL_BIT		128
-#define OUT_BIT			256
-#define PARAMETER_BIT		512
-#define POINTER_BIT		1024
-#define PRIVATE_BIT		2048
-#define PUBLIC_BIT		4096
-#define SAVE_BIT		8192
-#define SEQUENCE_BIT		16384
-#define RECURSIVE_BIT		32768
-#define TARGET_BIT		65536
-#define PROCESSORS_BIT		131072
-#define TEMPLATE_BIT            262144
-#define DISTRIBUTE_BIT          524288  
-#define ALIGN_BIT               1048576
-#define HEAP_BIT                2097152
-#define DYNAMIC_BIT             4194304
-#define SHADOW_BIT              8388608
-#define DVM_POINTER_BIT        16777216  
-#define COMMON_BIT             33554432
-#define INDIRECT_BIT           67108864
-#define POSTPONE_BIT          134217728    
-#define DO_VAR_BIT            268435456              
-#define DATA_BIT              536870912          
-#define TASK_BIT             1073741824
-
-#define EQUIVALENCE_BIT	          16384
-#define ALIGN_BASE_BIT         67108864
-#define CONSISTENT_BIT        268435456 
-
-#define ELEMENTAL_BIT           2097152
-#define PURE_BIT               33554432
-
-
-/* This constant is used in HPF unparser */
-
-#define DVM_POINTER_ARRAY_BIT 	268435456
-/*2147483648  */
-
-#define ALREADY_DISTRIBUTE_BIT 	    524288  
-#define ALREADY_ALIGN_BIT 	   1048576
-#define ALREADY_TEMPLATE_BIT        262144
-#define ALREADY_DYNAMIC_BIT        4194304
-#define ALREADY_PROCESSORS_BIT	    131072
-#define ALREADY_SHADOW_BIT	   8388608
-#define ALREADY_TASK_BIT	1073741824
-#define ALREADY_INHERIT_BIT	  67108864
-#define ALREADY_DVM_POINTER_BIT   16777216  
-#define ALREADY_TASK_BIT        1073741824
-
-/*ACC*/
-#define USE_IN_BIT		    8
-#define USE_OUT_BIT		32768
-
-#define USER_PROCEDURE_BIT        512
-
-/* This constant is used in analyzer */
-#define ASSOCIATION_BIT        2097152
diff --git a/projects/dvm_svn/fdvm/trunk/include/fdvm_version.h b/projects/dvm_svn/fdvm/trunk/include/fdvm_version.h
deleted file mode 100644
index 4986c60..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/fdvm_version.h
+++ /dev/null
@@ -1 +0,0 @@
-#define COMPILER_VERSION "4.1 (06.03.2025)" 
diff --git a/projects/dvm_svn/fdvm/trunk/include/inc.h b/projects/dvm_svn/fdvm/trunk/include/inc.h
deleted file mode 100644
index 0d90226..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/inc.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#include <stdio.h>
-#include "defs.h"
-#include "bif.h"
-#include "ll.h"
-#include "symb.h"
-#include "sets.h"
diff --git a/projects/dvm_svn/fdvm/trunk/include/leak_detector.h b/projects/dvm_svn/fdvm/trunk/include/leak_detector.h
deleted file mode 100644
index d26beac..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/leak_detector.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-#ifdef _WIN32
-#ifdef _DEBUG
-
-#define _CRTDBG_MAP_ALLOC 
-#include <stdlib.h> 
-#include <crtdbg.h>  
-
-#ifdef _DEBUG 
-	#ifndef DBG_NEW 
-		#define DBG_NEW new ( _NORMAL_BLOCK , __FILE__ , __LINE__ )
-		#define new DBG_NEW 
-	#endif 
-#endif 
-
-#endif
-#endif
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/include/libSageOMP.h b/projects/dvm_svn/fdvm/trunk/include/libSageOMP.h
deleted file mode 100644
index fa64efe..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/libSageOMP.h
+++ /dev/null
@@ -1,2000 +0,0 @@
-void InstrumentForOpenMPDebug (SgFile *f);
-//OMP PRIVATE CLAUSE
-
-class SgOMP_PRIVATE: public SgExpression{
-  // OMP PRIVATE (expr1, expr2, ....)
-  // variant == OMP_PRIVATE
-public:
-  inline SgOMP_PRIVATE(PTR_LLND ll);
-  inline SgOMP_PRIVATE(SgExpression &paramList);
-  inline ~SgOMP_PRIVATE();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-// SgOMP_PRIVATE--inlines
-
-inline SgOMP_PRIVATE::SgOMP_PRIVATE(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_PRIVATE::SgOMP_PRIVATE(SgExpression &paramList):SgExpression(OMP_PRIVATE)
-{
-  NODE_OPERAND0(thellnd) = paramList.thellnd;
-}
-
-inline SgOMP_PRIVATE::~SgOMP_PRIVATE()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression * SgOMP_PRIVATE::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgOMP_PRIVATE::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgOMP_PRIVATE::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-inline void SgOMP_PRIVATE::addArg(SgExpression &arg)
-{ NODE_OPERAND0(thellnd) = addToExprList(NODE_OPERAND0(thellnd),arg.thellnd); }
-
-//OMP SHARED CLAUSE
-
-class SgOMP_SHARED: public SgExpression{
-  // OMP SHARED (expr1, expr2, ....)
-  // variant == OMP_SHARED
-public:
-  inline SgOMP_SHARED(PTR_LLND ll);
-  inline SgOMP_SHARED(SgExpression &paramList);
-  inline ~SgOMP_SHARED();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-// SgOMP_SHARED--inlines
-
-inline SgOMP_SHARED::SgOMP_SHARED(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_SHARED::SgOMP_SHARED(SgExpression &paramList):SgExpression(OMP_SHARED)
-{
-  NODE_OPERAND0(thellnd) = paramList.thellnd;
-}
-
-inline SgOMP_SHARED::~SgOMP_SHARED()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression * SgOMP_SHARED::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgOMP_SHARED::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgOMP_SHARED::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-inline void SgOMP_SHARED::addArg(SgExpression &arg)
-{ NODE_OPERAND0(thellnd) = addToExprList(NODE_OPERAND0(thellnd),arg.thellnd); }
-
-//OMP FIRSTPRIVATE CLAUSE
-
-class SgOMP_FIRSTPRIVATE: public SgExpression{
-  // OMP FIRSTPRIVATE (expr1, expr2, ....)
-  // variant == OMP_FIRSTPRIVATE
-public:
-  inline SgOMP_FIRSTPRIVATE(PTR_LLND ll);
-  inline SgOMP_FIRSTPRIVATE(SgExpression &paramList);
-  inline ~SgOMP_FIRSTPRIVATE();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-// SgOMP_FIRSTPRIVATE--inlines
-
-inline SgOMP_FIRSTPRIVATE::SgOMP_FIRSTPRIVATE(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_FIRSTPRIVATE::SgOMP_FIRSTPRIVATE(SgExpression &paramList):SgExpression(OMP_FIRSTPRIVATE)
-{
-  NODE_OPERAND0(thellnd) = paramList.thellnd;
-}
-
-inline SgOMP_FIRSTPRIVATE::~SgOMP_FIRSTPRIVATE()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression * SgOMP_FIRSTPRIVATE::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgOMP_FIRSTPRIVATE::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgOMP_FIRSTPRIVATE::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-inline void SgOMP_FIRSTPRIVATE::addArg(SgExpression &arg)
-{ NODE_OPERAND0(thellnd) = addToExprList(NODE_OPERAND0(thellnd),arg.thellnd); }
-
-//OMP LASTPRIVATE CLAUSE
-
-class SgOMP_LASTPRIVATE: public SgExpression{
-  // OMP LASTPRIVATE (expr1, expr2, ....)
-  // variant == OMP_LASTPRIVATE
-public:
-  inline SgOMP_LASTPRIVATE(PTR_LLND ll);
-  inline SgOMP_LASTPRIVATE(SgExpression &paramList);
-  inline ~SgOMP_LASTPRIVATE();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-// SgOMP_LASTPRIVATE--inlines
-
-inline SgOMP_LASTPRIVATE::SgOMP_LASTPRIVATE(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_LASTPRIVATE::SgOMP_LASTPRIVATE(SgExpression &paramList):SgExpression(OMP_LASTPRIVATE)
-{
-  NODE_OPERAND0(thellnd) = paramList.thellnd;
-}
-
-inline SgOMP_LASTPRIVATE::~SgOMP_LASTPRIVATE()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression * SgOMP_LASTPRIVATE::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgOMP_LASTPRIVATE::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgOMP_LASTPRIVATE::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-inline void SgOMP_LASTPRIVATE::addArg(SgExpression &arg)
-{ NODE_OPERAND0(thellnd) = addToExprList(NODE_OPERAND0(thellnd),arg.thellnd); }
-
-//OMP THREADPRIVATE CLAUSE
-
-class SgOMP_THREADPRIVATE: public SgExpression{
-  // OMP THREADPRIVATE (expr1, expr2, ....)
-  // variant == OMP_THREADPRIVATE
-public:
-  inline SgOMP_THREADPRIVATE(PTR_LLND ll);
-  inline SgOMP_THREADPRIVATE(SgExpression &paramList);
-  inline ~SgOMP_THREADPRIVATE();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-// SgOMP_THREADPRIVATE--inlines
-
-inline SgOMP_THREADPRIVATE::SgOMP_THREADPRIVATE(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_THREADPRIVATE::SgOMP_THREADPRIVATE(SgExpression &paramList):SgExpression(OMP_THREADPRIVATE)
-{
-  NODE_OPERAND0(thellnd) = paramList.thellnd;
-}
-
-inline SgOMP_THREADPRIVATE::~SgOMP_THREADPRIVATE()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression * SgOMP_THREADPRIVATE::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgOMP_THREADPRIVATE::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgOMP_THREADPRIVATE::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-inline void SgOMP_THREADPRIVATE::addArg(SgExpression &arg)
-{ NODE_OPERAND0(thellnd) = addToExprList(NODE_OPERAND0(thellnd),arg.thellnd); }
-
-
-//OMP COPYIN CLAUSE
-
-class SgOMP_COPYIN: public SgExpression{
-  // OMP COPYIN (expr1, expr2, ....)
-  // variant == OMP_COPYIN
-public:
-  inline SgOMP_COPYIN(PTR_LLND ll);
-  inline SgOMP_COPYIN(SgExpression &paramList);
-  inline ~SgOMP_COPYIN();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-// SgOMP_COPYIN--inlines
-
-inline SgOMP_COPYIN::SgOMP_COPYIN(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_COPYIN::SgOMP_COPYIN(SgExpression &paramList):SgExpression(OMP_COPYIN)
-{
-  NODE_OPERAND0(thellnd) = paramList.thellnd;
-}
-
-inline SgOMP_COPYIN::~SgOMP_COPYIN()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression * SgOMP_COPYIN::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgOMP_COPYIN::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgOMP_COPYIN::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-inline void SgOMP_COPYIN::addArg(SgExpression &arg)
-{ NODE_OPERAND0(thellnd) = addToExprList(NODE_OPERAND0(thellnd),arg.thellnd); }
-
-//OMP COPYPRIVATE CLAUSE
-
-class SgOMP_COPYPRIVATE: public SgExpression{
-  // OMP COPYPRIVATE (expr1, expr2, ....)
-  // variant == OMP_COPYPRIVATE
-public:
-  inline SgOMP_COPYPRIVATE(PTR_LLND ll);
-  inline SgOMP_COPYPRIVATE(SgExpression &paramList);
-  inline ~SgOMP_COPYPRIVATE();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-// SgOMP_COPYPRIVATE--inlines
-
-inline SgOMP_COPYPRIVATE::SgOMP_COPYPRIVATE(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_COPYPRIVATE::SgOMP_COPYPRIVATE(SgExpression &paramList):SgExpression(OMP_COPYPRIVATE)
-{
-  NODE_OPERAND0(thellnd) = paramList.thellnd;
-}
-
-inline SgOMP_COPYPRIVATE::~SgOMP_COPYPRIVATE()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression * SgOMP_COPYPRIVATE::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgOMP_COPYPRIVATE::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgOMP_COPYPRIVATE::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-inline void SgOMP_COPYPRIVATE::addArg(SgExpression &arg)
-{ NODE_OPERAND0(thellnd) = addToExprList(NODE_OPERAND0(thellnd),arg.thellnd); }
-
-
-//OMP DEFAULT CLAUSE
-class SgOMP_DEFAULT: public SgExpression{
-  // OMP DEFAULT ( PRIVATE | SHARED | NONE )
-  // variant == OMP_DEFAULT
-public:
-  inline SgOMP_DEFAULT(PTR_LLND ll);
-  inline SgOMP_DEFAULT(char *raspis);
-  inline ~SgOMP_DEFAULT();
-};
-
-// SgOMP_DEFAULT--inlines
-
-inline SgOMP_DEFAULT::SgOMP_DEFAULT(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_DEFAULT::SgOMP_DEFAULT(char *raspis):SgExpression(OMP_DEFAULT)
-{
-  SgKeywordValExp	*x=new SgKeywordValExp(raspis);
-  NODE_OPERAND0(thellnd) = x->thellnd;
-}
-
-inline SgOMP_DEFAULT::~SgOMP_DEFAULT()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-//OMP ORDERED CLAUSE
-class SgOMP_ORDERED: public SgExpression{
-  // OMP ORDERED ( PRIVATE | SHARED | NONE )
-  // variant == OMP_ORDERED
-public:
-  inline SgOMP_ORDERED(PTR_LLND ll);
-  inline SgOMP_ORDERED(char *name);
-  inline ~SgOMP_ORDERED();
-};
-
-// SgOMP_ORDERED--inlines
-
-inline SgOMP_ORDERED::SgOMP_ORDERED(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_ORDERED::SgOMP_ORDERED(char *name):SgExpression(OMP_ORDERED)
-{
-  SgKeywordValExp *x=new SgKeywordValExp("ORDERED");
-  NODE_OPERAND0(thellnd) = x->thellnd;
-}
-
-inline SgOMP_ORDERED::~SgOMP_ORDERED()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-//OMP SCHEDULE CLAUSE
-class SgOMP_SCHEDULE: public SgExpression{
-  // OMP SCHEDULE ( type , chunk )
-  // variant == OMP_SCHEDULE
-public:
-  inline SgOMP_SCHEDULE(PTR_LLND ll);
-  inline SgOMP_SCHEDULE(char *name);
-  inline SgOMP_SCHEDULE(char *name, SgExpression &chunk);
-  inline SgOMP_SCHEDULE(const char *name);
-  inline SgOMP_SCHEDULE(const char *name, SgExpression &chunk);
-  inline ~SgOMP_SCHEDULE();
-};
-
-// SgOMP_SCHEDULE--inlines
-
-inline SgOMP_SCHEDULE::SgOMP_SCHEDULE(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_SCHEDULE::SgOMP_SCHEDULE(char *name):SgExpression(OMP_SCHEDULE)
-{
-  SgKeywordValExp *x=new SgKeywordValExp(name);
-  NODE_OPERAND0(thellnd) = x->thellnd;
-}
-
-inline SgOMP_SCHEDULE::SgOMP_SCHEDULE(const char *name) :SgExpression(OMP_SCHEDULE)
-{
-    SgKeywordValExp *x = new SgKeywordValExp(name);
-    NODE_OPERAND0(thellnd) = x->thellnd;
-}
-
-inline SgOMP_SCHEDULE::SgOMP_SCHEDULE(char *name,SgExpression &chunk):SgExpression(OMP_SCHEDULE)
-{
-  SgKeywordValExp *x=new SgKeywordValExp(name);
-  NODE_OPERAND0(thellnd) = x->thellnd;
-  NODE_OPERAND1(thellnd) = chunk.thellnd;
-}
-
-inline SgOMP_SCHEDULE::SgOMP_SCHEDULE(const char *name, SgExpression &chunk) :SgExpression(OMP_SCHEDULE)
-{
-    SgKeywordValExp *x = new SgKeywordValExp(name);
-    NODE_OPERAND0(thellnd) = x->thellnd;
-    NODE_OPERAND1(thellnd) = chunk.thellnd;
-}
-
-inline SgOMP_SCHEDULE::~SgOMP_SCHEDULE()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-//OMP REDUCTION CLAUSE
-
-class SgOMP_REDUCTION: public SgExpression{
-  // OMP REDUCTION ({operator|intrinsic_procedure_name} : expr1, expr2, ....)
-  // variant == OMP_REDUCTION
-public:
-  inline SgOMP_REDUCTION(PTR_LLND ll);
-  inline SgOMP_REDUCTION(SgExpression &redop,SgExpression &redList);
-  inline SgOMP_REDUCTION(char *redname);
-  inline SgOMP_REDUCTION(char *redname,SgExpression &redList);
-  inline SgOMP_REDUCTION(const char *redname);
-  inline SgOMP_REDUCTION(const char *redname, SgExpression &redList);
-  inline ~SgOMP_REDUCTION();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-// SgOMP_REDUCTION--inlines
-
-inline SgOMP_REDUCTION::SgOMP_REDUCTION(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_REDUCTION::SgOMP_REDUCTION(SgExpression &redOp,SgExpression &redList):SgExpression(OMP_REDUCTION)
-{
-  NODE_OPERAND0(thellnd) = redList.thellnd;
-  NODE_OPERAND1(thellnd) = redOp.thellnd;
-
-}
-inline SgOMP_REDUCTION::SgOMP_REDUCTION(char *name):SgExpression(OMP_REDUCTION)
-{
-  SgKeywordValExp *x=new SgKeywordValExp(name);
-  NODE_OPERAND1(thellnd) = x->thellnd;
-}
-inline SgOMP_REDUCTION::SgOMP_REDUCTION(char *name,SgExpression &redList):SgExpression(OMP_REDUCTION)
-{
-  SgKeywordValExp *x=new SgKeywordValExp(name);
-  NODE_OPERAND0(thellnd) = redList.thellnd;
-  NODE_OPERAND1(thellnd) = x->thellnd;
-}
-inline SgOMP_REDUCTION::SgOMP_REDUCTION(const char *name) :SgExpression(OMP_REDUCTION)
-{
-    SgKeywordValExp *x = new SgKeywordValExp(name);
-    NODE_OPERAND1(thellnd) = x->thellnd;
-}
-inline SgOMP_REDUCTION::SgOMP_REDUCTION(const char *name, SgExpression &redList) : SgExpression(OMP_REDUCTION)
-{
-    SgKeywordValExp *x = new SgKeywordValExp(name);
-    NODE_OPERAND0(thellnd) = redList.thellnd;
-    NODE_OPERAND1(thellnd) = x->thellnd;
-}
-
-inline SgOMP_REDUCTION::~SgOMP_REDUCTION()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgExpression * SgOMP_REDUCTION::args()
-{ return LlndMapping(NODE_OPERAND0(thellnd)); }
-
-inline  int SgOMP_REDUCTION::numberOfArgs()
-{ return exprListLength(NODE_OPERAND0(thellnd)); }
-
-inline SgExpression * SgOMP_REDUCTION::arg(int i)
-{ return LlndMapping(getPositionInExprList(NODE_OPERAND0(thellnd),i));  }
-
-inline void SgOMP_REDUCTION::addArg(SgExpression &arg)
-{ NODE_OPERAND0(thellnd) = addToExprList(NODE_OPERAND0(thellnd),arg.thellnd); }
-
-//OMP IF CLAUSE
-class SgOMP_IF: public SgExpression{
-  // OMP IF ( scalar_logical_expression )
-  // variant == OMP_IF
-public:
-  inline SgOMP_IF(PTR_LLND ll);
-  inline SgOMP_IF(SgExpression &cond);
-  inline ~SgOMP_IF();
-};
-
-// SgOMP_IF--inlines
-
-inline SgOMP_IF::SgOMP_IF(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_IF::SgOMP_IF(SgExpression &cond):SgExpression(OMP_IF)
-{
-  SgKeywordValExp	*x=new SgKeywordValExp("IF");
-  NODE_OPERAND0(thellnd) = x->thellnd;
-  NODE_OPERAND1(thellnd) =cond.thellnd;
-}
-
-inline SgOMP_IF::~SgOMP_IF()
-{ RemoveFromTableLlnd((void *) this); }
-
-//OMP NUM_THREADS CLAUSE
-class SgOMP_NUM_THREADS: public SgExpression{
-  // OMP NUM_THREADS ( scalar_integer_expression )
-  // variant == OMP_NUM_THREADS
-public:
-  inline SgOMP_NUM_THREADS(PTR_LLND ll);
-  inline SgOMP_NUM_THREADS(SgExpression &cond);
-  inline ~SgOMP_NUM_THREADS();
-};
-
-// SgOMP_NUM_THREADS--inlines
-
-inline SgOMP_NUM_THREADS::SgOMP_NUM_THREADS(PTR_LLND ll):SgExpression(ll)
-{}
-
-inline SgOMP_NUM_THREADS::SgOMP_NUM_THREADS(SgExpression &cond):SgExpression(OMP_NUM_THREADS)
-{
-  SgKeywordValExp	*x=new SgKeywordValExp("NUM_THREADS");
-  NODE_OPERAND0(thellnd) = x->thellnd;
-  NODE_OPERAND1(thellnd) =cond.thellnd;
-}
-
-inline SgOMP_NUM_THREADS::~SgOMP_NUM_THREADS()
-{ RemoveFromTableLlnd((void *) this); }
-
-
-// !!!! OPENMP Statement OPENMP !!!!
-
-class SgOMPStmt: public SgStatement{
-  // the Openmp Fortran  statement
-  // variant == OPENMP_STAT
-public:
-  inline SgOMPStmt(int variant);
-  inline SgOMPStmt(int variant, SgExpression &e1);
-  inline SgOMPStmt(int variant, SgExpression &e1,
-                     SgExpression &e2);
-  inline ~SgOMPStmt();
-  inline void addClause0(SgExpression &clause);
-  inline void addClause1(SgExpression &clause);
-  inline void addClause2(SgExpression &clause);
- };
-
-// SgOMPStmt--inlines
-inline SgOMPStmt::SgOMPStmt(int variant):SgStatement(variant)
-{ }
-
-inline SgOMPStmt::SgOMPStmt(int variant, SgExpression &e1):SgStatement(variant)
-{ BIF_LL1(thebif) = e1.thellnd; }
-
-
-inline SgOMPStmt::SgOMPStmt(int variant, SgExpression &e1, SgExpression &e2)
-                   :SgStatement(variant)
-{
-  BIF_LL1(thebif) = e1.thellnd;
-  BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), e2.thellnd);
-}
-
-inline SgOMPStmt::~SgOMPStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-inline void SgOMPStmt::addClause0(SgExpression &clause)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif), clause.thellnd); }
-
-inline void SgOMPStmt::addClause1(SgExpression &clause)
-{ BIF_LL2(thebif) = addToExprList(BIF_LL2(thebif), clause.thellnd); }
-
-inline void SgOMPStmt::addClause2(SgExpression &clause)
-{ BIF_LL3(thebif) = addToExprList(BIF_LL3(thebif), clause.thellnd); }
-
-
-
-
-class SgRecordStmt: public SgClassStmt{
-  // type type_name
-  //    fields
-  // end type
-  // variant == STRUCT_DECL
-public:
-  // consider like a class.
-  inline SgRecordStmt();
-  inline SgRecordStmt(SgSymbol &type,SgStatement &body);
-  inline ~SgRecordStmt();
-  
-};
-
-// SgRecordStmt--inlines
-
-inline SgRecordStmt::SgRecordStmt():SgClassStmt(STRUCT_DECL)
-{}
-
-inline SgRecordStmt::SgRecordStmt(SgSymbol &type,SgStatement &body):SgClassStmt(type)
-{
-  if (CurrentProject->Fortranlanguage())
-    {
-	  BIF_SYMB(thebif) = type.thesymb;
-	  BIF_CODE(thebif) = RECORD_DECL;
-	  insertBfndListIn(body.thebif,thebif,thebif);
-	  addControlEndToStmt(thebif);
-    } else
-      {
-        SORRY;
-      }
-}
-
-inline SgRecordStmt::~SgRecordStmt()
-{ RemoveFromTableBfnd((void *) this); }
-
-
-class SgFunctionCallStmt: public SgStatement{
-  // function_call(expr1, expr2, ....)
-  // or
-  // ALLOCATE(expr1, expr2, ....)
-  // variant == FUNC_CALL
-
-public:
-  inline SgFunctionCallStmt(SgExpression &paramList);
-  inline SgFunctionCallStmt(SgSymbol &fun, SgExpression &paramList);
-  inline ~SgFunctionCallStmt();
-  inline SgSymbol *funName();
-  inline SgExpression *args();
-  inline int numberOfArgs();
-  inline SgExpression *arg(int i);
-  inline void addArg(SgExpression &arg);
-};
-
-// SgFunctionCallStmt--inlines
-
-
-inline SgFunctionCallStmt::SgFunctionCallStmt(SgSymbol &fun, SgExpression &paramList):SgStatement(FUNC_STAT)
-{
-  BIF_SYMB(thebif)= fun.thesymb;
-  BIF_CODE(thebif)= FUNC_STAT;
-  BIF_LL1(thebif) = paramList.thellnd;
-}
-
-inline SgFunctionCallStmt::SgFunctionCallStmt(SgExpression &paramList):SgStatement(FUNC_STAT)
-{
-  SgSymbol fun(FUNCTION_NAME,"allocate");
-  BIF_SYMB(thebif)= fun.thesymb;
-  BIF_CODE(thebif)= FUNC_STAT;
-  BIF_LL1(thebif) = paramList.thellnd;
-
-}
-inline SgFunctionCallStmt::~SgFunctionCallStmt()
-{ RemoveFromTableLlnd((void *) this); }
-
-inline SgSymbol *SgFunctionCallStmt::funName()
-{ return SymbMapping(BIF_SYMB(thebif)); }
-
-inline SgExpression * SgFunctionCallStmt::args()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-inline  int SgFunctionCallStmt::numberOfArgs()
-{ return exprListLength(BIF_LL1(thebif)); }
-
-inline SgExpression * SgFunctionCallStmt::arg(int i)
-{ return LlndMapping(getPositionInExprList(BIF_LL1(thebif),i));  }
-
-inline void SgFunctionCallStmt::addArg(SgExpression &arg)
-{ BIF_LL1(thebif) = addToExprList(BIF_LL1(thebif),arg.thellnd); }
-
-
-class SgF90PointerAssignStmt: public SgExecutableStatement{
-  // Fortran assignment Statment
-  // variant == POINTER_ASSIGN_STAT
-public:
-  inline SgF90PointerAssignStmt(int variant);
-  inline SgF90PointerAssignStmt(SgExpression &lhs, SgExpression &rhs);
-  inline SgExpression *lhs();  // the left hand side
-  inline SgExpression *rhs();  // the right hand side
-  inline void replaceLhs(SgExpression &e); // replace lhs with e
-  inline void replaceRhs(SgExpression &e); // replace rhs with e
-};
-
-// SgF90PointerAssignStmt--inlines
-
-inline SgF90PointerAssignStmt::SgF90PointerAssignStmt(int variant):SgExecutableStatement(variant)
-{}
-inline SgF90PointerAssignStmt::SgF90PointerAssignStmt(SgExpression &lhs, SgExpression &rhs):SgExecutableStatement(POINTER_ASSIGN_STAT)
-{
-  BIF_LL1(thebif) = lhs.thellnd;
-  BIF_LL2(thebif) = rhs.thellnd;
-}
-
-inline SgExpression * SgF90PointerAssignStmt::lhs()
-{ return LlndMapping(BIF_LL1(thebif)); }
-
-// the right hand side
-inline SgExpression * SgF90PointerAssignStmt::rhs()
-{ return LlndMapping(BIF_LL2(thebif)); }
-
-// replace lhs with e
-inline void SgF90PointerAssignStmt::replaceLhs(SgExpression &e)
-{ BIF_LL1(thebif) = e.thellnd; }
-
-// replace rhs with e
-inline void SgF90PointerAssignStmt::replaceRhs(SgExpression &e)
-{ BIF_LL2(thebif) = e.thellnd; }
-///////////////////////////NEW LIST STRUCTURES ////////////////////////
-
-extern SgStatement *cur_func;  // current function 
-extern SgFile *current_file;    //current file
-
-struct pointer_list {
-       pointer_list *next;
-	   int dim;
-       SgSymbol *symb;
-};
-struct type_list {
-       type_list *next;
-	   SgType *type;
-	   SgType *base;
-};
-///////////////////////////OPENMP FUNCTIONS INTERFACE////////////////////////
-void TranslateFileDVMOpenMP(SgFile *f);
-SgSymbol* GenerateNewVariableName(const char *name);
-SgSymbol* GenerateTypeName(int dim);
-void GenerateOMPRoutinesName(void);
-SgExpression * TranslateOpenMPReduction(SgExpression *red) ;
-SgExpression * TranslateOpenMPPrivate(SgExpression *pri,SgExpression *on) ;
-SgExpression * AddOpenMPPrivate(SgExpression *private_clause,SgExprListExp *explist) ;
-SgSymbol * DeclarePointerTypeRecord(SgStatement *stmt,int numdim,SgType *type);
-void DeclarePointerType(SgStatement *stmt,SgSymbol *sym,int numdim,SgType *type);
-pointer_list  *AddToPointerList ( pointer_list *ls, SgSymbol *s,int dim);
-int FindInPointerList ( pointer_list *ls, SgSymbol *s);
-pointer_list* FindPointerInPointerList ( pointer_list *ls, SgSymbol *s);
-type_list  *AddToTypeList ( type_list *ls, SgType *t, SgType *base);
-type_list* FindTypeInTypeList ( type_list *ls, SgType *t, int dim);
-void TransFuncOpenMP(SgStatement *func) ;
-//char* filterDVM(char *s);
-///////////////////////////OPENMP FUNCTIONS DEFINITION////////////////////////
-void TranslateFileDVMOpenMP(SgFile *f)
-{
-  SgStatement *func;
-  SgExpression *var_ref;
-  int i,numfun;
-  numfun = f->numberOfFunctions(); //  number of functions
-// function is program unit accept BLOCKDATA and MODULE (F90),i.e. 
-// PROGRAM, SUBROUTINE, FUNCTION
-  for(var_ref=f->firstExpression();var_ref;var_ref=var_ref->nextInExprTable())
-  {
-	if ((var_ref->variant()==ARRAY_REF)&&((var_ref->symbol()->thesymb->attr & HEAP_BIT)||!strcmp("heap",var_ref->symbol()->identifier())))
-		{
-			SgExpression *arr_ref=NULL;		
-			arr_ref=var_ref->lhs();
-			if (arr_ref&&isSgExprListExp(arr_ref)&&(isSgArrayRefExp(arr_ref->lhs())||isSgFunctionCallExp(arr_ref->lhs())||isSgVarRefExp(arr_ref->lhs())))
-				{
-				SgSymbol *s;
-				SgExpression *lhs,*tmp;
-				tmp=arr_ref->lhs();	
-				if (tmp&&tmp->symbol())
-					{
-					if(tmp->lhs())
-						{
-						lhs=new SgExpression(ARRAY_REF,tmp->lhs()->copyPtr(),NULL,tmp->symbol());
-						//lhs=tmp->lhs()->copyPtr();
-						//var_ref->setSymbol(*tmp->symbol());
-						s=new SgSymbol(FIELD_NAME,"PTR");
-						var_ref->setLhs(*lhs);
-						NODE_CODE(var_ref->thellnd)=RECORD_REF;
-						//var_ref->setVariant(RECORD_REF);
-						var_ref->setRhs(*(new SgVarRefExp(*s)));
-						}
-					else 
-						{
-						var_ref->setSymbol(*tmp->symbol());
-						var_ref->setLhs(NULL);
-						}
-					}
-				else printf("error in string statement - line  \n");
-				}
-		}
-  }
-  for(i = 0; i < numfun; i++) { 
-     func = f -> functions(i);
-     cur_func = func;
-     TransFuncOpenMP(func);
-  }
-}
-
-SgSymbol* GenerateNewVariableName(const char *name)
-{
-	int i=0,ok=1;
-	char str[80];
-	SgSymbol *tmp;
-	while (ok)
-	{
-		if (i) sprintf(str,"%s%i",name,i);
-		else sprintf(str,"%s",name);
-		for (tmp = current_file->firstSymbol(); tmp ; tmp = tmp->next())
-		{
-			if (!strcmp(tmp->identifier(),str)) 
-			{
-				i++;
-				break;
-			}
-		}
-	if (!tmp) ok=0;
-	}
-	return (new SgSymbol(VARIABLE_NAME,str));
-}
-
-void GenerateOMPRoutinesName(void)
-{
-    int i = 0;// ok = 1;
-	const char *str[]={"omp_get_num_threads","omp_get_thread_num"};
-	char name[80];
-	SgSymbol *tmp;
-	for(i=0;i<2;i++) 
-	{
-		sprintf(name,"%s",str[i]);
-		for (tmp = current_file->firstSymbol(); tmp ; tmp = tmp->next())
-		{
-			if ((tmp->scope()==cur_func)&&(!strcmp(tmp->identifier(),name))) 
-			{
-			    break;
-			}
-		}
-		if (!tmp)
-		{
-		tmp=new SgSymbol(VARIABLE_NAME,str[i]);
-		tmp->declareTheSymbol(*cur_func);
-		}
-	}
-}
-
-SgSymbol* GenerateTypeName(int dim)
-{
-	SgSymbol *tmp;
-	int i=0,ok=1;
-	char str[80];
-	while (ok)
-	{
-		if (i) sprintf(str,"ptr_type%i%i",dim,i);
-		else sprintf(str,"ptr_type%i",dim);
-		for (tmp = current_file->firstSymbol(); tmp ; tmp = tmp->next())
-		{
-			if (!strcmp(tmp->identifier(),str)) 
-			{
-				i++;
-				break;
-			}
-		}
-	if (!tmp) ok=0;
-	}
-	return (new SgSymbol(VARIABLE_NAME,str));
-}
-
-
-
-SgExpression * TranslateOpenMPPrivate(SgExpression *private_clause,SgExpression *on_clause) 
-{
-    SgExprListExp *explist = NULL, *prilist = NULL;
-    int i, length = 0;
-	if (private_clause!=NULL&&private_clause->lhs()!=NULL) 
-		{	prilist=new SgExprListExp(private_clause->lhs()->thellnd);
-			if (on_clause->lhs()!=NULL) explist=new SgExprListExp(on_clause->thellnd);
-			length=explist->length();
-			for (i=0;i<length;i++)
-				{
-					prilist->append(*explist->elem(i));
-				}	
-		return (new SgOMP_PRIVATE(*prilist)); 
-		}
-	else return (new SgOMP_PRIVATE(*on_clause)); 
-}
-
-SgExpression * AddOpenMPPrivate(SgExpression *private_clause,SgExprListExp *explist) 
-{
-	SgExprListExp *prilist;
-    int i, length = 0;
-	if (private_clause!=NULL&&private_clause->lhs()!=NULL) 
-		{	prilist=new SgExprListExp(private_clause->lhs()->thellnd);
-			if (explist!=NULL) 	length=explist->length();
-			for (i=0;i<length;i++)
-				{
-					prilist->append(*explist->elem(i));
-				}	
-		return (new SgOMP_PRIVATE(*prilist)); 
-		}
-	else return (new SgOMP_PRIVATE(*explist)); 
-}
-
-SgExpression * TranslateOpenMPReduction(SgExpression *reduction_clause) 
-{
-	SgExprListExp *explist = NULL, *OpenMPReductions;
-	SgExpression *clause;
-	SgExprListExp *red_max,*red_min,*red_sum,*red_product;
-	SgExprListExp *red_and,*red_eqv,*red_neqv;
-	SgExprListExp *red_or;
-	int i,length;
-	red_max=red_min=red_sum=red_product=red_or=red_and=red_eqv=red_neqv=NULL;
-	OpenMPReductions=NULL;
-	if (reduction_clause->lhs()!=NULL) explist=new SgExprListExp(reduction_clause->lhs()->thellnd);
-	length=explist->length();
-	for (i=0;i<length;i++)
-		{
-			clause=explist->elem(i);
-			switch (clause->variant())
-				{
-				case ARRAY_OP:
-					{
-						if ((clause->lhs()!=NULL)&&(clause->rhs()!=NULL))
-						{
-							if (clause->lhs()->variant()==KEYWORD_VAL)
-								{
-								char *reduction_name=NODE_STRING_POINTER(clause->lhs()->thellnd);
-								if (!strcmp(reduction_name,"max"))
-									{
-									 if (red_max!=NULL) red_max->append(*clause->rhs());
-									 else red_max=new SgExprListExp(*clause->rhs());
-								 	 continue;
-									}
-								if (!strcmp(reduction_name,"min"))
-									{
-									 if (red_min!=NULL) red_min->append(*clause->rhs());  
-									 else red_min=new SgExprListExp(*clause->rhs());
-									 continue;
-									}
-								if (!strcmp(reduction_name,"sum"))
-									{
-									 if (red_sum!=NULL) red_sum->append(*clause->rhs());  
-									 else red_sum=new SgExprListExp(*clause->rhs());
-									 continue;
-									}
-								if (!strcmp(reduction_name,"product"))
-									{
-									 if (red_product!=NULL) red_product->append(*clause->rhs());  
-									 else red_product=new SgExprListExp(*clause->rhs());
-									 continue;
-									}
-
-								if (!strcmp(reduction_name,"or"))
-									{
-									 if (red_or!=NULL) red_or->append(*clause->rhs());  
-									 else red_or=new SgExprListExp(*clause->rhs());
-			 						 continue;
-									}
-								if (!strcmp(reduction_name,"and"))
-									{
-									 if (red_and!=NULL) red_and->append(*clause->rhs());  
- 								     else red_and=new SgExprListExp(*clause->rhs());
-									 continue;
-									}
-								if (!strcmp(reduction_name,"eqv"))
-									{
-									 if (red_eqv!=NULL) red_eqv->append(*clause->rhs());  
- 								     else red_eqv=new SgExprListExp(*clause->rhs());
-									 continue;
-									}
-								if (!strcmp(reduction_name,"neqv"))
-									{
-									 if (red_neqv!=NULL) red_neqv->append(*clause->rhs());  
- 								     else red_neqv=new SgExprListExp(*clause->rhs());
-									 continue;
-									}
-								if (!strcmp(reduction_name,"maxloc"))
-									{
-									return NULL;
-									}
-								if (!strcmp(reduction_name,"minloc"))
-									{
-									return NULL;
-									}
-							}
-									
-						}
-						break;
-					}
-
-				}
-		}
-	//OpenMPReductions=new SgExprListExp();
-	if (red_max!=NULL) 
-		{
-		if (!OpenMPReductions) OpenMPReductions=new SgExprListExp(*(new SgOMP_REDUCTION("max",*red_max)));
-		else OpenMPReductions->append(*(new SgOMP_REDUCTION("max",*red_max)));
-		}
-	if (red_min!=NULL) 
-		{
-		if (!OpenMPReductions) OpenMPReductions=new SgExprListExp(*(new SgOMP_REDUCTION("min",*red_min)));
-		else OpenMPReductions->append(*(new SgOMP_REDUCTION("min",*red_min)));
-		}
-	if (red_sum!=NULL) 
-		{
-		if (!OpenMPReductions) OpenMPReductions=new SgExprListExp(*(new SgOMP_REDUCTION("+",*red_sum)));
-		else OpenMPReductions->append(*(new SgOMP_REDUCTION("+",*red_sum)));
-		}
-	if (red_product!=NULL) 
-		{
-		if (!OpenMPReductions) OpenMPReductions=new SgExprListExp(*(new SgOMP_REDUCTION("*",*red_product)));
-		else OpenMPReductions->append(*(new SgOMP_REDUCTION("*",*red_product)));
-		}
-	if (red_eqv!=NULL) 
-		{
-		if (!OpenMPReductions) OpenMPReductions=new SgExprListExp(*(new SgOMP_REDUCTION(".eq.",*red_eqv)));
-		else OpenMPReductions->append(*(new SgOMP_REDUCTION(".eq.",*red_eqv)));
-		}
-	if (red_neqv!=NULL) 
-		{
-		if (!OpenMPReductions) OpenMPReductions=new SgExprListExp(*(new SgOMP_REDUCTION(".neqv.",*red_neqv)));
-		else OpenMPReductions->append(*(new SgOMP_REDUCTION(".neqv.",*red_neqv)));
-		}
-	if (red_or!=NULL) 
-		{
-		if (!OpenMPReductions) OpenMPReductions=new SgExprListExp(*(new SgOMP_REDUCTION(".or.",*red_or)));
-		else OpenMPReductions->append(*(new SgOMP_REDUCTION(".or.",*red_or)));
-		}
-	if (red_and!=NULL) 
-		{
-		if (!OpenMPReductions) OpenMPReductions=new SgExprListExp(*(new SgOMP_REDUCTION(".and.",*red_and)));
-		else OpenMPReductions->append(*(new SgOMP_REDUCTION(".and.",*red_and)));
-		}
-	return OpenMPReductions;
-}
-
-SgExpression *GenerateArrayRefDimList(int length,SgSymbol *arr_name,SgExpression *sub)
-{
-	int i,subpos,j;
-	SgExprListExp *expr,*ret;
-	expr=ret=NULL;
-	if ((sub!=NULL)&&(expr=isSgExprListExp(sub)))
-		{
-		for(i=0;i<expr->length();i++)
-			{
-			if (isSgValueExp(expr->elem(i))) break;
-			}
-		subpos=i;
-		for(j=1;j<=length;j++)
-			{
-			SgExprListExp *tmp=NULL;
-			for(i=0;i<expr->length();i++)
-				{
-				if (i==subpos) 
-					{
-					if(tmp) tmp->append(*(new SgValueExp(j)));
-					else tmp=new SgExprListExp(*(new SgValueExp(j)));
-					}
-				else
-					{
-					if(tmp) tmp->append(*expr->elem(i));
-					else tmp=new SgExprListExp(*expr->elem(i));
-					}
-				}
-			if (ret) ret->append(* (new SgArrayRefExp(*arr_name,*tmp)));
-			else ret=new SgExprListExp(* (new SgArrayRefExp(*arr_name,*tmp)));
-			}
-
-		}
-	else 
-		{
-		for(j=1;j<=length;j++)
-			{
-			//if(tmp) tmp->append(*(new SgValueExp(j)));
-			//else tmp=new SgExprListExp(*(new SgValueExp(j)));
-			//if (ret) ret->append(SgArrayRefExp(*arr_name,*tmp));
-			//else ret=new SgExprListExp(SgArrayRefExp(*arr_name,*tmp));
-			if (ret != NULL)
-                ret->append(* (new SgArrayRefExp(*arr_name,*(new SgExprListExp(*(new SgValueExp(j)))))));
-			else 
-                ret=new SgExprListExp(* (new SgArrayRefExp(*arr_name,*(new SgExprListExp(*(new SgValueExp(j)))))));
-			
-			}
-		}
-return ret;
-}
-
-SgStatement *NextStmtAfterLoopStmt(SgStatement *st)
-{
-	SgForStmt *for_loop=NULL;
-	if ( (for_loop=isSgForStmt(st)) != 0)
-		{
-		if (for_loop->isEnddoLoop())
-			{
-			return st->lastNodeOfStmt();
-			}
-		else
-			{
-			SgLabel *label=NULL;
-			SgStatement *ret=NULL;
-			if ( (label=for_loop->endOfLoop()) != 0)
-				{
-				ret=st;
-				while (ret)
-					{
-					ret=ret->lexNext();
-					if (ret->label()&&(ret->label()->id()==label->id()))
-						return ret;
-					} 
-					return NULL;
-				}
-			else return NULL;
-			}
-		}
-	else return NULL;
-}
-void TransFuncOpenMP(SgStatement *func) {
-  SgStatement *stmt,*last, *first;
-  pointer_list *pointer=NULL;
-  symb_list *heaps=NULL;
-  stmt_list *stmt_to_delete = NULL;
-  first = func->lexNext();
-  last = func->lastNodeOfStmt();
-  if(!(last->variant() == CONTROL_END))
-     printf(" END Statement is absent\n");
-  if ((func->variant()==FUNC_HEDR)&&func->symbol()&&(!strcmp(func->symbol()->identifier(),"allocate")))
-	{
-	  //SgSymbol *s;
-	  SgSymbol old=func->symbol()->copyLevel1();
-	  //s=GenerateNewVariableName("user_allocate");  	    
-	  //if (func->IsSymbolReferenced(*func->symbol()))
-	  func->replaceSymbBySymb(*func->symbol(),*GenerateNewVariableName("user_allocate"));
-	  SYMB_FUNC_PARAM(func->symbol()->thesymb)=SYMB_FUNC_PARAM(old.thesymb);
-	}
-  for (stmt = first; stmt && (stmt != last); stmt = stmt->lexNext())
-  {
-	if (isSgForStmt(stmt)) convertToEnddoLoop(stmt->thebif); 
-  }
-  for (stmt = first; stmt && (stmt != last); stmt = stmt->lexNext())
-  {
-    //printf("stmt line :%i\n",stmt->lineNumber());
-    if (isSgExecutableStatement(stmt))
-	// is Fortran specification statement
-	// isSgExecutableStatement: 
-	//               FALSE  -  for specification statement of Fortan 90
-	//               TRUE   -  for executable statement of Fortan 90 and
-	//                         all directives of F-DVM 
-      {
-		if(stmt->variant()==DVM_HEAP_DIR)
-			{
-				SgExprListExp *heap;
-				if (isSgExprListExp(stmt->expr(0)))
-					{
-					int i;
-					heap=isSgExprListExp(stmt->expr(0));
-					for(i=0;i<heap->length();i++)
-						heaps=AddToSymbList(heaps,heap->elem(i)->symbol());
-					}
-				else printf("error in string statement - line  %i\n",stmt->lineNumber());
-			}
-		if(stmt->variant()==DVM_POINTER_DIR) 
-			{
-				SgExprListExp *vars,*dim;
-				SgTypeExp *type;
-				int i;
-				if (isSgExprListExp(stmt->expr(0))&&isSgExprListExp(stmt->expr(1))&&isSgTypeExp(stmt->expr(2)))
-					{
-					vars=isSgExprListExp(stmt->expr(0));
-					dim=isSgExprListExp(stmt->expr(1));
-					type=isSgTypeExp(stmt->expr(2));
-					for(i=0;i<vars->length();i++)
-						{
-						if (vars->elem(i)->symbol())
-							{
-							SgSymbol *s;
-							s=new SgSymbol(VARIABLE_NAME,vars->elem(i)->symbol()->identifier());
-							s->setType(*type->type());
-							pointer=AddToPointerList(pointer,s,dim->length());
-							}
-						}
-					}
-			}
-		if(stmt->variant()==ASSIGN_STAT) 
-			{
-			SgExpression *left;
-			SgFunctionCallExp *right;
-			left=NULL;
-			right=NULL;
-			left=stmt->expr(0);
-			SgSymbol ptr(VARIABLE_NAME,"PTR");
-			ptr.setType(* (new SgType(T_ARRAY)));
-			if (left&&stmt->expr(1)&&(right=isSgFunctionCallExp(stmt->expr(1))))
-				{
-				if (!strcmp(right->funName()->identifier(),"allocate"))
-					{
-					SgExprListExp *expr_list=NULL;
-					SgArrayRefExp *array_ref=NULL;
-					if (right->args()&&right->arg(0)) 
-						{
-						expr_list=new SgExprListExp(*right->arg(0));
-						}
-					stmt_to_delete = addToStmtList(stmt_to_delete, stmt);
-					if (isSgArrayRefExp(expr_list->elem(0))||isSgFunctionCallExp(expr_list->elem(0))||isSgVarRefExp(expr_list->elem(0)))
-						{
-						expr_list->elem(0)->symbol()->setType(* (new SgType(T_ARRAY)));
-						if (expr_list->elem(0)->lhs())
-							array_ref=new SgArrayRefExp(*expr_list->elem(0)->symbol(),*expr_list->elem(0)->lhs());
-						else
-							{
-							array_ref=new SgArrayRefExp(*expr_list->elem(0)->symbol());
-							}
-						if (left&&left->symbol())
-							{
-							if (left->lhs())
-								{
-								array_ref=new SgArrayRefExp(ptr,*GenerateArrayRefDimList(FindInPointerList(pointer,left->symbol()),array_ref->symbol(),array_ref->lhs()));				
-								stmt->insertStmtAfter(*(new SgFunctionCallStmt(*(new SgExpression(RECORD_REF,left,array_ref,NULL,NULL)))));	
-								}
-							else
-								{
-								stmt->insertStmtAfter(*(new SgFunctionCallStmt(*(new SgExpression(ARRAY_REF,GenerateArrayRefDimList(FindInPointerList(pointer,left->symbol()),array_ref->symbol(),array_ref->lhs()),NULL,left->symbol())))));	
-								}
-							}
-						}
-					else printf("error in string statement - line  %i\n",stmt->lineNumber());
-					}
-				}
-			else
-				if (left&&stmt->expr(1))
-					{
-					switch (left->variant())
-						{
-							case ARRAY_REF:
-							case VAR_REF:	
-								{
-									if (left->symbol()->thesymb->attr & DVM_POINTER_BIT)
-										{
-										//SgRecordRefExp *rec_ref=NULL;
-										SgExpression *lhs,*rhs;
-										lhs=left;
-										rhs=stmt->expr(1);
-										if ((left->variant()==ARRAY_REF)&&left->lhs())
-											{
-											lhs=new SgExpression(RECORD_REF,left,new SgVarRefExp(* (new SgSymbol(VARIABLE_NAME,"PTR"))),NULL);
-											}
-										if ((rhs->variant()==ARRAY_REF)&&rhs->lhs())
-											{
-											rhs=new SgExpression(RECORD_REF,stmt->expr(1),new SgVarRefExp(* (new SgSymbol(VARIABLE_NAME,"PTR"))),NULL);
-											}
-										stmt->insertStmtBefore(* (new SgF90PointerAssignStmt(*lhs,*rhs)));
-										stmt_to_delete = addToStmtList(stmt_to_delete, stmt);
-										}
-									break;
-								}
-						}
-					}
-		
-			}
-	    if(stmt->variant()==DVM_PARALLEL_ON_DIR) 
-			{
-			SgOMPStmt  *parallel=NULL;
-			SgStatement *last_node_of_loop=NULL;
-			SgExprListExp *explist=NULL;
-			SgExpression *new_clause=NULL;
-			SgExpression *reduction_clause=NULL;
-            SgExpression *shadow_clause=NULL;
-            SgExpression *remote_access_clause=NULL;
-			SgExpression *indirect_access_clause=NULL;
-			SgExpression *stage_clause=NULL;
-			SgExpression *across_clause=NULL;
-			SgExpression *on_clause=NULL;
-			SgForStmt *for_stmt=NULL;
-			int ignore=0;
-			if (stmt->expr(2)!=NULL) on_clause=stmt->expr(2);
-			if (stmt->lexNext()!=NULL) for_stmt=isSgForStmt(stmt->lexNext());
-			if (stmt->expr(1)!=NULL) 
-				{
-				int i,length;
-				explist= new SgExprListExp(stmt->expr(1)->thellnd);
-				length=explist->length();
-				for (i=0;i<length;i++)
-				{
-					switch (explist->elem(i)->variant())
-					{
-						case NEW_SPEC_OP:
-						{
-							new_clause=explist->elem(i)->copyPtr();
-							//new_clause=TranslateOpenMPPrivate(new_clause,on_clause);
-							break;
-						}
-						case REDUCTION_OP:
-						{
-							reduction_clause=explist->elem(i);
-							if (reduction_clause!=NULL) ignore=1;
-							reduction_clause=TranslateOpenMPReduction(reduction_clause); 
-							if (reduction_clause!=NULL) ignore=0;
-							break;
-						}
-						case SHADOW_RENEW_OP:
-						case SHADOW_START_OP:
-						case SHADOW_WAIT_OP:
-						case SHADOW_COMP_OP:
-						{
-							shadow_clause=explist->elem(i);
-							break;
-						}
-						case REMOTE_ACCESS_OP:
-						{
-							remote_access_clause=explist->elem(i);
-							break;
-						}
-						case INDIRECT_ACCESS_OP:
-						{
-							indirect_access_clause=explist->elem(i);
-							break;
-						}
-						case STAGE_OP:
-						{
-							stage_clause=explist->elem(i);
-							break;
-						}
-						case ACROSS_OP:
-						{
-							across_clause=explist->elem(i);
-							break;
-						}
-					}
-				}
-				if (ignore) continue;
-				for (i=0;i<length;i++)
-				{
-					switch (explist->elem(i)->variant())
-					{
-					/*28.05.2002
-					case ACROSS_OP: 
-							SgSymbol *tmp,*jj;
-							SgVarRefExp *iam,*numt,*jjref;
-							SgFunctionCallExp *ogtn,*ognt;
-							SgAssignStmt *numt_ognt,*iam_ogtn;
-							SgExpression *dovar,*start,*end,*loop;
-							SgStatement *next_loop_stmt,*tmp_stmt;
-							SgOMPStmt *tmp_stmt1;
-							SgForStmt *next_for_stmt;
-							SgIfStmt *if_stmt;
-							SgValueExp c1(1);
-							SgExprListExp *explist;
-							SgOMP_SCHEDULE *omp_schedule=new SgOMP_SCHEDULE("STATIC");
-							tmp=GenerateNewVariableName("iam");
-							tmp->declareTheSymbol(*cur_func);
-							iam=new SgVarRefExp(*tmp);
-							tmp=GenerateNewVariableName("numt");
-							tmp->declareTheSymbol(*cur_func);
-							numt=new SgVarRefExp(*tmp);
-							tmp=new SgSymbol(VARIABLE_NAME,"omp_get_thread_num");
-							ogtn=new SgFunctionCallExp(*tmp);	
-							tmp=new SgSymbol(VARIABLE_NAME,"omp_get_num_threads");
-							ognt=new SgFunctionCallExp(*tmp);
-							numt_ognt=new  SgAssignStmt(*numt,*ognt);
-							iam_ogtn=new  SgAssignStmt(*iam,*ogtn);
-							stmt->insertStmtAfter(*numt_ognt);
-							stmt->insertStmtAfter(*iam_ogtn);
-							start=for_stmt->start();
-							end=for_stmt->end();
-							loop=for_stmt->end();
-							for_stmt->setEnd(*loop+*numt-c1);
-							tmp=for_stmt->symbol();
-							dovar=new SgVarRefExp(*tmp);
-							jj=GenerateNewVariableName(tmp->identifier());
-							jj->declareTheSymbol(*cur_func);
-							for_stmt->setSymbol(*jj);
-							next_loop_stmt=for_stmt->getNextLoop();
-							jjref=new SgVarRefExp(*jj);
-							tmp_stmt=new SgAssignStmt(*dovar,*jjref-*iam);
-							next_loop_stmt->insertStmtBefore(*tmp_stmt);
-							tmp_stmt1=new SgOMPStmt(OMP_DO_DIR);
-							tmp_stmt1->addClause1(*omp_schedule);
-							tmp_stmt->insertStmtAfter(* tmp_stmt1);
-							next_for_stmt=isSgForStmt(next_loop_stmt);
-							next_loop_stmt=next_loop_stmt->lexNext();
-							if_stmt=new SgIfStmt(*dovar>=*start&&*dovar<=*end,*next_loop_stmt->copyBlockPtr());
-							next_for_stmt->set_body(*if_stmt);
-							tmp_stmt=new SgStatement(CONTROL_END);	
-							tmp_stmt->setControlParent(*next_for_stmt->controlParent());
-							next_loop_stmt->insertStmtBefore(* tmp_stmt);
-							tmp_stmt->insertStmtAfter(* new SgOMPStmt(OMP_END_PARALLEL_DIR));
-							tmp_stmt->insertStmtAfter(* new SgOMPStmt(OMP_END_DO_DIR));
-							explist=new SgExprListExp(*jjref);
-							explist->append(*numt);
-							explist->append(*iam);
-							new_clause=AddOpenMPPrivate(new_clause,explist);
-							ignore=1;*/
-						case ACROSS_OP: //28.05.2002 
-							SgSymbol *tmp,*jj;
-							SgVarRefExp *iam,*numt,*jjref;
-							SgFunctionCallExp *ogtn,*ognt;
-							SgAssignStmt *numt_ognt,*iam_ogtn;
-							SgExpression *dovar,*start,*end,*loop;
-							SgStatement *tmp_stmt;
-							SgOMPStmt *ompstmt;
-							SgIfStmt *if_stmt;
-							SgValueExp c1(1),c0(0);
-							SgExprListExp *explist;
-							SgOMP_SCHEDULE *omp_schedule=new SgOMP_SCHEDULE("STATIC");
-							last_node_of_loop=NextStmtAfterLoopStmt(stmt->lexNext());
-							GenerateOMPRoutinesName();
-							tmp=GenerateNewVariableName("iam");
-							tmp->declareTheSymbol(*cur_func);
-							iam=new SgVarRefExp(*tmp);
-							tmp=GenerateNewVariableName("numt");
-							tmp->declareTheSymbol(*cur_func);
-							numt=new SgVarRefExp(*tmp);
-							tmp=new SgSymbol(VARIABLE_NAME,"omp_get_thread_num");
-							ogtn=new SgFunctionCallExp(*tmp);	
-							tmp=new SgSymbol(VARIABLE_NAME,"omp_get_num_threads");
-							ognt=new SgFunctionCallExp(*tmp);
-							numt_ognt=new  SgAssignStmt(*numt,*ognt);
-							numt_ognt->setlineNumber(-1);
-							iam_ogtn=new  SgAssignStmt(*iam,*ogtn);
-							iam_ogtn->setlineNumber(-1);
-							stmt->insertStmtBefore(*(new SgAssignStmt(*iam,c0)));
-							stmt->insertStmtBefore(*(new SgAssignStmt(*numt,c1)));
-							stmt->insertStmtAfter(*numt_ognt);
-							stmt->insertStmtAfter(*iam_ogtn);
-							start=for_stmt->start();
-							end=for_stmt->end();
-							loop=for_stmt->end();
-							for_stmt->setEnd(*loop+*numt-c1);
-							tmp=for_stmt->symbol();
-							dovar=new SgVarRefExp(*tmp);
-							jj=GenerateNewVariableName(tmp->identifier());
-							jj->declareTheSymbol(*cur_func);
-							for_stmt->setSymbol(*jj);
-							tmp_stmt=for_stmt->getNextLoop();
-							jjref=new SgVarRefExp(*jj);
-							tmp_stmt->insertStmtBefore(*(new SgAssignStmt(*dovar,*jjref-*iam)));
-							//tmp_stmt->lexPrev()->setlineNumber(-1);
-							ompstmt=new SgOMPStmt(OMP_DO_DIR);
-							ompstmt->addClause1(*omp_schedule);
-							tmp_stmt->insertStmtBefore(* ompstmt);
-							if_stmt=new SgIfStmt(*dovar<*start||*dovar>*end,*(new SgStatement(CYCLE_STMT)));
-							if_stmt->setlineNumber(-1);
-							if_stmt->trueBody(1)->setlineNumber(-1);
-							if_stmt->trueBody(2)->setlineNumber(-1);
-							tmp_stmt->insertStmtAfter(*if_stmt);
-							if_stmt->setControlParent(*tmp_stmt->controlParent());
-                            if (last_node_of_loop != 0)
-                            {
-                                last_node_of_loop->insertStmtAfter(*new SgOMPStmt(OMP_END_PARALLEL_DIR));
-                                last_node_of_loop->insertStmtBefore(*new SgOMPStmt(OMP_END_DO_DIR));
-                            }
-							explist=new SgExprListExp(*jjref);
-							explist->append(*numt);
-							explist->append(*iam);
-							new_clause=AddOpenMPPrivate(new_clause,explist);
-							ignore=1;
-					}
-				}
-				}
-				if (!ignore)
-					{
-					if ( (last_node_of_loop = NextStmtAfterLoopStmt(stmt->lexNext())) != 0)
-						{
-						parallel=new SgOMPStmt(OMP_END_PARALLEL_DIR);
-						last_node_of_loop->insertStmtAfter(*parallel);
-						parallel=new SgOMPStmt(OMP_END_DO_DIR);
-						last_node_of_loop->insertStmtAfter(*parallel);
-						parallel=new SgOMPStmt(OMP_DO_DIR);
-						parallel->addClause1(*(new SgOMP_SCHEDULE("STATIC")));
-						stmt ->insertStmtAfter(*parallel);
-						}
-					else printf("error in string statement - line  %i\n",stmt->lineNumber());
-					}
-				parallel=new SgOMPStmt(OMP_PARALLEL_DIR);
-				if (reduction_clause!=NULL) 
-                parallel->addClause1(*reduction_clause); 
-	//				if (new_clause!=NULL) 
-				parallel->addClause1(*TranslateOpenMPPrivate(new_clause,on_clause)); 
-				stmt->insertStmtAfter(*parallel);
-			}
-	    if(stmt->variant()==DVM_TASK_REGION_DIR) 
-			{
-			SgOMPStmt  *parallel=NULL;
-			SgStatement *task=NULL;
-			SgExpression *reduction_clause=NULL;
-            SgExpression *on_clause=NULL;
-			SgExpression *private_clause=NULL;
-			SgForStmt *for_stmt;
-			int ignore=0,task_loop=0;
-			if (stmt->expr(2)!=NULL) on_clause=stmt->expr(2);
-			if (stmt->expr(0)!=NULL) 
-				{
-					switch (stmt->expr(0)->variant())
-					{
-						case REDUCTION_OP:
-						{
-							reduction_clause=stmt->expr(0);
-							if (reduction_clause!=NULL) ignore=1;
-							reduction_clause=TranslateOpenMPReduction(reduction_clause); 
-							if (reduction_clause!=NULL) ignore=0;
-							break;
-						}
-				}
-				}
-			for (task = stmt; task && (task != last); task = task->lexNext())
-				{
-					if (isSgExecutableStatement(task))
-					  {
-
-						if(task->variant()==DVM_PARALLEL_TASK_DIR)
-							{
-							//////////////////////////////////////////////////////////////								
-								SgExprListExp *explist=NULL;
-								SgExpression *newclause=NULL;
-								SgExpression *redclause=NULL;
-								SgExpression *onclause=NULL;
-								if (task->expr(2)!=NULL) onclause=task->expr(2);
-								if (task->lexNext()!=NULL) for_stmt=(SgForStmt *)(task->lexNext());
-								if (task->expr(1)!=NULL) 
-									{
-										int i,length;
-										explist= new SgExprListExp(task->expr(1)->thellnd);
-										length=explist->length();
-										for (i=0;i<length;i++)
-											{
-												switch (explist->elem(i)->variant())
-													{
-														case NEW_SPEC_OP:
-														{
-															newclause=explist->elem(i)->copyPtr();
-															break;
-														}
-														case REDUCTION_OP:
-														{
-															redclause=explist->elem(i);
-															if (redclause!=NULL) task_loop=1;
-															redclause=TranslateOpenMPReduction(redclause); 
-															if (redclause!=NULL) task_loop=0;
-															break;
-														}
-													}
-											}
-									}
-							///////////////////////////////////////////////////////////////
-									if (!ignore&&!task_loop)
-										{	
-											SgStatement *last_node_of_loop=NULL;
-											if ( (last_node_of_loop = NextStmtAfterLoopStmt(task->lexNext())) != 0)
-												{
-												parallel=new SgOMPStmt(OMP_END_PARALLEL_DIR);
-												last_node_of_loop->insertStmtAfter(*parallel);
-												parallel=new SgOMPStmt(OMP_END_DO_DIR);
-												last_node_of_loop->insertStmtAfter(*parallel);
-												}
-											else printf("error in string statement - line  %i\n",task->lineNumber());
-											parallel=new SgOMPStmt(OMP_DO_DIR);
-											parallel->addClause1(*(new SgOMP_SCHEDULE("STATIC")));
-											task ->insertStmtAfter(*parallel);
-											parallel=new SgOMPStmt(OMP_PARALLEL_DIR);
-											if (redclause!=NULL) 
-												parallel->addClause1(*redclause); 
-											if (reduction_clause!=NULL) 
-												parallel->addClause1(*reduction_clause); 
-											parallel->addClause1(*TranslateOpenMPPrivate(newclause,onclause)); 
-											task->insertStmtAfter(*parallel);
-										}
-							ignore=1;	
-							task_loop=1;
-							////////////////////////////////////////////////////////////////
-							}
-
-						if(task->variant()==DVM_END_TASK_REGION_DIR) 
-							{
-							if (!ignore)
-								{
-									SgOMPStmt  *tregion=NULL;
-									tregion=new SgOMPStmt(OMP_END_PARALLEL_DIR);
-									task ->insertStmtAfter(*tregion);
-									if (!task_loop)
-										{
-										tregion=new SgOMPStmt(OMP_END_SECTIONS_DIR);
-										task ->insertStmtAfter(*tregion);	
-										}
-									break;
-								}
-							}
-						if(task->variant()==DVM_ON_DIR) 
-						{
-							if (!ignore)
-							{
-								SgOMPStmt  *tregion=NULL;
-								tregion=new SgOMPStmt(OMP_SECTION_DIR);
-								task ->insertStmtAfter(*tregion);
-								if ((task->expr(1))!=NULL&&(task->expr(1)->lhs()!=NULL)&&(task->expr(1)->lhs()->variant()==EXPR_LIST)) 
-									{				
-									private_clause=TranslateOpenMPPrivate(private_clause,task->expr(1)->lhs()->copyPtr());
-									}
-							}
-						}
-					}
-				}
-			if (!ignore)
-				{
-					if (!task_loop)
-						{
-						parallel=new SgOMPStmt(OMP_SECTIONS_DIR);
-						stmt ->insertStmtAfter(*parallel);
-						}
-					parallel=new SgOMPStmt(OMP_PARALLEL_DIR);
-					if (reduction_clause!=NULL) 
-					parallel->addClause1(*reduction_clause); 
-					if (private_clause!=NULL) 
-					parallel->addClause1(*private_clause); 
-					stmt->insertStmtAfter(*parallel);
-				}
-			}
-	    if(stmt->variant()==DVM_ASYNCHRONOUS_DIR) 
-			{
-			stmt_list *pstmt = NULL;
-			SgOMPStmt  *parallel=NULL;
-			SgStatement *section=NULL;
-			SgStatement *prev=NULL;
-			for (section = stmt->lexNext(); section && (section != last); section = section->lexNext())
-				{
-					prev=section;	
-					if (isSgExecutableStatement(section))
-					  {
-						if(section->variant()==DVM_F90_DIR) 
-							{
-								SgAssignStmt *sect_assign;
-								if ((section->expr(0)!=NULL)&&(section->expr(1)!=NULL))
-									{
-									sect_assign=new SgAssignStmt(*section->expr(0),*section->expr(1));
-									section->insertStmtAfter(*sect_assign);
-									}
-								continue;
-							}
-						if(section->variant()==DVM_ENDASYNCHRONOUS_DIR) 
-							{
-								parallel=new SgOMPStmt(OMP_END_PARALLEL_DIR);
-								section ->insertStmtAfter(*parallel);
-								parallel=new SgOMPStmt(OMP_END_WORKSHARE_DIR);
-								section ->insertStmtAfter(*parallel);
-								break;
-							}
-						if(section->variant()==FOR_NODE) 
-							{		
-								pstmt = addToStmtList(pstmt, section);
-							}
-					}
-				}
-			for(;pstmt; pstmt= pstmt->next) Extract_Stmt(pstmt->st);
-			parallel=new SgOMPStmt(OMP_WORKSHARE_DIR);
-			stmt ->insertStmtAfter(*parallel);
-			parallel=new SgOMPStmt(OMP_PARALLEL_DIR);
-			stmt ->insertStmtAfter(*parallel);
-			}
-		}
-	}
-for(;stmt_to_delete; stmt_to_delete= stmt_to_delete->next) Extract_Stmt(stmt_to_delete->st);
-
-if (pointer)
-	{
-	type_list *tlist=NULL;
-	for (stmt = first; stmt && (stmt != last); stmt = stmt->lexNext())
-		{
-			SgExprListExp *vars,*type,*dims,*new_vars;
-			vars=type=dims=new_vars=NULL;
-			pointer_list *tmp;
-			//printf ("Variant %i = %i\n",stmt->variant(),stmt->lineNumber());
-			if (stmt->variant()==VAR_DECL)
-				{
-					if(stmt->expr(0)&&(vars=isSgExprListExp(stmt->expr(0))));
-					if(stmt->expr(1)&&(type=isSgExprListExp(stmt->expr(1))));
-					if(stmt->expr(2)&&(dims=isSgExprListExp(stmt->expr(2))));
-					for(int i=0;i<vars->length();i++)
-						{
-						if(vars->elem(i)->symbol()&&(tmp=FindPointerInPointerList(pointer,vars->elem(i)->symbol()))) 
-							{
-							type_list *tname;
-							SgSymbol *s;
-							SgTypeExp *type_op;
-							SgType *type_name;
-							if (!vars->elem(i)->lhs())
-								{
-								//printf("Arr REF vars->elem(i)->symbol %s\n",vars->elem(i)->symbol()->identifier());
-								DeclarePointerType(stmt,vars->elem(i)->symbol(),tmp->dim,tmp->symb->type());
-								continue;
-								}
-
-							if (tlist&&(tname=FindTypeInTypeList(tlist,tmp->symb->type(),tmp->dim)))
-								{
-								type_name=tname->type;
-								}
-							else
-								{
-								s=DeclarePointerTypeRecord(stmt,tmp->dim,tmp->symb->type());
-								type_name=new SgDerivedType(*s);
-								TYPE_SYMB(type_name->thetype)=s->thesymb;
-								TYPE_LENGTH(type_name->thetype)=tmp->dim;
-								tlist=AddToTypeList(tlist,type_name,tmp->symb->type());
-								}
-							type_op=new SgTypeExp(*type_name);
-							stmt->insertStmtBefore(* (new SgStatement(VAR_DECL,NULL,NULL,vars->elem(i),type_op,NULL)));
-							}
-						else 
-							{
-								if (!strcmp(vars->elem(i)->symbol()->identifier(),"heap")||!strcmp(vars->elem(i)->symbol()->identifier(),"allocate")||(vars->elem(i)->symbol()->thesymb->attr & HEAP_BIT)) continue		;
-								if (!new_vars)
-									new_vars=new SgExprListExp(*vars->elem(i));
-								else new_vars->append(*vars->elem(i));
-
-							}
-
-						}
-					if (new_vars)
-						{
-						stmt->setExpression (0,*new_vars);
-						}
-					else 
-						{
-						stmt_to_delete = addToStmtList(stmt_to_delete, stmt);
-						}
-				}
-			if (stmt->variant()==COMM_STAT)
-				{
-					SgExprListExp *vars,*new_vars;
-					vars=new_vars=NULL;
-					if(stmt->expr(0)&&(vars=isSgExprListExp(stmt->expr(0)->lhs())))
-					{
-					for(int i=0;i<vars->length();i++)
-						{
-						if(vars->elem(i)->symbol()&&(isInSymbList(heaps,vars->elem(i)->symbol()))) 
-							continue;
-						if (!new_vars)
-								new_vars=new SgExprListExp(*vars->elem(i));
-						else new_vars->append(*vars->elem(i));
-						}
-					if (new_vars)
-						{
-						stmt->expr(0)->setLhs(*new_vars);
-						}
-					else 
-						{
-						stmt_to_delete = addToStmtList(stmt_to_delete, stmt);
-						}
-					}
-				}
-		}	
-
-	for(;stmt_to_delete; stmt_to_delete= stmt_to_delete->next) Extract_Stmt(stmt_to_delete->st);		
-	}
-}		
-
-
-
-SgSymbol* DeclarePointerTypeRecord(SgStatement *stmt,int numdim,SgType *type)
-{
-	int i;
-	SgSymbol *sym;
-	SgExpression *symref;
-	SgRecordStmt *record;
-	SgExprListExp *expr_list=NULL;
-	SgExprListExp *dim=NULL;
-	SgExpression *tmp=NULL;
-	sym=new SgSymbol(VARIABLE_NAME,"PTR");
-	sym->setType(*(new SgArrayType(*type)));
-	symref=new SgArrayRefExp(*sym);
-	tmp=new SgExpression(POINTER_OP);
-	expr_list=new SgExprListExp(*tmp);
-	tmp=new SgExpression(DIMENSION_OP);
-	dim=new SgExprListExp(*(new SgKeywordValExp(":")));
-	for(i=numdim-1;i>0;i--)
-		dim->append(*(new SgKeywordValExp(":")));
-	tmp->setLhs(*dim);
-	expr_list->append(*tmp);
-	sym=GenerateTypeName(numdim);
-	record=new SgRecordStmt(*sym,*(new SgVarDeclStmt(*symref,*expr_list,*type)));
-	//cur_func->lastDeclaration()
-	stmt->insertStmtBefore(*record);
-	return sym;
-}
-
-void DeclarePointerType(SgStatement *stmt,SgSymbol *sym,int numdim,SgType *type)
-{
-	int i;
-	SgExpression *symref;
-	SgExprListExp *expr_list=NULL;
-	SgExprListExp *dim=NULL;
-	SgExpression *tmp=NULL;
-	sym->setType(*(new SgArrayType(*type)));
-	symref=new SgArrayRefExp(*sym);
-	tmp=new SgExpression(POINTER_OP);
-	expr_list=new SgExprListExp(*tmp);
-	tmp=new SgExpression(DIMENSION_OP);
-	dim=new SgExprListExp(*(new SgKeywordValExp(":")));
-	for(i=numdim-1;i>0;i--)
-		dim->append(*(new SgKeywordValExp(":")));
-	tmp->setLhs(*dim);
-	expr_list->append(*tmp);
-	//printf("Insert\n");
-	stmt->insertStmtBefore(* (new SgVarDeclStmt(*symref,*expr_list,*type)));
-}
-
-////////////////////////LIST FUNCTIONS DEFINITION/////////////////
-pointer_list  *AddToPointerList ( pointer_list *ls, SgSymbol *s,int dim)
-{
-pointer_list *l;
-//adding the symbol 's' to pointer_list 'ls'
-  if(!ls) {	
-     ls = new pointer_list;
-     ls->symb = s;
-     ls->dim=dim;
-     ls->next = NULL;
-  } else {
-     l = new pointer_list;
-     l->symb = s;
-     l->dim=dim;
-     l->next = ls;
-     ls = l;
-  }
-  return(ls);
-}
-
-int FindInPointerList ( pointer_list *ls, SgSymbol *s)
-{
-pointer_list *l;
-for(l=ls; l; l=l->next)
-   if(!strcmp(l->symb->identifier(),s->identifier()))
-      return l->dim;
-return 0;
-
-}
-
-pointer_list* FindPointerInPointerList ( pointer_list *ls, SgSymbol *s)
-{
-pointer_list *l;
-for(l=ls; l; l=l->next)
-   if(!strcmp(l->symb->identifier(),s->identifier()))
-      return l;
-return NULL;
-
-}
-
-type_list  *AddToTypeList ( type_list *ls, SgType *type_name,SgType *base_type)
-{
-type_list *l;
-//adding the symbol 's' to type_list 'ls'
-  if(!ls) {	
-	 ls = new type_list;
-     ls->type = type_name;
-	 ls->base = base_type;
-     ls->next = NULL;
-  } else {
-     l = new type_list;
-	 l->type = type_name;
-	 l->base = base_type;
-     l->next = ls;
-     ls = l;
-  }
-  return(ls);
-}
-
-type_list* FindTypeInTypeList ( type_list *ls, SgType *t, int dim)
-{
-type_list *l;
-for(l=ls; l; l=l->next)
-	{
-		if(( TYPE_LENGTH(l->type->thetype)==dim)&&t->equivalentToType(l->base))
-			  return l;
-	}
-return NULL;
-
-}
-
-/*
-char* filterDVM(char *s)
-{
-  char c;
-  int i = 1;
-  char temp[1024];
-  int temp_i = 0;
-  int buf_i = 0;
-  int commentline = 0;
-  char *resul, *init;
-  int OMP,DVM;
-  OMP=DVM=0;
-  
-  if (!s) return NULL;
-  if (strlen(s)==0) return s;
-  make_a_malloc_stack();
-  resul = (char *) mymalloc(2*strlen(s));
-  memset(resul, 0, 2*strlen(s));
-  init = resul;
-  c = s[0];
-
-  if ((c != ' ')
-      &&(c != '\n')
-      && (c != '0')
-      && (c != '1') 
-      && (c != '2') 
-      && (c != '3') 
-      && (c != '4') 
-      && (c != '5') 
-      && (c != '6') 
-      && (c != '7') 
-      && (c != '8') 
-      && (c != '9'))
-		commentline = 1;
-  else
-    commentline = 0;
-  if(commentline)
-	{	if (s[1]=='$') 
-			OMP=1;
-		else	
-			if (s[1]=='D') 
-				DVM=1;		
-			else OMP=DVM=0;
-	}
-  temp_i = 0;
-  i = 0;
-  buf_i =0;
-  while (c!='\0')
-    {
-      c = s[i];
-      temp[ buf_i] = c;
-      if (c == '\n')
-        {
-          temp[ buf_i+1] = '\0';
-          sprintf(resul,"%s",temp);
-          resul = resul + strlen(temp);
-          temp_i = -1;
-          buf_i = -1;
-          if ((s[i+1] != ' ')
-              &&(s[i+1] != '\n')
-              && (s[i+1] != '0')
-              && (s[i+1] != '1') 
-              && (s[i+1] != '2') 
-              && (s[i+1] != '3') 
-              && (s[i+1] != '4') 
-              && (s[i+1] != '5') 
-              && (s[i+1] != '6') 
-              && (s[i+1] != '7') 
-              && (s[i+1] != '8') 
-              && (s[i+1] != '9'))
-				commentline = 1;
-          else
-            commentline = 0;
-		  if(commentline)
-			{	if (s[i+1]=='$') 
-					OMP=1;
-				else	
-					if (s[i+1]=='D') 
-						DVM=1;		
-					else OMP=DVM=0;
-			}
-        } else
-          {
-            if ((temp_i == 71) && !commentline)
-              { 
-                temp[ buf_i+1]  = '\0';
-                sprintf(resul,"%s\n",temp);
-                resul = resul + strlen(temp)+1;
-                sprintf(resul,"     +");
-                resul = resul + strlen("     +");
-                commentline = 0;
-                memset(temp, 0, 1024);
-                temp_i = strlen("     +")-1;
-                buf_i = -1;
-              }
-	    if ((temp_i == 71)&&commentline&&(OMP||DVM))
-              { 
-		int count=0;
-		for(;s[i]!='$';i--,count++)
-            	    {
-		    if (strncmp(&(s[i]),"ONTO", strlen("ONTO"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"BEGIN", strlen("BEGIN"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"WITH", strlen("WITH"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"NEW", strlen("NEW"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"REDUCTION", strlen("REDUCTION"))== 0)
-			break;
-			if (strncmp(&(s[i]),"REMOTE", strlen("REMOTE"))== 0)
-			break;    
-		    if (strncmp(&(s[i]),"TEMPLATE", strlen("TEMPLATE"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"SHADOW", strlen("SHADOW"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"INHERIT", strlen("INHERIT"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"DYNAMIC", strlen("DYNAMIC"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"DIMENSION", strlen("DIMENSION"))== 0)
-			break;
-			if (strncmp(&(s[i]),"PRIVATE", strlen("PRIVATE"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"SCHEDULE", strlen("SCHEDULE"))== 0)
-			break;    
-			if (strncmp(&(s[i]),"ACROSS", strlen("ACROSS"))== 0)
-			break;    
-			if (strncmp(&(s[i]),"DO", strlen("DO"))== 0)
-			break;
-			if (strncmp(&(s[i]),"PROCESSORS", strlen("PROCESSORS"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"DISTRIBUTE", strlen("DISTRIBUTE"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"ALIGN", strlen("ALIGN"))== 0)
-			break;
-		    }
-		i--;count++;      
-		if (count<36)
-		    temp[ buf_i+1-count]  = '\0';
-		else 
-		    {
-		    i+=count;
-		    temp[ buf_i+1]  = '\0';
-		    }
-                sprintf(resul,"%s\n",temp);
-                resul = resul + strlen(temp)+1;
-				memset(temp, 0, 1024);
-				if (OMP)
-					{
-					sprintf(resul,"!$OMP*");
-					resul = resul + strlen("!$OMP*");
-					temp_i = strlen("!$OMP*")-1;
-					}
-				if (DVM)
-					{
-					sprintf(resul,"CDVM$*");
-					resul = resul + strlen("CDVM$*");
-					temp_i = strlen("CDVM$*")-1;
-					}
-                buf_i = -1;
-              }
-          }
-      i++;
-      temp_i++;
-      buf_i++;
-    }
-
-  return init;  
-}
-*/
diff --git a/projects/dvm_svn/fdvm/trunk/include/libdvm.h b/projects/dvm_svn/fdvm/trunk/include/libdvm.h
deleted file mode 100644
index c1c389a..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/libdvm.h
+++ /dev/null
@@ -1,341 +0,0 @@
-name_dvm[CLFDVM]   = "clfdvm"; //fortran subroutine closing all opened files
-name_dvm[RTLINI]   = "linit";
-name_dvm[RTLEXI]   = "lexit";
-name_dvm[GETAM]    = "getam";
-name_dvm[GETVM]    = "getps";
-name_dvm[BEGBL]    = "begbl";
-name_dvm[ENDBL]    = "endbl";
-name_dvm[CRTAMV]   = "crtamv";
-name_dvm[DISAM]    = "distr";
-name_dvm[CRTDA]    = "crtda";
-name_dvm[ALGNDA]   = "align";
-name_dvm[REDVAR]   = "crtred";
-name_dvm[REDVARF]  = "crtrdf";
-name_dvm[CRTRG]    = "crtrg";
-name_dvm[INSRV]    = "insred";
-name_dvm[SAVERV]   = "saverv";
-name_dvm[STARTR]   = "strtrd";
-name_dvm[WAITR]    = "waitrd";
-name_dvm[DELRG]    = "delrg";
-name_dvm[CRTSHG]   = "crtshg";
-name_dvm[DATOSHG]  = "inssh";
-name_dvm[STARTSH]  = "strtsh";
-name_dvm[WAITSH]   = "waitsh";
-name_dvm[DELSHG]   = "delshg";
-name_dvm[CRTPLP]   = "crtpl";
-name_dvm[BEGPLP]   = "mappl";
-name_dvm[ENDPLP]   = "endpl";
-name_dvm[BFIRST]   = "exfrst";
-name_dvm[BLAST]    = "imlast";
-name_dvm[DOLOOP]   = "dopl";
-name_dvm[GETADR]   = "getadr";
-name_dvm[GETAI]    = "getai";
-name_dvm[GETAL]    = "getal";
-name_dvm[GETAF]    = "getaf";
-name_dvm[GETAD]    = "getad";
-name_dvm[GETAC]    = "getac";
-name_dvm[GETACH]   = "getach";
-name_dvm[TSTIOP]   = "tstio";
-name_dvm[GETRNK]   = "getrnk";
-name_dvm[GETSIZ]   = "getsiz";
-name_dvm[ARRCPY]   = "arrcpy";
-name_dvm[SRMEM]    = "srmem";
-name_dvm[RDISAM]   = "redis";
-name_dvm[REALGN]   = "realn";
-name_dvm[RWELM]    = "rwelm";
-name_dvm[RWELMF]   = "rwelmf";
-name_dvm[DELOBJ]   = "delobj";
-name_dvm[TSTELM]   = "tstelm";
-name_dvm[DLOADV]   = "dldv";
-name_dvm[DSTORV]   = "dstv";
-name_dvm[DPRSTV]   = "dprstv";
-name_dvm[DINOUT]   = "dinout";
-name_dvm[DRMBUF]   = "drmbuf";
-name_dvm[DITER]    = "diter";
-name_dvm[DBEGPL]   = "dbegpl";
-name_dvm[DBEGSL]   = "dbegsl";
-name_dvm[DENDL]    = "dendl";
-name_dvm[DSKPBL]   = "dskpbl";
-name_dvm[BINTER]   = "binter";
-name_dvm[EINTER]   = "einter";
-name_dvm[BSLOOP]   = "bsloop";
-name_dvm[BPLOOP]   = "bploop";
-name_dvm[ENLOOP]   = "enloop";
-name_dvm[BIOF]     = "biof";
-name_dvm[EIOF]     = "eiof";
-name_dvm[FNAME]    = "fname";
-name_dvm[LNUMB]    = "lnumb";
-name_dvm[ADDHDR]   = "addhdr";
-name_dvm[PSVIEW]   = "psview";
-name_dvm[CRTPS]    = "crtps";
-name_dvm[GETAMV]   = "getamv";
-name_dvm[GETAMR]   = "getamr";
-name_dvm[MAPAM]    = "mapam";
-name_dvm[RUNAM]    = "runam";
-name_dvm[STOPAM]   = "stopam";
-name_dvm[CRTBG]    = "crtbg";
-name_dvm[LOADBG]   = "loadbg";
-name_dvm[WAITBG]   = "waitbg";
-name_dvm[CRTRB]    = "crtrbl";
-name_dvm[CRTRBP]   = "crtrbp";
-name_dvm[LOADRB]   = "loadrb";
-name_dvm[WAITRB]   = "waitrb";
-name_dvm[INSRB]    = "insrb";
-name_dvm[CRTIG]    = "crtig";
-name_dvm[LOADIG]   = "loadig";
-name_dvm[WAITIG]   = "waitig";
-name_dvm[CRTIB]    = "crtib";
-name_dvm[LOADIB]   = "loadib";
-name_dvm[WAITIB]   = "waitib";
-name_dvm[INSIB]    = "insib";
-name_dvm[INSSHD]   = "insshd";
-name_dvm[SENDSH]   = "sendsh";
-name_dvm[RECVSH]   = "recvsh";
-name_dvm[TRON]     = "tron";
-name_dvm[TROFF]    = "troff";
-name_dvm[DBEGTR]   = "dbegtr";
-name_dvm[GENBLI]   = "genbli";
-name_dvm[TPCNTR]   = "tpcntr";
-name_dvm[RMKIND]   = "rmkind";
-name_dvm[SETELW]   = "setelw";
-name_dvm[DLOAD2]   = "dldv2";
-name_dvm[DREADA]   = "dreada";
-name_dvm[DREAD]    = "dread";
-name_dvm[LINDTP]   = "lindtp";
-name_dvm[DVMRM]    = "acrecv";
-name_dvm[DVMSM]    = "acsend";
-name_dvm[AARRCP]   = "aarrcp";
-name_dvm[WAITCP]   = "waitcp";
-name_dvm[ACROSS]   = "across";
-name_dvm[DVMLF]    = "dvmlf";
-name_dvm[ADDBND]   = "addbnd";
-name_dvm[INCSH]    = "incsh";
-name_dvm[INCSHD]   = "incshd";
-name_dvm[DRARR]    = "drarr";
-name_dvm[BARRIER]  = "bsynch";
-name_dvm[DINSRD]   = "dinsrf";
-name_dvm[DCRRG]    = "dcrtrg";
-name_dvm[DSAVRG]   = "dsavrg";
-name_dvm[DCLCRG]   = "dclcrg";
-name_dvm[DDLRG]    = "ddelrg";
-name_dvm[ADDSHD]   = "addshd";
-name_dvm[CRTRDA]   = "crtraf";
-name_dvm[STRTAC]   = "strtac";
-name_dvm[WAITAC]   = "waitac";
-name_dvm[CRTCG]    = "crtcg";
-name_dvm[INSCG]    = "inscg";
-name_dvm[STRTCG]   = "strtcg";
-name_dvm[WAITCG]   = "waitcg";
-name_dvm[DELCG]    = "delcg";
-name_dvm[CONSDA]   = "consda";
-name_dvm[INCLCG]   = "inclcg";
-name_dvm[RSTRDA]   = "rstrda";
-name_dvm[RSTCG]    = "rstcg";
-name_dvm[CRTRA9]   = "crtra9";
-name_dvm[CRTDA9]   = "crtda9";
-name_dvm[FTCNTR]   = "ftcntr";
-name_dvm[DACSUM]   = "dacsum";
-name_dvm[ARCSF]    = "arcsf";
-name_dvm[BLKDIV]   = "blkdiv";
-name_dvm[DOPLMB]   = "doplmb";
-name_dvm[DOSL]     = "dosl";
-name_dvm[DVTR]     = "dvtr";
-name_dvm[DOPLSEQ]  = "doplmbseq";
-name_dvm[INIMPI]   = "linit";
-name_dvm[DVMH_INIT]        = "dvmh_init2";
-name_dvm[DVMH_FINISH]      = "dvmh_finish";
-name_dvm[DVMH_EXIT]        = "dvmh_exit";
-name_dvm[INIT_CUDA]        = "init_cuda";
-name_dvm[REG_CREATE]       = "region_create";
-name_dvm[REG_CREATE_2]     = "dvmh_region_create";
-name_dvm[REG_END]          = "region_end";
-name_dvm[REG_END_2]        = "dvmh_region_end";
-name_dvm[REG_DEVICES]      = "region_execute_on_targets";
-name_dvm[REG_DEVICES_2]    = "dvmh_region_execute_on_targets";
-name_dvm[REG_START]        = "region_inner_start";
-name_dvm[RGSTR_ARRAY_2]    = "dvmh_region_register_array";
-name_dvm[RGSTR_SUBARRAY_2] = "dvmh_region_register_subarray";
-name_dvm[RGSTR_SCALAR_2]   = "dvmh_region_register_scalar";
-name_dvm[RGSTR_ARRAY]      = "region_register_array";
-name_dvm[RGSTR_SUBARRAY]   = "region_register_subarray";
-name_dvm[RGSTR_SCALAR]     = "region_register_scalar";
-name_dvm[SET_NAME_ARRAY]   = "region_set_name_array";
-name_dvm[SET_NAME_VAR]     = "region_set_name_variable";
-name_dvm[BEFORE_LOADRB]    = "dvmh_remote_access";
-name_dvm[REG_WAITRB]       = "region_after_waitrb";
-name_dvm[REG_DESTROY_RB]   = "region_destroy_rb";
-name_dvm[GET_ACTUAL_EDGES] = "dvmh_get_actual_edges";
-name_dvm[SHADOW_RENEW]     = "dvmh_shadow_renew";
-name_dvm[SHADOW_RENEW_2]   = "dvmh_shadow_renew2";
-name_dvm[INDIRECT_SH_RENEW]= "dvmh_indirect_shadow_renew";
-name_dvm[LOOP_CREATE]      = "loop_create";
-name_dvm[LOOP_CREATE_2]    = "dvmh_loop_create";
-name_dvm[REG_HANDLER]      = "loop_register_handler";
-name_dvm[REG_HANDLER_2]    = "dvmh_loop_register_handler";
-name_dvm[HANDLER_FUNC]     = "dvmh_handler_func";
-name_dvm[LOOP_START]       = "loop_start";
-name_dvm[LOOP_END]         = "loop_end";
-name_dvm[LOOP_PERFORM]     = "loop_perform";
-name_dvm[LOOP_PERFORM_2]   = "dvmh_loop_perform";
-name_dvm[CUDA_BLOCK]       = "loop_set_cuda_block";
-name_dvm[CUDA_BLOCK_2]     = "dvmh_loop_set_cuda_block";
-name_dvm[LOOP_INSRED]      = "loop_insred";
-name_dvm[LOOP_RED]         = "dvmh_loop_reduction";
-name_dvm[SHADOW_COMPUTE]   = "loop_shadow_compute";
-name_dvm[SHADOW_COMPUTE_AR]= "dvmh_loop_shadow_compute_array";
-name_dvm[SHADOW_COMPUTE_2] = "dvmh_loop_shadow_compute";
-name_dvm[CORRESPONDENCE]   = "dvmh_loop_array_correspondence";
-name_dvm[GET_ACTUAL_ALL]   = "dvmh_get_actual_all";
-name_dvm[GET_ACTUAL_ALL_2] = "dvmh_get_actual_all2";
-name_dvm[GET_ACTUAL_ARRAY] = "dvmh_get_actual_array"; 
-name_dvm[GET_ACTUAL_ARR_2] = "dvmh_get_actual_array2";
-name_dvm[GET_ACTUAL_SUBARRAY]= "dvmh_get_actual_subarray";
-name_dvm[GET_ACTUAL_SUBARR_2]= "dvmh_get_actual_subarray2";   
-name_dvm[GET_ACTUAL_SCALAR]  = "dvmh_get_actual_variable";
-name_dvm[GET_ACTUAL_SCALAR_2]= "dvmh_get_actual_variable2";
-name_dvm[GET_ACTUAL_SUBVAR]  = "dvmh_get_actual_subvariable";
-name_dvm[GET_ACTUAL_SUBVAR_2]= "dvmh_get_actual_subvariable2"; 
-name_dvm[ACTUAL_ARRAY]     = "dvmh_actual_array"; 
-name_dvm[ACTUAL_ARRAY_2]   = "dvmh_actual_array2";       
-name_dvm[ACTUAL_SUBARRAY]  = "dvmh_actual_subarray"; 
-name_dvm[ACTUAL_SUBARRAY_2]= "dvmh_actual_subarray2";   
-name_dvm[ACTUAL_SCALAR]    = "dvmh_actual_variable";
-name_dvm[ACTUAL_SCALAR_2]  = "dvmh_actual_variable2";
-name_dvm[ACTUAL_SUBVAR]    = "dvmh_actual_subvariable";
-name_dvm[ACTUAL_SUBVAR_2]  = "dvmh_actual_subvariable2";         
-name_dvm[ACTUAL_ALL]       = "dvmh_actual_all";
-name_dvm[ACTUAL_ALL_2]     = "dvmh_actual_all2";
-name_dvm[DVMH_REDISTRIBUTE]= "dvmh_redistribute";
-name_dvm[DVMH_REALIGN]     = "dvmh_realign";
-name_dvm[DESTROY_ARRAY]    = "dvmh_destroy_array";   
-name_dvm[DESTROY_SCALAR]   = "dvmh_destroy_variable";
-name_dvm[HANDLE_CONSIST]   = "region_handle_consistent";
-name_dvm[LOOP_ACROSS]      = "loop_across"; 
-name_dvm[LOOP_ACROSS_2]    = "dvmh_loop_across";
-name_dvm[DVMH_SET_STAGE]   = "dvmh_loop_set_stage";
-name_dvm[GET_STAGE]        = "dvmh_get_next_stage";
-name_dvm[MAP_TASKS]        = "map_tasks"; 
-name_dvm[DATA_ENTER]       = "dvmh_data_enter";
-name_dvm[DATA_EXIT]        = "dvmh_data_exit";
-name_dvm[DELETE_OBJECT]    = "dvmh_delete_object";
-name_dvm[FORGET_HEADER]    = "dvmh_forget_header";
-name_dvm[SCOPE_START]      = "dvmh_scope_start"; 
-name_dvm[SCOPE_END]        = "dvmh_scope_end";
-name_dvm[SCOPE_INSERT]     = "dvmh_scope_insert";
-name_dvm[LOOP_MAP]         = "dvmh_loop_map";
-name_dvm[ALIGN_LINEAR]     = "dvmh_alignment_linear";
-name_dvm[REGISTER_ARR]     = "dvmh_register_array";
-name_dvm[GET_ADDR]         = "dvmh_get_addr";
-name_dvm[STRING]           = "dvmh_string";
-name_dvm[STRING_VAR]	   = "dvmh_string_var";
-name_dvm[VAR_GEN_HDR]	   = "dvmh_variable_gen_header";
-name_dvm[VAR_FILL_HDR]	   = "dvmh_variable_fill_header";
-name_dvm[CP_CHECK_FILENAME]= "dvmh_cp_check_filename";
-name_dvm[CP_NEXT_FILENAME] = "dvmh_cp_next_filename";
-name_dvm[CP_SAVE_FILENAMES]= "dvmh_cp_save_filenames";
-name_dvm[CP_WAIT]          = "dvmh_cp_wait";
-name_dvm[CP_SAVE_ASYNC_UNIT]="dvmh_cp_save_async_unit"; 
-name_dvm[DVMH_LINE]        = "dvmh_line"; 
-name_dvm[CREATE_ARRAY]     = "dvmh_array_create";
-name_dvm[CREATE_TEMPLATE]  = "dvmh_template_create";
-name_dvm[DVMH_REPLICATED]  = "dvmh_distribution_replicated";
-name_dvm[DVMH_BLOCK]       = "dvmh_distribution_block";
-name_dvm[DVMH_WGTBLOCK]    = "dvmh_distribution_wgtblock";
-name_dvm[DVMH_GENBLOCK]    = "dvmh_distribution_genblock";
-name_dvm[DVMH_MULTBLOCK]   = "dvmh_distribution_multblock";
-name_dvm[DVMH_INDIRECT]    = "dvmh_distribution_indirect";
-name_dvm[DVMH_DERIVED]     = "dvmh_distribution_derived";
-name_dvm[DVMH_DISTRIBUTE]  = "dvmh_distribute";
-name_dvm[DVMH_REDISTR_2]   = "dvmh_redistribute2"; 
-name_dvm[DVMH_ALIGN]       = "dvmh_align";
-name_dvm[DVMH_REALIGN_2]   = "dvmh_realign2";
-name_dvm[DVMH_HAS_ELEMENT] = "dvmh_has_element";
-name_dvm[CALC_LINEAR]      = "dvmh_calc_linear";
-name_dvm[LOCALIZE]         = "dvmh_indirect_localize";
-name_dvm[SHADOW_ADD]       = "dvmh_indirect_shadow_add";
-name_dvm[EXPR_IGNORE]      = "dvmh_derived_rhs_expr_ignore";
-name_dvm[EXPR_CONSTANT]    = "dvmh_derived_rhs_expr_constant";
-name_dvm[EXPR_SCAN]        = "dvmh_derived_rhs_expr_scan";
-name_dvm[DERIVED_RHS]      = "dvmh_derived_rhs";
-name_dvm[ARRAY_SLICE]      = "dvmh_array_slice";
-name_dvm[COPY_WHOLE]       = "dvmh_array_copy_whole"; 
-name_dvm[COPY_ARRAY]       = "dvmh_array_copy";
-name_dvm[SET_VALUE]        = "dvmh_array_set_value";
-name_dvm[LOOP_CONSISTENT]  = "dvmh_loop_consistent";
-name_dvm[DVMH_REMOTE2]     = "dvmh_remote_access2";
-name_dvm[LOOP_REMOTE]      = "dvmh_loop_remote_access";
-name_dvm[GET_REMOTE_BUF]   = "dvmh_loop_get_remote_buf";
-name_dvm[FTN_OPEN]	   = "dvmh_ftn_open";         /* IO */
-name_dvm[FTN_CLOSE]	   = "dvmh_ftn_close";        /* IO */
-name_dvm[FTN_READ]	   = "dvmh_ftn_read_unf";     /* IO */
-name_dvm[FTN_WRITE]	   = "dvmh_ftn_write_unf";    /* IO */
-name_dvm[FTN_ENDFILE]	   = "dvmh_ftn_endfile";      /* IO */
-name_dvm[FTN_FLUSH]	   = "dvmh_ftn_flush";        /* IO */
-name_dvm[FTN_REWIND]       = "dvmh_ftn_rewind";       /* IO */
-name_dvm[FTN_CONNECTED]	   = "dvmh_ftn_connected";    /* IO */
- 
-//--------------------- called from host-handler ------------
-name_dvm[FILL_BOUNDS]      = "loop_fill_bounds";
-name_dvm[RED_INIT]         = "loop_red_init";
-name_dvm[RED_POST]         = "loop_red_post";
-name_dvm[SLOT_COUNT]       = "loop_get_slot_count";
-name_dvm[HAS_ELEMENT]      = "loop_has_element";
-name_dvm[HAS_ELEMENT_2]    = "dvmh_loop_has_element";
-name_dvm[FILL_LOCAL_PART]  = "loop_fill_local_part";
-name_dvm[OMP_STAT_BP]      = "dvmh_perf_before_parallel";
-name_dvm[OMP_STAT_AP]      = "dvmh_perf_after_parallel";
-name_dvm[OMP_STAT_BL]      = "dvmh_perf_before_loop";
-name_dvm[OMP_STAT_AL]      = "dvmh_perf_after_loop";
-name_dvm[OMP_STAT_BS]      = "dvmh_perf_before_synchro";
-name_dvm[OMP_STAT_AS]      = "dvmh_perf_after_synchro";
-//--------------------- called from cuda-handler ------------
-name_dvm[GET_BASE]         = "dvmh_get_natural_base";
-name_dvm[GET_BASE_C]       = "dvmh_get_natural_base_C";
-name_dvm[FILL_HEADER]      = "dvmh_fill_header_";
-name_dvm[FILL_HEADER_2]    = "dvmh_fill_header2_";
-name_dvm[FILL_HEADER_EX]   = "dvmh_fill_header_ex_";
-name_dvm[FILL_HEADER_EX_2] = "dvmh_fill_header_ex2_";
-name_dvm[DO_CUDA]          = "loop_cuda_do";
-name_dvm[RED_CUDA]         = "loop_cuda_register_red";
-name_dvm[RED_CUDA_C]       = "dvmh_loop_cuda_register_red_C";
-name_dvm[REGISTER_RED]     = "loop_cuda_register_red_";
-name_dvm[RED_INIT_C]       = "loop_red_init_";
-name_dvm[RED_INIT_2]       = "dvmh_loop_red_init_";
-name_dvm[CUDA_RED_INIT]    = "loop_cuda_red_init";
-name_dvm[CUDA_RED_INIT_2]  = "dvmh_loop_cuda_red_init_C";
-name_dvm[RED_PREPARE]      = "loop_cuda_red_prepare";
-name_dvm[RED_PREPARE_C]    = "dvmh_loop_cuda_red_prepare_C";
-name_dvm[RED_FINISH]       = "loop_red_finish";
-name_dvm[RED_FINISH_C]     = "dvmh_loop_cuda_red_finish_C";
-name_dvm[SHARED_NEEDED]    = "loop_cuda_shared_needed_";
-name_dvm[GET_DEVICE_ADDR]  = "dvmh_get_device_addr";
-name_dvm[GET_DEVICE_ADDR_C]= "dvmh_get_device_addr_C";
-name_dvm[GET_LOCAL_PART]   = "loop_cuda_get_local_part";
-name_dvm[GET_LOCAL_PART_C] = "dvmh_loop_cuda_get_local_part_C";
-name_dvm[GET_DEVICE_NUM]   = "loop_get_device_num_";
-name_dvm[GET_DEVICE_NUM_2] = "dvmh_loop_get_device_num_C";
-name_dvm[GET_OVERALL_STEP] = "loop_cuda_get_red_step";
-name_dvm[FILL_BOUNDS_C]    = "loop_fill_bounds_";
-name_dvm[FILL_BOUNDS_2]    = "dvmh_loop_fill_bounds_";
-name_dvm[RED_POST_C]       = "loop_red_post_";
-name_dvm[RED_POST_2]       = "dvmh_loop_red_post_";
-name_dvm[CUDA_REPLICATE]   = "dvmh_cuda_replicate";
-name_dvm[GET_DEP_MASK]     = "loop_get_dependency_mask_";
-name_dvm[GET_DEP_MASK_2]   = "dvmh_loop_get_dependency_mask_";
-name_dvm[GET_DEP_MASK_F]   = "loop_get_dependency_mask";
-name_dvm[CUDA_TRANSFORM]   = "loop_cuda_transform_";
-name_dvm[CUDA_AUTOTRANSFORM]="loop_cuda_autotransform";
-name_dvm[LOOP_AUTOTRANSFORM]="dvmh_loop_autotransform_";
-name_dvm[APPLY_OFFSET]     = "dvmh_apply_offset";
-name_dvm[GET_CONFIG]       = "loop_cuda_get_config";
-name_dvm[GET_CONFIG_C]     = "dvmh_loop_cuda_get_config_C";
-name_dvm[CHANGE_BOUNDS]    = "dvmh_change_filled_bounds";
-name_dvm[GUESS_INDEX_TYPE] = "loop_guess_index_type_";
-name_dvm[GUESS_INDEX_TYPE_2]="dvmh_loop_guess_index_type_C";
-name_dvm[RTC_SET_LANG]     = "loop_cuda_rtc_set_lang";
-name_dvm[GET_REMOTE_BUF_C] = "dvmh_loop_get_remote_buf_C";
-name_dvm[GET_DEVICE_PROP]  = "loop_cuda_get_device_prop";
-name_dvm[GET_MAX_BLOCKS]   = "loop_cuda_get_max_blocks";
-name_dvm[GET_PRIVATE_ARR]  = "loop_cuda_get_private_array";
-name_dvm[DISPOSE_PRIVATE_AR]="loop_cuda_dispose_private_array";
-name_dvm[GET_WARP_SIZE]    = "dvmh_get_warp_size";
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/include/libnum.h b/projects/dvm_svn/fdvm/trunk/include/libnum.h
deleted file mode 100644
index 41f842b..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/libnum.h
+++ /dev/null
@@ -1,341 +0,0 @@
-enum {
-      CLFDVM,     
-      RTLINI,
-      RTLEXI,
-      GETAM,   
-      GETVM,
-      BEGBL,
-      ENDBL,
-      CRTAMV,
-      DISAM,
-      CRTDA,
-      ALGNDA,
-      REDVAR,
-      REDVARF,
-      CRTRG,
-      INSRV,
-      SAVERV,
-      STARTR,
-      WAITR,
-      DELRG, 
-      CRTSHG,
-      DATOSHG,
-      STARTSH,
-      WAITSH,
-      DELSHG,
-      CRTPLP,
-      BEGPLP,
-      ENDPLP,
-      BFIRST,
-      BLAST,
-      DOLOOP,
-      GETADR,
-      GETAI,
-      GETAL,
-      GETAF,
-      GETAD,
-      GETAC,
-      GETACH,
-      TSTIOP,
-      GETRNK,
-      GETSIZ,
-      ARRCPY,
-      SRMEM,
-      RDISAM,
-      REALGN,
-      RWELM,
-      RWELMF,
-      DELOBJ,
-      TSTELM,
-      DLOADV,
-      DSTORV,
-      DPRSTV,
-      DINOUT,
-      DRMBUF,
-      DITER,
-      DBEGPL,
-      DBEGSL,
-      DENDL,
-      DSKPBL,  
-      BINTER,
-      EINTER,
-      BSLOOP,
-      BPLOOP,
-      ENLOOP,
-      BIOF,
-      EIOF,
-      FNAME,
-      LNUMB,
-      ADDHDR,
-      PSVIEW,
-      CRTPS,
-      GETAMV,
-      GETAMR,
-      MAPAM,
-      RUNAM,
-      STOPAM,
-      CRTBG,
-      LOADBG,
-      WAITBG,
-      CRTRB,
-      CRTRBP,
-      LOADRB,
-      WAITRB,
-      INSRB,  
-      CRTIG,
-      LOADIG,
-      WAITIG,
-      CRTIB,
-      LOADIB,
-      WAITIB,
-      INSIB,
-      INSSHD,
-      SENDSH,
-      RECVSH,
-      TRON,
-      TROFF,
-      DBEGTR,
-      GENBLI,
-      TPCNTR,
-      RMKIND,
-      SETELW,
-      DLOAD2,
-      DREADA,
-      DREAD,
-      LINDTP,
-      DVMRM,
-      DVMSM,
-      AARRCP,
-      WAITCP,
-      ACROSS,
-      DVMLF,
-      ADDBND,
-      INCSH,
-      INCSHD,
-      DRARR,
-      BARRIER,
-      DINSRD,
-      DCRRG,
-      DSAVRG,
-      DCLCRG,
-      DDLRG,
-      ADDSHD,
-      CRTRDA,
-      STRTAC,
-      WAITAC,
-      CRTCG,
-      INSCG,
-      STRTCG,
-      WAITCG,
-      DELCG,
-      CONSDA,
-      INCLCG,
-      RSTRDA,
-      RSTCG, 
-      CRTRA9,
-      CRTDA9,
-      FTCNTR,
-      DACSUM,
-      ARCSF,
-      BLKDIV,
-      DOPLMB,
-      DOSL,
-      DVTR,
-      DOPLSEQ,
-      INIMPI,
-      DVMH_INIT,
-      DVMH_FINISH,
-      DVMH_EXIT,
-      INIT_CUDA,
-      REG_CREATE,
-      REG_CREATE_2,
-      REG_END,
-      REG_END_2,
-      REG_DEVICES,
-      REG_DEVICES_2,
-      REG_START,
-      RGSTR_ARRAY_2,
-      RGSTR_SUBARRAY_2,
-      RGSTR_SCALAR_2,
-      RGSTR_ARRAY,
-      RGSTR_SUBARRAY,
-      RGSTR_SCALAR,
-      SET_NAME_ARRAY,
-      SET_NAME_VAR,
-      BEFORE_LOADRB,
-      REG_WAITRB,
-      REG_DESTROY_RB,
-      GET_ACTUAL_EDGES,
-      SHADOW_RENEW,
-      SHADOW_RENEW_2,
-      INDIRECT_SH_RENEW,
-      LOOP_CREATE,
-      LOOP_CREATE_2,
-      REG_HANDLER,
-      REG_HANDLER_2,
-      HANDLER_FUNC,
-      LOOP_START,
-      LOOP_END,
-      LOOP_PERFORM,
-      LOOP_PERFORM_2,
-      CUDA_BLOCK,
-      CUDA_BLOCK_2,
-      LOOP_INSRED,
-      LOOP_RED,
-      SHADOW_COMPUTE,
-      SHADOW_COMPUTE_AR,
-      SHADOW_COMPUTE_2,
-      CORRESPONDENCE,
-      GET_ACTUAL_ALL,
-      GET_ACTUAL_ALL_2,
-      GET_ACTUAL_ARRAY,
-      GET_ACTUAL_ARR_2,
-      GET_ACTUAL_SUBARRAY,
-      GET_ACTUAL_SUBARR_2,
-      GET_ACTUAL_SCALAR,
-      GET_ACTUAL_SCALAR_2,
-      GET_ACTUAL_SUBVAR,
-      GET_ACTUAL_SUBVAR_2,
-      ACTUAL_ARRAY,
-      ACTUAL_ARRAY_2,
-      ACTUAL_SUBARRAY,
-      ACTUAL_SUBARRAY_2,
-      ACTUAL_SCALAR,
-      ACTUAL_SCALAR_2,
-      ACTUAL_SUBVAR,
-      ACTUAL_SUBVAR_2,
-      ACTUAL_ALL,
-      ACTUAL_ALL_2,
-      DVMH_REDISTRIBUTE,
-      DVMH_REALIGN,
-      DESTROY_ARRAY,
-      DESTROY_SCALAR,
-      HANDLE_CONSIST,
-      LOOP_ACROSS,
-      LOOP_ACROSS_2,
-      DVMH_SET_STAGE,
-      GET_STAGE,
-      MAP_TASKS,
-      DATA_ENTER,
-      DATA_EXIT,
-      DELETE_OBJECT,
-      FORGET_HEADER,
-      SCOPE_START, 
-      SCOPE_END,
-      SCOPE_INSERT, 
-      LOOP_MAP,
-      ALIGN_LINEAR,
-      REGISTER_ARR,
-      GET_ADDR,
-      STRING,
-      STRING_VAR,
-      VAR_GEN_HDR,
-      VAR_FILL_HDR,
-      CP_NEXT_FILENAME,
-      CP_CHECK_FILENAME,
-      CP_SAVE_FILENAMES,
-      CP_WAIT,
-      CP_SAVE_ASYNC_UNIT,
-      DVMH_LINE,
-      CREATE_ARRAY, 
-      CREATE_TEMPLATE,
-      DVMH_REPLICATED, 
-      DVMH_BLOCK,      
-      DVMH_WGTBLOCK,  
-      DVMH_GENBLOCK,   
-      DVMH_MULTBLOCK,
-      DVMH_INDIRECT,
-      DVMH_DERIVED,  
-      DVMH_DISTRIBUTE,
-      DVMH_REDISTR_2, 
-      DVMH_ALIGN,
-      DVMH_REALIGN_2,
-      DVMH_HAS_ELEMENT,
-      CALC_LINEAR,
-      LOCALIZE,      
-      SHADOW_ADD,
-      EXPR_IGNORE,
-      EXPR_CONSTANT,
-      EXPR_SCAN,
-      DERIVED_RHS,
-      ARRAY_SLICE,
-      COPY_WHOLE,
-      COPY_ARRAY,
-      SET_VALUE,
-      LOOP_CONSISTENT,
-      DVMH_REMOTE2,
-      LOOP_REMOTE,
-      GET_REMOTE_BUF,
-      FTN_OPEN,
-      FTN_CLOSE,
-      FTN_READ,
-      FTN_WRITE,
-      FTN_ENDFILE,
-      FTN_FLUSH,
-      FTN_REWIND,
-      FTN_CONNECTED,      
-      FILL_BOUNDS,
-      RED_INIT,
-      RED_POST,
-      SLOT_COUNT,
-      HAS_ELEMENT,
-      HAS_ELEMENT_2,
-      FILL_LOCAL_PART,
-      OMP_STAT_BP,
-      OMP_STAT_AP,
-      OMP_STAT_BL,
-      OMP_STAT_AL,
-      OMP_STAT_BS,
-      OMP_STAT_AS,      
-      GET_BASE,
-      GET_BASE_C,
-      FILL_HEADER,
-      FILL_HEADER_2,
-      FILL_HEADER_EX,
-      FILL_HEADER_EX_2,
-      DO_CUDA,
-      RED_CUDA,
-      RED_CUDA_C,
-      REGISTER_RED,
-      RED_INIT_C,
-      RED_INIT_2,
-      CUDA_RED_INIT,
-      CUDA_RED_INIT_2,
-      RED_PREPARE,
-      RED_PREPARE_C,
-      RED_FINISH,
-      RED_FINISH_C,
-      SHARED_NEEDED,
-      GET_DEVICE_ADDR,
-      GET_DEVICE_ADDR_C,
-      GET_LOCAL_PART,
-      GET_LOCAL_PART_C,
-      GET_DEVICE_NUM,
-      GET_DEVICE_NUM_2,
-      GET_OVERALL_STEP,
-      FILL_BOUNDS_C,
-      FILL_BOUNDS_2,
-      RED_POST_C,
-      RED_POST_2,
-      CUDA_REPLICATE, 
-      GET_DEP_MASK,
-      GET_DEP_MASK_2,
-      GET_DEP_MASK_F,
-      CUDA_TRANSFORM,
-      CUDA_AUTOTRANSFORM,
-      LOOP_AUTOTRANSFORM,
-      APPLY_OFFSET,
-      GET_CONFIG,
-      GET_CONFIG_C,
-      CHANGE_BOUNDS,
-      GUESS_INDEX_TYPE,
-      GUESS_INDEX_TYPE_2,
-      RTC_SET_LANG,
-      GET_REMOTE_BUF_C,
-      GET_DEVICE_PROP,
-      GET_MAX_BLOCKS,
-      GET_PRIVATE_ARR,
-      DISPOSE_PRIVATE_AR,
-      GET_WARP_SIZE,
-      MAX_LIBFUN_NUM
-};  
diff --git a/projects/dvm_svn/fdvm/trunk/include/unparse.hpf b/projects/dvm_svn/fdvm/trunk/include/unparse.hpf
deleted file mode 100644
index 10d56c7..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/unparse.hpf
+++ /dev/null
@@ -1,1127 +0,0 @@
-/*********************************************************************/
-
-/*****************************************************************************/
-/*****************************************************************************/
-/*****                                                                   *****/
-/*****    UNPARSE.DEF:   Gregory HOGDAL / Eric MARCHAND    July 1992     *****/
-/*****                   Bodin Francois August 1992                      *****/
-/*****                                                                   *****/
-/*****************************************************************************/
-/*****************************************************************************/
-
-/* 
-   The following types exist: BIFNODE, LLNODE, SYMBNODE and TYPENODE
-
-   Any erroneous construct is parsed into a node of this type.
-   This type of node is accepted without complaint in all contexts
-   by later parsing activities, to avoid multiple error messages
-   for one error.
-   No fields in these nodes are used except the NODE_CODE.  
-*/
-
-/* exemple 
-DEFNODECODE (ERROR_MARK, "error_mark", "x", 0, LLNODE)
-*/
-
-/***** List of commands for BIF NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %CMNT	      : the comment attached to a bif node */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %SYMBID     : Symbol identifier */
-       /* %LL1        : Low Level Node 1 */
-       /* %LL2        : Low Level Node 2 */
-       /* %LL3        : Low Level Node 3 */
-       /* %L2L2       : Low Level Node 2 of Low Level Node 2 */
-       /* %BLOB1      : All Blob 1 */
-       /* %BLOB2      : All Blob 2 */
-       /* %STATENO    : Statement number */
-       /* %L1SYMBID   : pbf->entry.Template.ll_ptr1->entry.Template.symbol->ident; */
-       /* %INWRITEON  : In_Write_Statement Flag ON */
-       /* %INWRITEOFF : In_Write_Statement Flag OFF */
-       /* %INPARAMON  : In_Param_Statement Flag ON */
-       /* %INPARAMOFF : In_Param_Statement Flag OFF */
-       /* %INIMPLION  : In_Impli_Statement Flag ON */
-       /* %INIMPLIOFF : In_Impli_Statement Flag OFF */
-       /* SYMBTYPE    : Type of Symbol */
-       /* %VARLIST    : list of variables / parameters */
-/******************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for BIF NODE *****/
-       /* %RECURSBIT  : int constant RECURSIVE_BIT (integer) */
-       /* %EXPR_LIST  : int constant EXPR_LIST code for Low Level Node (integer) */
-       /* %SPEC_PAIR  : int constant SPEC_PAIR code for Low Level Node (integer) */
-       /* %IOACCESS   : int constant IOACCESS code for Low Level Node (integer) */
-       /* %SATTR      : Symbol Attribut (integer) */
-       /* %STRCST     : String Constant in '' */
-       /* %SYMBID     : Symbol Identifier (string) */
-       /* %SYMBOL     : Symbol node (integer) */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %LL1        : Low Level Node 1 (integer) */
-       /* %LL2        : Low Level Node 2 (integer) */
-       /* %LL3        : Low Level Node 3 (integer) */
-       /* %LABUSE     : Label ptr (do end) (integer) */
-       /* %L1CODE     : Code (variant) of Low Level Node 1 (integer) */
-       /* %L2CODE     : Code (variant) of Low Level Node 2 (integer) */
-       /* %L1L2L1CODE : Code (variant) of Low Level Node 1 of Low Level Node 2 of Low Level Node 1 (integer) */
-	/* %L1L2*L1CODE : Code (variant) of Low Level Node 1 of (Low Level Node 2)* of Low Level Node 1 (integer) follow L2*/
-       /* %L2L1STR    : String (string_val) of Low Level Node 1 of Low Level Node 2 (string) */
-/*****************************************************************************************/
-
-/*
-DEFNODECODE(GLOBAL,             "%CMNT%SETFLAG(QUOTE)%INCTAB%BLOB1%DECTAB%UNSETFLAG(QUOTE)",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(GLOBAL,             "%CMNT%SETFLAG(QUOTE)%BLOB1%UNSETFLAG(QUOTE)",
-'s',0,BIFNODE)
-
-DEFNODECODE(PROG_HEDR,          "%RESETID%CMNT%PUTTABprogram %IF(%SYMBID != %STRCST'_MAIN')%SYMBID%ENDIF%NL%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(PROC_HEDR,          "%RESETID%CMNT%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIFsubroutine %SYMBID (%VARLIST)%NL%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(PROS_HEDR,          "%CMNT%PUTTABprocess %SYMBID (%VARLIST)%NL%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(BASIC_BLOCK,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PROCESSES_STAT,     "%CMNT%PUTTABprocesses%NL%INCTAB%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(INPORT_DECL,        "%CMNT%PUTTABinport (%LL2) %LL1%NL",
-'s',2,BIFNODE)
-DEFNODECODE(OUTPORT_DECL,       "%CMNT%PUTTABoutport (%LL2) %LL1%NL",
-'s',2,BIFNODE)
-DEFNODECODE(CHANNEL_STAT,       "%CMNT%PUTTABchannel(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(MERGER_STAT,         "%CMNT%PUTTABmerger(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(MOVE_PORT,          "%CMNT%PUTTABmoveport(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(SEND_STAT,          "%CMNT%PUTTABsend%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT) %IF ( %LL2 != %NULL )%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(RECEIVE_STAT,       "%CMNT%PUTTABreceive%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT) %IF ( %LL2 != %NULL )%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(ENDCHANNEL_STAT,    "%CMNT%PUTTABendchannel%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(PROBE_STAT,          "%CMNT%PUTTABprobe%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(INTENT_STMT,        "%CMNT%PUTTAB%LL2 %LL1%NL",
-'s',2,BIFNODE)
-
-/* 107 is value for FOR_NODE 
-DEFNODECODE(CONTROL_END,        "%CMNT%IF ( %VALINT107  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF%IF ( %VALINT102  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%NL%ENDIF%IF ( %VALINT101  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%ENDIF%IF ( %VALINT130  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%NL%ENDIF%IF ( %VALINT124  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF",
-'s',0,BIFNODE) */
-
-DEFNODECODE(CONTROL_END,        "%CMNT%IF ( %VALINT107  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF%IF ( %VALINT102  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABend%RESETID%NL%NL%ENDIF%IF ( %VALINT101  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%RESETID%NL%NL%ENDIF%IF ( %VALINT130  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%RESETID%NL%NL%ENDIF%IF ( %VALINT124  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF%IF ( %VALINT109  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF%IF ( %VALINT285  == %BIFCP)%DECTAB%PUTTABendprocessdo%INCTAB%NL%ENDIF%IF ( %VALINT279  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABend%RESETID%NL%NL%ENDIF%IF ( %VALINT101  == %BIFCP)%IF(%CHECKFLAG(TASK_REGION)!=%NULL)%TASKERROR3%ENDIF%ENDIF",
-  's',0,BIFNODE)
-DEFNODECODE(PROCESSES_END,      "%CMNT%DECTAB%PUTTABendprocesses%NL",
-  's',0,BIFNODE)
-DEFNODECODE(IF_NODE,            "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABif (%LL1) then%NL%INCTAB%BLOB1%DECTAB %IF (%BLOB2 != %NULL) %IF (%ELSIFBLOB2 == %NULL)%PUTTABelse%NL%ELSE%PUTTABelse if%ENDIF%INCTAB%BLOB2%DECTAB%LABELENDIF%PUTTABendif%NL%ELSE%LABELENDIF%PUTTABendif%NL%ENDIF",
-'s',0,BIFNODE)
-DEFNODECODE(ARITHIF_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABif (%LL1) %LL2%NL",
-'s',0,BIFNODE)
-/*DEFNODECODE(LOGIF_NODE,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABif (%LL1) %NL%PUTTAB%INCTABthen%BLOB1%DECTAB%PUTTABendif %NL",
-'s',0,BIFNODE)*/
-DEFNODECODE(LOGIF_NODE,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABif (%LL1) then %NL%INCTAB%BLOB1%DECTAB%PUTTABendif%NL",
-'s',0,BIFNODE)
-DEFNODECODE(LOOP_NODE,          "%ERROR",
-'s',0,BIFNODE)
-/*DEFNODECODE(FOR_NODE,           "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)do %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%BLOB1%DECTAB", 
-'s',0,BIFNODE)*/                                                                                      /* previously : for %SYMBID = %LL1 %NL %INCTAB%BLOB1%DECTAB enddo%NL",*/
-
-/*DEFNODECODE(FOR_NODE,           "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)do %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%IF (%CHECKFLAG(APPEND_ON) != %NULL)%PUTTAB%UNPARSE_ON%UNSETFLAG(APPEND_ON)%NL%ELSE%PUSHFLAG(DO_ON)%ENDIF%BLOB1%DECTAB", 
-'s',0,BIFNODE)*/
-/*DEFNODECODE(FOR_NODE,           "%IF(%CHECKFLAG(INDEPENDENT_ALREADY)==%NULL)%CHECK_INDEPENDENT_DO%ELSE%UNSETFLAG(INDEPENDENT_ALREADY)%ENDIF%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)do %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%IF (%CHECKFLAG(APPEND_ON) != %NULL)%UNPARSE_ON%INCTAB%UNSETFLAG(APPEND_ON)%NL%ENDIF%BLOB1%DECTAB", 
-'s',0,BIFNODE)18062001*/
-DEFNODECODE(FOR_NODE,           "%IF(%CHECKFLAG(INDEPENDENT_ALREADY)==%NULL)%CHECK_INDEPENDENT_DO%ELSE%UNSETFLAG(INDEPENDENT_ALREADY)%ENDIF%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)do %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%IF (%CHECKFLAG(APPEND_ON) != %NULL)%UNPARSE_ON%INCTAB%UNSETFLAG(APPEND_ON)%NL%ENDIF%BLOB1%DECTAB", 
-'s',0,BIFNODE)
-
-DEFNODECODE(PROCESS_DO_STAT,    "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)processdo %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%BLOB1%DECTAB", 
-'s',2,BIFNODE)
-DEFNODECODE(FORALL_NODE,        "%ERROR",
-'s',0,BIFNODE)
-/* wrong
-DEFNODECODE(WHILE_NODE,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIFdo %IF (%LABUSE != %NULL)%STATENO%ENDIF while (%LL1)%NL",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(WHILE_NODE,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIFdo %IF (%LABUSE != %NULL)%STATENO %ENDIFwhile (%LL1)%NL%INCTAB%BLOB1%DECTAB",
-  's',0,BIFNODE)
-
-/* DEFNODECODE(CDOALL_NODE,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcdoall %IF (%LABUSE != %NULL)%STATENO%ENDIF%SYMBID = %LL1, %LL2%IF (%LL2 != %NULL) , %LL2%ENDIF%NL",
-'s',0,BIFNODE) */
-
-DEFNODECODE(CDOALL_NODE,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)cdoall %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%BLOB1%DECTAB",
-'s',0,BIFNODE) 
-
-DEFNODECODE(SDOALL_NODE,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(DOACROSS_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CDOACROSS_NODE,     "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(EXIT_NODE,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(GOTO_NODE,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABgoto %LL3%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ASSGOTO_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABgoto %SYMBID %IF (%LL1 != %NULL)(%LL1)%ENDIF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(COMGOTO_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABgoto (%LL1), %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PAUSE_NODE,         "%CMNT%PUTTABPAUSE%NL",
-'s',0,BIFNODE)
-DEFNODECODE(STOP_NODE,          "%ERROR",
-'s',0,BIFNODE)
-
-DEFNODECODE(ASSIGN_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%CHECK_ALLOCATE%LL1 = %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(M_ASSIGN_STAT,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PROC_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcall %SYMBID(%LL1)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PROS_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprocess call %SYMBID(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(PROS_STAT_LCTN,     "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprocess call %SYMBID(%LL1) location%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(PROS_STAT_SUBM,     "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprocess call %SYMBID(%LL1) submachine%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(ASSLAB_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABassign %LL1 to %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SUM_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MULT_ACC,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MAX_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MIN_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CAT_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(OR_ACC,             "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(AND_ACC,            "%ERROR",
-'s',0,BIFNODE)
-
-/*DEFNODECODE(READ_STAT,          "%CMNTread %IF (%L2CODE == %EXPR_LIST)(%LL2) %ELSE%IF (%L2CODE == %SPEC_PAIR)%IF (%L2L1STR == %STRCST 'fmt')(%LL2) %ELSE%L2L2%IF (%LL1 != %NULL), %ENDIF%ENDIF%ELSE%L2L2%IF (%LL1 != %NULL), %ENDIF%ENDIF%ENDIF%LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(READ_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIFread %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%INWRITEON%IF (%L1L2*L1CODE == %IOACCESS)(%ENDIF%LL1%IF (%L1L2*L1CODE == %IOACCESS))%ENDIF%INWRITEOFF%NL",
-'s',0,BIFNODE) */
-
-/* this is OK but WRITE NODE differ for what reason????????, Should be the same*/
-DEFNODECODE(READ_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABread %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE%IF (%LL2 != %NULL)(%LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%ENDIF%INWRITEON%LL1%INWRITEOFF%NL",
-'s',0,BIFNODE)
-
-/*
-DEFNODECODE(WRITE_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABwrite %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%INWRITEON%IF (%L1L2*L1CODE == %IOACCESS)(%ENDIF%LL1%IF (%L1L2*L1CODE == %IOACCESS))%ENDIF%INWRITEOFF%NL",
-'s',0,BIFNODE) */
-
-
-DEFNODECODE(WRITE_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABwrite %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE%IF (%LL2 != %NULL)(%LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%ENDIF%INWRITEON%LL1%INWRITEOFF%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(PRINT_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprint %IF (%LL2 != %NULL)%SETFLAG(PRINT)%LL2%UNSETFLAG(PRINT)%IF (%LL1!= %NULL),%ENDIF%ENDIF%INWRITEON%LL1%INWRITEOFF%NL",
-'s',0,BIFNODE)
-
-
-
-DEFNODECODE(OTHERIO_STAT,       "%CMNT%PUTTAB%LL1%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(BLOB,               "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(SIZES,              "%ERROR",
-'s',0,BIFNODE)
-
-
-/*
-DEFNODECODE(FUNC_HEDR,          "%CMNT%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIF%SYMBTYPE function %SYMBID (%VARLIST) %NL%BLOB1",
-*/
-/*DEFNODECODE(FUNC_HEDR,          "%CMNT%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIF%IF(%LL2 != %NULL)%LL2%ELSE%SYMBTYPE%ENDIF function %SYMBID (%VARLIST) %NL%BLOB1",
-'s',0,BIFNODE)*/
-
-/*DEFNODECODE(FUNC_HEDR,          "%RESETID%CHECK_FUNC%CMNT%IF (%CHECKFLAG(COMMENT) != %NULL)C%ENDIF%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIF%IF(%LL2 != %NULL)%LL2%ELSE%SYMBTYPE%ENDIF function %SYMBID (%VARLIST) %NL%BLOB1%IF (%CHECKFLAG(COMMENT) != %NULL)%UNSETFLAG(COMMENT)%ENDIF",
-'s',0,BIFNODE)*/
-DEFNODECODE(FUNC_HEDR,          "%RESETID%CHECK_FUNC%CMNT%IF (%CHECKFLAG(COMMENT) != %NULL)C%ENDIF%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIF%IF(%LL2 != %NULL)%LL2 %ENDIFfunction %SYMBID (%VARLIST) %NL%BLOB1%IF (%CHECKFLAG(COMMENT) != %NULL)%UNSETFLAG(COMMENT)%ENDIF",
-'s',0,BIFNODE)
-
-DEFNODECODE(WHERE_NODE,         "%CMNT%PUTTABwhere (%LL1) %LL2 = %LL3%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ALLDO_NODE,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(IDENTIFY,           "%CMNT%PUTTABidentify %LL1 %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(FORMAT_STAT,        "%CMNT%IF (%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%LL1%NL", 
-'s',0,BIFNODE)
-DEFNODECODE(STOP_STAT,          "%CMNT%PUTTABstop%IF (%LL1 != %NULL)%LL1%ENDIF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(RETURN_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABreturn%NL",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(ELSEIF_NODE,        " (%LL1) then%NL%INCTAB%BLOB1%DECTAB %IF (%BLOB2 != %NULL) %IF (%ELSIFBLOB2 == %NULL)%PUTTABelse%NL%ELSE%PUTTABelse if%ENDIF%BLOB2%IF (%BLOB2 != %NULL)%NL%ENDIF%ELSE%NL%ENDIF",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(ELSEIF_NODE,        " (%LL1) then %NL%INCTAB%BLOB1%DECTAB%IF (%BLOB2 != %NULL) %IF (%ELSIFBLOB2 == %NULL)%PUTTABelse%NL%ELSE%PUTTABelse if%ENDIF%INCTAB%BLOB2%DECTAB%ENDIF",
-'s',0,BIFNODE)
-
-/*NO_OPnodes*/
-DEFNODECODE(COMMENT_STAT,       "%ERROR",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(CONT_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABcontinue%NL",
-'s',0,BIFNODE)
-*/
-
-DEFNODECODE(CONT_STAT,          "%IF (%CHECKFLAG(DO_ON)==%NULL)%IF(%CHECKFLAG(TASK_DIR)!=%NULL)%UNSETFLAG(TASK_DIR)%DECTAB%CHPFTAB%INCTAB END ON%NL%ENDIF%ENDIF%IF (%CHECKFLAG(DO_ON)!=%NULL) %POPFLAG(DO_ON)%ENDIF%CMNT%IF ( %VALINT107 == %BIFCP )%FIND_DO%ENDIF%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcontinue%NL",
-'s',0,BIFNODE)
-
-/*DEFNODECODE(CONT_STAT,          "%CMNT%IF ( %VALINT107 == %BIFCP ) %FIND_DO%ENDIF%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcontinue%NL",
-'s',0,BIFNODE)18062001*/
-
-/*DEFNODECODE(VAR_DECL,           "%SAVE%CMNT%PUTTAB%SETFLAG(POINTER)%SETFLAG(VARLEN)%LL2%IF (%LL3 != %NULL),%LL3:: %LL1%IF(%CHECKFLAG(NOARRAY) != %NULL)%UNSETFLAG(NOARRAY)%ENDIF %ELSE%SETFLAG(VARDECL) %LL1%UNSETFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%IF (%CHECKFLAG(POINTER) != %NULL)%UNSETFLAG(POINTER)%ENDIF%IF (%CHECKFLAG(DECLARED) != %NULL)%UNSETFLAG(DECLARED)%LOAD%ENDIF%NL",
-'s',0,BIFNODE)*/
-DEFNODECODE(VAR_DECL,           "%SAVE%IF (%CHECKFLAG(POINTER) != %NULL)%UNSETFLAG(POINTER)%ENDIF%CMNT%PUTTAB%SETFLAG(VARLEN)%LL2%IF (%LL3 != %NULL),%LL3:: %DECLARATION%IF(%CHECKFLAG(NOARRAY) != %NULL)%UNSETFLAG(NOARRAY)%ENDIF %ELSE%SETFLAG(VARDECL) %DECLARATION%UNSETFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%NL%IF (%CHECKFLAG(POINTER) != %NULL)%UNSETFLAG(POINTER)%LOAD%ENDIF",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_VAR_DECL,           "%CHECK_DVMBIT%IF (%CHECKFLAG(DYNAMIC) != %NULL)%UNSETFLAG(DYNAMIC)%ENDIF%CMNT%CHPFTAB%SETFLAG(VARLEN)%IF (%LL3 != %NULL) %LL3:: %LL1%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%IF (%CHECKFLAG(DYNAMIC) != %NULL)%UNSETFLAG(DYNAMIC)%ELSE%CHECK_COMBINED_DIR%ENDIF%NL",
-'s',0,BIFNODE)
-
-/*DEFNODECODE(VAR_DECL,           "%CMNT%PUTTAB%SETFLAG(VARLEN)%LL2%IF (%LL3 != %NULL),%LL3:: %LL1%IF(%CHECKFLAG(NOARRAY) != %NULL)%UNSETFLAG(NOARRAY)%ENDIF %ELSE%SETFLAG(VARDECL) %LL1%UNSETFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%NL",
-'s',0,BIFNODE)*/
-
-/*
-ALLOCATABLE_STMT,       ALLOCATE_STMT,           CONTAINS_STMT,           CYCLE_STMT,              DEALLOCATE_STMT,
- EXIT_STMT,              INTENT_STMT,             INTERFACE_STMT,          MODULE_PROC_STMT,        MODULE_STMT,
- NULLIFY_STMT,           OPTIONAL_STMT,           POINTER_STMT,            PRIVATE_STMT,            PUBLIC_STMT,
- SEQUENCE_STMT,          TARGET_STMT,             USE_STMT, 
-*/
-DEFNODECODE(PARAM_DECL,         "%CMNT%PUTTABparameter (%INPARAMON%SETFLAG(PARAM)%LL1%UNSETFLAG(PARAM)%INPARAMOFF)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(COMM_STAT,          "%SAVE%IF (%CHECKFLAG(POINTER) != %NULL)%UNSETFLAG(POINTER)%ENDIF%CMNT%PUTTABcommon %LL1%NL%IF (%CHECKFLAG(POINTER) != %NULL)%UNSETFLAG(POINTER)%LOAD%ENDIF",
-'s',0,BIFNODE)
-
-/*DEFNODECODE(COMM_STAT,          "%CMNT%PUTTAB%SAVEcommon %LL1%LOAD%NL",
-'s',0,BIFNODE)*/
-
-DEFNODECODE(PROS_COMM,           "%CMNT%PUTTABprocess common %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(EQUI_STAT,          "%CMNT%PUTTABequivalence %LL1%NL",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(IMPL_DECL,          "%CMNT%PUTTABimplicit %IF (%LL1 != %NULL)%IF (%LL2 != %NULL)%ERROR'IMPLICIT Error'%ELSE%INIMPLION%LL1%INIMPLIOFF%ENDIF%ELSE%INIMPLION%LL2%INIMPLIOFF%ENDIF%NL",
-'s',0,BIFNODE)
-*/
-
-DEFNODECODE(IMPL_DECL,          "%CMNT%PUTTABimplicit %IF (%LL1 != %NULL)%SETFLAG(RANGEPRINT)%INIMPLION%LL1%INIMPLIOFF%UNSETFLAG(RANGEPRINT)%ELSEnone%ENDIF%NL",
-'s',0,BIFNODE)
-
-
-DEFNODECODE(DATA_DECL,          "%CMNT%PUTTAB%LL1%NL",
-'s',0,BIFNODE)
-/* DEFNODECODE(SAVE_DECL,          "%CMNT%PUTTABsave %IF (%LL1 != %NULL)%LL1%ELSEall%ENDIF%NL",
-'s',0,BIFNODE) */
-DEFNODECODE(SAVE_DECL,          "%CMNT%PUTTABsave %IF (%LL1 != %NULL)%LL1%ENDIF%NL",
-'s',0,BIFNODE) 
-DEFNODECODE(STMTFN_STAT,        "%CMNT%PUTTAB%LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DIM_STAT,           "%CMNT%PUTTABdimension %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PROCESSORS_STAT,    "%CMNT%PUTTABprocessors %LL1%NL",
-'s',1,BIFNODE)
-DEFNODECODE(EXTERN_STAT,        "%CMNT%PUTTABexternal %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(INTRIN_STAT,        "%CMNT%PUTTABintrinsic %LL1%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(ENUM_DECL,          "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(CLASS_DECL,         "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(UNION_DECL,         "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(STRUCT_DECL,        "%CMNT%PUTTABtype %IF (%LL1 != %NULL),%LL1::%ENDIF%SYMBID%NL",
-'d',0,BIFNODE)
-DEFNODECODE(DERIVED_CLASS_DECL, "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(EXPR_STMT_NODE,     "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(DO_WHILE_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(SWITCH_NODE,        "%CMNT%PUTTABcase (%LL1)%SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CASE_NODE,          "%CMNT%IF (%LL3 != %NULL)%LL3:%ENDIF%PUTTABselect case (%LL1)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DEFAULT_NODE,       "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(BREAK_NODE,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CONTINUE_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(RETURN_NODE,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(ASM_NODE,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(LABEL_STAT,         "%ERROR",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(PROC_COM,           "%ERROR",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(ATTR_DECL,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(NAMELIST_STAT,      "%CMNTnamelist %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(OPEN_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABopen (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CLOSE_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABclose (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ENDFILE_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABendfile (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(REWIND_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABrewind (%LL2)%NL",
-'s',0,BIFNODE)
-/* DEFNODECODE(ENTRY_STAT,      "%CMNT%PUTTABentry %SYMBID(%VARLIST)%NL",
-'s',0,BIFNODE) */
- DEFNODECODE(ENTRY_STAT,      "%CMNT%PUTTABentry %SYMBID%IF(%LL1 != %NULL)(%LL1)%ENDIF%NL",
-'s',0,BIFNODE) 
-
-DEFNODECODE(BLOCK_DATA,      "%CMNT%PUTTABblock data %SYMBID%NL%BLOB1%NL%PUTTABend%NL",
-'s',0,BIFNODE)
-
-/*****************variant tags for low level nodes********************/
-
-/***** List of commands for LOW LEVEL NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %LL1        : Low Level Node 1 */
-       /* %LL2        : Low Level Node 2 */
-       /* %SYMBID     : Symbol identifier */
-       /* %TYPE       : Type */
-       /* %L1SYMBCST  : Constant Value of Low Level Node Symbol */
-       /* %INTVAL     : Integer Value */
-       /* %STATENO    : Statement Number */
-       /* %STRVAL     : String Value */
-       /* %BOOLVAL    : Boolean Value */
-       /* %CHARVAL    : Char Value */
-       /* %ORBPL1     : Openning Round Brackets on Precedence of Low Level Node 1 */
-       /* %CRBPL1     : Closing Round Brackets on Precedence of Low Level Node 1 */
-       /* %ORBPL2     : Openning Round Brackets on Precedence of Low Level Node 2 */
-       /* %CRBPL2     : Closing Round Brackets on Precedence of Low Level Node 2 */
-/***********************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for LOW LEVEL NODE *****/
-       /* %STRCST     : String Constant in '' */
-       /* %SYMBID     : Symbol Identifier (string) */
-       /* %SYMBOL     : Symbol node (integer) */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %LL1        : Low Level Node 1 (integer) */
-       /* %LL2        : Low Level Node 2 (integer) */
-       /* %LABUSE     : Label ptr (do end) (integer) */
-       /* %L1CODE     : Code (variant) of Low Level Node 1 (integer) */
-       /* %L2CODE     : Code (variant) of Low Level Node 2 (integer) */
-       /* %INWRITE    : In_Write_Statement (integer / boolean flag) */
-       /* %INPARAM    : In_Param_Statement (integer / boolean flag) */
-       /* %INIMPLI    : In_Impli_Statement (integer / boolean flag) */
-/************************************************************************************************/
-
-
-DEFNODECODE(LEN_OP,            "%SETFLAG(LENOP)%IF (%LL1 != %NULL)*%LL1 %IF (%CHECKFLAG(STYPE) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%ENDIF%UNSETFLAG(LENOP) ",
-'e',0,LLNODE)
-DEFNODECODE(INT_VAL,            "%INTVAL",
-'c',0,LLNODE)
-DEFNODECODE(FLOAT_VAL,          "%STRVAL",
-'c',0,LLNODE)
-DEFNODECODE(DOUBLE_VAL,         "%STRVAL",
-'c',0,LLNODE)
-DEFNODECODE(BOOL_VAL,           "%BOOLVAL",
-'c',0,LLNODE)
-DEFNODECODE(CHAR_VAL,           "%IF (%INIMPLI == %NULL)\\%ENDIF%CHARVAL%IF (%INIMPLI == %NULL)\\%ENDIF",
-'c',0,LLNODE)
-DEFNODECODE(STRING_VAL,         "%IF (%CHECKFLAG(QUOTE) != %NULL)'%STRVAL'%ELSE\\%STRVAL\\%ENDIF",
-'c',0,LLNODE)
-DEFNODECODE(KEYWORD_VAL,        "%IF (%CHECKFLAG(LENOP) != %NULL)(%STRVAL)%ELSE%STRVAL%ENDIF",
-'c',0,LLNODE)
-DEFNODECODE(COMPLEX_VAL,        "(%LL1, %LL2)",
-'c',0,LLNODE)
-
-DEFNODECODE(CONST_REF,          "%SYMBID",
-'r',2,LLNODE)
-
-/*DEFNODECODE(VAR_REF,            "%IF (%CHECKFLAG(POINTER) != %NULL)%POINTER_NAME%ENDIF%SYMBID%IF (%CHECKFLAG(POINTER) != %NULL)%SETFLAG(DECLARED)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',0,LLNODE)*/
-
-/*DEFNODECODE(VAR_REF,            "%SYMBID%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',0,LLNODE)*/
-
-/*DEFNODECODE(ARRAY_REF,          "%CHECK_HEAP%IF (%CHECKFLAG(POINTER) != %NULL)%POINTER_NAME%ENDIF%SYMBID%IF (%CHECKFLAG(POINTER) != %NULL)%SETFLAG(DECLARED)%ENDIF%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%IF(%CHECKFLAG(NOARRAY) == %NULL)(%LL1)%ENDIF%POPFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',1,LLNODE)
-DEFNODECODE(PROCESSORS_REF,     "%IF (%CHECKFLAG(POINTER) != %NULL)%PUSHFLAG(DECLARED)%ENDIF%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%IF(%CHECKFLAG(NOARRAY) == %NULL)(%LL1)%ENDIF%POPFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%STRINGLEN%ENDIF",
-'r',1,LLNODE)*/
-
-DEFNODECODE(VAR_REF,            "%IF (%CHECKFLAG(REDUCTION) != %NULL)%SAVE_SYMBOL%ENDIF%SYMBID%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',0,LLNODE)
-DEFNODECODE(ARRAY_REF,          "%CHECK_HEAP%SYMBID%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%IF(%CHECKFLAG(NOARRAY) == %NULL)(%LL1)%CHECK_PTR%ENDIF%POPFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',1,LLNODE)
-DEFNODECODE(PROCESSORS_REF,     "%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%IF(%CHECKFLAG(NOARRAY) == %NULL)(%LL1)%ENDIF%POPFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%STRINGLEN%ENDIF",
-'r',1,LLNODE)
-
-DEFNODECODE(RECORD_REF,         "%LL1%%%LL2",
-'r',2,LLNODE)
-DEFNODECODE(ENUM_REF,           "%SYMBID",
-'r',2,LLNODE)
-DEFNODECODE(LABEL_REF,          "%STATENO",
-'r',0,LLNODE)
-DEFNODECODE(TYPE_OP,            "%TYPE",
-'e',1,LLNODE)
-DEFNODECODE(DIMENSION_OP,            "%SETFLAG(NOARRAY) dimension(%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(ALLOCATABLE_OP,            " allocatable",
-'e',1,LLNODE)
-DEFNODECODE(PARAMETER_OP,            " parameter",
-'e',1,LLNODE)
-DEFNODECODE(TARGET_OP,            " target",
-'e',1,LLNODE)
-DEFNODECODE(SAVE_OP,            " save",
-'e',1,LLNODE)
-DEFNODECODE(POINTER_OP,            " pointer",
-'e',1,LLNODE)
-DEFNODECODE(INTRINSIC_OP,            " intrinsic",
-'e',1,LLNODE)
-DEFNODECODE(OPTIONAL_OP,            " optional",
-'e',1,LLNODE)
-DEFNODECODE(EXTERNAL_OP,            " external",
-'e',1,LLNODE)
-DEFNODECODE(PRIVATE_OP,            " private",
-'e',1,LLNODE)
-DEFNODECODE(PUBLIC_OP,            " public",
-'e',1,LLNODE)
-DEFNODECODE(IN_OP,            "intent(in)",
-'e',1,LLNODE)
-DEFNODECODE(OUT_OP,            "intent(out)",
-'e',1,LLNODE)
-DEFNODECODE(INOUT_OP,            "intent(inout)",
-'e',1,LLNODE)
-
-DEFNODECODE(VAR_LIST,           "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(PORT_TYPE_OP,       "%TYPE%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(INPORT_TYPE_OP,       "inport ( %TYPE%SETFLAG(RECPORT)%LL1%IF (%LL2 != %NULL), %LL2%ENDIF%IF(%CHECKFLAG(RECPORT) != %NULL))%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(OUTPORT_TYPE_OP,       "outport( %TYPE%SETFLAG(RECPORT)%LL1%IF (%LL2 != %NULL), %LL2%ENDIF%IF(%CHECKFLAG(RECPORT) != %NULL))%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(INPORT_NAME,        "%IF(%CHECKFLAG(PORT) != %NULL)PORT=%ELSEIN=%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(OUTPORT_NAME,       "%IF(%CHECKFLAG(PORT) != %NULL)PORT=%ELSEOUT=%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(FROMPORT_NAME,      "FROM=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(TOPORT_NAME,        "TO=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(IOSTAT_STORE,       "IOSTAT=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(EMPTY_STORE,        "EMPTY=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(ERR_LABEL,          "ERR=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(END_LABEL,          "END=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_IMPL_DO,       "(%LL1, %SYMBID=%LL2)", 
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_ELT,           "%IF (%SYMBOL == %NULL)%LL1%ELSE%SYMBID%LL1%ENDIF%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_SUBS,          "(%LL1)%IF (%LL2 != %NULL)%LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_RANGE,         "(%IF (%LL1 != %NULL)%LL1%ENDIF:%IF (%LL2 != %NULL)%LL2%ENDIF)",
-'e',2,LLNODE)
-
-DEFNODECODE(ICON_EXPR,          "%LL1%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(EXPR_LIST,          "%LL1%IF (%CHECKFLAG(PARAM) != %NULL) = %L1SYMBCST%ENDIF%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE) 
- 
-DEFNODECODE(RANGE_LIST,         "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CASE_CHOICE,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(DEF_CHOICE,         "%LL1%IF (%LL2 != %NULL):%LL2",
-'e',2,LLNODE)
-DEFNODECODE(VARIANT_CHOICE,     "%ERROR",
-'e',2,LLNODE)
-/*
-DEFNODECODE(DDOT,               "%LL1%IF (%INWRITE != %NULL),%ELSE%IF (%INIMPLI != %NULL)-%ELSE%IF (%CHECKFLAG(LOOP) != %NULL),%ELSE:%ENDIF%ENDIF%ENDIF%LL2",
-*/
-DEFNODECODE(DDOT,               "%IF (%LL1==%NULL):%ELSE%LL1%IF (%INWRITE != %NULL),%ELSE%IF (%INIMPLI != %NULL)-%ELSE%IF (%CHECKFLAG(LOOP) != %NULL),%ELSE%IF (%LL2 != %NULL):%ENDIF%ENDIF%ENDIF%ENDIF%LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(RANGE_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(UPPER_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LOWER_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EQ_OP,              "%ORBPL1%LL1%CRBPL1.eq.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(LT_OP,              "%ORBPL1%LL1%CRBPL1.lt.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(GT_OP,              "%ORBPL1%LL1%CRBPL1.gt.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(NOTEQL_OP,          "%ORBPL1%LL1%CRBPL1.ne.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(LTEQL_OP,           "%ORBPL1%LL1%CRBPL1.le.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(GTEQL_OP,           "%ORBPL1%LL1%CRBPL1.ge.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(ADD_OP,             "%ORBPL1%LL1%CRBPL1+%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(SUBT_OP,            "%ORBPL1%LL1%CRBPL1-%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(OR_OP,              "%ORBPL1%LL1%CRBPL1.or.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(MULT_OP,            "%ORBPL1%LL1%CRBPL1*%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(DIV_OP,             "%ORBPL1%LL1%CRBPL1/%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(MOD_OP,             "%ORBPL1%LL1%CRBPL1%%%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(AND_OP,             "%ORBPL1%LL1%CRBPL1.and.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(EXP_OP,             "%ORBPL1%LL1%CRBPL1** %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(ARRAY_MULT,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CONCAT_OP,          "%ORBPL1%LL1%CRBPL1//%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(XOR_OP,             "%LL1.xor.%LL2",
-'e',2,LLNODE)
-DEFNODECODE(EQV_OP,             "%LL1.eqv.%LL2",
-'e',2,LLNODE)
-DEFNODECODE(NEQV_OP,            "%LL1.neqv.%LL2",
-'e',2,LLNODE)
-DEFNODECODE(MINUS_OP,           " (-(%LL1))",
-'e',1,LLNODE)
-DEFNODECODE(NOT_OP,             ".not.(%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(ASSGN_OP,           "=%LL1",
-'e',2,LLNODE)
-DEFNODECODE(DEREF_OP,           "%LL1",
-'e',1,LLNODE)
-DEFNODECODE(POINTST_OP,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MINUSMINUS_OP,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PLUSPLUS_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BITAND_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BITOR_OP,           "%ERROR",
-'e',2,LLNODE)
-
-
-
-DEFNODECODE(STAR_RANGE,         "*",
-'e',2,LLNODE)
-
-DEFNODECODE(PROC_CALL,          "%SYMBID (%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(PROS_CALL,          "%SYMBID (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(FUNC_CALL,          "%SYMBID (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACCESS_REF,         "%LL1%IF (%LL2 != %NULL) (%LL2)%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CONS,               "%LL1, %LL2",
-'e',2,LLNODE)
-DEFNODECODE(ACCESS,             "%LL1, FORALL = (%SYMBID = %LL2)",
-'e',2,LLNODE)
-DEFNODECODE(IOACCESS,           "%IF (%LL1 != %NULL)(%LL1, %ENDIF%SYMBID = %LL2%IF (%LL1 != %NULL))%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CONTROL_LIST,       "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(SEQ,                "%LL1%IF (%LL2 != %NULL)%IF (%INWRITE != %NULL),%ELSE:%ENDIF%LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(SPEC_PAIR,          "%IF (%CHECKFLAG(PRINT) != %NULL)%LL2%ELSE%LL1 = %LL2%ENDIF",
-'e',2,LLNODE)
-/*DEFNODECODE(COMM_LIST,          "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)*/
-DEFNODECODE(COMM_LIST,          "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%COMMONDECL%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-/*DEFNODECODE(COMM_LIST,          "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)*/
-DEFNODECODE(STMT_STR,           "%STRVAL",
-'e',2,LLNODE)
-DEFNODECODE(EQUI_LIST,          "(%LL1)%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(IMPL_TYPE,          "%TYPE %IF (%LL1 != %NULL)(%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(STMTFN_DECL,        "%SYMBID (%VARLIST) = %LL1",
-'e',2,LLNODE)
-DEFNODECODE(BIT_COMPLEMENT_OP,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXPR_IF,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXPR_IF_BODY,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_REF,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LSHIFT_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RSHIFT_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(UNARY_ADD_OP,       "(+(%LL1))",
-'e',2,LLNODE)
-DEFNODECODE(SIZE_OP,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(INTEGER_DIV_OP,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(SUB_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LE_OP,              "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(GE_OP,              "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(NE_OP,              "%ERROR",
-'e',2,LLNODE)
-
-DEFNODECODE(CLASSINIT_OP,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CAST_OP,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ADDRESS_OP,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(POINSTAT_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(COPY_NODE,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(INIT_LIST,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(VECTOR_CONST,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_NUMBER,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ARITH_ASSGN_OP,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ARRAY_OP,           "%IF (%CHECKFLAG(REDUCTION) != %NULL) %LL2%ELSE%LL1 (%LL2)%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(NEW_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(DELETE_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(NAMELIST_LIST,      "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-/* new tag for some expression */
-
-DEFNODECODE(CEIL_DIV_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MAX_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIF_SAVE_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MIN_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIF_ADDR_EXPR,      "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIF_NOP_EXPR,       "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIF_RTL_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUNC_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUNC_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOOR_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOOR_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CEIL_MOD_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ROUND_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ROUND_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RDIV_EXPR,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXACT_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CONVERT_EXPR,       "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(CONST_DECL,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ABS_EXPR,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_ANDIF_EXPR,   "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_AND_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_NOT_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_ORIF_EXPR,    "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PREINCREMENT_EXPR,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PREDECREMENT_EXPR,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(COMPOUND_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOAT_EXPR,         "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIT_IOR_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_XOR_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_ANDTC_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_OR_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_TRUNC_EXPR,     "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(RROTATE_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LROTATE_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RANGE_EXPR,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(POSTDECREMENT_EXPR, "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(REFERENCE_TYPE,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_FLOOR_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_ROUND_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_CEIL_EXPR ,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_DECL ,     "%ERROR",
-'d',2,LLNODE)
-DEFNODECODE(MODIFY_EXPR,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(REFERENCE_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RESULT_DECL,        "%ERROR",
-'d',2,LLNODE)
-DEFNODECODE(PARM_DECL,          "%ERROR",
-'d',2,LLNODE)
-
-/*****************variant tags for DVM nodes*****************************/
-
-DEFNODECODE(BLOCK_OP,            "%IF(%LL1!=%NULL)%IF(%SYMBOL==%NULL) BLOCK(%LL1) %ELSE BLOCK %ENDIF%ELSE%IF (%SYMBOL!=%NULL) GEN_BLOCK(%SYMBID) %ELSE BLOCK %ENDIF%ENDIF ",
-'e',0,LLNODE)
-
-DEFNODECODE(NEW_VALUE_OP,            "%IF(%LL1!=%NULL) NEW(%LL1)%ELSE NEW%ENDIF",
-'e',0,LLNODE)
-
-DEFNODECODE(NEW_SPEC_OP,            "%NEWSPEC%DELETE_COMMA,%IF (%CHECKFLAG(INDEPENDENT) != %NULL) NEW(%LL1)%ENDIF",
-'e',0,LLNODE)
-
-
-DEFNODECODE(TEMPLATE_OP,            "TEMPLATE",
-'e',0,LLNODE)
-
-DEFNODECODE(PROCESSORS_OP,          "PROCESSORS",
-'e',0,LLNODE)
-
-DEFNODECODE(DYNAMIC_OP,             "%IF(%CHECKFLAG(DYNAMIC) !=%NULL )%BACK%ELSE%SETFLAG(DYNAMIC)DYNAMIC%ENDIF",
-'e',0,LLNODE)
-
-DEFNODECODE(DIMENSION_OP,           "DIMENSION (%LL1)",
-'e',0,LLNODE)
-
-DEFNODECODE(SHADOW_OP,              "SHADOW %LL1",
-'e',0,LLNODE)
-DEFNODECODE(SHADOW_COMP_OP,          "%DELETE_COMMA",
-'e',0,LLNODE)
-
-DEFNODECODE(ALIGN_OP,               "%CHECK_DYNAMICALIGN %IF(%LL1!=%NULL) (%LL1)%ENDIF%IF(%LL2!=%NULL) WITH %LL2%ENDIF",
-'e',0,LLNODE)
-
-DEFNODECODE(DISTRIBUTE_OP,              "%CHECK_DYNAMICDISTRIBUTE %IF(%LL1!=%NULL) (%LL1)%ENDIF%IF(%LL2!=%NULL) ONTO %LL2%ENDIF",
-'e',0,LLNODE)
-
-
-DEFNODECODE(DVM_NEW_VALUE_DIR,        "",
-'s',1,BIFNODE)
-
-DEFNODECODE(HPF_TEMPLATE_STAT,        "%CHECK_DVMBIT%CHPFTAB TEMPLATE %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_DYNAMIC_DIR,         "%CHECK_DVMBIT%CHECK_DAC_DIR%CHPFTAB DYNAMIC %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_INHERIT_DIR,         "%CHECK_REDISTRIBUTE_DIR%CHECK_DVMBIT%CHPFTAB INHERIT %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(HPF_PROCESSORS_STAT,     "%CHECK_DVMBIT%CHPFTAB PROCESSORS %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_SHADOW_DIR,          "%CHECK_DVMBIT%CHPFTAB SHADOW %LL1( %LL2 )%NL",
-'s',2,BIFNODE)
-
-DEFNODECODE(DVM_INDIRECT_GROUP_DIR,  "",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_REMOTE_GROUP_DIR,    "",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_REDUCTION_GROUP_DIR, "",
-'s',1,BIFNODE)
-
-/*DEFNODECODE(DVM_DISTRIBUTE_DIR,      "%CHPFTAB DISTRIBUTE %LL1 %IF(%LL2!=%NULL) (%LL2)%ENDIF %IF(%LL3!=%NULL) ONTO %LL3%ENDIF%NL",
-'s',3,BIFNODE)*/
-
-DEFNODECODE(DVM_DISTRIBUTE_DIR,    "%CHECK_DVMBIT%CHECK_FORMAT_NULL%CHECK_REDISTRIBUTE_DIR%CHPFTAB DISTRIBUTE %IF(%LL2!=%NULL) (%LL2)%ENDIF %IF(%LL3!=%NULL) ONTO %LL3 %ENDIF :: %LL1%NL",
-'s',3,BIFNODE)
-DEFNODECODE(DVM_REDISTRIBUTE_DIR,    "%CHPFTAB REDISTRIBUTE (%LL2)%IF(%LL3!=%NULL) ONTO %CHECK_REDISTRIBUTE_ON_MAP%ENDIF :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_ALIGN_DIR,    	     "%CHECK_DVMBIT%CHECK_FORMAT_NULL%CHECK_REALIGN_DIR%CHPFTAB ALIGN (%LL2) WITH %LL3 :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_REALIGN_DIR,         "%CHPFTAB REALIGN (%LL2) WITH %LL3 :: %LL1%NL",
-'s',3,BIFNODE)
-
-/*DEFNODECODE(DVM_PARALLEL_ON_DIR,     "%FIND_REDUCTION%CHECK_ACROSS%INDEPENDENT_DO%IF(%CHECKFLAG(ON_REGION)==%NULL)%SETFLAG(INDEPENDENT_ALREADY)%SETFLAG(INDEPENDENT)%CHPFTAB INDEPENDENT %IF (%LL2!=%NULL) ,%LL2%DELETE_COMMA%ENDIF%UNSETFLAG(INDEPENDENT)%DELETE_COMMA,%INSERT_REDUCTION%DELETE_COMMA%NL%ENDIF",
-'s',3,BIFNODE)*/
-DEFNODECODE(DVM_PARALLEL_ON_DIR,     "%FIND_REDUCTION%CHECK_ACROSS%INDEPENDENT_DO%IF(%CHECKFLAG(ON_REGION)==%NULL)%SETFLAG(INDEPENDENT_ALREADY)%SETFLAG(INDEPENDENT)%CHPFTAB INDEPENDENT %IF (%LL2!=%NULL) ,%LL2%DELETE_COMMA%ENDIF%UNSETFLAG(INDEPENDENT)%NL%ENDIF",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_PARALLEL_TASK_DIR,     "%IF (%LL1 != %NULL)%PAR_TASK_MAP%ENDIF%SETFLAG(INDEPENDENT)%CHPFTAB INDEPENDENT %IF (%LL2!=%NULL) ,%LL2%DELETE_COMMA%ENDIF%UNSETFLAG(INDEPENDENT)%IF (%LL1!=%NULL)%SETFLAG(APPEND_ON)%SETFLAG(TASK_DIR)%ENDIF%NL",
-'s',3,BIFNODE)
-DEFNODECODE(REMOTE_ACCESS_OP,        "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(INDIRECT_ACCESS_OP,      "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(ACROSS_OP,               "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(SHADOW_RENEW_OP,         "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(SHADOW_START_OP,         "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(SHADOW_WAIT_OP,          "%DELETE_COMMA",
-'e',0,LLNODE)
-
-DEFNODECODE(DVM_SHADOW_START_DIR,    "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_SHADOW_WAIT_DIR,     "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_SHADOW_GROUP_DIR,    "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_REDUCTION_START_DIR, "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_REDUCTION_WAIT_DIR,  "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_REDUCTION_GROUP_DIR, "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_REMOTE_ACCESS_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TASK_DIR,	     "%CHECK_DVMBIT",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_MAP_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_PREFETCH_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_RESET_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_DEBUG_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_ENDDEBUG_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_INTERVAL_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_ENDINTERVAL_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TRACEON_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TRACEOFF_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_OWN_DIR,   	     "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_ON_DIR,   	"%IF(%CHECKFLAG(TASK_REGION)==%NULL)%TASKERROR1%ENDIF%ONPLUS%CHPFTAB ON (%FIND_MAP) %IF(%LL3!=%NULL) , %LL3%ENDIF, RESIDENT BEGIN%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_END_ON_DIR,   	"%IF(%CHECKFLAG(TASK_REGION)==%NULL)%TASKERROR2%ENDIF%ONMINUS%CHPFTAB END ON%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TASK_REGION_DIR,	"%IF(%CHECKFLAG(TASK_REGION)==%NULL)%SETFLAG(TASK_REGION)%ELSE%TASKERROR0%ENDIF%ONINIT%CHPFTAB TASK_REGION%NL",
-'s',0,BIFNODE)	
-DEFNODECODE(DVM_END_TASK_REGION_DIR,	   "%IF(%CHECKFLAG(TASK_REGION)==%NULL)%TASKERROR4%ELSE%UNSETFLAG(TASK_REGION)%ENDIF%ONERROR%CHPFTAB END TASK_REGION%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_POINTER_DIR, 	  "%CHECK_DVMBIT%PTR_ARRAY%CMNT%PUTTAB%LL3 ,POINTER ,DIMENSION (%LL2) :: %DESCRIPTOR%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(REDUCTION_OP, 	  "%DELETE_COMMA,%SETFLAG(REDUCTION) REDUCTION (%LL1)%UNSETFLAG(REDUCTION)%DELETE_SYMBOL",
-'e',0,LLNODE)
-
-
-
-
-
-
-
-
-
-
-
-/*****************variant tags for symbol table entries********************/
-
-DEFNODECODE(BIF_PARM_DECL,      "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(CONST_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(ENUM_NAME,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(FIELD_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(VARIABLE_NAME,      "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(TYPE_NAME,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(PROGRAM_NAME,       "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(PROCEDURE_NAME,     "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(PROCESS_NAME,       "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(VAR_FIELD,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(LABEL_VAR,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(FUNCTION_NAME,      "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(MEMBER_FUNC,        "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(CLASS_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(UNION_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(STRUCT_NAME,        "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(LABEL_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-
-/*****************variant tags for type nodes********************/
-
-/***** List of commands for TYPE NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %BASETYPE   : Base Type Name Identifier */
-       /* %NAMEID     : Name Identifier */
-       /* %TABNAME    : Self Name from Table */
-       /* %RANGES     : Ranges */
-       /* %RANGLL1    : Low Level Node 1 of Ranges */
-/*******************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for TYPE NODE *****/
-       /* %STRCST     : String Constant in '' */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %INIMPLI    : In_Impli_Statement (integer / boolean flag) */
-/******************************************************************************************/
-
-/* CODES AYANT DISPARU :
- T_SEQUENCE,             T_EVENT,                 T_GATE,
-*/
-
-DEFNODECODE(DEFAULT,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_INT,              "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_FLOAT,            "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_DOUBLE,           "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_CHAR,             "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_BOOL,             "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_STRING,           "%TABNAME%SETFLAG(STYPE)%SETFLAG(TSRIN)%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF%UNSETFLAG(TSRIN)%UNSETFLAG(STYPE) ",
-'t',0,TYPENODE)
-DEFNODECODE(T_COMPLEX,          "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_DCOMPLEX,         "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-
-
-
-DEFNODECODE(T_ENUM,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_SUBRANGE,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_LIST,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_ARRAY,            "%BASETYPE %RANGES",
-'t',0,TYPENODE)
-DEFNODECODE(T_RECORD,           "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_ENUM_FIELD,       "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_UNKNOWN,          "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_VOID,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_DESCRIPT,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_FUNCTION,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_POINTER,          "%BASETYPE",
-'t',0,TYPENODE)
-DEFNODECODE(T_UNION,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_STRUCT,           "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_CLASS,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_DERIVED_CLASS,    "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_DERIVED_TYPE,     "type (%NAMEID)",
-'t',0,TYPENODE)
-
-
-DEFNODECODE(LOCAL,              "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(INPUT,              "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(OUTPUT,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(IO,                 "%ERROR",
-'t',0,TYPENODE)
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/include/unparse1.hpf b/projects/dvm_svn/fdvm/trunk/include/unparse1.hpf
deleted file mode 100644
index e0a26d7..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/unparse1.hpf
+++ /dev/null
@@ -1,1097 +0,0 @@
-/*********************************************************************/
-
-/*****************************************************************************/
-/*****************************************************************************/
-/*****                                                                   *****/
-/*****    UNPARSE.DEF:   Gregory HOGDAL / Eric MARCHAND    July 1992     *****/
-/*****                   Bodin Francois August 1992                      *****/
-/*****                                                                   *****/
-/*****************************************************************************/
-/*****************************************************************************/
-
-/* 
-   The following types exist: BIFNODE, LLNODE, SYMBNODE and TYPENODE
-
-   Any erroneous construct is parsed into a node of this type.
-   This type of node is accepted without complaint in all contexts
-   by later parsing activities, to avoid multiple error messages
-   for one error.
-   No fields in these nodes are used except the NODE_CODE.  
-*/
-
-/* exemple 
-DEFNODECODE (ERROR_MARK, "error_mark", "x", 0, LLNODE)
-*/
-
-/***** List of commands for BIF NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %CMNT	      : the comment attached to a bif node */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %SYMBID     : Symbol identifier */
-       /* %LL1        : Low Level Node 1 */
-       /* %LL2        : Low Level Node 2 */
-       /* %LL3        : Low Level Node 3 */
-       /* %L2L2       : Low Level Node 2 of Low Level Node 2 */
-       /* %BLOB1      : All Blob 1 */
-       /* %BLOB2      : All Blob 2 */
-       /* %STATENO    : Statement number */
-       /* %L1SYMBID   : pbf->entry.Template.ll_ptr1->entry.Template.symbol->ident; */
-       /* %INWRITEON  : In_Write_Statement Flag ON */
-       /* %INWRITEOFF : In_Write_Statement Flag OFF */
-       /* %INPARAMON  : In_Param_Statement Flag ON */
-       /* %INPARAMOFF : In_Param_Statement Flag OFF */
-       /* %INIMPLION  : In_Impli_Statement Flag ON */
-       /* %INIMPLIOFF : In_Impli_Statement Flag OFF */
-       /* SYMBTYPE    : Type of Symbol */
-       /* %VARLIST    : list of variables / parameters */
-/******************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for BIF NODE *****/
-       /* %RECURSBIT  : int constant RECURSIVE_BIT (integer) */
-       /* %EXPR_LIST  : int constant EXPR_LIST code for Low Level Node (integer) */
-       /* %SPEC_PAIR  : int constant SPEC_PAIR code for Low Level Node (integer) */
-       /* %IOACCESS   : int constant IOACCESS code for Low Level Node (integer) */
-       /* %SATTR      : Symbol Attribut (integer) */
-       /* %STRCST     : String Constant in '' */
-       /* %SYMBID     : Symbol Identifier (string) */
-       /* %SYMBOL     : Symbol node (integer) */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %LL1        : Low Level Node 1 (integer) */
-       /* %LL2        : Low Level Node 2 (integer) */
-       /* %LL3        : Low Level Node 3 (integer) */
-       /* %LABUSE     : Label ptr (do end) (integer) */
-       /* %L1CODE     : Code (variant) of Low Level Node 1 (integer) */
-       /* %L2CODE     : Code (variant) of Low Level Node 2 (integer) */
-       /* %L1L2L1CODE : Code (variant) of Low Level Node 1 of Low Level Node 2 of Low Level Node 1 (integer) */
-	/* %L1L2*L1CODE : Code (variant) of Low Level Node 1 of (Low Level Node 2)* of Low Level Node 1 (integer) follow L2*/
-       /* %L2L1STR    : String (string_val) of Low Level Node 1 of Low Level Node 2 (string) */
-/*****************************************************************************************/
-
-/*
-DEFNODECODE(GLOBAL,             "%CMNT%SETFLAG(QUOTE)%INCTAB%BLOB1%DECTAB%UNSETFLAG(QUOTE)",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(GLOBAL,             "%CMNT%SETFLAG(QUOTE)%BLOB1%UNSETFLAG(QUOTE)",
-'s',0,BIFNODE)
-
-DEFNODECODE(PROG_HEDR,          "%RESETID%CMNT%PUTTABprogram %IF(%SYMBID != %STRCST'_MAIN')%SYMBID%ENDIF%NL%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(PROC_HEDR,          "%RESETID%CMNT%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIFsubroutine %SYMBID (%VARLIST)%NL%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(PROS_HEDR,          "%CMNT%PUTTABprocess %SYMBID (%VARLIST)%NL%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(BASIC_BLOCK,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PROCESSES_STAT,     "%CMNT%PUTTABprocesses%NL%INCTAB%BLOB1",
-'s',0,BIFNODE)
-DEFNODECODE(INPORT_DECL,        "%CMNT%PUTTABinport (%LL2) %LL1%NL",
-'s',2,BIFNODE)
-DEFNODECODE(OUTPORT_DECL,       "%CMNT%PUTTABoutport (%LL2) %LL1%NL",
-'s',2,BIFNODE)
-DEFNODECODE(CHANNEL_STAT,       "%CMNT%PUTTABchannel(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(MERGER_STAT,         "%CMNT%PUTTABmerger(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(MOVE_PORT,          "%CMNT%PUTTABmoveport(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(SEND_STAT,          "%CMNT%PUTTABsend%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT) %IF ( %LL2 != %NULL )%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(RECEIVE_STAT,       "%CMNT%PUTTABreceive%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT) %IF ( %LL2 != %NULL )%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(ENDCHANNEL_STAT,    "%CMNT%PUTTABendchannel%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(PROBE_STAT,          "%CMNT%PUTTABprobe%SETFLAG(PORT)(%LL1)%UNSETFLAG(PORT)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(INTENT_STMT,        "%CMNT%PUTTAB%LL2 %LL1%NL",
-'s',2,BIFNODE)
-
-/* 107 is value for FOR_NODE 
-DEFNODECODE(CONTROL_END,        "%CMNT%IF ( %VALINT107  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF%IF ( %VALINT102  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%NL%ENDIF%IF ( %VALINT101  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%ENDIF%IF ( %VALINT130  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%NL%NL%ENDIF%IF ( %VALINT124  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF",
-'s',0,BIFNODE) */
-
-DEFNODECODE(CONTROL_END,        "%CMNT%IF ( %VALINT107  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF%IF ( %VALINT102  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABend%RESETID%NL%NL%ENDIF%IF ( %VALINT101  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%RESETID%NL%NL%ENDIF%IF ( %VALINT130  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABend%RESETID%NL%NL%ENDIF%IF ( %VALINT124  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF%IF ( %VALINT109  == %BIFCP)%DECTAB%PUTTABenddo%INCTAB%NL%ENDIF%IF ( %VALINT285  == %BIFCP)%DECTAB%PUTTABendprocessdo%INCTAB%NL%ENDIF%IF ( %VALINT279  == %BIFCP)%IF(%LABEL != %NULL)%LABEL%ENDIF%DECTAB%PUTTABend%RESETID%NL%NL%ENDIF",
-  's',0,BIFNODE)
-DEFNODECODE(PROCESSES_END,      "%CMNT%DECTAB%PUTTABendprocesses%NL",
-  's',0,BIFNODE)
-DEFNODECODE(IF_NODE,            "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABif (%LL1) then%NL%INCTAB%BLOB1%DECTAB %IF (%BLOB2 != %NULL) %IF (%ELSIFBLOB2 == %NULL)%PUTTABelse%NL%ELSE%PUTTABelse if%ENDIF%INCTAB%BLOB2%DECTAB%LABELENDIF%PUTTABendif%NL%ELSE%LABELENDIF%PUTTABendif%NL%ENDIF",
-'s',0,BIFNODE)
-DEFNODECODE(ARITHIF_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABif (%LL1) %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(LOGIF_NODE,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABif (%LL1) %SETFLAG(NO_NL)%BLOB1%UNSETFLAG(NO_NL) %NL",
-'s',0,BIFNODE)
-DEFNODECODE(FOR_NODE,           "%IF(%CHECKFLAG(INDEPENDENT_ALREADY)==%NULL)%CHECK_INDEPENDENT_DO%ELSE%UNSETFLAG(INDEPENDENT_ALREADY)%ENDIF%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)do %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%BLOB1%DECTAB", 
-'s',0,BIFNODE)                                                                                      /* previously : for %SYMBID = %LL1 %NL %INCTAB%BLOB1%DECTAB enddo%NL",*/
-DEFNODECODE(LOOP_NODE,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PROCESS_DO_STAT,    "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)processdo %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%BLOB1%DECTAB", 
-'s',2,BIFNODE)
-DEFNODECODE(FORALL_NODE,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(WHILE_NODE,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIFdo %IF (%LABUSE != %NULL)%STATENO %ENDIFwhile (%LL1)%NL%INCTAB%BLOB1%DECTAB",
-  's',0,BIFNODE)
-
-DEFNODECODE(CDOALL_NODE,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%IF (%LL3 != %NULL)%LL3:%ENDIF%INIMPLIOFF%INWRITEOFF%SETFLAG(LOOP)cdoall %IF (%LABUSE != %NULL)%STATENO%ENDIF %SYMBID = %LL1%IF (%LL2 != %NULL),%LL2%ENDIF%INCTAB%NL%UNSETFLAG(LOOP)%BLOB1%DECTAB",
-'s',0,BIFNODE) 
-
-DEFNODECODE(SDOALL_NODE,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(DOACROSS_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CDOACROSS_NODE,     "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(EXIT_NODE,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(GOTO_NODE,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABgoto %LL3%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ASSGOTO_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABgoto %SYMBID %IF (%LL1 != %NULL)(%LL1)%ENDIF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(COMGOTO_NODE,       "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABgoto (%LL1), %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PAUSE_NODE,         "%CMNT%PUTTABPAUSE%NL",
-'s',0,BIFNODE)
-DEFNODECODE(STOP_NODE,          "%ERROR",
-'s',0,BIFNODE)
-
-DEFNODECODE(ASSIGN_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%CHECK_ALLOCATE%LL1 = %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(M_ASSIGN_STAT,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(PROC_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcall %SYMBID(%LL1)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PROS_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprocess call %SYMBID(%LL1)%NL",
-'s',1,BIFNODE)
-DEFNODECODE(PROS_STAT_LCTN,     "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprocess call %SYMBID(%LL1) location%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(PROS_STAT_SUBM,     "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprocess call %SYMBID(%LL1) submachine%LL2%NL",
-'s',2,BIFNODE)
-DEFNODECODE(ASSLAB_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABassign %LL1 to %SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(SUM_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MULT_ACC,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MAX_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(MIN_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CAT_ACC,            "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(OR_ACC,             "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(AND_ACC,            "%ERROR",
-'s',0,BIFNODE)
-
-/*DEFNODECODE(READ_STAT,          "%CMNTread %IF (%L2CODE == %EXPR_LIST)(%LL2) %ELSE%IF (%L2CODE == %SPEC_PAIR)%IF (%L2L1STR == %STRCST 'fmt')(%LL2) %ELSE%L2L2%IF (%LL1 != %NULL), %ENDIF%ENDIF%ELSE%L2L2%IF (%LL1 != %NULL), %ENDIF%ENDIF%ENDIF%LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(READ_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIFread %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%INWRITEON%IF (%L1L2*L1CODE == %IOACCESS)(%ENDIF%LL1%IF (%L1L2*L1CODE == %IOACCESS))%ENDIF%INWRITEOFF%NL",
-'s',0,BIFNODE) */
-
-/* this is OK but WRITE NODE differ for what reason????????, Should be the same*/
-DEFNODECODE(READ_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABread %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE%IF (%LL2 != %NULL)(%LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%ENDIF%INWRITEON%LL1%INWRITEOFF%NL",
-'s',0,BIFNODE)
-
-/*
-DEFNODECODE(WRITE_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABwrite %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%INWRITEON%IF (%L1L2*L1CODE == %IOACCESS)(%ENDIF%LL1%IF (%L1L2*L1CODE == %IOACCESS))%ENDIF%INWRITEOFF%NL",
-'s',0,BIFNODE) */
-
-
-DEFNODECODE(WRITE_STAT,         "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABwrite %IF (%L2CODE == %EXPR_LIST)(%LL2)%ELSE%IF (%L2L1STR == %STRCST 'fmt')(unit = *, %LL2)%ELSE%IF (%LL2 != %NULL)(%LL2)%ELSE(fmt = *, %LL2)%ENDIF%ENDIF%ENDIF%INWRITEON%LL1%INWRITEOFF%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(PRINT_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABprint %IF (%LL2 != %NULL)%SETFLAG(PRINT)%LL2%UNSETFLAG(PRINT)%IF (%LL1!= %NULL),%ENDIF%ENDIF%INWRITEON%LL1%INWRITEOFF%NL",
-'s',0,BIFNODE)
-
-
-
-DEFNODECODE(OTHERIO_STAT,       "%CMNT%PUTTAB%LL1%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(BLOB,               "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(SIZES,              "%ERROR",
-'s',0,BIFNODE)
-
-
-/*
-DEFNODECODE(FUNC_HEDR,          "%CMNT%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIF%SYMBTYPE function %SYMBID (%VARLIST) %NL%BLOB1",
-*/
-/*DEFNODECODE(FUNC_HEDR,          "%CMNT%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIF%IF(%LL2 != %NULL)%LL2%ELSE%SYMBTYPE%ENDIF function %SYMBID (%VARLIST) %NL%BLOB1",
-'s',0,BIFNODE)*/
-
-/*DEFNODECODE(FUNC_HEDR,          "%RESETID%CHECK_FUNC%CMNT%IF (%CHECKFLAG(COMMENT) != %NULL)C%ENDIF%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIF%IF(%LL2 != %NULL)%LL2%ELSE%SYMBTYPE%ENDIF function %SYMBID (%VARLIST) %NL%BLOB1%IF (%CHECKFLAG(COMMENT) != %NULL)%UNSETFLAG(COMMENT)%ENDIF",
-'s',0,BIFNODE)*/
-DEFNODECODE(FUNC_HEDR,          "%RESETID%CHECK_FUNC%CMNT%IF (%CHECKFLAG(COMMENT) != %NULL)C%ENDIF%PUTTAB%IF(%SATTR == %RECURSBIT)recusive %ENDIF%IF(%LL2 != %NULL)%LL2 %ENDIFfunction %SYMBID (%VARLIST) %NL%BLOB1%IF (%CHECKFLAG(COMMENT) != %NULL)%UNSETFLAG(COMMENT)%ENDIF",
-'s',0,BIFNODE)
-DEFNODECODE(WHERE_NODE,         "%CMNT%PUTTABwhere (%LL1) %LL2 = %LL3%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ALLDO_NODE,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(IDENTIFY,           "%CMNT%PUTTABidentify %LL1 %LL2%NL",
-'s',0,BIFNODE)
-DEFNODECODE(FORMAT_STAT,        "%CMNT%IF (%LABEL != %NULL)%LABEL%ENDIF%PUTTAB%LL1%NL", 
-'s',0,BIFNODE)
-DEFNODECODE(STOP_STAT,          "%CMNT%PUTTABstop%IF (%LL1 != %NULL)%LL1%ENDIF%NL",
-'s',0,BIFNODE)
-DEFNODECODE(RETURN_STAT,        "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABreturn%NL",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(ELSEIF_NODE,        " (%LL1) then%NL%INCTAB%BLOB1%DECTAB %IF (%BLOB2 != %NULL) %IF (%ELSIFBLOB2 == %NULL)%PUTTABelse%NL%ELSE%PUTTABelse if%ENDIF%BLOB2%IF (%BLOB2 != %NULL)%NL%ENDIF%ELSE%NL%ENDIF",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(ELSEIF_NODE,        " (%LL1) then %NL%INCTAB%BLOB1%DECTAB%IF (%BLOB2 != %NULL) %IF (%ELSIFBLOB2 == %NULL)%PUTTABelse%NL%ELSE%PUTTABelse if%ENDIF%INCTAB%BLOB2%DECTAB%ENDIF",
-'s',0,BIFNODE)
-
-/*NO_OPnodes*/
-DEFNODECODE(COMMENT_STAT,       "%ERROR",
-'s',0,BIFNODE)
-
-/*DEFNODECODE(CONT_STAT,          "%CMNT%IF ( %VALINT107 == %BIFCP ) %FIND_DO%ENDIF%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABcontinue%NL",
-'s',0,BIFNODE)*/
-
-DEFNODECODE(CONT_STAT,          "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%CHANGE_TABNUMBER%PUTTABcontinue%NL",
-'s',0,BIFNODE)
-
-/*DEFNODECODE(VAR_DECL,           "%SAVE%CMNT%PUTTAB%SETFLAG(POINTER)%SETFLAG(VARLEN)%LL2%IF (%LL3 != %NULL),%LL3:: %LL1%IF(%CHECKFLAG(NOARRAY) != %NULL)%UNSETFLAG(NOARRAY)%ENDIF %ELSE%SETFLAG(VARDECL) %LL1%UNSETFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%IF (%CHECKFLAG(POINTER) != %NULL)%UNSETFLAG(POINTER)%ENDIF%IF (%CHECKFLAG(DECLARED) != %NULL)%UNSETFLAG(DECLARED)%LOAD%ENDIF%NL",
-'s',0,BIFNODE)*/
-DEFNODECODE(VAR_DECL,           "%SAVE%IF (%CHECKFLAG(POINTER) != %NULL)%UNSETFLAG(POINTER)%ENDIF%CMNT%PUTTAB%SETFLAG(VARLEN)%LL2%IF (%LL3 != %NULL),%LL3:: %DECLARATION%IF(%CHECKFLAG(NOARRAY) != %NULL)%UNSETFLAG(NOARRAY)%ENDIF %ELSE%SETFLAG(VARDECL) %DECLARATION%UNSETFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%NL%IF (%CHECKFLAG(POINTER) != %NULL)%UNSETFLAG(POINTER)%LOAD%ENDIF",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_VAR_DECL,           "%CHECK_DVMBIT%CHECK_SHADOW_OP%SETFLAG(PROC_REF)%IF (%CHECKFLAG(DYNAMIC) != %NULL)%UNSETFLAG(DYNAMIC)%ENDIF%CMNT%CHPFTAB%SETFLAG(VARLEN)%IF (%LL3 != %NULL) %LL3:: %LL1%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%IF (%CHECKFLAG(PROC_REF) != %NULL)%UNSETFLAG(PROC_REF)%ENDIF%IF (%CHECKFLAG(DYNAMIC) != %NULL)%UNSETFLAG(DYNAMIC)%ELSE%CHECK_COMBINED_DIR%ENDIF%NL",
-'s',0,BIFNODE)
-
-/*DEFNODECODE(VAR_DECL,           "%CMNT%PUTTAB%SETFLAG(VARLEN)%LL2%IF (%LL3 != %NULL),%LL3:: %LL1%IF(%CHECKFLAG(NOARRAY) != %NULL)%UNSETFLAG(NOARRAY)%ENDIF %ELSE%SETFLAG(VARDECL) %LL1%UNSETFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARLEN) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%NL",
-'s',0,BIFNODE)*/
-
-/*
-ALLOCATABLE_STMT,       ALLOCATE_STMT,           CONTAINS_STMT,           CYCLE_STMT,              DEALLOCATE_STMT,
- EXIT_STMT,              INTENT_STMT,             INTERFACE_STMT,          MODULE_PROC_STMT,        MODULE_STMT,
- NULLIFY_STMT,           OPTIONAL_STMT,           POINTER_STMT,            PRIVATE_STMT,            PUBLIC_STMT,
- SEQUENCE_STMT,          TARGET_STMT,             USE_STMT, 
-*/
-DEFNODECODE(PARAM_DECL,         "%CMNT%PUTTABparameter (%INPARAMON%SETFLAG(PARAM)%LL1%UNSETFLAG(PARAM)%INPARAMOFF)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(COMM_STAT,          "%CMNT%PUTTABcommon %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PROS_COMM,           "%CMNT%PUTTABprocess common %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(EQUI_STAT,          "%CMNT%PUTTABequivalence %LL1%NL",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(IMPL_DECL,          "%CMNT%PUTTABimplicit %IF (%LL1 != %NULL)%IF (%LL2 != %NULL)%ERROR'IMPLICIT Error'%ELSE%INIMPLION%LL1%INIMPLIOFF%ENDIF%ELSE%INIMPLION%LL2%INIMPLIOFF%ENDIF%NL",
-'s',0,BIFNODE)
-*/
-
-DEFNODECODE(IMPL_DECL,          "%CMNT%PUTTABimplicit %IF (%LL1 != %NULL)%SETFLAG(RANGEPRINT)%INIMPLION%LL1%INIMPLIOFF%UNSETFLAG(RANGEPRINT)%ELSEnone%ENDIF%NL",
-'s',0,BIFNODE)
-
-
-DEFNODECODE(DATA_DECL,          "%CMNT%PUTTAB%LL1%NL",
-'s',0,BIFNODE)
-/* DEFNODECODE(SAVE_DECL,          "%CMNT%PUTTABsave %IF (%LL1 != %NULL)%LL1%ELSEall%ENDIF%NL",
-'s',0,BIFNODE) */
-DEFNODECODE(SAVE_DECL,          "%CMNT%PUTTABsave %IF (%LL1 != %NULL)%LL1%ENDIF%NL",
-'s',0,BIFNODE) 
-DEFNODECODE(STMTFN_STAT,        "%CMNT%PUTTAB%LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DIM_STAT,           "%CMNT%PUTTABdimension %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(PROCESSORS_STAT,    "%CMNT%PUTTABprocessors %LL1%NL",
-'s',1,BIFNODE)
-DEFNODECODE(EXTERN_STAT,        "%CMNT%PUTTABexternal %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(INTRIN_STAT,        "%CMNT%PUTTABintrinsic %LL1%NL",
-'s',0,BIFNODE)
-
-DEFNODECODE(ENUM_DECL,          "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(CLASS_DECL,         "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(UNION_DECL,         "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(STRUCT_DECL,        "%CMNT%PUTTABtype %IF (%LL1 != %NULL),%LL1::%ENDIF%SYMBID%NL",
-'d',0,BIFNODE)
-DEFNODECODE(DERIVED_CLASS_DECL, "%ERROR",
-'d',0,BIFNODE)
-DEFNODECODE(EXPR_STMT_NODE,     "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(DO_WHILE_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(SWITCH_NODE,        "%CMNT%PUTTABcase (%LL1)%SYMBID%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CASE_NODE,          "%CMNT%IF (%LL3 != %NULL)%LL3:%ENDIF%PUTTABselect case (%LL1)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(DEFAULT_NODE,       "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(BREAK_NODE,         "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(CONTINUE_NODE,      "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(RETURN_NODE,        "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(ASM_NODE,           "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(LABEL_STAT,         "%ERROR",
-'s',0,BIFNODE)
-/*
-DEFNODECODE(PROC_COM,           "%ERROR",
-'s',0,BIFNODE)
-*/
-DEFNODECODE(ATTR_DECL,          "%ERROR",
-'s',0,BIFNODE)
-DEFNODECODE(NAMELIST_STAT,      "%CMNTnamelist %LL1%NL",
-'s',0,BIFNODE)
-DEFNODECODE(OPEN_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABopen (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(CLOSE_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABclose (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(ENDFILE_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABendfile (%LL2)%NL",
-'s',0,BIFNODE)
-DEFNODECODE(REWIND_STAT,      "%CMNT%IF(%LABEL != %NULL)%LABEL%ENDIF%PUTTABrewind (%LL2)%NL",
-'s',0,BIFNODE)
-/* DEFNODECODE(ENTRY_STAT,      "%CMNT%PUTTABentry %SYMBID(%VARLIST)%NL",
-'s',0,BIFNODE) */
- DEFNODECODE(ENTRY_STAT,      "%CMNT%PUTTABentry %SYMBID%IF(%LL1 != %NULL)(%LL1)%ENDIF%NL",
-'s',0,BIFNODE) 
-
-DEFNODECODE(BLOCK_DATA,      "%CMNT%PUTTABblock data %SYMBID%NL%BLOB1%NL%PUTTABend%NL",
-'s',0,BIFNODE)
-
-/*****************variant tags for low level nodes********************/
-
-/***** List of commands for LOW LEVEL NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %LL1        : Low Level Node 1 */
-       /* %LL2        : Low Level Node 2 */
-       /* %SYMBID     : Symbol identifier */
-       /* %TYPE       : Type */
-       /* %L1SYMBCST  : Constant Value of Low Level Node Symbol */
-       /* %INTVAL     : Integer Value */
-       /* %STATENO    : Statement Number */
-       /* %STRVAL     : String Value */
-       /* %BOOLVAL    : Boolean Value */
-       /* %CHARVAL    : Char Value */
-       /* %ORBPL1     : Openning Round Brackets on Precedence of Low Level Node 1 */
-       /* %CRBPL1     : Closing Round Brackets on Precedence of Low Level Node 1 */
-       /* %ORBPL2     : Openning Round Brackets on Precedence of Low Level Node 2 */
-       /* %CRBPL2     : Closing Round Brackets on Precedence of Low Level Node 2 */
-/***********************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for LOW LEVEL NODE *****/
-       /* %STRCST     : String Constant in '' */
-       /* %SYMBID     : Symbol Identifier (string) */
-       /* %SYMBOL     : Symbol node (integer) */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %LL1        : Low Level Node 1 (integer) */
-       /* %LL2        : Low Level Node 2 (integer) */
-       /* %LABUSE     : Label ptr (do end) (integer) */
-       /* %L1CODE     : Code (variant) of Low Level Node 1 (integer) */
-       /* %L2CODE     : Code (variant) of Low Level Node 2 (integer) */
-       /* %INWRITE    : In_Write_Statement (integer / boolean flag) */
-       /* %INPARAM    : In_Param_Statement (integer / boolean flag) */
-       /* %INIMPLI    : In_Impli_Statement (integer / boolean flag) */
-/************************************************************************************************/
-
-
-DEFNODECODE(LEN_OP,            "%SETFLAG(LENOP)%IF (%LL1 != %NULL)*%LL1 %IF (%CHECKFLAG(STYPE) != %NULL)%UNSETFLAG(VARLEN)%ENDIF%ENDIF%UNSETFLAG(LENOP) ",
-'e',0,LLNODE)
-DEFNODECODE(INT_VAL,            "%INTVAL",
-'c',0,LLNODE)
-DEFNODECODE(FLOAT_VAL,          "%STRVAL",
-'c',0,LLNODE)
-DEFNODECODE(DOUBLE_VAL,         "%STRVAL",
-'c',0,LLNODE)
-DEFNODECODE(BOOL_VAL,           "%BOOLVAL",
-'c',0,LLNODE)
-DEFNODECODE(CHAR_VAL,           "%IF (%INIMPLI == %NULL)\\%ENDIF%CHARVAL%IF (%INIMPLI == %NULL)\\%ENDIF",
-'c',0,LLNODE)
-DEFNODECODE(STRING_VAL,         "%IF (%CHECKFLAG(QUOTE) != %NULL)'%STRVAL'%ELSE\\%STRVAL\\%ENDIF",
-'c',0,LLNODE)
-DEFNODECODE(KEYWORD_VAL,        "%IF (%CHECKFLAG(LENOP) != %NULL)(%STRVAL)%ELSE%STRVAL%ENDIF",
-'c',0,LLNODE)
-DEFNODECODE(COMPLEX_VAL,        "(%LL1, %LL2)",
-'c',0,LLNODE)
-
-DEFNODECODE(CONST_REF,          "%SYMBID",
-'r',2,LLNODE)
-
-/*DEFNODECODE(VAR_REF,            "%IF (%CHECKFLAG(POINTER) != %NULL)%POINTER_NAME%ENDIF%SYMBID%IF (%CHECKFLAG(POINTER) != %NULL)%SETFLAG(DECLARED)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',0,LLNODE)*/
-
-/*DEFNODECODE(VAR_REF,            "%SYMBID%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',0,LLNODE)*/
-
-/*DEFNODECODE(ARRAY_REF,          "%CHECK_HEAP%IF (%CHECKFLAG(POINTER) != %NULL)%POINTER_NAME%ENDIF%SYMBID%IF (%CHECKFLAG(POINTER) != %NULL)%SETFLAG(DECLARED)%ENDIF%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%IF(%CHECKFLAG(NOARRAY) == %NULL)(%LL1)%ENDIF%POPFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',1,LLNODE)
-DEFNODECODE(PROCESSORS_REF,     "%IF (%CHECKFLAG(POINTER) != %NULL)%PUSHFLAG(DECLARED)%ENDIF%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%IF(%CHECKFLAG(NOARRAY) == %NULL)(%LL1)%ENDIF%POPFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%STRINGLEN%ENDIF",
-'r',1,LLNODE)*/
-
-DEFNODECODE(VAR_REF,            "%SYMBID%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',0,LLNODE)
-DEFNODECODE(ARRAY_REF,          "%CHECK_HEAP%SYMBID%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%IF(%CHECKFLAG(NOARRAY) == %NULL)%CHECK_PROC_REF(%LL1)%CHECK_PTR%ENDIF%POPFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%IF (%CHECKFLAG(VARLEN) != %NULL)%STRINGLEN%ENDIF%ENDIF",
-'r',1,LLNODE)
-DEFNODECODE(PROCESSORS_REF,     "%IF (%LL1 != %NULL)%PUSHFLAG(VARDECL)%IF(%CHECKFLAG(NOARRAY) == %NULL)(%LL1)%ENDIF%POPFLAG(VARDECL)%ENDIF%IF (%CHECKFLAG(VARDECL) != %NULL)%STRINGLEN%ENDIF",
-'r',1,LLNODE)
-
-DEFNODECODE(RECORD_REF,         "%LL1%%%LL2",
-'r',2,LLNODE)
-DEFNODECODE(ENUM_REF,           "%SYMBID",
-'r',2,LLNODE)
-DEFNODECODE(LABEL_REF,          "%STATENO",
-'r',0,LLNODE)
-DEFNODECODE(TYPE_OP,            "%TYPE",
-'e',1,LLNODE)
-DEFNODECODE(DIMENSION_OP,            "%SETFLAG(NOARRAY) dimension(%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(ALLOCATABLE_OP,            " allocatable",
-'e',1,LLNODE)
-DEFNODECODE(PARAMETER_OP,            " parameter",
-'e',1,LLNODE)
-DEFNODECODE(TARGET_OP,            " target",
-'e',1,LLNODE)
-DEFNODECODE(SAVE_OP,            " save",
-'e',1,LLNODE)
-DEFNODECODE(POINTER_OP,            " pointer",
-'e',1,LLNODE)
-DEFNODECODE(INTRINSIC_OP,            " intrinsic",
-'e',1,LLNODE)
-DEFNODECODE(OPTIONAL_OP,            " optional",
-'e',1,LLNODE)
-DEFNODECODE(EXTERNAL_OP,            " external",
-'e',1,LLNODE)
-DEFNODECODE(PRIVATE_OP,            " private",
-'e',1,LLNODE)
-DEFNODECODE(PUBLIC_OP,            " public",
-'e',1,LLNODE)
-DEFNODECODE(IN_OP,            "intent(in)",
-'e',1,LLNODE)
-DEFNODECODE(OUT_OP,            "intent(out)",
-'e',1,LLNODE)
-DEFNODECODE(INOUT_OP,            "intent(inout)",
-'e',1,LLNODE)
-
-DEFNODECODE(VAR_LIST,           "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(PORT_TYPE_OP,       "%TYPE%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(INPORT_TYPE_OP,       "inport ( %TYPE%SETFLAG(RECPORT)%LL1%IF (%LL2 != %NULL), %LL2%ENDIF%IF(%CHECKFLAG(RECPORT) != %NULL))%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(OUTPORT_TYPE_OP,       "outport( %TYPE%SETFLAG(RECPORT)%LL1%IF (%LL2 != %NULL), %LL2%ENDIF%IF(%CHECKFLAG(RECPORT) != %NULL))%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(INPORT_NAME,        "%IF(%CHECKFLAG(PORT) != %NULL)PORT=%ELSEIN=%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(OUTPORT_NAME,       "%IF(%CHECKFLAG(PORT) != %NULL)PORT=%ELSEOUT=%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(FROMPORT_NAME,      "FROM=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(TOPORT_NAME,        "TO=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(IOSTAT_STORE,       "IOSTAT=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(EMPTY_STORE,        "EMPTY=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(ERR_LABEL,          "ERR=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(END_LABEL,          "END=%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_IMPL_DO,       "(%LL1, %SYMBID=%LL2)", 
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_ELT,           "%IF (%SYMBOL == %NULL)%LL1%ELSE%SYMBID%LL1%ENDIF%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_SUBS,          "(%LL1)%IF (%LL2 != %NULL)%LL2%ENDIF",
-'e',2,LLNODE)
-
-DEFNODECODE(DATA_RANGE,         "(%IF (%LL1 != %NULL)%LL1%ENDIF:%IF (%LL2 != %NULL)%LL2%ENDIF)",
-'e',2,LLNODE)
-
-DEFNODECODE(ICON_EXPR,          "%LL1%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE)
-
-/* Probablement faux BODIN
-DEFNODECODE(EXPR_LIST,          "%LL1%IF (%INPARAM != %NULL) = %L1SYMBCST%ENDIF%IF (%LL2 != %NULL)%IF (%CHECKFLAG(COMMA) != %NULL)%LL2%ELSE,%LL2%ENDIF%ENDIF",
-'e',2,LLNODE) */
-
-DEFNODECODE(EXPR_LIST,          "%LL1%IF (%CHECKFLAG(PARAM) != %NULL) = %L1SYMBCST%ENDIF%IF (%LL2 != %NULL),%LL2%ENDIF",
-'e',2,LLNODE) 
- 
-DEFNODECODE(RANGE_LIST,         "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CASE_CHOICE,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(DEF_CHOICE,         "%LL1%IF (%LL2 != %NULL):%LL2",
-'e',2,LLNODE)
-DEFNODECODE(VARIANT_CHOICE,     "%ERROR",
-'e',2,LLNODE)
-/*
-DEFNODECODE(DDOT,               "%LL1%IF (%INWRITE != %NULL),%ELSE%IF (%INIMPLI != %NULL)-%ELSE%IF (%CHECKFLAG(LOOP) != %NULL),%ELSE:%ENDIF%ENDIF%ENDIF%LL2",
-*/
-DEFNODECODE(DDOT,               "%IF (%LL1==%NULL):%ELSE%LL1%IF (%INWRITE != %NULL),%ELSE%IF (%INIMPLI != %NULL)-%ELSE%IF (%CHECKFLAG(LOOP) != %NULL),%ELSE%IF (%LL2 != %NULL):%ENDIF%ENDIF%ENDIF%ENDIF%LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(RANGE_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(UPPER_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LOWER_OP,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EQ_OP,              "%ORBPL1%LL1%CRBPL1.eq.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(LT_OP,              "%ORBPL1%LL1%CRBPL1.lt.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(GT_OP,              "%ORBPL1%LL1%CRBPL1.gt.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(NOTEQL_OP,          "%ORBPL1%LL1%CRBPL1.ne.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(LTEQL_OP,           "%ORBPL1%LL1%CRBPL1.le.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(GTEQL_OP,           "%ORBPL1%LL1%CRBPL1.ge.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(ADD_OP,             "%ORBPL1%LL1%CRBPL1+%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(SUBT_OP,            "%ORBPL1%LL1%CRBPL1-%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(OR_OP,              "%ORBPL1%LL1%CRBPL1.or.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(MULT_OP,            "%ORBPL1%LL1%CRBPL1*%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(DIV_OP,             "%ORBPL1%LL1%CRBPL1/%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(MOD_OP,             "%ORBPL1%LL1%CRBPL1%%%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(AND_OP,             "%ORBPL1%LL1%CRBPL1.and.%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-
-DEFNODECODE(EXP_OP,             "%ORBPL1%LL1%CRBPL1** %ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(ARRAY_MULT,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CONCAT_OP,          "%ORBPL1%LL1%CRBPL1//%ORBPL2%LL2%CRBPL2",
-'e',2,LLNODE)
-DEFNODECODE(XOR_OP,             "%LL1.xor.%LL2",
-'e',2,LLNODE)
-DEFNODECODE(EQV_OP,             "%LL1.eqv.%LL2",
-'e',2,LLNODE)
-DEFNODECODE(NEQV_OP,            "%LL1.neqv.%LL2",
-'e',2,LLNODE)
-DEFNODECODE(MINUS_OP,           " (-(%LL1))",
-'e',1,LLNODE)
-DEFNODECODE(NOT_OP,             ".not.(%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(ASSGN_OP,           "=%LL1",
-'e',2,LLNODE)
-DEFNODECODE(DEREF_OP,           "%LL1",
-'e',1,LLNODE)
-DEFNODECODE(POINTST_OP,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MINUSMINUS_OP,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PLUSPLUS_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BITAND_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BITOR_OP,           "%ERROR",
-'e',2,LLNODE)
-
-
-
-DEFNODECODE(STAR_RANGE,         "*",
-'e',2,LLNODE)
-
-DEFNODECODE(PROC_CALL,          "%SYMBID (%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(PROS_CALL,          "%SYMBID (%LL1)",
-'e',1,LLNODE)
-DEFNODECODE(FUNC_CALL,          "%SYMBID (%LL1)",
-'e',1,LLNODE)
-
-DEFNODECODE(ACCESS_REF,         "%LL1%IF (%LL2 != %NULL) (%LL2)%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CONS,               "%LL1, %LL2",
-'e',2,LLNODE)
-DEFNODECODE(ACCESS,             "%LL1, FORALL = (%SYMBID = %LL2)",
-'e',2,LLNODE)
-DEFNODECODE(IOACCESS,           "%IF (%LL1 != %NULL)(%LL1, %ENDIF%SYMBID = %LL2%IF (%LL1 != %NULL))%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(CONTROL_LIST,       "%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(SEQ,                "%LL1%IF (%LL2 != %NULL)%IF (%INWRITE != %NULL),%ELSE:%ENDIF%LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(SPEC_PAIR,          "%IF (%CHECKFLAG(PRINT) != %NULL)%LL2%ELSE%LL1 = %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(COMM_LIST,          "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)                   
-DEFNODECODE(STMT_STR,           "%STRVAL",
-'e',2,LLNODE)
-DEFNODECODE(EQUI_LIST,          "(%LL1)%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-DEFNODECODE(IMPL_TYPE,          "%TYPE %IF (%LL1 != %NULL)(%LL1)",
-'e',2,LLNODE)
-DEFNODECODE(STMTFN_DECL,        "%SYMBID (%VARLIST) = %LL1",
-'e',2,LLNODE)
-DEFNODECODE(BIT_COMPLEMENT_OP,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXPR_IF,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXPR_IF_BODY,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_REF,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LSHIFT_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RSHIFT_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(UNARY_ADD_OP,       "(+(%LL1))",
-'e',2,LLNODE)
-DEFNODECODE(SIZE_OP,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(INTEGER_DIV_OP,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(SUB_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LE_OP,              "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(GE_OP,              "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(NE_OP,              "%ERROR",
-'e',2,LLNODE)
-
-DEFNODECODE(CLASSINIT_OP,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CAST_OP,            "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ADDRESS_OP,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(POINSTAT_OP,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(COPY_NODE,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(INIT_LIST,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(VECTOR_CONST,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_NUMBER,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ARITH_ASSGN_OP,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ARRAY_OP,           "%LL1 (%LL2)",
-'e',2,LLNODE)
-DEFNODECODE(NEW_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(DELETE_OP,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(NAMELIST_LIST,      "%IF (%SYMBOL != %NULL)/%SYMBID/%ENDIF%LL1%IF (%LL2 != %NULL), %LL2%ENDIF",
-'e',2,LLNODE)
-
-/* new tag for some expression */
-
-DEFNODECODE(CEIL_DIV_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MAX_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIF_SAVE_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(MIN_OP,             "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIF_ADDR_EXPR,      "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIF_NOP_EXPR,       "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIF_RTL_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUNC_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUNC_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOOR_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOOR_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CEIL_MOD_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ROUND_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ROUND_MOD_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RDIV_EXPR,          "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(EXACT_DIV_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(CONVERT_EXPR,       "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(CONST_DECL,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(ABS_EXPR,           "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_ANDIF_EXPR,   "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_AND_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_NOT_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_ORIF_EXPR,    "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PREINCREMENT_EXPR,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(PREDECREMENT_EXPR,  "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(COMPOUND_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FLOAT_EXPR,         "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(BIT_IOR_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_XOR_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(BIT_ANDTC_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(TRUTH_OR_EXPR,      "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_TRUNC_EXPR,     "%ERROR",
-'e',1,LLNODE)
-DEFNODECODE(RROTATE_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(LROTATE_EXPR,       "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RANGE_EXPR,         "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(POSTDECREMENT_EXPR, "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(REFERENCE_TYPE,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_FLOOR_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_ROUND_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FIX_CEIL_EXPR ,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(FUNCTION_DECL ,     "%ERROR",
-'d',2,LLNODE)
-DEFNODECODE(MODIFY_EXPR,        "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(REFERENCE_EXPR,     "%ERROR",
-'e',2,LLNODE)
-DEFNODECODE(RESULT_DECL,        "%ERROR",
-'d',2,LLNODE)
-DEFNODECODE(PARM_DECL,          "%ERROR",
-'d',2,LLNODE)
-
-/*****************variant tags for DVM nodes*****************************/
-
-DEFNODECODE(BLOCK_OP,            "%IF(%LL1!=%NULL)%IF(%SYMBOL==%NULL) BLOCK(%LL1) %ELSE BLOCK %ENDIF%ELSE BLOCK %ENDIF",
-'e',0,LLNODE)
-
-DEFNODECODE(NEW_VALUE_OP,            "%IF(%LL1!=%NULL) NEW(%LL1)%ELSE NEW%ENDIF",
-'e',0,LLNODE)
-
-DEFNODECODE(NEW_SPEC_OP,            "%NEWSPEC%DELETE_COMMA,%IF (%CHECKFLAG(INDEPENDENT) != %NULL) NEW(%LL1)%ENDIF",
-'e',0,LLNODE)
-
-
-DEFNODECODE(TEMPLATE_OP,            "TEMPLATE",
-'e',0,LLNODE)
-
-DEFNODECODE(PROCESSORS_OP,          "PROCESSORS",
-'e',0,LLNODE)
-
-DEFNODECODE(DYNAMIC_OP,             "%IF(%CHECKFLAG(DYNAMIC) !=%NULL )%BACK%ELSE%SETFLAG(DYNAMIC)DYNAMIC%ENDIF",
-'e',0,LLNODE)
-
-DEFNODECODE(DIMENSION_OP,           "DIMENSION (%LL1)",
-'e',0,LLNODE)
-
-DEFNODECODE(SHADOW_OP,              "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(SHADOW_COMP_OP,          "%DELETE_COMMA",
-'e',0,LLNODE)
-
-DEFNODECODE(ALIGN_OP,               "%CHECK_DYNAMICALIGN %IF(%LL1!=%NULL) (%LL1)%ENDIF%IF(%LL2!=%NULL) WITH %LL2%ENDIF",
-'e',0,LLNODE)
-
-DEFNODECODE(DISTRIBUTE_OP,              "%CHECK_DYNAMICDISTRIBUTE %IF(%LL1!=%NULL) (%LL1)%ENDIF%IF(%LL2!=%NULL) ONTO %LL2%ENDIF",
-'e',0,LLNODE)
-
-DEFNODECODE(DVM_NEW_VALUE_DIR,        "",
-'s',1,BIFNODE)
-
-DEFNODECODE(HPF_TEMPLATE_STAT,        "%CHECK_DVMBIT%CHPFTAB TEMPLATE %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_DYNAMIC_DIR,         "%CHECK_DVMBIT%CHECK_DAC_DIR%CHPFTAB DYNAMIC %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_INHERIT_DIR,         "%CHECK_REDISTRIBUTE_DIR%CHECK_DVMBIT%CHPFTAB INHERIT %LL1%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(HPF_PROCESSORS_STAT,     "%CHECK_DVMBIT%SETFLAG(PROC_REF)%CHPFTAB PROCESSORS %LL1%IF (%CHECKFLAG(PROC_REF) != %NULL)%UNSETFLAG(PROC_REF)%ENDIF%NL",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_SHADOW_DIR,          "",
-'s',2,BIFNODE)
-
-DEFNODECODE(DVM_INDIRECT_GROUP_DIR,  "",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_REMOTE_GROUP_DIR,    "",
-'s',1,BIFNODE)
-
-DEFNODECODE(DVM_REDUCTION_GROUP_DIR, "",
-'s',1,BIFNODE)
-
-/*DEFNODECODE(DVM_DISTRIBUTE_DIR,      "%CHPFTAB DISTRIBUTE %LL1 %IF(%LL2!=%NULL) (%LL2)%ENDIF %IF(%LL3!=%NULL) ONTO %LL3%ENDIF%NL",
-'s',3,BIFNODE)*/
-
-DEFNODECODE(DVM_DISTRIBUTE_DIR,    "%CHECK_DVMBIT%CHECK_FORMAT_NULL%CHECK_REDISTRIBUTE_DIR%CHPFTAB DISTRIBUTE %IF(%LL2!=%NULL) (%LL2)%ENDIF %IF(%LL3!=%NULL) ONTO %LL3 %ENDIF :: %LL1%NL",
-'s',3,BIFNODE)
-DEFNODECODE(DVM_REDISTRIBUTE_DIR,    "%CHPFTAB REDISTRIBUTE (%LL2)%IF(%LL3!=%NULL) ONTO %CHECK_REDISTRIBUTE_ON_MAP%ENDIF :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_ALIGN_DIR,    	     "%CHECK_DVMBIT%CHECK_FORMAT_NULL%CHECK_REALIGN_DIR%CHPFTAB ALIGN (%LL2) WITH %LL3 :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_REALIGN_DIR,         "%CHPFTAB REALIGN (%LL2) WITH %LL3 :: %LL1%NL",
-'s',3,BIFNODE)
-
-DEFNODECODE(DVM_PARALLEL_ON_DIR,     "%CHECK_ACROSS%CHECK_REDUCTION%INDEPENDENT_DO%SETFLAG(INDEPENDENT_ALREADY)%SETFLAG(INDEPENDENT)%CHPFTAB INDEPENDENT %IF (%LL2!=%NULL) ,%LL2%DELETE_COMMA%ENDIF%UNSETFLAG(INDEPENDENT)%NL",
-'s',3,BIFNODE)
-DEFNODECODE(DVM_PARALLEL_TASK_DIR,     "",
-'s',3,BIFNODE)
-DEFNODECODE(REMOTE_ACCESS_OP,        "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(INDIRECT_ACCESS_OP,      "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(ACROSS_OP,               "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(SHADOW_RENEW_OP,         "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(SHADOW_START_OP,         "%DELETE_COMMA",
-'e',0,LLNODE)
-DEFNODECODE(SHADOW_WAIT_OP,          "%DELETE_COMMA",
-'e',0,LLNODE)
-
-DEFNODECODE(DVM_SHADOW_START_DIR,    "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_SHADOW_WAIT_DIR,     "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_SHADOW_GROUP_DIR,    "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_REDUCTION_START_DIR, "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_REDUCTION_WAIT_DIR,  "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_REDUCTION_GROUP_DIR, "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_REMOTE_ACCESS_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TASK_DIR,	     "%CHECK_DVMBIT",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_MAP_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_PREFETCH_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_RESET_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_DEBUG_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_ENDDEBUG_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_INTERVAL_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_ENDINTERVAL_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TRACEON_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TRACEOFF_DIR,   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_OWN_DIR,   	     "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_ON_DIR,   	"",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_END_ON_DIR,   	"",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_TASK_REGION_DIR,	"",
-'s',0,BIFNODE)	
-DEFNODECODE(DVM_END_TASK_REGION_DIR,	   "",
-'s',0,BIFNODE)
-DEFNODECODE(DVM_POINTER_DIR, 	  "%HPF1_POINTER",
-'s',0,BIFNODE)
-
-DEFNODECODE(REDUCTION_OP, 	  "%DELETE_COMMA",
-'e',0,LLNODE)
-
-
-
-
-
-
-
-
-
-
-
-/*****************variant tags for symbol table entries********************/
-
-DEFNODECODE(BIF_PARM_DECL,      "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(CONST_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(ENUM_NAME,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(FIELD_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(VARIABLE_NAME,      "%SYMBID",
-'r',0,SYMBNODE)
-DEFNODECODE(TYPE_NAME,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(PROGRAM_NAME,       "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(PROCEDURE_NAME,     "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(PROCESS_NAME,       "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(VAR_FIELD,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(LABEL_VAR,          "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(FUNCTION_NAME,      "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(MEMBER_FUNC,        "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(CLASS_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(UNION_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(STRUCT_NAME,        "%ERROR",
-'r',0,SYMBNODE)
-DEFNODECODE(LABEL_NAME,         "%ERROR",
-'r',0,SYMBNODE)
-
-/*****************variant tags for type nodes********************/
-
-/***** List of commands for TYPE NODES *****/
-       /* %ERROR      : Error ; syntax : %ERROR'message' */
-       /* %NL         : NewLine */
-       /* %%          : '%' (Percent Sign) */
-       /* %TAB        : Tab */
-       /* %IF         : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-       /* %ELSE       : Else */
-       /* %ENDIF      : End of If */
-       /* %BASETYPE   : Base Type Name Identifier */
-       /* %NAMEID     : Name Identifier */
-       /* %TABNAME    : Self Name from Table */
-       /* %RANGES     : Ranges */
-       /* %RANGLL1    : Low Level Node 1 of Ranges */
-/*******************************************/
-
-/***** List of commands for evaluation in IF THEN ELSE ENDIF statements for TYPE NODE *****/
-       /* %STRCST     : String Constant in '' */
-       /* ==          : Equal (operation) */
-       /* !=          : Different (operation) */
-       /* %NULL       : 0, Integer Constant (or false boolean) */
-       /* %INIMPLI    : In_Impli_Statement (integer / boolean flag) */
-/******************************************************************************************/
-
-/* CODES AYANT DISPARU :
- T_SEQUENCE,             T_EVENT,                 T_GATE,
-*/
-
-DEFNODECODE(DEFAULT,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_INT,              "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_FLOAT,            "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_DOUBLE,           "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_CHAR,             "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_BOOL,             "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_STRING,           "%TABNAME%SETFLAG(STYPE)%SETFLAG(TSRIN)%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF%UNSETFLAG(TSRIN)%UNSETFLAG(STYPE) ",
-'t',0,TYPENODE)
-DEFNODECODE(T_COMPLEX,          "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-DEFNODECODE(T_DCOMPLEX,         "%TABNAME%IF (%INIMPLI == %NULL)%RANGES%ELSE%IF(%CHECKFLAG(RANGEPRINT) !=%NULL)%RANGES%ENDIF%ENDIF ",
-'t',0,TYPENODE)
-
-
-
-DEFNODECODE(T_ENUM,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_SUBRANGE,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_LIST,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_ARRAY,            "%BASETYPE %RANGES",
-'t',0,TYPENODE)
-DEFNODECODE(T_RECORD,           "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_ENUM_FIELD,       "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_UNKNOWN,          "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_VOID,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_DESCRIPT,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_FUNCTION,         "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_POINTER,          "%BASETYPE",
-'t',0,TYPENODE)
-DEFNODECODE(T_UNION,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_STRUCT,           "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_CLASS,            "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_DERIVED_CLASS,    "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(T_DERIVED_TYPE,     "type (%NAMEID)",
-'t',0,TYPENODE)
-
-
-DEFNODECODE(LOCAL,              "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(INPUT,              "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(OUTPUT,             "%ERROR",
-'t',0,TYPENODE)
-DEFNODECODE(IO,                 "%ERROR",
-'t',0,TYPENODE)
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/include/user.h b/projects/dvm_svn/fdvm/trunk/include/user.h
deleted file mode 100644
index 88b549b..0000000
--- a/projects/dvm_svn/fdvm/trunk/include/user.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#ifndef SAGEXXUSER_H 
-#define SAGEXXUSER_H 1
-
-#define CPLUS_
-#include "macro.h"
-#undef CPLUS_
-
-// For C/C++ parser internals
-#include "vpc.h"
-
-// For the fortran parser internals
-#include "fdvm.h"
-
-// All the "C" functions from the Rennes toolbox
-#include "extcxx_low.h"
-
-class SgProject;
-class SgFile;
-class SgStatement;
-class SgExpression;
-class SgLabel;
-class SgSymbol;
-class SgType;
-class SgUnaryExp;
-class SgClassSymb;
-class SgVarDeclStmt;
-class SgVarRefExp; /* ajm: I think they should all be here! @$!@ */
-
-// All the externs (from libSage++.C) used in libSage++.h
-#include "sage++extern.h"
-
-#define SORRY Message("Sorry, not implemented yet",0)
-
-// Prototype definitions  for all the functions in libSage++.C
-#include "sage++proto.h"
-
-
-// dont delete needed in libSage++.h
-#define USER
-#include "libSage++.h"
-
-#endif /* ndef SAGEXXUSER_H */
diff --git a/projects/dvm_svn/fdvm/trunk/makefile.uni b/projects/dvm_svn/fdvm/trunk/makefile.uni
deleted file mode 100644
index 2b22284..0000000
--- a/projects/dvm_svn/fdvm/trunk/makefile.uni
+++ /dev/null
@@ -1,46 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-# dvm/fdvm/makefile.uni
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=Sage parser fdvm InlineExpansion
-
-Sage:
-	cd Sage; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-parser: Sage
-	cd parser; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-fdvm: Sage
-	cd fdvm; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-inliner: Sage
-	cd InlineExpansion; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-
-all: Sage parser fdvm inliner
-	@echo "****** DONE MAKING SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-
-clean:
-	@echo "****** RECURSIVELY CLEAN SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-	cd Sage; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	cd parser; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	cd fdvm;$(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	cd InlineExpansion;$(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	rm -fr lib
-	@echo "****** DONE CLEAN SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-
-cleanall:
-	@echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-	cd Sage; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	cd parser; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	cd fdvm; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	cd InlineExpansion; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	rm -fr lib
-	@echo "****** DONE CLEANALL SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-
-.PHONY: all clean cleanall Sage parser fdvm inliner
diff --git a/projects/dvm_svn/fdvm/trunk/makefile.win b/projects/dvm_svn/fdvm/trunk/makefile.win
deleted file mode 100644
index 4e3a1a0..0000000
--- a/projects/dvm_svn/fdvm/trunk/makefile.win
+++ /dev/null
@@ -1,69 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-
-# dvm/fdvm/makefile.win
-
-# Valentin Emelianov  (4/01/99)
-
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=Sage parser fdvm InlineExpansion
-
-all: 
-	@echo "****** RECURSIVELY MAKING SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-	@cd Sage
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-	@cd ..
-	@cd parser
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-	@cd .. 
-	@cd fdvm
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-	@cd .. 
-	@cd InlineExpansion
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-	@cd .. 
-	@echo "****** DONE MAKING SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-
-clean:
-	@echo "****** RECURSIVELY CLEAN SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-	@cd Sage
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	@cd ..
-	@cd parser
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	@cd .. 
-	@cd fdvm
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	@cd .. 
-	@cd InlineExpansion
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	@cd .. 
-	@del /q .\obj\*.* > NUL
-	@del /q .\lib\*.* > NUL
-	@echo "****** DONE CLEAN SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-
-cleanall:
-	@echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
-	@cd Sage
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall 
-	@cd ..
-	@cd parser
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	@cd ..
-	@cd fdvm
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	@cd .. 
-	@cd InlineExpansion
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	@cd .. 
-	@del /q .\lib\*.* > NUL
-	@del /q .\obj\*.* > NUL
-	@del /q .\bin\*.* > NUL
-	@echo "****** DONE CLEANALL SUBDIRECTORIES dvm/fdvm/: $(SUBDIR) ******"
diff --git a/projects/dvm_svn/fdvm/trunk/parser/CMakeLists.txt b/projects/dvm_svn/fdvm/trunk/parser/CMakeLists.txt
deleted file mode 100644
index 4f25656..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-set(PARSE_SOURCES cftn.c errors.c gram1.tab.c hash.c init.c lexfdvm.c lists.c
-  low_hpf.c misc.c stat.c sym.c types.c unparse_hpf.c)
-
-set_source_files_properties(gram1.tab.c PROPERTIES COMPILE_DEFINITIONS YYDEBUG)
-
-if(MSVC_IDE)
-  file(GLOB_RECURSE PARSE_HEADERS RELATIVE
-    ${CMAKE_CURRENT_SOURCE_DIR} *.h)
-  set(PARSE_HEADERS ${PARSE_HEADERS} head tag tokens)
-  source_group("Header Files" FILES ${PARSE_HEADERS})
-  foreach(DIR ${DVM_FORTRAN_INCLUDE_DIRS})
-    file(GLOB_RECURSE FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${DIR}/*.h")
-    set(PARSE_HEADERS ${PARSE_HEADERS} ${FILES})
-  endforeach()
-  file(GLOB_RECURSE PARSE_GRAMMERS RELATIVE
-    ${CMAKE_CURRENT_SOURCE_DIR} *.gram *.y)
-  source_group("Grammer Files" FILES ${PARSE_GRAMMERS})
-endif()
-
-add_executable(parse ${PARSE_SOURCES} ${PARSE_HEADERS} ${PARSE_GRAMMERS})
-
-add_dependencies(parse db sage sage++)
-target_link_libraries(parse db sage sage++)
-target_compile_definitions(parse PRIVATE SYS5)
-if (WIN32)
-  target_compile_definitions(parse PRIVATE WIN)
-endif()
-target_include_directories(parse PRIVATE "${DVM_FORTRAN_INCLUDE_DIRS}")
-set_target_properties(parse PROPERTIES FOLDER "${DVM_TOOL_FOLDER}"
-  RUNTIME_OUTPUT_DIRECTORY ${DVM_BIN_DIR}
-  COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>
-  PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>
-)
diff --git a/projects/dvm_svn/fdvm/trunk/parser/Makefile b/projects/dvm_svn/fdvm/trunk/parser/Makefile
deleted file mode 100644
index 0c14422..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/Makefile
+++ /dev/null
@@ -1,196 +0,0 @@
-#echo#######################################################################
-# Makefile for   Fortran DVM front-end
-#
-#	HDR	traditional header files.
-#	HDRg	header files generated by programs.
-#	SRC	traditional  source files.
-#	SRCg	source files generated by programs.
-#	OBJS	object files required to load the program.
-#
-
-#PATH=$PATH/usr/freeware/lib:
-SHELL = /bin/sh
-CONFIG_ARCH=iris4d
-#!!
-SAGEROOT=../Sage
-LIBDIR = ../libsage
-#LIBDIR = $(SAGEROOT)/lib/$(CONFIG_ARCH)
-#LIBDIR = /usr/people/podd/oldsrc
-LIBINCLUDE = $(SAGEROOT)/lib/include
-HINCLUDE =$(SAGEROOT)/h
-DVMINCLUDE = ../include
-#INSTALLDEST = $(SAGEROOT)/bin/$(CONFIG_ARCH)
-INSTALLDEST = ../bin
-INSTALL = /bin/cp
-#!!
-
-CC = gcc
-#USE_CC#CC=cc#ENDIF#
-
-CXX = /usr/WorkShop/usr/DCC
-
-LINKER = $(CC)
-
-
-
-LINTFLAGS = -azhx -I$(HINCLUDE)
-
-#C90#EXTRAOBJS=../lib/c90/alloca-c90.o#ENDIF#
-#MIPS_CC#CEXTRA = -Wf,-XNg800#ENDIF#
-#HP-ALLOCA#LDLIBS = -lPW#ENDIF#
-#HP_CFLAGS#CEXTRA = -Aa#ENDIF#
-
-CFLAGS = -g -Wall -I$(DVMINCLUDE) -I$(HINCLUDE) -I$(LIBINCLUDE) $(CFEXTRA) $(CEXTRA) -DSYS5
-
-LIBS	= $(LIBDIR)/libdb.a
-#HP_CFLAGS#LIBS	= $(LIBDIR)/libdb.sl#ENDIF#
-
-# Comment the following line out if you don't use bison
-#YACC	= /usr/local/bin/bison
-YACC	= bison
-#YACC = yacc
-# Tells bison to be yacc-compatible and generates y.tab.h and y.tab.c
-YFLAGS	= -vd
-#!!
-EXECUTABLES =	parse
-
-# Directory in which include file can be found
-TOOLBOX_HDR     =  $(LIBINCLUDE)/macro.h $(LIBINCLUDE)/bif_node.def  $(LIBINCLUDE)/type.def  $(LIBINCLUDE)/symb.def 
-FDVM		=  $(DVMINCLUDE)/dvm_tag.h
-
-
-HDR	= $(DVMINCLUDE)/inc.h $(HINCLUDE)/defs.h $(DVMINCLUDE)/fdvm.h $(HINCLUDE)/bif.h  \
-          $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h  \
-	  $(DVMINCLUDE)/extern.h $(HINCLUDE)/sets.h tag tokens
-
-HDRg	= tag.h tokdefs.h
-
-HDRS	= $(HDR) $(HDRg)
-# !!
-SRC	= cftn.c init.c hash.c lexfdvm.c lists.c\
-	  misc.c stat.c  errors.c types.c sym.c\
-	  low_hpf.c unparse_hpf.c
-#!!
-SRCg	= gram.tab.c
-
-SRCS	= $(SRC) $(SRCg)
-#!! 
-OBJS	= cftn.o errors.o hash.o init.o lexfdvm.o lists.o\
-	  misc.o stat.o types.o gram1.tab.o sym.o\
-	  low_hpf.o unparse_hpf.o
-
-all:	$(EXECUTABLES)
-
-install: $(INSTALLDEST)/parse
- 
-$(INSTALLDEST)/parse: parse
-		@echo Installing $? in $(INSTALLDEST)
-		if [ -d $(INSTALLDEST) ] ; then true; \
-		else mkdir $(INSTALLDEST) ;fi
-		@$(INSTALL) $? $(INSTALLDEST)
-
-
-$(EXECUTABLES) : $(OBJS) $(LIBS)
-	@echo -n "Loading $(EXECUTABLES) ... "
-	$(LINKER) $(LDFLAGS) $(OBJS) $(EXTRAOBJS) $(LIBS) \
-		-o $(EXECUTABLES) $(LDLIBS)
-	@echo "done"
-# !!
-gram1.tab.o:	gram1.tab.c
-	$(CC) $(CFLAGS) -DYYDEBUG -c gram1.tab.c
-#!!
-gram1.tab.c:	tokdefs.h ftn.gram fdvm.gram fomp.gram facc.gram fspf.gram
-	( sed < tokdefs.h "s/#define/%token/"; cat ftn.gram fdvm.gram fomp.gram facc.gram fspf.gram) > gram1.y
-	$(YACC) $(YFLAGS) gram1.y
-
-tokdefs.h: tokens
-	grep -n . <tokens | sed "s/\([^:]*\):\(.*\)/#define \2 \1/" >tokdefs.h
-
-tag.h:	head tag
-	( cat head; \
-	  sed < tag \
-	    '/#defin/s/\([^ ]*\) \([^ 	]*\)\(.*\)/  tag \[ \2 \] = \"\2\";/')\
-	  > tag.h
-
-lint:
-	lint $(LINTFLAGS) $(SRCS) $(SAGEROOT)/lib/llib-llibdb.ln
-
-clean:
-		@rm -f $(OBJS)
-		@rm -f $(EXECUTABLES)
-		@rm -f *.dep
-cleaninstall:
-		/bin/rm -f $(OBJS)
-		/bin/rm -f $(EXECUTABLES)
-		/bin/rm -f *.dep
-
-realclean:
-	@rm -f $(HDRg) gram1.tab.c
-
-ci:
-	ci -u -f $(SRC) $(HDR) ftn.gram
-
-tags:	$(HDRS) $(SRC) ftn.gram; @etags $(HDRS) $(SRC) ftn.gram
-
-update:	$(HDR) $(SRC) ftn.gram
-	@update $?
-	@touch update
-###
-cftn.o: $(HINCLUDE)/db.h $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/bif.h \
-	$(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/sets.h
-ftn.gram: $(DVMINCLUDE)/extern.h $(HINCLUDE)/defines.h $(HINCLUDE)/defs.h \
-        $(DVMINCLUDE)/fdvm.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h \
-	$(HINCLUDE)/sets.h
-commsym.o: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h \
-	$(HINCLUDE)/bif.h $(DVMINCLUDE)/extern.h $(HINCLUDE)/db.h $(HINCLUDE)/ll.h \
-	$(HINCLUDE)/sets.h
-errors.o: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/symb.h  $(DVMINCLUDE)/extern.h \
-	$(HINCLUDE)/db.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/sets.h
-exec.o: $(HINCLUDE)/defs.h $(HINCLUDE)/tag
-gram.o: $(HINCLUDE)/defs.h \
-	$(HINCLUDE)/tag $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h \
-	$(HINCLUDE)/sets.h  $(DVMINCLUDE)/extern.h $(HINCLUDE)/db.h $(HINCLUDE)/defines.h 
-hash.o: $(HINCLUDE)/defs.h $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h $(DVMINCLUDE)/extern.h \
-	$(HINCLUDE)/db.h $(HINCLUDE)/bif.h  $(HINCLUDE)/ll.h $(HINCLUDE)/sets.h $(HINCLUDE)/tag
-init.o:  $(DVMINCLUDE)/inc.h $(HINCLUDE)/defs.h $(HINCLUDE)/bif.h  $(HINCLUDE)/defines.h \
-	$(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/sets.h $(HINCLUDE)/db.h $(HINCLUDE)/tag
-# !!
-lexfdvm.o: $(DVMINCLUDE)/extern.h
-lists.o:$(HINCLUDE)/defs.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/bif.h
-misc.o: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/defines.h $(HINCLUDE)/db.h \
-	$(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/sets.h
-stat.o:	$(HINCLUDE)/defs.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h\
-        $(HINCLUDE)/sets.h $(HINCLUDE)/defines.h $(DVMINCLUDE)/extern.h
-sym.o:  $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h \
-	$(HINCLUDE)/bif.h $(DVMINCLUDE)/extern.h $(HINCLUDE)/db.h $(HINCLUDE)/ll.h \
-	$(HINCLUDE)/sets.h $(DVMINCLUDE)/fdvm.h
-types.o:$(HINCLUDE)/defs.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h
-
-low_hpf.o: low_hpf.c $(FDVM) $(TOOLBOX_HDR)         
-unparse_hpf.o:   unparse_hpf.c   $(FDVM) $(TOOLBOX_HDR) $(DVMINCLUDE)/unparse.hpf
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/cftn.c b/projects/dvm_svn/fdvm/trunk/parser/cftn.c
deleted file mode 100644
index 3dae8f8..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/cftn.c
+++ /dev/null
@@ -1,922 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/*
- * main.c --- Calls parser, dependence graph analyzer, subscript analyzer.
- * Opens and closes the files that are needed. 
- */
-
-
-#include <stdio.h>
-
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#ifdef WIN
-#define SLASH_ "\\" 
-#else
-#define SLASH_ "/"
-#endif
-
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <fcntl.h>
-#include "db.h"
-#include "defines.h"
-#include "version.h"
-#include "fdvm_version.h"
-typedef FILE	*FILEP;
-
-#ifdef __SPF
-#ifndef __SPF_BUILT_IN_PARSER
-void addToCollection(const int line, const char *file, void *pointer, int type) { }
-void removeFromCollection(void *pointer) { }
-#else
-#define HPF_program HPF_program_
-#define OMP_program OMP_program_
-#define ACC_program ACC_program_
-#define deb_mpi deb_mpi_
-#endif
-#endif
-
-extern int	yylineno, yyleng, yylisting, yylonglines, yydebug;
-extern int      parstate;   
-extern char *   infname;             
-extern int	errcnt,	prflag, errline, num_files;
-extern PTR_BFND global_bfnd;
-extern PTR_BLOB head_blob;
-extern PTR_FNAME head_file,cur_thread_file;
-extern int     num_bfnds;		/* total # of bif nodes */
-extern int     num_llnds;		/* total # of low level nodes */
-extern int     num_symbs;		/* total # of symbol nodes */
-extern int     num_types;		/* total # of types nodes */
-extern int     num_blobs;		/* total # of blob nodes */
-extern int     num_sets;		/* total # of set nodes */
-extern int     num_cmnt;
-extern int     num_def;		/* total # of dependncy nodes */
-extern int     num_dep;
-extern int     num_label;		/* total # of label nodes */
-extern PTR_BFND head_bfnd,	/* start of bfnd chain */
-	        cur_bfnd;	/* poextern int to current bfnd */
-
-extern PTR_LLND head_llnd, cur_llnd;
-extern PTR_SYMB head_symb, cur_symb;
-extern PTR_TYPE head_type, cur_type;
-extern PTR_LABEL head_label, cur_label;
-extern PTR_FNAME head_file,cur_thread_file;
-extern PTR_BLOB head_blob, cur_blob;
-extern PTR_SETS head_sets, cur_sets;
-extern PTR_DEF head_def, cur_def;
-extern PTR_DEFLST head_deflst, cur_deflst;
-extern PTR_DEP head_dep, cur_dep, pre_dep;
-extern PTR_CMNT head_cmnt, cur_cmnt;
-extern PTR_CMNT cur_comment;
-PTR_TYPE global_unknown = NULL;
-
-int _filbuf();
-PTR_SETS build_sets();
-int relink();
-int write_nodes();
-int fclose();
-int inilex();
-int dbginilex();
-int yyparse();
-
-PTR_BFND get_bfnd();
-void fatalstr(), initialize(), errstr(), release_nodes(), close_files();
-void errstr_fatal(), err_fatal();
-void make_file_list();
-char *copys();
-char *getenv();
-int system();
-void free();
-void exit();
-void err();
-char* chkalloc();
-int UnparseFDVMProgram();
-void PrepareSourceFileForDebug (); /*OMP*/
-
-extern int	language;
-extern int warn_all;
-/*int	language = ForSrc;*/
-FILE	*outf;
-static	char *defeditor = "/usr/ucb/vi +%d %s";
-int show_deps = 0; /* set to 1 by -sd flag */
-int garb_collect = 1; /* disabled by -c flag */
-/*static int dep = 0;*/
-static int dvm_debug = 0;     /*set to 1 by -d1 ...-d4 flags */
-/*int only_debug = 0; */   /*set to 1 by  -s flag */
-/*int level_debug = 0; */  /*set to 1 by -d1 flag, to 2 by -d2 flag and so on */
-/*int perf_analysis =0; */ /*set to 1 by -e1 flag, to 2 by -e2 flag and so on */
-static int v_print = 0; /*set to 1 by -v flag */
-/*int warn_all = 0; */     /*set to 1 by -w flag */
-int HPF;
-extern int HPF_VERSION;
-int HPF_program;
-int OMP_program; /*OMP*/
-int ACC_program; /*ACC*/
-int SAPFOR;      /*SPF*/
-int free_form;
-int source_form_by_option;
-int ftn_std;
-int d_line;
-int deb_mpi;
-int extend_source;
-int nchars_per_line;
-char *outname;
-PTR_FILE fi;
-extern PTR_FILE cur_file;
-struct include_dir {
-        struct include_dir *next;
-        char *dir_name;
-}; /*list of directories for "include"*/
-struct include_dir *incl_first = NULL; /*set by -I flag */
-struct include_dir *incl_last;
-
-int is_integer_value(str)
-char *str;
-{   
-   if(!str)
-     return 0;
-   for( ; *str != '\0'; str++)
-        if (! isdigit(*str))
-           return 0;
-   return 1;
-}
-
-void gen_out_name(const char *filename)
-{
-    register int i;
-    char *q, *r;
-
-    if (!filename)
-        return;
-    
-    outname = (char *)malloc((unsigned)(strlen(filename) + 4));
-    strcpy(outname, filename);
-
-    for (i = strlen(filename) - 1; i >= 0; i--)
-    {
-        if (filename[i] == '.')
-        {
-            q = &(outname[i + 1]);
-            break;
-        }
-    }
-    if (i < 0) {
-        q = &(outname[strlen(filename)]);
-        *q++ = '.';
-    }
-    /*else if (!strcmp(q,"hpf"))*/
-
-    else if ((q[0] == 'h' || q[0] == 'H') && (q[1] == 'p' || q[1] == 'P') && (q[2] == 'f' || q[2] == 'F') && (q[3] == '\0'))
-        HPF_program = 1;
-    /* else if ((q[0] == 'f' || q[0] == 'F') && (q[1] == 'd' || q[1] == 'D') && (q[2] == 'v' || q[2] == 'V') && (q[3] =='\0'))
-     ;  */
-     /* else if (deb_mpi && ( ((q[0] == 'f' || q[0] == 'F') && q[1] == '\0') || ((q[0] == 'f' || q[0] == 'F') && q[1] == '9' && q[2] == '0' && q[3] == '\0' ) )) */
-     /* else if (deb_mpi && (!strcmp(q,"f") || !strcmp(q,"F") || !strcmp(q,"f90") || !strcmp(q,"F90") ) ) */
-     /* else if (deb_mpi || ftn_std )
-      ; */
-      /* else
-          errstr_fatal("Invalid source file %s ", filename, 300);
-      */
-
-#if 0 /* OBSOLETE */
-    for (i = strlen(p), q = outname; i; i--)
-        if ((*q++ = *p++) == '.') {
-            dot = 1;
-            break;
-        }
-#endif /* OBSOLETE */
-
-    r = q;
-    if (yylisting) 
-    {
-        *q++ = 'l';
-        *q++ = 's';
-        *q++ = 't';
-        *q = '\0';
-        if ((outf = fopen(outname, "w")) == NULL)
-            errstr_fatal("Can't open file %s for write", outname, 6);
-    }
-
-    if (HPF) 
-    {
-        *r++ = 'h';
-        *r++ = 'p';
-        *r++ = 'f';
-    }
-    else 
-    {
-        *r++ = 'd';
-        *r++ = 'e';
-        *r++ = 'p';
-    }
-    *r = '\0';
-}
-
-
-int
-SourceFormByName (filename)
-char *filename;
-{
-   register int    i;
-   char *q;
-   
-   for (i = strlen(filename)-1 ; i >= 0 ; i --)
-   {
-        if ( filename[i] == '.' )
-        {
-             q = &(filename[i+1]);
-             break;
-        }
-   }
- if (i<0) 
-   return(0); /* fix source form by default */ 
- 
- else if (!strcmp(q,"f90") || !strcmp(q,"F90") )
-   return(1);   /* free source form by default */
- else
-   return(0); /* fix source form by default */  
-
-}
-
-
-void add_include_list(dirname)
-char *dirname;
-{
-  struct include_dir *in;
-  char  *namep = (char *) malloc((unsigned)(strlen(dirname)+1));
-  (void)strcpy(namep, dirname);
-  in = (struct include_dir *) chkalloc(sizeof(struct include_dir));
-  in->next = NULL;
-  in->dir_name = namep;
-  if(!incl_first) {
-    incl_first = in;
-    incl_last = in;
-  }
-  else {
-    incl_last->next = in;
-    incl_last = in;
-  } 
-}
-
-FILE * open_include_file(name)
-char   *name;	
-{
-  char *whole_name,*p;
-  FILE *fincl;
-  struct include_dir *incld; 
-  for(p=name; (*p != '\0'); p++)
-   if(*p == *SLASH_){
-        fincl = fopen(name, "r"); 
-        return(fincl);
-   }
-
-  for(incld=incl_first; incld; incld=incld->next) {
-     whole_name =(char *) malloc((unsigned)(strlen(incld->dir_name)+strlen(name)+2));
-     strcpy(whole_name,incld->dir_name);
-     strcat(whole_name,SLASH_);
-     strcat(whole_name,name);
-     fincl = fopen(whole_name, "r");
-     if(fincl)
-        return(fincl);
-  }
-  fincl = fopen(name, "r"); 
-  return(fincl);
-}
-
-void FragmentList(char *str)
-{
-cur_num:
- if(!isdigit(*str)) {
-     (void)fprintf (stderr, "Warning 002: invalid option argument %s is ignored\n", str);
-     return;
- }
- for(str++; (*str != '\0' &&  *str != ',' &&  *str != '-'); str++) 
-   if(!isdigit(*str)) {
-     (void)fprintf (stderr, "Warning 002: invalid option argument %s is ignored\n", str);
-     return;
-   }
- if(*str == '\0')
-     return;
- str = str+1;
- goto cur_num; 
- 
-return;
-}
-
-#ifdef __SPF_BUILT_IN_PARSER
-int parse_file(int argc, char* argv[], char* proj_name)
-#else
-int main(int argc, char *argv[])
-#endif
-{
-#ifndef __SPF_BUILT_IN_PARSER
-    char *proj_name = "dvm.proj";
-#endif
-    FILE *fproj;
-    int k;
-    int fromfile = (argv != 0);	/* Flag to see if read from a file */
-    void procinit();
-    char *input_file = NULL;
-    char *debug_file;/*OMP*/
-    char *output_file = NULL;
-    int gendeps();
-    int collect_garbage();
-    int no = 0;
-    int ad = 0;
-    HPF = 0;
-    warn_all = 0;
-    HPF_program = 0;
-    OMP_program = 0; /*OMP*/
-    ACC_program = 0; /*ACC*/
-    SAPFOR = 0;      /*SPF*/
-    /*  free_form = 0; */
-    source_form_by_option = 0;
-    ftn_std = 0;
-    d_line = 0;
-    deb_mpi = 0;
-    extend_source = 0;
-    nchars_per_line = 72 - 6;
-#ifdef __SPF
-    int noProject = 0;
-#endif
-    argv++;
-
-    while ((argc > 1) && (*argv)[0] == '-')
-    {
-        if ((*argv)[1] == 'D')
-            yydebug = 1;
-        else if ((*argv)[1] == 'I')
-            add_include_list((*argv) + 2);
-        else if (!strcmp(argv[0], "-o")) {
-            output_file = argv[1]; no++;
-            argv++;
-            argc--;
-        }
-        else if (!strcmp(argv[0], "-a")) {
-            proj_name = argv[1]; ad++;
-            argv++;
-            argc--;
-        }
-        else if (!strcmp(argv[0], "-d_line"))
-            d_line = 1;
-        else if (!strcmp(argv[0], "-dc"))
-            ;
-        else if (!strcmp(argv[0], "-dbif1"))
-            ;
-        else if (!strcmp(argv[0], "-dbif2"))
-            ;
-        else if (!strcmp(argv[0], "-dnoind"))
-            ;
-        else if (!strcmp(argv[0], "-dvmLoopAnalysisEC"))       /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-dvmLoopAnalysis"))   /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-dvmPrivateAnalysis"))   /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-dvmIrregAnalysis"))   /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-speedL0")) /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-speedL1")) /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-byFunUnparse"))
-            ;
-        else if (!strcmp(argv[0], "-dmpi"))
-            deb_mpi = 1;
-        else if (!strcmp(argv[0], "-dperf"))
-            dvm_debug = 5;
-        else if (!strcmp(argv[0], "-emp"))
-            ;
-        else if (!strcmp(argv[0], "-extend_source")) {
-            extend_source = 132;
-            nchars_per_line = extend_source - 6;
-        }
-        else if (((*argv)[1] == 'd') || ((*argv)[1] == 'e')) {
-            if ((*argv)[1] == 'd') {
-                switch ((*argv)[2]) {
-                case '0': dvm_debug = 0; break; /*OMP*/
-                case '1': dvm_debug = 1; break; /*OMP*/
-                case '2': dvm_debug = 2; break; /*OMP*/
-                case '3': dvm_debug = 3; break; /*OMP*/
-                case '4': dvm_debug = 4; break; /*OMP*/
-                    /*case '5':*/
-                    break;
-                default:
-                    goto ERR;
-                }
-            }
-            else if ((*argv)[1] == 'e') { /*OMP*/
-                switch ((*argv)[2]) { /*OMP*/
-                case '0': /*OMP*/
-                case '1': /*OMP*/
-                case '2': /*OMP*/
-                case '3': /*OMP*/
-                case '4': /*OMP*/
-                    /*case '5':*/
-                    break;/*OMP*/
-                default: /*OMP*/
-                    goto ERR; /*OMP*/
-                } /*OMP*/
-            }
-            if ((*argv)[3] == ':')
-                FragmentList(*argv + 4);
-            else  if ((*argv)[3] != '\0')
-                goto ERR;
-        }
-        else if (!strcmp(argv[0], "-spf"))
-            SAPFOR = 1;
-        else if (!strcmp(argv[0], "-p"))
-            HPF = 0;
-        else if (!strcmp(argv[0], "-s"))
-            HPF = 0;
-        else if (!strcmp(argv[0], "-v"))
-            v_print = 1;
-        else if (!strcmp(argv[0], "-w"))
-            warn_all = 1;
-        else if (!strcmp(argv[0], "-t8"))
-            ;
-        else if (!strcmp(argv[0], "-t4"))
-            ;
-        else if (!strcmp(argv[0], "-r8"))
-            ;
-        else if (!strcmp(argv[0], "-i8"))
-            ;
-        else if (!strcmp(argv[0], "-bind0"))
-            ;
-        else if (!strcmp(argv[0], "-bind1"))
-            ;
-        else if (!strcmp(argv[0], "-mp"))  /*OMP*/
-            OMP_program = 1;
-        else if (!strncmp(argv[0], "-bufio", 6)) {
-            if ((*argv)[6] == '\0' || (!is_integer_value(*argv + 6)))
-                goto ERR;
-        }
-        else if (!strncmp(argv[0], "-bufUnparser", 12)) {
-            if ((*argv)[12] == '\0' || (!is_integer_value(*argv + 12)))
-                goto ERR;
-        }
-        else if (!strcmp(argv[0], "-bigPrivates"))
-            ;
-        else if (!strcmp(argv[0], "-ioRTS"))
-            ;
-        else if (!strcmp(argv[0], "-read_all"))
-            ;
-        else if (!strncmp(argv[0], "-collapse", 9)) {
-            if ((*argv)[9] == '\0' || (!is_integer_value(*argv + 9)))
-                goto ERR;
-        }
-        else if (!strcmp(argv[0], "-Obase"))
-            ;
-        else if (!strcmp(argv[0], "-Oloop_range"))
-            ;
-        else if (!strcmp(argv[0], "-hpf")) {
-            HPF = 1;
-            HPF_VERSION = 2;
-        }
-        else if (!strcmp(argv[0], "-hpf1")) {
-            HPF = 1;
-            HPF_VERSION = 1;
-        }
-        else if (!strcmp(argv[0], "-hpf2")) {
-            HPF = 1;
-            HPF_VERSION = 2;
-        }
-        else if (!strcmp(argv[0], "-f90")) {
-            free_form = 1;
-            source_form_by_option = 1;
-        }
-        else if (!strcmp(argv[0], "-FR")) {
-            free_form = 1;
-            source_form_by_option = 1;
-        }
-        else if (!strcmp(argv[0], "-FI")) {
-            free_form = 0;
-            source_form_by_option = 1;
-        }
-        else if (!strcmp(argv[0], "-ffo"))
-            ;
-        else if (!strcmp(argv[0], "-upcase"))
-            ;
-        else if (!strcmp(argv[0], "-noLimitLine"))
-            ;
-        else if (!strcmp(argv[0], "-uniForm"))
-            ;
-        else if (!strcmp(argv[0], "-noRemote"))
-            ;
-        else if (!strcmp(argv[0], "-lgstd"))
-            ftn_std = 1;
-        //else if (!strcmp(argv[0],"-ta"))
-        //  ACC_program= 1;
-        else if (!strcmp(argv[0], "-noH"))
-            ;
-        else if (!strcmp(argv[0], "-C_Cuda"))         /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-FTN_Cuda") || !strcmp(argv[0], "-F_Cuda"))    /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-noCudaType"))     /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-noCuda"))         /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-noPureFunc"))     /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-no_blocks_info")) /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-noBI"))           /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-cacheIdx"))       /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-Ohost"))          /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-noOhost"))        /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-Opl2"))           /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-Opl"))            /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-oneThread"))      /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-noTfm"))          /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-autoTfm"))        /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-gpuO0"))          /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-gpuO1"))          /*ACC*/
-            ;
-        else if (!strcmp(argv[0], "-rtc"))            /*ACC*/
-            ;
-        else if ((*argv)[1] == 'H')
-        {
-            if ((*argv)[2] == 's' && (*argv)[3] == 'h' && (*argv)[4] == 'w')
-            {
-                if (!is_integer_value(*argv + 5))
-                    goto ERR;
-            }
-            else if (!strcmp(*argv + 2, "nora"))
-                ;
-            else if (!strcmp(*argv + 2, "oneq"))
-                ;
-            else if (!strcmp(*argv + 2, "onlyl"))
-                ;
-            else
-                goto ERR;
-        }
-        else if (!strcmp(argv[0], "-ver"))
-        {
-            (void)fprintf(stderr, "parser version is \"%s\"\n", VERSION_NUMBER_INT);
-#ifdef __SPF_BUILT_IN_PARSER
-            return 0;
-#else
-            exit(0);
-#endif
-        }
-#ifdef __SPF
-        else if (!strcmp(argv[0], "-noProject"))
-            noProject = 1;        
-#endif
-        /*   else if (!strcmp(argv[0],"-l"))
-         *	 yylisting = 1;
-        */
-        else
-ERR:       (void)fprintf(stderr, "Warning 001: unknown option %s is ignored\n", argv[0]);
-        argc--;
-        argv++;
-    }
-
-retry:
-    if (*argv)
-    {
-        input_file = *argv;
-        if (output_file)
-            gen_out_name(output_file);
-        else
-            gen_out_name(input_file);
-    }
-    else
-    {
-        /*input_file = "stdin";*/
-        /*(void)fprintf(stderr,"fdvm: Error: no source file specified\n");
-          exit (1);
-         */
-        err_fatal("no source file specified", 3);
-    }
-
-    if (!source_form_by_option)
-        free_form = SourceFormByName(input_file);
-
-    if (output_file && !strcmp(input_file, output_file))
-        err_fatal("Output file has the same name as source file", 334);
-
-    if (argc > 2) {
-        /*
-          (void)fprintf(stderr,"fdvm: Error: illegal command line format\n");
-          exit (1);
-         */
-        err_fatal("illegal command line format", 4);
-    }
-    /*  if(perf_analysis && dvm_debug)
-        err_fatal("conflicting options -e and -d");
-    */
-    if (HPF_program && HPF) {
-        (void)fprintf(stderr, "Warning: option -hpf%d is ignored\n", HPF_VERSION);
-        HPF = 0;
-    }
-    if (free_form && extend_source) {
-        (void)fprintf(stderr, "Warning: option -extend_source is ignored\n");
-        extend_source= 0;
-    } 
-    language = ForSrc;
-    yylonglines = 1;
-    prflag = 1;
-    cur_file = fi = (PTR_FILE)calloc(1, (unsigned)sizeof(struct file_obj));
-    fi->lang = language;
-    initialize();
-    if ((OMP_program == 1) && (dvm_debug > 0)) {/*OMP*/
-        debug_file = (char *)malloc((unsigned)(strlen(input_file) + 5));/*OMP*/
-        sprintf(debug_file, "dbg_%s", input_file);/*OMP*/
-        PrepareSourceFileForDebug(input_file, debug_file); /*OMP*/
-        make_file_list(input_file);/*OMP*/
-        if (dbginilex(copys(input_file), copys(debug_file))) { /*OMP*/
-            err_fatal("Compiler bug (Error in inilex)", 0); /*OMP*/
-        } /*OMP*/
-    }/*OMP*/ else {
-        make_file_list(input_file);
-
-        if (inilex(copys(*argv ? *argv : ""))) {
-            /*  (void)printf("Error in inilex\n");
-             exit(1); */
-            err_fatal("Compiler bug (Error in inilex)", 0);
-            /*goto finish;*/
-        }
-    }/*OMP*/
-    procinit();
-
-    if (v_print) {
-        (void)fprintf(stderr, "*****  Fortran DVM  %s  *****\n", COMPILER_VERSION);
-        (void)fprintf(stderr, "\n<<<<<  Parsing  %s  >>>>>\n", input_file);
-    }
-    /* parsing */
-    if ((k = yyparse())) {
-        /*(void)printf("Bad parse, return code %d\n", k);*/
-        (void)err("Compiler bug", 0);
-#ifdef __SPF_BUILT_IN_PARSER
-        release_nodes();
-        close_files();
-        return 1;
-#else
-        exit(1);
-#endif
-        /*goto finish;*/
-    }
-    if (parstate != OUTSIDE) {
-        infname = input_file;
-        err("Missing final end statement or unclosed construct", 8);
-        (void)fprintf(stderr, "%d error(s)\n", errcnt);
-#ifdef __SPF_BUILT_IN_PARSER
-        release_nodes();
-        close_files();
-        return 1;
-#else
-        exit(1);
-#endif
-        /*goto finish;*/
-    }
-    global_bfnd->filename = head_file; /*podd 18.04.99*/
-    /*global_bfnd->filename = cur_thread_file;*/ /*podd 18.04.99*/
-    if (errcnt) {
-        (void)fprintf(stderr, "%d error(s)\n", errcnt);
-#ifdef __SPF_BUILT_IN_PARSER
-        release_nodes();
-        close_files();
-        return 1;
-#else
-        exit(1);
-#endif
-        if (fromfile) {
-            int ans;
-
-            (void)printf("Do you want to invoke editor? [y/n] ");
-            while ((ans = getchar()) == '\n');
-            if (ans == 'y' || ans == 'Y') {
-                char *edtcmd;
-                char cmd[50];
-
-                edtcmd = getenv("FOREDIT");
-                if (!edtcmd) edtcmd = defeditor;
-                (void)sprintf(cmd, edtcmd, errline, *argv);
-                (void)system(cmd);
-                release_nodes();
-                close_files();
-                goto retry;
-            }
-#ifdef __SPF_BUILT_IN_PARSER
-            release_nodes();
-            close_files();
-            return 1;
-#else
-            exit(1);
-#endif
-        }
-
-    }
-    /*
-       if (dep) {
-          (void)build_sets(0, global_bfnd,NULL,NULL,1);
-          (void)build_sets(0, global_bfnd,NULL,NULL,2);
-          (void)gendeps(global_bfnd);
-          (void)relink(fi);
-          printf("garbage collecting\n");
-
-          if (garb_collect) (void)collect_garbage(fi);
-       }
-    */
-    if (yylisting)
-        (void)fprintf(outf, "%s\n", input_file);
-    if (!global_bfnd->thread) /*null program (only global_bfnd is)*/
-    {
-        err_fatal("null program", 7);
-    }
-
-#ifndef __SPF_BUILT_IN_PARSER
-    if (HPF)
-    {
-        FILE *hpfout;
-        if (no <= 1)
-            output_file = outname;
-        if ((hpfout = fopen(output_file, "w")) == NULL) {
-            /* (void) fprintf(stderr,"Can't open file %s for write\n",output_file);*/
-                /*UnparseFDVMProgram(stdout,cur_file);*/
-            /* exit(1);*/
-            errstr_fatal("Can't open file %s for write", output_file, 6);
-        }
-        else
-        {
-            if (v_print)
-                (void)fprintf(stderr, "\n<<<<<  Generating HPF program  %s  >>>>>\n", output_file);
-            errcnt = UnparseFDVMProgram(hpfout, cur_file);
-            (void)fclose(hpfout);
-            if (errcnt) {
-                (void)fprintf(stderr, "%d error(s)\n", errcnt);
-                exit(1);
-            }
-            else
-                if (v_print)
-                    (void)fprintf(stderr, "\n*****  Done  *****\n");
-            exit(0);
-        }
-    }
-#else
-    if (HPF)
-        return -1;
-#endif
-    write_nodes(cur_file, outname);
-
-#ifdef __SPF
-    if (noProject == 0)
-#endif
-    {
-        fproj = ad ? fopen(proj_name, "a") : fopen(proj_name, "w");
-        if (fproj == NULL) {
-            /* (void) fprintf(stderr,"Can't open file %s for write\n",proj_name);
-                exit(1); */
-            errstr_fatal("Can't open file %s for write", proj_name, 6);
-        }
-        (void)fprintf(fproj, "%s\n", outname);
-        (void)fclose(fproj);
-    }
-    /* finish:*/
-    return 0;
-}
-
-
-void clf(p) 
-FILEP *p;
-{
-   void fatal();
-   
-   if (p && *p && *p != stdout) {
-      if (ferror(*p))
-	 fatal("writing error", 329);
-      (void)fclose(*p);
-   }
-   *p = (FILEP)NULL;
-}
-
-
-void
-make_file_list(filename)
-char *filename;
-{
-   char  *namep = (char *) malloc((unsigned)(strlen(filename)+1));
-   PTR_FNAME this = (PTR_FNAME) malloc((unsigned)sizeof(struct file_name));
-   PTR_FNAME p;
-   
-   (void)strcpy(namep, filename);
-   this->id = fi->num_files = ++num_files;
-   this->name = namep;
-   this->next = (PTR_FNAME)NULL;
-   if (head_file == (PTR_FNAME)NULL)
-      fi->head_file = head_file = this;
-   else {
-      for (p = head_file; p->next != NULL; p = p->next)
-	 ;
-      p->next = this;
-   }
-   cur_thread_file = this;
-}
-
-void PrepareSourceFileForDebug (input_file, debug_file) /*OMP*/
-char *input_file; /*OMP*/
-char *debug_file; /*OMP*/
-{ /*OMP*/
-  FILE * pFile;
-  long lSize;
-  char sInclude[] = "\r\n      include 'dbg_init.h'";
-  /*int count = 0;*/
-  char * buffer;
-  size_t result;
-  pFile = fopen ("dbg_init.h", "r");
-  if (pFile==NULL) {
-    pFile = fopen ("dbg_init.h", "w");
-    fprintf (pFile, "      subroutine DBG_Init_Handles ()\n");
-    fprintf (pFile, "      include 'dbg_vars.h'\n");
-    fprintf (pFile, "      end subroutine DBG_Init_Handles");
-
-  }
-  fclose (pFile);
-  pFile = fopen ("dbg_vars.h", "r");
-  if (pFile==NULL) {
-    pFile = fopen ("dbg_vars.h", "w");
-    fprintf (pFile, "      dimension idyn_mp(1)\n");
-    fprintf (pFile, "      dimension istat_mp(1)\n");
-    fprintf (pFile, "      common /DBG_STAT/ istat_mp\n");
-    fprintf (pFile, "      common /DBG_DYN/ idyn_mp\n");
-    fprintf (pFile, "C$OMP THREADPRIVATE (/DBG_DYN/)\n");
-    fprintf (pFile, "      common /DBG_THREAD/ ithreadid\n");
-    fprintf (pFile, "C$OMP THREADPRIVATE (/DBG_THREAD/)");
-  }
-  fclose (pFile);
-  pFile = fopen (input_file, "rb" );
-  if (pFile==NULL) {return;}
-  /* obtain file size:*/
-  fseek (pFile , 0 , SEEK_END);
-  lSize = ftell (pFile);
-  rewind (pFile);
-  /* allocate memory to contain the whole file:*/
-  buffer = (char*) malloc (sizeof(char)*(lSize + sizeof(sInclude)));
-  if (buffer == NULL) {fprintf (stderr, "PrepareSourceFileForDebug: not engough memory!\n"); exit (1);}
-  /* copy the file into the buffer:*/
-  result = fread (buffer,1,lSize,pFile);
-  /* the whole file is now loaded in the memory buffer. */ 
-  fclose (pFile);
-  pFile = fopen (debug_file, "wb" );
-  if (pFile==NULL) {fprintf (stderr, "PrepareSourceFileForDebug: can not open %s file!\n", debug_file); exit (1);}
-  strcpy (buffer+lSize, sInclude);
-  result = fwrite (buffer,1,lSize + sizeof(sInclude),pFile);
-  fclose (pFile);
-  free (buffer);
-} /*OMP*/
-
-int DoDebugInclude (char *fname) {/*OMP*/
-  FILE * pFile;
-  long lSize;
-  int count = 0;
-  char * buffer;
-  char * beg = NULL;
-  size_t result;
-  pFile = fopen (fname, "rb" );
-  if (pFile==NULL) {return 0;}
-  /* obtain file size:*/
-  fseek (pFile , 0 , SEEK_END);
-  lSize = ftell (pFile);
-  rewind (pFile);
-  /* allocate memory to contain the whole file:*/
-  buffer = (char*) malloc (sizeof(char)*lSize);
-  if (buffer == NULL) {fprintf (stderr, "DoDebugInclude: not engough memory!\n"); exit (1);}
-  /* copy the file into the buffer:*/
-  result = fread (buffer,1,lSize,pFile);
-  /* the whole file is now loaded in the memory buffer. */ 
-  fclose (pFile);
-  beg = buffer;
-  while (beg != NULL) {
-     beg = strstr (beg, "call DBG_Get_Handle");
-     if (beg != NULL) {
-        beg++;     
-        count++;
-     }
-  }  
-  free (buffer);
-  fprintf (stderr, "%d",count);
-  return count;
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/errors.c b/projects/dvm_svn/fdvm/trunk/parser/errors.c
deleted file mode 100644
index a21f2c9..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/errors.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/*
- * errors.c
- *
- * Miscellaneous error routines
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "defs.h"
-#include "symb.h"
-#include "extern.h"
-
-#define MAX_PARSER_ERRORS 1000 
-
-static char buff[100];
-
-#ifdef __SPF_BUILT_IN_PARSER
-extern void ExitFromParser(const int c);
-#endif
-
-void format_num (int num, char num3s[])
-{
- if(num>99)
-   sprintf(num3s,"%3d",num);
- else if(num>9)
-   sprintf(num3s,"0%2d",num);
- else 
-  sprintf(num3s,"00%1d",num);
-}
-
-int
-error_limit()
-{
-	if (! errcnt)
-		errline = yylineno;
-        if (errcnt++ == MAX_PARSER_ERRORS)
-                (void)fprintf(stderr, "!!! Too many errors !!!\n");
-        
-        if (errcnt > MAX_PARSER_ERRORS)
-                return 1;         
-        return 0;
-}
-
-/*
- * fatal -- print the fatal error message then exit
- *
- * input:
- *	  s - the message to be printed out
- *        num  - error message number
- */
-void fatal(char* s, int num)
-{
-    char num3s[4];
-    format_num(num, num3s);
-    (void)fprintf(stderr, "Error %s on line %d of %s: %s\n", num3s, yylineno, infname, s);
-#ifdef __SPF_BUILT_IN_PARSER
-    ExitFromParser(3);
-#else
-    exit(3);
-#endif
-}
-
-
-/*
- * fatalstr -- sets up the error message according to the given format
- *		then call "fatal" to print it out
- *
- * input:
- *	  t - a string that specifies the output format
- *	  s - a string that contents the error messaged to be formatted
- *        num  - error message number
- */
-void 
-fatalstr(t, s, num)
-	char   *t, *s;
-        int num;
-{
-	(void)sprintf(buff, t, s);
-	fatal(buff,num);
-}
-
-
-/*
- * fatali -- formats a fatal error message which contains a number
- *	     then call "fatal" to print it
- *
- * input:
- *	  t - a string that specifies the output format
- *	  d - an integer to be converted according to t
- */
-void 
-fatali(t, d)
-	char   *t;
-	int     d;
-{
-	(void)sprintf(buff, t, d);
-	fatal(buff,0);
-}
-
-/*
- * err_fatal -- print the fatal error message then exit
- *
- * input:
- *	  s - the message to be printed out
- */
-void err_fatal(char* s, int num)
-{
-    char num3s[4];
-    format_num(num, num3s);
-    (void)fprintf(stderr, "Error %s: %s\n", num3s, s);
-#ifdef __SPF_BUILT_IN_PARSER
-    ExitFromParser(3);
-#else
-    exit(3);
-#endif
-}
-
-
-/*
- * errstr_fatal -- sets up the error message according to the given format
- *		then call "fatal" to print it out
- *
- * input:
- *	  t - a string that specifies the output format
- *	  s - a string that contents the error messaged to be formatted
- */
-void 
-errstr_fatal(t, s, num)
-	char   *t, *s;
-        int num;
-{
-	(void)sprintf(buff, t, s);
-	err_fatal(buff, num);
-}
-
-
-
-/*
- * warn1 -- formats a warning message then call "warn" to print it out
- *
- * input:
- *	  s - string that specifies the conversion format
- *	  t - string that to be converted according to s
- *	  n - warning message number
- */
-void 
-warn1(s, t, num)
-	char   *s, *t;
-        int num;
-{
-   void warn();
-
-   (void)sprintf(buff, s, t);
-   warn(buff,num);
-}
-
-
-/*
- * warn -- print the warning message if specified
- *
- * input:
- *	  s - string to be printed
- *	  num - warning message number
- */
-void
-warn(s, num)
-char *s;
-int num;
-{char num3s[4];
-   format_num(num,num3s);
-   if (!nowarnflag) {
-      ++nwarn;
-      (void)fprintf(stderr, "Warning %s on line %d of %s: %s\n", num3s,yylineno, infname, s);
-   }
-}
-
-/*
- * warn_line -- prints the error message and does the bookkeeping
- *
- * input:
- *	  s - string to be printed out
- *	  num - warning  message number
- *        ln  - string number
- */
-void
-warn_line(s, num, ln)
-	char   *s;
-        int num, ln;
-{       char num3s[4];
-        format_num(num,num3s);
-        if (!nowarnflag) {
-           ++nwarn;
-	(void)fprintf(stderr,"Warning %s on line %d of %s: %s\n", num3s,ln,infname, s);
-        }
-}
-
-
-/*
- * errstr -- formats the non-fatal error message then call "err" to print it
- *
- * input:
- *	  s - string that specifies the conversion format
- *	  t - string that to be formated according to s
- *	  num - error message number
- */
-void 
-errstr(s, t, num)
-	char   *s, *t;
-        int num;
-{ 
-   void err();
-   (void)sprintf(buff, s, t);
-   err(buff,num);
-}
-
-
-/*
- * erri -- formats an error number then prints it out
- *
- * input:
- *	  s - string that specifies the output format
- *	  t - number to be formatted
- *	  num - error message number
- */
-void
-erri(s, t, num)
-	char   *s;
-	int     t,num;
-{
-   void err();
-
-   (void)sprintf(buff, s, t);
-   err(buff,num);
-}
-
-
-/*
- * err -- prints the error message and does the bookkeeping
- *
- * input:
- *	  s - string to be printed out
- *	  num - error message number
- */
-void
-err(s, num)
-	char   *s;
-        int num;
-{       char num3s[4];
-        format_num(num,num3s);
-	if (error_limit()) 
-	  	return;
-        (void)fprintf(stderr,"Error %s on line %d of %s: %s\n", num3s,yylineno,infname, s);
-}
-/*
- * err_line -- prints the error message and does the bookkeeping
- *
- * input:
- *	  s - string to be printed out
- *	  num - error message number
- *        ln  - string number
- */
-void
-err_line(s, num, ln)
-	char   *s;
-        int num, ln;
-{       char num3s[4];
-        format_num(num,num3s);
-	if (error_limit()) 
-	  	return;
-	(void)fprintf(stderr,"Error %s on line %d of %s: %s\n", num3s,ln,infname, s);
-}
-
-/*
- * errg -- prints the error message (without line number)
- *
- * input:
- *	  s - string to be printed out
- *	  num - error message number
- */
-void
-errg(s, num)
-	char   *s;
-        int num;
-{       char num3s[4];
-        format_num(num,num3s);
-	if (error_limit()) 
-	  	return;
-	(void)fprintf(stderr,"Error %s: %s\n", num3s, s);
-}
-
-
-/*
- * yyerror -- the error handling routine called by yacc
- *
- * input:
- *	  s - the error message to be printed
- */
-void 
-yyerror(s)
-	char   *s;
-    
-{
-	err(s,14); /* 14 - syntax error */
-}
-
-
-/*
- * dclerr -- prints the error message when find error in declaration part
- *
- * input:
- *	  s - error message string
- *	  v - pointer to the symble table entry
- */
-void 
-dclerr(s, v)
-	char   *s;
-	PTR_SYMB v;
-{
-	char    buf[100];
-
-	if (v) {
-		(void)sprintf(buf,"Declaration error for %s: %s",v->ident, s);
-		err(buf,0);
-	} else
-		errstr("Declaration error: %s", s,0);
-}
-
-
-/*
- * execerr -- prints error message for executable part
- *
- * input:
- *	  s - the error message string1
- *	  n - the error message string2
- */
-void 
-execerr(s, n)
-	char   *s, *n;
-{
-	char    buf1[100], buf2[100];
-
-	/*(void)sprintf(buf1, "Execution error: %s", s);*/
-        (void)sprintf(buf1, "%s", s);
-	(void)sprintf(buf2, buf1, n);
-	err(buf2,0);
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/facc.gram b/projects/dvm_svn/fdvm/trunk/parser/facc.gram
deleted file mode 100644
index bbcb852..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/facc.gram
+++ /dev/null
@@ -1,145 +0,0 @@
-acc_specification: acc_declare
-                 | acc_routine
-                 ;
-acc_directive: acc_region
-             | acc_end_region      
-             | acc_checksection
-             | acc_end_checksection
-             | acc_get_actual
-             | acc_actual 
-	     ;
-
-acc_region: ACC_REGION end_spec  opt_clause 
-             {  $$ = get_bfnd(fi,ACC_REGION_DIR,SMNULL,$3,LLNULL,LLNULL);}
-             ;
-
-acc_checksection: ACC_CHECKSECTION end_spec 
-             {  $$ = get_bfnd(fi,ACC_CHECKSECTION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-             ;
-
-acc_get_actual:  ACC_GET_ACTUAL end_spec LEFTPAR acc_var_list RIGHTPAR
-             {  $$ = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,$4,LLNULL,LLNULL);}
-              |  ACC_GET_ACTUAL end_spec LEFTPAR RIGHTPAR
-             {  $$ = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-              |  ACC_GET_ACTUAL end_spec 
-             {  $$ = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-             ;
-
-acc_actual:     ACC_ACTUAL end_spec LEFTPAR acc_var_list RIGHTPAR
-             {  $$ = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,$4,LLNULL,LLNULL);}
-          |   ACC_ACTUAL end_spec LEFTPAR RIGHTPAR
-             {  $$ = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-          |   ACC_ACTUAL end_spec 
-             {  $$ = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-             ;
-
-opt_clause:  needkeyword keywordoff
-              { $$ = LLNULL;}
-          |  acc_clause_list
-              { $$ = $1; }
-          ;
-
-acc_clause_list:   acc_clause
-	          { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-               | acc_clause_list COMMA acc_clause
-	          { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-               ;
-
-acc_clause:    needkeyword data_clause
-               { $$ = $2;}
-
-             | needkeyword async_clause
-               { $$ = $2;}
-               
-             | needkeyword targets_clause
-               { $$ = $2;}                   
-             ;
-
-
-data_clause:   INOUT   LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_INOUT_OP,$3,LLNULL,SMNULL);}
-             | IN      LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_IN_OP,$3,LLNULL,SMNULL);}
-             | OUT     LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_OUT_OP,$3,LLNULL,SMNULL);}
-             | ACC_LOCAL   LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_LOCAL_OP,$3,LLNULL,SMNULL);}             
-             | ACC_INLOCAL LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_INLOCAL_OP,$3,LLNULL,SMNULL);}             
-             ;
-
-targets_clause:   ACC_TARGETS LEFTPAR computer_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_TARGETS_OP,$3,LLNULL,SMNULL);}
-             ;
-
-async_clause:   ACC_ASYNC             
-               { $$ = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);}
-             ;
-
-
-acc_var_list: variable_list
-              { $$ = $1;}
-            ;
-
-computer_list:   computer
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | computer_list COMMA computer
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-computer:       needkeyword ACC_HOST
-              { $$ = make_llnd(fi,ACC_HOST_OP, LLNULL,LLNULL,SMNULL);}
-             |  needkeyword ACC_CUDA
-              { $$ = make_llnd(fi,ACC_CUDA_OP, LLNULL,LLNULL,SMNULL);}
-             ;
-
-acc_end_region: ACC_END_REGION
-              {  $$ = get_bfnd(fi,ACC_END_REGION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-              ;
-     
-acc_end_checksection: ACC_END_CHECKSECTION
-              {  $$ = get_bfnd(fi,ACC_END_CHECKSECTION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-              ;     
-
-acc_declare: ACC_DECLARE in_dcl opt_double_colon acc_declare_list
-	   {
-	      $$ = get_bfnd(fi,ACC_DECLARE_DIR, SMNULL, $4, LLNULL, LLNULL);
-           }
-           ;
-acc_declare_list: declare_var
-                  { $$ = make_llnd(fi,EXPR_LIST, $1, LLNULL, SMNULL); }
-	        | acc_declare_list COMMA declare_var
-                  { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	        ;
-
-declare_var: name
-           {
-              PTR_SYMB s;
-              s = make_scalar($1,TYNULL,LOCAL);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT) || (s->attr & DYNAMIC_BIT) || (s->attr & HEAP_BIT)|| (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT) ||(s->attr & SHADOW_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16);	
-	      $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s); 
-           }
-           ;
-        
-acc_routine: ACC_ROUTINE in_dcl opt_routine_clauses 
-             {  $$ = get_bfnd(fi,ACC_ROUTINE_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-           ;
-
-opt_routine_clauses:
-                     {  $$ = LLNULL;}
-                   | routine_clause_list
-                     { $$ = $1;}
-                   ;
-
-routine_clause_list: routine_clause
-	             { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                   | routine_clause_list routine_clause
-	           { $$ = set_ll_list($1,$2,EXPR_LIST); }	
-                   ;
-           
-routine_clause: COMMA needkeyword PRIVATE LEFTPAR acc_declare_list RIGHTPAR
-                    { $$ = make_llnd(fi,ACC_PRIVATE_OP,$5,LLNULL,SMNULL);}  
-              | COMMA needkeyword targets_clause
-                    { $$ = $3;} 
-              ;
diff --git a/projects/dvm_svn/fdvm/trunk/parser/fdvm.gram b/projects/dvm_svn/fdvm/trunk/parser/fdvm.gram
deleted file mode 100644
index f412c8a..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/fdvm.gram
+++ /dev/null
@@ -1,2257 +0,0 @@
-dvm_specification: dvm_template
-                 | dvm_align  
-                 | dvm_distribute   
-                 | dvm_dynamic   
-                 | dvm_processors 
-                 | dvm_shadow
-                 | dvm_combined_dir
-                 | dvm_pointer 
-                 | dvm_task
-                 | dvm_inherit
-                 | dvm_indirect_group
-                 | dvm_remote_group
-                 | dvm_reduction_group
-                 | dvm_consistent_group
-                 | dvm_heap
-                 | dvm_asyncid
-                 | dvm_consistent
-                 | ompdvm_onethread /*OMP*/
-		 | omp_specification_directive /*OMP*/
-                 ; 
-
-dvm_exec: dvm_redistribute
-        | dvm_realign
-        | dvm_parallel_on
-        | dvm_shadow_group
-        | dvm_shadow_start
-        | dvm_shadow_wait
-        | dvm_reduction_start
-        | dvm_reduction_wait
-        | dvm_consistent_start
-        | dvm_consistent_wait
-        | dvm_remote_access
-        | dvm_task_region
-        | dvm_end_task_region
-        | dvm_map
-        | dvm_on
-        | dvm_end_on
-        | dvm_indirect_access
-        | dvm_prefetch
-        | dvm_reset
-        | dvm_debug_dir
-        | dvm_enddebug_dir
-        | dvm_interval_dir
-        | dvm_endinterval_dir
-        | dvm_exit_interval_dir
-        | dvm_traceon_dir
-        | dvm_traceoff_dir
-        | dvm_barrier_dir
-        | dvm_check
-        | dvm_new_value   
-        | dvm_asynchronous
-        | dvm_endasynchronous
-        | dvm_asyncwait
-        | dvm_f90
-        | dvm_io_mode_dir
-        | dvm_shadow_add
-        | dvm_localize
-        | dvm_cp_create
-        | dvm_cp_load
-        | dvm_cp_save
-        | dvm_cp_wait
-        | dvm_template_create
-        | dvm_template_delete
-        | hpf_independent 
-	| omp_execution_directive /*OMP*/
-/*        | dvm_own      */
-        ;
-       
-dvm_template: HPF_TEMPLATE in_dcl template_obj	    
-	      { $$ = get_bfnd(fi,HPF_TEMPLATE_STAT, SMNULL, $3, LLNULL, LLNULL); }
-	    | dvm_template COMMA template_obj 
-              { PTR_SYMB s;
-                if($1->entry.Template.ll_ptr2)
-                {
-                  s = $3->entry.Template.ll_ptr1->entry.Template.symbol;
-                  s->attr = s->attr | COMMON_BIT;
-                }
-	        add_to_lowLevelList($3, $1->entry.Template.ll_ptr1);
-	      }
-	    ;
-
-template_obj: name dims
-             {PTR_SYMB s;
-	      PTR_LLND q;
-	    /* 27.06.18
-	      if(! explicit_shape)   
-                err("Explicit shape specification is required", 50);
-	    */  
-	      s = make_array($1, TYNULL, $2, ndim, LOCAL);
-              if(s->attr & TEMPLATE_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & DVM_POINTER_BIT))
-                errstr( "Inconsistent declaration of identifier  %s ", s->ident, 16);
-              else
-	        s->attr = s->attr | TEMPLATE_BIT;
-              if($2) s->attr = s->attr | DIMENSION_BIT;  
-	      q = make_llnd(fi,ARRAY_REF, $2, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $2;
-	      $$ = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	     }
-             ;
-
-dvm_dynamic: DYNAMIC in_dcl dyn_array_name_list
-    { $$ = get_bfnd(fi,DVM_DYNAMIC_DIR, SMNULL, $3, LLNULL, LLNULL);}
-           ;
-
-dyn_array_name_list: dyn_array_name
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | dyn_array_name_list COMMA dyn_array_name
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-dyn_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              if(s->attr &  DYNAMIC_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & HEAP_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-              else
-                s->attr = s->attr | DYNAMIC_BIT;        
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;
-
-dvm_inherit: INHERIT in_dcl dummy_array_name_list
-    { $$ = get_bfnd(fi,DVM_INHERIT_DIR, SMNULL, $3, LLNULL, LLNULL);}
-           ;
-
-dummy_array_name_list: dummy_array_name
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | dummy_array_name_list COMMA dummy_array_name
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-dummy_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-              else
-                s->attr = s->attr | INHERIT_BIT;        
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;
-
-dvm_shadow: SHADOW in_dcl sh_array_name shadow_attr_stuff
-           { PTR_LLND q;
-             q = set_ll_list($3,LLNULL,EXPR_LIST);
-              /* (void)fprintf(stderr,"hpf.gram: shadow\n");*/ 
-	     $$ = get_bfnd(fi,DVM_SHADOW_DIR,SMNULL,q,$4,LLNULL);
-            }
-         /*
-          | SHADOW in_dcl shadow_attr_stuff COLON COLON sh_array_name_list
-            {$$ = get_bfnd(fi,DVM_SHADOW_DIR,SMNULL,$6,$3,LLNULL);}
-          */
-          ;
-shadow_attr_stuff: LEFTPAR sh_width_list RIGHTPAR
-                  { $$ = $2;}
-                 ;
-
-sh_width_list: sh_width
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | sh_width_list COMMA sh_width
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-             ;
-
-sh_width: expr
-          { $$ = $1;}
-        | expr COLON expr
-          { $$ = make_llnd(fi,DDOT, $1, $3, SMNULL);}
-        | COLON LEFTPAR subscript_list RIGHTPAR
-          {
-            if(parstate!=INEXEC) 
-               err("Illegal shadow width specification", 56);  
-            $$ = make_llnd(fi,SHADOW_NAMES_OP, $3, LLNULL, SMNULL);
-          }
-        ;
-     
-/*         
-sh_array_name_list: sh_array_name
-	           { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                  | sh_array_name_list COMMA sh_array_name
-	           { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-*/
-sh_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              if(s->attr & SHADOW_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & HEAP_BIT)) 
-                      errstr( "Inconsistent declaration of identifier %s", s->ident, 16); 
-              else
-        	      s->attr = s->attr | SHADOW_BIT;  
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;  
-dvm_processors: HPF_PROCESSORS in_dcl name dims 
-	    { PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! explicit_shape) {
-              err("Explicit shape specification is required", 50);
-		/* $$ = BFNULL;*/
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-              if(s->attr &  PROCESSORS_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & TASK_BIT) || (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT))
-                errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-              else
-	        s->attr = s->attr | PROCESSORS_BIT;
-              if($4) s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,HPF_PROCESSORS_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| OMPDVM_NODES in_dcl name dims 
-	    { PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! explicit_shape) {
-              err("Explicit shape specification is required", 50);
-		/* $$ = BFNULL;*/
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-              if(s->attr &  PROCESSORS_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & TASK_BIT) || (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT))
-                errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-              else
-	        s->attr = s->attr | PROCESSORS_BIT;
-              if($4) s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,HPF_PROCESSORS_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| dvm_processors COMMA name dims 
-           {  PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! explicit_shape) {
-		err("Explicit shape specification is required", 50);
-		/*$$ = BFNULL;*/
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-              if(s->attr &  PROCESSORS_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & TASK_BIT) || (s->attr &  DVM_POINTER_BIT) || (s->attr & INHERIT_BIT) )
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16);
-              else
-	        s->attr = s->attr | PROCESSORS_BIT;
-              if($4) s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-dvm_indirect_group: INDIRECT_GROUP in_dcl indirect_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           $$ = get_bfnd(fi,DVM_INDIRECT_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-                  | dvm_indirect_group COMMA  indirect_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	           ;
-                }
-                  ;
-
-indirect_group_name: name
-          {$$ = make_local_entity($1, REF_GROUP_NAME,global_default,LOCAL);
-          if($$->attr &  INDIRECT_BIT)
-                errstr( "Multiple declaration of identifier  %s ", $$->ident, 73);
-           $$->attr = $$->attr | INDIRECT_BIT;
-          }
-                   ;
-
-dvm_remote_group: REMOTE_GROUP in_dcl remote_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           $$ = get_bfnd(fi,DVM_REMOTE_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-                  | dvm_remote_group COMMA  remote_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-                }
-                  ;
-
-remote_group_name: name
-          {$$ = make_local_entity($1, REF_GROUP_NAME,global_default,LOCAL);
-           if($$->attr &  INDIRECT_BIT)
-                errstr( "Inconsistent declaration of identifier  %s ", $$->ident, 16);
-          }
-          ;
-
-dvm_reduction_group: REDUCTION_GROUP in_dcl reduction_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           $$ = get_bfnd(fi,DVM_REDUCTION_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-                  | dvm_reduction_group COMMA  reduction_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	           ;
-                }
-                  ;
-
-reduction_group_name:  name
-       {$$ = make_local_entity($1, REDUCTION_GROUP_NAME,global_default,LOCAL);}
-            ;       
-
-dvm_consistent_group: CONSISTENT_GROUP in_dcl consistent_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           $$ = get_bfnd(fi,DVM_CONSISTENT_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-                  | dvm_consistent_group COMMA  consistent_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);	           
-                }
-                  ;
-
-consistent_group_name:  name
-       {$$ = make_local_entity($1, CONSISTENT_GROUP_NAME,global_default,LOCAL);}
-            ;       
-
-
-/*opt_new: 
-*	    { $$ = LLNULL; opt_kwd_ = NO;}
-*	|    NEW 
-*	    { $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-*             $$->entry.string_val = (char *) "new";
-*             $$->type = global_string;
-*           }
-*       ;
-*/
-opt_onto:   ONTO name dims 
-            { PTR_SYMB s;
-            if(parstate == INEXEC){
-              if (!(s = $2->id_attr))
-              {
-	         s = make_array($2, TYNULL, LLNULL, 0, LOCAL);
-	     	 s->decl = SOFT;
-	      } 
-            } else
-              s = make_array($2, TYNULL, LLNULL, 0, LOCAL);
-
-              $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, s);
-            }               
-	|  
-            { $$ = LLNULL; opt_kwd_ = NO;}
-	    
-	;
-
-
-dvm_distribute: DISTRIBUTE in_dcl dist_name  opt_dist_format_clause opt_onto 
-           { PTR_LLND q;
-             if(!$4)
-               err("Distribution format list is omitted", 51);
-            /* if($6)
-               err("NEW_VALUE specification in DISTRIBUTE directive");*/
-             q = set_ll_list($3,LLNULL,EXPR_LIST);
-	     $$ = get_bfnd(fi,DVM_DISTRIBUTE_DIR,SMNULL,q,$4,$5);
-            }
-      /*        | DISTRIBUTE in_dcl opt_aster opt_key_word opt_dist_format_clause opt_onto COLON COLON dist_name_list
-	    { if(!$3 && !$5)
-                err(" dist-format-clause is omitted");
-              $$ = get_bfnd(fi,DVM_DISTRIBUTE_DIR,$6,$9,$5,$3); }
-      */
-	      ;
-
-dvm_redistribute: REDISTRIBUTE end_spec  dist_name dist_format_clause opt_key_word opt_onto  
-            { PTR_LLND q;
-                /*  if(!$4)
-                  {err("Distribution format is omitted", 51); errcnt--;}
-                 */
-              q = set_ll_list($3,LLNULL,EXPR_LIST);
-                 /* r = LLNULL;
-                   if($6){
-                     r = set_ll_list($6,LLNULL,EXPR_LIST);
-                     if($7) r = set_ll_list(r,$7,EXPR_LIST);
-                   } else
-                     if($7) r = set_ll_list(r,$7,EXPR_LIST);
-                 */
-	      $$ = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,SMNULL,q,$4,$6);}
-
-                | REDISTRIBUTE end_spec  dist_format_clause  opt_key_word opt_onto  COLON COLON dist_name_list
-             {
-                 /* r = LLNULL;
-                    if($5){
-                      r = set_ll_list($5,LLNULL,EXPR_LIST);
-                      if($6) r = set_ll_list(r,$6,EXPR_LIST);
-                    } else
-                      if($6) r = set_ll_list(r,$6,EXPR_LIST);
-                  */
-	      $$ = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,SMNULL,$8 ,$3,$5 );
-             }
-/*              | REDISTRIBUTE_NEW end_spec dist_name dist_format_clause opt_key_word opt_onto
-            { PTR_LLND q,p;
-              q = set_ll_list($3,LLNULL,EXPR_LIST);
-	      p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              p->entry.string_val = (char *) "new";
-              p->type = global_string;
-	      $$ = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,$6,q,$4,p);
-            }
-               | REDISTRIBUTE_NEW end_spec dist_format_clause  opt_key_word opt_onto COLON COLON dist_name_list
-	    { PTR_LLND p;
-	      p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              p->entry.string_val = (char *) "new";
-              p->type = global_string;
-              $$ = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,$5,$8,$3,p); }
-*/    
-            ;
-
-dist_name_list: distributee
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | dist_name_list COMMA distributee
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-distributee: dist_name
-             {$$ = $1;}
-           | pointer_ar_elem
-             {$$ = $1;}
-           ;
-
-dist_name: name 
-       {  PTR_SYMB s;
- 
-          if(parstate == INEXEC){
-            if (!(s = $1->id_attr))
-              {
-	         s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-	     	 s->decl = SOFT;
-	      } 
-            if(s->attr & PROCESSORS_BIT)
-              errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);
-            if(s->attr & TASK_BIT)
-              errstr( "Illegal use of task array name %s ", s->ident, 71);
-
-          } else {
-            s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-            if(s->attr & DISTRIBUTE_BIT)
-              errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-            else if( (s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & INHERIT_BIT))
-              errstr("Inconsistent declaration of identifier  %s",s->ident, 16);
-            else
-              s->attr = s->attr | DISTRIBUTE_BIT;
-          } 
-         if(s->attr & ALIGN_BIT)
-               errstr("A distributee may not have the ALIGN attribute:%s",s->ident, 54);
-          $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);               	  
-	}
-        ;
-
-pointer_ar_elem: name LEFTPAR subscript_list RIGHTPAR
-       {  PTR_SYMB s;
-          s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-        
-          if(parstate != INEXEC) 
-               errstr( "Illegal distributee:%s", s->ident, 312);
-          else {
-            if(s->attr & PROCESSORS_BIT)
-               errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);  
-            if(s->attr & TASK_BIT)
-               errstr( "Illegal use of task array name %s ", s->ident, 71);        
-            if(s->attr & ALIGN_BIT)
-               errstr("A distributee may not have the ALIGN attribute:%s",s->ident, 54);
-            if(!(s->attr & DVM_POINTER_BIT))
-               errstr("Illegal distributee:%s", s->ident, 312);
-          /*s->attr = s->attr | DISTRIBUTE_BIT;*/
-	  $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, s); 
-          }
-        
-	}
-        ;
-
-
-processors_name: name 
-       {  PTR_SYMB s;
-          if((s=$1->id_attr) == SMNULL)
-            s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-          if((parstate == INEXEC) && !(s->attr & PROCESSORS_BIT))
-               errstr( "'%s' is not processor array ", s->ident, 67);
-	  $$ = s;
-	}
-        ;
-/*
-opt_aster:
-          {$$ = LLNULL;} 
-         | ASTER
-          { 
-            $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-            $$->entry.string_val = (char *) "*";
-            $$->type = global_string;
-          }
-          ; 
-*/
-opt_dist_format_clause: 
-                       { $$ = LLNULL;  }
-                      | dist_format_clause opt_key_word 
-                        { $$ = $1;}
-                      ; 
- 
-dist_format_clause: LEFTPAR dist_format_list RIGHTPAR
-                      { $$ = $2;}
-                  ;
-/*opt_dist_format_clause: dist_format_clause
-                      { (void)fprintf(stderr,"hpf.gram:opt_dist_format_clause\n");
-                         $$ = $1;}
-                      | ASTER dist_format_clause
-                      { PTR_LLND q;
-                         q = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-                         q->entry.string_val = (char *) "*";
-                         q->type = global_string;
-                      (void)fprintf(stderr,"hpf.gram: * opt_dist_format_clause\n");
-                       $$ = make_llnd(fi,ARRAY_OP, q, $2, SMNULL);} 
-                      | ASTER 
-           {         
-             $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-             $$->entry.string_val = (char *) "*";
-             $$->type = global_string;
-           } 
-                  ; 
-*/
-dist_format_list: opt_key_word dist_format
-	    { $$ = set_ll_list($2,LLNULL,EXPR_LIST); }
-                | dist_format_list COMMA opt_key_word dist_format
-	    { $$ = set_ll_list($1,$4,EXPR_LIST); }	    
-	        ;
-opt_key_word:
-            { opt_kwd_ = YES; }
-            ;
-/*
-no_opt_key_word:
-            { opt_kwd_ = NO; }
-	     ;	     
-*/
-
-dist_format:   BLOCK
-        {  
-               $$ = make_llnd(fi,BLOCK_OP, LLNULL, LLNULL, SMNULL);
-        }
-           |   BLOCK LEFTPAR in_ioctl shadow_width  RIGHTPAR
-        {  err("Distribution format BLOCK(n) is not permitted in FDVM", 55);
-          $$ = make_llnd(fi,BLOCK_OP, $4, LLNULL, SMNULL);
-          endioctl();
-        }
-           |   GEN_BLOCK LEFTPAR array_name RIGHTPAR
-        { $$ = make_llnd(fi,BLOCK_OP, LLNULL, LLNULL, $3); }  
-           |   WGT_BLOCK LEFTPAR array_name COMMA expr RIGHTPAR
-        { $$ = make_llnd(fi,BLOCK_OP,  $5,  LLNULL,  $3); }   
-           |   MULT_BLOCK LEFTPAR  expr RIGHTPAR
-        { $$ = make_llnd(fi,BLOCK_OP,  LLNULL, $3,  SMNULL); } 
-           |  ASTER
-        { 
-          $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-          $$->entry.string_val = (char *) "*";
-          $$->type = global_string;
-        }
-           |  INDIRECT LEFTPAR array_name RIGHTPAR 
-        { $$ = make_llnd(fi,INDIRECT_OP, LLNULL, LLNULL, $3); }     
-           |  DERIVED LEFTPAR derived_spec RIGHTPAR 
-        { $$ = make_llnd(fi,INDIRECT_OP, $3, LLNULL, SMNULL); }     
-           ;
-
-array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-       
-	      $$ = s;
-	   }
-           ;
-
-derived_spec: LEFTPAR derived_elem_list  RIGHTPAR needkeyword WITH target_spec 
-            { $$ = make_llnd(fi,DERIVED_OP, $2, $6, SMNULL); }
-            ;
-
-derived_elem_list: derived_elem 
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | derived_elem_list COMMA derived_elem 
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-
-             ;
-
-derived_elem: expr
-              { $$ = $1;}
-            | expr COLON expr
-              { $$ = make_llnd(fi,DDOT, $1, $3, SMNULL);} 
-            ;
-
-target_spec: derived_target 
-            { 
-              $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, $1);
-	    }
-            | derived_target LEFTPAR derived_subscript_list RIGHTPAR
-            { 
-              $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, $1);
-	    }
-            ;
-
-derived_target:  name 
-            { 
-              if (!($$ = $1->id_attr))
-              {
-	         $$ = make_array($1, TYNULL, LLNULL,0,LOCAL);
-	         $$->decl = SOFT;
-	      } 
-            }
-            ;
-
-derived_subscript_list: derived_subscript
-	                { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                      | derived_subscript_list COMMA derived_subscript
-	                { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-                      ;
-
-derived_subscript:  expr
-                   {  $$ = $1;}
-                 |  aster_expr
-                   {  $$ = $1;}
-                 |  AT dummy_ident opt_plus_shadow
-                   {
-                      $2->entry.Template.ll_ptr1 = $3; 
-                      $$ = $2;   
-                   }     
-                 ;
-
-dummy_ident: name
-          { PTR_SYMB s;
-            s = make_scalar($1,TYNULL,LOCAL);
-	    $$ = make_llnd(fi,DUMMY_REF, LLNULL, LLNULL, s);
-            /*$$->type = global_int;*/
-          }
-          ; 
-/*
-dummy_ident: IDENTIFIER
-           {
-                    PTR_HASH hash_entry;
-                    hash_entry = just_look_up_sym_in_scope(cur_scope(),yytext);
-                    if
-           }
-           ;
-*/
-
-opt_plus_shadow: 
-               {  $$ = LLNULL; }
-               | plus_shadow
-               {  $$ = $1; }
-               ; 
-
-plus_shadow: PLUS shadow_id
-           {  $$ = set_ll_list($2,LLNULL,EXPR_LIST); }
-           | opt_plus_shadow PLUS shadow_id
-           {  $$ = set_ll_list($1,$3,EXPR_LIST); }
-           ;
- 
-shadow_id:  expr
-            {  if($1->type->variant != T_STRING)
-                 errstr( "Illegal type of shadow_name", 627);
-               $$ = $1; 
-            }
-         ;
-
-shadow_width: nameeq expr
-        { char *q;
-          nioctl = 1;
-          q = $1->entry.string_val;
-          if((!strcmp(q,"shadow")) && ($2->variant == INT_VAL))                          $$ = make_llnd(fi,SPEC_PAIR, $1, $2, SMNULL);
-          else
-          {  err("Illegal shadow width specification", 56);
-             $$ = LLNULL;
-          }
-        }
-           | nameeq expr COMMA nameeq expr 
-        { char *ql, *qh;
-          PTR_LLND p1, p2;
-          nioctl = 2;
-          ql = $1->entry.string_val;
-          qh = $4->entry.string_val;
-          if((!strcmp(ql,"low_shadow")) && ($2->variant == INT_VAL) && (!strcmp(qh,"high_shadow")) && ($5->variant == INT_VAL)) 
-              {
-                 p1 = make_llnd(fi,SPEC_PAIR, $1, $2, SMNULL);
-                 p2 = make_llnd(fi,SPEC_PAIR, $4, $5, SMNULL);
-                 $$ = make_llnd(fi,CONS, p1, p2, SMNULL);
-              } 
-          else
-          {  err("Illegal shadow width specification", 56);
-             $$ = LLNULL;
-          }
-        }
-          ;
-
-/*
-opt_new_value_spec:
-                     {$$ = LLNULL;}
-                  |  COMMA needkeyword NEW_VALUE
-                     {$$ = make_llnd(fi,NEW_VALUE_OP, LLNULL, LLNULL, SMNULL);}
-                  |  COMMA needkeyword NEW_VALUE LEFTPAR  array_ident_list RIGHTPAR
-                     {$$ = make_llnd(fi,NEW_VALUE_OP, $5, LLNULL, SMNULL);}
-                  ;
-*/
-
-dvm_align:  ALIGN in_dcl alignee align_directive_stuff
-	    { PTR_LLND q;
-              q = set_ll_list($3,LLNULL,EXPR_LIST);
-              $$ = $4;
-              $$->entry.Template.ll_ptr1 = q;
-            }
-           /*
-            *|  ALIGN in_dcl  align_directive_stuff COLON COLON alignee_list
-	    * { 
-            *   $$ = $3;
-            *   $$->entry.Template.ll_ptr1 = $6;
-            * }
-            */
-	;
-
-dvm_realign:  REALIGN end_spec realignee align_directive_stuff 
-	    { PTR_LLND q;
-              q = set_ll_list($3,LLNULL,EXPR_LIST);
-              $$ = $4;
-              $$->variant = DVM_REALIGN_DIR; 
-              $$->entry.Template.ll_ptr1 = q;
-            }
-           |  REALIGN end_spec  align_directive_stuff COLON COLON realignee_list
-	    {
-              $$ = $3;
-              $$->variant = DVM_REALIGN_DIR; 
-              $$->entry.Template.ll_ptr1 = $6;
-            }
-        /*
-           |  REALIGN_WITH end_spec  align_base COLON COLON realignee_list
-	    { $$ = get_bfnd(fi,DVM_REALIGN_DIR,SMNULL,$6,LLNULL,$3);}
-         */
-	   ;
-/*
-alignee_list: alignee
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | alignee_list COMMA alignee
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-*/
-realignee_list: realignee
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | realignee_list COMMA realignee
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-alignee: name
-       {  PTR_SYMB s;
-          s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-          if((s->attr & ALIGN_BIT)) 
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-          if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & INHERIT_BIT)) 
-                errstr( "Inconsistent declaration of identifier  %s", s->ident, 16); 
-          else  if(s->attr & DISTRIBUTE_BIT)
-               errstr( "An alignee may not have the DISTRIBUTE attribute:'%s'", s->ident,57);             else
-                s->attr = s->attr | ALIGN_BIT;     
-	  $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	}
-        ;
-  
-realignee: ident
-       {PTR_SYMB s;
-        s = $1->entry.Template.symbol;
-        if(s->attr & PROCESSORS_BIT)
-               errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);
-        else  if(s->attr & TASK_BIT)
-              errstr( "Illegal use of task array name %s ", s->ident, 71);
-        else if( !(s->attr & DIMENSION_BIT) && !(s->attr & DVM_POINTER_BIT))
-            errstr("The alignee %s isn't an array", s->ident, 58);
-        else {
-            /*  if(!(s->attr & DYNAMIC_BIT))
-                 errstr("'%s' hasn't the DYNAMIC attribute", s->ident, 59);
-             */
-              if(!(s->attr & ALIGN_BIT) && !(s->attr & INHERIT_BIT))
-                 errstr("'%s' hasn't the ALIGN attribute", s->ident, 60);
-              if(s->attr & DISTRIBUTE_BIT)
-                 errstr("An alignee may not have the DISTRIBUTE attribute: %s", s->ident, 57);
-
-/*               if(s->entry.var_decl.local == IO)
- *                 errstr("An alignee may not be the dummy argument");
-*/
-          }
-	  $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	}
-        ;
-
-align_directive_stuff: LEFTPAR dim_ident_list RIGHTPAR needkeyword WITH align_base 
-           { /* PTR_LLND r;
-              if($7) {
-                r = set_ll_list($6,LLNULL,EXPR_LIST);
-                r = set_ll_list(r,$7,EXPR_LIST);
-              }
-              else
-                r = $6;
-              */
-            $$ = get_bfnd(fi,DVM_ALIGN_DIR,SMNULL,LLNULL,$2,$6);
-           }  
-                     ;
-
-align_base:  align_base_name LEFTPAR align_subscript_list RIGHTPAR
-	  {
-           $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, $1);        
-          } 
-/*
-          |  align_base_name
-          {PTR_LLND q;
-           q = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, $2);
-           if($1)
-               $$ = make_llnd(fi,ARRAY_OP, $1, q, SMNULL);
-           else
-               $$ = q;
-          } 
-*/
-          ;
-
-align_subscript_list: align_subscript
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | align_subscript_list COMMA align_subscript
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-                    ;
-align_subscript:  expr
-                 { $$ = $1;}
-               | ASTER
-                 {
-                  $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-                  $$->entry.string_val = (char *) "*";
-                  $$->type = global_string;
-                 }
-               | triplet
-                 { $$ = $1;}
-               ;
- 
-align_base_name: name
-       { 
-         /* if(parstate == INEXEC){ *for REALIGN directive*
-              if (!($$ = $1->id_attr))
-              {
-	         $$ = make_array($1, TYNULL, LLNULL,0,LOCAL);
-	     	 $$->decl = SOFT;
-	      } 
-          } else
-             $$ = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-          */
-          if (!($$ = $1->id_attr))
-          {
-	       $$ = make_array($1, TYNULL, LLNULL,0,LOCAL);
-	       $$->decl = SOFT;
-	  } 
-          $$->attr = $$->attr | ALIGN_BASE_BIT;
-          if($$->attr & PROCESSORS_BIT)
-               errstr( "Illegal use of PROCESSORS name %s ", $$->ident, 53);
-          else  if($$->attr & TASK_BIT)
-               errstr( "Illegal use of task array name %s ", $$->ident, 71);
-          else
-          if((parstate == INEXEC) /* for  REALIGN directive */
-             &&   !($$->attr & DIMENSION_BIT) && !($$->attr & DVM_POINTER_BIT))
-            errstr("The align-target %s isn't declared as array", $$->ident, 61); 
-         }  
-              ;
-
-dim_ident_list: dim_ident
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | dim_ident_list COMMA dim_ident
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-dim_ident: name
-          { PTR_SYMB s;
-            s = make_scalar($1,TYNULL,LOCAL);
-            if(s->type->variant != T_INT || s->attr & PARAMETER_BIT)             
-              errstr("The align-dummy %s isn't a scalar integer variable", s->ident, 62); 
-	   $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-           $$->type = global_int;
-         }  
-           |  ASTER
-        {  
-          $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-          $$->entry.string_val = (char *) "*";
-          $$->type = global_string;
-        }
-           |  COLON
-        {   $$ = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL); }   
-        ;
-dvm_combined_dir: dvm_attribute_list COLON COLON  in_dcl name dims
-                   { PTR_SYMB s;
-	             PTR_LLND q, r, p;
-                     int numdim;
-                     if(type_options & PROCESSORS_BIT) {    /* 27.06.18 || (type_options & TEMPLATE_BIT)){ */
-                       if(! explicit_shape) {
-                         err("Explicit shape specification is required", 50);
-		         /*$$ = BFNULL;*/
-	               }
-                     } 
-
-                    /*  else {
-                       if($6)
-                         err("Shape specification is not permitted", 263);
-                     } */
-
-                     if(type_options & DIMENSION_BIT)
-                       { p = attr_dims; numdim = attr_ndim;}
-                     else
-                       { p = LLNULL; numdim = 0; }
-                     if($6)          /*dimension information after the object name*/
-                     { p = $6; numdim = ndim;} /*overrides the DIMENSION attribute */
-	             s = make_array($5, TYNULL, p, numdim, LOCAL);
-
-                     if((type_options & COMMON_BIT) && !(type_options & TEMPLATE_BIT))
-                     {
-                        err("Illegal combination of attributes", 63);
-                        type_options = type_options & (~COMMON_BIT);
-                     }
-                     if((type_options & PROCESSORS_BIT) &&((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT) ))
-                        err("Illegal combination of attributes", 63);
-                     else  if((type_options & PROCESSORS_BIT) && ((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT)) )
-                     {  errstr("Inconsistent declaration of  %s", s->ident, 16);
-                        type_options = type_options & (~PROCESSORS_BIT);
-                     }
-                     else if ((s->attr & PROCESSORS_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT))) 
-                        errstr("Inconsistent declaration of  %s", s->ident, 16);
-                     else if ((s->attr & INHERIT_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT)))
-                        errstr("Inconsistent declaration of  %s", s->ident, 16);
-                     if(( s->attr & DISTRIBUTE_BIT) &&  (type_options & DISTRIBUTE_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & ALIGN_BIT) &&  (type_options & ALIGN_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & SHADOW_BIT) &&  (type_options & SHADOW_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & TEMPLATE_BIT) &&  (type_options & TEMPLATE_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & PROCESSORS_BIT) &&  (type_options & PROCESSORS_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-	             s->attr = s->attr | type_options;
-                     if($6) s->attr = s->attr | DIMENSION_BIT;
-                     if((s->attr & DISTRIBUTE_BIT) && (s->attr & ALIGN_BIT))
-                       errstr("%s has the DISTRIBUTE and ALIGN attribute",s->ident, 64);
-	             q = make_llnd(fi,ARRAY_REF, $6, LLNULL, s);
-	             if(p) s->type->entry.ar_decl.ranges = p;
-	             r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	             $$ = get_bfnd(fi,DVM_VAR_DECL, SMNULL, r, LLNULL,$1);
-	            }
-                | dvm_combined_dir COMMA name dims
-                   { PTR_SYMB s;
-	             PTR_LLND q, r, p;
-                     int numdim;
-                    if(type_options & PROCESSORS_BIT) { /*23.10.18  || (type_options & TEMPLATE_BIT)){ */
-                       if(! explicit_shape) {
-                         err("Explicit shape specification is required", 50);
-		         /*$$ = BFNULL;*/
-	               }
-                     } 
-                    /* else {
-                       if($4)
-                         err("Shape specification is not permitted", 263);
-                     } */
-                     if(type_options & DIMENSION_BIT)
-                       { p = attr_dims; numdim = attr_ndim;}
-                     else
-                       { p = LLNULL; numdim = 0; }
-                     if($4)                   /*dimension information after the object name*/
-                     { p = $4; numdim = ndim;}/*overrides the DIMENSION attribute */
-	             s = make_array($3, TYNULL, p, numdim, LOCAL);
-
-                     if((type_options & COMMON_BIT) && !(type_options & TEMPLATE_BIT))
-                     {
-                        err("Illegal combination of attributes", 63);
-                        type_options = type_options & (~COMMON_BIT);
-                     }
-                     if((type_options & PROCESSORS_BIT) &&((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT) ))
-                       err("Illegal combination of attributes", 63);
-                     else  if((type_options & PROCESSORS_BIT) && ((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT)) )
-                     {  errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-                        type_options = type_options & (~PROCESSORS_BIT);
-                     }
-                     else if ((s->attr & PROCESSORS_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT))) 
-                          errstr("Inconsistent declaration of identifier  %s", s->ident,16);
-                     else if ((s->attr & INHERIT_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT)))
-                          errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-                     if(( s->attr & DISTRIBUTE_BIT) &&  (type_options & DISTRIBUTE_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & ALIGN_BIT) &&  (type_options & ALIGN_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & SHADOW_BIT) &&  (type_options & SHADOW_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & TEMPLATE_BIT) &&  (type_options & TEMPLATE_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & PROCESSORS_BIT) &&  (type_options & PROCESSORS_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);   
-	             s->attr = s->attr | type_options;
-                     if($4) s->attr = s->attr | DIMENSION_BIT;
-                     if((s->attr & DISTRIBUTE_BIT) && (s->attr & ALIGN_BIT))
-                           errstr("%s has the DISTRIBUTE and ALIGN attribute",s->ident, 64);
-	             q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	             if(p) s->type->entry.ar_decl.ranges = p;
-	             r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	             add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	            }
-                ;
-         
-/*dvm_attribute_list: { type_options = 0; attr_ndim = 0; attr_dims = LLNULL;} dvm_attribute
-	    { $$ = set_ll_list($2,LLNULL,EXPR_LIST); }
-              | dvm_attribute_list COMMA needkeyword dvm_attribute
-	    { $$ = set_ll_list($1,$4,EXPR_LIST); }	
-                 ;
-*/
-dvm_attribute_list:  dvm_attribute
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); type_options = type_opt; }
-              | dvm_attribute_list COMMA needkeyword dvm_attribute
-	    { $$ = set_ll_list($1,$4,EXPR_LIST); type_options = type_options | type_opt;}
-                 ;
-dvm_attribute: HPF_TEMPLATE
-               { type_opt = TEMPLATE_BIT;
-               $$ = make_llnd(fi,TEMPLATE_OP,LLNULL,LLNULL,SMNULL);
-               } 
-             | HPF_PROCESSORS
-               { type_opt = PROCESSORS_BIT;
-                $$ = make_llnd(fi,PROCESSORS_OP,LLNULL,LLNULL,SMNULL);
-               } 
-             | OMPDVM_NODES
-               { type_opt = PROCESSORS_BIT;
-                $$ = make_llnd(fi,PROCESSORS_OP,LLNULL,LLNULL,SMNULL);
-               } 
-             | DYNAMIC
-               { type_opt = DYNAMIC_BIT;
-                $$ = make_llnd(fi,DYNAMIC_OP,LLNULL,LLNULL,SMNULL);
-               } 
-            /* | DIMENSION dims
-               {
-                if(! explicit_shape) {
-                  err("Explicit shape specification is required", 50);
-                }
-                if(! $2) {
-                  err("No shape specification", 65);
-	        }
-                type_opt = DIMENSION_BIT;
-                attr_ndim = ndim; attr_dims = $2;
-                $$ = make_llnd(fi,DIMENSION_OP,$2,LLNULL,SMNULL);
-	       }*/
-
-            | DIMENSION LEFTPAR dimlist RIGHTPAR
-               {
-                if(! explicit_shape) {
-                  err("Explicit shape specification is required", 50);
-                }
-                if(! $3) {
-                  err("No shape specification", 65);
-	        }
-                type_opt = DIMENSION_BIT;
-                attr_ndim = ndim; attr_dims = $3;
-                $$ = make_llnd(fi,DIMENSION_OP,$3,LLNULL,SMNULL);
-	       }
-              | SHADOW shadow_attr_stuff
-                { type_opt = SHADOW_BIT;
-                  $$ = make_llnd(fi,SHADOW_OP,$2,LLNULL,SMNULL);
-                 } 
-              | ALIGN LEFTPAR dim_ident_list RIGHTPAR needkeyword WITH align_base
-                 { type_opt = ALIGN_BIT;
-                  $$ = make_llnd(fi,ALIGN_OP,$3,$7,SMNULL);
-                 } 
-              | ALIGN 
-                { type_opt = ALIGN_BIT;
-                  $$ = make_llnd(fi,ALIGN_OP,LLNULL,SMNULL,SMNULL);
-                }
-/*
-              | ALIGN_WITH align_base
-                { type_opt = ALIGN_BIT;
-                  $$ = make_llnd(fi,ALIGN_OP,LLNULL,$2,SMNULL);
-                }
-*/
-              | DISTRIBUTE  dist_format_clause opt_key_word  opt_onto 
-	        { 
-                 type_opt = DISTRIBUTE_BIT;
-                 $$ = make_llnd(fi,DISTRIBUTE_OP,$2,$4,SMNULL);
-                } 
-              | DISTRIBUTE  
-	        { 
-                 type_opt = DISTRIBUTE_BIT;
-                 $$ = make_llnd(fi,DISTRIBUTE_OP,LLNULL,LLNULL,SMNULL);
-                } 
-              | COMMON
-                {
-                 type_opt = COMMON_BIT;
-                 $$ = make_llnd(fi,COMMON_OP, LLNULL, LLNULL, SMNULL);
-                }
-               ; 
-
-dvm_pointer: type COMMA needkeyword DVM_POINTER in_dcl LEFTPAR dimension_list RIGHTPAR COLON COLON pointer_var_list
-           { 
-	      PTR_LLND  l;
-	      l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-	      l->type = $1;
-	      $$ = get_bfnd(fi,DVM_POINTER_DIR, SMNULL, $11,$7, l);
-	    }
-           ;
-
-dimension_list: {ndim = 0;} COLON
-	    { PTR_LLND  q;
-             if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		q = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL);
-	      ++ndim;
-              $$ = set_ll_list(q, LLNULL, EXPR_LIST);
-	       /*$$ = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);*/
-	       /*$$->type = global_default;*/
-	    }
-	| dimension_list COMMA COLON
-	    { PTR_LLND  q;
-             if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		q = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL);
-	      ++ndim;
-              $$ = set_ll_list($1, q, EXPR_LIST);
-            }
-	;
-
-pointer_var_list: pointer_var
-	          { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                |  pointer_var_list COMMA  pointer_var
-	          { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	        ;
-
-pointer_var: name
-           {PTR_SYMB s;
-           /* s = make_scalar($1,TYNULL,LOCAL);*/
-            s = make_array($1,TYNULL,LLNULL,0,LOCAL);
-            s->attr = s->attr | DVM_POINTER_BIT;
-            if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & INHERIT_BIT))
-               errstr( "Inconsistent declaration of identifier %s", s->ident, 16);     
-            $$ = make_llnd(fi,VAR_REF,LLNULL,LLNULL,s);
-            }
-            ;
-
-dvm_heap: HEAP in_dcl  heap_array_name_list
-           { $$ = get_bfnd(fi,DVM_HEAP_DIR, SMNULL, $3, LLNULL, LLNULL);}
-           ;
-
-heap_array_name_list: heap_array_name
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | heap_array_name_list COMMA heap_array_name
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-heap_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              s->attr = s->attr | HEAP_BIT;
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT) || (s->attr & INHERIT_BIT) || (s->attr & DYNAMIC_BIT) || (s->attr & SHADOW_BIT) || (s->attr & DVM_POINTER_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-      
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;
-
-dvm_consistent: CONSISTENT in_dcl  consistent_array_name_list
-           { $$ = get_bfnd(fi,DVM_CONSISTENT_DIR, SMNULL, $3, LLNULL, LLNULL);}
-           ;
-
-consistent_array_name_list: consistent_array_name
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | consistent_array_name_list COMMA consistent_array_name
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-consistent_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              s->attr = s->attr | CONSISTENT_BIT;
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT) || (s->attr & INHERIT_BIT) || (s->attr & DYNAMIC_BIT) || (s->attr & SHADOW_BIT) || (s->attr & DVM_POINTER_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-      
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;
-
-
-dvm_asyncid: ASYNCID in_dcl  async_id_list
-            { $$ = get_bfnd(fi,DVM_ASYNCID_DIR, SMNULL, $3, LLNULL, LLNULL);}
-	   | ASYNCID in_dcl COMMA needkeyword COMMON COLON COLON async_id_list 
-            { PTR_LLND p;
-              p = make_llnd(fi,COMM_LIST, LLNULL, LLNULL, SMNULL);              
-              $$ = get_bfnd(fi,DVM_ASYNCID_DIR, SMNULL, $8, p, LLNULL);
-            }
-           ;
-
-async_id_list: async_id
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | async_id_list COMMA async_id
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	     ;
-
-async_id: name dims
-           {  PTR_SYMB s;
-              if($2){
-                  s = make_array($1, global_default, $2, ndim, LOCAL);
-		  s->variant = ASYNC_ID;
-                  s->attr = s->attr | DIMENSION_BIT;
-                  s->type->entry.ar_decl.ranges = $2;
-                  $$ = make_llnd(fi,ARRAY_REF, $2, LLNULL, s);
-              } else {
-              s = make_local_entity($1, ASYNC_ID, global_default, LOCAL);
-	      $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-              }
-	   }
-           ;
-
-
-dvm_new_value: NEW_VALUE  end_spec
-               { $$ = get_bfnd(fi,DVM_NEW_VALUE_DIR,SMNULL, LLNULL, LLNULL,LLNULL);} 
-          /* | NEW_VALUE  end_spec array_ident_list
-               { $$ = get_bfnd(fi,DVM_NEW_VALUE_DIR,SMNULL, $3, LLNULL,LLNULL);}
-           */
-             ;
-
-
-dvm_parallel_on: PARALLEL end_spec LEFTPAR ident_list RIGHTPAR opt_on opt_spec 
- 
-
-                 {  if($6 &&  $6->entry.Template.symbol->attr & TASK_BIT)
-                        $$ = get_bfnd(fi,DVM_PARALLEL_TASK_DIR,SMNULL,$6,$7,$4);
-                    else
-                        $$ = get_bfnd(fi,DVM_PARALLEL_ON_DIR,SMNULL,$6,$7,$4);
-                 }
-               ;
-
-
-ident_list: ident
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | ident_list COMMA ident
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-opt_on:   opt_key_word ON distribute_cycles 
-          { $$ = $3;}
-                       
-	| opt_key_word 
-            { $$ = LLNULL; opt_kwd_ = NO;}
-	    
-	;
-
-distribute_cycles: ident LEFTPAR par_subscript_list RIGHTPAR
-        {
-          if($1->type->variant != T_ARRAY) 
-             errstr("'%s' isn't array", $1->entry.Template.symbol->ident, 66);
-          $1->entry.Template.ll_ptr1 = $3;
-          $$ = $1;
-          $$->type = $1->type->entry.ar_decl.base_type;
-        }
-        ;
-
-par_subscript_list: par_subscript
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | par_subscript_list COMMA par_subscript
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-par_subscript: expr
-            { $$ = $1;}
-             | ASTER
-            {
-             $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-             $$->entry.string_val = (char *) "*";
-             $$->type = global_string;
-            }
-             ;
-
-opt_spec:
-          {  $$ = LLNULL;}
-        | spec_list
-          { $$ = $1;}
-        ;
-
-spec_list:     par_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | spec_list par_spec
-	       { $$ = set_ll_list($1,$2,EXPR_LIST); }	
-             ;
-           
-
-par_spec: new_spec
-        | reduction_spec
-        | shadow_spec
-        | remote_access_spec
-        | indirect_access_spec
-        | across_spec
-        | stage_spec
-        | consistent_spec
-        | private_spec     /*ACC*/
-        | cuda_block_spec  /*ACC*/
-        | tie_spec         /*ACC*/
-        ;
-
-remote_access_spec:  COMMA needkeyword REMOTE_ACCESS_SPEC LEFTPAR group_name COLON remote_data_list RIGHTPAR
-                        { if($5->attr & INDIRECT_BIT)
-                            errstr("'%s' is not remote group name", $5->ident, 68);
-                          $$ = make_llnd(fi,REMOTE_ACCESS_OP,$7,LLNULL,$5);
-                        }
-                  |  COMMA needkeyword REMOTE_ACCESS_SPEC LEFTPAR remote_data_list RIGHTPAR
-                        { $$ = make_llnd(fi,REMOTE_ACCESS_OP,$5,LLNULL,SMNULL);}
-                      ;
-
-consistent_spec:  COMMA needkeyword CONSISTENT_SPEC LEFTPAR consistent_group COLON remote_data_list RIGHTPAR
-                        {
-                          $$ = make_llnd(fi,CONSISTENT_OP,$7,LLNULL,$5);
-                        }
-                  |  COMMA needkeyword CONSISTENT_SPEC LEFTPAR remote_data_list RIGHTPAR
-                        { $$ = make_llnd(fi,CONSISTENT_OP,$5,LLNULL,SMNULL);}
-                      ;
-
-consistent_group: name
-          {  
-            if(($$=$1->id_attr) == SMNULL){
-                errstr("'%s' is not declared as group", $1->ident, 74);
-                $$ = make_local_entity($1,CONSISTENT_GROUP_NAME,global_default,LOCAL);
-            } else {
-                if($$->variant != CONSISTENT_GROUP_NAME)
-                   errstr("'%s' is not declared as group", $1->ident, 74);
-            }
-          }
-          ;
-
-
-new_spec: COMMA needkeyword NEW LEFTPAR variable_list RIGHTPAR
-              {$$ = make_llnd(fi,NEW_SPEC_OP,$5,LLNULL,SMNULL);}
-/*	| COMMA needkeyword PRIVATE LEFTPAR variable_list RIGHTPAR
-	      {$$ = make_llnd(fi,NEW_SPEC_OP,$5,LLNULL,SMNULL);} */  /*OMP*/
-        | COMMA needkeyword OMPDVM_FIRSTPRIVATE LEFTPAR variable_list RIGHTPAR
-              {$$ = make_llnd(fi,NEW_SPEC_OP,$5,LLNULL,SMNULL);}   /*OMP*/
-        ;
-
-private_spec: COMMA needkeyword PRIVATE LEFTPAR variable_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_PRIVATE_OP,$5,LLNULL,SMNULL);}  /*ACC*/
-            ;
-
-cuda_block_spec: COMMA needkeyword ACC_CUDA_BLOCK LEFTPAR sizelist RIGHTPAR
-                { $$ = make_llnd(fi,ACC_CUDA_BLOCK_OP,$5,LLNULL,SMNULL);} /*ACC*/
-               ;
-sizelist:  expr
-           { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}        /*ACC*/
-        |  expr COMMA expr
-           {$$ = set_ll_list($1,$3,EXPR_LIST);}            /*ACC*/
-        |  expr COMMA expr COMMA expr
-           {$$ = set_ll_list($1,$3,EXPR_LIST); $$ = set_ll_list($$,$5,EXPR_LIST);} /*ACC*/
-        ;
-
-variable_list: lhs
-               { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-             | variable_list COMMA lhs
-               { $$ = set_ll_list($1,$3,EXPR_LIST);}
-             ;
-
-tie_spec: COMMA needkeyword ACC_TIE LEFTPAR tied_array_list RIGHTPAR
-         { $$ = make_llnd(fi,ACC_TIE_OP,$5,LLNULL,SMNULL);} /*ACC*/
-        ;
-
-tied_array_list: distribute_cycles
-                 { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-               | tied_array_list COMMA distribute_cycles
-                 { $$ = set_ll_list($1,$3,EXPR_LIST);}
-               ;
-
-indirect_access_spec: COMMA needkeyword INDIRECT_ACCESS LEFTPAR group_name COLON indirect_list RIGHTPAR 
-                    { if(!($5->attr & INDIRECT_BIT))
-                         errstr("'%s' is not indirect group name", $5->ident, 313);
-                      $$ = make_llnd(fi,INDIRECT_ACCESS_OP,$7,LLNULL,$5);
-                    }
-                   |  COMMA needkeyword INDIRECT_ACCESS LEFTPAR  indirect_list RIGHTPAR 
-                        { $$ = make_llnd(fi,INDIRECT_ACCESS_OP,$5,LLNULL,SMNULL);}
-                   ;
-
-stage_spec:  COMMA needkeyword STAGE LEFTPAR expr RIGHTPAR
-              {$$ = make_llnd(fi,STAGE_OP,$5,LLNULL,SMNULL);}
-          ;
-
-across_spec: COMMA needkeyword ACROSS in_out_across
-               {$$ = make_llnd(fi,ACROSS_OP,$4,LLNULL,SMNULL);}
-           | COMMA needkeyword ACROSS in_out_across in_out_across
-               {$$ = make_llnd(fi,ACROSS_OP,$4,$5,SMNULL);}
-           ;
-
-in_out_across:  LEFTPAR opt_keyword_in_out opt_in_out dependent_array_list RIGHTPAR
-                {  if($3)
-                     $$ = make_llnd(fi,DDOT,$3,$4,SMNULL);
-                   else
-                     $$ = $4;
-                }
-             ;
-
-opt_keyword_in_out:
-            { opt_in_out = YES; }
-            ;
-
-opt_in_out:  IN  COLON
-            {
-	      $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "in";
-              $$->type = global_string;
-            }
-          |  OUT COLON
-            {
-	      $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "out";
-              $$->type = global_string;
-            }
-          |
-            {  $$ = LLNULL; opt_in_out = NO;}
-          ;
-
-dependent_array_list: dependent_array
-            { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-             | dependent_array_list COMMA dependent_array 
-            { $$ = set_ll_list($1,$3,EXPR_LIST);}
-             ;
-
-dependent_array: array_ident
-                 { $$ = $1;}
-               | array_ident LEFTPAR dependence_list RIGHTPAR
-                  { $$ = $1;
-                    $$-> entry.Template.ll_ptr1 = $3;  
-                  }
-               | array_ident LEFTPAR dependence_list RIGHTPAR LEFTPAR section_spec_list RIGHTPAR
-                 { /*  PTR_LLND p;
-                       p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-                       p->entry.string_val = (char *) "corner";
-                       p->type = global_string;
-                   */
-                   $1-> entry.Template.ll_ptr1 = $3;  
-                   $$ = make_llnd(fi,ARRAY_OP,$1,$6,SMNULL);
-                 }
-
-               ;  
- 
-dependence_list: dependence
-            { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-             | dependence_list COMMA dependence 
-            { $$ = set_ll_list($1,$3,EXPR_LIST);}
-             ; 
-  
-dependence:  expr COLON expr
-             { $$ = make_llnd(fi,DDOT, $1, $3, SMNULL);}
-          ;      
-
-section_spec_list: section_spec
-              { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-            | section_spec_list COMMA  section_spec
-              { $$ = set_ll_list($1,$3,EXPR_LIST);}
-            ;
-
-section_spec: ar_section COLON low_section COLON high_section 
-             { $$ = make_llnd(fi,DDOT,$1,make_llnd(fi,DDOT,$3,$5,SMNULL),SMNULL); } 
-            |  ar_section COLON low_section  
-             { $$ = make_llnd(fi,DDOT,$1,make_llnd(fi,DDOT,$3,LLNULL,SMNULL),SMNULL); } 
-            | ar_section COLON high_section
-             { $$ = make_llnd(fi,DDOT,$1,make_llnd(fi,DDOT,LLNULL,$3,SMNULL),SMNULL); } 
-            | ar_section
-             { $$ = make_llnd(fi,DDOT,$1,LLNULL,SMNULL); }
-            | low_section COLON high_section
-             { $$ = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,$1,$3,SMNULL),SMNULL); }
-            | low_section
-             { $$ = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,$1,LLNULL,SMNULL),SMNULL); }
-            |  high_section
-             { $$ = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,LLNULL,$1,SMNULL),SMNULL); }
-            ;
-
-ar_section: needkeyword SECTION section
-            { $$ = $3;}
-          ;
-
-low_section: needkeyword LOW section
-            { $$ = $3;}
-          ;
-
-high_section: needkeyword HIGH section
-            { $$ = $3;}
-          ;
-
-section:  LEFTPAR funargs RIGHTPAR
-          { $$ = $2;}
-       ;
-
-reduction_spec: COMMA needkeyword REDUCTION LEFTPAR  opt_key_word_r  reduction  no_opt_key_word_r  COMMA reduction_list RIGHTPAR
-                {PTR_LLND q;
-                /* q = set_ll_list($9,$6,EXPR_LIST); */
-                 q = set_ll_list($6,LLNULL,EXPR_LIST); /*podd 11.10.01*/
-                 q = add_to_lowLevelList($9,q);        /*podd 11.10.01*/
-                 $$ = make_llnd(fi,REDUCTION_OP,q,LLNULL,SMNULL);
-                }
-              | COMMA needkeyword REDUCTION LEFTPAR  opt_key_word_r  reduction  no_opt_key_word_r  RIGHTPAR
-                {PTR_LLND q;
-                 q = set_ll_list($6,LLNULL,EXPR_LIST);
-                 $$ = make_llnd(fi,REDUCTION_OP,q,LLNULL,SMNULL);
-                }
-
-              | COMMA needkeyword REDUCTION LEFTPAR opt_key_word_r reduction_group no_opt_key_word_r COLON reduction_list RIGHTPAR
-                {  $$ = make_llnd(fi,REDUCTION_OP,$9,LLNULL,$6); }            
-              ;
-
-opt_key_word_r:
-                  { opt_kwd_r = YES; }
-               ;  
-no_opt_key_word_r:
-                  { opt_kwd_r = NO; }
-               ;  
-
-reduction_group:  name
-                { 
-                  if(($$=$1->id_attr) == SMNULL) {
-                      errstr("'%s' is not declared as reduction group", $1->ident, 69);
-                      $$ = make_local_entity($1,REDUCTION_GROUP_NAME,global_default,LOCAL);
-                  } else {
-                    if($$->variant != REDUCTION_GROUP_NAME)
-                      errstr("'%s' is not declared as reduction group", $1->ident, 69);
-                  }
-                }
-               ;       
-
-
-reduction_list: needkeyword reduction
-               {$$ = set_ll_list($2,LLNULL,EXPR_LIST);}
-              | reduction_list COMMA  needkeyword reduction
-               {$$ = set_ll_list($1,$4,EXPR_LIST);}
-             ;
-
-reduction: reduction_op LEFTPAR lhs RIGHTPAR
-           {$$ = make_llnd(fi,ARRAY_OP,$1,$3,SMNULL);}
-         | loc_op LEFTPAR variable_list COMMA expr RIGHTPAR
-           {$3 = set_ll_list($3,$5,EXPR_LIST);
-            $$ = make_llnd(fi,ARRAY_OP,$1,$3,SMNULL);}
-         ; 
-
-reduction_op: SUM
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "sum";
-              $$->type = global_string;
-             }
-            | PRODUCT
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "product";
-              $$->type = global_string;
-             }
-            | MIN
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "min";
-              $$->type = global_string;
-             }
-            | MAX
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "max";
-              $$->type = global_string;
-             }
-            | OR
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "or";
-              $$->type = global_string;
-             }
-            | AND
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "and";
-              $$->type = global_string;
-             }
-            | EQV
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "eqv";
-              $$->type = global_string;
-             }
-            | NEQV
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "neqv";
-              $$->type = global_string;
-             }
-            | UNKNOWN
-             { err("Illegal reduction operation name", 70);
-               errcnt--;
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "unknown";
-              $$->type = global_string;
-             }
-            ;
-
-loc_op:       MAXLOC
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "maxloc";
-              $$->type = global_string;
-             }
-            | MINLOC
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "minloc";
-              $$->type = global_string;
-             }
-/*
-            | UNKNOWN
-             { err("Illegal reduction operation name", 70);
-               errcnt--; 
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "unknown";
-              $$->type = global_string;
-             }
-*/
-             ;
-
-shadow_spec: COMMA needkeyword SHADOW_RENEW LEFTPAR shadow_list RIGHTPAR
-                { $$ = make_llnd(fi,SHADOW_RENEW_OP,$5,LLNULL,SMNULL);}
-           | COMMA needkeyword SHADOW_START_SPEC shadow_group_name
-/*
-                { PTR_LLND q;
-                  q = make_llnd(fi,VAR_REF,LLNULL,LLNULL,$4);
-                 $$ = make_llnd(fi,SHADOW_START_OP,q,LLNULL,SMNULL);
-                }
-*/
-                { $$ = make_llnd(fi,SHADOW_START_OP,LLNULL,LLNULL,$4);}
-           | COMMA needkeyword SHADOW_WAIT_SPEC  shadow_group_name
-                
-/*              {  PTR_LLND q;
-                  q = make_llnd(fi,VAR_REF,LLNULL,LLNULL,$4);
-                  $$ = make_llnd(fi,SHADOW_WAIT_OP,q,LLNULL,SMNULL);
-                } 
-*/
-                { $$ = make_llnd(fi,SHADOW_WAIT_OP,LLNULL,LLNULL,$4);} 
-           | COMMA needkeyword SHADOW_COMPUTE 
-                { $$ = make_llnd(fi,SHADOW_COMP_OP,LLNULL,LLNULL,SMNULL);}  
-           | COMMA needkeyword SHADOW_COMPUTE LEFTPAR  array_ident LEFTPAR  sh_width_list RIGHTPAR  RIGHTPAR 
-                {  $5-> entry.Template.ll_ptr1 = $7; $$ = make_llnd(fi,SHADOW_COMP_OP,$5,LLNULL,SMNULL);}  
-           ;
-
-shadow_group_name:  name
-       {$$ = make_local_entity($1, SHADOW_GROUP_NAME,global_default,LOCAL);}
-            ;        
-
-shadow_list: shadow
-              { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-           | shadow_list COMMA shadow
-              { $$ = set_ll_list($1,$3,EXPR_LIST);}
-           ;
-
-shadow: array_ident
-        { $$ = $1;} /* $$->variant is ARRAY_REF */
-      | array_ident LEFTPAR opt_corner CORNER  RIGHTPAR
-        { PTR_LLND p;
-          p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-          p->entry.string_val = (char *) "corner";
-          p->type = global_string;
-          $$ = make_llnd(fi,ARRAY_OP,$1,p,SMNULL);
-         }
-
-      | array_ident LEFTPAR  opt_corner sh_width_list RIGHTPAR
-        { $$ = $1;
-          $$-> entry.Template.ll_ptr1 = $4;  
-        }
-      | array_ident LEFTPAR opt_corner sh_width_list RIGHTPAR LEFTPAR needkeyword CORNER RIGHTPAR
-       { PTR_LLND p;
-          p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-          p->entry.string_val = (char *) "corner";
-          p->type = global_string;
-          $1-> entry.Template.ll_ptr1 = $4;  
-          $$ = make_llnd(fi,ARRAY_OP,$1,p,SMNULL);
-       }
-
-      ;
- 
-opt_corner: 
-           { optcorner = YES; }
-          ;
-
-array_ident: ident
-       { PTR_SYMB s;
-         s = $1->entry.Template.symbol;
-         if(s->attr & PROCESSORS_BIT)
-             errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);
-         else if(s->attr & TASK_BIT)
-             errstr( "Illegal use of task array name %s ", s->ident, 71);
-         else
-           if(s->type->variant != T_ARRAY) 
-             errstr("'%s' isn't array", s->ident, 66);
-           else 
-              if((!(s->attr & DISTRIBUTE_BIT)) && (!(s->attr & ALIGN_BIT)))
-               ; /*errstr("hpf.gram: %s is not distributed array", s->ident);*/
-                
-         $$ = $1;
-        }
-           ;
-
-array_ident_list: array_ident
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | array_ident_list COMMA array_ident
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-dvm_shadow_start: SHADOW_START end_spec shadow_group_name
-         { $$ = get_bfnd(fi,DVM_SHADOW_START_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-                |  SHADOW_START_SPEC end_spec shadow_group_name
-                {errstr("Missing DVM directive prefix", 49);}
-                ;
-
-dvm_shadow_wait: SHADOW_WAIT  end_spec shadow_group_name
-         { $$ = get_bfnd(fi,DVM_SHADOW_WAIT_DIR,$3,LLNULL,LLNULL,LLNULL);}  
-                |  SHADOW_WAIT_SPEC end_spec shadow_group_name
-                {errstr("Missing DVM directive prefix", 49);}
-               ;
-
-dvm_shadow_group: SHADOW_GROUP end_spec shadow_group_name LEFTPAR shadow_list RIGHTPAR
-          { $$ = get_bfnd(fi,DVM_SHADOW_GROUP_DIR,$3,$5,LLNULL,LLNULL);}   
-                ;
-
-dvm_reduction_start: REDUCTION_START end_spec reduction_group
-         { $$ = get_bfnd(fi,DVM_REDUCTION_START_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-                ;
-
-dvm_reduction_wait: REDUCTION_WAIT  end_spec reduction_group
-         { $$ = get_bfnd(fi,DVM_REDUCTION_WAIT_DIR,$3,LLNULL,LLNULL,LLNULL);}  
-               ;
-/*
-dvm_reduction_group: REDUCTION_GROUP  end_spec reduction_group_name LEFTPAR reduction_list RIGHTPAR
-          { $$ = get_bfnd(fi,DVM_REDUCTION_GROUP_DIR,$3,$5,LLNULL,LLNULL);}
-                   ;
-*/
-
-dvm_consistent_start: CONSISTENT_START end_spec consistent_group
-         { $$ = get_bfnd(fi,DVM_CONSISTENT_START_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-                ;
-
-dvm_consistent_wait: CONSISTENT_WAIT  end_spec consistent_group
-         { $$ = get_bfnd(fi,DVM_CONSISTENT_WAIT_DIR,$3,LLNULL,LLNULL,LLNULL);}  
-               ;
-
-dvm_remote_access: REMOTE_ACCESS end_spec LEFTPAR group_name COLON remote_data_list RIGHTPAR 
-         { if(($4->attr & INDIRECT_BIT))
-                errstr("'%s' is not remote group name", $4->ident, 68);
-           $$ = get_bfnd(fi,DVM_REMOTE_ACCESS_DIR,$4,$6,LLNULL,LLNULL);
-         }
-                 | REMOTE_ACCESS  end_spec LEFTPAR remote_data_list RIGHTPAR 
-         { $$ = get_bfnd(fi,DVM_REMOTE_ACCESS_DIR,SMNULL,$4,LLNULL,LLNULL);}
-                 ;
-
-group_name: name
-          {  
-            if(($$=$1->id_attr) == SMNULL){
-                errstr("'%s' is not declared as group", $1->ident, 74);
-                $$ = make_local_entity($1,REF_GROUP_NAME,global_default,LOCAL);
-            } else {
-              if($$->variant != REF_GROUP_NAME)
-                errstr("'%s' is not declared as group", $1->ident, 74);
-            }
-          }
-          ;
-
-remote_data_list: remote_data
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | remote_data_list COMMA remote_data
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-remote_data: array_ident LEFTPAR remote_index_list RIGHTPAR
-            {
-              $$ = $1;
-              $$->entry.Template.ll_ptr1 = $3;
-            }
-           | array_ident
-             { $$ = $1;}
-           ;
-
-remote_index_list: remote_index
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                 | remote_index_list COMMA remote_index
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-remote_index: expr
-            { $$ = $1;}
-            | COLON
-            { $$ = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL);}
-             ;
-
-dvm_task: TASK in_dcl  task_array
-          {  PTR_LLND q;
-             q = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-             $$ = get_bfnd(fi,DVM_TASK_DIR,SMNULL,q,LLNULL,LLNULL);
-          }
-        | dvm_task COMMA task_array
-          {   PTR_LLND q;
-              q = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, $1->entry.Template.ll_ptr1);
-          }
-        ;
-
-task_array: name dims
-           { 
-             PTR_SYMB s;
-	      s = make_array($1, global_int, $2, ndim, LOCAL);
-              if($2){
-                  s->attr = s->attr | DIMENSION_BIT;
-                  s->type->entry.ar_decl.ranges = $2;
-              }
-              else
-                  err("No dimensions in TASK directive", 75);
-              if(ndim > 1)
-                  errstr("Illegal rank of '%s'", s->ident, 76);
-              if(s->attr & TASK_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & PROCESSORS_BIT)  || (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT))
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16);
-              else
-	        s->attr = s->attr | TASK_BIT;
-    
-	      $$ = make_llnd(fi,ARRAY_REF, $2, LLNULL, s);	  
-	    }    
-	;
-
-dvm_task_region: TASK_REGION  end_spec task_name  
-                 {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,LLNULL,LLNULL,LLNULL);}             
-               | TASK_REGION  end_spec task_name reduction_spec
-                {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,$4,LLNULL,LLNULL);}
-               | TASK_REGION  end_spec task_name consistent_spec
-                {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,LLNULL,$4,LLNULL);}
-               | TASK_REGION  end_spec task_name reduction_spec consistent_spec
-                {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,$4,$5,LLNULL);}              
-               | TASK_REGION  end_spec task_name consistent_spec reduction_spec
-                {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,$5,$4,LLNULL);}                  
-               ;
-
-task_name:   name
-             { PTR_SYMB s;
-              if((s=$1->id_attr) == SMNULL)
-                s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              
-              if(!(s->attr & TASK_BIT))
-                 errstr("'%s' is not task array", s->ident, 77);
-              $$ = s;
-              }
-              ;
-
-dvm_end_task_region:  ENDTASK_REGION  end_spec
-          { $$ = get_bfnd(fi,DVM_END_TASK_REGION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-                   ;
-
-task:  task_name  LEFTPAR expr RIGHTPAR
-           {  PTR_SYMB s;
-              PTR_LLND q;
-             /*
-              s = make_array($1, TYNULL, LLNULL, 0, LOCAL);                           
-	      if((parstate == INEXEC) && !(s->attr & TASK_BIT))
-                 errstr("'%s' is not task array", s->ident, 77);  
-              q =  set_ll_list($3,LLNULL,EXPR_LIST);
-	      $$ = make_llnd(fi,ARRAY_REF, q, LLNULL, s);
-              */
-
-              s = $1;
-              q =  set_ll_list($3,LLNULL,EXPR_LIST);
-	      $$ = make_llnd(fi,ARRAY_REF, q, LLNULL, s);
-	   }
-     | task_name  LEFTPAR triplet RIGHTPAR 
-           {  PTR_LLND q; 
-              q =  set_ll_list($3,LLNULL,EXPR_LIST);
-	      $$ = make_llnd(fi,ARRAY_REF, q, LLNULL, $1);
-	   }
-            ;        
-
-dvm_on: ON_DIR end_spec array_ele_substring_func_ref opt_private_spec
-    {              
-         $$ = get_bfnd(fi,DVM_ON_DIR,SMNULL,$3,$4,LLNULL);
-    } 
-      ;  
-
-opt_private_spec: 
-             {$$ = LLNULL;}
-            | private_spec
-             { $$ = $1;}
-            ;
-
-dvm_end_on: ENDON end_spec
-         {$$ = get_bfnd(fi,DVM_END_ON_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-          ;
-
-dvm_map:  MAP end_spec task  needkeyword ONTO processors_name dims
-      { PTR_LLND q;
-        /* if(!($6->attr & PROCESSORS_BIT))
-           errstr("'%s' is not processor array", $6->ident, 67);
-         */
-        q = make_llnd(fi,ARRAY_REF, $7, LLNULL, $6);
-        $$ = get_bfnd(fi,DVM_MAP_DIR,SMNULL,$3,q,LLNULL);
-      }
-      | MAP end_spec task  needkeyword BY lhs
-       { $$ = get_bfnd(fi,DVM_MAP_DIR,SMNULL,$3,LLNULL,$6); } 
-       ;
-
-dvm_prefetch: PREFETCH end_spec group_name
-              { $$ = get_bfnd(fi,DVM_PREFETCH_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-            ;
-
-dvm_reset: RESET end_spec group_name
-           { $$ = get_bfnd(fi,DVM_RESET_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-         ;
-/*
-dvm_indirect_access: INDIRECT_ACCESS end_spec LEFTPAR opt_group indirect_list RIGHTPAR 
-                    { $$ = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,$4,$5,LLNULL,LLNULL);} 
-                   ;
-*/
-dvm_indirect_access: INDIRECT_ACCESS end_spec LEFTPAR group_name COLON indirect_list RIGHTPAR 
-                    { if(!($4->attr & INDIRECT_BIT))
-                         errstr("'%s' is not indirect group name", $4->ident, 313);
-                      $$ = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,$4,$6,LLNULL,LLNULL);
-                    }
-                   | INDIRECT_ACCESS end_spec LEFTPAR  indirect_list RIGHTPAR 
-                    { $$ = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,SMNULL,$4,LLNULL,LLNULL);} 
-                   ;
-/*
-opt_group:
-               { $$ = SMNULL;}
-         |  group_name COLON 
-               { if(!($1->attr & INDIRECT_BIT))
-                   errstr("'%s' is not indirect group name", $1->ident, 313);
-                 $$ = $1;
-                }
-         ;
-*/
-
-indirect_list: indirect_reference
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-            | indirect_list COMMA  indirect_reference 
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-indirect_reference: array_ident
-                    { $$ = $1;} 
-                  | array_ident LEFTPAR subscript_list RIGHTPAR
-                    { $$ = $1; $$->entry.Template.ll_ptr1 = $3;} 
-                  ; 
-/* 
-dvm_own: OWN
-          { $$ = get_bfnd(fi,DVM_OWN_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-       ;
-*/
-  
-hpf_independent: INDEPENDENT end_spec
-                { $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}  
-               | INDEPENDENT end_spec new_spec
-                { $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, $3, LLNULL, LLNULL);}
-               | INDEPENDENT end_spec hpf_reduction_spec
-                { $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, LLNULL, $3, LLNULL);}
-               | INDEPENDENT end_spec new_spec hpf_reduction_spec
-                { $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, $3, $4,LLNULL);}
-
-               ;
- /*
-               | INDEPENDENT end_spec COMMA needkeyword NEW LEFTPAR new_variable_list  RIGHTPAR
-      { PTR_LLND p;
-        p  = make_llnd(fi,NEW_SPEC_OP, $7, LLNULL, SMNULL);
-        $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, p, LLNULL,LLNULL);
-      }  
-  */      
-
-/*
-new_variable_list: new_variable
-            { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-             | new_variable_list COMMA new_variable
-            { $$ = set_ll_list($1,$3,EXPR_LIST);}
-             ;
-
-new_variable: lhs
-        { PTR_SYMB s;
-          if($1->variant == FUNC_CALL)
-               errstr("illegal function call");
-          s = $1->entry.Template.symbol;
-          if(s->attr & SAVE_BIT)
-               errstr("'%s' has the SAVE attribute", s->ident);  
-          if(s->attr & TARGET_BIT)
-                 errstr("'%s' has the TARGET attribute", s->ident);
-          if(s->attr & DVM_POINTER_BIT)
-                 errstr("'%s' is a pointer", s->ident);
-          if(s->entry.var_decl.local == IO)
-                 errstr("'%s' is a dummy argument", s->ident);
-        }
-           ;
-*/
-
-hpf_reduction_spec: COMMA needkeyword REDUCTION LEFTPAR variable_list RIGHTPAR
-              {$$ = make_llnd(fi,REDUCTION_OP,$5,LLNULL,SMNULL);}
-                  ;
-
-dvm_asynchronous: ASYNCHRONOUS end_spec async
-                { $$ = get_bfnd(fi,DVM_ASYNCHRONOUS_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-                ;
-
-dvm_endasynchronous: ENDASYNCHRONOUS end_spec 
-                { $$ = get_bfnd(fi,DVM_ENDASYNCHRONOUS_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-                ;
-
-dvm_asyncwait: ASYNCWAIT end_spec async
-                { $$ = get_bfnd(fi,DVM_ASYNCWAIT_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             ;
-
-async_ident: name 
-     {  
-            if(($$=$1->id_attr) == SMNULL) {
-                errstr("'%s' is not declared as ASYNCID", $1->ident, 115);
-                $$ = make_local_entity($1,ASYNC_ID,global_default,LOCAL);
-            } else {
-              if($$->variant != ASYNC_ID)
-                errstr("'%s' is not declared as ASYNCID", $1->ident, 115);
-            }
-     }
-     ;
-
-async: async_ident
-      { $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $1);}
-     | async_ident LEFTPAR subscript_list RIGHTPAR
-       { $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, $1);} 
-     ;
-
-dvm_f90: F90 end_spec lhs EQUAL lhs
-        { $$ = get_bfnd(fi,DVM_F90_DIR,SMNULL,$3,$5,LLNULL);} 
-       ;
-dvm_debug_dir: DEBUG end_spec fragment_number
-               { $$ = get_bfnd(fi,DVM_DEBUG_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             |  DEBUG end_spec fragment_number LEFTPAR debparamlist RIGHTPAR 
-               { $$ = get_bfnd(fi,DVM_DEBUG_DIR,SMNULL,$3,$5,LLNULL);} 
-             ;
-
-debparamlist:  in_ioctl debparam
-	    { 
-              $$ = set_ll_list($2, LLNULL, EXPR_LIST);
-              endioctl();
-            }
-	    | debparamlist COMMA in_ioctl debparam
-	    { 
-              $$ = set_ll_list($1, $4, EXPR_LIST);
-              endioctl();
-            }
-	    ;
-
-debparam:  nameeq expr
-           { $$  = make_llnd(fi, KEYWORD_ARG, $1, $2, SMNULL); } /* SPEC_PAIR*/
-        ;
-fragment_number:  INT_CONSTANT
-	        {
-	         $$ = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-	         $$->entry.ival = atoi(yytext);
-	         $$->type = global_int;
-	        }
-              ;
-
-dvm_enddebug_dir: ENDDEBUG end_spec fragment_number
-       { $$ = get_bfnd(fi,DVM_ENDDEBUG_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             ;
-
-dvm_interval_dir: INTERVAL end_spec interval_number 
-       { $$ = get_bfnd(fi,DVM_INTERVAL_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             ;
-
-interval_number:
-                { $$ = LLNULL;}
-
-               |  expr
-                { if($1->type->variant != T_INT)             
-                    err("Illegal interval number", 78);
-                  $$ = $1;
-                 }
-               ;
-
-dvm_exit_interval_dir: EXITINTERVAL end_spec subscript_list 
-                      /* subscript_list - interval number list */ 
-       { $$ = get_bfnd(fi,DVM_EXIT_INTERVAL_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             ;
-
-dvm_endinterval_dir: ENDINTERVAL end_spec
-            { $$ = get_bfnd(fi,DVM_ENDINTERVAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-                   ;
-
-dvm_traceon_dir: TRACEON end_spec
-            { $$ = get_bfnd(fi,DVM_TRACEON_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-               ;
-
-dvm_traceoff_dir: TRACEOFF end_spec
-            { $$ = get_bfnd(fi,DVM_TRACEOFF_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-               ;
-
-dvm_barrier_dir: BARRIER end_spec
-            { $$ = get_bfnd(fi,DVM_BARRIER_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-               ;
-
-dvm_check: CHECK end_spec in_ioctl LEFTPAR callarglist RIGHTPAR end_ioctl opt_double_colon variable_list 
-          { $$ = get_bfnd(fi,DVM_CHECK_DIR,SMNULL,$9,$5,LLNULL); }         
-         ;
-
-dvm_io_mode_dir: IO_MODE end_spec LEFTPAR mode_list RIGHTPAR
-            { $$ = get_bfnd(fi,DVM_IO_MODE_DIR,SMNULL,$4,LLNULL,LLNULL);} 
-               ;
-mode_list:   mode_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-         |   mode_list COMMA mode_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-         ;
-
-mode_spec:  needkeyword ACC_ASYNC
-              { $$ = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);}
-         |  needkeyword ACC_LOCAL
-              { $$ = make_llnd(fi,ACC_LOCAL_OP, LLNULL,LLNULL,SMNULL);}
-         |  needkeyword PARALLEL
-              { $$ = make_llnd(fi,PARALLEL_OP, LLNULL,LLNULL,SMNULL);}
-         ;
-
-dvm_shadow_add: SHADOW_ADD end_spec LEFTPAR template_ref EQUAL shadow_id RIGHTPAR opt_key_word opt_include_to 
-              { $$ = get_bfnd(fi,DVM_SHADOW_ADD_DIR,SMNULL,$4,$6,$9); }
-              ;
-
-template_ref:  ident LEFTPAR shadow_axis_list RIGHTPAR
-               {
-                 if($1->type->variant != T_ARRAY) 
-                    errstr("'%s' isn't array", $1->entry.Template.symbol->ident, 66);
-                 if(!($1->entry.Template.symbol->attr & TEMPLATE_BIT))
-                    errstr("'%s' isn't TEMPLATE", $1->entry.Template.symbol->ident, 628);
-                 $1->entry.Template.ll_ptr1 = $3;
-                 $$ = $1;
-                 /*$$->type = $1->type->entry.ar_decl.base_type;*/
-               }
-            ;
-
-shadow_axis_list: shadow_axis
-	          { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                | shadow_axis_list COMMA shadow_axis
-	          { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-                ;
-
-shadow_axis: derived_spec
-             { $$ = $1; }
-           | aster_expr
-             { $$ = $1; }
-           ;
-
-opt_include_to: INCLUDE_TO array_ident_list
-                { $$ = $2;}              
-	      |  
-                { $$ = LLNULL; opt_kwd_ = NO;}
-              ;
- 
-dvm_localize: LOCALIZE end_spec LEFTPAR ident POINT_TO localize_target  RIGHTPAR
-              { $$ = get_bfnd(fi,DVM_LOCALIZE_DIR,SMNULL,$4,$6,LLNULL); }
-            ;
-
-localize_target: ident
-                {
-                 if($1->type->variant != T_ARRAY) 
-                    errstr("'%s' isn't array", $1->entry.Template.symbol->ident, 66); 
-                 $$ = $1;
-                }
-               | ident  LEFTPAR target_subscript_list RIGHTPAR
-                {
-                 if($1->type->variant != T_ARRAY) 
-                    errstr("'%s' isn't array", $1->entry.Template.symbol->ident, 66); 
-                                 
-                 $1->entry.Template.ll_ptr1 = $3;
-                 $$ = $1;
-                 $$->type = $1->type->entry.ar_decl.base_type;
-                }
-                                                          
-               ;
-
-target_subscript_list: target_subscript
-	               { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                     | target_subscript_list COMMA target_subscript
-	               { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-                     ;
-
-target_subscript: aster_expr
-                { $$ = $1; }
-                | COLON
-                { $$ = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL);}
-                ;
-
-aster_expr: ASTER
-          { 
-            $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-            $$->entry.string_val = (char *) "*";
-            $$->type = global_string;
-          }
-          ;
-
-dvm_cp_create: CP_CREATE end_spec expr COMMA needkeyword VARLIST LEFTPAR variable_list RIGHTPAR COMMA needkeyword FILES LEFTPAR subscript_list RIGHTPAR  opt_mode 
-              { 
-                PTR_LLND q;
-                if($16)
-                  q = make_llnd(fi,ARRAY_OP, $14, $16, SMNULL);
-                else
-                  q = $14;                  
-                $$ = get_bfnd(fi,DVM_CP_CREATE_DIR,SMNULL,$3,$8,q); 
-              } 
-             ;
-
-opt_mode:
-              { $$ = LLNULL; }
-            |  COMMA needkeyword PARALLEL
-              { $$ = make_llnd(fi, PARALLEL_OP, LLNULL, LLNULL, SMNULL); }
-            |  COMMA needkeyword ACC_LOCAL 
-              { $$ = make_llnd(fi,ACC_LOCAL_OP, LLNULL, LLNULL, SMNULL); }  
-            ;
-
-dvm_cp_load:   CP_LOAD end_spec expr
-              { $$ = get_bfnd(fi,DVM_CP_LOAD_DIR,SMNULL,$3,LLNULL,LLNULL); } 
-           ;
-
-dvm_cp_save:   CP_SAVE end_spec expr
-              { $$ = get_bfnd(fi,DVM_CP_SAVE_DIR,SMNULL,$3,LLNULL,LLNULL); }              
-           |   CP_SAVE end_spec expr COMMA needkeyword ACC_ASYNC 
-              {
-                PTR_LLND q;
-                q = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);
-                $$ = get_bfnd(fi,DVM_CP_SAVE_DIR,SMNULL,$3,q,LLNULL);
-              }
-           ;
-
-dvm_cp_wait:   CP_WAIT end_spec expr COMMA needkeyword STATUS LEFTPAR ident RIGHTPAR
-              { $$ = get_bfnd(fi,DVM_CP_WAIT_DIR,SMNULL,$3,$8,LLNULL); }
-           ;
-
-dvm_template_create: TEMPLATE_CREATE end_spec  LEFTPAR  template_list RIGHTPAR
-                     { $$ = get_bfnd(fi,DVM_TEMPLATE_CREATE_DIR,SMNULL,$4,LLNULL,LLNULL); }
-                   ;
-template_list: array_element
-	       { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	     | template_list COMMA array_element
-               { $$ = set_ll_list($1, $3, EXPR_LIST); }
-             ;
-
-dvm_template_delete: TEMPLATE_DELETE end_spec  LEFTPAR ident_list RIGHTPAR
-                     { $$ = get_bfnd(fi,DVM_TEMPLATE_DELETE_DIR,SMNULL,$4,LLNULL,LLNULL); }
-                   ;
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/fomp.gram b/projects/dvm_svn/fdvm/trunk/parser/fomp.gram
deleted file mode 100644
index a0a7d5f..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/fomp.gram
+++ /dev/null
@@ -1,644 +0,0 @@
-omp_specification_directive: omp_threadprivate_directive
-	;
-omp_execution_directive: omp_parallel_begin_directive
-	| omp_parallel_end_directive
-	| omp_sections_begin_directive
-	| omp_sections_end_directive
-	| omp_section_directive
-	| omp_do_begin_directive
-	| omp_do_end_directive
-	| omp_single_begin_directive
-	| omp_single_end_directive
-	| omp_workshare_begin_directive
-	| omp_workshare_end_directive
-	| omp_parallel_do_begin_directive
-	| omp_parallel_do_end_directive
-	| omp_parallel_sections_begin_directive
-	| omp_parallel_sections_end_directive
-	| omp_parallel_workshare_begin_directive
-	| omp_parallel_workshare_end_directive
-	| omp_master_begin_directive
-	| omp_master_end_directive
-	| omp_ordered_begin_directive
-	| omp_ordered_end_directive
-	| omp_barrier_directive
-	| omp_atomic_directive
-	| omp_flush_directive
-	| omp_critical_begin_directive
-	| omp_critical_end_directive
-	;
-
-ompdvm_onethread: OMPDVM_ONETHREAD end_spec 
-	{
-          $$ = get_bfnd(fi,OMP_ONETHREAD_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	};
-
-
-omp_parallel_end_directive: OMPDVM_ENDPARALLEL end_spec 
-	{
-  	   $$ = make_endparallel();
-	};
-
-
-omp_parallel_begin_directive: OMPDVM_PARALLEL end_spec opt_key_word parallel_clause_list
-	{
-  	   $$ = make_parallel();
-           $$->entry.Template.ll_ptr1 = $4;
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_PARALLEL end_spec opt_key_word
-	{
-  	   $$ = make_parallel();
-	   opt_kwd_ = NO;
-	};
-
-parallel_clause_list: opt_comma opt_key_word parallel_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| parallel_clause_list opt_comma opt_key_word parallel_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);	
-	}
-	;
-
-parallel_clause:  ompprivate_clause
-        | ompreduction_clause
-        | ompshared_clause
-        | ompdefault_clause
-        | ompfirstprivate_clause
-	| omplastprivate_clause
-        | ompcopyin_clause
-	| ompif_clause
-	| ompnumthreads_clause
-        ;
-
-omp_variable_list_in_par: op_slash_1 LEFTPAR op_slash_0 omp_variable_list RIGHTPAR
-        {
-		$$ = $4;
-        };
-
-ompprivate_clause: PRIVATE omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_PRIVATE,$2,LLNULL,SMNULL);
-	};
-
-ompfirstprivate_clause: OMPDVM_FIRSTPRIVATE omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_FIRSTPRIVATE,$2,LLNULL,SMNULL);
-	}
-        ;
-
-omplastprivate_clause: OMPDVM_LASTPRIVATE omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_LASTPRIVATE,$2,LLNULL,SMNULL);
-	}
-        ;
-
-ompcopyin_clause: OMPDVM_COPYIN omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_COPYIN,$2,LLNULL,SMNULL);
-	}
-        ;
-
-ompshared_clause: OMPDVM_SHARED omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_SHARED,$2,LLNULL,SMNULL);
-	}
-        ;
-ompdefault_clause: DEFAULT_CASE LEFTPAR needkeyword def_expr RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_DEFAULT,$4,LLNULL,SMNULL);
-	}
-        ;
-
-def_expr: PRIVATE
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "private";
-		$$->type = global_string;
-	}
-	| OMPDVM_SHARED
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "shared";
-		$$->type = global_string;
-	}
-	| OMPDVM_NONE
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "none";
-		$$->type = global_string;
-	}
-	;
-ompif_clause: OMPDVM_IF LEFTPAR expr RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_IF,$3,LLNULL,SMNULL);
-	}
-        ;
-
-ompnumthreads_clause: OMPDVM_NUM_THREADS LEFTPAR expr RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_NUM_THREADS,$3,LLNULL,SMNULL);
-	}
-        ;
-
-ompreduction_clause: REDUCTION LEFTPAR ompreduction RIGHTPAR
-	{
-		PTR_LLND q;
-		q = set_ll_list($3,LLNULL,EXPR_LIST);
-		$$ = make_llnd(fi,OMP_REDUCTION,q,LLNULL,SMNULL);
-	};
-
-ompreduction:  opt_key_word ompreduction_op COLON ompreduction_vars
-           {$$ = make_llnd(fi,DDOT,$2,$4,SMNULL);}
-         ; 
-
-ompreduction_vars: variable_list;
-
-ompreduction_op: PLUS
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "+";
-              $$->type = global_string;
-             }
-	    | MINUS
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "-";
-              $$->type = global_string;
-             }
-
-            | ASTER
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "*";
-              $$->type = global_string;
-             }
-            | SLASH
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "/";
-              $$->type = global_string;
-             }
-            | MIN
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "min";
-              $$->type = global_string;
-             }
-            | MAX
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "max";
-              $$->type = global_string;
-             }
-            | OR
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) ".or.";
-              $$->type = global_string;
-             }
-            | AND
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) ".and.";
-              $$->type = global_string;
-             }
-            | EQV
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) ".eqv.";
-              $$->type = global_string;
-             }
-            | NEQV
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) ".neqv.";
-              $$->type = global_string;
-             }
-            | IAND
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "iand";
-              $$->type = global_string;
-             }
-            | IEOR
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "ieor";
-              $$->type = global_string;
-             }
-            | IOR
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "ior";
-              $$->type = global_string;
-             }
-            | UNKNOWN
-             { err("Illegal reduction operation name", 70);
-               errcnt--;
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "unknown";
-              $$->type = global_string;
-             }
-            ;
-
-
-omp_sections_begin_directive: OMPDVM_SECTIONS end_spec opt_key_word sections_clause_list 
-	{
-  	   $$ = make_sections($4);
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_SECTIONS end_spec opt_key_word
-	{
-  	   $$ = make_sections(LLNULL);
-	   opt_kwd_ = NO;
-	};
-
-sections_clause_list: opt_comma opt_key_word sections_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| sections_clause_list opt_comma opt_key_word sections_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-sections_clause:  ompprivate_clause
-        | ompreduction_clause
-        | ompfirstprivate_clause
-	| omplastprivate_clause
-        ;
-
-omp_sections_end_directive: OMPDVM_ENDSECTIONS end_spec opt_key_word ompnowait_clause
-	{
-		PTR_LLND q;
-   	        $$ = make_endsections();
-		q = set_ll_list($4,LLNULL,EXPR_LIST);
-                $$->entry.Template.ll_ptr1 = q;
-                opt_kwd_ = NO;
-	}
-	| OMPDVM_ENDSECTIONS end_spec opt_key_word
-	{
-   	        $$ = make_endsections();
-	        opt_kwd_ = NO; 
-	};
-
-omp_section_directive: OMPDVM_SECTION end_spec
-	{
-           $$ = make_ompsection();
-	};
-
-
-omp_do_begin_directive: OMPDVM_DO end_spec opt_key_word do_clause_list 
-	{
-           $$ = get_bfnd(fi,OMP_DO_DIR,SMNULL,$4,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_DO end_spec opt_key_word
-	{
-           $$ = get_bfnd(fi,OMP_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	};
-
-omp_do_end_directive: OMPDVM_ENDDO end_spec opt_key_word ompnowait_clause
-	{
-		PTR_LLND q;
-		q = set_ll_list($4,LLNULL,EXPR_LIST);
-	        $$ = get_bfnd(fi,OMP_END_DO_DIR,SMNULL,q,LLNULL,LLNULL);
-      	        opt_kwd_ = NO;
-	}
-	| OMPDVM_ENDDO end_spec opt_key_word 
-	{
-           $$ = get_bfnd(fi,OMP_END_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	};
-
-do_clause_list: opt_comma opt_key_word do_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| do_clause_list opt_comma opt_key_word do_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-do_clause:  ompprivate_clause
-        | ompreduction_clause
-        | ompfirstprivate_clause
-	| omplastprivate_clause
-	| ompschedule_clause
-	| ompordered_clause
-        ;
-
-ompordered_clause: OMPDVM_ORDERED
-	{
-		/*$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "ORDERED";
-		$$->type = global_string;*/
-                $$ = make_llnd(fi,OMP_ORDERED,LLNULL,LLNULL,SMNULL);
-	}
-	;
-
-ompschedule_clause: OMPDVM_SCHEDULE LEFTPAR needkeyword ompschedule_op COMMA expr RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_SCHEDULE,$4,$6,SMNULL);
-	}
-	| OMPDVM_SCHEDULE LEFTPAR needkeyword ompschedule_op RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_SCHEDULE,$4,LLNULL,SMNULL);
-	}
-	;
-
-ompschedule_op: STATIC
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "STATIC";
-		$$->type = global_string;
-		
-	}
-	| DYNAMIC
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "DYNAMIC";
-		$$->type = global_string;
-		
-	}
-	| OMPDVM_GUIDED
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "GUIDED";
-		$$->type = global_string;
-		
-	}
-	| OMPDVM_RUNTIME
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "RUNTIME";
-		$$->type = global_string;
-		
-	}
-	;
-
-omp_single_begin_directive: OMPDVM_SINGLE end_spec opt_key_word single_clause_list 
-	{
-  	   $$ = make_single();
-           $$->entry.Template.ll_ptr1 = $4;
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_SINGLE end_spec opt_key_word
-	{
-  	   $$ = make_single();
-	   opt_kwd_ = NO;
-	};
-
-single_clause_list: opt_comma opt_key_word single_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| single_clause_list opt_comma opt_key_word single_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-single_clause:  ompprivate_clause
-        | ompfirstprivate_clause
-        ;
-
-omp_single_end_directive: OMPDVM_ENDSINGLE end_spec opt_key_word end_single_clause_list 
-	{
-  	   $$ = make_endsingle();
-           $$->entry.Template.ll_ptr1 = $4;
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_ENDSINGLE end_spec opt_key_word
-	{
-  	   $$ = make_endsingle();
-	   opt_kwd_ = NO;
-	};
-
-end_single_clause_list: opt_comma opt_key_word end_single_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| end_single_clause_list opt_comma opt_key_word end_single_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-
-end_single_clause:  ompnowait_clause
-        | ompcopyprivate_clause
-        ;
-
-ompcopyprivate_clause: OMPDVM_COPYPRIVATE omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_COPYPRIVATE,$2,LLNULL,SMNULL);
-	}
-        ;
-
-ompnowait_clause: OMPDVM_NOWAIT
-	{
-		$$ = make_llnd(fi,OMP_NOWAIT,LLNULL,LLNULL,SMNULL);
-	}
-        ;
-
-omp_workshare_begin_directive: OMPDVM_WORKSHARE end_spec
-	{
-           $$ = make_workshare();
-	};
-
-omp_workshare_end_directive: OMPDVM_ENDWORKSHARE end_spec opt_key_word ompnowait_clause
-	{
-		PTR_LLND q;
-   	        $$ = make_endworkshare();
-		q = set_ll_list($4,LLNULL,EXPR_LIST);
-                $$->entry.Template.ll_ptr1 = q;
-  	        opt_kwd_ = NO;
-	}
-	| OMPDVM_ENDWORKSHARE end_spec opt_key_word
-	{
-   	        $$ = make_endworkshare();
-                opt_kwd_ = NO;
-	};
-
-omp_parallel_do_begin_directive: OMPDVM_PARALLELDO end_spec opt_key_word paralleldo_clause_list  
-	{
-           $$ = get_bfnd(fi,OMP_PARALLEL_DO_DIR,SMNULL,$4,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_PARALLELDO end_spec opt_key_word
-	{
-           $$ = get_bfnd(fi,OMP_PARALLEL_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-	;
-
-paralleldo_clause_list: opt_comma opt_key_word paralleldo_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| paralleldo_clause_list opt_comma opt_key_word paralleldo_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-paralleldo_clause: ompprivate_clause
-        | ompreduction_clause
-        | ompshared_clause
-        | ompdefault_clause
-        | ompfirstprivate_clause
-	| omplastprivate_clause
-        | ompcopyin_clause
-	| ompif_clause
-	| ompnumthreads_clause
-	| ompschedule_clause
-	| ompordered_clause
-        ;
-
-
-omp_parallel_do_end_directive: OMPDVM_ENDPARALLELDO end_spec
-	{
-           $$ = get_bfnd(fi,OMP_END_PARALLEL_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	};
-
-omp_parallel_sections_begin_directive: OMPDVM_PARALLELSECTIONS end_spec opt_key_word parallel_clause_list
-	{
-           $$ = make_parallelsections($4);
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_PARALLELSECTIONS end_spec opt_key_word
-	{
-           $$ = make_parallelsections(LLNULL);
-	   opt_kwd_ = NO;
-	};
-
-
-omp_parallel_sections_end_directive: OMPDVM_ENDPARALLELSECTIONS end_spec
-	{
-           $$ = make_endparallelsections();
-	};
-
-omp_parallel_workshare_begin_directive: OMPDVM_PARALLELWORKSHARE end_spec opt_key_word parallel_clause_list 
-	{
-           $$ = make_parallelworkshare();
-           $$->entry.Template.ll_ptr1 = $4;
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_PARALLELWORKSHARE end_spec opt_key_word
-	{
-           $$ = make_parallelworkshare();
-	   opt_kwd_ = NO;
-	};
-
-omp_parallel_workshare_end_directive: OMPDVM_ENDPARALLELWORKSHARE end_spec
-	{
-           $$ = make_endparallelworkshare();
-	};
-
-omp_threadprivate_directive: OMPDVM_THREADPRIVATE in_dcl omp_variable_list_in_par
-	{ 
-	   $$ = get_bfnd(fi,OMP_THREADPRIVATE_DIR, SMNULL, $3, LLNULL, LLNULL);
-	};
-
-omp_master_begin_directive: OMPDVM_MASTER end_spec 
-	{
-  	   $$ = make_master();
-	};
-
-omp_master_end_directive: OMPDVM_ENDMASTER end_spec 
-	{
-  	   $$ = make_endmaster();
-	};
-omp_ordered_begin_directive: OMPDVM_ORDERED end_spec 
-	{
-  	   $$ = make_ordered();
-	};
-
-omp_ordered_end_directive: OMPDVM_ENDORDERED end_spec 
-	{
-  	   $$ = make_endordered();
-	};
-
-omp_barrier_directive: OMPDVM_BARRIER end_spec 
-	{
-           $$ = get_bfnd(fi,OMP_BARRIER_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	};
-omp_atomic_directive: OMPDVM_ATOMIC end_spec 
-	{
-           $$ = get_bfnd(fi,OMP_ATOMIC_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	};
-
-omp_flush_directive: OMPDVM_FLUSH end_spec omp_variable_list_in_par
-	{
-           $$ = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,$3,LLNULL,LLNULL);
-	}
-	| OMPDVM_FLUSH end_spec 
-	{
-           $$ = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-	;
-
-omp_critical_begin_directive: OMPDVM_CRITICAL end_spec LEFTPAR ident RIGHTPAR
-	{
-  	   $$ = make_critical();
-           $$->entry.Template.ll_ptr1 = $4;
-	}
-	| OMPDVM_CRITICAL end_spec 
-	{
-  	   $$ = make_critical();
-	}
-	;
-
-omp_critical_end_directive: OMPDVM_ENDCRITICAL end_spec LEFTPAR ident RIGHTPAR
-	{
-  	   $$ = make_endcritical();
-           $$->entry.Template.ll_ptr1 = $4;
-	}
-	| OMPDVM_ENDCRITICAL end_spec 
-	{
-  	   $$ = make_endcritical();
-	}
-	;
-
-omp_common_var: SLASH name op_slash_1 SLASH op_slash_0
-	{ 
-		PTR_SYMB s;
-		PTR_LLND l;
-		s = make_common($2); 
-		l = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-		$$ = make_llnd(fi,OMP_THREADPRIVATE, l, LLNULL, SMNULL);
-	};
-
-
-omp_variable_list: omp_common_var
-	{
-		$$ = set_ll_list($1,LLNULL,EXPR_LIST);
-	}
-	| ident
-	{	
-		$$ = set_ll_list($1,LLNULL,EXPR_LIST);
-	}
-	| omp_variable_list COMMA omp_common_var
-	{ 
-		$$ = set_ll_list($1,$3,EXPR_LIST);
-	}
-	| omp_variable_list COMMA ident
-	{ 
-		$$ = set_ll_list($1,$3,EXPR_LIST);
-	}
-	;
-
-op_slash_1 : {
-		operator_slash = 1;
-	};
-op_slash_0 : {
-		operator_slash = 0;
-	};
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/fspf.gram b/projects/dvm_svn/fdvm/trunk/parser/fspf.gram
deleted file mode 100644
index 6f288af..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/fspf.gram
+++ /dev/null
@@ -1,214 +0,0 @@
-spf_directive: spf_analysis
-             | spf_parallel      
-             | spf_transform
-             | spf_parallel_reg
-             | spf_end_parallel_reg
-             | spf_checkpoint
-	     ;
-
-spf_analysis: SPF_ANALYSIS in_unit LEFTPAR analysis_spec_list RIGHTPAR 
-             {  $$ = get_bfnd(fi,SPF_ANALYSIS_DIR,SMNULL,$4,LLNULL,LLNULL);}
-             ;
-
-spf_parallel: SPF_PARALLEL in_unit LEFTPAR parallel_spec_list RIGHTPAR 
-             {  $$ = get_bfnd(fi,SPF_PARALLEL_DIR,SMNULL,$4,LLNULL,LLNULL);}
-             ;
-
-spf_transform: SPF_TRANSFORM in_unit  LEFTPAR transform_spec_list RIGHTPAR 
-             {  $$ = get_bfnd(fi,SPF_TRANSFORM_DIR,SMNULL,$4,LLNULL,LLNULL);}
-             ;
-
-spf_parallel_reg: SPF_PARALLEL_REG in_unit region_name 
-                  { $$ = get_bfnd(fi,SPF_PARALLEL_REG_DIR,$3,LLNULL,LLNULL,LLNULL);}
-                | SPF_PARALLEL_REG in_unit region_name COMMA needkeyword  SPF_APPLY_REGION  LEFTPAR characteristic_list RIGHTPAR opt_clause_apply_fragment
-                  { $$ = get_bfnd(fi,SPF_PARALLEL_REG_DIR,$3,$8,$10,LLNULL);}
-                | SPF_PARALLEL_REG in_unit region_name COMMA needkeyword SPF_APPLY_FRAGMENT LEFTPAR characteristic_list RIGHTPAR opt_clause_apply_region
-                  { $$ = get_bfnd(fi,SPF_PARALLEL_REG_DIR,$3,$10,$8,LLNULL);}
-                ;
-
-characteristic_list:  characteristic
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             |  characteristic_list COMMA characteristic
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-characteristic: needkeyword SPF_CODE_COVERAGE
-                {  $$ = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
-              | needkeyword SPF_WEIGHT LEFTPAR DP_CONSTANT RIGHTPAR
-                { 
-                   PTR_LLND w;
-                   w = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
-	           w->entry.string_val = copys(yytext);
-	           w->type = global_double;
-                   $$ = make_llnd(fi,SPF_WEIGHT_OP,w,LLNULL,SMNULL);
-                }
-              ;
-
-opt_clause_apply_fragment: 
-                           { $$ = LLNULL;}
-                         | COMMA needkeyword SPF_APPLY_FRAGMENT LEFTPAR characteristic_list RIGHTPAR
-                           { $$ = $5;}
-                         ;
-
-opt_clause_apply_region: 
-                           { $$ = LLNULL;}
-                         | COMMA needkeyword SPF_APPLY_REGION LEFTPAR characteristic_list RIGHTPAR
-                           { $$ = $5;}
-                         ;
-
-spf_end_parallel_reg: SPF_END_PARALLEL_REG  in_unit
-                { $$ = get_bfnd(fi,SPF_END_PARALLEL_REG_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-                ;
-
-analysis_spec_list:  analysis_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | analysis_spec_list COMMA analysis_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-analysis_spec: analysis_reduction_spec
-             | analysis_private_spec
-             | analysis_process_private_spec
-             | analysis_parameter_spec
-             | analysis_cover_spec     
-             ;
-
-analysis_reduction_spec: needkeyword REDUCTION LEFTPAR reduction_list RIGHTPAR
-               { $$ = make_llnd(fi,REDUCTION_OP,$4,LLNULL,SMNULL); }    
-                     ;
-
-analysis_private_spec:   needkeyword PRIVATE LEFTPAR variable_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_PRIVATE_OP,$4,LLNULL,SMNULL);} 
-                     ;
-
-analysis_process_private_spec: needkeyword SPF_PROCESS_PRIVATE LEFTPAR variable_list RIGHTPAR
-               { $$ = make_llnd(fi,SPF_PROCESS_PRIVATE_OP,$4,LLNULL,SMNULL);} 
-                     ;
-
-analysis_cover_spec: needkeyword SPF_COVER LEFTPAR integer_constant RIGHTPAR
-               { $$ = make_llnd(fi,SPF_COVER_OP,$4,LLNULL,SMNULL);} 
-                     ;
-
-analysis_parameter_spec: needkeyword PARAMETER LEFTPAR spf_parameter_list RIGHTPAR
-               { $$ = make_llnd(fi,SPF_PARAMETER_OP,$4,LLNULL,SMNULL);}
-                     ;   
-spf_parameter_list: spf_parameter
-	       { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	     | spf_parameter_list COMMA spf_parameter
-               { $$ = set_ll_list($1, $3, EXPR_LIST); }
-             ;
-
-spf_parameter: array_element EQUAL expr
-	     { $$ = make_llnd(fi, ASSGN_OP, $1, $3, SMNULL); }
-	     ;
-
-parallel_spec_list:  parallel_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             |  parallel_spec_list COMMA parallel_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-parallel_spec: parallel_shadow_spec
-             | parallel_across_spec
-             | parallel_remote_access_spec     
-             ;
-
-parallel_shadow_spec:  needkeyword SHADOW LEFTPAR shadow_list RIGHTPAR
-                { $$ = make_llnd(fi,SHADOW_OP,$4,LLNULL,SMNULL);}
-                    ;
-
-parallel_across_spec:  needkeyword ACROSS LEFTPAR shadow_list RIGHTPAR
-                { $$ = make_llnd(fi,ACROSS_OP,$4,LLNULL,SMNULL);}
-                    ;
-
-parallel_remote_access_spec: needkeyword REMOTE_ACCESS_SPEC LEFTPAR remote_data_list RIGHTPAR
-                { $$ = make_llnd(fi,REMOTE_ACCESS_OP,$4,LLNULL,SMNULL);}
-                           ;
-
-transform_spec_list:  transform_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             |  transform_spec_list COMMA transform_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-transform_spec: needkeyword SPF_NOINLINE
-                { $$ = make_llnd(fi,SPF_NOINLINE_OP,LLNULL,LLNULL,SMNULL);}
-              | needkeyword SPF_FISSION LEFTPAR ident_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_FISSION_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_EXPAND 
-                { $$ = make_llnd(fi,SPF_EXPAND_OP,LLNULL,LLNULL,SMNULL);}
-              | needkeyword SPF_EXPAND LEFTPAR ident_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_EXPAND_OP,$4,LLNULL,SMNULL);}
-           /*   | needkeyword SPF_SHRINK LEFTPAR ident LEFTPAR digit_list RIGHTPAR RIGHTPAR  */
-              | needkeyword SPF_SHRINK LEFTPAR array_element_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_SHRINK_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_UNROLL 
-                { $$ = make_llnd(fi,SPF_UNROLL_OP,LLNULL,LLNULL,SMNULL);}
-              | needkeyword SPF_UNROLL LEFTPAR unroll_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_UNROLL_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_MERGE 
-                { $$ = make_llnd(fi,SPF_MERGE_OP,LLNULL,LLNULL,SMNULL);}
-              ;
-
-unroll_list: expr COMMA expr COMMA expr
-             {
-               $$ = set_ll_list($1, $3, EXPR_LIST);
-               $$ = set_ll_list($$, $5, EXPR_LIST);
-             } 
-           ;
-
-region_name: name
-           { $$ = make_parallel_region($1);}
-           ; 
-  
-array_element_list: array_element
-	           { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	          | array_element_list COMMA array_element 
-	           { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	          ;
-
-spf_checkpoint:  SPF_CHECKPOINT in_unit LEFTPAR checkpoint_spec_list RIGHTPAR 
-             {  $$ = get_bfnd(fi,SPF_CHECKPOINT_DIR,SMNULL,$4,LLNULL,LLNULL);}
-             ;
-
-checkpoint_spec_list:  checkpoint_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             |  checkpoint_spec_list COMMA checkpoint_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-checkpoint_spec: needkeyword TYPE LEFTPAR spf_type_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_TYPE_OP,$4,LLNULL,SMNULL);}
-              | needkeyword VARLIST LEFTPAR ident_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_VARLIST_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_EXCEPT LEFTPAR ident_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_EXCEPT_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_FILES_COUNT LEFTPAR expr RIGHTPAR
-                { $$ = make_llnd(fi,SPF_FILES_COUNT_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_INTERVAL LEFTPAR interval_spec COMMA expr RIGHTPAR
-                { $$ = make_llnd(fi,SPF_INTERVAL_OP,$4,$6,SMNULL);}
-              ;
-
-spf_type_list: spf_type
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | spf_type_list COMMA spf_type
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-spf_type:       needkeyword ACC_ASYNC
-              { $$ = make_llnd(fi,ACC_ASYNC_OP, LLNULL,LLNULL,SMNULL);}
-             |  needkeyword SPF_FLEXIBLE
-              { $$ = make_llnd(fi,SPF_FLEXIBLE_OP, LLNULL,LLNULL,SMNULL);}
-             ;
-
-interval_spec:  needkeyword SPF_TIME
-                { $$ = make_llnd(fi,SPF_TIME_OP, LLNULL,LLNULL,SMNULL);}
-             |  needkeyword SPF_ITER
-                { $$ = make_llnd(fi,SPF_ITER_OP, LLNULL,LLNULL,SMNULL);}
-             ;
-
-in_unit: 
-             { if(position==IN_OUTSIDE)
-                 err("Misplaced SPF-directive",103);
-             }
-             ;
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/parser/ftn.gram b/projects/dvm_svn/fdvm/trunk/parser/ftn.gram
deleted file mode 100644
index f36bd23..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/ftn.gram
+++ /dev/null
@@ -1,4594 +0,0 @@
-
-%{
-#include <string.h>
-#include "inc.h"
-#include "extern.h"
-#include "defines.h"
-#include "fdvm.h"
-#include "fm.h"
-
-/* We may use builtin alloca */
-#include "compatible.h"
-#ifdef _NEEDALLOCAH_
-#  include <alloca.h>
-#endif
-
-#define EXTEND_NODE 2  /* move the definition to h/ files. */
-
-extern PTR_BFND global_bfnd, pred_bfnd;
-extern PTR_SYMB star_symb;
-extern PTR_SYMB global_list;
-extern PTR_TYPE global_bool;
-extern PTR_TYPE global_int;
-extern PTR_TYPE global_float;
-extern PTR_TYPE global_double;
-extern PTR_TYPE global_char;
-extern PTR_TYPE global_string;
-extern PTR_TYPE global_string_2;
-extern PTR_TYPE global_complex;
-extern PTR_TYPE global_dcomplex;
-extern PTR_TYPE global_gate;
-extern PTR_TYPE global_event;
-extern PTR_TYPE global_sequence;
-extern PTR_TYPE global_default;
-extern PTR_LABEL thislabel;
-extern PTR_CMNT comments, cur_comment;
-extern PTR_BFND last_bfnd;
-extern PTR_TYPE impltype[];
-extern int nioctl;
-extern int maxdim;
-extern long yystno;	/* statement label */
-extern char stmtbuf[];	/* input buffer */
-extern char *commentbuf;	/* comments buffer from scanner */
-extern PTR_BLOB head_blob;
-extern PTR_BLOB cur_blob;
-extern PTR_TYPE vartype; /* variable type */
-extern int end_group;
-extern char saveall;
-extern int privateall;
-extern int needkwd;
-extern int implkwd;
-extern int opt_kwd_hedr;
-/* added for FORTRAN 90 */
-extern PTR_LLND first_unresolved_call;
-extern PTR_LLND last_unresolved_call;
-extern int data_stat;
-extern char yyquote;
-
-extern int warn_all;
-extern int statement_kind; /* kind of statement: 1 - HPF-DVM-directive, 0 - Fortran statement*/ 
-int extend_flag = 0;
-
-static int do_name_err;
-static int ndim;	/* number of dimension */
-/*!!! hpf */
-static int explicit_shape; /*  1 if shape specification is explicit */
-/* static int varleng;*/	/* variable size */
-static int lastwasbranch = NO;	/* set if last stmt was a branch stmt */
-static int thiswasbranch = NO;	/* set if this stmt is a branch stmt */
-static PTR_SYMB type_var = SMNULL;
-static PTR_LLND stat_alloc = LLNULL; /* set if ALLOCATE/DEALLOCATE stmt has STAT-clause*/
-/* static int subscripts_status = 0; */
-static int type_options,type_opt;   /* The various options used to declare a name -
-                                      RECURSIVE, POINTER, OPTIONAL etc.         */
-static PTR_BFND module_scope;
-static int position = IN_OUTSIDE;            
-static int attr_ndim;           /* number of dimensions in DIMENSION (array_spec)
-                                   attribute declaration */
-static PTR_LLND attr_dims;     /* low level representation of array_spec in
-                                   DIMENSION (array_spec) attribute declarartion. */
-static int in_vec = NO;	      /* set if processing array constructor */
-%}
-
-%union {
-    int token;
-    char charv;
-    char *charp;
-    PTR_BFND bf_node;
-    PTR_LLND ll_node;
-    PTR_SYMB symbol;
-    PTR_TYPE data_type;
-    PTR_HASH hash_entry;
-    PTR_LABEL label;
-}
-
-/*
- * gram.head
- *
- * First part of the Fortran grammar
- *
- */
-
-/* Specify precedences and associativities. */
-
-
-%left COMMA
-%nonassoc COLON
-%right EQUAL
-%left DEFINED_OPERATOR
-%left BINARY_OP
-%left EQV NEQV
-%left OR XOR
-%left AND
-%left NOT
-%nonassoc LT GT LE GE EQ NE
-%left DSLASH
-%left PLUS MINUS
-%left ASTER SLASH
-%right DASTER
-%nonassoc UNARY_OP
-
-%start program
-%type <token> addop  stop att_type
-%type <charv> letter
-%type <charp> filename
-%type <hash_entry> name opt_unit_name
-%type <symbol> progname blokname args arg arglist call comblock namelist_group
-%type <bf_node> program stat spec exec iffable goto logif
-%type <bf_node> dcl implicit data common dimension external intrinsic attrib
-%type <bf_node> equivalence namelist type_dcl end_type static
-%type <bf_node> intent optional public private sequence allocatable pointer target 
-%type <ll_node> implist impitem
-%type <ll_node> paramlist paramitem
-%type <ll_node> dim dims dimlist ubound funarglist funarg funargs opt_expr var
-%type <ll_node> labellist expr uexpr lhs simple_const lengspec substring 
-%type <ll_node> complex_const vec triplet
-%type <ll_node> dospec  use_name_list 
-%type <symbol>  do_var
-%type <label>   dotarget
-%type <symbol> funcname typedfunc procname
-%type <ll_node> equivset equivlist
-%type <ll_node> savelist saveitem
-
-/* FORTRAN 90 */
-%type <hash_entry> defined_op intrinsic_op operator construct_name
-%type <bf_node> case whereable interface use_stat forall
-%type <ll_node> forall_list forall_expr opt_forall_cond
-%type <bf_node> module_proc_stmt do_while plain_do
-%type <ll_node> opt_result_clause case_selector case_value_range
-%type <ll_node> case_value_range_list proper_lengspec
-%type <symbol>  opt_construct_name  
-%type <symbol>  module_name 
-%type <ll_node> selector initial_value clause opt_while
-%type <ll_node> options attr_spec_list attr_spec intent_spec access_spec
-%type <ll_node> string_constant structure_component opt_substring
-%type <ll_node> array_ele_substring_func_ref ident array_element 
-%type <ll_node> subscript_list asubstring equi_object
-%type <ll_node> allocation_list allocate_object_list
-%type <ll_node> allocate_object pointer_name_list rename_list rename_name use_name
-%type <ll_node> only_list only_name proc_name_list construct_name_colon
-%type <ll_node> kind numeric_bool_const integer_constant proc_attr
-
-/*
- * used by I/O statement
- */
-
-%type <bf_node> io read write print iofmove iofctl fmkwd ctlkwd inquire
-%type <ll_node> fexpr unpar_fexpr 
-%type <ll_node> ioctl ctllist ioclause nameeq inlist inelt
-%type <ll_node> outlist out2 other infmt
-
-%type <ll_node> label letgroups letgroup let
-%type <ll_node> callarglist callarg
-%type <data_type> typename typespec type type_implicit
-%type <label> thislabel
-
-
-%type <ll_node> dataimplieddo dlist dataelt datasubs datarange
-%type <ll_node> iconexprlist opticonexpr iconexpr iconterm
-%type <ll_node> iconfactor iconprimary
-%type <symbol>  dataname d_name
-
-/* 
- *
- * used by HPF and FDVM 
- */
-%type <bf_node> dvm_specification dvm_combined_dir dvm_pointer dvm_heap
-%type <bf_node> dvm_template dvm_processors dvm_indirect_group dvm_remote_group
-%type <bf_node> dvm_task dvm_inherit dvm_new_value
-%type <bf_node> dvm_dynamic dvm_align dvm_realign align_directive_stuff
-%type <bf_node> dvm_distribute dvm_redistribute dvm_exec
-%type <bf_node> dvm_parallel_on dvm_remote_access 
-%type <bf_node> dvm_shadow_group dvm_shadow_start dvm_shadow_wait dvm_shadow
-%type <bf_node> dvm_reduction_group dvm_reduction_start dvm_reduction_wait
-%type <bf_node> dvm_task_region  dvm_end_task_region dvm_map dvm_on dvm_end_on
-%type <bf_node> dvm_reset dvm_prefetch dvm_indirect_access hpf_independent 
-%type <bf_node> dvm_debug_dir dvm_enddebug_dir dvm_traceon_dir dvm_traceoff_dir
-%type <bf_node> dvm_interval_dir dvm_endinterval_dir dvm_exit_interval_dir dvm_barrier_dir dvm_check 
-%type <bf_node> dvm_io_mode_dir dvm_shadow_add dvm_localize
-%type <bf_node> dvm_cp_create dvm_cp_load dvm_cp_save dvm_cp_wait dvm_template_create dvm_template_delete
-%type <bf_node> dvm_asyncid dvm_f90 dvm_asynchronous dvm_endasynchronous dvm_asyncwait
-%type <bf_node> dvm_consistent_group dvm_consistent_start dvm_consistent_wait dvm_consistent
-%type <ll_node> dist_name dist_name_list dist_format dist_format_list
-%type <ll_node> distributee pointer_ar_elem
-%type <ll_node> dist_format_clause opt_dist_format_clause  shadow_width 
-%type <ll_node> opt_spec  dvm_attribute_list dvm_attribute
-%type <ll_node> new_spec reduction_spec shadow_spec remote_access_spec
-%type <ll_node> spec_list par_spec indirect_access_spec across_spec stage_spec
-%type <ll_node> in_out_across opt_in_out
-%type <ll_node> dependent_array_list dependent_array dependence  dependence_list
-%type <ll_node> variable_list reduction_list shadow_list distribute_cycles
-%type <ll_node> reduction reduction_op loc_op array_ident array_ident_list shadow
-%type <ll_node> dyn_array_name_list dyn_array_name 
-%type <ll_node> heap_array_name_list heap_array_name 
-%type <ll_node> align_base align_subscript_list par_subscript_list par_subscript
-%type <ll_node> remote_data_list remote_data remote_index_list remote_index
-%type <ll_node> dim_ident_list dim_ident align_subscript 
-%type <ll_node> realignee_list alignee realignee
-%type <ll_node> dummy_array_name_list dummy_array_name 
-%type <ll_node> ident_list sh_array_name 
-%type <ll_node> shadow_attr_stuff sh_width  sh_width_list
-%type <ll_node> pointer_var pointer_var_list dimension_list
-%type <ll_node> interval_number fragment_number
-%type <ll_node> task task_array opt_private_spec async 
-%type <ll_node> indirect_list indirect_reference opt_onto opt_on hpf_reduction_spec
-%type <ll_node> debparamlist debparam async_id_list async_id high_section
-%type <ll_node> section_spec_list section_spec section ar_section low_section
-%type <ll_node> consistent_spec consistent_array_name_list consistent_array_name
-%type <ll_node> mode_list mode_spec opt_mode
-%type <ll_node> derived_spec derived_elem derived_elem_list target_spec 
-%type <ll_node> derived_subscript derived_subscript_list opt_plus_shadow plus_shadow shadow_id
-%type <ll_node> template_ref template_obj shadow_axis shadow_axis_list opt_include_to 
-%type <ll_node> localize_target target_subscript target_subscript_list aster_expr dummy_ident 
-%type <ll_node> template_list tie_spec tied_array_list
-%type <symbol> processors_name align_base_name 
-%type <symbol> shadow_group_name reduction_group_name reduction_group  indirect_group_name task_name
-%type <symbol> remote_group_name group_name array_name async_ident consistent_group_name consistent_group
-%type <symbol> derived_target 
-
-/* FORTRAN OPENMPDVM*/
-%type <bf_node> omp_specification_directive omp_threadprivate_directive
-%type <bf_node> omp_execution_directive omp_section_directive
-%type <bf_node> omp_parallel_begin_directive omp_parallel_end_directive
-%type <bf_node> omp_sections_begin_directive omp_sections_end_directive
-%type <bf_node> omp_do_begin_directive omp_do_end_directive
-%type <bf_node> omp_single_begin_directive omp_single_end_directive
-%type <bf_node> omp_workshare_begin_directive omp_workshare_end_directive
-%type <bf_node> omp_parallel_do_begin_directive omp_parallel_do_end_directive
-%type <bf_node> omp_parallel_sections_begin_directive omp_parallel_sections_end_directive
-%type <bf_node> omp_parallel_workshare_begin_directive omp_parallel_workshare_end_directive
-%type <bf_node> omp_master_begin_directive omp_master_end_directive
-%type <bf_node> omp_ordered_begin_directive omp_ordered_end_directive
-%type <bf_node> omp_barrier_directive omp_atomic_directive omp_flush_directive
-%type <bf_node> omp_critical_begin_directive omp_critical_end_directive ompdvm_onethread
-
-%type <ll_node> parallel_clause_list parallel_clause
-%type <ll_node> ompprivate_clause ompfirstprivate_clause
-%type <ll_node> omplastprivate_clause ompcopyin_clause
-%type <ll_node> ompshared_clause ompdefault_clause
-%type <ll_node> def_expr ompif_clause ompnumthreads_clause
-%type <ll_node> ompreduction_clause ompreduction ompreduction_vars
-%type <ll_node> ompreduction_op
-%type <ll_node> sections_clause_list sections_clause
-%type <ll_node> do_clause_list do_clause omp_variable_list
-%type <ll_node> omp_common_var omp_variable_list_in_par
-%type <ll_node> ompordered_clause ompschedule_clause ompschedule_op
-%type <ll_node> single_clause_list single_clause
-%type <ll_node> end_single_clause_list end_single_clause
-%type <ll_node> ompcopyprivate_clause ompnowait_clause
-%type <ll_node> paralleldo_clause_list paralleldo_clause
-
-/* FORTRAN ACC */
-%type <bf_node> acc_specification acc_declare
-%type <bf_node> acc_directive acc_region acc_end_region acc_checksection acc_end_checksection
-%type <bf_node> acc_get_actual acc_actual acc_routine
-%type <ll_node> opt_clause acc_clause_list acc_clause data_clause async_clause targets_clause
-%type <ll_node> acc_var_list computer_list computer opt_routine_clauses routine_clause_list routine_clause
-%type <ll_node> acc_declare_list declare_var
-
-/* new clauses for PARALLEL directive */
-%type <ll_node> private_spec cuda_block_spec sizelist 
-
-/* SAPFOR */
-%type <bf_node> spf_directive spf_analysis spf_parallel spf_transform spf_parallel_reg spf_end_parallel_reg
-%type <bf_node> spf_checkpoint
-%type <ll_node> analysis_spec_list analysis_spec analysis_reduction_spec analysis_private_spec analysis_parameter_spec
-%type <ll_node> analysis_cover_spec analysis_process_private_spec
-%type <ll_node> parallel_spec_list parallel_spec parallel_shadow_spec parallel_across_spec parallel_remote_access_spec
-%type <ll_node> transform_spec_list transform_spec array_element_list spf_parameter_list spf_parameter
-%type <ll_node> characteristic characteristic_list opt_clause_apply_region opt_clause_apply_fragment 
-%type <ll_node> checkpoint_spec checkpoint_spec_list spf_type_list spf_type interval_spec unroll_list
-%type <symbol>  region_name 
-
-%{
-void add_scope_level();
-void delete_beyond_scope_level();
-PTR_HASH look_up_sym();
-PTR_HASH just_look_up_sym();
-PTR_HASH just_look_up_sym_in_scope();
-PTR_HASH look_up_op();
-PTR_SYMB make_constant();
-PTR_SYMB make_scalar();
-PTR_SYMB make_array();
-PTR_SYMB make_pointer();
-PTR_SYMB make_function();
-PTR_SYMB make_external();
-PTR_SYMB make_intrinsic();
-PTR_SYMB make_procedure();
-PTR_SYMB make_process();
-PTR_SYMB make_program();
-PTR_SYMB make_module();
-PTR_SYMB make_common();
-PTR_SYMB make_parallel_region();
-PTR_SYMB make_derived_type();
-PTR_SYMB make_local_entity();
-PTR_SYMB make_global_entity();
-PTR_TYPE make_type_node();
-PTR_TYPE lookup_type(), make_type();
-void     process_type();
-void     process_interface();
-void     bind();
-void     late_bind_if_needed();
-PTR_SYMB component();
-PTR_SYMB lookup_type_symbol();
-PTR_SYMB resolve_overloading();
-PTR_BFND cur_scope();
-PTR_BFND subroutine_call();
-PTR_BFND process_call();
-PTR_LLND deal_with_options();
-PTR_LLND intrinsic_op_node();
-PTR_LLND defined_op_node();
-int is_substring_ref();
-int is_array_section_ref();
-PTR_LLND dim_expr(); 
-PTR_BFND exit_stat();
-PTR_BFND make_do();
-PTR_BFND make_pardo();
-PTR_BFND make_enddoall();
-PTR_TYPE install_array(); 
-PTR_SYMB install_entry(); 
-void install_param_list();
-PTR_LLND construct_entry_list();
-void copy_sym_data();
-PTR_LLND check_and_install();
-PTR_HASH look_up();
-PTR_BFND get_bfnd(); 
-PTR_BLOB make_blob();
-PTR_LABEL make_label();
-PTR_LABEL make_label_node();
-int is_interface_stat();
-PTR_LLND make_llnd (); 
-PTR_LLND make_llnd_label (); 
-PTR_TYPE make_sa_type(); 
-PTR_SYMB procedure_call();
-PTR_BFND proc_list();
-PTR_SYMB set_id_list();
-PTR_LLND set_ll_list();
-PTR_LLND add_to_lowLevelList(), add_to_lowList();
-PTR_BFND set_stat_list() ;
-PTR_BLOB follow_blob();
-PTR_SYMB proc_decl_init();
-PTR_CMNT make_comment();
-PTR_HASH correct_symtab();
-char *copyn();
-char *convic();
-char *StringConcatenation();
-int atoi();
-PTR_BFND make_logif();
-PTR_BFND make_if();
-PTR_BFND make_forall();
-void startproc();
-void match_parameters();
-void make_else();
-void make_elseif();
-void make_endif();
-void make_elsewhere();
-void make_elsewhere_mask();
-void make_endwhere();
-void make_endforall();
-void make_endselect();
-void make_extend();
-void make_endextend();
-void make_section();
-void make_section_extend();
-void doinclude();
-void endproc();
-void err();
-void execerr();
-void flline();
-void warn();
-void warn1();
-void newprog();
-void set_type();
-void dclerr();
-void enddcl();
-void install_const();
-void setimpl();
-void copy_module_scope();
-void delete_symbol();
-void replace_symbol_in_expr();
-long convci();
-void set_expr_type();
-void errstr();
-void yyerror();
-void set_blobs();
-void make_loop();
-void startioctl();
-void endioctl();
-void redefine_func_arg_type();
-int isResultVar();
-int yylex();
-
-/* used by FORTRAN M */
-PTR_BFND make_processdo();
-PTR_BFND make_processes();
-PTR_BFND make_endprocesses();
-
-PTR_BFND make_endparallel();/*OMP*/
-PTR_BFND make_parallel();/*OMP*/
-PTR_BFND make_endsingle();/*OMP*/
-PTR_BFND make_single();/*OMP*/
-PTR_BFND make_endmaster();/*OMP*/
-PTR_BFND make_master();/*OMP*/
-PTR_BFND make_endordered();/*OMP*/
-PTR_BFND make_ordered();/*OMP*/
-PTR_BFND make_endcritical();/*OMP*/
-PTR_BFND make_critical();/*OMP*/
-PTR_BFND make_endsections();/*OMP*/
-PTR_BFND make_sections();/*OMP*/
-PTR_BFND make_ompsection();/*OMP*/
-PTR_BFND make_endparallelsections();/*OMP*/
-PTR_BFND make_parallelsections();/*OMP*/
-PTR_BFND make_endworkshare();/*OMP*/
-PTR_BFND make_workshare();/*OMP*/
-PTR_BFND make_endparallelworkshare();/*OMP*/
-PTR_BFND make_parallelworkshare();/*OMP*/
-
-%}
-%%
-
-program:    { $$ = BFNULL; }
-	| program stat EOLN
-	    { $$ = set_stat_list($1,$2); }
-	;
-
-stat:	  thislabel  entry cmnt
-	    { lastwasbranch = NO;  $$ = BFNULL; }
-	| thislabel  spec cmnt
-            {
-	       if ($2 != BFNULL) 
-               {	    
-	          $2->label = $1;
-	          $$ = $2;
-	 	  if (is_openmp_stmt) {            /*OMP*/
-			is_openmp_stmt = 0;
-			if($2) {                        /*OMP*/
-				if ($2->decl_specs != -BIT_OPENMP) $2->decl_specs = BIT_OPENMP; /*OMP*/
-			}                               /*OMP*/
-		  }                                       /*OMP*/
-               }
-	    }
-	| thislabel exec cmnt
-	    { PTR_BFND p;
-
-	     if(lastwasbranch && ! thislabel)
-               /*if (warn_all)
-		 warn("statement cannot be reached", 36);*/
-	     lastwasbranch = thiswasbranch;
-	     thiswasbranch = NO;
-	     if($2) $2->label = $1;
-	     if($1 && $2) $1->statbody = $2; /*8.11.06 podd*/
-	     if($1) {
-		/*$1->statbody = $2;*/ /*8.11.06 podd*/
-		if($1->labtype == LABFORMAT)
-		  err("label already that of a format",39);
-		else
-		  $1->labtype = LABEXEC;
-	     }
-	     if (is_openmp_stmt) {            /*OMP*/
-			is_openmp_stmt = 0;
-			if($2) {                        /*OMP*/
-				if ($2->decl_specs != -BIT_OPENMP) $2->decl_specs = BIT_OPENMP; /*OMP*/
-			}                               /*OMP*/
-	     }                                       /*OMP*/
-             for (p = pred_bfnd; $1 && 
-		  ((p->variant == FOR_NODE)||(p->variant == WHILE_NODE)) &&
-                  (p->entry.for_node.doend) &&
-		  (p->entry.for_node.doend->stateno == $1->stateno);
-		  p = p->control_parent)
-                ++end_group;
-	     $$ = $2;
-     }
-	| thislabel INCLUDE filename
-		{ /* PTR_LLND p; */
-			doinclude( $3 );
-/*			p = make_llnd(fi, STRING_VAL, LLNULL, LLNULL, SMNULL);
-			p->entry.string_val = $3;
-			p->type = global_string;
-			$$ = get_bfnd(fi, INCLUDE_STAT, SMNULL, p, LLNULL); */
-			$$ = BFNULL;
-		}
-	| thislabel UNKNOWN
-	    {
-	      err("Unclassifiable statement", 10);
-	      flline();
-	      $$ = BFNULL;
-	    };
-	| COMMENT
-	    { PTR_CMNT p;
-              PTR_BFND bif; 
-	    
-              if (last_bfnd && last_bfnd->control_parent &&((last_bfnd->control_parent->variant == LOGIF_NODE)
-	         ||(last_bfnd->control_parent->variant == FORALL_STAT)))
-  	         bif = last_bfnd->control_parent;
-              else
-                 bif = last_bfnd;
-              p=bif->entry.Template.cmnt_ptr;
-              if(p)
-                 p->string = StringConcatenation(p->string,commentbuf);
-              else
-              {
-                 p = make_comment(fi,commentbuf, FULL);
-                 bif->entry.Template.cmnt_ptr = p;
-              }
- 	      $$ = BFNULL;         
-            }
-
-	| error
-	    { 
-	      flline();	 needkwd = NO;	inioctl = NO;
-/*!!!*/
-              opt_kwd_ = NO; intonly = NO; opt_kwd_hedr = NO; opt_kwd_r = NO; as_op_kwd_= NO; optcorner = NO;
-	      yyerrok; yyclearin;  $$ = BFNULL;
-	    }
-	;
-
-thislabel:  LABEL
-	    {
-	    if(yystno)
-	      {
-	      $$ = thislabel =	make_label_node(fi,yystno);
-	      thislabel->scope = cur_scope();
-	      if (thislabel->labdefined && (thislabel->scope == cur_scope()))
-		 errstr("Label %s already defined",convic(thislabel->stateno),40);
-	      else
-		 thislabel->labdefined = YES;
-	      }
-	    else
-	      $$ = thislabel = LBNULL;
-	    }
-	;
-
-entry:	  PROGRAM new_prog progname
-	    { PTR_BFND p;
-
-	        if (pred_bfnd != global_bfnd)
-		    err("Misplaced PROGRAM statement", 33);
-		p = get_bfnd(fi,PROG_HEDR, $3, LLNULL, LLNULL, LLNULL);
-		$3->entry.prog_decl.prog_hedr=p;
- 		set_blobs(p, global_bfnd, NEW_GROUP1);
-	        add_scope_level(p, NO);
-	        position = IN_PROC;
-	    }
-
-	| BLOCKDATA new_prog blokname
-	    {  PTR_BFND q = BFNULL;
-
-	      $3->variant = PROCEDURE_NAME;
-	      $3->decl = YES;   /* variable declaration has been seen. */
-	      q = get_bfnd(fi,BLOCK_DATA, $3, LLNULL, LLNULL, LLNULL);
-	      set_blobs(q, global_bfnd, NEW_GROUP1);
-              add_scope_level(q, NO);
-	    }
-
-	| SUBROUTINE new_prog procname arglist
-	    { 
-              install_param_list($3, $4, LLNULL, PROCEDURE_NAME); 
-	      /* if there is only a control end the control parent is not set */
-              
-	     }
- 
-	| proc_attr SUBROUTINE new_prog procname arglist
-	    { install_param_list($4, $5, LLNULL, PROCEDURE_NAME); 
-              if($1->variant == RECURSIVE_OP) 
-                   $4->attr = $4->attr | RECURSIVE_BIT;
-              pred_bfnd->entry.Template.ll_ptr3 = $1;
-            }
-	| FUNCTION new_prog funcname arglist opt_result_clause
-	    {
-              install_param_list($3, $4, $5, FUNCTION_NAME);  
-  	      pred_bfnd->entry.Template.ll_ptr1 = $5;
-            }
-	| typedfunc arglist opt_result_clause
-	    {
-              install_param_list($1, $2, $3, FUNCTION_NAME); 
-	      pred_bfnd->entry.Template.ll_ptr1 = $3;
-	    }
-	| ENTRY name arglist opt_result_clause
-	    {PTR_BFND p, bif;
-	     PTR_SYMB q = SMNULL;
-             PTR_LLND l = LLNULL;
-
-	     if(parstate==OUTSIDE || procclass==CLMAIN || procclass==CLBLOCK)
-	        err("Misplaced ENTRY statement", 35);
-
-	     bif = cur_scope();
-	     if (bif->variant == FUNC_HEDR) {
-	        q = make_function($2, bif->entry.Template.symbol->type, LOCAL);
-	        l = construct_entry_list(q, $3, FUNCTION_NAME); 
-             }
-             else if ((bif->variant == PROC_HEDR) || 
-                      (bif->variant == PROS_HEDR) || /* added for FORTRAN M */
-                      (bif->variant == PROG_HEDR)) {
-	             q = make_procedure($2,LOCAL);
-  	             l = construct_entry_list(q, $3, PROCEDURE_NAME); 
-             }
-	     p = get_bfnd(fi,ENTRY_STAT, q, l, $4, LLNULL);
-	     set_blobs(p, pred_bfnd, SAME_GROUP);
-             q->decl = YES;   /*4.02.03*/
-             q->entry.proc_decl.proc_hedr = p; /*5.02.03*/
-	    }
-	| MODULE  new_prog  name 
-	    { PTR_SYMB s;
-	      PTR_BFND p;
-/*
-	      s = make_global_entity($3, MODULE_NAME, global_default, NO);
-	      s->decl = YES;  
-	      p = get_bfnd(fi, MODULE_STMT, s, LLNULL, LLNULL, LLNULL);
-	      s->entry.Template.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-*/
-	      /*position = IN_MODULE;*/
-
-
-               s = make_module($3);
-	       s->decl = YES;   /* variable declaration has been seen. */
-	        if (pred_bfnd != global_bfnd)
-		    err("Misplaced MODULE statement", 33);
-              p = get_bfnd(fi, MODULE_STMT, s, LLNULL, LLNULL, LLNULL);
-	      s->entry.Template.func_hedr = p; /* !!!????*/
-	      set_blobs(p, global_bfnd, NEW_GROUP1);
-	      add_scope_level(p, NO);	
-	      position =  IN_MODULE;    /*IN_PROC*/
-              privateall = 0;
-            }
-	;
-
-new_prog:   { newprog(); 
-	      if (position == IN_OUTSIDE)
-	           position = IN_PROC;
-              else if (position != IN_INTERNAL_PROC){ 
-                if(!is_interface_stat(pred_bfnd))
-	           position--;
-              }
-              else {
-                if(!is_interface_stat(pred_bfnd))
-                  err("Internal procedures can not contain procedures",304);
-              }
-	    }
-	;
-
-proc_attr: RECURSIVE needkeyword
-           { $$ = make_llnd(fi, RECURSIVE_OP, LLNULL, LLNULL, SMNULL); }
-         | PURE needkeyword
-           { $$ = make_llnd(fi, PURE_OP, LLNULL, LLNULL, SMNULL); }
-         | ELEMENTAL needkeyword
-           { $$ = make_llnd(fi, ELEMENTAL_OP, LLNULL, LLNULL, SMNULL); }
-         ;
-
-procname:  name
-           { PTR_BFND p;
-
-	      $$ = make_procedure($1, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-             /* if (pred_bfnd != global_bfnd)
-		 {
-	         err("Misplaced SUBROUTINE statement", 34);
-		 }  
-              */
-	      p = get_bfnd(fi,PROC_HEDR, $$, LLNULL, LLNULL, LLNULL);
-              $$->entry.proc_decl.proc_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-          ;
-
-funcname:  name
-           { PTR_BFND p;
-
-	      $$ = make_function($1, TYNULL, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-             /* if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement", 34); */
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, LLNULL, LLNULL);
-              $$->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-           ;
-
-typedfunc: type  FUNCTION new_prog name 
-           { PTR_BFND p;
-             PTR_LLND l;
-
-	      $$ = make_function($4, $1, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-              l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-              l->type = $1;
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, l, LLNULL);
-              $$->entry.func_decl.func_hedr = p;
-            /*  if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement", 34);*/
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-/*
-	      $$ = make_function($4, $1, LOCAL);
-	      $$->decl = YES;
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, LLNULL, LLNULL);
-              if (pred_bfnd != global_bfnd)
-	         errstr("cftn.gram: misplaced SUBROUTINE statement.");
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-*/
-           }        
-	| type  proc_attr FUNCTION new_prog name
-           { PTR_BFND p;
-             PTR_LLND l;
-	      $$ = make_function($5, $1, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-              if($2->variant == RECURSIVE_OP)
-	         $$->attr = $$->attr | RECURSIVE_BIT;
-              l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-              l->type = $1;
-             /* if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement", 34);*/
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, l, $2);
-              $$->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-	| proc_attr FUNCTION new_prog name
-           { PTR_BFND p;
-
-	      $$ = make_function($4, TYNULL, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-              if($1->variant == RECURSIVE_OP)
-	        $$->attr = $$->attr | RECURSIVE_BIT;
-              /*if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement",34);*/
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, LLNULL, $1);
-              $$->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-	| proc_attr type FUNCTION new_prog name
-           { PTR_BFND p;
-              PTR_LLND l;
-	      $$ = make_function($5, $2, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-              if($1->variant == RECURSIVE_OP)
-	        $$->attr = $$->attr | RECURSIVE_BIT;
-              l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-              l->type = $2;
-             /* if (pred_bfnd != global_bfnd)
-	          err("Misplaced FUNCTION statement",34);*/
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, l, $1);
-              $$->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-	;
-
-opt_result_clause: needkeyword keywordoff
-	    { $$ = LLNULL; }
-	| needkeyword RESULT LEFTPAR name RIGHTPAR 
-	    { PTR_SYMB s;
-              s = make_scalar($4, TYNULL, LOCAL);
-              $$ = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-            }
-	;
-
-name:	  IDENTIFIER
-	    { $$ = look_up_sym(yytext); }
-	;
-
-progname:   { $$ = make_program(look_up_sym("_MAIN")); }
-	| name
-	    {
-              $$ = make_program($1);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-            }
-	;
-
-blokname:   { $$ = make_program(look_up_sym("_BLOCK")); }
-	| name
-	    {
-              $$ = make_program($1); 
-	      $$->decl = YES;   /* variable declaration has been seen. */
-	    }
-	;
-
-arglist:
-	    { $$ = SMNULL; }
-	| LEFTPAR RIGHTPAR
-	    { $$ = SMNULL; }
-	| LEFTPAR args RIGHTPAR
-	    { $$ = $2; }
-	;
-
-args:	  arg
-	| args COMMA arg
-	    { $$ = set_id_list($1, $3); }
-	;
-
-arg:	  name
-	    {
-	      $$ = make_scalar($1, TYNULL, IO);
-            }
-	| ASTER
-	    { $$ = make_scalar(look_up_sym("*"), TYNULL, IO); }   /*star_symb*/
-	;
-
-
-
-filename: CHAR_CONSTANT
-	    { char *s;
-
-	      s = copyn(yyleng+1, yytext);
-	      s[yyleng] = '\0';
-	      $$ = s;
-	    }
-	;
-
-needkeyword: 
-            { needkwd = 1; }
-         ;
-
-keywordoff: 
-            { needkwd = NO; }
-         ;
-
-/* The scanner checks if the keyword is ONLY. */
-keyword_if_colon_follow: 
-            { colon_flag = YES; }
-         ;
-
-/*
- * Grammar for declarations
- */
-
-spec:	  type_dcl
-	| end_type
-	| dcl
-	| common
-        | dimension
-        | dvm_specification /* FDVM */
-        | acc_specification /* FDVM */
-	| external
-	| intrinsic
-	| equivalence
-	| implicit
-	| attrib
-	| namelist
-	| data
-	| SAVE in_dcl
-	    {
-	      saveall = YES;
-	      $$ = get_bfnd(fi,SAVE_DECL, SMNULL, LLNULL, LLNULL, LLNULL);
-	    }
-	| SAVE in_dcl  opt_double_colon savelist
-	    {
-	      $$ = get_bfnd(fi,SAVE_DECL, SMNULL, $4, LLNULL, LLNULL);
-            }
-
-	| FORMAT inside
-           { PTR_LLND p;
-
-	      p = make_llnd(fi,STMT_STR, LLNULL, LLNULL, SMNULL);
-	      p->entry.string_val = copys(stmtbuf);
-	      $$ = get_bfnd(fi,FORMAT_STAT, SMNULL, p, LLNULL, LLNULL);
-             }
-	| PARAMETER in_dcl LEFTPAR paramlist RIGHTPAR
-           { $$ = get_bfnd(fi,PARAM_DECL, SMNULL, $4, LLNULL, LLNULL); }
-	| intent
-	| optional
-	| public
-	| private
-        | sequence
-	| allocatable
-	| pointer
-	| target
-	| interface
-	| use_stat
-	| module_proc_stmt
-        | static
-	;
-
-interface: INTERFACE in_dcl
-	    { $$ = get_bfnd(fi, INTERFACE_STMT, SMNULL, LLNULL, LLNULL, LLNULL); 
-              add_scope_level($$, NO);     
-            }
-	| INTERFACE in_dcl name
-	    { PTR_SYMB s;
-
-	      s = make_procedure($3, LOCAL);
-	      s->variant = INTERFACE_NAME;
-	      $$ = get_bfnd(fi, INTERFACE_STMT, s, LLNULL, LLNULL, LLNULL);
-              add_scope_level($$, NO);
-	    }
-	| INTERFACEOPERATOR in_dcl LEFTPAR operator RIGHTPAR 
-	    { PTR_SYMB s;
-
-	      s = make_function($4, global_default, LOCAL);
-	      s->variant = INTERFACE_NAME;
-	      $$ = get_bfnd(fi, INTERFACE_OPERATOR, s, LLNULL, LLNULL, LLNULL);
-              add_scope_level($$, NO);
-	    }
-	| INTERFACEASSIGNMENT in_dcl LEFTPAR EQUAL RIGHTPAR
-	    { PTR_SYMB s;
-
-
-	      s = make_procedure(look_up_sym("="), LOCAL);
-	      s->variant = INTERFACE_NAME;
-	      $$ = get_bfnd(fi, INTERFACE_ASSIGNMENT, s, LLNULL, LLNULL, LLNULL);
-              add_scope_level($$, NO);
-	    }
-	| ENDINTERFACE  opt_unit_name 
-	    { parstate = INDCL;
-              $$ = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
-	      /*process_interface($$);*/ /*podd 01.02.03*/
-              delete_beyond_scope_level(pred_bfnd);
-	    }
-	;
-
-defined_op: DEFINED_OPERATOR
-	    { $$ = look_up_sym(yytext); }
-	;
-
-operator: defined_op
-	    { $$ = $1; }
-	| intrinsic_op
-	    { $$ = $1; }
-	;
-
-intrinsic_op: PLUS
-	    { $$ = look_up_op(PLUS); }
-	| MINUS
-	    { $$ = look_up_op(MINUS); }
-	| ASTER
-	    { $$ = look_up_op(ASTER); }
-	| DASTER
-	    { $$ = look_up_op(DASTER); }
-	| SLASH
-	    { $$ = look_up_op(SLASH); }
-	| DSLASH
-	    { $$ = look_up_op(DSLASH); }
-	| AND
-	    { $$ = look_up_op(AND); }
-	| OR
-	    { $$ = look_up_op(OR); }
-	| XOR
-	    { $$ = look_up_op(XOR); }
-	| NOT
-	    { $$ = look_up_op(NOT); }
-	| EQ
-	    { $$ = look_up_op(EQ); }
-	| NE
-	    { $$ = look_up_op(NE); }
-	| GT
-	    { $$ = look_up_op(GT); }
-	| GE
-	    { $$ = look_up_op(GE); }
-        | LT
-	    { $$ = look_up_op(LT); }
-	| LE
-	    { $$ = look_up_op(LE); }
-	| NEQV
-	    { $$ = look_up_op(NEQV); }
-	| EQV
-	    { $$ = look_up_op(EQV); }
-	;
-
-
-type_dcl: TYPE_DECL in_dcl opt_double_colon name
-	   {
-             PTR_SYMB s;
-         
-             type_var = s = make_derived_type($4, TYNULL, LOCAL);	
-             $$ = get_bfnd(fi, STRUCT_DECL, s, LLNULL, LLNULL, LLNULL);
-             add_scope_level($$, NO);
-	   }
-
-	| TYPE_DECL COMMA in_dcl needkeyword access_spec opt_double_colon name
-	   { PTR_SYMB s;
-         
-             type_var = s = make_derived_type($7, TYNULL, LOCAL);	
-	     s->attr = s->attr | type_opt;
-             $$ = get_bfnd(fi, STRUCT_DECL, s, $5, LLNULL, LLNULL);
-             add_scope_level($$, NO);
-	   }
-	;
-
-end_type: ENDTYPE in_dcl
-	   {
-	     $$ = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	     if (type_var != SMNULL)
-               process_type(type_var, $$);
-             type_var = SMNULL;
-	     delete_beyond_scope_level(pred_bfnd);
-           }
-	| ENDTYPE in_dcl name
-	   {
-             $$ = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	     if (type_var != SMNULL)
-               process_type(type_var, $$);
-             type_var = SMNULL;
-	     delete_beyond_scope_level(pred_bfnd);	
-           }
-	;
-
-dcl:	 type options name in_dcl dims lengspec initial_value
-	    { 
-	      PTR_LLND q, r, l;
-	     /* PTR_SYMB s;*/
-	      PTR_TYPE t;
-	      int type_opts;
-
-	      vartype = $1;
-              if($6 && vartype->variant != T_STRING)
-                errstr("Non character entity  %s  has length specification",$3->ident,41);
-              t = make_type_node(vartype, $6);
-	      type_opts = type_options;
-	      if ($5) type_opts = type_opts | DIMENSION_BIT;
-	      if ($5)
-		 q = deal_with_options($3, t, type_opts, $5, ndim, $7, $5);
-	      else q = deal_with_options($3, t, type_opts, attr_dims, attr_ndim, $7, $5);
-	      r = make_llnd(fi, EXPR_LIST, q, LLNULL, SMNULL);
-	      l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-	      l->type = vartype;
-	      $$ = get_bfnd(fi,VAR_DECL, SMNULL, r, l, $2);
-	    }
-	| dcl COMMA name dims lengspec initial_value
-	    { 
-	      PTR_LLND q, r;
-	    /*  PTR_SYMB s;*/
-              PTR_TYPE t;
-	      int type_opts;
-              if($5 && vartype->variant != T_STRING)
-                errstr("Non character entity  %s  has length specification",$3->ident,41);
-              t = make_type_node(vartype, $5);
-	      type_opts = type_options;
-	      if ($4) type_opts = type_opts | DIMENSION_BIT;
-	      if ($4)
-		 q = deal_with_options($3, t, type_opts, $4, ndim, $6, $4);
-	      else q = deal_with_options($3, t, type_opts, attr_dims, attr_ndim, $6, $4);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-       	    }
-        ;
-
-options: 
-	    { $$ = LLNULL; }
-	| COLON COLON
-            { $$ = LLNULL; }
-	| COMMA needkeyword attr_spec_list COLON COLON
-	    { $$ = $3; }
-	;
-
-attr_spec_list:  attr_spec
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| attr_spec_list COMMA needkeyword attr_spec
-	    { $$ = set_ll_list($1, $4, EXPR_LIST); }
-	;
-
-attr_spec: PARAMETER
-	    { type_options = type_options | PARAMETER_BIT; 
-              $$ = make_llnd(fi, PARAMETER_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| access_spec
-            { $$ = $1; }
-	| ALLOCATABLE
-	    { type_options = type_options | ALLOCATABLE_BIT;
-              $$ = make_llnd(fi, ALLOCATABLE_OP, LLNULL, LLNULL, SMNULL);
-	    }
-	| DIMENSION dims
-	    { type_options = type_options | DIMENSION_BIT;
-	      attr_ndim = ndim;
-	      attr_dims = $2;
-              $$ = make_llnd(fi, DIMENSION_OP, $2, LLNULL, SMNULL);
-            }
-	| EXTERNAL
-	    { type_options = type_options | EXTERNAL_BIT;
-              $$ = make_llnd(fi, EXTERNAL_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| INTENT LEFTPAR intent_spec RIGHTPAR
-	    { $$ = $3; }
-	| INTRINSIC
-	    { type_options = type_options | INTRINSIC_BIT;
-              $$ = make_llnd(fi, INTRINSIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| OPTIONAL
-	    { type_options = type_options | OPTIONAL_BIT;
-              $$ = make_llnd(fi, OPTIONAL_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| POINTER
-	    { type_options = type_options | POINTER_BIT;
-              $$ = make_llnd(fi, POINTER_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| SAVE
-	    { type_options = type_options | SAVE_BIT; 
-              $$ = make_llnd(fi, SAVE_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| STATIC
-	    { type_options = type_options | SAVE_BIT; 
-              $$ = make_llnd(fi, STATIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| TARGET
-	    { type_options = type_options | TARGET_BIT; 
-              $$ = make_llnd(fi, TARGET_OP, LLNULL, LLNULL, SMNULL);
-            }
-	;
-
-intent_spec: needkeyword IN
-	    { type_options = type_options | IN_BIT;  type_opt = IN_BIT; 
-              $$ = make_llnd(fi, IN_OP, LLNULL, LLNULL, SMNULL);
-            }
-        | needkeyword OUT
-	    { type_options = type_options | OUT_BIT;  type_opt = OUT_BIT; 
-              $$ = make_llnd(fi, OUT_OP, LLNULL, LLNULL, SMNULL);
-            }
-        | needkeyword INOUT
-	    { type_options = type_options | INOUT_BIT;  type_opt = INOUT_BIT;
-              $$ = make_llnd(fi, INOUT_OP, LLNULL, LLNULL, SMNULL);
-            }
-	;
-
-access_spec: PUBLIC
-	    { type_options = type_options | PUBLIC_BIT; 
-              type_opt = PUBLIC_BIT;
-              $$ = make_llnd(fi, PUBLIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-	   | PRIVATE
-	    { type_options =  type_options | PRIVATE_BIT;
-               type_opt = PRIVATE_BIT;
-              $$ = make_llnd(fi, PRIVATE_OP, LLNULL, LLNULL, SMNULL);
-            }
-        ;
-
-intent:	 INTENT in_dcl LEFTPAR intent_spec RIGHTPAR opt_double_colon name
-	    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar($7, TYNULL, LOCAL);
-	      s->attr = s->attr | type_opt;	
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, INTENT_STMT, SMNULL, r, $4, LLNULL);
-	    }
-	| intent COMMA name 
-	    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar($3, TYNULL, LOCAL);	
-	      s->attr = s->attr | type_opt;
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-  	    }
-	;
-
-optional: OPTIONAL in_dcl opt_double_colon name
-	    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar($4, TYNULL, LOCAL);	
-	      s->attr = s->attr | OPTIONAL_BIT;
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, OPTIONAL_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| optional COMMA name 
-	    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar($3, TYNULL, LOCAL);	
-	      s->attr = s->attr | OPTIONAL_BIT;
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-  	    }
-	;
-
-static: STATIC in_dcl opt_double_colon var
-	    { 
-	      PTR_LLND r;
-	      PTR_SYMB s;
-
-              s = $4->entry.Template.symbol; 
-              s->attr = s->attr | SAVE_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, STATIC_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| static COMMA var 
-	    { 
-	      PTR_LLND r;
-	      PTR_SYMB s;
-
-              s = $3->entry.Template.symbol;
-              s->attr = s->attr | SAVE_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-  	    }
-	;
-
-
-private: PRIVATE in_dcl
-	    {
-	      privateall = 1;
-	      $$ = get_bfnd(fi, PRIVATE_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
-	    }
-	| PRIVATE in_dcl opt_double_colon private_attr use_name_list
-	    {
-	      /*type_options = type_options | PRIVATE_BIT;*/
-	      $$ = get_bfnd(fi, PRIVATE_STMT, SMNULL, $5, LLNULL, LLNULL);
-            }
-        ;
-private_attr:
-              {type_opt = PRIVATE_BIT;}
-            ;
-
-sequence: SEQUENCE in_dcl
-	    { 
-	      $$ = get_bfnd(fi, SEQUENCE_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
-            }
-
-public: PUBLIC in_dcl
-	    {
-	      /*saveall = YES;*/ /*14.03.03*/
-	      $$ = get_bfnd(fi, PUBLIC_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
-	    }
-	| PUBLIC in_dcl opt_double_colon public_attr use_name_list
-	    {
-	      /*type_options = type_options | PUBLIC_BIT;*/
-	      $$ = get_bfnd(fi, PUBLIC_STMT, SMNULL, $5, LLNULL, LLNULL);
-            }
-
-public_attr:
-              {type_opt = PUBLIC_BIT;}
-            ;
-
-type:	  typespec  opt_key_hedr  selector  opt_key_hedr 
-	    {
-	      type_options = 0;
-              /* following block added by dbg */
-	      ndim = 0;
-	      attr_ndim = 0;
-	      attr_dims = LLNULL;
-	      /* end section added by dbg */
-              $$ = make_type_node($1, $3);
-            }
-	| TYPE LEFTPAR name RIGHTPAR opt_key_hedr
-	    { PTR_TYPE t;
-
-	      type_options = 0;
-	      ndim = 0;
-	      attr_ndim = 0;
-	      attr_dims = LLNULL;
-              t = lookup_type($3);
-	      vartype = t;
-	      $$ = make_type_node(t, LLNULL);
-            }
-	;
-
-opt_key_hedr:
-            {opt_kwd_hedr = YES;}
-            ;
-
-attrib:   att_type name
-
-	    { PTR_TYPE p;
-	      PTR_LLND q;
-	      PTR_SYMB s;
-              s = $2->id_attr;
-	      if (s)
-		   s->attr = $1;
-	      else {
-		p = undeftype ? global_unknown : impltype[*$2->ident - 'a'];
-                s = install_entry($2, SOFT);
-		s->attr = $1;
-                set_type(s, p, LOCAL);
-	      }
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $2->id_attr);
-	      q = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,ATTR_DECL, SMNULL, q, LLNULL, LLNULL);
-	    }
-
-	| attrib COMMA name
-
-	    { PTR_TYPE p;
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-	      int att;
-
-	      att = $1->entry.Template.ll_ptr1->entry.Template.ll_ptr1->
-		    entry.Template.symbol->attr;
-              s = $3->id_attr;
-	      if (s)
-		   s->attr = att;
-	      else {
-		p = undeftype ? global_unknown : impltype[*$3->ident - 'a'];
-                s = install_entry($3, SOFT);
-		s->attr = att;
-                set_type(s, p, LOCAL);
-	      }
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3->id_attr);
-	      for (r = $1->entry.Template.ll_ptr1;
-		   r->entry.list.next;
-		   r = r->entry.list.next) ;
-	      r->entry.list.next = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-
-	    }
-	;
-
-att_type: GLOBAL_A
-	 { $$ = ATT_GLOBAL; }
-	| CLUSTER
-	 { $$ = ATT_CLUSTER; }
-	;
-
-/*
-opt_attr:
-	| TASK_GLOBAL
-	| PROCESS_GLOBAL
-	| TASK_CLUSTER
-	| PROCESS_CLUSTER
-	;
-*/
-typespec:  typename
-		{
-/*		  varleng = ($1<0 || $1==TYLONG ? 0 : typesize[$1]); */
-		  vartype = $1;
-		}
-
-	;
-
-typename: INTEGER	{ $$ = global_int; }
-	| REAL		{ $$ = global_float; }
-	| COMPLEX	{ $$ = global_complex; }
-	| DOUBLEPRECISION { $$ = global_double; }
-	| DOUBLECOMPLEX	{ $$ = global_dcomplex; }
-	| LOGICAL	{ $$ = global_bool; }
-	| CHARACTER	{ $$ = global_string; }
-
-	;
-
-lengspec:
-	    { $$ = LLNULL; }
-	| proper_lengspec
-	    { $$ = $1; }
-	;
-
-proper_lengspec: ASTER intonlyon integer_constant intonlyoff  opt_key_hedr
-	        { $$ = make_llnd(fi, LEN_OP, $3, LLNULL, SMNULL); }
-	       | ASTER  intonlyon LEFTPAR intonlyoff ASTER RIGHTPAR 
-	        { PTR_LLND l;
-
-                 l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL); 
-                 l->entry.string_val = (char *)"*";
-                 $$ = make_llnd(fi, LEN_OP, l,l, SMNULL);
-                }
-               | ASTER intonlyon LEFTPAR  intonlyoff expr RIGHTPAR 
-                {$$ = make_llnd(fi, LEN_OP, $5, $5, SMNULL);}
-	       ;
-
-selector:
-	    { $$ = LLNULL; }
- 	| proper_lengspec  
-	    { $$ = $1; } 
-        | LEFTPAR in_ioctl  clause  end_ioctl RIGHTPAR 
-	    { /*$$ = make_llnd(fi, PAREN_OP, $2, LLNULL, SMNULL);*/  $$ = $3;  }
-        | LEFTPAR  in_ioctl  clause  end_ioctl COMMA  in_ioctl  clause  end_ioctl RIGHTPAR
-      /*  | LEFTPAR in_ioctl clause COMMA clause RIGHTPAR 
-	    { PTR_LLND l;
-
-              l = make_llnd(fi, CONS, $2, $4, SMNULL);
-	      $$ = make_llnd(fi, PAREN_OP, l, LLNULL, SMNULL);}
-       */
-            { if($7->variant==LENGTH_OP && $3->variant==$7->variant)
-                $7->variant=KIND_OP;
-                $$ = make_llnd(fi, CONS, $3, $7, SMNULL); 
-            }             
-	;
-
-clause:   expr
-	    { if(vartype->variant == T_STRING)
-                $$ = make_llnd(fi,LENGTH_OP,$1,LLNULL,SMNULL);
-              else
-                $$ = make_llnd(fi,KIND_OP,$1,LLNULL,SMNULL);
-            }
-	| ASTER
-	    { PTR_LLND l;
-	      l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	      l->entry.string_val = (char *)"*";
-              $$ = make_llnd(fi,LENGTH_OP,l,LLNULL,SMNULL);
-            }
-	| nameeq expr
-	    { /* $$ = make_llnd(fi, SPEC_PAIR, $2, LLNULL, SMNULL); */
-	     char *q;
-             q = $1->entry.string_val;
-  	     if (strcmp(q, "len") == 0)
-               $$ = make_llnd(fi,LENGTH_OP,$2,LLNULL,SMNULL);
-             else
-                $$ = make_llnd(fi,KIND_OP,$2,LLNULL,SMNULL);              
-            }
-        | nameeq ASTER
-	    { PTR_LLND l;
-	      l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	      l->entry.string_val = (char *)"*";
-              $$ = make_llnd(fi,LENGTH_OP,l,LLNULL,SMNULL);
-            }
-	;
-
-end_ioctl:
-          {endioctl();}
-         ;
-
-/*
-int_nameeq_on:
-	    { intonly = inioctl = YES; }
-	;
-
-int_nameeq_off:
-	    { intonly = inioctl = NO; }
-	;
-*/
-initial_value: 
-	    { $$ = LLNULL; }
-	| EQUAL expr
-	    { $$ = $2; }
-
-        | POINT_TO expr
-            { $$ = make_llnd(fi, POINTST_OP, LLNULL, $2, SMNULL); }
-	;
-
-dimension: DIMENSION  opt_double_colon  in_dcl   name dims 
-	    { PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! $5) {
-		err("No dimensions in DIMENSION statement", 42);
-	      }
-              if(statement_kind == 1) /*DVM-directive*/
-                err("No shape specification", 65);                
-	      s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	      s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $5;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,DIM_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| dimension COMMA name dims 
-           {  PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! $4) {
-		err("No dimensions in DIMENSION statement", 42);
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	      s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-allocatable: ALLOCATABLE in_dcl opt_double_colon var
-                   /* ALLOCATABLE in_dcl opt_double_colon name dims lengspec*/
-	    {/* PTR_SYMB s;*/
-	      PTR_LLND r;
-
-	         /*if(!$5) {
-		   err("No dimensions in ALLOCATABLE statement",305);		
-	           }
-	          s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	          s->attr = s->attr | ALLOCATABLE_BIT;
-	          q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	          s->type->entry.ar_decl.ranges = $5;
-                  r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                */
-              $4->entry.Template.symbol->attr = $4->entry.Template.symbol->attr | ALLOCATABLE_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, ALLOCATABLE_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| allocatable COMMA var
-                /*allocatable COMMA name dims lengspec */
-           {  /*PTR_SYMB s;*/
-	      PTR_LLND r;
-
-	        /*  if(! $4) {
-		      err("No dimensions in ALLOCATABLE statement",305);
-		
-	            }
-	           s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	           s->attr = s->attr | ALLOCATABLE_BIT;
-	           q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	           s->type->entry.ar_decl.ranges = $4;
-	           r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                */
-              $3->entry.Template.symbol->attr = $3->entry.Template.symbol->attr | ALLOCATABLE_BIT;
-              r = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-pointer: POINTER in_dcl opt_double_colon var
-	    { PTR_SYMB s;
-	      PTR_LLND  r;
-           
-	          /*  if(! $5) {
-		      err("No dimensions in POINTER statement",306);	    
-	              } 
-	             s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	             s->attr = s->attr | POINTER_BIT;
-	             q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	             s->type->entry.ar_decl.ranges = $5;
-                   */
-
-                  /*s = make_pointer( $4->entry.Template.symbol->parent, TYNULL, LOCAL);*/ /*17.02.03*/
-                 /*$4->entry.Template.symbol->attr = $4->entry.Template.symbol->attr | POINTER_BIT;*/
-              s = $4->entry.Template.symbol; /*17.02.03*/
-              s->attr = s->attr | POINTER_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, POINTER_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| pointer COMMA var
-           {  PTR_SYMB s;
-	      PTR_LLND r;
-
-     	        /*  if(! $4) {
-	        	err("No dimensions in POINTER statement",306);
-	            }
-	           s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	           s->attr = s->attr | POINTER_BIT;
-	           q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	           s->type->entry.ar_decl.ranges = $4;
-                */
-
-                /*s = make_pointer( $3->entry.Template.symbol->parent, TYNULL, LOCAL);*/ /*17.02.03*/
-                /*$3->entry.Template.symbol->attr = $3->entry.Template.symbol->attr | POINTER_BIT;*/
-              s = $3->entry.Template.symbol; /*17.02.03*/
-              s->attr = s->attr | POINTER_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-target: TARGET in_dcl opt_double_colon var
-	    {/* PTR_SYMB s;*/
-	      PTR_LLND r;
-
-
-	     /* if(! $5) {
-		err("No dimensions in TARGET statement",307);
-	      }
-	      s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	      s->attr = s->attr | TARGET_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $5;
-             */
-              $4->entry.Template.symbol->attr = $4->entry.Template.symbol->attr | TARGET_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, TARGET_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| target COMMA var
-           {  /*PTR_SYMB s;*/
-	      PTR_LLND r;
-
-	     /* if(! $4) {
-		err("No dimensions in TARGET statement",307);
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	      s->attr = s->attr | TARGET_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-              */
-              $3->entry.Template.symbol->attr = $3->entry.Template.symbol->attr | TARGET_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-common:	  COMMON in_dcl var
-	    { PTR_LLND p, q;
-
-              p = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      q = make_llnd(fi,COMM_LIST, p, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,COMM_STAT, SMNULL, q, LLNULL, LLNULL);
-	    }
-	| COMMON in_dcl comblock var
-	    { PTR_LLND p, q;
-
-              p = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      q = make_llnd(fi,COMM_LIST, p, LLNULL, $3);
-	      $$ = get_bfnd(fi,COMM_STAT, SMNULL, q, LLNULL, LLNULL);
-	    }
-	| common opt_comma comblock opt_comma var
-	    { PTR_LLND p, q;
-
-              p = make_llnd(fi,EXPR_LIST, $5, LLNULL, SMNULL);
-	      q = make_llnd(fi,COMM_LIST, p, LLNULL, $3);
-	      add_to_lowList(q, $1->entry.Template.ll_ptr1);
-	    }
-	| common COMMA var
-	    { PTR_LLND p, r;
-
-              p = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      /*q = make_llnd(fi,COMM_LIST, p, LLNULL, SMNULL);*/
-	      for (r = $1->entry.Template.ll_ptr1;
-		   r->entry.list.next;
-		   r = r->entry.list.next);
-	      add_to_lowLevelList(p, r->entry.Template.ll_ptr1);
-	    }
-	;
-
-
-namelist:  NAMELIST in_dcl namelist_group ident
-	    { PTR_LLND q, r;
-
-              q = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      r = make_llnd(fi,NAMELIST_LIST, q, LLNULL, $3);
-	      $$ = get_bfnd(fi,NAMELIST_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| namelist opt_comma namelist_group opt_comma ident
-	    { PTR_LLND q, r;
-
-              q = make_llnd(fi,EXPR_LIST, $5, LLNULL, SMNULL);
-	      r = make_llnd(fi,NAMELIST_LIST, q, LLNULL, $3);
-	      add_to_lowList(r, $1->entry.Template.ll_ptr1);
-	    }
-	| namelist COMMA ident
-	    { PTR_LLND q, r;
-
-              q = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      for (r = $1->entry.Template.ll_ptr1;
-		   r->entry.list.next;
-		   r = r->entry.list.next);
-	      add_to_lowLevelList(q, r->entry.Template.ll_ptr1);
-	    }
-	;
-
-namelist_group: SLASH name SLASH
-	    { $$ =  make_local_entity($2, NAMELIST_NAME,global_default,LOCAL); }
-	;
-
-comblock: DSLASH
-	    { $$ = NULL; /*make_common(look_up_sym("*"));*/ }
-	| SLASH name SLASH
-	    { $$ = make_common($2); }
-	;
-
-
-var:	  name dims
-          {  PTR_SYMB s;
-	
-	      if($2) {
-		s = make_array($1, TYNULL, $2, ndim, LOCAL);
-                s->attr = s->attr | DIMENSION_BIT;
-		s->type->entry.ar_decl.ranges = $2;
-		$$ = make_llnd(fi,ARRAY_REF, $2, LLNULL, s);
-	      }
-	      else {
-		s = make_scalar($1, TYNULL, LOCAL);	
-		$$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      }
-
-          }
-            
-	;
-
-external: EXTERNAL in_dcl  opt_double_colon  name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_external($4, TYNULL);
-	      s->attr = s->attr | EXTERNAL_BIT;
-              q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      p = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,EXTERN_STAT, SMNULL, p, LLNULL, LLNULL);
-	    }
-
-	| external COMMA name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_external($3, TYNULL);
-	      s->attr = s->attr | EXTERNAL_BIT;
-              p = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, $1->entry.Template.ll_ptr1);
-	    }
-	;
-
-intrinsic: INTRINSIC in_dcl  opt_double_colon  name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_intrinsic($4, TYNULL); /*make_function($3, TYNULL, NO);*/
-	      s->attr = s->attr | INTRINSIC_BIT;
-              q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      p = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,INTRIN_STAT, SMNULL, p,
-			     LLNULL, LLNULL);
-	    }
-
-	| intrinsic COMMA name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_intrinsic($3, TYNULL); /* make_function($3, TYNULL, NO);*/
-	      s->attr = s->attr | INTRINSIC_BIT;
-              p = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, $1->entry.Template.ll_ptr1);
-	    }
-
-	;
-
-
-equivalence:  EQUIVALENCE in_dcl equivset
-	    {
-	      $$ = get_bfnd(fi,EQUI_STAT, SMNULL, $3,
-			     LLNULL, LLNULL);
-	    }
-
-	| equivalence COMMA equivset
-	    { 
-	      add_to_lowLevelList($3, $1->entry.Template.ll_ptr1);
-	    }
-
-	;
-
-equivset: LEFTPAR equivlist RIGHTPAR
-	  {
-	      $$ = make_llnd(fi,EQUI_LIST, $2, LLNULL, SMNULL);
-           }
-	;
-
-equivlist: equi_object COMMA equi_object
-           { PTR_LLND p;
-	      p = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      $$ = make_llnd(fi,EXPR_LIST, $1, p, SMNULL);
-	    }
-
-	| equivlist COMMA equi_object
-	    { PTR_LLND p;
-
-	      p = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(p, $1);
-	    }
-	;
-
-equi_object: name
-        {  PTR_SYMB s;
-           s=make_scalar($1,TYNULL,LOCAL);
-           $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-           s->attr = s->attr | EQUIVALENCE_BIT;
-            /*$$=$1; $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT; */
-        }
-           | name LEFTPAR subscript_list RIGHTPAR
-        {  PTR_SYMB s;
-           s=make_array($1,TYNULL,LLNULL,0,LOCAL);
-           $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, s);
-           s->attr = s->attr | EQUIVALENCE_BIT;
-            /*$$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT; */
-        }
-
-     /*   { $$ = $1;
-         $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT;
-	 $$->variant == ARRAY_REF; 
-         $$->entry.Template.ll_ptr1 = $3;
-        }
-      */
-        ;
-
-           | asubstring
-           ;
-
-data:	  data1
-            { PTR_LLND p;
-              data_stat = NO;
-	      p = make_llnd(fi,STMT_STR, LLNULL, LLNULL,
-			    SMNULL);
-              p->entry.string_val = copys(stmtbuf);
-	      $$ = get_bfnd(fi,DATA_DECL, SMNULL, p, LLNULL, LLNULL);
-            }
-
-data1:	  DATA inside data_in datapair
-
-	| data1 opt_comma datapair
-	;
-
-data_in:
-        {data_stat = YES;}
-       ;
-
-in_data:  
-	    {
-	      if (parstate == OUTSIDE)
-	         { PTR_BFND p;
-
-		   p = get_bfnd(fi,PROG_HEDR,
-                                make_program(look_up_sym("_MAIN")),
-                                LLNULL, LLNULL, LLNULL);
-		   set_blobs(p, global_bfnd, NEW_GROUP1);
-	           add_scope_level(p, NO);
-		   position = IN_PROC; 
-	  	   /*parstate = INDCL;*/
-                 }
-	      if(parstate < INDCL)
-		{
-		  /* enddcl();*/
-		  parstate = INDCL;
-		}
-	    }
-	;
-
-datapair: datalvals SLASH datarvals SLASH
-
-	;
-
-datalvals: datalval
-
-	| datalvals COMMA datalval
-
-	;
-
-datarvals: datarval
-	| datarvals COMMA datarval
-	;
-
-datalval: data_null dataname
-
-	| data_null dataname datasubs
-
-	| data_null dataname datarange
-
-	| data_null dataname datasubs datarange
-
-	| data_null dataimplieddo
-	;
-data_null: 
-           {;}
-         ;
-
-d_name: name
-	    { $$= make_scalar($1, TYNULL, LOCAL);}
-      ;
-
-dataname: name
-	    { $$= make_scalar($1, TYNULL, LOCAL); 
-              $$->attr = $$->attr | DATA_BIT; 
-            }
-	;
-
-datasubs: LEFTPAR iconexprlist RIGHTPAR
-            { $$ = make_llnd(fi, DATA_SUBS, $2, LLNULL, SMNULL); }
-	;
-
-datarange: LEFTPAR opticonexpr COLON opticonexpr RIGHTPAR
-            { $$ = make_llnd(fi, DATA_RANGE, $2, $4, SMNULL); }
-	;
-
-iconexprlist: iconexpr
-	    { $$ = $1; }
-	| iconexprlist COMMA iconexpr
-            { $$ = add_to_lowLevelList($3, $1); }
-	;
-
-opticonexpr:
-            { $$ = LLNULL; }
-	| iconexpr
-	    { $$ = $1; }
-	;
-
-dataimplieddo:	LEFTPAR dlist COMMA d_name EQUAL iconexprlist RIGHTPAR
-            {$$= make_llnd(fi, DATA_IMPL_DO, $2, $6, $4); }
-	;
-
-dlist:	  dataelt
-	    { $$ = $1; }
-	| dlist COMMA dataelt
-            { $$ = add_to_lowLevelList($3, $1); }
-	;
-
-dataelt:  dataname datasubs
-            { $$ = make_llnd(fi, DATA_ELT, $2, LLNULL, $1); }
-	| dataname datarange
-            { $$ = make_llnd(fi, DATA_ELT, $2, LLNULL, $1); }
-	| dataname datasubs datarange
-	    {
-              $2->entry.Template.ll_ptr2 = $3;
-              $$ = make_llnd(fi, DATA_ELT, $2, LLNULL, $1); 
-            }
-	| dataimplieddo
-	    { $$ = make_llnd(fi, DATA_ELT, $1, LLNULL, SMNULL); }
-	;
-
-datarval: datavalue
-
-	| data_null d_name ASTER datavalue
-
-	| unsignedint ASTER datavalue
-	;
-
-datavalue: data_null d_name
-
-	| int_const
-	| real_const
-	| complex_const_data
-	| TTRUE 
-	| TTRUE  UNDER kind
-	| FFALSE
-	| FFALSE UNDER kind 
-	| CHAR_CONSTANT
-/*	| STRING	*/
-/*	| bit_const	*/
-        | BOZ_const
-        | data_null ident LEFTPAR in_ioctl  funarglist RIGHTPAR
-           {if($2->entry.Template.symbol->variant != TYPE_NAME)
-               errstr("Undefined type %s",$2->entry.Template.symbol->ident,319); 
-           }
-	;
-
-BOZ_const: BOZ_CONSTANT
-         ;
-
-int_const: unsignedint
-	| PLUS unsignedint
-
-	| MINUS unsignedint
-				
-	;
-
-unsignedint: INT_CONSTANT
-           | INT_CONSTANT UNDER kind
-	   ;
-
-real_const: unsignedreal
-	  | PLUS unsignedreal
-
-	  | MINUS unsignedreal
-
-	  ;
-
-unsignedreal: REAL_CONSTANT
-            | REAL_CONSTANT UNDER kind 
-	    | DP_CONSTANT
-	    | DP_CONSTANT   UNDER kind 
-	    ;
-complex_const_data:	LEFTPAR complex_part COMMA complex_part RIGHTPAR
-                  ;
-
-complex_part: real_const
-            | int_const
-            ;
-
-/*
-bit_const:HEX_CONSTANT	{ $$ = mkbitcon(4, yyleng, yytext); }
-	| OCT_CONSTANT	{ $$ = mkbitcon(3, yyleng, yytext); }
-	| BITCON	{ $$ = mkbitcon(1, yyleng, yytext); }
-	;
-*/
-iconexpr: iconterm
-	    { $$ = make_llnd(fi,ICON_EXPR, $1, LLNULL, SMNULL); }
-	| PLUS iconterm
-            {
-              PTR_LLND p;
-
-              p = intrinsic_op_node("+", UNARY_ADD_OP, $2, LLNULL);
-              $$ = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-	| MINUS iconterm
-            {
-              PTR_LLND p;
- 
-              p = intrinsic_op_node("-", MINUS_OP, $2, LLNULL);
-              $$ = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-	| iconexpr PLUS iconterm
-            {
-              PTR_LLND p;
- 
-              p = intrinsic_op_node("+", ADD_OP, $1, $3);
-              $$ = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-	| iconexpr MINUS iconterm
-            {
-              PTR_LLND p;
- 
-              p = intrinsic_op_node("-", SUBT_OP, $1, $3);
-              $$ = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-	;
-
-iconterm: iconfactor
-            { $$ = $1; }
-	| iconterm ASTER iconfactor
-            { $$ = intrinsic_op_node("*", MULT_OP, $1, $3); }
-	| iconterm SLASH iconfactor
-            { $$ = intrinsic_op_node("/", DIV_OP, $1, $3); }
-	;
-
-iconfactor: iconprimary
-	    { $$ = $1; }
-	| iconprimary DASTER iconfactor
-            { $$ = intrinsic_op_node("**", EXP_OP, $1, $3); }
-	;
-
-iconprimary: INT_CONSTANT
-            {
-              PTR_LLND p;
-
-              p = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-              p->entry.ival = atoi(yytext);
-              p->type = global_int;
-              $$ = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-            }
-	| d_name
-            {
-              PTR_LLND p;
- 
-              p = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $1);
-              $$ = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-            }
-	| LEFTPAR iconexpr RIGHTPAR
-            {
-              $$ = make_llnd(fi,EXPR_LIST, $2, LLNULL, SMNULL);
-            }
-	;
-
-
-savelist: saveitem
-         { $$ = make_llnd(fi,EXPR_LIST, $1, LLNULL, SMNULL); }
-	| savelist COMMA saveitem
-         { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-saveitem: var
-	   { $$ = $1;
-             $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | SAVE_BIT;
-           }
-	| comblock
-          { $$ = make_llnd(fi,COMM_LIST, LLNULL, LLNULL, $1); 
-            $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | SAVE_BIT;
-          }
-	;
-
-use_name_list: use_key_word  use_name  no_use_key_word
-            { $$ = set_ll_list($2, LLNULL, EXPR_LIST); }
-	| use_name_list COMMA use_key_word  use_name  no_use_key_word 
-	    { $$ = set_ll_list($1, $4, EXPR_LIST); }
-	;
-
-use_key_word:
-            { as_op_kwd_ = YES; }
-            ;
-
-no_use_key_word:
-            { as_op_kwd_ = NO; }
-	     ;	     
-
-
-use_name: name
-	   { 
-             PTR_SYMB s; 
-             s = make_scalar($1, TYNULL, LOCAL);	
-	     s->attr = s->attr | type_opt;
-	     $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-            }
-	|  OPERATOR LEFTPAR operator RIGHTPAR 
-	    { PTR_SYMB s;
-	      s = make_function($3, global_default, LOCAL);
-	      s->variant = INTERFACE_NAME;
-              s->attr = s->attr | type_opt;
-              $$ = make_llnd(fi,OPERATOR_OP, LLNULL, LLNULL, s);
-	    }
-        | ASSIGNMENT  LEFTPAR EQUAL RIGHTPAR
-	    { PTR_SYMB s;
-	      s = make_procedure(look_up_sym("="), LOCAL);
-	      s->variant = INTERFACE_NAME;
-              s->attr = s->attr | type_opt;
-              $$ = make_llnd(fi,ASSIGNMENT_OP, LLNULL, LLNULL, s);
-	    }
-         ;
-
-
-paramlist:paramitem
-            { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| paramlist COMMA paramitem
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-paramitem: name EQUAL expr
-	    { PTR_SYMB p;
-
-                /* The check if name and expr have compatible types has
-                   not been done yet. */ 
-		p = make_constant($1, TYNULL);
- 	        p->attr = p->attr | PARAMETER_BIT;
-                p->entry.const_value = $3;
-		$$ = make_llnd(fi,CONST_REF, LLNULL, LLNULL, p);
-	    }
-	;
-
-module_proc_stmt: MODULE_PROCEDURE  proc_name_list
-	    { $$ = get_bfnd(fi, MODULE_PROC_STMT, SMNULL, $2, LLNULL, LLNULL); }
-
-proc_name_list: name
-	    { PTR_SYMB s;
- 	      PTR_LLND q;
-
-	      s = make_function($1, TYNULL, LOCAL);
-	      s->variant = ROUTINE_NAME;
-              q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      $$ = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	    }
-	| proc_name_list COMMA name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_function($3, TYNULL, LOCAL);
-	      s->variant = ROUTINE_NAME;
-              p = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, $1);
-	    }
-	;
-
-
-use_stat: USE in_dcl module_name 
-	    { $$ = get_bfnd(fi, USE_STMT, $3, LLNULL, LLNULL, LLNULL);
-              /*add_scope_level($3->entry.Template.func_hedr, YES);*/ /*17.06.01*/
-              copy_module_scope($3,LLNULL); /*17.03.03*/
-              colon_flag = NO;
-            }
-	| USE in_dcl module_name COMMA keyword_if_colon_follow rename_list
-	    { $$ = get_bfnd(fi, USE_STMT, $3, $6, LLNULL, LLNULL); 
-              /*add_scope_level(module_scope, YES); *//* 17.06.01*/
-              copy_module_scope($3,$6); /*17.03.03 */
-              colon_flag = NO;
-            }
-	| USE in_dcl module_name COMMA keyword_if_colon_follow ONLY 
-	    { PTR_LLND l;
-
-	      l = make_llnd(fi, ONLY_NODE, LLNULL, LLNULL, SMNULL);
-              $$ = get_bfnd(fi, USE_STMT, $3, l, LLNULL, LLNULL);
-            }
-	| USE in_dcl module_name COMMA keyword_if_colon_follow ONLY only_list
-	    { PTR_LLND l;
-
-	      l = make_llnd(fi, ONLY_NODE, $7, LLNULL, SMNULL);
-              $$ = get_bfnd(fi, USE_STMT, $3, l, LLNULL, LLNULL);
-            }
-	;
-
-module_name: name
-            {
-              if ($1->id_attr == SMNULL)
-	         warn1("Unknown module %s", $1->ident,308);
-              $$ = make_global_entity($1, MODULE_NAME, global_default, NO);
-	      module_scope = $$->entry.Template.func_hedr;
-           
-            }
-        ;
-
-only_list: only_name
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| only_list COMMA only_name
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-only_name: rename_name
-            {  $$ = $1; }
-         | name
-	    {  PTR_HASH oldhash,copyhash;
-	       PTR_SYMB oldsym, newsym;
-	       PTR_LLND m;
-
-	       oldhash = just_look_up_sym_in_scope(module_scope, $1->ident);
-	       if (oldhash == HSNULL) {
-                  errstr("Unknown identifier %s.", $1->ident,309);
-	          $$= LLNULL;
-	       }
-	       else {
-                 oldsym = oldhash->id_attr;
-                 copyhash=just_look_up_sym_in_scope(cur_scope(), $1->ident);
-	         if( copyhash && copyhash->id_attr && copyhash->id_attr->entry.Template.tag==module_scope->id)
-                 {
-                   newsym = copyhash->id_attr;
-                   newsym->entry.Template.tag = 0;
-                 }
-                 else
-                 {
-	           newsym = make_local_entity($1, oldsym->variant, oldsym->type,LOCAL);
-	           /* copies data in entry.Template structure and attr */
-	           copy_sym_data(oldsym, newsym);	         
-	             /*newsym->entry.Template.base_name = oldsym;*//*19.03.03*/
-                 }
-	  	/* l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, oldsym);*/
-		 m = make_llnd(fi, VAR_REF, LLNULL, LLNULL, newsym);
-		 $$ = make_llnd(fi, RENAME_NODE, m, LLNULL, oldsym);
- 	      }
-            }
-	;
-
-
-rename_list: rename_name
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| rename_list COMMA rename_name
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-rename_name: name POINT_TO name
-	    {  PTR_HASH oldhash,copyhash;
-	       PTR_SYMB oldsym, newsym;
-	       PTR_LLND l, m;
-
-	       oldhash = just_look_up_sym_in_scope(module_scope, $3->ident);
-	       if (oldhash == HSNULL) {
-                  errstr("Unknown identifier %s", $3->ident,309);
-	          $$= LLNULL;
-	       }
-	       else {
-                 oldsym = oldhash->id_attr;
-                 copyhash = just_look_up_sym_in_scope(cur_scope(), $3->ident);
-	         if(copyhash && copyhash->id_attr && copyhash->id_attr->entry.Template.tag==module_scope->id)
-                 {
-                    delete_symbol(copyhash->id_attr);
-                    copyhash->id_attr = SMNULL;
-                 }
-                   newsym = make_local_entity($1, oldsym->variant, oldsym->type, LOCAL);
-	           /* copies data in entry.Template structure and attr */
-	           copy_sym_data(oldsym, newsym);	
-                         
-	           /*newsym->entry.Template.base_name = oldsym;*//*19.03.03*/
-	  	 l  = make_llnd(fi, VAR_REF, LLNULL, LLNULL, oldsym);
-		 m  = make_llnd(fi, VAR_REF, LLNULL, LLNULL, newsym);
-		 $$ = make_llnd(fi, RENAME_NODE, m, l, SMNULL);
- 	      }
-            }
-            ;
-	
- /*
-in_param: inside
-	    {
-	      if(parstate > INDCL)
-		dclerr("parameter statement out of order", SMNULL);
-	    }
-	;
-*/
-dims:
-	    { ndim = 0;	explicit_shape = 1; $$ = LLNULL; }
-	| LEFTPAR dimlist RIGHTPAR
-	    { $$ = $2; }
-	;
-
-dimlist:   { ndim = 0; explicit_shape = 1;}   dim
-	    {
-	      $$ = make_llnd(fi,EXPR_LIST, $2, LLNULL, SMNULL);
-	      $$->type = global_default;
-	    }
-	| dimlist COMMA dim
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-dim:	  ubound
-	    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		$$ = $1;
-	      ++ndim;
-	    }
-	| COLON
-	    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		$$ = make_llnd(fi, DDOT, LLNULL, LLNULL, SMNULL);
-	      ++ndim;
-              explicit_shape = 0;
-	    } 
-	| expr COLON
-	    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		$$ = make_llnd(fi,DDOT, $1, LLNULL, SMNULL);
-	      ++ndim;
-              explicit_shape = 0;
-	    }
-	| expr COLON ubound
-	    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		$$ = make_llnd(fi,DDOT, $1, $3, SMNULL);
-	      ++ndim;
-	    }
-	;
-
-ubound:	  ASTER
-	    {
-	      $$ = make_llnd(fi,STAR_RANGE, LLNULL, LLNULL, SMNULL);
-	      $$->type = global_default;
-              explicit_shape = 0;
-	    }
-	| expr
-	;
-
-labellist: label
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| labellist COMMA label
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-label:	  INT_CONSTANT
-	    {PTR_LABEL p;
-	     p = make_label_node(fi,convci(yyleng, yytext));
-	     p->scope = cur_scope();
-	     $$ = make_llnd_label(fi,LABEL_REF, p);
-	  }
-	;
-
-implicit: IMPLICIT in_dcl implist
-	   { /*PTR_LLND l;*/
-
-          /*   l = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);*/
-             $$ = get_bfnd(fi,IMPL_DECL, SMNULL, $3, LLNULL, LLNULL);
-             redefine_func_arg_type();
-           }
-/*
-	| implicit COMMA implist
-	  { PTR_LLND l;
-
-            l = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);
-            add_to_lowLevelList(l, $1->entry.Template.ll_ptr1);
-          }
- */
-	| IMPLICITNONE
-	  { /*undeftype = YES;
-	    setimpl(TYNULL, (int)'a', (int)'z'); FB COMMENTED---> NOT QUITE RIGHT BUT AVOID PB WITH COMMON*/
-	    $$ = get_bfnd(fi,IMPL_DECL, SMNULL, LLNULL, LLNULL, LLNULL);
-	  }
-	;
-
-implist: impitem
-         { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-       | implist COMMA impitem
-         { $$ = set_ll_list($1, $3, EXPR_LIST); }
-       ;
-
-impitem:  imptype LEFTPAR letgroups RIGHTPAR
-          { 
-
-            $$ = make_llnd(fi, IMPL_TYPE, $3, LLNULL, SMNULL);
-            $$->type = vartype;
-          }
-/*	| imptype
-	 {
-           $$ = make_llnd(fi, IMPL_TYPE, LLNULL, LLNULL, SMNULL);
-           $$->type = vartype;
-         }
-*/ /*30.10.03*/
-	; 
-
-/* The draft specification leads to big trouble. Check that up. */
-/* For the time being. */
-imptype:   { implkwd = YES; } type_implicit
-	    { vartype = $2; }
-	;
-
-type_implicit: STAT typename
-               { $$ = $2; }
-             | type
-               { $$ = $1;}
-             ;
-
-/* Not used. 
-in_implicit: inside
-	    {
-	      if (parstate >= INDCL)
-		dclerr("implicit statement out of order", SMNULL);
-	    }
-	;
-*/
-letgroups: letgroup
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| letgroups COMMA letgroup
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-letgroup:  letter
-	    {
-	      setimpl(vartype, (int)$1, (int)$1);
-	      $$ = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.cval = $1;
-	    }
-	| letter MINUS letter
-	    { PTR_LLND p,q;
-	      
-	      setimpl(vartype, (int)$1, (int)$3);
-	      p = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
-	      p->entry.cval = $1;
-	      q = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
-	      q->entry.cval = $3;
-	      $$= make_llnd(fi,DDOT, p, q, SMNULL);
-	    }
-	;
-
-letter:	 IDENTIFIER
-	    {
-	      if(yyleng!=1 || yytext[0]<'a' || yytext[0]>'z')
-		{
-		  err("IMPLICIT item must be single letter", 37);
-		  $$ = '\0';
-		}
-	      else $$ = yytext[0];
-	    }
-	;
-
-inside:
-	    {
-	      if (parstate == OUTSIDE)
-	         { PTR_BFND p;
-
-		   p = get_bfnd(fi,PROG_HEDR,
-                                make_program(look_up_sym("_MAIN")),
-                                LLNULL, LLNULL, LLNULL);
-		   set_blobs(p, global_bfnd, NEW_GROUP1);
-	           add_scope_level(p, NO);
-		   position = IN_PROC; 
-	  	   parstate = INSIDE;
-                 }
-	  
-	    }
-	;
-
-in_dcl:
-        { switch(parstate)
-		{
-                case OUTSIDE:  
-			{ PTR_BFND p;
-
-			  p = get_bfnd(fi,PROG_HEDR,
-                                       make_program(look_up_sym("_MAIN")),
-                                       LLNULL, LLNULL, LLNULL);
-			  set_blobs(p, global_bfnd, NEW_GROUP1);
-			  add_scope_level(p, NO);
-			  position = IN_PROC; 
-	  		  parstate = INDCL; }
-	                  break;
-                case INSIDE:    parstate = INDCL;
-                case INDCL:     break;
-
-                case INDATA:
-                         /*  err(
-                     "Statement order error: declaration after DATA or function statement", 
-                                 29);*/
-                              break;
-
-                default:
-                           err("Declaration among executables", 30);
-                }
-        }
-
-	;
-
-opt_double_colon: 
-	| COLON COLON
-        ;         
-
-/*
- * Grammar for expressions
- */
-
-funarglist:
-	    { $$ = LLNULL; endioctl(); }
-	| funargs 
-            { $$ = $1;  endioctl();}
-	;
-
-funarg:  expr
-	    { $$ = $1; }
-	| triplet
-	    { $$ = $1; }
-	| nameeq expr
-	    { PTR_LLND l;
-	      l = make_llnd(fi, KEYWORD_ARG, $1, $2, SMNULL);
-	      l->type = $2->type;
-              $$ = l; 
-	    }
-
-        ;
-
-
-
-funargs:  in_ioctl  funarg
-            { $$ = set_ll_list($2, LLNULL, EXPR_LIST);
-              endioctl(); 
-            }
-        | funargs COMMA  in_ioctl  funarg
-	    { $$ = set_ll_list($1, $4, EXPR_LIST);
-              endioctl(); 
-            }
-        ;
-
-subscript_list: expr
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-        | subscript_list COMMA expr
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-        ;
-
-expr:	  uexpr
-            { $$ = $1; }
-	| LEFTPAR expr RIGHTPAR
-	    { $$ = $2; }
-	| complex_const
-	    { $$ = $1; }
-	;
-
-uexpr:	  lhs
-            { $$ = $1; }
-	| simple_const
-            { $$ = $1; }
-/*        | string_constant opt_substring
-            { $$ = make_llnd(fi, ARRAY_OP, $1, $2, SMNULL); }
-*/	| vec
-            { $$ = $1; }
-	| expr PLUS expr   %prec PLUS
-	    { $$ = intrinsic_op_node("+", ADD_OP, $1, $3); }
-	| expr MINUS expr   %prec PLUS
-	    { $$ = intrinsic_op_node("-", SUBT_OP, $1, $3); }
-	| expr ASTER expr
-	    { $$ = intrinsic_op_node("*", MULT_OP, $1, $3); }
-	| expr SLASH expr
-	    { $$ = intrinsic_op_node("/", DIV_OP, $1, $3); }
-	| expr DASTER expr
-	    { $$ = intrinsic_op_node("**", EXP_OP, $1, $3); }      
-        | defined_op expr %prec UNARY_OP
-	      { $$ = defined_op_node($1, $2, LLNULL); }
-	| PLUS expr  %prec ASTER
-	    { $$ = intrinsic_op_node("+", UNARY_ADD_OP, $2, LLNULL); }
-	| MINUS expr  %prec ASTER
-	    { $$ = intrinsic_op_node("-", MINUS_OP, $2, LLNULL); }
-	| expr EQ expr  %prec EQ
-	    { $$ = intrinsic_op_node(".eq.", EQ_OP, $1, $3); }
-	| expr GT expr  %prec EQ
-	    { $$ = intrinsic_op_node(".gt.", GT_OP, $1, $3); }
-	| expr LT expr  %prec EQ
-	    { $$ = intrinsic_op_node(".lt.", LT_OP, $1, $3); }
-	| expr GE expr  %prec EQ
-	    { $$ = intrinsic_op_node(".ge.", GTEQL_OP, $1, $3); }
-	| expr LE expr  %prec EQ
-	    { $$ = intrinsic_op_node(".ge.", LTEQL_OP, $1, $3); }
-	| expr NE expr  %prec EQ
-	    { $$ = intrinsic_op_node(".ne.", NOTEQL_OP, $1, $3); }
-	| expr EQV expr
-	    { $$ = intrinsic_op_node(".eqv.", EQV_OP, $1, $3); }
-	| expr NEQV expr
-	    { $$ = intrinsic_op_node(".neqv.", NEQV_OP, $1, $3); }
-	| expr XOR expr
-	    { $$ = intrinsic_op_node(".xor.", XOR_OP, $1, $3); }
-	| expr OR expr
-	    { $$ = intrinsic_op_node(".or.", OR_OP, $1, $3); }
-	| expr AND expr
-	    { $$ = intrinsic_op_node(".and.", AND_OP, $1, $3); }
-	| NOT expr
-	    { $$ = intrinsic_op_node(".not.", NOT_OP, $2, LLNULL); }
-	| expr DSLASH expr
-	    { $$ = intrinsic_op_node("//", CONCAT_OP, $1, $3); }
-	| expr defined_op expr %prec BINARY_OP
-	    { $$ = defined_op_node($2, $1, $3); }
-        ;
-
-addop:	  PLUS	{ $$ = ADD_OP; }
-	| MINUS	{ $$ = SUBT_OP; }
-	;
-/*
-relop:	  EQ	{ $$ = EQ_OP; }
-	| GT	{ $$ = GT_OP; }
-	| LT	{ $$ = LT_OP; }
-	| GE	{ $$ = GTEQL_OP; }
-	| LE	{ $$ = LTEQL_OP; }
-	| NE	{ $$ = NOTEQL_OP; }
-	;
-*/
-ident: name
-	    { PTR_SYMB s;
-	      PTR_TYPE t;
-	     /* PTR_LLND l;*/
-
-       	      if (!(s = $1->id_attr))
-              {
-	         s = make_scalar($1, TYNULL, LOCAL);
-	     	 s->decl = SOFT;
-	      } 
-	
-	      switch (s->variant)
-              {
-	      case CONST_NAME:
-		   $$ = make_llnd(fi,CONST_REF,LLNULL,LLNULL, s);
-		   t = s->type;
-	           if ((t != TYNULL) &&
-                       ((t->variant == T_ARRAY) ||  (t->variant == T_STRING) ))
-                                 $$->variant = ARRAY_REF;
-
-                   $$->type = t;
-	           break;
-	      case DEFAULT:   /* if common region with same name has been
-                                 declared. */
-		   s = make_scalar($1, TYNULL, LOCAL);
-	     	   s->decl = SOFT;
-
-	      case VARIABLE_NAME:
-                   $$ = make_llnd(fi,VAR_REF,LLNULL,LLNULL, s);
-	           t = s->type;
-	           if (t != TYNULL) {
-                     if ((t->variant == T_ARRAY) ||  (t->variant == T_STRING) ||
-                         ((t->variant == T_POINTER) && (t->entry.Template.base_type->variant == T_ARRAY) ) )
-                         $$->variant = ARRAY_REF;
-
-/*  	              if (t->variant == T_DERIVED_TYPE)
-                         $$->variant = RECORD_REF; */
-	           }
-                   $$->type = t;
-	           break;
-	      case TYPE_NAME:
-  	           $$ = make_llnd(fi,TYPE_REF,LLNULL,LLNULL, s);
-	           $$->type = s->type;
-	           break;
-	      case INTERFACE_NAME:
-  	           $$ = make_llnd(fi, INTERFACE_REF,LLNULL,LLNULL, s);
-	           $$->type = s->type;
-	           break;
-              case FUNCTION_NAME:
-                   if(isResultVar(s)) {
-                     $$ = make_llnd(fi,VAR_REF,LLNULL,LLNULL, s);
-	             t = s->type;
-	             if (t != TYNULL) {
-                       if ((t->variant == T_ARRAY) ||  (t->variant == T_STRING) ||
-                         ((t->variant == T_POINTER) && (t->entry.Template.base_type->variant == T_ARRAY) ) )
-                         $$->variant = ARRAY_REF;
-	             }
-                     $$->type = t;
-	             break;
-                   }                                        
-	      default:
-  	           $$ = make_llnd(fi,VAR_REF,LLNULL,LLNULL, s);
-	           $$->type = s->type;
-	           break;
-	      }
-             /* if ($$->variant == T_POINTER) {
-	         l = $$;
-	         $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $$->type = l->type->entry.Template.base_type;
-	      }
-              */ /*11.02.03*/
-           } 
-        ;
-
-lhs:      ident
-            { PTR_SYMB  s;
-	      $$ = $1; 
-              s= $$->entry.Template.symbol;
-              if ((($1->variant == VAR_REF) || ($1->variant == ARRAY_REF))  && (s->scope !=cur_scope()))  /*global_bfnd*/
-              {
-	          if(((s->variant == FUNCTION_NAME) && (!isResultVar(s))) || (s->variant == PROCEDURE_NAME) || (s->variant == ROUTINE_NAME))
-                  { s = $$->entry.Template.symbol =  make_scalar(s->parent, TYNULL, LOCAL);
-		    $$->type = s->type;  
-		  }
-              }
-            }
-	| structure_component
-            { $$ = $1; }
-        |  array_ele_substring_func_ref
-            { $$ = $1; }
-	;
-
-array_ele_substring_func_ref:  ident LEFTPAR in_ioctl  funarglist RIGHTPAR
-	    { int num_triplets;
-	      PTR_SYMB s;  /*, sym;*/
-	      /* PTR_LLND l; */
-	      PTR_TYPE tp;
-	      /* l = $1; */
-	      s = $1->entry.Template.symbol;
-            
-	      /* Handle variable to function conversion. */
-	      if (($1->variant == VAR_REF) && 
-	          (((s->variant == VARIABLE_NAME) && (s->type) &&
-                    (s->type->variant != T_ARRAY)) ||
-  	            (s->variant == ROUTINE_NAME))) {
-	        s = $1->entry.Template.symbol =  make_function(s->parent, TYNULL, LOCAL);
-	        $1->variant = FUNC_CALL;
-              }
-	      if (($1->variant == VAR_REF) && (s->variant == FUNCTION_NAME)) { 
-                if(isResultVar(s))
-	          $1->variant = ARRAY_REF;
-                else
-                  $1->variant = FUNC_CALL;
-              }
-	      if (($1->variant == VAR_REF) && (s->variant == PROGRAM_NAME)) {
-                 errstr("The name '%s' is invalid in this context",s->ident,285);
-                 $1->variant = FUNC_CALL;
-              }
-              /* l = $1; */
-	      num_triplets = is_array_section_ref($4);
-	      switch ($1->variant)
-              {
-	      case TYPE_REF:
-                   $1->variant = STRUCTURE_CONSTRUCTOR;                  
-                   $1->entry.Template.ll_ptr1 = $4;
-                   $$ = $1;
-                   $$->type =  lookup_type(s->parent); 
-	          /* $$ = make_llnd(fi, STRUCTURE_CONSTRUCTOR, $1, $4, SMNULL);
-	           $$->type = $1->type;*//*18.02.03*/
-	           break;
-	      case INTERFACE_REF:
-	       /*  sym = resolve_overloading(s, $4);
-	           if (sym != SMNULL)
-	  	   {
-	              l = make_llnd(fi, FUNC_CALL, $4, LLNULL, sym);
-	              l->type = sym->type;
-	              $$ = $1; $$->variant = OVERLOADED_CALL;
-	              $$->entry.Template.ll_ptr1 = l;
-	              $$->type = sym->type;
-	           }
-	           else {
-	             errstr("can't resolve call %s", s->ident,310);
-	           }
-	           break;
-                 */ /*podd 01.02.03*/
-
-                   $1->variant = FUNC_CALL;
-
-	      case FUNC_CALL:
-                   $1->entry.Template.ll_ptr1 = $4;
-                   $$ = $1;
-                   if(s->type) 
-                     $$->type = s->type;
-                   else
-                     $$->type = global_default;
-	           /*late_bind_if_needed($$);*/ /*podd 02.02.23*/
-	           break;
-	      case DEREF_OP:
-              case ARRAY_REF:
-	           /* array element */
-	           if (num_triplets == 0) {
-                       if ($4 == LLNULL) {
-                           s = $1->entry.Template.symbol = make_function(s->parent, TYNULL, LOCAL);
-                           s->entry.func_decl.num_output = 1;
-                           $1->variant = FUNC_CALL;
-                           $$ = $1;
-                       } else if ($1->type->variant == T_STRING) {
-                           PTR_LLND temp = $4;
-                           int num_input = 0;
-
-                           while (temp) {
-                             ++num_input;
-                             temp = temp->entry.Template.ll_ptr2;
-                           }
-                           $1->entry.Template.ll_ptr1 = $4;
-                           s = $1->entry.Template.symbol = make_function(s->parent, TYNULL, LOCAL);
-                           s->entry.func_decl.num_output = 1;
-                           s->entry.func_decl.num_input = num_input;
-                           $1->variant = FUNC_CALL;
-                           $$ = $1;
-                       } else {
-       	                   $1->entry.Template.ll_ptr1 = $4;
-	                   $$ = $1;
-                           $$->type = $1->type->entry.ar_decl.base_type;
-                       }
-                   }
-                   /* substring */
-	           else if ((num_triplets == 1) && 
-                            ($1->type->variant == T_STRING)) {
-    	           /*
-                     $1->entry.Template.ll_ptr1 = $4;
-	             $$ = $1; $$->type = global_string;
-                   */
-	                  $$ = make_llnd(fi, 
-			  ARRAY_OP, LLNULL, LLNULL, SMNULL);
-    	                  $$->entry.Template.ll_ptr1 = $1;
-       	                  $$->entry.Template.ll_ptr2 = $4->entry.Template.ll_ptr1;
-	                  $$->type = global_string;
-                   }           
-                   /* array section */
-                   else {
-    	             $1->entry.Template.ll_ptr1 = $4;
-	             $$ = $1; tp = make_type(fi, T_ARRAY);     /**18.03.17*/
-                     tp->entry.ar_decl.base_type = $1->type->entry.ar_decl.base_type; /**18.03.17 $1->type */
-	             tp->entry.ar_decl.num_dimensions = num_triplets;
-	             $$->type = tp;
-                   }
-	           break;
-	      default:
-                    if($1->entry.Template.symbol)
-                      errstr("Can't subscript %s",$1->entry.Template.symbol->ident, 44);
-                    else
-	              err("Can't subscript",44);
-             }
-             /*if ($$->variant == T_POINTER) {
-	        l = $$;
-	        $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	        $$->type = l->type->entry.Template.base_type;
-	     }
-              */  /*11.02.03*/
-
-	     endioctl(); 
-           }
-        | ident LEFTPAR in_ioctl  funarglist RIGHTPAR substring
-	    { int num_triplets;
-	      PTR_SYMB s;
-	      PTR_LLND l;
-
-	      s = $1->entry.Template.symbol;
-/*              if ($1->type->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-	      if (($1->type->variant != T_ARRAY) ||
-                  ($1->type->entry.ar_decl.base_type->variant != T_STRING)) {
-	         errstr("Can't take substring of %s", s->ident, 45);
-              }
-              else {
-  	        num_triplets = is_array_section_ref($4);
-	           /* array element */
-                if (num_triplets == 0) {
-                   $1->entry.Template.ll_ptr1 = $4;
-                  /* $1->entry.Template.ll_ptr2 = $6;*/
-	          /* $$ = $1;*/
-                   l=$1;
-                   /*$$->type = $1->type->entry.ar_decl.base_type;*/
-                   l->type = global_string;  /**18.03.17* $1->type->entry.ar_decl.base_type;*/
-                }
-                /* array section */
-                else {
-    	           $1->entry.Template.ll_ptr1 = $4;
-    	           /*$1->entry.Template.ll_ptr2 = $6;
-	           $$ = $1; $$->type = make_type(fi, T_ARRAY);
-                   $$->type->entry.ar_decl.base_type = $1->type;
-	           $$->type->entry.ar_decl.num_dimensions = num_triplets;
-                  */
-                   l = $1; l->type = make_type(fi, T_ARRAY);
-                   l->type->entry.ar_decl.base_type = global_string;   /**18.03.17* $1->type*/
-	           l->type->entry.ar_decl.num_dimensions = num_triplets;
-               }
-                $$ = make_llnd(fi, ARRAY_OP, l, $6, SMNULL);
-	        $$->type = l->type;
-              
-              /* if ($$->variant == T_POINTER) {
-	          l = $$;
-	          $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	          $$->type = l->type->entry.Template.base_type;
-	       }
-               */  /*11.02.03*/
-             }
-             endioctl();
-          }
-        | structure_component LEFTPAR funarglist RIGHTPAR
-           {  int num_triplets;
-	      PTR_LLND l,l1,l2;
-              PTR_TYPE tp;
-
-         /*   if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-              num_triplets = is_array_section_ref($3);
-              $$ = $1;
-              l2 = $1->entry.Template.ll_ptr2;  
-              l1 = $1->entry.Template.ll_ptr1;                
-              if(l2 && l2->type->variant == T_STRING)/*substring*/
-                if(num_triplets == 1){
-	           l = make_llnd(fi, ARRAY_OP, LLNULL, LLNULL, SMNULL);
-    	           l->entry.Template.ll_ptr1 = l2;
-       	           l->entry.Template.ll_ptr2 = $3->entry.Template.ll_ptr1;
-	           l->type = global_string; 
-                   $$->entry.Template.ll_ptr2 = l;                                          
-                } else
-                   err("Can't subscript",44);
-              else if (l2 && l2->type->variant == T_ARRAY) {
-                 if(num_triplets > 0) { /*array section*/
-                   tp = make_type(fi,T_ARRAY);
-                   tp->entry.ar_decl.base_type = $1->type->entry.ar_decl.base_type;
-                   tp->entry.ar_decl.num_dimensions = num_triplets;
-                   $$->type = tp;
-                   l2->entry.Template.ll_ptr1 = $3;
-                   l2->type = $$->type;   
-                  }                 
-                 else {  /*array element*/
-                   l2->type = l2->type->entry.ar_decl.base_type;
-                   l2->entry.Template.ll_ptr1 = $3;   
-                   if(l1->type->variant != T_ARRAY)  
-                     $$->type = l2->type;
-                 }
-              } else 
-                   {err("Can't subscript",44); /*fprintf(stderr,"%d  %d",$1->variant,l2);*/}
-                   /*errstr("Can't subscript %s",l2->entry.Template.symbol->ident,441);*/
-         }    
-	
-        | structure_component LEFTPAR funarglist RIGHTPAR substring
-	    { int num_triplets;
-	      PTR_LLND l,q;
-
-          /*     if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-              $$ = $1;
-	      if (($1->type->variant != T_ARRAY) &&
-                  ($1->type->entry.ar_decl.base_type->variant != T_STRING)) {
-	         err("Can't take substring",45);
-              }
-              else {
-  	        num_triplets = is_array_section_ref($3);
-                l = $1->entry.Template.ll_ptr2;
-                if(l) {
-                /* array element */
-	        if (num_triplets == 0) {
-                   l->entry.Template.ll_ptr1 = $3;       	           
-                   l->type = global_string;
-                }
-                /* array section */
-                else {	
-    	             l->entry.Template.ll_ptr1 = $3;
-	             l->type = make_type(fi, T_ARRAY);
-                     l->type->entry.ar_decl.base_type = global_string;
-	             l->type->entry.ar_decl.num_dimensions = num_triplets;
-                }
-	        q = make_llnd(fi, ARRAY_OP, l, $5, SMNULL);
-	        q->type = l->type;
-                $$->entry.Template.ll_ptr2 = q;
-                if($1->entry.Template.ll_ptr1->type->variant != T_ARRAY)  
-                     $$->type = q->type;
-               }
-             }
-          }
-	;
-
-
-structure_component: lhs PERCENT IDENTIFIER
-	    { PTR_TYPE t;
-	      PTR_SYMB  field;
-	    /*  PTR_BFND at_scope;*/
-              PTR_LLND l;
-
-
-/*              if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-	      t = $1->type; 
-	      
-	      if (( ( ($1->variant == VAR_REF) 
-	          ||  ($1->variant == CONST_REF) 
-                  ||  ($1->variant == ARRAY_REF)
-                  ||  ($1->variant == RECORD_REF)) && (t->variant == T_DERIVED_TYPE)) 
-	          ||((($1->variant == ARRAY_REF) || ($1->variant == RECORD_REF)) && (t->variant == T_ARRAY) &&
-                      (t = t->entry.ar_decl.base_type) && (t->variant == T_DERIVED_TYPE))) 
-                {
-                 t->name = lookup_type_symbol(t->name);
-	         if ((field = component(t->name, yytext))) {                   
-	            l =  make_llnd(fi, VAR_REF, LLNULL, LLNULL, field);
-                    l->type = field->type;
-                    if(field->type->variant == T_ARRAY || field->type->variant == T_STRING)
-                      l->variant = ARRAY_REF; 
-                    $$ = make_llnd(fi, RECORD_REF, $1, l, SMNULL);
-                    if($1->type->variant != T_ARRAY)
-                       $$->type = field->type;
-                    else {
-                       $$->type = make_type(fi,T_ARRAY);
-                       if(field->type->variant != T_ARRAY) 
-	                 $$->type->entry.ar_decl.base_type = field->type;
-                       else
-                         $$->type->entry.ar_decl.base_type = field->type->entry.ar_decl.base_type;
-	               $$->type->entry.ar_decl.num_dimensions = t->entry.ar_decl.num_dimensions;
-                       }
-                 }
-                  else  
-                    errstr("Illegal component  %s", yytext,311);
-              }                     
-               else 
-                    errstr("Can't take component  %s", yytext,311);
-             }
-              /*   if ($$->variant == T_POINTER) {
-	            l = $$;
-	            $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	            $$->type = l->type->entry.Template.base_type;
-	         }
-              }
-                else errstr("Can't take component of %s", yytext, 311);
-              */
-	   
-        ;
-
-
-array_element: ident
-              { $$ = $1;}
-            | structure_component
-              {$$ = $1;}
-            | ident LEFTPAR in_ioctl funarglist RIGHTPAR
-            {  int num_triplets;
-               PTR_TYPE tp;
-              /* PTR_LLND l;*/
-	      if ($1->type->variant == T_ARRAY)
-              {
-  	         num_triplets = is_array_section_ref($4);
-	         /* array element */
-	         if (num_triplets == 0) {
-       	            $1->entry.Template.ll_ptr1 = $4;
-       	            $$ = $1;
-                    $$->type = $1->type->entry.ar_decl.base_type;
-                 }
-                 /* substring */
-	       /*  else if ((num_triplets == 1) && 
-                          ($1->type->variant == T_STRING)) {
-    	                  $1->entry.Template.ll_ptr1 = $4;
-	                  $$ = $1; $$->type = global_string;
-                 }   */ /*podd*/        
-                 /* array section */
-                 else {
-    	             $1->entry.Template.ll_ptr1 = $4;
-	             $$ = $1; tp = make_type(fi, T_ARRAY);
-                     tp->entry.ar_decl.base_type = $1->type->entry.ar_decl.base_type;  /**18.03.17* $1->type */
-	             tp->entry.ar_decl.num_dimensions = num_triplets;
-                     $$->type = tp;
-                 }
-             } 
-             else err("can't subscript",44);
-
-            /* if ($$->variant == T_POINTER) {
-	        l = $$;
-	        $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	        $$->type = l->type->entry.Template.base_type;
-	     }
-             */  /*11.02.03*/
-
-            endioctl();
-           }
-        | structure_component LEFTPAR funarglist RIGHTPAR
-
-           {  int num_triplets;
-	      PTR_LLND l,l1,l2;
-
-         /*   if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-              num_triplets = is_array_section_ref($3);
-              $$ = $1;
-              l2 = $1->entry.Template.ll_ptr2;  
-              l1 = $1->entry.Template.ll_ptr1;                
-              if(l2 && l2->type->variant == T_STRING)/*substring*/
-                if(num_triplets == 1){
-	           l = make_llnd(fi, ARRAY_OP, LLNULL, LLNULL, SMNULL);
-    	           l->entry.Template.ll_ptr1 = l2;
-       	           l->entry.Template.ll_ptr2 = $3->entry.Template.ll_ptr1;
-	           l->type = global_string; 
-                   $$->entry.Template.ll_ptr2 = l;                                          
-                } else
-                   err("Can't subscript",44);
-              else if (l2 && l2->type->variant == T_ARRAY) {
-                 if(num_triplets > 0) { /*array section*/
-                   $$->type = make_type(fi,T_ARRAY);
-                   $$->type->entry.ar_decl.base_type = l2->type->entry.ar_decl.base_type;
-                   $$->type->entry.ar_decl.num_dimensions = num_triplets;
-                   l2->entry.Template.ll_ptr1 = $3;
-                   l2->type = $$->type;   
-                  }                 
-                 else {  /*array element*/
-                   l2->type = l2->type->entry.ar_decl.base_type;
-                   l2->entry.Template.ll_ptr1 = $3;   
-                   if(l1->type->variant != T_ARRAY)  
-                     $$->type = l2->type;
-                 }
-              } else 
-                   err("Can't subscript",44);
-         }  
-         ;
-
-asubstring: ident substring
-            { 
-	      if ($1->type->variant == T_STRING) {
-                 $1->entry.Template.ll_ptr1 = $2;
-                 $$ = $1; $$->type = global_string;
-              }
-              else errstr("can't subscript of %s", $1->entry.Template.symbol->ident,44);
-            }
-        ;
-
-opt_substring:
-            { $$ = LLNULL; }
-        | substring
-            { $$ = $1; }
-        ;
-
-substring:  LEFTPAR opt_expr COLON opt_expr RIGHTPAR
-	    { $$ = make_llnd(fi, DDOT, $2, $4, SMNULL); }
-	;
-
-opt_expr:
-	    { $$ = LLNULL; }
-	| expr
-	    { $$ = $1; }
-	;
-
-simple_const: numeric_bool_const
-             { $$ = $1;}
-            | numeric_bool_const UNDER kind
-             { PTR_TYPE t;
-               t = make_type_node($1->type, $3);
-               $$ = $1;
-               $$->type = t;
-             }
-            | integer_constant
-	     { $$ = $1; }
-            | integer_constant UNDER kind
-             { PTR_TYPE t;
-               t = make_type_node($1->type, $3);
-               $$ = $1;
-               $$->type = t;
-             }
-            | string_constant opt_substring
-             {
-              if ($2 != LLNULL)
-              {
-		 $$ = make_llnd(fi, ARRAY_OP, $1, $2, SMNULL); 
-                 $$->type = global_string;
-              }
-	      else 
-                 $$ = $1;
-             }
-            ;
-
-numeric_bool_const:
-	  TTRUE
-	    {
-	      $$ = make_llnd(fi,BOOL_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.bval = 1;
-	      $$->type = global_bool;
-	    }
-	| FFALSE
-	    {
-	      $$ = make_llnd(fi,BOOL_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.bval = 0;
-	      $$->type = global_bool;
-	    }
-
-	| REAL_CONSTANT
-	    {
-	      $$ = make_llnd(fi,FLOAT_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-	      $$->type = global_float;
-	    }
-	| DP_CONSTANT
-	    {
-	      $$ = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-	      $$->type = global_double;
-	    }
-	;
-
-integer_constant: INT_CONSTANT
-	    {
-	      $$ = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.ival = atoi(yytext);
-	      $$->type = global_int;
-	    }
-                ;
-
-string_constant: CHAR_CONSTANT
-	    { PTR_TYPE t;
-	      PTR_LLND p,q;
-	      $$ = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-              if(yyquote=='\"') 
-	        t = global_string_2;
-              else
-	        t = global_string;
-
-	      p = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-	      p->entry.ival = yyleng;
-	      p->type = global_int;
-              q = make_llnd(fi, LEN_OP, p, LLNULL, SMNULL); 
-              $$->type = make_type_node(t, q);
-	    }
-              | ident  UNDER  CHAR_CONSTANT
-            { PTR_TYPE t;
-	      $$ = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-              if(yyquote=='\"') 
-	        t = global_string_2;
-              else
-	        t = global_string;
-	      $$->type = make_type_node(t, $1);
-            }
-              | integer_constant  UNDER  CHAR_CONSTANT
-            { PTR_TYPE t;
-	      $$ = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-              if(yyquote=='\"') 
-	        t = global_string_2;
-              else
-	        t = global_string;
-	      $$->type = make_type_node(t, $1);
-            }
-        ;
-
-
-complex_const:	LEFTPAR uexpr COMMA uexpr RIGHTPAR
-	    {
-	      $$ = make_llnd(fi,COMPLEX_VAL, $2, $4, SMNULL);
-	      $$->type = global_complex;
-	    }
-	;
-
-kind:  ident
-     { $$ = $1;}
-    |  integer_constant
-       { $$ = $1; }
-   ;
-
-/*
-section: LEFTPAR triplets RIGHTPAR
-	    { $$ = $2; }
-	;
-
-triplets:triplet
-	    { $$ = make_llnd(fi,EXPR_LIST, $1, LLNULL, SMNULL); }
-
-	| triplets COMMA triplet
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }*/
-/* I changed uexpr to expr in below rule and triplet rules.
-    Don't know why Daya wrote it as uexpr. Srinivas. */
-/*	| triplets COMMA expr
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); } */
-/* Deleted. Purpose unknown. Srinivas. 
-	| expr COMMA triplets
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); } 
-	;*/
-
-triplet:  expr COLON expr
-	    { $$ = make_llnd(fi,DDOT,$1,$3,SMNULL); }
-        | expr COLON 
-	    { $$ = make_llnd(fi,DDOT,$1,LLNULL,SMNULL); }
-	| expr COLON expr COLON expr
-	    { $$ = make_llnd(fi,DDOT,make_llnd(fi,DDOT,$1,$3,SMNULL),$5,SMNULL); }
-        | expr COLON COLON expr
-	    { $$ = make_llnd(fi,DDOT,make_llnd(fi,DDOT,$1,LLNULL,SMNULL),$4,SMNULL); }
-	| COLON expr COLON expr
-	    { $$ = make_llnd(fi,DDOT, make_llnd(fi,DDOT,LLNULL,$2,SMNULL),$4,SMNULL); }
-	| COLON COLON expr
-	    { $$ = make_llnd(fi,DDOT,make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL),$3,SMNULL); }
-	| COLON expr
-	    { $$ = make_llnd(fi,DDOT,LLNULL,$2,SMNULL); }
-	| COLON
-	    { $$ = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL); }
-	;
-
-vec:	  LEFTAB end_ioctl {in_vec=YES;} outlist {in_vec=NO;} RIGHTAB
-           { PTR_TYPE array_type;
-             $$ = make_llnd (fi,CONSTRUCTOR_REF,$4,LLNULL,SMNULL); 
-             /*$$->type = $2->type;*/ /*28.02.03*/
-             array_type = make_type(fi, T_ARRAY);
-	     array_type->entry.ar_decl.num_dimensions = 1;
-             if($4->type->variant == T_ARRAY)
-	       array_type->entry.ar_decl.base_type = $4->type->entry.ar_decl.base_type;
-             else
-               array_type->entry.ar_decl.base_type = $4->type;
-             $$->type = array_type;
-           }
-	;
-  
-allocate_object: ident
-	   { $$ = $1; }
-	| structure_component
-	   { $$ = $1; }
-	;
-/*
-allocation_list: ident 
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| structure_component
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-
-allocation_list: allocate_object
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-*/
-
-
-/*allocation_list: array_element
-	        { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	       | allocation_list COMMA  opt_key_word  array_element
-	        { $$ = set_ll_list($1, $4, EXPR_LIST); opt_kwd_ = NO; }
-               | allocation_list COMMA  opt_key_word STAT EQUAL ident
-                { stat_alloc = $6; }
-	;
-*/
-
-allocation_list: array_element
-	        { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	       | allocation_list COMMA  in_ioctl  array_element 
-	        { $$ = set_ll_list($1, $4, EXPR_LIST); endioctl(); }
-               | allocation_list COMMA  in_ioctl nameeq ident 
-                { stat_alloc = make_llnd(fi, SPEC_PAIR, $4, $5, SMNULL);
-                  endioctl();
-                }
-	;
-
-
-/*allocate_object_list: allocate_object 
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| allocate_object_list COMMA opt_key_word allocate_object 
-	   { $$ = set_ll_list($1, $4, EXPR_LIST); opt_kwd_ = NO; }
-       | allocate_object_list COMMA  opt_key_word STAT EQUAL ident
-	   { stat_alloc = $6; }
-	;
-*/
-
-allocate_object_list: allocate_object 
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| allocate_object_list COMMA in_ioctl allocate_object 
-	   { $$ = set_ll_list($1, $4, EXPR_LIST); endioctl(); }
-       | allocate_object_list COMMA  in_ioctl nameeq ident
-	   { stat_alloc = make_llnd(fi, SPEC_PAIR, $4, $5, SMNULL);
-             endioctl();
-           }
-	;
-/*
-opt_stat_spec: 
-	   { $$ = LLNULL; }
-	| COMMA needkeyword STAT EQUAL ident
-	   { $$ = $5; }
-	;
-*/
-
-stat_spec: 
-           {stat_alloc = LLNULL;}
-         ;
-
-pointer_name_list: ident
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| pointer_name_list COMMA ident
-	   { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-/*
- * Grammar for executable statements
- */
-
-exec:	  iffable
-	    { $$ = $1; }
-	| whereable
-            { $$ = $1; }
-        | plain_do
-            { $$ = $1; }
-        | construct_name_colon  plain_do
-	    {
-              $$ = $2;
-              $$->entry.Template.ll_ptr3 = $1;
-            }
-/*
-
-	| PLAINDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr
-	    {
-              if(!$4){
-                 err("No label in DO statement"); 
-                 $$ = BFNULL;
-              }
-              else {
-               if( $4->labdefined)
-		  execerr("no backward DO loops", (char *)NULL);
-	        $$ = make_do(FOR_NODE, $4, $7, $9, $11, NULL);
-	      }
-             
-	    }
-	| PLAINDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr COMMA expr
-	    {
-              if(!$4){
-                 err("No label in DO statement"); 
-                 $$ = BFNULL;
-              }
-              else {
-               if( $4->labdefined)
-		  execerr("no backward DO loops", (char *)NULL);
-	        $$ = make_do(FOR_NODE, $4, $7, $9, $11, $13);
-	      }
-             
-	    }
-*/
-/* PROCESSDO added for FORTRAN M 
-	| opt_construct_name_colon PROCESSDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr
-	    {
-              if( !do_name_err ) {
-                if($5 && $5->labdefined)
-                  err("No backward DO loops", 46);
-                $$ = make_processdo(PROCESS_DO_STAT, $5, $8, $10, $12, NULL);
-	        $$->entry.Template.ll_ptr3 = $1;
-              }
-            }
-	| opt_construct_name_colon PROCESSDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr COMMA expr
-            {
-              if( !do_name_err ) {
-                if($5 && $5->labdefined)
-                  err("No backward DO loops", 46);
-                $$ = make_processdo(PROCESS_DO_STAT, $5, $8, $10, $12, $14);
-	        $$->entry.Template.ll_ptr3 = $1;
-              }
-            }
-*/
-	| ENDUNIT end_spec opt_unit_name
-	    { PTR_BFND biff;
-
-	      $$ = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
-	      bind(); 
-	      biff = cur_scope();
-	      if ((biff->variant == FUNC_HEDR) || (biff->variant == PROC_HEDR)
-		  || (biff->variant == PROS_HEDR) 
-	          || (biff->variant == PROG_HEDR)
-                  || (biff->variant == BLOCK_DATA)) {
-                if(biff->control_parent == global_bfnd) position = IN_OUTSIDE;
-		else if(!is_interface_stat(biff->control_parent)) position++;
-              } else if  (biff->variant == MODULE_STMT)
-                position = IN_OUTSIDE;
-	      else err("Unexpected END statement read", 52);
-             /* FB ADDED set the control parent so the empty function unparse right*/
-              if ($$)
-                $$->control_parent = biff;
-              delete_beyond_scope_level(pred_bfnd);
-            }
-	| ENDDO end_spec opt_construct_name                  
-/*          { $$ = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);}*/
-/*          Had to be changed to accomodate PCF's do loops.  */
-	    {
-              make_extend($3);
-              $$ = BFNULL; 
-              /* delete_beyond_scope_level(pred_bfnd); */
-             } 
- 
-/* ENDPROCESSDO was added by C.Y.Chen 
-        | ENDPROCESSDO end_spec
-            { $$ = make_enddoall(); }
-*/
-	/* end module is bit different. So shouldn't have end_spec. */
-	/* It may be better to move it to spec. */
-	| ENDMODULE opt_unit_name
-          { $$ = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
-	    bind(); 
-	    delete_beyond_scope_level(pred_bfnd);
-	    position = IN_OUTSIDE;
-          }
-
-/*
-	| opt_construct_name_colon DOWHILE end_spec  needkeyword intonlyon dotarget intonlyoff WHILE LEFTPAR expr RIGHTPAR */
-        | do_while
-            { $$ = $1; }
-
-        | construct_name_colon do_while
-	    {
-              $$ = $2;
-              $$->entry.Template.ll_ptr3 = $1;
-            }
-
-/*	| CDOALL do_var EQUAL expr COMMA expr
-	        {$$ = make_do(CDOALL_NODE, NULL, $2, $4, $6, NULL);
-                 add_scope_level($$, NO);
-                }
-	| CDOALL do_var EQUAL expr COMMA expr COMMA expr
-	        {$$ = make_do(CDOALL_NODE, NULL, $2, $4, $6, $8);
-                 add_scope_level($$, NO);
-                }
-	| SDOALL do_var EQUAL expr COMMA expr
-	        {$$ = make_do(SDOALL_NODE, NULL, $2, $4, $6, NULL);
-                 add_scope_level($$, NO);
-                }
-	| SDOALL do_var EQUAL expr COMMA expr COMMA expr
-	        {$$ = make_do(SDOALL_NODE, NULL, $2, $4, $6, $8);
-                 add_scope_level($$, NO);
-                }
-	| DOACROSS do_var EQUAL expr COMMA expr
-	        {$$ = make_do(DOACROSS_NODE, NULL, $2, $4, $6, NULL);
-                 add_scope_level($$, NO);
-                }
-	| DOACROSS do_var EQUAL expr COMMA expr COMMA expr
-	        {$$ = make_do(DOACROSS_NODE, NULL, $2, $4, $6, $8);
-                 add_scope_level($$, NO);
-                }
-	| CDOACROSS do_var EQUAL expr COMMA expr
-	        {$$ = make_do(CDOACROSS_NODE, NULL, $2, $4, $6, NULL);
-                 add_scope_level($$, NO);
-                }
-	| CDOACROSS do_var EQUAL expr COMMA expr COMMA expr
-	        {$$ = make_do(CDOACROSS_NODE, NULL, $2, $4, $6, $8);
-                 add_scope_level($$, NO);
-                }
-	| LOOP
-          {
-	   make_loop();
-	   $$ = BFNULL;
-	  }
-
-	| enddoall
-	    { $$ = make_enddoall();
-              delete_beyond_scope_level(pred_bfnd);
-            }
-*/
-
-	| logif iffable
-	    { thiswasbranch = NO;
-              $1->variant = LOGIF_NODE;
-              $$ = make_logif($1, $2);
-	      set_blobs($1, pred_bfnd, SAME_GROUP);
-	    }
-	| logif THEN
-	    {
-              $$ = $1;
-	      set_blobs($$, pred_bfnd, NEW_GROUP1); 
-            }
-	|  construct_name_colon logif THEN
-	    {
-              $$ = $2;
-              $$->entry.Template.ll_ptr3 = $1;
-	      set_blobs($$, pred_bfnd, NEW_GROUP1); 
-            }
-	 /* | CONSTRUCT_ID COLON logif THEN
-	    { PTR_SYMB s;
-	      PTR_LLND l;
-              
-	      s = make_local_entity(look_up_sym(yytext), CONSTRUCT_NAME, global_default, LOCAL);
-              l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      * $$ = make_if($3); *
-	      $3->entry.Template.ll_ptr3 = l;
-              $$ = $3;
-	      set_blobs($$, pred_bfnd, NEW_GROUP1); 
-            }
-         */
-	| ELSEIF end_spec LEFTPAR expr RIGHTPAR THEN opt_construct_name
-	    { make_elseif($4,$7); lastwasbranch = NO; $$ = BFNULL;}
-	| ELSE end_spec opt_construct_name
-	    { make_else($3); lastwasbranch = NO; $$ = BFNULL; }
-	| ENDIF end_spec opt_construct_name
-	    { make_endif($3); $$ = BFNULL; }
-	| case
-	    { $$ = $1; }
-	| CONTAINS end_spec
-	    { $$ = get_bfnd(fi, CONTAINS_STMT, SMNULL, LLNULL, LLNULL, LLNULL); }
-        
-        | forall iffable
-	    { thiswasbranch = NO;
-              $1->variant = FORALL_STAT;
-              $$ = make_logif($1, $2);
-	      set_blobs($1, pred_bfnd, SAME_GROUP);
-	    }
-        | forall
-            { $$ = $1; }
-        | construct_name_colon  forall
-            { $$ = $2; $$->entry.Template.ll_ptr3 = $1;}
-        | ENDFORALL end_spec  opt_construct_name
-              { make_endforall($3); $$ = BFNULL; }   
-               
-        | dvm_exec
-            { $$ = $1; }
-        | acc_directive
-            { $$ = $1; }
-        | spf_directive
-            { $$ = $1; }                
-	;
-/*
-do_while:  DOWHILE end_spec  LEFTPAR expr RIGHTPAR
-          { 	     
-	
-	       $$ = make_do(WHILE_NODE, LBNULL, SMNULL, $4, LLNULL, LLNULL);
-	          
-           }
-        | DOWHILE end_spec  intonlyon dotarget intonlyoff needkeyword WHILE LEFTPAR expr RIGHTPAR 
-        
-          { 	     
-	       if($4 && $4->labdefined)
-		 execerr("no backward DO loops", (char *)NULL); 
-	       $$ = make_do(WHILE_NODE, $4, SMNULL, $9, LLNULL, LLNULL);
-	       	     
-           }
-        | DOWHILE end_spec intonlyon dotarget intonlyoff 
-            {
-               if( $4 && $4->labdefined)
-		  err("No backward DO loops", 46);
-	        $$ = make_do(WHILE_NODE, $4, SMNULL, LLNULL, LLNULL, LLNULL);            
-	    }
-     ;
-*/
-
-do_while:  DOWHILE end_spec  LEFTPAR expr RIGHTPAR
-          { 	     
-	     /*  if($5 && $5->labdefined)
-		 execerr("no backward DO loops", (char *)NULL); */
-	       $$ = make_do(WHILE_NODE, LBNULL, SMNULL, $4, LLNULL, LLNULL);
-	       /*$$->entry.Template.ll_ptr3 = $1;*/	     
-           }
-
-  
-       | DOWHILE end_spec intonlyon dotarget intonlyoff  opt_key_word opt_while
-            {
-               if( $4 && $4->labdefined)
-		  err("No backward DO loops", 46);
-	        $$ = make_do(WHILE_NODE, $4, SMNULL, $7, LLNULL, LLNULL);            
-	    }
-     ;
-
-opt_while: 
-	    { $$ = LLNULL; }
-           |  COMMA needkeyword WHILE LEFTPAR expr RIGHTPAR
-            { $$ = $5;}
-	   |  WHILE LEFTPAR expr RIGHTPAR 
-	    { $$ = $3;}
-            
-	;
-
-plain_do: PLAINDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr
-	    {  
-               if( $4 && $4->labdefined)
-		  err("No backward DO loops", 46);
-	        $$ = make_do(FOR_NODE, $4, $7, $9, $11, LLNULL);            
-	    }
-
-	| PLAINDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr COMMA expr
-	    {
-               if( $4 && $4->labdefined)
-		  err("No backward DO loops", 46);
-	        $$ = make_do(FOR_NODE, $4, $7, $9, $11, $13);            
-	    }
-        ;
-
-case:	CASE end_spec case_selector opt_construct_name
-	    { $$ = get_bfnd(fi, CASE_NODE, $4, $3, LLNULL, LLNULL); }
-      | DEFAULT_CASE  end_spec opt_construct_name
-	    { /*PTR_LLND p;*/
-	     /* p = make_llnd(fi, DEFAULT, LLNULL, LLNULL, SMNULL); */
-	      $$ = get_bfnd(fi, DEFAULT_NODE, $3, LLNULL, LLNULL, LLNULL); }
-      | ENDSELECT  end_spec opt_construct_name
-        { make_endselect($3); $$ = BFNULL; }
-	   /* { $$ = get_bfnd(fi, CONTROL_END, $3, LLNULL, LLNULL, LLNULL); }*/
-      | SELECT  end_spec needkeyword CASE LEFTPAR expr RIGHTPAR
-	    { $$ = get_bfnd(fi, SWITCH_NODE, SMNULL, $6, LLNULL, LLNULL) ; }
-      | construct_name_colon SELECT  end_spec needkeyword CASE LEFTPAR expr RIGHTPAR
-	    { $$ = get_bfnd(fi, SWITCH_NODE, SMNULL, $7, LLNULL, $1) ; }
-	;
-
-case_selector: LEFTPAR case_value_range_list RIGHTPAR
-	         { $$ = $2; }
-/*	| DEFAULT_CASE
-	    { $$ = make_llnd(fi, DEFAULT, LLNULL, LLNULL, SMNULL); }
-*/	;
-
-case_value_range: expr
-	            { $$ = $1; }
-	| expr COLON
-	    { $$ = make_llnd(fi, DDOT, $1, LLNULL, SMNULL); }
-	| COLON expr
-	    { $$ = make_llnd(fi, DDOT, LLNULL, $2, SMNULL); }
-	| expr COLON expr
-	    { $$ = make_llnd(fi, DDOT, $1, $3, SMNULL); }
-	;
-
-case_value_range_list: case_value_range
-	                 { $$ = make_llnd(fi, EXPR_LIST, $1, LLNULL, SMNULL); }
-	| case_value_range_list COMMA case_value_range
-	    { PTR_LLND p;
-	      
-	      p = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(p, $1);
-	    }
-	;
-
-opt_construct_name:
-	    { $$ = SMNULL; }
-	| name
-	    { $$ = make_local_entity($1, CONSTRUCT_NAME, global_default,
-                                     LOCAL); } 
-
-	;
-
-opt_unit_name: 
-              {$$ = HSNULL;}
-             | name
-              { $$ = $1;}
-             ;
-
-construct_name: CONSTRUCT_ID
-               {$$ = look_up_sym(yytext);}
-              ;
-
-construct_name_colon:  construct_name COLON
-	           { PTR_SYMB s;
-	             s = make_local_entity( $1, CONSTRUCT_NAME, global_default, LOCAL);             
-                    $$ = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-                   }
-	           ;
-/*
-opt_construct_name_colon: 
-	           { $$ = LLNULL; }
-	          | construct_name COLON
-	           { PTR_SYMB s;
-	             s = make_local_entity( $1, CONSTRUCT_NAME, global_default, LOCAL);             
-                    $$ = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-                   }
-	           ;
-*/
-/*
-optkeyword: 
-           {opt_kwd_ = YES;}
-          ;
-*/
-logif:	  LOGICALIF end_spec LEFTPAR expr RIGHTPAR
-	    { $$ = make_if($4); }
-	;
-forall:	  FORALL end_spec LEFTPAR forall_list opt_forall_cond RIGHTPAR
-	    { $$ = make_forall($4,$5); }
-	;
-
-forall_list: forall_expr
-             { $$ = make_llnd(fi, EXPR_LIST, $1, LLNULL, SMNULL); }
-            | forall_list COMMA forall_expr
-	    { PTR_LLND p;	      
-	      p = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(p, $1);
-	    }
-            ;
-
-forall_expr: do_var EQUAL triplet
-              {$$ = make_llnd(fi, FORALL_OP, $3, LLNULL, $1); }
-           ;
-
-opt_forall_cond:
-                 { $$=LLNULL;}
-               |  COMMA expr
-                 { $$=$2;}           
-               ;
-/*
-enddoall: ENDCDOALL
-        | ENDSDOALL
-	| ENDDOACROSS
-	| ENDCDOACROSS
-	;
-*/
-
-do_var:	 name
-         { PTR_SYMB  s;
-              s = $1->id_attr;
-      	      if (!s || s->variant == DEFAULT)
-              {
-	         s = make_scalar($1, TYNULL, LOCAL);
-	     	 s->decl = SOFT;
-	      }
-              $$ = s; 
-	 }
-	;
-
-dospec:	  do_var EQUAL expr COMMA expr
-             /* name EQUAL expr COMMA expr*/  /*16.02.03*/
-	    { PTR_SYMB s;
-              PTR_LLND l;
-              int vrnt;
-
-            /*  s = make_scalar($1, TYNULL, LOCAL);*/ /*16.02.03*/
-              s = $1;
-	      if (s->variant != CONST_NAME) {
-                if(in_vec) 
-                   vrnt=SEQ;
-                else
-                   vrnt=DDOT;     
-                l = make_llnd(fi, SEQ, make_llnd(fi, vrnt, $3, $5, SMNULL),
-                              LLNULL, SMNULL);
-		$$ = make_llnd(fi,IOACCESS, LLNULL, l, s);
-		do_name_err = NO;
-	      }
-	      else {
-		err("Symbolic constant not allowed as DO variable", 47);
-		do_name_err = YES;
-	      }
-	    }
-	| do_var EQUAL expr COMMA expr COMMA expr
-              /*name EQUAL expr COMMA expr COMMA expr*/ /*16.02.03*/
-	    { PTR_SYMB s;
-              PTR_LLND l;
-              int vrnt;
-              /*s = make_scalar($1, TYNULL, LOCAL);*/ /*16.02.03*/
-              s = $1;
-	      if( s->variant != CONST_NAME ) {
-                if(in_vec) 
-                   vrnt=SEQ;
-                else
-                   vrnt=DDOT;     
-                l = make_llnd(fi, SEQ, make_llnd(fi, vrnt, $3, $5, SMNULL), $7,
-                              SMNULL);
-		$$ = make_llnd(fi,IOACCESS, LLNULL, l, s);
-		do_name_err = NO;
-	      }
-	      else {
-		err("Symbolic constant not allowed as DO variable", 47);
-		do_name_err = YES;
-	      }
-	    }
-	;
-
-
-dotarget: { $$ = LBNULL; } 
-        | INT_CONSTANT
-            {
-	       $$  = make_label_node(fi,convci(yyleng, yytext));
-	       $$->scope = cur_scope();
-	    }
-       ;
-
-whereable: ENDWHERE  end_spec opt_construct_name
-           { make_endwhere($3); $$ = BFNULL; }
-	 | ELSEWHERE  end_spec opt_construct_name
-           { make_elsewhere($3); lastwasbranch = NO; $$ = BFNULL; }
-	 | ELSEWHERE  end_spec LEFTPAR expr RIGHTPAR opt_construct_name
-           { make_elsewhere_mask($4,$6); lastwasbranch = NO; $$ = BFNULL; }
-	 | WHERE  end_spec LEFTPAR expr RIGHTPAR 
-           { $$ = get_bfnd(fi, WHERE_BLOCK_STMT, SMNULL, $4, LLNULL, LLNULL); }
-	 | construct_name_colon WHERE end_spec LEFTPAR expr RIGHTPAR 
-           { $$ = get_bfnd(fi, WHERE_BLOCK_STMT, SMNULL, $5, LLNULL, $1); }
-	 ;
-
-iffable:  let expr EQUAL expr
-          /* let lhs EQUAL expr */
-           { PTR_LLND p, r;
-             PTR_SYMB s1, s2 = SMNULL, s3, arg_list;
-	     PTR_HASH hash_entry;
-
-	   /*  if (just_look_up_sym("=") != HSNULL) {
-	        p = intrinsic_op_node("=", EQUAL, $2, $4);
-   	        $$ = get_bfnd(fi, OVERLOADED_ASSIGN_STAT, SMNULL, p, $2, $4);
-             }	      
-             else */ if ($2->variant == FUNC_CALL) {
-                if(parstate==INEXEC){
-                  	  err("Declaration among executables", 30);
-                 /*   $$=BFNULL;*/
- 	         $$ = get_bfnd(fi,STMTFN_STAT, SMNULL, $2, LLNULL, LLNULL);
-                } 
-                else {	         
-  	         $2->variant = STMTFN_DECL;
-		 /* $2->entry.Template.ll_ptr2 = $4; */
-                 if( $2->entry.Template.ll_ptr1) {
-		   r = $2->entry.Template.ll_ptr1->entry.Template.ll_ptr1;
-                   if(r->variant != VAR_REF && r->variant != ARRAY_REF){
-                     err("A dummy argument of a statement function must be a scalar identifier", 333);
-                     s1 = SMNULL;
-                   }
-                   else                       
-		     s1 = r ->entry.Template.symbol;
-                 } else
-                   s1 = SMNULL;
-		 if (s1)
-	            s1->scope = cur_scope();
- 	         $$ = get_bfnd(fi,STMTFN_STAT, SMNULL, $2, LLNULL, LLNULL);
-	         add_scope_level($$, NO);
-                 arg_list = SMNULL;
-		 if (s1) 
-                 {
-	            /*arg_list = SMNULL;*/
-                    p = $2->entry.Template.ll_ptr1;
-                    while (p != LLNULL)
-                    {
-		    /*   if (p->entry.Template.ll_ptr1->variant != VAR_REF) {
-			  errstr("cftn.gram:1: illegal statement function %s.", $2->entry.Template.symbol->ident);
-			  break;
-		       } 
-                    */
-                       r = p->entry.Template.ll_ptr1;
-                       if(r->variant != VAR_REF && r->variant != ARRAY_REF){
-                         err("A dummy argument of a statement function must be a scalar identifier", 333);
-                         break;
-                       }
-	               hash_entry = look_up_sym(r->entry.Template.symbol->parent->ident);
-	               s3 = make_scalar(hash_entry, s1->type, IO);
-                       replace_symbol_in_expr(s3,$4);
-	               if (arg_list == SMNULL) 
-                          s2 = arg_list = s3;
-             	       else 
-                       {
-                          s2->id_list = s3;
-                          s2 = s3;
-                       }
-                       p = p->entry.Template.ll_ptr2;
-                    }
-                 }
-  		    $2->entry.Template.ll_ptr1 = $4;
-		    install_param_list($2->entry.Template.symbol,
-				       arg_list, LLNULL, FUNCTION_NAME);
-	            delete_beyond_scope_level($$);
-		 
-		/* else
-		    errstr("cftn.gram: Illegal statement function declaration %s.", $2->entry.Template.symbol->ident); */
-               }
-	     }
-	     else {
-		$$ = get_bfnd(fi,ASSIGN_STAT,SMNULL, $2, $4, LLNULL);
-                 parstate = INEXEC;
-             }
-	  }
-	| POINTERLET end_spec lhs POINT_TO expr
-	    { /*PTR_SYMB s;*/
-	
-	      /*s = make_scalar($2, TYNULL, LOCAL);*/
-  	      $$ = get_bfnd(fi, POINTER_ASSIGN_STAT, SMNULL, $3, $5, LLNULL);
-	    }
-/*        | let lhs EQUAL vec
-		
-	       { if ($2->variant == ARRAY_REF)
-		    $$ = get_bfnd(fi,ASSIGN_STAT,SMNULL, $2, $4, LLNULL);
-                 else err("Constructor reference");
-		}
-*/	| ASSIGN end_spec label TO name
-	    { PTR_SYMB p;
-
-	      p = make_scalar($5, TYNULL, LOCAL);
-	      p->variant = LABEL_VAR;
-  	      $$ = get_bfnd(fi,ASSLAB_STAT, p, $3,LLNULL,LLNULL);
-            }
-	| CONTINUE end_spec
-	    { $$ = get_bfnd(fi,CONT_STAT,SMNULL,LLNULL,LLNULL,LLNULL); }
-	| goto
-	| io
-	    { inioctl = NO; }
-	| ARITHIF end_spec LEFTPAR expr RIGHTPAR label COMMA label COMMA label
-	    { PTR_LLND	p;
-
-	      p = make_llnd(fi,EXPR_LIST, $10, LLNULL, SMNULL);
-	      p = make_llnd(fi,EXPR_LIST, $8, p, SMNULL);
-	      $$= get_bfnd(fi,ARITHIF_NODE, SMNULL, $4,
-			    make_llnd(fi,EXPR_LIST, $6, p, SMNULL), LLNULL);
-	      thiswasbranch = YES;
-            }
-	| call
-	    {
-	      $$ = subroutine_call($1, LLNULL, LLNULL, PLAIN);
-/*	      match_parameters($1, LLNULL);
-	      $$= get_bfnd(fi,PROC_STAT, $1, LLNULL, LLNULL, LLNULL);
-*/	      endioctl(); 
-            }
-	| call LEFTPAR RIGHTPAR
-	    {
-	      $$ = subroutine_call($1, LLNULL, LLNULL, PLAIN);
-/*	      match_parameters($1, LLNULL);
-	      $$= get_bfnd(fi,PROC_STAT,$1,LLNULL,LLNULL,LLNULL);
-*/	      endioctl(); 
-	    }
-	| call LEFTPAR  callarglist RIGHTPAR
-	    {
-	      $$ = subroutine_call($1, $3, LLNULL, PLAIN);
-/*	      match_parameters($1, $3);
-	      $$= get_bfnd(fi,PROC_STAT,$1,$3,LLNULL,LLNULL);
-*/	      endioctl(); 
-	    }
-
-	| RETURN end_spec opt_expr
-	    {
-	      $$ = get_bfnd(fi,RETURN_STAT,SMNULL,$3,LLNULL,LLNULL);
-	      thiswasbranch = YES;
-	    }
-	| stop end_spec opt_expr
-	    {
-	      $$ = get_bfnd(fi,$1,SMNULL,$3,LLNULL,LLNULL);
-	      thiswasbranch = ($1 == STOP_STAT);
-	    }
-	| CYCLE  end_spec opt_construct_name
-	    { $$ = get_bfnd(fi, CYCLE_STMT, $3, LLNULL, LLNULL, LLNULL); }
-
-	| EXIT  end_spec opt_construct_name
-	    { $$ = get_bfnd(fi, EXIT_STMT, $3, LLNULL, LLNULL, LLNULL); }
-
-	| ALLOCATE  end_spec  LEFTPAR  stat_spec allocation_list RIGHTPAR
-	    { $$ = get_bfnd(fi, ALLOCATE_STMT,  SMNULL, $5, stat_alloc, LLNULL); }
-
-	| DEALLOCATE end_spec LEFTPAR  stat_spec allocate_object_list  RIGHTPAR
-	    { $$ = get_bfnd(fi, DEALLOCATE_STMT, SMNULL, $5, stat_alloc , LLNULL); }
-
-	| NULLIFY end_spec LEFTPAR pointer_name_list RIGHTPAR
-	    { $$ = get_bfnd(fi, NULLIFY_STMT, SMNULL, $4, LLNULL, LLNULL); }
-
-        | WHERE_ASSIGN end_spec LEFTPAR expr RIGHTPAR lhs EQUAL expr
-           { $$ = get_bfnd(fi, WHERE_NODE, SMNULL, $4, $6, $8); }
-	;
-
-let:	  LET in_data
-      /*
-	    { if(parstate == OUTSIDE)
-		{ PTR_BFND p;
-
-		  p = get_bfnd(fi,PROG_HEDR, make_program(look_up_sym("_MAIN")), LLNULL, LLNULL, LLNULL);
-		  set_blobs(p, global_bfnd, NEW_GROUP1);
-		  add_scope_level(p, NO);
-		  position = IN_PROC; 
-		}
-		if(parstate < INDATA) enddcl();
-		parstate = INEXEC;
-		yystno = 0;	 
-     }
-     */
-         {$$ = LLNULL;}
-	;
- 
-goto:	  PLAINGOTO end_spec label
-	    {
-	      $$=get_bfnd(fi,GOTO_NODE,SMNULL,LLNULL,LLNULL,(PTR_LLND)$3);
-	      thiswasbranch = YES;
-	    }
-	| ASSIGNGOTO end_spec name
-	    { PTR_SYMB p;
-
-	      if($3->id_attr)
-		p = $3->id_attr;
-	      else {
-	        p = make_scalar($3, TYNULL, LOCAL);
-		p->variant = LABEL_VAR;
-	      }
-
-	      if(p->variant == LABEL_VAR) {
-		  $$ = get_bfnd(fi,ASSGOTO_NODE,p,LLNULL,LLNULL,LLNULL);
-		  thiswasbranch = YES;
-	      }
-	      else {
-		  err("Must go to assigned variable", 48);
-		  $$ = BFNULL;
-	      }
-	    }
-	| ASSIGNGOTO end_spec name opt_comma LEFTPAR labellist RIGHTPAR
-	    { PTR_SYMB p;
-
-	      if($3->id_attr)
-		p = $3->id_attr;
-	      else {
-	        p = make_scalar($3, TYNULL, LOCAL);
-		p->variant = LABEL_VAR;
-	      }
-
-	      if (p->variant == LABEL_VAR) {
-		 $$ = get_bfnd(fi,ASSGOTO_NODE,p,$6,LLNULL,LLNULL);
-		 thiswasbranch = YES;
-	      }
-	      else {
-		err("Must go to assigned variable",48);
-		$$ = BFNULL;
-	      }
-	    }
-	| COMPGOTO end_spec LEFTPAR labellist RIGHTPAR opt_comma expr
-	    { $$ = get_bfnd(fi,COMGOTO_NODE, SMNULL, $4, $7, LLNULL); }
-	;
-
-opt_comma:
-	| COMMA
-	;
-
-call:	  CALL end_spec name in_ioctl
-	    { $$ = make_procedure($3, LOCAL); }
-	;
-
-callarglist:  in_ioctl callarg
-	    { 
-              $$ = set_ll_list($2, LLNULL, EXPR_LIST);
-              endioctl();
-            }
-	| callarglist COMMA in_ioctl callarg
-	    { 
-               $$ = set_ll_list($1, $4, EXPR_LIST);
-               endioctl();
-            }
-	;
-
-callarg:  expr
-	    { $$ = $1; }
-	| nameeq expr
-	    { $$  = make_llnd(fi, KEYWORD_ARG, $1, $2, SMNULL); }
-	| ASTER label
-	    { $$ = make_llnd(fi,LABEL_ARG,$2,LLNULL,SMNULL); }
-	;
-
-stop:	  PAUSE	{ $$ = PAUSE_NODE; }
-	| STOP	{ $$ = STOP_STAT; }
-	;
-
-/*
-exprlist: expr
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| exprlist COMMA expr
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-*/
-end_spec:
-	    { if(parstate == OUTSIDE)
-		{ PTR_BFND p;
-
-		  p = get_bfnd(fi,PROG_HEDR, make_program(look_up_sym("_MAIN")), LLNULL, LLNULL, LLNULL);
-		  set_blobs(p, global_bfnd, NEW_GROUP1);
-		  add_scope_level(p, NO);
-		  position = IN_PROC; 
-		}
-		if(parstate < INDATA) enddcl();
-		parstate = INEXEC;
-		yystno = 0;
-	      }
-	;
-
-intonlyon:
-	    { intonly = YES; }
-	;
-
-intonlyoff:
-	     { intonly = NO; }
-
-	;
-
-/*
- *  Grammar for Input/Output statements
- */
-io:	  iofmove ioctl
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| iofmove unpar_fexpr 
-		{ PTR_LLND p, q = LLNULL;
-
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"unit";
-		  q->type = global_string;
-		  p = make_llnd(fi, SPEC_PAIR, q, $2, SMNULL);
-		  $1->entry.Template.ll_ptr2 = p;
-		  endioctl();
-		  $$ = $1; }
-	| iofmove ASTER
-		{ PTR_LLND p, q, r;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"unit";
-		  q->type = global_string;
-		  r = make_llnd(fi, SPEC_PAIR, p, q, SMNULL);
-		  $1->entry.Template.ll_ptr2 = r;
-		  endioctl();
-		  $$ = $1; }
- 	| iofmove DASTER
-		{ PTR_LLND p, q, r;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"**";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"unit";
-		  q->type = global_string;
-		  r = make_llnd(fi, SPEC_PAIR, p, q, SMNULL);
-		  $1->entry.Template.ll_ptr2 = r;
-		  endioctl();
-		  $$ = $1; }
-	| iofctl ioctl
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| inquire
-                { $$ = $1; }
-	| read ioctl
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| read infmt
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| read ioctl inlist
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $1->entry.Template.ll_ptr1 = $3;
-		  $$ = $1; }
-	| read infmt COMMA inlist
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $1->entry.Template.ll_ptr1 = $4;
-		  $$ = $1; }
-/*	| read ioctl COMMA inlist                   Not needed
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $1->entry.Template.ll_ptr1 = $4;
-		  $$ = $1; }  
-*/
-	| write ioctl
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| write ioctl outlist
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $1->entry.Template.ll_ptr1 = $3;
-		  $$ = $1; }
-	| print
-		{ $$ = $1; }
-	| print COMMA outlist
-		{ $1->entry.Template.ll_ptr1 = $3;
-		  $$ = $1; }
-	;
-
-
-iofmove:   fmkwd end_spec start_ioctl
-		{ $$ = $1; }
-	;
-
-fmkwd:	  BACKSPACE
-           {$$ = get_bfnd(fi, BACKSPACE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	| REWIND
-           {$$ = get_bfnd(fi, REWIND_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	| ENDFILE
-           {$$ = get_bfnd(fi, ENDFILE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-/*        | SKIPPASTEOF
-           {$$ = get_bfnd(fi, SKIPPASTEOF_NODE, SMNULL, LLNULL, LLNULL, LLNULL); }
-*/
-	;
-
-iofctl:  ctlkwd end_spec start_ioctl
-		{ $$ = $1; }
-	;
-
-ctlkwd:   OPEN
-           {$$ = get_bfnd(fi, OPEN_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	| CLOSE
-           {$$ = get_bfnd(fi, CLOSE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	;
-
-inquire: INQUIRE end_spec start_ioctl ioctl
-           {  $$ = get_bfnd(fi, INQUIRE_STAT, SMNULL, LLNULL, $4, LLNULL);}
-        | INQUIRE end_spec start_ioctl  ioctl outlist
-           {  $$ = get_bfnd(fi, INQUIRE_STAT, SMNULL, $5, $4, LLNULL);}
-	;
-
-infmt:	  unpar_fexpr
-		{ PTR_LLND p;
-		  PTR_LLND q = LLNULL;
-
-		  if ($1->variant == INT_VAL)
- 	          {
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) $1->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		  }
-		  else p = $1; 
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		  endioctl();
-		}
-	| ASTER
-		{ PTR_LLND p;
-		  PTR_LLND q;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		  endioctl();
-		}
-	;
-
-
-ioctl:	LEFTPAR fexpr RIGHTPAR
-		{ PTR_LLND p;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"unit";
-		  p->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, p, $2, SMNULL);
-		  endioctl();
-		}
-	| LEFTPAR  ctllist RIGHTPAR
-
-/*ioctl: LEFTPAR  ctllist RIGHTPAR*/
-		{ 
-		  $$ = $2;
-		  endioctl();
-		 }
-	;
-
-ctllist:  ioclause
-		{ $$ = $1; endioctl();}
-	| ctllist COMMA in_ioctl ioclause
-		{ $$ = set_ll_list($1, $4, EXPR_LIST); endioctl();}
-	;
-
-ioclause:  fexpr
-		{ PTR_LLND p;
-		  PTR_LLND q;
- 
-		  nioctl++;
-		  if ((nioctl == 2) && ($1->variant == INT_VAL))
- 	          {
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) $1->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		  }
-		  else p = $1; 
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  if (nioctl == 1)
-		        q->entry.string_val = (char *)"unit"; 
-		  else {
-                     if(($1->variant == VAR_REF) && $1->entry.Template.symbol->variant == NAMELIST_NAME)
-                       q->entry.string_val = (char *)"nml";
-                     else
-                       q->entry.string_val = (char *)"fmt";
-                  }
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		}
-	| ASTER
-		{ PTR_LLND p;
-		  PTR_LLND q;
-
-		  nioctl++;
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  if (nioctl == 1)
-		        q->entry.string_val = (char *)"unit"; 
-		  else  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		}
-	| DASTER
-		{ PTR_LLND p;
-		  PTR_LLND q;
-
-		  nioctl++;
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"**";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  if (nioctl == 1)
-		        q->entry.string_val = (char *)"unit"; 
-		  else  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		}
-	| nameeq expr
-		{ 
-		  PTR_LLND p;
-		  char *q;
-
-		  q = $1->entry.string_val;
-  		  if ((strcmp(q, "end") == 0) || (strcmp(q, "err") == 0) || (strcmp(q, "eor") == 0) || ((strcmp(q,"fmt") == 0) && ($2->variant == INT_VAL)))
- 	          {
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) $2->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		  }
-		  else p = $2;
-
-		  $$ = make_llnd(fi, SPEC_PAIR, $1, p, SMNULL); }
-	| nameeq ASTER
-		{ PTR_LLND p;
-                  
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, $1, p, SMNULL);
-		}
-	| nameeq DASTER
-		{ PTR_LLND p;
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, $1, p, SMNULL);
-		}
-	;
-
-nameeq:  NAMEEQ
-		{ $$ = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  $$->entry.string_val = copys(yytext);
-		  $$->type = global_string;
-	        }
-	;
-
-
-read:	  READ end_spec start_ioctl
-           {$$ = get_bfnd(fi, READ_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	;
-
-
-write:	  WRITE end_spec start_ioctl
-           {$$ = get_bfnd(fi, WRITE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	;
-
-
-print:	  PRINT end_spec fexpr start_ioctl
-           {
-	    PTR_LLND p, q, l;
-
-	    if ($3->variant == INT_VAL)
-		{
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) $3->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		}
-	    else p = $3;
-	    
-            q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	    q->entry.string_val = (char *)"fmt";
-            q->type = global_string;
-            l = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-
-            $$ = get_bfnd(fi, PRINT_STAT, SMNULL, LLNULL, l, LLNULL);
-	    endioctl();
-	   }	
-	| PRINT end_spec ASTER start_ioctl
-	   { PTR_LLND p, q, r;
-		
-	     p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	     p->entry.string_val = (char *)"*";
-	     p->type = global_string;
-	     q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	     q->entry.string_val = (char *)"fmt";
-             q->type = global_string;
-             r = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-	     $$ = get_bfnd(fi, PRINT_STAT, SMNULL, LLNULL, r, LLNULL);
-	     endioctl();
-           }
-	;
-
-
-inlist:	  inelt
-		{ $$ = set_ll_list($1, LLNULL, EXPR_LIST);}
-	| inlist COMMA inelt
-		{ $$ = set_ll_list($1, $3, EXPR_LIST);}
-	;
-
-inelt:	  lhs
-		{ $$ = $1; }
-	| LEFTPAR inlist COMMA dospec RIGHTPAR
-		{
-		  $4->entry.Template.ll_ptr1 = $2;
-		  $$ = $4;
-		}
-	;
-
-outlist:  uexpr
-		{ $$ = set_ll_list($1, LLNULL, EXPR_LIST);  $$->type = $1->type;}
-	| other
-		{ $$ = $1; }
-	| out2
-		{ $$ = $1; }
-	;
-
-out2:	  uexpr COMMA uexpr
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| uexpr COMMA other
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| other COMMA uexpr
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| other COMMA other
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| out2  COMMA uexpr
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| out2  COMMA other
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	;
-
-other:	  complex_const
-		{ $$ =  set_ll_list($1, LLNULL, EXPR_LIST);
-	          $$->type = global_complex; }
-	| LEFTPAR expr RIGHTPAR
-		{ $$ =  set_ll_list($2, LLNULL, EXPR_LIST);
-                  $$->type = $2->type; }
-	| LEFTPAR uexpr COMMA dospec RIGHTPAR
-		{
-		  $4->entry.Template.ll_ptr1 = $2;
-		  $$ =  set_ll_list($4, LLNULL, EXPR_LIST);
-                  $$->type = $2->type; 
-		}
-	| LEFTPAR other COMMA dospec RIGHTPAR	
-		{
-		  $4->entry.Template.ll_ptr1 = $2;
-		  $$ =  set_ll_list($4, LLNULL, EXPR_LIST);
-                  $$->type = $2->type; 
-		}
-	| LEFTPAR out2  COMMA dospec RIGHTPAR
-		{
-		  $4->entry.Template.ll_ptr1 = $2;
-		  $$ =  set_ll_list($4, LLNULL, EXPR_LIST);
-                  $$->type = $2->type; 
-		}
-	;
-
-in_ioctl:
-		{ inioctl = YES; }
-	;
-
-start_ioctl:
-		{ startioctl();}
-	;
-
-
-/*
- * used by I/O statement 
- */
-fexpr:	unpar_fexpr
-            { $$ = $1; }
-	| LEFTPAR fexpr RIGHTPAR
-	    { $$ = $2; }
-	;
-
-unpar_fexpr:  lhs
-        { $$ = $1; }
-	| simple_const
-        { $$ = $1; }
-	| fexpr addop fexpr   %prec PLUS
-	    {
-	      $$ = make_llnd(fi,$2, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-	| fexpr ASTER fexpr
-	    {
-	      $$ = make_llnd(fi,MULT_OP, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-	| fexpr SLASH fexpr
-	    {
-	      $$ = make_llnd(fi,DIV_OP, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-	| fexpr DASTER fexpr
-	    {
-	      $$ = make_llnd(fi,EXP_OP, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-	| addop fexpr  %prec ASTER
-	    {
-	      if($1 == SUBT_OP)
-		{
-		  $$ = make_llnd(fi,SUBT_OP, $2, LLNULL, SMNULL);
-		  set_expr_type($$);
-		}
-	      else	$$ = $2;
-	    }
-	| fexpr DSLASH fexpr
-	    {
-	      $$ = make_llnd(fi,CONCAT_OP, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-        | IDENTIFIER EQUAL expr  
-           { $$ = LLNULL; }
-	;
-
-
-cmnt:       /* nothing */
-	  { comments = cur_comment = CMNULL; }
-	| COMMENT
-	  { PTR_CMNT p;
-	    p = make_comment(fi,*commentbuf, HALF);
-	    if (cur_comment)
-               cur_comment->next = p;
-            else {
-	       if ((pred_bfnd->control_parent->variant == LOGIF_NODE) ||(pred_bfnd->control_parent->variant == FORALL_STAT))
-
-	           pred_bfnd->control_parent->entry.Template.cmnt_ptr = p;
-
-	       else last_bfnd->entry.Template.cmnt_ptr = p;
-            }
-	    comments = cur_comment = CMNULL;
-          }
-	;
diff --git a/projects/dvm_svn/fdvm/trunk/parser/gram1.tab.c b/projects/dvm_svn/fdvm/trunk/parser/gram1.tab.c
deleted file mode 100644
index 91f0ffa..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/gram1.tab.c
+++ /dev/null
@@ -1,14474 +0,0 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
-
-/* Bison implementation for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "3.0.4"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 0
-
-/* Push parsers.  */
-#define YYPUSH 0
-
-/* Pull parsers.  */
-#define YYPULL 1
-
-
-
-
-/* Copy the first part of user declarations.  */
-#line 359 "gram1.y" /* yacc.c:339  */
-
-#include <string.h>
-#include "inc.h"
-#include "extern.h"
-#include "defines.h"
-#include "fdvm.h"
-#include "fm.h"
-
-/* We may use builtin alloca */
-#include "compatible.h"
-#ifdef _NEEDALLOCAH_
-#  include <alloca.h>
-#endif
-
-#define EXTEND_NODE 2  /* move the definition to h/ files. */
-
-extern PTR_BFND global_bfnd, pred_bfnd;
-extern PTR_SYMB star_symb;
-extern PTR_SYMB global_list;
-extern PTR_TYPE global_bool;
-extern PTR_TYPE global_int;
-extern PTR_TYPE global_float;
-extern PTR_TYPE global_double;
-extern PTR_TYPE global_char;
-extern PTR_TYPE global_string;
-extern PTR_TYPE global_string_2;
-extern PTR_TYPE global_complex;
-extern PTR_TYPE global_dcomplex;
-extern PTR_TYPE global_gate;
-extern PTR_TYPE global_event;
-extern PTR_TYPE global_sequence;
-extern PTR_TYPE global_default;
-extern PTR_LABEL thislabel;
-extern PTR_CMNT comments, cur_comment;
-extern PTR_BFND last_bfnd;
-extern PTR_TYPE impltype[];
-extern int nioctl;
-extern int maxdim;
-extern long yystno;	/* statement label */
-extern char stmtbuf[];	/* input buffer */
-extern char *commentbuf;	/* comments buffer from scanner */
-extern PTR_BLOB head_blob;
-extern PTR_BLOB cur_blob;
-extern PTR_TYPE vartype; /* variable type */
-extern int end_group;
-extern char saveall;
-extern int privateall;
-extern int needkwd;
-extern int implkwd;
-extern int opt_kwd_hedr;
-/* added for FORTRAN 90 */
-extern PTR_LLND first_unresolved_call;
-extern PTR_LLND last_unresolved_call;
-extern int data_stat;
-extern char yyquote;
-
-extern int warn_all;
-extern int statement_kind; /* kind of statement: 1 - HPF-DVM-directive, 0 - Fortran statement*/ 
-int extend_flag = 0;
-
-static int do_name_err;
-static int ndim;	/* number of dimension */
-/*!!! hpf */
-static int explicit_shape; /*  1 if shape specification is explicit */
-/* static int varleng;*/	/* variable size */
-static int lastwasbranch = NO;	/* set if last stmt was a branch stmt */
-static int thiswasbranch = NO;	/* set if this stmt is a branch stmt */
-static PTR_SYMB type_var = SMNULL;
-static PTR_LLND stat_alloc = LLNULL; /* set if ALLOCATE/DEALLOCATE stmt has STAT-clause*/
-/* static int subscripts_status = 0; */
-static int type_options,type_opt;   /* The various options used to declare a name -
-                                      RECURSIVE, POINTER, OPTIONAL etc.         */
-static PTR_BFND module_scope;
-static int position = IN_OUTSIDE;            
-static int attr_ndim;           /* number of dimensions in DIMENSION (array_spec)
-                                   attribute declaration */
-static PTR_LLND attr_dims;     /* low level representation of array_spec in
-                                   DIMENSION (array_spec) attribute declarartion. */
-static int in_vec = NO;	      /* set if processing array constructor */
-
-#line 147 "gram1.tab.c" /* yacc.c:339  */
-
-# ifndef YY_NULLPTR
-#  if defined __cplusplus && 201103L <= __cplusplus
-#   define YY_NULLPTR nullptr
-#  else
-#   define YY_NULLPTR 0
-#  endif
-# endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-# undef YYERROR_VERBOSE
-# define YYERROR_VERBOSE 1
-#else
-# define YYERROR_VERBOSE 0
-#endif
-
-/* In a future release of Bison, this section will be replaced
-   by #include "gram1.tab.h".  */
-#ifndef YY_YY_GRAM1_TAB_H_INCLUDED
-# define YY_YY_GRAM1_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    PERCENT = 1,
-    AMPERSAND = 2,
-    ASTER = 3,
-    CLUSTER = 4,
-    COLON = 5,
-    COMMA = 6,
-    DASTER = 7,
-    DEFINED_OPERATOR = 8,
-    DOT = 9,
-    DQUOTE = 10,
-    GLOBAL_A = 11,
-    LEFTAB = 12,
-    LEFTPAR = 13,
-    MINUS = 14,
-    PLUS = 15,
-    POINT_TO = 16,
-    QUOTE = 17,
-    RIGHTAB = 18,
-    RIGHTPAR = 19,
-    AND = 20,
-    DSLASH = 21,
-    EQV = 22,
-    EQ = 23,
-    EQUAL = 24,
-    FFALSE = 25,
-    GE = 26,
-    GT = 27,
-    LE = 28,
-    LT = 29,
-    NE = 30,
-    NEQV = 31,
-    NOT = 32,
-    OR = 33,
-    TTRUE = 34,
-    SLASH = 35,
-    XOR = 36,
-    REFERENCE = 37,
-    AT = 38,
-    ACROSS = 39,
-    ALIGN_WITH = 40,
-    ALIGN = 41,
-    ALLOCATABLE = 42,
-    ALLOCATE = 43,
-    ARITHIF = 44,
-    ASSIGNMENT = 45,
-    ASSIGN = 46,
-    ASSIGNGOTO = 47,
-    ASYNCHRONOUS = 48,
-    ASYNCID = 49,
-    ASYNCWAIT = 50,
-    BACKSPACE = 51,
-    BAD_CCONST = 52,
-    BAD_SYMBOL = 53,
-    BARRIER = 54,
-    BLOCKDATA = 55,
-    BLOCK = 56,
-    BOZ_CONSTANT = 57,
-    BYTE = 58,
-    CALL = 59,
-    CASE = 60,
-    CHARACTER = 61,
-    CHAR_CONSTANT = 62,
-    CHECK = 63,
-    CLOSE = 64,
-    COMMON = 65,
-    COMPLEX = 66,
-    COMPGOTO = 67,
-    CONSISTENT_GROUP = 68,
-    CONSISTENT_SPEC = 69,
-    CONSISTENT_START = 70,
-    CONSISTENT_WAIT = 71,
-    CONSISTENT = 72,
-    CONSTRUCT_ID = 73,
-    CONTAINS = 74,
-    CONTINUE = 75,
-    CORNER = 76,
-    CYCLE = 77,
-    DATA = 78,
-    DEALLOCATE = 79,
-    HPF_TEMPLATE = 80,
-    DEBUG = 81,
-    DEFAULT_CASE = 82,
-    DEFINE = 83,
-    DERIVED = 84,
-    DIMENSION = 85,
-    DISTRIBUTE = 86,
-    DOWHILE = 87,
-    DOUBLEPRECISION = 88,
-    DOUBLECOMPLEX = 89,
-    DP_CONSTANT = 90,
-    DVM_POINTER = 91,
-    DYNAMIC = 92,
-    ELEMENTAL = 93,
-    ELSE = 94,
-    ELSEIF = 95,
-    ELSEWHERE = 96,
-    ENDASYNCHRONOUS = 97,
-    ENDDEBUG = 98,
-    ENDINTERVAL = 99,
-    ENDUNIT = 100,
-    ENDDO = 101,
-    ENDFILE = 102,
-    ENDFORALL = 103,
-    ENDIF = 104,
-    ENDINTERFACE = 105,
-    ENDMODULE = 106,
-    ENDON = 107,
-    ENDSELECT = 108,
-    ENDTASK_REGION = 109,
-    ENDTYPE = 110,
-    ENDWHERE = 111,
-    ENTRY = 112,
-    EXIT = 113,
-    EOLN = 114,
-    EQUIVALENCE = 115,
-    ERROR = 116,
-    EXTERNAL = 117,
-    F90 = 118,
-    FIND = 119,
-    FORALL = 120,
-    FORMAT = 121,
-    FUNCTION = 122,
-    GATE = 123,
-    GEN_BLOCK = 124,
-    HEAP = 125,
-    HIGH = 126,
-    IDENTIFIER = 127,
-    IMPLICIT = 128,
-    IMPLICITNONE = 129,
-    INCLUDE_TO = 130,
-    INCLUDE = 131,
-    INDEPENDENT = 132,
-    INDIRECT_ACCESS = 133,
-    INDIRECT_GROUP = 134,
-    INDIRECT = 135,
-    INHERIT = 136,
-    INQUIRE = 137,
-    INTERFACEASSIGNMENT = 138,
-    INTERFACEOPERATOR = 139,
-    INTERFACE = 140,
-    INTRINSIC = 141,
-    INTEGER = 142,
-    INTENT = 143,
-    INTERVAL = 144,
-    INOUT = 145,
-    IN = 146,
-    INT_CONSTANT = 147,
-    LABEL = 148,
-    LABEL_DECLARE = 149,
-    LET = 150,
-    LOCALIZE = 151,
-    LOGICAL = 152,
-    LOGICALIF = 153,
-    LOOP = 154,
-    LOW = 155,
-    MAXLOC = 156,
-    MAX = 157,
-    MAP = 158,
-    MINLOC = 159,
-    MIN = 160,
-    MODULE_PROCEDURE = 161,
-    MODULE = 162,
-    MULT_BLOCK = 163,
-    NAMEEQ = 164,
-    NAMELIST = 165,
-    NEW_VALUE = 166,
-    NEW = 167,
-    NULLIFY = 168,
-    OCTAL_CONSTANT = 169,
-    ONLY = 170,
-    ON = 171,
-    ON_DIR = 172,
-    ONTO = 173,
-    OPEN = 174,
-    OPERATOR = 175,
-    OPTIONAL = 176,
-    OTHERWISE = 177,
-    OUT = 178,
-    OWN = 179,
-    PARALLEL = 180,
-    PARAMETER = 181,
-    PAUSE = 182,
-    PLAINDO = 183,
-    PLAINGOTO = 184,
-    POINTER = 185,
-    POINTERLET = 186,
-    PREFETCH = 187,
-    PRINT = 188,
-    PRIVATE = 189,
-    PRODUCT = 190,
-    PROGRAM = 191,
-    PUBLIC = 192,
-    PURE = 193,
-    RANGE = 194,
-    READ = 195,
-    REALIGN_WITH = 196,
-    REALIGN = 197,
-    REAL = 198,
-    REAL_CONSTANT = 199,
-    RECURSIVE = 200,
-    REDISTRIBUTE_NEW = 201,
-    REDISTRIBUTE = 202,
-    REDUCTION_GROUP = 203,
-    REDUCTION_START = 204,
-    REDUCTION_WAIT = 205,
-    REDUCTION = 206,
-    REMOTE_ACCESS_SPEC = 207,
-    REMOTE_ACCESS = 208,
-    REMOTE_GROUP = 209,
-    RESET = 210,
-    RESULT = 211,
-    RETURN = 212,
-    REWIND = 213,
-    SAVE = 214,
-    SECTION = 215,
-    SELECT = 216,
-    SEQUENCE = 217,
-    SHADOW_ADD = 218,
-    SHADOW_COMPUTE = 219,
-    SHADOW_GROUP = 220,
-    SHADOW_RENEW = 221,
-    SHADOW_START_SPEC = 222,
-    SHADOW_START = 223,
-    SHADOW_WAIT_SPEC = 224,
-    SHADOW_WAIT = 225,
-    SHADOW = 226,
-    STAGE = 227,
-    STATIC = 228,
-    STAT = 229,
-    STOP = 230,
-    SUBROUTINE = 231,
-    SUM = 232,
-    SYNC = 233,
-    TARGET = 234,
-    TASK = 235,
-    TASK_REGION = 236,
-    THEN = 237,
-    TO = 238,
-    TRACEON = 239,
-    TRACEOFF = 240,
-    TRUNC = 241,
-    TYPE = 242,
-    TYPE_DECL = 243,
-    UNDER = 244,
-    UNKNOWN = 245,
-    USE = 246,
-    VIRTUAL = 247,
-    VARIABLE = 248,
-    WAIT = 249,
-    WHERE = 250,
-    WHERE_ASSIGN = 251,
-    WHILE = 252,
-    WITH = 253,
-    WRITE = 254,
-    COMMENT = 255,
-    WGT_BLOCK = 256,
-    HPF_PROCESSORS = 257,
-    IOSTAT = 258,
-    ERR = 259,
-    END = 260,
-    OMPDVM_ATOMIC = 261,
-    OMPDVM_BARRIER = 262,
-    OMPDVM_COPYIN = 263,
-    OMPDVM_COPYPRIVATE = 264,
-    OMPDVM_CRITICAL = 265,
-    OMPDVM_ONETHREAD = 266,
-    OMPDVM_DO = 267,
-    OMPDVM_DYNAMIC = 268,
-    OMPDVM_ENDCRITICAL = 269,
-    OMPDVM_ENDDO = 270,
-    OMPDVM_ENDMASTER = 271,
-    OMPDVM_ENDORDERED = 272,
-    OMPDVM_ENDPARALLEL = 273,
-    OMPDVM_ENDPARALLELDO = 274,
-    OMPDVM_ENDPARALLELSECTIONS = 275,
-    OMPDVM_ENDPARALLELWORKSHARE = 276,
-    OMPDVM_ENDSECTIONS = 277,
-    OMPDVM_ENDSINGLE = 278,
-    OMPDVM_ENDWORKSHARE = 279,
-    OMPDVM_FIRSTPRIVATE = 280,
-    OMPDVM_FLUSH = 281,
-    OMPDVM_GUIDED = 282,
-    OMPDVM_LASTPRIVATE = 283,
-    OMPDVM_MASTER = 284,
-    OMPDVM_NOWAIT = 285,
-    OMPDVM_NONE = 286,
-    OMPDVM_NUM_THREADS = 287,
-    OMPDVM_ORDERED = 288,
-    OMPDVM_PARALLEL = 289,
-    OMPDVM_PARALLELDO = 290,
-    OMPDVM_PARALLELSECTIONS = 291,
-    OMPDVM_PARALLELWORKSHARE = 292,
-    OMPDVM_RUNTIME = 293,
-    OMPDVM_SECTION = 294,
-    OMPDVM_SECTIONS = 295,
-    OMPDVM_SCHEDULE = 296,
-    OMPDVM_SHARED = 297,
-    OMPDVM_SINGLE = 298,
-    OMPDVM_THREADPRIVATE = 299,
-    OMPDVM_WORKSHARE = 300,
-    OMPDVM_NODES = 301,
-    OMPDVM_IF = 302,
-    IAND = 303,
-    IEOR = 304,
-    IOR = 305,
-    ACC_REGION = 306,
-    ACC_END_REGION = 307,
-    ACC_CHECKSECTION = 308,
-    ACC_END_CHECKSECTION = 309,
-    ACC_GET_ACTUAL = 310,
-    ACC_ACTUAL = 311,
-    ACC_TARGETS = 312,
-    ACC_ASYNC = 313,
-    ACC_HOST = 314,
-    ACC_CUDA = 315,
-    ACC_LOCAL = 316,
-    ACC_INLOCAL = 317,
-    ACC_CUDA_BLOCK = 318,
-    ACC_ROUTINE = 319,
-    ACC_TIE = 320,
-    ACC_DECLARE = 321,
-    BY = 322,
-    IO_MODE = 323,
-    CP_CREATE = 324,
-    CP_LOAD = 325,
-    CP_SAVE = 326,
-    CP_WAIT = 327,
-    FILES = 328,
-    VARLIST = 329,
-    STATUS = 330,
-    EXITINTERVAL = 331,
-    TEMPLATE_CREATE = 332,
-    TEMPLATE_DELETE = 333,
-    SPF_ANALYSIS = 334,
-    SPF_PARALLEL = 335,
-    SPF_TRANSFORM = 336,
-    SPF_NOINLINE = 337,
-    SPF_PARALLEL_REG = 338,
-    SPF_END_PARALLEL_REG = 339,
-    SPF_EXPAND = 340,
-    SPF_FISSION = 341,
-    SPF_SHRINK = 342,
-    SPF_CHECKPOINT = 343,
-    SPF_EXCEPT = 344,
-    SPF_FILES_COUNT = 345,
-    SPF_INTERVAL = 346,
-    SPF_TIME = 347,
-    SPF_ITER = 348,
-    SPF_FLEXIBLE = 349,
-    SPF_APPLY_REGION = 350,
-    SPF_APPLY_FRAGMENT = 351,
-    SPF_CODE_COVERAGE = 352,
-    SPF_UNROLL = 353,
-    SPF_MERGE = 354,
-    SPF_COVER = 355,
-    SPF_PROCESS_PRIVATE = 356,
-    SPF_WEIGHT = 357,
-    BINARY_OP = 360,
-    UNARY_OP = 361
-  };
-#endif
-
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
-union YYSTYPE
-{
-#line 440 "gram1.y" /* yacc.c:355  */
-
-    int token;
-    char charv;
-    char *charp;
-    PTR_BFND bf_node;
-    PTR_LLND ll_node;
-    PTR_SYMB symbol;
-    PTR_TYPE data_type;
-    PTR_HASH hash_entry;
-    PTR_LABEL label;
-
-#line 561 "gram1.tab.c" /* yacc.c:355  */
-};
-
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-extern YYSTYPE yylval;
-
-int yyparse (void);
-
-#endif /* !YY_YY_GRAM1_TAB_H_INCLUDED  */
-
-/* Copy the second part of user declarations.  */
-#line 650 "gram1.y" /* yacc.c:358  */
-
-void add_scope_level();
-void delete_beyond_scope_level();
-PTR_HASH look_up_sym();
-PTR_HASH just_look_up_sym();
-PTR_HASH just_look_up_sym_in_scope();
-PTR_HASH look_up_op();
-PTR_SYMB make_constant();
-PTR_SYMB make_scalar();
-PTR_SYMB make_array();
-PTR_SYMB make_pointer();
-PTR_SYMB make_function();
-PTR_SYMB make_external();
-PTR_SYMB make_intrinsic();
-PTR_SYMB make_procedure();
-PTR_SYMB make_process();
-PTR_SYMB make_program();
-PTR_SYMB make_module();
-PTR_SYMB make_common();
-PTR_SYMB make_parallel_region();
-PTR_SYMB make_derived_type();
-PTR_SYMB make_local_entity();
-PTR_SYMB make_global_entity();
-PTR_TYPE make_type_node();
-PTR_TYPE lookup_type(), make_type();
-void     process_type();
-void     process_interface();
-void     bind();
-void     late_bind_if_needed();
-PTR_SYMB component();
-PTR_SYMB lookup_type_symbol();
-PTR_SYMB resolve_overloading();
-PTR_BFND cur_scope();
-PTR_BFND subroutine_call();
-PTR_BFND process_call();
-PTR_LLND deal_with_options();
-PTR_LLND intrinsic_op_node();
-PTR_LLND defined_op_node();
-int is_substring_ref();
-int is_array_section_ref();
-PTR_LLND dim_expr(); 
-PTR_BFND exit_stat();
-PTR_BFND make_do();
-PTR_BFND make_pardo();
-PTR_BFND make_enddoall();
-PTR_TYPE install_array(); 
-PTR_SYMB install_entry(); 
-void install_param_list();
-PTR_LLND construct_entry_list();
-void copy_sym_data();
-PTR_LLND check_and_install();
-PTR_HASH look_up();
-PTR_BFND get_bfnd(); 
-PTR_BLOB make_blob();
-PTR_LABEL make_label();
-PTR_LABEL make_label_node();
-int is_interface_stat();
-PTR_LLND make_llnd (); 
-PTR_LLND make_llnd_label (); 
-PTR_TYPE make_sa_type(); 
-PTR_SYMB procedure_call();
-PTR_BFND proc_list();
-PTR_SYMB set_id_list();
-PTR_LLND set_ll_list();
-PTR_LLND add_to_lowLevelList(), add_to_lowList();
-PTR_BFND set_stat_list() ;
-PTR_BLOB follow_blob();
-PTR_SYMB proc_decl_init();
-PTR_CMNT make_comment();
-PTR_HASH correct_symtab();
-char *copyn();
-char *convic();
-char *StringConcatenation();
-int atoi();
-PTR_BFND make_logif();
-PTR_BFND make_if();
-PTR_BFND make_forall();
-void startproc();
-void match_parameters();
-void make_else();
-void make_elseif();
-void make_endif();
-void make_elsewhere();
-void make_elsewhere_mask();
-void make_endwhere();
-void make_endforall();
-void make_endselect();
-void make_extend();
-void make_endextend();
-void make_section();
-void make_section_extend();
-void doinclude();
-void endproc();
-void err();
-void execerr();
-void flline();
-void warn();
-void warn1();
-void newprog();
-void set_type();
-void dclerr();
-void enddcl();
-void install_const();
-void setimpl();
-void copy_module_scope();
-void delete_symbol();
-void replace_symbol_in_expr();
-long convci();
-void set_expr_type();
-void errstr();
-void yyerror();
-void set_blobs();
-void make_loop();
-void startioctl();
-void endioctl();
-void redefine_func_arg_type();
-int isResultVar();
-int yylex();
-
-/* used by FORTRAN M */
-PTR_BFND make_processdo();
-PTR_BFND make_processes();
-PTR_BFND make_endprocesses();
-
-PTR_BFND make_endparallel();/*OMP*/
-PTR_BFND make_parallel();/*OMP*/
-PTR_BFND make_endsingle();/*OMP*/
-PTR_BFND make_single();/*OMP*/
-PTR_BFND make_endmaster();/*OMP*/
-PTR_BFND make_master();/*OMP*/
-PTR_BFND make_endordered();/*OMP*/
-PTR_BFND make_ordered();/*OMP*/
-PTR_BFND make_endcritical();/*OMP*/
-PTR_BFND make_critical();/*OMP*/
-PTR_BFND make_endsections();/*OMP*/
-PTR_BFND make_sections();/*OMP*/
-PTR_BFND make_ompsection();/*OMP*/
-PTR_BFND make_endparallelsections();/*OMP*/
-PTR_BFND make_parallelsections();/*OMP*/
-PTR_BFND make_endworkshare();/*OMP*/
-PTR_BFND make_workshare();/*OMP*/
-PTR_BFND make_endparallelworkshare();/*OMP*/
-PTR_BFND make_parallelworkshare();/*OMP*/
-
-
-#line 723 "gram1.tab.c" /* yacc.c:358  */
-
-#ifdef short
-# undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#else
-typedef signed char yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-# ifdef __SIZE_TYPE__
-#  define YYSIZE_T __SIZE_TYPE__
-# elif defined size_t
-#  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T
-#  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYSIZE_T size_t
-# else
-#  define YYSIZE_T unsigned int
-# endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
-
-#ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
-#  if ENABLE_NLS
-#   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
-#  endif
-# endif
-# ifndef YY_
-#  define YY_(Msgid) Msgid
-# endif
-#endif
-
-#ifndef YY_ATTRIBUTE
-# if (defined __GNUC__                                               \
-      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
-     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
-#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
-# else
-#  define YY_ATTRIBUTE(Spec) /* empty */
-# endif
-#endif
-
-#ifndef YY_ATTRIBUTE_PURE
-# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
-#endif
-
-#ifndef YY_ATTRIBUTE_UNUSED
-# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
-#endif
-
-#if !defined _Noreturn \
-     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if ! defined lint || defined __GNUC__
-# define YYUSE(E) ((void) (E))
-#else
-# define YYUSE(E) /* empty */
-#endif
-
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
-/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
-    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define YY_INITIAL_VALUE(Value) Value
-#endif
-#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-# define YY_IGNORE_MAYBE_UNINITIALIZED_END
-#endif
-#ifndef YY_INITIAL_VALUE
-# define YY_INITIAL_VALUE(Value) /* Nothing. */
-#endif
-
-
-#if ! defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-# ifdef YYSTACK_USE_ALLOCA
-#  if YYSTACK_USE_ALLOCA
-#   ifdef __GNUC__
-#    define YYSTACK_ALLOC __builtin_alloca
-#   elif defined __BUILTIN_VA_ARG_INCR
-#    include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#   elif defined _AIX
-#    define YYSTACK_ALLOC __alloca
-#   elif defined _MSC_VER
-#    include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#    define alloca _alloca
-#   else
-#    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
-#     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
-#     endif
-#    endif
-#   endif
-#  endif
-# endif
-
-# ifdef YYSTACK_ALLOC
-   /* Pacify GCC's 'empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-    /* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#   define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#  endif
-# else
-#  define YYSTACK_ALLOC YYMALLOC
-#  define YYSTACK_FREE YYFREE
-#  ifndef YYSTACK_ALLOC_MAXIMUM
-#   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
-       && ! ((defined YYMALLOC || defined malloc) \
-             && (defined YYFREE || defined free)))
-#   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
-#   endif
-#  endif
-#  ifndef YYMALLOC
-#   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS
-void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-#  ifndef YYFREE
-#   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS
-void free (void *); /* INFRINGES ON USER NAME SPACE */
-#   endif
-#  endif
-# endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-
-#if (! defined yyoverflow \
-     && (! defined __cplusplus \
-         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc
-{
-  yytype_int16 yyss_alloc;
-  YYSTYPE yyvs_alloc;
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-# define YYSTACK_GAP_MAXIMUM (sizeof (union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-# define YYSTACK_BYTES(N) \
-     ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
-      + YYSTACK_GAP_MAXIMUM)
-
-# define YYCOPY_NEEDED 1
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
-    do                                                                  \
-      {                                                                 \
-        YYSIZE_T yynewbytes;                                            \
-        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
-        Stack = &yyptr->Stack_alloc;                                    \
-        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof (*yyptr);                          \
-      }                                                                 \
-    while (0)
-
-#endif
-
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from SRC to DST.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(Dst, Src, Count) \
-      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
-#  else
-#   define YYCOPY(Dst, Src, Count)              \
-      do                                        \
-        {                                       \
-          YYSIZE_T yyi;                         \
-          for (yyi = 0; yyi < (Count); yyi++)   \
-            (Dst)[yyi] = (Src)[yyi];            \
-        }                                       \
-      while (0)
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  2
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   5655
-
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  362
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  547
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES  1313
-/* YYNSTATES -- Number of states.  */
-#define YYNSTATES  2617
-
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
-   by yylex, with out-of-bounds checking.  */
-#define YYUNDEFTOK  2
-#define YYMAXUTOK   361
-
-#define YYTRANSLATE(YYX)                                                \
-  ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
-   as returned by yylex, without out-of-bounds checking.  */
-static const yytype_uint16 yytranslate[] =
-{
-       0,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      32,    33,    34,    35,    36,    37,    38,    39,    40,    41,
-      42,    43,    44,    45,    46,    47,    48,    49,    50,    51,
-      52,    53,    54,    55,    56,    57,    58,    59,    60,    61,
-      62,    63,    64,    65,    66,    67,    68,    69,    70,    71,
-      72,    73,    74,    75,    76,    77,    78,    79,    80,    81,
-      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
-      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-     102,   103,   104,   105,   106,   107,   108,   109,   110,   111,
-     112,   113,   114,   115,   116,   117,   118,   119,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     132,   133,   134,   135,   136,   137,   138,   139,   140,   141,
-     142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
-     152,   153,   154,   155,   156,   157,   158,   159,   160,   161,
-     162,   163,   164,   165,   166,   167,   168,   169,   170,   171,
-     172,   173,   174,   175,   176,   177,   178,   179,   180,   181,
-     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
-     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
-     202,   203,   204,   205,   206,   207,   208,   209,   210,   211,
-     212,   213,   214,   215,   216,   217,   218,   219,   220,   221,
-     222,   223,   224,   225,   226,   227,   228,   229,   230,   231,
-     232,   233,   234,   235,   236,   237,   238,   239,   240,   241,
-     242,   243,   244,   245,   246,   247,   248,   249,   250,   251,
-     252,   253,   254,   255,   256,   257,   258,   259,   260,   261,
-     262,   263,   264,   265,   266,   267,   268,   269,   270,   271,
-     272,   273,   274,   275,   276,   277,   278,   279,   280,   281,
-     282,   283,   284,   285,   286,   287,   288,   289,   290,   291,
-     292,   293,   294,   295,   296,   297,   298,   299,   300,   301,
-     302,   303,   304,   305,   306,   307,   308,   309,   310,   311,
-     312,   313,   314,   315,   316,   317,   318,   319,   320,   321,
-     322,   323,   324,   325,   326,   327,   328,   329,   330,   331,
-     332,   333,   334,   335,   336,   337,   338,   339,   340,   341,
-     342,   343,   344,   345,   346,   347,   348,   349,   350,   351,
-     352,   353,   354,   355,   356,   357,   358,   359,     1,     2,
-     360,   361
-};
-
-#if YYDEBUG
-  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
-static const yytype_uint16 yyrline[] =
-{
-       0,   797,   797,   798,   802,   804,   818,   849,   858,   864,
-     884,   893,   909,   921,   931,   938,   944,   949,   954,   978,
-    1005,  1019,  1021,  1023,  1027,  1044,  1058,  1082,  1098,  1112,
-    1130,  1132,  1139,  1143,  1144,  1151,  1152,  1160,  1161,  1163,
-    1167,  1168,  1172,  1176,  1182,  1192,  1196,  1201,  1208,  1209,
-    1210,  1211,  1212,  1213,  1214,  1215,  1216,  1217,  1218,  1219,
-    1220,  1221,  1222,  1227,  1232,  1239,  1241,  1242,  1243,  1244,
-    1245,  1246,  1247,  1248,  1249,  1250,  1251,  1252,  1255,  1259,
-    1267,  1275,  1284,  1292,  1296,  1298,  1302,  1304,  1306,  1308,
-    1310,  1312,  1314,  1316,  1318,  1320,  1322,  1324,  1326,  1328,
-    1330,  1332,  1334,  1336,  1341,  1350,  1360,  1368,  1378,  1399,
-    1419,  1420,  1422,  1426,  1428,  1432,  1436,  1438,  1442,  1448,
-    1452,  1454,  1458,  1462,  1466,  1470,  1474,  1480,  1484,  1488,
-    1494,  1499,  1506,  1517,  1530,  1541,  1554,  1564,  1577,  1582,
-    1589,  1592,  1597,  1602,  1609,  1612,  1622,  1636,  1639,  1658,
-    1685,  1687,  1699,  1707,  1708,  1709,  1710,  1711,  1712,  1713,
-    1718,  1719,  1723,  1725,  1732,  1737,  1738,  1740,  1742,  1755,
-    1761,  1767,  1776,  1785,  1798,  1799,  1802,  1806,  1821,  1836,
-    1854,  1875,  1895,  1917,  1934,  1952,  1959,  1966,  1973,  1986,
-    1993,  2000,  2011,  2015,  2017,  2022,  2040,  2051,  2063,  2075,
-    2089,  2095,  2102,  2108,  2114,  2122,  2129,  2145,  2148,  2157,
-    2159,  2163,  2167,  2187,  2191,  2193,  2197,  2198,  2201,  2203,
-    2205,  2207,  2209,  2212,  2215,  2219,  2225,  2229,  2233,  2235,
-    2240,  2241,  2245,  2249,  2251,  2255,  2257,  2259,  2264,  2268,
-    2270,  2272,  2275,  2277,  2278,  2279,  2280,  2281,  2282,  2283,
-    2284,  2287,  2288,  2294,  2297,  2298,  2300,  2304,  2305,  2308,
-    2309,  2311,  2315,  2316,  2317,  2318,  2320,  2323,  2324,  2333,
-    2335,  2342,  2349,  2356,  2365,  2367,  2369,  2373,  2375,  2379,
-    2388,  2395,  2402,  2404,  2408,  2412,  2418,  2420,  2425,  2429,
-    2433,  2440,  2447,  2457,  2459,  2463,  2475,  2478,  2487,  2500,
-    2506,  2512,  2518,  2526,  2536,  2538,  2542,  2544,  2577,  2579,
-    2583,  2622,  2623,  2627,  2627,  2632,  2636,  2644,  2653,  2662,
-    2672,  2678,  2681,  2683,  2687,  2695,  2710,  2717,  2719,  2723,
-    2739,  2739,  2743,  2745,  2757,  2759,  2763,  2769,  2781,  2793,
-    2810,  2839,  2840,  2848,  2849,  2853,  2855,  2857,  2868,  2872,
-    2878,  2880,  2884,  2886,  2888,  2892,  2894,  2898,  2900,  2902,
-    2904,  2906,  2908,  2910,  2912,  2914,  2916,  2918,  2920,  2922,
-    2924,  2926,  2928,  2930,  2932,  2934,  2936,  2938,  2940,  2942,
-    2946,  2947,  2958,  3032,  3044,  3046,  3050,  3181,  3231,  3275,
-    3317,  3375,  3377,  3379,  3418,  3461,  3472,  3473,  3477,  3482,
-    3483,  3487,  3489,  3495,  3497,  3503,  3516,  3522,  3529,  3535,
-    3543,  3551,  3567,  3577,  3590,  3597,  3599,  3622,  3624,  3626,
-    3628,  3630,  3632,  3634,  3636,  3640,  3640,  3640,  3654,  3656,
-    3679,  3681,  3683,  3699,  3701,  3703,  3717,  3720,  3722,  3730,
-    3732,  3734,  3736,  3790,  3810,  3825,  3834,  3837,  3887,  3893,
-    3898,  3916,  3918,  3920,  3922,  3924,  3927,  3933,  3935,  3937,
-    3940,  3942,  3944,  3971,  3980,  3989,  3990,  3992,  3997,  4004,
-    4012,  4014,  4018,  4021,  4023,  4027,  4033,  4035,  4037,  4039,
-    4043,  4045,  4054,  4055,  4062,  4063,  4067,  4071,  4092,  4095,
-    4099,  4101,  4108,  4113,  4114,  4125,  4137,  4160,  4185,  4186,
-    4193,  4195,  4197,  4199,  4201,  4205,  4282,  4294,  4301,  4303,
-    4304,  4306,  4315,  4322,  4329,  4337,  4342,  4347,  4350,  4353,
-    4356,  4359,  4362,  4366,  4384,  4389,  4408,  4427,  4431,  4432,
-    4435,  4439,  4444,  4451,  4453,  4455,  4459,  4460,  4471,  4486,
-    4490,  4497,  4500,  4510,  4523,  4536,  4539,  4541,  4544,  4547,
-    4551,  4560,  4563,  4567,  4569,  4575,  4579,  4581,  4583,  4590,
-    4594,  4596,  4600,  4602,  4606,  4625,  4641,  4650,  4659,  4661,
-    4665,  4691,  4706,  4721,  4738,  4746,  4755,  4763,  4768,  4773,
-    4795,  4811,  4813,  4817,  4819,  4826,  4828,  4830,  4834,  4836,
-    4838,  4840,  4842,  4844,  4848,  4851,  4854,  4860,  4866,  4875,
-    4879,  4886,  4888,  4892,  4894,  4896,  4901,  4906,  4911,  4916,
-    4925,  4930,  4936,  4937,  4952,  4953,  4954,  4955,  4956,  4957,
-    4958,  4959,  4960,  4961,  4962,  4963,  4964,  4965,  4966,  4967,
-    4968,  4969,  4970,  4973,  4974,  4975,  4976,  4977,  4978,  4979,
-    4980,  4981,  4982,  4983,  4984,  4985,  4986,  4987,  4988,  4989,
-    4990,  4991,  4992,  4993,  4994,  4995,  4996,  4997,  4998,  4999,
-    5000,  5001,  5002,  5003,  5004,  5005,  5006,  5007,  5008,  5009,
-    5010,  5011,  5012,  5013,  5014,  5015,  5016,  5020,  5022,  5033,
-    5054,  5058,  5060,  5064,  5077,  5081,  5083,  5087,  5098,  5109,
-    5113,  5115,  5119,  5121,  5123,  5138,  5150,  5170,  5190,  5212,
-    5218,  5227,  5235,  5241,  5249,  5256,  5262,  5271,  5275,  5281,
-    5289,  5303,  5317,  5322,  5338,  5353,  5381,  5383,  5387,  5389,
-    5393,  5422,  5445,  5466,  5467,  5471,  5492,  5494,  5498,  5506,
-    5510,  5515,  5517,  5519,  5521,  5527,  5529,  5533,  5543,  5547,
-    5549,  5554,  5556,  5560,  5564,  5570,  5580,  5582,  5586,  5588,
-    5590,  5597,  5615,  5616,  5620,  5622,  5626,  5633,  5643,  5672,
-    5687,  5694,  5712,  5714,  5718,  5732,  5758,  5771,  5787,  5789,
-    5792,  5794,  5800,  5804,  5832,  5834,  5838,  5846,  5852,  5855,
-    5913,  5977,  5979,  5982,  5986,  5990,  5994,  6011,  6023,  6027,
-    6031,  6041,  6046,  6051,  6058,  6067,  6067,  6078,  6089,  6091,
-    6095,  6106,  6110,  6112,  6116,  6127,  6131,  6133,  6137,  6149,
-    6151,  6158,  6160,  6164,  6180,  6188,  6199,  6201,  6205,  6208,
-    6213,  6223,  6225,  6229,  6231,  6240,  6241,  6245,  6247,  6252,
-    6253,  6254,  6255,  6256,  6257,  6258,  6259,  6260,  6261,  6262,
-    6265,  6270,  6274,  6278,  6282,  6295,  6299,  6303,  6307,  6310,
-    6312,  6314,  6318,  6320,  6324,  6328,  6330,  6334,  6339,  6343,
-    6347,  6349,  6353,  6362,  6365,  6371,  6378,  6381,  6383,  6387,
-    6389,  6393,  6405,  6407,  6411,  6415,  6417,  6421,  6423,  6425,
-    6427,  6429,  6431,  6433,  6437,  6441,  6445,  6449,  6453,  6460,
-    6466,  6471,  6474,  6477,  6490,  6492,  6496,  6498,  6503,  6509,
-    6515,  6521,  6527,  6533,  6539,  6545,  6551,  6560,  6566,  6583,
-    6585,  6593,  6601,  6603,  6607,  6611,  6613,  6617,  6619,  6627,
-    6631,  6643,  6646,  6664,  6666,  6670,  6672,  6676,  6678,  6682,
-    6686,  6690,  6699,  6703,  6707,  6712,  6716,  6728,  6730,  6734,
-    6739,  6743,  6745,  6749,  6751,  6755,  6760,  6767,  6790,  6792,
-    6794,  6796,  6798,  6802,  6813,  6817,  6832,  6839,  6846,  6847,
-    6851,  6855,  6863,  6867,  6871,  6879,  6884,  6898,  6900,  6904,
-    6906,  6915,  6917,  6919,  6921,  6957,  6961,  6965,  6969,  6973,
-    6985,  6987,  6991,  6994,  6996,  7000,  7005,  7012,  7015,  7023,
-    7027,  7032,  7034,  7041,  7046,  7050,  7054,  7058,  7062,  7066,
-    7069,  7071,  7075,  7077,  7079,  7083,  7087,  7099,  7101,  7105,
-    7107,  7111,  7114,  7117,  7121,  7127,  7139,  7141,  7145,  7147,
-    7151,  7159,  7171,  7172,  7174,  7178,  7182,  7184,  7192,  7196,
-    7199,  7201,  7205,  7209,  7211,  7212,  7213,  7214,  7215,  7216,
-    7217,  7218,  7219,  7220,  7221,  7222,  7223,  7224,  7225,  7226,
-    7227,  7228,  7229,  7230,  7231,  7232,  7233,  7234,  7235,  7236,
-    7239,  7245,  7251,  7257,  7263,  7267,  7273,  7274,  7275,  7276,
-    7277,  7278,  7279,  7280,  7281,  7284,  7289,  7294,  7300,  7306,
-    7312,  7317,  7323,  7329,  7335,  7342,  7348,  7354,  7361,  7365,
-    7367,  7373,  7380,  7386,  7392,  7398,  7404,  7410,  7416,  7422,
-    7428,  7434,  7440,  7446,  7456,  7461,  7467,  7471,  7477,  7478,
-    7479,  7480,  7483,  7491,  7497,  7503,  7508,  7514,  7521,  7527,
-    7531,  7537,  7538,  7539,  7540,  7541,  7542,  7545,  7554,  7558,
-    7564,  7571,  7578,  7585,  7594,  7600,  7606,  7610,  7616,  7617,
-    7620,  7626,  7632,  7636,  7643,  7644,  7647,  7653,  7659,  7664,
-    7672,  7678,  7683,  7690,  7694,  7700,  7701,  7702,  7703,  7704,
-    7705,  7706,  7707,  7708,  7709,  7710,  7714,  7719,  7724,  7731,
-    7736,  7742,  7748,  7753,  7758,  7763,  7767,  7772,  7777,  7781,
-    7786,  7790,  7796,  7801,  7807,  7812,  7818,  7828,  7832,  7836,
-    7840,  7846,  7849,  7853,  7854,  7856,  7857,  7858,  7859,  7860,
-    7861,  7864,  7868,  7872,  7874,  7876,  7880,  7882,  7884,  7888,
-    7890,  7894,  7896,  7900,  7903,  7906,  7911,  7913,  7915,  7917,
-    7919,  7923,  7927,  7932,  7936,  7938,  7942,  7944,  7948,  7952,
-    7956,  7961,  7963,  7967,  7977,  7982,  7983,  7987,  7989,  7993,
-    7995,  7998,  7999,  8000,  8001,  8002,  8003,  8006,  8010,  8014,
-    8018,  8020,  8022,  8026,  8028,  8032,  8034,  8045,  8046,  8051,
-    8052,  8056,  8060,  8062,  8066,  8067,  8068,  8069,  8070,  8073,
-    8077,  8081,  8085,  8089,  8092,  8094,  8098,  8102,  8104,  8108,
-    8109,  8110,  8113,  8117,  8121,  8125,  8127,  8131,  8133,  8135,
-    8137,  8140,  8142,  8144,  8146,  8150,  8157,  8161,  8163,  8167,
-    8171,  8173,  8177,  8179,  8181,  8183,  8185,  8189,  8191,  8195,
-    8197,  8201,  8203,  8208
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE || 0
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char *const yytname[] =
-{
-  "$end", "error", "$undefined", "PERCENT", "AMPERSAND", "ASTER",
-  "CLUSTER", "COLON", "COMMA", "DASTER", "DEFINED_OPERATOR", "DOT",
-  "DQUOTE", "GLOBAL_A", "LEFTAB", "LEFTPAR", "MINUS", "PLUS", "POINT_TO",
-  "QUOTE", "RIGHTAB", "RIGHTPAR", "AND", "DSLASH", "EQV", "EQ", "EQUAL",
-  "FFALSE", "GE", "GT", "LE", "LT", "NE", "NEQV", "NOT", "OR", "TTRUE",
-  "SLASH", "XOR", "REFERENCE", "AT", "ACROSS", "ALIGN_WITH", "ALIGN",
-  "ALLOCATABLE", "ALLOCATE", "ARITHIF", "ASSIGNMENT", "ASSIGN",
-  "ASSIGNGOTO", "ASYNCHRONOUS", "ASYNCID", "ASYNCWAIT", "BACKSPACE",
-  "BAD_CCONST", "BAD_SYMBOL", "BARRIER", "BLOCKDATA", "BLOCK",
-  "BOZ_CONSTANT", "BYTE", "CALL", "CASE", "CHARACTER", "CHAR_CONSTANT",
-  "CHECK", "CLOSE", "COMMON", "COMPLEX", "COMPGOTO", "CONSISTENT_GROUP",
-  "CONSISTENT_SPEC", "CONSISTENT_START", "CONSISTENT_WAIT", "CONSISTENT",
-  "CONSTRUCT_ID", "CONTAINS", "CONTINUE", "CORNER", "CYCLE", "DATA",
-  "DEALLOCATE", "HPF_TEMPLATE", "DEBUG", "DEFAULT_CASE", "DEFINE",
-  "DERIVED", "DIMENSION", "DISTRIBUTE", "DOWHILE", "DOUBLEPRECISION",
-  "DOUBLECOMPLEX", "DP_CONSTANT", "DVM_POINTER", "DYNAMIC", "ELEMENTAL",
-  "ELSE", "ELSEIF", "ELSEWHERE", "ENDASYNCHRONOUS", "ENDDEBUG",
-  "ENDINTERVAL", "ENDUNIT", "ENDDO", "ENDFILE", "ENDFORALL", "ENDIF",
-  "ENDINTERFACE", "ENDMODULE", "ENDON", "ENDSELECT", "ENDTASK_REGION",
-  "ENDTYPE", "ENDWHERE", "ENTRY", "EXIT", "EOLN", "EQUIVALENCE", "ERROR",
-  "EXTERNAL", "F90", "FIND", "FORALL", "FORMAT", "FUNCTION", "GATE",
-  "GEN_BLOCK", "HEAP", "HIGH", "IDENTIFIER", "IMPLICIT", "IMPLICITNONE",
-  "INCLUDE_TO", "INCLUDE", "INDEPENDENT", "INDIRECT_ACCESS",
-  "INDIRECT_GROUP", "INDIRECT", "INHERIT", "INQUIRE",
-  "INTERFACEASSIGNMENT", "INTERFACEOPERATOR", "INTERFACE", "INTRINSIC",
-  "INTEGER", "INTENT", "INTERVAL", "INOUT", "IN", "INT_CONSTANT", "LABEL",
-  "LABEL_DECLARE", "LET", "LOCALIZE", "LOGICAL", "LOGICALIF", "LOOP",
-  "LOW", "MAXLOC", "MAX", "MAP", "MINLOC", "MIN", "MODULE_PROCEDURE",
-  "MODULE", "MULT_BLOCK", "NAMEEQ", "NAMELIST", "NEW_VALUE", "NEW",
-  "NULLIFY", "OCTAL_CONSTANT", "ONLY", "ON", "ON_DIR", "ONTO", "OPEN",
-  "OPERATOR", "OPTIONAL", "OTHERWISE", "OUT", "OWN", "PARALLEL",
-  "PARAMETER", "PAUSE", "PLAINDO", "PLAINGOTO", "POINTER", "POINTERLET",
-  "PREFETCH", "PRINT", "PRIVATE", "PRODUCT", "PROGRAM", "PUBLIC", "PURE",
-  "RANGE", "READ", "REALIGN_WITH", "REALIGN", "REAL", "REAL_CONSTANT",
-  "RECURSIVE", "REDISTRIBUTE_NEW", "REDISTRIBUTE", "REDUCTION_GROUP",
-  "REDUCTION_START", "REDUCTION_WAIT", "REDUCTION", "REMOTE_ACCESS_SPEC",
-  "REMOTE_ACCESS", "REMOTE_GROUP", "RESET", "RESULT", "RETURN", "REWIND",
-  "SAVE", "SECTION", "SELECT", "SEQUENCE", "SHADOW_ADD", "SHADOW_COMPUTE",
-  "SHADOW_GROUP", "SHADOW_RENEW", "SHADOW_START_SPEC", "SHADOW_START",
-  "SHADOW_WAIT_SPEC", "SHADOW_WAIT", "SHADOW", "STAGE", "STATIC", "STAT",
-  "STOP", "SUBROUTINE", "SUM", "SYNC", "TARGET", "TASK", "TASK_REGION",
-  "THEN", "TO", "TRACEON", "TRACEOFF", "TRUNC", "TYPE", "TYPE_DECL",
-  "UNDER", "UNKNOWN", "USE", "VIRTUAL", "VARIABLE", "WAIT", "WHERE",
-  "WHERE_ASSIGN", "WHILE", "WITH", "WRITE", "COMMENT", "WGT_BLOCK",
-  "HPF_PROCESSORS", "IOSTAT", "ERR", "END", "OMPDVM_ATOMIC",
-  "OMPDVM_BARRIER", "OMPDVM_COPYIN", "OMPDVM_COPYPRIVATE",
-  "OMPDVM_CRITICAL", "OMPDVM_ONETHREAD", "OMPDVM_DO", "OMPDVM_DYNAMIC",
-  "OMPDVM_ENDCRITICAL", "OMPDVM_ENDDO", "OMPDVM_ENDMASTER",
-  "OMPDVM_ENDORDERED", "OMPDVM_ENDPARALLEL", "OMPDVM_ENDPARALLELDO",
-  "OMPDVM_ENDPARALLELSECTIONS", "OMPDVM_ENDPARALLELWORKSHARE",
-  "OMPDVM_ENDSECTIONS", "OMPDVM_ENDSINGLE", "OMPDVM_ENDWORKSHARE",
-  "OMPDVM_FIRSTPRIVATE", "OMPDVM_FLUSH", "OMPDVM_GUIDED",
-  "OMPDVM_LASTPRIVATE", "OMPDVM_MASTER", "OMPDVM_NOWAIT", "OMPDVM_NONE",
-  "OMPDVM_NUM_THREADS", "OMPDVM_ORDERED", "OMPDVM_PARALLEL",
-  "OMPDVM_PARALLELDO", "OMPDVM_PARALLELSECTIONS",
-  "OMPDVM_PARALLELWORKSHARE", "OMPDVM_RUNTIME", "OMPDVM_SECTION",
-  "OMPDVM_SECTIONS", "OMPDVM_SCHEDULE", "OMPDVM_SHARED", "OMPDVM_SINGLE",
-  "OMPDVM_THREADPRIVATE", "OMPDVM_WORKSHARE", "OMPDVM_NODES", "OMPDVM_IF",
-  "IAND", "IEOR", "IOR", "ACC_REGION", "ACC_END_REGION",
-  "ACC_CHECKSECTION", "ACC_END_CHECKSECTION", "ACC_GET_ACTUAL",
-  "ACC_ACTUAL", "ACC_TARGETS", "ACC_ASYNC", "ACC_HOST", "ACC_CUDA",
-  "ACC_LOCAL", "ACC_INLOCAL", "ACC_CUDA_BLOCK", "ACC_ROUTINE", "ACC_TIE",
-  "ACC_DECLARE", "BY", "IO_MODE", "CP_CREATE", "CP_LOAD", "CP_SAVE",
-  "CP_WAIT", "FILES", "VARLIST", "STATUS", "EXITINTERVAL",
-  "TEMPLATE_CREATE", "TEMPLATE_DELETE", "SPF_ANALYSIS", "SPF_PARALLEL",
-  "SPF_TRANSFORM", "SPF_NOINLINE", "SPF_PARALLEL_REG",
-  "SPF_END_PARALLEL_REG", "SPF_EXPAND", "SPF_FISSION", "SPF_SHRINK",
-  "SPF_CHECKPOINT", "SPF_EXCEPT", "SPF_FILES_COUNT", "SPF_INTERVAL",
-  "SPF_TIME", "SPF_ITER", "SPF_FLEXIBLE", "SPF_APPLY_REGION",
-  "SPF_APPLY_FRAGMENT", "SPF_CODE_COVERAGE", "SPF_UNROLL", "SPF_MERGE",
-  "SPF_COVER", "SPF_PROCESS_PRIVATE", "SPF_WEIGHT", "BINARY_OP",
-  "UNARY_OP", "$accept", "program", "stat", "thislabel", "entry",
-  "new_prog", "proc_attr", "procname", "funcname", "typedfunc",
-  "opt_result_clause", "name", "progname", "blokname", "arglist", "args",
-  "arg", "filename", "needkeyword", "keywordoff",
-  "keyword_if_colon_follow", "spec", "interface", "defined_op", "operator",
-  "intrinsic_op", "type_dcl", "end_type", "dcl", "options",
-  "attr_spec_list", "attr_spec", "intent_spec", "access_spec", "intent",
-  "optional", "static", "private", "private_attr", "sequence", "public",
-  "public_attr", "type", "opt_key_hedr", "attrib", "att_type", "typespec",
-  "typename", "lengspec", "proper_lengspec", "selector", "clause",
-  "end_ioctl", "initial_value", "dimension", "allocatable", "pointer",
-  "target", "common", "namelist", "namelist_group", "comblock", "var",
-  "external", "intrinsic", "equivalence", "equivset", "equivlist",
-  "equi_object", "data", "data1", "data_in", "in_data", "datapair",
-  "datalvals", "datarvals", "datalval", "data_null", "d_name", "dataname",
-  "datasubs", "datarange", "iconexprlist", "opticonexpr", "dataimplieddo",
-  "dlist", "dataelt", "datarval", "datavalue", "BOZ_const", "int_const",
-  "unsignedint", "real_const", "unsignedreal", "complex_const_data",
-  "complex_part", "iconexpr", "iconterm", "iconfactor", "iconprimary",
-  "savelist", "saveitem", "use_name_list", "use_key_word",
-  "no_use_key_word", "use_name", "paramlist", "paramitem",
-  "module_proc_stmt", "proc_name_list", "use_stat", "module_name",
-  "only_list", "only_name", "rename_list", "rename_name", "dims",
-  "dimlist", "$@1", "dim", "ubound", "labellist", "label", "implicit",
-  "implist", "impitem", "imptype", "$@2", "type_implicit", "letgroups",
-  "letgroup", "letter", "inside", "in_dcl", "opt_double_colon",
-  "funarglist", "funarg", "funargs", "subscript_list", "expr", "uexpr",
-  "addop", "ident", "lhs", "array_ele_substring_func_ref",
-  "structure_component", "array_element", "asubstring", "opt_substring",
-  "substring", "opt_expr", "simple_const", "numeric_bool_const",
-  "integer_constant", "string_constant", "complex_const", "kind",
-  "triplet", "vec", "$@3", "$@4", "allocate_object", "allocation_list",
-  "allocate_object_list", "stat_spec", "pointer_name_list", "exec",
-  "do_while", "opt_while", "plain_do", "case", "case_selector",
-  "case_value_range", "case_value_range_list", "opt_construct_name",
-  "opt_unit_name", "construct_name", "construct_name_colon", "logif",
-  "forall", "forall_list", "forall_expr", "opt_forall_cond", "do_var",
-  "dospec", "dotarget", "whereable", "iffable", "let", "goto", "opt_comma",
-  "call", "callarglist", "callarg", "stop", "end_spec", "intonlyon",
-  "intonlyoff", "io", "iofmove", "fmkwd", "iofctl", "ctlkwd", "inquire",
-  "infmt", "ioctl", "ctllist", "ioclause", "nameeq", "read", "write",
-  "print", "inlist", "inelt", "outlist", "out2", "other", "in_ioctl",
-  "start_ioctl", "fexpr", "unpar_fexpr", "cmnt", "dvm_specification",
-  "dvm_exec", "dvm_template", "template_obj", "dvm_dynamic",
-  "dyn_array_name_list", "dyn_array_name", "dvm_inherit",
-  "dummy_array_name_list", "dummy_array_name", "dvm_shadow",
-  "shadow_attr_stuff", "sh_width_list", "sh_width", "sh_array_name",
-  "dvm_processors", "dvm_indirect_group", "indirect_group_name",
-  "dvm_remote_group", "remote_group_name", "dvm_reduction_group",
-  "reduction_group_name", "dvm_consistent_group", "consistent_group_name",
-  "opt_onto", "dvm_distribute", "dvm_redistribute", "dist_name_list",
-  "distributee", "dist_name", "pointer_ar_elem", "processors_name",
-  "opt_dist_format_clause", "dist_format_clause", "dist_format_list",
-  "opt_key_word", "dist_format", "array_name", "derived_spec",
-  "derived_elem_list", "derived_elem", "target_spec", "derived_target",
-  "derived_subscript_list", "derived_subscript", "dummy_ident",
-  "opt_plus_shadow", "plus_shadow", "shadow_id", "shadow_width",
-  "dvm_align", "dvm_realign", "realignee_list", "alignee", "realignee",
-  "align_directive_stuff", "align_base", "align_subscript_list",
-  "align_subscript", "align_base_name", "dim_ident_list", "dim_ident",
-  "dvm_combined_dir", "dvm_attribute_list", "dvm_attribute", "dvm_pointer",
-  "dimension_list", "$@5", "pointer_var_list", "pointer_var", "dvm_heap",
-  "heap_array_name_list", "heap_array_name", "dvm_consistent",
-  "consistent_array_name_list", "consistent_array_name", "dvm_asyncid",
-  "async_id_list", "async_id", "dvm_new_value", "dvm_parallel_on",
-  "ident_list", "opt_on", "distribute_cycles", "par_subscript_list",
-  "par_subscript", "opt_spec", "spec_list", "par_spec",
-  "remote_access_spec", "consistent_spec", "consistent_group", "new_spec",
-  "private_spec", "cuda_block_spec", "sizelist", "variable_list",
-  "tie_spec", "tied_array_list", "indirect_access_spec", "stage_spec",
-  "across_spec", "in_out_across", "opt_keyword_in_out", "opt_in_out",
-  "dependent_array_list", "dependent_array", "dependence_list",
-  "dependence", "section_spec_list", "section_spec", "ar_section",
-  "low_section", "high_section", "section", "reduction_spec",
-  "opt_key_word_r", "no_opt_key_word_r", "reduction_group",
-  "reduction_list", "reduction", "reduction_op", "loc_op", "shadow_spec",
-  "shadow_group_name", "shadow_list", "shadow", "opt_corner",
-  "array_ident", "array_ident_list", "dvm_shadow_start", "dvm_shadow_wait",
-  "dvm_shadow_group", "dvm_reduction_start", "dvm_reduction_wait",
-  "dvm_consistent_start", "dvm_consistent_wait", "dvm_remote_access",
-  "group_name", "remote_data_list", "remote_data", "remote_index_list",
-  "remote_index", "dvm_task", "task_array", "dvm_task_region", "task_name",
-  "dvm_end_task_region", "task", "dvm_on", "opt_private_spec",
-  "dvm_end_on", "dvm_map", "dvm_prefetch", "dvm_reset",
-  "dvm_indirect_access", "indirect_list", "indirect_reference",
-  "hpf_independent", "hpf_reduction_spec", "dvm_asynchronous",
-  "dvm_endasynchronous", "dvm_asyncwait", "async_ident", "async",
-  "dvm_f90", "dvm_debug_dir", "debparamlist", "debparam",
-  "fragment_number", "dvm_enddebug_dir", "dvm_interval_dir",
-  "interval_number", "dvm_exit_interval_dir", "dvm_endinterval_dir",
-  "dvm_traceon_dir", "dvm_traceoff_dir", "dvm_barrier_dir", "dvm_check",
-  "dvm_io_mode_dir", "mode_list", "mode_spec", "dvm_shadow_add",
-  "template_ref", "shadow_axis_list", "shadow_axis", "opt_include_to",
-  "dvm_localize", "localize_target", "target_subscript_list",
-  "target_subscript", "aster_expr", "dvm_cp_create", "opt_mode",
-  "dvm_cp_load", "dvm_cp_save", "dvm_cp_wait", "dvm_template_create",
-  "template_list", "dvm_template_delete", "omp_specification_directive",
-  "omp_execution_directive", "ompdvm_onethread",
-  "omp_parallel_end_directive", "omp_parallel_begin_directive",
-  "parallel_clause_list", "parallel_clause", "omp_variable_list_in_par",
-  "ompprivate_clause", "ompfirstprivate_clause", "omplastprivate_clause",
-  "ompcopyin_clause", "ompshared_clause", "ompdefault_clause", "def_expr",
-  "ompif_clause", "ompnumthreads_clause", "ompreduction_clause",
-  "ompreduction", "ompreduction_vars", "ompreduction_op",
-  "omp_sections_begin_directive", "sections_clause_list",
-  "sections_clause", "omp_sections_end_directive", "omp_section_directive",
-  "omp_do_begin_directive", "omp_do_end_directive", "do_clause_list",
-  "do_clause", "ompordered_clause", "ompschedule_clause", "ompschedule_op",
-  "omp_single_begin_directive", "single_clause_list", "single_clause",
-  "omp_single_end_directive", "end_single_clause_list",
-  "end_single_clause", "ompcopyprivate_clause", "ompnowait_clause",
-  "omp_workshare_begin_directive", "omp_workshare_end_directive",
-  "omp_parallel_do_begin_directive", "paralleldo_clause_list",
-  "paralleldo_clause", "omp_parallel_do_end_directive",
-  "omp_parallel_sections_begin_directive",
-  "omp_parallel_sections_end_directive",
-  "omp_parallel_workshare_begin_directive",
-  "omp_parallel_workshare_end_directive", "omp_threadprivate_directive",
-  "omp_master_begin_directive", "omp_master_end_directive",
-  "omp_ordered_begin_directive", "omp_ordered_end_directive",
-  "omp_barrier_directive", "omp_atomic_directive", "omp_flush_directive",
-  "omp_critical_begin_directive", "omp_critical_end_directive",
-  "omp_common_var", "omp_variable_list", "op_slash_1", "op_slash_0",
-  "acc_specification", "acc_directive", "acc_region", "acc_checksection",
-  "acc_get_actual", "acc_actual", "opt_clause", "acc_clause_list",
-  "acc_clause", "data_clause", "targets_clause", "async_clause",
-  "acc_var_list", "computer_list", "computer", "acc_end_region",
-  "acc_end_checksection", "acc_declare", "acc_declare_list", "declare_var",
-  "acc_routine", "opt_routine_clauses", "routine_clause_list",
-  "routine_clause", "spf_directive", "spf_analysis", "spf_parallel",
-  "spf_transform", "spf_parallel_reg", "characteristic_list",
-  "characteristic", "opt_clause_apply_fragment", "opt_clause_apply_region",
-  "spf_end_parallel_reg", "analysis_spec_list", "analysis_spec",
-  "analysis_reduction_spec", "analysis_private_spec",
-  "analysis_process_private_spec", "analysis_cover_spec",
-  "analysis_parameter_spec", "spf_parameter_list", "spf_parameter",
-  "parallel_spec_list", "parallel_spec", "parallel_shadow_spec",
-  "parallel_across_spec", "parallel_remote_access_spec",
-  "transform_spec_list", "transform_spec", "unroll_list", "region_name",
-  "array_element_list", "spf_checkpoint", "checkpoint_spec_list",
-  "checkpoint_spec", "spf_type_list", "spf_type", "interval_spec",
-  "in_unit", YY_NULLPTR
-};
-#endif
-
-# ifdef YYPRINT
-/* YYTOKNUM[NUM] -- (External) token number corresponding to the
-   (internal) symbol number NUM (which must be that of a token).  */
-static const yytype_uint16 yytoknum[] =
-{
-       0,   358,   359,     1,     2,     3,     4,     5,     6,     7,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    22,    23,    24,    25,    26,    27,
-      28,    29,    30,    31,    32,    33,    34,    35,    36,    37,
-      38,    39,    40,    41,    42,    43,    44,    45,    46,    47,
-      48,    49,    50,    51,    52,    53,    54,    55,    56,    57,
-      58,    59,    60,    61,    62,    63,    64,    65,    66,    67,
-      68,    69,    70,    71,    72,    73,    74,    75,    76,    77,
-      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
-      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
-      98,    99,   100,   101,   102,   103,   104,   105,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,   116,   117,
-     118,   119,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,   132,   133,   134,   135,   136,   137,
-     138,   139,   140,   141,   142,   143,   144,   145,   146,   147,
-     148,   149,   150,   151,   152,   153,   154,   155,   156,   157,
-     158,   159,   160,   161,   162,   163,   164,   165,   166,   167,
-     168,   169,   170,   171,   172,   173,   174,   175,   176,   177,
-     178,   179,   180,   181,   182,   183,   184,   185,   186,   187,
-     188,   189,   190,   191,   192,   193,   194,   195,   196,   197,
-     198,   199,   200,   201,   202,   203,   204,   205,   206,   207,
-     208,   209,   210,   211,   212,   213,   214,   215,   216,   217,
-     218,   219,   220,   221,   222,   223,   224,   225,   226,   227,
-     228,   229,   230,   231,   232,   233,   234,   235,   236,   237,
-     238,   239,   240,   241,   242,   243,   244,   245,   246,   247,
-     248,   249,   250,   251,   252,   253,   254,   255,   256,   257,
-     258,   259,   260,   261,   262,   263,   264,   265,   266,   267,
-     268,   269,   270,   271,   272,   273,   274,   275,   276,   277,
-     278,   279,   280,   281,   282,   283,   284,   285,   286,   287,
-     288,   289,   290,   291,   292,   293,   294,   295,   296,   297,
-     298,   299,   300,   301,   302,   303,   304,   305,   306,   307,
-     308,   309,   310,   311,   312,   313,   314,   315,   316,   317,
-     318,   319,   320,   321,   322,   323,   324,   325,   326,   327,
-     328,   329,   330,   331,   332,   333,   334,   335,   336,   337,
-     338,   339,   340,   341,   342,   343,   344,   345,   346,   347,
-     348,   349,   350,   351,   352,   353,   354,   355,   356,   357,
-     360,   361
-};
-# endif
-
-#define YYPACT_NINF -2103
-
-#define yypact_value_is_default(Yystate) \
-  (!!((Yystate) == (-2103)))
-
-#define YYTABLE_NINF -1192
-
-#define yytable_value_is_error(Yytable_value) \
-  (!!((Yytable_value) == (-1192)))
-
-  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-     STATE-NUM.  */
-static const yytype_int16 yypact[] =
-{
-   -2103,   120, -2103, -2103, -2103, -2103,    -7,  5156, -2103, -2103,
-   -2103,   134, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   889, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103,   118, -2103, -2103,   753,   162, -2103, -2103, -2103,   118,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103,   124,   124, -2103, -2103, -2103, -2103, -2103,   124,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-     238, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   124, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103,   211, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-     344,   417, -2103, -2103, -2103, -2103, -2103,   118, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103,   118, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   234,
-    1817,   445,   234, -2103, -2103, -2103,   504,   530,   594,   615,
-   -2103, -2103, -2103,   786,   621,   124, -2103, -2103,   725,   755,
-     774,   791,   630,   518,   837,   856,   862, -2103,   153, -2103,
-   -2103, -2103,   234, -2103, -2103, -2103,   570,   917,  2307,  2403,
-   -2103, -2103,  2952, -2103,   701, -2103, -2103,  1131, -2103,   870,
-   -2103, -2103,  1762,   870,   896, -2103, -2103,   925, -2103, -2103,
-   -2103,   941,   967,   979,   997,  1001, -2103, -2103, -2103, -2103,
-    1004,   972, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103,  1006, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103,   152,   124,  1009,  1015,
-    1033,   903,   124,   124,   190,   124, -2103,   124,   124,  1056,
-   -2103,   525,  1068,   124,   124,   124,   124, -2103, -2103,   124,
-   -2103,  1090,   124,   964,   124,  1031, -2103, -2103, -2103,   124,
-   -2103,  1096,   124, -2103,   124,  1107,   175, -2103,   964, -2103,
-     124,   124,   124,   124, -2103, -2103, -2103, -2103, -2103,   124,
-   -2103,   124,   124,   445,   124,  1110,  1009,   124,  1114, -2103,
-     124,   124, -2103, -2103, -2103,  1124,  1119,   124,   124, -2103,
-    1122,  1128,   124,  1009,  1134,  2952, -2103,  1140,  1144,   124,
-   -2103,  1157,   124,  1102, -2103,  1175,   124,  1009,  1194,  1205,
-   -2103,   903,  1009,   124,   124,  2162,    79,   124,    84, -2103,
-   -2103,   202, -2103,   203,   124,   124,   124,  1231,   124,   124,
-    2952,    93, -2103, -2103,  1235,   124,   124,   124,   124,   124,
-    2647,   124, -2103,  1009,   124,  1009,   124,   124, -2103, -2103,
-     124, -2103,  1009,   124,  1241,  1243, -2103,   124, -2103, -2103,
-    1246, -2103, -2103,  1250, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103,  1253, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103,   124, -2103, -2103,  1269,
-    1289,  1223,  1009,  1313,  2952,  2952,  2952,  2952,  2952,  1315,
-    1321,  1348,  1370,  1382,   124, -2103,  1392, -2103, -2103, -2103,
-   -2103,  1195,   113, -2103, -2103,   124,   124,   124,   124,  1362,
-   -2103, -2103,  1290,   124,   124, -2103,   700,   124,   124,   124,
-     124,   124,   312,   124,  1102,   124,   124,  1110, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103,  1154, -2103, -2103, -2103,
-   -2103, -2103, -2103,  2952,  2952,  2952, -2103,  2952, -2103, -2103,
-   -2103, -2103, -2103, -2103,  2952,  2407, -2103,    80,  1414, -2103,
-    1408, -2103,  1182,  1189,  1426, -2103, -2103,  1428,  2952, -2103,
-   -2103,  2055, -2103, -2103,  1421,  1527,  1414, -2103, -2103,  1075,
-       3, -2103,  2055, -2103, -2103, -2103,  1468,   210,    72,  2960,
-    2960,   124,   124,   124,   124,   124,   124,   124,  1474, -2103,
-     124, -2103, -2103, -2103,   667, -2103, -2103,  1463,   124, -2103,
-    2952, -2103,  1242,   878, -2103,  1482, -2103, -2103,  1485,  1478,
-   -2103, -2103, -2103, -2103, -2103,  2662,   124,  1490, -2103,   124,
-    1485,   124, -2103,   903, -2103, -2103, -2103, -2103, -2103, -2103,
-    1498, -2103, -2103, -2103, -2103, -2103,  1485, -2103, -2103,  1500,
-   -2103, -2103,   771,  1177,   124,   792,    97, -2103,  1507,  1366,
-    2952,  1374, -2103,  1537, -2103, -2103,  2952,  2952, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   124,
-   -2103,   124,  1531,   243,   124,   445, -2103, -2103,  1543, -2103,
-    1548, -2103,  1550,  1139, -2103,  1562, -2103,   124, -2103, -2103,
-   -2103,  1563, -2103,   870,  1549,  3062, -2103,   124, -2103,  5617,
-   -2103,   124,  2952, -2103,  1564, -2103,   124, -2103,   124,   124,
-     124,  1414,   731,   124,   124,   124,  1374, -2103,   124,   648,
-   -2103, -2103, -2103,  1527,  1075, -2103, -2103, -2103, -2103, -2103,
-   -2103,   152, -2103,  1463,  1570,  1507, -2103, -2103, -2103, -2103,
-   -2103, -2103,   124, -2103, -2103, -2103,  5617, -2103,   525,  1520,
-     124, -2103,  1585, -2103, -2103, -2103, -2103,  1588,  3140,   798,
-   -2103, -2103,   211,   124,   445, -2103,   124,  1485, -2103,  1598,
-    1589, -2103,   124, -2103,  1606,  2952,  2952, -2103,  1485,   124,
-     272,   124,  1330,  1330,   364,  1330, -2103,  1603,   419,   487,
-     495,   524,   526,   532, -2103,  1485,   838, -2103,  1624, -2103,
-     198,   485, -2103, -2103,  1223, -2103,   124, -2103,  3203,  5617,
-    3237,  3329,  1626,  5617,   124,   124, -2103, -2103, -2103, -2103,
-    1627, -2103,   124,   124, -2103, -2103, -2103, -2103,   821, -2103,
-   -2103,  1423,  1485, -2103, -2103, -2103, -2103,  1297,   124, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103,  1485, -2103, -2103, -2103,
-   -2103,  1638, -2103,  1638, -2103, -2103, -2103, -2103,   578, -2103,
-     214, -2103,  1636, -2103, -2103,  3403,  1650,  1656,  1656,  1673,
-   -2103,  2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,
-    2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,  2952,
-   -2103,  1602,  1544,  1664,   390,   440,  2952, -2103, -2103, -2103,
-     832,  1228, -2103, -2103, -2103, -2103,   846, -2103,  1410,  1273,
-    2952,  1668,  1527,  1527,  1527,  1527,  1527, -2103,  1663, -2103,
-     210,   210,  1414,  1679, -2103,  2960,  5617,   125,   150, -2103,
-    1684,  1689, -2103, -2103,  1485, -2103, -2103, -2103, -2103,  1485,
-   -2103,   708, -2103,   152, -2103, -2103, -2103,   124,  3450,   124,
-    1697,  2952,  1651, -2103, -2103,   124, -2103,  2952,  3513, -2103,
-     855, -2103, -2103,  1662, -2103, -2103,   882, -2103,   124, -2103,
-     124, -2103, -2103,  1177, -2103, -2103, -2103, -2103, -2103,  3585,
-    1485, -2103, -2103, -2103,  1704,  1705,  1706,  1715,  1716,  1718,
-   -2103,  1366, -2103,   124, -2103,  3665, -2103, -2103,   124,  3750,
-    3781, -2103,  1725,   900,  1737,  1426, -2103, -2103,   124, -2103,
-    1739, -2103,  1724, -2103,   124, -2103,  1622,   748, -2103, -2103,
-     -26, -2103, -2103,  1745, -2103,  1738,  1749,   905, -2103,   124,
-    2960,  1744, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103,  1751, -2103, -2103,    57,  1752,  1740,  3830,  2685,   -70,
-   -2103,  1722, -2103, -2103,   920, -2103, -2103, -2103, -2103, -2103,
-     943,  1748,   944, -2103, -2103, -2103,  2952, -2103,  1792, -2103,
-   -2103, -2103,   961, -2103,  1759, -2103,  1366,  1755,  1768,   962,
-   -2103, -2103, -2103,  1772, -2103,  1766,  1770,  1761,   124,  2952,
-    2952,  2647, -2103, -2103, -2103, -2103, -2103, -2103, -2103,  1782,
-    1783, -2103,   623, -2103, -2103,  3866,  3982, -2103,  1771, -2103,
-     565,  1774, -2103, -2103, -2103, -2103,   568, -2103, -2103, -2103,
-     571, -2103,   573,   574,   576, -2103,   592, -2103,   593, -2103,
-    1785,  1787,  1795,  1796, -2103,  1799,  1802, -2103, -2103, -2103,
-   -2103, -2103, -2103,  1414,  1810,  1798, -2103,  1800,   -49, -2103,
-   -2103,  1814, -2103,   -15,   981, -2103, -2103, -2103, -2103,  2952,
-     372,   691, -2103,   989,  1013,   286,  1028, -2103, -2103, -2103,
-   -2103, -2103, -2103,    89,  1032, -2103, -2103, -2103, -2103,   726,
-    1054, -2103, -2103,   401,  1065, -2103, -2103,   445,   124,   191,
-   -2103,  1809, -2103,  1823, -2103,  1485, -2103, -2103, -2103,  1815,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   983, -2103,
-   -2103, -2103,   124,  1485,   138,  1494, -2103, -2103,   124,   124,
-   -2103,  1820,   214, -2103,  1819, -2103,  1776,  2952,  2960, -2103,
-    2952,  1656,  1656,   569,   569,  1673,   857,  1567,  2757,  5617,
-    2757,  2757,  2757,  2757,  2757,  1567,  1732,  1656,  1732,  3280,
-    1664, -2103, -2103,  1818,  1832,  2253, -2103, -2103, -2103, -2103,
-   -2103,  1834, -2103, -2103,   903,  5617, -2103,  2952, -2103, -2103,
-   -2103, -2103,  5617,    83,  5617,  1668,  1668,  1355,  1668,   654,
-   -2103,  1679,  1835,   210,  4229,  1836,  1837,  1838,  2960,  2960,
-    2960, -2103, -2103,   124,  1827, -2103, -2103,  1840,  1507, -2103,
-     211, -2103, -2103, -2103, -2103,  1595, -2103,  1069,   903, -2103,
-     903,  1085,  1845,  1086, -2103,  5617,  2952,  2662, -2103,  1100,
-   -2103,   903,  1638, -2103,   707,   710, -2103,  1112,  1692,  1123,
-   -2103,  1789, -2103,    97, -2103,  1844,   124,   124,  2952,   124,
-   -2103, -2103,  1485, -2103, -2103, -2103,  1621,   124,  2952,   124,
-   -2103,   124, -2103,  1414,  2952,  1841,  2685, -2103, -2103, -2103,
-   -2103,  1133, -2103,  1847, -2103,  1846,  1850,  1851,  1659,  2952,
-     124,   124, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-    1009,   124, -2103,  2700,  2998,  1848,   124,   124, -2103,   124,
-   -2103,  1677,   124, -2103,  2952,   124, -2103,  1638,  5617, -2103,
-    1862,   544,  1862, -2103,   124,  1366,  1864,  2736,   124,   124,
-   -2103,   525,  2952,   863,  2952,  1152, -2103,  1858,  1153,  5617,
-   -2103,    37, -2103, -2103, -2103, -2103, -2103,  1009,    15, -2103,
-     124, -2103,   918, -2103, -2103,  -116, -2103,    91,   635, -2103,
-     633, -2103,   323, -2103,    33, -2103,   124,   124,   124, -2103,
-     124,   124,   838, -2103,   124, -2103, -2103,  1859, -2103,   124,
-   -2103, -2103, -2103, -2103, -2103,  1546,  1561,  1565,  5617, -2103,
-    1664,   124, -2103, -2103,  1860,  1863,  1867,  1879,  1880, -2103,
-   -2103,  1881,  1883,  1887, -2103, -2103, -2103,  1888,  1889,  1894,
-    1895, -2103, -2103, -2103,   693,  1898,  1899,  1900,  1901,  1902,
-   -2103, -2103, -2103, -2103, -2103,   124,   826, -2103, -2103,  1904,
-   -2103,  1913, -2103, -2103,  1823, -2103, -2103, -2103, -2103,  5617,
-    1916, -2103, -2103, -2103,   115,   371,   371,  1682,  1683, -2103,
-   -2103,  1688,  1690,  1693,   580,   124, -2103, -2103, -2103, -2103,
-    1930, -2103, -2103, -2103,  1819, -2103,  1932, -2103,   164,  1927,
-   -2103,  1933,  4290, -2103,  1924,  1926,  1426, -2103, -2103,  3908,
-   -2103,  2952,  2952,  1228, -2103,  5617,  2055,   210, -2103,   183,
-    2960,  2960,  2960,   193, -2103,   228, -2103,   493, -2103,  1485,
-     124, -2103, -2103,  1949,  1168, -2103,  1951, -2103,  5617, -2103,
-   -2103, -2103,  2952, -2103, -2103,  2952, -2103, -2103, -2103, -2103,
-    5617, -2103,  1692,  2952,  1938, -2103,  1941,  1943,  4337,  1952,
-   -2103,    67,   124, -2103,  1191, -2103, -2103,  1942,  5617, -2103,
-   -2103,  3908, -2103,  1622, -2103,  1622,   124,   124,   124,  1197,
-    1207, -2103,   124,  1950,  1946,  2952,  4372,  2914, -2103, -2103,
-   -2103,  1485,  1414, -2103,  1955, -2103,  1801,  1964,  5617, -2103,
-     124, -2103,  1962,  1963, -2103, -2103,  1727,  1971, -2103, -2103,
-    1976, -2103,  5617,  1211, -2103,  1216, -2103, -2103,  4403, -2103,
-   -2103,  1219, -2103, -2103,  5617,  1965,   124, -2103, -2103, -2103,
-    1969,  1973,  1781,  1920,   124,   124,  1975,  1986, -2103,   448,
-   -2103,  1980, -2103, -2103, -2103,  1981, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103,   918, -2103, -2103, -2103, -2103,  -116,   124,
-   -2103, -2103,  1249,  1983, -2103,  1984, -2103,  1985, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   635, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103,   633, -2103, -2103, -2103, -2103, -2103,   323, -2103, -2103,
-   -2103,    33,  1990,  1991,  1993,   738,  1258, -2103,  1994,  1997,
-    1414,   124, -2103, -2103,  1987, -2103,  1992,  1664,  2002, -2103,
-     124,   124, -2103,  1857,   124, -2103,   124,   124,   124, -2103,
-     124,   124,   124,  2952, -2103,  2014,  2015, -2103,   124,   124,
-    2952, -2103, -2103,  2012,  2952,  2952, -2103, -2103,  2013, -2103,
-    1023,   826,  1939, -2103,  1277, -2103,  5617, -2103, -2103, -2103,
-    2032, -2103, -2103, -2103, -2103,   390,   390,   390,   390,   390,
-    1820, -2103,  2026,  2037,  2028,  1820,  1927, -2103,   214,   164,
-     145,   145, -2103, -2103, -2103,  1278,  2039,   872,   171, -2103,
-    2035,   164, -2103,  2952, -2103,  2027, -2103,  1426, -2103,  2253,
-    5617,  2030, -2103, -2103,  1075,  2029,  2031,  1279,  2033,  2036,
-    2038, -2103, -2103, -2103,  2047,    40,   903, -2103,   124,  1009,
-    5617,    40,  5617,  1692,  2952,  2042,  4437,  1287, -2103, -2103,
-   -2103, -2103, -2103,  2952, -2103,  2051, -2103, -2103, -2103, -2103,
-   -2103,  1301,  1304,  1308, -2103, -2103, -2103,   754, -2103,  5617,
-    2952,  2952,  4471, -2103,   124,   124, -2103, -2103,  1964, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103,  2041,   544,  2043,  3062, -2103,   124,   124,   124,  2736,
-   -2103, -2103, -2103,   863, -2103, -2103, -2103,  2616,   124, -2103,
-   -2103,  1975,  2040, -2103, -2103,   124,   124,  2952, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,    91,
-   -2103, -2103, -2103,  2952, -2103,  2952, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103,  1316,   124,   124,  2052,   750,  2048,  1319,
-   -2103,  1326,   938,  1337,  2054,  1338,  1353,  1354,  1360,  1368,
-    1378, -2103,  1379,  3360,  2057, -2103, -2103,  -113,  1380, -2103,
-    1383,  1397,  4502,   876,  2045, -2103,  5617,  5617,  1401,  2069,
-   -2103, -2103, -2103,  2058,  4539, -2103, -2103, -2103,   115, -2103,
-   -2103, -2103, -2103, -2103, -2103,  1820, -2103,   124, -2103, -2103,
-    2065,  2059, -2103,   662,   171,   171,   164, -2103,   164,   145,
-     145,   145,   145,   145,  1071,  4573, -2103, -2103, -2103, -2103,
-    2952, -2103, -2103, -2103, -2103,  1647, -2103,   124,  2073,  1478,
-     124, -2103,   124, -2103,  4614, -2103,  2952,  2952, -2103,  4645,
-    1829,  2952, -2103, -2103, -2103, -2103,  1430, -2103, -2103,  5617,
-    5617,  2952,  1431,  2072, -2103,   954, -2103,  2952, -2103,  2063,
-    2068, -2103, -2103,  2075,  2084, -2103, -2103, -2103, -2103, -2103,
-    1961,  2074,  1442,  2087,  2090,  1445,   785,   124, -2103, -2103,
-    5617,   721,  2077,    28, -2103, -2103,  2062, -2103, -2103,   217,
-    4676,  4713, -2103, -2103, -2103, -2103, -2103, -2103,  1451,  2079,
-     795,  2952,   124, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103,  2086,  2088, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   124, -2103,
-    2952, -2103,   553,  1469, -2103,  1471, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103,  2952,  2095,  2097, -2103, -2103,
-   -2103,  1494,  2085, -2103,  1664, -2103,   164, -2103,  1071,  2092,
-     171,   171, -2103, -2103, -2103, -2103,  4744, -2103,  3908, -2103,
-    1475, -2103, -2103,   903,  1810, -2103,  1692,  5617, -2103,  1861,
-   -2103,  2100,  4787,   754, -2103,  5617, -2103,  2022,  2124,  2126,
-    2127,  2128,  2129,   124,   124,  2131,  2133,  2134,  4832, -2103,
-   -2103, -2103,  2952,   124,   124, -2103, -2103,  2139,   124, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103,  2148, -2103, -2103,
-   -2103, -2103, -2103,  1477, -2103, -2103, -2103, -2103,  2135, -2103,
-   -2103,  2150, -2103,  5617, -2103,   124,   124,   938, -2103,  4863,
-   -2103,  2145, -2103,  2153,  2154, -2103,  4927, -2103,  2156, -2103,
-   -2103,  2143,  1493,  1071, -2103,  2952,  1647, -2103, -2103,  2952,
-     124,  2952, -2103, -2103, -2103,  5617,  1499, -2103, -2103,  2124,
-     124,   124,   124,   124, -2103, -2103,  2952,  2952,   124,  2952,
-    1504, -2103, -2103,  2157, -2103,  1508,  2159,  1526,   124,  2952,
-   -2103, -2103, -2103, -2103,   189,  2160, -2103,  2952,  2078, -2103,
-   -2103, -2103, -2103, -2103, -2103,   124,  2151, -2103, -2103,  4958,
-   -2103,  5617, -2103, -2103,  2158,  4992,  2022, -2103,   348, -2103,
-    2173,  1541,  2174,  1545,  2167,  1552,  5023,  5093,  2164, -2103,
-    1559,  5151, -2103,   124,  2105, -2103, -2103, -2103, -2103,  1810,
-   -2103,  5490,  1856, -2103,  2952,  5617,  2169,  1839,  1842, -2103,
-    2180, -2103, -2103,  2952,  1521, -2103, -2103,  2184,  2186,   124,
-     124, -2103,   124, -2103,  2647, -2103, -2103,  2952, -2103,   124,
-   -2103,  2952, -2103,  2175,  1560,  1566, -2103,  2182,  5521,   908,
-   -2103,  2187,  2188,   124,  5617,   124,  5617,  1580, -2103, -2103,
-   -2103, -2103,  1600, -2103,  2192,  1601,  1604,  1607,  5552, -2103,
-    5617, -2103, -2103, -2103,  2952, -2103, -2103, -2103, -2103, -2103,
-    2178,  1521, -2103,   124, -2103,  2952, -2103, -2103,  2190,  2952,
-    1612,  1632,  1634,  2952,  2191, -2103, -2103, -2103,  5586,  1667,
-   -2103, -2103,  5617,  2204, -2103, -2103, -2103,  2952,  2952,  2952,
-    2198, -2103, -2103, -2103,  5617, -2103, -2103,   -47,   380,  1685,
-   -2103,  2208,  2209, -2103, -2103, -2103,  2202,  2202,  2202, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,   541,  2212,
-   -2103,  2096, -2103,  1686, -2103, -2103, -2103
-};
-
-  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-     Performed when YYTABLE does not specify something else to do.  Zero
-     means the default is an error.  */
-static const yytype_uint16 yydefact[] =
-{
-       2,     0,     1,    10,    11,     9,     0,     0,     3,   151,
-     150,   790,   340,   538,   538,   538,   538,   538,   340,   538,
-     556,   538,    20,   538,   538,   159,   538,   561,   340,   155,
-     538,   340,   538,   538,   340,   486,   538,   538,   538,   339,
-     538,   783,   538,   538,   341,   792,   538,   156,   157,   786,
-      45,   538,   538,   538,   538,   538,   538,   538,   538,   558,
-     538,   538,   484,   484,   538,   538,   538,   340,   538,     0,
-     538,   340,   340,   538,   538,   339,    20,   340,   340,   326,
-       0,   538,   538,   340,   340,   538,   340,   340,   340,   340,
-     153,   340,   538,   212,   538,   158,   538,   538,     0,    20,
-     340,   538,   538,   538,   560,   340,   538,   340,   536,   538,
-     538,   340,   538,   538,   538,   340,    20,   340,    45,   538,
-     538,   154,    45,   538,   340,   538,   538,   538,   340,   538,
-     538,   557,   340,   538,   340,   538,   538,   538,   538,   538,
-     538,   340,   340,   537,    20,   340,   340,   538,   538,   538,
-       0,   340,     8,   340,   538,   538,   538,   784,   538,   538,
-     538,   538,   538,   538,   538,   538,   538,   538,   538,   538,
-     538,   538,   538,   538,   538,   538,   538,   538,   538,   538,
-     538,   538,   538,   538,   340,   538,   785,   538,  1228,   538,
-    1229,   538,   538,   340,   340,   538,   538,   538,   538,   538,
-     538,   538,   538,  1313,  1313,  1313,  1313,  1313,  1313,   612,
-       0,    37,   612,    74,    48,    49,    50,    66,    67,    77,
-      69,    70,    68,   110,    59,     0,   147,   152,    52,    71,
-      72,    73,    51,    60,    55,    56,    57,    61,   208,    76,
-      75,    58,   612,   446,   441,   454,     0,     0,     0,   457,
-     440,   439,     0,   509,   512,   538,   510,     0,   538,     0,
-     538,   546,     0,     0,   553,    53,   460,   614,   617,   623,
-     619,   618,   624,   625,   626,   627,   616,   633,   615,   634,
-     620,     0,   781,   621,   628,   630,   629,   661,   635,   637,
-     638,   636,   639,   640,   641,   642,   643,   622,   644,   645,
-     647,   648,   646,   650,   651,   649,   675,   662,   663,   664,
-     665,   652,   653,   654,   656,   655,   657,   658,   659,   660,
-     666,   667,   668,   669,   670,   671,   672,   673,   674,   632,
-     676,   631,  1035,  1034,  1036,  1037,  1038,  1039,  1040,  1041,
-    1042,  1043,  1044,  1045,  1046,  1047,  1048,  1049,  1050,  1033,
-    1051,  1052,  1053,  1054,  1055,  1056,  1057,  1058,  1059,    54,
-     461,  1195,  1197,  1199,  1200,  1196,  1198,  1193,  1194,   462,
-    1241,  1242,  1243,  1244,  1245,  1246,     0,     0,   341,     0,
-       0,     0,     0,     0,     0,     0,   997,    35,     0,     0,
-     599,     0,     0,     0,     0,     0,     0,   455,   508,   482,
-     211,     0,     0,     0,   482,     0,   313,   340,   728,     0,
-     728,   539,     0,    23,   482,     0,   482,   977,     0,   994,
-     484,   482,   482,   482,    32,   485,    82,   445,   960,   482,
-     954,   106,   482,    37,   482,     0,   341,     0,     0,    64,
-       0,     0,   330,    44,     7,   971,     0,     0,     0,   600,
-       0,     0,    78,   341,     0,   991,   523,     0,     0,     0,
-     297,   296,     0,     0,   814,     0,     0,   341,     0,     0,
-     539,     0,   341,     0,     0,     0,   341,    33,   341,    22,
-     600,     0,    21,     0,     0,     0,     0,     0,     0,     0,
-     399,   341,    45,   141,     0,     0,     0,     0,     0,     0,
-       0,     0,   788,   341,     0,   341,     0,     0,   995,   996,
-       0,   340,   341,     0,     0,     0,   600,     0,  1179,  1178,
-    1183,  1060,   728,  1185,   728,  1175,  1177,  1061,  1166,  1169,
-    1172,   728,   728,   728,  1181,  1174,  1176,   728,   728,   728,
-     728,  1114,   728,   728,  1191,  1148,     0,    45,  1202,  1205,
-    1208,  1235,   341,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,  1261,     0,   613,     4,    20,
-      20,     0,     0,    45,     5,     0,     0,     0,     0,     0,
-      45,    20,     0,     0,     0,   148,   165,     0,     0,     0,
-       0,   529,     0,   529,     0,     0,     0,     0,   529,   223,
-       6,   487,   538,   538,   447,   442,     0,   458,   449,   448,
-     456,    83,   173,     0,     0,     0,   407,     0,   406,   411,
-     409,   410,   408,   382,     0,     0,   352,   383,   355,   385,
-     384,   356,   401,   403,   396,   354,   357,   599,   399,   543,
-     544,     0,   381,   380,    32,     0,   603,   604,   541,     0,
-     601,   600,     0,   545,   600,   565,   548,   547,   601,   551,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,    45,
-       0,   777,   778,   776,     0,   774,   764,     0,     0,   436,
-       0,   324,     0,   525,   979,   980,   976,    45,   311,   809,
-     811,   978,    36,    13,   599,     0,   482,     0,   193,     0,
-     311,     0,   185,     0,   710,   708,   844,   932,   933,   808,
-     805,   806,   483,   517,   223,   436,   311,   677,   988,   983,
-     471,   342,     0,     0,     0,     0,     0,   720,   723,   712,
-       0,   498,   683,   680,   681,   452,     0,     0,   501,   989,
-     443,   444,   459,   453,   472,   107,   500,    45,   518,     0,
-     200,     0,   383,     0,     0,    37,    25,   804,   801,   802,
-     325,   327,     0,     0,    45,   972,   973,     0,   701,   699,
-     687,   684,   685,     0,     0,     0,    79,     0,    45,   992,
-     990,     0,     0,   953,     0,    45,     0,    19,     0,     0,
-       0,     0,   958,     0,     0,     0,   498,   524,     0,     0,
-     936,   963,   600,     0,   600,   601,   140,    34,    12,   144,
-     577,     0,   765,     0,     0,     0,   728,   707,   705,   893,
-     930,   931,     0,   704,   702,   964,   400,   515,     0,     0,
-       0,   914,     0,   926,   925,   928,   927,     0,   692,     0,
-     690,   695,     0,     0,    37,    24,     0,   311,   945,   948,
-       0,    45,     0,   303,   299,     0,     0,   578,   311,     0,
-     528,     0,  1118,  1113,   528,  1150,  1180,     0,   528,   528,
-     528,   528,   528,   528,  1173,   311,    46,  1201,  1210,  1211,
-       0,     0,    45,  1234,  1236,  1237,     0,    45,     0,  1025,
-    1026,     0,   993,   350,     0,     0,    45,    45,    45,  1296,
-    1250,    45,     0,     0,    20,    43,    38,    42,     0,    40,
-      17,    46,   311,   133,   135,   137,   111,     0,     0,    20,
-     340,   149,   539,   599,   166,   147,   311,   180,   182,   184,
-     188,   528,   191,   528,   197,   199,   201,   210,     0,   214,
-       0,    45,     0,   450,   425,     0,   352,   365,   364,   377,
-     363,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-     599,     0,     0,   599,     0,     0,   399,   405,   397,   513,
-       0,     0,   516,   571,   572,   576,     0,   568,     0,   570,
-       0,   609,     0,     0,     0,     0,     0,   555,   570,   559,
-       0,     0,   583,   549,   581,     0,     0,   352,   354,   552,
-     587,   586,   554,   678,   311,   700,   703,   706,   709,   311,
-     340,     0,   946,     0,    45,   759,   179,     0,     0,     0,
-       0,     0,     0,   313,   813,     0,   530,     0,   476,   480,
-       0,   470,   599,     0,   195,   186,     0,   322,     0,   209,
-       0,   679,   599,     0,   787,   320,   317,   314,   316,   321,
-     311,   728,   725,   734,   729,     0,     0,     0,     0,     0,
-     726,   712,   728,     0,   791,     0,   499,   540,     0,     0,
-       0,    18,   205,     0,     0,     0,   207,   196,     0,   495,
-     493,   490,     0,    45,     0,   330,     0,     0,   333,   331,
-       0,    45,   974,   382,   922,   969,     0,     0,   967,     0,
-     562,     0,    88,    89,    87,    86,    92,    91,   103,    96,
-      99,    98,   101,   100,    97,   102,    95,    93,    90,    94,
-      84,     0,    85,   198,     0,     0,     0,     0,     0,     0,
-     298,     0,   189,   437,     0,    45,   959,   957,   134,   816,
-       0,     0,     0,   293,   540,   181,     0,   580,     0,   579,
-     288,   288,     0,   760,     0,   728,   712,   940,     0,     0,
-     937,   285,   284,    63,   282,     0,     0,     0,     0,     0,
-       0,     0,   689,   688,   136,    14,   183,   947,    45,   950,
-     949,   147,     0,   104,    47,     0,     0,   696,     0,   728,
-     528,     0,  1147,  1117,  1112,   728,   528,  1149,  1192,   728,
-     528,   728,   528,   528,   528,   728,   528,   728,   528,   697,
-       0,     0,     0,     0,  1222,     0,     0,  1209,  1213,  1215,
-    1214,    45,  1204,   852,  1223,     0,  1207,     0,     0,  1238,
-    1233,  1230,  1231,     0,     0,  1000,    45,    45,    45,     0,
-     391,   392,  1030,     0,     0,     0,     0,  1262,  1264,  1265,
-    1266,  1268,  1267,     0,     0,  1277,  1279,  1280,  1281,     0,
-       0,  1285,    45,     0,     0,  1300,    28,    37,     0,     0,
-      39,     0,    30,   160,   117,   311,   340,   119,   121,     0,
-     122,   115,   123,   131,   130,   124,   125,   126,     0,   113,
-     116,    26,     0,   311,     0,     0,   145,   178,     0,     0,
-     223,   223,     0,   225,   218,   222,     0,     0,     0,   353,
-       0,   360,   362,   359,   358,   376,   378,   372,   366,   505,
-     369,   367,   370,   368,   371,   373,   375,   361,   374,   379,
-     599,   412,   390,     0,   344,     0,   415,   416,   402,   413,
-     404,     0,   599,   514,     0,   533,   531,     0,   599,   567,
-     574,   575,   573,   602,   611,   606,   608,   610,   607,   605,
-     566,   550,     0,     0,     0,   352,     0,     0,     0,     0,
-       0,   698,   780,     0,   790,   793,   783,     0,   792,   786,
-       0,   784,   785,   782,   775,     0,   430,     0,     0,   507,
-       0,     0,     0,     0,   812,   478,   477,     0,   475,     0,
-     194,     0,   528,   807,   428,   429,   433,     0,     0,     0,
-     315,   318,   177,     0,   599,     0,     0,     0,     0,     0,
-     713,   724,   311,   463,   728,   682,     0,   482,     0,     0,
-     202,     0,   395,   982,     0,     0,     0,    16,   803,   328,
-     338,     0,   334,   336,   332,     0,     0,     0,     0,     0,
-       0,     0,   966,   686,   563,    81,    80,   129,   127,   128,
-     341,     0,   488,   424,     0,     0,     0,     0,   192,     0,
-     521,     0,     0,   728,     0,     0,    65,   528,   506,   602,
-     139,     0,   143,    45,     0,   712,     0,     0,     0,     0,
-     935,     0,     0,     0,     0,     0,   915,   917,     0,   693,
-     691,     0,    45,   952,    45,   951,   146,   341,     0,   503,
-       0,  1182,     0,   728,  1184,     0,   728,     0,     0,   728,
-       0,   728,     0,   728,     0,   728,     0,     0,     0,    45,
-       0,     0,     0,  1212,     0,  1203,  1206,     0,  1240,     0,
-    1004,  1002,  1003,    45,   999,     0,     0,     0,   351,   599,
-     599,     0,  1029,  1032,     0,     0,     0,     0,     0,    45,
-    1247,     0,     0,     0,    45,  1248,  1287,  1289,     0,     0,
-    1292,  1294,    45,  1249,     0,     0,     0,     0,     0,     0,
-      45,  1299,    15,    29,    41,     0,   174,   161,   118,     0,
-      45,     0,    45,    27,   160,   540,   540,   170,   173,   169,
-       0,   187,   190,   215,     0,     0,     0,   248,   246,   253,
-     250,   264,   257,   262,     0,     0,   216,   239,   251,   243,
-     254,   244,   259,   245,     0,   238,     0,   233,   230,   219,
-     220,     0,     0,   426,   352,     0,   388,   599,   348,   345,
-     346,     0,   399,     0,   535,   534,     0,     0,   582,   353,
-       0,     0,     0,   352,   589,   352,   593,   352,   591,   311,
-       0,   599,   519,     0,     0,   981,     0,   312,   479,   481,
-     173,   323,     0,   599,   520,     0,   985,   599,   984,   319,
-     321,   727,     0,     0,     0,   737,     0,     0,     0,     0,
-     711,   465,   482,   502,     0,   204,   203,   382,   494,   491,
-     489,     0,   492,     0,   329,     0,     0,     0,     0,     0,
-       0,   968,     0,  1014,     0,     0,   423,   418,   955,   956,
-     722,   311,   962,   438,     0,   817,   819,   825,   295,   294,
-       0,   288,     0,     0,   290,   289,     0,   761,   762,   714,
-       0,   944,   943,     0,   941,     0,   938,   283,     0,  1020,
-    1009,     0,  1007,  1010,   756,     0,     0,   929,   921,   694,
-       0,     0,     0,     0,     0,   301,     0,   300,   308,     0,
-    1191,     0,  1191,  1191,  1127,     0,  1121,  1123,  1124,  1122,
-     728,  1126,  1125,     0,  1191,   728,  1145,  1144,     0,     0,
-    1188,  1187,     0,     0,  1191,     0,  1191,     0,   728,  1066,
-    1070,  1071,  1072,  1068,  1069,  1073,  1074,  1067,     0,  1155,
-    1159,  1160,  1161,  1157,  1158,  1162,  1163,  1156,  1165,  1164,
-     728,     0,  1108,  1110,  1111,  1109,   728,     0,  1138,  1139,
-     728,     0,     0,     0,     0,     0,     0,  1224,     0,     0,
-     853,     0,  1232,  1001,     0,  1027,     0,   599,     0,  1031,
-       0,     0,    45,     0,     0,  1263,     0,     0,     0,  1278,
-       0,     0,     0,     0,  1286,     0,     0,    45,     0,     0,
-       0,    45,  1301,     0,     0,     0,   109,   795,     0,   112,
-       0,   174,     0,   147,     0,   172,   171,   268,   254,   267,
-       0,   256,   261,   255,   260,     0,     0,     0,     0,     0,
-     223,   213,   224,   242,     0,   223,   235,   236,     0,     0,
-       0,     0,   279,   224,   280,     0,     0,   228,   269,   274,
-     277,   230,   221,     0,   504,     0,   414,   386,   389,     0,
-     347,     0,   532,   569,   570,     0,     0,   352,     0,     0,
-       0,   779,   773,   789,     0,     0,     0,   526,     0,   341,
-     527,     0,   987,     0,     0,     0,   741,     0,   739,   736,
-     731,   735,   733,     0,    45,     0,   464,   451,   206,   335,
-     337,     0,     0,     0,   970,   965,   132,     0,  1013,   422,
-       0,     0,   417,   961,     0,     0,    45,   815,   826,   827,
-     832,   836,   829,   837,   838,   839,   833,   835,   834,   830,
-     831,     0,     0,     0,     0,   286,     0,     0,     0,     0,
-     939,   934,   473,     0,  1006,   728,   916,     0,     0,   891,
-     105,   307,   302,   304,   306,     0,     0,     0,  1076,   728,
-    1077,  1078,    45,  1119,   728,  1146,  1142,   728,  1191,     0,
-    1075,    45,  1079,     0,  1080,     0,  1064,   728,  1153,   728,
-    1106,   728,  1136,   728,  1216,  1217,  1218,  1226,  1227,    45,
-    1221,  1219,  1220,     0,     0,     0,     0,   394,     0,     0,
-    1274,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,  1297,     0,     0,     0,    45,    45,     0,     0,  1307,
-       0,     0,     0,     0,     0,    31,   176,   175,     0,     0,
-     120,   114,   108,     0,     0,   162,   599,   167,     0,   249,
-     247,   265,   258,   263,   217,   223,   599,     0,   241,   237,
-     224,     0,   234,     0,   271,   270,     0,   226,   230,     0,
-       0,     0,     0,     0,   231,     0,   427,   387,   349,   398,
-       0,   584,   596,   598,   597,     0,   431,     0,     0,   810,
-       0,   434,     0,   986,   757,   730,     0,     0,    45,     0,
-       0,     0,   845,   975,   846,  1019,     0,  1016,  1018,   421,
-     420,     0,     0,     0,   818,     0,   828,     0,   289,     0,
-       0,   766,   763,   720,   715,   716,   718,   719,   942,  1008,
-    1012,     0,     0,   382,     0,     0,     0,     0,   310,   309,
-     522,     0,     0,     0,  1120,  1143,     0,  1190,  1189,     0,
-       0,     0,  1065,  1154,  1107,  1137,  1225,  1239,     0,     0,
-     393,     0,     0,  1273,  1270,   903,   904,   905,   902,   907,
-     901,   908,   900,   899,   898,   906,   894,     0,     0,    45,
-    1269,  1272,  1271,  1283,  1284,  1282,  1290,  1288,     0,  1291,
-       0,  1293,     0,     0,  1253,     0,  1309,  1310,    45,  1302,
-    1303,  1304,  1305,  1311,  1312,     0,     0,     0,   796,   163,
-     164,     0,     0,   240,   599,   242,     0,   281,   229,     0,
-     273,   272,   275,   276,   278,   474,     0,   771,   770,   772,
-       0,   768,   432,     0,   998,   435,     0,   742,   740,     0,
-     732,     0,     0,     0,  1015,   419,   847,     0,     0,     0,
-       0,   912,     0,     0,     0,     0,     0,     0,     0,   287,
-     292,   291,     0,     0,     0,  1005,   918,   919,     0,   843,
-     892,   892,   305,  1092,  1091,  1090,  1097,  1098,  1099,  1096,
-    1093,  1095,  1094,  1103,  1100,  1101,  1102,     0,  1087,  1131,
-    1130,  1132,  1133,     0,  1192,  1082,  1084,  1083,     0,  1086,
-    1085,     0,  1028,  1276,  1275,     0,     0,     0,  1298,     0,
-    1255,     0,    45,  1257,  1259,  1308,     0,   797,     0,   173,
-     266,     0,     0,   228,   227,     0,     0,   767,   511,     0,
-       0,     0,   467,  1017,   824,   823,     0,   821,   863,   860,
-       0,     0,     0,     0,   910,   911,     0,     0,     0,     0,
-       0,   717,   923,  1011,    45,     0,     0,     0,     0,     0,
-    1129,  1186,  1081,    45,     0,     0,   895,     0,     0,  1254,
-      45,  1251,    45,  1252,  1306,     0,     0,   252,   232,   496,
-     769,   758,   745,   738,   743,     0,     0,   820,   866,   861,
-       0,     0,     0,     0,     0,     0,     0,   849,     0,   855,
-       0,   468,   721,     0,     0,   842,    45,    45,   889,  1089,
-    1088,     0,     0,   896,     0,  1295,     0,     0,     0,   800,
-     794,   798,   168,     0,     0,   466,   822,     0,     0,     0,
-       0,   858,     0,   841,     0,   909,   859,     0,   848,     0,
-     854,     0,   924,     0,     0,     0,  1128,     0,     0,   355,
-    1256,     0,     0,     0,   497,     0,   748,     0,   746,   749,
-     864,   865,     0,   867,   869,     0,     0,     0,   850,   856,
-     469,   920,   890,   888,     0,   897,    45,    45,   799,   751,
-     752,     0,   744,     0,   862,     0,   857,   840,     0,     0,
-       0,     0,     0,     0,   750,   753,   747,   868,     0,     0,
-     872,   913,   851,  1022,  1258,  1260,   754,     0,     0,     0,
-     870,    45,  1021,   755,   874,   873,    45,     0,     0,     0,
-     875,   880,   882,   883,  1023,  1024,     0,     0,     0,    45,
-     871,    45,    45,   599,   886,   885,   884,   876,     0,   878,
-     879,     0,   881,     0,    45,   887,   877
-};
-
-  /* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
-{
-   -2103, -2103, -2103, -2103, -2103,   -20,  2004,  1317, -2103, -2103,
-    -688,   -31, -2103, -2103,  -408, -2103,   946, -2103,   -50,  1318,
-   -2103, -2103, -2103,  2626,   216, -2103, -2103, -2103, -2103, -2103,
-   -2103,   338,   631,  1040, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103,  -180,  -899, -2103, -2103, -2103,  1136,   632,  1648,
-   -2103,   -46, -1581,   346, -2103, -2103, -2103, -2103, -2103, -2103,
-    1644,  -274,  -194, -2103, -2103, -2103,  1642, -2103,  -636, -2103,
-   -2103, -2103, -2103,  1529, -2103, -2103,   930, -1269, -1542,  1306,
-     607, -1550,   -42,   109,  1309, -2103,   330,   341, -1818, -2103,
-   -1548, -1246, -1543,  -445, -2103,   135, -1609, -1615,  -776, -2103,
-   -2103,   751,  1097,   516,    71,   250, -2103,   779, -2103, -2103,
-   -2103, -2103, -2103,    58, -2103, -1465,  -358,  1233, -2103,  1218,
-     851,   873,  -378, -2103, -2103,  1179, -2103, -2103, -2103, -2103,
-     562,   563,  2201,   144,  -366, -1321,   343,  -326, -1027,  1169,
-    -544,  -508,  1420,  -223,  1822,  -876,  -879, -2103, -2103,  -614,
-    -602,  -208, -2103,  -848, -2103,  -638,  -952, -1124, -2103, -2103,
-   -2103,   322, -2103, -2103,  1569, -2103, -2103,  2049, -2103,  2050,
-   -2103, -2103,   879, -2103,  -371,    18, -2103, -2103,  2056,  2061,
-   -2103,   841, -2103,  -737,  -204,  1502, -2103,   986, -2103, -2103,
-     255, -2103,  1248,   642, -2103,  4031,  -413, -1107, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103,  -186, -2103,   643,  -926, -2103,
-   -2103, -2103,   301, -1309,  -632,  1299,  -931,  -380,  -192,  -368,
-     673,   -58, -2103, -2103, -2103,  1645, -2103, -2103,  1227, -2103,
-   -2103,  1200, -2103,  1470, -1986,  1129, -2103, -2103, -2103,  1653,
-   -2103,  1649, -2103,  1654, -2103,  1652,  -993, -2103, -2103, -2103,
-     -13,  -243, -2103, -2103, -2103,  -395, -2103,   811,   898,  -487,
-     897, -2103,   156, -2103, -2103, -2103,  -227, -2103, -2103, -2103,
-   -1903, -2103, -2103, -2103, -2103, -2103, -1454,  -530,   310, -2103,
-     -69, -2103,  1517,  1307, -2103, -2103,  1310, -2103, -2103, -2103,
-   -2103,  -191, -2103, -2103,  1239, -2103, -2103,  1281, -2103,   377,
-    1303, -2103, -2103,  -871, -2103, -1896, -2103,  -120, -2103, -2103,
-     345, -2103,  -767,  -384,  1896,  1547, -2103, -2103, -1553, -2103,
-   -2103, -2103, -2103, -2103,   -62, -2103, -2103, -2103,  -202, -2103,
-    -225, -2103,  -242, -2103,  -240, -1890, -1195,  -787, -2103,    17,
-    -477, -1065, -2102, -2103, -2103, -2103,  -491, -1820,   596, -2103,
-    -765, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-    -488, -1461,   860, -2103,   347, -2103,  1694, -2103,  1865, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -1444,   904,
-   -2103,  1605, -2103, -2103, -2103, -2103,  1982, -2103, -2103, -2103,
-     408,  1957, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103,   824, -2103, -2103, -2103,   355, -2103, -2103,
-   -2103, -2103,    68, -1952, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103,   561,   567,  -531,
-    -936,  -912, -1438, -1445, -1427, -1419, -2103, -1417, -1416, -1392,
-   -2103, -2103, -2103, -2103, -2103,   550, -2103, -2103, -2103, -2103,
-   -2103,   598, -1407, -1401, -2103, -2103, -2103,   548, -2103, -2103,
-     595, -2103,    96, -2103, -2103, -2103, -2103,   566, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103, -2103,
-   -2103, -2103, -2103,   349, -2103,   351,    32, -2103, -2103, -2103,
-   -2103, -2103, -2103, -2103, -2103,  1170, -2103,  1162, -2103,  -837,
-   -2103,   334, -2103, -2103, -2103,   554,   858, -2103, -2103, -2103,
-    1522, -2103, -2103, -2103, -2103, -2103, -2036,    22, -2103, -2103,
-   -2103, -2103,   839, -2103, -2103, -2103, -2103, -2103, -2103,   177,
-   -2103,   836, -2103, -2103, -2103, -2103,   831, -2103, -2103, -2103,
-   -2103, -2103,   825, -2103,   157, -2103,  1509
-};
-
-  /* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,     1,     6,     7,   209,   387,   210,   844,   755,   211,
-     910,   623,   808,   693,   573,   908,   909,   444,  2262,  1227,
-    1518,   212,   213,   624,  1131,  1132,   214,   215,   216,   583,
-    1298,  1299,  1135,  1300,   217,   218,   219,   220,  1160,   221,
-     222,  1161,   223,   586,   224,   225,   226,   227,  1596,  1597,
-     925,  1608,   944,  1886,   228,   229,   230,   231,   232,   233,
-     789,  1171,  1172,   234,   235,   236,   750,  1083,  1084,   237,
-     238,   714,   456,   937,   938,  1624,   939,   940,  1924,  1634,
-    1639,  1640,  1925,  1926,  1635,  1636,  1637,  1626,  1627,  1628,
-    1629,  1898,  1631,  1632,  1633,  1900,  2144,  1928,  1929,  1930,
-    1173,  1174,  1490,  1491,  2015,  1745,  1152,  1153,   239,   461,
-     240,   854,  2032,  2033,  1777,  2034,  1034,   722,   723,  1057,
-    1058,  1046,  1047,   241,   760,   761,   762,   763,  1099,  1451,
-    1452,  1453,   400,   377,   407,  1343,  1648,  1344,   892,  1006,
-     626,   645,   627,   628,   629,   630,  2078,  1086,   977,  1938,
-     827,   631,   632,   633,   634,   635,  1348,  1650,   636,  1318,
-    1935,  1416,  1397,  1417,  1027,  1144,   242,   243,  1976,   244,
-     245,   696,  1039,  1040,   713,   426,   246,   247,   248,   249,
-    1090,  1091,  1445,  1945,  1946,  1077,   250,   251,   252,   253,
-    1209,   254,   980,  1356,   255,   379,   731,  1434,   256,   257,
-     258,   259,   260,   261,   656,   648,   986,   987,   988,   262,
-     263,   264,  1003,  1004,  1009,  1010,  1011,  1345,   773,   649,
-     805,   568,   265,   266,   267,   717,   268,   733,   734,   269,
-     771,   772,   270,   502,   839,   840,   842,   271,   272,   769,
-     273,   824,   274,   818,   275,   705,  1074,   276,   277,  2194,
-    2195,  2196,  2197,  1731,  1071,   410,   725,   726,  1070,  1696,
-    1760,  1967,  1968,  2453,  2454,  2527,  2528,  2550,  2564,  2565,
-    1765,  1965,   278,   279,  1747,   677,   813,   814,  1953,  2300,
-    2301,  1954,   674,   675,   280,   281,   282,   283,  2108,  2109,
-    2490,  2491,   284,   758,   759,   285,   710,   711,   286,   689,
-     690,   287,   288,  1150,  1737,  2184,  2406,  2407,  1997,  1998,
-    1999,  2000,  2001,   707,  2002,  2003,  2004,  2468,  1234,  2005,
-    2470,  2006,  2007,  2008,  2409,  2458,  2499,  2532,  2533,  2569,
-    2570,  2589,  2590,  2591,  2592,  2593,  2604,  2009,  2206,  2426,
-     820,  2083,  2246,  2247,  2248,  2010,   832,  1505,  1506,  2027,
-    1167,  2423,   289,   290,   291,   292,   293,   294,   295,   296,
-     801,  1169,  1170,  1753,  1754,   297,   848,   298,   784,   299,
-     785,   300,  1147,   301,   302,   303,   304,   305,  1107,  1108,
-     306,   766,   307,   308,   309,   685,   686,   310,   311,  1419,
-    1686,   719,   312,   313,   780,   314,   315,   316,   317,   318,
-     319,   320,  1244,  1245,   321,  1177,  1761,  1762,  2335,   322,
-    1724,  2176,  2177,  1763,   323,  2582,   324,   325,   326,   327,
-    1253,   328,   329,   330,   331,   332,   333,  1210,  1808,   866,
-    1786,  1787,  1788,  1812,  1813,  1814,  2368,  1815,  1816,  1789,
-    2212,  2480,  2357,   334,  1216,  1836,   335,   336,   337,   338,
-    1200,  1790,  1791,  1792,  2363,   339,  1218,  1840,   340,  1206,
-    1795,  1796,  1797,   341,   342,   343,  1212,  1830,   344,   345,
-     346,   347,   348,   349,   350,   351,   352,   353,   354,   355,
-     356,   357,   358,  1801,  1802,   867,  1527,   359,   360,   361,
-     362,   363,   364,   877,   878,   879,  1228,  1229,  1230,  1235,
-    1846,  1847,   365,   366,   367,  1241,  1242,   368,   883,   884,
-     885,   369,   370,   371,   372,   373,  2263,  2264,  2441,  2443,
-     374,  1256,  1257,  1258,  1259,  1260,  1261,  1262,  2079,  2080,
-    1264,  1265,  1266,  1267,  1268,  1270,  1271,  2094,   900,  2092,
-     375,  1274,  1275,  2098,  2099,  2104,   561
-};
-
-  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-     positive, shift that token.  If negative, reduce the rule whose
-     number is the opposite.  If YYTABLE_NINF, syntax error.  */
-static const yytype_int16 yytable[] =
-{
-     413,   825,  1105,   682,  1401,   833,   834,   835,   836,   821,
-     697,   708,   678,   874,  1475,  1252,  1720,  1092,  1251,  1645,
-     978,  1008,  1008,  1350,  1254,   747,  1306,  1894,  1012,  1927,
-     571,   425,   425,   720,   646,  2178,   982,  1755,   433,   646,
-    1748,  2202,  1625,   735,  1237,   738,  2086,  1487,  2088,   647,
-     741,   742,   743,  1778,   647,  1357,   440,   796,   744,  1081,
-    2265,   746,  1190,   748,  1658,  1630,  1897,   460,   479,   946,
-     751,  1899,   482,   653,  1377,  1974,   657,   659,  1430,   462,
-    -564,   427,  1189,  1913,  1917,  1822,   405,   777,   816,  1932,
-    1811,   405,  1821,   797,  1834,   970,   477,  2128,  -566,  1959,
-     405,   793,  1063,  1823,  2341,  1476,   798,   804,  1770,     8,
-     806,  1824,   809,  1825,  1826,  1007,  1007,   701,   905,  -542,
-       2,     3,  2359,  1828,   504,   828,  1347,  1347,  1799,  1829,
-    1571,  1615,  1616,  1378,   906,  2594,  1817,   843,  1827,   846,
-    1835,   996,  1547,  1455,   424,  -585,   852,  1025,  1396,   376,
-    1794,  1251,  1508,  1605,   574,  1064,   378,   671,  -594,   672,
-    1919,   598,   384,  1981,  1982,  1983,   728,  1550,  -528,   424,
-    -594,  1202,   391,  1496,  1415,   393,  2141,   408,   396,  1919,
-    1920,  1921,  1456,  1065,   600,   402,   886,  1775,  -564,   409,
-     737,  -595,   972,   412,   585,  -138,   905,   702,   687,  -566,
-    -142,  -588,  2266,  -595,  1467,  1468,   985,  1621,  2142,   -62,
-    2483,   431,  -566,  -588,   753,   435,   436,   811,   408,  1232,
-     424,   441,   442,  1066,  1780,  1001,   500,   447,   448,  1312,
-     450,   451,   452,   453,  1067,   454,  -592,  1469,  2267,  1858,
-     815,  -585,   424,   791,   463,  1771,   972,  -340,  -592,   467,
-     799,   469,   646,   424,  1477,   472,  1457,   981,  2360,   476,
-    -542,   478,  1068,  -340,  1622,  1223,  -594,   647,   484,  1088,
-       4,  2595,   488,   989,   424,  2436,   491,   991,   493,  1106,
-     598,   424,  -528,  1163,   998,   501,   503,   621,   810,   505,
-     506,  -340,  1516,   424,  1922,   512,   996,   513,  1572,  -595,
-    1551,   517,   443,  1552,   424,  2134,  2135,  2283,  2081,  -588,
-    2133,  2085,  2361,  1922,  1036,  1782,  1623,  1573,   931,   424,
-     424,  1975,  1712,  2362,   857,  1041,   971,   424,   544,  -564,
-     546,   424,   424,  1072,  1168,   698,  -138,   551,   552,   424,
-    -566,  -142,  1044,   424,  -592,   673,   676,  1093,  1658,   699,
-     -62,   683,   684,   688,   684,  1069,   692,   694,  1051,   510,
-     700,  2178,   704,   706,   706,   709,  2129,  1008,   712,  1901,
-    1903,   716,   598,   712,  1351,  -383,  2131,     5,   727,  1610,
-    1811,   732,  -585,   712,   915,   712,  1822,  1559, -1116,   425,
-     712,   712,   712,  1821,   927,   928,   929,   930,   712,  1834,
-     745,   712,  1513,   712,  1823,  1447,  2087,  -594,  2365,   756,
-     757,  1704,  1824,  1507,  1825,  1826,   768,   770,   646,  1651,
-    1165,   776,   646,  1515,  1828,   511,  1817,   598,   783,   646,
-    1829,   787,  1719,   647,  1002,  1158,  1185,   647,   740,  1827,
-    -595,  2182,   829,   800,   647,  1835,   807,  1664,  1666,  1668,
-    -588,   972,   727,   817,   819,   819,  1606,   823,   800,   997,
-     572,  1375,   999,  1621,   831,   831,   831,   831,   831,  1564,
-     841,  1442,  1008,   845,  2037,   847,   783,  1565,  1464,   850,
-   -1141,   996,   853,   996,  1026,  -592,   858,   592,   594,  1187,
-     996,   567,  1685,   599,  1566,   598,  2497,   876,  1892,  1893,
-    1197,  -590,  1749,   598,  1349,  2366,  1236,  1045,  2596,  1304,
-    2561,  2562,   575,  -590,  1780,   875,  2367,  1219,  2537,   424,
-    1622,  2228,  2469,   911,  2290,  2291,   593,  2288,  2498, -1116,
-     917,  1781,   598,   899,   598, -1063,  2076,  2597,   576,   621,
-     598,   907,  2529,  1305,   912,   913,   914,   700,   698,   902,
-     903,   724,   920,   921,  1283,  -528,   926,   700,   700,   700,
-     700,   918,   699,  2192,   934,   935,  1007,  2205,  1307,   424,
-    1897,  2209,  1623,   598,   951,  1899,   598,   601,   952,   598,
-     646,   598,   598,  1098,   598,  2285,  1310,  1110,  1910,   621,
-    1340,  1742,  1809,  2465,  1819,   647,  1832,  2598,  1838,  2529,
-     598,   598,   577, -1152,  1155,  1782,   967,  2304,  1783,  -590,
-    1157, -1168,  1159,  2539,   424,  1311,  1810,  1911,  1820,  1021,
-    1833, -1141,  1839,   578,  1365,  1366,  1367,  1368,  1369,   584,
-     716,  1014,   768,   823,   817,   704,  1019,  1032,   591,   847,
-   -1171,  1625, -1105,  1567,  1568,  1585,  2127,   700, -1135,  1184,
-     996,   972,  1186,  -528,   424,   851,  1381,  1233,  1233,   992,
-    2576,  1382,   981,   993,  1630,   712,  1156,  -528,  1043,  2596,
-     700,   791,  1418,   424,  2583,  1023, -1063,  2393,  2139,  2140,
-    1008, -1115,  1859,  2287, -1140,  1251,  1643, -1062,  1024, -1151,
-   -1167,   995, -1170,  1060,  -384,  1105,  1105,   911,  2597,  1842,
-    1843,  1844,  1422,  1848,  1849,   922,  1560,  1092, -1104, -1134,
-    -383,  2610,  2612,  -384,  1100,   923,   637,  1803,  1082,  1803,
-    1087,  1743,   970,  1089,  2616,   973,  2343,  1357,  1134,  1664,
-    1666,  1668,  1586,   587,  -385,  1139,  1103,  2344,  2345,  1145,
-    1008,  1008,  1008,  2346, -1152,  2347,  1133,  1587,  1588,  1589,
-    -590,  1384, -1168,  -388,  2348,  1140,  2349,  1141,  2350,  1759,
-     405,  2175,  1148,   588,  1151,   976,  1964,   700,   406,   646,
-     646,   646,   646,   646,  1007,  1385,  1644,  1002,  1002,  1053,
-     673, -1171,   589, -1105,   647,   647,   647,   647,   647, -1135,
-    1386,  1103,  1054,   579,   580,  1387,  1388,   700,  -386,   590,
-    1061,  1192,  1389,  1705,   791,  1706,  1181,  2235,  2446,  2236,
-     976,    25,   700,  1062,  1293,   700,    29,  1294,  2237,  1182,
-    2238,  1193, -1115,  2435,  1780, -1140,  1780,   791, -1062,  1279,
-   -1151, -1167,  1238, -1170,  1663,  1665,  1667,  1243,    47,    48,
-    1352,  1781,  1280,  1781,  1884,   595,  1255,  1263,  1269, -1104,
-   -1134,  1273,  1885,  1353,  1358,  1240,  2127,   996,   996,   996,
-     996,   996,   951,  1407,   596,  1443,   952,  1359,  1759,  1592,
-     597,  1276,   845,   953,   954,  2479,  1408,  2425,  1693,  -231,
-    2351,    50,  1809,  2352,  1278,   652,   598,  1301,  2139,  2140,
-    1411,  1316,    90,  -528,   967,  1819,  -793,  -793,  1804,  1302,
-    1804,  1832,    95,  1412,   660,  1838,  1810,  2380,  1439,  1313,
-     581,   972,  2381,  1461,   424,  1782,  -853,  1782,  1783,  1820,
-    1783,  1440,  1805,  1784,  1805,  1833,  1462,  1598,  1479,  1839,
-     650,  1785,  1806,   661,  1806,   658,  1390,  1807,  1030,  1807,
-    1697,  1480,  1699,  2239,  2240,  1604,  2241,  2242,   121,   662,
-    2463,  1482,  1485,  2119,  2120,  2121,  2122,  2123,  1203,  1204,
-    2235,  1207,  2236,  2391,  1483,  1486,  2461,  1391,  2353,  1023,
-    1499,  2237,  1653,  2238,  1395,   663,  1654,  2243,  1656,   668,
-     669,   118,  1493,  1500,  1251,  1220,  1221,   664,   122,  1553,
-    1601,  1602,   673,  2091,  2115,  2318,  1251,  1561,  1399,  2089,
-    2090,  1507,  1554,  2011,   688,   665,    46,  2100,  2101,   666,
-    1562,  1392,   667,  1651,   670,  2084,   405,   709,  1222,  2244,
-    1673,  1482,  1008,  1008,  1008,  1770,  2354,  2355,  2356,  2157,
-     679,  2299,  2245,  1681,  1563,  2162,  1569,  1685,   721,    74,
-    1574,  2536,  1432,   911,  1692,  1875,  1876,   732,   680,  1570,
-    1941,  1458,   681,  1575,  2067,  2068,  2535,  1347,  1347,  1347,
-    1347,  1347,  1582,   757,  1303,  1576,  1703,  1284,  1577,  1578,
-    1579,   695,    96,  1590,  1700,  1583,  2156,  1671,   770,  1251,
-     992,  1580,  1581,   703,   993,  1415,  1591,  2139,  2140,  2319,
-    1672,   642,   643,  1249,  1053,  1481,  2239,  2240,   994,  2241,
-    2242,  1507,   109,  1507,  1722,   715,  1675,  1677,  1352,  1780,
-    1285,   730,   995,   718,  1611,  1199,  1947,  1665,  1667,  1205,
-    1683,  1680,   736,  1455,  1211,   749,  1781,  1215,  1217,   754,
-    2243,  1687,   764,  1684,   767,   602,   639,   774,  1511,   788,
-     640,  1713,  1287,   775,  1688,  1734,   641,   642,   643,   778,
-    1002,  1774,  1223,  1224,  1714,   781,  1225,  1226,   616,   782,
-    1766,  1249,  1771,  2320,  1383,   786,  1288,   618,  1289,   603,
-    1902,  1904,  2244,  1767,  1769,  2321,  1411,  2322,  2323,  1857,
-    2324,  1542,  1055,  2325,  1056,  2245,  1308,   611,  1309,  1957,
-     790,   612,   613,   614,   615,   619,  1555,  1556,  1557,  1249,
-    1782,  1290,    25,  1783,   616,  1249,  1291,    29,  1784,   794,
-    1292,   617,  1978,   618,  1293,  1461,  1785,  1294,  1984,  2019,
-     795,   729,  1584,   620,  1499,  2273,  2274,  2023,  1985,    47,
-      48,   882,  2020,  1354,   609,   610,  1457,  2021,   611,  1295,
-    2024,   619,   612,   613,   614,   615,   822,  1593,   907,  2038,
-     830,  2040,  2041,  1296,  1732,   616,   855,  2049,   856,  1297,
-     644,   859,   617,  2045,   618,   861,  2069,  1939, -1191,   620,
-    2050,  1603,  2299,  2052,  2326,  2054,  2327,   700,   992,  2070,
-     621,  1313,   993,    90,   880,  2116,  2136,  -588,  1944,   642,
-     643,  1955,   619,    95,  1363,  2167,   994,  1779,  2117,  2137,
-    1936,  1371,  1372,  1961,   881,  2420,   424,  1963,  2168,  1544,
-     995,  1951,  1544,  1233,  1233,  1233,  1544,  1233,  1233,   904,
-     620,  1850,  2172,  2147,  1549,  2173,   621,  2232,   887,  2174,
-     894,  1977,   622,   860,  1544,   862,   895,  2227,   791,   121,
-    2233,  1284,   863,   864,   865,  2249,  1544,  2234,   868,   869,
-     870,   871,  1669,   872,   873,  1610,  1251,   424,  2250,  2252,
-     992,  1766,  1499,   896,   993,  2292,  2293,  2294,  1766,   916,
-    1097,   642,   643,  1993,  2253,  2254,  1482,   621,   622,  2378,
-    2399,  2255,  1251,   150,  1285,   897,  1482,  2258,  2268,  2256,
-    1286,  1482,   995,   943,   985,  1695,  1695,   898,  1695,  2257,
-    2259,  2269,  2605,  2606,  2270,  1482,   712,   901,  1082,  2276,
-    1082,  2514,  2515,  1707,   919,  1360,  1287,   972,  2271,  1361,
-     611,   625,  2277,   973,   612,   613,   614,   615,   974,   622,
-    1599,  1213,  1214,   646,  1002,   975,   996,   616,  2313,  1544,
-    1288,   976,  1289,  1746,   617,  1730,   618,   990,   647,   979,
-    1181,  2314,  2316,  1499,  1151,  1523,  1948,  1949,  1950,  1544,
-    1744,  1526,  1772,  2337,  1773,  1529,  2339,  1531,  1529,  1529,
-     700,  1533,  2371,  1535,   619,  1290,  1000,  2382,   811,  2382,
-    1291,  1020,  1029,  2396,  1292,  2429,  1035,  1776,  1293,  1845,
-    2383,  1294,  2384,  1233,  1233,  1233,  2397,  1031,  2430,  1607,
-    1033,  2136,   620,  1243,   611,  1042,  1048,  2456,   612,   613,
-     614,   615,  1249,  1295,  2448,  1052,  1499,  2560,  1240,  1255,
-    2457,   616,   408,  1076,  1263,  2472,  1759,  1296,   617,  2475,
-     618,   611,  1269,  1297,  2477,   612,   613,   614,   615,   424,
-    1273,  1073,   803,   642,   643,  1078,   970,  2478,   616,  1461,
-    1134,  1094,  1890,  1499,   616,   617,  1095,   618,   619,   621,
-    1766,  2525,  2501,   618,  1883,  1096,  2503,  2509,  2249,  2422,
-    1101,  1109,   951,  2505,  2249,  1111,   952,  1164,  2158,  1138,
-    2510,  2542,  1175,   953,   954,   619,   620,  2543,  2551,   955,
-     956,   619,   958,  2160,  1912,   960,   961,   962,   963,   964,
-    1178,  2552,   966,  1179,   967,   968,  1188,  1923,  2553,  1461,
-    1191,   622,  1499,   620,  1194,  1181,  2147,  1202,  1208,   620,
-    1249,  2554,  2556,   424,   779,  2557,  1707,  1166,  2558,  1707,
-    1707,  1707,  1231,  2573,  1249,  1272,  1281,   791,  1233,  1952,
-    2382,  1233,  2382,   621,  2204,  1105,   598,  2464,  1507,   791,
-     424,  1317,  2297,  2574,  1473,  2575,   644,   611,  1320,   826,
-     985,   612,   613,   614,   615,   952,  1341,  1682,   992,   838,
-     621,   712,   993,  1342,   616,  2579,   621,   993,   951,   642,
-     643,   617,   952,   618,  1370,  -343,   994,  1373,  2580,   953,
-     954,  1986,  1379,  2599,  1647,   622,   956,  1380,   958,  1410,
-     995,   960,   961,   962,   963,   964,  2600,  2615,  2512,  1089,
-     967,   619,  1400,   562,   563,   564,   565,   566,  1402,  1424,
-    1425,  1426,   622,   888,   889,   890,   891,   893,   622,  2340,
-    1427,  1428,   791,  1429,  2534,  1105,  2281,   951,   791,   620,
-    1438,   952,  1740,  2030,  2031,  1441,  2284,  1444,   953,   954,
-    1446,  1450,  -936,  1459,   955,   956,  1460,   958,  1471,  1478,
-     960,   961,   962,   963,   964,  1465,  1494,   655,  2048,   967,
-    1497,  1233,  1466,  1470,  1484,  1498,   424,   641,   642,   643,
-    1501,  1502,   945,   947,   948,  1503,   949,  1504,  2534,   616,
-    1512,  1514,  1521,   950,  1055,  1524,   621,   992,   618,   611,
-    1536,   993,  1537,   612,   613,   614,   615,   826,   642,   643,
-    1538,  1539,  2082,  1489,  1540,   994,   616,  1541,  1544,  1545,
-    1240,  1546,  1549,   617,  1595,   618,   619,  2097,   922,   995,
-    1600,  2103,  2414,  2415,  1638,  1614,  1615,  1616,  1641,  1646,
-    1647,  1652,   376,  1657,  1660,  1661,  1662,  1617,   622,  1028,
-    1670,  1233,  1676,   619,   620,   406,  1618,   752,   985,  1693,
-    1702,  1716,  1710,  1715,  1038,  1717,  1718,  1456,  1734,  1729,
-    1741,  1750,  1423,  1768,  1851,  1860,  1855,  1854,  1861,  1619,
-      25,   620,  1862,  1431,  1620,    29,   752,  2130,  1923,  1923,
-    1923,   644,  1059,   752,  1863,  1864,  1866,  1856,  1867,  1075,
-    1923,   812,  1868,  1870,  1871,  1079,  1080,    47,    48,  1872,
-    1873,   621,  1621,  1877,  1878,  1879,  1880,  1881,   424,  1887,
-    1889,  1895,  2460,  2462,  2170,  2398,   611,   688,  1905,  1906,
-     612,   613,   614,   615,  1907,  1915,  1908,  1233,   621,  1909,
-    1918,   569,  1931,   616,  2113,  1936,  2185,  1937,  1933,   611,
-     617,  1137,   618,   612,   613,   614,   615,  1956,  1958,  1969,
-    1973,    90,  1970,   622,  1971,  1987,   616,  1988,  -495,  1622,
-    1994,    95,  1996,   617,  1995,   618,  1495,  2013,  2014,  2017,
-     619,  1744,  2016,  2018,  2028,  1952,  2025,  2193,  2029,  1771,
-     622,  1770,  2213,  2035,  2036,  2039,  2042,  2203,  2051,  2053,
-    2055,  2219,  2074,   619,  2208,  1776,   621,  2075,   620,   791,
-    1522,  2064,  2065,   932,  2066,  2071,  1525,   121,  2072,  1845,
-    1528,  1623,  1530,  2077,  1195,  1196,  1532,  2404,  1534,  2095,
-    2096,   620,   611,  2105,  2110,   791,   612,   613,   614,   615,
-    2118,  -382,  2125,  2126,  2143,   424,  2138,  2146,  2207,   616,
-     570,  2149,  2151,  2275,  2152,  2150,   617,  2153,   618,  2154,
-     983,   150,  2155,  2165,   984,   621,  2171,  2187,   424,  2189,
-     803,   642,   643,  2230,  2231,  2251,  2278,   752,  2261,  2279,
-    -225,  2303,   616,  2311,  2330,  2286,   619,  2317,   621,  2331,
-    2332,   618,  2333,  2334,  -844,  2336,  1912,  2338,  2358,  2364,
-    2372,  2375,  2387,  2376,  2388,  1923,  2390,  1923,  1923,  1923,
-    1923,  1923,  1923,  2394,   620,  2401,  2400,   622,  2309,   619,
-    1321,  1322,  1323,  1324,  1325,  1326,  1327,  1328,  1329,  1330,
-    1331,  1332,  1333,  1334,  1335,  1336,  1337,  1338,  1339,  2408,
-     622,  2410,  2411,  2412,  2413,   826,  2416,   620,  2417,  2418,
-    1355,   424,  2434,  1233,  2424,  2428,  2432,  1362,  2433,  1364,
-    2438,  2440,  2442,  2445,  2447,  2473,  2476,   802,  2484,  1085,
-    2486,   621,  2492,  2494,  1374,   819,  2031,   803,   642,   643,
-    2500,  2502,  2504,  2513,   644,  2508,  2517,  1104,  2523,   616,
-    2520,  2530,  2521,  2531,  2522,  2563,  2541,  2544,   618,  2377,
-     893,  1136,  2546,  2547,   621,  1233,  1405,  2555,  2577,  1142,
-    1143,  2571,  2581,  2586,  1149,  2601,  2602,  2603,  2097,  2614,
-    1277,   985,  1059,   622,  2596,  1594,   619,   582,  2111,  1282,
-    2190,  1888,  1517,  1454,   924,  2389,  1891,  2112,   933,   936,
-    1613,  1916,  1104,  1049,  2392,  1701,  1314,  2289,  2132,  1315,
-    1176,  2124,  1757,  2282,   620,  1923,   622,  2012,  1492,  2329,
-    1473,  2519,  2188,   611,  1739,  2342,  1403,   612,   613,   614,
-     615,  1420,  1689,  1674,  1449,  1979,   439,  2613,  1980,  1198,
-     616,  1201,  2148,  2161,  1050,  1709,  1679,   617,   792,   618,
-    1409,   644,   831,   831,  1736,  1942,   604,   605,  1154,  1943,
-     752,   752,  2193,   606,  1376,  1435,  1013,  1474,   607,  1463,
-    1510,   621,  1183,  1016,  1250,  1149,  1015,   619,  1018,  1017,
-    2421,  1691,  1694,  2308,  2566,  1488,  2191,  2450,  1162,  1413,
-    1394,  1393,  2548,  1448,  1793,  2159,  2496,  1798,  1404,  1146,
-    1818,   765,  1831,  2186,  1837,   620,  1841,  2459,   893,  1509,
-     838,  2567,    13,    14,  2585,    15,    16,  2607,  2427,  1756,
-      20,  2609,  2026,   622,  1022,  1721,  2198,   691,    23,  2452,
-    1102,  2163,   849,    27,  2474,   739,    30,  1853,  2199,  1103,
-    1103,  2403,   424,  2482,    37,  2057,    38,  2061,    40,  2063,
-    2487,  2044,  2488,  2047,  1346,  1346,  2431,  2059,  2218,  2216,
-    1548,  1543,   621,  2226,  2439,  2073,  1239,  1852,  1865,  2374,
-    1869,    59,   951,  1874,  2489,  1882,   952,   611,  1558,   985,
-     752,   752,    70,   953,   954,  2385,  2082,  2082,     0,   955,
-     956,   957,   958,   959,     0,   960,   961,   962,   963,   964,
-     965,     0,   966,     0,   967,   968,    85,  1250,    13,    14,
-       0,    15,    16,     0,   622,     0,    20,     0,     0,    93,
-       0,     0,     0,     0,    23,     0,     0,     0,     0,    27,
-    1414,     0,    30,     0,  1609,     0,     0,   102,     0,     0,
-      37,     0,    38,   104,    40,     0,  1642,     0,     0,     0,
-       0,   108,  2489,   110,  2549,   112,     0,   114,     0,     0,
-       0,     0,     0,     0,   119,     0,     0,    59,   752,     0,
-       0,     0,     0,     0,  1649,     0,     0,     0,    70,     0,
-       0,   130,   131,     0,     0,     0,  1655,     0,     0,     0,
-       0,  2587,     0,     0,     0,     0,  2588,     0,     0,   143,
-       0,     0,    85,     0,     0,     0,   608,     0,     0,  2588,
-       0,  2608,  2611,     0,     0,    93,     0,     0,     0,     0,
-     155,     0,     0,   156,  2611,     0,     0,     0,     0,     0,
-       0,     0,     0,   102,     0,  1678,  1038,     0,     0,   104,
-       0,     0,     0,     0,     0,     0,     0,   108,     0,   110,
-    1690,   112,     0,   114,     0,     0,     0,  1698,  1104,     0,
-     119,  2043,     0,     0,     0,     0,  2046,   893,     0,     0,
-       0,     0,     0,  1708,     0,  1711,     0,   130,   131,  2056,
-       0,     0,     0,   837,     0,     0,   611,     0,   893,     0,
-     612,   613,   614,   615,     0,   143,     0,     0,     0,     0,
-       0,  2058,  1726,   616,     0,     0,     0,  2060,     0,     0,
-     617,  2062,   618,  1738,   837,     0,   155,   611,     0,   156,
-       0,   612,   613,   614,   615,     0,  1752,     0,     0,  1037,
-       0,  1758,   611,  1764,   616,     0,   612,   613,   614,   615,
-     619,   617,     0,   618,     0,     0,     0,     0,     0,   616,
-       0,     0,  1473,     0,  2201,   611,   617,     0,   618,   612,
-     613,   614,   615,     0,     0,     0,     0,  1725,   620,     0,
-     611,   619,   616,     0,   612,   613,   614,   615,     0,   617,
-       0,   618,     0,     0,     0,     0,   619,   616,     0,  1612,
-       0,     0,     0,     0,   617,     0,   618,     0,     0,   620,
-       0,     0,     0,  1751,     0,   424,   611,     0,     0,   619,
-     612,   613,   614,   615,   620,     0,     0,     0,     0,     0,
-       0,     0,   951,   616,   619,   621,   952,     0,     0,     0,
-     617,     0,   618,   953,   954,     0,   424,   620,     0,  1896,
-     956,     0, -1192,     0,     0, -1192, -1192, -1192, -1192, -1192,
-       0,   424,   620,   752,   967,     0,   621,     0,     0,     0,
-     619,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   621,     0,     0,   424,     0,     0,   622,     0,     0,
-    1940,   826,  1355,     0,     0,     0,     0,     0,   620,   424,
-       0,     0,     0,     0,   621,     0,  2200,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,   622,   621,
-    2211,  1960,     0,     0,  1962,  2214,     0,     0,  2215,  1085,
-       0,  1085,  1966,   622,     0,   424,     0,     0,  2222,     0,
-    2223,     0,  2224,     0,  2225,     0,     0,     0,     0,     0,
-    1104,  1104,     0,     0,     0,   621,   622,     0,     0,     0,
-       0,  1723,     0,     0,  1989,     0,  1992,   752,     0,  1733,
-       0,   622,  1735,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   812,     0,     0,     0,  1104,  1104,
-       0,  1991,     0,     0,   611,     0,     0,     0,   612,   613,
-     614,   615,     0,     0,     0,     0,     0,   622,     0,     0,
-     752,   616,     0,     0,     0,     0,     0,  1800,   617,     0,
-     618,     0,     0,     0,     0,     0,   752,   752,   752,     0,
-     752,   752,   611,     0,   752,     0,   612,   613,   614,   615,
-     611,     0,     0,     0,   612,  1005,   614,   615,   619,   616,
-       0,  1250,     0,     0,     0,     0,   617,   616,   618,     0,
-       0,     0,     0,     0,   617,     0,   618,     0,     0,     0,
-       0,     0,     0,   951,     0,  1727,   620,   952,   611,     0,
-       0,     0,     0,     0,   953,   954,   619,     0,     0,  1728,
-     955,   956,   957,   958,   619,     0,   960,   961,   962,   963,
-     964,   965,     0,   966,     0,   967,   968,     0,     0,     0,
-       0,     0,  2093,   424,   620,  1914,     0,     0,     0,  2102,
-       0,     0,   620,  2106,  2107,     0,     0,     0,     0,     0,
-       0,  2114,     0,   621,     0,     0,     0,  1112,     0,     0,
-       0,  1113,   611,     0,     0,     0,     0,   752,  1114,  1115,
-       0,   424,     0,     0,  1116,  1117,  1118,  1119,     0,   424,
-    1120,  1121,  1122,  1123,  1124,  1125,  1126,  1127,     0,  1128,
-    1129,   621,  2145,     0,     0,     0,     0,     0,  1649,   621,
-       0,     0,     0,     0,     0,   622,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,  2164,     0,     0,   752,   752,   752,     0,
-       0,     0,  2169,     0,     0,   951,     0,  1180,     0,   952,
-     611,     0,     0,   622,     0,     0,   953,   954,     0,  2179,
-    2180,   622,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,     0,   967,   968,     0,
-       0,     0,     0,     0,     0,     0,  1104,     0,  1752,     0,
-       0,     0,     0,     0,     0,     0,   838,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  2210,     0,   951,     0,
-       0,  1246,   952,   611,     0,     0,     0,     0,     0,   953,
-     954,     0,  2220,     0,  2221,   955,   956,   957,   958,     0,
-       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
-     967,   968,   951,     0,     0,  1247,   952,   611,     0,     0,
-       0,   969,     0,   953,   954,     0,     0,     0,     0,   955,
-     956,   957,   958,     0,     0,   960,   961,   962,   963,   964,
-     965,     0,   966,     0,   967,   968,     0,     0,     0,     0,
-    1250,   752,     0,     0,   752,   951,  1104,  1104,  1104,   952,
-    1149,  1149,  1250,     0,     0,     0,   953,   954,  1149,  1149,
-       0,     0,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,     0,   967,   968,  2296,
-       0,     0,     0,     0,  2298,  1346,  1346,  1346,  1346,  1346,
-       0,     0,     0,     0,   951,  2307,  1966,  1248,   952,   611,
-    2312,     0,     0,     0,     0,   953,   954,     0,     0,     0,
-    2315,   955,   956,   957,   958,     0,  2328,   960,   961,   962,
-     963,   964,   965,     0,   966,   951,   967,   968,  2260,   952,
-     611,     0,     0,     0,     0,  1250,   953,   954,     0,     0,
-       0,  1414,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,     0,   967,   968,     0,
-    2373,  1130,     0,     0,     0,   969,     0,     0,   951,     0,
-       0,     0,   952,   611,   752,  2183,     0,     0,     0,   953,
-     954,     0,     0,     0,  1319,   955,   956,   957,   958,  2379,
-       0,   960,   961,   962,   963,   964,   965,   812,   966,     0,
-     967,   968,     0,     0,  2386,     0,     0,     0,  1104,     0,
-    1609,     0,   969,     0,     0,   951,     0,     0,     0,   952,
-     611,     0,     0,     0,   969,     0,   953,   954,     0,  2217,
-       0,  1398,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,  2405,   967,   968,     0,
-       0,     0,     0,     0,   752,  2229,     0,     0,     0,     0,
-       0,   893,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   969,   969,   969,   969,   951,   969,
-    1406,     0,   952,   611,     0,     0,     0,     0,     0,   953,
-     954,     0,     0,     0,     0,   955,   956,   957,   958,     0,
-       0,   960,   961,   962,   963,   964,   965,  1914,   966,     0,
-     967,   968,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,  2449,  2298,     0,     0,  2451,     0,
-    2455,   969,     0,   969,   969,   969,   969,  2302,     0,     0,
-     752,     0,  2305,     0,     0,  2466,  2467,     0,  2471,     0,
-     951,     0,  1421,     0,   952,   611,     0,     0,  2481,     0,
-       0,   953,   954,     0,     0,     0,  2485,   955,   956,   957,
-     958,     0,     0,   960,   961,   962,   963,   964,   965,     0,
-     966,     0,   967,   968,     0,  2405,     0,     0,     0,     0,
-       0,     0,   969,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,  1250,  2518,   969,     0,     0,     0,     0,     0,
-       0,     0,  2524,  2526,   969,     0,     0,     0,     0,     0,
-     951,     0,     0,   838,   952,   611,  2538,     0,  1250,     0,
-    2540,   953,   954,     0,     0,   969,  1433,   955,   956,   957,
-     958,     0,     0,   960,   961,   962,   963,   964,   965,     0,
-     966,   969,   967,   968,     0,   969,   969,     0,     0,     0,
-       0,     0,     0,   893,     0,     0,     0,     0,     0,     0,
-    2526,     0,     0,     0,  2568,     0,     0,     0,  2572,     0,
-       0,     0,  1764,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,  1764,  2584,  2568,     0,
-       0,     0,     0,     0,  1104,   951,     0,     0,  1104,   952,
-     611,     0,     0,   969,     0,     0,   953,   954,     0,     0,
-       0,  1436,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,   951,   967,   968,     0,
-     952,   611,     0,     0,     0,   752,   752,   953,   954,     0,
-       0,     0,  1437,   955,   956,   957,   958,     0,     0,   960,
-     961,   962,   963,   964,   965,     0,   966,     0,   967,   968,
-       0,   969,   969,     0,     0,     0,     0,     0,     0,     0,
-    1104,  1104,  1104,  1104,     0,   951,     0,     0,  2183,   952,
-     611,     0,     0,     0,     0,     0,   953,   954,   752,     0,
-       0,  1472,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,     0,   967,   968,     0,
-       0,   951,     0,     0,     0,   952,   611,     0,     0,     0,
-       0,     0,   953,   954,     0,     0,     0,  1519,   955,   956,
-     957,   958,     0,  1104,   960,   961,   962,   963,   964,   965,
-       0,   966,     0,   967,   968,     0,     0,     0,     0,     0,
-       0,     0,     0,   951,     0,  1727,     0,   952,   611,  1104,
-    1104,     0,  1104,     0,   953,   954,     0,     0,     0,  2183,
-     955,   956,   957,   958,     0,     0,   960,   961,   962,   963,
-     964,   965,     0,   966,     0,   967,   968,   969,   969,   969,
-     969,   969,   969,   969,   969,   969,   969,   969,   969,   969,
-     969,   969,   969,   969,   969,   969,     0,     0,     0,     0,
-       0,     0,     0,  1104,     0,     0,     0,     0,     0,     0,
-       0,   969,     0,     0,     0,     0,     0,   951,   969,     0,
-     969,   952,   611,     0,     0,     0,     0,     0,   953,   954,
-     969,     0,     0,  1520,   955,   956,   957,   958,     0,     0,
-     960,   961,   962,   963,   964,   965,     0,   966,     0,   967,
-     968,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   969,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   380,   381,   382,   383,     0,
-     385,     0,   386,     0,   388,   389,     0,   390,     0,     0,
-       0,   392,     0,   394,   395,     0,     0,   397,   398,   399,
-       0,   401,     0,   403,   404,     0,     0,   411,     0,     0,
-       0,     0,   414,   415,   416,   417,   418,   419,   420,   421,
-       0,   422,   423,     0,     0,   428,   429,   430,     0,   432,
-     969,   434,     0,     0,   437,   438,     0,     0,     0,     0,
-       0,     0,   445,   446,   969,     0,   449,     0,     0,     0,
-       0,     0,     0,   455,     0,   457,     0,   458,   459,     0,
-       0,     0,   464,   465,   466,   969,     0,   468,     0,     0,
-     470,   471,     0,   473,   474,   475,     0,     0,     0,     0,
-     480,   481,     0,     0,   483,     0,   485,   486,   487,     0,
-     489,   490,     0,     0,   492,     0,   494,   495,   496,   497,
-     498,   499,     0,     0,     0,     0,     0,     0,   507,   508,
-     509,     0,     0,     0,   969,   514,   515,   516,     0,   518,
-     519,   520,   521,   522,   523,   524,   525,   526,   527,   528,
-     529,   530,   531,   532,   533,   534,   535,   536,   537,   538,
-     539,   540,   541,   542,   543,     0,   545,     0,   547,     0,
-     548,     0,   549,   550,     0,     0,   553,   554,   555,   556,
-     557,   558,   559,   560,   951,   969,     0,     0,   952,   611,
-       0,     0,     0,     0,     0,   953,   954,     0,     0,     0,
-    1659,   955,   956,   957,   958,     0,     0,   960,   961,   962,
-     963,   964,   965,     0,   966,     0,   967,   968,   969,     0,
-       0,     0,     0,     0,     0,   969,     0,     0,     0,     0,
-       0,   969,     0,     0,     0,     0,   638,     0,     0,   651,
-       0,   654,     0,     0,     0,   951,     0,     0,     0,   952,
-     611,     0,     0,     0,   969,     0,   953,   954,     0,     0,
-       0,  1934,   955,   956,   957,   958,   969,     0,   960,   961,
-     962,   963,   964,   965,   969,   966,     0,   967,   968,     0,
-       0,     0,     0,     0,   969,     0,     0,   969,     0,     0,
-       0,     0,   951,     0,     0,     0,   952,   611,     0,     0,
-       0,     0,   969,   953,   954,     0,     0,     0,  1972,   955,
-     956,   957,   958,     0,   969,   960,   961,   962,   963,   964,
-     965,     0,   966,     0,   967,   968,     0,   951,   969,  1990,
-       0,   952,   611,     0,   969,     0,     0,     0,   953,   954,
-     969,     0,     0,     0,   955,   956,   957,   958,     0,     0,
-     960,   961,   962,   963,   964,   965,     0,   966,   951,   967,
-     968,     0,   952,   611,     0,     0,     0,     0,     0,   953,
-     954,     0,     0,     0,  2022,   955,   956,   957,   958,     0,
-       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
-     967,   968,   951,     0,  2166,     0,   952,   611,     0,     0,
-       0,     0,     0,   953,   954,     0,     0,     0,     0,   955,
-     956,   957,   958,     0,     0,   960,   961,   962,   963,   964,
-     965,     0,   966,     0,   967,   968,   951,     0,  2181,     0,
-     952,   611,     0,     0,     0,     0,     0,   953,   954,     0,
-       0,     0,     0,   955,   956,   957,   958,     0,     0,   960,
-     961,   962,   963,   964,   965,     0,   966,   951,   967,   968,
-       0,   952,   611,     0,     0,     0,     0,     0,   953,   954,
-       0,     0,   969,  2272,   955,   956,   957,   958,     0,     0,
-     960,   961,   962,   963,   964,   965,     0,   966,     0,   967,
-     968,     0,     0,     0,   951,     0,     0,     0,   952,   611,
-       0,     0,     0,     0,     0,   953,   954,     0,     0,     0,
-    2280,   955,   956,   957,   958,     0,   969,   960,   961,   962,
-     963,   964,   965,     0,   966,     0,   967,   968,   951,     0,
-       0,     0,   952,   611,     0,     0,   969,     0,   969,   953,
-     954,     0,   969,     0,  2295,   955,   956,   957,   958,     0,
-       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
-     967,   968,     0,     0,     0,   969,     0,     0,   969,   951,
-       0,     0,  2306,   952,   611,     0,     0,     0,     0,     0,
-     953,   954,     0,   941,   942,     0,   955,   956,   957,   958,
-    1130,     0,   960,   961,   962,   963,   964,   965,     0,   966,
-     951,   967,   968,     0,   952,   611,     0,     0,     0,     0,
-       0,   953,   954,     0,     0,     0,  2310,   955,   956,   957,
-     958,     0,     0,   960,   961,   962,   963,   964,   965,     0,
-     966,   951,   967,   968,     0,   952,   611,     0,     0,     0,
-       0,     0,   953,   954,     0,     0,     0,  2369,   955,   956,
-     957,   958,     0,     0,   960,   961,   962,   963,   964,   965,
-       0,   966,     0,   967,   968,     0,     0,     0,   951,   969,
-       0,     0,   952,   611,     0,     0,     0,     0,   969,   953,
-     954,     0,   969,   969,  2370,   955,   956,   957,   958,     0,
-     969,   960,   961,   962,   963,   964,   965,     0,   966,   951,
-     967,   968,  2395,   952,   611,     0,     0,     0,     0,     0,
-     953,   954,     0,     0,     0,     0,   955,   956,   957,   958,
-       0,   969,   960,   961,   962,   963,   964,   965,     0,   966,
-       0,   967,   968,     0,     0,     0,     0,     0,     0,     0,
-     969,     0,   951,     0,     0,   969,   952,   611,     0,     0,
-       0,     0,     0,   953,   954,   969,   969,     0,  2402,   955,
-     956,   957,   958,     0,     0,   960,   961,   962,   963,   964,
-     965,     0,   966,     0,   967,   968,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,   969,   951,     0,     0,
-    2419,   952,   611,     0,     0,     0,   969,   969,   953,   954,
-       0,     0,     0,     0,   955,   956,   957,   958,     0,     0,
-     960,   961,   962,   963,   964,   965,     0,   966,   951,   967,
-     968,  2437,   952,   611,     0,     0,     0,     0,     0,   953,
-     954,     0,     0,     0,     0,   955,   956,   957,   958,     0,
-       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
-     967,   968,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   969,     0,   969,     0,     0,     0,     0,     0,
-       0,     0,   951,   969,     0,     0,   952,   611,   969,     0,
-       0,   969,     0,   953,   954,     0,     0,     0,  2444,   955,
-     956,   957,   958,     0,   969,   960,   961,   962,   963,   964,
-     965,     0,   966,   951,   967,   968,  2493,   952,   611,     0,
-       0,     0,     0,     0,   953,   954,     0,     0,     0,     0,
-     955,   956,   957,   958,     0,     0,   960,   961,   962,   963,
-     964,   965,     0,   966,     0,   967,   968,   951,     0,   969,
-       0,   952,   611,     0,     0,   969,     0,     0,   953,   954,
-       0,     0,   969,  2495,   955,   956,   957,   958,     0,     0,
-     960,   961,   962,   963,   964,   965,     0,   966,   951,   967,
-     968,   969,   952,   611,     0,     0,     0,     0,     0,   953,
-     954,     0,     0,     0,  2506,   955,   956,   957,   958,     0,
-       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
-     967,   968,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   969,     0,   969,     0,     0,
-       0,   969,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   969,   969,     0,     0,     0,   969,   951,     0,
-       0,  2507,   952,   611,     0,     0,     0,   969,     0,   953,
-     954,   969,     0,     0,     0,   955,   956,   957,   958,     0,
-       0,   960,   961,   962,   963,   964,   965,     0,   966,     0,
-     967,   968,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,   969,     0,     0,     0,     0,     0,
-     969,     0,   969,     0,     0,     0,   951,     0,     0,  2511,
-     952,   611,     9,     0,   969,     0,   969,   953,   954,    10,
-       0,     0,     0,   955,   956,   957,   958,     0,     0,   960,
-     961,   962,   963,   964,   965,     0,   966,     0,   967,   968,
-       0,     0,     0,     0,   969,     0,     0,     0,   969,    11,
-      12,    13,    14,     0,    15,    16,    17,    18,    19,    20,
-     969,     0,    21,    22,     0,     0,     0,    23,    24,    25,
-       0,    26,    27,    28,    29,    30,    31,     0,    32,    33,
-      34,    35,    36,    37,     0,    38,    39,    40,    41,    42,
-      43,     0,     0,    44,    45,    46,    47,    48,     0,     0,
-      49,    50,    51,    52,    53,    54,    55,    56,    57,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,    68,
-      69,    70,     0,    71,     0,    72,    73,     0,    74,    75,
-      76,     0,     0,    77,     0,     0,    78,    79,     0,    80,
-      81,    82,    83,     0,    84,    85,    86,    87,    88,    89,
-      90,    91,    92,     0,     0,     0,     0,     0,    93,    94,
-      95,    96,     0,     0,     0,     0,    97,     0,     0,    98,
-      99,     0,     0,   100,   101,     0,   102,     0,     0,     0,
-     103,     0,   104,     0,   105,     0,     0,     0,   106,   107,
-     108,   109,   110,   111,   112,   113,   114,   115,     0,   116,
-     117,   118,     0,   119,     0,   120,   121,     0,   122,     0,
-     123,   124,   125,   126,     0,     0,   127,   128,   129,     0,
-     130,   131,   132,     0,   133,   134,   135,     0,   136,     0,
-     137,   138,   139,   140,   141,     0,   142,     0,   143,   144,
-       0,     0,   145,   146,   147,     0,     0,   148,   149,     0,
-     150,   151,     0,   152,   153,     0,     0,     0,   154,   155,
-       0,     0,   156,     0,     0,   157,     0,     0,     0,   158,
-     159,     0,     0,   160,   161,   162,     0,   163,   164,   165,
-     166,   167,   168,   169,   170,   171,   172,   173,     0,   174,
-       0,     0,   175,     0,     0,     0,   176,   177,   178,   179,
-     180,     0,   181,   182,     0,     0,   183,   184,   185,   186,
-       0,     0,     0,     0,   187,   188,   189,   190,   191,   192,
-       0,     0,     0,     0,     0,     0,     0,   193,     0,   194,
-       0,   195,   196,   197,   198,   199,     0,     0,     0,   200,
-     201,   202,   203,   204,   205,   951,   206,   207,     0,   952,
-     611,   208,     0,     0,     0,     0,   953,   954,     0,     0,
-       0,  2516,   955,   956,   957,   958,     0,     0,   960,   961,
-     962,   963,   964,   965,     0,   966,   951,   967,   968,     0,
-     952,   611,     0,     0,     0,     0,     0,   953,   954,     0,
-       0,     0,  2545,   955,   956,   957,   958,     0,     0,   960,
-     961,   962,   963,   964,   965,     0,   966,   951,   967,   968,
-    2559,   952,   611,     0,     0,     0,     0,     0,   953,   954,
-       0,     0,     0,     0,   955,   956,   957,   958,     0,     0,
-     960,   961,   962,   963,   964,   965,     0,   966,     0,   967,
-     968,   951,     0,  2578,     0,   952,   611,     0,     0,     0,
-       0,     0,   953,   954,     0,     0,     0,     0,   955,   956,
-     957,   958,     0,     0,   960,   961,   962,   963,   964,   965,
-       0,   966,   951,   967,   968,     0,   952,   611,     0,     0,
-       0,     0,     0,   953,   954,     0,     0,     0,     0,   955,
-     956,   957,   958,     0,     0,   960,   961,   962,   963,   964,
-     965,     0,   966,     0,   967,   968
-};
-
-static const yytype_int16 yycheck[] =
-{
-      50,   489,   767,   381,  1031,   496,   497,   498,   499,   486,
-     390,   395,   378,   544,  1138,   894,  1460,   754,   894,  1340,
-     634,   659,   660,   975,   895,   433,   925,  1608,   660,  1638,
-     210,    62,    63,   404,   257,  1987,   638,  1498,    69,   262,
-    1494,  2027,  1311,   414,   881,   416,  1866,  1154,  1868,   257,
-     421,   422,   423,  1518,   262,   981,    76,   470,   429,   747,
-    2096,   432,   849,   434,  1373,  1311,  1614,    98,   118,   613,
-     436,  1614,   122,   259,  1005,     8,   262,   263,  1071,    99,
-       8,    63,   849,  1625,  1634,  1530,     7,   453,   483,  1639,
-    1528,     7,  1530,   471,  1532,    15,   116,  1915,    15,  1680,
-       7,   467,     5,  1530,  2206,   175,   472,   475,    71,   116,
-     476,  1530,   478,  1530,  1530,   659,   660,   391,     5,   116,
-       0,     1,    94,  1530,   144,   491,   974,   975,    37,  1530,
-      41,    16,    17,     8,    21,   182,  1528,   503,  1530,   505,
-    1532,   649,   191,   169,   129,    20,   512,   677,  1027,    15,
-     266,  1027,  1179,    15,   212,    58,    12,     5,     8,     7,
-      15,     8,    18,  1716,  1717,  1718,   409,   182,    15,   129,
-      20,   287,    28,  1166,  1050,    31,     5,    15,    34,    15,
-      16,    17,   208,    86,   242,    41,   552,   172,   116,    45,
-      15,     8,     3,    49,   225,   116,     5,   391,     8,   116,
-     116,     8,   315,    20,   147,   148,   166,    92,    37,   116,
-      21,    67,   129,    20,   437,    71,    72,    15,    15,    21,
-     129,    77,    78,   126,   191,    15,    15,    83,    84,    15,
-      86,    87,    88,    89,   137,    91,     8,   180,   351,  1560,
-     483,   116,   129,   466,   100,   208,     3,   129,    20,   105,
-     473,   107,   475,   129,   324,   111,   282,   637,   230,   115,
-     257,   117,   165,   129,   149,   314,   116,   475,   124,    26,
-     150,   318,   128,   641,   129,  2377,   132,   645,   134,   767,
-       8,   129,   129,   813,   652,   141,   142,   149,   480,   145,
-     146,   129,  1191,   129,   149,   151,   804,   153,   209,   116,
-     315,   157,    64,   318,   129,  1920,  1921,  2125,  1861,   116,
-    1919,  1864,   284,   149,   694,   282,   201,   228,   592,   129,
-     129,   254,  1446,   295,   516,   696,   246,   129,   184,   257,
-     186,   129,   129,   728,   822,    23,   257,   193,   194,   129,
-     257,   257,   700,   129,   116,   376,   377,   755,  1657,    37,
-     257,   382,   383,   384,   385,   258,   387,   388,   716,    15,
-     391,  2313,   393,   394,   395,   396,  1916,  1005,   399,  1615,
-    1616,   402,     8,   404,   976,     3,  1918,   257,   409,  1305,
-    1818,   412,   257,   414,   578,   416,  1831,    15,   116,   420,
-     421,   422,   423,  1831,   588,   589,   590,   591,   429,  1837,
-     431,   432,  1189,   434,  1831,  1093,  1867,   257,   191,   440,
-     441,  1438,  1831,  1178,  1831,  1831,   447,   448,   641,  1345,
-     815,   452,   645,  1190,  1831,     8,  1818,     8,   459,   652,
-    1831,   462,  1459,   641,   657,   803,   844,   645,   420,  1831,
-     257,  1994,   492,   474,   652,  1837,   477,  1378,  1379,  1380,
-     257,     3,   483,   484,   485,   486,  1304,   488,   489,   651,
-      15,  1005,   654,    92,   495,   496,   497,   498,   499,   183,
-     501,  1085,  1110,   504,    26,   506,   507,   191,  1110,   510,
-     116,   989,   513,   991,   678,   257,   517,   232,   233,   847,
-     998,   257,  1418,   238,   208,     8,   148,   547,  1605,  1606,
-     858,     8,  1495,     8,    64,   288,    21,   701,   128,   922,
-    2546,  2547,     8,    20,   191,   546,   299,   875,  2504,   129,
-     149,  2074,  2418,   573,  2139,  2140,     8,  2136,   180,   257,
-     580,   208,     8,   564,     8,   116,  1857,   157,     8,   149,
-       8,   572,  2494,   923,   575,   576,   577,   578,    23,   569,
-     570,   407,   583,   584,   912,    37,   587,   588,   589,   590,
-     591,   581,    37,  2017,   595,   596,  1110,  2028,   926,   129,
-    2118,  2036,   201,     8,     5,  2118,     8,     7,     9,     8,
-     803,     8,     8,   763,     8,  2127,     8,   773,     8,   149,
-     970,    47,  1528,  2413,  1530,   803,  1532,   217,  1534,  2551,
-       8,     8,     8,   116,   798,   282,    37,  2160,   285,   116,
-     802,   116,   804,  2509,   129,    37,  1528,    37,  1530,   669,
-    1532,   257,  1534,     8,   992,   993,   994,   995,   996,     8,
-     661,   662,   663,   664,   665,   666,   667,   687,     8,   670,
-     116,  1910,   116,   357,   358,   244,  1915,   678,   116,   843,
-    1158,     3,   846,    23,   129,   511,  1014,   880,   881,     5,
-    2563,  1019,  1042,     9,  1910,   696,    18,    37,   699,   128,
-     701,   894,  1052,   129,  2577,     8,   257,  2286,    16,    17,
-    1318,   116,  1561,    21,   116,  1561,  1318,   116,    21,   116,
-     116,    37,   116,   724,     3,  1460,  1461,   747,   157,  1536,
-    1537,  1538,  1060,  1540,  1541,     5,    15,  1444,   116,   116,
-       3,  2601,  2602,     3,   764,    15,    15,    84,   749,    84,
-     751,   177,    15,   754,  2614,    15,     5,  1653,   778,  1660,
-    1661,  1662,   331,     8,     3,   785,   767,    16,    17,     8,
-    1378,  1379,  1380,    22,   257,    24,   777,   346,   347,   348,
-     257,    43,   257,     3,    33,   786,    35,   788,    37,     5,
-       7,     7,   793,     8,   795,    15,  1692,   798,    15,   992,
-     993,   994,   995,   996,  1318,    67,  1320,  1000,  1001,     8,
-     811,   257,     8,   257,   992,   993,   994,   995,   996,   257,
-      82,   822,    21,     7,     8,    87,    88,   828,     3,     8,
-       8,   851,    94,  1439,  1027,  1441,     8,    22,  2389,    24,
-      15,    63,   843,    21,   191,   846,    68,   194,    33,    21,
-      35,   852,   257,  2376,   191,   257,   191,  1050,   257,     8,
-     257,   257,   882,   257,  1378,  1379,  1380,   887,    90,    91,
-       8,   208,    21,   208,    18,     8,   896,   897,   898,   257,
-     257,   901,    26,    21,     8,   886,  2125,  1365,  1366,  1367,
-    1368,  1369,     5,     8,     8,  1088,     9,    21,     5,  1277,
-       8,   902,   903,    16,    17,  2428,    21,  2338,    15,     7,
-     159,    95,  1818,   162,   904,    15,     8,   918,    16,    17,
-       8,   941,   144,    15,    37,  1831,     7,     8,   265,   919,
-     265,  1837,   154,    21,     8,  1841,  1818,   354,     8,   940,
-     124,     3,   359,     8,   129,   282,     8,   282,   285,  1831,
-     285,    21,   289,   290,   289,  1837,    21,  1285,     8,  1841,
-     257,   298,   299,     8,   299,   262,   228,   304,   683,   304,
-    1427,    21,  1429,   158,   159,  1303,   161,   162,   200,     8,
-    2411,     8,     8,  1905,  1906,  1907,  1908,  1909,   862,   863,
-      22,   865,    24,  2284,    21,    21,  2410,   259,   247,     8,
-       8,    33,  1352,    35,  1024,     8,  1354,   192,  1358,     7,
-       8,   195,    21,    21,  1860,   147,   148,     8,   202,     8,
-       7,     8,  1023,  1872,  1893,    41,  1872,     8,  1029,  1870,
-    1871,  1766,    21,  1740,  1035,     8,    89,  1878,  1879,     8,
-      21,   303,     8,  1939,     8,  1863,     7,  1048,   180,   234,
-    1398,     8,  1660,  1661,  1662,    71,   305,   306,   307,  1955,
-      15,  2155,   247,  1411,    21,  1961,     8,  1963,     7,   122,
-       8,  2502,  1073,  1093,  1424,   352,   353,  1078,    15,    21,
-    1652,  1101,   149,    21,   316,   317,  2500,  1905,  1906,  1907,
-    1908,  1909,     8,  1094,   920,   339,  1437,    44,   342,   343,
-     344,    15,   155,     8,  1432,    21,  1955,     8,  1109,  1955,
-       5,   355,   356,    15,     9,  1961,    21,    16,    17,   135,
-      21,    16,    17,     8,     8,  1145,   158,   159,    23,   161,
-     162,  1866,   185,  1868,  1470,    15,    21,    21,     8,   191,
-      87,    15,    37,   149,  1308,   860,  1660,  1661,  1662,   864,
-       8,    21,    15,   169,   869,    15,   208,   872,   873,    15,
-     192,     8,     8,    21,    15,   218,     5,    15,  1188,    37,
-       9,     8,   119,    15,    21,   191,    15,    16,    17,    15,
-    1373,  1517,   314,   315,    21,    15,   318,   319,    27,    15,
-       8,     8,   208,   209,  1020,     8,   143,    36,   145,   252,
-    1615,  1616,   234,    21,    21,   221,     8,   223,   224,  1559,
-     226,  1231,     5,   229,     7,   247,   931,    10,   933,    21,
-      15,    14,    15,    16,    17,    64,  1246,  1247,  1248,     8,
-     282,   178,    63,   285,    27,     8,   183,    68,   290,    15,
-     187,    34,    21,    36,   191,     8,   298,   194,    21,     8,
-      15,   410,  1272,    92,     8,   349,   350,     8,    21,    90,
-      91,     8,    21,     5,   248,   249,   282,    21,    10,   216,
-      21,    64,    14,    15,    16,    17,    15,  1278,  1279,  1780,
-      15,  1782,  1783,   230,  1477,    27,    15,     8,    15,   236,
-     129,    15,    34,  1794,    36,    15,     8,  1647,    15,    92,
-      21,  1302,  2396,  1804,   320,  1806,   322,  1308,     5,    21,
-     149,  1312,     9,   144,    15,     8,     8,     8,  1656,    16,
-      17,  1671,    64,   154,    21,     8,    23,  1520,    21,    21,
-      21,  1000,  1001,  1683,    15,  2332,   129,  1687,    21,     8,
-      37,  1669,     8,  1536,  1537,  1538,     8,  1540,  1541,   124,
-      92,  1544,    21,  1937,     8,    21,   149,     8,    15,    21,
-      15,  1702,   201,   522,     8,   524,    15,    21,  1561,   200,
-      21,    44,   531,   532,   533,     8,     8,    21,   537,   538,
-     539,   540,  1383,   542,   543,  2281,  2232,   129,    21,    21,
-       5,     8,     8,    15,     9,  2141,  2142,  2143,     8,     7,
-     231,    16,    17,  1731,    21,    21,     8,   149,   201,  2258,
-    2306,    21,  2258,   244,    87,    15,     8,     8,     8,    21,
-      93,     8,    37,   239,   166,  1426,  1427,    15,  1429,    21,
-      21,    21,  2597,  2598,    21,     8,  1437,    15,  1439,     8,
-    1441,  2476,  2477,  1444,   124,     5,   119,     3,    21,     9,
-      10,   252,    21,    15,    14,    15,    16,    17,   246,   201,
-    1286,   870,   871,  1656,  1657,   246,  1944,    27,     8,     8,
-     143,    15,   145,  1493,    34,  1476,    36,    26,  1656,    21,
-       8,    21,    21,     8,  1485,  1200,  1660,  1661,  1662,     8,
-    1491,  1206,  1512,    21,  1514,  1210,    21,  1212,  1213,  1214,
-    1501,  1216,    21,  1218,    64,   178,     8,     8,    15,     8,
-     183,     7,   240,     8,   187,     8,     8,  1518,   191,  1539,
-      21,   194,    21,  1716,  1717,  1718,    21,    15,    21,     5,
-      15,     8,    92,  1553,    10,    15,     8,     8,    14,    15,
-      16,    17,     8,   216,    21,    15,     8,  2544,  1549,  1569,
-      21,    27,    15,   149,  1574,    21,     5,   230,    34,    21,
-      36,    10,  1582,   236,     8,    14,    15,    16,    17,   129,
-    1590,   175,    15,    16,    17,     8,    15,    21,    27,     8,
-    1600,     8,  1602,     8,    27,    34,     8,    36,    64,   149,
-       8,    40,    21,    36,  1595,    15,    21,     8,     8,  2334,
-       8,     8,     5,    21,     8,    26,     9,     7,  1956,    15,
-      21,    21,    62,    16,    17,    64,    92,    21,     8,    22,
-      23,    64,    25,  1959,  1625,    28,    29,    30,    31,    32,
-      15,    21,    35,    15,    37,    38,     8,  1638,     8,     8,
-      21,   201,     8,    92,     8,     8,  2230,   287,    15,    92,
-       8,    21,    21,   129,   455,    21,  1657,   816,    21,  1660,
-    1661,  1662,     8,    21,     8,     8,   213,  1860,  1861,  1670,
-       8,  1864,     8,   149,  2028,  2410,     8,  2412,  2413,  1872,
-     129,    15,     5,    21,     7,    21,   129,    10,     8,   490,
-     166,    14,    15,    16,    17,     9,    64,  1412,     5,   500,
-     149,  1702,     9,   129,    27,     8,   149,     9,     5,    16,
-      17,    34,     9,    36,    21,    21,    23,     8,    21,    16,
-      17,  1722,     8,     8,     8,   201,    23,     8,    25,    37,
-      37,    28,    29,    30,    31,    32,    21,    21,  2473,  1740,
-      37,    64,    15,   204,   205,   206,   207,   208,    67,    15,
-      15,    15,   201,   554,   555,   556,   557,   558,   201,  2206,
-      15,    15,  1955,    15,  2499,  2500,  2116,     5,  1961,    92,
-      15,     9,  1487,  1774,  1775,     8,  2126,     8,    16,    17,
-      26,   129,     7,    15,    22,    23,     7,    25,    18,    37,
-      28,    29,    30,    31,    32,    21,     7,     5,  1799,    37,
-      15,  1994,    21,    21,    26,     7,   129,    15,    16,    17,
-       8,    15,   613,   614,   615,    15,   617,    26,  2553,    27,
-       8,     8,    21,   624,     5,    21,   149,     5,    36,    10,
-      15,     9,    15,    14,    15,    16,    17,   638,    16,    17,
-      15,    15,  1862,    21,    15,    23,    27,    15,     8,    21,
-    1851,    21,     8,    34,    15,    36,    64,  1877,     5,    37,
-      15,  1881,  2323,  2324,    15,    15,    16,    17,    62,    21,
-       8,     7,    15,     8,     8,     8,     8,    27,   201,   680,
-     255,  2074,     7,    64,    92,    15,    36,   437,   166,    15,
-     239,    15,    21,    16,   695,    15,    15,   208,   191,    21,
-       8,     7,  1061,    15,    15,    15,   315,   331,    15,    59,
-      63,    92,    15,  1072,    64,    68,   466,  1918,  1919,  1920,
-    1921,   129,   723,   473,    15,    15,    15,   332,    15,   730,
-    1931,   481,    15,    15,    15,   736,   737,    90,    91,    15,
-      15,   149,    92,    15,    15,    15,    15,    15,   129,    15,
-       7,     5,  2410,  2411,  1974,  2303,    10,  1958,   246,   246,
-      14,    15,    16,    17,   246,     5,   246,  2160,   149,   246,
-       8,   124,    15,    27,     5,    21,  1996,    21,    15,    10,
-      34,   782,    36,    14,    15,    16,    17,     8,     7,    21,
-       8,   144,    21,   201,    21,    15,    27,    21,    26,   149,
-      15,   154,     8,    34,   173,    36,  1165,    15,    15,     8,
-      64,  2012,   255,     7,    15,  2016,    21,  2018,    15,   208,
-     201,    71,  2042,    18,     8,    15,    15,  2028,    15,    15,
-      15,  2051,    15,    64,  2035,  2036,   149,    15,    92,  2232,
-    1199,    21,    21,   593,    21,    21,  1205,   200,    21,  2069,
-    1209,   201,  1211,    21,   855,   856,  1215,     5,  1217,    15,
-      15,    92,    10,    21,    21,  2258,    14,    15,    16,    17,
-       8,    15,     5,    15,     9,   129,     7,    20,     8,    27,
-     233,    21,    21,     8,    21,    26,    34,    21,    36,    21,
-       5,   244,    15,    21,     9,   149,    15,    26,   129,    26,
-      15,    16,    17,    21,    26,    21,     7,   657,    21,    21,
-      15,     8,    27,   254,    21,    26,    64,    15,   149,    21,
-      15,    36,     8,   132,     7,    21,  2127,     7,    21,    37,
-      21,    15,     7,    15,     7,  2136,    21,  2138,  2139,  2140,
-    2141,  2142,  2143,    21,    92,    15,   255,   201,  2168,    64,
-     951,   952,   953,   954,   955,   956,   957,   958,   959,   960,
-     961,   962,   963,   964,   965,   966,   967,   968,   969,    15,
-     201,    15,    15,    15,    15,   976,    15,    92,    15,    15,
-     981,   129,  2375,  2376,    15,     7,    21,   988,     8,   990,
-      15,     8,     8,     7,    21,     8,     7,     5,     8,   749,
-      92,   149,    21,    15,  1005,  2206,  2207,    15,    16,    17,
-       7,     7,    15,    78,   129,    21,   330,   767,     8,    27,
-      21,     7,   353,     7,   352,    17,    21,    15,    36,  2249,
-    1031,   781,    15,    15,   149,  2428,  1037,    15,    17,   789,
-     790,    21,     8,    15,   794,     7,     7,    15,  2268,     7,
-     903,   166,  1053,   201,   128,  1279,    64,   223,  1890,   911,
-    2014,  1600,  1192,  1097,   586,  2281,  1604,  1891,   594,   597,
-    1310,  1634,   822,   714,  2286,  1434,   940,  2138,  1918,   940,
-     830,  1910,  1501,  2118,    92,  2286,   201,  1741,  1161,  2188,
-       7,  2484,  2012,    10,  1485,  2207,  1033,    14,    15,    16,
-      17,  1053,  1421,  1400,  1095,  1713,    75,  2603,  1715,   859,
-      27,   861,  1939,  1961,   715,  1444,  1407,    34,   466,    36,
-    1042,   129,  2323,  2324,  1483,  1653,   247,   247,   796,  1656,
-     880,   881,  2333,   247,  1005,  1078,   661,  1138,   247,  1109,
-    1181,   149,   842,   664,   894,   895,   663,    64,   666,   665,
-    2333,  1423,  1425,  2167,  2551,  1156,  2016,  2396,   811,  1048,
-    1023,  1021,  2523,  1094,  1523,  1958,  2456,  1526,  1035,   792,
-    1529,   445,  1531,  1998,  1533,    92,  1535,  2409,  1179,  1180,
-    1181,  2553,    45,    46,  2579,    48,    49,  2599,  2341,  1499,
-      53,  2601,  1766,   201,   670,  1461,  2019,   385,    61,  2400,
-     765,  1963,   507,    66,  2424,   418,    69,  1553,  2023,  2410,
-    2411,  2313,   129,  2433,    77,  1818,    79,  1837,    81,  1841,
-    2440,  1793,  2442,  1798,   974,   975,  2364,  1831,  2049,  2048,
-    1238,  1231,   149,  2069,  2382,  1851,   884,  1549,  1569,  2232,
-    1574,   104,     5,  1582,  2445,  1590,     9,    10,  1249,   166,
-    1000,  1001,   115,    16,    17,  2268,  2476,  2477,    -1,    22,
-      23,    24,    25,    26,    -1,    28,    29,    30,    31,    32,
-      33,    -1,    35,    -1,    37,    38,   139,  1027,    45,    46,
-      -1,    48,    49,    -1,   201,    -1,    53,    -1,    -1,   152,
-      -1,    -1,    -1,    -1,    61,    -1,    -1,    -1,    -1,    66,
-    1050,    -1,    69,    -1,  1305,    -1,    -1,   170,    -1,    -1,
-      77,    -1,    79,   176,    81,    -1,  1317,    -1,    -1,    -1,
-      -1,   184,  2523,   186,  2525,   188,    -1,   190,    -1,    -1,
-      -1,    -1,    -1,    -1,   197,    -1,    -1,   104,  1088,    -1,
-      -1,    -1,    -1,    -1,  1345,    -1,    -1,    -1,   115,    -1,
-      -1,   214,   215,    -1,    -1,    -1,  1357,    -1,    -1,    -1,
-      -1,  2581,    -1,    -1,    -1,    -1,  2586,    -1,    -1,   232,
-      -1,    -1,   139,    -1,    -1,    -1,   239,    -1,    -1,  2599,
-      -1,  2601,  2602,    -1,    -1,   152,    -1,    -1,    -1,    -1,
-     253,    -1,    -1,   256,  2614,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,   170,    -1,  1406,  1407,    -1,    -1,   176,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   184,    -1,   186,
-    1421,   188,    -1,   190,    -1,    -1,    -1,  1428,  1178,    -1,
-     197,  1790,    -1,    -1,    -1,    -1,  1795,  1438,    -1,    -1,
-      -1,    -1,    -1,  1444,    -1,  1446,    -1,   214,   215,  1808,
-      -1,    -1,    -1,     7,    -1,    -1,    10,    -1,  1459,    -1,
-      14,    15,    16,    17,    -1,   232,    -1,    -1,    -1,    -1,
-      -1,  1830,  1473,    27,    -1,    -1,    -1,  1836,    -1,    -1,
-      34,  1840,    36,  1484,     7,    -1,   253,    10,    -1,   256,
-      -1,    14,    15,    16,    17,    -1,  1497,    -1,    -1,     7,
-      -1,  1502,    10,  1504,    27,    -1,    14,    15,    16,    17,
-      64,    34,    -1,    36,    -1,    -1,    -1,    -1,    -1,    27,
-      -1,    -1,     7,    -1,    78,    10,    34,    -1,    36,    14,
-      15,    16,    17,    -1,    -1,    -1,    -1,     7,    92,    -1,
-      10,    64,    27,    -1,    14,    15,    16,    17,    -1,    34,
-      -1,    36,    -1,    -1,    -1,    -1,    64,    27,    -1,  1309,
-      -1,    -1,    -1,    -1,    34,    -1,    36,    -1,    -1,    92,
-      -1,    -1,    -1,     7,    -1,   129,    10,    -1,    -1,    64,
-      14,    15,    16,    17,    92,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     5,    27,    64,   149,     9,    -1,    -1,    -1,
-      34,    -1,    36,    16,    17,    -1,   129,    92,    -1,  1610,
-      23,    -1,    25,    -1,    -1,    28,    29,    30,    31,    32,
-      -1,   129,    92,  1373,    37,    -1,   149,    -1,    -1,    -1,
-      64,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   149,    -1,    -1,   129,    -1,    -1,   201,    -1,    -1,
-    1651,  1652,  1653,    -1,    -1,    -1,    -1,    -1,    92,   129,
-      -1,    -1,    -1,    -1,   149,    -1,  2025,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,   201,   149,
-    2039,  1682,    -1,    -1,  1685,  2044,    -1,    -1,  2047,  1439,
-      -1,  1441,  1693,   201,    -1,   129,    -1,    -1,  2057,    -1,
-    2059,    -1,  2061,    -1,  2063,    -1,    -1,    -1,    -1,    -1,
-    1460,  1461,    -1,    -1,    -1,   149,   201,    -1,    -1,    -1,
-      -1,  1471,    -1,    -1,  1725,    -1,  1727,  1477,    -1,  1479,
-      -1,   201,  1482,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  1494,    -1,    -1,    -1,  1498,  1499,
-      -1,     7,    -1,    -1,    10,    -1,    -1,    -1,    14,    15,
-      16,    17,    -1,    -1,    -1,    -1,    -1,   201,    -1,    -1,
-    1520,    27,    -1,    -1,    -1,    -1,    -1,  1527,    34,    -1,
-      36,    -1,    -1,    -1,    -1,    -1,  1536,  1537,  1538,    -1,
-    1540,  1541,    10,    -1,  1544,    -1,    14,    15,    16,    17,
-      10,    -1,    -1,    -1,    14,    15,    16,    17,    64,    27,
-      -1,  1561,    -1,    -1,    -1,    -1,    34,    27,    36,    -1,
-      -1,    -1,    -1,    -1,    34,    -1,    36,    -1,    -1,    -1,
-      -1,    -1,    -1,     5,    -1,     7,    92,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    16,    17,    64,    -1,    -1,    21,
-      22,    23,    24,    25,    64,    -1,    28,    29,    30,    31,
-      32,    33,    -1,    35,    -1,    37,    38,    -1,    -1,    -1,
-      -1,    -1,  1873,   129,    92,  1625,    -1,    -1,    -1,  1880,
-      -1,    -1,    92,  1884,  1885,    -1,    -1,    -1,    -1,    -1,
-      -1,  1892,    -1,   149,    -1,    -1,    -1,     5,    -1,    -1,
-      -1,     9,    10,    -1,    -1,    -1,    -1,  1657,    16,    17,
-      -1,   129,    -1,    -1,    22,    23,    24,    25,    -1,   129,
-      28,    29,    30,    31,    32,    33,    34,    35,    -1,    37,
-      38,   149,  1933,    -1,    -1,    -1,    -1,    -1,  1939,   149,
-      -1,    -1,    -1,    -1,    -1,   201,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  1964,    -1,    -1,  1716,  1717,  1718,    -1,
-      -1,    -1,  1973,    -1,    -1,     5,    -1,     7,    -1,     9,
-      10,    -1,    -1,   201,    -1,    -1,    16,    17,    -1,  1990,
-    1991,   201,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,    -1,    37,    38,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  1766,    -1,  2019,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2027,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2037,    -1,     5,    -1,
-      -1,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
-      17,    -1,  2053,    -1,  2055,    22,    23,    24,    25,    -1,
-      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
-      37,    38,     5,    -1,    -1,     8,     9,    10,    -1,    -1,
-      -1,   625,    -1,    16,    17,    -1,    -1,    -1,    -1,    22,
-      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
-      33,    -1,    35,    -1,    37,    38,    -1,    -1,    -1,    -1,
-    1860,  1861,    -1,    -1,  1864,     5,  1866,  1867,  1868,     9,
-    1870,  1871,  1872,    -1,    -1,    -1,    16,    17,  1878,  1879,
-      -1,    -1,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,    -1,    37,    38,  2150,
-      -1,    -1,    -1,    -1,  2155,  1905,  1906,  1907,  1908,  1909,
-      -1,    -1,    -1,    -1,     5,  2166,  2167,     8,     9,    10,
-    2171,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,
-    2181,    22,    23,    24,    25,    -1,  2187,    28,    29,    30,
-      31,    32,    33,    -1,    35,     5,    37,    38,     8,     9,
-      10,    -1,    -1,    -1,    -1,  1955,    16,    17,    -1,    -1,
-      -1,  1961,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,    -1,    37,    38,    -1,
-    2231,   775,    -1,    -1,    -1,   779,    -1,    -1,     5,    -1,
-      -1,    -1,     9,    10,  1994,  1995,    -1,    -1,    -1,    16,
-      17,    -1,    -1,    -1,    21,    22,    23,    24,    25,  2260,
-      -1,    28,    29,    30,    31,    32,    33,  2017,    35,    -1,
-      37,    38,    -1,    -1,  2275,    -1,    -1,    -1,  2028,    -1,
-    2281,    -1,   826,    -1,    -1,     5,    -1,    -1,    -1,     9,
-      10,    -1,    -1,    -1,   838,    -1,    16,    17,    -1,  2049,
-      -1,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,  2317,    37,    38,    -1,
-      -1,    -1,    -1,    -1,  2074,  2075,    -1,    -1,    -1,    -1,
-      -1,  2332,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,   888,   889,   890,   891,     5,   893,
-       7,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
-      17,    -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,
-      -1,    28,    29,    30,    31,    32,    33,  2127,    35,    -1,
-      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2395,  2396,    -1,    -1,  2399,    -1,
-    2401,   945,    -1,   947,   948,   949,   950,  2157,    -1,    -1,
-    2160,    -1,  2162,    -1,    -1,  2416,  2417,    -1,  2419,    -1,
-       5,    -1,     7,    -1,     9,    10,    -1,    -1,  2429,    -1,
-      -1,    16,    17,    -1,    -1,    -1,  2437,    22,    23,    24,
-      25,    -1,    -1,    28,    29,    30,    31,    32,    33,    -1,
-      35,    -1,    37,    38,    -1,  2456,    -1,    -1,    -1,    -1,
-      -1,    -1,  1006,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2232,  2484,  1028,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2493,  2494,  1038,    -1,    -1,    -1,    -1,    -1,
-       5,    -1,    -1,  2504,     9,    10,  2507,    -1,  2258,    -1,
-    2511,    16,    17,    -1,    -1,  1059,    21,    22,    23,    24,
-      25,    -1,    -1,    28,    29,    30,    31,    32,    33,    -1,
-      35,  1075,    37,    38,    -1,  1079,  1080,    -1,    -1,    -1,
-      -1,    -1,    -1,  2544,    -1,    -1,    -1,    -1,    -1,    -1,
-    2551,    -1,    -1,    -1,  2555,    -1,    -1,    -1,  2559,    -1,
-      -1,    -1,  2563,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2577,  2578,  2579,    -1,
-      -1,    -1,    -1,    -1,  2334,     5,    -1,    -1,  2338,     9,
-      10,    -1,    -1,  1137,    -1,    -1,    16,    17,    -1,    -1,
-      -1,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,     5,    37,    38,    -1,
-       9,    10,    -1,    -1,    -1,  2375,  2376,    16,    17,    -1,
-      -1,    -1,    21,    22,    23,    24,    25,    -1,    -1,    28,
-      29,    30,    31,    32,    33,    -1,    35,    -1,    37,    38,
-      -1,  1195,  1196,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2410,  2411,  2412,  2413,    -1,     5,    -1,    -1,  2418,     9,
-      10,    -1,    -1,    -1,    -1,    -1,    16,    17,  2428,    -1,
-      -1,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,    -1,    37,    38,    -1,
-      -1,     5,    -1,    -1,    -1,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    16,    17,    -1,    -1,    -1,    21,    22,    23,
-      24,    25,    -1,  2473,    28,    29,    30,    31,    32,    33,
-      -1,    35,    -1,    37,    38,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,     5,    -1,     7,    -1,     9,    10,  2499,
-    2500,    -1,  2502,    -1,    16,    17,    -1,    -1,    -1,  2509,
-      22,    23,    24,    25,    -1,    -1,    28,    29,    30,    31,
-      32,    33,    -1,    35,    -1,    37,    38,  1321,  1322,  1323,
-    1324,  1325,  1326,  1327,  1328,  1329,  1330,  1331,  1332,  1333,
-    1334,  1335,  1336,  1337,  1338,  1339,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,  2553,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1355,    -1,    -1,    -1,    -1,    -1,     5,  1362,    -1,
-    1364,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,
-    1374,    -1,    -1,    21,    22,    23,    24,    25,    -1,    -1,
-      28,    29,    30,    31,    32,    33,    -1,    35,    -1,    37,
-      38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,  1405,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    14,    15,    16,    17,    -1,
-      19,    -1,    21,    -1,    23,    24,    -1,    26,    -1,    -1,
-      -1,    30,    -1,    32,    33,    -1,    -1,    36,    37,    38,
-      -1,    40,    -1,    42,    43,    -1,    -1,    46,    -1,    -1,
-      -1,    -1,    51,    52,    53,    54,    55,    56,    57,    58,
-      -1,    60,    61,    -1,    -1,    64,    65,    66,    -1,    68,
-    1474,    70,    -1,    -1,    73,    74,    -1,    -1,    -1,    -1,
-      -1,    -1,    81,    82,  1488,    -1,    85,    -1,    -1,    -1,
-      -1,    -1,    -1,    92,    -1,    94,    -1,    96,    97,    -1,
-      -1,    -1,   101,   102,   103,  1509,    -1,   106,    -1,    -1,
-     109,   110,    -1,   112,   113,   114,    -1,    -1,    -1,    -1,
-     119,   120,    -1,    -1,   123,    -1,   125,   126,   127,    -1,
-     129,   130,    -1,    -1,   133,    -1,   135,   136,   137,   138,
-     139,   140,    -1,    -1,    -1,    -1,    -1,    -1,   147,   148,
-     149,    -1,    -1,    -1,  1558,   154,   155,   156,    -1,   158,
-     159,   160,   161,   162,   163,   164,   165,   166,   167,   168,
-     169,   170,   171,   172,   173,   174,   175,   176,   177,   178,
-     179,   180,   181,   182,   183,    -1,   185,    -1,   187,    -1,
-     189,    -1,   191,   192,    -1,    -1,   195,   196,   197,   198,
-     199,   200,   201,   202,     5,  1609,    -1,    -1,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,
-      21,    22,    23,    24,    25,    -1,    -1,    28,    29,    30,
-      31,    32,    33,    -1,    35,    -1,    37,    38,  1642,    -1,
-      -1,    -1,    -1,    -1,    -1,  1649,    -1,    -1,    -1,    -1,
-      -1,  1655,    -1,    -1,    -1,    -1,   255,    -1,    -1,   258,
-      -1,   260,    -1,    -1,    -1,     5,    -1,    -1,    -1,     9,
-      10,    -1,    -1,    -1,  1678,    -1,    16,    17,    -1,    -1,
-      -1,    21,    22,    23,    24,    25,  1690,    -1,    28,    29,
-      30,    31,    32,    33,  1698,    35,    -1,    37,    38,    -1,
-      -1,    -1,    -1,    -1,  1708,    -1,    -1,  1711,    -1,    -1,
-      -1,    -1,     5,    -1,    -1,    -1,     9,    10,    -1,    -1,
-      -1,    -1,  1726,    16,    17,    -1,    -1,    -1,    21,    22,
-      23,    24,    25,    -1,  1738,    28,    29,    30,    31,    32,
-      33,    -1,    35,    -1,    37,    38,    -1,     5,  1752,     7,
-      -1,     9,    10,    -1,  1758,    -1,    -1,    -1,    16,    17,
-    1764,    -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
-      28,    29,    30,    31,    32,    33,    -1,    35,     5,    37,
-      38,    -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
-      17,    -1,    -1,    -1,    21,    22,    23,    24,    25,    -1,
-      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
-      37,    38,     5,    -1,     7,    -1,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    -1,    22,
-      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
-      33,    -1,    35,    -1,    37,    38,     5,    -1,     7,    -1,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,
-      -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,    28,
-      29,    30,    31,    32,    33,    -1,    35,     5,    37,    38,
-      -1,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,
-      -1,    -1,  1896,    21,    22,    23,    24,    25,    -1,    -1,
-      28,    29,    30,    31,    32,    33,    -1,    35,    -1,    37,
-      38,    -1,    -1,    -1,     5,    -1,    -1,    -1,     9,    10,
-      -1,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,
-      21,    22,    23,    24,    25,    -1,  1940,    28,    29,    30,
-      31,    32,    33,    -1,    35,    -1,    37,    38,     5,    -1,
-      -1,    -1,     9,    10,    -1,    -1,  1960,    -1,  1962,    16,
-      17,    -1,  1966,    -1,    21,    22,    23,    24,    25,    -1,
-      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
-      37,    38,    -1,    -1,    -1,  1989,    -1,    -1,  1992,     5,
-      -1,    -1,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
-      16,    17,    -1,   602,   603,    -1,    22,    23,    24,    25,
-    2014,    -1,    28,    29,    30,    31,    32,    33,    -1,    35,
-       5,    37,    38,    -1,     9,    10,    -1,    -1,    -1,    -1,
-      -1,    16,    17,    -1,    -1,    -1,    21,    22,    23,    24,
-      25,    -1,    -1,    28,    29,    30,    31,    32,    33,    -1,
-      35,     5,    37,    38,    -1,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    16,    17,    -1,    -1,    -1,    21,    22,    23,
-      24,    25,    -1,    -1,    28,    29,    30,    31,    32,    33,
-      -1,    35,    -1,    37,    38,    -1,    -1,    -1,     5,  2093,
-      -1,    -1,     9,    10,    -1,    -1,    -1,    -1,  2102,    16,
-      17,    -1,  2106,  2107,    21,    22,    23,    24,    25,    -1,
-    2114,    28,    29,    30,    31,    32,    33,    -1,    35,     5,
-      37,    38,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,
-      16,    17,    -1,    -1,    -1,    -1,    22,    23,    24,    25,
-      -1,  2145,    28,    29,    30,    31,    32,    33,    -1,    35,
-      -1,    37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    2164,    -1,     5,    -1,    -1,  2169,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    16,    17,  2179,  2180,    -1,    21,    22,
-      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
-      33,    -1,    35,    -1,    37,    38,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,  2210,     5,    -1,    -1,
-       8,     9,    10,    -1,    -1,    -1,  2220,  2221,    16,    17,
-      -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
-      28,    29,    30,    31,    32,    33,    -1,    35,     5,    37,
-      38,     8,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
-      17,    -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,
-      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
-      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2296,    -1,  2298,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,     5,  2307,    -1,    -1,     9,    10,  2312,    -1,
-      -1,  2315,    -1,    16,    17,    -1,    -1,    -1,    21,    22,
-      23,    24,    25,    -1,  2328,    28,    29,    30,    31,    32,
-      33,    -1,    35,     5,    37,    38,     8,     9,    10,    -1,
-      -1,    -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    -1,
-      22,    23,    24,    25,    -1,    -1,    28,    29,    30,    31,
-      32,    33,    -1,    35,    -1,    37,    38,     5,    -1,  2373,
-      -1,     9,    10,    -1,    -1,  2379,    -1,    -1,    16,    17,
-      -1,    -1,  2386,    21,    22,    23,    24,    25,    -1,    -1,
-      28,    29,    30,    31,    32,    33,    -1,    35,     5,    37,
-      38,  2405,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,
-      17,    -1,    -1,    -1,    21,    22,    23,    24,    25,    -1,
-      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
-      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,  2449,    -1,  2451,    -1,    -1,
-      -1,  2455,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,  2466,  2467,    -1,    -1,    -1,  2471,     5,    -1,
-      -1,     8,     9,    10,    -1,    -1,    -1,  2481,    -1,    16,
-      17,  2485,    -1,    -1,    -1,    22,    23,    24,    25,    -1,
-      -1,    28,    29,    30,    31,    32,    33,    -1,    35,    -1,
-      37,    38,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,  2518,    -1,    -1,    -1,    -1,    -1,
-    2524,    -1,  2526,    -1,    -1,    -1,     5,    -1,    -1,     8,
-       9,    10,     6,    -1,  2538,    -1,  2540,    16,    17,    13,
-      -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,    28,
-      29,    30,    31,    32,    33,    -1,    35,    -1,    37,    38,
-      -1,    -1,    -1,    -1,  2568,    -1,    -1,    -1,  2572,    43,
-      44,    45,    46,    -1,    48,    49,    50,    51,    52,    53,
-    2584,    -1,    56,    57,    -1,    -1,    -1,    61,    62,    63,
-      -1,    65,    66,    67,    68,    69,    70,    -1,    72,    73,
-      74,    75,    76,    77,    -1,    79,    80,    81,    82,    83,
-      84,    -1,    -1,    87,    88,    89,    90,    91,    -1,    -1,
-      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
-     104,   105,   106,   107,   108,   109,   110,   111,   112,   113,
-     114,   115,    -1,   117,    -1,   119,   120,    -1,   122,   123,
-     124,    -1,    -1,   127,    -1,    -1,   130,   131,    -1,   133,
-     134,   135,   136,    -1,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,    -1,    -1,    -1,    -1,    -1,   152,   153,
-     154,   155,    -1,    -1,    -1,    -1,   160,    -1,    -1,   163,
-     164,    -1,    -1,   167,   168,    -1,   170,    -1,    -1,    -1,
-     174,    -1,   176,    -1,   178,    -1,    -1,    -1,   182,   183,
-     184,   185,   186,   187,   188,   189,   190,   191,    -1,   193,
-     194,   195,    -1,   197,    -1,   199,   200,    -1,   202,    -1,
-     204,   205,   206,   207,    -1,    -1,   210,   211,   212,    -1,
-     214,   215,   216,    -1,   218,   219,   220,    -1,   222,    -1,
-     224,   225,   226,   227,   228,    -1,   230,    -1,   232,   233,
-      -1,    -1,   236,   237,   238,    -1,    -1,   241,   242,    -1,
-     244,   245,    -1,   247,   248,    -1,    -1,    -1,   252,   253,
-      -1,    -1,   256,    -1,    -1,   259,    -1,    -1,    -1,   263,
-     264,    -1,    -1,   267,   268,   269,    -1,   271,   272,   273,
-     274,   275,   276,   277,   278,   279,   280,   281,    -1,   283,
-      -1,    -1,   286,    -1,    -1,    -1,   290,   291,   292,   293,
-     294,    -1,   296,   297,    -1,    -1,   300,   301,   302,   303,
-      -1,    -1,    -1,    -1,   308,   309,   310,   311,   312,   313,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,   321,    -1,   323,
-      -1,   325,   326,   327,   328,   329,    -1,    -1,    -1,   333,
-     334,   335,   336,   337,   338,     5,   340,   341,    -1,     9,
-      10,   345,    -1,    -1,    -1,    -1,    16,    17,    -1,    -1,
-      -1,    21,    22,    23,    24,    25,    -1,    -1,    28,    29,
-      30,    31,    32,    33,    -1,    35,     5,    37,    38,    -1,
-       9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,    -1,
-      -1,    -1,    21,    22,    23,    24,    25,    -1,    -1,    28,
-      29,    30,    31,    32,    33,    -1,    35,     5,    37,    38,
-       8,     9,    10,    -1,    -1,    -1,    -1,    -1,    16,    17,
-      -1,    -1,    -1,    -1,    22,    23,    24,    25,    -1,    -1,
-      28,    29,    30,    31,    32,    33,    -1,    35,    -1,    37,
-      38,     5,    -1,     7,    -1,     9,    10,    -1,    -1,    -1,
-      -1,    -1,    16,    17,    -1,    -1,    -1,    -1,    22,    23,
-      24,    25,    -1,    -1,    28,    29,    30,    31,    32,    33,
-      -1,    35,     5,    37,    38,    -1,     9,    10,    -1,    -1,
-      -1,    -1,    -1,    16,    17,    -1,    -1,    -1,    -1,    22,
-      23,    24,    25,    -1,    -1,    28,    29,    30,    31,    32,
-      33,    -1,    35,    -1,    37,    38
-};
-
-  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-     symbol of state STATE-NUM.  */
-static const yytype_uint16 yystos[] =
-{
-       0,   363,     0,     1,   150,   257,   364,   365,   116,     6,
-      13,    43,    44,    45,    46,    48,    49,    50,    51,    52,
-      53,    56,    57,    61,    62,    63,    65,    66,    67,    68,
-      69,    70,    72,    73,    74,    75,    76,    77,    79,    80,
-      81,    82,    83,    84,    87,    88,    89,    90,    91,    94,
-      95,    96,    97,    98,    99,   100,   101,   102,   103,   104,
-     105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
-     115,   117,   119,   120,   122,   123,   124,   127,   130,   131,
-     133,   134,   135,   136,   138,   139,   140,   141,   142,   143,
-     144,   145,   146,   152,   153,   154,   155,   160,   163,   164,
-     167,   168,   170,   174,   176,   178,   182,   183,   184,   185,
-     186,   187,   188,   189,   190,   191,   193,   194,   195,   197,
-     199,   200,   202,   204,   205,   206,   207,   210,   211,   212,
-     214,   215,   216,   218,   219,   220,   222,   224,   225,   226,
-     227,   228,   230,   232,   233,   236,   237,   238,   241,   242,
-     244,   245,   247,   248,   252,   253,   256,   259,   263,   264,
-     267,   268,   269,   271,   272,   273,   274,   275,   276,   277,
-     278,   279,   280,   281,   283,   286,   290,   291,   292,   293,
-     294,   296,   297,   300,   301,   302,   303,   308,   309,   310,
-     311,   312,   313,   321,   323,   325,   326,   327,   328,   329,
-     333,   334,   335,   336,   337,   338,   340,   341,   345,   366,
-     368,   371,   383,   384,   388,   389,   390,   396,   397,   398,
-     399,   401,   402,   404,   406,   407,   408,   409,   416,   417,
-     418,   419,   420,   421,   425,   426,   427,   431,   432,   470,
-     472,   485,   528,   529,   531,   532,   538,   539,   540,   541,
-     548,   549,   550,   551,   553,   556,   560,   561,   562,   563,
-     564,   565,   571,   572,   573,   584,   585,   586,   588,   591,
-     594,   599,   600,   602,   604,   606,   609,   610,   634,   635,
-     646,   647,   648,   649,   654,   657,   660,   663,   664,   714,
-     715,   716,   717,   718,   719,   720,   721,   727,   729,   731,
-     733,   735,   736,   737,   738,   739,   742,   744,   745,   746,
-     749,   750,   754,   755,   757,   758,   759,   760,   761,   762,
-     763,   766,   771,   776,   778,   779,   780,   781,   783,   784,
-     785,   786,   787,   788,   805,   808,   809,   810,   811,   817,
-     820,   825,   826,   827,   830,   831,   832,   833,   834,   835,
-     836,   837,   838,   839,   840,   841,   842,   843,   844,   849,
-     850,   851,   852,   853,   854,   864,   865,   866,   869,   873,
-     874,   875,   876,   877,   882,   902,    15,   495,   495,   557,
-     557,   557,   557,   557,   495,   557,   557,   367,   557,   557,
-     557,   495,   557,   495,   557,   557,   495,   557,   557,   557,
-     494,   557,   495,   557,   557,     7,    15,   496,    15,   495,
-     617,   557,   495,   380,   557,   557,   557,   557,   557,   557,
-     557,   557,   557,   557,   129,   373,   537,   537,   557,   557,
-     557,   495,   557,   373,   557,   495,   495,   557,   557,   494,
-     367,   495,   495,    64,   379,   557,   557,   495,   495,   557,
-     495,   495,   495,   495,   495,   557,   434,   557,   557,   557,
-     373,   471,   367,   495,   557,   557,   557,   495,   557,   495,
-     557,   557,   495,   557,   557,   557,   495,   367,   495,   380,
-     557,   557,   380,   557,   495,   557,   557,   557,   495,   557,
-     557,   495,   557,   495,   557,   557,   557,   557,   557,   557,
-      15,   495,   595,   495,   367,   495,   495,   557,   557,   557,
-      15,     8,   495,   495,   557,   557,   557,   495,   557,   557,
-     557,   557,   557,   557,   557,   557,   557,   557,   557,   557,
-     557,   557,   557,   557,   557,   557,   557,   557,   557,   557,
-     557,   557,   557,   557,   495,   557,   495,   557,   557,   557,
-     557,   495,   495,   557,   557,   557,   557,   557,   557,   557,
-     557,   908,   908,   908,   908,   908,   908,   257,   583,   124,
-     233,   404,    15,   376,   583,     8,     8,     8,     8,     7,
-       8,   124,   368,   391,     8,   373,   405,     8,     8,     8,
-       8,     8,   552,     8,   552,     8,     8,     8,     8,   552,
-     583,     7,   218,   252,   529,   531,   540,   541,   239,   549,
-     549,    10,    14,    15,    16,    17,    27,    34,    36,    64,
-      92,   149,   201,   373,   385,   501,   502,   504,   505,   506,
-     507,   513,   514,   515,   516,   517,   520,    15,   557,     5,
-       9,    15,    16,    17,   129,   503,   505,   513,   567,   581,
-     582,   557,    15,   567,   557,     5,   566,   567,   582,   567,
-       8,     8,     8,     8,     8,     8,     8,     8,     7,     8,
-       8,     5,     7,   373,   644,   645,   373,   637,   496,    15,
-      15,   149,   484,   373,   373,   747,   748,     8,   373,   661,
-     662,   748,   373,   375,   373,    15,   533,   579,    23,    37,
-     373,   423,   424,    15,   373,   607,   373,   675,   675,   373,
-     658,   659,   373,   536,   433,    15,   373,   587,   149,   753,
-     536,     7,   479,   480,   495,   618,   619,   373,   613,   619,
-      15,   558,   373,   589,   590,   536,    15,    15,   536,   753,
-     537,   536,   536,   536,   536,   373,   536,   376,   536,    15,
-     428,   496,   504,   505,    15,   370,   373,   373,   655,   656,
-     486,   487,   488,   489,     8,   676,   743,    15,   373,   601,
-     373,   592,   593,   580,    15,    15,   373,   496,    15,   501,
-     756,    15,    15,   373,   730,   732,     8,   373,    37,   422,
-      15,   505,   506,   496,    15,    15,   558,   484,   496,   505,
-     373,   722,     5,    15,   581,   582,   496,   373,   374,   496,
-     580,    15,   504,   638,   639,   613,   617,   373,   605,   373,
-     702,   702,    15,   373,   603,   722,   501,   512,   496,   380,
-      15,   373,   708,   708,   708,   708,   708,     7,   501,   596,
-     597,   373,   598,   496,   369,   373,   496,   373,   728,   730,
-     373,   495,   496,   373,   473,    15,    15,   580,   373,    15,
-     619,    15,   619,   619,   619,   619,   791,   847,   619,   619,
-     619,   619,   619,   619,   791,   373,   380,   855,   856,   857,
-      15,    15,     8,   870,   871,   872,   496,    15,   501,   501,
-     501,   501,   500,   501,    15,    15,    15,    15,    15,   373,
-     900,    15,   367,   367,   124,     5,    21,   373,   377,   378,
-     372,   380,   373,   373,   373,   424,     7,   380,   367,   124,
-     373,   373,     5,    15,   411,   412,   373,   424,   424,   424,
-     424,   423,   504,   422,   373,   373,   428,   435,   436,   438,
-     439,   557,   557,   239,   414,   501,   502,   501,   501,   501,
-     501,     5,     9,    16,    17,    22,    23,    24,    25,    26,
-      28,    29,    30,    31,    32,    33,    35,    37,    38,   385,
-      15,   246,     3,    15,   246,   246,    15,   510,   511,    21,
-     554,   579,   512,     5,     9,   166,   568,   569,   570,   581,
-      26,   581,     5,     9,    23,    37,   503,   580,   581,   580,
-       8,    15,   505,   574,   575,    15,   501,   502,   517,   576,
-     577,   578,   576,   587,   373,   601,   603,   605,   607,   373,
-       7,   380,   728,     8,    21,   639,   424,   526,   501,   240,
-     552,    15,   380,    15,   478,     8,   579,     7,   501,   534,
-     535,   536,    15,   373,   478,   424,   483,   484,     8,   435,
-     526,   478,    15,     8,    21,     5,     7,   481,   482,   501,
-     373,     8,    21,     5,    58,    86,   126,   137,   165,   258,
-     620,   616,   617,   175,   608,   501,   149,   547,     8,   501,
-     501,   372,   373,   429,   430,   504,   509,   373,    26,   373,
-     542,   543,   545,   376,     8,     8,    15,   231,   404,   490,
-     380,     8,   743,   373,   504,   712,   722,   740,   741,     8,
-     567,    26,     5,     9,    16,    17,    22,    23,    24,    25,
-      28,    29,    30,    31,    32,    33,    34,    35,    37,    38,
-     385,   386,   387,   373,   380,   394,   504,   501,    15,   380,
-     373,   373,   504,   504,   527,     8,   677,   734,   373,   504,
-     665,   373,   468,   469,   547,   424,    18,   580,   581,   580,
-     400,   403,   644,   639,     7,   617,   619,   712,   722,   723,
-     724,   423,   424,   462,   463,    62,   504,   767,    15,    15,
-       7,     8,    21,   595,   424,   376,   424,   478,     8,   674,
-     699,    21,   380,   373,     8,   501,   501,   478,   504,   552,
-     812,   504,   287,   824,   824,   552,   821,   824,    15,   552,
-     789,   552,   828,   789,   789,   552,   806,   552,   818,   478,
-     147,   148,   180,   314,   315,   318,   319,   381,   858,   859,
-     860,     8,    21,   505,   680,   861,    21,   861,   380,   872,
-     373,   867,   868,   380,   764,   765,     8,     8,     8,     8,
-     504,   507,   508,   782,   665,   380,   883,   884,   885,   886,
-     887,   888,   889,   380,   892,   893,   894,   895,   896,   380,
-     897,   898,     8,   380,   903,   904,   373,   369,   367,     8,
-      21,   213,   381,   478,    44,    87,    93,   119,   143,   145,
-     178,   183,   187,   191,   194,   216,   230,   236,   392,   393,
-     395,   373,   367,   495,   558,   579,   405,   478,   552,   552,
-       8,    37,    15,   373,   441,   446,   380,    15,   521,    21,
-       8,   501,   501,   501,   501,   501,   501,   501,   501,   501,
-     501,   501,   501,   501,   501,   501,   501,   501,   501,   501,
-     579,    64,   129,   497,   499,   579,   504,   515,   518,    64,
-     518,   512,     8,    21,     5,   501,   555,   570,     8,    21,
-       5,     9,   501,    21,   501,   581,   581,   581,   581,   581,
-      21,   574,   574,     8,   501,   502,   577,   578,     8,     8,
-       8,   478,   478,   495,    43,    67,    82,    87,    88,    94,
-     228,   259,   303,   648,   645,   380,   508,   524,    21,   373,
-      15,   500,    67,   479,   662,   501,     7,     8,    21,   554,
-      37,     8,    21,   659,   504,   507,   523,   525,   579,   751,
-     481,     7,   478,   619,    15,    15,    15,    15,    15,    15,
-     608,   619,   373,    21,   559,   590,    21,    21,    15,     8,
-      21,     8,   511,   505,     8,   544,    26,   372,   656,   487,
-     129,   491,   492,   493,   409,   169,   208,   282,   380,    15,
-       7,     8,    21,   593,   576,    21,    21,   147,   148,   180,
-      21,    18,    21,     7,   501,   519,   175,   324,    37,     8,
-      21,   380,     8,    21,    26,     8,    21,   559,   501,    21,
-     464,   465,   464,    21,     7,   619,   608,    15,     7,     8,
-      21,     8,    15,    15,    26,   709,   710,   712,   500,   501,
-     597,   380,     8,   699,     8,   674,   405,   395,   382,    21,
-      21,    21,   619,   552,    21,   619,   552,   848,   619,   552,
-     619,   552,   619,   552,   619,   552,    15,    15,    15,    15,
-      15,    15,   380,   857,     8,    21,    21,   191,   859,     8,
-     182,   315,   318,     8,    21,   380,   380,   380,   501,    15,
-      15,     8,    21,    21,   183,   191,   208,   357,   358,     8,
-      21,    41,   209,   228,     8,    21,   339,   342,   343,   344,
-     355,   356,     8,    21,   380,   244,   331,   346,   347,   348,
-       8,    21,   376,   373,   378,    15,   410,   411,   478,   495,
-      15,     7,     8,   373,   478,    15,   515,     5,   413,   501,
-     570,   424,   504,   438,    15,    16,    17,    27,    36,    59,
-      64,    92,   149,   201,   437,   439,   449,   450,   451,   452,
-     453,   454,   455,   456,   441,   446,   447,   448,    15,   442,
-     443,    62,   501,   576,   502,   497,    21,     8,   498,   501,
-     519,   570,     7,   579,   484,   501,   579,     8,   575,    21,
-       8,     8,     8,   502,   578,   502,   578,   502,   578,   373,
-     255,     8,    21,   484,   483,    21,     7,    21,   501,   534,
-      21,   484,   552,     8,    21,   570,   752,     8,    21,   482,
-     501,   620,   579,    15,   622,   373,   621,   621,   501,   621,
-     478,   619,   239,   536,   500,   430,   430,   373,   501,   543,
-      21,   501,   519,     8,    21,    16,    15,    15,    15,   500,
-     740,   741,   496,   504,   772,     7,   501,     7,    21,    21,
-     373,   615,   505,   504,   191,   504,   619,   666,   501,   469,
-     552,     8,    47,   177,   373,   467,   380,   636,   638,   608,
-       7,     7,   501,   725,   726,   723,   724,   463,   501,     5,
-     622,   768,   769,   775,   501,   632,     8,    21,    15,    21,
-      71,   208,   380,   380,   496,   172,   373,   476,   477,   505,
-     191,   208,   282,   285,   290,   298,   792,   793,   794,   801,
-     813,   814,   815,   619,   266,   822,   823,   824,   619,    37,
-     504,   845,   846,    84,   265,   289,   299,   304,   790,   792,
-     793,   794,   795,   796,   797,   799,   800,   801,   619,   792,
-     793,   794,   795,   796,   797,   799,   800,   801,   814,   815,
-     829,   619,   792,   793,   794,   801,   807,   619,   792,   793,
-     819,   619,   861,   861,   861,   380,   862,   863,   861,   861,
-     505,    15,   868,   765,   331,   315,   332,   579,   497,   508,
-      15,    15,    15,    15,    15,   884,    15,    15,    15,   893,
-      15,    15,    15,    15,   898,   352,   353,    15,    15,    15,
-      15,    15,   904,   373,    18,    26,   415,    15,   394,     7,
-     380,   410,   559,   559,   414,     5,   501,   452,   453,   454,
-     457,   453,   455,   453,   455,   246,   246,   246,   246,   246,
-       8,    37,   373,   440,   504,     5,   442,   443,     8,    15,
-      16,    17,   149,   373,   440,   444,   445,   458,   459,   460,
-     461,    15,   443,    15,    21,   522,    21,    21,   511,   579,
-     501,   512,   555,   569,   581,   545,   546,   502,   546,   546,
-     546,   478,   373,   640,   643,   579,     8,    21,     7,   414,
-     501,   579,   501,   579,   570,   633,   501,   623,   624,    21,
-      21,    21,    21,     8,     8,   254,   530,   536,    21,   492,
-     493,   680,   680,   680,    21,    21,   373,    15,    21,   501,
-       7,     7,   501,   478,    15,   173,     8,   670,   671,   672,
-     673,   674,   676,   677,   678,   681,   683,   684,   685,   699,
-     707,   545,   465,    15,    15,   466,   255,     8,     7,     8,
-      21,    21,    21,     8,    21,    21,   710,   711,    15,    15,
-     373,   373,   474,   475,   477,    18,     8,    26,   791,    15,
-     791,   791,    15,   619,   813,   791,   619,   822,   373,     8,
-      21,    15,   791,    15,   791,    15,   619,   790,   619,   829,
-     619,   807,   619,   819,    21,    21,    21,   316,   317,     8,
-      21,    21,    21,   867,    15,    15,   497,    21,   508,   890,
-     891,   680,   380,   703,   515,   680,   709,   723,   709,   665,
-     665,   508,   901,   501,   899,    15,    15,   380,   905,   906,
-     665,   665,   501,   380,   907,    21,   501,   501,   650,   651,
-      21,   393,   415,     5,   501,   405,     8,    21,     8,   518,
-     518,   518,   518,   518,   449,     5,    15,   439,   450,   443,
-     373,   440,   448,   458,   459,   459,     8,    21,     7,    16,
-      17,     5,    37,     9,   458,   501,    20,   511,   498,    21,
-      26,    21,    21,    21,    21,    15,   508,   570,   484,   661,
-     496,   523,   570,   752,   501,    21,     7,     8,    21,   501,
-     380,    15,    21,    21,    21,     7,   773,   774,   775,   501,
-     501,     7,   680,   504,   667,   380,   672,    26,   467,    26,
-     386,   640,   638,   373,   611,   612,   613,   614,   726,   769,
-     619,    78,   596,   373,   675,   723,   700,     8,   373,   477,
-     501,   619,   802,   380,   619,   619,   847,   504,   845,   380,
-     501,   501,   619,   619,   619,   619,   863,    21,   680,   504,
-      21,    26,     8,    21,    21,    22,    24,    33,    35,   158,
-     159,   161,   162,   192,   234,   247,   704,   705,   706,     8,
-      21,    21,    21,    21,    21,    21,    21,    21,     8,    21,
-       8,    21,   380,   878,   879,   878,   315,   351,     8,    21,
-      21,    21,    21,   349,   350,     8,     8,    21,     7,    21,
-      21,   579,   457,   450,   579,   440,    26,    21,   458,   445,
-     459,   459,   460,   460,   460,    21,   501,     5,   501,   519,
-     641,   642,   504,     8,   680,   504,     8,   501,   624,   380,
-      21,   254,   501,     8,    21,   501,    21,    15,    41,   135,
-     209,   221,   223,   224,   226,   229,   320,   322,   501,   466,
-      21,    21,    15,     8,   132,   770,    21,    21,     7,    21,
-     702,   704,   475,     5,    16,    17,    22,    24,    33,    35,
-      37,   159,   162,   247,   305,   306,   307,   804,    21,    94,
-     230,   284,   295,   816,    37,   191,   288,   299,   798,    21,
-      21,    21,    21,   501,   891,    15,    15,   380,   508,   501,
-     354,   359,     8,    21,    21,   906,   501,     7,     7,   413,
-      21,   497,   444,   458,    21,     8,     8,    21,   484,   570,
-     255,    15,    21,   774,     5,   501,   668,   669,    15,   686,
-      15,    15,    15,    15,   708,   708,    15,    15,    15,     8,
-     500,   612,   712,   713,    15,   723,   701,   701,     7,     8,
-      21,   848,    21,     8,   505,   680,   704,     8,    15,   879,
-       8,   880,     8,   881,    21,     7,   414,    21,    21,   501,
-     642,   501,   373,   625,   626,   501,     8,    21,   687,   686,
-     722,   740,   722,   723,   712,   709,   501,   501,   679,   667,
-     682,   501,    21,     8,   380,    21,     7,     8,    21,   680,
-     803,   501,   380,    21,     8,   501,    92,   380,   380,   373,
-     652,   653,    21,     8,    15,    21,   669,   148,   180,   688,
-       7,    21,     7,    21,    15,    21,    21,     8,    21,     8,
-      21,     8,   712,    78,   703,   703,    21,   330,   501,   505,
-      21,   353,   352,     8,   501,    40,   501,   627,   628,   775,
-       7,     7,   689,   690,   712,   740,   723,   596,   501,   667,
-     501,    21,    21,    21,    15,    21,    15,    15,   653,   373,
-     629,     8,    21,     8,    21,    15,    21,    21,    21,     8,
-     500,   878,   878,    17,   630,   631,   628,   690,   501,   691,
-     692,    21,   501,    21,    21,    21,   632,    17,     7,     8,
-      21,     8,   777,   632,   501,   692,    15,   380,   380,   693,
-     694,   695,   696,   697,   182,   318,   128,   157,   217,     8,
-      21,     7,     7,    15,   698,   698,   698,   694,   380,   696,
-     697,   380,   697,   499,     7,    21,   697
-};
-
-  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint16 yyr1[] =
-{
-       0,   362,   363,   363,   364,   364,   364,   364,   364,   364,
-     364,   365,   366,   366,   366,   366,   366,   366,   366,   366,
-     367,   368,   368,   368,   369,   370,   371,   371,   371,   371,
-     372,   372,   373,   374,   374,   375,   375,   376,   376,   376,
-     377,   377,   378,   378,   379,   380,   381,   382,   383,   383,
-     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
-     383,   383,   383,   383,   383,   383,   383,   383,   383,   383,
-     383,   383,   383,   383,   383,   383,   383,   383,   384,   384,
-     384,   384,   384,   385,   386,   386,   387,   387,   387,   387,
-     387,   387,   387,   387,   387,   387,   387,   387,   387,   387,
-     387,   387,   387,   387,   388,   388,   389,   389,   390,   390,
-     391,   391,   391,   392,   392,   393,   393,   393,   393,   393,
-     393,   393,   393,   393,   393,   393,   393,   394,   394,   394,
-     395,   395,   396,   396,   397,   397,   398,   398,   399,   399,
-     400,   401,   402,   402,   403,   404,   404,   405,   406,   406,
-     407,   407,   408,   409,   409,   409,   409,   409,   409,   409,
-     410,   410,   411,   411,   411,   412,   412,   412,   412,   413,
-     413,   413,   413,   414,   415,   415,   415,   416,   416,   417,
-     417,   418,   418,   419,   419,   420,   420,   420,   420,   421,
-     421,   421,   422,   423,   423,   424,   425,   425,   426,   426,
-     427,   427,   428,   429,   429,   430,   430,   430,   431,   432,
-     432,   433,   434,   435,   436,   436,   437,   437,   438,   438,
-     438,   438,   438,   439,   440,   441,   442,   443,   444,   444,
-     445,   445,   446,   447,   447,   448,   448,   448,   448,   449,
-     449,   449,   450,   450,   450,   450,   450,   450,   450,   450,
-     450,   450,   450,   451,   452,   452,   452,   453,   453,   454,
-     454,   454,   455,   455,   455,   455,   456,   457,   457,   458,
-     458,   458,   458,   458,   459,   459,   459,   460,   460,   461,
-     461,   461,   462,   462,   463,   463,   464,   464,   465,   466,
-     467,   467,   467,   468,   468,   469,   470,   471,   471,   472,
-     472,   472,   472,   473,   474,   474,   475,   475,   476,   476,
-     477,   478,   478,   480,   479,   479,   481,   481,   481,   481,
-     482,   482,   483,   483,   484,   485,   485,   486,   486,   487,
-     489,   488,   490,   490,   491,   491,   492,   492,   493,   494,
-     495,   496,   496,   497,   497,   498,   498,   498,   499,   499,
-     500,   500,   501,   501,   501,   502,   502,   502,   502,   502,
-     502,   502,   502,   502,   502,   502,   502,   502,   502,   502,
-     502,   502,   502,   502,   502,   502,   502,   502,   502,   502,
-     503,   503,   504,   505,   505,   505,   506,   506,   506,   506,
-     507,   508,   508,   508,   508,   509,   510,   510,   511,   512,
-     512,   513,   513,   513,   513,   513,   514,   514,   514,   514,
-     515,   516,   516,   516,   517,   518,   518,   519,   519,   519,
-     519,   519,   519,   519,   519,   521,   522,   520,   523,   523,
-     524,   524,   524,   525,   525,   525,   526,   527,   527,   528,
-     528,   528,   528,   528,   528,   528,   528,   528,   528,   528,
-     528,   528,   528,   528,   528,   528,   528,   528,   528,   528,
-     528,   528,   528,   529,   529,   530,   530,   530,   531,   531,
-     532,   532,   532,   532,   532,   533,   534,   534,   534,   534,
-     535,   535,   536,   536,   537,   537,   538,   539,   540,   541,
-     542,   542,   543,   544,   544,   545,   546,   546,   547,   547,
-     548,   548,   548,   548,   548,   549,   549,   549,   549,   549,
-     549,   549,   549,   549,   549,   549,   549,   549,   549,   549,
-     549,   549,   549,   550,   551,   551,   551,   551,   552,   552,
-     553,   554,   554,   555,   555,   555,   556,   556,   557,   558,
-     559,   560,   560,   560,   560,   560,   560,   560,   560,   560,
-     560,   560,   560,   560,   560,   561,   562,   562,   562,   563,
-     564,   564,   565,   565,   566,   566,   567,   567,   568,   568,
-     569,   569,   569,   569,   569,   569,   570,   571,   572,   573,
-     573,   574,   574,   575,   575,   576,   576,   576,   577,   577,
-     577,   577,   577,   577,   578,   578,   578,   578,   578,   579,
-     580,   581,   581,   582,   582,   582,   582,   582,   582,   582,
-     582,   582,   583,   583,   584,   584,   584,   584,   584,   584,
-     584,   584,   584,   584,   584,   584,   584,   584,   584,   584,
-     584,   584,   584,   585,   585,   585,   585,   585,   585,   585,
-     585,   585,   585,   585,   585,   585,   585,   585,   585,   585,
-     585,   585,   585,   585,   585,   585,   585,   585,   585,   585,
-     585,   585,   585,   585,   585,   585,   585,   585,   585,   585,
-     585,   585,   585,   585,   585,   585,   585,   586,   586,   587,
-     588,   589,   589,   590,   591,   592,   592,   593,   594,   595,
-     596,   596,   597,   597,   597,   598,   599,   599,   599,   600,
-     600,   601,   602,   602,   603,   604,   604,   605,   606,   606,
-     607,   608,   608,   609,   610,   610,   611,   611,   612,   612,
-     613,   614,   615,   616,   616,   617,   618,   618,   619,   620,
-     620,   620,   620,   620,   620,   620,   620,   621,   622,   623,
-     623,   624,   624,   625,   625,   626,   627,   627,   628,   628,
-     628,   629,   630,   630,   631,   631,   632,   633,   633,   634,
-     635,   635,   636,   636,   637,   638,   639,   640,   641,   641,
-     642,   642,   642,   643,   644,   644,   645,   645,   645,   646,
-     646,   647,   647,   648,   648,   648,   648,   648,   648,   648,
-     648,   648,   648,   648,   649,   651,   650,   650,   652,   652,
-     653,   654,   655,   655,   656,   657,   658,   658,   659,   660,
-     660,   661,   661,   662,   663,   664,   665,   665,   666,   666,
-     667,   668,   668,   669,   669,   670,   670,   671,   671,   672,
-     672,   672,   672,   672,   672,   672,   672,   672,   672,   672,
-     673,   673,   674,   674,   675,   676,   676,   677,   678,   679,
-     679,   679,   680,   680,   681,   682,   682,   683,   683,   684,
-     685,   685,   686,   687,   688,   688,   688,   689,   689,   690,
-     690,   690,   691,   691,   692,   693,   693,   694,   694,   694,
-     694,   694,   694,   694,   695,   696,   697,   698,   699,   699,
-     699,   700,   701,   702,   703,   703,   704,   704,   705,   705,
-     705,   705,   705,   705,   705,   705,   705,   706,   706,   707,
-     707,   707,   707,   707,   708,   709,   709,   710,   710,   710,
-     710,   711,   712,   713,   713,   714,   714,   715,   715,   716,
-     717,   718,   719,   720,   721,   721,   722,   723,   723,   724,
-     724,   725,   725,   726,   726,   727,   727,   728,   729,   729,
-     729,   729,   729,   730,   731,   732,   732,   733,   734,   734,
-     735,   736,   736,   737,   738,   739,   739,   740,   740,   741,
-     741,   742,   742,   742,   742,   743,   744,   745,   746,   747,
-     748,   748,   749,   750,   750,   751,   751,   752,   753,   754,
-     755,   756,   756,   757,   758,   759,   760,   761,   762,   763,
-     764,   764,   765,   765,   765,   766,   767,   768,   768,   769,
-     769,   770,   770,   771,   772,   772,   773,   773,   774,   774,
-     775,   776,   777,   777,   777,   778,   779,   779,   780,   781,
-     782,   782,   783,   784,   785,   785,   785,   785,   785,   785,
-     785,   785,   785,   785,   785,   785,   785,   785,   785,   785,
-     785,   785,   785,   785,   785,   785,   785,   785,   785,   785,
-     786,   787,   788,   788,   789,   789,   790,   790,   790,   790,
-     790,   790,   790,   790,   790,   791,   792,   793,   794,   795,
-     796,   797,   798,   798,   798,   799,   800,   801,   802,   803,
-     804,   804,   804,   804,   804,   804,   804,   804,   804,   804,
-     804,   804,   804,   804,   805,   805,   806,   806,   807,   807,
-     807,   807,   808,   808,   809,   810,   810,   811,   811,   812,
-     812,   813,   813,   813,   813,   813,   813,   814,   815,   815,
-     816,   816,   816,   816,   817,   817,   818,   818,   819,   819,
-     820,   820,   821,   821,   822,   822,   823,   824,   825,   826,
-     826,   827,   827,   828,   828,   829,   829,   829,   829,   829,
-     829,   829,   829,   829,   829,   829,   830,   831,   831,   832,
-     833,   833,   834,   835,   836,   837,   838,   839,   840,   841,
-     842,   842,   843,   843,   844,   844,   845,   846,   846,   846,
-     846,   847,   848,   849,   849,   850,   850,   850,   850,   850,
-     850,   851,   852,   853,   853,   853,   854,   854,   854,   855,
-     855,   856,   856,   857,   857,   857,   858,   858,   858,   858,
-     858,   859,   860,   861,   862,   862,   863,   863,   864,   865,
-     866,   867,   867,   868,   869,   870,   870,   871,   871,   872,
-     872,   873,   873,   873,   873,   873,   873,   874,   875,   876,
-     877,   877,   877,   878,   878,   879,   879,   880,   880,   881,
-     881,   882,   883,   883,   884,   884,   884,   884,   884,   885,
-     886,   887,   888,   889,   890,   890,   891,   892,   892,   893,
-     893,   893,   894,   895,   896,   897,   897,   898,   898,   898,
-     898,   898,   898,   898,   898,   899,   900,   901,   901,   902,
-     903,   903,   904,   904,   904,   904,   904,   905,   905,   906,
-     906,   907,   907,   908
-};
-
-  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
-{
-       0,     2,     0,     3,     3,     3,     3,     3,     2,     1,
-       1,     1,     3,     3,     4,     5,     5,     3,     4,     3,
-       0,     2,     2,     2,     1,     1,     4,     5,     4,     5,
-       2,     5,     1,     0,     1,     0,     1,     0,     2,     3,
-       1,     3,     1,     1,     1,     0,     0,     0,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     2,     4,     2,     5,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     2,     3,
-       5,     5,     2,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     4,     7,     2,     3,     7,     6,
-       0,     2,     5,     1,     4,     1,     1,     1,     2,     1,
-       4,     1,     1,     1,     1,     1,     1,     2,     2,     2,
-       1,     1,     7,     3,     4,     3,     4,     3,     2,     5,
-       0,     2,     2,     5,     0,     4,     5,     0,     2,     3,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       0,     1,     5,     6,     6,     0,     1,     5,     9,     1,
-       1,     2,     2,     0,     0,     2,     2,     5,     4,     4,
-       3,     4,     3,     4,     3,     3,     4,     5,     3,     4,
-       5,     3,     3,     1,     3,     2,     4,     3,     4,     3,
-       3,     3,     3,     3,     3,     1,     4,     1,     1,     4,
-       3,     0,     0,     4,     1,     3,     1,     3,     2,     3,
-       3,     4,     2,     0,     1,     1,     3,     5,     1,     3,
-       0,     1,     7,     1,     3,     2,     2,     3,     1,     1,
-       4,     3,     2,     1,     1,     1,     1,     3,     1,     3,
-       1,     1,     6,     1,     1,     2,     2,     1,     3,     1,
-       2,     2,     1,     3,     1,     3,     5,     1,     1,     1,
-       2,     2,     3,     3,     1,     3,     3,     1,     3,     1,
-       1,     3,     1,     3,     1,     1,     3,     5,     0,     0,
-       1,     4,     4,     1,     3,     3,     2,     1,     3,     3,
-       6,     6,     7,     1,     1,     3,     1,     1,     1,     3,
-       3,     0,     3,     0,     2,     3,     1,     1,     2,     3,
-       1,     1,     1,     3,     1,     3,     1,     1,     3,     4,
-       0,     2,     2,     1,     1,     3,     1,     3,     1,     0,
-       0,     0,     2,     0,     1,     1,     1,     2,     2,     4,
-       1,     3,     1,     3,     1,     1,     1,     1,     3,     3,
-       3,     3,     3,     2,     2,     2,     3,     3,     3,     3,
-       3,     3,     3,     3,     3,     3,     3,     2,     3,     3,
-       1,     1,     1,     1,     1,     1,     5,     6,     4,     5,
-       3,     1,     1,     5,     4,     2,     0,     1,     5,     0,
-       1,     1,     3,     1,     3,     2,     1,     1,     1,     1,
-       1,     1,     3,     3,     5,     1,     1,     3,     2,     5,
-       4,     4,     3,     2,     1,     0,     0,     6,     1,     1,
-       1,     4,     5,     1,     4,     5,     0,     1,     3,     1,
-       1,     1,     2,     3,     3,     2,     1,     2,     2,     2,
-       3,     7,     3,     3,     1,     2,     2,     1,     2,     3,
-       1,     1,     1,     5,     7,     0,     6,     4,    11,    13,
-       4,     3,     3,     7,     8,     3,     1,     2,     2,     3,
-       1,     3,     0,     1,     0,     1,     1,     2,     5,     6,
-       1,     3,     3,     0,     2,     1,     5,     7,     0,     1,
-       3,     3,     6,     5,     6,     4,     5,     5,     2,     1,
-       1,    10,     1,     3,     4,     3,     3,     3,     3,     6,
-       6,     5,     8,     2,     3,     3,     7,     7,     0,     1,
-       4,     2,     4,     1,     2,     2,     1,     1,     0,     0,
-       0,     2,     2,     2,     2,     2,     1,     2,     2,     3,
-       4,     2,     3,     1,     3,     3,     1,     1,     1,     3,
-       1,     1,     4,     5,     1,     1,     3,     3,     1,     4,
-       1,     1,     1,     2,     2,     2,     1,     3,     3,     4,
-       4,     1,     3,     1,     5,     1,     1,     1,     3,     3,
-       3,     3,     3,     3,     1,     3,     5,     5,     5,     0,
-       0,     1,     3,     1,     1,     3,     3,     3,     3,     2,
-       3,     3,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     3,     3,     2,
-       3,     1,     3,     1,     3,     1,     3,     1,     4,     3,
-       1,     3,     1,     3,     4,     1,     4,     4,     4,     3,
-       3,     1,     3,     3,     1,     3,     3,     1,     3,     3,
-       1,     3,     0,     5,     6,     8,     1,     3,     1,     1,
-       1,     4,     1,     0,     2,     3,     2,     4,     0,     1,
-       5,     4,     6,     4,     1,     4,     4,     1,     6,     1,
-       3,     1,     3,     1,     4,     1,     1,     3,     1,     1,
-       3,     1,     0,     1,     2,     3,     1,     2,     5,     4,
-       4,     6,     1,     3,     1,     1,     6,     4,     1,     3,
-       1,     1,     1,     1,     1,     3,     1,     1,     1,     6,
-       4,     1,     4,     1,     1,     1,     1,     4,     2,     7,
-       1,     4,     1,     1,    11,     0,     2,     3,     1,     3,
-       1,     3,     1,     3,     1,     3,     1,     3,     1,     3,
-       8,     1,     3,     2,     2,     7,     1,     3,     3,     1,
-       4,     1,     3,     1,     1,     0,     1,     1,     2,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       8,     6,     8,     6,     1,     6,     6,     6,     6,     1,
-       3,     5,     1,     3,     6,     1,     3,     8,     6,     6,
-       4,     5,     5,     0,     2,     2,     0,     1,     3,     1,
-       4,     7,     1,     3,     3,     1,     3,     5,     3,     3,
-       1,     3,     1,     1,     3,     3,     3,     3,    10,     8,
-      10,     0,     0,     1,     2,     4,     4,     6,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     6,
-       4,     4,     3,     9,     1,     1,     3,     1,     5,     5,
-       9,     0,     1,     1,     3,     3,     3,     3,     3,     6,
-       3,     3,     3,     3,     7,     5,     1,     1,     3,     4,
-       1,     1,     3,     1,     1,     3,     3,     2,     3,     4,
-       4,     5,     5,     1,     2,     4,     4,     4,     0,     1,
-       2,     7,     6,     3,     3,     7,     5,     1,     3,     1,
-       4,     2,     3,     3,     4,     6,     3,     2,     3,     1,
-       1,     4,     5,     3,     6,     2,     4,     2,     1,     3,
-       3,     0,     1,     3,     2,     2,     2,     2,     9,     5,
-       1,     3,     2,     2,     2,     9,     4,     1,     3,     1,
-       1,     2,     0,     7,     1,     4,     1,     3,     1,     1,
-       1,    16,     0,     3,     3,     3,     3,     6,     9,     5,
-       1,     3,     5,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       2,     2,     4,     3,     4,     5,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     5,     2,     2,     2,     2,
-       2,     5,     1,     1,     1,     4,     4,     4,     4,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     4,     3,     4,     5,     1,     1,
-       1,     1,     4,     3,     2,     4,     3,     4,     3,     4,
-       5,     1,     1,     1,     1,     1,     1,     1,     7,     5,
-       1,     1,     1,     1,     4,     3,     4,     5,     1,     1,
-       4,     3,     4,     5,     1,     1,     2,     1,     2,     4,
-       3,     4,     3,     4,     5,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     4,     3,     2,
-       4,     3,     2,     3,     2,     2,     2,     2,     2,     2,
-       3,     2,     5,     2,     5,     2,     5,     1,     1,     3,
-       3,     0,     0,     1,     1,     1,     1,     1,     1,     1,
-       1,     3,     2,     5,     4,     2,     5,     4,     2,     2,
-       1,     1,     3,     2,     2,     2,     4,     4,     4,     4,
-       4,     4,     1,     1,     1,     3,     2,     2,     1,     1,
-       4,     1,     3,     1,     3,     0,     1,     1,     2,     6,
-       3,     1,     1,     1,     1,     1,     1,     5,     5,     5,
-       3,    10,    10,     1,     3,     2,     5,     0,     6,     0,
-       6,     2,     1,     3,     1,     1,     1,     1,     1,     5,
-       5,     5,     5,     5,     1,     3,     3,     1,     3,     1,
-       1,     1,     5,     5,     5,     1,     3,     2,     5,     2,
-       5,     5,     2,     5,     2,     5,     1,     1,     3,     5,
-       1,     3,     5,     5,     5,     5,     7,     1,     3,     2,
-       2,     2,     2,     0
-};
-
-
-#define yyerrok         (yyerrstatus = 0)
-#define yyclearin       (yychar = YYEMPTY)
-#define YYEMPTY         (-2)
-#define YYEOF           0
-
-#define YYACCEPT        goto yyacceptlab
-#define YYABORT         goto yyabortlab
-#define YYERROR         goto yyerrorlab
-
-
-#define YYRECOVERING()  (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)                                  \
-do                                                              \
-  if (yychar == YYEMPTY)                                        \
-    {                                                           \
-      yychar = (Token);                                         \
-      yylval = (Value);                                         \
-      YYPOPSTACK (yylen);                                       \
-      yystate = *yyssp;                                         \
-      goto yybackup;                                            \
-    }                                                           \
-  else                                                          \
-    {                                                           \
-      yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;                                                  \
-    }                                                           \
-while (0)
-
-/* Error token number */
-#define YYTERROR        1
-#define YYERRCODE       256
-
-
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-# ifndef YYFPRINTF
-#  include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#  define YYFPRINTF fprintf
-# endif
-
-# define YYDPRINTF(Args)                        \
-do {                                            \
-  if (yydebug)                                  \
-    YYFPRINTF Args;                             \
-} while (0)
-
-/* This macro is provided for backward compatibility. */
-#ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-#endif
-
-
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
-do {                                                                      \
-  if (yydebug)                                                            \
-    {                                                                     \
-      YYFPRINTF (stderr, "%s ", Title);                                   \
-      yy_symbol_print (stderr,                                            \
-                  Type, Value); \
-      YYFPRINTF (stderr, "\n");                                           \
-    }                                                                     \
-} while (0)
-
-
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT.  |
-`----------------------------------------*/
-
-static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-{
-  FILE *yyo = yyoutput;
-  YYUSE (yyo);
-  if (!yyvaluep)
-    return;
-# ifdef YYPRINT
-  if (yytype < YYNTOKENS)
-    YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# endif
-  YYUSE (yytype);
-}
-
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-{
-  YYFPRINTF (yyoutput, "%s %s (",
-             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
-
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
-  YYFPRINTF (yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-static void
-yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-{
-  YYFPRINTF (stderr, "Stack now");
-  for (; yybottom <= yytop; yybottom++)
-    {
-      int yybot = *yybottom;
-      YYFPRINTF (stderr, " %d", yybot);
-    }
-  YYFPRINTF (stderr, "\n");
-}
-
-# define YY_STACK_PRINT(Bottom, Top)                            \
-do {                                                            \
-  if (yydebug)                                                  \
-    yy_stack_print ((Bottom), (Top));                           \
-} while (0)
-
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-static void
-yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
-{
-  unsigned long int yylno = yyrline[yyrule];
-  int yynrhs = yyr2[yyrule];
-  int yyi;
-  YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-             yyrule - 1, yylno);
-  /* The symbols being reduced.  */
-  for (yyi = 0; yyi < yynrhs; yyi++)
-    {
-      YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr,
-                       yystos[yyssp[yyi + 1 - yynrhs]],
-                       &(yyvsp[(yyi + 1) - (yynrhs)])
-                                              );
-      YYFPRINTF (stderr, "\n");
-    }
-}
-
-# define YY_REDUCE_PRINT(Rule)          \
-do {                                    \
-  if (yydebug)                          \
-    yy_reduce_print (yyssp, yyvsp, Rule); \
-} while (0)
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-# define YYDPRINTF(Args)
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-# define YY_STACK_PRINT(Bottom, Top)
-# define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
-# define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#ifndef YYMAXDEPTH
-# define YYMAXDEPTH 10000
-#endif
-
-
-#if YYERROR_VERBOSE
-
-# ifndef yystrlen
-#  if defined __GLIBC__ && defined _STRING_H
-#   define yystrlen strlen
-#  else
-/* Return the length of YYSTR.  */
-static YYSIZE_T
-yystrlen (const char *yystr)
-{
-  YYSIZE_T yylen;
-  for (yylen = 0; yystr[yylen]; yylen++)
-    continue;
-  return yylen;
-}
-#  endif
-# endif
-
-# ifndef yystpcpy
-#  if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#   define yystpcpy stpcpy
-#  else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-static char *
-yystpcpy (char *yydest, const char *yysrc)
-{
-  char *yyd = yydest;
-  const char *yys = yysrc;
-
-  while ((*yyd++ = *yys++) != '\0')
-    continue;
-
-  return yyd - 1;
-}
-#  endif
-# endif
-
-# ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr (char *yyres, const char *yystr)
-{
-  if (*yystr == '"')
-    {
-      YYSIZE_T yyn = 0;
-      char const *yyp = yystr;
-
-      for (;;)
-        switch (*++yyp)
-          {
-          case '\'':
-          case ',':
-            goto do_not_strip_quotes;
-
-          case '\\':
-            if (*++yyp != '\\')
-              goto do_not_strip_quotes;
-            /* Fall through.  */
-          default:
-            if (yyres)
-              yyres[yyn] = *yyp;
-            yyn++;
-            break;
-
-          case '"':
-            if (yyres)
-              yyres[yyn] = '\0';
-            return yyn;
-          }
-    do_not_strip_quotes: ;
-    }
-
-  if (! yyres)
-    return yystrlen (yystr);
-
-  return yystpcpy (yyres, yystr) - yyres;
-}
-# endif
-
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
-{
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
-                  if (! (yysize <= yysize1
-                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                    return 2;
-                  yysize = yysize1;
-                }
-              }
-        }
-    }
-
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
-
-  {
-    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
-    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-      return 2;
-    yysize = yysize1;
-  }
-
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
-
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
-}
-#endif /* YYERROR_VERBOSE */
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-{
-  YYUSE (yyvaluep);
-  if (!yymsg)
-    yymsg = "Deleting";
-  YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  YYUSE (yytype);
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-}
-
-
-
-
-/* The lookahead symbol.  */
-int yychar;
-
-/* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-int
-yyparse (void)
-{
-    int yystate;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-
-    /* The stacks and their tools:
-       'yyss': related to states.
-       'yyvs': related to semantic values.
-
-       Refer to the stacks through separate pointers, to allow yyoverflow
-       to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16 *yyss;
-    yytype_int16 *yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE *yyvs;
-    YYSTYPE *yyvsp;
-
-    YYSIZE_T yystacksize;
-
-  int yyn;
-  int yyresult;
-  /* Lookahead token as an internal (translated) token number.  */
-  int yytoken = 0;
-  /* The variables used to return semantic value and location from the
-     action routines.  */
-  YYSTYPE yyval;
-
-#if YYERROR_VERBOSE
-  /* Buffer for error messages, and its allocated size.  */
-  char yymsgbuf[128];
-  char *yymsg = yymsgbuf;
-  YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-#define YYPOPSTACK(N)   (yyvsp -= (N), yyssp -= (N))
-
-  /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-  int yylen = 0;
-
-  yyssp = yyss = yyssa;
-  yyvsp = yyvs = yyvsa;
-  yystacksize = YYINITDEPTH;
-
-  YYDPRINTF ((stderr, "Starting parse\n"));
-
-  yystate = 0;
-  yyerrstatus = 0;
-  yynerrs = 0;
-  yychar = YYEMPTY; /* Cause a token to be read.  */
-  goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
- yynewstate:
-  /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
-  yyssp++;
-
- yysetstate:
-  *yyssp = yystate;
-
-  if (yyss + yystacksize - 1 <= yyssp)
-    {
-      /* Get the current used size of the three stacks, in elements.  */
-      YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-      {
-        /* Give user a chance to reallocate the stack.  Use copies of
-           these so that the &'s don't force the real ones into
-           memory.  */
-        YYSTYPE *yyvs1 = yyvs;
-        yytype_int16 *yyss1 = yyss;
-
-        /* Each stack pointer address is followed by the size of the
-           data in use in that stack, in bytes.  This used to be a
-           conditional around just the two extra args, but that might
-           be undefined if yyoverflow is a macro.  */
-        yyoverflow (YY_("memory exhausted"),
-                    &yyss1, yysize * sizeof (*yyssp),
-                    &yyvs1, yysize * sizeof (*yyvsp),
-                    &yystacksize);
-
-        yyss = yyss1;
-        yyvs = yyvs1;
-      }
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
-      goto yyexhaustedlab;
-# else
-      /* Extend the stack our own way.  */
-      if (YYMAXDEPTH <= yystacksize)
-        goto yyexhaustedlab;
-      yystacksize *= 2;
-      if (YYMAXDEPTH < yystacksize)
-        yystacksize = YYMAXDEPTH;
-
-      {
-        yytype_int16 *yyss1 = yyss;
-        union yyalloc *yyptr =
-          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-        if (! yyptr)
-          goto yyexhaustedlab;
-        YYSTACK_RELOCATE (yyss_alloc, yyss);
-        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-#  undef YYSTACK_RELOCATE
-        if (yyss1 != yyssa)
-          YYSTACK_FREE (yyss1);
-      }
-# endif
-#endif /* no yyoverflow */
-
-      yyssp = yyss + yysize - 1;
-      yyvsp = yyvs + yysize - 1;
-
-      YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-                  (unsigned long int) yystacksize));
-
-      if (yyss + yystacksize - 1 <= yyssp)
-        YYABORT;
-    }
-
-  YYDPRINTF ((stderr, "Entering state %d\n", yystate));
-
-  if (yystate == YYFINAL)
-    YYACCEPT;
-
-  goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-  /* Do appropriate processing given the current state.  Read a
-     lookahead token if we need one and don't already have one.  */
-
-  /* First try to decide what to do without reference to lookahead token.  */
-  yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
-    goto yydefault;
-
-  /* Not known => get a lookahead token if don't already have one.  */
-
-  /* YYCHAR is either YYEMPTY or YYEOF or a valid lookahead symbol.  */
-  if (yychar == YYEMPTY)
-    {
-      YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = yylex ();
-    }
-
-  if (yychar <= YYEOF)
-    {
-      yychar = yytoken = YYEOF;
-      YYDPRINTF ((stderr, "Now at end of input.\n"));
-    }
-  else
-    {
-      yytoken = YYTRANSLATE (yychar);
-      YY_SYMBOL_PRINT ("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-  /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-  yyn += yytoken;
-  if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-    goto yydefault;
-  yyn = yytable[yyn];
-  if (yyn <= 0)
-    {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
-      yyn = -yyn;
-      goto yyreduce;
-    }
-
-  /* Count tokens shifted since error; after three, turn off error
-     status.  */
-  if (yyerrstatus)
-    yyerrstatus--;
-
-  /* Shift the lookahead token.  */
-  YY_SYMBOL_PRINT ("Shifting", yytoken, &yylval, &yylloc);
-
-  /* Discard the shifted token.  */
-  yychar = YYEMPTY;
-
-  yystate = yyn;
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-
-  goto yynewstate;
-
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-  yyn = yydefact[yystate];
-  if (yyn == 0)
-    goto yyerrlab;
-  goto yyreduce;
-
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-  /* yyn is the number of a rule to reduce with.  */
-  yylen = yyr2[yyn];
-
-  /* If YYLEN is nonzero, implement the default value of the action:
-     '$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-  yyval = yyvsp[1-yylen];
-
-
-  YY_REDUCE_PRINT (yyn);
-  switch (yyn)
-    {
-        case 2:
-#line 797 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = BFNULL; }
-#line 4460 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 3:
-#line 799 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = set_stat_list((yyvsp[-2].bf_node),(yyvsp[-1].bf_node)); }
-#line 4466 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 4:
-#line 803 "gram1.y" /* yacc.c:1646  */
-    { lastwasbranch = NO;  (yyval.bf_node) = BFNULL; }
-#line 4472 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 5:
-#line 805 "gram1.y" /* yacc.c:1646  */
-    {
-	       if ((yyvsp[-1].bf_node) != BFNULL) 
-               {	    
-	          (yyvsp[-1].bf_node)->label = (yyvsp[-2].label);
-	          (yyval.bf_node) = (yyvsp[-1].bf_node);
-	 	  if (is_openmp_stmt) {            /*OMP*/
-			is_openmp_stmt = 0;
-			if((yyvsp[-1].bf_node)) {                        /*OMP*/
-				if ((yyvsp[-1].bf_node)->decl_specs != -BIT_OPENMP) (yyvsp[-1].bf_node)->decl_specs = BIT_OPENMP; /*OMP*/
-			}                               /*OMP*/
-		  }                                       /*OMP*/
-               }
-	    }
-#line 4490 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 6:
-#line 819 "gram1.y" /* yacc.c:1646  */
-    { PTR_BFND p;
-
-	     if(lastwasbranch && ! thislabel)
-               /*if (warn_all)
-		 warn("statement cannot be reached", 36);*/
-	     lastwasbranch = thiswasbranch;
-	     thiswasbranch = NO;
-	     if((yyvsp[-1].bf_node)) (yyvsp[-1].bf_node)->label = (yyvsp[-2].label);
-	     if((yyvsp[-2].label) && (yyvsp[-1].bf_node)) (yyvsp[-2].label)->statbody = (yyvsp[-1].bf_node); /*8.11.06 podd*/
-	     if((yyvsp[-2].label)) {
-		/*$1->statbody = $2;*/ /*8.11.06 podd*/
-		if((yyvsp[-2].label)->labtype == LABFORMAT)
-		  err("label already that of a format",39);
-		else
-		  (yyvsp[-2].label)->labtype = LABEXEC;
-	     }
-	     if (is_openmp_stmt) {            /*OMP*/
-			is_openmp_stmt = 0;
-			if((yyvsp[-1].bf_node)) {                        /*OMP*/
-				if ((yyvsp[-1].bf_node)->decl_specs != -BIT_OPENMP) (yyvsp[-1].bf_node)->decl_specs = BIT_OPENMP; /*OMP*/
-			}                               /*OMP*/
-	     }                                       /*OMP*/
-             for (p = pred_bfnd; (yyvsp[-2].label) && 
-		  ((p->variant == FOR_NODE)||(p->variant == WHILE_NODE)) &&
-                  (p->entry.for_node.doend) &&
-		  (p->entry.for_node.doend->stateno == (yyvsp[-2].label)->stateno);
-		  p = p->control_parent)
-                ++end_group;
-	     (yyval.bf_node) = (yyvsp[-1].bf_node);
-     }
-#line 4525 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 7:
-#line 850 "gram1.y" /* yacc.c:1646  */
-    { /* PTR_LLND p; */
-			doinclude( (yyvsp[0].charp) );
-/*			p = make_llnd(fi, STRING_VAL, LLNULL, LLNULL, SMNULL);
-			p->entry.string_val = $3;
-			p->type = global_string;
-			$$ = get_bfnd(fi, INCLUDE_STAT, SMNULL, p, LLNULL); */
-			(yyval.bf_node) = BFNULL;
-		}
-#line 4538 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 8:
-#line 859 "gram1.y" /* yacc.c:1646  */
-    {
-	      err("Unclassifiable statement", 10);
-	      flline();
-	      (yyval.bf_node) = BFNULL;
-	    }
-#line 4548 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 9:
-#line 865 "gram1.y" /* yacc.c:1646  */
-    { PTR_CMNT p;
-              PTR_BFND bif; 
-	    
-              if (last_bfnd && last_bfnd->control_parent &&((last_bfnd->control_parent->variant == LOGIF_NODE)
-	         ||(last_bfnd->control_parent->variant == FORALL_STAT)))
-  	         bif = last_bfnd->control_parent;
-              else
-                 bif = last_bfnd;
-              p=bif->entry.Template.cmnt_ptr;
-              if(p)
-                 p->string = StringConcatenation(p->string,commentbuf);
-              else
-              {
-                 p = make_comment(fi,commentbuf, FULL);
-                 bif->entry.Template.cmnt_ptr = p;
-              }
- 	      (yyval.bf_node) = BFNULL;         
-            }
-#line 4571 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 10:
-#line 885 "gram1.y" /* yacc.c:1646  */
-    { 
-	      flline();	 needkwd = NO;	inioctl = NO;
-/*!!!*/
-              opt_kwd_ = NO; intonly = NO; opt_kwd_hedr = NO; opt_kwd_r = NO; as_op_kwd_= NO; optcorner = NO;
-	      yyerrok; yyclearin;  (yyval.bf_node) = BFNULL;
-	    }
-#line 4582 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 11:
-#line 894 "gram1.y" /* yacc.c:1646  */
-    {
-	    if(yystno)
-	      {
-	      (yyval.label) = thislabel =	make_label_node(fi,yystno);
-	      thislabel->scope = cur_scope();
-	      if (thislabel->labdefined && (thislabel->scope == cur_scope()))
-		 errstr("Label %s already defined",convic(thislabel->stateno),40);
-	      else
-		 thislabel->labdefined = YES;
-	      }
-	    else
-	      (yyval.label) = thislabel = LBNULL;
-	    }
-#line 4600 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 12:
-#line 910 "gram1.y" /* yacc.c:1646  */
-    { PTR_BFND p;
-
-	        if (pred_bfnd != global_bfnd)
-		    err("Misplaced PROGRAM statement", 33);
-		p = get_bfnd(fi,PROG_HEDR, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL);
-		(yyvsp[0].symbol)->entry.prog_decl.prog_hedr=p;
- 		set_blobs(p, global_bfnd, NEW_GROUP1);
-	        add_scope_level(p, NO);
-	        position = IN_PROC;
-	    }
-#line 4615 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 13:
-#line 922 "gram1.y" /* yacc.c:1646  */
-    {  PTR_BFND q = BFNULL;
-
-	      (yyvsp[0].symbol)->variant = PROCEDURE_NAME;
-	      (yyvsp[0].symbol)->decl = YES;   /* variable declaration has been seen. */
-	      q = get_bfnd(fi,BLOCK_DATA, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL);
-	      set_blobs(q, global_bfnd, NEW_GROUP1);
-              add_scope_level(q, NO);
-	    }
-#line 4628 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 14:
-#line 932 "gram1.y" /* yacc.c:1646  */
-    { 
-              install_param_list((yyvsp[-1].symbol), (yyvsp[0].symbol), LLNULL, PROCEDURE_NAME); 
-	      /* if there is only a control end the control parent is not set */
-              
-	     }
-#line 4638 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 15:
-#line 939 "gram1.y" /* yacc.c:1646  */
-    { install_param_list((yyvsp[-1].symbol), (yyvsp[0].symbol), LLNULL, PROCEDURE_NAME); 
-              if((yyvsp[-4].ll_node)->variant == RECURSIVE_OP) 
-                   (yyvsp[-1].symbol)->attr = (yyvsp[-1].symbol)->attr | RECURSIVE_BIT;
-              pred_bfnd->entry.Template.ll_ptr3 = (yyvsp[-4].ll_node);
-            }
-#line 4648 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 16:
-#line 945 "gram1.y" /* yacc.c:1646  */
-    {
-              install_param_list((yyvsp[-2].symbol), (yyvsp[-1].symbol), (yyvsp[0].ll_node), FUNCTION_NAME);  
-  	      pred_bfnd->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-            }
-#line 4657 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 17:
-#line 950 "gram1.y" /* yacc.c:1646  */
-    {
-              install_param_list((yyvsp[-2].symbol), (yyvsp[-1].symbol), (yyvsp[0].ll_node), FUNCTION_NAME); 
-	      pred_bfnd->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-	    }
-#line 4666 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 18:
-#line 955 "gram1.y" /* yacc.c:1646  */
-    {PTR_BFND p, bif;
-	     PTR_SYMB q = SMNULL;
-             PTR_LLND l = LLNULL;
-
-	     if(parstate==OUTSIDE || procclass==CLMAIN || procclass==CLBLOCK)
-	        err("Misplaced ENTRY statement", 35);
-
-	     bif = cur_scope();
-	     if (bif->variant == FUNC_HEDR) {
-	        q = make_function((yyvsp[-2].hash_entry), bif->entry.Template.symbol->type, LOCAL);
-	        l = construct_entry_list(q, (yyvsp[-1].symbol), FUNCTION_NAME); 
-             }
-             else if ((bif->variant == PROC_HEDR) || 
-                      (bif->variant == PROS_HEDR) || /* added for FORTRAN M */
-                      (bif->variant == PROG_HEDR)) {
-	             q = make_procedure((yyvsp[-2].hash_entry),LOCAL);
-  	             l = construct_entry_list(q, (yyvsp[-1].symbol), PROCEDURE_NAME); 
-             }
-	     p = get_bfnd(fi,ENTRY_STAT, q, l, (yyvsp[0].ll_node), LLNULL);
-	     set_blobs(p, pred_bfnd, SAME_GROUP);
-             q->decl = YES;   /*4.02.03*/
-             q->entry.proc_decl.proc_hedr = p; /*5.02.03*/
-	    }
-#line 4694 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 19:
-#line 979 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	      PTR_BFND p;
-/*
-	      s = make_global_entity($3, MODULE_NAME, global_default, NO);
-	      s->decl = YES;  
-	      p = get_bfnd(fi, MODULE_STMT, s, LLNULL, LLNULL, LLNULL);
-	      s->entry.Template.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-*/
-	      /*position = IN_MODULE;*/
-
-
-               s = make_module((yyvsp[0].hash_entry));
-	       s->decl = YES;   /* variable declaration has been seen. */
-	        if (pred_bfnd != global_bfnd)
-		    err("Misplaced MODULE statement", 33);
-              p = get_bfnd(fi, MODULE_STMT, s, LLNULL, LLNULL, LLNULL);
-	      s->entry.Template.func_hedr = p; /* !!!????*/
-	      set_blobs(p, global_bfnd, NEW_GROUP1);
-	      add_scope_level(p, NO);	
-	      position =  IN_MODULE;    /*IN_PROC*/
-              privateall = 0;
-            }
-#line 4723 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 20:
-#line 1005 "gram1.y" /* yacc.c:1646  */
-    { newprog(); 
-	      if (position == IN_OUTSIDE)
-	           position = IN_PROC;
-              else if (position != IN_INTERNAL_PROC){ 
-                if(!is_interface_stat(pred_bfnd))
-	           position--;
-              }
-              else {
-                if(!is_interface_stat(pred_bfnd))
-                  err("Internal procedures can not contain procedures",304);
-              }
-	    }
-#line 4740 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 21:
-#line 1020 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, RECURSIVE_OP, LLNULL, LLNULL, SMNULL); }
-#line 4746 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 22:
-#line 1022 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, PURE_OP, LLNULL, LLNULL, SMNULL); }
-#line 4752 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 23:
-#line 1024 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, ELEMENTAL_OP, LLNULL, LLNULL, SMNULL); }
-#line 4758 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 24:
-#line 1028 "gram1.y" /* yacc.c:1646  */
-    { PTR_BFND p;
-
-	      (yyval.symbol) = make_procedure((yyvsp[0].hash_entry), LOCAL);
-	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
-             /* if (pred_bfnd != global_bfnd)
-		 {
-	         err("Misplaced SUBROUTINE statement", 34);
-		 }  
-              */
-	      p = get_bfnd(fi,PROC_HEDR, (yyval.symbol), LLNULL, LLNULL, LLNULL);
-              (yyval.symbol)->entry.proc_decl.proc_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }
-#line 4777 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 25:
-#line 1045 "gram1.y" /* yacc.c:1646  */
-    { PTR_BFND p;
-
-	      (yyval.symbol) = make_function((yyvsp[0].hash_entry), TYNULL, LOCAL);
-	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
-             /* if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement", 34); */
-	      p = get_bfnd(fi,FUNC_HEDR, (yyval.symbol), LLNULL, LLNULL, LLNULL);
-              (yyval.symbol)->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }
-#line 4793 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 26:
-#line 1059 "gram1.y" /* yacc.c:1646  */
-    { PTR_BFND p;
-             PTR_LLND l;
-
-	      (yyval.symbol) = make_function((yyvsp[0].hash_entry), (yyvsp[-3].data_type), LOCAL);
-	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
-              l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-              l->type = (yyvsp[-3].data_type);
-	      p = get_bfnd(fi,FUNC_HEDR, (yyval.symbol), LLNULL, l, LLNULL);
-              (yyval.symbol)->entry.func_decl.func_hedr = p;
-            /*  if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement", 34);*/
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-/*
-	      $$ = make_function($4, $1, LOCAL);
-	      $$->decl = YES;
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, LLNULL, LLNULL);
-              if (pred_bfnd != global_bfnd)
-	         errstr("cftn.gram: misplaced SUBROUTINE statement.");
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-*/
-           }
-#line 4821 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 27:
-#line 1083 "gram1.y" /* yacc.c:1646  */
-    { PTR_BFND p;
-             PTR_LLND l;
-	      (yyval.symbol) = make_function((yyvsp[0].hash_entry), (yyvsp[-4].data_type), LOCAL);
-	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
-              if((yyvsp[-3].ll_node)->variant == RECURSIVE_OP)
-	         (yyval.symbol)->attr = (yyval.symbol)->attr | RECURSIVE_BIT;
-              l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-              l->type = (yyvsp[-4].data_type);
-             /* if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement", 34);*/
-	      p = get_bfnd(fi,FUNC_HEDR, (yyval.symbol), LLNULL, l, (yyvsp[-3].ll_node));
-              (yyval.symbol)->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }
-#line 4841 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 28:
-#line 1099 "gram1.y" /* yacc.c:1646  */
-    { PTR_BFND p;
-
-	      (yyval.symbol) = make_function((yyvsp[0].hash_entry), TYNULL, LOCAL);
-	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
-              if((yyvsp[-3].ll_node)->variant == RECURSIVE_OP)
-	        (yyval.symbol)->attr = (yyval.symbol)->attr | RECURSIVE_BIT;
-              /*if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement",34);*/
-	      p = get_bfnd(fi,FUNC_HEDR, (yyval.symbol), LLNULL, LLNULL, (yyvsp[-3].ll_node));
-              (yyval.symbol)->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }
-#line 4859 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 29:
-#line 1113 "gram1.y" /* yacc.c:1646  */
-    { PTR_BFND p;
-              PTR_LLND l;
-	      (yyval.symbol) = make_function((yyvsp[0].hash_entry), (yyvsp[-3].data_type), LOCAL);
-	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
-              if((yyvsp[-4].ll_node)->variant == RECURSIVE_OP)
-	        (yyval.symbol)->attr = (yyval.symbol)->attr | RECURSIVE_BIT;
-              l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-              l->type = (yyvsp[-3].data_type);
-             /* if (pred_bfnd != global_bfnd)
-	          err("Misplaced FUNCTION statement",34);*/
-	      p = get_bfnd(fi,FUNC_HEDR, (yyval.symbol), LLNULL, l, (yyvsp[-4].ll_node));
-              (yyval.symbol)->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }
-#line 4879 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 30:
-#line 1131 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 4885 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 31:
-#line 1133 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-              s = make_scalar((yyvsp[-1].hash_entry), TYNULL, LOCAL);
-              (yyval.ll_node) = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-            }
-#line 4894 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 32:
-#line 1140 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_sym(yytext); }
-#line 4900 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 33:
-#line 1143 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = make_program(look_up_sym("_MAIN")); }
-#line 4906 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 34:
-#line 1145 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.symbol) = make_program((yyvsp[0].hash_entry));
-	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
-            }
-#line 4915 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 35:
-#line 1151 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = make_program(look_up_sym("_BLOCK")); }
-#line 4921 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 36:
-#line 1153 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.symbol) = make_program((yyvsp[0].hash_entry)); 
-	      (yyval.symbol)->decl = YES;   /* variable declaration has been seen. */
-	    }
-#line 4930 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 37:
-#line 1160 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = SMNULL; }
-#line 4936 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 38:
-#line 1162 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = SMNULL; }
-#line 4942 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 39:
-#line 1164 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = (yyvsp[-1].symbol); }
-#line 4948 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 41:
-#line 1169 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = set_id_list((yyvsp[-2].symbol), (yyvsp[0].symbol)); }
-#line 4954 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 42:
-#line 1173 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.symbol) = make_scalar((yyvsp[0].hash_entry), TYNULL, IO);
-            }
-#line 4962 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 43:
-#line 1177 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = make_scalar(look_up_sym("*"), TYNULL, IO); }
-#line 4968 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 44:
-#line 1183 "gram1.y" /* yacc.c:1646  */
-    { char *s;
-
-	      s = copyn(yyleng+1, yytext);
-	      s[yyleng] = '\0';
-	      (yyval.charp) = s;
-	    }
-#line 4979 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 45:
-#line 1192 "gram1.y" /* yacc.c:1646  */
-    { needkwd = 1; }
-#line 4985 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 46:
-#line 1196 "gram1.y" /* yacc.c:1646  */
-    { needkwd = NO; }
-#line 4991 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 47:
-#line 1201 "gram1.y" /* yacc.c:1646  */
-    { colon_flag = YES; }
-#line 4997 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 62:
-#line 1223 "gram1.y" /* yacc.c:1646  */
-    {
-	      saveall = YES;
-	      (yyval.bf_node) = get_bfnd(fi,SAVE_DECL, SMNULL, LLNULL, LLNULL, LLNULL);
-	    }
-#line 5006 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 63:
-#line 1228 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.bf_node) = get_bfnd(fi,SAVE_DECL, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
-            }
-#line 5014 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 64:
-#line 1233 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-
-	      p = make_llnd(fi,STMT_STR, LLNULL, LLNULL, SMNULL);
-	      p->entry.string_val = copys(stmtbuf);
-	      (yyval.bf_node) = get_bfnd(fi,FORMAT_STAT, SMNULL, p, LLNULL, LLNULL);
-             }
-#line 5025 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 65:
-#line 1240 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,PARAM_DECL, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL); }
-#line 5031 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 78:
-#line 1256 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, INTERFACE_STMT, SMNULL, LLNULL, LLNULL, LLNULL); 
-              add_scope_level((yyval.bf_node), NO);     
-            }
-#line 5039 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 79:
-#line 1260 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-
-	      s = make_procedure((yyvsp[0].hash_entry), LOCAL);
-	      s->variant = INTERFACE_NAME;
-	      (yyval.bf_node) = get_bfnd(fi, INTERFACE_STMT, s, LLNULL, LLNULL, LLNULL);
-              add_scope_level((yyval.bf_node), NO);
-	    }
-#line 5051 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 80:
-#line 1268 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-
-	      s = make_function((yyvsp[-1].hash_entry), global_default, LOCAL);
-	      s->variant = INTERFACE_NAME;
-	      (yyval.bf_node) = get_bfnd(fi, INTERFACE_OPERATOR, s, LLNULL, LLNULL, LLNULL);
-              add_scope_level((yyval.bf_node), NO);
-	    }
-#line 5063 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 81:
-#line 1276 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-
-
-	      s = make_procedure(look_up_sym("="), LOCAL);
-	      s->variant = INTERFACE_NAME;
-	      (yyval.bf_node) = get_bfnd(fi, INTERFACE_ASSIGNMENT, s, LLNULL, LLNULL, LLNULL);
-              add_scope_level((yyval.bf_node), NO);
-	    }
-#line 5076 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 82:
-#line 1285 "gram1.y" /* yacc.c:1646  */
-    { parstate = INDCL;
-              (yyval.bf_node) = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
-	      /*process_interface($$);*/ /*podd 01.02.03*/
-              delete_beyond_scope_level(pred_bfnd);
-	    }
-#line 5086 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 83:
-#line 1293 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_sym(yytext); }
-#line 5092 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 84:
-#line 1297 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = (yyvsp[0].hash_entry); }
-#line 5098 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 85:
-#line 1299 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = (yyvsp[0].hash_entry); }
-#line 5104 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 86:
-#line 1303 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(PLUS); }
-#line 5110 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 87:
-#line 1305 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(MINUS); }
-#line 5116 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 88:
-#line 1307 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(ASTER); }
-#line 5122 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 89:
-#line 1309 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(DASTER); }
-#line 5128 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 90:
-#line 1311 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(SLASH); }
-#line 5134 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 91:
-#line 1313 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(DSLASH); }
-#line 5140 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 92:
-#line 1315 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(AND); }
-#line 5146 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 93:
-#line 1317 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(OR); }
-#line 5152 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 94:
-#line 1319 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(XOR); }
-#line 5158 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 95:
-#line 1321 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(NOT); }
-#line 5164 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 96:
-#line 1323 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(EQ); }
-#line 5170 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 97:
-#line 1325 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(NE); }
-#line 5176 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 98:
-#line 1327 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(GT); }
-#line 5182 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 99:
-#line 1329 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(GE); }
-#line 5188 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 100:
-#line 1331 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(LT); }
-#line 5194 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 101:
-#line 1333 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(LE); }
-#line 5200 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 102:
-#line 1335 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(NEQV); }
-#line 5206 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 103:
-#line 1337 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = look_up_op(EQV); }
-#line 5212 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 104:
-#line 1342 "gram1.y" /* yacc.c:1646  */
-    {
-             PTR_SYMB s;
-         
-             type_var = s = make_derived_type((yyvsp[0].hash_entry), TYNULL, LOCAL);	
-             (yyval.bf_node) = get_bfnd(fi, STRUCT_DECL, s, LLNULL, LLNULL, LLNULL);
-             add_scope_level((yyval.bf_node), NO);
-	   }
-#line 5224 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 105:
-#line 1351 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-         
-             type_var = s = make_derived_type((yyvsp[0].hash_entry), TYNULL, LOCAL);	
-	     s->attr = s->attr | type_opt;
-             (yyval.bf_node) = get_bfnd(fi, STRUCT_DECL, s, (yyvsp[-2].ll_node), LLNULL, LLNULL);
-             add_scope_level((yyval.bf_node), NO);
-	   }
-#line 5236 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 106:
-#line 1361 "gram1.y" /* yacc.c:1646  */
-    {
-	     (yyval.bf_node) = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	     if (type_var != SMNULL)
-               process_type(type_var, (yyval.bf_node));
-             type_var = SMNULL;
-	     delete_beyond_scope_level(pred_bfnd);
-           }
-#line 5248 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 107:
-#line 1369 "gram1.y" /* yacc.c:1646  */
-    {
-             (yyval.bf_node) = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	     if (type_var != SMNULL)
-               process_type(type_var, (yyval.bf_node));
-             type_var = SMNULL;
-	     delete_beyond_scope_level(pred_bfnd);	
-           }
-#line 5260 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 108:
-#line 1379 "gram1.y" /* yacc.c:1646  */
-    { 
-	      PTR_LLND q, r, l;
-	     /* PTR_SYMB s;*/
-	      PTR_TYPE t;
-	      int type_opts;
-
-	      vartype = (yyvsp[-6].data_type);
-              if((yyvsp[-1].ll_node) && vartype->variant != T_STRING)
-                errstr("Non character entity  %s  has length specification",(yyvsp[-4].hash_entry)->ident,41);
-              t = make_type_node(vartype, (yyvsp[-1].ll_node));
-	      type_opts = type_options;
-	      if ((yyvsp[-2].ll_node)) type_opts = type_opts | DIMENSION_BIT;
-	      if ((yyvsp[-2].ll_node))
-		 q = deal_with_options((yyvsp[-4].hash_entry), t, type_opts, (yyvsp[-2].ll_node), ndim, (yyvsp[0].ll_node), (yyvsp[-2].ll_node));
-	      else q = deal_with_options((yyvsp[-4].hash_entry), t, type_opts, attr_dims, attr_ndim, (yyvsp[0].ll_node), (yyvsp[-2].ll_node));
-	      r = make_llnd(fi, EXPR_LIST, q, LLNULL, SMNULL);
-	      l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-	      l->type = vartype;
-	      (yyval.bf_node) = get_bfnd(fi,VAR_DECL, SMNULL, r, l, (yyvsp[-5].ll_node));
-	    }
-#line 5285 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 109:
-#line 1400 "gram1.y" /* yacc.c:1646  */
-    { 
-	      PTR_LLND q, r;
-	    /*  PTR_SYMB s;*/
-              PTR_TYPE t;
-	      int type_opts;
-              if((yyvsp[-1].ll_node) && vartype->variant != T_STRING)
-                errstr("Non character entity  %s  has length specification",(yyvsp[-3].hash_entry)->ident,41);
-              t = make_type_node(vartype, (yyvsp[-1].ll_node));
-	      type_opts = type_options;
-	      if ((yyvsp[-2].ll_node)) type_opts = type_opts | DIMENSION_BIT;
-	      if ((yyvsp[-2].ll_node))
-		 q = deal_with_options((yyvsp[-3].hash_entry), t, type_opts, (yyvsp[-2].ll_node), ndim, (yyvsp[0].ll_node), (yyvsp[-2].ll_node));
-	      else q = deal_with_options((yyvsp[-3].hash_entry), t, type_opts, attr_dims, attr_ndim, (yyvsp[0].ll_node), (yyvsp[-2].ll_node));
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, (yyvsp[-5].bf_node)->entry.Template.ll_ptr1);
-       	    }
-#line 5306 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 110:
-#line 1419 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 5312 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 111:
-#line 1421 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 5318 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 112:
-#line 1423 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-2].ll_node); }
-#line 5324 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 113:
-#line 1427 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 5330 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 114:
-#line 1429 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 5336 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 115:
-#line 1433 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | PARAMETER_BIT; 
-              (yyval.ll_node) = make_llnd(fi, PARAMETER_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5344 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 116:
-#line 1437 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 5350 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 117:
-#line 1439 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | ALLOCATABLE_BIT;
-              (yyval.ll_node) = make_llnd(fi, ALLOCATABLE_OP, LLNULL, LLNULL, SMNULL);
-	    }
-#line 5358 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 118:
-#line 1443 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | DIMENSION_BIT;
-	      attr_ndim = ndim;
-	      attr_dims = (yyvsp[0].ll_node);
-              (yyval.ll_node) = make_llnd(fi, DIMENSION_OP, (yyvsp[0].ll_node), LLNULL, SMNULL);
-            }
-#line 5368 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 119:
-#line 1449 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | EXTERNAL_BIT;
-              (yyval.ll_node) = make_llnd(fi, EXTERNAL_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5376 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 120:
-#line 1453 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 5382 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 121:
-#line 1455 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | INTRINSIC_BIT;
-              (yyval.ll_node) = make_llnd(fi, INTRINSIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5390 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 122:
-#line 1459 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | OPTIONAL_BIT;
-              (yyval.ll_node) = make_llnd(fi, OPTIONAL_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5398 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 123:
-#line 1463 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | POINTER_BIT;
-              (yyval.ll_node) = make_llnd(fi, POINTER_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5406 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 124:
-#line 1467 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | SAVE_BIT; 
-              (yyval.ll_node) = make_llnd(fi, SAVE_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5414 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 125:
-#line 1471 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | SAVE_BIT; 
-              (yyval.ll_node) = make_llnd(fi, STATIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5422 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 126:
-#line 1475 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | TARGET_BIT; 
-              (yyval.ll_node) = make_llnd(fi, TARGET_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5430 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 127:
-#line 1481 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | IN_BIT;  type_opt = IN_BIT; 
-              (yyval.ll_node) = make_llnd(fi, IN_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5438 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 128:
-#line 1485 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | OUT_BIT;  type_opt = OUT_BIT; 
-              (yyval.ll_node) = make_llnd(fi, OUT_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5446 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 129:
-#line 1489 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | INOUT_BIT;  type_opt = INOUT_BIT;
-              (yyval.ll_node) = make_llnd(fi, INOUT_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5454 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 130:
-#line 1495 "gram1.y" /* yacc.c:1646  */
-    { type_options = type_options | PUBLIC_BIT; 
-              type_opt = PUBLIC_BIT;
-              (yyval.ll_node) = make_llnd(fi, PUBLIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5463 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 131:
-#line 1500 "gram1.y" /* yacc.c:1646  */
-    { type_options =  type_options | PRIVATE_BIT;
-               type_opt = PRIVATE_BIT;
-              (yyval.ll_node) = make_llnd(fi, PRIVATE_OP, LLNULL, LLNULL, SMNULL);
-            }
-#line 5472 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 132:
-#line 1507 "gram1.y" /* yacc.c:1646  */
-    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);
-	      s->attr = s->attr | type_opt;	
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi, INTENT_STMT, SMNULL, r, (yyvsp[-3].ll_node), LLNULL);
-	    }
-#line 5487 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 133:
-#line 1518 "gram1.y" /* yacc.c:1646  */
-    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);	
-	      s->attr = s->attr | type_opt;
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-  	    }
-#line 5502 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 134:
-#line 1531 "gram1.y" /* yacc.c:1646  */
-    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);	
-	      s->attr = s->attr | OPTIONAL_BIT;
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi, OPTIONAL_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-#line 5517 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 135:
-#line 1542 "gram1.y" /* yacc.c:1646  */
-    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);	
-	      s->attr = s->attr | OPTIONAL_BIT;
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-  	    }
-#line 5532 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 136:
-#line 1555 "gram1.y" /* yacc.c:1646  */
-    { 
-	      PTR_LLND r;
-	      PTR_SYMB s;
-
-              s = (yyvsp[0].ll_node)->entry.Template.symbol; 
-              s->attr = s->attr | SAVE_BIT;
-	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi, STATIC_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-#line 5546 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 137:
-#line 1565 "gram1.y" /* yacc.c:1646  */
-    { 
-	      PTR_LLND r;
-	      PTR_SYMB s;
-
-              s = (yyvsp[0].ll_node)->entry.Template.symbol;
-              s->attr = s->attr | SAVE_BIT;
-	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-  	    }
-#line 5560 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 138:
-#line 1578 "gram1.y" /* yacc.c:1646  */
-    {
-	      privateall = 1;
-	      (yyval.bf_node) = get_bfnd(fi, PRIVATE_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
-	    }
-#line 5569 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 139:
-#line 1583 "gram1.y" /* yacc.c:1646  */
-    {
-	      /*type_options = type_options | PRIVATE_BIT;*/
-	      (yyval.bf_node) = get_bfnd(fi, PRIVATE_STMT, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
-            }
-#line 5578 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 140:
-#line 1589 "gram1.y" /* yacc.c:1646  */
-    {type_opt = PRIVATE_BIT;}
-#line 5584 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 141:
-#line 1593 "gram1.y" /* yacc.c:1646  */
-    { 
-	      (yyval.bf_node) = get_bfnd(fi, SEQUENCE_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
-            }
-#line 5592 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 142:
-#line 1598 "gram1.y" /* yacc.c:1646  */
-    {
-	      /*saveall = YES;*/ /*14.03.03*/
-	      (yyval.bf_node) = get_bfnd(fi, PUBLIC_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
-	    }
-#line 5601 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 143:
-#line 1603 "gram1.y" /* yacc.c:1646  */
-    {
-	      /*type_options = type_options | PUBLIC_BIT;*/
-	      (yyval.bf_node) = get_bfnd(fi, PUBLIC_STMT, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
-            }
-#line 5610 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 144:
-#line 1609 "gram1.y" /* yacc.c:1646  */
-    {type_opt = PUBLIC_BIT;}
-#line 5616 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 145:
-#line 1613 "gram1.y" /* yacc.c:1646  */
-    {
-	      type_options = 0;
-              /* following block added by dbg */
-	      ndim = 0;
-	      attr_ndim = 0;
-	      attr_dims = LLNULL;
-	      /* end section added by dbg */
-              (yyval.data_type) = make_type_node((yyvsp[-3].data_type), (yyvsp[-1].ll_node));
-            }
-#line 5630 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 146:
-#line 1623 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE t;
-
-	      type_options = 0;
-	      ndim = 0;
-	      attr_ndim = 0;
-	      attr_dims = LLNULL;
-              t = lookup_type((yyvsp[-2].hash_entry));
-	      vartype = t;
-	      (yyval.data_type) = make_type_node(t, LLNULL);
-            }
-#line 5645 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 147:
-#line 1636 "gram1.y" /* yacc.c:1646  */
-    {opt_kwd_hedr = YES;}
-#line 5651 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 148:
-#line 1641 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE p;
-	      PTR_LLND q;
-	      PTR_SYMB s;
-              s = (yyvsp[0].hash_entry)->id_attr;
-	      if (s)
-		   s->attr = (yyvsp[-1].token);
-	      else {
-		p = undeftype ? global_unknown : impltype[*(yyvsp[0].hash_entry)->ident - 'a'];
-                s = install_entry((yyvsp[0].hash_entry), SOFT);
-		s->attr = (yyvsp[-1].token);
-                set_type(s, p, LOCAL);
-	      }
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].hash_entry)->id_attr);
-	      q = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi,ATTR_DECL, SMNULL, q, LLNULL, LLNULL);
-	    }
-#line 5672 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 149:
-#line 1660 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE p;
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-	      int att;
-
-	      att = (yyvsp[-2].bf_node)->entry.Template.ll_ptr1->entry.Template.ll_ptr1->
-		    entry.Template.symbol->attr;
-              s = (yyvsp[0].hash_entry)->id_attr;
-	      if (s)
-		   s->attr = att;
-	      else {
-		p = undeftype ? global_unknown : impltype[*(yyvsp[0].hash_entry)->ident - 'a'];
-                s = install_entry((yyvsp[0].hash_entry), SOFT);
-		s->attr = att;
-                set_type(s, p, LOCAL);
-	      }
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].hash_entry)->id_attr);
-	      for (r = (yyvsp[-2].bf_node)->entry.Template.ll_ptr1;
-		   r->entry.list.next;
-		   r = r->entry.list.next) ;
-	      r->entry.list.next = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-
-	    }
-#line 5700 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 150:
-#line 1686 "gram1.y" /* yacc.c:1646  */
-    { (yyval.token) = ATT_GLOBAL; }
-#line 5706 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 151:
-#line 1688 "gram1.y" /* yacc.c:1646  */
-    { (yyval.token) = ATT_CLUSTER; }
-#line 5712 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 152:
-#line 1700 "gram1.y" /* yacc.c:1646  */
-    {
-/*		  varleng = ($1<0 || $1==TYLONG ? 0 : typesize[$1]); */
-		  vartype = (yyvsp[0].data_type);
-		}
-#line 5721 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 153:
-#line 1707 "gram1.y" /* yacc.c:1646  */
-    { (yyval.data_type) = global_int; }
-#line 5727 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 154:
-#line 1708 "gram1.y" /* yacc.c:1646  */
-    { (yyval.data_type) = global_float; }
-#line 5733 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 155:
-#line 1709 "gram1.y" /* yacc.c:1646  */
-    { (yyval.data_type) = global_complex; }
-#line 5739 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 156:
-#line 1710 "gram1.y" /* yacc.c:1646  */
-    { (yyval.data_type) = global_double; }
-#line 5745 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 157:
-#line 1711 "gram1.y" /* yacc.c:1646  */
-    { (yyval.data_type) = global_dcomplex; }
-#line 5751 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 158:
-#line 1712 "gram1.y" /* yacc.c:1646  */
-    { (yyval.data_type) = global_bool; }
-#line 5757 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 159:
-#line 1713 "gram1.y" /* yacc.c:1646  */
-    { (yyval.data_type) = global_string; }
-#line 5763 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 160:
-#line 1718 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 5769 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 161:
-#line 1720 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 5775 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 162:
-#line 1724 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, LEN_OP, (yyvsp[-2].ll_node), LLNULL, SMNULL); }
-#line 5781 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 163:
-#line 1726 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND l;
-
-                 l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL); 
-                 l->entry.string_val = (char *)"*";
-                 (yyval.ll_node) = make_llnd(fi, LEN_OP, l,l, SMNULL);
-                }
-#line 5792 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 164:
-#line 1733 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi, LEN_OP, (yyvsp[-1].ll_node), (yyvsp[-1].ll_node), SMNULL);}
-#line 5798 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 165:
-#line 1737 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 5804 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 166:
-#line 1739 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 5810 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 167:
-#line 1741 "gram1.y" /* yacc.c:1646  */
-    { /*$$ = make_llnd(fi, PAREN_OP, $2, LLNULL, SMNULL);*/  (yyval.ll_node) = (yyvsp[-2].ll_node);  }
-#line 5816 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 168:
-#line 1749 "gram1.y" /* yacc.c:1646  */
-    { if((yyvsp[-2].ll_node)->variant==LENGTH_OP && (yyvsp[-6].ll_node)->variant==(yyvsp[-2].ll_node)->variant)
-                (yyvsp[-2].ll_node)->variant=KIND_OP;
-                (yyval.ll_node) = make_llnd(fi, CONS, (yyvsp[-6].ll_node), (yyvsp[-2].ll_node), SMNULL); 
-            }
-#line 5825 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 169:
-#line 1756 "gram1.y" /* yacc.c:1646  */
-    { if(vartype->variant == T_STRING)
-                (yyval.ll_node) = make_llnd(fi,LENGTH_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);
-              else
-                (yyval.ll_node) = make_llnd(fi,KIND_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);
-            }
-#line 5835 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 170:
-#line 1762 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND l;
-	      l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	      l->entry.string_val = (char *)"*";
-              (yyval.ll_node) = make_llnd(fi,LENGTH_OP,l,LLNULL,SMNULL);
-            }
-#line 5845 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 171:
-#line 1768 "gram1.y" /* yacc.c:1646  */
-    { /* $$ = make_llnd(fi, SPEC_PAIR, $2, LLNULL, SMNULL); */
-	     char *q;
-             q = (yyvsp[-1].ll_node)->entry.string_val;
-  	     if (strcmp(q, "len") == 0)
-               (yyval.ll_node) = make_llnd(fi,LENGTH_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);
-             else
-                (yyval.ll_node) = make_llnd(fi,KIND_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);              
-            }
-#line 5858 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 172:
-#line 1777 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND l;
-	      l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	      l->entry.string_val = (char *)"*";
-              (yyval.ll_node) = make_llnd(fi,LENGTH_OP,l,LLNULL,SMNULL);
-            }
-#line 5868 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 173:
-#line 1785 "gram1.y" /* yacc.c:1646  */
-    {endioctl();}
-#line 5874 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 174:
-#line 1798 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 5880 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 175:
-#line 1800 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 5886 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 176:
-#line 1803 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, POINTST_OP, LLNULL, (yyvsp[0].ll_node), SMNULL); }
-#line 5892 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 177:
-#line 1807 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! (yyvsp[0].ll_node)) {
-		err("No dimensions in DIMENSION statement", 42);
-	      }
-              if(statement_kind == 1) /*DVM-directive*/
-                err("No shape specification", 65);                
-	      s = make_array((yyvsp[-1].hash_entry), TYNULL, (yyvsp[0].ll_node), ndim, LOCAL);
-	      s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-	      s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi,DIM_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-#line 5911 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 178:
-#line 1822 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! (yyvsp[0].ll_node)) {
-		err("No dimensions in DIMENSION statement", 42);
-	      }
-	      s = make_array((yyvsp[-1].hash_entry), TYNULL, (yyvsp[0].ll_node), ndim, LOCAL);
-	      s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-	      s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, (yyvsp[-3].bf_node)->entry.Template.ll_ptr1);
-	}
-#line 5928 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 179:
-#line 1838 "gram1.y" /* yacc.c:1646  */
-    {/* PTR_SYMB s;*/
-	      PTR_LLND r;
-
-	         /*if(!$5) {
-		   err("No dimensions in ALLOCATABLE statement",305);		
-	           }
-	          s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	          s->attr = s->attr | ALLOCATABLE_BIT;
-	          q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	          s->type->entry.ar_decl.ranges = $5;
-                  r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                */
-              (yyvsp[0].ll_node)->entry.Template.symbol->attr = (yyvsp[0].ll_node)->entry.Template.symbol->attr | ALLOCATABLE_BIT;
-	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi, ALLOCATABLE_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-#line 5949 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 180:
-#line 1856 "gram1.y" /* yacc.c:1646  */
-    {  /*PTR_SYMB s;*/
-	      PTR_LLND r;
-
-	        /*  if(! $4) {
-		      err("No dimensions in ALLOCATABLE statement",305);
-		
-	            }
-	           s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	           s->attr = s->attr | ALLOCATABLE_BIT;
-	           q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	           s->type->entry.ar_decl.ranges = $4;
-	           r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                */
-              (yyvsp[0].ll_node)->entry.Template.symbol->attr = (yyvsp[0].ll_node)->entry.Template.symbol->attr | ALLOCATABLE_BIT;
-              r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-	}
-#line 5971 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 181:
-#line 1876 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	      PTR_LLND  r;
-           
-	          /*  if(! $5) {
-		      err("No dimensions in POINTER statement",306);	    
-	              } 
-	             s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	             s->attr = s->attr | POINTER_BIT;
-	             q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	             s->type->entry.ar_decl.ranges = $5;
-                   */
-
-                  /*s = make_pointer( $4->entry.Template.symbol->parent, TYNULL, LOCAL);*/ /*17.02.03*/
-                 /*$4->entry.Template.symbol->attr = $4->entry.Template.symbol->attr | POINTER_BIT;*/
-              s = (yyvsp[0].ll_node)->entry.Template.symbol; /*17.02.03*/
-              s->attr = s->attr | POINTER_BIT;
-	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi, POINTER_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-#line 5995 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 182:
-#line 1896 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	      PTR_LLND r;
-
-     	        /*  if(! $4) {
-	        	err("No dimensions in POINTER statement",306);
-	            }
-	           s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	           s->attr = s->attr | POINTER_BIT;
-	           q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	           s->type->entry.ar_decl.ranges = $4;
-                */
-
-                /*s = make_pointer( $3->entry.Template.symbol->parent, TYNULL, LOCAL);*/ /*17.02.03*/
-                /*$3->entry.Template.symbol->attr = $3->entry.Template.symbol->attr | POINTER_BIT;*/
-              s = (yyvsp[0].ll_node)->entry.Template.symbol; /*17.02.03*/
-              s->attr = s->attr | POINTER_BIT;
-	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-	}
-#line 6019 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 183:
-#line 1918 "gram1.y" /* yacc.c:1646  */
-    {/* PTR_SYMB s;*/
-	      PTR_LLND r;
-
-
-	     /* if(! $5) {
-		err("No dimensions in TARGET statement",307);
-	      }
-	      s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	      s->attr = s->attr | TARGET_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $5;
-             */
-              (yyvsp[0].ll_node)->entry.Template.symbol->attr = (yyvsp[0].ll_node)->entry.Template.symbol->attr | TARGET_BIT;
-	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi, TARGET_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-#line 6040 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 184:
-#line 1935 "gram1.y" /* yacc.c:1646  */
-    {  /*PTR_SYMB s;*/
-	      PTR_LLND r;
-
-	     /* if(! $4) {
-		err("No dimensions in TARGET statement",307);
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	      s->attr = s->attr | TARGET_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-              */
-              (yyvsp[0].ll_node)->entry.Template.symbol->attr = (yyvsp[0].ll_node)->entry.Template.symbol->attr | TARGET_BIT;
-	      r = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-	}
-#line 6060 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 185:
-#line 1953 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q;
-
-              p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      q = make_llnd(fi,COMM_LIST, p, LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi,COMM_STAT, SMNULL, q, LLNULL, LLNULL);
-	    }
-#line 6071 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 186:
-#line 1960 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q;
-
-              p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      q = make_llnd(fi,COMM_LIST, p, LLNULL, (yyvsp[-1].symbol));
-	      (yyval.bf_node) = get_bfnd(fi,COMM_STAT, SMNULL, q, LLNULL, LLNULL);
-	    }
-#line 6082 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 187:
-#line 1967 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q;
-
-              p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      q = make_llnd(fi,COMM_LIST, p, LLNULL, (yyvsp[-2].symbol));
-	      add_to_lowList(q, (yyvsp[-4].bf_node)->entry.Template.ll_ptr1);
-	    }
-#line 6093 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 188:
-#line 1974 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, r;
-
-              p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      /*q = make_llnd(fi,COMM_LIST, p, LLNULL, SMNULL);*/
-	      for (r = (yyvsp[-2].bf_node)->entry.Template.ll_ptr1;
-		   r->entry.list.next;
-		   r = r->entry.list.next);
-	      add_to_lowLevelList(p, r->entry.Template.ll_ptr1);
-	    }
-#line 6107 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 189:
-#line 1987 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND q, r;
-
-              q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      r = make_llnd(fi,NAMELIST_LIST, q, LLNULL, (yyvsp[-1].symbol));
-	      (yyval.bf_node) = get_bfnd(fi,NAMELIST_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-#line 6118 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 190:
-#line 1994 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND q, r;
-
-              q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      r = make_llnd(fi,NAMELIST_LIST, q, LLNULL, (yyvsp[-2].symbol));
-	      add_to_lowList(r, (yyvsp[-4].bf_node)->entry.Template.ll_ptr1);
-	    }
-#line 6129 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 191:
-#line 2001 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND q, r;
-
-              q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      for (r = (yyvsp[-2].bf_node)->entry.Template.ll_ptr1;
-		   r->entry.list.next;
-		   r = r->entry.list.next);
-	      add_to_lowLevelList(q, r->entry.Template.ll_ptr1);
-	    }
-#line 6142 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 192:
-#line 2012 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) =  make_local_entity((yyvsp[-1].hash_entry), NAMELIST_NAME,global_default,LOCAL); }
-#line 6148 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 193:
-#line 2016 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = NULL; /*make_common(look_up_sym("*"));*/ }
-#line 6154 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 194:
-#line 2018 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = make_common((yyvsp[-1].hash_entry)); }
-#line 6160 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 195:
-#line 2023 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	
-	      if((yyvsp[0].ll_node)) {
-		s = make_array((yyvsp[-1].hash_entry), TYNULL, (yyvsp[0].ll_node), ndim, LOCAL);
-                s->attr = s->attr | DIMENSION_BIT;
-		s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
-		(yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-	      }
-	      else {
-		s = make_scalar((yyvsp[-1].hash_entry), TYNULL, LOCAL);	
-		(yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      }
-
-          }
-#line 6179 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 196:
-#line 2041 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_external((yyvsp[0].hash_entry), TYNULL);
-	      s->attr = s->attr | EXTERNAL_BIT;
-              q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      p = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi,EXTERN_STAT, SMNULL, p, LLNULL, LLNULL);
-	    }
-#line 6193 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 197:
-#line 2052 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_external((yyvsp[0].hash_entry), TYNULL);
-	      s->attr = s->attr | EXTERNAL_BIT;
-              p = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-	    }
-#line 6207 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 198:
-#line 2064 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_intrinsic((yyvsp[0].hash_entry), TYNULL); /*make_function($3, TYNULL, NO);*/
-	      s->attr = s->attr | INTRINSIC_BIT;
-              q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      p = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi,INTRIN_STAT, SMNULL, p,
-			     LLNULL, LLNULL);
-	    }
-#line 6222 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 199:
-#line 2076 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_intrinsic((yyvsp[0].hash_entry), TYNULL); /* make_function($3, TYNULL, NO);*/
-	      s->attr = s->attr | INTRINSIC_BIT;
-              p = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-	    }
-#line 6236 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 200:
-#line 2090 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.bf_node) = get_bfnd(fi,EQUI_STAT, SMNULL, (yyvsp[0].ll_node),
-			     LLNULL, LLNULL);
-	    }
-#line 6245 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 201:
-#line 2096 "gram1.y" /* yacc.c:1646  */
-    { 
-	      add_to_lowLevelList((yyvsp[0].ll_node), (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-	    }
-#line 6253 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 202:
-#line 2103 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,EQUI_LIST, (yyvsp[-1].ll_node), LLNULL, SMNULL);
-           }
-#line 6261 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 203:
-#line 2109 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-	      p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[-2].ll_node), p, SMNULL);
-	    }
-#line 6270 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 204:
-#line 2115 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-
-	      p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      add_to_lowLevelList(p, (yyvsp[-2].ll_node));
-	    }
-#line 6280 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 205:
-#line 2123 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-           s=make_scalar((yyvsp[0].hash_entry),TYNULL,LOCAL);
-           (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-           s->attr = s->attr | EQUIVALENCE_BIT;
-            /*$$=$1; $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT; */
-        }
-#line 6291 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 206:
-#line 2130 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-           s=make_array((yyvsp[-3].hash_entry),TYNULL,LLNULL,0,LOCAL);
-           (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[-1].ll_node), LLNULL, s);
-           s->attr = s->attr | EQUIVALENCE_BIT;
-            /*$$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT; */
-        }
-#line 6302 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 208:
-#line 2149 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-              data_stat = NO;
-	      p = make_llnd(fi,STMT_STR, LLNULL, LLNULL,
-			    SMNULL);
-              p->entry.string_val = copys(stmtbuf);
-	      (yyval.bf_node) = get_bfnd(fi,DATA_DECL, SMNULL, p, LLNULL, LLNULL);
-            }
-#line 6314 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 211:
-#line 2163 "gram1.y" /* yacc.c:1646  */
-    {data_stat = YES;}
-#line 6320 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 212:
-#line 2167 "gram1.y" /* yacc.c:1646  */
-    {
-	      if (parstate == OUTSIDE)
-	         { PTR_BFND p;
-
-		   p = get_bfnd(fi,PROG_HEDR,
-                                make_program(look_up_sym("_MAIN")),
-                                LLNULL, LLNULL, LLNULL);
-		   set_blobs(p, global_bfnd, NEW_GROUP1);
-	           add_scope_level(p, NO);
-		   position = IN_PROC; 
-	  	   /*parstate = INDCL;*/
-                 }
-	      if(parstate < INDCL)
-		{
-		  /* enddcl();*/
-		  parstate = INDCL;
-		}
-	    }
-#line 6343 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 223:
-#line 2212 "gram1.y" /* yacc.c:1646  */
-    {;}
-#line 6349 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 224:
-#line 2216 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol)= make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);}
-#line 6355 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 225:
-#line 2220 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol)= make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL); 
-              (yyval.symbol)->attr = (yyval.symbol)->attr | DATA_BIT; 
-            }
-#line 6363 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 226:
-#line 2226 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, DATA_SUBS, (yyvsp[-1].ll_node), LLNULL, SMNULL); }
-#line 6369 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 227:
-#line 2230 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, DATA_RANGE, (yyvsp[-3].ll_node), (yyvsp[-1].ll_node), SMNULL); }
-#line 6375 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 228:
-#line 2234 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6381 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 229:
-#line 2236 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = add_to_lowLevelList((yyvsp[0].ll_node), (yyvsp[-2].ll_node)); }
-#line 6387 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 230:
-#line 2240 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 6393 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 231:
-#line 2242 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6399 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 232:
-#line 2246 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node)= make_llnd(fi, DATA_IMPL_DO, (yyvsp[-5].ll_node), (yyvsp[-1].ll_node), (yyvsp[-3].symbol)); }
-#line 6405 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 233:
-#line 2250 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6411 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 234:
-#line 2252 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = add_to_lowLevelList((yyvsp[0].ll_node), (yyvsp[-2].ll_node)); }
-#line 6417 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 235:
-#line 2256 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, DATA_ELT, (yyvsp[0].ll_node), LLNULL, (yyvsp[-1].symbol)); }
-#line 6423 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 236:
-#line 2258 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, DATA_ELT, (yyvsp[0].ll_node), LLNULL, (yyvsp[-1].symbol)); }
-#line 6429 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 237:
-#line 2260 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyvsp[-1].ll_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
-              (yyval.ll_node) = make_llnd(fi, DATA_ELT, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-2].symbol)); 
-            }
-#line 6438 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 238:
-#line 2265 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, DATA_ELT, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 6444 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 252:
-#line 2289 "gram1.y" /* yacc.c:1646  */
-    {if((yyvsp[-4].ll_node)->entry.Template.symbol->variant != TYPE_NAME)
-               errstr("Undefined type %s",(yyvsp[-4].ll_node)->entry.Template.symbol->ident,319); 
-           }
-#line 6452 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 269:
-#line 2334 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ICON_EXPR, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 6458 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 270:
-#line 2336 "gram1.y" /* yacc.c:1646  */
-    {
-              PTR_LLND p;
-
-              p = intrinsic_op_node("+", UNARY_ADD_OP, (yyvsp[0].ll_node), LLNULL);
-              (yyval.ll_node) = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-#line 6469 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 271:
-#line 2343 "gram1.y" /* yacc.c:1646  */
-    {
-              PTR_LLND p;
- 
-              p = intrinsic_op_node("-", MINUS_OP, (yyvsp[0].ll_node), LLNULL);
-              (yyval.ll_node) = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-#line 6480 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 272:
-#line 2350 "gram1.y" /* yacc.c:1646  */
-    {
-              PTR_LLND p;
- 
-              p = intrinsic_op_node("+", ADD_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node));
-              (yyval.ll_node) = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-#line 6491 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 273:
-#line 2357 "gram1.y" /* yacc.c:1646  */
-    {
-              PTR_LLND p;
- 
-              p = intrinsic_op_node("-", SUBT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node));
-              (yyval.ll_node) = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-#line 6502 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 274:
-#line 2366 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6508 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 275:
-#line 2368 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("*", MULT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 6514 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 276:
-#line 2370 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("/", DIV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 6520 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 277:
-#line 2374 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6526 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 278:
-#line 2376 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("**", EXP_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 6532 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 279:
-#line 2380 "gram1.y" /* yacc.c:1646  */
-    {
-              PTR_LLND p;
-
-              p = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-              p->entry.ival = atoi(yytext);
-              p->type = global_int;
-              (yyval.ll_node) = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-            }
-#line 6545 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 280:
-#line 2389 "gram1.y" /* yacc.c:1646  */
-    {
-              PTR_LLND p;
- 
-              p = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-              (yyval.ll_node) = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-            }
-#line 6556 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 281:
-#line 2396 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[-1].ll_node), LLNULL, SMNULL);
-            }
-#line 6564 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 282:
-#line 2403 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 6570 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 283:
-#line 2405 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6576 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 284:
-#line 2409 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);
-             (yyval.ll_node)->entry.Template.symbol->attr = (yyval.ll_node)->entry.Template.symbol->attr | SAVE_BIT;
-           }
-#line 6584 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 285:
-#line 2413 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,COMM_LIST, LLNULL, LLNULL, (yyvsp[0].symbol)); 
-            (yyval.ll_node)->entry.Template.symbol->attr = (yyval.ll_node)->entry.Template.symbol->attr | SAVE_BIT;
-          }
-#line 6592 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 286:
-#line 2419 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST); }
-#line 6598 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 287:
-#line 2421 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node), (yyvsp[-1].ll_node), EXPR_LIST); }
-#line 6604 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 288:
-#line 2425 "gram1.y" /* yacc.c:1646  */
-    { as_op_kwd_ = YES; }
-#line 6610 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 289:
-#line 2429 "gram1.y" /* yacc.c:1646  */
-    { as_op_kwd_ = NO; }
-#line 6616 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 290:
-#line 2434 "gram1.y" /* yacc.c:1646  */
-    { 
-             PTR_SYMB s; 
-             s = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);	
-	     s->attr = s->attr | type_opt;
-	     (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-            }
-#line 6627 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 291:
-#line 2441 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	      s = make_function((yyvsp[-1].hash_entry), global_default, LOCAL);
-	      s->variant = INTERFACE_NAME;
-              s->attr = s->attr | type_opt;
-              (yyval.ll_node) = make_llnd(fi,OPERATOR_OP, LLNULL, LLNULL, s);
-	    }
-#line 6638 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 292:
-#line 2448 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	      s = make_procedure(look_up_sym("="), LOCAL);
-	      s->variant = INTERFACE_NAME;
-              s->attr = s->attr | type_opt;
-              (yyval.ll_node) = make_llnd(fi,ASSIGNMENT_OP, LLNULL, LLNULL, s);
-	    }
-#line 6649 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 293:
-#line 2458 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 6655 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 294:
-#line 2460 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6661 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 295:
-#line 2464 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB p;
-
-                /* The check if name and expr have compatible types has
-                   not been done yet. */ 
-		p = make_constant((yyvsp[-2].hash_entry), TYNULL);
- 	        p->attr = p->attr | PARAMETER_BIT;
-                p->entry.const_value = (yyvsp[0].ll_node);
-		(yyval.ll_node) = make_llnd(fi,CONST_REF, LLNULL, LLNULL, p);
-	    }
-#line 6675 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 296:
-#line 2476 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, MODULE_PROC_STMT, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL); }
-#line 6681 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 297:
-#line 2479 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
- 	      PTR_LLND q;
-
-	      s = make_function((yyvsp[0].hash_entry), TYNULL, LOCAL);
-	      s->variant = ROUTINE_NAME;
-              q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      (yyval.ll_node) = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	    }
-#line 6694 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 298:
-#line 2488 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_function((yyvsp[0].hash_entry), TYNULL, LOCAL);
-	      s->variant = ROUTINE_NAME;
-              p = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, (yyvsp[-2].ll_node));
-	    }
-#line 6708 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 299:
-#line 2501 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, USE_STMT, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL);
-              /*add_scope_level($3->entry.Template.func_hedr, YES);*/ /*17.06.01*/
-              copy_module_scope((yyvsp[0].symbol),LLNULL); /*17.03.03*/
-              colon_flag = NO;
-            }
-#line 6718 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 300:
-#line 2507 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, USE_STMT, (yyvsp[-3].symbol), (yyvsp[0].ll_node), LLNULL, LLNULL); 
-              /*add_scope_level(module_scope, YES); *//* 17.06.01*/
-              copy_module_scope((yyvsp[-3].symbol),(yyvsp[0].ll_node)); /*17.03.03 */
-              colon_flag = NO;
-            }
-#line 6728 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 301:
-#line 2513 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND l;
-
-	      l = make_llnd(fi, ONLY_NODE, LLNULL, LLNULL, SMNULL);
-              (yyval.bf_node) = get_bfnd(fi, USE_STMT, (yyvsp[-3].symbol), l, LLNULL, LLNULL);
-            }
-#line 6738 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 302:
-#line 2519 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND l;
-
-	      l = make_llnd(fi, ONLY_NODE, (yyvsp[0].ll_node), LLNULL, SMNULL);
-              (yyval.bf_node) = get_bfnd(fi, USE_STMT, (yyvsp[-4].symbol), l, LLNULL, LLNULL);
-            }
-#line 6748 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 303:
-#line 2527 "gram1.y" /* yacc.c:1646  */
-    {
-              if ((yyvsp[0].hash_entry)->id_attr == SMNULL)
-	         warn1("Unknown module %s", (yyvsp[0].hash_entry)->ident,308);
-              (yyval.symbol) = make_global_entity((yyvsp[0].hash_entry), MODULE_NAME, global_default, NO);
-	      module_scope = (yyval.symbol)->entry.Template.func_hedr;
-           
-            }
-#line 6760 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 304:
-#line 2537 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 6766 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 305:
-#line 2539 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6772 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 306:
-#line 2543 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 6778 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 307:
-#line 2545 "gram1.y" /* yacc.c:1646  */
-    {  PTR_HASH oldhash,copyhash;
-	       PTR_SYMB oldsym, newsym;
-	       PTR_LLND m;
-
-	       oldhash = just_look_up_sym_in_scope(module_scope, (yyvsp[0].hash_entry)->ident);
-	       if (oldhash == HSNULL) {
-                  errstr("Unknown identifier %s.", (yyvsp[0].hash_entry)->ident,309);
-	          (yyval.ll_node)= LLNULL;
-	       }
-	       else {
-                 oldsym = oldhash->id_attr;
-                 copyhash=just_look_up_sym_in_scope(cur_scope(), (yyvsp[0].hash_entry)->ident);
-	         if( copyhash && copyhash->id_attr && copyhash->id_attr->entry.Template.tag==module_scope->id)
-                 {
-                   newsym = copyhash->id_attr;
-                   newsym->entry.Template.tag = 0;
-                 }
-                 else
-                 {
-	           newsym = make_local_entity((yyvsp[0].hash_entry), oldsym->variant, oldsym->type,LOCAL);
-	           /* copies data in entry.Template structure and attr */
-	           copy_sym_data(oldsym, newsym);	         
-	             /*newsym->entry.Template.base_name = oldsym;*//*19.03.03*/
-                 }
-	  	/* l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, oldsym);*/
-		 m = make_llnd(fi, VAR_REF, LLNULL, LLNULL, newsym);
-		 (yyval.ll_node) = make_llnd(fi, RENAME_NODE, m, LLNULL, oldsym);
- 	      }
-            }
-#line 6812 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 308:
-#line 2578 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 6818 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 309:
-#line 2580 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6824 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 310:
-#line 2584 "gram1.y" /* yacc.c:1646  */
-    {  PTR_HASH oldhash,copyhash;
-	       PTR_SYMB oldsym, newsym;
-	       PTR_LLND l, m;
-
-	       oldhash = just_look_up_sym_in_scope(module_scope, (yyvsp[0].hash_entry)->ident);
-	       if (oldhash == HSNULL) {
-                  errstr("Unknown identifier %s", (yyvsp[0].hash_entry)->ident,309);
-	          (yyval.ll_node)= LLNULL;
-	       }
-	       else {
-                 oldsym = oldhash->id_attr;
-                 copyhash = just_look_up_sym_in_scope(cur_scope(), (yyvsp[0].hash_entry)->ident);
-	         if(copyhash && copyhash->id_attr && copyhash->id_attr->entry.Template.tag==module_scope->id)
-                 {
-                    delete_symbol(copyhash->id_attr);
-                    copyhash->id_attr = SMNULL;
-                 }
-                   newsym = make_local_entity((yyvsp[-2].hash_entry), oldsym->variant, oldsym->type, LOCAL);
-	           /* copies data in entry.Template structure and attr */
-	           copy_sym_data(oldsym, newsym);	
-                         
-	           /*newsym->entry.Template.base_name = oldsym;*//*19.03.03*/
-	  	 l  = make_llnd(fi, VAR_REF, LLNULL, LLNULL, oldsym);
-		 m  = make_llnd(fi, VAR_REF, LLNULL, LLNULL, newsym);
-		 (yyval.ll_node) = make_llnd(fi, RENAME_NODE, m, l, SMNULL);
- 	      }
-            }
-#line 6856 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 311:
-#line 2622 "gram1.y" /* yacc.c:1646  */
-    { ndim = 0;	explicit_shape = 1; (yyval.ll_node) = LLNULL; }
-#line 6862 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 312:
-#line 2624 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 6868 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 313:
-#line 2627 "gram1.y" /* yacc.c:1646  */
-    { ndim = 0; explicit_shape = 1;}
-#line 6874 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 314:
-#line 2628 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      (yyval.ll_node)->type = global_default;
-	    }
-#line 6883 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 315:
-#line 2633 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6889 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 316:
-#line 2637 "gram1.y" /* yacc.c:1646  */
-    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		(yyval.ll_node) = (yyvsp[0].ll_node);
-	      ++ndim;
-	    }
-#line 6901 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 317:
-#line 2645 "gram1.y" /* yacc.c:1646  */
-    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		(yyval.ll_node) = make_llnd(fi, DDOT, LLNULL, LLNULL, SMNULL);
-	      ++ndim;
-              explicit_shape = 0;
-	    }
-#line 6914 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 318:
-#line 2654 "gram1.y" /* yacc.c:1646  */
-    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		(yyval.ll_node) = make_llnd(fi,DDOT, (yyvsp[-1].ll_node), LLNULL, SMNULL);
-	      ++ndim;
-              explicit_shape = 0;
-	    }
-#line 6927 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 319:
-#line 2663 "gram1.y" /* yacc.c:1646  */
-    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		(yyval.ll_node) = make_llnd(fi,DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
-	      ++ndim;
-	    }
-#line 6939 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 320:
-#line 2673 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,STAR_RANGE, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->type = global_default;
-              explicit_shape = 0;
-	    }
-#line 6949 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 322:
-#line 2682 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 6955 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 323:
-#line 2684 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 6961 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 324:
-#line 2688 "gram1.y" /* yacc.c:1646  */
-    {PTR_LABEL p;
-	     p = make_label_node(fi,convci(yyleng, yytext));
-	     p->scope = cur_scope();
-	     (yyval.ll_node) = make_llnd_label(fi,LABEL_REF, p);
-	  }
-#line 6971 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 325:
-#line 2696 "gram1.y" /* yacc.c:1646  */
-    { /*PTR_LLND l;*/
-
-          /*   l = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);*/
-             (yyval.bf_node) = get_bfnd(fi,IMPL_DECL, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
-             redefine_func_arg_type();
-           }
-#line 6982 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 326:
-#line 2711 "gram1.y" /* yacc.c:1646  */
-    { /*undeftype = YES;
-	    setimpl(TYNULL, (int)'a', (int)'z'); FB COMMENTED---> NOT QUITE RIGHT BUT AVOID PB WITH COMMON*/
-	    (yyval.bf_node) = get_bfnd(fi,IMPL_DECL, SMNULL, LLNULL, LLNULL, LLNULL);
-	  }
-#line 6991 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 327:
-#line 2718 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 6997 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 328:
-#line 2720 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 7003 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 329:
-#line 2724 "gram1.y" /* yacc.c:1646  */
-    { 
-
-            (yyval.ll_node) = make_llnd(fi, IMPL_TYPE, (yyvsp[-1].ll_node), LLNULL, SMNULL);
-            (yyval.ll_node)->type = vartype;
-          }
-#line 7013 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 330:
-#line 2739 "gram1.y" /* yacc.c:1646  */
-    { implkwd = YES; }
-#line 7019 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 331:
-#line 2740 "gram1.y" /* yacc.c:1646  */
-    { vartype = (yyvsp[0].data_type); }
-#line 7025 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 332:
-#line 2744 "gram1.y" /* yacc.c:1646  */
-    { (yyval.data_type) = (yyvsp[0].data_type); }
-#line 7031 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 333:
-#line 2746 "gram1.y" /* yacc.c:1646  */
-    { (yyval.data_type) = (yyvsp[0].data_type);}
-#line 7037 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 334:
-#line 2758 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 7043 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 335:
-#line 2760 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 7049 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 336:
-#line 2764 "gram1.y" /* yacc.c:1646  */
-    {
-	      setimpl(vartype, (int)(yyvsp[0].charv), (int)(yyvsp[0].charv));
-	      (yyval.ll_node) = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->entry.cval = (yyvsp[0].charv);
-	    }
-#line 7059 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 337:
-#line 2770 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p,q;
-	      
-	      setimpl(vartype, (int)(yyvsp[-2].charv), (int)(yyvsp[0].charv));
-	      p = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
-	      p->entry.cval = (yyvsp[-2].charv);
-	      q = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
-	      q->entry.cval = (yyvsp[0].charv);
-	      (yyval.ll_node)= make_llnd(fi,DDOT, p, q, SMNULL);
-	    }
-#line 7073 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 338:
-#line 2782 "gram1.y" /* yacc.c:1646  */
-    {
-	      if(yyleng!=1 || yytext[0]<'a' || yytext[0]>'z')
-		{
-		  err("IMPLICIT item must be single letter", 37);
-		  (yyval.charv) = '\0';
-		}
-	      else (yyval.charv) = yytext[0];
-	    }
-#line 7086 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 339:
-#line 2793 "gram1.y" /* yacc.c:1646  */
-    {
-	      if (parstate == OUTSIDE)
-	         { PTR_BFND p;
-
-		   p = get_bfnd(fi,PROG_HEDR,
-                                make_program(look_up_sym("_MAIN")),
-                                LLNULL, LLNULL, LLNULL);
-		   set_blobs(p, global_bfnd, NEW_GROUP1);
-	           add_scope_level(p, NO);
-		   position = IN_PROC; 
-	  	   parstate = INSIDE;
-                 }
-	  
-	    }
-#line 7105 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 340:
-#line 2810 "gram1.y" /* yacc.c:1646  */
-    { switch(parstate)
-		{
-                case OUTSIDE:  
-			{ PTR_BFND p;
-
-			  p = get_bfnd(fi,PROG_HEDR,
-                                       make_program(look_up_sym("_MAIN")),
-                                       LLNULL, LLNULL, LLNULL);
-			  set_blobs(p, global_bfnd, NEW_GROUP1);
-			  add_scope_level(p, NO);
-			  position = IN_PROC; 
-	  		  parstate = INDCL; }
-	                  break;
-                case INSIDE:    parstate = INDCL;
-                case INDCL:     break;
-
-                case INDATA:
-                         /*  err(
-                     "Statement order error: declaration after DATA or function statement", 
-                                 29);*/
-                              break;
-
-                default:
-                           err("Declaration among executables", 30);
-                }
-        }
-#line 7136 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 343:
-#line 2848 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; endioctl(); }
-#line 7142 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 344:
-#line 2850 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);  endioctl();}
-#line 7148 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 345:
-#line 2854 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7154 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 346:
-#line 2856 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7160 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 347:
-#line 2858 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND l;
-	      l = make_llnd(fi, KEYWORD_ARG, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL);
-	      l->type = (yyvsp[0].ll_node)->type;
-              (yyval.ll_node) = l; 
-	    }
-#line 7170 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 348:
-#line 2869 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);
-              endioctl(); 
-            }
-#line 7178 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 349:
-#line 2873 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST);
-              endioctl(); 
-            }
-#line 7186 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 350:
-#line 2879 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 7192 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 351:
-#line 2881 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 7198 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 352:
-#line 2885 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7204 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 353:
-#line 2887 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 7210 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 354:
-#line 2889 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7216 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 355:
-#line 2893 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7222 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 356:
-#line 2895 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7228 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 357:
-#line 2899 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7234 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 358:
-#line 2901 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("+", ADD_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7240 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 359:
-#line 2903 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("-", SUBT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7246 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 360:
-#line 2905 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("*", MULT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7252 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 361:
-#line 2907 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("/", DIV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7258 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 362:
-#line 2909 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("**", EXP_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7264 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 363:
-#line 2911 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = defined_op_node((yyvsp[-1].hash_entry), (yyvsp[0].ll_node), LLNULL); }
-#line 7270 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 364:
-#line 2913 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("+", UNARY_ADD_OP, (yyvsp[0].ll_node), LLNULL); }
-#line 7276 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 365:
-#line 2915 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("-", MINUS_OP, (yyvsp[0].ll_node), LLNULL); }
-#line 7282 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 366:
-#line 2917 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".eq.", EQ_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7288 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 367:
-#line 2919 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".gt.", GT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7294 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 368:
-#line 2921 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".lt.", LT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7300 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 369:
-#line 2923 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".ge.", GTEQL_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7306 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 370:
-#line 2925 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".ge.", LTEQL_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7312 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 371:
-#line 2927 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".ne.", NOTEQL_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7318 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 372:
-#line 2929 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".eqv.", EQV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7324 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 373:
-#line 2931 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".neqv.", NEQV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7330 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 374:
-#line 2933 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".xor.", XOR_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7336 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 375:
-#line 2935 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".or.", OR_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7342 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 376:
-#line 2937 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".and.", AND_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7348 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 377:
-#line 2939 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node(".not.", NOT_OP, (yyvsp[0].ll_node), LLNULL); }
-#line 7354 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 378:
-#line 2941 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = intrinsic_op_node("//", CONCAT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7360 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 379:
-#line 2943 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = defined_op_node((yyvsp[-1].hash_entry), (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 7366 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 380:
-#line 2946 "gram1.y" /* yacc.c:1646  */
-    { (yyval.token) = ADD_OP; }
-#line 7372 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 381:
-#line 2947 "gram1.y" /* yacc.c:1646  */
-    { (yyval.token) = SUBT_OP; }
-#line 7378 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 382:
-#line 2959 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	      PTR_TYPE t;
-	     /* PTR_LLND l;*/
-
-       	      if (!(s = (yyvsp[0].hash_entry)->id_attr))
-              {
-	         s = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);
-	     	 s->decl = SOFT;
-	      } 
-	
-	      switch (s->variant)
-              {
-	      case CONST_NAME:
-		   (yyval.ll_node) = make_llnd(fi,CONST_REF,LLNULL,LLNULL, s);
-		   t = s->type;
-	           if ((t != TYNULL) &&
-                       ((t->variant == T_ARRAY) ||  (t->variant == T_STRING) ))
-                                 (yyval.ll_node)->variant = ARRAY_REF;
-
-                   (yyval.ll_node)->type = t;
-	           break;
-	      case DEFAULT:   /* if common region with same name has been
-                                 declared. */
-		   s = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);
-	     	   s->decl = SOFT;
-
-	      case VARIABLE_NAME:
-                   (yyval.ll_node) = make_llnd(fi,VAR_REF,LLNULL,LLNULL, s);
-	           t = s->type;
-	           if (t != TYNULL) {
-                     if ((t->variant == T_ARRAY) ||  (t->variant == T_STRING) ||
-                         ((t->variant == T_POINTER) && (t->entry.Template.base_type->variant == T_ARRAY) ) )
-                         (yyval.ll_node)->variant = ARRAY_REF;
-
-/*  	              if (t->variant == T_DERIVED_TYPE)
-                         $$->variant = RECORD_REF; */
-	           }
-                   (yyval.ll_node)->type = t;
-	           break;
-	      case TYPE_NAME:
-  	           (yyval.ll_node) = make_llnd(fi,TYPE_REF,LLNULL,LLNULL, s);
-	           (yyval.ll_node)->type = s->type;
-	           break;
-	      case INTERFACE_NAME:
-  	           (yyval.ll_node) = make_llnd(fi, INTERFACE_REF,LLNULL,LLNULL, s);
-	           (yyval.ll_node)->type = s->type;
-	           break;
-              case FUNCTION_NAME:
-                   if(isResultVar(s)) {
-                     (yyval.ll_node) = make_llnd(fi,VAR_REF,LLNULL,LLNULL, s);
-	             t = s->type;
-	             if (t != TYNULL) {
-                       if ((t->variant == T_ARRAY) ||  (t->variant == T_STRING) ||
-                         ((t->variant == T_POINTER) && (t->entry.Template.base_type->variant == T_ARRAY) ) )
-                         (yyval.ll_node)->variant = ARRAY_REF;
-	             }
-                     (yyval.ll_node)->type = t;
-	             break;
-                   }                                        
-	      default:
-  	           (yyval.ll_node) = make_llnd(fi,VAR_REF,LLNULL,LLNULL, s);
-	           (yyval.ll_node)->type = s->type;
-	           break;
-	      }
-             /* if ($$->variant == T_POINTER) {
-	         l = $$;
-	         $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $$->type = l->type->entry.Template.base_type;
-	      }
-              */ /*11.02.03*/
-           }
-#line 7454 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 383:
-#line 3033 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB  s;
-	      (yyval.ll_node) = (yyvsp[0].ll_node); 
-              s= (yyval.ll_node)->entry.Template.symbol;
-              if ((((yyvsp[0].ll_node)->variant == VAR_REF) || ((yyvsp[0].ll_node)->variant == ARRAY_REF))  && (s->scope !=cur_scope()))  /*global_bfnd*/
-              {
-	          if(((s->variant == FUNCTION_NAME) && (!isResultVar(s))) || (s->variant == PROCEDURE_NAME) || (s->variant == ROUTINE_NAME))
-                  { s = (yyval.ll_node)->entry.Template.symbol =  make_scalar(s->parent, TYNULL, LOCAL);
-		    (yyval.ll_node)->type = s->type;  
-		  }
-              }
-            }
-#line 7470 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 384:
-#line 3045 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7476 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 385:
-#line 3047 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7482 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 386:
-#line 3051 "gram1.y" /* yacc.c:1646  */
-    { int num_triplets;
-	      PTR_SYMB s;  /*, sym;*/
-	      /* PTR_LLND l; */
-	      PTR_TYPE tp;
-	      /* l = $1; */
-	      s = (yyvsp[-4].ll_node)->entry.Template.symbol;
-            
-	      /* Handle variable to function conversion. */
-	      if (((yyvsp[-4].ll_node)->variant == VAR_REF) && 
-	          (((s->variant == VARIABLE_NAME) && (s->type) &&
-                    (s->type->variant != T_ARRAY)) ||
-  	            (s->variant == ROUTINE_NAME))) {
-	        s = (yyvsp[-4].ll_node)->entry.Template.symbol =  make_function(s->parent, TYNULL, LOCAL);
-	        (yyvsp[-4].ll_node)->variant = FUNC_CALL;
-              }
-	      if (((yyvsp[-4].ll_node)->variant == VAR_REF) && (s->variant == FUNCTION_NAME)) { 
-                if(isResultVar(s))
-	          (yyvsp[-4].ll_node)->variant = ARRAY_REF;
-                else
-                  (yyvsp[-4].ll_node)->variant = FUNC_CALL;
-              }
-	      if (((yyvsp[-4].ll_node)->variant == VAR_REF) && (s->variant == PROGRAM_NAME)) {
-                 errstr("The name '%s' is invalid in this context",s->ident,285);
-                 (yyvsp[-4].ll_node)->variant = FUNC_CALL;
-              }
-              /* l = $1; */
-	      num_triplets = is_array_section_ref((yyvsp[-1].ll_node));
-	      switch ((yyvsp[-4].ll_node)->variant)
-              {
-	      case TYPE_REF:
-                   (yyvsp[-4].ll_node)->variant = STRUCTURE_CONSTRUCTOR;                  
-                   (yyvsp[-4].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-                   (yyval.ll_node) = (yyvsp[-4].ll_node);
-                   (yyval.ll_node)->type =  lookup_type(s->parent); 
-	          /* $$ = make_llnd(fi, STRUCTURE_CONSTRUCTOR, $1, $4, SMNULL);
-	           $$->type = $1->type;*//*18.02.03*/
-	           break;
-	      case INTERFACE_REF:
-	       /*  sym = resolve_overloading(s, $4);
-	           if (sym != SMNULL)
-	  	   {
-	              l = make_llnd(fi, FUNC_CALL, $4, LLNULL, sym);
-	              l->type = sym->type;
-	              $$ = $1; $$->variant = OVERLOADED_CALL;
-	              $$->entry.Template.ll_ptr1 = l;
-	              $$->type = sym->type;
-	           }
-	           else {
-	             errstr("can't resolve call %s", s->ident,310);
-	           }
-	           break;
-                 */ /*podd 01.02.03*/
-
-                   (yyvsp[-4].ll_node)->variant = FUNC_CALL;
-
-	      case FUNC_CALL:
-                   (yyvsp[-4].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-                   (yyval.ll_node) = (yyvsp[-4].ll_node);
-                   if(s->type) 
-                     (yyval.ll_node)->type = s->type;
-                   else
-                     (yyval.ll_node)->type = global_default;
-	           /*late_bind_if_needed($$);*/ /*podd 02.02.23*/
-	           break;
-	      case DEREF_OP:
-              case ARRAY_REF:
-	           /* array element */
-	           if (num_triplets == 0) {
-                       if ((yyvsp[-1].ll_node) == LLNULL) {
-                           s = (yyvsp[-4].ll_node)->entry.Template.symbol = make_function(s->parent, TYNULL, LOCAL);
-                           s->entry.func_decl.num_output = 1;
-                           (yyvsp[-4].ll_node)->variant = FUNC_CALL;
-                           (yyval.ll_node) = (yyvsp[-4].ll_node);
-                       } else if ((yyvsp[-4].ll_node)->type->variant == T_STRING) {
-                           PTR_LLND temp = (yyvsp[-1].ll_node);
-                           int num_input = 0;
-
-                           while (temp) {
-                             ++num_input;
-                             temp = temp->entry.Template.ll_ptr2;
-                           }
-                           (yyvsp[-4].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-                           s = (yyvsp[-4].ll_node)->entry.Template.symbol = make_function(s->parent, TYNULL, LOCAL);
-                           s->entry.func_decl.num_output = 1;
-                           s->entry.func_decl.num_input = num_input;
-                           (yyvsp[-4].ll_node)->variant = FUNC_CALL;
-                           (yyval.ll_node) = (yyvsp[-4].ll_node);
-                       } else {
-       	                   (yyvsp[-4].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-	                   (yyval.ll_node) = (yyvsp[-4].ll_node);
-                           (yyval.ll_node)->type = (yyvsp[-4].ll_node)->type->entry.ar_decl.base_type;
-                       }
-                   }
-                   /* substring */
-	           else if ((num_triplets == 1) && 
-                            ((yyvsp[-4].ll_node)->type->variant == T_STRING)) {
-    	           /*
-                     $1->entry.Template.ll_ptr1 = $4;
-	             $$ = $1; $$->type = global_string;
-                   */
-	                  (yyval.ll_node) = make_llnd(fi, 
-			  ARRAY_OP, LLNULL, LLNULL, SMNULL);
-    	                  (yyval.ll_node)->entry.Template.ll_ptr1 = (yyvsp[-4].ll_node);
-       	                  (yyval.ll_node)->entry.Template.ll_ptr2 = (yyvsp[-1].ll_node)->entry.Template.ll_ptr1;
-	                  (yyval.ll_node)->type = global_string;
-                   }           
-                   /* array section */
-                   else {
-    	             (yyvsp[-4].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-	             (yyval.ll_node) = (yyvsp[-4].ll_node); tp = make_type(fi, T_ARRAY);     /**18.03.17*/
-                     tp->entry.ar_decl.base_type = (yyvsp[-4].ll_node)->type->entry.ar_decl.base_type; /**18.03.17 $1->type */
-	             tp->entry.ar_decl.num_dimensions = num_triplets;
-	             (yyval.ll_node)->type = tp;
-                   }
-	           break;
-	      default:
-                    if((yyvsp[-4].ll_node)->entry.Template.symbol)
-                      errstr("Can't subscript %s",(yyvsp[-4].ll_node)->entry.Template.symbol->ident, 44);
-                    else
-	              err("Can't subscript",44);
-             }
-             /*if ($$->variant == T_POINTER) {
-	        l = $$;
-	        $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	        $$->type = l->type->entry.Template.base_type;
-	     }
-              */  /*11.02.03*/
-
-	     endioctl(); 
-           }
-#line 7617 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 387:
-#line 3182 "gram1.y" /* yacc.c:1646  */
-    { int num_triplets;
-	      PTR_SYMB s;
-	      PTR_LLND l;
-
-	      s = (yyvsp[-5].ll_node)->entry.Template.symbol;
-/*              if ($1->type->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-	      if (((yyvsp[-5].ll_node)->type->variant != T_ARRAY) ||
-                  ((yyvsp[-5].ll_node)->type->entry.ar_decl.base_type->variant != T_STRING)) {
-	         errstr("Can't take substring of %s", s->ident, 45);
-              }
-              else {
-  	        num_triplets = is_array_section_ref((yyvsp[-2].ll_node));
-	           /* array element */
-                if (num_triplets == 0) {
-                   (yyvsp[-5].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-2].ll_node);
-                  /* $1->entry.Template.ll_ptr2 = $6;*/
-	          /* $$ = $1;*/
-                   l=(yyvsp[-5].ll_node);
-                   /*$$->type = $1->type->entry.ar_decl.base_type;*/
-                   l->type = global_string;  /**18.03.17* $1->type->entry.ar_decl.base_type;*/
-                }
-                /* array section */
-                else {
-    	           (yyvsp[-5].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-2].ll_node);
-    	           /*$1->entry.Template.ll_ptr2 = $6;
-	           $$ = $1; $$->type = make_type(fi, T_ARRAY);
-                   $$->type->entry.ar_decl.base_type = $1->type;
-	           $$->type->entry.ar_decl.num_dimensions = num_triplets;
-                  */
-                   l = (yyvsp[-5].ll_node); l->type = make_type(fi, T_ARRAY);
-                   l->type->entry.ar_decl.base_type = global_string;   /**18.03.17* $1->type*/
-	           l->type->entry.ar_decl.num_dimensions = num_triplets;
-               }
-                (yyval.ll_node) = make_llnd(fi, ARRAY_OP, l, (yyvsp[0].ll_node), SMNULL);
-	        (yyval.ll_node)->type = l->type;
-              
-              /* if ($$->variant == T_POINTER) {
-	          l = $$;
-	          $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	          $$->type = l->type->entry.Template.base_type;
-	       }
-               */  /*11.02.03*/
-             }
-             endioctl();
-          }
-#line 7671 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 388:
-#line 3232 "gram1.y" /* yacc.c:1646  */
-    {  int num_triplets;
-	      PTR_LLND l,l1,l2;
-              PTR_TYPE tp;
-
-         /*   if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-              num_triplets = is_array_section_ref((yyvsp[-1].ll_node));
-              (yyval.ll_node) = (yyvsp[-3].ll_node);
-              l2 = (yyvsp[-3].ll_node)->entry.Template.ll_ptr2;  
-              l1 = (yyvsp[-3].ll_node)->entry.Template.ll_ptr1;                
-              if(l2 && l2->type->variant == T_STRING)/*substring*/
-                if(num_triplets == 1){
-	           l = make_llnd(fi, ARRAY_OP, LLNULL, LLNULL, SMNULL);
-    	           l->entry.Template.ll_ptr1 = l2;
-       	           l->entry.Template.ll_ptr2 = (yyvsp[-1].ll_node)->entry.Template.ll_ptr1;
-	           l->type = global_string; 
-                   (yyval.ll_node)->entry.Template.ll_ptr2 = l;                                          
-                } else
-                   err("Can't subscript",44);
-              else if (l2 && l2->type->variant == T_ARRAY) {
-                 if(num_triplets > 0) { /*array section*/
-                   tp = make_type(fi,T_ARRAY);
-                   tp->entry.ar_decl.base_type = (yyvsp[-3].ll_node)->type->entry.ar_decl.base_type;
-                   tp->entry.ar_decl.num_dimensions = num_triplets;
-                   (yyval.ll_node)->type = tp;
-                   l2->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-                   l2->type = (yyval.ll_node)->type;   
-                  }                 
-                 else {  /*array element*/
-                   l2->type = l2->type->entry.ar_decl.base_type;
-                   l2->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);   
-                   if(l1->type->variant != T_ARRAY)  
-                     (yyval.ll_node)->type = l2->type;
-                 }
-              } else 
-                   {err("Can't subscript",44); /*fprintf(stderr,"%d  %d",$1->variant,l2);*/}
-                   /*errstr("Can't subscript %s",l2->entry.Template.symbol->ident,441);*/
-         }
-#line 7718 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 389:
-#line 3276 "gram1.y" /* yacc.c:1646  */
-    { int num_triplets;
-	      PTR_LLND l,q;
-
-          /*     if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-              (yyval.ll_node) = (yyvsp[-4].ll_node);
-	      if (((yyvsp[-4].ll_node)->type->variant != T_ARRAY) &&
-                  ((yyvsp[-4].ll_node)->type->entry.ar_decl.base_type->variant != T_STRING)) {
-	         err("Can't take substring",45);
-              }
-              else {
-  	        num_triplets = is_array_section_ref((yyvsp[-2].ll_node));
-                l = (yyvsp[-4].ll_node)->entry.Template.ll_ptr2;
-                if(l) {
-                /* array element */
-	        if (num_triplets == 0) {
-                   l->entry.Template.ll_ptr1 = (yyvsp[-2].ll_node);       	           
-                   l->type = global_string;
-                }
-                /* array section */
-                else {	
-    	             l->entry.Template.ll_ptr1 = (yyvsp[-2].ll_node);
-	             l->type = make_type(fi, T_ARRAY);
-                     l->type->entry.ar_decl.base_type = global_string;
-	             l->type->entry.ar_decl.num_dimensions = num_triplets;
-                }
-	        q = make_llnd(fi, ARRAY_OP, l, (yyvsp[0].ll_node), SMNULL);
-	        q->type = l->type;
-                (yyval.ll_node)->entry.Template.ll_ptr2 = q;
-                if((yyvsp[-4].ll_node)->entry.Template.ll_ptr1->type->variant != T_ARRAY)  
-                     (yyval.ll_node)->type = q->type;
-               }
-             }
-          }
-#line 7761 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 390:
-#line 3318 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE t;
-	      PTR_SYMB  field;
-	    /*  PTR_BFND at_scope;*/
-              PTR_LLND l;
-
-
-/*              if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-	      t = (yyvsp[-2].ll_node)->type; 
-	      
-	      if (( ( ((yyvsp[-2].ll_node)->variant == VAR_REF) 
-	          ||  ((yyvsp[-2].ll_node)->variant == CONST_REF) 
-                  ||  ((yyvsp[-2].ll_node)->variant == ARRAY_REF)
-                  ||  ((yyvsp[-2].ll_node)->variant == RECORD_REF)) && (t->variant == T_DERIVED_TYPE)) 
-	          ||((((yyvsp[-2].ll_node)->variant == ARRAY_REF) || ((yyvsp[-2].ll_node)->variant == RECORD_REF)) && (t->variant == T_ARRAY) &&
-                      (t = t->entry.ar_decl.base_type) && (t->variant == T_DERIVED_TYPE))) 
-                {
-                 t->name = lookup_type_symbol(t->name);
-	         if ((field = component(t->name, yytext))) {                   
-	            l =  make_llnd(fi, VAR_REF, LLNULL, LLNULL, field);
-                    l->type = field->type;
-                    if(field->type->variant == T_ARRAY || field->type->variant == T_STRING)
-                      l->variant = ARRAY_REF; 
-                    (yyval.ll_node) = make_llnd(fi, RECORD_REF, (yyvsp[-2].ll_node), l, SMNULL);
-                    if((yyvsp[-2].ll_node)->type->variant != T_ARRAY)
-                       (yyval.ll_node)->type = field->type;
-                    else {
-                       (yyval.ll_node)->type = make_type(fi,T_ARRAY);
-                       if(field->type->variant != T_ARRAY) 
-	                 (yyval.ll_node)->type->entry.ar_decl.base_type = field->type;
-                       else
-                         (yyval.ll_node)->type->entry.ar_decl.base_type = field->type->entry.ar_decl.base_type;
-	               (yyval.ll_node)->type->entry.ar_decl.num_dimensions = t->entry.ar_decl.num_dimensions;
-                       }
-                 }
-                  else  
-                    errstr("Illegal component  %s", yytext,311);
-              }                     
-               else 
-                    errstr("Can't take component  %s", yytext,311);
-             }
-#line 7811 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 391:
-#line 3376 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 7817 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 392:
-#line 3378 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 7823 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 393:
-#line 3380 "gram1.y" /* yacc.c:1646  */
-    {  int num_triplets;
-               PTR_TYPE tp;
-              /* PTR_LLND l;*/
-	      if ((yyvsp[-4].ll_node)->type->variant == T_ARRAY)
-              {
-  	         num_triplets = is_array_section_ref((yyvsp[-1].ll_node));
-	         /* array element */
-	         if (num_triplets == 0) {
-       	            (yyvsp[-4].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-       	            (yyval.ll_node) = (yyvsp[-4].ll_node);
-                    (yyval.ll_node)->type = (yyvsp[-4].ll_node)->type->entry.ar_decl.base_type;
-                 }
-                 /* substring */
-	       /*  else if ((num_triplets == 1) && 
-                          ($1->type->variant == T_STRING)) {
-    	                  $1->entry.Template.ll_ptr1 = $4;
-	                  $$ = $1; $$->type = global_string;
-                 }   */ /*podd*/        
-                 /* array section */
-                 else {
-    	             (yyvsp[-4].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-	             (yyval.ll_node) = (yyvsp[-4].ll_node); tp = make_type(fi, T_ARRAY);
-                     tp->entry.ar_decl.base_type = (yyvsp[-4].ll_node)->type->entry.ar_decl.base_type;  /**18.03.17* $1->type */
-	             tp->entry.ar_decl.num_dimensions = num_triplets;
-                     (yyval.ll_node)->type = tp;
-                 }
-             } 
-             else err("can't subscript",44);
-
-            /* if ($$->variant == T_POINTER) {
-	        l = $$;
-	        $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	        $$->type = l->type->entry.Template.base_type;
-	     }
-             */  /*11.02.03*/
-
-            endioctl();
-           }
-#line 7866 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 394:
-#line 3420 "gram1.y" /* yacc.c:1646  */
-    {  int num_triplets;
-	      PTR_LLND l,l1,l2;
-
-         /*   if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-              num_triplets = is_array_section_ref((yyvsp[-1].ll_node));
-              (yyval.ll_node) = (yyvsp[-3].ll_node);
-              l2 = (yyvsp[-3].ll_node)->entry.Template.ll_ptr2;  
-              l1 = (yyvsp[-3].ll_node)->entry.Template.ll_ptr1;                
-              if(l2 && l2->type->variant == T_STRING)/*substring*/
-                if(num_triplets == 1){
-	           l = make_llnd(fi, ARRAY_OP, LLNULL, LLNULL, SMNULL);
-    	           l->entry.Template.ll_ptr1 = l2;
-       	           l->entry.Template.ll_ptr2 = (yyvsp[-1].ll_node)->entry.Template.ll_ptr1;
-	           l->type = global_string; 
-                   (yyval.ll_node)->entry.Template.ll_ptr2 = l;                                          
-                } else
-                   err("Can't subscript",44);
-              else if (l2 && l2->type->variant == T_ARRAY) {
-                 if(num_triplets > 0) { /*array section*/
-                   (yyval.ll_node)->type = make_type(fi,T_ARRAY);
-                   (yyval.ll_node)->type->entry.ar_decl.base_type = l2->type->entry.ar_decl.base_type;
-                   (yyval.ll_node)->type->entry.ar_decl.num_dimensions = num_triplets;
-                   l2->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-                   l2->type = (yyval.ll_node)->type;   
-                  }                 
-                 else {  /*array element*/
-                   l2->type = l2->type->entry.ar_decl.base_type;
-                   l2->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);   
-                   if(l1->type->variant != T_ARRAY)  
-                     (yyval.ll_node)->type = l2->type;
-                 }
-              } else 
-                   err("Can't subscript",44);
-         }
-#line 7910 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 395:
-#line 3462 "gram1.y" /* yacc.c:1646  */
-    { 
-	      if ((yyvsp[-1].ll_node)->type->variant == T_STRING) {
-                 (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-                 (yyval.ll_node) = (yyvsp[-1].ll_node); (yyval.ll_node)->type = global_string;
-              }
-              else errstr("can't subscript of %s", (yyvsp[-1].ll_node)->entry.Template.symbol->ident,44);
-            }
-#line 7922 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 396:
-#line 3472 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 7928 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 397:
-#line 3474 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7934 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 398:
-#line 3478 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, DDOT, (yyvsp[-3].ll_node), (yyvsp[-1].ll_node), SMNULL); }
-#line 7940 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 399:
-#line 3482 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 7946 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 400:
-#line 3484 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7952 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 401:
-#line 3488 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 7958 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 402:
-#line 3490 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE t;
-               t = make_type_node((yyvsp[-2].ll_node)->type, (yyvsp[0].ll_node));
-               (yyval.ll_node) = (yyvsp[-2].ll_node);
-               (yyval.ll_node)->type = t;
-             }
-#line 7968 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 403:
-#line 3496 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 7974 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 404:
-#line 3498 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE t;
-               t = make_type_node((yyvsp[-2].ll_node)->type, (yyvsp[0].ll_node));
-               (yyval.ll_node) = (yyvsp[-2].ll_node);
-               (yyval.ll_node)->type = t;
-             }
-#line 7984 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 405:
-#line 3504 "gram1.y" /* yacc.c:1646  */
-    {
-              if ((yyvsp[0].ll_node) != LLNULL)
-              {
-		 (yyval.ll_node) = make_llnd(fi, ARRAY_OP, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL); 
-                 (yyval.ll_node)->type = global_string;
-              }
-	      else 
-                 (yyval.ll_node) = (yyvsp[-1].ll_node);
-             }
-#line 7998 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 406:
-#line 3517 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,BOOL_VAL, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->entry.bval = 1;
-	      (yyval.ll_node)->type = global_bool;
-	    }
-#line 8008 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 407:
-#line 3523 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,BOOL_VAL, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->entry.bval = 0;
-	      (yyval.ll_node)->type = global_bool;
-	    }
-#line 8018 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 408:
-#line 3530 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,FLOAT_VAL, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->entry.string_val = copys(yytext);
-	      (yyval.ll_node)->type = global_float;
-	    }
-#line 8028 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 409:
-#line 3536 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->entry.string_val = copys(yytext);
-	      (yyval.ll_node)->type = global_double;
-	    }
-#line 8038 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 410:
-#line 3544 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->entry.ival = atoi(yytext);
-	      (yyval.ll_node)->type = global_int;
-	    }
-#line 8048 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 411:
-#line 3552 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE t;
-	      PTR_LLND p,q;
-	      (yyval.ll_node) = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->entry.string_val = copys(yytext);
-              if(yyquote=='\"') 
-	        t = global_string_2;
-              else
-	        t = global_string;
-
-	      p = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-	      p->entry.ival = yyleng;
-	      p->type = global_int;
-              q = make_llnd(fi, LEN_OP, p, LLNULL, SMNULL); 
-              (yyval.ll_node)->type = make_type_node(t, q);
-	    }
-#line 8068 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 412:
-#line 3568 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE t;
-	      (yyval.ll_node) = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->entry.string_val = copys(yytext);
-              if(yyquote=='\"') 
-	        t = global_string_2;
-              else
-	        t = global_string;
-	      (yyval.ll_node)->type = make_type_node(t, (yyvsp[-2].ll_node));
-            }
-#line 8082 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 413:
-#line 3578 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE t;
-	      (yyval.ll_node) = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
-	      (yyval.ll_node)->entry.string_val = copys(yytext);
-              if(yyquote=='\"') 
-	        t = global_string_2;
-              else
-	        t = global_string;
-	      (yyval.ll_node)->type = make_type_node(t, (yyvsp[-2].ll_node));
-            }
-#line 8096 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 414:
-#line 3591 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,COMPLEX_VAL, (yyvsp[-3].ll_node), (yyvsp[-1].ll_node), SMNULL);
-	      (yyval.ll_node)->type = global_complex;
-	    }
-#line 8105 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 415:
-#line 3598 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 8111 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 416:
-#line 3600 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8117 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 417:
-#line 3623 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL); }
-#line 8123 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 418:
-#line 3625 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-1].ll_node),LLNULL,SMNULL); }
-#line 8129 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 419:
-#line 3627 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,make_llnd(fi,DDOT,(yyvsp[-4].ll_node),(yyvsp[-2].ll_node),SMNULL),(yyvsp[0].ll_node),SMNULL); }
-#line 8135 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 420:
-#line 3629 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,make_llnd(fi,DDOT,(yyvsp[-3].ll_node),LLNULL,SMNULL),(yyvsp[0].ll_node),SMNULL); }
-#line 8141 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 421:
-#line 3631 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT, make_llnd(fi,DDOT,LLNULL,(yyvsp[-2].ll_node),SMNULL),(yyvsp[0].ll_node),SMNULL); }
-#line 8147 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 422:
-#line 3633 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL),(yyvsp[0].ll_node),SMNULL); }
-#line 8153 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 423:
-#line 3635 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,(yyvsp[0].ll_node),SMNULL); }
-#line 8159 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 424:
-#line 3637 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL); }
-#line 8165 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 425:
-#line 3640 "gram1.y" /* yacc.c:1646  */
-    {in_vec=YES;}
-#line 8171 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 426:
-#line 3640 "gram1.y" /* yacc.c:1646  */
-    {in_vec=NO;}
-#line 8177 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 427:
-#line 3641 "gram1.y" /* yacc.c:1646  */
-    { PTR_TYPE array_type;
-             (yyval.ll_node) = make_llnd (fi,CONSTRUCTOR_REF,(yyvsp[-2].ll_node),LLNULL,SMNULL); 
-             /*$$->type = $2->type;*/ /*28.02.03*/
-             array_type = make_type(fi, T_ARRAY);
-	     array_type->entry.ar_decl.num_dimensions = 1;
-             if((yyvsp[-2].ll_node)->type->variant == T_ARRAY)
-	       array_type->entry.ar_decl.base_type = (yyvsp[-2].ll_node)->type->entry.ar_decl.base_type;
-             else
-               array_type->entry.ar_decl.base_type = (yyvsp[-2].ll_node)->type;
-             (yyval.ll_node)->type = array_type;
-           }
-#line 8193 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 428:
-#line 3655 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8199 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 429:
-#line 3657 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8205 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 430:
-#line 3680 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 8211 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 431:
-#line 3682 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST); endioctl(); }
-#line 8217 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 432:
-#line 3684 "gram1.y" /* yacc.c:1646  */
-    { stat_alloc = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL);
-                  endioctl();
-                }
-#line 8225 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 433:
-#line 3700 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 8231 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 434:
-#line 3702 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST); endioctl(); }
-#line 8237 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 435:
-#line 3704 "gram1.y" /* yacc.c:1646  */
-    { stat_alloc = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL);
-             endioctl();
-           }
-#line 8245 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 436:
-#line 3717 "gram1.y" /* yacc.c:1646  */
-    {stat_alloc = LLNULL;}
-#line 8251 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 437:
-#line 3721 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 8257 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 438:
-#line 3723 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 8263 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 439:
-#line 3731 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8269 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 440:
-#line 3733 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8275 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 441:
-#line 3735 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8281 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 442:
-#line 3737 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.bf_node) = (yyvsp[0].bf_node);
-              (yyval.bf_node)->entry.Template.ll_ptr3 = (yyvsp[-1].ll_node);
-            }
-#line 8290 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 443:
-#line 3791 "gram1.y" /* yacc.c:1646  */
-    { PTR_BFND biff;
-
-	      (yyval.bf_node) = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
-	      bind(); 
-	      biff = cur_scope();
-	      if ((biff->variant == FUNC_HEDR) || (biff->variant == PROC_HEDR)
-		  || (biff->variant == PROS_HEDR) 
-	          || (biff->variant == PROG_HEDR)
-                  || (biff->variant == BLOCK_DATA)) {
-                if(biff->control_parent == global_bfnd) position = IN_OUTSIDE;
-		else if(!is_interface_stat(biff->control_parent)) position++;
-              } else if  (biff->variant == MODULE_STMT)
-                position = IN_OUTSIDE;
-	      else err("Unexpected END statement read", 52);
-             /* FB ADDED set the control parent so the empty function unparse right*/
-              if ((yyval.bf_node))
-                (yyval.bf_node)->control_parent = biff;
-              delete_beyond_scope_level(pred_bfnd);
-            }
-#line 8314 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 444:
-#line 3813 "gram1.y" /* yacc.c:1646  */
-    {
-              make_extend((yyvsp[0].symbol));
-              (yyval.bf_node) = BFNULL; 
-              /* delete_beyond_scope_level(pred_bfnd); */
-             }
-#line 8324 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 445:
-#line 3826 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
-	    bind(); 
-	    delete_beyond_scope_level(pred_bfnd);
-	    position = IN_OUTSIDE;
-          }
-#line 8334 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 446:
-#line 3835 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8340 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 447:
-#line 3838 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.bf_node) = (yyvsp[0].bf_node);
-              (yyval.bf_node)->entry.Template.ll_ptr3 = (yyvsp[-1].ll_node);
-            }
-#line 8349 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 448:
-#line 3888 "gram1.y" /* yacc.c:1646  */
-    { thiswasbranch = NO;
-              (yyvsp[-1].bf_node)->variant = LOGIF_NODE;
-              (yyval.bf_node) = make_logif((yyvsp[-1].bf_node), (yyvsp[0].bf_node));
-	      set_blobs((yyvsp[-1].bf_node), pred_bfnd, SAME_GROUP);
-	    }
-#line 8359 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 449:
-#line 3894 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.bf_node) = (yyvsp[-1].bf_node);
-	      set_blobs((yyval.bf_node), pred_bfnd, NEW_GROUP1); 
-            }
-#line 8368 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 450:
-#line 3899 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.bf_node) = (yyvsp[-1].bf_node);
-              (yyval.bf_node)->entry.Template.ll_ptr3 = (yyvsp[-2].ll_node);
-	      set_blobs((yyval.bf_node), pred_bfnd, NEW_GROUP1); 
-            }
-#line 8378 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 451:
-#line 3917 "gram1.y" /* yacc.c:1646  */
-    { make_elseif((yyvsp[-3].ll_node),(yyvsp[0].symbol)); lastwasbranch = NO; (yyval.bf_node) = BFNULL;}
-#line 8384 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 452:
-#line 3919 "gram1.y" /* yacc.c:1646  */
-    { make_else((yyvsp[0].symbol)); lastwasbranch = NO; (yyval.bf_node) = BFNULL; }
-#line 8390 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 453:
-#line 3921 "gram1.y" /* yacc.c:1646  */
-    { make_endif((yyvsp[0].symbol)); (yyval.bf_node) = BFNULL; }
-#line 8396 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 454:
-#line 3923 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8402 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 455:
-#line 3925 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, CONTAINS_STMT, SMNULL, LLNULL, LLNULL, LLNULL); }
-#line 8408 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 456:
-#line 3928 "gram1.y" /* yacc.c:1646  */
-    { thiswasbranch = NO;
-              (yyvsp[-1].bf_node)->variant = FORALL_STAT;
-              (yyval.bf_node) = make_logif((yyvsp[-1].bf_node), (yyvsp[0].bf_node));
-	      set_blobs((yyvsp[-1].bf_node), pred_bfnd, SAME_GROUP);
-	    }
-#line 8418 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 457:
-#line 3934 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8424 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 458:
-#line 3936 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); (yyval.bf_node)->entry.Template.ll_ptr3 = (yyvsp[-1].ll_node);}
-#line 8430 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 459:
-#line 3938 "gram1.y" /* yacc.c:1646  */
-    { make_endforall((yyvsp[0].symbol)); (yyval.bf_node) = BFNULL; }
-#line 8436 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 460:
-#line 3941 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8442 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 461:
-#line 3943 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8448 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 462:
-#line 3945 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 8454 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 463:
-#line 3972 "gram1.y" /* yacc.c:1646  */
-    { 	     
-	     /*  if($5 && $5->labdefined)
-		 execerr("no backward DO loops", (char *)NULL); */
-	       (yyval.bf_node) = make_do(WHILE_NODE, LBNULL, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL);
-	       /*$$->entry.Template.ll_ptr3 = $1;*/	     
-           }
-#line 8465 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 464:
-#line 3981 "gram1.y" /* yacc.c:1646  */
-    {
-               if( (yyvsp[-3].label) && (yyvsp[-3].label)->labdefined)
-		  err("No backward DO loops", 46);
-	        (yyval.bf_node) = make_do(WHILE_NODE, (yyvsp[-3].label), SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);            
-	    }
-#line 8475 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 465:
-#line 3989 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 8481 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 466:
-#line 3991 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 8487 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 467:
-#line 3993 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 8493 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 468:
-#line 3998 "gram1.y" /* yacc.c:1646  */
-    {  
-               if( (yyvsp[-7].label) && (yyvsp[-7].label)->labdefined)
-		  err("No backward DO loops", 46);
-	        (yyval.bf_node) = make_do(FOR_NODE, (yyvsp[-7].label), (yyvsp[-4].symbol), (yyvsp[-2].ll_node), (yyvsp[0].ll_node), LLNULL);            
-	    }
-#line 8503 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 469:
-#line 4005 "gram1.y" /* yacc.c:1646  */
-    {
-               if( (yyvsp[-9].label) && (yyvsp[-9].label)->labdefined)
-		  err("No backward DO loops", 46);
-	        (yyval.bf_node) = make_do(FOR_NODE, (yyvsp[-9].label), (yyvsp[-6].symbol), (yyvsp[-4].ll_node), (yyvsp[-2].ll_node), (yyvsp[0].ll_node));            
-	    }
-#line 8513 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 470:
-#line 4013 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, CASE_NODE, (yyvsp[0].symbol), (yyvsp[-1].ll_node), LLNULL, LLNULL); }
-#line 8519 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 471:
-#line 4015 "gram1.y" /* yacc.c:1646  */
-    { /*PTR_LLND p;*/
-	     /* p = make_llnd(fi, DEFAULT, LLNULL, LLNULL, SMNULL); */
-	      (yyval.bf_node) = get_bfnd(fi, DEFAULT_NODE, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL); }
-#line 8527 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 472:
-#line 4019 "gram1.y" /* yacc.c:1646  */
-    { make_endselect((yyvsp[0].symbol)); (yyval.bf_node) = BFNULL; }
-#line 8533 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 473:
-#line 4022 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, SWITCH_NODE, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL) ; }
-#line 8539 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 474:
-#line 4024 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, SWITCH_NODE, SMNULL, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-7].ll_node)) ; }
-#line 8545 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 475:
-#line 4028 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 8551 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 476:
-#line 4034 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 8557 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 477:
-#line 4036 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, DDOT, (yyvsp[-1].ll_node), LLNULL, SMNULL); }
-#line 8563 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 478:
-#line 4038 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, DDOT, LLNULL, (yyvsp[0].ll_node), SMNULL); }
-#line 8569 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 479:
-#line 4040 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 8575 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 480:
-#line 4044 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 8581 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 481:
-#line 4046 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-	      
-	      p = make_llnd(fi, EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      add_to_lowLevelList(p, (yyvsp[-2].ll_node));
-	    }
-#line 8591 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 482:
-#line 4054 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = SMNULL; }
-#line 8597 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 483:
-#line 4056 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), CONSTRUCT_NAME, global_default,
-                                     LOCAL); }
-#line 8604 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 484:
-#line 4062 "gram1.y" /* yacc.c:1646  */
-    {(yyval.hash_entry) = HSNULL;}
-#line 8610 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 485:
-#line 4064 "gram1.y" /* yacc.c:1646  */
-    { (yyval.hash_entry) = (yyvsp[0].hash_entry);}
-#line 8616 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 486:
-#line 4068 "gram1.y" /* yacc.c:1646  */
-    {(yyval.hash_entry) = look_up_sym(yytext);}
-#line 8622 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 487:
-#line 4072 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	             s = make_local_entity( (yyvsp[-1].hash_entry), CONSTRUCT_NAME, global_default, LOCAL);             
-                    (yyval.ll_node) = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-                   }
-#line 8631 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 488:
-#line 4093 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = make_if((yyvsp[-1].ll_node)); }
-#line 8637 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 489:
-#line 4096 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = make_forall((yyvsp[-2].ll_node),(yyvsp[-1].ll_node)); }
-#line 8643 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 490:
-#line 4100 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 8649 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 491:
-#line 4102 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;	      
-	      p = make_llnd(fi, EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      add_to_lowLevelList(p, (yyvsp[-2].ll_node));
-	    }
-#line 8658 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 492:
-#line 4109 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi, FORALL_OP, (yyvsp[0].ll_node), LLNULL, (yyvsp[-2].symbol)); }
-#line 8664 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 493:
-#line 4113 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node)=LLNULL;}
-#line 8670 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 494:
-#line 4115 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node)=(yyvsp[0].ll_node);}
-#line 8676 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 495:
-#line 4126 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB  s;
-              s = (yyvsp[0].hash_entry)->id_attr;
-      	      if (!s || s->variant == DEFAULT)
-              {
-	         s = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);
-	     	 s->decl = SOFT;
-	      }
-              (yyval.symbol) = s; 
-	 }
-#line 8690 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 496:
-#line 4139 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-              PTR_LLND l;
-              int vrnt;
-
-            /*  s = make_scalar($1, TYNULL, LOCAL);*/ /*16.02.03*/
-              s = (yyvsp[-4].symbol);
-	      if (s->variant != CONST_NAME) {
-                if(in_vec) 
-                   vrnt=SEQ;
-                else
-                   vrnt=DDOT;     
-                l = make_llnd(fi, SEQ, make_llnd(fi, vrnt, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL),
-                              LLNULL, SMNULL);
-		(yyval.ll_node) = make_llnd(fi,IOACCESS, LLNULL, l, s);
-		do_name_err = NO;
-	      }
-	      else {
-		err("Symbolic constant not allowed as DO variable", 47);
-		do_name_err = YES;
-	      }
-	    }
-#line 8716 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 497:
-#line 4162 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-              PTR_LLND l;
-              int vrnt;
-              /*s = make_scalar($1, TYNULL, LOCAL);*/ /*16.02.03*/
-              s = (yyvsp[-6].symbol);
-	      if( s->variant != CONST_NAME ) {
-                if(in_vec) 
-                   vrnt=SEQ;
-                else
-                   vrnt=DDOT;     
-                l = make_llnd(fi, SEQ, make_llnd(fi, vrnt, (yyvsp[-4].ll_node), (yyvsp[-2].ll_node), SMNULL), (yyvsp[0].ll_node),
-                              SMNULL);
-		(yyval.ll_node) = make_llnd(fi,IOACCESS, LLNULL, l, s);
-		do_name_err = NO;
-	      }
-	      else {
-		err("Symbolic constant not allowed as DO variable", 47);
-		do_name_err = YES;
-	      }
-	    }
-#line 8741 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 498:
-#line 4185 "gram1.y" /* yacc.c:1646  */
-    { (yyval.label) = LBNULL; }
-#line 8747 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 499:
-#line 4187 "gram1.y" /* yacc.c:1646  */
-    {
-	       (yyval.label)  = make_label_node(fi,convci(yyleng, yytext));
-	       (yyval.label)->scope = cur_scope();
-	    }
-#line 8756 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 500:
-#line 4194 "gram1.y" /* yacc.c:1646  */
-    { make_endwhere((yyvsp[0].symbol)); (yyval.bf_node) = BFNULL; }
-#line 8762 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 501:
-#line 4196 "gram1.y" /* yacc.c:1646  */
-    { make_elsewhere((yyvsp[0].symbol)); lastwasbranch = NO; (yyval.bf_node) = BFNULL; }
-#line 8768 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 502:
-#line 4198 "gram1.y" /* yacc.c:1646  */
-    { make_elsewhere_mask((yyvsp[-2].ll_node),(yyvsp[0].symbol)); lastwasbranch = NO; (yyval.bf_node) = BFNULL; }
-#line 8774 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 503:
-#line 4200 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, WHERE_BLOCK_STMT, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL); }
-#line 8780 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 504:
-#line 4202 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, WHERE_BLOCK_STMT, SMNULL, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-5].ll_node)); }
-#line 8786 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 505:
-#line 4207 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, r;
-             PTR_SYMB s1, s2 = SMNULL, s3, arg_list;
-	     PTR_HASH hash_entry;
-
-	   /*  if (just_look_up_sym("=") != HSNULL) {
-	        p = intrinsic_op_node("=", EQUAL, $2, $4);
-   	        $$ = get_bfnd(fi, OVERLOADED_ASSIGN_STAT, SMNULL, p, $2, $4);
-             }	      
-             else */ if ((yyvsp[-2].ll_node)->variant == FUNC_CALL) {
-                if(parstate==INEXEC){
-                  	  err("Declaration among executables", 30);
-                 /*   $$=BFNULL;*/
- 	         (yyval.bf_node) = get_bfnd(fi,STMTFN_STAT, SMNULL, (yyvsp[-2].ll_node), LLNULL, LLNULL);
-                } 
-                else {	         
-  	         (yyvsp[-2].ll_node)->variant = STMTFN_DECL;
-		 /* $2->entry.Template.ll_ptr2 = $4; */
-                 if( (yyvsp[-2].ll_node)->entry.Template.ll_ptr1) {
-		   r = (yyvsp[-2].ll_node)->entry.Template.ll_ptr1->entry.Template.ll_ptr1;
-                   if(r->variant != VAR_REF && r->variant != ARRAY_REF){
-                     err("A dummy argument of a statement function must be a scalar identifier", 333);
-                     s1 = SMNULL;
-                   }
-                   else                       
-		     s1 = r ->entry.Template.symbol;
-                 } else
-                   s1 = SMNULL;
-		 if (s1)
-	            s1->scope = cur_scope();
- 	         (yyval.bf_node) = get_bfnd(fi,STMTFN_STAT, SMNULL, (yyvsp[-2].ll_node), LLNULL, LLNULL);
-	         add_scope_level((yyval.bf_node), NO);
-                 arg_list = SMNULL;
-		 if (s1) 
-                 {
-	            /*arg_list = SMNULL;*/
-                    p = (yyvsp[-2].ll_node)->entry.Template.ll_ptr1;
-                    while (p != LLNULL)
-                    {
-		    /*   if (p->entry.Template.ll_ptr1->variant != VAR_REF) {
-			  errstr("cftn.gram:1: illegal statement function %s.", $2->entry.Template.symbol->ident);
-			  break;
-		       } 
-                    */
-                       r = p->entry.Template.ll_ptr1;
-                       if(r->variant != VAR_REF && r->variant != ARRAY_REF){
-                         err("A dummy argument of a statement function must be a scalar identifier", 333);
-                         break;
-                       }
-	               hash_entry = look_up_sym(r->entry.Template.symbol->parent->ident);
-	               s3 = make_scalar(hash_entry, s1->type, IO);
-                       replace_symbol_in_expr(s3,(yyvsp[0].ll_node));
-	               if (arg_list == SMNULL) 
-                          s2 = arg_list = s3;
-             	       else 
-                       {
-                          s2->id_list = s3;
-                          s2 = s3;
-                       }
-                       p = p->entry.Template.ll_ptr2;
-                    }
-                 }
-  		    (yyvsp[-2].ll_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-		    install_param_list((yyvsp[-2].ll_node)->entry.Template.symbol,
-				       arg_list, LLNULL, FUNCTION_NAME);
-	            delete_beyond_scope_level((yyval.bf_node));
-		 
-		/* else
-		    errstr("cftn.gram: Illegal statement function declaration %s.", $2->entry.Template.symbol->ident); */
-               }
-	     }
-	     else {
-		(yyval.bf_node) = get_bfnd(fi,ASSIGN_STAT,SMNULL, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), LLNULL);
-                 parstate = INEXEC;
-             }
-	  }
-#line 8866 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 506:
-#line 4283 "gram1.y" /* yacc.c:1646  */
-    { /*PTR_SYMB s;*/
-	
-	      /*s = make_scalar($2, TYNULL, LOCAL);*/
-  	      (yyval.bf_node) = get_bfnd(fi, POINTER_ASSIGN_STAT, SMNULL, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), LLNULL);
-	    }
-#line 8876 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 507:
-#line 4295 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB p;
-
-	      p = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);
-	      p->variant = LABEL_VAR;
-  	      (yyval.bf_node) = get_bfnd(fi,ASSLAB_STAT, p, (yyvsp[-2].ll_node),LLNULL,LLNULL);
-            }
-#line 8887 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 508:
-#line 4302 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,CONT_STAT,SMNULL,LLNULL,LLNULL,LLNULL); }
-#line 8893 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 510:
-#line 4305 "gram1.y" /* yacc.c:1646  */
-    { inioctl = NO; }
-#line 8899 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 511:
-#line 4307 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND	p;
-
-	      p = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      p = make_llnd(fi,EXPR_LIST, (yyvsp[-2].ll_node), p, SMNULL);
-	      (yyval.bf_node)= get_bfnd(fi,ARITHIF_NODE, SMNULL, (yyvsp[-6].ll_node),
-			    make_llnd(fi,EXPR_LIST, (yyvsp[-4].ll_node), p, SMNULL), LLNULL);
-	      thiswasbranch = YES;
-            }
-#line 8912 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 512:
-#line 4316 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.bf_node) = subroutine_call((yyvsp[0].symbol), LLNULL, LLNULL, PLAIN);
-/*	      match_parameters($1, LLNULL);
-	      $$= get_bfnd(fi,PROC_STAT, $1, LLNULL, LLNULL, LLNULL);
-*/	      endioctl(); 
-            }
-#line 8923 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 513:
-#line 4323 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.bf_node) = subroutine_call((yyvsp[-2].symbol), LLNULL, LLNULL, PLAIN);
-/*	      match_parameters($1, LLNULL);
-	      $$= get_bfnd(fi,PROC_STAT,$1,LLNULL,LLNULL,LLNULL);
-*/	      endioctl(); 
-	    }
-#line 8934 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 514:
-#line 4330 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.bf_node) = subroutine_call((yyvsp[-3].symbol), (yyvsp[-1].ll_node), LLNULL, PLAIN);
-/*	      match_parameters($1, $3);
-	      $$= get_bfnd(fi,PROC_STAT,$1,$3,LLNULL,LLNULL);
-*/	      endioctl(); 
-	    }
-#line 8945 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 515:
-#line 4338 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.bf_node) = get_bfnd(fi,RETURN_STAT,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
-	      thiswasbranch = YES;
-	    }
-#line 8954 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 516:
-#line 4343 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.bf_node) = get_bfnd(fi,(yyvsp[-2].token),SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
-	      thiswasbranch = ((yyvsp[-2].token) == STOP_STAT);
-	    }
-#line 8963 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 517:
-#line 4348 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, CYCLE_STMT, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL); }
-#line 8969 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 518:
-#line 4351 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, EXIT_STMT, (yyvsp[0].symbol), LLNULL, LLNULL, LLNULL); }
-#line 8975 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 519:
-#line 4354 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, ALLOCATE_STMT,  SMNULL, (yyvsp[-1].ll_node), stat_alloc, LLNULL); }
-#line 8981 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 520:
-#line 4357 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, DEALLOCATE_STMT, SMNULL, (yyvsp[-1].ll_node), stat_alloc , LLNULL); }
-#line 8987 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 521:
-#line 4360 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, NULLIFY_STMT, SMNULL, (yyvsp[-1].ll_node), LLNULL, LLNULL); }
-#line 8993 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 522:
-#line 4363 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi, WHERE_NODE, SMNULL, (yyvsp[-4].ll_node), (yyvsp[-2].ll_node), (yyvsp[0].ll_node)); }
-#line 8999 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 523:
-#line 4381 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = LLNULL;}
-#line 9005 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 524:
-#line 4385 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.bf_node)=get_bfnd(fi,GOTO_NODE,SMNULL,LLNULL,LLNULL,(PTR_LLND)(yyvsp[0].ll_node));
-	      thiswasbranch = YES;
-	    }
-#line 9014 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 525:
-#line 4390 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB p;
-
-	      if((yyvsp[0].hash_entry)->id_attr)
-		p = (yyvsp[0].hash_entry)->id_attr;
-	      else {
-	        p = make_scalar((yyvsp[0].hash_entry), TYNULL, LOCAL);
-		p->variant = LABEL_VAR;
-	      }
-
-	      if(p->variant == LABEL_VAR) {
-		  (yyval.bf_node) = get_bfnd(fi,ASSGOTO_NODE,p,LLNULL,LLNULL,LLNULL);
-		  thiswasbranch = YES;
-	      }
-	      else {
-		  err("Must go to assigned variable", 48);
-		  (yyval.bf_node) = BFNULL;
-	      }
-	    }
-#line 9037 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 526:
-#line 4409 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB p;
-
-	      if((yyvsp[-4].hash_entry)->id_attr)
-		p = (yyvsp[-4].hash_entry)->id_attr;
-	      else {
-	        p = make_scalar((yyvsp[-4].hash_entry), TYNULL, LOCAL);
-		p->variant = LABEL_VAR;
-	      }
-
-	      if (p->variant == LABEL_VAR) {
-		 (yyval.bf_node) = get_bfnd(fi,ASSGOTO_NODE,p,(yyvsp[-1].ll_node),LLNULL,LLNULL);
-		 thiswasbranch = YES;
-	      }
-	      else {
-		err("Must go to assigned variable",48);
-		(yyval.bf_node) = BFNULL;
-	      }
-	    }
-#line 9060 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 527:
-#line 4428 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,COMGOTO_NODE, SMNULL, (yyvsp[-3].ll_node), (yyvsp[0].ll_node), LLNULL); }
-#line 9066 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 530:
-#line 4436 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = make_procedure((yyvsp[-1].hash_entry), LOCAL); }
-#line 9072 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 531:
-#line 4440 "gram1.y" /* yacc.c:1646  */
-    { 
-              (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);
-              endioctl();
-            }
-#line 9081 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 532:
-#line 4445 "gram1.y" /* yacc.c:1646  */
-    { 
-               (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST);
-               endioctl();
-            }
-#line 9090 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 533:
-#line 4452 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9096 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 534:
-#line 4454 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node)  = make_llnd(fi, KEYWORD_ARG, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 9102 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 535:
-#line 4456 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,LABEL_ARG,(yyvsp[0].ll_node),LLNULL,SMNULL); }
-#line 9108 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 536:
-#line 4459 "gram1.y" /* yacc.c:1646  */
-    { (yyval.token) = PAUSE_NODE; }
-#line 9114 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 537:
-#line 4460 "gram1.y" /* yacc.c:1646  */
-    { (yyval.token) = STOP_STAT; }
-#line 9120 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 538:
-#line 4471 "gram1.y" /* yacc.c:1646  */
-    { if(parstate == OUTSIDE)
-		{ PTR_BFND p;
-
-		  p = get_bfnd(fi,PROG_HEDR, make_program(look_up_sym("_MAIN")), LLNULL, LLNULL, LLNULL);
-		  set_blobs(p, global_bfnd, NEW_GROUP1);
-		  add_scope_level(p, NO);
-		  position = IN_PROC; 
-		}
-		if(parstate < INDATA) enddcl();
-		parstate = INEXEC;
-		yystno = 0;
-	      }
-#line 9137 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 539:
-#line 4486 "gram1.y" /* yacc.c:1646  */
-    { intonly = YES; }
-#line 9143 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 540:
-#line 4490 "gram1.y" /* yacc.c:1646  */
-    { intonly = NO; }
-#line 9149 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 541:
-#line 4498 "gram1.y" /* yacc.c:1646  */
-    { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
-		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9156 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 542:
-#line 4501 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q = LLNULL;
-
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"unit";
-		  q->type = global_string;
-		  p = make_llnd(fi, SPEC_PAIR, q, (yyvsp[0].ll_node), SMNULL);
-		  (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = p;
-		  endioctl();
-		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9170 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 543:
-#line 4511 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q, r;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"unit";
-		  q->type = global_string;
-		  r = make_llnd(fi, SPEC_PAIR, p, q, SMNULL);
-		  (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = r;
-		  endioctl();
-		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9187 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 544:
-#line 4524 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q, r;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"**";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"unit";
-		  q->type = global_string;
-		  r = make_llnd(fi, SPEC_PAIR, p, q, SMNULL);
-		  (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = r;
-		  endioctl();
-		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9204 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 545:
-#line 4537 "gram1.y" /* yacc.c:1646  */
-    { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
-		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9211 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 546:
-#line 4540 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 9217 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 547:
-#line 4542 "gram1.y" /* yacc.c:1646  */
-    { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
-		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9224 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 548:
-#line 4545 "gram1.y" /* yacc.c:1646  */
-    { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
-		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9231 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 549:
-#line 4548 "gram1.y" /* yacc.c:1646  */
-    { (yyvsp[-2].bf_node)->entry.Template.ll_ptr2 = (yyvsp[-1].ll_node);
-		  (yyvsp[-2].bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-		  (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9239 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 550:
-#line 4552 "gram1.y" /* yacc.c:1646  */
-    { (yyvsp[-3].bf_node)->entry.Template.ll_ptr2 = (yyvsp[-2].ll_node);
-		  (yyvsp[-3].bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-		  (yyval.bf_node) = (yyvsp[-3].bf_node); }
-#line 9247 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 551:
-#line 4561 "gram1.y" /* yacc.c:1646  */
-    { (yyvsp[-1].bf_node)->entry.Template.ll_ptr2 = (yyvsp[0].ll_node);
-		  (yyval.bf_node) = (yyvsp[-1].bf_node); }
-#line 9254 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 552:
-#line 4564 "gram1.y" /* yacc.c:1646  */
-    { (yyvsp[-2].bf_node)->entry.Template.ll_ptr2 = (yyvsp[-1].ll_node);
-		  (yyvsp[-2].bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-		  (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9262 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 553:
-#line 4568 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[0].bf_node); }
-#line 9268 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 554:
-#line 4570 "gram1.y" /* yacc.c:1646  */
-    { (yyvsp[-2].bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-		  (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9275 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 555:
-#line 4576 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9281 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 556:
-#line 4580 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi, BACKSPACE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9287 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 557:
-#line 4582 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi, REWIND_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9293 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 558:
-#line 4584 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi, ENDFILE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9299 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 559:
-#line 4591 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = (yyvsp[-2].bf_node); }
-#line 9305 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 560:
-#line 4595 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi, OPEN_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9311 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 561:
-#line 4597 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi, CLOSE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9317 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 562:
-#line 4601 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi, INQUIRE_STAT, SMNULL, LLNULL, (yyvsp[0].ll_node), LLNULL);}
-#line 9323 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 563:
-#line 4603 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi, INQUIRE_STAT, SMNULL, (yyvsp[0].ll_node), (yyvsp[-1].ll_node), LLNULL);}
-#line 9329 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 564:
-#line 4607 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-		  PTR_LLND q = LLNULL;
-
-		  if ((yyvsp[0].ll_node)->variant == INT_VAL)
- 	          {
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) (yyvsp[0].ll_node)->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		  }
-		  else p = (yyvsp[0].ll_node); 
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		  endioctl();
-		}
-#line 9352 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 565:
-#line 4626 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-		  PTR_LLND q;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		  endioctl();
-		}
-#line 9369 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 566:
-#line 4642 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"unit";
-		  p->type = global_string;
-		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, p, (yyvsp[-1].ll_node), SMNULL);
-		  endioctl();
-		}
-#line 9382 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 567:
-#line 4653 "gram1.y" /* yacc.c:1646  */
-    { 
-		  (yyval.ll_node) = (yyvsp[-1].ll_node);
-		  endioctl();
-		 }
-#line 9391 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 568:
-#line 4660 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); endioctl();}
-#line 9397 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 569:
-#line 4662 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST); endioctl();}
-#line 9403 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 570:
-#line 4666 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-		  PTR_LLND q;
- 
-		  nioctl++;
-		  if ((nioctl == 2) && ((yyvsp[0].ll_node)->variant == INT_VAL))
- 	          {
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) (yyvsp[0].ll_node)->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		  }
-		  else p = (yyvsp[0].ll_node); 
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  if (nioctl == 1)
-		        q->entry.string_val = (char *)"unit"; 
-		  else {
-                     if(((yyvsp[0].ll_node)->variant == VAR_REF) && (yyvsp[0].ll_node)->entry.Template.symbol->variant == NAMELIST_NAME)
-                       q->entry.string_val = (char *)"nml";
-                     else
-                       q->entry.string_val = (char *)"fmt";
-                  }
-		  q->type = global_string;
-		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		}
-#line 9433 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 571:
-#line 4692 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-		  PTR_LLND q;
-
-		  nioctl++;
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  if (nioctl == 1)
-		        q->entry.string_val = (char *)"unit"; 
-		  else  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		}
-#line 9452 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 572:
-#line 4707 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-		  PTR_LLND q;
-
-		  nioctl++;
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"**";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  if (nioctl == 1)
-		        q->entry.string_val = (char *)"unit"; 
-		  else  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		}
-#line 9471 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 573:
-#line 4722 "gram1.y" /* yacc.c:1646  */
-    { 
-		  PTR_LLND p;
-		  char *q;
-
-		  q = (yyvsp[-1].ll_node)->entry.string_val;
-  		  if ((strcmp(q, "end") == 0) || (strcmp(q, "err") == 0) || (strcmp(q, "eor") == 0) || ((strcmp(q,"fmt") == 0) && ((yyvsp[0].ll_node)->variant == INT_VAL)))
- 	          {
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) (yyvsp[0].ll_node)->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		  }
-		  else p = (yyvsp[0].ll_node);
-
-		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), p, SMNULL); }
-#line 9492 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 574:
-#line 4739 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-                  
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), p, SMNULL);
-		}
-#line 9504 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 575:
-#line 4747 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  (yyval.ll_node) = make_llnd(fi, SPEC_PAIR, (yyvsp[-1].ll_node), p, SMNULL);
-		}
-#line 9515 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 576:
-#line 4756 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  (yyval.ll_node)->entry.string_val = copys(yytext);
-		  (yyval.ll_node)->type = global_string;
-	        }
-#line 9524 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 577:
-#line 4764 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi, READ_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9530 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 578:
-#line 4769 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi, WRITE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-#line 9536 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 579:
-#line 4774 "gram1.y" /* yacc.c:1646  */
-    {
-	    PTR_LLND p, q, l;
-
-	    if ((yyvsp[-1].ll_node)->variant == INT_VAL)
-		{
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) (yyvsp[-1].ll_node)->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		}
-	    else p = (yyvsp[-1].ll_node);
-	    
-            q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	    q->entry.string_val = (char *)"fmt";
-            q->type = global_string;
-            l = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-
-            (yyval.bf_node) = get_bfnd(fi, PRINT_STAT, SMNULL, LLNULL, l, LLNULL);
-	    endioctl();
-	   }
-#line 9562 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 580:
-#line 4796 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p, q, r;
-		
-	     p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	     p->entry.string_val = (char *)"*";
-	     p->type = global_string;
-	     q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	     q->entry.string_val = (char *)"fmt";
-             q->type = global_string;
-             r = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-	     (yyval.bf_node) = get_bfnd(fi, PRINT_STAT, SMNULL, LLNULL, r, LLNULL);
-	     endioctl();
-           }
-#line 9579 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 581:
-#line 4812 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);}
-#line 9585 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 582:
-#line 4814 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST);}
-#line 9591 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 583:
-#line 4818 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9597 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 584:
-#line 4820 "gram1.y" /* yacc.c:1646  */
-    {
-		  (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-3].ll_node);
-		  (yyval.ll_node) = (yyvsp[-1].ll_node);
-		}
-#line 9606 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 585:
-#line 4827 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);  (yyval.ll_node)->type = (yyvsp[0].ll_node)->type;}
-#line 9612 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 586:
-#line 4829 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9618 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 587:
-#line 4831 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9624 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 588:
-#line 4835 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9630 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 589:
-#line 4837 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9636 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 590:
-#line 4839 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9642 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 591:
-#line 4841 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9648 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 592:
-#line 4843 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9654 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 593:
-#line 4845 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); (yyval.ll_node)->type = (yyvsp[-2].ll_node)->type;}
-#line 9660 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 594:
-#line 4849 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) =  set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);
-	          (yyval.ll_node)->type = global_complex; }
-#line 9667 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 595:
-#line 4852 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) =  set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST);
-                  (yyval.ll_node)->type = (yyvsp[-1].ll_node)->type; }
-#line 9674 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 596:
-#line 4855 "gram1.y" /* yacc.c:1646  */
-    {
-		  (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-3].ll_node);
-		  (yyval.ll_node) =  set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST);
-                  (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type; 
-		}
-#line 9684 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 597:
-#line 4861 "gram1.y" /* yacc.c:1646  */
-    {
-		  (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-3].ll_node);
-		  (yyval.ll_node) =  set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST);
-                  (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type; 
-		}
-#line 9694 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 598:
-#line 4867 "gram1.y" /* yacc.c:1646  */
-    {
-		  (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-3].ll_node);
-		  (yyval.ll_node) =  set_ll_list((yyvsp[-1].ll_node), LLNULL, EXPR_LIST);
-                  (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type; 
-		}
-#line 9704 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 599:
-#line 4875 "gram1.y" /* yacc.c:1646  */
-    { inioctl = YES; }
-#line 9710 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 600:
-#line 4879 "gram1.y" /* yacc.c:1646  */
-    { startioctl();}
-#line 9716 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 601:
-#line 4887 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9722 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 602:
-#line 4889 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node); }
-#line 9728 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 603:
-#line 4893 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9734 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 604:
-#line 4895 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 9740 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 605:
-#line 4897 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,(yyvsp[-1].token), (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
-	      set_expr_type((yyval.ll_node));
-	    }
-#line 9749 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 606:
-#line 4902 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,MULT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
-	      set_expr_type((yyval.ll_node));
-	    }
-#line 9758 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 607:
-#line 4907 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,DIV_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
-	      set_expr_type((yyval.ll_node));
-	    }
-#line 9767 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 608:
-#line 4912 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,EXP_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
-	      set_expr_type((yyval.ll_node));
-	    }
-#line 9776 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 609:
-#line 4917 "gram1.y" /* yacc.c:1646  */
-    {
-	      if((yyvsp[-1].token) == SUBT_OP)
-		{
-		  (yyval.ll_node) = make_llnd(fi,SUBT_OP, (yyvsp[0].ll_node), LLNULL, SMNULL);
-		  set_expr_type((yyval.ll_node));
-		}
-	      else	(yyval.ll_node) = (yyvsp[0].ll_node);
-	    }
-#line 9789 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 610:
-#line 4926 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,CONCAT_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
-	      set_expr_type((yyval.ll_node));
-	    }
-#line 9798 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 611:
-#line 4931 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 9804 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 612:
-#line 4936 "gram1.y" /* yacc.c:1646  */
-    { comments = cur_comment = CMNULL; }
-#line 9810 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 613:
-#line 4938 "gram1.y" /* yacc.c:1646  */
-    { PTR_CMNT p;
-	    p = make_comment(fi,*commentbuf, HALF);
-	    if (cur_comment)
-               cur_comment->next = p;
-            else {
-	       if ((pred_bfnd->control_parent->variant == LOGIF_NODE) ||(pred_bfnd->control_parent->variant == FORALL_STAT))
-
-	           pred_bfnd->control_parent->entry.Template.cmnt_ptr = p;
-
-	       else last_bfnd->entry.Template.cmnt_ptr = p;
-            }
-	    comments = cur_comment = CMNULL;
-          }
-#line 9828 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 677:
-#line 5021 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,HPF_TEMPLATE_STAT, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL); }
-#line 9834 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 678:
-#line 5023 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-                if((yyvsp[-2].bf_node)->entry.Template.ll_ptr2)
-                {
-                  s = (yyvsp[0].ll_node)->entry.Template.ll_ptr1->entry.Template.symbol;
-                  s->attr = s->attr | COMMON_BIT;
-                }
-	        add_to_lowLevelList((yyvsp[0].ll_node), (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-	      }
-#line 9847 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 679:
-#line 5034 "gram1.y" /* yacc.c:1646  */
-    {PTR_SYMB s;
-	      PTR_LLND q;
-	    /* 27.06.18
-	      if(! explicit_shape)   
-                err("Explicit shape specification is required", 50);
-	    */  
-	      s = make_array((yyvsp[-1].hash_entry), TYNULL, (yyvsp[0].ll_node), ndim, LOCAL);
-              if(s->attr & TEMPLATE_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & DVM_POINTER_BIT))
-                errstr( "Inconsistent declaration of identifier  %s ", s->ident, 16);
-              else
-	        s->attr = s->attr | TEMPLATE_BIT;
-              if((yyvsp[0].ll_node)) s->attr = s->attr | DIMENSION_BIT;  
-	      q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-	      s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
-	      (yyval.ll_node) = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	     }
-#line 9870 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 680:
-#line 5055 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_DYNAMIC_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 9876 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 681:
-#line 5059 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 9882 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 682:
-#line 5061 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 9888 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 683:
-#line 5065 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-              if(s->attr &  DYNAMIC_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & HEAP_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-              else
-                s->attr = s->attr | DYNAMIC_BIT;        
-	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-#line 9903 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 684:
-#line 5078 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_INHERIT_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 9909 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 685:
-#line 5082 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 9915 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 686:
-#line 5084 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 9921 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 687:
-#line 5088 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-              else
-                s->attr = s->attr | INHERIT_BIT;        
-	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-#line 9934 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 688:
-#line 5099 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND q;
-             q = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-              /* (void)fprintf(stderr,"hpf.gram: shadow\n");*/ 
-	     (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_DIR,SMNULL,q,(yyvsp[0].ll_node),LLNULL);
-            }
-#line 9944 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 689:
-#line 5110 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 9950 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 690:
-#line 5114 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 9956 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 691:
-#line 5116 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 9962 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 692:
-#line 5120 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 9968 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 693:
-#line 5122 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);}
-#line 9974 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 694:
-#line 5124 "gram1.y" /* yacc.c:1646  */
-    {
-            if(parstate!=INEXEC) 
-               err("Illegal shadow width specification", 56);  
-            (yyval.ll_node) = make_llnd(fi,SHADOW_NAMES_OP, (yyvsp[-1].ll_node), LLNULL, SMNULL);
-          }
-#line 9984 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 695:
-#line 5139 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-              if(s->attr & SHADOW_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & HEAP_BIT)) 
-                      errstr( "Inconsistent declaration of identifier %s", s->ident, 16); 
-              else
-        	      s->attr = s->attr | SHADOW_BIT;  
-	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-#line 9999 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 696:
-#line 5151 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! explicit_shape) {
-              err("Explicit shape specification is required", 50);
-		/* $$ = BFNULL;*/
-	      }
-	      s = make_array((yyvsp[-1].hash_entry), TYNULL, (yyvsp[0].ll_node), ndim, LOCAL);
-              if(s->attr &  PROCESSORS_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & TASK_BIT) || (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT))
-                errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-              else
-	        s->attr = s->attr | PROCESSORS_BIT;
-              if((yyvsp[0].ll_node)) s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-	      s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi,HPF_PROCESSORS_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-#line 10023 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 697:
-#line 5171 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! explicit_shape) {
-              err("Explicit shape specification is required", 50);
-		/* $$ = BFNULL;*/
-	      }
-	      s = make_array((yyvsp[-1].hash_entry), TYNULL, (yyvsp[0].ll_node), ndim, LOCAL);
-              if(s->attr &  PROCESSORS_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & TASK_BIT) || (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT))
-                errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-              else
-	        s->attr = s->attr | PROCESSORS_BIT;
-              if((yyvsp[0].ll_node)) s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-	      s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      (yyval.bf_node) = get_bfnd(fi,HPF_PROCESSORS_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-#line 10047 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 698:
-#line 5191 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! explicit_shape) {
-		err("Explicit shape specification is required", 50);
-		/*$$ = BFNULL;*/
-	      }
-	      s = make_array((yyvsp[-1].hash_entry), TYNULL, (yyvsp[0].ll_node), ndim, LOCAL);
-              if(s->attr &  PROCESSORS_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & TASK_BIT) || (s->attr &  DVM_POINTER_BIT) || (s->attr & INHERIT_BIT) )
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16);
-              else
-	        s->attr = s->attr | PROCESSORS_BIT;
-              if((yyvsp[0].ll_node)) s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-	      s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, (yyvsp[-3].bf_node)->entry.Template.ll_ptr1);
-	}
-#line 10071 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 699:
-#line 5213 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           (yyval.bf_node) = get_bfnd(fi,DVM_INDIRECT_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-#line 10081 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 700:
-#line 5219 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-	           ;
-                }
-#line 10092 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 701:
-#line 5228 "gram1.y" /* yacc.c:1646  */
-    {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), REF_GROUP_NAME,global_default,LOCAL);
-          if((yyval.symbol)->attr &  INDIRECT_BIT)
-                errstr( "Multiple declaration of identifier  %s ", (yyval.symbol)->ident, 73);
-           (yyval.symbol)->attr = (yyval.symbol)->attr | INDIRECT_BIT;
-          }
-#line 10102 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 702:
-#line 5236 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           (yyval.bf_node) = get_bfnd(fi,DVM_REMOTE_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-#line 10112 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 703:
-#line 5242 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-                }
-#line 10122 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 704:
-#line 5250 "gram1.y" /* yacc.c:1646  */
-    {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), REF_GROUP_NAME,global_default,LOCAL);
-           if((yyval.symbol)->attr &  INDIRECT_BIT)
-                errstr( "Inconsistent declaration of identifier  %s ", (yyval.symbol)->ident, 16);
-          }
-#line 10131 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 705:
-#line 5257 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           (yyval.bf_node) = get_bfnd(fi,DVM_REDUCTION_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-#line 10141 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 706:
-#line 5263 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-	           ;
-                }
-#line 10152 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 707:
-#line 5272 "gram1.y" /* yacc.c:1646  */
-    {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), REDUCTION_GROUP_NAME,global_default,LOCAL);}
-#line 10158 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 708:
-#line 5276 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           (yyval.bf_node) = get_bfnd(fi,DVM_CONSISTENT_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-#line 10168 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 709:
-#line 5282 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);	           
-                }
-#line 10178 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 710:
-#line 5290 "gram1.y" /* yacc.c:1646  */
-    {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), CONSISTENT_GROUP_NAME,global_default,LOCAL);}
-#line 10184 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 711:
-#line 5304 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-            if(parstate == INEXEC){
-              if (!(s = (yyvsp[-1].hash_entry)->id_attr))
-              {
-	         s = make_array((yyvsp[-1].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-	     	 s->decl = SOFT;
-	      } 
-            } else
-              s = make_array((yyvsp[-1].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-
-              (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-            }
-#line 10201 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 712:
-#line 5317 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; opt_kwd_ = NO;}
-#line 10207 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 713:
-#line 5323 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND q;
-             if(!(yyvsp[-1].ll_node))
-               err("Distribution format list is omitted", 51);
-            /* if($6)
-               err("NEW_VALUE specification in DISTRIBUTE directive");*/
-             q = set_ll_list((yyvsp[-2].ll_node),LLNULL,EXPR_LIST);
-	     (yyval.bf_node) = get_bfnd(fi,DVM_DISTRIBUTE_DIR,SMNULL,q,(yyvsp[-1].ll_node),(yyvsp[0].ll_node));
-            }
-#line 10220 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 714:
-#line 5339 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND q;
-                /*  if(!$4)
-                  {err("Distribution format is omitted", 51); errcnt--;}
-                 */
-              q = set_ll_list((yyvsp[-3].ll_node),LLNULL,EXPR_LIST);
-                 /* r = LLNULL;
-                   if($6){
-                     r = set_ll_list($6,LLNULL,EXPR_LIST);
-                     if($7) r = set_ll_list(r,$7,EXPR_LIST);
-                   } else
-                     if($7) r = set_ll_list(r,$7,EXPR_LIST);
-                 */
-	      (yyval.bf_node) = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,SMNULL,q,(yyvsp[-2].ll_node),(yyvsp[0].ll_node));}
-#line 10238 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 715:
-#line 5354 "gram1.y" /* yacc.c:1646  */
-    {
-                 /* r = LLNULL;
-                    if($5){
-                      r = set_ll_list($5,LLNULL,EXPR_LIST);
-                      if($6) r = set_ll_list(r,$6,EXPR_LIST);
-                    } else
-                      if($6) r = set_ll_list(r,$6,EXPR_LIST);
-                  */
-	      (yyval.bf_node) = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,SMNULL,(yyvsp[0].ll_node) ,(yyvsp[-5].ll_node),(yyvsp[-3].ll_node) );
-             }
-#line 10253 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 716:
-#line 5382 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10259 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 717:
-#line 5384 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10265 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 718:
-#line 5388 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10271 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 719:
-#line 5390 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10277 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 720:
-#line 5394 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
- 
-          if(parstate == INEXEC){
-            if (!(s = (yyvsp[0].hash_entry)->id_attr))
-              {
-	         s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-	     	 s->decl = SOFT;
-	      } 
-            if(s->attr & PROCESSORS_BIT)
-              errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);
-            if(s->attr & TASK_BIT)
-              errstr( "Illegal use of task array name %s ", s->ident, 71);
-
-          } else {
-            s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-            if(s->attr & DISTRIBUTE_BIT)
-              errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-            else if( (s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & INHERIT_BIT))
-              errstr("Inconsistent declaration of identifier  %s",s->ident, 16);
-            else
-              s->attr = s->attr | DISTRIBUTE_BIT;
-          } 
-         if(s->attr & ALIGN_BIT)
-               errstr("A distributee may not have the ALIGN attribute:%s",s->ident, 54);
-          (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);               	  
-	}
-#line 10308 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 721:
-#line 5423 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-          s = make_array((yyvsp[-3].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-        
-          if(parstate != INEXEC) 
-               errstr( "Illegal distributee:%s", s->ident, 312);
-          else {
-            if(s->attr & PROCESSORS_BIT)
-               errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);  
-            if(s->attr & TASK_BIT)
-               errstr( "Illegal use of task array name %s ", s->ident, 71);        
-            if(s->attr & ALIGN_BIT)
-               errstr("A distributee may not have the ALIGN attribute:%s",s->ident, 54);
-            if(!(s->attr & DVM_POINTER_BIT))
-               errstr("Illegal distributee:%s", s->ident, 312);
-          /*s->attr = s->attr | DISTRIBUTE_BIT;*/
-	  (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[-1].ll_node), LLNULL, s); 
-          }
-        
-	}
-#line 10332 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 722:
-#line 5446 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-          if((s=(yyvsp[0].hash_entry)->id_attr) == SMNULL)
-            s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-          if((parstate == INEXEC) && !(s->attr & PROCESSORS_BIT))
-               errstr( "'%s' is not processor array ", s->ident, 67);
-	  (yyval.symbol) = s;
-	}
-#line 10344 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 723:
-#line 5466 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL;  }
-#line 10350 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 724:
-#line 5468 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 10356 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 725:
-#line 5472 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 10362 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 726:
-#line 5493 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10368 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 727:
-#line 5495 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10374 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 728:
-#line 5498 "gram1.y" /* yacc.c:1646  */
-    { opt_kwd_ = YES; }
-#line 10380 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 729:
-#line 5507 "gram1.y" /* yacc.c:1646  */
-    {  
-               (yyval.ll_node) = make_llnd(fi,BLOCK_OP, LLNULL, LLNULL, SMNULL);
-        }
-#line 10388 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 730:
-#line 5511 "gram1.y" /* yacc.c:1646  */
-    {  err("Distribution format BLOCK(n) is not permitted in FDVM", 55);
-          (yyval.ll_node) = make_llnd(fi,BLOCK_OP, (yyvsp[-1].ll_node), LLNULL, SMNULL);
-          endioctl();
-        }
-#line 10397 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 731:
-#line 5516 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,BLOCK_OP, LLNULL, LLNULL, (yyvsp[-1].symbol)); }
-#line 10403 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 732:
-#line 5518 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,BLOCK_OP,  (yyvsp[-1].ll_node),  LLNULL,  (yyvsp[-3].symbol)); }
-#line 10409 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 733:
-#line 5520 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,BLOCK_OP,  LLNULL, (yyvsp[-1].ll_node),  SMNULL); }
-#line 10415 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 734:
-#line 5522 "gram1.y" /* yacc.c:1646  */
-    { 
-          (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-          (yyval.ll_node)->entry.string_val = (char *) "*";
-          (yyval.ll_node)->type = global_string;
-        }
-#line 10425 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 735:
-#line 5528 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,INDIRECT_OP, LLNULL, LLNULL, (yyvsp[-1].symbol)); }
-#line 10431 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 736:
-#line 5530 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,INDIRECT_OP, (yyvsp[-1].ll_node), LLNULL, SMNULL); }
-#line 10437 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 737:
-#line 5534 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-       
-	      (yyval.symbol) = s;
-	   }
-#line 10449 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 738:
-#line 5544 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DERIVED_OP, (yyvsp[-4].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 10455 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 739:
-#line 5548 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10461 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 740:
-#line 5550 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10467 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 741:
-#line 5555 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10473 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 742:
-#line 5557 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);}
-#line 10479 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 743:
-#line 5561 "gram1.y" /* yacc.c:1646  */
-    { 
-              (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, (yyvsp[0].symbol));
-	    }
-#line 10487 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 744:
-#line 5565 "gram1.y" /* yacc.c:1646  */
-    { 
-              (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-3].symbol));
-	    }
-#line 10495 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 745:
-#line 5571 "gram1.y" /* yacc.c:1646  */
-    { 
-              if (!((yyval.symbol) = (yyvsp[0].hash_entry)->id_attr))
-              {
-	         (yyval.symbol) = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL,0,LOCAL);
-	         (yyval.symbol)->decl = SOFT;
-	      } 
-            }
-#line 10507 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 746:
-#line 5581 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10513 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 747:
-#line 5583 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10519 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 748:
-#line 5587 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10525 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 749:
-#line 5589 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10531 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 750:
-#line 5591 "gram1.y" /* yacc.c:1646  */
-    {
-                      (yyvsp[-1].ll_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node); 
-                      (yyval.ll_node) = (yyvsp[-1].ll_node);   
-                   }
-#line 10540 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 751:
-#line 5598 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-            s = make_scalar((yyvsp[0].hash_entry),TYNULL,LOCAL);
-	    (yyval.ll_node) = make_llnd(fi,DUMMY_REF, LLNULL, LLNULL, s);
-            /*$$->type = global_int;*/
-          }
-#line 10550 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 752:
-#line 5615 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = LLNULL; }
-#line 10556 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 753:
-#line 5617 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 10562 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 754:
-#line 5621 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10568 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 755:
-#line 5623 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10574 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 756:
-#line 5627 "gram1.y" /* yacc.c:1646  */
-    {  if((yyvsp[0].ll_node)->type->variant != T_STRING)
-                 errstr( "Illegal type of shadow_name", 627);
-               (yyval.ll_node) = (yyvsp[0].ll_node); 
-            }
-#line 10583 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 757:
-#line 5634 "gram1.y" /* yacc.c:1646  */
-    { char *q;
-          nioctl = 1;
-          q = (yyvsp[-1].ll_node)->entry.string_val;
-          if((!strcmp(q,"shadow")) && ((yyvsp[0].ll_node)->variant == INT_VAL))                          (yyval.ll_node) = make_llnd(fi,SPEC_PAIR, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL);
-          else
-          {  err("Illegal shadow width specification", 56);
-             (yyval.ll_node) = LLNULL;
-          }
-        }
-#line 10597 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 758:
-#line 5644 "gram1.y" /* yacc.c:1646  */
-    { char *ql, *qh;
-          PTR_LLND p1, p2;
-          nioctl = 2;
-          ql = (yyvsp[-4].ll_node)->entry.string_val;
-          qh = (yyvsp[-1].ll_node)->entry.string_val;
-          if((!strcmp(ql,"low_shadow")) && ((yyvsp[-3].ll_node)->variant == INT_VAL) && (!strcmp(qh,"high_shadow")) && ((yyvsp[0].ll_node)->variant == INT_VAL)) 
-              {
-                 p1 = make_llnd(fi,SPEC_PAIR, (yyvsp[-4].ll_node), (yyvsp[-3].ll_node), SMNULL);
-                 p2 = make_llnd(fi,SPEC_PAIR, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL);
-                 (yyval.ll_node) = make_llnd(fi,CONS, p1, p2, SMNULL);
-              } 
-          else
-          {  err("Illegal shadow width specification", 56);
-             (yyval.ll_node) = LLNULL;
-          }
-        }
-#line 10618 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 759:
-#line 5673 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND q;
-              q = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-              (yyval.bf_node) = (yyvsp[0].bf_node);
-              (yyval.bf_node)->entry.Template.ll_ptr1 = q;
-            }
-#line 10628 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 760:
-#line 5688 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND q;
-              q = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-              (yyval.bf_node) = (yyvsp[0].bf_node);
-              (yyval.bf_node)->variant = DVM_REALIGN_DIR; 
-              (yyval.bf_node)->entry.Template.ll_ptr1 = q;
-            }
-#line 10639 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 761:
-#line 5695 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.bf_node) = (yyvsp[-3].bf_node);
-              (yyval.bf_node)->variant = DVM_REALIGN_DIR; 
-              (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-            }
-#line 10649 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 762:
-#line 5713 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10655 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 763:
-#line 5715 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10661 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 764:
-#line 5719 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-          s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-          if((s->attr & ALIGN_BIT)) 
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-          if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & INHERIT_BIT)) 
-                errstr( "Inconsistent declaration of identifier  %s", s->ident, 16); 
-          else  if(s->attr & DISTRIBUTE_BIT)
-               errstr( "An alignee may not have the DISTRIBUTE attribute:'%s'", s->ident,57);             else
-                s->attr = s->attr | ALIGN_BIT;     
-	  (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	}
-#line 10677 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 765:
-#line 5733 "gram1.y" /* yacc.c:1646  */
-    {PTR_SYMB s;
-        s = (yyvsp[0].ll_node)->entry.Template.symbol;
-        if(s->attr & PROCESSORS_BIT)
-               errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);
-        else  if(s->attr & TASK_BIT)
-              errstr( "Illegal use of task array name %s ", s->ident, 71);
-        else if( !(s->attr & DIMENSION_BIT) && !(s->attr & DVM_POINTER_BIT))
-            errstr("The alignee %s isn't an array", s->ident, 58);
-        else {
-            /*  if(!(s->attr & DYNAMIC_BIT))
-                 errstr("'%s' hasn't the DYNAMIC attribute", s->ident, 59);
-             */
-              if(!(s->attr & ALIGN_BIT) && !(s->attr & INHERIT_BIT))
-                 errstr("'%s' hasn't the ALIGN attribute", s->ident, 60);
-              if(s->attr & DISTRIBUTE_BIT)
-                 errstr("An alignee may not have the DISTRIBUTE attribute: %s", s->ident, 57);
-
-/*               if(s->entry.var_decl.local == IO)
- *                 errstr("An alignee may not be the dummy argument");
-*/
-          }
-	  (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	}
-#line 10705 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 766:
-#line 5759 "gram1.y" /* yacc.c:1646  */
-    { /* PTR_LLND r;
-              if($7) {
-                r = set_ll_list($6,LLNULL,EXPR_LIST);
-                r = set_ll_list(r,$7,EXPR_LIST);
-              }
-              else
-                r = $6;
-              */
-            (yyval.bf_node) = get_bfnd(fi,DVM_ALIGN_DIR,SMNULL,LLNULL,(yyvsp[-4].ll_node),(yyvsp[0].ll_node));
-           }
-#line 10720 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 767:
-#line 5772 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-3].symbol));        
-          }
-#line 10728 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 768:
-#line 5788 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10734 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 769:
-#line 5790 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10740 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 770:
-#line 5793 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10746 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 771:
-#line 5795 "gram1.y" /* yacc.c:1646  */
-    {
-                  (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-                  (yyval.ll_node)->entry.string_val = (char *) "*";
-                  (yyval.ll_node)->type = global_string;
-                 }
-#line 10756 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 772:
-#line 5801 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 10762 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 773:
-#line 5805 "gram1.y" /* yacc.c:1646  */
-    { 
-         /* if(parstate == INEXEC){ *for REALIGN directive*
-              if (!($$ = $1->id_attr))
-              {
-	         $$ = make_array($1, TYNULL, LLNULL,0,LOCAL);
-	     	 $$->decl = SOFT;
-	      } 
-          } else
-             $$ = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-          */
-          if (!((yyval.symbol) = (yyvsp[0].hash_entry)->id_attr))
-          {
-	       (yyval.symbol) = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL,0,LOCAL);
-	       (yyval.symbol)->decl = SOFT;
-	  } 
-          (yyval.symbol)->attr = (yyval.symbol)->attr | ALIGN_BASE_BIT;
-          if((yyval.symbol)->attr & PROCESSORS_BIT)
-               errstr( "Illegal use of PROCESSORS name %s ", (yyval.symbol)->ident, 53);
-          else  if((yyval.symbol)->attr & TASK_BIT)
-               errstr( "Illegal use of task array name %s ", (yyval.symbol)->ident, 71);
-          else
-          if((parstate == INEXEC) /* for  REALIGN directive */
-             &&   !((yyval.symbol)->attr & DIMENSION_BIT) && !((yyval.symbol)->attr & DVM_POINTER_BIT))
-            errstr("The align-target %s isn't declared as array", (yyval.symbol)->ident, 61); 
-         }
-#line 10792 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 774:
-#line 5833 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 10798 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 775:
-#line 5835 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 10804 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 776:
-#line 5839 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-            s = make_scalar((yyvsp[0].hash_entry),TYNULL,LOCAL);
-            if(s->type->variant != T_INT || s->attr & PARAMETER_BIT)             
-              errstr("The align-dummy %s isn't a scalar integer variable", s->ident, 62); 
-	   (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-           (yyval.ll_node)->type = global_int;
-         }
-#line 10816 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 777:
-#line 5847 "gram1.y" /* yacc.c:1646  */
-    {  
-          (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-          (yyval.ll_node)->entry.string_val = (char *) "*";
-          (yyval.ll_node)->type = global_string;
-        }
-#line 10826 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 778:
-#line 5853 "gram1.y" /* yacc.c:1646  */
-    {   (yyval.ll_node) = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL); }
-#line 10832 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 779:
-#line 5856 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	             PTR_LLND q, r, p;
-                     int numdim;
-                     if(type_options & PROCESSORS_BIT) {    /* 27.06.18 || (type_options & TEMPLATE_BIT)){ */
-                       if(! explicit_shape) {
-                         err("Explicit shape specification is required", 50);
-		         /*$$ = BFNULL;*/
-	               }
-                     } 
-
-                    /*  else {
-                       if($6)
-                         err("Shape specification is not permitted", 263);
-                     } */
-
-                     if(type_options & DIMENSION_BIT)
-                       { p = attr_dims; numdim = attr_ndim;}
-                     else
-                       { p = LLNULL; numdim = 0; }
-                     if((yyvsp[0].ll_node))          /*dimension information after the object name*/
-                     { p = (yyvsp[0].ll_node); numdim = ndim;} /*overrides the DIMENSION attribute */
-	             s = make_array((yyvsp[-1].hash_entry), TYNULL, p, numdim, LOCAL);
-
-                     if((type_options & COMMON_BIT) && !(type_options & TEMPLATE_BIT))
-                     {
-                        err("Illegal combination of attributes", 63);
-                        type_options = type_options & (~COMMON_BIT);
-                     }
-                     if((type_options & PROCESSORS_BIT) &&((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT) ))
-                        err("Illegal combination of attributes", 63);
-                     else  if((type_options & PROCESSORS_BIT) && ((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT)) )
-                     {  errstr("Inconsistent declaration of  %s", s->ident, 16);
-                        type_options = type_options & (~PROCESSORS_BIT);
-                     }
-                     else if ((s->attr & PROCESSORS_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT))) 
-                        errstr("Inconsistent declaration of  %s", s->ident, 16);
-                     else if ((s->attr & INHERIT_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT)))
-                        errstr("Inconsistent declaration of  %s", s->ident, 16);
-                     if(( s->attr & DISTRIBUTE_BIT) &&  (type_options & DISTRIBUTE_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & ALIGN_BIT) &&  (type_options & ALIGN_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & SHADOW_BIT) &&  (type_options & SHADOW_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & TEMPLATE_BIT) &&  (type_options & TEMPLATE_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & PROCESSORS_BIT) &&  (type_options & PROCESSORS_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-	             s->attr = s->attr | type_options;
-                     if((yyvsp[0].ll_node)) s->attr = s->attr | DIMENSION_BIT;
-                     if((s->attr & DISTRIBUTE_BIT) && (s->attr & ALIGN_BIT))
-                       errstr("%s has the DISTRIBUTE and ALIGN attribute",s->ident, 64);
-	             q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-	             if(p) s->type->entry.ar_decl.ranges = p;
-	             r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	             (yyval.bf_node) = get_bfnd(fi,DVM_VAR_DECL, SMNULL, r, LLNULL,(yyvsp[-5].ll_node));
-	            }
-#line 10894 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 780:
-#line 5914 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-	             PTR_LLND q, r, p;
-                     int numdim;
-                    if(type_options & PROCESSORS_BIT) { /*23.10.18  || (type_options & TEMPLATE_BIT)){ */
-                       if(! explicit_shape) {
-                         err("Explicit shape specification is required", 50);
-		         /*$$ = BFNULL;*/
-	               }
-                     } 
-                    /* else {
-                       if($4)
-                         err("Shape specification is not permitted", 263);
-                     } */
-                     if(type_options & DIMENSION_BIT)
-                       { p = attr_dims; numdim = attr_ndim;}
-                     else
-                       { p = LLNULL; numdim = 0; }
-                     if((yyvsp[0].ll_node))                   /*dimension information after the object name*/
-                     { p = (yyvsp[0].ll_node); numdim = ndim;}/*overrides the DIMENSION attribute */
-	             s = make_array((yyvsp[-1].hash_entry), TYNULL, p, numdim, LOCAL);
-
-                     if((type_options & COMMON_BIT) && !(type_options & TEMPLATE_BIT))
-                     {
-                        err("Illegal combination of attributes", 63);
-                        type_options = type_options & (~COMMON_BIT);
-                     }
-                     if((type_options & PROCESSORS_BIT) &&((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT) ))
-                       err("Illegal combination of attributes", 63);
-                     else  if((type_options & PROCESSORS_BIT) && ((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT)) )
-                     {  errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-                        type_options = type_options & (~PROCESSORS_BIT);
-                     }
-                     else if ((s->attr & PROCESSORS_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT))) 
-                          errstr("Inconsistent declaration of identifier  %s", s->ident,16);
-                     else if ((s->attr & INHERIT_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT)))
-                          errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-                     if(( s->attr & DISTRIBUTE_BIT) &&  (type_options & DISTRIBUTE_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & ALIGN_BIT) &&  (type_options & ALIGN_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & SHADOW_BIT) &&  (type_options & SHADOW_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & TEMPLATE_BIT) &&  (type_options & TEMPLATE_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & PROCESSORS_BIT) &&  (type_options & PROCESSORS_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);   
-	             s->attr = s->attr | type_options;
-                     if((yyvsp[0].ll_node)) s->attr = s->attr | DIMENSION_BIT;
-                     if((s->attr & DISTRIBUTE_BIT) && (s->attr & ALIGN_BIT))
-                           errstr("%s has the DISTRIBUTE and ALIGN attribute",s->ident, 64);
-	             q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-	             if(p) s->type->entry.ar_decl.ranges = p;
-	             r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	             add_to_lowLevelList(r, (yyvsp[-3].bf_node)->entry.Template.ll_ptr1);
-	            }
-#line 10954 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 781:
-#line 5978 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); type_options = type_opt; }
-#line 10960 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 782:
-#line 5980 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node),(yyvsp[0].ll_node),EXPR_LIST); type_options = type_options | type_opt;}
-#line 10966 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 783:
-#line 5983 "gram1.y" /* yacc.c:1646  */
-    { type_opt = TEMPLATE_BIT;
-               (yyval.ll_node) = make_llnd(fi,TEMPLATE_OP,LLNULL,LLNULL,SMNULL);
-               }
-#line 10974 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 784:
-#line 5987 "gram1.y" /* yacc.c:1646  */
-    { type_opt = PROCESSORS_BIT;
-                (yyval.ll_node) = make_llnd(fi,PROCESSORS_OP,LLNULL,LLNULL,SMNULL);
-               }
-#line 10982 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 785:
-#line 5991 "gram1.y" /* yacc.c:1646  */
-    { type_opt = PROCESSORS_BIT;
-                (yyval.ll_node) = make_llnd(fi,PROCESSORS_OP,LLNULL,LLNULL,SMNULL);
-               }
-#line 10990 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 786:
-#line 5995 "gram1.y" /* yacc.c:1646  */
-    { type_opt = DYNAMIC_BIT;
-                (yyval.ll_node) = make_llnd(fi,DYNAMIC_OP,LLNULL,LLNULL,SMNULL);
-               }
-#line 10998 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 787:
-#line 6012 "gram1.y" /* yacc.c:1646  */
-    {
-                if(! explicit_shape) {
-                  err("Explicit shape specification is required", 50);
-                }
-                if(! (yyvsp[-1].ll_node)) {
-                  err("No shape specification", 65);
-	        }
-                type_opt = DIMENSION_BIT;
-                attr_ndim = ndim; attr_dims = (yyvsp[-1].ll_node);
-                (yyval.ll_node) = make_llnd(fi,DIMENSION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);
-	       }
-#line 11014 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 788:
-#line 6024 "gram1.y" /* yacc.c:1646  */
-    { type_opt = SHADOW_BIT;
-                  (yyval.ll_node) = make_llnd(fi,SHADOW_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);
-                 }
-#line 11022 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 789:
-#line 6028 "gram1.y" /* yacc.c:1646  */
-    { type_opt = ALIGN_BIT;
-                  (yyval.ll_node) = make_llnd(fi,ALIGN_OP,(yyvsp[-4].ll_node),(yyvsp[0].ll_node),SMNULL);
-                 }
-#line 11030 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 790:
-#line 6032 "gram1.y" /* yacc.c:1646  */
-    { type_opt = ALIGN_BIT;
-                  (yyval.ll_node) = make_llnd(fi,ALIGN_OP,LLNULL,SMNULL,SMNULL);
-                }
-#line 11038 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 791:
-#line 6042 "gram1.y" /* yacc.c:1646  */
-    { 
-                 type_opt = DISTRIBUTE_BIT;
-                 (yyval.ll_node) = make_llnd(fi,DISTRIBUTE_OP,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL);
-                }
-#line 11047 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 792:
-#line 6047 "gram1.y" /* yacc.c:1646  */
-    { 
-                 type_opt = DISTRIBUTE_BIT;
-                 (yyval.ll_node) = make_llnd(fi,DISTRIBUTE_OP,LLNULL,LLNULL,SMNULL);
-                }
-#line 11056 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 793:
-#line 6052 "gram1.y" /* yacc.c:1646  */
-    {
-                 type_opt = COMMON_BIT;
-                 (yyval.ll_node) = make_llnd(fi,COMMON_OP, LLNULL, LLNULL, SMNULL);
-                }
-#line 11065 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 794:
-#line 6059 "gram1.y" /* yacc.c:1646  */
-    { 
-	      PTR_LLND  l;
-	      l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-	      l->type = (yyvsp[-10].data_type);
-	      (yyval.bf_node) = get_bfnd(fi,DVM_POINTER_DIR, SMNULL, (yyvsp[0].ll_node),(yyvsp[-4].ll_node), l);
-	    }
-#line 11076 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 795:
-#line 6067 "gram1.y" /* yacc.c:1646  */
-    {ndim = 0;}
-#line 11082 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 796:
-#line 6068 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND  q;
-             if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		q = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL);
-	      ++ndim;
-              (yyval.ll_node) = set_ll_list(q, LLNULL, EXPR_LIST);
-	       /*$$ = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);*/
-	       /*$$->type = global_default;*/
-	    }
-#line 11097 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 797:
-#line 6079 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND  q;
-             if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		q = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL);
-	      ++ndim;
-              (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), q, EXPR_LIST);
-            }
-#line 11110 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 798:
-#line 6090 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11116 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 799:
-#line 6092 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11122 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 800:
-#line 6096 "gram1.y" /* yacc.c:1646  */
-    {PTR_SYMB s;
-           /* s = make_scalar($1,TYNULL,LOCAL);*/
-            s = make_array((yyvsp[0].hash_entry),TYNULL,LLNULL,0,LOCAL);
-            s->attr = s->attr | DVM_POINTER_BIT;
-            if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & INHERIT_BIT))
-               errstr( "Inconsistent declaration of identifier %s", s->ident, 16);     
-            (yyval.ll_node) = make_llnd(fi,VAR_REF,LLNULL,LLNULL,s);
-            }
-#line 11135 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 801:
-#line 6107 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_HEAP_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 11141 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 802:
-#line 6111 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11147 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 803:
-#line 6113 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11153 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 804:
-#line 6117 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-              s->attr = s->attr | HEAP_BIT;
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT) || (s->attr & INHERIT_BIT) || (s->attr & DYNAMIC_BIT) || (s->attr & SHADOW_BIT) || (s->attr & DVM_POINTER_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-      
-	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-#line 11166 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 805:
-#line 6128 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_CONSISTENT_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 11172 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 806:
-#line 6132 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11178 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 807:
-#line 6134 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11184 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 808:
-#line 6138 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-	      s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-              s->attr = s->attr | CONSISTENT_BIT;
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT) || (s->attr & INHERIT_BIT) || (s->attr & DYNAMIC_BIT) || (s->attr & SHADOW_BIT) || (s->attr & DVM_POINTER_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-      
-	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-#line 11197 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 809:
-#line 6150 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_ASYNCID_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 11203 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 810:
-#line 6152 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-              p = make_llnd(fi,COMM_LIST, LLNULL, LLNULL, SMNULL);              
-              (yyval.bf_node) = get_bfnd(fi,DVM_ASYNCID_DIR, SMNULL, (yyvsp[0].ll_node), p, LLNULL);
-            }
-#line 11212 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 811:
-#line 6159 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11218 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 812:
-#line 6161 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11224 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 813:
-#line 6165 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-              if((yyvsp[0].ll_node)){
-                  s = make_array((yyvsp[-1].hash_entry), global_default, (yyvsp[0].ll_node), ndim, LOCAL);
-		  s->variant = ASYNC_ID;
-                  s->attr = s->attr | DIMENSION_BIT;
-                  s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
-                  (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);
-              } else {
-              s = make_local_entity((yyvsp[-1].hash_entry), ASYNC_ID, global_default, LOCAL);
-	      (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-              }
-	   }
-#line 11241 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 814:
-#line 6181 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_NEW_VALUE_DIR,SMNULL, LLNULL, LLNULL,LLNULL);}
-#line 11247 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 815:
-#line 6191 "gram1.y" /* yacc.c:1646  */
-    {  if((yyvsp[-1].ll_node) &&  (yyvsp[-1].ll_node)->entry.Template.symbol->attr & TASK_BIT)
-                        (yyval.bf_node) = get_bfnd(fi,DVM_PARALLEL_TASK_DIR,SMNULL,(yyvsp[-1].ll_node),(yyvsp[0].ll_node),(yyvsp[-3].ll_node));
-                    else
-                        (yyval.bf_node) = get_bfnd(fi,DVM_PARALLEL_ON_DIR,SMNULL,(yyvsp[-1].ll_node),(yyvsp[0].ll_node),(yyvsp[-3].ll_node));
-                 }
-#line 11257 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 816:
-#line 6200 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11263 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 817:
-#line 6202 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11269 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 818:
-#line 6206 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11275 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 819:
-#line 6209 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; opt_kwd_ = NO;}
-#line 11281 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 820:
-#line 6214 "gram1.y" /* yacc.c:1646  */
-    {
-          if((yyvsp[-3].ll_node)->type->variant != T_ARRAY) 
-             errstr("'%s' isn't array", (yyvsp[-3].ll_node)->entry.Template.symbol->ident, 66);
-          (yyvsp[-3].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-          (yyval.ll_node) = (yyvsp[-3].ll_node);
-          (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type->entry.ar_decl.base_type;
-        }
-#line 11293 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 821:
-#line 6224 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11299 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 822:
-#line 6226 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11305 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 823:
-#line 6230 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11311 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 824:
-#line 6232 "gram1.y" /* yacc.c:1646  */
-    {
-             (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-             (yyval.ll_node)->entry.string_val = (char *) "*";
-             (yyval.ll_node)->type = global_string;
-            }
-#line 11321 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 825:
-#line 6240 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = LLNULL;}
-#line 11327 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 826:
-#line 6242 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11333 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 827:
-#line 6246 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11339 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 828:
-#line 6248 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11345 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 840:
-#line 6266 "gram1.y" /* yacc.c:1646  */
-    { if((yyvsp[-3].symbol)->attr & INDIRECT_BIT)
-                            errstr("'%s' is not remote group name", (yyvsp[-3].symbol)->ident, 68);
-                          (yyval.ll_node) = make_llnd(fi,REMOTE_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,(yyvsp[-3].symbol));
-                        }
-#line 11354 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 841:
-#line 6271 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,REMOTE_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11360 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 842:
-#line 6275 "gram1.y" /* yacc.c:1646  */
-    {
-                          (yyval.ll_node) = make_llnd(fi,CONSISTENT_OP,(yyvsp[-1].ll_node),LLNULL,(yyvsp[-3].symbol));
-                        }
-#line 11368 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 843:
-#line 6279 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,CONSISTENT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11374 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 844:
-#line 6283 "gram1.y" /* yacc.c:1646  */
-    {  
-            if(((yyval.symbol)=(yyvsp[0].hash_entry)->id_attr) == SMNULL){
-                errstr("'%s' is not declared as group", (yyvsp[0].hash_entry)->ident, 74);
-                (yyval.symbol) = make_local_entity((yyvsp[0].hash_entry),CONSISTENT_GROUP_NAME,global_default,LOCAL);
-            } else {
-                if((yyval.symbol)->variant != CONSISTENT_GROUP_NAME)
-                   errstr("'%s' is not declared as group", (yyvsp[0].hash_entry)->ident, 74);
-            }
-          }
-#line 11388 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 845:
-#line 6296 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi,NEW_SPEC_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11394 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 846:
-#line 6300 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi,NEW_SPEC_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11400 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 847:
-#line 6304 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11406 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 848:
-#line 6308 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_CUDA_BLOCK_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11412 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 849:
-#line 6311 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11418 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 850:
-#line 6313 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11424 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 851:
-#line 6315 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-2].ll_node),EXPR_LIST); (yyval.ll_node) = set_ll_list((yyval.ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11430 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 852:
-#line 6319 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11436 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 853:
-#line 6321 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11442 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 854:
-#line 6325 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_TIE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11448 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 855:
-#line 6329 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11454 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 856:
-#line 6331 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11460 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 857:
-#line 6335 "gram1.y" /* yacc.c:1646  */
-    { if(!((yyvsp[-3].symbol)->attr & INDIRECT_BIT))
-                         errstr("'%s' is not indirect group name", (yyvsp[-3].symbol)->ident, 313);
-                      (yyval.ll_node) = make_llnd(fi,INDIRECT_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,(yyvsp[-3].symbol));
-                    }
-#line 11469 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 858:
-#line 6340 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,INDIRECT_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11475 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 859:
-#line 6344 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi,STAGE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11481 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 860:
-#line 6348 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi,ACROSS_OP,(yyvsp[0].ll_node),LLNULL,SMNULL);}
-#line 11487 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 861:
-#line 6350 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi,ACROSS_OP,(yyvsp[-1].ll_node),(yyvsp[0].ll_node),SMNULL);}
-#line 11493 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 862:
-#line 6354 "gram1.y" /* yacc.c:1646  */
-    {  if((yyvsp[-2].ll_node))
-                     (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[-1].ll_node),SMNULL);
-                   else
-                     (yyval.ll_node) = (yyvsp[-1].ll_node);
-                }
-#line 11503 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 863:
-#line 6362 "gram1.y" /* yacc.c:1646  */
-    { opt_in_out = YES; }
-#line 11509 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 864:
-#line 6366 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "in";
-              (yyval.ll_node)->type = global_string;
-            }
-#line 11519 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 865:
-#line 6372 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "out";
-              (yyval.ll_node)->type = global_string;
-            }
-#line 11529 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 866:
-#line 6378 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = LLNULL; opt_in_out = NO;}
-#line 11535 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 867:
-#line 6382 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11541 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 868:
-#line 6384 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11547 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 869:
-#line 6388 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11553 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 870:
-#line 6390 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-3].ll_node);
-                    (yyval.ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);  
-                  }
-#line 11561 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 871:
-#line 6394 "gram1.y" /* yacc.c:1646  */
-    { /*  PTR_LLND p;
-                       p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-                       p->entry.string_val = (char *) "corner";
-                       p->type = global_string;
-                   */
-                   (yyvsp[-6].ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-4].ll_node);  
-                   (yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-6].ll_node),(yyvsp[-1].ll_node),SMNULL);
-                 }
-#line 11574 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 872:
-#line 6406 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11580 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 873:
-#line 6408 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11586 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 874:
-#line 6412 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);}
-#line 11592 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 875:
-#line 6416 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11598 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 876:
-#line 6418 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11604 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 877:
-#line 6422 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-4].ll_node),make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL),SMNULL); }
-#line 11610 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 878:
-#line 6424 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),make_llnd(fi,DDOT,(yyvsp[0].ll_node),LLNULL,SMNULL),SMNULL); }
-#line 11616 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 879:
-#line 6426 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),make_llnd(fi,DDOT,LLNULL,(yyvsp[0].ll_node),SMNULL),SMNULL); }
-#line 11622 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 880:
-#line 6428 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[0].ll_node),LLNULL,SMNULL); }
-#line 11628 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 881:
-#line 6430 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL),SMNULL); }
-#line 11634 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 882:
-#line 6432 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,(yyvsp[0].ll_node),LLNULL,SMNULL),SMNULL); }
-#line 11640 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 883:
-#line 6434 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,LLNULL,(yyvsp[0].ll_node),SMNULL),SMNULL); }
-#line 11646 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 884:
-#line 6438 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11652 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 885:
-#line 6442 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11658 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 886:
-#line 6446 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11664 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 887:
-#line 6450 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 11670 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 888:
-#line 6454 "gram1.y" /* yacc.c:1646  */
-    {PTR_LLND q;
-                /* q = set_ll_list($9,$6,EXPR_LIST); */
-                 q = set_ll_list((yyvsp[-4].ll_node),LLNULL,EXPR_LIST); /*podd 11.10.01*/
-                 q = add_to_lowLevelList((yyvsp[-1].ll_node),q);        /*podd 11.10.01*/
-                 (yyval.ll_node) = make_llnd(fi,REDUCTION_OP,q,LLNULL,SMNULL);
-                }
-#line 11681 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 889:
-#line 6461 "gram1.y" /* yacc.c:1646  */
-    {PTR_LLND q;
-                 q = set_ll_list((yyvsp[-2].ll_node),LLNULL,EXPR_LIST);
-                 (yyval.ll_node) = make_llnd(fi,REDUCTION_OP,q,LLNULL,SMNULL);
-                }
-#line 11690 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 890:
-#line 6467 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = make_llnd(fi,REDUCTION_OP,(yyvsp[-1].ll_node),LLNULL,(yyvsp[-4].symbol)); }
-#line 11696 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 891:
-#line 6471 "gram1.y" /* yacc.c:1646  */
-    { opt_kwd_r = YES; }
-#line 11702 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 892:
-#line 6474 "gram1.y" /* yacc.c:1646  */
-    { opt_kwd_r = NO; }
-#line 11708 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 893:
-#line 6478 "gram1.y" /* yacc.c:1646  */
-    { 
-                  if(((yyval.symbol)=(yyvsp[0].hash_entry)->id_attr) == SMNULL) {
-                      errstr("'%s' is not declared as reduction group", (yyvsp[0].hash_entry)->ident, 69);
-                      (yyval.symbol) = make_local_entity((yyvsp[0].hash_entry),REDUCTION_GROUP_NAME,global_default,LOCAL);
-                  } else {
-                    if((yyval.symbol)->variant != REDUCTION_GROUP_NAME)
-                      errstr("'%s' is not declared as reduction group", (yyvsp[0].hash_entry)->ident, 69);
-                  }
-                }
-#line 11722 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 894:
-#line 6491 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11728 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 895:
-#line 6493 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11734 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 896:
-#line 6497 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),SMNULL);}
-#line 11740 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 897:
-#line 6499 "gram1.y" /* yacc.c:1646  */
-    {(yyvsp[-3].ll_node) = set_ll_list((yyvsp[-3].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
-            (yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-5].ll_node),(yyvsp[-3].ll_node),SMNULL);}
-#line 11747 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 898:
-#line 6504 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "sum";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11757 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 899:
-#line 6510 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "product";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11767 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 900:
-#line 6516 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "min";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11777 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 901:
-#line 6522 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "max";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11787 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 902:
-#line 6528 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "or";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11797 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 903:
-#line 6534 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "and";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11807 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 904:
-#line 6540 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "eqv";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11817 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 905:
-#line 6546 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "neqv";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11827 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 906:
-#line 6552 "gram1.y" /* yacc.c:1646  */
-    { err("Illegal reduction operation name", 70);
-               errcnt--;
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "unknown";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11838 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 907:
-#line 6561 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "maxloc";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11848 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 908:
-#line 6567 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "minloc";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 11858 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 909:
-#line 6584 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SHADOW_RENEW_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 11864 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 910:
-#line 6592 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SHADOW_START_OP,LLNULL,LLNULL,(yyvsp[0].symbol));}
-#line 11870 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 911:
-#line 6600 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SHADOW_WAIT_OP,LLNULL,LLNULL,(yyvsp[0].symbol));}
-#line 11876 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 912:
-#line 6602 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SHADOW_COMP_OP,LLNULL,LLNULL,SMNULL);}
-#line 11882 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 913:
-#line 6604 "gram1.y" /* yacc.c:1646  */
-    {  (yyvsp[-4].ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-2].ll_node); (yyval.ll_node) = make_llnd(fi,SHADOW_COMP_OP,(yyvsp[-4].ll_node),LLNULL,SMNULL);}
-#line 11888 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 914:
-#line 6608 "gram1.y" /* yacc.c:1646  */
-    {(yyval.symbol) = make_local_entity((yyvsp[0].hash_entry), SHADOW_GROUP_NAME,global_default,LOCAL);}
-#line 11894 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 915:
-#line 6612 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);}
-#line 11900 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 916:
-#line 6614 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);}
-#line 11906 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 917:
-#line 6618 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 11912 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 918:
-#line 6620 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-          p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-          p->entry.string_val = (char *) "corner";
-          p->type = global_string;
-          (yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-4].ll_node),p,SMNULL);
-         }
-#line 11923 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 919:
-#line 6628 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-4].ll_node);
-          (yyval.ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);  
-        }
-#line 11931 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 920:
-#line 6632 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND p;
-          p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-          p->entry.string_val = (char *) "corner";
-          p->type = global_string;
-          (yyvsp[-8].ll_node)-> entry.Template.ll_ptr1 = (yyvsp[-5].ll_node);  
-          (yyval.ll_node) = make_llnd(fi,ARRAY_OP,(yyvsp[-8].ll_node),p,SMNULL);
-       }
-#line 11943 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 921:
-#line 6643 "gram1.y" /* yacc.c:1646  */
-    { optcorner = YES; }
-#line 11949 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 922:
-#line 6647 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-         s = (yyvsp[0].ll_node)->entry.Template.symbol;
-         if(s->attr & PROCESSORS_BIT)
-             errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);
-         else if(s->attr & TASK_BIT)
-             errstr( "Illegal use of task array name %s ", s->ident, 71);
-         else
-           if(s->type->variant != T_ARRAY) 
-             errstr("'%s' isn't array", s->ident, 66);
-           else 
-              if((!(s->attr & DISTRIBUTE_BIT)) && (!(s->attr & ALIGN_BIT)))
-               ; /*errstr("hpf.gram: %s is not distributed array", s->ident);*/
-                
-         (yyval.ll_node) = (yyvsp[0].ll_node);
-        }
-#line 11969 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 923:
-#line 6665 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 11975 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 924:
-#line 6667 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 11981 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 925:
-#line 6671 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_START_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 11987 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 926:
-#line 6673 "gram1.y" /* yacc.c:1646  */
-    {errstr("Missing DVM directive prefix", 49);}
-#line 11993 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 927:
-#line 6677 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_WAIT_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 11999 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 928:
-#line 6679 "gram1.y" /* yacc.c:1646  */
-    {errstr("Missing DVM directive prefix", 49);}
-#line 12005 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 929:
-#line 6683 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_GROUP_DIR,(yyvsp[-3].symbol),(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 12011 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 930:
-#line 6687 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_REDUCTION_START_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12017 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 931:
-#line 6691 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_REDUCTION_WAIT_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12023 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 932:
-#line 6700 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_CONSISTENT_START_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12029 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 933:
-#line 6704 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_CONSISTENT_WAIT_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12035 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 934:
-#line 6708 "gram1.y" /* yacc.c:1646  */
-    { if(((yyvsp[-3].symbol)->attr & INDIRECT_BIT))
-                errstr("'%s' is not remote group name", (yyvsp[-3].symbol)->ident, 68);
-           (yyval.bf_node) = get_bfnd(fi,DVM_REMOTE_ACCESS_DIR,(yyvsp[-3].symbol),(yyvsp[-1].ll_node),LLNULL,LLNULL);
-         }
-#line 12044 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 935:
-#line 6713 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_REMOTE_ACCESS_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 12050 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 936:
-#line 6717 "gram1.y" /* yacc.c:1646  */
-    {  
-            if(((yyval.symbol)=(yyvsp[0].hash_entry)->id_attr) == SMNULL){
-                errstr("'%s' is not declared as group", (yyvsp[0].hash_entry)->ident, 74);
-                (yyval.symbol) = make_local_entity((yyvsp[0].hash_entry),REF_GROUP_NAME,global_default,LOCAL);
-            } else {
-              if((yyval.symbol)->variant != REF_GROUP_NAME)
-                errstr("'%s' is not declared as group", (yyvsp[0].hash_entry)->ident, 74);
-            }
-          }
-#line 12064 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 937:
-#line 6729 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12070 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 938:
-#line 6731 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12076 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 939:
-#line 6735 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = (yyvsp[-3].ll_node);
-              (yyval.ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-            }
-#line 12085 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 940:
-#line 6740 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12091 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 941:
-#line 6744 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12097 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 942:
-#line 6746 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12103 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 943:
-#line 6750 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12109 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 944:
-#line 6752 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL);}
-#line 12115 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 945:
-#line 6756 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q;
-             q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-             (yyval.bf_node) = get_bfnd(fi,DVM_TASK_DIR,SMNULL,q,LLNULL,LLNULL);
-          }
-#line 12124 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 946:
-#line 6761 "gram1.y" /* yacc.c:1646  */
-    {   PTR_LLND q;
-              q = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL);
-	      add_to_lowLevelList(q, (yyvsp[-2].bf_node)->entry.Template.ll_ptr1);
-          }
-#line 12133 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 947:
-#line 6768 "gram1.y" /* yacc.c:1646  */
-    { 
-             PTR_SYMB s;
-	      s = make_array((yyvsp[-1].hash_entry), global_int, (yyvsp[0].ll_node), ndim, LOCAL);
-              if((yyvsp[0].ll_node)){
-                  s->attr = s->attr | DIMENSION_BIT;
-                  s->type->entry.ar_decl.ranges = (yyvsp[0].ll_node);
-              }
-              else
-                  err("No dimensions in TASK directive", 75);
-              if(ndim > 1)
-                  errstr("Illegal rank of '%s'", s->ident, 76);
-              if(s->attr & TASK_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & PROCESSORS_BIT)  || (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT))
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16);
-              else
-	        s->attr = s->attr | TASK_BIT;
-    
-	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, s);	  
-	    }
-#line 12158 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 948:
-#line 6791 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12164 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 949:
-#line 6793 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[-1].symbol),(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12170 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 950:
-#line 6795 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[-1].symbol),LLNULL,(yyvsp[0].ll_node),LLNULL);}
-#line 12176 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 951:
-#line 6797 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[-2].symbol),(yyvsp[-1].ll_node),(yyvsp[0].ll_node),LLNULL);}
-#line 12182 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 952:
-#line 6799 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi,DVM_TASK_REGION_DIR,(yyvsp[-2].symbol),(yyvsp[0].ll_node),(yyvsp[-1].ll_node),LLNULL);}
-#line 12188 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 953:
-#line 6803 "gram1.y" /* yacc.c:1646  */
-    { PTR_SYMB s;
-              if((s=(yyvsp[0].hash_entry)->id_attr) == SMNULL)
-                s = make_array((yyvsp[0].hash_entry), TYNULL, LLNULL, 0, LOCAL);
-              
-              if(!(s->attr & TASK_BIT))
-                 errstr("'%s' is not task array", s->ident, 77);
-              (yyval.symbol) = s;
-              }
-#line 12201 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 954:
-#line 6814 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_END_TASK_REGION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12207 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 955:
-#line 6818 "gram1.y" /* yacc.c:1646  */
-    {  PTR_SYMB s;
-              PTR_LLND q;
-             /*
-              s = make_array($1, TYNULL, LLNULL, 0, LOCAL);                           
-	      if((parstate == INEXEC) && !(s->attr & TASK_BIT))
-                 errstr("'%s' is not task array", s->ident, 77);  
-              q =  set_ll_list($3,LLNULL,EXPR_LIST);
-	      $$ = make_llnd(fi,ARRAY_REF, q, LLNULL, s);
-              */
-
-              s = (yyvsp[-3].symbol);
-              q =  set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, q, LLNULL, s);
-	   }
-#line 12226 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 956:
-#line 6833 "gram1.y" /* yacc.c:1646  */
-    {  PTR_LLND q; 
-              q =  set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-	      (yyval.ll_node) = make_llnd(fi,ARRAY_REF, q, LLNULL, (yyvsp[-3].symbol));
-	   }
-#line 12235 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 957:
-#line 6840 "gram1.y" /* yacc.c:1646  */
-    {              
-         (yyval.bf_node) = get_bfnd(fi,DVM_ON_DIR,SMNULL,(yyvsp[-1].ll_node),(yyvsp[0].ll_node),LLNULL);
-    }
-#line 12243 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 958:
-#line 6846 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = LLNULL;}
-#line 12249 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 959:
-#line 6848 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12255 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 960:
-#line 6852 "gram1.y" /* yacc.c:1646  */
-    {(yyval.bf_node) = get_bfnd(fi,DVM_END_ON_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12261 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 961:
-#line 6856 "gram1.y" /* yacc.c:1646  */
-    { PTR_LLND q;
-        /* if(!($6->attr & PROCESSORS_BIT))
-           errstr("'%s' is not processor array", $6->ident, 67);
-         */
-        q = make_llnd(fi,ARRAY_REF, (yyvsp[0].ll_node), LLNULL, (yyvsp[-1].symbol));
-        (yyval.bf_node) = get_bfnd(fi,DVM_MAP_DIR,SMNULL,(yyvsp[-4].ll_node),q,LLNULL);
-      }
-#line 12273 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 962:
-#line 6864 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_MAP_DIR,SMNULL,(yyvsp[-3].ll_node),LLNULL,(yyvsp[0].ll_node)); }
-#line 12279 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 963:
-#line 6868 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_PREFETCH_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12285 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 964:
-#line 6872 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_RESET_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 12291 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 965:
-#line 6880 "gram1.y" /* yacc.c:1646  */
-    { if(!((yyvsp[-3].symbol)->attr & INDIRECT_BIT))
-                         errstr("'%s' is not indirect group name", (yyvsp[-3].symbol)->ident, 313);
-                      (yyval.bf_node) = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,(yyvsp[-3].symbol),(yyvsp[-1].ll_node),LLNULL,LLNULL);
-                    }
-#line 12300 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 966:
-#line 6885 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 12306 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 967:
-#line 6899 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12312 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 968:
-#line 6901 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12318 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 969:
-#line 6905 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12324 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 970:
-#line 6907 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-3].ll_node); (yyval.ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);}
-#line 12330 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 971:
-#line 6916 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12336 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 972:
-#line 6918 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);}
-#line 12342 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 973:
-#line 6920 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, LLNULL, (yyvsp[0].ll_node), LLNULL);}
-#line 12348 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 974:
-#line 6922 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, (yyvsp[-1].ll_node), (yyvsp[0].ll_node),LLNULL);}
-#line 12354 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 975:
-#line 6958 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi,REDUCTION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 12360 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 976:
-#line 6962 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_ASYNCHRONOUS_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12366 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 977:
-#line 6966 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_ENDASYNCHRONOUS_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12372 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 978:
-#line 6970 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_ASYNCWAIT_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12378 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 979:
-#line 6974 "gram1.y" /* yacc.c:1646  */
-    {  
-            if(((yyval.symbol)=(yyvsp[0].hash_entry)->id_attr) == SMNULL) {
-                errstr("'%s' is not declared as ASYNCID", (yyvsp[0].hash_entry)->ident, 115);
-                (yyval.symbol) = make_local_entity((yyvsp[0].hash_entry),ASYNC_ID,global_default,LOCAL);
-            } else {
-              if((yyval.symbol)->variant != ASYNC_ID)
-                errstr("'%s' is not declared as ASYNCID", (yyvsp[0].hash_entry)->ident, 115);
-            }
-     }
-#line 12392 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 980:
-#line 6986 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, (yyvsp[0].symbol));}
-#line 12398 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 981:
-#line 6988 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ARRAY_REF, (yyvsp[-1].ll_node), LLNULL, (yyvsp[-3].symbol));}
-#line 12404 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 982:
-#line 6992 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_F90_DIR,SMNULL,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),LLNULL);}
-#line 12410 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 983:
-#line 6995 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_DEBUG_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12416 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 984:
-#line 6997 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_DEBUG_DIR,SMNULL,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),LLNULL);}
-#line 12422 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 985:
-#line 7001 "gram1.y" /* yacc.c:1646  */
-    { 
-              (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST);
-              endioctl();
-            }
-#line 12431 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 986:
-#line 7006 "gram1.y" /* yacc.c:1646  */
-    { 
-              (yyval.ll_node) = set_ll_list((yyvsp[-3].ll_node), (yyvsp[0].ll_node), EXPR_LIST);
-              endioctl();
-            }
-#line 12440 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 987:
-#line 7013 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node)  = make_llnd(fi, KEYWORD_ARG, (yyvsp[-1].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 12446 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 988:
-#line 7016 "gram1.y" /* yacc.c:1646  */
-    {
-	         (yyval.ll_node) = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-	         (yyval.ll_node)->entry.ival = atoi(yytext);
-	         (yyval.ll_node)->type = global_int;
-	        }
-#line 12456 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 989:
-#line 7024 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_ENDDEBUG_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12462 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 990:
-#line 7028 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_INTERVAL_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12468 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 991:
-#line 7032 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL;}
-#line 12474 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 992:
-#line 7035 "gram1.y" /* yacc.c:1646  */
-    { if((yyvsp[0].ll_node)->type->variant != T_INT)             
-                    err("Illegal interval number", 78);
-                  (yyval.ll_node) = (yyvsp[0].ll_node);
-                 }
-#line 12483 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 993:
-#line 7043 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_EXIT_INTERVAL_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 12489 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 994:
-#line 7047 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_ENDINTERVAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12495 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 995:
-#line 7051 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_TRACEON_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12501 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 996:
-#line 7055 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_TRACEOFF_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12507 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 997:
-#line 7059 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_BARRIER_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 12513 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 998:
-#line 7063 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_CHECK_DIR,SMNULL,(yyvsp[0].ll_node),(yyvsp[-4].ll_node),LLNULL); }
-#line 12519 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 999:
-#line 7067 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_IO_MODE_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 12525 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1000:
-#line 7070 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12531 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1001:
-#line 7072 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12537 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1002:
-#line 7076 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);}
-#line 12543 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1003:
-#line 7078 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_LOCAL_OP, LLNULL,LLNULL,SMNULL);}
-#line 12549 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1004:
-#line 7080 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,PARALLEL_OP, LLNULL,LLNULL,SMNULL);}
-#line 12555 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1005:
-#line 7084 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_SHADOW_ADD_DIR,SMNULL,(yyvsp[-5].ll_node),(yyvsp[-3].ll_node),(yyvsp[0].ll_node)); }
-#line 12561 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1006:
-#line 7088 "gram1.y" /* yacc.c:1646  */
-    {
-                 if((yyvsp[-3].ll_node)->type->variant != T_ARRAY) 
-                    errstr("'%s' isn't array", (yyvsp[-3].ll_node)->entry.Template.symbol->ident, 66);
-                 if(!((yyvsp[-3].ll_node)->entry.Template.symbol->attr & TEMPLATE_BIT))
-                    errstr("'%s' isn't TEMPLATE", (yyvsp[-3].ll_node)->entry.Template.symbol->ident, 628);
-                 (yyvsp[-3].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-                 (yyval.ll_node) = (yyvsp[-3].ll_node);
-                 /*$$->type = $1->type->entry.ar_decl.base_type;*/
-               }
-#line 12575 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1007:
-#line 7100 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12581 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1008:
-#line 7102 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12587 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1009:
-#line 7106 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 12593 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1010:
-#line 7108 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 12599 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1011:
-#line 7112 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 12605 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1012:
-#line 7114 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; opt_kwd_ = NO;}
-#line 12611 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1013:
-#line 7118 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_LOCALIZE_DIR,SMNULL,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),LLNULL); }
-#line 12617 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1014:
-#line 7122 "gram1.y" /* yacc.c:1646  */
-    {
-                 if((yyvsp[0].ll_node)->type->variant != T_ARRAY) 
-                    errstr("'%s' isn't array", (yyvsp[0].ll_node)->entry.Template.symbol->ident, 66); 
-                 (yyval.ll_node) = (yyvsp[0].ll_node);
-                }
-#line 12627 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1015:
-#line 7128 "gram1.y" /* yacc.c:1646  */
-    {
-                 if((yyvsp[-3].ll_node)->type->variant != T_ARRAY) 
-                    errstr("'%s' isn't array", (yyvsp[-3].ll_node)->entry.Template.symbol->ident, 66); 
-                                 
-                 (yyvsp[-3].ll_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-                 (yyval.ll_node) = (yyvsp[-3].ll_node);
-                 (yyval.ll_node)->type = (yyvsp[-3].ll_node)->type->entry.ar_decl.base_type;
-                }
-#line 12640 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1016:
-#line 7140 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 12646 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1017:
-#line 7142 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 12652 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1018:
-#line 7146 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 12658 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1019:
-#line 7148 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL);}
-#line 12664 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1020:
-#line 7152 "gram1.y" /* yacc.c:1646  */
-    { 
-            (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-            (yyval.ll_node)->entry.string_val = (char *) "*";
-            (yyval.ll_node)->type = global_string;
-          }
-#line 12674 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1021:
-#line 7160 "gram1.y" /* yacc.c:1646  */
-    { 
-                PTR_LLND q;
-                if((yyvsp[0].ll_node))
-                  q = make_llnd(fi,ARRAY_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL);
-                else
-                  q = (yyvsp[-2].ll_node);                  
-                (yyval.bf_node) = get_bfnd(fi,DVM_CP_CREATE_DIR,SMNULL,(yyvsp[-13].ll_node),(yyvsp[-8].ll_node),q); 
-              }
-#line 12687 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1022:
-#line 7171 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL; }
-#line 12693 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1023:
-#line 7173 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, PARALLEL_OP, LLNULL, LLNULL, SMNULL); }
-#line 12699 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1024:
-#line 7175 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_LOCAL_OP, LLNULL, LLNULL, SMNULL); }
-#line 12705 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1025:
-#line 7179 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_CP_LOAD_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL); }
-#line 12711 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1026:
-#line 7183 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_CP_SAVE_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL); }
-#line 12717 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1027:
-#line 7185 "gram1.y" /* yacc.c:1646  */
-    {
-                PTR_LLND q;
-                q = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);
-                (yyval.bf_node) = get_bfnd(fi,DVM_CP_SAVE_DIR,SMNULL,(yyvsp[-3].ll_node),q,LLNULL);
-              }
-#line 12727 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1028:
-#line 7193 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_CP_WAIT_DIR,SMNULL,(yyvsp[-6].ll_node),(yyvsp[-1].ll_node),LLNULL); }
-#line 12733 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1029:
-#line 7197 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_TEMPLATE_CREATE_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL); }
-#line 12739 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1030:
-#line 7200 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 12745 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1031:
-#line 7202 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 12751 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1032:
-#line 7206 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,DVM_TEMPLATE_DELETE_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL); }
-#line 12757 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1060:
-#line 7240 "gram1.y" /* yacc.c:1646  */
-    {
-          (yyval.bf_node) = get_bfnd(fi,OMP_ONETHREAD_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-#line 12765 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1061:
-#line 7246 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_endparallel();
-	}
-#line 12773 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1062:
-#line 7252 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_parallel();
-           (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-	   opt_kwd_ = NO;
-	}
-#line 12783 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1063:
-#line 7258 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_parallel();
-	   opt_kwd_ = NO;
-	}
-#line 12792 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1064:
-#line 7264 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-	}
-#line 12800 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1065:
-#line 7268 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);	
-	}
-#line 12808 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1075:
-#line 7285 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = (yyvsp[-1].ll_node);
-        }
-#line 12816 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1076:
-#line 7290 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_PRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12824 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1077:
-#line 7295 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_FIRSTPRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12832 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1078:
-#line 7301 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_LASTPRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12840 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1079:
-#line 7307 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_COPYIN,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12848 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1080:
-#line 7313 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_SHARED,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 12856 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1081:
-#line 7318 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_DEFAULT,(yyvsp[-1].ll_node),LLNULL,SMNULL);
-	}
-#line 12864 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1082:
-#line 7324 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		(yyval.ll_node)->entry.string_val = (char *) "private";
-		(yyval.ll_node)->type = global_string;
-	}
-#line 12874 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1083:
-#line 7330 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		(yyval.ll_node)->entry.string_val = (char *) "shared";
-		(yyval.ll_node)->type = global_string;
-	}
-#line 12884 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1084:
-#line 7336 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		(yyval.ll_node)->entry.string_val = (char *) "none";
-		(yyval.ll_node)->type = global_string;
-	}
-#line 12894 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1085:
-#line 7343 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_IF,(yyvsp[-1].ll_node),LLNULL,SMNULL);
-	}
-#line 12902 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1086:
-#line 7349 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_NUM_THREADS,(yyvsp[-1].ll_node),LLNULL,SMNULL);
-	}
-#line 12910 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1087:
-#line 7355 "gram1.y" /* yacc.c:1646  */
-    {
-		PTR_LLND q;
-		q = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-		(yyval.ll_node) = make_llnd(fi,OMP_REDUCTION,q,LLNULL,SMNULL);
-	}
-#line 12920 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1088:
-#line 7362 "gram1.y" /* yacc.c:1646  */
-    {(yyval.ll_node) = make_llnd(fi,DDOT,(yyvsp[-2].ll_node),(yyvsp[0].ll_node),SMNULL);}
-#line 12926 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1090:
-#line 7368 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "+";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 12936 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1091:
-#line 7374 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "-";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 12946 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1092:
-#line 7381 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "*";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 12956 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1093:
-#line 7387 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "/";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 12966 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1094:
-#line 7393 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "min";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 12976 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1095:
-#line 7399 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "max";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 12986 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1096:
-#line 7405 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) ".or.";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 12996 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1097:
-#line 7411 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) ".and.";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 13006 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1098:
-#line 7417 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) ".eqv.";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 13016 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1099:
-#line 7423 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) ".neqv.";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 13026 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1100:
-#line 7429 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "iand";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 13036 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1101:
-#line 7435 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "ieor";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 13046 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1102:
-#line 7441 "gram1.y" /* yacc.c:1646  */
-    {
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "ior";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 13056 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1103:
-#line 7447 "gram1.y" /* yacc.c:1646  */
-    { err("Illegal reduction operation name", 70);
-               errcnt--;
-              (yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              (yyval.ll_node)->entry.string_val = (char *) "unknown";
-              (yyval.ll_node)->type = global_string;
-             }
-#line 13067 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1104:
-#line 7457 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_sections((yyvsp[0].ll_node));
-	   opt_kwd_ = NO;
-	}
-#line 13076 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1105:
-#line 7462 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_sections(LLNULL);
-	   opt_kwd_ = NO;
-	}
-#line 13085 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1106:
-#line 7468 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-	}
-#line 13093 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1107:
-#line 7472 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
-	}
-#line 13101 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1112:
-#line 7484 "gram1.y" /* yacc.c:1646  */
-    {
-		PTR_LLND q;
-   	        (yyval.bf_node) = make_endsections();
-		q = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);
-                (yyval.bf_node)->entry.Template.ll_ptr1 = q;
-                opt_kwd_ = NO;
-	}
-#line 13113 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1113:
-#line 7492 "gram1.y" /* yacc.c:1646  */
-    {
-   	        (yyval.bf_node) = make_endsections();
-	        opt_kwd_ = NO; 
-	}
-#line 13122 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1114:
-#line 7498 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = make_ompsection();
-	}
-#line 13130 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1115:
-#line 7504 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_DO_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-#line 13139 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1116:
-#line 7509 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-#line 13148 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1117:
-#line 7515 "gram1.y" /* yacc.c:1646  */
-    {
-		PTR_LLND q;
-		q = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);
-	        (yyval.bf_node) = get_bfnd(fi,OMP_END_DO_DIR,SMNULL,q,LLNULL,LLNULL);
-      	        opt_kwd_ = NO;
-	}
-#line 13159 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1118:
-#line 7522 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_END_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-#line 13168 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1119:
-#line 7528 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-	}
-#line 13176 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1120:
-#line 7532 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
-	}
-#line 13184 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1127:
-#line 7546 "gram1.y" /* yacc.c:1646  */
-    {
-		/*$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "ORDERED";
-		$$->type = global_string;*/
-                (yyval.ll_node) = make_llnd(fi,OMP_ORDERED,LLNULL,LLNULL,SMNULL);
-	}
-#line 13195 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1128:
-#line 7555 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_SCHEDULE,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),SMNULL);
-	}
-#line 13203 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1129:
-#line 7559 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_SCHEDULE,(yyvsp[-1].ll_node),LLNULL,SMNULL);
-	}
-#line 13211 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1130:
-#line 7565 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		(yyval.ll_node)->entry.string_val = (char *) "STATIC";
-		(yyval.ll_node)->type = global_string;
-		
-	}
-#line 13222 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1131:
-#line 7572 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		(yyval.ll_node)->entry.string_val = (char *) "DYNAMIC";
-		(yyval.ll_node)->type = global_string;
-		
-	}
-#line 13233 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1132:
-#line 7579 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		(yyval.ll_node)->entry.string_val = (char *) "GUIDED";
-		(yyval.ll_node)->type = global_string;
-		
-	}
-#line 13244 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1133:
-#line 7586 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		(yyval.ll_node)->entry.string_val = (char *) "RUNTIME";
-		(yyval.ll_node)->type = global_string;
-		
-	}
-#line 13255 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1134:
-#line 7595 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_single();
-           (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-	   opt_kwd_ = NO;
-	}
-#line 13265 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1135:
-#line 7601 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_single();
-	   opt_kwd_ = NO;
-	}
-#line 13274 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1136:
-#line 7607 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-	}
-#line 13282 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1137:
-#line 7611 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
-	}
-#line 13290 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1140:
-#line 7621 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_endsingle();
-           (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-	   opt_kwd_ = NO;
-	}
-#line 13300 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1141:
-#line 7627 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_endsingle();
-	   opt_kwd_ = NO;
-	}
-#line 13309 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1142:
-#line 7633 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-	}
-#line 13317 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1143:
-#line 7637 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
-	}
-#line 13325 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1146:
-#line 7648 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_COPYPRIVATE,(yyvsp[0].ll_node),LLNULL,SMNULL);
-	}
-#line 13333 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1147:
-#line 7654 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = make_llnd(fi,OMP_NOWAIT,LLNULL,LLNULL,SMNULL);
-	}
-#line 13341 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1148:
-#line 7660 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = make_workshare();
-	}
-#line 13349 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1149:
-#line 7665 "gram1.y" /* yacc.c:1646  */
-    {
-		PTR_LLND q;
-   	        (yyval.bf_node) = make_endworkshare();
-		q = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);
-                (yyval.bf_node)->entry.Template.ll_ptr1 = q;
-  	        opt_kwd_ = NO;
-	}
-#line 13361 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1150:
-#line 7673 "gram1.y" /* yacc.c:1646  */
-    {
-   	        (yyval.bf_node) = make_endworkshare();
-                opt_kwd_ = NO;
-	}
-#line 13370 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1151:
-#line 7679 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_PARALLEL_DO_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-#line 13379 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1152:
-#line 7684 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_PARALLEL_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-#line 13388 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1153:
-#line 7691 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),LLNULL,EXPR_LIST);
-	}
-#line 13396 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1154:
-#line 7695 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node),(yyvsp[-1].ll_node),EXPR_LIST);
-	}
-#line 13404 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1166:
-#line 7715 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_END_PARALLEL_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-#line 13412 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1167:
-#line 7720 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = make_parallelsections((yyvsp[0].ll_node));
-	   opt_kwd_ = NO;
-	}
-#line 13421 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1168:
-#line 7725 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = make_parallelsections(LLNULL);
-	   opt_kwd_ = NO;
-	}
-#line 13430 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1169:
-#line 7732 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = make_endparallelsections();
-	}
-#line 13438 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1170:
-#line 7737 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = make_parallelworkshare();
-           (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[0].ll_node);
-	   opt_kwd_ = NO;
-	}
-#line 13448 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1171:
-#line 7743 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = make_parallelworkshare();
-	   opt_kwd_ = NO;
-	}
-#line 13457 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1172:
-#line 7749 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = make_endparallelworkshare();
-	}
-#line 13465 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1173:
-#line 7754 "gram1.y" /* yacc.c:1646  */
-    { 
-	   (yyval.bf_node) = get_bfnd(fi,OMP_THREADPRIVATE_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
-	}
-#line 13473 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1174:
-#line 7759 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_master();
-	}
-#line 13481 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1175:
-#line 7764 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_endmaster();
-	}
-#line 13489 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1176:
-#line 7768 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_ordered();
-	}
-#line 13497 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1177:
-#line 7773 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_endordered();
-	}
-#line 13505 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1178:
-#line 7778 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_BARRIER_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-#line 13513 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1179:
-#line 7782 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_ATOMIC_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-#line 13521 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1180:
-#line 7787 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);
-	}
-#line 13529 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1181:
-#line 7791 "gram1.y" /* yacc.c:1646  */
-    {
-           (yyval.bf_node) = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-#line 13537 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1182:
-#line 7797 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_critical();
-           (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-	}
-#line 13546 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1183:
-#line 7802 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_critical();
-	}
-#line 13554 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1184:
-#line 7808 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_endcritical();
-           (yyval.bf_node)->entry.Template.ll_ptr1 = (yyvsp[-1].ll_node);
-	}
-#line 13563 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1185:
-#line 7813 "gram1.y" /* yacc.c:1646  */
-    {
-  	   (yyval.bf_node) = make_endcritical();
-	}
-#line 13571 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1186:
-#line 7819 "gram1.y" /* yacc.c:1646  */
-    { 
-		PTR_SYMB s;
-		PTR_LLND l;
-		s = make_common((yyvsp[-3].hash_entry)); 
-		l = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-		(yyval.ll_node) = make_llnd(fi,OMP_THREADPRIVATE, l, LLNULL, SMNULL);
-	}
-#line 13583 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1187:
-#line 7829 "gram1.y" /* yacc.c:1646  */
-    {
-		(yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);
-	}
-#line 13591 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1188:
-#line 7833 "gram1.y" /* yacc.c:1646  */
-    {	
-		(yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST);
-	}
-#line 13599 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1189:
-#line 7837 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);
-	}
-#line 13607 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1190:
-#line 7841 "gram1.y" /* yacc.c:1646  */
-    { 
-		(yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST);
-	}
-#line 13615 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1191:
-#line 7846 "gram1.y" /* yacc.c:1646  */
-    {
-		operator_slash = 1;
-	}
-#line 13623 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1192:
-#line 7849 "gram1.y" /* yacc.c:1646  */
-    {
-		operator_slash = 0;
-	}
-#line 13631 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1201:
-#line 7865 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_REGION_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 13637 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1202:
-#line 7869 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_CHECKSECTION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13643 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1203:
-#line 7873 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13649 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1204:
-#line 7875 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13655 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1205:
-#line 7877 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13661 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1206:
-#line 7881 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13667 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1207:
-#line 7883 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13673 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1208:
-#line 7885 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13679 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1209:
-#line 7889 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL;}
-#line 13685 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1210:
-#line 7891 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node); }
-#line 13691 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1211:
-#line 7895 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 13697 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1212:
-#line 7897 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 13703 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1213:
-#line 7901 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13709 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1214:
-#line 7904 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13715 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1215:
-#line 7907 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13721 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1216:
-#line 7912 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_INOUT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13727 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1217:
-#line 7914 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_IN_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13733 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1218:
-#line 7916 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_OUT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13739 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1219:
-#line 7918 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_LOCAL_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13745 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1220:
-#line 7920 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_INLOCAL_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13751 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1221:
-#line 7924 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_TARGETS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13757 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1222:
-#line 7928 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);}
-#line 13763 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1223:
-#line 7933 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13769 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1224:
-#line 7937 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 13775 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1225:
-#line 7939 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 13781 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1226:
-#line 7943 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_HOST_OP, LLNULL,LLNULL,SMNULL);}
-#line 13787 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1227:
-#line 7945 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_CUDA_OP, LLNULL,LLNULL,SMNULL);}
-#line 13793 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1228:
-#line 7949 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_END_REGION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13799 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1229:
-#line 7953 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_END_CHECKSECTION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13805 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1230:
-#line 7957 "gram1.y" /* yacc.c:1646  */
-    {
-	      (yyval.bf_node) = get_bfnd(fi,ACC_DECLARE_DIR, SMNULL, (yyvsp[0].ll_node), LLNULL, LLNULL);
-           }
-#line 13813 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1231:
-#line 7962 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,EXPR_LIST, (yyvsp[0].ll_node), LLNULL, SMNULL); }
-#line 13819 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1232:
-#line 7964 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 13825 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1233:
-#line 7968 "gram1.y" /* yacc.c:1646  */
-    {
-              PTR_SYMB s;
-              s = make_scalar((yyvsp[0].hash_entry),TYNULL,LOCAL);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT) || (s->attr & DYNAMIC_BIT) || (s->attr & HEAP_BIT)|| (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT) ||(s->attr & SHADOW_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16);	
-	      (yyval.ll_node) = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s); 
-           }
-#line 13837 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1234:
-#line 7978 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,ACC_ROUTINE_DIR,SMNULL,(yyvsp[0].ll_node),LLNULL,LLNULL);}
-#line 13843 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1235:
-#line 7982 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = LLNULL;}
-#line 13849 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1236:
-#line 7984 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13855 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1237:
-#line 7988 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 13861 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1238:
-#line 7990 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-1].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 13867 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1239:
-#line 7994 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13873 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1240:
-#line 7996 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[0].ll_node);}
-#line 13879 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1247:
-#line 8007 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,SPF_ANALYSIS_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13885 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1248:
-#line 8011 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,SPF_PARALLEL_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13891 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1249:
-#line 8015 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,SPF_TRANSFORM_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 13897 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1250:
-#line 8019 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,SPF_PARALLEL_REG_DIR,(yyvsp[0].symbol),LLNULL,LLNULL,LLNULL);}
-#line 13903 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1251:
-#line 8021 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,SPF_PARALLEL_REG_DIR,(yyvsp[-7].symbol),(yyvsp[-2].ll_node),(yyvsp[0].ll_node),LLNULL);}
-#line 13909 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1252:
-#line 8023 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,SPF_PARALLEL_REG_DIR,(yyvsp[-7].symbol),(yyvsp[0].ll_node),(yyvsp[-2].ll_node),LLNULL);}
-#line 13915 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1253:
-#line 8027 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 13921 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1254:
-#line 8029 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 13927 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1255:
-#line 8033 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.ll_node) = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
-#line 13933 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1256:
-#line 8035 "gram1.y" /* yacc.c:1646  */
-    { 
-                   PTR_LLND w;
-                   w = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
-	           w->entry.string_val = copys(yytext);
-	           w->type = global_double;
-                   (yyval.ll_node) = make_llnd(fi,SPF_WEIGHT_OP,w,LLNULL,SMNULL);
-                }
-#line 13945 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1257:
-#line 8045 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL;}
-#line 13951 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1258:
-#line 8047 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 13957 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1259:
-#line 8051 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = LLNULL;}
-#line 13963 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1260:
-#line 8053 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = (yyvsp[-1].ll_node);}
-#line 13969 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1261:
-#line 8057 "gram1.y" /* yacc.c:1646  */
-    { (yyval.bf_node) = get_bfnd(fi,SPF_END_PARALLEL_REG_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-#line 13975 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1262:
-#line 8061 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 13981 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1263:
-#line 8063 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 13987 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1269:
-#line 8074 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,REDUCTION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL); }
-#line 13993 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1270:
-#line 8078 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 13999 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1271:
-#line 8082 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_PROCESS_PRIVATE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14005 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1272:
-#line 8086 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_COVER_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14011 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1273:
-#line 8090 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_PARAMETER_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14017 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1274:
-#line 8093 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 14023 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1275:
-#line 8095 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 14029 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1276:
-#line 8099 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi, ASSGN_OP, (yyvsp[-2].ll_node), (yyvsp[0].ll_node), SMNULL); }
-#line 14035 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1277:
-#line 8103 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 14041 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1278:
-#line 8105 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 14047 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1282:
-#line 8114 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SHADOW_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14053 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1283:
-#line 8118 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACROSS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14059 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1284:
-#line 8122 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,REMOTE_ACCESS_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14065 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1285:
-#line 8126 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 14071 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1286:
-#line 8128 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 14077 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1287:
-#line 8132 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_NOINLINE_OP,LLNULL,LLNULL,SMNULL);}
-#line 14083 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1288:
-#line 8134 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_FISSION_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14089 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1289:
-#line 8136 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_EXPAND_OP,LLNULL,LLNULL,SMNULL);}
-#line 14095 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1290:
-#line 8138 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_EXPAND_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14101 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1291:
-#line 8141 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_SHRINK_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14107 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1292:
-#line 8143 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_UNROLL_OP,LLNULL,LLNULL,SMNULL);}
-#line 14113 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1293:
-#line 8145 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_UNROLL_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14119 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1294:
-#line 8147 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_MERGE_OP,LLNULL,LLNULL,SMNULL);}
-#line 14125 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1295:
-#line 8151 "gram1.y" /* yacc.c:1646  */
-    {
-               (yyval.ll_node) = set_ll_list((yyvsp[-4].ll_node), (yyvsp[-2].ll_node), EXPR_LIST);
-               (yyval.ll_node) = set_ll_list((yyval.ll_node), (yyvsp[0].ll_node), EXPR_LIST);
-             }
-#line 14134 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1296:
-#line 8158 "gram1.y" /* yacc.c:1646  */
-    { (yyval.symbol) = make_parallel_region((yyvsp[0].hash_entry));}
-#line 14140 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1297:
-#line 8162 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node), LLNULL, EXPR_LIST); }
-#line 14146 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1298:
-#line 8164 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node), (yyvsp[0].ll_node), EXPR_LIST); }
-#line 14152 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1299:
-#line 8168 "gram1.y" /* yacc.c:1646  */
-    {  (yyval.bf_node) = get_bfnd(fi,SPF_CHECKPOINT_DIR,SMNULL,(yyvsp[-1].ll_node),LLNULL,LLNULL);}
-#line 14158 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1300:
-#line 8172 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 14164 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1301:
-#line 8174 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 14170 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1302:
-#line 8178 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_TYPE_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14176 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1303:
-#line 8180 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_VARLIST_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14182 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1304:
-#line 8182 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_EXCEPT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14188 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1305:
-#line 8184 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_FILES_COUNT_OP,(yyvsp[-1].ll_node),LLNULL,SMNULL);}
-#line 14194 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1306:
-#line 8186 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_INTERVAL_OP,(yyvsp[-3].ll_node),(yyvsp[-1].ll_node),SMNULL);}
-#line 14200 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1307:
-#line 8190 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[0].ll_node),LLNULL,EXPR_LIST); }
-#line 14206 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1308:
-#line 8192 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = set_ll_list((yyvsp[-2].ll_node),(yyvsp[0].ll_node),EXPR_LIST); }
-#line 14212 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1309:
-#line 8196 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,ACC_ASYNC_OP, LLNULL,LLNULL,SMNULL);}
-#line 14218 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1310:
-#line 8198 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_FLEXIBLE_OP, LLNULL,LLNULL,SMNULL);}
-#line 14224 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1311:
-#line 8202 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_TIME_OP, LLNULL,LLNULL,SMNULL);}
-#line 14230 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1312:
-#line 8204 "gram1.y" /* yacc.c:1646  */
-    { (yyval.ll_node) = make_llnd(fi,SPF_ITER_OP, LLNULL,LLNULL,SMNULL);}
-#line 14236 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-  case 1313:
-#line 8208 "gram1.y" /* yacc.c:1646  */
-    { if(position==IN_OUTSIDE)
-                 err("Misplaced SPF-directive",103);
-             }
-#line 14244 "gram1.tab.c" /* yacc.c:1646  */
-    break;
-
-
-#line 14248 "gram1.tab.c" /* yacc.c:1646  */
-      default: break;
-    }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
-  YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-
-  *++yyvsp = yyval;
-
-  /* Now 'shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-  yyn = yyr1[yyn];
-
-  yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-  if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-    yystate = yytable[yystate];
-  else
-    yystate = yydefgoto[yyn - YYNTOKENS];
-
-  goto yynewstate;
-
-
-/*--------------------------------------.
-| yyerrlab -- here on detecting error.  |
-`--------------------------------------*/
-yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
-  /* If not already recovering from an error, report this error.  */
-  if (!yyerrstatus)
-    {
-      ++yynerrs;
-#if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
-#else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
-      {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
-      }
-# undef YYSYNTAX_ERROR
-#endif
-    }
-
-
-
-  if (yyerrstatus == 3)
-    {
-      /* If just tried and failed to reuse lookahead token after an
-         error, discard it.  */
-
-      if (yychar <= YYEOF)
-        {
-          /* Return failure if at end of input.  */
-          if (yychar == YYEOF)
-            YYABORT;
-        }
-      else
-        {
-          yydestruct ("Error: discarding",
-                      yytoken, &yylval);
-          yychar = YYEMPTY;
-        }
-    }
-
-  /* Else will try to reuse lookahead token after shifting the error
-     token.  */
-  goto yyerrlab1;
-
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-  /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-  if (/*CONSTCOND*/ 0)
-     goto yyerrorlab;
-
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYERROR.  */
-  YYPOPSTACK (yylen);
-  yylen = 0;
-  YY_STACK_PRINT (yyss, yyssp);
-  yystate = *yyssp;
-  goto yyerrlab1;
-
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
-
-  for (;;)
-    {
-      yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
-        {
-          yyn += YYTERROR;
-          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-            {
-              yyn = yytable[yyn];
-              if (0 < yyn)
-                break;
-            }
-        }
-
-      /* Pop the current state because it cannot handle the error token.  */
-      if (yyssp == yyss)
-        YYABORT;
-
-
-      yydestruct ("Error: popping",
-                  yystos[yystate], yyvsp);
-      YYPOPSTACK (1);
-      yystate = *yyssp;
-      YY_STACK_PRINT (yyss, yyssp);
-    }
-
-  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
-  *++yyvsp = yylval;
-  YY_IGNORE_MAYBE_UNINITIALIZED_END
-
-
-  /* Shift the error token.  */
-  YY_SYMBOL_PRINT ("Shifting", yystos[yyn], yyvsp, yylsp);
-
-  yystate = yyn;
-  goto yynewstate;
-
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-  yyresult = 0;
-  goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-  yyresult = 1;
-  goto yyreturn;
-
-#if !defined yyoverflow || YYERROR_VERBOSE
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
-  yyresult = 2;
-  /* Fall through.  */
-#endif
-
-yyreturn:
-  if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
-    }
-  /* Do not reclaim the symbols of the rule whose action triggered
-     this YYABORT or YYACCEPT.  */
-  YYPOPSTACK (yylen);
-  YY_STACK_PRINT (yyss, yyssp);
-  while (yyssp != yyss)
-    {
-      yydestruct ("Cleanup: popping",
-                  yystos[*yyssp], yyvsp);
-      YYPOPSTACK (1);
-    }
-#ifndef yyoverflow
-  if (yyss != yyssa)
-    YYSTACK_FREE (yyss);
-#endif
-#if YYERROR_VERBOSE
-  if (yymsg != yymsgbuf)
-    YYSTACK_FREE (yymsg);
-#endif
-  return yyresult;
-}
diff --git a/projects/dvm_svn/fdvm/trunk/parser/gram1.tab.h b/projects/dvm_svn/fdvm/trunk/parser/gram1.tab.h
deleted file mode 100644
index cbb2086..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/gram1.tab.h
+++ /dev/null
@@ -1,440 +0,0 @@
-/* A Bison parser, made by GNU Bison 3.0.4.  */
-
-/* Bison interface for Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
-
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-#ifndef YY_YY_GRAM1_TAB_H_INCLUDED
-# define YY_YY_GRAM1_TAB_H_INCLUDED
-/* Debug traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 0
-#endif
-#if YYDEBUG
-extern int yydebug;
-#endif
-
-/* Token type.  */
-#ifndef YYTOKENTYPE
-# define YYTOKENTYPE
-  enum yytokentype
-  {
-    PERCENT = 1,
-    AMPERSAND = 2,
-    ASTER = 3,
-    CLUSTER = 4,
-    COLON = 5,
-    COMMA = 6,
-    DASTER = 7,
-    DEFINED_OPERATOR = 8,
-    DOT = 9,
-    DQUOTE = 10,
-    GLOBAL_A = 11,
-    LEFTAB = 12,
-    LEFTPAR = 13,
-    MINUS = 14,
-    PLUS = 15,
-    POINT_TO = 16,
-    QUOTE = 17,
-    RIGHTAB = 18,
-    RIGHTPAR = 19,
-    AND = 20,
-    DSLASH = 21,
-    EQV = 22,
-    EQ = 23,
-    EQUAL = 24,
-    FFALSE = 25,
-    GE = 26,
-    GT = 27,
-    LE = 28,
-    LT = 29,
-    NE = 30,
-    NEQV = 31,
-    NOT = 32,
-    OR = 33,
-    TTRUE = 34,
-    SLASH = 35,
-    XOR = 36,
-    REFERENCE = 37,
-    AT = 38,
-    ACROSS = 39,
-    ALIGN_WITH = 40,
-    ALIGN = 41,
-    ALLOCATABLE = 42,
-    ALLOCATE = 43,
-    ARITHIF = 44,
-    ASSIGNMENT = 45,
-    ASSIGN = 46,
-    ASSIGNGOTO = 47,
-    ASYNCHRONOUS = 48,
-    ASYNCID = 49,
-    ASYNCWAIT = 50,
-    BACKSPACE = 51,
-    BAD_CCONST = 52,
-    BAD_SYMBOL = 53,
-    BARRIER = 54,
-    BLOCKDATA = 55,
-    BLOCK = 56,
-    BOZ_CONSTANT = 57,
-    BYTE = 58,
-    CALL = 59,
-    CASE = 60,
-    CHARACTER = 61,
-    CHAR_CONSTANT = 62,
-    CHECK = 63,
-    CLOSE = 64,
-    COMMON = 65,
-    COMPLEX = 66,
-    COMPGOTO = 67,
-    CONSISTENT_GROUP = 68,
-    CONSISTENT_SPEC = 69,
-    CONSISTENT_START = 70,
-    CONSISTENT_WAIT = 71,
-    CONSISTENT = 72,
-    CONSTRUCT_ID = 73,
-    CONTAINS = 74,
-    CONTINUE = 75,
-    CORNER = 76,
-    CYCLE = 77,
-    DATA = 78,
-    DEALLOCATE = 79,
-    HPF_TEMPLATE = 80,
-    DEBUG = 81,
-    DEFAULT_CASE = 82,
-    DEFINE = 83,
-    DERIVED = 84,
-    DIMENSION = 85,
-    DISTRIBUTE = 86,
-    DOWHILE = 87,
-    DOUBLEPRECISION = 88,
-    DOUBLECOMPLEX = 89,
-    DP_CONSTANT = 90,
-    DVM_POINTER = 91,
-    DYNAMIC = 92,
-    ELEMENTAL = 93,
-    ELSE = 94,
-    ELSEIF = 95,
-    ELSEWHERE = 96,
-    ENDASYNCHRONOUS = 97,
-    ENDDEBUG = 98,
-    ENDINTERVAL = 99,
-    ENDUNIT = 100,
-    ENDDO = 101,
-    ENDFILE = 102,
-    ENDFORALL = 103,
-    ENDIF = 104,
-    ENDINTERFACE = 105,
-    ENDMODULE = 106,
-    ENDON = 107,
-    ENDSELECT = 108,
-    ENDTASK_REGION = 109,
-    ENDTYPE = 110,
-    ENDWHERE = 111,
-    ENTRY = 112,
-    EXIT = 113,
-    EOLN = 114,
-    EQUIVALENCE = 115,
-    ERROR = 116,
-    EXTERNAL = 117,
-    F90 = 118,
-    FIND = 119,
-    FORALL = 120,
-    FORMAT = 121,
-    FUNCTION = 122,
-    GATE = 123,
-    GEN_BLOCK = 124,
-    HEAP = 125,
-    HIGH = 126,
-    IDENTIFIER = 127,
-    IMPLICIT = 128,
-    IMPLICITNONE = 129,
-    INCLUDE_TO = 130,
-    INCLUDE = 131,
-    INDEPENDENT = 132,
-    INDIRECT_ACCESS = 133,
-    INDIRECT_GROUP = 134,
-    INDIRECT = 135,
-    INHERIT = 136,
-    INQUIRE = 137,
-    INTERFACEASSIGNMENT = 138,
-    INTERFACEOPERATOR = 139,
-    INTERFACE = 140,
-    INTRINSIC = 141,
-    INTEGER = 142,
-    INTENT = 143,
-    INTERVAL = 144,
-    INOUT = 145,
-    IN = 146,
-    INT_CONSTANT = 147,
-    LABEL = 148,
-    LABEL_DECLARE = 149,
-    LET = 150,
-    LOCALIZE = 151,
-    LOGICAL = 152,
-    LOGICALIF = 153,
-    LOOP = 154,
-    LOW = 155,
-    MAXLOC = 156,
-    MAX = 157,
-    MAP = 158,
-    MINLOC = 159,
-    MIN = 160,
-    MODULE_PROCEDURE = 161,
-    MODULE = 162,
-    MULT_BLOCK = 163,
-    NAMEEQ = 164,
-    NAMELIST = 165,
-    NEW_VALUE = 166,
-    NEW = 167,
-    NULLIFY = 168,
-    OCTAL_CONSTANT = 169,
-    ONLY = 170,
-    ON = 171,
-    ON_DIR = 172,
-    ONTO = 173,
-    OPEN = 174,
-    OPERATOR = 175,
-    OPTIONAL = 176,
-    OTHERWISE = 177,
-    OUT = 178,
-    OWN = 179,
-    PARALLEL = 180,
-    PARAMETER = 181,
-    PAUSE = 182,
-    PLAINDO = 183,
-    PLAINGOTO = 184,
-    POINTER = 185,
-    POINTERLET = 186,
-    PREFETCH = 187,
-    PRINT = 188,
-    PRIVATE = 189,
-    PRODUCT = 190,
-    PROGRAM = 191,
-    PUBLIC = 192,
-    PURE = 193,
-    RANGE = 194,
-    READ = 195,
-    REALIGN_WITH = 196,
-    REALIGN = 197,
-    REAL = 198,
-    REAL_CONSTANT = 199,
-    RECURSIVE = 200,
-    REDISTRIBUTE_NEW = 201,
-    REDISTRIBUTE = 202,
-    REDUCTION_GROUP = 203,
-    REDUCTION_START = 204,
-    REDUCTION_WAIT = 205,
-    REDUCTION = 206,
-    REMOTE_ACCESS_SPEC = 207,
-    REMOTE_ACCESS = 208,
-    REMOTE_GROUP = 209,
-    RESET = 210,
-    RESULT = 211,
-    RETURN = 212,
-    REWIND = 213,
-    SAVE = 214,
-    SECTION = 215,
-    SELECT = 216,
-    SEQUENCE = 217,
-    SHADOW_ADD = 218,
-    SHADOW_COMPUTE = 219,
-    SHADOW_GROUP = 220,
-    SHADOW_RENEW = 221,
-    SHADOW_START_SPEC = 222,
-    SHADOW_START = 223,
-    SHADOW_WAIT_SPEC = 224,
-    SHADOW_WAIT = 225,
-    SHADOW = 226,
-    STAGE = 227,
-    STATIC = 228,
-    STAT = 229,
-    STOP = 230,
-    SUBROUTINE = 231,
-    SUM = 232,
-    SYNC = 233,
-    TARGET = 234,
-    TASK = 235,
-    TASK_REGION = 236,
-    THEN = 237,
-    TO = 238,
-    TRACEON = 239,
-    TRACEOFF = 240,
-    TRUNC = 241,
-    TYPE = 242,
-    TYPE_DECL = 243,
-    UNDER = 244,
-    UNKNOWN = 245,
-    USE = 246,
-    VIRTUAL = 247,
-    VARIABLE = 248,
-    WAIT = 249,
-    WHERE = 250,
-    WHERE_ASSIGN = 251,
-    WHILE = 252,
-    WITH = 253,
-    WRITE = 254,
-    COMMENT = 255,
-    WGT_BLOCK = 256,
-    HPF_PROCESSORS = 257,
-    IOSTAT = 258,
-    ERR = 259,
-    END = 260,
-    OMPDVM_ATOMIC = 261,
-    OMPDVM_BARRIER = 262,
-    OMPDVM_COPYIN = 263,
-    OMPDVM_COPYPRIVATE = 264,
-    OMPDVM_CRITICAL = 265,
-    OMPDVM_ONETHREAD = 266,
-    OMPDVM_DO = 267,
-    OMPDVM_DYNAMIC = 268,
-    OMPDVM_ENDCRITICAL = 269,
-    OMPDVM_ENDDO = 270,
-    OMPDVM_ENDMASTER = 271,
-    OMPDVM_ENDORDERED = 272,
-    OMPDVM_ENDPARALLEL = 273,
-    OMPDVM_ENDPARALLELDO = 274,
-    OMPDVM_ENDPARALLELSECTIONS = 275,
-    OMPDVM_ENDPARALLELWORKSHARE = 276,
-    OMPDVM_ENDSECTIONS = 277,
-    OMPDVM_ENDSINGLE = 278,
-    OMPDVM_ENDWORKSHARE = 279,
-    OMPDVM_FIRSTPRIVATE = 280,
-    OMPDVM_FLUSH = 281,
-    OMPDVM_GUIDED = 282,
-    OMPDVM_LASTPRIVATE = 283,
-    OMPDVM_MASTER = 284,
-    OMPDVM_NOWAIT = 285,
-    OMPDVM_NONE = 286,
-    OMPDVM_NUM_THREADS = 287,
-    OMPDVM_ORDERED = 288,
-    OMPDVM_PARALLEL = 289,
-    OMPDVM_PARALLELDO = 290,
-    OMPDVM_PARALLELSECTIONS = 291,
-    OMPDVM_PARALLELWORKSHARE = 292,
-    OMPDVM_RUNTIME = 293,
-    OMPDVM_SECTION = 294,
-    OMPDVM_SECTIONS = 295,
-    OMPDVM_SCHEDULE = 296,
-    OMPDVM_SHARED = 297,
-    OMPDVM_SINGLE = 298,
-    OMPDVM_THREADPRIVATE = 299,
-    OMPDVM_WORKSHARE = 300,
-    OMPDVM_NODES = 301,
-    OMPDVM_IF = 302,
-    IAND = 303,
-    IEOR = 304,
-    IOR = 305,
-    ACC_REGION = 306,
-    ACC_END_REGION = 307,
-    ACC_CHECKSECTION = 308,
-    ACC_END_CHECKSECTION = 309,
-    ACC_GET_ACTUAL = 310,
-    ACC_ACTUAL = 311,
-    ACC_TARGETS = 312,
-    ACC_ASYNC = 313,
-    ACC_HOST = 314,
-    ACC_CUDA = 315,
-    ACC_LOCAL = 316,
-    ACC_INLOCAL = 317,
-    ACC_CUDA_BLOCK = 318,
-    ACC_ROUTINE = 319,
-    ACC_TIE = 320,
-    ACC_DECLARE = 321,
-    BY = 322,
-    IO_MODE = 323,
-    CP_CREATE = 324,
-    CP_LOAD = 325,
-    CP_SAVE = 326,
-    CP_WAIT = 327,
-    FILES = 328,
-    VARLIST = 329,
-    STATUS = 330,
-    EXITINTERVAL = 331,
-    TEMPLATE_CREATE = 332,
-    TEMPLATE_DELETE = 333,
-    SPF_ANALYSIS = 334,
-    SPF_PARALLEL = 335,
-    SPF_TRANSFORM = 336,
-    SPF_NOINLINE = 337,
-    SPF_PARALLEL_REG = 338,
-    SPF_END_PARALLEL_REG = 339,
-    SPF_EXPAND = 340,
-    SPF_FISSION = 341,
-    SPF_SHRINK = 342,
-    SPF_CHECKPOINT = 343,
-    SPF_EXCEPT = 344,
-    SPF_FILES_COUNT = 345,
-    SPF_INTERVAL = 346,
-    SPF_TIME = 347,
-    SPF_ITER = 348,
-    SPF_FLEXIBLE = 349,
-    SPF_APPLY_REGION = 350,
-    SPF_APPLY_FRAGMENT = 351,
-    SPF_CODE_COVERAGE = 352,
-    SPF_UNROLL = 353,
-    SPF_MERGE = 354,
-    SPF_COVER = 355,
-    SPF_PROCESS_PRIVATE = 356,
-    SPF_WEIGHT = 357,
-    BINARY_OP = 360,
-    UNARY_OP = 361
-  };
-#endif
-
-/* Value type.  */
-#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
-
-union YYSTYPE
-{
-#line 440 "gram1.y" /* yacc.c:1909  */
-
-    int token;
-    char charv;
-    char *charp;
-    PTR_BFND bf_node;
-    PTR_LLND ll_node;
-    PTR_SYMB symbol;
-    PTR_TYPE data_type;
-    PTR_HASH hash_entry;
-    PTR_LABEL label;
-
-#line 428 "gram1.tab.h" /* yacc.c:1909  */
-};
-
-typedef union YYSTYPE YYSTYPE;
-# define YYSTYPE_IS_TRIVIAL 1
-# define YYSTYPE_IS_DECLARED 1
-#endif
-
-
-extern YYSTYPE yylval;
-
-int yyparse (void);
-
-#endif /* !YY_YY_GRAM1_TAB_H_INCLUDED  */
diff --git a/projects/dvm_svn/fdvm/trunk/parser/gram1.y b/projects/dvm_svn/fdvm/trunk/parser/gram1.y
deleted file mode 100644
index 1b2c22a..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/gram1.y
+++ /dev/null
@@ -1,8211 +0,0 @@
-%token PERCENT 1
-%token AMPERSAND 2
-%token ASTER 3
-%token CLUSTER 4
-%token COLON 5
-%token COMMA 6
-%token DASTER 7
-%token DEFINED_OPERATOR 8
-%token DOT 9
-%token DQUOTE 10
-%token GLOBAL_A 11
-%token LEFTAB 12
-%token LEFTPAR 13
-%token MINUS 14
-%token PLUS 15
-%token POINT_TO 16
-%token QUOTE 17
-%token RIGHTAB 18
-%token RIGHTPAR 19
-%token AND 20
-%token DSLASH 21
-%token EQV 22
-%token EQ 23
-%token EQUAL 24
-%token FFALSE 25
-%token GE 26
-%token GT 27
-%token LE 28
-%token LT 29
-%token NE 30
-%token NEQV 31
-%token NOT 32
-%token OR 33
-%token TTRUE 34
-%token SLASH 35
-%token XOR 36
-%token REFERENCE 37
-%token AT 38
-%token ACROSS 39
-%token ALIGN_WITH 40
-%token ALIGN 41
-%token ALLOCATABLE 42
-%token ALLOCATE 43
-%token ARITHIF 44
-%token ASSIGNMENT 45
-%token ASSIGN 46
-%token ASSIGNGOTO 47
-%token ASYNCHRONOUS 48
-%token ASYNCID 49
-%token ASYNCWAIT 50
-%token BACKSPACE 51
-%token BAD_CCONST 52
-%token BAD_SYMBOL 53
-%token BARRIER 54
-%token BLOCKDATA 55
-%token BLOCK 56
-%token BOZ_CONSTANT 57
-%token BYTE 58
-%token CALL 59
-%token CASE 60
-%token CHARACTER 61
-%token CHAR_CONSTANT 62
-%token CHECK 63
-%token CLOSE 64
-%token COMMON 65
-%token COMPLEX 66
-%token COMPGOTO 67
-%token CONSISTENT_GROUP 68
-%token CONSISTENT_SPEC 69
-%token CONSISTENT_START 70
-%token CONSISTENT_WAIT 71
-%token CONSISTENT 72
-%token CONSTRUCT_ID 73
-%token CONTAINS 74
-%token CONTINUE 75
-%token CORNER 76
-%token CYCLE 77
-%token DATA 78
-%token DEALLOCATE 79
-%token HPF_TEMPLATE 80
-%token DEBUG 81
-%token DEFAULT_CASE 82
-%token DEFINE 83
-%token DERIVED 84
-%token DIMENSION 85
-%token DISTRIBUTE 86
-%token DOWHILE 87
-%token DOUBLEPRECISION 88
-%token DOUBLECOMPLEX 89
-%token DP_CONSTANT 90
-%token DVM_POINTER 91
-%token DYNAMIC 92
-%token ELEMENTAL 93
-%token ELSE 94
-%token ELSEIF 95
-%token ELSEWHERE 96
-%token ENDASYNCHRONOUS 97
-%token ENDDEBUG 98
-%token ENDINTERVAL 99
-%token ENDUNIT 100
-%token ENDDO 101
-%token ENDFILE 102
-%token ENDFORALL 103
-%token ENDIF 104
-%token ENDINTERFACE 105
-%token ENDMODULE 106
-%token ENDON 107
-%token ENDSELECT 108
-%token ENDTASK_REGION 109
-%token ENDTYPE 110
-%token ENDWHERE 111
-%token ENTRY 112
-%token EXIT 113
-%token EOLN 114
-%token EQUIVALENCE 115
-%token ERROR 116
-%token EXTERNAL 117
-%token F90 118
-%token FIND 119
-%token FORALL 120
-%token FORMAT 121
-%token FUNCTION 122
-%token GATE 123
-%token GEN_BLOCK 124
-%token HEAP 125
-%token HIGH 126
-%token IDENTIFIER 127
-%token IMPLICIT 128
-%token IMPLICITNONE 129
-%token INCLUDE_TO 130
-%token INCLUDE 131
-%token INDEPENDENT 132
-%token INDIRECT_ACCESS 133
-%token INDIRECT_GROUP 134
-%token INDIRECT 135
-%token INHERIT 136
-%token INQUIRE 137
-%token INTERFACEASSIGNMENT 138
-%token INTERFACEOPERATOR 139
-%token INTERFACE 140
-%token INTRINSIC 141
-%token INTEGER 142
-%token INTENT 143
-%token INTERVAL 144
-%token INOUT 145
-%token IN 146
-%token INT_CONSTANT 147
-%token LABEL 148
-%token LABEL_DECLARE 149
-%token LET 150
-%token LOCALIZE 151
-%token LOGICAL 152
-%token LOGICALIF 153
-%token LOOP 154
-%token LOW 155
-%token MAXLOC 156
-%token MAX 157
-%token MAP 158
-%token MINLOC 159
-%token MIN 160
-%token MODULE_PROCEDURE 161
-%token MODULE 162
-%token MULT_BLOCK 163
-%token NAMEEQ 164
-%token NAMELIST 165
-%token NEW_VALUE 166
-%token NEW 167
-%token NULLIFY 168
-%token OCTAL_CONSTANT 169
-%token ONLY 170
-%token ON 171
-%token ON_DIR 172
-%token ONTO 173
-%token OPEN 174
-%token OPERATOR 175
-%token OPTIONAL 176
-%token OTHERWISE 177
-%token OUT 178
-%token OWN 179
-%token PARALLEL 180
-%token PARAMETER 181
-%token PAUSE 182
-%token PLAINDO 183
-%token PLAINGOTO 184
-%token POINTER 185
-%token POINTERLET 186
-%token PREFETCH 187
-%token PRINT 188
-%token PRIVATE 189
-%token PRODUCT 190
-%token PROGRAM 191
-%token PUBLIC 192
-%token PURE 193
-%token RANGE 194
-%token READ 195
-%token REALIGN_WITH 196
-%token REALIGN 197
-%token REAL 198
-%token REAL_CONSTANT 199
-%token RECURSIVE 200
-%token REDISTRIBUTE_NEW 201
-%token REDISTRIBUTE 202
-%token REDUCTION_GROUP 203
-%token REDUCTION_START 204
-%token REDUCTION_WAIT 205
-%token REDUCTION 206
-%token REMOTE_ACCESS_SPEC 207
-%token REMOTE_ACCESS 208
-%token REMOTE_GROUP 209
-%token RESET 210
-%token RESULT 211
-%token RETURN 212
-%token REWIND 213
-%token SAVE 214
-%token SECTION 215
-%token SELECT 216
-%token SEQUENCE 217
-%token SHADOW_ADD 218
-%token SHADOW_COMPUTE 219
-%token SHADOW_GROUP 220
-%token SHADOW_RENEW 221
-%token SHADOW_START_SPEC 222
-%token SHADOW_START 223
-%token SHADOW_WAIT_SPEC 224
-%token SHADOW_WAIT 225
-%token SHADOW 226
-%token STAGE 227
-%token STATIC 228
-%token STAT 229
-%token STOP 230
-%token SUBROUTINE 231
-%token SUM 232
-%token SYNC 233
-%token TARGET 234
-%token TASK 235
-%token TASK_REGION 236
-%token THEN 237
-%token TO 238
-%token TRACEON 239
-%token TRACEOFF 240
-%token TRUNC 241
-%token TYPE 242
-%token TYPE_DECL 243
-%token UNDER 244
-%token UNKNOWN 245
-%token USE 246
-%token VIRTUAL 247
-%token VARIABLE 248
-%token WAIT 249
-%token WHERE 250
-%token WHERE_ASSIGN 251
-%token WHILE 252
-%token WITH 253
-%token WRITE 254
-%token COMMENT 255
-%token WGT_BLOCK 256
-%token HPF_PROCESSORS 257
-%token IOSTAT 258
-%token ERR 259
-%token END 260
-%token OMPDVM_ATOMIC 261
-%token OMPDVM_BARRIER 262
-%token OMPDVM_COPYIN 263
-%token OMPDVM_COPYPRIVATE 264
-%token OMPDVM_CRITICAL 265
-%token OMPDVM_ONETHREAD 266
-%token OMPDVM_DO 267
-%token OMPDVM_DYNAMIC 268
-%token OMPDVM_ENDCRITICAL 269
-%token OMPDVM_ENDDO 270
-%token OMPDVM_ENDMASTER 271
-%token OMPDVM_ENDORDERED 272
-%token OMPDVM_ENDPARALLEL 273
-%token OMPDVM_ENDPARALLELDO 274
-%token OMPDVM_ENDPARALLELSECTIONS 275
-%token OMPDVM_ENDPARALLELWORKSHARE 276
-%token OMPDVM_ENDSECTIONS 277
-%token OMPDVM_ENDSINGLE 278
-%token OMPDVM_ENDWORKSHARE 279
-%token OMPDVM_FIRSTPRIVATE 280
-%token OMPDVM_FLUSH 281
-%token OMPDVM_GUIDED 282
-%token OMPDVM_LASTPRIVATE 283
-%token OMPDVM_MASTER 284
-%token OMPDVM_NOWAIT 285
-%token OMPDVM_NONE 286
-%token OMPDVM_NUM_THREADS 287
-%token OMPDVM_ORDERED 288
-%token OMPDVM_PARALLEL 289
-%token OMPDVM_PARALLELDO 290
-%token OMPDVM_PARALLELSECTIONS 291
-%token OMPDVM_PARALLELWORKSHARE 292
-%token OMPDVM_RUNTIME 293
-%token OMPDVM_SECTION 294
-%token OMPDVM_SECTIONS 295
-%token OMPDVM_SCHEDULE 296
-%token OMPDVM_SHARED 297
-%token OMPDVM_SINGLE 298
-%token OMPDVM_THREADPRIVATE 299
-%token OMPDVM_WORKSHARE 300
-%token OMPDVM_NODES 301
-%token OMPDVM_IF 302
-%token IAND 303
-%token IEOR 304
-%token IOR 305
-%token ACC_REGION 306
-%token ACC_END_REGION 307
-%token ACC_CHECKSECTION 308
-%token ACC_END_CHECKSECTION 309
-%token ACC_GET_ACTUAL 310
-%token ACC_ACTUAL 311
-%token ACC_TARGETS 312
-%token ACC_ASYNC 313
-%token ACC_HOST 314
-%token ACC_CUDA 315
-%token ACC_LOCAL 316
-%token ACC_INLOCAL 317
-%token ACC_CUDA_BLOCK 318
-%token ACC_ROUTINE 319
-%token ACC_TIE 320
-%token ACC_DECLARE 321
-%token BY 322
-%token IO_MODE 323
-%token CP_CREATE 324
-%token CP_LOAD 325
-%token CP_SAVE 326
-%token CP_WAIT 327
-%token FILES 328
-%token VARLIST 329
-%token STATUS 330
-%token EXITINTERVAL 331
-%token TEMPLATE_CREATE 332
-%token TEMPLATE_DELETE 333
-%token SPF_ANALYSIS 334
-%token SPF_PARALLEL 335
-%token SPF_TRANSFORM 336
-%token SPF_NOINLINE 337
-%token SPF_PARALLEL_REG 338
-%token SPF_END_PARALLEL_REG 339
-%token SPF_EXPAND 340
-%token SPF_FISSION 341
-%token SPF_SHRINK 342
-%token SPF_CHECKPOINT 343
-%token SPF_EXCEPT 344
-%token SPF_FILES_COUNT 345
-%token SPF_INTERVAL 346
-%token SPF_TIME 347
-%token SPF_ITER 348
-%token SPF_FLEXIBLE 349
-%token SPF_APPLY_REGION 350
-%token SPF_APPLY_FRAGMENT 351
-%token SPF_CODE_COVERAGE 352
-%token SPF_UNROLL 353
-%token SPF_MERGE 354
-%token SPF_COVER 355
-%token SPF_PROCESS_PRIVATE 356
-%token SPF_WEIGHT 357
-
-%{
-#include <string.h>
-#include "inc.h"
-#include "extern.h"
-#include "defines.h"
-#include "fdvm.h"
-#include "fm.h"
-
-/* We may use builtin alloca */
-#include "compatible.h"
-#ifdef _NEEDALLOCAH_
-#  include <alloca.h>
-#endif
-
-#define EXTEND_NODE 2  /* move the definition to h/ files. */
-
-extern PTR_BFND global_bfnd, pred_bfnd;
-extern PTR_SYMB star_symb;
-extern PTR_SYMB global_list;
-extern PTR_TYPE global_bool;
-extern PTR_TYPE global_int;
-extern PTR_TYPE global_float;
-extern PTR_TYPE global_double;
-extern PTR_TYPE global_char;
-extern PTR_TYPE global_string;
-extern PTR_TYPE global_string_2;
-extern PTR_TYPE global_complex;
-extern PTR_TYPE global_dcomplex;
-extern PTR_TYPE global_gate;
-extern PTR_TYPE global_event;
-extern PTR_TYPE global_sequence;
-extern PTR_TYPE global_default;
-extern PTR_LABEL thislabel;
-extern PTR_CMNT comments, cur_comment;
-extern PTR_BFND last_bfnd;
-extern PTR_TYPE impltype[];
-extern int nioctl;
-extern int maxdim;
-extern long yystno;	/* statement label */
-extern char stmtbuf[];	/* input buffer */
-extern char *commentbuf;	/* comments buffer from scanner */
-extern PTR_BLOB head_blob;
-extern PTR_BLOB cur_blob;
-extern PTR_TYPE vartype; /* variable type */
-extern int end_group;
-extern char saveall;
-extern int privateall;
-extern int needkwd;
-extern int implkwd;
-extern int opt_kwd_hedr;
-/* added for FORTRAN 90 */
-extern PTR_LLND first_unresolved_call;
-extern PTR_LLND last_unresolved_call;
-extern int data_stat;
-extern char yyquote;
-
-extern int warn_all;
-extern int statement_kind; /* kind of statement: 1 - HPF-DVM-directive, 0 - Fortran statement*/ 
-int extend_flag = 0;
-
-static int do_name_err;
-static int ndim;	/* number of dimension */
-/*!!! hpf */
-static int explicit_shape; /*  1 if shape specification is explicit */
-/* static int varleng;*/	/* variable size */
-static int lastwasbranch = NO;	/* set if last stmt was a branch stmt */
-static int thiswasbranch = NO;	/* set if this stmt is a branch stmt */
-static PTR_SYMB type_var = SMNULL;
-static PTR_LLND stat_alloc = LLNULL; /* set if ALLOCATE/DEALLOCATE stmt has STAT-clause*/
-/* static int subscripts_status = 0; */
-static int type_options,type_opt;   /* The various options used to declare a name -
-                                      RECURSIVE, POINTER, OPTIONAL etc.         */
-static PTR_BFND module_scope;
-static int position = IN_OUTSIDE;            
-static int attr_ndim;           /* number of dimensions in DIMENSION (array_spec)
-                                   attribute declaration */
-static PTR_LLND attr_dims;     /* low level representation of array_spec in
-                                   DIMENSION (array_spec) attribute declarartion. */
-static int in_vec = NO;	      /* set if processing array constructor */
-%}
-
-%union {
-    int token;
-    char charv;
-    char *charp;
-    PTR_BFND bf_node;
-    PTR_LLND ll_node;
-    PTR_SYMB symbol;
-    PTR_TYPE data_type;
-    PTR_HASH hash_entry;
-    PTR_LABEL label;
-}
-
-/*
- * gram.head
- *
- * First part of the Fortran grammar
- *
- */
-
-/* Specify precedences and associativities. */
-
-
-%left COMMA
-%nonassoc COLON
-%right EQUAL
-%left DEFINED_OPERATOR
-%left BINARY_OP
-%left EQV NEQV
-%left OR XOR
-%left AND
-%left NOT
-%nonassoc LT GT LE GE EQ NE
-%left DSLASH
-%left PLUS MINUS
-%left ASTER SLASH
-%right DASTER
-%nonassoc UNARY_OP
-
-%start program
-%type <token> addop  stop att_type
-%type <charv> letter
-%type <charp> filename
-%type <hash_entry> name opt_unit_name
-%type <symbol> progname blokname args arg arglist call comblock namelist_group
-%type <bf_node> program stat spec exec iffable goto logif
-%type <bf_node> dcl implicit data common dimension external intrinsic attrib
-%type <bf_node> equivalence namelist type_dcl end_type static
-%type <bf_node> intent optional public private sequence allocatable pointer target 
-%type <ll_node> implist impitem
-%type <ll_node> paramlist paramitem
-%type <ll_node> dim dims dimlist ubound funarglist funarg funargs opt_expr var
-%type <ll_node> labellist expr uexpr lhs simple_const lengspec substring 
-%type <ll_node> complex_const vec triplet
-%type <ll_node> dospec  use_name_list 
-%type <symbol>  do_var
-%type <label>   dotarget
-%type <symbol> funcname typedfunc procname
-%type <ll_node> equivset equivlist
-%type <ll_node> savelist saveitem
-
-/* FORTRAN 90 */
-%type <hash_entry> defined_op intrinsic_op operator construct_name
-%type <bf_node> case whereable interface use_stat forall
-%type <ll_node> forall_list forall_expr opt_forall_cond
-%type <bf_node> module_proc_stmt do_while plain_do
-%type <ll_node> opt_result_clause case_selector case_value_range
-%type <ll_node> case_value_range_list proper_lengspec
-%type <symbol>  opt_construct_name  
-%type <symbol>  module_name 
-%type <ll_node> selector initial_value clause opt_while
-%type <ll_node> options attr_spec_list attr_spec intent_spec access_spec
-%type <ll_node> string_constant structure_component opt_substring
-%type <ll_node> array_ele_substring_func_ref ident array_element 
-%type <ll_node> subscript_list asubstring equi_object
-%type <ll_node> allocation_list allocate_object_list
-%type <ll_node> allocate_object pointer_name_list rename_list rename_name use_name
-%type <ll_node> only_list only_name proc_name_list construct_name_colon
-%type <ll_node> kind numeric_bool_const integer_constant proc_attr
-
-/*
- * used by I/O statement
- */
-
-%type <bf_node> io read write print iofmove iofctl fmkwd ctlkwd inquire
-%type <ll_node> fexpr unpar_fexpr 
-%type <ll_node> ioctl ctllist ioclause nameeq inlist inelt
-%type <ll_node> outlist out2 other infmt
-
-%type <ll_node> label letgroups letgroup let
-%type <ll_node> callarglist callarg
-%type <data_type> typename typespec type type_implicit
-%type <label> thislabel
-
-
-%type <ll_node> dataimplieddo dlist dataelt datasubs datarange
-%type <ll_node> iconexprlist opticonexpr iconexpr iconterm
-%type <ll_node> iconfactor iconprimary
-%type <symbol>  dataname d_name
-
-/* 
- *
- * used by HPF and FDVM 
- */
-%type <bf_node> dvm_specification dvm_combined_dir dvm_pointer dvm_heap
-%type <bf_node> dvm_template dvm_processors dvm_indirect_group dvm_remote_group
-%type <bf_node> dvm_task dvm_inherit dvm_new_value
-%type <bf_node> dvm_dynamic dvm_align dvm_realign align_directive_stuff
-%type <bf_node> dvm_distribute dvm_redistribute dvm_exec
-%type <bf_node> dvm_parallel_on dvm_remote_access 
-%type <bf_node> dvm_shadow_group dvm_shadow_start dvm_shadow_wait dvm_shadow
-%type <bf_node> dvm_reduction_group dvm_reduction_start dvm_reduction_wait
-%type <bf_node> dvm_task_region  dvm_end_task_region dvm_map dvm_on dvm_end_on
-%type <bf_node> dvm_reset dvm_prefetch dvm_indirect_access hpf_independent 
-%type <bf_node> dvm_debug_dir dvm_enddebug_dir dvm_traceon_dir dvm_traceoff_dir
-%type <bf_node> dvm_interval_dir dvm_endinterval_dir dvm_exit_interval_dir dvm_barrier_dir dvm_check 
-%type <bf_node> dvm_io_mode_dir dvm_shadow_add dvm_localize
-%type <bf_node> dvm_cp_create dvm_cp_load dvm_cp_save dvm_cp_wait dvm_template_create dvm_template_delete
-%type <bf_node> dvm_asyncid dvm_f90 dvm_asynchronous dvm_endasynchronous dvm_asyncwait
-%type <bf_node> dvm_consistent_group dvm_consistent_start dvm_consistent_wait dvm_consistent
-%type <ll_node> dist_name dist_name_list dist_format dist_format_list
-%type <ll_node> distributee pointer_ar_elem
-%type <ll_node> dist_format_clause opt_dist_format_clause  shadow_width 
-%type <ll_node> opt_spec  dvm_attribute_list dvm_attribute
-%type <ll_node> new_spec reduction_spec shadow_spec remote_access_spec
-%type <ll_node> spec_list par_spec indirect_access_spec across_spec stage_spec
-%type <ll_node> in_out_across opt_in_out
-%type <ll_node> dependent_array_list dependent_array dependence  dependence_list
-%type <ll_node> variable_list reduction_list shadow_list distribute_cycles
-%type <ll_node> reduction reduction_op loc_op array_ident array_ident_list shadow
-%type <ll_node> dyn_array_name_list dyn_array_name 
-%type <ll_node> heap_array_name_list heap_array_name 
-%type <ll_node> align_base align_subscript_list par_subscript_list par_subscript
-%type <ll_node> remote_data_list remote_data remote_index_list remote_index
-%type <ll_node> dim_ident_list dim_ident align_subscript 
-%type <ll_node> realignee_list alignee realignee
-%type <ll_node> dummy_array_name_list dummy_array_name 
-%type <ll_node> ident_list sh_array_name 
-%type <ll_node> shadow_attr_stuff sh_width  sh_width_list
-%type <ll_node> pointer_var pointer_var_list dimension_list
-%type <ll_node> interval_number fragment_number
-%type <ll_node> task task_array opt_private_spec async 
-%type <ll_node> indirect_list indirect_reference opt_onto opt_on hpf_reduction_spec
-%type <ll_node> debparamlist debparam async_id_list async_id high_section
-%type <ll_node> section_spec_list section_spec section ar_section low_section
-%type <ll_node> consistent_spec consistent_array_name_list consistent_array_name
-%type <ll_node> mode_list mode_spec opt_mode
-%type <ll_node> derived_spec derived_elem derived_elem_list target_spec 
-%type <ll_node> derived_subscript derived_subscript_list opt_plus_shadow plus_shadow shadow_id
-%type <ll_node> template_ref template_obj shadow_axis shadow_axis_list opt_include_to 
-%type <ll_node> localize_target target_subscript target_subscript_list aster_expr dummy_ident 
-%type <ll_node> template_list tie_spec tied_array_list
-%type <symbol> processors_name align_base_name 
-%type <symbol> shadow_group_name reduction_group_name reduction_group  indirect_group_name task_name
-%type <symbol> remote_group_name group_name array_name async_ident consistent_group_name consistent_group
-%type <symbol> derived_target 
-
-/* FORTRAN OPENMPDVM*/
-%type <bf_node> omp_specification_directive omp_threadprivate_directive
-%type <bf_node> omp_execution_directive omp_section_directive
-%type <bf_node> omp_parallel_begin_directive omp_parallel_end_directive
-%type <bf_node> omp_sections_begin_directive omp_sections_end_directive
-%type <bf_node> omp_do_begin_directive omp_do_end_directive
-%type <bf_node> omp_single_begin_directive omp_single_end_directive
-%type <bf_node> omp_workshare_begin_directive omp_workshare_end_directive
-%type <bf_node> omp_parallel_do_begin_directive omp_parallel_do_end_directive
-%type <bf_node> omp_parallel_sections_begin_directive omp_parallel_sections_end_directive
-%type <bf_node> omp_parallel_workshare_begin_directive omp_parallel_workshare_end_directive
-%type <bf_node> omp_master_begin_directive omp_master_end_directive
-%type <bf_node> omp_ordered_begin_directive omp_ordered_end_directive
-%type <bf_node> omp_barrier_directive omp_atomic_directive omp_flush_directive
-%type <bf_node> omp_critical_begin_directive omp_critical_end_directive ompdvm_onethread
-
-%type <ll_node> parallel_clause_list parallel_clause
-%type <ll_node> ompprivate_clause ompfirstprivate_clause
-%type <ll_node> omplastprivate_clause ompcopyin_clause
-%type <ll_node> ompshared_clause ompdefault_clause
-%type <ll_node> def_expr ompif_clause ompnumthreads_clause
-%type <ll_node> ompreduction_clause ompreduction ompreduction_vars
-%type <ll_node> ompreduction_op
-%type <ll_node> sections_clause_list sections_clause
-%type <ll_node> do_clause_list do_clause omp_variable_list
-%type <ll_node> omp_common_var omp_variable_list_in_par
-%type <ll_node> ompordered_clause ompschedule_clause ompschedule_op
-%type <ll_node> single_clause_list single_clause
-%type <ll_node> end_single_clause_list end_single_clause
-%type <ll_node> ompcopyprivate_clause ompnowait_clause
-%type <ll_node> paralleldo_clause_list paralleldo_clause
-
-/* FORTRAN ACC */
-%type <bf_node> acc_specification acc_declare
-%type <bf_node> acc_directive acc_region acc_end_region acc_checksection acc_end_checksection
-%type <bf_node> acc_get_actual acc_actual acc_routine
-%type <ll_node> opt_clause acc_clause_list acc_clause data_clause async_clause targets_clause
-%type <ll_node> acc_var_list computer_list computer opt_routine_clauses routine_clause_list routine_clause
-%type <ll_node> acc_declare_list declare_var
-
-/* new clauses for PARALLEL directive */
-%type <ll_node> private_spec cuda_block_spec sizelist 
-
-/* SAPFOR */
-%type <bf_node> spf_directive spf_analysis spf_parallel spf_transform spf_parallel_reg spf_end_parallel_reg
-%type <bf_node> spf_checkpoint
-%type <ll_node> analysis_spec_list analysis_spec analysis_reduction_spec analysis_private_spec analysis_parameter_spec
-%type <ll_node> analysis_cover_spec analysis_process_private_spec
-%type <ll_node> parallel_spec_list parallel_spec parallel_shadow_spec parallel_across_spec parallel_remote_access_spec
-%type <ll_node> transform_spec_list transform_spec array_element_list spf_parameter_list spf_parameter
-%type <ll_node> characteristic characteristic_list opt_clause_apply_region opt_clause_apply_fragment 
-%type <ll_node> checkpoint_spec checkpoint_spec_list spf_type_list spf_type interval_spec unroll_list
-%type <symbol>  region_name 
-
-%{
-void add_scope_level();
-void delete_beyond_scope_level();
-PTR_HASH look_up_sym();
-PTR_HASH just_look_up_sym();
-PTR_HASH just_look_up_sym_in_scope();
-PTR_HASH look_up_op();
-PTR_SYMB make_constant();
-PTR_SYMB make_scalar();
-PTR_SYMB make_array();
-PTR_SYMB make_pointer();
-PTR_SYMB make_function();
-PTR_SYMB make_external();
-PTR_SYMB make_intrinsic();
-PTR_SYMB make_procedure();
-PTR_SYMB make_process();
-PTR_SYMB make_program();
-PTR_SYMB make_module();
-PTR_SYMB make_common();
-PTR_SYMB make_parallel_region();
-PTR_SYMB make_derived_type();
-PTR_SYMB make_local_entity();
-PTR_SYMB make_global_entity();
-PTR_TYPE make_type_node();
-PTR_TYPE lookup_type(), make_type();
-void     process_type();
-void     process_interface();
-void     bind();
-void     late_bind_if_needed();
-PTR_SYMB component();
-PTR_SYMB lookup_type_symbol();
-PTR_SYMB resolve_overloading();
-PTR_BFND cur_scope();
-PTR_BFND subroutine_call();
-PTR_BFND process_call();
-PTR_LLND deal_with_options();
-PTR_LLND intrinsic_op_node();
-PTR_LLND defined_op_node();
-int is_substring_ref();
-int is_array_section_ref();
-PTR_LLND dim_expr(); 
-PTR_BFND exit_stat();
-PTR_BFND make_do();
-PTR_BFND make_pardo();
-PTR_BFND make_enddoall();
-PTR_TYPE install_array(); 
-PTR_SYMB install_entry(); 
-void install_param_list();
-PTR_LLND construct_entry_list();
-void copy_sym_data();
-PTR_LLND check_and_install();
-PTR_HASH look_up();
-PTR_BFND get_bfnd(); 
-PTR_BLOB make_blob();
-PTR_LABEL make_label();
-PTR_LABEL make_label_node();
-int is_interface_stat();
-PTR_LLND make_llnd (); 
-PTR_LLND make_llnd_label (); 
-PTR_TYPE make_sa_type(); 
-PTR_SYMB procedure_call();
-PTR_BFND proc_list();
-PTR_SYMB set_id_list();
-PTR_LLND set_ll_list();
-PTR_LLND add_to_lowLevelList(), add_to_lowList();
-PTR_BFND set_stat_list() ;
-PTR_BLOB follow_blob();
-PTR_SYMB proc_decl_init();
-PTR_CMNT make_comment();
-PTR_HASH correct_symtab();
-char *copyn();
-char *convic();
-char *StringConcatenation();
-int atoi();
-PTR_BFND make_logif();
-PTR_BFND make_if();
-PTR_BFND make_forall();
-void startproc();
-void match_parameters();
-void make_else();
-void make_elseif();
-void make_endif();
-void make_elsewhere();
-void make_elsewhere_mask();
-void make_endwhere();
-void make_endforall();
-void make_endselect();
-void make_extend();
-void make_endextend();
-void make_section();
-void make_section_extend();
-void doinclude();
-void endproc();
-void err();
-void execerr();
-void flline();
-void warn();
-void warn1();
-void newprog();
-void set_type();
-void dclerr();
-void enddcl();
-void install_const();
-void setimpl();
-void copy_module_scope();
-void delete_symbol();
-void replace_symbol_in_expr();
-long convci();
-void set_expr_type();
-void errstr();
-void yyerror();
-void set_blobs();
-void make_loop();
-void startioctl();
-void endioctl();
-void redefine_func_arg_type();
-int isResultVar();
-int yylex();
-
-/* used by FORTRAN M */
-PTR_BFND make_processdo();
-PTR_BFND make_processes();
-PTR_BFND make_endprocesses();
-
-PTR_BFND make_endparallel();/*OMP*/
-PTR_BFND make_parallel();/*OMP*/
-PTR_BFND make_endsingle();/*OMP*/
-PTR_BFND make_single();/*OMP*/
-PTR_BFND make_endmaster();/*OMP*/
-PTR_BFND make_master();/*OMP*/
-PTR_BFND make_endordered();/*OMP*/
-PTR_BFND make_ordered();/*OMP*/
-PTR_BFND make_endcritical();/*OMP*/
-PTR_BFND make_critical();/*OMP*/
-PTR_BFND make_endsections();/*OMP*/
-PTR_BFND make_sections();/*OMP*/
-PTR_BFND make_ompsection();/*OMP*/
-PTR_BFND make_endparallelsections();/*OMP*/
-PTR_BFND make_parallelsections();/*OMP*/
-PTR_BFND make_endworkshare();/*OMP*/
-PTR_BFND make_workshare();/*OMP*/
-PTR_BFND make_endparallelworkshare();/*OMP*/
-PTR_BFND make_parallelworkshare();/*OMP*/
-
-%}
-%%
-
-program:    { $$ = BFNULL; }
-	| program stat EOLN
-	    { $$ = set_stat_list($1,$2); }
-	;
-
-stat:	  thislabel  entry cmnt
-	    { lastwasbranch = NO;  $$ = BFNULL; }
-	| thislabel  spec cmnt
-            {
-	       if ($2 != BFNULL) 
-               {	    
-	          $2->label = $1;
-	          $$ = $2;
-	 	  if (is_openmp_stmt) {            /*OMP*/
-			is_openmp_stmt = 0;
-			if($2) {                        /*OMP*/
-				if ($2->decl_specs != -BIT_OPENMP) $2->decl_specs = BIT_OPENMP; /*OMP*/
-			}                               /*OMP*/
-		  }                                       /*OMP*/
-               }
-	    }
-	| thislabel exec cmnt
-	    { PTR_BFND p;
-
-	     if(lastwasbranch && ! thislabel)
-               /*if (warn_all)
-		 warn("statement cannot be reached", 36);*/
-	     lastwasbranch = thiswasbranch;
-	     thiswasbranch = NO;
-	     if($2) $2->label = $1;
-	     if($1 && $2) $1->statbody = $2; /*8.11.06 podd*/
-	     if($1) {
-		/*$1->statbody = $2;*/ /*8.11.06 podd*/
-		if($1->labtype == LABFORMAT)
-		  err("label already that of a format",39);
-		else
-		  $1->labtype = LABEXEC;
-	     }
-	     if (is_openmp_stmt) {            /*OMP*/
-			is_openmp_stmt = 0;
-			if($2) {                        /*OMP*/
-				if ($2->decl_specs != -BIT_OPENMP) $2->decl_specs = BIT_OPENMP; /*OMP*/
-			}                               /*OMP*/
-	     }                                       /*OMP*/
-             for (p = pred_bfnd; $1 && 
-		  ((p->variant == FOR_NODE)||(p->variant == WHILE_NODE)) &&
-                  (p->entry.for_node.doend) &&
-		  (p->entry.for_node.doend->stateno == $1->stateno);
-		  p = p->control_parent)
-                ++end_group;
-	     $$ = $2;
-     }
-	| thislabel INCLUDE filename
-		{ /* PTR_LLND p; */
-			doinclude( $3 );
-/*			p = make_llnd(fi, STRING_VAL, LLNULL, LLNULL, SMNULL);
-			p->entry.string_val = $3;
-			p->type = global_string;
-			$$ = get_bfnd(fi, INCLUDE_STAT, SMNULL, p, LLNULL); */
-			$$ = BFNULL;
-		}
-	| thislabel UNKNOWN
-	    {
-	      err("Unclassifiable statement", 10);
-	      flline();
-	      $$ = BFNULL;
-	    };
-	| COMMENT
-	    { PTR_CMNT p;
-              PTR_BFND bif; 
-	    
-              if (last_bfnd && last_bfnd->control_parent &&((last_bfnd->control_parent->variant == LOGIF_NODE)
-	         ||(last_bfnd->control_parent->variant == FORALL_STAT)))
-  	         bif = last_bfnd->control_parent;
-              else
-                 bif = last_bfnd;
-              p=bif->entry.Template.cmnt_ptr;
-              if(p)
-                 p->string = StringConcatenation(p->string,commentbuf);
-              else
-              {
-                 p = make_comment(fi,commentbuf, FULL);
-                 bif->entry.Template.cmnt_ptr = p;
-              }
- 	      $$ = BFNULL;         
-            }
-
-	| error
-	    { 
-	      flline();	 needkwd = NO;	inioctl = NO;
-/*!!!*/
-              opt_kwd_ = NO; intonly = NO; opt_kwd_hedr = NO; opt_kwd_r = NO; as_op_kwd_= NO; optcorner = NO;
-	      yyerrok; yyclearin;  $$ = BFNULL;
-	    }
-	;
-
-thislabel:  LABEL
-	    {
-	    if(yystno)
-	      {
-	      $$ = thislabel =	make_label_node(fi,yystno);
-	      thislabel->scope = cur_scope();
-	      if (thislabel->labdefined && (thislabel->scope == cur_scope()))
-		 errstr("Label %s already defined",convic(thislabel->stateno),40);
-	      else
-		 thislabel->labdefined = YES;
-	      }
-	    else
-	      $$ = thislabel = LBNULL;
-	    }
-	;
-
-entry:	  PROGRAM new_prog progname
-	    { PTR_BFND p;
-
-	        if (pred_bfnd != global_bfnd)
-		    err("Misplaced PROGRAM statement", 33);
-		p = get_bfnd(fi,PROG_HEDR, $3, LLNULL, LLNULL, LLNULL);
-		$3->entry.prog_decl.prog_hedr=p;
- 		set_blobs(p, global_bfnd, NEW_GROUP1);
-	        add_scope_level(p, NO);
-	        position = IN_PROC;
-	    }
-
-	| BLOCKDATA new_prog blokname
-	    {  PTR_BFND q = BFNULL;
-
-	      $3->variant = PROCEDURE_NAME;
-	      $3->decl = YES;   /* variable declaration has been seen. */
-	      q = get_bfnd(fi,BLOCK_DATA, $3, LLNULL, LLNULL, LLNULL);
-	      set_blobs(q, global_bfnd, NEW_GROUP1);
-              add_scope_level(q, NO);
-	    }
-
-	| SUBROUTINE new_prog procname arglist
-	    { 
-              install_param_list($3, $4, LLNULL, PROCEDURE_NAME); 
-	      /* if there is only a control end the control parent is not set */
-              
-	     }
- 
-	| proc_attr SUBROUTINE new_prog procname arglist
-	    { install_param_list($4, $5, LLNULL, PROCEDURE_NAME); 
-              if($1->variant == RECURSIVE_OP) 
-                   $4->attr = $4->attr | RECURSIVE_BIT;
-              pred_bfnd->entry.Template.ll_ptr3 = $1;
-            }
-	| FUNCTION new_prog funcname arglist opt_result_clause
-	    {
-              install_param_list($3, $4, $5, FUNCTION_NAME);  
-  	      pred_bfnd->entry.Template.ll_ptr1 = $5;
-            }
-	| typedfunc arglist opt_result_clause
-	    {
-              install_param_list($1, $2, $3, FUNCTION_NAME); 
-	      pred_bfnd->entry.Template.ll_ptr1 = $3;
-	    }
-	| ENTRY name arglist opt_result_clause
-	    {PTR_BFND p, bif;
-	     PTR_SYMB q = SMNULL;
-             PTR_LLND l = LLNULL;
-
-	     if(parstate==OUTSIDE || procclass==CLMAIN || procclass==CLBLOCK)
-	        err("Misplaced ENTRY statement", 35);
-
-	     bif = cur_scope();
-	     if (bif->variant == FUNC_HEDR) {
-	        q = make_function($2, bif->entry.Template.symbol->type, LOCAL);
-	        l = construct_entry_list(q, $3, FUNCTION_NAME); 
-             }
-             else if ((bif->variant == PROC_HEDR) || 
-                      (bif->variant == PROS_HEDR) || /* added for FORTRAN M */
-                      (bif->variant == PROG_HEDR)) {
-	             q = make_procedure($2,LOCAL);
-  	             l = construct_entry_list(q, $3, PROCEDURE_NAME); 
-             }
-	     p = get_bfnd(fi,ENTRY_STAT, q, l, $4, LLNULL);
-	     set_blobs(p, pred_bfnd, SAME_GROUP);
-             q->decl = YES;   /*4.02.03*/
-             q->entry.proc_decl.proc_hedr = p; /*5.02.03*/
-	    }
-	| MODULE  new_prog  name 
-	    { PTR_SYMB s;
-	      PTR_BFND p;
-/*
-	      s = make_global_entity($3, MODULE_NAME, global_default, NO);
-	      s->decl = YES;  
-	      p = get_bfnd(fi, MODULE_STMT, s, LLNULL, LLNULL, LLNULL);
-	      s->entry.Template.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-*/
-	      /*position = IN_MODULE;*/
-
-
-               s = make_module($3);
-	       s->decl = YES;   /* variable declaration has been seen. */
-	        if (pred_bfnd != global_bfnd)
-		    err("Misplaced MODULE statement", 33);
-              p = get_bfnd(fi, MODULE_STMT, s, LLNULL, LLNULL, LLNULL);
-	      s->entry.Template.func_hedr = p; /* !!!????*/
-	      set_blobs(p, global_bfnd, NEW_GROUP1);
-	      add_scope_level(p, NO);	
-	      position =  IN_MODULE;    /*IN_PROC*/
-              privateall = 0;
-            }
-	;
-
-new_prog:   { newprog(); 
-	      if (position == IN_OUTSIDE)
-	           position = IN_PROC;
-              else if (position != IN_INTERNAL_PROC){ 
-                if(!is_interface_stat(pred_bfnd))
-	           position--;
-              }
-              else {
-                if(!is_interface_stat(pred_bfnd))
-                  err("Internal procedures can not contain procedures",304);
-              }
-	    }
-	;
-
-proc_attr: RECURSIVE needkeyword
-           { $$ = make_llnd(fi, RECURSIVE_OP, LLNULL, LLNULL, SMNULL); }
-         | PURE needkeyword
-           { $$ = make_llnd(fi, PURE_OP, LLNULL, LLNULL, SMNULL); }
-         | ELEMENTAL needkeyword
-           { $$ = make_llnd(fi, ELEMENTAL_OP, LLNULL, LLNULL, SMNULL); }
-         ;
-
-procname:  name
-           { PTR_BFND p;
-
-	      $$ = make_procedure($1, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-             /* if (pred_bfnd != global_bfnd)
-		 {
-	         err("Misplaced SUBROUTINE statement", 34);
-		 }  
-              */
-	      p = get_bfnd(fi,PROC_HEDR, $$, LLNULL, LLNULL, LLNULL);
-              $$->entry.proc_decl.proc_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-          ;
-
-funcname:  name
-           { PTR_BFND p;
-
-	      $$ = make_function($1, TYNULL, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-             /* if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement", 34); */
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, LLNULL, LLNULL);
-              $$->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-           ;
-
-typedfunc: type  FUNCTION new_prog name 
-           { PTR_BFND p;
-             PTR_LLND l;
-
-	      $$ = make_function($4, $1, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-              l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-              l->type = $1;
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, l, LLNULL);
-              $$->entry.func_decl.func_hedr = p;
-            /*  if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement", 34);*/
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-/*
-	      $$ = make_function($4, $1, LOCAL);
-	      $$->decl = YES;
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, LLNULL, LLNULL);
-              if (pred_bfnd != global_bfnd)
-	         errstr("cftn.gram: misplaced SUBROUTINE statement.");
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-*/
-           }        
-	| type  proc_attr FUNCTION new_prog name
-           { PTR_BFND p;
-             PTR_LLND l;
-	      $$ = make_function($5, $1, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-              if($2->variant == RECURSIVE_OP)
-	         $$->attr = $$->attr | RECURSIVE_BIT;
-              l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-              l->type = $1;
-             /* if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement", 34);*/
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, l, $2);
-              $$->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-	| proc_attr FUNCTION new_prog name
-           { PTR_BFND p;
-
-	      $$ = make_function($4, TYNULL, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-              if($1->variant == RECURSIVE_OP)
-	        $$->attr = $$->attr | RECURSIVE_BIT;
-              /*if (pred_bfnd != global_bfnd)
-	         err("Misplaced FUNCTION statement",34);*/
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, LLNULL, $1);
-              $$->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-	| proc_attr type FUNCTION new_prog name
-           { PTR_BFND p;
-              PTR_LLND l;
-	      $$ = make_function($5, $2, LOCAL);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-              if($1->variant == RECURSIVE_OP)
-	        $$->attr = $$->attr | RECURSIVE_BIT;
-              l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-              l->type = $2;
-             /* if (pred_bfnd != global_bfnd)
-	          err("Misplaced FUNCTION statement",34);*/
-	      p = get_bfnd(fi,FUNC_HEDR, $$, LLNULL, l, $1);
-              $$->entry.func_decl.func_hedr = p;
-	      set_blobs(p, pred_bfnd, NEW_GROUP1);
-              add_scope_level(p, NO);
-            }        
-	;
-
-opt_result_clause: needkeyword keywordoff
-	    { $$ = LLNULL; }
-	| needkeyword RESULT LEFTPAR name RIGHTPAR 
-	    { PTR_SYMB s;
-              s = make_scalar($4, TYNULL, LOCAL);
-              $$ = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-            }
-	;
-
-name:	  IDENTIFIER
-	    { $$ = look_up_sym(yytext); }
-	;
-
-progname:   { $$ = make_program(look_up_sym("_MAIN")); }
-	| name
-	    {
-              $$ = make_program($1);
-	      $$->decl = YES;   /* variable declaration has been seen. */
-            }
-	;
-
-blokname:   { $$ = make_program(look_up_sym("_BLOCK")); }
-	| name
-	    {
-              $$ = make_program($1); 
-	      $$->decl = YES;   /* variable declaration has been seen. */
-	    }
-	;
-
-arglist:
-	    { $$ = SMNULL; }
-	| LEFTPAR RIGHTPAR
-	    { $$ = SMNULL; }
-	| LEFTPAR args RIGHTPAR
-	    { $$ = $2; }
-	;
-
-args:	  arg
-	| args COMMA arg
-	    { $$ = set_id_list($1, $3); }
-	;
-
-arg:	  name
-	    {
-	      $$ = make_scalar($1, TYNULL, IO);
-            }
-	| ASTER
-	    { $$ = make_scalar(look_up_sym("*"), TYNULL, IO); }   /*star_symb*/
-	;
-
-
-
-filename: CHAR_CONSTANT
-	    { char *s;
-
-	      s = copyn(yyleng+1, yytext);
-	      s[yyleng] = '\0';
-	      $$ = s;
-	    }
-	;
-
-needkeyword: 
-            { needkwd = 1; }
-         ;
-
-keywordoff: 
-            { needkwd = NO; }
-         ;
-
-/* The scanner checks if the keyword is ONLY. */
-keyword_if_colon_follow: 
-            { colon_flag = YES; }
-         ;
-
-/*
- * Grammar for declarations
- */
-
-spec:	  type_dcl
-	| end_type
-	| dcl
-	| common
-        | dimension
-        | dvm_specification /* FDVM */
-        | acc_specification /* FDVM */
-	| external
-	| intrinsic
-	| equivalence
-	| implicit
-	| attrib
-	| namelist
-	| data
-	| SAVE in_dcl
-	    {
-	      saveall = YES;
-	      $$ = get_bfnd(fi,SAVE_DECL, SMNULL, LLNULL, LLNULL, LLNULL);
-	    }
-	| SAVE in_dcl  opt_double_colon savelist
-	    {
-	      $$ = get_bfnd(fi,SAVE_DECL, SMNULL, $4, LLNULL, LLNULL);
-            }
-
-	| FORMAT inside
-           { PTR_LLND p;
-
-	      p = make_llnd(fi,STMT_STR, LLNULL, LLNULL, SMNULL);
-	      p->entry.string_val = copys(stmtbuf);
-	      $$ = get_bfnd(fi,FORMAT_STAT, SMNULL, p, LLNULL, LLNULL);
-             }
-	| PARAMETER in_dcl LEFTPAR paramlist RIGHTPAR
-           { $$ = get_bfnd(fi,PARAM_DECL, SMNULL, $4, LLNULL, LLNULL); }
-	| intent
-	| optional
-	| public
-	| private
-        | sequence
-	| allocatable
-	| pointer
-	| target
-	| interface
-	| use_stat
-	| module_proc_stmt
-        | static
-	;
-
-interface: INTERFACE in_dcl
-	    { $$ = get_bfnd(fi, INTERFACE_STMT, SMNULL, LLNULL, LLNULL, LLNULL); 
-              add_scope_level($$, NO);     
-            }
-	| INTERFACE in_dcl name
-	    { PTR_SYMB s;
-
-	      s = make_procedure($3, LOCAL);
-	      s->variant = INTERFACE_NAME;
-	      $$ = get_bfnd(fi, INTERFACE_STMT, s, LLNULL, LLNULL, LLNULL);
-              add_scope_level($$, NO);
-	    }
-	| INTERFACEOPERATOR in_dcl LEFTPAR operator RIGHTPAR 
-	    { PTR_SYMB s;
-
-	      s = make_function($4, global_default, LOCAL);
-	      s->variant = INTERFACE_NAME;
-	      $$ = get_bfnd(fi, INTERFACE_OPERATOR, s, LLNULL, LLNULL, LLNULL);
-              add_scope_level($$, NO);
-	    }
-	| INTERFACEASSIGNMENT in_dcl LEFTPAR EQUAL RIGHTPAR
-	    { PTR_SYMB s;
-
-
-	      s = make_procedure(look_up_sym("="), LOCAL);
-	      s->variant = INTERFACE_NAME;
-	      $$ = get_bfnd(fi, INTERFACE_ASSIGNMENT, s, LLNULL, LLNULL, LLNULL);
-              add_scope_level($$, NO);
-	    }
-	| ENDINTERFACE  opt_unit_name 
-	    { parstate = INDCL;
-              $$ = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
-	      /*process_interface($$);*/ /*podd 01.02.03*/
-              delete_beyond_scope_level(pred_bfnd);
-	    }
-	;
-
-defined_op: DEFINED_OPERATOR
-	    { $$ = look_up_sym(yytext); }
-	;
-
-operator: defined_op
-	    { $$ = $1; }
-	| intrinsic_op
-	    { $$ = $1; }
-	;
-
-intrinsic_op: PLUS
-	    { $$ = look_up_op(PLUS); }
-	| MINUS
-	    { $$ = look_up_op(MINUS); }
-	| ASTER
-	    { $$ = look_up_op(ASTER); }
-	| DASTER
-	    { $$ = look_up_op(DASTER); }
-	| SLASH
-	    { $$ = look_up_op(SLASH); }
-	| DSLASH
-	    { $$ = look_up_op(DSLASH); }
-	| AND
-	    { $$ = look_up_op(AND); }
-	| OR
-	    { $$ = look_up_op(OR); }
-	| XOR
-	    { $$ = look_up_op(XOR); }
-	| NOT
-	    { $$ = look_up_op(NOT); }
-	| EQ
-	    { $$ = look_up_op(EQ); }
-	| NE
-	    { $$ = look_up_op(NE); }
-	| GT
-	    { $$ = look_up_op(GT); }
-	| GE
-	    { $$ = look_up_op(GE); }
-        | LT
-	    { $$ = look_up_op(LT); }
-	| LE
-	    { $$ = look_up_op(LE); }
-	| NEQV
-	    { $$ = look_up_op(NEQV); }
-	| EQV
-	    { $$ = look_up_op(EQV); }
-	;
-
-
-type_dcl: TYPE_DECL in_dcl opt_double_colon name
-	   {
-             PTR_SYMB s;
-         
-             type_var = s = make_derived_type($4, TYNULL, LOCAL);	
-             $$ = get_bfnd(fi, STRUCT_DECL, s, LLNULL, LLNULL, LLNULL);
-             add_scope_level($$, NO);
-	   }
-
-	| TYPE_DECL COMMA in_dcl needkeyword access_spec opt_double_colon name
-	   { PTR_SYMB s;
-         
-             type_var = s = make_derived_type($7, TYNULL, LOCAL);	
-	     s->attr = s->attr | type_opt;
-             $$ = get_bfnd(fi, STRUCT_DECL, s, $5, LLNULL, LLNULL);
-             add_scope_level($$, NO);
-	   }
-	;
-
-end_type: ENDTYPE in_dcl
-	   {
-	     $$ = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	     if (type_var != SMNULL)
-               process_type(type_var, $$);
-             type_var = SMNULL;
-	     delete_beyond_scope_level(pred_bfnd);
-           }
-	| ENDTYPE in_dcl name
-	   {
-             $$ = get_bfnd(fi, CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	     if (type_var != SMNULL)
-               process_type(type_var, $$);
-             type_var = SMNULL;
-	     delete_beyond_scope_level(pred_bfnd);	
-           }
-	;
-
-dcl:	 type options name in_dcl dims lengspec initial_value
-	    { 
-	      PTR_LLND q, r, l;
-	     /* PTR_SYMB s;*/
-	      PTR_TYPE t;
-	      int type_opts;
-
-	      vartype = $1;
-              if($6 && vartype->variant != T_STRING)
-                errstr("Non character entity  %s  has length specification",$3->ident,41);
-              t = make_type_node(vartype, $6);
-	      type_opts = type_options;
-	      if ($5) type_opts = type_opts | DIMENSION_BIT;
-	      if ($5)
-		 q = deal_with_options($3, t, type_opts, $5, ndim, $7, $5);
-	      else q = deal_with_options($3, t, type_opts, attr_dims, attr_ndim, $7, $5);
-	      r = make_llnd(fi, EXPR_LIST, q, LLNULL, SMNULL);
-	      l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-	      l->type = vartype;
-	      $$ = get_bfnd(fi,VAR_DECL, SMNULL, r, l, $2);
-	    }
-	| dcl COMMA name dims lengspec initial_value
-	    { 
-	      PTR_LLND q, r;
-	    /*  PTR_SYMB s;*/
-              PTR_TYPE t;
-	      int type_opts;
-              if($5 && vartype->variant != T_STRING)
-                errstr("Non character entity  %s  has length specification",$3->ident,41);
-              t = make_type_node(vartype, $5);
-	      type_opts = type_options;
-	      if ($4) type_opts = type_opts | DIMENSION_BIT;
-	      if ($4)
-		 q = deal_with_options($3, t, type_opts, $4, ndim, $6, $4);
-	      else q = deal_with_options($3, t, type_opts, attr_dims, attr_ndim, $6, $4);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-       	    }
-        ;
-
-options: 
-	    { $$ = LLNULL; }
-	| COLON COLON
-            { $$ = LLNULL; }
-	| COMMA needkeyword attr_spec_list COLON COLON
-	    { $$ = $3; }
-	;
-
-attr_spec_list:  attr_spec
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| attr_spec_list COMMA needkeyword attr_spec
-	    { $$ = set_ll_list($1, $4, EXPR_LIST); }
-	;
-
-attr_spec: PARAMETER
-	    { type_options = type_options | PARAMETER_BIT; 
-              $$ = make_llnd(fi, PARAMETER_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| access_spec
-            { $$ = $1; }
-	| ALLOCATABLE
-	    { type_options = type_options | ALLOCATABLE_BIT;
-              $$ = make_llnd(fi, ALLOCATABLE_OP, LLNULL, LLNULL, SMNULL);
-	    }
-	| DIMENSION dims
-	    { type_options = type_options | DIMENSION_BIT;
-	      attr_ndim = ndim;
-	      attr_dims = $2;
-              $$ = make_llnd(fi, DIMENSION_OP, $2, LLNULL, SMNULL);
-            }
-	| EXTERNAL
-	    { type_options = type_options | EXTERNAL_BIT;
-              $$ = make_llnd(fi, EXTERNAL_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| INTENT LEFTPAR intent_spec RIGHTPAR
-	    { $$ = $3; }
-	| INTRINSIC
-	    { type_options = type_options | INTRINSIC_BIT;
-              $$ = make_llnd(fi, INTRINSIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| OPTIONAL
-	    { type_options = type_options | OPTIONAL_BIT;
-              $$ = make_llnd(fi, OPTIONAL_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| POINTER
-	    { type_options = type_options | POINTER_BIT;
-              $$ = make_llnd(fi, POINTER_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| SAVE
-	    { type_options = type_options | SAVE_BIT; 
-              $$ = make_llnd(fi, SAVE_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| STATIC
-	    { type_options = type_options | SAVE_BIT; 
-              $$ = make_llnd(fi, STATIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-	| TARGET
-	    { type_options = type_options | TARGET_BIT; 
-              $$ = make_llnd(fi, TARGET_OP, LLNULL, LLNULL, SMNULL);
-            }
-	;
-
-intent_spec: needkeyword IN
-	    { type_options = type_options | IN_BIT;  type_opt = IN_BIT; 
-              $$ = make_llnd(fi, IN_OP, LLNULL, LLNULL, SMNULL);
-            }
-        | needkeyword OUT
-	    { type_options = type_options | OUT_BIT;  type_opt = OUT_BIT; 
-              $$ = make_llnd(fi, OUT_OP, LLNULL, LLNULL, SMNULL);
-            }
-        | needkeyword INOUT
-	    { type_options = type_options | INOUT_BIT;  type_opt = INOUT_BIT;
-              $$ = make_llnd(fi, INOUT_OP, LLNULL, LLNULL, SMNULL);
-            }
-	;
-
-access_spec: PUBLIC
-	    { type_options = type_options | PUBLIC_BIT; 
-              type_opt = PUBLIC_BIT;
-              $$ = make_llnd(fi, PUBLIC_OP, LLNULL, LLNULL, SMNULL);
-            }
-	   | PRIVATE
-	    { type_options =  type_options | PRIVATE_BIT;
-               type_opt = PRIVATE_BIT;
-              $$ = make_llnd(fi, PRIVATE_OP, LLNULL, LLNULL, SMNULL);
-            }
-        ;
-
-intent:	 INTENT in_dcl LEFTPAR intent_spec RIGHTPAR opt_double_colon name
-	    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar($7, TYNULL, LOCAL);
-	      s->attr = s->attr | type_opt;	
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, INTENT_STMT, SMNULL, r, $4, LLNULL);
-	    }
-	| intent COMMA name 
-	    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar($3, TYNULL, LOCAL);	
-	      s->attr = s->attr | type_opt;
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-  	    }
-	;
-
-optional: OPTIONAL in_dcl opt_double_colon name
-	    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar($4, TYNULL, LOCAL);	
-	      s->attr = s->attr | OPTIONAL_BIT;
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, OPTIONAL_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| optional COMMA name 
-	    { 
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-
-              s = make_scalar($3, TYNULL, LOCAL);	
-	      s->attr = s->attr | OPTIONAL_BIT;
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-  	    }
-	;
-
-static: STATIC in_dcl opt_double_colon var
-	    { 
-	      PTR_LLND r;
-	      PTR_SYMB s;
-
-              s = $4->entry.Template.symbol; 
-              s->attr = s->attr | SAVE_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, STATIC_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| static COMMA var 
-	    { 
-	      PTR_LLND r;
-	      PTR_SYMB s;
-
-              s = $3->entry.Template.symbol;
-              s->attr = s->attr | SAVE_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-  	    }
-	;
-
-
-private: PRIVATE in_dcl
-	    {
-	      privateall = 1;
-	      $$ = get_bfnd(fi, PRIVATE_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
-	    }
-	| PRIVATE in_dcl opt_double_colon private_attr use_name_list
-	    {
-	      /*type_options = type_options | PRIVATE_BIT;*/
-	      $$ = get_bfnd(fi, PRIVATE_STMT, SMNULL, $5, LLNULL, LLNULL);
-            }
-        ;
-private_attr:
-              {type_opt = PRIVATE_BIT;}
-            ;
-
-sequence: SEQUENCE in_dcl
-	    { 
-	      $$ = get_bfnd(fi, SEQUENCE_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
-            }
-
-public: PUBLIC in_dcl
-	    {
-	      /*saveall = YES;*/ /*14.03.03*/
-	      $$ = get_bfnd(fi, PUBLIC_STMT, SMNULL, LLNULL, LLNULL, LLNULL);
-	    }
-	| PUBLIC in_dcl opt_double_colon public_attr use_name_list
-	    {
-	      /*type_options = type_options | PUBLIC_BIT;*/
-	      $$ = get_bfnd(fi, PUBLIC_STMT, SMNULL, $5, LLNULL, LLNULL);
-            }
-
-public_attr:
-              {type_opt = PUBLIC_BIT;}
-            ;
-
-type:	  typespec  opt_key_hedr  selector  opt_key_hedr 
-	    {
-	      type_options = 0;
-              /* following block added by dbg */
-	      ndim = 0;
-	      attr_ndim = 0;
-	      attr_dims = LLNULL;
-	      /* end section added by dbg */
-              $$ = make_type_node($1, $3);
-            }
-	| TYPE LEFTPAR name RIGHTPAR opt_key_hedr
-	    { PTR_TYPE t;
-
-	      type_options = 0;
-	      ndim = 0;
-	      attr_ndim = 0;
-	      attr_dims = LLNULL;
-              t = lookup_type($3);
-	      vartype = t;
-	      $$ = make_type_node(t, LLNULL);
-            }
-	;
-
-opt_key_hedr:
-            {opt_kwd_hedr = YES;}
-            ;
-
-attrib:   att_type name
-
-	    { PTR_TYPE p;
-	      PTR_LLND q;
-	      PTR_SYMB s;
-              s = $2->id_attr;
-	      if (s)
-		   s->attr = $1;
-	      else {
-		p = undeftype ? global_unknown : impltype[*$2->ident - 'a'];
-                s = install_entry($2, SOFT);
-		s->attr = $1;
-                set_type(s, p, LOCAL);
-	      }
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $2->id_attr);
-	      q = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,ATTR_DECL, SMNULL, q, LLNULL, LLNULL);
-	    }
-
-	| attrib COMMA name
-
-	    { PTR_TYPE p;
-	      PTR_LLND q, r;
-	      PTR_SYMB s;
-	      int att;
-
-	      att = $1->entry.Template.ll_ptr1->entry.Template.ll_ptr1->
-		    entry.Template.symbol->attr;
-              s = $3->id_attr;
-	      if (s)
-		   s->attr = att;
-	      else {
-		p = undeftype ? global_unknown : impltype[*$3->ident - 'a'];
-                s = install_entry($3, SOFT);
-		s->attr = att;
-                set_type(s, p, LOCAL);
-	      }
-	      q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3->id_attr);
-	      for (r = $1->entry.Template.ll_ptr1;
-		   r->entry.list.next;
-		   r = r->entry.list.next) ;
-	      r->entry.list.next = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-
-	    }
-	;
-
-att_type: GLOBAL_A
-	 { $$ = ATT_GLOBAL; }
-	| CLUSTER
-	 { $$ = ATT_CLUSTER; }
-	;
-
-/*
-opt_attr:
-	| TASK_GLOBAL
-	| PROCESS_GLOBAL
-	| TASK_CLUSTER
-	| PROCESS_CLUSTER
-	;
-*/
-typespec:  typename
-		{
-/*		  varleng = ($1<0 || $1==TYLONG ? 0 : typesize[$1]); */
-		  vartype = $1;
-		}
-
-	;
-
-typename: INTEGER	{ $$ = global_int; }
-	| REAL		{ $$ = global_float; }
-	| COMPLEX	{ $$ = global_complex; }
-	| DOUBLEPRECISION { $$ = global_double; }
-	| DOUBLECOMPLEX	{ $$ = global_dcomplex; }
-	| LOGICAL	{ $$ = global_bool; }
-	| CHARACTER	{ $$ = global_string; }
-
-	;
-
-lengspec:
-	    { $$ = LLNULL; }
-	| proper_lengspec
-	    { $$ = $1; }
-	;
-
-proper_lengspec: ASTER intonlyon integer_constant intonlyoff  opt_key_hedr
-	        { $$ = make_llnd(fi, LEN_OP, $3, LLNULL, SMNULL); }
-	       | ASTER  intonlyon LEFTPAR intonlyoff ASTER RIGHTPAR 
-	        { PTR_LLND l;
-
-                 l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL); 
-                 l->entry.string_val = (char *)"*";
-                 $$ = make_llnd(fi, LEN_OP, l,l, SMNULL);
-                }
-               | ASTER intonlyon LEFTPAR  intonlyoff expr RIGHTPAR 
-                {$$ = make_llnd(fi, LEN_OP, $5, $5, SMNULL);}
-	       ;
-
-selector:
-	    { $$ = LLNULL; }
- 	| proper_lengspec  
-	    { $$ = $1; } 
-        | LEFTPAR in_ioctl  clause  end_ioctl RIGHTPAR 
-	    { /*$$ = make_llnd(fi, PAREN_OP, $2, LLNULL, SMNULL);*/  $$ = $3;  }
-        | LEFTPAR  in_ioctl  clause  end_ioctl COMMA  in_ioctl  clause  end_ioctl RIGHTPAR
-      /*  | LEFTPAR in_ioctl clause COMMA clause RIGHTPAR 
-	    { PTR_LLND l;
-
-              l = make_llnd(fi, CONS, $2, $4, SMNULL);
-	      $$ = make_llnd(fi, PAREN_OP, l, LLNULL, SMNULL);}
-       */
-            { if($7->variant==LENGTH_OP && $3->variant==$7->variant)
-                $7->variant=KIND_OP;
-                $$ = make_llnd(fi, CONS, $3, $7, SMNULL); 
-            }             
-	;
-
-clause:   expr
-	    { if(vartype->variant == T_STRING)
-                $$ = make_llnd(fi,LENGTH_OP,$1,LLNULL,SMNULL);
-              else
-                $$ = make_llnd(fi,KIND_OP,$1,LLNULL,SMNULL);
-            }
-	| ASTER
-	    { PTR_LLND l;
-	      l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	      l->entry.string_val = (char *)"*";
-              $$ = make_llnd(fi,LENGTH_OP,l,LLNULL,SMNULL);
-            }
-	| nameeq expr
-	    { /* $$ = make_llnd(fi, SPEC_PAIR, $2, LLNULL, SMNULL); */
-	     char *q;
-             q = $1->entry.string_val;
-  	     if (strcmp(q, "len") == 0)
-               $$ = make_llnd(fi,LENGTH_OP,$2,LLNULL,SMNULL);
-             else
-                $$ = make_llnd(fi,KIND_OP,$2,LLNULL,SMNULL);              
-            }
-        | nameeq ASTER
-	    { PTR_LLND l;
-	      l = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	      l->entry.string_val = (char *)"*";
-              $$ = make_llnd(fi,LENGTH_OP,l,LLNULL,SMNULL);
-            }
-	;
-
-end_ioctl:
-          {endioctl();}
-         ;
-
-/*
-int_nameeq_on:
-	    { intonly = inioctl = YES; }
-	;
-
-int_nameeq_off:
-	    { intonly = inioctl = NO; }
-	;
-*/
-initial_value: 
-	    { $$ = LLNULL; }
-	| EQUAL expr
-	    { $$ = $2; }
-
-        | POINT_TO expr
-            { $$ = make_llnd(fi, POINTST_OP, LLNULL, $2, SMNULL); }
-	;
-
-dimension: DIMENSION  opt_double_colon  in_dcl   name dims 
-	    { PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! $5) {
-		err("No dimensions in DIMENSION statement", 42);
-	      }
-              if(statement_kind == 1) /*DVM-directive*/
-                err("No shape specification", 65);                
-	      s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	      s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $5;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,DIM_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| dimension COMMA name dims 
-           {  PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! $4) {
-		err("No dimensions in DIMENSION statement", 42);
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	      s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-allocatable: ALLOCATABLE in_dcl opt_double_colon var
-                   /* ALLOCATABLE in_dcl opt_double_colon name dims lengspec*/
-	    {/* PTR_SYMB s;*/
-	      PTR_LLND r;
-
-	         /*if(!$5) {
-		   err("No dimensions in ALLOCATABLE statement",305);		
-	           }
-	          s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	          s->attr = s->attr | ALLOCATABLE_BIT;
-	          q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	          s->type->entry.ar_decl.ranges = $5;
-                  r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                */
-              $4->entry.Template.symbol->attr = $4->entry.Template.symbol->attr | ALLOCATABLE_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, ALLOCATABLE_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| allocatable COMMA var
-                /*allocatable COMMA name dims lengspec */
-           {  /*PTR_SYMB s;*/
-	      PTR_LLND r;
-
-	        /*  if(! $4) {
-		      err("No dimensions in ALLOCATABLE statement",305);
-		
-	            }
-	           s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	           s->attr = s->attr | ALLOCATABLE_BIT;
-	           q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	           s->type->entry.ar_decl.ranges = $4;
-	           r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                */
-              $3->entry.Template.symbol->attr = $3->entry.Template.symbol->attr | ALLOCATABLE_BIT;
-              r = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-pointer: POINTER in_dcl opt_double_colon var
-	    { PTR_SYMB s;
-	      PTR_LLND  r;
-           
-	          /*  if(! $5) {
-		      err("No dimensions in POINTER statement",306);	    
-	              } 
-	             s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	             s->attr = s->attr | POINTER_BIT;
-	             q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	             s->type->entry.ar_decl.ranges = $5;
-                   */
-
-                  /*s = make_pointer( $4->entry.Template.symbol->parent, TYNULL, LOCAL);*/ /*17.02.03*/
-                 /*$4->entry.Template.symbol->attr = $4->entry.Template.symbol->attr | POINTER_BIT;*/
-              s = $4->entry.Template.symbol; /*17.02.03*/
-              s->attr = s->attr | POINTER_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, POINTER_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| pointer COMMA var
-           {  PTR_SYMB s;
-	      PTR_LLND r;
-
-     	        /*  if(! $4) {
-	        	err("No dimensions in POINTER statement",306);
-	            }
-	           s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	           s->attr = s->attr | POINTER_BIT;
-	           q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	           s->type->entry.ar_decl.ranges = $4;
-                */
-
-                /*s = make_pointer( $3->entry.Template.symbol->parent, TYNULL, LOCAL);*/ /*17.02.03*/
-                /*$3->entry.Template.symbol->attr = $3->entry.Template.symbol->attr | POINTER_BIT;*/
-              s = $3->entry.Template.symbol; /*17.02.03*/
-              s->attr = s->attr | POINTER_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-target: TARGET in_dcl opt_double_colon var
-	    {/* PTR_SYMB s;*/
-	      PTR_LLND r;
-
-
-	     /* if(! $5) {
-		err("No dimensions in TARGET statement",307);
-	      }
-	      s = make_array($4, TYNULL, $5, ndim, LOCAL);
-	      s->attr = s->attr | TARGET_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $5, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $5;
-             */
-              $4->entry.Template.symbol->attr = $4->entry.Template.symbol->attr | TARGET_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi, TARGET_STMT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| target COMMA var
-           {  /*PTR_SYMB s;*/
-	      PTR_LLND r;
-
-	     /* if(! $4) {
-		err("No dimensions in TARGET statement",307);
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-	      s->attr = s->attr | TARGET_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-              */
-              $3->entry.Template.symbol->attr = $3->entry.Template.symbol->attr | TARGET_BIT;
-	      r = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-common:	  COMMON in_dcl var
-	    { PTR_LLND p, q;
-
-              p = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      q = make_llnd(fi,COMM_LIST, p, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,COMM_STAT, SMNULL, q, LLNULL, LLNULL);
-	    }
-	| COMMON in_dcl comblock var
-	    { PTR_LLND p, q;
-
-              p = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      q = make_llnd(fi,COMM_LIST, p, LLNULL, $3);
-	      $$ = get_bfnd(fi,COMM_STAT, SMNULL, q, LLNULL, LLNULL);
-	    }
-	| common opt_comma comblock opt_comma var
-	    { PTR_LLND p, q;
-
-              p = make_llnd(fi,EXPR_LIST, $5, LLNULL, SMNULL);
-	      q = make_llnd(fi,COMM_LIST, p, LLNULL, $3);
-	      add_to_lowList(q, $1->entry.Template.ll_ptr1);
-	    }
-	| common COMMA var
-	    { PTR_LLND p, r;
-
-              p = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      /*q = make_llnd(fi,COMM_LIST, p, LLNULL, SMNULL);*/
-	      for (r = $1->entry.Template.ll_ptr1;
-		   r->entry.list.next;
-		   r = r->entry.list.next);
-	      add_to_lowLevelList(p, r->entry.Template.ll_ptr1);
-	    }
-	;
-
-
-namelist:  NAMELIST in_dcl namelist_group ident
-	    { PTR_LLND q, r;
-
-              q = make_llnd(fi,EXPR_LIST, $4, LLNULL, SMNULL);
-	      r = make_llnd(fi,NAMELIST_LIST, q, LLNULL, $3);
-	      $$ = get_bfnd(fi,NAMELIST_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| namelist opt_comma namelist_group opt_comma ident
-	    { PTR_LLND q, r;
-
-              q = make_llnd(fi,EXPR_LIST, $5, LLNULL, SMNULL);
-	      r = make_llnd(fi,NAMELIST_LIST, q, LLNULL, $3);
-	      add_to_lowList(r, $1->entry.Template.ll_ptr1);
-	    }
-	| namelist COMMA ident
-	    { PTR_LLND q, r;
-
-              q = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      for (r = $1->entry.Template.ll_ptr1;
-		   r->entry.list.next;
-		   r = r->entry.list.next);
-	      add_to_lowLevelList(q, r->entry.Template.ll_ptr1);
-	    }
-	;
-
-namelist_group: SLASH name SLASH
-	    { $$ =  make_local_entity($2, NAMELIST_NAME,global_default,LOCAL); }
-	;
-
-comblock: DSLASH
-	    { $$ = NULL; /*make_common(look_up_sym("*"));*/ }
-	| SLASH name SLASH
-	    { $$ = make_common($2); }
-	;
-
-
-var:	  name dims
-          {  PTR_SYMB s;
-	
-	      if($2) {
-		s = make_array($1, TYNULL, $2, ndim, LOCAL);
-                s->attr = s->attr | DIMENSION_BIT;
-		s->type->entry.ar_decl.ranges = $2;
-		$$ = make_llnd(fi,ARRAY_REF, $2, LLNULL, s);
-	      }
-	      else {
-		s = make_scalar($1, TYNULL, LOCAL);	
-		$$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-	      }
-
-          }
-            
-	;
-
-external: EXTERNAL in_dcl  opt_double_colon  name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_external($4, TYNULL);
-	      s->attr = s->attr | EXTERNAL_BIT;
-              q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      p = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,EXTERN_STAT, SMNULL, p, LLNULL, LLNULL);
-	    }
-
-	| external COMMA name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_external($3, TYNULL);
-	      s->attr = s->attr | EXTERNAL_BIT;
-              p = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, $1->entry.Template.ll_ptr1);
-	    }
-	;
-
-intrinsic: INTRINSIC in_dcl  opt_double_colon  name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_intrinsic($4, TYNULL); /*make_function($3, TYNULL, NO);*/
-	      s->attr = s->attr | INTRINSIC_BIT;
-              q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      p = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,INTRIN_STAT, SMNULL, p,
-			     LLNULL, LLNULL);
-	    }
-
-	| intrinsic COMMA name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_intrinsic($3, TYNULL); /* make_function($3, TYNULL, NO);*/
-	      s->attr = s->attr | INTRINSIC_BIT;
-              p = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, $1->entry.Template.ll_ptr1);
-	    }
-
-	;
-
-
-equivalence:  EQUIVALENCE in_dcl equivset
-	    {
-	      $$ = get_bfnd(fi,EQUI_STAT, SMNULL, $3,
-			     LLNULL, LLNULL);
-	    }
-
-	| equivalence COMMA equivset
-	    { 
-	      add_to_lowLevelList($3, $1->entry.Template.ll_ptr1);
-	    }
-
-	;
-
-equivset: LEFTPAR equivlist RIGHTPAR
-	  {
-	      $$ = make_llnd(fi,EQUI_LIST, $2, LLNULL, SMNULL);
-           }
-	;
-
-equivlist: equi_object COMMA equi_object
-           { PTR_LLND p;
-	      p = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      $$ = make_llnd(fi,EXPR_LIST, $1, p, SMNULL);
-	    }
-
-	| equivlist COMMA equi_object
-	    { PTR_LLND p;
-
-	      p = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(p, $1);
-	    }
-	;
-
-equi_object: name
-        {  PTR_SYMB s;
-           s=make_scalar($1,TYNULL,LOCAL);
-           $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-           s->attr = s->attr | EQUIVALENCE_BIT;
-            /*$$=$1; $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT; */
-        }
-           | name LEFTPAR subscript_list RIGHTPAR
-        {  PTR_SYMB s;
-           s=make_array($1,TYNULL,LLNULL,0,LOCAL);
-           $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, s);
-           s->attr = s->attr | EQUIVALENCE_BIT;
-            /*$$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT; */
-        }
-
-     /*   { $$ = $1;
-         $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | EQUIVALENCE_BIT;
-	 $$->variant == ARRAY_REF; 
-         $$->entry.Template.ll_ptr1 = $3;
-        }
-      */
-        ;
-
-           | asubstring
-           ;
-
-data:	  data1
-            { PTR_LLND p;
-              data_stat = NO;
-	      p = make_llnd(fi,STMT_STR, LLNULL, LLNULL,
-			    SMNULL);
-              p->entry.string_val = copys(stmtbuf);
-	      $$ = get_bfnd(fi,DATA_DECL, SMNULL, p, LLNULL, LLNULL);
-            }
-
-data1:	  DATA inside data_in datapair
-
-	| data1 opt_comma datapair
-	;
-
-data_in:
-        {data_stat = YES;}
-       ;
-
-in_data:  
-	    {
-	      if (parstate == OUTSIDE)
-	         { PTR_BFND p;
-
-		   p = get_bfnd(fi,PROG_HEDR,
-                                make_program(look_up_sym("_MAIN")),
-                                LLNULL, LLNULL, LLNULL);
-		   set_blobs(p, global_bfnd, NEW_GROUP1);
-	           add_scope_level(p, NO);
-		   position = IN_PROC; 
-	  	   /*parstate = INDCL;*/
-                 }
-	      if(parstate < INDCL)
-		{
-		  /* enddcl();*/
-		  parstate = INDCL;
-		}
-	    }
-	;
-
-datapair: datalvals SLASH datarvals SLASH
-
-	;
-
-datalvals: datalval
-
-	| datalvals COMMA datalval
-
-	;
-
-datarvals: datarval
-	| datarvals COMMA datarval
-	;
-
-datalval: data_null dataname
-
-	| data_null dataname datasubs
-
-	| data_null dataname datarange
-
-	| data_null dataname datasubs datarange
-
-	| data_null dataimplieddo
-	;
-data_null: 
-           {;}
-         ;
-
-d_name: name
-	    { $$= make_scalar($1, TYNULL, LOCAL);}
-      ;
-
-dataname: name
-	    { $$= make_scalar($1, TYNULL, LOCAL); 
-              $$->attr = $$->attr | DATA_BIT; 
-            }
-	;
-
-datasubs: LEFTPAR iconexprlist RIGHTPAR
-            { $$ = make_llnd(fi, DATA_SUBS, $2, LLNULL, SMNULL); }
-	;
-
-datarange: LEFTPAR opticonexpr COLON opticonexpr RIGHTPAR
-            { $$ = make_llnd(fi, DATA_RANGE, $2, $4, SMNULL); }
-	;
-
-iconexprlist: iconexpr
-	    { $$ = $1; }
-	| iconexprlist COMMA iconexpr
-            { $$ = add_to_lowLevelList($3, $1); }
-	;
-
-opticonexpr:
-            { $$ = LLNULL; }
-	| iconexpr
-	    { $$ = $1; }
-	;
-
-dataimplieddo:	LEFTPAR dlist COMMA d_name EQUAL iconexprlist RIGHTPAR
-            {$$= make_llnd(fi, DATA_IMPL_DO, $2, $6, $4); }
-	;
-
-dlist:	  dataelt
-	    { $$ = $1; }
-	| dlist COMMA dataelt
-            { $$ = add_to_lowLevelList($3, $1); }
-	;
-
-dataelt:  dataname datasubs
-            { $$ = make_llnd(fi, DATA_ELT, $2, LLNULL, $1); }
-	| dataname datarange
-            { $$ = make_llnd(fi, DATA_ELT, $2, LLNULL, $1); }
-	| dataname datasubs datarange
-	    {
-              $2->entry.Template.ll_ptr2 = $3;
-              $$ = make_llnd(fi, DATA_ELT, $2, LLNULL, $1); 
-            }
-	| dataimplieddo
-	    { $$ = make_llnd(fi, DATA_ELT, $1, LLNULL, SMNULL); }
-	;
-
-datarval: datavalue
-
-	| data_null d_name ASTER datavalue
-
-	| unsignedint ASTER datavalue
-	;
-
-datavalue: data_null d_name
-
-	| int_const
-	| real_const
-	| complex_const_data
-	| TTRUE 
-	| TTRUE  UNDER kind
-	| FFALSE
-	| FFALSE UNDER kind 
-	| CHAR_CONSTANT
-/*	| STRING	*/
-/*	| bit_const	*/
-        | BOZ_const
-        | data_null ident LEFTPAR in_ioctl  funarglist RIGHTPAR
-           {if($2->entry.Template.symbol->variant != TYPE_NAME)
-               errstr("Undefined type %s",$2->entry.Template.symbol->ident,319); 
-           }
-	;
-
-BOZ_const: BOZ_CONSTANT
-         ;
-
-int_const: unsignedint
-	| PLUS unsignedint
-
-	| MINUS unsignedint
-				
-	;
-
-unsignedint: INT_CONSTANT
-           | INT_CONSTANT UNDER kind
-	   ;
-
-real_const: unsignedreal
-	  | PLUS unsignedreal
-
-	  | MINUS unsignedreal
-
-	  ;
-
-unsignedreal: REAL_CONSTANT
-            | REAL_CONSTANT UNDER kind 
-	    | DP_CONSTANT
-	    | DP_CONSTANT   UNDER kind 
-	    ;
-complex_const_data:	LEFTPAR complex_part COMMA complex_part RIGHTPAR
-                  ;
-
-complex_part: real_const
-            | int_const
-            ;
-
-/*
-bit_const:HEX_CONSTANT	{ $$ = mkbitcon(4, yyleng, yytext); }
-	| OCT_CONSTANT	{ $$ = mkbitcon(3, yyleng, yytext); }
-	| BITCON	{ $$ = mkbitcon(1, yyleng, yytext); }
-	;
-*/
-iconexpr: iconterm
-	    { $$ = make_llnd(fi,ICON_EXPR, $1, LLNULL, SMNULL); }
-	| PLUS iconterm
-            {
-              PTR_LLND p;
-
-              p = intrinsic_op_node("+", UNARY_ADD_OP, $2, LLNULL);
-              $$ = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-	| MINUS iconterm
-            {
-              PTR_LLND p;
- 
-              p = intrinsic_op_node("-", MINUS_OP, $2, LLNULL);
-              $$ = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-	| iconexpr PLUS iconterm
-            {
-              PTR_LLND p;
- 
-              p = intrinsic_op_node("+", ADD_OP, $1, $3);
-              $$ = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-	| iconexpr MINUS iconterm
-            {
-              PTR_LLND p;
- 
-              p = intrinsic_op_node("-", SUBT_OP, $1, $3);
-              $$ = make_llnd(fi,ICON_EXPR, p, LLNULL, SMNULL);
-            }
-	;
-
-iconterm: iconfactor
-            { $$ = $1; }
-	| iconterm ASTER iconfactor
-            { $$ = intrinsic_op_node("*", MULT_OP, $1, $3); }
-	| iconterm SLASH iconfactor
-            { $$ = intrinsic_op_node("/", DIV_OP, $1, $3); }
-	;
-
-iconfactor: iconprimary
-	    { $$ = $1; }
-	| iconprimary DASTER iconfactor
-            { $$ = intrinsic_op_node("**", EXP_OP, $1, $3); }
-	;
-
-iconprimary: INT_CONSTANT
-            {
-              PTR_LLND p;
-
-              p = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-              p->entry.ival = atoi(yytext);
-              p->type = global_int;
-              $$ = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-            }
-	| d_name
-            {
-              PTR_LLND p;
- 
-              p = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $1);
-              $$ = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-            }
-	| LEFTPAR iconexpr RIGHTPAR
-            {
-              $$ = make_llnd(fi,EXPR_LIST, $2, LLNULL, SMNULL);
-            }
-	;
-
-
-savelist: saveitem
-         { $$ = make_llnd(fi,EXPR_LIST, $1, LLNULL, SMNULL); }
-	| savelist COMMA saveitem
-         { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-saveitem: var
-	   { $$ = $1;
-             $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | SAVE_BIT;
-           }
-	| comblock
-          { $$ = make_llnd(fi,COMM_LIST, LLNULL, LLNULL, $1); 
-            $$->entry.Template.symbol->attr = $$->entry.Template.symbol->attr | SAVE_BIT;
-          }
-	;
-
-use_name_list: use_key_word  use_name  no_use_key_word
-            { $$ = set_ll_list($2, LLNULL, EXPR_LIST); }
-	| use_name_list COMMA use_key_word  use_name  no_use_key_word 
-	    { $$ = set_ll_list($1, $4, EXPR_LIST); }
-	;
-
-use_key_word:
-            { as_op_kwd_ = YES; }
-            ;
-
-no_use_key_word:
-            { as_op_kwd_ = NO; }
-	     ;	     
-
-
-use_name: name
-	   { 
-             PTR_SYMB s; 
-             s = make_scalar($1, TYNULL, LOCAL);	
-	     s->attr = s->attr | type_opt;
-	     $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-            }
-	|  OPERATOR LEFTPAR operator RIGHTPAR 
-	    { PTR_SYMB s;
-	      s = make_function($3, global_default, LOCAL);
-	      s->variant = INTERFACE_NAME;
-              s->attr = s->attr | type_opt;
-              $$ = make_llnd(fi,OPERATOR_OP, LLNULL, LLNULL, s);
-	    }
-        | ASSIGNMENT  LEFTPAR EQUAL RIGHTPAR
-	    { PTR_SYMB s;
-	      s = make_procedure(look_up_sym("="), LOCAL);
-	      s->variant = INTERFACE_NAME;
-              s->attr = s->attr | type_opt;
-              $$ = make_llnd(fi,ASSIGNMENT_OP, LLNULL, LLNULL, s);
-	    }
-         ;
-
-
-paramlist:paramitem
-            { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| paramlist COMMA paramitem
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-paramitem: name EQUAL expr
-	    { PTR_SYMB p;
-
-                /* The check if name and expr have compatible types has
-                   not been done yet. */ 
-		p = make_constant($1, TYNULL);
- 	        p->attr = p->attr | PARAMETER_BIT;
-                p->entry.const_value = $3;
-		$$ = make_llnd(fi,CONST_REF, LLNULL, LLNULL, p);
-	    }
-	;
-
-module_proc_stmt: MODULE_PROCEDURE  proc_name_list
-	    { $$ = get_bfnd(fi, MODULE_PROC_STMT, SMNULL, $2, LLNULL, LLNULL); }
-
-proc_name_list: name
-	    { PTR_SYMB s;
- 	      PTR_LLND q;
-
-	      s = make_function($1, TYNULL, LOCAL);
-	      s->variant = ROUTINE_NAME;
-              q = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      $$ = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	    }
-	| proc_name_list COMMA name
-	    { PTR_LLND p, q;
-              PTR_SYMB s;
-
-	      s = make_function($3, TYNULL, LOCAL);
-	      s->variant = ROUTINE_NAME;
-              p = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      q = make_llnd(fi,EXPR_LIST, p, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, $1);
-	    }
-	;
-
-
-use_stat: USE in_dcl module_name 
-	    { $$ = get_bfnd(fi, USE_STMT, $3, LLNULL, LLNULL, LLNULL);
-              /*add_scope_level($3->entry.Template.func_hedr, YES);*/ /*17.06.01*/
-              copy_module_scope($3,LLNULL); /*17.03.03*/
-              colon_flag = NO;
-            }
-	| USE in_dcl module_name COMMA keyword_if_colon_follow rename_list
-	    { $$ = get_bfnd(fi, USE_STMT, $3, $6, LLNULL, LLNULL); 
-              /*add_scope_level(module_scope, YES); *//* 17.06.01*/
-              copy_module_scope($3,$6); /*17.03.03 */
-              colon_flag = NO;
-            }
-	| USE in_dcl module_name COMMA keyword_if_colon_follow ONLY 
-	    { PTR_LLND l;
-
-	      l = make_llnd(fi, ONLY_NODE, LLNULL, LLNULL, SMNULL);
-              $$ = get_bfnd(fi, USE_STMT, $3, l, LLNULL, LLNULL);
-            }
-	| USE in_dcl module_name COMMA keyword_if_colon_follow ONLY only_list
-	    { PTR_LLND l;
-
-	      l = make_llnd(fi, ONLY_NODE, $7, LLNULL, SMNULL);
-              $$ = get_bfnd(fi, USE_STMT, $3, l, LLNULL, LLNULL);
-            }
-	;
-
-module_name: name
-            {
-              if ($1->id_attr == SMNULL)
-	         warn1("Unknown module %s", $1->ident,308);
-              $$ = make_global_entity($1, MODULE_NAME, global_default, NO);
-	      module_scope = $$->entry.Template.func_hedr;
-           
-            }
-        ;
-
-only_list: only_name
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| only_list COMMA only_name
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-only_name: rename_name
-            {  $$ = $1; }
-         | name
-	    {  PTR_HASH oldhash,copyhash;
-	       PTR_SYMB oldsym, newsym;
-	       PTR_LLND m;
-
-	       oldhash = just_look_up_sym_in_scope(module_scope, $1->ident);
-	       if (oldhash == HSNULL) {
-                  errstr("Unknown identifier %s.", $1->ident,309);
-	          $$= LLNULL;
-	       }
-	       else {
-                 oldsym = oldhash->id_attr;
-                 copyhash=just_look_up_sym_in_scope(cur_scope(), $1->ident);
-	         if( copyhash && copyhash->id_attr && copyhash->id_attr->entry.Template.tag==module_scope->id)
-                 {
-                   newsym = copyhash->id_attr;
-                   newsym->entry.Template.tag = 0;
-                 }
-                 else
-                 {
-	           newsym = make_local_entity($1, oldsym->variant, oldsym->type,LOCAL);
-	           /* copies data in entry.Template structure and attr */
-	           copy_sym_data(oldsym, newsym);	         
-	             /*newsym->entry.Template.base_name = oldsym;*//*19.03.03*/
-                 }
-	  	/* l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, oldsym);*/
-		 m = make_llnd(fi, VAR_REF, LLNULL, LLNULL, newsym);
-		 $$ = make_llnd(fi, RENAME_NODE, m, LLNULL, oldsym);
- 	      }
-            }
-	;
-
-
-rename_list: rename_name
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| rename_list COMMA rename_name
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-rename_name: name POINT_TO name
-	    {  PTR_HASH oldhash,copyhash;
-	       PTR_SYMB oldsym, newsym;
-	       PTR_LLND l, m;
-
-	       oldhash = just_look_up_sym_in_scope(module_scope, $3->ident);
-	       if (oldhash == HSNULL) {
-                  errstr("Unknown identifier %s", $3->ident,309);
-	          $$= LLNULL;
-	       }
-	       else {
-                 oldsym = oldhash->id_attr;
-                 copyhash = just_look_up_sym_in_scope(cur_scope(), $3->ident);
-	         if(copyhash && copyhash->id_attr && copyhash->id_attr->entry.Template.tag==module_scope->id)
-                 {
-                    delete_symbol(copyhash->id_attr);
-                    copyhash->id_attr = SMNULL;
-                 }
-                   newsym = make_local_entity($1, oldsym->variant, oldsym->type, LOCAL);
-	           /* copies data in entry.Template structure and attr */
-	           copy_sym_data(oldsym, newsym);	
-                         
-	           /*newsym->entry.Template.base_name = oldsym;*//*19.03.03*/
-	  	 l  = make_llnd(fi, VAR_REF, LLNULL, LLNULL, oldsym);
-		 m  = make_llnd(fi, VAR_REF, LLNULL, LLNULL, newsym);
-		 $$ = make_llnd(fi, RENAME_NODE, m, l, SMNULL);
- 	      }
-            }
-            ;
-	
- /*
-in_param: inside
-	    {
-	      if(parstate > INDCL)
-		dclerr("parameter statement out of order", SMNULL);
-	    }
-	;
-*/
-dims:
-	    { ndim = 0;	explicit_shape = 1; $$ = LLNULL; }
-	| LEFTPAR dimlist RIGHTPAR
-	    { $$ = $2; }
-	;
-
-dimlist:   { ndim = 0; explicit_shape = 1;}   dim
-	    {
-	      $$ = make_llnd(fi,EXPR_LIST, $2, LLNULL, SMNULL);
-	      $$->type = global_default;
-	    }
-	| dimlist COMMA dim
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-dim:	  ubound
-	    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		$$ = $1;
-	      ++ndim;
-	    }
-	| COLON
-	    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		$$ = make_llnd(fi, DDOT, LLNULL, LLNULL, SMNULL);
-	      ++ndim;
-              explicit_shape = 0;
-	    } 
-	| expr COLON
-	    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		$$ = make_llnd(fi,DDOT, $1, LLNULL, SMNULL);
-	      ++ndim;
-              explicit_shape = 0;
-	    }
-	| expr COLON ubound
-	    {
-	      if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		$$ = make_llnd(fi,DDOT, $1, $3, SMNULL);
-	      ++ndim;
-	    }
-	;
-
-ubound:	  ASTER
-	    {
-	      $$ = make_llnd(fi,STAR_RANGE, LLNULL, LLNULL, SMNULL);
-	      $$->type = global_default;
-              explicit_shape = 0;
-	    }
-	| expr
-	;
-
-labellist: label
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| labellist COMMA label
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-label:	  INT_CONSTANT
-	    {PTR_LABEL p;
-	     p = make_label_node(fi,convci(yyleng, yytext));
-	     p->scope = cur_scope();
-	     $$ = make_llnd_label(fi,LABEL_REF, p);
-	  }
-	;
-
-implicit: IMPLICIT in_dcl implist
-	   { /*PTR_LLND l;*/
-
-          /*   l = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);*/
-             $$ = get_bfnd(fi,IMPL_DECL, SMNULL, $3, LLNULL, LLNULL);
-             redefine_func_arg_type();
-           }
-/*
-	| implicit COMMA implist
-	  { PTR_LLND l;
-
-            l = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);
-            add_to_lowLevelList(l, $1->entry.Template.ll_ptr1);
-          }
- */
-	| IMPLICITNONE
-	  { /*undeftype = YES;
-	    setimpl(TYNULL, (int)'a', (int)'z'); FB COMMENTED---> NOT QUITE RIGHT BUT AVOID PB WITH COMMON*/
-	    $$ = get_bfnd(fi,IMPL_DECL, SMNULL, LLNULL, LLNULL, LLNULL);
-	  }
-	;
-
-implist: impitem
-         { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-       | implist COMMA impitem
-         { $$ = set_ll_list($1, $3, EXPR_LIST); }
-       ;
-
-impitem:  imptype LEFTPAR letgroups RIGHTPAR
-          { 
-
-            $$ = make_llnd(fi, IMPL_TYPE, $3, LLNULL, SMNULL);
-            $$->type = vartype;
-          }
-/*	| imptype
-	 {
-           $$ = make_llnd(fi, IMPL_TYPE, LLNULL, LLNULL, SMNULL);
-           $$->type = vartype;
-         }
-*/ /*30.10.03*/
-	; 
-
-/* The draft specification leads to big trouble. Check that up. */
-/* For the time being. */
-imptype:   { implkwd = YES; } type_implicit
-	    { vartype = $2; }
-	;
-
-type_implicit: STAT typename
-               { $$ = $2; }
-             | type
-               { $$ = $1;}
-             ;
-
-/* Not used. 
-in_implicit: inside
-	    {
-	      if (parstate >= INDCL)
-		dclerr("implicit statement out of order", SMNULL);
-	    }
-	;
-*/
-letgroups: letgroup
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| letgroups COMMA letgroup
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-letgroup:  letter
-	    {
-	      setimpl(vartype, (int)$1, (int)$1);
-	      $$ = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.cval = $1;
-	    }
-	| letter MINUS letter
-	    { PTR_LLND p,q;
-	      
-	      setimpl(vartype, (int)$1, (int)$3);
-	      p = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
-	      p->entry.cval = $1;
-	      q = make_llnd(fi,CHAR_VAL, LLNULL, LLNULL, SMNULL);
-	      q->entry.cval = $3;
-	      $$= make_llnd(fi,DDOT, p, q, SMNULL);
-	    }
-	;
-
-letter:	 IDENTIFIER
-	    {
-	      if(yyleng!=1 || yytext[0]<'a' || yytext[0]>'z')
-		{
-		  err("IMPLICIT item must be single letter", 37);
-		  $$ = '\0';
-		}
-	      else $$ = yytext[0];
-	    }
-	;
-
-inside:
-	    {
-	      if (parstate == OUTSIDE)
-	         { PTR_BFND p;
-
-		   p = get_bfnd(fi,PROG_HEDR,
-                                make_program(look_up_sym("_MAIN")),
-                                LLNULL, LLNULL, LLNULL);
-		   set_blobs(p, global_bfnd, NEW_GROUP1);
-	           add_scope_level(p, NO);
-		   position = IN_PROC; 
-	  	   parstate = INSIDE;
-                 }
-	  
-	    }
-	;
-
-in_dcl:
-        { switch(parstate)
-		{
-                case OUTSIDE:  
-			{ PTR_BFND p;
-
-			  p = get_bfnd(fi,PROG_HEDR,
-                                       make_program(look_up_sym("_MAIN")),
-                                       LLNULL, LLNULL, LLNULL);
-			  set_blobs(p, global_bfnd, NEW_GROUP1);
-			  add_scope_level(p, NO);
-			  position = IN_PROC; 
-	  		  parstate = INDCL; }
-	                  break;
-                case INSIDE:    parstate = INDCL;
-                case INDCL:     break;
-
-                case INDATA:
-                         /*  err(
-                     "Statement order error: declaration after DATA or function statement", 
-                                 29);*/
-                              break;
-
-                default:
-                           err("Declaration among executables", 30);
-                }
-        }
-
-	;
-
-opt_double_colon: 
-	| COLON COLON
-        ;         
-
-/*
- * Grammar for expressions
- */
-
-funarglist:
-	    { $$ = LLNULL; endioctl(); }
-	| funargs 
-            { $$ = $1;  endioctl();}
-	;
-
-funarg:  expr
-	    { $$ = $1; }
-	| triplet
-	    { $$ = $1; }
-	| nameeq expr
-	    { PTR_LLND l;
-	      l = make_llnd(fi, KEYWORD_ARG, $1, $2, SMNULL);
-	      l->type = $2->type;
-              $$ = l; 
-	    }
-
-        ;
-
-
-
-funargs:  in_ioctl  funarg
-            { $$ = set_ll_list($2, LLNULL, EXPR_LIST);
-              endioctl(); 
-            }
-        | funargs COMMA  in_ioctl  funarg
-	    { $$ = set_ll_list($1, $4, EXPR_LIST);
-              endioctl(); 
-            }
-        ;
-
-subscript_list: expr
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-        | subscript_list COMMA expr
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-        ;
-
-expr:	  uexpr
-            { $$ = $1; }
-	| LEFTPAR expr RIGHTPAR
-	    { $$ = $2; }
-	| complex_const
-	    { $$ = $1; }
-	;
-
-uexpr:	  lhs
-            { $$ = $1; }
-	| simple_const
-            { $$ = $1; }
-/*        | string_constant opt_substring
-            { $$ = make_llnd(fi, ARRAY_OP, $1, $2, SMNULL); }
-*/	| vec
-            { $$ = $1; }
-	| expr PLUS expr   %prec PLUS
-	    { $$ = intrinsic_op_node("+", ADD_OP, $1, $3); }
-	| expr MINUS expr   %prec PLUS
-	    { $$ = intrinsic_op_node("-", SUBT_OP, $1, $3); }
-	| expr ASTER expr
-	    { $$ = intrinsic_op_node("*", MULT_OP, $1, $3); }
-	| expr SLASH expr
-	    { $$ = intrinsic_op_node("/", DIV_OP, $1, $3); }
-	| expr DASTER expr
-	    { $$ = intrinsic_op_node("**", EXP_OP, $1, $3); }      
-        | defined_op expr %prec UNARY_OP
-	      { $$ = defined_op_node($1, $2, LLNULL); }
-	| PLUS expr  %prec ASTER
-	    { $$ = intrinsic_op_node("+", UNARY_ADD_OP, $2, LLNULL); }
-	| MINUS expr  %prec ASTER
-	    { $$ = intrinsic_op_node("-", MINUS_OP, $2, LLNULL); }
-	| expr EQ expr  %prec EQ
-	    { $$ = intrinsic_op_node(".eq.", EQ_OP, $1, $3); }
-	| expr GT expr  %prec EQ
-	    { $$ = intrinsic_op_node(".gt.", GT_OP, $1, $3); }
-	| expr LT expr  %prec EQ
-	    { $$ = intrinsic_op_node(".lt.", LT_OP, $1, $3); }
-	| expr GE expr  %prec EQ
-	    { $$ = intrinsic_op_node(".ge.", GTEQL_OP, $1, $3); }
-	| expr LE expr  %prec EQ
-	    { $$ = intrinsic_op_node(".ge.", LTEQL_OP, $1, $3); }
-	| expr NE expr  %prec EQ
-	    { $$ = intrinsic_op_node(".ne.", NOTEQL_OP, $1, $3); }
-	| expr EQV expr
-	    { $$ = intrinsic_op_node(".eqv.", EQV_OP, $1, $3); }
-	| expr NEQV expr
-	    { $$ = intrinsic_op_node(".neqv.", NEQV_OP, $1, $3); }
-	| expr XOR expr
-	    { $$ = intrinsic_op_node(".xor.", XOR_OP, $1, $3); }
-	| expr OR expr
-	    { $$ = intrinsic_op_node(".or.", OR_OP, $1, $3); }
-	| expr AND expr
-	    { $$ = intrinsic_op_node(".and.", AND_OP, $1, $3); }
-	| NOT expr
-	    { $$ = intrinsic_op_node(".not.", NOT_OP, $2, LLNULL); }
-	| expr DSLASH expr
-	    { $$ = intrinsic_op_node("//", CONCAT_OP, $1, $3); }
-	| expr defined_op expr %prec BINARY_OP
-	    { $$ = defined_op_node($2, $1, $3); }
-        ;
-
-addop:	  PLUS	{ $$ = ADD_OP; }
-	| MINUS	{ $$ = SUBT_OP; }
-	;
-/*
-relop:	  EQ	{ $$ = EQ_OP; }
-	| GT	{ $$ = GT_OP; }
-	| LT	{ $$ = LT_OP; }
-	| GE	{ $$ = GTEQL_OP; }
-	| LE	{ $$ = LTEQL_OP; }
-	| NE	{ $$ = NOTEQL_OP; }
-	;
-*/
-ident: name
-	    { PTR_SYMB s;
-	      PTR_TYPE t;
-	     /* PTR_LLND l;*/
-
-       	      if (!(s = $1->id_attr))
-              {
-	         s = make_scalar($1, TYNULL, LOCAL);
-	     	 s->decl = SOFT;
-	      } 
-	
-	      switch (s->variant)
-              {
-	      case CONST_NAME:
-		   $$ = make_llnd(fi,CONST_REF,LLNULL,LLNULL, s);
-		   t = s->type;
-	           if ((t != TYNULL) &&
-                       ((t->variant == T_ARRAY) ||  (t->variant == T_STRING) ))
-                                 $$->variant = ARRAY_REF;
-
-                   $$->type = t;
-	           break;
-	      case DEFAULT:   /* if common region with same name has been
-                                 declared. */
-		   s = make_scalar($1, TYNULL, LOCAL);
-	     	   s->decl = SOFT;
-
-	      case VARIABLE_NAME:
-                   $$ = make_llnd(fi,VAR_REF,LLNULL,LLNULL, s);
-	           t = s->type;
-	           if (t != TYNULL) {
-                     if ((t->variant == T_ARRAY) ||  (t->variant == T_STRING) ||
-                         ((t->variant == T_POINTER) && (t->entry.Template.base_type->variant == T_ARRAY) ) )
-                         $$->variant = ARRAY_REF;
-
-/*  	              if (t->variant == T_DERIVED_TYPE)
-                         $$->variant = RECORD_REF; */
-	           }
-                   $$->type = t;
-	           break;
-	      case TYPE_NAME:
-  	           $$ = make_llnd(fi,TYPE_REF,LLNULL,LLNULL, s);
-	           $$->type = s->type;
-	           break;
-	      case INTERFACE_NAME:
-  	           $$ = make_llnd(fi, INTERFACE_REF,LLNULL,LLNULL, s);
-	           $$->type = s->type;
-	           break;
-              case FUNCTION_NAME:
-                   if(isResultVar(s)) {
-                     $$ = make_llnd(fi,VAR_REF,LLNULL,LLNULL, s);
-	             t = s->type;
-	             if (t != TYNULL) {
-                       if ((t->variant == T_ARRAY) ||  (t->variant == T_STRING) ||
-                         ((t->variant == T_POINTER) && (t->entry.Template.base_type->variant == T_ARRAY) ) )
-                         $$->variant = ARRAY_REF;
-	             }
-                     $$->type = t;
-	             break;
-                   }                                        
-	      default:
-  	           $$ = make_llnd(fi,VAR_REF,LLNULL,LLNULL, s);
-	           $$->type = s->type;
-	           break;
-	      }
-             /* if ($$->variant == T_POINTER) {
-	         l = $$;
-	         $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $$->type = l->type->entry.Template.base_type;
-	      }
-              */ /*11.02.03*/
-           } 
-        ;
-
-lhs:      ident
-            { PTR_SYMB  s;
-	      $$ = $1; 
-              s= $$->entry.Template.symbol;
-              if ((($1->variant == VAR_REF) || ($1->variant == ARRAY_REF))  && (s->scope !=cur_scope()))  /*global_bfnd*/
-              {
-	          if(((s->variant == FUNCTION_NAME) && (!isResultVar(s))) || (s->variant == PROCEDURE_NAME) || (s->variant == ROUTINE_NAME))
-                  { s = $$->entry.Template.symbol =  make_scalar(s->parent, TYNULL, LOCAL);
-		    $$->type = s->type;  
-		  }
-              }
-            }
-	| structure_component
-            { $$ = $1; }
-        |  array_ele_substring_func_ref
-            { $$ = $1; }
-	;
-
-array_ele_substring_func_ref:  ident LEFTPAR in_ioctl  funarglist RIGHTPAR
-	    { int num_triplets;
-	      PTR_SYMB s;  /*, sym;*/
-	      /* PTR_LLND l; */
-	      PTR_TYPE tp;
-	      /* l = $1; */
-	      s = $1->entry.Template.symbol;
-            
-	      /* Handle variable to function conversion. */
-	      if (($1->variant == VAR_REF) && 
-	          (((s->variant == VARIABLE_NAME) && (s->type) &&
-                    (s->type->variant != T_ARRAY)) ||
-  	            (s->variant == ROUTINE_NAME))) {
-	        s = $1->entry.Template.symbol =  make_function(s->parent, TYNULL, LOCAL);
-	        $1->variant = FUNC_CALL;
-              }
-	      if (($1->variant == VAR_REF) && (s->variant == FUNCTION_NAME)) { 
-                if(isResultVar(s))
-	          $1->variant = ARRAY_REF;
-                else
-                  $1->variant = FUNC_CALL;
-              }
-	      if (($1->variant == VAR_REF) && (s->variant == PROGRAM_NAME)) {
-                 errstr("The name '%s' is invalid in this context",s->ident,285);
-                 $1->variant = FUNC_CALL;
-              }
-              /* l = $1; */
-	      num_triplets = is_array_section_ref($4);
-	      switch ($1->variant)
-              {
-	      case TYPE_REF:
-                   $1->variant = STRUCTURE_CONSTRUCTOR;                  
-                   $1->entry.Template.ll_ptr1 = $4;
-                   $$ = $1;
-                   $$->type =  lookup_type(s->parent); 
-	          /* $$ = make_llnd(fi, STRUCTURE_CONSTRUCTOR, $1, $4, SMNULL);
-	           $$->type = $1->type;*//*18.02.03*/
-	           break;
-	      case INTERFACE_REF:
-	       /*  sym = resolve_overloading(s, $4);
-	           if (sym != SMNULL)
-	  	   {
-	              l = make_llnd(fi, FUNC_CALL, $4, LLNULL, sym);
-	              l->type = sym->type;
-	              $$ = $1; $$->variant = OVERLOADED_CALL;
-	              $$->entry.Template.ll_ptr1 = l;
-	              $$->type = sym->type;
-	           }
-	           else {
-	             errstr("can't resolve call %s", s->ident,310);
-	           }
-	           break;
-                 */ /*podd 01.02.03*/
-
-                   $1->variant = FUNC_CALL;
-
-	      case FUNC_CALL:
-                   $1->entry.Template.ll_ptr1 = $4;
-                   $$ = $1;
-                   if(s->type) 
-                     $$->type = s->type;
-                   else
-                     $$->type = global_default;
-	           /*late_bind_if_needed($$);*/ /*podd 02.02.23*/
-	           break;
-	      case DEREF_OP:
-              case ARRAY_REF:
-	           /* array element */
-	           if (num_triplets == 0) {
-                       if ($4 == LLNULL) {
-                           s = $1->entry.Template.symbol = make_function(s->parent, TYNULL, LOCAL);
-                           s->entry.func_decl.num_output = 1;
-                           $1->variant = FUNC_CALL;
-                           $$ = $1;
-                       } else if ($1->type->variant == T_STRING) {
-                           PTR_LLND temp = $4;
-                           int num_input = 0;
-
-                           while (temp) {
-                             ++num_input;
-                             temp = temp->entry.Template.ll_ptr2;
-                           }
-                           $1->entry.Template.ll_ptr1 = $4;
-                           s = $1->entry.Template.symbol = make_function(s->parent, TYNULL, LOCAL);
-                           s->entry.func_decl.num_output = 1;
-                           s->entry.func_decl.num_input = num_input;
-                           $1->variant = FUNC_CALL;
-                           $$ = $1;
-                       } else {
-       	                   $1->entry.Template.ll_ptr1 = $4;
-	                   $$ = $1;
-                           $$->type = $1->type->entry.ar_decl.base_type;
-                       }
-                   }
-                   /* substring */
-	           else if ((num_triplets == 1) && 
-                            ($1->type->variant == T_STRING)) {
-    	           /*
-                     $1->entry.Template.ll_ptr1 = $4;
-	             $$ = $1; $$->type = global_string;
-                   */
-	                  $$ = make_llnd(fi, 
-			  ARRAY_OP, LLNULL, LLNULL, SMNULL);
-    	                  $$->entry.Template.ll_ptr1 = $1;
-       	                  $$->entry.Template.ll_ptr2 = $4->entry.Template.ll_ptr1;
-	                  $$->type = global_string;
-                   }           
-                   /* array section */
-                   else {
-    	             $1->entry.Template.ll_ptr1 = $4;
-	             $$ = $1; tp = make_type(fi, T_ARRAY);     /**18.03.17*/
-                     tp->entry.ar_decl.base_type = $1->type->entry.ar_decl.base_type; /**18.03.17 $1->type */
-	             tp->entry.ar_decl.num_dimensions = num_triplets;
-	             $$->type = tp;
-                   }
-	           break;
-	      default:
-                    if($1->entry.Template.symbol)
-                      errstr("Can't subscript %s",$1->entry.Template.symbol->ident, 44);
-                    else
-	              err("Can't subscript",44);
-             }
-             /*if ($$->variant == T_POINTER) {
-	        l = $$;
-	        $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	        $$->type = l->type->entry.Template.base_type;
-	     }
-              */  /*11.02.03*/
-
-	     endioctl(); 
-           }
-        | ident LEFTPAR in_ioctl  funarglist RIGHTPAR substring
-	    { int num_triplets;
-	      PTR_SYMB s;
-	      PTR_LLND l;
-
-	      s = $1->entry.Template.symbol;
-/*              if ($1->type->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-	      if (($1->type->variant != T_ARRAY) ||
-                  ($1->type->entry.ar_decl.base_type->variant != T_STRING)) {
-	         errstr("Can't take substring of %s", s->ident, 45);
-              }
-              else {
-  	        num_triplets = is_array_section_ref($4);
-	           /* array element */
-                if (num_triplets == 0) {
-                   $1->entry.Template.ll_ptr1 = $4;
-                  /* $1->entry.Template.ll_ptr2 = $6;*/
-	          /* $$ = $1;*/
-                   l=$1;
-                   /*$$->type = $1->type->entry.ar_decl.base_type;*/
-                   l->type = global_string;  /**18.03.17* $1->type->entry.ar_decl.base_type;*/
-                }
-                /* array section */
-                else {
-    	           $1->entry.Template.ll_ptr1 = $4;
-    	           /*$1->entry.Template.ll_ptr2 = $6;
-	           $$ = $1; $$->type = make_type(fi, T_ARRAY);
-                   $$->type->entry.ar_decl.base_type = $1->type;
-	           $$->type->entry.ar_decl.num_dimensions = num_triplets;
-                  */
-                   l = $1; l->type = make_type(fi, T_ARRAY);
-                   l->type->entry.ar_decl.base_type = global_string;   /**18.03.17* $1->type*/
-	           l->type->entry.ar_decl.num_dimensions = num_triplets;
-               }
-                $$ = make_llnd(fi, ARRAY_OP, l, $6, SMNULL);
-	        $$->type = l->type;
-              
-              /* if ($$->variant == T_POINTER) {
-	          l = $$;
-	          $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	          $$->type = l->type->entry.Template.base_type;
-	       }
-               */  /*11.02.03*/
-             }
-             endioctl();
-          }
-        | structure_component LEFTPAR funarglist RIGHTPAR
-           {  int num_triplets;
-	      PTR_LLND l,l1,l2;
-              PTR_TYPE tp;
-
-         /*   if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-              num_triplets = is_array_section_ref($3);
-              $$ = $1;
-              l2 = $1->entry.Template.ll_ptr2;  
-              l1 = $1->entry.Template.ll_ptr1;                
-              if(l2 && l2->type->variant == T_STRING)/*substring*/
-                if(num_triplets == 1){
-	           l = make_llnd(fi, ARRAY_OP, LLNULL, LLNULL, SMNULL);
-    	           l->entry.Template.ll_ptr1 = l2;
-       	           l->entry.Template.ll_ptr2 = $3->entry.Template.ll_ptr1;
-	           l->type = global_string; 
-                   $$->entry.Template.ll_ptr2 = l;                                          
-                } else
-                   err("Can't subscript",44);
-              else if (l2 && l2->type->variant == T_ARRAY) {
-                 if(num_triplets > 0) { /*array section*/
-                   tp = make_type(fi,T_ARRAY);
-                   tp->entry.ar_decl.base_type = $1->type->entry.ar_decl.base_type;
-                   tp->entry.ar_decl.num_dimensions = num_triplets;
-                   $$->type = tp;
-                   l2->entry.Template.ll_ptr1 = $3;
-                   l2->type = $$->type;   
-                  }                 
-                 else {  /*array element*/
-                   l2->type = l2->type->entry.ar_decl.base_type;
-                   l2->entry.Template.ll_ptr1 = $3;   
-                   if(l1->type->variant != T_ARRAY)  
-                     $$->type = l2->type;
-                 }
-              } else 
-                   {err("Can't subscript",44); /*fprintf(stderr,"%d  %d",$1->variant,l2);*/}
-                   /*errstr("Can't subscript %s",l2->entry.Template.symbol->ident,441);*/
-         }    
-	
-        | structure_component LEFTPAR funarglist RIGHTPAR substring
-	    { int num_triplets;
-	      PTR_LLND l,q;
-
-          /*     if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-              $$ = $1;
-	      if (($1->type->variant != T_ARRAY) &&
-                  ($1->type->entry.ar_decl.base_type->variant != T_STRING)) {
-	         err("Can't take substring",45);
-              }
-              else {
-  	        num_triplets = is_array_section_ref($3);
-                l = $1->entry.Template.ll_ptr2;
-                if(l) {
-                /* array element */
-	        if (num_triplets == 0) {
-                   l->entry.Template.ll_ptr1 = $3;       	           
-                   l->type = global_string;
-                }
-                /* array section */
-                else {	
-    	             l->entry.Template.ll_ptr1 = $3;
-	             l->type = make_type(fi, T_ARRAY);
-                     l->type->entry.ar_decl.base_type = global_string;
-	             l->type->entry.ar_decl.num_dimensions = num_triplets;
-                }
-	        q = make_llnd(fi, ARRAY_OP, l, $5, SMNULL);
-	        q->type = l->type;
-                $$->entry.Template.ll_ptr2 = q;
-                if($1->entry.Template.ll_ptr1->type->variant != T_ARRAY)  
-                     $$->type = q->type;
-               }
-             }
-          }
-	;
-
-
-structure_component: lhs PERCENT IDENTIFIER
-	    { PTR_TYPE t;
-	      PTR_SYMB  field;
-	    /*  PTR_BFND at_scope;*/
-              PTR_LLND l;
-
-
-/*              if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-	      t = $1->type; 
-	      
-	      if (( ( ($1->variant == VAR_REF) 
-	          ||  ($1->variant == CONST_REF) 
-                  ||  ($1->variant == ARRAY_REF)
-                  ||  ($1->variant == RECORD_REF)) && (t->variant == T_DERIVED_TYPE)) 
-	          ||((($1->variant == ARRAY_REF) || ($1->variant == RECORD_REF)) && (t->variant == T_ARRAY) &&
-                      (t = t->entry.ar_decl.base_type) && (t->variant == T_DERIVED_TYPE))) 
-                {
-                 t->name = lookup_type_symbol(t->name);
-	         if ((field = component(t->name, yytext))) {                   
-	            l =  make_llnd(fi, VAR_REF, LLNULL, LLNULL, field);
-                    l->type = field->type;
-                    if(field->type->variant == T_ARRAY || field->type->variant == T_STRING)
-                      l->variant = ARRAY_REF; 
-                    $$ = make_llnd(fi, RECORD_REF, $1, l, SMNULL);
-                    if($1->type->variant != T_ARRAY)
-                       $$->type = field->type;
-                    else {
-                       $$->type = make_type(fi,T_ARRAY);
-                       if(field->type->variant != T_ARRAY) 
-	                 $$->type->entry.ar_decl.base_type = field->type;
-                       else
-                         $$->type->entry.ar_decl.base_type = field->type->entry.ar_decl.base_type;
-	               $$->type->entry.ar_decl.num_dimensions = t->entry.ar_decl.num_dimensions;
-                       }
-                 }
-                  else  
-                    errstr("Illegal component  %s", yytext,311);
-              }                     
-               else 
-                    errstr("Can't take component  %s", yytext,311);
-             }
-              /*   if ($$->variant == T_POINTER) {
-	            l = $$;
-	            $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	            $$->type = l->type->entry.Template.base_type;
-	         }
-              }
-                else errstr("Can't take component of %s", yytext, 311);
-              */
-	   
-        ;
-
-
-array_element: ident
-              { $$ = $1;}
-            | structure_component
-              {$$ = $1;}
-            | ident LEFTPAR in_ioctl funarglist RIGHTPAR
-            {  int num_triplets;
-               PTR_TYPE tp;
-              /* PTR_LLND l;*/
-	      if ($1->type->variant == T_ARRAY)
-              {
-  	         num_triplets = is_array_section_ref($4);
-	         /* array element */
-	         if (num_triplets == 0) {
-       	            $1->entry.Template.ll_ptr1 = $4;
-       	            $$ = $1;
-                    $$->type = $1->type->entry.ar_decl.base_type;
-                 }
-                 /* substring */
-	       /*  else if ((num_triplets == 1) && 
-                          ($1->type->variant == T_STRING)) {
-    	                  $1->entry.Template.ll_ptr1 = $4;
-	                  $$ = $1; $$->type = global_string;
-                 }   */ /*podd*/        
-                 /* array section */
-                 else {
-    	             $1->entry.Template.ll_ptr1 = $4;
-	             $$ = $1; tp = make_type(fi, T_ARRAY);
-                     tp->entry.ar_decl.base_type = $1->type->entry.ar_decl.base_type;  /**18.03.17* $1->type */
-	             tp->entry.ar_decl.num_dimensions = num_triplets;
-                     $$->type = tp;
-                 }
-             } 
-             else err("can't subscript",44);
-
-            /* if ($$->variant == T_POINTER) {
-	        l = $$;
-	        $$ = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	        $$->type = l->type->entry.Template.base_type;
-	     }
-             */  /*11.02.03*/
-
-            endioctl();
-           }
-        | structure_component LEFTPAR funarglist RIGHTPAR
-
-           {  int num_triplets;
-	      PTR_LLND l,l1,l2;
-
-         /*   if ($1->variant == T_POINTER) {
-	         l = $1;
-	         $1 = make_llnd(fi, DEREF_OP, l, LLNULL, SMNULL);
-	         $1->type = l->type->entry.Template.base_type;
-	      } */
-
-              num_triplets = is_array_section_ref($3);
-              $$ = $1;
-              l2 = $1->entry.Template.ll_ptr2;  
-              l1 = $1->entry.Template.ll_ptr1;                
-              if(l2 && l2->type->variant == T_STRING)/*substring*/
-                if(num_triplets == 1){
-	           l = make_llnd(fi, ARRAY_OP, LLNULL, LLNULL, SMNULL);
-    	           l->entry.Template.ll_ptr1 = l2;
-       	           l->entry.Template.ll_ptr2 = $3->entry.Template.ll_ptr1;
-	           l->type = global_string; 
-                   $$->entry.Template.ll_ptr2 = l;                                          
-                } else
-                   err("Can't subscript",44);
-              else if (l2 && l2->type->variant == T_ARRAY) {
-                 if(num_triplets > 0) { /*array section*/
-                   $$->type = make_type(fi,T_ARRAY);
-                   $$->type->entry.ar_decl.base_type = l2->type->entry.ar_decl.base_type;
-                   $$->type->entry.ar_decl.num_dimensions = num_triplets;
-                   l2->entry.Template.ll_ptr1 = $3;
-                   l2->type = $$->type;   
-                  }                 
-                 else {  /*array element*/
-                   l2->type = l2->type->entry.ar_decl.base_type;
-                   l2->entry.Template.ll_ptr1 = $3;   
-                   if(l1->type->variant != T_ARRAY)  
-                     $$->type = l2->type;
-                 }
-              } else 
-                   err("Can't subscript",44);
-         }  
-         ;
-
-asubstring: ident substring
-            { 
-	      if ($1->type->variant == T_STRING) {
-                 $1->entry.Template.ll_ptr1 = $2;
-                 $$ = $1; $$->type = global_string;
-              }
-              else errstr("can't subscript of %s", $1->entry.Template.symbol->ident,44);
-            }
-        ;
-
-opt_substring:
-            { $$ = LLNULL; }
-        | substring
-            { $$ = $1; }
-        ;
-
-substring:  LEFTPAR opt_expr COLON opt_expr RIGHTPAR
-	    { $$ = make_llnd(fi, DDOT, $2, $4, SMNULL); }
-	;
-
-opt_expr:
-	    { $$ = LLNULL; }
-	| expr
-	    { $$ = $1; }
-	;
-
-simple_const: numeric_bool_const
-             { $$ = $1;}
-            | numeric_bool_const UNDER kind
-             { PTR_TYPE t;
-               t = make_type_node($1->type, $3);
-               $$ = $1;
-               $$->type = t;
-             }
-            | integer_constant
-	     { $$ = $1; }
-            | integer_constant UNDER kind
-             { PTR_TYPE t;
-               t = make_type_node($1->type, $3);
-               $$ = $1;
-               $$->type = t;
-             }
-            | string_constant opt_substring
-             {
-              if ($2 != LLNULL)
-              {
-		 $$ = make_llnd(fi, ARRAY_OP, $1, $2, SMNULL); 
-                 $$->type = global_string;
-              }
-	      else 
-                 $$ = $1;
-             }
-            ;
-
-numeric_bool_const:
-	  TTRUE
-	    {
-	      $$ = make_llnd(fi,BOOL_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.bval = 1;
-	      $$->type = global_bool;
-	    }
-	| FFALSE
-	    {
-	      $$ = make_llnd(fi,BOOL_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.bval = 0;
-	      $$->type = global_bool;
-	    }
-
-	| REAL_CONSTANT
-	    {
-	      $$ = make_llnd(fi,FLOAT_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-	      $$->type = global_float;
-	    }
-	| DP_CONSTANT
-	    {
-	      $$ = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-	      $$->type = global_double;
-	    }
-	;
-
-integer_constant: INT_CONSTANT
-	    {
-	      $$ = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.ival = atoi(yytext);
-	      $$->type = global_int;
-	    }
-                ;
-
-string_constant: CHAR_CONSTANT
-	    { PTR_TYPE t;
-	      PTR_LLND p,q;
-	      $$ = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-              if(yyquote=='\"') 
-	        t = global_string_2;
-              else
-	        t = global_string;
-
-	      p = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-	      p->entry.ival = yyleng;
-	      p->type = global_int;
-              q = make_llnd(fi, LEN_OP, p, LLNULL, SMNULL); 
-              $$->type = make_type_node(t, q);
-	    }
-              | ident  UNDER  CHAR_CONSTANT
-            { PTR_TYPE t;
-	      $$ = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-              if(yyquote=='\"') 
-	        t = global_string_2;
-              else
-	        t = global_string;
-	      $$->type = make_type_node(t, $1);
-            }
-              | integer_constant  UNDER  CHAR_CONSTANT
-            { PTR_TYPE t;
-	      $$ = make_llnd(fi,STRING_VAL, LLNULL, LLNULL, SMNULL);
-	      $$->entry.string_val = copys(yytext);
-              if(yyquote=='\"') 
-	        t = global_string_2;
-              else
-	        t = global_string;
-	      $$->type = make_type_node(t, $1);
-            }
-        ;
-
-
-complex_const:	LEFTPAR uexpr COMMA uexpr RIGHTPAR
-	    {
-	      $$ = make_llnd(fi,COMPLEX_VAL, $2, $4, SMNULL);
-	      $$->type = global_complex;
-	    }
-	;
-
-kind:  ident
-     { $$ = $1;}
-    |  integer_constant
-       { $$ = $1; }
-   ;
-
-/*
-section: LEFTPAR triplets RIGHTPAR
-	    { $$ = $2; }
-	;
-
-triplets:triplet
-	    { $$ = make_llnd(fi,EXPR_LIST, $1, LLNULL, SMNULL); }
-
-	| triplets COMMA triplet
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }*/
-/* I changed uexpr to expr in below rule and triplet rules.
-    Don't know why Daya wrote it as uexpr. Srinivas. */
-/*	| triplets COMMA expr
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); } */
-/* Deleted. Purpose unknown. Srinivas. 
-	| expr COMMA triplets
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); } 
-	;*/
-
-triplet:  expr COLON expr
-	    { $$ = make_llnd(fi,DDOT,$1,$3,SMNULL); }
-        | expr COLON 
-	    { $$ = make_llnd(fi,DDOT,$1,LLNULL,SMNULL); }
-	| expr COLON expr COLON expr
-	    { $$ = make_llnd(fi,DDOT,make_llnd(fi,DDOT,$1,$3,SMNULL),$5,SMNULL); }
-        | expr COLON COLON expr
-	    { $$ = make_llnd(fi,DDOT,make_llnd(fi,DDOT,$1,LLNULL,SMNULL),$4,SMNULL); }
-	| COLON expr COLON expr
-	    { $$ = make_llnd(fi,DDOT, make_llnd(fi,DDOT,LLNULL,$2,SMNULL),$4,SMNULL); }
-	| COLON COLON expr
-	    { $$ = make_llnd(fi,DDOT,make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL),$3,SMNULL); }
-	| COLON expr
-	    { $$ = make_llnd(fi,DDOT,LLNULL,$2,SMNULL); }
-	| COLON
-	    { $$ = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL); }
-	;
-
-vec:	  LEFTAB end_ioctl {in_vec=YES;} outlist {in_vec=NO;} RIGHTAB
-           { PTR_TYPE array_type;
-             $$ = make_llnd (fi,CONSTRUCTOR_REF,$4,LLNULL,SMNULL); 
-             /*$$->type = $2->type;*/ /*28.02.03*/
-             array_type = make_type(fi, T_ARRAY);
-	     array_type->entry.ar_decl.num_dimensions = 1;
-             if($4->type->variant == T_ARRAY)
-	       array_type->entry.ar_decl.base_type = $4->type->entry.ar_decl.base_type;
-             else
-               array_type->entry.ar_decl.base_type = $4->type;
-             $$->type = array_type;
-           }
-	;
-  
-allocate_object: ident
-	   { $$ = $1; }
-	| structure_component
-	   { $$ = $1; }
-	;
-/*
-allocation_list: ident 
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| structure_component
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-
-allocation_list: allocate_object
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-*/
-
-
-/*allocation_list: array_element
-	        { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	       | allocation_list COMMA  opt_key_word  array_element
-	        { $$ = set_ll_list($1, $4, EXPR_LIST); opt_kwd_ = NO; }
-               | allocation_list COMMA  opt_key_word STAT EQUAL ident
-                { stat_alloc = $6; }
-	;
-*/
-
-allocation_list: array_element
-	        { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	       | allocation_list COMMA  in_ioctl  array_element 
-	        { $$ = set_ll_list($1, $4, EXPR_LIST); endioctl(); }
-               | allocation_list COMMA  in_ioctl nameeq ident 
-                { stat_alloc = make_llnd(fi, SPEC_PAIR, $4, $5, SMNULL);
-                  endioctl();
-                }
-	;
-
-
-/*allocate_object_list: allocate_object 
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| allocate_object_list COMMA opt_key_word allocate_object 
-	   { $$ = set_ll_list($1, $4, EXPR_LIST); opt_kwd_ = NO; }
-       | allocate_object_list COMMA  opt_key_word STAT EQUAL ident
-	   { stat_alloc = $6; }
-	;
-*/
-
-allocate_object_list: allocate_object 
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| allocate_object_list COMMA in_ioctl allocate_object 
-	   { $$ = set_ll_list($1, $4, EXPR_LIST); endioctl(); }
-       | allocate_object_list COMMA  in_ioctl nameeq ident
-	   { stat_alloc = make_llnd(fi, SPEC_PAIR, $4, $5, SMNULL);
-             endioctl();
-           }
-	;
-/*
-opt_stat_spec: 
-	   { $$ = LLNULL; }
-	| COMMA needkeyword STAT EQUAL ident
-	   { $$ = $5; }
-	;
-*/
-
-stat_spec: 
-           {stat_alloc = LLNULL;}
-         ;
-
-pointer_name_list: ident
-	   { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| pointer_name_list COMMA ident
-	   { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-
-/*
- * Grammar for executable statements
- */
-
-exec:	  iffable
-	    { $$ = $1; }
-	| whereable
-            { $$ = $1; }
-        | plain_do
-            { $$ = $1; }
-        | construct_name_colon  plain_do
-	    {
-              $$ = $2;
-              $$->entry.Template.ll_ptr3 = $1;
-            }
-/*
-
-	| PLAINDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr
-	    {
-              if(!$4){
-                 err("No label in DO statement"); 
-                 $$ = BFNULL;
-              }
-              else {
-               if( $4->labdefined)
-		  execerr("no backward DO loops", (char *)NULL);
-	        $$ = make_do(FOR_NODE, $4, $7, $9, $11, NULL);
-	      }
-             
-	    }
-	| PLAINDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr COMMA expr
-	    {
-              if(!$4){
-                 err("No label in DO statement"); 
-                 $$ = BFNULL;
-              }
-              else {
-               if( $4->labdefined)
-		  execerr("no backward DO loops", (char *)NULL);
-	        $$ = make_do(FOR_NODE, $4, $7, $9, $11, $13);
-	      }
-             
-	    }
-*/
-/* PROCESSDO added for FORTRAN M 
-	| opt_construct_name_colon PROCESSDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr
-	    {
-              if( !do_name_err ) {
-                if($5 && $5->labdefined)
-                  err("No backward DO loops", 46);
-                $$ = make_processdo(PROCESS_DO_STAT, $5, $8, $10, $12, NULL);
-	        $$->entry.Template.ll_ptr3 = $1;
-              }
-            }
-	| opt_construct_name_colon PROCESSDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr COMMA expr
-            {
-              if( !do_name_err ) {
-                if($5 && $5->labdefined)
-                  err("No backward DO loops", 46);
-                $$ = make_processdo(PROCESS_DO_STAT, $5, $8, $10, $12, $14);
-	        $$->entry.Template.ll_ptr3 = $1;
-              }
-            }
-*/
-	| ENDUNIT end_spec opt_unit_name
-	    { PTR_BFND biff;
-
-	      $$ = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
-	      bind(); 
-	      biff = cur_scope();
-	      if ((biff->variant == FUNC_HEDR) || (biff->variant == PROC_HEDR)
-		  || (biff->variant == PROS_HEDR) 
-	          || (biff->variant == PROG_HEDR)
-                  || (biff->variant == BLOCK_DATA)) {
-                if(biff->control_parent == global_bfnd) position = IN_OUTSIDE;
-		else if(!is_interface_stat(biff->control_parent)) position++;
-              } else if  (biff->variant == MODULE_STMT)
-                position = IN_OUTSIDE;
-	      else err("Unexpected END statement read", 52);
-             /* FB ADDED set the control parent so the empty function unparse right*/
-              if ($$)
-                $$->control_parent = biff;
-              delete_beyond_scope_level(pred_bfnd);
-            }
-	| ENDDO end_spec opt_construct_name                  
-/*          { $$ = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);}*/
-/*          Had to be changed to accomodate PCF's do loops.  */
-	    {
-              make_extend($3);
-              $$ = BFNULL; 
-              /* delete_beyond_scope_level(pred_bfnd); */
-             } 
- 
-/* ENDPROCESSDO was added by C.Y.Chen 
-        | ENDPROCESSDO end_spec
-            { $$ = make_enddoall(); }
-*/
-	/* end module is bit different. So shouldn't have end_spec. */
-	/* It may be better to move it to spec. */
-	| ENDMODULE opt_unit_name
-          { $$ = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL); 
-	    bind(); 
-	    delete_beyond_scope_level(pred_bfnd);
-	    position = IN_OUTSIDE;
-          }
-
-/*
-	| opt_construct_name_colon DOWHILE end_spec  needkeyword intonlyon dotarget intonlyoff WHILE LEFTPAR expr RIGHTPAR */
-        | do_while
-            { $$ = $1; }
-
-        | construct_name_colon do_while
-	    {
-              $$ = $2;
-              $$->entry.Template.ll_ptr3 = $1;
-            }
-
-/*	| CDOALL do_var EQUAL expr COMMA expr
-	        {$$ = make_do(CDOALL_NODE, NULL, $2, $4, $6, NULL);
-                 add_scope_level($$, NO);
-                }
-	| CDOALL do_var EQUAL expr COMMA expr COMMA expr
-	        {$$ = make_do(CDOALL_NODE, NULL, $2, $4, $6, $8);
-                 add_scope_level($$, NO);
-                }
-	| SDOALL do_var EQUAL expr COMMA expr
-	        {$$ = make_do(SDOALL_NODE, NULL, $2, $4, $6, NULL);
-                 add_scope_level($$, NO);
-                }
-	| SDOALL do_var EQUAL expr COMMA expr COMMA expr
-	        {$$ = make_do(SDOALL_NODE, NULL, $2, $4, $6, $8);
-                 add_scope_level($$, NO);
-                }
-	| DOACROSS do_var EQUAL expr COMMA expr
-	        {$$ = make_do(DOACROSS_NODE, NULL, $2, $4, $6, NULL);
-                 add_scope_level($$, NO);
-                }
-	| DOACROSS do_var EQUAL expr COMMA expr COMMA expr
-	        {$$ = make_do(DOACROSS_NODE, NULL, $2, $4, $6, $8);
-                 add_scope_level($$, NO);
-                }
-	| CDOACROSS do_var EQUAL expr COMMA expr
-	        {$$ = make_do(CDOACROSS_NODE, NULL, $2, $4, $6, NULL);
-                 add_scope_level($$, NO);
-                }
-	| CDOACROSS do_var EQUAL expr COMMA expr COMMA expr
-	        {$$ = make_do(CDOACROSS_NODE, NULL, $2, $4, $6, $8);
-                 add_scope_level($$, NO);
-                }
-	| LOOP
-          {
-	   make_loop();
-	   $$ = BFNULL;
-	  }
-
-	| enddoall
-	    { $$ = make_enddoall();
-              delete_beyond_scope_level(pred_bfnd);
-            }
-*/
-
-	| logif iffable
-	    { thiswasbranch = NO;
-              $1->variant = LOGIF_NODE;
-              $$ = make_logif($1, $2);
-	      set_blobs($1, pred_bfnd, SAME_GROUP);
-	    }
-	| logif THEN
-	    {
-              $$ = $1;
-	      set_blobs($$, pred_bfnd, NEW_GROUP1); 
-            }
-	|  construct_name_colon logif THEN
-	    {
-              $$ = $2;
-              $$->entry.Template.ll_ptr3 = $1;
-	      set_blobs($$, pred_bfnd, NEW_GROUP1); 
-            }
-	 /* | CONSTRUCT_ID COLON logif THEN
-	    { PTR_SYMB s;
-	      PTR_LLND l;
-              
-	      s = make_local_entity(look_up_sym(yytext), CONSTRUCT_NAME, global_default, LOCAL);
-              l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	      * $$ = make_if($3); *
-	      $3->entry.Template.ll_ptr3 = l;
-              $$ = $3;
-	      set_blobs($$, pred_bfnd, NEW_GROUP1); 
-            }
-         */
-	| ELSEIF end_spec LEFTPAR expr RIGHTPAR THEN opt_construct_name
-	    { make_elseif($4,$7); lastwasbranch = NO; $$ = BFNULL;}
-	| ELSE end_spec opt_construct_name
-	    { make_else($3); lastwasbranch = NO; $$ = BFNULL; }
-	| ENDIF end_spec opt_construct_name
-	    { make_endif($3); $$ = BFNULL; }
-	| case
-	    { $$ = $1; }
-	| CONTAINS end_spec
-	    { $$ = get_bfnd(fi, CONTAINS_STMT, SMNULL, LLNULL, LLNULL, LLNULL); }
-        
-        | forall iffable
-	    { thiswasbranch = NO;
-              $1->variant = FORALL_STAT;
-              $$ = make_logif($1, $2);
-	      set_blobs($1, pred_bfnd, SAME_GROUP);
-	    }
-        | forall
-            { $$ = $1; }
-        | construct_name_colon  forall
-            { $$ = $2; $$->entry.Template.ll_ptr3 = $1;}
-        | ENDFORALL end_spec  opt_construct_name
-              { make_endforall($3); $$ = BFNULL; }   
-               
-        | dvm_exec
-            { $$ = $1; }
-        | acc_directive
-            { $$ = $1; }
-        | spf_directive
-            { $$ = $1; }                
-	;
-/*
-do_while:  DOWHILE end_spec  LEFTPAR expr RIGHTPAR
-          { 	     
-	
-	       $$ = make_do(WHILE_NODE, LBNULL, SMNULL, $4, LLNULL, LLNULL);
-	          
-           }
-        | DOWHILE end_spec  intonlyon dotarget intonlyoff needkeyword WHILE LEFTPAR expr RIGHTPAR 
-        
-          { 	     
-	       if($4 && $4->labdefined)
-		 execerr("no backward DO loops", (char *)NULL); 
-	       $$ = make_do(WHILE_NODE, $4, SMNULL, $9, LLNULL, LLNULL);
-	       	     
-           }
-        | DOWHILE end_spec intonlyon dotarget intonlyoff 
-            {
-               if( $4 && $4->labdefined)
-		  err("No backward DO loops", 46);
-	        $$ = make_do(WHILE_NODE, $4, SMNULL, LLNULL, LLNULL, LLNULL);            
-	    }
-     ;
-*/
-
-do_while:  DOWHILE end_spec  LEFTPAR expr RIGHTPAR
-          { 	     
-	     /*  if($5 && $5->labdefined)
-		 execerr("no backward DO loops", (char *)NULL); */
-	       $$ = make_do(WHILE_NODE, LBNULL, SMNULL, $4, LLNULL, LLNULL);
-	       /*$$->entry.Template.ll_ptr3 = $1;*/	     
-           }
-
-  
-       | DOWHILE end_spec intonlyon dotarget intonlyoff  opt_key_word opt_while
-            {
-               if( $4 && $4->labdefined)
-		  err("No backward DO loops", 46);
-	        $$ = make_do(WHILE_NODE, $4, SMNULL, $7, LLNULL, LLNULL);            
-	    }
-     ;
-
-opt_while: 
-	    { $$ = LLNULL; }
-           |  COMMA needkeyword WHILE LEFTPAR expr RIGHTPAR
-            { $$ = $5;}
-	   |  WHILE LEFTPAR expr RIGHTPAR 
-	    { $$ = $3;}
-            
-	;
-
-plain_do: PLAINDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr
-	    {  
-               if( $4 && $4->labdefined)
-		  err("No backward DO loops", 46);
-	        $$ = make_do(FOR_NODE, $4, $7, $9, $11, LLNULL);            
-	    }
-
-	| PLAINDO end_spec intonlyon dotarget intonlyoff opt_comma do_var EQUAL expr COMMA expr COMMA expr
-	    {
-               if( $4 && $4->labdefined)
-		  err("No backward DO loops", 46);
-	        $$ = make_do(FOR_NODE, $4, $7, $9, $11, $13);            
-	    }
-        ;
-
-case:	CASE end_spec case_selector opt_construct_name
-	    { $$ = get_bfnd(fi, CASE_NODE, $4, $3, LLNULL, LLNULL); }
-      | DEFAULT_CASE  end_spec opt_construct_name
-	    { /*PTR_LLND p;*/
-	     /* p = make_llnd(fi, DEFAULT, LLNULL, LLNULL, SMNULL); */
-	      $$ = get_bfnd(fi, DEFAULT_NODE, $3, LLNULL, LLNULL, LLNULL); }
-      | ENDSELECT  end_spec opt_construct_name
-        { make_endselect($3); $$ = BFNULL; }
-	   /* { $$ = get_bfnd(fi, CONTROL_END, $3, LLNULL, LLNULL, LLNULL); }*/
-      | SELECT  end_spec needkeyword CASE LEFTPAR expr RIGHTPAR
-	    { $$ = get_bfnd(fi, SWITCH_NODE, SMNULL, $6, LLNULL, LLNULL) ; }
-      | construct_name_colon SELECT  end_spec needkeyword CASE LEFTPAR expr RIGHTPAR
-	    { $$ = get_bfnd(fi, SWITCH_NODE, SMNULL, $7, LLNULL, $1) ; }
-	;
-
-case_selector: LEFTPAR case_value_range_list RIGHTPAR
-	         { $$ = $2; }
-/*	| DEFAULT_CASE
-	    { $$ = make_llnd(fi, DEFAULT, LLNULL, LLNULL, SMNULL); }
-*/	;
-
-case_value_range: expr
-	            { $$ = $1; }
-	| expr COLON
-	    { $$ = make_llnd(fi, DDOT, $1, LLNULL, SMNULL); }
-	| COLON expr
-	    { $$ = make_llnd(fi, DDOT, LLNULL, $2, SMNULL); }
-	| expr COLON expr
-	    { $$ = make_llnd(fi, DDOT, $1, $3, SMNULL); }
-	;
-
-case_value_range_list: case_value_range
-	                 { $$ = make_llnd(fi, EXPR_LIST, $1, LLNULL, SMNULL); }
-	| case_value_range_list COMMA case_value_range
-	    { PTR_LLND p;
-	      
-	      p = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(p, $1);
-	    }
-	;
-
-opt_construct_name:
-	    { $$ = SMNULL; }
-	| name
-	    { $$ = make_local_entity($1, CONSTRUCT_NAME, global_default,
-                                     LOCAL); } 
-
-	;
-
-opt_unit_name: 
-              {$$ = HSNULL;}
-             | name
-              { $$ = $1;}
-             ;
-
-construct_name: CONSTRUCT_ID
-               {$$ = look_up_sym(yytext);}
-              ;
-
-construct_name_colon:  construct_name COLON
-	           { PTR_SYMB s;
-	             s = make_local_entity( $1, CONSTRUCT_NAME, global_default, LOCAL);             
-                    $$ = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-                   }
-	           ;
-/*
-opt_construct_name_colon: 
-	           { $$ = LLNULL; }
-	          | construct_name COLON
-	           { PTR_SYMB s;
-	             s = make_local_entity( $1, CONSTRUCT_NAME, global_default, LOCAL);             
-                    $$ = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-                   }
-	           ;
-*/
-/*
-optkeyword: 
-           {opt_kwd_ = YES;}
-          ;
-*/
-logif:	  LOGICALIF end_spec LEFTPAR expr RIGHTPAR
-	    { $$ = make_if($4); }
-	;
-forall:	  FORALL end_spec LEFTPAR forall_list opt_forall_cond RIGHTPAR
-	    { $$ = make_forall($4,$5); }
-	;
-
-forall_list: forall_expr
-             { $$ = make_llnd(fi, EXPR_LIST, $1, LLNULL, SMNULL); }
-            | forall_list COMMA forall_expr
-	    { PTR_LLND p;	      
-	      p = make_llnd(fi, EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(p, $1);
-	    }
-            ;
-
-forall_expr: do_var EQUAL triplet
-              {$$ = make_llnd(fi, FORALL_OP, $3, LLNULL, $1); }
-           ;
-
-opt_forall_cond:
-                 { $$=LLNULL;}
-               |  COMMA expr
-                 { $$=$2;}           
-               ;
-/*
-enddoall: ENDCDOALL
-        | ENDSDOALL
-	| ENDDOACROSS
-	| ENDCDOACROSS
-	;
-*/
-
-do_var:	 name
-         { PTR_SYMB  s;
-              s = $1->id_attr;
-      	      if (!s || s->variant == DEFAULT)
-              {
-	         s = make_scalar($1, TYNULL, LOCAL);
-	     	 s->decl = SOFT;
-	      }
-              $$ = s; 
-	 }
-	;
-
-dospec:	  do_var EQUAL expr COMMA expr
-             /* name EQUAL expr COMMA expr*/  /*16.02.03*/
-	    { PTR_SYMB s;
-              PTR_LLND l;
-              int vrnt;
-
-            /*  s = make_scalar($1, TYNULL, LOCAL);*/ /*16.02.03*/
-              s = $1;
-	      if (s->variant != CONST_NAME) {
-                if(in_vec) 
-                   vrnt=SEQ;
-                else
-                   vrnt=DDOT;     
-                l = make_llnd(fi, SEQ, make_llnd(fi, vrnt, $3, $5, SMNULL),
-                              LLNULL, SMNULL);
-		$$ = make_llnd(fi,IOACCESS, LLNULL, l, s);
-		do_name_err = NO;
-	      }
-	      else {
-		err("Symbolic constant not allowed as DO variable", 47);
-		do_name_err = YES;
-	      }
-	    }
-	| do_var EQUAL expr COMMA expr COMMA expr
-              /*name EQUAL expr COMMA expr COMMA expr*/ /*16.02.03*/
-	    { PTR_SYMB s;
-              PTR_LLND l;
-              int vrnt;
-              /*s = make_scalar($1, TYNULL, LOCAL);*/ /*16.02.03*/
-              s = $1;
-	      if( s->variant != CONST_NAME ) {
-                if(in_vec) 
-                   vrnt=SEQ;
-                else
-                   vrnt=DDOT;     
-                l = make_llnd(fi, SEQ, make_llnd(fi, vrnt, $3, $5, SMNULL), $7,
-                              SMNULL);
-		$$ = make_llnd(fi,IOACCESS, LLNULL, l, s);
-		do_name_err = NO;
-	      }
-	      else {
-		err("Symbolic constant not allowed as DO variable", 47);
-		do_name_err = YES;
-	      }
-	    }
-	;
-
-
-dotarget: { $$ = LBNULL; } 
-        | INT_CONSTANT
-            {
-	       $$  = make_label_node(fi,convci(yyleng, yytext));
-	       $$->scope = cur_scope();
-	    }
-       ;
-
-whereable: ENDWHERE  end_spec opt_construct_name
-           { make_endwhere($3); $$ = BFNULL; }
-	 | ELSEWHERE  end_spec opt_construct_name
-           { make_elsewhere($3); lastwasbranch = NO; $$ = BFNULL; }
-	 | ELSEWHERE  end_spec LEFTPAR expr RIGHTPAR opt_construct_name
-           { make_elsewhere_mask($4,$6); lastwasbranch = NO; $$ = BFNULL; }
-	 | WHERE  end_spec LEFTPAR expr RIGHTPAR 
-           { $$ = get_bfnd(fi, WHERE_BLOCK_STMT, SMNULL, $4, LLNULL, LLNULL); }
-	 | construct_name_colon WHERE end_spec LEFTPAR expr RIGHTPAR 
-           { $$ = get_bfnd(fi, WHERE_BLOCK_STMT, SMNULL, $5, LLNULL, $1); }
-	 ;
-
-iffable:  let expr EQUAL expr
-          /* let lhs EQUAL expr */
-           { PTR_LLND p, r;
-             PTR_SYMB s1, s2 = SMNULL, s3, arg_list;
-	     PTR_HASH hash_entry;
-
-	   /*  if (just_look_up_sym("=") != HSNULL) {
-	        p = intrinsic_op_node("=", EQUAL, $2, $4);
-   	        $$ = get_bfnd(fi, OVERLOADED_ASSIGN_STAT, SMNULL, p, $2, $4);
-             }	      
-             else */ if ($2->variant == FUNC_CALL) {
-                if(parstate==INEXEC){
-                  	  err("Declaration among executables", 30);
-                 /*   $$=BFNULL;*/
- 	         $$ = get_bfnd(fi,STMTFN_STAT, SMNULL, $2, LLNULL, LLNULL);
-                } 
-                else {	         
-  	         $2->variant = STMTFN_DECL;
-		 /* $2->entry.Template.ll_ptr2 = $4; */
-                 if( $2->entry.Template.ll_ptr1) {
-		   r = $2->entry.Template.ll_ptr1->entry.Template.ll_ptr1;
-                   if(r->variant != VAR_REF && r->variant != ARRAY_REF){
-                     err("A dummy argument of a statement function must be a scalar identifier", 333);
-                     s1 = SMNULL;
-                   }
-                   else                       
-		     s1 = r ->entry.Template.symbol;
-                 } else
-                   s1 = SMNULL;
-		 if (s1)
-	            s1->scope = cur_scope();
- 	         $$ = get_bfnd(fi,STMTFN_STAT, SMNULL, $2, LLNULL, LLNULL);
-	         add_scope_level($$, NO);
-                 arg_list = SMNULL;
-		 if (s1) 
-                 {
-	            /*arg_list = SMNULL;*/
-                    p = $2->entry.Template.ll_ptr1;
-                    while (p != LLNULL)
-                    {
-		    /*   if (p->entry.Template.ll_ptr1->variant != VAR_REF) {
-			  errstr("cftn.gram:1: illegal statement function %s.", $2->entry.Template.symbol->ident);
-			  break;
-		       } 
-                    */
-                       r = p->entry.Template.ll_ptr1;
-                       if(r->variant != VAR_REF && r->variant != ARRAY_REF){
-                         err("A dummy argument of a statement function must be a scalar identifier", 333);
-                         break;
-                       }
-	               hash_entry = look_up_sym(r->entry.Template.symbol->parent->ident);
-	               s3 = make_scalar(hash_entry, s1->type, IO);
-                       replace_symbol_in_expr(s3,$4);
-	               if (arg_list == SMNULL) 
-                          s2 = arg_list = s3;
-             	       else 
-                       {
-                          s2->id_list = s3;
-                          s2 = s3;
-                       }
-                       p = p->entry.Template.ll_ptr2;
-                    }
-                 }
-  		    $2->entry.Template.ll_ptr1 = $4;
-		    install_param_list($2->entry.Template.symbol,
-				       arg_list, LLNULL, FUNCTION_NAME);
-	            delete_beyond_scope_level($$);
-		 
-		/* else
-		    errstr("cftn.gram: Illegal statement function declaration %s.", $2->entry.Template.symbol->ident); */
-               }
-	     }
-	     else {
-		$$ = get_bfnd(fi,ASSIGN_STAT,SMNULL, $2, $4, LLNULL);
-                 parstate = INEXEC;
-             }
-	  }
-	| POINTERLET end_spec lhs POINT_TO expr
-	    { /*PTR_SYMB s;*/
-	
-	      /*s = make_scalar($2, TYNULL, LOCAL);*/
-  	      $$ = get_bfnd(fi, POINTER_ASSIGN_STAT, SMNULL, $3, $5, LLNULL);
-	    }
-/*        | let lhs EQUAL vec
-		
-	       { if ($2->variant == ARRAY_REF)
-		    $$ = get_bfnd(fi,ASSIGN_STAT,SMNULL, $2, $4, LLNULL);
-                 else err("Constructor reference");
-		}
-*/	| ASSIGN end_spec label TO name
-	    { PTR_SYMB p;
-
-	      p = make_scalar($5, TYNULL, LOCAL);
-	      p->variant = LABEL_VAR;
-  	      $$ = get_bfnd(fi,ASSLAB_STAT, p, $3,LLNULL,LLNULL);
-            }
-	| CONTINUE end_spec
-	    { $$ = get_bfnd(fi,CONT_STAT,SMNULL,LLNULL,LLNULL,LLNULL); }
-	| goto
-	| io
-	    { inioctl = NO; }
-	| ARITHIF end_spec LEFTPAR expr RIGHTPAR label COMMA label COMMA label
-	    { PTR_LLND	p;
-
-	      p = make_llnd(fi,EXPR_LIST, $10, LLNULL, SMNULL);
-	      p = make_llnd(fi,EXPR_LIST, $8, p, SMNULL);
-	      $$= get_bfnd(fi,ARITHIF_NODE, SMNULL, $4,
-			    make_llnd(fi,EXPR_LIST, $6, p, SMNULL), LLNULL);
-	      thiswasbranch = YES;
-            }
-	| call
-	    {
-	      $$ = subroutine_call($1, LLNULL, LLNULL, PLAIN);
-/*	      match_parameters($1, LLNULL);
-	      $$= get_bfnd(fi,PROC_STAT, $1, LLNULL, LLNULL, LLNULL);
-*/	      endioctl(); 
-            }
-	| call LEFTPAR RIGHTPAR
-	    {
-	      $$ = subroutine_call($1, LLNULL, LLNULL, PLAIN);
-/*	      match_parameters($1, LLNULL);
-	      $$= get_bfnd(fi,PROC_STAT,$1,LLNULL,LLNULL,LLNULL);
-*/	      endioctl(); 
-	    }
-	| call LEFTPAR  callarglist RIGHTPAR
-	    {
-	      $$ = subroutine_call($1, $3, LLNULL, PLAIN);
-/*	      match_parameters($1, $3);
-	      $$= get_bfnd(fi,PROC_STAT,$1,$3,LLNULL,LLNULL);
-*/	      endioctl(); 
-	    }
-
-	| RETURN end_spec opt_expr
-	    {
-	      $$ = get_bfnd(fi,RETURN_STAT,SMNULL,$3,LLNULL,LLNULL);
-	      thiswasbranch = YES;
-	    }
-	| stop end_spec opt_expr
-	    {
-	      $$ = get_bfnd(fi,$1,SMNULL,$3,LLNULL,LLNULL);
-	      thiswasbranch = ($1 == STOP_STAT);
-	    }
-	| CYCLE  end_spec opt_construct_name
-	    { $$ = get_bfnd(fi, CYCLE_STMT, $3, LLNULL, LLNULL, LLNULL); }
-
-	| EXIT  end_spec opt_construct_name
-	    { $$ = get_bfnd(fi, EXIT_STMT, $3, LLNULL, LLNULL, LLNULL); }
-
-	| ALLOCATE  end_spec  LEFTPAR  stat_spec allocation_list RIGHTPAR
-	    { $$ = get_bfnd(fi, ALLOCATE_STMT,  SMNULL, $5, stat_alloc, LLNULL); }
-
-	| DEALLOCATE end_spec LEFTPAR  stat_spec allocate_object_list  RIGHTPAR
-	    { $$ = get_bfnd(fi, DEALLOCATE_STMT, SMNULL, $5, stat_alloc , LLNULL); }
-
-	| NULLIFY end_spec LEFTPAR pointer_name_list RIGHTPAR
-	    { $$ = get_bfnd(fi, NULLIFY_STMT, SMNULL, $4, LLNULL, LLNULL); }
-
-        | WHERE_ASSIGN end_spec LEFTPAR expr RIGHTPAR lhs EQUAL expr
-           { $$ = get_bfnd(fi, WHERE_NODE, SMNULL, $4, $6, $8); }
-	;
-
-let:	  LET in_data
-      /*
-	    { if(parstate == OUTSIDE)
-		{ PTR_BFND p;
-
-		  p = get_bfnd(fi,PROG_HEDR, make_program(look_up_sym("_MAIN")), LLNULL, LLNULL, LLNULL);
-		  set_blobs(p, global_bfnd, NEW_GROUP1);
-		  add_scope_level(p, NO);
-		  position = IN_PROC; 
-		}
-		if(parstate < INDATA) enddcl();
-		parstate = INEXEC;
-		yystno = 0;	 
-     }
-     */
-         {$$ = LLNULL;}
-	;
- 
-goto:	  PLAINGOTO end_spec label
-	    {
-	      $$=get_bfnd(fi,GOTO_NODE,SMNULL,LLNULL,LLNULL,(PTR_LLND)$3);
-	      thiswasbranch = YES;
-	    }
-	| ASSIGNGOTO end_spec name
-	    { PTR_SYMB p;
-
-	      if($3->id_attr)
-		p = $3->id_attr;
-	      else {
-	        p = make_scalar($3, TYNULL, LOCAL);
-		p->variant = LABEL_VAR;
-	      }
-
-	      if(p->variant == LABEL_VAR) {
-		  $$ = get_bfnd(fi,ASSGOTO_NODE,p,LLNULL,LLNULL,LLNULL);
-		  thiswasbranch = YES;
-	      }
-	      else {
-		  err("Must go to assigned variable", 48);
-		  $$ = BFNULL;
-	      }
-	    }
-	| ASSIGNGOTO end_spec name opt_comma LEFTPAR labellist RIGHTPAR
-	    { PTR_SYMB p;
-
-	      if($3->id_attr)
-		p = $3->id_attr;
-	      else {
-	        p = make_scalar($3, TYNULL, LOCAL);
-		p->variant = LABEL_VAR;
-	      }
-
-	      if (p->variant == LABEL_VAR) {
-		 $$ = get_bfnd(fi,ASSGOTO_NODE,p,$6,LLNULL,LLNULL);
-		 thiswasbranch = YES;
-	      }
-	      else {
-		err("Must go to assigned variable",48);
-		$$ = BFNULL;
-	      }
-	    }
-	| COMPGOTO end_spec LEFTPAR labellist RIGHTPAR opt_comma expr
-	    { $$ = get_bfnd(fi,COMGOTO_NODE, SMNULL, $4, $7, LLNULL); }
-	;
-
-opt_comma:
-	| COMMA
-	;
-
-call:	  CALL end_spec name in_ioctl
-	    { $$ = make_procedure($3, LOCAL); }
-	;
-
-callarglist:  in_ioctl callarg
-	    { 
-              $$ = set_ll_list($2, LLNULL, EXPR_LIST);
-              endioctl();
-            }
-	| callarglist COMMA in_ioctl callarg
-	    { 
-               $$ = set_ll_list($1, $4, EXPR_LIST);
-               endioctl();
-            }
-	;
-
-callarg:  expr
-	    { $$ = $1; }
-	| nameeq expr
-	    { $$  = make_llnd(fi, KEYWORD_ARG, $1, $2, SMNULL); }
-	| ASTER label
-	    { $$ = make_llnd(fi,LABEL_ARG,$2,LLNULL,SMNULL); }
-	;
-
-stop:	  PAUSE	{ $$ = PAUSE_NODE; }
-	| STOP	{ $$ = STOP_STAT; }
-	;
-
-/*
-exprlist: expr
-	    { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	| exprlist COMMA expr
-	    { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	;
-*/
-end_spec:
-	    { if(parstate == OUTSIDE)
-		{ PTR_BFND p;
-
-		  p = get_bfnd(fi,PROG_HEDR, make_program(look_up_sym("_MAIN")), LLNULL, LLNULL, LLNULL);
-		  set_blobs(p, global_bfnd, NEW_GROUP1);
-		  add_scope_level(p, NO);
-		  position = IN_PROC; 
-		}
-		if(parstate < INDATA) enddcl();
-		parstate = INEXEC;
-		yystno = 0;
-	      }
-	;
-
-intonlyon:
-	    { intonly = YES; }
-	;
-
-intonlyoff:
-	     { intonly = NO; }
-
-	;
-
-/*
- *  Grammar for Input/Output statements
- */
-io:	  iofmove ioctl
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| iofmove unpar_fexpr 
-		{ PTR_LLND p, q = LLNULL;
-
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"unit";
-		  q->type = global_string;
-		  p = make_llnd(fi, SPEC_PAIR, q, $2, SMNULL);
-		  $1->entry.Template.ll_ptr2 = p;
-		  endioctl();
-		  $$ = $1; }
-	| iofmove ASTER
-		{ PTR_LLND p, q, r;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"unit";
-		  q->type = global_string;
-		  r = make_llnd(fi, SPEC_PAIR, p, q, SMNULL);
-		  $1->entry.Template.ll_ptr2 = r;
-		  endioctl();
-		  $$ = $1; }
- 	| iofmove DASTER
-		{ PTR_LLND p, q, r;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"**";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"unit";
-		  q->type = global_string;
-		  r = make_llnd(fi, SPEC_PAIR, p, q, SMNULL);
-		  $1->entry.Template.ll_ptr2 = r;
-		  endioctl();
-		  $$ = $1; }
-	| iofctl ioctl
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| inquire
-                { $$ = $1; }
-	| read ioctl
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| read infmt
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| read ioctl inlist
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $1->entry.Template.ll_ptr1 = $3;
-		  $$ = $1; }
-	| read infmt COMMA inlist
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $1->entry.Template.ll_ptr1 = $4;
-		  $$ = $1; }
-/*	| read ioctl COMMA inlist                   Not needed
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $1->entry.Template.ll_ptr1 = $4;
-		  $$ = $1; }  
-*/
-	| write ioctl
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $$ = $1; }
-	| write ioctl outlist
-		{ $1->entry.Template.ll_ptr2 = $2;
-		  $1->entry.Template.ll_ptr1 = $3;
-		  $$ = $1; }
-	| print
-		{ $$ = $1; }
-	| print COMMA outlist
-		{ $1->entry.Template.ll_ptr1 = $3;
-		  $$ = $1; }
-	;
-
-
-iofmove:   fmkwd end_spec start_ioctl
-		{ $$ = $1; }
-	;
-
-fmkwd:	  BACKSPACE
-           {$$ = get_bfnd(fi, BACKSPACE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	| REWIND
-           {$$ = get_bfnd(fi, REWIND_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	| ENDFILE
-           {$$ = get_bfnd(fi, ENDFILE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-/*        | SKIPPASTEOF
-           {$$ = get_bfnd(fi, SKIPPASTEOF_NODE, SMNULL, LLNULL, LLNULL, LLNULL); }
-*/
-	;
-
-iofctl:  ctlkwd end_spec start_ioctl
-		{ $$ = $1; }
-	;
-
-ctlkwd:   OPEN
-           {$$ = get_bfnd(fi, OPEN_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	| CLOSE
-           {$$ = get_bfnd(fi, CLOSE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	;
-
-inquire: INQUIRE end_spec start_ioctl ioctl
-           {  $$ = get_bfnd(fi, INQUIRE_STAT, SMNULL, LLNULL, $4, LLNULL);}
-        | INQUIRE end_spec start_ioctl  ioctl outlist
-           {  $$ = get_bfnd(fi, INQUIRE_STAT, SMNULL, $5, $4, LLNULL);}
-	;
-
-infmt:	  unpar_fexpr
-		{ PTR_LLND p;
-		  PTR_LLND q = LLNULL;
-
-		  if ($1->variant == INT_VAL)
- 	          {
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) $1->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		  }
-		  else p = $1; 
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		  endioctl();
-		}
-	| ASTER
-		{ PTR_LLND p;
-		  PTR_LLND q;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		  endioctl();
-		}
-	;
-
-
-ioctl:	LEFTPAR fexpr RIGHTPAR
-		{ PTR_LLND p;
-
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"unit";
-		  p->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, p, $2, SMNULL);
-		  endioctl();
-		}
-	| LEFTPAR  ctllist RIGHTPAR
-
-/*ioctl: LEFTPAR  ctllist RIGHTPAR*/
-		{ 
-		  $$ = $2;
-		  endioctl();
-		 }
-	;
-
-ctllist:  ioclause
-		{ $$ = $1; endioctl();}
-	| ctllist COMMA in_ioctl ioclause
-		{ $$ = set_ll_list($1, $4, EXPR_LIST); endioctl();}
-	;
-
-ioclause:  fexpr
-		{ PTR_LLND p;
-		  PTR_LLND q;
- 
-		  nioctl++;
-		  if ((nioctl == 2) && ($1->variant == INT_VAL))
- 	          {
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) $1->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		  }
-		  else p = $1; 
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  if (nioctl == 1)
-		        q->entry.string_val = (char *)"unit"; 
-		  else {
-                     if(($1->variant == VAR_REF) && $1->entry.Template.symbol->variant == NAMELIST_NAME)
-                       q->entry.string_val = (char *)"nml";
-                     else
-                       q->entry.string_val = (char *)"fmt";
-                  }
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		}
-	| ASTER
-		{ PTR_LLND p;
-		  PTR_LLND q;
-
-		  nioctl++;
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  if (nioctl == 1)
-		        q->entry.string_val = (char *)"unit"; 
-		  else  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		}
-	| DASTER
-		{ PTR_LLND p;
-		  PTR_LLND q;
-
-		  nioctl++;
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"**";
-		  p->type = global_string;
-		  q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  if (nioctl == 1)
-		        q->entry.string_val = (char *)"unit"; 
-		  else  q->entry.string_val = (char *)"fmt";
-		  q->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-		}
-	| nameeq expr
-		{ 
-		  PTR_LLND p;
-		  char *q;
-
-		  q = $1->entry.string_val;
-  		  if ((strcmp(q, "end") == 0) || (strcmp(q, "err") == 0) || (strcmp(q, "eor") == 0) || ((strcmp(q,"fmt") == 0) && ($2->variant == INT_VAL)))
- 	          {
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) $2->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		  }
-		  else p = $2;
-
-		  $$ = make_llnd(fi, SPEC_PAIR, $1, p, SMNULL); }
-	| nameeq ASTER
-		{ PTR_LLND p;
-                  
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, $1, p, SMNULL);
-		}
-	| nameeq DASTER
-		{ PTR_LLND p;
-		  p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  p->entry.string_val = (char *)"*";
-		  p->type = global_string;
-		  $$ = make_llnd(fi, SPEC_PAIR, $1, p, SMNULL);
-		}
-	;
-
-nameeq:  NAMEEQ
-		{ $$ = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-		  $$->entry.string_val = copys(yytext);
-		  $$->type = global_string;
-	        }
-	;
-
-
-read:	  READ end_spec start_ioctl
-           {$$ = get_bfnd(fi, READ_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	;
-
-
-write:	  WRITE end_spec start_ioctl
-           {$$ = get_bfnd(fi, WRITE_STAT, SMNULL, LLNULL, LLNULL, LLNULL);}
-	;
-
-
-print:	  PRINT end_spec fexpr start_ioctl
-           {
-	    PTR_LLND p, q, l;
-
-	    if ($3->variant == INT_VAL)
-		{
-		        PTR_LABEL r;
-
-			r = make_label_node(fi, (long) $3->entry.ival);
-			r->scope = cur_scope();
-			p = make_llnd_label(fi, LABEL_REF, r);
-		}
-	    else p = $3;
-	    
-            q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	    q->entry.string_val = (char *)"fmt";
-            q->type = global_string;
-            l = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-
-            $$ = get_bfnd(fi, PRINT_STAT, SMNULL, LLNULL, l, LLNULL);
-	    endioctl();
-	   }	
-	| PRINT end_spec ASTER start_ioctl
-	   { PTR_LLND p, q, r;
-		
-	     p = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	     p->entry.string_val = (char *)"*";
-	     p->type = global_string;
-	     q = make_llnd(fi, KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-	     q->entry.string_val = (char *)"fmt";
-             q->type = global_string;
-             r = make_llnd(fi, SPEC_PAIR, q, p, SMNULL);
-	     $$ = get_bfnd(fi, PRINT_STAT, SMNULL, LLNULL, r, LLNULL);
-	     endioctl();
-           }
-	;
-
-
-inlist:	  inelt
-		{ $$ = set_ll_list($1, LLNULL, EXPR_LIST);}
-	| inlist COMMA inelt
-		{ $$ = set_ll_list($1, $3, EXPR_LIST);}
-	;
-
-inelt:	  lhs
-		{ $$ = $1; }
-	| LEFTPAR inlist COMMA dospec RIGHTPAR
-		{
-		  $4->entry.Template.ll_ptr1 = $2;
-		  $$ = $4;
-		}
-	;
-
-outlist:  uexpr
-		{ $$ = set_ll_list($1, LLNULL, EXPR_LIST);  $$->type = $1->type;}
-	| other
-		{ $$ = $1; }
-	| out2
-		{ $$ = $1; }
-	;
-
-out2:	  uexpr COMMA uexpr
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| uexpr COMMA other
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| other COMMA uexpr
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| other COMMA other
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| out2  COMMA uexpr
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	| out2  COMMA other
-		{ $$ = set_ll_list($1, $3, EXPR_LIST); $$->type = $1->type;}
-	;
-
-other:	  complex_const
-		{ $$ =  set_ll_list($1, LLNULL, EXPR_LIST);
-	          $$->type = global_complex; }
-	| LEFTPAR expr RIGHTPAR
-		{ $$ =  set_ll_list($2, LLNULL, EXPR_LIST);
-                  $$->type = $2->type; }
-	| LEFTPAR uexpr COMMA dospec RIGHTPAR
-		{
-		  $4->entry.Template.ll_ptr1 = $2;
-		  $$ =  set_ll_list($4, LLNULL, EXPR_LIST);
-                  $$->type = $2->type; 
-		}
-	| LEFTPAR other COMMA dospec RIGHTPAR	
-		{
-		  $4->entry.Template.ll_ptr1 = $2;
-		  $$ =  set_ll_list($4, LLNULL, EXPR_LIST);
-                  $$->type = $2->type; 
-		}
-	| LEFTPAR out2  COMMA dospec RIGHTPAR
-		{
-		  $4->entry.Template.ll_ptr1 = $2;
-		  $$ =  set_ll_list($4, LLNULL, EXPR_LIST);
-                  $$->type = $2->type; 
-		}
-	;
-
-in_ioctl:
-		{ inioctl = YES; }
-	;
-
-start_ioctl:
-		{ startioctl();}
-	;
-
-
-/*
- * used by I/O statement 
- */
-fexpr:	unpar_fexpr
-            { $$ = $1; }
-	| LEFTPAR fexpr RIGHTPAR
-	    { $$ = $2; }
-	;
-
-unpar_fexpr:  lhs
-        { $$ = $1; }
-	| simple_const
-        { $$ = $1; }
-	| fexpr addop fexpr   %prec PLUS
-	    {
-	      $$ = make_llnd(fi,$2, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-	| fexpr ASTER fexpr
-	    {
-	      $$ = make_llnd(fi,MULT_OP, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-	| fexpr SLASH fexpr
-	    {
-	      $$ = make_llnd(fi,DIV_OP, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-	| fexpr DASTER fexpr
-	    {
-	      $$ = make_llnd(fi,EXP_OP, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-	| addop fexpr  %prec ASTER
-	    {
-	      if($1 == SUBT_OP)
-		{
-		  $$ = make_llnd(fi,SUBT_OP, $2, LLNULL, SMNULL);
-		  set_expr_type($$);
-		}
-	      else	$$ = $2;
-	    }
-	| fexpr DSLASH fexpr
-	    {
-	      $$ = make_llnd(fi,CONCAT_OP, $1, $3, SMNULL);
-	      set_expr_type($$);
-	    }
-        | IDENTIFIER EQUAL expr  
-           { $$ = LLNULL; }
-	;
-
-
-cmnt:       /* nothing */
-	  { comments = cur_comment = CMNULL; }
-	| COMMENT
-	  { PTR_CMNT p;
-	    p = make_comment(fi,*commentbuf, HALF);
-	    if (cur_comment)
-               cur_comment->next = p;
-            else {
-	       if ((pred_bfnd->control_parent->variant == LOGIF_NODE) ||(pred_bfnd->control_parent->variant == FORALL_STAT))
-
-	           pred_bfnd->control_parent->entry.Template.cmnt_ptr = p;
-
-	       else last_bfnd->entry.Template.cmnt_ptr = p;
-            }
-	    comments = cur_comment = CMNULL;
-          }
-	;
-dvm_specification: dvm_template
-                 | dvm_align  
-                 | dvm_distribute   
-                 | dvm_dynamic   
-                 | dvm_processors 
-                 | dvm_shadow
-                 | dvm_combined_dir
-                 | dvm_pointer 
-                 | dvm_task
-                 | dvm_inherit
-                 | dvm_indirect_group
-                 | dvm_remote_group
-                 | dvm_reduction_group
-                 | dvm_consistent_group
-                 | dvm_heap
-                 | dvm_asyncid
-                 | dvm_consistent
-                 | ompdvm_onethread /*OMP*/
-		 | omp_specification_directive /*OMP*/
-                 ; 
-
-dvm_exec: dvm_redistribute
-        | dvm_realign
-        | dvm_parallel_on
-        | dvm_shadow_group
-        | dvm_shadow_start
-        | dvm_shadow_wait
-        | dvm_reduction_start
-        | dvm_reduction_wait
-        | dvm_consistent_start
-        | dvm_consistent_wait
-        | dvm_remote_access
-        | dvm_task_region
-        | dvm_end_task_region
-        | dvm_map
-        | dvm_on
-        | dvm_end_on
-        | dvm_indirect_access
-        | dvm_prefetch
-        | dvm_reset
-        | dvm_debug_dir
-        | dvm_enddebug_dir
-        | dvm_interval_dir
-        | dvm_endinterval_dir
-        | dvm_exit_interval_dir
-        | dvm_traceon_dir
-        | dvm_traceoff_dir
-        | dvm_barrier_dir
-        | dvm_check
-        | dvm_new_value   
-        | dvm_asynchronous
-        | dvm_endasynchronous
-        | dvm_asyncwait
-        | dvm_f90
-        | dvm_io_mode_dir
-        | dvm_shadow_add
-        | dvm_localize
-        | dvm_cp_create
-        | dvm_cp_load
-        | dvm_cp_save
-        | dvm_cp_wait
-        | dvm_template_create
-        | dvm_template_delete
-        | hpf_independent 
-	| omp_execution_directive /*OMP*/
-/*        | dvm_own      */
-        ;
-       
-dvm_template: HPF_TEMPLATE in_dcl template_obj	    
-	      { $$ = get_bfnd(fi,HPF_TEMPLATE_STAT, SMNULL, $3, LLNULL, LLNULL); }
-	    | dvm_template COMMA template_obj 
-              { PTR_SYMB s;
-                if($1->entry.Template.ll_ptr2)
-                {
-                  s = $3->entry.Template.ll_ptr1->entry.Template.symbol;
-                  s->attr = s->attr | COMMON_BIT;
-                }
-	        add_to_lowLevelList($3, $1->entry.Template.ll_ptr1);
-	      }
-	    ;
-
-template_obj: name dims
-             {PTR_SYMB s;
-	      PTR_LLND q;
-	    /* 27.06.18
-	      if(! explicit_shape)   
-                err("Explicit shape specification is required", 50);
-	    */  
-	      s = make_array($1, TYNULL, $2, ndim, LOCAL);
-              if(s->attr & TEMPLATE_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & DVM_POINTER_BIT))
-                errstr( "Inconsistent declaration of identifier  %s ", s->ident, 16);
-              else
-	        s->attr = s->attr | TEMPLATE_BIT;
-              if($2) s->attr = s->attr | DIMENSION_BIT;  
-	      q = make_llnd(fi,ARRAY_REF, $2, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $2;
-	      $$ = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	     }
-             ;
-
-dvm_dynamic: DYNAMIC in_dcl dyn_array_name_list
-    { $$ = get_bfnd(fi,DVM_DYNAMIC_DIR, SMNULL, $3, LLNULL, LLNULL);}
-           ;
-
-dyn_array_name_list: dyn_array_name
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | dyn_array_name_list COMMA dyn_array_name
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-dyn_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              if(s->attr &  DYNAMIC_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & HEAP_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-              else
-                s->attr = s->attr | DYNAMIC_BIT;        
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;
-
-dvm_inherit: INHERIT in_dcl dummy_array_name_list
-    { $$ = get_bfnd(fi,DVM_INHERIT_DIR, SMNULL, $3, LLNULL, LLNULL);}
-           ;
-
-dummy_array_name_list: dummy_array_name
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | dummy_array_name_list COMMA dummy_array_name
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-dummy_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-              else
-                s->attr = s->attr | INHERIT_BIT;        
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;
-
-dvm_shadow: SHADOW in_dcl sh_array_name shadow_attr_stuff
-           { PTR_LLND q;
-             q = set_ll_list($3,LLNULL,EXPR_LIST);
-              /* (void)fprintf(stderr,"hpf.gram: shadow\n");*/ 
-	     $$ = get_bfnd(fi,DVM_SHADOW_DIR,SMNULL,q,$4,LLNULL);
-            }
-         /*
-          | SHADOW in_dcl shadow_attr_stuff COLON COLON sh_array_name_list
-            {$$ = get_bfnd(fi,DVM_SHADOW_DIR,SMNULL,$6,$3,LLNULL);}
-          */
-          ;
-shadow_attr_stuff: LEFTPAR sh_width_list RIGHTPAR
-                  { $$ = $2;}
-                 ;
-
-sh_width_list: sh_width
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | sh_width_list COMMA sh_width
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-             ;
-
-sh_width: expr
-          { $$ = $1;}
-        | expr COLON expr
-          { $$ = make_llnd(fi,DDOT, $1, $3, SMNULL);}
-        | COLON LEFTPAR subscript_list RIGHTPAR
-          {
-            if(parstate!=INEXEC) 
-               err("Illegal shadow width specification", 56);  
-            $$ = make_llnd(fi,SHADOW_NAMES_OP, $3, LLNULL, SMNULL);
-          }
-        ;
-     
-/*         
-sh_array_name_list: sh_array_name
-	           { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                  | sh_array_name_list COMMA sh_array_name
-	           { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-*/
-sh_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              if(s->attr & SHADOW_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & HEAP_BIT)) 
-                      errstr( "Inconsistent declaration of identifier %s", s->ident, 16); 
-              else
-        	      s->attr = s->attr | SHADOW_BIT;  
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;  
-dvm_processors: HPF_PROCESSORS in_dcl name dims 
-	    { PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! explicit_shape) {
-              err("Explicit shape specification is required", 50);
-		/* $$ = BFNULL;*/
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-              if(s->attr &  PROCESSORS_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & TASK_BIT) || (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT))
-                errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-              else
-	        s->attr = s->attr | PROCESSORS_BIT;
-              if($4) s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,HPF_PROCESSORS_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| OMPDVM_NODES in_dcl name dims 
-	    { PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! explicit_shape) {
-              err("Explicit shape specification is required", 50);
-		/* $$ = BFNULL;*/
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-              if(s->attr &  PROCESSORS_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & TASK_BIT) || (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT))
-                errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-              else
-	        s->attr = s->attr | PROCESSORS_BIT;
-              if($4) s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      $$ = get_bfnd(fi,HPF_PROCESSORS_STAT, SMNULL, r, LLNULL, LLNULL);
-	    }
-	| dvm_processors COMMA name dims 
-           {  PTR_SYMB s;
-	      PTR_LLND q, r;
-	      if(! explicit_shape) {
-		err("Explicit shape specification is required", 50);
-		/*$$ = BFNULL;*/
-	      }
-	      s = make_array($3, TYNULL, $4, ndim, LOCAL);
-              if(s->attr &  PROCESSORS_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & TASK_BIT) || (s->attr &  DVM_POINTER_BIT) || (s->attr & INHERIT_BIT) )
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16);
-              else
-	        s->attr = s->attr | PROCESSORS_BIT;
-              if($4) s->attr = s->attr | DIMENSION_BIT;
-	      q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	      s->type->entry.ar_decl.ranges = $4;
-	      r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	      add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	}
-	;
-
-dvm_indirect_group: INDIRECT_GROUP in_dcl indirect_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           $$ = get_bfnd(fi,DVM_INDIRECT_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-                  | dvm_indirect_group COMMA  indirect_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	           ;
-                }
-                  ;
-
-indirect_group_name: name
-          {$$ = make_local_entity($1, REF_GROUP_NAME,global_default,LOCAL);
-          if($$->attr &  INDIRECT_BIT)
-                errstr( "Multiple declaration of identifier  %s ", $$->ident, 73);
-           $$->attr = $$->attr | INDIRECT_BIT;
-          }
-                   ;
-
-dvm_remote_group: REMOTE_GROUP in_dcl remote_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           $$ = get_bfnd(fi,DVM_REMOTE_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-                  | dvm_remote_group COMMA  remote_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-                }
-                  ;
-
-remote_group_name: name
-          {$$ = make_local_entity($1, REF_GROUP_NAME,global_default,LOCAL);
-           if($$->attr &  INDIRECT_BIT)
-                errstr( "Inconsistent declaration of identifier  %s ", $$->ident, 16);
-          }
-          ;
-
-dvm_reduction_group: REDUCTION_GROUP in_dcl reduction_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           $$ = get_bfnd(fi,DVM_REDUCTION_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-                  | dvm_reduction_group COMMA  reduction_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	           ;
-                }
-                  ;
-
-reduction_group_name:  name
-       {$$ = make_local_entity($1, REDUCTION_GROUP_NAME,global_default,LOCAL);}
-            ;       
-
-dvm_consistent_group: CONSISTENT_GROUP in_dcl consistent_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	           $$ = get_bfnd(fi,DVM_CONSISTENT_GROUP_DIR, SMNULL, r, LLNULL, LLNULL);
-                }
-                  | dvm_consistent_group COMMA  consistent_group_name
-                {  PTR_LLND q,r;
-                   q = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $3);
-                   r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-                   add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);	           
-                }
-                  ;
-
-consistent_group_name:  name
-       {$$ = make_local_entity($1, CONSISTENT_GROUP_NAME,global_default,LOCAL);}
-            ;       
-
-
-/*opt_new: 
-*	    { $$ = LLNULL; opt_kwd_ = NO;}
-*	|    NEW 
-*	    { $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-*             $$->entry.string_val = (char *) "new";
-*             $$->type = global_string;
-*           }
-*       ;
-*/
-opt_onto:   ONTO name dims 
-            { PTR_SYMB s;
-            if(parstate == INEXEC){
-              if (!(s = $2->id_attr))
-              {
-	         s = make_array($2, TYNULL, LLNULL, 0, LOCAL);
-	     	 s->decl = SOFT;
-	      } 
-            } else
-              s = make_array($2, TYNULL, LLNULL, 0, LOCAL);
-
-              $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, s);
-            }               
-	|  
-            { $$ = LLNULL; opt_kwd_ = NO;}
-	    
-	;
-
-
-dvm_distribute: DISTRIBUTE in_dcl dist_name  opt_dist_format_clause opt_onto 
-           { PTR_LLND q;
-             if(!$4)
-               err("Distribution format list is omitted", 51);
-            /* if($6)
-               err("NEW_VALUE specification in DISTRIBUTE directive");*/
-             q = set_ll_list($3,LLNULL,EXPR_LIST);
-	     $$ = get_bfnd(fi,DVM_DISTRIBUTE_DIR,SMNULL,q,$4,$5);
-            }
-      /*        | DISTRIBUTE in_dcl opt_aster opt_key_word opt_dist_format_clause opt_onto COLON COLON dist_name_list
-	    { if(!$3 && !$5)
-                err(" dist-format-clause is omitted");
-              $$ = get_bfnd(fi,DVM_DISTRIBUTE_DIR,$6,$9,$5,$3); }
-      */
-	      ;
-
-dvm_redistribute: REDISTRIBUTE end_spec  dist_name dist_format_clause opt_key_word opt_onto  
-            { PTR_LLND q;
-                /*  if(!$4)
-                  {err("Distribution format is omitted", 51); errcnt--;}
-                 */
-              q = set_ll_list($3,LLNULL,EXPR_LIST);
-                 /* r = LLNULL;
-                   if($6){
-                     r = set_ll_list($6,LLNULL,EXPR_LIST);
-                     if($7) r = set_ll_list(r,$7,EXPR_LIST);
-                   } else
-                     if($7) r = set_ll_list(r,$7,EXPR_LIST);
-                 */
-	      $$ = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,SMNULL,q,$4,$6);}
-
-                | REDISTRIBUTE end_spec  dist_format_clause  opt_key_word opt_onto  COLON COLON dist_name_list
-             {
-                 /* r = LLNULL;
-                    if($5){
-                      r = set_ll_list($5,LLNULL,EXPR_LIST);
-                      if($6) r = set_ll_list(r,$6,EXPR_LIST);
-                    } else
-                      if($6) r = set_ll_list(r,$6,EXPR_LIST);
-                  */
-	      $$ = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,SMNULL,$8 ,$3,$5 );
-             }
-/*              | REDISTRIBUTE_NEW end_spec dist_name dist_format_clause opt_key_word opt_onto
-            { PTR_LLND q,p;
-              q = set_ll_list($3,LLNULL,EXPR_LIST);
-	      p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              p->entry.string_val = (char *) "new";
-              p->type = global_string;
-	      $$ = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,$6,q,$4,p);
-            }
-               | REDISTRIBUTE_NEW end_spec dist_format_clause  opt_key_word opt_onto COLON COLON dist_name_list
-	    { PTR_LLND p;
-	      p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              p->entry.string_val = (char *) "new";
-              p->type = global_string;
-              $$ = get_bfnd(fi,DVM_REDISTRIBUTE_DIR,$5,$8,$3,p); }
-*/    
-            ;
-
-dist_name_list: distributee
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | dist_name_list COMMA distributee
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-distributee: dist_name
-             {$$ = $1;}
-           | pointer_ar_elem
-             {$$ = $1;}
-           ;
-
-dist_name: name 
-       {  PTR_SYMB s;
- 
-          if(parstate == INEXEC){
-            if (!(s = $1->id_attr))
-              {
-	         s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-	     	 s->decl = SOFT;
-	      } 
-            if(s->attr & PROCESSORS_BIT)
-              errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);
-            if(s->attr & TASK_BIT)
-              errstr( "Illegal use of task array name %s ", s->ident, 71);
-
-          } else {
-            s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-            if(s->attr & DISTRIBUTE_BIT)
-              errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-            else if( (s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & INHERIT_BIT))
-              errstr("Inconsistent declaration of identifier  %s",s->ident, 16);
-            else
-              s->attr = s->attr | DISTRIBUTE_BIT;
-          } 
-         if(s->attr & ALIGN_BIT)
-               errstr("A distributee may not have the ALIGN attribute:%s",s->ident, 54);
-          $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);               	  
-	}
-        ;
-
-pointer_ar_elem: name LEFTPAR subscript_list RIGHTPAR
-       {  PTR_SYMB s;
-          s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-        
-          if(parstate != INEXEC) 
-               errstr( "Illegal distributee:%s", s->ident, 312);
-          else {
-            if(s->attr & PROCESSORS_BIT)
-               errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);  
-            if(s->attr & TASK_BIT)
-               errstr( "Illegal use of task array name %s ", s->ident, 71);        
-            if(s->attr & ALIGN_BIT)
-               errstr("A distributee may not have the ALIGN attribute:%s",s->ident, 54);
-            if(!(s->attr & DVM_POINTER_BIT))
-               errstr("Illegal distributee:%s", s->ident, 312);
-          /*s->attr = s->attr | DISTRIBUTE_BIT;*/
-	  $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, s); 
-          }
-        
-	}
-        ;
-
-
-processors_name: name 
-       {  PTR_SYMB s;
-          if((s=$1->id_attr) == SMNULL)
-            s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-          if((parstate == INEXEC) && !(s->attr & PROCESSORS_BIT))
-               errstr( "'%s' is not processor array ", s->ident, 67);
-	  $$ = s;
-	}
-        ;
-/*
-opt_aster:
-          {$$ = LLNULL;} 
-         | ASTER
-          { 
-            $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-            $$->entry.string_val = (char *) "*";
-            $$->type = global_string;
-          }
-          ; 
-*/
-opt_dist_format_clause: 
-                       { $$ = LLNULL;  }
-                      | dist_format_clause opt_key_word 
-                        { $$ = $1;}
-                      ; 
- 
-dist_format_clause: LEFTPAR dist_format_list RIGHTPAR
-                      { $$ = $2;}
-                  ;
-/*opt_dist_format_clause: dist_format_clause
-                      { (void)fprintf(stderr,"hpf.gram:opt_dist_format_clause\n");
-                         $$ = $1;}
-                      | ASTER dist_format_clause
-                      { PTR_LLND q;
-                         q = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-                         q->entry.string_val = (char *) "*";
-                         q->type = global_string;
-                      (void)fprintf(stderr,"hpf.gram: * opt_dist_format_clause\n");
-                       $$ = make_llnd(fi,ARRAY_OP, q, $2, SMNULL);} 
-                      | ASTER 
-           {         
-             $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-             $$->entry.string_val = (char *) "*";
-             $$->type = global_string;
-           } 
-                  ; 
-*/
-dist_format_list: opt_key_word dist_format
-	    { $$ = set_ll_list($2,LLNULL,EXPR_LIST); }
-                | dist_format_list COMMA opt_key_word dist_format
-	    { $$ = set_ll_list($1,$4,EXPR_LIST); }	    
-	        ;
-opt_key_word:
-            { opt_kwd_ = YES; }
-            ;
-/*
-no_opt_key_word:
-            { opt_kwd_ = NO; }
-	     ;	     
-*/
-
-dist_format:   BLOCK
-        {  
-               $$ = make_llnd(fi,BLOCK_OP, LLNULL, LLNULL, SMNULL);
-        }
-           |   BLOCK LEFTPAR in_ioctl shadow_width  RIGHTPAR
-        {  err("Distribution format BLOCK(n) is not permitted in FDVM", 55);
-          $$ = make_llnd(fi,BLOCK_OP, $4, LLNULL, SMNULL);
-          endioctl();
-        }
-           |   GEN_BLOCK LEFTPAR array_name RIGHTPAR
-        { $$ = make_llnd(fi,BLOCK_OP, LLNULL, LLNULL, $3); }  
-           |   WGT_BLOCK LEFTPAR array_name COMMA expr RIGHTPAR
-        { $$ = make_llnd(fi,BLOCK_OP,  $5,  LLNULL,  $3); }   
-           |   MULT_BLOCK LEFTPAR  expr RIGHTPAR
-        { $$ = make_llnd(fi,BLOCK_OP,  LLNULL, $3,  SMNULL); } 
-           |  ASTER
-        { 
-          $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-          $$->entry.string_val = (char *) "*";
-          $$->type = global_string;
-        }
-           |  INDIRECT LEFTPAR array_name RIGHTPAR 
-        { $$ = make_llnd(fi,INDIRECT_OP, LLNULL, LLNULL, $3); }     
-           |  DERIVED LEFTPAR derived_spec RIGHTPAR 
-        { $$ = make_llnd(fi,INDIRECT_OP, $3, LLNULL, SMNULL); }     
-           ;
-
-array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-       
-	      $$ = s;
-	   }
-           ;
-
-derived_spec: LEFTPAR derived_elem_list  RIGHTPAR needkeyword WITH target_spec 
-            { $$ = make_llnd(fi,DERIVED_OP, $2, $6, SMNULL); }
-            ;
-
-derived_elem_list: derived_elem 
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | derived_elem_list COMMA derived_elem 
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-
-             ;
-
-derived_elem: expr
-              { $$ = $1;}
-            | expr COLON expr
-              { $$ = make_llnd(fi,DDOT, $1, $3, SMNULL);} 
-            ;
-
-target_spec: derived_target 
-            { 
-              $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, $1);
-	    }
-            | derived_target LEFTPAR derived_subscript_list RIGHTPAR
-            { 
-              $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, $1);
-	    }
-            ;
-
-derived_target:  name 
-            { 
-              if (!($$ = $1->id_attr))
-              {
-	         $$ = make_array($1, TYNULL, LLNULL,0,LOCAL);
-	         $$->decl = SOFT;
-	      } 
-            }
-            ;
-
-derived_subscript_list: derived_subscript
-	                { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                      | derived_subscript_list COMMA derived_subscript
-	                { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-                      ;
-
-derived_subscript:  expr
-                   {  $$ = $1;}
-                 |  aster_expr
-                   {  $$ = $1;}
-                 |  AT dummy_ident opt_plus_shadow
-                   {
-                      $2->entry.Template.ll_ptr1 = $3; 
-                      $$ = $2;   
-                   }     
-                 ;
-
-dummy_ident: name
-          { PTR_SYMB s;
-            s = make_scalar($1,TYNULL,LOCAL);
-	    $$ = make_llnd(fi,DUMMY_REF, LLNULL, LLNULL, s);
-            /*$$->type = global_int;*/
-          }
-          ; 
-/*
-dummy_ident: IDENTIFIER
-           {
-                    PTR_HASH hash_entry;
-                    hash_entry = just_look_up_sym_in_scope(cur_scope(),yytext);
-                    if
-           }
-           ;
-*/
-
-opt_plus_shadow: 
-               {  $$ = LLNULL; }
-               | plus_shadow
-               {  $$ = $1; }
-               ; 
-
-plus_shadow: PLUS shadow_id
-           {  $$ = set_ll_list($2,LLNULL,EXPR_LIST); }
-           | opt_plus_shadow PLUS shadow_id
-           {  $$ = set_ll_list($1,$3,EXPR_LIST); }
-           ;
- 
-shadow_id:  expr
-            {  if($1->type->variant != T_STRING)
-                 errstr( "Illegal type of shadow_name", 627);
-               $$ = $1; 
-            }
-         ;
-
-shadow_width: nameeq expr
-        { char *q;
-          nioctl = 1;
-          q = $1->entry.string_val;
-          if((!strcmp(q,"shadow")) && ($2->variant == INT_VAL))                          $$ = make_llnd(fi,SPEC_PAIR, $1, $2, SMNULL);
-          else
-          {  err("Illegal shadow width specification", 56);
-             $$ = LLNULL;
-          }
-        }
-           | nameeq expr COMMA nameeq expr 
-        { char *ql, *qh;
-          PTR_LLND p1, p2;
-          nioctl = 2;
-          ql = $1->entry.string_val;
-          qh = $4->entry.string_val;
-          if((!strcmp(ql,"low_shadow")) && ($2->variant == INT_VAL) && (!strcmp(qh,"high_shadow")) && ($5->variant == INT_VAL)) 
-              {
-                 p1 = make_llnd(fi,SPEC_PAIR, $1, $2, SMNULL);
-                 p2 = make_llnd(fi,SPEC_PAIR, $4, $5, SMNULL);
-                 $$ = make_llnd(fi,CONS, p1, p2, SMNULL);
-              } 
-          else
-          {  err("Illegal shadow width specification", 56);
-             $$ = LLNULL;
-          }
-        }
-          ;
-
-/*
-opt_new_value_spec:
-                     {$$ = LLNULL;}
-                  |  COMMA needkeyword NEW_VALUE
-                     {$$ = make_llnd(fi,NEW_VALUE_OP, LLNULL, LLNULL, SMNULL);}
-                  |  COMMA needkeyword NEW_VALUE LEFTPAR  array_ident_list RIGHTPAR
-                     {$$ = make_llnd(fi,NEW_VALUE_OP, $5, LLNULL, SMNULL);}
-                  ;
-*/
-
-dvm_align:  ALIGN in_dcl alignee align_directive_stuff
-	    { PTR_LLND q;
-              q = set_ll_list($3,LLNULL,EXPR_LIST);
-              $$ = $4;
-              $$->entry.Template.ll_ptr1 = q;
-            }
-           /*
-            *|  ALIGN in_dcl  align_directive_stuff COLON COLON alignee_list
-	    * { 
-            *   $$ = $3;
-            *   $$->entry.Template.ll_ptr1 = $6;
-            * }
-            */
-	;
-
-dvm_realign:  REALIGN end_spec realignee align_directive_stuff 
-	    { PTR_LLND q;
-              q = set_ll_list($3,LLNULL,EXPR_LIST);
-              $$ = $4;
-              $$->variant = DVM_REALIGN_DIR; 
-              $$->entry.Template.ll_ptr1 = q;
-            }
-           |  REALIGN end_spec  align_directive_stuff COLON COLON realignee_list
-	    {
-              $$ = $3;
-              $$->variant = DVM_REALIGN_DIR; 
-              $$->entry.Template.ll_ptr1 = $6;
-            }
-        /*
-           |  REALIGN_WITH end_spec  align_base COLON COLON realignee_list
-	    { $$ = get_bfnd(fi,DVM_REALIGN_DIR,SMNULL,$6,LLNULL,$3);}
-         */
-	   ;
-/*
-alignee_list: alignee
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | alignee_list COMMA alignee
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-*/
-realignee_list: realignee
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | realignee_list COMMA realignee
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-alignee: name
-       {  PTR_SYMB s;
-          s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-          if((s->attr & ALIGN_BIT)) 
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-          if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & INHERIT_BIT)) 
-                errstr( "Inconsistent declaration of identifier  %s", s->ident, 16); 
-          else  if(s->attr & DISTRIBUTE_BIT)
-               errstr( "An alignee may not have the DISTRIBUTE attribute:'%s'", s->ident,57);             else
-                s->attr = s->attr | ALIGN_BIT;     
-	  $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	}
-        ;
-  
-realignee: ident
-       {PTR_SYMB s;
-        s = $1->entry.Template.symbol;
-        if(s->attr & PROCESSORS_BIT)
-               errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);
-        else  if(s->attr & TASK_BIT)
-              errstr( "Illegal use of task array name %s ", s->ident, 71);
-        else if( !(s->attr & DIMENSION_BIT) && !(s->attr & DVM_POINTER_BIT))
-            errstr("The alignee %s isn't an array", s->ident, 58);
-        else {
-            /*  if(!(s->attr & DYNAMIC_BIT))
-                 errstr("'%s' hasn't the DYNAMIC attribute", s->ident, 59);
-             */
-              if(!(s->attr & ALIGN_BIT) && !(s->attr & INHERIT_BIT))
-                 errstr("'%s' hasn't the ALIGN attribute", s->ident, 60);
-              if(s->attr & DISTRIBUTE_BIT)
-                 errstr("An alignee may not have the DISTRIBUTE attribute: %s", s->ident, 57);
-
-/*               if(s->entry.var_decl.local == IO)
- *                 errstr("An alignee may not be the dummy argument");
-*/
-          }
-	  $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	}
-        ;
-
-align_directive_stuff: LEFTPAR dim_ident_list RIGHTPAR needkeyword WITH align_base 
-           { /* PTR_LLND r;
-              if($7) {
-                r = set_ll_list($6,LLNULL,EXPR_LIST);
-                r = set_ll_list(r,$7,EXPR_LIST);
-              }
-              else
-                r = $6;
-              */
-            $$ = get_bfnd(fi,DVM_ALIGN_DIR,SMNULL,LLNULL,$2,$6);
-           }  
-                     ;
-
-align_base:  align_base_name LEFTPAR align_subscript_list RIGHTPAR
-	  {
-           $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, $1);        
-          } 
-/*
-          |  align_base_name
-          {PTR_LLND q;
-           q = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, $2);
-           if($1)
-               $$ = make_llnd(fi,ARRAY_OP, $1, q, SMNULL);
-           else
-               $$ = q;
-          } 
-*/
-          ;
-
-align_subscript_list: align_subscript
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | align_subscript_list COMMA align_subscript
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-                    ;
-align_subscript:  expr
-                 { $$ = $1;}
-               | ASTER
-                 {
-                  $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-                  $$->entry.string_val = (char *) "*";
-                  $$->type = global_string;
-                 }
-               | triplet
-                 { $$ = $1;}
-               ;
- 
-align_base_name: name
-       { 
-         /* if(parstate == INEXEC){ *for REALIGN directive*
-              if (!($$ = $1->id_attr))
-              {
-	         $$ = make_array($1, TYNULL, LLNULL,0,LOCAL);
-	     	 $$->decl = SOFT;
-	      } 
-          } else
-             $$ = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-          */
-          if (!($$ = $1->id_attr))
-          {
-	       $$ = make_array($1, TYNULL, LLNULL,0,LOCAL);
-	       $$->decl = SOFT;
-	  } 
-          $$->attr = $$->attr | ALIGN_BASE_BIT;
-          if($$->attr & PROCESSORS_BIT)
-               errstr( "Illegal use of PROCESSORS name %s ", $$->ident, 53);
-          else  if($$->attr & TASK_BIT)
-               errstr( "Illegal use of task array name %s ", $$->ident, 71);
-          else
-          if((parstate == INEXEC) /* for  REALIGN directive */
-             &&   !($$->attr & DIMENSION_BIT) && !($$->attr & DVM_POINTER_BIT))
-            errstr("The align-target %s isn't declared as array", $$->ident, 61); 
-         }  
-              ;
-
-dim_ident_list: dim_ident
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | dim_ident_list COMMA dim_ident
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-dim_ident: name
-          { PTR_SYMB s;
-            s = make_scalar($1,TYNULL,LOCAL);
-            if(s->type->variant != T_INT || s->attr & PARAMETER_BIT)             
-              errstr("The align-dummy %s isn't a scalar integer variable", s->ident, 62); 
-	   $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-           $$->type = global_int;
-         }  
-           |  ASTER
-        {  
-          $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-          $$->entry.string_val = (char *) "*";
-          $$->type = global_string;
-        }
-           |  COLON
-        {   $$ = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL); }   
-        ;
-dvm_combined_dir: dvm_attribute_list COLON COLON  in_dcl name dims
-                   { PTR_SYMB s;
-	             PTR_LLND q, r, p;
-                     int numdim;
-                     if(type_options & PROCESSORS_BIT) {    /* 27.06.18 || (type_options & TEMPLATE_BIT)){ */
-                       if(! explicit_shape) {
-                         err("Explicit shape specification is required", 50);
-		         /*$$ = BFNULL;*/
-	               }
-                     } 
-
-                    /*  else {
-                       if($6)
-                         err("Shape specification is not permitted", 263);
-                     } */
-
-                     if(type_options & DIMENSION_BIT)
-                       { p = attr_dims; numdim = attr_ndim;}
-                     else
-                       { p = LLNULL; numdim = 0; }
-                     if($6)          /*dimension information after the object name*/
-                     { p = $6; numdim = ndim;} /*overrides the DIMENSION attribute */
-	             s = make_array($5, TYNULL, p, numdim, LOCAL);
-
-                     if((type_options & COMMON_BIT) && !(type_options & TEMPLATE_BIT))
-                     {
-                        err("Illegal combination of attributes", 63);
-                        type_options = type_options & (~COMMON_BIT);
-                     }
-                     if((type_options & PROCESSORS_BIT) &&((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT) ))
-                        err("Illegal combination of attributes", 63);
-                     else  if((type_options & PROCESSORS_BIT) && ((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT)) )
-                     {  errstr("Inconsistent declaration of  %s", s->ident, 16);
-                        type_options = type_options & (~PROCESSORS_BIT);
-                     }
-                     else if ((s->attr & PROCESSORS_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT))) 
-                        errstr("Inconsistent declaration of  %s", s->ident, 16);
-                     else if ((s->attr & INHERIT_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT)))
-                        errstr("Inconsistent declaration of  %s", s->ident, 16);
-                     if(( s->attr & DISTRIBUTE_BIT) &&  (type_options & DISTRIBUTE_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & ALIGN_BIT) &&  (type_options & ALIGN_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & SHADOW_BIT) &&  (type_options & SHADOW_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & TEMPLATE_BIT) &&  (type_options & TEMPLATE_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & PROCESSORS_BIT) &&  (type_options & PROCESSORS_BIT))
-                           errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-	             s->attr = s->attr | type_options;
-                     if($6) s->attr = s->attr | DIMENSION_BIT;
-                     if((s->attr & DISTRIBUTE_BIT) && (s->attr & ALIGN_BIT))
-                       errstr("%s has the DISTRIBUTE and ALIGN attribute",s->ident, 64);
-	             q = make_llnd(fi,ARRAY_REF, $6, LLNULL, s);
-	             if(p) s->type->entry.ar_decl.ranges = p;
-	             r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	             $$ = get_bfnd(fi,DVM_VAR_DECL, SMNULL, r, LLNULL,$1);
-	            }
-                | dvm_combined_dir COMMA name dims
-                   { PTR_SYMB s;
-	             PTR_LLND q, r, p;
-                     int numdim;
-                    if(type_options & PROCESSORS_BIT) { /*23.10.18  || (type_options & TEMPLATE_BIT)){ */
-                       if(! explicit_shape) {
-                         err("Explicit shape specification is required", 50);
-		         /*$$ = BFNULL;*/
-	               }
-                     } 
-                    /* else {
-                       if($4)
-                         err("Shape specification is not permitted", 263);
-                     } */
-                     if(type_options & DIMENSION_BIT)
-                       { p = attr_dims; numdim = attr_ndim;}
-                     else
-                       { p = LLNULL; numdim = 0; }
-                     if($4)                   /*dimension information after the object name*/
-                     { p = $4; numdim = ndim;}/*overrides the DIMENSION attribute */
-	             s = make_array($3, TYNULL, p, numdim, LOCAL);
-
-                     if((type_options & COMMON_BIT) && !(type_options & TEMPLATE_BIT))
-                     {
-                        err("Illegal combination of attributes", 63);
-                        type_options = type_options & (~COMMON_BIT);
-                     }
-                     if((type_options & PROCESSORS_BIT) &&((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT) ))
-                       err("Illegal combination of attributes", 63);
-                     else  if((type_options & PROCESSORS_BIT) && ((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT)) )
-                     {  errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-                        type_options = type_options & (~PROCESSORS_BIT);
-                     }
-                     else if ((s->attr & PROCESSORS_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT) ||(type_options & TEMPLATE_BIT) || (type_options & DYNAMIC_BIT) ||(type_options & SHADOW_BIT))) 
-                          errstr("Inconsistent declaration of identifier  %s", s->ident,16);
-                     else if ((s->attr & INHERIT_BIT) && ((type_options & ALIGN_BIT) ||(type_options & DISTRIBUTE_BIT)))
-                          errstr("Inconsistent declaration of identifier %s", s->ident, 16);
-                     if(( s->attr & DISTRIBUTE_BIT) &&  (type_options & DISTRIBUTE_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & ALIGN_BIT) &&  (type_options & ALIGN_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & SHADOW_BIT) &&  (type_options & SHADOW_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & TEMPLATE_BIT) &&  (type_options & TEMPLATE_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-                     if(( s->attr & PROCESSORS_BIT) &&  (type_options & PROCESSORS_BIT))
-                          errstr( "Multiple declaration of identifier  %s ", s->ident, 73);   
-	             s->attr = s->attr | type_options;
-                     if($4) s->attr = s->attr | DIMENSION_BIT;
-                     if((s->attr & DISTRIBUTE_BIT) && (s->attr & ALIGN_BIT))
-                           errstr("%s has the DISTRIBUTE and ALIGN attribute",s->ident, 64);
-	             q = make_llnd(fi,ARRAY_REF, $4, LLNULL, s);
-	             if(p) s->type->entry.ar_decl.ranges = p;
-	             r = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);
-	             add_to_lowLevelList(r, $1->entry.Template.ll_ptr1);
-	            }
-                ;
-         
-/*dvm_attribute_list: { type_options = 0; attr_ndim = 0; attr_dims = LLNULL;} dvm_attribute
-	    { $$ = set_ll_list($2,LLNULL,EXPR_LIST); }
-              | dvm_attribute_list COMMA needkeyword dvm_attribute
-	    { $$ = set_ll_list($1,$4,EXPR_LIST); }	
-                 ;
-*/
-dvm_attribute_list:  dvm_attribute
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); type_options = type_opt; }
-              | dvm_attribute_list COMMA needkeyword dvm_attribute
-	    { $$ = set_ll_list($1,$4,EXPR_LIST); type_options = type_options | type_opt;}
-                 ;
-dvm_attribute: HPF_TEMPLATE
-               { type_opt = TEMPLATE_BIT;
-               $$ = make_llnd(fi,TEMPLATE_OP,LLNULL,LLNULL,SMNULL);
-               } 
-             | HPF_PROCESSORS
-               { type_opt = PROCESSORS_BIT;
-                $$ = make_llnd(fi,PROCESSORS_OP,LLNULL,LLNULL,SMNULL);
-               } 
-             | OMPDVM_NODES
-               { type_opt = PROCESSORS_BIT;
-                $$ = make_llnd(fi,PROCESSORS_OP,LLNULL,LLNULL,SMNULL);
-               } 
-             | DYNAMIC
-               { type_opt = DYNAMIC_BIT;
-                $$ = make_llnd(fi,DYNAMIC_OP,LLNULL,LLNULL,SMNULL);
-               } 
-            /* | DIMENSION dims
-               {
-                if(! explicit_shape) {
-                  err("Explicit shape specification is required", 50);
-                }
-                if(! $2) {
-                  err("No shape specification", 65);
-	        }
-                type_opt = DIMENSION_BIT;
-                attr_ndim = ndim; attr_dims = $2;
-                $$ = make_llnd(fi,DIMENSION_OP,$2,LLNULL,SMNULL);
-	       }*/
-
-            | DIMENSION LEFTPAR dimlist RIGHTPAR
-               {
-                if(! explicit_shape) {
-                  err("Explicit shape specification is required", 50);
-                }
-                if(! $3) {
-                  err("No shape specification", 65);
-	        }
-                type_opt = DIMENSION_BIT;
-                attr_ndim = ndim; attr_dims = $3;
-                $$ = make_llnd(fi,DIMENSION_OP,$3,LLNULL,SMNULL);
-	       }
-              | SHADOW shadow_attr_stuff
-                { type_opt = SHADOW_BIT;
-                  $$ = make_llnd(fi,SHADOW_OP,$2,LLNULL,SMNULL);
-                 } 
-              | ALIGN LEFTPAR dim_ident_list RIGHTPAR needkeyword WITH align_base
-                 { type_opt = ALIGN_BIT;
-                  $$ = make_llnd(fi,ALIGN_OP,$3,$7,SMNULL);
-                 } 
-              | ALIGN 
-                { type_opt = ALIGN_BIT;
-                  $$ = make_llnd(fi,ALIGN_OP,LLNULL,SMNULL,SMNULL);
-                }
-/*
-              | ALIGN_WITH align_base
-                { type_opt = ALIGN_BIT;
-                  $$ = make_llnd(fi,ALIGN_OP,LLNULL,$2,SMNULL);
-                }
-*/
-              | DISTRIBUTE  dist_format_clause opt_key_word  opt_onto 
-	        { 
-                 type_opt = DISTRIBUTE_BIT;
-                 $$ = make_llnd(fi,DISTRIBUTE_OP,$2,$4,SMNULL);
-                } 
-              | DISTRIBUTE  
-	        { 
-                 type_opt = DISTRIBUTE_BIT;
-                 $$ = make_llnd(fi,DISTRIBUTE_OP,LLNULL,LLNULL,SMNULL);
-                } 
-              | COMMON
-                {
-                 type_opt = COMMON_BIT;
-                 $$ = make_llnd(fi,COMMON_OP, LLNULL, LLNULL, SMNULL);
-                }
-               ; 
-
-dvm_pointer: type COMMA needkeyword DVM_POINTER in_dcl LEFTPAR dimension_list RIGHTPAR COLON COLON pointer_var_list
-           { 
-	      PTR_LLND  l;
-	      l = make_llnd(fi, TYPE_OP, LLNULL, LLNULL, SMNULL);
-	      l->type = $1;
-	      $$ = get_bfnd(fi,DVM_POINTER_DIR, SMNULL, $11,$7, l);
-	    }
-           ;
-
-dimension_list: {ndim = 0;} COLON
-	    { PTR_LLND  q;
-             if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		q = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL);
-	      ++ndim;
-              $$ = set_ll_list(q, LLNULL, EXPR_LIST);
-	       /*$$ = make_llnd(fi,EXPR_LIST, q, LLNULL, SMNULL);*/
-	       /*$$->type = global_default;*/
-	    }
-	| dimension_list COMMA COLON
-	    { PTR_LLND  q;
-             if(ndim == maxdim)
-		err("Too many dimensions", 43);
-	      else if(ndim < maxdim)
-		q = make_llnd(fi,DDOT,LLNULL,LLNULL,SMNULL);
-	      ++ndim;
-              $$ = set_ll_list($1, q, EXPR_LIST);
-            }
-	;
-
-pointer_var_list: pointer_var
-	          { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                |  pointer_var_list COMMA  pointer_var
-	          { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	        ;
-
-pointer_var: name
-           {PTR_SYMB s;
-           /* s = make_scalar($1,TYNULL,LOCAL);*/
-            s = make_array($1,TYNULL,LLNULL,0,LOCAL);
-            s->attr = s->attr | DVM_POINTER_BIT;
-            if((s->attr & PROCESSORS_BIT) || (s->attr & TASK_BIT) || (s->attr & INHERIT_BIT))
-               errstr( "Inconsistent declaration of identifier %s", s->ident, 16);     
-            $$ = make_llnd(fi,VAR_REF,LLNULL,LLNULL,s);
-            }
-            ;
-
-dvm_heap: HEAP in_dcl  heap_array_name_list
-           { $$ = get_bfnd(fi,DVM_HEAP_DIR, SMNULL, $3, LLNULL, LLNULL);}
-           ;
-
-heap_array_name_list: heap_array_name
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | heap_array_name_list COMMA heap_array_name
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-heap_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              s->attr = s->attr | HEAP_BIT;
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT) || (s->attr & INHERIT_BIT) || (s->attr & DYNAMIC_BIT) || (s->attr & SHADOW_BIT) || (s->attr & DVM_POINTER_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-      
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;
-
-dvm_consistent: CONSISTENT in_dcl  consistent_array_name_list
-           { $$ = get_bfnd(fi,DVM_CONSISTENT_DIR, SMNULL, $3, LLNULL, LLNULL);}
-           ;
-
-consistent_array_name_list: consistent_array_name
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | consistent_array_name_list COMMA consistent_array_name
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-consistent_array_name: name
-           {  PTR_SYMB s;
-	      s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              s->attr = s->attr | CONSISTENT_BIT;
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT) || (s->attr & INHERIT_BIT) || (s->attr & DYNAMIC_BIT) || (s->attr & SHADOW_BIT) || (s->attr & DVM_POINTER_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16); 
-      
-	      $$ = make_llnd(fi,ARRAY_REF, LLNULL, LLNULL, s);
-	   }
-           ;
-
-
-dvm_asyncid: ASYNCID in_dcl  async_id_list
-            { $$ = get_bfnd(fi,DVM_ASYNCID_DIR, SMNULL, $3, LLNULL, LLNULL);}
-	   | ASYNCID in_dcl COMMA needkeyword COMMON COLON COLON async_id_list 
-            { PTR_LLND p;
-              p = make_llnd(fi,COMM_LIST, LLNULL, LLNULL, SMNULL);              
-              $$ = get_bfnd(fi,DVM_ASYNCID_DIR, SMNULL, $8, p, LLNULL);
-            }
-           ;
-
-async_id_list: async_id
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | async_id_list COMMA async_id
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	     ;
-
-async_id: name dims
-           {  PTR_SYMB s;
-              if($2){
-                  s = make_array($1, global_default, $2, ndim, LOCAL);
-		  s->variant = ASYNC_ID;
-                  s->attr = s->attr | DIMENSION_BIT;
-                  s->type->entry.ar_decl.ranges = $2;
-                  $$ = make_llnd(fi,ARRAY_REF, $2, LLNULL, s);
-              } else {
-              s = make_local_entity($1, ASYNC_ID, global_default, LOCAL);
-	      $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-              }
-	   }
-           ;
-
-
-dvm_new_value: NEW_VALUE  end_spec
-               { $$ = get_bfnd(fi,DVM_NEW_VALUE_DIR,SMNULL, LLNULL, LLNULL,LLNULL);} 
-          /* | NEW_VALUE  end_spec array_ident_list
-               { $$ = get_bfnd(fi,DVM_NEW_VALUE_DIR,SMNULL, $3, LLNULL,LLNULL);}
-           */
-             ;
-
-
-dvm_parallel_on: PARALLEL end_spec LEFTPAR ident_list RIGHTPAR opt_on opt_spec 
- 
-
-                 {  if($6 &&  $6->entry.Template.symbol->attr & TASK_BIT)
-                        $$ = get_bfnd(fi,DVM_PARALLEL_TASK_DIR,SMNULL,$6,$7,$4);
-                    else
-                        $$ = get_bfnd(fi,DVM_PARALLEL_ON_DIR,SMNULL,$6,$7,$4);
-                 }
-               ;
-
-
-ident_list: ident
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | ident_list COMMA ident
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-opt_on:   opt_key_word ON distribute_cycles 
-          { $$ = $3;}
-                       
-	| opt_key_word 
-            { $$ = LLNULL; opt_kwd_ = NO;}
-	    
-	;
-
-distribute_cycles: ident LEFTPAR par_subscript_list RIGHTPAR
-        {
-          if($1->type->variant != T_ARRAY) 
-             errstr("'%s' isn't array", $1->entry.Template.symbol->ident, 66);
-          $1->entry.Template.ll_ptr1 = $3;
-          $$ = $1;
-          $$->type = $1->type->entry.ar_decl.base_type;
-        }
-        ;
-
-par_subscript_list: par_subscript
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | par_subscript_list COMMA par_subscript
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-par_subscript: expr
-            { $$ = $1;}
-             | ASTER
-            {
-             $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-             $$->entry.string_val = (char *) "*";
-             $$->type = global_string;
-            }
-             ;
-
-opt_spec:
-          {  $$ = LLNULL;}
-        | spec_list
-          { $$ = $1;}
-        ;
-
-spec_list:     par_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | spec_list par_spec
-	       { $$ = set_ll_list($1,$2,EXPR_LIST); }	
-             ;
-           
-
-par_spec: new_spec
-        | reduction_spec
-        | shadow_spec
-        | remote_access_spec
-        | indirect_access_spec
-        | across_spec
-        | stage_spec
-        | consistent_spec
-        | private_spec     /*ACC*/
-        | cuda_block_spec  /*ACC*/
-        | tie_spec         /*ACC*/
-        ;
-
-remote_access_spec:  COMMA needkeyword REMOTE_ACCESS_SPEC LEFTPAR group_name COLON remote_data_list RIGHTPAR
-                        { if($5->attr & INDIRECT_BIT)
-                            errstr("'%s' is not remote group name", $5->ident, 68);
-                          $$ = make_llnd(fi,REMOTE_ACCESS_OP,$7,LLNULL,$5);
-                        }
-                  |  COMMA needkeyword REMOTE_ACCESS_SPEC LEFTPAR remote_data_list RIGHTPAR
-                        { $$ = make_llnd(fi,REMOTE_ACCESS_OP,$5,LLNULL,SMNULL);}
-                      ;
-
-consistent_spec:  COMMA needkeyword CONSISTENT_SPEC LEFTPAR consistent_group COLON remote_data_list RIGHTPAR
-                        {
-                          $$ = make_llnd(fi,CONSISTENT_OP,$7,LLNULL,$5);
-                        }
-                  |  COMMA needkeyword CONSISTENT_SPEC LEFTPAR remote_data_list RIGHTPAR
-                        { $$ = make_llnd(fi,CONSISTENT_OP,$5,LLNULL,SMNULL);}
-                      ;
-
-consistent_group: name
-          {  
-            if(($$=$1->id_attr) == SMNULL){
-                errstr("'%s' is not declared as group", $1->ident, 74);
-                $$ = make_local_entity($1,CONSISTENT_GROUP_NAME,global_default,LOCAL);
-            } else {
-                if($$->variant != CONSISTENT_GROUP_NAME)
-                   errstr("'%s' is not declared as group", $1->ident, 74);
-            }
-          }
-          ;
-
-
-new_spec: COMMA needkeyword NEW LEFTPAR variable_list RIGHTPAR
-              {$$ = make_llnd(fi,NEW_SPEC_OP,$5,LLNULL,SMNULL);}
-/*	| COMMA needkeyword PRIVATE LEFTPAR variable_list RIGHTPAR
-	      {$$ = make_llnd(fi,NEW_SPEC_OP,$5,LLNULL,SMNULL);} */  /*OMP*/
-        | COMMA needkeyword OMPDVM_FIRSTPRIVATE LEFTPAR variable_list RIGHTPAR
-              {$$ = make_llnd(fi,NEW_SPEC_OP,$5,LLNULL,SMNULL);}   /*OMP*/
-        ;
-
-private_spec: COMMA needkeyword PRIVATE LEFTPAR variable_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_PRIVATE_OP,$5,LLNULL,SMNULL);}  /*ACC*/
-            ;
-
-cuda_block_spec: COMMA needkeyword ACC_CUDA_BLOCK LEFTPAR sizelist RIGHTPAR
-                { $$ = make_llnd(fi,ACC_CUDA_BLOCK_OP,$5,LLNULL,SMNULL);} /*ACC*/
-               ;
-sizelist:  expr
-           { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}        /*ACC*/
-        |  expr COMMA expr
-           {$$ = set_ll_list($1,$3,EXPR_LIST);}            /*ACC*/
-        |  expr COMMA expr COMMA expr
-           {$$ = set_ll_list($1,$3,EXPR_LIST); $$ = set_ll_list($$,$5,EXPR_LIST);} /*ACC*/
-        ;
-
-variable_list: lhs
-               { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-             | variable_list COMMA lhs
-               { $$ = set_ll_list($1,$3,EXPR_LIST);}
-             ;
-
-tie_spec: COMMA needkeyword ACC_TIE LEFTPAR tied_array_list RIGHTPAR
-         { $$ = make_llnd(fi,ACC_TIE_OP,$5,LLNULL,SMNULL);} /*ACC*/
-        ;
-
-tied_array_list: distribute_cycles
-                 { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-               | tied_array_list COMMA distribute_cycles
-                 { $$ = set_ll_list($1,$3,EXPR_LIST);}
-               ;
-
-indirect_access_spec: COMMA needkeyword INDIRECT_ACCESS LEFTPAR group_name COLON indirect_list RIGHTPAR 
-                    { if(!($5->attr & INDIRECT_BIT))
-                         errstr("'%s' is not indirect group name", $5->ident, 313);
-                      $$ = make_llnd(fi,INDIRECT_ACCESS_OP,$7,LLNULL,$5);
-                    }
-                   |  COMMA needkeyword INDIRECT_ACCESS LEFTPAR  indirect_list RIGHTPAR 
-                        { $$ = make_llnd(fi,INDIRECT_ACCESS_OP,$5,LLNULL,SMNULL);}
-                   ;
-
-stage_spec:  COMMA needkeyword STAGE LEFTPAR expr RIGHTPAR
-              {$$ = make_llnd(fi,STAGE_OP,$5,LLNULL,SMNULL);}
-          ;
-
-across_spec: COMMA needkeyword ACROSS in_out_across
-               {$$ = make_llnd(fi,ACROSS_OP,$4,LLNULL,SMNULL);}
-           | COMMA needkeyword ACROSS in_out_across in_out_across
-               {$$ = make_llnd(fi,ACROSS_OP,$4,$5,SMNULL);}
-           ;
-
-in_out_across:  LEFTPAR opt_keyword_in_out opt_in_out dependent_array_list RIGHTPAR
-                {  if($3)
-                     $$ = make_llnd(fi,DDOT,$3,$4,SMNULL);
-                   else
-                     $$ = $4;
-                }
-             ;
-
-opt_keyword_in_out:
-            { opt_in_out = YES; }
-            ;
-
-opt_in_out:  IN  COLON
-            {
-	      $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "in";
-              $$->type = global_string;
-            }
-          |  OUT COLON
-            {
-	      $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "out";
-              $$->type = global_string;
-            }
-          |
-            {  $$ = LLNULL; opt_in_out = NO;}
-          ;
-
-dependent_array_list: dependent_array
-            { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-             | dependent_array_list COMMA dependent_array 
-            { $$ = set_ll_list($1,$3,EXPR_LIST);}
-             ;
-
-dependent_array: array_ident
-                 { $$ = $1;}
-               | array_ident LEFTPAR dependence_list RIGHTPAR
-                  { $$ = $1;
-                    $$-> entry.Template.ll_ptr1 = $3;  
-                  }
-               | array_ident LEFTPAR dependence_list RIGHTPAR LEFTPAR section_spec_list RIGHTPAR
-                 { /*  PTR_LLND p;
-                       p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-                       p->entry.string_val = (char *) "corner";
-                       p->type = global_string;
-                   */
-                   $1-> entry.Template.ll_ptr1 = $3;  
-                   $$ = make_llnd(fi,ARRAY_OP,$1,$6,SMNULL);
-                 }
-
-               ;  
- 
-dependence_list: dependence
-            { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-             | dependence_list COMMA dependence 
-            { $$ = set_ll_list($1,$3,EXPR_LIST);}
-             ; 
-  
-dependence:  expr COLON expr
-             { $$ = make_llnd(fi,DDOT, $1, $3, SMNULL);}
-          ;      
-
-section_spec_list: section_spec
-              { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-            | section_spec_list COMMA  section_spec
-              { $$ = set_ll_list($1,$3,EXPR_LIST);}
-            ;
-
-section_spec: ar_section COLON low_section COLON high_section 
-             { $$ = make_llnd(fi,DDOT,$1,make_llnd(fi,DDOT,$3,$5,SMNULL),SMNULL); } 
-            |  ar_section COLON low_section  
-             { $$ = make_llnd(fi,DDOT,$1,make_llnd(fi,DDOT,$3,LLNULL,SMNULL),SMNULL); } 
-            | ar_section COLON high_section
-             { $$ = make_llnd(fi,DDOT,$1,make_llnd(fi,DDOT,LLNULL,$3,SMNULL),SMNULL); } 
-            | ar_section
-             { $$ = make_llnd(fi,DDOT,$1,LLNULL,SMNULL); }
-            | low_section COLON high_section
-             { $$ = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,$1,$3,SMNULL),SMNULL); }
-            | low_section
-             { $$ = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,$1,LLNULL,SMNULL),SMNULL); }
-            |  high_section
-             { $$ = make_llnd(fi,DDOT,LLNULL,make_llnd(fi,DDOT,LLNULL,$1,SMNULL),SMNULL); }
-            ;
-
-ar_section: needkeyword SECTION section
-            { $$ = $3;}
-          ;
-
-low_section: needkeyword LOW section
-            { $$ = $3;}
-          ;
-
-high_section: needkeyword HIGH section
-            { $$ = $3;}
-          ;
-
-section:  LEFTPAR funargs RIGHTPAR
-          { $$ = $2;}
-       ;
-
-reduction_spec: COMMA needkeyword REDUCTION LEFTPAR  opt_key_word_r  reduction  no_opt_key_word_r  COMMA reduction_list RIGHTPAR
-                {PTR_LLND q;
-                /* q = set_ll_list($9,$6,EXPR_LIST); */
-                 q = set_ll_list($6,LLNULL,EXPR_LIST); /*podd 11.10.01*/
-                 q = add_to_lowLevelList($9,q);        /*podd 11.10.01*/
-                 $$ = make_llnd(fi,REDUCTION_OP,q,LLNULL,SMNULL);
-                }
-              | COMMA needkeyword REDUCTION LEFTPAR  opt_key_word_r  reduction  no_opt_key_word_r  RIGHTPAR
-                {PTR_LLND q;
-                 q = set_ll_list($6,LLNULL,EXPR_LIST);
-                 $$ = make_llnd(fi,REDUCTION_OP,q,LLNULL,SMNULL);
-                }
-
-              | COMMA needkeyword REDUCTION LEFTPAR opt_key_word_r reduction_group no_opt_key_word_r COLON reduction_list RIGHTPAR
-                {  $$ = make_llnd(fi,REDUCTION_OP,$9,LLNULL,$6); }            
-              ;
-
-opt_key_word_r:
-                  { opt_kwd_r = YES; }
-               ;  
-no_opt_key_word_r:
-                  { opt_kwd_r = NO; }
-               ;  
-
-reduction_group:  name
-                { 
-                  if(($$=$1->id_attr) == SMNULL) {
-                      errstr("'%s' is not declared as reduction group", $1->ident, 69);
-                      $$ = make_local_entity($1,REDUCTION_GROUP_NAME,global_default,LOCAL);
-                  } else {
-                    if($$->variant != REDUCTION_GROUP_NAME)
-                      errstr("'%s' is not declared as reduction group", $1->ident, 69);
-                  }
-                }
-               ;       
-
-
-reduction_list: needkeyword reduction
-               {$$ = set_ll_list($2,LLNULL,EXPR_LIST);}
-              | reduction_list COMMA  needkeyword reduction
-               {$$ = set_ll_list($1,$4,EXPR_LIST);}
-             ;
-
-reduction: reduction_op LEFTPAR lhs RIGHTPAR
-           {$$ = make_llnd(fi,ARRAY_OP,$1,$3,SMNULL);}
-         | loc_op LEFTPAR variable_list COMMA expr RIGHTPAR
-           {$3 = set_ll_list($3,$5,EXPR_LIST);
-            $$ = make_llnd(fi,ARRAY_OP,$1,$3,SMNULL);}
-         ; 
-
-reduction_op: SUM
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "sum";
-              $$->type = global_string;
-             }
-            | PRODUCT
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "product";
-              $$->type = global_string;
-             }
-            | MIN
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "min";
-              $$->type = global_string;
-             }
-            | MAX
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "max";
-              $$->type = global_string;
-             }
-            | OR
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "or";
-              $$->type = global_string;
-             }
-            | AND
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "and";
-              $$->type = global_string;
-             }
-            | EQV
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "eqv";
-              $$->type = global_string;
-             }
-            | NEQV
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "neqv";
-              $$->type = global_string;
-             }
-            | UNKNOWN
-             { err("Illegal reduction operation name", 70);
-               errcnt--;
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "unknown";
-              $$->type = global_string;
-             }
-            ;
-
-loc_op:       MAXLOC
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "maxloc";
-              $$->type = global_string;
-             }
-            | MINLOC
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "minloc";
-              $$->type = global_string;
-             }
-/*
-            | UNKNOWN
-             { err("Illegal reduction operation name", 70);
-               errcnt--; 
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "unknown";
-              $$->type = global_string;
-             }
-*/
-             ;
-
-shadow_spec: COMMA needkeyword SHADOW_RENEW LEFTPAR shadow_list RIGHTPAR
-                { $$ = make_llnd(fi,SHADOW_RENEW_OP,$5,LLNULL,SMNULL);}
-           | COMMA needkeyword SHADOW_START_SPEC shadow_group_name
-/*
-                { PTR_LLND q;
-                  q = make_llnd(fi,VAR_REF,LLNULL,LLNULL,$4);
-                 $$ = make_llnd(fi,SHADOW_START_OP,q,LLNULL,SMNULL);
-                }
-*/
-                { $$ = make_llnd(fi,SHADOW_START_OP,LLNULL,LLNULL,$4);}
-           | COMMA needkeyword SHADOW_WAIT_SPEC  shadow_group_name
-                
-/*              {  PTR_LLND q;
-                  q = make_llnd(fi,VAR_REF,LLNULL,LLNULL,$4);
-                  $$ = make_llnd(fi,SHADOW_WAIT_OP,q,LLNULL,SMNULL);
-                } 
-*/
-                { $$ = make_llnd(fi,SHADOW_WAIT_OP,LLNULL,LLNULL,$4);} 
-           | COMMA needkeyword SHADOW_COMPUTE 
-                { $$ = make_llnd(fi,SHADOW_COMP_OP,LLNULL,LLNULL,SMNULL);}  
-           | COMMA needkeyword SHADOW_COMPUTE LEFTPAR  array_ident LEFTPAR  sh_width_list RIGHTPAR  RIGHTPAR 
-                {  $5-> entry.Template.ll_ptr1 = $7; $$ = make_llnd(fi,SHADOW_COMP_OP,$5,LLNULL,SMNULL);}  
-           ;
-
-shadow_group_name:  name
-       {$$ = make_local_entity($1, SHADOW_GROUP_NAME,global_default,LOCAL);}
-            ;        
-
-shadow_list: shadow
-              { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-           | shadow_list COMMA shadow
-              { $$ = set_ll_list($1,$3,EXPR_LIST);}
-           ;
-
-shadow: array_ident
-        { $$ = $1;} /* $$->variant is ARRAY_REF */
-      | array_ident LEFTPAR opt_corner CORNER  RIGHTPAR
-        { PTR_LLND p;
-          p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-          p->entry.string_val = (char *) "corner";
-          p->type = global_string;
-          $$ = make_llnd(fi,ARRAY_OP,$1,p,SMNULL);
-         }
-
-      | array_ident LEFTPAR  opt_corner sh_width_list RIGHTPAR
-        { $$ = $1;
-          $$-> entry.Template.ll_ptr1 = $4;  
-        }
-      | array_ident LEFTPAR opt_corner sh_width_list RIGHTPAR LEFTPAR needkeyword CORNER RIGHTPAR
-       { PTR_LLND p;
-          p = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-          p->entry.string_val = (char *) "corner";
-          p->type = global_string;
-          $1-> entry.Template.ll_ptr1 = $4;  
-          $$ = make_llnd(fi,ARRAY_OP,$1,p,SMNULL);
-       }
-
-      ;
- 
-opt_corner: 
-           { optcorner = YES; }
-          ;
-
-array_ident: ident
-       { PTR_SYMB s;
-         s = $1->entry.Template.symbol;
-         if(s->attr & PROCESSORS_BIT)
-             errstr( "Illegal use of PROCESSORS name %s ", s->ident, 53);
-         else if(s->attr & TASK_BIT)
-             errstr( "Illegal use of task array name %s ", s->ident, 71);
-         else
-           if(s->type->variant != T_ARRAY) 
-             errstr("'%s' isn't array", s->ident, 66);
-           else 
-              if((!(s->attr & DISTRIBUTE_BIT)) && (!(s->attr & ALIGN_BIT)))
-               ; /*errstr("hpf.gram: %s is not distributed array", s->ident);*/
-                
-         $$ = $1;
-        }
-           ;
-
-array_ident_list: array_ident
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | array_ident_list COMMA array_ident
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-dvm_shadow_start: SHADOW_START end_spec shadow_group_name
-         { $$ = get_bfnd(fi,DVM_SHADOW_START_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-                |  SHADOW_START_SPEC end_spec shadow_group_name
-                {errstr("Missing DVM directive prefix", 49);}
-                ;
-
-dvm_shadow_wait: SHADOW_WAIT  end_spec shadow_group_name
-         { $$ = get_bfnd(fi,DVM_SHADOW_WAIT_DIR,$3,LLNULL,LLNULL,LLNULL);}  
-                |  SHADOW_WAIT_SPEC end_spec shadow_group_name
-                {errstr("Missing DVM directive prefix", 49);}
-               ;
-
-dvm_shadow_group: SHADOW_GROUP end_spec shadow_group_name LEFTPAR shadow_list RIGHTPAR
-          { $$ = get_bfnd(fi,DVM_SHADOW_GROUP_DIR,$3,$5,LLNULL,LLNULL);}   
-                ;
-
-dvm_reduction_start: REDUCTION_START end_spec reduction_group
-         { $$ = get_bfnd(fi,DVM_REDUCTION_START_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-                ;
-
-dvm_reduction_wait: REDUCTION_WAIT  end_spec reduction_group
-         { $$ = get_bfnd(fi,DVM_REDUCTION_WAIT_DIR,$3,LLNULL,LLNULL,LLNULL);}  
-               ;
-/*
-dvm_reduction_group: REDUCTION_GROUP  end_spec reduction_group_name LEFTPAR reduction_list RIGHTPAR
-          { $$ = get_bfnd(fi,DVM_REDUCTION_GROUP_DIR,$3,$5,LLNULL,LLNULL);}
-                   ;
-*/
-
-dvm_consistent_start: CONSISTENT_START end_spec consistent_group
-         { $$ = get_bfnd(fi,DVM_CONSISTENT_START_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-                ;
-
-dvm_consistent_wait: CONSISTENT_WAIT  end_spec consistent_group
-         { $$ = get_bfnd(fi,DVM_CONSISTENT_WAIT_DIR,$3,LLNULL,LLNULL,LLNULL);}  
-               ;
-
-dvm_remote_access: REMOTE_ACCESS end_spec LEFTPAR group_name COLON remote_data_list RIGHTPAR 
-         { if(($4->attr & INDIRECT_BIT))
-                errstr("'%s' is not remote group name", $4->ident, 68);
-           $$ = get_bfnd(fi,DVM_REMOTE_ACCESS_DIR,$4,$6,LLNULL,LLNULL);
-         }
-                 | REMOTE_ACCESS  end_spec LEFTPAR remote_data_list RIGHTPAR 
-         { $$ = get_bfnd(fi,DVM_REMOTE_ACCESS_DIR,SMNULL,$4,LLNULL,LLNULL);}
-                 ;
-
-group_name: name
-          {  
-            if(($$=$1->id_attr) == SMNULL){
-                errstr("'%s' is not declared as group", $1->ident, 74);
-                $$ = make_local_entity($1,REF_GROUP_NAME,global_default,LOCAL);
-            } else {
-              if($$->variant != REF_GROUP_NAME)
-                errstr("'%s' is not declared as group", $1->ident, 74);
-            }
-          }
-          ;
-
-remote_data_list: remote_data
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-              | remote_data_list COMMA remote_data
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-remote_data: array_ident LEFTPAR remote_index_list RIGHTPAR
-            {
-              $$ = $1;
-              $$->entry.Template.ll_ptr1 = $3;
-            }
-           | array_ident
-             { $$ = $1;}
-           ;
-
-remote_index_list: remote_index
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                 | remote_index_list COMMA remote_index
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-remote_index: expr
-            { $$ = $1;}
-            | COLON
-            { $$ = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL);}
-             ;
-
-dvm_task: TASK in_dcl  task_array
-          {  PTR_LLND q;
-             q = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-             $$ = get_bfnd(fi,DVM_TASK_DIR,SMNULL,q,LLNULL,LLNULL);
-          }
-        | dvm_task COMMA task_array
-          {   PTR_LLND q;
-              q = make_llnd(fi,EXPR_LIST, $3, LLNULL, SMNULL);
-	      add_to_lowLevelList(q, $1->entry.Template.ll_ptr1);
-          }
-        ;
-
-task_array: name dims
-           { 
-             PTR_SYMB s;
-	      s = make_array($1, global_int, $2, ndim, LOCAL);
-              if($2){
-                  s->attr = s->attr | DIMENSION_BIT;
-                  s->type->entry.ar_decl.ranges = $2;
-              }
-              else
-                  err("No dimensions in TASK directive", 75);
-              if(ndim > 1)
-                  errstr("Illegal rank of '%s'", s->ident, 76);
-              if(s->attr & TASK_BIT)
-                errstr( "Multiple declaration of identifier  %s ", s->ident, 73);
-              if((s->attr & ALIGN_BIT) ||(s->attr & DISTRIBUTE_BIT) ||(s->attr & TEMPLATE_BIT) || (s->attr & DYNAMIC_BIT) ||(s->attr & SHADOW_BIT) || (s->attr & PROCESSORS_BIT)  || (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT))
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16);
-              else
-	        s->attr = s->attr | TASK_BIT;
-    
-	      $$ = make_llnd(fi,ARRAY_REF, $2, LLNULL, s);	  
-	    }    
-	;
-
-dvm_task_region: TASK_REGION  end_spec task_name  
-                 {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,LLNULL,LLNULL,LLNULL);}             
-               | TASK_REGION  end_spec task_name reduction_spec
-                {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,$4,LLNULL,LLNULL);}
-               | TASK_REGION  end_spec task_name consistent_spec
-                {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,LLNULL,$4,LLNULL);}
-               | TASK_REGION  end_spec task_name reduction_spec consistent_spec
-                {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,$4,$5,LLNULL);}              
-               | TASK_REGION  end_spec task_name consistent_spec reduction_spec
-                {$$ = get_bfnd(fi,DVM_TASK_REGION_DIR,$3,$5,$4,LLNULL);}                  
-               ;
-
-task_name:   name
-             { PTR_SYMB s;
-              if((s=$1->id_attr) == SMNULL)
-                s = make_array($1, TYNULL, LLNULL, 0, LOCAL);
-              
-              if(!(s->attr & TASK_BIT))
-                 errstr("'%s' is not task array", s->ident, 77);
-              $$ = s;
-              }
-              ;
-
-dvm_end_task_region:  ENDTASK_REGION  end_spec
-          { $$ = get_bfnd(fi,DVM_END_TASK_REGION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-                   ;
-
-task:  task_name  LEFTPAR expr RIGHTPAR
-           {  PTR_SYMB s;
-              PTR_LLND q;
-             /*
-              s = make_array($1, TYNULL, LLNULL, 0, LOCAL);                           
-	      if((parstate == INEXEC) && !(s->attr & TASK_BIT))
-                 errstr("'%s' is not task array", s->ident, 77);  
-              q =  set_ll_list($3,LLNULL,EXPR_LIST);
-	      $$ = make_llnd(fi,ARRAY_REF, q, LLNULL, s);
-              */
-
-              s = $1;
-              q =  set_ll_list($3,LLNULL,EXPR_LIST);
-	      $$ = make_llnd(fi,ARRAY_REF, q, LLNULL, s);
-	   }
-     | task_name  LEFTPAR triplet RIGHTPAR 
-           {  PTR_LLND q; 
-              q =  set_ll_list($3,LLNULL,EXPR_LIST);
-	      $$ = make_llnd(fi,ARRAY_REF, q, LLNULL, $1);
-	   }
-            ;        
-
-dvm_on: ON_DIR end_spec array_ele_substring_func_ref opt_private_spec
-    {              
-         $$ = get_bfnd(fi,DVM_ON_DIR,SMNULL,$3,$4,LLNULL);
-    } 
-      ;  
-
-opt_private_spec: 
-             {$$ = LLNULL;}
-            | private_spec
-             { $$ = $1;}
-            ;
-
-dvm_end_on: ENDON end_spec
-         {$$ = get_bfnd(fi,DVM_END_ON_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-          ;
-
-dvm_map:  MAP end_spec task  needkeyword ONTO processors_name dims
-      { PTR_LLND q;
-        /* if(!($6->attr & PROCESSORS_BIT))
-           errstr("'%s' is not processor array", $6->ident, 67);
-         */
-        q = make_llnd(fi,ARRAY_REF, $7, LLNULL, $6);
-        $$ = get_bfnd(fi,DVM_MAP_DIR,SMNULL,$3,q,LLNULL);
-      }
-      | MAP end_spec task  needkeyword BY lhs
-       { $$ = get_bfnd(fi,DVM_MAP_DIR,SMNULL,$3,LLNULL,$6); } 
-       ;
-
-dvm_prefetch: PREFETCH end_spec group_name
-              { $$ = get_bfnd(fi,DVM_PREFETCH_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-            ;
-
-dvm_reset: RESET end_spec group_name
-           { $$ = get_bfnd(fi,DVM_RESET_DIR,$3,LLNULL,LLNULL,LLNULL);} 
-         ;
-/*
-dvm_indirect_access: INDIRECT_ACCESS end_spec LEFTPAR opt_group indirect_list RIGHTPAR 
-                    { $$ = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,$4,$5,LLNULL,LLNULL);} 
-                   ;
-*/
-dvm_indirect_access: INDIRECT_ACCESS end_spec LEFTPAR group_name COLON indirect_list RIGHTPAR 
-                    { if(!($4->attr & INDIRECT_BIT))
-                         errstr("'%s' is not indirect group name", $4->ident, 313);
-                      $$ = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,$4,$6,LLNULL,LLNULL);
-                    }
-                   | INDIRECT_ACCESS end_spec LEFTPAR  indirect_list RIGHTPAR 
-                    { $$ = get_bfnd(fi,DVM_INDIRECT_ACCESS_DIR,SMNULL,$4,LLNULL,LLNULL);} 
-                   ;
-/*
-opt_group:
-               { $$ = SMNULL;}
-         |  group_name COLON 
-               { if(!($1->attr & INDIRECT_BIT))
-                   errstr("'%s' is not indirect group name", $1->ident, 313);
-                 $$ = $1;
-                }
-         ;
-*/
-
-indirect_list: indirect_reference
-	    { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-            | indirect_list COMMA  indirect_reference 
-	    { $$ = set_ll_list($1,$3,EXPR_LIST); }	    
-	;
-
-indirect_reference: array_ident
-                    { $$ = $1;} 
-                  | array_ident LEFTPAR subscript_list RIGHTPAR
-                    { $$ = $1; $$->entry.Template.ll_ptr1 = $3;} 
-                  ; 
-/* 
-dvm_own: OWN
-          { $$ = get_bfnd(fi,DVM_OWN_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-       ;
-*/
-  
-hpf_independent: INDEPENDENT end_spec
-                { $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}  
-               | INDEPENDENT end_spec new_spec
-                { $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, $3, LLNULL, LLNULL);}
-               | INDEPENDENT end_spec hpf_reduction_spec
-                { $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, LLNULL, $3, LLNULL);}
-               | INDEPENDENT end_spec new_spec hpf_reduction_spec
-                { $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, $3, $4,LLNULL);}
-
-               ;
- /*
-               | INDEPENDENT end_spec COMMA needkeyword NEW LEFTPAR new_variable_list  RIGHTPAR
-      { PTR_LLND p;
-        p  = make_llnd(fi,NEW_SPEC_OP, $7, LLNULL, SMNULL);
-        $$ = get_bfnd(fi,HPF_INDEPENDENT_DIR,SMNULL, p, LLNULL,LLNULL);
-      }  
-  */      
-
-/*
-new_variable_list: new_variable
-            { $$ = set_ll_list($1,LLNULL,EXPR_LIST);}
-             | new_variable_list COMMA new_variable
-            { $$ = set_ll_list($1,$3,EXPR_LIST);}
-             ;
-
-new_variable: lhs
-        { PTR_SYMB s;
-          if($1->variant == FUNC_CALL)
-               errstr("illegal function call");
-          s = $1->entry.Template.symbol;
-          if(s->attr & SAVE_BIT)
-               errstr("'%s' has the SAVE attribute", s->ident);  
-          if(s->attr & TARGET_BIT)
-                 errstr("'%s' has the TARGET attribute", s->ident);
-          if(s->attr & DVM_POINTER_BIT)
-                 errstr("'%s' is a pointer", s->ident);
-          if(s->entry.var_decl.local == IO)
-                 errstr("'%s' is a dummy argument", s->ident);
-        }
-           ;
-*/
-
-hpf_reduction_spec: COMMA needkeyword REDUCTION LEFTPAR variable_list RIGHTPAR
-              {$$ = make_llnd(fi,REDUCTION_OP,$5,LLNULL,SMNULL);}
-                  ;
-
-dvm_asynchronous: ASYNCHRONOUS end_spec async
-                { $$ = get_bfnd(fi,DVM_ASYNCHRONOUS_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-                ;
-
-dvm_endasynchronous: ENDASYNCHRONOUS end_spec 
-                { $$ = get_bfnd(fi,DVM_ENDASYNCHRONOUS_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-                ;
-
-dvm_asyncwait: ASYNCWAIT end_spec async
-                { $$ = get_bfnd(fi,DVM_ASYNCWAIT_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             ;
-
-async_ident: name 
-     {  
-            if(($$=$1->id_attr) == SMNULL) {
-                errstr("'%s' is not declared as ASYNCID", $1->ident, 115);
-                $$ = make_local_entity($1,ASYNC_ID,global_default,LOCAL);
-            } else {
-              if($$->variant != ASYNC_ID)
-                errstr("'%s' is not declared as ASYNCID", $1->ident, 115);
-            }
-     }
-     ;
-
-async: async_ident
-      { $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, $1);}
-     | async_ident LEFTPAR subscript_list RIGHTPAR
-       { $$ = make_llnd(fi,ARRAY_REF, $3, LLNULL, $1);} 
-     ;
-
-dvm_f90: F90 end_spec lhs EQUAL lhs
-        { $$ = get_bfnd(fi,DVM_F90_DIR,SMNULL,$3,$5,LLNULL);} 
-       ;
-dvm_debug_dir: DEBUG end_spec fragment_number
-               { $$ = get_bfnd(fi,DVM_DEBUG_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             |  DEBUG end_spec fragment_number LEFTPAR debparamlist RIGHTPAR 
-               { $$ = get_bfnd(fi,DVM_DEBUG_DIR,SMNULL,$3,$5,LLNULL);} 
-             ;
-
-debparamlist:  in_ioctl debparam
-	    { 
-              $$ = set_ll_list($2, LLNULL, EXPR_LIST);
-              endioctl();
-            }
-	    | debparamlist COMMA in_ioctl debparam
-	    { 
-              $$ = set_ll_list($1, $4, EXPR_LIST);
-              endioctl();
-            }
-	    ;
-
-debparam:  nameeq expr
-           { $$  = make_llnd(fi, KEYWORD_ARG, $1, $2, SMNULL); } /* SPEC_PAIR*/
-        ;
-fragment_number:  INT_CONSTANT
-	        {
-	         $$ = make_llnd(fi,INT_VAL, LLNULL, LLNULL, SMNULL);
-	         $$->entry.ival = atoi(yytext);
-	         $$->type = global_int;
-	        }
-              ;
-
-dvm_enddebug_dir: ENDDEBUG end_spec fragment_number
-       { $$ = get_bfnd(fi,DVM_ENDDEBUG_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             ;
-
-dvm_interval_dir: INTERVAL end_spec interval_number 
-       { $$ = get_bfnd(fi,DVM_INTERVAL_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             ;
-
-interval_number:
-                { $$ = LLNULL;}
-
-               |  expr
-                { if($1->type->variant != T_INT)             
-                    err("Illegal interval number", 78);
-                  $$ = $1;
-                 }
-               ;
-
-dvm_exit_interval_dir: EXITINTERVAL end_spec subscript_list 
-                      /* subscript_list - interval number list */ 
-       { $$ = get_bfnd(fi,DVM_EXIT_INTERVAL_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-             ;
-
-dvm_endinterval_dir: ENDINTERVAL end_spec
-            { $$ = get_bfnd(fi,DVM_ENDINTERVAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-                   ;
-
-dvm_traceon_dir: TRACEON end_spec
-            { $$ = get_bfnd(fi,DVM_TRACEON_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-               ;
-
-dvm_traceoff_dir: TRACEOFF end_spec
-            { $$ = get_bfnd(fi,DVM_TRACEOFF_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-               ;
-
-dvm_barrier_dir: BARRIER end_spec
-            { $$ = get_bfnd(fi,DVM_BARRIER_DIR,SMNULL,LLNULL,LLNULL,LLNULL);} 
-               ;
-
-dvm_check: CHECK end_spec in_ioctl LEFTPAR callarglist RIGHTPAR end_ioctl opt_double_colon variable_list 
-          { $$ = get_bfnd(fi,DVM_CHECK_DIR,SMNULL,$9,$5,LLNULL); }         
-         ;
-
-dvm_io_mode_dir: IO_MODE end_spec LEFTPAR mode_list RIGHTPAR
-            { $$ = get_bfnd(fi,DVM_IO_MODE_DIR,SMNULL,$4,LLNULL,LLNULL);} 
-               ;
-mode_list:   mode_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-         |   mode_list COMMA mode_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-         ;
-
-mode_spec:  needkeyword ACC_ASYNC
-              { $$ = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);}
-         |  needkeyword ACC_LOCAL
-              { $$ = make_llnd(fi,ACC_LOCAL_OP, LLNULL,LLNULL,SMNULL);}
-         |  needkeyword PARALLEL
-              { $$ = make_llnd(fi,PARALLEL_OP, LLNULL,LLNULL,SMNULL);}
-         ;
-
-dvm_shadow_add: SHADOW_ADD end_spec LEFTPAR template_ref EQUAL shadow_id RIGHTPAR opt_key_word opt_include_to 
-              { $$ = get_bfnd(fi,DVM_SHADOW_ADD_DIR,SMNULL,$4,$6,$9); }
-              ;
-
-template_ref:  ident LEFTPAR shadow_axis_list RIGHTPAR
-               {
-                 if($1->type->variant != T_ARRAY) 
-                    errstr("'%s' isn't array", $1->entry.Template.symbol->ident, 66);
-                 if(!($1->entry.Template.symbol->attr & TEMPLATE_BIT))
-                    errstr("'%s' isn't TEMPLATE", $1->entry.Template.symbol->ident, 628);
-                 $1->entry.Template.ll_ptr1 = $3;
-                 $$ = $1;
-                 /*$$->type = $1->type->entry.ar_decl.base_type;*/
-               }
-            ;
-
-shadow_axis_list: shadow_axis
-	          { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                | shadow_axis_list COMMA shadow_axis
-	          { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-                ;
-
-shadow_axis: derived_spec
-             { $$ = $1; }
-           | aster_expr
-             { $$ = $1; }
-           ;
-
-opt_include_to: INCLUDE_TO array_ident_list
-                { $$ = $2;}              
-	      |  
-                { $$ = LLNULL; opt_kwd_ = NO;}
-              ;
- 
-dvm_localize: LOCALIZE end_spec LEFTPAR ident POINT_TO localize_target  RIGHTPAR
-              { $$ = get_bfnd(fi,DVM_LOCALIZE_DIR,SMNULL,$4,$6,LLNULL); }
-            ;
-
-localize_target: ident
-                {
-                 if($1->type->variant != T_ARRAY) 
-                    errstr("'%s' isn't array", $1->entry.Template.symbol->ident, 66); 
-                 $$ = $1;
-                }
-               | ident  LEFTPAR target_subscript_list RIGHTPAR
-                {
-                 if($1->type->variant != T_ARRAY) 
-                    errstr("'%s' isn't array", $1->entry.Template.symbol->ident, 66); 
-                                 
-                 $1->entry.Template.ll_ptr1 = $3;
-                 $$ = $1;
-                 $$->type = $1->type->entry.ar_decl.base_type;
-                }
-                                                          
-               ;
-
-target_subscript_list: target_subscript
-	               { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                     | target_subscript_list COMMA target_subscript
-	               { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-                     ;
-
-target_subscript: aster_expr
-                { $$ = $1; }
-                | COLON
-                { $$ = make_llnd(fi,DDOT, LLNULL, LLNULL, SMNULL);}
-                ;
-
-aster_expr: ASTER
-          { 
-            $$ = make_llnd(fi,KEYWORD_VAL, LLNULL, LLNULL, SMNULL);
-            $$->entry.string_val = (char *) "*";
-            $$->type = global_string;
-          }
-          ;
-
-dvm_cp_create: CP_CREATE end_spec expr COMMA needkeyword VARLIST LEFTPAR variable_list RIGHTPAR COMMA needkeyword FILES LEFTPAR subscript_list RIGHTPAR  opt_mode 
-              { 
-                PTR_LLND q;
-                if($16)
-                  q = make_llnd(fi,ARRAY_OP, $14, $16, SMNULL);
-                else
-                  q = $14;                  
-                $$ = get_bfnd(fi,DVM_CP_CREATE_DIR,SMNULL,$3,$8,q); 
-              } 
-             ;
-
-opt_mode:
-              { $$ = LLNULL; }
-            |  COMMA needkeyword PARALLEL
-              { $$ = make_llnd(fi, PARALLEL_OP, LLNULL, LLNULL, SMNULL); }
-            |  COMMA needkeyword ACC_LOCAL 
-              { $$ = make_llnd(fi,ACC_LOCAL_OP, LLNULL, LLNULL, SMNULL); }  
-            ;
-
-dvm_cp_load:   CP_LOAD end_spec expr
-              { $$ = get_bfnd(fi,DVM_CP_LOAD_DIR,SMNULL,$3,LLNULL,LLNULL); } 
-           ;
-
-dvm_cp_save:   CP_SAVE end_spec expr
-              { $$ = get_bfnd(fi,DVM_CP_SAVE_DIR,SMNULL,$3,LLNULL,LLNULL); }              
-           |   CP_SAVE end_spec expr COMMA needkeyword ACC_ASYNC 
-              {
-                PTR_LLND q;
-                q = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);
-                $$ = get_bfnd(fi,DVM_CP_SAVE_DIR,SMNULL,$3,q,LLNULL);
-              }
-           ;
-
-dvm_cp_wait:   CP_WAIT end_spec expr COMMA needkeyword STATUS LEFTPAR ident RIGHTPAR
-              { $$ = get_bfnd(fi,DVM_CP_WAIT_DIR,SMNULL,$3,$8,LLNULL); }
-           ;
-
-dvm_template_create: TEMPLATE_CREATE end_spec  LEFTPAR  template_list RIGHTPAR
-                     { $$ = get_bfnd(fi,DVM_TEMPLATE_CREATE_DIR,SMNULL,$4,LLNULL,LLNULL); }
-                   ;
-template_list: array_element
-	       { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	     | template_list COMMA array_element
-               { $$ = set_ll_list($1, $3, EXPR_LIST); }
-             ;
-
-dvm_template_delete: TEMPLATE_DELETE end_spec  LEFTPAR ident_list RIGHTPAR
-                     { $$ = get_bfnd(fi,DVM_TEMPLATE_DELETE_DIR,SMNULL,$4,LLNULL,LLNULL); }
-                   ;
-
-omp_specification_directive: omp_threadprivate_directive
-	;
-omp_execution_directive: omp_parallel_begin_directive
-	| omp_parallel_end_directive
-	| omp_sections_begin_directive
-	| omp_sections_end_directive
-	| omp_section_directive
-	| omp_do_begin_directive
-	| omp_do_end_directive
-	| omp_single_begin_directive
-	| omp_single_end_directive
-	| omp_workshare_begin_directive
-	| omp_workshare_end_directive
-	| omp_parallel_do_begin_directive
-	| omp_parallel_do_end_directive
-	| omp_parallel_sections_begin_directive
-	| omp_parallel_sections_end_directive
-	| omp_parallel_workshare_begin_directive
-	| omp_parallel_workshare_end_directive
-	| omp_master_begin_directive
-	| omp_master_end_directive
-	| omp_ordered_begin_directive
-	| omp_ordered_end_directive
-	| omp_barrier_directive
-	| omp_atomic_directive
-	| omp_flush_directive
-	| omp_critical_begin_directive
-	| omp_critical_end_directive
-	;
-
-ompdvm_onethread: OMPDVM_ONETHREAD end_spec 
-	{
-          $$ = get_bfnd(fi,OMP_ONETHREAD_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	};
-
-
-omp_parallel_end_directive: OMPDVM_ENDPARALLEL end_spec 
-	{
-  	   $$ = make_endparallel();
-	};
-
-
-omp_parallel_begin_directive: OMPDVM_PARALLEL end_spec opt_key_word parallel_clause_list
-	{
-  	   $$ = make_parallel();
-           $$->entry.Template.ll_ptr1 = $4;
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_PARALLEL end_spec opt_key_word
-	{
-  	   $$ = make_parallel();
-	   opt_kwd_ = NO;
-	};
-
-parallel_clause_list: opt_comma opt_key_word parallel_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| parallel_clause_list opt_comma opt_key_word parallel_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);	
-	}
-	;
-
-parallel_clause:  ompprivate_clause
-        | ompreduction_clause
-        | ompshared_clause
-        | ompdefault_clause
-        | ompfirstprivate_clause
-	| omplastprivate_clause
-        | ompcopyin_clause
-	| ompif_clause
-	| ompnumthreads_clause
-        ;
-
-omp_variable_list_in_par: op_slash_1 LEFTPAR op_slash_0 omp_variable_list RIGHTPAR
-        {
-		$$ = $4;
-        };
-
-ompprivate_clause: PRIVATE omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_PRIVATE,$2,LLNULL,SMNULL);
-	};
-
-ompfirstprivate_clause: OMPDVM_FIRSTPRIVATE omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_FIRSTPRIVATE,$2,LLNULL,SMNULL);
-	}
-        ;
-
-omplastprivate_clause: OMPDVM_LASTPRIVATE omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_LASTPRIVATE,$2,LLNULL,SMNULL);
-	}
-        ;
-
-ompcopyin_clause: OMPDVM_COPYIN omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_COPYIN,$2,LLNULL,SMNULL);
-	}
-        ;
-
-ompshared_clause: OMPDVM_SHARED omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_SHARED,$2,LLNULL,SMNULL);
-	}
-        ;
-ompdefault_clause: DEFAULT_CASE LEFTPAR needkeyword def_expr RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_DEFAULT,$4,LLNULL,SMNULL);
-	}
-        ;
-
-def_expr: PRIVATE
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "private";
-		$$->type = global_string;
-	}
-	| OMPDVM_SHARED
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "shared";
-		$$->type = global_string;
-	}
-	| OMPDVM_NONE
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "none";
-		$$->type = global_string;
-	}
-	;
-ompif_clause: OMPDVM_IF LEFTPAR expr RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_IF,$3,LLNULL,SMNULL);
-	}
-        ;
-
-ompnumthreads_clause: OMPDVM_NUM_THREADS LEFTPAR expr RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_NUM_THREADS,$3,LLNULL,SMNULL);
-	}
-        ;
-
-ompreduction_clause: REDUCTION LEFTPAR ompreduction RIGHTPAR
-	{
-		PTR_LLND q;
-		q = set_ll_list($3,LLNULL,EXPR_LIST);
-		$$ = make_llnd(fi,OMP_REDUCTION,q,LLNULL,SMNULL);
-	};
-
-ompreduction:  opt_key_word ompreduction_op COLON ompreduction_vars
-           {$$ = make_llnd(fi,DDOT,$2,$4,SMNULL);}
-         ; 
-
-ompreduction_vars: variable_list;
-
-ompreduction_op: PLUS
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "+";
-              $$->type = global_string;
-             }
-	    | MINUS
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "-";
-              $$->type = global_string;
-             }
-
-            | ASTER
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "*";
-              $$->type = global_string;
-             }
-            | SLASH
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "/";
-              $$->type = global_string;
-             }
-            | MIN
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "min";
-              $$->type = global_string;
-             }
-            | MAX
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "max";
-              $$->type = global_string;
-             }
-            | OR
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) ".or.";
-              $$->type = global_string;
-             }
-            | AND
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) ".and.";
-              $$->type = global_string;
-             }
-            | EQV
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) ".eqv.";
-              $$->type = global_string;
-             }
-            | NEQV
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) ".neqv.";
-              $$->type = global_string;
-             }
-            | IAND
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "iand";
-              $$->type = global_string;
-             }
-            | IEOR
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "ieor";
-              $$->type = global_string;
-             }
-            | IOR
-             {
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "ior";
-              $$->type = global_string;
-             }
-            | UNKNOWN
-             { err("Illegal reduction operation name", 70);
-               errcnt--;
-              $$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-              $$->entry.string_val = (char *) "unknown";
-              $$->type = global_string;
-             }
-            ;
-
-
-omp_sections_begin_directive: OMPDVM_SECTIONS end_spec opt_key_word sections_clause_list 
-	{
-  	   $$ = make_sections($4);
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_SECTIONS end_spec opt_key_word
-	{
-  	   $$ = make_sections(LLNULL);
-	   opt_kwd_ = NO;
-	};
-
-sections_clause_list: opt_comma opt_key_word sections_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| sections_clause_list opt_comma opt_key_word sections_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-sections_clause:  ompprivate_clause
-        | ompreduction_clause
-        | ompfirstprivate_clause
-	| omplastprivate_clause
-        ;
-
-omp_sections_end_directive: OMPDVM_ENDSECTIONS end_spec opt_key_word ompnowait_clause
-	{
-		PTR_LLND q;
-   	        $$ = make_endsections();
-		q = set_ll_list($4,LLNULL,EXPR_LIST);
-                $$->entry.Template.ll_ptr1 = q;
-                opt_kwd_ = NO;
-	}
-	| OMPDVM_ENDSECTIONS end_spec opt_key_word
-	{
-   	        $$ = make_endsections();
-	        opt_kwd_ = NO; 
-	};
-
-omp_section_directive: OMPDVM_SECTION end_spec
-	{
-           $$ = make_ompsection();
-	};
-
-
-omp_do_begin_directive: OMPDVM_DO end_spec opt_key_word do_clause_list 
-	{
-           $$ = get_bfnd(fi,OMP_DO_DIR,SMNULL,$4,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_DO end_spec opt_key_word
-	{
-           $$ = get_bfnd(fi,OMP_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	};
-
-omp_do_end_directive: OMPDVM_ENDDO end_spec opt_key_word ompnowait_clause
-	{
-		PTR_LLND q;
-		q = set_ll_list($4,LLNULL,EXPR_LIST);
-	        $$ = get_bfnd(fi,OMP_END_DO_DIR,SMNULL,q,LLNULL,LLNULL);
-      	        opt_kwd_ = NO;
-	}
-	| OMPDVM_ENDDO end_spec opt_key_word 
-	{
-           $$ = get_bfnd(fi,OMP_END_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	};
-
-do_clause_list: opt_comma opt_key_word do_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| do_clause_list opt_comma opt_key_word do_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-do_clause:  ompprivate_clause
-        | ompreduction_clause
-        | ompfirstprivate_clause
-	| omplastprivate_clause
-	| ompschedule_clause
-	| ompordered_clause
-        ;
-
-ompordered_clause: OMPDVM_ORDERED
-	{
-		/*$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "ORDERED";
-		$$->type = global_string;*/
-                $$ = make_llnd(fi,OMP_ORDERED,LLNULL,LLNULL,SMNULL);
-	}
-	;
-
-ompschedule_clause: OMPDVM_SCHEDULE LEFTPAR needkeyword ompschedule_op COMMA expr RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_SCHEDULE,$4,$6,SMNULL);
-	}
-	| OMPDVM_SCHEDULE LEFTPAR needkeyword ompschedule_op RIGHTPAR
-	{
-		$$ = make_llnd(fi,OMP_SCHEDULE,$4,LLNULL,SMNULL);
-	}
-	;
-
-ompschedule_op: STATIC
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "STATIC";
-		$$->type = global_string;
-		
-	}
-	| DYNAMIC
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "DYNAMIC";
-		$$->type = global_string;
-		
-	}
-	| OMPDVM_GUIDED
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "GUIDED";
-		$$->type = global_string;
-		
-	}
-	| OMPDVM_RUNTIME
-	{
-		$$ = make_llnd(fi,KEYWORD_VAL,LLNULL,LLNULL,SMNULL);
-		$$->entry.string_val = (char *) "RUNTIME";
-		$$->type = global_string;
-		
-	}
-	;
-
-omp_single_begin_directive: OMPDVM_SINGLE end_spec opt_key_word single_clause_list 
-	{
-  	   $$ = make_single();
-           $$->entry.Template.ll_ptr1 = $4;
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_SINGLE end_spec opt_key_word
-	{
-  	   $$ = make_single();
-	   opt_kwd_ = NO;
-	};
-
-single_clause_list: opt_comma opt_key_word single_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| single_clause_list opt_comma opt_key_word single_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-single_clause:  ompprivate_clause
-        | ompfirstprivate_clause
-        ;
-
-omp_single_end_directive: OMPDVM_ENDSINGLE end_spec opt_key_word end_single_clause_list 
-	{
-  	   $$ = make_endsingle();
-           $$->entry.Template.ll_ptr1 = $4;
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_ENDSINGLE end_spec opt_key_word
-	{
-  	   $$ = make_endsingle();
-	   opt_kwd_ = NO;
-	};
-
-end_single_clause_list: opt_comma opt_key_word end_single_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| end_single_clause_list opt_comma opt_key_word end_single_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-
-end_single_clause:  ompnowait_clause
-        | ompcopyprivate_clause
-        ;
-
-ompcopyprivate_clause: OMPDVM_COPYPRIVATE omp_variable_list_in_par
-	{
-		$$ = make_llnd(fi,OMP_COPYPRIVATE,$2,LLNULL,SMNULL);
-	}
-        ;
-
-ompnowait_clause: OMPDVM_NOWAIT
-	{
-		$$ = make_llnd(fi,OMP_NOWAIT,LLNULL,LLNULL,SMNULL);
-	}
-        ;
-
-omp_workshare_begin_directive: OMPDVM_WORKSHARE end_spec
-	{
-           $$ = make_workshare();
-	};
-
-omp_workshare_end_directive: OMPDVM_ENDWORKSHARE end_spec opt_key_word ompnowait_clause
-	{
-		PTR_LLND q;
-   	        $$ = make_endworkshare();
-		q = set_ll_list($4,LLNULL,EXPR_LIST);
-                $$->entry.Template.ll_ptr1 = q;
-  	        opt_kwd_ = NO;
-	}
-	| OMPDVM_ENDWORKSHARE end_spec opt_key_word
-	{
-   	        $$ = make_endworkshare();
-                opt_kwd_ = NO;
-	};
-
-omp_parallel_do_begin_directive: OMPDVM_PARALLELDO end_spec opt_key_word paralleldo_clause_list  
-	{
-           $$ = get_bfnd(fi,OMP_PARALLEL_DO_DIR,SMNULL,$4,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_PARALLELDO end_spec opt_key_word
-	{
-           $$ = get_bfnd(fi,OMP_PARALLEL_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	   opt_kwd_ = NO;
-	}
-	;
-
-paralleldo_clause_list: opt_comma opt_key_word paralleldo_clause opt_key_word
-	{ 
-		$$ = set_ll_list($3,LLNULL,EXPR_LIST);
-	}
-	| paralleldo_clause_list opt_comma opt_key_word paralleldo_clause opt_key_word
-	{ 
-		$$ = set_ll_list($1,$4,EXPR_LIST);
-	}
-	;
-
-paralleldo_clause: ompprivate_clause
-        | ompreduction_clause
-        | ompshared_clause
-        | ompdefault_clause
-        | ompfirstprivate_clause
-	| omplastprivate_clause
-        | ompcopyin_clause
-	| ompif_clause
-	| ompnumthreads_clause
-	| ompschedule_clause
-	| ompordered_clause
-        ;
-
-
-omp_parallel_do_end_directive: OMPDVM_ENDPARALLELDO end_spec
-	{
-           $$ = get_bfnd(fi,OMP_END_PARALLEL_DO_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	};
-
-omp_parallel_sections_begin_directive: OMPDVM_PARALLELSECTIONS end_spec opt_key_word parallel_clause_list
-	{
-           $$ = make_parallelsections($4);
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_PARALLELSECTIONS end_spec opt_key_word
-	{
-           $$ = make_parallelsections(LLNULL);
-	   opt_kwd_ = NO;
-	};
-
-
-omp_parallel_sections_end_directive: OMPDVM_ENDPARALLELSECTIONS end_spec
-	{
-           $$ = make_endparallelsections();
-	};
-
-omp_parallel_workshare_begin_directive: OMPDVM_PARALLELWORKSHARE end_spec opt_key_word parallel_clause_list 
-	{
-           $$ = make_parallelworkshare();
-           $$->entry.Template.ll_ptr1 = $4;
-	   opt_kwd_ = NO;
-	}
-	| OMPDVM_PARALLELWORKSHARE end_spec opt_key_word
-	{
-           $$ = make_parallelworkshare();
-	   opt_kwd_ = NO;
-	};
-
-omp_parallel_workshare_end_directive: OMPDVM_ENDPARALLELWORKSHARE end_spec
-	{
-           $$ = make_endparallelworkshare();
-	};
-
-omp_threadprivate_directive: OMPDVM_THREADPRIVATE in_dcl omp_variable_list_in_par
-	{ 
-	   $$ = get_bfnd(fi,OMP_THREADPRIVATE_DIR, SMNULL, $3, LLNULL, LLNULL);
-	};
-
-omp_master_begin_directive: OMPDVM_MASTER end_spec 
-	{
-  	   $$ = make_master();
-	};
-
-omp_master_end_directive: OMPDVM_ENDMASTER end_spec 
-	{
-  	   $$ = make_endmaster();
-	};
-omp_ordered_begin_directive: OMPDVM_ORDERED end_spec 
-	{
-  	   $$ = make_ordered();
-	};
-
-omp_ordered_end_directive: OMPDVM_ENDORDERED end_spec 
-	{
-  	   $$ = make_endordered();
-	};
-
-omp_barrier_directive: OMPDVM_BARRIER end_spec 
-	{
-           $$ = get_bfnd(fi,OMP_BARRIER_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	};
-omp_atomic_directive: OMPDVM_ATOMIC end_spec 
-	{
-           $$ = get_bfnd(fi,OMP_ATOMIC_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	};
-
-omp_flush_directive: OMPDVM_FLUSH end_spec omp_variable_list_in_par
-	{
-           $$ = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,$3,LLNULL,LLNULL);
-	}
-	| OMPDVM_FLUSH end_spec 
-	{
-           $$ = get_bfnd(fi,OMP_FLUSH_DIR,SMNULL,LLNULL,LLNULL,LLNULL);
-	}
-	;
-
-omp_critical_begin_directive: OMPDVM_CRITICAL end_spec LEFTPAR ident RIGHTPAR
-	{
-  	   $$ = make_critical();
-           $$->entry.Template.ll_ptr1 = $4;
-	}
-	| OMPDVM_CRITICAL end_spec 
-	{
-  	   $$ = make_critical();
-	}
-	;
-
-omp_critical_end_directive: OMPDVM_ENDCRITICAL end_spec LEFTPAR ident RIGHTPAR
-	{
-  	   $$ = make_endcritical();
-           $$->entry.Template.ll_ptr1 = $4;
-	}
-	| OMPDVM_ENDCRITICAL end_spec 
-	{
-  	   $$ = make_endcritical();
-	}
-	;
-
-omp_common_var: SLASH name op_slash_1 SLASH op_slash_0
-	{ 
-		PTR_SYMB s;
-		PTR_LLND l;
-		s = make_common($2); 
-		l = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-		$$ = make_llnd(fi,OMP_THREADPRIVATE, l, LLNULL, SMNULL);
-	};
-
-
-omp_variable_list: omp_common_var
-	{
-		$$ = set_ll_list($1,LLNULL,EXPR_LIST);
-	}
-	| ident
-	{	
-		$$ = set_ll_list($1,LLNULL,EXPR_LIST);
-	}
-	| omp_variable_list COMMA omp_common_var
-	{ 
-		$$ = set_ll_list($1,$3,EXPR_LIST);
-	}
-	| omp_variable_list COMMA ident
-	{ 
-		$$ = set_ll_list($1,$3,EXPR_LIST);
-	}
-	;
-
-op_slash_1 : {
-		operator_slash = 1;
-	};
-op_slash_0 : {
-		operator_slash = 0;
-	};
-
-acc_specification: acc_declare
-                 | acc_routine
-                 ;
-acc_directive: acc_region
-             | acc_end_region      
-             | acc_checksection
-             | acc_end_checksection
-             | acc_get_actual
-             | acc_actual 
-	     ;
-
-acc_region: ACC_REGION end_spec  opt_clause 
-             {  $$ = get_bfnd(fi,ACC_REGION_DIR,SMNULL,$3,LLNULL,LLNULL);}
-             ;
-
-acc_checksection: ACC_CHECKSECTION end_spec 
-             {  $$ = get_bfnd(fi,ACC_CHECKSECTION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-             ;
-
-acc_get_actual:  ACC_GET_ACTUAL end_spec LEFTPAR acc_var_list RIGHTPAR
-             {  $$ = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,$4,LLNULL,LLNULL);}
-              |  ACC_GET_ACTUAL end_spec LEFTPAR RIGHTPAR
-             {  $$ = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-              |  ACC_GET_ACTUAL end_spec 
-             {  $$ = get_bfnd(fi,ACC_GET_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-             ;
-
-acc_actual:     ACC_ACTUAL end_spec LEFTPAR acc_var_list RIGHTPAR
-             {  $$ = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,$4,LLNULL,LLNULL);}
-          |   ACC_ACTUAL end_spec LEFTPAR RIGHTPAR
-             {  $$ = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-          |   ACC_ACTUAL end_spec 
-             {  $$ = get_bfnd(fi,ACC_ACTUAL_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-             ;
-
-opt_clause:  needkeyword keywordoff
-              { $$ = LLNULL;}
-          |  acc_clause_list
-              { $$ = $1; }
-          ;
-
-acc_clause_list:   acc_clause
-	          { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-               | acc_clause_list COMMA acc_clause
-	          { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-               ;
-
-acc_clause:    needkeyword data_clause
-               { $$ = $2;}
-
-             | needkeyword async_clause
-               { $$ = $2;}
-               
-             | needkeyword targets_clause
-               { $$ = $2;}                   
-             ;
-
-
-data_clause:   INOUT   LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_INOUT_OP,$3,LLNULL,SMNULL);}
-             | IN      LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_IN_OP,$3,LLNULL,SMNULL);}
-             | OUT     LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_OUT_OP,$3,LLNULL,SMNULL);}
-             | ACC_LOCAL   LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_LOCAL_OP,$3,LLNULL,SMNULL);}             
-             | ACC_INLOCAL LEFTPAR acc_var_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_INLOCAL_OP,$3,LLNULL,SMNULL);}             
-             ;
-
-targets_clause:   ACC_TARGETS LEFTPAR computer_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_TARGETS_OP,$3,LLNULL,SMNULL);}
-             ;
-
-async_clause:   ACC_ASYNC             
-               { $$ = make_llnd(fi,ACC_ASYNC_OP,LLNULL,LLNULL,SMNULL);}
-             ;
-
-
-acc_var_list: variable_list
-              { $$ = $1;}
-            ;
-
-computer_list:   computer
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | computer_list COMMA computer
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-computer:       needkeyword ACC_HOST
-              { $$ = make_llnd(fi,ACC_HOST_OP, LLNULL,LLNULL,SMNULL);}
-             |  needkeyword ACC_CUDA
-              { $$ = make_llnd(fi,ACC_CUDA_OP, LLNULL,LLNULL,SMNULL);}
-             ;
-
-acc_end_region: ACC_END_REGION
-              {  $$ = get_bfnd(fi,ACC_END_REGION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-              ;
-     
-acc_end_checksection: ACC_END_CHECKSECTION
-              {  $$ = get_bfnd(fi,ACC_END_CHECKSECTION_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-              ;     
-
-acc_declare: ACC_DECLARE in_dcl opt_double_colon acc_declare_list
-	   {
-	      $$ = get_bfnd(fi,ACC_DECLARE_DIR, SMNULL, $4, LLNULL, LLNULL);
-           }
-           ;
-acc_declare_list: declare_var
-                  { $$ = make_llnd(fi,EXPR_LIST, $1, LLNULL, SMNULL); }
-	        | acc_declare_list COMMA declare_var
-                  { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	        ;
-
-declare_var: name
-           {
-              PTR_SYMB s;
-              s = make_scalar($1,TYNULL,LOCAL);
-              if((s->attr & PROCESSORS_BIT) ||(s->attr & TASK_BIT)  || (s->attr & TEMPLATE_BIT) || (s->attr & ALIGN_BIT) || (s->attr & DISTRIBUTE_BIT) || (s->attr & DYNAMIC_BIT) || (s->attr & HEAP_BIT)|| (s->attr & DVM_POINTER_BIT) || (s->attr & INHERIT_BIT) ||(s->attr & SHADOW_BIT)) 
-                errstr("Inconsistent declaration of identifier  %s", s->ident, 16);	
-	      $$ = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s); 
-           }
-           ;
-        
-acc_routine: ACC_ROUTINE in_dcl opt_routine_clauses 
-             {  $$ = get_bfnd(fi,ACC_ROUTINE_DIR,SMNULL,$3,LLNULL,LLNULL);} 
-           ;
-
-opt_routine_clauses:
-                     {  $$ = LLNULL;}
-                   | routine_clause_list
-                     { $$ = $1;}
-                   ;
-
-routine_clause_list: routine_clause
-	             { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-                   | routine_clause_list routine_clause
-	           { $$ = set_ll_list($1,$2,EXPR_LIST); }	
-                   ;
-           
-routine_clause: COMMA needkeyword PRIVATE LEFTPAR acc_declare_list RIGHTPAR
-                    { $$ = make_llnd(fi,ACC_PRIVATE_OP,$5,LLNULL,SMNULL);}  
-              | COMMA needkeyword targets_clause
-                    { $$ = $3;} 
-              ;
-spf_directive: spf_analysis
-             | spf_parallel      
-             | spf_transform
-             | spf_parallel_reg
-             | spf_end_parallel_reg
-             | spf_checkpoint
-	     ;
-
-spf_analysis: SPF_ANALYSIS in_unit LEFTPAR analysis_spec_list RIGHTPAR 
-             {  $$ = get_bfnd(fi,SPF_ANALYSIS_DIR,SMNULL,$4,LLNULL,LLNULL);}
-             ;
-
-spf_parallel: SPF_PARALLEL in_unit LEFTPAR parallel_spec_list RIGHTPAR 
-             {  $$ = get_bfnd(fi,SPF_PARALLEL_DIR,SMNULL,$4,LLNULL,LLNULL);}
-             ;
-
-spf_transform: SPF_TRANSFORM in_unit  LEFTPAR transform_spec_list RIGHTPAR 
-             {  $$ = get_bfnd(fi,SPF_TRANSFORM_DIR,SMNULL,$4,LLNULL,LLNULL);}
-             ;
-
-spf_parallel_reg: SPF_PARALLEL_REG in_unit region_name 
-                  { $$ = get_bfnd(fi,SPF_PARALLEL_REG_DIR,$3,LLNULL,LLNULL,LLNULL);}
-                | SPF_PARALLEL_REG in_unit region_name COMMA needkeyword  SPF_APPLY_REGION  LEFTPAR characteristic_list RIGHTPAR opt_clause_apply_fragment
-                  { $$ = get_bfnd(fi,SPF_PARALLEL_REG_DIR,$3,$8,$10,LLNULL);}
-                | SPF_PARALLEL_REG in_unit region_name COMMA needkeyword SPF_APPLY_FRAGMENT LEFTPAR characteristic_list RIGHTPAR opt_clause_apply_region
-                  { $$ = get_bfnd(fi,SPF_PARALLEL_REG_DIR,$3,$10,$8,LLNULL);}
-                ;
-
-characteristic_list:  characteristic
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             |  characteristic_list COMMA characteristic
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-characteristic: needkeyword SPF_CODE_COVERAGE
-                {  $$ = make_llnd(fi,SPF_CODE_COVERAGE_OP,LLNULL,LLNULL,SMNULL);}
-              | needkeyword SPF_WEIGHT LEFTPAR DP_CONSTANT RIGHTPAR
-                { 
-                   PTR_LLND w;
-                   w = make_llnd(fi,DOUBLE_VAL, LLNULL, LLNULL, SMNULL);
-	           w->entry.string_val = copys(yytext);
-	           w->type = global_double;
-                   $$ = make_llnd(fi,SPF_WEIGHT_OP,w,LLNULL,SMNULL);
-                }
-              ;
-
-opt_clause_apply_fragment: 
-                           { $$ = LLNULL;}
-                         | COMMA needkeyword SPF_APPLY_FRAGMENT LEFTPAR characteristic_list RIGHTPAR
-                           { $$ = $5;}
-                         ;
-
-opt_clause_apply_region: 
-                           { $$ = LLNULL;}
-                         | COMMA needkeyword SPF_APPLY_REGION LEFTPAR characteristic_list RIGHTPAR
-                           { $$ = $5;}
-                         ;
-
-spf_end_parallel_reg: SPF_END_PARALLEL_REG  in_unit
-                { $$ = get_bfnd(fi,SPF_END_PARALLEL_REG_DIR,SMNULL,LLNULL,LLNULL,LLNULL);}
-                ;
-
-analysis_spec_list:  analysis_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | analysis_spec_list COMMA analysis_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-analysis_spec: analysis_reduction_spec
-             | analysis_private_spec
-             | analysis_process_private_spec
-             | analysis_parameter_spec
-             | analysis_cover_spec     
-             ;
-
-analysis_reduction_spec: needkeyword REDUCTION LEFTPAR reduction_list RIGHTPAR
-               { $$ = make_llnd(fi,REDUCTION_OP,$4,LLNULL,SMNULL); }    
-                     ;
-
-analysis_private_spec:   needkeyword PRIVATE LEFTPAR variable_list RIGHTPAR
-               { $$ = make_llnd(fi,ACC_PRIVATE_OP,$4,LLNULL,SMNULL);} 
-                     ;
-
-analysis_process_private_spec: needkeyword SPF_PROCESS_PRIVATE LEFTPAR variable_list RIGHTPAR
-               { $$ = make_llnd(fi,SPF_PROCESS_PRIVATE_OP,$4,LLNULL,SMNULL);} 
-                     ;
-
-analysis_cover_spec: needkeyword SPF_COVER LEFTPAR integer_constant RIGHTPAR
-               { $$ = make_llnd(fi,SPF_COVER_OP,$4,LLNULL,SMNULL);} 
-                     ;
-
-analysis_parameter_spec: needkeyword PARAMETER LEFTPAR spf_parameter_list RIGHTPAR
-               { $$ = make_llnd(fi,SPF_PARAMETER_OP,$4,LLNULL,SMNULL);}
-                     ;   
-spf_parameter_list: spf_parameter
-	       { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	     | spf_parameter_list COMMA spf_parameter
-               { $$ = set_ll_list($1, $3, EXPR_LIST); }
-             ;
-
-spf_parameter: array_element EQUAL expr
-	     { $$ = make_llnd(fi, ASSGN_OP, $1, $3, SMNULL); }
-	     ;
-
-parallel_spec_list:  parallel_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             |  parallel_spec_list COMMA parallel_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-parallel_spec: parallel_shadow_spec
-             | parallel_across_spec
-             | parallel_remote_access_spec     
-             ;
-
-parallel_shadow_spec:  needkeyword SHADOW LEFTPAR shadow_list RIGHTPAR
-                { $$ = make_llnd(fi,SHADOW_OP,$4,LLNULL,SMNULL);}
-                    ;
-
-parallel_across_spec:  needkeyword ACROSS LEFTPAR shadow_list RIGHTPAR
-                { $$ = make_llnd(fi,ACROSS_OP,$4,LLNULL,SMNULL);}
-                    ;
-
-parallel_remote_access_spec: needkeyword REMOTE_ACCESS_SPEC LEFTPAR remote_data_list RIGHTPAR
-                { $$ = make_llnd(fi,REMOTE_ACCESS_OP,$4,LLNULL,SMNULL);}
-                           ;
-
-transform_spec_list:  transform_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             |  transform_spec_list COMMA transform_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-transform_spec: needkeyword SPF_NOINLINE
-                { $$ = make_llnd(fi,SPF_NOINLINE_OP,LLNULL,LLNULL,SMNULL);}
-              | needkeyword SPF_FISSION LEFTPAR ident_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_FISSION_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_EXPAND 
-                { $$ = make_llnd(fi,SPF_EXPAND_OP,LLNULL,LLNULL,SMNULL);}
-              | needkeyword SPF_EXPAND LEFTPAR ident_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_EXPAND_OP,$4,LLNULL,SMNULL);}
-           /*   | needkeyword SPF_SHRINK LEFTPAR ident LEFTPAR digit_list RIGHTPAR RIGHTPAR  */
-              | needkeyword SPF_SHRINK LEFTPAR array_element_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_SHRINK_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_UNROLL 
-                { $$ = make_llnd(fi,SPF_UNROLL_OP,LLNULL,LLNULL,SMNULL);}
-              | needkeyword SPF_UNROLL LEFTPAR unroll_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_UNROLL_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_MERGE 
-                { $$ = make_llnd(fi,SPF_MERGE_OP,LLNULL,LLNULL,SMNULL);}
-              ;
-
-unroll_list: expr COMMA expr COMMA expr
-             {
-               $$ = set_ll_list($1, $3, EXPR_LIST);
-               $$ = set_ll_list($$, $5, EXPR_LIST);
-             } 
-           ;
-
-region_name: name
-           { $$ = make_parallel_region($1);}
-           ; 
-  
-array_element_list: array_element
-	           { $$ = set_ll_list($1, LLNULL, EXPR_LIST); }
-	          | array_element_list COMMA array_element 
-	           { $$ = set_ll_list($1, $3, EXPR_LIST); }
-	          ;
-
-spf_checkpoint:  SPF_CHECKPOINT in_unit LEFTPAR checkpoint_spec_list RIGHTPAR 
-             {  $$ = get_bfnd(fi,SPF_CHECKPOINT_DIR,SMNULL,$4,LLNULL,LLNULL);}
-             ;
-
-checkpoint_spec_list:  checkpoint_spec
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             |  checkpoint_spec_list COMMA checkpoint_spec
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-checkpoint_spec: needkeyword TYPE LEFTPAR spf_type_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_TYPE_OP,$4,LLNULL,SMNULL);}
-              | needkeyword VARLIST LEFTPAR ident_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_VARLIST_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_EXCEPT LEFTPAR ident_list RIGHTPAR
-                { $$ = make_llnd(fi,SPF_EXCEPT_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_FILES_COUNT LEFTPAR expr RIGHTPAR
-                { $$ = make_llnd(fi,SPF_FILES_COUNT_OP,$4,LLNULL,SMNULL);}
-              | needkeyword SPF_INTERVAL LEFTPAR interval_spec COMMA expr RIGHTPAR
-                { $$ = make_llnd(fi,SPF_INTERVAL_OP,$4,$6,SMNULL);}
-              ;
-
-spf_type_list: spf_type
-	       { $$ = set_ll_list($1,LLNULL,EXPR_LIST); }
-             | spf_type_list COMMA spf_type
-	       { $$ = set_ll_list($1,$3,EXPR_LIST); }	
-             ;
-
-spf_type:       needkeyword ACC_ASYNC
-              { $$ = make_llnd(fi,ACC_ASYNC_OP, LLNULL,LLNULL,SMNULL);}
-             |  needkeyword SPF_FLEXIBLE
-              { $$ = make_llnd(fi,SPF_FLEXIBLE_OP, LLNULL,LLNULL,SMNULL);}
-             ;
-
-interval_spec:  needkeyword SPF_TIME
-                { $$ = make_llnd(fi,SPF_TIME_OP, LLNULL,LLNULL,SMNULL);}
-             |  needkeyword SPF_ITER
-                { $$ = make_llnd(fi,SPF_ITER_OP, LLNULL,LLNULL,SMNULL);}
-             ;
-
-in_unit: 
-             { if(position==IN_OUTSIDE)
-                 err("Misplaced SPF-directive",103);
-             }
-             ;
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/parser/hash.c b/projects/dvm_svn/fdvm/trunk/parser/hash.c
deleted file mode 100644
index 46121e7..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/hash.c
+++ /dev/null
@@ -1,286 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/*
- * hash.c -- hash table routines
- */
-
-#include <stdio.h>
-
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#include "defs.h"
-#include "symb.h"
-#include "defines.h"
-#include "bif.h"
-#include "extern.h"
-
-extern int parstate;
-extern PTR_BFND cur_bfnd, pred_bfnd, global_bfnd;
-extern PTR_TYPE vartype, global_default, impltype[];
-extern void make_prog_header();
-PTR_TYPE install_array();
-PTR_LLND make_llnd();
-PTR_SYMB make_symb();
-char *chkalloc();
-void free();
-void errstr();
-
-PTR_HASH hash_table[hashMax];
-
-#ifdef __SPF
-extern void removeFromCollection(void *pointer);
-#endif
-/*
- * init_hash -- initialize the hash table
- */
-void
-init_hash()
-{
-	register int i;
-
-	for (i = 0; i < hashMax; i++)
-		hash_table[i] = HSNULL;
-}
-
-
-/*
- * Hash(string) -- compute hash value of string.
- */
-int 
-hash(string)
-	register char *string;
-{
-	register int i;
-
-	for (i = 0; *string;)
-		i += *string++;
-	return (i % hashMax);
-}
-
-
-/*
- * look_up(string) -- lookup string in the hash table and
- *		      install it if not there
- */
-PTR_HASH 
-look_up(string, decl_type)
-register char *string;
-int decl_type;
-{
-	int i;
-	register PTR_HASH entry;
-	PTR_BFND cur_scope(), p;
-
-	i = hash(string);
-	p = cur_scope();
-	for (entry = hash_table[i]; entry; entry = entry->next_entry) {
-	   if (!strcmp(string, entry->ident) && (entry->id_attr)) {
-	      if ((entry->id_attr->scope == p) ||
-		  ((entry->id_attr->variant==FUNCTION_NAME) &&
-		   (p->variant==FUNC_HEDR) &&
-		   (p->entry.Template.symbol==entry->id_attr)))
-		 return (entry);
-	      if (decl_type == SOFT) {
-		 for (p=cur_scope(); NEW_SCOPE(p); p = p->control_parent) {
-		    if (entry->id_attr->scope == p)
-		       return (entry);
-		 }
- 		 if (entry->id_attr->scope == p)
-		    return (entry);
-	      }
-	   }
-	}
-	entry = (struct hash_entry *) chkalloc(sizeof(struct hash_entry));
-	entry->ident = copys(string);
-	entry->next_entry = hash_table[i];
-	hash_table[i] = entry;
-	return (entry);
-}
-
-
-PTR_HASH
-correct_symtab(h, type)
-PTR_HASH h;
-int type;
-{
-   int i;
-   PTR_HASH entry;
-
-   i = hash(h->ident);
-   for (entry = hash_table[i]; entry; entry = entry->next_entry) {
-	   if (!strcmp(h->ident, entry->ident)
-	       && ( !(entry->id_attr)
-		   ||(entry->id_attr->variant==type))
-	       && (h != entry))
-	      break;
-	}
-   if (!entry) return h;
-      if (hash_table[i] != h) {
-	 fprintf (stderr, "Bug in correct_symtab\n");
-	 return h;
-      }
-   hash_table[i] = hash_table[i]->next_entry;
-#ifdef __SPF
-   removeFromCollection(h);
-#endif
-   free((char *)h);
-   return hash_table[i];
-}
-
-
-/*
- * Checks whether the "name" is installed and installs as a SOFT
- * entry if not.
- */
-PTR_LLND
-check_and_install(h, d, ndim)
-PTR_HASH h;
-PTR_LLND d;
-int ndim;
-{
-   PTR_BFND cur_scope();
-   PTR_SYMB install_entry();
-   PTR_TYPE p = NULL;
-   PTR_SYMB s;
-   PTR_LLND r;
-   void set_type(), err();
-
-   /* Check if the variable is already declared */
-   if ((s = h->id_attr) && (s->scope == cur_scope()) && s->type) {
-      if (d && s->type->variant != T_ARRAY) {
-	 p = install_array(d, s->type, ndim);
-	 s->type = p;
-      }
-   }
-   else {
-      if (h->id_attr && h->id_attr->type)
-	 p = h->id_attr->type;
-      else if (!undeftype)
-	 p = impltype[*h->ident - 'a'];
-      else
-	 err("Variable type unknown",327);
-      if (d)
-	 p = install_array(d, p, ndim);
-      s = install_entry(h, SOFT);
-      set_type(s, p, LOCAL);
-   }
-   if (d) {
-      r = p->entry.ar_decl.ranges
-	 = make_llnd(fi,ARRAY_REF, d, LLNULL, s);
-   }
-   else
-      r = make_llnd(fi,VAR_REF, LLNULL, LLNULL, s);
-   return  make_llnd(fi,EXPR_LIST, r, LLNULL, SMNULL);
-}
-
-
-
-/*
- * install_entry takes a pointer to a hash entry and
- *  makes another symbol table entry for the same id
- */
-PTR_SYMB 
-install_entry(entry, decl_type)
-PTR_HASH entry;
-int decl_type;
-{
-	register PTR_SYMB symb_ptr;
-	PTR_BFND cur_scope();
-	PTR_BFND p;
-	void err();
-
-	if (decl_type == HARD && entry->id_attr &&
-	    entry->id_attr->scope != cur_scope())
-	   entry = look_up(entry->ident, HARD);
-	if ((entry->id_attr) && ((entry->id_attr->scope == cur_scope()) ||
-		  ((entry->id_attr->variant==FUNCTION_NAME) &&
-		   (entry->id_attr->scope->variant==FUNC_HEDR))))
-	{
-		if (entry->id_attr->decl == SOFT) {
-			entry->id_attr->decl = decl_type;
-			return(entry->id_attr);
-		}
-		if (decl_type == SOFT)
-		   return(entry->id_attr);
-		/* else */
-		errstr("Redeclaration of identifier: %s",entry->id_attr->ident,328);
-		/*(void)fprintf(stderr, "id: %s\n", entry->id_attr->ident);*/
-		return (SMNULL);
-	}
-	symb_ptr = make_symb(fi,DEFAULT, entry->ident);
-	for (p=cur_scope();
-	     NEW_SCOPE(p) && (decl_type==SOFT);
-	     p = p->control_parent)
-	   ;
-	symb_ptr->scope = p;
-	symb_ptr->outer = entry->id_attr;
-	symb_ptr->parent = entry;
-	symb_ptr->decl = decl_type;
-	entry->id_attr = symb_ptr;
-	symb_ptr->id_list = SMNULL;
-	return (symb_ptr);
-}
-
-
-
-PTR_SYMB 
-get_proc_symbol(entry)
-	PTR_HASH entry;
-{
-	register PTR_SYMB symb_ptr;
-	PTR_BFND cur_scope();
-
-	symb_ptr = make_symb(fi, PROCEDURE_NAME, entry->ident);
-	symb_ptr->scope = global_bfnd;
-	symb_ptr->outer = entry->id_attr;
-	symb_ptr->parent = entry;
-	entry->id_attr = symb_ptr;
-	return (symb_ptr);
-}
-
-/*
-PTR_BFND
-cur_scope()
-{
-	register PTR_BFND p;
-*/
-        /* Takes cares of main program unit begining without a PROGRAM 
-           statement. After rewrite of statement processing has been done,
-	   strengthen ( weaken? ) the test.
-	*/
-/*
-	if ((pred_bfnd->variant == GLOBAL) && (parstate == OUTSIDE))
-	{
-	     make_prog_header();
-	     return (pred_bfnd);
-	}
-
-	for (p = pred_bfnd;
-	     (p->variant != PROG_HEDR) &&
-	     (p->variant != PROC_HEDR) &&
-	     (p->variant != PROS_HEDR) &&
-	     (p->variant != FUNC_HEDR) &&
-	     (p->variant != BLOCK_DATA) &&
-	     (p->variant != FORALL_NODE) &&
-	     (p->variant != GLOBAL) &&
-	     (p->variant != CDOALL_NODE) &&
-	     (p->variant != SDOALL_NODE) &&
-	     (p->variant != DOACROSS_NODE) &&
-	     (p->variant != STRUCT_DECL);
-	     p = p->control_parent);
-	  ;
-	     
-	return (p);
-}
-*/
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/head b/projects/dvm_svn/fdvm/trunk/parser/head
deleted file mode 100644
index 333fa33..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/head
+++ /dev/null
@@ -1,2 +0,0 @@
-/* don't modify this file directly, it is made by a clever 'sed'
-script using "tag".  Run make tag.h to regenerate this file */
diff --git a/projects/dvm_svn/fdvm/trunk/parser/init.c b/projects/dvm_svn/fdvm/trunk/parser/init.c
deleted file mode 100644
index fad9407..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/init.c
+++ /dev/null
@@ -1,281 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#include "inc.h"
-#include "defines.h"
-#include "db.h"
-
-extern int yylineno;
-extern PTR_FILE fi;
-
-
-/* In the following "set" means set the value to YES, or 1 */
-#ifndef __SPF_BUILT_IN_PARSER
-int     debug;
-#endif
-int	errline;		/* line number of 1st error */
-int     inioctl;		/* set if processing I/O control stmt */
-int     needkwd;		/* set if stmt needs keyword */
-int     optkwd;                 /* set if stmt needs optional keyword */
-int     implkwd;                /* set if processing  IMPLICIT statement */
-/*!!!*/
-int     opt_kwd_;               /* set if stmt needs optional keyword (fdvm.gram)*/
-int     opt_in_out;             /* set if stmt needs keyword IN  or OUT*/
-int     as_op_kwd_;             /* set if stmt needs keyword ASSIGNMENT  or OPERATOR */
-int     opt_kwd_hedr;           /* set if stmt needs after type specification */
-int     opt_kwd_r;              /* set if stmt needs optional keyword followed by '(' (fdvm.gram)*/
-int     optcorner;              /* set if stmt needs optional keyword CORNER(fdvm.gram)*/
-int     optcall;                /* set if stmt needs optional "call" */
-int     opt_l_s;                /* set if stmt needs optional "location"
-                                 or "submachine" */
-int     colon_flag;             /* set if stmt needs keyword followed by
-                                   colon. */
-int     is_openmp_stmt = 0;	/* set if OpenMP stmt*/ /*OMP*/
-int operator_slash;             /*OMP*/
-
-int     nioctl;
-int     data_stat;
-extern int     yydebug;
-long    yystno = 0;
-int     yyleng ;
-char    yyquote ;
-int     yylisting = 0;		/* set if listing to stdio required */
-int     yylonglines = 0;	/* set if non-standard line length allowed */
-int     prflag;
-int     dorange;		/* current do range label */
-int     undeftype = NO;		/* set if IMPLICIT NONE */
-int     maxdim = 15;		/* max allowable number of dimensions */
-int     nowarnflag = NO;	/* set if don't want warning messages */
-int     shiftcase = YES;	/* convert variable to lower case */
-int	num_files;
-char    intonly;		/* set if only integer param allowed */
-#if __SPF_BUILT_IN_PARSER && !_WIN32
-extern int warn_all;               /* set if -w option specified*/
-#else
-int     warn_all;               /* set if -w option specified*/
-#endif
-int     errcnt = 0;		/* error count */
-int     nwarn = 0;		/* number of warning */
-int	mod_offset;		/* line no offset of current module */
-
-int     num_bfnds;		/* total # of bif nodes */
-int     num_llnds;		/* total # of low level nodes */
-int     num_symbs;		/* total # of symbol nodes */
-int     num_types;		/* total # of types nodes */
-int     num_blobs;		/* total # of blob nodes */
-int     num_sets;		/* total # of set nodes */
-int     num_cmnt;
-int     num_def;		/* total # of dependncy nodes */
-int	num_dep;
-int     num_deflst;
-int     num_label;		/* total # of label nodes */
-
-PTR_LLND first_unresolved_call = LLNULL, last_unresolved_call = LLNULL;
-
-PTR_SYMB global_list;
-
-PTR_BFND head_bfnd,	/* start of bfnd chain */
-	 cur_bfnd,	/* point to current bfnd */
-         pred_bfnd,	/* used in finding the predecessor */
-         last_bfnd;
-
-PTR_LLND head_llnd, cur_llnd;
-PTR_SYMB head_symb, cur_symb;
-PTR_TYPE head_type, cur_type;
-PTR_LABEL head_label, cur_label, thislabel;
-PTR_BLOB head_blob, cur_blob;
-PTR_SETS head_sets, cur_sets;
-PTR_DEF head_def, cur_def;
-PTR_FNAME head_file, cur_thread_file, the_file;
-PTR_DEFLST head_deflst, cur_deflst;
-PTR_DEP head_dep, cur_dep, pre_dep;
-PTR_CMNT head_cmnt, cur_cmnt;
-PTR_BFND global_bfnd;
-PTR_SYMB star_symb;
-PTR_TYPE vartype;
-PTR_CMNT comments;
-#if __SPF_BUILT_IN_PARSER && !_WIN32
-extern PTR_CMNT cur_comment;
-#else
-PTR_CMNT cur_comment;
-#endif
-
-PTR_TYPE make_type();
-PTR_SYMB make_symb();
-PTR_BFND get_bfnd();
-PTR_BLOB make_blob();
-void	 init_hash();
-void     init_scope_table();
-
-PTR_TYPE global_int, global_float, global_double, global_char, global_string;
-PTR_TYPE global_bool, global_complex, global_dcomplex, global_gate,
-         global_event, global_sequence,global_default,global_string_2;
-
-char    yytext[1000];		/* text consumed for current lexeme */
-char   *infname;
-
-#if __SPF_BUILT_IN_PARSER && !_WIN32
-extern char    saveall;		/* set if "SAVE ALL" */
-extern int    privateall;		/* set if "PRIVATE ALL" */
-#else
-char    saveall;		/* set if "SAVE ALL" */
-int    privateall;		/* set if "PRIVATE ALL" */
-#endif
-char    substars;		/* set if * parameters seen */
-int     blklevel;		/* current block level */
-int     parstate;	/* current parser's state */
-
-PTR_TYPE impltype[26];		/* implicit type for 'a' to 'z' */
-
-int     procno;			/* procedure # in current file */
-int     proctype;		/* procedure type */
-char   *procname;		/* procedure name */
-
-int     procclass;
-int     nentry;			/* # of entries */
-char    multitype;
-
-/*
- *  General initialization routine
- */
-void 
-initialize()
-{
-	errcnt = 0;		/* error count */
-	nwarn = 0;		/* number of warning */
-	parstate = OUTSIDE;	/* current parser's state */
-	yylineno = 0;           /* global line no from lex */
-	mod_offset = 0;
-	num_files = 0;
-	num_bfnds = 0;		/* total # of bif nodes */
-	num_llnds = 0;		/* total # of low level nodes */
-	num_symbs = 0;		/* total # of symbol nodes */
-	num_types = 0;		/* total # of types nodes */
-	num_blobs = 0;		/* total # of blob nodes */
-	num_sets = 0;		/* total # of set nodes */
-	num_cmnt = 0;
-	num_def = 0;		/* total # of dependncy nodes */
-	num_dep = 0;
-	num_deflst = 0;
-	num_label = 0;		/* total # of label nodes */
-	global_list = (PTR_SYMB) NULL;
-	head_bfnd = BFNULL;
-	cur_bfnd = BFNULL;
-	pred_bfnd = BFNULL;      /* used in finding the predecessor */
-	last_bfnd = BFNULL;
-
-	head_llnd = LLNULL;
-	cur_llnd = LLNULL;
-	head_symb = SMNULL;
-	cur_symb = SMNULL;
-	head_cmnt = CMNULL;
-	cur_cmnt  = CMNULL;
-	head_type = TYNULL;
-	cur_type = TYNULL;
-	head_label = LBNULL;
-	cur_label = LBNULL;
-	thislabel = LBNULL;
-	head_blob = BLNULL;
-	cur_blob = BLNULL;
-	head_sets = (PTR_SETS)NULL;
-	cur_sets = (PTR_SETS)NULL;
-        head_file = (PTR_FNAME)NULL;
-	head_def = (PTR_DEF)NULL;
-	cur_def = (PTR_DEF)NULL;
-	head_deflst = (PTR_DEFLST)NULL;
-	cur_deflst = (PTR_DEFLST)NULL;
-	head_dep = (PTR_DEP)NULL;
-	cur_dep = (PTR_DEP)NULL;
-	pre_dep = (PTR_DEP)NULL;
-	global_bfnd = BFNULL;
-	comments = CMNULL;
-	cur_comment = CMNULL;
-	global_int	= make_type(fi,T_INT);
-	global_float	= make_type(fi,T_FLOAT);
-	global_double	= make_type(fi,T_DOUBLE);
-	global_char	= make_type(fi,T_CHAR);
-	global_string	= make_type(fi,T_STRING);
-	global_bool	= make_type(fi,T_BOOL);
-	global_complex	= make_type(fi,T_COMPLEX);
-	global_dcomplex	= make_type(fi,T_DCOMPLEX);
-        global_gate     = make_type(fi,T_GATE);
-        global_event    = make_type(fi,T_EVENT);
-	global_sequence = make_type(fi,T_SEQUENCE);
-	global_default	= make_type(fi,DEFAULT);
-	global_string_2	= make_type(fi,T_STRING);
-        global_string_2->entry.Template.dummy1=2;
-
-	star_symb	= make_symb(fi,DEFAULT, "*");
-	fi->global_bfnd = global_bfnd = get_bfnd(fi,GLOBAL, SMNULL, LLNULL, LLNULL, LLNULL);
-	global_bfnd->filename=(PTR_FNAME)NULL;/*later we put something there*/
-        cur_blob = global_bfnd->entry.Template.bl_ptr1
-		 = make_blob (fi,BFNULL, BLNULL);
-	pred_bfnd = global_bfnd;
-	init_hash();
-	init_scope_table();
-}
-
-
-/*
- * Set implicit type and length for each alphabetic chars in the range c1 - c2
- */
-void
-setimpl(type, c1, c2)
-	PTR_TYPE type;
-	int     c1, c2;
-{
-	register int i;
-	char    buff[100];
-	void err();
-
-	if (c1 == 0 || c2 == 0)
-		return;
-
-	if (c1 > c2) {
-	   (void)sprintf(buff, "characters out of order in implicit:%c-%c", c1, c2);
-	   err(buff);
-	} else {
-		for (i = c1; i <= c2; ++i) {
-			impltype[i - 'a'] = type;
-		}
-	}
-}
-
-
-/*
- *  Initialization routine for each new program unit
- */
-void 
-procinit()
-{
-	parstate = OUTSIDE;
-	blklevel = 1;
-	saveall = NO;
-        privateall = 0;
-	substars = NO;
-	nwarn = 0;
-	thislabel = LBNULL;
-	needkwd = 0;
-/*!!!*/
-        opt_kwd_ = 0;
-        opt_kwd_r = 0;
-        optcorner = 0;
-
-	++procno;
-	proctype = T_UNKNOWN;
-	procname = "MAIN_    ";
-	nentry = 0;
-	multitype = NO;
-	blklevel = 1;
-	dorange = 0;
-
-	if (undeftype)
-		 setimpl(global_default, 'a', 'z');
-	else {
-		 setimpl(global_float, 'a', 'z');
-		 setimpl(global_int, 'i', 'n');
-	}
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/lexfdvm.c b/projects/dvm_svn/fdvm/trunk/parser/lexfdvm.c
deleted file mode 100644
index 677ee73..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/lexfdvm.c
+++ /dev/null
@@ -1,3319 +0,0 @@
-
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/****************************************************************************
-
-DESCRIPTION:	This is the Cedar Fortran lexical scanner.  It reads an input
-		Cedar Fortran program and returns lexemes to the Cedar 
-		Fortran Preprocessor.  It is based on the Unix 4.2 BSD f77
-		lexical scanner.
-----------------------------------------------------------------------------
-CALLING FORMAT: yylex() 
-----------------------------------------------------------------------------
-ARGUMENTS:	<none>
-----------------------------------------------------------------------------
-OUTPUTS:	<return param>: integer lexeme value 
-----------------------------------------------------------------------------
-SIDE EFFECTS:	1].  A listing will be written to standard output based on
-		     the value of global variable "yylisting".
-		2].  The variable "yylineno" will be changed to reflect the
-		     current line number.
-		3].  The variables "yytext" and "yyleng" will be changed to
-		     hold the lexeme text and its length. 
-----------------------------------------------------------------------------
-EXTERNAL REFS:	1].  file: <strings.h>
-		2].  file: <sys/file.h>
-		3].  file: <stdio.h>
-		4].  file: <ctype.h>
-		5].  file: defs.h
-		6].  file: extern.h
-		7].  file: tokdefs.h
-		8].  extern int	 debug; ! when debug=0: D in col 1 is comment
-----------------------------------------------------------------------------
-INVOKED BY:	1].  yyparse()
-----------------------------------------------------------------------------
-GLOBALS:	1].  char yytext[];	! lexeme text
-		2].  int  yyleng;	! length of lexeme text (in yytext)
-		3].  int  yylineno;	! current line number
-		4].  int  yyi4;		! =4 default/ =2 if OPTIONS/NOI4 used
-		5].  int  yylisting;	! when yylisting=1: listing on stdout
-		6].  int  yylonglines;	! when yylonglines=0: cols >73 comment
----------------------------------------------------------------------------- */
-
-#include <string.h>
-/*#include <sys/file.h>*/
-#include <stdio.h>
-#include <ctype.h>
-#include <memory.h>
-#include "defs.h"
-#include "extern.h"
-#include "tokdefs.h"
-
-void fatal();
-void fatali();
-void fatalstr();
-void errstr_fatal();
-void err();
-void err_line();
-void warn_line();
-char* chkalloc();
-int getcd();
-int getcd_ff();
-int _filbuf();
-int randomio();
-int eqn();
-int getkwd();
-FILE* open_include_file();
-void warn();
-void free();
-void make_file_list();
-static void flush_comments();
-static void store_comment();
-static void store_comment_end_permbuff();
-static void move_comments_to_permbuffer();
-
-/* Scanner constants */
-
-#define XEOF		0
-#define HPF             1
-/* Character definitions */
-
-#define BLANKC		' '
-#define MYQUOTE		(2)
-#define MYHOLLERITH	(3)
-#define BADHOLLERITH	(4)
-#define NEWLINE		10
-
-/* input Fortran card types */
-
-#define STEOF		1
-#define STINITIAL	2
-#define STCONTINUE	3
-#define CMT             4
-
-/* lexical scanner states */
-
-#define NEWSTMT		1
-#define FIRSTTOKEN	2
-#define OTHERTOKEN	3
-#define RETEOS		4
-#define COMMENTS	5
-#define COMMENTSEOS     6
-#define OVER            7
-
-/* Declared limits */
-
-#define MAX_NAME_LEN		80	/* max length of Fortran name */
-#define MAXINCLUDES		8	/* max number of include levels */
-#define MAXPARLEV		100	/* max parenthesis nesting level */
-#define MAX_CONTIN_CARDS	1000	/* max number of continuation lines */
-#define NCHARS_PER_LINE		66	/* max chars/line without longlines */
-#define BUFFERSIZE		1024	/* number bytes read in one read */
-#define COMMENT_LENGTH          1000    /* Size of comment buffer */
-#define LONG_LINE_LENGTH        132
-
-/* is_equal added for FORTRAN M */
-#define is_equal(x) (((x)=='='))
-
-#ifdef __SPF_BUILT_IN_PARSER
-#define HPF_program HPF_program_
-#define OMP_program OMP_program_
-#define ACC_program ACC_program_
-#endif
-
-extern FILE *outf;
-extern char   *infname;
- 
-extern int only_debug;  /*main program  sets it*/
-
-extern int dvm_debug;     /*set to 1 by -d1 ...-d4 flags */ /*OMP*/
-
-extern int HPF_program;
-extern int OMP_program; /*OMP*/
-extern int ACC_program; /*ACC*/
-extern int SAPFOR;      /*SPF*/
-extern int free_form;
-extern int ftn_std;
-extern int d_line;
-extern int nchars_per_line; /* -extend_source option permits fixed form source lines to contain up to 132 characters */
-                            /*  nchars_per_line = extend_source ? extend_source - 6 : NCHARS_PER_LINE */
-
-/* Variables shared with calling routine */    
-
-extern int     yylisting ;	/* flag: =1: make listing on stdout */
-extern int     yylonglines;	/* flag: =0: col >72 for comments */
-extern int     yyleng;		/* length of text in yytext */
-extern char     yyquote;	/*first symbol of string constant:  " or ' */
-int     yylineno;		/* source line num : current lexeme */
-extern long    yystno;		/* statement number */
-extern PTR_FNAME the_file;      /*pointer to the current include file*/
-extern int  data_stat;          /* flag: =1: inside data statement*/
-
-/* Globals */
-
-static FILE *infile;    	/* file descriptor num: current file */
-static char *nextch;		/* next to be considered in stmtbuf */
-static char *lastch;		/* last char in this stmt in stmtbuf */
-static char *nextcd = (char *)NULL;	/* place for next card in stmtbuf */
-static char *endcd;		/* current end-of-card in stmtbuf */
-static char *newname = (char *)NULL;	/* pointer to string */
-
-static int restcd = 0;		/* rest-of-card  */
-static int char_cntx = 0;       /* 2, inside the character constant "...."
-                                   1, inside the character constant '....'
-                                   0, outside the character constant */ 
-static int lineno;
-static int prevlin;
-static int thislin;
-static int stkey;		/* lexeme for overall type of stmt */
-static int lastend = 1;
-static int parlev;		/* current parenthesis level */
-static int lexstate = NEWSTMT;	/* state within yylex */
-static int nincl = 0;		/* current number of include levels */
-
-/* Globals for: getcds/getcd/list_line/is_include/xgetc/unxgetc */
-
-static int code = 0;		/* result of getcd (STEOF,STINITIAL,STCONTINUE) */
-static char prefix[6];		/* 6 chars of Fortran stmt prefix */
-static char *prefixend = prefix + 6;	/* end of prefix */
-static int lines_returned = 0;	/* num lines read in getcd */
-static int is_directive_hpf= 0; /* 0 - isn't directive HPF */
-                                /* 1 - is directive HPF(state within getcd) */
-static int is_directive_omp=0;  /* 0 - isn't directive OpenMP */
-                                /* 1 - is directive OpenMP(state within getcd) */
-static int is_directive_acc=0;  /* 0 - isn't directive ACC */
-                                /* 1 - is directive ACC(state within getcd) */
-static int is_directive_spf=0;  /* 0 - isn't directive SPF */
-                                /* 1 - is directive SPF(state within getcd) */
-static int end_file ;           /* 0 - doesn't appear EOF in statement line(card)  */
-                                /* 1 - appears EOF in statement line(card)(state within getcd)*/
-int statement_kind = 0;         /* 0 - is a fortran statement */     
-                                /* 1 - is directive HPF/DVM(state within getcds) */
-                                /* used in ftn.gram */
-int is_acc_statement= 0;        /* 0 - is not a acc-directive */     
-                                /* 1 - is acc-directive (state within getcds) */
-int is_spf_statement= 0;        /* 0 - is not a spf-directive */     
-                                /* 1 - is spf-directive (state within getcds) */
-                                 
-int directive_key;              /* key of DVM directive == stkey */
-static int has_continuation = 0; /* 1 - there is symbol & in string */
-
-/* Globals for: crunch/analyz */
-
-static int expcom;		/* flag: =1: exposed , found */
-static int expeql;		/* flag: =1: exposed = found */
-static int expdcolon;           /* flag: =1; exposed :: found */
-static int expscolon;           /* flag: =1; exposed : found */
-static int expeqlt;             /* flag: =1; exposed => found */
-
-/* Globals for gettok */
-/*static int operator_slash;*//*OMP*/
-
-/* Statement numbers and the statement buffer */
-
-static long int stno;		/* stmt number for this Fortran stmt */
-static long int nxtstno;	/* stmt number for next Fortran stmt */
-char stmtbuf[LONG_LINE_LENGTH * (MAX_CONTIN_CARDS + 1)];
-				/* this Fortran stmt + 1 more card */
-char *commentbuf;
-static char tempbuf[COMMENT_LENGTH];
-static char *stmtend = stmtbuf + (MAX_CONTIN_CARDS * LONG_LINE_LENGTH);
-				/* max addr for this Fortran stmt */
-static char crunchbuf[LONG_LINE_LENGTH * (MAX_CONTIN_CARDS + 1)];
-/* "Crunch"ed statement is placed in crunchbuf so that unmodified stmtbuf
-    is avialable to the parser                                             */
-#define COMMENT_BUF_STORE 162    /*17.10.16 podd 161=>162 */
-
-typedef struct comment_buf {
-	struct comment_buf *next;
-	char *last;
-	char buf[COMMENT_BUF_STORE];
-	} comment_buf;
-static struct comment_buf *cbfirst, *cblast, *pcbfirst, *pcblast;
-
-/* Comment buffering data
-
-	Comments are kept in a list until the statement before them has
-   been parsed.  This list is implemented with the above comment_buf
-   structure and the pointers cbnext and cblast.
-
-	The comments are stored with terminating NULL, and no other
-   intervening space.  The last few bytes of each block are likely to
-   remain unused.
-*/
-
-
-/* INCLUDE file information block */
-
-struct Inclfile {
-	struct Inclfile *inclnext;/* pointer to next higher block */
-	FILE   *inclfp;		/* file descriptor number for file */
-	char   *inclname;	/* filename of this file */
-	int     incllno;
-	char   *incllinp;	/* point to saved nextcd when doing include */
-	int     incllen;	/* length of the saved card */
-	int     inclcode;	/* saved status when read nextcd */
-	int     inclstno;	/* saved statement number */
-	char   *prefix;		/* save columns 1-6 for later listing */
-        int     ishpf;          /* has 'CHPF$' or 'CDVM$'prefix */ 
-        int     rest;           /* length of card rest to be read */
-        int     context;        /* saved value of variable char_cntx*/
-        PTR_FNAME file_name;    /* point to structure 'file_name' of this file*/
-        comment_buf *cbfirst;   /* point to next comment: pcbfirst */ 
-        comment_buf *cblast;    /* point to next comment: pcblast */
-
-};
-
-struct Inclfile *inclp = (struct Inclfile *)NULL;	/* pointer to current INCLUDE block */
-
-
-/* Valid punctuation */
-
-struct Punctlist {
-	char    punchar;
-	int     punval;
-} puncts[] = {
-	{'(', LEFTPAR},
-	{'<', LEFTAB},
-	{'>', RIGHTAB},
-	{')', RIGHTPAR},
-	{'=', EQUAL},
-	{',', COMMA},
-	{'+', PLUS},
-	{'-', MINUS},
-	{'*', ASTER},
-	{'&', AMPERSAND},
-	{'/', SLASH},
-	{':', COLON},
-	{'\'', QUOTE},
-	{'"', DQUOTE},
-        {'%', PERCENT},
-        {'[', LEFTAB},
-        {']', RIGHTAB},
-        {'@', AT},  
-	{0, 0}
-};
-
-
-/* Valid relational operators */
-
-struct Dotlist {
-	char   *dotname;
-	int     dotval;
-} dots[] = {
-	{"and.", AND},
-	{"or.", OR},
-	{"xor.", XOR},
-	{"not.", NOT},
-	{"true.", TTRUE},
-	{"false.", FFALSE},
-	{"eq.", EQ},
-	{"ne.", NE},
-	{"lt.", LT},
-	{"le.", LE},
-	{"gt.", GT},
-	{"ge.", GE},
-	{"neqv.", NEQV},
-	{"eqv.", EQV},
-	{0, 0}
-};
-
-
-/* Lists of keywords:  Keylist for statement keywords */
-
-struct Keylist {
-	char   *keyname;
-	int     keyval;
-};
-struct Keylist *keystart[26], *keyend[26];	/* ptrs: start/end places for
-						 * each letter of alphabet */
-
-struct Keylist keys[] = {
-/*	{"accept", ACCEPT},*/
-        {"across", ACROSS},
-	{"alignwith", ALIGN_WITH},
-	{"align", ALIGN},
-        {"allocatable", ALLOCATABLE},
-        {"allocate", ALLOCATE},
-        {"and", AND},
-        {"apply_fragment", SPF_APPLY_FRAGMENT},
-        {"apply_region", SPF_APPLY_REGION},
-	{"assignment", ASSIGNMENT},
-	{"assign", ASSIGN},
-	{"async", ACC_ASYNC},   /*ACC*/
-	{"backspace", BACKSPACE},
-/*      {"block_cyclic", BLOCK_CYCLIC}, */
-	{"blockdata", BLOCKDATA},
-        {"block", BLOCK}, 
-	{"byte", BYTE},
-        {"by", BY},
-	{"call", CALL},
-        {"casedefault", DEFAULT_CASE},	
-	{"case", CASE},
-/*        {"channel", CHANNEL},*/
-	{"character", CHARACTER},
-/*	{"cdoacross", CDOACROSS}, */
-/*	{"cdoall", CDOALL}, */
-/*        {"clear", CLEAR},*/
-        {"close", CLOSE},
-	{"cluster", CLUSTER},
-        {"code_coverage", SPF_CODE_COVERAGE},
-	{"common", COMMON},
-	{"complex", COMPLEX},
-/*	{"concurrent", CONCURRENT},*/
-        {"consistent", CONSISTENT_SPEC},
-	{"contains", CONTAINS},
-	{"continue", CONTINUE},
-        {"copyin", OMPDVM_COPYIN},/*OMP*/
-        {"copyprivate", OMPDVM_COPYPRIVATE},/*OMP*/
-        {"corner", CORNER},
-        {"cover", SPF_COVER},   /*SPF*/
-/*        {"criticalsection", CRITICALSECTION},*/
-        {"cuda_block", ACC_CUDA_BLOCK},   /*ACC*/
-        {"cuda", ACC_CUDA},   /*ACC*/
-	{"cycle", CYCLE},
-	{"data", DATA},
-        {"deallocate", DEALLOCATE},
-/*	{ "decode", DECODE }, */
-/*      {"decomposition", DECOMPOSITION}, */
-	{"default", DEFAULT_CASE},
-	{"define", DEFINE},
-        {"derived", DERIVED},
-/*        {"diag", DIAG}, */
-	{"dimension", DIMENSION},
-	{"distribute", DISTRIBUTE},
-/*	{"doacross", DOACROSS}, */
-	{"doubleprecision", DOUBLEPRECISION},
-	{"doublecomplex", DOUBLECOMPLEX},
-	{"dowhile", DOWHILE},
-	{"do", DOWHILE},        
-        {"dynamic", DYNAMIC},
-        {"elemental", ELEMENTAL},
-	{"elseif", ELSEIF},
-	{"elsewhere", ELSEWHERE},
-	{"else", ELSE},
-/*        {"empty", EMPTY}, */
-/*	{ "encode",  ENCODE }, */
-/*	{"endcdoacross", ENDCDOACROSS},*/
-/*	{"endcdoall", ENDCDOALL},*/
-/*        {"endchannel", ENDCHANNEL},*/
-/*!!!	{"endcloop", ENDCLOOP},*/
-/*!!!	{"endconcurrent", ENDCONCURRENT},*/
-/* !!!        {"endcriticalsection", ENDCRITICALSECTION},*/
-        {"endblockdata", ENDUNIT},
-/*	{"enddoacross", ENDDOACROSS},*/
-	{"enddo", ENDDO},
-/* !!!        {"endextended", ENDEXTENDED},*/
-/* !!!        {"endextend", ENDEXTEND},*/
-	{"endfile", ENDFILE},
-        {"endforall", ENDFORALL},
-        {"endfunction", ENDUNIT},
-	{"endif", ENDIF},
-        {"endinterface", ENDINTERFACE},
-        {"endmodule", ENDUNIT},
-        {"endprogram", ENDUNIT},
-/* !!!        {"endparalleldo", ENDPARALLELDO},
-              {"endparallelsections", ENDPARALLELSECTIONS},
-              {"endparallel", ENDPARALLEL}, 
-              {"endpdo", ENDPDO},
-*/
-/*!!!        {"endprocessdo", ENDPROCESSDO},*/
-/*!!!        {"endprocesses", ENDPROCESSES},*/
-/* !!!        {"endpsections", ENDPSECTIONS},*/
-/*!!!	{"endsdoall", ENDSDOALL},*/
-/* !!!        {"endsections", ENDSECTIONS},*/
-        {"endselect", ENDSELECT},
-/* !!!        {"endsingleprocess", ENDSINGLEPROCESS},*/
-        {"endsubroutine", ENDUNIT},
-        {"endtype", ENDTYPE},
-	{"endwhere", ENDWHERE},
-	{"end", ENDUNIT},
-	{"entry", ENTRY},
-	{"equivalence", EQUIVALENCE},
-        {"eqv", EQV},
-        {"err", ERR},
-/*!!!        {"event", EVENT},*/
-        {"except", SPF_EXCEPT}, /*SPF*/
-        {"exit", EXIT},
-/*        {"extended", EXTENDED},*/
-/*        {"extend", EXTEND},*/
-	{"external", EXTERNAL},
-	{"expand", SPF_EXPAND }, /*SPF*/
-        {"files_count",SPF_FILES_COUNT}, /*SPF*/
-        {"files",FILES},
-	{"find", FIND},
-        {"fission",SPF_FISSION}, /*SPF*/
-        {"firstprivate", OMPDVM_FIRSTPRIVATE},/*OMP*/
-        {"flexible", SPF_FLEXIBLE}, /*SPF*/
-        {"forall", FORALL},
-	{"format", FORMAT},
-/*        {"from", FROM}, */
-	{"function", FUNCTION},
-        {"gate", GATE},
-        {"gen_block", GEN_BLOCK},
-	{"global", GLOBAL_A},
-	{"goto", PLAINGOTO},
-        {"guided", OMPDVM_GUIDED},/*OMP*/
-/*        {"guards", GUARDS},*/
-        {"high", HIGH},
-        {"host", ACC_HOST},   /*ACC*/     
-        {"if", OMPDVM_IF}, /*OMP*/
-	{"implicitnone", IMPLICITNONE},
-	{"implicit", IMPLICIT},
-	{"include_to", INCLUDE_TO},
-	{"include", INCLUDE},
-        {"indirect_access",INDIRECT_ACCESS},
-        {"indirect",INDIRECT},
-	{"inlocal", ACC_INLOCAL},  /*ACC*/
-	{"inout", INOUT},
-/*        {"inport", INPORT},*/
-	{"inquire", INQUIRE},
-	{"integer", INTEGER},
-        {"intent", INTENT},
-	{"interfaceassignment", INTERFACEASSIGNMENT},
-	{"interfaceoperator", INTERFACEOPERATOR},
-	{"interface", INTERFACE},
-        {"interval", SPF_INTERVAL}, /*SPF*/
-	{"intrinsic", INTRINSIC},
-	{"in", IN},
-	{"iand", IAND},/*OMP*/
-	{"ieor", IEOR},/*OMP*/
-	{"ior", IOR},/*OMP*/
-        {"iostat", IOSTAT},
-        {"iter", SPF_ITER}, /*SPF*/
-        {"lastprivate", OMPDVM_LASTPRIVATE},/*OMP*/
-/*        {"location", LOCATION},*/
-/*        {"lock", LOCK},*/
-	{"logical", LOGICAL},
-/*	{"localize", LOCALIZE},*/
-	{"local", ACC_LOCAL},  /*ACC*/
-	{"loop", LOOP},
-        {"low",LOW},
-        {"maxloc", MAXLOC},
-/*        {"maxparallel", MAXPARALLEL},*/
-        {"max", MAX},
-        {"merge", SPF_MERGE}, /*SPF*/
-        {"minloc", MINLOC},
-        {"min", MIN},
-        {"moduleprocedure", MODULE_PROCEDURE},
-	{"module", MODULE},
-	{"mult_block", MULT_BLOCK},
-/*        {"moveport", MOVEPORT},*/
-	{"namelist", NAMELIST},
-        {"neqv", NEQV},
-        {"new_value", NEW_VALUE},
-        {"new", NEW},
-        {"noinline", SPF_NOINLINE}, /*SPF*/
-        {"nowait", OMPDVM_NOWAIT},/*OMP*/
-        {"none", OMPDVM_NONE},/*OMP*/
-        {"nullify", NULLIFY},
-        {"num_threads", OMPDVM_NUM_THREADS},/*OMP*/
-	{"only", ONLY},
-	{"onto", ONTO},
-        {"on", ON},
-	{"open", OPEN},
-	{"operator", OPERATOR},
-        {"optional", OPTIONAL},
-	{"ordered", OMPDVM_ORDERED}, /*OMP*/
-        {"or", OR},
-	{"otherwise", OTHERWISE},
-/*        {"outport", OUTPORT},*/
-	{"out", OUT},
-/*	{"overflow", OVERFLOW},*/
-/* !!!        {"paralleldo", PARALLELDO},
- *        {"parallelsections", PARALLELSECTIONS},
-*/
-        {"parallel", PARALLEL},
-	{"parameter", PARAMETER},
-	{"pause", PAUSE},
-/*        {"pdo", PDO},*/
-        {"pointer", POINTER},
-/*        {"port", PORT},*/
-/*       {"post", POST}, */
-	{"print", PRINT},
-        {"private", PRIVATE}, 
-/*!!!        {"probe", PROBE}, */
-/*!!!        {"procedure", PROCEDURE},*/
-        {"process_private", SPF_PROCESS_PRIVATE}, /*SPF*/
-        {"product", PRODUCT},
-	{"program", PROGRAM},
-/*!!!	{"processcluster", PROCESS_CLUSTER},*/
-/*!!!	{"processcommon", PROCESS_COMMON},*/
-/*!!!        {"processdo", PROCESSDO},*/
-/*!!!        {"processes", PROCESSES},*/
-/*!!!	{"processglobal", PROCESS_GLOBAL},*/
-        {"processors", HPF_PROCESSORS},
-/*!!!        {"process", PROCESS},*/
-/*        {"psections", PSECTIONS},*/
-        {"public", PUBLIC},
-        {"pure", PURE},
-	{"range", RANGE},
-	{"read", READ},
-	{"real", REAL},
-/*        {"receive", RECEIVE},*/
-	{"recursive", RECURSIVE},
-/*	{"reduce", REDUCE}, */ 
-        {"reduction", REDUCTION},
-/*        {"release", RELEASE},*/
-        {"region", ACC_REGION}, /*ACC*/
-        {"remote_access", REMOTE_ACCESS_SPEC},
-        {"result", RESULT},
-	{"return", RETURN},
-	{"rewind", REWIND},
-        {"runtime", OMPDVM_RUNTIME},/*OMP*/
-	{"save", SAVE},
-/*!!!        {"scommon", SCOMMON},
- *     	{"sdoall", SDOALL}, 
- *      {"sectionwait", SECTION},
- */
- 	{"section", SECTION},
-	{"select", SELECT},
-/*        {"send", SEND},*/
-        {"sequence", SEQUENCE},
-/*        {"set", SET},*/
-        {"schedule", OMPDVM_SCHEDULE},/*OMP*/
-/*        {"shadow_add", SHADOW_ADD}, */
-        {"shadow_compute", SHADOW_COMPUTE},
-        {"shadow_start", SHADOW_START_SPEC},
-        {"shadow_wait", SHADOW_WAIT_SPEC},
-        {"shadow_renew", SHADOW_RENEW},
-        {"shadow", SHADOW},
-        {"shared", OMPDVM_SHARED},/*OMP*/
-/*        {"singleprocess", SINGLEPROCESS},*/
-/*        {"skippasteof", SKIPPASTEOF},*/
-        {"shrink",SPF_SHRINK}, /*SPF*/
-        {"stage", STAGE},
-        {"static", STATIC},
-        {"status", STATUS}, 
-        {"stat", STAT}, 
-	{"stop", STOP},
-/*        {"submachine", SUBMACHINE},*/
-	{"subroutine", SUBROUTINE},
-        {"sum",SUM},
-	{"sync", SYNC},
-/*	{"taskcluster", TASK_CLUSTER},*/
-/*      {"taskglobal", TASK_GLOBAL},*/
-        {"targets", ACC_TARGETS},  /*ACC*/
-        {"target", TARGET},
-        {"template", HPF_TEMPLATE},
-        {"tie", ACC_TIE},    /*ACC*/
-        {"time", SPF_TIME}, /*SPF*/
-	{"then", THEN},
-	{"to", TO},
-	{"type", TYPE},
-/*        {"unlock", UNLOCK},*/
-        {"unroll",SPF_UNROLL},              
-	{"use", USE},
-        {"varlist", VARLIST},
-	{"virtual", VIRTUAL},
-        {"wait", WAIT},
-        {"weight", SPF_WEIGHT},
-        {"wgt_block", WGT_BLOCK},
-	{"where", WHERE},
-	{"while", WHILE},
-        {"with", WITH},
-/*	{"wrap", WRAP},*/
-	{"write", WRITE},
-	{0, 0}
-};
-
-
-/*
- * This routine closes all files opened in this session
- */
-void
-close_files()
-{
-	register struct Inclfile *p = inclp;
-	while (p) {
-		(void)fclose(p->inclfp);
-		p = p->inclnext;
-	}
-}
-
-
-/*
- * This routine initializes the search tables for the keyword search
- * and the parameter keyword search.
- */
-void
-initkey()
-{
-	register struct Keylist *p;
-	register int i, j;
-
-	for (i = 0; i < 26; ++i)
-		keystart[i] = (struct Keylist *)NULL;
-
-	for (p = keys; p->keyname; ++p) {
-		j = p->keyname[0] - 'a';
-		if (keystart[j] == (struct Keylist *)NULL)
-			keystart[j] = p;
-		keyend[j] = p;
-	}
-}
-
-int 
-inilex(name)
-	char   *name;		/* filename to be scanned  */
-{
-	void    doinclude();
-
-	initkey();
-	cbfirst = NULL;
-	cblast = NULL;
-	pcbfirst = NULL;
-	pcblast = NULL;
-	nincl = 0;
-	inclp = NULL;
-        infile = stdin;
-	doinclude(name);
-	lexstate = NEWSTMT;
-	return (NO);
-}
-
-int /*OMP*/
-dbginilex(name, debug)
-	char   *name;		/* filename to be scanned  */
-	char   *debug;		/* filename to be scanned  */
-{
-	void dodbginclude();
-	initkey();
-	cbfirst = NULL;
-	cblast = NULL;
-	pcbfirst = NULL;
-	pcblast = NULL;
-	nincl = 0;
-	inclp = NULL;
-        infile = stdin;
-	dodbginclude(name, debug);
-	lexstate = NEWSTMT;
-	return (NO);
-}
-
-
-/* throw away the rest of the current line */
-void 
-flline()
-{
-	lexstate = RETEOS;
-}
-
-void 
-doinclude(name)
-	char   *name;		/* file name string of the INCLUDE file to be
-				 * set up */
-{
-	FILE   *fp;
-	struct Inclfile *t;
-
-	if (inclp) {
-	        /* --lines_returned; */ /*podd 18.04.99*/
-		inclp->incllno = lines_returned;   /*podd 18.04.99*/
-		/*inclp->incllno = thislin;*/
-                inclp->inclcode = code;
-                inclp->inclstno = stno;
-                inclp->ishpf = is_directive_hpf;
-                if(is_directive_omp)
-                  inclp->ishpf+=2; 
-                else if(is_directive_spf)
-                  inclp->ishpf+=4; 
-                else if(is_directive_acc)
-                  inclp->ishpf+=8; 
-                inclp->rest = restcd;
-                inclp->context = char_cntx;
-                inclp->cbfirst = cbfirst; 
-                inclp->cblast  = cblast;
-		if(nextcd && !free_form) {
-			inclp->incllinp = copyn(inclp->incllen = endcd-nextcd , nextcd);
-                        inclp->prefix = copyn(6,prefix);
-                }  
-		else
-			inclp->incllinp = 0;
-	}
-	nextcd = (char *)NULL;     
-        lines_returned = 0;  /*podd 18.04.99*/
-        restcd = 0;
-        char_cntx = 0;
-        has_continuation = 0;
-        cbfirst = NULL;
-        cblast  = NULL;
-	if(++nincl >= MAXINCLUDES)
-		fatal("includes nested too deep\n");
-	if (name[0] == '\0')
-		fp = stdin;
-	else 
-            if(!inclp)    
-		fp = fopen(name, "r"); /*source file*/
-            else {
-                fp = open_include_file(name); /*include file*/
-                make_file_list(name); /*podd 18.04.99*/
-            }
-	if (fp)
-        {
-		t = inclp;
-		inclp = (struct Inclfile *) chkalloc(sizeof(struct Inclfile));
-		inclp->inclnext = t;
-		prevlin = thislin = 0;
-		inclp->inclname = name;
-		infname = copys(name);
-		infile = inclp->inclfp = fp;
-                the_file =  inclp->file_name = cur_thread_file; /*podd 18.04.99*/
-	} else {
-           if(inclp)
-	     fatalstr("Can not open file %s", name, 5);
-           else
-             errstr_fatal("Can not open file %s", name, 5);
-        } 
-}
-
-void /*OMP*/
-dodbginclude(name, debug)
-	char   *name;		/* file name string of the INCLUDE file to be set up */
-	char   *debug;		/* file name string of the INCLUDE file to be set up */
-
-{
-	FILE *fp = NULL;
-	struct Inclfile *t;
-	nextcd = (char *)NULL;     
-        lines_returned = 0;  /*podd 18.04.99*/
-        restcd = 0;
-        char_cntx = 0;
-        has_continuation = 0;
-	if (name[0] == '\0')
-		fp = stdin;
-	else 
-            if(!inclp)    
-		fp = fopen(debug, "r"); /*source file*/
-	if (fp)
-        {
-		t = inclp;
-		inclp = (struct Inclfile *) chkalloc(sizeof(struct Inclfile));
-		inclp->inclnext = t;
-		prevlin = thislin = 0;
-		inclp->inclname = name;
-		infname = copys(name);
-		infile = inclp->inclfp = fp;
-                the_file =  inclp->file_name = cur_thread_file; /*podd 18.04.99*/
-	} else {
-           if(inclp)
-	     fatalstr("Can not open file %s", debug, 5);
-           else
-             errstr_fatal("Can not open file %s", debug, 5);
-        } 
-} /*OMP*/
-
-/*
- * This routine eliminates the current INCLUDE file block and sets up the
- * immediately previous INCLUDE file block as the current block.
- *
- *	return value = YES (1) if we are at INCLUDE level >= 2
- *		       NO  (0) if we are at the top level (we hit end-of-file)
- */
-int 
-popinclude()
-{
-	struct Inclfile *t;
-	register char *p,*pp;
-	register int k;
-	void clf();
-
-/* Free the space for this include file's buffer. */
-
-	if (infile != stdin)
-		clf(&infile);
-	free(infname);
-
-	--nincl;
-	t = inclp->inclnext;
-	free((char *)inclp->inclname);
-	free((char *) inclp);
-	inclp = t;
-	if (!inclp)
-		return (NO);
-
-	infile = inclp->inclfp;
-	infname = copys(inclp->inclname);
-	prevlin = thislin = inclp->incllno;
-        lines_returned =  inclp->incllno;  /*podd 18.04.99*/
-        the_file = inclp->file_name;  /*podd 18.04.99*/
-	code = inclp->inclcode;
-	stno = nxtstno = inclp->inclstno;
-        is_directive_hpf = inclp->ishpf ? 1 : 0;
-        is_directive_acc = is_directive_spf = is_directive_omp = 0;
-        if( inclp->ishpf >=8 )
-           is_directive_acc = 1;
-        else if(inclp->ishpf >=4)
-           is_directive_spf = 1;
-        else if(inclp->ishpf >=2)
-           is_directive_omp = 1;
-        restcd = inclp->rest;
-        char_cntx = inclp->context;
-        cbfirst = inclp->cbfirst;
-        cblast  = inclp->cblast; 
-	if (inclp->incllinp && !free_form) {
-		nextcd = ""; /*OMP*/
-		endcd = nextcd = stmtbuf;
-		k = inclp->incllen;
-		p = inclp->incllinp;
-		while (--k >= 0)
-			*endcd++ = *p++;
-		free((char *) (inclp->incllinp));
-                k = 6;
-                p = inclp->prefix;
-                pp = prefix;
-                while (--k >= 0)
-			*pp++ = *p++;
-		free((char *) (inclp->prefix));
-	} else
-		nextcd = (char *)NULL;
-        end_file = 0;   
-        has_continuation = 0;
-	return (YES);
-}
-
-
-/*
- * This routine does one line of a listing on stdout.
- *
- *   ptr    (INPUT) -	a pointer to the body of the line to be listed (col 7)
- *   line_number (INPUT) - the line number for this line
- */
-void
-list_line(ptr, line_number)
-	char   *ptr;
-	int     line_number;
-{
-	if (ptr)
-		(void)fprintf(outf,"%6d %c %c%c%c%c%c%c%s\n",
-		       line_number, ((nincl > 1) ? 'I' : ' '),
-		       prefix[0], prefix[1], prefix[2], prefix[3], prefix[4], prefix[5], ptr);
-}
-
-
-/*
- * This routine fetches all the cards necessary to get a complete Fortran
- * statement.  One additional card after the full Fortran statement must 
- * be read to determine that it is not a continuation card.
- *
- *	return value - STINITIAL (a Fortran statement is ready)
- *		       STEOF	 (end of entire program)
- */
-int
-getcds()
-{
-	register char *p, *q;
-	void err();
-       
-
-/* First, record how many bytes and lines have been read from the file */
-
-first:	yylineno = lines_returned;
-	if (yylisting && (code != STEOF) )	/* LISTING */
-		list_line(nextcd, yylineno);
-
-	if (newname) {
-		free(infname);
-		infname = newname;
-		newname = (char *)NULL;
-	}
-	move_comments_to_permbuffer();
-top:
-	if (!nextcd) {
-		nextcd = ""; /*OMP*/
-		code = getcd(nextcd = stmtbuf);
-		yylineno = lines_returned;
-
-		if (yylisting && (code != STEOF)) /* LISTING */
-			(void) list_line(nextcd, yylineno);
-
-		stno = nxtstno;
-		if (newname) {
-			free(infname);
-			infname = newname;
-			newname = (char *)NULL;
-		}
-		prevlin = thislin;
-	}
-	if (code == STEOF) {
-    	        move_comments_to_permbuffer();
-		if (popinclude()) {
-		        /* ++lines_returned; */  /*podd 18.04.99*/
-			goto first;
-		} else
-			return (STEOF);
-	}
-	if (code == STCONTINUE) {
-		if (newname) {
-			free(infname);
-			infname = newname;
-			newname = (char *)NULL;
-		}
-		lineno = thislin;
-		err("Illegal continuation line ignored", 9);    /* podd 21.05.14 card=>line */
-		nextcd = (char *)NULL;
-		goto top;
-	}
-	if (code == CMT) {
-		nextcd = (char *)NULL;
-		flline();
-		return (CMT);
-	}
-	if (nextcd > stmtbuf) {
-		for (q = nextcd, p = stmtbuf; q < endcd; *p++ = *q++)
-			;
-		endcd = p;
-	}
-	move_comments_to_permbuffer();
-        statement_kind = is_directive_hpf;
-	is_openmp_stmt = is_directive_omp; /*OMP*/
-	is_acc_statement=is_directive_acc; /*ACC*/
-	is_spf_statement=is_directive_spf; /*SPF*/
-        if(end_file) {
-       	   nextcd = ""; /*OMP*/
-           nextcd = endcd;
-           code = STEOF;
-           goto end;
-        } 
-	nextcd = ""; /*OMP*/
-	for (nextcd = endcd;
-	     (nextcd+nchars_per_line <= stmtend) && ((code=getcd(nextcd)) == STCONTINUE);
-	     nextcd = endcd-1)   /*podd 12.11.17: NCHARS_PER_LINE=>nchars_per_line*/
-	{
-       
-             if(statement_kind != is_directive_hpf || is_openmp_stmt != is_directive_omp || is_acc_statement != is_directive_acc || is_spf_statement != is_directive_spf) 
-             {  if (newname) {
-                    free(infname);
-                    infname = newname;
-                    newname = (char *) NULL;
-                }
-                lineno = thislin;
-                err_line("Illegal continuation line ignored", 9, lines_returned);
-
-                endcd = nextcd + 1; 
-                continue;
-             }
-	     memmove(nextcd-1,nextcd,endcd-nextcd);   /*memcpy => memmove*/  /*podd 23.12.13*/ 
-	     move_comments_to_permbuffer();
-		if (yylisting && (code != STEOF) && (code != CMT)) /* LISTING */
-			list_line(nextcd-1, lines_returned);
-             if(end_file) {
-                code = STEOF;
-                nextcd = endcd-1;
-                break;
-             } 
-	}
-end:	nextch = stmtbuf;
-	lastch = nextcd - 1;
-	if (nextcd >= stmtend)
-		nextcd = (char *)NULL;
-	lineno = prevlin;
-	prevlin = thislin;
-	return (STINITIAL);
-}
-
-
-/*
- * This routine fetches all the cards necessary to get a complete Fortran
- * statement (free format).
- *
- *	return value - STINITIAL (a Fortran statement is ready)
- *		       STEOF	 (end of entire program)
- */
-int
-getcds_ff()
-{
-  /*	register char *p, *q;*/
-	void err(),err_line();
-       
-
-/* First, record how many bytes and lines have been read from the file */
-
-/*first:	yylineno = lines_returned;
-	if (yylisting && (code != STEOF) )	 
-		list_line(nextcd, yylineno);
-
-	move_comments_to_permbuffer();*/
-top:
-		nextcd = ""; /*OMP*/
-		code = getcd_ff(nextcd = stmtbuf);
-		yylineno = lines_returned;
-
-		if (yylisting && (code != STEOF)) /* LISTING */
-			(void) list_line(nextcd, yylineno);
-
-		stno = nxtstno;
-
-/*		prevlin = thislin; */
-	
-	if (code == STEOF) {
-    	        move_comments_to_permbuffer();
-		if (popinclude()) 		     
-			goto top;
-		else
-			return (STEOF);
-	}
-	if (code == STCONTINUE) {
-		lineno = thislin;
-		err("Illegal continuation line ignored", 9);
-		nextcd = (char *)NULL;
-		goto top;
-	}
-/*	if (code == CMT) {
-		nextcd = (char *)NULL;
-		flline();
-		return (CMT);
-	}
-*/
-
-	move_comments_to_permbuffer();
-        statement_kind = is_directive_hpf;
-	is_openmp_stmt = is_directive_omp; /*OMP*/
-	is_acc_statement=is_directive_acc; /*ACC*/
-	is_spf_statement=is_directive_spf; /*SPF*/
-        if(end_file) {
-	   nextcd = ""; /*OMP*/
-           nextcd = endcd;
-           code = STEOF;
-           goto end;
-        }
-        for(nextcd=endcd; (has_continuation != 0); nextcd=endcd) { 
-             
-             code=getcd_ff(nextcd);	     
-       
-             if(statement_kind != is_directive_hpf || is_openmp_stmt != is_directive_omp || is_acc_statement != is_directive_acc || is_spf_statement != is_directive_spf) /*ACC*/  
-             {  lineno = thislin;
-                err_line("Illegal continuation line ignored", 9, lines_returned );
-                endcd = nextcd + 1; 
-                continue;
-             }
-
-	     move_comments_to_permbuffer();
-
-		if (yylisting && (code != STEOF) && (code != CMT)) /* LISTING */
-			list_line(nextcd-1, lines_returned);
-
-             if(end_file) {
-                code = STEOF;
-                nextcd=endcd;
-                break;
-             } 
-	}
-end:	nextch = stmtbuf;
-	lastch = nextcd - 1;
-	/*if (nextcd >= stmtend)
-		nextcd = (char *)NULL;*/
-	lineno = prevlin;
-	prevlin = thislin;
-	return (STINITIAL);
-}
-
-
-
-
-/*
- * This routine retrieves one card from the Fortran source file.
- *
- *	b (INPUT) -	The address at which to put the new card
- *
- *	return value - STINITIAL (the first card of a Fortran statement)
- *		       STCONTINUE (a continuation card)
- *		       STEOF (end-of-file on the current file)
- */
-int 
-getcd(b)
-	register char *b;
-{
-	register int c;
-	register char *p, *bend, *cmt;
-	/*extern int debug;*/
-	int     cnext;  /*, has_comment_sym; */
-	void err(), err_line(), warn_line(), store_comment();
-
-top:
-	endcd = b;
-        is_directive_hpf = 0;
-        is_directive_acc = 0; /*ACC*/
-        is_directive_spf = 0; /*SPF*/
-        is_directive_omp = 0; /*OMP*/
-        end_file = 0;
-        /* bend = yylonglines? stmtend : b + NCHARS_PER_LINE */
-        if(restcd) { /* reading the rest of card (after ';' )  */
-         /*(void)fprintf(stderr,"getcd: restcd  = %d\n",restcd);*/
-	  bend = b + restcd;
-          p = prefix;
-          while( p < prefixend )
-            *p++ = BLANKC;
-          restcd = 0;
-          c = BLANKC; 
-          -- lines_returned;         
-          goto body;  
-        }
-	bend = b + nchars_per_line; /*podd 12.11.17: NCHARS_PER_LINE=>nchars_per_line*/
-
-	/* Get first character on a line */
-        c = getc(infile);  
-
-        if (c == 'c' || c == 'C' || c == '*' || c == '!' || c == '#' 
-		  || (d_line ? 0 : (c == 'D') || (c == 'd') )  ) { /* comment card */
-		++lines_returned;
-
-		/* For the listing:  fill the prefix array from the comment */
-
-		prefix[0] = (c != 'D' && c != 'd') ? '!' : c; /* c */
-		for (p = prefix + 1; p < prefixend; p++)
-			if ((c = getc(infile)) == '\n')
-				break;
-			else if (c == EOF)
-				break;
-			else
-				*p = c;
-                if ((prefix[1]=='$') && ((prefix[2]==' ') || isdigit(prefix[2]))) { /*OMP*/
-                    if(OMP_program==1 ) {   
-			for (p = prefix; p < prefixend; p++) {/*OMP*/
-				*p = ' ';/*OMP*/
-				(void)ungetc(' ', infile);/*OMP*/
-			}/*OMP*/
-                        is_directive_omp = 1; /*OMP*/
-			--lines_returned; /*OMP*/
-			goto top;/*OMP*/
-                    } else if(SAPFOR==0) {                      
-                        warn_line("Ignoring line with OpenMP conditional compilation sentinel ($)", 664, lines_returned);                        
-                        prefix[1] ='!';
-                    }
-		} 	
-		/*
-		 * If we saw EOF or '\n' and quit early above,
-		 * fill the rest of the prefix with blanks. 
-		 */
-
-		for (; p < prefixend; p++)
-			*p = ' ';
-
-		
-                if((HPF_program && eqn(4,prefix+1,"hpf$")) ||
-                  (!HPF_program && !ftn_std && eqn(4,prefix+1,"dvm$"))) {                  
-                    is_directive_hpf = 1;
-                   -- lines_returned; 
-                    goto body;
-                }
-                if(eqn(4,prefix+1,"$omp")) {/*OMP*/
-                  if(OMP_program==1) { 
-                    is_directive_hpf = 1; /*OMP*/
-                    is_directive_omp = 1; /*OMP*/
-                    -- lines_returned;  /*OMP*/
-                    goto body; /*OMP*/
-                  } else if(SAPFOR==0) {                      
-                    warn_line("Ignoring OpenMP derective", 664, lines_returned);                        
-                    prefix[1] = '!';
-                    } 
-                } /*OMP*/
-                if((ACC_program==1) && (eqn(4,prefix+1,"$acc")|| eqn(4,prefix+1,"$apm"))) {/*ACC*/
-                    is_directive_hpf = 1; /*ACC*/
-                    is_directive_acc = 1; /*ACC*/
-                    -- lines_returned;  /*ACC*/
-                    goto body; /*ACC*/
-                } /*ACC*/
-                if((SAPFOR==1) && eqn(4,prefix+1,"$spf")) {/*SPF*/
-                    is_directive_hpf = 1; /*SPF*/
-                    is_directive_spf = 1; /*SPF*/
-                    -- lines_returned;  /*SPF*/
-                    goto body; /*SPF*/
-                } /*SPF*/
-
-                /*
-                if (only_debug && (eqn(4,prefix+1,"dvm$")) && isspace(prefix[5])){
-                    while((endcd < bend) && ((c = getc(infile))!='\n') && (c!=EOF) && isspace(c))
-                        *endcd++=c;
-                  
-		    if(c=='p' || c=='P') {
-                      *endcd++=c;
-                      is_directive_hpf = 1;
-                      -- lines_returned; 
-                      goto body;
-                    }
-                    if ((c != EOF) && (c != '\n'))
-                      *endcd++=c;   
-                }
-               if (only_debug  &&  statement_kind == HPF &&  (eqn(4,prefix+1,"dvm$")) && !isspace(prefix[5]))
-                  {  is_directive_hpf = 1;
-                     -- lines_returned; 
-                     goto body;
-                   }
-		*/
-          
-		/* Now, begin consuming the rest of the comment line- */
-
-		if ((c != EOF) && (c != '\n'))
-			while (((c = getc(infile)) != '\n') &&
-			       (c != EOF)) 
-				*endcd++ = c;
-		/*if (c == '\n') *endcd++ = c;    podd 24.11.00*/
-                *endcd++ = '\n'; /* podd 24.11.00*/
-		*endcd = '\0';
-
-		if (yylisting)	/* LISTING */ 
-			(void) list_line(b, lines_returned);
-		for (cmt = tempbuf, p = prefix; p < prefixend; )
-		  *cmt++ = *p++;
-		for (p = b; *p;)
-		  *cmt++ = *p++;
-		*cmt = '\0';
-		store_comment();
-		goto top;
-        }  else if (c == EOF) 
-		    return (STEOF);
-	         
-	   else {                       /*if(c != EOF)*/
-		/* a tab in columns 1-6 skips to column 7 */
-		(void)ungetc(c, infile);
-		for (p = prefix; p < prefixend &&
-		     ((c = getc(infile)) != '\n') && (c != EOF);)
-			if (c == '\t') {
-				while (p < prefixend)
-					*p++ = BLANKC;
-
-			/*
-			 * check out next char: if digit, it goes in col 6 of
-			 * the card 
-			 */
-
-				if (isdigit(cnext = getc(infile)))
-					prefix[5] = cnext;
-				else
-					(void)ungetc(cnext, infile);
-				/*bend = stmtend;*/ /* podd 01.12.02*/
-			} else
-				*p++ = c;
-	}
-body:/* if(newname) {
-               free(infname);
-               infname = newname;
-               newname=(char *)NULL;
-        }
-        lineno=thislin;
-        if(is_directive_hpf) err("directive HPF");
-      */
-        /* has_comment_sym = 0; */
-        if ((c == EOF) || (c == '\n')) {
-  
-	         /*return (STEOF);
-		  *}
-	          *if (c == '\n') {
-                  */
-		while (p < prefixend)
-			*p++ = BLANKC;
-		*endcd = '\0';	/* EOLN:  make statement empty */
-                if(c == EOF)   
-                       end_file = 1;
-                
-	} else {		/* Read body of line */
-                if (is_directive_hpf) { 
-                   if (isspace(prefix[5])) /*first card of directive*/
-                         char_cntx = 0;
-                }
-                else  if ((prefix[5] == ' ') || (prefix[5] == '0')) /*first card of statement*/
-                         char_cntx = 0;
-
-		while ((endcd < bend) && ((c = getc(infile)) != '\n') && (c != EOF) )
-		{        if((c=='!') && (char_cntx==0)) break;
-                         if((c==';') && (char_cntx==0)) break;
-                         *endcd++ = c; 
-                        /*  if( c=='!') has_comment_sym=1; */
-                          
-                         if(c=='\'') {
-                           if(char_cntx == 0)
-                               char_cntx = 1;
-                           else if(char_cntx == 1)
-                               char_cntx = 0;
-                         }
-                         if(c=='\"') {
-                           if(char_cntx == 0)
-                               char_cntx = 2;
-                           else if(char_cntx == 2)
-                               char_cntx = 0;
-                         }
-          
-                }
-			
-                if((c == '\n') && (endcd > b) && (*(endcd-1) == '\r')) /*podd 03.06.01*/
-                  *(endcd-1)='\0'; /* deleting '\r' before '\n'*/
-                                  /*('\r\n' is end line marker in Windows) */
-                else if ((c == '\n') && (endcd == b) && (prefix[5]=='\r')) /*podd 07.06.02*/
-                     { prefix[5]=BLANKC; *endcd++ = '\0';} 
-                else
-		  *endcd++ = '\0';  /* put NULL char in buffer as end marker */
-stmt_end:       if((c==';') && (char_cntx==0)) {              
-                  restcd = bend - endcd;
-                  while( ((c = getc(infile)) == ';') || (c == ' '))
-                    restcd--;
-                  if(c == '!') { /* delimiter ';' is ignored before comment */
-                    restcd = 0;
-                    goto stmt_end;           
-                  }                		  
-                  else
-		    (void) ungetc(c,infile); 
-                }
-                else if((c=='!') && (char_cntx==0)) {
-                    cmt = tempbuf;
-                    *cmt++ = '!';
-                    while (((c = getc(infile)) != '\n') && (c != EOF)) 
-				*cmt++ = c;
-                    *cmt++ = '\n'; 
-		    *cmt = '\0';
-                    store_comment();
-                }
-		else if (c == EOF) 
-		    /*return (STEOF);*/
-                    end_file = 1;
-		else if (c != '\n') {
-			while ((c = getc(infile)) != '\n')
-				if (c == EOF)           
-                             { /*return (STEOF);*/
-                               end_file = 1;
-                               break;
-			     }
-		}
-
-	}
-
-	++lines_returned;
-
-	/* Check for a comment char in the prefix */
- 
-        if (!is_directive_hpf) {
-	for (p = prefix; p < prefixend-1; ++p)
-		if (*p == '!') {
-			if (yylisting)
-				(void) list_line(b, lines_returned);
-			for (cmt = tempbuf; p < prefixend; )
-			  *cmt++ = *p++;
-		        for (p = b; *p;)
-		          *cmt++ = *p++;
-                        *cmt++ = '\n';
-                        *cmt = '\0';
-/*!!!!*/
-			/*(void)fprintf(stderr,"getcd:tempbuf =  %s \n",tempbuf);*/
-			store_comment();
-			goto top; 
-		}
-         }
-
-        if (is_directive_hpf) {
-            if(isspace(prefix[5]) == 0 ) /*((prefix[5] != ' ') && (prefix[5] != '0'))*/
-		return (STCONTINUE);
-            goto check; 
-        }
-	if ((prefix[5] != ' ') && (prefix[5] != '0'))
-		return (STCONTINUE);
-	for (p = prefix; p < prefixend; ++p)
-		if (isspace(*p) == 0)
-			goto initline;
-check:	/* Check for blank line */
-	for (p = b; p < endcd - 1; ++p)	/* char at endcd-1 is always \0 */
-             if (isspace(*p) == 0) {
-			nxtstno = 0;
-			return (STINITIAL);
-		}
-
-
-	/* We have a completely blank line */
-
-	if (yylisting)	/* LISTING */
-		(void) list_line(b, lines_returned);
-	goto top;
-
-initline:			/* there is a label */
-	nxtstno = 0;
-
- /*
-  * Start out conversion loop at second char in prefix if we have debug set and
-  * a D/d in col 1.  Otherwise, start at first. 
-  */
-
-	if (d_line) {
-		if (prefix[0] == 'd' || prefix[0] == 'D')
-			p = prefix + 1;
-		else
-			p = prefix;
-        }
-	while (p < prefix + 5) {
-	        if (isspace(*p) == 0) {
-		        if (isdigit(*p))
-				nxtstno = 10 * nxtstno + (*p - '0');
-			else {
-				if (newname) {
-					free(infname);
-					infname = newname;
-					newname = (char *)NULL;
-				}
-				lineno = thislin;
-				err_line("Non digit in statement number field", 11, lines_returned);
-				nxtstno = 0;
-				break;
-			}
-	        }
-		p++;
-	}
-	return (STINITIAL);
-}
-
-int 
-getcd_ff(b)
-	register char *b;
-{
-	register int c;
-	register char *p,  *cmt;
-	/*extern int debug;*/
-	int   continuation_state, is_continuation, has_label, numsym;
-	void err(), err_line(), warn_line(), store_comment();
-
-top:
-	endcd = b;
-        is_directive_hpf = 0;
-        is_directive_acc = 0; /*ACC*/
-        is_directive_spf = 0; /*SPF*/
-        is_directive_omp = 0; /*OMP*/
-        is_continuation = 0;
-        has_label = 0;
-        end_file = 0;
-        numsym = 0;        
-
-        if(restcd) { /* reading the rest of card (after ';' )  */
-          restcd = 0;
-          numsym = 1; 
-         /* -- lines_returned;*/                 
-        } else
-          lines_returned++; 
-        
-        if(has_continuation) {
-            continuation_state = 1;
-            has_continuation = 0;
-        } else
-            continuation_state = 0; 
-
-
-	/* Get first nonblank character on a line */  
-        while(isspace(c=getc(infile)) && (c != '\n'))  
-          numsym++;
-        
-        
-        if((c =='!') || (numsym == 0 && (c == '$'))) {
-		/*++lines_returned;*/
-
-		prefix[0] = c;
-		for (p = prefix + 1; p < prefixend; p++)
-			if ((c = getc(infile)) == '\n')
-				break;
-			else if (c == EOF)
-				break;
-			else
-				*p = c;
-
-		/*
-		 * If we saw EOF or '\n' and quit early above,
-		 * fill the rest of the prefix with blanks. 
-		 */
-
-		for (; p < prefixend; p++)
-			*p = ' ';
-                if ((prefix[1]=='$') && ((prefix[2]==' ') || (prefix[2]=='&'))) { /*OMP*/ 
-                    if (OMP_program == 1) {  /*OMP*/   
-			for (p = prefix; p < prefixend; p++) {/*OMP*/
-				*p = ' ';/*OMP*/
-				(void)ungetc(' ', infile);/*OMP*/
-			}/*OMP*/
-                        is_directive_omp = 1; /*OMP*/
-			--lines_returned; /*OMP*/
-			goto top;/*OMP*/
-                    } else if(SAPFOR==0) {   /*OMP*/                   
-                        warn_line("Ignoring line with OpenMP conditional compilation sentinel ($)", 664, lines_returned);  /*OMP*/                      
-                        prefix[1] ='!';   /*OMP*/
-                    }
-		} /*OMP*/		
-                if((HPF_program && eqn(4,prefix+1,"hpf$") && (prefix[0] != '$')) ||
-                  (!HPF_program && !ftn_std && eqn(4,prefix+1,"dvm$") && (prefix[0] != '$'))) {
-                    is_directive_hpf = 1;
-                    goto body;
-                } else if((ACC_program==1) && (eqn(4,prefix+1,"$acc") || eqn(4,prefix+1,"$apm"))) {/*ACC*/
-                    is_directive_hpf = 1; /*ACC*/
-                    is_directive_acc = 1; /*ACC*/
-                    goto body; /*ACC*/ 
-                } else if((SAPFOR==1) && eqn(4,prefix+1,"$spf")) {/*SPF*/
-                    is_directive_hpf = 1; /*SPF*/
-                    is_directive_spf = 1; /*SPF*/
-                    goto body; /*SPF*/                
-                } else if (eqn(4,prefix+1,"$omp")) {/*OMP*/
-                    if(OMP_program == 1) {  /*OMP*/  
-                       is_directive_hpf = 1; /*OMP*/
-                       is_directive_omp = 1; /*OMP podd*/                  
-                       goto body; /*OMP*/
-                    } else if(SAPFOR==0) {  /*OMP*/
-                       warn_line("Ignoring OpenMP derective", 664, lines_returned); /*OMP*/                       
-                       prefix[1] = '!'; /*OMP*/                      
-                    } /*OMP*/
-                }  
-
-                for(cmt = tempbuf, p=prefix; p<prefixend;)
-                    *cmt++ = *p++;                
-        
-		/* Now, begin consuming the rest of the comment line- */
-
-		if ((c != EOF) && (c != '\n'))
-			while (((c = getc(infile)) != '\n') &&
-			       (c != EOF)) 
-				*cmt++ = c;
-		
-                *cmt++ = '\n'; 
-		*cmt = '\0';		
-		store_comment();
-                if(c == EOF)
-                   return (STEOF);
-		goto top;
-        }  else if (c == EOF) 
-		return (STEOF);
-           else if (c == '\n') {/* We have a completely blank line */
-                /*++lines_returned;*/
-                goto top;
-        }
-           else if (c == '&') {
-                is_continuation = 1;
-                goto body;      
-        }
-          else if (!continuation_state && isdigit(c)) {              
-              while(isdigit(c)) {
-                has_label = 10*has_label + (c - '0');
-                c = getc(infile);
-              }
-              if(!isspace(c)) 
-                 err_line("No blank after label", 330, lines_returned );
-               else
-                 while(isspace(c) && (c != '\n'))
-                     c = getc(infile);
-        }
-	    
-        (void) ungetc(c,infile);
-body:         	/* Read body of line */
-	while ((endcd < stmtend) && ((c = getc(infile)) != '\n') && (c != EOF) )
-		{        if((c=='!') && (char_cntx==0)) break;
-                         if((c==';') && (char_cntx==0)) break;
-                         *endcd++ = c;                         
-                          
-                         if(c=='\'') {
-                           if(char_cntx == 0)
-                               char_cntx = 1;
-                           else if(char_cntx == 1)
-                               char_cntx = 0;
-                         }
-                         if(c=='\"') {
-                           if(char_cntx == 0)
-                               char_cntx = 2;
-                           else if(char_cntx == 2)
-                               char_cntx = 0;
-                         }          
-                }
-			
-                if((c == '\n') && (endcd > b) && (*(endcd-1) == '\r')) /*podd 03.06.01*/
-                  *(endcd-1)='\0'; /* deleting '\r' before '\n'*/
-                                  /*('\r\n' is end line marker in Windows) */                
-                else
-		  *endcd++ = '\0';  /* put NULL char in buffer as end marker */
-stmt_end:       if((c==';') && (char_cntx==0)) {
-                  restcd = 1;                                                    
-                  while( ((c = getc(infile)) == ';') || (c == ' '))
-                     ;
-                  if(c == '!') { /* delimiter ';' is ignored before comment */
-                    restcd = 0;
-                    goto stmt_end;           
-                  }                		  
-                  else
-		    (void) ungetc(c,infile);                  		  
-                }
-                else if((c=='!') && (char_cntx==0)) {
-                    cmt = tempbuf;
-                    *cmt++ = '!';
-                    while (((c = getc(infile)) != '\n') && (c != EOF)) 
-				*cmt++ = c;
-                    *cmt++ = '\n'; 
-		    *cmt = '\0';
-                    store_comment();
-                    if (c == EOF) end_file = 1;
-                }
-		else if (c == EOF) 
-		    /*return (STEOF);*/
-                    end_file = 1;
-		else if (c != '\n') {
-			while ((c = getc(infile)) != '\n')
-				if (c == EOF)           
-                             { /*return (STEOF);*/
-                               end_file = 1;
-                               break;
-			     }
-		}
-
-	/*++lines_returned;*/
-        for(p=endcd-2; isspace(*p) && p>=b ;endcd-- ){/*deleting last blanks in line*/
-           *p-- = '\0';
-        }
-        
-        if( *(p) == '&') 
-          {has_continuation = 1;  endcd = p;}
-
-        if (is_directive_hpf) {
-            if(prefix[5] == '&' ) 
-		return (STCONTINUE);            
-	/* Check for blank line */        
-	  for (p = b; p < endcd - 1; ++p)	/* char at endcd-1 is always \0 */
-		  if (isspace(*p) == 0) {    
-		    nxtstno = 0;		 
-			return (STINITIAL);  
-		  }	
-	  goto top;
-          
-        }
-
-	if (is_continuation)
-		return (STCONTINUE);
-
-	nxtstno = has_label;
-
-	return (STINITIAL);
-}
-
-
-          
-
-/*
- * This routine removes all blanks, reduces everything to lower case
- *   (except char strings), replaces outer quotes with MYQUOTE, encloses
- *   a Hollerith string with MYHOLLERITH, and determines whether this
- *   statement contains either an exposed comma, or an exposed equal.
- */
-void
-crunch()
-{
-	register char *i, *j, *j0, *j1, *prvstr, *cmt;
-	int     bracklev;
-	int     ten, nh, quote;
-	void    erri(), err();
-
-/* i is the next input character to be looked at.
-   j is the next output character */
-
-	--lastch;		/* at this point, lastch is pointing at the
-				 * ending '\0' decrement it to eliminate that
-				 * '\0' from consideration */
-
-	bracklev = 0;		/* level of <,> pairs */
-	parlev = 0;		/* level of (,) pairs */
-
-	expcom = 0;		/* exposed ','s */
-	expeql = 0;		/* exposed '='s */
-	expdcolon = 0;          /* exposed '::'s */
-	expscolon = 0;          /* exposed ':' eg. construct_name : .... */
-	expeqlt = 0;
-	operator_slash = 0;
-	prvstr = j = crunchbuf;
-	memset(crunchbuf, 0, sizeof(crunchbuf)); /*OMP*/
-	for (i = stmtbuf; i <= lastch; ++i) {
-		if (isspace(*i) || (*i == '\0'))
-			continue;
-	/* eliminate ! comments	 */
-		if (*i == '!') {
-		     
-/*			*j++ = '!'; why? */
-			cmt = tempbuf;
-			while (*i)
-				*cmt++ = *i++;
-                        *cmt++ = '\n';
-			*cmt = '\0';
-/*!!!*/
-			/* (void)fprintf(stderr,"crunch:tempbuf = %s \n",tempbuf);*/
-			store_comment_end_permbuff();
-			continue;
-		}
-	/* Is this a QUOTE and is this not a random I/O operator? */
-        /* character constant "<string>" will be change by '<string>' */
-        /* "acb""d" will be change by 'abc"d' */
-
-		if ((*i == '\'') || (*i == '\"'))   /* && (!randomio(j)))*/
-                {
-			quote = *i;
-			*j = MYQUOTE;	/* special marker */
-                        *++j = *i;
-			for (;;) {
-				if (++i > lastch) {
-					err("Unbalanced quotes; closing quote supplied", 12);
-					break;
-				}
-				if (*i == quote)
-				{  if (i < lastch && i[1] == quote) { 
-                                                *++j = *i;          
-						++i;
-                                   }
-				   else
-						break;
-				}		
-				*++j = *i;
-			}
-			if (i > lastch)
-				++j;	/* quotes were unbalanced */
-			else {
-				j[1] = MYQUOTE;
-				j += 2;
-			}
-			prvstr = j;
-
-
-		} else if ((*i == 'h' || *i == 'H') && j > prvstr) {/*	 test for Hollerith
-								     *	  strings */
-			if (isdigit(j[-1])==0)
-				goto copychar;
-			nh = j[-1] - '0';
-			ten = 10;
-			j1 = prvstr - 1;
-			if (j1 < j - 5)
-				j1 = j - 5;
-			for (j0 = j - 2; j0 > j1; --j0) {
-				if (isdigit(*j0)==0)
-					break;
-				nh += ten * (*j0 - '0');
-				ten *= 10;
-			}
-			if (j0 <= j1)
-				goto copychar;
-             
-/*
- * A hollerith must be preceded by a punctuation mark.
- * '*' is possible only as repetition factor in a data statement
- * not, in particular, in character*2h
- */
-	           
-			if (!(*j0 == '*' && stmtbuf[0] == 'd' && stmtbuf[1] == 'a') &&
-			    *j0 != '/' && *j0 != '(' &&
-			    *j0 != ',' && *j0 != '=' && *j0 != '.')
-				goto copychar;
-			if (i + nh > lastch) {
-				erri("%dH too big", nh, 326);
-				nh = lastch - i;
-			}
-			/* Form the string for the Hollerith constant.*/ 
-			j0[1] = MYHOLLERITH;	/* special marker */
-			j = j0 + 1;
-			while (nh-- > 0)
-				*++j = *++i;
-			j[1] = MYHOLLERITH;
-			j += 2;
-			prvstr = j;
-
-
-		} else {
-			if (*i == '(') {
-				if (++parlev > MAXPARLEV)
-					fatal("Too many levels of parenthesis nesting");
-			} else if (*i == ')')
-				--parlev;
-/*			else if (*i == '<')
-				++bracklev;
-			else if (*i == '>')
-				--bracklev;
-			else if ((*i == ':') && (i[1] == ':') && (bracklev == 0))
-  			        expdcolon = 1;
-*/			else if ((parlev == 0) && (bracklev == 0))
-                        {       if ((*i == ':') && (i[1] == ':')) 
-				{
-				     *j++ = *i++;
-				     expdcolon = 1;
-				}
-			        else if (*i == ':')
-				     expscolon = 1;
-				else if ((*i == '=') && (i[1] == '>') && (expdcolon == 0))
-				{
-				     *j++ = *i++;
-				     expeqlt = 1;
-				}
-				else if ((*i == '=') && (i[1] == '='))
-				     *j++ = *i++;
-				else if ((*i == '=') && (expdcolon == 0))
-				     expeql = 1;
-				else if (*i == ',')
-				     expcom = 1;
-			}	     
-	copychar:		/* not a string or space -- copy, shifting case
-				 * if necessary */
-			*j++ = (shiftcase && isupper(*i)) ? tolower(*i) : *i;
-		}
-	}
-	{ register char *k;
-	for (i = k = stmtbuf; i <= lastch; ++i)
-            if (*i != '\0') { *k = *i; ++k; }
-        }
-	lastch = j - 1;
- 	nextch = crunchbuf;
-}
-
-
-/*
- * This routine is only called when the current character in crunch is 
- * a single quote (').  It determines whether the beginning of the current
- * statement looks like the beginning of a random I/O statement.  The 
- * parameter j is a pointer to the next place where a 'crunch'ed character
- * will be put within crunchbuf.  The characters under scrutiny are:
- * crunchbuf[0] through j[-1].
- *
- *      j (INPUT) - the next place within crunchbuf where a 'crunch'ed
- *                  character will be placed.
- *
- *	return value - YES if the chars in cruncbuf look like a random I/O
- *                     stmt NO  otherwise
- */
-int 
-randomio(j)
-	register char *j;
-{
-	int     nchars;
-	char   *start;
-	register char *p;
-
-	nchars = j - crunchbuf;	/* compute number of characters in buffer */
-
-	if ((nchars > 6) && eqn(6, crunchbuf, "write("))
-		start = crunchbuf + 6;
-	else if ((nchars > 5) && eqn(5, crunchbuf, "read("))
-		start = crunchbuf + 5;
-	else if ((nchars > 5) && eqn(5, crunchbuf, "find("))
-		start = crunchbuf + 5;
-	else
-		return (NO);
-
-	if (isalpha(*start))
-	/* We have an identifier for a unit number.  Rest must be alphanum-- */
-	{
-		for (p = start + 1; p < j; ++p)
-			if ((isalpha(*p)==0) && (isdigit(*p)==0) && !(*p == '_'))
-				return (NO);
-		return (YES);
-	} else if (isdigit(*start))
-	/* We have an integer constant for a unit number. */
-	{
-		for (p = start + 1; p < j; ++p)
-			if (isdigit(*p) == 0)
-				return (NO);
-		return (YES);
-	} else
-		return (NO);
-}
-
-
-int 
-named_stmt()
-{
-     char *i, *p;
-     i = nextch;
-     p = yytext;
-     *p++ = *i++;
-     while (i <= lastch)
-	  if (isalpha(*i) || isdigit(*i) || (*i == '_'))
-	       *p++ = *i++;
-	  else
-	       break;
-     yyleng = p - yytext;
-     *p = '\0';
-     if ((*i == ':') && (i[1] != ':') && (i != nextch)) 
-     {
-	  nextch = i;
-	  return (1);
-     }
-     else return (0);
-}
-
-	  
-/*
- * This routine determines the type of statement we have.  It either
- * finds the first lexeme, (like FORMAT, LOGICALIF, etc), or determines
- * that this is an assignment statement (LET).  It assigns that value
- * to the variable "stkey" which stays around as a reminder of what
- * type statement we have as the rest of the statement is scanned.
- */
-void
-analyz()
-{
-	register char *i;
-	int forallstmt, level;
-        int hpf;
-	void err();
-
-        directive_key = 0;
-        hpf = 0;
-	if (parlev) {
-		err("Unbalanced parentheses, statement skipped", 13);
-		stkey = UNKNOWN;
-		return;
-	}
-
-	if ((expscolon) && (named_stmt()))
-	{
-	     stkey = CONSTRUCT_ID;
-	     return;
-	}
-/* !!! */
-        if (statement_kind != HPF) {	
-	if (nextch + 2 <= lastch && eqn(3, nextch, "if(")) {
-               /* assignment or if statement -- look at character after balancing paren */
-		parlev = 1;
-		for (i = nextch + 3; i <= lastch; ++i)
-			if (*i == (MYQUOTE))
-				while (*++i != MYQUOTE);
-			else if (*i == (MYHOLLERITH))
-				while (*++i != MYHOLLERITH);
-			else if (*i == '(')
-				++parlev;
-			else if (*i == ')') {
-				if (--parlev == 0)
-					break;
-			}
-		if (i >= lastch)
-			stkey = LOGICALIF;
-		else if (i[1] == '=')
-			stkey = LET;
-		else if (isdigit(i[1]))
-			stkey = ARITHIF;
-		else
-			stkey = LOGICALIF;
-		if (stkey != LET)
-			nextch += 2;
-	} else if (nextch + 5 <= lastch && eqn(6, nextch, "where(")) {
-               /* assignment or where statement -- look at character after balancing paren */
-		parlev = 1;
-		for (i = nextch + 6; i <= lastch; ++i)
-			if (*i == (MYQUOTE))
-				while (*++i != MYQUOTE);
-			else if (*i == (MYHOLLERITH))
-				while (*++i != MYHOLLERITH);
-			else if (*i == '(')
-				++parlev;
-			else if (*i == ')') {
-				if (--parlev == 0)
-					break;
-			}
-		if (i >= lastch)
-			stkey = WHERE;
-		else if (i[1] == '=')
-			stkey = LET;
-		else
-			stkey = WHERE_ASSIGN;
-		if (stkey != LET)
-			nextch += 5;
-	} else if (expeql) {	/* may be an assignment */
-		if (expcom && nextch < lastch) {
-			if ((nextch[0] == 'd') && (nextch[1] == 'o')) {
-				stkey = PLAINDO;
-				nextch += 2;
-/*!!!
-                        } else if (eqn(9, nextch, "processdo")) {
-                                stkey = PROCESSDO;
-                                nextch += 9;
-
-			} else if (eqn(10, nextch, "paralleldo")) {
-				stkey = PARALLELDO;
-				nextch += 10;
-			} else if (eqn(3, nextch, "pdo")) {
-				stkey = PDO;
-				nextch += 3;
-
-			} else if (eqn(5, nextch, "alldo")) {
-				stkey = CDOALL;
-				nextch += 5;
-			} else if (eqn(8, nextch, "acrossdo")) {
-				stkey = CDOACROSS;
-				nextch += 8;
-			} else if (eqn(6, nextch, "cdoall")) {
-				stkey = CDOALL;
-				nextch += 6;
-			} else if (eqn(6, nextch, "sdoall")) {
-				stkey = SDOALL;
-				nextch += 6;
-			} else if (eqn(8, nextch, "doacross")) {
-				stkey = DOACROSS;
-				nextch += 8;
-			} else if (eqn(9, nextch, "cdoacross")) {
-				stkey = CDOACROSS;
-				nextch += 6;
-			} else if (eqn(6, nextch, "forall")) {
-				stkey = FORALLDO;
-				nextch += 6;
-!!!*/
-
-			} else
-				stkey = LET;
-		}
-
-		else if (eqn(7, nextch, "forall(")) {
-			level = 0;
-			forallstmt = -1;
-			for (i = nextch + 7; i<= lastch; i++) {
-				switch (*i) {
-				    case (')'):
-					if (level <= 0)
-						if (*(i + 1) == '=') {
-							forallstmt = NO;
-							break;
-						} else {
-							forallstmt = YES;
-							break;
-						}
-					else
-						level--;
-					break;
-				    case ('('):
-					level++;
-				    default:
-					break;
-				}
-				if (forallstmt >= 0) {
-					if (forallstmt == 1) {
-						stkey = FORALL;
-						nextch += 6;
-					} else
-						stkey = LET;
-					break;
-				}
-			}
-			if (i > lastch)
-				stkey = LET;
-		}
-
-                 else
-			stkey = LET;
-	}
-	else if (expeqlt && !expcom)
-	     stkey = POINTERLET;
-/* otherwise search for keyword */
-	else {
-        
-                      /*printf("analyz: %d\n",yylineno);*/
-  		stkey = getkwd();
- 		if ((stkey == TYPE) && (nextch[0] != '('))
- 		     stkey = TYPE_DECL;
- 		if (stkey == PLAINGOTO && lastch >= nextch){
- 		     if (nextch[0] == '(')
-			  stkey = COMPGOTO;
-		     else if (isalpha(nextch[0]))
-			  stkey = ASSIGNGOTO;                
-                }
-                if (stkey == ELSEIF && nextch[0] != '('){
-                          stkey = ELSE;
-                          nextch -= 2;          
-                }              
-	}
-	parlev = 0;
-        }
-        else  { /* for HPF, DVM, OMP and SPF directives */
-          if(is_spf_statement) {  
-             if ( eqn(8,  nextch,   "analysis")) {
-                stkey = SPF_ANALYSIS;   
-                nextch += 8;
-             }  else if (eqn(15, nextch, "endparallel_reg")) {
-                stkey = SPF_END_PARALLEL_REG;    
-                nextch += 15;
-             }  else if (eqn(12, nextch, "parallel_reg")) {
-                stkey = SPF_PARALLEL_REG;    
-                nextch += 12;
-             }  else if (eqn(8, nextch, "parallel")) {
-                stkey = SPF_PARALLEL;  
-                nextch += 8;
-             }  else if (eqn(9, nextch, "transform")) {
-                stkey = SPF_TRANSFORM;    
-                nextch += 9;
-             }  else if (eqn(10, nextch, "checkpoint")) {
-                stkey = SPF_CHECKPOINT;    
-                nextch += 10;
-
-             }  else
-                stkey = UNKNOWN;
-             parlev = 0;
-             return;
-          } 
-          switch(*nextch) {
-	  case 's':
-             if ( eqn(12,  nextch,   "shadow_group")) {
-                stkey = SHADOW_GROUP;   
-                nextch += 12;
-             }  else if (eqn(12, nextch, "shadow_start")) {
-                stkey = SHADOW_START;  
-                nextch += 12;
-             }  else if (eqn(11, nextch, "shadow_wait")) {
-                stkey = SHADOW_WAIT;    
-                nextch += 11;
-             }  else if (eqn(10, nextch, "shadow_add")) {
-                stkey = SHADOW_ADD;    
-                nextch += 10;
-             }  else if (eqn(6, nextch, "shadow")) {
-                stkey = SHADOW;       
-                nextch += 6;
-	     }  else if (eqn(8, nextch, "sections")) { /*OMP*/
-                stkey = OMPDVM_SECTIONS;
-                nextch += 8;
-             }  else if (eqn(7, nextch, "section")) { /*OMP*/
-                stkey = OMPDVM_SECTION;
-                nextch += 7;
-             }  else if (eqn(6, nextch, "single")) { /*OMP*/
-                stkey = OMPDVM_SINGLE;       
-                nextch += 6;
-             }  else
-                stkey = UNKNOWN;
-              break;
-          case 'r':
-             if  (eqn(12,  nextch,      "redistribute")) {
-                stkey = REDISTRIBUTE;  hpf = 1;
-                nextch += 12;
-             }  else if (eqn(15, nextch, "reduction_group")) {
-                stkey = REDUCTION_GROUP;  
-                nextch += 15;
-             }  else if (eqn(15, nextch, "reduction_start")) {
-                stkey = REDUCTION_START;   
-                nextch += 15;
-             }  else if (eqn(14, nextch, "reduction_wait")) {
-                stkey = REDUCTION_WAIT;    
-                nextch += 14;
-             }  else if (eqn(11, nextch, "realignwith")) {
-                stkey = REALIGN_WITH;  hpf = 1;
-                nextch += 11;
-             }  else if (eqn(7, nextch, "realign")) {
-                stkey = REALIGN;      hpf = 1;
-                nextch += 7;
-             }  else if (eqn(13, nextch, "remote_access")) {
-                stkey = REMOTE_ACCESS;   
-                nextch += 13;
-             }  else if (eqn(12, nextch, "remote_group")) {
-                stkey = REMOTE_GROUP;    
-                nextch += 12;
-             }  else if (eqn(4, nextch, "real")) {
-                stkey = REAL;
-                nextch += 4;
-             }  else if (eqn(5, nextch, "reset")) {
-                stkey = RESET;     
-                nextch += 5;
-             }  else if (eqn(6, nextch, "region")) {  /*ACC*/
-                stkey = ACC_REGION;  
-                nextch += 6;
-             }  else if (eqn(7, nextch, "routine")) { /*ACC*/
-                stkey = ACC_ROUTINE;  
-                nextch += 7; 
-            }  else
-                stkey = UNKNOWN;
-             break;
-          case 'd':
-             if ( eqn(10,  nextch,    "distribute")) {
-                stkey = DISTRIBUTE;  hpf = 1;
-                nextch += 10;
-             }  else if (eqn(7, nextch, "dynamic")) {
-                stkey = DYNAMIC;     hpf = 1;
-                nextch += 7;
-             }  else if (eqn(15, nextch, "doubleprecision")) {
-                stkey = DOUBLEPRECISION;
-                nextch += 15;
-             }  else if (eqn(9, nextch, "dimension")) {
-                stkey = DIMENSION;   hpf = 1;
-                nextch += 9;
-             }  else if (eqn(5, nextch, "debug")) {
-                stkey = DEBUG;       hpf = 1;
-                nextch += 5;
-             }  else if (eqn(13,  nextch,  "doublecomplex")) {
-                stkey = DOUBLECOMPLEX;
-                nextch += 13;
-             }  else if (eqn(7, nextch, "declare")) { /*ACC*/
-                stkey = ACC_DECLARE;  
-                nextch += 7; 
-             }  else if (eqn(2,  nextch,  "do")) { /*OMP*/
-		if (OMP_program == 1) { /*OMP*/
-	                stkey = OMPDVM_DO; /*OMP*/
-        	        nextch += 2; /*OMP*/
-		}/*OMP*/
-             }  else
-                stkey = UNKNOWN;
-             break;
-          case 'p': 
-             if ( eqn(10,  nextch,  "processors")) {
-                stkey = HPF_PROCESSORS;  hpf = 1;
-                nextch += 10;
-             }  else if (eqn(8, nextch, "prefetch")) {
-                stkey = PREFETCH ;   
-                nextch += 8;
-             }  else if (eqn(10, nextch, "paralleldo")) { /*OMP*/
-                stkey = OMPDVM_PARALLELDO ;   
-                nextch += 10;
-             }  else if (eqn(16, nextch, "parallelsections")) { /*OMP*/
-                stkey = OMPDVM_PARALLELSECTIONS;   
-                nextch += 16;
-             }  else if (eqn(17, nextch, "parallelworkshare")) { /*OMP*/
-                stkey = OMPDVM_PARALLELWORKSHARE;
-                nextch += 17;
-             }  else if (eqn(8, nextch, "parallel")) {
-                if (!is_openmp_stmt) stkey = PARALLEL ;  /*OMP*/
-		else stkey = OMPDVM_PARALLEL; /*OMP*/
-                directive_key = stkey;
-                nextch += 8;
-             }  else
-                stkey = UNKNOWN;
-             break;
-          case 'i':
-             if ( eqn(11,  nextch,  "independent")) {
-                stkey = INDEPENDENT;  hpf = 1;
-                nextch += 11;
-             }  else if (eqn(7, nextch, "integer")) {
-                stkey = INTEGER;
-                nextch += 7;
-             }  else if (eqn(8, nextch, "interval")) {
-                stkey = INTERVAL;     hpf = 1;
-                nextch += 8;
-             }  else if (eqn(7, nextch, "inherit")) {
-                stkey = INHERIT;      hpf = 1;
-                nextch += 7;
-             }  else if (eqn(15, nextch, "indirect_access")) {
-                stkey = INDIRECT_ACCESS;   
-                nextch += 15;
-             }  else if (eqn(14, nextch, "indirect_group")) {
-                stkey = INDIRECT_GROUP;    
-                nextch += 14;
-             }  else if (eqn(7, nextch, "io_mode")) {
-                stkey = IO_MODE;    
-                nextch += 7;
-             }  else
-                stkey = UNKNOWN;
-             break;
-          case 'e':
-             if (eqn(11,  nextch,   "endinterval")) {
-                stkey = ENDINTERVAL;  hpf = 1;
-                nextch += 11;
-             }  else if (eqn(12, nextch, "exitinterval")) {
-                stkey = EXITINTERVAL;     hpf = 1;
-                nextch += 12;
-             }  else if (eqn(8, nextch, "enddebug")) {
-                stkey = ENDDEBUG;     hpf = 1;
-                nextch += 8;
-             }  else if (eqn(14, nextch, "endtask_region")) {
-                stkey = ENDTASK_REGION;   
-                nextch += 14;
-             }  else if (eqn(5, nextch, "endon")) {
-                stkey = ENDON;    
-                nextch += 5;
-             }  else if (eqn(15, nextch, "endasynchronous")) {
-                stkey = ENDASYNCHRONOUS;    
-                nextch += 15;
-             }  else if (eqn(11, nextch, "endcritical")) {/*OMP*/
-                stkey = OMPDVM_ENDCRITICAL;
-	        nextch += 11;
-             }  else if (eqn(11, nextch, "endsections")) {/*OMP*/
-                stkey = OMPDVM_ENDSECTIONS;
-	        nextch += 11;
-             }  else if (eqn(9, nextch, "endmaster")) {/*OMP*/
-                stkey = OMPDVM_ENDMASTER;
-	        nextch += 9;
-             }  else if (eqn(10, nextch, "endordered")) {/*OMP*/
-                stkey = OMPDVM_ENDORDERED;
-	        nextch += 10;
-             }  else if (eqn(9, nextch, "endsingle")) {/*OMP*/
-                stkey = OMPDVM_ENDSINGLE;
-	        nextch += 9;
-             }  else if (eqn(12, nextch, "endworkshare")) {/*OMP*/
-                stkey = OMPDVM_ENDWORKSHARE;
-	        nextch += 12;
-             }  else if (eqn(5, nextch, "enddo")) {/*OMP*/
-                stkey = OMPDVM_ENDDO;
-	        nextch += 5;
-             }  else if (eqn(20, nextch, "endparallelworkshare")) {/*OMP*/
-                stkey = OMPDVM_ENDPARALLELWORKSHARE;
-                nextch += 20;
-             }  else if (eqn(19, nextch, "endparallelsections")) {/*OMP*/
-                stkey = OMPDVM_ENDPARALLELSECTIONS;
-                nextch += 19;
-             }  else if (eqn(13, nextch, "endparalleldo")) {/*OMP*/
-                stkey = OMPDVM_ENDPARALLELDO;
-                nextch += 13;
-             }  else if (eqn(11, nextch, "endparallel")) {/*OMP*/
-                stkey = OMPDVM_ENDPARALLEL;    
-                nextch += 11;
-             }  else if (eqn(9, nextch, "endregion")) {   /*ACC*/
-                stkey = ACC_END_REGION;  
-                nextch += 9;
-            }  else if (eqn(14, nextch, "endhostsection")) { /*ACC*/
-                 stkey = ACC_END_CHECKSECTION;
-                 nextch += 14;
-            }  else
-                stkey = UNKNOWN;
-             break;
-          case 'a':
-             if ( eqn(9,  nextch,  "alignwith")) {
-                stkey = ALIGN_WITH;  hpf = 1;
-                nextch += 9;
-             }  else if (eqn(5, nextch, "align")) {
-                stkey = ALIGN;       hpf = 1;
-                nextch += 5;
-             }  else if (eqn(7, nextch, "asyncid")) {
-                stkey = ASYNCID;       
-                nextch += 7;
-             }  else if (eqn(12, nextch, "asynchronous")) {
-                stkey = ASYNCHRONOUS;      
-                nextch += 12;
-             }  else if (eqn(9, nextch, "asyncwait")) {
-                stkey = ASYNCWAIT;       
-                nextch += 9;
-             }  else if (eqn(6, nextch, "atomic")) { /*OMP*/
-                stkey = OMPDVM_ATOMIC;       
-                nextch += 6;
-             }  else if (eqn(6, nextch, "actual")) { /*ACC*/
-                stkey = ACC_ACTUAL;       
-                nextch += 6;
-             }  else
-                stkey = UNKNOWN;
-             break;
-          case 'c': 
-             if (eqn(7,  nextch,  "complex")) {
-                stkey = COMPLEX;
-                nextch += 7;
-             }  else if (eqn(9, nextch, "character")) {
-                 stkey = CHARACTER;
-                 nextch += 9;
-             }  else if (eqn(5, nextch, "check")) {
-                 stkey = CHECK;
-                 nextch += 5;
-             }  else if (eqn(16, nextch, "consistent_group")) {
-                 stkey = CONSISTENT_GROUP;
-                 nextch += 16;
-            }  else if (eqn(16, nextch, "consistent_start")) {
-                 stkey = CONSISTENT_START;
-                 nextch += 16; 
-            }  else if (eqn(15, nextch, "consistent_wait")) {
-                 stkey = CONSISTENT_WAIT;
-                 nextch += 15; 
-            }  else if (eqn(10, nextch, "consistent")) {
-                 stkey = CONSISTENT;
-                 nextch += 10;
-            }  else if (eqn(8, nextch, "critical")) { /*OMP*/
-                 stkey = OMPDVM_CRITICAL;
-                 nextch += 8;
-            }  else if (eqn(9, nextch, "cp_create")) { 
-                 stkey = CP_CREATE;
-                 nextch += 9;
-            }  else if (eqn(7, nextch, "cp_load")) { 
-                 stkey = CP_LOAD;
-                 nextch += 7;
-            }  else if (eqn(7, nextch, "cp_save")) { 
-                 stkey = CP_SAVE;
-                 nextch += 7;
-            }  else if (eqn(7, nextch, "cp_wait")) { 
-                 stkey = CP_WAIT;
-                 nextch += 7;
-            }  else
-                stkey = UNKNOWN;
-             break;
-	  case 't':
-             if (eqn(15, nextch, "template_create")) {
-                stkey = TEMPLATE_CREATE;   
-                nextch += 15;
-             } else if (eqn(15, nextch, "template_delete")) {
-                stkey = TEMPLATE_DELETE;   
-                nextch += 15;  
-             } else if (eqn(8, nextch, "template")) {
-                stkey = HPF_TEMPLATE;   hpf = 1;
-                nextch += 8; 
-             } else if (eqn(7, nextch, "traceon")) {
-                stkey = TRACEON;        hpf = 1;
-                nextch += 7; 
-             } else if (eqn(8, nextch, "traceoff")) {
-                stkey = TRACEOFF;       hpf = 1;
-                nextch += 8;  
-             } else if (eqn(11, nextch, "task_region")) {
-                stkey = TASK_REGION;   
-                nextch += 11; 
-             } else if (eqn(4, nextch, "task")) {
-                stkey = TASK;      
-                nextch += 4;  
-             } else if (eqn(13, nextch, "threadprivate")) { /*OMP*/
-                stkey = OMPDVM_THREADPRIVATE;      
-                nextch += 13;  
-             }/* else if (eqn(11, nextch, "num_threads")) {
-                stkey = OMPDVM_NUM_THREADS;      
-                nextch += 11;  
-             }*/  else
-                stkey = UNKNOWN;
-             break;
-	  default:
-             if (eqn(9, nextch, "new_value")) {
-                stkey = NEW_VALUE;    
-                nextch += 9;
-             }  else if (eqn(7, nextch, "logical")) {
-                stkey = LOGICAL;
-                nextch += 7;   
-             }  else if (eqn(8, nextch, "localize")) {
-                stkey = LOCALIZE;
-                nextch += 8;   
-             }  else if (eqn(3, nextch, "map")) {
-                stkey = MAP;     
-                nextch += 3; 
-             }  else if (eqn(3, nextch, "f90")) {
-                stkey = F90;
-                nextch += 3;       
-             }  else if (eqn(5, nextch, "flush")) { /*OMP*/
-                stkey = OMPDVM_FLUSH;
-                nextch += 5;
-             }  else if (eqn(9, nextch, "workshare")) {
-                stkey = OMPDVM_WORKSHARE;
-                nextch += 9;       
-             }  else if (eqn(2, nextch, "on")) {
-                stkey = ON_DIR;
-                nextch += 2;        
-             } else if (eqn(4, nextch, "heap")) {
-                stkey = HEAP;
-                nextch += 4; 
-             } else if (eqn(7, nextch, "barrier")) {
-		if (!is_openmp_stmt) stkey = BARRIER;  /*OMP*/
-		else stkey = OMPDVM_BARRIER;  /*OMP*/
-		hpf = 1;
-                nextch += 7;          
-             } else if (eqn(5, nextch, "nodes")) {
-		stkey = OMPDVM_NODES;  /*OMP*/
-                nextch += 5;
-             } else if (eqn(13, nextch, "fromonethread")) {
-                stkey = OMPDVM_ONETHREAD;
-                nextch += 13;       
-             } else if (eqn(6, nextch, "master")) {
-                stkey = OMPDVM_MASTER;
-                nextch += 6;       
-             } else if (eqn(7, nextch, "ordered")) { /*OMP*/
-                stkey = OMPDVM_ORDERED;
-                nextch += 7; 
-             }  else if (eqn(10, nextch, "get_actual")) { /*ACC*/
-                stkey = ACC_GET_ACTUAL;       
-                nextch += 10; 
-            }  else if (eqn(11, nextch, "hostsection")) { /*ACC*/
-                 stkey = ACC_CHECKSECTION;
-                 nextch += 11;     
-             } else
-                stkey = UNKNOWN; 
-             break; 
-	  }
-          if(HPF_program && hpf != 1) 
-                stkey = UNKNOWN;   /* some FDVM directives are illegal in HPF-DVM */
-          if(!HPF_program &&  stkey == INDEPENDENT)
-                stkey = UNKNOWN;   /* INDEPENDENT directive is illegal in FDVM */
-        }
-        parlev = 0;
-}
-
-
-/*
- * This routine checks the characters starting at "nextch" against the
- * table of Fortran keywords.
- */
-int 
-getkwd()
-{
-	register char *i, *j;
-	register struct Keylist *pk, *pend;
-	int     k, kval;
-
-        /* the following line is useful for testing parser */
-          /* fprintf(stderr,"getkwd:::  %d %s\n", yylineno, nextch);*/
-          /* printf("getkwd:::  %d %s\n", yylineno, nextch);*/
-	if (isalpha(nextch[0])==0)
-		return (LET);
-	k = nextch[0] - 'a';
-        pk = keystart[k];
-	if (pk)
-		for (pend = keyend[k]; pk <= pend; ++pk) {
-			i = pk->keyname;
- /*!!!*/             /*   if(pk->keyval == ACC_USES && !is_acc_statement)
-                          continue;
-                     */
-
- /*!!!*/                if(pk->keyval == ACC_TARGETS && statement_kind != HPF)
-                          continue;
- /*!!!*/                if(pk->keyval == BYTE && statement_kind == HPF)
-                          continue;
- /*!!!*/                if(pk->keyval == ONLY && statement_kind == HPF)
-                          continue;
- /*!!!*/                if(pk->keyval == ONTO && directive_key == PARALLEL)
-                          continue;
-                     
-                       /* (void)fprintf(stderr,"getkwd:keyname %s\n",i);*/
-                       /* (void)printf("getkwd:keyname %s\n",i);        */
-			j = nextch;
-			while (*++i == *++j && *i != '\0');
-			if (*i == '\0' && j <= lastch + 1) {
-				nextch = j;
-/*!!!*/
-				/*(void)fprintf(stderr,"getkwd:keyword %s = %d\n",pk->keyname, pk->keyval);*/
-				/*(void)printf("getkwd:keyword %s = %d\n",pk->keyname, pk->keyval);*/
-	                        
-				  kval = pk->keyval;
-
-                                  if((kval == ONLY)  && (statement_kind == HPF))
-                                     return(ON);
-                                  if((kval == POINTER) && (statement_kind == HPF))
-                                     return(DVM_POINTER);
-			          if(statement_kind != HPF)
-                                  switch (kval) {
-				  case HPF_TEMPLATE:
-                                  case HPF_PROCESSORS:
-                                  case DYNAMIC:
-                                  case ALIGN:
-                                  case ALIGN_WITH:
-                                  case SHADOW:
-                                  case DISTRIBUTE:  
-                                     return (UNKNOWN);
-                                  default:
-                                     return (kval);
-				}                                
-                                 return (kval);
-			}
-		}
-/*!!!*/
-	/*(void)fprintf(stderr,"getkwd:keyword UNKNOWN\n");*/
-	
-	return (UNKNOWN);
-}
-
-
-/*
- * This routine gets the next token in a statement.  It starts at "nextch"
- * within "stmtbuf".  As a side effect, "yytext" is filled with the
- * consumed input and "yyleng" is set to the length of that text.
- *
- *	return value - the lexeme value for the token
- */
-int 
-gettok()
-{
-	register struct Dotlist *pd;
-	register struct Punctlist *pp;
-	/*register struct oplist *op;*/
-	register char *p, *i, *j, *saveptr;
-
-	int     havdot, havexp, havdbl;
-	int     val, ijk;
-	extern struct Punctlist puncts[];
-	extern struct Dotlist dots[];
-	/*extern struct oplist operands[];*/
-	extern int yyleng;
-	void err();
-
-	char   *n1;
-        int boz;
-
-        boz = 0;
-        if(data_stat && (*nextch == 'b' || *nextch == 'o' || *nextch == 'z' || *nextch == 'x') && nextch[1] == MYQUOTE) { /* 'x' is extension in Intel compiler */
-	  ++nextch;
-          boz = 1;
-        } 
-/* Check for ordinary character string: 'xxxxxxx' */
-	if (*nextch == (MYQUOTE)) {
-		++nextch;
-		p = yytext;
-                yyquote = *nextch++; 
-		while ((nextch <= lastch) && (*nextch != MYQUOTE))
-			*p++ = *nextch++;
-		if (nextch > lastch) {
-			yyleng = p - yytext;
-			*p = '\0';
-			return (BAD_CCONST);
-		}
-		++nextch;
-		yyleng = p - yytext;
-		*p = '\0';
-
-                if(boz==1)
-                  return (BOZ_CONSTANT);
-                else
-	       /* Are we sure this is a char constant? (could be hex, octal or binary, Intel compiler extension ) podd 29.12.14 */
-		{ if ((*nextch != 'x') &&
-		      (*nextch != 'o') &&
-                      (*nextch != 'b'))
-			
-                     return (CHAR_CONSTANT);
-                  else
-                /* It's a hex, octal or binary constant! - Intel compiler  */
-        	  {  
-        	     ++nextch;
-                     return (BOZ_CONSTANT);
-                  }
-                }
-/*		else {
-			if (*nextch == 'x')
-				radix = 16;
-			else
-				radix = 8;
-
-*/		/* Check for bad chars in constant. */
-
-/*			for (p = yytext + 1; p < (yytext + (yyleng - 1));)
-				if (*p == BLANKC || *p == '\t')
-					p++;
-				else {
-					if (isupper(*p))
-						*p = tolower(*p);
-					if (hextoi(*p++) >= radix) {
-						radix = 0;
-						break;
-					}
-				}
-			++nextch;
-			return (radix == 0 ? BAD_SYMBOL :
-				(radix == 16 ? HEX_CONSTANT : OCTAL_CONSTANT));
-	        }
-*/       }
-/* Check for a Hollerith constant */
-
-	if (*nextch == (MYHOLLERITH)) {
-		++nextch;
-		p = yytext;
-		*p++ = '\'';	/* opening quote */
-		while (*nextch != MYHOLLERITH) {
-			if (*nextch == '\'')
-				*p++ = '\'';	/*-explode quotes-*/
-			*p++ = *nextch++;
-		}
-		++nextch;
-		*p++ = '\'';	/* closing quote */
-		yyleng = p - yytext;
-		*p = '\0';
-		return (CHAR_CONSTANT);
-	}
-/* Check for a bad Hollerith constant (as found by crunch) */
-
-	if (*nextch == (BADHOLLERITH)) {
-		++nextch;
-		yytext[0] = '1';
-		yytext[1] = 'h';
-		yytext[yyleng = 2] = '\0';
-		return (BAD_CCONST);
-	}
-
-	if (needkwd) {
-		needkwd = 0;
- /*!!! */
-		/*(void)fprintf(stderr,"gettok:case needkw\n");*/
-		return (getkwd());
-	}
-        if (implkwd) {
-		implkwd = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if(ijk == UNKNOWN)
-  	           return (ijk);
-                if(*nextch != '(') 
-                   return (ijk);
-                parlev =1;
-	        for (i = nextch + 1; i <= lastch; ++i)
-			if (*i == (MYQUOTE))
-				while (*++i != MYQUOTE);
-			else if (*i == (MYHOLLERITH))
-				while (*++i != MYHOLLERITH);
-			else if (*i == '(')
-				++parlev;
-			else if (*i == ')') {
-				if (--parlev == 0)
-					break;
-			}
-
-		if ((i <= lastch) &&(i[1] == '('))
-                                  /* IMPLICIT statemet is of kind: IMPLICIT REAL(kind-selector)(spec-letter_list) */
-		  return(ijk);
-		else {            /* IMPLICIT statemet is of kind (F77): IMPLICIT REAL (spec-letter_list) */
-                  nextch=saveptr;
-                  needkwd=1;
-                  return(STAT);
-                }
-	}
-        if (optkwd) {
-                optkwd = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if ((ijk != UNKNOWN) && (is_equal(*nextch)))
-                    return(ijk);
-                else
-                    nextch = saveptr;
-        }
-        if (opt_kwd_) {
-                opt_kwd_ = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if ((ijk != UNKNOWN)&&(ijk!= LET))
-                    return(ijk);
-                else
-                    nextch = saveptr;
-        }
-        if (opt_kwd_r) {
-                opt_kwd_r = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if ((ijk != UNKNOWN)&&(ijk!= LET) && (*nextch == '('))
-                    return(ijk);
-                else
-                    nextch = saveptr;
-        }
-        if (as_op_kwd_) {
-                as_op_kwd_ = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if ((ijk != UNKNOWN)&&((ijk == ASSIGNMENT) || (ijk == OPERATOR)) && (*nextch == '('))
-                    return(ijk);
-                else
-                    nextch = saveptr;
-        }
-       if (opt_kwd_hedr) {
-                opt_kwd_hedr = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if ((ijk != UNKNOWN)&&((ijk == FUNCTION) || (ijk == PURE) || (ijk == RECURSIVE) || (ijk == ELEMENTAL)))
-                    return(ijk);
-                else
-                    nextch = saveptr;
-        }
-        if (optcorner) {
-	  /* (void)fprintf(stderr,"gettok:case optcorner\n");*/
-                optcorner = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if (ijk == CORNER)
-                    return(ijk);
-                else
-                    nextch = saveptr;
-        }
-        if (optcall) {
-                optcall = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if ((ijk != UNKNOWN) && (ijk == CALL))
-                    return(ijk);
-                else
-                    nextch = saveptr;
-        }
-        if (opt_in_out) {
-                opt_in_out = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if ((ijk != UNKNOWN) && ((ijk == IN) || (ijk == OUT)) && (*nextch == ':'))
-                    return(ijk);
-                else
-                    nextch = saveptr;
-        }
-
-	/*        if (opt_l_s) {
-                opt_l_s = 0;
-                saveptr = nextch;
-                ijk = getkwd();
-                if ((ijk != UNKNOWN) && ((ijk == LOCATION) || (ijk == SUBMACHINE)))
-                    return(ijk);
-                else
-                    nextch = saveptr;
-        }
-        */
-
-/* Check for punctuation */
-	for (pp = puncts; pp->punchar; ++pp)
-		if (*nextch == pp->punchar) {
-			if ((*nextch == '*' || *nextch == '/') &&
-			    nextch < lastch && nextch[1] == nextch[0]) {
-				if (*nextch == '*')
-					val = DASTER;
-				else
-					val = DSLASH;
-				nextch += 2;
-			} 
-			else if ((*nextch == '/') && ( nextch < lastch))
-			{
-			  if (nextch[1] == ')' )
-			    {
-                               if  (operator_slash == 1)
-		               {
-			          val = SLASH;
-				  ++nextch;
-				  operator_slash = 0;
-			       }
-			       else 
-			       {
-				  val = RIGHTAB;
-				  nextch += 2;
-			       }
-			    }       
-			  else if (nextch[1] == '=')
-			      {
-			         val = NE;
-				 nextch += 2;
-			      }       
-			  else 
-			     {
-				  val = SLASH;
-				  ++nextch;
-			     }
-			}
-			else if ((*nextch == '(') && ( nextch < lastch))
-			{
-			     if (nextch[1] == '/') { 
-                               if (nextch[2] == ')') {
-		                  val = LEFTPAR;
-				  ++nextch;
-                                  ++parlev;
-				  operator_slash = 1;
-                               } else if (nextch[2] == '/') {
-		                  val = LEFTPAR;
-				  ++nextch;
-                                  ++parlev;
-                               } else if (nextch[2] == '=') {
-		                  val = LEFTPAR;
-				  ++nextch;
-                                  ++parlev;
-                               } else {
- 	                          if (operator_slash == 1) { /*OMP*/
-				     val = LEFTPAR; /*OMP*/
-				     ++nextch; /*OMP*/
-				     operator_slash = 0; /*OMP*/
-				  } /*OMP*/ else {
-                                     val = LEFTAB;
-				     nextch += 2;
-				  }	
-                               }
-			     } else {
-				  val = LEFTPAR;
-				  ++parlev;
-				  ++nextch;
-			     }
-			}
-			else if ((*nextch == '=') && (nextch < lastch))
-			{
-			     if (nextch[1] == '>')
-			     {
-				  val = POINT_TO;
-				  nextch += 2;
-			     }
-			     else if (nextch[1] == '=')
-			     {
-				  val = EQ;
-			     	  nextch += 2;
-			     }
-			     else 
-			     {
-				  val = EQUAL;
-				  ++nextch;
-			     }
-			}
-			else if ((*nextch == '<') && (nextch < lastch))
-			{
-			     if (nextch[1] == '>')
-			     {
-				  val = NE;
-				  nextch += 2;
-			     }
-			     else if (nextch[1] == '=')
-			     {
-				  val = LE;
-			     	  nextch += 2;
-			     }
-			     else
-			     {
-				  val = LT;
-				  ++nextch;
-			     }
-			}
-			else if ((*nextch == '>') && (nextch < lastch))
-			{
-			     if (nextch[1] == '=')
-			     {
-				  val = GE;
-			     	  nextch += 2;
-			     }
-			     else 
-			     {
-				  val = GT;
-				  ++nextch;
-			     }
-			}
-			else {
-				val = pp->punval;
-				if (val == LEFTPAR)
-					++parlev;
-				else if (val == RIGHTPAR)
-					--parlev;
-				++nextch;
-			}
-			return (val);
-		}
-/* Check for dotted lexeme (.AND. .OR. .XOR.  ...) */
-
-	if (*nextch == '.')
-	{	if (nextch >= lastch)
-			goto badchar;
-		else if (isdigit(nextch[1]))
-			goto numconst;
-		else {
-			for (pd = dots; (j = pd->dotname); ++pd) {
-				for (i = nextch + 1; i <= lastch; ++i)
-					if (*i != *j)
-						break;
-					else if (*i != '.')
-						++j;
-					else {
-						nextch = i + 1;
-						return (pd->dotval);
-					}
-			}
-			p = yytext;
-			*p++ = *nextch++;
-			while ((nextch <= lastch) && (*nextch != '.'))
-			     if (isalpha(*nextch))
-				  *p++ = *nextch++;
-			     else
-				  goto badchar;
-			if (*nextch != '.')
-			     goto badchar;
-			*p++ = *nextch++;
-			yyleng = p - yytext;
-                        *p = '\0';
-			return (DEFINED_OPERATOR);
-		}
-	}	
-/* Check for underscore '_' */
-        if(*nextch == '_'){
-          ++nextch;
-	  return(UNDER);
-        }
-/* Check for an alphabetic lexeme */
-	if (isalpha(*nextch)) {
-	/* Now, match an ordinary identifier. */
-
-		p = yytext;
-		*p++ = *nextch++;
-		while (nextch <= lastch)
-                  if(*nextch == '_') {
-                    if (nextch[1] == MYQUOTE)
-                      break;
-                    else
-                      *p++ = *nextch++;
-                  }
-		  else if (isalpha(*nextch) || isdigit(*nextch) || (*nextch == '$'))
-		    *p++ = *nextch++;
-		  else
-		    break;
-		yyleng = p - yytext;
-		*p = '\0';
-                if (colon_flag && nextch <= lastch && (*nextch == ':') &&
-                    !strcmp(yytext, "only"))
-		{
-		     ++nextch;
-		     colon_flag = 0;
-		     return (ONLY);
-		}
-		if (inioctl && nextch <= lastch && *nextch == '=' && nextch[1] != '=') { 
-			++nextch;
-			return (NAMEEQ);
-		}
-	/* Check to make sure that it was not a FUNCTION def */
-		/*
-		if (yyleng > 17 && eqn(17, yytext, "recursivefunction") &&
-		    isalpha(yytext[17]) && (nextch < lastch) && (nextch[0] == '(') &&
-		    ((nextch[1] == ')') || isalpha(nextch[1]))) {
-			nextch -= (yyleng - 9);
-			return (RECURSIVE);
-		}
-		if (yyleng > 8 && eqn(8, yytext, "function") &&
-		    isalpha(yytext[8]) && (nextch < lastch) && (nextch[0] == '(') &&
-		    ((nextch[1] == ')') || isalpha(nextch[1]))) {
-			nextch -= (yyleng - 8);
-			return (FUNCTION);
-		}
-                */
-		if (yyleng > MAX_NAME_LEN) {
-			char    buff[200];
-			(void)sprintf(buff, "name %s too long, truncated to %d",
-				yytext, MAX_NAME_LEN);
-			err(buff, 170);
-			/*yyleng = MAX_NAME_LEN;
-			yytext[MAX_NAME_LEN] = '\0';  */
-		}
-		return (IDENTIFIER);
-	}
-	if (*nextch == '!') {
-		++nextch;
-	        return(COMMENT);
-	}
-
-/* Check for a numeric lexeme */
-
-	if (isdigit(*nextch)==0)
-		goto badchar;
-numconst:
-	havdot = NO;
-	havexp = NO;
-	havdbl = NO;
-	for (n1 = nextch; nextch <= lastch; ++nextch) {
-		if (*nextch == '.')
-			if (havdot)
-				break;
-			else if (nextch + 2 <= lastch && isalpha(nextch[1])
-				 && isalpha(nextch[2]))
-				break;
-			else
-				havdot = YES;
-		else if (!intonly && (*nextch == 'd' || *nextch == 'e')) {
-			p = nextch;
-			havexp = YES;
-			if (*nextch == 'd')
-				havdbl = YES;
-			if (nextch < lastch)
-				if (nextch[1] == '+' || nextch[1] == '-')
-					++nextch;
-			if ((nextch >= lastch) || (isdigit(*++nextch)==0)) {
-				nextch = p;
-				havdbl = havexp = NO;
-				break;
-			}
-			for (++nextch;
-			     nextch <= lastch && isdigit(*nextch);
-			     ++nextch);
-			break;
-		} else if (isdigit(*nextch)==0)
-			break;
-	}
-	p = yytext;
-	i = n1;
-	while (i < nextch)
-		*p++ = *i++;
-	yyleng = p - yytext;
-	*p = '\0';
-	if (havdbl)
-		return (DP_CONSTANT);
-	if (havdot || havexp)
-		return (REAL_CONSTANT);
-
-/* Have an INTEGER constant.  Is it a label? */
-	return (INT_CONSTANT);
-badchar:
-	stmtbuf[0] = *nextch++;
-	return (UNKNOWN);
-}
-
-
-/*
- * This routine is the top level of the Scanner, called to get a lexeme.
- *
- *	return value - lexeme value
- */
-int 
-yylex()
-{
-	static int tokno;
-	static int nt;
-/*!!! */
-        int tkn;
-/* Initialize the token value and length. */
-
-	/* yytext[0] = '\0';*/
-	yyleng = 0;
-
-	switch (lexstate) {
-new_stmt:
- 	    case OVER:
-                            /*(void)fprintf(stderr,"yylex: OVER");*/
-	        return XEOF;
-	    case NEWSTMT:	/* need a new statement */
-                if(free_form)
-                   nt = getcds_ff();
-                else
-		   nt = getcds();
-		if (nt == STEOF) {
-		     nt = XEOF;
-		     if (pcbfirst != NULL)
-			  goto commentscase;
-		     else return (XEOF);
-		} /* if getcds() == SEOF */
-
-		lastend = stkey == ENDUNIT;
-
-	/*
-	 * Now, crunch the new statement.  If nothing's left after crunching,
-	 * then go get another statement. 
-	 */
-
-		crunch();
-		if (nextch > lastch)
-			goto new_stmt;
-		tokno = 0;
-		lexstate = FIRSTTOKEN;
-		yystno = stno;
-		stno = nxtstno;
-		yyleng = 0;
-		return (LABEL);
-
-first:
-	    case FIRSTTOKEN:	/* first step on a statement */ 
-		(void) analyz();
-                lexstate = OTHERTOKEN;
-		tokno = 1;
-/* !!! */
-               /* (void)fprintf(stderr,"yylex:token N%d %d line %d\n",tokno,stkey,yylineno); */
-		return (stkey);
-
-	    case OTHERTOKEN:	/* return next token */
-		if (stkey == FORMAT)
-		        goto reteos;
-/*		if (stkey == READ)
-		        goto reteos;
-		if (stkey == WRITE)
-		        goto reteos;
-*/		if (nextch > lastch) {
-			nextch = lastch + 1;
-			goto reteos;
-		}
- 		++tokno;
-                
-		if ((stkey == LOGICALIF || stkey == ELSEIF || stkey == FORALL)
-                      && parlev == 0 &&tokno > 3)
-			goto first;
-		if (stkey == ASSIGN && tokno == 3 && nextch < lastch &&
-		    nextch[0] == 't' && nextch[1] == 'o') {
-			nextch += 2;
-			return (TO);
-		}
-		if ((stkey == CONSTRUCT_ID) && (tokno == 2) && (nextch[0] == ':'))
-		     lexstate = FIRSTTOKEN;
-                
-                tkn = gettok();
-		/*(void)fprintf(stderr,"yylex:token N%d %d\n",tokno,tkn);*/
-                return(tkn);
-/*!!!		return (gettok()); */
-
-reteos:
-	    case RETEOS:
-		if (pcbfirst != NULL && stkey != INCLUDE)
-		     lexstate = COMMENTS;
-		else lexstate = NEWSTMT;
-		return (EOLN);
-commentscase:
-	   case COMMENTS:
-		lexstate = COMMENTSEOS;
-		flush_comments();
-		return (COMMENT);
-	   case COMMENTSEOS:
-		if (nt == XEOF)
-		     lexstate = OVER;
-		else lexstate = NEWSTMT;
-		return (EOLN);
-	}
-
-	if (nt == EOF)
-	     if (pcbfirst != NULL) {
-		  flush_comments();
-		  return (COMMENT);
-	     }
-	
-        return nt;
-	
-}
-
-/* Comment buffering code */
-
-static void store_comment()
-{
-    comment_buf *ncb;
-
-    ncb = (comment_buf *)chkalloc(sizeof(comment_buf));
-         /* 14.10.2016 Kolganov, 17.10.16 podd. Don't loss '\n' symbol during truncating */
-    if ((int)strlen(tempbuf) > COMMENT_BUF_STORE-1)   
-    {
-        warn("comment too long, truncated to 160 characters", 15);               
-	tempbuf[COMMENT_BUF_STORE-2] = '\n';
-        tempbuf[COMMENT_BUF_STORE-1] = '\0';
-    }
-
-    ncb->buf[0] = '\0';
-    strcpy(ncb->buf, tempbuf);
-    /* (void)fprintf(stderr,"store_comment_end_permbuff:tempbuf = %s \n",tempbuf);*/
-    ncb->next = NULL;
-    if (!cbfirst) {
-        cbfirst = ncb;
-        cblast = cbfirst;
-    }
-    else
-    {
-        cblast->next = ncb;
-        cblast = ncb;
-    }
-}
-
-static void
-store_comment_end_permbuff()
-
-{
-     comment_buf *ncb;
-     
-     ncb = (comment_buf *) chkalloc(sizeof(comment_buf));
-     ncb->buf[0]='\0';
-     strcpy(ncb->buf,tempbuf);
-     /* (void)fprintf(stderr,"store_comment_end_permbuff:tempbuf = %s \n",tempbuf);*/
-     ncb->next = NULL;
-     if (!pcbfirst) {
-	  pcbfirst = ncb;
-	  pcblast = pcbfirst;
-     }
-     else 
-     {
-	  pcblast->next = ncb;
-	  pcblast = ncb;
-     }
-}
-
-static void
-move_comments_to_permbuffer()
-{
-     if (pcbfirst == NULL)
-     {
-	  pcbfirst = cbfirst;
-	  pcblast = cblast;
-/*  (void)fprintf(stderr,"move_comments_to_permbuff: first\n");*/
-     }
-     else 
-     {
-	  if (cbfirst != NULL) 
-	  {
-	       pcblast->next = cbfirst;
-	       pcblast = cblast;
-/*  (void)fprintf(stderr,"move_comments_to_permbuff: next\n");*/
-	  }
-	  
-     }
-     
-     cbfirst = cblast = NULL;
-/*        (void)fprintf(stderr,"move_comments_to_permbuff:\n");*/
-}
-
-     
-static void
-flush_comments()
-{
-     comment_buf *ncb;
-     int len = 0;
-
-     for (ncb = pcbfirst; ncb; ncb = ncb->next)
-	  len = len + strlen(ncb->buf) + 1;
-     
-     commentbuf = (char *) chkalloc(len * sizeof(char));
-     
-     for (ncb = pcbfirst; ncb; ncb = ncb->next) 
-	  strcat(commentbuf, ncb->buf);
-     
-
-     pcbfirst = pcblast = NULL;
-     /*   (void)fprintf(stderr,"%s\n", commentbuf);*/
-/*    printf("%s\n", commentbuf);*/
-     
-}     
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/lists.c b/projects/dvm_svn/fdvm/trunk/parser/lists.c
deleted file mode 100644
index 7bad1f1..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/lists.c
+++ /dev/null
@@ -1,108 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#include <stdio.h>
-#include "defs.h"
-#include "bif.h"
-#include "ll.h"
-#include "symb.h"
-#include "db.h"
-
-extern PTR_TYPE global_default;
-extern PTR_LLND make_llnd();
-extern PTR_FILE fi;
-
-void errstr();
-
-/*
- * set_ll_list attaches a new node to a given old_list and
- * makes sure that the old_list is of the same type as ll_type
- */
-PTR_LLND 
-set_ll_list(old_list, node, ll_type)
-	PTR_LLND old_list, node;
-	int     ll_type;
-{
-	register PTR_LLND temp, new;
-
-	if (!node) {	/* the first item in the list */
-		new = make_llnd(fi,ll_type, old_list, LLNULL, SMNULL);
-		new->type = global_default;
-		return (new);
-	}
-	if (old_list->variant != ll_type) { 	/* first two items */
-		new = make_llnd(fi,ll_type, old_list,
-				make_llnd(fi,ll_type, node, LLNULL, SMNULL),
-				SMNULL);
-		new->type = global_default;
-		new->entry.Template.ll_ptr2->type = global_default;
-		return (new);
-}
-	new = make_llnd(fi,ll_type, node, LLNULL, SMNULL);
-	for (temp = old_list;
-	     temp->entry.Template.ll_ptr2;
-	     temp = temp->entry.Template.ll_ptr2)
-		;
-	temp->entry.Template.ll_ptr2 = new;
-	new->type = global_default;
-	return (old_list);
-}
-
-
-/*
- * set_id_list takes an old id list and runs down the list attaching new 
- * id at the end
- */
-PTR_SYMB 
-set_id_list(old_list, id)
-	PTR_SYMB old_list, id;
-{
-	register PTR_SYMB temp;
-
-	if (!id)
-	    return (old_list);
-        if(id->id_list) {
-            errstr("'%s' is a duplicate dummy argument",id->ident,121); /*podd 9.03.00*/
-            return(old_list);
-        }
-	for (temp = old_list; temp->id_list; temp = temp->id_list)
-		;
-
-	temp->id_list = id;
-	return (old_list);
-}
-
-PTR_LLND
-add_to_lowLevelList(ele, oldList)
-PTR_LLND ele, oldList;
-{
-	register PTR_LLND temp;
-
-	if (!ele)
-	     return (oldList);
-
-	for (temp = oldList; temp->entry.list.next; temp = temp->entry.list.next)
-		;
-
-	temp->entry.list.next = ele;
-	return (oldList);
-}
-     
-PTR_LLND
-add_to_lowList(ele, oldList)
-PTR_LLND ele, oldList;
-{
-	register PTR_LLND temp;
-
-	if (!ele)
-	     return (oldList);
-
-	for (temp = oldList; temp->entry.Template.ll_ptr2; temp = temp->entry.Template.ll_ptr2)
-	     ;
-
-	temp->entry.Template.ll_ptr2 = ele;
-	
-	return (oldList);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/parser/low_hpf.c b/projects/dvm_svn/fdvm/trunk/parser/low_hpf.c
deleted file mode 100644
index e74423d..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/low_hpf.c
+++ /dev/null
@@ -1,1006 +0,0 @@
-
-#include <stdio.h>
-
-#include <stdlib.h>
-#include <stdarg.h> /* ANSI variable argument header */
-
-#include "compatible.h"   /* Make different system compatible... (PHB) */
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#include "vpc.h"
-#include "macro.h"
-#include "ext_lib.h"
-#define HPF_STRING 2
-
-/*int debug =NO;  used in db.c*/
-
-/*static int number_of_bif_node = 0;*/
-/*int number_of_ll_node = 0; this counters are useless anymore */
-/*static int number_of_symb_node  = 0;
-static int number_of_type_node = 0;*/
-
-/* FORWARD DECLARATIONS (phb) */
-void Message();
-char * filter();
-int *evaluateExpression();
-
-extern int write_nodes();
-extern char* Tool_Unparse2_LLnode(); 
-extern void Init_HPFUnparser();
-extern char* Tool_Unparse_Bif ();
-extern char* Tool_Unparse_Type();
-
-#define MAXFIELDSYMB 10
-#define MAXFIELDTYPE 10
-
-#ifdef __SPF
-extern void removeFromCollection(void *pointer);
-#endif
-
-#ifdef __SPF_BUILT_IN_PARSER
-static int Warning_count = 0;
-//static PTR_FILE pointer_on_file_proj;
-//static char* default_filename;
-
-/* records propoerties and type of node */
-//static char node_code_type[LAST_CODE];
-/* Number of argument-words in each kind of tree-node.  */
-//static int node_code_length[LAST_CODE];
-//static enum typenode node_code_kind[LAST_CODE];
-
-/* special table for infos on type and symbol */
-static char info_type[LAST_CODE][MAXFIELDTYPE];
-static char info_symb[LAST_CODE][MAXFIELDSYMB];
-static char general_info[LAST_CODE][MAXFIELDSYMB];
-#else
-PTR_FILE pointer_on_file_proj;
-char* default_filename;
-int Warning_count = 0;
-
-/* records propoerties and type of node */
-char node_code_type[LAST_CODE];
-/* Number of argument-words in each kind of tree-node.  */
-int node_code_length[LAST_CODE];
-enum typenode node_code_kind[LAST_CODE];
-
-/* special table for infos on type and symbol */
-char info_type[LAST_CODE][MAXFIELDTYPE];
-char info_symb[LAST_CODE][MAXFIELDSYMB];
-char general_info[LAST_CODE][MAXFIELDSYMB];
-#endif
-
-/*static struct bif_stack_level   *stack_level = NULL;
-static struct bif_stack_level *current_level = NULL;*/
-
-PTR_BFND  getFunctionHeader();
-#ifdef __SPF_BUILT_IN_PARSER
-
-#define xmalloc xmalloc_temp
-#define make_a_malloc_stack make_a_malloc_stack_temp
-#define mymalloc mymalloc_temp
-#define isATypeNode isATypeNode_temp
-#define isASymbNode isASymbNode_temp
-#define isABifNode isABifNode_temp
-#define isALoNode isALoNode_temp
-#define hasTypeBaseType hasTypeBaseType_temp
-#define isStructType isStructType_temp
-#define isPointerType isPointerType_temp
-#define isUnionType isUnionType_temp
-#define isEnumType isEnumType_temp
-#define hasTypeSymbol hasTypeSymbol_temp
-#define isAtomicType isAtomicType_temp
-#define hasNodeASymb hasNodeASymb_temp
-#define isNodeAConst isNodeAConst_temp
-#define isAStructDeclBif isAStructDeclBif_temp
-#define isAUnionDeclBif isAUnionDeclBif_temp
-#define isAEnumDeclBif isAEnumDeclBif_temp
-#define isADeclBif isADeclBif_temp
-#define isAControlEnd isAControlEnd_temp
-#define Message Message_temp
-#define Check_Lang_Fortran Check_Lang_Fortran_temp
-#define filter filter_temp
-#define allocateValueEvaluate allocateValueEvaluate_temp
-#define addElementEvaluate addElementEvaluate_temp
-#define getElementEvaluate getElementEvaluate_temp
-#define resetPresetEvaluate resetPresetEvaluate_temp
-#define evaluateExpression evaluateExpression_temp
-#define patternMatchExpression patternMatchExpression_temp
-#define Follow_Llnd Follow_Llnd_temp
-
-#endif
-
-/*****************************************************************************
- *                                                                           *
- *                   Procedure of general use                                *
- *                                                                           *
- *****************************************************************************/
-
-/***************************************************************************/
-void Message(s, l)
-char *s;
-int l;
-{
-  if (l != 0)
-    fprintf(stderr,"Warning : %s line %d\n",s, l);
-  else
-    fprintf(stderr,"Warning : %s\n",s);
- Warning_count++;
-}
-
-/* Modified to return a pointer (64bit clean) (phb) */
-/***************************************************************************/
-char* xmalloc(size)
-     int size;
-{
-  char *val;
-  val = (char *) malloc (size);
-  
-  if (val == 0)
-    Message("Virtual memory exhausted (malloc failed)",0);
-  return val;
-}
-
-/* list of allocated data */
-static ptstack_chaining Current_Allocated_Data = NULL;
-static ptstack_chaining First_STACK= NULL;
-
-/***************************************************************************/
-void make_a_malloc_stack()
-{
-  ptstack_chaining pt;
-    
-  pt = (ptstack_chaining) malloc(sizeof(struct stack_chaining));
-  if (!pt)
-    {
-      Message("sorry : out of memory\n",0);
-      exit(1);
-    }
-  
-  if (Current_Allocated_Data)
-    Current_Allocated_Data->next = pt;
-  pt->first = NULL;
-  pt->last = NULL;
-  pt->prev = Current_Allocated_Data;
-  if (Current_Allocated_Data)
-    pt->level = Current_Allocated_Data->level +1;
-  else
-    pt->level = 0;
-/*  printf("make_a_malloc_stack %d \n",pt->level);*/
-  Current_Allocated_Data = pt;
-  if (First_STACK == NULL)
-    First_STACK = pt;
-}
-
-/***************************************************************************/
-char* mymalloc(size)
-int size;
-{
-  char *pt1;
-  ptchaining pt2;
-  if (!Current_Allocated_Data)
-    {
-      Message("Allocated Stack not defined\n",0);
-      exit(1);
-    }
-
-/*  if (Current_Allocated_Data->level > 0)
-    printf("mymalloc  %d \n", Current_Allocated_Data->level); */
-  pt1 = (char *) malloc(size);
-  if (!pt1)
-    {
-      Message("sorry : out of memory\n",0);
-      exit(1);
-    }
- 
-  pt2 = (ptchaining) malloc(sizeof(struct chaining));
-  if (!pt2 )
-    {
-      Message("sorry : out of memory\n",0);
-      exit(1);
-    }
-  
-  pt2->zone = pt1;
-  pt2->list = NULL;
-
-  if (Current_Allocated_Data->first == NULL)
-    Current_Allocated_Data->first = pt2;
-  
-  if (Current_Allocated_Data->last == NULL)
-    Current_Allocated_Data->last = pt2;
-  else
-    {
-      Current_Allocated_Data->last->list = pt2;
-      Current_Allocated_Data->last = pt2;
-    }
-  return pt1;
-}
-
-/***************** Provides infos on nodes ********************************
- *                                                                        *
- *     based on the table info in include dir *.def                       *
- *                                                                        *
- **************************************************************************/
-
-/***************************************************************************/
-int isATypeNode(variant)
-int variant;
-{
-  return (TYPENODE == (int) node_code_kind[variant]);
-}
-
-/***************************************************************************/
-int isASymbNode(variant)
-int variant;
-{
-  return (SYMBNODE == (int) node_code_kind[variant]);
-}
-
-/***************************************************************************/
-int isABifNode(variant)
-int variant;
-{
-  return (BIFNODE == (int) node_code_kind[variant]);
-}
-
-/***************************************************************************/
-int isALoNode(variant)
-int variant;
-{
-  return (LLNODE == (int) node_code_kind[variant]);
-}
-
-/***************************************************************************/
-int hasTypeBaseType(variant)
-int variant;
-{
-  if (!isATypeNode(variant))
-    {
-      Message("hasTypeBaseType not applied to a type node",0);
-      return 0;
-    }
-  if (info_type[variant][2] == 'b')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int isStructType(variant)
-int variant;
-{
-  if (!isATypeNode(variant))
-    {
-      Message("isStructType not applied to a type node",0);
-      return 0;
-    }
-  if (info_type[variant][0] == 's')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int isPointerType(variant)
-int variant;
-{
-  if (!isATypeNode(variant))
-    {
-      Message("isPointerType not applied to a type node",0);
-      return 0;
-    }
-  if (info_type[variant][0] == 'p')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-
-/***************************************************************************/
-int isUnionType(variant)
-int variant;
-{
-  if (!isATypeNode(variant))
-    {
-      Message("isUnionType not applied to a type node",0);
-      return 0;
-    }
-  if (info_type[variant][0] == 'u')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-
-/***************************************************************************/
-int isEnumType(variant)
-int variant;
-{
-  if (!isATypeNode(variant))
-    {
-      Message("EnumType not applied to a type node",0);
-      return 0;
-    }
-  if (info_type[variant][0] == 'e')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-
-/***************************************************************************/
-int hasTypeSymbol(variant)
-int variant;
-{
-  if (!isATypeNode(variant))
-    {
-      Message("hasTypeSymbol not applied to a type node",0);
-      return 0;
-    }
-  if (info_type[variant][1] == 's')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int isAtomicType(variant)
-int variant;
-{
-  if (!isATypeNode(variant))
-    {
-      Message("isAtomicType not applied to a type node",0);
-      return 0;
-    }
-  if (info_type[variant][0] == 'a')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int hasNodeASymb(variant)
-int variant;
-{
-  if ((!isABifNode(variant)) && (!isALoNode(variant)))
-    {
-      Message("hasNodeASymb not applied to a bif or low level node",0);
-      return 0;
-    }
-  if (general_info[variant][2] == 's')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int isNodeAConst(variant)
-int variant;
-{
-  if ((!isABifNode(variant)) && (!isALoNode(variant)))
-    {
-      Message("isNodeAConst not applied to a bif or low level node",0);
-      return 0;
-    }
-  if (general_info[variant][1] == 'c')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-
-/***************************************************************************/
-int isAStructDeclBif(variant)
-int variant;
-{
-  if (!isABifNode(variant))
-    {
-      Message("isAStructDeclBif not applied to a bif",0);
-      return 0;
-    }
-  if (general_info[variant][1] == 's')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int isAUnionDeclBif(variant)
-int variant;
-{
-  if (!isABifNode(variant))
-    {
-      Message("isAUnionDeclBif not applied to a bif",0);
-      return 0;
-    }
-  if (general_info[variant][1] == 'u')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int isAEnumDeclBif(variant)
-int variant;
-{
-  if (!isABifNode(variant))
-    {
-      Message("isAEnumDeclBif not applied to a bif",0);
-      return 0;
-    }
-  if (general_info[variant][1] == 'e')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int isADeclBif(variant)
-int variant;
-{
-  if (!isABifNode(variant))
-    {
-      Message("isADeclBif not applied to a bif",0);
-      return 0;
-    }
-  if (general_info[variant][0] == 'd')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int isAControlEnd(variant)
-int variant;
-{
-  if (!isABifNode(variant))
-    {
-      Message("isAControlEnd not applied to a bif",0);
-      return 0;
-    }
-  if (general_info[variant][0] == 'c')
-    return TRUE;
-  else
-    return FALSE;
-}
-
-/***************************************************************************/
-int Check_Lang_Fortran(proj)
-PTR_PROJ proj;
-{
-  PTR_FILE ptf;
-  PTR_BLOB ptb;
-  /* Change FALSE to TRUE */
-  if (!proj)
-    return TRUE;
-  for (ptb = PROJ_FILE_CHAIN (proj); ptb ; ptb =  BLOB_NEXT (ptb))
-    {
-      ptf = (PTR_FILE) BLOB_VALUE (ptb);
-    /*  if (debug)
-	fprintf(stderr,"%s\n",FILE_FILENAME (ptf)); */
-
-      if (FILE_LANGUAGE(ptf) != ForSrc)
-	return(FALSE);
-    }
-  return(TRUE);
-}
-
-
-/***************************************************************************/
-char* filter(s)
-char *s;
-{
-  char c;
-  int i = 1;
-  char temp[1024];
-  int temp_i = 0;
-  int buf_i = 0;
-  int commentline = 0;
-  char *resul, *init;
-  
-  if (!s) return NULL;
-  if (strlen(s)==0) return s;
-
-  /* allocate very simple, but to redo later, allocate two times the size */
-  make_a_malloc_stack();
-  resul = (char *) mymalloc((int)(2*strlen(s)));
-  memset(resul, 0, 2*strlen(s));
-  init = resul;
-  /* find the separator */
-  c = s[0];
-
-  if ((c != ' ')
-      &&(c != '\n')
-      && (c != '0')
-      && (c != '1') 
-      && (c != '2') 
-      && (c != '3') 
-      && (c != '4') 
-      && (c != '5') 
-      && (c != '6') 
-      && (c != '7') 
-      && (c != '8') 
-      && (c != '9'))
-      if ( c=='!')  commentline = HPF_STRING;
-      else commentline = 1;
-  else
-    commentline = 0;
-
-  temp_i = 0;
-  i = 0;
-  buf_i =0;
-  while (c!='\0')
-    {
-      c = s[i];
-      temp[ buf_i] = c;
-      if (c == '\n')
-        {
-          temp[ buf_i+1] = '\0';
-          sprintf(resul,"%s",temp);
-          resul = resul + strlen(temp);
-          temp_i = -1;
-          buf_i = -1;
-          if ((s[i+1] != ' ')
-              &&(s[i+1] != '\n')
-              && (s[i+1] != '0')
-              && (s[i+1] != '1') 
-              && (s[i+1] != '2') 
-              && (s[i+1] != '3') 
-              && (s[i+1] != '4') 
-              && (s[i+1] != '5') 
-              && (s[i+1] != '6') 
-              && (s[i+1] != '7') 
-              && (s[i+1] != '8') 
-              && (s[i+1] != '9'))
-	      if (s[i+1] == '!')  commentline = HPF_STRING;
-	      else commentline = 1;
-          else
-            commentline = 0;
-        } else
-          {
-            if ((temp_i == 71) && !commentline)
-              { 
-                /* insert where necessary */
-                temp[ buf_i+1]  = '\0';
-                sprintf(resul,"%s\n",temp);
-                resul = resul + strlen(temp)+1;
-                sprintf(resul,"     +");
-                resul = resul + strlen("     +");
-                commentline = 0;
-                memset(temp, 0, 1024);
-                temp_i = strlen("     +")-1;
-                buf_i = -1;
-              }
-	    if ((temp_i == 71) && (commentline==HPF_STRING))
-              { 
-                /* insert where necessary */
-		int count=0;
-		for(;s[i]!='$';i--,count++)
-            	    {
-		    if (strncmp(&(s[i]),"ONTO", strlen("ONTO"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"BEGIN", strlen("BEGIN"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"ON", strlen("ON"))== 0)
-			{
-			i+=3;count-=3;		
-			break;
-			}
-		    if (strncmp(&(s[i]),"WITH", strlen("WITH"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"NEW", strlen("NEW"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"REDUCTION", strlen("REDUCTION"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"TEMPLATE", strlen("TEMPLATE"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"SHADOW", strlen("SHADOW"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"INHERIT", strlen("INHERIT"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"DYNAMIC", strlen("DYNAMIC"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"DIMENSION", strlen("DIMENSION"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"PROCESSORS", strlen("PROCESSORS"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"DISTRIBUTE", strlen("DISTRIBUTE"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"ALIGN", strlen("ALIGN"))== 0)
-			break;
-		    if (strncmp(&(s[i]),"::", strlen("::"))== 0)
-			{
-			/*i+=3;count-=3;*/
-			break;
-			}
-		    }
-		i--;count++;      
-		if (count<36)
-		    temp[ buf_i+1-count]  = '\0';
-		else 
-		    {
-		    i+=count;
-		    temp[ buf_i+1]  = '\0';
-		    }
-                sprintf(resul,"%s\n",temp);
-                resul = resul + strlen(temp)+1;
-                sprintf(resul,"!HPF$*");
-                resul = resul + strlen("!HPF$*");
-                /*8commentline = 0;*/
-                memset(temp, 0, 1024);
-                temp_i = strlen("!HPF$*")-1;
-                buf_i = -1;
-              }
-          }
-      i++;
-      temp_i++;
-      buf_i++;
-    }
-
-  return init;  
-}
-/* preset some values of symbols for evaluateExpression*/
-#define ALLOCATECHUNKVALUE  100
-static PTR_SYMB  *ValuesSymb = NULL;
-static int       *ValuesInt  = NULL;
-static int        NbValues   = 0;
-static int        NbElement   = 0;
-
-/***************************************************************************/
-void allocateValueEvaluate()
-{
-  int i;
-  PTR_SYMB  *pt1;
-  int       *pt2;
-  
-  pt1 = (PTR_SYMB  *) xmalloc((int)( sizeof(PTR_SYMB  *) * 
-			      (NbValues + ALLOCATECHUNKVALUE)));
-  pt2 =  (int *) xmalloc((int)( sizeof(int  *) * (NbValues + ALLOCATECHUNKVALUE)));
-  
-  for (i=0; i<NbValues + ALLOCATECHUNKVALUE; i++) {
-    pt1[i] = NULL;
-    pt2[i] = 0;
-  }
-  
-  for (i=0 ; i < NbValues; i++) {
-    pt1[i] = ValuesSymb[i];
-    pt2[i] = ValuesInt[i];
-  }
-  
-  if (NbValues) {
-#ifdef __SPF
-      removeFromCollection(ValuesSymb);
-      removeFromCollection(ValuesInt);
-#endif
-    free(ValuesSymb);
-    free(ValuesInt);
-  }
-    
-  ValuesSymb = pt1;
-  ValuesInt = pt2;
-  NbValues = NbValues + ALLOCATECHUNKVALUE;
-}
-
-/***************************************************************************/
-void addElementEvaluate(symb, val)
-     PTR_SYMB symb;
-     int val;
-{
-  if (!symb)
-    return;
-  while (NbValues <= ( NbElement+1))
-    {
-      allocateValueEvaluate();
-    }
-  ValuesSymb[NbElement] = symb;
-  ValuesInt[NbElement] = val;
-  NbElement++;
-}
-
-
-/***************************************************************************/
-int getElementEvaluate(symb)
-     PTR_SYMB symb;
-{
-  int i;
-  if (!symb)
-    return -1;
-  for (i=0 ; i < NbElement; i++)
-    {
-      if (ValuesSymb[i] == symb)
-        return i;
-    }
-  return -1;
-}
-
-
-/***************************************************************************/
-void resetPresetEvaluate()
-{
-  NbValues = 0;
-  NbElement  = 0;
-  if (ValuesSymb)
-  {
-#ifdef __SPF
-      removeFromCollection(ValuesSymb);
-#endif
-      free(ValuesSymb);
-  }
-  if (ValuesInt)
-  {
-#ifdef __SPF
-      removeFromCollection(ValuesInt);
-#endif
-      free(ValuesInt);
-  }
-  ValuesSymb = NULL;
-  ValuesInt = NULL;
-}
-
-/***************************************************************************/
-int* evaluateExpression(expr)
-     PTR_LLND expr;
-{
-  int *res, *op1, *op2;
-  
-  res = (int *) xmalloc((int)(2 * sizeof(int)));
-  memset((char *) res, 0, 2 * sizeof (int));
-  op1 = (int *) xmalloc((int)(2 * sizeof(int)));
-  memset((char *)op1, 0, 2 * sizeof (int));
-  op2 = (int *) xmalloc((int)(2 * sizeof(int)));
-  memset((char *) op2, 0, 2 * sizeof (int));
-  if (! expr)
-    {
-      res [0] = -1;
-      return res;
-    }
-  
-  switch (BIF_CODE (expr)) 
-    {
-    case INT_VAL:
-      res [1] = NODE_INT_CST_LOW (expr);
-#ifdef __SPF
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-    case ADD_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] + op2 [1];
-#ifdef __SPF
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case MULT_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] * op2 [1];
-#ifdef __SPF
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case SUBT_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] - op2 [1];
-#ifdef __SPF
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case DIV_OP :
-        op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] / op2 [1];
-#ifdef __SPF
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case MOD_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] % op2 [1];
-#ifdef __SPF
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-   case EXP_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      op2  = evaluateExpression (NODE_OPERAND1 (expr));
-      if ((op1 [0] == -1) || (op2 [0] == -1))
-        res [0] = -1;
-      else
-        res [1] = op1 [1] ^ op2 [1];
-#ifdef __SPF
-      removeFromCollection(op1);
-      removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-
-    case MINUS_OP :
-      op1  = evaluateExpression (NODE_OPERAND0 (expr));
-      if (op1 [0] == -1)
-        res [0] = -1;
-      else
-        res [1] = - op1 [1];  
-#ifdef __SPF
-      removeFromCollection(op1);
-#endif
-      free(op1);
-      return res;
-    case VAR_REF: /* assume here that some value for Symbole are given*/
-      {
-        int ind;
-        if ((ind = getElementEvaluate(NODE_SYMB(expr))) != -1)
-          {
-             res [1] = ValuesInt[ind];
-#ifdef __SPF
-             removeFromCollection(op1);
-             removeFromCollection(op2);
-#endif
-             free(op1); free(op2);
-             return res;
-           } else
-             {
-                res [0] = -1;
-#ifdef __SPF
-                removeFromCollection(op1);
-                removeFromCollection(op2);
-#endif
-                free(op1); free(op2);
-                return res;
-             }
-        break;
-      }
-   default :
-     res [0] = -1;
-#ifdef __SPF
-     removeFromCollection(op1);
-     removeFromCollection(op2);
-#endif
-      free(op1); free(op2);
-      return res;
-    }
-    return res;
-}
-
-/***************************************************************************/
-int patternMatchExpression(ll1,ll2)
-     PTR_LLND ll1,ll2;
-{
-  int *res1, *res2;
-  
-  if (ll1 == ll2)
-    return TRUE;
-  
- if (!ll1 || !ll2)
-   return FALSE;
-
-  if (NODE_CODE(ll1) != NODE_CODE(ll2))
-    return FALSE;
-  /* first test if constant equations identical */
-  res1 = evaluateExpression(ll1);
-  res2 = evaluateExpression(ll2);
-  if ((res1[0] != -1) &&
-      (res2[0] != -1) &&
-      (res1[1] == res2[1]))
-    {
-#ifdef __SPF
-      removeFromCollection(res1);
-      removeFromCollection(res2);
-#endif
-      free(res1);
-      free(res2);
-      return TRUE;
-    }
-  if ((res1[0] != -1) && (res2[0] == -1))
-    {
-#ifdef __SPF
-      removeFromCollection(res1);
-      removeFromCollection(res2);
-#endif
-      free(res1);
-      free(res2);
-      return FALSE;
-    }
-  if ((res1[0] == -1) && (res2[0] != -1))
-    {
-#ifdef __SPF
-      removeFromCollection(res1);
-      removeFromCollection(res2);
-#endif
-      free(res1);
-      free(res2);
-      return FALSE;
-    }
-#ifdef __SPF
-  removeFromCollection(res1);
-  removeFromCollection(res2);
-#endif
-  free(res1);
-  free(res2);
-
-  /* for each  kind of node do the pattern match */
-  switch (NODE_CODE(ll1))
-    {
-    case VAR_REF:
-      if (NODE_SYMB(ll1) == NODE_SYMB(ll2))
-        return TRUE;
-      break;
-
-      /* commutatif operator */
-    case EQ_OP:
-      if ((NODE_SYMB(ll1) == NODE_SYMB(ll2)) &&
-          patternMatchExpression(NODE_OPERAND0(ll1),
-                                   NODE_OPERAND1(ll2)) &&
-          patternMatchExpression(NODE_OPERAND0(ll1),
-                                   NODE_OPERAND1(ll2))) 
-        return TRUE;
-    default :
-      if ((NODE_SYMB(ll1) == NODE_SYMB(ll2)) &&
-          patternMatchExpression(NODE_OPERAND0(ll1),
-                                    NODE_OPERAND0(ll2)) &&
-          patternMatchExpression(NODE_OPERAND1(ll1),
-                                   NODE_OPERAND1(ll2))) 
-        return TRUE;
-    }
-  return FALSE;
-}
-
-PTR_LLND Follow_Llnd(ll,c)
-PTR_LLND ll;
-int c;
-{
-  PTR_LLND pt;
-  if(c == 2)
-    {
-      pt = ll;
-      while(pt)
-	{
-	  if (NODE_OPERAND1(pt) == NULL)
-	    return pt;
-	  pt = NODE_OPERAND1(pt);	  
-	}
-    } else
-      {
-        pt = ll;
-        while(pt)
-          {
-            if (NODE_OPERAND1(pt) == NULL)
-              return NODE_OPERAND0(pt);
-            pt = NODE_OPERAND1(pt);	  
-          }
-      }
-  return NULL;
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/makefile.uni b/projects/dvm_svn/fdvm/trunk/parser/makefile.uni
deleted file mode 100644
index 4eda491..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/makefile.uni
+++ /dev/null
@@ -1,99 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# dvm/fdvm/parser/makefile.uni
-
-#	HDR	traditional header files.
-#	HDRg	header files generated by programs.
-#	SRC	traditional source files.
-#	SRCg	source files generated by programs.
-#	OBJS	object files required to load the program.
-#
-
-BINDIR = ../../bin
-LIBDIR = ../lib
-
-SAGEROOT = ../Sage
-LIBINCLUDE = $(SAGEROOT)/lib/include
-HINCLUDE = $(SAGEROOT)/h
-DVMINCLUDE = ../include
-EXECUTABLES = parse
-
-INCL = -I. -I$(DVMINCLUDE) -I$(LIBINCLUDE) -I$(HINCLUDE)
-
-# -w don't issue warning now.
-CFLAGS=$(INCL) -c -DSYS5 -Wall
-
-$(OUTDIR)/%.o:%.c
-	$(CC) $(CFLAGS) -o $(OUTDIR)/$*.o $<
-
-gram1.tab.o: gram1.tab.c
-	$(CC) $(CFLAGS) -DYYDEBUG gram1.tab.c
-LIBS = $(LIBDIR)/libdb.a 
-FDVM = $(DVMINCLUDE)/dvm_tag.h
-HDR = $(DVMINCLUDE)/inc.h $(HINCLUDE)/defs.h $(DVMINCLUDE)/fdvm.h $(HINCLUDE)/bif.h \
-	$(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h \
-	$(DVMINCLUDE)/extern.h $(HINCLUDE)/sets.h tag tokens
-TOOLBOX_HDR = $(LIBINCLUDE)/macro.h $(LIBINCLUDE)/bif_node.def $(LIBINCLUDE)/type.def $(LIBINCLUDE)/symb.def
-HDRg = tag.h tokdefs.h
-
-HDRS = $(HDR) $(HDRg)
-# !!
-SRC = cftn.c init.c hash.c lexfdvm.c lists.c misc.c stat.c errors.c types.c sym.c \
-	low_hpf.c unparse_hpf.c
-#!!
-SRCg = gram.tab.c
-
-SRCS = $(SRC) $(SRCg)
-#!! 
-OBJS = cftn.o errors.o hash.o init.o \
-	lexfdvm.o lists.o misc.o stat.o \
-	types.o gram1.tab.o sym.o low_hpf.o unparse_hpf.o
-
-$(BINDIR)/$(EXECUTABLES): $(OBJS)
-	$(LINKER) -o $(BINDIR)/$(EXECUTABLES) $(OBJS) $(LIBS)
-
-all: $(BINDIR)/$(EXECUTABLES)
-	@echo "****** COMPILING EXECUTABLE $(EXECUTABLES) DONE ******"
-
-clean:
-	rm -f $(OBJS)
-cleanall:
-	rm -f $(OBJS)
-
-# ***********************************************************
-
-###
-cftn.o: $(HINCLUDE)/db.h $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/bif.h \
-	$(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/sets.h
-ftn.gram: $(DVMINCLUDE)/extern.h $(HINCLUDE)/defines.h $(HINCLUDE)/defs.h \
-	$(DVMINCLUDE)/fdvm.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h \
-	$(HINCLUDE)/sets.h
-commsym.o: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h \
-	$(HINCLUDE)/bif.h $(DVMINCLUDE)/extern.h $(HINCLUDE)/db.h $(HINCLUDE)/ll.h \
-	$(HINCLUDE)/sets.h
-errors.o: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/symb.h $(DVMINCLUDE)/extern.h \
-	$(HINCLUDE)/db.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/sets.h
-exec.o: $(HINCLUDE)/defs.h $(HINCLUDE)/tag
-gram.o: $(HINCLUDE)/defs.h \
-	$(HINCLUDE)/tag $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h \
-	$(HINCLUDE)/sets.h $(DVMINCLUDE)/extern.h $(HINCLUDE)/db.h $(HINCLUDE)/defines.h 
-hash.o: $(HINCLUDE)/defs.h $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h $(DVMINCLUDE)/extern.h \
-	$(HINCLUDE)/db.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/sets.h $(HINCLUDE)/tag
-init.o: $(DVMINCLUDE)/inc.h $(HINCLUDE)/defs.h $(HINCLUDE)/bif.h $(HINCLUDE)/defines.h \
-	$(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/sets.h $(HINCLUDE)/db.h $(HINCLUDE)/tag
-# !!
-lexfdvm.o: $(DVMINCLUDE)/extern.h
-lists.o: $(HINCLUDE)/defs.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/bif.h
-misc.o: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/defines.h $(HINCLUDE)/db.h \
-	$(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/sets.h
-stat.o: $(HINCLUDE)/defs.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h\
-	$(HINCLUDE)/sets.h $(HINCLUDE)/defines.h $(DVMINCLUDE)/extern.h
-sym.o: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h \
-	$(HINCLUDE)/bif.h $(DVMINCLUDE)/extern.h $(HINCLUDE)/db.h $(HINCLUDE)/ll.h \
-	$(HINCLUDE)/sets.h $(DVMINCLUDE)/fdvm.h
-types.o: $(HINCLUDE)/defs.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h
-low_hpf.o: $(FDVM) $(TOOLBOX_HDR)
-unparse_hpf.o: $(FDVM) $(TOOLBOX_HDR) $(DVMINCLUDE)/unparse.hpf
diff --git a/projects/dvm_svn/fdvm/trunk/parser/makefile.win b/projects/dvm_svn/fdvm/trunk/parser/makefile.win
deleted file mode 100644
index c61e0e1..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/makefile.win
+++ /dev/null
@@ -1,129 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# dvm/fdvm/parser/makefile.win
-
-#	HDR	traditional header files.
-#	HDRg	header files generated by programs.
-#	SRC	traditional  source files.
-#	SRCg	source files generated by programs.
-#	OBJS	object files required to load the program.
-#
-
-OUTDIR = ..\obj
-BINDIR = ..\..\bin
-LIBDIR = ..\lib
-
-SAGEROOT =../Sage
-LIBINCLUDE = $(SAGEROOT)/lib/include
-HINCLUDE = $(SAGEROOT)/h
-FDVMINCL = ../include
-EXECUTABLES =	parse
-
-INCL = -I. -I$(FDVMINCL) -I$(LIBINCLUDE) -I$(HINCLUDE) 
-TOOLBOX_HDR =  $(LIBINCLUDE)/macro.h $(LIBINCLUDE)/bif_node.def  $(LIBINCLUDE)/type.def  $(LIBINCLUDE)/symb.def 
-FDVM =  $(DVMINCLUDE)/dvm_tag.h
-# -w don't issue warning now.
-#CFLAGS=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" \
-#  	/D "YYDEBUG" /D "MSDOS" /D "SYS5" /D "WIN" $(INCL) \
-#	/Fp"$(OUTDIR)/newsrc.pch" /YX /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-CFLAGS=/nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" \
-  	/D "YYDEBUG" /D "MSDOS" /D "SYS5" /D "WIN" $(INCL) \
-	/Fp"$(OUTDIR)/newsrc.pch" /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-
-
-
-.c{$(OUTDIR)/}.obj:
-    echo $(CC) $(CFLAGS) $<
-    $(CC) $(CFLAGS) $<
-
-$(OUTDIR)/gram1.tab.obj:	gram1.tab.c
-	$(CC) $(CFLAGS) /D "YYDEBUG" -c gram1.tab.c
-
-LINK=$(LINKER)
- 
-LINK_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-LINK_FLAGS=kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib\
- advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
- odbccp32.lib /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-
-LIBS = $(LIBDIR)/libdb.lib 
-
-HDR	= $(DVMINCLUDE)/inc.h $(HINCLUDE)/defs.h $(DVMINCLUDE)/fdvm.h $(HINCLUDE)/bif.h  \
-      $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h  \
-	  $(DVMINCLUDE)/extern.h $(HINCLUDE)/sets.h tag tokens
-
-HDRg	= tag.h tokdefs.h
-
-HDRS	= $(HDR) $(HDRg)
-# !!
-SRC	= cftn.c init.c hash.c lexfdvm.c lists.c\
-	  misc.c stat.c  errors.c types.c sym.c low_hpf.c unparse_hpf.c
-#!!
-SRCg	= gram.tab.c
-
-SRCS	= $(SRC) $(SRCg)
-#!! 
-OBJS	= $(OUTDIR)/cftn.obj $(OUTDIR)/errors.obj $(OUTDIR)/hash.obj $(OUTDIR)/init.obj \
-	$(OUTDIR)/lexfdvm.obj $(OUTDIR)/lists.obj $(OUTDIR)/misc.obj $(OUTDIR)/stat.obj \
-	$(OUTDIR)/types.obj $(OUTDIR)/gram1.tab.obj $(OUTDIR)/sym.obj \
-	$(OUTDIR)/low_hpf.obj $(OUTDIR)/unparse_hpf.obj
-
-
-$(BINDIR)/$(EXECUTABLES).exe: $(OBJS)
-	$(LINK) @<<
-	$(LINK_FLAGS) $(OBJS) $(LIBS)
-<<
-
-all: $(BINDIR)/$(EXECUTABLES).exe
-    @echo "*** COMPILING EXECUTABLE $(EXECUTABLES) DONE"
-
-clean:
-
-cleanall:
-
-# ***********************************************************
-
-###
-cftn.obj: $(HINCLUDE)/db.h $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/bif.h \
-	$(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/sets.h
-ftn.gram: $(DVMINCLUDE)/extern.h $(HINCLUDE)/defines.h $(HINCLUDE)/defs.h \
-        $(DVMINCLUDE)/fdvm.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h \
-	$(HINCLUDE)/sets.h
-commsym.obj: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h \
-	$(HINCLUDE)/bif.h $(DVMINCLUDE)/extern.h $(HINCLUDE)/db.h $(HINCLUDE)/ll.h \
-	$(HINCLUDE)/sets.h
-errors.obj: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/symb.h  $(DVMINCLUDE)/extern.h \
-	$(HINCLUDE)/db.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/sets.h
-exec.obj: $(HINCLUDE)/defs.h $(HINCLUDE)/tag
-gram.obj: $(HINCLUDE)/defs.h \
-	$(HINCLUDE)/tag $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h \
-	$(HINCLUDE)/sets.h  $(DVMINCLUDE)/extern.h $(HINCLUDE)/db.h $(HINCLUDE)/defines.h 
-hash.obj: $(HINCLUDE)/defs.h $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h $(DVMINCLUDE)/extern.h \
-	$(HINCLUDE)/db.h $(HINCLUDE)/bif.h  $(HINCLUDE)/ll.h $(HINCLUDE)/sets.h $(HINCLUDE)/tag
-init.obj:  $(DVMINCLUDE)/inc.h $(HINCLUDE)/defs.h $(HINCLUDE)/bif.h  $(HINCLUDE)/defines.h \
-	$(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/sets.h $(HINCLUDE)/db.h $(HINCLUDE)/tag
-# !!
-lexfdvm.obj: $(DVMINCLUDE)/extern.h
-lists.obj:$(HINCLUDE)/defs.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/bif.h
-misc.obj: $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/defines.h $(HINCLUDE)/db.h \
-	$(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h $(HINCLUDE)/sets.h
-stat.obj:	$(HINCLUDE)/defs.h $(HINCLUDE)/bif.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h\
-        $(HINCLUDE)/sets.h $(HINCLUDE)/defines.h $(DVMINCLUDE)/extern.h
-sym.obj:  $(HINCLUDE)/defs.h $(HINCLUDE)/tag $(HINCLUDE)/symb.h $(HINCLUDE)/defines.h \
-	$(HINCLUDE)/bif.h $(DVMINCLUDE)/extern.h $(HINCLUDE)/db.h $(HINCLUDE)/ll.h \
-	$(HINCLUDE)/sets.h $(DVMINCLUDE)/fdvm.h
-types.obj:$(HINCLUDE)/defs.h $(HINCLUDE)/ll.h $(HINCLUDE)/symb.h
-low_hpf.obj: $(FDVM) $(TOOLBOX_HDR)         
-unparse_hpf.obj:  $(FDVM) $(TOOLBOX_HDR) $(DVMINCLUDE)/unparse.hpf
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/misc.c b/projects/dvm_svn/fdvm/trunk/parser/misc.c
deleted file mode 100644
index 112ea22..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/misc.c
+++ /dev/null
@@ -1,212 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-/*
- * misc.c
- *
- * Misellanious help routines
- */
-
-#include "defs.h"
-#include "defines.h"
-#include <ctype.h>
-#include "db.h"
-#include <stdlib.h>
-#include <string.h>
-
-extern int blklevel;
-extern void warn1();
-extern PTR_BFND cur_scope();
-PTR_LABEL make_label();
-extern PTR_FILE fi;
-void free();
-
-extern PTR_CMNT comments;
-extern PTR_FNAME cur_thread_file;
-extern PTR_FNAME the_file;
-extern int yylineno;
-extern int mod_offset;
-extern PTR_BFND last_bfnd;
-extern PTR_BFND head_bfnd, last_bfnd;
-extern PTR_LLND head_llnd;
-extern PTR_SYMB head_symb;
-extern PTR_TYPE head_type;
-extern PTR_LABEL head_label;
-
-#ifdef __SPF
-extern void removeFromCollection(void *pointer);
-#endif
-
-/*
- * eqn -- checks if first n characters of two strings are the same
- *
- * input:
- *	  n - length to be checked
- *	  a - string1
- *	  b - string2
- *
- * output:
- *	  YES if the first n characters are same.  NO, otherwise.
- */
-int 
-eqn(n, a, b)
-	register int n;
-	register unsigned char *a, *b;
-{
-	while (--n >= 0)
-		if ((isupper(*a) ? tolower(*a++) : *a++) != *b++)
-			return (NO);
-	return (YES);
-}
-
-/*
- * StringConcatenation -- concatenate strings
- */
-char *StringConcatenation(char *s1, char*s2)
-{
-   char *res = (char*)malloc(strlen(s1)+strlen(s2)+1);   
-   res[0] = '\0';
-   strcat(res, s1);
-   strcat(res, s2);
-   return res;  
-}
-
-/*
- * convci - converts an ASCII string to binary
- *
- * input:
- *	  n - length of the string
- *	  s - the string to be converted
- *
- * output:
- *	  the converted long value
- */
-long 
-convci(n, s)
-	register int n;
-	register char *s;
-{
-	register long sum;
-
-	sum = 0;
-	while (n-- > 0)
-		sum = 10 * sum + (*s++ - '0');
-	return (sum);
-}
-
-
-/*
- * convic -- converts a long integer to ASCII string
- *
- * input:
- *	  n - the number to be converted
- *
- * output:
- *	  the converted string
- */
-char   *
-convic(n)
-	long    n;
-{
-	static char s[20];
-	register char *t;
-
-	s[19] = '\0';
-	t = s + 19;
-
-	do {
-		*--t = '0' + n % 10;
-		n /= 10;
-	} while (n > 0);
-
-	return (t);
-}
-
-
-/*
- * Get a BIF node
- */
-PTR_BFND 
-get_bfnd(fid,node_type, symb_ptr, ll1, ll2, ll3)
-PTR_FILE fid;
-int     node_type;
-PTR_SYMB symb_ptr;
-PTR_LLND ll1, ll2, ll3;
-{
-	PTR_BFND new_bfnd, make_bfnd();
-
-	new_bfnd = make_bfnd(fid, node_type, symb_ptr, ll1, ll2, ll3);
-        new_bfnd->filename = the_file;
-	/*new_bfnd->filename = cur_thread_file;*/ /*podd 18.04.99*/
-        new_bfnd->entry.Template.cmnt_ptr = comments;
-	new_bfnd->entry.Template.bl_ptr1 = BLNULL;
-	new_bfnd->entry.Template.bl_ptr2 = BLNULL;
-	new_bfnd->g_line = yylineno;
-	new_bfnd->l_line = yylineno - mod_offset;
-	last_bfnd = new_bfnd;
-	return (new_bfnd);
-}
-
-
-void
-release_nodes()
-{
-	register PTR_BFND p1 = head_bfnd;
-	register PTR_LLND p2 = head_llnd;
-	register PTR_SYMB p3 = head_symb;
-	register PTR_TYPE p4 = head_type;
-	register PTR_LABEL p5 =head_label;
-	register PTR_BFND t1;
-	register PTR_LLND t2;
-	register PTR_SYMB t3;
-	register PTR_TYPE t4;
-	register PTR_LABEL t5;
-
-	while (p1) {
-		t1 = p1;
-		p1 = p1->thread;
-#ifdef __SPF
-        removeFromCollection(t1);
-#endif
-		free ((char *)t1);
-	}
-	
-	while (p2) {
-		t2 = p2;
-		p2 = p2->thread;
-#ifdef __SPF
-        removeFromCollection(t2);
-#endif
-		free ((char *)t2);
-	}
-	
-	while (p3) {
-		t3 = p3;
-		p3 = p3->thread;
-#ifdef __SPF
-        removeFromCollection(t3);
-#endif
-		free ((char *)t3);
-	}
-	
-	while (p4) {
-		t4 = p4;
-		p4 = p4->thread;
-#ifdef __SPF
-        removeFromCollection(t4);
-#endif
-		free ((char *)t4);
-	}
-	
-	while (p5) {
-		t5 = p5;
-		p5 = p5->next;
-#ifdef __SPF
-        removeFromCollection(t5);
-#endif
-		free ((char *)t5);
-	}
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/stat.c b/projects/dvm_svn/fdvm/trunk/parser/stat.c
deleted file mode 100644
index 0cdfcbd..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/stat.c
+++ /dev/null
@@ -1,1449 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-#define EXTEND_NODE 2  /* move this definition to h/ files. */
-                       /* should agree with cftn.gram definition. */
-/*
- * stat.c
- *
- * Routines for handling Fortran statements
- *
- */
-
-#include "inc.h"
-#include "defines.h"
-#include "extern.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-extern int parstate;
-extern PTR_SYMB head_symb, global_list, star_symb;
-extern PTR_BFND cur_bfnd, global_bfnd, pred_bfnd, cur_scope();
-extern PTR_BFND last_bfnd; /*OMP*/
-extern PTR_TYPE global_float, global_int, global_bool, global_default, vartype;
-extern PTR_LABEL head_label;
-extern PTR_LABEL thislabel;
-extern PTR_TYPE impltype[];
-extern PTR_BLOB head_blob, cur_blob;
-extern PTR_CMNT comments;
-extern int yylineno;
-extern int mod_offset;
-extern int nioctl;
-extern int yydebug;
-
-void fatalstr();
-void execerr();
-int chk_params();
-void err();
-void setimpl();
-
-PTR_BFND get_bfnd();
-PTR_LLND make_llnd();
-PTR_SYMB make_symb();
-PTR_BLOB make_blob();
-PTR_LABEL make_label();
-PTR_SYMB install_entry();
-PTR_SYMB get_proc_symbol();
-PTR_HASH correct_symtab();
-int end_group = 0;
-
-/* 
-   The following two routines are used for reading in input/output
-   control lists. 
-*/
-
-void
-startioctl()
-{
-
-	inioctl = YES;
-        nioctl = 0; 
-
-}
-
-void
-endioctl()
-{
-	inioctl = NO;
-
-}
-
-
-/*
- * Follow a chain of blob nodes to get the last
- *
- * input:
- *	 blob - the list to be searched
- *
- * output:
- *	 pointer to the last node in the list
- */
-PTR_BLOB
-follow_blob(blob)
-	PTR_BLOB blob;
-{
-	register PTR_BLOB next, last;
-
-	for (next = last = blob; next; next = next->next)
-		last = next;
-	return (last);
-}
-
-
-/* 
- * make_if takes an expression to make an IF_NODE
- * Also allocates a collection point and points the false branch
- * to the collection point
- */
-PTR_BFND
-make_if(expr)
-	PTR_LLND expr;
-{
-	PTR_BFND p;
-	void set_blobs(), make_prog_header();
-	void err();
-
-	/*
-        if (pred_bfnd->variant == GLOBAL)
-	  make_prog_header();
-	*/
-	
-	/*	if (expr->type->variant != T_BOOL) {
-		err("Non-logical expression in IF statement", 28);
-		expr = LLNULL;
-	}
-        */ /*06.06.03*/ 
-	p = get_bfnd(fi,IF_NODE, SMNULL, expr, LLNULL, LLNULL);
-/*	set_blobs(p, pred_bfnd, NEW_GROUP1); */
-	return (p);
-}
-
-
-PTR_BFND
-make_forall(lexpr,expr)
-	PTR_LLND expr,lexpr;
-{
-	PTR_BFND p;
-	void set_blobs(), make_prog_header();
-	void err();
-
-	/*
-        if (pred_bfnd->variant == GLOBAL)
-	  make_prog_header();
-	*/
-	/*	if (expr && expr->type->variant != T_BOOL) {
-		err("Non-logical expression in FORALL statement", 288);
-		expr = LLNULL;
-	}
-         */ /*06.06.03*/ 
-	p = get_bfnd(fi,FORALL_NODE, SMNULL, lexpr, expr, LLNULL);
-/*	set_blobs(p, pred_bfnd, NEW_GROUP1); */
-	return (p);
-}
-
-/*
- * make_elseif fixes the control frame to reflect the current paring state
- */
-
-void
-make_elseif(expr,s)
-	PTR_LLND expr;
-        PTR_SYMB s;  /*podd 3.02.03*/
-{
-	register PTR_BFND p = NULL;
-	void execerr(), make_endblock();
-
-	/*	if (expr->type->variant != T_BOOL) {
-		err("Non-logical expression in IF statement", 28);
-		expr = LLNULL;
-	}
-        */ /*06.06.03*/ 
-	if (pred_bfnd->variant == IF_NODE || pred_bfnd->variant == ELSEIF_NODE)
-		p = get_bfnd(fi,ELSEIF_NODE, s, expr, LLNULL, LLNULL);
-	else
-		err("ELSEIF out of place", 31);
-	p->control_parent = pred_bfnd;
-	pred_bfnd->entry.Template.bl_ptr2 = make_blob(fi,p, BLNULL);
-	pred_bfnd = p;
-	cur_blob = p->entry.Template.bl_ptr1 = make_blob(fi,BFNULL, BLNULL);
-}
-
-void
-make_elsewhere_mask(expr,s)
-	PTR_LLND expr;
-        PTR_SYMB s;  /*podd 15.02.03*/
-{
-	register PTR_BFND p = NULL;
-	void execerr(), make_endblock();
-
-	/*if (expr->type->variant != T_BOOL) {
-		err("Non-logical expression in IF statement", 28);
-		expr = LLNULL;
-		}*/
-	if (pred_bfnd->variant == WHERE_BLOCK_STMT || pred_bfnd->variant == ELSEWH_NODE)
-		p = get_bfnd(fi,ELSEWH_NODE, s, expr, LLNULL, LLNULL);
-	else
-		err("ELSEWHERE out of place", 291);
-	p->control_parent = pred_bfnd;
-	pred_bfnd->entry.Template.bl_ptr2 = make_blob(fi,p, BLNULL);
-	pred_bfnd = p;
-	cur_blob = p->entry.Template.bl_ptr1 = make_blob(fi,BFNULL, BLNULL);
-}
-
-
-
-/*
- * make_else fixes the control stack to reflect the current state of parsing
- * and put all BIF nodes after the saved control frame as the true branch of
- * the If statement
- */
-void
-make_else(s)
-PTR_SYMB s;  /*podd 3.02.03*/
-{
-	void execerr(), set_blobs();
-	PTR_BFND p;
-
-	if (pred_bfnd->variant != IF_NODE && pred_bfnd->variant != ELSEIF_NODE)
-	  err("ELSE out of place", 32);
-	p = get_bfnd(fi,CONTROL_END, s, LLNULL, LLNULL, LLNULL);
-        if (is_openmp_stmt) { /*OMP*/
-            is_openmp_stmt = 0; /*OMP*/
-            p -> decl_specs = BIT_OPENMP; /*OMP*/
-        } /*OMP*/
-	set_blobs(p, pred_bfnd, SAME_GROUP);
-        cur_blob = pred_bfnd->entry.Template.bl_ptr2
-	  = make_blob(fi,BFNULL, BLNULL);
-}
-
-void
-make_elsewhere(s)
-     PTR_SYMB s; /*15.02.03*/
-{
-	void execerr(), set_blobs();
-	PTR_BFND p;
-
-	if (pred_bfnd->variant != WHERE_BLOCK_STMT  && pred_bfnd->variant != ELSEWH_NODE)
-	   err("ELSEWHERE out of place", 291 );
-	p = get_bfnd(fi,CONTROL_END, s, LLNULL, LLNULL, LLNULL);
-        if (is_openmp_stmt) { /*OMP*/
-            is_openmp_stmt = 0; /*OMP*/
-            p -> decl_specs = BIT_OPENMP; /*OMP*/
-        } /*OMP*/
-	set_blobs(p, pred_bfnd, SAME_GROUP);
-        cur_blob = pred_bfnd->entry.Template.bl_ptr2
-	  = make_blob(fi,BFNULL, BLNULL);
-}
-
-
-/*
- * make_endblock sets up the statement list to the proper branch according
- * to the control stack's status and then pop the control stack.
- */
-void
-make_endblock(p) 
-PTR_BFND p;
-{
-	PTR_BFND past_pred;
-	PTR_BLOB q;
-	void set_blobs();
-
-	if ((pred_bfnd==BFNULL) || (pred_bfnd->control_parent==BFNULL))
-	   fatalstr("Illegal end of block",(char *)NULL,258);
-	if (cur_blob->ref==BFNULL) { /* empty block body */
-/*	  pred_bfnd->entry.Template.bl_ptr1 = BLNULL; */
-	  cur_blob->ref = p;
-        }
-	else
-	   if (p) set_blobs(p, pred_bfnd, SAME_GROUP);
-	past_pred = pred_bfnd;
-	pred_bfnd = pred_bfnd->control_parent;
-	if (pred_bfnd->variant == GLOBAL) parstate = OUTSIDE;
-	q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	cur_blob = (q && (q->ref == past_pred)) ?
-	             q
-		    :follow_blob(pred_bfnd->entry.Template.bl_ptr2);
-}
-
-
-void
-make_endif(s) 
-PTR_SYMB s;  /*podd 3.02.03*/
-{      
-	PTR_BFND p, past_pred;
-	PTR_BLOB q;
-	void set_blobs();
-
-	if ((pred_bfnd==BFNULL) || (pred_bfnd->control_parent==BFNULL)
-	     || ((pred_bfnd->variant != IF_NODE) &&
-	        (pred_bfnd->variant != ELSEIF_NODE))) {
-		fatalstr("Illegal END IF", (char *)NULL, 260);
-	}
-	if ((!cur_blob->ref) || (cur_blob->ref->variant != CONTROL_END)) {
-	   p = get_bfnd(fi,CONTROL_END, s, LLNULL, LLNULL, LLNULL);
-	   p = get_bfnd(fi,CONTROL_END, s, LLNULL, LLNULL, LLNULL);
-           if (is_openmp_stmt) { /*OMP*/
-              is_openmp_stmt = 0; /*OMP*/
-              p -> decl_specs = BIT_OPENMP; /*OMP*/
-           } /*OMP*/
-           /*change by podd*/
-	   if(thislabel){
-              thislabel->statbody = p;
-              thislabel->labtype = LABEXEC;
-              p->label = thislabel;   
-           }                   
-	   set_blobs(p, pred_bfnd, SAME_GROUP);
-	}
-	while (pred_bfnd->variant == ELSEIF_NODE)
-	  pred_bfnd = pred_bfnd->control_parent;
-	past_pred = pred_bfnd;
-	pred_bfnd = pred_bfnd->control_parent;
-	q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	cur_blob = (q && (q->ref == past_pred)) ?
-	             q
-		    :follow_blob(pred_bfnd->entry.Template.bl_ptr2);
-/*	cur_blob = follow_blob(pred_bfnd->entry.Template.bl_ptr1);*/
-}
-
-void
-make_endwhere(s) 
-     PTR_SYMB s;  /*15.02.03*/
-{
-	PTR_BFND p, past_pred;
-	PTR_BLOB q;
-	void set_blobs();
-
-	if ((pred_bfnd==BFNULL) || (pred_bfnd->control_parent==BFNULL)
-	     || ((pred_bfnd->variant != WHERE_BLOCK_STMT) &&
-	        (pred_bfnd->variant != ELSEWH_NODE))) {
-		fatalstr("Illegal ENDWHERE", (char *)NULL, 290);
-	}
-	if ((!cur_blob->ref) || (cur_blob->ref->variant != CONTROL_END)) {
-	   p = get_bfnd(fi,CONTROL_END, s, LLNULL, LLNULL, LLNULL);
-           if (is_openmp_stmt) { /*OMP*/
-              is_openmp_stmt = 0; /*OMP*/
-              p -> decl_specs = BIT_OPENMP; /*OMP*/
-           } /*OMP*/
-	   set_blobs(p, pred_bfnd, SAME_GROUP);
-           /*change by podd*/
-	   if(thislabel){
-              thislabel->statbody = p;
-              thislabel->labtype = LABEXEC;
-              p->label = thislabel;   
-           }                   
-	}
-	/* pred_bfnd = pred_bfnd->control_parent;*/
-	/* cur_blob = follow_blob(pred_bfnd->entry.Template.bl_ptr1);*/
-	while (pred_bfnd->variant == ELSEWH_NODE)
-	  pred_bfnd = pred_bfnd->control_parent;
-	past_pred = pred_bfnd;
-	pred_bfnd = pred_bfnd->control_parent;
-	q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	cur_blob = (q && (q->ref == past_pred)) ?
-	             q
-		    :follow_blob(pred_bfnd->entry.Template.bl_ptr2);
-}
-
-void
-make_endforall(s) 
-     PTR_SYMB s; 
-{
-	PTR_BFND p, past_pred;
-	PTR_BLOB q;
-	void set_blobs();
-
-	if ((pred_bfnd==BFNULL) || (pred_bfnd->control_parent==BFNULL)
-	     || (pred_bfnd->variant != FORALL_NODE)) {
-		fatalstr("Illegal ENDFORALL", (char *)NULL, 289);
-	}
-	if ((!cur_blob->ref) || (cur_blob->ref->variant != CONTROL_END)) {
-	   p = get_bfnd(fi,CONTROL_END, s, LLNULL, LLNULL, LLNULL);
-           if (is_openmp_stmt) { /*OMP*/
-              is_openmp_stmt = 0; /*OMP*/
-              p -> decl_specs = BIT_OPENMP; /*OMP*/
-           } /*OMP*/
-	   set_blobs(p, pred_bfnd, SAME_GROUP);
-           /*change by podd*/
-	   if(thislabel){
-              thislabel->statbody = p;
-              thislabel->labtype = LABEXEC;
-              p->label = thislabel;   
-           }                   
-	}
-	past_pred = pred_bfnd;
-	pred_bfnd = pred_bfnd->control_parent;
-	q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	cur_blob = (q && (q->ref == past_pred)) ?
-	             q
-		    :follow_blob(pred_bfnd->entry.Template.bl_ptr2);
-}
-
-void
-make_endselect(s) 
-     PTR_SYMB s; 
-{
-	PTR_BFND p, past_pred;
-	PTR_BLOB q;
-	void set_blobs();
-
-	if ((pred_bfnd==BFNULL) || (pred_bfnd->control_parent==BFNULL)
-	     || (pred_bfnd->variant != SWITCH_NODE)) {
-		fatalstr("Illegal ENDSELECT", (char *)NULL, 286);
-	}
-	if ((!cur_blob->ref) || (cur_blob->ref->variant != CONTROL_END)) {
-	   p = get_bfnd(fi,CONTROL_END, s, LLNULL, LLNULL, LLNULL);
-           if (is_openmp_stmt) { /*OMP*/
-              is_openmp_stmt = 0; /*OMP*/
-              p -> decl_specs = BIT_OPENMP; /*OMP*/
-           } /*OMP*/
-	   set_blobs(p, pred_bfnd, SAME_GROUP);
-           
-	   if(thislabel){
-              thislabel->statbody = p;
-              thislabel->labtype = LABEXEC;
-              p->label = thislabel;   
-           }                   
-	}
-	past_pred = pred_bfnd;
-	pred_bfnd = pred_bfnd->control_parent;
-	q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	cur_blob = (q && (q->ref == past_pred)) ?
-	             q
-		    :follow_blob(pred_bfnd->entry.Template.bl_ptr2);
-}
-
-
-void
-make_endextend() 
-{
-	PTR_BFND p;
-	void set_blobs();
-
-	if ((pred_bfnd==BFNULL) || (pred_bfnd->control_parent==BFNULL)
-	     || ((pred_bfnd->variant != PDO_NODE) &&
-	        (pred_bfnd->variant != PSECTIONS_NODE))) {
-/*		fatalstr("Illegal end extend[ed] statement\n", (char *)NULL);*/
-	}
-	if ((!cur_blob->ref) || (cur_blob->ref->variant != CONTROL_END)) {
-	   p = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-           if (is_openmp_stmt) { /*OMP*/
-              is_openmp_stmt = 0; /*OMP*/
-              p -> decl_specs = BIT_OPENMP; /*OMP*/
-           } /*OMP*/
-	   set_blobs(p, pred_bfnd, SAME_GROUP);
-	}
-	pred_bfnd = pred_bfnd->control_parent;
-	cur_blob = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	if (cur_blob->ref->variant == CONTROL_END)
-	cur_blob = follow_blob(pred_bfnd->entry.Template.bl_ptr2);
-}
-
-/* 18th, Dec. 90 */
-/* modified to take care of PCF FORTRAN's variety of END statements */
-
-PTR_BFND
-make_enddoall()
-{
-        PTR_BFND p = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	PTR_BLOB q;
-        if (is_openmp_stmt) { /*OMP*/
-           is_openmp_stmt = 0; /*OMP*/
-           p -> decl_specs = BIT_OPENMP; /*OMP*/
-        } /*OMP*/
-	if ((!pred_bfnd) ||
-	    ((pred_bfnd->variant != CDOALL_NODE) &&
-	     (pred_bfnd->variant != SDOALL_NODE) &&
-	     (pred_bfnd->variant != DOACROSS_NODE) &&
-	     (pred_bfnd->variant != CDOACROSS_NODE) &&
-             (pred_bfnd->variant != PARDO_NODE) &&
-             (pred_bfnd->variant != PROCESS_DO_STAT) &&
-             (pred_bfnd->variant != PDO_NODE)))
-	   execerr("enddoall statement out of place", (char *)NULL);
-	q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	if (q != cur_blob) {
-	   pred_bfnd->entry.Template.bl_ptr1 =
-                 pred_bfnd->entry.Template.bl_ptr2;
-	   pred_bfnd->entry.Template.bl_ptr2 = BLNULL;
-	}
-	return p;
-}
-
-PTR_BFND
-make_endprocesses()
-{
-        PTR_BFND p = get_bfnd(fi,PROCESSES_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	PTR_BLOB q;
-
-	if ((!pred_bfnd) || (pred_bfnd->variant != PROCESSES_STAT))
-	   execerr("endprocesses statement out of place", (char *)NULL);
-	q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	if (q != cur_blob) {
-	   pred_bfnd->entry.Template.bl_ptr1 =
-                 pred_bfnd->entry.Template.bl_ptr2;
-	   pred_bfnd->entry.Template.bl_ptr2 = BLNULL;
-	}
-	return p;
-}
-
-
-void
-make_loop()
-{
-	PTR_BFND p;
-	void set_blobs();
-
-	if ((pred_bfnd->variant != CDOALL_NODE) &&
-	    (pred_bfnd->variant != SDOALL_NODE) &&
-	    (pred_bfnd->variant != DOACROSS_NODE) &&
-	    (pred_bfnd->variant != CDOACROSS_NODE))
-	  execerr("loop statement out of place", (char *)NULL);
-	p = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-        if (is_openmp_stmt) { /*OMP*/
-           is_openmp_stmt = 0; /*OMP*/
-           p -> decl_specs = BIT_OPENMP; /*OMP*/
-        } /*OMP*/
-	set_blobs(p, pred_bfnd, SAME_GROUP);
-	cur_blob = pred_bfnd->entry.Template.bl_ptr1
-	  = make_blob(fi,(PTR_BFND) NULL, (PTR_BLOB) NULL);
-}
-
-
-/*
- * Setup of logical IF statement
- */
-PTR_BFND
-make_logif(if_stmt, body)
-	PTR_BFND if_stmt, body;
-{
-        /*PTR_BFND temp;*/
-        PTR_BLOB new_blob;
-	void set_blobs(), make_prog_header();
-
-/*
-	if (expr->type->variant != T_BOOL) {
-		err("non-logical expression in IF statement");
-		expr = LLNULL;
-	} 
-	if (pred_bfnd->variant == GLOBAL)
-	  make_prog_header();
-	temp = get_bfnd(fi,LOGIF_NODE, SMNULL, expr, LLNULL, LLNULL);
-	set_blobs(temp, pred_bfnd, SAME_GROUP);
-*/
-	new_blob = make_blob(fi,body, BLNULL);
-	if_stmt->entry.Template.bl_ptr1 = new_blob;
-	body->control_parent = if_stmt;
-	return (if_stmt);
-}
-
-void
-make_extend(s)
-     PTR_SYMB s;
-{
-	void execerr(), set_blobs();
-	PTR_BFND p, past_pred;
-	PTR_BLOB q;
-       if ((pred_bfnd==BFNULL) || (pred_bfnd->control_parent==BFNULL)
-	     || ((pred_bfnd->variant != FOR_NODE) &&
-	         (pred_bfnd->variant != WHILE_NODE))) {
-		fatalstr("Illegal END DO",(char *)NULL, 259);
-	}
-	p = get_bfnd(fi,CONTROL_END, s, LLNULL, LLNULL, LLNULL);
-	if (is_openmp_stmt) { /*OMP*/
-		is_openmp_stmt = 0;  /*OMP*/
-		p -> decl_specs = BIT_OPENMP; /*OMP*/
-	} /*OMP*/
-           /*change by podd*/
-	   if(thislabel){
-              thislabel->statbody = p;
-              thislabel->labtype = LABEXEC;
-              p->label = thislabel;   
-           }                   
-	set_blobs(p, pred_bfnd, SAME_GROUP);
-	if ((pred_bfnd->variant == PDO_NODE) &&
-            (pred_bfnd->index == EXTEND_NODE))
-	{
-	     cur_blob = pred_bfnd->entry.Template.bl_ptr2
-		                          = make_blob(fi,BFNULL, BLNULL);
-        }
-	else 
-	{
-	     past_pred = pred_bfnd;
-	     pred_bfnd = pred_bfnd->control_parent;
-	     q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	     cur_blob = (q && (q->ref == past_pred)) ?
-		         q : follow_blob(pred_bfnd->entry.Template.bl_ptr2);
-	}
-}
-
-void
-make_section_extend()
-{
-	void execerr(), set_blobs();
-	PTR_BFND p, past_pred, set_stat_list();
-	PTR_BLOB q;
-	
-   {
-	/* mark end of section */
-	p = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	set_stat_list(pred_bfnd, p);
-	/* mark end of psections's sections */
-	p = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	set_blobs(p, pred_bfnd, SAME_GROUP);
-	/* prepare for extend statements of psections in case */
-	if ((pred_bfnd->variant == PSECTIONS_NODE) && 
-            (pred_bfnd->index == EXTEND_NODE))
-	{
-	     cur_blob = pred_bfnd->entry.Template.bl_ptr2
-		                          = make_blob(fi,BFNULL, BLNULL);
-        }
-	else 
-	{
-	     past_pred = pred_bfnd;
-	     pred_bfnd = pred_bfnd->control_parent;
-	     q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	     cur_blob = (q && (q->ref == past_pred)) ?
-		         q : follow_blob(pred_bfnd->entry.Template.bl_ptr2);
-	}
-   }
-}
-
-void
-make_section(section_name, wait_list)
-PTR_LLND section_name, wait_list;
-{
-	void execerr(), set_blobs();
-	PTR_BFND p, set_stat_list();
-	
-   {
-	if (pred_bfnd->variant == SECTION_NODE)
-	{
-	     p = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	     set_stat_list(pred_bfnd, p);
-	}
-	if ((pred_bfnd->variant == PSECTIONS_NODE) ||
-            (pred_bfnd->variant == PARSECTIONS_NODE))
-	{
-        p = get_bfnd(fi,SECTION_NODE, SMNULL, section_name, wait_list, LLNULL);
-	set_stat_list(pred_bfnd, p);
-/*	pred_bfnd = p;*/
-	}
-	else printf("stat.c:make_section: SECTION NODE's attachment point is not a PSECTION NODE\n"); 
-	
-   }
-}
-
-/* 
- * procedure_call gets an id and parameter list.
- * It handles procedures not seen yet
- */
-PTR_SYMB
-procedure_call(entry)
-PTR_HASH entry;
-{
-	register PTR_SYMB symb_ptr;
-
-	entry = correct_symtab(entry, PROCEDURE_NAME);
-	for (symb_ptr = entry->id_attr; symb_ptr; symb_ptr = symb_ptr->outer)
-		if (symb_ptr->variant == PROCEDURE_NAME)
-			return (symb_ptr);
-
-	symb_ptr = get_proc_symbol(entry);
-	symb_ptr->variant = PROCEDURE_NAME;
-	symb_ptr->type = global_default;
-	symb_ptr->entry.proc_decl.seen = NO;
-	return (symb_ptr);
-}
-
-
-/*
- * proceduer match_parameters gets a proc_id and param_list and performs type
- * checking
- */
-void
-match_parameters(proc_id, param_list)
-	PTR_SYMB proc_id;
-	PTR_LLND param_list;
-{
-	PTR_LLND new;
-	void err();
-
-	new = make_llnd(fi,FUNC_CALL, param_list, LLNULL, proc_id);
-	if (proc_id->entry.proc_decl.seen == YES)
-		if (!chk_params(proc_id->entry.proc_decl.in_list, param_list))
-		  /*	err(" Parameter mismatch ")*/ /*podd*/ ;
-
- /*
-  * if procedure declaration not seen yet and otherwise too add this call to
-  * the call list 
-  */
-	new->entry.proc.next_call = proc_id->entry.proc_decl.call_list;
-	proc_id->entry.proc_decl.call_list = new;
-}
-
-
-/*
- * chk_params checks formals against actuals -- to be added later
- */
-int
-chk_params(formal, actual)
-	PTR_SYMB formal;
-	PTR_LLND actual;
-{
-	return (1);
-}
-
-
-/*
- * set_stat_list  -- links together an old BIF node list with a new one
- *
- * input:
- *	  old_list - old BIF node list
- *	  stat	   - new BIF node
- *
- * output:
- *	  a BIF node list that links these two together
- */
-PTR_BFND
-set_stat_list(old_list, stat)
-	PTR_BFND old_list, stat;
-{
-	PTR_BFND ret=BFNULL;
-	BOOL    start_new_group = NO;
-	void fatal(), set_blobs(), make_prog_header(), close_groups();
-       
-	if (!stat) return (old_list);
-        /* The proper place for this piece of code is in cur_scope(). */
-	/* if (pred_bfnd->variant == GLOBAL)
-	    make_prog_header(); */
-	switch (stat->variant) {
- 	    case (IF_NODE):
-	    case (LOGIF_NODE):
-            case (FORALL_STAT):
-	          close_groups();
-	          return (old_list);
-  	    /* start of group */
- 
-            case (INTERFACE_STMT):
-            case (INTERFACE_OPERATOR):
-            case (INTERFACE_ASSIGNMENT):
-            case (STRUCT_DECL):
-	    case (CDOALL_NODE): 
-	    case (SDOALL_NODE):
-	    case (DOACROSS_NODE):
-	    case (CDOACROSS_NODE):
-	    case (FOR_NODE):
-	    case (PROCESS_DO_STAT):
-	    case (WHILE_NODE):
-	    case (FORALL_NODE):
-            case (PARDO_NODE):
-            case (PROCESSES_STAT):
-	    case (PDO_NODE):
-	    case (PARREGION_NODE):
-	    case (PSECTIONS_NODE):
-            case (PARSECTIONS_NODE):
-	    case (SECTION_NODE):
-            case (CRITSECTION_NODE):
-            case (SINGLEPROCESS_NODE):
-	    case (SWITCH_NODE):
-	    case (WHERE_BLOCK_STMT):
-	    case (OMP_SECTION_DIR): /*OMP*/
-	    case (OMP_PARALLEL_DIR): /*OMP*/
-	    case (OMP_SINGLE_DIR): /*OMP*/
-	    case (OMP_MASTER_DIR): /*OMP*/
-	    case (OMP_CRITICAL_DIR): /*OMP*/
-	    case (OMP_ORDERED_DIR): /*OMP*/
-            case (OMP_WORKSHARE_DIR): /*OMP*/
-	    case (OMP_PARALLEL_SECTIONS_DIR): /*OMP*/
-	    case (OMP_PARALLEL_WORKSHARE_DIR): /*OMP*/
-          /*  case (ACC_REGION_DIR): */   /*ACC*/
-          /*  case (ACC_DATA_REGION_DIR): */   /*ACC*/
-	        start_new_group = NEW_GROUP1;
-	    /* NO_OP nodes */
-	    case (VAR_DECL):
-	    case (PARAM_DECL):
-	    case (COMM_STAT):
-	    case (NAMELIST_STAT):
-	    case (PROS_COMM):
-	    case (DIM_STAT):
-            case (HPF_TEMPLATE_STAT):
-            case (HPF_PROCESSORS_STAT):
-	    case (DVM_DISTRIBUTE_DIR):
-	    case (DVM_ALIGN_DIR):
-	    case (DVM_DYNAMIC_DIR):
-            case (DVM_SHADOW_DIR):
-	    case (DVM_VAR_DECL):
-            case (DVM_POINTER_DIR):
-            case (DVM_HEAP_DIR):
-	    case (DVM_INHERIT_DIR):
-	    case (DVM_TASK_DIR):
-            case (DVM_REDUCTION_GROUP_DIR):
-	    case (DVM_REMOTE_GROUP_DIR):
-            case (DVM_INDIRECT_GROUP_DIR):
-            case (DVM_CONSISTENT_GROUP_DIR):
-            case (DVM_CONSISTENT_DIR):
-            case (DVM_ASYNCID_DIR):
-            case (ACC_ROUTINE_DIR):
-            case (ACC_DECLARE_DIR):
-	    case (DATA_DECL):
-	    case (EXTERN_STAT):
-	    case (INTRIN_STAT):
-	    case (EQUI_STAT):
-	    case (IMPL_DECL):
-	    case (SAVE_DECL):
-	    case (INCLUDE_STAT):
-	    case (ATTR_DECL):
-	    case (INPORT_DECL):
-	    case (OUTPORT_DECL):
-            case (ALLOCATABLE_STMT):
-	    case (SEQUENCE_STMT):
-            case (PRIVATE_STMT):
-            case (PUBLIC_STMT):
-            case (OPTIONAL_STMT):
-            case (POINTER_STMT):
-            case (TARGET_STMT):
-	    case (STATIC_STMT):
-	    /* not an assignment stat */
-	    case (GOTO_NODE):
-	    case (ASSGOTO_NODE):
-	    case (COMGOTO_NODE):
-	    case (ARITHIF_NODE):
-	    case (LOOP_NODE):
-	    case (EXIT_NODE):
-            case (CONT_STAT):
-	    case (RETURN_STAT):
-	    case (STOP_STAT):
-	    case (PAUSE_NODE):
-	    case (CASE_NODE):
-	    case (DEFAULT_NODE):
-            /* other */
-	    case (ASSIGN_STAT):
-	    case (STMTFN_STAT):
-	    case (SUM_ACC):
-	    case (MULT_ACC):
-	    case (MAX_ACC):
-	    case (MIN_ACC):
-	    case (CAT_ACC):
-	    case (OR_ACC):
-	    case (AND_ACC):
-	    case (READ_STAT):
-	    case (WRITE_STAT):
-	    case (PRINT_STAT):
-	    case (BACKSPACE_STAT):
-	    case (REWIND_STAT):
-	    case (ENDFILE_STAT):
-	    case (INQUIRE_STAT):
-	    case (OPEN_STAT):
-	    case (CLOSE_STAT):
-	    case (OTHERIO_STAT):
-	    case (FORMAT_STAT):
-	    case (PROC_STAT):
-            case (PROS_STAT):
-            case (PROS_STAT_LCTN):
-            case (PROS_STAT_SUBM):
-	    case (ASSLAB_STAT):
-            case (LOCK_NODE):
-	    case (UNLOCK_NODE):
-            case (POST_NODE):
-	    case (WAIT_NODE):
-	    case (CLEAR_NODE):
-            case (POSTSEQ_NODE):
-	    case (WAITSEQ_NODE):
-	    case (SETSEQ_NODE):
-	    case (PRIVATE_NODE):
-            case (GUARDS_NODE):
-	    case (CYCLE_STMT):
-	    case (EXIT_STMT):
-	    case (CONTAINS_STMT):
-	    case (WHERE_NODE):
-	    case (USE_STMT):
-	    case (MODULE_PROC_STMT):
-	    case (OVERLOADED_ASSIGN_STAT): 
-	    case (POINTER_ASSIGN_STAT):
-	    case (OVERLOADED_PROC_STAT):
-            case (INTENT_STMT):
-	    case (CHANNEL_STAT):
-	    case (MERGER_STAT):
-            case (DVM_REDISTRIBUTE_DIR):
-            case (DVM_PARALLEL_ON_DIR):
-            case (HPF_INDEPENDENT_DIR):
-            case (DVM_SHADOW_GROUP_DIR):
-            case (DVM_SHADOW_START_DIR):
-            case (DVM_SHADOW_WAIT_DIR):
-            case (DVM_REDUCTION_START_DIR):
-            case (DVM_REDUCTION_WAIT_DIR):
-            case (DVM_CONSISTENT_START_DIR):
-            case (DVM_CONSISTENT_WAIT_DIR):
-	    case (DVM_REALIGN_DIR):
-	    case (DVM_NEW_VALUE_DIR):
-	    case (DVM_REMOTE_ACCESS_DIR):
-            case (DVM_TASK_REGION_DIR):
-            case (DVM_END_TASK_REGION_DIR):
-            case (DVM_ON_DIR):
-            case (DVM_END_ON_DIR):
-            case (DVM_MAP_DIR):
-            case (DVM_PARALLEL_TASK_DIR):
-            case (DVM_RESET_DIR):
-            case (DVM_PREFETCH_DIR):
-            case (DVM_INDIRECT_ACCESS_DIR):
-            case (DVM_OWN_DIR):
-            case (DVM_INTERVAL_DIR):
-            case (DVM_ENDINTERVAL_DIR):
-            case (DVM_EXIT_INTERVAL_DIR):
-            case (DVM_DEBUG_DIR):
-            case (DVM_ENDDEBUG_DIR):
-            case (DVM_TRACEON_DIR):  
-            case (DVM_TRACEOFF_DIR):
-            case (DVM_BARRIER_DIR):
-            case (DVM_CHECK_DIR):
-            case (DVM_ASYNCHRONOUS_DIR):
-            case (DVM_ENDASYNCHRONOUS_DIR):
-            case (DVM_ASYNCWAIT_DIR):
-            case (DVM_F90_DIR):
-            case (DVM_IO_MODE_DIR):
-            case (DVM_CP_CREATE_DIR):
-            case (DVM_CP_LOAD_DIR):
-            case (DVM_CP_SAVE_DIR):
-            case (DVM_CP_WAIT_DIR):
-            case (DVM_LOCALIZE_DIR):
-            case (DVM_SHADOW_ADD_DIR):
-	    case (MOVE_PORT):
-            case (DVM_TEMPLATE_CREATE_DIR):
-            case (DVM_TEMPLATE_DELETE_DIR):
-	    case (SEND_STAT):
-	    case (RECEIVE_STAT):
-	    case (ENDCHANNEL_STAT):
-	    case (PROBE_STAT):
-	    case (ALLOCATE_STMT):
-	    case (DEALLOCATE_STMT):
-	    case (NULLIFY_STMT):
-	    case (OMP_DO_DIR): /*OMP*/
-	    case (OMP_END_DO_DIR): /*OMP*/
-	    case (OMP_PARALLEL_DO_DIR): /*OMP*/
-	    case (OMP_END_PARALLEL_DO_DIR): /*OMP*/
-	    case (OMP_BARRIER_DIR): /*OMP*/
-	    case (OMP_ATOMIC_DIR): /*OMP*/
-	    case (OMP_FLUSH_DIR): /*OMP*/
-	    case (OMP_THREADPRIVATE_DIR): /*OMP*/
-	    case (OMP_ONETHREAD_DIR): /*OMP*/
-            case (ACC_REGION_DIR):             /*ACC*/
-            case (ACC_END_REGION_DIR):         /*ACC*/
-            case (ACC_CHECKSECTION_DIR):       /*ACC*/
-            case (ACC_END_CHECKSECTION_DIR):   /*ACC*/
-            case (ACC_GET_ACTUAL_DIR):         /*ACC*/ 
-            case (ACC_ACTUAL_DIR):             /*ACC*/
-            case (SPF_ANALYSIS_DIR):           /*SPF*/
-            case (SPF_PARALLEL_DIR):           /*SPF*/
-            case (SPF_TRANSFORM_DIR):          /*SPF*/ 
-            case (SPF_PARALLEL_REG_DIR):       /*SPF*/
-            case (SPF_END_PARALLEL_REG_DIR):   /*SPF*/ 
-            case (SPF_CHECKPOINT_DIR):         /*SPF*/ 
-	      if (start_new_group) {
-		if (stat->variant == CDOALL_NODE
-		    || stat->variant == SDOALL_NODE
-		    || stat->variant == DOACROSS_NODE
-		    || stat->variant == CDOACROSS_NODE)
-		  set_blobs(stat, pred_bfnd, NEW_GROUP2);
-		else
-		  set_blobs(stat, pred_bfnd, NEW_GROUP1);
-	      } else
-		  set_blobs(stat, pred_bfnd, SAME_GROUP);
-		break;
-	    case (CONTROL_END):
-	    case (PROCESSES_END):
-           /* case (ACC_END_REGION_DIR): */   /*ACC*/
-	    case (OMP_END_PARALLEL_DIR): /*OMP*/
-	    case (OMP_END_SINGLE_DIR): /*OMP*/
-	    case (OMP_END_MASTER_DIR): /*OMP*/
-	    case (OMP_END_CRITICAL_DIR): /*OMP*/
-	    case (OMP_END_ORDERED_DIR): /*OMP*/
-	    case (OMP_END_PARALLEL_WORKSHARE_DIR): /*OMP*/
-	    case (OMP_END_WORKSHARE_DIR): /*OMP*/
-	    case (OMP_END_PARALLEL_SECTIONS_DIR): /*OMP*/
-	    case (OMP_END_SECTIONS_DIR): /*OMP*/ {
-	        make_endblock(stat);
-		break;
-	    }
-	    default:
-		err("Compiler bug (stat.c)", 0);
-		ret = old_list;
-	}
-     
-	close_groups();
-	return (ret);
-}
-
-
-void
-close_groups()
-{
-     PTR_BFND past_pred;
-     PTR_BLOB q;
-     
-     while (end_group > 0) {
-	  past_pred = pred_bfnd;
-	  pred_bfnd = pred_bfnd->control_parent;
-	  q = follow_blob(pred_bfnd->entry.Template.bl_ptr1);
-	  cur_blob = (q && (q->ref == past_pred)) ?
-	       q : follow_blob(pred_bfnd->entry.Template.bl_ptr2); 
-/*	  cur_blob = follow_blob(pred_bfnd->entry.Template.bl_ptr1); */
-	  --end_group;
-     }
-}
-
-
-/*
- *  Makes a PROG_HEDR statement for programs which does not start with
- *  a program name.
- */ 
-void
-make_prog_header()
-{/*never used function*/
-     PTR_BFND first_bfnd;
-     /*PTR_BLOB b;*/
-     void set_blobs();
-     first_bfnd = BFNULL;
-     parstate = INSIDE;
-     set_blobs(first_bfnd, global_bfnd, NEW_GROUP1);
-}
-
-
-
-PTR_SYMB
-proc_decl_init(entry, type)
-PTR_HASH entry;
-int type;
-{
-	PTR_SYMB symb_ptr;
-
-	undeftype = NO;
-	entry = correct_symtab(entry, type);
-	mod_offset = yylineno - 1;
-	for (symb_ptr = head_symb; symb_ptr; symb_ptr = symb_ptr->thread)
-		if ((strcmp(symb_ptr->ident, entry->ident) == 0) &&
-		    (symb_ptr->variant == PROCEDURE_NAME))
-			break;
-	if (!symb_ptr)
-		symb_ptr = install_entry(entry, SOFT);
-	if (type == FUNCTION_NAME)
-	   symb_ptr->type = (vartype == global_default) ?
-	                        (undeftype ? global_unknown
-			               :impltype[*entry->ident - 'a'])
-			          : vartype;
-
-	symb_ptr->variant = type;
-	symb_ptr->scope = global_bfnd;
-	symb_ptr->entry.proc_decl.seen = YES;
-	return (symb_ptr);
-}
-
-
-
-/*
- * End of declaration section of procedure.  Allocate storage.
- */
-void
-enddcl()
-{ PTR_BFND scope;
- PTR_SYMB fname,res;
-	parstate = INEXEC;
-        /*16.03.03*/
-        scope=cur_scope();
-        if(scope->variant == FUNC_HEDR && scope->entry.Template.ll_ptr1){ /*current scope is function header with RESULT clause*/
-          fname = scope->entry.Template.symbol;
-          res = scope->entry.Template.ll_ptr1->entry.Template.symbol;
-          fname->type = res->type; /* characteristics of result identifier are set on function name*/
-          fname->attr =fname->attr | res->attr;
-        }  
-/*
-	docommon();
-	doequiv();
-	docomleng();
-*/
-}
-
-/*
- * Start a new procedure
- */
-void
-newprog()
-{
-	void execerr();
-
-	mod_offset = yylineno - 1;
-	/* if (parstate != OUTSIDE)
-		execerr("missing end statement", (char *)NULL); */	
-        if (parstate == OUTSIDE) {
-	  setimpl(global_float, 'a', 'z');
-	  setimpl(global_int, 'i', 'n');
-        } 
-        parstate = INSIDE;
-
-}
-
-
-/*
- * Main program or Block data
- */
-void
-startproc(prgname, class)
-	PTR_SYMB prgname;
-	int     class;
-{
-}
-
-
-/*
- *  pop_lab either marks all labels in inner blocks unreachable
- *    or moves all labels referred to in inner blocks out a level
- */ /*
-void
-pop_lab()
-{
-	register PTR_LABEL lp;
-
-	for (lp = head_label; lp; lp = lp->next)
-		if (lp->labdefined) {
-*/		/* mark all labels in inner blocks unreachable */
-/*			if (lp->blklevel > blklevel)
-				lp->labinacc = YES;
-		} else if (lp->blklevel > blklevel) {
-*/		/* move all labels referred to in inner blocks out a level */
-/*			lp->blklevel = blklevel;
-		}
-}
-*/
-
-/*
- * make_do handles the DO statement.
- *
- * input:
- *	  label - the label of the last statement of the DO loop
- *	  spec  - list of low level nodes specifying the starting,
- *		  value, end value, and increment of the loop
- *
- * output:
- *	  returns a BIF node which contains the necessary information
- *	  of a loop header
- */
-PTR_BFND
-make_do(type, label, symbol, start, end, stride)
-        int      type;
-	PTR_LABEL label;
-	PTR_SYMB symbol;
-        PTR_LLND start, end, stride;
-{
-       
-	PTR_BFND bfnd;
-	PTR_LLND ddot;
-
-        if (symbol != SMNULL)
-	  symbol->dovar = 1;
-        if(type == FOR_NODE)
-	  ddot = make_llnd(fi, DDOT, start, end, SMNULL);
-        else
-          ddot = start;
-	bfnd = get_bfnd(fi, type, symbol, ddot, stride, LLNULL);
-	bfnd->entry.for_node.doend = label;
-	return (bfnd);
-}
-
-/* Assuming where_cond is unused in FORTRAN */
-PTR_BFND
-make_pardo(type, label, symbol, start, end, stride, qualities)
-        int      type;
-	PTR_LABEL label;
-	PTR_SYMB symbol;
-        PTR_LLND start, end, stride, qualities;
-{
-       
-	PTR_BFND bfnd;
-	PTR_LLND ddot;
-
-	ddot = make_llnd(fi, DDOT, start, end, SMNULL);
-	bfnd = get_bfnd(fi, type, symbol, ddot, stride, LLNULL);
-	bfnd->entry.for_node.doend = label;
-	bfnd->entry.for_node.where_cond = qualities;
-	return (bfnd);
-}
-
-PTR_BFND
-make_processdo(type, label, symbol, start, end, stride)
-        int      type;
-	PTR_LABEL label;
-	PTR_SYMB symbol;
-        PTR_LLND start, end, stride;
-{
-       
-	PTR_BFND bfnd;
-	PTR_LLND ddot;
-
-        symbol->dovar = 1;
-	ddot = make_llnd(fi, DDOT, start, end, SMNULL);
-	bfnd = get_bfnd(fi, type, symbol, ddot, stride, LLNULL);
-	bfnd->entry.for_node.doend = label;
-	return (bfnd);
-}
-
-PTR_BFND
-make_processes()
-{
-	PTR_BFND p;
-	void make_prog_header();
-
-	if (pred_bfnd->variant == GLOBAL)
-	  make_prog_header();
-
-	p = get_bfnd(fi, PROCESSES_STAT, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
-
-void
-set_blobs(stat, parent, new_group)
-PTR_BFND stat, parent;
-int new_group;
-{
-	if (((new_group == NEW_GROUP1) && stat->entry.Template.bl_ptr1) ||
-	    ((new_group == NEW_GROUP2) && stat->entry.Template.bl_ptr2))
-	  return;
-	stat->control_parent = parent;
-	if (!cur_blob) {
-	  /*(void)fprintf(stderr, "cur_blob is null !\n");*/ /*podd*/
-           fatalstr("Illegal program structure (set_blobs)",(char *)NULL,342);
-	   return;
-	}
-	if (cur_blob->ref) {
-		cur_blob->next = make_blob(fi,stat, BLNULL);
-		cur_blob = cur_blob->next;
-	} else 
-	  cur_blob->ref = stat;
-	if (new_group) {
-		pred_bfnd = stat;
-		cur_blob = make_blob(fi,BFNULL, BLNULL);
-		if (new_group == NEW_GROUP1)
-		   stat->entry.Template.bl_ptr1 = cur_blob;
-		else
-		   stat->entry.Template.bl_ptr2 = cur_blob;
-	}
-}
-
-PTR_LABEL make_label_node(fi, l)
-   	PTR_FILE fi;
-	long	 l;
-   {    PTR_LABEL new_lab;
-        PTR_BFND  this_scope;
-        this_scope = cur_scope();
-	for (new_lab = fi->head_lab; new_lab; new_lab = new_lab->next)
-		if (new_lab->stateno == l && new_lab->scope == this_scope)
-			return (new_lab);
-        new_lab =make_label(fi, l);
-        if(new_lab->stateno == 0)
-           err("Label out of range",38);
-        new_lab -> scope = this_scope;
-        return (new_lab);
-   }
-
-int is_interface_stat(st)
-     PTR_BFND st;
-{if(st->variant == INTERFACE_STMT || st->variant == INTERFACE_ASSIGNMENT || st->variant == INTERFACE_OPERATOR)
-   return(1);
- else
-   return(0);
-}
-
-PTR_BFND
-make_endparallel()
-{
-        PTR_BFND p = get_bfnd(fi,OMP_END_PARALLEL_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	/*PTR_BLOB q;*/
-	if ((!pred_bfnd) || (pred_bfnd->variant != OMP_PARALLEL_DIR))
-	   execerr("OMP END PARALLEL DIR out of place", (char *)NULL);
-	return p;
-}
-
-PTR_BFND
-make_parallel()
-{
-	PTR_BFND p = get_bfnd(fi, OMP_PARALLEL_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
-
-
-PTR_BFND
-make_endsingle()
-{
-        PTR_BFND p = get_bfnd(fi,OMP_END_SINGLE_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	/*PTR_BLOB q;*/
-
-	if ((!pred_bfnd) || (pred_bfnd->variant != OMP_SINGLE_DIR))
-	   execerr("OMP END SINGLE DIR out of place", (char *)NULL);
-	return p;
-}
-
-PTR_BFND
-make_single()
-{
-	PTR_BFND p;
-	p = get_bfnd(fi, OMP_SINGLE_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
-
-PTR_BFND
-make_endmaster()
-{
-        PTR_BFND p = get_bfnd(fi,OMP_END_MASTER_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	if ((!pred_bfnd) || (pred_bfnd->variant != OMP_MASTER_DIR))
-	   execerr("OMP END MASTER DIR out of place", (char *)NULL);
-	return p;
-}
-
-PTR_BFND
-make_master()
-{
-	PTR_BFND p = get_bfnd(fi, OMP_MASTER_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
-
-PTR_BFND
-make_endordered()
-{
-        PTR_BFND p = get_bfnd(fi,OMP_END_ORDERED_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	/*PTR_BLOB q;*/
-
-	if ((!pred_bfnd) || (pred_bfnd->variant != OMP_ORDERED_DIR))
-	   execerr("OMP END ORDERED DIR out of place", (char *)NULL);
-	return p;
-}
-
-PTR_BFND
-make_ordered()
-{
-	PTR_BFND p;
-	p = get_bfnd(fi, OMP_ORDERED_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
-
-PTR_BFND
-make_endcritical()
-{
-        PTR_BFND p = get_bfnd(fi,OMP_END_CRITICAL_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	if ((!pred_bfnd) || (pred_bfnd->variant != OMP_CRITICAL_DIR))
-	   execerr("OMP END CRITICAL DIR out of place", (char *)NULL);
-	return p;
-}
-
-PTR_BFND
-make_critical()
-{
-	PTR_BFND p = get_bfnd(fi, OMP_CRITICAL_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
-
-PTR_BFND
-make_endsections()
-{
-        PTR_BFND p;
-	/*PTR_BLOB q;*/
-	/* mark end of section */
-	p = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	set_stat_list(pred_bfnd, p);
-	if ((!pred_bfnd) || (pred_bfnd->variant != OMP_SECTIONS_DIR)) {
-		fprintf (stderr,"%d",pred_bfnd->variant);
-	   execerr("OMP END SECTIONS DIR out of place", (char *)NULL);
-	}
-        p = get_bfnd(fi,OMP_END_SECTIONS_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return p;
-}
-
-PTR_BFND
-make_sections(PTR_LLND clause)
-{
-	PTR_BFND p;
-	p = get_bfnd(fi, OMP_SECTIONS_DIR, SMNULL, clause, LLNULL, LLNULL);
-	set_blobs(p, pred_bfnd, NEW_GROUP1);
-	p = get_bfnd(fi, OMP_SECTION_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
-
-PTR_BFND
-make_ompsection()
-{
-    PTR_BFND p;
-    /*PTR_BLOB q;*/
-    if (pred_bfnd) {
-	if (pred_bfnd->variant == OMP_SECTION_DIR) {
-		if (last_bfnd->variant == OMP_SECTION_DIR) {
-			return BFNULL;	
-		} else {
-			p = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-			set_stat_list(pred_bfnd, p);
-		}
-	}
-    }
-    p = get_bfnd(fi, OMP_SECTION_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-    return p;
-}
-
-PTR_BFND
-make_endparallelsections()
-{
-        PTR_BFND p;
-	/*PTR_BLOB q;*/
-	/* mark end of section */
-	p = get_bfnd(fi,CONTROL_END, SMNULL, LLNULL, LLNULL, LLNULL);
-	set_stat_list(pred_bfnd, p);
-	if ((!pred_bfnd) || (pred_bfnd->variant != OMP_PARALLEL_SECTIONS_DIR)) {
-		fprintf (stderr,"%d",pred_bfnd->variant);
-		execerr("OMP END PARALLEL SECTIONS DIR out of place", (char *)NULL);
-	}
-        p = get_bfnd(fi,OMP_END_PARALLEL_SECTIONS_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return p;
-}
-
-PTR_BFND
-make_parallelsections(PTR_LLND clause)
-{
-	PTR_BFND p;
-	p = get_bfnd(fi, OMP_PARALLEL_SECTIONS_DIR, SMNULL, clause, LLNULL, LLNULL);
-	set_blobs(p, pred_bfnd, NEW_GROUP1);
-	p = get_bfnd(fi, OMP_SECTION_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
-
-PTR_BFND
-make_endworkshare()
-{
-        PTR_BFND p = get_bfnd(fi,OMP_END_WORKSHARE_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	/*PTR_BLOB q;*/
-	if ((!pred_bfnd) || (pred_bfnd->variant != OMP_WORKSHARE_DIR))
-	   execerr("OMP END WORKSHARE DIR out of place", (char *)NULL);
-	return p;
-}
-
-PTR_BFND
-make_workshare()
-{
-	PTR_BFND p = get_bfnd(fi, OMP_WORKSHARE_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
-
-PTR_BFND
-make_endparallelworkshare()
-{
-        PTR_BFND p = get_bfnd(fi,OMP_END_PARALLEL_WORKSHARE_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	if ((!pred_bfnd) || (pred_bfnd->variant != OMP_PARALLEL_WORKSHARE_DIR))
-	   execerr("OMP END PARALLEL WORKSHARE DIR out of place", (char *)NULL);
-	return p;
-}
-
-PTR_BFND
-make_parallelworkshare()
-{
-	PTR_BFND p;
-	p = get_bfnd(fi, OMP_PARALLEL_WORKSHARE_DIR, SMNULL, LLNULL, LLNULL, LLNULL);
-	return (p);
-}
diff --git a/projects/dvm_svn/fdvm/trunk/parser/sym.c b/projects/dvm_svn/fdvm/trunk/parser/sym.c
deleted file mode 100644
index ef5885d..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/sym.c
+++ /dev/null
@@ -1,2012 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/*
- * sym.c -- hash table routines
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "compatible.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-#include "defs.h"
-#include "symb.h"
-#include "defines.h"
-#include "bif.h"
-#include "extern.h"
-#include "fdvm.h" /*f90.h  10.03.03*/
-#include "tokdefs.h"
-
-extern int hash(), ndim;
-extern PTR_BFND cur_bfnd, pred_bfnd, last_bfnd, global_bfnd;
-extern PTR_TYPE vartype, global_default, impltype[], make_type();
-extern PTR_LLND make_llnd();
-extern PTR_SYMB make_symb();
-/* added for FORTRAN 90 */
-extern PTR_LLND first_unresolved_call;
-extern PTR_LLND last_unresolved_call;
-extern void err(), errstr();
-char *chkalloc();
-void warn1();
-extern PTR_HASH hash_table[];
-extern int warn_all;
-extern int privateall;
-/* Scope table variables */
-PTR_BFND scope_table[1000];
-PTR_TYPE * scope_implicit[1000];
-int top_scope_level;
-int scope_starts[10];
-int top_scope_starts;
-
-
-struct operand
-{
-     int opval;
-     char *opname;
-} oplist [] = {
-        {PLUS, "+"},
-	{MINUS, "-"},
-	{ASTER, "*"},
-	{DASTER, "**"},
-	{SLASH, "/"},
-	{DSLASH, "//"},
-	{AND, ".and."},
-	{OR, ".or."},
-	{XOR, ".xor."},
-	{NOT, ".not."},
-	{EQ, ".eq."},
-	{NE, ".ne."},
-	{GT, ".gt."},
-	{GE, ".ge."},
-	{LT, ".lt."},
-	{LE, ".le."},        
-	{NEQV, ".neqv."},
-	{EQV, ".eqv."},
-	{0, 0}
-};
-
-void store_implicit()
-{PTR_TYPE *impl,*it,*ip;
- int i;
- /*fprintf(stderr,"%s\n",scope_table[top_scope_level]->entry.Template.symbol->ident);*/
- impl = (PTR_TYPE * ) calloc(26, sizeof(PTR_TYPE));
- it=impltype; ip=impl;
- i=26;
- while(--i >= 0)
-   *ip++ = *it++;
- /*return(impl)*/;
- scope_implicit[top_scope_level] = impl;
-}
-     
-void restore_implicit()
-{PTR_TYPE *impl;
- int i;
- /*fprintf(stderr,"restore%s\n",scope_table[top_scope_level]->entry.Template.symbol->ident);*/
- impl = scope_implicit[top_scope_level];
- for(i=0; i<26; i++)
-   impltype[i] = *impl++;
- /* it=impltype;
- i=26;
- while(--i >= 0)
- *it++ = *impl++;*/
-}
-
-void
-init_scope_table()
-{
-     scope_table[0] = global_bfnd;
-     top_scope_level = 0;
-     scope_starts[0]= 0;
-     top_scope_starts = 0;
-     scope_implicit[0] = NULL;
-}
-
-PTR_BFND
-cur_scope()
-{
-     return (scope_table[top_scope_level]);
-}
-
-PTR_BFND
-parent_scope(present_scope_level)
-int present_scope_level;
-{
-     if (present_scope_level >= 0)
-	  return (scope_table[--present_scope_level]);
-     else err("Requested scope level non-existent", 314);
-     return 0;
-}
-
-void
-add_scope_level(new_scope, due_to_use_stat)
-PTR_BFND new_scope;
-int due_to_use_stat;
-{
-     PTR_BFND tmp;
-     
-     if (due_to_use_stat)
-     {
-	  tmp = scope_table[top_scope_level];
-	  scope_table[top_scope_level] = new_scope;
-	  scope_table[++top_scope_level] = tmp;
-     }
-     else 
-     {
-          if(top_scope_level>0 && !scope_implicit[top_scope_level])
-            store_implicit();
-	  scope_table[++top_scope_level] = new_scope;
-	  scope_starts[++top_scope_starts] = top_scope_level; 
-     }
-}
-
-void
-delete_beyond_scope_level(level)
-PTR_BFND level;
-{    scope_implicit[top_scope_level] = NULL; 
-     top_scope_level = scope_starts[top_scope_starts] -  1;
-     top_scope_starts --;
-     if (top_scope_level < 0) 
-	  err("Requested scope level non-existent", 314);
-     if(top_scope_level>0)
-       restore_implicit();
-}	  
-
-int
-cur_scope_level()
-{
-     return (top_scope_level);
-}
-
-PTR_BFND
-scope_at_level(level)
-int level;
-{
-     if (level >= 0)
-	  return (scope_table[level]);
-     else  errstr("Requested scope non-existent", 315);
-     return 0;
-}
-
-
-/*
- look_up_sym(string) : 
-   lookup string in the hash table. If a hash table entry having string 
-   as it's name, in curent scope is found then return the hash table entry, 
-   else make a hash  table entry with string as it's name and return it.
- */
-PTR_HASH 
-look_up_sym(string)
-register char *string;
-{
-	int i, index, cur_scope_level();
-	register PTR_HASH entry;
-	PTR_HASH  make_hash_entry();
-	PTR_BFND parent_scope(), scope_at_level(), p;
-
-	i = hash(string);
-        for (index = cur_scope_level(); index >= 0; index--) 
-	{
-	     p = scope_at_level(index);
-	     for (entry = hash_table[i]; entry; entry = entry->next_entry) {
-		  if (!strcmp(string, entry->ident) && (entry->id_attr) && 
-                      (entry->id_attr->scope == p)) {
-		       return (entry);
-		  }
-	     }
-	}
-
-	return (make_hash_entry(string));
-}
-
-PTR_HASH 
-just_look_up_sym_in_scope(scope, string)
-PTR_BFND scope;
-register char *string;
-{
-	int i, cur_scope_level();
-	register PTR_HASH entry;
-	PTR_HASH  make_hash_entry();
-	PTR_BFND parent_scope(), scope_at_level(), p;
-
-	i = hash(string);
-	p = scope;
-	for (entry = hash_table[i]; entry; entry = entry->next_entry) {
-	     if (!strcmp(string, entry->ident) && (entry->id_attr) && 
-		 (entry->id_attr->scope == p)) {
-		  return (entry);
-	     }
-	}
-
-	return (HSNULL);
-}
-
-
-PTR_HASH
-look_up_op(operator)
-int operator;
-{
-     struct operand *p;
-     
-     for (p = oplist; p->opname; p++)
-	  if (p->opval == operator)
-	       return (look_up_sym(p->opname));
-     errstr("Unknown operator %d", operator, 316);
-     return (HSNULL);
-}
-
-PTR_HASH 
-just_look_up_sym(string)
-register char *string;
-{
-	int i, index, cur_scope_level();
-	register PTR_HASH entry;
-	PTR_HASH  make_hash_entry();
-	PTR_BFND parent_scope(), scope_at_level(), p;
-
-	i = hash(string);
-	p = cur_scope();
-        for (index = cur_scope_level(); index >= 0; index--) 
-	{
-	     p = scope_at_level(index);
-	     for (entry = hash_table[i]; entry; entry = entry->next_entry) {
-		  if (!strcmp(string, entry->ident) && (entry->id_attr) && 
-                      (entry->id_attr->scope == p)) {
-		       return (entry);
-		  }
-	     }
-	}
-
-	return (HSNULL);
-}
-
-PTR_HASH 
-make_hash_entry(string)
-register char *string;
-{
-     int i;
-     register PTR_HASH entry;
-
-     i = hash(string);
-
-     entry = (struct hash_entry *) chkalloc(sizeof(struct hash_entry));
-     entry->ident = copys(string);
-     entry->next_entry = hash_table[i];
-     hash_table[i] = entry;
-     return (entry);
-}    
- 
-PTR_SYMB
-make_sym_entry(var_hash_entry, variant, type, scope, kind)
-PTR_HASH var_hash_entry;
-int variant, kind;
-PTR_TYPE type;
-PTR_BFND scope;
-{
-     PTR_SYMB var_sym_entry;
-     PTR_SYMB list;     
-     /* If type is undefined, then obtain type from implicit type table. */
-     if ((variant != PROGRAM_NAME) && (variant != DEFAULT) &&  (variant != MODULE_NAME) &&
-	 (variant != PROCEDURE_NAME) && (variant != PROCESS_NAME) && (variant != INTERFACE_NAME)) 
-     {
-	  if (type == TYNULL)
-            {
-              if ((*var_hash_entry->ident - 'a') >= 0) 
-                type =  impltype[*var_hash_entry->ident - 'a'];
-            }
-	  else if ((type->variant == T_ARRAY) &&
-		   (type->entry.ar_decl.base_type == TYNULL)) {
-                 if ((*var_hash_entry->ident-'a') < 0)
-                   type->entry.ar_decl.base_type = 0;
-                 else
-	           type->entry.ar_decl.base_type = 
-	    	               impltype[*var_hash_entry->ident - 'a'];
-               } 
-	
-	  if ((type == TYNULL) ||
-              ((type->variant == T_ARRAY) &&
-               (type->entry.ar_decl.base_type == TYNULL) &&
-               (strcmp(var_hash_entry->ident, "_PROCESSORS") != 0)))
-	  {
-               /*
-	       errstr("type unknown of %s",
-                                                    var_hash_entry->ident);
-               */
-	       type = global_default;
-	  }
-     }
-     
-
-     var_sym_entry = make_symb(fi, variant, var_hash_entry->ident);
-
-     /* Point the hash entry to the symbol table entry */
-     var_hash_entry->id_attr = var_sym_entry;
-
-     var_sym_entry->variant = variant;
-     var_sym_entry->type = type;
-     var_sym_entry->scope = scope;
-     var_sym_entry->id_list = SMNULL;
-     switch (variant) {
-     case VARIABLE_NAME: 
-	  /* if not a formal parameter, 
-             then mark it as local. */
-	  if (var_sym_entry->entry.var_decl.local != IO) 
-	       var_sym_entry->entry.var_decl.local = kind;
-	  break;
-     case FUNCTION_NAME:
-     case PROCEDURE_NAME:
-     case PROCESS_NAME:
-	  var_sym_entry->entry.proc_decl.seen = kind;
-	  break;
-     default:
-	  break;
-     }
-
-     /* initialize administrative stuff */
-     var_sym_entry->outer = SMNULL;
-     var_sym_entry->parent = var_hash_entry;
-/*     var_sym_entry->decl = HARD; */
-     if(scope == cur_scope() && scope->variant == MODULE_STMT ){
-       if(privateall)
-	 var_sym_entry->attr =  var_sym_entry->attr | PRIVATE_BIT;
-       list = scope->entry.Template.symbol->entry.Template.next; /* adding to list of all the identifiers of module */
-       scope->entry.Template.symbol->entry.Template.next = var_sym_entry;
-       var_sym_entry->entry.Template.next = list;
-     }
-     return(var_sym_entry);
-}
-
-PTR_SYMB
-make_constant(var_hash_entry, type)
-PTR_HASH var_hash_entry;
-PTR_TYPE type;
-{
-     PTR_SYMB var_sym_entry;
-     int var_variant;
-   
-
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-	  return (make_sym_entry(var_hash_entry, CONST_NAME, type, cur_scope(), 
-                                 0));
-
-     var_variant = var_sym_entry->variant;
-     if (var_sym_entry->scope == global_bfnd)
-	  return (make_sym_entry(make_hash_entry(var_hash_entry->ident),
-                                 CONST_NAME, type, cur_scope(), 0));
-     	       
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_variant) 
-	  {
-	  case VARIABLE_NAME:
-	       var_sym_entry->variant = CONST_NAME;
-	       /*  var_sym_entry's type */
-	       switch (var_sym_entry->type->variant) 
-	       {
-	       case T_STRING:
-	       case T_ARRAY:
-                    if (type != TYNULL)
-		       var_sym_entry->type->entry.ar_decl.base_type = type;
-                    return (var_sym_entry);
-	       case (T_POINTER):
-                    if (type != TYNULL)
-		       var_sym_entry->type->entry.Template.base_type = type;
-                    return (var_sym_entry);
-	       case T_INT:
-	       case T_FLOAT:
-	       case T_DOUBLE:
-	       case T_COMPLEX:
-	       case T_BOOL:
-	       case T_STRUCT:
-	       case T_DERIVED_TYPE:
-		    if (type != TYNULL) 
-			 var_sym_entry->type = type;
-		    return (var_sym_entry);
-	       }
-	       break;
-	  case CONST_NAME:
-	       if (type != TYNULL)
-		    var_sym_entry->type = type;
-	       return (var_sym_entry);
-	  default:
-	       errstr("Inconsistent constant declaration %s", var_hash_entry->ident, 17);
-	       return (var_sym_entry);/*return (SMNULL);*/
-	  }
-     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), CONST_NAME,
-                            type, cur_scope(), 0));
-}     
-
-/* Occurence of Function name in it's body not properly taken care of. */
-PTR_SYMB
-make_scalar(var_hash_entry, type, kind)
-PTR_HASH var_hash_entry;
-PTR_TYPE type;
-int kind;
-{
-     PTR_SYMB var_sym_entry, cur_scope_sym_ptr;
-     int var_variant;
-
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-	  return (make_sym_entry(var_hash_entry, VARIABLE_NAME, type, 
-                                 cur_scope(), kind));
-
-     var_variant = var_sym_entry->variant;
-     cur_scope_sym_ptr = cur_scope()->entry.Template.symbol;
-     if (var_sym_entry->scope != cur_scope()){ /*(var_sym_entry->scope == global_bfnd)*/
-	  if ((cur_scope()->variant == FUNC_HEDR) &&
-	      (!(strcmp(var_hash_entry->ident, cur_scope_sym_ptr->ident))))
-	       if (type == TYNULL)
-		    return (var_sym_entry);
-               else 
-	       {
-		    cur_scope_sym_ptr->type = type;
-		    /* result_sym_ptr =  cur_scope_sym_ptr->entry.Template.declared_name;
-		    if (result_sym_ptr)
-			 result_sym_ptr->type = type;
-		    */ /*19.03.03*/
-		    return (var_sym_entry);
-	       }
-     	  else return (make_sym_entry(make_hash_entry(var_hash_entry->ident),
-                                 VARIABLE_NAME, type, cur_scope(), kind));
-     }
-     
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_variant) 
-	  {
-	  case VARIABLE_NAME:
-	       /*  var_sym_entry's type */
-	       switch (var_sym_entry->type->variant) 
-	       {
-	       case T_STRING:
-	       case T_ARRAY:
-                    if (type != TYNULL)
-		       var_sym_entry->type->entry.ar_decl.base_type = type;
-                    return (var_sym_entry);
-	       case T_POINTER:
-                    if (type != TYNULL)
-		       var_sym_entry->type->entry.Template.base_type = type;
-                    return (var_sym_entry);
-	       case T_INT:
-	       case T_FLOAT:
-	       case T_DOUBLE:
-	       case T_COMPLEX:
-	       case T_BOOL:
-	       case T_STRUCT:
-	       case T_DERIVED_TYPE:
-		    if (type != TYNULL)
-			 var_sym_entry->type = type;
-		    return (var_sym_entry);
-	       }
-	       break;
-	  case CONST_NAME:
-	       if (type != TYNULL)
-		    var_sym_entry->type = type;
-	       return (var_sym_entry);
-	  case ROUTINE_NAME:
-          case FUNCTION_NAME:
-	       if (type != TYNULL)
-		    var_sym_entry->type = type;
-	       return (var_sym_entry);
-	  case LABEL_VAR:
-	       return (var_sym_entry);
-          case TYPE_NAME:
-          case PROCEDURE_NAME:
-          case INTERFACE_NAME:
-          case NAMELIST_NAME:
-	       return (var_sym_entry);            
-	  default:
-	       errstr("Inconsistent declaration of identifier %s",var_hash_entry->ident,16);
-	       return (var_sym_entry); /* return (SMNULL);*/
-	  }
-     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), 
-                            VARIABLE_NAME, type, cur_scope(), kind));
-}     
-
-/*
-     make_array(var_hash_entry:PTR_HASH, base_type: PTR_TYPE, dcl_type:int,
-                ranges: PTR_LLND, ndim : int)
-       makes a array symbol table entry.
-*/
-
-PTR_SYMB
-make_array(var_hash_entry, base_type, ranges, ndim, kind)
-PTR_HASH var_hash_entry;
-PTR_TYPE base_type;
-PTR_LLND ranges;
-int ndim, kind;
-{
-     PTR_SYMB var_sym_entry, cur_scope_sym_ptr;
-     PTR_TYPE array_type;
-     int var_variant;
-     
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-     {
-	  array_type = make_type(fi, T_ARRAY);
-	  array_type->entry.ar_decl.base_type = base_type;
-	  array_type->entry.ar_decl.num_dimensions = ndim;
-	  return (make_sym_entry(var_hash_entry, VARIABLE_NAME, array_type,
-                                 cur_scope(), kind));
-     }
-     
-     var_variant = var_sym_entry->variant;
-     cur_scope_sym_ptr = cur_scope()->entry.Template.symbol;
-     if (var_sym_entry->scope != cur_scope()){ /*(var_sym_entry->scope == global_bfnd)*/
-	  if ((cur_scope()->variant == FUNC_HEDR) &&
-	      (!(strcmp(var_hash_entry->ident, cur_scope_sym_ptr->ident))))
-	       if (base_type == TYNULL)
-		    return (var_sym_entry);
-               else 
-	       {
-                    array_type = make_type(fi, T_ARRAY);
-	            array_type->entry.ar_decl.base_type = base_type;
-	            array_type->entry.ar_decl.num_dimensions = ndim;
-		    cur_scope_sym_ptr->type = array_type;
-                    /*result_sym_ptr =  cur_scope_sym_ptr->entry.Template.declared_name;
-		    if (result_sym_ptr)
-			 result_sym_ptr->type = array_type;
-		    *//*19.03.03*/
-		    return (var_sym_entry);
-	       }
-     	  else /*return (make_sym_entry(make_hash_entry(var_hash_entry->ident),
-		 VARIABLE_NAME, type, cur_scope(), kind));*/
-     	       
-
-	    /*  if (var_sym_entry->scope == global_bfnd)*/
-         {
-	  array_type = make_type(fi, T_ARRAY);
-	  array_type->entry.ar_decl.base_type = base_type;
-	  array_type->entry.ar_decl.num_dimensions = ndim;
-	  return (make_sym_entry(make_hash_entry(var_hash_entry->ident), VARIABLE_NAME, array_type, 
-                                 cur_scope(), kind));/*7.03.03*/
-         }
-    } 
-  
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_variant) 
-	  {
-	  case VARIABLE_NAME:
-	       /*  var_sym_entry's type */
-	       switch (var_sym_entry->type->variant) 
-	       {
-	       case T_ARRAY:
-                    if (base_type != TYNULL)
-                         var_sym_entry->type->entry.ar_decl.base_type = 
-			      base_type;
-		    if (ndim) 
-			 var_sym_entry->type->entry.ar_decl.num_dimensions = ndim;
-                    return (var_sym_entry);
-	       case T_STRING:
-	       case T_POINTER:
-	       case T_INT:
-	       case T_FLOAT:
-	       case T_DOUBLE:
-	       case T_COMPLEX:
-	       case T_DCOMPLEX:
-	       case T_BOOL:
-	       case T_STRUCT:
-	       case T_DERIVED_TYPE:
-	       {
-		    array_type = make_type(fi, T_ARRAY);
-		    if (base_type == TYNULL)
-			 array_type->entry.ar_decl.base_type = 
-			      var_sym_entry->type;
-		    else array_type->entry.ar_decl.base_type = base_type;
-		    array_type->entry.ar_decl.num_dimensions = ndim;
-		    var_sym_entry->type = array_type;
-                    return (var_sym_entry);
-	       }
-               default:
-		    return (var_sym_entry);
-	       }
-	      
-	  default:
-	       errstr("Inconsistent array declaration of identifier %s", var_hash_entry->ident,18);
-	       return (var_sym_entry);/*return (SMNULL);*/
-	  }
-
-     array_type = make_type(fi, T_ARRAY);
-     array_type->entry.ar_decl.base_type = base_type;
-     array_type->entry.ar_decl.num_dimensions = ndim;
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), VARIABLE_NAME, array_type,
-			    cur_scope(), kind)); /*7.03.03*/
-}
-
-PTR_SYMB
-make_pointer(var_hash_entry, base_type, kind)
-PTR_HASH var_hash_entry;
-PTR_TYPE base_type;
-int kind;
-{
-     PTR_SYMB var_sym_entry;
-     PTR_TYPE pointer_type;
-     int var_variant;
-     
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-     {
-	  pointer_type = make_type(fi, T_POINTER);
-	  pointer_type->entry.Template.base_type = base_type;
-	  return (make_sym_entry(var_hash_entry, VARIABLE_NAME, pointer_type,
-                                 cur_scope(), kind));
-     }
-     
-     var_variant = var_sym_entry->variant;
-     if (var_sym_entry->scope == global_bfnd)
-     {
-	  pointer_type = make_type(fi, T_POINTER);
-	  pointer_type->entry.Template.base_type = base_type;
-	  return (make_sym_entry(var_hash_entry, VARIABLE_NAME, pointer_type, 
-                                 cur_scope(), kind));
-     }
-
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_variant) 
-	  {
-	  case VARIABLE_NAME:
-	       /*  var_sym_entry's type */
-	       switch (var_sym_entry->type->variant) 
-	       {
-	       case T_POINTER:
-                    if (base_type != TYNULL)
-                         var_sym_entry->type->entry.Template.base_type = 
-			      base_type;
-                    return (var_sym_entry);
-	       case T_STRING:
-	       case T_ARRAY:
-	       case T_INT:
-	       case T_FLOAT:
-	       case T_DOUBLE:
-	       case T_COMPLEX:
-	       case T_BOOL:
-	       case T_STRUCT:
-	       case T_DERIVED_TYPE:
-	       {
-		    pointer_type = make_type(fi, T_POINTER);
-		    if (base_type == TYNULL)
-			 pointer_type->entry.Template.base_type = 
-			      var_sym_entry->type;
-		    else pointer_type->entry.Template.base_type = base_type;
-		    var_sym_entry->type = pointer_type;
-                    return (var_sym_entry);
-	       }
-               default:
-		    return (var_sym_entry);
-	       }
-	       
-	  default:
-	       errstr("Inconsistent declaration of identifier %s",var_hash_entry->ident,16);
-               return (var_sym_entry);		 /*   return (SMNULL);*/
-	  }
-
-     pointer_type = make_type(fi, T_POINTER);
-     pointer_type->entry.Template.base_type = base_type;
-     return (make_sym_entry(var_hash_entry, VARIABLE_NAME, pointer_type,
-                             cur_scope(), kind));
-}
-     
-PTR_SYMB
-make_function(var_hash_entry, type, kind)
-PTR_HASH var_hash_entry;
-PTR_TYPE type;
-int kind;
-{
-     PTR_SYMB var_sym_entry;
-     int var_variant;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL){
-	  if (kind == LOCAL)
-	       return (make_sym_entry(var_hash_entry, FUNCTION_NAME, type,
-                                      cur_scope(), kind));
-          else return (make_sym_entry(var_hash_entry, FUNCTION_NAME, type,
-                                      global_bfnd, kind));
-     }
-     var_variant = var_sym_entry->variant;
-     if (var_sym_entry->scope == global_bfnd) {
-          if (var_variant == FUNCTION_NAME) 
-	  {
-	       if (kind == LOCAL)
-		    return (make_sym_entry(var_hash_entry, FUNCTION_NAME, type,
-                                      cur_scope(), kind));
-	       else return var_sym_entry;
-          }
-          else if (var_variant == ROUTINE_NAME)
-	  {
-	       var_sym_entry->variant = FUNCTION_NAME;/* FB Modified == before*/
-	       return var_sym_entry;
-	  }
-          else if (var_variant == INTERFACE_NAME)
-	       return var_sym_entry;
-          else if (var_variant == DEFAULT){
-              /* intrinsic function  can have same name as a common block name */
-               if(warn_all)
-                 warn1("Function has the same name as a common block  %s.",var_hash_entry->ident, 24);      
-	       var_sym_entry->variant = FUNCTION_NAME;
-               return var_sym_entry;
-          }
-          else if (var_variant == VARIABLE_NAME)
-	  {
-	       var_sym_entry->variant = FUNCTION_NAME; /* FB Modified == before*/
-	       return var_sym_entry;
-	  }
-	  else
-	  {
-	       errstr("Inconsistent function declaration %s", var_hash_entry->ident, 19);
-	       return (var_sym_entry); /* return (SMNULL);*/
-	  }     	       
-     }
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_variant) 
-	  {
-	  case VARIABLE_NAME:
-	       /*  var_sym_entry's type */
-	       switch (var_sym_entry->type->variant) 
-	       {
-	       case T_STRING:
-	       case T_INT:
-	       case T_FLOAT:
-	       case T_DOUBLE:
-	       case T_COMPLEX:
-	       case T_BOOL:
-	       case T_POINTER:
-	       case T_STRUCT:
-	       case T_DERIVED_TYPE:
-		    /* if not a formal parameter, convert it into 
-		       a global function. */
-		    if (var_sym_entry->entry.var_decl.local != IO)
-		    {
-			 var_sym_entry->variant = FUNCTION_NAME;
-                        /* if (kind != LOCAL)
-			   var_sym_entry->scope = global_bfnd; */ /*podd 02.02.23*/
-		    }
-		    if (type != TYNULL)
-			 var_sym_entry->type = type;
-		    return (var_sym_entry);
-	       case T_ARRAY:
-                    if (kind == LOCAL)
-		    {
-		     errstr("Inconsistent function declaration %s",var_hash_entry->ident,19);
-		     return (var_sym_entry);/* return (SMNULL);*/
-		    } 
-                    else return (var_sym_entry);
-	       }
-	  case FUNCTION_NAME:
-	       if (type != TYNULL)
-		   var_sym_entry->type = type;
-	       return (var_sym_entry);
-	  case ROUTINE_NAME:
-	       var_sym_entry->variant = FUNCTION_NAME;
-	       return (var_sym_entry);
-	  case INTERFACE_NAME:
-	       return (var_sym_entry);
-	  default:
-	       errstr("Inconsistent function declaration %s", var_hash_entry->ident, 19);
-	       return (var_sym_entry); /* return (SMNULL);*/
-	  }
-     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), FUNCTION_NAME, type, cur_scope(), kind));
-}     
-
-PTR_SYMB
-make_external(var_hash_entry, type)
-PTR_HASH var_hash_entry;
-PTR_TYPE type;
-{
-     PTR_SYMB var_sym_entry;
-     int var_variant;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-       return (make_sym_entry(var_hash_entry, ROUTINE_NAME, type,
-				 cur_scope(), NO));       
-
-     var_variant = var_sym_entry->variant;
-  /*
-     if (var_sym_entry->scope == global_bfnd) { 
-	  if ((var_variant == FUNCTION_NAME) ||
-              (var_variant == PROCEDURE_NAME) ||
-              (var_variant == PROCESS_NAME))
-	       return var_sym_entry;
-          else if (var_variant == ROUTINE_NAME)
-	  {
-	       return var_sym_entry;
-	  }
-	  else
-	  {
-	       errstr("Inconsistent procedure declaration %s", var_hash_entry->ident, 20);
-	       return (var_sym_entry); 
-	  }       	       
-     }
-*/
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_variant) 
-	  {
-	  case VARIABLE_NAME:
-	       /*  var_sym_entry's type */
-	       switch (var_sym_entry->type->variant) 
-	       {
-	       case T_STRING:
-	       case T_INT:
-	       case T_FLOAT:
-	       case T_DOUBLE:
-	       case T_COMPLEX:
-	       case T_BOOL:
-	       case T_POINTER:
-	       case T_STRUCT:
-	       case T_ARRAY:
-	       case T_DERIVED_TYPE:
-		    /* if not a formal parameter, convert it into 
-		       a global function. */
-		    if (var_sym_entry->entry.var_decl.local != IO)
-			 var_sym_entry->variant = ROUTINE_NAME;
-		    if (type != TYNULL)
-			 var_sym_entry->type = type;
-		    return (var_sym_entry);
-	       }
-	  case ROUTINE_NAME:
-	       return (var_sym_entry);
-	  default:
-	       errstr("Inconsistent procedure declaration %s", var_hash_entry->ident, 20);
-	       return (var_sym_entry); /*return (SMNULL);*/
-	  }     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), ROUTINE_NAME, type, cur_scope(), NO));
-}     
-
-PTR_SYMB
-make_intrinsic(var_hash_entry, type)
-PTR_HASH var_hash_entry;
-PTR_TYPE type;
-{
-     PTR_SYMB var_sym_entry;
-     int var_variant;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-       return (make_sym_entry(var_hash_entry, ROUTINE_NAME, type,
-				 cur_scope(), LOCAL));       
-
-     var_variant = var_sym_entry->variant;
-     	       
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_variant) 
-	  {
-	  case VARIABLE_NAME:
-	       /*  var_sym_entry's type */
-	       switch (var_sym_entry->type->variant) 
-	       {
-	       case T_STRING:
-	       case T_INT:
-	       case T_FLOAT:
-	       case T_DOUBLE:
-	       case T_COMPLEX:
-	       case T_BOOL:
-	       case T_POINTER:
-	       case T_STRUCT:
-	       case T_ARRAY:
-	       case T_DERIVED_TYPE:
-		    /* if not a formal parameter, convert it into 
-		       a global function. */
-		 if (var_sym_entry->entry.var_decl.local != IO)/*7.03.03*/
-		         var_sym_entry->variant = ROUTINE_NAME;		      
-		    
-		    if (type != TYNULL)
-			 var_sym_entry->type = type;
-		    return (var_sym_entry);
-	       }
-          case FUNCTION_NAME:
-          case PROCEDURE_NAME:
-	  case ROUTINE_NAME:
-	       return (var_sym_entry);
-	  default:
-	       errstr("Inconsistent procedure declaration %s", var_hash_entry->ident, 20);
-	       return (var_sym_entry); /* return (SMNULL);*/
-	  }     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), ROUTINE_NAME, type, cur_scope(), LOCAL));
-}     
-
-     
-PTR_SYMB
-make_procedure(var_hash_entry, kind)
-PTR_HASH var_hash_entry;
-int kind;
-{
-     PTR_SYMB var_sym_entry;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL) {
-	  if (kind == LOCAL)
-	       return (make_sym_entry(var_hash_entry, PROCEDURE_NAME, TYNULL,
-                                      cur_scope(), kind));
-          else return (make_sym_entry(var_hash_entry, PROCEDURE_NAME, TYNULL,
-                                      global_bfnd, kind));
-     }
-     if (var_sym_entry->scope == global_bfnd) {
-          if (var_sym_entry->variant == PROCEDURE_NAME){
-	       if (kind == LOCAL) /*10.03.03*/
-		    return (make_sym_entry(make_hash_entry(var_hash_entry->ident), PROCEDURE_NAME, TYNULL,
-                                      cur_scope(), kind));
-	       else return var_sym_entry;
-                 /* if (var_sym_entry->variant == PROCEDURE_NAME)
-	        return (var_sym_entry);*/
-	  }
-          else if (var_sym_entry->variant == PROCESS_NAME)
-          {
-               var_sym_entry->variant = PROCEDURE_NAME;
-               return var_sym_entry;
-          }
-          else if (var_sym_entry->variant == ROUTINE_NAME)
-	  {
-	       var_sym_entry->variant = PROCEDURE_NAME;
-	       return var_sym_entry;
-	  }
-          else if (var_sym_entry->variant == INTERFACE_NAME)
-	       return var_sym_entry;
-	  else
-	  {
-	       errstr("Inconsistent subroutine declaration %s", var_hash_entry->ident, 21);
-	       return (var_sym_entry); /* return (SMNULL);*/
-	  }
-     }	       
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_sym_entry->variant)
-	  {
-	  case PROCEDURE_NAME:
-	       return (var_sym_entry);
-	  case VARIABLE_NAME:
-	       /* if not a formal parameter, convert it into 
-                  a global procedure. */
-	       if (var_sym_entry->entry.var_decl.local != IO)
-	       {
-		    var_sym_entry->variant = PROCEDURE_NAME;
-                    /* if(kind != LOCAL)
-		      var_sym_entry->scope = global_bfnd; */ /*podd 02.02.23*/
-	       }
-	       return (var_sym_entry);
-          case PROCESS_NAME:
-               var_sym_entry->variant = PROCEDURE_NAME;
-               return (var_sym_entry);
-	  case ROUTINE_NAME:
-	       var_sym_entry->variant = PROCEDURE_NAME;
-	       return (var_sym_entry);
-	  case INTERFACE_NAME:
-	       return (var_sym_entry);
-	  default:
-	       errstr("Inconsistent subroutine declaration %s", var_hash_entry->ident, 21);
-	       return (var_sym_entry); /* return (SMNULL);*/
-	  }
-     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident),
-                            PROCEDURE_NAME, TYNULL, cur_scope(), kind));
-}     
-     
-
-PTR_SYMB			/* make_process added for FORTRAN M */
-make_process(var_hash_entry, kind)
-PTR_HASH var_hash_entry;
-int kind;
-{
-     PTR_SYMB var_sym_entry;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL) {
-	  if (kind == LOCAL)
-	       return (make_sym_entry(var_hash_entry, PROCESS_NAME, TYNULL,
-                                      cur_scope(), kind));
-          else return (make_sym_entry(var_hash_entry, PROCESS_NAME, TYNULL,
-                                      global_bfnd, kind));
-     }
-     if (var_sym_entry->scope == global_bfnd) {
-	  if (var_sym_entry->variant == PROCESS_NAME)
-	       return (var_sym_entry);
-          else if (var_sym_entry->variant == PROCEDURE_NAME)
-	  {
-	       var_sym_entry->variant = PROCESS_NAME;
-	       return var_sym_entry;
-	  }
-          else if (var_sym_entry->variant == ROUTINE_NAME)
-	  {
-	       var_sym_entry->variant = PROCESS_NAME;
-	       return var_sym_entry;
-	  }
-          else if (var_sym_entry->variant == INTERFACE_NAME)
-	       return var_sym_entry;
-	  else
-	  {
-	       errstr("Inconsistent process %s %d", var_hash_entry->ident, var_sym_entry->variant, 317);
-	       return (SMNULL);
-	  }
-     } 	       
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_sym_entry->variant)
-	  {
-	  case PROCESS_NAME:
-	       return (var_sym_entry);
-	  case VARIABLE_NAME:
-	       /* if not a formal parameter, convert it into 
-                  a global procedure. */
-	       if (var_sym_entry->entry.var_decl.local != IO)
-	       {
-		    var_sym_entry->variant = PROCESS_NAME;
-		    var_sym_entry->scope = global_bfnd;
-	       }
-	       return (var_sym_entry);
-          case PROCEDURE_NAME:
-               var_sym_entry->variant = PROCESS_NAME;
-               return (var_sym_entry);
-	  case ROUTINE_NAME:
-	       var_sym_entry->variant = PROCESS_NAME;
-	       return (var_sym_entry);
-	  case INTERFACE_NAME:
-	       return (var_sym_entry);
-	  default:
-	       errstr("Inconsistent process %s", var_hash_entry->ident,317);
-	       return (SMNULL);
-	  }
-     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident),
-                            PROCESS_NAME, TYNULL, global_bfnd, kind));
-}     
-     
-
-PTR_SYMB
-make_program(var_hash_entry)
-PTR_HASH var_hash_entry;
-{
-     PTR_SYMB var_sym_entry;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-	  return (make_sym_entry(var_hash_entry, PROGRAM_NAME, TYNULL, 
-                                 global_bfnd, 0));
-
-     if (var_sym_entry->scope == global_bfnd)
-	  {
-	       errstr("Inconsistent program declaration %s", var_hash_entry->ident, 22);
-
-	       return (var_sym_entry); /*return (SMNULL);*/
-	  }
-     	       
-     if (var_sym_entry->scope == cur_scope())
-	  {
-	       errstr("Inconsistent program declaration %s", var_hash_entry->ident, 22);
-
-	       return (var_sym_entry); /* return (SMNULL);*/
-	  }
-     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), PROGRAM_NAME,
-                            TYNULL, global_bfnd, 0));
-}     
-
-
-PTR_SYMB
-make_module(var_hash_entry)
-PTR_HASH var_hash_entry;
-{
-     PTR_SYMB var_sym_entry;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-	  return (make_sym_entry(var_hash_entry, MODULE_NAME, TYNULL, 
-                                 global_bfnd, 0));
-
-     if (var_sym_entry->scope == global_bfnd)
-	  {
-	       errstr("Inconsistent module declaration %s", var_hash_entry->ident, 331);
-
-	        return (var_sym_entry); /* return (SMNULL);*/
-	  }
-     	       
-     if (var_sym_entry->scope == cur_scope())
-	  {
-	       errstr("Inconsistent module declaration %s", var_hash_entry->ident, 331);
-
-	       return (var_sym_entry); /* return (SMNULL);*/
-	  }
-     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), MODULE_NAME,
-                            TYNULL, global_bfnd, 0));
-}     
-
-
-
-
-PTR_SYMB
-make_common(var_hash_entry)
-PTR_HASH var_hash_entry;
-{
-     PTR_SYMB var_sym_entry;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-       return (make_sym_entry(var_hash_entry, DEFAULT, TYNULL, global_bfnd,
-                              0));
-
-     if (var_sym_entry->scope == global_bfnd) {
-	  if (var_sym_entry->variant == DEFAULT)
-	       return (var_sym_entry);
-	  else 
-	  { if(var_sym_entry->variant == FUNCTION_NAME){
-                      /* intrinsic function  can have same name as a common block name */
-               if(warn_all)
-                 warn1("Common block have same name as a function  %s", var_hash_entry->ident, 25);
-                return (var_sym_entry);
-             }
-             else
-	       errstr("Inconsistent common declaration  %s", var_hash_entry->ident, 23);
-
-	  return (var_sym_entry); /* return (SMNULL);*/
-	  }
-     } 	       
-     /* A local entity can have same name as a common block name. So, ignore
-        the local entity. */
-     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), DEFAULT,
-                            TYNULL, global_bfnd, 0));
-}     
-
-
-PTR_SYMB
-make_parallel_region(var_hash_entry)  /*SPF*/
-PTR_HASH var_hash_entry;
-{ 
-     PTR_SYMB var_sym_entry;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-       return (make_sym_entry(var_hash_entry, SPF_REGION_NAME, TYNULL, global_bfnd,
-                              0));
-
-     if (var_sym_entry->scope == global_bfnd) {
-	  if (var_sym_entry->variant != SPF_REGION_NAME)
-	       errstr("Inconsistent region declaration  %s", var_hash_entry->ident, 630);
-	  return (var_sym_entry);
-	  
-     } 	       
-     
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), SPF_REGION_NAME,
-                            TYNULL, global_bfnd, 0));
-}     
-
-PTR_TYPE 
-make_type_node(typespec, lengspec)
-PTR_TYPE typespec;
-PTR_LLND lengspec;
-{
-     PTR_TYPE t;
-     
-     t = typespec;
-     if (lengspec != LLNULL) 
-     {
-	  t = make_type(fi, typespec->variant);
-          if(typespec->variant == T_STRING)
-            t->entry.Template.dummy1 = typespec->entry.Template.dummy1; /* dummy1=2 for string constant inclosing " */  
-          if(lengspec->variant == LEN_OP) {
-	    t->entry.Template.ranges = lengspec;
-	    t->entry.Template.kind_len = typespec->entry.Template.kind_len;
-          }	    
-          else
-            t->entry.Template.kind_len = lengspec;	      
-     }
-     return (t);
-}
-
-PTR_SYMB
-make_derived_type(var_hash_entry, type, kind)
-PTR_HASH var_hash_entry;
-PTR_TYPE type;
-int kind;
-{
-     PTR_SYMB var_sym_entry;
-     PTR_TYPE struct_type;
-     int var_variant;
-     
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-     {
-	  struct_type = make_type(fi, T_STRUCT);
-	  return (make_sym_entry(var_hash_entry, TYPE_NAME, struct_type,
-                                 cur_scope(), kind));
-     }
-     
-     var_variant = var_sym_entry->variant;
-     if (var_sym_entry->scope == global_bfnd)
-     {
-	  struct_type = make_type(fi, T_STRUCT);
-	  return (make_sym_entry(make_hash_entry(var_hash_entry->ident), TYPE_NAME, struct_type, 
-                                 cur_scope(), kind));/*16.03.03*/
-     }
-
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_variant) 
-	  {
-	  case VARIABLE_NAME:
-	       /*  var_sym_entry's type */
-	       var_sym_entry->variant = TYPE_NAME;
-	       switch (var_sym_entry->type->variant) 
-	       {
-	       case T_STRING:
-	       case T_ARRAY:
-                    if (type != TYNULL)
-                         var_sym_entry->type->entry.ar_decl.base_type = 
-			      type;
-                    return (var_sym_entry);
-	       case T_INT:
-	       case T_FLOAT:
-	       case T_DOUBLE:
-	       case T_COMPLEX:
-	       case T_BOOL:
-	       case T_POINTER:
-	       case T_STRUCT:
-	       {
-		    struct_type = make_type(fi, T_STRUCT);
-		    var_sym_entry->type = struct_type;
-                    return (var_sym_entry);
-	       }
-               default:
-		    return (var_sym_entry);
-	       }
-	  case TYPE_NAME:   /*added 24.04.12*/
-	       {
-		    struct_type = make_type(fi, T_STRUCT);
-		    var_sym_entry->type = struct_type;
-                    return (var_sym_entry);
-	       }
-    
-	  default:
-	       errstr("Inconsistent struct declaration of identifier %s", var_hash_entry->ident,318);
-	       return (var_sym_entry);  /*  return (SMNULL);*/
-	  }
-
-     struct_type = make_type(fi, T_STRUCT);
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), TYPE_NAME, struct_type,
-			    cur_scope(), kind)); /*16.03.03*/
-}
-
-PTR_SYMB
-make_local_entity(var_hash_entry, variant, type, kind)
-PTR_HASH var_hash_entry;
-PTR_TYPE type;
-int variant, kind;
-{
-     PTR_SYMB var_sym_entry;
-     int var_variant;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-     {
-	  return (make_sym_entry(var_hash_entry, variant, type,
-                                 cur_scope(), kind));
-     }
-     
-     var_variant = var_sym_entry->variant;
-     if (var_sym_entry->scope == global_bfnd)
-     {
-	  return (make_sym_entry(make_hash_entry(var_hash_entry->ident), variant, type, 
-                                 cur_scope(), kind)); /*16.03.03*/
-     }
-
-     if (var_sym_entry->scope == cur_scope())
-	  switch(var_variant) 
-	  {
-	  default:
-	       if (variant == var_variant)
-		    return(var_sym_entry);
-	       else 
-               {
-                 errstr("Inconsistent declaration of identifier %s", var_hash_entry->ident, 16);
-		 return (var_sym_entry); /*return (SMNULL);*/
-	       }
-	  };
-
-     return (make_sym_entry(make_hash_entry(var_hash_entry->ident), variant, type, cur_scope(), kind));/*16.03.03*/
-}
-
-PTR_SYMB
-make_global_entity(var_hash_entry, variant, type, kind)
-PTR_HASH var_hash_entry;
-PTR_TYPE type;
-int variant, kind;
-{
-     PTR_SYMB var_sym_entry;
-     int var_variant;
-     
-     var_sym_entry = var_hash_entry->id_attr;
-     if (var_sym_entry == SMNULL)
-     {
-	  return (make_sym_entry(var_hash_entry, variant, type,
-                                 global_bfnd, kind));
-     }
-     
-     var_variant = var_sym_entry->variant;
-     if (var_sym_entry->scope == global_bfnd)
-	  switch(var_variant) 
-	  {
-	  default:
-	       if (variant == var_variant)
-		    return(var_sym_entry);
-	       else 
-               {
-                 errstr("Inconsistent declaration of identifier %s", var_hash_entry->ident, 16);
-		 return (var_sym_entry); /* return (SMNULL);*/
-	       }
-	  };
-     errstr("Inconsistent declaration of identifier %s", var_hash_entry->ident, 16);
-     return (var_sym_entry); /*return (SMNULL);*/
-}
-
-void
-process_type(type_var, type_fields_end)
-PTR_SYMB type_var;
-PTR_BFND type_fields_end;
-{
-     PTR_SYMB sym_temp, last_field;
-     PTR_LLND ll_temp;
-     PTR_BFND temp;
-     PTR_BLOB blob_temp;
-     int count = 0;
-     
-     temp = cur_scope();
-     blob_temp = temp->entry.Template.bl_ptr1;
-     while(blob_temp->ref->variant != VAR_DECL)
-          blob_temp = blob_temp->next;
-     /*last_field = blob_temp->ref->entry.Template.ll_ptr1->entry.list.item->entry.Template.symbol;*/
-     type_var->type->variant = T_STRUCT;
-     type_var->type->name = type_var; /*18.03.03*/
-     /* The field derived class is a constraint put by the design. Maybe instead of T_STRUCT, T_RECORD 
-        might be better. But then it would be inconsistent with C++. */
-     /*type_var->type->entry.derived_class.first = last_field;*/
-     last_field = SMNULL;
-     while (blob_temp && (blob_temp->ref != type_fields_end))
-     {
-          ll_temp = blob_temp->ref->entry.Template.ll_ptr1;
-	  while (ll_temp != LLNULL) 
-	  {
-	       count++;
-               if(ll_temp->entry.list.item->variant == ASSGN_OP || ll_temp->entry.list.item->variant == POINTST_OP)/*2.07.03*/
-                  sym_temp = ll_temp->entry.list.item->entry.Template.ll_ptr1->entry.Template.symbol; 
-               else
-	          sym_temp = ll_temp->entry.list.item->entry.Template.symbol;
-	      /* sym_temp->entry.Template.tag = FIELD_NAME;*/
-               sym_temp->entry.field.tag = sym_temp->variant;
-               sym_temp->variant = FIELD_NAME;
-               sym_temp->entry.field.base_name = type_var;
-               if(last_field){
-	         last_field->entry.field.next = sym_temp;
-                 last_field = sym_temp;
-               }
-               else {
-                 last_field = sym_temp;
-                 type_var->type->entry.derived_class.first = last_field;
-               }
-	       
-	       ll_temp = ll_temp->entry.list.next;
-	  }
-	  blob_temp = blob_temp->next;
-     }
-     type_var->type->entry.derived_class.num_fields = count;
-     last_field->entry.field.next = SMNULL;     
-}     
-
-void
-process_interface(end_of_interface)
-PTR_BFND end_of_interface;
-{
-     PTR_SYMB sym_temp, last_symbol, interface_symbol;
-     PTR_BFND temp;
-     PTR_BLOB blob_temp;
-     PTR_LLND  list;
-     
-     temp = pred_bfnd;
-     blob_temp = temp->entry.Template.bl_ptr1;
-     interface_symbol = pred_bfnd->entry.Template.symbol;
-     if (interface_symbol == SMNULL) return;
-     if((pred_bfnd->variant != INTERFACE_STMT)) return;
-     
-     if(!blob_temp->ref) return;
- 
-     last_symbol = SMNULL;
-     while (blob_temp && (blob_temp->ref != end_of_interface))
-     {
-	 sym_temp = blob_temp->ref->entry.Template.symbol;
-         if(sym_temp != SMNULL){
-          if(last_symbol) {
-	    last_symbol->entry.Template.declared_name = sym_temp;
-            last_symbol = sym_temp;
-          }
-          else {
-            last_symbol = sym_temp;
-            interface_symbol->entry.Template.symb_list = last_symbol;/*19.03.03*/
-          }
-	  blob_temp = blob_temp->next;
-          continue;
-         }
-         /* MODULE_PROC_STMT(module procedure statement)*/
-         list = blob_temp->ref->entry.Template.ll_ptr1;
-         while(list){
-            sym_temp = list->entry.Template.ll_ptr1->entry.Template.symbol;
-            if(last_symbol) {
-	         last_symbol->entry.Template.declared_name = sym_temp;
-                 last_symbol = sym_temp;
-             }
-             else {
-                last_symbol = sym_temp;
-                interface_symbol->entry.Template.symb_list = last_symbol;/*19.03.03*/
-             }   
-            list = list->entry.Template.ll_ptr2;                   
-          } 
-	  blob_temp = blob_temp->next;  
-     }
-     last_symbol->entry.Template.declared_name = SMNULL;
-}     
-
-/*
-void
-process_interface(end_of_interface)
-PTR_BFND end_of_interface;
-{
-     PTR_SYMB sym_temp, last_symbol, interface_symbol;
-     PTR_BFND temp;
-     PTR_BLOB blob_temp;
-     
-     temp = pred_bfnd;
-     blob_temp = temp->entry.Template.bl_ptr1;
-     interface_symbol = pred_bfnd->entry.Template.symbol;
-     if (interface_symbol == SMNULL) return;
-     if((pred_bfnd->variant != INTERFACE_STMT)) return;
-     
-     if(!blob_temp->ref) return;
-     last_symbol = blob_temp->ref->entry.Template.symbol;
-     interface_symbol->entry.Template.declared_name = last_symbol;
-     while (blob_temp && (blob_temp->ref != end_of_interface))
-     {
-	  sym_temp = blob_temp->ref->entry.Template.symbol;
-	  last_symbol->entry.Template.declared_name = sym_temp;
-	  blob_temp = blob_temp->next;
-	  last_symbol = sym_temp;
-     }
-     last_symbol->entry.Template.declared_name = SMNULL;
-}     
-*/
-
-PTR_TYPE
-lookup_type(name)
-PTR_HASH name;
-{
- /*    PTR_HASH hash_temp; */
-     PTR_SYMB sym_temp;
-     PTR_TYPE ty_temp;
-     
- /*    hash_temp = just_look_up_sym(name->ident);  */ /*05.04.17*/
- /*    if (hash_temp && (sym_temp = hash_temp->id_attr) && (sym_temp->variant == TYPE_NAME))
-     {
-	  ty_temp = make_type(fi, T_DERIVED_TYPE);
-	  ty_temp->name = sym_temp;
-          ty_temp->entry.derived_type.symbol = sym_temp;
-	  return (ty_temp);
-     }
-     errstr("Undefined type %s", name->ident,319);
-     return (TYNULL);
- */  /*24.04.12*/
-     if (name && (sym_temp = name->id_attr) && (sym_temp->variant == TYPE_NAME))
-       ;
-     else
-       sym_temp = make_sym_entry(name, TYPE_NAME, TYNULL, cur_scope(), LOCAL); 
-     ty_temp = make_type(fi, T_DERIVED_TYPE);
-     ty_temp->name = sym_temp;
-     ty_temp->entry.derived_type.symbol = sym_temp;
-     return (ty_temp);
-
-}
-
-PTR_SYMB
-component(type_sym_entry, fieldname)
-PTR_SYMB type_sym_entry;
-char *fieldname;
-{
-	int i;
-	register PTR_HASH entry;
-	register PTR_SYMB t;
-        PTR_SYMB OriginalSymbol();
-        
-	i = hash(fieldname);
-	for (entry = hash_table[i]; entry; entry = entry->next_entry) {
-	     t = entry->id_attr; 
-	        if (!strcmp(fieldname, entry->ident) && t && 
-		 (t->variant == FIELD_NAME) && OriginalSymbol(t->entry.field.base_name) == OriginalSymbol(type_sym_entry)) /*type_sym_entry->type->name*/ /*BaseSymbol(type_sym_entry)*//*(!strcmp(t->entry.field.base_name->ident, type_sym_entry->ident)) */
-		   return (t);
-	     }
-	
-	return (SMNULL);
-}
-
-PTR_SYMB
-lookup_type_symbol(type_sym_entry)
-PTR_SYMB type_sym_entry;
-{
-    int i;
-    register PTR_HASH entry;
-    register PTR_SYMB s;
-    if (type_sym_entry == NULL)
-        return (SMNULL);
-
-    if (type_sym_entry->type->variant == T_STRUCT && type_sym_entry->type->name)
-        return (type_sym_entry);
-
-    i = hash(type_sym_entry->ident);
-    for (entry = hash_table[i]; entry; entry = entry->next_entry) 
-    {
-        s = entry->id_attr;
-        if (!strcmp(type_sym_entry->ident, entry->ident) && s)
-            if (s->variant == TYPE_NAME && s->type->variant == T_STRUCT && s->type->name)
-                return (s);
-    }
-    return (SMNULL);
-}
-
-PTR_LLND
-deal_with_options(name, type, attributes, dims, ndim, value, spec_dims)
-PTR_HASH name;
-PTR_TYPE type;
-int attributes, ndim;
-PTR_LLND dims, value, spec_dims;
-{
-     PTR_SYMB s;
-     PTR_LLND l;
-     PTR_TYPE t;
-
-     l = LLNULL;
-     s = SMNULL;
-     t = TYNULL;
-
-     if ((attributes & DIMENSION_BIT) && (dims != LLNULL))
-     {   
-	  t = make_type(fi, T_ARRAY);
-	  t->entry.ar_decl.base_type = type;
-	  t->entry.ar_decl.num_dimensions = ndim;
-	  t->entry.ar_decl.ranges = dims; 
-      }
-     else
-          t = type;
-
-     if (attributes & PARAMETER_BIT) 
-     {
-	  s = make_constant(name, type);
-	  s->entry.const_value = value;
-          if(!value)
-             errstr("An initialization expression is missing: %s", s->ident,267 );  
-	  s->attr = s->attr | attributes;
-          if((t->variant==T_STRING) || (t->variant==T_ARRAY)) 
-	    l = make_llnd(fi, ARRAY_REF, spec_dims, LLNULL, s);	
-	  else
-	    l = make_llnd(fi, CONST_REF, LLNULL, LLNULL, s);
-          s->type = t; /*7.03.03*/ 
-	  return (l);
-     }
-     if (attributes & EXTERNAL_BIT) 
-     {
-	  s = make_scalar(name, type, NO);
-	  s->attr = s->attr | attributes;
-          /*s->variant = ROUTINE_NAME;*//*7.02.03*/
-	  l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	  return (l);
-     }
-
-     if (attributes & INTRINSIC_BIT) 
-     {
-          s =  make_intrinsic(name, type); /*make_function(name, type, NO);*/
-	  s->attr = s->attr | attributes;
-	  l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	  return (l);
-     }
-
-     s = make_scalar(name, type, LOCAL);
-     s->attr = s->attr | attributes;
-
-     if ((attributes & DIMENSION_BIT) && (dims != LLNULL))
-     {   
-          s->type = t;
-          /*s = make_array(name, type, dims, ndim, LOCAL);*/
-	  l = make_llnd(fi, ARRAY_REF, spec_dims, LLNULL, s);	
-	  /*s->type->entry.ar_decl.ranges = dims;*/
-     }
-
-     if (l == LLNULL)
-     {
-	  l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-     }
-
-     if (value != LLNULL){
-       if(value->variant == POINTST_OP) {
-          value->entry.Template.ll_ptr1 = l;
-          l = value;          
-       } else
-	  l = make_llnd(fi, ASSGN_OP, l, value, SMNULL);
-          
-          s->attr = s->attr | DATA_BIT;  /*7.03.03*/    
-     }
-
-     return (l);
-}
-
-
-/*
-PTR_LLND
-deal_with_options(name, type, attributes, dims, ndim, value, spec_dims)
-PTR_HASH name;
-PTR_TYPE type;
-int attributes, ndim;
-PTR_LLND dims, value, spec_dims;
-{
-     PTR_SYMB s;
-     PTR_LLND l;
-
-     l = LLNULL;
-     if (attributes & PARAMETER_BIT) 
-     {
-	  s = make_constant(name, type);
-	  s->entry.const_value = value;
-	  s->attr = s->attr | attributes;
-	  l = make_llnd(fi, CONST_REF, LLNULL, LLNULL, s);
-	  * return (l);**7.03.03*
-     }
-     if (attributes & EXTERNAL_BIT) 
-     {
-	  s = make_scalar(name, type, NO);
-	  s->attr = s->attr | attributes;
-	  *s->variant = ROUTINE_NAME;**7.02.03*
-	  l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	  return (l);
-     }
-     if (attributes & INTRINSIC_BIT) 
-     {
-          s =  make_intrinsic(name, type); *make_function(name, type, NO);*
-	  s->attr = s->attr | attributes;
-	  l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-	  return (l);
-     }
-     if ((attributes & DIMENSION_BIT) && (dims != LLNULL))
-     {   
-          s = make_array(s->parent, TYNULL, dims, ndim, LOCAL);
-	  l = make_llnd(fi, ARRAY_REF, spec_dims, LLNULL, s);
-	  s->type->entry.ar_decl.ranges = dims;
-     else
-          s = make_scalar(name, type, LOCAL);
-
-     s->attr = s->attr | attributes;
-
-
-     if (l == LLNULL)
-     {
-	  l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, s);
-     }
-
-     if (value != LLNULL){
-	  l = make_llnd(fi, ASSGN_OP, l, value, SMNULL); 
-          s->attr = s->attr | DATA_BIT;  *7.03.03*   
-     }
-     return (l);
-}
-*/
-/*    
-PTR_BFND
-parent_scope(p)
-register PTR_BFND p;
-{
-     for (p = p->control_parent;
-	     (p != BFNULL) &&
-     	     (p->variant != PROG_HEDR) &&
-	     (p->variant != PROC_HEDR) &&
-	     (p->variant != PROS_HEDR) &&
-	     (p->variant != FUNC_HEDR) &&
-	     (p->variant != BLOCK_DATA) &&
-	     (p->variant != FORALL_NODE) &&
-	     (p->variant != GLOBAL) &&
-	     (p->variant != CDOALL_NODE) &&
-	     (p->variant != SDOALL_NODE) &&
-	     (p->variant != DOACROSS_NODE) &&
-	     (p->variant != CDOACROSS_NODE) &&
-	     (p->variant != STRUCT_DECL);
-	     p = p->control_parent)
-	  ;
-	return (p);
-}
-*/
-
-int is_array_section_ref(list)
-PTR_LLND list;
-{
-     int num_triplets = 0;
-     PTR_LLND p;
-     PTR_TYPE t;
-
-     p = list;
-     while (p != LLNULL) 
-     {
-	  /* subscript range */
-	  if (p->entry.Template.ll_ptr1->variant == DDOT) num_triplets++;
-	  if ((t = list->entry.Template.ll_ptr1->type)) 
-	  {
-	       if (t->variant == KEYWORD_ARG) return (0);
-	       /* vector subscript */
-	       if ((t->variant == T_ARRAY) && (t->entry.ar_decl.base_type->variant == T_INT))
-	       num_triplets++;
-	  }
-	  p = p->entry.Template.ll_ptr2;
-     }
-     
-     return (num_triplets);
-}
-
-int is_substring_ref(list)
-PTR_LLND list;
-{    PTR_LLND l1;
-     
-     l1 = list->entry.Template.ll_ptr1;
-     if (l1->variant == KEYWORD_ARG) return (0);
-     if (list && (list->entry.Template.ll_ptr2 == LLNULL) && 
-	 l1 && (l1->variant == DDOT) && 
-	 (l1->entry.Template.ll_ptr1->variant == DDOT))
-	  return (1);
-     else return (0);
-}
-
-void
-bind()
-{
-     PTR_SYMB s, sym;
-     PTR_LLND tmp;
-     PTR_HASH hash_node;
-     
-     while (first_unresolved_call != LLNULL) 
-     {
-	  s = first_unresolved_call->entry.Template.symbol;
-	  if (s->decl == 0)
-	  {
-	       hash_node = just_look_up_sym_in_scope(s->scope->control_parent, s->ident);
-	       if (hash_node == HSNULL) 
-	       {
-		    s->scope = global_bfnd;
-	       }
-	       else if ((hash_node->id_attr->variant == s->variant) || (hash_node->id_attr->variant == VARIABLE_NAME))
-	       {
-		    sym = hash_node->id_attr;
-		    /*  remove s from symbol table. */
-		    s->parent->id_attr = SMNULL;
-		    first_unresolved_call->entry.Template.symbol = sym;
-	       }
-	       else  errstr("Inconsistent call %s", s->ident, 320);
-	  }
-			 
-	  tmp = first_unresolved_call;
-	  first_unresolved_call = tmp->entry.Template.ll_ptr2;
-	  tmp->entry.Template.ll_ptr2 = LLNULL; 
-     }
-}     
-
-void
-late_bind_if_needed(ll_node)
-PTR_LLND ll_node;
-{
-     PTR_SYMB s;
-     
-     s = ll_node->entry.Template.symbol;
-     if ((s->entry.var_decl.local == IO) || 
-	 (s->decl == YES))
-	  return;
-     else 
-     {
-	  if (first_unresolved_call == LLNULL) 
-	       last_unresolved_call = first_unresolved_call = ll_node;
-	  else 
-	  {
-	       last_unresolved_call->entry.Template.ll_ptr2 = ll_node; 
-	       last_unresolved_call = ll_node;
-	  }
-     }	  
-}  
-     
-void
-redefine_func_arg_type()
-{PTR_BFND hedr;
- PTR_SYMB arg,proc,res;
- hedr = cur_scope();
- if((hedr->variant == FUNC_HEDR) ||(hedr->variant == PROC_HEDR))
-   proc = hedr->entry.Template.symbol;
- else
-   return;
- 
- if((hedr->variant == FUNC_HEDR) && (hedr->entry.Template.ll_ptr2 == LLNULL)){
-   if (proc->type->variant == T_ARRAY)
-      proc->type->entry.ar_decl.base_type = impltype[*proc->ident - 'a'];
-   else
-      proc->type = impltype[*proc->ident - 'a'];
-   if (hedr->entry.Template.ll_ptr1 != LLNULL){
-     res =  hedr->entry.Template.ll_ptr1->entry.Template.symbol;
-     res->type =  impltype[*res->ident - 'a']; 
-   }
- }
- for(arg = proc->entry.proc_decl.in_list; arg; arg=arg->entry.var_decl.next_in)
-   if (arg->type->variant == T_ARRAY)
-      arg->type->entry.ar_decl.base_type = impltype[*arg->ident - 'a'];
-   else
-   {
-      if (*arg->ident - 'a' >= 0)
-         arg->type = impltype[*arg->ident - 'a'];   
-   }
-}
-
-int 
-in_rename_list(symb,list)
-     PTR_SYMB symb;
-     PTR_LLND list;
-{ PTR_SYMB s;
-  PTR_LLND l;
- for(l = list; l ; l = l->entry.Template.ll_ptr2){
-   s = l->entry.Template.ll_ptr1->entry.Template.ll_ptr2->entry.Template.symbol;
-   if(!strcmp(symb->ident,s->ident))
-     return(1);
- }
- return(0);
-}
-
-void
-copy_sym_data(source, dest)
-    PTR_SYMB source, dest;
-{PTR_SYMB BaseSymbol();
-   if(source->variant == CONST_NAME) {/* named constant */ /*16.03.03 */
-     dest->entry.const_value = source->entry.const_value;
-     dest->entry.Template.base_name = BaseSymbol(source); /*27.01.12*/
-     dest->attr = source->attr;   /*06.11.12*/
-     return;
-   }
-   if(dest->entry.Template.seen == BY_USE) return;
-
-     dest->attr = source->attr; /* source->attr  & (~PRIVATE_BIT) & (~PUBLIC_BIT);*/
-     dest->attr = dest->attr & (~PRIVATE_BIT);
-     dest->attr = dest->attr & (~PUBLIC_BIT);
-     if(privateall)
-	 dest->attr =  dest->attr | PRIVATE_BIT;
-     dest->entry.Template.seen = BY_USE; /*source->entry.Template.seen;*/
-     dest->entry.Template.num_input = source->entry.Template.num_input;
-     dest->entry.Template.num_output = source->entry.Template.num_output;
-     dest->entry.Template.num_io = source->entry.Template.num_io;
-     dest->entry.Template.in_list = source->entry.Template.in_list;
-     dest->entry.Template.out_list = source->entry.Template.out_list;
-     dest->entry.Template.symb_list = source->entry.Template.symb_list;
-     dest->entry.Template.local_size = source->entry.Template.local_size;
-     dest->entry.Template.label_list = source->entry.Template.label_list;
-     dest->entry.Template.func_hedr = source->entry.Template.func_hedr;
-     dest->entry.Template.call_list = source->entry.Template.call_list;
-     dest->entry.Template.tag = source->entry.Template.tag;
-     dest->entry.Template.offset = source->entry.Template.offset;
-     dest->entry.Template.declared_name = source->entry.Template.declared_name;
-     /*dest->entry.Template.next = source->entry.Template.next;*/
-     /*dest->entry.Template.base_name = source->entry.Template.base_name;*/
-
-     dest->entry.Template.base_name = BaseSymbol(source); /*25.03.03*/ /*source;*/    
-}
-
-void 
-delete_symbol(symb)
-     PTR_SYMB symb;
-{
-/*     PTR_SYMB symb_scope, s, s_pre;
-
-     symb_scope = symb->scope->entry.Template.symbol;
-     for(s=symb_scope->thread,s_pre=symb_scope; s; s_pre=s,s=s->thread) {
-        if(s==symb) {
-           s_pre->thread = s->thread;
-           return;
-        }
-     }
-*/
-/*     symb->parent = BFNULL;  */
-     symb->ident = "***";
-     symb->scope = BFNULL;
-     symb->type  = TYNULL;
-     return;
-}
-
-int 
-copy_is(sym_mod)
-     PTR_SYMB sym_mod;
-{ //looking for a USE-ststement with sym_mod symbol without ONLY-clause  
- PTR_BFND st;
- for(st=cur_scope()->thread; st!=last_bfnd; st=st->thread) {
-    if(st->variant==USE_STMT && st->entry.Template.ll_ptr1 && st->entry.Template.ll_ptr1->variant==ONLY_NODE)
-       continue;
-    if(st->variant==USE_STMT && !strcmp(st->entry.Template.symbol->ident,sym_mod->ident))
-       return (1); 
- }     
- return (0);
-}
- 
-void 
-copy_module_scope(sym_mod,list)
-     PTR_SYMB sym_mod;
-     PTR_LLND list;
- 
-{
- PTR_SYMB new_symb, source;
- PTR_HASH copy;
-
- if(copy_is(sym_mod))
-    return;
- for(source=sym_mod->entry.Template.next; source; source=source->entry.Template.next) {
-    if((source->attr & PRIVATE_BIT) && (!(source->attr & PUBLIC_BIT)) )
-       continue;
-    if(source->variant == FUNCTION_NAME && source->decl != YES)  /* intrinsic function called from specification expression */ /* podd 24.02.24 */
-       continue;
-    if(list && in_rename_list(source,list))
-       continue;
-    if(!strcmp(source->ident, "***")) 
-       continue;
-    if((copy=just_look_up_sym_in_scope(cur_scope(),source->ident)) && copy->id_attr && copy->id_attr->entry.Template.tag==sym_mod->entry.Template.func_hedr->id)
-       continue;
-    new_symb = make_local_entity(source->parent, source->variant, source->type, LOCAL);
-    copy_sym_data(source,new_symb);
-    new_symb->entry.Template.tag = sym_mod->entry.Template.func_hedr->id;
-   /* if(new_symb->entry.Template.seen != BY_USE) {
-       copy_sym_data(source,new_symb);  
-       new_symb->entry.Template.base_name = source; 
-      }
-   */      
- }
-   return;
-}
-      
-PTR_SYMB
-BaseSymbol(sym)
-     PTR_SYMB sym;
-{ PTR_SYMB s;
- s = sym;
- while(s && s->entry.Template.seen == BY_USE)
-   s = s->entry.Template.base_name;
- return(s);
-}
-
-PTR_SYMB
-OriginalSymbol(sym)
-     PTR_SYMB sym;
-{ 
- if(sym && sym->entry.Template.base_name)
-   return(sym->entry.Template.base_name);
- else
-   return(sym);
-}
-
-int isResultVar(sym)
-     PTR_SYMB sym;
-{ PTR_BFND curstmt;
-  curstmt = cur_scope();
-  if ((sym->variant == FUNCTION_NAME) &&(curstmt->variant == FUNC_HEDR) && (!curstmt->entry.Template.ll_ptr1) &&
-	      (!(strcmp(sym->parent->ident, curstmt->entry.Template.symbol->ident))))
-    return(1); /* function name is a result variable name */
-  else
-    return(0);
-}
-
-void replace_symbol_in_expr(PTR_LLND expr, PTR_SYMB symb)
-{                                                      
-   if(!expr) 
-      return;
-   if(expr->variant == VAR_REF)
-      if(!strcmp(expr->entry.Template.symbol->ident, symb->ident))
-         expr->entry.Template.symbol = symb;
-   replace_symbol_in_expr(expr->entry.Template.ll_ptr1,symb);
-   replace_symbol_in_expr(expr->entry.Template.ll_ptr2,symb);
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/parser/tag b/projects/dvm_svn/fdvm/trunk/parser/tag
deleted file mode 100644
index 343d1f5..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/tag
+++ /dev/null
@@ -1,628 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
- 
-/******************* variant tags for bif nodes **********************/
-
-#define GLOBAL			100
-#define PROG_HEDR		101
-#define PROC_HEDR		102
-#define BASIC_BLOCK		103
-#define CONTROL_END		104
-#define IF_NODE			105
-#define LOOP_NODE		106
-#define FOR_NODE		107
-#define FORALL_NODE		108
-#define WHILE_NODE		109
-#define EXIT_NODE		110
-#define ASSIGN_STAT		111
-#define M_ASSIGN_STAT		112
-#define PROC_STAT		113
-#define SUM_ACC			114	/* accumulation statements */
-#define MULT_ACC		115
-#define MAX_ACC			116
-#define MIN_ACC			117
-#define CAT_ACC			118
-#define OR_ACC			119
-#define AND_ACC			120
-#define READ_STAT		121
-#define WRITE_STAT		122
-#define OTHERIO_STAT		123
-#define CDOALL_NODE		124
-#define SDOALL_NODE		125
-#define DOACROSS_NODE		126
-#define CDOACROSS_NODE		127
-#define DVM_INTERVAL_DIR	128  /* DVM-F */
-#define DVM_ENDINTERVAL_DIR	129  /* DVM-F */
-#define FUNC_HEDR		130
-#define WHERE_NODE		131
-#define ALLDO_NODE		132
-#define IDENTIFY		133
-#define FORMAT_STAT		134
-#define STOP_STAT		135
-#define RETURN_STAT		136
-#define ELSEIF_NODE		137
-#define ARITHIF_NODE		138
-#define GOTO_NODE		139
-#define ASSGOTO_NODE		140
-#define COMGOTO_NODE		141
-#define PAUSE_NODE		142
-#define STOP_NODE		143
-#define ASSLAB_STAT		144
-#define LOGIF_NODE		145
-#define DVM_DEBUG_DIR		146  /* DVM-F */
-#define DVM_ENDDEBUG_DIR	147  /* DVM-F */
-#define DVM_TRACEON_DIR		148  /* DVM-F */
-#define DVM_TRACEOFF_DIR	149  /* DVM-F */
-#define BLOB			150
-#define SIZES			151
-#define COMMENT_STAT		152
-#define CONT_STAT		153
-#define VAR_DECL		154
-#define PARAM_DECL		155
-#define COMM_STAT		156
-#define EQUI_STAT		157
-#define IMPL_DECL		158
-#define DATA_DECL		159
-#define SAVE_DECL		160
-#define ENTRY_STAT		162
-#define STMTFN_STAT		163
-#define DIM_STAT		164
-#define BLOCK_DATA		165
-#define EXTERN_STAT		166
-#define INTRIN_STAT		167
-#define ENUM_DECL		168	/* New added for VPC */
-#define CLASS_DECL		169	/* New added for VPC */
-#define UNION_DECL		170	/* New added for VPC */
-#define STRUCT_DECL		171	/* New added for VPC */
-#define DERIVED_CLASS_DECL	172	/* New added for VPC */
-#define EXPR_STMT_NODE		173	/* New added for VPC */
-#define DO_WHILE_NODE		174	/* New added for VPC */
-#define SWITCH_NODE		175	/* New added for VPC */
-#define CASE_NODE		176	/* New added for VPC */
-#define DEFAULT_NODE		177	/* New added for VPC */
-#define BREAK_NODE		178	/* New added for VPC */
-#define CONTINUE_NODE		179	/* New added for VPC */
-#define RETURN_NODE		180	/* New added for VPC */
-#define ASM_NODE		181	/* New added for VPC */
-#define SPAWN_NODE		182	/* New added for CC++ */
-#define PARFOR_NODE		183	/* New added for CC++ */
-#define PAR_NODE		184	/* New added for CC++ */
-#define LABEL_STAT		185	/* New added for VPC */
-#define PROS_COMM		186	/* Fortran M */
-#define ATTR_DECL		187	/* attribute declaration */
-#define NAMELIST_STAT		188
-#define FUTURE_STMT		189	/* NEW added for VPC */
-#define COLLECTION_DECL		190	/* NEW added for PC++ */
-#define TEMPLATE_DECL		191     /* added by dbg for templates */
-#define TEMPLATE_FUNDECL	192     /* added by dbg for template function*/
-#define TECLASS_DECL		193     /* added for pC++ */
-#define ELSEWH_NODE		194     /*F95*/
-#define STATIC_STMT             195     /*F95*/
-#define INCLUDE_LINE            196     /*F95*/
-#define PREPROCESSOR_DIR        197     /*C,C++*/
-#define PRINT_STAT		200
-#define BACKSPACE_STAT		201
-#define REWIND_STAT		202
-#define ENDFILE_STAT		203
-#define INQUIRE_STAT		204
-#define OPEN_STAT		205
-#define CLOSE_STAT		206
-#define EXTERN_C_STAT		207	/* Added by PHB for 'extern "C" {}' */
-#define INCLUDE_STAT		208
-#define TRY_STAT		209     /* added by dbg for C++ exceptions  */
-#define CATCH_STAT		210     /* moreexcpt handling (part of try) */
-#define DVM_PARALLEL_ON_DIR     211  /* DVM-F */
-#define DVM_SHADOW_START_DIR    212  /* DVM-F */
-#define DVM_SHADOW_GROUP_DIR    213  /* DVM-F */
-#define DVM_SHADOW_WAIT_DIR     214  /* DVM-F */
-#define DVM_REDUCTION_START_DIR 215  /* DVM-F */
-#define DVM_REDUCTION_GROUP_DIR 216  /* DVM-F */
-#define DVM_REDUCTION_WAIT_DIR  217  /* DVM-F */
-#define DVM_DYNAMIC_DIR         218  /* DVM-F */
-#define DVM_ALIGN_DIR           219  /* DVM-F */
-#define DVM_REALIGN_DIR         220  /* DVM-F */
-#define DVM_REALIGN_NEW_DIR     221  /* DVM-F */
-#define DVM_REMOTE_ACCESS_DIR   222  /* DVM-F */
-#define HPF_INDEPENDENT_DIR     223  /* HPF */
-#define DVM_SHADOW_DIR          224  /* DVM-F */
-#define PARDO_NODE		225     /* Following added for PCF Fortran */
-#define PARSECTIONS_NODE	226
-#define SECTION_NODE		227
-#define GUARDS_NODE		228
-#define LOCK_NODE		229
-#define UNLOCK_NODE		230
-#define CRITSECTION_NODE	231
-#define POST_NODE		232
-#define WAIT_NODE		233
-#define CLEAR_NODE		234
-#define POSTSEQ_NODE		235
-#define WAITSEQ_NODE		236
-#define SETSEQ_NODE		237
-#define ASSIGN_NODE		238
-#define RELEASE_NODE		239
-#define PRIVATE_NODE		240
-#define SCOMMON_NODE		241
-#define PARREGION_NODE		242
-#define PDO_NODE		243
-#define PSECTIONS_NODE		244
-#define SINGLEPROCESS_NODE	245
-#define SKIPPASTEOF_NODE	246
-#define DVM_NEW_VALUE_DIR	247 /* DVM-F */
-#define DVM_VAR_DECL    	248 /* DVM-F */
-#define DVM_POINTER_DIR    	249 /* DVM-F */
-#define INTENT_STMT             250        /* Added for Fortran 90 */
-#define OPTIONAL_STMT           251
-#define PUBLIC_STMT             252
-#define PRIVATE_STMT            253
-#define ALLOCATABLE_STMT        254
-#define POINTER_STMT            255
-#define TARGET_STMT             256
-#define ALLOCATE_STMT           257
-#define NULLIFY_STMT            258
-#define DEALLOCATE_STMT         259
-#define SEQUENCE_STMT	        260
-#define CYCLE_STMT	        261
-#define EXIT_STMT	        262
-#define CONTAINS_STMT           263
-#define WHERE_BLOCK_STMT 	264
-#define MODULE_STMT	        265
-#define USE_STMT	        266
-#define INTERFACE_STMT	        267
-#define MODULE_PROC_STMT	268
-#define OVERLOADED_ASSIGN_STAT  269
-#define POINTER_ASSIGN_STAT     270
-#define OVERLOADED_PROC_STAT	271
-#define DECOMPOSITION_STMT	275
-#define ALIGN_STMT		276
-#define DVM_DISTRIBUTE_DIR	277  /* DVM-F */ 
-#define REDUCE_STMT		278
-#define PROS_HEDR		279  /* Fortran M */
-#define PROS_STAT		280  /* Fortran M */
-#define PROS_STAT_LCTN		281  /* Fortran M */
-#define PROS_STAT_SUBM		282  /* Fortran M */
-#define PROCESSES_STAT		283  /* Fortran M */
-#define PROCESSES_END		284  /* Fortran M */
-#define PROCESS_DO_STAT         285  /* Fortran M */
-#define PROCESSORS_STAT		286  /* Fortran M */
-#define CHANNEL_STAT		287  /* Fortran M */
-#define MERGER_STAT		288  /* Fortran M */
-#define MOVE_PORT		289  /* Fortran M */
-#define SEND_STAT		290  /* Fortran M */
-#define RECEIVE_STAT		291  /* Fortran M */
-#define ENDCHANNEL_STAT		292  /* Fortran M */
-#define PROBE_STAT		293  /* Fortran M */
-#define INPORT_DECL     	294  /* Fortran M */
-#define OUTPORT_DECL		295  /* Fortran M */
-#define HPF_TEMPLATE_STAT       296  /* HPF */
-#define HPF_ALIGN_STAT          297  /* HPF */    
-#define HPF_PROCESSORS_STAT     298  /* HPF */
-#define DVM_REDISTRIBUTE_DIR    299  /* DVM-F */
-#define DVM_TASK_REGION_DIR 	605	/* DVM-F */
-#define DVM_END_TASK_REGION_DIR	606	/* DVM-F */
-#define DVM_ON_DIR  		607	/* DVM-F */
-#define DVM_END_ON_DIR		608	/* DVM-F */
-#define DVM_TASK_DIR           	609	/* DVM-F */
-#define DVM_MAP_DIR 		610	/* DVM-F */
-#define DVM_PARALLEL_TASK_DIR	611     /* DVM-F */
-#define DVM_INHERIT_DIR		612	/* DVM-F */
-#define DVM_INDIRECT_GROUP_DIR	613	/* DVM-F */
-#define DVM_INDIRECT_ACCESS_DIR	614	/* DVM-F */
-#define DVM_REMOTE_GROUP_DIR	615	/* DVM-F */
-#define DVM_RESET_DIR		616	/* DVM-F */
-#define DVM_PREFETCH_DIR	617	/* DVM-F */
-#define DVM_OWN_DIR		618	/* DVM-F */
-#define DVM_HEAP_DIR		619	/* DVM-F */
-#define DVM_ASYNCID_DIR		620	/* DVM-F */
-#define DVM_ASYNCHRONOUS_DIR	621	/* DVM-F */
-#define DVM_ENDASYNCHRONOUS_DIR	622	/* DVM-F */
-#define DVM_ASYNCWAIT_DIR	623	/* DVM-F */
-#define DVM_F90_DIR		624	/* DVM-F */
-#define DVM_BARRIER_DIR		625	/* DVM-F */
-#define FORALL_STAT		626	/* F95 */
-#define DVM_CONSISTENT_GROUP_DIR 627	/* DVM-F */
-#define DVM_CONSISTENT_START_DIR 628	/* DVM-F */
-#define DVM_CONSISTENT_WAIT_DIR  629	/* DVM-F */
-#define DVM_CONSISTENT_DIR       630	/* DVM-F */
-#define DVM_CHECK_DIR            631	/* DVM-F */
-#define DVM_IO_MODE_DIR          632	/* DVM-F */
-#define DVM_LOCALIZE_DIR         633    /* DVM-F */
-#define DVM_SHADOW_ADD_DIR       634    /* DVM-F */
-#define DVM_CP_CREATE_DIR        635	/* DVM-F */ 
-#define DVM_CP_LOAD_DIR          636	/* DVM-F */
-#define DVM_CP_SAVE_DIR          637	/* DVM-F */
-#define DVM_CP_WAIT_DIR          638	/* DVM-F */
-#define DVM_EXIT_INTERVAL_DIR	 639    /* DVM-F */
-#define DVM_TEMPLATE_CREATE_DIR	 640    /* DVM-F */ 
-#define DVM_TEMPLATE_DELETE_DIR	 641    /* DVM-F */
-#define PRIVATE_AR_DECL          642    /* DVM-F */
-    
-/***************** variant tags for low level nodes ********************/
-
-#define INT_VAL			300
-#define FLOAT_VAL		301
-#define DOUBLE_VAL		302
-#define BOOL_VAL		303
-#define CHAR_VAL		304
-#define STRING_VAL		305
-#define CONST_REF		306
-#define VAR_REF			307
-#define ARRAY_REF		308
-#define RECORD_REF		309   /* diff struct between Blaze and VPC++ */
-#define ENUM_REF		310
-#define VAR_LIST		311
-#define EXPR_LIST		312
-#define RANGE_LIST		313
-#define CASE_CHOICE		314
-#define DEF_CHOICE		315
-#define VARIANT_CHOICE		316
-#define COMPLEX_VAL		317
-#define LABEL_REF		318
-#define KEYWORD_VAL		319   /* Strings to be printed with quotes */
-#define DDOT			324
-#define RANGE_OP		325
-#define UPPER_OP		326
-#define LOWER_OP		327
-#define EQ_OP			328
-#define LT_OP			329
-#define GT_OP			330
-#define NOTEQL_OP		331
-#define LTEQL_OP		332
-#define GTEQL_OP		333
-#define ADD_OP			334
-#define SUBT_OP			335
-#define OR_OP			336
-#define MULT_OP			337
-#define DIV_OP			338
-#define MOD_OP			339
-#define AND_OP			340
-#define EXP_OP			341
-#define ARRAY_MULT		342
-#define CONCAT_OP		343	/* cancatenation of strings */
-#define XOR_OP			344	/* .XOR. in fortran */
-#define EQV_OP			345	/* .EQV. in fortran */
-#define NEQV_OP			346	/* .NEQV. in fortran */
-#define MINUS_OP		350	/* unary operations */
-#define NOT_OP			351
-#define ASSGN_OP		352	/* New ADDED For VPC */
-#define DEREF_OP		353	/* New ADDED For VPC */
-#define POINTST_OP		354	/* New ADDED For VPC */	/* ptr->x  */
-#define FUNCTION_OP		355	/* New ADDED For VPC */	/* (*DD)() */
-#define MINUSMINUS_OP		356	/* New ADDED For VPC */
-#define PLUSPLUS_OP		357	/* New ADDED For VPC */
-#define BITAND_OP		358	/* New ADDED For VPC */
-#define BITOR_OP		359	/* New ADDED For VPC */
-#define STAR_RANGE		360	/* operations with no operands 360.. */
-#define PROC_CALL		370
-#define FUNC_CALL		371
-#define CONSTRUCTOR_REF 	380
-#define ACCESS_REF		381
-#define CONS			382
-#define ACCESS			383
-#define IOACCESS		384
-#define CONTROL_LIST		385
-#define SEQ			386
-#define SPEC_PAIR		387
-#define COMM_LIST		388
-#define STMT_STR		389
-#define EQUI_LIST		390
-#define IMPL_TYPE		391
-#define STMTFN_DECL		392
-#define BIT_COMPLEMENT_OP     	393
-#define EXPR_IF			394
-#define EXPR_IF_BODY		395
-#define FUNCTION_REF		396
-#define LSHIFT_OP		397
-#define RSHIFT_OP		398
-#define UNARY_ADD_OP		399
-#define SIZE_OP			400
-#define INTEGER_DIV_OP		401
-#define SUB_OP			402
-#define LE_OP			403	/* New added for VPC */
-#define GE_OP			404	/* New added for VPC */
-#define NE_OP			405	/* New added for VPC */
-#define CLASSINIT_OP		406	/* New added for VPC */
-#define CAST_OP			407	/* New added for VPC */
-#define ADDRESS_OP		408	/* New added for VPC */
-#define POINSTAT_OP		409	/* New added for VPC */    
-#define COPY_NODE		410	/* New added for VPC */    
-#define INIT_LIST		411	/* New added for VPC */    
-#define VECTOR_CONST		412	/* New added for VPC */    
-#define BIT_NUMBER		413	/* New added for VPC */    
-#define ARITH_ASSGN_OP		414	/* New added for VPC */    
-#define ARRAY_OP		415	/* New added for VPC */   
-#define NEW_OP			416	/* New added for VPC */    
-#define DELETE_OP		417	/* New added for VPC */
-#define NAMELIST_LIST		418
-#define THIS_NODE		419	/* New added for VPC */    
-#define SCOPE_OP		420	/* New added for VPC */    
-#define PLUS_ASSGN_OP		421	/* New added for VPC */    
-#define MINUS_ASSGN_OP		422	/* New added for VPC */    
-#define AND_ASSGN_OP		423	/* New added for VPC */    
-#define IOR_ASSGN_OP		424	/* New added for VPC */    
-#define MULT_ASSGN_OP		425	/* New added for VPC */    
-#define DIV_ASSGN_OP		426	/* New added for VPC */    
-#define MOD_ASSGN_OP		427	/* New added for VPC */    
-#define XOR_ASSGN_OP		428	/* New added for VPC */    
-#define LSHIFT_ASSGN_OP 	429	/* New added for VPC */    
-#define RSHIFT_ASSGN_OP 	430	/* New added for VPC */    
-#define ORDERED_OP		431     /* Following added for PCF FORTRAN */
-#define EXTEND_OP		432
-#define MAXPARALLEL_OP		433
-#define SAMETYPE_OP             434
-#define TYPE_REF                450     /* Added for FORTRAN 90 */
-#define STRUCTURE_CONSTRUCTOR   451
-#define ARRAY_CONSTRUCTOR       452
-#define SECTION_REF             453
-#define VECTOR_SUBSCRIPT        454
-#define SECTION_OPERANDS        455
-#define KEYWORD_ARG   	        456
-#define OVERLOADED_CALL	        457
-#define INTERFACE_REF           458
-#define RENAME_NODE	        459
-#define TYPE_NODE	        460
-#define PAREN_OP	        461
-#define PARAMETER_OP	        462
-#define PUBLIC_OP	        463
-#define PRIVATE_OP	        464
-#define ALLOCATABLE_OP	        465
-#define DIMENSION_OP	        466
-#define EXTERNAL_OP	        467
-#define IN_OP	                468
-#define OUT_OP	        	469
-#define INOUT_OP	        470
-#define INTRINSIC_OP	        471
-#define POINTER_OP	        472
-#define OPTIONAL_OP	        473
-#define SAVE_OP	        	474
-#define TARGET_OP	        475
-#define ONLY_NODE        	476
-#define LEN_OP	        	477
-#define TYPE_OP 	        479
-#define DOTSTAR_OP         	480	/* C++ .* operator */
-#define ARROWSTAR_OP		481	/* C++ ->* operator */
-#define FORDECL_OP		482	/* C++ for(int i; needs a new op */
-#define THROW_OP		483	/* C++ throw operator */
-#define PROCESSORS_REF		484	/* Fortran M */
-#define PORT_TYPE_OP		485	/* Fortran M */
-#define INPORT_TYPE_OP		486	/* Fortran M */
-#define OUTPORT_TYPE_OP		487	/* Fortran M */
-#define INPORT_NAME		488	/* Fortran M */
-#define OUTPORT_NAME		489	/* Fortran M */
-#define FROMPORT_NAME		490	/* Fortran M */
-#define TOPORT_NAME		491	/* Fortran M */
-#define IOSTAT_STORE		492	/* Fortran M */
-#define EMPTY_STORE		493	/* Fortran M */
-#define ERR_LABEL		494	/* Fortran M */
-#define END_LABEL		495	/* Fortran M */
-#define PROS_CALL		496	/* Fortran M */
-#define STATIC_OP               497     /* F95*/
-#define LABEL_ARG               498  
-#define DATA_IMPL_DO            700     /* Fortran M */
-#define DATA_ELT                701     /* Fortran M */
-#define DATA_SUBS               702     /* Fortran M */
-#define DATA_RANGE              703     /* Fortran M */
-#define ICON_EXPR               704     /* Fortran M */
-#define BLOCK_OP                705     /* DVM-F */
-#define NEW_SPEC_OP             706     /* DVM-F */
-#define REDUCTION_OP            707     /* DVM-F */
-#define SHADOW_RENEW_OP         708     /* DVM-F */
-#define SHADOW_START_OP         709     /* DVM-F */
-#define SHADOW_WAIT_OP          710     /* DVM-F */
-#define DIAG_OP                 711     /* DVM-F */
-#define REMOTE_ACCESS_OP        712     /* DVM-F */
-#define TEMPLATE_OP             713     /* DVM-F */
-#define PROCESSORS_OP           714     /* DVM-F */
-#define DYNAMIC_OP              715     /* DVM-F */
-#define ALIGN_OP                716     /* DVM-F */
-#define DISTRIBUTE_OP           717     /* DVM-F */
-#define SHADOW_OP               718     /* DVM-F */
-#define INDIRECT_ACCESS_OP      719     /* DVM-F */
-#define ACROSS_OP               720     /* DVM-F */
-#define NEW_VALUE_OP            721     /* DVM-F */
-#define SHADOW_COMP_OP          722     /* DVM-F */
-#define STAGE_OP                723     /* DVM-F */
-#define FORALL_OP               724     /* F95 */	
-#define CONSISTENT_OP           725     /* DVM-F */
-#define INTERFACE_OPERATOR	726     /* F95 */
-#define INTERFACE_ASSIGNMENT	727     /* F95 */
-#define VAR_DECL_90             728     /* F95 */
-#define ASSIGNMENT_OP           729     /* F95 */
-#define OPERATOR_OP             730     /* F95 */
-#define KIND_OP                 731     /* F95 */
-#define LENGTH_OP               732     /* F95 */
-#define RECURSIVE_OP            733     /* F95 */
-#define ELEMENTAL_OP            734     /* F95 */
-#define PURE_OP                 735     /* F95 */
-#define DEFINED_OP	        736     /* F95 */
-#define PARALLEL_OP             737     /*DVM-F */ 
-#define INDIRECT_OP             738     /*DVM-F */
-#define DERIVED_OP              739     /*DVM-F */
-#define DUMMY_REF               740     /*DVM-F */
-#define COMMON_OP               741     /*DVM-F */
-#define SHADOW_NAMES_OP         742     /*DVM-F */
-
-/***************** variant tags for symbol table entries ********************/
-
-#define CONST_NAME		500	/* constant types */
-#define ENUM_NAME		501
-#define FIELD_NAME		502   
-#define VARIABLE_NAME		503 
-#define TYPE_NAME		504
-#define PROGRAM_NAME		505
-#define PROCEDURE_NAME		506
-#define VAR_FIELD		507
-#define LABEL_VAR		508	/* dest of assigned goto stmt */
-#define FUNCTION_NAME		509
-#define MEMBER_FUNC		510	/* new added for VPC */
-#define CLASS_NAME		511	/* new added for VPC */
-#define UNION_NAME		512	/* new added for VPC */
-#define STRUCT_NAME		513	/* new added for VPC */
-#define LABEL_NAME		514	/* new added for VPC */
-#define COLLECTION_NAME		515	/* new added for VPC */
-#define ROUTINE_NAME		516	/*added for external statement*/
-#define CONSTRUCT_NAME          517
-#define INTERFACE_NAME	        518
-#define MODULE_NAME	        519
-#define TEMPLATE_CL_NAME	520
-#define TEMPLATE_FN_NAME	521
-#define TECLASS_NAME		522
-#define SHADOW_GROUP_NAME	523   /*  DVM_F */
-#define REDUCTION_GROUP_NAME	524   /*  DVM_F */
-#define REF_GROUP_NAME	        525   /*  DVM_F */
-#define ASYNC_ID		526   /*  DVM_F */
-#define CONSISTENT_GROUP_NAME   527   /*  DVM_F */
-#define NAMELIST_NAME           528
-#define COMMON_NAME             529 /* name of a common block (add Kataev N.A., 02.04.2014)*/
-
-#define DEFAULT			550
-#define T_INT			551	/* scalar types */
-#define T_FLOAT			552
-#define T_DOUBLE		553
-#define T_CHAR			554
-#define T_BOOL			555
-#define T_STRING		556
-#define T_ENUM			557
-#define T_SUBRANGE		558
-#define T_LIST			559
-#define T_ARRAY			560
-#define T_RECORD		561
-#define T_ENUM_FIELD		562
-#define T_UNKNOWN		563
-#define T_COMPLEX		564
-#define T_VOID			565	/* New one for VPC */
-#define T_DESCRIPT		566	/* New one for VPC */
-#define T_FUNCTION		567	/* New one for VPC */
-#define T_POINTER		568	/* New one for VPC */
-#define T_UNION			569	/* New one for VPC */
-#define T_STRUCT		570	/* New one for VPC */
-#define T_CLASS			571	/* New one for VPC */
-#define T_DERIVED_CLASS 	572	/* New one for VPC */
-#define T_DERIVED_TYPE		573	/* New one for VPC */
-#define T_COLLECTION		574	/* New one for PC++*/
-#define T_DERIVED_COLLECTION	575	/* New one for PC++*/
-#define T_REFERENCE		576	/* New one for PC++*/
-#define T_DERIVED_TEMPLATE      577     /* template type T<A,3,4> */
-#define T_MEMBER_POINTER        578     /* need for C::* (ptr to memb ) */ 
-#define T_TECLASS		579	/* new one for pC++*/
-#define T_GATE			580     /* added for PCF FORTRAN */
-#define T_EVENT			581
-#define T_SEQUENCE		582
-#define T_DCOMPLEX		583
-#define T_LONG			584
-#define BY_USE		        599     /* Fortran 90 */
-#define LOCAL			600	/* variable type */
-#define INPUT			601
-#define OUTPUT			602
-#define IO			603
-#define PROCESS_NAME 		604     /* Fortran M */
-
-#define OMP_PRIVATE                      801     /* OpenMP Fortran */
-#define OMP_SHARED                       802     /* OpenMP Fortran */
-#define OMP_FIRSTPRIVATE                 803     /* OpenMP Fortran */
-#define OMP_LASTPRIVATE                  804     /* OpenMP Fortran */
-#define OMP_THREADPRIVATE                805     /* OpenMP Fortran */
-#define OMP_COPYIN                       806     /* OpenMP Fortran */
-#define OMP_COPYPRIVATE                  807     /* OpenMP Fortran */
-#define OMP_DEFAULT                      808     /* OpenMP Fortran */
-#define OMP_ORDERED                      809     /* OpenMP Fortran */
-#define OMP_SCHEDULE                     810	 /* OpenMP Fortran */
-#define OMP_REDUCTION                    811	 /* OpenMP Fortran */
-#define OMP_IF                           812     /* OpenMP Fortran */
-#define OMP_NUM_THREADS                  813     /* OpenMP Fortran */
-#define OMP_NOWAIT                       814     /* OpenMP Fortran */
-#define OMP_PARALLEL_DIR                 820     /* OpenMP Fortran */
-#define OMP_END_PARALLEL_DIR             821     /* OpenMP Fortran */
-#define OMP_DO_DIR                       822     /* OpenMP Fortran */
-#define OMP_END_DO_DIR                   823     /* OpenMP Fortran */
-#define OMP_SECTIONS_DIR                 824     /* OpenMP Fortran */
-#define OMP_END_SECTIONS_DIR             825     /* OpenMP Fortran */
-#define OMP_SECTION_DIR                  826     /* OpenMP Fortran */
-#define OMP_SINGLE_DIR                   827     /* OpenMP Fortran */ 
-#define OMP_END_SINGLE_DIR               828     /* OpenMP Fortran */ 
-#define OMP_WORKSHARE_DIR                829     /* OpenMP Fortran */ 
-#define OMP_END_WORKSHARE_DIR            830     /* OpenMP Fortran */   
-#define OMP_PARALLEL_DO_DIR              831     /* OpenMP Fortran */    
-#define OMP_END_PARALLEL_DO_DIR          832     /* OpenMP Fortran */   
-#define OMP_PARALLEL_SECTIONS_DIR        833     /* OpenMP Fortran */    
-#define OMP_END_PARALLEL_SECTIONS_DIR    834     /* OpenMP Fortran */   
-#define OMP_PARALLEL_WORKSHARE_DIR       835     /* OpenMP Fortran */   
-#define OMP_END_PARALLEL_WORKSHARE_DIR   836     /* OpenMP Fortran */   
-#define OMP_MASTER_DIR                   837     /* OpenMP Fortran */    
-#define OMP_END_MASTER_DIR               838     /* OpenMP Fortran */    
-#define OMP_CRITICAL_DIR                 839     /* OpenMP Fortran */   
-#define OMP_END_CRITICAL_DIR             840     /* OpenMP Fortran */   
-#define OMP_BARRIER_DIR                  841     /* OpenMP Fortran */   
-#define OMP_ATOMIC_DIR                   842     /* OpenMP Fortran */   
-#define OMP_FLUSH_DIR                    843     /* OpenMP Fortran */   
-#define OMP_ORDERED_DIR                  844     /* OpenMP Fortran */   
-#define OMP_END_ORDERED_DIR              845     /* OpenMP Fortran */   
-#define RECORD_DECL                      846     /* OpenMP Fortran */   
-#define FUNC_STAT                        847     /* OpenMP Fortran */   
-#define OMP_ONETHREAD_DIR                848     /* OpenMP Fortran */
-#define OMP_THREADPRIVATE_DIR            849     /* OpenMP Fortran */   
-#define OMP_DEFAULT_SECTION_DIR          850     /* OpenMP Fortran */
-#define OMP_COLLAPSE                     851     /* OpenMP Fortran */
-
-#define ACC_REGION_DIR        	         900     /* ACC Fortran */
-#define ACC_END_REGION_DIR               901     /* ACC Fortran */
-#define ACC_CALL_STMT                    907     /* ACC Fortran */
-#define ACC_KERNEL_HEDR                  908     /* ACC Fortran */
-#define ACC_GET_ACTUAL_DIR               909     /* ACC Fortran */
-#define ACC_ACTUAL_DIR                   910     /* ACC Fortran */
-#define ACC_CHECKSECTION_DIR             911     /* ACC Fortran */
-#define ACC_END_CHECKSECTION_DIR         912     /* ACC Fortran */
-#define ACC_ROUTINE_DIR                  913     /* ACC Fortran */
-#define ACC_DECLARE_DIR                  914     /* ACC Fortran */
-
-#define ACC_TIE_OP                       930     /* ACC Fortran */          
-#define ACC_INLOCAL_OP                   931     /* ACC Fortran */
-#define ACC_INOUT_OP                     932     /* ACC Fortran */
-#define ACC_IN_OP                        933     /* ACC Fortran */
-#define ACC_OUT_OP                       934     /* ACC Fortran */
-#define ACC_LOCAL_OP                     935     /* ACC Fortran */
-#define ACC_PRIVATE_OP                   936     /* ACC Fortran */
-#define ACC_DEVICE_OP                    937     /* ACC Fortran */
-#define ACC_CUDA_OP                      938     /* ACC Fortran */
-#define ACC_HOST_OP                      939     /* ACC Fortran */
-
-#define ACC_GLOBAL_OP                    940     /* ACC Fortran */ 
-#define ACC_ATTRIBUTES_OP                941     /* ACC Fortran */
-#define ACC_VALUE_OP                     942     /* ACC Fortran */
-#define ACC_SHARED_OP                    943     /* ACC Fortran */
-#define ACC_CONSTANT_OP                  944     /* ACC Fortran */
-#define ACC_USES_OP                      945     /* ACC Fortran */
-#define ACC_CALL_OP                      946     /* ACC Fortran */
-#define ACC_CUDA_BLOCK_OP                947     /* ACC Fortran */
-
-#define ACC_TARGETS_OP                   948     /* ACC Fortran */
-#define ACC_ASYNC_OP                     949     /* ACC Fortran */
-
-#define SPF_ANALYSIS_DIR                 950     /* SAPFOR */
-#define SPF_PARALLEL_DIR                 951     /* SAPFOR */
-#define SPF_TRANSFORM_DIR                952     /* SAPFOR */
-#define SPF_NOINLINE_OP                  953     /* SAPFOR */
-#define SPF_PARALLEL_REG_DIR             954     /* SAPFOR */
-#define SPF_END_PARALLEL_REG_DIR         955     /* SAPFOR */
-#define SPF_REGION_NAME                  956     /* SAPFOR */ 
-#define SPF_EXPAND_OP                    957     /* SAPFOR */
-#define SPF_FISSION_OP                   958     /* SAPFOR */
-#define SPF_SHRINK_OP                    959     /* SAPFOR */
-#define SPF_CHECKPOINT_DIR               960     /* SAPFOR */
-#define SPF_TYPE_OP                      961     /* SAPFOR */
-#define SPF_VARLIST_OP                   962     /* SAPFOR */
-#define SPF_EXCEPT_OP                    963     /* SAPFOR */
-#define SPF_FILES_COUNT_OP               964     /* SAPFOR */
-#define SPF_INTERVAL_OP                  965     /* SAPFOR */
-#define SPF_TIME_OP                      966     /* SAPFOR */
-#define SPF_ITER_OP                      967     /* SAPFOR */
-#define SPF_FLEXIBLE_OP                  968     /* SAPFOR */
-#define SPF_PARAMETER_OP                 969     /* SAPFOR */
-#define SPF_CODE_COVERAGE_OP             970     /* SAPFOR */
-#define SPF_UNROLL_OP                    971     /* SAPFOR */
-#define SPF_COVER_OP                     972     /* SAPFOR */
-#define SPF_MERGE_OP                     973     /* SAPFOR */
-#define SPF_PROCESS_PRIVATE_OP           974     /* SAPFOR */
-#define SPF_WEIGHT_OP			 975     /* SAPFOR */
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/tag.h b/projects/dvm_svn/fdvm/trunk/parser/tag.h
deleted file mode 100644
index 02ff849..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/tag.h
+++ /dev/null
@@ -1,630 +0,0 @@
-/* don't modify this file directly, it is made by a clever 'sed'
-script using "tag".  Run make tag.h to regenerate this file */
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
- 
-/******************* variant tags for bif nodes **********************/
-
-  tag [ GLOBAL ] = "GLOBAL";
-  tag [ PROG_HEDR ] = "PROG_HEDR";
-  tag [ PROC_HEDR ] = "PROC_HEDR";
-  tag [ BASIC_BLOCK ] = "BASIC_BLOCK";
-  tag [ CONTROL_END ] = "CONTROL_END";
-  tag [ IF_NODE ] = "IF_NODE";
-  tag [ LOOP_NODE ] = "LOOP_NODE";
-  tag [ FOR_NODE ] = "FOR_NODE";
-  tag [ FORALL_NODE ] = "FORALL_NODE";
-  tag [ WHILE_NODE ] = "WHILE_NODE";
-  tag [ EXIT_NODE ] = "EXIT_NODE";
-  tag [ ASSIGN_STAT ] = "ASSIGN_STAT";
-  tag [ M_ASSIGN_STAT ] = "M_ASSIGN_STAT";
-  tag [ PROC_STAT ] = "PROC_STAT";
-  tag [ SUM_ACC ] = "SUM_ACC";
-  tag [ MULT_ACC ] = "MULT_ACC";
-  tag [ MAX_ACC ] = "MAX_ACC";
-  tag [ MIN_ACC ] = "MIN_ACC";
-  tag [ CAT_ACC ] = "CAT_ACC";
-  tag [ OR_ACC ] = "OR_ACC";
-  tag [ AND_ACC ] = "AND_ACC";
-  tag [ READ_STAT ] = "READ_STAT";
-  tag [ WRITE_STAT ] = "WRITE_STAT";
-  tag [ OTHERIO_STAT ] = "OTHERIO_STAT";
-  tag [ CDOALL_NODE ] = "CDOALL_NODE";
-  tag [ SDOALL_NODE ] = "SDOALL_NODE";
-  tag [ DOACROSS_NODE ] = "DOACROSS_NODE";
-  tag [ CDOACROSS_NODE ] = "CDOACROSS_NODE";
-  tag [ DVM_INTERVAL_DIR ] = "DVM_INTERVAL_DIR";
-  tag [ DVM_ENDINTERVAL_DIR ] = "DVM_ENDINTERVAL_DIR";
-  tag [ FUNC_HEDR ] = "FUNC_HEDR";
-  tag [ WHERE_NODE ] = "WHERE_NODE";
-  tag [ ALLDO_NODE ] = "ALLDO_NODE";
-  tag [ IDENTIFY ] = "IDENTIFY";
-  tag [ FORMAT_STAT ] = "FORMAT_STAT";
-  tag [ STOP_STAT ] = "STOP_STAT";
-  tag [ RETURN_STAT ] = "RETURN_STAT";
-  tag [ ELSEIF_NODE ] = "ELSEIF_NODE";
-  tag [ ARITHIF_NODE ] = "ARITHIF_NODE";
-  tag [ GOTO_NODE ] = "GOTO_NODE";
-  tag [ ASSGOTO_NODE ] = "ASSGOTO_NODE";
-  tag [ COMGOTO_NODE ] = "COMGOTO_NODE";
-  tag [ PAUSE_NODE ] = "PAUSE_NODE";
-  tag [ STOP_NODE ] = "STOP_NODE";
-  tag [ ASSLAB_STAT ] = "ASSLAB_STAT";
-  tag [ LOGIF_NODE ] = "LOGIF_NODE";
-  tag [ DVM_DEBUG_DIR ] = "DVM_DEBUG_DIR";
-  tag [ DVM_ENDDEBUG_DIR ] = "DVM_ENDDEBUG_DIR";
-  tag [ DVM_TRACEON_DIR ] = "DVM_TRACEON_DIR";
-  tag [ DVM_TRACEOFF_DIR ] = "DVM_TRACEOFF_DIR";
-  tag [ BLOB ] = "BLOB";
-  tag [ SIZES ] = "SIZES";
-  tag [ COMMENT_STAT ] = "COMMENT_STAT";
-  tag [ CONT_STAT ] = "CONT_STAT";
-  tag [ VAR_DECL ] = "VAR_DECL";
-  tag [ PARAM_DECL ] = "PARAM_DECL";
-  tag [ COMM_STAT ] = "COMM_STAT";
-  tag [ EQUI_STAT ] = "EQUI_STAT";
-  tag [ IMPL_DECL ] = "IMPL_DECL";
-  tag [ DATA_DECL ] = "DATA_DECL";
-  tag [ SAVE_DECL ] = "SAVE_DECL";
-  tag [ ENTRY_STAT ] = "ENTRY_STAT";
-  tag [ STMTFN_STAT ] = "STMTFN_STAT";
-  tag [ DIM_STAT ] = "DIM_STAT";
-  tag [ BLOCK_DATA ] = "BLOCK_DATA";
-  tag [ EXTERN_STAT ] = "EXTERN_STAT";
-  tag [ INTRIN_STAT ] = "INTRIN_STAT";
-  tag [ ENUM_DECL ] = "ENUM_DECL";
-  tag [ CLASS_DECL ] = "CLASS_DECL";
-  tag [ UNION_DECL ] = "UNION_DECL";
-  tag [ STRUCT_DECL ] = "STRUCT_DECL";
-  tag [ DERIVED_CLASS_DECL ] = "DERIVED_CLASS_DECL";
-  tag [ EXPR_STMT_NODE ] = "EXPR_STMT_NODE";
-  tag [ DO_WHILE_NODE ] = "DO_WHILE_NODE";
-  tag [ SWITCH_NODE ] = "SWITCH_NODE";
-  tag [ CASE_NODE ] = "CASE_NODE";
-  tag [ DEFAULT_NODE ] = "DEFAULT_NODE";
-  tag [ BREAK_NODE ] = "BREAK_NODE";
-  tag [ CONTINUE_NODE ] = "CONTINUE_NODE";
-  tag [ RETURN_NODE ] = "RETURN_NODE";
-  tag [ ASM_NODE ] = "ASM_NODE";
-  tag [ SPAWN_NODE ] = "SPAWN_NODE";
-  tag [ PARFOR_NODE ] = "PARFOR_NODE";
-  tag [ PAR_NODE ] = "PAR_NODE";
-  tag [ LABEL_STAT ] = "LABEL_STAT";
-  tag [ PROS_COMM ] = "PROS_COMM";
-  tag [ ATTR_DECL ] = "ATTR_DECL";
-  tag [ NAMELIST_STAT ] = "NAMELIST_STAT";
-  tag [ FUTURE_STMT ] = "FUTURE_STMT";
-  tag [ COLLECTION_DECL ] = "COLLECTION_DECL";
-  tag [ TEMPLATE_DECL ] = "TEMPLATE_DECL";
-  tag [ TEMPLATE_FUNDECL ] = "TEMPLATE_FUNDECL";
-  tag [ TECLASS_DECL ] = "TECLASS_DECL";
-  tag [ ELSEWH_NODE ] = "ELSEWH_NODE";
-  tag [ STATIC_STMT ] = "STATIC_STMT";
-  tag [ INCLUDE_LINE ] = "INCLUDE_LINE";
-  tag [ PREPROCESSOR_DIR ] = "PREPROCESSOR_DIR";
-  tag [ PRINT_STAT ] = "PRINT_STAT";
-  tag [ BACKSPACE_STAT ] = "BACKSPACE_STAT";
-  tag [ REWIND_STAT ] = "REWIND_STAT";
-  tag [ ENDFILE_STAT ] = "ENDFILE_STAT";
-  tag [ INQUIRE_STAT ] = "INQUIRE_STAT";
-  tag [ OPEN_STAT ] = "OPEN_STAT";
-  tag [ CLOSE_STAT ] = "CLOSE_STAT";
-  tag [ EXTERN_C_STAT ] = "EXTERN_C_STAT";
-  tag [ INCLUDE_STAT ] = "INCLUDE_STAT";
-  tag [ TRY_STAT ] = "TRY_STAT";
-  tag [ CATCH_STAT ] = "CATCH_STAT";
-  tag [ DVM_PARALLEL_ON_DIR ] = "DVM_PARALLEL_ON_DIR";
-  tag [ DVM_SHADOW_START_DIR ] = "DVM_SHADOW_START_DIR";
-  tag [ DVM_SHADOW_GROUP_DIR ] = "DVM_SHADOW_GROUP_DIR";
-  tag [ DVM_SHADOW_WAIT_DIR ] = "DVM_SHADOW_WAIT_DIR";
-  tag [ DVM_REDUCTION_START_DIR ] = "DVM_REDUCTION_START_DIR";
-  tag [ DVM_REDUCTION_GROUP_DIR ] = "DVM_REDUCTION_GROUP_DIR";
-  tag [ DVM_REDUCTION_WAIT_DIR ] = "DVM_REDUCTION_WAIT_DIR";
-  tag [ DVM_DYNAMIC_DIR ] = "DVM_DYNAMIC_DIR";
-  tag [ DVM_ALIGN_DIR ] = "DVM_ALIGN_DIR";
-  tag [ DVM_REALIGN_DIR ] = "DVM_REALIGN_DIR";
-  tag [ DVM_REALIGN_NEW_DIR ] = "DVM_REALIGN_NEW_DIR";
-  tag [ DVM_REMOTE_ACCESS_DIR ] = "DVM_REMOTE_ACCESS_DIR";
-  tag [ HPF_INDEPENDENT_DIR ] = "HPF_INDEPENDENT_DIR";
-  tag [ DVM_SHADOW_DIR ] = "DVM_SHADOW_DIR";
-  tag [ PARDO_NODE ] = "PARDO_NODE";
-  tag [ PARSECTIONS_NODE ] = "PARSECTIONS_NODE";
-  tag [ SECTION_NODE ] = "SECTION_NODE";
-  tag [ GUARDS_NODE ] = "GUARDS_NODE";
-  tag [ LOCK_NODE ] = "LOCK_NODE";
-  tag [ UNLOCK_NODE ] = "UNLOCK_NODE";
-  tag [ CRITSECTION_NODE ] = "CRITSECTION_NODE";
-  tag [ POST_NODE ] = "POST_NODE";
-  tag [ WAIT_NODE ] = "WAIT_NODE";
-  tag [ CLEAR_NODE ] = "CLEAR_NODE";
-  tag [ POSTSEQ_NODE ] = "POSTSEQ_NODE";
-  tag [ WAITSEQ_NODE ] = "WAITSEQ_NODE";
-  tag [ SETSEQ_NODE ] = "SETSEQ_NODE";
-  tag [ ASSIGN_NODE ] = "ASSIGN_NODE";
-  tag [ RELEASE_NODE ] = "RELEASE_NODE";
-  tag [ PRIVATE_NODE ] = "PRIVATE_NODE";
-  tag [ SCOMMON_NODE ] = "SCOMMON_NODE";
-  tag [ PARREGION_NODE ] = "PARREGION_NODE";
-  tag [ PDO_NODE ] = "PDO_NODE";
-  tag [ PSECTIONS_NODE ] = "PSECTIONS_NODE";
-  tag [ SINGLEPROCESS_NODE ] = "SINGLEPROCESS_NODE";
-  tag [ SKIPPASTEOF_NODE ] = "SKIPPASTEOF_NODE";
-  tag [ DVM_NEW_VALUE_DIR ] = "DVM_NEW_VALUE_DIR";
-  tag [ DVM_VAR_DECL ] = "DVM_VAR_DECL";
-  tag [ DVM_POINTER_DIR ] = "DVM_POINTER_DIR";
-  tag [ INTENT_STMT ] = "INTENT_STMT";
-  tag [ OPTIONAL_STMT ] = "OPTIONAL_STMT";
-  tag [ PUBLIC_STMT ] = "PUBLIC_STMT";
-  tag [ PRIVATE_STMT ] = "PRIVATE_STMT";
-  tag [ ALLOCATABLE_STMT ] = "ALLOCATABLE_STMT";
-  tag [ POINTER_STMT ] = "POINTER_STMT";
-  tag [ TARGET_STMT ] = "TARGET_STMT";
-  tag [ ALLOCATE_STMT ] = "ALLOCATE_STMT";
-  tag [ NULLIFY_STMT ] = "NULLIFY_STMT";
-  tag [ DEALLOCATE_STMT ] = "DEALLOCATE_STMT";
-  tag [ SEQUENCE_STMT ] = "SEQUENCE_STMT";
-  tag [ CYCLE_STMT ] = "CYCLE_STMT";
-  tag [ EXIT_STMT ] = "EXIT_STMT";
-  tag [ CONTAINS_STMT ] = "CONTAINS_STMT";
-  tag [ WHERE_BLOCK_STMT ] = "WHERE_BLOCK_STMT";
-  tag [ MODULE_STMT ] = "MODULE_STMT";
-  tag [ USE_STMT ] = "USE_STMT";
-  tag [ INTERFACE_STMT ] = "INTERFACE_STMT";
-  tag [ MODULE_PROC_STMT ] = "MODULE_PROC_STMT";
-  tag [ OVERLOADED_ASSIGN_STAT ] = "OVERLOADED_ASSIGN_STAT";
-  tag [ POINTER_ASSIGN_STAT ] = "POINTER_ASSIGN_STAT";
-  tag [ OVERLOADED_PROC_STAT ] = "OVERLOADED_PROC_STAT";
-  tag [ DECOMPOSITION_STMT ] = "DECOMPOSITION_STMT";
-  tag [ ALIGN_STMT ] = "ALIGN_STMT";
-  tag [ DVM_DISTRIBUTE_DIR ] = "DVM_DISTRIBUTE_DIR";
-  tag [ REDUCE_STMT ] = "REDUCE_STMT";
-  tag [ PROS_HEDR ] = "PROS_HEDR";
-  tag [ PROS_STAT ] = "PROS_STAT";
-  tag [ PROS_STAT_LCTN ] = "PROS_STAT_LCTN";
-  tag [ PROS_STAT_SUBM ] = "PROS_STAT_SUBM";
-  tag [ PROCESSES_STAT ] = "PROCESSES_STAT";
-  tag [ PROCESSES_END ] = "PROCESSES_END";
-  tag [ PROCESS_DO_STAT ] = "PROCESS_DO_STAT";
-  tag [ PROCESSORS_STAT ] = "PROCESSORS_STAT";
-  tag [ CHANNEL_STAT ] = "CHANNEL_STAT";
-  tag [ MERGER_STAT ] = "MERGER_STAT";
-  tag [ MOVE_PORT ] = "MOVE_PORT";
-  tag [ SEND_STAT ] = "SEND_STAT";
-  tag [ RECEIVE_STAT ] = "RECEIVE_STAT";
-  tag [ ENDCHANNEL_STAT ] = "ENDCHANNEL_STAT";
-  tag [ PROBE_STAT ] = "PROBE_STAT";
-  tag [ INPORT_DECL ] = "INPORT_DECL";
-  tag [ OUTPORT_DECL ] = "OUTPORT_DECL";
-  tag [ HPF_TEMPLATE_STAT ] = "HPF_TEMPLATE_STAT";
-  tag [ HPF_ALIGN_STAT ] = "HPF_ALIGN_STAT";
-  tag [ HPF_PROCESSORS_STAT ] = "HPF_PROCESSORS_STAT";
-  tag [ DVM_REDISTRIBUTE_DIR ] = "DVM_REDISTRIBUTE_DIR";
-  tag [ DVM_TASK_REGION_DIR ] = "DVM_TASK_REGION_DIR";
-  tag [ DVM_END_TASK_REGION_DIR ] = "DVM_END_TASK_REGION_DIR";
-  tag [ DVM_ON_DIR ] = "DVM_ON_DIR";
-  tag [ DVM_END_ON_DIR ] = "DVM_END_ON_DIR";
-  tag [ DVM_TASK_DIR ] = "DVM_TASK_DIR";
-  tag [ DVM_MAP_DIR ] = "DVM_MAP_DIR";
-  tag [ DVM_PARALLEL_TASK_DIR ] = "DVM_PARALLEL_TASK_DIR";
-  tag [ DVM_INHERIT_DIR ] = "DVM_INHERIT_DIR";
-  tag [ DVM_INDIRECT_GROUP_DIR ] = "DVM_INDIRECT_GROUP_DIR";
-  tag [ DVM_INDIRECT_ACCESS_DIR ] = "DVM_INDIRECT_ACCESS_DIR";
-  tag [ DVM_REMOTE_GROUP_DIR ] = "DVM_REMOTE_GROUP_DIR";
-  tag [ DVM_RESET_DIR ] = "DVM_RESET_DIR";
-  tag [ DVM_PREFETCH_DIR ] = "DVM_PREFETCH_DIR";
-  tag [ DVM_OWN_DIR ] = "DVM_OWN_DIR";
-  tag [ DVM_HEAP_DIR ] = "DVM_HEAP_DIR";
-  tag [ DVM_ASYNCID_DIR ] = "DVM_ASYNCID_DIR";
-  tag [ DVM_ASYNCHRONOUS_DIR ] = "DVM_ASYNCHRONOUS_DIR";
-  tag [ DVM_ENDASYNCHRONOUS_DIR ] = "DVM_ENDASYNCHRONOUS_DIR";
-  tag [ DVM_ASYNCWAIT_DIR ] = "DVM_ASYNCWAIT_DIR";
-  tag [ DVM_F90_DIR ] = "DVM_F90_DIR";
-  tag [ DVM_BARRIER_DIR ] = "DVM_BARRIER_DIR";
-  tag [ FORALL_STAT ] = "FORALL_STAT";
-  tag [ DVM_CONSISTENT_GROUP_DIR ] = "DVM_CONSISTENT_GROUP_DIR";
-  tag [ DVM_CONSISTENT_START_DIR ] = "DVM_CONSISTENT_START_DIR";
-  tag [ DVM_CONSISTENT_WAIT_DIR ] = "DVM_CONSISTENT_WAIT_DIR";
-  tag [ DVM_CONSISTENT_DIR ] = "DVM_CONSISTENT_DIR";
-  tag [ DVM_CHECK_DIR ] = "DVM_CHECK_DIR";
-  tag [ DVM_IO_MODE_DIR ] = "DVM_IO_MODE_DIR";
-  tag [ DVM_LOCALIZE_DIR ] = "DVM_LOCALIZE_DIR";
-  tag [ DVM_SHADOW_ADD_DIR ] = "DVM_SHADOW_ADD_DIR";
-  tag [ DVM_CP_CREATE_DIR ] = "DVM_CP_CREATE_DIR";
-  tag [ DVM_CP_LOAD_DIR ] = "DVM_CP_LOAD_DIR";
-  tag [ DVM_CP_SAVE_DIR ] = "DVM_CP_SAVE_DIR";
-  tag [ DVM_CP_WAIT_DIR ] = "DVM_CP_WAIT_DIR";
-  tag [ DVM_EXIT_INTERVAL_DIR ] = "DVM_EXIT_INTERVAL_DIR";
-  tag [ DVM_TEMPLATE_CREATE_DIR ] = "DVM_TEMPLATE_CREATE_DIR";
-  tag [ DVM_TEMPLATE_DELETE_DIR ] = "DVM_TEMPLATE_DELETE_DIR";
-  tag [ PRIVATE_AR_DECL ] = "PRIVATE_AR_DECL";
-    
-/***************** variant tags for low level nodes ********************/
-
-  tag [ INT_VAL ] = "INT_VAL";
-  tag [ FLOAT_VAL ] = "FLOAT_VAL";
-  tag [ DOUBLE_VAL ] = "DOUBLE_VAL";
-  tag [ BOOL_VAL ] = "BOOL_VAL";
-  tag [ CHAR_VAL ] = "CHAR_VAL";
-  tag [ STRING_VAL ] = "STRING_VAL";
-  tag [ CONST_REF ] = "CONST_REF";
-  tag [ VAR_REF ] = "VAR_REF";
-  tag [ ARRAY_REF ] = "ARRAY_REF";
-  tag [ RECORD_REF ] = "RECORD_REF";
-  tag [ ENUM_REF ] = "ENUM_REF";
-  tag [ VAR_LIST ] = "VAR_LIST";
-  tag [ EXPR_LIST ] = "EXPR_LIST";
-  tag [ RANGE_LIST ] = "RANGE_LIST";
-  tag [ CASE_CHOICE ] = "CASE_CHOICE";
-  tag [ DEF_CHOICE ] = "DEF_CHOICE";
-  tag [ VARIANT_CHOICE ] = "VARIANT_CHOICE";
-  tag [ COMPLEX_VAL ] = "COMPLEX_VAL";
-  tag [ LABEL_REF ] = "LABEL_REF";
-  tag [ KEYWORD_VAL ] = "KEYWORD_VAL";
-  tag [ DDOT ] = "DDOT";
-  tag [ RANGE_OP ] = "RANGE_OP";
-  tag [ UPPER_OP ] = "UPPER_OP";
-  tag [ LOWER_OP ] = "LOWER_OP";
-  tag [ EQ_OP ] = "EQ_OP";
-  tag [ LT_OP ] = "LT_OP";
-  tag [ GT_OP ] = "GT_OP";
-  tag [ NOTEQL_OP ] = "NOTEQL_OP";
-  tag [ LTEQL_OP ] = "LTEQL_OP";
-  tag [ GTEQL_OP ] = "GTEQL_OP";
-  tag [ ADD_OP ] = "ADD_OP";
-  tag [ SUBT_OP ] = "SUBT_OP";
-  tag [ OR_OP ] = "OR_OP";
-  tag [ MULT_OP ] = "MULT_OP";
-  tag [ DIV_OP ] = "DIV_OP";
-  tag [ MOD_OP ] = "MOD_OP";
-  tag [ AND_OP ] = "AND_OP";
-  tag [ EXP_OP ] = "EXP_OP";
-  tag [ ARRAY_MULT ] = "ARRAY_MULT";
-  tag [ CONCAT_OP ] = "CONCAT_OP";
-  tag [ XOR_OP ] = "XOR_OP";
-  tag [ EQV_OP ] = "EQV_OP";
-  tag [ NEQV_OP ] = "NEQV_OP";
-  tag [ MINUS_OP ] = "MINUS_OP";
-  tag [ NOT_OP ] = "NOT_OP";
-  tag [ ASSGN_OP ] = "ASSGN_OP";
-  tag [ DEREF_OP ] = "DEREF_OP";
-  tag [ POINTST_OP ] = "POINTST_OP";
-  tag [ FUNCTION_OP ] = "FUNCTION_OP";
-  tag [ MINUSMINUS_OP ] = "MINUSMINUS_OP";
-  tag [ PLUSPLUS_OP ] = "PLUSPLUS_OP";
-  tag [ BITAND_OP ] = "BITAND_OP";
-  tag [ BITOR_OP ] = "BITOR_OP";
-  tag [ STAR_RANGE ] = "STAR_RANGE";
-  tag [ PROC_CALL ] = "PROC_CALL";
-  tag [ FUNC_CALL ] = "FUNC_CALL";
-  tag [ CONSTRUCTOR_REF ] = "CONSTRUCTOR_REF";
-  tag [ ACCESS_REF ] = "ACCESS_REF";
-  tag [ CONS ] = "CONS";
-  tag [ ACCESS ] = "ACCESS";
-  tag [ IOACCESS ] = "IOACCESS";
-  tag [ CONTROL_LIST ] = "CONTROL_LIST";
-  tag [ SEQ ] = "SEQ";
-  tag [ SPEC_PAIR ] = "SPEC_PAIR";
-  tag [ COMM_LIST ] = "COMM_LIST";
-  tag [ STMT_STR ] = "STMT_STR";
-  tag [ EQUI_LIST ] = "EQUI_LIST";
-  tag [ IMPL_TYPE ] = "IMPL_TYPE";
-  tag [ STMTFN_DECL ] = "STMTFN_DECL";
-  tag [ BIT_COMPLEMENT_OP ] = "BIT_COMPLEMENT_OP";
-  tag [ EXPR_IF ] = "EXPR_IF";
-  tag [ EXPR_IF_BODY ] = "EXPR_IF_BODY";
-  tag [ FUNCTION_REF ] = "FUNCTION_REF";
-  tag [ LSHIFT_OP ] = "LSHIFT_OP";
-  tag [ RSHIFT_OP ] = "RSHIFT_OP";
-  tag [ UNARY_ADD_OP ] = "UNARY_ADD_OP";
-  tag [ SIZE_OP ] = "SIZE_OP";
-  tag [ INTEGER_DIV_OP ] = "INTEGER_DIV_OP";
-  tag [ SUB_OP ] = "SUB_OP";
-  tag [ LE_OP ] = "LE_OP";
-  tag [ GE_OP ] = "GE_OP";
-  tag [ NE_OP ] = "NE_OP";
-  tag [ CLASSINIT_OP ] = "CLASSINIT_OP";
-  tag [ CAST_OP ] = "CAST_OP";
-  tag [ ADDRESS_OP ] = "ADDRESS_OP";
-  tag [ POINSTAT_OP ] = "POINSTAT_OP";
-  tag [ COPY_NODE ] = "COPY_NODE";
-  tag [ INIT_LIST ] = "INIT_LIST";
-  tag [ VECTOR_CONST ] = "VECTOR_CONST";
-  tag [ BIT_NUMBER ] = "BIT_NUMBER";
-  tag [ ARITH_ASSGN_OP ] = "ARITH_ASSGN_OP";
-  tag [ ARRAY_OP ] = "ARRAY_OP";
-  tag [ NEW_OP ] = "NEW_OP";
-  tag [ DELETE_OP ] = "DELETE_OP";
-  tag [ NAMELIST_LIST ] = "NAMELIST_LIST";
-  tag [ THIS_NODE ] = "THIS_NODE";
-  tag [ SCOPE_OP ] = "SCOPE_OP";
-  tag [ PLUS_ASSGN_OP ] = "PLUS_ASSGN_OP";
-  tag [ MINUS_ASSGN_OP ] = "MINUS_ASSGN_OP";
-  tag [ AND_ASSGN_OP ] = "AND_ASSGN_OP";
-  tag [ IOR_ASSGN_OP ] = "IOR_ASSGN_OP";
-  tag [ MULT_ASSGN_OP ] = "MULT_ASSGN_OP";
-  tag [ DIV_ASSGN_OP ] = "DIV_ASSGN_OP";
-  tag [ MOD_ASSGN_OP ] = "MOD_ASSGN_OP";
-  tag [ XOR_ASSGN_OP ] = "XOR_ASSGN_OP";
-  tag [ LSHIFT_ASSGN_OP ] = "LSHIFT_ASSGN_OP";
-  tag [ RSHIFT_ASSGN_OP ] = "RSHIFT_ASSGN_OP";
-  tag [ ORDERED_OP ] = "ORDERED_OP";
-  tag [ EXTEND_OP ] = "EXTEND_OP";
-  tag [ MAXPARALLEL_OP ] = "MAXPARALLEL_OP";
-  tag [ SAMETYPE_OP ] = "SAMETYPE_OP";
-  tag [ TYPE_REF ] = "TYPE_REF";
-  tag [ STRUCTURE_CONSTRUCTOR ] = "STRUCTURE_CONSTRUCTOR";
-  tag [ ARRAY_CONSTRUCTOR ] = "ARRAY_CONSTRUCTOR";
-  tag [ SECTION_REF ] = "SECTION_REF";
-  tag [ VECTOR_SUBSCRIPT ] = "VECTOR_SUBSCRIPT";
-  tag [ SECTION_OPERANDS ] = "SECTION_OPERANDS";
-  tag [ KEYWORD_ARG ] = "KEYWORD_ARG";
-  tag [ OVERLOADED_CALL ] = "OVERLOADED_CALL";
-  tag [ INTERFACE_REF ] = "INTERFACE_REF";
-  tag [ RENAME_NODE ] = "RENAME_NODE";
-  tag [ TYPE_NODE ] = "TYPE_NODE";
-  tag [ PAREN_OP ] = "PAREN_OP";
-  tag [ PARAMETER_OP ] = "PARAMETER_OP";
-  tag [ PUBLIC_OP ] = "PUBLIC_OP";
-  tag [ PRIVATE_OP ] = "PRIVATE_OP";
-  tag [ ALLOCATABLE_OP ] = "ALLOCATABLE_OP";
-  tag [ DIMENSION_OP ] = "DIMENSION_OP";
-  tag [ EXTERNAL_OP ] = "EXTERNAL_OP";
-  tag [ IN_OP ] = "IN_OP";
-  tag [ OUT_OP ] = "OUT_OP";
-  tag [ INOUT_OP ] = "INOUT_OP";
-  tag [ INTRINSIC_OP ] = "INTRINSIC_OP";
-  tag [ POINTER_OP ] = "POINTER_OP";
-  tag [ OPTIONAL_OP ] = "OPTIONAL_OP";
-  tag [ SAVE_OP ] = "SAVE_OP";
-  tag [ TARGET_OP ] = "TARGET_OP";
-  tag [ ONLY_NODE ] = "ONLY_NODE";
-  tag [ LEN_OP ] = "LEN_OP";
-  tag [ TYPE_OP ] = "TYPE_OP";
-  tag [ DOTSTAR_OP ] = "DOTSTAR_OP";
-  tag [ ARROWSTAR_OP ] = "ARROWSTAR_OP";
-  tag [ FORDECL_OP ] = "FORDECL_OP";
-  tag [ THROW_OP ] = "THROW_OP";
-  tag [ PROCESSORS_REF ] = "PROCESSORS_REF";
-  tag [ PORT_TYPE_OP ] = "PORT_TYPE_OP";
-  tag [ INPORT_TYPE_OP ] = "INPORT_TYPE_OP";
-  tag [ OUTPORT_TYPE_OP ] = "OUTPORT_TYPE_OP";
-  tag [ INPORT_NAME ] = "INPORT_NAME";
-  tag [ OUTPORT_NAME ] = "OUTPORT_NAME";
-  tag [ FROMPORT_NAME ] = "FROMPORT_NAME";
-  tag [ TOPORT_NAME ] = "TOPORT_NAME";
-  tag [ IOSTAT_STORE ] = "IOSTAT_STORE";
-  tag [ EMPTY_STORE ] = "EMPTY_STORE";
-  tag [ ERR_LABEL ] = "ERR_LABEL";
-  tag [ END_LABEL ] = "END_LABEL";
-  tag [ PROS_CALL ] = "PROS_CALL";
-  tag [ STATIC_OP ] = "STATIC_OP";
-  tag [ LABEL_ARG ] = "LABEL_ARG";
-  tag [ DATA_IMPL_DO ] = "DATA_IMPL_DO";
-  tag [ DATA_ELT ] = "DATA_ELT";
-  tag [ DATA_SUBS ] = "DATA_SUBS";
-  tag [ DATA_RANGE ] = "DATA_RANGE";
-  tag [ ICON_EXPR ] = "ICON_EXPR";
-  tag [ BLOCK_OP ] = "BLOCK_OP";
-  tag [ NEW_SPEC_OP ] = "NEW_SPEC_OP";
-  tag [ REDUCTION_OP ] = "REDUCTION_OP";
-  tag [ SHADOW_RENEW_OP ] = "SHADOW_RENEW_OP";
-  tag [ SHADOW_START_OP ] = "SHADOW_START_OP";
-  tag [ SHADOW_WAIT_OP ] = "SHADOW_WAIT_OP";
-  tag [ DIAG_OP ] = "DIAG_OP";
-  tag [ REMOTE_ACCESS_OP ] = "REMOTE_ACCESS_OP";
-  tag [ TEMPLATE_OP ] = "TEMPLATE_OP";
-  tag [ PROCESSORS_OP ] = "PROCESSORS_OP";
-  tag [ DYNAMIC_OP ] = "DYNAMIC_OP";
-  tag [ ALIGN_OP ] = "ALIGN_OP";
-  tag [ DISTRIBUTE_OP ] = "DISTRIBUTE_OP";
-  tag [ SHADOW_OP ] = "SHADOW_OP";
-  tag [ INDIRECT_ACCESS_OP ] = "INDIRECT_ACCESS_OP";
-  tag [ ACROSS_OP ] = "ACROSS_OP";
-  tag [ NEW_VALUE_OP ] = "NEW_VALUE_OP";
-  tag [ SHADOW_COMP_OP ] = "SHADOW_COMP_OP";
-  tag [ STAGE_OP ] = "STAGE_OP";
-  tag [ FORALL_OP ] = "FORALL_OP";
-  tag [ CONSISTENT_OP ] = "CONSISTENT_OP";
-  tag [ INTERFACE_OPERATOR ] = "INTERFACE_OPERATOR";
-  tag [ INTERFACE_ASSIGNMENT ] = "INTERFACE_ASSIGNMENT";
-  tag [ VAR_DECL_90 ] = "VAR_DECL_90";
-  tag [ ASSIGNMENT_OP ] = "ASSIGNMENT_OP";
-  tag [ OPERATOR_OP ] = "OPERATOR_OP";
-  tag [ KIND_OP ] = "KIND_OP";
-  tag [ LENGTH_OP ] = "LENGTH_OP";
-  tag [ RECURSIVE_OP ] = "RECURSIVE_OP";
-  tag [ ELEMENTAL_OP ] = "ELEMENTAL_OP";
-  tag [ PURE_OP ] = "PURE_OP";
-  tag [ DEFINED_OP ] = "DEFINED_OP";
-  tag [ PARALLEL_OP ] = "PARALLEL_OP";
-  tag [ INDIRECT_OP ] = "INDIRECT_OP";
-  tag [ DERIVED_OP ] = "DERIVED_OP";
-  tag [ DUMMY_REF ] = "DUMMY_REF";
-  tag [ COMMON_OP ] = "COMMON_OP";
-  tag [ SHADOW_NAMES_OP ] = "SHADOW_NAMES_OP";
-
-/***************** variant tags for symbol table entries ********************/
-
-  tag [ CONST_NAME ] = "CONST_NAME";
-  tag [ ENUM_NAME ] = "ENUM_NAME";
-  tag [ FIELD_NAME ] = "FIELD_NAME";
-  tag [ VARIABLE_NAME ] = "VARIABLE_NAME";
-  tag [ TYPE_NAME ] = "TYPE_NAME";
-  tag [ PROGRAM_NAME ] = "PROGRAM_NAME";
-  tag [ PROCEDURE_NAME ] = "PROCEDURE_NAME";
-  tag [ VAR_FIELD ] = "VAR_FIELD";
-  tag [ LABEL_VAR ] = "LABEL_VAR";
-  tag [ FUNCTION_NAME ] = "FUNCTION_NAME";
-  tag [ MEMBER_FUNC ] = "MEMBER_FUNC";
-  tag [ CLASS_NAME ] = "CLASS_NAME";
-  tag [ UNION_NAME ] = "UNION_NAME";
-  tag [ STRUCT_NAME ] = "STRUCT_NAME";
-  tag [ LABEL_NAME ] = "LABEL_NAME";
-  tag [ COLLECTION_NAME ] = "COLLECTION_NAME";
-  tag [ ROUTINE_NAME ] = "ROUTINE_NAME";
-  tag [ CONSTRUCT_NAME ] = "CONSTRUCT_NAME";
-  tag [ INTERFACE_NAME ] = "INTERFACE_NAME";
-  tag [ MODULE_NAME ] = "MODULE_NAME";
-  tag [ TEMPLATE_CL_NAME ] = "TEMPLATE_CL_NAME";
-  tag [ TEMPLATE_FN_NAME ] = "TEMPLATE_FN_NAME";
-  tag [ TECLASS_NAME ] = "TECLASS_NAME";
-  tag [ SHADOW_GROUP_NAME ] = "SHADOW_GROUP_NAME";
-  tag [ REDUCTION_GROUP_NAME ] = "REDUCTION_GROUP_NAME";
-  tag [ REF_GROUP_NAME ] = "REF_GROUP_NAME";
-  tag [ ASYNC_ID ] = "ASYNC_ID";
-  tag [ CONSISTENT_GROUP_NAME ] = "CONSISTENT_GROUP_NAME";
-  tag [ NAMELIST_NAME ] = "NAMELIST_NAME";
-  tag [ COMMON_NAME ] = "COMMON_NAME";
-
-  tag [ DEFAULT ] = "DEFAULT";
-  tag [ T_INT ] = "T_INT";
-  tag [ T_FLOAT ] = "T_FLOAT";
-  tag [ T_DOUBLE ] = "T_DOUBLE";
-  tag [ T_CHAR ] = "T_CHAR";
-  tag [ T_BOOL ] = "T_BOOL";
-  tag [ T_STRING ] = "T_STRING";
-  tag [ T_ENUM ] = "T_ENUM";
-  tag [ T_SUBRANGE ] = "T_SUBRANGE";
-  tag [ T_LIST ] = "T_LIST";
-  tag [ T_ARRAY ] = "T_ARRAY";
-  tag [ T_RECORD ] = "T_RECORD";
-  tag [ T_ENUM_FIELD ] = "T_ENUM_FIELD";
-  tag [ T_UNKNOWN ] = "T_UNKNOWN";
-  tag [ T_COMPLEX ] = "T_COMPLEX";
-  tag [ T_VOID ] = "T_VOID";
-  tag [ T_DESCRIPT ] = "T_DESCRIPT";
-  tag [ T_FUNCTION ] = "T_FUNCTION";
-  tag [ T_POINTER ] = "T_POINTER";
-  tag [ T_UNION ] = "T_UNION";
-  tag [ T_STRUCT ] = "T_STRUCT";
-  tag [ T_CLASS ] = "T_CLASS";
-  tag [ T_DERIVED_CLASS ] = "T_DERIVED_CLASS";
-  tag [ T_DERIVED_TYPE ] = "T_DERIVED_TYPE";
-  tag [ T_COLLECTION ] = "T_COLLECTION";
-  tag [ T_DERIVED_COLLECTION ] = "T_DERIVED_COLLECTION";
-  tag [ T_REFERENCE ] = "T_REFERENCE";
-  tag [ T_DERIVED_TEMPLATE ] = "T_DERIVED_TEMPLATE";
-  tag [ T_MEMBER_POINTER ] = "T_MEMBER_POINTER";
-  tag [ T_TECLASS ] = "T_TECLASS";
-  tag [ T_GATE ] = "T_GATE";
-  tag [ T_EVENT ] = "T_EVENT";
-  tag [ T_SEQUENCE ] = "T_SEQUENCE";
-  tag [ T_DCOMPLEX ] = "T_DCOMPLEX";
-  tag [ T_LONG ] = "T_LONG";
-  tag [ BY_USE ] = "BY_USE";
-  tag [ LOCAL ] = "LOCAL";
-  tag [ INPUT ] = "INPUT";
-  tag [ OUTPUT ] = "OUTPUT";
-  tag [ IO ] = "IO";
-  tag [ PROCESS_NAME ] = "PROCESS_NAME";
-
-  tag [ OMP_PRIVATE ] = "OMP_PRIVATE";
-  tag [ OMP_SHARED ] = "OMP_SHARED";
-  tag [ OMP_FIRSTPRIVATE ] = "OMP_FIRSTPRIVATE";
-  tag [ OMP_LASTPRIVATE ] = "OMP_LASTPRIVATE";
-  tag [ OMP_THREADPRIVATE ] = "OMP_THREADPRIVATE";
-  tag [ OMP_COPYIN ] = "OMP_COPYIN";
-  tag [ OMP_COPYPRIVATE ] = "OMP_COPYPRIVATE";
-  tag [ OMP_DEFAULT ] = "OMP_DEFAULT";
-  tag [ OMP_ORDERED ] = "OMP_ORDERED";
-  tag [ OMP_SCHEDULE ] = "OMP_SCHEDULE";
-  tag [ OMP_REDUCTION ] = "OMP_REDUCTION";
-  tag [ OMP_IF ] = "OMP_IF";
-  tag [ OMP_NUM_THREADS ] = "OMP_NUM_THREADS";
-  tag [ OMP_NOWAIT ] = "OMP_NOWAIT";
-  tag [ OMP_PARALLEL_DIR ] = "OMP_PARALLEL_DIR";
-  tag [ OMP_END_PARALLEL_DIR ] = "OMP_END_PARALLEL_DIR";
-  tag [ OMP_DO_DIR ] = "OMP_DO_DIR";
-  tag [ OMP_END_DO_DIR ] = "OMP_END_DO_DIR";
-  tag [ OMP_SECTIONS_DIR ] = "OMP_SECTIONS_DIR";
-  tag [ OMP_END_SECTIONS_DIR ] = "OMP_END_SECTIONS_DIR";
-  tag [ OMP_SECTION_DIR ] = "OMP_SECTION_DIR";
-  tag [ OMP_SINGLE_DIR ] = "OMP_SINGLE_DIR";
-  tag [ OMP_END_SINGLE_DIR ] = "OMP_END_SINGLE_DIR";
-  tag [ OMP_WORKSHARE_DIR ] = "OMP_WORKSHARE_DIR";
-  tag [ OMP_END_WORKSHARE_DIR ] = "OMP_END_WORKSHARE_DIR";
-  tag [ OMP_PARALLEL_DO_DIR ] = "OMP_PARALLEL_DO_DIR";
-  tag [ OMP_END_PARALLEL_DO_DIR ] = "OMP_END_PARALLEL_DO_DIR";
-  tag [ OMP_PARALLEL_SECTIONS_DIR ] = "OMP_PARALLEL_SECTIONS_DIR";
-  tag [ OMP_END_PARALLEL_SECTIONS_DIR ] = "OMP_END_PARALLEL_SECTIONS_DIR";
-  tag [ OMP_PARALLEL_WORKSHARE_DIR ] = "OMP_PARALLEL_WORKSHARE_DIR";
-  tag [ OMP_END_PARALLEL_WORKSHARE_DIR ] = "OMP_END_PARALLEL_WORKSHARE_DIR";
-  tag [ OMP_MASTER_DIR ] = "OMP_MASTER_DIR";
-  tag [ OMP_END_MASTER_DIR ] = "OMP_END_MASTER_DIR";
-  tag [ OMP_CRITICAL_DIR ] = "OMP_CRITICAL_DIR";
-  tag [ OMP_END_CRITICAL_DIR ] = "OMP_END_CRITICAL_DIR";
-  tag [ OMP_BARRIER_DIR ] = "OMP_BARRIER_DIR";
-  tag [ OMP_ATOMIC_DIR ] = "OMP_ATOMIC_DIR";
-  tag [ OMP_FLUSH_DIR ] = "OMP_FLUSH_DIR";
-  tag [ OMP_ORDERED_DIR ] = "OMP_ORDERED_DIR";
-  tag [ OMP_END_ORDERED_DIR ] = "OMP_END_ORDERED_DIR";
-  tag [ RECORD_DECL ] = "RECORD_DECL";
-  tag [ FUNC_STAT ] = "FUNC_STAT";
-  tag [ OMP_ONETHREAD_DIR ] = "OMP_ONETHREAD_DIR";
-  tag [ OMP_THREADPRIVATE_DIR ] = "OMP_THREADPRIVATE_DIR";
-  tag [ OMP_DEFAULT_SECTION_DIR ] = "OMP_DEFAULT_SECTION_DIR";
-  tag [ OMP_COLLAPSE ] = "OMP_COLLAPSE";
-
-  tag [ ACC_REGION_DIR ] = "ACC_REGION_DIR";
-  tag [ ACC_END_REGION_DIR ] = "ACC_END_REGION_DIR";
-  tag [ ACC_CALL_STMT ] = "ACC_CALL_STMT";
-  tag [ ACC_KERNEL_HEDR ] = "ACC_KERNEL_HEDR";
-  tag [ ACC_GET_ACTUAL_DIR ] = "ACC_GET_ACTUAL_DIR";
-  tag [ ACC_ACTUAL_DIR ] = "ACC_ACTUAL_DIR";
-  tag [ ACC_CHECKSECTION_DIR ] = "ACC_CHECKSECTION_DIR";
-  tag [ ACC_END_CHECKSECTION_DIR ] = "ACC_END_CHECKSECTION_DIR";
-  tag [ ACC_ROUTINE_DIR ] = "ACC_ROUTINE_DIR";
-  tag [ ACC_DECLARE_DIR ] = "ACC_DECLARE_DIR";
-
-  tag [ ACC_TIE_OP ] = "ACC_TIE_OP";
-  tag [ ACC_INLOCAL_OP ] = "ACC_INLOCAL_OP";
-  tag [ ACC_INOUT_OP ] = "ACC_INOUT_OP";
-  tag [ ACC_IN_OP ] = "ACC_IN_OP";
-  tag [ ACC_OUT_OP ] = "ACC_OUT_OP";
-  tag [ ACC_LOCAL_OP ] = "ACC_LOCAL_OP";
-  tag [ ACC_PRIVATE_OP ] = "ACC_PRIVATE_OP";
-  tag [ ACC_DEVICE_OP ] = "ACC_DEVICE_OP";
-  tag [ ACC_CUDA_OP ] = "ACC_CUDA_OP";
-  tag [ ACC_HOST_OP ] = "ACC_HOST_OP";
-
-  tag [ ACC_GLOBAL_OP ] = "ACC_GLOBAL_OP";
-  tag [ ACC_ATTRIBUTES_OP ] = "ACC_ATTRIBUTES_OP";
-  tag [ ACC_VALUE_OP ] = "ACC_VALUE_OP";
-  tag [ ACC_SHARED_OP ] = "ACC_SHARED_OP";
-  tag [ ACC_CONSTANT_OP ] = "ACC_CONSTANT_OP";
-  tag [ ACC_USES_OP ] = "ACC_USES_OP";
-  tag [ ACC_CALL_OP ] = "ACC_CALL_OP";
-  tag [ ACC_CUDA_BLOCK_OP ] = "ACC_CUDA_BLOCK_OP";
-
-  tag [ ACC_TARGETS_OP ] = "ACC_TARGETS_OP";
-  tag [ ACC_ASYNC_OP ] = "ACC_ASYNC_OP";
-
-  tag [ SPF_ANALYSIS_DIR ] = "SPF_ANALYSIS_DIR";
-  tag [ SPF_PARALLEL_DIR ] = "SPF_PARALLEL_DIR";
-  tag [ SPF_TRANSFORM_DIR ] = "SPF_TRANSFORM_DIR";
-  tag [ SPF_NOINLINE_OP ] = "SPF_NOINLINE_OP";
-  tag [ SPF_PARALLEL_REG_DIR ] = "SPF_PARALLEL_REG_DIR";
-  tag [ SPF_END_PARALLEL_REG_DIR ] = "SPF_END_PARALLEL_REG_DIR";
-  tag [ SPF_REGION_NAME ] = "SPF_REGION_NAME";
-  tag [ SPF_EXPAND_OP ] = "SPF_EXPAND_OP";
-  tag [ SPF_FISSION_OP ] = "SPF_FISSION_OP";
-  tag [ SPF_SHRINK_OP ] = "SPF_SHRINK_OP";
-  tag [ SPF_CHECKPOINT_DIR ] = "SPF_CHECKPOINT_DIR";
-  tag [ SPF_TYPE_OP ] = "SPF_TYPE_OP";
-  tag [ SPF_VARLIST_OP ] = "SPF_VARLIST_OP";
-  tag [ SPF_EXCEPT_OP ] = "SPF_EXCEPT_OP";
-  tag [ SPF_FILES_COUNT_OP ] = "SPF_FILES_COUNT_OP";
-  tag [ SPF_INTERVAL_OP ] = "SPF_INTERVAL_OP";
-  tag [ SPF_TIME_OP ] = "SPF_TIME_OP";
-  tag [ SPF_ITER_OP ] = "SPF_ITER_OP";
-  tag [ SPF_FLEXIBLE_OP ] = "SPF_FLEXIBLE_OP";
-  tag [ SPF_PARAMETER_OP ] = "SPF_PARAMETER_OP";
-  tag [ SPF_CODE_COVERAGE_OP ] = "SPF_CODE_COVERAGE_OP";
-  tag [ SPF_UNROLL_OP ] = "SPF_UNROLL_OP";
-  tag [ SPF_COVER_OP ] = "SPF_COVER_OP";
-  tag [ SPF_MERGE_OP ] = "SPF_MERGE_OP";
-  tag [ SPF_PROCESS_PRIVATE_OP ] = "SPF_PROCESS_PRIVATE_OP";
-  tag [ SPF_WEIGHT_OP ] = "SPF_WEIGHT_OP";
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/tokdefs.h b/projects/dvm_svn/fdvm/trunk/parser/tokdefs.h
deleted file mode 100644
index 7dd70ee..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/tokdefs.h
+++ /dev/null
@@ -1,357 +0,0 @@
-#define PERCENT 1
-#define AMPERSAND 2
-#define ASTER 3
-#define CLUSTER 4
-#define COLON 5
-#define COMMA 6
-#define DASTER 7
-#define DEFINED_OPERATOR 8
-#define DOT 9
-#define DQUOTE 10
-#define GLOBAL_A 11
-#define LEFTAB 12
-#define LEFTPAR 13
-#define MINUS 14
-#define PLUS 15
-#define POINT_TO 16
-#define QUOTE 17
-#define RIGHTAB 18
-#define RIGHTPAR 19
-#define AND 20
-#define DSLASH 21
-#define EQV 22
-#define EQ 23
-#define EQUAL 24
-#define FFALSE 25
-#define GE 26
-#define GT 27
-#define LE 28
-#define LT 29
-#define NE 30
-#define NEQV 31
-#define NOT 32
-#define OR 33
-#define TTRUE 34
-#define SLASH 35
-#define XOR 36
-#define REFERENCE 37
-#define AT 38
-#define ACROSS 39
-#define ALIGN_WITH 40
-#define ALIGN 41
-#define ALLOCATABLE 42
-#define ALLOCATE 43
-#define ARITHIF 44
-#define ASSIGNMENT 45
-#define ASSIGN 46
-#define ASSIGNGOTO 47
-#define ASYNCHRONOUS 48
-#define ASYNCID 49
-#define ASYNCWAIT 50
-#define BACKSPACE 51
-#define BAD_CCONST 52
-#define BAD_SYMBOL 53
-#define BARRIER 54
-#define BLOCKDATA 55
-#define BLOCK 56
-#define BOZ_CONSTANT 57
-#define BYTE 58
-#define CALL 59
-#define CASE 60
-#define CHARACTER 61
-#define CHAR_CONSTANT 62
-#define CHECK 63
-#define CLOSE 64
-#define COMMON 65
-#define COMPLEX 66
-#define COMPGOTO 67
-#define CONSISTENT_GROUP 68
-#define CONSISTENT_SPEC 69
-#define CONSISTENT_START 70
-#define CONSISTENT_WAIT 71
-#define CONSISTENT 72
-#define CONSTRUCT_ID 73
-#define CONTAINS 74
-#define CONTINUE 75
-#define CORNER 76
-#define CYCLE 77
-#define DATA 78
-#define DEALLOCATE 79
-#define HPF_TEMPLATE 80
-#define DEBUG 81
-#define DEFAULT_CASE 82
-#define DEFINE 83
-#define DERIVED 84
-#define DIMENSION 85
-#define DISTRIBUTE 86
-#define DOWHILE 87
-#define DOUBLEPRECISION 88
-#define DOUBLECOMPLEX 89
-#define DP_CONSTANT 90
-#define DVM_POINTER 91
-#define DYNAMIC 92
-#define ELEMENTAL 93
-#define ELSE 94
-#define ELSEIF 95
-#define ELSEWHERE 96
-#define ENDASYNCHRONOUS 97
-#define ENDDEBUG 98
-#define ENDINTERVAL 99
-#define ENDUNIT 100
-#define ENDDO 101
-#define ENDFILE 102
-#define ENDFORALL 103
-#define ENDIF 104
-#define ENDINTERFACE 105
-#define ENDMODULE 106
-#define ENDON 107
-#define ENDSELECT 108
-#define ENDTASK_REGION 109
-#define ENDTYPE 110
-#define ENDWHERE 111
-#define ENTRY 112
-#define EXIT 113
-#define EOLN 114
-#define EQUIVALENCE 115
-#define ERROR 116
-#define EXTERNAL 117
-#define F90 118
-#define FIND 119
-#define FORALL 120
-#define FORMAT 121
-#define FUNCTION 122
-#define GATE 123
-#define GEN_BLOCK 124
-#define HEAP 125
-#define HIGH 126
-#define IDENTIFIER 127
-#define IMPLICIT 128
-#define IMPLICITNONE 129
-#define INCLUDE_TO 130
-#define INCLUDE 131
-#define INDEPENDENT 132
-#define INDIRECT_ACCESS 133
-#define INDIRECT_GROUP 134
-#define INDIRECT 135
-#define INHERIT 136
-#define INQUIRE 137
-#define INTERFACEASSIGNMENT 138
-#define INTERFACEOPERATOR 139
-#define INTERFACE 140
-#define INTRINSIC 141
-#define INTEGER 142
-#define INTENT 143
-#define INTERVAL 144
-#define INOUT 145
-#define IN 146
-#define INT_CONSTANT 147
-#define LABEL 148
-#define LABEL_DECLARE 149
-#define LET 150
-#define LOCALIZE 151
-#define LOGICAL 152
-#define LOGICALIF 153
-#define LOOP 154
-#define LOW 155
-#define MAXLOC 156
-#define MAX 157
-#define MAP 158
-#define MINLOC 159
-#define MIN 160
-#define MODULE_PROCEDURE 161
-#define MODULE 162
-#define MULT_BLOCK 163
-#define NAMEEQ 164
-#define NAMELIST 165
-#define NEW_VALUE 166
-#define NEW 167
-#define NULLIFY 168
-#define OCTAL_CONSTANT 169
-#define ONLY 170
-#define ON 171
-#define ON_DIR 172
-#define ONTO 173
-#define OPEN 174
-#define OPERATOR 175
-#define OPTIONAL 176
-#define OTHERWISE 177
-#define OUT 178
-#define OWN 179
-#define PARALLEL 180
-#define PARAMETER 181
-#define PAUSE 182
-#define PLAINDO 183
-#define PLAINGOTO 184
-#define POINTER 185
-#define POINTERLET 186
-#define PREFETCH 187
-#define PRINT 188
-#define PRIVATE 189
-#define PRODUCT 190
-#define PROGRAM 191
-#define PUBLIC 192
-#define PURE 193
-#define RANGE 194
-#define READ 195
-#define REALIGN_WITH 196
-#define REALIGN 197
-#define REAL 198
-#define REAL_CONSTANT 199
-#define RECURSIVE 200
-#define REDISTRIBUTE_NEW 201
-#define REDISTRIBUTE 202
-#define REDUCTION_GROUP 203
-#define REDUCTION_START 204
-#define REDUCTION_WAIT 205
-#define REDUCTION 206
-#define REMOTE_ACCESS_SPEC 207
-#define REMOTE_ACCESS 208
-#define REMOTE_GROUP 209
-#define RESET 210
-#define RESULT 211
-#define RETURN 212
-#define REWIND 213
-#define SAVE 214
-#define SECTION 215
-#define SELECT 216
-#define SEQUENCE 217
-#define SHADOW_ADD 218
-#define SHADOW_COMPUTE 219
-#define SHADOW_GROUP 220
-#define SHADOW_RENEW 221
-#define SHADOW_START_SPEC 222
-#define SHADOW_START 223
-#define SHADOW_WAIT_SPEC 224
-#define SHADOW_WAIT 225
-#define SHADOW 226
-#define STAGE 227
-#define STATIC 228
-#define STAT 229
-#define STOP 230
-#define SUBROUTINE 231
-#define SUM 232
-#define SYNC 233
-#define TARGET 234
-#define TASK 235
-#define TASK_REGION 236
-#define THEN 237
-#define TO 238
-#define TRACEON 239
-#define TRACEOFF 240
-#define TRUNC 241
-#define TYPE 242
-#define TYPE_DECL 243
-#define UNDER 244
-#define UNKNOWN 245
-#define USE 246
-#define VIRTUAL 247
-#define VARIABLE 248
-#define WAIT 249
-#define WHERE 250
-#define WHERE_ASSIGN 251
-#define WHILE 252
-#define WITH 253
-#define WRITE 254
-#define COMMENT 255
-#define WGT_BLOCK 256
-#define HPF_PROCESSORS 257
-#define IOSTAT 258
-#define ERR 259
-#define END 260
-#define OMPDVM_ATOMIC 261
-#define OMPDVM_BARRIER 262
-#define OMPDVM_COPYIN 263
-#define OMPDVM_COPYPRIVATE 264
-#define OMPDVM_CRITICAL 265
-#define OMPDVM_ONETHREAD 266
-#define OMPDVM_DO 267
-#define OMPDVM_DYNAMIC 268
-#define OMPDVM_ENDCRITICAL 269
-#define OMPDVM_ENDDO 270
-#define OMPDVM_ENDMASTER 271
-#define OMPDVM_ENDORDERED 272
-#define OMPDVM_ENDPARALLEL 273
-#define OMPDVM_ENDPARALLELDO 274
-#define OMPDVM_ENDPARALLELSECTIONS 275
-#define OMPDVM_ENDPARALLELWORKSHARE 276
-#define OMPDVM_ENDSECTIONS 277
-#define OMPDVM_ENDSINGLE 278
-#define OMPDVM_ENDWORKSHARE 279
-#define OMPDVM_FIRSTPRIVATE 280
-#define OMPDVM_FLUSH 281
-#define OMPDVM_GUIDED 282
-#define OMPDVM_LASTPRIVATE 283
-#define OMPDVM_MASTER 284
-#define OMPDVM_NOWAIT 285
-#define OMPDVM_NONE 286
-#define OMPDVM_NUM_THREADS 287
-#define OMPDVM_ORDERED 288
-#define OMPDVM_PARALLEL 289
-#define OMPDVM_PARALLELDO 290
-#define OMPDVM_PARALLELSECTIONS 291
-#define OMPDVM_PARALLELWORKSHARE 292
-#define OMPDVM_RUNTIME 293
-#define OMPDVM_SECTION 294
-#define OMPDVM_SECTIONS 295
-#define OMPDVM_SCHEDULE 296
-#define OMPDVM_SHARED 297
-#define OMPDVM_SINGLE 298
-#define OMPDVM_THREADPRIVATE 299
-#define OMPDVM_WORKSHARE 300
-#define OMPDVM_NODES 301
-#define OMPDVM_IF 302
-#define IAND 303
-#define IEOR 304
-#define IOR 305
-#define ACC_REGION 306
-#define ACC_END_REGION 307
-#define ACC_CHECKSECTION 308
-#define ACC_END_CHECKSECTION 309
-#define ACC_GET_ACTUAL 310
-#define ACC_ACTUAL 311
-#define ACC_TARGETS 312
-#define ACC_ASYNC 313
-#define ACC_HOST 314
-#define ACC_CUDA 315
-#define ACC_LOCAL 316
-#define ACC_INLOCAL 317
-#define ACC_CUDA_BLOCK 318
-#define ACC_ROUTINE 319
-#define ACC_TIE 320
-#define ACC_DECLARE 321
-#define BY 322
-#define IO_MODE 323
-#define CP_CREATE 324
-#define CP_LOAD 325
-#define CP_SAVE 326
-#define CP_WAIT 327
-#define FILES 328
-#define VARLIST 329
-#define STATUS 330
-#define EXITINTERVAL 331
-#define TEMPLATE_CREATE 332
-#define TEMPLATE_DELETE 333
-#define SPF_ANALYSIS 334
-#define SPF_PARALLEL 335
-#define SPF_TRANSFORM 336
-#define SPF_NOINLINE 337
-#define SPF_PARALLEL_REG 338
-#define SPF_END_PARALLEL_REG 339
-#define SPF_EXPAND 340
-#define SPF_FISSION 341
-#define SPF_SHRINK 342
-#define SPF_CHECKPOINT 343
-#define SPF_EXCEPT 344
-#define SPF_FILES_COUNT 345
-#define SPF_INTERVAL 346
-#define SPF_TIME 347
-#define SPF_ITER 348
-#define SPF_FLEXIBLE 349
-#define SPF_APPLY_REGION 350
-#define SPF_APPLY_FRAGMENT 351
-#define SPF_CODE_COVERAGE 352
-#define SPF_UNROLL 353
-#define SPF_MERGE 354
-#define SPF_COVER 355
-#define SPF_PROCESS_PRIVATE 356
-#define SPF_WEIGHT 357
diff --git a/projects/dvm_svn/fdvm/trunk/parser/tokens b/projects/dvm_svn/fdvm/trunk/parser/tokens
deleted file mode 100644
index bf8e1bc..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/tokens
+++ /dev/null
@@ -1,357 +0,0 @@
-PERCENT
-AMPERSAND
-ASTER
-CLUSTER
-COLON
-COMMA
-DASTER
-DEFINED_OPERATOR
-DOT
-DQUOTE
-GLOBAL_A
-LEFTAB
-LEFTPAR
-MINUS
-PLUS
-POINT_TO
-QUOTE
-RIGHTAB
-RIGHTPAR
-AND
-DSLASH
-EQV
-EQ
-EQUAL
-FFALSE
-GE
-GT
-LE
-LT
-NE
-NEQV
-NOT
-OR
-TTRUE
-SLASH
-XOR
-REFERENCE
-AT
-ACROSS
-ALIGN_WITH
-ALIGN
-ALLOCATABLE
-ALLOCATE
-ARITHIF
-ASSIGNMENT
-ASSIGN
-ASSIGNGOTO
-ASYNCHRONOUS
-ASYNCID
-ASYNCWAIT
-BACKSPACE
-BAD_CCONST
-BAD_SYMBOL
-BARRIER
-BLOCKDATA
-BLOCK
-BOZ_CONSTANT
-BYTE
-CALL
-CASE
-CHARACTER
-CHAR_CONSTANT
-CHECK
-CLOSE
-COMMON
-COMPLEX
-COMPGOTO
-CONSISTENT_GROUP
-CONSISTENT_SPEC
-CONSISTENT_START
-CONSISTENT_WAIT
-CONSISTENT
-CONSTRUCT_ID
-CONTAINS
-CONTINUE
-CORNER
-CYCLE
-DATA
-DEALLOCATE
-HPF_TEMPLATE
-DEBUG
-DEFAULT_CASE
-DEFINE
-DERIVED
-DIMENSION
-DISTRIBUTE
-DOWHILE
-DOUBLEPRECISION
-DOUBLECOMPLEX
-DP_CONSTANT
-DVM_POINTER
-DYNAMIC
-ELEMENTAL
-ELSE
-ELSEIF
-ELSEWHERE
-ENDASYNCHRONOUS
-ENDDEBUG
-ENDINTERVAL
-ENDUNIT
-ENDDO
-ENDFILE
-ENDFORALL
-ENDIF
-ENDINTERFACE
-ENDMODULE
-ENDON
-ENDSELECT
-ENDTASK_REGION
-ENDTYPE
-ENDWHERE
-ENTRY
-EXIT
-EOLN
-EQUIVALENCE
-ERROR
-EXTERNAL
-F90
-FIND
-FORALL
-FORMAT
-FUNCTION
-GATE
-GEN_BLOCK
-HEAP
-HIGH
-IDENTIFIER
-IMPLICIT
-IMPLICITNONE
-INCLUDE_TO
-INCLUDE
-INDEPENDENT
-INDIRECT_ACCESS
-INDIRECT_GROUP
-INDIRECT
-INHERIT
-INQUIRE
-INTERFACEASSIGNMENT
-INTERFACEOPERATOR
-INTERFACE
-INTRINSIC
-INTEGER
-INTENT
-INTERVAL
-INOUT
-IN
-INT_CONSTANT
-LABEL
-LABEL_DECLARE
-LET
-LOCALIZE
-LOGICAL
-LOGICALIF
-LOOP
-LOW
-MAXLOC
-MAX
-MAP
-MINLOC
-MIN
-MODULE_PROCEDURE
-MODULE
-MULT_BLOCK
-NAMEEQ
-NAMELIST
-NEW_VALUE
-NEW
-NULLIFY
-OCTAL_CONSTANT
-ONLY
-ON
-ON_DIR
-ONTO
-OPEN
-OPERATOR
-OPTIONAL
-OTHERWISE
-OUT
-OWN
-PARALLEL
-PARAMETER
-PAUSE
-PLAINDO
-PLAINGOTO
-POINTER
-POINTERLET
-PREFETCH
-PRINT
-PRIVATE
-PRODUCT
-PROGRAM
-PUBLIC
-PURE
-RANGE
-READ
-REALIGN_WITH
-REALIGN
-REAL
-REAL_CONSTANT
-RECURSIVE
-REDISTRIBUTE_NEW
-REDISTRIBUTE
-REDUCTION_GROUP
-REDUCTION_START
-REDUCTION_WAIT
-REDUCTION
-REMOTE_ACCESS_SPEC
-REMOTE_ACCESS
-REMOTE_GROUP
-RESET
-RESULT
-RETURN
-REWIND
-SAVE
-SECTION
-SELECT
-SEQUENCE
-SHADOW_ADD
-SHADOW_COMPUTE
-SHADOW_GROUP
-SHADOW_RENEW
-SHADOW_START_SPEC
-SHADOW_START
-SHADOW_WAIT_SPEC
-SHADOW_WAIT
-SHADOW
-STAGE
-STATIC
-STAT
-STOP
-SUBROUTINE
-SUM
-SYNC
-TARGET
-TASK
-TASK_REGION
-THEN
-TO
-TRACEON
-TRACEOFF
-TRUNC
-TYPE
-TYPE_DECL
-UNDER
-UNKNOWN
-USE
-VIRTUAL
-VARIABLE
-WAIT
-WHERE
-WHERE_ASSIGN
-WHILE
-WITH
-WRITE
-COMMENT
-WGT_BLOCK
-HPF_PROCESSORS
-IOSTAT
-ERR
-END
-OMPDVM_ATOMIC
-OMPDVM_BARRIER
-OMPDVM_COPYIN
-OMPDVM_COPYPRIVATE
-OMPDVM_CRITICAL
-OMPDVM_ONETHREAD
-OMPDVM_DO
-OMPDVM_DYNAMIC
-OMPDVM_ENDCRITICAL
-OMPDVM_ENDDO
-OMPDVM_ENDMASTER
-OMPDVM_ENDORDERED
-OMPDVM_ENDPARALLEL
-OMPDVM_ENDPARALLELDO
-OMPDVM_ENDPARALLELSECTIONS
-OMPDVM_ENDPARALLELWORKSHARE
-OMPDVM_ENDSECTIONS
-OMPDVM_ENDSINGLE
-OMPDVM_ENDWORKSHARE
-OMPDVM_FIRSTPRIVATE
-OMPDVM_FLUSH
-OMPDVM_GUIDED
-OMPDVM_LASTPRIVATE
-OMPDVM_MASTER
-OMPDVM_NOWAIT
-OMPDVM_NONE
-OMPDVM_NUM_THREADS
-OMPDVM_ORDERED
-OMPDVM_PARALLEL
-OMPDVM_PARALLELDO
-OMPDVM_PARALLELSECTIONS
-OMPDVM_PARALLELWORKSHARE
-OMPDVM_RUNTIME
-OMPDVM_SECTION
-OMPDVM_SECTIONS
-OMPDVM_SCHEDULE
-OMPDVM_SHARED
-OMPDVM_SINGLE
-OMPDVM_THREADPRIVATE
-OMPDVM_WORKSHARE
-OMPDVM_NODES
-OMPDVM_IF
-IAND
-IEOR
-IOR
-ACC_REGION
-ACC_END_REGION
-ACC_CHECKSECTION
-ACC_END_CHECKSECTION
-ACC_GET_ACTUAL
-ACC_ACTUAL
-ACC_TARGETS
-ACC_ASYNC
-ACC_HOST
-ACC_CUDA
-ACC_LOCAL
-ACC_INLOCAL
-ACC_CUDA_BLOCK
-ACC_ROUTINE
-ACC_TIE
-ACC_DECLARE
-BY
-IO_MODE
-CP_CREATE
-CP_LOAD
-CP_SAVE
-CP_WAIT
-FILES
-VARLIST
-STATUS
-EXITINTERVAL
-TEMPLATE_CREATE
-TEMPLATE_DELETE
-SPF_ANALYSIS
-SPF_PARALLEL
-SPF_TRANSFORM
-SPF_NOINLINE
-SPF_PARALLEL_REG
-SPF_END_PARALLEL_REG
-SPF_EXPAND
-SPF_FISSION
-SPF_SHRINK
-SPF_CHECKPOINT
-SPF_EXCEPT
-SPF_FILES_COUNT
-SPF_INTERVAL
-SPF_TIME
-SPF_ITER
-SPF_FLEXIBLE
-SPF_APPLY_REGION
-SPF_APPLY_FRAGMENT
-SPF_CODE_COVERAGE
-SPF_UNROLL
-SPF_MERGE
-SPF_COVER
-SPF_PROCESS_PRIVATE
-SPF_WEIGHT
\ No newline at end of file
diff --git a/projects/dvm_svn/fdvm/trunk/parser/types.c b/projects/dvm_svn/fdvm/trunk/parser/types.c
deleted file mode 100644
index b8ca5eb..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/types.c
+++ /dev/null
@@ -1,778 +0,0 @@
-/*********************************************************************/
-/*                  pC++/Sage++  Copyright (C) 1993                  */
-/*  Indiana University  University of Oregon  University of Rennes   */
-/*********************************************************************/
-
-
-/*
- * types.c
- *
- * Routines to handle the type and variable decalrations
- */
-
-#include <stdio.h>
-#include "defs.h"
-#include "ll.h"
-#include "symb.h"
-#include "db.h"
-#include "f90.h"
-#include "fm.h"
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-
-PTR_LLND make_llnd();
-PTR_TYPE make_type();
-PTR_BFND get_bfnd();
-extern void err();
-extern PTR_FILE fi;
-void errstr();
-int match_args();
-int match_an_arg();
-int remainder_optional();
-
-extern PTR_TYPE global_int, global_double, global_float, global_bool;
-extern PTR_TYPE global_char, global_string, global_complex, global_dcomplex, global_default;
-
-/*
- * set_type takes an id_list and a base type goes through list
- *  settting up the type used for variables and params 
- */
-void
-set_type(id_list, base, tag)
-	PTR_SYMB id_list;
-	PTR_TYPE base;
-	int     tag;
-{
-	PTR_SYMB temp;
-	PTR_SYMB last;
-
-	temp = id_list;
-	while (temp) {
-		temp->variant = VARIABLE_NAME;
-		temp->type = base;
-		temp->entry.var_decl.local = tag;
-	/* if parameter the local field should already be set */
-		last = temp;
-		temp = last->id_list;
-		last->id_list = SMNULL;
-	}
-}
-
-
-/*
- * install_const takes an id_list and an expr sets up the constant declarations
- */
-void 
-install_const(id_list, expr)
-	PTR_SYMB id_list;
-	PTR_LLND expr;
-{
-	register PTR_SYMB temp, last;
-
-	temp = id_list;
-	while (temp) {
-		temp->variant = CONST_NAME;
-		temp->type = expr->type;
-		temp->entry.const_value = expr;
-		last = temp;
-		temp = last->id_list;
-		last->id_list = SMNULL;
-	}
-}
-
-
-/*
- * install_array
- */
-PTR_TYPE 
-install_array(range, base, ndim)
-	PTR_LLND range;
-	PTR_TYPE base;
-	int     ndim;
-{
-	PTR_TYPE ret;
-
-	ret = make_type(fi,T_ARRAY);
-	ret->entry.ar_decl.num_dimensions = ndim;
-	ret->entry.ar_decl.base_type = base;
-	return (ret);
-}
-
-
-/* 
- * install_param_list gets an proc id and a parameter list
- * and sets them up as parameters
- */
-void
-install_param_list(id, id_list, result_clause, func)
-PTR_SYMB id, id_list;
-int func;
-PTR_LLND result_clause;
-{
-	int     num_input = 0;
-	register PTR_SYMB temp, last, result_sym_ptr;
-
-	temp = id_list;
-	while (temp) {
-		temp->variant = VARIABLE_NAME;
-		temp->entry.var_decl.next_in = temp->id_list;
-		temp->entry.var_decl.local = IO;
-		++num_input;
-		last = temp;
-		temp = last->id_list;
-		last->id_list = SMNULL;
-	}
-	id->entry.proc_decl.in_list = id_list;
-	id->entry.proc_decl.num_io = 0;
-	id->entry.proc_decl.num_input = num_input;
-	id->entry.proc_decl.num_output = (func == FUNCTION_NAME);
-	if (result_clause) 
-	{
-	     result_sym_ptr = result_clause->entry.Template.symbol;
-	     /* id->entry.Template.declared_name = result_sym_ptr;*/ /*16.03.03*/
-	     result_sym_ptr->type = id->type;
-	}
-}
-
-PTR_LLND 
-construct_entry_list(entry_id, symb_list, entry_kind)
-PTR_SYMB entry_id, symb_list;
-int entry_kind;
-{
-     int     num_input = 0;
-     PTR_SYMB last_symb;
-     PTR_LLND entry_param_list, l, set_ll_list();
-    
-     entry_param_list = LLNULL;
-     if (symb_list) 
-     {
-	  l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, symb_list);
-	  entry_param_list = set_ll_list(l, LLNULL, EXPR_LIST);
-	  last_symb = symb_list;
-	  symb_list = last_symb->id_list;
-	  last_symb->id_list = SMNULL;
-	  num_input++;
-          last_symb->entry.var_decl.local = IO; /*5.02.03*/
-     }
-
-     while (symb_list) 
-     {
-	  l = make_llnd(fi, VAR_REF, LLNULL, LLNULL, symb_list);
-	  entry_param_list = set_ll_list(entry_param_list, l, EXPR_LIST);
-	  last_symb = symb_list;
-	  symb_list = last_symb->id_list;
-	  last_symb->id_list = SMNULL;
-	  num_input++;
-          last_symb->entry.var_decl.local = IO; /*5.02.03*/
-     }
-
-     /* entry_id->entry.proc_decl.in_list = symb_list; */
-     entry_id->entry.proc_decl.num_io = 0;
-     entry_id->entry.proc_decl.num_input = num_input;
-     entry_id->entry.proc_decl.num_output = (entry_kind == FUNCTION_NAME);
-     return entry_param_list;
-  
-}
-
-	  
-/*
- * set_expr_type sets the type of an expression and
- *    performs other semantic checks
- */
-void 
-set_expr_type(expr)
-	PTR_LLND expr;
-{
-	int     r_type, l_type, ilen;
-	PTR_TYPE temp, l_operand, r_operand, copy_type_node();
-	PTR_LLND len;
-        len = NULL;
-        ilen = 0;
-	switch (expr->variant) {
-
-	    case (ARRAY_MULT):	/* to be changed */
-	    case (PROC_CALL):
-	    case (DEF_CHOICE):
-	    case (VAR_LIST):
-	    case (EXPR_LIST):
-	    case (RANGE_LIST):
-	    case (RANGE_OP):
-	    case (STAR_RANGE):
-		expr->type = global_default;
-		break;
-
-	    case (INT_VAL):
-		expr->type = global_int;
-		break;
-	    case (FLOAT_VAL):
-		expr->type = global_float;
-		break;
-	    case (DOUBLE_VAL):
-		expr->type = global_double;
-		break;
-	    case (BOOL_VAL):
-		expr->type = global_bool;
-		break;
-	    case (CHAR_VAL):
-		expr->type = global_char;
-		break;
-	    case (STMT_STR):
-	    case (STRING_VAL):
-		expr->type = global_string;
-		break;
-	    case (COMPLEX_VAL):
-		expr->type = global_complex;
-		break;
-	    case (CONST_REF):	/* check that the symbol referred to is a
-				 * constant and then return type */
-	       if (expr->entry.const_ref.symbol->variant != CONST_NAME) {
-		 /*err("Not a constant identifier");*/ /*podd*/
-			expr->type = global_default;
-		} else
-			expr->type = expr->entry.const_ref.symbol->type;
-		break;
-	    case (ENUM_REF):
-	    case (VAR_REF):
-		expr->type = expr->entry.var_ref.symbol->type;
-		if (expr->type == global_default)
-			err("Identifier not declared",321);
-		break;
-
-	    case (ARRAY_REF):	/* check to see if symbol is array ??? */
-		expr->type = expr->entry.array_ref.array_elt ?
-			expr->entry.array_ref.array_elt->type :
-			expr->entry.array_ref.symbol->type;
-		break;
-
-	    case (RECORD_REF):
-		expr->type = expr->entry.record_ref.rec_field ?
-			expr->entry.record_ref.rec_field->type :
-			expr->entry.record_ref.symbol->type;
-		break;
-	    case (MOD_OP):
-	    case (LOWER_OP):
-	    case (UPPER_OP):
-		expr->type = global_int;
-		break;
-	    case (AND_OP):
-	    case (OR_OP):
-	    case (EQ_OP):
-	    case (LT_OP):
-	    case (GT_OP):
-	    case (NOTEQL_OP):
-	    case (LTEQL_OP):
-	    case (EQV_OP):
-	    case (NEQV_OP):
-	    case (GTEQL_OP):
-	        if ((expr->entry.binary_op.l_operand == LLNULL) ||
-                     (expr->entry.binary_op.l_operand->type == TYNULL) ||
-		     (expr->entry.binary_op.r_operand == LLNULL) ||
-                     (expr->entry.binary_op.r_operand->type == TYNULL))
-		     /*   err("Inconsistent operands to boolean operation", 26); */
-                     expr->type = global_default; 
-		else if (expr->entry.binary_op.l_operand->type->variant == T_ARRAY)
-		{
-		     expr->type = copy_type_node(expr->entry.binary_op.l_operand->type);
-		     expr->type->entry.ar_decl.base_type =  global_bool;
-		}
-                else if (expr->entry.binary_op.r_operand->type->variant == T_ARRAY)
-		{
-		     expr->type = copy_type_node(expr->entry.binary_op.r_operand->type);
-		     expr->type->entry.ar_decl.base_type =  global_bool;
-		}
-		else  expr->type =  global_bool;
-		break;
-	    case (DIV_OP):
-	    case (ADD_OP):
-	    case (SUBT_OP):
-	    case (MULT_OP):
-            case (EXP_OP):
-		 if ((expr->entry.binary_op.l_operand == LLNULL) ||
-		     (expr->entry.binary_op.r_operand == LLNULL)) 
-                 {
-		   /* err("Inconsistent operands to arithmetic operation", 27);*/
-                     expr->type = global_default;
-                     break;
-                 }
-  	        l_operand = expr->entry.binary_op.l_operand->type;
-		r_operand = expr->entry.binary_op.r_operand->type;
-		if (! l_operand || ! r_operand)
-			expr->type = global_default;
-		else {
-		        if (l_operand->variant == T_ARRAY)
-			     l_type = l_operand->entry.ar_decl.base_type->variant;
-			else
-			     l_type = l_operand->variant;
-		        if (r_operand->variant == T_ARRAY)
-			     r_type = r_operand->entry.ar_decl.base_type->variant;
-			else
-			     r_type = r_operand->variant;
-                        if(l_operand->entry.Template.ranges)
-                        { len=(l_operand->entry.Template.ranges)->entry.Template.ll_ptr1;
-                          if(len && len->variant==INT_VAL)
-                             ilen=len->entry.ival; 
-                          if(l_type==T_FLOAT && ilen==8)                        
-                             l_type=T_DOUBLE;
-                          if(l_type==T_COMPLEX && ilen==16)                        
-                             l_type=T_DCOMPLEX;
-                        }
-                        if(r_operand->entry.Template.ranges)
-                        { len=(r_operand->entry.Template.ranges)->entry.Template.ll_ptr1;
-                          if(len && len->variant==INT_VAL)
-                             ilen=len->entry.ival; 
-                          if(r_type==T_FLOAT && ilen==8)                        
-                             r_type=T_DOUBLE;
-                          if(r_type==T_COMPLEX && ilen==16)                        
-                             r_type=T_DCOMPLEX;
-                        }
-
-			if (l_type == T_DCOMPLEX || r_type == T_DCOMPLEX)
-				temp = global_dcomplex;
-			else if (l_type == T_COMPLEX || r_type == T_COMPLEX)
-				temp = global_complex;
-			else if (l_type == T_DOUBLE || r_type == T_DOUBLE)
-				temp = global_double;
-			else if (l_type == T_FLOAT || r_type == T_FLOAT)
-				temp = global_float;
-			else if (l_type == T_INT && r_type == T_INT) 
-				temp = global_int;
-				
-		        else temp = global_default;
-
-			if (l_operand->variant == T_ARRAY)
-			{
-			     expr->type = copy_type_node(expr->entry.binary_op.l_operand->type);
-			     expr->type->entry.ar_decl.base_type =  temp;
-			}
-                        else if (r_operand->variant == T_ARRAY)
-		        {
-		            expr->type = copy_type_node(expr->entry.binary_op.r_operand->type);
-		            expr->type->entry.ar_decl.base_type =  temp;
-		        }
-			else  expr->type =  temp;
-		   }
-		break;
-	    case (NOT_OP):
-	    case (UNARY_ADD_OP):
-	    case (MINUS_OP):
-		expr->type = expr->entry.unary_op.operand->type;
-		break;
-	   /* case (EXP_OP):
-		expr->type = expr->entry.binary_op.l_operand->type;
-		break;
-            */
-	    case (CONCAT_OP):
-		expr->type = expr->entry.binary_op.l_operand->type;
-		break;
-	    case (DDOT):
-		expr->type = expr->entry.binary_op.r_operand->type;
-		break;
-	    default:
-		err("Expression variant not known",322);
-		break;
-
-	}
-}
-
-
-/* 
- * chase_qual_index  gets a partially set up variable and an index list
- * and has to chase down array elements or record fields to hang the list
- */
-void 
-chase_qual_index(ref, index_list)
-	PTR_LLND ref, index_list;
-{
-	if (ref->variant == ARRAY_REF)
-		chase_qual_index(ref->entry.array_ref.array_elt, index_list);
-	else if (ref->variant == RECORD_REF)
-		chase_qual_index(ref->entry.record_ref.rec_field, index_list);
-	else if (ref->variant == VAR_REF) {
-
-	/*
-	 * check that this is an array ref symbol and that dimensions are ok
-	 * etc. 
-	 */
-		ref->variant = ARRAY_REF;
-		ref->entry.array_ref.index = index_list;
-	}
-}
-
-
-/*
- * chase_qual_field gets ref and a field_id and has to be set up
- */
-void 
-chase_qual_field(ref, field_id)
-	PTR_LLND ref;
-	PTR_SYMB field_id;
-{
-	if (ref->variant == ARRAY_REF) {
-		if (! ref->entry.array_ref.array_elt)
-			ref->entry.array_ref.array_elt =
-				make_llnd(fi,VAR_REF, LLNULL, LLNULL, field_id);
-		else
-			chase_qual_field(ref->entry.array_ref.array_elt, field_id);
-	} else if (ref->variant == RECORD_REF) {
-		if (! ref->entry.record_ref.rec_field)
-			ref->entry.record_ref.rec_field =
-				make_llnd(fi,VAR_REF, LLNULL, LLNULL, field_id);
-		else
-			chase_qual_field(ref->entry.record_ref.rec_field, field_id);
-	} else if (ref->variant == VAR_REF) {
-		ref->variant = RECORD_REF;
-		ref->entry.record_ref.rec_field =
-			make_llnd(fi,VAR_REF, LLNULL, LLNULL, field_id);
-	} else
-		err("Error in chase filed ids", 323);
-}
-
-PTR_TYPE
-copy_type_node(typenode)
-PTR_TYPE typenode;
-{
-     PTR_TYPE new_node;
-     
-     new_node = make_type(fi, typenode->variant);
-     
-     new_node->entry.Template.base_type = typenode->entry.Template.base_type;
-     new_node->entry.Template.ranges = typenode->entry.Template.ranges;
-     new_node->entry.Template.dummy1 = typenode->entry.Template.dummy1;
-     new_node->entry.Template.kind_len = typenode->entry.Template.kind_len;
-     new_node->entry.Template.dummy3 = typenode->entry.Template.dummy3;
-     new_node->entry.Template.dummy4 = typenode->entry.Template.dummy4;
-     new_node->entry.Template.dummy5 = typenode->entry.Template.dummy5;
-
-     return (new_node);
-}
-
-PTR_SYMB
-resolve_overloading(interface_symbol, argptr)
-PTR_SYMB interface_symbol;
-PTR_LLND argptr;
-{
-     PTR_SYMB current;
-     void reset_args();
-     
-     if (interface_symbol->variant != INTERFACE_NAME)
-	  return (interface_symbol);
-     
-     current = interface_symbol->entry.Template.symb_list; /*entry.Template.declared_name;*//*19.03.03*/
-     while (current) 
-     {
-	  reset_args(current);
-	  if (match_args(current, argptr))
-	       return (current);
-	  current = current->entry.Template.declared_name;
-     }
-     return (SMNULL);
-}
-
-int
-match_args(contender_proc, argptr)
-PTR_SYMB contender_proc;
-PTR_LLND argptr;
-{
-     PTR_SYMB formal_argptr, formal_arg, find_keyword_arg();
-     PTR_LLND argref, actual_arg;
-     int match_status;
-     
-     formal_argptr = contender_proc->entry.Template.in_list;
-     while (argptr && formal_argptr)
-     {
-	  argref = argptr->entry.list.item;
-	  if (argref->variant == KEYWORD_ARG)
-	  {
-	       formal_arg = find_keyword_arg(contender_proc,
-                             argref->entry.Template.ll_ptr1->entry.string_val);
-	       actual_arg = argref->entry.Template.ll_ptr2;
-	  }
-	  else 
-	  {
-	       formal_arg = formal_argptr;
-	       actual_arg = argref;
-	  }
-	  match_status = match_an_arg(actual_arg, formal_arg);
-	  if (!match_status)
-	       return (0);
-	  formal_argptr = formal_argptr->entry.var_decl.next_in;
-	  argptr = argptr->entry.list.next;
-     }
-     if (remainder_optional(contender_proc))
-	  return (1);
-     else return (0);
-}
-
-
-int
-match_an_arg(actual_arg, formal_arg)
-PTR_LLND actual_arg;
-PTR_SYMB formal_arg;
-{
-     PTR_TYPE actual_arg_type, formal_arg_type;
-
-     actual_arg_type = actual_arg->type;
-     formal_arg_type = formal_arg->type;
-     
-     if (actual_arg_type->variant != formal_arg_type->variant) 
-	  return (0);
-     
-     if ((actual_arg_type->variant == T_DERIVED_TYPE) &&
-	 (actual_arg_type->name != formal_arg_type->name))
-	  return (0);
-
-     if (actual_arg_type->variant == T_ARRAY)
-     {
-	  if (actual_arg_type->entry.ar_decl.base_type->variant !=
- 	      formal_arg_type->entry.ar_decl.base_type->variant)
-	       return (0);
-
-	  if ((actual_arg_type->entry.ar_decl.base_type->variant == T_DERIVED_TYPE)
-	      && (actual_arg_type->entry.ar_decl.base_type->name !=
-		  formal_arg_type->entry.ar_decl.base_type->name))
-	       return (0);
-	  
-	  if (actual_arg_type->entry.ar_decl.num_dimensions !=
-	      formal_arg_type->entry.ar_decl.num_dimensions)
-	       return (0);
-     }
-
-     formal_arg->decl = 1;
-     return (1);
-}
-
-void
-reset_args(proc)
-PTR_SYMB proc;
-{
-     PTR_SYMB temp;
-     
-     temp = proc->entry.Template.in_list;
-     while (temp != SMNULL) 
-     {
-	  temp->decl = 0;
-	  temp = temp->entry.var_decl.next_in;
-     }
-}
-
-PTR_SYMB
-find_keyword_arg(proc, keyword)
-PTR_SYMB proc;
-char *keyword;
-{
-     PTR_SYMB temp;
-     
-     temp = proc->entry.Template.in_list;
-     while (temp != SMNULL) 
-     {
-	  if (!strcmp(temp->ident, keyword))
-	       return (temp);
-	  temp = temp->entry.var_decl.next_in;
-     }
-     
-     return (SMNULL);
-}
-
-int
-remainder_optional(proc)
-PTR_SYMB proc;
-{
-     PTR_SYMB temp;
-     
-     temp = proc->entry.Template.in_list;
-     while (temp != SMNULL) 
-     {
-	  if ((temp->decl == 0) && !(temp->attr & OPTIONAL_BIT))
-	       return (0);
-	  temp = temp->entry.var_decl.next_in;
-     }
-     
-     return (1);
-}     
-
-PTR_LLND
-intrinsic_op_node(opname, op, rand1, rand2)
-char *opname;
-int op;
-PTR_LLND rand1, rand2;
-{
-     PTR_HASH hash_node;
-     PTR_SYMB s, sym;
-     PTR_LLND temp1, temp2, l, result;
-     extern PTR_HASH just_look_up_sym();
-     
-     hash_node = just_look_up_sym(opname);  
-     if (hash_node == HSNULL || !strcmp(hash_node->id_attr->ident,"*") && hash_node->id_attr->entry.var_decl.local == IO)
-     {   
-	result = make_llnd(fi, op, rand1, rand2, SMNULL);
-        set_expr_type(result); 
-        return (result);
-     }
-     else 
-     {
-	  s = hash_node->id_attr;
-	  if (s->variant != INTERFACE_NAME)
-	  {
-             errstr("Can't resolve call %s", opname,324);
-	     return (LLNULL);
- 	  }
-
-	  temp1 = make_llnd(fi, EXPR_LIST, rand1, LLNULL, SMNULL);
-	  temp2 = make_llnd(fi, EXPR_LIST, rand2, LLNULL, SMNULL);
-	  temp1->entry.Template.ll_ptr2 = temp2;
-	  sym = resolve_overloading(s, temp1);
-	  if (sym != SMNULL)
-	  {
-	       l = make_llnd(fi, FUNC_CALL, temp1, LLNULL, sym);
-	       l->type = sym->type;
-	       result = make_llnd(fi, OVERLOADED_CALL, l, LLNULL, s);
-	       result->type = sym->type;
-               return (result);
-	  }
-	  else {
-	       result = make_llnd(fi, op, rand1, rand2, SMNULL);
-	       set_expr_type(result); 
-	       return (result);
-	  }
-     }
- return (result);
-}
-
-PTR_LLND
-defined_op_node(hash_node, rand1, rand2)
-PTR_HASH hash_node;
-PTR_LLND rand1, rand2;
-
-{
-     PTR_SYMB s, sym;
-     PTR_LLND temp1,temp2, l, result;
-     PTR_TYPE  type;
-     extern PTR_HASH just_look_up_sym();
-     
-     if (hash_node == HSNULL) 
-     { 
-	  err("Unknown operator",316);
-	  return (LLNULL);
-     }
-     else 
-     {
-	  s = hash_node->id_attr;
-          if(s == SMNULL ){
-             errstr("Unknown operator %s",hash_node->ident,316);
-	     return (LLNULL);
-          }
-	  if ( s->variant != INTERFACE_NAME)
- 
-	  {  
-             errstr("Can't resolve call %s", s->ident,324);
-	     return (LLNULL);
- 	  }
-	 
-	  temp1 = make_llnd(fi, EXPR_LIST, rand1, LLNULL, SMNULL);
-          if(rand2 != LLNULL){
-	    temp2 = make_llnd(fi, EXPR_LIST, rand2, LLNULL, SMNULL);
-	    temp1->entry.Template.ll_ptr2 = temp2;
-          }
-	  sym = resolve_overloading(s, temp1);
-          l = make_llnd(fi, DEFINED_OP, rand1, rand2, s);
-          if (sym != SMNULL)
-             type = sym->type;
-          else
-             type = global_default;
-          l->type = type;
-	  result = make_llnd(fi, OVERLOADED_CALL, l, LLNULL, sym);
-	  result->type = type;
-          return (result);
-	  /*
-	  if (sym != SMNULL)
-	  { 
-	       l = make_llnd(fi, FUNC_CALL, temp1, LLNULL, sym);
- 
-	       l->type = sym->type;
-	       result = make_llnd(fi, OVERLOADED_CALL, l, LLNULL, sym);
-	       result->type = sym->type;
-               return (result);
-	  }
-	  else {
-	    errstr("Can't resolve call %s", hash_node->ident,324);
-
-	     return (result);
-	  }
-         */ /*2.07.03*/
-     }
- return (result);
-}
-
-	       
-
-PTR_BFND
-subroutine_call(subroutine_name, argptr)
-PTR_SYMB subroutine_name;
-PTR_LLND argptr;
-{
-     PTR_BFND stmt;
-     PTR_LLND ll_ptr;
-     PTR_SYMB current;
-     void reset_args();
-     
-  /*   if (subroutine_name->variant != INTERFACE_NAME) */ /*19.08.03*/
-     {
-	  stmt = get_bfnd(fi,PROC_STAT, subroutine_name, argptr, LLNULL, LLNULL);
-	  return (stmt);
-     }
-     
-     current = subroutine_name->entry.Template.symb_list; /*entry.Template.declared_name;*//*19.03.03*/
-     while (current) 
-     {
-	  reset_args(current);
-	  if (match_args(current, argptr))
-	  {
-	       ll_ptr = make_llnd(fi, PROC_CALL, argptr, LLNULL, current);
-	       stmt = get_bfnd(fi,OVERLOADED_PROC_STAT, subroutine_name, argptr, ll_ptr,LLNULL);
-	       return (stmt);
-	  }
-	  current = current->entry.Template.declared_name;
-     }
-     return (BFNULL);
-}
-
-
-PTR_BFND			/* process_call added for FORTRAN M */
-process_call(process_name, argptr, p_mapping, type)
-PTR_SYMB process_name;
-PTR_LLND argptr;
-PTR_LLND p_mapping;
-int type;
-{
-     PTR_BFND stmt = NULL;
-     /*PTR_LLND ll_ptr;*/
-     /*PTR_SYMB current;*/
-     void reset_args();
-     
-     if (process_name->variant != INTERFACE_NAME) 
-     {
-	  switch (type) {
-	    case PLAIN:
-	      stmt = get_bfnd(fi, PROS_STAT, process_name, argptr,
-							 p_mapping, LLNULL);
-              break;
-            case LCTN:
-	      stmt = get_bfnd(fi, PROS_STAT_LCTN, process_name, argptr,
-							 p_mapping, LLNULL);
-	      break;
-            case SUBM:
-	      stmt = get_bfnd(fi, PROS_STAT_SUBM, process_name, argptr,
-							 p_mapping, LLNULL);
-	      break;
-	    default:
-              errstr("Invalid type of process call %d", type,325);
-	  }
-	  return (stmt);
-     }
-     
-     return (BFNULL);
-}
-
diff --git a/projects/dvm_svn/fdvm/trunk/parser/unparse_hpf.c b/projects/dvm_svn/fdvm/trunk/parser/unparse_hpf.c
deleted file mode 100644
index a06c60a..0000000
--- a/projects/dvm_svn/fdvm/trunk/parser/unparse_hpf.c
+++ /dev/null
@@ -1,4895 +0,0 @@
- /**************************************************************************
-  *                                                                        *
-  *   Unparser for toolbox                                                 *
-  *                                                                        *
-  *************************************************************************/
-
-#include <stdio.h>
-
-#include "compatible.h"   /* Make different system compatible... (PHB) */
-#ifdef SYS5
-#include <string.h>
-#else
-#include <strings.h>
-#endif
-#include <stdlib.h>
-
-#include "dvm_tag.h"
-#include "fdvm.h"
-#include "macro.h"
-#include "ext_lib.h"
-#include "ext_low.h"
-static int TabNumber =0;
-static int Number_Of_Flag = 0;
-#define TASK_PROC_GENERATE 0
-#define MAXFLAG 64
-#define  MAXLFLAG 256
-#define MAXLEVEL 256
-#define IS_DISTRIBUTE_ARRAY(A) ((SYMB_ATTR((A)) & DISTRIBUTE_BIT) || (SYMB_ATTR((A)) & ALIGN_BIT) || (SYMB_ATTR((A)) & INHERIT_BIT))
-char *copys(char *);
-
-PTR_SYMB SymbolID[MAXFLAG];
-int Number_Of_Symbol = 0;
-int On_count = 0;
-int TaskRegionUnparse = 0;
-int HPF_VERSION=0;
-int errnumber=0;
-int NumberOfIndependent=0;
-static char TabOfFlag[MAXFLAG][MAXLFLAG];
-static int  FlagLenght[MAXFLAG];
-static int  FlagLevel[MAXFLAG];
-static int  FlagOn[MAXLEVEL][MAXFLAG];
-#define MAXLENGHTBUF 750000
-static int Buf_pointer = 0;
-static char UnpBuf[MAXLENGHTBUF];
-static char *Buf_address;
-#ifdef __SPF_BUILT_IN_PARSER
-static int CommentOut = 0;
-#else
-int CommentOut = 0;
-#endif
-int Pointer = 0;
-char *hpfname;
-#define C_Initialized 1
-#define Fortran_Initialized 2
-static int Parser_Initiated = 0;
-
-#ifdef __SPF
-extern void removeFromCollection(void *pointer);
-#endif
-
-#ifdef __SPF_BUILT_IN_PARSER
-
-static PTR_FILE current_file = NULL;
-#define DealWith_Rid DealWith_Rid_temp
-#define is_overloaded_type is_overloaded_type_temp
-#define Find_Type_For_Bif Find_Type_For_Bif_temp
-#define Find_Protection_For_Bif Find_Protection_For_Bif_temp
-#define Find_BaseType Find_BaseType_temp
-#define Find_BaseType2 Find_BaseType2_temp
-#define create_unp_str create_unp_str_temp
-#define alloc_str alloc_str_temp
-#define Reset_Unparser Reset_Unparser_temp
-#define BufPutChar BufPutChar_temp
-#define BufPutString BufPutString_temp
-#define BufPutInt BufPutInt_temp
-#define Get_Flag_val Get_Flag_val_temp
-#define Treat_Flag Treat_Flag_temp
-#define PushPop_Flag PushPop_Flag_temp
-#define Tool_Unparse_Symbol Tool_Unparse_Symbol_temp
-#define Get_Type_Operand Get_Type_Operand_temp
-#define Get_LL_Operand Get_LL_Operand_temp
-#define Get_Bif_Operand Get_Bif_Operand_temp
-#define GetComp GetComp_temp
-#define Eval_Type_Condition Eval_Type_Condition_temp
-#define Eval_LLND_Condition Eval_LLND_Condition_temp
-#define Eval_Bif_Condition Eval_Bif_Condition_temp
-#define SkipToEndif SkipToEndif_temp
-#define Tool_Unparse_Type Tool_Unparse_Type_temp
-#define Tool_Unparse2_LLnode Tool_Unparse2_LLnode_temp
-#define Tool_Unparse_Bif Tool_Unparse_Bif_temp
-
-#else
-PTR_FILE current_file=NULL;
-#endif
-
-PTR_LLND On_Clause=NULL;
-PTR_LLND ReductionList=NULL;
-PTR_LLND NewSpecList=NULL;
-extern void Message();
-/* FORWARD DECLARATIONS */
-int BufPutString();
-PTR_LLND FindMapDir();
-PTR_LLND ChangeRedistributeOntoTask();
-PTR_LLND FindRealignDir();
-PTR_LLND FindRedistributeDir();
-PTR_LLND FindDynamicDir();
-int UnparseEndofCircle();
-PTR_BFND FindDistrAlignCombinedDir();
-PTR_LLND FindPointerDescriptor();
-void gen_hpf_name ();
-void PointerDeclaration();
-int ArrayOfPointerDeclaration();
-void GenerateType();
-void Init_HPFUnparser();
-void ResetSymbolId();
-int NumberOfForNode();
-int FindPointerDir();
-int FindPointerDeclaration();
-int FindCommonHeapDeclaration();
-int Puttab();
-int Find_SaveSymbol();
-int CheckNullDistribution();
-char *Tool_Unparse_Bif();
-char *Tool_Unparse2_LLnode (); 
-char * Tool_Unparse_Type();
-char * Tool_Unparse_Symbol();
-PTR_BFND FindBeginingOfBlock();
-PTR_BFND FindEndOfBlock();
-int CheckAcross();
-int CheckReduction();
-int IfReduction();
-int FindRedInExpr();
-PTR_LLND AddToReductionList();
-int FindInNewList();
-int isForNodeEndStmt();
-int ForNodeStmt();
-PTR_LLND FreeReductionList();
-
-#include "f90.h"
-
-typedef struct 
-{
-  char *str;
-  char *(* fct)();
-} UNP_EXPR;
-
-
-static UNP_EXPR Unparse_Def[LAST_CODE];
-
-/************ Unparse Flags **************/
-static int In_Write_Flag = 0;
-static int Rec_Port_Decl = 0;
-static int In_Param_Flag = 0;
-static int In_Impli_Flag = 0;
-static int In_Class_Flag = 0;
-/*****************************************/
-
-/*************** TYPE names in ASCII form ****************/
-static char *ftype_name[] = {"integer",
-			       "real",
-			       "double precision",
-			       "character",
-			       "logical",
-			       "character",
-			       "gate",
-			       "event",
-			       "sequence",
-			       "",
-			       "",
-			       "",
-			       "",
-			       "complex",
-			       "",
-			       "",		
-			       "",		
-			       "",			
-			       "",	
-			       "",	
-			       "",	
-			       "",	
-			       "",	
-			       "",	
-			       "",	
-			       "",		
-			       "",	
-			       "",		
-			       "",
-			       "",
-			       "",
-			       "",
-			       "double complex"
-};static char *ctype_name[] = {"int",
-			       "float",
-			       "double",
-			       "char",
-			       "logical",
-			       "char",
-			       "gate",
-			       "event",
-			       "sequence",
-			       "error1",
-			       "error2",
-			       "error3",
-			       "error4",
-			       "complex",
-			       "void",
-			       "error6",		
-			       "error7",		
-			       "error8",			
-			       "error9",	
-			       "error10",	
-			       "error11",	
-			       "error12",	
-			       "ElementType",	
-			       "error14",	
-			       "error15",	
-			       "error16",		
-			       "error17",	
-			       "error18",		
-			       "error19",
-			       "error20",
-			       "error21",
-			       "error22",
-			       "error23"
-};
-
-static
-char *ridpointers[] = {
-	"-error1-",			/* unused */
-	"-error2-",			/* int */
-	"char", 		/* char */
-	"float",		/* float */
-	"double",		/* double */
-	"void", 		/* void */
-	"-error3-",			/* unused1 */
-	"unsigned",		/* unsigned */
-	"short",		/* short */
-	"long", 		/* long */
-	"auto", 		/* auto */
-	"static",		/* static */
-	"extern",		/* extern */
-	"register",		/* register */
-	"typedef",		/* typedef */
-	"signed",		/* signed */
-	"const",		/* const */
-	"volatile",		/* volatile */
-	"private",		/* private */
-	"future",		/* future */
-	"virtual",		/* virtual */
-	"inline",		/* inline */
-	"friend",		/* friend */
-	"-error4-",			/* public */
-	"-error5-",			/* protected */
-        "Sync",                 /* CC++ sync */
-        "global",               /* CC++ global */
-        "atomic",                /* CC++ atomic */
-        "__private",             /* for KSR */
-        "restrict"
-};
-
-/*********************************************************/
-
-/******* Precedence table of operators for Fortran *******/
-static char precedence[] = {5,      /* .eq. */
-                            5,      /* .lt. */
-                            5,      /* .gt. */
-                            5,      /* .ne. */
-                            5,      /* .le. */
-                            5,      /* .ge. */
-                            3,      /*  +   */
-                            3,      /*  -   */
-                            8,      /* .or. */
-                            2,      /*  *   */
-                            2,      /*  /   */
-                            0,      /* none */
-                            7,      /* .and. */
-                            1,      /*  **  */
-                            0,      /* none */
-                            4,      /*  //  */
-                            8,      /* .xor. */
-                            9,      /* .eqv. */
-                            9,     /* .neqv. */
-                            1,     /* Minus_op*/
-                            1      /* not op */
-                            };
-
-#define type_index(X)   (X-T_INT)                 /* gives the index of a type to access the Table "ftype_name" from a type code */
-#define binop(n)    (n >= EQ_OP && n <= NEQV_OP)  /* gives the boolean value of the operation "n" being binary (not unary) */
-/* In order to change ON-block procedure call */
-typedef struct func_call *PTR_FCALL;
-
-struct func_call 
-    {
-     PTR_LLND   func_ref;
-     PTR_BFND   first;
-     PTR_BFND	last;
-     PTR_FCALL  next;
-    };
-    
-PTR_LLND parameter_list=NULL;
-PTR_SYMB function_name=NULL;
-int ON_BLOCK=0;
-int ON_BEGIN=0;
-PTR_FCALL TaskRegion=NULL;
-extern char *chkalloc();
-#define ALLOC(x)  (struct x *) chkalloc(sizeof(struct x))
-#define FUNC_REF(NODE) ((NODE)->func_ref)
-#define FUNC_FIRST(NODE) ((NODE)->first)
-#define FUNC_LAST(NODE) ((NODE)->last)
-#define FUNC_NEXT(NODE) ((NODE)->next)
-
-void UnparseTaskRegion(PTR_FCALL TaskRegion)
-{
-PTR_BFND bif;
-PTR_FCALL temp=NULL;
-TaskRegionUnparse=1;
-for(;TaskRegion;temp=TaskRegion,TaskRegion=FUNC_NEXT(TaskRegion))
-    {
-    PTR_LLND llnd;
-    if (temp)
-	{
-	FUNC_NEXT(temp)=NULL;
-	FUNC_FIRST(temp)=NULL;
-	FUNC_LAST(temp)=NULL;
-#ifdef __SPF
-    removeFromCollection(FUNC_REF(temp));
-    removeFromCollection(temp);
-#endif
-	free(FUNC_REF(temp));
-	free(temp);
-	}
-    BufPutString("\n",0);
-    Puttab();
-    BufPutString("subroutine ",0);
-    Tool_Unparse2_LLnode(FUNC_REF(TaskRegion));
-    BufPutString("\n",0);
-    llnd=NODE_OPERAND0(FUNC_REF(TaskRegion));
-    for(;llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-	{
-	if (NODE_CODE(NODE_OPERAND0(llnd))==ARRAY_REF)
-	    {
-	    if (NODE_SYMB(NODE_OPERAND0(llnd)))
-		{
-		PTR_SYMB sym=NODE_SYMB(NODE_OPERAND0(llnd));
-		if ((SYMB_ATTR(sym)&DISTRIBUTE_BIT)||
-		   (SYMB_ATTR(sym)&ALIGN_BIT))
-		    {
-		    Puttab();
-		    BufPutString("DIMENSION ",0);
-		    Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-		    BufPutString("(",0);
-		    Tool_Unparse2_LLnode(TYPE_DECL_RANGES(SYMB_TYPE(sym)));
-		    BufPutString(")",0);
-		    BufPutString("\n",0);
-		    BufPutString("!HPF$",0);
-		    Puttab();
-		    Buf_pointer-=5;
-		    BufPutString("INHERIT ",0);
-		    Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-		    BufPutString("\n",0);
-		    }
-		else
-		    {
-		    Puttab();
-		    BufPutString("DIMENSION ",0);
-		    Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-		    BufPutString("(",0);
-		    Tool_Unparse2_LLnode(TYPE_DECL_RANGES(SYMB_TYPE(sym)));
-		    BufPutString(")",0);
-		    BufPutString("\n",0);
-		    }     
-		}
-	    }
-	else 
-	    {		    
-	    PTR_SYMB sym=NODE_SYMB(NODE_OPERAND0(llnd));
-	    if ((NODE_CODE(NODE_OPERAND0(llnd))==CONST_REF)||
-		(NODE_CODE(NODE_OPERAND0(llnd))==VAR_REF))
-		{
-		Puttab();
-		Tool_Unparse_Type(SYMB_TYPE(sym));
-		BufPutString(" ",0);
-		Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-		BufPutString("\n",0);
-		}
-	    }
-	}
-    for(bif=BIF_NEXT(FUNC_FIRST(TaskRegion));bif&&(bif!=FUNC_LAST(TaskRegion));bif=BIF_NEXT(bif))
-	Tool_Unparse_Bif(bif);
-    Puttab();
-    BufPutString("end \n\n",0);
-    }
-if (temp)
-    {
-    FUNC_NEXT(temp)=NULL;
-    FUNC_FIRST(temp)=NULL;
-    FUNC_LAST(temp)=NULL;
-#ifdef __SPF
-    removeFromCollection(FUNC_REF(temp));
-    removeFromCollection(temp);
-#endif
-    free(FUNC_REF(temp));
-    free(temp);
-    }
-    
-TaskRegionUnparse=0;
-}    
-    
-
-PTR_FCALL 
-FindLast ( ptr )
-PTR_FCALL ptr;
-{
-PTR_FCALL ptr_func=ptr;
-if (!ptr) return NULL;
-while(ptr_func)
-	{
-	  if (FUNC_NEXT(ptr_func) == NULL)
-	    return ptr_func;
-	  ptr_func = FUNC_NEXT(ptr_func);	  
-	}
-return NULL;
-}
-
-PTR_LLND
-make_llnode (node_type, ll1, ll2, symb_ptr)
-	int	 node_type;
-	PTR_LLND ll1, ll2;
-	PTR_SYMB symb_ptr;
-{
-	PTR_LLND new_llnd;
-
-	new_llnd = ALLOC (llnd);
-	new_llnd->variant = node_type;
-	new_llnd->type = TYNULL;
-	new_llnd->entry.Template.ll_ptr1 = ll1;
-	new_llnd->entry.Template.ll_ptr2 = ll2;
-	switch (node_type) {
-	  case INT_VAL:
-            /*new_llnd->entry.ival = (int) symb_ptr;*/
-            break;
-	  case BOOL_VAL:
-            /*new_llnd->entry.bval = (int) symb_ptr;*/
-            break;
-	  default:
-            new_llnd->entry.Template.symbol = symb_ptr;
-            break;
-	  }
-	return (new_llnd);
-}
-
-PTR_SYMB
-make_funcsymb (string)
-	char	*string;
-{
-	PTR_SYMB new_symb;
-	new_symb = ALLOC (symb);
-	new_symb->variant = ARRAY_REF;
-	new_symb->ident = copys (string);
-	return (new_symb);
-}
-
-void ResetSymbolDovar()
-{
-PTR_SYMB symb;
-for (symb = current_file->head_symb; symb ; symb = SYMB_NEXT (symb))
-    if (SYMB_DOVAR (symb)) SYMB_DOVAR (symb) &=~2 ;
-}
-
-
-
-/* In order to change ON-block procedure call end*/
-
-/* manage the unparse buffer */
-
-void DealWith_Rid(typei, flg)
-     PTR_TYPE typei;
-     int flg;  /* if 1 then do virtual */
-{ int j;
-  
-  int index;
-   PTR_TYPE type;
-  if (!typei)
-    return;
-  
-  for (type = typei; type; )
-    {
-      switch(TYPE_CODE(type))
-	{
-	case T_POINTER : 
-	case T_REFERENCE :
-	case T_FUNCTION :
-	case T_ARRAY	:
-	  type = TYPE_BASE(type);
-	  break;
-        case T_MEMBER_POINTER:
-          type = TYPE_COLL_BASE(type);
-	case T_DESCRIPT :
-	  index = TYPE_LONG_SHORT(type);
-           /* printf("index = %d\n", index); */
-          if( index & BIT_RESTRICT) {
-		BufPutString(ridpointers[(int)RID_RESTRICT],0);
-		BufPutString(" ", 0);
-		}
-          if( index & BIT_KSRPRIVATE) {
-		BufPutString(ridpointers[(int)RID_KSRPRIVATE],0);
-		BufPutString(" ", 0);
-		}
-          if( index & BIT_EXTERN) {
-		BufPutString(ridpointers[(int)RID_EXTERN],0);
-		BufPutString(" ", 0);
-		}
-          if( index & BIT_TYPEDEF) {
-		BufPutString(ridpointers[(int)RID_TYPEDEF],0);
-		BufPutString(" ", 0);
-		}
-	  for (j=1; j< MAX_BIT; j= j*2)
-	    {
-	      switch (index & j)
-		{
-		case (int) BIT_PRIVATE:   BufPutString(ridpointers[(int)RID_PRIVATE],0);
-		  break;
-		case (int) BIT_FUTURE:	BufPutString(ridpointers[(int)RID_FUTURE],0);
-		  break;
-		case (int) BIT_VIRTUAL:  if(flg) BufPutString(ridpointers[(int)RID_VIRTUAL],0);
-		  break;
-		case (int) BIT_ATOMIC:  if(flg) BufPutString(ridpointers[(int)RID_ATOMIC],0);
-		  break;
-		case (int) BIT_INLINE:	BufPutString(ridpointers[(int)RID_INLINE],0);
-		  break;
-		case (int) BIT_UNSIGNED:  BufPutString(ridpointers[(int)RID_UNSIGNED],0);
-		  break;
-		case (int) BIT_SIGNED :   BufPutString(ridpointers[(int)RID_SIGNED],0);
-		  break;
-		case (int) BIT_SHORT :	BufPutString(ridpointers[(int)RID_SHORT],0);
-		  break;
-		case (int) BIT_LONG :	BufPutString(ridpointers[(int)RID_LONG],0);
-		  break;
-		case (int) BIT_VOLATILE:  BufPutString(ridpointers[(int)RID_VOLATILE],0);
-		  break;
-		case (int) BIT_CONST   :  BufPutString(ridpointers[(int)RID_CONST],0); 
-		  break;
-		case (int) BIT_GLOBL   :  BufPutString(ridpointers[(int)RID_GLOBL],0);
-		  break; 
-		case (int) BIT_SYNC   :  BufPutString(ridpointers[(int)RID_SYNC],0); 
-		  break;
-		case (int) BIT_TYPEDEF :  /* BufPutString(ridpointers[(int)RID_TYPEDEF],0); */
-		  break;
-		case (int) BIT_EXTERN  :  /* BufPutString(ridpointers[(int)RID_EXTERN],0); */
-		  break;
-		case (int) BIT_AUTO :	BufPutString(ridpointers[(int)RID_AUTO],0);
-		  break;
-		case (int) BIT_STATIC :   BufPutString(ridpointers[(int)RID_STATIC],0);
-		  break;
-		case (int) BIT_REGISTER:  BufPutString(ridpointers[(int)RID_REGISTER],0);
-		  break;
-		case (int) BIT_FRIEND:	BufPutString(ridpointers[(int)RID_FRIEND],0);
-
-		}
-	      if ((index & j) != 0)
-		BufPutString(" ",0);
-	    }
-	  type = TYPE_DESCRIP_BASE_TYPE(type);
-	  break;
-	  default:
-	  type = NULL;
-	}
-    }
-}
-
-int is_overloaded_type(bif)
-   PTR_BFND bif;
-{
-   PTR_LLND ll;
-   if(!bif) return 0;
-   ll = BIF_LL1(bif);
-   while(ll && (NODE_SYMB(ll) == NULL)) ll = NODE_OPERAND0(ll);
-   if(ll == NULL) return 0;
-   if(SYMB_ATTR(NODE_SYMB(ll)) & OVOPERATOR) return 1;
-   else return 0;
-}
-
-PTR_TYPE Find_Type_For_Bif(bif)
-     PTR_BFND bif;
-{
-  PTR_TYPE type = NULL;
-  if (BIF_LL1(bif) && (NODE_CODE(BIF_LL1(bif)) == EXPR_LIST))
-    { PTR_LLND tp;
-      tp = BIF_LL1(bif);
-      for (tp = NODE_OPERAND0(tp); tp && (type == NULL); )
-	{
-	  switch (NODE_CODE(tp)) {
-	  case BIT_NUMBER:
-	  case ASSGN_OP :
-	  case ARRAY_OP:
-	  case FUNCTION_OP :
-	  case CLASSINIT_OP:
-	  case ADDRESS_OP:
-	  case DEREF_OP :
-	    tp = NODE_OPERAND0(tp);
-	    break ;
-          case SCOPE_OP:
-            tp = NODE_OPERAND1(tp);
-            break;
-	  case FUNCTION_REF:
-	  case ARRAY_REF:
-	  case VAR_REF:
-	    if (tp)
-	    { if(!NODE_SYMB(tp)){
-		 printf("syntax error at line %d\n", bif->g_line);
-		 exit(1);
-		}
-	      else
-	         type = SYMB_TYPE(NODE_SYMB(tp));
-	    }     
-	    tp = NULL;
-	    break ;
-	  default:
-             type = NODE_TYPE(tp);
-	    break;
-	  }
-	}
-    }
-  return type;
-}
-
-int Find_Protection_For_Bif(bif)
-     PTR_BFND bif;
-{
-  int protect = 0;
-  if (BIF_LL1(bif) && (BIF_CODE(BIF_LL1(bif)) == EXPR_LIST))
-    { PTR_LLND tp;
-      tp = BIF_LL1(bif);
-      for (tp = NODE_OPERAND0(tp); tp && (protect == 0); ) /*(protect == NULL)*/
-	{
-	  switch (NODE_CODE(tp)) {
-	  case BIT_NUMBER:
-	  case ASSGN_OP :
-	  case ARRAY_OP:
-	  case FUNCTION_OP :
-	  case CLASSINIT_OP:
-	  case ADDRESS_OP:
-	  case DEREF_OP :
-	    tp = NODE_OPERAND0(tp);
-	    break ;
-          case SCOPE_OP:
-	    tp = NODE_OPERAND1(tp);
-	    break;
-	  case FUNCTION_REF:
-	  case ARRAY_REF:
-	  case VAR_REF:
-	    if (tp)
-	      protect = SYMB_ATTR(NODE_SYMB(tp));
-	    tp = NULL;
-	    break ;
-	  }
-	}
-    }
-  return protect;
-}
-
-PTR_TYPE Find_BaseType(ptype)
-     PTR_TYPE ptype;
-{
-  PTR_TYPE pt;
-
-  if (!ptype)
-    return NULL;
-  pt = TYPE_BASE (ptype); 
-  if (pt)
-    { int j;
-      j = 0;
-      while ((j < 100) && pt)
-	{
-	  if (TYPE_CODE(pt) == DEFAULT) break;
-	  if (TYPE_CODE(pt) == T_INT) break;
-	  if (TYPE_CODE(pt) == T_FLOAT) break;
-	  if (TYPE_CODE(pt) == T_DOUBLE) break;
-	  if (TYPE_CODE(pt) == T_CHAR) break;
-	  if (TYPE_CODE(pt) == T_BOOL) break;
-	  if (TYPE_CODE(pt) == T_STRING) break;
-	  if (TYPE_CODE(pt) == T_COMPLEX) break;
-	  if (TYPE_CODE(pt) == T_DCOMPLEX) break;
-	  if (TYPE_CODE(pt) == T_VOID) break;
-	  if (TYPE_CODE(pt) == T_UNKNOWN) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_TYPE) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_COLLECTION) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_TEMPLATE) break;
-          if (TYPE_CODE(pt) == T_DERIVED_CLASS) break;
-	  if (TYPE_CODE(pt) == T_CLASS) break;
-	  if (TYPE_CODE(pt) == T_COLLECTION) break;
-	  if (TYPE_CODE(pt) == T_DESCRIPT) break;  /* by dbg */
-			  
-	  pt = TYPE_BASE (pt);
-	  j++;
-	}
-      if (j == 100)
-	{
-	  Message("Looping in getting the Basetype; sorry",0);
-	  exit(1);
-	}
-    }
-  return pt;
-}
-
-PTR_TYPE Find_BaseType2(ptype)         /* breaks out of the loop for pointers and references   BW */
-     PTR_TYPE ptype;
-{
-  PTR_TYPE pt;
-
-  if (!ptype)
-    return NULL;
-  pt = TYPE_BASE (ptype); 
-  if (pt)
-    { int j;
-      j = 0;
-      while ((j < 100) && pt)
-	{
-	  if (TYPE_CODE(pt) == T_REFERENCE) break;
-	  if (TYPE_CODE(pt) == T_POINTER) break;
-	  if (TYPE_CODE(pt) == DEFAULT) break;
-	  if (TYPE_CODE(pt) == T_INT) break;
-	  if (TYPE_CODE(pt) == T_FLOAT) break;
-	  if (TYPE_CODE(pt) == T_DOUBLE) break;
-	  if (TYPE_CODE(pt) == T_CHAR) break;
-	  if (TYPE_CODE(pt) == T_BOOL) break;
-	  if (TYPE_CODE(pt) == T_STRING) break;
-	  if (TYPE_CODE(pt) == T_COMPLEX) break;
-	  if (TYPE_CODE(pt) == T_DCOMPLEX) break;
-	  if (TYPE_CODE(pt) == T_VOID) break;
-	  if (TYPE_CODE(pt) == T_UNKNOWN) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_TYPE) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_COLLECTION) break;
-	  if (TYPE_CODE(pt) == T_DERIVED_CLASS) break;
-	  if (TYPE_CODE(pt) == T_CLASS) break;
-	  if (TYPE_CODE(pt) == T_COLLECTION) break;
-	  if (TYPE_CODE(pt) == T_DESCRIPT) break;  /* by dbg */
-			  
-	  pt = TYPE_BASE (pt);
-	  j++;
-	}
-      if (j == 100)
-	{
-	  Message("Looping in getting the Basetype; sorry",0);
-	  exit(1);
-	}
-    }
-  return pt;
-}
-
-char *create_unp_str(str)
-     char *str;
-{
-  char *pt;
-
-  if (!str)
-    return NULL;
-    
-  pt = (char *) xmalloc((int)(strlen(str)+1));
-  memset(pt, 0, strlen(str)+1);
-  strcpy(pt,str);
-  return pt;
-}     
-
-char *alloc_str(size)
-     int size;
-{
-  char *pt;
-
-  if (!(size++)) return NULL;
-  pt = (char *) xmalloc(size);
-  memset(pt, 0, size);
-  return pt;
-}     
-
-int Reset_Unparser()
-{
-  int i,j;
-
-  /* initialize the number of flag */
-  Number_Of_Flag = 0;
-  for (i=0; i < MAXFLAG ; i++)
-    {
-      TabOfFlag[i][0] = '\0';
-      FlagLenght[i] = 0;
-      for(j=0; j<MAXLEVEL; j++)
-        FlagOn[j][i] = 0;
-      FlagLevel[i] = 0;
-    }
-  /* setbuffer to 0 */
-  Buf_pointer = 0;  
-  Buf_address = &(UnpBuf[0]); /* may be reallocated */
-  memset(UnpBuf, 0, MAXLENGHTBUF);
-  return 0;
-}
-
-
-
-/* function to manage the unparse buffer */
-int BufPutChar(c)
-     char c;
-{
-  if (Buf_pointer >= MAXLENGHTBUF)
-    {
-      Message("Unparse Buffer Full",0);
-      return 0;
-    }
-  Buf_address[Buf_pointer] = c;
-  Buf_pointer++;
-  return 1;
-}
-
-int BufPutString(s, len)
-     char *s;
-     int len;
-{
-  int length;
-  if (!s)
-    {
-      Message("Null String in BufPutString",0);
-      return 0;
-    }
-  length = len;
-  if (length <= 0)
-    length  = strlen(s);
-  
-  if (Buf_pointer + length>= MAXLENGHTBUF)
-    {
-      Message("Unparse Buffer Full",0);
-      return 0;
-    }
-  strncpy(&(Buf_address[Buf_pointer]),s,length);
-  Buf_pointer += length;
-  return 1;
-}
-
-int BufPutInt(i)
-     int i;
-{
-  int length;
-  char s[MAXLFLAG];
-  
-  sprintf(s,"%d",i);
-  length = strlen(s);
-  
-  if (Buf_pointer + length>= MAXLENGHTBUF)
-    {
-      Message("Unparse Buffer Full",0);
-      return 0;
-    }
-  strncpy(&(Buf_address[Buf_pointer]),s,length);
-  Buf_pointer += length;
-  return 1;
-}
-
-int Get_Flag_val(str, i)
-     char  *str;
-     int *i;
-{
-  int j, con;
-  char sflag[MAXLFLAG];
-  (*i)++; /* skip the paranthesis */  
-  /* extract the flag name */
-  j = *i;
-  con = 0;
-  
-  while ((str[j]  != '\0') && (str[j]  != ')'))
-    {
-      sflag[con] = str[j];      
-      con ++;      
-      j ++;
-    }
-  sflag[con] = '\0';
-  con ++; 
-  
-  /* look in table if flag is in */
-  
-  for (j = 0 ;  j < Number_Of_Flag; j++)
-    {
-      if (strncmp(TabOfFlag[j],sflag, con) == 0)
-          break;
-    }
-  *i += con;      
-  if (j >= Number_Of_Flag)
-    {
-      /* not found  */
-      return 0;
-    }
-  else          
-    return FlagOn[FlagLevel[j]][j];
-
-}
-
-void Treat_Flag(str, i, val)
-     char  *str;
-     int *i;
-     int val;     
-{
-  int j, con;
-  char sflag[MAXLFLAG];
-  (*i)++; /* skip the paranthesis */  
-  /* extract the flag name */
-  j = *i;
-  con = 0;
-  
-  while ((str[j]  != '\0') && (str[j]  != ')'))
-    {
-      sflag[con] = str[j];      
-      con ++;      
-      j ++;
-    }
-  sflag[con] = '\0';
-  con ++; 
-  
-  /* look in table if flag is in */
-  
-  for (j = 0 ;  j < Number_Of_Flag; j++)
-    {
-      if (strncmp(TabOfFlag[j],sflag, con) == 0)
-          break;
-    }
-      if (j >= Number_Of_Flag)
-        {
-          /* not found  */
-          strcpy(TabOfFlag[Number_Of_Flag],sflag);
-          FlagOn[0][Number_Of_Flag] = val;
-          FlagLenght[Number_Of_Flag] = con-1;
-          Number_Of_Flag++;          
-        } else
-          FlagOn[FlagLevel[j]][j] += val;
-      *i += con;      
-}
-
-void PushPop_Flag(str, i, val)
-     char  *str;
-     int *i;
-     int val;     
-{
-  int j, con;
-  char sflag[MAXLFLAG];
-  (*i)++; /* skip the paranthesis */  
-  /* extract the flag name */
-  j = *i;
-  con = 0;
-  
-  while ((str[j]  != '\0') && (str[j]  != ')'))
-    {
-      sflag[con] = str[j];      
-      con ++;      
-      j ++;
-    }
-  sflag[con] = '\0';
-  con ++; 
-  
-  /* look in table if flag is in */
-  
-  for (j = 0 ;  j < Number_Of_Flag; j++)
-    {
-      if (strncmp(TabOfFlag[j],sflag, con) == 0)
-          break;
-    }
-      if (j < Number_Of_Flag)
-        {
-          /* if a pop, clear old value befor poping */
-          if(val< 0) FlagOn[FlagLevel[j]][j] = 0; /* added by dbg to make sure initialized */
-          FlagLevel[j]  += val;
-          if (FlagLevel[j] < 0)
-            FlagLevel[j] = 0;
-          if (FlagLevel[j] >= MAXLEVEL)
-            {
-              Message("Stack of flag overflow; abort()",0);
-              abort();
-            }
-        }
-      /* else printf("WARNING(unparser): unknow flag pushed or popped:%s\n",sflag); */
-      *i += con;      
-}
-
-char * Tool_Unparse_Type();
-
-char *Tool_Unparse_Symbol (symb)
-     PTR_SYMB symb;
-{
-  PTR_TYPE ov_type;
-  if (!symb)
-    return NULL;
-  if (SYMB_IDENT(symb))
-    {
-       if((SYMB_ATTR(symb) & OVOPERATOR)){
-	  ov_type = SYMB_TYPE(symb);
-	  if(TYPE_CODE(ov_type) == T_DESCRIPT){
-	      if(TYPE_LONG_SHORT(ov_type) == BIT_VIRTUAL && In_Class_Flag){
-               BufPutString ("virtual ",0);
-	       if(TYPE_LONG_SHORT(ov_type) == BIT_ATOMIC) BufPutString ("atomic ",0);
-	       ov_type = TYPE_DESCRIP_BASE_TYPE(ov_type);
-	       }
-	      if(TYPE_LONG_SHORT(ov_type) == BIT_INLINE){
-               BufPutString ("inline ",0);
-	       ov_type = TYPE_DESCRIP_BASE_TYPE(ov_type);
-	       }
-          }
-       } else ov_type = NULL;
-              
-      if ((SYMB_ATTR(symb) & OVOPERATOR) ||
-	  (strcmp(SYMB_IDENT(symb),"()")==0) ||
-          (strcmp(SYMB_IDENT(symb),"*")==0) ||
-          (strcmp(SYMB_IDENT(symb),"+")==0) ||
-          (strcmp(SYMB_IDENT(symb),"-")==0) ||
-          (strcmp(SYMB_IDENT(symb),"/")==0) ||
-          (strcmp(SYMB_IDENT(symb),"=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"%")==0) ||
-          (strcmp(SYMB_IDENT(symb),"&")==0) ||
-          (strcmp(SYMB_IDENT(symb),"|")==0) ||
-          (strcmp(SYMB_IDENT(symb),"!")==0) ||
-          (strcmp(SYMB_IDENT(symb),"~")==0) ||
-          (strcmp(SYMB_IDENT(symb),"^")==0) ||
-          (strcmp(SYMB_IDENT(symb),"+=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"-=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"*=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"/=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"%=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"^=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"&=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"|=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"<<")==0) ||
-          (strcmp(SYMB_IDENT(symb),">>")==0) ||
-          (strcmp(SYMB_IDENT(symb),"<<=")==0) ||
-          (strcmp(SYMB_IDENT(symb),">>=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"==")==0) ||
-          (strcmp(SYMB_IDENT(symb),"!=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"<=")==0) ||
-          (strcmp(SYMB_IDENT(symb),">=")==0) ||
-          (strcmp(SYMB_IDENT(symb),"<")==0) ||
-          (strcmp(SYMB_IDENT(symb),">")==0) ||
-          (strcmp(SYMB_IDENT(symb),"&&")==0) ||
-          (strcmp(SYMB_IDENT(symb),"||")==0) ||
-          (strcmp(SYMB_IDENT(symb),"++")==0) ||
-          (strcmp(SYMB_IDENT(symb),"--")==0) ||
-          (strcmp(SYMB_IDENT(symb),"->")==0) ||
-          (strcmp(SYMB_IDENT(symb),"->*")==0) ||
-          (strcmp(SYMB_IDENT(symb),",")==0) ||
-          (strcmp(SYMB_IDENT(symb),"new")==0) ||
-          (strcmp(SYMB_IDENT(symb),"delete")==0) ||
-          (strcmp(SYMB_IDENT(symb),"[]")==0) )
-        BufPutString ("operator ",0);
-    }
-  /*
-  if(ov_type) Tool_Unparse_Type(ov_type, 0);
-  else */
-  BufPutString (SYMB_IDENT(symb),0);
-  return Buf_address;
-}
-
-
-typedef struct
-{
-  int typ;
-  union {char *S;
-         long  I;
-        } val;
-} operand;
-
-/* macro def. of operand type */
-#define UNDEF_TYP   0
-#define STRING_TYP  1
-#define INTEGER_TYP 2
-
-/* macro def. of comparison operators */
-#define COMP_UNDEF -1 /* Bodin */
-#define COMP_EQUAL 0
-#define COMP_DIFF  1
-
-
-void Get_Type_Operand (str, iptr, ptype,Op)
-     char *str;
-     int *iptr;
-     PTR_TYPE ptype;
-     operand *Op;
-{
-
-  Op->typ = UNDEF_TYP;
-  if (strncmp(&(str[*iptr]),"%CHECKFLAG", strlen("%CHECKFLAG"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%CHECKFLAG");
-      Op->val.I = Get_Flag_val(str, iptr);
-    } else
-  if (strncmp(&(str[*iptr]),"%STRCST", strlen("%STRCST"))== 0)               /* %STRCST : String Constant */
-    {
-      int i_save;
-
-      *iptr += strlen("%STRCST");
-      while (str[*iptr] == ' ') {(*iptr)++;} /* skip spaces before string */
-      if (str[*iptr] != '\'')
-        {
-          Message (" *** Missing \"'\" after %STRCST *** ",0);
-        }
-      i_save = ++(*iptr);
-      while ((str[*iptr] != '\0') && (str[*iptr] != '\'')) (*iptr)++;
-      Op->val.S = alloc_str ((*iptr) - i_save);
-      strncpy (Op->val.S, &(str[i_save]), (*iptr) - i_save);
-      Op->typ = STRING_TYP;
-    } else
-  if (strncmp(&(str[*iptr]),"%NULL", strlen("%NULL"))== 0)                   /* %NULL : Integer Constant (or false boolean) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = 0;
-      *iptr += strlen("%NULL");
-    } else
-  if (strncmp(&(str[*iptr]),"%INIMPLI", strlen("%INIMPLI"))== 0)             /* %INIMPLI : In_Impli_Statement (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = In_Impli_Flag;
-      *iptr += strlen("%INIMPLI");
-    } else
-      {
-        Message (" *** Unknown operand in %IF (condition) for Type Node *** ",0);
-      }
-}
-
-void Get_LL_Operand (str, iptr, ll, Op)
-     char *str;
-     int *iptr;
-     PTR_LLND ll;
-     operand *Op;
-{
-
-  Op->typ = UNDEF_TYP;
-  if (strncmp(&(str[*iptr]),"%CHECKFLAG", strlen("%CHECKFLAG"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%CHECKFLAG");
-      Op->val.I = Get_Flag_val(str, iptr);
-    } else
-  if (strncmp(&(str[*iptr]),"%STRCST", strlen("%STRCST"))== 0)               /* %STRCST : String Constant */
-    {
-      int i_save;
-
-      *iptr += strlen("%STRCST");
-      while (str[*iptr] == ' ') {(*iptr)++;} /* skip spaces before string */
-      if (str[*iptr] != '\'')
-        {
-          Message  (" *** Missing \"'\" after %STRCST *** ",0);
-        }
-      i_save = ++(*iptr);
-      while ((str[*iptr] != '\0') && (str[*iptr] != '\'')) (*iptr)++;
-      Op->val.S = alloc_str ((*iptr) - i_save);
-      strncpy (Op->val.S, &(str[i_save]), (*iptr) - i_save);
-      Op->typ = STRING_TYP;
-    } else
-  if (strncmp(&(str[*iptr]),"%SYMBOL", strlen("%SYMBOL"))== 0)               /* %SYMBOL : Symbol pointer (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) NODE_SYMB (ll);
-      *iptr += strlen("%SYMBOL");
-    } else
-  if (strncmp(&(str[*iptr]),"%SYMBID", strlen("%SYMBID"))== 0)               /* %SYMBID : Symbol identifier (string) */
-    {
-      Op->typ = STRING_TYP;
-      if (NODE_SYMB (ll))
-        Op->val.S = SYMB_IDENT (NODE_SYMB (ll));
-      else
-        Op->val.S = NULL;
-      *iptr += strlen("%SYMBID");
-    } else
-  if (strncmp(&(str[*iptr]),"%NULL", strlen("%NULL"))== 0)                   /* %NULL : Integer Constant (or false boolean) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = 0;
-      *iptr += strlen("%NULL");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL1", strlen("%LL1"))== 0)                     /* %LL1 : Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;      
-      Op->val.I = (long) NODE_TEMPLATE_LL1 (ll);
-      *iptr += strlen("%LL1");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL2", strlen("%LL2"))== 0)                     /* %LL2 : Low Level Node 2 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) NODE_TEMPLATE_LL2 (ll);
-      *iptr += strlen("%LL2");
-    } else
-  if (strncmp(&(str[*iptr]),"%LABUSE", strlen("%LABUSE"))== 0)               /* %LABUSE : label ptr (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) NODE_LABEL (ll);
-      *iptr += strlen("%LABUSE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L1CODE", strlen("%L1CODE"))== 0)               /* %L1CODE : Code (variant) of Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (NODE_TEMPLATE_LL1 (ll))
-        Op->val.I = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-      else
-        Op->val.I = (long) NULL;
-      *iptr += strlen("%L1CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L2CODE", strlen("%L2CODE"))== 0)               /* %L2CODE : Code (variant) of Low Level Node 2 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (NODE_TEMPLATE_LL2 (ll))
-        Op->val.I = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-      else
-        Op->val.I = (long) NULL;
-      *iptr += strlen("%L2CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%INWRITE", strlen("%INWRITE"))== 0)             /* %INWRITE : In_Write_Statement (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = In_Write_Flag;
-      *iptr += strlen("%INWRITE");
-    } else
-  if (strncmp(&(str[*iptr]),"%RECPORT", strlen("%RECPORT"))== 0)            /* %RECPORT : reccursive_port_decl (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = Rec_Port_Decl;
-      *iptr += strlen("%RECPORT");
-    } else
-  if (strncmp(&(str[*iptr]),"%INPARAM", strlen("%INPARAM"))== 0)             /* %INPARAM : In_Param_Statement (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = In_Param_Flag;
-      *iptr += strlen("%INPARAM");
-    } else
-  if (strncmp(&(str[*iptr]),"%INIMPLI", strlen("%INIMPLI"))== 0)             /* %INIMPLI : In_Impli_Statement (integer / boolean flag) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = In_Impli_Flag;
-      *iptr += strlen("%INIMPLI");
-    } else
-      if (strncmp(&(str[*iptr]),"%L1L2*L1CODE", strlen("%L1L2*L1CODE"))== 0)       /* %L1L2L1CODE : Code (variant) of Low Level Node 1 of Low Level Node 2 of Low Level Node 1 (integer) */
-    {
-      PTR_LLND temp;
-      
-      Op->typ = INTEGER_TYP;
-      if (NODE_OPERAND0(ll))
-        {
-          temp = NODE_OPERAND0(ll);
-          while (temp && NODE_OPERAND1(temp)) temp =  NODE_OPERAND1(temp);
-          if (temp && NODE_OPERAND0(temp))
-            Op->val.I = NODE_CODE (NODE_OPERAND0(temp));
-          else
-            Op->val.I = (long) NULL;
-        }
-      else
-        Op->val.I = (long) NULL;
-      *iptr += strlen("%L1L2*L1CODE");
-    } else
-      {
-        Message  (" *** Unknown operand in %IF (condition) for LL Node *** ",0);
-      }
-}
-
-void Get_Bif_Operand (str, iptr, bif,Op)
-     char *str;
-     int *iptr;
-     PTR_BFND bif;
-     operand *Op;
-{
-
-  Op->typ = UNDEF_TYP;
-  if (strncmp(&(str[*iptr]),"%ELSIFBLOB2", strlen("%ELSIFBLOB2"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%ELSIFBLOB2");
-      if (BIF_BLOB2(bif) && (BIF_CODE(BLOB_VALUE(BIF_BLOB2(bif))) == ELSEIF_NODE))
-        Op->val.I = 1;
-      else
-        Op->val.I = 0;      
-    } else
-  if (strncmp(&(str[*iptr]),"%LABEL", strlen("%LABEL"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%LABEL");
-      Op->val.I = (long) BIF_LABEL(bif);
-    } else
-  if (strncmp(&(str[*iptr]),"%CHECKFLAG", strlen("%CHECKFLAG"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      *iptr += strlen("%CHECKFLAG");
-      Op->val.I = Get_Flag_val(str, iptr);
-    } else
-  if (strncmp(&(str[*iptr]),"%BLOB1", strlen("%BLOB1"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_BLOB1(bif);
-      *iptr += strlen("%BLOB1");
-    } else
-  if (strncmp(&(str[*iptr]),"%BLOB2", strlen("%BLOB2"))== 0)  
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long)  BIF_BLOB2(bif);
-      *iptr += strlen("%BLOB2");
-    } else
-      if (strncmp(&(str[*iptr]),"%BIFCP", strlen("%BIFCP"))== 0)  
-        {
-          Op->typ = INTEGER_TYP;
-          if (BIF_CP(bif))
-            Op->val.I = BIF_CODE(BIF_CP(bif));
-          else
-            Op->val.I = 0;          
-          *iptr += strlen("%BIFCP");
-        } else
-          if (strncmp(&(str[*iptr]),"%VALINT", strlen("%VALINT"))== 0)  
-            {
-              Op->typ = INTEGER_TYP;              
-              Op->val.I = atoi(&(str[*iptr + strlen("%VALINT")]));    /* %VALINT-12232323  space is necessary after the number*/
-              /* skip to next statement */
-              while (str[*iptr] != ' ') (*iptr)++;
-            } else
-  if (strncmp(&(str[*iptr]),"%RECURSBIT", strlen("%RECURSBIT"))== 0)         /* %RECURSBIT : Symbol Attribut (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = RECURSIVE_BIT;
-      *iptr += strlen("%RECURSBIT");
-    } else
-  if (strncmp(&(str[*iptr]),"%EXPR_LIST", strlen("%EXPR_LIST"))== 0)         /* %EXPR_LIST : int constant EXPR_LIST code for Low Level Node (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = EXPR_LIST;
-      *iptr += strlen("%EXPR_LIST");
-    } else
-  if (strncmp(&(str[*iptr]),"%SPEC_PAIR", strlen("%SPEC_PAIR"))== 0)         /* %SPEC_PAIR : int constant SPEC_PAIR code for Low Level Node (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = SPEC_PAIR;
-      *iptr += strlen("%SPEC_PAIR");
-    } else
-  if (strncmp(&(str[*iptr]),"%IOACCESS", strlen("%IOACCESS"))== 0)           /* %IOACCESS : int constant IOACCESS code for Low Level Node (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = IOACCESS;
-      *iptr += strlen("%IOACCESS");
-    } else
-  if (strncmp(&(str[*iptr]),"%STRCST", strlen("%STRCST"))== 0)               /* %STRCST : String Constant */
-    {
-      int i_save;
-
-      *iptr += strlen("%STRCST");
-      while (str[*iptr] == ' ') {(*iptr)++;} /* skip spaces before string */
-      if (str[*iptr] != '\'')
-        {
-          Message  (" *** Missing \"'\" after %STRCST *** ",0);
-        }
-      i_save = ++(*iptr);
-      while ((str[*iptr] != '\0') && (str[*iptr] != '\'')) (*iptr)++;
-      Op->val.S = alloc_str ((*iptr) - i_save);
-      strncpy (Op->val.S, &(str[i_save]), (*iptr) - i_save);
-      Op->typ = STRING_TYP;
-       (*iptr)++; /* skip the ' */
-    } else
-  if (strncmp(&(str[*iptr]),"%SYMBOL", strlen("%SYMBOL"))== 0)               /* %SYMBOL : Symbol pointer (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_SYMB (bif);
-      *iptr += strlen("%SYMBOL");
-    } else
-  if (strncmp(&(str[*iptr]),"%SATTR", strlen("%SATTR"))== 0)                 /* %SATTR : Symbol Attribut (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (BIF_SYMB (bif))->attr;
-      *iptr += strlen("%SATTR");
-    } else
-  if (strncmp(&(str[*iptr]),"%SYMBID", strlen("%SYMBID"))== 0)               /* %SYMBID : Symbol identifier (string) */
-    {
-      Op->typ = STRING_TYP;
-      if (BIF_SYMB (bif))
-        Op->val.S = SYMB_IDENT (BIF_SYMB (bif));
-      else
-        Op->val.S = NULL;
-      *iptr += strlen("%SYMBID");
-    } else
-  if (strncmp(&(str[*iptr]),"%NULL", strlen("%NULL"))== 0)                   /* %NULL : Integer Constant (or false boolean) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = 0;
-      *iptr += strlen("%NULL");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL1", strlen("%LL1"))== 0)                     /* %LL1 : Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_LL1 (bif);
-      *iptr += strlen("%LL1");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL2", strlen("%LL2"))== 0)                     /* %LL2 : Low Level Node 2 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_LL2 (bif);
-      *iptr += strlen("%LL2");
-    } else
-  if (strncmp(&(str[*iptr]),"%LL3", strlen("%LL3"))== 0)                     /* %LL3 : Low Level Node 3 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_LL3 (bif);
-      *iptr += strlen("%LL3");
-    } else
-  if (strncmp(&(str[*iptr]),"%LABUSE", strlen("%LABUSE"))== 0)               /* %LABUSE : label ptr (used for do : doend) (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      Op->val.I = (long) BIF_LABEL_USE (bif);
-      *iptr += strlen("%LABUSE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L1CODE", strlen("%L1CODE"))== 0)               /* %L1CODE : Code (variant) of Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (BIF_LL1 (bif))
-        Op->val.I = NODE_CODE (BIF_LL1 (bif));
-      else
-        Op->val.I = (long) NULL;
-      *iptr += strlen("%L1CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L2CODE", strlen("%L2CODE"))== 0)               /* %L2CODE : Code (variant) of Low Level Node 2 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (BIF_LL2 (bif))
-        Op->val.I = NODE_CODE (BIF_LL2 (bif));
-      else
-        Op->val.I = (long) NULL;
-      *iptr += strlen("%L2CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L1L2L1CODE", strlen("%L1L2L1CODE"))== 0)       /* %L1L2L1CODE : Code (variant) of Low Level Node 1 of Low Level Node 2 of Low Level Node 1 (integer) */
-    {
-      Op->typ = INTEGER_TYP;
-      if (BIF_LL1 (bif) && NODE_TEMPLATE_LL2 (BIF_LL1 (bif)) && NODE_TEMPLATE_LL1 (NODE_TEMPLATE_LL2 (BIF_LL1 (bif))))
-        Op->val.I = NODE_CODE (NODE_TEMPLATE_LL1 (NODE_TEMPLATE_LL2 (BIF_LL1 (bif))));
-      else
-        Op->val.I = (long) NULL;
-      *iptr += strlen("%L1L2L1CODE");
-    } else
-      if (strncmp(&(str[*iptr]),"%L1L2*L1CODE", strlen("%L1L2*L1CODE"))== 0)       /* %L1L2L1CODE : Code (variant) of Low Level Node 1 of Low Level Node 2 of Low Level Node 1 (integer) */
-    {
-      PTR_LLND temp;
-      
-      Op->typ = INTEGER_TYP;
-      if (BIF_LL1 (bif) && NODE_TEMPLATE_LL2 (BIF_LL1 (bif)) && NODE_TEMPLATE_LL1 (NODE_TEMPLATE_LL2 (BIF_LL1 (bif))))
-        {
-          temp = BIF_LL1 (bif);
-          while (NODE_OPERAND1(temp)) temp =  NODE_OPERAND1(temp);
-          if (NODE_TEMPLATE_LL1 (temp))
-            Op->val.I = NODE_CODE (NODE_TEMPLATE_LL1 (temp));
-          else
-            Op->val.I = (long) NULL;
-        }
-      else
-        Op->val.I = (long) NULL;
-      *iptr += strlen("%L1L2*L1CODE");
-    } else
-  if (strncmp(&(str[*iptr]),"%L2L1STR", strlen("%L2L1STR"))== 0)             /* %L2L1STR : String (string_val) of Low Level Node 1 of Low Level Node 2 (string) */
-    {
-      Op->typ = STRING_TYP;
-      if (BIF_LL2 (bif) && NODE_TEMPLATE_LL1 (BIF_LL2 (bif)))
-        Op->val.S = NODE_STR (NODE_TEMPLATE_LL1 (BIF_LL2 (bif)));
-      else
-        Op->val.S = NULL;
-      *iptr += strlen("%L2L1STR");
-    } else
-      {
-        Message  (" *** Unknown operand in %IF (condition) for Bif Node *** ",0);
-      }
-}
-
-int GetComp (str, iptr)
-     char *str;
-     int *iptr;
-{
-  int Comp;
-
-  if (strncmp(&(str[*iptr]),"==", strlen("==")) == 0)         /* == : Equal */
-    {
-      Comp = COMP_EQUAL;
-      *iptr += strlen("==");
-    } else
-  if (strncmp(&(str[*iptr]),"!=", strlen("!=")) == 0)         /* != : Different */
-    {
-      Comp = COMP_DIFF;
-      *iptr += strlen("!=");
-    } else
-      {
-        Message (" *** Unknown comparison operator in %IF (condition) *** ",0);
-        Comp = COMP_UNDEF;
-      }
-  return Comp;
-}
-
-int Eval_Type_Condition(str, ptype)
-     char *str;
-     PTR_TYPE ptype;
-{
-  int Result = 0;
-  int i = 0;
-  operand Op1, Op2;
-  int Comp;
-
-  while (str[i] == ' ') {i++;} /* skip spaces before '(condition)' */
-  if (str[i++] != '(')
-    {
-      Message  (" *** Missing (condition) after %IF *** ",0);
-      
-      return 0;
-    } else
-  while (str[i] == ' ') {i++;} /* skip spaces before first operand */
-  Get_Type_Operand(str, &i, ptype, &Op1);
-  while (str[i] == ' ') {i++;} /* skip spaces before the comparison operator */
-  Comp = GetComp(str, &i);
-  while (str[i] == ' ') {i++;} /* skip spaces before second operand */
-  Get_Type_Operand(str, &i, ptype, &Op2);
-  while (str[i] == ' ') {i++;} /* skip spaces before the closing round bracket */
-  if (str[i] != ')')
-    {
-      Message (" *** Missing ')' after %IF (condition *** ",0);
-      return i;
-    } else
-  i++;
-  if ((Op1.typ != UNDEF_TYP) && (Op1.typ == Op2.typ) && (Comp !=COMP_UNDEF))
-    {
-      switch (Op1.typ)
-        {
-          case STRING_TYP : Result = strcmp (Op1.val.S, Op2.val.S);
-            break;
-          case INTEGER_TYP : Result = Op1.val.I - Op2.val.I;
-            break;
-        }
-      if (Comp == COMP_EQUAL) Result = !Result;
-      if (Result) return i; /* continue from here to the corresponding %ELSE if exists */
-      else                  /* continue at the corresponding %ELSE */
-        {
-          int ifcount_local = 1;
-          while (str[i])
-            {
-              while (str[i] != '%') {
-                                      if (str[i]) i++;
-                                      else return i;
-                                    }
-              i++;
-              if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* Counts %IF */
-                {
-                  ifcount_local++;
-                  i += strlen("IF");
-                } else
-              if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* Counts %ENDIF ; stop skipping if corresponding */
-                {
-                  ifcount_local--;
-                  i += strlen("ENDIF");
-                  if (ifcount_local == 0) return i;
-                } else
-              if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* Counts %ELSE ; stop skipping if corresponding*/
-                {
-                  i += strlen("ELSE");
-                  if (ifcount_local == 1) return i;
-                }
-            }
-          return i;
-        }
-    } else
-        {
-          Message (" *** Error in condition for %IF command *** 1",0);
-          return i;
-        }
-}
-
-int Eval_LLND_Condition(str, ll)
-     char *str;
-     PTR_LLND ll;
-{
-  int Result = 0;
-  int i = 0;
-  operand Op1, Op2;
-  int Comp = 0;
-
-  while (str[i] == ' ') {i++;} /* skip spaces before '(condition)' */
-  if (str[i++] != '(')
-    {
-      Message  (" *** Missing (condition) after %IF *** ",0);
-      return 0;
-    } else
-  while (str[i] == ' ') {i++;} /* skip spaces before first operand */
- Get_LL_Operand(str, &i, ll, &Op1);
-  while (str[i] == ' ') {i++;} /* skip spaces before the comparison operator */
-  Comp = GetComp(str, &i);
-  while (str[i] == ' ') {i++;} /* skip spaces before second operand */
-  Get_LL_Operand(str, &i, ll, &Op2);
-  while (str[i] == ' ') {i++;} /* skip spaces before the closing round bracket */
-  if (str[i] != ')')
-    {
-      Message (" *** Missing ')' after %IF (condition *** ",0);
-      i++;      
-      return i;
-    }  else
-       i++; 
-
-  if ((Op1.typ != UNDEF_TYP) && (Op1.typ == Op2.typ) && (Comp != COMP_UNDEF))
-    {
-      switch (Op1.typ)
-        {
-          case STRING_TYP : Result = strcmp (Op1.val.S, Op2.val.S);
-            break;
-          case INTEGER_TYP : Result = Op1.val.I - Op2.val.I;
-            break;
-        }
-      if (Comp == COMP_EQUAL) Result = !Result;
-      if (Result) return i; /* continue from here to the corresponding %ELSE if exists */
-      else                  /* continue at the corresponding %ELSE */
-        {
-          int ifcount_local = 1;
-          while (str[i])
-            {
-              while (str[i] != '%') {
-                                      if (str[i]) i++;
-                                      else return i;
-                                    }
-              i++;
-              if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* Counts %IF */
-                {
-                  ifcount_local++;
-                  i += strlen("IF");
-                } else
-              if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* Counts %ENDIF ; stop skipping if corresponding */
-                {
-                  ifcount_local--;
-                  i += strlen("ENDIF");
-                  if (ifcount_local == 0) return i;
-                } else
-              if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* Counts %ELSE ; stop skipping if corresponding*/
-                {
-                  i += strlen("ELSE");
-                  if (ifcount_local == 1) return i;
-                }
-            }
-          return i;
-        }
-    } else
-        {
-          Message  (" *** Error in condition for %IF command *** 2",0);
-          return i;
-        }
-}
-
-int Eval_Bif_Condition(str, bif)
-     char *str;
-     PTR_BFND bif;
-{
-  int Result = 0;
-  int i = 0;
-  operand Op1, Op2;
-  int Comp;
-
-  while (str[i] == ' ') {i++;} /* skip spaces before '(condition)' */
-  if (str[i++] != '(')
-    {
-      Message (" *** Missing (condition) after %IF *** ",0);
-      return 0;
-    } else
-  while (str[i] == ' ') {i++;} /* skip spaces before first operand */
-  Get_Bif_Operand(str, &i, bif, &Op1);
-  while (str[i] == ' ') {i++;} /* skip spaces before the comparison operator */
-  Comp = GetComp(str, &i);
-  while (str[i] == ' ') {i++;} /* skip spaces before second operand */
-  Get_Bif_Operand(str, &i, bif, &Op2);
-  while (str[i] == ' ') {i++;} /* skip spaces before the closing round bracket */
-
-  if (str[i] != ')')
-    {
-      Message  (" *** Missing ')' after %IF (condition *** ",0);
-      return i;
-    } else
-  i++;
-  if ((Op1.typ != UNDEF_TYP) && (Op1.typ == Op2.typ) && (Comp != COMP_UNDEF))
-    {
-      switch (Op1.typ)
-        {
-          case STRING_TYP : Result = strcmp (Op1.val.S, Op2.val.S);
-            break;
-          case INTEGER_TYP : Result = Op1.val.I - Op2.val.I;
-            break;
-        }
-      if (Comp == COMP_EQUAL) Result = !Result;
-      if (Result) return i; /* continue from here to the corresponding %ELSE if exists */
-      else                  /* continue at the corresponding %ELSE */
-        {
-          int ifcount_local = 1;
-          while (str[i])
-            {
-              while (str[i] != '%') {
-                                      if (str[i]) i++;
-                                      else return i;
-                                    }
-              i++;
-              if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* Counts %IF */
-                {
-                  ifcount_local++;
-                  i += strlen("IF");
-                } else
-              if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* Counts %ENDIF ; stop skipping if corresponding */
-                {
-                  ifcount_local--;
-                  i += strlen("ENDIF");
-                  if (ifcount_local == 0) return i;
-                } else
-              if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* Counts %ELSE ; stop skipping if corresponding*/
-                {
-                  i += strlen("ELSE");
-                  if (ifcount_local == 1) return i;
-                }
-            }
-          return i;
-        }
-    } else
-        {
-          Message  (" *** Error in condition for %IF command *** 3",0);
-          return i;
-        }
-}
-
-int SkipToEndif (str)
-     char *str;
-{
-  int ifcount_local = 1;
-  int i = 0;
-
-  while (str[i])
-    {
-      while (str[i] != '%') {
-                              if (str[i]) i++;
-                              else return i;
-                            }
-      i++;
-      if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                         /* Counts %IF */
-        {
-          ifcount_local++;
-          i += strlen("IF");
-        } else
-      if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)                   /* Counts %ENDIF ; stop skipping if corresponding */
-        {
-          ifcount_local--;
-          i += strlen("ENDIF");
-          if (ifcount_local == 0) return i;
-        }
-    }
-  return i;
-}
-
-char *Tool_Unparse2_LLnode (); 
-
-char *Tool_Unparse_Type (ptype)
-     PTR_TYPE ptype;
-     /*int def;*/        /* def = 1 : defined type */
-                     /*   def = 0 : named type */
-{
-  int variant;
-  int kind;
-  char *str;
-  char c;
-  int i;
-
-  if (!ptype)
-    return NULL;
-
-  variant = TYPE_CODE (ptype);
-  kind = (int) node_code_kind [(int) variant];
-  if (kind != (int)TYPENODE)
-    Message ("Error in Unparse, not a type node", 0);
-
-  str = Unparse_Def [variant].str;
-
-  /* now we have to interpret the code to unparse it */
-
-  if (str == NULL)
-    return NULL;
-  if (strcmp ( str, "n") == 0)
-    {
-      Message("Node not define for unparse",0);
-      return NULL;
-    }
-  
-
-  i = 0 ;
-  c = str[i];
-  while (c != '\0')
-    {
-      if (c == '%')
-        {
-          i++;
-          c = str[i];
-          /******** WE HAVE TO INTERPRET THE COMMAND *********/
-          if (c  == '%')                                                 /* %% : Percent Sign */
-            {
-              BufPutString ("%",0);
-              i++;
-            } else
-          if (strncmp(&(str[i]),"ERROR", strlen("ERROR"))== 0)           /* %ERROR : Generate error message */
-            {
-              Message("Error Node not defined",0);
-	      BufPutInt(variant);
-              BufPutString ("-----TYPE ERROR--------",0);
-              i += strlen("ERROR");
-            } else
-          if (strncmp(&(str[i]),"NL", strlen("NL"))== 0)                 /* %NL : NewLine */
-            {
-                /*int j;*/
-		BufPutChar ('\n');
-/*              for (j = 0; j < TabNumber; j++)
-                if (j>1)
-                  BufPutString ("   ",0);
-                else
-                  BufPutString ("       ",0);*/
-               i += strlen("NL");
-            } else
-           if (strncmp(&(str[i]),"NOTABNL", strlen("NOTABNL"))== 0)                 /* %NL : NewLine */
-            {
-              BufPutChar ('\n');
-              i += strlen("NOTABNL");
-            } else
-	   if (strncmp(&(str[i]),"RIDPT", strlen("RIDPT"))== 0)      
-                { 
-		  DealWith_Rid(ptype,In_Class_Flag);
-                  i += strlen("RIDPT");
-                } else
-           if (strncmp(&(str[i]),"TABNAME", strlen("TABNAME"))== 0)       /* %TABNAME : Self Name from Table */
-                {
-		  if (Check_Lang_Fortran(cur_proj))
-		    BufPutString (ftype_name [type_index (TYPE_CODE (ptype))],0);
-		  else
-		    {
-		      BufPutString (ctype_name [type_index (TYPE_CODE (ptype))],0);
-		    }
-                  i += strlen("TABNAME");
-                } else
-                  if (strncmp(&(str[i]),"TAB", strlen("TAB"))== 0)               /* %TAB : Tab */
-               {
-              BufPutString ("      ",0); /* cychen */
-              i += strlen("TAB");
-            } else
-	 if (strncmp(&(str[i]),"SETFLAG", strlen("SETFLAG"))== 0)
-	   {               
-		i = i + strlen("SETFLAG");
-		Treat_Flag(str, &i,1);
-	   } else
-	 if (strncmp(&(str[i]),"UNSETFLAG", strlen("UNSETFLAG"))== 0) 
-	   {               
-		i = i + strlen("UNSETFLAG");
-		Treat_Flag(str, &i,-1);
-	   } else
-         if (strncmp(&(str[i]),"PUSHFLAG", strlen("PUSHFLAG"))== 0)
-           {               
-                i = i + strlen("PUSHFLAG");
-                PushPop_Flag(str, &i,1);
-           } else
-         if (strncmp(&(str[i]),"POPFLAG", strlen("POPFLAG"))== 0) 
-            {               
-                i = i + strlen("POPFLAG");
-                PushPop_Flag(str, &i,-1);
-            } else
-          if (strncmp(&(str[i]),"PUTTAB", strlen("PUTTAB"))== 0)               /* %TAB : Tab */
-                {
-                  int j;
-                  for (j = 0; j < TabNumber; j++)
-                    if (j>0)
-                  BufPutString ("   ",0);
-                else
-                    BufPutString ("      ",0); /* cychen */
-                  i += strlen("PUTTAB");
-                } else
-           if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* %IF : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-            {
-              i += strlen("IF");
-              i += Eval_Type_Condition(&(str[i]), ptype);
-            } else
-          if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* %ELSE : Else */
-            {
-              i += strlen("ELSE");
-              i += SkipToEndif(&(str[i]));  /* skip to the corresponding endif */
-            } else
-          if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* %ENDIF : End of If */
-            {
-              i += strlen("ENDIF");
-            } else
-          if (strncmp(&(str[i]),"SUBTYPE", strlen("SUBTYPE"))== 0)     /* %SUBTYPE :  find the next type for (CAST) */
-	    {
-		PTR_TYPE pt;
-                pt = TYPE_BASE(ptype);
-		if(pt) Tool_Unparse_Type(pt);
-		i += strlen("SUBTYPE");
-	     } else
-          if (strncmp(&(str[i]),"BASETYPE", strlen("BASETYPE"))== 0)     /* %BASETYPE : Base Type Name Identifier */
-            {
-	      if (Check_Lang_Fortran(cur_proj))
-		BufPutString (ftype_name [type_index (TYPE_CODE (TYPE_BASE (ptype)))],0);
-	      else
-		{
-		  PTR_TYPE pt;
-		  pt = Find_BaseType(ptype);
-		  if (pt)
-		    {
-		      Tool_Unparse_Type(pt);
-		    } else{
-		      /* printf("offeding node type node: %d\n", ptype->id);
-		      Message("basetype not found",0);
-                      */
-		      }
-		}
-              i += strlen("BASETYPE");
-            } else
-
-          if (strncmp(&(str[i]),"FBASETYPE", strlen("FBASETYPE"))== 0)     /* %FBASETYPE : Base Type Name Identifier */
-            {
-		  PTR_TYPE pt;
-		  pt = Find_BaseType2(ptype);
-		  if (pt)
-		    {
-		      Tool_Unparse_Type(pt);
-		    } else{
-		      /* printf("offeding node type node: %d\n", ptype->id);
-		      Message("basetype not found",0);
-                      */
-		      }
-              i += strlen("FBASETYPE");
-            } else
-
-
-          if (strncmp(&(str[i]),"STAR", strlen("STAR"))== 0)    
-            {
-              PTR_TYPE pt;
-              int flg;
-              pt = ptype;
-       /*       while (pt)        */
-                {
-                  if (TYPE_CODE(pt) == T_POINTER){
-                    BufPutString ("*",0); 
-		    flg = pt->entry.Template.dummy5;  
-		    if(flg & BIT_RESTRICT) BufPutString(" restrict ",0);
-		    if(flg & BIT_CONST) BufPutString(" const ",0);
-		    if(flg & BIT_GLOBL) BufPutString(" global ",0);
-		    if(flg & BIT_SYNC) BufPutString(" Sync ",0);
-		    if(flg & BIT_VOLATILE) BufPutString(" volatile ",0);
-		    }
-                  else
-                  if (TYPE_CODE(pt) == T_REFERENCE){
-                    BufPutString ("&",0);
-		    flg = pt->entry.Template.dummy5;  
-		    if(flg & BIT_RESTRICT) BufPutString(" restrict ",0);
-		    if(flg & BIT_CONST) BufPutString(" const ",0);
-		    if(flg & BIT_GLOBL) BufPutString(" global ",0);
-		    if(flg & BIT_SYNC) BufPutString(" Sync ",0);
-		    if(flg & BIT_VOLATILE) BufPutString(" volatile ",0);
-		    }
- /*                 else
-                    break;
-                  if(TYPE_CODE(pt) == T_MEMBER_POINTER)
-                          pt = TYPE_COLL_BASE(pt);
-                  else pt = TYPE_BASE(pt);           */
-                } 
-              i += strlen("STAR");
-            } else
-          if (strncmp(&(str[i]),"RANGES", strlen("RANGES"))== 0)         /* %RANGES : Ranges */
-            {
-              Tool_Unparse2_LLnode (TYPE_RANGES (ptype));
-              i += strlen("RANGES");
-            } else
-          if (strncmp(&(str[i]),"NAMEID", strlen("NAMEID"))== 0)         /* %NAMEID : Name Identifier */
-            {
-	      if (ptype->name)
-		BufPutString ( ptype->name->ident,0);
-	      else
-		{
-		  BufPutString ("-------TYPE ERROR (NAMEID)------",0);
-		}
-              i += strlen("NAMEID");
-            } else
-	 if (strncmp(&(str[i]),"SYMBID", strlen("SYMBID"))== 0)         /* %NAMEID : Name Identifier */
-		{
-		  if (TYPE_SYMB_DERIVE(ptype)){
-		    PTR_SYMB cname;
-		    cname = TYPE_SYMB_DERIVE(ptype);
-                    if(TYPE_CODE(ptype) == T_DERIVED_TYPE){
-			if((SYMB_CODE(cname) == STRUCT_NAME) && (SYMB_TYPE(cname) == NULL) 
-                           &&(BIF_CODE(SYMB_SCOPE(cname)) == GLOBAL))
-				BufPutString("struct ", 0);
-                        if((SYMB_CODE(cname) == CLASS_NAME) && (SYMB_TYPE(cname) == NULL) 
-                           &&(BIF_CODE(SYMB_SCOPE(cname)) == GLOBAL))
-				BufPutString("class ", 0);
-                        if((SYMB_CODE(cname) == UNION_NAME) && (SYMB_TYPE(cname) == NULL) 
-                           &&(BIF_CODE(SYMB_SCOPE(cname)) == GLOBAL))
-				BufPutString("union ", 0);
-			}
-                     if(TYPE_SCOPE_SYMB_DERIVE(ptype) && TYPE_CODE(ptype) != T_DERIVED_TEMPLATE) {
-                         Tool_Unparse_Symbol(TYPE_SCOPE_SYMB_DERIVE(ptype));
-                         BufPutString("::",0);
-                         }
-		    Tool_Unparse_Symbol(cname);
-		    }
-                  else if(TYPE_CODE(ptype) == T_MEMBER_POINTER)
-                    Tool_Unparse_Symbol(TYPE_COLL_NAME(ptype));
-		  else
-		    {
-                      printf("node = %d, variant = %d\n",TYPE_ID(ptype), TYPE_CODE(ptype));
-		      BufPutString ("-------TYPE ERROR (ISYMBD)------",0);
-		    }
-		  i += strlen("SYMBID");
-		} else
-          if (strncmp(&(str[i]),"RANGLL1", strlen("RANGLL1"))== 0)       /* %RANGLL1 : Low Level Node 1 of Ranges */
-            {
-              if (TYPE_RANGES (ptype))
-                Tool_Unparse2_LLnode (NODE_TEMPLATE_LL1 (TYPE_RANGES (ptype)));
-              i += strlen("RANGLL1");
-            } else
-          if (strncmp(&(str[i]),"COLLBASE", strlen("COLLBASE"))== 0)       /* %COLL BASE */
-            {
-              if (TYPE_COLL_BASE(ptype))
-		Tool_Unparse_Type(TYPE_COLL_BASE(ptype));
-              i += strlen("COLLBASE");
-            }  else
-          if (strncmp(&(str[i]),"TMPLARGS", strlen("TMPLARGS"))== 0)       /* %RANGLL1 : Low Level Node 1 of Ranges */
-            {
-              if (TYPE_TEMPL_ARGS(ptype))
-		Tool_Unparse2_LLnode(TYPE_TEMPL_ARGS(ptype));
-              i += strlen("TMPLARGS");
-            }  else
-          Message  (" *** Unknown type node COMMAND *** ",0);
-        }
-       else
-         {
-           BufPutChar (c);
-           i++;
-         }
-      c = str[i];
-    }
-  return  Buf_address;
-}
-
-char *Tool_Unparse2_LLnode(ll)
-     PTR_LLND ll;
-{
-  int variant;
-  int kind;
-  char *str;
-  char c;
-  int i;
-  
-  if (!ll)
-    return NULL;
-  
-  variant = NODE_CODE (ll);
-  /*BufPutInt(variant);
-  printf("LLNODE : %i\n%s",variant,Buf_address);*/
-  if (TASK_PROC_GENERATE&&(HPF_VERSION==2)&&
-      ((variant==ARRAY_REF)||
-       (variant==VAR_REF)||
-       (variant==CONST_REF))&&
-       ON_BLOCK&&NODE_SYMB(ll)) 
-      {
-      PTR_LLND ptr,new_node,new_symb;
-      if (!SYMB_DOVAR(NODE_SYMB(ll))&&
-          (!(SYMB_ATTR(NODE_SYMB(ll))&TASK_BIT))&&
-	  (!(SYMB_ATTR(NODE_SYMB(ll))&PROCESSORS_BIT)))
-          {
-          new_symb=make_llnode(variant,LLNULL,LLNULL,NODE_SYMB(ll));
-	  new_node=make_llnode(EXPR_LIST,new_symb,LLNULL,SMNULL);
-          if (parameter_list)
-              { 
-              ptr=Follow_Llnd(parameter_list,2);
-	      NODE_OPERAND1(ptr)=new_node;
-	      }
-          if (!parameter_list) parameter_list=new_node;
-	  SYMB_DOVAR(NODE_SYMB(ll))=2;
-	  }
-      }
-  kind = (int) node_code_kind[(int) variant];
-  if (kind != (int)LLNODE)
-    {
-      Message("Error in Unparse, not a llnd node",0);
-      BufPutInt(variant);
-      BufPutString ("------ERROR--------",0);
-      return NULL;
-    }
-  str = Unparse_Def[variant].str;
-  /* now we have to interpret the code to unparse it */
-  
-  if (str == NULL)
-    return NULL;
-  if (strcmp( str, "n") == 0)
-    return NULL;
-
-  i = 0 ;
-  c = str[i];
-  while (c != '\0')
-    {
-      if (c == '%')
-        {
-          i++;
-          c = str[i];
-          /******** WE HAVE TO INTERPRET THE COMMAND *********/
-          if (c  == '%')                                                 /* %% : Percent Sign */
-            {
-              BufPutString ("%",0);
-              i++;
-            } else
-          if (strncmp(&(str[i]),"ERROR", strlen("ERROR"))== 0)           /* %ERROR : Generate error message */
-            {
-              Message ("--- unparsing error[0] : ",0);
-	      BufPutInt(variant);
-              BufPutString ("------ERROR--------",0);
-              i += strlen("ERROR");
-            } else
-          if (strncmp(&(str[i]),"NL", strlen("NL"))== 0)                 /* %NL : NewLine */
-            {
-             /* int j;*/
-              BufPutChar ('\n');
-/*              for (j = 0; j < TabNumber; j++)
-                if (j>1)
-                  BufPutString ("   ",0);
-                else
-                  BufPutString ("       ",0);*/
-               i += strlen("NL");
-            } else
-          if (strncmp(&(str[i]),"TAB", strlen("TAB"))== 0)               /* %TAB : Tab */
-            {
-              BufPutString ("      ",0); /* cychen */
-              i += strlen("TAB");
-            } else
-	  if (strncmp(&(str[i]),"BACK", strlen("BACK"))== 0)
-            {
-              Buf_pointer--;
-              i += strlen("BACK");
-            } else
-           
-          if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* %IF : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-            {
-              i += strlen("IF");
-              i += Eval_LLND_Condition(&(str[i]), ll);
-            } else
-          if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* %ELSE : Else */
-            {
-              i += strlen("ELSE");
-              i += SkipToEndif(&(str[i]));  /* skip to the corresponding endif */
-            } else
-          if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* %ENDIF : End of If */
-            {
-              i += strlen("ENDIF");
-            } else
-          if (strncmp(&(str[i]),"LL1", strlen("LL1"))== 0)               /* %LL1 : Low Level Node 1 */
-            {
-              Tool_Unparse2_LLnode(NODE_TEMPLATE_LL1(ll));
-              i += strlen("LL1");
-            } else
-          if (strncmp(&(str[i]),"LL2", strlen("LL2"))== 0)               /* %LL2 : Low Level Node 2 */
-            {
-              Tool_Unparse2_LLnode(NODE_TEMPLATE_LL2(ll));
-              i += strlen("LL2");
-            } else
-          if (strncmp(&(str[i]),"SYMBID", strlen("SYMBID"))== 0)         /* %SYMBID : Symbol identifier */
-            {
-              Tool_Unparse_Symbol (NODE_SYMB (ll));
-              i += strlen("SYMBID");
-            } else
-          if (strncmp(&(str[i]),"NEWSPEC", strlen("NEWSPEC"))== 0)
-            {
-              if (NewSpecList)
-              {
-#ifdef __SPF
-                  removeFromCollection(NewSpecList);
-#endif
-                  free(NewSpecList);
-              }
-              NewSpecList=NODE_OPERAND0(ll);
-              i += strlen("NEWSPEC");
-            } else
-	      if (strncmp(&(str[i]),"COMMONDECL", strlen("COMMONDECL"))== 0)               /* %DECLARATION : We need to change declaration of Pointer descriptor */
-            {
-              int count=0;
-	      if ((NODE_CODE(ll)==COMM_LIST)&&NODE_OPERAND0(ll)) count=FindCommonHeapDeclaration(NODE_OPERAND0(ll));
-	      if (!count) 
-		{
-		  count=0;
-		  Treat_Flag("(POINTER)",&count, 1);
-		}
-              i += strlen("COMMONDECL");
-            } else
-	      if (strncmp(&(str[i]),"CHECK_HEAP", strlen("CHECK_HEAP"))== 0)         /* %CHECK_HEAP : Pointer HEAP(PA) -> PA */
-		{
-		 /* char *str;
-		  if (ll) str=SYMB_IDENT(NODE_SYMB (ll));
-		  if (!strcmp(str,"heap")||!strcmp(str,"HEAP")) */                  
-		if(SYMB_ATTR(NODE_SYMB (ll))&HEAP_BIT)
-		    {
-		      /*BufPutString("<HEAP_BIT",0);
-		      BufPutString(SYMB_IDENT(NODE_SYMB (ll)),0);
-		      BufPutString("/HEAP_BIT>",0);*/
-		      Tool_Unparse2_LLnode (NODE_OPERAND0(ll));
-		      return Buf_address;
-		    }
-		  i += strlen("CHECK_HEAP");
-		} else
-		if (strncmp(&(str[i]),"CHECK_PTR", strlen("CHECK_PTR"))== 0)         /* %CHECK_HEAP : Pointer HEAP(PA) -> PA */
-		{
-		  if (ll) 
-		      if(SYMB_ATTR(NODE_SYMB (ll))&DVM_POINTER_ARRAY_BIT)
-		          BufPutString("%PTR",0);
-		  i += strlen("CHECK_PTR");
-		} else
-		if (strncmp(&(str[i]),"CHECK_PROC_REF", strlen("CHECK_PROC_REF"))== 0)         /* %CHECK_HEAP : Pointer HEAP(PA) -> PA */
-		{
-		    int k=0;
-		    if (ll) 
-		      if(SYMB_ATTR(NODE_SYMB (ll))&PROCESSORS_BIT)
-		          if (!Get_Flag_val("(PROC_REF)",&k)) 
-			      return Buf_address;
-		  i += strlen("CHECK_PROC_REF");
-		} else
-		if (strncmp(&(str[i]),"DELETE_COMMA", strlen("DELETE_COMMA"))== 0)         /* %CHECK_HEAP : Pointer HEAP(PA) -> PA */
-		{
-		  if (Buf_address[Buf_pointer-1]==',') 
-		      Buf_pointer--;
-		  i += strlen("DELETE_COMMA");
-		} else
-		if (strncmp(&(str[i]),"CHECK_DYNAMIC", strlen("CHECK_DYNAMIC"))== 0)
-		{
-		  if (NODE_OPERAND0(ll)||NODE_OPERAND1(ll)) 
-		      i += strlen("CHECK_DYNAMIC");
-		  else {
-		         int k=0;
-			 if (Get_Flag_val("(DYNAMIC)",&k)) 
-			     {
-			     Buf_pointer--;
-			     return Buf_address;
-			     }
-			 k=0;
-			 Treat_Flag("(DYNAMIC)",&k,1);
-		         BufPutString("DYNAMIC",0);
-			 i += strlen("CHECK_DYNAMIC");		      
-		         return Buf_address;
-			}
-		} else
-	
-		  if (strncmp(&(str[i]),"SAVE_SYMBOL", strlen("SAVE_SYMBOL"))== 0)         /* %SAVE_SYMBOL : Reduction variables list */
-		{
-		  if (Find_SaveSymbol (ll)) 
-		    {
-		      if (Buf_address[Buf_pointer-1]==',') Buf_pointer--;
-		      return Buf_address;
-		    }
-		  i += strlen("SAVE_SYMBOL");
-		} else
-		    if (strncmp(&(str[i]),"DELETE_SYMBOL", strlen("DELETE_SYMBOL"))== 0)         /* %DELETE_SYMBOL : Clear reduction variables list */
-		{
-		  Number_Of_Symbol=0;
-		  i += strlen("DELETE_SYMBOL");
-		} else
-	      if (strncmp(&(str[i]),"POINTER_NAME", strlen("POINTER_NAME"))== 0)         /* %POINTER_NAME : We should change the definition of Pointer descriptor  */
-            {
-	      if ((NODE_CODE(ll)==VAR_REF)||(NODE_CODE(ll)==ARRAY_REF))
-		if(SYMB_ATTR(NODE_SYMB (ll))&DVM_POINTER_BIT) 
-		  {
-		    Tool_Unparse_Symbol (NODE_SYMB (ll));
-		    if (NODE_CODE(ll)==ARRAY_REF)
-		      {
-			if(NODE_OPERAND0(ll))
-			  {
-			    BufPutChar('(');
-			    Tool_Unparse2_LLnode (NODE_OPERAND0(ll));
-			    BufPutChar(')');
-			  }
-		      }
-		     return Buf_address;
-		  }
-              i += strlen("POINTER_NAME");
-            } else
-          if (strncmp(&(str[i]),"DOPROC", strlen("DOPROC"))== 0)             /* for subclass qualification */
-            { int flg;
-              if(NODE_TYPE(ll) && (NODE_CODE(NODE_TYPE(ll)) == T_DESCRIPT)){
-		flg = (NODE_TYPE(ll))->entry.Template.dummy5;
-		if(flg & BIT_VIRTUAL) BufPutString(" virtual ",0);
-		if(flg & BIT_ATOMIC) BufPutString(" atomic ",0);
-		if(flg & BIT_PRIVATE) BufPutString(" private ",0);
-		if(flg & BIT_PROTECTED) BufPutString(" protected ",0);
-		if(flg & BIT_PUBLIC) BufPutString(" public ",0);
-		}
-	       else BufPutString(" public ", 0);
-		/* note: this last else condition is to fix a bug in
-		   the dep2C++ which does not create the right types
-		   when converting a collection to a class.
-                */
-              i += strlen("DOPROC");
-            } else
-          if (strncmp(&(str[i]),"TYPE", strlen("TYPE"))== 0)             /* %TYPE : Type */
-            { 
-              if(NODE_SYMB(ll) &&  (SYMB_ATTR(NODE_SYMB(ll)) & OVOPERATOR)){
-		  /* this is an overloaded operator.  don't do type */
-		}
-              else{ Tool_Unparse_Type (NODE_TYPE (ll)); }
-              i += strlen("TYPE");
-            } else
-          if (strncmp(&(str[i]),"L1SYMBCST", strlen("L1SYMBCST"))== 0)   /* %L1SYMBCST  : Constant Value of Low Level Node Symbol */
-            {
-              if (NODE_TEMPLATE_LL1 (ll) && NODE_SYMB (NODE_TEMPLATE_LL1 (ll)))
-                {
-                   Tool_Unparse2_LLnode((NODE_SYMB (NODE_TEMPLATE_LL1 (ll)))->entry.const_value);
-                }
-              i += strlen("L1SYMBCST");
-            } else
-          if (strncmp(&(str[i]),"INTVAL", strlen("INTVAL"))== 0)         /* %INTVAL : Integer Value */
-            {
-              if (NODE_INT_CST_LOW (ll) >= 0)
-                {
-                  BufPutInt (NODE_INT_CST_LOW (ll));
-                } else
-                  {
-                    BufPutString ("(",0);
-                    BufPutInt (NODE_INT_CST_LOW (ll));
-                    BufPutString (")",0);
-                  }
-              i += strlen("INTVAL");
-            } else
-          if (strncmp(&(str[i]),"STATENO", strlen("STATENO"))== 0)       /* %STATENO : Statement number */
-            {
-              if (NODE_LABEL (ll))
-                {
-                  BufPutInt ((int)( LABEL_STMTNO (NODE_LABEL (ll))));
-                }
-              i += strlen("STATENO");
-            } else
-          if (strncmp(&(str[i]),"STRVAL", strlen("STRVAL"))== 0)         /* %STRVAL : String Value */
-            {
-              BufPutString (NODE_STR (ll),0);
-              i += strlen("STRVAL");
-            } else
-          if (strncmp(&(str[i]),"BOOLVAL", strlen("BOOLVAL"))== 0)       /* %BOOLVAL : String Value */
-            {
-              BufPutString (NODE_BV (ll) ? ".TRUE." : ".FALSE.",0);
-              i += strlen("BOOLVAL");
-            } else
-          if (strncmp(&(str[i]),"CHARVAL", strlen("CHARVAL"))== 0)       /* %CHARVAL : Char Value */
-            {
-	      switch(NODE_CV(ll)){
-    		     case '\n':BufPutChar('\\'); BufPutChar('n'); break;
-    		     case '\t':BufPutChar('\\'); BufPutChar('t'); break;
-    		     case '\r':BufPutChar('\\'); BufPutChar('r'); break;
-		     case '\f':BufPutChar('\\'); BufPutChar('f'); break;
-    		     case '\b':BufPutChar('\\'); BufPutChar('b'); break;
-    		     case '\a':BufPutChar('\\'); BufPutChar('a'); break;
-    		     case '\v':BufPutChar('\\'); BufPutChar('v'); break;
-		    default:
-              		BufPutChar (NODE_CV (ll));
-		    }
-              i += strlen("CHARVAL");
-            } else
-          if (strncmp(&(str[i]),"ORBPL1", strlen("ORBPL1"))== 0)         /* %ORBPL1 : Openning Round Brackets on Precedence of Low Level Node 1 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] < precedence [llvar - EQ_OP]))
-                BufPutString ("(",0);
-              i += strlen("ORBPL1");
-            } else
-          if (strncmp(&(str[i]),"CRBPL1", strlen("CRBPL1"))== 0)         /* %CRBPL1 : Closing Round Brackets on Precedence of Low Level Node 1 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL1 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] < precedence [llvar - EQ_OP]))
-                BufPutString (")",0);
-              i += strlen("CRBPL1");
-            } else
-          if (strncmp(&(str[i]),"ORBPL2", strlen("ORBPL2"))== 0)         /* %ORBPL2 : Openning Round Brackets on Precedence of Low Level Node 2 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] <= precedence [llvar - EQ_OP]))
-                BufPutString ("(",0);
-              i += strlen("ORBPL2");
-            } else
-          if (strncmp(&(str[i]),"CRBPL2", strlen("CRBPL2"))== 0)         /* %CRBPL2 : Closing Round Brackets on Precedence of Low Level Node 2 */
-            {
-              int llvar = NODE_CODE (NODE_TEMPLATE_LL2 (ll));
-              if (binop (llvar) && (precedence [variant - EQ_OP] <= precedence [llvar - EQ_OP]))
-                BufPutString (")",0);
-              i += strlen("CRBPL2");
-            } else
-	 if (strncmp(&(str[i]),"SETFLAG", strlen("SETFLAG"))== 0)
-	   {               
-		i = i + strlen("SETFLAG");
-		Treat_Flag(str, &i,1);
-	   } else
-	 if (strncmp(&(str[i]),"UNSETFLAG", strlen("UNSETFLAG"))== 0) 
-	   {               
-		i = i + strlen("UNSETFLAG");
-		Treat_Flag(str, &i,-1);
-	   } else
-         if (strncmp(&(str[i]),"PUSHFLAG", strlen("PUSHFLAG"))== 0)
-           {               
-                i = i + strlen("PUSHFLAG");
-                PushPop_Flag(str, &i,1);
-           } else
-         if (strncmp(&(str[i]),"POPFLAG", strlen("POPFLAG"))== 0) 
-            {               
-                i = i + strlen("POPFLAG");
-                PushPop_Flag(str, &i,-1);
-            } else
-         if (strncmp(&(str[i]),"PURE", strlen("PURE"))== 0) /* for pure function declarations */
-	{
-	   PTR_SYMB symb;
-	   symb = NODE_SYMB(ll);
-	   if(symb && (SYMB_TEMPLATE_DUMMY8(symb) &  128)) BufPutString ("= 0",0);
-           i += strlen("PURE");
-           }
-          else
-          if (strncmp(&(str[i]),"CNSTF", strlen("CNSTF"))== 0)    /* for const functions */
-           {
-              PTR_SYMB symb;
-              if (NODE_SYMB (ll)){
-                symb = BIF_SYMB (ll);
-		if(SYMB_TEMPLATE_DUMMY8(symb) & 64) BufPutString(" const",0); 
-		}
-	      i += strlen("CNSTF");
-             } else        
-         if (strncmp(&(str[i]),"CNSTCHK", strlen("CNSTCHK"))== 0) /* do "const", vol" after * */
-	{
-	   int flg;
-           PTR_TYPE t;
-           if((t = NODE_TYPE(ll)) &&( (NODE_CODE(t) == T_POINTER) ||
-		(NODE_CODE(t) == T_REFERENCE))){
-		flg = t->entry.Template.dummy5;  
-		    if(flg & BIT_RESTRICT) BufPutString(" restrict ",0);
-		    if(flg & BIT_CONST) BufPutString(" const ",0);
-		    if(flg & BIT_GLOBL) BufPutString(" global ",0);
-		    if(flg & BIT_SYNC) BufPutString(" Sync ",0);
-		if(flg & BIT_VOLATILE) BufPutString(" volatile ",0);
-		}
-           i += strlen("CNSTCHK");
-           }
-          else
-         if (strncmp(&(str[i]),"VARLISTTY", strlen("VARLISTTY"))== 0)  /* %VARLIST : list of variables / parameters */
-            {
-              PTR_SYMB symb, s;
-	      PTR_LLND args, arg_item = NULL, t;
-	      PTR_TYPE typ;
-              int new_op_flag; /* 1 if this is a new op */
-              new_op_flag = 0;
-              if(NODE_CODE(ll) == CAST_OP ){
-			args = NODE_OPERAND1(ll);
-			new_op_flag = 1;
-                        }
-	      else if(NODE_CODE(ll) != FUNCTION_OP){ 
-			args = NODE_OPERAND0(ll);
-			/* symb = SYMB_FUNC_PARAM(NODE_SYMB(ll)); */
-		  	}
-              else {  /* this is a pointer to a function parameter */
-			args = NODE_OPERAND1(ll);
-			t = NODE_OPERAND0(ll); /* node_code(t) == deref_op */
-			t = NODE_OPERAND0(t);  /* node_code(t) == var_ref */
-			s = NODE_SYMB(t);
-			if(s) symb = SYMB_NEXT(s);
-			else symb = NULL;
-		}	
-              while (args )
-                      { 
-                        int typflag;
-			if(new_op_flag) t = args;
-			else{
-				arg_item = NODE_OPERAND0(args);
-				t = arg_item;
-                        	typflag = 1;
-				while(t && typflag){
-                           		if((NODE_CODE(t) == VAR_REF) || (NODE_CODE(t) == ARRAY_REF))
-                                    		typflag = 0;
-                           	else if (NODE_CODE(t) == SCOPE_OP) t = NODE_OPERAND1(t);
-                           	else  t = NODE_OPERAND0(t);
-                           } 
-			  }
- 			if(t){
-			      symb = NODE_SYMB(t); 
-			      typ = NODE_TYPE(t);
-			      if(symb && (typ == NULL)) typ = SYMB_TYPE(symb);
-			      if(new_op_flag || symb  ) {
-                                 typflag = 1;
-			         while(typ && typflag){
-                                          if(TYPE_CODE(typ) == T_ARRAY || 
-				             TYPE_CODE(typ) == T_FUNCTION ||
-			                     TYPE_CODE(typ) == T_REFERENCE ||
-				             TYPE_CODE(typ) == T_POINTER) typ = TYPE_BASE(typ);
-				          else 	if(TYPE_CODE(typ) == T_MEMBER_POINTER)
-                                                      typ = TYPE_COLL_BASE(typ);
-					  else typflag = 0;
-				          } 
-                                   }
-                              if(typ) Tool_Unparse_Type (typ);
-                              BufPutString (" ",0);
-			   }
-			else printf("unp could not find var ref!\n");
-			if(new_op_flag){
-			        Tool_Unparse2_LLnode(args);
-				args = LLNULL;
-				new_op_flag = 0;
-				}
-			else{
-			     Tool_Unparse2_LLnode(arg_item);
-			     args = NODE_OPERAND1(args);
-			    }
-                        if (args) BufPutString (", ",0);
-                      }
-              i += strlen("VARLISTTY");
-            } 
-	      else 
-	   if (strncmp(&(str[i]),"VARLIST", strlen("VARLIST"))== 0)    /* %VARLIST : list of variables / parameters */
-		  {
-		    PTR_SYMB symb;
-		    if (NODE_SYMB (ll))
-		      symb = SYMB_FUNC_PARAM (NODE_SYMB (ll));
-		    else
-		      symb = NULL;
-		    while (symb)
-		      {
-			BufPutString ( SYMB_IDENT (symb),0);
-			symb = SYMB_NEXT_DECL (symb);
-			if (symb) BufPutString (", ",0);
-		      }
-		    i += strlen("VARLIST");
-		  } else
-    	    if (strncmp(&(str[i]),"STRINGLEN", strlen("STRINGLEN"))== 0)
-		      {
-			PTR_SYMB symb;
-			PTR_TYPE type;
-			if (NODE_SYMB (ll))
-			  symb = NODE_SYMB (ll);
-			else
-			  symb = NULL;
-			if (symb)
-			  {
-			    type = SYMB_TYPE(symb);
-			    if (type && (TYPE_CODE(type) == T_ARRAY))
-			      {
-				type = Find_BaseType(type);
-			      }
-			    if (type && (TYPE_CODE(type) == T_STRING))
-			      {
-				if (TYPE_RANGES(type))
-				  Tool_Unparse2_LLnode(TYPE_RANGES(type));
-			      }
-			  }
-			i += strlen("STRINGLEN");
-		 }  else
-		if (strncmp(&(str[i]),"CHPFCONTTAB", strlen("CHPFCONTTAB"))== 0)               /* %TAB : Tab */
-                {
-                  int j;
-		  BufPutString ("\n!HPF$*",0);
-                  for (j = 0; j < TabNumber; j++)
-                    if (j>0)
-                      BufPutString ("   ",0);
-                    else
-                      BufPutString ("      ",0);
-		      Buf_pointer-=7;
-                  i += strlen("CHPFCONTTAB");
-                } else
-		    Message  (" *** Unknown low level node COMMAND *** ",0);
-	}
-      else
-	{
-	  BufPutChar ( c);
-	  i++; /* Bodin */
-	}
-      c = str[i];
-    }
-  return Buf_address;
-}
-
-char *Tool_Unparse_Bif(bif)
-     PTR_BFND bif;
-{
-  int variant;
-  int kind;
-  char *str;
-  char c;
-  int i;
-  int AfterDOLabel=0;
-
-  if (!bif)
-    return NULL;
-
-  variant = BIF_CODE(bif);
-  /*BufPutInt(variant);
-  printf("BIFNODE : %i\n%s",variant,Buf_address);*/
-
-  /*BufPutInt(isForNodeEndStmt(bif));
-  BufPutInt(variant);*/
-  kind = (int) node_code_kind[(int) variant];
-  if (kind  != (int)BIFNODE)
-    Message("Error in Unparse, not a bif node",0);
-  str = Unparse_Def[variant].str;
-  if (TASK_PROC_GENERATE&&(HPF_VERSION==2)&&TaskRegionUnparse) 
-  {   if (!BIF_ID(bif)) return Buf_address;
-      else BIF_ID(bif)=0;
-  }      
-  if (TASK_PROC_GENERATE&&(HPF_VERSION==2)&&(variant==CONTROL_END)) 
-      if (NODE_CODE(BIF_CP(bif))==PROG_HEDR)
-          if (TaskRegion) 
-	      {
-	      if (TabNumber>1) TabNumber--;
-	      Puttab();
-	      BufPutString("end \n\n",0);
-	      UnparseTaskRegion(TaskRegion);
-	      return Buf_address;
-	      }
-  if (TASK_PROC_GENERATE&&(HPF_VERSION==2)&&(variant==DVM_ON_DIR)) 
-      {
-      char *name;
-      int i,temp=Buf_pointer;
-      PTR_FCALL fcall,new_node;
-      Tool_Unparse2_LLnode(BIF_LL1(bif));
-      name=xmalloc(Buf_pointer-temp);
-      for(i=0;i+temp<Buf_pointer;i++)
-          if(Buf_address[temp+i]!='(')
-              name[i]=Buf_address[temp+i];
-	  else name[i]='_';
-      name[i-1]='\0';
-      Buf_pointer=temp;
-      function_name=make_funcsymb(name);
-#ifdef __SPF
-      removeFromCollection(name);
-#endif
-      free(name);
-      new_node=ALLOC(func_call);
-      FUNC_FIRST(new_node)=bif;
-      if (TaskRegion)
-              { 
-              fcall=FindLast(TaskRegion);
-	      FUNC_NEXT(fcall)=new_node;
-	      }
-      else TaskRegion=new_node;
-      }
-  if (TASK_PROC_GENERATE&&(HPF_VERSION==2)&&(variant==DVM_END_ON_DIR)) 
-      {
-      PTR_FCALL fcall;
-      ON_BLOCK=0;
-      Buf_pointer=ON_BEGIN;
-      if (TaskRegion)
-              { 
-              fcall=FindLast(TaskRegion);
-	      FUNC_LAST(fcall)=bif;
-	      FUNC_REF(fcall)=make_llnode(FUNC_CALL,parameter_list,LLNULL,function_name);
-	      }      
-      TabNumber++;
-      Puttab();
-      TabNumber--;
-      BufPutString("call ",0);
-      Tool_Unparse2_LLnode(make_llnode(FUNC_CALL,parameter_list,LLNULL,function_name));
-      BufPutString("\n",0);
-      parameter_list=NULL;
-      ResetSymbolDovar();
-      }
-  /* printf("variant = %d, str = %s\n", variant, str); */
-  /* now we have to interpret the code to unparse it */
-  
-  if (str == NULL)
-    return NULL;
-  if (strcmp( str, "n") == 0)
-    if (strcmp ( str, "n") == 0)
-    {
-      Message("Node not define for unparse",BIF_LINE(bif));
-      return NULL;
-    }
-
-  
-  i = 0 ;
-  if (Get_Flag_val("(COMMENT)",&i)) BufPutChar('C');
-  i = 0 ;
-  c = str[i];
-  while ((c != '\0') && (c != '\n'))
-    {
-      if (c == '%')
-        {
-          i++;
-          c = str[i];
-          /******** WE HAVE TO INTERPRET THE COMMAND *********/
-          if (c  == '%')                                                 /* %% : Percent Sign */
-            {
-              BufPutString ("%",0);
-              i++;
-            } else
-              if (strncmp(&(str[i]),"CMNT", strlen("CMNT"))== 0)
-            {               
-              i = i + strlen("CMNT");
-	      if (!CommentOut)
-		{
-		  /* print the attached comment first */
-		  if (BIF_CMNT(bif))
-		    {       
-		      if (CMNT_STRING(BIF_CMNT(bif)))
-			{
-			  BufPutChar('\n');
-			  BufPutString(CMNT_STRING(BIF_CMNT(bif)),0);
-			  if (!Check_Lang_Fortran(cur_proj))
-			    BufPutChar('\n');
-			}
-		    }
-		}
-            } else
-              if (strncmp(&(str[i]),"DECLSPEC", strlen("DECLSPEC"))== 0)             /* %DECLSPEC : for extern, static, inline, friend */
-            {
-              int index = BIF_DECL_SPECS(bif);
-              i = i + strlen("DECLSPEC");
-              if( index & BIT_EXTERN) {
-		 BufPutString(ridpointers[(int)RID_EXTERN],0);
-		 BufPutString(" ", 0);
-		 }
-              if( index & BIT_STATIC) {
-		 BufPutString(ridpointers[(int)RID_STATIC],0);
-		 BufPutString(" ", 0);
-		 }
-              if( index & BIT_INLINE) {
-	         BufPutString(ridpointers[(int)RID_INLINE],0);
-		 BufPutString(" ", 0);
-		 }
-              if( index & BIT_FRIEND) {
-		 BufPutString(ridpointers[(int)RID_FRIEND],0);
-		 BufPutString(" ", 0);
-		 }
-            } else
-              if (strncmp(&(str[i]),"SETFLAG", strlen("SETFLAG"))== 0)
-            {               
-              i = i + strlen("SETFLAG");
-              Treat_Flag(str, &i,1);
-            } else
-	      if (strncmp(&(str[i]),"INDEPENDENT_DO", strlen("INDEPENDENT_DO"))== 0)
-            {               
-              int count=0;
-		if (BIF_CODE(bif)==DVM_PARALLEL_ON_DIR)
-	          {
-		  if (BIF_LL3(bif))
-		      {
-		      if (NODE_CODE(BIF_LL3(bif))==EXPR_LIST)
-		          {
-			  PTR_LLND expr_list;
-			  for(expr_list=BIF_LL3(bif);expr_list;expr_list=NODE_OPERAND1(expr_list))
-			      count++;
-			  }
-		      }
-		  }
-	      NumberOfIndependent=count-1;
-	      i = i + strlen("INDEPENDENT_DO");
-            } else
-	      if (strncmp(&(str[i]),"CHECK_INDEPENDENT_DO", strlen("CHECK_INDEPENDENT_DO"))== 0)
-            {               
-		if (NumberOfIndependent>0)
-		    {
-		    BufPutString("!HPF$",0);
-	            Puttab();
-	            Buf_pointer-=5;
-	            BufPutString("INDEPENDENT\n",0);	      
-		    }
-		NumberOfIndependent--;
-	      i = i + strlen("CHECK_INDEPENDENT_DO");
-            } else
-	      if (strncmp(&(str[i]),"RESET_INDEPENDENT_DO", strlen("RESET_INDEPENDENT_DO"))== 0)
-            {               
-		NumberOfIndependent=0;
-	      i = i + strlen("RESET_INDEPENDENT_DO");
-            } else
-              if (strncmp(&(str[i]),"UNSETFLAG", strlen("UNSETFLAG"))== 0) 
-            {               
-              i = i + strlen("UNSETFLAG");
-              Treat_Flag(str, &i,-1);
-            } else
-              if (strncmp(&(str[i]),"PUSHFLAG", strlen("PUSHFLAG"))== 0)
-                        {               
-                          i = i + strlen("PUSHFLAG");
-                          PushPop_Flag(str, &i,1);
-                        } else
-                          if (strncmp(&(str[i]),"POPFLAG", strlen("POPFLAG"))== 0) 
-                            {               
-                              i = i + strlen("POPFLAG");
-                              PushPop_Flag(str, &i,-1);
-                            } else
-          if (strncmp(&(str[i]),"ERROR", strlen("ERROR"))== 0)           /* %ERROR : Generate error message */
-            {
-              Message("--- stmt unparsing error[1] : ",0);
-              i += strlen("ERROR");
-              BufPutString (" *** UNPARSING ERROR OCCURRED HERE ***\n",0);
-            } else
-              if (strncmp(&(str[i]),"NL", strlen("NL"))== 0)                 /* %NL : NewLine */
-            { 
-		int j=0;     
-                  if (!Get_Flag_val("(NO_NL)",&j)) 
-		    BufPutChar ('\n');
-/*              for (j = 0; j < TabNumber; j++)
-                if (j>1)
-                  BufPutString ("   ",0);
-                else
-                  BufPutString ("       ",0);*/
-              i += strlen("NL");
-            } else
-              if (strncmp(&(str[i]),"NOTABNL", strlen("NOTABNL"))== 0)                 /* %NL : NewLine */
-            {
-              BufPutChar ('\n');
-              i += strlen("NOTABNL");
-            } else
-              if (strncmp(&(str[i]),"TAB", strlen("TAB"))== 0)               /* %TAB : Tab */
-                {
-              BufPutString ("      ",0); /* cychen */
-              i += strlen("TAB");
-            } else
-              if (strncmp(&(str[i]),"PUTTAB", strlen("PUTTAB"))== 0)               /* %TAB : Tab */
-                {
-                  int j;
-		  int k=0;     
-                  if (!Get_Flag_val("(NO_NL)",&k)) 
-		      for (j = 0; j < TabNumber; j++)
-                	if (j>0)
-                          BufPutString ("   ",0);
-                	else
-                          BufPutString ("      ",0); /* cychen */
-                  i += strlen("PUTTAB");
-                } else
-		if (strncmp(&(str[i]),"CHPFTAB", strlen("CHPFTAB"))== 0)               /* %TAB : Tab */
-                {
-                  int j;
-		  BufPutString ("!HPF$",0);
-                  for (j = 0; j < TabNumber; j++)
-                    if (j>0)
-                      BufPutString ("   ",0);
-                    else
-                      BufPutString ("      ",0);
-		      Buf_pointer-=6;
-                  i += strlen("CHPFTAB");
-                } else
-		if (strncmp(&(str[i]),"GETRED", strlen("GETRED"))== 0)               /* %TAB : Tab */
-                {
-		  if (FindRedInExpr(BIF_LL1(bif),BIF_LL2 (bif)))
-			{
-			if (BIF_LL1(bif)&&NODE_SYMB(BIF_LL1(bif))&&(!IS_DISTRIBUTE_ARRAY(NODE_SYMB(BIF_LL1(bif))))&&(!SYMB_DOVAR(NODE_SYMB(BIF_LL1(bif)))))
-				{
-				BufPutString("Reduction var :",0);
-				Tool_Unparse2_LLnode(BIF_LL1(bif));
-				BufPutString("\n",0);
-				if (!FindInNewList(NewSpecList,BIF_LL1(bif)))
-				  if(!FindInNewList(ReductionList,BIF_LL1(bif)))
-				   {		
-				   ReductionList=AddToReductionList(ReductionList,BIF_LL1(bif));
-				   BufPutString("Reduction LIST :",0);
-				   Tool_Unparse2_LLnode(ReductionList);
-				   BufPutString("\n",0);
-                                   }
-				}
-			}
-                  i += strlen("GETRED");
-                } else
-		if (strncmp(&(str[i]),"INSERT_REDUCTION", strlen("INSERT_REDUCTION"))== 0)         /* %CHECK_HEAP : Pointer HEAP(PA) -> PA */
-		{
-		  if (ReductionList)
-		     {
-                      BufPutString("MY_REDUCTION (",0);
- 		      Tool_Unparse2_LLnode(ReductionList);
-                      BufPutString(")",0);
-		      ReductionList=FreeReductionList(ReductionList);
-		      /*if (NewSpecList)  free(NewSpecList);*/
-		     }			
-		  i += strlen("INSERT_REDUCTION");
-		} else
-		if (strncmp(&(str[i]),"CHPFCONTTAB", strlen("CHPFCONTTAB"))== 0)               /* %TAB : Tab */
-                {
-                  int j;
-		  BufPutString ("\n!HPF$*",0);
-                  for (j = 0; j < TabNumber; j++)
-                    if (j>0)
-                      BufPutString ("   ",0);
-                    else
-                      BufPutString ("      ",0);
-		      Buf_pointer-=7;
-                  i += strlen("CHPFCONTTAB");
-                } else
-              if (strncmp(&(str[i]),"INCTAB", strlen("INCTAB"))== 0)               /* increment tab */
-            {
-              TabNumber++;              
-              i += strlen("INCTAB");
-            }  else
-              if (strncmp(&(str[i]),"DECTAB", strlen("DECTAB"))== 0)               /*deccrement tab */
-            {
-	      if (Check_Lang_Fortran(cur_proj))
-		{
-		  if (TabNumber>1)
-		    TabNumber--;              
-		} else
-		  TabNumber--; 
-              i += strlen("DECTAB");
-            }  else
-          if (strncmp(&(str[i]),"IF", strlen("IF"))== 0)                 /* %IF : If ; syntax : %IF (condition) then_bloc [%ELSE else_bloc] %ENDIF */
-            {
-              i += strlen("IF");
-              i += Eval_Bif_Condition(&(str[i]), bif);
-            } else
-          if (strncmp(&(str[i]),"ELSE", strlen("ELSE"))== 0)             /* %ELSE : Else */
-            {
-              i += strlen("ELSE");
-              i += SkipToEndif(&(str[i]));  /* skip to the corresponding endif */
-            } else
-          if (strncmp(&(str[i]),"ENDIF", strlen("ENDIF"))== 0)           /* %ENDIF : End of If */
-            {
-              i += strlen("ENDIF");
-            } else
-          if (strncmp(&(str[i]),"BLOB1", strlen("BLOB1"))== 0)           /* %BLOB1 : All Blob 1 */
-            {
-              PTR_BLOB blob;
-              for (blob = BIF_BLOB1(bif);blob; blob = BLOB_NEXT (blob))
-                {
-		    Tool_Unparse_Bif(BLOB_VALUE(blob));
-                }
-              i += strlen("BLOB1");
-            } else
-          if (strncmp(&(str[i]),"BLOB2", strlen("BLOB2"))== 0)           /* %BLOB2 : All Blob 2 */
-            {
-              PTR_BLOB blob;
-
-              for (blob = BIF_BLOB2(bif);blob; blob = BLOB_NEXT (blob))
-                {
-                  Tool_Unparse_Bif(BLOB_VALUE(blob));
-                }
-              i += strlen("BLOB2");
-            } else
-          if (strncmp(&(str[i]),"LL1", strlen("LL1"))== 0)               /* %LL1 : Low Level Node 1 */
-            {
-              Tool_Unparse2_LLnode(BIF_LL1(bif));
-              i += strlen("LL1");
-            } else
-          if (strncmp(&(str[i]),"LL2", strlen("LL2"))== 0)               /* %LL2 : Low Level Node 2 */
-            {
-              Tool_Unparse2_LLnode (BIF_LL2 (bif));
-              i += strlen("LL2");
-            } else
-          if (strncmp(&(str[i]),"LL3", strlen("LL3"))== 0)               /* %LL3 : Low Level Node 3 */
-            {
-              Tool_Unparse2_LLnode(BIF_LL3(bif));
-              i += strlen("LL3");
-            } else
-          if (strncmp(&(str[i]),"L2L2", strlen("L2L2"))== 0)          /* %L2L2 : Low Level Node 2 of Low Level Node 2 */
-            {
-              if (BIF_LL2 (bif))
-                Tool_Unparse2_LLnode (NODE_TEMPLATE_LL2 (BIF_LL2 (bif)));
-              i += strlen("L2L2");
-            } else
-          if (strncmp(&(str[i]),"FUNHD", strlen("FUNHD"))== 0)         /* %FUNHD track down a function header */
-	    {
-	       PTR_LLND p;
-               p = BIF_LL1(bif);
-	       while(p && NODE_CODE(p) != FUNCTION_REF) p = NODE_OPERAND0(p);
-	       if(p == NULL) printf("unparse error in FUNHD!!\n");
-	       else Tool_Unparse2_LLnode(p);
-              i += strlen("FUNHD");
-	    } else
-          if (strncmp(&(str[i]),"SYMBIDFUL", strlen("SYMBIDFUL"))== 0)         /* %SYMBID : Symbol identifier */
-            {
-	      if (BIF_SYMB(bif) && SYMB_MEMBER_BASENAME(BIF_SYMB(bif)))
-		{
-		  Tool_Unparse_Symbol(SYMB_MEMBER_BASENAME(BIF_SYMB(bif)));
-		  BufPutString("::",0);
-		}
-              Tool_Unparse_Symbol(BIF_SYMB(bif));
-              i += strlen("SYMBIDFUL");
-            } else
-	  if (strncmp(&(str[i]),"SYMBID", strlen("SYMBID"))== 0)         /* %SYMBID : Symbol identifier */
-            {
-              Tool_Unparse_Symbol(BIF_SYMB(bif));
-              i += strlen("SYMBID");
-            } else
-          if (strncmp(&(str[i]),"SYMBSCOPE", strlen("SYMBSCOPE"))== 0)         /* %SYMBSCOPE : Symbol identifier */
-            {
-	      if (BIF_SYMB(bif) && SYMB_MEMBER_BASENAME(BIF_SYMB(bif)))
-		{
-		  Tool_Unparse_Symbol(SYMB_MEMBER_BASENAME(BIF_SYMB(bif)));
-		}
-              i += strlen("SYMBSCOPE");
-            } else
-          if (strncmp(&(str[i]),"SYMBDC", strlen("SYMBDC"))== 0)         /* %SYMBSCOPE : Symbol identifier */
-            {
-	      if (BIF_LL3(bif) ||
-                 (BIF_SYMB(bif) && SYMB_MEMBER_BASENAME(BIF_SYMB(bif))))
-		{
-		  BufPutString("::",0);
-		}
-              i += strlen("SYMBDC");
-            } else
-	      
-          if (strncmp(&(str[i]),"STATENO", strlen("STATENO"))== 0)       /* %STATENO : Statement number */
-            {
-              if (BIF_LABEL_USE (bif))
-                {
-		    BufPutInt ((int)(LABEL_STMTNO (BIF_LABEL_USE (bif))));
-                }
-              i += strlen("STATENO");
-            } else
-              if (strncmp(&(str[i]),"LABELENDIF", strlen("LABELENDIF"))== 0)       /* %STATENO : Statement number */
-                {
-                  PTR_BFND temp;
-                  PTR_BLOB blob;
-
-                  temp = NULL;
-                  if (!BIF_BLOB2(bif))
-                    blob = BIF_BLOB1(bif);
-                  else
-                     blob = BIF_BLOB2(bif);
-                  for (;blob; blob = BLOB_NEXT (blob))
-                    {
-                      temp = BLOB_VALUE(blob);
-                      if (temp && (BIF_CODE(temp) == CONTROL_END))
-                        {
-                          if (BIF_LABEL(temp))
-                            break;
-                        }
-                      temp = NULL;
-                    }
-                  if (temp && BIF_LABEL(temp))
-                    {
-                      BufPutInt ((int)(LABEL_STMTNO (BIF_LABEL(bif))));
-                    }
-              i += strlen("LABELENDIF");
-            } else
-          if (strncmp(&(str[i]),"LABNAME", strlen("LABNAME")) == 0)  /* %LABNAME for C labels: added by dbg */
-           {
-              if(BIF_LABEL_USE(bif)){
-                if(LABEL_SYMB(BIF_LABEL_USE(bif)))
-			BufPutString (SYMB_IDENT(LABEL_SYMB(BIF_LABEL_USE(bif))), 0);
-                else printf("label-symbol error\n");
-              } else printf("label error\n");
-             i += strlen("LABNAME");
-           } else
-          if (strncmp(&(str[i]),"LABEL", strlen("LABEL"))== 0)       /* %STATENO : Statement number */
-                {
-              if (BIF_LABEL(bif))
-                {
-		/*if (BIF_CP(bif)&&(BIF_CODE(BIF_CP(bif))==FOR_NODE)&&
-		    (HPF_VERSION==2))
-		        {
-			AfterDOLabel=1;
-			if (BIF_LABEL_USE(BIF_CP(bif))&&
-			   (LABEL_STMTNO (BIF_LABEL(bif))!=LABEL_STMTNO (BIF_LABEL_USE(BIF_CP(bif)))))
-				BufPutInt ((int)(LABEL_STMTNO (BIF_LABEL(bif))));
-			else if (!BIF_LABEL_USE(BIF_CP(bif)))
-				BufPutInt ((int)(LABEL_STMTNO (BIF_LABEL(bif))));
-			}
-		else21052001*/
-                /*BufPutInt (LABEL_STMTNO (BIF_LABEL(bif)));*/
-		if (BIF_CP(bif)&&(BIF_CODE(BIF_CP(bif))==FOR_NODE)&&
-		    (HPF_VERSION==2))
-		        {
-			AfterDOLabel=1;
-			if (BIF_LABEL_USE(BIF_CP(bif))&&
-			   (LABEL_STMTNO (BIF_LABEL(bif))!=LABEL_STMTNO (BIF_LABEL_USE(BIF_CP(bif)))))
-				BufPutInt ((int)(LABEL_STMTNO (BIF_LABEL(bif))));
-			else if (!BIF_LABEL_USE(BIF_CP(bif)))
-				BufPutInt ((int)(LABEL_STMTNO (BIF_LABEL(bif))));
-			}
-		else
-                BufPutInt ((int)(LABEL_STMTNO (BIF_LABEL(bif))));
-                }
-              i += strlen("LABEL");
-            } else
-          if (strncmp(&(str[i]),"SYMBTYPE", strlen("SYMBTYPE"))== 0)     /* SYMBTYPE : Type of Symbol */
-            {
-              if (BIF_SYMB (bif) && SYMB_TYPE (BIF_SYMB (bif)))
-		{
-		  if (Check_Lang_Fortran(cur_proj))
-                  BufPutString ( ftype_name [type_index (TYPE_CODE (SYMB_TYPE (BIF_SYMB (bif))))],0);
-		  else if((SYMB_ATTR(BIF_SYMB(bif)) & OVOPERATOR ) == 0){
-			PTR_LLND el;
-                        el = BIF_LL1(bif);
-			if((BIF_CODE(BIF_CP(bif)) == TEMPLATE_FUNDECL) &&
-			    el && NODE_TYPE(el))
-			    Tool_Unparse_Type(NODE_TYPE(el));
-			else
-		           Tool_Unparse_Type(SYMB_TYPE (BIF_SYMB (bif)));
-			}
-		}
-              i += strlen("SYMBTYPE");
-            } else
-          if (strncmp(&(str[i]),"CNSTF", strlen("CNSTF"))== 0)    /* for const functions */
-           {
-              PTR_SYMB symb;
-              if (BIF_SYMB (bif)){
-                symb = BIF_SYMB (bif);
-	        /* if(SYMB_TEMPLATE_DUMMY8(symb) & 64) BufPutString(" const",0); */
-		}
-	      i += strlen("CNSTF");
-             } else        
-          if (strncmp(&(str[i]),"VARLISTTY", strlen("VARLISTTY"))== 0)       /* %VARLIST : list of variables / parameters */
-            {
-              PTR_SYMB symb;
-              if (BIF_SYMB (bif))
-                symb = SYMB_FUNC_PARAM (BIF_SYMB (bif));
-              else
-                symb = NULL;
-              while (symb)
-                {
-		  Tool_Unparse_Type (SYMB_TYPE(symb));
-		  BufPutString (" ",0);
-                  BufPutString ( SYMB_IDENT (symb),0);
-                  symb = SYMB_NEXT_DECL (symb);
-                  if (symb) BufPutString (", ",0);
-                }
-              i += strlen("VARLISTTY");
-            } else
-          if (strncmp(&(str[i]),"TMPLARGS", strlen("TMPLARGS"))== 0)       
-            {
-              PTR_SYMB symb;
-	      PTR_LLND args, arg_item, t;
-	      PTR_TYPE typ;
-              if(BIF_CODE(bif) == FUNC_HEDR) args = BIF_LL3(bif);
-              else args = BIF_LL1(bif);
-              while (args )
-                      { 
-                        int typflag;
-			arg_item = NODE_OPERAND0(args);
-			if(arg_item == NULL) printf("MAJOR TEMPLATE UNPARSE ERROR. contact dbg \n");
-			t = arg_item;
-                        typflag = 1;
-			while(t && typflag){
-                           if((NODE_CODE(t) == VAR_REF) || (NODE_CODE(t) == ARRAY_REF))
-                                    typflag = 0;
-                           else if (NODE_CODE(t) == SCOPE_OP) t = NODE_OPERAND1(t);
-                           else  t = NODE_OPERAND0(t);
-                           } 
- 			if(t){
-			      symb = NODE_SYMB(t); 
-			      typ = NODE_TYPE(t);
-			      if(typ == NULL) typ = SYMB_TYPE(symb);
-			      if((int)strlen(symb->ident) > 0){ /* special case for named arguments */
-                                 typflag = 1;
-			         while(typ && typflag){
-                                          if(TYPE_CODE(typ) == T_ARRAY || 
-				             TYPE_CODE(typ) == T_FUNCTION ||
-			                     TYPE_CODE(typ) == T_REFERENCE ||
-				             TYPE_CODE(typ) == T_POINTER) typ = TYPE_BASE(typ);
-				          else 	if(TYPE_CODE(typ) == T_MEMBER_POINTER)
-                                                      typ = TYPE_COLL_BASE(typ);
-					  else typflag = 0;
-				          } 
-                                 }
-			      else BufPutString("class ", 0); 
-                              Tool_Unparse_Type (typ);
-                              BufPutString (" ",0);
-			   }
-			/* else printf("could not find var ref!\n"); */
-                        Tool_Unparse2_LLnode(arg_item);
-			args = NODE_OPERAND1(args);
-                        if (args) BufPutString (", ",0);
-                      }
-              i += strlen("TMPLARGS");
-            } else
-          if (strncmp(&(str[i]),"CONSTRU", strlen("CONSTRU"))== 0)       
-            {
-              PTR_LLND ll;
-              if (BIF_LL1(bif))
-                {
-                  ll = NODE_OPERAND0(BIF_LL1(bif));
-                  if (ll)
-                    ll = NODE_OPERAND1(ll);
-                  if (ll)
-                    {
-                      BufPutString (":",0);
-                      Tool_Unparse2_LLnode(ll);
-                    }
-                }
-              i += strlen("CONSTRU");
-            } else
-	  if (strncmp(&(str[i]),"L1SYMBID", strlen("L1SYMBID"))== 0)     /* %L1SYMBID : Symbol of Low Level Node 1 */
-            {
-              if (BIF_LL1 (bif))
-                  Tool_Unparse_Symbol (NODE_SYMB (BIF_LL1 (bif)));
-              i += strlen("L1SYMBID");
-            } else
-          if (strncmp(&(str[i]),"VARLIST", strlen("VARLIST"))== 0)       /* %VARLIST : list of variables / parameters */
-            {
-              PTR_SYMB symb;
-              if (BIF_SYMB (bif))
-                symb = SYMB_FUNC_PARAM (BIF_SYMB (bif));
-              else
-                symb = NULL;
-              while (symb)
-                {
-                  BufPutString ( SYMB_IDENT (symb),0);
-                  symb = SYMB_NEXT_DECL (symb);
-                  if (symb) BufPutString (", ",0);
-                }
-              i += strlen("VARLIST");
-            } else
-	  if (strncmp(&(str[i]),"DELETE_COMMA", strlen("DELETE_COMMA"))== 0)         /* %CHECK_HEAP : Pointer HEAP(PA) -> PA */
-	    {
-	    if (Buf_address[Buf_pointer-1]==',') 
-	      Buf_pointer--;
-	    i += strlen("DELETE_COMMA");
-	     } else
-	    if (strncmp(&(str[i]),"TASKERROR0", strlen("TASKERROR0"))== 0)
-            {
-	    /*Message("Error in block-task-region\n end-task-region-directive: CDVM$ END TASK_REGION is missing before TASK_REGION construct.",BIF_LINE(bif));*/
-	    fprintf(stderr,"Error 210 on line %d of %s : End-task-region-directive: CDVM$ END TASK_REGION is missing before TASK_REGION construct\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-	    errnumber++;
-	    i += strlen("TASKERROR0");
-            } else
-	    if (strncmp(&(str[i]),"TASKERROR1", strlen("TASKERROR1"))== 0)
-            {
-	    /*Message("Error in block-task-region\n task-region-directive: CDVM$ TASK_REGION is missing before on-block.",BIF_LINE(bif));*/
-	    fprintf(stderr,"Error 211 on line %d of %s : CDVM$ TASK_REGION is missing before on-block \n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-	    errnumber++;
-	    i += strlen("TASKERROR1");
-            } else
-	    if (strncmp(&(str[i]),"TASKERROR2", strlen("TASKERROR2"))== 0)
-            {
-	    /*Message("Error in block-task-region\n task-region-directive: CDVM$ TASK_REGION is missing before end-on-directive.",BIF_LINE(bif));*/
-	    fprintf(stderr,"Error 212 on line %d of %s : CDVM$ TASK_REGION is missing before end-on-directive \n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-	    errnumber++;
-	    i += strlen("TASKERROR2");
-            } else
-	    if (strncmp(&(str[i]),"TASKERROR3", strlen("TASKERROR3"))== 0)
-            {
-	    /*Message("Error in block-task-region\n end-task-region-directive: CDVM$ END TASK_REGION is missing before end of program.",BIF_LINE(bif));*/
-	    fprintf(stderr,"Error 213 on line %d of %s : End-task-region-directive: CDVM$ END TASK_REGION is missing before end of program\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-	    errnumber++;
-	    i += strlen("TASKERROR3");
-            } else
-	    if (strncmp(&(str[i]),"TASKERROR4", strlen("TASKERROR4"))== 0)
-            {
-	    /*Message("Error in block-task-region\n task-region-directive: CDVM$ TASK_REGION is missing before end-task-region-directive.",BIF_LINE(bif));*/
-	    fprintf(stderr,"Error 214 on line %d of %s : End-task-region-directive: CDVM$ TASK_REGION is missing before end-task-region-directive\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-	    errnumber++;
-	    i += strlen("TASKERROR4");
-            } else    
-	    if (strncmp(&(str[i]),"ONERROR", strlen("ONERROR"))== 0)
-            {
-            if (On_count)
-		{
-		fprintf(stderr,"Error 215 on line %d of %s : Error in TASK_REGION construct\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-		fprintf(stderr,"Warning 216 on line %d of %s : Incorrect number of ON and END_ON directives\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-		errnumber++;
-		/*Message("Error in TASK_REGION construct\nThis may be due to incorrect number of ON and END_ON directives.",BIF_LINE(bif));*/
-		On_count=0;
-		}    
-	    i += strlen("ONERROR");
-            } else
-	    if (strncmp(&(str[i]),"HPF1_POINTER", strlen("HPF1_POINTER"))== 0)
-            {
-	    /*Message("Error in DVM_POINTER_DIR\n Can`t work this pointers in HPF1.",BIF_LINE(bif));*/
-	    fprintf(stderr,"Error 197 on line %d of %s : Can`t work this pointers in HPF1\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-	    errnumber++;
-	    i += strlen("HPF1_POINTER");
-            } else    	    
-	    if (strncmp(&(str[i]),"ONPLUS", strlen("ONPLUS"))== 0)
-        	{
-        	int k=0;
-		On_count++;
-		Treat_Flag("(ON_REGION)",&k,1);
-		i += strlen("ONPLUS");
-        	} 
-	    else
-	    if (strncmp(&(str[i]),"ONMINUS", strlen("ONMINUS"))== 0)
-        	{
-        	int k=0;
-		On_count--;
-		Treat_Flag("(ON_REGION)",&k,-1);
-	        i += strlen("ONMINUS");
-        	} 
-	    else
-	    if (strncmp(&(str[i]),"ONINIT", strlen("ONINIT"))== 0)
-        	{
-        	On_count=0;
-		i += strlen("ONINIT");
-        	} 
-	    else
-	    if (strncmp(&(str[i]),"RESETID", strlen("RESETID"))== 0)
-        	{
-        	ResetSymbolId();
-		i += strlen("RESETID");
-        	} 
-	    else
-	      if (strncmp(&(str[i]),"CHANGE_TABNUMBER", strlen("CHANGE_TABNUMBER"))== 0)
-		{
-		  int count=0,label;
-		  count=NumberOfForNode(bif,&label);
-		  if(count)
-		      TabNumber-=count;
-		  if (TabNumber<1) TabNumber=1;
-		  i += strlen("CHANGE_TABNUMBER");
-		}
-	    else
-	      if (strncmp(&(str[i]),"FIND_DO", strlen("FIND_DO"))== 0)       /* %FIND_DO : We need to find the corresponding FOR_NODE for CONT_STAT*/
-		{
-		  i += strlen("FIND_DO");
-		  /*21052001if (UnparseEndofCircle(bif))
-		  	return Buf_address;*/
-		if (UnparseEndofCircle(bif))
-		  	return Buf_address;
-		} else
-	      if (strncmp(&(str[i]),"SAVE", strlen("SAVE"))== 0)
-		{
-		  Pointer=Buf_pointer;
-		  i += strlen("SAVE");
-		} else
-	      if (strncmp(&(str[i]),"LOAD", strlen("LOAD"))== 0)
-		{
-		  Buf_pointer=Pointer;
-		  i += strlen("LOAD");
-		} else
-          if (strncmp(&(str[i]),"FIND_MAP", strlen("FIND_MAP"))== 0)       /* %FIND_MAP : We need to find the corresponding MAP_DIR*/
-            {
-              PTR_LLND llnd;
-	      if (BIF_LL1(bif))
-                {
-                  llnd=FindMapDir(BIF_LL1(bif),bif);
-                  if (llnd)
-                    {
-                      Tool_Unparse2_LLnode(llnd);
-                    }
-		  else  
-		    {
-		      /*Message ("Error in Unparse, can`t find a corresponding MAP_DIR", BIF_LINE(bif));*/
-		      fprintf(stderr,"Error 195 on line %d of %s : Can`t find a corresponding MAP_DIR\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-		      errnumber++;
-		      Tool_Unparse2_LLnode(BIF_LL1(bif));
-		    }
-		}
-              i += strlen("FIND_MAP");
-            } else
-	    if (strncmp(&(str[i]),"CHECK_REDISTRIBUTE_DIR", strlen("CHECK_REDISTRIBUTE_DIR"))== 0)       /* %FIND_MAP : We need to find the corresponding MAP_DIR*/
-            {
-              PTR_LLND llnd;
-	      if (BIF_LL1(bif))
-                {
-                  for (llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-                      if (FindRedistributeDir(NODE_OPERAND0(llnd),bif))
-                	 {
-			    if (!FindDynamicDir(NODE_OPERAND0(llnd),bif))
-			     {
-			     BufPutString("!HPF$",0);
-			     Puttab();
-			     Buf_pointer-=5;
-			     BufPutString("DYNAMIC ",0);
-			     Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-			     BufPutString("\n",0);
-			     }
-			 }
-                 }
-              i += strlen("CHECK_REDISTRIBUTE_DIR");
-            } else
-	    if (strncmp(&(str[i]),"CHECK_REALIGN_DIR", strlen("CHECK_REALIGN_DIR"))== 0)       /* %FIND_MAP : We need to find the corresponding MAP_DIR*/
-            {
-              PTR_LLND llnd;
-	      if (BIF_LL1(bif))
-                {
-                  for (llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-                      if (FindRealignDir(NODE_OPERAND0(llnd),bif))
-                	 {
-			    if (!FindDynamicDir(NODE_OPERAND0(llnd),bif))
-			     {
-			     BufPutString("!HPF$",0);
-			     Puttab();
-			     Buf_pointer-=5;
-			     BufPutString("DYNAMIC ",0);
-			     Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-			     BufPutString("\n",0);
-			     }
-			 }
-                 }
-              i += strlen("CHECK_REALIGN_DIR");
-            } else
-	    if (strncmp(&(str[i]),"CHECK_FORMAT_NULL", strlen("CHECK_FORMAT_NULL"))== 0)       /* %FIND_MAP : We need to find the corresponding MAP_DIR*/
-            {
-	      if (BIF_LL1(bif))
-                {
-		if (!BIF_LL2(bif)&&!BIF_LL3(bif))	     
-		    {
-		    BufPutString("!HPF$",0);
-		    Puttab();
-		    Buf_pointer-=5;
-    		    BufPutString("DYNAMIC ",0);
-		    Tool_Unparse2_LLnode(BIF_LL1(bif));
-            	    BufPutString("\n",0);
-		    return Buf_address;
-		    }
-		}
-              i += strlen("CHECK_FORMAT_NULL");
-            } else
-	    if (strncmp(&(str[i]),"CHECK_DVMBIT", strlen("CHECK_DVMBIT"))== 0)       /* %FIND_MAP : We need to find the corresponding MAP_DIR*/
-            {
-	      if (BIF_LL1(bif))
-                {
-		PTR_LLND ptr;
-		if (BIF_CODE(bif)==DVM_ALIGN_DIR)
-		    {
-		    for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if (SYMB_ID(NODE_SYMB(llnd))==ALREADY_ALIGN_BIT)
-			    {
-			    fprintf(stderr,"Error 200 on line %d of %s:Object '%s' already has ALIGN_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else SYMB_ID(NODE_SYMB(llnd))=ALREADY_ALIGN_BIT;
-			}
-		    }
-		if (BIF_CODE(bif)==HPF_PROCESSORS_STAT)
-		    {
-		    for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if (SYMB_ID(NODE_SYMB(llnd))==ALREADY_PROCESSORS_BIT)
-			    {
-			    fprintf(stderr,"Error 201 on line %d of %s :Object '%s' already has PROCESSORS_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else SYMB_ID(NODE_SYMB(llnd))=ALREADY_PROCESSORS_BIT;
-			}
-		    }
-		    
-		if (BIF_CODE(bif)==DVM_DISTRIBUTE_DIR)
-		    {
-		    for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if (SYMB_ID(NODE_SYMB(llnd))==ALREADY_DISTRIBUTE_BIT)
-			    {
-			    fprintf(stderr,"Error 202 on line %d of %s :Object '%s' already has DISTRIBUTE_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else SYMB_ID(NODE_SYMB(llnd))=ALREADY_DISTRIBUTE_BIT;
-			}
-		    }
-		if (BIF_CODE(bif)==HPF_TEMPLATE_STAT)
-		    {
-		    for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if (SYMB_ID(NODE_SYMB(llnd))==ALREADY_TEMPLATE_BIT)
-			    {
-			    fprintf(stderr,"Error 203 on line %d of %s :Object '%s' already has TEMPLATE_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else SYMB_ID(NODE_SYMB(llnd))=ALREADY_TEMPLATE_BIT;
-			}
-		    }
-		if (BIF_CODE(bif)==DVM_INHERIT_DIR)
-		    {
-		    for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if (SYMB_ID(NODE_SYMB(llnd))==ALREADY_INHERIT_BIT)
-			    {
-			    fprintf(stderr,"Error 204 on line %d of %s :Object '%s' already has INHERIT_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else SYMB_ID(NODE_SYMB(llnd))=ALREADY_INHERIT_BIT;
-			}
-		    }
-		if (BIF_CODE(bif)==DVM_DYNAMIC_DIR)
-		    {
-		    for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if (SYMB_ID(NODE_SYMB(llnd))==ALREADY_DYNAMIC_BIT)
-			    {
-			    fprintf(stderr,"Error 205 on line %d of %s :Object '%s' already has DYNAMIC_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else SYMB_ID(NODE_SYMB(llnd))=ALREADY_DYNAMIC_BIT;
-			}
-		    }
-		if (BIF_CODE(bif)==DVM_SHADOW_DIR)
-		    {
-		    for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if (SYMB_ID(NODE_SYMB(llnd))==ALREADY_SHADOW_BIT)
-			    {
-			    fprintf(stderr,"Error 206 on line %d of %s :Object '%s' already has SHADOW_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else SYMB_ID(NODE_SYMB(llnd))=ALREADY_SHADOW_BIT;
-			}
-		    }
-		if (BIF_CODE(bif)==DVM_TASK_DIR)
-		    {
-		    for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if (SYMB_ID(NODE_SYMB(llnd))==ALREADY_TASK_BIT)
-			    {
-			    fprintf(stderr,"Error 207 on line %d of %s :Object '%s' already has TASK_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else SYMB_ID(NODE_SYMB(llnd))=ALREADY_TASK_BIT;
-			}
-		    }
-		if (BIF_CODE(bif)==DVM_POINTER_DIR)
-		    {
-		    for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if (SYMB_ID(NODE_SYMB(llnd))==ALREADY_DVM_POINTER_BIT)
-			    {
-			    fprintf(stderr,"Error 208 on line %d of %s :Object '%s' already has DVM_POINTER_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else SYMB_ID(NODE_SYMB(llnd))=ALREADY_DVM_POINTER_BIT;
-			}
-		    }
-		if (BIF_CODE(bif)==DVM_VAR_DECL)
-		    {
-			PTR_LLND ptr_llnd;
-			int BIT=0;
-			for(ptr_llnd=BIF_LL3(bif);ptr_llnd&&(NODE_CODE(ptr_llnd)==EXPR_LIST);ptr_llnd=NODE_OPERAND1(ptr_llnd))
-			    {
-			    if (NODE_CODE(NODE_OPERAND0(ptr_llnd))==DISTRIBUTE_OP) 
-				BIT|=ALREADY_DISTRIBUTE_BIT;
-			    if (NODE_CODE(NODE_OPERAND0(ptr_llnd))==PROCESSORS_OP) 
-				BIT|=ALREADY_PROCESSORS_BIT;
-    			    if (NODE_CODE(NODE_OPERAND0(ptr_llnd))==ALIGN_OP) 
-				{
-				BIT|=ALREADY_ALIGN_BIT;
-				}
-			    if (NODE_CODE(NODE_OPERAND0(ptr_llnd))==TEMPLATE_OP) 
-				{
-				BIT|=ALREADY_TEMPLATE_BIT;
-				}
-    			    if (NODE_CODE(NODE_OPERAND0(ptr_llnd))==SHADOW_OP) 
-				{
-				BIT|=ALREADY_SHADOW_BIT;
-				}
-    			    if (NODE_CODE(NODE_OPERAND0(ptr_llnd))==DYNAMIC_OP) 
-				{
-				BIT|=ALREADY_DYNAMIC_BIT;
-				}
-			    }
-		    for(ptr=BIF_LL1(bif);BIT&&ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-			{
-			PTR_LLND llnd=NODE_OPERAND0(ptr);
-			if (!llnd||(NODE_CODE(llnd)!=ARRAY_REF)) break;
-			if ((BIT&ALREADY_DYNAMIC_BIT)&&(SYMB_ID(NODE_SYMB(llnd))==ALREADY_DYNAMIC_BIT))
-			    {
-			    fprintf(stderr,"Error 205 on line %d of %s :Object '%s' already has DYNAMIC_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else 
-			    if (BIT&ALREADY_DYNAMIC_BIT) SYMB_ID(NODE_SYMB(llnd))=ALREADY_DYNAMIC_BIT;
-			if ((BIT&ALREADY_PROCESSORS_BIT)&&(SYMB_ID(NODE_SYMB(llnd))==ALREADY_PROCESSORS_BIT))
-			    {
-			    fprintf(stderr,"Error 201 on line %d of %s :Object '%s' already has PROCESSORS_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else 
-			    if (BIT&ALREADY_PROCESSORS_BIT) SYMB_ID(NODE_SYMB(llnd))=ALREADY_PROCESSORS_BIT;    
-			if ((BIT&ALREADY_SHADOW_BIT)&&(SYMB_ID(NODE_SYMB(llnd))==ALREADY_SHADOW_BIT))
-			    {
-			    fprintf(stderr,"Error 206 on line %d of %s :Object '%s' already has SHADOW_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else 
-			    if (BIT&ALREADY_SHADOW_BIT) SYMB_ID(NODE_SYMB(llnd))=ALREADY_SHADOW_BIT;
-			if ((BIT&ALREADY_TEMPLATE_BIT)&&(SYMB_ID(NODE_SYMB(llnd))==ALREADY_TEMPLATE_BIT))
-			    {
-			    fprintf(stderr,"Error 203 on line %d of %s :Object '%s' already has TEMPLATE_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else 
-			    if (BIT&ALREADY_TEMPLATE_BIT) SYMB_ID(NODE_SYMB(llnd))=ALREADY_TEMPLATE_BIT;
-			if ((BIT&&ALREADY_ALIGN_BIT)&&(SYMB_ID(NODE_SYMB(llnd))==ALREADY_ALIGN_BIT))
-			    {
-			    fprintf(stderr,"Error 200 on line %d of %s :Object '%s' already has ALIGN_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else 
-			    if (BIT&ALREADY_ALIGN_BIT) SYMB_ID(NODE_SYMB(llnd))=ALREADY_ALIGN_BIT;
-			if ((BIT&ALREADY_DISTRIBUTE_BIT)&&(SYMB_ID(NODE_SYMB(llnd))==ALREADY_DISTRIBUTE_BIT))
-			    {
-			    fprintf(stderr,"Error 202 on line %d of %s :Object '%s' already has DISTRIBUTE_BIT\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name,SYMB_IDENT(NODE_SYMB(llnd)));
-			    errnumber++;
-			    }
-			else 
-			    if (BIT&ALREADY_DISTRIBUTE_BIT) SYMB_ID(NODE_SYMB(llnd))=ALREADY_DISTRIBUTE_BIT;
-			}
-		    }
-		}
-              i += strlen("CHECK_DVMBIT");
-            } else
-	    if (strncmp(&(str[i]),"CHECK_COMBINED_DIR", strlen("CHECK_COMBINED_DIR"))== 0)       /* %FIND_MAP : We need to find the corresponding MAP_DIR*/
-            {
-              PTR_LLND llnd;
-	      if (BIF_LL1(bif))
-                {
-                  for (llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-                      {
-		      PTR_SYMB s=SMNULL;
-		      if (NODE_CODE(NODE_OPERAND0(llnd))==ARRAY_REF)
-		          s=NODE_SYMB(NODE_OPERAND0(llnd));
-		      if (!s) continue;
-		      if(s->attr & DISTRIBUTE_BIT) 
-		          if (FindRedistributeDir(NODE_OPERAND0(llnd),bif))
-                	     {
-				if (!FindDynamicDir(NODE_OPERAND0(llnd),bif))
-			         {
-			         BufPutString("\n!HPF$",0);
-				 Puttab();
-				 Buf_pointer-=5;
-				 BufPutString("DYNAMIC ",0);
-			         Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-			         }
-			     }
-		      if(s->attr & ALIGN_BIT) 
-		          if (FindRealignDir(NODE_OPERAND0(llnd),bif))
-                	     {
-				if (!FindDynamicDir(NODE_OPERAND0(llnd),bif))
-			    	 {
-			    	 BufPutString("\n!HPF$",0);
-				 Puttab();
-				 Buf_pointer-=5;
-				 BufPutString("DYNAMIC ",0);
-			    	 Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-				 }
-			     }
-		              
-		      }
-                }
-              i += strlen("CHECK_COMBINED_DIR");
-            } else
-	    if (strncmp(&(str[i]),"CHECK_SHADOW_OP", strlen("CHECK_SHADOW_OP"))== 0)       /* %FIND_MAP : We need to find the corresponding MAP_DIR*/
-            {            
-	    if (BIF_CODE(bif)==DVM_VAR_DECL)
-		    {
-		    PTR_LLND ptr_llnd;
-		    int OpNumber=0;
-		    int Shadow=0;
-		    for(ptr_llnd=BIF_LL3(bif);ptr_llnd&&(NODE_CODE(ptr_llnd)==EXPR_LIST);ptr_llnd=NODE_OPERAND1(ptr_llnd))
-			{
-			if (NODE_CODE(NODE_OPERAND0(ptr_llnd))==SHADOW_OP)
-			    Shadow=1;
-			else  OpNumber++;
-			}
-		    if ((Shadow==1)&&!OpNumber) return Buf_address;
-		    }	
-              i += strlen("CHECK_SHADOW_OP");
-            } else	    
-	   if (strncmp(&(str[i]),"CHECK_DAC_DIR", strlen("CHECK_DAC_DIR"))== 0)       /* %CHECK_DAC_DIR : We need to find FDVM-directive that can be transformed into DYNAMIC-directive*/
-            {
-              PTR_LLND llnd;
-	      PTR_BFND ptr_bif;
-	      int pointer,beg;
-	      beg=Buf_pointer;
-	      BufPutString("!HPF$",0);
-	      Puttab();
-	      Buf_pointer-=5;
-	      BufPutString("DYNAMIC ",0);
-	      pointer=Buf_pointer;
-	      if (BIF_LL1(bif))
-                {
-		    for (llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-                      if ((ptr_bif=FindDistrAlignCombinedDir(NODE_OPERAND0(llnd),bif)))
-                	 {
-			 if (!CheckNullDistribution(ptr_bif))
-			    {
-			    Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-			    BufPutString(" ,",0);
-			    }			     
-			 }
-		    Buf_pointer--;
-		    BufPutString("\n",0);			 
-		}
-	      if (pointer==Buf_pointer) Buf_pointer=beg;
-	      return Buf_address;
-              i += strlen("CHECK_DAC_DIR");
-            } else
-	  if (strncmp(&(str[i]),"UNPARSE_ON", strlen("UNPARSE_ON"))== 0)       /* %APPEND_ON : We need to append ON clause after FOR statement in INDEPENDENT cycle for DVM_PARALLEL_TASK_DIR*/
-            {
-              PTR_LLND llnd;
-	      if (On_Clause)
-                {
-                  llnd=FindMapDir(On_Clause,bif);
-                  if (llnd)
-                    {
-                      BufPutString("!HPF$",0);
-		      Puttab();
-		      Buf_pointer-=5;
-		      BufPutString("ON ( ",0);
-		      Tool_Unparse2_LLnode(llnd);
-		      BufPutString(" ) BEGIN",0);
-                    }
-		  else  
-		    {
-		    /*Message ("Error in Unparse, can`t find a corresponding MAP_DIR for DVM_PARALLEL_TASK_DIR", BIF_LINE(bif));*/
-		    fprintf(stderr,"Error 195 on line %d of %s : Can`t find a corresponding MAP_DIR\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-		    errnumber++;  		      
-		    }
-		}
-              i += strlen("UNPARSE_ON");
-            } else
-	      if (strncmp(&(str[i]),"CHECK_ACROSS", strlen("CHECK_ACROSS"))== 0) 
-            {               
-              i = i + strlen("CHECK_ACROSS");
-	      if (CheckAcross(bif)) return Buf_address;
-            } else
-	      if (strncmp(&(str[i]),"CHECK_REDUCTION", strlen("CHECK_REDUCTION"))== 0) 
-            {               
-              i = i + strlen("CHECK_REDUCTION");
-	      if (CheckReduction(bif)) return Buf_address;
-            } else
-	      if (strncmp(&(str[i]),"FIND_REDUCTION", strlen("FIND_REDUCTION"))== 0) 
-            {               
-	      ForNodeStmt(BIF_NEXT(bif));
-              i = i + strlen("FIND_REDUCTION");
-            } else
-
-	      if (strncmp(&(str[i]),"PAR_TASK_MAP", strlen("PAR_TASK_MAP"))== 0)       /* %PAR_TASK_MAP : We need to save ON clause for DVM_PARALLEL_TASK_DIR*/
-            {
-              On_Clause=BIF_LL1(bif);
-              i += strlen("PAR_TASK_MAP");
-            } else
-	      if (strncmp(&(str[i]),"CHECK_REDISTRIBUTE_ON_MAP", strlen("CHECK_REDISTRIBUTE_ON_MAP"))== 0)       /* %CHECK_REDISTRIBUTE_ON_MAP : We need to find the corresponding MAP_DIR*/
-            {
-              PTR_LLND llnd,ptr_llnd;
-	      if (BIF_LL3(bif))
-                {
-                  ptr_llnd=ChangeRedistributeOntoTask(BIF_LL3(bif));
-		  if (ptr_llnd)
-		    {
-		      llnd=FindMapDir(ptr_llnd,bif);
-		      if (llnd)
-			{
-			  /*if (HPF_VERSION==1)
-			      Tool_Unparse_Symbol(NODE_SYMB(llnd));
-			  else  */
-			  Tool_Unparse2_LLnode(llnd);
-			}
-		      else  
-			{
-			  /*Message ("Error in Unparse, can`t find a corresponding MAP_DIR", BIF_LINE(bif));*/
-			  fprintf(stderr,"Error 195 on line %d of %s : Can`t find a corresponding MAP_DIR\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-		          errnumber++;
-			  Tool_Unparse2_LLnode(BIF_LL3(bif));
-			}
-		    }
-		  else Tool_Unparse2_LLnode(BIF_LL3(bif));
-		}
-		  i += strlen("CHECK_REDISTRIBUTE_ON_MAP");
-            } else
-          if (strncmp(&(str[i]),"CHECK_ALLOCATE", strlen("CHECK_ALLOCATE"))== 0)       /* %CHECK_ALLOCATE : We must change the allocation for DVM`s pointers*/
-            {
-              PTR_LLND llnd;
-	      if (NODE_CODE(BIF_LL2(bif))==FUNC_CALL)
-                {
-                 if (!strcmp(SYMB_IDENT(NODE_SYMB(BIF_LL2(bif))),"allocate"))
-		   if ((NODE_CODE(BIF_LL1(bif))==ARRAY_REF)&& (SYMB_ATTR(NODE_SYMB(BIF_LL1(bif)))&DVM_POINTER_BIT))
-		     {
-		       int count=0;
-		       char *str;
-		       count=FindPointerDir(NODE_SYMB(BIF_LL1(bif)),bif);
-		       if (count)
-			 {
-			   int i=0;
-			   BufPutString("ALLOCATE(", 0);
-			   Tool_Unparse2_LLnode(BIF_LL1(bif));
-			   BufPutChar('(');		       
-			   llnd=NODE_OPERAND0(BIF_LL2(bif));
-			   if (!llnd||(NODE_CODE(llnd)!=EXPR_LIST)) 
-			       {
-			       /*Message("Incorrect call of allocate function",BIF_LINE(bif));*/
-			       fprintf(stderr,"Error 196 on line %d of %s : Incorrect call of allocate function\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-		               errnumber++;
-			       BufPutString("))\n", 0);
-			       return Buf_address;
-			       };
-			   if (NODE_OPERAND0(llnd))
-			       {
-			       if (NODE_CODE(NODE_OPERAND0(llnd))==VAR_REF)
-			           {
-				     fprintf(stderr,"Error 196 on line %d of %s : Incorrect call of allocate function\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-		                     fprintf(stderr,"Warning 197 on line %d of %s : You can`t use variable as SDIM array function\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-				     errnumber++;
-			             /*Message("Incorrect call of allocate function",0);
-				     Message("You can`t use variable as SDIM array",BIF_LINE(bif));*/
-				     BufPutString("))\n", 0);
-			             return Buf_address;
-			            }
-				else 
-				    if (NODE_CODE(NODE_OPERAND0(llnd))==ARRAY_REF)
-					{
-				         int ar_index=0;
-					 PTR_LLND ptr1=LLNULL,ptr2=LLNULL;
-					 str=SYMB_IDENT(NODE_SYMB(NODE_OPERAND0(llnd)));
-					 llnd=NODE_OPERAND0(NODE_OPERAND0(llnd));
-					 if (!llnd)
-					     {
-			                       for(i=1;i<=count;i++)
-			                         {
-			                          if (i!=1) BufPutChar(',');
-			                          BufPutString(str,0);
-			                          BufPutChar('(');
-					          BufPutInt(i);
-    			                          BufPutChar(')');
-			                         }
-					       BufPutString("))\n", 0);
-			                       return Buf_address;
-			                     };
-					if (NODE_OPERAND0(llnd)) ptr1=NODE_OPERAND0(llnd);
-					if (NODE_OPERAND1(llnd)) ptr2=NODE_OPERAND0(NODE_OPERAND1(llnd));
-					if (ptr1&&!ptr2)
-					     {
-			                       /*Message("Incorrect call of allocate function",BIF_LINE(bif));*/
-			                       fprintf(stderr,"Error 196 on line %d of %s : Incorrect call of allocate function\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-				    	       errnumber++;
-					       BufPutString("))\n", 0);
-			                       return Buf_address;
-			                     };
-					 if (ptr1&&ptr2&&(NODE_CODE(ptr1)==INT_VAL)) 
-					     {
-					     ar_index=1;
-					     if(NODE_CODE(ptr2)==INT_VAL)
-					         {
-			                           fprintf(stderr,"Error 196 on line %d of %s : Incorrect call of allocate function\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-		                                   fprintf(stderr,"Warning 198 on line %d of %s : You can`t use 2 integer constants in SDIM array\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-				                   errnumber++;			             			             
-						   /*Message("Incorrect call of allocate function",0);
-						   Message("You can`t use 2 integer constants in SDIM array",BIF_LINE(bif));*/
-			                           BufPutString("))\n", 0);
-			                           return Buf_address;
-			                         };
-					     }
-					 else 
-					     if (ptr1&&ptr2&&(NODE_CODE(ptr2)==INT_VAL)) 
-					         ar_index=2;
-					     else 
-					         {
-			                           fprintf(stderr,"Error 196 on line %d of %s : Incorrect call of allocate function\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-		                                   fprintf(stderr,"Warning 199 on line %d of %s : You can`t use 2 variables in SDIM array\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-				                   errnumber++;			             			             
-						   /* Message("Incorrect call of allocate function",0);
-						   Message("You can`t use 2 variables in SDIM array",BIF_LINE(bif));*/
-			                           BufPutString("))\n", 0);
-			                           return Buf_address;
-			                         };
-					 for(i=1;(i<=count)&&ar_index;i++)
-			                 {
-			                   if (i!=1) BufPutChar(',');
-			                   BufPutString(str,0);
-			                   BufPutChar('(');
-			                   if (ar_index==1)  
-					       {
-					       BufPutInt(i);
-					       BufPutChar(',');
-					       Tool_Unparse2_LLnode(ptr2);
-					       }
-					   else   
-					       {
-					       Tool_Unparse2_LLnode(ptr1);
-					       BufPutChar(',');
-					       BufPutInt(i);
-					       }   
-			                   BufPutChar(')');
-			                 }
-			        }
-			    }	
-			   BufPutChar(')');
-			   BufPutString(")\n", 0);
-			   return Buf_address;
-			 }
-		     }
-		}
-	      else
-		if (NODE_CODE(bif)==ASSIGN_STAT) 
-		   {
-		   llnd=BIF_LL1(bif);
-		   if(((NODE_CODE(llnd)==ARRAY_REF)||(NODE_CODE(llnd)==VAR_REF))&&NODE_SYMB(llnd)&&(SYMB_ATTR(NODE_SYMB(llnd))&DVM_POINTER_BIT)) 
-		     /*		   if(SYMB_ATTR(NODE_SYMB(llnd))&DVM_POINTER_BIT)*/ 
-                      {
-		      Tool_Unparse2_LLnode(llnd);
-		      BufPutString(" => ",0);
-		      Tool_Unparse2_LLnode(BIF_LL2(bif));
-		      BufPutString("\n",0);
-		      return Buf_address;
-		      }
- 		   }	
-	      i += strlen("CHECK_ALLOCATE");
-            } else
-	        if (strncmp(&(str[i]),"CHECK_FUNC", strlen("CHECK_FUNC"))== 0)       /* %CHECK_FUNC : We must change function ALLOCATE*/
-            { 
-	      int count=0;
-	      if (NODE_SYMB(bif))
-		if (!strcmp(SYMB_IDENT(NODE_SYMB(bif)),"ALLOCATE")||
-		    !strcmp(SYMB_IDENT(NODE_SYMB(bif)),"allocate"))
-		  Treat_Flag("(COMMENT)",&count,1);
-	      i += strlen("CHECK_FUNC");
-            } else
-	      if (strncmp(&(str[i]),"DECLARATION", strlen("DECLARATION"))== 0)               /* %DECLARATION : We need to change declaration of Pointer descriptor */
-            {
-              int count=0;
-	      if (BIF_LL1(bif)) count=FindPointerDeclaration(BIF_LL1(bif));
-	      if (!count) 
-		{
-		  count=0;
-		  Treat_Flag("(POINTER)",&count, 1);
-		}
-              i += strlen("DECLARATION");
-            } else
-	   if (strncmp(&(str[i]),"DESCRIPTOR", strlen("DESCRIPTOR"))== 0)               /* %DECLARATION : We need to change declaration of Pointer descriptor */
-            {
-              PTR_LLND ptr,llnd;
-	      if (BIF_LL1(bif))
-	         {  
-	          for(ptr=BIF_LL1(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-		      {
-		      if (NODE_OPERAND0(ptr))
-		          {
-			  llnd=FindPointerDescriptor(NODE_OPERAND0(ptr),bif);
-			  if (NODE_OPERAND0(llnd)) continue;
-			  if (!llnd) 
-			      {
-			      /*Message("Can`t find a descriptor for POINTER",BIF_LINE(bif));*/
-			      fprintf(stderr,"Error 222 on line %d of %s : Can`t find a descriptor for POINTER\n",BIF_LINE(bif),BIF_FILE_NAME(bif)->name);
-			      errnumber++;			             			             
-			      Tool_Unparse2_LLnode(NODE_OPERAND0(ptr));
-			      }
-			  else Tool_Unparse2_LLnode(llnd);
-			  BufPutChar(',');
-			  }
-		       }
-		   Buf_pointer--;   	
-		 }        
-	      i += strlen("DESCRIPTOR");
-            } else
-	  if (strncmp(&(str[i]),"PTR_ARRAY", strlen("PTR_ARRAY"))== 0)               /* %DECLARATION : We need to change declaration of Pointer descriptor */
-            {
-	      if (BIF_LL1(bif))
-	         {  
-	         ArrayOfPointerDeclaration(bif);
-		 PointerDeclaration(bif);
-		 return Buf_address;
-		 }        
-	      i += strlen("PTR_ARRAY");
-            } else
-	      
-	  if (strncmp(&(str[i]),"RIDPT", strlen("RIDPT"))== 0)      
-                { 
-		  PTR_TYPE type = NULL;
-
-		  type = Find_Type_For_Bif(bif);
-		  if (type )
-		    {
-			DealWith_Rid(type, In_Class_Flag);
-		    }
-		  else if(BIF_CODE(bif) == CLASS_DECL)
-		    {
-			DealWith_Rid(SYMB_TYPE(BIF_SYMB(bif)), In_Class_Flag);
-		    } 
-                  i += strlen("RIDPT");
-                } else
-          if (strncmp(&(str[i]),"INCLASSON", strlen("INCLASSON"))== 0)   
-            {
-              In_Class_Flag = 1;
-              i += strlen("INCLASSON");
-            } else
-          if (strncmp(&(str[i]),"INCLASSOFF", strlen("INCLASSOFF"))== 0) 
-            {
-              In_Class_Flag = 0;
-              i += strlen("INCLASSOFF");
-            } else
-          if (strncmp(&(str[i]),"INWRITEON", strlen("INWRITEON"))== 0)   /* %INWRITEON : In_Write_Statement Flag ON */
-            {
-              In_Write_Flag = 1;
-              i += strlen("INWRITEON");
-            } else
-          if (strncmp(&(str[i]),"INWRITEOFF", strlen("INWRITEOFF"))== 0) /* %INWRITEOFF : In_Write_Statement Flag OFF */
-            {
-              In_Write_Flag = 0;
-              i += strlen("INWRITEOFF");
-            } else
-          if (strncmp(&(str[i]),"RECPORTON", strlen("RECPORTON"))== 0)   /* %RECPORTON : recursive_port_decl Flag ON */
-            {
-              Rec_Port_Decl = 1;
-              i += strlen("RECPORTON");
-            } else
-          if (strncmp(&(str[i]),"RECPORTOFF", strlen("RECPORTOFF"))== 0) /* %RECPORTOFF : recursive_port_decl Flag OFF */
-            {
-              Rec_Port_Decl = 0;
-              i += strlen("RECPORTOFF");
-            } else
-
-          if (strncmp(&(str[i]),"INPARAMON", strlen("INPARAMON"))== 0)   /* %INPARAMON : In_Param_Statement Flag ON */
-            {
-              In_Param_Flag = 1;
-              i += strlen("INPARAMON");
-            } else
-          if (strncmp(&(str[i]),"INPARAMOFF", strlen("INPARAMOFF"))== 0) /* %INPARAMOFF : In_Param_Statement Flag OFF */
-            {
-              In_Param_Flag = 0;
-              i += strlen("INPARAMOFF");
-            } else
-          if (strncmp(&(str[i]),"INIMPLION", strlen("INIMPLION"))== 0)   /* %INIMPLION : In_Impli_Statement Flag ON */
-            {
-              In_Impli_Flag = 1;
-              i += strlen("INIMPLION");
-            } else
-          if (strncmp(&(str[i]),"INIMPLIOFF", strlen("INIMPLIOFF"))== 0) /* %INIMPLIOFF : In_Impli_Statement Flag OFF */
-            {
-              In_Impli_Flag = 0;
-              i += strlen("INIMPLIOFF");
-            } else
-	      if (strncmp(&(str[i]),"TYPE", strlen("TYPE"))== 0)
-		{
-		  PTR_TYPE type = NULL;
-		  type = Find_Type_For_Bif(bif);
-		  if (!type)
-		    {
-		      Message("TYPE not found",0);
-		      BufPutString("------TYPE ERROR----",0);
-		    }
-		  if( !is_overloaded_type(bif) ) 
-		      Tool_Unparse_Type (type);
-              i += strlen("TYPE");
-            } else
-	      if (strncmp(&(str[i]),"PROTECTION", strlen("PROTECTION"))== 0)
-		{
-		  int protect = 0; /*protect = NULL*/
-		  protect  = Find_Protection_For_Bif(bif);
-		  if (protect)
-		    {
-		      if (protect & 128)
-			{
-			  /* BufPutString("MethodOfElement:\n",0);  a temporary fix until dep2C++ done */
-                          BufPutString("public:\n", 0);
-			} else
-			  {
-			    switch (protect)
-			      { /* find the definition of the flag someday */
-			      case 64:  BufPutString("public:\n",0); break;
-			      case 32:  BufPutString("protected:\n",0); break;
-			      case 16:  BufPutString("private:\n",0); break;
-			      }
-			  }
-		    }
-              i += strlen("PROTECTION");
-            } else
-              if (strncmp(&(str[i]),"DUMMY", strlen("DUMMY"))== 0) /* %DUMMY Do nothing */
-            {
-              i += strlen("DUMMY");
-            } else
-		{
-                  Message (" *** Unknown bif node COMMAND *** ",0);
-		  Message (&(str[i]),0);
-		}
-        }
-       else
-         {
-           BufPutChar( c);
-           i++;
-         }
-      c = str[i];
-    }
-  if (AfterDOLabel&&(HPF_VERSION==2)) UnparseEndofCircle(bif);    
-  if (TASK_PROC_GENERATE&&(HPF_VERSION==2)&&(variant==DVM_ON_DIR)) 
-      {
-      ON_BLOCK=1;
-      ON_BEGIN=Buf_pointer;
-      };
-  return Buf_address;
-}
-
-void DefineHPF1()
-{
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT) Unparse_Def[SYM].str = create_unp_str( NAME);
-#include"unparse1.hpf"
-#undef DEFNODECODE
-
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT) Unparse_Def[SYM].fct = NULL;
-#include"unparse1.hpf"
-#undef DEFNODECODE
-}
-void DefineHPF2()
-{
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT) Unparse_Def[SYM].str = create_unp_str( NAME);
-#include"unparse.hpf"
-#undef DEFNODECODE
-
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT) Unparse_Def[SYM].fct = NULL;
-#include"unparse.hpf"
-#undef DEFNODECODE
-}
-
-void Init_HPFUnparser()
-{
-  int i,j;
-  CommentOut=1; /*Ignore comment*/
-      if (Parser_Initiated != Fortran_Initialized)
-        {
-	  /*printf("\nHPF_VERSION = %d",HPF_VERSION);*/
-	  if (HPF_VERSION==1)  DefineHPF1();
-	    else DefineHPF2();
-          Parser_Initiated = Fortran_Initialized;
-          /* set the first tabulation */
-          TabNumber = 1;
-        }
-  /* initialize the number of flag */
-  Number_Of_Flag = 0;
-  for (i=0; i < MAXFLAG ; i++)
-    {
-      TabOfFlag[i][0] = '\0';
-      FlagLenght[i] = 0;
-      for(j=0; j<MAXLEVEL; j++)
-        FlagOn[j][i] = 0;
-      FlagLevel[i] = 0;
-    }
-  /* Type definition for all BIF,LL,etc NODES */ 
-#define DEFNODECODE(SYM, NAME, TYPE, LENGTH, NT,f1,f2,f3,f4,f5) node_code_kind[SYM] = NT;
-#include"bif_node.def"
-#undef DEFNODECODE
-  /* setbuffer to 0 */
-  Buf_pointer = 0;  
-  Buf_address = &(UnpBuf[0]); /* may be reallocated */
-  memset(UnpBuf, 0, MAXLENGHTBUF);
-}
-
-/**************************************************************/
-int UnparseFDVMProgram(fout,fi)
-     FILE *fout;
-     PTR_FILE fi;
-{
-  
-  Init_HPFUnparser();
-  current_file=fi;
-  errnumber=0;
-  fprintf(fout,"%s",filter(Tool_Unparse_Bif(fi->head_bfnd)));
-  return errnumber;
-}
-
-PTR_LLND FindMapDir(PTR_LLND ptr_llnd,PTR_BFND ptr_bif)
-{
-PTR_BFND bif,end=FindEndOfBlock(ptr_bif);
-for(bif=FindBeginingOfBlock(ptr_bif);bif&&(bif!=end);bif=BIF_NEXT(bif))
-	  { 
-	    if (BIF_CODE(bif)!=DVM_MAP_DIR) continue;
-	    if (patternMatchExpression(ptr_llnd,BIF_LL1(bif))) 
-	      {
-		return BIF_LL2(bif);
-	      }
-	  }
-return NULL;    
-}
-
-int NumberOfForNode(PTR_BFND ptrbif,int *label)
-{
-int incircle=0;
-PTR_BFND bif,end=FindEndOfBlock(ptrbif);
-int count=0;
-if (!BIF_LABEL(ptrbif)) return 0;
-for(bif=FindBeginingOfBlock(ptrbif);bif&&(bif!=end);bif=BIF_NEXT(bif))
-      { 
- 	if (incircle&&(BIF_CODE(bif)==GOTO_NODE)) 
-		{
-	           if (BIF_LL3(bif)&&NODE_LABEL (BIF_LL3(bif)))
-                	{
-	                  if ( LABEL_STMTNO (NODE_LABEL (BIF_LL3(bif)))==LABEL_STMTNO (BIF_LABEL(ptrbif)))
-				{
-				*label=LABEL_STMTNO (BIF_LABEL(ptrbif));
-				}
-        	        }
-
-		}
-	if (BIF_CODE(bif)!=FOR_NODE) continue;
-	if (BIF_LABEL_USE (bif))
-	  {
-	   if (LABEL_STMTNO (BIF_LABEL_USE (bif))==LABEL_STMTNO (BIF_LABEL(ptrbif))) 
-		{
-			count++;
-	        	incircle=1;
-		}
-
-	  }
-       }
-return count;    
-}
-
-int FindPointerDir(PTR_SYMB symb,PTR_BFND ptr_bif)
-{
-PTR_BFND bif,end=FindEndOfBlock(ptr_bif);
-for(bif=FindBeginingOfBlock(ptr_bif);bif&&(bif!=end);bif=BIF_NEXT(bif))
-	  { 
-	    PTR_LLND llnd;
-	    if (BIF_CODE(bif)!=DVM_POINTER_DIR) continue;
-            for(llnd=BIF_LL1(bif);llnd;llnd=NODE_OPERAND1(llnd))
-	    if (!strcmp(SYMB_IDENT(NODE_SYMB(NODE_OPERAND0(llnd))),SYMB_IDENT(symb))) 
-	      {
-		int count=0;
-		char *str;
-		str=funparse_llnd(BIF_LL2(bif));
-		for(;*str!='\0';str++)
-		  if (*str==':') count++;
-		return count;		  
-	      }
-	  }
-return 0;    
-}
-
-int Puttab() 
-{                  
-  int j;
-  for (j = 0; j < TabNumber; j++)
-    if (j>0)
-      BufPutString ("   ",0);
-    else
-      BufPutString ("      ",0); /* cychen */
-return j;
-}
-
-PTR_LLND ChangeRedistributeOntoTask(PTR_LLND llnd)
-{
-if (!llnd) return LLNULL;
-/*if (NODE_CODE(llnd)!=EXPR_LIST) return LLNULL;
-if (NODE_CODE(NODE_OPERAND0(llnd))!=ARRAY_REF) return LLNULL;
-if (!(SYMB_ATTR(NODE_SYMB(NODE_OPERAND0(llnd)))&TASK_BIT)) return LLNULL;*/
-if (NODE_CODE(llnd)!=ARRAY_REF) return LLNULL;
-if (!(SYMB_ATTR(NODE_SYMB(llnd))&TASK_BIT)) return LLNULL;
-/*return NODE_OPERAND0(llnd);*/
-return llnd;
-}
-
-int Find_SaveSymbol(PTR_LLND llnd)
-{
-int i;
-if (NODE_CODE(llnd)!=VAR_REF)  return 0;
-for (i=0;i<Number_Of_Symbol;i++)
-  if (SymbolID[i]==NODE_SYMB(llnd)) return 1;
-SymbolID[Number_Of_Symbol++]=NODE_SYMB(llnd);
-if (Number_Of_Symbol==MAXFLAG)  
-  {
-    Message("Too many reductions variables; sorry",0);
-    Number_Of_Symbol--;
-  }
-return 0;
-}
-
-int FindPointerDeclaration(PTR_LLND llnd)
-{
-int count=0;
-for(;llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-  if ((NODE_CODE(NODE_OPERAND0(llnd))==VAR_REF)||(NODE_CODE(NODE_OPERAND0(llnd))==ARRAY_REF))
-    {
-	/*printf("\nFindPointerDecl : %s ",SYMB_IDENT(NODE_SYMB(NODE_OPERAND0(llnd))));*/
-      if (!(SYMB_ATTR(NODE_SYMB(NODE_OPERAND0(llnd)))&DVM_POINTER_BIT)) 
-	{
-	  /*printf(": %s ",SYMB_IDENT(NODE_SYMB(NODE_OPERAND0(llnd))));*/
-	  /*if(strcmp(SYMB_IDENT(NODE_SYMB(NODE_OPERAND0(llnd))),"heap"))*/
- 	  if(!(SYMB_ATTR(NODE_SYMB (NODE_OPERAND0(llnd)))&HEAP_BIT))
-	    {
-	      if (count) BufPutChar(',');
-	      /*printf(": %s",SYMB_IDENT(NODE_SYMB(NODE_OPERAND0(llnd))));*/
-	      Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-	      count++;
-	      /*BufPutString("QWERTY\n",0);*/
-	    }
-	};
-    }
-  else 
-    {
-      if (count) BufPutChar(',');
-      Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-      count++;
-    };
-return count;
-}
-
-int FindCommonHeapDeclaration(PTR_LLND llnd)
-{
-int count=0;
-for(;llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-  if ((NODE_CODE(NODE_OPERAND0(llnd))==VAR_REF)||(NODE_CODE(NODE_OPERAND0(llnd))==ARRAY_REF))
-    {
-    if(!(SYMB_ATTR(NODE_SYMB (NODE_OPERAND0(llnd)))&HEAP_BIT))
-       {
-       if (count) BufPutChar(',');
-       Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-       count++;
-       }
-    }
-  else 
-    {
-      if (count) BufPutChar(',');
-      Tool_Unparse2_LLnode(NODE_OPERAND0(llnd));
-      count++;
-    };
-return count;
-}
-
-PTR_LLND FindRedistributeDir(PTR_LLND ptr_llnd,PTR_BFND ptr_bif)
-{
-PTR_BFND bif,end=FindEndOfBlock(ptr_bif);
-for(bif=FindBeginingOfBlock(ptr_bif);bif&&(bif!=end);bif=BIF_NEXT(bif))
-     { 	
-	if (BIF_CODE(bif)!=DVM_REDISTRIBUTE_DIR) continue;
-        if (BIF_LL1(bif)) 
-	    {
-	    PTR_LLND llnd;
-	    for(llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-		{
-		if (patternMatchExpression(ptr_llnd,NODE_OPERAND0(llnd)))
-		    return NODE_OPERAND0(llnd);
-		}
-	    } 	 
-     }	
-return NULL;    
-}
-
-PTR_LLND FindRealignDir(PTR_LLND ptr_llnd,PTR_BFND ptr_bif)
-{
-PTR_BFND bif,end=FindEndOfBlock(ptr_bif);
-for(bif=FindBeginingOfBlock(ptr_bif);bif&&(bif!=end);bif=BIF_NEXT(bif))
-     { 	
-	if (BIF_CODE(bif)!=DVM_REALIGN_DIR) continue;
-        if (BIF_LL1(bif)) 
-	    {
-	    PTR_LLND llnd;
-	    for(llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-		{
-		if (patternMatchExpression(ptr_llnd,NODE_OPERAND0(llnd)))
-		    return NODE_OPERAND0(llnd);
-		}
-	    } 	 
-     }	
-return NULL;    
-}
-
-PTR_LLND FindDynamicDir(PTR_LLND ptr_llnd,PTR_BFND ptr_bif)
-{
-PTR_BFND bif,end=FindEndOfBlock(ptr_bif);
-for(bif=FindBeginingOfBlock(ptr_bif);bif&&(bif!=end);bif=BIF_NEXT(bif))
-     { 	
-	if (BIF_CODE(bif)!=DVM_DYNAMIC_DIR) continue;
-        if (BIF_LL1(bif)) 
-	    {
-	    PTR_LLND llnd;
-	    for(llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-		{
-		if (patternMatchExpression(ptr_llnd,NODE_OPERAND0(llnd)))
-		    return NODE_OPERAND0(llnd);
-		}
-	    } 	 
-     }
-/*for(bif=current_file->head_bfnd;bif;bif=BIF_NEXT(bif))
-     { 	
-	PTR_LLND ptr;
-	int ok=0;
-	if (BIF_CODE(bif)!=DVM_VAR_DECL) continue;
-	for(ptr=BIF_LL3(bif);ptr&&(NODE_CODE(ptr)==EXPR_LIST);ptr=NODE_OPERAND1(ptr))
-	    if (NODE_CODE(NODE_OPERAND0(ptr))==DYNAMIC_OP) ok=1;
-        if (BIF_LL1(bif)) 
-	    {
-	    PTR_LLND llnd;
-	    for(llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-		{
-		if (patternMatchExpression(ptr_llnd,NODE_OPERAND0(llnd)))
-		    if (ok)
-			return NODE_OPERAND0(llnd);
-		    else return 0;
-		}
-	    } 	 
-     }
-*/     	
-return NULL;    
-}
-
-int UnparseEndofCircle(PTR_BFND bif)
-{
-int TabNum;
-int i,count=0,label=0;
-TabNum=TabNumber;
-count=NumberOfForNode(bif,&label);
-if (label) BufPutInt(label);
-if(count)
-    {
-      if (TabNumber>1) TabNumber--;
-      for(i=0;i<count;i++)
-    	{
-	  if (i==count-1)
-	    {
-	     int k = 0 ;
-	     if (Get_Flag_val("(TASK_DIR)",&k))
-	       { 
-	         BufPutString("!HPF$",0);
-	         Puttab();
-		 Buf_pointer-=5;
-		 BufPutString("END ON\n",0);
-		 if (TabNumber>1) TabNumber--;
-		 k=0;
-		 Treat_Flag("(TASK_DIR)",&k,-1);
-		 TabNum--;
-	       }
-	    }
-	  Puttab();
-	  if (TabNumber>1) TabNumber--;    
-	  BufPutString("end do\n",0);
-	}
-      TabNumber=TabNum;
-    }
-return count;
-/*21052001*/
-}
-
-PTR_BFND FindDistrAlignCombinedDir(PTR_LLND ptr_llnd,PTR_BFND ptr_bif)
-{
-PTR_BFND bif,end=FindEndOfBlock(ptr_bif);
-for(bif=FindBeginingOfBlock(ptr_bif);bif&&(bif!=end);bif=BIF_NEXT(bif))
-     { 	
-	if ((BIF_CODE(bif)==DVM_DISTRIBUTE_DIR)||
-	    (BIF_CODE(bif)==DVM_ALIGN_DIR)||
-	    (BIF_CODE(bif)==DVM_VAR_DECL))
-	    { 
-            if (BIF_LL1(bif)) 
-    		{
-		PTR_LLND llnd;
-		for(llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-		    {
-		    if (patternMatchExpression(ptr_llnd,NODE_OPERAND0(llnd)))
-			{
-			return bif;
-			}
-		    }
-		}
-	    }		 	 
-     }	
-return NULL;    
-}
-
-PTR_LLND FindPointerDescriptor(PTR_LLND ptr_llnd,PTR_BFND ptr_bif)
-{
-PTR_BFND bif,end=FindEndOfBlock(ptr_bif);
-for(bif=FindBeginingOfBlock(ptr_bif);bif&&(bif!=end);bif=BIF_NEXT(bif))
-     { 	
-	if (BIF_CODE(bif)!=VAR_DECL) continue;
-        if (BIF_LL1(bif)) 
-	    {
-	    PTR_LLND llnd;
-	    for(llnd=BIF_LL1(bif);llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-		{
-		if (!strcmp(SYMB_IDENT(NODE_SYMB(ptr_llnd)),SYMB_IDENT(NODE_SYMB(NODE_OPERAND0(llnd)))))
-		    return NODE_OPERAND0(llnd);
-		}
-	    } 	 
-     }	
-return NULL;    
-}
-
-int ArrayOfPointerDeclaration(PTR_BFND bif)
-{
-PTR_LLND llnd=BIF_LL1(bif);
-int ok=1,empty=1;
-int count=0;
-for (;llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-    {
-    PTR_LLND descr;
-    descr=FindPointerDescriptor(NODE_OPERAND0(llnd),bif);
-    if (ok&&!count)    
-	{
-	char *str=NULL;
-	str=funparse_llnd(BIF_LL2(bif));
-	for(;*str!='\0';str++)
-	 if (*str==':') count++;
-	}
-    if (count&&descr&&NODE_OPERAND0(descr))
-	{ 
-	char FLAG[10];
-	int i=0;
-	if (count>10) 
-	    {
-	    Message("Can`t work : too many dimensions in DVM_POINTER_DIR",0);
-	    return 0;
-	    }
-	sprintf(FLAG,"(PTRTYPE%i)",count);    
-	if (ok&&!Get_Flag_val(FLAG,&i)) 
-	    {
-	    i=0;
-	    Treat_Flag(FLAG, &i,1);
-	    GenerateType(count, BIF_LL3(bif));
-	    };
-	if(ok)
-	    {
-	    Puttab();
-	    BufPutString("TYPE (PTR_ARRAY",0);
-	    BufPutInt(count);
-	    BufPutString(") :: ",0);
-	    ok=0;
-	    empty=0;
-	    BufPutString(SYMB_IDENT(NODE_SYMB(descr)),0);
-	    SYMB_ATTR(NODE_SYMB(descr))|=DVM_POINTER_ARRAY_BIT;
-	    BufPutChar('(');
-	    Tool_Unparse2_LLnode(NODE_OPERAND0(descr));
-	    BufPutChar(')');
-	    continue;
-	    }
-	if (!ok)
-	    {
-	    empty=0;
-	    BufPutChar(',');
-	    BufPutString(SYMB_IDENT(NODE_SYMB(descr)),0);
-	    SYMB_ATTR(NODE_SYMB(descr))|=DVM_POINTER_ARRAY_BIT;
-	    BufPutChar('(');
-	    Tool_Unparse2_LLnode(NODE_OPERAND0(descr));
-	    BufPutChar(')');
-	    }
-	}
-    }	    
-if (!empty) BufPutChar('\n');
-return 1;
-}
-
-void PointerDeclaration(PTR_BFND bif)
-{
-PTR_LLND llnd=BIF_LL1(bif);
-int ok=1,empty=1;
-int count=0;
-for (;llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-    {
-    PTR_LLND descr;
-    descr=FindPointerDescriptor(NODE_OPERAND0(llnd),bif);
-    if (ok&&!count)
-	    {
-	    char *str=NULL;
-	    str=funparse_llnd(BIF_LL2(bif));
-	    for(;*str!='\0';str++)
-		 if (*str==':') count++;
-	    }    
-    if ((count)&&descr&&!NODE_OPERAND0(descr))
-	{ 
-	if(ok)
-	    {
-	    Puttab();
-            Tool_Unparse2_LLnode(BIF_LL3(bif));
-	    BufPutString(", POINTER, DIMENSION (",0);
-	    Tool_Unparse2_LLnode(BIF_LL2(bif));
-	    BufPutString(") :: ",0);
-	    ok=0;
-	    empty=0;
-	    BufPutString(SYMB_IDENT(NODE_SYMB(descr)),0);
-	    continue;
-	    }
-	if (!ok)
-	    {
-	    empty=0;
-	    BufPutChar(',');
-	    BufPutString(SYMB_IDENT(NODE_SYMB(descr)),0);
-	    }
-	}
-    }	    
-if (!empty) BufPutChar('\n');
-}
-
-void GenerateType(int count, PTR_LLND llnd_type)
-{
-    int i;
-    Puttab();
-    BufPutString("TYPE PTR_ARRAY",0);
-    BufPutInt(count);
-    BufPutChar('\n');
-    TabNumber++;
-    Puttab();
-    Tool_Unparse2_LLnode(llnd_type);
-    BufPutString(", POINTER, DIMENSION (",0);
-    for(i=0;i<count;i++)
-	{
-         BufPutString(":,",0);
-         }
-    Buf_pointer--;
-    BufPutString(") :: PTR\n",0);
-    BufPutString("!HPF$",0);
-    Puttab();
-    Buf_pointer-=5;
-    BufPutString("DYNAMIC PTR",0);
-    TabNumber--;
-    BufPutChar('\n');
-    Puttab();
-    BufPutString("END TYPE PTR_ARRAY",0);
-    BufPutInt(count);
-    BufPutChar('\n');
-}
-
-void gen_hpf_name (char *filename)
-{
-   register int i;
-   hpfname = (char *) malloc((unsigned)(strlen(filename)+4));
-   strcpy (hpfname,filename);
-   for (i = strlen(filename)-1 ; i >= 0 ; i --)
-        if ( filename[i] == '.' )
-             break;
- hpfname[i+1]='h';
- hpfname[i+2]='p';
- hpfname[i+3]='f';
- hpfname[i+4]='\0';
-}
-   
-int CheckNullDistribution(PTR_BFND bif)
-{
-if (BIF_CODE(bif)==DVM_DISTRIBUTE_DIR)
-    {
-    if (!BIF_LL2(bif)&&!BIF_LL3(bif))	     
-	return 1;
-    };
-if (BIF_CODE(bif)==DVM_ALIGN_DIR)
-    {
-    if (!BIF_LL2(bif)&&!BIF_LL3(bif))	     
-	return 1;
-    };    
-if (BIF_CODE(bif)==DVM_VAR_DECL)
-    {
-    PTR_LLND llnd=BIF_LL3(bif);
-    for(;llnd&&(NODE_CODE(llnd)==EXPR_LIST);llnd=NODE_OPERAND1(llnd))
-	{
-	 /*BufPutInt(NODE_CODE(NODE_OPERAND0(llnd)));*/
-         if (NODE_CODE(NODE_OPERAND0(llnd))==DYNAMIC_OP)
-		return 1;
-	 if (NODE_CODE(NODE_OPERAND0(llnd))==DISTRIBUTE_OP)
-	    if (!NODE_OPERAND0(NODE_OPERAND0(llnd))&&!NODE_OPERAND1(NODE_OPERAND0(llnd))) 
-		return 1;		
-	 if (NODE_CODE(NODE_OPERAND0(llnd))==ALIGN_OP)
-	    if (!NODE_OPERAND0(NODE_OPERAND0(llnd))&&!NODE_OPERAND1(NODE_OPERAND0(llnd))) 
-		return 1;
-	};
-    }
-/*BufPutInt(1234567);*/
-return 0;
-}
-
-void ResetSymbolId()
-{
-int i,j;
-char FLAG[10];
-PTR_SYMB symb;
-for (symb = current_file->head_symb; symb ; symb = SYMB_NEXT (symb))
-    SYMB_ID (symb) = 0;
-for (j=0;j<10;j++)
-    {
-    sprintf(FLAG,"(PTRTYPE%i)",j);
-    i=0;
-    if (Get_Flag_val(FLAG,&i)) 
-    	{
-    	i=0;
-    	Treat_Flag(FLAG, &i,-1);
-    	};
-    }
-}
-
-PTR_BFND FindBeginingOfBlock(PTR_BFND ptr_bif)
-{
-PTR_BFND bif,ptr=NULL;
-for(bif=current_file->head_bfnd;bif&&(bif!=ptr_bif);bif=BIF_NEXT(bif))
-    { 	
-    if ((BIF_CODE(bif)==PROG_HEDR)||
-        (BIF_CODE(bif)==PROC_HEDR)||
-        (BIF_CODE(bif)==PROS_HEDR))
-        ptr=bif;
-    }
-return ptr;
-}
-
-PTR_BFND FindEndOfBlock(PTR_BFND ptr_bif)
-{
-PTR_BFND bif;
-for(bif=ptr_bif;bif;bif=BIF_NEXT(bif))
-    { 	
-    if (BIF_CODE(bif)==CONTROL_END)
-	if ((BIF_CODE(BIF_CP(bif))==PROG_HEDR)||
-    	    (BIF_CODE(BIF_CP(bif))==PROC_HEDR)||
-    	    (BIF_CODE(BIF_CP(bif))==PROS_HEDR))
-	    {
-	    return bif;
-	    }	    
-    }
-return NULL;
-}
-    
-int CheckAcross(PTR_BFND bif)
-{
-PTR_LLND llnd;
-if (!bif) return 0;
-for (llnd=BIF_LL2(bif);llnd&&NODE_CODE(llnd)==EXPR_LIST;llnd=NODE_OPERAND1(llnd))
-    {
-    if (NODE_OPERAND0(llnd)&&(NODE_CODE(NODE_OPERAND0(llnd))==ACROSS_OP))
-	return 1;
-    }
-return 0;
-}
-int CheckReduction(PTR_BFND bif)
-{
-PTR_LLND llnd;
-if (!bif) return 0;
-for (llnd=BIF_LL2(bif);llnd&&NODE_CODE(llnd)==EXPR_LIST;llnd=NODE_OPERAND1(llnd))
-    {
-    if (NODE_OPERAND0(llnd)&&(NODE_CODE(NODE_OPERAND0(llnd))==REDUCTION_OP))
-	return 1;
-    }
-return 0;
-}
-    
-int IfReduction(PTR_LLND e1, PTR_LLND e2)
-{ 
-  if(!e1||!e2)  return(0); 
-  if(NODE_CODE(e1) != NODE_CODE(e2))
-      return(0);
-  if(NODE_CODE(e1) != VAR_REF && NODE_CODE(e1) != ARRAY_REF)
-      return(0);
-  if(NODE_SYMB(e1) != NODE_SYMB(e2))
-    return(0);
-  if(NODE_CODE(e1) == ARRAY_REF && !patternMatchExpression(NODE_OPERAND0(e1),NODE_OPERAND0(e2)))
-    return(0);
-  return (1);    
-}   
-int FindRedInExpr(PTR_LLND red, PTR_LLND expr)
-{
-if(!expr)  return 0;
-if (!red) return 0;
-if (NODE_CODE(red)!=VAR_REF && NODE_CODE(red)!=ARRAY_REF) return 0;
-
-if(NODE_CODE(red)==VAR_REF && NODE_CODE(red) == NODE_CODE(expr))  
-  {
-  if (NODE_SYMB(red)== NODE_SYMB(expr))
-      return 1;
-  else return 0;
-  }
-
-if(NODE_CODE(red)==ARRAY_REF && NODE_CODE(red) == NODE_CODE(expr))
- { 
-   if (NODE_SYMB(red) == NODE_SYMB(expr))
-      return(patternMatchExpression(NODE_OPERAND0(red),NODE_OPERAND0(expr)));
- }
-return (FindRedInExpr(red,NODE_OPERAND0(expr))+FindRedInExpr(red,NODE_OPERAND1(expr)));
-}
-
-PTR_LLND AddToReductionList(PTR_LLND redlist, PTR_LLND newred)
-{
-PTR_LLND new_node,ptr;
-new_node=make_llnode(EXPR_LIST,newred,LLNULL,SMNULL);
-if (new_node)
-    {
-    if (redlist)
-    	{
-    	ptr=Follow_Llnd(redlist,2);
-    	NODE_OPERAND1(ptr)=new_node;
-    	}
-    if (!redlist) redlist=new_node;
-    }
-else
-    {
-    return NULL;
-    }
-return redlist; 
-}
-
-int FindInNewList(PTR_LLND newlist, PTR_LLND red)
-{
-PTR_LLND ExprList;
-if (!newlist) return 0;
-
-if (!red) return 0;
-if (NODE_CODE(red)!=VAR_REF && NODE_CODE(red)!=ARRAY_REF) return 0;
-for (ExprList=newlist;ExprList&&(NODE_CODE(ExprList)==EXPR_LIST);ExprList=NODE_OPERAND1(ExprList))
-    {
-    if (NODE_CODE(NODE_OPERAND0(ExprList))==VAR_REF || NODE_CODE(NODE_OPERAND0(ExprList))==ARRAY_REF )
-	if (NODE_SYMB(NODE_OPERAND0(ExprList))==NODE_SYMB(red))
-	    return 1;
-    }
-return 0;
-}
-
-int isForNodeEndStmt(PTR_BFND stmt)
-{
- PTR_LABEL lab, do_lab;
- PTR_BFND parent;
- if(!(lab=BIF_LABEL(stmt)) && BIF_CODE(stmt) != CONTROL_END) /*the statement has no label and*/
-   return(0);                                               /*is not ENDDO */
- parent = BIF_CP(stmt);
- if (parent)
-    {
-    if(BIF_CODE(parent)!=FOR_NODE)  /*parent isn't DO statement*/
-      return(0);
-    do_lab = BIF_LABEL_USE(parent); /* label of loop end or NULL*/
-    if(do_lab) /*  DO statement with label */
-      if(lab && LABEL_STMTNO(lab) == LABEL_STMTNO(do_lab))
-                           /* the statement label is the label of loop end*/
-        return(1);
-      else
-        return(0);
-    else   /*  DO statement without label */
-      if(BIF_CODE(stmt) == CONTROL_END)
-        return(1);
-      else
-        return(0);
-    }
- else return (0);
-}
-int ForNodeStmt(PTR_BFND stmt)
-{
-PTR_BFND bif;
-int count=0,label;
-for(bif=stmt;bif;bif=BIF_NEXT(bif))
-	  { 
-	    /*BufPutString("Count=",0);
-            BufPutInt(count);*/
-	    if (BIF_CODE(bif)==ASSIGN_STAT) 
-		{
-		  if (FindRedInExpr(BIF_LL1(bif),BIF_LL2 (bif)))
-			{
-			if (BIF_LL1(bif)&&NODE_SYMB(BIF_LL1(bif))&&(!IS_DISTRIBUTE_ARRAY(NODE_SYMB(BIF_LL1(bif))))&&(!SYMB_DOVAR(NODE_SYMB(BIF_LL1(bif)))))
-				{
-				/*BufPutString("Reduction var :",0);
-				Tool_Unparse2_LLnode(BIF_LL1(bif));
-				BufPutString("\n",0);*/
-				if (!FindInNewList(NewSpecList,BIF_LL1(bif)))
-				  if(!FindInNewList(ReductionList,BIF_LL1(bif)))
-				   {		
-				   ReductionList=AddToReductionList(ReductionList,BIF_LL1(bif));
-				   /*BufPutString("Reduction LIST :",0);
-				   Tool_Unparse2_LLnode(ReductionList);
-				   BufPutString("\n",0);*/
-                                   }
-				}
-			}
-                continue;
-		}
-	    if (BIF_CODE(bif)==FOR_NODE) 
-		{
-		count++;
-		continue;
-		}
-	    else
-		{
-		if (isForNodeEndStmt(bif))
-		   {
-		   if (BIF_CODE(bif)==CONTROL_END)
-			count--;
-		   else
-			count-=NumberOfForNode(bif,&label);
-		   }
-		}			
-	   if (!count) break;
-	   }
-return 0;    
-}
-
-PTR_LLND FreeReductionList(PTR_LLND redlist)
-{
-PTR_LLND llnd,ptr;
-llnd=redlist;
-while((ptr=llnd))
-  {
-    if (NODE_OPERAND1(llnd) == NULL)
-        break;
-    llnd = NODE_OPERAND1(llnd);
-    NODE_OPERAND0(ptr)=NULL;
-    NODE_OPERAND1(ptr)=NULL;
-#ifdef __SPF
-    removeFromCollection(ptr);
-#endif
-    free(ptr);
-   }
-return (NULL);
-}
-
-int ForNodeLabel(PTR_BFND stmt)
-{
-PTR_BFND bif;
-int count=0,label;
-/*int LABEL=0;*/
-for(bif=stmt;bif;bif=BIF_NEXT(bif))
-	  { 
-	    if (BIF_CODE(bif)==FOR_NODE) 
-		{
-		count++;
-		continue;
-		}
-	    else
-		{
-		if (isForNodeEndStmt(bif))
-		   {
-		   if (BIF_CODE(bif)==CONTROL_END)
-			count--;
-		   else
-			count-=NumberOfForNode(bif,&label);
-		   }
-		}			
-	   if (!count) break;
-	   }
-return 0;    
-}
-
-
-
-
-
-
-
-
-
diff --git a/projects/dvm_svn/fdvm/trunk/sageExample/SwapFors.cpp b/projects/dvm_svn/fdvm/trunk/sageExample/SwapFors.cpp
deleted file mode 100644
index 0ff4bcd..0000000
--- a/projects/dvm_svn/fdvm/trunk/sageExample/SwapFors.cpp
+++ /dev/null
@@ -1,1565 +0,0 @@
-
-#include <cstdio>
-#include <cstring>
-#include <fstream>
-#include <iostream>
-#include <cstdlib>
-#define IN_ANAL_
-#include "dvm.h"
-#undef IN_ANAL_
-#include "aks_structs.h"
-
-char *fin_name = 0;
-SgFile *current_file;
-
-
-#define DEBUG true
-#define DEBUG_LV2 false
-#define DEBUG_LV3 false
-
-#if 0
-std::ostream &out = std::cout;
-#else
-std::ofstream out("log_swap.txt");
-#endif
-
-using namespace std;
-
-void PrintVars(SgExpression *node, int LR, int d)
-{
-	if (LR == 0)
-		out << "variant LHS " << node->variant() << " d = " << d << endl;	
-	else
-		out << "variant RHS " << node->variant() << " d = " << d << endl;
-	
-	if (node->lhs())
-		PrintVars(node->lhs(), 0, d + 1);
-
-	if(node->rhs())
-		PrintVars(node->rhs(), 1, d + 1);
-}
-
-SageSymbols* SearchVarRef(SgExpression *expr, SageSymbols *smbl)
-{
-	SageSymbols *newS;
-	if(expr->variant() == VAR_REF)
-	{
-		SageSymbols *tempS = smbl;
-		bool flag = true;		
-		while(tempS)
-		{
-			if(expr->symbol() == tempS->symb)
-			{
-				flag = !flag;
-				break;
-			}
-			tempS = tempS->next;
-		}
-		if(flag)
-		{
-			newS = new SageSymbols();
-			newS->symb = expr->symbol();
-			newS->len = -1;
-			newS->next = smbl;
-		}
-		else
-			newS = smbl;
-	}
-	else
-		newS = smbl;
-
-	SgExpression *L = expr->lhs();
-	SgExpression *R = expr->rhs();
-	if(L)
-		newS = SearchVarRef(L,newS);
-	if(R)
-		newS = SearchVarRef(R,newS);
-	return newS;	
-}
-
-
-bool CheckSpecOp(SgExpression *expr, int Op)
-{
-	if(expr)
-	{
-		if(expr->variant() == Op)
-			return false;
-		else
-			return CheckSpecOp(expr->lhs(),Op) && CheckSpecOp(expr->rhs(),Op); 
-	}
-	else
-		return true;
-}
-
-bool CheckExpr(SgExpression *expr)
-{
-	if(expr)
-	{
-		switch(expr->variant())
-		{
-		case MULT_OP:
-			return CheckSpecOp(expr->lhs(), VAR_REF)  ||  CheckSpecOp(expr->rhs(), VAR_REF);
-		case MOD_OP:
-			return CheckSpecOp(expr->lhs(), VAR_REF)  &&  CheckSpecOp(expr->rhs(), VAR_REF);
-		case ARRAY_REF:
-			return false;
-		default:
-			return CheckExpr(expr->lhs()) && CheckExpr(expr->rhs());
-		}
-	}
-	else
-		return true;
-}
-
-int CountExpr(SgExpression *, int);
-
-int GetConstRef(SgExpression *expr)
-{
-	SgExpression *temp;
-	SgConstantSymb *sc = isSgConstantSymb(expr->symbol());
-	temp = &(sc->constantValue()->copy());
-	return CountExpr(temp, 0);
-}
-
-int CountExpr(SgExpression *expr, int rewrite)
-{
-	switch(expr->variant())
-	{
-	case VAR_REF:
-		return rewrite;
-	case CONST_REF:
-		return GetConstRef(expr);
-	case INT_VAL:
-		return expr->valueInteger();
-	case ADD_OP:
-		return CountExpr(expr->lhs(),rewrite) + CountExpr(expr->rhs(),rewrite);
-	case MULT_OP:
-		return CountExpr(expr->lhs(),rewrite) * CountExpr(expr->rhs(),rewrite);
-	case SUBT_OP:
-		return CountExpr(expr->lhs(),rewrite) - CountExpr(expr->rhs(),rewrite);	
-	case MOD_OP:
-		return CountExpr(expr->lhs(),rewrite) % CountExpr(expr->rhs(),rewrite);
-	case MINUS_OP:
-		return -CountExpr(expr->lhs(),rewrite);	
-	case DIV_OP:
-		return CountExpr(expr->lhs(),rewrite) / CountExpr(expr->rhs(),rewrite);
-	case DDOT:
-		{
-			int L = 1;
-			int R = 1;
-			if(expr->lhs())
-				L = CountExpr(expr->lhs(), 0);
-			if(expr->rhs())
-				R = CountExpr(expr->rhs(), 0);
-			return abs(L - R);
-		}
-	case STAR_RANGE:
-		if(DEBUG)
-			out << " Error: unknown operator * in expr" << endl;
-		return 1;
-	case NULL:
-		if(DEBUG)
-			out << " unknown expr with NULL-end" << endl;
-		break;
-	default:
-		if(DEBUG)
-			out << " unknown operand with variant: " << expr->variant()<< endl;
-		break;
-	}
-	return -1;
-}
-
-int CountLen(SgExpression *expr, int step)
-{
-	int ret_val = 0;
-	int a = CountExpr(expr,0);
-	int b = CountExpr(expr,step);
-	ret_val = abs(a - b);
-	
-	return ret_val;
-}
-
-SageArrayIdxs* AnalizeRef(SgExpression *expr, SageArrayIdxs *arr, int step)
-{
-	SgExpression *count = expr;
-	int p = 0;
-	while(count)
-	{
-		p++;
-		count = count->rhs();
-	}
-	arr->dim = p;
-	arr->symb = new SageSymbols*[p];
-
-	p = 0;
-	while(expr)
-	{
-		SageSymbols *allSymb  = new SageSymbols();
-		allSymb->symb = NULL;
-		allSymb->next = NULL;
-		allSymb->len = 0;
-		allSymb = SearchVarRef(expr->lhs(),allSymb);
-		arr->symb[p] = allSymb;
-		if(allSymb->next)
-			if(allSymb->next->symb == NULL && CheckExpr(expr->lhs()))
-			{	
-				arr->symb[p]->len = CountLen(expr->lhs(), step);
-				arr->symb[p]->next = NULL;
-			}
-			else
-			{
-				while (allSymb->next->len != 0)
-					allSymb = allSymb->next;
-				allSymb->next = NULL;				
-			}
-		expr = expr->rhs();
-		p++;
-	}
-	return arr;
-}
-
-SageArrayIdxs* AnalizeAssignStat(SgExpression *expr, SageArrayIdxs *retval, int read_write, int step)
-{
-	switch(expr->variant())
-	{
-	case ARRAY_REF:
-		{
-			SageArrayIdxs *outRef = new SageArrayIdxs();
-			outRef->array_expr = expr;		
-			outRef = AnalizeRef(expr->lhs(),outRef,step);
-			outRef->next = NULL;
-			outRef->read_write = read_write;
-			retval->next = outRef;
-			return retval->next;		
-			break;
-		}
-	default:
-		break;
-	}	
-		
-	SgExpression *R = expr->rhs();
-	SgExpression *L = expr->lhs();
-
-	if(R)
-	{
-		retval = AnalizeAssignStat(R, retval, read_write, step);
-	}
-	if(L)
-	{
-		retval = AnalizeAssignStat(L, retval, read_write, step);
-	}
-	return retval;
-}
-
-void PrintStr(SageArrayIdxs *p)
-{
-	out << p->dim << endl;
-}
-
-SageArrayIdxs* Analize(SgForStmt *loop, int count)
-{	
-	SageArrayIdxs *q = new SageArrayIdxs();
-	SageArrayIdxs *AllRef = q;
-	int step = 1;
-	if(loop->step())
-	{
-		step = loop->step()->valueInteger();
-	}
-
-	SgStatement *finish = loop->childList1(count - 1);
-	SgStatement *temp = loop->childList1(0);
-	while(true)
-	{
-		switch(temp->variant())
-		{
-		case ASSIGN_STAT:
-			if(DEBUG)
-				out << " ASSIGN_STAT in line: " << temp->lineNumber() << " ";
-			q = AnalizeAssignStat(temp->expr(0),q,0, step);
-			q = AnalizeAssignStat(temp->expr(1),q,1, step);
-			if(DEBUG)
-				out << " success" << endl;
-			break;
-		case IF_NODE:
-			if(DEBUG)
-				out << " IF_NODE condition in line: " << temp->lineNumber() << " ";
-			q = AnalizeAssignStat(temp->expr(0),q,1, step);
-			if(DEBUG)
-				out << " success" << endl;
-		case ELSEIF_NODE:
-			if(DEBUG)
-				out << " ELSEIF_NODE condition in line: " << temp->lineNumber() << " ";
-			q = AnalizeAssignStat(temp->expr(0),q,1, step);
-			if(DEBUG)
-				out << " success" << endl;
-			break;
-		case ARITHIF_NODE:
-			if(DEBUG)
-				out << " ARITHIF_NODE condition in line: " << temp->lineNumber() << " ";
-			q = AnalizeAssignStat(temp->expr(0),q,1, step);
-			if(DEBUG)
-				out << " success" << endl;
-			break;
-		case LOGIF_NODE:
-			if(DEBUG)
-				out << " LOGIF_NODE condition in line: " << temp->lineNumber() << " ";
-			q = AnalizeAssignStat(temp->expr(0),q,1, step);
-			if(DEBUG)
-				out << " success" << endl;
-			break;
-		case PROC_STAT:
-			{
-				if(DEBUG)
-					out << " PROC_STAT in line: " << temp->lineNumber() << " ";
-				SgExpression *ex = temp->expr(0);
-				while (ex)
-				{
-					q = AnalizeAssignStat(ex->lhs(),q,1, step);
-					ex = ex->rhs();
-				}
-					if(DEBUG)
-						out << " success" << endl;
-				break;
-			}
-			
-		default:
-			/*if(DEBUG)
-				out << " unknown op in line: " << temp->lineNumber() << " " << temp->variant() << endl;*/
-			break;
-		}
-				
-		if (temp == finish)
-			break;
-		temp = temp->lexNext();		
-	}
-	return AllRef->next;
-}
-
-void SwapFors( SgForStmt *first, SgForStmt *second)
-{
-	SgExpression *oldStart;
-	SgExpression *oldfin;
-	SgExpression *oldStep;
-	SgSymbol *oldSymb;
-	SgValueExp *one = new SgValueExp(1);
-
-	oldStart = first->start();
-	oldfin = first->end();
-	oldStep = first->step();
-	
-	first->setStart(*second->start());
-	first->setEnd(*second->end());
-	if(second->step())
-		first->setStep(*second->step());
-	else
-		first->setStep(*one);
-
-	second->setStart(*oldStart);
-	second->setEnd(*oldfin);
-	if(oldStep)
-		second->setStep(*oldStep);
-	else
-		second->setStep(*one);
-
-	oldSymb = first->symbol();
-	first->setDoName(*second->symbol());
-	second->setDoName(*oldSymb);
-}
-
-int AnalizeLoopNest(SgForStmt *stmt, int d)
-{
-	int ret_val = d;
-	int ch_list = stmt->numberOfChildrenList1();
-
-	if(ch_list == 1)
-	{
-		if (isSgForStmt(stmt->childList1(0)))
-		{
-			ret_val = AnalizeLoopNest(isSgForStmt(stmt->childList1(0)), ret_val + 1);
-		}
-	}
-	else if(ch_list == 2)
-	{
-		if (isSgForStmt(stmt->childList1(0)) && stmt->childList1(1)->variant() == CONTROL_END)
-		{
-			ret_val = AnalizeLoopNest(isSgForStmt(stmt->childList1(0)), ret_val + 1);
-		}
-	}
-
-	return ret_val;
-}
-
-void SearchInnerFor(SgForStmt *in, int dep, SageStOp *parent)
-{
-	SgStatement *temp;
-	SgForStmt *loop;
-	SageStOp *FirstNode;
-	SageStOp *p;
-	bool flag = true;
-	for(int i = 0; i < in->numberOfChildrenList1(); ++i)
-	{
-		SageStOp *find = new SageStOp();
-		temp = in->childList1(i);
-		if (loop = isSgForStmt(temp))
-		{
-			loop->convertLoop();
-			parent->count_inner_loops++;
-
-			find->depth = dep;
-			find->line_code = loop->lineNumber();
-			find->loop_op = loop;
-			find->numChList1 = loop->numberOfChildrenList1();
-			find->numChList2 = loop->numberOfChildrenList2();
-			find->count_inner_loops = 0;
-			find->inner_loops = NULL;
-			find->LoopNest = AnalizeLoopNest(loop,1);
-
-			if (flag)
-			{
-				FirstNode = find;
-				p = find;
-				flag = !flag;
-			} 
-			else
-			{
-				p->next = find;
-				p = find;				
-			}
-			
-			if(DEBUG)
-			{
-				for(int k = 0; k < dep; k ++)
-					out << "  ";
-				out << "found loop in " << loop->lineNumber() << " line with " << loop->numberOfChildrenList1() << " inner ops\n";
-			}
-			
-			SearchInnerFor(loop, dep + 1, find);
-		}		
-	}
-	if (parent->count_inner_loops != 0)
-	{
-		parent->inner_loops = FirstNode;
-	}
-	else
-	{
-		parent->inner_loops = NULL;
-	}	
-}
-
-SageStOp* ForSearch(SgStatement *start)
-{
-	SgForStmt *loop;
-	SgStatement *op = start;
-	int count_of_parent = 0;
-	SageStOp *AllForLoops;
-	SageStOp *q = NULL;
-	while(op)
-	{
-		SageStOp *p = new SageStOp();
-		if(loop = isSgForStmt(op))
-		{
-			loop->convertLoop();		
-			
-			count_of_parent++;
-			p->depth = 0;
-			p->count_inner_loops = 0;
-			p->line_code = loop->lineNumber();
-			p->loop_op = loop;
-			p->numChList1 = loop->numberOfChildrenList1();
-			p->numChList2 = loop->numberOfChildrenList2();
-			p->LoopNest = AnalizeLoopNest(loop,1);
-
-			if (q == NULL)
-			{
-				AllForLoops = p;
-				q = p;
-			} 
-			else
-			{
-				q->next = p;
-				q = p;
-			}
-
-			if(DEBUG)
-				out << "found parent loop in " << loop->lineNumber() << " line with " << loop->numberOfChildrenList1() << " inner ops\n";
-			SearchInnerFor(loop, 1, p);
-			op = loop->childList1(loop->numberOfChildrenList1() - 1);	
-		}
-		op = op->lexNext();
-	}
-	return AllForLoops;
-}
-
-bool EqualSageSymbols(SageSymbols *first, SageSymbols *second)
-{
-	SageSymbols *q = first;
-	SageSymbols *p = second;
-	int count_f = 0;
-	int count_s = 0;
-	bool ret_val = false;
-
-	while (q)
-	{
-		count_f++;
-		q = q->next;
-	}
-	while (p)
-	{
-		count_s++;
-		p = p->next;
-	}
-	if(count_f == count_s)
-	{
-		q = first;
-		p = second; 
-		ret_val = true;
-		for (int i = 0; i < count_f; ++i)
-		{
-			if(p->symb && q->symb)
-			{
-				if(p->symb->id() != q->symb->id())
-				{
-					ret_val = false;
-					break;
-				}
-			}
-			else
-			{
-				ret_val = false;
-				break;
-			}
-			p = p->next;
-			q = q->next;
-		}
-	}
-	
-	return ret_val;
-}
-
-bool CheckExist(SageSymbols *templateParallel, SageSymbols *oneElem)
-{
-	bool ret_val = false;
-	SageSymbols *q = templateParallel;
-	while (q)
-	{
-		if(oneElem->symb != NULL)
-			if (oneElem->symb->id() == q->symb->id())
-			{
-				ret_val = true;
-				break;
-			}
-		q = q->next;
-	}
-	return ret_val;
-}
-
-bool CheckExist(Templates *t, SageSymbols *oneElem)
-{
-	bool ret_val = false;
-	Templates *q = t;
-	while (q)
-	{
-		if (EqualSageSymbols(q->first,oneElem))
-		{
-			q->count++;
-			ret_val = true;
-			break;
-		}
-		q = q->next;
-	}
-	return ret_val;
-}
-
-SageSymbols* CreateNeededOrder(SageSymbols *templateParallel, SageSymbols *ArrayOrder)
-{
-	int templ = 0;
-	int arr = 0;
-	SageSymbols *q = templateParallel;
-	SageSymbols *ret_val;
-	while (q)
-	{
-		templ++;
-		q = q->next;
-	}
-	q = ArrayOrder;
-	while (q)
-	{
-		arr++;
-		q = q->next;
-	}
-
-	q = new SageSymbols();
-	SageSymbols *temp = ArrayOrder;
-	ret_val = q;
-	for(int i = 0; i < arr; ++i)
-	{
-		if(CheckExist(templateParallel,temp))
-		{
-			q->next = new SageSymbols();
-			q = q->next;
-			q->len = temp->len;
-			q->symb = temp->symb;
-			q->next = NULL;
-		}
-		temp = temp->next;
-	}
-	return ret_val->next;
-}
-
-SageSymbols* CheckOrder(SageSymbols *templateParallel, SageSymbols *ArrayOrder)
-{
-	SageSymbols *q_t = templateParallel;
-	SageSymbols *q_a = ArrayOrder;
-	SageSymbols *neededOrder = new SageSymbols();
-	neededOrder->len = 0;
-	neededOrder->next = NULL;
-	neededOrder->symb = NULL;
-
-	int find_idx = 0;
-	int all_idx = 0;
-
-	while (q_t)
-	{
-		all_idx++;
-		q_t = q_t->next;
-	}
-
-	while (q_a)
-	{
-		q_t = templateParallel;
-		while (q_t)
-		{
-			if(q_a->symb)
-				if (q_a->symb->id() == q_t->symb->id())
-					find_idx++;
-			q_t = q_t->next;
-		}
-		q_a = q_a->next;
-	}
-	if(find_idx != all_idx)
-		neededOrder->len = -1;
-	else
-	{
-		q_t = templateParallel;
-		q_a = ArrayOrder;
-		while (q_a)
-		{
-			if(q_a->symb)
-				if (q_a->symb->id() == q_t->symb->id())
-				{
-					if (q_t->next)
-						q_t = q_t->next;
-					else	
-					{
-						q_t = NULL;
-						break;
-					}
-				}
-			q_a = q_a->next;
-		}
-		if (q_t == NULL)	
-			neededOrder->len = 1;
-		else			
-		{
-			delete neededOrder;
-			neededOrder = CreateNeededOrder(templateParallel, ArrayOrder);
-			neededOrder->len = 0;
-		}
-	}
-	
-	return neededOrder;
-}
-
-int compare (const void * first, const void * second)
-{
-	SageSymbols *p = (SageSymbols*)first;
-	SageSymbols *q = (SageSymbols*)second;
-	if(p->len > q->len)
-		return -1;
-	else if(p->len < q->len)
-		return 1;
-	else
-		return 0;
-}
-
-SageSymbols* CreateOrderForArray( SageSymbols **Idxs, int count, int *dims)
-{
-	bool flag = true;
-	SageSymbols *retval = NULL;
-
-	// check for null var idxs in Array Ref
-	/*for(int i = 0; i < count; ++i)
-	{
-		if(!Idxs[i]->symb)
-		{
-			for (int k = 0; k < count; ++k)
-			{	
-				if(Idxs[k]->symb)
-					cerr << Idxs[k]->symb->identifier() << " ";
-				else
-					cerr << " NULL ";
-			}
-			cerr << endl;
-			flag = false;
-			break;
-		}
-	}*/
-	if (flag)
-	{
-		int k = dims[0];
-		SageSymbols *sortArr = new SageSymbols[count];
-		for(int i = 1; i < count; ++i)
-		{
-			Idxs[i]->len = Idxs[i]->len * k;
-			k *= dims[i];			
-		}
-
-		for(int i = 0; i < count; ++i)
-		{
-			sortArr[i] = *Idxs[i];
-		}
-		qsort(sortArr, count, sizeof(SageSymbols),compare);
-				
-		SageSymbols *p = new SageSymbols();
-		retval = p;
-
-		for(int i = 0; i < count; ++i)
-		{
-			SageSymbols *q = new SageSymbols();
-			q->len = sortArr[i].len;
-			q->next = NULL;
-			q->symb = sortArr[i].symb;
-			p->next = q;
-			p = q;		
-		}
-
-		retval = retval->next;
-	}
-
-	return retval;
-}
-
-int* GetIdxOfArrRef(SgExpression *expr)
-{
-	int *ret_idx = NULL;
-	int dim;
-	SgArrayType *arrayt;
-
-	if(arrayt = isSgArrayType(expr->symbol()->type()))
-	{
-		dim = arrayt->dimension();
-		if (DEBUG_LV3)
-			out << " dim = " << dim << endl;
-		ret_idx = new int[dim];
-		for(int i = 0; i < dim; i++) 
-		{  
-			if(arrayt->sizeInDim(i))
-				if (arrayt->sizeInDim(i)->variant() == STAR_RANGE)
-				{
-					if (DEBUG)
-						out << " Warning: array in place " << i << " has * dimention size - replaced by 100 dim" << endl;
-					ret_idx[i] = 100;
-					continue;
-				}
-			ret_idx[i] = CountExpr(arrayt->sizeInDim(i), 0);
-			if(ret_idx[i] == 0)
-			{
-				if (DEBUG)
-					out << " unknown value in dimention in place " << i << " with variant " << arrayt->sizeInDim(i)->variant() << endl;
-				delete []ret_idx;
-				ret_idx = NULL;
-				break;
-			}
-			if (DEBUG_LV3)
-				out << " size in " << i << " dim is " << ret_idx[i] << endl;
-		}
-	}
-	else
-	{
-		out << "unknown type is " << expr->symbol()->variant() << endl;
-	}
-	return ret_idx;
-}
-
-void PrintFindTemplates(Templates *t, bool flag)
-{
-	if (flag)
-	{
-		while(t)
-		{
-			if(t->first)
-			{
-				out << " template ( ";
-				SageSymbols*p = t->first;
-				while(p)
-				{
-					if(p->symb)
-						out << p->symb->identifier() << " ";
-					else
-						out << " NULL ";
-					p = p->next;
-				}
-				out << "): ";
-				if (t->read_write == 1)
-					out << "read = " << t->count << " write = " << t->count_write_read << endl;
-				else
-					out << "write = " << t->count << " read = " << t->count_write_read << endl;
-			}
-			else
-			{
-				if (t->read_write == 1)
-					out << " unknown template: read = " << t->count << " write = " << t->count_write_read << endl;
-				else
-					out << " unknown template: write = " << t->count << " read = " << t->count_write_read << endl;
-			}
-			t = t->next;
-		}
-	}
-	else
-	{
-		if(t->read_write == 0)
-		{
-			while(t)
-			{
-				if(t->first)
-				{
-					out << " write template ( ";
-					SageSymbols*p = t->first;
-					while(p)
-					{
-						if(p->symb)
-							out << p->symb->identifier()<< " ";
-						else
-							out << " NULL ";
-						p = p->next;
-					}
-					out << ") = " << t->count << endl;
-				}
-				else
-				{
-					out << " write unknown " << t->count << endl;
-				}
-				t = t->next;
-			}
-		}
-		else
-		{
-			while(t)
-			{
-				if(t->first)
-				{
-					out << " read template ( ";
-					SageSymbols*p = t->first;
-					while(p)
-					{
-						if(p->symb)
-							out << p->symb->identifier()<< " ";
-						else
-							out << " NULL ";
-						p = p->next;
-					}
-					out << ") = " << t->count << endl;
-				}
-				else
-				{
-					out << " read unknown " << t->count << endl;
-				}
-				t = t->next;
-			}
-		}
-	}
-}
-
-Templates* CopyAllTempl(Templates* copy_t)
-{
-	Templates *t = copy_t;
-	Templates *p = new Templates();
-	Templates *ret;
-	ret = p;
-	while(t)
-	{	
-		p->next = new Templates();
-		p = p->next;
-		p->count = t->count;
-		p->first = t->first;
-		p->count_write_read = t->count_write_read;
-		p->read_write = t->read_write;
-		t = t->next;
-	}
-
-	return ret->next;
-}
-
-Templates* mergeTemplates(Templates *first,Templates *second)
-{
-	Templates *fQ = CopyAllTempl(first);
-	Templates *sQ = CopyAllTempl(second);
-	Templates *retval = new Templates();
-	Templates *temp;
-
-	retval->count = fQ->count;
-	retval->first = fQ->first;
-	retval->read_write = fQ->read_write;
-	retval->next = new Templates();
-	retval->count_write_read = sQ->count;
-	temp = retval->next;
-	fQ = fQ->next;
-	sQ = sQ->next;
-	temp->count = fQ->count;
-	temp->first = fQ->first;
-	temp->read_write = fQ->read_write;
-	temp->count_write_read = sQ->count;
-	fQ = fQ->next;
-	sQ = sQ->next;
-	
-	Templates *t = fQ;
-	while(t)
-	{
-		temp->next = new Templates();
-		temp = temp->next;
-		temp->count = t->count;
-		temp->first = t->first;
-		temp->read_write = t->read_write;
-		temp->count_write_read = 0;
-		Templates *m = sQ;
-		Templates *del_m = sQ;
-		bool f = FALSE;
-		while(m)
-		{
-			if (EqualSageSymbols(t->first,m->first))
-			{
-				temp->count_write_read = m->count;
-				if(f)
-					del_m->next = m->next;
-				else
-					sQ = NULL;
-				break;
-			}
-			if (f)
-				del_m = del_m->next;
-			else
-				f = TRUE;
-			m = m->next;
-		}
-		t = t->next;
-	}
-	while(sQ)
-	{
-		temp->next = new Templates();
-		temp = temp->next;
-		temp->count = sQ->count;
-		temp->first = sQ->first;
-		temp->read_write = sQ->read_write;
-		temp->count_write_read = 0;
-		sQ = sQ->next;
-	}
-	temp->next = NULL;
-	return retval;
-}
-
-bool SwapIfNeed(Templates *merge, SgForStmt *loop, SgExpression *DVM_par)
-{
-	bool swap_ret = false;
-	int count_swap_op = 0;
-	Templates *swap = NULL;
-
-	Templates *t = merge->next->next;
-	int max = merge->count + merge->count_write_read;
-	while(t)
-	{
-		if(max < t->count + t->count_write_read)
-		{
-			max = t->count + t->count_write_read;
-			swap = t;
-		}
-		t = t->next;
-	}
-
-	if (swap != NULL)
-	{
-		swap_ret = true;
-		out << " need swap for ( ";
-		for(SageSymbols *t = swap->first;t != NULL; t = t->next)
-		{
-			out << t->symb->identifier() << " ";
-		}
-		out << ") template\n";
-
-		SageSymbols *t = swap->first;
-		SgExpression *e = DVM_par;
-		int count = 0;
-		while(t)
-		{
-			e->lhs()->setSymbol(t->symb);
-			e = e->rhs();
-			t = t->next;
-			count++;
-		}
-
-		SgForStmt **swapFor = new SgForStmt*[count];
-		SgForStmt *forL = loop;
-		count = 0;
-		while(forL)
-		{
-			t = swap->first;
-			while(t)
-			{
-				if(forL->symbol()->id() == t->symb->id())
-				{
-					swapFor[count] = forL;
-					count++;
-					break;
-				}
-				t = t->next;
-			}
-			forL = isSgForStmt(forL->getNextLoop());
-		}
-
-		t = swap->first;
-		for (int i = 0; i < count; ++i)
-		{			
-			if(swapFor[i]->symbol()->id() != t->symb->id())
-			{
-				int s = i + 1;
-				for( ;s < count ;s++)
-				{
-					if(swapFor[s]->symbol()->id() == t->symb->id())
-						break;
-				}
-				SwapFors(swapFor[i], swapFor[s]);
-			}
-			t = t->next;
-		}
-	}
-	else
-	{
-		out << " not swap need " << endl;
-	}
-	return swap_ret;
-}
-bool SwapIfNeed(Templates *read, Templates *write, SgForStmt *loop, SgExpression *DVM_par)
-{
-	bool swap_ret = false;
-	int count_read = 0;
-	int count_write = 0;
-	Templates *swapR = NULL;
-	Templates *swapW = NULL;
-
-	Templates *t = read->next->next;
-	int max = read->count;
-	while(t)
-	{
-		if(max < t->count)
-		{
-			max = t->count;
-			swapR = t;
-		}
-		t = t->next;
-	}
-	if(max < write->count)
-	{
-		max = write->count;
-		swapR = NULL;
-	}
-	t = write->next->next;
-	while(t)
-	{
-		if(max < t->count)
-		{
-			max = t->count;
-			swapW = t;
-		}
-		t = t->next;
-	}
-	if (swapR != NULL)
-	{
-		swap_ret = true;
-		out << " need swap for read " << endl;
-		SageSymbols *t = swapR->first;
-		SgExpression *e = DVM_par;
-		int count = 0;
-		while(t)
-		{
-			e->lhs()->setSymbol(t->symb);
-			e = e->rhs();
-			t = t->next;
-			count++;
-		}
-
-		SgForStmt **swapFor = new SgForStmt*[count];
-		SgForStmt *forL = loop;
-		count = 0;
-		while(forL)
-		{
-			t = swapR->first;
-			while(t)
-			{
-				if(forL->symbol()->id() == t->symb->id())
-				{
-					swapFor[count] = forL;
-					count++;
-					break;
-				}
-				t = t->next;
-			}
-			forL = isSgForStmt(forL->getNextLoop());
-		}
-
-		t = swapR->first;
-		for (int i = 0; i < count; ++i)
-		{			
-			if(swapFor[i]->symbol()->id() != t->symb->id())
-			{
-				int s = i + 1;
-				for( ;s < count ;s++)
-				{
-					if(swapFor[s]->symbol()->id() == t->symb->id())
-						break;
-				}
-				SwapFors(swapFor[i], swapFor[s]);
-			}
-			t = t->next;
-		}
-	}
-	else if (swapW != NULL)
-	{
-		swap_ret = true;
-		out << " need swap for write " << endl;
-		SageSymbols *t = swapW->first;
-		SgExpression *e = DVM_par;
-		int count = 0;
-		while(t)
-		{
-			e->lhs()->setSymbol(t->symb);
-			e = e->rhs();
-			t = t->next;
-			count++;
-		}
-
-		SgForStmt **swapFor = new SgForStmt*[count];
-		SgForStmt *forL = loop;
-		count = 0;
-		while(forL)
-		{
-			t = swapW->first;
-			while(t)
-			{
-				if(forL->symbol()->id() == t->symb->id())
-				{
-					swapFor[count] = forL;
-					count++;
-					break;
-				}
-				t = t->next;
-			}			
-			forL = isSgForStmt(forL->getNextLoop());
-		}
-
-		t = swapW->first;
-		for (int i = 0; i < count; ++i)
-		{
-			if(swapFor[i]->symbol()->id() != t->symb->id())
-			{
-				int s = i + 1;
-				for( ;s < count; s++)
-				{
-					if(swapFor[s]->symbol()->id() == t->symb->id())
-						break;
-				}
-				SwapFors(swapFor[i], swapFor[s]);
-			}
-			t = t->next;
-		}
-	}
-	else
-	{
-		out << " not swap need " << endl;
-	}
-	return swap_ret;
-}
-
-int allSwaps = 0;
-void AnalizeAllFors(SageStOp *first)
-{
-	for (SageStOp *p = first; p != NULL; p = p->next)
-	{
-		if (p->LoopNest > 1)
-		{
-			SgStatement *temp = p->loop_op->lexPrev();
-			
-			if (temp->variant() == DVM_PARALLEL_ON_DIR)
-			{
-				// create template from parallel directive
-				SageSymbols *templateParalell;
-				SageSymbols *p_t = new SageSymbols();
-				templateParalell = p_t;
-
-				SgExpression *first = temp->expr(2);
-				while(first)
-				{
-					SageSymbols *q = new SageSymbols();
-					q->len = -1;
-					q->next = NULL;
-					q->symb = first->lhs()->symbol();
-					p_t->next = q;
-					p_t = q;
-					first = first->rhs();
-				}
-				//p_t = templateParalell;
-				templateParalell = templateParalell->next;
-				//p_t->next = NULL;
-				//delete p_t;
-
-				Templates *R_temp = new Templates();
-				Templates *W_temp = new Templates();
-				Templates *ReadOper = R_temp;
-				Templates *WriteOper = W_temp;
-				
-				ReadOper->count = 0;
-				ReadOper->first = templateParalell;
-				ReadOper->next = new Templates();
-				ReadOper->read_write = 1;
-				ReadOper->next->count = 0;
-				ReadOper->next->first = NULL;
-				ReadOper->next->next = NULL;
-				ReadOper->next->read_write = 1;
-				ReadOper->count_write_read = 0;
-
-				WriteOper->count = 0;
-				WriteOper->first = templateParalell;
-				WriteOper->next = new Templates();
-				WriteOper->read_write = 0;
-				WriteOper->next->first = NULL;
-				WriteOper->next->next = NULL;
-				WriteOper->next->read_write = 0;
-				WriteOper->count_write_read = 0;
-
-				R_temp = R_temp->next;
-				W_temp = W_temp->next;
-
-				SageStOp *q = p;
-				for(int i = 0; i < p->LoopNest - 1; ++i)
-				{
-					q = q->inner_loops;
-				}
-				out << " \nAnalize LoopNest in line " << p->loop_op->lineNumber() << endl;
-				SageArrayIdxs *AllArrayRefInLoop;					
-				AllArrayRefInLoop = Analize(q->loop_op,q->numChList1);
-				
-				if(DEBUG_LV2)
-					out << " Analize func OK\n";
-				while (AllArrayRefInLoop)
-				{
-					bool flag;
-					if(AllArrayRefInLoop->dim)
-						flag = true;
-					else
-						flag = false;
-					for(int i = 0; i < AllArrayRefInLoop->dim; ++i)
-					{
-						//out << " len " << AllArrayRefInLoop->symb[i]->len << " for idx " << AllArrayRefInLoop->symb[i]->symb->identifier();
-						if (AllArrayRefInLoop->symb[i]->len == -1)
-						{
-							flag = !flag;
-							break;
-						}
-					}
-					if (flag)
-					{		
-						SageSymbols *params, *neededOrder;
-						bool flag_null = false;
-						if(DEBUG_LV2)
-							out << "before GetIdxOfArrRef func\n";
-						int *dims = GetIdxOfArrRef(AllArrayRefInLoop->array_expr);
-						if(DEBUG_LV2)
-							out << "after GetIdxOfArrRef func\n before CreateOrderForArray func\n";
-						if (dims)
-						{
-							params = CreateOrderForArray(AllArrayRefInLoop->symb, AllArrayRefInLoop->dim, dims);
-							if(DEBUG_LV2)
-								out << "after CreateOrderForArray func\n before CheckOrder func\n";
-							if (params)
-							{
-								neededOrder = CheckOrder(templateParalell,params);
-								if(DEBUG_LV2)
-									out << "after CheckOrder func\n";
-							}
-							else							
-								flag_null = true;							
-						}
-						else
-							flag_null = true;
-						
-						if(flag_null)
-						{
-							neededOrder = new SageSymbols();
-							neededOrder->len = -1;
-							neededOrder->next = NULL;
-							neededOrder->symb = NULL;
-						}
-						//out << " :rez = " << neededOrder->len;
-						switch(neededOrder->len)
-						{
-						case 0:
-							if(AllArrayRefInLoop->read_write)
-							{
-								if(!CheckExist(ReadOper, neededOrder))
-								{
-									R_temp->next = new Templates();
-									R_temp = R_temp->next;
-									R_temp->count = 1;
-									R_temp->first = neededOrder;
-									R_temp->next = NULL;
-									R_temp->read_write = 1;
-									R_temp->count_write_read = 0;
-								}
-							}
-							else
-								if(!CheckExist(WriteOper, neededOrder))
-								{
-									W_temp->next = new Templates();
-									W_temp = W_temp->next;
-									W_temp->count = 1;
-									W_temp->first = neededOrder;
-									W_temp->next = NULL;
-									W_temp->read_write = 0;
-									W_temp->count_write_read = 0;
-								}
-							break;
-						case 1:
-							if(AllArrayRefInLoop->read_write)
-								ReadOper->count++;
-							else
-								WriteOper->count++;
-							break;
-						case -1:
-							if(AllArrayRefInLoop->read_write)
-								ReadOper->next->count++;
-							else
-								WriteOper->next->count++;
-							break;
-						default:
-							if(DEBUG)
-								out << " unknown case in switch-template\n";
-							break;
-						}
-					}
-					else
-					{
-						if(AllArrayRefInLoop->read_write)
-							ReadOper->next->count++;
-						else
-							WriteOper->next->count++;
-					}
-					//out << endl;					
-					AllArrayRefInLoop = AllArrayRefInLoop->next;
-										
-				}
-				Templates *MerT = mergeTemplates(ReadOper, WriteOper);
-				if(DEBUG)
-				{
-					PrintFindTemplates(MerT, true);
-					//PrintFindTemplates(ReadOper, false);
-					//PrintFindTemplates(WriteOper, false);
-				}
-				if(DEBUG_LV2)
-					out << " before SwapIfNeed func\n";
-				if(SwapIfNeed(MerT, p->loop_op, temp->expr(2)))
-					allSwaps++;
-				if(DEBUG_LV2)
-					out << " after SwapIfNeed func\n";
-			}
-		}
-		
-		if (p->inner_loops != NULL)
-		{
-			AnalizeAllFors(p->inner_loops);
-		}		
-	}	
-}
-
-void Print(SageStOp *first)
-{
-	for (SageStOp *p = first; p != NULL; p = p->next)
-	{
-		out << "for in line " << p->line_code << " has " << p->LoopNest << " LoopNest\n";
-		//out << "   count " << p->count_inner_loops << endl; 
-		if (p->inner_loops != NULL)
-		{
-			Print(p->inner_loops);
-		}
-	}	
-}
-
-SgExpression* findDirect(SgExpression *inExpr, int DIR)
-{
-	SgExpression *temp = NULL;
-	if (inExpr)
-	{
-		if (inExpr->variant() == DIR)
-		{
-			return inExpr;
-		}
-		else
-		{
-			if (inExpr->lhs())
-				temp = findDirect(inExpr->lhs(), DIR);
-			if(inExpr->rhs() && temp == NULL)
-				temp = findDirect(inExpr->rhs(), DIR);
-		}
-	}
-	return temp;
-}
-void GlobalAnalizeFunctionOfSwapFors(SageStOp *AllFors)
-{	
-	AnalizeAllFors(AllFors);
-	cerr << " ALL Swaps = " << allSwaps << endl;
-}
-
-SageArrayIdxs* GetIdxInParDir(SgExpression *on, SgExpression *across)
-{
-	SageArrayIdxs *ret = new SageArrayIdxs();
-	ret->next = NULL;
-	ret->array_expr = NULL;
-	ret->read_write = -1;
-	ret->dim = 0;
-	
-	SgExpression *temp = on;
-	while (temp)
-	{
-		ret->dim++;
-		temp = temp->rhs();
-	}
-
-	ret->symb = new SageSymbols*[ret->dim];
-	temp = on;
-	for (int i = 0; i < ret->dim; ++i)
-	{
-		ret->symb[i] = new SageSymbols();
-		ret->symb[i]->symb = temp->lhs()->symbol();
-		ret->symb[i]->across_left = 0;
-		ret->symb[i]->across_right = 0;
-		ret->symb[i]->next = NULL;
-		temp = temp->rhs();
-	}
-	
-	while (across)
-	{
-		SgExpression *t = across->lhs();
-		int dim = 0;
-		if(t->variant() == ARRAY_REF)
-			t = t->lhs();
-		else if(t->variant() == ARRAY_OP)
-			t = t->lhs()->lhs();
-		else
-		{
-			if(DEBUG)
-				out << "!!! unknown vatiant in ACROSS dir: " << t->variant() << endl;
-		}
-
-		while (t)
-		{
-			ret->symb[dim]->across_left = MAX(ret->symb[dim]->across_left, t->lhs()->lhs()->valueInteger());
-			ret->symb[dim]->across_right = MAX(ret->symb[dim]->across_right, t->lhs()->rhs()->valueInteger());
-			dim ++;
-			t = t->rhs();
-		}
-		across = across->rhs();
-	}
-
-	return ret;
-}
-
-void GlobalAnalizeFunction(SgFile *file)
-{
-	out << endl << fin_name << endl;
-
-	SgStatement *op = file->firstStatement();
-	SageStOp *AllFors = ForSearch(file->firstStatement()->lexNext());
-	int par_loops = 0;
-	for(SageStOp *p = AllFors; p != NULL; p = p->next)
-	{
-		par_loops++;
-	}			
-	if(DEBUG)
-	{
-		out << "\n ***** FOUND ***** " << par_loops << " parent fors\n\n";
-		//Print(AllFors);
-	}
-	GlobalAnalizeFunctionOfSwapFors(AllFors);
-}
-
-char* OnlyName(char *filename)
-{  
-	char *basename;
-	int i;
-	basename = new char[strlen(filename) + 4];
-
-	strcpy (basename,filename);
-	for (i = strlen(filename) - 1 ; i >= 0 ; --i)
-	{
-		if ( basename[i] == '.' )
-		{
-			basename[i] ='\0';
-			break;
-		}
-	}
-
-	return(basename); 
-}
-
-int main(int argc, char *argv[])
-{ 
-	FILE *fout;
-	char fout_name[80];
-	char *db_name = NULL;
-	char *proj_name = "dvm.proj";
-	int i,n, i_file;
-	SgFile *file;
-
-	argv ++;
-	if(argc > 1)
-	{  
-		proj_name = *argv;
-		db_name = OnlyName(proj_name);
-	}
-	
-	SgProject project(proj_name);
-	fin_name = new char[80];
-	n = project.numberOfFiles();
-	cerr << "number of files in project " << n << endl;
-	fin_name = project.fileName(n - 1); 
-
-	// looking through the file list of project (second time)
-	for(i = n - 1; i >= 0; --i)
-	{
-		file = &(project.file(i));  
-		current_file = file;   // global variable 
-		i_file = i;
-		fin_name = project.fileName(i);   
-		cerr <<  "Analyzing: " << fin_name << endl;
-		GlobalAnalizeFunction(file);
-		sprintf(fout_name,"%s.f",OnlyName(fin_name));
-		file->saveDepFile(strcat(OnlyName(fin_name),".dep"));
-		cerr << "Saving in file: " << strcat(OnlyName(fin_name),".dep") << endl;
-		//unparsing into file
-		if(DEBUG_LV2)
-		{
-			if((fout = fopen(fout_name,"w")) == NULL) 
-			{
-				cerr << "Can't open file " << fout_name << " for write\n";
-				return 1;
-			}   
-			cerr << "Unparsing: " << fout_name << endl;
-			file->unparse(fout);  
-			if((fclose(fout)) < 0) 
-			{
-				cerr << "Could not close " << fout_name << endl;
-				return 1;
-			}
-		}
-	}  
-	cerr << "All work done successfully!\n";
-	getchar();
-	return 0;	
-}
diff --git a/projects/dvm_svn/fdvm/trunk/sageExample/makefile.uni b/projects/dvm_svn/fdvm/trunk/sageExample/makefile.uni
deleted file mode 100644
index dcdad98..0000000
--- a/projects/dvm_svn/fdvm/trunk/sageExample/makefile.uni
+++ /dev/null
@@ -1,42 +0,0 @@
-#echo#######################################################################
-# Makefile for   Fortran DVM transformator
-#
-#echo#######################################################################
-
-# dvm/fdvm/fdvm_transform/makefile.uni
-
-SAGEROOT = ../Sage
-LIBDIR = ../lib
-BINDIR = ../../bin
-LIBINCLUDE = $(SAGEROOT)/lib/include
-HINCLUDE = $(SAGEROOT)/h
-DVMINCLUDE = ../include
-EXECUTABLES = fdvm_transform
-
-LOADER = $(CXX)
-
-INCL = -I. -I$(LIBINCLUDE) -I$(HINCLUDE) -I$(DVMINCLUDE)
-
-CFLAGS = -c $(INCL)
-LDFLAGS =
-
-LIBS = $(LIBDIR)/libSage++.a $(LIBDIR)/libsage.a $(LIBDIR)/libdb.a
-OBJS = SwapFors.o
-
-
-$(BINDIR)/$(EXECUTABLES): $(OBJS)
-	$(LOADER) $(LDFLAGS) -o $(BINDIR)/$(EXECUTABLES) $(OBJS) $(LIBS)
-
-all: $(BINDIR)/$(EXECUTABLES)
-	@echo "****** COMPILING $(EXECUTABLES) DONE ******"
-
-clean:
-	rm -f $(OBJS)
-cleanall:
-	rm -f $(OBJS)
-
-############################# dependencies ############################
-
-
-SwapFors.o: SwapFors.cpp $(DVMINCLUDE)/dvm.h
-	$(CXX) $(CFLAGS) SwapFors.cpp
diff --git a/projects/dvm_svn/fdvm/trunk/sageExample/makefile.win b/projects/dvm_svn/fdvm/trunk/sageExample/makefile.win
deleted file mode 100644
index a5c58c5..0000000
--- a/projects/dvm_svn/fdvm/trunk/sageExample/makefile.win
+++ /dev/null
@@ -1,59 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# dvm/fdvm/fdvm_transform/makefile.win
-
-OUTDIR = ..\obj
-BINDIR = ..\..\bin
-LIBDIR = ..\lib
-SAGEROOT =..\Sage
-
-LIBINCLUDE = $(SAGEROOT)\lib\include
-HINCLUDE = $(SAGEROOT)\h
-FDVMINCL = ..\include
-EXECUTABLES = fdvm_transform
-
-INCL = -I. -I$(LIBINCLUDE) -I$(HINCLUDE) -I$(FDVMINCL)
-
-
-# -w don't issue warning now.
-#CFLAGS=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-#	/Fp"$(OUTDIR)/fdvm_transform.pch" /YX /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-CFLAGS=/nologo /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D SYS5 $(INCL) \
-	/Fp"$(OUTDIR)/fdvm_transform.pch" /Fo"$(OUTDIR)/" /Fd"$(OUTDIR)/" /c 
-
-.cpp{$(OUTDIR)/}.obj:
-    $(CXX) $(CFLAGS) $<
-
-LINK=$(LINKER)
- 
-LINK_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-LINK_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-OBJS = $(OUTDIR)/SwapFors.obj
-
-LIBS = $(LIBDIR)/libSage++.lib $(LIBDIR)\libsage.lib $(LIBDIR)\libdb.lib 
-
-
-$(BINDIR)/$(EXECUTABLES).exe: $(OBJS)
-	$(LINK) @<<
-	$(LINK_FLAGS) $(OBJS) $(LIBS)  
-<<
-
-all: $(BINDIR)/$(EXECUTABLES).exe
-    @echo "*** COMPILING EXECUTABLE $(EXECUTABLES) DONE"
-
-
-clean:
-
-cleanall:
-
-
-# ***********************************************************
-
-SwapFors.obj: SwapFors.cpp $(FDVMINCL)/dvm.h
diff --git a/projects/dvm_svn/tools/Zlib/CMakeLists.txt b/projects/dvm_svn/tools/Zlib/CMakeLists.txt
deleted file mode 100644
index 27e4941..0000000
--- a/projects/dvm_svn/tools/Zlib/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(src)
diff --git a/projects/dvm_svn/tools/Zlib/include/deflate.h b/projects/dvm_svn/tools/Zlib/include/deflate.h
deleted file mode 100644
index ea65bb9..0000000
--- a/projects/dvm_svn/tools/Zlib/include/deflate.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-2002 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef _DEFLATE_H
-#define _DEFLATE_H
-
-#include "zutil.h"
-
-/* ===========================================================================
- * Internal compression state.
- */
-
-#define LENGTH_CODES 29
-/* number of length codes, not counting the special END_BLOCK code */
-
-#define LITERALS  256
-/* number of literal bytes 0..255 */
-
-#define L_CODES (LITERALS+1+LENGTH_CODES)
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-#define D_CODES   30
-/* number of distance codes */
-
-#define BL_CODES  19
-/* number of codes used to transfer the bit lengths */
-
-#define HEAP_SIZE (2*L_CODES+1)
-/* maximum heap size */
-
-#define MAX_BITS 15
-/* All codes must not exceed MAX_BITS bits */
-
-#define INIT_STATE    42
-#define BUSY_STATE   113
-#define FINISH_STATE 666
-/* Stream status */
-
-
-/* Data structure describing a single value and its code string. */
-typedef struct ct_data_s {
-    union {
-        ush  freq;       /* frequency count */
-        ush  code;       /* bit string */
-    } fc;
-    union {
-        ush  dad;        /* father node in Huffman tree */
-        ush  len;        /* length of bit string */
-    } dl;
-} FAR ct_data;
-
-#define Freq fc.freq
-#define Code fc.code
-#define Dad  dl.dad
-#define Len  dl.len
-
-typedef struct static_tree_desc_s  static_tree_desc;
-
-typedef struct tree_desc_s {
-    ct_data *dyn_tree;           /* the dynamic tree */
-    int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc *stat_desc; /* the corresponding static tree */
-} FAR tree_desc;
-
-typedef ush Pos;
-typedef Pos FAR Posf;
-typedef unsigned IPos;
-
-/* A Pos is an index in the character window. We use short instead of int to
- * save space in the various tables. IPos is used only for parameter passing.
- */
-
-typedef struct internal_state {
-    z_streamp strm;      /* pointer back to this zlib stream */
-    int   status;        /* as the name implies */
-    Bytef *pending_buf;  /* output still pending */
-    ulg   pending_buf_size; /* size of pending_buf */
-    Bytef *pending_out;  /* next pending byte to output to the stream */
-    int   pending;       /* nb of bytes in the pending buffer */
-    int   noheader;      /* suppress zlib header and adler32 */
-    Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
-    int   last_flush;    /* value of flush param for previous deflate call */
-
-                /* used by deflate.c: */
-
-    uInt  w_size;        /* LZ77 window size (32K by default) */
-    uInt  w_bits;        /* log2(w_size)  (8..16) */
-    uInt  w_mask;        /* w_size - 1 */
-
-    Bytef *window;
-    /* Sliding window. Input bytes are read into the second half of the window,
-     * and move to the first half later to keep a dictionary of at least wSize
-     * bytes. With this organization, matches are limited to a distance of
-     * wSize-MAX_MATCH bytes, but this ensures that IO is always
-     * performed with a length multiple of the block size. Also, it limits
-     * the window size to 64K, which is quite useful on MSDOS.
-     * To do: use the user input buffer as sliding window.
-     */
-
-    ulg window_size;
-    /* Actual size of window: 2*wSize, except when the user input buffer
-     * is directly used as sliding window.
-     */
-
-    Posf *prev;
-    /* Link to older string with same hash index. To limit the size of this
-     * array to 64K, this link is maintained only for the last 32K strings.
-     * An index in this array is thus a window index modulo 32K.
-     */
-
-    Posf *head; /* Heads of the hash chains or NIL. */
-
-    uInt  ins_h;          /* hash index of string to be inserted */
-    uInt  hash_size;      /* number of elements in hash table */
-    uInt  hash_bits;      /* log2(hash_size) */
-    uInt  hash_mask;      /* hash_size-1 */
-
-    uInt  hash_shift;
-    /* Number of bits by which ins_h must be shifted at each input
-     * step. It must be such that after MIN_MATCH steps, the oldest
-     * byte no longer takes part in the hash key, that is:
-     *   hash_shift * MIN_MATCH >= hash_bits
-     */
-
-    long block_start;
-    /* Window position at the beginning of the current output block. Gets
-     * negative when the window is moved backwards.
-     */
-
-    uInt match_length;           /* length of best match */
-    IPos prev_match;             /* previous match */
-    int match_available;         /* set if previous match exists */
-    uInt strstart;               /* start of string to insert */
-    uInt match_start;            /* start of matching string */
-    uInt lookahead;              /* number of valid bytes ahead in window */
-
-    uInt prev_length;
-    /* Length of the best match at previous step. Matches not greater than this
-     * are discarded. This is used in the lazy match evaluation.
-     */
-
-    uInt max_chain_length;
-    /* To speed up deflation, hash chains are never searched beyond this
-     * length.  A higher limit improves compression ratio but degrades the
-     * speed.
-     */
-
-    uInt max_lazy_match;
-    /* Attempt to find a better match only when the current match is strictly
-     * smaller than this value. This mechanism is used only for compression
-     * levels >= 4.
-     */
-#   define max_insert_length  max_lazy_match
-    /* Insert new strings in the hash table only if the match length is not
-     * greater than this length. This saves time but degrades compression.
-     * max_insert_length is used only for compression levels <= 3.
-     */
-
-    int level;    /* compression level (1..9) */
-    int strategy; /* favor or force Huffman coding*/
-
-    uInt good_match;
-    /* Use a faster search when the previous match is longer than this */
-
-    int nice_match; /* Stop searching when current match exceeds this */
-
-                /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-    int heap_len;               /* number of elements in the heap */
-    int heap_max;               /* element of largest frequency */
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-     * The same heap array is used to build all trees.
-     */
-
-    uch depth[2*L_CODES+1];
-    /* Depth of each subtree used as tie breaker for trees of equal frequency
-     */
-
-    uchf *l_buf;          /* buffer for literals or lengths */
-
-    uInt  lit_bufsize;
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for
-     * limiting lit_bufsize to 64K:
-     *   - frequencies can be kept in 16 bit counters
-     *   - if compression is not successful for the first block, all input
-     *     data is still in the window so we can still emit a stored block even
-     *     when input comes from standard input.  (This can also be done for
-     *     all blocks if lit_bufsize is not greater than 32K.)
-     *   - if compression is not successful for a file smaller than 64K, we can
-     *     even emit a stored file instead of a stored block (saving 5 bytes).
-     *     This is applicable only for zip (not gzip or zlib).
-     *   - creating new Huffman trees less frequently may not provide fast
-     *     adaptation to changes in the input data statistics. (Take for
-     *     example a binary file with poorly compressible code followed by
-     *     a highly compressible string table.) Smaller buffer sizes give
-     *     fast adaptation but have of course the overhead of transmitting
-     *     trees more frequently.
-     *   - I can't count above 4
-     */
-
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
-
-    ulg opt_len;        /* bit length of current block with optimal trees */
-    ulg static_len;     /* bit length of current block with static trees */
-    uInt matches;       /* number of string matches in current block */
-    int last_eob_len;   /* bit length of EOB code for last block */
-
-#ifdef DEBUG
-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
-#endif
-
-    ush bi_buf;
-    /* Output buffer. bits are inserted starting at the bottom (least
-     * significant bits).
-     */
-    int bi_valid;
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit
-     * are always zero.
-     */
-
-} FAR deflate_state;
-
-/* Output a byte on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
-
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
-/* In order to simplify the code, particularly on 16 bit machines, match
- * distances are limited to MAX_DIST instead of WSIZE.
- */
-
-        /* in trees.c */
-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-			  int eof));
-void _tr_align        OF((deflate_state *s));
-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-
-#define d_code(dist) \
-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
-/* Mapping from a distance to a distance code. dist is the distance - 1 and
- * must not have side effects. _dist_code[256] and _dist_code[257] are never
- * used.
- */
-
-#ifndef DEBUG
-/* Inline versions of _tr_tally for speed: */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch _length_code[];
-  extern uch _dist_code[];
-#else
-  extern const uch _length_code[];
-  extern const uch _dist_code[];
-#endif
-
-# define _tr_tally_lit(s, c, flush) \
-  { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
-    s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-   }
-# define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (uch)(length); \
-    ush dist = (ush)(distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
-    dist--; \
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-    s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-  }
-#else
-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-# define _tr_tally_dist(s, distance, length, flush) \
-              flush = _tr_tally(s, distance, length) 
-#endif
-
-#endif
diff --git a/projects/dvm_svn/tools/Zlib/include/infblock.h b/projects/dvm_svn/tools/Zlib/include/infblock.h
deleted file mode 100644
index 173b226..0000000
--- a/projects/dvm_svn/tools/Zlib/include/infblock.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* infblock.h -- header to use infblock.c
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-struct inflate_blocks_state;
-typedef struct inflate_blocks_state FAR inflate_blocks_statef;
-
-extern inflate_blocks_statef * inflate_blocks_new OF((
-    z_streamp z,
-    check_func c,               /* check function */
-    uInt w));                   /* window size */
-
-extern int inflate_blocks OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));                      /* initial return code */
-
-extern void inflate_blocks_reset OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    uLongf *));                  /* check value on output */
-
-extern int inflate_blocks_free OF((
-    inflate_blocks_statef *,
-    z_streamp));
-
-extern void inflate_set_dictionary OF((
-    inflate_blocks_statef *s,
-    const Bytef *d,  /* dictionary */
-    uInt  n));       /* dictionary length */
-
-extern int inflate_blocks_sync_point OF((
-    inflate_blocks_statef *s));
diff --git a/projects/dvm_svn/tools/Zlib/include/infcodes.h b/projects/dvm_svn/tools/Zlib/include/infcodes.h
deleted file mode 100644
index 46821a0..0000000
--- a/projects/dvm_svn/tools/Zlib/include/infcodes.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* infcodes.h -- header to use infcodes.c
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-struct inflate_codes_state;
-typedef struct inflate_codes_state FAR inflate_codes_statef;
-
-extern inflate_codes_statef *inflate_codes_new OF((
-    uInt, uInt,
-    inflate_huft *, inflate_huft *,
-    z_streamp ));
-
-extern int inflate_codes OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-extern void inflate_codes_free OF((
-    inflate_codes_statef *,
-    z_streamp ));
-
diff --git a/projects/dvm_svn/tools/Zlib/include/inffast.h b/projects/dvm_svn/tools/Zlib/include/inffast.h
deleted file mode 100644
index a31a4bb..0000000
--- a/projects/dvm_svn/tools/Zlib/include/inffast.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-extern int inflate_fast OF((
-    uInt,
-    uInt,
-    inflate_huft *,
-    inflate_huft *,
-    inflate_blocks_statef *,
-    z_streamp ));
diff --git a/projects/dvm_svn/tools/Zlib/include/inffixed.h b/projects/dvm_svn/tools/Zlib/include/inffixed.h
deleted file mode 100644
index 77f7e76..0000000
--- a/projects/dvm_svn/tools/Zlib/include/inffixed.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* inffixed.h -- table for decoding fixed codes
- * Generated automatically by the maketree.c program
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-local uInt fixed_bl = 9;
-local uInt fixed_bd = 5;
-local inflate_huft fixed_tl[] = {
-    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220},
-    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188},
-    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252},
-    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222},
-    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190},
-    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254},
-    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221},
-    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189},
-    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253},
-    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223},
-    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191},
-    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255}
-  };
-local inflate_huft fixed_td[] = {
-    {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097},
-    {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385},
-    {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193},
-    {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577},
-    {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145},
-    {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577},
-    {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289},
-    {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577}
-  };
diff --git a/projects/dvm_svn/tools/Zlib/include/inftrees.h b/projects/dvm_svn/tools/Zlib/include/inftrees.h
deleted file mode 100644
index 04b73b7..0000000
--- a/projects/dvm_svn/tools/Zlib/include/inftrees.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Huffman code lookup table entry--this entry is four bytes for machines
-   that have 16-bit pointers (e.g. PC's in the small or medium model). */
-
-typedef struct inflate_huft_s FAR inflate_huft;
-
-struct inflate_huft_s {
-  union {
-    struct {
-      Byte Exop;        /* number of extra bits or operation */
-      Byte Bits;        /* number of bits in this code or subcode */
-    } what;
-    uInt pad;           /* pad structure to a power of 2 (4 bytes for */
-  } word;               /*  16-bit, 8 bytes for 32-bit int's) */
-  uInt base;            /* literal, length base, distance base,
-                           or table offset */
-};
-
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1004 huft structures (850 for length/literals
-   and 154 for distances, the latter actually the result of an
-   exhaustive search).  The actual maximum is not known, but the
-   value below is more than safe. */
-#define MANY 1440
-
-extern int inflate_trees_bits OF((
-    uIntf *,                    /* 19 code lengths */
-    uIntf *,                    /* bits tree desired/actual depth */
-    inflate_huft * FAR *,       /* bits tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-extern int inflate_trees_dynamic OF((
-    uInt,                       /* number of literal/length codes */
-    uInt,                       /* number of distance codes */
-    uIntf *,                    /* that many (total) code lengths */
-    uIntf *,                    /* literal desired/actual bit depth */
-    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft * FAR *,       /* distance tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-extern int inflate_trees_fixed OF((
-    uIntf *,                    /* literal desired/actual bit depth */
-    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft * FAR *,       /* distance tree result */
-    z_streamp));                /* for memory allocation */
diff --git a/projects/dvm_svn/tools/Zlib/include/infutil.h b/projects/dvm_svn/tools/Zlib/include/infutil.h
deleted file mode 100644
index 4401df8..0000000
--- a/projects/dvm_svn/tools/Zlib/include/infutil.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* infutil.h -- types and macros common to blocks and codes
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-#ifndef _INFUTIL_H
-#define _INFUTIL_H
-
-typedef enum {
-      TYPE,     /* get type bits (3, including end bit) */
-      LENS,     /* get lengths for stored */
-      STORED,   /* processing stored block */
-      TABLE,    /* get table lengths */
-      BTREE,    /* get bit lengths tree for a dynamic block */
-      DTREE,    /* get length, distance trees for a dynamic block */
-      CODES,    /* processing fixed or dynamic block */
-      DRY,      /* output remaining window bytes */
-      DONE,     /* finished last block, done */
-      BAD}      /* got a data error--stuck here */
-inflate_block_mode;
-
-/* inflate blocks semi-private state */
-struct inflate_blocks_state {
-
-  /* mode */
-  inflate_block_mode  mode;     /* current inflate_block mode */
-
-  /* mode dependent information */
-  union {
-    uInt left;          /* if STORED, bytes left to copy */
-    struct {
-      uInt table;               /* table lengths (14 bits) */
-      uInt index;               /* index into blens (or border) */
-      uIntf *blens;             /* bit lengths of codes */
-      uInt bb;                  /* bit length tree depth */
-      inflate_huft *tb;         /* bit length decoding tree */
-    } trees;            /* if DTREE, decoding info for trees */
-    struct {
-      inflate_codes_statef 
-         *codes;
-    } decode;           /* if CODES, current state */
-  } sub;                /* submode */
-  uInt last;            /* true if this block is the last block */
-
-  /* mode independent information */
-  uInt bitk;            /* bits in bit buffer */
-  uLong bitb;           /* bit buffer */
-  inflate_huft *hufts;  /* single malloc for tree space */
-  Bytef *window;        /* sliding window */
-  Bytef *end;           /* one byte after sliding window */
-  Bytef *read;          /* window read pointer */
-  Bytef *write;         /* window write pointer */
-  check_func checkfn;   /* check function */
-  uLong check;          /* check on output */
-
-};
-
-
-/* defines for inflate input/output */
-/*   update pointers and return */
-#define UPDBITS {s->bitb=b;s->bitk=k;}
-#define UPDIN {z->avail_in=n;z->total_in+=p-z->next_in;z->next_in=p;}
-#define UPDOUT {s->write=q;}
-#define UPDATE {UPDBITS UPDIN UPDOUT}
-#define LEAVE {UPDATE return inflate_flush(s,z,r);}
-/*   get bytes and bits */
-#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;}
-#define NEEDBYTE {if(n)r=Z_OK;else LEAVE}
-#define NEXTBYTE (n--,*p++)
-#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define DUMPBITS(j) {b>>=(j);k-=(j);}
-/*   output bytes */
-#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
-#define LOADOUT {q=s->write;m=(uInt)WAVAIL;}
-#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}}
-#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
-#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;}
-#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
-/*   load local pointers */
-#define LOAD {LOADIN LOADOUT}
-
-/* masks for lower bits (size given to avoid silly warnings with Visual C++) */
-extern uInt inflate_mask[17];
-
-/* copy as much as possible from the sliding window to the output area */
-extern int inflate_flush OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-struct internal_state      {int dummy;}; /* for buggy compilers */
-
-#endif
diff --git a/projects/dvm_svn/tools/Zlib/include/trees.h b/projects/dvm_svn/tools/Zlib/include/trees.h
deleted file mode 100644
index 72facf9..0000000
--- a/projects/dvm_svn/tools/Zlib/include/trees.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* header created automatically with -DGEN_TREES_H */
-
-local const ct_data static_ltree[L_CODES+2] = {
-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
-};
-
-local const ct_data static_dtree[D_CODES] = {
-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
-};
-
-const uch _dist_code[DIST_CODE_LEN] = {
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-};
-
-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
-};
-
-local const int base_length[LENGTH_CODES] = {
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-64, 80, 96, 112, 128, 160, 192, 224, 0
-};
-
-local const int base_dist[D_CODES] = {
-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
-};
-
diff --git a/projects/dvm_svn/tools/Zlib/include/zconf.h b/projects/dvm_svn/tools/Zlib/include/zconf.h
deleted file mode 100644
index 1d25495..0000000
--- a/projects/dvm_svn/tools/Zlib/include/zconf.h
+++ /dev/null
@@ -1,283 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#ifndef _ZCONF_H
-#define _ZCONF_H
-
-#ifndef Z_PRINTF_BUFSIZE
-   #define Z_PRINTF_BUFSIZE 20000
-#endif
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_	z_deflateInit_
-#  define deflate	z_deflate
-#  define deflateEnd	z_deflateEnd
-#  define inflateInit_ 	z_inflateInit_
-#  define inflate	z_inflate
-#  define inflateEnd	z_inflateEnd
-#  define deflateInit2_	z_deflateInit2_
-#  define deflateSetDictionary z_deflateSetDictionary
-#  define deflateCopy	z_deflateCopy
-#  define deflateReset	z_deflateReset
-#  define deflateParams	z_deflateParams
-#  define inflateInit2_	z_inflateInit2_
-#  define inflateSetDictionary z_inflateSetDictionary
-#  define inflateSync	z_inflateSync
-#  define inflateSyncPoint z_inflateSyncPoint
-#  define inflateReset	z_inflateReset
-#  define compress	z_compress
-#  define compress2	z_compress2
-#  define uncompress	z_uncompress
-#  define adler32	z_adler32
-#  define crc32		z_crc32
-#  define get_crc_table z_get_crc_table
-
-#  define Byte		z_Byte
-#  define uInt		z_uInt
-#  define uLong		z_uLong
-#  define Bytef	        z_Bytef
-#  define charf		z_charf
-#  define intf		z_intf
-#  define uIntf		z_uIntf
-#  define uLongf	z_uLongf
-#  define voidpf	z_voidpf
-#  define voidp		z_voidp
-#endif
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
-#  ifndef __32BIT__
-#    define __32BIT__
-#  endif
-#endif
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#if defined(MSDOS) && !defined(__32BIT__)
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
-#  define STDC
-#endif
-#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
-#  ifndef STDC
-#    define STDC
-#  endif
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Old Borland C incorrectly complains about missing returns: */
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
-#  define NEED_DUMMY_RETURN
-#endif
-
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
-   /* MSC small or medium model */
-#  define SMALL_MEDIUM
-#  ifdef _MSC_VER
-#    define FAR _far
-#  else
-#    define FAR far
-#  endif
-#endif
-#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
-#  ifndef __32BIT__
-#    define SMALL_MEDIUM
-#    define FAR _far
-#  endif
-#endif
-
-/* Compile with -DZLIB_DLL for Windows DLL support */
-#if defined(ZLIB_DLL)
-#  if defined(_WINDOWS) || defined(WINDOWS)
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-#    define ZEXPORT  WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA  WINAPIV
-#    else
-#      define ZEXPORTVA  FAR _cdecl _export
-#    endif
-#  endif
-#  if defined (__BORLANDC__)
-#    if (__BORLANDC__ >= 0x0500) && defined (WIN32)
-#      include <windows.h>
-#      define ZEXPORT __declspec(dllexport) WINAPI
-#      define ZEXPORTRVA __declspec(dllexport) WINAPIV
-#    else
-#      if defined (_Windows) && defined (__DLL__)
-#        define ZEXPORT _export
-#        define ZEXPORTVA _export
-#      endif
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  if defined (ZLIB_DLL)
-#    define ZEXTERN extern __declspec(dllexport)
-#  else
-#    define ZEXTERN extern __declspec(dllimport)
-#  endif
-#endif
-
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-
-#ifndef FAR
-#   define FAR
-#endif
-
-#if !defined(MACOS) && !defined(TARGET_OS_MAC)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void FAR *voidpf;
-   typedef void     *voidp;
-#else
-   typedef Byte FAR *voidpf;
-   typedef Byte     *voidp;
-#endif
-
-#ifdef HAVE_UNISTD_H
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  define z_off_t  off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define  z_off_t long
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(inflate_blocks,"INBL")
-#   pragma map(inflate_blocks_new,"INBLNE")
-#   pragma map(inflate_blocks_free,"INBLFR")
-#   pragma map(inflate_blocks_reset,"INBLRE")
-#   pragma map(inflate_codes_free,"INCOFR")
-#   pragma map(inflate_codes,"INCO")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_flush,"INFLU")
-#   pragma map(inflate_mask,"INMA")
-#   pragma map(inflate_set_dictionary,"INSEDI2")
-#   pragma map(inflate_copyright,"INCOPY")
-#   pragma map(inflate_trees_bits,"INTRBI")
-#   pragma map(inflate_trees_dynamic,"INTRDY")
-#   pragma map(inflate_trees_fixed,"INTRFI")
-#   pragma map(inflate_trees_free,"INTRFR")
-#endif
-
-#endif /* _ZCONF_H */
diff --git a/projects/dvm_svn/tools/Zlib/include/zlib.h b/projects/dvm_svn/tools/Zlib/include/zlib.h
deleted file mode 100644
index 63a23a2..0000000
--- a/projects/dvm_svn/tools/Zlib/include/zlib.h
+++ /dev/null
@@ -1,913 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.1.4, March 11th, 2002
-
-  Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef _ZLIB_H
-#define _ZLIB_H
-
-#include <stdio.h>
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.1.4"
-
-/* 
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: ascii or binary */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-#ifdef _RTS_ZLIB_
-
-typedef struct gz_stream {
-    z_stream stream;
-    int      z_err;   /* error code for last stream operation */
-    int      z_eof;   /* set if end of input file */
-    FILE     *file;   /* .gz file */
-    Byte     *inbuf;  /* input buffer */
-    Byte     *outbuf; /* output buffer */
-    uLong    crc;     /* crc32 of uncompressed data */
-    char     *msg;    /* error message */
-    char     *path;   /* path name for debugging only */
-    int      transparent; /* 1 if input file is not a .gz file */
-    char     mode;    /* 'w' or 'r' */
-    long     startpos; /* start of compressed data in file (header skipped) */
-} gz_stream;
-
-#endif
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-/* Allowed flush values; see deflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_ASCII    1
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/* 
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  the compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-  
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update data_type if it can make a good guess about
-  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/* 
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may some
-  introduce some output latency (reading input without producing any output)
-  except when forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
-  output as possible to the output buffer. The flushing behavior of inflate is
-  not specified for values of the flush parameter other than Z_SYNC_FLUSH
-  and Z_FINISH, but the current implementation actually flushes as much output
-  as possible anyway.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster routine
-  may be used for the single inflate() call.
-
-     If a preset dictionary is needed at this point (see inflateSetDictionary
-  below), inflate sets strm-adler to the adler32 checksum of the
-  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise 
-  it sets strm->adler to the adler32 checksum of all output produced
-  so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
-  an error code as described below. At the end of the stream, inflate()
-  checks that its computed adler32 checksum is equal to that saved by the
-  compressor and returns Z_STREAM_END only if the checksum is correct.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect
-  adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
-  (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
-  enough memory, Z_BUF_ERROR if no progress is possible or if there was not
-  enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
-  case, the application may then call inflateSync to look for a good
-  compression block.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*   
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match).  Filtered data consists mostly of small values with a
-   somewhat random distribution. In this case, the compression algorithm is
-   tuned to compress them better. The effect of Z_FILTERED is to force more
-   Huffman coding and less string matching; it is somewhat intermediate
-   between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
-   the compression ratio but not the correctness of the compressed output even
-   if it is not set appropriately.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-                            
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front.
-
-     Upon return of this function, strm->adler is set to the Adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The Adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.)
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-				      int level,
-				      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-/*   
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. If a compressed stream with a larger window size is given as
-   input, inflate() will return with the error code Z_DATA_ERROR instead of
-   trying to allocate a larger window.
-
-      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
-   memLevel). msg is set to null if there is no error message.  inflateInit2
-   does not perform any decompression apart from reading the zlib header if
-   present: this will be done by inflate(). (So next_in and avail_in may be
-   modified, but next_out and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate
-   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the Adler32 value returned by this call of
-   inflate. The compressor and decompressor must use exactly the same
-   dictionary (see deflateSetDictionary).
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/* 
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least 0.1% larger than
-   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h". (See the description
-   of deflateInit2 for more information about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file, 
-				   const voidp buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-				      z_off_t offset, int whence));
-/* 
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running crc with the bytes buf[0..len-1] and return the updated
-   crc. If buf is NULL, this function returns the required initial value
-   for the crc. Pre- and post-conditioning (one's complement) is performed
-   within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char   * ZEXPORT zError           OF((int err));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ZLIB_H */
diff --git a/projects/dvm_svn/tools/Zlib/include/zutil.h b/projects/dvm_svn/tools/Zlib/include/zutil.h
deleted file mode 100644
index 94f8501..0000000
--- a/projects/dvm_svn/tools/Zlib/include/zutil.h
+++ /dev/null
@@ -1,227 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef _Z_UTIL_H
-#define _Z_UTIL_H
-
-#include "zlib.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-
-/*typedef unsigned short ush;*/
-
-typedef unsigned int ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-
-
-extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#ifdef MSDOS
-#  define OS_CODE  0x00
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl farfree( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
-#    else
-#     include <alloc.h>
-#    endif
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
-#  endif
-#endif
-
-#ifdef OS2
-#  define OS_CODE  0x06
-#endif
-
-#ifdef WIN32 /* Window 95 & Windows NT */
-#  define OS_CODE  0x0b
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
-#  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  0x01
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#    include <unix.h> /* for fdopen */
-#  else
-#    ifndef fdopen
-#      define fdopen(fd,mode) NULL /* No fdopen() */
-#    endif
-#  endif
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0F
-#endif
-
-#ifdef TOPS20
-#  define OS_CODE  0x0a
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600))
-#  define fdopen(fd,type)  _fdopen(fd,type)
-#endif
-
-
-        /* Common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#ifdef HAVE_STRERROR
-   extern char *strerror OF((int));
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
-#if defined(pyr)
-#  define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
-#  define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#  define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-#else
-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  include <stdio.h>
-   extern int z_verbose;
-   extern void z_error    OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-
-typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
-				       uInt len));
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-#endif /* _Z_UTIL_H */
diff --git a/projects/dvm_svn/tools/Zlib/makefile.uni b/projects/dvm_svn/tools/Zlib/makefile.uni
deleted file mode 100644
index 82c261f..0000000
--- a/projects/dvm_svn/tools/Zlib/makefile.uni
+++ /dev/null
@@ -1,72 +0,0 @@
-LIB     = ./Release/libzlib.a
-
-INC_DIR = -I./include
-SOURCE_DIR = ./src
-
-COPT    = $(INC_DIR) $(RELEASE)
-LINK    = ar crs
-
-MODULES  = \
-	adler32.o \
-	compress.o \
-	crc32.o \
-	gzio.o \
-	uncompr.o \
-	deflate.o \
-	trees.o \
-	zutil.o \
-	inflate.o \
-	infblock.o \
-	inftrees.o \
-	infcodes.o \
-	infutil.o \
-	inffast.o
-
-adler32.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/adler32.c
-compress.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/compress.c
-crc32.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/crc32.c
-gzio.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/gzio.c
-uncompr.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/uncompr.c
-deflate.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/deflate.c
-trees.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/trees.c
-zutil.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/zutil.c
-inflate.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/inflate.c
-infblock.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/infblock.c
-inftrees.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/inftrees.c
-infcodes.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/infcodes.c
-infutil.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/infutil.c
-inffast.o:
-	$(CC) -c $(COPT) $(SOURCE_DIR)/inffast.c
-
-all: Incs libzlib
-
-Incs:
-	cp include/zlib.h ../../include/
-	cp include/zconf.h ../../include/
-
-libzlib: $(LIB)
-
-$(LIB): $(MODULES)
-	mkdir -p Release
-	rm -f $(LIB)
-	$(LINK) $(LIB) $(MODULES)
-
-clean:
-	rm -rf *.o Release
-
-cleanall: clean
-
-.PHONY: all clean cleanall Incs libzlib
diff --git a/projects/dvm_svn/tools/Zlib/makefile.win b/projects/dvm_svn/tools/Zlib/makefile.win
deleted file mode 100644
index 9380d4e..0000000
--- a/projects/dvm_svn/tools/Zlib/makefile.win
+++ /dev/null
@@ -1,316 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Zlib.dsp
-!IF "$(CFG)" == ""
-CFG=Zlib - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Zlib - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Zlib - Win32 Release" && "$(CFG)" != "Zlib - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Zlib.mak" CFG="Zlib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Zlib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "Zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "Zlib - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\Zlib.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\adler32.obj"
-	-@erase "$(INTDIR)\compress.obj"
-	-@erase "$(INTDIR)\crc32.obj"
-	-@erase "$(INTDIR)\deflate.obj"
-	-@erase "$(INTDIR)\gzio.obj"
-	-@erase "$(INTDIR)\infblock.obj"
-	-@erase "$(INTDIR)\infcodes.obj"
-	-@erase "$(INTDIR)\inffast.obj"
-	-@erase "$(INTDIR)\inflate.obj"
-	-@erase "$(INTDIR)\inftrees.obj"
-	-@erase "$(INTDIR)\infutil.obj"
-	-@erase "$(INTDIR)\trees.obj"
-	-@erase "$(INTDIR)\uncompr.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\zutil.obj"
-	-@erase "$(OUTDIR)\Zlib.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-F90=df.exe
-CPP=cl.exe
-CPP_PROJ=/nologo /O2 /I "./include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\Zlib.pch"  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Zlib.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\Zlib.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\adler32.obj" \
-	"$(INTDIR)\compress.obj" \
-	"$(INTDIR)\crc32.obj" \
-	"$(INTDIR)\deflate.obj" \
-	"$(INTDIR)\gzio.obj" \
-	"$(INTDIR)\infblock.obj" \
-	"$(INTDIR)\infcodes.obj" \
-	"$(INTDIR)\inffast.obj" \
-	"$(INTDIR)\inflate.obj" \
-	"$(INTDIR)\inftrees.obj" \
-	"$(INTDIR)\infutil.obj" \
-	"$(INTDIR)\trees.obj" \
-	"$(INTDIR)\uncompr.obj" \
-	"$(INTDIR)\zutil.obj"
-
-"$(OUTDIR)\Zlib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Zlib - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\Zlib.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\adler32.obj"
-	-@erase "$(INTDIR)\compress.obj"
-	-@erase "$(INTDIR)\crc32.obj"
-	-@erase "$(INTDIR)\deflate.obj"
-	-@erase "$(INTDIR)\gzio.obj"
-	-@erase "$(INTDIR)\infblock.obj"
-	-@erase "$(INTDIR)\infcodes.obj"
-	-@erase "$(INTDIR)\inffast.obj"
-	-@erase "$(INTDIR)\inflate.obj"
-	-@erase "$(INTDIR)\inftrees.obj"
-	-@erase "$(INTDIR)\infutil.obj"
-	-@erase "$(INTDIR)\trees.obj"
-	-@erase "$(INTDIR)\uncompr.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\zutil.obj"
-	-@erase "$(OUTDIR)\Zlib.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-F90=df.exe
-CPP=cl.exe
-CPP_PROJ=/nologo /ZI /Od /I "include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\Zlib.pch"  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Zlib.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\Zlib.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\adler32.obj" \
-	"$(INTDIR)\compress.obj" \
-	"$(INTDIR)\crc32.obj" \
-	"$(INTDIR)\deflate.obj" \
-	"$(INTDIR)\gzio.obj" \
-	"$(INTDIR)\infblock.obj" \
-	"$(INTDIR)\infcodes.obj" \
-	"$(INTDIR)\inffast.obj" \
-	"$(INTDIR)\inflate.obj" \
-	"$(INTDIR)\inftrees.obj" \
-	"$(INTDIR)\infutil.obj" \
-	"$(INTDIR)\trees.obj" \
-	"$(INTDIR)\uncompr.obj" \
-	"$(INTDIR)\zutil.obj"
-
-"$(OUTDIR)\Zlib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("Zlib.dep")
-!INCLUDE "Zlib.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "Zlib.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "Zlib - Win32 Release" || "$(CFG)" == "Zlib - Win32 Debug"
-SOURCE=.\src\adler32.c
-
-"$(INTDIR)\adler32.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\compress.c
-
-"$(INTDIR)\compress.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\crc32.c
-
-"$(INTDIR)\crc32.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\deflate.c
-
-"$(INTDIR)\deflate.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\gzio.c
-
-"$(INTDIR)\gzio.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\infblock.c
-
-"$(INTDIR)\infblock.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\infcodes.c
-
-"$(INTDIR)\infcodes.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\inffast.c
-
-"$(INTDIR)\inffast.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\inflate.c
-
-"$(INTDIR)\inflate.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\inftrees.c
-
-"$(INTDIR)\inftrees.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\infutil.c
-
-"$(INTDIR)\infutil.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\trees.c
-
-"$(INTDIR)\trees.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\uncompr.c
-
-"$(INTDIR)\uncompr.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\src\zutil.c
-
-"$(INTDIR)\zutil.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/projects/dvm_svn/tools/Zlib/src/CMakeLists.txt b/projects/dvm_svn/tools/Zlib/src/CMakeLists.txt
deleted file mode 100644
index 41d1b0b..0000000
--- a/projects/dvm_svn/tools/Zlib/src/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-set(ZLIB_SOURCES adler32.c compress.c crc32.c gzio.c uncompr.c deflate.c
- trees.c zutil.c inflate.c infblock.c inftrees.c infcodes.c infutil.c inffast.c)
-
-if(MSVC_IDE)
-  file(GLOB_RECURSE FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h ../include/*.h)
-endif()
-
-add_library(zlib ${ZLIB_SOURCES} ${ZLIB_HEADERS})
-
-target_include_directories(zlib
-  PUBLIC ${CMAKE_INCLUDE_CURRENT_DIR}../include ${CMAKE_CURRENT_SOURCE_DIR})
-set_target_properties(zlib PROPERTIES FOLDER "${DVM_LIBRARY_FOLDER}")
diff --git a/projects/dvm_svn/tools/Zlib/src/adler32.c b/projects/dvm_svn/tools/Zlib/src/adler32.c
deleted file mode 100644
index 8990fd6..0000000
--- a/projects/dvm_svn/tools/Zlib/src/adler32.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-
-#define BASE 65521L /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len)
-{
-    unsigned long s1 = adler & 0xffff;
-    unsigned long s2 = (adler >> 16) & 0xffff;
-    int k;
-
-    if (buf == Z_NULL) return 1L;
-
-    while (len > 0) {
-        k = len < NMAX ? len : NMAX;
-        len -= k;
-        while (k >= 16) {
-            DO16(buf);
-	    buf += 16;
-            k -= 16;
-        }
-        if (k != 0) do {
-            s1 += *buf++;
-	    s2 += s1;
-        } while (--k);
-        s1 %= BASE;
-        s2 %= BASE;
-    }
-    return (s2 << 16) | s1;
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/compress.c b/projects/dvm_svn/tools/Zlib/src/compress.c
deleted file mode 100644
index 421e4fe..0000000
--- a/projects/dvm_svn/tools/Zlib/src/compress.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-
-/* ===========================================================================
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-int ZEXPORT compress2 (Bytef *dest, uLongf *destLen,
-                       const Bytef *source, uLong sourceLen, int level)
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (Bytef*)source;
-    stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-#endif
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = deflateInit(&stream, level);
-    if (err != Z_OK) return err;
-
-    err = deflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        deflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
-    }
-    *destLen = stream.total_out;
-
-    err = deflateEnd(&stream);
-    return err;
-}
-
-/* ===========================================================================
- */
-int ZEXPORT compress (Bytef *dest, uLongf *destLen,
-                      const Bytef *source, uLong sourceLen)
-{
-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/crc32.c b/projects/dvm_svn/tools/Zlib/src/crc32.c
deleted file mode 100644
index 460ed9b..0000000
--- a/projects/dvm_svn/tools/Zlib/src/crc32.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-
-#define local static
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local int crc_table_empty = 1;
-local uLongf crc_table[256];
-local void make_crc_table OF((void));
-
-/*
-  Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The table is simply the CRC of all possible eight bit values.  This is all
-  the information needed to generate CRC's on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.
-*/
-local void make_crc_table()
-{
-  uLong c;
-  int n, k;
-  uLong poly;            /* polynomial exclusive-or pattern */
-  /* terms of polynomial defining this crc (except x^32): */
-  static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-  /* make exclusive-or pattern from polynomial (0xedb88320L) */
-  poly = 0L;
-  for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
-    poly |= 1L << (31 - p[n]);
- 
-  for (n = 0; n < 256; n++)
-  {
-    c = (uLong)n;
-    for (k = 0; k < 8; k++)
-      c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-    crc_table[n] = c;
-  }
-  crc_table_empty = 0;
-}
-#else
-/* ========================================================================
- * Table of CRC-32's of all single-byte values (made by make_crc_table)
- */
-local const uLongf crc_table[256] = {
-  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
-  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
-  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
-  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
-  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
-  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
-  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
-  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
-  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
-  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
-  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
-  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
-  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
-  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
-  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
-  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
-  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
-  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
-  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
-  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
-  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
-  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
-  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
-  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
-  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
-  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
-  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
-  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
-  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
-  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
-  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
-  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
-  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
-  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
-  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
-  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
-  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
-  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
-  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
-  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
-  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
-  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
-  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
-  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
-  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
-  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
-  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
-  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
-  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
-  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
-  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
-  0x2d02ef8dL
-};
-#endif
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const uLongf * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-  if (crc_table_empty) make_crc_table();
-#endif
-  return (const uLongf *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
-#define DO2(buf)  DO1(buf); DO1(buf);
-#define DO4(buf)  DO2(buf); DO2(buf);
-#define DO8(buf)  DO4(buf); DO4(buf);
-
-/* ========================================================================= */
-uLong ZEXPORT crc32(uLong crc, const Bytef *buf, uInt len)
-{
-    if (buf == Z_NULL) return 0L;
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-      make_crc_table();
-#endif
-    crc = crc ^ 0xffffffffL;
-    while (len >= 8)
-    {
-      DO8(buf);
-      len -= 8;
-    }
-    if (len) do {
-      DO1(buf);
-    } while (--len);
-    return crc ^ 0xffffffffL;
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/deflate.c b/projects/dvm_svn/tools/Zlib/src/deflate.c
deleted file mode 100644
index dfc6262..0000000
--- a/projects/dvm_svn/tools/Zlib/src/deflate.c
+++ /dev/null
@@ -1,1308 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in ftp://ds.internic.net/rfc/rfc1951.txt
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include "deflate.h"
-
-const char deflate_copyright[] =
-   " deflate 1.1.4 Copyright 1995-2002 Jean-loup Gailly ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Function prototypes.
- */
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-#  define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
-} config;
-
-local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* maximum speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* maximum compression */
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
- *    input characters, so that a running hash key can be computed from the
- *    previous key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
- *    input characters and the first MIN_MATCH bytes of str are valid
- *    (except for the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(z_streamp strm, int level, const char *version,
-                         int stream_size)
-{
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-			 Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(z_streamp strm, int level, int method,
-                          int windowBits, int memLevel, int strategy,
-                          const char *version, int stream_size)
-{
-    deflate_state *s;
-    int noheader = 0;
-    static const char* my_version = ZLIB_VERSION;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-	return Z_VERSION_ERROR;
-    }
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->msg = Z_NULL;
-    if (strm->zalloc == Z_NULL) {
-	strm->zalloc = zcalloc;
-	strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == Z_NULL) strm->zfree = zcfree;
-
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#ifdef FASTEST
-    level = 1;
-#endif
-
-    if (windowBits < 0) { /* undocumented feature: suppress zlib header */
-        noheader = 1;
-        windowBits = -windowBits;
-    }
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 9 || windowBits > 15 || level < 0 || level > 9 ||
-	strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
-        return Z_STREAM_ERROR;
-    }
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state FAR *)s;
-    s->strm = strm;
-
-    s->noheader = noheader;
-    s->w_bits = windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = memLevel + 7;
-    s->hash_size = 1 << s->hash_bits;
-    s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
-        return Z_MEM_ERROR;
-    }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary(z_streamp strm, const Bytef *dictionary,
-                                 uInt dictLength)
-{
-    deflate_state *s;
-    uInt length = dictLength;
-    uInt n;
-    IPos hash_head = 0;
-
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->status != INIT_STATE) return Z_STREAM_ERROR;
-
-    s = strm->state;
-    strm->adler = adler32(strm->adler, dictionary, dictLength);
-
-    if (length < MIN_MATCH) return Z_OK;
-    if (length > MAX_DIST(s)) {
-	length = MAX_DIST(s);
-#ifndef USE_DICT_HEAD
-	dictionary += dictLength - length; /* use the tail of the dictionary */
-#endif
-    }
-    zmemcpy(s->window, dictionary, length);
-    s->strstart = length;
-    s->block_start = (long)length;
-
-    /* Insert all strings in the hash table (except for the last two bytes).
-     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-     * call of fill_window.
-     */
-    s->ins_h = s->window[0];
-    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    for (n = 0; n <= length - MIN_MATCH; n++) {
-	INSERT_STRING(s, n, hash_head);
-    }
-    if (hash_head) hash_head = 0;  /* to make compiler happy */
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (z_streamp strm)
-{
-    deflate_state *s;
-    
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == Z_NULL || strm->zfree == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->noheader < 0) {
-        s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */
-    }
-    s->status = s->noheader ? BUSY_STATE : INIT_STATE;
-    strm->adler = 1;
-    s->last_flush = Z_NO_FLUSH;
-
-    _tr_init(s);
-    lm_init(s);
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(z_streamp strm, int level, int strategy)
-{
-    deflate_state *s;
-    compress_func func;
-    int err = Z_OK;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-
-    if (level == Z_DEFAULT_COMPRESSION) {
-	level = 6;
-    }
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
-	return Z_STREAM_ERROR;
-    }
-    func = configuration_table[s->level].func;
-
-    if (func != configuration_table[level].func && strm->total_in != 0) {
-	/* Flush the last buffer: */
-	err = deflate(strm, Z_PARTIAL_FLUSH);
-    }
-    if (s->level != level) {
-	s->level = level;
-	s->max_lazy_match   = configuration_table[level].max_lazy;
-	s->good_match       = configuration_table[level].good_length;
-	s->nice_match       = configuration_table[level].nice_length;
-	s->max_chain_length = configuration_table[level].max_chain;
-    }
-    s->strategy = strategy;
-    return err;
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (deflate_state *s, uInt b)
-{
-    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, (Byte)(b & 0xff));
-}   
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also read_buf()).
- */
-local void flush_pending(z_streamp strm)
-{
-    unsigned len = strm->state->pending;
-
-    if (len > strm->avail_out) len = strm->avail_out;
-    if (len == 0) return;
-
-    zmemcpy(strm->next_out, strm->state->pending_out, len);
-    strm->next_out  += len;
-    strm->state->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out  -= len;
-    strm->state->pending -= len;
-    if (strm->state->pending == 0) {
-        strm->state->pending_out = strm->state->pending_buf;
-    }
-}
-
-/* ========================================================================= */
-int ZEXPORT deflate (z_streamp strm, int flush)
-{
-    int old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-	flush > Z_FINISH || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-	(s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    s->strm = strm; /* just in case */
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Write the zlib header */
-    if (s->status == INIT_STATE) {
-
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-        uInt level_flags = (s->level-1) >> 1;
-
-        if (level_flags > 3) level_flags = 3;
-        header |= (level_flags << 6);
-	if (s->strstart != 0) header |= PRESET_DICT;
-        header += 31 - (header % 31);
-
-        s->status = BUSY_STATE;
-        putShortMSB(s, header);
-
-	/* Save the adler32 of the preset dictionary: */
-	if (s->strstart != 0) {
-	    putShortMSB(s, (uInt)(strm->adler >> 16));
-	    putShortMSB(s, (uInt)(strm->adler & 0xffff));
-	}
-	strm->adler = 1L;
-    }
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        flush_pending(strm);
-        if (strm->avail_out == 0) {
-	    /* Since avail_out is 0, deflate will be called again with
-	     * more output space, but possibly with both pending and
-	     * avail_in equal to zero. There won't be anything to do,
-	     * but this is not an error situation so make sure we
-	     * return OK instead of BUF_ERROR at next call of deflate:
-             */
-	    s->last_flush = -1;
-	    return Z_OK;
-	}
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUFF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && flush <= old_flush &&
-	       flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-	bstate = (*(configuration_table[s->level].func))(s, flush);
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-	    if (strm->avail_out == 0) {
-	        s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-	    }
-	    return Z_OK;
-	    /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-	     * of deflate should use the same flush parameter to make sure
-	     * that the flush is complete. So we don't have to output an
-	     * empty block here, this will be done at next call. This also
-	     * ensures that for a very small output buffer, we emit at most
-	     * one empty block.
-	     */
-	}
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                _tr_align(s);
-            } else { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                }
-            }
-            flush_pending(strm);
-	    if (strm->avail_out == 0) {
-	      s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-	      return Z_OK;
-	    }
-        }
-    }
-    Assert(strm->avail_out > 0, "bug2");
-
-    if (flush != Z_FINISH) return Z_OK;
-    if (s->noheader) return Z_STREAM_END;
-
-    /* Write the zlib trailer (adler32) */
-    putShortMSB(s, (uInt)(strm->adler >> 16));
-    putShortMSB(s, (uInt)(strm->adler & 0xffff));
-    flush_pending(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    s->noheader = -1; /* write the trailer only once! */
-    return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (z_streamp strm)
-{
-    int status;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-    if (status != INIT_STATE && status != BUSY_STATE &&
-	status != FINISH_STATE) {
-      return Z_STREAM_ERROR;
-    }
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->window);
-
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MSDOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (z_streamp dest, z_streamp source)
-{
-#ifdef MAXSEG_64K
-    return Z_STREAM_ERROR;
-#else
-    deflate_state *ds;
-    deflate_state *ss;
-    ushf *overlay;
-
-
-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
-        return Z_STREAM_ERROR;
-    }
-
-    ss = source->state;
-
-    *dest = *source;
-
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-    if (ds == Z_NULL) return Z_MEM_ERROR;
-    dest->state = (struct internal_state FAR *) ds;
-    *ds = *ss;
-    ds->strm = dest;
-
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
-        return Z_MEM_ERROR;
-    }
-    /* following zmemcpy do not work for 16-bit MSDOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-#endif
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local int read_buf(z_streamp strm, Bytef *buf, unsigned size)
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    if (!strm->state->noheader) {
-        strm->adler = adler32(strm->adler, strm->next_in, len);
-    }
-    zmemcpy(buf, strm->next_in, len);
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return (int)len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (deflate_state *s)
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-}
-
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-#ifndef FASTEST
-local uInt longest_match(deflate_state *s, IPos cur_match)
-{
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    int best_len = s->prev_length;              /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0.
-     */
-    Posf *prev = s->prev;
-    uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
-    /* Compare two bytes at a time. Note: this is not always beneficial.
-     * Try with and without -DUNALIGNED_OK to check.
-     */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
-#else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
-    register Byte scan_end   = scan[best_len];
-#endif
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    /* Do not waste too much time if we already have a good match: */
-    if (s->prev_length >= s->good_match) {
-        chain_length >>= 2;
-    }
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    do {
-        Assert(cur_match < s->strstart, "no future");
-        match = s->window + cur_match;
-
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2:
-         */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-        /* This code assumes sizeof(unsigned short) == 2. Do not use
-         * UNALIGNED_OK if your compiler uses a different size.
-         */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
-
-        /* It is not necessary to compare scan[2] and match[2] since they are
-         * always equal when the other bytes match, given that the hash keys
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
-         * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-         * necessary to put more guard bytes at the end of the window, or
-         * to check more often for insufficient lookahead.
-         */
-        Assert(scan[2] == match[2], "scan[2]?");
-        scan++, match++;
-        do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 scan < strend);
-        /* The funny "do {}" generates better code on most compilers */
-
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-        if (*scan == *match) scan++;
-
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * It is not necessary to compare scan[2] and match[2] since they
-         * are always equal when the other bytes match, given that
-         * the hash keys are equal and that HASH_BITS >= 8.
-         */
-        scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 scan < strend);
-
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-        len = MAX_MATCH - (int)(strend - scan);
-        scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
-        if (len > best_len) {
-            s->match_start = cur_match;
-            best_len = len;
-            if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
-#else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
-#endif
-        }
-    } while ((cur_match = prev[cur_match & wmask]) > limit
-             && --chain_length != 0);
-
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-    return s->lookahead;
-}
-
-#else /* FASTEST */
-/* ---------------------------------------------------------------------------
- * Optimized version for level == 1 only
- */
-local uInt longest_match(deflate_state *s, IPos cur_match)
-{
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    Assert(cur_match < s->strstart, "no future");
-
-    match = s->window + cur_match;
-
-    /* Return failure if the match length is less than 2:
-     */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2, match += 2;
-    Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-    } while (*++scan == *++match && *++scan == *++match &&
-	     *++scan == *++match && *++scan == *++match &&
-	     *++scan == *++match && *++scan == *++match &&
-	     *++scan == *++match && *++scan == *++match &&
-	     scan < strend);
-
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (int)(strend - scan);
-
-    if (len < MIN_MATCH) return MIN_MATCH - 1;
-
-    s->match_start = cur_match;
-    return len <= s->lookahead ? len : s->lookahead;
-}
-#endif /* FASTEST */
-#endif /* ASMV */
-
-#ifdef DEBUG
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(deflate_state *s, IPos start, IPos match, int length)
-{
-    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-		start, match, length);
-        do {
-	    fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-	} while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
-    }
-}
-#else
-#  define check_match(s, start, match, length)
-#endif
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(deflate_state *s)
-{
-    register unsigned n, m;
-    register Posf *p;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-            more = wsize;
-
-        } else if (more == (unsigned)(-1)) {
-            /* Very unlikely, but possible on 16 bit machine if strstart == 0
-             * and lookahead == 1 (input done one byte at time)
-             */
-            more--;
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        } else if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-
-            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage). We slide even when level == 0
-               to keep the hash table consistent if we switch back to level > 0
-               later. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-	    n = s->hash_size;
-	    p = &s->head[n];
-	    do {
-		m = *--p;
-		*p = (Pos)(m >= wsize ? m-wsize : NIL);
-	    } while (--n);
-
-	    n = wsize;
-#ifndef FASTEST
-	    p = &s->prev[n];
-	    do {
-		m = *--p;
-		*p = (Pos)(m >= wsize ? m-wsize : NIL);
-		/* If n is not on any hash chain, prev[n] is garbage but
-		 * its value will never be used.
-		 */
-	    } while (--n);
-#endif
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) return;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            s->ins_h = s->window[s->strstart];
-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, eof) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-		(ulg)((long)s->strstart - s->block_start), \
-		(eof)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, eof) { \
-   FLUSH_BLOCK_ONLY(s, eof); \
-   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-local block_state deflate_stored(deflate_state *s, int flush)
-{
-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-     * to pending_buf_size, and each stored block has a 5 byte header:
-     */
-    ulg max_block_size = 0xffff;
-    ulg max_start;
-
-    if (max_block_size > s->pending_buf_size - 5) {
-        max_block_size = s->pending_buf_size - 5;
-    }
-
-    /* Copy as much as possible from input to output: */
-    for (;;) {
-        /* Fill the window as much as possible: */
-        if (s->lookahead <= 1) {
-
-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-		   s->block_start >= (long)s->w_size, "slide too late");
-
-            fill_window(s);
-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
-
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-	Assert(s->block_start >= 0L, "block gone");
-
-	s->strstart += s->lookahead;
-	s->lookahead = 0;
-
-	/* Emit a stored block if pending_buf will be full: */
- 	max_start = s->block_start + max_block_size;
-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-	    /* strstart == 0 is possible when wraparound on 16-bit machine */
-	    s->lookahead = (uInt)(s->strstart - max_start);
-	    s->strstart = (uInt)max_start;
-            FLUSH_BLOCK(s, 0);
-	}
-	/* Flush if we may have to slide, otherwise block_start may become
-         * negative and the data will be gone:
-         */
-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-            FLUSH_BLOCK(s, 0);
-	}
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(deflate_state *s, int flush)
-{
-    IPos hash_head = NIL; /* head of the hash chain */
-    int bflush;           /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-	        return need_more;
-	    }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            if (s->strategy != Z_HUFFMAN_ONLY) {
-                s->match_length = longest_match (s, hash_head);
-            }
-            /* longest_match() sets match_start */
-        }
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
-
-            _tr_tally_dist(s, s->strstart - s->match_start,
-                           s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-#ifndef FASTEST
-            if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in hash table */
-                do {
-                    s->strstart++;
-                    INSERT_STRING(s, s->strstart, hash_head);
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead.
-                     */
-                } while (--s->match_length != 0);
-                s->strstart++; 
-            } else
-#endif
-	    {
-                s->strstart += s->match_length;
-                s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++; 
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(deflate_state *s, int flush)
-{
-    IPos hash_head = NIL;    /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-	        return need_more;
-	    }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            if (s->strategy != Z_HUFFMAN_ONLY) {
-                s->match_length = longest_match (s, hash_head);
-            }
-            /* longest_match() sets match_start */
-
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED ||
-                 (s->match_length == MIN_MATCH &&
-                  s->strstart - s->match_start > TOO_FAR))) {
-
-                /* If prev_match is also MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                s->match_length = MIN_MATCH-1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-			   s->prev_length - MIN_MATCH, bflush);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->lookahead -= s->prev_length-1;
-            s->prev_length -= 2;
-            do {
-                if (++s->strstart <= max_insert) {
-                    INSERT_STRING(s, s->strstart, hash_head);
-                }
-            } while (--s->prev_length != 0);
-            s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
-            s->strstart++;
-
-            if (bflush) FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-	    _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-	    if (bflush) {
-                FLUSH_BLOCK_ONLY(s, 0);
-            }
-            s->strstart++;
-            s->lookahead--;
-            if (s->strm->avail_out == 0) return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
-    if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-        s->match_available = 0;
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/example.c b/projects/dvm_svn/tools/Zlib/src/example.c
deleted file mode 100644
index e7e3673..0000000
--- a/projects/dvm_svn/tools/Zlib/src/example.c
+++ /dev/null
@@ -1,556 +0,0 @@
-/* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include <stdio.h>
-#include "zlib.h"
-
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#else
-   extern void exit  OF((int));
-#endif
-
-#if defined(VMS) || defined(RISCOS)
-#  define TESTFILE "foo-gz"
-#else
-#  define TESTFILE "foo.gz"
-#endif
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) { \
-        fprintf(stderr, "%s error: %d\n", msg, err); \
-        exit(1); \
-    } \
-}
-
-const char hello[] = "hello, hello!";
-/* "hello world" would be more standard, but the repeated "hello"
- * stresses the compression code better, sorry...
- */
-
-const char dictionary[] = "hello";
-uLong dictId; /* Adler32 value of the dictionary */
-
-void test_compress      OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_gzio          OF((const char *out, const char *in, 
-		            Byte *uncompr, int uncomprLen));
-void test_deflate       OF((Byte *compr, uLong comprLen));
-void test_inflate       OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_large_deflate OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_large_inflate OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_flush         OF((Byte *compr, uLong *comprLen));
-void test_sync          OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_dict_deflate  OF((Byte *compr, uLong comprLen));
-void test_dict_inflate  OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-int  main               OF((int argc, char *argv[]));
-
-/* ===========================================================================
- * Test compress() and uncompress()
- */
-void test_compress(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    uLong len = strlen(hello)+1;
-
-    err = compress(compr, &comprLen, (const Bytef*)hello, len);
-    CHECK_ERR(err, "compress");
-
-    strcpy((char*)uncompr, "garbage");
-
-    err = uncompress(uncompr, &uncomprLen, compr, comprLen);
-    CHECK_ERR(err, "uncompress");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad uncompress\n");
-	exit(1);
-    } else {
-        printf("uncompress(): %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Test read/write of .gz files
- */
-void test_gzio(out, in, uncompr, uncomprLen)
-    const char *out; /* compressed output file */
-    const char *in;  /* compressed input file */
-    Byte *uncompr;
-    int  uncomprLen;
-{
-    int err;
-    int len = strlen(hello)+1;
-    gzFile file;
-    z_off_t pos;
-
-    file = gzopen(out, "wb");
-    if (file == NULL) {
-        fprintf(stderr, "gzopen error\n");
-        exit(1);
-    }
-    gzputc(file, 'h');
-    if (gzputs(file, "ello") != 4) {
-        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
-	exit(1);
-    }
-    if (gzprintf(file, ", %s!", "hello") != 8) {
-        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
-	exit(1);
-    }
-    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
-    gzclose(file);
-
-    file = gzopen(in, "rb");
-    if (file == NULL) {
-        fprintf(stderr, "gzopen error\n");
-    }
-    strcpy((char*)uncompr, "garbage");
-
-    uncomprLen = gzread(file, uncompr, (unsigned)uncomprLen);
-    if (uncomprLen != len) {
-        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
-	exit(1);
-    }
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
-	exit(1);
-    } else {
-        printf("gzread(): %s\n", (char *)uncompr);
-    }
-
-    pos = gzseek(file, -8L, SEEK_CUR);
-    if (pos != 6 || gztell(file) != pos) {
-	fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
-		(long)pos, (long)gztell(file));
-	exit(1);
-    }
-
-    if (gzgetc(file) != ' ') {
-	fprintf(stderr, "gzgetc error\n");
-	exit(1);
-    }
-
-    gzgets(file, (char*)uncompr, uncomprLen);
-    uncomprLen = strlen((char*)uncompr);
-    if (uncomprLen != 6) { /* "hello!" */
-        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
-	exit(1);
-    }
-    if (strcmp((char*)uncompr, hello+7)) {
-        fprintf(stderr, "bad gzgets after gzseek\n");
-	exit(1);
-    } else {
-        printf("gzgets() after gzseek: %s\n", (char *)uncompr);
-    }
-
-    gzclose(file);
-}
-
-/* ===========================================================================
- * Test deflate() with small buffers
- */
-void test_deflate(compr, comprLen)
-    Byte *compr;
-    uLong comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-    int len = strlen(hello)+1;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (Bytef*)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != (uLong)len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = deflate(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate");
-    }
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = deflate(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with small buffers
- */
-void test_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 0;
-    d_stream.next_out = uncompr;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
-        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "inflate");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad inflate\n");
-	exit(1);
-    } else {
-        printf("inflate(): %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Test deflate() with large buffers and dynamic change of compression level
- */
-void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_BEST_SPEED);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uInt)comprLen;
-
-    /* At this point, uncompr is still mostly zeroes, so it should compress
-     * very well:
-     */
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (uInt)uncomprLen;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-    if (c_stream.avail_in != 0) {
-        fprintf(stderr, "deflate not greedy\n");
-	exit(1);
-    }
-
-    /* Feed in already compressed data and switch to no compression: */
-    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
-    c_stream.next_in = compr;
-    c_stream.avail_in = (uInt)comprLen/2;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    /* Switch back to compressing mode: */
-    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (uInt)uncomprLen;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate should report Z_STREAM_END\n");
-	exit(1);
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with large buffers
- */
-void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uInt)comprLen;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    for (;;) {
-        d_stream.next_out = uncompr;            /* discard the output */
-	d_stream.avail_out = (uInt)uncomprLen;
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "large inflate");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
-        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
-	exit(1);
-    } else {
-        printf("large_inflate(): OK\n");
-    }
-}
-
-/* ===========================================================================
- * Test deflate() with full flush
- */
-void test_flush(compr, comprLen)
-    Byte *compr;
-    uLong *comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-    int len = strlen(hello)+1;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (Bytef*)hello;
-    c_stream.next_out = compr;
-    c_stream.avail_in = 3;
-    c_stream.avail_out = (uInt)*comprLen;
-    err = deflate(&c_stream, Z_FULL_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    compr[3]++; /* force an error in first compressed block */
-    c_stream.avail_in = len - 3;
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        CHECK_ERR(err, "deflate");
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    *comprLen = c_stream.total_out;
-}
-
-/* ===========================================================================
- * Test inflateSync()
- */
-void test_sync(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 2; /* just read the zlib header */
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uInt)uncomprLen;
-
-    inflate(&d_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "inflate");
-
-    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
-    err = inflateSync(&d_stream);           /* but skip the damaged part */
-    CHECK_ERR(err, "inflateSync");
-
-    err = inflate(&d_stream, Z_FINISH);
-    if (err != Z_DATA_ERROR) {
-        fprintf(stderr, "inflate should report DATA_ERROR\n");
-        /* Because of incorrect adler32 */
-	exit(1);
-    }
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    printf("after inflateSync(): hel%s\n", (char *)uncompr);
-}
-
-/* ===========================================================================
- * Test deflate() with preset dictionary
- */
-void test_dict_deflate(compr, comprLen)
-    Byte *compr;
-    uLong comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    err = deflateSetDictionary(&c_stream,
-			       (const Bytef*)dictionary, sizeof(dictionary));
-    CHECK_ERR(err, "deflateSetDictionary");
-
-    dictId = c_stream.adler;
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uInt)comprLen;
-
-    c_stream.next_in = (Bytef*)hello;
-    c_stream.avail_in = (uInt)strlen(hello)+1;
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate should report Z_STREAM_END\n");
-	exit(1);
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with a preset dictionary
- */
-void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uInt)comprLen;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uInt)uncomprLen;
-
-    for (;;) {
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-	if (err == Z_NEED_DICT) {
-	    if (d_stream.adler != dictId) {
-		fprintf(stderr, "unexpected dictionary");
-		exit(1);
-	    }
-	    err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
-				       sizeof(dictionary));
-	}
-        CHECK_ERR(err, "inflate with dict");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad inflate with dict\n");
-	exit(1);
-    } else {
-        printf("inflate with dictionary: %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Usage:  example [output.gz  [input.gz]]
- */
-
-int main(argc, argv)
-    int argc;
-    char *argv[];
-{
-    Byte *compr, *uncompr;
-    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
-    uLong uncomprLen = comprLen;
-    static const char* myVersion = ZLIB_VERSION;
-
-    if (zlibVersion()[0] != myVersion[0]) {
-        fprintf(stderr, "incompatible zlib version\n");
-        exit(1);
-
-    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
-        fprintf(stderr, "warning: different zlib version\n");
-    }
-
-    compr    = (Byte*)calloc((uInt)comprLen, 1);
-    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
-    /* compr and uncompr are cleared to avoid reading uninitialized
-     * data and to ensure that uncompr compresses well.
-     */
-    if (compr == Z_NULL || uncompr == Z_NULL) {
-        printf("out of memory\n");
-	exit(1);
-    }
-    test_compress(compr, comprLen, uncompr, uncomprLen);
-
-    test_gzio((argc > 1 ? argv[1] : TESTFILE),
-              (argc > 2 ? argv[2] : TESTFILE),
-	      uncompr, (int)uncomprLen);
-
-    test_deflate(compr, comprLen);
-    test_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
-    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_flush(compr, &comprLen);
-    test_sync(compr, comprLen, uncompr, uncomprLen);
-    comprLen = uncomprLen;
-
-    test_dict_deflate(compr, comprLen);
-    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    exit(0);
-    return 0; /* to avoid warning */
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/gzio.c b/projects/dvm_svn/tools/Zlib/src/gzio.c
deleted file mode 100644
index 902527d..0000000
--- a/projects/dvm_svn/tools/Zlib/src/gzio.c
+++ /dev/null
@@ -1,851 +0,0 @@
-/* gzio.c -- IO on .gz files
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Compile this file with -DNO_DEFLATE to avoid the compression code.
- */
-
-/* @(#) $Id$ */
-
-#include <stdio.h>
-
-#include "zutil.h"
-
-struct internal_state {int dummy;}; /* for buggy compilers */
-
-#ifndef Z_BUFSIZE
-#  ifdef MAXSEG_64K
-#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
-#  else
-#    define Z_BUFSIZE 16384
-#  endif
-#endif
-
-# ifndef Z_PRINTF_BUFSIZE
-#    define Z_PRINTF_BUFSIZE 4096
-# endif
-
-#define ALLOC(size) malloc(size)
-#define TRYFREE(p) {if (p) free(p);}
-
-static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
-
-/* gzip flag byte */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define RESERVED     0xE0 /* bits 5..7: reserved */
-
-#ifndef _RTS_ZLIB_
-
-typedef struct gz_stream {
-    z_stream stream;
-    int      z_err;   /* error code for last stream operation */
-    int      z_eof;   /* set if end of input file */
-    FILE     *file;   /* .gz file */
-    Byte     *inbuf;  /* input buffer */
-    Byte     *outbuf; /* output buffer */
-    uLong    crc;     /* crc32 of uncompressed data */
-    char     *msg;    /* error message */
-    char     *path;   /* path name for debugging only */
-    int      transparent; /* 1 if input file is not a .gz file */
-    char     mode;    /* 'w' or 'r' */
-    long     startpos; /* start of compressed data in file (header skipped) */
-} gz_stream;
-
-#endif
-
-
-local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
-local int do_flush        OF((gzFile file, int flush));
-local int    get_byte     OF((gz_stream *s));
-local void   check_header OF((gz_stream *s));
-local int    destroy      OF((gz_stream *s));
-local void   putLong      OF((FILE *file, uLong x));
-local uLong  getLong      OF((gz_stream *s));
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
-   or path name (if fd == -1).
-     gz_open return NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).
-*/
-local gzFile gz_open (const char *path, const char *mode, int fd)
-{
-    int err;
-    int level = Z_DEFAULT_COMPRESSION; /* compression level */
-    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
-    char *p = (char*)mode;
-    gz_stream *s;
-    char fmode[80]; /* copy of mode, without the compression level */
-    char *m = fmode;
-
-    if (!path || !mode) return Z_NULL;
-
-    s = (gz_stream *)ALLOC(sizeof(gz_stream));
-    if (!s) return Z_NULL;
-
-    s->stream.zalloc = (alloc_func)0;
-    s->stream.zfree = (free_func)0;
-    s->stream.opaque = (voidpf)0;
-    s->stream.next_in = s->inbuf = Z_NULL;
-    s->stream.next_out = s->outbuf = Z_NULL;
-    s->stream.avail_in = s->stream.avail_out = 0;
-    s->file = NULL;
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->crc = crc32(0L, Z_NULL, 0);
-    s->msg = NULL;
-    s->transparent = 0;
-
-    s->path = (char*)ALLOC(strlen(path)+1);
-    if (s->path == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    strcpy(s->path, path); /* do this early for debugging */
-
-    s->mode = '\0';
-    do {
-        if (*p == 'r') s->mode = 'r';
-        if (*p == 'w' || *p == 'a') s->mode = 'w';
-        if (*p >= '0' && *p <= '9') {
-	    level = *p - '0';
-	} else if (*p == 'f') {
-	  strategy = Z_FILTERED;
-	} else if (*p == 'h') {
-	  strategy = Z_HUFFMAN_ONLY;
-	} else {
-	    *m++ = *p; /* copy the mode */
-	}
-    } while (*p++ && m != fmode + sizeof(fmode));
-    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
-    
-    if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-        err = Z_STREAM_ERROR;
-#else
-        err = deflateInit2(&(s->stream), level,
-                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
-        /* windowBits is passed < 0 to suppress zlib header */
-
-        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-#endif
-        if (err != Z_OK || s->outbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    } else {
-        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
-        err = inflateInit2(&(s->stream), -MAX_WBITS);
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
-         * present after the compressed stream.
-         */
-        if (err != Z_OK || s->inbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    }
-    s->stream.avail_out = Z_BUFSIZE;
-
-    errno = 0;
-    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
-
-    if (s->file == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    if (s->mode == 'w') {
-        /* Write a very simple .gz header:
-         */
-        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-	s->startpos = 10L;
-	/* We use 10L instead of ftell(s->file) to because ftell causes an
-         * fflush on some systems. This version of the library doesn't use
-         * startpos anyway in write mode, so this initialization is not
-         * necessary.
-         */
-    } else {
-	check_header(s); /* skip the .gz header */
-	s->startpos = (ftell(s->file) - s->stream.avail_in);
-    }
-    
-    return (gzFile)s;
-}
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing.
-*/
-gzFile ZEXPORT gzopen (const char *path, const char *mode)
-{
-    return gz_open (path, mode, -1);
-}
-
-/* ===========================================================================
-     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
-   to mimic the behavio(u)r of fdopen.
-*/
-gzFile ZEXPORT gzdopen (int fd, const char *mode)
-{
-    char name[20];
-
-    if (fd < 0) return (gzFile)Z_NULL;
-    sprintf(name, "<fd:%d>", fd); /* for debugging */
-
-    return gz_open (name, mode, fd);
-}
-
-/* ===========================================================================
- * Update the compression level and strategy
- */
-int ZEXPORT gzsetparams (gzFile file, int level, int strategy)
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    /* Make room to allow flushing */
-    if (s->stream.avail_out == 0) {
-
-	s->stream.next_out = s->outbuf;
-	if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-	    s->z_err = Z_ERRNO;
-	}
-	s->stream.avail_out = Z_BUFSIZE;
-    }
-
-    return deflateParams (&(s->stream), level, strategy);
-}
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-local int get_byte(gz_stream *s)
-{
-    if (s->z_eof) return EOF;
-    if (s->stream.avail_in == 0) {
-	errno = 0;
-	s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-	if (s->stream.avail_in == 0) {
-	    s->z_eof = 1;
-	    if (ferror(s->file)) s->z_err = Z_ERRNO;
-	    return EOF;
-	}
-	s->stream.next_in = s->inbuf;
-    }
-    s->stream.avail_in--;
-    return *(s->stream.next_in)++;
-}
-
-/* ===========================================================================
-      Check the gzip header of a gz_stream opened for reading. Set the stream
-    mode to transparent if the gzip magic header is not present; set s->err
-    to Z_DATA_ERROR if the magic header is present but the rest of the header
-    is incorrect.
-    IN assertion: the stream s has already been created sucessfully;
-       s->stream.avail_in is zero for the first time, but may be non-zero
-       for concatenated .gz files.
-*/
-local void check_header(gz_stream *s)
-{
-    int method; /* method byte */
-    int flags;  /* flags byte */
-    uInt len;
-    int c;
-
-    /* Check the gzip magic header */
-    for (len = 0; len < 2; len++) {
-	c = get_byte(s);
-	if (c != gz_magic[len]) {
-	    if (len != 0) s->stream.avail_in++, s->stream.next_in--;
-	    if (c != EOF) {
-		s->stream.avail_in++, s->stream.next_in--;
-		s->transparent = 1;
-	    }
-	    s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
-	    return;
-	}
-    }
-    method = get_byte(s);
-    flags = get_byte(s);
-    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
-	s->z_err = Z_DATA_ERROR;
-	return;
-    }
-
-    /* Discard time, xflags and OS code: */
-    for (len = 0; len < 6; len++) (void)get_byte(s);
-
-    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-	len  =  (uInt)get_byte(s);
-	len += ((uInt)get_byte(s))<<8;
-	/* len is garbage if EOF but the loop below will quit anyway */
-	while (len-- != 0 && get_byte(s) != EOF) ;
-    }
-    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-	while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
-	while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
-	for (len = 0; len < 2; len++) (void)get_byte(s);
-    }
-    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
-}
-
- /* ===========================================================================
- * Cleanup then free the given gz_stream. Return a zlib error code.
-   Try freeing in the reverse order of allocations.
- */
-local int destroy (gz_stream *s)
-{
-    int err = Z_OK;
-
-    if (!s) return Z_STREAM_ERROR;
-
-    TRYFREE(s->msg);
-
-    if (s->stream.state != NULL) {
-	if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-	    err = Z_STREAM_ERROR;
-#else
-	    err = deflateEnd(&(s->stream));
-#endif
-	} else if (s->mode == 'r') {
-	    err = inflateEnd(&(s->stream));
-	}
-    }
-    if (s->file != NULL && fclose(s->file)) {
-#ifdef ESPIPE
-	if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
-#endif
-	    err = Z_ERRNO;
-    }
-    if (s->z_err < 0) err = s->z_err;
-
-    TRYFREE(s->inbuf);
-    TRYFREE(s->outbuf);
-    TRYFREE(s->path);
-    TRYFREE(s);
-    return err;
-}
-
-/* ===========================================================================
-     Reads the given number of uncompressed bytes from the compressed file.
-   gzread returns the number of bytes actually read (0 for end of file).
-*/
-int ZEXPORT gzread (gzFile file, voidp buf, unsigned len)
-{
-    gz_stream *s = (gz_stream*)file;
-    Bytef *start = (Bytef*)buf; /* starting point for crc computation */
-    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
-
-    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
-
-    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
-    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
-
-    next_out = (Byte*)buf;
-    s->stream.next_out = (Bytef*)buf;
-    s->stream.avail_out = len;
-
-    while (s->stream.avail_out != 0) {
-
-	if (s->transparent) {
-	    /* Copy first the lookahead bytes: */
-	    uInt n = s->stream.avail_in;
-	    if (n > s->stream.avail_out) n = s->stream.avail_out;
-	    if (n > 0) {
-		zmemcpy(s->stream.next_out, s->stream.next_in, n);
-		next_out += n;
-		s->stream.next_out = next_out;
-		s->stream.next_in   += n;
-		s->stream.avail_out -= n;
-		s->stream.avail_in  -= n;
-	    }
-	    if (s->stream.avail_out > 0) {
-		s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out,
-					     s->file);
-	    }
-	    len -= s->stream.avail_out;
-	    s->stream.total_in  += (uLong)len;
-	    s->stream.total_out += (uLong)len;
-            if (len == 0) s->z_eof = 1;
-	    return (int)len;
-	}
-        if (s->stream.avail_in == 0 && !s->z_eof) {
-
-            errno = 0;
-            s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-            if (s->stream.avail_in == 0) {
-                s->z_eof = 1;
-		if (ferror(s->file)) {
-		    s->z_err = Z_ERRNO;
-		    break;
-		}
-            }
-            s->stream.next_in = s->inbuf;
-        }
-        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
-
-	if (s->z_err == Z_STREAM_END) {
-	    /* Check CRC and original size */
-	    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-	    start = s->stream.next_out;
-
-	    if (getLong(s) != s->crc) {
-		s->z_err = Z_DATA_ERROR;
-	    } else {
-	        (void)getLong(s);
-                /* The uncompressed length returned by above getlong() may
-                 * be different from s->stream.total_out) in case of
-		 * concatenated .gz files. Check for such files:
-		 */
-		check_header(s);
-		if (s->z_err == Z_OK) {
-		    uLong total_in = s->stream.total_in;
-		    uLong total_out = s->stream.total_out;
-
-		    inflateReset(&(s->stream));
-		    s->stream.total_in = total_in;
-		    s->stream.total_out = total_out;
-		    s->crc = crc32(0L, Z_NULL, 0);
-		}
-	    }
-	}
-	if (s->z_err != Z_OK || s->z_eof) break;
-    }
-    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-
-    return (int)(len - s->stream.avail_out);
-}
-
-
-/* ===========================================================================
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-int ZEXPORT gzgetc(gzFile file)
-{
-    unsigned char c;
-
-    return gzread(file, &c, 1) == 1 ? c : -1;
-}
-
-
-/* ===========================================================================
-      Reads bytes from the compressed file until len-1 characters are
-   read, or a newline character is read and transferred to buf, or an
-   end-of-file condition is encountered.  The string is then terminated
-   with a null character.
-      gzgets returns buf, or Z_NULL in case of error.
-
-      The current implementation is not optimized at all.
-*/
-char * ZEXPORT gzgets(gzFile file, char *buf, int len)
-{
-    char *b = buf;
-    if (buf == Z_NULL || len <= 0) return Z_NULL;
-
-    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
-    *buf = '\0';
-    return b == buf && len > 0 ? Z_NULL : b;
-}
-
-
-#ifndef NO_DEFLATE
-/* ===========================================================================
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of bytes actually written (0 in case of error).
-*/
-int ZEXPORT gzwrite (gzFile file, const voidp buf, unsigned len)
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.next_in = (Bytef*)buf;
-    s->stream.avail_in = len;
-
-    while (s->stream.avail_in != 0) {
-
-        if (s->stream.avail_out == 0) {
-
-            s->stream.next_out = s->outbuf;
-            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-                s->z_err = Z_ERRNO;
-                break;
-            }
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-        if (s->z_err != Z_OK) break;
-    }
-    s->crc = crc32(s->crc, (const Bytef *)buf, len);
-
-    return (int)(len - s->stream.avail_in);
-}
-
-/* ===========================================================================
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-#ifdef STDC
-#include <stdarg.h>
-
-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
-{
-    char gzBuf[Z_PRINTF_BUFSIZE];
-    va_list va;
-    int len = 0;
-
-    va_start(va, format);
-
-#ifdef HAS_vsnprintf
-/*    (void)vsnprintf(gzBuf, sizeof(gzBuf), format, va);*/
-    len = vsnprintf(gzBuf, sizeof(gzBuf), format, va);
-#else
-/*    (void)vsprintf(gzBuf, format, va);*/
-    len = vsprintf(gzBuf, format, va);
-#endif
-
-    va_end(va);
-    len = strlen(gzBuf);   /* some *sprintf don't return the nb of bytes written */
-    if (len <= 0)
-        return 0;
-
-    return gzwrite(file, gzBuf, (unsigned)len);
-}
-#else /* not ANSI C */
-
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-                        a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-    gzFile file;
-    const char *format;
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-	a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
-    char gzBuf[Z_PRINTF_BUFSIZE];
-
-    int len = 0;
-
-#ifdef HAS_snprintf
-/*    snprintf(gzBuf, sizeof(gzBuf), format,
-               a1, a2, a3, a4, a5, a6, a7, a8,
-               a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);*/
-    len = snprintf(gzBuf, sizeof(gzBuf), format,
-                   a1, a2, a3, a4, a5, a6, a7, a8,
-	           a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#else
-/*    sprintf(gzBuf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-	    a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);*/
-    len = sprintf(gzBuf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-	          a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#endif
-
-    len = strlen(gzBuf);   /* old sprintf doesn't return the nb of bytes written */
-    if (len <= 0) return 0;
-
-    return gzwrite(file, gzBuf, len);
-}
-
-#endif
-
-/* ===========================================================================
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-int ZEXPORT gzputc(gzFile file, int c)
-{
-    unsigned char cc = (unsigned char) c; /* required for big endian systems */
-
-    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
-}
-
-
-/* ===========================================================================
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-int ZEXPORT gzputs(gzFile file, const char *s)
-{
-    return gzwrite(file, (char*)s, (unsigned)strlen(s));
-}
-
-
-/* ===========================================================================
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function.
-*/
-local int do_flush (gzFile file, int flush)
-{
-    uInt len;
-    int done = 0;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.avail_in = 0; /* should be zero already anyway */
-
-    for (;;) {
-        len = Z_BUFSIZE - s->stream.avail_out;
-
-        if (len != 0) {
-            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
-                s->z_err = Z_ERRNO;
-                return Z_ERRNO;
-            }
-            s->stream.next_out = s->outbuf;
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        if (done) break;
-        s->z_err = deflate(&(s->stream), flush);
-
-	/* Ignore the second of two consecutive flushes: */
-	if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
-
-        /* deflate has finished flushing only when it hasn't used up
-         * all the available space in the output buffer: 
-         */
-        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
- 
-        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
-    }
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-
-int ZEXPORT gzflush (gzFile file, int flush)
-{
-    gz_stream *s = (gz_stream*)file;
-    int err = do_flush (file, flush);
-
-    if (err) return err;
-    fflush(s->file);
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-#endif /* NO_DEFLATE */
-
-/* ===========================================================================
-      Sets the starting position for the next gzread or gzwrite on the given
-   compressed file. The offset represents a number of bytes in the
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error.
-      SEEK_END is not implemented, returns error.
-      In this version of the library, gzseek can be extremely slow.
-*/
-z_off_t ZEXPORT gzseek (gzFile file, z_off_t offset, int whence)
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || whence == SEEK_END ||
-	s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
-	return -1L;
-    }
-    
-    if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-	return -1L;
-#else
-	if (whence == SEEK_SET) {
-	    offset -= s->stream.total_in;
-	}
-	if (offset < 0) return -1L;
-
-	/* At this point, offset is the number of zero bytes to write. */
-	if (s->inbuf == Z_NULL) {
-	    s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
-	    zmemzero(s->inbuf, Z_BUFSIZE);
-	}
-	while (offset > 0)  {
-	    uInt size = Z_BUFSIZE;
-	    if (offset < Z_BUFSIZE) size = (uInt)offset;
-
-	    size = gzwrite(file, s->inbuf, size);
-	    if (size == 0) return -1L;
-
-	    offset -= size;
-	}
-	return (z_off_t)s->stream.total_in;
-#endif
-    }
-    /* Rest of function is for reading only */
-
-    /* compute absolute position */
-    if (whence == SEEK_CUR) {
-	offset += s->stream.total_out;
-    }
-    if (offset < 0) return -1L;
-
-    if (s->transparent) {
-	/* map to fseek */
-	s->stream.avail_in = 0;
-	s->stream.next_in = s->inbuf;
-        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
-
-	s->stream.total_in = s->stream.total_out = (uLong)offset;
-	return offset;
-    }
-
-    /* For a negative seek, rewind and use positive seek */
-    if ((uLong)offset >= s->stream.total_out) {
-	offset -= s->stream.total_out;
-    } else if (gzrewind(file) < 0) {
-	return -1L;
-    }
-    /* offset is now the number of bytes to skip. */
-
-    if (offset != 0 && s->outbuf == Z_NULL) {
-	s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-    }
-    while (offset > 0)  {
-	int size = Z_BUFSIZE;
-	if (offset < Z_BUFSIZE) size = (int)offset;
-
-	size = gzread(file, s->outbuf, (uInt)size);
-	if (size <= 0) return -1L;
-	offset -= size;
-    }
-    return (z_off_t)s->stream.total_out;
-}
-
-/* ===========================================================================
-     Rewinds input file. 
-*/
-int ZEXPORT gzrewind (gzFile file)
-{
-    gz_stream *s = (gz_stream*)file;
-    
-    if (s == NULL || s->mode != 'r') return -1;
-
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->stream.avail_in = 0;
-    s->stream.next_in = s->inbuf;
-    s->crc = crc32(0L, Z_NULL, 0);
-	
-    if (s->startpos == 0) { /* not a compressed file */
-	rewind(s->file);
-	return 0;
-    }
-
-    (void) inflateReset(&s->stream);
-    return fseek(s->file, s->startpos, SEEK_SET);
-}
-
-/* ===========================================================================
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-*/
-z_off_t ZEXPORT gztell (gzFile file)
-{
-    return gzseek(file, 0L, SEEK_CUR);
-}
-
-/* ===========================================================================
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-int ZEXPORT gzeof (gzFile file)
-{
-    gz_stream *s = (gz_stream*)file;
-    
-    return (s == NULL || s->mode != 'r') ? 0 : s->z_eof;
-}
-
-/* ===========================================================================
-   Outputs a long in LSB order to the given file
-*/
-local void putLong (FILE *file, uLong x)
-{
-    int n;
-    for (n = 0; n < 4; n++) {
-        fputc((int)(x & 0xff), file);
-        x >>= 8;
-    }
-}
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets z_err in case
-   of error.
-*/
-local uLong getLong (gz_stream *s)
-{
-    uLong x = (uLong)get_byte(s);
-    int c;
-
-    x += ((uLong)get_byte(s))<<8;
-    x += ((uLong)get_byte(s))<<16;
-    c = get_byte(s);
-    if (c == EOF) s->z_err = Z_DATA_ERROR;
-    x += ((uLong)c)<<24;
-    return x;
-}
-
-/* ===========================================================================
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state.
-*/
-int ZEXPORT gzclose (gzFile file)
-{
-    int err;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) return Z_STREAM_ERROR;
-
-    if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-	return Z_STREAM_ERROR;
-#else
-        err = do_flush (file, Z_FINISH);
-        if (err != Z_OK) return destroy((gz_stream*)file);
-
-        putLong (s->file, s->crc);
-        putLong (s->file, s->stream.total_in);
-#endif
-    }
-    return destroy((gz_stream*)file);
-}
-
-/* ===========================================================================
-     Returns the error message for the last error which occured on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occured in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-const char*  ZEXPORT gzerror (gzFile file, int *errnum)
-{
-    char *m;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) {
-        *errnum = Z_STREAM_ERROR;
-        return (const char*)ERR_MSG(Z_STREAM_ERROR);
-    }
-    *errnum = s->z_err;
-    if (*errnum == Z_OK) return (const char*)"";
-
-    m =  (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
-
-    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
-
-    TRYFREE(s->msg);
-    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
-    strcpy(s->msg, s->path);
-    strcat(s->msg, ": ");
-    strcat(s->msg, m);
-    return (const char*)s->msg;
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/infblock.c b/projects/dvm_svn/tools/Zlib/src/infblock.c
deleted file mode 100644
index 9348065..0000000
--- a/projects/dvm_svn/tools/Zlib/src/infblock.c
+++ /dev/null
@@ -1,395 +0,0 @@
-/* infblock.c -- interpret and process block types to last block
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "infblock.h"
-#include "inftrees.h"
-#include "infcodes.h"
-#include "infutil.h"
-
-struct inflate_codes_state {int dummy;}; /* for buggy compilers */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* Table for deflate from PKZIP's appnote.txt. */
-local const uInt border[] = { /* Order of the bit length code lengths */
-        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-/*
-   Notes beyond the 1.93a appnote.txt:
-
-   1. Distance pointers never point before the beginning of the output
-      stream.
-   2. Distance pointers can point back across blocks, up to 32k away.
-   3. There is an implied maximum of 7 bits for the bit length table and
-      15 bits for the actual data.
-   4. If only one code exists, then it is encoded using one bit.  (Zero
-      would be more efficient, but perhaps a little confusing.)  If two
-      codes exist, they are coded using one bit each (0 and 1).
-   5. There is no way of sending zero distance codes--a dummy must be
-      sent if there are none.  (History: a pre 2.0 version of PKZIP would
-      store blocks with no distance codes, but this was discovered to be
-      too harsh a criterion.)  Valid only for 1.93a.  2.04c does allow
-      zero distance codes, which is sent as one code of zero bits in
-      length.
-   6. There are up to 286 literal/length codes.  Code 256 represents the
-      end-of-block.  Note however that the static length tree defines
-      288 codes just to fill out the Huffman codes.  Codes 286 and 287
-      cannot be used though, since there is no length base or extra bits
-      defined for them.  Similarily, there are up to 30 distance codes.
-      However, static trees define 32 codes (all 5 bits) to fill out the
-      Huffman codes, but the last two had better not show up in the data.
-   7. Unzip can check dynamic Huffman blocks for complete code sets.
-      The exception is that a single code would not be complete (see #4).
-   8. The five bits following the block type is really the number of
-      literal codes sent minus 257.
-   9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
-      (1+6+6).  Therefore, to output three times the length, you output
-      three codes (1+1+1), whereas to output four times the same length,
-      you only need two codes (1+3).  Hmm.
-  10. In the tree reconstruction algorithm, Code = Code + Increment
-      only if BitLength(i) is not zero.  (Pretty obvious.)
-  11. Correction: 4 Bits: # of Bit Length codes - 4     (4 - 19)
-  12. Note: length code 284 can represent 227-258, but length code 285
-      really is 258.  The last length deserves its own, short code
-      since it gets used a lot in very redundant files.  The length
-      258 is special since 258 - 3 (the min match length) is 255.
-  13. The literal/length and distance code bit lengths are read as a
-      single stream of lengths.  It is possible (and advantageous) for
-      a repeat code (16, 17, or 18) to go across the boundary between
-      the two sets of lengths.
- */
-
-
-void inflate_blocks_reset(inflate_blocks_statef *s, z_streamp z,
-                          uLongf *c)
-{
-  if (c != Z_NULL)
-    *c = s->check;
-  if (s->mode == BTREE || s->mode == DTREE)
-    ZFREE(z, s->sub.trees.blens);
-  if (s->mode == CODES)
-    inflate_codes_free(s->sub.decode.codes, z);
-  s->mode = TYPE;
-  s->bitk = 0;
-  s->bitb = 0;
-  s->read = s->write = s->window;
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(0L, (const Bytef *)Z_NULL, 0);
-  Tracev((stderr, "inflate:   blocks reset\n"));
-}
-
-
-inflate_blocks_statef *inflate_blocks_new(z_streamp z, check_func c,
-                                          uInt w)
-{
-  inflate_blocks_statef *s;
-
-  if ((s = (inflate_blocks_statef *)ZALLOC
-       (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
-    return s;
-  if ((s->hufts =
-       (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL)
-  {
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
-  {
-    ZFREE(z, s->hufts);
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  s->end = s->window + w;
-  s->checkfn = c;
-  s->mode = TYPE;
-  Tracev((stderr, "inflate:   blocks allocated\n"));
-  inflate_blocks_reset(s, z, Z_NULL);
-  return s;
-}
-
-
-int inflate_blocks(inflate_blocks_statef *s, z_streamp z, int r)
-{
-  uInt t;               /* temporary storage */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Bytef *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Bytef *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  uch  CondTrue = 1;
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input based on current state */
-  while (CondTrue) switch (s->mode)
-  {
-
-    case TYPE:
-      NEEDBITS(3)
-      t = (uInt)b & 7;
-      s->last = t & 1;
-      switch (t >> 1)
-      {
-        case 0:                         /* stored */
-          Tracev((stderr, "inflate:     stored block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          t = k & 7;                    /* go to byte boundary */
-          DUMPBITS(t)
-          s->mode = LENS;               /* get length of stored block */
-          break;
-        case 1:                         /* fixed */
-          Tracev((stderr, "inflate:     fixed codes block%s\n",
-                 s->last ? " (last)" : ""));
-          {
-            uInt bl, bd;
-            inflate_huft *tl, *td;
-
-            inflate_trees_fixed(&bl, &bd, &tl, &td, z);
-            s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
-            if (s->sub.decode.codes == Z_NULL)
-            {
-              r = Z_MEM_ERROR;
-              LEAVE
-            }
-          }
-          DUMPBITS(3)
-          s->mode = CODES;
-          break;
-        case 2:                         /* dynamic */
-          Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          s->mode = TABLE;
-          break;
-        case 3:                         /* illegal */
-          DUMPBITS(3)
-          s->mode = BAD;
-          z->msg = (char*)"invalid block type";
-          r = Z_DATA_ERROR;
-          LEAVE
-      }
-      break;
-    case LENS:
-      NEEDBITS(32)
-      if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
-      {
-        s->mode = BAD;
-        z->msg = (char*)"invalid stored block lengths";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-      s->sub.left = (uInt)b & 0xffff;
-      b = k = 0;                      /* dump bits */
-      Tracev((stderr, "inflate:       stored length %u\n", s->sub.left));
-      s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
-      break;
-    case STORED:
-      if (n == 0)
-        LEAVE
-      NEEDOUT
-      t = s->sub.left;
-      if (t > n) t = n;
-      if (t > m) t = m;
-      zmemcpy(q, p, t);
-      p += t;  n -= t;
-      q += t;  m -= t;
-      if ((s->sub.left -= t) != 0)
-        break;
-      Tracev((stderr, "inflate:       stored end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      s->mode = s->last ? DRY : TYPE;
-      break;
-    case TABLE:
-      NEEDBITS(14)
-      s->sub.trees.table = t = (uInt)b & 0x3fff;
-#ifndef PKZIP_BUG_WORKAROUND
-      if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
-      {
-        s->mode = BAD;
-        z->msg = (char*)"too many length or distance symbols";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-#endif
-      t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
-      if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
-      {
-        r = Z_MEM_ERROR;
-        LEAVE
-      }
-      DUMPBITS(14)
-      s->sub.trees.index = 0;
-      Tracev((stderr, "inflate:       table sizes ok\n"));
-      s->mode = BTREE;
-    case BTREE:
-      while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
-      {
-        NEEDBITS(3)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
-        DUMPBITS(3)
-      }
-      while (s->sub.trees.index < 19)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
-      s->sub.trees.bb = 7;
-      t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
-                             &s->sub.trees.tb, s->hufts, z);
-      if (t != Z_OK)
-      {
-        r = t;
-        if (r == Z_DATA_ERROR)
-        {
-          ZFREE(z, s->sub.trees.blens);
-          s->mode = BAD;
-        }
-        LEAVE
-      }
-      s->sub.trees.index = 0;
-      Tracev((stderr, "inflate:       bits tree ok\n"));
-      s->mode = DTREE;
-    case DTREE:
-      while (t = s->sub.trees.table,
-             s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
-      {
-        inflate_huft *h;
-        uInt i, j, c;
-
-        t = s->sub.trees.bb;
-        NEEDBITS(t)
-        h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
-        t = h->bits;
-        c = h->base;
-        if (c < 16)
-        {
-          DUMPBITS(t)
-          s->sub.trees.blens[s->sub.trees.index++] = c;
-        }
-        else /* c == 16..18 */
-        {
-          i = c == 18 ? 7 : c - 14;
-          j = c == 18 ? 11 : 3;
-          NEEDBITS(t + i)
-          DUMPBITS(t)
-          j += (uInt)b & inflate_mask[i];
-          DUMPBITS(i)
-          i = s->sub.trees.index;
-          t = s->sub.trees.table;
-          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
-              (c == 16 && i < 1))
-          {
-            ZFREE(z, s->sub.trees.blens);
-            s->mode = BAD;
-            z->msg = (char*)"invalid bit length repeat";
-            r = Z_DATA_ERROR;
-            LEAVE
-          }
-          c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
-          do {
-            s->sub.trees.blens[i++] = c;
-          } while (--j);
-          s->sub.trees.index = i;
-        }
-      }
-      s->sub.trees.tb = Z_NULL;
-      {
-        uInt bl, bd;
-        inflate_huft *tl, *td;
-        inflate_codes_statef *c;
-
-        bl = 9;         /* must be <= 9 for lookahead assumptions */
-        bd = 6;         /* must be <= 9 for lookahead assumptions */
-        t = s->sub.trees.table;
-        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
-                                  s->sub.trees.blens, &bl, &bd, &tl, &td,
-                                  s->hufts, z);
-        if (t != Z_OK)
-        {
-          if (t == (uInt)Z_DATA_ERROR)
-          {
-            ZFREE(z, s->sub.trees.blens);
-            s->mode = BAD;
-          }
-          r = t;
-          LEAVE
-        }
-        Tracev((stderr, "inflate:       trees ok\n"));
-        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
-        {
-          r = Z_MEM_ERROR;
-          LEAVE
-        }
-        s->sub.decode.codes = c;
-      }
-      ZFREE(z, s->sub.trees.blens);
-      s->mode = CODES;
-    case CODES:
-      UPDATE
-      if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
-        return inflate_flush(s, z, r);
-      r = Z_OK;
-      inflate_codes_free(s->sub.decode.codes, z);
-      LOAD
-      Tracev((stderr, "inflate:       codes end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      if (!s->last)
-      {
-        s->mode = TYPE;
-        break;
-      }
-      s->mode = DRY;
-    case DRY:
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      s->mode = DONE;
-    case DONE:
-      r = Z_STREAM_END;
-      LEAVE
-    case BAD:
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-  
-  return  0;      /* warning!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-}
-
-
-int inflate_blocks_free(inflate_blocks_statef *s, z_streamp z)
-{
-  inflate_blocks_reset(s, z, Z_NULL);
-  ZFREE(z, s->window);
-  ZFREE(z, s->hufts);
-  ZFREE(z, s);
-  Tracev((stderr, "inflate:   blocks freed\n"));
-  return Z_OK;
-}
-
-
-void inflate_set_dictionary(inflate_blocks_statef *s, const Bytef *d,
-                            uInt n)
-{
-  zmemcpy(s->window, d, n);
-  s->read = s->write = s->window + n;
-}
-
-
-/* Returns true if inflate is currently at the end of a block generated
- * by Z_SYNC_FLUSH or Z_FULL_FLUSH. 
- * IN assertion: s != Z_NULL
- */
-int inflate_blocks_sync_point(inflate_blocks_statef *s)
-{
-  return s->mode == LENS;
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/infcodes.c b/projects/dvm_svn/tools/Zlib/src/infcodes.c
deleted file mode 100644
index 3e71f45..0000000
--- a/projects/dvm_svn/tools/Zlib/src/infcodes.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/* infcodes.c -- process literals and length/distance pairs
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "infblock.h"
-#include "infcodes.h"
-#include "infutil.h"
-#include "inffast.h"
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-typedef enum {        /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-      START,    /* x: set up for LEN */
-      LEN,      /* i: get length/literal/eob next */
-      LENEXT,   /* i: getting length extra (have base) */
-      DIST,     /* i: get distance next */
-      DISTEXT,  /* i: getting distance extra */
-      COPY,     /* o: copying bytes in window, waiting for space */
-      LIT,      /* o: got literal, waiting for output space */
-      WASH,     /* o: got eob, possibly still output waiting */
-      END,      /* x: got eob and all data flushed */
-      BADCODE}  /* x: got error */
-inflate_codes_mode;
-
-/* inflate codes private state */
-struct inflate_codes_state {
-
-  /* mode */
-  inflate_codes_mode mode;      /* current inflate_codes mode */
-
-  /* mode dependent information */
-  uInt len;
-  union {
-    struct {
-      inflate_huft *tree;       /* pointer into tree */
-      uInt need;                /* bits needed */
-    } code;             /* if LEN or DIST, where in tree */
-    uInt lit;           /* if LIT, literal */
-    struct {
-      uInt get;                 /* bits to get for extra */
-      uInt dist;                /* distance back to copy from */
-    } copy;             /* if EXT or COPY, where and how much */
-  } sub;                /* submode */
-
-  /* mode independent information */
-  Byte lbits;           /* ltree bits decoded per branch */
-  Byte dbits;           /* dtree bits decoder per branch */
-  inflate_huft *ltree;          /* literal/length/eob tree */
-  inflate_huft *dtree;          /* distance tree */
-
-};
-
-
-inflate_codes_statef *inflate_codes_new(uInt bl, uInt bd,
-                                        inflate_huft *tl,
-                                        inflate_huft *td, z_streamp z)
-{
-  inflate_codes_statef *c;
-
-  if ((c = (inflate_codes_statef *)
-       ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
-  {
-    c->mode = START;
-    c->lbits = (Byte)bl;
-    c->dbits = (Byte)bd;
-    c->ltree = tl;
-    c->dtree = td;
-    Tracev((stderr, "inflate:       codes new\n"));
-  }
-  return c;
-}
-
-
-int inflate_codes(inflate_blocks_statef *s, z_streamp z, int r)
-{
-  uInt j;               /* temporary storage */
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Bytef *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Bytef *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  Bytef *f;             /* pointer to copy strings from */
-  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */
-  uch  CondTrue = 1;
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input and output based on current state */
-  while (CondTrue) switch (c->mode)
-  {             /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-    case START:         /* x: set up for LEN */
-#ifndef SLOW
-      if (m >= 258 && n >= 10)
-      {
-        UPDATE
-        r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
-        LOAD
-        if (r != Z_OK)
-        {
-          c->mode = r == Z_STREAM_END ? WASH : BADCODE;
-          break;
-        }
-      }
-#endif /* !SLOW */
-      c->sub.code.need = c->lbits;
-      c->sub.code.tree = c->ltree;
-      c->mode = LEN;
-    case LEN:           /* i: get length/literal/eob next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e == 0)               /* literal */
-      {
-        c->sub.lit = t->base;
-        Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-                 "inflate:         literal '%c'\n" :
-                 "inflate:         literal 0x%02x\n", t->base));
-        c->mode = LIT;
-        break;
-      }
-      if (e & 16)               /* length */
-      {
-        c->sub.copy.get = e & 15;
-        c->len = t->base;
-        c->mode = LENEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      if (e & 32)               /* end of block */
-      {
-        Tracevv((stderr, "inflate:         end of block\n"));
-        c->mode = WASH;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid literal/length code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case LENEXT:        /* i: getting length extra (have base) */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->len += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      c->sub.code.need = c->dbits;
-      c->sub.code.tree = c->dtree;
-      Tracevv((stderr, "inflate:         length %u\n", c->len));
-      c->mode = DIST;
-    case DIST:          /* i: get distance next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e & 16)               /* distance */
-      {
-        c->sub.copy.get = e & 15;
-        c->sub.copy.dist = t->base;
-        c->mode = DISTEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid distance code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case DISTEXT:       /* i: getting distance extra */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->sub.copy.dist += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      Tracevv((stderr, "inflate:         distance %u\n", c->sub.copy.dist));
-      c->mode = COPY;
-    case COPY:          /* o: copying bytes in window, waiting for space */
-      f = q - c->sub.copy.dist;
-      while (f < s->window)             /* modulo window size-"while" instead */
-        f += s->end - s->window;        /* of "if" handles invalid distances */
-      while (c->len)
-      {
-        NEEDOUT
-        OUTBYTE(*f++)
-        if (f == s->end)
-          f = s->window;
-        c->len--;
-      }
-      c->mode = START;
-      break;
-    case LIT:           /* o: got literal, waiting for output space */
-      NEEDOUT
-      OUTBYTE(c->sub.lit)
-      c->mode = START;
-      break;
-    case WASH:          /* o: got eob, possibly more output */
-      if (k > 7)        /* return unused byte, if any */
-      {
-        Assert(k < 16, "inflate_codes grabbed too many bytes")
-        k -= 8;
-        n++;
-        p--;            /* can always return one */
-      }
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      c->mode = END;
-    case END:
-      r = Z_STREAM_END;
-      LEAVE
-    case BADCODE:       /* x: got error */
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-
-  return  0;      /* warning!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-}
-
-
-void inflate_codes_free(inflate_codes_statef *c, z_streamp z)
-{
-  ZFREE(z, c);
-  Tracev((stderr, "inflate:       codes free\n"));
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/inffast.c b/projects/dvm_svn/tools/Zlib/src/inffast.c
deleted file mode 100644
index 1427f0f..0000000
--- a/projects/dvm_svn/tools/Zlib/src/inffast.c
+++ /dev/null
@@ -1,180 +0,0 @@
-/* inffast.c -- process literals and length/distance pairs fast
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "infblock.h"
-#include "infcodes.h"
-#include "infutil.h"
-#include "inffast.h"
-
-struct inflate_codes_state {int dummy;}; /* for buggy compilers */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* macros for bit input with no checking and for returning unused bytes */
-#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;}
-
-/* Called with number of bytes left to write in window at least 258
-   (the maximum string length) and number of input bytes available
-   at least ten.  The ten bytes are six bytes for the longest length/
-   distance pair plus four bytes for overloading the bit buffer. */
-
-int inflate_fast(uInt bl, uInt bd, inflate_huft *tl, inflate_huft *td,
-                 inflate_blocks_statef *s, z_streamp z)
-{
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Bytef *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Bytef *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  uInt ml;              /* mask for literal/length tree */
-  uInt md;              /* mask for distance tree */
-  uInt c;               /* bytes to copy */
-  uInt d;               /* distance back to copy from */
-  Bytef *r;             /* copy source pointer */
-  uch  CondTrue = 1;
-
-  /* load input, output, bit values */
-  LOAD
-
-  /* initialize masks */
-  ml = inflate_mask[bl];
-  md = inflate_mask[bd];
-
-  /* do until not enough input or output space for fast loop */
-  do {                          /* assume called with m >= 258 && n >= 10 */
-    /* get literal/length code */
-    GRABBITS(20)                /* max bits for literal/length code */
-    if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
-    {
-      DUMPBITS(t->bits)
-      Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-                "inflate:         * literal '%c'\n" :
-                "inflate:         * literal 0x%02x\n", t->base));
-      *q++ = (Byte)t->base;
-      m--;
-      continue;
-    }
-    do {
-      DUMPBITS(t->bits)
-      if (e & 16)
-      {
-        /* get extra bits for length */
-        e &= 15;
-        c = t->base + ((uInt)b & inflate_mask[e]);
-        DUMPBITS(e)
-        Tracevv((stderr, "inflate:         * length %u\n", c));
-
-        /* decode distance base of block to copy */
-        GRABBITS(15);           /* max bits for distance code */
-        e = (t = td + ((uInt)b & md))->exop;
-        do {
-          DUMPBITS(t->bits)
-          if (e & 16)
-          {
-            /* get extra bits to add to distance base */
-            e &= 15;
-            GRABBITS(e)         /* get extra bits (up to 13) */
-            d = t->base + ((uInt)b & inflate_mask[e]);
-            DUMPBITS(e)
-            Tracevv((stderr, "inflate:         * distance %u\n", d));
-
-            /* do the copy */
-            m -= c;
-            r = q - d;
-            if (r < s->window)                  /* wrap if needed */
-            {
-              do {
-                r += s->end - s->window;        /* force pointer in window */
-              } while (r < s->window);          /* covers invalid distances */
-              e = s->end - r;
-              if (c > e)
-              {
-                c -= e;                         /* wrapped copy */
-                do {
-                    *q++ = *r++;
-                } while (--e);
-                r = s->window;
-                do {
-                    *q++ = *r++;
-                } while (--c);
-              }
-              else                              /* normal copy */
-              {
-                *q++ = *r++;  c--;
-                *q++ = *r++;  c--;
-                do {
-                    *q++ = *r++;
-                } while (--c);
-              }
-            }
-            else                                /* normal copy */
-            {
-              *q++ = *r++;  c--;
-              *q++ = *r++;  c--;
-              do {
-                *q++ = *r++;
-              } while (--c);
-            }
-            break;
-          }
-          else if ((e & 64) == 0)
-          {
-            t += t->base;
-            e = (t += ((uInt)b & inflate_mask[e]))->exop;
-          }
-          else
-          {
-            z->msg = (char*)"invalid distance code";
-            UNGRAB
-            UPDATE
-            return Z_DATA_ERROR;
-          }
-        } while (CondTrue);
-        break;
-      }
-      if ((e & 64) == 0)
-      {
-        t += t->base;
-        if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0)
-        {
-          DUMPBITS(t->bits)
-          Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-                    "inflate:         * literal '%c'\n" :
-                    "inflate:         * literal 0x%02x\n", t->base));
-          *q++ = (Byte)t->base;
-          m--;
-          break;
-        }
-      }
-      else if (e & 32)
-      {
-        Tracevv((stderr, "inflate:         * end of block\n"));
-        UNGRAB
-        UPDATE
-        return Z_STREAM_END;
-      }
-      else
-      {
-        z->msg = (char*)"invalid literal/length code";
-        UNGRAB
-        UPDATE
-        return Z_DATA_ERROR;
-      }
-    } while (CondTrue);
-  } while (m >= 258 && n >= 10);
-
-  /* not enough input or output--restore pointers and return */
-  UNGRAB
-  UPDATE
-  return Z_OK;
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/inflate.c b/projects/dvm_svn/tools/Zlib/src/inflate.c
deleted file mode 100644
index ec056b4..0000000
--- a/projects/dvm_svn/tools/Zlib/src/inflate.c
+++ /dev/null
@@ -1,356 +0,0 @@
-/* inflate.c -- zlib interface to inflate modules
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "infblock.h"
-
-struct inflate_blocks_state {int dummy;}; /* for buggy compilers */
-
-typedef enum {
-      METHOD,   /* waiting for method byte */
-      FLAG,     /* waiting for flag byte */
-      DICT4,    /* four dictionary check bytes to go */
-      DICT3,    /* three dictionary check bytes to go */
-      DICT2,    /* two dictionary check bytes to go */
-      DICT1,    /* one dictionary check byte to go */
-      DICT0,    /* waiting for inflateSetDictionary */
-      BLOCKS,   /* decompressing blocks */
-      CHECK4,   /* four check bytes to go */
-      CHECK3,   /* three check bytes to go */
-      CHECK2,   /* two check bytes to go */
-      CHECK1,   /* one check byte to go */
-      DONE,     /* finished check, done */
-      BAD}      /* got an error--stay here */
-inflate_mode;
-
-/* inflate private state */
-struct internal_state {
-
-  /* mode */
-  inflate_mode  mode;   /* current inflate mode */
-
-  /* mode dependent information */
-  union {
-    uInt method;        /* if FLAGS, method byte */
-    struct {
-      uLong was;                /* computed check value */
-      uLong need;               /* stream check value */
-    } check;            /* if CHECK, check values to compare */
-    uInt marker;        /* if BAD, inflateSync's marker bytes count */
-  } sub;        /* submode */
-
-  /* mode independent information */
-  int  nowrap;          /* flag for no wrapper */
-  uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
-  inflate_blocks_statef 
-    *blocks;            /* current inflate_blocks state */
-
-};
-
-
-int ZEXPORT inflateReset(z_streamp z)
-{
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->total_in = z->total_out = 0;
-  z->msg = Z_NULL;
-  z->state->mode = z->state->nowrap ? BLOCKS : METHOD;
-  inflate_blocks_reset(z->state->blocks, z, Z_NULL);
-  Tracev((stderr, "inflate: reset\n"));
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateEnd(z_streamp z)
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->blocks != Z_NULL)
-    inflate_blocks_free(z->state->blocks, z);
-  ZFREE(z, z->state);
-  z->state = Z_NULL;
-  Tracev((stderr, "inflate: end\n"));
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateInit2_(z_streamp z, int w, const char *version,
-                          int stream_size)
-{
-  if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-      stream_size != sizeof(z_stream))
-      return Z_VERSION_ERROR;
-
-  /* initialize state */
-  if (z == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->msg = Z_NULL;
-  if (z->zalloc == Z_NULL)
-  {
-    z->zalloc = zcalloc;
-    z->opaque = (voidpf)0;
-  }
-  if (z->zfree == Z_NULL) z->zfree = zcfree;
-  if ((z->state = (struct internal_state FAR *)
-       ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
-    return Z_MEM_ERROR;
-  z->state->blocks = Z_NULL;
-
-  /* handle undocumented nowrap option (no zlib header or check) */
-  z->state->nowrap = 0;
-  if (w < 0)
-  {
-    w = - w;
-    z->state->nowrap = 1;
-  }
-
-  /* set window size */
-  if (w < 8 || w > 15)
-  {
-    inflateEnd(z);
-    return Z_STREAM_ERROR;
-  }
-  z->state->wbits = (uInt)w;
-
-  /* create inflate_blocks state */
-  if ((z->state->blocks =
-      inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, (uInt)1 << w))
-      == Z_NULL)
-  {
-    inflateEnd(z);
-    return Z_MEM_ERROR;
-  }
-  Tracev((stderr, "inflate: allocated\n"));
-
-  /* reset state */
-  inflateReset(z);
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateInit_(z_streamp z, const char *version,
-                         int stream_size)
-{
-  return inflateInit2_(z, DEF_WBITS, version, stream_size);
-}
-
-
-#define NEEDBYTE {if(z->avail_in==0)return r;r=f;}
-#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
-
-int ZEXPORT inflate(z_streamp z, int f)
-{
-  int r;
-  uInt b;
-  uch  CondTrue = 1;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL)
-    return Z_STREAM_ERROR;
-  f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
-  r = Z_BUF_ERROR;
-  while (CondTrue) switch (z->state->mode)
-  {
-    case METHOD:
-      NEEDBYTE
-      if (((z->state->sub.method = NEXTBYTE) & 0xf) != Z_DEFLATED)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"unknown compression method";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"invalid window size";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      z->state->mode = FLAG;
-    case FLAG:
-      NEEDBYTE
-      b = NEXTBYTE;
-      if (((z->state->sub.method << 8) + b) % 31)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"incorrect header check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev((stderr, "inflate: zlib header ok\n"));
-      if (!(b & PRESET_DICT))
-      {
-        z->state->mode = BLOCKS;
-        break;
-      }
-      z->state->mode = DICT4;
-    case DICT4:
-      NEEDBYTE
-      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
-      z->state->mode = DICT3;
-    case DICT3:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
-      z->state->mode = DICT2;
-    case DICT2:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
-      z->state->mode = DICT1;
-    case DICT1:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE;
-      z->adler = z->state->sub.check.need;
-      z->state->mode = DICT0;
-      return Z_NEED_DICT;
-    case DICT0:
-      z->state->mode = BAD;
-      z->msg = (char*)"need dictionary";
-      z->state->sub.marker = 0;       /* can try inflateSync */
-      return Z_STREAM_ERROR;
-    case BLOCKS:
-      r = inflate_blocks(z->state->blocks, z, r);
-      if (r == Z_DATA_ERROR)
-      {
-        z->state->mode = BAD;
-        z->state->sub.marker = 0;       /* can try inflateSync */
-        break;
-      }
-      if (r == Z_OK)
-        r = f;
-      if (r != Z_STREAM_END)
-        return r;
-      r = f;
-      inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
-      if (z->state->nowrap)
-      {
-        z->state->mode = DONE;
-        break;
-      }
-      z->state->mode = CHECK4;
-    case CHECK4:
-      NEEDBYTE
-      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
-      z->state->mode = CHECK3;
-    case CHECK3:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
-      z->state->mode = CHECK2;
-    case CHECK2:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
-      z->state->mode = CHECK1;
-    case CHECK1:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE;
-
-      if (z->state->sub.check.was != z->state->sub.check.need)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"incorrect data check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev((stderr, "inflate: zlib check ok\n"));
-      z->state->mode = DONE;
-    case DONE:
-      return Z_STREAM_END;
-    case BAD:
-      return Z_DATA_ERROR;
-    default:
-      return Z_STREAM_ERROR;
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-
-  return   0;     /* warning!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
-}
-
-
-int ZEXPORT inflateSetDictionary(z_streamp z, const Bytef *dictionary,
-                                 uInt dictLength)
-{
-  uInt length = dictLength;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->state->mode != DICT0)
-    return Z_STREAM_ERROR;
-
-  if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
-  z->adler = 1L;
-
-  if (length >= ((uInt)1<<z->state->wbits))
-  {
-    length = (1<<z->state->wbits)-1;
-    dictionary += dictLength - length;
-  }
-  inflate_set_dictionary(z->state->blocks, dictionary, length);
-  z->state->mode = BLOCKS;
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateSync(z_streamp z)
-{
-  uInt n;       /* number of bytes to look at */
-  Bytef *p;     /* pointer to bytes */
-  uInt m;       /* number of marker bytes found in a row */
-  uLong r, w;   /* temporaries to save total_in and total_out */
-
-  /* set up */
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->mode != BAD)
-  {
-    z->state->mode = BAD;
-    z->state->sub.marker = 0;
-  }
-  if ((n = z->avail_in) == 0)
-    return Z_BUF_ERROR;
-  p = z->next_in;
-  m = z->state->sub.marker;
-
-  /* search */
-  while (n && m < 4)
-  {
-    static const Byte mark[4] = {0, 0, 0xff, 0xff};
-    if (*p == mark[m])
-      m++;
-    else if (*p)
-      m = 0;
-    else
-      m = 4 - m;
-    p++, n--;
-  }
-
-  /* restore */
-  z->total_in += p - z->next_in;
-  z->next_in = p;
-  z->avail_in = n;
-  z->state->sub.marker = m;
-
-  /* return no joy or set up to restart on a new block */
-  if (m != 4)
-    return Z_DATA_ERROR;
-  r = z->total_in;  w = z->total_out;
-  inflateReset(z);
-  z->total_in = r;  z->total_out = w;
-  z->state->mode = BLOCKS;
-  return Z_OK;
-}
-
-
-/* Returns true if inflate is currently at the end of a block generated
- * by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
- * implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
- * but removes the length bytes of the resulting empty stored block. When
- * decompressing, PPP checks that at the end of input packet, inflate is
- * waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(z_streamp z)
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL)
-    return Z_STREAM_ERROR;
-  return inflate_blocks_sync_point(z->state->blocks);
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/inftrees.c b/projects/dvm_svn/tools/Zlib/src/inftrees.c
deleted file mode 100644
index 78217ee..0000000
--- a/projects/dvm_svn/tools/Zlib/src/inftrees.c
+++ /dev/null
@@ -1,458 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#if !defined(BUILDFIXED) && !defined(STDC)
-#  define BUILDFIXED   /* non ANSI compilers may not accept inffixed.h */
-#endif
-
-const char inflate_copyright[] =
-   " inflate 1.1.4 Copyright 1995-2002 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-struct internal_state  {int dummy;}; /* for buggy compilers */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-
-local int huft_build OF((
-    uIntf *,            /* code lengths in bits */
-    uInt,               /* number of codes */
-    uInt,               /* number of "simple" codes */
-    const uIntf *,      /* list of base values for non-simple codes */
-    const uIntf *,      /* list of extra bits for non-simple codes */
-    inflate_huft * FAR*,/* result: starting table */
-    uIntf *,            /* maximum lookup bits (returns actual) */
-    inflate_huft *,     /* space for trees */
-    uInt *,             /* hufts used in space */
-    uIntf * ));         /* space for values */
-
-/* Tables for deflate from PKZIP's appnote.txt. */
-local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-        /* see note #13 above about 258 */
-local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */
-local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577};
-local const uInt cpdext[30] = { /* Extra bits for distance codes */
-        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-        12, 12, 13, 13};
-
-/*
-   Huffman code decoding is performed using a multi-level table lookup.
-   The fastest way to decode is to simply build a lookup table whose
-   size is determined by the longest code.  However, the time it takes
-   to build this table can also be a factor if the data being decoded
-   is not very long.  The most common codes are necessarily the
-   shortest codes, so those codes dominate the decoding time, and hence
-   the speed.  The idea is you can have a shorter table that decodes the
-   shorter, more probable codes, and then point to subsidiary tables for
-   the longer codes.  The time it costs to decode the longer codes is
-   then traded against the time it takes to make longer tables.
-
-   This results of this trade are in the variables lbits and dbits
-   below.  lbits is the number of bits the first level table for literal/
-   length codes can decode in one step, and dbits is the same thing for
-   the distance codes.  Subsequent tables are also less than or equal to
-   those sizes.  These values may be adjusted either when all of the
-   codes are shorter than that, in which case the longest code length in
-   bits is used, or when the shortest code is *longer* than the requested
-   table size, in which case the length of the shortest code in bits is
-   used.
-
-   There are two different values for the two tables, since they code a
-   different number of possibilities each.  The literal/length table
-   codes 286 possible values, or in a flat code, a little over eight
-   bits.  The distance table codes 30 possible values, or a little less
-   than five bits, flat.  The optimum values for speed end up being
-   about one bit more than those, so lbits is 8+1 and dbits is 5+1.
-   The optimum values may differ though from machine to machine, and
-   possibly even between compilers.  Your mileage may vary.
- */
-
-
-/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
-#define BMAX 15         /* maximum bit length of any code */
-
-local int huft_build(uIntf *b, uInt n, uInt s, const uIntf *d,
-                     const uIntf *e, inflate_huft * FAR *t, uIntf *m,
-                     inflate_huft *hp, uInt *hn, uIntf *v)
-/*uIntf *b;*/               /* code lengths in bits (all assumed <= BMAX) */
-/*uInt n;*/                 /* number of codes (assumed <= 288) */
-/*uInt s;*/                 /* number of simple-valued codes (0..s-1) */
-/*const uIntf *d;*/         /* list of base values for non-simple codes */
-/*const uIntf *e;*/         /* list of extra bits for non-simple codes */
-/*inflate_huft * FAR *t;*/  /* result: starting table */
-/*uIntf *m;*/               /* maximum lookup bits, returns actual */
-/*inflate_huft *hp;*/       /* space for trees */
-/*uInt *hn;*/               /* hufts used in space */
-/*uIntf *v;*/               /* working area: values in order of bit length */
-/* Given a list of code lengths and a maximum table size, make a set of
-   tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
-   if the given code set is incomplete (the tables are still built in this
-   case), or Z_DATA_ERROR if the input is invalid. */
-{
-
-  uInt a;                       /* counter for codes of length k */
-  uInt c[BMAX+1];               /* bit length count table */
-  uInt f;                       /* i repeats in table every f entries */
-  int g;                        /* maximum code length */
-  int h;                        /* table level */
-  register uInt i;              /* counter, current code */
-  register uInt j;              /* counter */
-  register int k;               /* number of bits in current code */
-  int l;                        /* bits per table (returned in m) */
-  uInt mask;                    /* (1 << w) - 1, to avoid cc -O bug on HP */
-  register uIntf *p;            /* pointer into c[], b[], or v[] */
-  inflate_huft *q;              /* points to current table */
-  struct inflate_huft_s r;      /* table entry for structure assignment */
-  inflate_huft *u[BMAX];        /* table stack */
-  register int w;               /* bits before this table == (l * h) */
-  uInt x[BMAX+1];               /* bit offsets, then code stack */
-  uIntf *xp;                    /* pointer into x */
-  int y;                        /* number of dummy codes added */
-  uInt z;                       /* number of entries in current table */
-
-
-  /* Generate counts for each bit length */
-  p = c;
-#define C0 *p++ = 0;
-#define C2 C0 C0 C0 C0
-#define C4 C2 C2 C2 C2
-  C4                            /* clear c[]--assume BMAX+1 is 16 */
-  p = b;  i = n;
-  do {
-    c[*p++]++;                  /* assume all entries <= BMAX */
-  } while (--i);
-  if (c[0] == n)                /* null input--all zero length codes */
-  {
-    *t = (inflate_huft *)Z_NULL;
-    *m = 0;
-    return Z_OK;
-  }
-
-
-  /* Find minimum and maximum length, bound *m by those */
-  l = *m;
-  for (j = 1; j <= BMAX; j++)
-    if (c[j])
-      break;
-  k = j;                        /* minimum code length */
-  if ((uInt)l < j)
-    l = j;
-  for (i = BMAX; i; i--)
-    if (c[i])
-      break;
-  g = i;                        /* maximum code length */
-  if ((uInt)l > i)
-    l = i;
-  *m = l;
-
-
-  /* Adjust last length count to fill out codes, if needed */
-  for (y = 1 << j; j < i; j++, y <<= 1)
-    if ((y -= c[j]) < 0)
-      return Z_DATA_ERROR;
-  if ((y -= c[i]) < 0)
-    return Z_DATA_ERROR;
-  c[i] += y;
-
-
-  /* Generate starting offsets into the value table for each length */
-  x[1] = j = 0;
-  p = c + 1;  xp = x + 2;
-  while (--i) {                 /* note that i == g from above */
-    *xp++ = (j += *p++);
-  }
-
-
-  /* Make a table of values in order of bit lengths */
-  p = b;  i = 0;
-  do {
-    if ((j = *p++) != 0)
-      v[x[j]++] = i;
-  } while (++i < n);
-  n = x[g];                     /* set n to length of v */
-
-
-  /* Generate the Huffman codes and for each, make the table entries */
-  x[0] = i = 0;                 /* first Huffman code is zero */
-  p = v;                        /* grab values in bit order */
-  h = -1;                       /* no tables yet--level -1 */
-  w = -l;                       /* bits decoded == (l * h) */
-  u[0] = (inflate_huft *)Z_NULL;        /* just to keep compilers happy */
-  q = (inflate_huft *)Z_NULL;   /* ditto */
-  z = 0;                        /* ditto */
-
-  /* go through the bit lengths (k already is bits in shortest code) */
-  for (; k <= g; k++)
-  {
-    a = c[k];
-    while (a--)
-    {
-      /* here i is the Huffman code of length k bits for value *p */
-      /* make tables up to required level */
-      while (k > w + l)
-      {
-        h++;
-        w += l;                 /* previous table always l bits */
-
-        /* compute minimum size table less than or equal to l bits */
-        z = g - w;
-        z = z > (uInt)l ? l : z;        /* table size upper limit */
-        if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
-        {                       /* too few codes for k-w bit table */
-          f -= a + 1;           /* deduct codes from patterns left */
-          xp = c + k;
-          if (j < z)
-            while (++j < z)     /* try smaller tables up to z bits */
-            {
-              if ((f <<= 1) <= *++xp)
-                break;          /* enough codes to use up j bits */
-              f -= *xp;         /* else deduct codes from patterns */
-            }
-        }
-        z = 1 << j;             /* table entries for j-bit table */
-
-        /* allocate new table */
-        if (*hn + z > MANY)     /* (note: doesn't matter for fixed) */
-          return Z_DATA_ERROR;  /* overflow of MANY */
-        u[h] = q = hp + *hn;
-        *hn += z;
-
-        /* connect to last table, if there is one */
-        if (h)
-        {
-          x[h] = i;             /* save pattern for backing up */
-          r.bits = (Byte)l;     /* bits to dump before this table */
-          r.exop = (Byte)j;     /* bits in this table */
-          j = i >> (w - l);
-          r.base = (uInt)(q - u[h-1] - j);   /* offset to this table */
-          u[h-1][j] = r;        /* connect to last table */
-        }
-        else
-          *t = q;               /* first table is returned result */
-      }
-
-      /* set up table entry in r */
-      r.bits = (Byte)(k - w);
-      if (p >= v + n)
-        r.exop = 128 + 64;      /* out of values--invalid code */
-      else if (*p < s)
-      {
-        r.exop = (Byte)(*p < 256 ? 0 : 32 + 64);     /* 256 is end-of-block */
-        r.base = *p++;          /* simple code is just the value */
-      }
-      else
-      {
-        r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */
-        r.base = d[*p++ - s];
-      }
-
-      /* fill code-like entries with r */
-      f = 1 << (k - w);
-      for (j = i >> w; j < z; j += f)
-        q[j] = r;
-
-      /* backwards increment the k-bit code i */
-      for (j = 1 << (k - 1); i & j; j >>= 1)
-        i ^= j;
-      i ^= j;
-
-      /* backup over finished tables */
-      mask = (1 << w) - 1;      /* needed on HP, cc -O bug */
-      while ((i & mask) != x[h])
-      {
-        h--;                    /* don't need to update q */
-        w -= l;
-        mask = (1 << w) - 1;
-      }
-    }
-  }
-
-
-  /* Return Z_BUF_ERROR if we were given an incomplete table */
-  return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
-}
-
-
-int inflate_trees_bits(uIntf *c, uIntf *bb, inflate_huft * FAR *tb,
-                       inflate_huft *hp, z_streamp z)
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uIntf *v;             /* work area for huft_build */
-
-  if ((v = (uIntf*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-  r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL,
-                 tb, bb, hp, &hn, v);
-  if (r == Z_DATA_ERROR)
-    z->msg = (char*)"oversubscribed dynamic bit lengths tree";
-  else if (r == Z_BUF_ERROR || *bb == 0)
-  {
-    z->msg = (char*)"incomplete dynamic bit lengths tree";
-    r = Z_DATA_ERROR;
-  }
-  ZFREE(z, v);
-  return r;
-}
-
-
-int inflate_trees_dynamic(uInt nl, uInt nd, uIntf *c, uIntf *bl,
-                          uIntf *bd, inflate_huft * FAR *tl,
-                          inflate_huft * FAR *td, inflate_huft *hp,
-                          z_streamp z)
-/*uInt nl;*/                   /* number of literal/length codes */
-/*uInt nd;*/                   /* number of distance codes */
-/*uIntf *c;*/                  /* that many (total) code lengths */
-/*uIntf *bl;*/                 /* literal desired/actual bit depth */
-/*uIntf *bd;*/                 /* distance desired/actual bit depth */
-/*inflate_huft * FAR *tl;*/    /* literal/length tree result */
-/*inflate_huft * FAR *td;*/    /* distance tree result */
-/*inflate_huft *hp;*/          /* space for trees */
-/*z_streamp z;*/               /* for messages */
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uIntf *v;             /* work area for huft_build */
-
-  /* allocate work area */
-  if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-
-  /* build literal/length tree */
-  r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
-  if (r != Z_OK || *bl == 0)
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed literal/length tree";
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"incomplete literal/length tree";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-  }
-
-  /* build distance tree */
-  r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
-  if (r != Z_OK || (*bd == 0 && nl > 257))
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed distance tree";
-    else if (r == Z_BUF_ERROR) {
-#ifdef PKZIP_BUG_WORKAROUND
-      r = Z_OK;
-    }
-#else
-      z->msg = (char*)"incomplete distance tree";
-      r = Z_DATA_ERROR;
-    }
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"empty distance tree with lengths";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-#endif
-  }
-
-  /* done */
-  ZFREE(z, v);
-  return Z_OK;
-}
-
-
-/* build fixed tables only once--keep them here */
-#ifdef BUILDFIXED
-local int fixed_built = 0;
-#define FIXEDH 544      /* number of hufts used by fixed tables */
-local inflate_huft fixed_mem[FIXEDH];
-local uInt fixed_bl;
-local uInt fixed_bd;
-local inflate_huft *fixed_tl;
-local inflate_huft *fixed_td;
-#else
-#include "inffixed.h"
-#endif
-
-
-int inflate_trees_fixed(uIntf *bl, uIntf *bd, inflate_huft * FAR *tl,
-                        inflate_huft * FAR *td, z_streamp z)
-/*uIntf *bl;*/                  /* literal desired/actual bit depth */
-/*uIntf *bd;*/                  /* distance desired/actual bit depth */
-/*inflate_huft * FAR *tl;*/     /* literal/length tree result */
-/*inflate_huft * FAR *td;*/     /* distance tree result */
-/*z_streamp z;*/                /* for memory allocation */
-
-{ z_streamp  *zzzzzz = &z; 
-
-#ifdef BUILDFIXED
-  /* build fixed tables if not already */
-  if (!fixed_built)
-  {
-    int k;              /* temporary variable */
-    uInt f = 0;         /* number of hufts used in fixed_mem */
-    uIntf *c;           /* length list for huft_build */
-    uIntf *v;           /* work area for huft_build */
-
-    /* allocate memory */
-    if ((c = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-      return Z_MEM_ERROR;
-    if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-    {
-      ZFREE(z, c);
-      return Z_MEM_ERROR;
-    }
-
-    /* literal table */
-    for (k = 0; k < 144; k++)
-      c[k] = 8;
-    for (; k < 256; k++)
-      c[k] = 9;
-    for (; k < 280; k++)
-      c[k] = 7;
-    for (; k < 288; k++)
-      c[k] = 8;
-    fixed_bl = 9;
-    huft_build(c, 288, 257, cplens, cplext, &fixed_tl, &fixed_bl,
-               fixed_mem, &f, v);
-
-    /* distance table */
-    for (k = 0; k < 30; k++)
-      c[k] = 5;
-    fixed_bd = 5;
-    huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd,
-               fixed_mem, &f, v);
-
-    /* done */
-    ZFREE(z, v);
-    ZFREE(z, c);
-    fixed_built = 1;
-  }
-#endif
-  *bl = fixed_bl;
-  *bd = fixed_bd;
-  *tl = fixed_tl;
-  *td = fixed_td;
-  return Z_OK;
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/infutil.c b/projects/dvm_svn/tools/Zlib/src/infutil.c
deleted file mode 100644
index 5078911..0000000
--- a/projects/dvm_svn/tools/Zlib/src/infutil.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* inflate_util.c -- data and routines common to blocks and codes
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "infblock.h"
-#include "inftrees.h"
-#include "infcodes.h"
-#include "infutil.h"
-
-struct inflate_codes_state {int dummy;}; /* for buggy compilers */
-
-/* And'ing with mask[n] masks the lower n bits */
-uInt inflate_mask[17] = {
-    0x0000,
-    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
-};
-
-
-/* copy as much as possible from the sliding window to the output area */
-int inflate_flush(inflate_blocks_statef *s, z_streamp z, int r)
-
-{
-  uInt n;
-  Bytef *p;
-  Bytef *q;
-
-  /* local copies of source and destination pointers */
-  p = z->next_out;
-  q = s->read;
-
-  /* compute number of bytes to copy as far as end of window */
-  n = (uInt)((q <= s->write ? s->write : s->end) - q);
-  if (n > z->avail_out) n = z->avail_out;
-  if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-  /* update counters */
-  z->avail_out -= n;
-  z->total_out += n;
-
-  /* update check information */
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-  /* copy as far as end of window */
-  zmemcpy(p, q, n);
-  p += n;
-  q += n;
-
-  /* see if more to copy at beginning of window */
-  if (q == s->end)
-  {
-    /* wrap pointers */
-    q = s->window;
-    if (s->write == s->end)
-      s->write = s->window;
-
-    /* compute bytes to copy */
-    n = (uInt)(s->write - q);
-    if (n > z->avail_out) n = z->avail_out;
-    if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-    /* update counters */
-    z->avail_out -= n;
-    z->total_out += n;
-
-    /* update check information */
-    if (s->checkfn != Z_NULL)
-      z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-    /* copy */
-    zmemcpy(p, q, n);
-    p += n;
-    q += n;
-  }
-
-  /* update pointers */
-  z->next_out = p;
-  s->read = q;
-
-  /* done */
-  return r;
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/maketree.c b/projects/dvm_svn/tools/Zlib/src/maketree.c
deleted file mode 100644
index a16d4b1..0000000
--- a/projects/dvm_svn/tools/Zlib/src/maketree.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* maketree.c -- make inffixed.h table for decoding fixed codes
- * Copyright (C) 1995-2002 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* This program is included in the distribution for completeness.
-   You do not need to compile or run this program since inffixed.h
-   is already included in the distribution.  To use this program
-   you need to compile zlib with BUILDFIXED defined and then compile
-   and link this program with the zlib library.  Then the output of
-   this program can be piped to inffixed.h. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "zutil.h"
-#include "inftrees.h"
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* generate initialization table for an inflate_huft structure array */
-void maketree(uInt b, inflate_huft *t)
-{
-  int i, e;
-
-  i = 0;
-  while (1)
-  {
-    e = t[i].exop;
-    if (e && (e & (16+64)) == 0)        /* table pointer */
-    {
-      fprintf(stderr, "maketree: cannot initialize sub-tables!\n");
-      exit(1);
-    }
-    if (i % 4 == 0)
-      printf("\n   ");
-    printf(" {{{%u,%u}},%u}", t[i].exop, t[i].bits, t[i].base);
-    if (++i == (1<<b))
-      break;
-    putchar(',');
-  }
-  puts("");
-}
-
-/* create the fixed tables in C initialization syntax */
-void main(void)
-{
-  int r;
-  uInt bl, bd;
-  inflate_huft *tl, *td;
-  z_stream z;
-
-  z.zalloc = zcalloc;
-  z.opaque = (voidpf)0;
-  z.zfree = zcfree;
-  r = inflate_trees_fixed(&bl, &bd, &tl, &td, &z);
-  if (r)
-  {
-    fprintf(stderr, "inflate_trees_fixed error %d\n", r);
-    return;
-  }
-  puts("/* inffixed.h -- table for decoding fixed codes");
-  puts(" * Generated automatically by the maketree.c program");
-  puts(" */");
-  puts("");
-  puts("/* WARNING: this file should *not* be used by applications. It is");
-  puts("   part of the implementation of the compression library and is");
-  puts("   subject to change. Applications should only use zlib.h.");
-  puts(" */");
-  puts("");
-  printf("local uInt fixed_bl = %d;\n", bl);
-  printf("local uInt fixed_bd = %d;\n", bd);
-  printf("local inflate_huft fixed_tl[] = {");
-  maketree(bl, tl);
-  puts("  };");
-  printf("local inflate_huft fixed_td[] = {");
-  maketree(bd, td);
-  puts("  };");
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/minigzip.c b/projects/dvm_svn/tools/Zlib/src/minigzip.c
deleted file mode 100644
index 97b7c2d..0000000
--- a/projects/dvm_svn/tools/Zlib/src/minigzip.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/*
- * minigzip is a minimal implementation of the gzip utility. This is
- * only an example of using zlib and isn't meant to replace the
- * full-featured gzip. No attempt is made to deal with file systems
- * limiting names to 14 or 8+3 characters, etc... Error checking is
- * very limited. So use minigzip only for testing; use gzip for the
- * real thing. On MSDOS, use only on file names without extension
- * or in pipe mode.
- */
-
-/* @(#) $Id$ */
-
-#include <stdio.h>
-#include "zlib.h"
-
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#else
-   extern void exit  OF((int));
-#endif
-
-#ifdef USE_MMAP
-#  include <sys/types.h>
-#  include <sys/mman.h>
-#  include <sys/stat.h>
-#endif
-
-#if defined(MSDOS) || defined(OS2) || defined(WIN32)
-#  include <fcntl.h>
-#  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-#ifdef VMS
-#  define unlink delete
-#  define GZ_SUFFIX "-gz"
-#endif
-#ifdef RISCOS
-#  define unlink remove
-#  define GZ_SUFFIX "-gz"
-#  define fileno(file) file->__file
-#endif
-#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#  include <unix.h> /* for fileno */
-#endif
-
-#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
-  extern int unlink OF((const char *));
-#endif
-
-#ifndef GZ_SUFFIX
-#  define GZ_SUFFIX ".gz"
-#endif
-#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
-
-#define BUFLEN      16384
-#define MAX_NAME_LEN 1024
-
-#ifdef MAXSEG_64K
-#  define local static
-   /* Needed for systems with limitation on stack size. */
-#else
-#  define local
-#endif
-
-char *prog;
-
-void error            OF((const char *msg));
-void gz_compress      OF((FILE   *in, gzFile out));
-#ifdef USE_MMAP
-int  gz_compress_mmap OF((FILE   *in, gzFile out));
-#endif
-void gz_uncompress    OF((gzFile in, FILE   *out));
-void file_compress    OF((char  *file, char *mode));
-void file_uncompress  OF((char  *file));
-int  main             OF((int argc, char *argv[]));
-
-/* ===========================================================================
- * Display error message and exit
- */
-void error(msg)
-    const char *msg;
-{
-    fprintf(stderr, "%s: %s\n", prog, msg);
-    exit(1);
-}
-
-/* ===========================================================================
- * Compress input to output then close both files.
- */
-
-void gz_compress(in, out)
-    FILE   *in;
-    gzFile out;
-{
-    local char buf[BUFLEN];
-    int len;
-    int err;
-
-#ifdef USE_MMAP
-    /* Try first compressing with mmap. If mmap fails (minigzip used in a
-     * pipe), use the normal fread loop.
-     */
-    if (gz_compress_mmap(in, out) == Z_OK) return;
-#endif
-    for (;;) {
-        len = fread(buf, 1, sizeof(buf), in);
-        if (ferror(in)) {
-            perror("fread");
-            exit(1);
-        }
-        if (len == 0) break;
-
-        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
-    }
-    fclose(in);
-    if (gzclose(out) != Z_OK) error("failed gzclose");
-}
-
-#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
-
-/* Try compressing the input file at once using mmap. Return Z_OK if
- * if success, Z_ERRNO otherwise.
- */
-int gz_compress_mmap(in, out)
-    FILE   *in;
-    gzFile out;
-{
-    int len;
-    int err;
-    int ifd = fileno(in);
-    caddr_t buf;    /* mmap'ed buffer for the entire input file */
-    off_t buf_len;  /* length of the input file */
-    struct stat sb;
-
-    /* Determine the size of the file, needed for mmap: */
-    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
-    buf_len = sb.st_size;
-    if (buf_len <= 0) return Z_ERRNO;
-
-    /* Now do the actual mmap: */
-    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0); 
-    if (buf == (caddr_t)(-1)) return Z_ERRNO;
-
-    /* Compress the whole file at once: */
-    len = gzwrite(out, (char *)buf, (unsigned)buf_len);
-
-    if (len != (int)buf_len) error(gzerror(out, &err));
-
-    munmap(buf, buf_len);
-    fclose(in);
-    if (gzclose(out) != Z_OK) error("failed gzclose");
-    return Z_OK;
-}
-#endif /* USE_MMAP */
-
-/* ===========================================================================
- * Uncompress input to output then close both files.
- */
-void gz_uncompress(in, out)
-    gzFile in;
-    FILE   *out;
-{
-    local char buf[BUFLEN];
-    int len;
-    int err;
-
-    for (;;) {
-        len = gzread(in, buf, sizeof(buf));
-        if (len < 0) error (gzerror(in, &err));
-        if (len == 0) break;
-
-        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
-	    error("failed fwrite");
-	}
-    }
-    if (fclose(out)) error("failed fclose");
-
-    if (gzclose(in) != Z_OK) error("failed gzclose");
-}
-
-
-/* ===========================================================================
- * Compress the given file: create a corresponding .gz file and remove the
- * original.
- */
-void file_compress(file, mode)
-    char  *file;
-    char  *mode;
-{
-    local char outfile[MAX_NAME_LEN];
-    FILE  *in;
-    gzFile out;
-
-    strcpy(outfile, file);
-    strcat(outfile, GZ_SUFFIX);
-
-    in = fopen(file, "rb");
-    if (in == NULL) {
-        perror(file);
-        exit(1);
-    }
-    out = gzopen(outfile, mode);
-    if (out == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
-        exit(1);
-    }
-    gz_compress(in, out);
-
-    unlink(file);
-}
-
-
-/* ===========================================================================
- * Uncompress the given file and remove the original.
- */
-void file_uncompress(file)
-    char  *file;
-{
-    local char buf[MAX_NAME_LEN];
-    char *infile, *outfile;
-    FILE  *out;
-    gzFile in;
-    int len = strlen(file);
-
-    strcpy(buf, file);
-
-    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
-        infile = file;
-        outfile = buf;
-        outfile[len-3] = '\0';
-    } else {
-        outfile = file;
-        infile = buf;
-        strcat(infile, GZ_SUFFIX);
-    }
-    in = gzopen(infile, "rb");
-    if (in == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
-        exit(1);
-    }
-    out = fopen(outfile, "wb");
-    if (out == NULL) {
-        perror(file);
-        exit(1);
-    }
-
-    gz_uncompress(in, out);
-
-    unlink(infile);
-}
-
-
-/* ===========================================================================
- * Usage:  minigzip [-d] [-f] [-h] [-1 to -9] [files...]
- *   -d : decompress
- *   -f : compress with Z_FILTERED
- *   -h : compress with Z_HUFFMAN_ONLY
- *   -1 to -9 : compression level
- */
-
-int main(argc, argv)
-    int argc;
-    char *argv[];
-{
-    int uncompr = 0;
-    gzFile file;
-    char outmode[20];
-
-    strcpy(outmode, "wb6 ");
-
-    prog = argv[0];
-    argc--, argv++;
-
-    while (argc > 0) {
-      if (strcmp(*argv, "-d") == 0)
-	uncompr = 1;
-      else if (strcmp(*argv, "-f") == 0)
-	outmode[3] = 'f';
-      else if (strcmp(*argv, "-h") == 0)
-	outmode[3] = 'h';
-      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
-	       (*argv)[2] == 0)
-	outmode[2] = (*argv)[1];
-      else
-	break;
-      argc--, argv++;
-    }
-    if (argc == 0) {
-        SET_BINARY_MODE(stdin);
-        SET_BINARY_MODE(stdout);
-        if (uncompr) {
-            file = gzdopen(fileno(stdin), "rb");
-            if (file == NULL) error("can't gzdopen stdin");
-            gz_uncompress(file, stdout);
-        } else {
-            file = gzdopen(fileno(stdout), outmode);
-            if (file == NULL) error("can't gzdopen stdout");
-            gz_compress(stdin, file);
-        }
-    } else {
-        do {
-            if (uncompr) {
-                file_uncompress(*argv);
-            } else {
-                file_compress(*argv, outmode);
-            }
-        } while (argv++, --argc);
-    }
-    exit(0);
-    return 0; /* to avoid warning */
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/trees.c b/projects/dvm_svn/tools/Zlib/src/trees.c
deleted file mode 100644
index cb2bcac..0000000
--- a/projects/dvm_svn/tools/Zlib/src/trees.c
+++ /dev/null
@@ -1,1212 +0,0 @@
-/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-2002 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process uses several Huffman trees. The more
- *      common source values are represented by shorter bit sequences.
- *
- *      Each code tree is stored in a compressed form which is itself
- * a Huffman encoding of the lengths of all the code strings (in
- * ascending order by source values).  The actual code strings are
- * reconstructed from the lengths in the inflate process, as described
- * in the deflate specification.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
- *
- *      Storer, James A.
- *          Data Compression:  Methods and Theory, pp. 49-50.
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
- *
- *      Sedgewick, R.
- *          Algorithms, p290.
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
- */
-
-/* @(#) $Id$ */
-
-/* #define GEN_TREES_H */
-
-#include "deflate.h"
-
-#ifdef DEBUG
-#  include <ctype.h>
-#endif
-
-/* ===========================================================================
- * Constants
- */
-
-#define MAX_BL_BITS 7
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-#define END_BLOCK 256
-/* end of block literal code */
-
-#define REP_3_6      16
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-#define REPZ_3_10    17
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-#define REPZ_11_138  18
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-
-local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-
-local const uch bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-#define Buf_size (8 * 2*sizeof(char))
-/* Number of bits used within bi_buf. (bi_buf might be implemented on
- * more than 16 bits on some systems.)
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-/* non ANSI compilers may not accept trees.h */
-
-local ct_data static_ltree[L_CODES+2];
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-local ct_data static_dtree[D_CODES];
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-uch _dist_code[DIST_CODE_LEN];
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-uch _length_code[MAX_MATCH-MIN_MATCH+1];
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-local int base_length[LENGTH_CODES];
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-local int base_dist[D_CODES];
-/* First normalized distance for each code (0 = distance of 1) */
-
-#else
-#  include "trees.h"
-#endif /* GEN_TREES_H */
-
-struct static_tree_desc_s {
-    const ct_data *static_tree;  /* static tree or NULL */
-    const intf *extra_bits;      /* extra bits for each code or NULL */
-    int     extra_base;          /* base index for extra_bits */
-    int     elems;               /* max number of elements in the tree */
-    int     max_length;          /* max bit length for the codes */
-};
-
-local static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-
-local static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
-
-local static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
-
-/* ===========================================================================
- * Local (static) routines in this file.
- */
-
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, ct_data *ltree,
-                              ct_data *dtree));
-local void set_data_type  OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                              int header));
-
-#ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
-#endif
-
-#ifndef DEBUG
-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-   /* Send a code of the given tree. c and tree must not have side effects */
-
-#else /* DEBUG */
-#  define send_code(s, c, tree) \
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-       send_bits(s, tree[c].Code, tree[c].Len); }
-#endif
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-#ifdef DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-    Tracevv((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid);
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
-#else /* !DEBUG */
-
-#define send_bits(s, value, length) \
-{ int len = length;\
-  if (s->bi_valid > (int)Buf_size - len) {\
-    int val = value;\
-    s->bi_buf |= (val << s->bi_valid);\
-    put_short(s, s->bi_buf);\
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-    s->bi_valid += len - Buf_size;\
-  } else {\
-    s->bi_buf |= (value) << s->bi_valid;\
-    s->bi_valid += len;\
-  }\
-}
-#endif /* DEBUG */
-
-
-#define MAX(a,b) (a >= b ? a : b)
-/* the arguments must not have side effects */
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-local void tr_static_init()
-{
-#if defined(GEN_TREES_H) || !defined(STDC)
-    static int static_init_done = 0;
-    int n;        /* iterates over tree elements */
-    int bits;     /* bit counter */
-    int length;   /* length value */
-    int code;     /* code value */
-    int dist;     /* distance index */
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    if (static_init_done) return;
-
-    /* For some embedded targets, global variables are not initialized: */
-    static_l_desc.static_tree = static_ltree;
-    static_l_desc.extra_bits = extra_lbits;
-    static_d_desc.static_tree = static_dtree;
-    static_d_desc.extra_bits = extra_dbits;
-    static_bl_desc.extra_bits = extra_blbits;
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            _length_code[length++] = (uch)code;
-        }
-    }
-    Assert (length == 256, "tr_static_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented
-     * in two different ways: code 284 + 5 bits or code 285, so we
-     * overwrite length_code[255] to use the best encoding:
-     */
-    _length_code[length-1] = (uch)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0 ; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            _dist_code[dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            _dist_code[256 + dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the
-     * tree construction to get a canonical Huffman tree (longest code
-     * all ones)
-     */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-    }
-    static_init_done = 1;
-
-#  ifdef GEN_TREES_H
-    gen_trees_header();
-#  endif
-#endif /* defined(GEN_TREES_H) || !defined(STDC) */
-}
-
-/* ===========================================================================
- * Genererate the file trees.h describing the static trees.
- */
-#ifdef GEN_TREES_H
-#  ifndef DEBUG
-#    include <stdio.h>
-#  endif
-
-#  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
-
-void gen_trees_header()
-{
-    FILE *header = fopen("trees.h", "w");
-    int i;
-
-    Assert (header != NULL, "Can't open trees.h");
-    fprintf(header,
-	    "/* header created automatically with -DGEN_TREES_H */\n\n");
-
-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
-	fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-		static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-    }
-
-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-	fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-		static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-    }
-
-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
-    for (i = 0; i < DIST_CODE_LEN; i++) {
-	fprintf(header, "%2u%s", _dist_code[i],
-		SEPARATOR(i, DIST_CODE_LEN-1, 20));
-    }
-
-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-	fprintf(header, "%2u%s", _length_code[i],
-		SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-    }
-
-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-    for (i = 0; i < LENGTH_CODES; i++) {
-	fprintf(header, "%1u%s", base_length[i],
-		SEPARATOR(i, LENGTH_CODES-1, 20));
-    }
-
-    fprintf(header, "local const int base_dist[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-	fprintf(header, "%5u%s", base_dist[i],
-		SEPARATOR(i, D_CODES-1, 10));
-    }
-
-    fclose(header);
-}
-#endif /* GEN_TREES_H */
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-void _tr_init(deflate_state *s)
-{
-    tr_static_init();
-
-    s->l_desc.dyn_tree = s->dyn_ltree;
-    s->l_desc.stat_desc = &static_l_desc;
-
-    s->d_desc.dyn_tree = s->dyn_dtree;
-    s->d_desc.stat_desc = &static_d_desc;
-
-    s->bl_desc.dyn_tree = s->bl_tree;
-    s->bl_desc.stat_desc = &static_bl_desc;
-
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-#ifdef DEBUG
-    s->compressed_len = 0L;
-    s->bits_sent = 0L;
-#endif
-
-    /* Initialize the first block of the first file: */
-    init_block(s);
-}
-
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(deflate_state *s)
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
-#define SMALLEST 1
-/* Index within the heap array of least frequent node in the Huffman tree */
-
-
-/* ===========================================================================
- * Remove the smallest element from the heap and recreate the heap with
- * one less element. Updates heap and heap_len.
- */
-#define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-#define smaller(tree, n, m, depth) \
-   (tree[n].Freq < tree[m].Freq || \
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-local void pqdownheap(deflate_state *s, ct_data *tree, int k)
-/*    deflate_state *s;*/
-/*    ct_data *tree;*/  /* the tree to restore */
-/*    int k;*/               /* node to move down */
-{
-    int v = s->heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= s->heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-            j++;
-        }
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, s->heap[j], s->depth)) break;
-
-        /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];  k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    s->heap[k] = v;
-}
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-local void gen_bitlen(deflate_state *s, tree_desc *desc)
-/*    deflate_state *s;*/
-/*    tree_desc *desc;*/    /* the tree descriptor */
-{
-    ct_data *tree        = desc->dyn_tree;
-    int max_code         = desc->max_code;
-    const ct_data *stree = desc->stat_desc->static_tree;
-    const intf *extra    = desc->stat_desc->extra_bits;
-    int base             = desc->stat_desc->extra_base;
-    int max_length       = desc->stat_desc->max_length;
-    int h;              /* heap index */
-    int n, m;           /* iterate over the tree elements */
-    int bits;           /* bit length */
-    int xbits;          /* extra bits */
-    ush f;              /* frequency */
-    int overflow = 0;   /* number of elements with bit length too large */
-
-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-        n = s->heap[h];
-        bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
-        tree[n].Len = (ush)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) continue; /* not a leaf node */
-
-        s->bl_count[bits]++;
-        xbits = 0;
-        if (n >= base) xbits = extra[n-base];
-        f = tree[n].Freq;
-        s->opt_len += (ulg)f * (bits + xbits);
-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
-    }
-    if (overflow == 0) return;
-
-    Trace((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length-1;
-        while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-        s->bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = s->bl_count[bits];
-        while (n != 0) {
-            m = s->heap[--h];
-            if (m > max_code) continue;
-            if (tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
-                tree[m].Len = (ush)bits;
-            }
-            n--;
-        }
-    }
-}
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (ct_data *tree, int max_code, ushf *bl_count)
-/*    ct_data *tree;*/             /* the tree to decorate */
-/*    int max_code;*/              /* largest code with non zero frequency */
-/*    ushf *bl_count;*/            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    ush code = 0;              /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-local void build_tree(deflate_state *s, tree_desc *desc)
-/*    deflate_state *s;*/
-/*    tree_desc *desc;*/ /* the tree descriptor */
-{
-    ct_data *tree         = desc->dyn_tree;
-    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems             = desc->stat_desc->elems;
-    int n, m;          /* iterate over heap elements */
-    int max_code = -1; /* largest code with non zero frequency */
-    int node;          /* new node being created */
-
-    /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-     * heap[0] is not used.
-     */
-    s->heap_len = 0, s->heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            s->heap[++(s->heap_len)] = max_code = n;
-            s->depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (s->heap_len < 2) {
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[node].Freq = 1;
-        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* node is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    node = elems;              /* next internal node of the tree */
-    do {
-        pqremove(s, tree, n);  /* n = node of least frequency */
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */
-
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-        s->heap[--(s->heap_max)] = m;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch) (MAX(s->depth[n], s->depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (ush)node;
-#ifdef DUMP_BL_TREE
-        if (tree == s->bl_tree) {
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-        }
-#endif
-        /* and insert the new node in the heap */
-        s->heap[SMALLEST] = node++;
-        pqdownheap(s, tree, SMALLEST);
-
-    } while (s->heap_len >= 2);
-
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen(s, (tree_desc *)desc);
-
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data *)tree, max_code, s->bl_count);
-}
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-local void scan_tree (deflate_state *s, ct_data *tree, int max_code)
-/*    deflate_state *s;*/
-/*    ct_data *tree;*/   /* the tree to be scanned */
-/*    int max_code;*/    /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-            s->bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            s->bl_tree[REPZ_3_10].Freq++;
-        } else {
-            s->bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-local void send_tree (deflate_state *s, ct_data *tree, int max_code)
-/*    deflate_state *s;*/
-/*    ct_data *tree;*/      /* the tree to be scanned */
-/*    int max_code;*/       /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) max_count = 138, min_count = 3;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree); count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
-
-        } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
-
-        } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-local int build_bl_tree(deflate_state *s)
-{
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    /* Determine the bit length frequencies for literal and distance trees */
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-
-    /* Build the bit length tree: */
-    build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-    }
-    /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*(max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-            s->opt_len, s->static_len));
-
-    return max_blindex;
-}
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-local void send_all_trees(deflate_state *s, int lcodes, int dcodes,
-                          int blcodes)
-/*    deflate_state *s;*/
-/*    int lcodes, dcodes, blcodes;*/  /* number of codes for each tree */
-{
-    int rank;                    /* index in bl_order */
-
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-            "too many codes");
-    Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-    }
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-/* ===========================================================================
- * Send a stored block
- */
-void _tr_stored_block(deflate_state *s, charf *buf, ulg stored_len,
-                      int eof)
-/*    deflate_state *s;*/
-/*    charf *buf;*/       /* input block */
-/*    ulg stored_len;*/   /* length of input block */
-/*    int eof;*/          /* true if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
-#ifdef DEBUG
-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-    s->compressed_len += (stored_len + 4) << 3;
-#endif
-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
-}
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- * The current inflate code requires 9 bits of lookahead. If the
- * last two codes for the previous block (real code plus EOB) were coded
- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
- * the last real code. In this case we send two empty static blocks instead
- * of one. (There are no problems if the previous block is stored or fixed.)
- * To simplify the code, we assume the worst case of last real code encoded
- * on one bit only.
- */
-void _tr_align(deflate_state *s)
-{
-    send_bits(s, STATIC_TREES<<1, 3);
-    send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
-#endif
-    bi_flush(s);
-    /* Of the 10 bits for the empty block, we have already sent
-     * (10 - bi_valid) bits. The lookahead for the last real code (before
-     * the EOB of the previous block) was thus at least one plus the length
-     * of the EOB plus what we have just sent of the empty static block.
-     */
-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
-        send_bits(s, STATIC_TREES<<1, 3);
-        send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-        s->compressed_len += 10L;
-#endif
-        bi_flush(s);
-    }
-    s->last_eob_len = 7;
-}
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
- */
-void _tr_flush_block(deflate_state *s, charf *buf, ulg stored_len,
-                     int eof)
-/*    deflate_state *s;*/
-/*    charf *buf;*/       /* input block, or NULL if too old */
-/*    ulg stored_len;*/   /* length of input block */
-/*    int eof;*/          /* true if this is the last block for a file */
-{
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */
-
-    /* Build the Huffman trees unless a stored block is forced */
-    if (s->level > 0) {
-
-	 /* Check if the file is ascii or binary */
-	if (s->data_type == Z_UNKNOWN) set_data_type(s);
-
-	/* Construct the literal and distance trees */
-	build_tree(s, (tree_desc *)(&(s->l_desc)));
-	Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-		s->static_len));
-
-	build_tree(s, (tree_desc *)(&(s->d_desc)));
-	Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-		s->static_len));
-	/* At this point, opt_len and static_len are the total bit lengths of
-	 * the compressed block data, excluding the tree representations.
-	 */
-
-	/* Build the bit length tree for the above two trees, and get the index
-	 * in bl_order of the last bit length code to send.
-	 */
-	max_blindex = build_bl_tree(s);
-
-	/* Determine the best encoding. Compute first the block length in bytes*/
-	opt_lenb = (s->opt_len+3+7)>>3;
-	static_lenb = (s->static_len+3+7)>>3;
-
-	Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-		opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-		s->last_lit));
-
-	if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-
-    } else {
-        Assert(buf != (char*)0, "lost buf");
-	opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-    }
-
-#ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
-#else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-                       /* 4: two words for the lengths */
-#endif
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        _tr_stored_block(s, buf, stored_len, eof);
-
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+eof, 3);
-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->static_len;
-#endif
-    } else {
-        send_bits(s, (DYN_TREES<<1)+eof, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->opt_len;
-#endif
-    }
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-    /* The above check is made mod 2^32, for files larger than 512 MB
-     * and uLong implemented on 32 bits.
-     */
-    init_block(s);
-
-    if (eof) {
-        bi_windup(s);
-#ifdef DEBUG
-        s->compressed_len += 7;  /* align on byte boundary */
-#endif
-    }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*eof));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-int _tr_tally (deflate_state *s, unsigned dist, unsigned lc)
-/*    deflate_state *s;*/
-/*    unsigned dist;*/  /* distance of matched string */
-/*    unsigned lc;*/    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
-    if (dist == 0) {
-        /* lc is the unmatched char */
-        s->dyn_ltree[lc].Freq++;
-    } else {
-        s->matches++;
-        /* Here, lc is the match length - MIN_MATCH */
-        dist--;             /* dist = match distance - 1 */
-        Assert((ush)dist < (ush)MAX_DIST(s) &&
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-        s->dyn_dtree[d_code(dist)].Freq++;
-    }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(deflate_state *s, ct_data *ltree,
-                          ct_data *dtree)
-/*    deflate_state *s;*/
-/*    ct_data *ltree;*/    /* literal tree */
-/*    ct_data *dtree;*/    /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert(s->pending < s->lit_bufsize + 2*lx, "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-    s->last_eob_len = ltree[END_BLOCK].Len;
-}
-
-/* ===========================================================================
- * Set the data type to ASCII or BINARY, using a crude approximation:
- * binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise.
- * IN assertion: the fields freq of dyn_ltree are set and the total of all
- * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
- */
-local void set_data_type(deflate_state *s)
-{
-    int n = 0;
-    unsigned ascii_freq = 0;
-    unsigned bin_freq = 0;
-    while (n < 7)        bin_freq += s->dyn_ltree[n++].Freq;
-    while (n < 128)    ascii_freq += s->dyn_ltree[n++].Freq;
-    while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq;
-    s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII);
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(unsigned code, int len)
-/*    unsigned code;*/ /* the value to invert */
-/*    int len;*/       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(deflate_state *s)
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(deflate_state *s)
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(deflate_state *s, charf *buf, unsigned len,
-                      int header)
-/*    deflate_state *s;*/
-/*    charf    *buf;*/    /* the input data */
-/*    unsigned len;*/     /* its length */
-/*    int      header;*/  /* true if block header must be written */
-{
-    bi_windup(s);        /* align on byte boundary */
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-
-    if (header) {
-        put_short(s, (ush)len);   
-        put_short(s, (ush)~len);
-#ifdef DEBUG
-        s->bits_sent += 2*16;
-#endif
-    }
-#ifdef DEBUG
-    s->bits_sent += (ulg)len<<3;
-#endif
-    while (len--) {
-        put_byte(s, *buf++);
-    }
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/uncompr.c b/projects/dvm_svn/tools/Zlib/src/uncompr.c
deleted file mode 100644
index 07d6b80..0000000
--- a/projects/dvm_svn/tools/Zlib/src/uncompr.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-
-/* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-int ZEXPORT uncompress (Bytef *dest, uLongf *destLen,
-                        const Bytef *source, uLong sourceLen)
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (Bytef*)source;
-    stream.avail_in = (uInt)sourceLen;
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-
-    err = inflateInit(&stream);
-    if (err != Z_OK) return err;
-
-    err = inflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        inflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
-    }
-    *destLen = stream.total_out;
-
-    err = inflateEnd(&stream);
-    return err;
-}
diff --git a/projects/dvm_svn/tools/Zlib/src/zutil.c b/projects/dvm_svn/tools/Zlib/src/zutil.c
deleted file mode 100644
index fa18ff5..0000000
--- a/projects/dvm_svn/tools/Zlib/src/zutil.c
+++ /dev/null
@@ -1,210 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-2002 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-struct internal_state      {int dummy;}; /* for buggy compilers */
-
-#ifndef STDC
-extern void exit OF((int));
-#endif
-
-const char *z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
-
-
-const char * ZEXPORT zlibVersion()
-{
-    return ZLIB_VERSION;
-}
-
-#ifdef DEBUG
-
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int z_verbose = verbose;
-
-void z_error (char *m)
-{
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(int err)
-{
-    return ERR_MSG(err);
-}
-
-
-#ifndef HAVE_MEMCPY
-
-void zmemcpy(Bytef* dest, const Bytef *source, uInt len)
-{
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
-}
-
-int zmemcmp(const Bytef *s1, const Bytef *s2, uInt len)
-{
-    uInt j;
-
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-    }
-    return 0;
-}
-
-void zmemzero(Bytef *dest, uInt len)
-{
-    if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
-}
-#endif
-
-#ifdef __TURBOC__
-#if (defined( __BORLANDC__) || !defined(SMALL_MEDIUM)) && !defined(__32BIT__)
-/* Small and medium model in Turbo C are for now limited to near allocation
- * with reduced MAX_WBITS and MAX_MEM_LEVEL
- */
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    ptr = opaque; /* just to make some compilers happy */
-    Assert(0, "zcfree: ptr not found");
-}
-#endif
-#endif /* __TURBOC__ */
-
-
-#if defined(M_I86) && !defined(__32BIT__)
-/* Microsoft C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-#  define _halloc  halloc
-#  define _hfree   hfree
-#endif
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    return _halloc((long)items, size);
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    _hfree(ptr);
-}
-
-#endif /* MSC */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    if (opaque) items += size - size; /* make compiler happy */
-    return (voidpf)calloc(items, size);
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    free(ptr);
-    if (opaque) return; /* make compiler happy */
-}
-
-#endif /* MY_ZCALLOC */
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.uni b/projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.uni
deleted file mode 100644
index 27e226b..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.uni
+++ /dev/null
@@ -1,28 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematicd            ##
-#######################################################################
-
-# dvm/pppa/makefile.gnu
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=src
-
-all: 
-	@echo "****** RECURSIVELY MAKING SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-	cd ../predictor/Zlib/Src; ($(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all > logfile.txt) 
-	cd src; ($(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all > logfile.txt) 
-	@echo "****** DONE MAKING SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-
-clean:
-	@echo "****** RECURSIVELY CLEAN SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-	(cd src; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean)
-	@echo "****** DONE CLEAN SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-
-cleanall:
-	@echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-	(cd src; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall)
-	@echo "****** DONE CLEANALL SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.win b/projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.win
deleted file mode 100644
index 57a1da4..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/makefile.win
+++ /dev/null
@@ -1,42 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematicd            ##
-#######################################################################
-
-
-# dvm/pppa/makefile.win
-
-# Valentin Emelianon  (4/01/99)
-
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=src
-
-all: 
-	@echo "****** RECURSIVELY MAKING SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-	@cd ..\predictor\Zlib
-	@$(MAKE)  /nologo /f Zlib.mak "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)"  CFG="Zlib - Win32 Release" ALL > translate.log
-	@cd ..\..\pppa\src
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all > logfile.txt
-	@cd ..
-	@echo "****** DONE MAKING SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-
-clean:
-	@echo "****** RECURSIVELY CLEAN SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-	@cd src
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	@cd ..
-	@del /q .\obj\*.*
-	@echo "****** DONE CLEAN SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-
-cleanall:
-	@echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
-	@cd src
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	@cd ..
-	@del /q .\bin\*.*
-	@del /q .\obj\*.*
-	@echo "****** DONE CLEANALL SUBDIRECTORIES dvm/pppa/: $(SUBDIR) ******"
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/bool.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/bool.h
deleted file mode 100644
index fa057d2..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/bool.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _BOOL_H
-#define _BOOL_H
-#define FALSE 0
-#define TRUE 1
-typedef int BOOL;
-#endif
-
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/dvmvers.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/dvmvers.h
deleted file mode 100644
index e29bce2..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/dvmvers.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define VERS "406" 
-#define PLATFORM "ntmpich" 
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.cpp
deleted file mode 100644
index 112e74c..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.cpp
+++ /dev/null
@@ -1,350 +0,0 @@
-#define _STATFILE_
-#include "inter.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-// calculate execution characteristics for interval
-CInter::CInter(s_GRPTIMES (*pt)[StatGrpCount],s_SendRecvTimes ps,
-			   ident id,unsigned long nint,
-			   int iIM,int jIM,short sore)
- //(*pt)[StatGrpCount] - pointer to time array,it reading from file,
- // ps                 - pointer to add info
- //id                  - interval identifier,
- //nint                - interval number.
-{
-	//identifire interval information
-	if (id.pname[0]!='\0') {
-		idint.pname=new char[strlen(id.pname)+1];
-        if (idint.pname==NULL) throw("Out of memory\n");
-	}
-	else idint.pname=NULL;
-	if (idint.pname!=NULL) strcpy(idint.pname,id.pname);// name of DVM-programm
-	idint.nline=id.nline; // number of DVM-programm line
-        idint.nline_end=id.nline_end; // number of end of DVM-programm line
-	idint.nenter=id.nenter; // number of enters into the interval
-	idint.expr=id.expr; // conditional expession
-	idint.nlev=id.nlev; // number of interval level
-	idint.t=id.t; // type of interval
-	ninter=nint;
-	idint.proc=id.proc; // number of processors
-	// arrays of collective operation times
-	int i;
-	for ( i=0;i<=ITER;i++) mgen[i]=0.;
-	for (i=0;i<=RED;i++) {
-		mcom[i]=0.;
-		mrcom[i]=0.;
-		msyn[i]=0.;
-		mvar[i]=0.;
-		mcall[i]=0.;
-		moverlap[i]=0.;
-	}
-	for(i=0;i<StatGrpCount;i++) {
-		lost[i]=0.;
-		calls[i]=0.;
-		prod[i]=0.;
-	}
-	// execution characteristics on each processor
-	for (i=0;i<StatGrpCount;i++) {
-		mgen[SUMCOM]=mgen[SUMCOM]+pt[i][MsgPasGrp].LostTime;
-		mgen[SUMRCOM]=mgen[SUMRCOM]+pt[i][MsgPasGrp].ProductTime;
-		mgen[CPUUSR]=mgen[CPUUSR]+pt[i][UserGrp].ProductTime;
-		mgen[INSUFUSR]=mgen[INSUFUSR]+pt[i][UserGrp].LostTime;
-		mgen[IOTIME]=mgen[IOTIME]+pt[i][IOGrp].ProductTime;
-		for (int j=0;j<StatGrpCount;j++) {
-			/*if (i==UserGrp) {
-				mgen[CPUUSR]=mgen[CPUUSR]+pt[UserGrp][j].ProductTime;
-                mgen[INSUFUSR]=mgen[INSUFUSR]+pt[UserGrp][j].LostTime;
-			}
-			if (i==IOGrp) mgen[IOTIME]=mgen[IOTIME]+pt[IOGrp][j].ProductTime;*/
-			mgen[EXEC]=mgen[EXEC]+pt[i][j].ProductTime+pt[i][j].LostTime;
-			mgen[INSUF]=mgen[INSUF]+pt[i][j].LostTime;
-			mgen[CPU]=mgen[CPU]+pt[i][j].ProductTime;
-		} // end for j
-	}
-	mgen[EXEC]=mgen[EXEC]-mgen[SUMRCOM];
-	mgen[CPU]=mgen[CPU]-mgen[CPUUSR]-mgen[SUMRCOM]-mgen[IOTIME];
-	mgen[INSUF]=mgen[INSUF]-mgen[INSUFUSR]-mgen[SUMCOM];
-	//real synchronization,number of calls, communication
-	// reduction
-	mcom[RD]=pt[WaitRedGrp][MsgPasGrp].LostTime+
-		pt[StartRedGrp][MsgPasGrp].LostTime;
-	mrcom[RD]=pt[WaitRedGrp][MsgPasGrp].ProductTime;
-	mcall[RD]=pt[UserGrp][WaitRedGrp].CallCount;
-	// shadow
-	mcom[SH]=pt[WaitShdGrp][MsgPasGrp].LostTime+
-		pt[DoPLGrp][MsgPasGrp].LostTime+
-		pt[StartShdGrp][MsgPasGrp].LostTime;
-	mrcom[SH]=pt[WaitShdGrp][MsgPasGrp].ProductTime+
-		pt[DoPLGrp][MsgPasGrp].ProductTime;
-	mcall[SH]=pt[UserGrp][WaitShdGrp].CallCount;
-	// remote access
-	mcom[RA]=pt[RemAccessGrp][MsgPasGrp].LostTime;
-	mrcom[RA]=pt[RemAccessGrp][MsgPasGrp].ProductTime;
-	mcall[RA]=pt[UserGrp][RemAccessGrp].CallCount;
-	// redistribute
-	mcom[RED]=pt[ReDistrGrp][MsgPasGrp].LostTime;
-	mrcom[RED]=pt[ReDistrGrp][MsgPasGrp].ProductTime;
-	mcall[RED]=pt[UserGrp][ReDistrGrp].CallCount;
-	// input/output
-	mcom[IO]=pt[IOGrp][MsgPasGrp].LostTime;
-	mrcom[IO]=pt[IOGrp][MsgPasGrp].ProductTime;
-	mcall[IO]=pt[UserGrp][IOGrp].CallCount;
-	// add information
-	SendCallTime=ps.SendCallTime;
-	MinSendCallTime=ps.MinSendCallTime;
-	MaxSendCallTime=ps.MaxSendCallTime;
-	SendCallCount=ps.SendCallCount;
-	RecvCallTime=ps.RecvCallTime;
-	MinRecvCallTime=ps.MinRecvCallTime;
-	MaxRecvCallTime=ps.MaxRecvCallTime;
-	RecvCallCount=ps.RecvCallCount;
-	mgen[START]=SendCallTime+RecvCallTime;
-	// time array
-	//int j=USERGRP;
-	if (iIM!=0) {
-		for (i=0;i<StatGrpCount;i++) {
-			if (sore==1) {//sum
-				for (int k=0;k<StatGrpCount; k++) {
-					//mgen[j]=mgen[j]+pt[i][k].ProductTime;
-					lost[i]=lost[i]+pt[i][k].LostTime;
-					prod[i]=prod[i]+pt[i][k].ProductTime;
-					calls[i]=calls[i]+pt[i][k].CallCount;
-				}
-			}else {
-				//mgen[j]=pt[iIM-1][i].ProductTime;
-				lost[i]=pt[iIM-1][i].LostTime;
-				prod[i]=pt[iIM-1][i].ProductTime;
-				calls[i]=pt[iIM-1][i].CallCount;
-			}
-		}
-	}
-	if (jIM!=0) {
-		for (i=0;i<StatGrpCount;i++) {
-			if (sore==1) {
-				for (int k=0;k<StatGrpCount;k++) {
-					//mgen[j]=mgen[j]+pt[k][i].ProductTime;
-					prod[i]=prod[i]+pt[k][i].ProductTime;
-					lost[i]=lost[i]+pt[k][i].LostTime;
-					calls[i]=calls[i]+pt[k][i].CallCount;
-				}
-			} else {
-				//mgen[j]=pt[i][jIM-1].ProductTime;
-				prod[i]=pt[i][jIM-1].ProductTime;
-				lost[i]=pt[i][jIM-1].LostTime;
-				calls[i]=pt[i][jIM-1].CallCount;
-			}
-		//j++;
-		}
-	}
-}
-//-------------------------------------------------
-// deallocate memory for name of DVM-program
-CInter::~CInter()
-{
-	if (idint.pname!=NULL) delete []idint.pname;
-}
-//--------------------------------------------------
-// addition execution time characteristics
-void CInter::AddTime(typetime t2,double val)
-//t2 - type of execution characteristics
-// val - additional value
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>ITER) {
-		printf("CInter AddTime incorrect typetime %d\n",t2);
-		return;
-	}
-#endif
-	mgen[t2]=mgen[t2]+val;
-}
-//--------------------------------------------------
-//write new execution time characteristics
-void CInter::WriteTime(typetime t2,double val)
-//t2 - type of execution characteristics
-// val - new value
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>ITER) {
-		printf("CInter WriteTime incorrect typetime %d\n",t2);
-		return;
-	}
-#endif
-	mgen[t2]=val;
-}
-//-------------------------------------------------
-// read execution time characteristics
-void CInter::ReadTime(typetime t2,double &val)
-//t2 - type of execution characteristics
-// val - answer
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>ITER) {
-		printf("CInter ReadTime incorrect typetime %d\n",t2);
-		return;
-	}
-#endif
-	val=mgen[t2];
-}
-//--------------------------------------------------
-// addition times of collective operations
-void CInter::AddTime(typegrp t1,typecom t2,double val)
-//t1 - type of communication operation
-//t2 - type of collective operation
-//val - additional value 
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>RED) {
-			printf("CInter AddTime incorrect typecom %d\n",t2);
-		return;
-	}
-#endif
-	switch (t1) {
-		case COM:
-			mcom[t2]=mcom[t2]+val;
-			break;
-		case RCOM:
-			mrcom[t2]=mrcom[t2]+val;
-			break;
-		case SYN :
-			msyn[t2]=msyn[t2]+val;
-			break;
-		case VAR:
-			mvar[t2]=mvar[t2]+val;
-			break;
-		case CALL:
-			mcall[t2]=mcall[t2]+val;
-			break;
-		case OVERLAP:
-			moverlap[t2]=moverlap[t2]+val;
-			break;
-		default:
-			printf("CInter WriteCom incorrect typegrp\n");
-			break;
-	}
-}
-//---------------------------------------------------
-// read communication collective operations time
-void CInter::ReadTime(typegrp t1,typecom t2,double &val)
-//t1 - type of communication operation
-//t2 - type of collective operation
-//val - answer 
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>RED) {
-			printf("CInter ReadTime incorrect typecom %d\n",t2);
-		return;
-	}
-#endif
-	switch (t1) {
-		case COM:
-			val=mcom[t2];
-			break;
-		case RCOM:
-			val=mrcom[t2];
-			break;
-		case SYN :
-			val=msyn[t2];
-			break;
-		case VAR:
-			val=mvar[t2];
-			break;
-		case CALL:
-			val=mcall[t2];
-			break;
-		case OVERLAP:
-			val=moverlap[t2];
-			break;
-		default:
-			printf("CInter ReadTime incorrect typegrp\n");
-			break;
-	}
-}
-//---------------------------------------------------
-// read time from interval matrix
-void CInter::ReadTime(typetimeim t1,int t2,double &val)
-//t1 - type of time (lost/number of calls)
-//t2 - index
-//val - answer
- 
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>=StatGrpCount) {
-		printf("CInter ReadTime incorrect 2 parameter %d\n",t2);
-		return;
-	}
-#endif
-	switch (t1) {
-		case CALLSMT:
-			val=calls[t2];
-			break;
-		case LOSTMT:
-			val=lost[t2];
-			break;
-		case PRODMT:
-			val=prod[t2];
-			break;
-		default:
-			printf("CInter ReadTime incorrect type of im time\n");
-			break;
-	}
-}
-//-----------------------------------------------------
-// compare identifier information on other processors
-int CInter::CompIdent(ident *p)
-//p - pointer identifire information
-{
-	if ((idint.pname==NULL || (strcmp(p->pname,idint.pname)==0)) && (p->nline==idint.nline) &&
-	(p->nlev==idint.nlev) &&  (p->expr==idint.expr) && 	(p->t==idint.t)) {
-		return(1);
-	}
-	return(0);
-}
-//------------------------------------------------------
-// read identifier information
-void CInter::ReadIdent(ident **p)
-{
-	*p=&idint;
-}
-//-----------------------------------------------------
-// sum times characteristics upon levels
-void CInter::SumInter(CInter *p)
-{
-	int i;
-	for (i=0;i<=RED;i++) {
-		mgen[SUMSYN]=mgen[SUMSYN]+msyn[i];
-		mgen[SUMVAR]=mgen[SUMVAR]+mvar[i];
-		mgen[SUMOVERLAP]=mgen[SUMOVERLAP]+moverlap[i];
-	}
-	mgen[PROC]=(double)idint.proc;
-	if (idint.proc!=0) {
-		mgen[LOST]=mgen[INSUF]+mgen[INSUFUSR]+mgen[IDLE]+mgen[SUMCOM];
-	}
-	if (p==NULL) return;
-	for (i=0;i<=ITER;i++) {
-		if (i<SUMSYN || i>SUMOVERLAP) p->mgen[i]=p->mgen[i]+mgen[i];
-	}
-	for (i=0;i<StatGrpCount;i++) {
-		p->lost[i]=p->lost[i]+lost[i];
-		p->prod[i]=p->prod[i]+prod[i];
-		p->calls[i]=p->calls[i]+calls[i];
-	}
-	// add information
-	p->SendCallTime=p->SendCallTime+SendCallTime;
-	p->MinSendCallTime=p->MinSendCallTime+MinSendCallTime;
-	p->MaxSendCallTime=p->MaxSendCallTime+MaxSendCallTime;
-	p->SendCallCount=p->SendCallCount+SendCallCount;
-	p->RecvCallTime=p->RecvCallTime+RecvCallTime;
-	p->MinRecvCallTime=p->MinRecvCallTime+MinRecvCallTime;
-	p->MaxRecvCallTime=p->MaxRecvCallTime+MaxRecvCallTime;
-	p->RecvCallCount=p->RecvCallCount+RecvCallCount;
-	// sum communication information
-	for (i=0;i<=RED;i++) {
-		p->mcom[i]=p->mcom[i]+mcom[i];
-		p->mrcom[i]=p->mrcom[i]+mrcom[i];
-		p->msyn[i]=p->msyn[i]+msyn[i];
-		p->mvar[i]=p->mvar[i]+mvar[i];
-		p->moverlap[i]=p->moverlap[i]+moverlap[i];
-		p->mcall[i]=p->mcall[i]+mcall[i];
-	}
-}
-//-----------------------------------------------------
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.h
deleted file mode 100644
index d309869..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/inter.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef _INTER_H
-#define _INTER_H
-#include "sysstat.h"
-#include "strall.h"
-enum typegrp {COM,RCOM,SYN,VAR,OVERLAP,CALL};
-enum typetimeim {CALLSMT,LOSTMT,PRODMT};
-enum typetime {LOST,INSUFUSR,INSUF,IDLE,SUMCOM,SUMRCOM,SUMSYN,SUMVAR,SUMOVERLAP,IMB,
-EXEC,CPUUSR,CPU,IOTIME,START,PROC,ITER};
-enum typecom {IO,RD,SH,RA,RED};//5 collective operation. new operation insert before RED
-//if insert new time don't forget insert text in the statread.h
-//don't insert new time between SUMCOM...SUMOVERLAP
-typedef struct tident {
-        double nenter;
-        unsigned long nline,nline_end,proc;
-        long expr;
-	short nlev;
-	typefrag t;
-        char *pname;
-}ident;
-typedef    struct	{	double	SendCallTime;
-		double	MinSendCallTime;
-		double	MaxSendCallTime;
-		long	SendCallCount;
-		double	RecvCallTime;
-		double	MinRecvCallTime;
-		double	MaxRecvCallTime;
-		long	RecvCallCount;
-	}	s_SendRecvTimes;	
-
-class CInter {
-public:
-CInter (s_GRPTIMES (*pt)[StatGrpCount],s_SendRecvTimes ps,ident p,
-		unsigned long nint,int i,int j,short sore);
-~CInter(void);
-void AddTime(typetime t2,double val);
-void WriteTime(typetime t2,double val);
-void ReadTime(typetime t2,double &val);
-void AddTime(typegrp t1,typecom t2,double val);
-void ReadTime(typegrp t1,typecom t2,double &val);
-void ReadTime(typetimeim t1,int t2,double &val);
-int CompIdent(ident *p);
-void ReadIdent(ident **p);
-void SumInter(CInter *p);
-unsigned long ninter;
-private:
-	double mgen[ITER+1];
-	double mcom[RED+1];
-	double mrcom[RED+1];
-	double msyn[RED+1];
-	double mvar[RED+1];
-	double moverlap[RED+1];
-	double mcall[RED+1];
-	double lost[StatGrpCount];
-	double prod[StatGrpCount];
-	double calls[StatGrpCount];
-	double	SendCallTime;
-	double	MinSendCallTime;
-	double	MaxSendCallTime;
-	long	SendCallCount;
-	double	RecvCallTime;
-	double	MinRecvCallTime;
-	double	MaxRecvCallTime;
-	long	RecvCallCount;
-	ident idint;
-};
-/*enum typetime {LOST,INSUFUSR,INSUF,IDLE,
-SUMCOM,SUMRCOM,SUMSYN,SUMVAR,SUMOVERLAP,
-IMB,EXEC,CPUUSR,CPU,IOTIME,START,PROC,USERGRP,MSGPASGRP,
-STARTREDGRP,WAITREDGRP,REDGRP,STARTSHDGRP,WAITSHDGRP,SHDGRP,DISRGRP,
-REDISTRGRP,MAPPLGRP,DOPLGRP,PROGBLOCKGRP,IOGRP,REMACCESSGRP,USERDEBGRP,
-STATISTGRP,SYSTEMGRP,ITER};*/
-#endif
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.uni b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.uni
deleted file mode 100644
index 8633283..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.uni
+++ /dev/null
@@ -1,44 +0,0 @@
-######################################
-### Automated created makefile.win ###
-######################################
-
-BINDIR=../../bin
-
-EXECUTABLES = dvmstf
-COPT=-c -I../../predictor/Zlib/Include
-ZLIB	= zlib
-ZLIBDIR	= ../../predictor/Zlib/Src
-
-OBJS=\
-	inter.o  \
-	potensyn.o  \
-	statfile.o \
-	statread.o  \
-	treeinter.o \
-	statprintf.o
-
-$(BINDIR)/$(EXECUTABLES): $(OBJS)
-	$(CXX) -o $@ $(OBJS) -L$(ZLIBDIR) -l$(ZLIB)
-
-all:  $(BINDIR)/$(EXECUTABLES)
-	@echo "*** COMPILING EXECUTABLE $(EXECUTABLES) DONE"
- 
-clean:
-	rm -f logfile.txt
-	rm -f $(OBJS)
-cleanall:
-	rm -f logfile.txt
-	rm -f $(OBJS)
-
-potensyn.o:
-	$(CXX) $(COPT) potensyn.cpp 
-inter.o:
-	$(CXX) $(COPT) inter.cpp
-statfile.o:
-	$(CXX) $(COPT) statfile.cpp
-statread.o:
-	$(CXX) $(COPT) statread.cpp
-treeinter.o:
-	$(CXX) $(COPT) treeinter.cpp
-statprintf.o:
-	$(CXX) $(COPT) statprintf.cpp
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.win b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.win
deleted file mode 100644
index 6aae341..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/makefile.win
+++ /dev/null
@@ -1,46 +0,0 @@
-######################################
-### Automated created makefile.win ###
-######################################
-
-OUTDIR=..\obj
-BINDIR=..\..\bin
-ZLIB=zlib.lib
-ZLIBDIR=..\..\predictor\Zlib\Release
-
-EXECUTABLES = dvmstf
-
-LINK_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /machine:I386 /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-#COPT=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
-# /I "../../predictor/Zlib/Include"\
-# /Fp"$(OUTDIR)\tools.pch" /YX /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /c
-COPT=/nologo  /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
- /I "../../predictor/Zlib/Include"\
- /Fp"$(OUTDIR)\tools.pch" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /c
-
-.cpp{$(OUTDIR)/}.obj:
-	$(CXX) $(COPT) $<
-
-OBJS=\
-	$(OUTDIR)\potensyn.obj \
-	$(OUTDIR)\inter.obj  \
-	$(OUTDIR)\statfile.obj \
-	$(OUTDIR)\statread.obj  \
-	$(OUTDIR)\treeinter.obj \
-	$(OUTDIR)\statprintf.obj
-	
-$(BINDIR)/$(EXECUTABLES).exe: $(OBJS)
-	$(LINKER) @<<
-	$(LINK_FLAGS) $(OBJS)  $(ZLIBDIR)\$(ZLIB)
-<<
-
-all:  $(BINDIR)/$(EXECUTABLES).exe
-    @echo "*** COMPILING EXECUTABLE $(EXECUTABLES) DONE"
- 
-clean:
-	@erase logfile.txt
-
-cleanall:
-	@erase logfile.txt
-
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.cpp
deleted file mode 100644
index a1d22f3..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-#define _STATFILE_
-#include <stdio.h>
-#include <string.h>
-#include "strall.h"
-#include "potensyn.h"
-short reverse,szsh,szd,szv,szl,torightto,torightfrom;
-// Dynamically allocate array of synchronization times
-CSynchro::CSynchro(gzFile stream,unsigned long lsyn,unsigned char *pbuff)
-// stream - pointer to the file written during DVM-program execution
-// lsyn - length of written information
-{
-	valid=TRUE;
-	ps=NULL;
-	pbuff_read=NULL;
-	// dynamically allocate array of char from file (strall.h tsyn_ch)
-	unsigned char *buffer;
-	if (pbuff==NULL) {
-		buffer=new unsigned char[lsyn];
-		if (buffer==NULL) throw("Out of memory\n");
-		pbuff_read=buffer;
-		long l=gztell(stream);
-	// read from file to the allocated buffer
-		int s=gzread(stream,buffer,lsyn);
-		if ((unsigned long)s!=lsyn) {
-			valid=FALSE;
-			sprintf(texterr,"Can't read synchronization times from file addr=%ld,length=%ld\n",
-			l,lsyn);
-			if (pbuff_read!=NULL) {
-				delete []pbuff_read;
-				pbuff_read=NULL;
-			}
-			return;
-		}
-	}else buffer=pbuff;
-	// calculate size of struct tsyn_ch
-	unsigned long lsynone=QSYN_SHORT*szsh+QSYN_LONG*szl+QSYN_VOID*szv+
-		QSYN_DOUBLE*szd;
-	//set pointer to the first synchronization time
-	unsigned char *p=buffer+lsyn-lsynone;
-	// number of synchronization times
- 	qsyn=lsyn/lsynone;
-	// allocate array of struct tsyn
-	ps=new psyn[qsyn];
-	if (ps==NULL) throw("Out of memory\n");
-	psyn *psl=ps;
-	unsigned long i;
-	// copy values from struct of char to struct tsyn
-	for (i=0;i<qsyn;i++) {
-		psl->sh.nitem=0; psl->l.ninter=0; psl->v.ppgrp=NULL; psl->d.time=0.0;
-		CPYMEM(psl->sh.nitem,p+MAKESHORT(ps,nitem,nitem),szsh);
-		CPYMEM(psl->l.ninter,p+MAKELONG(ps,ninter,ninter,QSYN_SHORT),szl);
-  		// ppgrp -reference to group, used only for compare values
-		CPYMEM(psl->v.ppgrp,p+MAKEVOID(ps,ppgrp,ppgrp,QSYN_SHORT,QSYN_LONG),szv);
-		CPYMEM(psl->d.time,p+MAKEDOUBLE(ps,time,time,QSYN_SHORT,QSYN_LONG,QSYN_VOID),szd);
-		p=p-lsynone;
-		psl++;
-	}
-	if (pbuff_read!=NULL) {
-				delete []pbuff_read;
-				pbuff_read=NULL;
-			}
-}
-//------------------------------------------
-// deallocate  struct tsyn and memory of group references
-CSynchro::~CSynchro()
-{
-	if (ps==0) return;
-	if (pbuff_read!=NULL) delete []pbuff_read;
-	delete []ps;
-}
-//---------------------------------------------------------
-//return result of constructor execution
-int CSynchro::Valid()
-{
-	return(valid);
-}
-//-------------------------------------------
-//error message
-void CSynchro::TextErr(char *p)
-{
-	strcpy(p,texterr);
-}
-//-----------------------------------------------
-// calculate number of times different types
-BOOL CSynchro::Count(unsigned long n,short waserr )
-// n - number of interval
-// waserr - sign of error during accumulating times 
-{
-	if (n==0) return(0);
-	//qoper - array of number of times
-	for (int j=0;j<QCOLLECT+QCOLLECT;j++) {
-		qoper[j]=0;
-	}
-	ncurr=0;
-	// set current ninter
-	ninter=n;
-	psyn *pp=ps;
-	// calculate number of times, nitem - type of time
-	for (unsigned long i=0;i<qsyn;i++) {
-		if (pp->l.ninter==n) {
-			qoper[pp->sh.nitem-1]++;
-		}
-		pp++;
-	}
-	// veryfy number of calls and number of returns
-	if (waserr!=0) return(0);
-	for (int ak=0;ak<QCOLLECT;ak=ak+4) {
-		// number of start calls and number of wait calls
-		if (qoper[ak]!=qoper[ak+QCOLLECT] || qoper[ak+2]!=qoper[ak+2+QCOLLECT]) {
-			valid=FALSE;
-			sprintf(texterr,"Number of calls !=number of returns interval=%ld\n",n);
-			return(1);
-		}
-	}
-	return(0);
-}
-//-------------------------------------------
-// return number of synchronization time, function call after Count()
-int CSynchro::GetCount(typecollect nitem1)
-// nitem1 - type of synchronyzation time
-{
-	short nitem=(short)nitem1;
-	ncurr=0;
-	first=1; // the first Find
-	return (qoper[nitem-1]);
-}
-//--------------------------------------------
-//return next synchronyzation time,call after Count()
-double CSynchro::Find(typecollect nitem1)
-// nitem1 - type of synchronyzation time
-{
-	short nitem=(short)nitem1;
-	if (first!=1) ncurr++;
-	first++;
-	psyn *psl=ps+ncurr;
-	// ninter set Count()
-	for (unsigned long i=ncurr;i<qsyn;i++) {
-		if (psl->sh.nitem==nitem && psl->l.ninter==ninter) {
-			ncurr=i; // set current synchronization time
-			return(psl->d.time);
-		}
-		psl++;
-	}
-	ncurr=0;
-	return(0.0);
-}
-//-----------------------------------------------------
-// return current synchronyzation time, call after Find()
-double CSynchro::GetCurr(void)
-{
-	// ncurr set find
-	if (ncurr>=qsyn) return(0.0);
-	psyn *psl=ps+ncurr;
-	return(psl->d.time);
-}
-//--------------------------------------------------------
-//return nearest time from current
-double CSynchro::FindNearest(typecollect nitem1)
-// nitem1 - type of synchronyzation time
-// for overlap, for call_wait_operation find ret_start_operation
-{
-	if (ncurr>=qsyn ) return(0.0);
-	short nitem=(short)nitem1;
-	psyn *psl=ps+ncurr;
-	psyn *psl_curr=psl;
-	for (unsigned long i=ncurr;;i--) {
-		if (psl->sh.nitem==nitem) {
-			if (psl->v.ppgrp==psl_curr->v.ppgrp) {
-				return(psl->d.time);
-			}
-		}
-		psl--;
-		if (i==0) return(0.0);
-	}
-}
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.h
deleted file mode 100644
index 537f068..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/potensyn.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#if !defined( _POTENSYN_H )
-#define _POTENSYN_H
-#include "zlib.h"
-#include "bool.h"
-#include "inter.h"
-#include "treeinter.h"
-struct syn_short{
-	short nitem;
-};
-struct syn_long{
-	unsigned long ninter;
-};
-struct syn_void{
-	void* ppgrp;
-};
-struct syn_double{
-	double time;
-};
-#define QSYN_SHORT sizeof(syn_short)/SZSH
-#define QSYN_LONG sizeof(syn_long)/SZL
-#define QSYN_VOID sizeof(syn_void)/SZV
-#define QSYN_DOUBLE sizeof(syn_double)/SZD
-typedef struct tsyn {
-           syn_double d;
-           syn_void v;
-           syn_long l;
-           syn_short sh;
-}psyn;
-class CSynchro {
-public:
-	CSynchro(gzFile stream,unsigned long l,unsigned char *pbuff);
-	~CSynchro();
-	BOOL Valid();
-	void TextErr(char *t);
-	BOOL Count(unsigned long nin,short waserr);
-	int GetCount(typecollect nitem);
-	double Find(typecollect nitem);
-	double GetCurr(void);
-	double FindNearest(typecollect nitem);
-private:
-	BOOL valid;
-	char texterr[80];
-	psyn *ps;
-	unsigned long qsyn;
-    unsigned long ninter;
-	unsigned char *pbuff_read;
-	int qoper[QCOLLECT+QCOLLECT];
-	unsigned long ncurr;
-	short first;
-	int err;
-};
-#endif
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statfile.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statfile.cpp
deleted file mode 100644
index 5bb454b..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statfile.cpp
+++ /dev/null
@@ -1,523 +0,0 @@
-#include "bool.h"
-#define _STATFILE_
-#include "statread.h"
-#include <stdlib.h>
-#include <string.h>
-#include <float.h>
-#include <exception>
-#include <new>
-#include "dvmvers.h"
-#include "statprintf.h"
-using namespace std;
-
-int main (int argv,char **argc)
-{
-	//sfn outfn -l d>=0 -c d=-1..9 -n d-d>=0 -m text 
-	if (argv<3) {
-		printf("Performance analyser parameters: <file _name1> <file_name2> [-l  <level>]\n");
-		printf("         [-n <list>] [-c <compression_level>] [-m <matrix>]\n");
-		printf("<file_name1> - statistics file name \n");
-		printf("<file_name2> - output file name \n");
-		printf("<level> - interval level number \n");
-		printf("<list> - list of processor numbers, 0 - without processor characteristics \n");
-		printf("<compression_level> - -1..9 - compression level of output file,-1-no compression \n");
-		printf("<matrix> - <i[:<groupname>]|j[:<groupname>]\n");
-		printf("i|j - sum of row or column elements of matrix of interval characteristics \n");
-		printf("<groupname> - name of group, set to output row or column per elements. Groups names :\n");
-		printf("	          UserGrp|MsgPasGrp|StartRedGrp|WaitRedGrp|RedGrp|StartShdGrp|\n");
-		printf("              WaitShdGrp|ShdGrp|DistrGrp|ReDistrGrp|MapPLGrp|DoPLGrp|\n");
-		printf("              ProgBlockGrp|IOGrp|RemAccessGrp|UserDebGrp|StatistGrp|SystemGrp\n");
-		return 0;
-	}
-	if (argv>10) {
-		printf("Incorrect number of parameters\n");
-		exit(1);
-	}
-	BOOL proc=TRUE,comp=TRUE,gen=TRUE;
-	char compr[3],mode[5];
-	strcpy(mode,"wb0");
-	int nlevel=9999,qnumb=1;
-	unsigned long *pnumb=NULL;
-	int iIM=0,jIM=0,nparin=0,nparout=0;
-	short sore=0;
-	size_t st=0;
-	//new_handler set_new_handler(NULL);
-	nparin=1;// statistics file
-	nparout=2;// output file
-	for (int npar=3; npar<argv;npar++) { // key parameters
-		int i,cc;
-		char let;
-		char arrs[24] = "                       "; // strlen nameGen[i]
-		if (argc[npar][2]!=0) {
-			printf("Incorrect parameter %s\n",argc[npar]);
-			exit(1);
-		}
-		if (argv==npar+1) {
-			printf("Parameter for %s not set\n",argc[npar]);
-			exit(1);
-		}
-		switch(argc[npar][1]) {
-			case 'l':
-			//interval level
-			npar++;
-			nlevel=atoi(argc[npar]);
-		if (nlevel<0 || (nlevel==0 && strcmp(argc[npar],"0")!=0)) {
-			printf("Incorrect number of level %s \n",argc[npar]);
-			exit(1);
-		}
-			break;
-		case 'c':
-			// compression level
-			npar++;
-			mode[0]=0;compr[0]=0;
-			cc=atoi(argc[npar]);
-			if (cc<-1 || cc>9) {
-				printf("Incorrect compression level of file %s \n",argc[3]);
-				exit(1);
-			}
-			if (cc==-1) {
-				strcpy(compr,"0");
-			} else {
-				int comprd;
-				if (cc==0) strcpy(compr,"-1");
-				else {
-					comprd=cc;
-					sprintf(compr,"%d",comprd);
-				}
-			}
-			strcpy(mode,"wb");
-			strcat(mode,compr);
-			break;
-		case 'n':
-			// list of processor numbers
-			npar ++;
-			qnumb=1;
-			i=0;
-			while (argc[npar][i]!=0) {
-				if (argc[npar][i]==',') qnumb++;
-				i++;
-			}
-			pnumb=new unsigned long(qnumb*2);
-			if (pnumb==NULL) throw("Out of memory\n");
-			char * token;
-			token=strtok(argc[npar],",/n");
-			i=0;
-			while (token!=NULL) {
-				char *tdiap=strchr(token,'-');
-				if (tdiap==NULL) {
-					pnumb[i]=atoi(token);
-					pnumb[i+1]=pnumb[i];
-				}else {
-					pnumb[i+1]=atoi(tdiap+1);
-					tdiap[0]='\0';
-					pnumb[i]=atoi(token);
-				}
-				token=strtok(NULL,",\n");
-				i=i+2;
-			} // end while
-			// -n 0 - not print processor characteristics
-			if (qnumb==1 && pnumb[0]==0 && pnumb[1]==0) proc=FALSE;
-			break;
-		case 'm':
-			// interval matrix
-			npar++;
-			let=argc[npar][0];
-			if (let!='i' && let!='j') {
-				printf("Incorrect %d parameter %c, must be i/j\n",npar,let);
-				exit(1);
-			}
-			sore=1; 
-			if (let=='i') iIM=1;else jIM=1;
-			st=strlen(argc[npar]);
-			if (st==1) break;
-			sore=0;  // element
-			if (argc[npar][1]!=':') {
-				printf("Incorrect %d parameter %s, must be i=<groupname>/j=<groupname>\n",npar,argc[npar]);
-				exit(1);
-			}
-			strncpy(arrs,&(argc[npar][2]),st-2);
-			iIM=0;jIM=0;
-			for (i=1;i<=StatGrpCount;i++) {
-				if (strcmp(nameGenMT[i-1],arrs)==0) {
-					if (let=='i') iIM=i;
-					else jIM=i;
-					break;
-				}
-			} // end for
-			if (iIM==0 && jIM==0) {
-				printf("Incorrect group name %s \n",argc[npar]);
-				exit(1);
-			}
-			break;
-		default:
-			printf("Incorrect parameter %s\n",argc[npar]);
-			exit(1);
-			break;
-		} // end switch
-	} // end for key parameters
-	// read time characteristics and syn times
-	try {
-	CStatRead stat(argc[nparin],iIM,jIM,sore);
-	int warn;
-	if (stat.Valid(&warn)!=TRUE) {
-		char t[80];
-		stat.TextErr(t);
-		printf("%s",t);
-		exit(1);
-	}
-	unsigned long qproc=stat.QProc();
-	if (qproc==0) exit(1);
-	// string for processor characteristics - max
-	// printf for compressed and not compressed out file
-	CStatPrintf statpr(argc[nparout],1024,mode);
-	if (statpr.Valid()!=TRUE) {
-		char t[80];
-		statpr.TextErr(t);
-		printf("%s",t);
-		exit (1);
-	}
-	double min[ITER+1];
-	double max[ITER+1];
-	double sum[ITER+1];
-	// communication
-	double minc[RED+1];
-	double maxc[RED+1];
-	double sumc[RED+1];
-	// real communication
-	double minrc[RED+1];
-	double maxrc[RED+1];
-	double sumrc[RED+1];
-	// synchronization
-	double mins[RED+1];
-	double maxs[RED+1];
-	double sums[RED+1];
-	// variation
-	double minv[RED+1];
-	double maxv[RED+1];
-	double sumv[RED+1];
-	// overlap
-	double minov[RED+1];
-	double maxov[RED+1];
-	double sumov[RED+1];
-	// number of processor
-	unsigned long nprocmin[ITER+1],nprocmax[ITER+1]; 
-	unsigned long nprocminc[RED+1],nprocmaxc[RED+1]; 
-	unsigned long nprocminrc[RED+1],nprocmaxrc[RED+1]; 
-	unsigned long nprocmins[RED+1],nprocmaxs[RED+1]; 
-	unsigned long nprocminv[RED+1],nprocmaxv[RED+1]; 
-	unsigned long nprocminov[RED+1],nprocmaxov[RED+1]; 
-	char *namecomp[3]={"Tmin","Tmax","Tmid"};
-	int ltxt=strlen(nameCom[0])+1;
-	char p_heading[80];
-	int lenstr=0;
-	char *poutstr;
-	int i;
-	stat.VMSSize(p_heading);
-	statpr.StatPrintf("Processor system=%s\n",p_heading);
-	char * pvers=stat.ReadVers();
-	char *pplat=stat.ReadPlatform();
-	statpr.StatPrintf("Statistics has been accumulated on DVM-system version %s, platform %s\n",pvers,pplat);
-	statpr.StatPrintf("Analyzer is executing on DVM-system version %s, platform %s\n",VERS,PLATFORM);	
-	for (i=0;i<warn;i++) { // warning message
-		stat.WasErrAccum(p_heading);
-		statpr.StatPrintf("!! %s",p_heading);
-	}
-	short dig_time=0;
-	unsigned long n=stat.BeginTreeWalk();
-    while (n!=0) {
-        short nlev=stat.ReadTitle(p_heading);
-		if (nlev<=nlevel) {
-            statpr.StatPrintf("%s","-------------------------------------------------------------------------\n");
-			statpr.StatPrintf("%s",p_heading);
-			// calculate min,max,sum values for all times
-			stat.MinMaxSum(PRGEN,min,nprocmin,max,nprocmax,sum);
-			stat.MinMaxSum(PRCOM,minc,nprocminc,maxc,nprocmaxc,sumc);
-			stat.MinMaxSum(PRRCOM,minrc,nprocminrc,maxrc,nprocmaxrc,sumrc);
-			stat.MinMaxSum(PRSYN,mins,nprocmins,maxs,nprocmaxs,sums);
-			stat.MinMaxSum(PRVAR,minv,nprocminv,maxv,nprocmaxv,sumv);
-			stat.MinMaxSum(PROVER,minov,nprocminov,maxov,nprocmaxov,sumov);
-			if (dig_time==0) { // format for print
-				double max_val=0.0;
-				for (i=0;i<=RED;i++) {
-                    if (max_val<sumc[i]) max_val=sumc[i];
-					if (max_val<sumrc[i]) max_val=sumrc[i];
-					if (max_val<sums[i]) max_val=sums[i];
-					if (max_val<sumv[i]) max_val=sumv[i];
-					if (max_val<sumov[i]) max_val=sumov[i];
-				} // end for
-				char tval[80];
-				sprintf(tval,"%*.*lf",DIGTIME,PREC,max_val);
-				dig_time=(short)strlen(tval);
-				lenstr=(dig_time+1)*qproc+strlen(nameGen[0])+1;
-				if (lenstr<=1024) lenstr=1024;else statpr.ChangeLenStr(lenstr);
-				poutstr=new char[lenstr];
-				if (poutstr==NULL) throw("Out of memory\n");
-			}
-			if (gen==TRUE) {
-				statpr.StatPrintf("--- The main characteristics --- \n");
-				double time1,prodcpu,timef,prod;
-				timef=sum[IOTIME];
-				prodcpu=sum[CPU];
-				prod=sum[CPU]+sum[CPUUSR]+timef;
-				if ((n)*max[EXEC]==0) time1=0.0;
-				else time1=prod/(n*max[EXEC]);
-			    statpr.StatPrintf("%s %*.*lf \n","Parallelization efficiency ",dig_time,PREC,time1);
-				statpr.StatPrintf("%s %*.*lf \n",    "Execution time             ",dig_time,PREC,max[EXEC]);
-				statpr.StatPrintf("%s %d\n",       "Processors                          ",n);
-				statpr.StatPrintf("%s %*.*lf\n",     "Total time                 ",dig_time,PREC,(n)*max[EXEC]);
-				if (prod!=0.0) {
-				statpr.StatPrintf("%s %*.*lf %s %.*lf %s %.*lf %s %.*lf %c\n","Productive time            ",
-				dig_time,PREC,prod,"( CPU=",PREC,sum[CPUUSR]," Sys=",
-				PREC,prodcpu,"I/O=",PREC,timef,')');
-				}
-				if(sum[LOST]>0.0)statpr.StatPrintf("%s %*.*lf \n","Lost  time                 ",dig_time,PREC,sum[LOST]);
-				if (sum[INSUFUSR]+sum[INSUF]!=0.0) 
-				statpr.StatPrintf("%s %*.*lf %s %.*lf %s %.*lf %c\n","   Insufficient parallelism",dig_time,PREC,sum[INSUFUSR]+sum[INSUF],
-				"( User=",PREC,sum[INSUFUSR],"Sys=",PREC,sum[INSUF],')');
-				if (sum[SUMCOM]!=0.0)
-				statpr.StatPrintf("%s %*.*lf %s %.*lf %s %.*lf %c\n","   Communication           ",dig_time,PREC,sum[SUMCOM],
-				"( Real_sync=",PREC,sum[SUMRCOM],"Starts=",PREC,sum[START],')'); 
-				if (sum[IDLE]!=0.0)   statpr.StatPrintf("%s %*.*lf\n","   Idle time               ",dig_time,PREC,sum[IDLE]);
-				if (sum[IMB]!=0.0)statpr.StatPrintf("%s %*.*lf\n","Load imbalance             ",
-					dig_time,PREC,sum[IMB]);
-				if (sum[SUMSYN]!=0.0) statpr.StatPrintf("%s %*.*lf\n","Synchronization            ",dig_time,PREC,sum[SUMSYN]);
-				if (sum[SUMVAR]!=0.0) statpr.StatPrintf("%s %*.*lf\n","Time variation             ",dig_time,PREC,sum[SUMVAR]);
-				if (sum[SUMOVERLAP]>0.0)statpr.StatPrintf("%s %*.*lf\n","Overlap                    ",dig_time,PREC,
-				sum[SUMOVERLAP]);
-				long ncall=0;
-				int dig_stat=DIGSTAT;
-				for (i=0;i<=RED;i++) ncall=ncall+stat.ReadCall(typecom(i));
-				if (ncall>0) {
-                    statpr.StatPrintf("%*c",ltxt,' ');
-					char tval[20];
-					sprintf(tval,"%ld",ncall);
-					int l=strlen(tval);
-					if (l>DIGSTAT)dig_stat=l; 
-					statpr.StatPrintf("%*s",dig_stat," Nop ");
-					for (int j=SUMCOM;j<=SUMOVERLAP;j++) {
-						if (sum[j]>0.0) 
-						statpr.StatPrintf("%*s ",dig_time,nameOper[j-SUMCOM]);
-					} // end for
-					statpr.StatPrintf("\n");
-				}// end if
-                for (i=0;i<=RED;i++) {
-                    ncall=stat.ReadCall(typecom(i));
-					if (ncall>0) {
-						statpr.StatPrintf("%s",nameCom[i]);
-						statpr.StatPrintf("%*d ",dig_stat,ncall);
-						if (sum[SUMCOM]>0.0)statpr.StatPrintf("%*.*lf ",dig_time,PREC,sumc[i]);
-						if (sum[SUMRCOM]>0.0)statpr.StatPrintf("%*.*lf ",dig_time,PREC,sumrc[i]);
-						if (sum[SUMSYN]>0.0)statpr.StatPrintf("%*.*lf ",dig_time,PREC,sums[i]);
-						if (sum[SUMVAR]>0.0)statpr.StatPrintf("%*.*lf ",dig_time,PREC,sumv[i]);
-						if (sum[SUMOVERLAP]>0.0)statpr.StatPrintf("%*.*lf ",dig_time,PREC,sumov[i]);
-						statpr.StatPrintf("\n");
-					} // end if ncall>0
-				} // end for
-				if (iIM>0 || jIM>0) { // statistics matrix
-					for (unsigned long np=1;np<=qproc;np++) {
-					double prod[StatGrpCount],lost[StatGrpCount],sumprod=0.0,sumlost=0.0;
-					double calls[StatGrpCount],sumcalls=0.0;
-					stat.GrpTimes(prod,lost,calls,np);
-					sprintf(p_heading,"%ld",np);
-					int ll=strlen(nameGen[0])-strlen(p_heading)-strlen(" Nproc=")-2;
-					statpr.StatPrintf("%s %d %*c %*s %*s %*s\n"," Nproc=",np,ll,' ',
-						dig_time,"CALL COUNT",dig_time,"PRODUCT TIME",dig_time,
-						"LOST TIME");
-					for (i=0;i<StatGrpCount;i++) {
-						sumprod=sumprod+prod[i];
-						sumlost=sumlost+lost[i];
-						sumcalls=sumcalls+calls[i];
-						//if (calls[i]>0 || prod[i]!=0.0 || lost[i]!=0.0 ) {
-							statpr.StatPrintf("%s %*.*lf %*.*lf %*.*lf \n",nameGenMT[i],
-								dig_time,PREC,calls[i],
-								dig_time,PREC,prod[i],
-								dig_time,PREC,lost[i]);
-						//}
-					} // end for
-					statpr.StatPrintf("%s %*.*lf %*.*lf %*.*lf \n","      Total:           ",
-					dig_time,PREC,sumcalls,dig_time,PREC,sumprod,dig_time,PREC,sumlost);
-					} // end for qproc
-				} // end statistics matrix
-			} // end main characteristics
-			if (comp==TRUE) {
-				// comparative characteristics
-				statpr.StatPrintf("--- The comparative characteristics --- \n");
-				poutstr[0]=0;
-				statpr.StatPrintf ("%*c",strlen(nameGen[0])+1,' ');
-				int i;
-				for (i=0;i<3;i++) {
-					if (i==2)statpr.StatPrintf("%*s\n",dig_time,namecomp[i]);
-					else statpr.StatPrintf("%*s %*s",dig_time,namecomp[i],
-						DIGSTAT,"N proc");
-				}
-				// general characteristics
-				for (i=0;i<=ITER;i++) {
-					if (sum[i]>0.0) {
-						int prec;
-						double tt=sum[i]/n;
-						if ((typetime)(i)==PROC || (typetime)(i)==ITER)
-							prec=0;else prec=PREC;
-						statpr.StatPrintf("%s %*.*lf %*d %*.*lf %*d %*.*lf \n",
-							nameGen[i],dig_time,prec,
-							min[i],DIGSTAT,nprocmin[i],dig_time,prec,max[i],DIGSTAT,
-							nprocmax[i],dig_time,prec,tt);
-					}
-				}
-				long ncall=0;
-				// characteristics of collective operations
-				for (i=0;i<=RED;i++) ncall=ncall+stat.ReadCall(typecom(i));
-				if (ncall>0) {
-					statpr.StatPrintf("%*c",ltxt-2,' ');
-					for (int j=SUMCOM;j<=SUMOVERLAP;j++) {
-						if (sum[j]>0.0) 
-						statpr.StatPrintf("%*s  ",dig_time+DIGSTAT,nameOper[j-SUMCOM]);
-					}
-					statpr.StatPrintf("\n");
-					for (i=0;i<=RED;i++) {
-					for (int k=0;k<3;k++) {
-						if (sumc[i]==0.0 && sumrc[i]==0.0 && sums[i]==0.0 &&
-							sumv[i]==0.0 &&sumov[i]==0.0) break;
-						double t[CALL];//com,realcom,syn,var,overlap
-						unsigned long pnp[CALL];
-						// 0 - min; 1 - max; 2 - sum
-						switch (k) {
-							case 0:
-								t[0]=minc[i];t[1]=minrc[i];
-								t[2]=mins[i];t[3]=minv[i];
-								t[4]=minov[i];
-								pnp[0]=nprocminc[i];
-								pnp[1]=nprocminrc[i];
-								pnp[2]=nprocmins[i];
-								pnp[3]=nprocminv[i];
-								pnp[4]=nprocminov[i];
-								break;
-							case 1:
-								t[0]=maxc[i];t[1]=maxrc[i];
-								t[2]=maxs[i];t[3]=maxv[i];
-								t[4]=maxov[i];
-								pnp[0]=nprocmaxc[i];
-								pnp[1]=nprocmaxrc[i];
-								pnp[2]=nprocmaxs[i];
-								pnp[3]=nprocmaxv[i];
-								pnp[4]=nprocmaxov[i];
-								break;
-							case 2:
-								t[0]=sumc[i]/n;t[1]=sumrc[i]/n;
-								t[2]=sums[i]/n;t[3]=sumv[i]/n;
-								t[4]=sumov[i]/n;
-								pnp[0]=0;
-								pnp[1]=0;
-								pnp[2]=0;
-								pnp[3]=0;
-								pnp[4]=0;
-								break;
-							default:
-								statpr.StatPrintf("Unknown type=%d\n",k);
-								exit(1);
-						}// end switch
-						statpr.StatPrintf("%s%s",nameCom[i],namecomp[k]);
-						for (int j=SUMCOM;j<=SUMOVERLAP;j++) {
-							if (sum[j]>0.0) {
-								if (pnp[0]==0) {
-								statpr.StatPrintf("%*.*lf ",
-								dig_time,PREC,t[j-SUMCOM]);
-								statpr.StatPrintf("%*c",DIGSTAT+1,' ');
-								}
-								else 
-								statpr.StatPrintf("%*.*lf %*d ",
-								dig_time,PREC,t[j-SUMCOM],
-								DIGSTAT,pnp[j-SUMCOM]);
-							}
-						}
-						statpr.StatPrintf("\n");
-					} //end for
-				}//end for
-				}
-			}
-			if (proc==TRUE) {
-				// execution characteristics
-				statpr.StatPrintf("--- The execution characteristics --- \n");
-				statpr.StatPrintf("%s","                       ");
-				unsigned long i;
-				// print numbers of processor
-				for (i=0;i<n;i++) {//!!! qproc
-					int pr=FALSE;
-					if (pnumb==NULL) pr=TRUE;
-					else {
-						for (int j=0; j<qnumb;j++) {
-							if(i+1>=pnumb[j] && i+1<=pnumb[j+1]) pr=TRUE;
-						}
-					}
-					if (pr==TRUE) {
-						statpr.StatPrintf("%*d ",dig_time,i+1); // probel
-					}
-				}
-				statpr.StatPrintf("\n");
-				// general characteristics
-				for (i=0;i<=ITER;i++) {
-					stat.ReadProc(PRGEN,pnumb,qnumb,dig_time,sum[i],poutstr);
-					if (poutstr[0]!='\0')statpr.StatPrintf("%s\n",poutstr);
-					//statpr.StatPrintf("\n");
-				}
-				//statpr.StatPrintf("\n");
-				// characteristics of collective operatios
-				long ncall=0;
-				for (int k=0;k<=RED;k++) ncall=ncall+stat.ReadCall(typecom(k));
-					for (int j=SUMCOM;j<=SUMOVERLAP;j++) {
-						double *ps;
-						switch (j) {
-						case SUMCOM: ps=sumc;break;
-						case SUMRCOM: ps=sumrc;break;
-						case SUMSYN: ps=sums;break;
-						case SUMVAR: ps=sumv;break;
-						case SUMOVERLAP: ps=sumov;break;
-						default:statpr.StatPrintf("Unknown type=%d\n",j);
-						exit(1);
-					}// end for j
-					int i=0;
-					//if (j==SUMOVERLAP) ncall=0; //for pc sum[j]=0.0
-					if (sum[j]>0.0 && ncall>0) {
-						statpr.StatPrintf("           %s\n",nameGen[j]);
-						for (i=0;i<=RED;i++) {
-							stat.ReadProc((typeprint)(j-SUMCOM+1),pnumb,qnumb,dig_time,ps[i],poutstr);
-							if (poutstr[0]!='\0')statpr.StatPrintf("%s\n",poutstr);
-						}
-					}
-				} // end for k
-			}//exec characteristics
-		} // if nlev<=nlevel
-		n=stat.TreeWalk();
-	}
-	//names and times of processors
-	char *pname=NULL,*pnamemin=NULL,*pnamemax=NULL;
-	double time,mintime=DBL_MAX,maxtime=0.0,sumtime=0.0;
-	stat.NameTimeProc(0,&pname,&time);
-	if (pname==NULL) exit(1); // not MPI
-	unsigned long minn=0,maxn=0;
-	statpr.StatPrintf("%s","-------------------------------------------------------------------------\n");
-	statpr.StatPrintf("Name (number) and performance time of processors\n");
-	for (unsigned long i1=0;i1<qproc;i1++) {
-		stat.NameTimeProc(i1,&pname,&time);
-		sumtime=sumtime+time;
-		if (time<mintime) {mintime=time;minn=i1+1;pnamemin=pname;}
-		if (time>maxtime) {maxtime=time; maxn=i1+1;pnamemax=pname;}
-		statpr.StatPrintf("%s(%d) %lf\n",pname,i1+1,time);
-	}
-	statpr.StatPrintf("min - %s(%d) %lf; max - %s(%d) %lf; mid - %lf\n",
-		pnamemin,minn,mintime,pnamemax,maxn,maxtime,sumtime/qproc);
-	} // end try
-	catch (bad_alloc ex) {
-		printf("Out of memory\n");
-		exit(1);
-	}
-	catch (exception ex) {
-		printf("Exception in standart library %s\n",ex.what());
-		exit(1);
-	}
-	catch (char *str) {
-		printf("%s\n",str);
-		exit(1);
-	}
-	return 0;
-}
-
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statist.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statist.h
deleted file mode 100644
index b00cb66..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statist.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#if !defined( __STATIST_H )
-#define __STATIST_H
-void CreateInter(int typef,long val);
-int FindInter(int typef,long val);
-void EndInter(long nline);
-void FreeInter(void);
-#endif
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.cpp
deleted file mode 100644
index 6013539..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "statprintf.h"
-#include <string.h>
-#include <stdarg.h>
-CStatPrintf::CStatPrintf(char *name,int lstr,char *mode)
-//name -file name
-//lstr - string length for sprintf,used only for compressed file
-// mode -file mode,"wb0"- not compress out file 
-{
-	valid=TRUE;
-	ff=NULL;
-	lenstr=lstr;
-	pstr=new char[lstr];
-	if (pstr==NULL) throw("Out of memory\n");
-	if (strcmp(mode,"wb0")!=0)  {// compress file
-		char *pname=new char[strlen(name)+4];
-		if (pname==NULL) throw("Out of memory\n");
-		strcpy(pname,name);
-		strcat(pname,".gz");
-		ffgz=gzopen(pname,mode);
-		if (ffgz==NULL) {
-			valid=FALSE;
-			sprintf(texterr,"Can't open file %s\n",name);
-			return;
-		}
-	} else {
-		ff=fopen(name,"w");
-		if (ff==NULL) {
-			valid=FALSE;
-			sprintf(texterr,"Can't open file %s\n",name);
-			return;
-		}
-	}
-	return;
-}
-//-------------------------------------------------
-//return result of constructor execution
-BOOL CStatPrintf::Valid()
-{
-	return(valid);
-}
-//-------------------------------------------
-// error message
-void CStatPrintf::TextErr(char *p)
-{
-	strcpy(p,texterr);
-}
-//------------------------------------------------
-// change length of string, if it > lenstr
-void CStatPrintf::ChangeLenStr(int lstr)
-{
-	if (lstr<=lenstr) return;
-	char * ppstr=new char[lstr];
-	if (ppstr==NULL) throw("Out of memory\n");
-	delete []pstr;
-	pstr=ppstr;
-	lenstr=lstr;
-	return;
-}
-//---------------------------------------------------------
-int CStatPrintf::StatPrintf(const char *format,...)
-	{
-		va_list arglist;
-		va_start(arglist,format);
-		if (ff==NULL) { // compress file
-			int len=vsprintf(pstr,format,arglist);
-			if (len<=0) return 1;
-			int ans=gzwrite(ffgz,pstr,unsigned(len));
-			if (ans!=len) return 1;
-		} else {
-			vfprintf(ff,format,arglist);
-		}
-		va_end(arglist);
-		return 0;
-	}
-//----------------------------------------------------------
-CStatPrintf::~CStatPrintf()
-{ 
-	if (ff==NULL) {
-		delete []pstr;
-		gzclose(ffgz);
-	} else fclose (ff);
-	return;
-}
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.h
deleted file mode 100644
index 2b71ec2..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statprintf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _STATPRINTF_H
-#define _STATPRINTF_H
-#include "bool.h"
-#include "zlib.h"
-#include "stdio.h"
-class CStatPrintf {
-public:
-CStatPrintf(char * name,int lstr,char *mode);
-~CStatPrintf();
-void ChangeLenStr(int lstr);
-BOOL Valid();
-void TextErr(char *t);
-int StatPrintf(const char *format,...);
-private:
-	int lll;
-	char *pstr;
-	int lenstr;
-	FILE * ff;
-	gzFile ffgz;
-	BOOL valid;
-	char texterr[80];
-};
-#endif
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.cpp
deleted file mode 100644
index a30c5a3..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.cpp
+++ /dev/null
@@ -1,961 +0,0 @@
-#define _STATFILE_
-#include "zlib.h"
-#include <string.h>
-#include <float.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <new>
-#include "bool.h"
-#include "strall.h"
-#include "inter.h"
-#include "treeinter.h"
-#include "potensyn.h"
-#include "statread.h"
-using namespace std;
-extern short reverse,szsh,szl,szd,szv,torightto,torightfrom;
-// read intervals and synchronyzation times from file
-CStatRead::CStatRead(const char * name,int iIM,int jIM,short sore)
-// name - file name
-{
-	gzFile  ff=NULL;
-	valid=TRUE;
-	valid_warning=0;
-	BOOL valid_synchro=TRUE;
-	valid_synchro=TRUE;
-	pclfrag=NULL;
-	pclsyn=NULL;
-	pic=NULL;
-	pch_vmssize=NULL;
-	pvers=NULL;
-	pvms *pb_vms=NULL;
-	proccount=0;
-	ff=gzopen(name,"rb");
-	if (ff==NULL) {
-		valid=FALSE;
-		sprintf(texterr,"Can't open file %s \n",name);
-		return;
-	}
-	unsigned long lbufcompr,lbufuncompr=0,luncompr,luncomprread;
-	pbufcompr=NULL;pbufuncompr=NULL;
-	char lbufplusch[12]={0};
-	char nprocch[12]={0};
-	int s; // for gzread
-	long l; // for gztell
-	short sz[QV_CONST];
-	unsigned char *psz; //struc sz
-	gzplus =0; // sign of file gz/ gz+
-	if (strstr(name,".gz+") !=NULL) { //file gz+
-		gzplus=1;
-		int k;
-		for (k=0;;k++) { // number of compressed bytes
-			if (gzread(ff,&(lbufplusch[k]),1)!=1) {
-				valid=FALSE;
-				sprintf(texterr,"Can't read from file %s \n",name);
-				return;
-			}
-			if (lbufplusch[k]==0) break;
-		}
-		lbufuncompr=atol(lbufplusch); // size of buffer
-		for (k=0;k<12;k++) lbufplusch[k]=0;
-		for (k=0;;k++) { // number of processors
-			if (gzread(ff,&(nprocch[k]),1)!=1) {
-				valid=FALSE;
-				sprintf(texterr,"Can't read from file %s \n",name);
-				return;
-			}
-			if (nprocch[k]==0) break;
-		}
-		for (k=0;;k++) { // number of compressed bytes
-			if (gzread(ff,&(lbufplusch[k]),1)!=1) {
-				valid=FALSE;
-				sprintf(texterr,"Can't read from file %s \n",name);
-				return;
-			}
-			if (lbufplusch[k]==0) break;
-		}
-		lbufcompr=atol(lbufplusch);
-		pbufcompr=new unsigned char[lbufcompr];
-		if (pbufcompr==NULL) throw("Out of memory\n");
-		luncompr=lbufuncompr+lbufuncompr/1000+12; // length uncompressed buffer
-		luncomprread=luncompr;
-		if (pbufcompr!=NULL) {
-			pbufuncompr=new unsigned char[luncompr];
-			if (pbufuncompr==NULL) throw("Out of memory\n");
-		}
-		s=gzread(ff,pbufcompr,lbufcompr);
-		if (s!=(int)lbufcompr) {
-			valid=FALSE;
-			sprintf(texterr,"Can't read from file %s l=%ld\n",name,lbufcompr);
-			return;
-		}
-		int err=uncompress(pbufuncompr,&luncomprread,pbufcompr,lbufcompr);
-		if (err!=Z_OK || luncomprread!=lbufuncompr) {
-			valid=FALSE;
-			sprintf(texterr,"Can't uncompress l=%ld\n",lbufcompr);
-			return;
-		}
-		psz=pbufuncompr;
-	} else { // file gz or other files
-		l=gztell(ff);
-		psz=(unsigned char *)(&(sz[0]));
-		// read const information about size of variables and reverse
-		s=gzread(ff,&sz,sizeof(sz));
-		if (s!=(int)sizeof(sz)) {
-			valid=FALSE;
-			sprintf(texterr,"Can't read from file %s addr=%ld size=%d\n",
-				name,l,(int)sizeof(sz));
-			return;
-		}
-	}
-	// data presentation
-	memcpy(&reverse,psz,2); // variables reverse and toright for CPYMEM
-	if (reverse!=1) {
-		short imcpy,sh1=0;
-		for (imcpy=sizeof(reverse)-1;imcpy>=0;imcpy--)	{ 
-			*((unsigned char*)(&sh1)+imcpy)=
-				*((unsigned char *)(&reverse)+sizeof(reverse)-1-imcpy);
-		}
-		if (sh1!=1) {
-			valid=FALSE;
-			sprintf(texterr,"Analyzing file %s is not statistics\n",name);
-			return;
-		}
-		reverse=1;
-	}else reverse=0;
-	short left=1; torightto=0;torightfrom=0;
-	char *pleft=(char *)&left;
-	if (reverse==1) { // data reverse
-		if (pleft[0]==0 ) torightto=1;else torightfrom=1;
-	}
-	// size of used variables
-	CPYMEM(szsh,psz+2,2);
-	CPYMEM(szl,psz+4,2);
-	CPYMEM(szv,psz+6,2);
-	CPYMEM(szd,psz+8,2);
-	if ((szsh!=SZSH) || /*(szl>SZL) || (szv>SZV) ||*/ (szd!=SZD)) {
-		valid=FALSE;
-		sprintf(texterr,"Size of accumulating data > size of machine data %d>%d\n",
-		szsh,(int)SZSH);
-		return;
-	}
-	if ((szl>SZL) || (szv>SZV) ) {
-		sprintf(textwarning[valid_warning],"Number of operation may be incorrect. Data size not equal. %d>%d %d>%d\n",
-		szl,(int)SZL,szv,(int)SZV);
-		valid_warning++;
-	}
-	// calculate size of const information
-	int lvms=QV_SHORT*szsh+QV_LONG*szl+QV_VOID*szv+QV_DOUBLE*szd;
-	// read const information from file
-	unsigned char *pch_vms=NULL;
-	if (gzplus==1) pch_vms=pbufuncompr+sizeof(sz);
-	else {
-		pch_vms=new unsigned char[lvms];
-		if (pch_vms==NULL) throw("Out of memory\n");
-		l=gztell(ff);
-		s=gzread(ff,pch_vms,lvms);
-		if (s!=lvms) {
-			valid=FALSE;
-			sprintf(texterr,"Can't read from file %s addr=%ld size=%d\n",
-				name,l,lvms);
-			return;
-		}
-	}
-	unsigned long linter=0; // read there only for control
-	CPYMEM(linter,pch_vms+MAKELONG(pb_vms,linter,proccount,QV_SHORT),szl);
-	if (linter<=0) {
-		valid=FALSE;
-		sprintf(texterr,"Execution was exit with statistics error. \n");
-		return;
-	}
-	// smallbuff - not enough memory in buffer,not all data accumulated
-	CPYMEM(smallbuff,pch_vms+MAKESHORT(pb_vms,smallbuff,rank),szsh);
-	if (smallbuff==1) {
-		sprintf(textwarning[valid_warning],
-			"Not all times of collective operations were accumulated\n");
-		valid_warning++;
-	}
-	CPYMEM(rank,pch_vms+MAKESHORT(pb_vms,rank,rank),szsh);
-	// global size of const information
-	size_t lvms_add=lvms+szl*rank+QV_CONST*2;
-	// size of VMS run
-	pch_vmssize=new unsigned char[szl*rank];
-	if (pch_vmssize==NULL) throw("Out of memory\n");
-	if (gzplus==1) memcpy(pch_vmssize,pbufuncompr+sizeof(sz)+lvms,szl*rank);
-	else {
-		l=gztell(ff);
-		s=gzread(ff,pch_vmssize,szl*rank);
-		if (s!=szl*rank) {
-			valid=FALSE;
-			sprintf(texterr,"Can't read from file %s addr=%ld size=%d\n",
-					name,l,szl*rank);
-			return;
-		}
-	}
-	CPYMEM(maxnlevel,pch_vms+MAKESHORT(pb_vms,maxnlev,rank),szsh);
-	CPYMEM(proccount,pch_vms+MAKELONG(pb_vms,proccount,proccount,QV_SHORT),szl);
-	pclfrag=new CTreeInter*[proccount]; 
-	if (pclfrag==NULL) throw("Out of memory\n");
-	unsigned long i;
-	for (i=0;i<proccount;i++) pclfrag[i]=NULL;
-	// allocate memory for pointer of synchronization times
-	pclsyn=new CSynchro*[proccount];
-	if (pclsyn==NULL) throw("Out of memory\n");
-	// proccount - number of processors, the main loop
-	for (i=0;i<proccount;i++) pclsyn[i]=NULL;
-	unsigned long lsynchro=0;
-	for (i=0;i<proccount;i++) {// main processor's loop 
-		unsigned long qfrag=0;
-		short maxn=0;
-		// qfrag - number of intervals
-		CPYMEM(qfrag,pch_vms+MAKELONG(pb_vms,qfrag,proccount,QV_SHORT),szl);
-		// maxn - number of levels
-		CPYMEM(maxn,pch_vms+MAKESHORT(pb_vms,maxnlev,rank),szsh);
-		// linter - size of all intervals in bytes
-		CPYMEM(linter,pch_vms+MAKELONG(pb_vms,linter,proccount,QV_SHORT),szl); //all variables on other processors may be not equivalent
-		char *pbuffer=NULL;
-		CPYMEM(pbuffer,pch_vms+MAKEVOID(pb_vms,pbuffer,pbuffer,QV_SHORT,QV_LONG),szv);
-		// length of version, platform and processor name
-		short lvers=0;
-		CPYMEM(lvers,pch_vms+MAKESHORT(pb_vms,lvers,rank),szsh);
-		// different values on each processor 
-		if (lvers<=0) {
-			valid=FALSE;
-			sprintf(texterr,"Incorrect version\n");
-			return;
-		}
-		pvers=new char[lvers];
-		if (pvers==NULL) throw("Out of memory\n");
-		l=gztell(ff);
-		if (gzplus==1) {
-			memcpy(pvers,(char *)(pbufuncompr+sizeof(sz)+lvms+szl*rank),lvers);
-		} else {
-			// read from file platform, version number, processor name and time
-			s=gzread(ff,pvers,lvers);
-			if (s!=lvers) {
-				valid=FALSE;
-				sprintf(texterr,"Can't read from file %s addr=%ld size=%d\n",
-					name,l,lvers);
-				return;
-			}
-		}
-		pbuffer=pbuffer+lvms_add+lvers;
-		unsigned char * pinterinbuff;
-		if (gzplus==1) pinterinbuff=pbufuncompr+lvms_add+lvers;
-		else pinterinbuff=NULL;
-		// processor name
-		char * pprocname=pvers+strlen(pvers)+strlen(pvers+strlen(pvers)+1)+2;
-		double proct=0.;// processor time
-		CPYMEM(proct,pch_vms+MAKEDOUBLE(pb_vms,proctime,proctime,QV_SHORT,QV_LONG,QV_VOID),szd);
-		// create interval tree
-		pclfrag[i]=new CTreeInter(ff,linter,pbuffer,i,qfrag,maxn,
-			pprocname,proct,iIM,jIM,sore,pinterinbuff);
-		if (pclfrag[i]==NULL) throw("Out of memory\n");
-		valid=pclfrag[i]->Valid();
-		if (!valid) {
-			pclfrag[i]->TextErr(texterr);
-			return;
-		}
-		unsigned long lbuf=0;
-		// lbuf - size of buffer
-		CPYMEM(lbuf,pch_vms+MAKELONG(pb_vms,lbuf,proccount,QV_SHORT),szl);
-		// lsynchro - size of synchronyzation times in bytes
-		if (valid_synchro==FALSE) lsynchro=0; // out of memory for synchro operations
-		else CPYMEM(lsynchro,pch_vms+MAKELONG(pb_vms,lsynchro,proccount,QV_SHORT),szl);
-		// set it the first time
-		unsigned char *psynchroinbuff;
-		if (gzplus==1) {
-			psynchroinbuff=lbuf-lsynchro+pbufuncompr;
-			//psynchroinbuff=pinterinbuff+lbuf-lsynchro-linter-lvms_add-lvers;
-		} else {
-			psynchroinbuff=NULL;
-			if (z_off_t zo=gzseek(ff,lbuf-lsynchro-linter-lvms_add-lvers,SEEK_CUR)==-1) {
-				sprintf(texterr,"Can't read from file %s addr=%ld size=%ld\n",
-				name,l,lbuf-lsynchro-linter-lvms_add-lvers);
-				valid=FALSE;
-				return;
-			}
-		}
-		if (lsynchro>0) {
-			l=gztell(ff);
-			// create array of synchronization times
-			try {
-				pclsyn[i]= new CSynchro(ff,lsynchro,psynchroinbuff);
-				if (pclsyn[i]==NULL) throw("Out of memory\n");
-			}
-			catch (bad_alloc e) {
-			    valid_synchro=FALSE;
-			    //lsynchro=0;
-			    for (unsigned int j=0;j<=i;j++) {
-             		if (pclsyn[j]!=NULL) {
-						pclsyn[j]->~CSynchro();
-						pclsyn[j]=NULL;
-					}
-				}
-				sprintf(textwarning[valid_warning],"Out of memory for synchronization operations\n");
-				valid_warning++;
-			}	// end catch
-			catch (char *str) {
-			    valid_synchro=FALSE;
-			    //lsynchro=0;
-			    for (unsigned int j=0;j<=i;j++) {
-             		if (pclsyn[j]!=NULL) {
-						pclsyn[j]->~CSynchro();
-						pclsyn[j]=NULL;
-					}
-				}
-				sprintf(textwarning[valid_warning],"Out of memory for synchronization operations\n");
-				valid_warning++;
-			}	// end catch
-			if (pclsyn[i]!=NULL) {
-				valid=pclsyn[i]->Valid();
-                if (!valid) {
-					pclsyn[i]->TextErr(texterr);
-					return;
-				}
-			} // end if
-		} else {
-			// synchronization times not accumulated
-			pclsyn[i]=0;
-			if (lsynchro >0 && gzplus==0) {
-				if (gzseek(ff,lsynchro,SEEK_CUR)!=0) {
-					valid=FALSE;
-					return;
-				}
-			}
-		}
-		if (gzplus==1) {delete []pbufcompr; pbufcompr=NULL;}
-		if (i!=proccount-1) {
-			if (gzplus==1) {
-				for (int k=0;;k++) {
-					if (gzread(ff,&(lbufplusch[k]),1)!=1) {
-						valid=FALSE;
-						sprintf(texterr,"Can't read from file %s \n",name);
-						return;
-					}
-					if (lbufplusch[k]==0) break;
-				}
-				lbufcompr=atol(lbufplusch);
-				pbufcompr=new unsigned char[lbufcompr];
-				if (pbufcompr==NULL) throw("Out of memory\n");
-				s=gzread(ff,pbufcompr,lbufcompr);
-				if (s!=(int)lbufcompr) {
-					valid=FALSE;
-					sprintf(texterr,"Can't read from file %s l=%ld\n",name,lbufcompr);
-					return;
-				}
-				int err=uncompress(pbufuncompr,&luncomprread,pbufcompr,lbufcompr);
-				if (err!=Z_OK || luncomprread!=lbufuncompr) {
-					valid=FALSE;
-					sprintf(texterr,"Can't uncompress l=%ld\n",lbufcompr);
-					return;
-				}
-			} else {
-				s=gzread(ff,&sz,sizeof(sz));
-				if (s!=sizeof(sz)) {
-					valid=FALSE;
-					sprintf(texterr,"Can't read from file %s addr=%ld size=%d\n",
-					name,l,(int)sizeof(sz));
-					return;
-				}
-				s=gzread(ff,pch_vms,lvms);
-				if (s!=lvms) {
-					valid=FALSE;
-					sprintf(texterr,"Can't read from file %s addr=%ld size=%d\n",
-					name,l,lvms);
-					return;
-				}
-			}
-			CPYMEM(rank,pch_vms+MAKESHORT(pb_vms,rank,rank),szsh);
-			if (gzplus==1) pch_vms=pbufuncompr+sizeof(sz);
-			else {
-				l=gztell(ff);
-				s=gzread(ff,pch_vmssize,szl*rank);
-				if (s!=szl*rank) {
-					valid=FALSE;
-					sprintf(texterr,"Can't read from file %s addr=%ld size=%d\n",
-					name,l,szl*rank);
-					return;
-				}
-				l=gztell(ff);
-				delete [] pvers; pvers=NULL;
-			}
-		}
-	}
-	if (gzplus==1) {delete []pbufuncompr; pbufuncompr=NULL;}
-	pic=new CInter*[proccount];
-	if (pic==NULL) throw("Out of memory\n");
-	// add synchronization times to interval characteristics
-	if (lsynchro>0) {
-		unsigned long n=BeginTreeWalk();
-		while (n!=0) {
-			BOOL b=Synchro();
-			if (b==1) return;
-			n=TreeWalk();
-		}
-		for (i=0;i<proccount;i++) {
-			pclsyn[i]->~CSynchro();
-		}
-	}//lsynchro
-	// sum interval characteristics
-	for (i=0;i<proccount;i++){
-		pclfrag[i]->SumLevel();
-		pclsyn[i]=NULL;
-	}
-		// Idle, Load imbalance
-	unsigned long n=BeginTreeWalk();
-	while (n!=0) {
-		double max=0.0,maxi=0.0;
-		double time,time1;
-		// calculate maximal values
-		for (i=0;i<proccount;i++) {
-			if (pic[i]!=NULL) {
-				pic[i]->ReadTime(EXEC,time);
-				if (time>max) max=time;
-				pic[i]->ReadTime(CPU,time);
-				pic[i]->ReadTime(CPUUSR,time1);
-				if (time+time1>maxi) maxi=time+time1;
-			}
-		}
-		// calculate maximal - current
-		for (i=0;i<proccount;i++) {
-			if (pic[i]!=NULL) {
-				double qproc;
-				pic[i]->ReadTime(PROC,qproc);
-				if (qproc!=n) {
-					// interval execute not on all processors
-					for (i=0;i<proccount;i++) {
-						if (pic[i]!=NULL) {
-							pic[i]->WriteTime(IDLE,0);
-							pic[i]->WriteTime(LOST,0);
-							pic[i]->WriteTime(IMB,0);
-							pic[i]->WriteTime(PROC,0);
-						}
-					}
-					break;
-				} else {
-					pic[i]->ReadTime(EXEC,time);
-					if (max-time>0.0) {
-						pic[i]->AddTime(IDLE,max-time);
-						pic[i]->AddTime(LOST,max-time);
-					}
-					pic[i]->ReadTime(CPU,time);
-					pic[i]->ReadTime(CPUUSR,time1);
-					if (maxi-time-time1>0.0)
-						pic[i]->AddTime(IMB,maxi-time-time1);
-				}
-			}
-		}
-		n=TreeWalk();
-	}
-	if (gzplus!=1) {
-		if (pch_vms!=NULL) {delete [] pch_vms;pch_vms=NULL;}
-	}
-	gzclose(ff);
-}
-//--------------------------------------------------
-// deallocate memory for trees and syn times
-CStatRead::~CStatRead(void)
-{
-	if (pvers!=NULL) delete []pvers;
-	if (gzplus==1) {
-        if (pbufcompr!=NULL) delete []pbufcompr; 
-		if (pbufuncompr!=NULL) delete []pbufuncompr; 
-	} else {
-		if (pch_vms!=NULL) delete [] pch_vms;
-	}
-	if (pclfrag!=NULL) {
-		for (unsigned long i=0;i<proccount;i++) {
-			if (pclfrag[i]!=NULL) pclfrag[i]->~CTreeInter();
-			pclfrag[i]=NULL;
-			if (pic!=NULL) pic[i]=NULL;
-			if (pclsyn!=NULL) {
-				if (pclsyn[i]!=NULL) pclsyn[i]->~CSynchro();
-				pclsyn[i]=NULL;
-			}
-		}
-		delete [] pclfrag;
-	}
-	// deallocate memory for data-member
-	if (pclsyn!=NULL) delete [] pclsyn;
-	if (pch_vmssize!=NULL) delete []pch_vmssize;
-	if (pic!=NULL) delete [] pic;
-}
-//--------------------------------------------------
-// begin tree-walk
-unsigned long CStatRead::BeginTreeWalk(void)
-// return number of intervals
-{
-	unsigned long n=0;
-	for (unsigned long i=0;i<proccount;i++) {
-		pclfrag[i]->BeginInter();
-		pic[i]=NULL;
-	}
-	ident *id;
-	for(curnproc=0;curnproc<proccount;curnproc++) {
-		pclfrag[curnproc]->NextInter(&id);
-		if (id!=NULL) {
-			for (unsigned long j=0;j<proccount;j++) {
-				pic[j]=pclfrag[j]->FindInter(id);
-				if (pic[j]!=NULL) n++;
-			}
-			return(n);
-		}
-	}
-	return(n);
-}
-//------------------------------------------------
-// continue tree-walk
-unsigned long CStatRead::TreeWalk(void)
-// return number of intervals
-{
-	unsigned long n=0;
-	ident *id;
-	pclfrag[curnproc]->NextInter(&id);
-	if (id!=NULL) {
-		for (unsigned long j=0;j<proccount;j++) {
-			pic[j]=pclfrag[j]->FindInter(id);
-			if (pic[j]!=NULL) n++;
-		}
-		if (n!=0)return(n);
-	}
-	for(unsigned long i=curnproc+1;i<proccount;i++) {
-		pclfrag[i]->NextInter(&id);
-		if (id!=NULL) {
-			curnproc=i;
-			for (unsigned long j=0;j<proccount;j++) {
-				pic[j]=pclfrag[j]->FindInter(id);
-				if (pic[j]!=NULL) n++;
-			}
-			return(n);
-		}
-	}
-	return(n);
-}
-//------------------------------------------------
-// calculate synchronization times, variation times and overlap
-BOOL CStatRead::Synchro(void)
-// return 0 - OK
-{
-	unsigned long nint=0;
-	for (unsigned long k=0;k<proccount;k++) {
-		if (pic[k]!=NULL) {
-			// nint - number of current interval 
-			nint=pic[k]->ninter;
-			BOOL b=pclsyn[k]->Count(nint,smallbuff);
-			if (b!=0) {
-				pclsyn[k]->TextErr(texterr);
-				valid=FALSE;
-				return(1);
-			}
-		}
-	}
-	if (nint==0) return(0);
-	for (short i=1;i<=QCOLLECT+QCOLLECT;i++) {
-		if ((i&3)!=0 && (i&3)!=2) { //4 type not used
-			typegrp t1;
-			typecom t2;
-			if (i<=QCOLLECT) {
-				t1=SYN;
-				t2=(typecom)((i)>>2);
-			}else{
-				t1=VAR;
-				t2=(typecom)((i-QCOLLECT)>>2);
-			}
-			int min=INT_MAX;
-			unsigned long j;		
-			for (j=0;j<proccount;j++) {
-				if (pic[j]!=NULL) {
-					// n - number of times in the interval
-					int n=pclsyn[j]->GetCount((typecollect)(i));
-					if (min!=INT_MAX && n!=min && smallbuff==0) {
-						valid=FALSE;
-						sprintf(texterr,
-"Number of synhro or variation times not equivalent on other processors %ld %ld numbers %d %d %\n",j+1,j,n,min);
-						return(1);
-					}
-					if (min>n) min=n;
-				}
-			}
-			if (min!=0) { 
-				// times is accumulated 
-				for ( int k=0; k<min; k++) {
-					double max=0.0;
-					// calculate maximal value
-					for (j=0;j<proccount;j++) {
-						if (pic[j]!=NULL) {
-							double time=pclsyn[j]->Find((typecollect)i);
-							if (time-max>0.0) max=time;
-						}
-					}
-					double maxs=0.0;
-					if (i<QCOLLECT && (i&3)==3) { 
-						// overlap for wait_operation
-						for (j=0;j<proccount;j++) {
-							if (pic[j]!=NULL) {
-								double time=pclsyn[j]->FindNearest
-									((typecollect)(i+QCOLLECT-1)); //Start_operation
-								if (time==0.0 && smallbuff==0) {
-									valid=FALSE;
-sprintf(texterr,"Number of call operations != number of wait operations\n");
-									return(1);
-								}
-								if (time-maxs>0.0) maxs=time;
-							}
-						}
-					} 
-					for (j=0;j<proccount;j++) {
-						if (pic[j]!=NULL) {
-							double time=pclsyn[j]->GetCurr();
-							// write overlap
-							if (maxs>0.0 && time-maxs>0.0 ) {
-								pic[j]->AddTime(OVERLAP,t2,time-maxs);
-							}
-							// write syn and variation times
-							if (max-time>0.0) {
-								pic[j]->AddTime(t1,t2,max-time);
-							}
-						}
-					} 
-				}
-			}
-		}
-	}
-	return(0);
-}
-//------------------------------------------------
-// return result of constructor execution
-BOOL CStatRead::Valid(int *warn)
-{
-	*warn=valid_warning;
-	return(valid);
-}
-//---------------------------------------------------
-// error message
-void CStatRead::TextErr(char *t)
-{
-	strcpy(t,texterr);
-	return;
-}
-// warning message
-//---------------------------------------------------
-// return number of processors
-unsigned long CStatRead::QProc(void)
-{
-	return(proccount);
-}
-//--------------------------------------------
-// size of VMS
-void CStatRead::VMSSize(char *str)
-{
-	str[0]='\0';
-	char n[11];
-	long l=0;
-	for (int i=0;i<rank;i++) {
-		CPYMEM(l,pch_vmssize+i*szl,szl);
-		sprintf(n,"%ld",l);
-		if(i==rank-1) strcat(str,n);
-		else {
-			strcat(str,n);
-			strcat(str,"*");
-		}
-	}
-}
-//-----------------------------------------------
-// warning message
-void CStatRead::WasErrAccum(char *str)
-{
-if (valid_warning==0) str[0]='\0';
-else {
-	strcpy(str,textwarning[valid_warning-1]);
-	valid_warning--;
-}
-return;
-}
-//---------------------------------------------
-// return number of calls of collective operations
-long CStatRead::ReadCall(typecom t)
-{
-	double val=0.0;
-	long calll=0;
-	for (unsigned long i=0;i<proccount;i++) {
-		if (pic[i]!=NULL) {
-			double v;
-			pic[i]->ReadTime(CALL,t,v);
-			val=val+v;
-		}
-	}
-	calll=(long)(val/1);
-	if (val-calll!=0.0) calll++;
-	return(calll);
-}
-//---------------------------------------------
-// identifier information of interval
-// set number of current characteristics =0
-// return number of level
-short CStatRead::ReadTitle(char *str)
-{
-	short nlev=0;
-	ident *id=NULL;
-	// nenter = number of enters / weight
-	double nenter=0.0;
-	for (unsigned long i=0;i<proccount;i++) {
-		if (pic[i]!=NULL) {
-			pic[i]->ReadIdent(&id);
-			nlev=id->nlev;
-			nenter=nenter+id->nenter;
-
-		}
-	}
-	long nent=(long)(nenter/1);
-	if (nenter-nent!=0.0) nent++;
-	char type[10];
-	switch((int)(id->t)) {
-	case REDUC:strcpy(type,"REDUC");
-		break;
-	case SREDUC:strcpy(type,"SREDUC");
-		break;
-	case WREDUC:strcpy(type,"WREDUC");
-		break;
-	case SHAD:strcpy(type,"SHAD");
-		break;
-	case SSHAD:strcpy(type,"SSHAD");
-		break;
-	case WSHAD:strcpy(type,"WSHAD");
-		break;
-	case RACC:strcpy(type,"RACC");
-		break;
-	case SRACC:strcpy(type,"SRACC");
-		break;
-	case WRACC:strcpy(type,"WRACC");
-		break;
-	case REDISTR:strcpy(type,"REDISTR");
-		break;
-	case SREDISTR:strcpy(type,"SREDISTR");
-		break;
-	case WREDISTR:strcpy(type,"WREDISTR");
-		break;
-	case PREFIX:strcpy(type,"PREFIX");
-		break;
-	case SEQ:strcpy(type,"SEQ");
-		break;
-	case PAR: strcpy(type,"PAR");
-		break;
-	case USER: strcpy(type,"USER");
-		break;
-	default: sprintf(str,"Statread ReadTitle:Incorrect type\n");
-		return(0);
-	}
-	if (id->nlev==0) type[0]='\0';
-	if (id->pname==NULL) {
-		if (id->expr==Fic_index) 
-		sprintf(str,"INTERVAL ( NLINE=%ld ) LEVEL=%d %s EXE_COUNT=%ld\n",
-		id->nline,id->nlev,type,nent);
-		else sprintf(str,"INTERVAL ( NLINE=%ld ) LEVEL=%d %s EXE_COUNT=%ld EXPR=%ld\n",
-			id->nline,id->nlev,type,nent,id->expr);
-	}else {
-		if (id->expr==Fic_index) 
-		sprintf(str,"INTERVAL ( NLINE=%ld SOURCE=%s ) LEVEL=%d %s EXE_COUNT=%ld\n",
-		id->nline,id->pname,id->nlev,type,nent);
-		else sprintf(str,"INTERVAL ( NLINE=%ld SOURCE=%s ) LEVEL=%d %s EXE_COUNT=%ld EXPR=%ld\n",
-			id->nline,id->pname,id->nlev,type,nent,id->expr);
-	}
-	curntime=0;
-	return(nlev);
-}
-//--------------------------------------------------------
-// return version number on accumulation
-char *CStatRead::ReadVers(void)
-{  
-	return(pvers);
-}
-//--------------------------------------------------------
-// return platform information on accumulation
-char *CStatRead::ReadPlatform(void)
-{  
-	return(pvers+strlen(pvers)+1);
-}
-//-----------------------------------------------------------
-//name and time of processor
-void CStatRead::NameTimeProc(unsigned long n,char **name,double *time)
-{
-	pclfrag[n]->ReadProcName(name);
-	pclfrag[n]->ReadProcTime(*time);
-	return;
-}
-//-------------------------------------------------------
-// read current time characteristics
-// use after ReadTitle()
-BOOL CStatRead::ReadProc(typeprint t,unsigned long *pnumb,int qnumb,short fmt,
-						 double sum,char *str)
-//t - type of information of characteristics for each processor,
-//pnumb - pointer to array of processor numbers, for which characteristics are to be output,
-//qnumb - number of elements of processor number array,
-//sum - total characteristic value for each processor,
-//str - string where characteristic name and time values are written.
-{
-	int q,prec,lstr;
-	if (t==PRGEN) q=ITER;else q=RED;
-	//char ss[1024];
-	curntime++;
-	if (sum==0.0) {
-		str[0]='\0';
-		if (curntime>q) curntime=0;
-		return(TRUE);
-	}
-	if (t==PRGEN) {
-		sprintf(str,"%s",nameGen[curntime-1]);
-		//sprintf(ss,"%s",nameGen[curntime-1]);
-	} else {
-		// nameCom for VAR,OVERLAP,SYN,COM,RCOM 
-		sprintf(str,"%s",nameCom[curntime-1]);
-		strcat(str,"       ");
-	}
-	lstr=strlen(nameGen[curntime-1]);
-	// list of processor numbers - pnumb
-	// pr=TRUE - number is in list
-	for (unsigned long i=0;i<proccount;i++) {
-		BOOL pr=FALSE;
-		if (pic[i]!=NULL) {
-			if (pnumb!=NULL) {
-				for (int j=0;j<qnumb;j++) {
-					if (i+1>=pnumb[j] && i+1<=pnumb[j+1]) pr=TRUE;
-				}
-			} else pr=TRUE;
-			if (pr==TRUE) {
-				// read time characteristic
-				double time;
-				switch (t) {
-				case PRGEN:
-					pic[i]->ReadTime((typetime)(curntime-1),time);
-					break;
-				case PRCOM:
-					pic[i]->ReadTime(COM,(typecom)(curntime-1),time);
-					break;
-				case PRRCOM:
-					pic[i]->ReadTime(RCOM,(typecom)(curntime-1),time);
-					break;
-				case PRSYN:
-					pic[i]->ReadTime(SYN,(typecom)(curntime-1),time);
-					break;
-				case PRVAR:
-					pic[i]->ReadTime(VAR,(typecom)(curntime-1),time);
-					break;
-				case PROVER:
-					pic[i]->ReadTime(OVERLAP,(typecom)(curntime-1),time);
-					break;
-				default:sprintf(str,"Statread ReadProc:Incorrect type=%d\n",t);
-				return(FALSE);
-				}
-				if ((t==PRGEN) && ((typetime)(curntime-1)==PROC ||
-					(typetime)(curntime-1)==ITER)) prec=0;else prec=PREC;
-				sprintf((str+lstr),"%*.*lf ",fmt,prec,time);
-				//sprintf(ss+lstr,"%*.*lf",fmt,prec,time);
-				lstr=strlen(str);
-			} 
-		}
-	}
-	if (curntime>q) curntime=0;
-	return(TRUE);
-}
-//--------------------------------------------------------
-// calculate min,max,sum time characteristics
-void CStatRead::MinMaxSum(typeprint t,double *min,unsigned long *nprocmin,
-						  double*max,unsigned long *nprocmax,
-						  double *sum)
-// t - characteristic type,
-//min - pointer to array of minimal characteristic values,
-//nprocmin,- pointer to processor number array, corresponding to minimal values,
-//max, - pointer to array of maximal characteristic values,
-//nprocmax, - pointer to processor number array, corresponding to maximal values,
-//sum - pointer to array of total characteristic values.
-{
-	int q;
-	if (t==PRGEN) q=ITER;else q=RED;
-	if (t==PRCALLS || t==PRLOST) q=StatGrpCount-1;
-	int k;
-	for (k=0;k<=q;k++) {
-		min[k]=DBL_MAX;
-		max[k]=0.0;
-		sum[k]=0.0;
-		nprocmin[k]=0;
-		nprocmax[k]=0;
-	}
-	for (unsigned long i=0;i<proccount;i++) {
-		if (pic[i]!=NULL) {
-			for (k=0;k<=q;k++) {
-				double time;
-				// read time characteristic
-				switch (t) {
-				case PRGEN:
-					pic[i]->ReadTime((typetime)k,time);
-					break;
-				case PRCOM:
-					pic[i]->ReadTime(COM,(typecom)k,time);
-					break;
-				case PRRCOM:
-					pic[i]->ReadTime(RCOM,(typecom)k,time);
-					break;
-				case PRSYN:
-					pic[i]->ReadTime(SYN,(typecom)k,time);
-					break;
-				case PRVAR:
-					pic[i]->ReadTime(VAR,(typecom)k,time);
-					break;
-				case PRCALLS:
-					pic[i]->ReadTime(CALLSMT,k,time);
-					break;
-				case PRLOST:
-					pic[i]->ReadTime(LOSTMT,k,time);
-					break;
-				case PROVER:
-					pic[i]->ReadTime(OVERLAP,(typecom)k,time);
-					break;
-				default:
-					valid=FALSE;
-					printf("CStatRead::MinMaxSum Unknown typeprint=%d\n",t);
-					return;
-				}
-				// minimal value
-				if (min[k]>time) {
-					min[k]=time;
-					nprocmin[k]=i+1;
-				}
-				//maximal value
-				if (max[k]<=time) {
-					max[k]=time;
-					nprocmax[k]=i+1;
-				}
-				// sum value
-				sum[k]=sum[k]+time;
-			}
-		}
-
-	}
-}
-//-------------------------------------------------------------------------
-// read grp  characteristics
-void CStatRead::GrpTimes(double *arrprod,double *arrlost,double *arrcalls,int nproc)
-{
-	int q=StatGrpCount-1;
-	int k;
-	for (k=0;k<=q;k++) {
-		arrprod[k]=0.0;
-		arrlost[k]=0.0;
-		arrcalls[k]=0.0;
-	}
-	unsigned long i=nproc-1;
-	//double arr[StatGrpCount];
-	if (pic[i]!=NULL) {
-        for (k=0;k<=q;k++) {
-            // read time characteristic
-			pic[i]->ReadTime(CALLSMT,k,arrcalls[k]);
-			//arrcalls[k]=(int)arr[k];
-			pic[i]->ReadTime(LOSTMT,k,arrlost[k]);
-			pic[i]->ReadTime(PRODMT,k,arrprod[k]);
-		} // end for
-	}// end if 
-	return;
-}
-
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.h
deleted file mode 100644
index 7e2998d..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/statread.h
+++ /dev/null
@@ -1,136 +0,0 @@
-#if !defined( _STATREAD_H )
-#define _STATREAD_H
-#include "potensyn.h"
-#include "inter.h"
-#include "treeinter.h"
-#define Fic_index 2000000000 //interval.h
-#define PREC 4
-#define DIGTIME 6+PREC
-// sizeof(nameOper[i])=DIGTIME
-#define DIGSTAT 5
-
-enum typeprint {PRGEN,PRCOM,PRRCOM,PRSYN,PRVAR,PROVER,PRCALL,PRCALLS,PRLOST};
-static char *nameGen[ITER+1]={
-"Lost time              ",
-"User insufficient par. ",
-"Sys.insufficient par.  ",
-"Idle time              ",
-"Communication          ",
-"Real synchronization   ",
-"Synchronization        ",
-"Variation              ",
-"Overlap                ", 
-"Load imbalance         ",
-"Execution time         ",
-"User CPU time          ",
-"Sys. CPU time          ",
-"I/O time               ",
-"Start operation        ",
-"Processors             "
-};
-static char *nameGenMT[StatGrpCount]={
-"UserGrp                ",
-"MsgPasGrp              ",  
-"StartRedGrp            ",
-"WaitRedGrp             ",
-"RedGrp                 ",
-"StartShdGrp            ",
-"WaitShdGrp             ",
-"ShdGrp                 ",
-"DistrGrp               ",
-"ReDistrGrp             ",
-"MapPLGrp               ",
-"DoPLGrp                ",
-"ProgBlockGrp           ",
-"IOGrp                  ",
-"RemAccessGrp           ",
-"UserDebGrp             ", 
-"StatistGrp             ",
-"SystemGrp              ",
-};
-static char *nameCom[RED+1]={
-"I/O             ",
-"Reduction       ",
-"Shadow          ",
-"Remote access   ",
-"Redistribution  "
-};
-static char *nameOper[SUMOVERLAP-SUMCOM+1]={
-"  Communic",
-" Real_sync",
-"   Synchro",
-" Variation",
-"   Overlap"
-};
-enum tmps {EMP,GNS,ROU,MPI,PVM};
-struct vms_const {
-	short  reverse,szsh,szl,
-		szv,szd;
-};
-struct vms_short {
-	short  rank,maxnlev,
-			 smallbuff,lvers;
-};
-struct vms_long{
-	long proccount,mpstype,ioproc,
-			 qfrag,lbuf,linter,lsynchro;
-};
-struct vms_void{
-	void *pbuffer;
-};
-struct vms_double{
-	double proctime;
-};
-typedef struct tvms{
-        vms_double d;
-        vms_void v;
-        vms_long l;
-	vms_short sh;
-	vms_const chc;
-} pvms;
-#define QV_CONST sizeof(vms_const)/SZSH
-#define QV_SHORT sizeof(vms_short)/SZSH
-#define QV_LONG sizeof(vms_long)/SZL
-#define QV_VOID sizeof(vms_void)/SZV
-#define QV_DOUBLE sizeof(vms_double)/SZD
-class CStatRead {
-public:
-	CStatRead(const char * name,int i,int j,short sore);
-	~CStatRead(void);
-	unsigned long QProc(void);
-	unsigned long BeginTreeWalk(void);
-	unsigned long TreeWalk(void);
-	BOOL Valid(int *warn);
-	void TextErr(char *t);
-	short ReadTitle(char * p);
-	BOOL ReadProc(typeprint t,unsigned long *pnumb,int qnumb,short fmt,double sum,char *str);
-	void MinMaxSum(typeprint t,double *min,unsigned long *nprocmin,
-						  double*max,unsigned long *nprocmax,
-						  double *sum);
-	void GrpTimes(double *arrprod,double *arrlost,double *arrcalls,int nproc);
-	void VMSSize(char *p);
-	void WasErrAccum(char *p);
-	long ReadCall(typecom t);
-	char *ReadVers(void);
-	char *ReadPlatform(void);
-	void NameTimeProc(unsigned long n,char **name,double *time);
-private:
-	unsigned long proccount,curnproc;
-	BOOL valid,valid_synchro;
-	short rank;
-	unsigned char *pch_vmssize,*pch_vms;
-	short maxnlevel;
-	char texterr[80];
-	char textwarning[3][80];
-	int valid_warning;
-	CTreeInter **pclfrag;
-	CSynchro **pclsyn;
-	short smallbuff;
-	CInter **pic;
-	int nf,curntime;
-	char *pvers;
-	unsigned char *pbufcompr,*pbufuncompr;
-	short gzplus; // sign of file gz/ gz+
-	BOOL Synchro(void);
-	};
-#endif
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/strall.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/strall.h
deleted file mode 100644
index 37cc647..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/strall.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#if !defined( __STRALL_H )
-#define __STRALL_H
-#if defined (_STATFILE_)
-#include "sysstat.h"
-#endif
-#define SZSH sizeof(short)
-#define SZL sizeof(long)
-#define SZINT sizeof(int)
-#define SZD sizeof(double)
-#define SZV sizeof(void*)
-enum typecollect {INOUT=1,SINOUT,WINOUT,NINOUT,REDUC,SREDUC,WREDUC,NREDUC,
-SHAD,SSHAD,WSHAD,NSHAD,RACC,SRACC,WRACC,NRACC,REDISTR,SREDISTR,WREDISTR,
-NREDISTR}; /* new operation insert before REDISTR */
-#define QCOLLECT NREDISTR  /* 4 type for 5 collective operation */
-
-enum typefrag {PREFIX=QCOLLECT,SEQ,PAR,USER};
-#if !defined (_STATFILE_)
-struct vms_const {
-	unsigned char  reverse[2],szsh[2],szl[2],
-		szv[2],szd[2];
-};
-struct vms_short {
-	unsigned char  rank[SZSH],maxnlev[SZSH],
-			 smallbuff[SZSH],lvers[SZSH];
-};
-struct vms_long{
-	unsigned char proccount[SZL],mpstype[SZL],ioproc[SZL],
-			 qfrag[SZL],lbuf[SZL],linter[SZL],lsynchro[SZL];
-};
-struct vms_void{
-	unsigned char pbuffer[SZV];
-};
-struct vms_double{
-	unsigned char proctime[SZD];
-};
-/* if change here chahge statread.h */
-typedef struct tvms_ch {
-	struct vms_const shc;
-	struct vms_short sh;
-	struct vms_long l;
-	struct vms_void v;
-	struct vms_double d;
-} *pvms_ch;
-
-struct inter_short {
-	unsigned char nlev[SZSH],type[SZSH];
-};
-struct inter_long {
-	unsigned char nline[SZL],nline_end[SZL],valvar[SZL],qproc[SZL],
-		ninter[SZL],SendCallCount[SZL],RecvCallCount[SZL];
-};
-struct inter_void{
-	unsigned char up[SZV],next[SZV],down[SZV],
-        ptimes[SZV];
-};
-struct inter_double{
-	unsigned char nenter[SZD],SendCallTime[SZD],MinSendCallTime[SZD],
-	MaxSendCallTime[SZD],RecvCallTime[SZD],MinRecvCallTime[SZD],
-	MaxRecvCallTime[SZD],
-	times[3*StatGrpCount*StatGrpCount][SZD];
-};
-/* if change here change treeinter.h*/
-typedef struct tinter_ch {
-	struct inter_short sh;
-	struct inter_long l;
-	struct inter_void v;
-	struct inter_double d;		
-}*pinter_ch;
-struct syn_short{
-	unsigned char nitem[SZSH];
-};
-struct syn_long{
-	unsigned char ninter[SZL];
-};
-struct syn_void{
-	unsigned char pgrp[SZV];
-};
-struct syn_double{
-	unsigned char time[SZD];
-};
-/* if change here change potensyn.h*/
-typedef struct tsyn_ch {
-       struct syn_short sh;
-	   struct syn_long l;
-	   struct syn_void v;
-	   struct syn_double d;
-}*psyn_ch;
-#define CPYMEM(to,from)\
- memcpy(&(to),&(from),sizeof(to));
-#define CPYMEMC(to,from)\
-	smfrom=0;\
-        stcond = sizeof(from)>sizeof(to);\
-	if (stcond && toright==1) smfrom=sizeof(from)-sizeof(to);\
-	memcpy(&(to),(unsigned char *)(&(from))+smfrom,sizeof(to));
-#else
-#define min(a,b) (((a) <(b)) ? (a):(b))
-#define MAKESHORT(p,nm,nmfirst)\
-	(&(p->sh.nm)-&(p->sh.nmfirst))*szsh
-#define MAKELONG(p,nm,nmfirst,q_short)\
-	q_short*szsh+(&(p->l.nm)-&(p->l.nmfirst))*szl
-#define MAKEVOID(p,nm,nmfirst,q_short,q_long)\
-	q_short*szsh+q_long*szl+(&(p->v.nm)-&(p->v.nmfirst))*szv
-#define MAKEDOUBLE(p,nm,nmfirst,q_short,q_long,q_void)\
-	q_short*szsh+q_long*szl+q_void*szv+(&(p->d.nm)-&(p->d.nmfirst))*szd
-#define MAKEDOUBLEA(p,nm,nmfirst,q_short,q_long,q_void,a)\
-	a=q_short*szsh+q_long*szl+q_void*szv+(&(p->d.nm)-&(p->d.nmfirst))*szd;
-	
-#define CPYMEM(to,pfrom,sz_var)\
-{\
-	int sz_to;\
-	int smfrom=0,smto=0,mmin;\
-	sz_to=sizeof(to);\
-	mmin=min(sz_to,sz_var);\
-	if (sz_to!=sz_var) {\
-		if (sz_to>sz_var) {\
-			if (torightto==1)	smto=sz_to-sz_var;\
-		} else {\
-			if (torightfrom==1) smfrom=sz_var-sz_to;\
-		}\
-	}\
-	if (reverse!=1) {\
-		memcpy((unsigned char *)(&(to))+smto,pfrom+smfrom,mmin);\
-	} else {\
-		int imcpy;\
-		for (imcpy=mmin-1;imcpy>=0;imcpy--) {\
-			*((unsigned char*)(&(to))+imcpy+smto)=\
-				*(pfrom+smfrom+mmin-1-imcpy);\
-		}\
-	}\
-}
-#endif
-#endif
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/sysstat.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/sysstat.h
deleted file mode 100644
index 4039415..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/sysstat.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _SYSSTAT_H
-#define _SYSSTAT_H
-typedef struct {
-	double  CallCount; 
-	double  ProductTime;
-	double  LostTime;
-}s_GRPTIMES;
-
-#define StatGrpCount 18
-#define UserGrp       0 
-#define MsgPasGrp     1  
-#define StartRedGrp   2  
-#define WaitRedGrp    3  
-#define RedGrp        4  
-#define StartShdGrp   5  
-#define WaitShdGrp    6  
-#define ShdGrp        7  
-#define DistrGrp      8  
-#define ReDistrGrp    9  
-#define MapPLGrp     10  
-#define DoPLGrp      11  
-#define ProgBlockGrp 12  
-#define IOGrp        13  
-#define RemAccessGrp 14  
-#define UserDebGrp   15  
-#define StatistGrp   16  
-#define SystemGrp    17  
-
-#endif
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.cpp b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.cpp
deleted file mode 100644
index 84fbf1e..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-#define _STATFILE_
-#include "treeinter.h"
-#include <stdio.h>
-#include <string.h>
-extern short reverse,szsh,szd,szv,szl,torightto,torightfrom;
-// list of intervals for each processor
-CTreeInter::CTreeInter(gzFile stream,unsigned long lint,char *pbuff,
-					   unsigned int n,unsigned long qint,short maxn,
-					   char * ppn,double proct,
-					   int iIM,int jIM,short sore,
-					   unsigned char *pbuffer)
-// stream-file descriptor pointer,
-//lint- information length in bytes,
-// pbuff - beginning of the buffer at the collection stage,
-//n - processor number,
-//qint - number of intervals
-//maxn - maximal nesting level
-// ppn - processor name
-// proct - processor time
-//iIm- 0/1 sign of summing on index i
-//jIM-0/1 sign of summing on index j
-//sore - sign of summing or elements print
-//pbuffer - file gz+,data have been read
-{
-	valid=TRUE;
-	nproc=n;
-	qinter=qint;
-	maxnlev=maxn;
-	curninter=1;
-	pt=NULL;
-	pprocname=NULL;
-	sign_buffer=NULL;
-	unsigned char *buffer;
-	if (ppn!=NULL) {// processor name
-		pprocname=new char[strlen(ppn)+1];
-		if (pprocname==NULL) throw("Out of memory\n");
-		strcpy(pprocname,ppn);
-	}
-	proctime=proct;
-	// dynamically allocate memory for intervals of struct tinter_ch
-	if (pbuffer==NULL) { //data had not been read
-		buffer=new unsigned char[lint];
-		if (buffer==NULL) throw("Out of memory\n");
-		sign_buffer=buffer;
-		long l=gztell(stream);
-		// read interval information from file
-		int s=gzread(stream,buffer,lint);
-		if ((unsigned long)s!=lint) {
-			valid=FALSE;
-			sprintf(texterr,"Can't read intervals from file, addr=%ld, length=%ld\n",
-			l,lint);
-			delete []sign_buffer;
-			sign_buffer=NULL;
-			return;
-		}
-	} else buffer=pbuffer;
-	unsigned char *pch=buffer;
-	pinter *pi=NULL;
-	// allocate memory for intervals of struct ttree
-	pt=new ptree[qinter];
-	if (pt==NULL) throw("Out of memory\n");
-	ident id;
-	// calculate size of interval without name of DVM-programm
-	int lintone=QI_SHORT*szsh+QI_LONG*szl+QI_VOID*szv+QI_DOUBLE*szd;
-	s_GRPTIMES times[StatGrpCount][StatGrpCount];
-	int a=MAKEDOUBLE(pi,times[0],nenter,QI_SHORT,QI_LONG,QI_VOID);
-	a=MAKELONG(pi,nline,nline,QI_SHORT);
-	for (unsigned long ll=0;ll<qinter;ll++) {
-		int lt=0;
-		// copy time characteristics from file
-		for (int i=0;i<StatGrpCount;i++) {
-			for (int j=0;j<StatGrpCount;j++) {
-                                times[i][j].CallCount=0.0; times[i][j].ProductTime=0.0; times[i][j].LostTime=0.0;  
-				CPYMEM(times[i][j].CallCount,
-					pch+MAKEDOUBLE(pi,times[lt],nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-				CPYMEM(times[i][j].ProductTime,
-					pch+MAKEDOUBLE(pi,times[lt+1],nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-				CPYMEM(times[i][j].LostTime,
-					pch+MAKEDOUBLE(pi,times[lt+2],nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-				lt=lt+3;
-			}
-		}
-		// add information to interval matrix
-		s_SendRecvTimes addinfo;
-                addinfo.SendCallTime=0.0;
-                addinfo.MinSendCallTime=0.0;
-		addinfo.MaxSendCallTime=0.0;
-                addinfo.SendCallCount=0;
-                addinfo.RecvCallTime=0.0;
-                addinfo.MinRecvCallTime=0.0;
-                addinfo.MaxRecvCallTime=0.0;
-                addinfo.RecvCallCount=0;
-		CPYMEM(addinfo.SendCallTime,pch+MAKEDOUBLE(pi,SendCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.MinSendCallTime,pch+MAKEDOUBLE(pi,MinSendCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.MaxSendCallTime,pch+MAKEDOUBLE(pi,MaxSendCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.SendCallCount,pch+MAKELONG(pi,SendCallCount,nline,QI_SHORT),szl);
-		CPYMEM(addinfo.RecvCallTime,pch+MAKEDOUBLE(pi,RecvCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.MinRecvCallTime,pch+MAKEDOUBLE(pi,MinRecvCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.MaxRecvCallTime,pch+MAKEDOUBLE(pi,MaxRecvCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.RecvCallCount,pch+MAKELONG(pi,RecvCallCount,nline,QI_SHORT),szl);
-		id.pname=(char *)(pch+lintone);
-		// copy identifier information
-                id.nline=0; id.nline_end=0; id.proc=0;id.nenter=0,0; id.expr=0;id.nlev=0;
-		CPYMEM(id.nline,pch+MAKELONG(pi,nline,nline,QI_SHORT),szl);
-                CPYMEM(id.nline_end,pch+MAKELONG(pi,nline_end,nline,QI_SHORT),szl);
-		CPYMEM(id.proc,pch+MAKELONG(pi,qproc,nline,QI_SHORT),szl);
-		CPYMEM(id.nlev,pch+MAKESHORT(pi,nlev,nlev),szsh);
-		CPYMEM(id.expr,pch+MAKELONG(pi,expr,nline,QI_SHORT),szl);
-		CPYMEM(id.nenter,pch+MAKEDOUBLE(pi,nenter,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		short sh=0;
-		CPYMEM(sh,pch+MAKESHORT(pi,type,nlev),szsh);
-		id.t=(typefrag)sh;
-		unsigned char *pptr=NULL;
-		unsigned long l0=0;
-		// copy referenses on up, down and next intervals
-		CPYMEM(pptr,pch+MAKEVOID(pi,up,up,QI_SHORT,QI_LONG),szv);
-		if (pptr==NULL) {memcpy(&pt[ll].up,&l0,sizeof(l0));
-		} else {
-			long l=(char*)pptr-pbuff;
-			pptr=buffer+l;
-                        pt[ll].up=0;  
-			CPYMEM(pt[ll].up,pptr+MAKELONG(pi,ninter,nline,QI_SHORT),szl);
-		}
-                pptr=NULL;
-		CPYMEM(pptr,pch+MAKEVOID(pi,down,up,QI_SHORT,QI_LONG),szv);
-		if (pptr==NULL) {memcpy(&pt[ll].down,&l0,sizeof(l0));
-		} else {
-			long l=(char*)pptr-pbuff;
-			pptr=buffer+l;
-                        pt[ll].down=0;
-			CPYMEM(pt[ll].down,pptr+MAKELONG(pi,ninter,nline,QI_SHORT),szl);
-		}
-                pptr=NULL;
-		CPYMEM(pptr,pch+MAKEVOID(pi,next,up,QI_SHORT,QI_LONG),szv);
-		if (pptr==NULL) {memcpy(&pt[ll].next,&l0,sizeof(l0));
-		} else {
-			long l=(char *)pptr-pbuff;
-			pptr=buffer+l;
-			pt[ll].next=0;
-			CPYMEM(pt[ll].next,pptr+MAKELONG(pi,ninter,nline,QI_SHORT),szl);
-		}
-		// time characteristics for each interval
-		pt[ll].pint=new CInter(times,addinfo,id,ll+1,iIM,jIM,sore);
-		if (pt[ll].pint==NULL) throw("Out of memory\n");
-		pch=pch+lintone+1+strlen((char*)(pch+lintone));
-	}
-	if (sign_buffer!=NULL) {delete []sign_buffer; sign_buffer=NULL;}
-	return;
-}
-//----------------------------------------
-//return result of constructor execution
-BOOL CTreeInter::Valid()
-{
-	return(valid);
-}
-//-------------------------------------------
-// error message
-void CTreeInter::TextErr(char *p)
-{
-	strcpy(p,texterr);
-}
-
-//-------------------------------------------------
-//set current interval at the first interval
-void CTreeInter::BeginInter(void)
-{
-	for (unsigned long i=0;i<qinter;i++) {
-		pt[i].sign=0;
-	}
-	curninter=1;
-	return;
-}
-//--------------------------------------------------
-//read identifier information of current interval
-void CTreeInter::NextInter(ident **id)
-{
-	*id=NULL;
-	for (unsigned long i=curninter;i<=qinter;i++) {
-		if (pt[i-1].sign==0) {
-			pt[i-1].sign=1;
-			curninter=i;
-			CInter *p=pt[i-1].pint;
-			p->ReadIdent(id);
-			return;
-		}
-	}
-	return;
-	
-}
-//------------------------------------------------
-// return pointer to interval with the same identifier information
-// set current interval
-CInter *CTreeInter::FindInter(ident *id)
-//id - identifier information
-{
-	unsigned long n;
-	ident *idcur;
-	pt[curninter-1].pint->ReadIdent(&idcur);
-	if (id==idcur) return(pt[curninter-1].pint); //the same processor
-	if (id->nlev==idcur->nlev) { // the same level
-		n=pt[curninter-1].up;
-		if (n>0) n=pt[n-1].down;
-		else n=curninter;// first interval 
-		while(n>0) {
-			if (pt[n-1].sign==0 && pt[n-1].pint->CompIdent(id)==1) {
-				pt[n-1].sign=1;
-				curninter=n;
-				return(pt[n-1].pint);
-			}
-			n=pt[n-1].next;
-		}
-		return(NULL);
-	}
-	// need level > current level
-	n=curninter;
-	if (id->nlev>idcur->nlev) {
-		// find need down level
-		while (id->nlev>idcur->nlev) {
-			n=pt[n-1].down;
-			if (n==0) return(NULL);
-			pt[n-1].pint->ReadIdent(&idcur);
-		}
-		// find need interval on finded level
-		while(n>0) {
-			if (pt[n-1].sign==0 && pt[n-1].pint->CompIdent(id)==1) {
-				pt[n-1].sign=1;
-				curninter=n;
-				return(pt[n-1].pint);
-			}
-			n=pt[n-1].next;
-		}
-		return(NULL);
-	} else {
-		// find need up level
-		while (id->nlev<idcur->nlev) {
-			n=pt[n-1].up;
-			if (n==0) return(NULL);
-			pt[n-1].pint->ReadIdent(&idcur);
-		}
-		unsigned long n1=n;
-		n=pt[n-1].up;
-		if (n>0) n=pt[n-1].down;else n=n1;
-		while(n>0) {
-			if (pt[n-1].sign==0 && pt[n-1].pint->CompIdent(id)==1) {
-				pt[n-1].sign=1;
-				curninter=n;
-				return(pt[n-1].pint);
-			}
-			n=pt[n-1].next;
-		}
-	}
-	return(NULL);
-}
-//--------------------------------------------------
-//sum time characteristics  
-void CTreeInter::SumLevel(void)
-{
-	for (short i=maxnlev;i>0;i--) {
-		for (unsigned long j=0;j<qinter;j++) {
-			ident *id;
-			pt[j].pint->ReadIdent(&id);
-			if (id->nlev==i) {
-				// psum - up level
-				unsigned long up=pt[j].up;
-				CInter *psum=pt[up-1].pint;
-				pt[j].pint->SumInter(psum);
-			}
-		}
-	}
-	pt[0].pint->SumInter(NULL);
-}
-//---------------------------------------------------
-//processor time
-void CTreeInter::ReadProcTime(double &time)
-{
-	time=proctime;
-}
-//---------------------------------------------------
-//processor name
-void CTreeInter::ReadProcName(char **name)
-{
-	*name=pprocname;
-}
-//--------------------------------------------------
-// deallocate memory for tree interval
-CTreeInter::~CTreeInter()
-{
-	if (pprocname!=NULL) delete []pprocname;
-	if (sign_buffer!=NULL) delete []sign_buffer;
-	if (pt==NULL) return;
-	for (unsigned long i=0;i<qinter;i++) {
-		if (pt[i].pint!=NULL) pt[i].pint->~CInter();
-		pt[i].pint=NULL;
-	}
-	 delete []pt;
-}
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.h
deleted file mode 100644
index 642e961..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/treeinter.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef _TREEINTER_H
-#define _TREEINTER_H
-#include "zlib.h"
-#include "inter.h"
-#include "strall.h"
-#include "stdio.h"
-#include "bool.h"
-typedef struct ttree{
-	unsigned long up,next,down;
-	int sign;
-	CInter *pint;
-} ptree;
-struct inter_short{
-	short nlev,type;
-};
-struct inter_long{
-	unsigned long nline,nline_end,expr,qproc,ninter,SendCallCount,RecvCallCount;
-};
-struct inter_void{
-	void *up,*next,*down,*ptimes;
-};
-struct inter_double{
-	double nenter,SendCallTime,MinSendCallTime,
-	MaxSendCallTime,RecvCallTime,MinRecvCallTime,
-	MaxRecvCallTime,
-	times[3*StatGrpCount*StatGrpCount];
-};
-typedef struct tinter {
-        inter_double d;
-        inter_void v;
-        inter_long l;
-	inter_short sh;
-}pinter;
-#define QI_SHORT sizeof(inter_short)/SZSH
-#define QI_LONG sizeof(inter_long)/SZL
-#define QI_VOID sizeof(inter_void)/SZV
-#define QI_DOUBLE sizeof(inter_double)/SZD
-class CTreeInter {
-public:
-	CTreeInter(gzFile stream,unsigned long lint,char* pbuf,unsigned int n,
-		unsigned long qfrag,short maxn,char * ppn,double proct,int i,int j,short sore,unsigned char *pbuffer);
-	~CTreeInter();
-	BOOL Valid();
-	void TextErr(char *t);
-	void BeginInter(void);
-	void NextInter(ident **p);
-	CInter *FindInter(ident *id);
-	void SumLevel(void);
-	void ReadProcTime(double &time);
-	void ReadProcName(char **name);
-	ptree (*pt);
-protected:
-	unsigned int nproc;
-	unsigned long qinter;
-	unsigned long curninter;
-	short maxnlev;
-	BOOL valid;
-	char texterr[80];
-	char *pprocname;
-	unsigned char * sign_buffer;
-	double proctime;
-};
-#endif
diff --git a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/ver.h b/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/ver.h
deleted file mode 100644
index 8eefc89..0000000
--- a/projects/dvm_svn/tools/pppa/branches/dvm4.07/src/ver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef VER_H
-#define VER_H
-
-#define  VER_PPPA "Analyzer 2.6,(c) 02.02.2010"
-#define  RTS_VERSION "RTS VERSION = 2871"
-
-#endif
-
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
deleted file mode 100644
index 962676d..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/deflate.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/* deflate.h -- internal compression state
- * Copyright (C) 1995-1998 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef _DEFLATE_H
-#define _DEFLATE_H
-
-#include "zutil.h"
-
-/* ===========================================================================
- * Internal compression state.
- */
-
-#define LENGTH_CODES 29
-/* number of length codes, not counting the special END_BLOCK code */
-
-#define LITERALS  256
-/* number of literal bytes 0..255 */
-
-#define L_CODES (LITERALS+1+LENGTH_CODES)
-/* number of Literal or Length codes, including the END_BLOCK code */
-
-#define D_CODES   30
-/* number of distance codes */
-
-#define BL_CODES  19
-/* number of codes used to transfer the bit lengths */
-
-#define HEAP_SIZE (2*L_CODES+1)
-/* maximum heap size */
-
-#define MAX_BITS 15
-/* All codes must not exceed MAX_BITS bits */
-
-#define INIT_STATE    42
-#define BUSY_STATE   113
-#define FINISH_STATE 666
-/* Stream status */
-
-
-/* Data structure describing a single value and its code string. */
-typedef struct ct_data_s {
-    union {
-        ush  freq;       /* frequency count */
-        ush  code;       /* bit string */
-    } fc;
-    union {
-        ush  dad;        /* father node in Huffman tree */
-        ush  len;        /* length of bit string */
-    } dl;
-} FAR ct_data;
-
-#define Freq fc.freq
-#define Code fc.code
-#define Dad  dl.dad
-#define Len  dl.len
-
-typedef struct static_tree_desc_s  static_tree_desc;
-
-typedef struct tree_desc_s {
-    ct_data *dyn_tree;           /* the dynamic tree */
-    int     max_code;            /* largest code with non zero frequency */
-    static_tree_desc *stat_desc; /* the corresponding static tree */
-} FAR tree_desc;
-
-typedef ush Pos;
-typedef Pos FAR Posf;
-typedef unsigned IPos;
-
-/* A Pos is an index in the character window. We use short instead of int to
- * save space in the various tables. IPos is used only for parameter passing.
- */
-
-typedef struct internal_state {
-    z_streamp strm;      /* pointer back to this zlib stream */
-    int   status;        /* as the name implies */
-    Bytef *pending_buf;  /* output still pending */
-    ulg   pending_buf_size; /* size of pending_buf */
-    Bytef *pending_out;  /* next pending byte to output to the stream */
-    int   pending;       /* nb of bytes in the pending buffer */
-    int   noheader;      /* suppress zlib header and adler32 */
-    Byte  data_type;     /* UNKNOWN, BINARY or ASCII */
-    Byte  method;        /* STORED (for zip only) or DEFLATED */
-    int   last_flush;    /* value of flush param for previous deflate call */
-
-                /* used by deflate.c: */
-
-    uInt  w_size;        /* LZ77 window size (32K by default) */
-    uInt  w_bits;        /* log2(w_size)  (8..16) */
-    uInt  w_mask;        /* w_size - 1 */
-
-    Bytef *window;
-    /* Sliding window. Input bytes are read into the second half of the window,
-     * and move to the first half later to keep a dictionary of at least wSize
-     * bytes. With this organization, matches are limited to a distance of
-     * wSize-MAX_MATCH bytes, but this ensures that IO is always
-     * performed with a length multiple of the block size. Also, it limits
-     * the window size to 64K, which is quite useful on MSDOS.
-     * To do: use the user input buffer as sliding window.
-     */
-
-    ulg window_size;
-    /* Actual size of window: 2*wSize, except when the user input buffer
-     * is directly used as sliding window.
-     */
-
-    Posf *prev;
-    /* Link to older string with same hash index. To limit the size of this
-     * array to 64K, this link is maintained only for the last 32K strings.
-     * An index in this array is thus a window index modulo 32K.
-     */
-
-    Posf *head; /* Heads of the hash chains or NIL. */
-
-    uInt  ins_h;          /* hash index of string to be inserted */
-    uInt  hash_size;      /* number of elements in hash table */
-    uInt  hash_bits;      /* log2(hash_size) */
-    uInt  hash_mask;      /* hash_size-1 */
-
-    uInt  hash_shift;
-    /* Number of bits by which ins_h must be shifted at each input
-     * step. It must be such that after MIN_MATCH steps, the oldest
-     * byte no longer takes part in the hash key, that is:
-     *   hash_shift * MIN_MATCH >= hash_bits
-     */
-
-    long block_start;
-    /* Window position at the beginning of the current output block. Gets
-     * negative when the window is moved backwards.
-     */
-
-    uInt match_length;           /* length of best match */
-    IPos prev_match;             /* previous match */
-    int match_available;         /* set if previous match exists */
-    uInt strstart;               /* start of string to insert */
-    uInt match_start;            /* start of matching string */
-    uInt lookahead;              /* number of valid bytes ahead in window */
-
-    uInt prev_length;
-    /* Length of the best match at previous step. Matches not greater than this
-     * are discarded. This is used in the lazy match evaluation.
-     */
-
-    uInt max_chain_length;
-    /* To speed up deflation, hash chains are never searched beyond this
-     * length.  A higher limit improves compression ratio but degrades the
-     * speed.
-     */
-
-    uInt max_lazy_match;
-    /* Attempt to find a better match only when the current match is strictly
-     * smaller than this value. This mechanism is used only for compression
-     * levels >= 4.
-     */
-#   define max_insert_length  max_lazy_match
-    /* Insert new strings in the hash table only if the match length is not
-     * greater than this length. This saves time but degrades compression.
-     * max_insert_length is used only for compression levels <= 3.
-     */
-
-    int level;    /* compression level (1..9) */
-    int strategy; /* favor or force Huffman coding*/
-
-    uInt good_match;
-    /* Use a faster search when the previous match is longer than this */
-
-    int nice_match; /* Stop searching when current match exceeds this */
-
-                /* used by trees.c: */
-    /* Didn't use ct_data typedef below to supress compiler warning */
-    struct ct_data_s dyn_ltree[HEAP_SIZE];   /* literal and length tree */
-    struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
-    struct ct_data_s bl_tree[2*BL_CODES+1];  /* Huffman tree for bit lengths */
-
-    struct tree_desc_s l_desc;               /* desc. for literal tree */
-    struct tree_desc_s d_desc;               /* desc. for distance tree */
-    struct tree_desc_s bl_desc;              /* desc. for bit length tree */
-
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    int heap[2*L_CODES+1];      /* heap used to build the Huffman trees */
-    int heap_len;               /* number of elements in the heap */
-    int heap_max;               /* element of largest frequency */
-    /* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used.
-     * The same heap array is used to build all trees.
-     */
-
-    uch depth[2*L_CODES+1];
-    /* Depth of each subtree used as tie breaker for trees of equal frequency
-     */
-
-    uchf *l_buf;          /* buffer for literals or lengths */
-
-    uInt  lit_bufsize;
-    /* Size of match buffer for literals/lengths.  There are 4 reasons for
-     * limiting lit_bufsize to 64K:
-     *   - frequencies can be kept in 16 bit counters
-     *   - if compression is not successful for the first block, all input
-     *     data is still in the window so we can still emit a stored block even
-     *     when input comes from standard input.  (This can also be done for
-     *     all blocks if lit_bufsize is not greater than 32K.)
-     *   - if compression is not successful for a file smaller than 64K, we can
-     *     even emit a stored file instead of a stored block (saving 5 bytes).
-     *     This is applicable only for zip (not gzip or zlib).
-     *   - creating new Huffman trees less frequently may not provide fast
-     *     adaptation to changes in the input data statistics. (Take for
-     *     example a binary file with poorly compressible code followed by
-     *     a highly compressible string table.) Smaller buffer sizes give
-     *     fast adaptation but have of course the overhead of transmitting
-     *     trees more frequently.
-     *   - I can't count above 4
-     */
-
-    uInt last_lit;      /* running index in l_buf */
-
-    ushf *d_buf;
-    /* Buffer for distances. To simplify the code, d_buf and l_buf have
-     * the same number of elements. To use different lengths, an extra flag
-     * array would be necessary.
-     */
-
-    ulg opt_len;        /* bit length of current block with optimal trees */
-    ulg static_len;     /* bit length of current block with static trees */
-    uInt matches;       /* number of string matches in current block */
-    int last_eob_len;   /* bit length of EOB code for last block */
-
-#ifdef DEBUG
-    ulg compressed_len; /* total bit length of compressed file mod 2^32 */
-    ulg bits_sent;      /* bit length of compressed data sent mod 2^32 */
-#endif
-
-    ush bi_buf;
-    /* Output buffer. bits are inserted starting at the bottom (least
-     * significant bits).
-     */
-    int bi_valid;
-    /* Number of valid bits in bi_buf.  All bits above the last valid bit
-     * are always zero.
-     */
-
-} FAR deflate_state;
-
-/* Output a byte on the stream.
- * IN assertion: there is enough room in pending_buf.
- */
-#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);}
-
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-#define MAX_DIST(s)  ((s)->w_size-MIN_LOOKAHEAD)
-/* In order to simplify the code, particularly on 16 bit machines, match
- * distances are limited to MAX_DIST instead of WSIZE.
- */
-
-        /* in trees.c */
-void _tr_init         OF((deflate_state *s));
-int  _tr_tally        OF((deflate_state *s, unsigned dist, unsigned lc));
-void _tr_flush_block  OF((deflate_state *s, charf *buf, ulg stored_len,
-			  int eof));
-void _tr_align        OF((deflate_state *s));
-void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
-                          int eof));
-
-#define d_code(dist) \
-   ((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)])
-/* Mapping from a distance to a distance code. dist is the distance - 1 and
- * must not have side effects. _dist_code[256] and _dist_code[257] are never
- * used.
- */
-
-#ifndef DEBUG
-/* Inline versions of _tr_tally for speed: */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-  extern uch _length_code[];
-  extern uch _dist_code[];
-#else
-  extern const uch _length_code[];
-  extern const uch _dist_code[];
-#endif
-
-# define _tr_tally_lit(s, c, flush) \
-  { uch cc = (c); \
-    s->d_buf[s->last_lit] = 0; \
-    s->l_buf[s->last_lit++] = cc; \
-    s->dyn_ltree[cc].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-   }
-# define _tr_tally_dist(s, distance, length, flush) \
-  { uch len = (length); \
-    ush dist = (distance); \
-    s->d_buf[s->last_lit] = dist; \
-    s->l_buf[s->last_lit++] = len; \
-    dist--; \
-    s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \
-    s->dyn_dtree[d_code(dist)].Freq++; \
-    flush = (s->last_lit == s->lit_bufsize-1); \
-  }
-#else
-# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c)
-# define _tr_tally_dist(s, distance, length, flush) \
-              flush = _tr_tally(s, distance, length) 
-#endif
-
-#endif
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
deleted file mode 100644
index bd25c80..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infblock.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* infblock.h -- header to use infblock.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-struct inflate_blocks_state;
-typedef struct inflate_blocks_state FAR inflate_blocks_statef;
-
-extern inflate_blocks_statef * inflate_blocks_new OF((
-    z_streamp z,
-    check_func c,               /* check function */
-    uInt w));                   /* window size */
-
-extern int inflate_blocks OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));                      /* initial return code */
-
-extern void inflate_blocks_reset OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    uLongf *));                  /* check value on output */
-
-extern int inflate_blocks_free OF((
-    inflate_blocks_statef *,
-    z_streamp));
-
-extern void inflate_set_dictionary OF((
-    inflate_blocks_statef *s,
-    const Bytef *d,  /* dictionary */
-    uInt  n));       /* dictionary length */
-
-extern int inflate_blocks_sync_point OF((
-    inflate_blocks_statef *s));
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
deleted file mode 100644
index 6c750d8..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infcodes.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* infcodes.h -- header to use infcodes.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-struct inflate_codes_state;
-typedef struct inflate_codes_state FAR inflate_codes_statef;
-
-extern inflate_codes_statef *inflate_codes_new OF((
-    uInt, uInt,
-    inflate_huft *, inflate_huft *,
-    z_streamp ));
-
-extern int inflate_codes OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-extern void inflate_codes_free OF((
-    inflate_codes_statef *,
-    z_streamp ));
-
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
deleted file mode 100644
index 8facec5..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffast.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* inffast.h -- header to use inffast.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-extern int inflate_fast OF((
-    uInt,
-    uInt,
-    inflate_huft *,
-    inflate_huft *,
-    inflate_blocks_statef *,
-    z_streamp ));
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
deleted file mode 100644
index 77f7e76..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inffixed.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* inffixed.h -- table for decoding fixed codes
- * Generated automatically by the maketree.c program
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-local uInt fixed_bl = 9;
-local uInt fixed_bd = 5;
-local inflate_huft fixed_tl[] = {
-    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},224},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},144},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},208},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},176},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},240},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},200},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},168},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},232},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},152},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},216},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},184},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},248},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},196},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},164},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},228},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},148},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},212},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},180},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},244},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},204},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},172},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},236},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},156},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},220},
-    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},188},
-    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},252},
-    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},194},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},162},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},226},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},146},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},210},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},178},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},242},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},202},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},170},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},234},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},154},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},218},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},186},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},250},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},198},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},166},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},230},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},150},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},214},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},182},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},246},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},206},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},174},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},238},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},158},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},222},
-    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},190},
-    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},254},
-    {{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
-    {{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},193},
-    {{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},161},
-    {{{0,8}},0}, {{{0,8}},128}, {{{0,8}},64}, {{{0,9}},225},
-    {{{80,7}},6}, {{{0,8}},88}, {{{0,8}},24}, {{{0,9}},145},
-    {{{83,7}},59}, {{{0,8}},120}, {{{0,8}},56}, {{{0,9}},209},
-    {{{81,7}},17}, {{{0,8}},104}, {{{0,8}},40}, {{{0,9}},177},
-    {{{0,8}},8}, {{{0,8}},136}, {{{0,8}},72}, {{{0,9}},241},
-    {{{80,7}},4}, {{{0,8}},84}, {{{0,8}},20}, {{{85,8}},227},
-    {{{83,7}},43}, {{{0,8}},116}, {{{0,8}},52}, {{{0,9}},201},
-    {{{81,7}},13}, {{{0,8}},100}, {{{0,8}},36}, {{{0,9}},169},
-    {{{0,8}},4}, {{{0,8}},132}, {{{0,8}},68}, {{{0,9}},233},
-    {{{80,7}},8}, {{{0,8}},92}, {{{0,8}},28}, {{{0,9}},153},
-    {{{84,7}},83}, {{{0,8}},124}, {{{0,8}},60}, {{{0,9}},217},
-    {{{82,7}},23}, {{{0,8}},108}, {{{0,8}},44}, {{{0,9}},185},
-    {{{0,8}},12}, {{{0,8}},140}, {{{0,8}},76}, {{{0,9}},249},
-    {{{80,7}},3}, {{{0,8}},82}, {{{0,8}},18}, {{{85,8}},163},
-    {{{83,7}},35}, {{{0,8}},114}, {{{0,8}},50}, {{{0,9}},197},
-    {{{81,7}},11}, {{{0,8}},98}, {{{0,8}},34}, {{{0,9}},165},
-    {{{0,8}},2}, {{{0,8}},130}, {{{0,8}},66}, {{{0,9}},229},
-    {{{80,7}},7}, {{{0,8}},90}, {{{0,8}},26}, {{{0,9}},149},
-    {{{84,7}},67}, {{{0,8}},122}, {{{0,8}},58}, {{{0,9}},213},
-    {{{82,7}},19}, {{{0,8}},106}, {{{0,8}},42}, {{{0,9}},181},
-    {{{0,8}},10}, {{{0,8}},138}, {{{0,8}},74}, {{{0,9}},245},
-    {{{80,7}},5}, {{{0,8}},86}, {{{0,8}},22}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},118}, {{{0,8}},54}, {{{0,9}},205},
-    {{{81,7}},15}, {{{0,8}},102}, {{{0,8}},38}, {{{0,9}},173},
-    {{{0,8}},6}, {{{0,8}},134}, {{{0,8}},70}, {{{0,9}},237},
-    {{{80,7}},9}, {{{0,8}},94}, {{{0,8}},30}, {{{0,9}},157},
-    {{{84,7}},99}, {{{0,8}},126}, {{{0,8}},62}, {{{0,9}},221},
-    {{{82,7}},27}, {{{0,8}},110}, {{{0,8}},46}, {{{0,9}},189},
-    {{{0,8}},14}, {{{0,8}},142}, {{{0,8}},78}, {{{0,9}},253},
-    {{{96,7}},256}, {{{0,8}},81}, {{{0,8}},17}, {{{85,8}},131},
-    {{{82,7}},31}, {{{0,8}},113}, {{{0,8}},49}, {{{0,9}},195},
-    {{{80,7}},10}, {{{0,8}},97}, {{{0,8}},33}, {{{0,9}},163},
-    {{{0,8}},1}, {{{0,8}},129}, {{{0,8}},65}, {{{0,9}},227},
-    {{{80,7}},6}, {{{0,8}},89}, {{{0,8}},25}, {{{0,9}},147},
-    {{{83,7}},59}, {{{0,8}},121}, {{{0,8}},57}, {{{0,9}},211},
-    {{{81,7}},17}, {{{0,8}},105}, {{{0,8}},41}, {{{0,9}},179},
-    {{{0,8}},9}, {{{0,8}},137}, {{{0,8}},73}, {{{0,9}},243},
-    {{{80,7}},4}, {{{0,8}},85}, {{{0,8}},21}, {{{80,8}},258},
-    {{{83,7}},43}, {{{0,8}},117}, {{{0,8}},53}, {{{0,9}},203},
-    {{{81,7}},13}, {{{0,8}},101}, {{{0,8}},37}, {{{0,9}},171},
-    {{{0,8}},5}, {{{0,8}},133}, {{{0,8}},69}, {{{0,9}},235},
-    {{{80,7}},8}, {{{0,8}},93}, {{{0,8}},29}, {{{0,9}},155},
-    {{{84,7}},83}, {{{0,8}},125}, {{{0,8}},61}, {{{0,9}},219},
-    {{{82,7}},23}, {{{0,8}},109}, {{{0,8}},45}, {{{0,9}},187},
-    {{{0,8}},13}, {{{0,8}},141}, {{{0,8}},77}, {{{0,9}},251},
-    {{{80,7}},3}, {{{0,8}},83}, {{{0,8}},19}, {{{85,8}},195},
-    {{{83,7}},35}, {{{0,8}},115}, {{{0,8}},51}, {{{0,9}},199},
-    {{{81,7}},11}, {{{0,8}},99}, {{{0,8}},35}, {{{0,9}},167},
-    {{{0,8}},3}, {{{0,8}},131}, {{{0,8}},67}, {{{0,9}},231},
-    {{{80,7}},7}, {{{0,8}},91}, {{{0,8}},27}, {{{0,9}},151},
-    {{{84,7}},67}, {{{0,8}},123}, {{{0,8}},59}, {{{0,9}},215},
-    {{{82,7}},19}, {{{0,8}},107}, {{{0,8}},43}, {{{0,9}},183},
-    {{{0,8}},11}, {{{0,8}},139}, {{{0,8}},75}, {{{0,9}},247},
-    {{{80,7}},5}, {{{0,8}},87}, {{{0,8}},23}, {{{192,8}},0},
-    {{{83,7}},51}, {{{0,8}},119}, {{{0,8}},55}, {{{0,9}},207},
-    {{{81,7}},15}, {{{0,8}},103}, {{{0,8}},39}, {{{0,9}},175},
-    {{{0,8}},7}, {{{0,8}},135}, {{{0,8}},71}, {{{0,9}},239},
-    {{{80,7}},9}, {{{0,8}},95}, {{{0,8}},31}, {{{0,9}},159},
-    {{{84,7}},99}, {{{0,8}},127}, {{{0,8}},63}, {{{0,9}},223},
-    {{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191},
-    {{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255}
-  };
-local inflate_huft fixed_td[] = {
-    {{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097},
-    {{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385},
-    {{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193},
-    {{{82,5}},9}, {{{90,5}},2049}, {{{86,5}},129}, {{{192,5}},24577},
-    {{{80,5}},2}, {{{87,5}},385}, {{{83,5}},25}, {{{91,5}},6145},
-    {{{81,5}},7}, {{{89,5}},1537}, {{{85,5}},97}, {{{93,5}},24577},
-    {{{80,5}},4}, {{{88,5}},769}, {{{84,5}},49}, {{{92,5}},12289},
-    {{{82,5}},13}, {{{90,5}},3073}, {{{86,5}},193}, {{{192,5}},24577}
-  };
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
deleted file mode 100644
index 85853e0..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/inftrees.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* inftrees.h -- header to use inftrees.c
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* Huffman code lookup table entry--this entry is four bytes for machines
-   that have 16-bit pointers (e.g. PC's in the small or medium model). */
-
-typedef struct inflate_huft_s FAR inflate_huft;
-
-struct inflate_huft_s {
-  union {
-    struct {
-      Byte Exop;        /* number of extra bits or operation */
-      Byte Bits;        /* number of bits in this code or subcode */
-    } what;
-    uInt pad;           /* pad structure to a power of 2 (4 bytes for */
-  } word;               /*  16-bit, 8 bytes for 32-bit int's) */
-  uInt base;            /* literal, length base, distance base,
-                           or table offset */
-};
-
-/* Maximum size of dynamic tree.  The maximum found in a long but non-
-   exhaustive search was 1004 huft structures (850 for length/literals
-   and 154 for distances, the latter actually the result of an
-   exhaustive search).  The actual maximum is not known, but the
-   value below is more than safe. */
-#define MANY 1440
-
-extern int inflate_trees_bits OF((
-    uIntf *,                    /* 19 code lengths */
-    uIntf *,                    /* bits tree desired/actual depth */
-    inflate_huft * FAR *,       /* bits tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-extern int inflate_trees_dynamic OF((
-    uInt,                       /* number of literal/length codes */
-    uInt,                       /* number of distance codes */
-    uIntf *,                    /* that many (total) code lengths */
-    uIntf *,                    /* literal desired/actual bit depth */
-    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft * FAR *,       /* distance tree result */
-    inflate_huft *,             /* space for trees */
-    z_streamp));                /* for messages */
-
-extern int inflate_trees_fixed OF((
-    uIntf *,                    /* literal desired/actual bit depth */
-    uIntf *,                    /* distance desired/actual bit depth */
-    inflate_huft * FAR *,       /* literal/length tree result */
-    inflate_huft * FAR *,       /* distance tree result */
-    z_streamp));                /* for memory allocation */
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
deleted file mode 100644
index 99d1135..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/infutil.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/* infutil.h -- types and macros common to blocks and codes
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-#ifndef _INFUTIL_H
-#define _INFUTIL_H
-
-typedef enum {
-      TYPE,     /* get type bits (3, including end bit) */
-      LENS,     /* get lengths for stored */
-      STORED,   /* processing stored block */
-      TABLE,    /* get table lengths */
-      BTREE,    /* get bit lengths tree for a dynamic block */
-      DTREE,    /* get length, distance trees for a dynamic block */
-      CODES,    /* processing fixed or dynamic block */
-      DRY,      /* output remaining window bytes */
-      DONE,     /* finished last block, done */
-      BAD}      /* got a data error--stuck here */
-inflate_block_mode;
-
-/* inflate blocks semi-private state */
-struct inflate_blocks_state {
-
-  /* mode */
-  inflate_block_mode  mode;     /* current inflate_block mode */
-
-  /* mode dependent information */
-  union {
-    uInt left;          /* if STORED, bytes left to copy */
-    struct {
-      uInt table;               /* table lengths (14 bits) */
-      uInt index;               /* index into blens (or border) */
-      uIntf *blens;             /* bit lengths of codes */
-      uInt bb;                  /* bit length tree depth */
-      inflate_huft *tb;         /* bit length decoding tree */
-    } trees;            /* if DTREE, decoding info for trees */
-    struct {
-      inflate_codes_statef 
-         *codes;
-    } decode;           /* if CODES, current state */
-  } sub;                /* submode */
-  uInt last;            /* true if this block is the last block */
-
-  /* mode independent information */
-  uInt bitk;            /* bits in bit buffer */
-  uLong bitb;           /* bit buffer */
-  inflate_huft *hufts;  /* single malloc for tree space */
-  Bytef *window;        /* sliding window */
-  Bytef *end;           /* one byte after sliding window */
-  Bytef *read;          /* window read pointer */
-  Bytef *write;         /* window write pointer */
-  check_func checkfn;   /* check function */
-  uLong check;          /* check on output */
-
-};
-
-
-/* defines for inflate input/output */
-/*   update pointers and return */
-#define UPDBITS {s->bitb=b;s->bitk=k;}
-#define UPDIN {z->avail_in=n;z->total_in+=p-z->next_in;z->next_in=p;}
-#define UPDOUT {s->write=q;}
-#define UPDATE {UPDBITS UPDIN UPDOUT}
-#define LEAVE {UPDATE return inflate_flush(s,z,r);}
-/*   get bytes and bits */
-#define LOADIN {p=z->next_in;n=z->avail_in;b=s->bitb;k=s->bitk;}
-#define NEEDBYTE {if(n)r=Z_OK;else LEAVE}
-#define NEXTBYTE (n--,*p++)
-#define NEEDBITS(j) {while(k<(j)){NEEDBYTE;b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define DUMPBITS(j) {b>>=(j);k-=(j);}
-/*   output bytes */
-#define WAVAIL (uInt)(q<s->read?s->read-q-1:s->end-q)
-#define LOADOUT {q=s->write;m=(uInt)WAVAIL;}
-#define WRAP {if(q==s->end&&s->read!=s->window){q=s->window;m=(uInt)WAVAIL;}}
-#define FLUSH {UPDOUT r=inflate_flush(s,z,r); LOADOUT}
-#define NEEDOUT {if(m==0){WRAP if(m==0){FLUSH WRAP if(m==0) LEAVE}}r=Z_OK;}
-#define OUTBYTE(a) {*q++=(Byte)(a);m--;}
-/*   load local pointers */
-#define LOAD {LOADIN LOADOUT}
-
-/* masks for lower bits (size given to avoid silly warnings with Visual C++) */
-extern uInt inflate_mask[17];
-
-/* copy as much as possible from the sliding window to the output area */
-extern int inflate_flush OF((
-    inflate_blocks_statef *,
-    z_streamp ,
-    int));
-
-struct internal_state      {int dummy;}; /* for buggy compilers */
-
-#endif
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
deleted file mode 100644
index 72facf9..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/trees.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/* header created automatically with -DGEN_TREES_H */
-
-local const ct_data static_ltree[L_CODES+2] = {
-{{ 12},{  8}}, {{140},{  8}}, {{ 76},{  8}}, {{204},{  8}}, {{ 44},{  8}},
-{{172},{  8}}, {{108},{  8}}, {{236},{  8}}, {{ 28},{  8}}, {{156},{  8}},
-{{ 92},{  8}}, {{220},{  8}}, {{ 60},{  8}}, {{188},{  8}}, {{124},{  8}},
-{{252},{  8}}, {{  2},{  8}}, {{130},{  8}}, {{ 66},{  8}}, {{194},{  8}},
-{{ 34},{  8}}, {{162},{  8}}, {{ 98},{  8}}, {{226},{  8}}, {{ 18},{  8}},
-{{146},{  8}}, {{ 82},{  8}}, {{210},{  8}}, {{ 50},{  8}}, {{178},{  8}},
-{{114},{  8}}, {{242},{  8}}, {{ 10},{  8}}, {{138},{  8}}, {{ 74},{  8}},
-{{202},{  8}}, {{ 42},{  8}}, {{170},{  8}}, {{106},{  8}}, {{234},{  8}},
-{{ 26},{  8}}, {{154},{  8}}, {{ 90},{  8}}, {{218},{  8}}, {{ 58},{  8}},
-{{186},{  8}}, {{122},{  8}}, {{250},{  8}}, {{  6},{  8}}, {{134},{  8}},
-{{ 70},{  8}}, {{198},{  8}}, {{ 38},{  8}}, {{166},{  8}}, {{102},{  8}},
-{{230},{  8}}, {{ 22},{  8}}, {{150},{  8}}, {{ 86},{  8}}, {{214},{  8}},
-{{ 54},{  8}}, {{182},{  8}}, {{118},{  8}}, {{246},{  8}}, {{ 14},{  8}},
-{{142},{  8}}, {{ 78},{  8}}, {{206},{  8}}, {{ 46},{  8}}, {{174},{  8}},
-{{110},{  8}}, {{238},{  8}}, {{ 30},{  8}}, {{158},{  8}}, {{ 94},{  8}},
-{{222},{  8}}, {{ 62},{  8}}, {{190},{  8}}, {{126},{  8}}, {{254},{  8}},
-{{  1},{  8}}, {{129},{  8}}, {{ 65},{  8}}, {{193},{  8}}, {{ 33},{  8}},
-{{161},{  8}}, {{ 97},{  8}}, {{225},{  8}}, {{ 17},{  8}}, {{145},{  8}},
-{{ 81},{  8}}, {{209},{  8}}, {{ 49},{  8}}, {{177},{  8}}, {{113},{  8}},
-{{241},{  8}}, {{  9},{  8}}, {{137},{  8}}, {{ 73},{  8}}, {{201},{  8}},
-{{ 41},{  8}}, {{169},{  8}}, {{105},{  8}}, {{233},{  8}}, {{ 25},{  8}},
-{{153},{  8}}, {{ 89},{  8}}, {{217},{  8}}, {{ 57},{  8}}, {{185},{  8}},
-{{121},{  8}}, {{249},{  8}}, {{  5},{  8}}, {{133},{  8}}, {{ 69},{  8}},
-{{197},{  8}}, {{ 37},{  8}}, {{165},{  8}}, {{101},{  8}}, {{229},{  8}},
-{{ 21},{  8}}, {{149},{  8}}, {{ 85},{  8}}, {{213},{  8}}, {{ 53},{  8}},
-{{181},{  8}}, {{117},{  8}}, {{245},{  8}}, {{ 13},{  8}}, {{141},{  8}},
-{{ 77},{  8}}, {{205},{  8}}, {{ 45},{  8}}, {{173},{  8}}, {{109},{  8}},
-{{237},{  8}}, {{ 29},{  8}}, {{157},{  8}}, {{ 93},{  8}}, {{221},{  8}},
-{{ 61},{  8}}, {{189},{  8}}, {{125},{  8}}, {{253},{  8}}, {{ 19},{  9}},
-{{275},{  9}}, {{147},{  9}}, {{403},{  9}}, {{ 83},{  9}}, {{339},{  9}},
-{{211},{  9}}, {{467},{  9}}, {{ 51},{  9}}, {{307},{  9}}, {{179},{  9}},
-{{435},{  9}}, {{115},{  9}}, {{371},{  9}}, {{243},{  9}}, {{499},{  9}},
-{{ 11},{  9}}, {{267},{  9}}, {{139},{  9}}, {{395},{  9}}, {{ 75},{  9}},
-{{331},{  9}}, {{203},{  9}}, {{459},{  9}}, {{ 43},{  9}}, {{299},{  9}},
-{{171},{  9}}, {{427},{  9}}, {{107},{  9}}, {{363},{  9}}, {{235},{  9}},
-{{491},{  9}}, {{ 27},{  9}}, {{283},{  9}}, {{155},{  9}}, {{411},{  9}},
-{{ 91},{  9}}, {{347},{  9}}, {{219},{  9}}, {{475},{  9}}, {{ 59},{  9}},
-{{315},{  9}}, {{187},{  9}}, {{443},{  9}}, {{123},{  9}}, {{379},{  9}},
-{{251},{  9}}, {{507},{  9}}, {{  7},{  9}}, {{263},{  9}}, {{135},{  9}},
-{{391},{  9}}, {{ 71},{  9}}, {{327},{  9}}, {{199},{  9}}, {{455},{  9}},
-{{ 39},{  9}}, {{295},{  9}}, {{167},{  9}}, {{423},{  9}}, {{103},{  9}},
-{{359},{  9}}, {{231},{  9}}, {{487},{  9}}, {{ 23},{  9}}, {{279},{  9}},
-{{151},{  9}}, {{407},{  9}}, {{ 87},{  9}}, {{343},{  9}}, {{215},{  9}},
-{{471},{  9}}, {{ 55},{  9}}, {{311},{  9}}, {{183},{  9}}, {{439},{  9}},
-{{119},{  9}}, {{375},{  9}}, {{247},{  9}}, {{503},{  9}}, {{ 15},{  9}},
-{{271},{  9}}, {{143},{  9}}, {{399},{  9}}, {{ 79},{  9}}, {{335},{  9}},
-{{207},{  9}}, {{463},{  9}}, {{ 47},{  9}}, {{303},{  9}}, {{175},{  9}},
-{{431},{  9}}, {{111},{  9}}, {{367},{  9}}, {{239},{  9}}, {{495},{  9}},
-{{ 31},{  9}}, {{287},{  9}}, {{159},{  9}}, {{415},{  9}}, {{ 95},{  9}},
-{{351},{  9}}, {{223},{  9}}, {{479},{  9}}, {{ 63},{  9}}, {{319},{  9}},
-{{191},{  9}}, {{447},{  9}}, {{127},{  9}}, {{383},{  9}}, {{255},{  9}},
-{{511},{  9}}, {{  0},{  7}}, {{ 64},{  7}}, {{ 32},{  7}}, {{ 96},{  7}},
-{{ 16},{  7}}, {{ 80},{  7}}, {{ 48},{  7}}, {{112},{  7}}, {{  8},{  7}},
-{{ 72},{  7}}, {{ 40},{  7}}, {{104},{  7}}, {{ 24},{  7}}, {{ 88},{  7}},
-{{ 56},{  7}}, {{120},{  7}}, {{  4},{  7}}, {{ 68},{  7}}, {{ 36},{  7}},
-{{100},{  7}}, {{ 20},{  7}}, {{ 84},{  7}}, {{ 52},{  7}}, {{116},{  7}},
-{{  3},{  8}}, {{131},{  8}}, {{ 67},{  8}}, {{195},{  8}}, {{ 35},{  8}},
-{{163},{  8}}, {{ 99},{  8}}, {{227},{  8}}
-};
-
-local const ct_data static_dtree[D_CODES] = {
-{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}},
-{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}},
-{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}},
-{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}},
-{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}},
-{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}}
-};
-
-const uch _dist_code[DIST_CODE_LEN] = {
- 0,  1,  2,  3,  4,  4,  5,  5,  6,  6,  6,  6,  7,  7,  7,  7,  8,  8,  8,  8,
- 8,  8,  8,  8,  9,  9,  9,  9,  9,  9,  9,  9, 10, 10, 10, 10, 10, 10, 10, 10,
-10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11,
-11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12,
-12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13,
-13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14,
-14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,
-15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15,  0,  0, 16, 17,
-18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
-29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29
-};
-
-const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {
- 0,  1,  2,  3,  4,  5,  6,  7,  8,  8,  9,  9, 10, 10, 11, 11, 12, 12, 12, 12,
-13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16,
-17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19,
-19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
-21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22,
-22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23,
-23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
-26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27,
-27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28
-};
-
-local const int base_length[LENGTH_CODES] = {
-0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56,
-64, 80, 96, 112, 128, 160, 192, 224, 0
-};
-
-local const int base_dist[D_CODES] = {
-    0,     1,     2,     3,     4,     6,     8,    12,    16,    24,
-   32,    48,    64,    96,   128,   192,   256,   384,   512,   768,
- 1024,  1536,  2048,  3072,  4096,  6144,  8192, 12288, 16384, 24576
-};
-
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
deleted file mode 100644
index 6d450fc..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zconf.h
+++ /dev/null
@@ -1,279 +0,0 @@
-/* zconf.h -- configuration of the zlib compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#ifndef _ZCONF_H
-#define _ZCONF_H
-
-/*
- * If you *really* need a unique prefix for all types and library functions,
- * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it.
- */
-#ifdef Z_PREFIX
-#  define deflateInit_	z_deflateInit_
-#  define deflate	z_deflate
-#  define deflateEnd	z_deflateEnd
-#  define inflateInit_ 	z_inflateInit_
-#  define inflate	z_inflate
-#  define inflateEnd	z_inflateEnd
-#  define deflateInit2_	z_deflateInit2_
-#  define deflateSetDictionary z_deflateSetDictionary
-#  define deflateCopy	z_deflateCopy
-#  define deflateReset	z_deflateReset
-#  define deflateParams	z_deflateParams
-#  define inflateInit2_	z_inflateInit2_
-#  define inflateSetDictionary z_inflateSetDictionary
-#  define inflateSync	z_inflateSync
-#  define inflateSyncPoint z_inflateSyncPoint
-#  define inflateReset	z_inflateReset
-#  define compress	z_compress
-#  define compress2	z_compress2
-#  define uncompress	z_uncompress
-#  define adler32	z_adler32
-#  define crc32		z_crc32
-#  define get_crc_table z_get_crc_table
-
-#  define Byte		z_Byte
-#  define uInt		z_uInt
-#  define uLong		z_uLong
-#  define Bytef	        z_Bytef
-#  define charf		z_charf
-#  define intf		z_intf
-#  define uIntf		z_uIntf
-#  define uLongf	z_uLongf
-#  define voidpf	z_voidpf
-#  define voidp		z_voidp
-#endif
-
-#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
-#  define WIN32
-#endif
-#if defined(__GNUC__) || defined(WIN32) || defined(__386__) || defined(i386)
-#  ifndef __32BIT__
-#    define __32BIT__
-#  endif
-#endif
-#if defined(__MSDOS__) && !defined(MSDOS)
-#  define MSDOS
-#endif
-
-/*
- * Compile with -DMAXSEG_64K if the alloc function cannot allocate more
- * than 64k bytes at a time (needed on systems with 16-bit int).
- */
-#if defined(MSDOS) && !defined(__32BIT__)
-#  define MAXSEG_64K
-#endif
-#ifdef MSDOS
-#  define UNALIGNED_OK
-#endif
-
-#if (defined(MSDOS) || defined(_WINDOWS) || defined(WIN32))  && !defined(STDC)
-#  define STDC
-#endif
-#if defined(__STDC__) || defined(__cplusplus) || defined(__OS2__)
-#  ifndef STDC
-#    define STDC
-#  endif
-#endif
-
-#ifndef STDC
-#  ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */
-#    define const
-#  endif
-#endif
-
-/* Some Mac compilers merge all .h files incorrectly: */
-#if defined(__MWERKS__) || defined(applec) ||defined(THINK_C) ||defined(__SC__)
-#  define NO_DUMMY_DECL
-#endif
-
-/* Old Borland C incorrectly complains about missing returns: */
-#if defined(__BORLANDC__) && (__BORLANDC__ < 0x500)
-#  define NEED_DUMMY_RETURN
-#endif
-
-
-/* Maximum value for memLevel in deflateInit2 */
-#ifndef MAX_MEM_LEVEL
-#  ifdef MAXSEG_64K
-#    define MAX_MEM_LEVEL 8
-#  else
-#    define MAX_MEM_LEVEL 9
-#  endif
-#endif
-
-/* Maximum value for windowBits in deflateInit2 and inflateInit2.
- * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files
- * created by gzip. (Files created by minigzip can still be extracted by
- * gzip.)
- */
-#ifndef MAX_WBITS
-#  define MAX_WBITS   15 /* 32K LZ77 window */
-#endif
-
-/* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
- that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
- plus a few kilobytes for small objects. For example, if you want to reduce
- the default memory requirements from 256K to 128K, compile with
-     make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
- Of course this will generally degrade compression (there's no free lunch).
-
-   The memory requirements for inflate are (in bytes) 1 << windowBits
- that is, 32K for windowBits=15 (default value) plus a few kilobytes
- for small objects.
-*/
-
-                        /* Type declarations */
-
-#ifndef OF /* function prototypes */
-#  ifdef STDC
-#    define OF(args)  args
-#  else
-#    define OF(args)  ()
-#  endif
-#endif
-
-/* The following definitions for FAR are needed only for MSDOS mixed
- * model programming (small or medium model with some far allocations).
- * This was tested only with MSC; for other MSDOS compilers you may have
- * to define NO_MEMCPY in zutil.h.  If you don't need the mixed model,
- * just define FAR to be empty.
- */
-#if (defined(M_I86SM) || defined(M_I86MM)) && !defined(__32BIT__)
-   /* MSC small or medium model */
-#  define SMALL_MEDIUM
-#  ifdef _MSC_VER
-#    define FAR _far
-#  else
-#    define FAR far
-#  endif
-#endif
-#if defined(__BORLANDC__) && (defined(__SMALL__) || defined(__MEDIUM__))
-#  ifndef __32BIT__
-#    define SMALL_MEDIUM
-#    define FAR _far
-#  endif
-#endif
-
-/* Compile with -DZLIB_DLL for Windows DLL support */
-#if defined(ZLIB_DLL)
-#  if defined(_WINDOWS) || defined(WINDOWS)
-#    ifdef FAR
-#      undef FAR
-#    endif
-#    include <windows.h>
-#    define ZEXPORT  WINAPI
-#    ifdef WIN32
-#      define ZEXPORTVA  WINAPIV
-#    else
-#      define ZEXPORTVA  FAR _cdecl _export
-#    endif
-#  endif
-#  if defined (__BORLANDC__)
-#    if (__BORLANDC__ >= 0x0500) && defined (WIN32)
-#      include <windows.h>
-#      define ZEXPORT __declspec(dllexport) WINAPI
-#      define ZEXPORTRVA __declspec(dllexport) WINAPIV
-#    else
-#      if defined (_Windows) && defined (__DLL__)
-#        define ZEXPORT _export
-#        define ZEXPORTVA _export
-#      endif
-#    endif
-#  endif
-#endif
-
-#if defined (__BEOS__)
-#  if defined (ZLIB_DLL)
-#    define ZEXTERN extern __declspec(dllexport)
-#  else
-#    define ZEXTERN extern __declspec(dllimport)
-#  endif
-#endif
-
-#ifndef ZEXPORT
-#  define ZEXPORT
-#endif
-#ifndef ZEXPORTVA
-#  define ZEXPORTVA
-#endif
-#ifndef ZEXTERN
-#  define ZEXTERN extern
-#endif
-
-#ifndef FAR
-#   define FAR
-#endif
-
-#if !defined(MACOS) && !defined(TARGET_OS_MAC)
-typedef unsigned char  Byte;  /* 8 bits */
-#endif
-typedef unsigned int   uInt;  /* 16 bits or more */
-typedef unsigned long  uLong; /* 32 bits or more */
-
-#ifdef SMALL_MEDIUM
-   /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */
-#  define Bytef Byte FAR
-#else
-   typedef Byte  FAR Bytef;
-#endif
-typedef char  FAR charf;
-typedef int   FAR intf;
-typedef uInt  FAR uIntf;
-typedef uLong FAR uLongf;
-
-#ifdef STDC
-   typedef void FAR *voidpf;
-   typedef void     *voidp;
-#else
-   typedef Byte FAR *voidpf;
-   typedef Byte     *voidp;
-#endif
-
-#ifdef HAVE_UNISTD_H
-#  include <sys/types.h> /* for off_t */
-#  include <unistd.h>    /* for SEEK_* and off_t */
-#  define z_off_t  off_t
-#endif
-#ifndef SEEK_SET
-#  define SEEK_SET        0       /* Seek from beginning of file.  */
-#  define SEEK_CUR        1       /* Seek from current position.  */
-#  define SEEK_END        2       /* Set file pointer to EOF plus "offset" */
-#endif
-#ifndef z_off_t
-#  define  z_off_t long
-#endif
-
-/* MVS linker does not support external names larger than 8 bytes */
-#if defined(__MVS__)
-#   pragma map(deflateInit_,"DEIN")
-#   pragma map(deflateInit2_,"DEIN2")
-#   pragma map(deflateEnd,"DEEND")
-#   pragma map(inflateInit_,"ININ")
-#   pragma map(inflateInit2_,"ININ2")
-#   pragma map(inflateEnd,"INEND")
-#   pragma map(inflateSync,"INSY")
-#   pragma map(inflateSetDictionary,"INSEDI")
-#   pragma map(inflate_blocks,"INBL")
-#   pragma map(inflate_blocks_new,"INBLNE")
-#   pragma map(inflate_blocks_free,"INBLFR")
-#   pragma map(inflate_blocks_reset,"INBLRE")
-#   pragma map(inflate_codes_free,"INCOFR")
-#   pragma map(inflate_codes,"INCO")
-#   pragma map(inflate_fast,"INFA")
-#   pragma map(inflate_flush,"INFLU")
-#   pragma map(inflate_mask,"INMA")
-#   pragma map(inflate_set_dictionary,"INSEDI2")
-#   pragma map(inflate_copyright,"INCOPY")
-#   pragma map(inflate_trees_bits,"INTRBI")
-#   pragma map(inflate_trees_dynamic,"INTRDY")
-#   pragma map(inflate_trees_fixed,"INTRFI")
-#   pragma map(inflate_trees_free,"INTRFR")
-#endif
-
-#endif /* _ZCONF_H */
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
deleted file mode 100644
index 49f56b4..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zlib.h
+++ /dev/null
@@ -1,893 +0,0 @@
-/* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.1.3, July 9th, 1998
-
-  Copyright (C) 1995-1998 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-
-  The data format used by the zlib library is described by RFCs (Request for
-  Comments) 1950 to 1952 in the files ftp://ds.internic.net/rfc/rfc1950.txt
-  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
-*/
-
-#ifndef _ZLIB_H
-#define _ZLIB_H
-
-#include "zconf.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define ZLIB_VERSION "1.1.3"
-
-/* 
-     The 'zlib' compression library provides in-memory compression and
-  decompression functions, including integrity checks of the uncompressed
-  data.  This version of the library supports only one compression method
-  (deflation) but other algorithms will be added later and will have the same
-  stream interface.
-
-     Compression can be done in a single step if the buffers are large
-  enough (for example if an input file is mmap'ed), or can be done by
-  repeated calls of the compression function.  In the latter case, the
-  application must provide more input and/or consume the output
-  (providing more output space) before each call.
-
-     The library also supports reading and writing files in gzip (.gz) format
-  with an interface similar to that of stdio.
-
-     The library does not install any signal handler. The decoder checks
-  the consistency of the compressed data, so the library should never
-  crash even in case of corrupted input.
-*/
-
-typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));
-typedef void   (*free_func)  OF((voidpf opaque, voidpf address));
-
-struct internal_state;
-
-typedef struct z_stream_s {
-    Bytef    *next_in;  /* next input byte */
-    uInt     avail_in;  /* number of bytes available at next_in */
-    uLong    total_in;  /* total nb of input bytes read so far */
-
-    Bytef    *next_out; /* next output byte should be put there */
-    uInt     avail_out; /* remaining free space at next_out */
-    uLong    total_out; /* total nb of bytes output so far */
-
-    char     *msg;      /* last error message, NULL if no error */
-    struct internal_state FAR *state; /* not visible by applications */
-
-    alloc_func zalloc;  /* used to allocate the internal state */
-    free_func  zfree;   /* used to free the internal state */
-    voidpf     opaque;  /* private data object passed to zalloc and zfree */
-
-    int     data_type;  /* best guess about the data type: ascii or binary */
-    uLong   adler;      /* adler32 value of the uncompressed data */
-    uLong   reserved;   /* reserved for future use */
-} z_stream;
-
-typedef z_stream FAR *z_streamp;
-
-/*
-   The application must update next_in and avail_in when avail_in has
-   dropped to zero. It must update next_out and avail_out when avail_out
-   has dropped to zero. The application must initialize zalloc, zfree and
-   opaque before calling the init function. All other fields are set by the
-   compression library and must not be updated by the application.
-
-   The opaque value provided by the application will be passed as the first
-   parameter for calls of zalloc and zfree. This can be useful for custom
-   memory management. The compression library attaches no meaning to the
-   opaque value.
-
-   zalloc must return Z_NULL if there is not enough memory for the object.
-   If zlib is used in a multi-threaded application, zalloc and zfree must be
-   thread safe.
-
-   On 16-bit systems, the functions zalloc and zfree must be able to allocate
-   exactly 65536 bytes, but will not be required to allocate more than this
-   if the symbol MAXSEG_64K is defined (see zconf.h). WARNING: On MSDOS,
-   pointers returned by zalloc for objects of exactly 65536 bytes *must*
-   have their offset normalized to zero. The default allocation function
-   provided by this library ensures this (see zutil.c). To reduce memory
-   requirements and avoid any allocation of 64K objects, at the expense of
-   compression ratio, compile the library with -DMAX_WBITS=14 (see zconf.h).
-
-   The fields total_in and total_out can be used for statistics or
-   progress reports. After compression, total_in holds the total size of
-   the uncompressed data and may be saved for use in the decompressor
-   (particularly if the decompressor wants to decompress everything in
-   a single step).
-*/
-
-                        /* constants */
-
-#define Z_NO_FLUSH      0
-#define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
-#define Z_SYNC_FLUSH    2
-#define Z_FULL_FLUSH    3
-#define Z_FINISH        4
-/* Allowed flush values; see deflate() below for details */
-
-#define Z_OK            0
-#define Z_STREAM_END    1
-#define Z_NEED_DICT     2
-#define Z_ERRNO        (-1)
-#define Z_STREAM_ERROR (-2)
-#define Z_DATA_ERROR   (-3)
-#define Z_MEM_ERROR    (-4)
-#define Z_BUF_ERROR    (-5)
-#define Z_VERSION_ERROR (-6)
-/* Return codes for the compression/decompression functions. Negative
- * values are errors, positive values are used for special but normal events.
- */
-
-#define Z_NO_COMPRESSION         0
-#define Z_BEST_SPEED             1
-#define Z_BEST_COMPRESSION       9
-#define Z_DEFAULT_COMPRESSION  (-1)
-/* compression levels */
-
-#define Z_FILTERED            1
-#define Z_HUFFMAN_ONLY        2
-#define Z_DEFAULT_STRATEGY    0
-/* compression strategy; see deflateInit2() below for details */
-
-#define Z_BINARY   0
-#define Z_ASCII    1
-#define Z_UNKNOWN  2
-/* Possible values of the data_type field */
-
-#define Z_DEFLATED   8
-/* The deflate compression method (the only one supported in this version) */
-
-#define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
-
-#define zlib_version zlibVersion()
-/* for compatibility with versions < 1.0.2 */
-
-                        /* basic functions */
-
-ZEXTERN const char * ZEXPORT zlibVersion OF((void));
-/* The application can compare zlibVersion and ZLIB_VERSION for consistency.
-   If the first character differs, the library code actually used is
-   not compatible with the zlib.h header file used by the application.
-   This check is automatically made by deflateInit and inflateInit.
- */
-
-/* 
-ZEXTERN int ZEXPORT deflateInit OF((z_streamp strm, int level));
-
-     Initializes the internal stream state for compression. The fields
-   zalloc, zfree and opaque must be initialized before by the caller.
-   If zalloc and zfree are set to Z_NULL, deflateInit updates them to
-   use default allocation functions.
-
-     The compression level must be Z_DEFAULT_COMPRESSION, or between 0 and 9:
-   1 gives best speed, 9 gives best compression, 0 gives no compression at
-   all (the input data is simply copied a block at a time).
-   Z_DEFAULT_COMPRESSION requests a default compromise between speed and
-   compression (currently equivalent to level 6).
-
-     deflateInit returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if level is not a valid compression level,
-   Z_VERSION_ERROR if the zlib library version (zlib_version) is incompatible
-   with the version assumed by the caller (ZLIB_VERSION).
-   msg is set to null if there is no error message.  deflateInit does not
-   perform any compression: this will be done by deflate().
-*/
-
-
-ZEXTERN int ZEXPORT deflate OF((z_streamp strm, int flush));
-/*
-    deflate compresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may introduce some
-  output latency (reading input without producing any output) except when
-  forced to flush.
-
-    The detailed semantics are as follows. deflate performs one or both of the
-  following actions:
-
-  - Compress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in and avail_in are updated and
-    processing will resume at this point for the next call of deflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly. This action is forced if the parameter flush is non zero.
-    Forcing flush frequently degrades the compression ratio, so this parameter
-    should be set only when necessary (in interactive applications).
-    Some output may be provided even if flush is not set.
-
-  Before the call of deflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating avail_in or avail_out accordingly; avail_out
-  should never be zero before the call. The application can consume the
-  compressed output when it wants, for example when the output buffer is full
-  (avail_out == 0), or after each call of deflate(). If deflate returns Z_OK
-  and with zero avail_out, it must be called again after making room in the
-  output buffer because there might be more output pending.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, all pending output is
-  flushed to the output buffer and the output is aligned on a byte boundary, so
-  that the decompressor can get all input data available so far. (In particular
-  avail_in is zero after the call if enough output space has been provided
-  before the call.)  Flushing may degrade compression for some compression
-  algorithms and so it should be used only when necessary.
-
-    If flush is set to Z_FULL_FLUSH, all output is flushed as with
-  Z_SYNC_FLUSH, and the compression state is reset so that decompression can
-  restart from this point if previous compressed data has been damaged or if
-  random access is desired. Using Z_FULL_FLUSH too often can seriously degrade
-  the compression.
-
-    If deflate returns with avail_out == 0, this function must be called again
-  with the same value of the flush parameter and more output space (updated
-  avail_out), until the flush is complete (deflate returns with non-zero
-  avail_out).
-
-    If the parameter flush is set to Z_FINISH, pending input is processed,
-  pending output is flushed and deflate returns with Z_STREAM_END if there
-  was enough output space; if deflate returns with Z_OK, this function must be
-  called again with Z_FINISH and more output space (updated avail_out) but no
-  more input data, until it returns with Z_STREAM_END or an error. After
-  deflate has returned Z_STREAM_END, the only possible operations on the
-  stream are deflateReset or deflateEnd.
-  
-    Z_FINISH can be used immediately after deflateInit if all the compression
-  is to be done in a single step. In this case, avail_out must be at least
-  0.1% larger than avail_in plus 12 bytes.  If deflate does not return
-  Z_STREAM_END, then it must be called again as described above.
-
-    deflate() sets strm->adler to the adler32 checksum of all input read
-  so far (that is, total_in bytes).
-
-    deflate() may update data_type if it can make a good guess about
-  the input data type (Z_ASCII or Z_BINARY). In doubt, the data is considered
-  binary. This field is only for information purposes and does not affect
-  the compression algorithm in any manner.
-
-    deflate() returns Z_OK if some progress has been made (more input
-  processed or more output produced), Z_STREAM_END if all input has been
-  consumed and all output has been produced (only when flush is set to
-  Z_FINISH), Z_STREAM_ERROR if the stream state was inconsistent (for example
-  if next_in or next_out was NULL), Z_BUF_ERROR if no progress is possible
-  (for example avail_in or avail_out was zero).
-*/
-
-
-ZEXTERN int ZEXPORT deflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     deflateEnd returns Z_OK if success, Z_STREAM_ERROR if the
-   stream state was inconsistent, Z_DATA_ERROR if the stream was freed
-   prematurely (some input or output was discarded). In the error case,
-   msg may be set but then points to a static string (which must not be
-   deallocated).
-*/
-
-
-/* 
-ZEXTERN int ZEXPORT inflateInit OF((z_streamp strm));
-
-     Initializes the internal stream state for decompression. The fields
-   next_in, avail_in, zalloc, zfree and opaque must be initialized before by
-   the caller. If next_in is not Z_NULL and avail_in is large enough (the exact
-   value depends on the compression method), inflateInit determines the
-   compression method from the zlib header and allocates all data structures
-   accordingly; otherwise the allocation will be deferred to the first call of
-   inflate.  If zalloc and zfree are set to Z_NULL, inflateInit updates them to
-   use default allocation functions.
-
-     inflateInit returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_VERSION_ERROR if the zlib library version is incompatible with the
-   version assumed by the caller.  msg is set to null if there is no error
-   message. inflateInit does not perform any decompression apart from reading
-   the zlib header if present: this will be done by inflate().  (So next_in and
-   avail_in may be modified, but next_out and avail_out are unchanged.)
-*/
-
-
-ZEXTERN int ZEXPORT inflate OF((z_streamp strm, int flush));
-/*
-    inflate decompresses as much data as possible, and stops when the input
-  buffer becomes empty or the output buffer becomes full. It may some
-  introduce some output latency (reading input without producing any output)
-  except when forced to flush.
-
-  The detailed semantics are as follows. inflate performs one or both of the
-  following actions:
-
-  - Decompress more input starting at next_in and update next_in and avail_in
-    accordingly. If not all input can be processed (because there is not
-    enough room in the output buffer), next_in is updated and processing
-    will resume at this point for the next call of inflate().
-
-  - Provide more output starting at next_out and update next_out and avail_out
-    accordingly.  inflate() provides as much output as possible, until there
-    is no more input data or no more space in the output buffer (see below
-    about the flush parameter).
-
-  Before the call of inflate(), the application should ensure that at least
-  one of the actions is possible, by providing more input and/or consuming
-  more output, and updating the next_* and avail_* values accordingly.
-  The application can consume the uncompressed output when it wants, for
-  example when the output buffer is full (avail_out == 0), or after each
-  call of inflate(). If inflate returns Z_OK and with zero avail_out, it
-  must be called again after making room in the output buffer because there
-  might be more output pending.
-
-    If the parameter flush is set to Z_SYNC_FLUSH, inflate flushes as much
-  output as possible to the output buffer. The flushing behavior of inflate is
-  not specified for values of the flush parameter other than Z_SYNC_FLUSH
-  and Z_FINISH, but the current implementation actually flushes as much output
-  as possible anyway.
-
-    inflate() should normally be called until it returns Z_STREAM_END or an
-  error. However if all decompression is to be performed in a single step
-  (a single call of inflate), the parameter flush should be set to
-  Z_FINISH. In this case all pending input is processed and all pending
-  output is flushed; avail_out must be large enough to hold all the
-  uncompressed data. (The size of the uncompressed data may have been saved
-  by the compressor for this purpose.) The next operation on this stream must
-  be inflateEnd to deallocate the decompression state. The use of Z_FINISH
-  is never required, but can be used to inform inflate that a faster routine
-  may be used for the single inflate() call.
-
-     If a preset dictionary is needed at this point (see inflateSetDictionary
-  below), inflate sets strm-adler to the adler32 checksum of the
-  dictionary chosen by the compressor and returns Z_NEED_DICT; otherwise 
-  it sets strm->adler to the adler32 checksum of all output produced
-  so far (that is, total_out bytes) and returns Z_OK, Z_STREAM_END or
-  an error code as described below. At the end of the stream, inflate()
-  checks that its computed adler32 checksum is equal to that saved by the
-  compressor and returns Z_STREAM_END only if the checksum is correct.
-
-    inflate() returns Z_OK if some progress has been made (more input processed
-  or more output produced), Z_STREAM_END if the end of the compressed data has
-  been reached and all uncompressed output has been produced, Z_NEED_DICT if a
-  preset dictionary is needed at this point, Z_DATA_ERROR if the input data was
-  corrupted (input stream not conforming to the zlib format or incorrect
-  adler32 checksum), Z_STREAM_ERROR if the stream structure was inconsistent
-  (for example if next_in or next_out was NULL), Z_MEM_ERROR if there was not
-  enough memory, Z_BUF_ERROR if no progress is possible or if there was not
-  enough room in the output buffer when Z_FINISH is used. In the Z_DATA_ERROR
-  case, the application may then call inflateSync to look for a good
-  compression block.
-*/
-
-
-ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
-/*
-     All dynamically allocated data structures for this stream are freed.
-   This function discards any unprocessed input and does not flush any
-   pending output.
-
-     inflateEnd returns Z_OK if success, Z_STREAM_ERROR if the stream state
-   was inconsistent. In the error case, msg may be set but then points to a
-   static string (which must not be deallocated).
-*/
-
-                        /* Advanced functions */
-
-/*
-    The following functions are needed only in some special applications.
-*/
-
-/*   
-ZEXTERN int ZEXPORT deflateInit2 OF((z_streamp strm,
-                                     int  level,
-                                     int  method,
-                                     int  windowBits,
-                                     int  memLevel,
-                                     int  strategy));
-
-     This is another version of deflateInit with more compression options. The
-   fields next_in, zalloc, zfree and opaque must be initialized before by
-   the caller.
-
-     The method parameter is the compression method. It must be Z_DEFLATED in
-   this version of the library.
-
-     The windowBits parameter is the base two logarithm of the window size
-   (the size of the history buffer).  It should be in the range 8..15 for this
-   version of the library. Larger values of this parameter result in better
-   compression at the expense of memory usage. The default value is 15 if
-   deflateInit is used instead.
-
-     The memLevel parameter specifies how much memory should be allocated
-   for the internal compression state. memLevel=1 uses minimum memory but
-   is slow and reduces compression ratio; memLevel=9 uses maximum memory
-   for optimal speed. The default value is 8. See zconf.h for total memory
-   usage as a function of windowBits and memLevel.
-
-     The strategy parameter is used to tune the compression algorithm. Use the
-   value Z_DEFAULT_STRATEGY for normal data, Z_FILTERED for data produced by a
-   filter (or predictor), or Z_HUFFMAN_ONLY to force Huffman encoding only (no
-   string match).  Filtered data consists mostly of small values with a
-   somewhat random distribution. In this case, the compression algorithm is
-   tuned to compress them better. The effect of Z_FILTERED is to force more
-   Huffman coding and less string matching; it is somewhat intermediate
-   between Z_DEFAULT and Z_HUFFMAN_ONLY. The strategy parameter only affects
-   the compression ratio but not the correctness of the compressed output even
-   if it is not set appropriately.
-
-      deflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as an invalid
-   method). msg is set to null if there is no error message.  deflateInit2 does
-   not perform any compression: this will be done by deflate().
-*/
-                            
-ZEXTERN int ZEXPORT deflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the compression dictionary from the given byte sequence
-   without producing any compressed output. This function must be called
-   immediately after deflateInit, deflateInit2 or deflateReset, before any
-   call of deflate. The compressor and decompressor must use exactly the same
-   dictionary (see inflateSetDictionary).
-
-     The dictionary should consist of strings (byte sequences) that are likely
-   to be encountered later in the data to be compressed, with the most commonly
-   used strings preferably put towards the end of the dictionary. Using a
-   dictionary is most useful when the data to be compressed is short and can be
-   predicted with good accuracy; the data can then be compressed better than
-   with the default empty dictionary.
-
-     Depending on the size of the compression data structures selected by
-   deflateInit or deflateInit2, a part of the dictionary may in effect be
-   discarded, for example if the dictionary is larger than the window size in
-   deflate or deflate2. Thus the strings most likely to be useful should be
-   put at the end of the dictionary, not at the front.
-
-     Upon return of this function, strm->adler is set to the Adler32 value
-   of the dictionary; the decompressor may later use this value to determine
-   which dictionary has been used by the compressor. (The Adler32 value
-   applies to the whole dictionary even if only a subset of the dictionary is
-   actually used by the compressor.)
-
-     deflateSetDictionary returns Z_OK if success, or Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent (for example if deflate has already been called for this stream
-   or if the compression method is bsort). deflateSetDictionary does not
-   perform any compression: this will be done by deflate().
-*/
-
-ZEXTERN int ZEXPORT deflateCopy OF((z_streamp dest,
-                                    z_streamp source));
-/*
-     Sets the destination stream as a complete copy of the source stream.
-
-     This function can be useful when several compression strategies will be
-   tried, for example when there are several ways of pre-processing the input
-   data with a filter. The streams that will be discarded should then be freed
-   by calling deflateEnd.  Note that deflateCopy duplicates the internal
-   compression state which can be quite large, so this strategy is slow and
-   can consume lots of memory.
-
-     deflateCopy returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_STREAM_ERROR if the source stream state was inconsistent
-   (such as zalloc being NULL). msg is left unchanged in both source and
-   destination.
-*/
-
-ZEXTERN int ZEXPORT deflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to deflateEnd followed by deflateInit,
-   but does not free and reallocate all the internal compression state.
-   The stream will keep the same compression level and any other attributes
-   that may have been set by deflateInit2.
-
-      deflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-ZEXTERN int ZEXPORT deflateParams OF((z_streamp strm,
-				      int level,
-				      int strategy));
-/*
-     Dynamically update the compression level and compression strategy.  The
-   interpretation of level and strategy is as in deflateInit2.  This can be
-   used to switch between compression and straight copy of the input data, or
-   to switch to a different kind of input data requiring a different
-   strategy. If the compression level is changed, the input available so far
-   is compressed with the old level (and may be flushed); the new level will
-   take effect only at the next call of deflate().
-
-     Before the call of deflateParams, the stream state must be set as for
-   a call of deflate(), since the currently available input may have to
-   be compressed and flushed. In particular, strm->avail_out must be non-zero.
-
-     deflateParams returns Z_OK if success, Z_STREAM_ERROR if the source
-   stream state was inconsistent or if a parameter was invalid, Z_BUF_ERROR
-   if strm->avail_out was zero.
-*/
-
-/*   
-ZEXTERN int ZEXPORT inflateInit2 OF((z_streamp strm,
-                                     int  windowBits));
-
-     This is another version of inflateInit with an extra parameter. The
-   fields next_in, avail_in, zalloc, zfree and opaque must be initialized
-   before by the caller.
-
-     The windowBits parameter is the base two logarithm of the maximum window
-   size (the size of the history buffer).  It should be in the range 8..15 for
-   this version of the library. The default value is 15 if inflateInit is used
-   instead. If a compressed stream with a larger window size is given as
-   input, inflate() will return with the error code Z_DATA_ERROR instead of
-   trying to allocate a larger window.
-
-      inflateInit2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_STREAM_ERROR if a parameter is invalid (such as a negative
-   memLevel). msg is set to null if there is no error message.  inflateInit2
-   does not perform any decompression apart from reading the zlib header if
-   present: this will be done by inflate(). (So next_in and avail_in may be
-   modified, but next_out and avail_out are unchanged.)
-*/
-
-ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm,
-                                             const Bytef *dictionary,
-                                             uInt  dictLength));
-/*
-     Initializes the decompression dictionary from the given uncompressed byte
-   sequence. This function must be called immediately after a call of inflate
-   if this call returned Z_NEED_DICT. The dictionary chosen by the compressor
-   can be determined from the Adler32 value returned by this call of
-   inflate. The compressor and decompressor must use exactly the same
-   dictionary (see deflateSetDictionary).
-
-     inflateSetDictionary returns Z_OK if success, Z_STREAM_ERROR if a
-   parameter is invalid (such as NULL dictionary) or the stream state is
-   inconsistent, Z_DATA_ERROR if the given dictionary doesn't match the
-   expected one (incorrect Adler32 value). inflateSetDictionary does not
-   perform any decompression: this will be done by subsequent calls of
-   inflate().
-*/
-
-ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm));
-/* 
-    Skips invalid compressed data until a full flush point (see above the
-  description of deflate with Z_FULL_FLUSH) can be found, or until all
-  available input is skipped. No output is provided.
-
-    inflateSync returns Z_OK if a full flush point has been found, Z_BUF_ERROR
-  if no more input was provided, Z_DATA_ERROR if no flush point has been found,
-  or Z_STREAM_ERROR if the stream structure was inconsistent. In the success
-  case, the application may save the current current value of total_in which
-  indicates where valid compressed data was found. In the error case, the
-  application may repeatedly call inflateSync, providing more input each time,
-  until success or end of the input data.
-*/
-
-ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
-/*
-     This function is equivalent to inflateEnd followed by inflateInit,
-   but does not free and reallocate all the internal decompression state.
-   The stream will keep attributes that may have been set by inflateInit2.
-
-      inflateReset returns Z_OK if success, or Z_STREAM_ERROR if the source
-   stream state was inconsistent (such as zalloc or state being NULL).
-*/
-
-
-                        /* utility functions */
-
-/*
-     The following utility functions are implemented on top of the
-   basic stream-oriented functions. To simplify the interface, some
-   default options are assumed (compression level and memory usage,
-   standard memory allocation functions). The source code of these
-   utility functions can easily be modified if you need special options.
-*/
-
-ZEXTERN int ZEXPORT compress OF((Bytef *dest,   uLongf *destLen,
-                                 const Bytef *source, uLong sourceLen));
-/*
-     Compresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be at least 0.1% larger than
-   sourceLen plus 12 bytes. Upon exit, destLen is the actual size of the
-   compressed buffer.
-     This function can be used to compress a whole file at once if the
-   input file is mmap'ed.
-     compress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer.
-*/
-
-ZEXTERN int ZEXPORT compress2 OF((Bytef *dest,   uLongf *destLen,
-                                  const Bytef *source, uLong sourceLen,
-                                  int level));
-/*
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-
-ZEXTERN int ZEXPORT uncompress OF((Bytef *dest,   uLongf *destLen,
-                                   const Bytef *source, uLong sourceLen));
-/*
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-
-
-typedef voidp gzFile;
-
-ZEXTERN gzFile ZEXPORT gzopen  OF((const char *path, const char *mode));
-/*
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb") but can also include a compression level
-   ("wb9") or a strategy: 'f' for filtered data as in "wb6f", 'h' for
-   Huffman only compression as in "wb1h". (See the description
-   of deflateInit2 for more information about the strategy parameter.)
-
-     gzopen can be used to read a file which is not in gzip format; in this
-   case gzread will directly read from the file without decompression.
-
-     gzopen returns NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).  */
-
-ZEXTERN gzFile ZEXPORT gzdopen  OF((int fd, const char *mode));
-/*
-     gzdopen() associates a gzFile with the file descriptor fd.  File
-   descriptors are obtained from calls like open, dup, creat, pipe or
-   fileno (in the file has been previously opened with fopen).
-   The mode parameter is as in gzopen.
-     The next call of gzclose on the returned gzFile will also close the
-   file descriptor fd, just like fclose(fdopen(fd), mode) closes the file
-   descriptor fd. If you want to keep fd open, use gzdopen(dup(fd), mode).
-     gzdopen returns NULL if there was insufficient memory to allocate
-   the (de)compression state.
-*/
-
-ZEXTERN int ZEXPORT gzsetparams OF((gzFile file, int level, int strategy));
-/*
-     Dynamically update the compression level or strategy. See the description
-   of deflateInit2 for the meaning of these parameters.
-     gzsetparams returns Z_OK if success, or Z_STREAM_ERROR if the file was not
-   opened for writing.
-*/
-
-ZEXTERN int ZEXPORT    gzread  OF((gzFile file, voidp buf, unsigned len));
-/*
-     Reads the given number of uncompressed bytes from the compressed file.
-   If the input file was not in gzip format, gzread copies the given number
-   of bytes into the buffer.
-     gzread returns the number of uncompressed bytes actually read (0 for
-   end of file, -1 for error). */
-
-ZEXTERN int ZEXPORT    gzwrite OF((gzFile file, 
-				   const voidp buf, unsigned len));
-/*
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of uncompressed bytes actually written
-   (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORTVA   gzprintf OF((gzFile file, const char *format, ...));
-/*
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-
-ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s));
-/*
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-
-ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len));
-/*
-      Reads bytes from the compressed file until len-1 characters are read, or
-   a newline character is read and transferred to buf, or an end-of-file
-   condition is encountered.  The string is then terminated with a null
-   character.
-      gzgets returns buf, or Z_NULL in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzputc OF((gzFile file, int c));
-/*
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-
-ZEXTERN int ZEXPORT    gzgetc OF((gzFile file));
-/*
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-
-ZEXTERN int ZEXPORT    gzflush OF((gzFile file, int flush));
-/*
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function. The return value is the zlib
-   error number (see function gzerror below). gzflush returns Z_OK if
-   the flush parameter is Z_FINISH and all output could be flushed.
-     gzflush should be called only when strictly necessary because it can
-   degrade compression.
-*/
-
-ZEXTERN z_off_t ZEXPORT    gzseek OF((gzFile file,
-				      z_off_t offset, int whence));
-/* 
-      Sets the starting position for the next gzread or gzwrite on the
-   given compressed file. The offset represents a number of bytes in the
-   uncompressed data stream. The whence parameter is defined as in lseek(2);
-   the value SEEK_END is not supported.
-     If the file is opened for reading, this function is emulated but can be
-   extremely slow. If the file is opened for writing, only forward seeks are
-   supported; gzseek then compresses a sequence of zeroes up to the new
-   starting position.
-
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error, in
-   particular if the file is opened for writing and the new starting position
-   would be before the current position.
-*/
-
-ZEXTERN int ZEXPORT    gzrewind OF((gzFile file));
-/*
-     Rewinds the given file. This function is supported only for reading.
-
-   gzrewind(file) is equivalent to (int)gzseek(file, 0L, SEEK_SET)
-*/
-
-ZEXTERN z_off_t ZEXPORT    gztell OF((gzFile file));
-/*
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-
-   gztell(file) is equivalent to gzseek(file, 0L, SEEK_CUR)
-*/
-
-ZEXTERN int ZEXPORT gzeof OF((gzFile file));
-/*
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-
-ZEXTERN int ZEXPORT    gzclose OF((gzFile file));
-/*
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state. The return value is the zlib
-   error number (see function gzerror below).
-*/
-
-ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum));
-/*
-     Returns the error message for the last error which occurred on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occurred in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-
-                        /* checksum functions */
-
-/*
-     These functions are not related to compression but are exported
-   anyway because they might be useful in applications using the
-   compression library.
-*/
-
-ZEXTERN uLong ZEXPORT adler32 OF((uLong adler, const Bytef *buf, uInt len));
-
-/*
-     Update a running Adler-32 checksum with the bytes buf[0..len-1] and
-   return the updated checksum. If buf is NULL, this function returns
-   the required initial value for the checksum.
-   An Adler-32 checksum is almost as reliable as a CRC32 but can be computed
-   much faster. Usage example:
-
-     uLong adler = adler32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       adler = adler32(adler, buffer, length);
-     }
-     if (adler != original_adler) error();
-*/
-
-ZEXTERN uLong ZEXPORT crc32   OF((uLong crc, const Bytef *buf, uInt len));
-/*
-     Update a running crc with the bytes buf[0..len-1] and return the updated
-   crc. If buf is NULL, this function returns the required initial value
-   for the crc. Pre- and post-conditioning (one's complement) is performed
-   within this function so it shouldn't be done by the application.
-   Usage example:
-
-     uLong crc = crc32(0L, Z_NULL, 0);
-
-     while (read_buffer(buffer, length) != EOF) {
-       crc = crc32(crc, buffer, length);
-     }
-     if (crc != original_crc) error();
-*/
-
-
-                        /* various hacks, don't look :) */
-
-/* deflateInit and inflateInit are macros to allow checking the zlib version
- * and the compiler's view of z_stream:
- */
-ZEXTERN int ZEXPORT deflateInit_ OF((z_streamp strm, int level,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT inflateInit_ OF((z_streamp strm,
-                                     const char *version, int stream_size));
-ZEXTERN int ZEXPORT deflateInit2_ OF((z_streamp strm, int  level, int  method,
-                                      int windowBits, int memLevel,
-                                      int strategy, const char *version,
-                                      int stream_size));
-ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
-#define deflateInit(strm, level) \
-        deflateInit_((strm), (level),       ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit(strm) \
-        inflateInit_((strm),                ZLIB_VERSION, sizeof(z_stream))
-#define deflateInit2(strm, level, method, windowBits, memLevel, strategy) \
-        deflateInit2_((strm),(level),(method),(windowBits),(memLevel),\
-                      (strategy),           ZLIB_VERSION, sizeof(z_stream))
-#define inflateInit2(strm, windowBits) \
-        inflateInit2_((strm), (windowBits), ZLIB_VERSION, sizeof(z_stream))
-
-
-#if !defined(_Z_UTIL_H) && !defined(NO_DUMMY_DECL)
-    struct internal_state {int dummy;}; /* hack for buggy compilers */
-#endif
-
-ZEXTERN const char   * ZEXPORT zError           OF((int err));
-ZEXTERN int            ZEXPORT inflateSyncPoint OF((z_streamp z));
-ZEXTERN const uLongf * ZEXPORT get_crc_table    OF((void));
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _ZLIB_H */
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
deleted file mode 100644
index 6f2cb97..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Include/zutil.h
+++ /dev/null
@@ -1,220 +0,0 @@
-/* zutil.h -- internal interface and configuration of the compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* @(#) $Id$ */
-
-#ifndef _Z_UTIL_H
-#define _Z_UTIL_H
-
-#include "zlib.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-typedef unsigned char  uch;
-typedef uch FAR uchf;
-typedef unsigned short ush;
-typedef ush FAR ushf;
-typedef unsigned long  ulg;
-
-extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
-/* (size given to avoid silly warnings with Visual C++) */
-
-#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)]
-
-#define ERR_RETURN(strm,err) \
-  return (strm->msg = (char*)ERR_MSG(err), (err))
-/* To be used only when the state is known to be valid */
-
-        /* common constants */
-
-#ifndef DEF_WBITS
-#  define DEF_WBITS MAX_WBITS
-#endif
-/* default windowBits for decompression. MAX_WBITS is for compression only */
-
-#if MAX_MEM_LEVEL >= 8
-#  define DEF_MEM_LEVEL 8
-#else
-#  define DEF_MEM_LEVEL  MAX_MEM_LEVEL
-#endif
-/* default memLevel */
-
-#define STORED_BLOCK 0
-#define STATIC_TREES 1
-#define DYN_TREES    2
-/* The three kinds of block type */
-
-#define MIN_MATCH  3
-#define MAX_MATCH  258
-/* The minimum and maximum match lengths */
-
-#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */
-
-        /* target dependencies */
-
-#ifdef MSDOS
-#  define OS_CODE  0x00
-#  if defined(__TURBOC__) || defined(__BORLANDC__)
-#    if(__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__))
-       /* Allow compilation with ANSI keywords only enabled */
-       void _Cdecl farfree( void *block );
-       void *_Cdecl farmalloc( unsigned long nbytes );
-#    else
-#     include <alloc.h>
-#    endif
-#  else /* MSC or DJGPP */
-#    include <malloc.h>
-#  endif
-#endif
-
-#ifdef OS2
-#  define OS_CODE  0x06
-#endif
-
-#ifdef WIN32 /* Window 95 & Windows NT */
-#  define OS_CODE  0x0b
-#endif
-
-#if defined(VAXC) || defined(VMS)
-#  define OS_CODE  0x02
-#  define F_OPEN(name, mode) \
-     fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512")
-#endif
-
-#ifdef AMIGA
-#  define OS_CODE  0x01
-#endif
-
-#if defined(ATARI) || defined(atarist)
-#  define OS_CODE  0x05
-#endif
-
-#if defined(MACOS) || defined(TARGET_OS_MAC)
-#  define OS_CODE  0x07
-#  if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#    include <unix.h> /* for fdopen */
-#  else
-#    ifndef fdopen
-#      define fdopen(fd,mode) NULL /* No fdopen() */
-#    endif
-#  endif
-#endif
-
-#ifdef __50SERIES /* Prime/PRIMOS */
-#  define OS_CODE  0x0F
-#endif
-
-#ifdef TOPS20
-#  define OS_CODE  0x0a
-#endif
-
-#if defined(_BEOS_) || defined(RISCOS)
-#  define fdopen(fd,mode) NULL /* No fdopen() */
-#endif
-
-#if (defined(_MSC_VER) && (_MSC_VER > 600))
-#  define fdopen(fd,type)  _fdopen(fd,type)
-#endif
-
-
-        /* Common defaults */
-
-#ifndef OS_CODE
-#  define OS_CODE  0x03  /* assume Unix */
-#endif
-
-#ifndef F_OPEN
-#  define F_OPEN(name, mode) fopen((name), (mode))
-#endif
-
-         /* functions */
-
-#ifdef HAVE_STRERROR
-   extern char *strerror OF((int));
-#  define zstrerror(errnum) strerror(errnum)
-#else
-#  define zstrerror(errnum) ""
-#endif
-
-#if defined(pyr)
-#  define NO_MEMCPY
-#endif
-#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__)
- /* Use our own functions for small and medium model with MSC <= 5.0.
-  * You may have to use the same strategy for Borland C (untested).
-  * The __SC__ check is for Symantec.
-  */
-#  define NO_MEMCPY
-#endif
-#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY)
-#  define HAVE_MEMCPY
-#endif
-#ifdef HAVE_MEMCPY
-#  ifdef SMALL_MEDIUM /* MSDOS small or medium model */
-#    define zmemcpy _fmemcpy
-#    define zmemcmp _fmemcmp
-#    define zmemzero(dest, len) _fmemset(dest, 0, len)
-#  else
-#    define zmemcpy memcpy
-#    define zmemcmp memcmp
-#    define zmemzero(dest, len) memset(dest, 0, len)
-#  endif
-#else
-   extern void zmemcpy  OF((Bytef* dest, const Bytef* source, uInt len));
-   extern int  zmemcmp  OF((const Bytef* s1, const Bytef* s2, uInt len));
-   extern void zmemzero OF((Bytef* dest, uInt len));
-#endif
-
-/* Diagnostic functions */
-#ifdef DEBUG
-#  include <stdio.h>
-   extern int z_verbose;
-   extern void z_error    OF((char *m));
-#  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
-#  define Trace(x) {if (z_verbose>=0) fprintf x ;}
-#  define Tracev(x) {if (z_verbose>0) fprintf x ;}
-#  define Tracevv(x) {if (z_verbose>1) fprintf x ;}
-#  define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;}
-#  define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;}
-#else
-#  define Assert(cond,msg)
-#  define Trace(x)
-#  define Tracev(x)
-#  define Tracevv(x)
-#  define Tracec(c,x)
-#  define Tracecv(c,x)
-#endif
-
-
-typedef uLong (ZEXPORT *check_func) OF((uLong check, const Bytef *buf,
-				       uInt len));
-voidpf zcalloc OF((voidpf opaque, unsigned items, unsigned size));
-void   zcfree  OF((voidpf opaque, voidpf ptr));
-
-#define ZALLOC(strm, items, size) \
-           (*((strm)->zalloc))((strm)->opaque, (items), (size))
-#define ZFREE(strm, addr)  (*((strm)->zfree))((strm)->opaque, (voidpf)(addr))
-#define TRY_FREE(s, p) {if (p) ZFREE(s, p);}
-
-#endif /* _Z_UTIL_H */
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
deleted file mode 100644
index 9bcbabf..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-.KEEP_STATE:
-#############################################################################
-#                                                                           #
-#                                   RATER                                   #
-#                                                                           #
-#############################################################################
-
-LIB	    = libzlib.a
-
-INC_DIR = -I../Include
-
-COPT    = -g -w $(INC_DIR) -DP_DEBUG
-LINK	= ar r 
-
-.SUFFIXES: .o .cpp
-.cpp.o:
-	$(CXX) -c $(COPT) $*.cpp
-
-MODULES  = \
-	adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-	zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
-
-################################## RATER ##################################
-
-all: $(LIB)
-
-$(LIB): $(MODULES) 
-	$(LINK) $(LIB) $(MODULES)
-	
-clean:
-	rm -f *.o $(LIB) logfile.txt 
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1 b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
deleted file mode 100644
index 1c14199..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/Makefile.1
+++ /dev/null
@@ -1,35 +0,0 @@
-.KEEP_STATE:
-#############################################################################
-#                                                                           #
-#                                   RATER                                   #
-#                                                                           #
-#############################################################################
-
-LIB	    = librater.a
-
-INC_DIR = -I../Include -I../../Presage/Include
-
-COPT    = -g -w $(INC_DIR) -DP_DEBUG
-LINK	= ar r 
-
-.SUFFIXES: .o .cpp
-.cpp.o:
-	$(CXX) -c $(COPT) $*.cpp
-
-MODULES  = \
-	AMView.o		DimBound.o	RedGroup.o \
-	AlignAxis.o		DistAxis.o	RedVar.o \
-	BGroup.o		Space.o \
-	Block.o		Ls.o		Vm.o RemAccessBuf.o \
-	CommCost.o		ParLoop.o 	DArray.o \
-	intersection.o	LoopBlock.o	LoopLS.o
-
-################################## RATER ##################################
-
-all: $(LIB)
-
-$(LIB): $(MODULES) 
-	$(LINK) $(LIB) $(MODULES)
-	
-clean:
-	rm -f *.o $(LIB) logfile.txt 
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
deleted file mode 100644
index 16cf9a7..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/adler32.c
+++ /dev/null
@@ -1,48 +0,0 @@
-/* adler32.c -- compute the Adler-32 checksum of a data stream
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-
-#define BASE 65521L /* largest prime smaller than 65536 */
-#define NMAX 5552
-/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
-
-#define DO1(buf,i)  {s1 += buf[i]; s2 += s1;}
-#define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
-#define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
-#define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
-#define DO16(buf)   DO8(buf,0); DO8(buf,8);
-
-/* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
-    unsigned long s1 = adler & 0xffff;
-    unsigned long s2 = (adler >> 16) & 0xffff;
-    int k;
-
-    if (buf == Z_NULL) return 1L;
-
-    while (len > 0) {
-        k = len < NMAX ? len : NMAX;
-        len -= k;
-        while (k >= 16) {
-            DO16(buf);
-	    buf += 16;
-            k -= 16;
-        }
-        if (k != 0) do {
-            s1 += *buf++;
-	    s2 += s1;
-        } while (--k);
-        s1 %= BASE;
-        s2 %= BASE;
-    }
-    return (s2 << 16) | s1;
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
deleted file mode 100644
index 1cee470..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/compress.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/* compress.c -- compress a memory buffer
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-
-/* ===========================================================================
-     Compresses the source buffer into the destination buffer. The level
-   parameter has the same meaning as in deflateInit.  sourceLen is the byte
-   length of the source buffer. Upon entry, destLen is the total size of the
-   destination buffer, which must be at least 0.1% larger than sourceLen plus
-   12 bytes. Upon exit, destLen is the actual size of the compressed buffer.
-
-     compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough
-   memory, Z_BUF_ERROR if there was not enough room in the output buffer,
-   Z_STREAM_ERROR if the level parameter is invalid.
-*/
-int ZEXPORT compress2 (dest, destLen, source, sourceLen, level)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-    int level;
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (Bytef*)source;
-    stream.avail_in = (uInt)sourceLen;
-#ifdef MAXSEG_64K
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-#endif
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-    stream.opaque = (voidpf)0;
-
-    err = deflateInit(&stream, level);
-    if (err != Z_OK) return err;
-
-    err = deflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        deflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
-    }
-    *destLen = stream.total_out;
-
-    err = deflateEnd(&stream);
-    return err;
-}
-
-/* ===========================================================================
- */
-int ZEXPORT compress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION);
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
deleted file mode 100644
index a91101a..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/crc32.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/* crc32.c -- compute the CRC-32 of a data stream
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-
-#define local static
-
-#ifdef DYNAMIC_CRC_TABLE
-
-local int crc_table_empty = 1;
-local uLongf crc_table[256];
-local void make_crc_table OF((void));
-
-/*
-  Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:
-  x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.
-
-  Polynomials over GF(2) are represented in binary, one bit per coefficient,
-  with the lowest powers in the most significant bit.  Then adding polynomials
-  is just exclusive-or, and multiplying a polynomial by x is a right shift by
-  one.  If we call the above polynomial p, and represent a byte as the
-  polynomial q, also with the lowest power in the most significant bit (so the
-  byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,
-  where a mod b means the remainder after dividing a by b.
-
-  This calculation is done using the shift-register method of multiplying and
-  taking the remainder.  The register is initialized to zero, and for each
-  incoming bit, x^32 is added mod p to the register if the bit is a one (where
-  x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by
-  x (which is shifting right by one and adding x^32 mod p if the bit shifted
-  out is a one).  We start with the highest power (least significant bit) of
-  q and repeat for all eight bits of q.
-
-  The table is simply the CRC of all possible eight bit values.  This is all
-  the information needed to generate CRC's on data a byte at a time for all
-  combinations of CRC register values and incoming bytes.
-*/
-local void make_crc_table()
-{
-  uLong c;
-  int n, k;
-  uLong poly;            /* polynomial exclusive-or pattern */
-  /* terms of polynomial defining this crc (except x^32): */
-  static const Byte p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26};
-
-  /* make exclusive-or pattern from polynomial (0xedb88320L) */
-  poly = 0L;
-  for (n = 0; n < sizeof(p)/sizeof(Byte); n++)
-    poly |= 1L << (31 - p[n]);
- 
-  for (n = 0; n < 256; n++)
-  {
-    c = (uLong)n;
-    for (k = 0; k < 8; k++)
-      c = c & 1 ? poly ^ (c >> 1) : c >> 1;
-    crc_table[n] = c;
-  }
-  crc_table_empty = 0;
-}
-#else
-/* ========================================================================
- * Table of CRC-32's of all single-byte values (made by make_crc_table)
- */
-local const uLongf crc_table[256] = {
-  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
-  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
-  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
-  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
-  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
-  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
-  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
-  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
-  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
-  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
-  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
-  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
-  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
-  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
-  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
-  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
-  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
-  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
-  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
-  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
-  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
-  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
-  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
-  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
-  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
-  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
-  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
-  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
-  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
-  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
-  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
-  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
-  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
-  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
-  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
-  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
-  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
-  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
-  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
-  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
-  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
-  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
-  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
-  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
-  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
-  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
-  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
-  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
-  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
-  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
-  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
-  0x2d02ef8dL
-};
-#endif
-
-/* =========================================================================
- * This function can be used by asm versions of crc32()
- */
-const uLongf * ZEXPORT get_crc_table()
-{
-#ifdef DYNAMIC_CRC_TABLE
-  if (crc_table_empty) make_crc_table();
-#endif
-  return (const uLongf *)crc_table;
-}
-
-/* ========================================================================= */
-#define DO1(buf) crc = crc_table[((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
-#define DO2(buf)  DO1(buf); DO1(buf);
-#define DO4(buf)  DO2(buf); DO2(buf);
-#define DO8(buf)  DO4(buf); DO4(buf);
-
-/* ========================================================================= */
-uLong ZEXPORT crc32(crc, buf, len)
-    uLong crc;
-    const Bytef *buf;
-    uInt len;
-{
-    if (buf == Z_NULL) return 0L;
-#ifdef DYNAMIC_CRC_TABLE
-    if (crc_table_empty)
-      make_crc_table();
-#endif
-    crc = crc ^ 0xffffffffL;
-    while (len >= 8)
-    {
-      DO8(buf);
-      len -= 8;
-    }
-    if (len) do {
-      DO1(buf);
-    } while (--len);
-    return crc ^ 0xffffffffL;
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
deleted file mode 100644
index 25d5818..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/deflate.c
+++ /dev/null
@@ -1,1350 +0,0 @@
-/* deflate.c -- compress data using the deflation algorithm
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process depends on being able to identify portions
- *      of the input text which are identical to earlier input (within a
- *      sliding window trailing behind the input currently being processed).
- *
- *      The most straightforward technique turns out to be the fastest for
- *      most input files: try all possible matches and select the longest.
- *      The key feature of this algorithm is that insertions into the string
- *      dictionary are very simple and thus fast, and deletions are avoided
- *      completely. Insertions are performed at each input character, whereas
- *      string matches are performed only when the previous match ends. So it
- *      is preferable to spend more time in matches to allow very fast string
- *      insertions and avoid deletions. The matching algorithm for small
- *      strings is inspired from that of Rabin & Karp. A brute force approach
- *      is used to find longer strings when a small match has been found.
- *      A similar algorithm is used in comic (by Jan-Mark Wams) and freeze
- *      (by Leonid Broukhis).
- *         A previous version of this file used a more sophisticated algorithm
- *      (by Fiala and Greene) which is guaranteed to run in linear amortized
- *      time, but has a larger average cost, uses more memory and is patented.
- *      However the F&G algorithm may be faster for some highly redundant
- *      files if the parameter max_chain_length (described below) is too large.
- *
- *  ACKNOWLEDGEMENTS
- *
- *      The idea of lazy evaluation of matches is due to Jan-Mark Wams, and
- *      I found it in 'freeze' written by Leonid Broukhis.
- *      Thanks to many people for bug reports and testing.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"DEFLATE Compressed Data Format Specification".
- *      Available in ftp://ds.internic.net/rfc/rfc1951.txt
- *
- *      A description of the Rabin and Karp algorithm is given in the book
- *         "Algorithms" by R. Sedgewick, Addison-Wesley, p252.
- *
- *      Fiala,E.R., and Greene,D.H.
- *         Data Compression with Finite Windows, Comm.ACM, 32,4 (1989) 490-595
- *
- */
-
-/* @(#) $Id$ */
-
-#include "deflate.h"
-
-const char deflate_copyright[] =
-   " deflate 1.1.3 Copyright 1995-1998 Jean-loup Gailly ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-
-/* ===========================================================================
- *  Function prototypes.
- */
-typedef enum {
-    need_more,      /* block not completed, need more input or more output */
-    block_done,     /* block flush performed */
-    finish_started, /* finish started, need only more output at next deflate */
-    finish_done     /* finish done, accept no more input or output */
-} block_state;
-
-typedef block_state (*compress_func) OF((deflate_state *s, int flush));
-/* Compression function. Returns the block state after the call. */
-
-local void fill_window    OF((deflate_state *s));
-local block_state deflate_stored OF((deflate_state *s, int flush));
-local block_state deflate_fast   OF((deflate_state *s, int flush));
-local block_state deflate_slow   OF((deflate_state *s, int flush));
-local void lm_init        OF((deflate_state *s));
-local void putShortMSB    OF((deflate_state *s, uInt b));
-local void flush_pending  OF((z_streamp strm));
-local int read_buf        OF((z_streamp strm, Bytef *buf, unsigned size));
-#ifdef ASMV
-      void match_init OF((void)); /* asm code initialization */
-      uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#else
-local uInt longest_match  OF((deflate_state *s, IPos cur_match));
-#endif
-
-#ifdef DEBUG
-local  void check_match OF((deflate_state *s, IPos start, IPos match,
-                            int length));
-#endif
-
-/* ===========================================================================
- * Local data
- */
-
-#define NIL 0
-/* Tail of hash chains */
-
-#ifndef TOO_FAR
-#  define TOO_FAR 4096
-#endif
-/* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
-
-#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1)
-/* Minimum amount of lookahead, except at the end of the input file.
- * See deflate.c for comments about the MIN_MATCH+1.
- */
-
-/* Values for max_lazy_match, good_match and max_chain_length, depending on
- * the desired pack level (0..9). The values given below have been tuned to
- * exclude worst case performance for pathological files. Better values may be
- * found for specific files.
- */
-typedef struct config_s {
-   ush good_length; /* reduce lazy search above this match length */
-   ush max_lazy;    /* do not perform lazy search above this match length */
-   ush nice_length; /* quit search above this match length */
-   ush max_chain;
-   compress_func func;
-} config;
-
-local const config configuration_table[10] = {
-/*      good lazy nice chain */
-/* 0 */ {0,    0,  0,    0, deflate_stored},  /* store only */
-/* 1 */ {4,    4,  8,    4, deflate_fast}, /* maximum speed, no lazy matches */
-/* 2 */ {4,    5, 16,    8, deflate_fast},
-/* 3 */ {4,    6, 32,   32, deflate_fast},
-
-/* 4 */ {4,    4, 16,   16, deflate_slow},  /* lazy matches */
-/* 5 */ {8,   16, 32,   32, deflate_slow},
-/* 6 */ {8,   16, 128, 128, deflate_slow},
-/* 7 */ {8,   32, 128, 256, deflate_slow},
-/* 8 */ {32, 128, 258, 1024, deflate_slow},
-/* 9 */ {32, 258, 258, 4096, deflate_slow}}; /* maximum compression */
-
-/* Note: the deflate() code requires max_lazy >= MIN_MATCH and max_chain >= 4
- * For deflate_fast() (levels <= 3) good is ignored and lazy has a different
- * meaning.
- */
-
-#define EQUAL 0
-/* result of memcmp for equal strings */
-
-struct static_tree_desc_s {int dummy;}; /* for buggy compilers */
-
-/* ===========================================================================
- * Update a hash value with the given input byte
- * IN  assertion: all calls to to UPDATE_HASH are made with consecutive
- *    input characters, so that a running hash key can be computed from the
- *    previous key instead of complete recalculation each time.
- */
-#define UPDATE_HASH(s,h,c) (h = (((h)<<s->hash_shift) ^ (c)) & s->hash_mask)
-
-
-/* ===========================================================================
- * Insert string str in the dictionary and set match_head to the previous head
- * of the hash chain (the most recent string with same hash key). Return
- * the previous length of the hash chain.
- * If this file is compiled with -DFASTEST, the compression level is forced
- * to 1, and no hash chains are maintained.
- * IN  assertion: all calls to to INSERT_STRING are made with consecutive
- *    input characters and the first MIN_MATCH bytes of str are valid
- *    (except for the last MIN_MATCH-1 bytes of the input file).
- */
-#ifdef FASTEST
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#else
-#define INSERT_STRING(s, str, match_head) \
-   (UPDATE_HASH(s, s->ins_h, s->window[(str) + (MIN_MATCH-1)]), \
-    s->prev[(str) & s->w_mask] = match_head = s->head[s->ins_h], \
-    s->head[s->ins_h] = (Pos)(str))
-#endif
-
-/* ===========================================================================
- * Initialize the hash table (avoiding 64K overflow for 16 bit systems).
- * prev[] will be initialized on the fly.
- */
-#define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
-
-/* ========================================================================= */
-int ZEXPORT deflateInit_(strm, level, version, stream_size)
-    z_streamp strm;
-    int level;
-    const char *version;
-    int stream_size;
-{
-    return deflateInit2_(strm, level, Z_DEFLATED, MAX_WBITS, DEF_MEM_LEVEL,
-			 Z_DEFAULT_STRATEGY, version, stream_size);
-    /* To do: ignore strm->next_in if we use it as window */
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
-		  version, stream_size)
-    z_streamp strm;
-    int  level;
-    int  method;
-    int  windowBits;
-    int  memLevel;
-    int  strategy;
-    const char *version;
-    int stream_size;
-{
-    deflate_state *s;
-    int noheader = 0;
-    static const char* my_version = ZLIB_VERSION;
-
-    ushf *overlay;
-    /* We overlay pending_buf and d_buf+l_buf. This works since the average
-     * output size for (length,distance) codes is <= 24 bits.
-     */
-
-    if (version == Z_NULL || version[0] != my_version[0] ||
-        stream_size != sizeof(z_stream)) {
-	return Z_VERSION_ERROR;
-    }
-    if (strm == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->msg = Z_NULL;
-    if (strm->zalloc == Z_NULL) {
-	strm->zalloc = zcalloc;
-	strm->opaque = (voidpf)0;
-    }
-    if (strm->zfree == Z_NULL) strm->zfree = zcfree;
-
-    if (level == Z_DEFAULT_COMPRESSION) level = 6;
-#ifdef FASTEST
-    level = 1;
-#endif
-
-    if (windowBits < 0) { /* undocumented feature: suppress zlib header */
-        noheader = 1;
-        windowBits = -windowBits;
-    }
-    if (memLevel < 1 || memLevel > MAX_MEM_LEVEL || method != Z_DEFLATED ||
-        windowBits < 8 || windowBits > 15 || level < 0 || level > 9 ||
-	strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
-        return Z_STREAM_ERROR;
-    }
-    s = (deflate_state *) ZALLOC(strm, 1, sizeof(deflate_state));
-    if (s == Z_NULL) return Z_MEM_ERROR;
-    strm->state = (struct internal_state FAR *)s;
-    s->strm = strm;
-
-    s->noheader = noheader;
-    s->w_bits = windowBits;
-    s->w_size = 1 << s->w_bits;
-    s->w_mask = s->w_size - 1;
-
-    s->hash_bits = memLevel + 7;
-    s->hash_size = 1 << s->hash_bits;
-    s->hash_mask = s->hash_size - 1;
-    s->hash_shift =  ((s->hash_bits+MIN_MATCH-1)/MIN_MATCH);
-
-    s->window = (Bytef *) ZALLOC(strm, s->w_size, 2*sizeof(Byte));
-    s->prev   = (Posf *)  ZALLOC(strm, s->w_size, sizeof(Pos));
-    s->head   = (Posf *)  ZALLOC(strm, s->hash_size, sizeof(Pos));
-
-    s->lit_bufsize = 1 << (memLevel + 6); /* 16K elements by default */
-
-    overlay = (ushf *) ZALLOC(strm, s->lit_bufsize, sizeof(ush)+2);
-    s->pending_buf = (uchf *) overlay;
-    s->pending_buf_size = (ulg)s->lit_bufsize * (sizeof(ush)+2L);
-
-    if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL ||
-        s->pending_buf == Z_NULL) {
-        strm->msg = (char*)ERR_MSG(Z_MEM_ERROR);
-        deflateEnd (strm);
-        return Z_MEM_ERROR;
-    }
-    s->d_buf = overlay + s->lit_bufsize/sizeof(ush);
-    s->l_buf = s->pending_buf + (1+sizeof(ush))*s->lit_bufsize;
-
-    s->level = level;
-    s->strategy = strategy;
-    s->method = (Byte)method;
-
-    return deflateReset(strm);
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength)
-    z_streamp strm;
-    const Bytef *dictionary;
-    uInt  dictLength;
-{
-    deflate_state *s;
-    uInt length = dictLength;
-    uInt n;
-    IPos hash_head = 0;
-
-    if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL ||
-        strm->state->status != INIT_STATE) return Z_STREAM_ERROR;
-
-    s = strm->state;
-    strm->adler = adler32(strm->adler, dictionary, dictLength);
-
-    if (length < MIN_MATCH) return Z_OK;
-    if (length > MAX_DIST(s)) {
-	length = MAX_DIST(s);
-#ifndef USE_DICT_HEAD
-	dictionary += dictLength - length; /* use the tail of the dictionary */
-#endif
-    }
-    zmemcpy(s->window, dictionary, length);
-    s->strstart = length;
-    s->block_start = (long)length;
-
-    /* Insert all strings in the hash table (except for the last two bytes).
-     * s->lookahead stays null, so s->ins_h will be recomputed at the next
-     * call of fill_window.
-     */
-    s->ins_h = s->window[0];
-    UPDATE_HASH(s, s->ins_h, s->window[1]);
-    for (n = 0; n <= length - MIN_MATCH; n++) {
-	INSERT_STRING(s, n, hash_head);
-    }
-    if (hash_head) hash_head = 0;  /* to make compiler happy */
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateReset (strm)
-    z_streamp strm;
-{
-    deflate_state *s;
-    
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-        strm->zalloc == Z_NULL || strm->zfree == Z_NULL) return Z_STREAM_ERROR;
-
-    strm->total_in = strm->total_out = 0;
-    strm->msg = Z_NULL; /* use zfree if we ever allocate msg dynamically */
-    strm->data_type = Z_UNKNOWN;
-
-    s = (deflate_state *)strm->state;
-    s->pending = 0;
-    s->pending_out = s->pending_buf;
-
-    if (s->noheader < 0) {
-        s->noheader = 0; /* was set to -1 by deflate(..., Z_FINISH); */
-    }
-    s->status = s->noheader ? BUSY_STATE : INIT_STATE;
-    strm->adler = 1;
-    s->last_flush = Z_NO_FLUSH;
-
-    _tr_init(s);
-    lm_init(s);
-
-    return Z_OK;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateParams(strm, level, strategy)
-    z_streamp strm;
-    int level;
-    int strategy;
-{
-    deflate_state *s;
-    compress_func func;
-    int err = Z_OK;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-    s = strm->state;
-
-    if (level == Z_DEFAULT_COMPRESSION) {
-	level = 6;
-    }
-    if (level < 0 || level > 9 || strategy < 0 || strategy > Z_HUFFMAN_ONLY) {
-	return Z_STREAM_ERROR;
-    }
-    func = configuration_table[s->level].func;
-
-    if (func != configuration_table[level].func && strm->total_in != 0) {
-	/* Flush the last buffer: */
-	err = deflate(strm, Z_PARTIAL_FLUSH);
-    }
-    if (s->level != level) {
-	s->level = level;
-	s->max_lazy_match   = configuration_table[level].max_lazy;
-	s->good_match       = configuration_table[level].good_length;
-	s->nice_match       = configuration_table[level].nice_length;
-	s->max_chain_length = configuration_table[level].max_chain;
-    }
-    s->strategy = strategy;
-    return err;
-}
-
-/* =========================================================================
- * Put a short in the pending buffer. The 16-bit value is put in MSB order.
- * IN assertion: the stream state is correct and there is enough room in
- * pending_buf.
- */
-local void putShortMSB (s, b)
-    deflate_state *s;
-    uInt b;
-{
-    put_byte(s, (Byte)(b >> 8));
-    put_byte(s, (Byte)(b & 0xff));
-}   
-
-/* =========================================================================
- * Flush as much pending output as possible. All deflate() output goes
- * through this function so some applications may wish to modify it
- * to avoid allocating a large strm->next_out buffer and copying into it.
- * (See also read_buf()).
- */
-local void flush_pending(strm)
-    z_streamp strm;
-{
-    unsigned len = strm->state->pending;
-
-    if (len > strm->avail_out) len = strm->avail_out;
-    if (len == 0) return;
-
-    zmemcpy(strm->next_out, strm->state->pending_out, len);
-    strm->next_out  += len;
-    strm->state->pending_out  += len;
-    strm->total_out += len;
-    strm->avail_out  -= len;
-    strm->state->pending -= len;
-    if (strm->state->pending == 0) {
-        strm->state->pending_out = strm->state->pending_buf;
-    }
-}
-
-/* ========================================================================= */
-int ZEXPORT deflate (strm, flush)
-    z_streamp strm;
-    int flush;
-{
-    int old_flush; /* value of flush param for previous deflate call */
-    deflate_state *s;
-
-    if (strm == Z_NULL || strm->state == Z_NULL ||
-	flush > Z_FINISH || flush < 0) {
-        return Z_STREAM_ERROR;
-    }
-    s = strm->state;
-
-    if (strm->next_out == Z_NULL ||
-        (strm->next_in == Z_NULL && strm->avail_in != 0) ||
-	(s->status == FINISH_STATE && flush != Z_FINISH)) {
-        ERR_RETURN(strm, Z_STREAM_ERROR);
-    }
-    if (strm->avail_out == 0) ERR_RETURN(strm, Z_BUF_ERROR);
-
-    s->strm = strm; /* just in case */
-    old_flush = s->last_flush;
-    s->last_flush = flush;
-
-    /* Write the zlib header */
-    if (s->status == INIT_STATE) {
-
-        uInt header = (Z_DEFLATED + ((s->w_bits-8)<<4)) << 8;
-        uInt level_flags = (s->level-1) >> 1;
-
-        if (level_flags > 3) level_flags = 3;
-        header |= (level_flags << 6);
-	if (s->strstart != 0) header |= PRESET_DICT;
-        header += 31 - (header % 31);
-
-        s->status = BUSY_STATE;
-        putShortMSB(s, header);
-
-	/* Save the adler32 of the preset dictionary: */
-	if (s->strstart != 0) {
-	    putShortMSB(s, (uInt)(strm->adler >> 16));
-	    putShortMSB(s, (uInt)(strm->adler & 0xffff));
-	}
-	strm->adler = 1L;
-    }
-
-    /* Flush as much pending output as possible */
-    if (s->pending != 0) {
-        flush_pending(strm);
-        if (strm->avail_out == 0) {
-	    /* Since avail_out is 0, deflate will be called again with
-	     * more output space, but possibly with both pending and
-	     * avail_in equal to zero. There won't be anything to do,
-	     * but this is not an error situation so make sure we
-	     * return OK instead of BUF_ERROR at next call of deflate:
-             */
-	    s->last_flush = -1;
-	    return Z_OK;
-	}
-
-    /* Make sure there is something to do and avoid duplicate consecutive
-     * flushes. For repeated and useless calls with Z_FINISH, we keep
-     * returning Z_STREAM_END instead of Z_BUFF_ERROR.
-     */
-    } else if (strm->avail_in == 0 && flush <= old_flush &&
-	       flush != Z_FINISH) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* User must not provide more input after the first FINISH: */
-    if (s->status == FINISH_STATE && strm->avail_in != 0) {
-        ERR_RETURN(strm, Z_BUF_ERROR);
-    }
-
-    /* Start a new block or continue the current one.
-     */
-    if (strm->avail_in != 0 || s->lookahead != 0 ||
-        (flush != Z_NO_FLUSH && s->status != FINISH_STATE)) {
-        block_state bstate;
-
-	bstate = (*(configuration_table[s->level].func))(s, flush);
-
-        if (bstate == finish_started || bstate == finish_done) {
-            s->status = FINISH_STATE;
-        }
-        if (bstate == need_more || bstate == finish_started) {
-	    if (strm->avail_out == 0) {
-	        s->last_flush = -1; /* avoid BUF_ERROR next call, see above */
-	    }
-	    return Z_OK;
-	    /* If flush != Z_NO_FLUSH && avail_out == 0, the next call
-	     * of deflate should use the same flush parameter to make sure
-	     * that the flush is complete. So we don't have to output an
-	     * empty block here, this will be done at next call. This also
-	     * ensures that for a very small output buffer, we emit at most
-	     * one empty block.
-	     */
-	}
-        if (bstate == block_done) {
-            if (flush == Z_PARTIAL_FLUSH) {
-                _tr_align(s);
-            } else { /* FULL_FLUSH or SYNC_FLUSH */
-                _tr_stored_block(s, (char*)0, 0L, 0);
-                /* For a full flush, this empty block will be recognized
-                 * as a special marker by inflate_sync().
-                 */
-                if (flush == Z_FULL_FLUSH) {
-                    CLEAR_HASH(s);             /* forget history */
-                }
-            }
-            flush_pending(strm);
-	    if (strm->avail_out == 0) {
-	      s->last_flush = -1; /* avoid BUF_ERROR at next call, see above */
-	      return Z_OK;
-	    }
-        }
-    }
-    Assert(strm->avail_out > 0, "bug2");
-
-    if (flush != Z_FINISH) return Z_OK;
-    if (s->noheader) return Z_STREAM_END;
-
-    /* Write the zlib trailer (adler32) */
-    putShortMSB(s, (uInt)(strm->adler >> 16));
-    putShortMSB(s, (uInt)(strm->adler & 0xffff));
-    flush_pending(strm);
-    /* If avail_out is zero, the application will call deflate again
-     * to flush the rest.
-     */
-    s->noheader = -1; /* write the trailer only once! */
-    return s->pending != 0 ? Z_OK : Z_STREAM_END;
-}
-
-/* ========================================================================= */
-int ZEXPORT deflateEnd (strm)
-    z_streamp strm;
-{
-    int status;
-
-    if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR;
-
-    status = strm->state->status;
-    if (status != INIT_STATE && status != BUSY_STATE &&
-	status != FINISH_STATE) {
-      return Z_STREAM_ERROR;
-    }
-
-    /* Deallocate in reverse order of allocations: */
-    TRY_FREE(strm, strm->state->pending_buf);
-    TRY_FREE(strm, strm->state->head);
-    TRY_FREE(strm, strm->state->prev);
-    TRY_FREE(strm, strm->state->window);
-
-    ZFREE(strm, strm->state);
-    strm->state = Z_NULL;
-
-    return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
-}
-
-/* =========================================================================
- * Copy the source state to the destination state.
- * To simplify the source, this is not supported for 16-bit MSDOS (which
- * doesn't have enough memory anyway to duplicate compression states).
- */
-int ZEXPORT deflateCopy (dest, source)
-    z_streamp dest;
-    z_streamp source;
-{
-#ifdef MAXSEG_64K
-    return Z_STREAM_ERROR;
-#else
-    deflate_state *ds;
-    deflate_state *ss;
-    ushf *overlay;
-
-
-    if (source == Z_NULL || dest == Z_NULL || source->state == Z_NULL) {
-        return Z_STREAM_ERROR;
-    }
-
-    ss = source->state;
-
-    *dest = *source;
-
-    ds = (deflate_state *) ZALLOC(dest, 1, sizeof(deflate_state));
-    if (ds == Z_NULL) return Z_MEM_ERROR;
-    dest->state = (struct internal_state FAR *) ds;
-    *ds = *ss;
-    ds->strm = dest;
-
-    ds->window = (Bytef *) ZALLOC(dest, ds->w_size, 2*sizeof(Byte));
-    ds->prev   = (Posf *)  ZALLOC(dest, ds->w_size, sizeof(Pos));
-    ds->head   = (Posf *)  ZALLOC(dest, ds->hash_size, sizeof(Pos));
-    overlay = (ushf *) ZALLOC(dest, ds->lit_bufsize, sizeof(ush)+2);
-    ds->pending_buf = (uchf *) overlay;
-
-    if (ds->window == Z_NULL || ds->prev == Z_NULL || ds->head == Z_NULL ||
-        ds->pending_buf == Z_NULL) {
-        deflateEnd (dest);
-        return Z_MEM_ERROR;
-    }
-    /* following zmemcpy do not work for 16-bit MSDOS */
-    zmemcpy(ds->window, ss->window, ds->w_size * 2 * sizeof(Byte));
-    zmemcpy(ds->prev, ss->prev, ds->w_size * sizeof(Pos));
-    zmemcpy(ds->head, ss->head, ds->hash_size * sizeof(Pos));
-    zmemcpy(ds->pending_buf, ss->pending_buf, (uInt)ds->pending_buf_size);
-
-    ds->pending_out = ds->pending_buf + (ss->pending_out - ss->pending_buf);
-    ds->d_buf = overlay + ds->lit_bufsize/sizeof(ush);
-    ds->l_buf = ds->pending_buf + (1+sizeof(ush))*ds->lit_bufsize;
-
-    ds->l_desc.dyn_tree = ds->dyn_ltree;
-    ds->d_desc.dyn_tree = ds->dyn_dtree;
-    ds->bl_desc.dyn_tree = ds->bl_tree;
-
-    return Z_OK;
-#endif
-}
-
-/* ===========================================================================
- * Read a new buffer from the current input stream, update the adler32
- * and total number of bytes read.  All deflate() input goes through
- * this function so some applications may wish to modify it to avoid
- * allocating a large strm->next_in buffer and copying from it.
- * (See also flush_pending()).
- */
-local int read_buf(strm, buf, size)
-    z_streamp strm;
-    Bytef *buf;
-    unsigned size;
-{
-    unsigned len = strm->avail_in;
-
-    if (len > size) len = size;
-    if (len == 0) return 0;
-
-    strm->avail_in  -= len;
-
-    if (!strm->state->noheader) {
-        strm->adler = adler32(strm->adler, strm->next_in, len);
-    }
-    zmemcpy(buf, strm->next_in, len);
-    strm->next_in  += len;
-    strm->total_in += len;
-
-    return (int)len;
-}
-
-/* ===========================================================================
- * Initialize the "longest match" routines for a new zlib stream
- */
-local void lm_init (s)
-    deflate_state *s;
-{
-    s->window_size = (ulg)2L*s->w_size;
-
-    CLEAR_HASH(s);
-
-    /* Set the default configuration parameters:
-     */
-    s->max_lazy_match   = configuration_table[s->level].max_lazy;
-    s->good_match       = configuration_table[s->level].good_length;
-    s->nice_match       = configuration_table[s->level].nice_length;
-    s->max_chain_length = configuration_table[s->level].max_chain;
-
-    s->strstart = 0;
-    s->block_start = 0L;
-    s->lookahead = 0;
-    s->match_length = s->prev_length = MIN_MATCH-1;
-    s->match_available = 0;
-    s->ins_h = 0;
-#ifdef ASMV
-    match_init(); /* initialize the asm code */
-#endif
-}
-
-/* ===========================================================================
- * Set match_start to the longest match starting at the given string and
- * return its length. Matches shorter or equal to prev_length are discarded,
- * in which case the result is equal to prev_length and match_start is
- * garbage.
- * IN assertions: cur_match is the head of the hash chain for the current
- *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
- * OUT assertion: the match length is not greater than s->lookahead.
- */
-#ifndef ASMV
-/* For 80x86 and 680x0, an optimized version will be provided in match.asm or
- * match.S. The code will be functionally equivalent.
- */
-#ifndef FASTEST
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    unsigned chain_length = s->max_chain_length;/* max hash chain length */
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    int best_len = s->prev_length;              /* best match length so far */
-    int nice_match = s->nice_match;             /* stop if match long enough */
-    IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
-        s->strstart - (IPos)MAX_DIST(s) : NIL;
-    /* Stop when cur_match becomes <= limit. To simplify the code,
-     * we prevent matches with the string of window index 0.
-     */
-    Posf *prev = s->prev;
-    uInt wmask = s->w_mask;
-
-#ifdef UNALIGNED_OK
-    /* Compare two bytes at a time. Note: this is not always beneficial.
-     * Try with and without -DUNALIGNED_OK to check.
-     */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
-    register ush scan_start = *(ushf*)scan;
-    register ush scan_end   = *(ushf*)(scan+best_len-1);
-#else
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-    register Byte scan_end1  = scan[best_len-1];
-    register Byte scan_end   = scan[best_len];
-#endif
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    /* Do not waste too much time if we already have a good match: */
-    if (s->prev_length >= s->good_match) {
-        chain_length >>= 2;
-    }
-    /* Do not look for matches beyond the end of the input. This is necessary
-     * to make deflate deterministic.
-     */
-    if ((uInt)nice_match > s->lookahead) nice_match = s->lookahead;
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    do {
-        Assert(cur_match < s->strstart, "no future");
-        match = s->window + cur_match;
-
-        /* Skip to next match if the match length cannot increase
-         * or if the match length is less than 2:
-         */
-#if (defined(UNALIGNED_OK) && MAX_MATCH == 258)
-        /* This code assumes sizeof(unsigned short) == 2. Do not use
-         * UNALIGNED_OK if your compiler uses a different size.
-         */
-        if (*(ushf*)(match+best_len-1) != scan_end ||
-            *(ushf*)match != scan_start) continue;
-
-        /* It is not necessary to compare scan[2] and match[2] since they are
-         * always equal when the other bytes match, given that the hash keys
-         * are equal and that HASH_BITS >= 8. Compare 2 bytes at a time at
-         * strstart+3, +5, ... up to strstart+257. We check for insufficient
-         * lookahead only every 4th comparison; the 128th check will be made
-         * at strstart+257. If MAX_MATCH-2 is not a multiple of 8, it is
-         * necessary to put more guard bytes at the end of the window, or
-         * to check more often for insufficient lookahead.
-         */
-        Assert(scan[2] == match[2], "scan[2]?");
-        scan++, match++;
-        do {
-        } while (*(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 *(ushf*)(scan+=2) == *(ushf*)(match+=2) &&
-                 scan < strend);
-        /* The funny "do {}" generates better code on most compilers */
-
-        /* Here, scan <= window+strstart+257 */
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-        if (*scan == *match) scan++;
-
-        len = (MAX_MATCH - 1) - (int)(strend-scan);
-        scan = strend - (MAX_MATCH-1);
-
-#else /* UNALIGNED_OK */
-
-        if (match[best_len]   != scan_end  ||
-            match[best_len-1] != scan_end1 ||
-            *match            != *scan     ||
-            *++match          != scan[1])      continue;
-
-        /* The check at best_len-1 can be removed because it will be made
-         * again later. (This heuristic is not always a win.)
-         * It is not necessary to compare scan[2] and match[2] since they
-         * are always equal when the other bytes match, given that
-         * the hash keys are equal and that HASH_BITS >= 8.
-         */
-        scan += 2, match++;
-        Assert(*scan == *match, "match[2]?");
-
-        /* We check for insufficient lookahead only every 8th comparison;
-         * the 256th check will be made at strstart+258.
-         */
-        do {
-        } while (*++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 *++scan == *++match && *++scan == *++match &&
-                 scan < strend);
-
-        Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-        len = MAX_MATCH - (int)(strend - scan);
-        scan = strend - MAX_MATCH;
-
-#endif /* UNALIGNED_OK */
-
-        if (len > best_len) {
-            s->match_start = cur_match;
-            best_len = len;
-            if (len >= nice_match) break;
-#ifdef UNALIGNED_OK
-            scan_end = *(ushf*)(scan+best_len-1);
-#else
-            scan_end1  = scan[best_len-1];
-            scan_end   = scan[best_len];
-#endif
-        }
-    } while ((cur_match = prev[cur_match & wmask]) > limit
-             && --chain_length != 0);
-
-    if ((uInt)best_len <= s->lookahead) return (uInt)best_len;
-    return s->lookahead;
-}
-
-#else /* FASTEST */
-/* ---------------------------------------------------------------------------
- * Optimized version for level == 1 only
- */
-local uInt longest_match(s, cur_match)
-    deflate_state *s;
-    IPos cur_match;                             /* current match */
-{
-    register Bytef *scan = s->window + s->strstart; /* current string */
-    register Bytef *match;                       /* matched string */
-    register int len;                           /* length of current match */
-    register Bytef *strend = s->window + s->strstart + MAX_MATCH;
-
-    /* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
-     * It is easy to get rid of this optimization if necessary.
-     */
-    Assert(s->hash_bits >= 8 && MAX_MATCH == 258, "Code too clever");
-
-    Assert((ulg)s->strstart <= s->window_size-MIN_LOOKAHEAD, "need lookahead");
-
-    Assert(cur_match < s->strstart, "no future");
-
-    match = s->window + cur_match;
-
-    /* Return failure if the match length is less than 2:
-     */
-    if (match[0] != scan[0] || match[1] != scan[1]) return MIN_MATCH-1;
-
-    /* The check at best_len-1 can be removed because it will be made
-     * again later. (This heuristic is not always a win.)
-     * It is not necessary to compare scan[2] and match[2] since they
-     * are always equal when the other bytes match, given that
-     * the hash keys are equal and that HASH_BITS >= 8.
-     */
-    scan += 2, match += 2;
-    Assert(*scan == *match, "match[2]?");
-
-    /* We check for insufficient lookahead only every 8th comparison;
-     * the 256th check will be made at strstart+258.
-     */
-    do {
-    } while (*++scan == *++match && *++scan == *++match &&
-	     *++scan == *++match && *++scan == *++match &&
-	     *++scan == *++match && *++scan == *++match &&
-	     *++scan == *++match && *++scan == *++match &&
-	     scan < strend);
-
-    Assert(scan <= s->window+(unsigned)(s->window_size-1), "wild scan");
-
-    len = MAX_MATCH - (int)(strend - scan);
-
-    if (len < MIN_MATCH) return MIN_MATCH - 1;
-
-    s->match_start = cur_match;
-    return len <= s->lookahead ? len : s->lookahead;
-}
-#endif /* FASTEST */
-#endif /* ASMV */
-
-#ifdef DEBUG
-/* ===========================================================================
- * Check that the match at match_start is indeed a match.
- */
-local void check_match(s, start, match, length)
-    deflate_state *s;
-    IPos start, match;
-    int length;
-{
-    /* check that the match is indeed a match */
-    if (zmemcmp(s->window + match,
-                s->window + start, length) != EQUAL) {
-        fprintf(stderr, " start %u, match %u, length %d\n",
-		start, match, length);
-        do {
-	    fprintf(stderr, "%c%c", s->window[match++], s->window[start++]);
-	} while (--length != 0);
-        z_error("invalid match");
-    }
-    if (z_verbose > 1) {
-        fprintf(stderr,"\\[%d,%d]", start-match, length);
-        do { putc(s->window[start++], stderr); } while (--length != 0);
-    }
-}
-#else
-#  define check_match(s, start, match, length)
-#endif
-
-/* ===========================================================================
- * Fill the window when the lookahead becomes insufficient.
- * Updates strstart and lookahead.
- *
- * IN assertion: lookahead < MIN_LOOKAHEAD
- * OUT assertions: strstart <= window_size-MIN_LOOKAHEAD
- *    At least one byte has been read, or avail_in == 0; reads are
- *    performed for at least two bytes (required for the zip translate_eol
- *    option -- not supported here).
- */
-local void fill_window(s)
-    deflate_state *s;
-{
-    register unsigned n, m;
-    register Posf *p;
-    unsigned more;    /* Amount of free space at the end of the window. */
-    uInt wsize = s->w_size;
-
-    do {
-        more = (unsigned)(s->window_size -(ulg)s->lookahead -(ulg)s->strstart);
-
-        /* Deal with !@#$% 64K limit: */
-        if (more == 0 && s->strstart == 0 && s->lookahead == 0) {
-            more = wsize;
-
-        } else if (more == (unsigned)(-1)) {
-            /* Very unlikely, but possible on 16 bit machine if strstart == 0
-             * and lookahead == 1 (input done one byte at time)
-             */
-            more--;
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        } else if (s->strstart >= wsize+MAX_DIST(s)) {
-
-            zmemcpy(s->window, s->window+wsize, (unsigned)wsize);
-            s->match_start -= wsize;
-            s->strstart    -= wsize; /* we now have strstart >= MAX_DIST */
-            s->block_start -= (long) wsize;
-
-            /* Slide the hash table (could be avoided with 32 bit values
-               at the expense of memory usage). We slide even when level == 0
-               to keep the hash table consistent if we switch back to level > 0
-               later. (Using level 0 permanently is not an optimal usage of
-               zlib, so we don't care about this pathological case.)
-             */
-	    n = s->hash_size;
-	    p = &s->head[n];
-	    do {
-		m = *--p;
-		*p = (Pos)(m >= wsize ? m-wsize : NIL);
-	    } while (--n);
-
-	    n = wsize;
-#ifndef FASTEST
-	    p = &s->prev[n];
-	    do {
-		m = *--p;
-		*p = (Pos)(m >= wsize ? m-wsize : NIL);
-		/* If n is not on any hash chain, prev[n] is garbage but
-		 * its value will never be used.
-		 */
-	    } while (--n);
-#endif
-            more += wsize;
-        }
-        if (s->strm->avail_in == 0) return;
-
-        /* If there was no sliding:
-         *    strstart <= WSIZE+MAX_DIST-1 && lookahead <= MIN_LOOKAHEAD - 1 &&
-         *    more == window_size - lookahead - strstart
-         * => more >= window_size - (MIN_LOOKAHEAD-1 + WSIZE + MAX_DIST-1)
-         * => more >= window_size - 2*WSIZE + 2
-         * In the BIG_MEM or MMAP case (not yet supported),
-         *   window_size == input_size + MIN_LOOKAHEAD  &&
-         *   strstart + s->lookahead <= input_size => more >= MIN_LOOKAHEAD.
-         * Otherwise, window_size == 2*WSIZE so more >= 2.
-         * If there was sliding, more >= WSIZE. So in all cases, more >= 2.
-         */
-        Assert(more >= 2, "more < 2");
-
-        n = read_buf(s->strm, s->window + s->strstart + s->lookahead, more);
-        s->lookahead += n;
-
-        /* Initialize the hash value now that we have some input: */
-        if (s->lookahead >= MIN_MATCH) {
-            s->ins_h = s->window[s->strstart];
-            UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-            Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-        }
-        /* If the whole input has less than MIN_MATCH bytes, ins_h is garbage,
-         * but this is not important since only literal bytes will be emitted.
-         */
-
-    } while (s->lookahead < MIN_LOOKAHEAD && s->strm->avail_in != 0);
-}
-
-/* ===========================================================================
- * Flush the current block, with given end-of-file flag.
- * IN assertion: strstart is set to the end of the current match.
- */
-#define FLUSH_BLOCK_ONLY(s, eof) { \
-   _tr_flush_block(s, (s->block_start >= 0L ? \
-                   (charf *)&s->window[(unsigned)s->block_start] : \
-                   (charf *)Z_NULL), \
-		(ulg)((long)s->strstart - s->block_start), \
-		(eof)); \
-   s->block_start = s->strstart; \
-   flush_pending(s->strm); \
-   Tracev((stderr,"[FLUSH]")); \
-}
-
-/* Same but force premature exit if necessary. */
-#define FLUSH_BLOCK(s, eof) { \
-   FLUSH_BLOCK_ONLY(s, eof); \
-   if (s->strm->avail_out == 0) return (eof) ? finish_started : need_more; \
-}
-
-/* ===========================================================================
- * Copy without compression as much as possible from the input stream, return
- * the current block state.
- * This function does not insert new strings in the dictionary since
- * uncompressible data is probably not useful. This function is used
- * only for the level=0 compression option.
- * NOTE: this function should be optimized to avoid extra copying from
- * window to pending_buf.
- */
-local block_state deflate_stored(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    /* Stored blocks are limited to 0xffff bytes, pending_buf is limited
-     * to pending_buf_size, and each stored block has a 5 byte header:
-     */
-    ulg max_block_size = 0xffff;
-    ulg max_start;
-
-    if (max_block_size > s->pending_buf_size - 5) {
-        max_block_size = s->pending_buf_size - 5;
-    }
-
-    /* Copy as much as possible from input to output: */
-    for (;;) {
-        /* Fill the window as much as possible: */
-        if (s->lookahead <= 1) {
-
-            Assert(s->strstart < s->w_size+MAX_DIST(s) ||
-		   s->block_start >= (long)s->w_size, "slide too late");
-
-            fill_window(s);
-            if (s->lookahead == 0 && flush == Z_NO_FLUSH) return need_more;
-
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-	Assert(s->block_start >= 0L, "block gone");
-
-	s->strstart += s->lookahead;
-	s->lookahead = 0;
-
-	/* Emit a stored block if pending_buf will be full: */
- 	max_start = s->block_start + max_block_size;
-        if (s->strstart == 0 || (ulg)s->strstart >= max_start) {
-	    /* strstart == 0 is possible when wraparound on 16-bit machine */
-	    s->lookahead = (uInt)(s->strstart - max_start);
-	    s->strstart = (uInt)max_start;
-            FLUSH_BLOCK(s, 0);
-	}
-	/* Flush if we may have to slide, otherwise block_start may become
-         * negative and the data will be gone:
-         */
-        if (s->strstart - (uInt)s->block_start >= MAX_DIST(s)) {
-            FLUSH_BLOCK(s, 0);
-	}
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-/* ===========================================================================
- * Compress as much as possible from the input stream, return the current
- * block state.
- * This function does not perform lazy evaluation of matches and inserts
- * new strings in the dictionary only for unmatched strings or for short
- * matches. It is used only for the fast compression options.
- */
-local block_state deflate_fast(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head = NIL; /* head of the hash chain */
-    int bflush;           /* set if current block must be flushed */
-
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-	        return need_more;
-	    }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-        if (hash_head != NIL && s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            if (s->strategy != Z_HUFFMAN_ONLY) {
-                s->match_length = longest_match (s, hash_head);
-            }
-            /* longest_match() sets match_start */
-        }
-        if (s->match_length >= MIN_MATCH) {
-            check_match(s, s->strstart, s->match_start, s->match_length);
-
-            _tr_tally_dist(s, s->strstart - s->match_start,
-                           s->match_length - MIN_MATCH, bflush);
-
-            s->lookahead -= s->match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-#ifndef FASTEST
-            if (s->match_length <= s->max_insert_length &&
-                s->lookahead >= MIN_MATCH) {
-                s->match_length--; /* string at strstart already in hash table */
-                do {
-                    s->strstart++;
-                    INSERT_STRING(s, s->strstart, hash_head);
-                    /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                     * always MIN_MATCH bytes ahead.
-                     */
-                } while (--s->match_length != 0);
-                s->strstart++; 
-            } else
-#endif
-	    {
-                s->strstart += s->match_length;
-                s->match_length = 0;
-                s->ins_h = s->window[s->strstart];
-                UPDATE_HASH(s, s->ins_h, s->window[s->strstart+1]);
-#if MIN_MATCH != 3
-                Call UPDATE_HASH() MIN_MATCH-3 more times
-#endif
-                /* If lookahead < MIN_MATCH, ins_h is garbage, but it does not
-                 * matter since it will be recomputed at next deflate call.
-                 */
-            }
-        } else {
-            /* No match, output a literal byte */
-            Tracevv((stderr,"%c", s->window[s->strstart]));
-            _tr_tally_lit (s, s->window[s->strstart], bflush);
-            s->lookahead--;
-            s->strstart++; 
-        }
-        if (bflush) FLUSH_BLOCK(s, 0);
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
-
-/* ===========================================================================
- * Same as above, but achieves better compression. We use a lazy
- * evaluation for matches: a match is finally adopted only if there is
- * no better match at the next window position.
- */
-local block_state deflate_slow(s, flush)
-    deflate_state *s;
-    int flush;
-{
-    IPos hash_head = NIL;    /* head of hash chain */
-    int bflush;              /* set if current block must be flushed */
-
-    /* Process the input block. */
-    for (;;) {
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-        if (s->lookahead < MIN_LOOKAHEAD) {
-            fill_window(s);
-            if (s->lookahead < MIN_LOOKAHEAD && flush == Z_NO_FLUSH) {
-	        return need_more;
-	    }
-            if (s->lookahead == 0) break; /* flush the current block */
-        }
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-        if (s->lookahead >= MIN_MATCH) {
-            INSERT_STRING(s, s->strstart, hash_head);
-        }
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-        s->prev_length = s->match_length, s->prev_match = s->match_start;
-        s->match_length = MIN_MATCH-1;
-
-        if (hash_head != NIL && s->prev_length < s->max_lazy_match &&
-            s->strstart - hash_head <= MAX_DIST(s)) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-            if (s->strategy != Z_HUFFMAN_ONLY) {
-                s->match_length = longest_match (s, hash_head);
-            }
-            /* longest_match() sets match_start */
-
-            if (s->match_length <= 5 && (s->strategy == Z_FILTERED ||
-                 (s->match_length == MIN_MATCH &&
-                  s->strstart - s->match_start > TOO_FAR))) {
-
-                /* If prev_match is also MIN_MATCH, match_start is garbage
-                 * but we will ignore the current match anyway.
-                 */
-                s->match_length = MIN_MATCH-1;
-            }
-        }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-        if (s->prev_length >= MIN_MATCH && s->match_length <= s->prev_length) {
-            uInt max_insert = s->strstart + s->lookahead - MIN_MATCH;
-            /* Do not insert strings in hash table beyond this. */
-
-            check_match(s, s->strstart-1, s->prev_match, s->prev_length);
-
-            _tr_tally_dist(s, s->strstart -1 - s->prev_match,
-			   s->prev_length - MIN_MATCH, bflush);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted. If there is not
-             * enough lookahead, the last two strings are not inserted in
-             * the hash table.
-             */
-            s->lookahead -= s->prev_length-1;
-            s->prev_length -= 2;
-            do {
-                if (++s->strstart <= max_insert) {
-                    INSERT_STRING(s, s->strstart, hash_head);
-                }
-            } while (--s->prev_length != 0);
-            s->match_available = 0;
-            s->match_length = MIN_MATCH-1;
-            s->strstart++;
-
-            if (bflush) FLUSH_BLOCK(s, 0);
-
-        } else if (s->match_available) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-            Tracevv((stderr,"%c", s->window[s->strstart-1]));
-	    _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-	    if (bflush) {
-                FLUSH_BLOCK_ONLY(s, 0);
-            }
-            s->strstart++;
-            s->lookahead--;
-            if (s->strm->avail_out == 0) return need_more;
-        } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-            s->match_available = 1;
-            s->strstart++;
-            s->lookahead--;
-        }
-    }
-    Assert (flush != Z_NO_FLUSH, "no flush?");
-    if (s->match_available) {
-        Tracevv((stderr,"%c", s->window[s->strstart-1]));
-        _tr_tally_lit(s, s->window[s->strstart-1], bflush);
-        s->match_available = 0;
-    }
-    FLUSH_BLOCK(s, flush == Z_FINISH);
-    return flush == Z_FINISH ? finish_done : block_done;
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/example.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
deleted file mode 100644
index 8307c84..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/example.c
+++ /dev/null
@@ -1,556 +0,0 @@
-/* example.c -- usage example of the zlib compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include <stdio.h>
-#include "zlib.h"
-
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#else
-   extern void exit  OF((int));
-#endif
-
-#if defined(VMS) || defined(RISCOS)
-#  define TESTFILE "foo-gz"
-#else
-#  define TESTFILE "foo.gz"
-#endif
-
-#define CHECK_ERR(err, msg) { \
-    if (err != Z_OK) { \
-        fprintf(stderr, "%s error: %d\n", msg, err); \
-        exit(1); \
-    } \
-}
-
-const char hello[] = "hello, hello!";
-/* "hello world" would be more standard, but the repeated "hello"
- * stresses the compression code better, sorry...
- */
-
-const char dictionary[] = "hello";
-uLong dictId; /* Adler32 value of the dictionary */
-
-void test_compress      OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_gzio          OF((const char *out, const char *in, 
-		            Byte *uncompr, int uncomprLen));
-void test_deflate       OF((Byte *compr, uLong comprLen));
-void test_inflate       OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_large_deflate OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_large_inflate OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_flush         OF((Byte *compr, uLong *comprLen));
-void test_sync          OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-void test_dict_deflate  OF((Byte *compr, uLong comprLen));
-void test_dict_inflate  OF((Byte *compr, uLong comprLen,
-		            Byte *uncompr, uLong uncomprLen));
-int  main               OF((int argc, char *argv[]));
-
-/* ===========================================================================
- * Test compress() and uncompress()
- */
-void test_compress(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    uLong len = strlen(hello)+1;
-
-    err = compress(compr, &comprLen, (const Bytef*)hello, len);
-    CHECK_ERR(err, "compress");
-
-    strcpy((char*)uncompr, "garbage");
-
-    err = uncompress(uncompr, &uncomprLen, compr, comprLen);
-    CHECK_ERR(err, "uncompress");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad uncompress\n");
-	exit(1);
-    } else {
-        printf("uncompress(): %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Test read/write of .gz files
- */
-void test_gzio(out, in, uncompr, uncomprLen)
-    const char *out; /* compressed output file */
-    const char *in;  /* compressed input file */
-    Byte *uncompr;
-    int  uncomprLen;
-{
-    int err;
-    int len = strlen(hello)+1;
-    gzFile file;
-    z_off_t pos;
-
-    file = gzopen(out, "wb");
-    if (file == NULL) {
-        fprintf(stderr, "gzopen error\n");
-        exit(1);
-    }
-    gzputc(file, 'h');
-    if (gzputs(file, "ello") != 4) {
-        fprintf(stderr, "gzputs err: %s\n", gzerror(file, &err));
-	exit(1);
-    }
-    if (gzprintf(file, ", %s!", "hello") != 8) {
-        fprintf(stderr, "gzprintf err: %s\n", gzerror(file, &err));
-	exit(1);
-    }
-    gzseek(file, 1L, SEEK_CUR); /* add one zero byte */
-    gzclose(file);
-
-    file = gzopen(in, "rb");
-    if (file == NULL) {
-        fprintf(stderr, "gzopen error\n");
-    }
-    strcpy((char*)uncompr, "garbage");
-
-    uncomprLen = gzread(file, uncompr, (unsigned)uncomprLen);
-    if (uncomprLen != len) {
-        fprintf(stderr, "gzread err: %s\n", gzerror(file, &err));
-	exit(1);
-    }
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad gzread: %s\n", (char*)uncompr);
-	exit(1);
-    } else {
-        printf("gzread(): %s\n", (char *)uncompr);
-    }
-
-    pos = gzseek(file, -8L, SEEK_CUR);
-    if (pos != 6 || gztell(file) != pos) {
-	fprintf(stderr, "gzseek error, pos=%ld, gztell=%ld\n",
-		(long)pos, (long)gztell(file));
-	exit(1);
-    }
-
-    if (gzgetc(file) != ' ') {
-	fprintf(stderr, "gzgetc error\n");
-	exit(1);
-    }
-
-    gzgets(file, (char*)uncompr, uncomprLen);
-    uncomprLen = strlen((char*)uncompr);
-    if (uncomprLen != 6) { /* "hello!" */
-        fprintf(stderr, "gzgets err after gzseek: %s\n", gzerror(file, &err));
-	exit(1);
-    }
-    if (strcmp((char*)uncompr, hello+7)) {
-        fprintf(stderr, "bad gzgets after gzseek\n");
-	exit(1);
-    } else {
-        printf("gzgets() after gzseek: %s\n", (char *)uncompr);
-    }
-
-    gzclose(file);
-}
-
-/* ===========================================================================
- * Test deflate() with small buffers
- */
-void test_deflate(compr, comprLen)
-    Byte *compr;
-    uLong comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-    int len = strlen(hello)+1;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (Bytef*)hello;
-    c_stream.next_out = compr;
-
-    while (c_stream.total_in != (uLong)len && c_stream.total_out < comprLen) {
-        c_stream.avail_in = c_stream.avail_out = 1; /* force small buffers */
-        err = deflate(&c_stream, Z_NO_FLUSH);
-        CHECK_ERR(err, "deflate");
-    }
-    /* Finish the stream, still forcing small buffers: */
-    for (;;) {
-        c_stream.avail_out = 1;
-        err = deflate(&c_stream, Z_FINISH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "deflate");
-    }
-
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with small buffers
- */
-void test_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 0;
-    d_stream.next_out = uncompr;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    while (d_stream.total_out < uncomprLen && d_stream.total_in < comprLen) {
-        d_stream.avail_in = d_stream.avail_out = 1; /* force small buffers */
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "inflate");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad inflate\n");
-	exit(1);
-    } else {
-        printf("inflate(): %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Test deflate() with large buffers and dynamic change of compression level
- */
-void test_large_deflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_BEST_SPEED);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uInt)comprLen;
-
-    /* At this point, uncompr is still mostly zeroes, so it should compress
-     * very well:
-     */
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (uInt)uncomprLen;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-    if (c_stream.avail_in != 0) {
-        fprintf(stderr, "deflate not greedy\n");
-	exit(1);
-    }
-
-    /* Feed in already compressed data and switch to no compression: */
-    deflateParams(&c_stream, Z_NO_COMPRESSION, Z_DEFAULT_STRATEGY);
-    c_stream.next_in = compr;
-    c_stream.avail_in = (uInt)comprLen/2;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    /* Switch back to compressing mode: */
-    deflateParams(&c_stream, Z_BEST_COMPRESSION, Z_FILTERED);
-    c_stream.next_in = uncompr;
-    c_stream.avail_in = (uInt)uncomprLen;
-    err = deflate(&c_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate should report Z_STREAM_END\n");
-	exit(1);
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with large buffers
- */
-void test_large_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uInt)comprLen;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    for (;;) {
-        d_stream.next_out = uncompr;            /* discard the output */
-	d_stream.avail_out = (uInt)uncomprLen;
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-        CHECK_ERR(err, "large inflate");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (d_stream.total_out != 2*uncomprLen + comprLen/2) {
-        fprintf(stderr, "bad large inflate: %ld\n", d_stream.total_out);
-	exit(1);
-    } else {
-        printf("large_inflate(): OK\n");
-    }
-}
-
-/* ===========================================================================
- * Test deflate() with full flush
- */
-void test_flush(compr, comprLen)
-    Byte *compr;
-    uLong *comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-    int len = strlen(hello)+1;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    c_stream.next_in  = (Bytef*)hello;
-    c_stream.next_out = compr;
-    c_stream.avail_in = 3;
-    c_stream.avail_out = (uInt)*comprLen;
-    err = deflate(&c_stream, Z_FULL_FLUSH);
-    CHECK_ERR(err, "deflate");
-
-    compr[3]++; /* force an error in first compressed block */
-    c_stream.avail_in = len - 3;
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        CHECK_ERR(err, "deflate");
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-
-    *comprLen = c_stream.total_out;
-}
-
-/* ===========================================================================
- * Test inflateSync()
- */
-void test_sync(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = 2; /* just read the zlib header */
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uInt)uncomprLen;
-
-    inflate(&d_stream, Z_NO_FLUSH);
-    CHECK_ERR(err, "inflate");
-
-    d_stream.avail_in = (uInt)comprLen-2;   /* read all compressed data */
-    err = inflateSync(&d_stream);           /* but skip the damaged part */
-    CHECK_ERR(err, "inflateSync");
-
-    err = inflate(&d_stream, Z_FINISH);
-    if (err != Z_DATA_ERROR) {
-        fprintf(stderr, "inflate should report DATA_ERROR\n");
-        /* Because of incorrect adler32 */
-	exit(1);
-    }
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    printf("after inflateSync(): hel%s\n", (char *)uncompr);
-}
-
-/* ===========================================================================
- * Test deflate() with preset dictionary
- */
-void test_dict_deflate(compr, comprLen)
-    Byte *compr;
-    uLong comprLen;
-{
-    z_stream c_stream; /* compression stream */
-    int err;
-
-    c_stream.zalloc = (alloc_func)0;
-    c_stream.zfree = (free_func)0;
-    c_stream.opaque = (voidpf)0;
-
-    err = deflateInit(&c_stream, Z_BEST_COMPRESSION);
-    CHECK_ERR(err, "deflateInit");
-
-    err = deflateSetDictionary(&c_stream,
-			       (const Bytef*)dictionary, sizeof(dictionary));
-    CHECK_ERR(err, "deflateSetDictionary");
-
-    dictId = c_stream.adler;
-    c_stream.next_out = compr;
-    c_stream.avail_out = (uInt)comprLen;
-
-    c_stream.next_in = (Bytef*)hello;
-    c_stream.avail_in = (uInt)strlen(hello)+1;
-
-    err = deflate(&c_stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        fprintf(stderr, "deflate should report Z_STREAM_END\n");
-	exit(1);
-    }
-    err = deflateEnd(&c_stream);
-    CHECK_ERR(err, "deflateEnd");
-}
-
-/* ===========================================================================
- * Test inflate() with a preset dictionary
- */
-void test_dict_inflate(compr, comprLen, uncompr, uncomprLen)
-    Byte *compr, *uncompr;
-    uLong comprLen, uncomprLen;
-{
-    int err;
-    z_stream d_stream; /* decompression stream */
-
-    strcpy((char*)uncompr, "garbage");
-
-    d_stream.zalloc = (alloc_func)0;
-    d_stream.zfree = (free_func)0;
-    d_stream.opaque = (voidpf)0;
-
-    d_stream.next_in  = compr;
-    d_stream.avail_in = (uInt)comprLen;
-
-    err = inflateInit(&d_stream);
-    CHECK_ERR(err, "inflateInit");
-
-    d_stream.next_out = uncompr;
-    d_stream.avail_out = (uInt)uncomprLen;
-
-    for (;;) {
-        err = inflate(&d_stream, Z_NO_FLUSH);
-        if (err == Z_STREAM_END) break;
-	if (err == Z_NEED_DICT) {
-	    if (d_stream.adler != dictId) {
-		fprintf(stderr, "unexpected dictionary");
-		exit(1);
-	    }
-	    err = inflateSetDictionary(&d_stream, (const Bytef*)dictionary,
-				       sizeof(dictionary));
-	}
-        CHECK_ERR(err, "inflate with dict");
-    }
-
-    err = inflateEnd(&d_stream);
-    CHECK_ERR(err, "inflateEnd");
-
-    if (strcmp((char*)uncompr, hello)) {
-        fprintf(stderr, "bad inflate with dict\n");
-	exit(1);
-    } else {
-        printf("inflate with dictionary: %s\n", (char *)uncompr);
-    }
-}
-
-/* ===========================================================================
- * Usage:  example [output.gz  [input.gz]]
- */
-
-int main(argc, argv)
-    int argc;
-    char *argv[];
-{
-    Byte *compr, *uncompr;
-    uLong comprLen = 10000*sizeof(int); /* don't overflow on MSDOS */
-    uLong uncomprLen = comprLen;
-    static const char* myVersion = ZLIB_VERSION;
-
-    if (zlibVersion()[0] != myVersion[0]) {
-        fprintf(stderr, "incompatible zlib version\n");
-        exit(1);
-
-    } else if (strcmp(zlibVersion(), ZLIB_VERSION) != 0) {
-        fprintf(stderr, "warning: different zlib version\n");
-    }
-
-    compr    = (Byte*)calloc((uInt)comprLen, 1);
-    uncompr  = (Byte*)calloc((uInt)uncomprLen, 1);
-    /* compr and uncompr are cleared to avoid reading uninitialized
-     * data and to ensure that uncompr compresses well.
-     */
-    if (compr == Z_NULL || uncompr == Z_NULL) {
-        printf("out of memory\n");
-	exit(1);
-    }
-    test_compress(compr, comprLen, uncompr, uncomprLen);
-
-    test_gzio((argc > 1 ? argv[1] : TESTFILE),
-              (argc > 2 ? argv[2] : TESTFILE),
-	      uncompr, (int)uncomprLen);
-
-    test_deflate(compr, comprLen);
-    test_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_large_deflate(compr, comprLen, uncompr, uncomprLen);
-    test_large_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    test_flush(compr, &comprLen);
-    test_sync(compr, comprLen, uncompr, uncomprLen);
-    comprLen = uncomprLen;
-
-    test_dict_deflate(compr, comprLen);
-    test_dict_inflate(compr, comprLen, uncompr, uncomprLen);
-
-    exit(0);
-    return 0; /* to avoid warning */
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
deleted file mode 100644
index f7c336a..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/gzio.c
+++ /dev/null
@@ -1,875 +0,0 @@
-/* gzio.c -- IO on .gz files
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h
- *
- * Compile this file with -DNO_DEFLATE to avoid the compression code.
- */
-
-/* @(#) $Id$ */
-
-#include <stdio.h>
-
-#include "zutil.h"
-
-struct internal_state {int dummy;}; /* for buggy compilers */
-
-#ifndef Z_BUFSIZE
-#  ifdef MAXSEG_64K
-#    define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */
-#  else
-#    define Z_BUFSIZE 16384
-#  endif
-#endif
-#ifndef Z_PRINTF_BUFSIZE
-#  define Z_PRINTF_BUFSIZE 4096
-#endif
-
-#define ALLOC(size) malloc(size)
-#define TRYFREE(p) {if (p) free(p);}
-
-static int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
-
-/* gzip flag byte */
-#define ASCII_FLAG   0x01 /* bit 0 set: file probably ascii text */
-#define HEAD_CRC     0x02 /* bit 1 set: header CRC present */
-#define EXTRA_FIELD  0x04 /* bit 2 set: extra field present */
-#define ORIG_NAME    0x08 /* bit 3 set: original file name present */
-#define COMMENT      0x10 /* bit 4 set: file comment present */
-#define RESERVED     0xE0 /* bits 5..7: reserved */
-
-typedef struct gz_stream {
-    z_stream stream;
-    int      z_err;   /* error code for last stream operation */
-    int      z_eof;   /* set if end of input file */
-    FILE     *file;   /* .gz file */
-    Byte     *inbuf;  /* input buffer */
-    Byte     *outbuf; /* output buffer */
-    uLong    crc;     /* crc32 of uncompressed data */
-    char     *msg;    /* error message */
-    char     *path;   /* path name for debugging only */
-    int      transparent; /* 1 if input file is not a .gz file */
-    char     mode;    /* 'w' or 'r' */
-    long     startpos; /* start of compressed data in file (header skipped) */
-} gz_stream;
-
-
-local gzFile gz_open      OF((const char *path, const char *mode, int  fd));
-local int do_flush        OF((gzFile file, int flush));
-local int    get_byte     OF((gz_stream *s));
-local void   check_header OF((gz_stream *s));
-local int    destroy      OF((gz_stream *s));
-local void   putLong      OF((FILE *file, uLong x));
-local uLong  getLong      OF((gz_stream *s));
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing. The mode parameter
-   is as in fopen ("rb" or "wb"). The file is given either by file descriptor
-   or path name (if fd == -1).
-     gz_open return NULL if the file could not be opened or if there was
-   insufficient memory to allocate the (de)compression state; errno
-   can be checked to distinguish the two cases (if errno is zero, the
-   zlib error is Z_MEM_ERROR).
-*/
-local gzFile gz_open (path, mode, fd)
-    const char *path;
-    const char *mode;
-    int  fd;
-{
-    int err;
-    int level = Z_DEFAULT_COMPRESSION; /* compression level */
-    int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */
-    char *p = (char*)mode;
-    gz_stream *s;
-    char fmode[80]; /* copy of mode, without the compression level */
-    char *m = fmode;
-
-    if (!path || !mode) return Z_NULL;
-
-    s = (gz_stream *)ALLOC(sizeof(gz_stream));
-    if (!s) return Z_NULL;
-
-    s->stream.zalloc = (alloc_func)0;
-    s->stream.zfree = (free_func)0;
-    s->stream.opaque = (voidpf)0;
-    s->stream.next_in = s->inbuf = Z_NULL;
-    s->stream.next_out = s->outbuf = Z_NULL;
-    s->stream.avail_in = s->stream.avail_out = 0;
-    s->file = NULL;
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->crc = crc32(0L, Z_NULL, 0);
-    s->msg = NULL;
-    s->transparent = 0;
-
-    s->path = (char*)ALLOC(strlen(path)+1);
-    if (s->path == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    strcpy(s->path, path); /* do this early for debugging */
-
-    s->mode = '\0';
-    do {
-        if (*p == 'r') s->mode = 'r';
-        if (*p == 'w' || *p == 'a') s->mode = 'w';
-        if (*p >= '0' && *p <= '9') {
-	    level = *p - '0';
-	} else if (*p == 'f') {
-	  strategy = Z_FILTERED;
-	} else if (*p == 'h') {
-	  strategy = Z_HUFFMAN_ONLY;
-	} else {
-	    *m++ = *p; /* copy the mode */
-	}
-    } while (*p++ && m != fmode + sizeof(fmode));
-    if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL;
-    
-    if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-        err = Z_STREAM_ERROR;
-#else
-        err = deflateInit2(&(s->stream), level,
-                           Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy);
-        /* windowBits is passed < 0 to suppress zlib header */
-
-        s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-#endif
-        if (err != Z_OK || s->outbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    } else {
-        s->stream.next_in  = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE);
-
-        err = inflateInit2(&(s->stream), -MAX_WBITS);
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END. Here the gzip CRC32 ensures that 4 bytes are
-         * present after the compressed stream.
-         */
-        if (err != Z_OK || s->inbuf == Z_NULL) {
-            return destroy(s), (gzFile)Z_NULL;
-        }
-    }
-    s->stream.avail_out = Z_BUFSIZE;
-
-    errno = 0;
-    s->file = fd < 0 ? F_OPEN(path, fmode) : (FILE*)fdopen(fd, fmode);
-
-    if (s->file == NULL) {
-        return destroy(s), (gzFile)Z_NULL;
-    }
-    if (s->mode == 'w') {
-        /* Write a very simple .gz header:
-         */
-        fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
-             Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE);
-	s->startpos = 10L;
-	/* We use 10L instead of ftell(s->file) to because ftell causes an
-         * fflush on some systems. This version of the library doesn't use
-         * startpos anyway in write mode, so this initialization is not
-         * necessary.
-         */
-    } else {
-	check_header(s); /* skip the .gz header */
-	s->startpos = (ftell(s->file) - s->stream.avail_in);
-    }
-    
-    return (gzFile)s;
-}
-
-/* ===========================================================================
-     Opens a gzip (.gz) file for reading or writing.
-*/
-gzFile ZEXPORT gzopen (path, mode)
-    const char *path;
-    const char *mode;
-{
-    return gz_open (path, mode, -1);
-}
-
-/* ===========================================================================
-     Associate a gzFile with the file descriptor fd. fd is not dup'ed here
-   to mimic the behavio(u)r of fdopen.
-*/
-gzFile ZEXPORT gzdopen (fd, mode)
-    int fd;
-    const char *mode;
-{
-    char name[20];
-
-    if (fd < 0) return (gzFile)Z_NULL;
-    sprintf(name, "<fd:%d>", fd); /* for debugging */
-
-    return gz_open (name, mode, fd);
-}
-
-/* ===========================================================================
- * Update the compression level and strategy
- */
-int ZEXPORT gzsetparams (file, level, strategy)
-    gzFile file;
-    int level;
-    int strategy;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    /* Make room to allow flushing */
-    if (s->stream.avail_out == 0) {
-
-	s->stream.next_out = s->outbuf;
-	if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-	    s->z_err = Z_ERRNO;
-	}
-	s->stream.avail_out = Z_BUFSIZE;
-    }
-
-    return deflateParams (&(s->stream), level, strategy);
-}
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-local int get_byte(s)
-    gz_stream *s;
-{
-    if (s->z_eof) return EOF;
-    if (s->stream.avail_in == 0) {
-	errno = 0;
-	s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-	if (s->stream.avail_in == 0) {
-	    s->z_eof = 1;
-	    if (ferror(s->file)) s->z_err = Z_ERRNO;
-	    return EOF;
-	}
-	s->stream.next_in = s->inbuf;
-    }
-    s->stream.avail_in--;
-    return *(s->stream.next_in)++;
-}
-
-/* ===========================================================================
-      Check the gzip header of a gz_stream opened for reading. Set the stream
-    mode to transparent if the gzip magic header is not present; set s->err
-    to Z_DATA_ERROR if the magic header is present but the rest of the header
-    is incorrect.
-    IN assertion: the stream s has already been created sucessfully;
-       s->stream.avail_in is zero for the first time, but may be non-zero
-       for concatenated .gz files.
-*/
-local void check_header(s)
-    gz_stream *s;
-{
-    int method; /* method byte */
-    int flags;  /* flags byte */
-    uInt len;
-    int c;
-
-    /* Check the gzip magic header */
-    for (len = 0; len < 2; len++) {
-	c = get_byte(s);
-	if (c != gz_magic[len]) {
-	    if (len != 0) s->stream.avail_in++, s->stream.next_in--;
-	    if (c != EOF) {
-		s->stream.avail_in++, s->stream.next_in--;
-		s->transparent = 1;
-	    }
-	    s->z_err = s->stream.avail_in != 0 ? Z_OK : Z_STREAM_END;
-	    return;
-	}
-    }
-    method = get_byte(s);
-    flags = get_byte(s);
-    if (method != Z_DEFLATED || (flags & RESERVED) != 0) {
-	s->z_err = Z_DATA_ERROR;
-	return;
-    }
-
-    /* Discard time, xflags and OS code: */
-    for (len = 0; len < 6; len++) (void)get_byte(s);
-
-    if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */
-	len  =  (uInt)get_byte(s);
-	len += ((uInt)get_byte(s))<<8;
-	/* len is garbage if EOF but the loop below will quit anyway */
-	while (len-- != 0 && get_byte(s) != EOF) ;
-    }
-    if ((flags & ORIG_NAME) != 0) { /* skip the original file name */
-	while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & COMMENT) != 0) {   /* skip the .gz file comment */
-	while ((c = get_byte(s)) != 0 && c != EOF) ;
-    }
-    if ((flags & HEAD_CRC) != 0) {  /* skip the header crc */
-	for (len = 0; len < 2; len++) (void)get_byte(s);
-    }
-    s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK;
-}
-
- /* ===========================================================================
- * Cleanup then free the given gz_stream. Return a zlib error code.
-   Try freeing in the reverse order of allocations.
- */
-local int destroy (s)
-    gz_stream *s;
-{
-    int err = Z_OK;
-
-    if (!s) return Z_STREAM_ERROR;
-
-    TRYFREE(s->msg);
-
-    if (s->stream.state != NULL) {
-	if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-	    err = Z_STREAM_ERROR;
-#else
-	    err = deflateEnd(&(s->stream));
-#endif
-	} else if (s->mode == 'r') {
-	    err = inflateEnd(&(s->stream));
-	}
-    }
-    if (s->file != NULL && fclose(s->file)) {
-#ifdef ESPIPE
-	if (errno != ESPIPE) /* fclose is broken for pipes in HP/UX */
-#endif
-	    err = Z_ERRNO;
-    }
-    if (s->z_err < 0) err = s->z_err;
-
-    TRYFREE(s->inbuf);
-    TRYFREE(s->outbuf);
-    TRYFREE(s->path);
-    TRYFREE(s);
-    return err;
-}
-
-/* ===========================================================================
-     Reads the given number of uncompressed bytes from the compressed file.
-   gzread returns the number of bytes actually read (0 for end of file).
-*/
-int ZEXPORT gzread (file, buf, len)
-    gzFile file;
-    voidp buf;
-    unsigned len;
-{
-    gz_stream *s = (gz_stream*)file;
-    Bytef *start = (Bytef*)buf; /* starting point for crc computation */
-    Byte  *next_out; /* == stream.next_out but not forced far (for MSDOS) */
-
-    if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR;
-
-    if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1;
-    if (s->z_err == Z_STREAM_END) return 0;  /* EOF */
-
-    next_out = (Byte*)buf;
-    s->stream.next_out = (Bytef*)buf;
-    s->stream.avail_out = len;
-
-    while (s->stream.avail_out != 0) {
-
-	if (s->transparent) {
-	    /* Copy first the lookahead bytes: */
-	    uInt n = s->stream.avail_in;
-	    if (n > s->stream.avail_out) n = s->stream.avail_out;
-	    if (n > 0) {
-		zmemcpy(s->stream.next_out, s->stream.next_in, n);
-		next_out += n;
-		s->stream.next_out = next_out;
-		s->stream.next_in   += n;
-		s->stream.avail_out -= n;
-		s->stream.avail_in  -= n;
-	    }
-	    if (s->stream.avail_out > 0) {
-		s->stream.avail_out -= fread(next_out, 1, s->stream.avail_out,
-					     s->file);
-	    }
-	    len -= s->stream.avail_out;
-	    s->stream.total_in  += (uLong)len;
-	    s->stream.total_out += (uLong)len;
-            if (len == 0) s->z_eof = 1;
-	    return (int)len;
-	}
-        if (s->stream.avail_in == 0 && !s->z_eof) {
-
-            errno = 0;
-            s->stream.avail_in = fread(s->inbuf, 1, Z_BUFSIZE, s->file);
-            if (s->stream.avail_in == 0) {
-                s->z_eof = 1;
-		if (ferror(s->file)) {
-		    s->z_err = Z_ERRNO;
-		    break;
-		}
-            }
-            s->stream.next_in = s->inbuf;
-        }
-        s->z_err = inflate(&(s->stream), Z_NO_FLUSH);
-
-	if (s->z_err == Z_STREAM_END) {
-	    /* Check CRC and original size */
-	    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-	    start = s->stream.next_out;
-
-	    if (getLong(s) != s->crc) {
-		s->z_err = Z_DATA_ERROR;
-	    } else {
-	        (void)getLong(s);
-                /* The uncompressed length returned by above getlong() may
-                 * be different from s->stream.total_out) in case of
-		 * concatenated .gz files. Check for such files:
-		 */
-		check_header(s);
-		if (s->z_err == Z_OK) {
-		    uLong total_in = s->stream.total_in;
-		    uLong total_out = s->stream.total_out;
-
-		    inflateReset(&(s->stream));
-		    s->stream.total_in = total_in;
-		    s->stream.total_out = total_out;
-		    s->crc = crc32(0L, Z_NULL, 0);
-		}
-	    }
-	}
-	if (s->z_err != Z_OK || s->z_eof) break;
-    }
-    s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start));
-
-    return (int)(len - s->stream.avail_out);
-}
-
-
-/* ===========================================================================
-      Reads one byte from the compressed file. gzgetc returns this byte
-   or -1 in case of end of file or error.
-*/
-int ZEXPORT gzgetc(file)
-    gzFile file;
-{
-    unsigned char c;
-
-    return gzread(file, &c, 1) == 1 ? c : -1;
-}
-
-
-/* ===========================================================================
-      Reads bytes from the compressed file until len-1 characters are
-   read, or a newline character is read and transferred to buf, or an
-   end-of-file condition is encountered.  The string is then terminated
-   with a null character.
-      gzgets returns buf, or Z_NULL in case of error.
-
-      The current implementation is not optimized at all.
-*/
-char * ZEXPORT gzgets(file, buf, len)
-    gzFile file;
-    char *buf;
-    int len;
-{
-    char *b = buf;
-    if (buf == Z_NULL || len <= 0) return Z_NULL;
-
-    while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ;
-    *buf = '\0';
-    return b == buf && len > 0 ? Z_NULL : b;
-}
-
-
-#ifndef NO_DEFLATE
-/* ===========================================================================
-     Writes the given number of uncompressed bytes into the compressed file.
-   gzwrite returns the number of bytes actually written (0 in case of error).
-*/
-int ZEXPORT gzwrite (file, buf, len)
-    gzFile file;
-    const voidp buf;
-    unsigned len;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.next_in = (Bytef*)buf;
-    s->stream.avail_in = len;
-
-    while (s->stream.avail_in != 0) {
-
-        if (s->stream.avail_out == 0) {
-
-            s->stream.next_out = s->outbuf;
-            if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) {
-                s->z_err = Z_ERRNO;
-                break;
-            }
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        s->z_err = deflate(&(s->stream), Z_NO_FLUSH);
-        if (s->z_err != Z_OK) break;
-    }
-    s->crc = crc32(s->crc, (const Bytef *)buf, len);
-
-    return (int)(len - s->stream.avail_in);
-}
-
-/* ===========================================================================
-     Converts, formats, and writes the args to the compressed file under
-   control of the format string, as in fprintf. gzprintf returns the number of
-   uncompressed bytes actually written (0 in case of error).
-*/
-#ifdef STDC
-#include <stdarg.h>
-
-int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...)
-{
-    char buf[Z_PRINTF_BUFSIZE];
-    va_list va;
-    int len;
-
-    va_start(va, format);
-#ifdef HAS_vsnprintf
-    (void)vsnprintf(buf, sizeof(buf), format, va);
-#else
-    (void)vsprintf(buf, format, va);
-#endif
-    va_end(va);
-    len = strlen(buf); /* some *sprintf don't return the nb of bytes written */
-    if (len <= 0) return 0;
-
-    return gzwrite(file, buf, (unsigned)len);
-}
-#else /* not ANSI C */
-
-int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-	               a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
-    gzFile file;
-    const char *format;
-    int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10,
-	a11, a12, a13, a14, a15, a16, a17, a18, a19, a20;
-{
-    char buf[Z_PRINTF_BUFSIZE];
-    int len;
-
-#ifdef HAS_snprintf
-    snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8,
-	     a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#else
-    sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8,
-	    a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20);
-#endif
-    len = strlen(buf); /* old sprintf doesn't return the nb of bytes written */
-    if (len <= 0) return 0;
-
-    return gzwrite(file, buf, len);
-}
-#endif
-
-/* ===========================================================================
-      Writes c, converted to an unsigned char, into the compressed file.
-   gzputc returns the value that was written, or -1 in case of error.
-*/
-int ZEXPORT gzputc(file, c)
-    gzFile file;
-    int c;
-{
-    unsigned char cc = (unsigned char) c; /* required for big endian systems */
-
-    return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1;
-}
-
-
-/* ===========================================================================
-      Writes the given null-terminated string to the compressed file, excluding
-   the terminating null character.
-      gzputs returns the number of characters written, or -1 in case of error.
-*/
-int ZEXPORT gzputs(file, s)
-    gzFile file;
-    const char *s;
-{
-    return gzwrite(file, (char*)s, (unsigned)strlen(s));
-}
-
-
-/* ===========================================================================
-     Flushes all pending output into the compressed file. The parameter
-   flush is as in the deflate() function.
-*/
-local int do_flush (file, flush)
-    gzFile file;
-    int flush;
-{
-    uInt len;
-    int done = 0;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR;
-
-    s->stream.avail_in = 0; /* should be zero already anyway */
-
-    for (;;) {
-        len = Z_BUFSIZE - s->stream.avail_out;
-
-        if (len != 0) {
-            if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) {
-                s->z_err = Z_ERRNO;
-                return Z_ERRNO;
-            }
-            s->stream.next_out = s->outbuf;
-            s->stream.avail_out = Z_BUFSIZE;
-        }
-        if (done) break;
-        s->z_err = deflate(&(s->stream), flush);
-
-	/* Ignore the second of two consecutive flushes: */
-	if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK;
-
-        /* deflate has finished flushing only when it hasn't used up
-         * all the available space in the output buffer: 
-         */
-        done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END);
- 
-        if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break;
-    }
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-
-int ZEXPORT gzflush (file, flush)
-     gzFile file;
-     int flush;
-{
-    gz_stream *s = (gz_stream*)file;
-    int err = do_flush (file, flush);
-
-    if (err) return err;
-    fflush(s->file);
-    return  s->z_err == Z_STREAM_END ? Z_OK : s->z_err;
-}
-#endif /* NO_DEFLATE */
-
-/* ===========================================================================
-      Sets the starting position for the next gzread or gzwrite on the given
-   compressed file. The offset represents a number of bytes in the
-      gzseek returns the resulting offset location as measured in bytes from
-   the beginning of the uncompressed stream, or -1 in case of error.
-      SEEK_END is not implemented, returns error.
-      In this version of the library, gzseek can be extremely slow.
-*/
-z_off_t ZEXPORT gzseek (file, offset, whence)
-    gzFile file;
-    z_off_t offset;
-    int whence;
-{
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL || whence == SEEK_END ||
-	s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) {
-	return -1L;
-    }
-    
-    if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-	return -1L;
-#else
-	if (whence == SEEK_SET) {
-	    offset -= s->stream.total_in;
-	}
-	if (offset < 0) return -1L;
-
-	/* At this point, offset is the number of zero bytes to write. */
-	if (s->inbuf == Z_NULL) {
-	    s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */
-	    zmemzero(s->inbuf, Z_BUFSIZE);
-	}
-	while (offset > 0)  {
-	    uInt size = Z_BUFSIZE;
-	    if (offset < Z_BUFSIZE) size = (uInt)offset;
-
-	    size = gzwrite(file, s->inbuf, size);
-	    if (size == 0) return -1L;
-
-	    offset -= size;
-	}
-	return (z_off_t)s->stream.total_in;
-#endif
-    }
-    /* Rest of function is for reading only */
-
-    /* compute absolute position */
-    if (whence == SEEK_CUR) {
-	offset += s->stream.total_out;
-    }
-    if (offset < 0) return -1L;
-
-    if (s->transparent) {
-	/* map to fseek */
-	s->stream.avail_in = 0;
-	s->stream.next_in = s->inbuf;
-        if (fseek(s->file, offset, SEEK_SET) < 0) return -1L;
-
-	s->stream.total_in = s->stream.total_out = (uLong)offset;
-	return offset;
-    }
-
-    /* For a negative seek, rewind and use positive seek */
-    if ((uLong)offset >= s->stream.total_out) {
-	offset -= s->stream.total_out;
-    } else if (gzrewind(file) < 0) {
-	return -1L;
-    }
-    /* offset is now the number of bytes to skip. */
-
-    if (offset != 0 && s->outbuf == Z_NULL) {
-	s->outbuf = (Byte*)ALLOC(Z_BUFSIZE);
-    }
-    while (offset > 0)  {
-	int size = Z_BUFSIZE;
-	if (offset < Z_BUFSIZE) size = (int)offset;
-
-	size = gzread(file, s->outbuf, (uInt)size);
-	if (size <= 0) return -1L;
-	offset -= size;
-    }
-    return (z_off_t)s->stream.total_out;
-}
-
-/* ===========================================================================
-     Rewinds input file. 
-*/
-int ZEXPORT gzrewind (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-    
-    if (s == NULL || s->mode != 'r') return -1;
-
-    s->z_err = Z_OK;
-    s->z_eof = 0;
-    s->stream.avail_in = 0;
-    s->stream.next_in = s->inbuf;
-    s->crc = crc32(0L, Z_NULL, 0);
-	
-    if (s->startpos == 0) { /* not a compressed file */
-	rewind(s->file);
-	return 0;
-    }
-
-    (void) inflateReset(&s->stream);
-    return fseek(s->file, s->startpos, SEEK_SET);
-}
-
-/* ===========================================================================
-     Returns the starting position for the next gzread or gzwrite on the
-   given compressed file. This position represents a number of bytes in the
-   uncompressed data stream.
-*/
-z_off_t ZEXPORT gztell (file)
-    gzFile file;
-{
-    return gzseek(file, 0L, SEEK_CUR);
-}
-
-/* ===========================================================================
-     Returns 1 when EOF has previously been detected reading the given
-   input stream, otherwise zero.
-*/
-int ZEXPORT gzeof (file)
-    gzFile file;
-{
-    gz_stream *s = (gz_stream*)file;
-    
-    return (s == NULL || s->mode != 'r') ? 0 : s->z_eof;
-}
-
-/* ===========================================================================
-   Outputs a long in LSB order to the given file
-*/
-local void putLong (file, x)
-    FILE *file;
-    uLong x;
-{
-    int n;
-    for (n = 0; n < 4; n++) {
-        fputc((int)(x & 0xff), file);
-        x >>= 8;
-    }
-}
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets z_err in case
-   of error.
-*/
-local uLong getLong (s)
-    gz_stream *s;
-{
-    uLong x = (uLong)get_byte(s);
-    int c;
-
-    x += ((uLong)get_byte(s))<<8;
-    x += ((uLong)get_byte(s))<<16;
-    c = get_byte(s);
-    if (c == EOF) s->z_err = Z_DATA_ERROR;
-    x += ((uLong)c)<<24;
-    return x;
-}
-
-/* ===========================================================================
-     Flushes all pending output if necessary, closes the compressed file
-   and deallocates all the (de)compression state.
-*/
-int ZEXPORT gzclose (file)
-    gzFile file;
-{
-    int err;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) return Z_STREAM_ERROR;
-
-    if (s->mode == 'w') {
-#ifdef NO_DEFLATE
-	return Z_STREAM_ERROR;
-#else
-        err = do_flush (file, Z_FINISH);
-        if (err != Z_OK) return destroy((gz_stream*)file);
-
-        putLong (s->file, s->crc);
-        putLong (s->file, s->stream.total_in);
-#endif
-    }
-    return destroy((gz_stream*)file);
-}
-
-/* ===========================================================================
-     Returns the error message for the last error which occured on the
-   given compressed file. errnum is set to zlib error number. If an
-   error occured in the file system and not in the compression library,
-   errnum is set to Z_ERRNO and the application may consult errno
-   to get the exact error code.
-*/
-const char*  ZEXPORT gzerror (file, errnum)
-    gzFile file;
-    int *errnum;
-{
-    char *m;
-    gz_stream *s = (gz_stream*)file;
-
-    if (s == NULL) {
-        *errnum = Z_STREAM_ERROR;
-        return (const char*)ERR_MSG(Z_STREAM_ERROR);
-    }
-    *errnum = s->z_err;
-    if (*errnum == Z_OK) return (const char*)"";
-
-    m =  (char*)(*errnum == Z_ERRNO ? zstrerror(errno) : s->stream.msg);
-
-    if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err);
-
-    TRYFREE(s->msg);
-    s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3);
-    strcpy(s->msg, s->path);
-    strcat(s->msg, ": ");
-    strcat(s->msg, m);
-    return (const char*)s->msg;
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
deleted file mode 100644
index f4920fa..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infblock.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/* infblock.c -- interpret and process block types to last block
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "infblock.h"
-#include "inftrees.h"
-#include "infcodes.h"
-#include "infutil.h"
-
-struct inflate_codes_state {int dummy;}; /* for buggy compilers */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* Table for deflate from PKZIP's appnote.txt. */
-local const uInt border[] = { /* Order of the bit length code lengths */
-        16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
-
-/*
-   Notes beyond the 1.93a appnote.txt:
-
-   1. Distance pointers never point before the beginning of the output
-      stream.
-   2. Distance pointers can point back across blocks, up to 32k away.
-   3. There is an implied maximum of 7 bits for the bit length table and
-      15 bits for the actual data.
-   4. If only one code exists, then it is encoded using one bit.  (Zero
-      would be more efficient, but perhaps a little confusing.)  If two
-      codes exist, they are coded using one bit each (0 and 1).
-   5. There is no way of sending zero distance codes--a dummy must be
-      sent if there are none.  (History: a pre 2.0 version of PKZIP would
-      store blocks with no distance codes, but this was discovered to be
-      too harsh a criterion.)  Valid only for 1.93a.  2.04c does allow
-      zero distance codes, which is sent as one code of zero bits in
-      length.
-   6. There are up to 286 literal/length codes.  Code 256 represents the
-      end-of-block.  Note however that the static length tree defines
-      288 codes just to fill out the Huffman codes.  Codes 286 and 287
-      cannot be used though, since there is no length base or extra bits
-      defined for them.  Similarily, there are up to 30 distance codes.
-      However, static trees define 32 codes (all 5 bits) to fill out the
-      Huffman codes, but the last two had better not show up in the data.
-   7. Unzip can check dynamic Huffman blocks for complete code sets.
-      The exception is that a single code would not be complete (see #4).
-   8. The five bits following the block type is really the number of
-      literal codes sent minus 257.
-   9. Length codes 8,16,16 are interpreted as 13 length codes of 8 bits
-      (1+6+6).  Therefore, to output three times the length, you output
-      three codes (1+1+1), whereas to output four times the same length,
-      you only need two codes (1+3).  Hmm.
-  10. In the tree reconstruction algorithm, Code = Code + Increment
-      only if BitLength(i) is not zero.  (Pretty obvious.)
-  11. Correction: 4 Bits: # of Bit Length codes - 4     (4 - 19)
-  12. Note: length code 284 can represent 227-258, but length code 285
-      really is 258.  The last length deserves its own, short code
-      since it gets used a lot in very redundant files.  The length
-      258 is special since 258 - 3 (the min match length) is 255.
-  13. The literal/length and distance code bit lengths are read as a
-      single stream of lengths.  It is possible (and advantageous) for
-      a repeat code (16, 17, or 18) to go across the boundary between
-      the two sets of lengths.
- */
-
-
-void inflate_blocks_reset(s, z, c)
-inflate_blocks_statef *s;
-z_streamp z;
-uLongf *c;
-{
-  if (c != Z_NULL)
-    *c = s->check;
-  if (s->mode == BTREE || s->mode == DTREE)
-    ZFREE(z, s->sub.trees.blens);
-  if (s->mode == CODES)
-    inflate_codes_free(s->sub.decode.codes, z);
-  s->mode = TYPE;
-  s->bitk = 0;
-  s->bitb = 0;
-  s->read = s->write = s->window;
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(0L, (const Bytef *)Z_NULL, 0);
-  Tracev((stderr, "inflate:   blocks reset\n"));
-}
-
-
-inflate_blocks_statef *inflate_blocks_new(z, c, w)
-z_streamp z;
-check_func c;
-uInt w;
-{
-  inflate_blocks_statef *s;
-
-  if ((s = (inflate_blocks_statef *)ZALLOC
-       (z,1,sizeof(struct inflate_blocks_state))) == Z_NULL)
-    return s;
-  if ((s->hufts =
-       (inflate_huft *)ZALLOC(z, sizeof(inflate_huft), MANY)) == Z_NULL)
-  {
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  if ((s->window = (Bytef *)ZALLOC(z, 1, w)) == Z_NULL)
-  {
-    ZFREE(z, s->hufts);
-    ZFREE(z, s);
-    return Z_NULL;
-  }
-  s->end = s->window + w;
-  s->checkfn = c;
-  s->mode = TYPE;
-  Tracev((stderr, "inflate:   blocks allocated\n"));
-  inflate_blocks_reset(s, z, Z_NULL);
-  return s;
-}
-
-
-int inflate_blocks(s, z, r)
-inflate_blocks_statef *s;
-z_streamp z;
-int r;
-{
-  uInt t;               /* temporary storage */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Bytef *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Bytef *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input based on current state */
-  while (1) switch (s->mode)
-  {
-    case TYPE:
-      NEEDBITS(3)
-      t = (uInt)b & 7;
-      s->last = t & 1;
-      switch (t >> 1)
-      {
-        case 0:                         /* stored */
-          Tracev((stderr, "inflate:     stored block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          t = k & 7;                    /* go to byte boundary */
-          DUMPBITS(t)
-          s->mode = LENS;               /* get length of stored block */
-          break;
-        case 1:                         /* fixed */
-          Tracev((stderr, "inflate:     fixed codes block%s\n",
-                 s->last ? " (last)" : ""));
-          {
-            uInt bl, bd;
-            inflate_huft *tl, *td;
-
-            inflate_trees_fixed(&bl, &bd, &tl, &td, z);
-            s->sub.decode.codes = inflate_codes_new(bl, bd, tl, td, z);
-            if (s->sub.decode.codes == Z_NULL)
-            {
-              r = Z_MEM_ERROR;
-              LEAVE
-            }
-          }
-          DUMPBITS(3)
-          s->mode = CODES;
-          break;
-        case 2:                         /* dynamic */
-          Tracev((stderr, "inflate:     dynamic codes block%s\n",
-                 s->last ? " (last)" : ""));
-          DUMPBITS(3)
-          s->mode = TABLE;
-          break;
-        case 3:                         /* illegal */
-          DUMPBITS(3)
-          s->mode = BAD;
-          z->msg = (char*)"invalid block type";
-          r = Z_DATA_ERROR;
-          LEAVE
-      }
-      break;
-    case LENS:
-      NEEDBITS(32)
-      if ((((~b) >> 16) & 0xffff) != (b & 0xffff))
-      {
-        s->mode = BAD;
-        z->msg = (char*)"invalid stored block lengths";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-      s->sub.left = (uInt)b & 0xffff;
-      b = k = 0;                      /* dump bits */
-      Tracev((stderr, "inflate:       stored length %u\n", s->sub.left));
-      s->mode = s->sub.left ? STORED : (s->last ? DRY : TYPE);
-      break;
-    case STORED:
-      if (n == 0)
-        LEAVE
-      NEEDOUT
-      t = s->sub.left;
-      if (t > n) t = n;
-      if (t > m) t = m;
-      zmemcpy(q, p, t);
-      p += t;  n -= t;
-      q += t;  m -= t;
-      if ((s->sub.left -= t) != 0)
-        break;
-      Tracev((stderr, "inflate:       stored end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      s->mode = s->last ? DRY : TYPE;
-      break;
-    case TABLE:
-      NEEDBITS(14)
-      s->sub.trees.table = t = (uInt)b & 0x3fff;
-#ifndef PKZIP_BUG_WORKAROUND
-      if ((t & 0x1f) > 29 || ((t >> 5) & 0x1f) > 29)
-      {
-        s->mode = BAD;
-        z->msg = (char*)"too many length or distance symbols";
-        r = Z_DATA_ERROR;
-        LEAVE
-      }
-#endif
-      t = 258 + (t & 0x1f) + ((t >> 5) & 0x1f);
-      if ((s->sub.trees.blens = (uIntf*)ZALLOC(z, t, sizeof(uInt))) == Z_NULL)
-      {
-        r = Z_MEM_ERROR;
-        LEAVE
-      }
-      DUMPBITS(14)
-      s->sub.trees.index = 0;
-      Tracev((stderr, "inflate:       table sizes ok\n"));
-      s->mode = BTREE;
-    case BTREE:
-      while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
-      {
-        NEEDBITS(3)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = (uInt)b & 7;
-        DUMPBITS(3)
-      }
-      while (s->sub.trees.index < 19)
-        s->sub.trees.blens[border[s->sub.trees.index++]] = 0;
-      s->sub.trees.bb = 7;
-      t = inflate_trees_bits(s->sub.trees.blens, &s->sub.trees.bb,
-                             &s->sub.trees.tb, s->hufts, z);
-      if (t != Z_OK)
-      {
-        ZFREE(z, s->sub.trees.blens);
-        r = t;
-        if (r == Z_DATA_ERROR)
-          s->mode = BAD;
-        LEAVE
-      }
-      s->sub.trees.index = 0;
-      Tracev((stderr, "inflate:       bits tree ok\n"));
-      s->mode = DTREE;
-    case DTREE:
-      while (t = s->sub.trees.table,
-             s->sub.trees.index < 258 + (t & 0x1f) + ((t >> 5) & 0x1f))
-      {
-        inflate_huft *h;
-        uInt i, j, c;
-
-        t = s->sub.trees.bb;
-        NEEDBITS(t)
-        h = s->sub.trees.tb + ((uInt)b & inflate_mask[t]);
-        t = h->bits;
-        c = h->base;
-        if (c < 16)
-        {
-          DUMPBITS(t)
-          s->sub.trees.blens[s->sub.trees.index++] = c;
-        }
-        else /* c == 16..18 */
-        {
-          i = c == 18 ? 7 : c - 14;
-          j = c == 18 ? 11 : 3;
-          NEEDBITS(t + i)
-          DUMPBITS(t)
-          j += (uInt)b & inflate_mask[i];
-          DUMPBITS(i)
-          i = s->sub.trees.index;
-          t = s->sub.trees.table;
-          if (i + j > 258 + (t & 0x1f) + ((t >> 5) & 0x1f) ||
-              (c == 16 && i < 1))
-          {
-            ZFREE(z, s->sub.trees.blens);
-            s->mode = BAD;
-            z->msg = (char*)"invalid bit length repeat";
-            r = Z_DATA_ERROR;
-            LEAVE
-          }
-          c = c == 16 ? s->sub.trees.blens[i - 1] : 0;
-          do {
-            s->sub.trees.blens[i++] = c;
-          } while (--j);
-          s->sub.trees.index = i;
-        }
-      }
-      s->sub.trees.tb = Z_NULL;
-      {
-        uInt bl, bd;
-        inflate_huft *tl, *td;
-        inflate_codes_statef *c;
-
-        bl = 9;         /* must be <= 9 for lookahead assumptions */
-        bd = 6;         /* must be <= 9 for lookahead assumptions */
-        t = s->sub.trees.table;
-        t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
-                                  s->sub.trees.blens, &bl, &bd, &tl, &td,
-                                  s->hufts, z);
-        ZFREE(z, s->sub.trees.blens);
-        if (t != Z_OK)
-        {
-          if (t == (uInt)Z_DATA_ERROR)
-            s->mode = BAD;
-          r = t;
-          LEAVE
-        }
-        Tracev((stderr, "inflate:       trees ok\n"));
-        if ((c = inflate_codes_new(bl, bd, tl, td, z)) == Z_NULL)
-        {
-          r = Z_MEM_ERROR;
-          LEAVE
-        }
-        s->sub.decode.codes = c;
-      }
-      s->mode = CODES;
-    case CODES:
-      UPDATE
-      if ((r = inflate_codes(s, z, r)) != Z_STREAM_END)
-        return inflate_flush(s, z, r);
-      r = Z_OK;
-      inflate_codes_free(s->sub.decode.codes, z);
-      LOAD
-      Tracev((stderr, "inflate:       codes end, %lu total out\n",
-              z->total_out + (q >= s->read ? q - s->read :
-              (s->end - s->read) + (q - s->window))));
-      if (!s->last)
-      {
-        s->mode = TYPE;
-        break;
-      }
-      s->mode = DRY;
-    case DRY:
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      s->mode = DONE;
-    case DONE:
-      r = Z_STREAM_END;
-      LEAVE
-    case BAD:
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-}
-
-
-int inflate_blocks_free(s, z)
-inflate_blocks_statef *s;
-z_streamp z;
-{
-  inflate_blocks_reset(s, z, Z_NULL);
-  ZFREE(z, s->window);
-  ZFREE(z, s->hufts);
-  ZFREE(z, s);
-  Tracev((stderr, "inflate:   blocks freed\n"));
-  return Z_OK;
-}
-
-
-void inflate_set_dictionary(s, d, n)
-inflate_blocks_statef *s;
-const Bytef *d;
-uInt  n;
-{
-  zmemcpy(s->window, d, n);
-  s->read = s->write = s->window + n;
-}
-
-
-/* Returns true if inflate is currently at the end of a block generated
- * by Z_SYNC_FLUSH or Z_FULL_FLUSH. 
- * IN assertion: s != Z_NULL
- */
-int inflate_blocks_sync_point(s)
-inflate_blocks_statef *s;
-{
-  return s->mode == LENS;
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
deleted file mode 100644
index d4e5ee9..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infcodes.c
+++ /dev/null
@@ -1,257 +0,0 @@
-/* infcodes.c -- process literals and length/distance pairs
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "infblock.h"
-#include "infcodes.h"
-#include "infutil.h"
-#include "inffast.h"
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-typedef enum {        /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-      START,    /* x: set up for LEN */
-      LEN,      /* i: get length/literal/eob next */
-      LENEXT,   /* i: getting length extra (have base) */
-      DIST,     /* i: get distance next */
-      DISTEXT,  /* i: getting distance extra */
-      COPY,     /* o: copying bytes in window, waiting for space */
-      LIT,      /* o: got literal, waiting for output space */
-      WASH,     /* o: got eob, possibly still output waiting */
-      END,      /* x: got eob and all data flushed */
-      BADCODE}  /* x: got error */
-inflate_codes_mode;
-
-/* inflate codes private state */
-struct inflate_codes_state {
-
-  /* mode */
-  inflate_codes_mode mode;      /* current inflate_codes mode */
-
-  /* mode dependent information */
-  uInt len;
-  union {
-    struct {
-      inflate_huft *tree;       /* pointer into tree */
-      uInt need;                /* bits needed */
-    } code;             /* if LEN or DIST, where in tree */
-    uInt lit;           /* if LIT, literal */
-    struct {
-      uInt get;                 /* bits to get for extra */
-      uInt dist;                /* distance back to copy from */
-    } copy;             /* if EXT or COPY, where and how much */
-  } sub;                /* submode */
-
-  /* mode independent information */
-  Byte lbits;           /* ltree bits decoded per branch */
-  Byte dbits;           /* dtree bits decoder per branch */
-  inflate_huft *ltree;          /* literal/length/eob tree */
-  inflate_huft *dtree;          /* distance tree */
-
-};
-
-
-inflate_codes_statef *inflate_codes_new(bl, bd, tl, td, z)
-uInt bl, bd;
-inflate_huft *tl;
-inflate_huft *td; /* need separate declaration for Borland C++ */
-z_streamp z;
-{
-  inflate_codes_statef *c;
-
-  if ((c = (inflate_codes_statef *)
-       ZALLOC(z,1,sizeof(struct inflate_codes_state))) != Z_NULL)
-  {
-    c->mode = START;
-    c->lbits = (Byte)bl;
-    c->dbits = (Byte)bd;
-    c->ltree = tl;
-    c->dtree = td;
-    Tracev((stderr, "inflate:       codes new\n"));
-  }
-  return c;
-}
-
-
-int inflate_codes(s, z, r)
-inflate_blocks_statef *s;
-z_streamp z;
-int r;
-{
-  uInt j;               /* temporary storage */
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Bytef *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Bytef *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  Bytef *f;             /* pointer to copy strings from */
-  inflate_codes_statef *c = s->sub.decode.codes;  /* codes state */
-
-  /* copy input/output information to locals (UPDATE macro restores) */
-  LOAD
-
-  /* process input and output based on current state */
-  while (1) switch (c->mode)
-  {             /* waiting for "i:"=input, "o:"=output, "x:"=nothing */
-    case START:         /* x: set up for LEN */
-#ifndef SLOW
-      if (m >= 258 && n >= 10)
-      {
-        UPDATE
-        r = inflate_fast(c->lbits, c->dbits, c->ltree, c->dtree, s, z);
-        LOAD
-        if (r != Z_OK)
-        {
-          c->mode = r == Z_STREAM_END ? WASH : BADCODE;
-          break;
-        }
-      }
-#endif /* !SLOW */
-      c->sub.code.need = c->lbits;
-      c->sub.code.tree = c->ltree;
-      c->mode = LEN;
-    case LEN:           /* i: get length/literal/eob next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e == 0)               /* literal */
-      {
-        c->sub.lit = t->base;
-        Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-                 "inflate:         literal '%c'\n" :
-                 "inflate:         literal 0x%02x\n", t->base));
-        c->mode = LIT;
-        break;
-      }
-      if (e & 16)               /* length */
-      {
-        c->sub.copy.get = e & 15;
-        c->len = t->base;
-        c->mode = LENEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      if (e & 32)               /* end of block */
-      {
-        Tracevv((stderr, "inflate:         end of block\n"));
-        c->mode = WASH;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid literal/length code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case LENEXT:        /* i: getting length extra (have base) */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->len += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      c->sub.code.need = c->dbits;
-      c->sub.code.tree = c->dtree;
-      Tracevv((stderr, "inflate:         length %u\n", c->len));
-      c->mode = DIST;
-    case DIST:          /* i: get distance next */
-      j = c->sub.code.need;
-      NEEDBITS(j)
-      t = c->sub.code.tree + ((uInt)b & inflate_mask[j]);
-      DUMPBITS(t->bits)
-      e = (uInt)(t->exop);
-      if (e & 16)               /* distance */
-      {
-        c->sub.copy.get = e & 15;
-        c->sub.copy.dist = t->base;
-        c->mode = DISTEXT;
-        break;
-      }
-      if ((e & 64) == 0)        /* next table */
-      {
-        c->sub.code.need = e;
-        c->sub.code.tree = t + t->base;
-        break;
-      }
-      c->mode = BADCODE;        /* invalid code */
-      z->msg = (char*)"invalid distance code";
-      r = Z_DATA_ERROR;
-      LEAVE
-    case DISTEXT:       /* i: getting distance extra */
-      j = c->sub.copy.get;
-      NEEDBITS(j)
-      c->sub.copy.dist += (uInt)b & inflate_mask[j];
-      DUMPBITS(j)
-      Tracevv((stderr, "inflate:         distance %u\n", c->sub.copy.dist));
-      c->mode = COPY;
-    case COPY:          /* o: copying bytes in window, waiting for space */
-#ifndef __TURBOC__ /* Turbo C bug for following expression */
-      f = (uInt)(q - s->window) < c->sub.copy.dist ?
-          s->end - (c->sub.copy.dist - (q - s->window)) :
-          q - c->sub.copy.dist;
-#else
-      f = q - c->sub.copy.dist;
-      if ((uInt)(q - s->window) < c->sub.copy.dist)
-        f = s->end - (c->sub.copy.dist - (uInt)(q - s->window));
-#endif
-      while (c->len)
-      {
-        NEEDOUT
-        OUTBYTE(*f++)
-        if (f == s->end)
-          f = s->window;
-        c->len--;
-      }
-      c->mode = START;
-      break;
-    case LIT:           /* o: got literal, waiting for output space */
-      NEEDOUT
-      OUTBYTE(c->sub.lit)
-      c->mode = START;
-      break;
-    case WASH:          /* o: got eob, possibly more output */
-      if (k > 7)        /* return unused byte, if any */
-      {
-        Assert(k < 16, "inflate_codes grabbed too many bytes")
-        k -= 8;
-        n++;
-        p--;            /* can always return one */
-      }
-      FLUSH
-      if (s->read != s->write)
-        LEAVE
-      c->mode = END;
-    case END:
-      r = Z_STREAM_END;
-      LEAVE
-    case BADCODE:       /* x: got error */
-      r = Z_DATA_ERROR;
-      LEAVE
-    default:
-      r = Z_STREAM_ERROR;
-      LEAVE
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-}
-
-
-void inflate_codes_free(c, z)
-inflate_codes_statef *c;
-z_streamp z;
-{
-  ZFREE(z, c);
-  Tracev((stderr, "inflate:       codes free\n"));
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
deleted file mode 100644
index 61a78ee..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inffast.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* inffast.c -- process literals and length/distance pairs fast
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-#include "infblock.h"
-#include "infcodes.h"
-#include "infutil.h"
-#include "inffast.h"
-
-struct inflate_codes_state {int dummy;}; /* for buggy compilers */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* macros for bit input with no checking and for returning unused bytes */
-#define GRABBITS(j) {while(k<(j)){b|=((uLong)NEXTBYTE)<<k;k+=8;}}
-#define UNGRAB {c=z->avail_in-n;c=(k>>3)<c?k>>3:c;n+=c;p-=c;k-=c<<3;}
-
-/* Called with number of bytes left to write in window at least 258
-   (the maximum string length) and number of input bytes available
-   at least ten.  The ten bytes are six bytes for the longest length/
-   distance pair plus four bytes for overloading the bit buffer. */
-
-int inflate_fast(bl, bd, tl, td, s, z)
-uInt bl, bd;
-inflate_huft *tl;
-inflate_huft *td; /* need separate declaration for Borland C++ */
-inflate_blocks_statef *s;
-z_streamp z;
-{
-  inflate_huft *t;      /* temporary pointer */
-  uInt e;               /* extra bits or operation */
-  uLong b;              /* bit buffer */
-  uInt k;               /* bits in bit buffer */
-  Bytef *p;             /* input data pointer */
-  uInt n;               /* bytes available there */
-  Bytef *q;             /* output window write pointer */
-  uInt m;               /* bytes to end of window or read pointer */
-  uInt ml;              /* mask for literal/length tree */
-  uInt md;              /* mask for distance tree */
-  uInt c;               /* bytes to copy */
-  uInt d;               /* distance back to copy from */
-  Bytef *r;             /* copy source pointer */
-
-  /* load input, output, bit values */
-  LOAD
-
-  /* initialize masks */
-  ml = inflate_mask[bl];
-  md = inflate_mask[bd];
-
-  /* do until not enough input or output space for fast loop */
-  do {                          /* assume called with m >= 258 && n >= 10 */
-    /* get literal/length code */
-    GRABBITS(20)                /* max bits for literal/length code */
-    if ((e = (t = tl + ((uInt)b & ml))->exop) == 0)
-    {
-      DUMPBITS(t->bits)
-      Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-                "inflate:         * literal '%c'\n" :
-                "inflate:         * literal 0x%02x\n", t->base));
-      *q++ = (Byte)t->base;
-      m--;
-      continue;
-    }
-    do {
-      DUMPBITS(t->bits)
-      if (e & 16)
-      {
-        /* get extra bits for length */
-        e &= 15;
-        c = t->base + ((uInt)b & inflate_mask[e]);
-        DUMPBITS(e)
-        Tracevv((stderr, "inflate:         * length %u\n", c));
-
-        /* decode distance base of block to copy */
-        GRABBITS(15);           /* max bits for distance code */
-        e = (t = td + ((uInt)b & md))->exop;
-        do {
-          DUMPBITS(t->bits)
-          if (e & 16)
-          {
-            /* get extra bits to add to distance base */
-            e &= 15;
-            GRABBITS(e)         /* get extra bits (up to 13) */
-            d = t->base + ((uInt)b & inflate_mask[e]);
-            DUMPBITS(e)
-            Tracevv((stderr, "inflate:         * distance %u\n", d));
-
-            /* do the copy */
-            m -= c;
-            if ((uInt)(q - s->window) >= d)     /* offset before dest */
-            {                                   /*  just copy */
-              r = q - d;
-              *q++ = *r++;  c--;        /* minimum count is three, */
-              *q++ = *r++;  c--;        /*  so unroll loop a little */
-            }
-            else                        /* else offset after destination */
-            {
-              e = d - (uInt)(q - s->window); /* bytes from offset to end */
-              r = s->end - e;           /* pointer to offset */
-              if (c > e)                /* if source crosses, */
-              {
-                c -= e;                 /* copy to end of window */
-                do {
-                  *q++ = *r++;
-                } while (--e);
-                r = s->window;          /* copy rest from start of window */
-              }
-            }
-            do {                        /* copy all or what's left */
-              *q++ = *r++;
-            } while (--c);
-            break;
-          }
-          else if ((e & 64) == 0)
-          {
-            t += t->base;
-            e = (t += ((uInt)b & inflate_mask[e]))->exop;
-          }
-          else
-          {
-            z->msg = (char*)"invalid distance code";
-            UNGRAB
-            UPDATE
-            return Z_DATA_ERROR;
-          }
-        } while (1);
-        break;
-      }
-      if ((e & 64) == 0)
-      {
-        t += t->base;
-        if ((e = (t += ((uInt)b & inflate_mask[e]))->exop) == 0)
-        {
-          DUMPBITS(t->bits)
-          Tracevv((stderr, t->base >= 0x20 && t->base < 0x7f ?
-                    "inflate:         * literal '%c'\n" :
-                    "inflate:         * literal 0x%02x\n", t->base));
-          *q++ = (Byte)t->base;
-          m--;
-          break;
-        }
-      }
-      else if (e & 32)
-      {
-        Tracevv((stderr, "inflate:         * end of block\n"));
-        UNGRAB
-        UPDATE
-        return Z_STREAM_END;
-      }
-      else
-      {
-        z->msg = (char*)"invalid literal/length code";
-        UNGRAB
-        UPDATE
-        return Z_DATA_ERROR;
-      }
-    } while (1);
-  } while (m >= 258 && n >= 10);
-
-  /* not enough input or output--restore pointers and return */
-  UNGRAB
-  UPDATE
-  return Z_OK;
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
deleted file mode 100644
index 32e9b8d..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inflate.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/* inflate.c -- zlib interface to inflate modules
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "infblock.h"
-
-struct inflate_blocks_state {int dummy;}; /* for buggy compilers */
-
-typedef enum {
-      METHOD,   /* waiting for method byte */
-      FLAG,     /* waiting for flag byte */
-      DICT4,    /* four dictionary check bytes to go */
-      DICT3,    /* three dictionary check bytes to go */
-      DICT2,    /* two dictionary check bytes to go */
-      DICT1,    /* one dictionary check byte to go */
-      DICT0,    /* waiting for inflateSetDictionary */
-      BLOCKS,   /* decompressing blocks */
-      CHECK4,   /* four check bytes to go */
-      CHECK3,   /* three check bytes to go */
-      CHECK2,   /* two check bytes to go */
-      CHECK1,   /* one check byte to go */
-      DONE,     /* finished check, done */
-      BAD}      /* got an error--stay here */
-inflate_mode;
-
-/* inflate private state */
-struct internal_state {
-
-  /* mode */
-  inflate_mode  mode;   /* current inflate mode */
-
-  /* mode dependent information */
-  union {
-    uInt method;        /* if FLAGS, method byte */
-    struct {
-      uLong was;                /* computed check value */
-      uLong need;               /* stream check value */
-    } check;            /* if CHECK, check values to compare */
-    uInt marker;        /* if BAD, inflateSync's marker bytes count */
-  } sub;        /* submode */
-
-  /* mode independent information */
-  int  nowrap;          /* flag for no wrapper */
-  uInt wbits;           /* log2(window size)  (8..15, defaults to 15) */
-  inflate_blocks_statef 
-    *blocks;            /* current inflate_blocks state */
-
-};
-
-
-int ZEXPORT inflateReset(z)
-z_streamp z;
-{
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->total_in = z->total_out = 0;
-  z->msg = Z_NULL;
-  z->state->mode = z->state->nowrap ? BLOCKS : METHOD;
-  inflate_blocks_reset(z->state->blocks, z, Z_NULL);
-  Tracev((stderr, "inflate: reset\n"));
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateEnd(z)
-z_streamp z;
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->zfree == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->blocks != Z_NULL)
-    inflate_blocks_free(z->state->blocks, z);
-  ZFREE(z, z->state);
-  z->state = Z_NULL;
-  Tracev((stderr, "inflate: end\n"));
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateInit2_(z, w, version, stream_size)
-z_streamp z;
-int w;
-const char *version;
-int stream_size;
-{
-  if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
-      stream_size != sizeof(z_stream))
-      return Z_VERSION_ERROR;
-
-  /* initialize state */
-  if (z == Z_NULL)
-    return Z_STREAM_ERROR;
-  z->msg = Z_NULL;
-  if (z->zalloc == Z_NULL)
-  {
-    z->zalloc = zcalloc;
-    z->opaque = (voidpf)0;
-  }
-  if (z->zfree == Z_NULL) z->zfree = zcfree;
-  if ((z->state = (struct internal_state FAR *)
-       ZALLOC(z,1,sizeof(struct internal_state))) == Z_NULL)
-    return Z_MEM_ERROR;
-  z->state->blocks = Z_NULL;
-
-  /* handle undocumented nowrap option (no zlib header or check) */
-  z->state->nowrap = 0;
-  if (w < 0)
-  {
-    w = - w;
-    z->state->nowrap = 1;
-  }
-
-  /* set window size */
-  if (w < 8 || w > 15)
-  {
-    inflateEnd(z);
-    return Z_STREAM_ERROR;
-  }
-  z->state->wbits = (uInt)w;
-
-  /* create inflate_blocks state */
-  if ((z->state->blocks =
-      inflate_blocks_new(z, z->state->nowrap ? Z_NULL : adler32, (uInt)1 << w))
-      == Z_NULL)
-  {
-    inflateEnd(z);
-    return Z_MEM_ERROR;
-  }
-  Tracev((stderr, "inflate: allocated\n"));
-
-  /* reset state */
-  inflateReset(z);
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateInit_(z, version, stream_size)
-z_streamp z;
-const char *version;
-int stream_size;
-{
-  return inflateInit2_(z, DEF_WBITS, version, stream_size);
-}
-
-
-#define NEEDBYTE {if(z->avail_in==0)return r;r=f;}
-#define NEXTBYTE (z->avail_in--,z->total_in++,*z->next_in++)
-
-int ZEXPORT inflate(z, f)
-z_streamp z;
-int f;
-{
-  int r;
-  uInt b;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->next_in == Z_NULL)
-    return Z_STREAM_ERROR;
-  f = f == Z_FINISH ? Z_BUF_ERROR : Z_OK;
-  r = Z_BUF_ERROR;
-  while (1) switch (z->state->mode)
-  {
-    case METHOD:
-      NEEDBYTE
-      if (((z->state->sub.method = NEXTBYTE) & 0xf) != Z_DEFLATED)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"unknown compression method";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      if ((z->state->sub.method >> 4) + 8 > z->state->wbits)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"invalid window size";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      z->state->mode = FLAG;
-    case FLAG:
-      NEEDBYTE
-      b = NEXTBYTE;
-      if (((z->state->sub.method << 8) + b) % 31)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"incorrect header check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev((stderr, "inflate: zlib header ok\n"));
-      if (!(b & PRESET_DICT))
-      {
-        z->state->mode = BLOCKS;
-        break;
-      }
-      z->state->mode = DICT4;
-    case DICT4:
-      NEEDBYTE
-      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
-      z->state->mode = DICT3;
-    case DICT3:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
-      z->state->mode = DICT2;
-    case DICT2:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
-      z->state->mode = DICT1;
-    case DICT1:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE;
-      z->adler = z->state->sub.check.need;
-      z->state->mode = DICT0;
-      return Z_NEED_DICT;
-    case DICT0:
-      z->state->mode = BAD;
-      z->msg = (char*)"need dictionary";
-      z->state->sub.marker = 0;       /* can try inflateSync */
-      return Z_STREAM_ERROR;
-    case BLOCKS:
-      r = inflate_blocks(z->state->blocks, z, r);
-      if (r == Z_DATA_ERROR)
-      {
-        z->state->mode = BAD;
-        z->state->sub.marker = 0;       /* can try inflateSync */
-        break;
-      }
-      if (r == Z_OK)
-        r = f;
-      if (r != Z_STREAM_END)
-        return r;
-      r = f;
-      inflate_blocks_reset(z->state->blocks, z, &z->state->sub.check.was);
-      if (z->state->nowrap)
-      {
-        z->state->mode = DONE;
-        break;
-      }
-      z->state->mode = CHECK4;
-    case CHECK4:
-      NEEDBYTE
-      z->state->sub.check.need = (uLong)NEXTBYTE << 24;
-      z->state->mode = CHECK3;
-    case CHECK3:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 16;
-      z->state->mode = CHECK2;
-    case CHECK2:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE << 8;
-      z->state->mode = CHECK1;
-    case CHECK1:
-      NEEDBYTE
-      z->state->sub.check.need += (uLong)NEXTBYTE;
-
-      if (z->state->sub.check.was != z->state->sub.check.need)
-      {
-        z->state->mode = BAD;
-        z->msg = (char*)"incorrect data check";
-        z->state->sub.marker = 5;       /* can't try inflateSync */
-        break;
-      }
-      Tracev((stderr, "inflate: zlib check ok\n"));
-      z->state->mode = DONE;
-    case DONE:
-      return Z_STREAM_END;
-    case BAD:
-      return Z_DATA_ERROR;
-    default:
-      return Z_STREAM_ERROR;
-  }
-#ifdef NEED_DUMMY_RETURN
-  return Z_STREAM_ERROR;  /* Some dumb compilers complain without this */
-#endif
-}
-
-
-int ZEXPORT inflateSetDictionary(z, dictionary, dictLength)
-z_streamp z;
-const Bytef *dictionary;
-uInt  dictLength;
-{
-  uInt length = dictLength;
-
-  if (z == Z_NULL || z->state == Z_NULL || z->state->mode != DICT0)
-    return Z_STREAM_ERROR;
-
-  if (adler32(1L, dictionary, dictLength) != z->adler) return Z_DATA_ERROR;
-  z->adler = 1L;
-
-  if (length >= ((uInt)1<<z->state->wbits))
-  {
-    length = (1<<z->state->wbits)-1;
-    dictionary += dictLength - length;
-  }
-  inflate_set_dictionary(z->state->blocks, dictionary, length);
-  z->state->mode = BLOCKS;
-  return Z_OK;
-}
-
-
-int ZEXPORT inflateSync(z)
-z_streamp z;
-{
-  uInt n;       /* number of bytes to look at */
-  Bytef *p;     /* pointer to bytes */
-  uInt m;       /* number of marker bytes found in a row */
-  uLong r, w;   /* temporaries to save total_in and total_out */
-
-  /* set up */
-  if (z == Z_NULL || z->state == Z_NULL)
-    return Z_STREAM_ERROR;
-  if (z->state->mode != BAD)
-  {
-    z->state->mode = BAD;
-    z->state->sub.marker = 0;
-  }
-  if ((n = z->avail_in) == 0)
-    return Z_BUF_ERROR;
-  p = z->next_in;
-  m = z->state->sub.marker;
-
-  /* search */
-  while (n && m < 4)
-  {
-    static const Byte mark[4] = {0, 0, 0xff, 0xff};
-    if (*p == mark[m])
-      m++;
-    else if (*p)
-      m = 0;
-    else
-      m = 4 - m;
-    p++, n--;
-  }
-
-  /* restore */
-  z->total_in += p - z->next_in;
-  z->next_in = p;
-  z->avail_in = n;
-  z->state->sub.marker = m;
-
-  /* return no joy or set up to restart on a new block */
-  if (m != 4)
-    return Z_DATA_ERROR;
-  r = z->total_in;  w = z->total_out;
-  inflateReset(z);
-  z->total_in = r;  z->total_out = w;
-  z->state->mode = BLOCKS;
-  return Z_OK;
-}
-
-
-/* Returns true if inflate is currently at the end of a block generated
- * by Z_SYNC_FLUSH or Z_FULL_FLUSH. This function is used by one PPP
- * implementation to provide an additional safety check. PPP uses Z_SYNC_FLUSH
- * but removes the length bytes of the resulting empty stored block. When
- * decompressing, PPP checks that at the end of input packet, inflate is
- * waiting for these length bytes.
- */
-int ZEXPORT inflateSyncPoint(z)
-z_streamp z;
-{
-  if (z == Z_NULL || z->state == Z_NULL || z->state->blocks == Z_NULL)
-    return Z_STREAM_ERROR;
-  return inflate_blocks_sync_point(z->state->blocks);
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
deleted file mode 100644
index ef1e0b6..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/inftrees.c
+++ /dev/null
@@ -1,455 +0,0 @@
-/* inftrees.c -- generate Huffman trees for efficient decoding
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "inftrees.h"
-
-#if !defined(BUILDFIXED) && !defined(STDC)
-#  define BUILDFIXED   /* non ANSI compilers may not accept inffixed.h */
-#endif
-
-const char inflate_copyright[] =
-   " inflate 1.1.3 Copyright 1995-1998 Mark Adler ";
-/*
-  If you use the zlib library in a product, an acknowledgment is welcome
-  in the documentation of your product. If for some reason you cannot
-  include such an acknowledgment, I would appreciate that you keep this
-  copyright string in the executable of your product.
- */
-struct internal_state  {int dummy;}; /* for buggy compilers */
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-
-local int huft_build OF((
-    uIntf *,            /* code lengths in bits */
-    uInt,               /* number of codes */
-    uInt,               /* number of "simple" codes */
-    const uIntf *,      /* list of base values for non-simple codes */
-    const uIntf *,      /* list of extra bits for non-simple codes */
-    inflate_huft * FAR*,/* result: starting table */
-    uIntf *,            /* maximum lookup bits (returns actual) */
-    inflate_huft *,     /* space for trees */
-    uInt *,             /* hufts used in space */
-    uIntf * ));         /* space for values */
-
-/* Tables for deflate from PKZIP's appnote.txt. */
-local const uInt cplens[31] = { /* Copy lengths for literal codes 257..285 */
-        3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-        35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0};
-        /* see note #13 above about 258 */
-local const uInt cplext[31] = { /* Extra bits for literal codes 257..285 */
-        0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-        3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 112, 112}; /* 112==invalid */
-local const uInt cpdist[30] = { /* Copy offsets for distance codes 0..29 */
-        1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-        257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-        8193, 12289, 16385, 24577};
-local const uInt cpdext[30] = { /* Extra bits for distance codes */
-        0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-        7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-        12, 12, 13, 13};
-
-/*
-   Huffman code decoding is performed using a multi-level table lookup.
-   The fastest way to decode is to simply build a lookup table whose
-   size is determined by the longest code.  However, the time it takes
-   to build this table can also be a factor if the data being decoded
-   is not very long.  The most common codes are necessarily the
-   shortest codes, so those codes dominate the decoding time, and hence
-   the speed.  The idea is you can have a shorter table that decodes the
-   shorter, more probable codes, and then point to subsidiary tables for
-   the longer codes.  The time it costs to decode the longer codes is
-   then traded against the time it takes to make longer tables.
-
-   This results of this trade are in the variables lbits and dbits
-   below.  lbits is the number of bits the first level table for literal/
-   length codes can decode in one step, and dbits is the same thing for
-   the distance codes.  Subsequent tables are also less than or equal to
-   those sizes.  These values may be adjusted either when all of the
-   codes are shorter than that, in which case the longest code length in
-   bits is used, or when the shortest code is *longer* than the requested
-   table size, in which case the length of the shortest code in bits is
-   used.
-
-   There are two different values for the two tables, since they code a
-   different number of possibilities each.  The literal/length table
-   codes 286 possible values, or in a flat code, a little over eight
-   bits.  The distance table codes 30 possible values, or a little less
-   than five bits, flat.  The optimum values for speed end up being
-   about one bit more than those, so lbits is 8+1 and dbits is 5+1.
-   The optimum values may differ though from machine to machine, and
-   possibly even between compilers.  Your mileage may vary.
- */
-
-
-/* If BMAX needs to be larger than 16, then h and x[] should be uLong. */
-#define BMAX 15         /* maximum bit length of any code */
-
-local int huft_build(b, n, s, d, e, t, m, hp, hn, v)
-uIntf *b;               /* code lengths in bits (all assumed <= BMAX) */
-uInt n;                 /* number of codes (assumed <= 288) */
-uInt s;                 /* number of simple-valued codes (0..s-1) */
-const uIntf *d;         /* list of base values for non-simple codes */
-const uIntf *e;         /* list of extra bits for non-simple codes */
-inflate_huft * FAR *t;  /* result: starting table */
-uIntf *m;               /* maximum lookup bits, returns actual */
-inflate_huft *hp;       /* space for trees */
-uInt *hn;               /* hufts used in space */
-uIntf *v;               /* working area: values in order of bit length */
-/* Given a list of code lengths and a maximum table size, make a set of
-   tables to decode that set of codes.  Return Z_OK on success, Z_BUF_ERROR
-   if the given code set is incomplete (the tables are still built in this
-   case), Z_DATA_ERROR if the input is invalid (an over-subscribed set of
-   lengths), or Z_MEM_ERROR if not enough memory. */
-{
-
-  uInt a;                       /* counter for codes of length k */
-  uInt c[BMAX+1];               /* bit length count table */
-  uInt f;                       /* i repeats in table every f entries */
-  int g;                        /* maximum code length */
-  int h;                        /* table level */
-  register uInt i;              /* counter, current code */
-  register uInt j;              /* counter */
-  register int k;               /* number of bits in current code */
-  int l;                        /* bits per table (returned in m) */
-  uInt mask;                    /* (1 << w) - 1, to avoid cc -O bug on HP */
-  register uIntf *p;            /* pointer into c[], b[], or v[] */
-  inflate_huft *q;              /* points to current table */
-  struct inflate_huft_s r;      /* table entry for structure assignment */
-  inflate_huft *u[BMAX];        /* table stack */
-  register int w;               /* bits before this table == (l * h) */
-  uInt x[BMAX+1];               /* bit offsets, then code stack */
-  uIntf *xp;                    /* pointer into x */
-  int y;                        /* number of dummy codes added */
-  uInt z;                       /* number of entries in current table */
-
-
-  /* Generate counts for each bit length */
-  p = c;
-#define C0 *p++ = 0;
-#define C2 C0 C0 C0 C0
-#define C4 C2 C2 C2 C2
-  C4                            /* clear c[]--assume BMAX+1 is 16 */
-  p = b;  i = n;
-  do {
-    c[*p++]++;                  /* assume all entries <= BMAX */
-  } while (--i);
-  if (c[0] == n)                /* null input--all zero length codes */
-  {
-    *t = (inflate_huft *)Z_NULL;
-    *m = 0;
-    return Z_OK;
-  }
-
-
-  /* Find minimum and maximum length, bound *m by those */
-  l = *m;
-  for (j = 1; j <= BMAX; j++)
-    if (c[j])
-      break;
-  k = j;                        /* minimum code length */
-  if ((uInt)l < j)
-    l = j;
-  for (i = BMAX; i; i--)
-    if (c[i])
-      break;
-  g = i;                        /* maximum code length */
-  if ((uInt)l > i)
-    l = i;
-  *m = l;
-
-
-  /* Adjust last length count to fill out codes, if needed */
-  for (y = 1 << j; j < i; j++, y <<= 1)
-    if ((y -= c[j]) < 0)
-      return Z_DATA_ERROR;
-  if ((y -= c[i]) < 0)
-    return Z_DATA_ERROR;
-  c[i] += y;
-
-
-  /* Generate starting offsets into the value table for each length */
-  x[1] = j = 0;
-  p = c + 1;  xp = x + 2;
-  while (--i) {                 /* note that i == g from above */
-    *xp++ = (j += *p++);
-  }
-
-
-  /* Make a table of values in order of bit lengths */
-  p = b;  i = 0;
-  do {
-    if ((j = *p++) != 0)
-      v[x[j]++] = i;
-  } while (++i < n);
-  n = x[g];                     /* set n to length of v */
-
-
-  /* Generate the Huffman codes and for each, make the table entries */
-  x[0] = i = 0;                 /* first Huffman code is zero */
-  p = v;                        /* grab values in bit order */
-  h = -1;                       /* no tables yet--level -1 */
-  w = -l;                       /* bits decoded == (l * h) */
-  u[0] = (inflate_huft *)Z_NULL;        /* just to keep compilers happy */
-  q = (inflate_huft *)Z_NULL;   /* ditto */
-  z = 0;                        /* ditto */
-
-  /* go through the bit lengths (k already is bits in shortest code) */
-  for (; k <= g; k++)
-  {
-    a = c[k];
-    while (a--)
-    {
-      /* here i is the Huffman code of length k bits for value *p */
-      /* make tables up to required level */
-      while (k > w + l)
-      {
-        h++;
-        w += l;                 /* previous table always l bits */
-
-        /* compute minimum size table less than or equal to l bits */
-        z = g - w;
-        z = z > (uInt)l ? l : z;        /* table size upper limit */
-        if ((f = 1 << (j = k - w)) > a + 1)     /* try a k-w bit table */
-        {                       /* too few codes for k-w bit table */
-          f -= a + 1;           /* deduct codes from patterns left */
-          xp = c + k;
-          if (j < z)
-            while (++j < z)     /* try smaller tables up to z bits */
-            {
-              if ((f <<= 1) <= *++xp)
-                break;          /* enough codes to use up j bits */
-              f -= *xp;         /* else deduct codes from patterns */
-            }
-        }
-        z = 1 << j;             /* table entries for j-bit table */
-
-        /* allocate new table */
-        if (*hn + z > MANY)     /* (note: doesn't matter for fixed) */
-          return Z_MEM_ERROR;   /* not enough memory */
-        u[h] = q = hp + *hn;
-        *hn += z;
-
-        /* connect to last table, if there is one */
-        if (h)
-        {
-          x[h] = i;             /* save pattern for backing up */
-          r.bits = (Byte)l;     /* bits to dump before this table */
-          r.exop = (Byte)j;     /* bits in this table */
-          j = i >> (w - l);
-          r.base = (uInt)(q - u[h-1] - j);   /* offset to this table */
-          u[h-1][j] = r;        /* connect to last table */
-        }
-        else
-          *t = q;               /* first table is returned result */
-      }
-
-      /* set up table entry in r */
-      r.bits = (Byte)(k - w);
-      if (p >= v + n)
-        r.exop = 128 + 64;      /* out of values--invalid code */
-      else if (*p < s)
-      {
-        r.exop = (Byte)(*p < 256 ? 0 : 32 + 64);     /* 256 is end-of-block */
-        r.base = *p++;          /* simple code is just the value */
-      }
-      else
-      {
-        r.exop = (Byte)(e[*p - s] + 16 + 64);/* non-simple--look up in lists */
-        r.base = d[*p++ - s];
-      }
-
-      /* fill code-like entries with r */
-      f = 1 << (k - w);
-      for (j = i >> w; j < z; j += f)
-        q[j] = r;
-
-      /* backwards increment the k-bit code i */
-      for (j = 1 << (k - 1); i & j; j >>= 1)
-        i ^= j;
-      i ^= j;
-
-      /* backup over finished tables */
-      mask = (1 << w) - 1;      /* needed on HP, cc -O bug */
-      while ((i & mask) != x[h])
-      {
-        h--;                    /* don't need to update q */
-        w -= l;
-        mask = (1 << w) - 1;
-      }
-    }
-  }
-
-
-  /* Return Z_BUF_ERROR if we were given an incomplete table */
-  return y != 0 && g != 1 ? Z_BUF_ERROR : Z_OK;
-}
-
-
-int inflate_trees_bits(c, bb, tb, hp, z)
-uIntf *c;               /* 19 code lengths */
-uIntf *bb;              /* bits tree desired/actual depth */
-inflate_huft * FAR *tb; /* bits tree result */
-inflate_huft *hp;       /* space for trees */
-z_streamp z;            /* for messages */
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uIntf *v;             /* work area for huft_build */
-
-  if ((v = (uIntf*)ZALLOC(z, 19, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-  r = huft_build(c, 19, 19, (uIntf*)Z_NULL, (uIntf*)Z_NULL,
-                 tb, bb, hp, &hn, v);
-  if (r == Z_DATA_ERROR)
-    z->msg = (char*)"oversubscribed dynamic bit lengths tree";
-  else if (r == Z_BUF_ERROR || *bb == 0)
-  {
-    z->msg = (char*)"incomplete dynamic bit lengths tree";
-    r = Z_DATA_ERROR;
-  }
-  ZFREE(z, v);
-  return r;
-}
-
-
-int inflate_trees_dynamic(nl, nd, c, bl, bd, tl, td, hp, z)
-uInt nl;                /* number of literal/length codes */
-uInt nd;                /* number of distance codes */
-uIntf *c;               /* that many (total) code lengths */
-uIntf *bl;              /* literal desired/actual bit depth */
-uIntf *bd;              /* distance desired/actual bit depth */
-inflate_huft * FAR *tl; /* literal/length tree result */
-inflate_huft * FAR *td; /* distance tree result */
-inflate_huft *hp;       /* space for trees */
-z_streamp z;            /* for messages */
-{
-  int r;
-  uInt hn = 0;          /* hufts used in space */
-  uIntf *v;             /* work area for huft_build */
-
-  /* allocate work area */
-  if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-    return Z_MEM_ERROR;
-
-  /* build literal/length tree */
-  r = huft_build(c, nl, 257, cplens, cplext, tl, bl, hp, &hn, v);
-  if (r != Z_OK || *bl == 0)
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed literal/length tree";
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"incomplete literal/length tree";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-  }
-
-  /* build distance tree */
-  r = huft_build(c + nl, nd, 0, cpdist, cpdext, td, bd, hp, &hn, v);
-  if (r != Z_OK || (*bd == 0 && nl > 257))
-  {
-    if (r == Z_DATA_ERROR)
-      z->msg = (char*)"oversubscribed distance tree";
-    else if (r == Z_BUF_ERROR) {
-#ifdef PKZIP_BUG_WORKAROUND
-      r = Z_OK;
-    }
-#else
-      z->msg = (char*)"incomplete distance tree";
-      r = Z_DATA_ERROR;
-    }
-    else if (r != Z_MEM_ERROR)
-    {
-      z->msg = (char*)"empty distance tree with lengths";
-      r = Z_DATA_ERROR;
-    }
-    ZFREE(z, v);
-    return r;
-#endif
-  }
-
-  /* done */
-  ZFREE(z, v);
-  return Z_OK;
-}
-
-
-/* build fixed tables only once--keep them here */
-#ifdef BUILDFIXED
-local int fixed_built = 0;
-#define FIXEDH 544      /* number of hufts used by fixed tables */
-local inflate_huft fixed_mem[FIXEDH];
-local uInt fixed_bl;
-local uInt fixed_bd;
-local inflate_huft *fixed_tl;
-local inflate_huft *fixed_td;
-#else
-#include "inffixed.h"
-#endif
-
-
-int inflate_trees_fixed(bl, bd, tl, td, z)
-uIntf *bl;               /* literal desired/actual bit depth */
-uIntf *bd;               /* distance desired/actual bit depth */
-inflate_huft * FAR *tl;  /* literal/length tree result */
-inflate_huft * FAR *td;  /* distance tree result */
-z_streamp z;             /* for memory allocation */
-{
-#ifdef BUILDFIXED
-  /* build fixed tables if not already */
-  if (!fixed_built)
-  {
-    int k;              /* temporary variable */
-    uInt f = 0;         /* number of hufts used in fixed_mem */
-    uIntf *c;           /* length list for huft_build */
-    uIntf *v;           /* work area for huft_build */
-
-    /* allocate memory */
-    if ((c = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-      return Z_MEM_ERROR;
-    if ((v = (uIntf*)ZALLOC(z, 288, sizeof(uInt))) == Z_NULL)
-    {
-      ZFREE(z, c);
-      return Z_MEM_ERROR;
-    }
-
-    /* literal table */
-    for (k = 0; k < 144; k++)
-      c[k] = 8;
-    for (; k < 256; k++)
-      c[k] = 9;
-    for (; k < 280; k++)
-      c[k] = 7;
-    for (; k < 288; k++)
-      c[k] = 8;
-    fixed_bl = 9;
-    huft_build(c, 288, 257, cplens, cplext, &fixed_tl, &fixed_bl,
-               fixed_mem, &f, v);
-
-    /* distance table */
-    for (k = 0; k < 30; k++)
-      c[k] = 5;
-    fixed_bd = 5;
-    huft_build(c, 30, 0, cpdist, cpdext, &fixed_td, &fixed_bd,
-               fixed_mem, &f, v);
-
-    /* done */
-    ZFREE(z, v);
-    ZFREE(z, c);
-    fixed_built = 1;
-  }
-#endif
-  *bl = fixed_bl;
-  *bd = fixed_bd;
-  *tl = fixed_tl;
-  *td = fixed_td;
-  return Z_OK;
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
deleted file mode 100644
index 824dab5..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/infutil.c
+++ /dev/null
@@ -1,87 +0,0 @@
-/* inflate_util.c -- data and routines common to blocks and codes
- * Copyright (C) 1995-1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-#include "zutil.h"
-#include "infblock.h"
-#include "inftrees.h"
-#include "infcodes.h"
-#include "infutil.h"
-
-struct inflate_codes_state {int dummy;}; /* for buggy compilers */
-
-/* And'ing with mask[n] masks the lower n bits */
-uInt inflate_mask[17] = {
-    0x0000,
-    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff
-};
-
-
-/* copy as much as possible from the sliding window to the output area */
-int inflate_flush(s, z, r)
-inflate_blocks_statef *s;
-z_streamp z;
-int r;
-{
-  uInt n;
-  Bytef *p;
-  Bytef *q;
-
-  /* local copies of source and destination pointers */
-  p = z->next_out;
-  q = s->read;
-
-  /* compute number of bytes to copy as far as end of window */
-  n = (uInt)((q <= s->write ? s->write : s->end) - q);
-  if (n > z->avail_out) n = z->avail_out;
-  if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-  /* update counters */
-  z->avail_out -= n;
-  z->total_out += n;
-
-  /* update check information */
-  if (s->checkfn != Z_NULL)
-    z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-  /* copy as far as end of window */
-  zmemcpy(p, q, n);
-  p += n;
-  q += n;
-
-  /* see if more to copy at beginning of window */
-  if (q == s->end)
-  {
-    /* wrap pointers */
-    q = s->window;
-    if (s->write == s->end)
-      s->write = s->window;
-
-    /* compute bytes to copy */
-    n = (uInt)(s->write - q);
-    if (n > z->avail_out) n = z->avail_out;
-    if (n && r == Z_BUF_ERROR) r = Z_OK;
-
-    /* update counters */
-    z->avail_out -= n;
-    z->total_out += n;
-
-    /* update check information */
-    if (s->checkfn != Z_NULL)
-      z->adler = s->check = (*s->checkfn)(s->check, q, n);
-
-    /* copy */
-    zmemcpy(p, q, n);
-    p += n;
-    q += n;
-  }
-
-  /* update pointers */
-  z->next_out = p;
-  s->read = q;
-
-  /* done */
-  return r;
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
deleted file mode 100644
index c564575..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/makefile.uni
+++ /dev/null
@@ -1,31 +0,0 @@
-.KEEP_STATE:
-#############################################################################
-#                                                                           #
-#                                   RATER                                   #
-#                                                                           #
-#############################################################################
-
-LIB	    = libzlib.a
-
-INC_DIR = -I../Include
-
-COPT    = -g -w $(INC_DIR) $(RELEASE)
-LINK	= ar r 
-
-.SUFFIXES: .o .c
-.c.o:
-	$(CC) -c $(COPT) $*.c
-
-MODULES  = \
-	adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-	zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
-
-################################## RATER ##################################
-
-all: $(LIB)
-
-$(LIB): $(MODULES) 
-	$(LINK) $(LIB) $(MODULES)
-	
-clean:
-	rm -f *.o $(LIB) logfile.txt 
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
deleted file mode 100644
index 949d786..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/maketree.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* maketree.c -- make inffixed.h table for decoding fixed codes
- * Copyright (C) 1998 Mark Adler
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* WARNING: this file should *not* be used by applications. It is
-   part of the implementation of the compression library and is
-   subject to change. Applications should only use zlib.h.
- */
-
-/* This program is included in the distribution for completeness.
-   You do not need to compile or run this program since inffixed.h
-   is already included in the distribution.  To use this program
-   you need to compile zlib with BUILDFIXED defined and then compile
-   and link this program with the zlib library.  Then the output of
-   this program can be piped to inffixed.h. */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "zutil.h"
-#include "inftrees.h"
-
-/* simplify the use of the inflate_huft type with some defines */
-#define exop word.what.Exop
-#define bits word.what.Bits
-
-/* generate initialization table for an inflate_huft structure array */
-void maketree(uInt b, inflate_huft *t)
-{
-  int i, e;
-
-  i = 0;
-  while (1)
-  {
-    e = t[i].exop;
-    if (e && (e & (16+64)) == 0)        /* table pointer */
-    {
-      fprintf(stderr, "maketree: cannot initialize sub-tables!\n");
-      exit(1);
-    }
-    if (i % 4 == 0)
-      printf("\n   ");
-    printf(" {{{%u,%u}},%u}", t[i].exop, t[i].bits, t[i].base);
-    if (++i == (1<<b))
-      break;
-    putchar(',');
-  }
-  puts("");
-}
-
-/* create the fixed tables in C initialization syntax */
-void main(void)
-{
-  int r;
-  uInt bl, bd;
-  inflate_huft *tl, *td;
-  z_stream z;
-
-  z.zalloc = zcalloc;
-  z.opaque = (voidpf)0;
-  z.zfree = zcfree;
-  r = inflate_trees_fixed(&bl, &bd, &tl, &td, &z);
-  if (r)
-  {
-    fprintf(stderr, "inflate_trees_fixed error %d\n", r);
-    return;
-  }
-  puts("/* inffixed.h -- table for decoding fixed codes");
-  puts(" * Generated automatically by the maketree.c program");
-  puts(" */");
-  puts("");
-  puts("/* WARNING: this file should *not* be used by applications. It is");
-  puts("   part of the implementation of the compression library and is");
-  puts("   subject to change. Applications should only use zlib.h.");
-  puts(" */");
-  puts("");
-  printf("local uInt fixed_bl = %d;\n", bl);
-  printf("local uInt fixed_bd = %d;\n", bd);
-  printf("local inflate_huft fixed_tl[] = {");
-  maketree(bl, tl);
-  puts("  };");
-  printf("local inflate_huft fixed_td[] = {");
-  maketree(bd, td);
-  puts("  };");
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
deleted file mode 100644
index 7215eae..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/minigzip.c
+++ /dev/null
@@ -1,320 +0,0 @@
-/* minigzip.c -- simulate gzip using the zlib compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/*
- * minigzip is a minimal implementation of the gzip utility. This is
- * only an example of using zlib and isn't meant to replace the
- * full-featured gzip. No attempt is made to deal with file systems
- * limiting names to 14 or 8+3 characters, etc... Error checking is
- * very limited. So use minigzip only for testing; use gzip for the
- * real thing. On MSDOS, use only on file names without extension
- * or in pipe mode.
- */
-
-/* @(#) $Id$ */
-
-#include <stdio.h>
-#include "zlib.h"
-
-#ifdef STDC
-#  include <string.h>
-#  include <stdlib.h>
-#else
-   extern void exit  OF((int));
-#endif
-
-#ifdef USE_MMAP
-#  include <sys/types.h>
-#  include <sys/mman.h>
-#  include <sys/stat.h>
-#endif
-
-#if defined(MSDOS) || defined(OS2) || defined(WIN32)
-#  include <fcntl.h>
-#  include <io.h>
-#  define SET_BINARY_MODE(file) setmode(fileno(file), O_BINARY)
-#else
-#  define SET_BINARY_MODE(file)
-#endif
-
-#ifdef VMS
-#  define unlink delete
-#  define GZ_SUFFIX "-gz"
-#endif
-#ifdef RISCOS
-#  define unlink remove
-#  define GZ_SUFFIX "-gz"
-#  define fileno(file) file->__file
-#endif
-#if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os
-#  include <unix.h> /* for fileno */
-#endif
-
-#ifndef WIN32 /* unlink already in stdio.h for WIN32 */
-  extern int unlink OF((const char *));
-#endif
-
-#ifndef GZ_SUFFIX
-#  define GZ_SUFFIX ".gz"
-#endif
-#define SUFFIX_LEN (sizeof(GZ_SUFFIX)-1)
-
-#define BUFLEN      16384
-#define MAX_NAME_LEN 1024
-
-#ifdef MAXSEG_64K
-#  define local static
-   /* Needed for systems with limitation on stack size. */
-#else
-#  define local
-#endif
-
-char *prog;
-
-void error            OF((const char *msg));
-void gz_compress      OF((FILE   *in, gzFile out));
-#ifdef USE_MMAP
-int  gz_compress_mmap OF((FILE   *in, gzFile out));
-#endif
-void gz_uncompress    OF((gzFile in, FILE   *out));
-void file_compress    OF((char  *file, char *mode));
-void file_uncompress  OF((char  *file));
-int  main             OF((int argc, char *argv[]));
-
-/* ===========================================================================
- * Display error message and exit
- */
-void error(msg)
-    const char *msg;
-{
-    fprintf(stderr, "%s: %s\n", prog, msg);
-    exit(1);
-}
-
-/* ===========================================================================
- * Compress input to output then close both files.
- */
-
-void gz_compress(in, out)
-    FILE   *in;
-    gzFile out;
-{
-    local char buf[BUFLEN];
-    int len;
-    int err;
-
-#ifdef USE_MMAP
-    /* Try first compressing with mmap. If mmap fails (minigzip used in a
-     * pipe), use the normal fread loop.
-     */
-    if (gz_compress_mmap(in, out) == Z_OK) return;
-#endif
-    for (;;) {
-        len = fread(buf, 1, sizeof(buf), in);
-        if (ferror(in)) {
-            perror("fread");
-            exit(1);
-        }
-        if (len == 0) break;
-
-        if (gzwrite(out, buf, (unsigned)len) != len) error(gzerror(out, &err));
-    }
-    fclose(in);
-    if (gzclose(out) != Z_OK) error("failed gzclose");
-}
-
-#ifdef USE_MMAP /* MMAP version, Miguel Albrecht <malbrech@eso.org> */
-
-/* Try compressing the input file at once using mmap. Return Z_OK if
- * if success, Z_ERRNO otherwise.
- */
-int gz_compress_mmap(in, out)
-    FILE   *in;
-    gzFile out;
-{
-    int len;
-    int err;
-    int ifd = fileno(in);
-    caddr_t buf;    /* mmap'ed buffer for the entire input file */
-    off_t buf_len;  /* length of the input file */
-    struct stat sb;
-
-    /* Determine the size of the file, needed for mmap: */
-    if (fstat(ifd, &sb) < 0) return Z_ERRNO;
-    buf_len = sb.st_size;
-    if (buf_len <= 0) return Z_ERRNO;
-
-    /* Now do the actual mmap: */
-    buf = mmap((caddr_t) 0, buf_len, PROT_READ, MAP_SHARED, ifd, (off_t)0); 
-    if (buf == (caddr_t)(-1)) return Z_ERRNO;
-
-    /* Compress the whole file at once: */
-    len = gzwrite(out, (char *)buf, (unsigned)buf_len);
-
-    if (len != (int)buf_len) error(gzerror(out, &err));
-
-    munmap(buf, buf_len);
-    fclose(in);
-    if (gzclose(out) != Z_OK) error("failed gzclose");
-    return Z_OK;
-}
-#endif /* USE_MMAP */
-
-/* ===========================================================================
- * Uncompress input to output then close both files.
- */
-void gz_uncompress(in, out)
-    gzFile in;
-    FILE   *out;
-{
-    local char buf[BUFLEN];
-    int len;
-    int err;
-
-    for (;;) {
-        len = gzread(in, buf, sizeof(buf));
-        if (len < 0) error (gzerror(in, &err));
-        if (len == 0) break;
-
-        if ((int)fwrite(buf, 1, (unsigned)len, out) != len) {
-	    error("failed fwrite");
-	}
-    }
-    if (fclose(out)) error("failed fclose");
-
-    if (gzclose(in) != Z_OK) error("failed gzclose");
-}
-
-
-/* ===========================================================================
- * Compress the given file: create a corresponding .gz file and remove the
- * original.
- */
-void file_compress(file, mode)
-    char  *file;
-    char  *mode;
-{
-    local char outfile[MAX_NAME_LEN];
-    FILE  *in;
-    gzFile out;
-
-    strcpy(outfile, file);
-    strcat(outfile, GZ_SUFFIX);
-
-    in = fopen(file, "rb");
-    if (in == NULL) {
-        perror(file);
-        exit(1);
-    }
-    out = gzopen(outfile, mode);
-    if (out == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, outfile);
-        exit(1);
-    }
-    gz_compress(in, out);
-
-    unlink(file);
-}
-
-
-/* ===========================================================================
- * Uncompress the given file and remove the original.
- */
-void file_uncompress(file)
-    char  *file;
-{
-    local char buf[MAX_NAME_LEN];
-    char *infile, *outfile;
-    FILE  *out;
-    gzFile in;
-    int len = strlen(file);
-
-    strcpy(buf, file);
-
-    if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) {
-        infile = file;
-        outfile = buf;
-        outfile[len-3] = '\0';
-    } else {
-        outfile = file;
-        infile = buf;
-        strcat(infile, GZ_SUFFIX);
-    }
-    in = gzopen(infile, "rb");
-    if (in == NULL) {
-        fprintf(stderr, "%s: can't gzopen %s\n", prog, infile);
-        exit(1);
-    }
-    out = fopen(outfile, "wb");
-    if (out == NULL) {
-        perror(file);
-        exit(1);
-    }
-
-    gz_uncompress(in, out);
-
-    unlink(infile);
-}
-
-
-/* ===========================================================================
- * Usage:  minigzip [-d] [-f] [-h] [-1 to -9] [files...]
- *   -d : decompress
- *   -f : compress with Z_FILTERED
- *   -h : compress with Z_HUFFMAN_ONLY
- *   -1 to -9 : compression level
- */
-
-int main(argc, argv)
-    int argc;
-    char *argv[];
-{
-    int uncompr = 0;
-    gzFile file;
-    char outmode[20];
-
-    strcpy(outmode, "wb6 ");
-
-    prog = argv[0];
-    argc--, argv++;
-
-    while (argc > 0) {
-      if (strcmp(*argv, "-d") == 0)
-	uncompr = 1;
-      else if (strcmp(*argv, "-f") == 0)
-	outmode[3] = 'f';
-      else if (strcmp(*argv, "-h") == 0)
-	outmode[3] = 'h';
-      else if ((*argv)[0] == '-' && (*argv)[1] >= '1' && (*argv)[1] <= '9' &&
-	       (*argv)[2] == 0)
-	outmode[2] = (*argv)[1];
-      else
-	break;
-      argc--, argv++;
-    }
-    if (argc == 0) {
-        SET_BINARY_MODE(stdin);
-        SET_BINARY_MODE(stdout);
-        if (uncompr) {
-            file = gzdopen(fileno(stdin), "rb");
-            if (file == NULL) error("can't gzdopen stdin");
-            gz_uncompress(file, stdout);
-        } else {
-            file = gzdopen(fileno(stdout), outmode);
-            if (file == NULL) error("can't gzdopen stdout");
-            gz_compress(stdin, file);
-        }
-    } else {
-        do {
-            if (uncompr) {
-                file_uncompress(*argv);
-            } else {
-                file_compress(*argv, outmode);
-            }
-        } while (argv++, --argc);
-    }
-    exit(0);
-    return 0; /* to avoid warning */
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
deleted file mode 100644
index f01fb30..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/trees.c
+++ /dev/null
@@ -1,1214 +0,0 @@
-/* trees.c -- output deflated data using Huffman coding
- * Copyright (C) 1995-1998 Jean-loup Gailly
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/*
- *  ALGORITHM
- *
- *      The "deflation" process uses several Huffman trees. The more
- *      common source values are represented by shorter bit sequences.
- *
- *      Each code tree is stored in a compressed form which is itself
- * a Huffman encoding of the lengths of all the code strings (in
- * ascending order by source values).  The actual code strings are
- * reconstructed from the lengths in the inflate process, as described
- * in the deflate specification.
- *
- *  REFERENCES
- *
- *      Deutsch, L.P.,"'Deflate' Compressed Data Format Specification".
- *      Available in ftp.uu.net:/pub/archiving/zip/doc/deflate-1.1.doc
- *
- *      Storer, James A.
- *          Data Compression:  Methods and Theory, pp. 49-50.
- *          Computer Science Press, 1988.  ISBN 0-7167-8156-5.
- *
- *      Sedgewick, R.
- *          Algorithms, p290.
- *          Addison-Wesley, 1983. ISBN 0-201-06672-6.
- */
-
-/* @(#) $Id$ */
-
-/* #define GEN_TREES_H */
-
-#include "deflate.h"
-
-#ifdef DEBUG
-#  include <ctype.h>
-#endif
-
-/* ===========================================================================
- * Constants
- */
-
-#define MAX_BL_BITS 7
-/* Bit length codes must not exceed MAX_BL_BITS bits */
-
-#define END_BLOCK 256
-/* end of block literal code */
-
-#define REP_3_6      16
-/* repeat previous bit length 3-6 times (2 bits of repeat count) */
-
-#define REPZ_3_10    17
-/* repeat a zero length 3-10 times  (3 bits of repeat count) */
-
-#define REPZ_11_138  18
-/* repeat a zero length 11-138 times  (7 bits of repeat count) */
-
-local const int extra_lbits[LENGTH_CODES] /* extra bits for each length code */
-   = {0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0};
-
-local const int extra_dbits[D_CODES] /* extra bits for each distance code */
-   = {0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-local const int extra_blbits[BL_CODES]/* extra bits for each bit length code */
-   = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7};
-
-local const uch bl_order[BL_CODES]
-   = {16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15};
-/* The lengths of the bit length codes are sent in order of decreasing
- * probability, to avoid transmitting the lengths for unused bit length codes.
- */
-
-#define Buf_size (8 * 2*sizeof(char))
-/* Number of bits used within bi_buf. (bi_buf might be implemented on
- * more than 16 bits on some systems.)
- */
-
-/* ===========================================================================
- * Local data. These are initialized only once.
- */
-
-#define DIST_CODE_LEN  512 /* see definition of array dist_code below */
-
-#if defined(GEN_TREES_H) || !defined(STDC)
-/* non ANSI compilers may not accept trees.h */
-
-local ct_data static_ltree[L_CODES+2];
-/* The static literal tree. Since the bit lengths are imposed, there is no
- * need for the L_CODES extra codes used during heap construction. However
- * The codes 286 and 287 are needed to build a canonical tree (see _tr_init
- * below).
- */
-
-local ct_data static_dtree[D_CODES];
-/* The static distance tree. (Actually a trivial tree since all codes use
- * 5 bits.)
- */
-
-uch _dist_code[DIST_CODE_LEN];
-/* Distance codes. The first 256 values correspond to the distances
- * 3 .. 258, the last 256 values correspond to the top 8 bits of
- * the 15 bit distances.
- */
-
-uch _length_code[MAX_MATCH-MIN_MATCH+1];
-/* length code for each normalized match length (0 == MIN_MATCH) */
-
-local int base_length[LENGTH_CODES];
-/* First normalized length for each code (0 = MIN_MATCH) */
-
-local int base_dist[D_CODES];
-/* First normalized distance for each code (0 = distance of 1) */
-
-#else
-#  include "trees.h"
-#endif /* GEN_TREES_H */
-
-struct static_tree_desc_s {
-    const ct_data *static_tree;  /* static tree or NULL */
-    const intf *extra_bits;      /* extra bits for each code or NULL */
-    int     extra_base;          /* base index for extra_bits */
-    int     elems;               /* max number of elements in the tree */
-    int     max_length;          /* max bit length for the codes */
-};
-
-local static_tree_desc  static_l_desc =
-{static_ltree, extra_lbits, LITERALS+1, L_CODES, MAX_BITS};
-
-local static_tree_desc  static_d_desc =
-{static_dtree, extra_dbits, 0,          D_CODES, MAX_BITS};
-
-local static_tree_desc  static_bl_desc =
-{(const ct_data *)0, extra_blbits, 0,   BL_CODES, MAX_BL_BITS};
-
-/* ===========================================================================
- * Local (static) routines in this file.
- */
-
-local void tr_static_init OF((void));
-local void init_block     OF((deflate_state *s));
-local void pqdownheap     OF((deflate_state *s, ct_data *tree, int k));
-local void gen_bitlen     OF((deflate_state *s, tree_desc *desc));
-local void gen_codes      OF((ct_data *tree, int max_code, ushf *bl_count));
-local void build_tree     OF((deflate_state *s, tree_desc *desc));
-local void scan_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local void send_tree      OF((deflate_state *s, ct_data *tree, int max_code));
-local int  build_bl_tree  OF((deflate_state *s));
-local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes,
-                              int blcodes));
-local void compress_block OF((deflate_state *s, ct_data *ltree,
-                              ct_data *dtree));
-local void set_data_type  OF((deflate_state *s));
-local unsigned bi_reverse OF((unsigned value, int length));
-local void bi_windup      OF((deflate_state *s));
-local void bi_flush       OF((deflate_state *s));
-local void copy_block     OF((deflate_state *s, charf *buf, unsigned len,
-                              int header));
-
-#ifdef GEN_TREES_H
-local void gen_trees_header OF((void));
-#endif
-
-#ifndef DEBUG
-#  define send_code(s, c, tree) send_bits(s, tree[c].Code, tree[c].Len)
-   /* Send a code of the given tree. c and tree must not have side effects */
-
-#else /* DEBUG */
-#  define send_code(s, c, tree) \
-     { if (z_verbose>2) fprintf(stderr,"\ncd %3d ",(c)); \
-       send_bits(s, tree[c].Code, tree[c].Len); }
-#endif
-
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-#ifdef DEBUG
-local void send_bits      OF((deflate_state *s, int value, int length));
-
-local void send_bits(s, value, length)
-    deflate_state *s;
-    int value;  /* value to send */
-    int length; /* number of bits */
-{
-    Tracevv((stderr," l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (ulg)length;
-
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (value << s->bi_valid);
-        put_short(s, s->bi_buf);
-        s->bi_buf = (ush)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
-#else /* !DEBUG */
-
-#define send_bits(s, value, length) \
-{ int len = length;\
-  if (s->bi_valid > (int)Buf_size - len) {\
-    int val = value;\
-    s->bi_buf |= (val << s->bi_valid);\
-    put_short(s, s->bi_buf);\
-    s->bi_buf = (ush)val >> (Buf_size - s->bi_valid);\
-    s->bi_valid += len - Buf_size;\
-  } else {\
-    s->bi_buf |= (value) << s->bi_valid;\
-    s->bi_valid += len;\
-  }\
-}
-#endif /* DEBUG */
-
-
-#define MAX(a,b) (a >= b ? a : b)
-/* the arguments must not have side effects */
-
-/* ===========================================================================
- * Initialize the various 'constant' tables.
- */
-local void tr_static_init()
-{
-#if defined(GEN_TREES_H) || !defined(STDC)
-    static int static_init_done = 0;
-    int n;        /* iterates over tree elements */
-    int bits;     /* bit counter */
-    int length;   /* length value */
-    int code;     /* code value */
-    int dist;     /* distance index */
-    ush bl_count[MAX_BITS+1];
-    /* number of codes at each bit length for an optimal tree */
-
-    if (static_init_done) return;
-
-    /* For some embedded targets, global variables are not initialized: */
-    static_l_desc.static_tree = static_ltree;
-    static_l_desc.extra_bits = extra_lbits;
-    static_d_desc.static_tree = static_dtree;
-    static_d_desc.extra_bits = extra_dbits;
-    static_bl_desc.extra_bits = extra_blbits;
-
-    /* Initialize the mapping length (0..255) -> length code (0..28) */
-    length = 0;
-    for (code = 0; code < LENGTH_CODES-1; code++) {
-        base_length[code] = length;
-        for (n = 0; n < (1<<extra_lbits[code]); n++) {
-            _length_code[length++] = (uch)code;
-        }
-    }
-    Assert (length == 256, "tr_static_init: length != 256");
-    /* Note that the length 255 (match length 258) can be represented
-     * in two different ways: code 284 + 5 bits or code 285, so we
-     * overwrite length_code[255] to use the best encoding:
-     */
-    _length_code[length-1] = (uch)code;
-
-    /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-    dist = 0;
-    for (code = 0 ; code < 16; code++) {
-        base_dist[code] = dist;
-        for (n = 0; n < (1<<extra_dbits[code]); n++) {
-            _dist_code[dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: dist != 256");
-    dist >>= 7; /* from now on, all distances are divided by 128 */
-    for ( ; code < D_CODES; code++) {
-        base_dist[code] = dist << 7;
-        for (n = 0; n < (1<<(extra_dbits[code]-7)); n++) {
-            _dist_code[256 + dist++] = (uch)code;
-        }
-    }
-    Assert (dist == 256, "tr_static_init: 256+dist != 512");
-
-    /* Construct the codes of the static literal tree */
-    for (bits = 0; bits <= MAX_BITS; bits++) bl_count[bits] = 0;
-    n = 0;
-    while (n <= 143) static_ltree[n++].Len = 8, bl_count[8]++;
-    while (n <= 255) static_ltree[n++].Len = 9, bl_count[9]++;
-    while (n <= 279) static_ltree[n++].Len = 7, bl_count[7]++;
-    while (n <= 287) static_ltree[n++].Len = 8, bl_count[8]++;
-    /* Codes 286 and 287 do not exist, but we must include them in the
-     * tree construction to get a canonical Huffman tree (longest code
-     * all ones)
-     */
-    gen_codes((ct_data *)static_ltree, L_CODES+1, bl_count);
-
-    /* The static distance tree is trivial: */
-    for (n = 0; n < D_CODES; n++) {
-        static_dtree[n].Len = 5;
-        static_dtree[n].Code = bi_reverse((unsigned)n, 5);
-    }
-    static_init_done = 1;
-
-#  ifdef GEN_TREES_H
-    gen_trees_header();
-#  endif
-#endif /* defined(GEN_TREES_H) || !defined(STDC) */
-}
-
-/* ===========================================================================
- * Genererate the file trees.h describing the static trees.
- */
-#ifdef GEN_TREES_H
-#  ifndef DEBUG
-#    include <stdio.h>
-#  endif
-
-#  define SEPARATOR(i, last, width) \
-      ((i) == (last)? "\n};\n\n" :    \
-       ((i) % (width) == (width)-1 ? ",\n" : ", "))
-
-void gen_trees_header()
-{
-    FILE *header = fopen("trees.h", "w");
-    int i;
-
-    Assert (header != NULL, "Can't open trees.h");
-    fprintf(header,
-	    "/* header created automatically with -DGEN_TREES_H */\n\n");
-
-    fprintf(header, "local const ct_data static_ltree[L_CODES+2] = {\n");
-    for (i = 0; i < L_CODES+2; i++) {
-	fprintf(header, "{{%3u},{%3u}}%s", static_ltree[i].Code,
-		static_ltree[i].Len, SEPARATOR(i, L_CODES+1, 5));
-    }
-
-    fprintf(header, "local const ct_data static_dtree[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-	fprintf(header, "{{%2u},{%2u}}%s", static_dtree[i].Code,
-		static_dtree[i].Len, SEPARATOR(i, D_CODES-1, 5));
-    }
-
-    fprintf(header, "const uch _dist_code[DIST_CODE_LEN] = {\n");
-    for (i = 0; i < DIST_CODE_LEN; i++) {
-	fprintf(header, "%2u%s", _dist_code[i],
-		SEPARATOR(i, DIST_CODE_LEN-1, 20));
-    }
-
-    fprintf(header, "const uch _length_code[MAX_MATCH-MIN_MATCH+1]= {\n");
-    for (i = 0; i < MAX_MATCH-MIN_MATCH+1; i++) {
-	fprintf(header, "%2u%s", _length_code[i],
-		SEPARATOR(i, MAX_MATCH-MIN_MATCH, 20));
-    }
-
-    fprintf(header, "local const int base_length[LENGTH_CODES] = {\n");
-    for (i = 0; i < LENGTH_CODES; i++) {
-	fprintf(header, "%1u%s", base_length[i],
-		SEPARATOR(i, LENGTH_CODES-1, 20));
-    }
-
-    fprintf(header, "local const int base_dist[D_CODES] = {\n");
-    for (i = 0; i < D_CODES; i++) {
-	fprintf(header, "%5u%s", base_dist[i],
-		SEPARATOR(i, D_CODES-1, 10));
-    }
-
-    fclose(header);
-}
-#endif /* GEN_TREES_H */
-
-/* ===========================================================================
- * Initialize the tree data structures for a new zlib stream.
- */
-void _tr_init(s)
-    deflate_state *s;
-{
-    tr_static_init();
-
-    s->l_desc.dyn_tree = s->dyn_ltree;
-    s->l_desc.stat_desc = &static_l_desc;
-
-    s->d_desc.dyn_tree = s->dyn_dtree;
-    s->d_desc.stat_desc = &static_d_desc;
-
-    s->bl_desc.dyn_tree = s->bl_tree;
-    s->bl_desc.stat_desc = &static_bl_desc;
-
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-#ifdef DEBUG
-    s->compressed_len = 0L;
-    s->bits_sent = 0L;
-#endif
-
-    /* Initialize the first block of the first file: */
-    init_block(s);
-}
-
-/* ===========================================================================
- * Initialize a new block.
- */
-local void init_block(s)
-    deflate_state *s;
-{
-    int n; /* iterates over tree elements */
-
-    /* Initialize the trees. */
-    for (n = 0; n < L_CODES;  n++) s->dyn_ltree[n].Freq = 0;
-    for (n = 0; n < D_CODES;  n++) s->dyn_dtree[n].Freq = 0;
-    for (n = 0; n < BL_CODES; n++) s->bl_tree[n].Freq = 0;
-
-    s->dyn_ltree[END_BLOCK].Freq = 1;
-    s->opt_len = s->static_len = 0L;
-    s->last_lit = s->matches = 0;
-}
-
-#define SMALLEST 1
-/* Index within the heap array of least frequent node in the Huffman tree */
-
-
-/* ===========================================================================
- * Remove the smallest element from the heap and recreate the heap with
- * one less element. Updates heap and heap_len.
- */
-#define pqremove(s, tree, top) \
-{\
-    top = s->heap[SMALLEST]; \
-    s->heap[SMALLEST] = s->heap[s->heap_len--]; \
-    pqdownheap(s, tree, SMALLEST); \
-}
-
-/* ===========================================================================
- * Compares to subtrees, using the tree depth as tie breaker when
- * the subtrees have equal frequency. This minimizes the worst case length.
- */
-#define smaller(tree, n, m, depth) \
-   (tree[n].Freq < tree[m].Freq || \
-   (tree[n].Freq == tree[m].Freq && depth[n] <= depth[m]))
-
-/* ===========================================================================
- * Restore the heap property by moving down the tree starting at node k,
- * exchanging a node with the smallest of its two sons if necessary, stopping
- * when the heap property is re-established (each father smaller than its
- * two sons).
- */
-local void pqdownheap(s, tree, k)
-    deflate_state *s;
-    ct_data *tree;  /* the tree to restore */
-    int k;               /* node to move down */
-{
-    int v = s->heap[k];
-    int j = k << 1;  /* left son of k */
-    while (j <= s->heap_len) {
-        /* Set j to the smallest of the two sons: */
-        if (j < s->heap_len &&
-            smaller(tree, s->heap[j+1], s->heap[j], s->depth)) {
-            j++;
-        }
-        /* Exit if v is smaller than both sons */
-        if (smaller(tree, v, s->heap[j], s->depth)) break;
-
-        /* Exchange v with the smallest son */
-        s->heap[k] = s->heap[j];  k = j;
-
-        /* And continue down the tree, setting j to the left son of k */
-        j <<= 1;
-    }
-    s->heap[k] = v;
-}
-
-/* ===========================================================================
- * Compute the optimal bit lengths for a tree and update the total bit length
- * for the current block.
- * IN assertion: the fields freq and dad are set, heap[heap_max] and
- *    above are the tree nodes sorted by increasing frequency.
- * OUT assertions: the field len is set to the optimal bit length, the
- *     array bl_count contains the frequencies for each bit length.
- *     The length opt_len is updated; static_len is also updated if stree is
- *     not null.
- */
-local void gen_bitlen(s, desc)
-    deflate_state *s;
-    tree_desc *desc;    /* the tree descriptor */
-{
-    ct_data *tree        = desc->dyn_tree;
-    int max_code         = desc->max_code;
-    const ct_data *stree = desc->stat_desc->static_tree;
-    const intf *extra    = desc->stat_desc->extra_bits;
-    int base             = desc->stat_desc->extra_base;
-    int max_length       = desc->stat_desc->max_length;
-    int h;              /* heap index */
-    int n, m;           /* iterate over the tree elements */
-    int bits;           /* bit length */
-    int xbits;          /* extra bits */
-    ush f;              /* frequency */
-    int overflow = 0;   /* number of elements with bit length too large */
-
-    for (bits = 0; bits <= MAX_BITS; bits++) s->bl_count[bits] = 0;
-
-    /* In a first pass, compute the optimal bit lengths (which may
-     * overflow in the case of the bit length tree).
-     */
-    tree[s->heap[s->heap_max]].Len = 0; /* root of the heap */
-
-    for (h = s->heap_max+1; h < HEAP_SIZE; h++) {
-        n = s->heap[h];
-        bits = tree[tree[n].Dad].Len + 1;
-        if (bits > max_length) bits = max_length, overflow++;
-        tree[n].Len = (ush)bits;
-        /* We overwrite tree[n].Dad which is no longer needed */
-
-        if (n > max_code) continue; /* not a leaf node */
-
-        s->bl_count[bits]++;
-        xbits = 0;
-        if (n >= base) xbits = extra[n-base];
-        f = tree[n].Freq;
-        s->opt_len += (ulg)f * (bits + xbits);
-        if (stree) s->static_len += (ulg)f * (stree[n].Len + xbits);
-    }
-    if (overflow == 0) return;
-
-    Trace((stderr,"\nbit length overflow\n"));
-    /* This happens for example on obj2 and pic of the Calgary corpus */
-
-    /* Find the first bit length which could increase: */
-    do {
-        bits = max_length-1;
-        while (s->bl_count[bits] == 0) bits--;
-        s->bl_count[bits]--;      /* move one leaf down the tree */
-        s->bl_count[bits+1] += 2; /* move one overflow item as its brother */
-        s->bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-        overflow -= 2;
-    } while (overflow > 0);
-
-    /* Now recompute all bit lengths, scanning in increasing frequency.
-     * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-     * lengths instead of fixing only the wrong ones. This idea is taken
-     * from 'ar' written by Haruhiko Okumura.)
-     */
-    for (bits = max_length; bits != 0; bits--) {
-        n = s->bl_count[bits];
-        while (n != 0) {
-            m = s->heap[--h];
-            if (m > max_code) continue;
-            if (tree[m].Len != (unsigned) bits) {
-                Trace((stderr,"code %d bits %d->%d\n", m, tree[m].Len, bits));
-                s->opt_len += ((long)bits - (long)tree[m].Len)
-                              *(long)tree[m].Freq;
-                tree[m].Len = (ush)bits;
-            }
-            n--;
-        }
-    }
-}
-
-/* ===========================================================================
- * Generate the codes for a given tree and bit counts (which need not be
- * optimal).
- * IN assertion: the array bl_count contains the bit length statistics for
- * the given tree and the field len is set for all tree elements.
- * OUT assertion: the field code is set for all tree elements of non
- *     zero code length.
- */
-local void gen_codes (tree, max_code, bl_count)
-    ct_data *tree;             /* the tree to decorate */
-    int max_code;              /* largest code with non zero frequency */
-    ushf *bl_count;            /* number of codes at each bit length */
-{
-    ush next_code[MAX_BITS+1]; /* next code value for each bit length */
-    ush code = 0;              /* running code value */
-    int bits;                  /* bit index */
-    int n;                     /* code index */
-
-    /* The distribution counts are first used to generate the code values
-     * without bit reversal.
-     */
-    for (bits = 1; bits <= MAX_BITS; bits++) {
-        next_code[bits] = code = (code + bl_count[bits-1]) << 1;
-    }
-    /* Check that the bit counts in bl_count are consistent. The last code
-     * must be all ones.
-     */
-    Assert (code + bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-            "inconsistent bit counts");
-    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-    for (n = 0;  n <= max_code; n++) {
-        int len = tree[n].Len;
-        if (len == 0) continue;
-        /* Now reverse the bits */
-        tree[n].Code = bi_reverse(next_code[len]++, len);
-
-        Tracecv(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-             n, (isgraph(n) ? n : ' '), len, tree[n].Code, next_code[len]-1));
-    }
-}
-
-/* ===========================================================================
- * Construct one Huffman tree and assigns the code bit strings and lengths.
- * Update the total bit length for the current block.
- * IN assertion: the field freq is set for all tree elements.
- * OUT assertions: the fields len and code are set to the optimal bit length
- *     and corresponding code. The length opt_len is updated; static_len is
- *     also updated if stree is not null. The field max_code is set.
- */
-local void build_tree(s, desc)
-    deflate_state *s;
-    tree_desc *desc; /* the tree descriptor */
-{
-    ct_data *tree         = desc->dyn_tree;
-    const ct_data *stree  = desc->stat_desc->static_tree;
-    int elems             = desc->stat_desc->elems;
-    int n, m;          /* iterate over heap elements */
-    int max_code = -1; /* largest code with non zero frequency */
-    int node;          /* new node being created */
-
-    /* Construct the initial heap, with least frequent element in
-     * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-     * heap[0] is not used.
-     */
-    s->heap_len = 0, s->heap_max = HEAP_SIZE;
-
-    for (n = 0; n < elems; n++) {
-        if (tree[n].Freq != 0) {
-            s->heap[++(s->heap_len)] = max_code = n;
-            s->depth[n] = 0;
-        } else {
-            tree[n].Len = 0;
-        }
-    }
-
-    /* The pkzip format requires that at least one distance code exists,
-     * and that at least one bit should be sent even if there is only one
-     * possible code. So to avoid special checks later on we force at least
-     * two codes of non zero frequency.
-     */
-    while (s->heap_len < 2) {
-        node = s->heap[++(s->heap_len)] = (max_code < 2 ? ++max_code : 0);
-        tree[node].Freq = 1;
-        s->depth[node] = 0;
-        s->opt_len--; if (stree) s->static_len -= stree[node].Len;
-        /* node is 0 or 1 so it does not have extra bits */
-    }
-    desc->max_code = max_code;
-
-    /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-     * establish sub-heaps of increasing lengths:
-     */
-    for (n = s->heap_len/2; n >= 1; n--) pqdownheap(s, tree, n);
-
-    /* Construct the Huffman tree by repeatedly combining the least two
-     * frequent nodes.
-     */
-    node = elems;              /* next internal node of the tree */
-    do {
-        pqremove(s, tree, n);  /* n = node of least frequency */
-        m = s->heap[SMALLEST]; /* m = node of next least frequency */
-
-        s->heap[--(s->heap_max)] = n; /* keep the nodes sorted by frequency */
-        s->heap[--(s->heap_max)] = m;
-
-        /* Create a new node father of n and m */
-        tree[node].Freq = tree[n].Freq + tree[m].Freq;
-        s->depth[node] = (uch) (MAX(s->depth[n], s->depth[m]) + 1);
-        tree[n].Dad = tree[m].Dad = (ush)node;
-#ifdef DUMP_BL_TREE
-        if (tree == s->bl_tree) {
-            fprintf(stderr,"\nnode %d(%d), sons %d(%d) %d(%d)",
-                    node, tree[node].Freq, n, tree[n].Freq, m, tree[m].Freq);
-        }
-#endif
-        /* and insert the new node in the heap */
-        s->heap[SMALLEST] = node++;
-        pqdownheap(s, tree, SMALLEST);
-
-    } while (s->heap_len >= 2);
-
-    s->heap[--(s->heap_max)] = s->heap[SMALLEST];
-
-    /* At this point, the fields freq and dad are set. We can now
-     * generate the bit lengths.
-     */
-    gen_bitlen(s, (tree_desc *)desc);
-
-    /* The field len is now set, we can generate the bit codes */
-    gen_codes ((ct_data *)tree, max_code, s->bl_count);
-}
-
-/* ===========================================================================
- * Scan a literal or distance tree to determine the frequencies of the codes
- * in the bit length tree.
- */
-local void scan_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree;   /* the tree to be scanned */
-    int max_code;    /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    if (nextlen == 0) max_count = 138, min_count = 3;
-    tree[max_code+1].Len = (ush)0xffff; /* guard */
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            s->bl_tree[curlen].Freq += count;
-        } else if (curlen != 0) {
-            if (curlen != prevlen) s->bl_tree[curlen].Freq++;
-            s->bl_tree[REP_3_6].Freq++;
-        } else if (count <= 10) {
-            s->bl_tree[REPZ_3_10].Freq++;
-        } else {
-            s->bl_tree[REPZ_11_138].Freq++;
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Send a literal or distance tree in compressed form, using the codes in
- * bl_tree.
- */
-local void send_tree (s, tree, max_code)
-    deflate_state *s;
-    ct_data *tree; /* the tree to be scanned */
-    int max_code;       /* and its largest code of non zero frequency */
-{
-    int n;                     /* iterates over all tree elements */
-    int prevlen = -1;          /* last emitted length */
-    int curlen;                /* length of current code */
-    int nextlen = tree[0].Len; /* length of next code */
-    int count = 0;             /* repeat count of the current code */
-    int max_count = 7;         /* max repeat count */
-    int min_count = 4;         /* min repeat count */
-
-    /* tree[max_code+1].Len = -1; */  /* guard already set */
-    if (nextlen == 0) max_count = 138, min_count = 3;
-
-    for (n = 0; n <= max_code; n++) {
-        curlen = nextlen; nextlen = tree[n+1].Len;
-        if (++count < max_count && curlen == nextlen) {
-            continue;
-        } else if (count < min_count) {
-            do { send_code(s, curlen, s->bl_tree); } while (--count != 0);
-
-        } else if (curlen != 0) {
-            if (curlen != prevlen) {
-                send_code(s, curlen, s->bl_tree); count--;
-            }
-            Assert(count >= 3 && count <= 6, " 3_6?");
-            send_code(s, REP_3_6, s->bl_tree); send_bits(s, count-3, 2);
-
-        } else if (count <= 10) {
-            send_code(s, REPZ_3_10, s->bl_tree); send_bits(s, count-3, 3);
-
-        } else {
-            send_code(s, REPZ_11_138, s->bl_tree); send_bits(s, count-11, 7);
-        }
-        count = 0; prevlen = curlen;
-        if (nextlen == 0) {
-            max_count = 138, min_count = 3;
-        } else if (curlen == nextlen) {
-            max_count = 6, min_count = 3;
-        } else {
-            max_count = 7, min_count = 4;
-        }
-    }
-}
-
-/* ===========================================================================
- * Construct the Huffman tree for the bit lengths and return the index in
- * bl_order of the last bit length code to send.
- */
-local int build_bl_tree(s)
-    deflate_state *s;
-{
-    int max_blindex;  /* index of last bit length code of non zero freq */
-
-    /* Determine the bit length frequencies for literal and distance trees */
-    scan_tree(s, (ct_data *)s->dyn_ltree, s->l_desc.max_code);
-    scan_tree(s, (ct_data *)s->dyn_dtree, s->d_desc.max_code);
-
-    /* Build the bit length tree: */
-    build_tree(s, (tree_desc *)(&(s->bl_desc)));
-    /* opt_len now includes the length of the tree representations, except
-     * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-     */
-
-    /* Determine the number of bit length codes to send. The pkzip format
-     * requires that at least 4 bit length codes be sent. (appnote.txt says
-     * 3 but the actual value used is 4.)
-     */
-    for (max_blindex = BL_CODES-1; max_blindex >= 3; max_blindex--) {
-        if (s->bl_tree[bl_order[max_blindex]].Len != 0) break;
-    }
-    /* Update opt_len to include the bit length tree and counts */
-    s->opt_len += 3*(max_blindex+1) + 5+5+4;
-    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-            s->opt_len, s->static_len));
-
-    return max_blindex;
-}
-
-/* ===========================================================================
- * Send the header for a block using dynamic Huffman trees: the counts, the
- * lengths of the bit length codes, the literal tree and the distance tree.
- * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
- */
-local void send_all_trees(s, lcodes, dcodes, blcodes)
-    deflate_state *s;
-    int lcodes, dcodes, blcodes; /* number of codes for each tree */
-{
-    int rank;                    /* index in bl_order */
-
-    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-            "too many codes");
-    Tracev((stderr, "\nbl counts: "));
-    send_bits(s, lcodes-257, 5); /* not +255 as stated in appnote.txt */
-    send_bits(s, dcodes-1,   5);
-    send_bits(s, blcodes-4,  4); /* not -3 as stated in appnote.txt */
-    for (rank = 0; rank < blcodes; rank++) {
-        Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-        send_bits(s, s->bl_tree[bl_order[rank]].Len, 3);
-    }
-    Tracev((stderr, "\nbl tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_ltree, lcodes-1); /* literal tree */
-    Tracev((stderr, "\nlit tree: sent %ld", s->bits_sent));
-
-    send_tree(s, (ct_data *)s->dyn_dtree, dcodes-1); /* distance tree */
-    Tracev((stderr, "\ndist tree: sent %ld", s->bits_sent));
-}
-
-/* ===========================================================================
- * Send a stored block
- */
-void _tr_stored_block(s, buf, stored_len, eof)
-    deflate_state *s;
-    charf *buf;       /* input block */
-    ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
-{
-    send_bits(s, (STORED_BLOCK<<1)+eof, 3);  /* send block type */
-#ifdef DEBUG
-    s->compressed_len = (s->compressed_len + 3 + 7) & (ulg)~7L;
-    s->compressed_len += (stored_len + 4) << 3;
-#endif
-    copy_block(s, buf, (unsigned)stored_len, 1); /* with header */
-}
-
-/* ===========================================================================
- * Send one empty static block to give enough lookahead for inflate.
- * This takes 10 bits, of which 7 may remain in the bit buffer.
- * The current inflate code requires 9 bits of lookahead. If the
- * last two codes for the previous block (real code plus EOB) were coded
- * on 5 bits or less, inflate may have only 5+3 bits of lookahead to decode
- * the last real code. In this case we send two empty static blocks instead
- * of one. (There are no problems if the previous block is stored or fixed.)
- * To simplify the code, we assume the worst case of last real code encoded
- * on one bit only.
- */
-void _tr_align(s)
-    deflate_state *s;
-{
-    send_bits(s, STATIC_TREES<<1, 3);
-    send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-    s->compressed_len += 10L; /* 3 for block type, 7 for EOB */
-#endif
-    bi_flush(s);
-    /* Of the 10 bits for the empty block, we have already sent
-     * (10 - bi_valid) bits. The lookahead for the last real code (before
-     * the EOB of the previous block) was thus at least one plus the length
-     * of the EOB plus what we have just sent of the empty static block.
-     */
-    if (1 + s->last_eob_len + 10 - s->bi_valid < 9) {
-        send_bits(s, STATIC_TREES<<1, 3);
-        send_code(s, END_BLOCK, static_ltree);
-#ifdef DEBUG
-        s->compressed_len += 10L;
-#endif
-        bi_flush(s);
-    }
-    s->last_eob_len = 7;
-}
-
-/* ===========================================================================
- * Determine the best encoding for the current block: dynamic trees, static
- * trees or store, and output the encoded block to the zip file.
- */
-void _tr_flush_block(s, buf, stored_len, eof)
-    deflate_state *s;
-    charf *buf;       /* input block, or NULL if too old */
-    ulg stored_len;   /* length of input block */
-    int eof;          /* true if this is the last block for a file */
-{
-    ulg opt_lenb, static_lenb; /* opt_len and static_len in bytes */
-    int max_blindex = 0;  /* index of last bit length code of non zero freq */
-
-    /* Build the Huffman trees unless a stored block is forced */
-    if (s->level > 0) {
-
-	 /* Check if the file is ascii or binary */
-	if (s->data_type == Z_UNKNOWN) set_data_type(s);
-
-	/* Construct the literal and distance trees */
-	build_tree(s, (tree_desc *)(&(s->l_desc)));
-	Tracev((stderr, "\nlit data: dyn %ld, stat %ld", s->opt_len,
-		s->static_len));
-
-	build_tree(s, (tree_desc *)(&(s->d_desc)));
-	Tracev((stderr, "\ndist data: dyn %ld, stat %ld", s->opt_len,
-		s->static_len));
-	/* At this point, opt_len and static_len are the total bit lengths of
-	 * the compressed block data, excluding the tree representations.
-	 */
-
-	/* Build the bit length tree for the above two trees, and get the index
-	 * in bl_order of the last bit length code to send.
-	 */
-	max_blindex = build_bl_tree(s);
-
-	/* Determine the best encoding. Compute first the block length in bytes*/
-	opt_lenb = (s->opt_len+3+7)>>3;
-	static_lenb = (s->static_len+3+7)>>3;
-
-	Tracev((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u ",
-		opt_lenb, s->opt_len, static_lenb, s->static_len, stored_len,
-		s->last_lit));
-
-	if (static_lenb <= opt_lenb) opt_lenb = static_lenb;
-
-    } else {
-        Assert(buf != (char*)0, "lost buf");
-	opt_lenb = static_lenb = stored_len + 5; /* force a stored block */
-    }
-
-#ifdef FORCE_STORED
-    if (buf != (char*)0) { /* force stored block */
-#else
-    if (stored_len+4 <= opt_lenb && buf != (char*)0) {
-                       /* 4: two words for the lengths */
-#endif
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-        _tr_stored_block(s, buf, stored_len, eof);
-
-#ifdef FORCE_STATIC
-    } else if (static_lenb >= 0) { /* force static trees */
-#else
-    } else if (static_lenb == opt_lenb) {
-#endif
-        send_bits(s, (STATIC_TREES<<1)+eof, 3);
-        compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->static_len;
-#endif
-    } else {
-        send_bits(s, (DYN_TREES<<1)+eof, 3);
-        send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1,
-                       max_blindex+1);
-        compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree);
-#ifdef DEBUG
-        s->compressed_len += 3 + s->opt_len;
-#endif
-    }
-    Assert (s->compressed_len == s->bits_sent, "bad compressed size");
-    /* The above check is made mod 2^32, for files larger than 512 MB
-     * and uLong implemented on 32 bits.
-     */
-    init_block(s);
-
-    if (eof) {
-        bi_windup(s);
-#ifdef DEBUG
-        s->compressed_len += 7;  /* align on byte boundary */
-#endif
-    }
-    Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
-           s->compressed_len-7*eof));
-}
-
-/* ===========================================================================
- * Save the match info and tally the frequency counts. Return true if
- * the current block must be flushed.
- */
-int _tr_tally (s, dist, lc)
-    deflate_state *s;
-    unsigned dist;  /* distance of matched string */
-    unsigned lc;    /* match length-MIN_MATCH or unmatched char (if dist==0) */
-{
-    s->d_buf[s->last_lit] = (ush)dist;
-    s->l_buf[s->last_lit++] = (uch)lc;
-    if (dist == 0) {
-        /* lc is the unmatched char */
-        s->dyn_ltree[lc].Freq++;
-    } else {
-        s->matches++;
-        /* Here, lc is the match length - MIN_MATCH */
-        dist--;             /* dist = match distance - 1 */
-        Assert((ush)dist < (ush)MAX_DIST(s) &&
-               (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-               (ush)d_code(dist) < (ush)D_CODES,  "_tr_tally: bad match");
-
-        s->dyn_ltree[_length_code[lc]+LITERALS+1].Freq++;
-        s->dyn_dtree[d_code(dist)].Freq++;
-    }
-
-#ifdef TRUNCATE_BLOCK
-    /* Try to guess if it is profitable to stop the current block here */
-    if ((s->last_lit & 0x1fff) == 0 && s->level > 2) {
-        /* Compute an upper bound for the compressed length */
-        ulg out_length = (ulg)s->last_lit*8L;
-        ulg in_length = (ulg)((long)s->strstart - s->block_start);
-        int dcode;
-        for (dcode = 0; dcode < D_CODES; dcode++) {
-            out_length += (ulg)s->dyn_dtree[dcode].Freq *
-                (5L+extra_dbits[dcode]);
-        }
-        out_length >>= 3;
-        Tracev((stderr,"\nlast_lit %u, in %ld, out ~%ld(%ld%%) ",
-               s->last_lit, in_length, out_length,
-               100L - out_length*100L/in_length));
-        if (s->matches < s->last_lit/2 && out_length < in_length/2) return 1;
-    }
-#endif
-    return (s->last_lit == s->lit_bufsize-1);
-    /* We avoid equality with lit_bufsize because of wraparound at 64K
-     * on 16 bit machines and because stored blocks are restricted to
-     * 64K-1 bytes.
-     */
-}
-
-/* ===========================================================================
- * Send the block data compressed using the given Huffman trees
- */
-local void compress_block(s, ltree, dtree)
-    deflate_state *s;
-    ct_data *ltree; /* literal tree */
-    ct_data *dtree; /* distance tree */
-{
-    unsigned dist;      /* distance of matched string */
-    int lc;             /* match length or unmatched char (if dist == 0) */
-    unsigned lx = 0;    /* running index in l_buf */
-    unsigned code;      /* the code to send */
-    int extra;          /* number of extra bits to send */
-
-    if (s->last_lit != 0) do {
-        dist = s->d_buf[lx];
-        lc = s->l_buf[lx++];
-        if (dist == 0) {
-            send_code(s, lc, ltree); /* send a literal byte */
-            Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-        } else {
-            /* Here, lc is the match length - MIN_MATCH */
-            code = _length_code[lc];
-            send_code(s, code+LITERALS+1, ltree); /* send the length code */
-            extra = extra_lbits[code];
-            if (extra != 0) {
-                lc -= base_length[code];
-                send_bits(s, lc, extra);       /* send the extra length bits */
-            }
-            dist--; /* dist is now the match distance - 1 */
-            code = d_code(dist);
-            Assert (code < D_CODES, "bad d_code");
-
-            send_code(s, code, dtree);       /* send the distance code */
-            extra = extra_dbits[code];
-            if (extra != 0) {
-                dist -= base_dist[code];
-                send_bits(s, dist, extra);   /* send the extra distance bits */
-            }
-        } /* literal or match pair ? */
-
-        /* Check that the overlay between pending_buf and d_buf+l_buf is ok: */
-        Assert(s->pending < s->lit_bufsize + 2*lx, "pendingBuf overflow");
-
-    } while (lx < s->last_lit);
-
-    send_code(s, END_BLOCK, ltree);
-    s->last_eob_len = ltree[END_BLOCK].Len;
-}
-
-/* ===========================================================================
- * Set the data type to ASCII or BINARY, using a crude approximation:
- * binary if more than 20% of the bytes are <= 6 or >= 128, ascii otherwise.
- * IN assertion: the fields freq of dyn_ltree are set and the total of all
- * frequencies does not exceed 64K (to fit in an int on 16 bit machines).
- */
-local void set_data_type(s)
-    deflate_state *s;
-{
-    int n = 0;
-    unsigned ascii_freq = 0;
-    unsigned bin_freq = 0;
-    while (n < 7)        bin_freq += s->dyn_ltree[n++].Freq;
-    while (n < 128)    ascii_freq += s->dyn_ltree[n++].Freq;
-    while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq;
-    s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII);
-}
-
-/* ===========================================================================
- * Reverse the first len bits of a code, using straightforward code (a faster
- * method would use a table)
- * IN assertion: 1 <= len <= 15
- */
-local unsigned bi_reverse(code, len)
-    unsigned code; /* the value to invert */
-    int len;       /* its bit length */
-{
-    register unsigned res = 0;
-    do {
-        res |= code & 1;
-        code >>= 1, res <<= 1;
-    } while (--len > 0);
-    return res >> 1;
-}
-
-/* ===========================================================================
- * Flush the bit buffer, keeping at most 7 bits in it.
- */
-local void bi_flush(s)
-    deflate_state *s;
-{
-    if (s->bi_valid == 16) {
-        put_short(s, s->bi_buf);
-        s->bi_buf = 0;
-        s->bi_valid = 0;
-    } else if (s->bi_valid >= 8) {
-        put_byte(s, (Byte)s->bi_buf);
-        s->bi_buf >>= 8;
-        s->bi_valid -= 8;
-    }
-}
-
-/* ===========================================================================
- * Flush the bit buffer and align the output on a byte boundary
- */
-local void bi_windup(s)
-    deflate_state *s;
-{
-    if (s->bi_valid > 8) {
-        put_short(s, s->bi_buf);
-    } else if (s->bi_valid > 0) {
-        put_byte(s, (Byte)s->bi_buf);
-    }
-    s->bi_buf = 0;
-    s->bi_valid = 0;
-#ifdef DEBUG
-    s->bits_sent = (s->bits_sent+7) & ~7;
-#endif
-}
-
-/* ===========================================================================
- * Copy a stored block, storing first the length and its
- * one's complement if requested.
- */
-local void copy_block(s, buf, len, header)
-    deflate_state *s;
-    charf    *buf;    /* the input data */
-    unsigned len;     /* its length */
-    int      header;  /* true if block header must be written */
-{
-    bi_windup(s);        /* align on byte boundary */
-    s->last_eob_len = 8; /* enough lookahead for inflate */
-
-    if (header) {
-        put_short(s, (ush)len);   
-        put_short(s, (ush)~len);
-#ifdef DEBUG
-        s->bits_sent += 2*16;
-#endif
-    }
-#ifdef DEBUG
-    s->bits_sent += (ulg)len<<3;
-#endif
-    while (len--) {
-        put_byte(s, *buf++);
-    }
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
deleted file mode 100644
index d103321..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/uncompr.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* uncompr.c -- decompress a memory buffer
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zlib.h"
-
-/* ===========================================================================
-     Decompresses the source buffer into the destination buffer.  sourceLen is
-   the byte length of the source buffer. Upon entry, destLen is the total
-   size of the destination buffer, which must be large enough to hold the
-   entire uncompressed data. (The size of the uncompressed data must have
-   been saved previously by the compressor and transmitted to the decompressor
-   by some mechanism outside the scope of this compression library.)
-   Upon exit, destLen is the actual size of the compressed buffer.
-     This function can be used to decompress a whole file at once if the
-   input file is mmap'ed.
-
-     uncompress returns Z_OK if success, Z_MEM_ERROR if there was not
-   enough memory, Z_BUF_ERROR if there was not enough room in the output
-   buffer, or Z_DATA_ERROR if the input data was corrupted.
-*/
-int ZEXPORT uncompress (dest, destLen, source, sourceLen)
-    Bytef *dest;
-    uLongf *destLen;
-    const Bytef *source;
-    uLong sourceLen;
-{
-    z_stream stream;
-    int err;
-
-    stream.next_in = (Bytef*)source;
-    stream.avail_in = (uInt)sourceLen;
-    /* Check for source > 64K on 16-bit machine: */
-    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
-
-    stream.next_out = dest;
-    stream.avail_out = (uInt)*destLen;
-    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
-
-    stream.zalloc = (alloc_func)0;
-    stream.zfree = (free_func)0;
-
-    err = inflateInit(&stream);
-    if (err != Z_OK) return err;
-
-    err = inflate(&stream, Z_FINISH);
-    if (err != Z_STREAM_END) {
-        inflateEnd(&stream);
-        return err == Z_OK ? Z_BUF_ERROR : err;
-    }
-    *destLen = stream.total_out;
-
-    err = inflateEnd(&stream);
-    return err;
-}
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
deleted file mode 100644
index b3de4e8..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Src/zutil.c
+++ /dev/null
@@ -1,225 +0,0 @@
-/* zutil.c -- target dependent utility functions for the compression library
- * Copyright (C) 1995-1998 Jean-loup Gailly.
- * For conditions of distribution and use, see copyright notice in zlib.h 
- */
-
-/* @(#) $Id$ */
-
-#include "zutil.h"
-
-struct internal_state      {int dummy;}; /* for buggy compilers */
-
-#ifndef STDC
-extern void exit OF((int));
-#endif
-
-const char *z_errmsg[10] = {
-"need dictionary",     /* Z_NEED_DICT       2  */
-"stream end",          /* Z_STREAM_END      1  */
-"",                    /* Z_OK              0  */
-"file error",          /* Z_ERRNO         (-1) */
-"stream error",        /* Z_STREAM_ERROR  (-2) */
-"data error",          /* Z_DATA_ERROR    (-3) */
-"insufficient memory", /* Z_MEM_ERROR     (-4) */
-"buffer error",        /* Z_BUF_ERROR     (-5) */
-"incompatible version",/* Z_VERSION_ERROR (-6) */
-""};
-
-
-const char * ZEXPORT zlibVersion()
-{
-    return ZLIB_VERSION;
-}
-
-#ifdef DEBUG
-
-#  ifndef verbose
-#    define verbose 0
-#  endif
-int z_verbose = verbose;
-
-void z_error (m)
-    char *m;
-{
-    fprintf(stderr, "%s\n", m);
-    exit(1);
-}
-#endif
-
-/* exported to allow conversion of error code to string for compress() and
- * uncompress()
- */
-const char * ZEXPORT zError(err)
-    int err;
-{
-    return ERR_MSG(err);
-}
-
-
-#ifndef HAVE_MEMCPY
-
-void zmemcpy(dest, source, len)
-    Bytef* dest;
-    const Bytef* source;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = *source++; /* ??? to be unrolled */
-    } while (--len != 0);
-}
-
-int zmemcmp(s1, s2, len)
-    const Bytef* s1;
-    const Bytef* s2;
-    uInt  len;
-{
-    uInt j;
-
-    for (j = 0; j < len; j++) {
-        if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1;
-    }
-    return 0;
-}
-
-void zmemzero(dest, len)
-    Bytef* dest;
-    uInt  len;
-{
-    if (len == 0) return;
-    do {
-        *dest++ = 0;  /* ??? to be unrolled */
-    } while (--len != 0);
-}
-#endif
-
-#ifdef __TURBOC__
-#if (defined( __BORLANDC__) || !defined(SMALL_MEDIUM)) && !defined(__32BIT__)
-/* Small and medium model in Turbo C are for now limited to near allocation
- * with reduced MAX_WBITS and MAX_MEM_LEVEL
- */
-#  define MY_ZCALLOC
-
-/* Turbo C malloc() does not allow dynamic allocation of 64K bytes
- * and farmalloc(64K) returns a pointer with an offset of 8, so we
- * must fix the pointer. Warning: the pointer must be put back to its
- * original form in order to free it, use zcfree().
- */
-
-#define MAX_PTR 10
-/* 10*64K = 640K */
-
-local int next_ptr = 0;
-
-typedef struct ptr_table_s {
-    voidpf org_ptr;
-    voidpf new_ptr;
-} ptr_table;
-
-local ptr_table table[MAX_PTR];
-/* This table is used to remember the original form of pointers
- * to large buffers (64K). Such pointers are normalized with a zero offset.
- * Since MSDOS is not a preemptive multitasking OS, this table is not
- * protected from concurrent access. This hack doesn't work anyway on
- * a protected system like OS/2. Use Microsoft C instead.
- */
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    voidpf buf = opaque; /* just to make some compilers happy */
-    ulg bsize = (ulg)items*size;
-
-    /* If we allocate less than 65520 bytes, we assume that farmalloc
-     * will return a usable pointer which doesn't have to be normalized.
-     */
-    if (bsize < 65520L) {
-        buf = farmalloc(bsize);
-        if (*(ush*)&buf != 0) return buf;
-    } else {
-        buf = farmalloc(bsize + 16L);
-    }
-    if (buf == NULL || next_ptr >= MAX_PTR) return NULL;
-    table[next_ptr].org_ptr = buf;
-
-    /* Normalize the pointer to seg:0 */
-    *((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4;
-    *(ush*)&buf = 0;
-    table[next_ptr++].new_ptr = buf;
-    return buf;
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    int n;
-    if (*(ush*)&ptr != 0) { /* object < 64K */
-        farfree(ptr);
-        return;
-    }
-    /* Find the original pointer */
-    for (n = 0; n < next_ptr; n++) {
-        if (ptr != table[n].new_ptr) continue;
-
-        farfree(table[n].org_ptr);
-        while (++n < next_ptr) {
-            table[n-1] = table[n];
-        }
-        next_ptr--;
-        return;
-    }
-    ptr = opaque; /* just to make some compilers happy */
-    Assert(0, "zcfree: ptr not found");
-}
-#endif
-#endif /* __TURBOC__ */
-
-
-#if defined(M_I86) && !defined(__32BIT__)
-/* Microsoft C in 16-bit mode */
-
-#  define MY_ZCALLOC
-
-#if (!defined(_MSC_VER) || (_MSC_VER <= 600))
-#  define _halloc  halloc
-#  define _hfree   hfree
-#endif
-
-voidpf zcalloc (voidpf opaque, unsigned items, unsigned size)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    return _halloc((long)items, size);
-}
-
-void  zcfree (voidpf opaque, voidpf ptr)
-{
-    if (opaque) opaque = 0; /* to make compiler happy */
-    _hfree(ptr);
-}
-
-#endif /* MSC */
-
-
-#ifndef MY_ZCALLOC /* Any system without a special alloc function */
-
-#ifndef STDC
-extern voidp  calloc OF((uInt items, uInt size));
-extern void   free   OF((voidpf ptr));
-#endif
-
-voidpf zcalloc (opaque, items, size)
-    voidpf opaque;
-    unsigned items;
-    unsigned size;
-{
-    if (opaque) items += size - size; /* make compiler happy */
-    return (voidpf)calloc(items, size);
-}
-
-void  zcfree (opaque, ptr)
-    voidpf opaque;
-    voidpf ptr;
-{
-    free(ptr);
-    if (opaque) return; /* make compiler happy */
-}
-
-#endif /* MY_ZCALLOC */
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
deleted file mode 100644
index d258212..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/Zlib.mak
+++ /dev/null
@@ -1,316 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on Zlib.dsp
-!IF "$(CFG)" == ""
-CFG=Zlib - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to Zlib - Win32 Debug.
-!ENDIF 
-
-!IF "$(CFG)" != "Zlib - Win32 Release" && "$(CFG)" != "Zlib - Win32 Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "Zlib.mak" CFG="Zlib - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "Zlib - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "Zlib - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-!IF  "$(CFG)" == "Zlib - Win32 Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-# Begin Custom Macros
-OutDir=.\Release
-# End Custom Macros
-
-ALL : "$(OUTDIR)\Zlib.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\adler32.obj"
-	-@erase "$(INTDIR)\compress.obj"
-	-@erase "$(INTDIR)\crc32.obj"
-	-@erase "$(INTDIR)\deflate.obj"
-	-@erase "$(INTDIR)\gzio.obj"
-	-@erase "$(INTDIR)\infblock.obj"
-	-@erase "$(INTDIR)\infcodes.obj"
-	-@erase "$(INTDIR)\inffast.obj"
-	-@erase "$(INTDIR)\inflate.obj"
-	-@erase "$(INTDIR)\inftrees.obj"
-	-@erase "$(INTDIR)\infutil.obj"
-	-@erase "$(INTDIR)\trees.obj"
-	-@erase "$(INTDIR)\uncompr.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\zutil.obj"
-	-@erase "$(OUTDIR)\Zlib.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-F90=df.exe
-CPP=cl.exe
-CPP_PROJ=/nologo /O2 /I "./include" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\Zlib.pch"  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Zlib.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\Zlib.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\adler32.obj" \
-	"$(INTDIR)\compress.obj" \
-	"$(INTDIR)\crc32.obj" \
-	"$(INTDIR)\deflate.obj" \
-	"$(INTDIR)\gzio.obj" \
-	"$(INTDIR)\infblock.obj" \
-	"$(INTDIR)\infcodes.obj" \
-	"$(INTDIR)\inffast.obj" \
-	"$(INTDIR)\inflate.obj" \
-	"$(INTDIR)\inftrees.obj" \
-	"$(INTDIR)\infutil.obj" \
-	"$(INTDIR)\trees.obj" \
-	"$(INTDIR)\uncompr.obj" \
-	"$(INTDIR)\zutil.obj"
-
-"$(OUTDIR)\Zlib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ELSEIF  "$(CFG)" == "Zlib - Win32 Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-ALL : "$(OUTDIR)\Zlib.lib"
-
-
-CLEAN :
-	-@erase "$(INTDIR)\adler32.obj"
-	-@erase "$(INTDIR)\compress.obj"
-	-@erase "$(INTDIR)\crc32.obj"
-	-@erase "$(INTDIR)\deflate.obj"
-	-@erase "$(INTDIR)\gzio.obj"
-	-@erase "$(INTDIR)\infblock.obj"
-	-@erase "$(INTDIR)\infcodes.obj"
-	-@erase "$(INTDIR)\inffast.obj"
-	-@erase "$(INTDIR)\inflate.obj"
-	-@erase "$(INTDIR)\inftrees.obj"
-	-@erase "$(INTDIR)\infutil.obj"
-	-@erase "$(INTDIR)\trees.obj"
-	-@erase "$(INTDIR)\uncompr.obj"
-	-@erase "$(INTDIR)\vc60.idb"
-	-@erase "$(INTDIR)\vc60.pdb"
-	-@erase "$(INTDIR)\zutil.obj"
-	-@erase "$(OUTDIR)\Zlib.lib"
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-F90=df.exe
-CPP=cl.exe
-CPP_PROJ=/nologo /ZI /Od /I "Include" /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /Fp"$(INTDIR)\Zlib.pch"  /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-RSC=rc.exe
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\Zlib.bsc" 
-BSC32_SBRS= \
-	
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\Zlib.lib" 
-LIB32_OBJS= \
-	"$(INTDIR)\adler32.obj" \
-	"$(INTDIR)\compress.obj" \
-	"$(INTDIR)\crc32.obj" \
-	"$(INTDIR)\deflate.obj" \
-	"$(INTDIR)\gzio.obj" \
-	"$(INTDIR)\infblock.obj" \
-	"$(INTDIR)\infcodes.obj" \
-	"$(INTDIR)\inffast.obj" \
-	"$(INTDIR)\inflate.obj" \
-	"$(INTDIR)\inftrees.obj" \
-	"$(INTDIR)\infutil.obj" \
-	"$(INTDIR)\trees.obj" \
-	"$(INTDIR)\uncompr.obj" \
-	"$(INTDIR)\zutil.obj"
-
-"$(OUTDIR)\Zlib.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
-    $(LIB32) @<<
-  $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF 
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("Zlib.dep")
-!INCLUDE "Zlib.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "Zlib.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "Zlib - Win32 Release" || "$(CFG)" == "Zlib - Win32 Debug"
-SOURCE=.\Src\adler32.c
-
-"$(INTDIR)\adler32.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\compress.c
-
-"$(INTDIR)\compress.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\crc32.c
-
-"$(INTDIR)\crc32.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\deflate.c
-
-"$(INTDIR)\deflate.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\gzio.c
-
-"$(INTDIR)\gzio.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\infblock.c
-
-"$(INTDIR)\infblock.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\infcodes.c
-
-"$(INTDIR)\infcodes.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\inffast.c
-
-"$(INTDIR)\inffast.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\inflate.c
-
-"$(INTDIR)\inflate.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\inftrees.c
-
-"$(INTDIR)\inftrees.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\infutil.c
-
-"$(INTDIR)\infutil.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\trees.c
-
-"$(INTDIR)\trees.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\uncompr.c
-
-"$(INTDIR)\uncompr.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-SOURCE=.\Src\zutil.c
-
-"$(INTDIR)\zutil.obj" : $(SOURCE) "$(INTDIR)"
-	$(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-
-!ENDIF 
-
diff --git a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/readme b/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/readme
deleted file mode 100644
index 8ff4587..0000000
--- a/projects/dvm_svn/tools/pppa/stuff/Zlib_1.1.3/readme
+++ /dev/null
@@ -1,148 +0,0 @@
-zlib 1.1.3 is a general purpose data compression library.  All the code
-is thread safe.  The data format used by the zlib library
-is described by RFCs (Request for Comments) 1950 to 1952 in the files 
-ftp://ds.internic.net/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate
-format) and rfc1952.txt (gzip format). These documents are also available in
-other formats from ftp://ftp.uu.net/graphics/png/documents/zlib/zdoc-index.html
-
-All functions of the compression library are documented in the file zlib.h
-(volunteer to write man pages welcome, contact jloup@gzip.org). A usage
-example of the library is given in the file example.c which also tests that
-the library is working correctly. Another example is given in the file
-minigzip.c. The compression library itself is composed of all source files
-except example.c and minigzip.c.
-
-To compile all files and run the test program, follow the instructions
-given at the top of Makefile. In short "make test; make install"
-should work for most machines. For Unix: "configure; make test; make install"
-For MSDOS, use one of the special makefiles such as Makefile.msc.
-For VMS, use Make_vms.com or descrip.mms.
-
-Questions about zlib should be sent to <zlib@quest.jpl.nasa.gov>, or to
-Gilles Vollant <info@winimage.com> for the Windows DLL version.
-The zlib home page is http://www.cdrom.com/pub/infozip/zlib/
-The official zlib ftp site is ftp://ftp.cdrom.com/pub/infozip/zlib/
-Before reporting a problem, please check those sites to verify that
-you have the latest version of zlib; otherwise get the latest version and
-check whether the problem still exists or not.
-
-Mark Nelson <markn@tiny.com> wrote an article about zlib for the Jan. 1997
-issue of  Dr. Dobb's Journal; a copy of the article is available in
-http://web2.airmail.net/markn/articles/zlibtool/zlibtool.htm
-
-The changes made in version 1.1.3 are documented in the file ChangeLog.
-The main changes since 1.1.2 are:
-
-- fix "an inflate input buffer bug that shows up on rare but persistent
-  occasions" (Mark)
-- fix gzread and gztell for concatenated .gz files (Didier Le Botlan)
-- fix gzseek(..., SEEK_SET) in write mode
-- fix crc check after a gzeek (Frank Faubert)
-- fix miniunzip when the last entry in a zip file is itself a zip file
-  (J Lillge)
-- add contrib/asm586 and contrib/asm686 (Brian Raiter)
-  See http://www.muppetlabs.com/~breadbox/software/assembly.html
-- add support for Delphi 3 in contrib/delphi (Bob Dellaca)
-- add support for C++Builder 3 and Delphi 3 in contrib/delphi2 (Davide Moretti)
-- do not exit prematurely in untgz if 0 at start of block (Magnus Holmgren)
-- use macro EXTERN instead of extern to support DLL for BeOS (Sander Stoks)
-- added a FAQ file
-
-plus many changes for portability.
-
-Unsupported third party contributions are provided in directory "contrib".
-
-A Java implementation of zlib is available in the Java Development Kit 1.1
-http://www.javasoft.com/products/JDK/1.1/docs/api/Package-java.util.zip.html
-See the zlib home page http://www.cdrom.com/pub/infozip/zlib/ for details.
-
-A Perl interface to zlib written by Paul Marquess <pmarquess@bfsec.bt.co.uk>
-is in the CPAN (Comprehensive Perl Archive Network) sites, such as:
-ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/Compress-Zlib*
-
-A Python interface to zlib written by A.M. Kuchling <amk@magnet.com>
-is available in Python 1.5 and later versions, see
-http://www.python.org/doc/lib/module-zlib.html
-
-A zlib binding for TCL written by Andreas Kupries <a.kupries@westend.com>
-is availlable at http://www.westend.com/~kupries/doc/trf/man/man.html
-
-An experimental package to read and write files in .zip format,
-written on top of zlib by Gilles Vollant <info@winimage.com>, is
-available at http://www.winimage.com/zLibDll/unzip.html
-and also in the contrib/minizip directory of zlib.
-
-
-Notes for some targets:
-
-- To build a Windows DLL version, include in a DLL project zlib.def, zlib.rc
-  and all .c files except example.c and minigzip.c; compile with -DZLIB_DLL
-  The zlib DLL support was initially done by Alessandro Iacopetti and is
-  now maintained by Gilles Vollant <info@winimage.com>. Check the zlib DLL
-  home page at http://www.winimage.com/zLibDll
-
-  From Visual Basic, you can call the DLL functions which do not take
-  a structure as argument: compress, uncompress and all gz* functions.
-  See contrib/visual-basic.txt for more information, or get
-  http://www.tcfb.com/dowseware/cmp-z-it.zip
-
-- For 64-bit Irix, deflate.c must be compiled without any optimization.
-  With -O, one libpng test fails. The test works in 32 bit mode (with
-  the -n32 compiler flag). The compiler bug has been reported to SGI.
-
-- zlib doesn't work with gcc 2.6.3 on a DEC 3000/300LX under OSF/1 2.1   
-  it works when compiled with cc.
-
-- on Digital Unix 4.0D (formely OSF/1) on AlphaServer, the cc option -std1
-  is necessary to get gzprintf working correctly. This is done by configure.
-
-- zlib doesn't work on HP-UX 9.05 with some versions of /bin/cc. It works
-  with other compilers. Use "make test" to check your compiler.
-
-- gzdopen is not supported on RISCOS, BEOS and by some Mac compilers.
-
-- For Turbo C the small model is supported only with reduced performance to
-  avoid any far allocation; it was tested with -DMAX_WBITS=11 -DMAX_MEM_LEVEL=3
-
-- For PalmOs, see http://www.cs.uit.no/~perm/PASTA/pilot/software.html
-  Per Harald Myrvang <perm@stud.cs.uit.no>
-
-
-Acknowledgments:
-
-  The deflate format used by zlib was defined by Phil Katz. The deflate
-  and zlib specifications were written by L. Peter Deutsch. Thanks to all the
-  people who reported problems and suggested various improvements in zlib;
-  they are too numerous to cite here.
-
-Copyright notice:
-
- (C) 1995-1998 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
-
-If you use the zlib library in a product, we would appreciate *not*
-receiving lengthy legal documents to sign. The sources are provided
-for free but without warranty of any kind.  The library has been
-entirely written by Jean-loup Gailly and Mark Adler; it does not
-include third-party code.
-
-If you redistribute modified sources, we would appreciate that you include
-in the file ChangeLog history information documenting your changes.
diff --git a/projects/dvm_svn/tools/pppa/trunk/CMakeLists.txt b/projects/dvm_svn/tools/pppa/trunk/CMakeLists.txt
deleted file mode 100644
index 27e4941..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(src)
diff --git a/projects/dvm_svn/tools/pppa/trunk/makefile.uni b/projects/dvm_svn/tools/pppa/trunk/makefile.uni
deleted file mode 100644
index c1772c5..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/makefile.uni
+++ /dev/null
@@ -1,27 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-# dvm/tools/pppa/makefile.uni
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=src
-
-all: 
-	@echo "****** RECURSIVELY MAKING SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-	cd src; $(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-	@echo "****** DONE MAKING SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-
-clean:
-	@echo "****** RECURSIVELY CLEAN SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-	cd src; ($(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean)
-	@echo "****** DONE CLEAN SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-
-cleanall:
-	@echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-	cd src; ($(MAKE) "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall)
-	@echo "****** DONE CLEANALL SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
diff --git a/projects/dvm_svn/tools/pppa/trunk/makefile.win b/projects/dvm_svn/tools/pppa/trunk/makefile.win
deleted file mode 100644
index 9594204..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/makefile.win
+++ /dev/null
@@ -1,40 +0,0 @@
-#######################################################################
-##                             Copyright (C) 1999                    ##
-##              Keldysh Institute of Appllied Mathematics            ##
-#######################################################################
-
-
-# dvm/tools/pppa/makefile.win
-
-# Valentin Emelianov  (4/01/99)
-
-#
-# This makefile recursively calls MAKE in each subdirectory
-#
-
-# What to compile
-SUBDIR=src
-
-all: 
-	@echo "****** RECURSIVELY MAKING SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-	@cd src
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" all
-	@cd ..
-	@echo "****** DONE MAKING SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-
-clean:
-	@echo "****** RECURSIVELY CLEAN SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-	@cd src
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" clean
-	@cd ..
-	@del /q .\obj\*.*
-	@echo "****** DONE CLEAN SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-
-cleanall:
-	@echo "****** RECURSIVELY CLEANALL SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
-	@cd src
-	@$(MAKE) /nologo  -f makefile.win "MAKE=$(MAKE)" "CC=$(CC)" "CXX=$(CXX)" "LINKER=$(LINKER)" cleanall
-	@cd ..
-	@del /q .\bin\*.*
-	@del /q .\obj\*.*
-	@echo "****** DONE CLEANALL SUBDIRECTORIES dvm/tools/pppa/: $(SUBDIR) ******"
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/CMakeLists.txt b/projects/dvm_svn/tools/pppa/trunk/src/CMakeLists.txt
deleted file mode 100644
index 6c80995..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-configure_file(dvmvers.h.in dvmvers.h)
-
-set(PPPA_SOURCES inter.cpp potensyn.cpp statfile.cpp statread.cpp treeinter.cpp
-  statprintf.cpp)
-
-if(MSVC_IDE)
-  file(GLOB_RECURSE PPPA_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h)
-endif()
-
-add_executable(dvmstf ${PPPA_SOURCES} ${PPPA_HEADERS})
-
-add_dependencies(dvmstf zlib)
-target_link_libraries(dvmstf zlib)
-target_include_directories(dvmstf PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-set_target_properties(dvmstf PROPERTIES
-  FOLDER "${DVM_TOOL_FOLDER}"
-  RUNTIME_OUTPUT_DIRECTORY ${DVM_BIN_DIR}
-  COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>
-  PDB_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>
-)
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.cpp b/projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.cpp
deleted file mode 100644
index 398eb98..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Created by Пенёк on 14.09.2020.
-//
-
-#include <jni.h>
-#include <stdio.h>
-#include <iostream>
-#include <string>
-#include "LibraryImport.h"
-#include "statlist.h"
-
-void _stat_to_char(CStat &stat, char * &res){
-    json j;
-//    std::cout << std::endl << std::endl;
-//    auto cur = stat.inter_tree;
-//    while (cur != NULL){
-//        for (int i = 0; i < cur->id.nlev; ++i)
-//            std::cout << "    ";
-//        std::cout << cur->id.nlev << " " << ((cur->id.t == SEQ) ? "SEQ" : ((cur->id.t == PAR) ? "PAR" : "USER"));
-//        std::cout << " " << ((cur->id.t == USER) ? cur->id.expr : NULL) << "  " << cur->id.nline << std::endl;
-//        cur = cur->next;
-//    }
-    stat.to_json(j);
-    std::string str = j.dump();
-    res = (char*) malloc(sizeof(char) * (str.size() + 1));
-    for (int i = 0; i < str.size(); ++i){
-        res[i] = str[i];
-    }
-    res[str.size()] = '\0';
-}
-
-JNIEXPORT jstring JNICALL Java_LibraryImport_readStat(JNIEnv * env, jobject obj, jstring s)
-{
-//    printf("Hello, Java! I am C++!!! Hm\n");
-    jboolean isCopy;
-    char *path = (char *) (env)->GetStringUTFChars(s, &isCopy);
-//    std::string string = std::string(path, strlen(path));
-//    std::cout << string << "\n";
-//    char msg[60] = "Puk puk";
-//    std::string str = "Std::string";
-//    jstring result = (env)->NewStringUTF(msg);
-
-    CStat stat;
-    stat.init(path);
-    if (!stat.isinitialized)
-        return NULL;
-    char *res;
-    _stat_to_char(stat, res);
-    return (env)->NewStringUTF(res);
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.h b/projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.h
deleted file mode 100644
index 393759b..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/LibraryImport.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class LibraryImport */
-
-#ifndef _Included_LibraryImport
-#define _Included_LibraryImport
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     LibraryImport
- * Method:    readStat
- * Signature: (Ljava/lang/String;)I
- */
-JNIEXPORT jstring JNICALL Java_LibraryImport_readStat
-        (JNIEnv *, jobject, jstring);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA.sln b/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA.sln
deleted file mode 100644
index 3634cbe..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPPA", "PPPA\PPPA.vcxproj", "{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release_lib|x64 = Release_lib|x64
-		Release_lib|x86 = Release_lib|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Debug|x64.ActiveCfg = Debug|x64
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Debug|x64.Build.0 = Debug|x64
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Debug|x86.ActiveCfg = Debug|Win32
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Debug|x86.Build.0 = Debug|Win32
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Release_lib|x64.ActiveCfg = Release_lib|x64
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Release_lib|x64.Build.0 = Release_lib|x64
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Release_lib|x86.ActiveCfg = Release_lib|Win32
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Release_lib|x86.Build.0 = Release_lib|Win32
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Release|x64.ActiveCfg = Release|x64
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Release|x64.Build.0 = Release|x64
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Release|x86.ActiveCfg = Release|Win32
-		{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F2863E8C-6FDC-4067-92B3-8E638CD846FA}
-	EndGlobalSection
-EndGlobal
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj b/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
deleted file mode 100644
index 1422b3b..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj
+++ /dev/null
@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_lib|Win32">
-      <Configuration>Release_lib</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release_lib|x64">
-      <Configuration>Release_lib</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{F3A2EEA7-8650-4D07-A526-AEDB0109ECB8}</ProjectGuid>
-    <RootNamespace>PPPA</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_lib|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_lib|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v143</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_lib|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_lib|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <IncludePath>..\..\..\..\branches\dvm4.07\src;..\..\..\..\..\Zlib\Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <IncludePath>..\..\..\..\branches\dvm4.07\src;..\..\..\..\..\Zlib\Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_lib|x64'">
-    <IncludePath>C:\Program Files\Java\jdk1.8.0_231\include\win32;C:\Program Files\Java\jdk1.8.0_231\include;..\..\..\..\branches\dvm4.07\src;..\..\..\..\..\Zlib\Include\;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;</PreprocessorDefinitions>
-      <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_lib|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;</PreprocessorDefinitions>
-      <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_lib|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;</PreprocessorDefinitions>
-      <AdditionalOptions>/wd4996 %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\adler32.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\compress.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\crc32.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\deflate.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\gzio.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\infblock.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\infcodes.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\inffast.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\inflate.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\inftrees.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\infutil.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\trees.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\uncompr.c" />
-    <ClCompile Include="..\..\..\..\..\Zlib\src\zutil.c" />
-    <ClCompile Include="..\..\inter.cpp" />
-    <ClCompile Include="..\..\LibraryImport.cpp" />
-    <ClCompile Include="..\..\potensyn.cpp" />
-    <ClCompile Include="..\..\stat.cpp" />
-    <ClCompile Include="..\..\statfile.cpp" />
-    <ClCompile Include="..\..\statinter.cpp" />
-    <ClCompile Include="..\..\statlist.cpp" />
-    <ClCompile Include="..\..\statprintf.cpp" />
-    <ClCompile Include="..\..\statread.cpp" />
-    <ClCompile Include="..\..\treeinter.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\bool.h" />
-    <ClInclude Include="..\..\dvmh_stat.h" />
-    <ClInclude Include="..\..\inter.h" />
-    <ClInclude Include="..\..\LibraryImport.h" />
-    <ClInclude Include="..\..\potensyn.h" />
-    <ClInclude Include="..\..\statist.h" />
-    <ClInclude Include="..\..\statlist.h" />
-    <ClInclude Include="..\..\statprintf.h" />
-    <ClInclude Include="..\..\statread.h" />
-    <ClInclude Include="..\..\strall.h" />
-    <ClInclude Include="..\..\sysstat.h" />
-    <ClInclude Include="..\..\treeinter.h" />
-    <ClInclude Include="..\..\ver.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters b/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
deleted file mode 100644
index c002daa..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/PPPA/PPPA/PPPA.vcxproj.filters
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Исходные файлы">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Файлы заголовков">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Файлы ресурсов">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Исходные файлы\pppa">
-      <UniqueIdentifier>{53f9375c-8c47-45fe-b189-8fba76eb91b8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Файлы заголовков\pppa">
-      <UniqueIdentifier>{53f30301-90df-4d39-ad4f-c3587eb4450f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Исходные файлы\Zlib">
-      <UniqueIdentifier>{e95620dc-95c6-438c-a5f7-2322880aa280}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\inter.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\potensyn.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\statfile.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\statprintf.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\statread.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\treeinter.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\adler32.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\compress.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\crc32.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\deflate.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\gzio.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\infblock.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\infcodes.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\inffast.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\inflate.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\inftrees.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\infutil.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\trees.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\uncompr.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\..\..\..\Zlib\src\zutil.c">
-      <Filter>Исходные файлы\Zlib</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\LibraryImport.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\statlist.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\stat.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\statinter.cpp">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\bool.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\dvmh_stat.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\inter.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\potensyn.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\statist.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\statprintf.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\statread.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\strall.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\sysstat.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\treeinter.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\ver.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\LibraryImport.h">
-      <Filter>Исходные файлы\pppa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\statlist.h">
-      <Filter>Файлы заголовков\pppa</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/bool.h b/projects/dvm_svn/tools/pppa/trunk/src/bool.h
deleted file mode 100644
index fa057d2..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/bool.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef _BOOL_H
-#define _BOOL_H
-#define FALSE 0
-#define TRUE 1
-typedef int BOOL;
-#endif
-
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/dvmh_stat.h b/projects/dvm_svn/tools/pppa/trunk/src/dvmh_stat.h
deleted file mode 100644
index 60cbce4..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/dvmh_stat.h
+++ /dev/null
@@ -1,208 +0,0 @@
-/**
- * Файл содержит типы и функции для сбора статистики DVMH
- * <b> Файл не полностью совпадает с файлом из RTS! Соотвествующие места помечены как (+) </b>
- * @author Aleksei Shubert <alexei@shubert.ru>
- */
-
-#ifndef DVM_SYS_DVMH_STAT_H
-#define DVM_SYS_DVMH_STAT_H
-
-#if defined(_WIN64)
-#define __LLP64__ 1
-#endif
-
-#if defined(__LLP64__)
-typedef long long DvmType;
-typedef unsigned long long UDvmType;
-#else
-typedef long DvmType;
-typedef unsigned long UDvmType;
-#endif
-
-#define DVMH_EXTENDED_STAT 0  /**< разбор расширенной статистики */
-
-// -- Forward declarations ---------------------------------------------------------------------------------------------
-
-struct _dvmh_stat_header_st;
-struct _dvmh_stat_header_gpu_info_st;
-struct _dvmh_stat_interval_st;
-struct _dvmh_stat_interval_gpu_st;
-struct _dvmh_stat_interval_gpu_metric_st;
-struct _dvmh_stat_interval_thread_st;
-
-// -- Типы связанные с заголовком статистики
-typedef struct _dvmh_stat_header_st          dvmh_stat_header;
-typedef struct _dvmh_stat_header_gpu_info_st dvmh_stat_header_gpu_info;
-
-// -- Типы связанные с интервальной статистикой
-typedef struct _dvmh_stat_interval_st                  dvmh_stat_interval;
-typedef struct _dvmh_stat_interval_gpu_st              dvmh_stat_interval_gpu;
-typedef struct _dvmh_stat_interval_gpu_metric_st       dvmh_stat_interval_gpu_metric;
-typedef struct _dvmh_stat_interval_thread_st           dvmh_stat_interval_thread;
-
-// -- Constants --------------------------------------------------------------------------------------------------------
-
-// Названия метрик
-typedef enum {
-    DVMH_STAT_METRIC_KERNEL_EXEC,
-    /* DVMH-CUDA memcpy */
-    DVMH_STAT_METRIC_CPY_DTOH,
-    DVMH_STAT_METRIC_CPY_HTOD,
-    DVMH_STAT_METRIC_CPY_DTOD,
-    /* DVMH memcpy */
-    DVMH_STAT_METRIC_CPY_ACROSS_DTOH,
-    DVMH_STAT_METRIC_CPY_ACROSS_HTOD,
-    DVMH_STAT_METRIC_CPY_ACROSS_DTOD,
-    DVMH_STAT_METRIC_CPY_SHADOW_DTOH,
-    DVMH_STAT_METRIC_CPY_SHADOW_HTOD,
-    DVMH_STAT_METRIC_CPY_SHADOW_DTOD,
-    DVMH_STAT_METRIC_CPY_REMOTE_DTOH,
-    DVMH_STAT_METRIC_CPY_REMOTE_HTOD,
-    DVMH_STAT_METRIC_CPY_REMOTE_DTOD,
-    DVMH_STAT_METRIC_CPY_REDIST_DTOH,
-    DVMH_STAT_METRIC_CPY_REDIST_HTOD,
-    DVMH_STAT_METRIC_CPY_REDIST_DTOD,
-    DVMH_STAT_METRIC_CPY_IN_REG_DTOH,
-    DVMH_STAT_METRIC_CPY_IN_REG_HTOD,
-    DVMH_STAT_METRIC_CPY_IN_REG_DTOD,
-    DVMH_STAT_METRIC_CPY_GET_ACTUAL,
-    /* DVMH loop events */
-    DVMH_STAT_METRIC_LOOP_PORTION_TIME,
-    /* DVMH utility functions events */ 
-    DVMH_STAT_METRIC_UTIL_ARRAY_TRANSFORMATION,
-    DVMH_STAT_METRIC_UTIL_ARRAY_REDUCTION,
-    DVMH_STAT_METRIC_UTIL_RTC_COMPILATION,
-	DVMH_STAT_METRIC_UTIL_PAGE_LOCK_HOST_MEM,
-    // --
-    DVMH_STAT_METRIC_FORCE_INT
-} dvmh_stat_metric_names;
-
-#define DVMH_STAT_SIZE_STR         64
-#define DVMH_STAT_METRIC_CNT       DVMH_STAT_METRIC_FORCE_INT
-#define DVMH_STAT_MAX_GPU_CNT      8
-#define DVMH_STAT_GPU_UNKNOWN      "Unknown"
-
-// -- Global variables -------------------------------------------------------------------------------------------------
-
-static const char *dvmhStatMetricsTitles[DVMH_STAT_METRIC_FORCE_INT] = {
-        "Kernel executions",
-        "Copy GPU to CPU",
-        "Copy CPU to GPU",
-        "Copy GPU to GPU",
-        "[Across] Copy GPU to CPU",
-        "[Across] Copy CPU to GPU",
-        "[Across] Copy GPU to GPU",
-        "[Shadow] Copy GPU to CPU",
-        "[Shadow] Copy CPU to GPU",
-        "[Shadow] Copy GPU to GPU",
-        "[Remote] Copy GPU to CPU",
-        "[Remote] Copy CPU to GPU",
-        "[Remote] Copy GPU to GPU",
-        "[Redistribution] Copy GPU to CPU",
-        "[Redistribution] Copy CPU to GPU",
-        "[Redistribution] Copy GPU to GPU",
-        "[Region IN] Copy GPU to CPU",
-        "[Region IN] Copy CPU to GPU",
-        "[Region IN] Copy GPU to GPU",
-        "GET_ACTUAL",
-        "Loop execution",
-        "Data reorganization",
-        "Reduction",
-        "GPU Runtime compilation",
-        "Page lock host memory"
-};
-
-static short dvmhDebug = 0;
-
-// -- Data types -------------------------------------------------------------------------------------------------------
-
-/**
- * Описатель GPU в заголовке статистики
- */
-struct _dvmh_stat_header_gpu_info_st {
-    unsigned long id;                           /**< идентификатор GPU */
-    unsigned char name[DVMH_STAT_SIZE_STR + 1]; /**< текстовое описание GPU */
-};
-
-/**
- * Заголовок DVMH статистики
- */
-struct _dvmh_stat_header_st {
-    unsigned long sizeHeader;
-    unsigned long sizeIntervalConstPart;
-    unsigned long threadsAmount;
-    dvmh_stat_header_gpu_info gpu[DVMH_STAT_MAX_GPU_CNT]; /**< ссылка на массив описателей GPU */
-};
-
-/**
- * Характеристика/метрика DVMH
- *
- * Поле `values` не выгружется в файл. Это ведет к избыточному использованию памяти, но упрощает поддержку.
- */
-struct _dvmh_stat_interval_gpu_metric_st {
-    short hasOwnMeasures;  /**< если собственные измерения */
-    short isReduced;       /**< значения метрики редуцированы */
-
-#if DVMH_EXTENDED_STAT == 1
-    dvmh_stat_interval_gpu_metric_value *values; /**< ссылка на массив значений */
-#endif
-
-    UDvmType countMeasures;  /**< количество измерений характеристики */
-    double  timeProductive; /**< полезное время */
-    double  timeLost;       /**< потерянное время */
-
-    // -- Агрегированные значения (для box-диаграммы)
-    double min;    /**< минимальное значение */
-    double mean;   /**< среднее */
-    double max;    /**< максимальное значение */
-    double sum;    /**< сумма значений */
-
-#if DVMH_EXTENDED_STAT == 1
-    double q1;     /**< Q1 квантиль */
-    double median; /**< медиана */
-    double q3;     /**< Q3 квантиль */
-#endif
-};
-
-/**
- * Интервальное хранилище статистики для одного GPU
- *
- * Необходим, для  автоматического позиционирования в памяти, а не ручному просчету.
- * Ведет к некоторому избыточному использованию памяти, ввиду возможного выравнивания компилятором,
- * но упрощает поддерживаемость кода.
- *
- * Структура избыточна, но введена с целью упрощения понимания кода.
- */
-struct _dvmh_stat_interval_gpu_st {
-    dvmh_stat_interval_gpu_metric metrics[DVMH_STAT_METRIC_FORCE_INT]; /** статистические метрики */
-    // --
-    double timeProductive; /**< (+) полезное время */
-    double timeLost;       /**< (+) потерянное время */
-};
-
-/**
- * Структура для нитей
- */
-struct _dvmh_stat_interval_thread_st {
-    double user_time;
-    double system_time;
-};
-
-/**
- * Интервальное хранилище статистики по GPU и нитям
- */
-struct _dvmh_stat_interval_st {
-    unsigned long mask; /**< маска GPU (если GPU задействован, устанавливаем бит в 1 с соотвествующим номером **/
-    bool threadsUsed;
-
-    dvmh_stat_interval_gpu     gpu[DVMH_STAT_MAX_GPU_CNT]; /** хранилище метрик для каждого GPU */
-    dvmh_stat_interval_thread* threads;
-    // --
-    double allGPUTimeProductive; /**< (+) полезное время */
-    double allGPUTimeLost;       /**< (+) потерянное время */
-   
-    double allThreadsUserTime;   /**< (+) полезное время нитей */
-    double allThreadsSystemTime; /**< (+) потерянное время нитей */
-};
-
-#endif //DVM_SYS_DVMH_STAT_H
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/dvmvers.h.in b/projects/dvm_svn/tools/pppa/trunk/src/dvmvers.h.in
deleted file mode 100644
index e8a0da5..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/dvmvers.h.in
+++ /dev/null
@@ -1,2 +0,0 @@
-#define VERS "@DVM_VERSION@"
-#define PLATFORM "@DVM_PLATFORM_STRING@"
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/inter.cpp b/projects/dvm_svn/tools/pppa/trunk/src/inter.cpp
deleted file mode 100644
index 5cfefa2..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/inter.cpp
+++ /dev/null
@@ -1,409 +0,0 @@
-#define _STATFILE_
-#include "inter.h"
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define CLEAR(A) memset(A, 0, sizeof A);
-
-typedef s_GRPTIMES (*matrix) [StatGrpCount];
-
-CInter::CInter(
-	    matrix          	pt,
-		s_SendRecvTimes 	ps,
-		ident           	id,
-		unsigned long   	nint,
-		int             	iIM,
-		int 				jIM,
-		short 				sore,
-	    dvmh_stat_interval *dvmhStatInterval
-) { int i, j;
-
-// ----------------------------------------------------------------------------------------
-// -- Store DVMH statistics for the interval
-// ----------------------------------------------------------------------------------------
-
-	// store prepared DVMH statistics
-	this->dvmhStatInterval = dvmhStatInterval;
-
-// ----------------------------------------------------------------------------------------
-// -- Store general information about the interval
-// ----------------------------------------------------------------------------------------
-	// set interval name (name of DVM programm)
-	if (id.pname) {
-		idint.pname = new char[strlen(id.pname) + 1];
-        if (idint.pname == NULL) 
-        	throw("Internal error: out of memory at %s, line %d \n", __FILE__, __LINE__);
-        strcpy(idint.pname, id.pname);
-	}
-	else idint.pname = NULL;
-
-	idint.nline     = id.nline;     // number of DVM-programm line
-    idint.nline_end = id.nline_end; // number of end of DVM-programm line
-	idint.nenter    = id.nenter;    // number of enters into the interval
-	idint.expr      = id.expr;      // conditional expession
-	idint.nlev      = id.nlev;      // number of interval level
-	idint.t         = id.t;         // type of interval	
-	idint.proc      = id.proc;      // number of processors§	
-	ninter          = nint;			// inteval number
-
-// ----------------------------------------------------------------------------------------
-// -- Clean statistics storages
-// ----------------------------------------------------------------------------------------
-
-	CLEAR(mgen)
-	CLEAR(mcom)
-	CLEAR(mrcom)
-	CLEAR(msyn)
-	CLEAR(mvar)
-	CLEAR(mcall)
-	CLEAR(moverlap)
-	CLEAR(lost)
-	CLEAR(calls)
-	CLEAR(prod)
-
-// ----------------------------------------------------------------------------------------
-// -- Aggregate statistics information
-// ----------------------------------------------------------------------------------------
-
-	// Execution characteristics on each processor
-	for (i = 0; i < StatGrpCount; i++) {		
-		mgen[SUMCOM]   += pt[i][MsgPasGrp].LostTime;
-		mgen[SUMRCOM]  += pt[i][MsgPasGrp].ProductTime;
-	
-		// mgen[CPUUSR]   += pt[i][UserGrp].ProductTime;
-		// mgen[INSUFUSR] += pt[i][UserGrp].LostTime;		
-		// mgen[IOTIME]   += pt[i][IOGrp].ProductTime;	
-
-		for (j = 0; j < StatGrpCount; j++) {
-
-			if (i == UserGrp) mgen[CPUUSR]   += pt[UserGrp][j].ProductTime;
-			if (i == UserGrp) mgen[INSUFUSR] += pt[UserGrp][j].LostTime;
-			if (i == IOGrp)   mgen[IOTIME]   += pt[IOGrp][j].ProductTime;
-			
-			mgen[CPU]   += pt[i][j].ProductTime;	
-			mgen[EXEC]  += pt[i][j].ProductTime + pt[i][j].LostTime;
-			mgen[INSUF] += pt[i][j].LostTime;
-		}
-	}
-
-	mgen[EXEC]  = mgen[EXEC]  - mgen[SUMRCOM];
-	mgen[CPU]   = mgen[CPU]   - mgen[CPUUSR] - mgen[SUMRCOM] - mgen[IOTIME];
-	mgen[INSUF] = mgen[INSUF] - mgen[INSUFUSR] - mgen[SUMCOM];
-	
-	if (mgen[CPU] < 0) mgen[CPU] = 0.0;
-
-	//real synchronization,number of calls, communication
-	// reduction
-	mcom[RD]  = pt[WaitRedGrp][MsgPasGrp].LostTime + pt[StartRedGrp][MsgPasGrp].LostTime;
-	mrcom[RD] = pt[WaitRedGrp][MsgPasGrp].ProductTime;
-	mcall[RD] = pt[UserGrp][WaitRedGrp].CallCount;
-	
-	// shadow
-	mcom[SH]  = pt[WaitShdGrp][MsgPasGrp].LostTime + pt[DoPLGrp][MsgPasGrp].LostTime + pt[StartShdGrp][MsgPasGrp].LostTime;
-	mrcom[SH] = pt[WaitShdGrp][MsgPasGrp].ProductTime + pt[DoPLGrp][MsgPasGrp].ProductTime;
-	mcall[SH] = pt[UserGrp][WaitShdGrp].CallCount;
-	
-	// remote access
-	mcom[RA]  = pt[RemAccessGrp][MsgPasGrp].LostTime;
-	mrcom[RA] = pt[RemAccessGrp][MsgPasGrp].ProductTime;
-	mcall[RA] = pt[UserGrp][RemAccessGrp].CallCount;
-	
-	// redistribute
-	mcom[RED]  = pt[ReDistrGrp][MsgPasGrp].LostTime;
-	mrcom[RED] = pt[ReDistrGrp][MsgPasGrp].ProductTime;
-	mcall[RED] = pt[UserGrp][ReDistrGrp].CallCount;
-	
-	// input/output
-	mcom[IO]  = pt[IOGrp][MsgPasGrp].LostTime;
-	mrcom[IO] = pt[IOGrp][MsgPasGrp].ProductTime;
-	mcall[IO] = pt[UserGrp][IOGrp].CallCount;
-
-	// add information
-	SendCallTime    = ps.SendCallTime;
-	MinSendCallTime = ps.MinSendCallTime;
-	MaxSendCallTime = ps.MaxSendCallTime;
-	SendCallCount   = ps.SendCallCount;
-	RecvCallTime    = ps.RecvCallTime;
-	MinRecvCallTime = ps.MinRecvCallTime;
-	MaxRecvCallTime = ps.MaxRecvCallTime;
-	RecvCallCount   = ps.RecvCallCount;
-	mgen[START]     = SendCallTime + RecvCallTime;
-
-	// -- FOR DEBUG !!! 
-	if (iIM != 0) {
-		for (i = 0; i < StatGrpCount; i++) {
-			if (sore == 1) {//sum
-				for (j = 0; j < StatGrpCount; j++) {
-					//mgen[j] = mgen[j] + pt[i][k].ProductTime;
-					lost[i]  = lost[i]  + pt[i][j].LostTime;
-					prod[i]  = prod[i]  + pt[i][j].ProductTime;
-					calls[i] = calls[i] + pt[i][j].CallCount;
-				}
-			} else {
-				//mgen[j]=pt[iIM-1][i].ProductTime;
-				lost[i]  = pt[iIM-1][i].LostTime;
-				prod[i]  = pt[iIM-1][i].ProductTime;
-				calls[i] = pt[iIM-1][i].CallCount;
-			}
-		}
-	}
-	if (jIM != 0) {
-		for (i = 0; i < StatGrpCount; i++) {
-			if (sore == 1) {
-				for (j = 0; j < StatGrpCount; j++) {
-					//mgen[j] = mgen[j] + pt[k][i].ProductTime;
-					prod[i]  = prod[i]  + pt[j][i].ProductTime;
-					lost[i]  = lost[i]  + pt[j][i].LostTime;
-					calls[i] = calls[i] + pt[j][i].CallCount;
-				}
-			} else {
-				//mgen[j] = pt[i][jIM-1].ProductTime;
-				prod[i]  = pt[i][jIM-1].ProductTime;
-				lost[i]  = pt[i][jIM-1].LostTime;
-				calls[i] = pt[i][jIM-1].CallCount;
-			}
-		}
-	}
-}
-//-------------------------------------------------
-// deallocate memory for name of DVM-program
-CInter::~CInter()
-{
-	if (idint.pname!=NULL) delete []idint.pname;
-	delete[] this->dvmhStatInterval->threads;
-	delete this->dvmhStatInterval;
-}
-//--------------------------------------------------
-// addition execution time characteristics
-void CInter::AddTime(typetime t2,double val)
-//t2 - type of execution characteristics
-// val - additional value
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>ITER) {
-		printf("CInter AddTime incorrect typetime %d\n",t2);
-		return;
-	}
-#endif
-	if (t2 == DVMH_GPU_TIME_PRODUCTIVE)
-		this->dvmhStatInterval->allGPUTimeProductive += val;
-	else if (t2 == DVMH_GPU_TIME_LOST)
-		this->dvmhStatInterval->allGPUTimeLost += val;
-	else if (t2 == DVMH_THREADS_USER_TIME)
-		this->dvmhStatInterval->allThreadsUserTime += val;
-	else if (t2 == DVMH_THREADS_SYSTEM_TIME)
-		this->dvmhStatInterval->allThreadsSystemTime += val;
-	else
-		mgen[t2] = mgen[t2] + val;
-
-}
-//--------------------------------------------------
-//write new execution time characteristics
-void CInter::WriteTime(typetime t2,double val)
-//t2 - type of execution characteristics
-// val - new value
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>ITER) {
-		printf("CInter WriteTime incorrect typetime %d\n",t2);
-		return;
-	}
-#endif
-	if (t2 == DVMH_GPU_TIME_PRODUCTIVE)
-		this->dvmhStatInterval->allGPUTimeProductive = val;
-	else if (t2 == DVMH_GPU_TIME_LOST)
-		this->dvmhStatInterval->allGPUTimeLost = val;
-	else if (t2 == DVMH_THREADS_USER_TIME)
-		this->dvmhStatInterval->allThreadsUserTime = val;
-	else if (t2 == DVMH_THREADS_SYSTEM_TIME)
-		this->dvmhStatInterval->allThreadsSystemTime = val;
-	else
-		mgen[t2] =  val;
-}
-//-------------------------------------------------
-// read execution time characteristics
-void CInter::ReadTime(typetime t2,double &val)
-//t2 - type of execution characteristics
-// val - answer
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>ITER) {
-		printf("CInter ReadTime incorrect typetime %d\n",t2);
-		return;
-	}
-#endif
-	if (t2 == DVMH_GPU_TIME_PRODUCTIVE)
-		val = this->dvmhStatInterval->allGPUTimeProductive;
-	else if (t2 == DVMH_GPU_TIME_LOST)
-		val = this->dvmhStatInterval->allGPUTimeLost;
-	else if (t2 == DVMH_THREADS_USER_TIME)
-		val = this->dvmhStatInterval->allThreadsUserTime;
-	else if (t2 == DVMH_THREADS_SYSTEM_TIME)
-		val = this->dvmhStatInterval->allThreadsSystemTime;
-	else
-		val = mgen[t2];
-}
-//--------------------------------------------------
-// addition times of collective operations
-void CInter::AddTime(typegrp t1,typecom t2,double val)
-//t1 - type of communication operation
-//t2 - type of collective operation
-//val - additional value
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>RED) {
-			printf("CInter AddTime incorrect typecom %d\n",t2);
-		return;
-	}
-#endif
-	switch (t1) {
-		case COM:
-			mcom[t2]=mcom[t2]+val;
-			break;
-		case RCOM:
-			mrcom[t2]=mrcom[t2]+val;
-			break;
-		case SYN :
-			msyn[t2]=msyn[t2]+val;
-			break;
-		case VAR:
-			mvar[t2]=mvar[t2]+val;
-			break;
-		case CALL:
-			mcall[t2]=mcall[t2]+val;
-			break;
-		case OVERLAP:
-			moverlap[t2]=moverlap[t2]+val;
-			break;
-		default:
-			printf("CInter WriteCom incorrect typegrp\n");
-			break;
-	}
-}
-//---------------------------------------------------
-// read communication collective operations time
-void CInter::ReadTime(typegrp t1,typecom t2,double &val)
-//t1 - type of communication operation
-//t2 - type of collective operation
-//val - answer
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>RED) {
-			printf("CInter ReadTime incorrect typecom %d\n",t2);
-		return;
-	}
-#endif
-	switch (t1) {
-		case COM:
-			val=mcom[t2];
-			break;
-		case RCOM:
-			val=mrcom[t2];
-			break;
-		case SYN :
-			val=msyn[t2];
-			break;
-		case VAR:
-			val=mvar[t2];
-			break;
-		case CALL:
-			val=mcall[t2];
-			break;
-		case OVERLAP:
-			val=moverlap[t2];
-			break;
-		default:
-			printf("CInter ReadTime incorrect typegrp\n");
-			break;
-	}
-}
-//---------------------------------------------------
-// read time from interval matrix
-void CInter::ReadTime(typetimeim t1,int t2,double &val)
-//t1 - type of time (lost/number of calls)
-//t2 - index
-//val - answer
-
-{
-#ifdef _DEBUG
-	if (t2<0 || t2>=StatGrpCount) {
-		printf("CInter ReadTime incorrect 2 parameter %d\n",t2);
-		return;
-	}
-#endif
-	switch (t1) {
-		case CALLSMT:
-			val=calls[t2];
-			break;
-		case LOSTMT:
-			val=lost[t2];
-			break;
-		case PRODMT:
-			val=prod[t2];
-			break;
-		default:
-			printf("CInter ReadTime incorrect type of im time\n");
-			break;
-	}
-}
-//-----------------------------------------------------
-// compare identifier information on other processors
-int CInter::CompIdent(ident *p)
-//p - pointer identifire information
-{
-	if ((idint.pname==NULL || (strcmp(p->pname,idint.pname)==0)) && (p->nline==idint.nline) &&
-	(p->nlev==idint.nlev) &&  (p->expr==idint.expr) && 	(p->t==idint.t)) {
-		return(1);
-	}
-	return(0);
-}
-//------------------------------------------------------
-// read identifier information
-void CInter::ReadIdent(ident **p)
-{
-	*p=&idint;
-}
-//-----------------------------------------------------
-// sum times characteristics upon levels
-void CInter::SumInter(CInter *p)
-{
-	int i;
-	for (i=0;i<=RED;i++) {
-		mgen[SUMSYN]=mgen[SUMSYN]+msyn[i];
-		mgen[SUMVAR]=mgen[SUMVAR]+mvar[i];
-		mgen[SUMOVERLAP]=mgen[SUMOVERLAP]+moverlap[i];
-	}
-	mgen[PROC]=(double)idint.proc;
-	if (idint.proc!=0) {
-		mgen[LOST]=mgen[INSUF]+mgen[INSUFUSR]+mgen[IDLE]+mgen[SUMCOM];
-	}
-	if (p==NULL) return;
-	for (i=0;i<=ITER;i++) {
-		if (i<SUMSYN || i>SUMOVERLAP) p->mgen[i]=p->mgen[i]+mgen[i];
-	}
-	for (i=0;i<StatGrpCount;i++) {
-		p->lost[i]=p->lost[i]+lost[i];
-		p->prod[i]=p->prod[i]+prod[i];
-		p->calls[i]=p->calls[i]+calls[i];
-	}
-	// add information
-	p->SendCallTime=p->SendCallTime+SendCallTime;
-	p->MinSendCallTime=p->MinSendCallTime+MinSendCallTime;
-	p->MaxSendCallTime=p->MaxSendCallTime+MaxSendCallTime;
-	p->SendCallCount=p->SendCallCount+SendCallCount;
-	p->RecvCallTime=p->RecvCallTime+RecvCallTime;
-	p->MinRecvCallTime=p->MinRecvCallTime+MinRecvCallTime;
-	p->MaxRecvCallTime=p->MaxRecvCallTime+MaxRecvCallTime;
-	p->RecvCallCount=p->RecvCallCount+RecvCallCount;
-
-	// sum communication information
-	for (i=0;i<=RED;i++) {
-		p->mcom[i]=p->mcom[i]+mcom[i];
-		p->mrcom[i]=p->mrcom[i]+mrcom[i];
-		p->msyn[i]=p->msyn[i]+msyn[i];
-		p->mvar[i]=p->mvar[i]+mvar[i];
-		p->moverlap[i]=p->moverlap[i]+moverlap[i];
-		p->mcall[i]=p->mcall[i]+mcall[i];
-	}
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/inter.h b/projects/dvm_svn/tools/pppa/trunk/src/inter.h
deleted file mode 100644
index 948dd56..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/inter.h
+++ /dev/null
@@ -1,178 +0,0 @@
-#ifndef _INTER_H
-#define _INTER_H
-
-#include "sysstat.h"
-#include "strall.h"
-#include "dvmh_stat.h"
-
-enum typegrp {
-	COM,
-	RCOM,
-	SYN,
-	VAR,
-	OVERLAP,
-	CALL
-};
-
-enum typetimeim {
-	CALLSMT,
-	LOSTMT,
-	PRODMT
-};
-
-enum typetime {
-	LOST,
-	INSUFUSR,
-	INSUF,
-	IDLE,
-	SUMCOM,
-	SUMRCOM,
-	SUMSYN,
-	SUMVAR,
-	SUMOVERLAP,
-	IMB,
-	EXEC,
-	CPUUSR,
-	CPU,
-	IOTIME,
-	START,
-	DVMH_THREADS_USER_TIME,
-	DVMH_THREADS_SYSTEM_TIME,
-	DVMH_GPU_TIME_PRODUCTIVE, 
-	DVMH_GPU_TIME_LOST, 
-	PROC,
-	ITER
-};
-
-enum typecom {
-	IO,
-	RD,
-	SH,
-	RA,
-	RED
-};
-//5 collective operation. new operation insert before RED
-//if insert new time don't forget insert text in the statread.h
-//don't insert new time between SUMCOM...SUMOVERLAP
-
-
-/** Описатель интервала */
-typedef struct tident {
-        typefrag      t;          // тип интервала
-		short         nlev;       // номер уровня, вложенности
-        char         *pname;      // имя исходного файла, где задан интервал
-        long          expr;       // значение выражения.
-        unsigned long nline;      // номер строки исходного файла
-        unsigned long nline_end;  // ???
-        unsigned long proc;       // количество процессоров, на которых выполнялся интервал
-        double        nenter;     // число вхождений в интервал        
-} ident;
-
-
-typedef struct	{	
-		double	SendCallTime;
-		double	MinSendCallTime;
-		double	MaxSendCallTime;
-		long	SendCallCount;
-		double	RecvCallTime;
-		double	MinRecvCallTime;
-		double	MaxRecvCallTime;
-		long	RecvCallCount;
-} s_SendRecvTimes;
-
-
-class CInter {
-	public:
-		/**
-		 * Конструктор интервала
-		 *
-	     * @param pt   				указатель на массив времен, переписанный из файла
-	     * @param ps 				??? 
-	     * @param id   				индентификатор интервала
-	     * @param nint 				номер интервала
-	     * @param iIM 				??? (для отладки)
-	     * @param jIM 				??? (для отладки)
-	     * @param sore 				??? (для отладки)
-	     * @param dvmhStatInterval  указатель на DVMH-статистику по интервалу
-		 */
-		CInter(
-			s_GRPTIMES          (*pt)[StatGrpCount],
-			s_SendRecvTimes     ps,
-			ident               id,
-			unsigned long       nint,
-			int 				iIM,
-			int 				jIM,
-			short               sore, 
-			dvmh_stat_interval *dvmhStatInterval
-		);
-
-		~CInter(void);
-
-		/**  
-		 * Эти функции-члены добавляют к ранее посчитанным или записывают новые значения временных 
-		 * характеристик. Первая функция AddTime и WriteTime предназначены для работы с массивом mgen, 
-		 * первый параметр - это номер индекса, а второй само значение. Вторая функция AddTime 
-		 * предназначена для работы с остальными массивами, параметр t1 служит для выбора массива, 
-		 * параметр t2 – значение индекса массива, а val - значение. 
-		 */
-		void AddTime(typetime t2, double val);
-		void WriteTime(typetime t2, double val);
-		void AddTime(typegrp t1, typecom t2, double val);
-
-        /** 
-         * Эти функции-члены читают значения временных характеристик, значения их параметров такие же, 
-         * как и для записи, только последний параметр передается ссылкой.
-         */
-		void ReadTime(typetime t2,double &val);				
-		void ReadTime(typegrp t1,typecom t2,double &val);
-		void ReadTime(typetimeim t1,int t2,double &val);
-		
-		/**
-		 * Сравнивает идентификатор интервала с другого процессора с идентификатором текущего интервала, 
-		 * параметр р - указатель на идентификатор интервала. В случае совпадения идентификаторов по всем 
-		 * элементам структуры возвращает 1, в противном случае – 0.
-		 */
-		int CompIdent(ident *p);
-		
-		/**
-		 * Устанавливает указатель равным адресу идентификатора интервала.
-		 */
-		void ReadIdent(ident **p);
-		
-		/** 
-		 * Эта функция-член суммирует значения временных характеристик интервала со значениями интервала 
-		 * более высокого уровня. Параметр р – указатель на интервал более высокого уровня.
-		 */
-		void SumInter(CInter *p);
-
-		// -- Открытые параметры 
-		unsigned long ninter;                 // номер интервала	
-		dvmh_stat_interval *dvmhStatInterval; // DVMH статитстика
-
-	private:
-		ident  idint;  // описатель интервала
-
-		double mgen    [ITER + 1]; // массив времен, для выдачи характеристик по процессорам
-
-		double mcom    [RED + 1];  // массив времен передачи сообщений в коллективных операциях
-		double mrcom   [RED + 1];  // массив времен реальной рассинхронизации
-		double msyn    [RED + 1];  // массив времен рассинхронизации
-		double mvar    [RED + 1];  // массив разброса времен
-		double moverlap[RED + 1];  // массив времен перекрытия операций
-		double mcall   [RED + 1];  // количество вызовов коллективных операций
-		
-		double lost[StatGrpCount];
-		double prod[StatGrpCount];
-		double calls[StatGrpCount];
-
-		double	SendCallTime;
-		double	MinSendCallTime;
-		double	MaxSendCallTime;
-		long	SendCallCount;
-		double	RecvCallTime;
-		double	MinRecvCallTime;
-		double	MaxRecvCallTime;
-		long	RecvCallCount;		
-};
-
-#endif
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/json.hpp b/projects/dvm_svn/tools/pppa/trunk/src/json.hpp
deleted file mode 100644
index f8ef95f..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/json.hpp
+++ /dev/null
@@ -1,22828 +0,0 @@
-/*
-    __ _____ _____ _____
- __|  |   __|     |   | |  JSON for Modern C++
-|  |  |__   |  |  | | | |  version 3.7.1
-|_____|_____|_____|_|___|  https://github.com/nlohmann/json
-
-Licensed under the MIT License <http://opensource.org/licenses/MIT>.
-SPDX-License-Identifier: MIT
-Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
-
-Permission is hereby  granted, free of charge, to any  person obtaining a copy
-of this software and associated  documentation files (the "Software"), to deal
-in the Software  without restriction, including without  limitation the rights
-to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
-copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
-IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
-FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
-AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
-LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-
-#ifndef INCLUDE_NLOHMANN_JSON_HPP_
-#define INCLUDE_NLOHMANN_JSON_HPP_
-
-#define NLOHMANN_JSON_VERSION_MAJOR 3
-#define NLOHMANN_JSON_VERSION_MINOR 7
-#define NLOHMANN_JSON_VERSION_PATCH 1
-
-#include <algorithm> // all_of, find, for_each
-#include <cassert> // assert
-#include <ciso646> // and, not, or
-#include <cstddef> // nullptr_t, ptrdiff_t, size_t
-#include <functional> // hash, less
-#include <initializer_list> // initializer_list
-#include <iosfwd> // istream, ostream
-#include <iterator> // random_access_iterator_tag
-#include <memory> // unique_ptr
-#include <numeric> // accumulate
-#include <string> // string, stoi, to_string
-#include <utility> // declval, forward, move, pair, swap
-#include <vector> // vector
-
-// #include <nlohmann/adl_serializer.hpp>
-
-
-#include <utility>
-
-// #include <nlohmann/detail/conversions/from_json.hpp>
-
-
-#include <algorithm> // transform
-#include <array> // array
-#include <ciso646> // and, not
-#include <forward_list> // forward_list
-#include <iterator> // inserter, front_inserter, end
-#include <map> // map
-#include <string> // string
-#include <tuple> // tuple, make_tuple
-#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
-#include <unordered_map> // unordered_map
-#include <utility> // pair, declval
-#include <valarray> // valarray
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-
-#include <exception> // exception
-#include <stdexcept> // runtime_error
-#include <string> // to_string
-
-// #include <nlohmann/detail/input/position_t.hpp>
-
-
-#include <cstddef> // size_t
-
-namespace nlohmann
-{
-namespace detail
-{
-/// struct to capture the start position of the current token
-struct position_t
-{
-    /// the total number of characters read
-    std::size_t chars_read_total = 0;
-    /// the number of characters read in the current line
-    std::size_t chars_read_current_line = 0;
-    /// the number of lines read
-    std::size_t lines_read = 0;
-
-    /// conversion to size_t to preserve SAX interface
-    constexpr operator size_t() const
-    {
-        return chars_read_total;
-    }
-};
-
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-#include <utility> // pair
-// #include <nlohmann/thirdparty/hedley/hedley.hpp>
-/* Hedley - https://nemequ.github.io/hedley
- * Created by Evan Nemerson <evan@nemerson.com>
- *
- * To the extent possible under law, the author(s) have dedicated all
- * copyright and related and neighboring rights to this software to
- * the public domain worldwide. This software is distributed without
- * any warranty.
- *
- * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
- * SPDX-License-Identifier: CC0-1.0
- */
-
-#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 11)
-#if defined(JSON_HEDLEY_VERSION)
-    #undef JSON_HEDLEY_VERSION
-#endif
-#define JSON_HEDLEY_VERSION 11
-
-#if defined(JSON_HEDLEY_STRINGIFY_EX)
-    #undef JSON_HEDLEY_STRINGIFY_EX
-#endif
-#define JSON_HEDLEY_STRINGIFY_EX(x) #x
-
-#if defined(JSON_HEDLEY_STRINGIFY)
-    #undef JSON_HEDLEY_STRINGIFY
-#endif
-#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
-
-#if defined(JSON_HEDLEY_CONCAT_EX)
-    #undef JSON_HEDLEY_CONCAT_EX
-#endif
-#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
-
-#if defined(JSON_HEDLEY_CONCAT)
-    #undef JSON_HEDLEY_CONCAT
-#endif
-#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
-
-#if defined(JSON_HEDLEY_VERSION_ENCODE)
-    #undef JSON_HEDLEY_VERSION_ENCODE
-#endif
-#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
-    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
-    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
-
-#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
-    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
-#endif
-#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
-
-#if defined(JSON_HEDLEY_GNUC_VERSION)
-    #undef JSON_HEDLEY_GNUC_VERSION
-#endif
-#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
-    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
-#elif defined(__GNUC__)
-    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
-    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_GNUC_VERSION)
-    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_MSVC_VERSION)
-    #undef JSON_HEDLEY_MSVC_VERSION
-#endif
-#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
-#elif defined(_MSC_FULL_VER)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
-#elif defined(_MSC_VER)
-    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
-    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
-#endif
-#if !defined(_MSC_VER)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
-#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
-#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
-#else
-    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_VERSION)
-    #undef JSON_HEDLEY_INTEL_VERSION
-#endif
-#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE)
-    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
-#elif defined(__INTEL_COMPILER)
-    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
-    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_INTEL_VERSION)
-    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_PGI_VERSION)
-    #undef JSON_HEDLEY_PGI_VERSION
-#endif
-#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
-    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
-#endif
-
-#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
-    #undef JSON_HEDLEY_PGI_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_PGI_VERSION)
-    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_SUNPRO_VERSION)
-    #undef JSON_HEDLEY_SUNPRO_VERSION
-#endif
-#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
-#elif defined(__SUNPRO_C)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
-#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
-#elif defined(__SUNPRO_CC)
-    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
-#endif
-
-#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
-    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_SUNPRO_VERSION)
-    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
-    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
-#endif
-#if defined(__EMSCRIPTEN__)
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
-#endif
-
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
-    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_ARM_VERSION)
-    #undef JSON_HEDLEY_ARM_VERSION
-#endif
-#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
-#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
-#endif
-
-#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
-    #undef JSON_HEDLEY_ARM_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_ARM_VERSION)
-    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_IBM_VERSION)
-    #undef JSON_HEDLEY_IBM_VERSION
-#endif
-#if defined(__ibmxl__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
-#elif defined(__xlC__) && defined(__xlC_ver__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
-#elif defined(__xlC__)
-    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
-#endif
-
-#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
-    #undef JSON_HEDLEY_IBM_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_IBM_VERSION)
-    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TI_VERSION)
-    #undef JSON_HEDLEY_TI_VERSION
-#endif
-#if defined(__TI_COMPILER_VERSION__)
-    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
-#endif
-
-#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
-    #undef JSON_HEDLEY_TI_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TI_VERSION)
-    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_CRAY_VERSION)
-    #undef JSON_HEDLEY_CRAY_VERSION
-#endif
-#if defined(_CRAYC)
-    #if defined(_RELEASE_PATCHLEVEL)
-        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
-    #else
-        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
-    #endif
-#endif
-
-#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
-    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_CRAY_VERSION)
-    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_IAR_VERSION)
-    #undef JSON_HEDLEY_IAR_VERSION
-#endif
-#if defined(__IAR_SYSTEMS_ICC__)
-    #if __VER__ > 1000
-        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
-    #else
-        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(VER / 100, __VER__ % 100, 0)
-    #endif
-#endif
-
-#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
-    #undef JSON_HEDLEY_IAR_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_IAR_VERSION)
-    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_TINYC_VERSION)
-    #undef JSON_HEDLEY_TINYC_VERSION
-#endif
-#if defined(__TINYC__)
-    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
-#endif
-
-#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
-    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_TINYC_VERSION)
-    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_DMC_VERSION)
-    #undef JSON_HEDLEY_DMC_VERSION
-#endif
-#if defined(__DMC__)
-    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
-#endif
-
-#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
-    #undef JSON_HEDLEY_DMC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_DMC_VERSION)
-    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_COMPCERT_VERSION)
-    #undef JSON_HEDLEY_COMPCERT_VERSION
-#endif
-#if defined(__COMPCERT_VERSION__)
-    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
-#endif
-
-#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
-    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_COMPCERT_VERSION)
-    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_PELLES_VERSION)
-    #undef JSON_HEDLEY_PELLES_VERSION
-#endif
-#if defined(__POCC__)
-    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
-#endif
-
-#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
-    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_PELLES_VERSION)
-    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_VERSION)
-    #undef JSON_HEDLEY_GCC_VERSION
-#endif
-#if \
-    defined(JSON_HEDLEY_GNUC_VERSION) && \
-    !defined(__clang__) && \
-    !defined(JSON_HEDLEY_INTEL_VERSION) && \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_ARM_VERSION) && \
-    !defined(JSON_HEDLEY_TI_VERSION) && \
-    !defined(__COMPCERT__)
-    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
-#endif
-
-#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
-    #undef JSON_HEDLEY_GCC_VERSION_CHECK
-#endif
-#if defined(JSON_HEDLEY_GCC_VERSION)
-    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
-#else
-    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_ATTRIBUTE
-#endif
-#if defined(__has_attribute)
-    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
-#else
-    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
-#endif
-#if defined(__has_attribute)
-    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
-#endif
-#if defined(__has_attribute)
-    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
-#endif
-#if \
-    defined(__has_cpp_attribute) && \
-    defined(__cplusplus) && \
-    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
-    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
-#endif
-#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
-#elif \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
-    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
-#else
-    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
-#endif
-#if defined(__has_cpp_attribute) && defined(__cplusplus)
-    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
-#endif
-#if defined(__has_cpp_attribute) && defined(__cplusplus)
-    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_BUILTIN)
-    #undef JSON_HEDLEY_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
-    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
-    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
-#endif
-#if defined(__has_builtin)
-    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
-#else
-    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_FEATURE)
-    #undef JSON_HEDLEY_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
-    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
-    #undef JSON_HEDLEY_GCC_HAS_FEATURE
-#endif
-#if defined(__has_feature)
-    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
-#else
-    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_EXTENSION)
-    #undef JSON_HEDLEY_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
-    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
-    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
-#endif
-#if defined(__has_extension)
-    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
-#else
-    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
-#endif
-#if defined(__has_declspec_attribute)
-    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
-#else
-    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_HAS_WARNING)
-    #undef JSON_HEDLEY_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
-#endif
-
-#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
-    #undef JSON_HEDLEY_GNUC_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
-    #undef JSON_HEDLEY_GCC_HAS_WARNING
-#endif
-#if defined(__has_warning)
-    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
-#else
-    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
-   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
-#endif
-#if defined(__cplusplus) && JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
-#  define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
-    xpr \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#else
-#  define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
-#endif
-
-#if \
-    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
-    defined(__clang__) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
-    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
-    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
-#else
-    #define JSON_HEDLEY_PRAGMA(value)
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
-    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
-#endif
-#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
-    #undef JSON_HEDLEY_DIAGNOSTIC_POP
-#endif
-#if defined(__clang__)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
-    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
-#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
-#elif JSON_HEDLEY_TI_VERSION_CHECK(8,1,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
-    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
-    #define JSON_HEDLEY_DIAGNOSTIC_POP
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
-#elif JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
-#elif JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
-#elif JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#endif
-
-#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
-    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
-#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
-#else
-    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#endif
-
-#if defined(JSON_HEDLEY_DEPRECATED)
-    #undef JSON_HEDLEY_DEPRECATED
-#endif
-#if defined(JSON_HEDLEY_DEPRECATED_FOR)
-    #undef JSON_HEDLEY_DEPRECATED_FOR
-#endif
-#if defined(__cplusplus) && (__cplusplus >= 201402L)
-    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
-#elif \
-    JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,3,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
-    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0)
-    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
-#else
-    #define JSON_HEDLEY_DEPRECATED(since)
-    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
-#endif
-
-#if defined(JSON_HEDLEY_UNAVAILABLE)
-    #undef JSON_HEDLEY_UNAVAILABLE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
-#else
-    #define JSON_HEDLEY_UNAVAILABLE(available_since)
-#endif
-
-#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
-    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
-#endif
-#if defined(__cplusplus) && (__cplusplus >= 201703L)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
-#elif defined(_Check_return_) /* SAL */
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
-#else
-    #define JSON_HEDLEY_WARN_UNUSED_RESULT
-#endif
-
-#if defined(JSON_HEDLEY_SENTINEL)
-    #undef JSON_HEDLEY_SENTINEL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0)
-    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
-#else
-    #define JSON_HEDLEY_SENTINEL(position)
-#endif
-
-#if defined(JSON_HEDLEY_NO_RETURN)
-    #undef JSON_HEDLEY_NO_RETURN
-#endif
-#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_NO_RETURN __noreturn
-#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
-    #define JSON_HEDLEY_NO_RETURN _Noreturn
-#elif defined(__cplusplus) && (__cplusplus >= 201103L)
-    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(18,0,0) || \
-    (JSON_HEDLEY_TI_VERSION_CHECK(17,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
-    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
-    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
-#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
-#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
-    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
-    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
-#else
-    #define JSON_HEDLEY_NO_RETURN
-#endif
-
-#if defined(JSON_HEDLEY_NO_ESCAPE)
-    #undef JSON_HEDLEY_NO_ESCAPE
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
-    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
-#else
-    #define JSON_HEDLEY_NO_ESCAPE
-#endif
-
-#if defined(JSON_HEDLEY_UNREACHABLE)
-    #undef JSON_HEDLEY_UNREACHABLE
-#endif
-#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
-    #undef JSON_HEDLEY_UNREACHABLE_RETURN
-#endif
-#if \
-    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5)
-    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
-    #define JSON_HEDLEY_UNREACHABLE() __assume(0)
-#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0)
-    #if defined(__cplusplus)
-        #define JSON_HEDLEY_UNREACHABLE() std::_nassert(0)
-    #else
-        #define JSON_HEDLEY_UNREACHABLE() _nassert(0)
-    #endif
-    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return value
-#elif defined(EXIT_FAILURE)
-    #define JSON_HEDLEY_UNREACHABLE() abort()
-#else
-    #define JSON_HEDLEY_UNREACHABLE()
-    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return value
-#endif
-#if !defined(JSON_HEDLEY_UNREACHABLE_RETURN)
-    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
-#endif
-
-#if defined(JSON_HEDLEY_ASSUME)
-    #undef JSON_HEDLEY_ASSUME
-#endif
-#if \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
-#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
-    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
-#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0)
-    #if defined(__cplusplus)
-        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
-    #else
-        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
-    #endif
-#elif \
-    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && !defined(JSON_HEDLEY_ARM_VERSION)) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5)
-    #define JSON_HEDLEY_ASSUME(expr) ((void) ((expr) ? 1 : (__builtin_unreachable(), 1)))
-#else
-    #define JSON_HEDLEY_ASSUME(expr) ((void) (expr))
-#endif
-
-JSON_HEDLEY_DIAGNOSTIC_PUSH
-#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
-    #pragma clang diagnostic ignored "-Wpedantic"
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
-    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
-#endif
-#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
-    #if defined(__clang__)
-        #pragma clang diagnostic ignored "-Wvariadic-macros"
-    #elif defined(JSON_HEDLEY_GCC_VERSION)
-        #pragma GCC diagnostic ignored "-Wvariadic-macros"
-    #endif
-#endif
-#if defined(JSON_HEDLEY_NON_NULL)
-    #undef JSON_HEDLEY_NON_NULL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
-    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
-#else
-    #define JSON_HEDLEY_NON_NULL(...)
-#endif
-JSON_HEDLEY_DIAGNOSTIC_POP
-
-#if defined(JSON_HEDLEY_PRINTF_FORMAT)
-    #undef JSON_HEDLEY_PRINTF_FORMAT
-#endif
-#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
-#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
-#elif \
-    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
-#else
-    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
-#endif
-
-#if defined(JSON_HEDLEY_CONSTEXPR)
-    #undef JSON_HEDLEY_CONSTEXPR
-#endif
-#if defined(__cplusplus)
-    #if __cplusplus >= 201103L
-        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
-    #endif
-#endif
-#if !defined(JSON_HEDLEY_CONSTEXPR)
-    #define JSON_HEDLEY_CONSTEXPR
-#endif
-
-#if defined(JSON_HEDLEY_PREDICT)
-    #undef JSON_HEDLEY_PREDICT
-#endif
-#if defined(JSON_HEDLEY_LIKELY)
-    #undef JSON_HEDLEY_LIKELY
-#endif
-#if defined(JSON_HEDLEY_UNLIKELY)
-    #undef JSON_HEDLEY_UNLIKELY
-#endif
-#if defined(JSON_HEDLEY_UNPREDICTABLE)
-    #undef JSON_HEDLEY_UNPREDICTABLE
-#endif
-#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
-    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable(!!(expr))
-#endif
-#if \
-  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0)
-#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(expr, value, probability)
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) __builtin_expect_with_probability(!!(expr), 1, probability)
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) __builtin_expect_with_probability(!!(expr), 0, probability)
-#  define JSON_HEDLEY_LIKELY(expr) __builtin_expect(!!(expr), 1)
-#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
-#if !defined(JSON_HEDLEY_BUILTIN_UNPREDICTABLE)
-    #define JSON_HEDLEY_BUILTIN_UNPREDICTABLE(expr) __builtin_expect_with_probability(!!(expr), 1, 0.5)
-#endif
-#elif \
-  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
-  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-  JSON_HEDLEY_TI_VERSION_CHECK(6,1,0) || \
-  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27)
-#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
-    (((probability) >= 0.9) ? __builtin_expect(!!(expr), (expected)) : (((void) (expected)), !!(expr)))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
-    (__extension__ ({ \
-        JSON_HEDLEY_CONSTEXPR double hedley_probability_ = (probability); \
-        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
-    }))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
-    (__extension__ ({ \
-        JSON_HEDLEY_CONSTEXPR double hedley_probability_ = (probability); \
-        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
-    }))
-#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
-#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
-#else
-#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (((void) (expected)), !!(expr))
-#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
-#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
-#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
-#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
-#endif
-#if !defined(JSON_HEDLEY_UNPREDICTABLE)
-    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
-#endif
-
-#if defined(JSON_HEDLEY_MALLOC)
-    #undef JSON_HEDLEY_MALLOC
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
-    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14, 0, 0)
-    #define JSON_HEDLEY_MALLOC __declspec(restrict)
-#else
-    #define JSON_HEDLEY_MALLOC
-#endif
-
-#if defined(JSON_HEDLEY_PURE)
-    #undef JSON_HEDLEY_PURE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_PURE __attribute__((__pure__))
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
-#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
-#else
-    #define JSON_HEDLEY_PURE
-#endif
-
-#if defined(JSON_HEDLEY_CONST)
-    #undef JSON_HEDLEY_CONST
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
-    #define JSON_HEDLEY_CONST __attribute__((__const__))
-#elif \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
-    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
-#else
-    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
-#endif
-
-#if defined(JSON_HEDLEY_RESTRICT)
-    #undef JSON_HEDLEY_RESTRICT
-#endif
-#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
-    #define JSON_HEDLEY_RESTRICT restrict
-#elif \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
-    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
-    defined(__clang__)
-    #define JSON_HEDLEY_RESTRICT __restrict
-#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
-    #define JSON_HEDLEY_RESTRICT _Restrict
-#else
-    #define JSON_HEDLEY_RESTRICT
-#endif
-
-#if defined(JSON_HEDLEY_INLINE)
-    #undef JSON_HEDLEY_INLINE
-#endif
-#if \
-    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
-    (defined(__cplusplus) && (__cplusplus >= 199711L))
-    #define JSON_HEDLEY_INLINE inline
-#elif \
-    defined(JSON_HEDLEY_GCC_VERSION) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
-    #define JSON_HEDLEY_INLINE __inline__
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_INLINE __inline
-#else
-    #define JSON_HEDLEY_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_ALWAYS_INLINE)
-    #undef JSON_HEDLEY_ALWAYS_INLINE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
-    #define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0)
-    #define JSON_HEDLEY_ALWAYS_INLINE __forceinline
-#elif JSON_HEDLEY_TI_VERSION_CHECK(7,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
-#else
-    #define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_NEVER_INLINE)
-    #undef JSON_HEDLEY_NEVER_INLINE
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-    (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
-    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
-    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
-#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
-#elif JSON_HEDLEY_TI_VERSION_CHECK(6,0,0) && defined(__cplusplus)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
-#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
-    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
-    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
-#else
-    #define JSON_HEDLEY_NEVER_INLINE
-#endif
-
-#if defined(JSON_HEDLEY_PRIVATE)
-    #undef JSON_HEDLEY_PRIVATE
-#endif
-#if defined(JSON_HEDLEY_PUBLIC)
-    #undef JSON_HEDLEY_PUBLIC
-#endif
-#if defined(JSON_HEDLEY_IMPORT)
-    #undef JSON_HEDLEY_IMPORT
-#endif
-#if defined(_WIN32) || defined(__CYGWIN__)
-    #define JSON_HEDLEY_PRIVATE
-    #define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
-    #define JSON_HEDLEY_IMPORT   __declspec(dllimport)
-#else
-    #if \
-        JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
-        JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-        JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
-        JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-        JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-        JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-        JSON_HEDLEY_TI_VERSION_CHECK(8,0,0) || \
-        (JSON_HEDLEY_TI_VERSION_CHECK(7,3,0) && defined(__TI_EABI__) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__))
-        #define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
-        #define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
-    #else
-        #define JSON_HEDLEY_PRIVATE
-        #define JSON_HEDLEY_PUBLIC
-    #endif
-    #define JSON_HEDLEY_IMPORT    extern
-#endif
-
-#if defined(JSON_HEDLEY_NO_THROW)
-    #undef JSON_HEDLEY_NO_THROW
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
-#elif \
-    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
-    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
-#else
-    #define JSON_HEDLEY_NO_THROW
-#endif
-
-#if defined(JSON_HEDLEY_FALL_THROUGH)
-    #undef JSON_HEDLEY_FALL_THROUGH
-#endif
-#if JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(fallthrough,7,0,0) && !defined(JSON_HEDLEY_PGI_VERSION)
-    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
-    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
-#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
-    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
-#elif defined(__fallthrough) /* SAL */
-    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
-#else
-    #define JSON_HEDLEY_FALL_THROUGH
-#endif
-
-#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
-    #undef JSON_HEDLEY_RETURNS_NON_NULL
-#endif
-#if \
-    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
-    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
-#elif defined(_Ret_notnull_) /* SAL */
-    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
-#else
-    #define JSON_HEDLEY_RETURNS_NON_NULL
-#endif
-
-#if defined(JSON_HEDLEY_ARRAY_PARAM)
-    #undef JSON_HEDLEY_ARRAY_PARAM
-#endif
-#if \
-    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
-    !defined(__STDC_NO_VLA__) && \
-    !defined(__cplusplus) && \
-    !defined(JSON_HEDLEY_PGI_VERSION) && \
-    !defined(JSON_HEDLEY_TINYC_VERSION)
-    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
-#else
-    #define JSON_HEDLEY_ARRAY_PARAM(name)
-#endif
-
-#if defined(JSON_HEDLEY_IS_CONSTANT)
-    #undef JSON_HEDLEY_IS_CONSTANT
-#endif
-#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
-    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
-#endif
-/* JSON_HEDLEY_IS_CONSTEXPR_ is for
-   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
-#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
-    #undef JSON_HEDLEY_IS_CONSTEXPR_
-#endif
-#if \
-    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
-    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
-    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
-    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-    JSON_HEDLEY_TI_VERSION_CHECK(6,1,0) || \
-    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
-    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0)
-    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
-#endif
-#if !defined(__cplusplus)
-#  if \
-       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
-       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
-       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
-       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
-       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
-       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
-#if defined(__INTPTR_TYPE__)
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
-#else
-    #include <stdint.h>
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
-#endif
-#  elif \
-       (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && !defined(JSON_HEDLEY_SUNPRO_VERSION) && !defined(JSON_HEDLEY_PGI_VERSION)) || \
-       JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) || \
-       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
-       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
-       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
-       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
-#if defined(__INTPTR_TYPE__)
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
-#else
-    #include <stdint.h>
-    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
-#endif
-#  elif \
-       defined(JSON_HEDLEY_GCC_VERSION) || \
-       defined(JSON_HEDLEY_INTEL_VERSION) || \
-       defined(JSON_HEDLEY_TINYC_VERSION) || \
-       defined(JSON_HEDLEY_TI_VERSION) || \
-       defined(__clang__)
-#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
-        sizeof(void) != \
-        sizeof(*( \
-                  1 ? \
-                  ((void*) ((expr) * 0L) ) : \
-((struct { char v[sizeof(void) * 2]; } *) 1) \
-                ) \
-              ) \
-                                            )
-#  endif
-#endif
-#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
-    #if !defined(JSON_HEDLEY_IS_CONSTANT)
-        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
-    #endif
-    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
-#else
-    #if !defined(JSON_HEDLEY_IS_CONSTANT)
-        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
-    #endif
-    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
-#endif
-
-#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
-    #undef JSON_HEDLEY_BEGIN_C_DECLS
-#endif
-#if defined(JSON_HEDLEY_END_C_DECLS)
-    #undef JSON_HEDLEY_END_C_DECLS
-#endif
-#if defined(JSON_HEDLEY_C_DECL)
-    #undef JSON_HEDLEY_C_DECL
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
-    #define JSON_HEDLEY_END_C_DECLS }
-    #define JSON_HEDLEY_C_DECL extern "C"
-#else
-    #define JSON_HEDLEY_BEGIN_C_DECLS
-    #define JSON_HEDLEY_END_C_DECLS
-    #define JSON_HEDLEY_C_DECL
-#endif
-
-#if defined(JSON_HEDLEY_STATIC_ASSERT)
-    #undef JSON_HEDLEY_STATIC_ASSERT
-#endif
-#if \
-  !defined(__cplusplus) && ( \
-      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
-      JSON_HEDLEY_HAS_FEATURE(c_static_assert) || \
-      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
-      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
-      defined(_Static_assert) \
-    )
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
-#elif \
-  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
-  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0) || \
-  (defined(__cplusplus) && JSON_HEDLEY_TI_VERSION_CHECK(8,3,0))
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
-#else
-#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
-#endif
-
-#if defined(JSON_HEDLEY_CONST_CAST)
-    #undef JSON_HEDLEY_CONST_CAST
-#endif
-#if defined(__cplusplus)
-#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
-#elif \
-  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
-        JSON_HEDLEY_DIAGNOSTIC_PUSH \
-        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
-        ((T) (expr)); \
-        JSON_HEDLEY_DIAGNOSTIC_POP \
-    }))
-#else
-#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_REINTERPRET_CAST)
-    #undef JSON_HEDLEY_REINTERPRET_CAST
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
-#else
-    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (*((T*) &(expr)))
-#endif
-
-#if defined(JSON_HEDLEY_STATIC_CAST)
-    #undef JSON_HEDLEY_STATIC_CAST
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
-#else
-    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
-#endif
-
-#if defined(JSON_HEDLEY_CPP_CAST)
-    #undef JSON_HEDLEY_CPP_CAST
-#endif
-#if defined(__cplusplus)
-    #define JSON_HEDLEY_CPP_CAST(T, expr) static_cast<T>(expr)
-#else
-    #define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
-#endif
-
-#if defined(JSON_HEDLEY_NULL)
-    #undef JSON_HEDLEY_NULL
-#endif
-#if defined(__cplusplus)
-    #if __cplusplus >= 201103L
-        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
-    #elif defined(NULL)
-        #define JSON_HEDLEY_NULL NULL
-    #else
-        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
-    #endif
-#elif defined(NULL)
-    #define JSON_HEDLEY_NULL NULL
-#else
-    #define JSON_HEDLEY_NULL ((void*) 0)
-#endif
-
-#if defined(JSON_HEDLEY_MESSAGE)
-    #undef JSON_HEDLEY_MESSAGE
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-#  define JSON_HEDLEY_MESSAGE(msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
-    JSON_HEDLEY_PRAGMA(message msg) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#elif \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
-  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
-#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
-#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
-#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#else
-#  define JSON_HEDLEY_MESSAGE(msg)
-#endif
-
-#if defined(JSON_HEDLEY_WARNING)
-    #undef JSON_HEDLEY_WARNING
-#endif
-#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
-#  define JSON_HEDLEY_WARNING(msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
-    JSON_HEDLEY_PRAGMA(clang warning msg) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#elif \
-  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
-  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0)
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
-#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
-#else
-#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
-#endif
-
-#if defined(JSON_HEDLEY_REQUIRE)
-    #undef JSON_HEDLEY_REQUIRE
-#endif
-#if defined(JSON_HEDLEY_REQUIRE_MSG)
-    #undef JSON_HEDLEY_REQUIRE_MSG
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
-#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
-#    define JSON_HEDLEY_REQUIRE(expr) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
-    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
-    JSON_HEDLEY_DIAGNOSTIC_PUSH \
-    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
-    __attribute__((diagnose_if(!(expr), msg, "error"))) \
-    JSON_HEDLEY_DIAGNOSTIC_POP
-#  else
-#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
-#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
-#  endif
-#else
-#  define JSON_HEDLEY_REQUIRE(expr)
-#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
-#endif
-
-#if defined(JSON_HEDLEY_FLAGS)
-    #undef JSON_HEDLEY_FLAGS
-#endif
-#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum)
-    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
-#endif
-
-#if defined(JSON_HEDLEY_FLAGS_CAST)
-    #undef JSON_HEDLEY_FLAGS_CAST
-#endif
-#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
-#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
-        JSON_HEDLEY_DIAGNOSTIC_PUSH \
-        _Pragma("warning(disable:188)") \
-        ((T) (expr)); \
-        JSON_HEDLEY_DIAGNOSTIC_POP \
-    }))
-#else
-#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
-#endif
-
-#if defined(JSON_HEDLEY_EMPTY_BASES)
-    #undef JSON_HEDLEY_EMPTY_BASES
-#endif
-#if JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)
-    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
-#else
-    #define JSON_HEDLEY_EMPTY_BASES
-#endif
-
-/* Remaining macros are deprecated. */
-
-#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
-    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
-#endif
-#if defined(__clang__)
-    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
-#else
-    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
-#endif
-
-#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
-    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
-#endif
-#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
-    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
-    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
-#endif
-#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
-    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
-#endif
-#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
-
-#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
-    #undef JSON_HEDLEY_CLANG_HAS_WARNING
-#endif
-#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
-
-#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
-
-
-// This file contains all internal macro definitions
-// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
-
-// exclude unsupported compilers
-#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
-    #if defined(__clang__)
-        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
-            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
-        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
-            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
-        #endif
-    #endif
-#endif
-
-// C++ language standard detection
-#if (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
-    #define JSON_HAS_CPP_17
-    #define JSON_HAS_CPP_14
-#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
-    #define JSON_HAS_CPP_14
-#endif
-
-// disable float-equal warnings on GCC/clang
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wfloat-equal"
-#endif
-
-// disable documentation warnings on clang
-#if defined(__clang__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wdocumentation"
-#endif
-
-// allow to disable exceptions
-#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
-    #define JSON_THROW(exception) throw exception
-    #define JSON_TRY try
-    #define JSON_CATCH(exception) catch(exception)
-    #define JSON_INTERNAL_CATCH(exception) catch(exception)
-#else
-    #include <cstdlib>
-    #define JSON_THROW(exception) std::abort()
-    #define JSON_TRY if(true)
-    #define JSON_CATCH(exception) if(false)
-    #define JSON_INTERNAL_CATCH(exception) if(false)
-#endif
-
-// override exception macros
-#if defined(JSON_THROW_USER)
-    #undef JSON_THROW
-    #define JSON_THROW JSON_THROW_USER
-#endif
-#if defined(JSON_TRY_USER)
-    #undef JSON_TRY
-    #define JSON_TRY JSON_TRY_USER
-#endif
-#if defined(JSON_CATCH_USER)
-    #undef JSON_CATCH
-    #define JSON_CATCH JSON_CATCH_USER
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
-#endif
-#if defined(JSON_INTERNAL_CATCH_USER)
-    #undef JSON_INTERNAL_CATCH
-    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
-#endif
-
-/*!
-@brief macro to briefly define a mapping between an enum and JSON
-@def NLOHMANN_JSON_SERIALIZE_ENUM
-@since version 3.4.0
-*/
-#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
-    template<typename BasicJsonType>                                                            \
-    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
-    {                                                                                           \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
-        auto it = std::find_if(std::begin(m), std::end(m),                                      \
-                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
-        {                                                                                       \
-            return ej_pair.first == e;                                                          \
-        });                                                                                     \
-        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
-    }                                                                                           \
-    template<typename BasicJsonType>                                                            \
-    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
-    {                                                                                           \
-        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
-        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
-        auto it = std::find_if(std::begin(m), std::end(m),                                      \
-                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
-        {                                                                                       \
-            return ej_pair.second == j;                                                         \
-        });                                                                                     \
-        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
-    }
-
-// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
-// may be removed in the future once the class is split.
-
-#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
-    template<template<typename, typename, typename...> class ObjectType,   \
-             template<typename, typename...> class ArrayType,              \
-             class StringType, class BooleanType, class NumberIntegerType, \
-             class NumberUnsignedType, class NumberFloatType,              \
-             template<typename> class AllocatorType,                       \
-             template<typename, typename = void> class JSONSerializer>
-
-#define NLOHMANN_BASIC_JSON_TPL                                            \
-    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
-    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
-    AllocatorType, JSONSerializer>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-////////////////
-// exceptions //
-////////////////
-
-/*!
-@brief general exception of the @ref basic_json class
-
-This class is an extension of `std::exception` objects with a member @a id for
-exception ids. It is used as the base class for all exceptions thrown by the
-@ref basic_json class. This class can hence be used as "wildcard" to catch
-exceptions.
-
-Subclasses:
-- @ref parse_error for exceptions indicating a parse error
-- @ref invalid_iterator for exceptions indicating errors with iterators
-- @ref type_error for exceptions indicating executing a member function with
-                  a wrong type
-- @ref out_of_range for exceptions indicating access out of the defined range
-- @ref other_error for exceptions indicating other library errors
-
-@internal
-@note To have nothrow-copy-constructible exceptions, we internally use
-      `std::runtime_error` which can cope with arbitrary-length error messages.
-      Intermediate strings are built with static functions and then passed to
-      the actual constructor.
-@endinternal
-
-@liveexample{The following code shows how arbitrary library exceptions can be
-caught.,exception}
-
-@since version 3.0.0
-*/
-class exception : public std::exception
-{
-  public:
-    /// returns the explanatory string
-    JSON_HEDLEY_RETURNS_NON_NULL
-    const char* what() const noexcept override
-    {
-        return m.what();
-    }
-
-    /// the id of the exception
-    const int id;
-
-  protected:
-    JSON_HEDLEY_NON_NULL(3)
-    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
-
-    static std::string name(const std::string& ename, int id_)
-    {
-        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
-    }
-
-  private:
-    /// an exception object as storage for error messages
-    std::runtime_error m;
-};
-
-/*!
-@brief exception indicating a parse error
-
-This exception is thrown by the library when a parse error occurs. Parse errors
-can occur during the deserialization of JSON text, CBOR, MessagePack, as well
-as when using JSON Patch.
-
-Member @a byte holds the byte index of the last read character in the input
-file.
-
-Exceptions have ids 1xx.
-
-name / id                      | example message | description
------------------------------- | --------------- | -------------------------
-json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
-json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
-json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
-json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
-json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
-json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`.
-json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
-json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
-json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
-json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
-json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
-json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
-json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet).
-
-@note For an input with n bytes, 1 is the index of the first character and n+1
-      is the index of the terminating null byte or the end of file. This also
-      holds true when reading a byte vector (CBOR or MessagePack).
-
-@liveexample{The following code shows how a `parse_error` exception can be
-caught.,parse_error}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class parse_error : public exception
-{
-  public:
-    /*!
-    @brief create a parse error exception
-    @param[in] id_       the id of the exception
-    @param[in] pos       the position where the error occurred (or with
-                         chars_read_total=0 if the position cannot be
-                         determined)
-    @param[in] what_arg  the explanatory string
-    @return parse_error object
-    */
-    static parse_error create(int id_, const position_t& pos, const std::string& what_arg)
-    {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        position_string(pos) + ": " + what_arg;
-        return parse_error(id_, pos.chars_read_total, w.c_str());
-    }
-
-    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg)
-    {
-        std::string w = exception::name("parse_error", id_) + "parse error" +
-                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
-                        ": " + what_arg;
-        return parse_error(id_, byte_, w.c_str());
-    }
-
-    /*!
-    @brief byte index of the parse error
-
-    The byte index of the last read character in the input file.
-
-    @note For an input with n bytes, 1 is the index of the first character and
-          n+1 is the index of the terminating null byte or the end of file.
-          This also holds true when reading a byte vector (CBOR or MessagePack).
-    */
-    const std::size_t byte;
-
-  private:
-    parse_error(int id_, std::size_t byte_, const char* what_arg)
-        : exception(id_, what_arg), byte(byte_) {}
-
-    static std::string position_string(const position_t& pos)
-    {
-        return " at line " + std::to_string(pos.lines_read + 1) +
-               ", column " + std::to_string(pos.chars_read_current_line);
-    }
-};
-
-/*!
-@brief exception indicating errors with iterators
-
-This exception is thrown if iterators passed to a library function do not match
-the expected semantics.
-
-Exceptions have ids 2xx.
-
-name / id                           | example message | description
------------------------------------ | --------------- | -------------------------
-json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
-json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
-json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
-json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
-json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
-json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
-json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
-json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
-json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
-json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
-json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
-json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
-json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
-json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
-
-@liveexample{The following code shows how an `invalid_iterator` exception can be
-caught.,invalid_iterator}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class invalid_iterator : public exception
-{
-  public:
-    static invalid_iterator create(int id_, const std::string& what_arg)
-    {
-        std::string w = exception::name("invalid_iterator", id_) + what_arg;
-        return invalid_iterator(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    invalid_iterator(int id_, const char* what_arg)
-        : exception(id_, what_arg) {}
-};
-
-/*!
-@brief exception indicating executing a member function with a wrong type
-
-This exception is thrown in case of a type error; that is, a library function is
-executed on a JSON value whose type does not match the expected semantics.
-
-Exceptions have ids 3xx.
-
-name / id                     | example message | description
------------------------------ | --------------- | -------------------------
-json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
-json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
-json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &.
-json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
-json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
-json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
-json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
-json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
-json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
-json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
-json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
-json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
-json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
-json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
-json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
-json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. |
-json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) |
-
-@liveexample{The following code shows how a `type_error` exception can be
-caught.,type_error}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class type_error : public exception
-{
-  public:
-    static type_error create(int id_, const std::string& what_arg)
-    {
-        std::string w = exception::name("type_error", id_) + what_arg;
-        return type_error(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/*!
-@brief exception indicating access out of the defined range
-
-This exception is thrown in case a library function is called on an input
-parameter that exceeds the expected range, for instance in case of array
-indices or nonexisting object keys.
-
-Exceptions have ids 4xx.
-
-name / id                       | example message | description
-------------------------------- | --------------- | -------------------------
-json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
-json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
-json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
-json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
-json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
-json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
-json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. |
-json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
-json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string |
-
-@liveexample{The following code shows how an `out_of_range` exception can be
-caught.,out_of_range}
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref other_error for exceptions indicating other library errors
-
-@since version 3.0.0
-*/
-class out_of_range : public exception
-{
-  public:
-    static out_of_range create(int id_, const std::string& what_arg)
-    {
-        std::string w = exception::name("out_of_range", id_) + what_arg;
-        return out_of_range(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-
-/*!
-@brief exception indicating other library errors
-
-This exception is thrown in case of errors that cannot be classified with the
-other exception types.
-
-Exceptions have ids 5xx.
-
-name / id                      | example message | description
------------------------------- | --------------- | -------------------------
-json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
-
-@sa - @ref exception for the base class of the library exceptions
-@sa - @ref parse_error for exceptions indicating a parse error
-@sa - @ref invalid_iterator for exceptions indicating errors with iterators
-@sa - @ref type_error for exceptions indicating executing a member function with
-                    a wrong type
-@sa - @ref out_of_range for exceptions indicating access out of the defined range
-
-@liveexample{The following code shows how an `other_error` exception can be
-caught.,other_error}
-
-@since version 3.0.0
-*/
-class other_error : public exception
-{
-  public:
-    static other_error create(int id_, const std::string& what_arg)
-    {
-        std::string w = exception::name("other_error", id_) + what_arg;
-        return other_error(id_, w.c_str());
-    }
-
-  private:
-    JSON_HEDLEY_NON_NULL(3)
-    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-
-#include <ciso646> // not
-#include <cstddef> // size_t
-#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
-
-namespace nlohmann
-{
-namespace detail
-{
-// alias templates to reduce boilerplate
-template<bool B, typename T = void>
-using enable_if_t = typename std::enable_if<B, T>::type;
-
-template<typename T>
-using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
-
-// implementation of C++14 index_sequence and affiliates
-// source: https://stackoverflow.com/a/32223343
-template<std::size_t... Ints>
-struct index_sequence
-{
-    using type = index_sequence;
-    using value_type = std::size_t;
-    static constexpr std::size_t size() noexcept
-    {
-        return sizeof...(Ints);
-    }
-};
-
-template<class Sequence1, class Sequence2>
-struct merge_and_renumber;
-
-template<std::size_t... I1, std::size_t... I2>
-struct merge_and_renumber<index_sequence<I1...>, index_sequence<I2...>>
-        : index_sequence < I1..., (sizeof...(I1) + I2)... > {};
-
-template<std::size_t N>
-struct make_index_sequence
-    : merge_and_renumber < typename make_index_sequence < N / 2 >::type,
-      typename make_index_sequence < N - N / 2 >::type > {};
-
-template<> struct make_index_sequence<0> : index_sequence<> {};
-template<> struct make_index_sequence<1> : index_sequence<0> {};
-
-template<typename... Ts>
-using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-
-// dispatch utility (taken from ranges-v3)
-template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
-template<> struct priority_tag<0> {};
-
-// taken from ranges-v3
-template<typename T>
-struct static_const
-{
-    static constexpr T value{};
-};
-
-template<typename T>
-constexpr T static_const<T>::value;
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-#include <ciso646> // not
-#include <limits> // numeric_limits
-#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
-#include <utility> // declval
-
-// #include <nlohmann/detail/iterators/iterator_traits.hpp>
-
-
-#include <iterator> // random_access_iterator_tag
-
-// #include <nlohmann/detail/meta/void_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template <typename ...Ts> struct make_void
-{
-    using type = void;
-};
-template <typename ...Ts> using void_t = typename make_void<Ts...>::type;
-} // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template <typename It, typename = void>
-struct iterator_types {};
-
-template <typename It>
-struct iterator_types <
-    It,
-    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
-    typename It::reference, typename It::iterator_category >>
-{
-    using difference_type = typename It::difference_type;
-    using value_type = typename It::value_type;
-    using pointer = typename It::pointer;
-    using reference = typename It::reference;
-    using iterator_category = typename It::iterator_category;
-};
-
-// This is required as some compilers implement std::iterator_traits in a way that
-// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
-template <typename T, typename = void>
-struct iterator_traits
-{
-};
-
-template <typename T>
-struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
-            : iterator_types<T>
-{
-};
-
-template <typename T>
-struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
-{
-    using iterator_category = std::random_access_iterator_tag;
-    using value_type = T;
-    using difference_type = ptrdiff_t;
-    using pointer = T*;
-    using reference = T&;
-};
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-
-#include <type_traits>
-
-// #include <nlohmann/detail/meta/void_t.hpp>
-
-
-// http://en.cppreference.com/w/cpp/experimental/is_detected
-namespace nlohmann
-{
-namespace detail
-{
-struct nonesuch
-{
-    nonesuch() = delete;
-    ~nonesuch() = delete;
-    nonesuch(nonesuch const&) = delete;
-    nonesuch(nonesuch const&&) = delete;
-    void operator=(nonesuch const&) = delete;
-    void operator=(nonesuch&&) = delete;
-};
-
-template <class Default,
-          class AlwaysVoid,
-          template <class...> class Op,
-          class... Args>
-struct detector
-{
-    using value_t = std::false_type;
-    using type = Default;
-};
-
-template <class Default, template <class...> class Op, class... Args>
-struct detector<Default, void_t<Op<Args...>>, Op, Args...>
-{
-    using value_t = std::true_type;
-    using type = Op<Args...>;
-};
-
-template <template <class...> class Op, class... Args>
-using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
-
-template <template <class...> class Op, class... Args>
-using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
-
-template <class Default, template <class...> class Op, class... Args>
-using detected_or = detector<Default, void, Op, Args...>;
-
-template <class Default, template <class...> class Op, class... Args>
-using detected_or_t = typename detected_or<Default, Op, Args...>::type;
-
-template <class Expected, template <class...> class Op, class... Args>
-using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
-
-template <class To, template <class...> class Op, class... Args>
-using is_detected_convertible =
-    std::is_convertible<detected_t<Op, Args...>, To>;
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/json_fwd.hpp>
-#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
-#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-#include <cstdint> // int64_t, uint64_t
-#include <map> // map
-#include <memory> // allocator
-#include <string> // string
-#include <vector> // vector
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-/*!
-@brief default JSONSerializer template argument
-
-This serializer ignores the template arguments and uses ADL
-([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
-for serialization.
-*/
-template<typename T = void, typename SFINAE = void>
-struct adl_serializer;
-
-template<template<typename U, typename V, typename... Args> class ObjectType =
-         std::map,
-         template<typename U, typename... Args> class ArrayType = std::vector,
-         class StringType = std::string, class BooleanType = bool,
-         class NumberIntegerType = std::int64_t,
-         class NumberUnsignedType = std::uint64_t,
-         class NumberFloatType = double,
-         template<typename U> class AllocatorType = std::allocator,
-         template<typename T, typename SFINAE = void> class JSONSerializer =
-         adl_serializer>
-class basic_json;
-
-/*!
-@brief JSON Pointer
-
-A JSON pointer defines a string syntax for identifying a specific value
-within a JSON document. It can be used with functions `at` and
-`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
-
-@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
-
-@since version 2.0.0
-*/
-template<typename BasicJsonType>
-class json_pointer;
-
-/*!
-@brief default JSON class
-
-This type is the default specialization of the @ref basic_json class which
-uses the standard template types.
-
-@since version 1.0.0
-*/
-using json = basic_json<>;
-}  // namespace nlohmann
-
-#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
-
-
-namespace nlohmann
-{
-/*!
-@brief detail namespace with internal helper functions
-
-This namespace collects functions that should not be exposed,
-implementations of some @ref basic_json methods, and meta-programming helpers.
-
-@since version 2.1.0
-*/
-namespace detail
-{
-/////////////
-// helpers //
-/////////////
-
-// Note to maintainers:
-//
-// Every trait in this file expects a non CV-qualified type.
-// The only exceptions are in the 'aliases for detected' section
-// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
-//
-// In this case, T has to be properly CV-qualified to constraint the function arguments
-// (e.g. to_json(BasicJsonType&, const T&))
-
-template<typename> struct is_basic_json : std::false_type {};
-
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
-
-//////////////////////////
-// aliases for detected //
-//////////////////////////
-
-template <typename T>
-using mapped_type_t = typename T::mapped_type;
-
-template <typename T>
-using key_type_t = typename T::key_type;
-
-template <typename T>
-using value_type_t = typename T::value_type;
-
-template <typename T>
-using difference_type_t = typename T::difference_type;
-
-template <typename T>
-using pointer_t = typename T::pointer;
-
-template <typename T>
-using reference_t = typename T::reference;
-
-template <typename T>
-using iterator_category_t = typename T::iterator_category;
-
-template <typename T>
-using iterator_t = typename T::iterator;
-
-template <typename T, typename... Args>
-using to_json_function = decltype(T::to_json(std::declval<Args>()...));
-
-template <typename T, typename... Args>
-using from_json_function = decltype(T::from_json(std::declval<Args>()...));
-
-template <typename T, typename U>
-using get_template_function = decltype(std::declval<T>().template get<U>());
-
-// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
-template <typename BasicJsonType, typename T, typename = void>
-struct has_from_json : std::false_type {};
-
-template <typename BasicJsonType, typename T>
-struct has_from_json<BasicJsonType, T,
-           enable_if_t<not is_basic_json<T>::value>>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<void, from_json_function, serializer,
-        const BasicJsonType&, T&>::value;
-};
-
-// This trait checks if JSONSerializer<T>::from_json(json const&) exists
-// this overload is used for non-default-constructible user-defined-types
-template <typename BasicJsonType, typename T, typename = void>
-struct has_non_default_from_json : std::false_type {};
-
-template<typename BasicJsonType, typename T>
-struct has_non_default_from_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<T, from_json_function, serializer,
-        const BasicJsonType&>::value;
-};
-
-// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
-// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
-template <typename BasicJsonType, typename T, typename = void>
-struct has_to_json : std::false_type {};
-
-template <typename BasicJsonType, typename T>
-struct has_to_json<BasicJsonType, T, enable_if_t<not is_basic_json<T>::value>>
-{
-    using serializer = typename BasicJsonType::template json_serializer<T, void>;
-
-    static constexpr bool value =
-        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
-        T>::value;
-};
-
-
-///////////////////
-// is_ functions //
-///////////////////
-
-template <typename T, typename = void>
-struct is_iterator_traits : std::false_type {};
-
-template <typename T>
-struct is_iterator_traits<iterator_traits<T>>
-{
-  private:
-    using traits = iterator_traits<T>;
-
-  public:
-    static constexpr auto value =
-        is_detected<value_type_t, traits>::value &&
-        is_detected<difference_type_t, traits>::value &&
-        is_detected<pointer_t, traits>::value &&
-        is_detected<iterator_category_t, traits>::value &&
-        is_detected<reference_t, traits>::value;
-};
-
-// source: https://stackoverflow.com/a/37193089/4116453
-
-template <typename T, typename = void>
-struct is_complete_type : std::false_type {};
-
-template <typename T>
-struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
-
-template <typename BasicJsonType, typename CompatibleObjectType,
-          typename = void>
-struct is_compatible_object_type_impl : std::false_type {};
-
-template <typename BasicJsonType, typename CompatibleObjectType>
-struct is_compatible_object_type_impl <
-    BasicJsonType, CompatibleObjectType,
-    enable_if_t<is_detected<mapped_type_t, CompatibleObjectType>::value and
-    is_detected<key_type_t, CompatibleObjectType>::value >>
-{
-
-    using object_t = typename BasicJsonType::object_t;
-
-    // macOS's is_constructible does not play well with nonesuch...
-    static constexpr bool value =
-        std::is_constructible<typename object_t::key_type,
-        typename CompatibleObjectType::key_type>::value and
-        std::is_constructible<typename object_t::mapped_type,
-        typename CompatibleObjectType::mapped_type>::value;
-};
-
-template <typename BasicJsonType, typename CompatibleObjectType>
-struct is_compatible_object_type
-    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
-
-template <typename BasicJsonType, typename ConstructibleObjectType,
-          typename = void>
-struct is_constructible_object_type_impl : std::false_type {};
-
-template <typename BasicJsonType, typename ConstructibleObjectType>
-struct is_constructible_object_type_impl <
-    BasicJsonType, ConstructibleObjectType,
-    enable_if_t<is_detected<mapped_type_t, ConstructibleObjectType>::value and
-    is_detected<key_type_t, ConstructibleObjectType>::value >>
-{
-    using object_t = typename BasicJsonType::object_t;
-
-    static constexpr bool value =
-        (std::is_default_constructible<ConstructibleObjectType>::value and
-         (std::is_move_assignable<ConstructibleObjectType>::value or
-          std::is_copy_assignable<ConstructibleObjectType>::value) and
-         (std::is_constructible<typename ConstructibleObjectType::key_type,
-          typename object_t::key_type>::value and
-          std::is_same <
-          typename object_t::mapped_type,
-          typename ConstructibleObjectType::mapped_type >::value)) or
-        (has_from_json<BasicJsonType,
-         typename ConstructibleObjectType::mapped_type>::value or
-         has_non_default_from_json <
-         BasicJsonType,
-         typename ConstructibleObjectType::mapped_type >::value);
-};
-
-template <typename BasicJsonType, typename ConstructibleObjectType>
-struct is_constructible_object_type
-    : is_constructible_object_type_impl<BasicJsonType,
-      ConstructibleObjectType> {};
-
-template <typename BasicJsonType, typename CompatibleStringType,
-          typename = void>
-struct is_compatible_string_type_impl : std::false_type {};
-
-template <typename BasicJsonType, typename CompatibleStringType>
-struct is_compatible_string_type_impl <
-    BasicJsonType, CompatibleStringType,
-    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
-    value_type_t, CompatibleStringType>::value >>
-{
-    static constexpr auto value =
-        std::is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
-};
-
-template <typename BasicJsonType, typename ConstructibleStringType>
-struct is_compatible_string_type
-    : is_compatible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
-
-template <typename BasicJsonType, typename ConstructibleStringType,
-          typename = void>
-struct is_constructible_string_type_impl : std::false_type {};
-
-template <typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type_impl <
-    BasicJsonType, ConstructibleStringType,
-    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
-    value_type_t, ConstructibleStringType>::value >>
-{
-    static constexpr auto value =
-        std::is_constructible<ConstructibleStringType,
-        typename BasicJsonType::string_t>::value;
-};
-
-template <typename BasicJsonType, typename ConstructibleStringType>
-struct is_constructible_string_type
-    : is_constructible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
-
-template <typename BasicJsonType, typename CompatibleArrayType, typename = void>
-struct is_compatible_array_type_impl : std::false_type {};
-
-template <typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type_impl <
-    BasicJsonType, CompatibleArrayType,
-    enable_if_t<is_detected<value_type_t, CompatibleArrayType>::value and
-    is_detected<iterator_t, CompatibleArrayType>::value and
-// This is needed because json_reverse_iterator has a ::iterator type...
-// Therefore it is detected as a CompatibleArrayType.
-// The real fix would be to have an Iterable concept.
-    not is_iterator_traits<
-    iterator_traits<CompatibleArrayType>>::value >>
-{
-    static constexpr bool value =
-        std::is_constructible<BasicJsonType,
-        typename CompatibleArrayType::value_type>::value;
-};
-
-template <typename BasicJsonType, typename CompatibleArrayType>
-struct is_compatible_array_type
-    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
-
-template <typename BasicJsonType, typename ConstructibleArrayType, typename = void>
-struct is_constructible_array_type_impl : std::false_type {};
-
-template <typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t<std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value >>
-            : std::true_type {};
-
-template <typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type_impl <
-    BasicJsonType, ConstructibleArrayType,
-    enable_if_t<not std::is_same<ConstructibleArrayType,
-    typename BasicJsonType::value_type>::value and
-    std::is_default_constructible<ConstructibleArrayType>::value and
-(std::is_move_assignable<ConstructibleArrayType>::value or
- std::is_copy_assignable<ConstructibleArrayType>::value) and
-is_detected<value_type_t, ConstructibleArrayType>::value and
-is_detected<iterator_t, ConstructibleArrayType>::value and
-is_complete_type<
-detected_t<value_type_t, ConstructibleArrayType>>::value >>
-{
-    static constexpr bool value =
-        // This is needed because json_reverse_iterator has a ::iterator type,
-        // furthermore, std::back_insert_iterator (and other iterators) have a
-        // base class `iterator`... Therefore it is detected as a
-        // ConstructibleArrayType. The real fix would be to have an Iterable
-        // concept.
-        not is_iterator_traits<iterator_traits<ConstructibleArrayType>>::value and
-
-        (std::is_same<typename ConstructibleArrayType::value_type,
-         typename BasicJsonType::array_t::value_type>::value or
-         has_from_json<BasicJsonType,
-         typename ConstructibleArrayType::value_type>::value or
-         has_non_default_from_json <
-         BasicJsonType, typename ConstructibleArrayType::value_type >::value);
-};
-
-template <typename BasicJsonType, typename ConstructibleArrayType>
-struct is_constructible_array_type
-    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
-
-template <typename RealIntegerType, typename CompatibleNumberIntegerType,
-          typename = void>
-struct is_compatible_integer_type_impl : std::false_type {};
-
-template <typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type_impl <
-    RealIntegerType, CompatibleNumberIntegerType,
-    enable_if_t<std::is_integral<RealIntegerType>::value and
-    std::is_integral<CompatibleNumberIntegerType>::value and
-    not std::is_same<bool, CompatibleNumberIntegerType>::value >>
-{
-    // is there an assert somewhere on overflows?
-    using RealLimits = std::numeric_limits<RealIntegerType>;
-    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
-
-    static constexpr auto value =
-        std::is_constructible<RealIntegerType,
-        CompatibleNumberIntegerType>::value and
-        CompatibleLimits::is_integer and
-        RealLimits::is_signed == CompatibleLimits::is_signed;
-};
-
-template <typename RealIntegerType, typename CompatibleNumberIntegerType>
-struct is_compatible_integer_type
-    : is_compatible_integer_type_impl<RealIntegerType,
-      CompatibleNumberIntegerType> {};
-
-template <typename BasicJsonType, typename CompatibleType, typename = void>
-struct is_compatible_type_impl: std::false_type {};
-
-template <typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type_impl <
-    BasicJsonType, CompatibleType,
-    enable_if_t<is_complete_type<CompatibleType>::value >>
-{
-    static constexpr bool value =
-        has_to_json<BasicJsonType, CompatibleType>::value;
-};
-
-template <typename BasicJsonType, typename CompatibleType>
-struct is_compatible_type
-    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
-
-// https://en.cppreference.com/w/cpp/types/conjunction
-template<class...> struct conjunction : std::true_type { };
-template<class B1> struct conjunction<B1> : B1 { };
-template<class B1, class... Bn>
-struct conjunction<B1, Bn...>
-: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
-
-template <typename T1, typename T2>
-struct is_constructible_tuple : std::false_type {};
-
-template <typename T1, typename... Args>
-struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<std::is_constructible<T1, Args>...> {};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-#include <array> // array
-#include <ciso646> // and
-#include <cstddef> // size_t
-#include <cstdint> // uint8_t
-#include <string> // string
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////////////
-// JSON type enumeration //
-///////////////////////////
-
-/*!
-@brief the JSON type enumeration
-
-This enumeration collects the different JSON types. It is internally used to
-distinguish the stored values, and the functions @ref basic_json::is_null(),
-@ref basic_json::is_object(), @ref basic_json::is_array(),
-@ref basic_json::is_string(), @ref basic_json::is_boolean(),
-@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
-@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
-@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
-@ref basic_json::is_structured() rely on it.
-
-@note There are three enumeration entries (number_integer, number_unsigned, and
-number_float), because the library distinguishes these three types for numbers:
-@ref basic_json::number_unsigned_t is used for unsigned integers,
-@ref basic_json::number_integer_t is used for signed integers, and
-@ref basic_json::number_float_t is used for floating-point numbers or to
-approximate integers which do not fit in the limits of their respective type.
-
-@sa @ref basic_json::basic_json(const value_t value_type) -- create a JSON
-value with the default value for a given type
-
-@since version 1.0.0
-*/
-enum class value_t : std::uint8_t
-{
-    null,             ///< null value
-    object,           ///< object (unordered set of name/value pairs)
-    array,            ///< array (ordered collection of values)
-    string,           ///< string value
-    boolean,          ///< boolean value
-    number_integer,   ///< number value (signed integer)
-    number_unsigned,  ///< number value (unsigned integer)
-    number_float,     ///< number value (floating-point)
-    discarded         ///< discarded by the the parser callback function
-};
-
-/*!
-@brief comparison operator for JSON types
-
-Returns an ordering that is similar to Python:
-- order: null < boolean < number < object < array < string
-- furthermore, each type is not smaller than itself
-- discarded values are not comparable
-
-@since version 1.0.0
-*/
-inline bool operator<(const value_t lhs, const value_t rhs) noexcept
-{
-    static constexpr std::array<std::uint8_t, 8> order = {{
-            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
-            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */
-        }
-    };
-
-    const auto l_index = static_cast<std::size_t>(lhs);
-    const auto r_index = static_cast<std::size_t>(rhs);
-    return l_index < order.size() and r_index < order.size() and order[l_index] < order[r_index];
-}
-}  // namespace detail
-}  // namespace nlohmann
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_null()))
-    {
-        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name())));
-    }
-    n = nullptr;
-}
-
-// overloads for basic_json template parameters
-template<typename BasicJsonType, typename ArithmeticType,
-         enable_if_t<std::is_arithmetic<ArithmeticType>::value and
-                     not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-                     int> = 0>
-void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-
-        default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
-    }
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_boolean()))
-    {
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name())));
-    }
-    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
-    }
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template <
-    typename BasicJsonType, typename ConstructibleStringType,
-    enable_if_t <
-        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value and
-        not std::is_same<typename BasicJsonType::string_t,
-                         ConstructibleStringType>::value,
-        int > = 0 >
-void from_json(const BasicJsonType& j, ConstructibleStringType& s)
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_string()))
-    {
-        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
-    }
-
-    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType>
-void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
-{
-    get_arithmetic_value(j, val);
-}
-
-template<typename BasicJsonType, typename EnumType,
-         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void from_json(const BasicJsonType& j, EnumType& e)
-{
-    typename std::underlying_type<EnumType>::type val;
-    get_arithmetic_value(j, val);
-    e = static_cast<EnumType>(val);
-}
-
-// forward_list doesn't have an insert method
-template<typename BasicJsonType, typename T, typename Allocator,
-         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
-    }
-    l.clear();
-    std::transform(j.rbegin(), j.rend(),
-                   std::front_inserter(l), [](const BasicJsonType & i)
-    {
-        return i.template get<T>();
-    });
-}
-
-// valarray doesn't have an insert method
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_convertible<BasicJsonType, T>::value, int> = 0>
-void from_json(const BasicJsonType& j, std::valarray<T>& l)
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
-    }
-    l.resize(j.size());
-    std::copy(j.begin(), j.end(), std::begin(l));
-}
-
-template <typename BasicJsonType, typename T, std::size_t N>
-auto from_json(const BasicJsonType& j, T (&arr)[N])
--> decltype(j.template get<T>(), void())
-{
-    for (std::size_t i = 0; i < N; ++i)
-    {
-        arr[i] = j.at(i).template get<T>();
-    }
-}
-
-template<typename BasicJsonType>
-void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
-{
-    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
-}
-
-template <typename BasicJsonType, typename T, std::size_t N>
-auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
-                          priority_tag<2> /*unused*/)
--> decltype(j.template get<T>(), void())
-{
-    for (std::size_t i = 0; i < N; ++i)
-    {
-        arr[i] = j.at(i).template get<T>();
-    }
-}
-
-template<typename BasicJsonType, typename ConstructibleArrayType>
-auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
--> decltype(
-    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
-    j.template get<typename ConstructibleArrayType::value_type>(),
-    void())
-{
-    using std::end;
-
-    ConstructibleArrayType ret;
-    ret.reserve(j.size());
-    std::transform(j.begin(), j.end(),
-                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename ConstructibleArrayType::value_type>();
-    });
-    arr = std::move(ret);
-}
-
-template <typename BasicJsonType, typename ConstructibleArrayType>
-void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
-                          priority_tag<0> /*unused*/)
-{
-    using std::end;
-
-    ConstructibleArrayType ret;
-    std::transform(
-        j.begin(), j.end(), std::inserter(ret, end(ret)),
-        [](const BasicJsonType & i)
-    {
-        // get<BasicJsonType>() returns *this, this won't call a from_json
-        // method when value_type is BasicJsonType
-        return i.template get<typename ConstructibleArrayType::value_type>();
-    });
-    arr = std::move(ret);
-}
-
-template <typename BasicJsonType, typename ConstructibleArrayType,
-          enable_if_t <
-              is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value and
-              not is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value and
-              not is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value and
-              not is_basic_json<ConstructibleArrayType>::value,
-              int > = 0 >
-
-auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
--> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
-j.template get<typename ConstructibleArrayType::value_type>(),
-void())
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " +
-                                      std::string(j.type_name())));
-    }
-
-    from_json_array_impl(j, arr, priority_tag<3> {});
-}
-
-template<typename BasicJsonType, typename ConstructibleObjectType,
-         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
-void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_object()))
-    {
-        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name())));
-    }
-
-    ConstructibleObjectType ret;
-    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
-    using value_type = typename ConstructibleObjectType::value_type;
-    std::transform(
-        inner_object->begin(), inner_object->end(),
-        std::inserter(ret, ret.begin()),
-        [](typename BasicJsonType::object_t::value_type const & p)
-    {
-        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
-    });
-    obj = std::move(ret);
-}
-
-// overload for arithmetic types, not chosen for basic_json template arguments
-// (BooleanType, etc..); note: Is it really necessary to provide explicit
-// overloads for boolean_t etc. in case of a custom BooleanType which is not
-// an arithmetic type?
-template<typename BasicJsonType, typename ArithmeticType,
-         enable_if_t <
-             std::is_arithmetic<ArithmeticType>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value and
-             not std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
-             int> = 0>
-void from_json(const BasicJsonType& j, ArithmeticType& val)
-{
-    switch (static_cast<value_t>(j))
-    {
-        case value_t::number_unsigned:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
-            break;
-        }
-        case value_t::number_integer:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
-            break;
-        }
-        case value_t::number_float:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
-            break;
-        }
-        case value_t::boolean:
-        {
-            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
-            break;
-        }
-
-        default:
-            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
-    }
-}
-
-template<typename BasicJsonType, typename A1, typename A2>
-void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
-{
-    p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
-}
-
-template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
-void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...> /*unused*/)
-{
-    t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
-}
-
-template<typename BasicJsonType, typename... Args>
-void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
-{
-    from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
-}
-
-template <typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
-          typename = enable_if_t<not std::is_constructible<
-                                     typename BasicJsonType::string_t, Key>::value>>
-void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
-    }
-    m.clear();
-    for (const auto& p : j)
-    {
-        if (JSON_HEDLEY_UNLIKELY(not p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
-    }
-}
-
-template <typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
-          typename = enable_if_t<not std::is_constructible<
-                                     typename BasicJsonType::string_t, Key>::value>>
-void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
-{
-    if (JSON_HEDLEY_UNLIKELY(not j.is_array()))
-    {
-        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
-    }
-    m.clear();
-    for (const auto& p : j)
-    {
-        if (JSON_HEDLEY_UNLIKELY(not p.is_array()))
-        {
-            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
-        }
-        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
-    }
-}
-
-struct from_json_fn
-{
-    template<typename BasicJsonType, typename T>
-    auto operator()(const BasicJsonType& j, T& val) const
-    noexcept(noexcept(from_json(j, val)))
-    -> decltype(from_json(j, val), void())
-    {
-        return from_json(j, val);
-    }
-};
-}  // namespace detail
-
-/// namespace to hold default `from_json` function
-/// to see why this is required:
-/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
-namespace
-{
-constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
-} // namespace
-} // namespace nlohmann
-
-// #include <nlohmann/detail/conversions/to_json.hpp>
-
-
-#include <algorithm> // copy
-#include <ciso646> // or, and, not
-#include <iterator> // begin, end
-#include <string> // string
-#include <tuple> // tuple, get
-#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
-#include <utility> // move, forward, declval, pair
-#include <valarray> // valarray
-#include <vector> // vector
-
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-
-
-#include <cstddef> // size_t
-#include <iterator> // input_iterator_tag
-#include <string> // string, to_string
-#include <tuple> // tuple_size, get, tuple_element
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename string_type>
-void int_to_string( string_type& target, std::size_t value )
-{
-    target = std::to_string(value);
-}
-template <typename IteratorType> class iteration_proxy_value
-{
-  public:
-    using difference_type = std::ptrdiff_t;
-    using value_type = iteration_proxy_value;
-    using pointer = value_type * ;
-    using reference = value_type & ;
-    using iterator_category = std::input_iterator_tag;
-    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
-
-  private:
-    /// the iterator
-    IteratorType anchor;
-    /// an index for arrays (used to create key names)
-    std::size_t array_index = 0;
-    /// last stringified array index
-    mutable std::size_t array_index_last = 0;
-    /// a string representation of the array index
-    mutable string_type array_index_str = "0";
-    /// an empty string (to return a reference for primitive values)
-    const string_type empty_str = "";
-
-  public:
-    explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {}
-
-    /// dereference operator (needed for range-based for)
-    iteration_proxy_value& operator*()
-    {
-        return *this;
-    }
-
-    /// increment operator (needed for range-based for)
-    iteration_proxy_value& operator++()
-    {
-        ++anchor;
-        ++array_index;
-
-        return *this;
-    }
-
-    /// equality operator (needed for InputIterator)
-    bool operator==(const iteration_proxy_value& o) const
-    {
-        return anchor == o.anchor;
-    }
-
-    /// inequality operator (needed for range-based for)
-    bool operator!=(const iteration_proxy_value& o) const
-    {
-        return anchor != o.anchor;
-    }
-
-    /// return key of the iterator
-    const string_type& key() const
-    {
-        assert(anchor.m_object != nullptr);
-
-        switch (anchor.m_object->type())
-        {
-            // use integer array index as key
-            case value_t::array:
-            {
-                if (array_index != array_index_last)
-                {
-                    int_to_string( array_index_str, array_index );
-                    array_index_last = array_index;
-                }
-                return array_index_str;
-            }
-
-            // use key from the object
-            case value_t::object:
-                return anchor.key();
-
-            // use an empty key for all primitive types
-            default:
-                return empty_str;
-        }
-    }
-
-    /// return value of the iterator
-    typename IteratorType::reference value() const
-    {
-        return anchor.value();
-    }
-};
-
-/// proxy class for the items() function
-template<typename IteratorType> class iteration_proxy
-{
-  private:
-    /// the container to iterate
-    typename IteratorType::reference container;
-
-  public:
-    /// construct iteration proxy from a container
-    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
-        : container(cont) {}
-
-    /// return iterator begin (needed for range-based for)
-    iteration_proxy_value<IteratorType> begin() noexcept
-    {
-        return iteration_proxy_value<IteratorType>(container.begin());
-    }
-
-    /// return iterator end (needed for range-based for)
-    iteration_proxy_value<IteratorType> end() noexcept
-    {
-        return iteration_proxy_value<IteratorType>(container.end());
-    }
-};
-// Structured Bindings Support
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-template <std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
-auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
-{
-    return i.key();
-}
-// Structured Bindings Support
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-template <std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
-auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
-{
-    return i.value();
-}
-}  // namespace detail
-}  // namespace nlohmann
-
-// The Addition to the STD Namespace is required to add
-// Structured Bindings Support to the iteration_proxy_value class
-// For further reference see https://blog.tartanllama.xyz/structured-bindings/
-// And see https://github.com/nlohmann/json/pull/1391
-namespace std
-{
-#if defined(__clang__)
-    // Fix: https://github.com/nlohmann/json/issues/1401
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wmismatched-tags"
-#endif
-template <typename IteratorType>
-class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
-            : public std::integral_constant<std::size_t, 2> {};
-
-template <std::size_t N, typename IteratorType>
-class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
-{
-  public:
-    using type = decltype(
-                     get<N>(std::declval <
-                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
-};
-#if defined(__clang__)
-    #pragma clang diagnostic pop
-#endif
-} // namespace std
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-//////////////////
-// constructors //
-//////////////////
-
-template<value_t> struct external_constructor;
-
-template<>
-struct external_constructor<value_t::boolean>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
-    {
-        j.m_type = value_t::boolean;
-        j.m_value = b;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::string>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
-    {
-        j.m_type = value_t::string;
-        j.m_value = s;
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
-    {
-        j.m_type = value_t::string;
-        j.m_value = std::move(s);
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType, typename CompatibleStringType,
-             enable_if_t<not std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
-                         int> = 0>
-    static void construct(BasicJsonType& j, const CompatibleStringType& str)
-    {
-        j.m_type = value_t::string;
-        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_float>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
-    {
-        j.m_type = value_t::number_float;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_unsigned>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
-    {
-        j.m_type = value_t::number_unsigned;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::number_integer>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
-    {
-        j.m_type = value_t::number_integer;
-        j.m_value = val;
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::array>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
-    {
-        j.m_type = value_t::array;
-        j.m_value = arr;
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
-    {
-        j.m_type = value_t::array;
-        j.m_value = std::move(arr);
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType, typename CompatibleArrayType,
-             enable_if_t<not std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
-                         int> = 0>
-    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
-    {
-        using std::begin;
-        using std::end;
-        j.m_type = value_t::array;
-        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
-    {
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->reserve(arr.size());
-        for (const bool x : arr)
-        {
-            j.m_value.array->push_back(x);
-        }
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType, typename T,
-             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
-    {
-        j.m_type = value_t::array;
-        j.m_value = value_t::array;
-        j.m_value.array->resize(arr.size());
-        if (arr.size() > 0)
-        {
-            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
-        }
-        j.assert_invariant();
-    }
-};
-
-template<>
-struct external_constructor<value_t::object>
-{
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
-    {
-        j.m_type = value_t::object;
-        j.m_value = obj;
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType>
-    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
-    {
-        j.m_type = value_t::object;
-        j.m_value = std::move(obj);
-        j.assert_invariant();
-    }
-
-    template<typename BasicJsonType, typename CompatibleObjectType,
-             enable_if_t<not std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int> = 0>
-    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
-    {
-        using std::begin;
-        using std::end;
-
-        j.m_type = value_t::object;
-        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
-        j.assert_invariant();
-    }
-};
-
-/////////////
-// to_json //
-/////////////
-
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
-void to_json(BasicJsonType& j, T b) noexcept
-{
-    external_constructor<value_t::boolean>::construct(j, b);
-}
-
-template<typename BasicJsonType, typename CompatibleString,
-         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
-void to_json(BasicJsonType& j, const CompatibleString& s)
-{
-    external_constructor<value_t::string>::construct(j, s);
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
-{
-    external_constructor<value_t::string>::construct(j, std::move(s));
-}
-
-template<typename BasicJsonType, typename FloatType,
-         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
-void to_json(BasicJsonType& j, FloatType val) noexcept
-{
-    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
-}
-
-template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
-         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
-{
-    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
-}
-
-template<typename BasicJsonType, typename CompatibleNumberIntegerType,
-         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
-void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
-{
-    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
-}
-
-template<typename BasicJsonType, typename EnumType,
-         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
-void to_json(BasicJsonType& j, EnumType e) noexcept
-{
-    using underlying_type = typename std::underlying_type<EnumType>::type;
-    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, const std::vector<bool>& e)
-{
-    external_constructor<value_t::array>::construct(j, e);
-}
-
-template <typename BasicJsonType, typename CompatibleArrayType,
-          enable_if_t<is_compatible_array_type<BasicJsonType,
-                      CompatibleArrayType>::value and
-                      not is_compatible_object_type<
-                          BasicJsonType, CompatibleArrayType>::value and
-                      not is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value and
-                      not is_basic_json<CompatibleArrayType>::value,
-                      int> = 0>
-void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
-{
-    external_constructor<value_t::array>::construct(j, arr);
-}
-
-template<typename BasicJsonType, typename T,
-         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
-void to_json(BasicJsonType& j, const std::valarray<T>& arr)
-{
-    external_constructor<value_t::array>::construct(j, std::move(arr));
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
-{
-    external_constructor<value_t::array>::construct(j, std::move(arr));
-}
-
-template<typename BasicJsonType, typename CompatibleObjectType,
-         enable_if_t<is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value and not is_basic_json<CompatibleObjectType>::value, int> = 0>
-void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
-{
-    external_constructor<value_t::object>::construct(j, obj);
-}
-
-template<typename BasicJsonType>
-void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
-{
-    external_constructor<value_t::object>::construct(j, std::move(obj));
-}
-
-template <
-    typename BasicJsonType, typename T, std::size_t N,
-    enable_if_t<not std::is_constructible<typename BasicJsonType::string_t,
-                const T(&)[N]>::value,
-                int> = 0 >
-void to_json(BasicJsonType& j, const T(&arr)[N])
-{
-    external_constructor<value_t::array>::construct(j, arr);
-}
-
-template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
-void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
-{
-    j = { p.first, p.second };
-}
-
-// for https://github.com/nlohmann/json/pull/1134
-template < typename BasicJsonType, typename T,
-           enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
-void to_json(BasicJsonType& j, const T& b)
-{
-    j = { {b.key(), b.value()} };
-}
-
-template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
-void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
-{
-    j = { std::get<Idx>(t)... };
-}
-
-template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
-void to_json(BasicJsonType& j, const T& t)
-{
-    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
-}
-
-struct to_json_fn
-{
-    template<typename BasicJsonType, typename T>
-    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
-    -> decltype(to_json(j, std::forward<T>(val)), void())
-    {
-        return to_json(j, std::forward<T>(val));
-    }
-};
-}  // namespace detail
-
-/// namespace to hold default `to_json` function
-namespace
-{
-constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
-} // namespace
-} // namespace nlohmann
-
-
-namespace nlohmann
-{
-
-template<typename, typename>
-struct adl_serializer
-{
-    /*!
-    @brief convert a JSON value to any value type
-
-    This function is usually called by the `get()` function of the
-    @ref basic_json class (either explicit or via conversion operators).
-
-    @param[in] j        JSON value to read from
-    @param[in,out] val  value to write to
-    */
-    template<typename BasicJsonType, typename ValueType>
-    static auto from_json(BasicJsonType&& j, ValueType& val) noexcept(
-        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
-    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
-    {
-        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
-    }
-
-    /*!
-    @brief convert any value type to a JSON value
-
-    This function is usually called by the constructors of the @ref basic_json
-    class.
-
-    @param[in,out] j  JSON value to write to
-    @param[in] val    value to read from
-    */
-    template <typename BasicJsonType, typename ValueType>
-    static auto to_json(BasicJsonType& j, ValueType&& val) noexcept(
-        noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
-    -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), void())
-    {
-        ::nlohmann::to_json(j, std::forward<ValueType>(val));
-    }
-};
-
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/conversions/from_json.hpp>
-
-// #include <nlohmann/detail/conversions/to_json.hpp>
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/input/binary_reader.hpp>
-
-
-#include <algorithm> // generate_n
-#include <array> // array
-#include <cassert> // assert
-#include <cmath> // ldexp
-#include <cstddef> // size_t
-#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
-#include <cstdio> // snprintf
-#include <cstring> // memcpy
-#include <iterator> // back_inserter
-#include <limits> // numeric_limits
-#include <string> // char_traits, string
-#include <utility> // make_pair, move
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-
-#include <array> // array
-#include <cassert> // assert
-#include <cstddef> // size_t
-#include <cstdio> //FILE *
-#include <cstring> // strlen
-#include <istream> // istream
-#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
-#include <memory> // shared_ptr, make_shared, addressof
-#include <numeric> // accumulate
-#include <string> // string, char_traits
-#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
-#include <utility> // pair, declval
-
-// #include <nlohmann/detail/iterators/iterator_traits.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/// the supported input formats
-enum class input_format_t { json, cbor, msgpack, ubjson, bson };
-
-////////////////////
-// input adapters //
-////////////////////
-
-/*!
-@brief abstract input adapter interface
-
-Produces a stream of std::char_traits<char>::int_type characters from a
-std::istream, a buffer, or some other input type. Accepts the return of
-exactly one non-EOF character for future input. The int_type characters
-returned consist of all valid char values as positive values (typically
-unsigned char), plus an EOF value outside that range, specified by the value
-of the function std::char_traits<char>::eof(). This value is typically -1, but
-could be any arbitrary value which is not a valid char value.
-*/
-struct input_adapter_protocol
-{
-    /// get a character [0,255] or std::char_traits<char>::eof().
-    virtual std::char_traits<char>::int_type get_character() = 0;
-    virtual ~input_adapter_protocol() = default;
-};
-
-/// a type to simplify interfaces
-using input_adapter_t = std::shared_ptr<input_adapter_protocol>;
-
-/*!
-Input adapter for stdio file access. This adapter read only 1 byte and do not use any
- buffer. This adapter is a very low level adapter.
-*/
-class file_input_adapter : public input_adapter_protocol
-{
-  public:
-    JSON_HEDLEY_NON_NULL(2)
-    explicit file_input_adapter(std::FILE* f)  noexcept
-        : m_file(f)
-    {}
-
-    // make class move-only
-    file_input_adapter(const file_input_adapter&) = delete;
-    file_input_adapter(file_input_adapter&&) = default;
-    file_input_adapter& operator=(const file_input_adapter&) = delete;
-    file_input_adapter& operator=(file_input_adapter&&) = default;
-    ~file_input_adapter() override = default;
-
-    std::char_traits<char>::int_type get_character() noexcept override
-    {
-        return std::fgetc(m_file);
-    }
-
-  private:
-    /// the file pointer to read from
-    std::FILE* m_file;
-};
-
-
-/*!
-Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
-beginning of input. Does not support changing the underlying std::streambuf
-in mid-input. Maintains underlying std::istream and std::streambuf to support
-subsequent use of standard std::istream operations to process any input
-characters following those used in parsing the JSON input.  Clears the
-std::istream flags; any input errors (e.g., EOF) will be detected by the first
-subsequent call for input from the std::istream.
-*/
-class input_stream_adapter : public input_adapter_protocol
-{
-  public:
-    ~input_stream_adapter() override
-    {
-        // clear stream flags; we use underlying streambuf I/O, do not
-        // maintain ifstream flags, except eof
-        is.clear(is.rdstate() & std::ios::eofbit);
-    }
-
-    explicit input_stream_adapter(std::istream& i)
-        : is(i), sb(*i.rdbuf())
-    {}
-
-    // delete because of pointer members
-    input_stream_adapter(const input_stream_adapter&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&) = delete;
-    input_stream_adapter(input_stream_adapter&&) = delete;
-    input_stream_adapter& operator=(input_stream_adapter&&) = delete;
-
-    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
-    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
-    // end up as the same value, eg. 0xFFFFFFFF.
-    std::char_traits<char>::int_type get_character() override
-    {
-        auto res = sb.sbumpc();
-        // set eof manually, as we don't use the istream interface.
-        if (res == EOF)
-        {
-            is.clear(is.rdstate() | std::ios::eofbit);
-        }
-        return res;
-    }
-
-  private:
-    /// the associated input stream
-    std::istream& is;
-    std::streambuf& sb;
-};
-
-/// input adapter for buffer input
-class input_buffer_adapter : public input_adapter_protocol
-{
-  public:
-    input_buffer_adapter(const char* b, const std::size_t l) noexcept
-        : cursor(b), limit(b == nullptr ? nullptr : (b + l))
-    {}
-
-    // delete because of pointer members
-    input_buffer_adapter(const input_buffer_adapter&) = delete;
-    input_buffer_adapter& operator=(input_buffer_adapter&) = delete;
-    input_buffer_adapter(input_buffer_adapter&&) = delete;
-    input_buffer_adapter& operator=(input_buffer_adapter&&) = delete;
-    ~input_buffer_adapter() override = default;
-
-    std::char_traits<char>::int_type get_character() noexcept override
-    {
-        if (JSON_HEDLEY_LIKELY(cursor < limit))
-        {
-            assert(cursor != nullptr and limit != nullptr);
-            return std::char_traits<char>::to_int_type(*(cursor++));
-        }
-
-        return std::char_traits<char>::eof();
-    }
-
-  private:
-    /// pointer to the current character
-    const char* cursor;
-    /// pointer past the last character
-    const char* const limit;
-};
-
-template<typename WideStringType, size_t T>
-struct wide_string_input_helper
-{
-    // UTF-32
-    static void fill_buffer(const WideStringType& str,
-                            size_t& current_wchar,
-                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
-                            size_t& utf8_bytes_index,
-                            size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (current_wchar == str.size())
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
-
-            // UTF-32 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u) & 0x1Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
-                utf8_bytes_filled = 2;
-            }
-            else if (wc <= 0xFFFF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u) & 0x0Fu));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
-                utf8_bytes_filled = 3;
-            }
-            else if (wc <= 0x10FFFF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((wc >> 18u) & 0x07u));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 12u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
-                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
-                utf8_bytes_filled = 4;
-            }
-            else
-            {
-                // unknown character
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-        }
-    }
-};
-
-template<typename WideStringType>
-struct wide_string_input_helper<WideStringType, 2>
-{
-    // UTF-16
-    static void fill_buffer(const WideStringType& str,
-                            size_t& current_wchar,
-                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
-                            size_t& utf8_bytes_index,
-                            size_t& utf8_bytes_filled)
-    {
-        utf8_bytes_index = 0;
-
-        if (current_wchar == str.size())
-        {
-            utf8_bytes[0] = std::char_traits<char>::eof();
-            utf8_bytes_filled = 1;
-        }
-        else
-        {
-            // get the current character
-            const auto wc = static_cast<unsigned int>(str[current_wchar++]);
-
-            // UTF-16 to UTF-8 encoding
-            if (wc < 0x80)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                utf8_bytes_filled = 1;
-            }
-            else if (wc <= 0x7FF)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((wc >> 6u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
-                utf8_bytes_filled = 2;
-            }
-            else if (0xD800 > wc or wc >= 0xE000)
-            {
-                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((wc >> 12u)));
-                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((wc >> 6u) & 0x3Fu));
-                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (wc & 0x3Fu));
-                utf8_bytes_filled = 3;
-            }
-            else
-            {
-                if (current_wchar < str.size())
-                {
-                    const auto wc2 = static_cast<unsigned int>(str[current_wchar++]);
-                    const auto charcode = 0x10000u + (((wc & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
-                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
-                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
-                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
-                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
-                    utf8_bytes_filled = 4;
-                }
-                else
-                {
-                    // unknown character
-                    ++current_wchar;
-                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
-                    utf8_bytes_filled = 1;
-                }
-            }
-        }
-    }
-};
-
-template<typename WideStringType>
-class wide_string_input_adapter : public input_adapter_protocol
-{
-  public:
-    explicit wide_string_input_adapter(const WideStringType& w) noexcept
-        : str(w)
-    {}
-
-    std::char_traits<char>::int_type get_character() noexcept override
-    {
-        // check if buffer needs to be filled
-        if (utf8_bytes_index == utf8_bytes_filled)
-        {
-            fill_buffer<sizeof(typename WideStringType::value_type)>();
-
-            assert(utf8_bytes_filled > 0);
-            assert(utf8_bytes_index == 0);
-        }
-
-        // use buffer
-        assert(utf8_bytes_filled > 0);
-        assert(utf8_bytes_index < utf8_bytes_filled);
-        return utf8_bytes[utf8_bytes_index++];
-    }
-
-  private:
-    template<size_t T>
-    void fill_buffer()
-    {
-        wide_string_input_helper<WideStringType, T>::fill_buffer(str, current_wchar, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
-    }
-
-    /// the wstring to process
-    const WideStringType& str;
-
-    /// index of the current wchar in str
-    std::size_t current_wchar = 0;
-
-    /// a buffer for UTF-8 bytes
-    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
-
-    /// index to the utf8_codes array for the next valid byte
-    std::size_t utf8_bytes_index = 0;
-    /// number of valid bytes in the utf8_codes array
-    std::size_t utf8_bytes_filled = 0;
-};
-
-class input_adapter
-{
-  public:
-    // native support
-    JSON_HEDLEY_NON_NULL(2)
-    input_adapter(std::FILE* file)
-        : ia(std::make_shared<file_input_adapter>(file)) {}
-    /// input adapter for input stream
-    input_adapter(std::istream& i)
-        : ia(std::make_shared<input_stream_adapter>(i)) {}
-
-    /// input adapter for input stream
-    input_adapter(std::istream&& i)
-        : ia(std::make_shared<input_stream_adapter>(i)) {}
-
-    input_adapter(const std::wstring& ws)
-        : ia(std::make_shared<wide_string_input_adapter<std::wstring>>(ws)) {}
-
-    input_adapter(const std::u16string& ws)
-        : ia(std::make_shared<wide_string_input_adapter<std::u16string>>(ws)) {}
-
-    input_adapter(const std::u32string& ws)
-        : ia(std::make_shared<wide_string_input_adapter<std::u32string>>(ws)) {}
-
-    /// input adapter for buffer
-    template<typename CharT,
-             typename std::enable_if<
-                 std::is_pointer<CharT>::value and
-                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
-                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
-                 int>::type = 0>
-    input_adapter(CharT b, std::size_t l)
-        : ia(std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(b), l)) {}
-
-    // derived support
-
-    /// input adapter for string literal
-    template<typename CharT,
-             typename std::enable_if<
-                 std::is_pointer<CharT>::value and
-                 std::is_integral<typename std::remove_pointer<CharT>::type>::value and
-                 sizeof(typename std::remove_pointer<CharT>::type) == 1,
-                 int>::type = 0>
-    input_adapter(CharT b)
-        : input_adapter(reinterpret_cast<const char*>(b),
-                        std::strlen(reinterpret_cast<const char*>(b))) {}
-
-    /// input adapter for iterator range with contiguous storage
-    template<class IteratorType,
-             typename std::enable_if<
-                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
-                 int>::type = 0>
-    input_adapter(IteratorType first, IteratorType last)
-    {
-#ifndef NDEBUG
-        // assertion to check that the iterator range is indeed contiguous,
-        // see http://stackoverflow.com/a/35008842/266378 for more discussion
-        const auto is_contiguous = std::accumulate(
-                                       first, last, std::pair<bool, int>(true, 0),
-                                       [&first](std::pair<bool, int> res, decltype(*first) val)
-        {
-            res.first &= (val == *(std::next(std::addressof(*first), res.second++)));
-            return res;
-        }).first;
-        assert(is_contiguous);
-#endif
-
-        // assertion to check that each element is 1 byte long
-        static_assert(
-            sizeof(typename iterator_traits<IteratorType>::value_type) == 1,
-            "each element in the iterator range must have the size of 1 byte");
-
-        const auto len = static_cast<size_t>(std::distance(first, last));
-        if (JSON_HEDLEY_LIKELY(len > 0))
-        {
-            // there is at least one element: use the address of first
-            ia = std::make_shared<input_buffer_adapter>(reinterpret_cast<const char*>(&(*first)), len);
-        }
-        else
-        {
-            // the address of first cannot be used: use nullptr
-            ia = std::make_shared<input_buffer_adapter>(nullptr, len);
-        }
-    }
-
-    /// input adapter for array
-    template<class T, std::size_t N>
-    input_adapter(T (&array)[N])
-        : input_adapter(std::begin(array), std::end(array)) {}
-
-    /// input adapter for contiguous container
-    template<class ContiguousContainer, typename
-             std::enable_if<not std::is_pointer<ContiguousContainer>::value and
-                            std::is_base_of<std::random_access_iterator_tag, typename iterator_traits<decltype(std::begin(std::declval<ContiguousContainer const>()))>::iterator_category>::value,
-                            int>::type = 0>
-    input_adapter(const ContiguousContainer& c)
-        : input_adapter(std::begin(c), std::end(c)) {}
-
-    operator input_adapter_t()
-    {
-        return ia;
-    }
-
-  private:
-    /// the actual adapter
-    input_adapter_t ia = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/json_sax.hpp>
-
-
-#include <cassert> // assert
-#include <cstddef>
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-
-/*!
-@brief SAX interface
-
-This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
-Each function is called in different situations while the input is parsed. The
-boolean return value informs the parser whether to continue processing the
-input.
-*/
-template<typename BasicJsonType>
-struct json_sax
-{
-    /// type for (signed) integers
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    /// type for unsigned integers
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    /// type for floating-point numbers
-    using number_float_t = typename BasicJsonType::number_float_t;
-    /// type for strings
-    using string_t = typename BasicJsonType::string_t;
-
-    /*!
-    @brief a null value was read
-    @return whether parsing should proceed
-    */
-    virtual bool null() = 0;
-
-    /*!
-    @brief a boolean value was read
-    @param[in] val  boolean value
-    @return whether parsing should proceed
-    */
-    virtual bool boolean(bool val) = 0;
-
-    /*!
-    @brief an integer number was read
-    @param[in] val  integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_integer(number_integer_t val) = 0;
-
-    /*!
-    @brief an unsigned integer number was read
-    @param[in] val  unsigned integer value
-    @return whether parsing should proceed
-    */
-    virtual bool number_unsigned(number_unsigned_t val) = 0;
-
-    /*!
-    @brief an floating-point number was read
-    @param[in] val  floating-point value
-    @param[in] s    raw token value
-    @return whether parsing should proceed
-    */
-    virtual bool number_float(number_float_t val, const string_t& s) = 0;
-
-    /*!
-    @brief a string was read
-    @param[in] val  string value
-    @return whether parsing should proceed
-    @note It is safe to move the passed string.
-    */
-    virtual bool string(string_t& val) = 0;
-
-    /*!
-    @brief the beginning of an object was read
-    @param[in] elements  number of object elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_object(std::size_t elements) = 0;
-
-    /*!
-    @brief an object key was read
-    @param[in] val  object key
-    @return whether parsing should proceed
-    @note It is safe to move the passed string.
-    */
-    virtual bool key(string_t& val) = 0;
-
-    /*!
-    @brief the end of an object was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_object() = 0;
-
-    /*!
-    @brief the beginning of an array was read
-    @param[in] elements  number of array elements or -1 if unknown
-    @return whether parsing should proceed
-    @note binary formats may report the number of elements
-    */
-    virtual bool start_array(std::size_t elements) = 0;
-
-    /*!
-    @brief the end of an array was read
-    @return whether parsing should proceed
-    */
-    virtual bool end_array() = 0;
-
-    /*!
-    @brief a parse error occurred
-    @param[in] position    the position in the input where the error occurs
-    @param[in] last_token  the last read token
-    @param[in] ex          an exception object describing the error
-    @return whether parsing should proceed (must return false)
-    */
-    virtual bool parse_error(std::size_t position,
-                             const std::string& last_token,
-                             const detail::exception& ex) = 0;
-
-    virtual ~json_sax() = default;
-};
-
-
-namespace detail
-{
-/*!
-@brief SAX implementation to create a JSON value from SAX events
-
-This class implements the @ref json_sax interface and processes the SAX events
-to create a JSON value which makes it basically a DOM parser. The structure or
-hierarchy of the JSON value is managed by the stack `ref_stack` which contains
-a pointer to the respective array or object for each recursion depth.
-
-After successful parsing, the value that is passed by reference to the
-constructor contains the parsed value.
-
-@tparam BasicJsonType  the JSON type
-*/
-template<typename BasicJsonType>
-class json_sax_dom_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-
-    /*!
-    @param[in, out] r  reference to a JSON value that is manipulated while
-                       parsing
-    @param[in] allow_exceptions_  whether parse errors yield exceptions
-    */
-    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
-        : root(r), allow_exceptions(allow_exceptions_)
-    {}
-
-    // make class move-only
-    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser(json_sax_dom_parser&&) = default;
-    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
-    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default;
-    ~json_sax_dom_parser() = default;
-
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t& /*unused*/)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
-
-        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408,
-                                            "excessive object size: " + std::to_string(len)));
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        // add null at given key and store the reference for later
-        object_element = &(ref_stack.back()->m_value.object->operator[](val));
-        return true;
-    }
-
-    bool end_object()
-    {
-        ref_stack.pop_back();
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
-
-        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408,
-                                            "excessive array size: " + std::to_string(len)));
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        ref_stack.pop_back();
-        return true;
-    }
-
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const detail::exception& ex)
-    {
-        errored = true;
-        if (allow_exceptions)
-        {
-            // determine the proper exception type from the id
-            switch ((ex.id / 100) % 100)
-            {
-                case 1:
-                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
-                case 4:
-                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
-                // LCOV_EXCL_START
-                case 2:
-                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
-                case 3:
-                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
-                case 5:
-                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
-                default:
-                    assert(false);
-                    // LCOV_EXCL_STOP
-            }
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-    */
-    template<typename Value>
-    JSON_HEDLEY_RETURNS_NON_NULL
-    BasicJsonType* handle_value(Value&& v)
-    {
-        if (ref_stack.empty())
-        {
-            root = BasicJsonType(std::forward<Value>(v));
-            return &root;
-        }
-
-        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
-
-        if (ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
-            return &(ref_stack.back()->m_value.array->back());
-        }
-
-        assert(ref_stack.back()->is_object());
-        assert(object_element);
-        *object_element = BasicJsonType(std::forward<Value>(v));
-        return object_element;
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack {};
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-};
-
-template<typename BasicJsonType>
-class json_sax_dom_callback_parser
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using parser_callback_t = typename BasicJsonType::parser_callback_t;
-    using parse_event_t = typename BasicJsonType::parse_event_t;
-
-    json_sax_dom_callback_parser(BasicJsonType& r,
-                                 const parser_callback_t cb,
-                                 const bool allow_exceptions_ = true)
-        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
-    {
-        keep_stack.push_back(true);
-    }
-
-    // make class move-only
-    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default;
-    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
-    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default;
-    ~json_sax_dom_callback_parser() = default;
-
-    bool null()
-    {
-        handle_value(nullptr);
-        return true;
-    }
-
-    bool boolean(bool val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_integer(number_integer_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool number_float(number_float_t val, const string_t& /*unused*/)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool string(string_t& val)
-    {
-        handle_value(val);
-        return true;
-    }
-
-    bool start_object(std::size_t len)
-    {
-        // check callback for object start
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::object, true);
-        ref_stack.push_back(val.second);
-
-        // check object limit
-        if (ref_stack.back() and JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len)));
-        }
-
-        return true;
-    }
-
-    bool key(string_t& val)
-    {
-        BasicJsonType k = BasicJsonType(val);
-
-        // check callback for key
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
-        key_keep_stack.push_back(keep);
-
-        // add discarded value at given key and store the reference for later
-        if (keep and ref_stack.back())
-        {
-            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
-        }
-
-        return true;
-    }
-
-    bool end_object()
-    {
-        if (ref_stack.back() and not callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
-        {
-            // discard object
-            *ref_stack.back() = discarded;
-        }
-
-        assert(not ref_stack.empty());
-        assert(not keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        if (not ref_stack.empty() and ref_stack.back() and ref_stack.back()->is_object())
-        {
-            // remove discarded value
-            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
-            {
-                if (it->is_discarded())
-                {
-                    ref_stack.back()->erase(it);
-                    break;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    bool start_array(std::size_t len)
-    {
-        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
-        keep_stack.push_back(keep);
-
-        auto val = handle_value(BasicJsonType::value_t::array, true);
-        ref_stack.push_back(val.second);
-
-        // check array limit
-        if (ref_stack.back() and JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) and len > ref_stack.back()->max_size()))
-        {
-            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len)));
-        }
-
-        return true;
-    }
-
-    bool end_array()
-    {
-        bool keep = true;
-
-        if (ref_stack.back())
-        {
-            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
-            if (not keep)
-            {
-                // discard array
-                *ref_stack.back() = discarded;
-            }
-        }
-
-        assert(not ref_stack.empty());
-        assert(not keep_stack.empty());
-        ref_stack.pop_back();
-        keep_stack.pop_back();
-
-        // remove discarded value
-        if (not keep and not ref_stack.empty() and ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->pop_back();
-        }
-
-        return true;
-    }
-
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
-                     const detail::exception& ex)
-    {
-        errored = true;
-        if (allow_exceptions)
-        {
-            // determine the proper exception type from the id
-            switch ((ex.id / 100) % 100)
-            {
-                case 1:
-                    JSON_THROW(*static_cast<const detail::parse_error*>(&ex));
-                case 4:
-                    JSON_THROW(*static_cast<const detail::out_of_range*>(&ex));
-                // LCOV_EXCL_START
-                case 2:
-                    JSON_THROW(*static_cast<const detail::invalid_iterator*>(&ex));
-                case 3:
-                    JSON_THROW(*static_cast<const detail::type_error*>(&ex));
-                case 5:
-                    JSON_THROW(*static_cast<const detail::other_error*>(&ex));
-                default:
-                    assert(false);
-                    // LCOV_EXCL_STOP
-            }
-        }
-        return false;
-    }
-
-    constexpr bool is_errored() const
-    {
-        return errored;
-    }
-
-  private:
-    /*!
-    @param[in] v  value to add to the JSON value we build during parsing
-    @param[in] skip_callback  whether we should skip calling the callback
-               function; this is required after start_array() and
-               start_object() SAX events, because otherwise we would call the
-               callback function with an empty array or object, respectively.
-
-    @invariant If the ref stack is empty, then the passed value will be the new
-               root.
-    @invariant If the ref stack contains a value, then it is an array or an
-               object to which we can add elements
-
-    @return pair of boolean (whether value should be kept) and pointer (to the
-            passed value in the ref_stack hierarchy; nullptr if not kept)
-    */
-    template<typename Value>
-    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
-    {
-        assert(not keep_stack.empty());
-
-        // do not handle this value if we know it would be added to a discarded
-        // container
-        if (not keep_stack.back())
-        {
-            return {false, nullptr};
-        }
-
-        // create value
-        auto value = BasicJsonType(std::forward<Value>(v));
-
-        // check callback
-        const bool keep = skip_callback or callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
-
-        // do not handle this value if we just learnt it shall be discarded
-        if (not keep)
-        {
-            return {false, nullptr};
-        }
-
-        if (ref_stack.empty())
-        {
-            root = std::move(value);
-            return {true, &root};
-        }
-
-        // skip this value if we already decided to skip the parent
-        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
-        if (not ref_stack.back())
-        {
-            return {false, nullptr};
-        }
-
-        // we now only expect arrays and objects
-        assert(ref_stack.back()->is_array() or ref_stack.back()->is_object());
-
-        // array
-        if (ref_stack.back()->is_array())
-        {
-            ref_stack.back()->m_value.array->push_back(std::move(value));
-            return {true, &(ref_stack.back()->m_value.array->back())};
-        }
-
-        // object
-        assert(ref_stack.back()->is_object());
-        // check if we should store an element for the current key
-        assert(not key_keep_stack.empty());
-        const bool store_element = key_keep_stack.back();
-        key_keep_stack.pop_back();
-
-        if (not store_element)
-        {
-            return {false, nullptr};
-        }
-
-        assert(object_element);
-        *object_element = std::move(value);
-        return {true, object_element};
-    }
-
-    /// the parsed JSON value
-    BasicJsonType& root;
-    /// stack to model hierarchy of values
-    std::vector<BasicJsonType*> ref_stack {};
-    /// stack to manage which values to keep
-    std::vector<bool> keep_stack {};
-    /// stack to manage which object keys to keep
-    std::vector<bool> key_keep_stack {};
-    /// helper to hold the reference for the next object element
-    BasicJsonType* object_element = nullptr;
-    /// whether a syntax error occurred
-    bool errored = false;
-    /// callback function
-    const parser_callback_t callback = nullptr;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-    /// a discarded value for the callback
-    BasicJsonType discarded = BasicJsonType::value_t::discarded;
-};
-
-template<typename BasicJsonType>
-class json_sax_acceptor
-{
-  public:
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-
-    bool null()
-    {
-        return true;
-    }
-
-    bool boolean(bool /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_integer(number_integer_t /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_unsigned(number_unsigned_t /*unused*/)
-    {
-        return true;
-    }
-
-    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool string(string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool start_object(std::size_t  /*unused*/ = std::size_t(-1))
-    {
-        return true;
-    }
-
-    bool key(string_t& /*unused*/)
-    {
-        return true;
-    }
-
-    bool end_object()
-    {
-        return true;
-    }
-
-    bool start_array(std::size_t  /*unused*/ = std::size_t(-1))
-    {
-        return true;
-    }
-
-    bool end_array()
-    {
-        return true;
-    }
-
-    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
-    {
-        return false;
-    }
-};
-}  // namespace detail
-
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
-
-#include <cstdint> // size_t
-#include <utility> // declval
-#include <string> // string
-
-// #include <nlohmann/detail/meta/detected.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template <typename T>
-using null_function_t = decltype(std::declval<T&>().null());
-
-template <typename T>
-using boolean_function_t =
-    decltype(std::declval<T&>().boolean(std::declval<bool>()));
-
-template <typename T, typename Integer>
-using number_integer_function_t =
-    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
-
-template <typename T, typename Unsigned>
-using number_unsigned_function_t =
-    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
-
-template <typename T, typename Float, typename String>
-using number_float_function_t = decltype(std::declval<T&>().number_float(
-                                    std::declval<Float>(), std::declval<const String&>()));
-
-template <typename T, typename String>
-using string_function_t =
-    decltype(std::declval<T&>().string(std::declval<String&>()));
-
-template <typename T>
-using start_object_function_t =
-    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
-
-template <typename T, typename String>
-using key_function_t =
-    decltype(std::declval<T&>().key(std::declval<String&>()));
-
-template <typename T>
-using end_object_function_t = decltype(std::declval<T&>().end_object());
-
-template <typename T>
-using start_array_function_t =
-    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
-
-template <typename T>
-using end_array_function_t = decltype(std::declval<T&>().end_array());
-
-template <typename T, typename Exception>
-using parse_error_function_t = decltype(std::declval<T&>().parse_error(
-        std::declval<std::size_t>(), std::declval<const std::string&>(),
-        std::declval<const Exception&>()));
-
-template <typename SAX, typename BasicJsonType>
-struct is_sax
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static constexpr bool value =
-        is_detected_exact<bool, null_function_t, SAX>::value &&
-        is_detected_exact<bool, boolean_function_t, SAX>::value &&
-        is_detected_exact<bool, number_integer_function_t, SAX,
-        number_integer_t>::value &&
-        is_detected_exact<bool, number_unsigned_function_t, SAX,
-        number_unsigned_t>::value &&
-        is_detected_exact<bool, number_float_function_t, SAX, number_float_t,
-        string_t>::value &&
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, start_object_function_t, SAX>::value &&
-        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
-        is_detected_exact<bool, end_object_function_t, SAX>::value &&
-        is_detected_exact<bool, start_array_function_t, SAX>::value &&
-        is_detected_exact<bool, end_array_function_t, SAX>::value &&
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
-};
-
-template <typename SAX, typename BasicJsonType>
-struct is_sax_static_asserts
-{
-  private:
-    static_assert(is_basic_json<BasicJsonType>::value,
-                  "BasicJsonType must be of type basic_json<...>");
-
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using exception_t = typename BasicJsonType::exception;
-
-  public:
-    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
-                  "Missing/invalid function: bool null()");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
-                  "Missing/invalid function: bool boolean(bool)");
-    static_assert(
-        is_detected_exact<bool, number_integer_function_t, SAX,
-        number_integer_t>::value,
-        "Missing/invalid function: bool number_integer(number_integer_t)");
-    static_assert(
-        is_detected_exact<bool, number_unsigned_function_t, SAX,
-        number_unsigned_t>::value,
-        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
-    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
-                  number_float_t, string_t>::value,
-                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
-    static_assert(
-        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
-        "Missing/invalid function: bool string(string_t&)");
-    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_object(std::size_t)");
-    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
-                  "Missing/invalid function: bool key(string_t&)");
-    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_object()");
-    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool start_array(std::size_t)");
-    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
-                  "Missing/invalid function: bool end_array()");
-    static_assert(
-        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
-        "Missing/invalid function: bool parse_error(std::size_t, const "
-        "std::string&, const exception&)");
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////
-// binary reader //
-///////////////////
-
-/*!
-@brief deserialization of CBOR, MessagePack, and UBJSON values
-*/
-template<typename BasicJsonType, typename SAX = json_sax_dom_parser<BasicJsonType>>
-class binary_reader
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using json_sax_t = SAX;
-
-  public:
-    /*!
-    @brief create a binary reader
-
-    @param[in] adapter  input adapter to read from
-    */
-    explicit binary_reader(input_adapter_t adapter) : ia(std::move(adapter))
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-        assert(ia);
-    }
-
-    // make class move-only
-    binary_reader(const binary_reader&) = delete;
-    binary_reader(binary_reader&&) = default;
-    binary_reader& operator=(const binary_reader&) = delete;
-    binary_reader& operator=(binary_reader&&) = default;
-    ~binary_reader() = default;
-
-    /*!
-    @param[in] format  the binary format to parse
-    @param[in] sax_    a SAX event processor
-    @param[in] strict  whether to expect the input to be consumed completed
-
-    @return
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    bool sax_parse(const input_format_t format,
-                   json_sax_t* sax_,
-                   const bool strict = true)
-    {
-        sax = sax_;
-        bool result = false;
-
-        switch (format)
-        {
-            case input_format_t::bson:
-                result = parse_bson_internal();
-                break;
-
-            case input_format_t::cbor:
-                result = parse_cbor_internal();
-                break;
-
-            case input_format_t::msgpack:
-                result = parse_msgpack_internal();
-                break;
-
-            case input_format_t::ubjson:
-                result = parse_ubjson_internal();
-                break;
-
-            default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
-        }
-
-        // strict mode: next byte must be EOF
-        if (result and strict)
-        {
-            if (format == input_format_t::ubjson)
-            {
-                get_ignore_noop();
-            }
-            else
-            {
-                get();
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char>::eof()))
-            {
-                return sax->parse_error(chars_read, get_token_string(),
-                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value")));
-            }
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief determine system byte order
-
-    @return true if and only if system's byte order is little endian
-
-    @note from http://stackoverflow.com/a/1001328/266378
-    */
-    static constexpr bool little_endianess(int num = 1) noexcept
-    {
-        return *reinterpret_cast<char*>(&num) == 1;
-    }
-
-  private:
-    //////////
-    // BSON //
-    //////////
-
-    /*!
-    @brief Reads in a BSON-object and passes it to the SAX-parser.
-    @return whether a valid BSON-value was passed to the SAX parser
-    */
-    bool parse_bson_internal()
-    {
-        std::int32_t document_size;
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(not parse_bson_element_list(/*is_array*/false)))
-        {
-            return false;
-        }
-
-        return sax->end_object();
-    }
-
-    /*!
-    @brief Parses a C-style string from the BSON input.
-    @param[in, out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @return `true` if the \x00-byte indicating the end of the string was
-             encountered before the EOF; false` indicates an unexpected EOF.
-    */
-    bool get_bson_cstr(string_t& result)
-    {
-        auto out = std::back_inserter(result);
-        while (true)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::bson, "cstring")))
-            {
-                return false;
-            }
-            if (current == 0x00)
-            {
-                return true;
-            }
-            *out++ = static_cast<char>(current);
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief Parses a zero-terminated string of length @a len from the BSON
-           input.
-    @param[in] len  The length (including the zero-byte at the end) of the
-                    string to be read.
-    @param[in, out] result  A reference to the string variable where the read
-                            string is to be stored.
-    @tparam NumberType The type of the length @a len
-    @pre len >= 1
-    @return `true` if the string was successfully parsed
-    */
-    template<typename NumberType>
-    bool get_bson_string(const NumberType len, string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(len < 1))
-        {
-            auto last_token = get_token_string();
-            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string")));
-        }
-
-        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) and get() != std::char_traits<char>::eof();
-    }
-
-    /*!
-    @brief Read a BSON document element of the given @a element_type.
-    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
-    @param[in] element_type_parse_position The position in the input stream,
-               where the `element_type` was read.
-    @warning Not all BSON element types are supported yet. An unsupported
-             @a element_type will give rise to a parse_error.114:
-             Unsupported BSON record type 0x...
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_internal(const int element_type,
-                                     const std::size_t element_type_parse_position)
-    {
-        switch (element_type)
-        {
-            case 0x01: // double
-            {
-                double number;
-                return get_number<double, true>(input_format_t::bson, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0x02: // string
-            {
-                std::int32_t len;
-                string_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, len) and get_bson_string(len, value) and sax->string(value);
-            }
-
-            case 0x03: // object
-            {
-                return parse_bson_internal();
-            }
-
-            case 0x04: // array
-            {
-                return parse_bson_array();
-            }
-
-            case 0x08: // boolean
-            {
-                return sax->boolean(get() != 0);
-            }
-
-            case 0x0A: // null
-            {
-                return sax->null();
-            }
-
-            case 0x10: // int32
-            {
-                std::int32_t value;
-                return get_number<std::int32_t, true>(input_format_t::bson, value) and sax->number_integer(value);
-            }
-
-            case 0x12: // int64
-            {
-                std::int64_t value;
-                return get_number<std::int64_t, true>(input_format_t::bson, value) and sax->number_integer(value);
-            }
-
-            default: // anything else not supported (yet)
-            {
-                std::array<char, 3> cr{{}};
-                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type));
-                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data())));
-            }
-        }
-    }
-
-    /*!
-    @brief Read a BSON element list (as specified in the BSON-spec)
-
-    The same binary layout is used for objects and arrays, hence it must be
-    indicated with the argument @a is_array which one is expected
-    (true --> array, false --> object).
-
-    @param[in] is_array Determines if the element list being read is to be
-                        treated as an object (@a is_array == false), or as an
-                        array (@a is_array == true).
-    @return whether a valid BSON-object/array was passed to the SAX parser
-    */
-    bool parse_bson_element_list(const bool is_array)
-    {
-        string_t key;
-        while (int element_type = get())
-        {
-            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::bson, "element list")))
-            {
-                return false;
-            }
-
-            const std::size_t element_type_parse_position = chars_read;
-            if (JSON_HEDLEY_UNLIKELY(not get_bson_cstr(key)))
-            {
-                return false;
-            }
-
-            if (not is_array and not sax->key(key))
-            {
-                return false;
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(not parse_bson_element_internal(element_type, element_type_parse_position)))
-            {
-                return false;
-            }
-
-            // get_bson_cstr only appends
-            key.clear();
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief Reads an array from the BSON input and passes it to the SAX-parser.
-    @return whether a valid BSON-array was passed to the SAX parser
-    */
-    bool parse_bson_array()
-    {
-        std::int32_t document_size;
-        get_number<std::int32_t, true>(input_format_t::bson, document_size);
-
-        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
-        {
-            return false;
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(not parse_bson_element_list(/*is_array*/true)))
-        {
-            return false;
-        }
-
-        return sax->end_array();
-    }
-
-    //////////
-    // CBOR //
-    //////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether a valid CBOR value was passed to the SAX parser
-    */
-    bool parse_cbor_internal(const bool get_char = true)
-    {
-        switch (get_char ? get() : current)
-        {
-            // EOF
-            case std::char_traits<char>::eof():
-                return unexpect_eof(input_format_t::cbor, "value");
-
-            // Integer 0x00..0x17 (0..23)
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            case 0x18: // Unsigned integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
-            }
-
-            case 0x19: // Unsigned integer (two-byte uint16_t follows)
-            {
-                std::uint16_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
-            }
-
-            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
-            {
-                std::uint32_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
-            }
-
-            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
-            {
-                std::uint64_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_unsigned(number);
-            }
-
-            // Negative integer -1-0x00..-1-0x17 (-1..-24)
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
-
-            case 0x38: // Negative integer (one-byte uint8_t follows)
-            {
-                std::uint8_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
-            {
-                std::uint16_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
-            {
-                std::uint32_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1) - number);
-            }
-
-            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
-            {
-                std::uint64_t number;
-                return get_number(input_format_t::cbor, number) and sax->number_integer(static_cast<number_integer_t>(-1)
-                        - static_cast<number_integer_t>(number));
-            }
-
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                string_t s;
-                return get_cbor_string(s) and sax->string(s);
-            }
-
-            // array (0x00..0x17 data items follow)
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
-
-            case 0x98: // array (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
-            }
-
-            case 0x99: // array (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
-            }
-
-            case 0x9A: // array (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
-            }
-
-            case 0x9B: // array (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_array(static_cast<std::size_t>(len));
-            }
-
-            case 0x9F: // array (indefinite length)
-                return get_cbor_array(std::size_t(-1));
-
-            // map (0x00..0x17 pairs of data items follow)
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu));
-
-            case 0xB8: // map (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xB9: // map (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xBA: // map (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xBB: // map (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len;
-                return get_number(input_format_t::cbor, len) and get_cbor_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xBF: // map (indefinite length)
-                return get_cbor_object(std::size_t(-1));
-
-            case 0xF4: // false
-                return sax->boolean(false);
-
-            case 0xF5: // true
-                return sax->boolean(true);
-
-            case 0xF6: // null
-                return sax->null();
-
-            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
-            {
-                const int byte1_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-                const int byte2_raw = get();
-                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::cbor, "number")))
-                {
-                    return false;
-                }
-
-                const auto byte1 = static_cast<unsigned char>(byte1_raw);
-                const auto byte2 = static_cast<unsigned char>(byte2_raw);
-
-                // code from RFC 7049, Appendix D, Figure 3:
-                // As half-precision floating-point numbers were only added
-                // to IEEE 754 in 2008, today's programming platforms often
-                // still only have limited support for them. It is very
-                // easy to include at least decoding support for them even
-                // without such support. An example of a small decoder for
-                // half-precision floating-point numbers in the C language
-                // is shown in Fig. 3.
-                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
-                const double val = [&half]
-                {
-                    const int exp = (half >> 10u) & 0x1Fu;
-                    const unsigned int mant = half & 0x3FFu;
-                    assert(0 <= exp and exp <= 32);
-                    assert(mant <= 1024);
-                    switch (exp)
-                    {
-                        case 0:
-                            return std::ldexp(mant, -24);
-                        case 31:
-                            return (mant == 0)
-                            ? std::numeric_limits<double>::infinity()
-                            : std::numeric_limits<double>::quiet_NaN();
-                        default:
-                            return std::ldexp(mant + 1024, exp - 25);
-                    }
-                }();
-                return sax->number_float((half & 0x8000u) != 0
-                                         ? static_cast<number_float_t>(-val)
-                                         : static_cast<number_float_t>(val), "");
-            }
-
-            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
-            {
-                float number;
-                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
-            {
-                double number;
-                return get_number(input_format_t::cbor, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            default: // anything else (0xFF is handled inside the other types)
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value")));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a CBOR string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-    Additionally, CBOR's strings with indefinite lengths are supported.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_cbor_string(string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::cbor, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // UTF-8 string (0x00..0x17 bytes follow)
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            {
-                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
-            {
-                std::uint64_t len;
-                return get_number(input_format_t::cbor, len) and get_string(input_format_t::cbor, len, result);
-            }
-
-            case 0x7F: // UTF-8 string (indefinite length)
-            {
-                while (get() != 0xFF)
-                {
-                    string_t chunk;
-                    if (not get_cbor_string(chunk))
-                    {
-                        return false;
-                    }
-                    result.append(chunk);
-                }
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string")));
-            }
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array or std::size_t(-1) for an
-                    array of indefinite size
-    @return whether array creation completed
-    */
-    bool get_cbor_array(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(len)))
-        {
-            return false;
-        }
-
-        if (len != std::size_t(-1))
-        {
-            for (std::size_t i = 0; i < len; ++i)
-            {
-                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal()))
-                {
-                    return false;
-                }
-            }
-        }
-        else
-        {
-            while (get() != 0xFF)
-            {
-                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal(false)))
-                {
-                    return false;
-                }
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object or std::size_t(-1) for an
-                    object of indefinite size
-    @return whether object creation completed
-    */
-    bool get_cbor_object(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(len)))
-        {
-            return false;
-        }
-
-        string_t key;
-        if (len != std::size_t(-1))
-        {
-            for (std::size_t i = 0; i < len; ++i)
-            {
-                get();
-                if (JSON_HEDLEY_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
-                {
-                    return false;
-                }
-
-                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal()))
-                {
-                    return false;
-                }
-                key.clear();
-            }
-        }
-        else
-        {
-            while (get() != 0xFF)
-            {
-                if (JSON_HEDLEY_UNLIKELY(not get_cbor_string(key) or not sax->key(key)))
-                {
-                    return false;
-                }
-
-                if (JSON_HEDLEY_UNLIKELY(not parse_cbor_internal()))
-                {
-                    return false;
-                }
-                key.clear();
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    /////////////
-    // MsgPack //
-    /////////////
-
-    /*!
-    @return whether a valid MessagePack value was passed to the SAX parser
-    */
-    bool parse_msgpack_internal()
-    {
-        switch (get())
-        {
-            // EOF
-            case std::char_traits<char>::eof():
-                return unexpect_eof(input_format_t::msgpack, "value");
-
-            // positive fixint
-            case 0x00:
-            case 0x01:
-            case 0x02:
-            case 0x03:
-            case 0x04:
-            case 0x05:
-            case 0x06:
-            case 0x07:
-            case 0x08:
-            case 0x09:
-            case 0x0A:
-            case 0x0B:
-            case 0x0C:
-            case 0x0D:
-            case 0x0E:
-            case 0x0F:
-            case 0x10:
-            case 0x11:
-            case 0x12:
-            case 0x13:
-            case 0x14:
-            case 0x15:
-            case 0x16:
-            case 0x17:
-            case 0x18:
-            case 0x19:
-            case 0x1A:
-            case 0x1B:
-            case 0x1C:
-            case 0x1D:
-            case 0x1E:
-            case 0x1F:
-            case 0x20:
-            case 0x21:
-            case 0x22:
-            case 0x23:
-            case 0x24:
-            case 0x25:
-            case 0x26:
-            case 0x27:
-            case 0x28:
-            case 0x29:
-            case 0x2A:
-            case 0x2B:
-            case 0x2C:
-            case 0x2D:
-            case 0x2E:
-            case 0x2F:
-            case 0x30:
-            case 0x31:
-            case 0x32:
-            case 0x33:
-            case 0x34:
-            case 0x35:
-            case 0x36:
-            case 0x37:
-            case 0x38:
-            case 0x39:
-            case 0x3A:
-            case 0x3B:
-            case 0x3C:
-            case 0x3D:
-            case 0x3E:
-            case 0x3F:
-            case 0x40:
-            case 0x41:
-            case 0x42:
-            case 0x43:
-            case 0x44:
-            case 0x45:
-            case 0x46:
-            case 0x47:
-            case 0x48:
-            case 0x49:
-            case 0x4A:
-            case 0x4B:
-            case 0x4C:
-            case 0x4D:
-            case 0x4E:
-            case 0x4F:
-            case 0x50:
-            case 0x51:
-            case 0x52:
-            case 0x53:
-            case 0x54:
-            case 0x55:
-            case 0x56:
-            case 0x57:
-            case 0x58:
-            case 0x59:
-            case 0x5A:
-            case 0x5B:
-            case 0x5C:
-            case 0x5D:
-            case 0x5E:
-            case 0x5F:
-            case 0x60:
-            case 0x61:
-            case 0x62:
-            case 0x63:
-            case 0x64:
-            case 0x65:
-            case 0x66:
-            case 0x67:
-            case 0x68:
-            case 0x69:
-            case 0x6A:
-            case 0x6B:
-            case 0x6C:
-            case 0x6D:
-            case 0x6E:
-            case 0x6F:
-            case 0x70:
-            case 0x71:
-            case 0x72:
-            case 0x73:
-            case 0x74:
-            case 0x75:
-            case 0x76:
-            case 0x77:
-            case 0x78:
-            case 0x79:
-            case 0x7A:
-            case 0x7B:
-            case 0x7C:
-            case 0x7D:
-            case 0x7E:
-            case 0x7F:
-                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
-
-            // fixmap
-            case 0x80:
-            case 0x81:
-            case 0x82:
-            case 0x83:
-            case 0x84:
-            case 0x85:
-            case 0x86:
-            case 0x87:
-            case 0x88:
-            case 0x89:
-            case 0x8A:
-            case 0x8B:
-            case 0x8C:
-            case 0x8D:
-            case 0x8E:
-            case 0x8F:
-                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixarray
-            case 0x90:
-            case 0x91:
-            case 0x92:
-            case 0x93:
-            case 0x94:
-            case 0x95:
-            case 0x96:
-            case 0x97:
-            case 0x98:
-            case 0x99:
-            case 0x9A:
-            case 0x9B:
-            case 0x9C:
-            case 0x9D:
-            case 0x9E:
-            case 0x9F:
-                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
-
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            case 0xD9: // str 8
-            case 0xDA: // str 16
-            case 0xDB: // str 32
-            {
-                string_t s;
-                return get_msgpack_string(s) and sax->string(s);
-            }
-
-            case 0xC0: // nil
-                return sax->null();
-
-            case 0xC2: // false
-                return sax->boolean(false);
-
-            case 0xC3: // true
-                return sax->boolean(true);
-
-            case 0xCA: // float 32
-            {
-                float number;
-                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCB: // float 64
-            {
-                double number;
-                return get_number(input_format_t::msgpack, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 0xCC: // uint 8
-            {
-                std::uint8_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
-            }
-
-            case 0xCD: // uint 16
-            {
-                std::uint16_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
-            }
-
-            case 0xCE: // uint 32
-            {
-                std::uint32_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
-            }
-
-            case 0xCF: // uint 64
-            {
-                std::uint64_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_unsigned(number);
-            }
-
-            case 0xD0: // int 8
-            {
-                std::int8_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
-            }
-
-            case 0xD1: // int 16
-            {
-                std::int16_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
-            }
-
-            case 0xD2: // int 32
-            {
-                std::int32_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
-            }
-
-            case 0xD3: // int 64
-            {
-                std::int64_t number;
-                return get_number(input_format_t::msgpack, number) and sax->number_integer(number);
-            }
-
-            case 0xDC: // array 16
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
-            }
-
-            case 0xDD: // array 32
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::msgpack, len) and get_msgpack_array(static_cast<std::size_t>(len));
-            }
-
-            case 0xDE: // map 16
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
-            }
-
-            case 0xDF: // map 32
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::msgpack, len) and get_msgpack_object(static_cast<std::size_t>(len));
-            }
-
-            // negative fixint
-            case 0xE0:
-            case 0xE1:
-            case 0xE2:
-            case 0xE3:
-            case 0xE4:
-            case 0xE5:
-            case 0xE6:
-            case 0xE7:
-            case 0xE8:
-            case 0xE9:
-            case 0xEA:
-            case 0xEB:
-            case 0xEC:
-            case 0xED:
-            case 0xEE:
-            case 0xEF:
-            case 0xF0:
-            case 0xF1:
-            case 0xF2:
-            case 0xF3:
-            case 0xF4:
-            case 0xF5:
-            case 0xF6:
-            case 0xF7:
-            case 0xF8:
-            case 0xF9:
-            case 0xFA:
-            case 0xFB:
-            case 0xFC:
-            case 0xFD:
-            case 0xFE:
-            case 0xFF:
-                return sax->number_integer(static_cast<std::int8_t>(current));
-
-            default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value")));
-            }
-        }
-    }
-
-    /*!
-    @brief reads a MessagePack string
-
-    This function first reads starting bytes to determine the expected
-    string length and then copies this number of bytes into a string.
-
-    @param[out] result  created string
-
-    @return whether string creation completed
-    */
-    bool get_msgpack_string(string_t& result)
-    {
-        if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::msgpack, "string")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            // fixstr
-            case 0xA0:
-            case 0xA1:
-            case 0xA2:
-            case 0xA3:
-            case 0xA4:
-            case 0xA5:
-            case 0xA6:
-            case 0xA7:
-            case 0xA8:
-            case 0xA9:
-            case 0xAA:
-            case 0xAB:
-            case 0xAC:
-            case 0xAD:
-            case 0xAE:
-            case 0xAF:
-            case 0xB0:
-            case 0xB1:
-            case 0xB2:
-            case 0xB3:
-            case 0xB4:
-            case 0xB5:
-            case 0xB6:
-            case 0xB7:
-            case 0xB8:
-            case 0xB9:
-            case 0xBA:
-            case 0xBB:
-            case 0xBC:
-            case 0xBD:
-            case 0xBE:
-            case 0xBF:
-            {
-                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
-            }
-
-            case 0xD9: // str 8
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDA: // str 16
-            {
-                std::uint16_t len;
-                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
-            }
-
-            case 0xDB: // str 32
-            {
-                std::uint32_t len;
-                return get_number(input_format_t::msgpack, len) and get_string(input_format_t::msgpack, len, result);
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string")));
-            }
-        }
-    }
-
-    /*!
-    @param[in] len  the length of the array
-    @return whether array creation completed
-    */
-    bool get_msgpack_array(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(len)))
-        {
-            return false;
-        }
-
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            if (JSON_HEDLEY_UNLIKELY(not parse_msgpack_internal()))
-            {
-                return false;
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @param[in] len  the length of the object
-    @return whether object creation completed
-    */
-    bool get_msgpack_object(const std::size_t len)
-    {
-        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(len)))
-        {
-            return false;
-        }
-
-        string_t key;
-        for (std::size_t i = 0; i < len; ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(not get_msgpack_string(key) or not sax->key(key)))
-            {
-                return false;
-            }
-
-            if (JSON_HEDLEY_UNLIKELY(not parse_msgpack_internal()))
-            {
-                return false;
-            }
-            key.clear();
-        }
-
-        return sax->end_object();
-    }
-
-    ////////////
-    // UBJSON //
-    ////////////
-
-    /*!
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether a valid UBJSON value was passed to the SAX parser
-    */
-    bool parse_ubjson_internal(const bool get_char = true)
-    {
-        return get_ubjson_value(get_char ? get_ignore_noop() : current);
-    }
-
-    /*!
-    @brief reads a UBJSON string
-
-    This function is either called after reading the 'S' byte explicitly
-    indicating a string, or in case of an object key where the 'S' byte can be
-    left out.
-
-    @param[out] result   created string
-    @param[in] get_char  whether a new character should be retrieved from the
-                         input (true, default) or whether the last read
-                         character should be considered instead
-
-    @return whether string creation completed
-    */
-    bool get_ubjson_string(string_t& result, const bool get_char = true)
-    {
-        if (get_char)
-        {
-            get();
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
-        {
-            return false;
-        }
-
-        switch (current)
-        {
-            case 'U':
-            {
-                std::uint8_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'i':
-            {
-                std::int8_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'I':
-            {
-                std::int16_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'l':
-            {
-                std::int32_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            case 'L':
-            {
-                std::int64_t len;
-                return get_number(input_format_t::ubjson, len) and get_string(input_format_t::ubjson, len, result);
-            }
-
-            default:
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string")));
-        }
-    }
-
-    /*!
-    @param[out] result  determined size
-    @return whether size determination completed
-    */
-    bool get_ubjson_size_value(std::size_t& result)
-    {
-        switch (get_ignore_noop())
-        {
-            case 'U':
-            {
-                std::uint8_t number;
-                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'i':
-            {
-                std::int8_t number;
-                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'I':
-            {
-                std::int16_t number;
-                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'l':
-            {
-                std::int32_t number;
-                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            case 'L':
-            {
-                std::int64_t number;
-                if (JSON_HEDLEY_UNLIKELY(not get_number(input_format_t::ubjson, number)))
-                {
-                    return false;
-                }
-                result = static_cast<std::size_t>(number);
-                return true;
-            }
-
-            default:
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size")));
-            }
-        }
-    }
-
-    /*!
-    @brief determine the type and size for a container
-
-    In the optimized UBJSON format, a type and a size can be provided to allow
-    for a more compact representation.
-
-    @param[out] result  pair of the size and the type
-
-    @return whether pair creation completed
-    */
-    bool get_ubjson_size_type(std::pair<std::size_t, int>& result)
-    {
-        result.first = string_t::npos; // size
-        result.second = 0; // type
-
-        get_ignore_noop();
-
-        if (current == '$')
-        {
-            result.second = get();  // must not ignore 'N', because 'N' maybe the type
-            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "type")))
-            {
-                return false;
-            }
-
-            get_ignore_noop();
-            if (JSON_HEDLEY_UNLIKELY(current != '#'))
-            {
-                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "value")))
-                {
-                    return false;
-                }
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size")));
-            }
-
-            return get_ubjson_size_value(result.first);
-        }
-
-        if (current == '#')
-        {
-            return get_ubjson_size_value(result.first);
-        }
-
-        return true;
-    }
-
-    /*!
-    @param prefix  the previously read or set type prefix
-    @return whether value creation completed
-    */
-    bool get_ubjson_value(const int prefix)
-    {
-        switch (prefix)
-        {
-            case std::char_traits<char>::eof():  // EOF
-                return unexpect_eof(input_format_t::ubjson, "value");
-
-            case 'T':  // true
-                return sax->boolean(true);
-            case 'F':  // false
-                return sax->boolean(false);
-
-            case 'Z':  // null
-                return sax->null();
-
-            case 'U':
-            {
-                std::uint8_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_unsigned(number);
-            }
-
-            case 'i':
-            {
-                std::int8_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
-            }
-
-            case 'I':
-            {
-                std::int16_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
-            }
-
-            case 'l':
-            {
-                std::int32_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
-            }
-
-            case 'L':
-            {
-                std::int64_t number;
-                return get_number(input_format_t::ubjson, number) and sax->number_integer(number);
-            }
-
-            case 'd':
-            {
-                float number;
-                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'D':
-            {
-                double number;
-                return get_number(input_format_t::ubjson, number) and sax->number_float(static_cast<number_float_t>(number), "");
-            }
-
-            case 'C':  // char
-            {
-                get();
-                if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(input_format_t::ubjson, "char")))
-                {
-                    return false;
-                }
-                if (JSON_HEDLEY_UNLIKELY(current > 127))
-                {
-                    auto last_token = get_token_string();
-                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char")));
-                }
-                string_t s(1, static_cast<char>(current));
-                return sax->string(s);
-            }
-
-            case 'S':  // string
-            {
-                string_t s;
-                return get_ubjson_string(s) and sax->string(s);
-            }
-
-            case '[':  // array
-                return get_ubjson_array();
-
-            case '{':  // object
-                return get_ubjson_object();
-
-            default: // anything else
-            {
-                auto last_token = get_token_string();
-                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value")));
-            }
-        }
-    }
-
-    /*!
-    @return whether array creation completed
-    */
-    bool get_ubjson_array()
-    {
-        std::pair<std::size_t, int> size_and_type;
-        if (JSON_HEDLEY_UNLIKELY(not get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        if (size_and_type.first != string_t::npos)
-        {
-            if (JSON_HEDLEY_UNLIKELY(not sax->start_array(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                if (size_and_type.second != 'N')
-                {
-                    for (std::size_t i = 0; i < size_and_type.first; ++i)
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(not get_ubjson_value(size_and_type.second)))
-                        {
-                            return false;
-                        }
-                    }
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                }
-            }
-        }
-        else
-        {
-            if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
-            {
-                return false;
-            }
-
-            while (current != ']')
-            {
-                if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal(false)))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-            }
-        }
-
-        return sax->end_array();
-    }
-
-    /*!
-    @return whether object creation completed
-    */
-    bool get_ubjson_object()
-    {
-        std::pair<std::size_t, int> size_and_type;
-        if (JSON_HEDLEY_UNLIKELY(not get_ubjson_size_type(size_and_type)))
-        {
-            return false;
-        }
-
-        string_t key;
-        if (size_and_type.first != string_t::npos)
-        {
-            if (JSON_HEDLEY_UNLIKELY(not sax->start_object(size_and_type.first)))
-            {
-                return false;
-            }
-
-            if (size_and_type.second != 0)
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(not get_ubjson_value(size_and_type.second)))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-            else
-            {
-                for (std::size_t i = 0; i < size_and_type.first; ++i)
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not get_ubjson_string(key) or not sax->key(key)))
-                    {
-                        return false;
-                    }
-                    if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal()))
-                    {
-                        return false;
-                    }
-                    key.clear();
-                }
-            }
-        }
-        else
-        {
-            if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
-            {
-                return false;
-            }
-
-            while (current != '}')
-            {
-                if (JSON_HEDLEY_UNLIKELY(not get_ubjson_string(key, false) or not sax->key(key)))
-                {
-                    return false;
-                }
-                if (JSON_HEDLEY_UNLIKELY(not parse_ubjson_internal()))
-                {
-                    return false;
-                }
-                get_ignore_noop();
-                key.clear();
-            }
-        }
-
-        return sax->end_object();
-    }
-
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-
-    /*!
-    @brief get next character from the input
-
-    This function provides the interface to the used input adapter. It does
-    not throw in case the input reached EOF, but returns a -'ve valued
-    `std::char_traits<char>::eof()` in that case.
-
-    @return character read from the input
-    */
-    int get()
-    {
-        ++chars_read;
-        return current = ia->get_character();
-    }
-
-    /*!
-    @return character read from the input after ignoring all 'N' entries
-    */
-    int get_ignore_noop()
-    {
-        do
-        {
-            get();
-        }
-        while (current == 'N');
-
-        return current;
-    }
-
-    /*
-    @brief read a number from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format   the current format (for diagnostics)
-    @param[out] result  number of type @a NumberType
-
-    @return whether conversion completed
-
-    @note This function needs to respect the system's endianess, because
-          bytes in CBOR, MessagePack, and UBJSON are stored in network order
-          (big endian) and therefore need reordering on little endian systems.
-    */
-    template<typename NumberType, bool InputIsLittleEndian = false>
-    bool get_number(const input_format_t format, NumberType& result)
-    {
-        // step 1: read input into array with system's byte order
-        std::array<std::uint8_t, sizeof(NumberType)> vec;
-        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(format, "number")))
-            {
-                return false;
-            }
-
-            // reverse byte order prior to conversion if necessary
-            if (is_little_endian != InputIsLittleEndian)
-            {
-                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
-            }
-            else
-            {
-                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
-            }
-        }
-
-        // step 2: convert array into number of type T and return
-        std::memcpy(&result, vec.data(), sizeof(NumberType));
-        return true;
-    }
-
-    /*!
-    @brief create a string by reading characters from the input
-
-    @tparam NumberType the type of the number
-    @param[in] format the current format (for diagnostics)
-    @param[in] len number of characters to read
-    @param[out] result string created by reading @a len bytes
-
-    @return whether string creation completed
-
-    @note We can not reserve @a len bytes for the result, because @a len
-          may be too large. Usually, @ref unexpect_eof() detects the end of
-          the input before we run out of string memory.
-    */
-    template<typename NumberType>
-    bool get_string(const input_format_t format,
-                    const NumberType len,
-                    string_t& result)
-    {
-        bool success = true;
-        std::generate_n(std::back_inserter(result), len, [this, &success, &format]()
-        {
-            get();
-            if (JSON_HEDLEY_UNLIKELY(not unexpect_eof(format, "string")))
-            {
-                success = false;
-            }
-            return static_cast<char>(current);
-        });
-        return success;
-    }
-
-    /*!
-    @param[in] format   the current format (for diagnostics)
-    @param[in] context  further context information (for diagnostics)
-    @return whether the last read character is not EOF
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    bool unexpect_eof(const input_format_t format, const char* context) const
-    {
-        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char>::eof()))
-        {
-            return sax->parse_error(chars_read, "<end of file>",
-                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context)));
-        }
-        return true;
-    }
-
-    /*!
-    @return a string representation of the last read byte
-    */
-    std::string get_token_string() const
-    {
-        std::array<char, 3> cr{{}};
-        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current));
-        return std::string{cr.data()};
-    }
-
-    /*!
-    @param[in] format   the current format
-    @param[in] detail   a detailed error message
-    @param[in] context  further context information
-    @return a message string to use in the parse_error exceptions
-    */
-    std::string exception_message(const input_format_t format,
-                                  const std::string& detail,
-                                  const std::string& context) const
-    {
-        std::string error_msg = "syntax error while parsing ";
-
-        switch (format)
-        {
-            case input_format_t::cbor:
-                error_msg += "CBOR";
-                break;
-
-            case input_format_t::msgpack:
-                error_msg += "MessagePack";
-                break;
-
-            case input_format_t::ubjson:
-                error_msg += "UBJSON";
-                break;
-
-            case input_format_t::bson:
-                error_msg += "BSON";
-                break;
-
-            default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
-        }
-
-        return error_msg + " " + context + ": " + detail;
-    }
-
-  private:
-    /// input adapter
-    input_adapter_t ia = nullptr;
-
-    /// the current character
-    int current = std::char_traits<char>::eof();
-
-    /// the number of characters read
-    std::size_t chars_read = 0;
-
-    /// whether we can assume little endianess
-    const bool is_little_endian = little_endianess();
-
-    /// the SAX parser
-    json_sax_t* sax = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-
-#include <array> // array
-#include <clocale> // localeconv
-#include <cstddef> // size_t
-#include <cstdio> // snprintf
-#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
-#include <initializer_list> // initializer_list
-#include <string> // char_traits, string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/position_t.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////
-// lexer //
-///////////
-
-/*!
-@brief lexical analysis
-
-This class organizes the lexical analysis during JSON deserialization.
-*/
-template<typename BasicJsonType>
-class lexer
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-
-  public:
-    /// token types for the parser
-    enum class token_type
-    {
-        uninitialized,    ///< indicating the scanner is uninitialized
-        literal_true,     ///< the `true` literal
-        literal_false,    ///< the `false` literal
-        literal_null,     ///< the `null` literal
-        value_string,     ///< a string -- use get_string() for actual value
-        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
-        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
-        value_float,      ///< an floating point number -- use get_number_float() for actual value
-        begin_array,      ///< the character for array begin `[`
-        begin_object,     ///< the character for object begin `{`
-        end_array,        ///< the character for array end `]`
-        end_object,       ///< the character for object end `}`
-        name_separator,   ///< the name separator `:`
-        value_separator,  ///< the value separator `,`
-        parse_error,      ///< indicating a parse error
-        end_of_input,     ///< indicating the end of the input buffer
-        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
-    };
-
-    /// return name of values of type token_type (only used for errors)
-    JSON_HEDLEY_RETURNS_NON_NULL
-    JSON_HEDLEY_CONST
-    static const char* token_type_name(const token_type t) noexcept
-    {
-        switch (t)
-        {
-            case token_type::uninitialized:
-                return "<uninitialized>";
-            case token_type::literal_true:
-                return "true literal";
-            case token_type::literal_false:
-                return "false literal";
-            case token_type::literal_null:
-                return "null literal";
-            case token_type::value_string:
-                return "string literal";
-            case lexer::token_type::value_unsigned:
-            case lexer::token_type::value_integer:
-            case lexer::token_type::value_float:
-                return "number literal";
-            case token_type::begin_array:
-                return "'['";
-            case token_type::begin_object:
-                return "'{'";
-            case token_type::end_array:
-                return "']'";
-            case token_type::end_object:
-                return "'}'";
-            case token_type::name_separator:
-                return "':'";
-            case token_type::value_separator:
-                return "','";
-            case token_type::parse_error:
-                return "<parse error>";
-            case token_type::end_of_input:
-                return "end of input";
-            case token_type::literal_or_value:
-                return "'[', '{', or a literal";
-            // LCOV_EXCL_START
-            default: // catch non-enum values
-                return "unknown token";
-                // LCOV_EXCL_STOP
-        }
-    }
-
-    explicit lexer(detail::input_adapter_t&& adapter)
-        : ia(std::move(adapter)), decimal_point_char(get_decimal_point()) {}
-
-    // delete because of pointer members
-    lexer(const lexer&) = delete;
-    lexer(lexer&&) = delete;
-    lexer& operator=(lexer&) = delete;
-    lexer& operator=(lexer&&) = delete;
-    ~lexer() = default;
-
-  private:
-    /////////////////////
-    // locales
-    /////////////////////
-
-    /// return the locale-dependent decimal point
-    JSON_HEDLEY_PURE
-    static char get_decimal_point() noexcept
-    {
-        const auto loc = localeconv();
-        assert(loc != nullptr);
-        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
-    }
-
-    /////////////////////
-    // scan functions
-    /////////////////////
-
-    /*!
-    @brief get codepoint from 4 hex characters following `\u`
-
-    For input "\u c1 c2 c3 c4" the codepoint is:
-      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
-    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
-
-    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
-    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
-    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
-    between the ASCII value of the character and the desired integer value.
-
-    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
-            non-hex character)
-    */
-    int get_codepoint()
-    {
-        // this function only makes sense after reading `\u`
-        assert(current == 'u');
-        int codepoint = 0;
-
-        const auto factors = { 12u, 8u, 4u, 0u };
-        for (const auto factor : factors)
-        {
-            get();
-
-            if (current >= '0' and current <= '9')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
-            }
-            else if (current >= 'A' and current <= 'F')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
-            }
-            else if (current >= 'a' and current <= 'f')
-            {
-                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
-            }
-            else
-            {
-                return -1;
-            }
-        }
-
-        assert(0x0000 <= codepoint and codepoint <= 0xFFFF);
-        return codepoint;
-    }
-
-    /*!
-    @brief check if the next byte(s) are inside a given range
-
-    Adds the current byte and, for each passed range, reads a new byte and
-    checks if it is inside the range. If a violation was detected, set up an
-    error message and return false. Otherwise, return true.
-
-    @param[in] ranges  list of integers; interpreted as list of pairs of
-                       inclusive lower and upper bound, respectively
-
-    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
-         1, 2, or 3 pairs. This precondition is enforced by an assertion.
-
-    @return true if and only if no range violation was detected
-    */
-    bool next_byte_in_range(std::initializer_list<int> ranges)
-    {
-        assert(ranges.size() == 2 or ranges.size() == 4 or ranges.size() == 6);
-        add(current);
-
-        for (auto range = ranges.begin(); range != ranges.end(); ++range)
-        {
-            get();
-            if (JSON_HEDLEY_LIKELY(*range <= current and current <= *(++range)))
-            {
-                add(current);
-            }
-            else
-            {
-                error_message = "invalid string: ill-formed UTF-8 byte";
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /*!
-    @brief scan a string literal
-
-    This function scans a string according to Sect. 7 of RFC 7159. While
-    scanning, bytes are escaped and copied into buffer token_buffer. Then the
-    function returns successfully, token_buffer is *not* null-terminated (as it
-    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
-    string.
-
-    @return token_type::value_string if string could be successfully scanned,
-            token_type::parse_error otherwise
-
-    @note In case of errors, variable error_message contains a textual
-          description.
-    */
-    token_type scan_string()
-    {
-        // reset token_buffer (ignore opening quote)
-        reset();
-
-        // we entered the function by reading an open quote
-        assert(current == '\"');
-
-        while (true)
-        {
-            // get next character
-            switch (get())
-            {
-                // end of file while parsing string
-                case std::char_traits<char>::eof():
-                {
-                    error_message = "invalid string: missing closing quote";
-                    return token_type::parse_error;
-                }
-
-                // closing quote
-                case '\"':
-                {
-                    return token_type::value_string;
-                }
-
-                // escapes
-                case '\\':
-                {
-                    switch (get())
-                    {
-                        // quotation mark
-                        case '\"':
-                            add('\"');
-                            break;
-                        // reverse solidus
-                        case '\\':
-                            add('\\');
-                            break;
-                        // solidus
-                        case '/':
-                            add('/');
-                            break;
-                        // backspace
-                        case 'b':
-                            add('\b');
-                            break;
-                        // form feed
-                        case 'f':
-                            add('\f');
-                            break;
-                        // line feed
-                        case 'n':
-                            add('\n');
-                            break;
-                        // carriage return
-                        case 'r':
-                            add('\r');
-                            break;
-                        // tab
-                        case 't':
-                            add('\t');
-                            break;
-
-                        // unicode escapes
-                        case 'u':
-                        {
-                            const int codepoint1 = get_codepoint();
-                            int codepoint = codepoint1; // start with codepoint1
-
-                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
-                            {
-                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
-                                return token_type::parse_error;
-                            }
-
-                            // check if code point is a high surrogate
-                            if (0xD800 <= codepoint1 and codepoint1 <= 0xDBFF)
-                            {
-                                // expect next \uxxxx entry
-                                if (JSON_HEDLEY_LIKELY(get() == '\\' and get() == 'u'))
-                                {
-                                    const int codepoint2 = get_codepoint();
-
-                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
-                                    {
-                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
-                                        return token_type::parse_error;
-                                    }
-
-                                    // check if codepoint2 is a low surrogate
-                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 and codepoint2 <= 0xDFFF))
-                                    {
-                                        // overwrite codepoint
-                                        codepoint = static_cast<int>(
-                                                        // high surrogate occupies the most significant 22 bits
-                                                        (static_cast<unsigned int>(codepoint1) << 10u)
-                                                        // low surrogate occupies the least significant 15 bits
-                                                        + static_cast<unsigned int>(codepoint2)
-                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
-                                                        // in the result so we have to subtract with:
-                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
-                                                        - 0x35FDC00u);
-                                    }
-                                    else
-                                    {
-                                        error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
-                                        return token_type::parse_error;
-                                    }
-                                }
-                                else
-                                {
-                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must be followed by U+DC00..U+DFFF";
-                                    return token_type::parse_error;
-                                }
-                            }
-                            else
-                            {
-                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 and codepoint1 <= 0xDFFF))
-                                {
-                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
-                                    return token_type::parse_error;
-                                }
-                            }
-
-                            // result of the above calculation yields a proper codepoint
-                            assert(0x00 <= codepoint and codepoint <= 0x10FFFF);
-
-                            // translate codepoint into bytes
-                            if (codepoint < 0x80)
-                            {
-                                // 1-byte characters: 0xxxxxxx (ASCII)
-                                add(codepoint);
-                            }
-                            else if (codepoint <= 0x7FF)
-                            {
-                                // 2-byte characters: 110xxxxx 10xxxxxx
-                                add(static_cast<int>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
-                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-                            else if (codepoint <= 0xFFFF)
-                            {
-                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<int>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
-                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-                            else
-                            {
-                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
-                                add(static_cast<int>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
-                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
-                                add(static_cast<int>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
-                                add(static_cast<int>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
-                            }
-
-                            break;
-                        }
-
-                        // other characters after escape
-                        default:
-                            error_message = "invalid string: forbidden character after backslash";
-                            return token_type::parse_error;
-                    }
-
-                    break;
-                }
-
-                // invalid control characters
-                case 0x00:
-                {
-                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
-                    return token_type::parse_error;
-                }
-
-                case 0x01:
-                {
-                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
-                    return token_type::parse_error;
-                }
-
-                case 0x02:
-                {
-                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
-                    return token_type::parse_error;
-                }
-
-                case 0x03:
-                {
-                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
-                    return token_type::parse_error;
-                }
-
-                case 0x04:
-                {
-                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
-                    return token_type::parse_error;
-                }
-
-                case 0x05:
-                {
-                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
-                    return token_type::parse_error;
-                }
-
-                case 0x06:
-                {
-                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
-                    return token_type::parse_error;
-                }
-
-                case 0x07:
-                {
-                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
-                    return token_type::parse_error;
-                }
-
-                case 0x08:
-                {
-                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
-                    return token_type::parse_error;
-                }
-
-                case 0x09:
-                {
-                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
-                    return token_type::parse_error;
-                }
-
-                case 0x0A:
-                {
-                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
-                    return token_type::parse_error;
-                }
-
-                case 0x0B:
-                {
-                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
-                    return token_type::parse_error;
-                }
-
-                case 0x0C:
-                {
-                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
-                    return token_type::parse_error;
-                }
-
-                case 0x0D:
-                {
-                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
-                    return token_type::parse_error;
-                }
-
-                case 0x0E:
-                {
-                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
-                    return token_type::parse_error;
-                }
-
-                case 0x0F:
-                {
-                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
-                    return token_type::parse_error;
-                }
-
-                case 0x10:
-                {
-                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
-                    return token_type::parse_error;
-                }
-
-                case 0x11:
-                {
-                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
-                    return token_type::parse_error;
-                }
-
-                case 0x12:
-                {
-                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
-                    return token_type::parse_error;
-                }
-
-                case 0x13:
-                {
-                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
-                    return token_type::parse_error;
-                }
-
-                case 0x14:
-                {
-                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
-                    return token_type::parse_error;
-                }
-
-                case 0x15:
-                {
-                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
-                    return token_type::parse_error;
-                }
-
-                case 0x16:
-                {
-                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
-                    return token_type::parse_error;
-                }
-
-                case 0x17:
-                {
-                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
-                    return token_type::parse_error;
-                }
-
-                case 0x18:
-                {
-                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
-                    return token_type::parse_error;
-                }
-
-                case 0x19:
-                {
-                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
-                    return token_type::parse_error;
-                }
-
-                case 0x1A:
-                {
-                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
-                    return token_type::parse_error;
-                }
-
-                case 0x1B:
-                {
-                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
-                    return token_type::parse_error;
-                }
-
-                case 0x1C:
-                {
-                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
-                    return token_type::parse_error;
-                }
-
-                case 0x1D:
-                {
-                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
-                    return token_type::parse_error;
-                }
-
-                case 0x1E:
-                {
-                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
-                    return token_type::parse_error;
-                }
-
-                case 0x1F:
-                {
-                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
-                    return token_type::parse_error;
-                }
-
-                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
-                case 0x20:
-                case 0x21:
-                case 0x23:
-                case 0x24:
-                case 0x25:
-                case 0x26:
-                case 0x27:
-                case 0x28:
-                case 0x29:
-                case 0x2A:
-                case 0x2B:
-                case 0x2C:
-                case 0x2D:
-                case 0x2E:
-                case 0x2F:
-                case 0x30:
-                case 0x31:
-                case 0x32:
-                case 0x33:
-                case 0x34:
-                case 0x35:
-                case 0x36:
-                case 0x37:
-                case 0x38:
-                case 0x39:
-                case 0x3A:
-                case 0x3B:
-                case 0x3C:
-                case 0x3D:
-                case 0x3E:
-                case 0x3F:
-                case 0x40:
-                case 0x41:
-                case 0x42:
-                case 0x43:
-                case 0x44:
-                case 0x45:
-                case 0x46:
-                case 0x47:
-                case 0x48:
-                case 0x49:
-                case 0x4A:
-                case 0x4B:
-                case 0x4C:
-                case 0x4D:
-                case 0x4E:
-                case 0x4F:
-                case 0x50:
-                case 0x51:
-                case 0x52:
-                case 0x53:
-                case 0x54:
-                case 0x55:
-                case 0x56:
-                case 0x57:
-                case 0x58:
-                case 0x59:
-                case 0x5A:
-                case 0x5B:
-                case 0x5D:
-                case 0x5E:
-                case 0x5F:
-                case 0x60:
-                case 0x61:
-                case 0x62:
-                case 0x63:
-                case 0x64:
-                case 0x65:
-                case 0x66:
-                case 0x67:
-                case 0x68:
-                case 0x69:
-                case 0x6A:
-                case 0x6B:
-                case 0x6C:
-                case 0x6D:
-                case 0x6E:
-                case 0x6F:
-                case 0x70:
-                case 0x71:
-                case 0x72:
-                case 0x73:
-                case 0x74:
-                case 0x75:
-                case 0x76:
-                case 0x77:
-                case 0x78:
-                case 0x79:
-                case 0x7A:
-                case 0x7B:
-                case 0x7C:
-                case 0x7D:
-                case 0x7E:
-                case 0x7F:
-                {
-                    add(current);
-                    break;
-                }
-
-                // U+0080..U+07FF: bytes C2..DF 80..BF
-                case 0xC2:
-                case 0xC3:
-                case 0xC4:
-                case 0xC5:
-                case 0xC6:
-                case 0xC7:
-                case 0xC8:
-                case 0xC9:
-                case 0xCA:
-                case 0xCB:
-                case 0xCC:
-                case 0xCD:
-                case 0xCE:
-                case 0xCF:
-                case 0xD0:
-                case 0xD1:
-                case 0xD2:
-                case 0xD3:
-                case 0xD4:
-                case 0xD5:
-                case 0xD6:
-                case 0xD7:
-                case 0xD8:
-                case 0xD9:
-                case 0xDA:
-                case 0xDB:
-                case 0xDC:
-                case 0xDD:
-                case 0xDE:
-                case 0xDF:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not next_byte_in_range({0x80, 0xBF})))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
-                case 0xE0:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
-                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
-                case 0xE1:
-                case 0xE2:
-                case 0xE3:
-                case 0xE4:
-                case 0xE5:
-                case 0xE6:
-                case 0xE7:
-                case 0xE8:
-                case 0xE9:
-                case 0xEA:
-                case 0xEB:
-                case 0xEC:
-                case 0xEE:
-                case 0xEF:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
-                case 0xED:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
-                case 0xF0:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
-                case 0xF1:
-                case 0xF2:
-                case 0xF3:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
-                case 0xF4:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not (next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
-                    {
-                        return token_type::parse_error;
-                    }
-                    break;
-                }
-
-                // remaining bytes (80..C1 and F5..FF) are ill-formed
-                default:
-                {
-                    error_message = "invalid string: ill-formed UTF-8 byte";
-                    return token_type::parse_error;
-                }
-            }
-        }
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(float& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtof(str, endptr);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(double& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtod(str, endptr);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    static void strtof(long double& f, const char* str, char** endptr) noexcept
-    {
-        f = std::strtold(str, endptr);
-    }
-
-    /*!
-    @brief scan a number literal
-
-    This function scans a string according to Sect. 6 of RFC 7159.
-
-    The function is realized with a deterministic finite state machine derived
-    from the grammar described in RFC 7159. Starting in state "init", the
-    input is read and used to determined the next state. Only state "done"
-    accepts the number. State "error" is a trap state to model errors. In the
-    table below, "anything" means any character but the ones listed before.
-
-    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
-    ---------|----------|----------|----------|---------|---------|----------|-----------
-    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
-    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
-    zero     | done     | done     | exponent | done    | done    | decimal1 | done
-    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
-    decimal1 | decimal2 | [error]  | [error]  | [error] | [error] | [error]  | [error]
-    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
-    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
-    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
-    any2     | any2     | any2     | done     | done    | done    | done     | done
-
-    The state machine is realized with one label per state (prefixed with
-    "scan_number_") and `goto` statements between them. The state machine
-    contains cycles, but any cycle can be left when EOF is read. Therefore,
-    the function is guaranteed to terminate.
-
-    During scanning, the read bytes are stored in token_buffer. This string is
-    then converted to a signed integer, an unsigned integer, or a
-    floating-point number.
-
-    @return token_type::value_unsigned, token_type::value_integer, or
-            token_type::value_float if number could be successfully scanned,
-            token_type::parse_error otherwise
-
-    @note The scanner is independent of the current locale. Internally, the
-          locale's decimal point is used instead of `.` to work with the
-          locale-dependent converters.
-    */
-    token_type scan_number()  // lgtm [cpp/use-of-goto]
-    {
-        // reset token_buffer to store the number's bytes
-        reset();
-
-        // the type of the parsed number; initially set to unsigned; will be
-        // changed if minus sign, decimal point or exponent is read
-        token_type number_type = token_type::value_unsigned;
-
-        // state (init): we just found out we need to scan a number
-        switch (current)
-        {
-            case '-':
-            {
-                add(current);
-                goto scan_number_minus;
-            }
-
-            case '0':
-            {
-                add(current);
-                goto scan_number_zero;
-            }
-
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            // all other characters are rejected outside scan_number()
-            default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
-        }
-
-scan_number_minus:
-        // state: we just parsed a leading minus sign
-        number_type = token_type::value_integer;
-        switch (get())
-        {
-            case '0':
-            {
-                add(current);
-                goto scan_number_zero;
-            }
-
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after '-'";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_zero:
-        // state: we just parse a zero (maybe with a leading minus sign)
-        switch (get())
-        {
-            case '.':
-            {
-                add(decimal_point_char);
-                goto scan_number_decimal1;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_any1:
-        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any1;
-            }
-
-            case '.':
-            {
-                add(decimal_point_char);
-                goto scan_number_decimal1;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_decimal1:
-        // state: we just parsed a decimal point
-        number_type = token_type::value_float;
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_decimal2;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after '.'";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_decimal2:
-        // we just parsed at least one number after a decimal point
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_decimal2;
-            }
-
-            case 'e':
-            case 'E':
-            {
-                add(current);
-                goto scan_number_exponent;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_exponent:
-        // we just parsed an exponent
-        number_type = token_type::value_float;
-        switch (get())
-        {
-            case '+':
-            case '-':
-            {
-                add(current);
-                goto scan_number_sign;
-            }
-
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-            {
-                error_message =
-                    "invalid number; expected '+', '-', or digit after exponent";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_sign:
-        // we just parsed an exponent sign
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-            {
-                error_message = "invalid number; expected digit after exponent sign";
-                return token_type::parse_error;
-            }
-        }
-
-scan_number_any2:
-        // we just parsed a number after the exponent or exponent sign
-        switch (get())
-        {
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-            {
-                add(current);
-                goto scan_number_any2;
-            }
-
-            default:
-                goto scan_number_done;
-        }
-
-scan_number_done:
-        // unget the character after the number (we only read it to know that
-        // we are done scanning a number)
-        unget();
-
-        char* endptr = nullptr;
-        errno = 0;
-
-        // try to parse integers first and fall back to floats
-        if (number_type == token_type::value_unsigned)
-        {
-            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
-
-            // we checked the number format before
-            assert(endptr == token_buffer.data() + token_buffer.size());
-
-            if (errno == 0)
-            {
-                value_unsigned = static_cast<number_unsigned_t>(x);
-                if (value_unsigned == x)
-                {
-                    return token_type::value_unsigned;
-                }
-            }
-        }
-        else if (number_type == token_type::value_integer)
-        {
-            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
-
-            // we checked the number format before
-            assert(endptr == token_buffer.data() + token_buffer.size());
-
-            if (errno == 0)
-            {
-                value_integer = static_cast<number_integer_t>(x);
-                if (value_integer == x)
-                {
-                    return token_type::value_integer;
-                }
-            }
-        }
-
-        // this code is reached if we parse a floating-point number or if an
-        // integer conversion above failed
-        strtof(value_float, token_buffer.data(), &endptr);
-
-        // we checked the number format before
-        assert(endptr == token_buffer.data() + token_buffer.size());
-
-        return token_type::value_float;
-    }
-
-    /*!
-    @param[in] literal_text  the literal text to expect
-    @param[in] length        the length of the passed literal text
-    @param[in] return_type   the token type to return on success
-    */
-    JSON_HEDLEY_NON_NULL(2)
-    token_type scan_literal(const char* literal_text, const std::size_t length,
-                            token_type return_type)
-    {
-        assert(current == literal_text[0]);
-        for (std::size_t i = 1; i < length; ++i)
-        {
-            if (JSON_HEDLEY_UNLIKELY(get() != literal_text[i]))
-            {
-                error_message = "invalid literal";
-                return token_type::parse_error;
-            }
-        }
-        return return_type;
-    }
-
-    /////////////////////
-    // input management
-    /////////////////////
-
-    /// reset token_buffer; current character is beginning of token
-    void reset() noexcept
-    {
-        token_buffer.clear();
-        token_string.clear();
-        token_string.push_back(std::char_traits<char>::to_char_type(current));
-    }
-
-    /*
-    @brief get next character from the input
-
-    This function provides the interface to the used input adapter. It does
-    not throw in case the input reached EOF, but returns a
-    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
-    for use in error messages.
-
-    @return character read from the input
-    */
-    std::char_traits<char>::int_type get()
-    {
-        ++position.chars_read_total;
-        ++position.chars_read_current_line;
-
-        if (next_unget)
-        {
-            // just reset the next_unget variable and work with current
-            next_unget = false;
-        }
-        else
-        {
-            current = ia->get_character();
-        }
-
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char>::eof()))
-        {
-            token_string.push_back(std::char_traits<char>::to_char_type(current));
-        }
-
-        if (current == '\n')
-        {
-            ++position.lines_read;
-            position.chars_read_current_line = 0;
-        }
-
-        return current;
-    }
-
-    /*!
-    @brief unget current character (read it again on next get)
-
-    We implement unget by setting variable next_unget to true. The input is not
-    changed - we just simulate ungetting by modifying chars_read_total,
-    chars_read_current_line, and token_string. The next call to get() will
-    behave as if the unget character is read again.
-    */
-    void unget()
-    {
-        next_unget = true;
-
-        --position.chars_read_total;
-
-        // in case we "unget" a newline, we have to also decrement the lines_read
-        if (position.chars_read_current_line == 0)
-        {
-            if (position.lines_read > 0)
-            {
-                --position.lines_read;
-            }
-        }
-        else
-        {
-            --position.chars_read_current_line;
-        }
-
-        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char>::eof()))
-        {
-            assert(not token_string.empty());
-            token_string.pop_back();
-        }
-    }
-
-    /// add a character to token_buffer
-    void add(int c)
-    {
-        token_buffer.push_back(std::char_traits<char>::to_char_type(c));
-    }
-
-  public:
-    /////////////////////
-    // value getters
-    /////////////////////
-
-    /// return integer value
-    constexpr number_integer_t get_number_integer() const noexcept
-    {
-        return value_integer;
-    }
-
-    /// return unsigned integer value
-    constexpr number_unsigned_t get_number_unsigned() const noexcept
-    {
-        return value_unsigned;
-    }
-
-    /// return floating-point value
-    constexpr number_float_t get_number_float() const noexcept
-    {
-        return value_float;
-    }
-
-    /// return current string value (implicitly resets the token; useful only once)
-    string_t& get_string()
-    {
-        return token_buffer;
-    }
-
-    /////////////////////
-    // diagnostics
-    /////////////////////
-
-    /// return position of last read token
-    constexpr position_t get_position() const noexcept
-    {
-        return position;
-    }
-
-    /// return the last read token (for errors only).  Will never contain EOF
-    /// (an arbitrary value that is not a valid char value, often -1), because
-    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
-    std::string get_token_string() const
-    {
-        // escape control characters
-        std::string result;
-        for (const auto c : token_string)
-        {
-            if ('\x00' <= c and c <= '\x1F')
-            {
-                // escape control characters
-                std::array<char, 9> cs{{}};
-                (std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c));
-                result += cs.data();
-            }
-            else
-            {
-                // add character as is
-                result.push_back(c);
-            }
-        }
-
-        return result;
-    }
-
-    /// return syntax error message
-    JSON_HEDLEY_RETURNS_NON_NULL
-    constexpr const char* get_error_message() const noexcept
-    {
-        return error_message;
-    }
-
-    /////////////////////
-    // actual scanner
-    /////////////////////
-
-    /*!
-    @brief skip the UTF-8 byte order mark
-    @return true iff there is no BOM or the correct BOM has been skipped
-    */
-    bool skip_bom()
-    {
-        if (get() == 0xEF)
-        {
-            // check if we completely parse the BOM
-            return get() == 0xBB and get() == 0xBF;
-        }
-
-        // the first character is not the beginning of the BOM; unget it to
-        // process is later
-        unget();
-        return true;
-    }
-
-    token_type scan()
-    {
-        // initially, skip the BOM
-        if (position.chars_read_total == 0 and not skip_bom())
-        {
-            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
-            return token_type::parse_error;
-        }
-
-        // read next character and ignore whitespace
-        do
-        {
-            get();
-        }
-        while (current == ' ' or current == '\t' or current == '\n' or current == '\r');
-
-        switch (current)
-        {
-            // structural characters
-            case '[':
-                return token_type::begin_array;
-            case ']':
-                return token_type::end_array;
-            case '{':
-                return token_type::begin_object;
-            case '}':
-                return token_type::end_object;
-            case ':':
-                return token_type::name_separator;
-            case ',':
-                return token_type::value_separator;
-
-            // literals
-            case 't':
-                return scan_literal("true", 4, token_type::literal_true);
-            case 'f':
-                return scan_literal("false", 5, token_type::literal_false);
-            case 'n':
-                return scan_literal("null", 4, token_type::literal_null);
-
-            // string
-            case '\"':
-                return scan_string();
-
-            // number
-            case '-':
-            case '0':
-            case '1':
-            case '2':
-            case '3':
-            case '4':
-            case '5':
-            case '6':
-            case '7':
-            case '8':
-            case '9':
-                return scan_number();
-
-            // end of input (the null byte is needed when parsing from
-            // string literals)
-            case '\0':
-            case std::char_traits<char>::eof():
-                return token_type::end_of_input;
-
-            // error
-            default:
-                error_message = "invalid literal";
-                return token_type::parse_error;
-        }
-    }
-
-  private:
-    /// input adapter
-    detail::input_adapter_t ia = nullptr;
-
-    /// the current character
-    std::char_traits<char>::int_type current = std::char_traits<char>::eof();
-
-    /// whether the next get() call should just return current
-    bool next_unget = false;
-
-    /// the start position of the current token
-    position_t position {};
-
-    /// raw input token string (for error messages)
-    std::vector<char> token_string {};
-
-    /// buffer for variable-length tokens (numbers, strings)
-    string_t token_buffer {};
-
-    /// a description of occurred lexer errors
-    const char* error_message = "";
-
-    // number values
-    number_integer_t value_integer = 0;
-    number_unsigned_t value_unsigned = 0;
-    number_float_t value_float = 0;
-
-    /// the decimal point
-    const char decimal_point_char = '.';
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/input/parser.hpp>
-
-
-#include <cassert> // assert
-#include <cmath> // isfinite
-#include <cstdint> // uint8_t
-#include <functional> // function
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/input/input_adapters.hpp>
-
-// #include <nlohmann/detail/input/json_sax.hpp>
-
-// #include <nlohmann/detail/input/lexer.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/is_sax.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-////////////
-// parser //
-////////////
-
-/*!
-@brief syntax analysis
-
-This class implements a recursive decent parser.
-*/
-template<typename BasicJsonType>
-class parser
-{
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using string_t = typename BasicJsonType::string_t;
-    using lexer_t = lexer<BasicJsonType>;
-    using token_type = typename lexer_t::token_type;
-
-  public:
-    enum class parse_event_t : uint8_t
-    {
-        /// the parser read `{` and started to process a JSON object
-        object_start,
-        /// the parser read `}` and finished processing a JSON object
-        object_end,
-        /// the parser read `[` and started to process a JSON array
-        array_start,
-        /// the parser read `]` and finished processing a JSON array
-        array_end,
-        /// the parser read a key of a value in an object
-        key,
-        /// the parser finished reading a JSON value
-        value
-    };
-
-    using parser_callback_t =
-        std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
-
-    /// a parser reading from an input adapter
-    explicit parser(detail::input_adapter_t&& adapter,
-                    const parser_callback_t cb = nullptr,
-                    const bool allow_exceptions_ = true)
-        : callback(cb), m_lexer(std::move(adapter)), allow_exceptions(allow_exceptions_)
-    {
-        // read first token
-        get_token();
-    }
-
-    /*!
-    @brief public parser interface
-
-    @param[in] strict      whether to expect the last token to be EOF
-    @param[in,out] result  parsed JSON value
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-    */
-    void parse(const bool strict, BasicJsonType& result)
-    {
-        if (callback)
-        {
-            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
-            sax_parse_internal(&sdp);
-            result.assert_invariant();
-
-            // in strict mode, input must be completely read
-            if (strict and (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(),
-                                                    exception_message(token_type::end_of_input, "value")));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-
-            // set top-level value to null if it was discarded by the callback
-            // function
-            if (result.is_discarded())
-            {
-                result = nullptr;
-            }
-        }
-        else
-        {
-            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
-            sax_parse_internal(&sdp);
-            result.assert_invariant();
-
-            // in strict mode, input must be completely read
-            if (strict and (get_token() != token_type::end_of_input))
-            {
-                sdp.parse_error(m_lexer.get_position(),
-                                m_lexer.get_token_string(),
-                                parse_error::create(101, m_lexer.get_position(),
-                                                    exception_message(token_type::end_of_input, "value")));
-            }
-
-            // in case of an error, return discarded value
-            if (sdp.is_errored())
-            {
-                result = value_t::discarded;
-                return;
-            }
-        }
-    }
-
-    /*!
-    @brief public accept interface
-
-    @param[in] strict  whether to expect the last token to be EOF
-    @return whether the input is a proper JSON text
-    */
-    bool accept(const bool strict = true)
-    {
-        json_sax_acceptor<BasicJsonType> sax_acceptor;
-        return sax_parse(&sax_acceptor, strict);
-    }
-
-    template <typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    bool sax_parse(SAX* sax, const bool strict = true)
-    {
-        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
-        const bool result = sax_parse_internal(sax);
-
-        // strict mode: next byte must be EOF
-        if (result and strict and (get_token() != token_type::end_of_input))
-        {
-            return sax->parse_error(m_lexer.get_position(),
-                                    m_lexer.get_token_string(),
-                                    parse_error::create(101, m_lexer.get_position(),
-                                            exception_message(token_type::end_of_input, "value")));
-        }
-
-        return result;
-    }
-
-  private:
-    template <typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    bool sax_parse_internal(SAX* sax)
-    {
-        // stack to remember the hierarchy of structured values we are parsing
-        // true = array; false = object
-        std::vector<bool> states;
-        // value to avoid a goto (see comment where set to true)
-        bool skip_to_state_evaluation = false;
-
-        while (true)
-        {
-            if (not skip_to_state_evaluation)
-            {
-                // invariant: get_token() was called before each iteration
-                switch (last_token)
-                {
-                    case token_type::begin_object:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(not sax->start_object(std::size_t(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing } -> we are done
-                        if (get_token() == token_type::end_object)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(not sax->end_object()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // parse key
-                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(),
-                                                            exception_message(token_type::value_string, "object key")));
-                        }
-                        if (JSON_HEDLEY_UNLIKELY(not sax->key(m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-
-                        // parse separator (:)
-                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    parse_error::create(101, m_lexer.get_position(),
-                                                            exception_message(token_type::name_separator, "object separator")));
-                        }
-
-                        // remember we are now inside an object
-                        states.push_back(false);
-
-                        // parse values
-                        get_token();
-                        continue;
-                    }
-
-                    case token_type::begin_array:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(not sax->start_array(std::size_t(-1))))
-                        {
-                            return false;
-                        }
-
-                        // closing ] -> we are done
-                        if (get_token() == token_type::end_array)
-                        {
-                            if (JSON_HEDLEY_UNLIKELY(not sax->end_array()))
-                            {
-                                return false;
-                            }
-                            break;
-                        }
-
-                        // remember we are now inside an array
-                        states.push_back(true);
-
-                        // parse values (no need to call get_token)
-                        continue;
-                    }
-
-                    case token_type::value_float:
-                    {
-                        const auto res = m_lexer.get_number_float();
-
-                        if (JSON_HEDLEY_UNLIKELY(not std::isfinite(res)))
-                        {
-                            return sax->parse_error(m_lexer.get_position(),
-                                                    m_lexer.get_token_string(),
-                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'"));
-                        }
-
-                        if (JSON_HEDLEY_UNLIKELY(not sax->number_float(res, m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-
-                        break;
-                    }
-
-                    case token_type::literal_false:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(not sax->boolean(false)))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::literal_null:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(not sax->null()))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::literal_true:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(not sax->boolean(true)))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_integer:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(not sax->number_integer(m_lexer.get_number_integer())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_string:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(not sax->string(m_lexer.get_string())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::value_unsigned:
-                    {
-                        if (JSON_HEDLEY_UNLIKELY(not sax->number_unsigned(m_lexer.get_number_unsigned())))
-                        {
-                            return false;
-                        }
-                        break;
-                    }
-
-                    case token_type::parse_error:
-                    {
-                        // using "uninitialized" to avoid "expected" message
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(),
-                                                        exception_message(token_type::uninitialized, "value")));
-                    }
-
-                    default: // the last token was unexpected
-                    {
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(),
-                                                        exception_message(token_type::literal_or_value, "value")));
-                    }
-                }
-            }
-            else
-            {
-                skip_to_state_evaluation = false;
-            }
-
-            // we reached this line after we successfully parsed a value
-            if (states.empty())
-            {
-                // empty stack: we reached the end of the hierarchy: done
-                return true;
-            }
-
-            if (states.back())  // array
-            {
-                // comma -> next value
-                if (get_token() == token_type::value_separator)
-                {
-                    // parse a new value
-                    get_token();
-                    continue;
-                }
-
-                // closing ]
-                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not sax->end_array()))
-                    {
-                        return false;
-                    }
-
-                    // We are done with this array. Before we can parse a
-                    // new value, we need to evaluate the new state first.
-                    // By setting skip_to_state_evaluation to false, we
-                    // are effectively jumping to the beginning of this if.
-                    assert(not states.empty());
-                    states.pop_back();
-                    skip_to_state_evaluation = true;
-                    continue;
-                }
-
-                return sax->parse_error(m_lexer.get_position(),
-                                        m_lexer.get_token_string(),
-                                        parse_error::create(101, m_lexer.get_position(),
-                                                exception_message(token_type::end_array, "array")));
-            }
-            else  // object
-            {
-                // comma -> next value
-                if (get_token() == token_type::value_separator)
-                {
-                    // parse key
-                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
-                    {
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(),
-                                                        exception_message(token_type::value_string, "object key")));
-                    }
-
-                    if (JSON_HEDLEY_UNLIKELY(not sax->key(m_lexer.get_string())))
-                    {
-                        return false;
-                    }
-
-                    // parse separator (:)
-                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
-                    {
-                        return sax->parse_error(m_lexer.get_position(),
-                                                m_lexer.get_token_string(),
-                                                parse_error::create(101, m_lexer.get_position(),
-                                                        exception_message(token_type::name_separator, "object separator")));
-                    }
-
-                    // parse values
-                    get_token();
-                    continue;
-                }
-
-                // closing }
-                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
-                {
-                    if (JSON_HEDLEY_UNLIKELY(not sax->end_object()))
-                    {
-                        return false;
-                    }
-
-                    // We are done with this object. Before we can parse a
-                    // new value, we need to evaluate the new state first.
-                    // By setting skip_to_state_evaluation to false, we
-                    // are effectively jumping to the beginning of this if.
-                    assert(not states.empty());
-                    states.pop_back();
-                    skip_to_state_evaluation = true;
-                    continue;
-                }
-
-                return sax->parse_error(m_lexer.get_position(),
-                                        m_lexer.get_token_string(),
-                                        parse_error::create(101, m_lexer.get_position(),
-                                                exception_message(token_type::end_object, "object")));
-            }
-        }
-    }
-
-    /// get next token from lexer
-    token_type get_token()
-    {
-        return last_token = m_lexer.scan();
-    }
-
-    std::string exception_message(const token_type expected, const std::string& context)
-    {
-        std::string error_msg = "syntax error ";
-
-        if (not context.empty())
-        {
-            error_msg += "while parsing " + context + " ";
-        }
-
-        error_msg += "- ";
-
-        if (last_token == token_type::parse_error)
-        {
-            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
-                         m_lexer.get_token_string() + "'";
-        }
-        else
-        {
-            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
-        }
-
-        if (expected != token_type::uninitialized)
-        {
-            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
-        }
-
-        return error_msg;
-    }
-
-  private:
-    /// callback function
-    const parser_callback_t callback = nullptr;
-    /// the type of the last read token
-    token_type last_token = token_type::uninitialized;
-    /// the lexer
-    lexer_t m_lexer;
-    /// whether to throw exceptions in case of errors
-    const bool allow_exceptions = true;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/internal_iterator.hpp>
-
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-
-#include <cstddef> // ptrdiff_t
-#include <limits>  // numeric_limits
-
-namespace nlohmann
-{
-namespace detail
-{
-/*
-@brief an iterator for primitive JSON types
-
-This class models an iterator for primitive JSON types (boolean, number,
-string). It's only purpose is to allow the iterator/const_iterator classes
-to "iterate" over primitive values. Internally, the iterator is modeled by
-a `difference_type` variable. Value begin_value (`0`) models the begin,
-end_value (`1`) models past the end.
-*/
-class primitive_iterator_t
-{
-  private:
-    using difference_type = std::ptrdiff_t;
-    static constexpr difference_type begin_value = 0;
-    static constexpr difference_type end_value = begin_value + 1;
-
-    /// iterator as signed integer type
-    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
-
-  public:
-    constexpr difference_type get_value() const noexcept
-    {
-        return m_it;
-    }
-
-    /// set iterator to a defined beginning
-    void set_begin() noexcept
-    {
-        m_it = begin_value;
-    }
-
-    /// set iterator to a defined past the end
-    void set_end() noexcept
-    {
-        m_it = end_value;
-    }
-
-    /// return whether the iterator can be dereferenced
-    constexpr bool is_begin() const noexcept
-    {
-        return m_it == begin_value;
-    }
-
-    /// return whether the iterator is at end
-    constexpr bool is_end() const noexcept
-    {
-        return m_it == end_value;
-    }
-
-    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it == rhs.m_it;
-    }
-
-    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it < rhs.m_it;
-    }
-
-    primitive_iterator_t operator+(difference_type n) noexcept
-    {
-        auto result = *this;
-        result += n;
-        return result;
-    }
-
-    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
-    {
-        return lhs.m_it - rhs.m_it;
-    }
-
-    primitive_iterator_t& operator++() noexcept
-    {
-        ++m_it;
-        return *this;
-    }
-
-    primitive_iterator_t const operator++(int) noexcept
-    {
-        auto result = *this;
-        ++m_it;
-        return result;
-    }
-
-    primitive_iterator_t& operator--() noexcept
-    {
-        --m_it;
-        return *this;
-    }
-
-    primitive_iterator_t const operator--(int) noexcept
-    {
-        auto result = *this;
-        --m_it;
-        return result;
-    }
-
-    primitive_iterator_t& operator+=(difference_type n) noexcept
-    {
-        m_it += n;
-        return *this;
-    }
-
-    primitive_iterator_t& operator-=(difference_type n) noexcept
-    {
-        m_it -= n;
-        return *this;
-    }
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/*!
-@brief an iterator value
-
-@note This structure could easily be a union, but MSVC currently does not allow
-unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
-*/
-template<typename BasicJsonType> struct internal_iterator
-{
-    /// iterator for JSON objects
-    typename BasicJsonType::object_t::iterator object_iterator {};
-    /// iterator for JSON arrays
-    typename BasicJsonType::array_t::iterator array_iterator {};
-    /// generic iterator for all other types
-    primitive_iterator_t primitive_iterator {};
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/iter_impl.hpp>
-
-
-#include <ciso646> // not
-#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
-#include <type_traits> // conditional, is_const, remove_const
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/iterators/internal_iterator.hpp>
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-// forward declare, to be able to friend it later on
-template<typename IteratorType> class iteration_proxy;
-template<typename IteratorType> class iteration_proxy_value;
-
-/*!
-@brief a template for a bidirectional iterator for the @ref basic_json class
-This class implements a both iterators (iterator and const_iterator) for the
-@ref basic_json class.
-@note An iterator is called *initialized* when a pointer to a JSON value has
-      been set (e.g., by a constructor or a copy assignment). If the iterator is
-      default-constructed, it is *uninitialized* and most methods are undefined.
-      **The library uses assertions to detect calls on uninitialized iterators.**
-@requirement The class satisfies the following concept requirements:
--
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
-  The iterator that can be moved can be moved in both directions (i.e.
-  incremented and decremented).
-@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
-       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
-*/
-template<typename BasicJsonType>
-class iter_impl
-{
-    /// allow basic_json to access private members
-    friend iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
-    friend BasicJsonType;
-    friend iteration_proxy<iter_impl>;
-    friend iteration_proxy_value<iter_impl>;
-
-    using object_t = typename BasicJsonType::object_t;
-    using array_t = typename BasicJsonType::array_t;
-    // make sure BasicJsonType is basic_json or const basic_json
-    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
-                  "iter_impl only accepts (const) basic_json");
-
-  public:
-
-    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
-    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
-    /// A user-defined iterator should provide publicly accessible typedefs named
-    /// iterator_category, value_type, difference_type, pointer, and reference.
-    /// Note that value_type is required to be non-const, even for constant iterators.
-    using iterator_category = std::bidirectional_iterator_tag;
-
-    /// the type of the values when the iterator is dereferenced
-    using value_type = typename BasicJsonType::value_type;
-    /// a type to represent differences between iterators
-    using difference_type = typename BasicJsonType::difference_type;
-    /// defines a pointer to the type iterated over (value_type)
-    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
-          typename BasicJsonType::const_pointer,
-          typename BasicJsonType::pointer>::type;
-    /// defines a reference to the type iterated over (value_type)
-    using reference =
-        typename std::conditional<std::is_const<BasicJsonType>::value,
-        typename BasicJsonType::const_reference,
-        typename BasicJsonType::reference>::type;
-
-    /// default constructor
-    iter_impl() = default;
-
-    /*!
-    @brief constructor for a given JSON instance
-    @param[in] object  pointer to a JSON object for this iterator
-    @pre object != nullptr
-    @post The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    explicit iter_impl(pointer object) noexcept : m_object(object)
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = typename object_t::iterator();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = typename array_t::iterator();
-                break;
-            }
-
-            default:
-            {
-                m_it.primitive_iterator = primitive_iterator_t();
-                break;
-            }
-        }
-    }
-
-    /*!
-    @note The conventional copy constructor and copy assignment are implicitly
-          defined. Combined with the following converting constructor and
-          assignment, they support: (1) copy from iterator to iterator, (2)
-          copy from const iterator to const iterator, and (3) conversion from
-          iterator to const iterator. However conversion from const iterator
-          to iterator is not defined.
-    */
-
-    /*!
-    @brief const copy constructor
-    @param[in] other const iterator to copy from
-    @note This copy constructor had to be defined explicitly to circumvent a bug
-          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
-          information refer to: https://github.com/nlohmann/json/issues/1608
-    */
-    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
-        : m_object(other.m_object), m_it(other.m_it)
-    {}
-
-    /*!
-    @brief converting assignment
-    @param[in] other const iterator to copy from
-    @return const/non-const iterator
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
-    {
-        m_object = other.m_object;
-        m_it = other.m_it;
-        return *this;
-    }
-
-    /*!
-    @brief converting constructor
-    @param[in] other  non-const iterator to copy from
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
-        : m_object(other.m_object), m_it(other.m_it)
-    {}
-
-    /*!
-    @brief converting assignment
-    @param[in] other  non-const iterator to copy from
-    @return const/non-const iterator
-    @note It is not checked whether @a other is initialized.
-    */
-    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
-    {
-        m_object = other.m_object;
-        m_it = other.m_it;
-        return *this;
-    }
-
-  private:
-    /*!
-    @brief set the iterator to the first value
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    void set_begin() noexcept
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = m_object->m_value.object->begin();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = m_object->m_value.array->begin();
-                break;
-            }
-
-            case value_t::null:
-            {
-                // set to end so begin()==end() is true: null is empty
-                m_it.primitive_iterator.set_end();
-                break;
-            }
-
-            default:
-            {
-                m_it.primitive_iterator.set_begin();
-                break;
-            }
-        }
-    }
-
-    /*!
-    @brief set the iterator past the last value
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    void set_end() noexcept
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                m_it.object_iterator = m_object->m_value.object->end();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_it.array_iterator = m_object->m_value.array->end();
-                break;
-            }
-
-            default:
-            {
-                m_it.primitive_iterator.set_end();
-                break;
-            }
-        }
-    }
-
-  public:
-    /*!
-    @brief return a reference to the value pointed to by the iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference operator*() const
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                assert(m_it.object_iterator != m_object->m_value.object->end());
-                return m_it.object_iterator->second;
-            }
-
-            case value_t::array:
-            {
-                assert(m_it.array_iterator != m_object->m_value.array->end());
-                return *m_it.array_iterator;
-            }
-
-            case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
-
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
-                {
-                    return *m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
-            }
-        }
-    }
-
-    /*!
-    @brief dereference the iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    pointer operator->() const
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                assert(m_it.object_iterator != m_object->m_value.object->end());
-                return &(m_it.object_iterator->second);
-            }
-
-            case value_t::array:
-            {
-                assert(m_it.array_iterator != m_object->m_value.array->end());
-                return &*m_it.array_iterator;
-            }
-
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
-                {
-                    return m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
-            }
-        }
-    }
-
-    /*!
-    @brief post-increment (it++)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl const operator++(int)
-    {
-        auto result = *this;
-        ++(*this);
-        return result;
-    }
-
-    /*!
-    @brief pre-increment (++it)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator++()
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                std::advance(m_it.object_iterator, 1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, 1);
-                break;
-            }
-
-            default:
-            {
-                ++m_it.primitive_iterator;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief post-decrement (it--)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl const operator--(int)
-    {
-        auto result = *this;
-        --(*this);
-        return result;
-    }
-
-    /*!
-    @brief pre-decrement (--it)
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator--()
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-            {
-                std::advance(m_it.object_iterator, -1);
-                break;
-            }
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, -1);
-                break;
-            }
-
-            default:
-            {
-                --m_it.primitive_iterator;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief  comparison: equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator==(const iter_impl& other) const
-    {
-        // if objects are not the same, the comparison is undefined
-        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
-        }
-
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                return (m_it.object_iterator == other.m_it.object_iterator);
-
-            case value_t::array:
-                return (m_it.array_iterator == other.m_it.array_iterator);
-
-            default:
-                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
-        }
-    }
-
-    /*!
-    @brief  comparison: not equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator!=(const iter_impl& other) const
-    {
-        return not operator==(other);
-    }
-
-    /*!
-    @brief  comparison: smaller
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator<(const iter_impl& other) const
-    {
-        // if objects are not the same, the comparison is undefined
-        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
-        }
-
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators"));
-
-            case value_t::array:
-                return (m_it.array_iterator < other.m_it.array_iterator);
-
-            default:
-                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
-        }
-    }
-
-    /*!
-    @brief  comparison: less than or equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator<=(const iter_impl& other) const
-    {
-        return not other.operator < (*this);
-    }
-
-    /*!
-    @brief  comparison: greater than
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator>(const iter_impl& other) const
-    {
-        return not operator<=(other);
-    }
-
-    /*!
-    @brief  comparison: greater than or equal
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    bool operator>=(const iter_impl& other) const
-    {
-        return not operator<(other);
-    }
-
-    /*!
-    @brief  add to iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator+=(difference_type i)
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
-
-            case value_t::array:
-            {
-                std::advance(m_it.array_iterator, i);
-                break;
-            }
-
-            default:
-            {
-                m_it.primitive_iterator += i;
-                break;
-            }
-        }
-
-        return *this;
-    }
-
-    /*!
-    @brief  subtract from iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl& operator-=(difference_type i)
-    {
-        return operator+=(-i);
-    }
-
-    /*!
-    @brief  add to iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator+(difference_type i) const
-    {
-        auto result = *this;
-        result += i;
-        return result;
-    }
-
-    /*!
-    @brief  addition of distance and iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    friend iter_impl operator+(difference_type i, const iter_impl& it)
-    {
-        auto result = it;
-        result += i;
-        return result;
-    }
-
-    /*!
-    @brief  subtract from iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    iter_impl operator-(difference_type i) const
-    {
-        auto result = *this;
-        result -= i;
-        return result;
-    }
-
-    /*!
-    @brief  return difference
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    difference_type operator-(const iter_impl& other) const
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
-
-            case value_t::array:
-                return m_it.array_iterator - other.m_it.array_iterator;
-
-            default:
-                return m_it.primitive_iterator - other.m_it.primitive_iterator;
-        }
-    }
-
-    /*!
-    @brief  access to successor
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference operator[](difference_type n) const
-    {
-        assert(m_object != nullptr);
-
-        switch (m_object->m_type)
-        {
-            case value_t::object:
-                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators"));
-
-            case value_t::array:
-                return *std::next(m_it.array_iterator, n);
-
-            case value_t::null:
-                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
-
-            default:
-            {
-                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
-                {
-                    return *m_object;
-                }
-
-                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
-            }
-        }
-    }
-
-    /*!
-    @brief  return the key of an object iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    const typename object_t::key_type& key() const
-    {
-        assert(m_object != nullptr);
-
-        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
-        {
-            return m_it.object_iterator->first;
-        }
-
-        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators"));
-    }
-
-    /*!
-    @brief  return the value of an iterator
-    @pre The iterator is initialized; i.e. `m_object != nullptr`.
-    */
-    reference value() const
-    {
-        return operator*();
-    }
-
-  private:
-    /// associated JSON instance
-    pointer m_object = nullptr;
-    /// the actual iterator of the associated instance
-    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
-};
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
-
-// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
-
-
-#include <cstddef> // ptrdiff_t
-#include <iterator> // reverse_iterator
-#include <utility> // declval
-
-namespace nlohmann
-{
-namespace detail
-{
-//////////////////////
-// reverse_iterator //
-//////////////////////
-
-/*!
-@brief a template for a reverse iterator class
-
-@tparam Base the base iterator type to reverse. Valid types are @ref
-iterator (to create @ref reverse_iterator) and @ref const_iterator (to
-create @ref const_reverse_iterator).
-
-@requirement The class satisfies the following concept requirements:
--
-[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
-  The iterator that can be moved can be moved in both directions (i.e.
-  incremented and decremented).
-- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
-  It is possible to write to the pointed-to element (only if @a Base is
-  @ref iterator).
-
-@since version 1.0.0
-*/
-template<typename Base>
-class json_reverse_iterator : public std::reverse_iterator<Base>
-{
-  public:
-    using difference_type = std::ptrdiff_t;
-    /// shortcut to the reverse iterator adapter
-    using base_iterator = std::reverse_iterator<Base>;
-    /// the reference type for the pointed-to element
-    using reference = typename Base::reference;
-
-    /// create reverse iterator from iterator
-    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
-        : base_iterator(it) {}
-
-    /// create reverse iterator from base class
-    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
-
-    /// post-increment (it++)
-    json_reverse_iterator const operator++(int)
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
-    }
-
-    /// pre-increment (++it)
-    json_reverse_iterator& operator++()
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
-    }
-
-    /// post-decrement (it--)
-    json_reverse_iterator const operator--(int)
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
-    }
-
-    /// pre-decrement (--it)
-    json_reverse_iterator& operator--()
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
-    }
-
-    /// add to iterator
-    json_reverse_iterator& operator+=(difference_type i)
-    {
-        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
-    }
-
-    /// add to iterator
-    json_reverse_iterator operator+(difference_type i) const
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
-    }
-
-    /// subtract from iterator
-    json_reverse_iterator operator-(difference_type i) const
-    {
-        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
-    }
-
-    /// return difference
-    difference_type operator-(const json_reverse_iterator& other) const
-    {
-        return base_iterator(*this) - base_iterator(other);
-    }
-
-    /// access to successor
-    reference operator[](difference_type n) const
-    {
-        return *(this->operator+(n));
-    }
-
-    /// return the key of an object iterator
-    auto key() const -> decltype(std::declval<Base>().key())
-    {
-        auto it = --this->base();
-        return it.key();
-    }
-
-    /// return the value of an iterator
-    reference value() const
-    {
-        auto it = --this->base();
-        return it.operator * ();
-    }
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
-
-// #include <nlohmann/detail/json_pointer.hpp>
-
-
-#include <algorithm> // all_of
-#include <cassert> // assert
-#include <cctype> // isdigit
-#include <numeric> // accumulate
-#include <string> // string
-#include <utility> // move
-#include <vector> // vector
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-template<typename BasicJsonType>
-class json_pointer
-{
-    // allow basic_json to access private members
-    NLOHMANN_BASIC_JSON_TPL_DECLARATION
-    friend class basic_json;
-
-  public:
-    /*!
-    @brief create JSON pointer
-
-    Create a JSON pointer according to the syntax described in
-    [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
-
-    @param[in] s  string representing the JSON pointer; if omitted, the empty
-                  string is assumed which references the whole JSON value
-
-    @throw parse_error.107 if the given JSON pointer @a s is nonempty and does
-                           not begin with a slash (`/`); see example below
-
-    @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is
-    not followed by `0` (representing `~`) or `1` (representing `/`); see
-    example below
-
-    @liveexample{The example shows the construction several valid JSON pointers
-    as well as the exceptional behavior.,json_pointer}
-
-    @since version 2.0.0
-    */
-    explicit json_pointer(const std::string& s = "")
-        : reference_tokens(split(s))
-    {}
-
-    /*!
-    @brief return a string representation of the JSON pointer
-
-    @invariant For each JSON pointer `ptr`, it holds:
-    @code {.cpp}
-    ptr == json_pointer(ptr.to_string());
-    @endcode
-
-    @return a string representation of the JSON pointer
-
-    @liveexample{The example shows the result of `to_string`.,json_pointer__to_string}
-
-    @since version 2.0.0
-    */
-    std::string to_string() const
-    {
-        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
-                               std::string{},
-                               [](const std::string & a, const std::string & b)
-        {
-            return a + "/" + escape(b);
-        });
-    }
-
-    /// @copydoc to_string()
-    operator std::string() const
-    {
-        return to_string();
-    }
-
-    /*!
-    @brief append another JSON pointer at the end of this JSON pointer
-
-    @param[in] ptr  JSON pointer to append
-    @return JSON pointer with @a ptr appended
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa @ref operator/=(std::string) to append a reference token
-    @sa @ref operator/=(std::size_t) to append an array index
-    @sa @ref operator/(const json_pointer&, const json_pointer&) for a binary operator
-
-    @since version 3.6.0
-    */
-    json_pointer& operator/=(const json_pointer& ptr)
-    {
-        reference_tokens.insert(reference_tokens.end(),
-                                ptr.reference_tokens.begin(),
-                                ptr.reference_tokens.end());
-        return *this;
-    }
-
-    /*!
-    @brief append an unescaped reference token at the end of this JSON pointer
-
-    @param[in] token  reference token to append
-    @return JSON pointer with @a token appended without escaping @a token
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Amortized constant.
-
-    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
-    @sa @ref operator/=(std::size_t) to append an array index
-    @sa @ref operator/(const json_pointer&, std::size_t) for a binary operator
-
-    @since version 3.6.0
-    */
-    json_pointer& operator/=(std::string token)
-    {
-        push_back(std::move(token));
-        return *this;
-    }
-
-    /*!
-    @brief append an array index at the end of this JSON pointer
-
-    @param[in] array_index  array index to append
-    @return JSON pointer with @a array_index appended
-
-    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
-
-    @complexity Amortized constant.
-
-    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
-    @sa @ref operator/=(std::string) to append a reference token
-    @sa @ref operator/(const json_pointer&, std::string) for a binary operator
-
-    @since version 3.6.0
-    */
-    json_pointer& operator/=(std::size_t array_index)
-    {
-        return *this /= std::to_string(array_index);
-    }
-
-    /*!
-    @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
-
-    @param[in] lhs  JSON pointer
-    @param[in] rhs  JSON pointer
-    @return a new JSON pointer with @a rhs appended to @a lhs
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a lhs and @a rhs.
-
-    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& lhs,
-                                  const json_pointer& rhs)
-    {
-        return json_pointer(lhs) /= rhs;
-    }
-
-    /*!
-    @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
-
-    @param[in] ptr  JSON pointer
-    @param[in] token  reference token
-    @return a new JSON pointer with unescaped @a token appended to @a ptr
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa @ref operator/=(std::string) to append a reference token
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& ptr, std::string token)
-    {
-        return json_pointer(ptr) /= std::move(token);
-    }
-
-    /*!
-    @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
-
-    @param[in] ptr  JSON pointer
-    @param[in] array_index  array index
-    @return a new JSON pointer with @a array_index appended to @a ptr
-
-    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
-
-    @complexity Linear in the length of @a ptr.
-
-    @sa @ref operator/=(std::size_t) to append an array index
-
-    @since version 3.6.0
-    */
-    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_index)
-    {
-        return json_pointer(ptr) /= array_index;
-    }
-
-    /*!
-    @brief returns the parent of this JSON pointer
-
-    @return parent of this JSON pointer; in case this JSON pointer is the root,
-            the root itself is returned
-
-    @complexity Linear in the length of the JSON pointer.
-
-    @liveexample{The example shows the result of `parent_pointer` for different
-    JSON Pointers.,json_pointer__parent_pointer}
-
-    @since version 3.6.0
-    */
-    json_pointer parent_pointer() const
-    {
-        if (empty())
-        {
-            return *this;
-        }
-
-        json_pointer res = *this;
-        res.pop_back();
-        return res;
-    }
-
-    /*!
-    @brief remove last reference token
-
-    @pre not `empty()`
-
-    @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back}
-
-    @complexity Constant.
-
-    @throw out_of_range.405 if JSON pointer has no parent
-
-    @since version 3.6.0
-    */
-    void pop_back()
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
-        }
-
-        reference_tokens.pop_back();
-    }
-
-    /*!
-    @brief return last reference token
-
-    @pre not `empty()`
-    @return last reference token
-
-    @liveexample{The example shows the usage of `back`.,json_pointer__back}
-
-    @complexity Constant.
-
-    @throw out_of_range.405 if JSON pointer has no parent
-
-    @since version 3.6.0
-    */
-    const std::string& back() const
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
-        }
-
-        return reference_tokens.back();
-    }
-
-    /*!
-    @brief append an unescaped token at the end of the reference pointer
-
-    @param[in] token  token to add
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows the result of `push_back` for different
-    JSON Pointers.,json_pointer__push_back}
-
-    @since version 3.6.0
-    */
-    void push_back(const std::string& token)
-    {
-        reference_tokens.push_back(token);
-    }
-
-    /// @copydoc push_back(const std::string&)
-    void push_back(std::string&& token)
-    {
-        reference_tokens.push_back(std::move(token));
-    }
-
-    /*!
-    @brief return whether pointer points to the root document
-
-    @return true iff the JSON pointer points to the root document
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example shows the result of `empty` for different JSON
-    Pointers.,json_pointer__empty}
-
-    @since version 3.6.0
-    */
-    bool empty() const noexcept
-    {
-        return reference_tokens.empty();
-    }
-
-  private:
-    /*!
-    @param[in] s  reference token to be converted into an array index
-
-    @return integer representation of @a s
-
-    @throw out_of_range.404 if string @a s could not be converted to an integer
-    */
-    static int array_index(const std::string& s)
-    {
-        std::size_t processed_chars = 0;
-        const int res = std::stoi(s, &processed_chars);
-
-        // check if the string was completely read
-        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
-        {
-            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'"));
-        }
-
-        return res;
-    }
-
-    json_pointer top() const
-    {
-        if (JSON_HEDLEY_UNLIKELY(empty()))
-        {
-            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
-        }
-
-        json_pointer result = *this;
-        result.reference_tokens = {reference_tokens[0]};
-        return result;
-    }
-
-    /*!
-    @brief create and return a reference to the pointed to value
-
-    @complexity Linear in the number of reference tokens.
-
-    @throw parse_error.109 if array index is not a number
-    @throw type_error.313 if value cannot be unflattened
-    */
-    BasicJsonType& get_and_create(BasicJsonType& j) const
-    {
-        using size_type = typename BasicJsonType::size_type;
-        auto result = &j;
-
-        // in case no reference tokens exist, return a reference to the JSON value
-        // j which will be overwritten by a primitive value
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (result->type())
-            {
-                case detail::value_t::null:
-                {
-                    if (reference_token == "0")
-                    {
-                        // start a new array if reference token is 0
-                        result = &result->operator[](0);
-                    }
-                    else
-                    {
-                        // start a new object otherwise
-                        result = &result->operator[](reference_token);
-                    }
-                    break;
-                }
-
-                case detail::value_t::object:
-                {
-                    // create an entry in the object
-                    result = &result->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    // create an entry in the array
-                    JSON_TRY
-                    {
-                        result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
-                    }
-                    JSON_CATCH(std::invalid_argument&)
-                    {
-                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                    }
-                    break;
-                }
-
-                /*
-                The following code is only reached if there exists a reference
-                token _and_ the current value is primitive. In this case, we have
-                an error situation, because primitive values may only occur as
-                single value; that is, with an empty list of reference tokens.
-                */
-                default:
-                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten"));
-            }
-        }
-
-        return *result;
-    }
-
-    /*!
-    @brief return a reference to the pointed to value
-
-    @note This version does not throw if a value is not present, but tries to
-          create nested values instead. For instance, calling this function
-          with pointer `"/this/that"` on a null value is equivalent to calling
-          `operator[]("this").operator[]("that")` on that value, effectively
-          changing the null value to an object.
-
-    @param[in] ptr  a JSON value
-
-    @return reference to the JSON value pointed to by the JSON pointer
-
-    @complexity Linear in the length of the JSON pointer.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
-    {
-        using size_type = typename BasicJsonType::size_type;
-        for (const auto& reference_token : reference_tokens)
-        {
-            // convert null values to arrays or objects before continuing
-            if (ptr->is_null())
-            {
-                // check if reference token is a number
-                const bool nums =
-                    std::all_of(reference_token.begin(), reference_token.end(),
-                                [](const unsigned char x)
-                {
-                    return std::isdigit(x);
-                });
-
-                // change value to array for numbers or "-" or to object otherwise
-                *ptr = (nums or reference_token == "-")
-                       ? detail::value_t::array
-                       : detail::value_t::object;
-            }
-
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // use unchecked object access
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    // error condition (cf. RFC 6901, Sect. 4)
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
-                    {
-                        JSON_THROW(detail::parse_error::create(106, 0,
-                                                               "array index '" + reference_token +
-                                                               "' must not begin with '0'"));
-                    }
-
-                    if (reference_token == "-")
-                    {
-                        // explicitly treat "-" as index beyond the end
-                        ptr = &ptr->operator[](ptr->m_value.array->size());
-                    }
-                    else
-                    {
-                        // convert array index to number; unchecked access
-                        JSON_TRY
-                        {
-                            ptr = &ptr->operator[](
-                                static_cast<size_type>(array_index(reference_token)));
-                        }
-                        JSON_CATCH(std::invalid_argument&)
-                        {
-                            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                        }
-                    }
-                    break;
-                }
-
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    BasicJsonType& get_checked(BasicJsonType* ptr) const
-    {
-        using size_type = typename BasicJsonType::size_type;
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // note: at performs range check
-                    ptr = &ptr->at(reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range"));
-                    }
-
-                    // error condition (cf. RFC 6901, Sect. 4)
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
-                    {
-                        JSON_THROW(detail::parse_error::create(106, 0,
-                                                               "array index '" + reference_token +
-                                                               "' must not begin with '0'"));
-                    }
-
-                    // note: at performs range check
-                    JSON_TRY
-                    {
-                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
-                    }
-                    JSON_CATCH(std::invalid_argument&)
-                    {
-                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                    }
-                    break;
-                }
-
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @brief return a const reference to the pointed to value
-
-    @param[in] ptr  a JSON value
-
-    @return const reference to the JSON value pointed to by the JSON
-    pointer
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
-    {
-        using size_type = typename BasicJsonType::size_type;
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // use unchecked object access
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" cannot be used for const access
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range"));
-                    }
-
-                    // error condition (cf. RFC 6901, Sect. 4)
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
-                    {
-                        JSON_THROW(detail::parse_error::create(106, 0,
-                                                               "array index '" + reference_token +
-                                                               "' must not begin with '0'"));
-                    }
-
-                    // use unchecked array access
-                    JSON_TRY
-                    {
-                        ptr = &ptr->operator[](
-                            static_cast<size_type>(array_index(reference_token)));
-                    }
-                    JSON_CATCH(std::invalid_argument&)
-                    {
-                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                    }
-                    break;
-                }
-
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-    */
-    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
-    {
-        using size_type = typename BasicJsonType::size_type;
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    // note: at performs range check
-                    ptr = &ptr->at(reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        JSON_THROW(detail::out_of_range::create(402,
-                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
-                                                                ") is out of range"));
-                    }
-
-                    // error condition (cf. RFC 6901, Sect. 4)
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
-                    {
-                        JSON_THROW(detail::parse_error::create(106, 0,
-                                                               "array index '" + reference_token +
-                                                               "' must not begin with '0'"));
-                    }
-
-                    // note: at performs range check
-                    JSON_TRY
-                    {
-                        ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
-                    }
-                    JSON_CATCH(std::invalid_argument&)
-                    {
-                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                    }
-                    break;
-                }
-
-                default:
-                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
-            }
-        }
-
-        return *ptr;
-    }
-
-    /*!
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    */
-    bool contains(const BasicJsonType* ptr) const
-    {
-        using size_type = typename BasicJsonType::size_type;
-        for (const auto& reference_token : reference_tokens)
-        {
-            switch (ptr->type())
-            {
-                case detail::value_t::object:
-                {
-                    if (not ptr->contains(reference_token))
-                    {
-                        // we did not find the key in the object
-                        return false;
-                    }
-
-                    ptr = &ptr->operator[](reference_token);
-                    break;
-                }
-
-                case detail::value_t::array:
-                {
-                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
-                    {
-                        // "-" always fails the range check
-                        return false;
-                    }
-
-                    // error condition (cf. RFC 6901, Sect. 4)
-                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1 and reference_token[0] == '0'))
-                    {
-                        JSON_THROW(detail::parse_error::create(106, 0,
-                                                               "array index '" + reference_token +
-                                                               "' must not begin with '0'"));
-                    }
-
-                    JSON_TRY
-                    {
-                        const auto idx = static_cast<size_type>(array_index(reference_token));
-                        if (idx >= ptr->size())
-                        {
-                            // index out of range
-                            return false;
-                        }
-
-                        ptr = &ptr->operator[](idx);
-                        break;
-                    }
-                    JSON_CATCH(std::invalid_argument&)
-                    {
-                        JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
-                    }
-                    break;
-                }
-
-                default:
-                {
-                    // we do not expect primitive values if there is still a
-                    // reference token to process
-                    return false;
-                }
-            }
-        }
-
-        // no reference token left means we found a primitive value
-        return true;
-    }
-
-    /*!
-    @brief split the string input to reference tokens
-
-    @note This function is only called by the json_pointer constructor.
-          All exceptions below are documented there.
-
-    @throw parse_error.107  if the pointer is not empty or begins with '/'
-    @throw parse_error.108  if character '~' is not followed by '0' or '1'
-    */
-    static std::vector<std::string> split(const std::string& reference_string)
-    {
-        std::vector<std::string> result;
-
-        // special case: empty reference string -> no reference tokens
-        if (reference_string.empty())
-        {
-            return result;
-        }
-
-        // check if nonempty reference string begins with slash
-        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
-        {
-            JSON_THROW(detail::parse_error::create(107, 1,
-                                                   "JSON pointer must be empty or begin with '/' - was: '" +
-                                                   reference_string + "'"));
-        }
-
-        // extract the reference tokens:
-        // - slash: position of the last read slash (or end of string)
-        // - start: position after the previous slash
-        for (
-            // search for the first slash after the first character
-            std::size_t slash = reference_string.find_first_of('/', 1),
-            // set the beginning of the first reference token
-            start = 1;
-            // we can stop if start == 0 (if slash == std::string::npos)
-            start != 0;
-            // set the beginning of the next reference token
-            // (will eventually be 0 if slash == std::string::npos)
-            start = (slash == std::string::npos) ? 0 : slash + 1,
-            // find next slash
-            slash = reference_string.find_first_of('/', start))
-        {
-            // use the text between the beginning of the reference token
-            // (start) and the last slash (slash).
-            auto reference_token = reference_string.substr(start, slash - start);
-
-            // check reference tokens are properly escaped
-            for (std::size_t pos = reference_token.find_first_of('~');
-                    pos != std::string::npos;
-                    pos = reference_token.find_first_of('~', pos + 1))
-            {
-                assert(reference_token[pos] == '~');
-
-                // ~ must be followed by 0 or 1
-                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 or
-                                         (reference_token[pos + 1] != '0' and
-                                          reference_token[pos + 1] != '1')))
-                {
-                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'"));
-                }
-            }
-
-            // finally, store the reference token
-            unescape(reference_token);
-            result.push_back(reference_token);
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief replace all occurrences of a substring by another string
-
-    @param[in,out] s  the string to manipulate; changed so that all
-                   occurrences of @a f are replaced with @a t
-    @param[in]     f  the substring to replace with @a t
-    @param[in]     t  the string to replace @a f
-
-    @pre The search string @a f must not be empty. **This precondition is
-    enforced with an assertion.**
-
-    @since version 2.0.0
-    */
-    static void replace_substring(std::string& s, const std::string& f,
-                                  const std::string& t)
-    {
-        assert(not f.empty());
-        for (auto pos = s.find(f);                // find first occurrence of f
-                pos != std::string::npos;         // make sure f was found
-                s.replace(pos, f.size(), t),      // replace with t, and
-                pos = s.find(f, pos + t.size()))  // find next occurrence of f
-        {}
-    }
-
-    /// escape "~" to "~0" and "/" to "~1"
-    static std::string escape(std::string s)
-    {
-        replace_substring(s, "~", "~0");
-        replace_substring(s, "/", "~1");
-        return s;
-    }
-
-    /// unescape "~1" to tilde and "~0" to slash (order is important!)
-    static void unescape(std::string& s)
-    {
-        replace_substring(s, "~1", "/");
-        replace_substring(s, "~0", "~");
-    }
-
-    /*!
-    @param[in] reference_string  the reference string to the current value
-    @param[in] value             the value to consider
-    @param[in,out] result        the result object to insert values to
-
-    @note Empty objects or arrays are flattened to `null`.
-    */
-    static void flatten(const std::string& reference_string,
-                        const BasicJsonType& value,
-                        BasicJsonType& result)
-    {
-        switch (value.type())
-        {
-            case detail::value_t::array:
-            {
-                if (value.m_value.array->empty())
-                {
-                    // flatten empty array as null
-                    result[reference_string] = nullptr;
-                }
-                else
-                {
-                    // iterate array and use index as reference string
-                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
-                    {
-                        flatten(reference_string + "/" + std::to_string(i),
-                                value.m_value.array->operator[](i), result);
-                    }
-                }
-                break;
-            }
-
-            case detail::value_t::object:
-            {
-                if (value.m_value.object->empty())
-                {
-                    // flatten empty object as null
-                    result[reference_string] = nullptr;
-                }
-                else
-                {
-                    // iterate object and use keys as reference string
-                    for (const auto& element : *value.m_value.object)
-                    {
-                        flatten(reference_string + "/" + escape(element.first), element.second, result);
-                    }
-                }
-                break;
-            }
-
-            default:
-            {
-                // add primitive value with its reference string
-                result[reference_string] = value;
-                break;
-            }
-        }
-    }
-
-    /*!
-    @param[in] value  flattened JSON
-
-    @return unflattened JSON
-
-    @throw parse_error.109 if array index is not a number
-    @throw type_error.314  if value is not an object
-    @throw type_error.315  if object values are not primitive
-    @throw type_error.313  if value cannot be unflattened
-    */
-    static BasicJsonType
-    unflatten(const BasicJsonType& value)
-    {
-        if (JSON_HEDLEY_UNLIKELY(not value.is_object()))
-        {
-            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened"));
-        }
-
-        BasicJsonType result;
-
-        // iterate the JSON object values
-        for (const auto& element : *value.m_value.object)
-        {
-            if (JSON_HEDLEY_UNLIKELY(not element.second.is_primitive()))
-            {
-                JSON_THROW(detail::type_error::create(315, "values in object must be primitive"));
-            }
-
-            // assign value to reference pointed to by JSON pointer; Note that if
-            // the JSON pointer is "" (i.e., points to the whole value), function
-            // get_and_create returns a reference to result itself. An assignment
-            // will then create a primitive value.
-            json_pointer(element.first).get_and_create(result) = element.second;
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief compares two JSON pointers for equality
-
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is equal to @a rhs
-
-    @complexity Linear in the length of the JSON pointer
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator==(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
-    {
-        return lhs.reference_tokens == rhs.reference_tokens;
-    }
-
-    /*!
-    @brief compares two JSON pointers for inequality
-
-    @param[in] lhs  JSON pointer to compare
-    @param[in] rhs  JSON pointer to compare
-    @return whether @a lhs is not equal @a rhs
-
-    @complexity Linear in the length of the JSON pointer
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-    */
-    friend bool operator!=(json_pointer const& lhs,
-                           json_pointer const& rhs) noexcept
-    {
-        return not (lhs == rhs);
-    }
-
-    /// the reference tokens
-    std::vector<std::string> reference_tokens;
-};
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/json_ref.hpp>
-
-
-#include <initializer_list>
-#include <utility>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-template<typename BasicJsonType>
-class json_ref
-{
-  public:
-    using value_type = BasicJsonType;
-
-    json_ref(value_type&& value)
-        : owned_value(std::move(value)), value_ref(&owned_value), is_rvalue(true)
-    {}
-
-    json_ref(const value_type& value)
-        : value_ref(const_cast<value_type*>(&value)), is_rvalue(false)
-    {}
-
-    json_ref(std::initializer_list<json_ref> init)
-        : owned_value(init), value_ref(&owned_value), is_rvalue(true)
-    {}
-
-    template <
-        class... Args,
-        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
-    json_ref(Args && ... args)
-        : owned_value(std::forward<Args>(args)...), value_ref(&owned_value),
-          is_rvalue(true) {}
-
-    // class should be movable only
-    json_ref(json_ref&&) = default;
-    json_ref(const json_ref&) = delete;
-    json_ref& operator=(const json_ref&) = delete;
-    json_ref& operator=(json_ref&&) = delete;
-    ~json_ref() = default;
-
-    value_type moved_or_copied() const
-    {
-        if (is_rvalue)
-        {
-            return std::move(*value_ref);
-        }
-        return *value_ref;
-    }
-
-    value_type const& operator*() const
-    {
-        return *static_cast<value_type const*>(value_ref);
-    }
-
-    value_type const* operator->() const
-    {
-        return static_cast<value_type const*>(value_ref);
-    }
-
-  private:
-    mutable value_type owned_value = nullptr;
-    value_type* value_ref = nullptr;
-    const bool is_rvalue;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/meta/type_traits.hpp>
-
-// #include <nlohmann/detail/output/binary_writer.hpp>
-
-
-#include <algorithm> // reverse
-#include <array> // array
-#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
-#include <cstring> // memcpy
-#include <limits> // numeric_limits
-#include <string> // string
-
-// #include <nlohmann/detail/input/binary_reader.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-
-#include <algorithm> // copy
-#include <cstddef> // size_t
-#include <ios> // streamsize
-#include <iterator> // back_inserter
-#include <memory> // shared_ptr, make_shared
-#include <ostream> // basic_ostream
-#include <string> // basic_string
-#include <vector> // vector
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-/// abstract output adapter interface
-template<typename CharType> struct output_adapter_protocol
-{
-    virtual void write_character(CharType c) = 0;
-    virtual void write_characters(const CharType* s, std::size_t length) = 0;
-    virtual ~output_adapter_protocol() = default;
-};
-
-/// a type to simplify interfaces
-template<typename CharType>
-using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
-
-/// output adapter for byte vectors
-template<typename CharType>
-class output_vector_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_vector_adapter(std::vector<CharType>& vec) noexcept
-        : v(vec)
-    {}
-
-    void write_character(CharType c) override
-    {
-        v.push_back(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        std::copy(s, s + length, std::back_inserter(v));
-    }
-
-  private:
-    std::vector<CharType>& v;
-};
-
-/// output adapter for output streams
-template<typename CharType>
-class output_stream_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
-        : stream(s)
-    {}
-
-    void write_character(CharType c) override
-    {
-        stream.put(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        stream.write(s, static_cast<std::streamsize>(length));
-    }
-
-  private:
-    std::basic_ostream<CharType>& stream;
-};
-
-/// output adapter for basic_string
-template<typename CharType, typename StringType = std::basic_string<CharType>>
-class output_string_adapter : public output_adapter_protocol<CharType>
-{
-  public:
-    explicit output_string_adapter(StringType& s) noexcept
-        : str(s)
-    {}
-
-    void write_character(CharType c) override
-    {
-        str.push_back(c);
-    }
-
-    JSON_HEDLEY_NON_NULL(2)
-    void write_characters(const CharType* s, std::size_t length) override
-    {
-        str.append(s, length);
-    }
-
-  private:
-    StringType& str;
-};
-
-template<typename CharType, typename StringType = std::basic_string<CharType>>
-class output_adapter
-{
-  public:
-    output_adapter(std::vector<CharType>& vec)
-        : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
-
-    output_adapter(std::basic_ostream<CharType>& s)
-        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
-
-    output_adapter(StringType& s)
-        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
-
-    operator output_adapter_t<CharType>()
-    {
-        return oa;
-    }
-
-  private:
-    output_adapter_t<CharType> oa = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////
-// binary writer //
-///////////////////
-
-/*!
-@brief serialization to CBOR and MessagePack values
-*/
-template<typename BasicJsonType, typename CharType>
-class binary_writer
-{
-    using string_t = typename BasicJsonType::string_t;
-
-  public:
-    /*!
-    @brief create a binary writer
-
-    @param[in] adapter  output adapter to write to
-    */
-    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
-    {
-        assert(oa);
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
-    */
-    void write_bson(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::object:
-            {
-                write_bson_object(*j.m_value.object);
-                break;
-            }
-
-            default:
-            {
-                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name())));
-            }
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    */
-    void write_cbor(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                oa->write_character(to_char_type(0xF6));
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                oa->write_character(j.m_value.boolean
-                                    ? to_char_type(0xF5)
-                                    : to_char_type(0xF4));
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // CBOR does not differentiate between positive signed
-                    // integers and unsigned integers. Therefore, we used the
-                    // code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_integer <= 0x17)
-                    {
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x18));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x19));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x1A));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                    }
-                    else
-                    {
-                        oa->write_character(to_char_type(0x1B));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                    }
-                }
-                else
-                {
-                    // The conversions below encode the sign in the first
-                    // byte, and the value is converted to a positive number.
-                    const auto positive_number = -1 - j.m_value.number_integer;
-                    if (j.m_value.number_integer >= -24)
-                    {
-                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x38));
-                        write_number(static_cast<std::uint8_t>(positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x39));
-                        write_number(static_cast<std::uint16_t>(positive_number));
-                    }
-                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        oa->write_character(to_char_type(0x3A));
-                        write_number(static_cast<std::uint32_t>(positive_number));
-                    }
-                    else
-                    {
-                        oa->write_character(to_char_type(0x3B));
-                        write_number(static_cast<std::uint64_t>(positive_number));
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x18));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x19));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x1A));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
-                }
-                else
-                {
-                    oa->write_character(to_char_type(0x1B));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                oa->write_character(get_cbor_float_prefix(j.m_value.number_float));
-                write_number(j.m_value.number_float);
-                break;
-            }
-
-            case value_t::string:
-            {
-                // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x60 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x78));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x79));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x7A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x7B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write the string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0x80 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x98));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x99));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x9A));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0x9B));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_cbor(el);
-                }
-                break;
-            }
-
-            case value_t::object:
-            {
-                // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
-                if (N <= 0x17)
-                {
-                    write_number(static_cast<std::uint8_t>(0xA0 + N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xB8));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xB9));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xBA));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-                // LCOV_EXCL_START
-                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    oa->write_character(to_char_type(0xBB));
-                    write_number(static_cast<std::uint64_t>(N));
-                }
-                // LCOV_EXCL_STOP
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_cbor(el.first);
-                    write_cbor(el.second);
-                }
-                break;
-            }
-
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    */
-    void write_msgpack(const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::null: // nil
-            {
-                oa->write_character(to_char_type(0xC0));
-                break;
-            }
-
-            case value_t::boolean: // true and false
-            {
-                oa->write_character(j.m_value.boolean
-                                    ? to_char_type(0xC3)
-                                    : to_char_type(0xC2));
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                if (j.m_value.number_integer >= 0)
-                {
-                    // MessagePack does not differentiate between positive
-                    // signed integers and unsigned integers. Therefore, we used
-                    // the code from the value_t::number_unsigned case here.
-                    if (j.m_value.number_unsigned < 128)
-                    {
-                        // positive fixnum
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                    {
-                        // uint 8
-                        oa->write_character(to_char_type(0xCC));
-                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                    {
-                        // uint 16
-                        oa->write_character(to_char_type(0xCD));
-                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                    {
-                        // uint 32
-                        oa->write_character(to_char_type(0xCE));
-                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
-                    {
-                        // uint 64
-                        oa->write_character(to_char_type(0xCF));
-                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                    }
-                }
-                else
-                {
-                    if (j.m_value.number_integer >= -32)
-                    {
-                        // negative fixnum
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() and
-                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
-                    {
-                        // int 8
-                        oa->write_character(to_char_type(0xD0));
-                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() and
-                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
-                    {
-                        // int 16
-                        oa->write_character(to_char_type(0xD1));
-                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() and
-                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
-                    {
-                        // int 32
-                        oa->write_character(to_char_type(0xD2));
-                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
-                    }
-                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() and
-                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
-                    {
-                        // int 64
-                        oa->write_character(to_char_type(0xD3));
-                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
-                    }
-                }
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned < 128)
-                {
-                    // positive fixnum
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    // uint 8
-                    oa->write_character(to_char_type(0xCC));
-                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // uint 16
-                    oa->write_character(to_char_type(0xCD));
-                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // uint 32
-                    oa->write_character(to_char_type(0xCE));
-                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
-                }
-                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
-                {
-                    // uint 64
-                    oa->write_character(to_char_type(0xCF));
-                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
-                }
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                oa->write_character(get_msgpack_float_prefix(j.m_value.number_float));
-                write_number(j.m_value.number_float);
-                break;
-            }
-
-            case value_t::string:
-            {
-                // step 1: write control byte and the string length
-                const auto N = j.m_value.string->size();
-                if (N <= 31)
-                {
-                    // fixstr
-                    write_number(static_cast<std::uint8_t>(0xA0 | N));
-                }
-                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    // str 8
-                    oa->write_character(to_char_type(0xD9));
-                    write_number(static_cast<std::uint8_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // str 16
-                    oa->write_character(to_char_type(0xDA));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // str 32
-                    oa->write_character(to_char_type(0xDB));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write the string
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                // step 1: write control byte and the array size
-                const auto N = j.m_value.array->size();
-                if (N <= 15)
-                {
-                    // fixarray
-                    write_number(static_cast<std::uint8_t>(0x90 | N));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // array 16
-                    oa->write_character(to_char_type(0xDC));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // array 32
-                    oa->write_character(to_char_type(0xDD));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_msgpack(el);
-                }
-                break;
-            }
-
-            case value_t::object:
-            {
-                // step 1: write control byte and the object size
-                const auto N = j.m_value.object->size();
-                if (N <= 15)
-                {
-                    // fixmap
-                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
-                }
-                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
-                {
-                    // map 16
-                    oa->write_character(to_char_type(0xDE));
-                    write_number(static_cast<std::uint16_t>(N));
-                }
-                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
-                {
-                    // map 32
-                    oa->write_character(to_char_type(0xDF));
-                    write_number(static_cast<std::uint32_t>(N));
-                }
-
-                // step 2: write each element
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_msgpack(el.first);
-                    write_msgpack(el.second);
-                }
-                break;
-            }
-
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    @param[in] use_count   whether to use '#' prefixes (optimized format)
-    @param[in] use_type    whether to use '$' prefixes (optimized format)
-    @param[in] add_prefix  whether prefixes need to be used for this value
-    */
-    void write_ubjson(const BasicJsonType& j, const bool use_count,
-                      const bool use_type, const bool add_prefix = true)
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('Z'));
-                }
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(j.m_value.boolean
-                                        ? to_char_type('T')
-                                        : to_char_type('F'));
-                }
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
-                break;
-            }
-
-            case value_t::string:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('S'));
-                }
-                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
-                oa->write_characters(
-                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
-                    j.m_value.string->size());
-                break;
-            }
-
-            case value_t::array:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('['));
-                }
-
-                bool prefix_required = true;
-                if (use_type and not j.m_value.array->empty())
-                {
-                    assert(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
-                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
-                    {
-                        return ubjson_prefix(v) == first_prefix;
-                    });
-
-                    if (same_prefix)
-                    {
-                        prefix_required = false;
-                        oa->write_character(to_char_type('$'));
-                        oa->write_character(first_prefix);
-                    }
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
-                }
-
-                for (const auto& el : *j.m_value.array)
-                {
-                    write_ubjson(el, use_count, use_type, prefix_required);
-                }
-
-                if (not use_count)
-                {
-                    oa->write_character(to_char_type(']'));
-                }
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                if (add_prefix)
-                {
-                    oa->write_character(to_char_type('{'));
-                }
-
-                bool prefix_required = true;
-                if (use_type and not j.m_value.object->empty())
-                {
-                    assert(use_count);
-                    const CharType first_prefix = ubjson_prefix(j.front());
-                    const bool same_prefix = std::all_of(j.begin(), j.end(),
-                                                         [this, first_prefix](const BasicJsonType & v)
-                    {
-                        return ubjson_prefix(v) == first_prefix;
-                    });
-
-                    if (same_prefix)
-                    {
-                        prefix_required = false;
-                        oa->write_character(to_char_type('$'));
-                        oa->write_character(first_prefix);
-                    }
-                }
-
-                if (use_count)
-                {
-                    oa->write_character(to_char_type('#'));
-                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
-                }
-
-                for (const auto& el : *j.m_value.object)
-                {
-                    write_number_with_ubjson_prefix(el.first.size(), true);
-                    oa->write_characters(
-                        reinterpret_cast<const CharType*>(el.first.c_str()),
-                        el.first.size());
-                    write_ubjson(el.second, use_count, use_type, prefix_required);
-                }
-
-                if (not use_count)
-                {
-                    oa->write_character(to_char_type('}'));
-                }
-
-                break;
-            }
-
-            default:
-                break;
-        }
-    }
-
-  private:
-    //////////
-    // BSON //
-    //////////
-
-    /*!
-    @return The size of a BSON document entry header, including the id marker
-            and the entry name size (and its null-terminator).
-    */
-    static std::size_t calc_bson_entry_header_size(const string_t& name)
-    {
-        const auto it = name.find(static_cast<typename string_t::value_type>(0));
-        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
-        {
-            JSON_THROW(out_of_range::create(409,
-                                            "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")"));
-        }
-
-        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
-    }
-
-    /*!
-    @brief Writes the given @a element_type and @a name to the output adapter
-    */
-    void write_bson_entry_header(const string_t& name,
-                                 const std::uint8_t element_type)
-    {
-        oa->write_character(to_char_type(element_type)); // boolean
-        oa->write_characters(
-            reinterpret_cast<const CharType*>(name.c_str()),
-            name.size() + 1u);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and boolean value @a value
-    */
-    void write_bson_boolean(const string_t& name,
-                            const bool value)
-    {
-        write_bson_entry_header(name, 0x08);
-        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and double value @a value
-    */
-    void write_bson_double(const string_t& name,
-                           const double value)
-    {
-        write_bson_entry_header(name, 0x01);
-        write_number<double, true>(value);
-    }
-
-    /*!
-    @return The size of the BSON-encoded string in @a value
-    */
-    static std::size_t calc_bson_string_size(const string_t& value)
-    {
-        return sizeof(std::int32_t) + value.size() + 1ul;
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and string value @a value
-    */
-    void write_bson_string(const string_t& name,
-                           const string_t& value)
-    {
-        write_bson_entry_header(name, 0x02);
-
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
-        oa->write_characters(
-            reinterpret_cast<const CharType*>(value.c_str()),
-            value.size() + 1);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and null value
-    */
-    void write_bson_null(const string_t& name)
-    {
-        write_bson_entry_header(name, 0x0A);
-    }
-
-    /*!
-    @return The size of the BSON-encoded integer @a value
-    */
-    static std::size_t calc_bson_integer_size(const std::int64_t value)
-    {
-        return (std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)()
-               ? sizeof(std::int32_t)
-               : sizeof(std::int64_t);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and integer @a value
-    */
-    void write_bson_integer(const string_t& name,
-                            const std::int64_t value)
-    {
-        if ((std::numeric_limits<std::int32_t>::min)() <= value and value <= (std::numeric_limits<std::int32_t>::max)())
-        {
-            write_bson_entry_header(name, 0x10); // int32
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
-        }
-        else
-        {
-            write_bson_entry_header(name, 0x12); // int64
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
-        }
-    }
-
-    /*!
-    @return The size of the BSON-encoded unsigned integer in @a j
-    */
-    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
-    {
-        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-               ? sizeof(std::int32_t)
-               : sizeof(std::int64_t);
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and unsigned @a value
-    */
-    void write_bson_unsigned(const string_t& name,
-                             const std::uint64_t value)
-    {
-        if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-        {
-            write_bson_entry_header(name, 0x10 /* int32 */);
-            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
-        }
-        else if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-        {
-            write_bson_entry_header(name, 0x12 /* int64 */);
-            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
-        }
-        else
-        {
-            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(value) + " cannot be represented by BSON as it does not fit int64"));
-        }
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and object @a value
-    */
-    void write_bson_object_entry(const string_t& name,
-                                 const typename BasicJsonType::object_t& value)
-    {
-        write_bson_entry_header(name, 0x03); // object
-        write_bson_object(value);
-    }
-
-    /*!
-    @return The size of the BSON-encoded array @a value
-    */
-    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
-    {
-        std::size_t array_index = 0ul;
-
-        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), 0ul, [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
-        {
-            return result + calc_bson_element_size(std::to_string(array_index++), el);
-        });
-
-        return sizeof(std::int32_t) + embedded_document_size + 1ul;
-    }
-
-    /*!
-    @brief Writes a BSON element with key @a name and array @a value
-    */
-    void write_bson_array(const string_t& name,
-                          const typename BasicJsonType::array_t& value)
-    {
-        write_bson_entry_header(name, 0x04); // array
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
-
-        std::size_t array_index = 0ul;
-
-        for (const auto& el : value)
-        {
-            write_bson_element(std::to_string(array_index++), el);
-        }
-
-        oa->write_character(to_char_type(0x00));
-    }
-
-    /*!
-    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
-    @return The calculated size for the BSON document entry for @a j with the given @a name.
-    */
-    static std::size_t calc_bson_element_size(const string_t& name,
-            const BasicJsonType& j)
-    {
-        const auto header_size = calc_bson_entry_header_size(name);
-        switch (j.type())
-        {
-            case value_t::object:
-                return header_size + calc_bson_object_size(*j.m_value.object);
-
-            case value_t::array:
-                return header_size + calc_bson_array_size(*j.m_value.array);
-
-            case value_t::boolean:
-                return header_size + 1ul;
-
-            case value_t::number_float:
-                return header_size + 8ul;
-
-            case value_t::number_integer:
-                return header_size + calc_bson_integer_size(j.m_value.number_integer);
-
-            case value_t::number_unsigned:
-                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
-
-            case value_t::string:
-                return header_size + calc_bson_string_size(*j.m_value.string);
-
-            case value_t::null:
-                return header_size + 0ul;
-
-            // LCOV_EXCL_START
-            default:
-                assert(false);
-                return 0ul;
-                // LCOV_EXCL_STOP
-        }
-    }
-
-    /*!
-    @brief Serializes the JSON value @a j to BSON and associates it with the
-           key @a name.
-    @param name The name to associate with the JSON entity @a j within the
-                current BSON document
-    @return The size of the BSON entry
-    */
-    void write_bson_element(const string_t& name,
-                            const BasicJsonType& j)
-    {
-        switch (j.type())
-        {
-            case value_t::object:
-                return write_bson_object_entry(name, *j.m_value.object);
-
-            case value_t::array:
-                return write_bson_array(name, *j.m_value.array);
-
-            case value_t::boolean:
-                return write_bson_boolean(name, j.m_value.boolean);
-
-            case value_t::number_float:
-                return write_bson_double(name, j.m_value.number_float);
-
-            case value_t::number_integer:
-                return write_bson_integer(name, j.m_value.number_integer);
-
-            case value_t::number_unsigned:
-                return write_bson_unsigned(name, j.m_value.number_unsigned);
-
-            case value_t::string:
-                return write_bson_string(name, *j.m_value.string);
-
-            case value_t::null:
-                return write_bson_null(name);
-
-            // LCOV_EXCL_START
-            default:
-                assert(false);
-                return;
-                // LCOV_EXCL_STOP
-        }
-    }
-
-    /*!
-    @brief Calculates the size of the BSON serialization of the given
-           JSON-object @a j.
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
-    */
-    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
-    {
-        std::size_t document_size = std::accumulate(value.begin(), value.end(), 0ul,
-                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
-        {
-            return result += calc_bson_element_size(el.first, el.second);
-        });
-
-        return sizeof(std::int32_t) + document_size + 1ul;
-    }
-
-    /*!
-    @param[in] j  JSON value to serialize
-    @pre       j.type() == value_t::object
-    */
-    void write_bson_object(const typename BasicJsonType::object_t& value)
-    {
-        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
-
-        for (const auto& el : value)
-        {
-            write_bson_element(el.first, el.second);
-        }
-
-        oa->write_character(to_char_type(0x00));
-    }
-
-    //////////
-    // CBOR //
-    //////////
-
-    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
-    {
-        return to_char_type(0xFA);  // Single-Precision Float
-    }
-
-    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
-    {
-        return to_char_type(0xFB);  // Double-Precision Float
-    }
-
-    /////////////
-    // MsgPack //
-    /////////////
-
-    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
-    {
-        return to_char_type(0xCA);  // float 32
-    }
-
-    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
-    {
-        return to_char_type(0xCB);  // float 64
-    }
-
-    ////////////
-    // UBJSON //
-    ////////////
-
-    // UBJSON: write number (floating point)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_floating_point<NumberType>::value, int>::type = 0>
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
-    {
-        if (add_prefix)
-        {
-            oa->write_character(get_ubjson_float_prefix(n));
-        }
-        write_number(n);
-    }
-
-    // UBJSON: write number (unsigned integer)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_unsigned<NumberType>::value, int>::type = 0>
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
-    {
-        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('i'));  // int8
-            }
-            write_number(static_cast<std::uint8_t>(n));
-        }
-        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('U'));  // uint8
-            }
-            write_number(static_cast<std::uint8_t>(n));
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('I'));  // int16
-            }
-            write_number(static_cast<std::int16_t>(n));
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('l'));  // int32
-            }
-            write_number(static_cast<std::int32_t>(n));
-        }
-        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('L'));  // int64
-            }
-            write_number(static_cast<std::int64_t>(n));
-        }
-        else
-        {
-            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
-        }
-    }
-
-    // UBJSON: write number (signed integer)
-    template<typename NumberType, typename std::enable_if<
-                 std::is_signed<NumberType>::value and
-                 not std::is_floating_point<NumberType>::value, int>::type = 0>
-    void write_number_with_ubjson_prefix(const NumberType n,
-                                         const bool add_prefix)
-    {
-        if ((std::numeric_limits<std::int8_t>::min)() <= n and n <= (std::numeric_limits<std::int8_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('i'));  // int8
-            }
-            write_number(static_cast<std::int8_t>(n));
-        }
-        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n and n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('U'));  // uint8
-            }
-            write_number(static_cast<std::uint8_t>(n));
-        }
-        else if ((std::numeric_limits<std::int16_t>::min)() <= n and n <= (std::numeric_limits<std::int16_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('I'));  // int16
-            }
-            write_number(static_cast<std::int16_t>(n));
-        }
-        else if ((std::numeric_limits<std::int32_t>::min)() <= n and n <= (std::numeric_limits<std::int32_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('l'));  // int32
-            }
-            write_number(static_cast<std::int32_t>(n));
-        }
-        else if ((std::numeric_limits<std::int64_t>::min)() <= n and n <= (std::numeric_limits<std::int64_t>::max)())
-        {
-            if (add_prefix)
-            {
-                oa->write_character(to_char_type('L'));  // int64
-            }
-            write_number(static_cast<std::int64_t>(n));
-        }
-        // LCOV_EXCL_START
-        else
-        {
-            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(n) + " cannot be represented by UBJSON as it does not fit int64"));
-        }
-        // LCOV_EXCL_STOP
-    }
-
-    /*!
-    @brief determine the type prefix of container values
-
-    @note This function does not need to be 100% accurate when it comes to
-          integer limits. In case a number exceeds the limits of int64_t,
-          this will be detected by a later call to function
-          write_number_with_ubjson_prefix. Therefore, we return 'L' for any
-          value that does not fit the previous limits.
-    */
-    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
-    {
-        switch (j.type())
-        {
-            case value_t::null:
-                return 'Z';
-
-            case value_t::boolean:
-                return j.m_value.boolean ? 'T' : 'F';
-
-            case value_t::number_integer:
-            {
-                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
-                {
-                    return 'i';
-                }
-                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
-                {
-                    return 'U';
-                }
-                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
-                {
-                    return 'I';
-                }
-                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer and j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
-                {
-                    return 'l';
-                }
-                // no check and assume int64_t (see note above)
-                return 'L';
-            }
-
-            case value_t::number_unsigned:
-            {
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
-                {
-                    return 'i';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
-                {
-                    return 'U';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
-                {
-                    return 'I';
-                }
-                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
-                {
-                    return 'l';
-                }
-                // no check and assume int64_t (see note above)
-                return 'L';
-            }
-
-            case value_t::number_float:
-                return get_ubjson_float_prefix(j.m_value.number_float);
-
-            case value_t::string:
-                return 'S';
-
-            case value_t::array:
-                return '[';
-
-            case value_t::object:
-                return '{';
-
-            default:  // discarded values
-                return 'N';
-        }
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
-    {
-        return 'd';  // float 32
-    }
-
-    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
-    {
-        return 'D';  // float 64
-    }
-
-    ///////////////////////
-    // Utility functions //
-    ///////////////////////
-
-    /*
-    @brief write a number to output input
-    @param[in] n number of type @a NumberType
-    @tparam NumberType the type of the number
-    @tparam OutputIsLittleEndian Set to true if output data is
-                                 required to be little endian
-
-    @note This function needs to respect the system's endianess, because bytes
-          in CBOR, MessagePack, and UBJSON are stored in network order (big
-          endian) and therefore need reordering on little endian systems.
-    */
-    template<typename NumberType, bool OutputIsLittleEndian = false>
-    void write_number(const NumberType n)
-    {
-        // step 1: write number to array of length NumberType
-        std::array<CharType, sizeof(NumberType)> vec;
-        std::memcpy(vec.data(), &n, sizeof(NumberType));
-
-        // step 2: write array to output (with possible reordering)
-        if (is_little_endian != OutputIsLittleEndian)
-        {
-            // reverse byte order prior to conversion if necessary
-            std::reverse(vec.begin(), vec.end());
-        }
-
-        oa->write_characters(vec.data(), sizeof(NumberType));
-    }
-
-  public:
-    // The following to_char_type functions are implement the conversion
-    // between uint8_t and CharType. In case CharType is not unsigned,
-    // such a conversion is required to allow values greater than 128.
-    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
-    template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value and std::is_signed<char>::value > * = nullptr >
-    static constexpr CharType to_char_type(std::uint8_t x) noexcept
-    {
-        return *reinterpret_cast<char*>(&x);
-    }
-
-    template < typename C = CharType,
-               enable_if_t < std::is_signed<C>::value and std::is_unsigned<char>::value > * = nullptr >
-    static CharType to_char_type(std::uint8_t x) noexcept
-    {
-        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
-        static_assert(std::is_pod<CharType>::value, "CharType must be POD");
-        CharType result;
-        std::memcpy(&result, &x, sizeof(x));
-        return result;
-    }
-
-    template<typename C = CharType,
-             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
-    static constexpr CharType to_char_type(std::uint8_t x) noexcept
-    {
-        return x;
-    }
-
-    template < typename InputCharType, typename C = CharType,
-               enable_if_t <
-                   std::is_signed<C>::value and
-                   std::is_signed<char>::value and
-                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
-                   > * = nullptr >
-    static constexpr CharType to_char_type(InputCharType x) noexcept
-    {
-        return x;
-    }
-
-  private:
-    /// whether we can assume little endianess
-    const bool is_little_endian = binary_reader<BasicJsonType>::little_endianess();
-
-    /// the output
-    output_adapter_t<CharType> oa = nullptr;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-// #include <nlohmann/detail/output/serializer.hpp>
-
-
-#include <algorithm> // reverse, remove, fill, find, none_of
-#include <array> // array
-#include <cassert> // assert
-#include <ciso646> // and, or
-#include <clocale> // localeconv, lconv
-#include <cmath> // labs, isfinite, isnan, signbit
-#include <cstddef> // size_t, ptrdiff_t
-#include <cstdint> // uint8_t
-#include <cstdio> // snprintf
-#include <limits> // numeric_limits
-#include <string> // string
-#include <type_traits> // is_same
-#include <utility> // move
-
-// #include <nlohmann/detail/conversions/to_chars.hpp>
-
-
-#include <array> // array
-#include <cassert> // assert
-#include <ciso646> // or, and, not
-#include <cmath>   // signbit, isfinite
-#include <cstdint> // intN_t, uintN_t
-#include <cstring> // memcpy, memmove
-#include <limits> // numeric_limits
-#include <type_traits> // conditional
-// #include <nlohmann/detail/macro_scope.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-
-/*!
-@brief implements the Grisu2 algorithm for binary to decimal floating-point
-conversion.
-
-This implementation is a slightly modified version of the reference
-implementation which may be obtained from
-http://florian.loitsch.com/publications (bench.tar.gz).
-
-The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
-
-For a detailed description of the algorithm see:
-
-[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
-    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
-    Language Design and Implementation, PLDI 2010
-[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
-    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
-    Design and Implementation, PLDI 1996
-*/
-namespace dtoa_impl
-{
-
-template <typename Target, typename Source>
-Target reinterpret_bits(const Source source)
-{
-    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
-
-    Target target;
-    std::memcpy(&target, &source, sizeof(Source));
-    return target;
-}
-
-struct diyfp // f * 2^e
-{
-    static constexpr int kPrecision = 64; // = q
-
-    std::uint64_t f = 0;
-    int e = 0;
-
-    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
-
-    /*!
-    @brief returns x - y
-    @pre x.e == y.e and x.f >= y.f
-    */
-    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
-    {
-        assert(x.e == y.e);
-        assert(x.f >= y.f);
-
-        return {x.f - y.f, x.e};
-    }
-
-    /*!
-    @brief returns x * y
-    @note The result is rounded. (Only the upper q bits are returned.)
-    */
-    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
-    {
-        static_assert(kPrecision == 64, "internal error");
-
-        // Computes:
-        //  f = round((x.f * y.f) / 2^q)
-        //  e = x.e + y.e + q
-
-        // Emulate the 64-bit * 64-bit multiplication:
-        //
-        // p = u * v
-        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
-        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
-        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
-        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
-        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
-        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
-        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
-        //
-        // (Since Q might be larger than 2^32 - 1)
-        //
-        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
-        //
-        // (Q_hi + H does not overflow a 64-bit int)
-        //
-        //   = p_lo + 2^64 p_hi
-
-        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
-        const std::uint64_t u_hi = x.f >> 32u;
-        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
-        const std::uint64_t v_hi = y.f >> 32u;
-
-        const std::uint64_t p0 = u_lo * v_lo;
-        const std::uint64_t p1 = u_lo * v_hi;
-        const std::uint64_t p2 = u_hi * v_lo;
-        const std::uint64_t p3 = u_hi * v_hi;
-
-        const std::uint64_t p0_hi = p0 >> 32u;
-        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
-        const std::uint64_t p1_hi = p1 >> 32u;
-        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
-        const std::uint64_t p2_hi = p2 >> 32u;
-
-        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
-
-        // The full product might now be computed as
-        //
-        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
-        // p_lo = p0_lo + (Q << 32)
-        //
-        // But in this particular case here, the full p_lo is not required.
-        // Effectively we only need to add the highest bit in p_lo to p_hi (and
-        // Q_hi + 1 does not overflow).
-
-        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
-
-        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
-
-        return {h, x.e + y.e + 64};
-    }
-
-    /*!
-    @brief normalize x such that the significand is >= 2^(q-1)
-    @pre x.f != 0
-    */
-    static diyfp normalize(diyfp x) noexcept
-    {
-        assert(x.f != 0);
-
-        while ((x.f >> 63u) == 0)
-        {
-            x.f <<= 1u;
-            x.e--;
-        }
-
-        return x;
-    }
-
-    /*!
-    @brief normalize x such that the result has the exponent E
-    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
-    */
-    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
-    {
-        const int delta = x.e - target_exponent;
-
-        assert(delta >= 0);
-        assert(((x.f << delta) >> delta) == x.f);
-
-        return {x.f << delta, target_exponent};
-    }
-};
-
-struct boundaries
-{
-    diyfp w;
-    diyfp minus;
-    diyfp plus;
-};
-
-/*!
-Compute the (normalized) diyfp representing the input number 'value' and its
-boundaries.
-
-@pre value must be finite and positive
-*/
-template <typename FloatType>
-boundaries compute_boundaries(FloatType value)
-{
-    assert(std::isfinite(value));
-    assert(value > 0);
-
-    // Convert the IEEE representation into a diyfp.
-    //
-    // If v is denormal:
-    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
-    // If v is normalized:
-    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
-
-    static_assert(std::numeric_limits<FloatType>::is_iec559,
-                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
-
-    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
-    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
-    constexpr int      kMinExp    = 1 - kBias;
-    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
-
-    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
-
-    const std::uint64_t bits = reinterpret_bits<bits_type>(value);
-    const std::uint64_t E = bits >> (kPrecision - 1);
-    const std::uint64_t F = bits & (kHiddenBit - 1);
-
-    const bool is_denormal = E == 0;
-    const diyfp v = is_denormal
-                    ? diyfp(F, kMinExp)
-                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
-
-    // Compute the boundaries m- and m+ of the floating-point value
-    // v = f * 2^e.
-    //
-    // Determine v- and v+, the floating-point predecessor and successor if v,
-    // respectively.
-    //
-    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
-    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
-    //
-    //      v+ = v + 2^e
-    //
-    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
-    // between m- and m+ round to v, regardless of how the input rounding
-    // algorithm breaks ties.
-    //
-    //      ---+-------------+-------------+-------------+-------------+---  (A)
-    //         v-            m-            v             m+            v+
-    //
-    //      -----------------+------+------+-------------+-------------+---  (B)
-    //                       v-     m-     v             m+            v+
-
-    const bool lower_boundary_is_closer = F == 0 and E > 1;
-    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
-    const diyfp m_minus = lower_boundary_is_closer
-                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
-                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
-
-    // Determine the normalized w+ = m+.
-    const diyfp w_plus = diyfp::normalize(m_plus);
-
-    // Determine w- = m- such that e_(w-) = e_(w+).
-    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
-
-    return {diyfp::normalize(v), w_minus, w_plus};
-}
-
-// Given normalized diyfp w, Grisu needs to find a (normalized) cached
-// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
-// within a certain range [alpha, gamma] (Definition 3.2 from [1])
-//
-//      alpha <= e = e_c + e_w + q <= gamma
-//
-// or
-//
-//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
-//                          <= f_c * f_w * 2^gamma
-//
-// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
-//
-//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
-//
-// or
-//
-//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
-//
-// The choice of (alpha,gamma) determines the size of the table and the form of
-// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
-// in practice:
-//
-// The idea is to cut the number c * w = f * 2^e into two parts, which can be
-// processed independently: An integral part p1, and a fractional part p2:
-//
-//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
-//              = (f div 2^-e) + (f mod 2^-e) * 2^e
-//              = p1 + p2 * 2^e
-//
-// The conversion of p1 into decimal form requires a series of divisions and
-// modulos by (a power of) 10. These operations are faster for 32-bit than for
-// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
-// achieved by choosing
-//
-//      -e >= 32   or   e <= -32 := gamma
-//
-// In order to convert the fractional part
-//
-//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
-//
-// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
-// d[-i] are extracted in order:
-//
-//      (10 * p2) div 2^-e = d[-1]
-//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
-//
-// The multiplication by 10 must not overflow. It is sufficient to choose
-//
-//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
-//
-// Since p2 = f mod 2^-e < 2^-e,
-//
-//      -e <= 60   or   e >= -60 := alpha
-
-constexpr int kAlpha = -60;
-constexpr int kGamma = -32;
-
-struct cached_power // c = f * 2^e ~= 10^k
-{
-    std::uint64_t f;
-    int e;
-    int k;
-};
-
-/*!
-For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
-power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
-satisfies (Definition 3.2 from [1])
-
-     alpha <= e_c + e + q <= gamma.
-*/
-inline cached_power get_cached_power_for_binary_exponent(int e)
-{
-    // Now
-    //
-    //      alpha <= e_c + e + q <= gamma                                    (1)
-    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
-    //
-    // and since the c's are normalized, 2^(q-1) <= f_c,
-    //
-    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
-    //      ==> 2^(alpha - e - 1) <= c
-    //
-    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
-    //
-    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
-    //        = ceil( (alpha - e - 1) * log_10(2) )
-    //
-    // From the paper:
-    // "In theory the result of the procedure could be wrong since c is rounded,
-    //  and the computation itself is approximated [...]. In practice, however,
-    //  this simple function is sufficient."
-    //
-    // For IEEE double precision floating-point numbers converted into
-    // normalized diyfp's w = f * 2^e, with q = 64,
-    //
-    //      e >= -1022      (min IEEE exponent)
-    //           -52        (p - 1)
-    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
-    //           -11        (normalize the diyfp)
-    //         = -1137
-    //
-    // and
-    //
-    //      e <= +1023      (max IEEE exponent)
-    //           -52        (p - 1)
-    //           -11        (normalize the diyfp)
-    //         = 960
-    //
-    // This binary exponent range [-1137,960] results in a decimal exponent
-    // range [-307,324]. One does not need to store a cached power for each
-    // k in this range. For each such k it suffices to find a cached power
-    // such that the exponent of the product lies in [alpha,gamma].
-    // This implies that the difference of the decimal exponents of adjacent
-    // table entries must be less than or equal to
-    //
-    //      floor( (gamma - alpha) * log_10(2) ) = 8.
-    //
-    // (A smaller distance gamma-alpha would require a larger table.)
-
-    // NB:
-    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
-
-    constexpr int kCachedPowersMinDecExp = -300;
-    constexpr int kCachedPowersDecStep = 8;
-
-    static constexpr std::array<cached_power, 79> kCachedPowers =
-    {
-        {
-            { 0xAB70FE17C79AC6CA, -1060, -300 },
-            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
-            { 0xBE5691EF416BD60C, -1007, -284 },
-            { 0x8DD01FAD907FFC3C,  -980, -276 },
-            { 0xD3515C2831559A83,  -954, -268 },
-            { 0x9D71AC8FADA6C9B5,  -927, -260 },
-            { 0xEA9C227723EE8BCB,  -901, -252 },
-            { 0xAECC49914078536D,  -874, -244 },
-            { 0x823C12795DB6CE57,  -847, -236 },
-            { 0xC21094364DFB5637,  -821, -228 },
-            { 0x9096EA6F3848984F,  -794, -220 },
-            { 0xD77485CB25823AC7,  -768, -212 },
-            { 0xA086CFCD97BF97F4,  -741, -204 },
-            { 0xEF340A98172AACE5,  -715, -196 },
-            { 0xB23867FB2A35B28E,  -688, -188 },
-            { 0x84C8D4DFD2C63F3B,  -661, -180 },
-            { 0xC5DD44271AD3CDBA,  -635, -172 },
-            { 0x936B9FCEBB25C996,  -608, -164 },
-            { 0xDBAC6C247D62A584,  -582, -156 },
-            { 0xA3AB66580D5FDAF6,  -555, -148 },
-            { 0xF3E2F893DEC3F126,  -529, -140 },
-            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
-            { 0x87625F056C7C4A8B,  -475, -124 },
-            { 0xC9BCFF6034C13053,  -449, -116 },
-            { 0x964E858C91BA2655,  -422, -108 },
-            { 0xDFF9772470297EBD,  -396, -100 },
-            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
-            { 0xF8A95FCF88747D94,  -343,  -84 },
-            { 0xB94470938FA89BCF,  -316,  -76 },
-            { 0x8A08F0F8BF0F156B,  -289,  -68 },
-            { 0xCDB02555653131B6,  -263,  -60 },
-            { 0x993FE2C6D07B7FAC,  -236,  -52 },
-            { 0xE45C10C42A2B3B06,  -210,  -44 },
-            { 0xAA242499697392D3,  -183,  -36 },
-            { 0xFD87B5F28300CA0E,  -157,  -28 },
-            { 0xBCE5086492111AEB,  -130,  -20 },
-            { 0x8CBCCC096F5088CC,  -103,  -12 },
-            { 0xD1B71758E219652C,   -77,   -4 },
-            { 0x9C40000000000000,   -50,    4 },
-            { 0xE8D4A51000000000,   -24,   12 },
-            { 0xAD78EBC5AC620000,     3,   20 },
-            { 0x813F3978F8940984,    30,   28 },
-            { 0xC097CE7BC90715B3,    56,   36 },
-            { 0x8F7E32CE7BEA5C70,    83,   44 },
-            { 0xD5D238A4ABE98068,   109,   52 },
-            { 0x9F4F2726179A2245,   136,   60 },
-            { 0xED63A231D4C4FB27,   162,   68 },
-            { 0xB0DE65388CC8ADA8,   189,   76 },
-            { 0x83C7088E1AAB65DB,   216,   84 },
-            { 0xC45D1DF942711D9A,   242,   92 },
-            { 0x924D692CA61BE758,   269,  100 },
-            { 0xDA01EE641A708DEA,   295,  108 },
-            { 0xA26DA3999AEF774A,   322,  116 },
-            { 0xF209787BB47D6B85,   348,  124 },
-            { 0xB454E4A179DD1877,   375,  132 },
-            { 0x865B86925B9BC5C2,   402,  140 },
-            { 0xC83553C5C8965D3D,   428,  148 },
-            { 0x952AB45CFA97A0B3,   455,  156 },
-            { 0xDE469FBD99A05FE3,   481,  164 },
-            { 0xA59BC234DB398C25,   508,  172 },
-            { 0xF6C69A72A3989F5C,   534,  180 },
-            { 0xB7DCBF5354E9BECE,   561,  188 },
-            { 0x88FCF317F22241E2,   588,  196 },
-            { 0xCC20CE9BD35C78A5,   614,  204 },
-            { 0x98165AF37B2153DF,   641,  212 },
-            { 0xE2A0B5DC971F303A,   667,  220 },
-            { 0xA8D9D1535CE3B396,   694,  228 },
-            { 0xFB9B7CD9A4A7443C,   720,  236 },
-            { 0xBB764C4CA7A44410,   747,  244 },
-            { 0x8BAB8EEFB6409C1A,   774,  252 },
-            { 0xD01FEF10A657842C,   800,  260 },
-            { 0x9B10A4E5E9913129,   827,  268 },
-            { 0xE7109BFBA19C0C9D,   853,  276 },
-            { 0xAC2820D9623BF429,   880,  284 },
-            { 0x80444B5E7AA7CF85,   907,  292 },
-            { 0xBF21E44003ACDD2D,   933,  300 },
-            { 0x8E679C2F5E44FF8F,   960,  308 },
-            { 0xD433179D9C8CB841,   986,  316 },
-            { 0x9E19DB92B4E31BA9,  1013,  324 },
-        }
-    };
-
-    // This computation gives exactly the same results for k as
-    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
-    // for |e| <= 1500, but doesn't require floating-point operations.
-    // NB: log_10(2) ~= 78913 / 2^18
-    assert(e >= -1500);
-    assert(e <=  1500);
-    const int f = kAlpha - e - 1;
-    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
-
-    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
-    assert(index >= 0);
-    assert(static_cast<std::size_t>(index) < kCachedPowers.size());
-
-    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
-    assert(kAlpha <= cached.e + e + 64);
-    assert(kGamma >= cached.e + e + 64);
-
-    return cached;
-}
-
-/*!
-For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
-For n == 0, returns 1 and sets pow10 := 1.
-*/
-inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
-{
-    // LCOV_EXCL_START
-    if (n >= 1000000000)
-    {
-        pow10 = 1000000000;
-        return 10;
-    }
-    // LCOV_EXCL_STOP
-    else if (n >= 100000000)
-    {
-        pow10 = 100000000;
-        return  9;
-    }
-    else if (n >= 10000000)
-    {
-        pow10 = 10000000;
-        return  8;
-    }
-    else if (n >= 1000000)
-    {
-        pow10 = 1000000;
-        return  7;
-    }
-    else if (n >= 100000)
-    {
-        pow10 = 100000;
-        return  6;
-    }
-    else if (n >= 10000)
-    {
-        pow10 = 10000;
-        return  5;
-    }
-    else if (n >= 1000)
-    {
-        pow10 = 1000;
-        return  4;
-    }
-    else if (n >= 100)
-    {
-        pow10 = 100;
-        return  3;
-    }
-    else if (n >= 10)
-    {
-        pow10 = 10;
-        return  2;
-    }
-    else
-    {
-        pow10 = 1;
-        return 1;
-    }
-}
-
-inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
-                         std::uint64_t rest, std::uint64_t ten_k)
-{
-    assert(len >= 1);
-    assert(dist <= delta);
-    assert(rest <= delta);
-    assert(ten_k > 0);
-
-    //               <--------------------------- delta ---->
-    //                                  <---- dist --------->
-    // --------------[------------------+-------------------]--------------
-    //               M-                 w                   M+
-    //
-    //                                  ten_k
-    //                                <------>
-    //                                       <---- rest ---->
-    // --------------[------------------+----+--------------]--------------
-    //                                  w    V
-    //                                       = buf * 10^k
-    //
-    // ten_k represents a unit-in-the-last-place in the decimal representation
-    // stored in buf.
-    // Decrement buf by ten_k while this takes buf closer to w.
-
-    // The tests are written in this order to avoid overflow in unsigned
-    // integer arithmetic.
-
-    while (rest < dist
-            and delta - rest >= ten_k
-            and (rest + ten_k < dist or dist - rest > rest + ten_k - dist))
-    {
-        assert(buf[len - 1] != '0');
-        buf[len - 1]--;
-        rest += ten_k;
-    }
-}
-
-/*!
-Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
-M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
-*/
-inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
-                             diyfp M_minus, diyfp w, diyfp M_plus)
-{
-    static_assert(kAlpha >= -60, "internal error");
-    static_assert(kGamma <= -32, "internal error");
-
-    // Generates the digits (and the exponent) of a decimal floating-point
-    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
-    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
-    //
-    //               <--------------------------- delta ---->
-    //                                  <---- dist --------->
-    // --------------[------------------+-------------------]--------------
-    //               M-                 w                   M+
-    //
-    // Grisu2 generates the digits of M+ from left to right and stops as soon as
-    // V is in [M-,M+].
-
-    assert(M_plus.e >= kAlpha);
-    assert(M_plus.e <= kGamma);
-
-    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
-    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
-
-    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
-    //
-    //      M+ = f * 2^e
-    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
-    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
-    //         = p1 + p2 * 2^e
-
-    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
-
-    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
-    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
-
-    // 1)
-    //
-    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
-
-    assert(p1 > 0);
-
-    std::uint32_t pow10;
-    const int k = find_largest_pow10(p1, pow10);
-
-    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
-    //
-    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
-    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
-    //
-    //      M+ = p1                                             + p2 * 2^e
-    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
-    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
-    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
-    //
-    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
-    //
-    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
-    //
-    // but stop as soon as
-    //
-    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
-
-    int n = k;
-    while (n > 0)
-    {
-        // Invariants:
-        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
-        //      pow10 = 10^(n-1) <= p1 < 10^n
-        //
-        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
-        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
-        //
-        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
-        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
-        //
-        assert(d <= 9);
-        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
-        //
-        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
-        //
-        p1 = r;
-        n--;
-        //
-        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
-        //      pow10 = 10^n
-        //
-
-        // Now check if enough digits have been generated.
-        // Compute
-        //
-        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
-        //
-        // Note:
-        // Since rest and delta share the same exponent e, it suffices to
-        // compare the significands.
-        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
-        if (rest <= delta)
-        {
-            // V = buffer * 10^n, with M- <= V <= M+.
-
-            decimal_exponent += n;
-
-            // We may now just stop. But instead look if the buffer could be
-            // decremented to bring V closer to w.
-            //
-            // pow10 = 10^n is now 1 ulp in the decimal representation V.
-            // The rounding procedure works with diyfp's with an implicit
-            // exponent of e.
-            //
-            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
-            //
-            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
-            grisu2_round(buffer, length, dist, delta, rest, ten_n);
-
-            return;
-        }
-
-        pow10 /= 10;
-        //
-        //      pow10 = 10^(n-1) <= p1 < 10^n
-        // Invariants restored.
-    }
-
-    // 2)
-    //
-    // The digits of the integral part have been generated:
-    //
-    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
-    //         = buffer            + p2 * 2^e
-    //
-    // Now generate the digits of the fractional part p2 * 2^e.
-    //
-    // Note:
-    // No decimal point is generated: the exponent is adjusted instead.
-    //
-    // p2 actually represents the fraction
-    //
-    //      p2 * 2^e
-    //          = p2 / 2^-e
-    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
-    //
-    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
-    //
-    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
-    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
-    //
-    // using
-    //
-    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
-    //                = (                   d) * 2^-e + (                   r)
-    //
-    // or
-    //      10^m * p2 * 2^e = d + r * 2^e
-    //
-    // i.e.
-    //
-    //      M+ = buffer + p2 * 2^e
-    //         = buffer + 10^-m * (d + r * 2^e)
-    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
-    //
-    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
-
-    assert(p2 > delta);
-
-    int m = 0;
-    for (;;)
-    {
-        // Invariant:
-        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
-        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
-        //
-        assert(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
-        p2 *= 10;
-        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
-        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
-        //
-        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
-        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
-        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
-        //
-        assert(d <= 9);
-        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
-        //
-        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
-        //
-        p2 = r;
-        m++;
-        //
-        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
-        // Invariant restored.
-
-        // Check if enough digits have been generated.
-        //
-        //      10^-m * p2 * 2^e <= delta * 2^e
-        //              p2 * 2^e <= 10^m * delta * 2^e
-        //                    p2 <= 10^m * delta
-        delta *= 10;
-        dist  *= 10;
-        if (p2 <= delta)
-        {
-            break;
-        }
-    }
-
-    // V = buffer * 10^-m, with M- <= V <= M+.
-
-    decimal_exponent -= m;
-
-    // 1 ulp in the decimal representation is now 10^-m.
-    // Since delta and dist are now scaled by 10^m, we need to do the
-    // same with ulp in order to keep the units in sync.
-    //
-    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
-    //
-    const std::uint64_t ten_m = one.f;
-    grisu2_round(buffer, length, dist, delta, p2, ten_m);
-
-    // By construction this algorithm generates the shortest possible decimal
-    // number (Loitsch, Theorem 6.2) which rounds back to w.
-    // For an input number of precision p, at least
-    //
-    //      N = 1 + ceil(p * log_10(2))
-    //
-    // decimal digits are sufficient to identify all binary floating-point
-    // numbers (Matula, "In-and-Out conversions").
-    // This implies that the algorithm does not produce more than N decimal
-    // digits.
-    //
-    //      N = 17 for p = 53 (IEEE double precision)
-    //      N = 9  for p = 24 (IEEE single precision)
-}
-
-/*!
-v = buf * 10^decimal_exponent
-len is the length of the buffer (number of decimal digits)
-The buffer must be large enough, i.e. >= max_digits10.
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline void grisu2(char* buf, int& len, int& decimal_exponent,
-                   diyfp m_minus, diyfp v, diyfp m_plus)
-{
-    assert(m_plus.e == m_minus.e);
-    assert(m_plus.e == v.e);
-
-    //  --------(-----------------------+-----------------------)--------    (A)
-    //          m-                      v                       m+
-    //
-    //  --------------------(-----------+-----------------------)--------    (B)
-    //                      m-          v                       m+
-    //
-    // First scale v (and m- and m+) such that the exponent is in the range
-    // [alpha, gamma].
-
-    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
-
-    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
-
-    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
-    const diyfp w       = diyfp::mul(v,       c_minus_k);
-    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
-    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
-
-    //  ----(---+---)---------------(---+---)---------------(---+---)----
-    //          w-                      w                       w+
-    //          = c*m-                  = c*v                   = c*m+
-    //
-    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
-    // w+ are now off by a small amount.
-    // In fact:
-    //
-    //      w - v * 10^k < 1 ulp
-    //
-    // To account for this inaccuracy, add resp. subtract 1 ulp.
-    //
-    //  --------+---[---------------(---+---)---------------]---+--------
-    //          w-  M-                  w                   M+  w+
-    //
-    // Now any number in [M-, M+] (bounds included) will round to w when input,
-    // regardless of how the input rounding algorithm breaks ties.
-    //
-    // And digit_gen generates the shortest possible such number in [M-, M+].
-    // Note that this does not mean that Grisu2 always generates the shortest
-    // possible number in the interval (m-, m+).
-    const diyfp M_minus(w_minus.f + 1, w_minus.e);
-    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
-
-    decimal_exponent = -cached.k; // = -(-k) = k
-
-    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
-}
-
-/*!
-v = buf * 10^decimal_exponent
-len is the length of the buffer (number of decimal digits)
-The buffer must be large enough, i.e. >= max_digits10.
-*/
-template <typename FloatType>
-JSON_HEDLEY_NON_NULL(1)
-void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
-{
-    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
-                  "internal error: not enough precision");
-
-    assert(std::isfinite(value));
-    assert(value > 0);
-
-    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
-    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
-    // decimal representations are not exactly "short".
-    //
-    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
-    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
-    // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
-    // does.
-    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
-    // representation using the corresponding std::from_chars function recovers value exactly". That
-    // indicates that single precision floating-point numbers should be recovered using
-    // 'std::strtof'.
-    //
-    // NB: If the neighbors are computed for single-precision numbers, there is a single float
-    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
-    //     value is off by 1 ulp.
-#if 0
-    const boundaries w = compute_boundaries(static_cast<double>(value));
-#else
-    const boundaries w = compute_boundaries(value);
-#endif
-
-    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
-}
-
-/*!
-@brief appends a decimal representation of e to buf
-@return a pointer to the element following the exponent.
-@pre -1000 < e < 1000
-*/
-JSON_HEDLEY_NON_NULL(1)
-JSON_HEDLEY_RETURNS_NON_NULL
-inline char* append_exponent(char* buf, int e)
-{
-    assert(e > -1000);
-    assert(e <  1000);
-
-    if (e < 0)
-    {
-        e = -e;
-        *buf++ = '-';
-    }
-    else
-    {
-        *buf++ = '+';
-    }
-
-    auto k = static_cast<std::uint32_t>(e);
-    if (k < 10)
-    {
-        // Always print at least two digits in the exponent.
-        // This is for compatibility with printf("%g").
-        *buf++ = '0';
-        *buf++ = static_cast<char>('0' + k);
-    }
-    else if (k < 100)
-    {
-        *buf++ = static_cast<char>('0' + k / 10);
-        k %= 10;
-        *buf++ = static_cast<char>('0' + k);
-    }
-    else
-    {
-        *buf++ = static_cast<char>('0' + k / 100);
-        k %= 100;
-        *buf++ = static_cast<char>('0' + k / 10);
-        k %= 10;
-        *buf++ = static_cast<char>('0' + k);
-    }
-
-    return buf;
-}
-
-/*!
-@brief prettify v = buf * 10^decimal_exponent
-
-If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
-notation. Otherwise it will be printed in exponential notation.
-
-@pre min_exp < 0
-@pre max_exp > 0
-*/
-JSON_HEDLEY_NON_NULL(1)
-JSON_HEDLEY_RETURNS_NON_NULL
-inline char* format_buffer(char* buf, int len, int decimal_exponent,
-                           int min_exp, int max_exp)
-{
-    assert(min_exp < 0);
-    assert(max_exp > 0);
-
-    const int k = len;
-    const int n = len + decimal_exponent;
-
-    // v = buf * 10^(n-k)
-    // k is the length of the buffer (number of decimal digits)
-    // n is the position of the decimal point relative to the start of the buffer.
-
-    if (k <= n and n <= max_exp)
-    {
-        // digits[000]
-        // len <= max_exp + 2
-
-        std::memset(buf + k, '0', static_cast<size_t>(n - k));
-        // Make it look like a floating-point number (#362, #378)
-        buf[n + 0] = '.';
-        buf[n + 1] = '0';
-        return buf + (n + 2);
-    }
-
-    if (0 < n and n <= max_exp)
-    {
-        // dig.its
-        // len <= max_digits10 + 1
-
-        assert(k > n);
-
-        std::memmove(buf + (n + 1), buf + n, static_cast<size_t>(k - n));
-        buf[n] = '.';
-        return buf + (k + 1);
-    }
-
-    if (min_exp < n and n <= 0)
-    {
-        // 0.[000]digits
-        // len <= 2 + (-min_exp - 1) + max_digits10
-
-        std::memmove(buf + (2 + -n), buf, static_cast<size_t>(k));
-        buf[0] = '0';
-        buf[1] = '.';
-        std::memset(buf + 2, '0', static_cast<size_t>(-n));
-        return buf + (2 + (-n) + k);
-    }
-
-    if (k == 1)
-    {
-        // dE+123
-        // len <= 1 + 5
-
-        buf += 1;
-    }
-    else
-    {
-        // d.igitsE+123
-        // len <= max_digits10 + 1 + 5
-
-        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k - 1));
-        buf[1] = '.';
-        buf += 1 + k;
-    }
-
-    *buf++ = 'e';
-    return append_exponent(buf, n - 1);
-}
-
-} // namespace dtoa_impl
-
-/*!
-@brief generates a decimal representation of the floating-point number value in [first, last).
-
-The format of the resulting decimal representation is similar to printf's %g
-format. Returns an iterator pointing past-the-end of the decimal representation.
-
-@note The input number must be finite, i.e. NaN's and Inf's are not supported.
-@note The buffer must be large enough.
-@note The result is NOT null-terminated.
-*/
-template <typename FloatType>
-JSON_HEDLEY_NON_NULL(1, 2)
-JSON_HEDLEY_RETURNS_NON_NULL
-char* to_chars(char* first, const char* last, FloatType value)
-{
-    static_cast<void>(last); // maybe unused - fix warning
-    assert(std::isfinite(value));
-
-    // Use signbit(value) instead of (value < 0) since signbit works for -0.
-    if (std::signbit(value))
-    {
-        value = -value;
-        *first++ = '-';
-    }
-
-    if (value == 0) // +-0
-    {
-        *first++ = '0';
-        // Make it look like a floating-point number (#362, #378)
-        *first++ = '.';
-        *first++ = '0';
-        return first;
-    }
-
-    assert(last - first >= std::numeric_limits<FloatType>::max_digits10);
-
-    // Compute v = buffer * 10^decimal_exponent.
-    // The decimal digits are stored in the buffer, which needs to be interpreted
-    // as an unsigned decimal integer.
-    // len is the length of the buffer, i.e. the number of decimal digits.
-    int len = 0;
-    int decimal_exponent = 0;
-    dtoa_impl::grisu2(first, len, decimal_exponent, value);
-
-    assert(len <= std::numeric_limits<FloatType>::max_digits10);
-
-    // Format the buffer like printf("%.*g", prec, value)
-    constexpr int kMinExp = -4;
-    // Use digits10 here to increase compatibility with version 2.
-    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
-
-    assert(last - first >= kMaxExp + 2);
-    assert(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
-    assert(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
-
-    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
-}
-
-} // namespace detail
-} // namespace nlohmann
-
-// #include <nlohmann/detail/exceptions.hpp>
-
-// #include <nlohmann/detail/macro_scope.hpp>
-
-// #include <nlohmann/detail/meta/cpp_future.hpp>
-
-// #include <nlohmann/detail/output/binary_writer.hpp>
-
-// #include <nlohmann/detail/output/output_adapters.hpp>
-
-// #include <nlohmann/detail/value_t.hpp>
-
-
-namespace nlohmann
-{
-namespace detail
-{
-///////////////////
-// serialization //
-///////////////////
-
-/// how to treat decoding errors
-enum class error_handler_t
-{
-    strict,  ///< throw a type_error exception in case of invalid UTF-8
-    replace, ///< replace invalid UTF-8 sequences with U+FFFD
-    ignore   ///< ignore invalid UTF-8 sequences
-};
-
-template<typename BasicJsonType>
-class serializer
-{
-    using string_t = typename BasicJsonType::string_t;
-    using number_float_t = typename BasicJsonType::number_float_t;
-    using number_integer_t = typename BasicJsonType::number_integer_t;
-    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-    static constexpr std::uint8_t UTF8_ACCEPT = 0;
-    static constexpr std::uint8_t UTF8_REJECT = 1;
-
-  public:
-    /*!
-    @param[in] s  output stream to serialize to
-    @param[in] ichar  indentation character to use
-    @param[in] error_handler_  how to react on decoding errors
-    */
-    serializer(output_adapter_t<char> s, const char ichar,
-               error_handler_t error_handler_ = error_handler_t::strict)
-        : o(std::move(s))
-        , loc(std::localeconv())
-        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : * (loc->thousands_sep))
-        , decimal_point(loc->decimal_point == nullptr ? '\0' : * (loc->decimal_point))
-        , indent_char(ichar)
-        , indent_string(512, indent_char)
-        , error_handler(error_handler_)
-    {}
-
-    // delete because of pointer members
-    serializer(const serializer&) = delete;
-    serializer& operator=(const serializer&) = delete;
-    serializer(serializer&&) = delete;
-    serializer& operator=(serializer&&) = delete;
-    ~serializer() = default;
-
-    /*!
-    @brief internal implementation of the serialization function
-
-    This function is called by the public member function dump and organizes
-    the serialization internally. The indentation level is propagated as
-    additional parameter. In case of arrays and objects, the function is
-    called recursively.
-
-    - strings and object keys are escaped using `escape_string()`
-    - integer numbers are converted implicitly via `operator<<`
-    - floating-point numbers are converted to a string using `"%g"` format
-
-    @param[in] val             value to serialize
-    @param[in] pretty_print    whether the output shall be pretty-printed
-    @param[in] indent_step     the indent level
-    @param[in] current_indent  the current indent level (only used internally)
-    */
-    void dump(const BasicJsonType& val, const bool pretty_print,
-              const bool ensure_ascii,
-              const unsigned int indent_step,
-              const unsigned int current_indent = 0)
-    {
-        switch (val.m_type)
-        {
-            case value_t::object:
-            {
-                if (val.m_value.object->empty())
-                {
-                    o->write_characters("{}", 2);
-                    return;
-                }
-
-                if (pretty_print)
-                {
-                    o->write_characters("{\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
-                    {
-                        o->write_characters(indent_string.c_str(), new_indent);
-                        o->write_character('\"');
-                        dump_escaped(i->first, ensure_ascii);
-                        o->write_characters("\": ", 3);
-                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
-                        o->write_characters(",\n", 2);
-                    }
-
-                    // last element
-                    assert(i != val.m_value.object->cend());
-                    assert(std::next(i) == val.m_value.object->cend());
-                    o->write_characters(indent_string.c_str(), new_indent);
-                    o->write_character('\"');
-                    dump_escaped(i->first, ensure_ascii);
-                    o->write_characters("\": ", 3);
-                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
-
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character('}');
-                }
-                else
-                {
-                    o->write_character('{');
-
-                    // first n-1 elements
-                    auto i = val.m_value.object->cbegin();
-                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
-                    {
-                        o->write_character('\"');
-                        dump_escaped(i->first, ensure_ascii);
-                        o->write_characters("\":", 2);
-                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
-                        o->write_character(',');
-                    }
-
-                    // last element
-                    assert(i != val.m_value.object->cend());
-                    assert(std::next(i) == val.m_value.object->cend());
-                    o->write_character('\"');
-                    dump_escaped(i->first, ensure_ascii);
-                    o->write_characters("\":", 2);
-                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
-
-                    o->write_character('}');
-                }
-
-                return;
-            }
-
-            case value_t::array:
-            {
-                if (val.m_value.array->empty())
-                {
-                    o->write_characters("[]", 2);
-                    return;
-                }
-
-                if (pretty_print)
-                {
-                    o->write_characters("[\n", 2);
-
-                    // variable to hold indentation for recursive calls
-                    const auto new_indent = current_indent + indent_step;
-                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
-                    {
-                        indent_string.resize(indent_string.size() * 2, ' ');
-                    }
-
-                    // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
-                    {
-                        o->write_characters(indent_string.c_str(), new_indent);
-                        dump(*i, true, ensure_ascii, indent_step, new_indent);
-                        o->write_characters(",\n", 2);
-                    }
-
-                    // last element
-                    assert(not val.m_value.array->empty());
-                    o->write_characters(indent_string.c_str(), new_indent);
-                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
-
-                    o->write_character('\n');
-                    o->write_characters(indent_string.c_str(), current_indent);
-                    o->write_character(']');
-                }
-                else
-                {
-                    o->write_character('[');
-
-                    // first n-1 elements
-                    for (auto i = val.m_value.array->cbegin();
-                            i != val.m_value.array->cend() - 1; ++i)
-                    {
-                        dump(*i, false, ensure_ascii, indent_step, current_indent);
-                        o->write_character(',');
-                    }
-
-                    // last element
-                    assert(not val.m_value.array->empty());
-                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
-
-                    o->write_character(']');
-                }
-
-                return;
-            }
-
-            case value_t::string:
-            {
-                o->write_character('\"');
-                dump_escaped(*val.m_value.string, ensure_ascii);
-                o->write_character('\"');
-                return;
-            }
-
-            case value_t::boolean:
-            {
-                if (val.m_value.boolean)
-                {
-                    o->write_characters("true", 4);
-                }
-                else
-                {
-                    o->write_characters("false", 5);
-                }
-                return;
-            }
-
-            case value_t::number_integer:
-            {
-                dump_integer(val.m_value.number_integer);
-                return;
-            }
-
-            case value_t::number_unsigned:
-            {
-                dump_integer(val.m_value.number_unsigned);
-                return;
-            }
-
-            case value_t::number_float:
-            {
-                dump_float(val.m_value.number_float);
-                return;
-            }
-
-            case value_t::discarded:
-            {
-                o->write_characters("<discarded>", 11);
-                return;
-            }
-
-            case value_t::null:
-            {
-                o->write_characters("null", 4);
-                return;
-            }
-
-            default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
-        }
-    }
-
-  private:
-    /*!
-    @brief dump escaped string
-
-    Escape a string by replacing certain special characters by a sequence of an
-    escape character (backslash) and another character and other control
-    characters by a sequence of "\u" followed by a four-digit hex
-    representation. The escaped string is written to output stream @a o.
-
-    @param[in] s  the string to escape
-    @param[in] ensure_ascii  whether to escape non-ASCII characters with
-                             \uXXXX sequences
-
-    @complexity Linear in the length of string @a s.
-    */
-    void dump_escaped(const string_t& s, const bool ensure_ascii)
-    {
-        std::uint32_t codepoint;
-        std::uint8_t state = UTF8_ACCEPT;
-        std::size_t bytes = 0;  // number of bytes written to string_buffer
-
-        // number of bytes written at the point of the last valid byte
-        std::size_t bytes_after_last_accept = 0;
-        std::size_t undumped_chars = 0;
-
-        for (std::size_t i = 0; i < s.size(); ++i)
-        {
-            const auto byte = static_cast<uint8_t>(s[i]);
-
-            switch (decode(state, codepoint, byte))
-            {
-                case UTF8_ACCEPT:  // decode found a new code point
-                {
-                    switch (codepoint)
-                    {
-                        case 0x08: // backspace
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'b';
-                            break;
-                        }
-
-                        case 0x09: // horizontal tab
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 't';
-                            break;
-                        }
-
-                        case 0x0A: // newline
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'n';
-                            break;
-                        }
-
-                        case 0x0C: // formfeed
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'f';
-                            break;
-                        }
-
-                        case 0x0D: // carriage return
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = 'r';
-                            break;
-                        }
-
-                        case 0x22: // quotation mark
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = '\"';
-                            break;
-                        }
-
-                        case 0x5C: // reverse solidus
-                        {
-                            string_buffer[bytes++] = '\\';
-                            string_buffer[bytes++] = '\\';
-                            break;
-                        }
-
-                        default:
-                        {
-                            // escape control characters (0x00..0x1F) or, if
-                            // ensure_ascii parameter is used, non-ASCII characters
-                            if ((codepoint <= 0x1F) or (ensure_ascii and (codepoint >= 0x7F)))
-                            {
-                                if (codepoint <= 0xFFFF)
-                                {
-                                    (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
-                                                    static_cast<std::uint16_t>(codepoint));
-                                    bytes += 6;
-                                }
-                                else
-                                {
-                                    (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
-                                                    static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
-                                                    static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
-                                    bytes += 12;
-                                }
-                            }
-                            else
-                            {
-                                // copy byte to buffer (all previous bytes
-                                // been copied have in default case above)
-                                string_buffer[bytes++] = s[i];
-                            }
-                            break;
-                        }
-                    }
-
-                    // write buffer and reset index; there must be 13 bytes
-                    // left, as this is the maximal number of bytes to be
-                    // written ("\uxxxx\uxxxx\0") for one code point
-                    if (string_buffer.size() - bytes < 13)
-                    {
-                        o->write_characters(string_buffer.data(), bytes);
-                        bytes = 0;
-                    }
-
-                    // remember the byte position of this accept
-                    bytes_after_last_accept = bytes;
-                    undumped_chars = 0;
-                    break;
-                }
-
-                case UTF8_REJECT:  // decode found invalid UTF-8 byte
-                {
-                    switch (error_handler)
-                    {
-                        case error_handler_t::strict:
-                        {
-                            std::string sn(3, '\0');
-                            (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
-                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn));
-                        }
-
-                        case error_handler_t::ignore:
-                        case error_handler_t::replace:
-                        {
-                            // in case we saw this character the first time, we
-                            // would like to read it again, because the byte
-                            // may be OK for itself, but just not OK for the
-                            // previous sequence
-                            if (undumped_chars > 0)
-                            {
-                                --i;
-                            }
-
-                            // reset length buffer to the last accepted index;
-                            // thus removing/ignoring the invalid characters
-                            bytes = bytes_after_last_accept;
-
-                            if (error_handler == error_handler_t::replace)
-                            {
-                                // add a replacement character
-                                if (ensure_ascii)
-                                {
-                                    string_buffer[bytes++] = '\\';
-                                    string_buffer[bytes++] = 'u';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'f';
-                                    string_buffer[bytes++] = 'd';
-                                }
-                                else
-                                {
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
-                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
-                                }
-
-                                // write buffer and reset index; there must be 13 bytes
-                                // left, as this is the maximal number of bytes to be
-                                // written ("\uxxxx\uxxxx\0") for one code point
-                                if (string_buffer.size() - bytes < 13)
-                                {
-                                    o->write_characters(string_buffer.data(), bytes);
-                                    bytes = 0;
-                                }
-
-                                bytes_after_last_accept = bytes;
-                            }
-
-                            undumped_chars = 0;
-
-                            // continue processing the string
-                            state = UTF8_ACCEPT;
-                            break;
-                        }
-
-                        default:            // LCOV_EXCL_LINE
-                            assert(false);  // LCOV_EXCL_LINE
-                    }
-                    break;
-                }
-
-                default:  // decode found yet incomplete multi-byte code point
-                {
-                    if (not ensure_ascii)
-                    {
-                        // code point will not be escaped - copy byte to buffer
-                        string_buffer[bytes++] = s[i];
-                    }
-                    ++undumped_chars;
-                    break;
-                }
-            }
-        }
-
-        // we finished processing the string
-        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
-        {
-            // write buffer
-            if (bytes > 0)
-            {
-                o->write_characters(string_buffer.data(), bytes);
-            }
-        }
-        else
-        {
-            // we finish reading, but do not accept: string was incomplete
-            switch (error_handler)
-            {
-                case error_handler_t::strict:
-                {
-                    std::string sn(3, '\0');
-                    (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
-                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn));
-                }
-
-                case error_handler_t::ignore:
-                {
-                    // write all accepted bytes
-                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
-                    break;
-                }
-
-                case error_handler_t::replace:
-                {
-                    // write all accepted bytes
-                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
-                    // add a replacement character
-                    if (ensure_ascii)
-                    {
-                        o->write_characters("\\ufffd", 6);
-                    }
-                    else
-                    {
-                        o->write_characters("\xEF\xBF\xBD", 3);
-                    }
-                    break;
-                }
-
-                default:            // LCOV_EXCL_LINE
-                    assert(false);  // LCOV_EXCL_LINE
-            }
-        }
-    }
-
-    /*!
-    @brief count digits
-
-    Count the number of decimal (base 10) digits for an input unsigned integer.
-
-    @param[in] x  unsigned integer number to count its digits
-    @return    number of decimal digits
-    */
-    inline unsigned int count_digits(number_unsigned_t x) noexcept
-    {
-        unsigned int n_digits = 1;
-        for (;;)
-        {
-            if (x < 10)
-            {
-                return n_digits;
-            }
-            if (x < 100)
-            {
-                return n_digits + 1;
-            }
-            if (x < 1000)
-            {
-                return n_digits + 2;
-            }
-            if (x < 10000)
-            {
-                return n_digits + 3;
-            }
-            x = x / 10000u;
-            n_digits += 4;
-        }
-    }
-
-    /*!
-    @brief dump an integer
-
-    Dump a given integer to output stream @a o. Works internally with
-    @a number_buffer.
-
-    @param[in] x  integer number (signed or unsigned) to dump
-    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
-    */
-    template<typename NumberType, detail::enable_if_t<
-                 std::is_same<NumberType, number_unsigned_t>::value or
-                 std::is_same<NumberType, number_integer_t>::value,
-                 int> = 0>
-    void dump_integer(NumberType x)
-    {
-        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
-        {
-            {
-                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
-                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
-                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
-                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
-                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
-                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
-                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
-                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
-                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
-                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
-            }
-        };
-
-        // special case for "0"
-        if (x == 0)
-        {
-            o->write_character('0');
-            return;
-        }
-
-        // use a pointer to fill the buffer
-        auto buffer_ptr = number_buffer.begin();
-
-        const bool is_negative = std::is_same<NumberType, number_integer_t>::value and not(x >= 0); // see issue #755
-        number_unsigned_t abs_value;
-
-        unsigned int n_chars;
-
-        if (is_negative)
-        {
-            *buffer_ptr = '-';
-            abs_value = remove_sign(x);
-
-            // account one more byte for the minus sign
-            n_chars = 1 + count_digits(abs_value);
-        }
-        else
-        {
-            abs_value = static_cast<number_unsigned_t>(x);
-            n_chars = count_digits(abs_value);
-        }
-
-        // spare 1 byte for '\0'
-        assert(n_chars < number_buffer.size() - 1);
-
-        // jump to the end to generate the string from backward
-        // so we later avoid reversing the result
-        buffer_ptr += n_chars;
-
-        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
-        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
-        while (abs_value >= 100)
-        {
-            const auto digits_index = static_cast<unsigned>((abs_value % 100));
-            abs_value /= 100;
-            *(--buffer_ptr) = digits_to_99[digits_index][1];
-            *(--buffer_ptr) = digits_to_99[digits_index][0];
-        }
-
-        if (abs_value >= 10)
-        {
-            const auto digits_index = static_cast<unsigned>(abs_value);
-            *(--buffer_ptr) = digits_to_99[digits_index][1];
-            *(--buffer_ptr) = digits_to_99[digits_index][0];
-        }
-        else
-        {
-            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
-        }
-
-        o->write_characters(number_buffer.data(), n_chars);
-    }
-
-    /*!
-    @brief dump a floating-point number
-
-    Dump a given floating-point number to output stream @a o. Works internally
-    with @a number_buffer.
-
-    @param[in] x  floating-point number to dump
-    */
-    void dump_float(number_float_t x)
-    {
-        // NaN / inf
-        if (not std::isfinite(x))
-        {
-            o->write_characters("null", 4);
-            return;
-        }
-
-        // If number_float_t is an IEEE-754 single or double precision number,
-        // use the Grisu2 algorithm to produce short numbers which are
-        // guaranteed to round-trip, using strtof and strtod, resp.
-        //
-        // NB: The test below works if <long double> == <double>.
-        static constexpr bool is_ieee_single_or_double
-            = (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 24 and std::numeric_limits<number_float_t>::max_exponent == 128) or
-              (std::numeric_limits<number_float_t>::is_iec559 and std::numeric_limits<number_float_t>::digits == 53 and std::numeric_limits<number_float_t>::max_exponent == 1024);
-
-        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
-    }
-
-    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
-    {
-        char* begin = number_buffer.data();
-        char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
-
-        o->write_characters(begin, static_cast<size_t>(end - begin));
-    }
-
-    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
-    {
-        // get number of digits for a float -> text -> float round-trip
-        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
-
-        // the actual conversion
-        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
-
-        // negative value indicates an error
-        assert(len > 0);
-        // check if buffer was large enough
-        assert(static_cast<std::size_t>(len) < number_buffer.size());
-
-        // erase thousands separator
-        if (thousands_sep != '\0')
-        {
-            const auto end = std::remove(number_buffer.begin(),
-                                         number_buffer.begin() + len, thousands_sep);
-            std::fill(end, number_buffer.end(), '\0');
-            assert((end - number_buffer.begin()) <= len);
-            len = (end - number_buffer.begin());
-        }
-
-        // convert decimal point to '.'
-        if (decimal_point != '\0' and decimal_point != '.')
-        {
-            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
-            if (dec_pos != number_buffer.end())
-            {
-                *dec_pos = '.';
-            }
-        }
-
-        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
-
-        // determine if need to append ".0"
-        const bool value_is_int_like =
-            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
-                         [](char c)
-        {
-            return c == '.' or c == 'e';
-        });
-
-        if (value_is_int_like)
-        {
-            o->write_characters(".0", 2);
-        }
-    }
-
-    /*!
-    @brief check whether a string is UTF-8 encoded
-
-    The function checks each byte of a string whether it is UTF-8 encoded. The
-    result of the check is stored in the @a state parameter. The function must
-    be called initially with state 0 (accept). State 1 means the string must
-    be rejected, because the current byte is not allowed. If the string is
-    completely processed, but the state is non-zero, the string ended
-    prematurely; that is, the last byte indicated more bytes should have
-    followed.
-
-    @param[in,out] state  the state of the decoding
-    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
-    @param[in] byte       next byte to decode
-    @return               new state
-
-    @note The function has been edited: a std::array is used.
-
-    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
-    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
-    */
-    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
-    {
-        static const std::array<std::uint8_t, 400> utf8d =
-        {
-            {
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
-                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
-                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
-                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
-                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
-                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
-                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
-                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
-                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
-                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
-                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
-            }
-        };
-
-        const std::uint8_t type = utf8d[byte];
-
-        codep = (state != UTF8_ACCEPT)
-                ? (byte & 0x3fu) | (codep << 6u)
-                : (0xFFu >> type) & (byte);
-
-        state = utf8d[256u + state * 16u + type];
-        return state;
-    }
-
-    /*
-     * Overload to make the compiler happy while it is instantiating
-     * dump_integer for number_unsigned_t.
-     * Must never be called.
-     */
-    number_unsigned_t remove_sign(number_unsigned_t x)
-    {
-        assert(false); // LCOV_EXCL_LINE
-        return x; // LCOV_EXCL_LINE
-    }
-
-    /*
-     * Helper function for dump_integer
-     *
-     * This function takes a negative signed integer and returns its absolute
-     * value as unsigned integer. The plus/minus shuffling is necessary as we can
-     * not directly remove the sign of an arbitrary signed integer as the
-     * absolute values of INT_MIN and INT_MAX are usually not the same. See
-     * #1708 for details.
-     */
-    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
-    {
-        assert(x < 0 and x < (std::numeric_limits<number_integer_t>::max)());
-        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
-    }
-
-  private:
-    /// the output of the serializer
-    output_adapter_t<char> o = nullptr;
-
-    /// a (hopefully) large enough character buffer
-    std::array<char, 64> number_buffer{{}};
-
-    /// the locale
-    const std::lconv* loc = nullptr;
-    /// the locale's thousand separator character
-    const char thousands_sep = '\0';
-    /// the locale's decimal point character
-    const char decimal_point = '\0';
-
-    /// string buffer
-    std::array<char, 512> string_buffer{{}};
-
-    /// the indentation character
-    const char indent_char;
-    /// the indentation string
-    string_t indent_string;
-
-    /// error_handler how to react on decoding errors
-    const error_handler_t error_handler;
-};
-}  // namespace detail
-}  // namespace nlohmann
-
-// #include <nlohmann/detail/value_t.hpp>
-
-// #include <nlohmann/json_fwd.hpp>
-
-
-/*!
-@brief namespace for Niels Lohmann
-@see https://github.com/nlohmann
-@since version 1.0.0
-*/
-namespace nlohmann
-{
-
-/*!
-@brief a class to store JSON values
-
-@tparam ObjectType type for JSON objects (`std::map` by default; will be used
-in @ref object_t)
-@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
-in @ref array_t)
-@tparam StringType type for JSON strings and object keys (`std::string` by
-default; will be used in @ref string_t)
-@tparam BooleanType type for JSON booleans (`bool` by default; will be used
-in @ref boolean_t)
-@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
-default; will be used in @ref number_integer_t)
-@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
-`uint64_t` by default; will be used in @ref number_unsigned_t)
-@tparam NumberFloatType type for JSON floating-point numbers (`double` by
-default; will be used in @ref number_float_t)
-@tparam AllocatorType type of the allocator to use (`std::allocator` by
-default)
-@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
-and `from_json()` (@ref adl_serializer by default)
-
-@requirement The class satisfies the following concept requirements:
-- Basic
- - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible):
-   JSON values can be default constructed. The result will be a JSON null
-   value.
- - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible):
-   A JSON value can be constructed from an rvalue argument.
- - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible):
-   A JSON value can be copy-constructed from an lvalue expression.
- - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable):
-   A JSON value van be assigned from an rvalue argument.
- - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable):
-   A JSON value can be copy-assigned from an lvalue expression.
- - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible):
-   JSON values can be destructed.
-- Layout
- - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType):
-   JSON values have
-   [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
-   All non-static data members are private and standard layout types, the
-   class has no virtual functions or (virtual) base classes.
-- Library-wide
- - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable):
-   JSON values can be compared with `==`, see @ref
-   operator==(const_reference,const_reference).
- - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable):
-   JSON values can be compared with `<`, see @ref
-   operator<(const_reference,const_reference).
- - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable):
-   Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
-   other compatible types, using unqualified function call @ref swap().
- - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer):
-   JSON values can be compared against `std::nullptr_t` objects which are used
-   to model the `null` value.
-- Container
- - [Container](https://en.cppreference.com/w/cpp/named_req/Container):
-   JSON values can be used like STL containers and provide iterator access.
- - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer);
-   JSON values can be used like STL containers and provide reverse iterator
-   access.
-
-@invariant The member variables @a m_value and @a m_type have the following
-relationship:
-- If `m_type == value_t::object`, then `m_value.object != nullptr`.
-- If `m_type == value_t::array`, then `m_value.array != nullptr`.
-- If `m_type == value_t::string`, then `m_value.string != nullptr`.
-The invariants are checked by member function assert_invariant().
-
-@internal
-@note ObjectType trick from http://stackoverflow.com/a/9860911
-@endinternal
-
-@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
-Format](http://rfc7159.net/rfc7159)
-
-@since version 1.0.0
-
-@nosubgrouping
-*/
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-class basic_json
-{
-  private:
-    template<detail::value_t> friend struct detail::external_constructor;
-    friend ::nlohmann::json_pointer<basic_json>;
-    friend ::nlohmann::detail::parser<basic_json>;
-    friend ::nlohmann::detail::serializer<basic_json>;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::iter_impl;
-    template<typename BasicJsonType, typename CharType>
-    friend class ::nlohmann::detail::binary_writer;
-    template<typename BasicJsonType, typename SAX>
-    friend class ::nlohmann::detail::binary_reader;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_parser;
-    template<typename BasicJsonType>
-    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
-
-    /// workaround type for MSVC
-    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
-
-    // convenience aliases for types residing in namespace detail;
-    using lexer = ::nlohmann::detail::lexer<basic_json>;
-    using parser = ::nlohmann::detail::parser<basic_json>;
-
-    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
-    template<typename BasicJsonType>
-    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
-    template<typename BasicJsonType>
-    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
-    template<typename Iterator>
-    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
-    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
-
-    template<typename CharType>
-    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
-
-    using binary_reader = ::nlohmann::detail::binary_reader<basic_json>;
-    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
-
-    using serializer = ::nlohmann::detail::serializer<basic_json>;
-
-  public:
-    using value_t = detail::value_t;
-    /// JSON Pointer, see @ref nlohmann::json_pointer
-    using json_pointer = ::nlohmann::json_pointer<basic_json>;
-    template<typename T, typename SFINAE>
-    using json_serializer = JSONSerializer<T, SFINAE>;
-    /// how to treat decoding errors
-    using error_handler_t = detail::error_handler_t;
-    /// helper type for initializer lists of basic_json values
-    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
-
-    using input_format_t = detail::input_format_t;
-    /// SAX interface type, see @ref nlohmann::json_sax
-    using json_sax_t = json_sax<basic_json>;
-
-    ////////////////
-    // exceptions //
-    ////////////////
-
-    /// @name exceptions
-    /// Classes to implement user-defined exceptions.
-    /// @{
-
-    /// @copydoc detail::exception
-    using exception = detail::exception;
-    /// @copydoc detail::parse_error
-    using parse_error = detail::parse_error;
-    /// @copydoc detail::invalid_iterator
-    using invalid_iterator = detail::invalid_iterator;
-    /// @copydoc detail::type_error
-    using type_error = detail::type_error;
-    /// @copydoc detail::out_of_range
-    using out_of_range = detail::out_of_range;
-    /// @copydoc detail::other_error
-    using other_error = detail::other_error;
-
-    /// @}
-
-
-    /////////////////////
-    // container types //
-    /////////////////////
-
-    /// @name container types
-    /// The canonic container types to use @ref basic_json like any other STL
-    /// container.
-    /// @{
-
-    /// the type of elements in a basic_json container
-    using value_type = basic_json;
-
-    /// the type of an element reference
-    using reference = value_type&;
-    /// the type of an element const reference
-    using const_reference = const value_type&;
-
-    /// a type to represent differences between iterators
-    using difference_type = std::ptrdiff_t;
-    /// a type to represent container sizes
-    using size_type = std::size_t;
-
-    /// the allocator type
-    using allocator_type = AllocatorType<basic_json>;
-
-    /// the type of an element pointer
-    using pointer = typename std::allocator_traits<allocator_type>::pointer;
-    /// the type of an element const pointer
-    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
-
-    /// an iterator for a basic_json container
-    using iterator = iter_impl<basic_json>;
-    /// a const iterator for a basic_json container
-    using const_iterator = iter_impl<const basic_json>;
-    /// a reverse iterator for a basic_json container
-    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
-    /// a const reverse iterator for a basic_json container
-    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
-
-    /// @}
-
-
-    /*!
-    @brief returns the allocator associated with the container
-    */
-    static allocator_type get_allocator()
-    {
-        return allocator_type();
-    }
-
-    /*!
-    @brief returns version information on the library
-
-    This function returns a JSON object with information about the library,
-    including the version number and information on the platform and compiler.
-
-    @return JSON object holding version information
-    key         | description
-    ----------- | ---------------
-    `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
-    `copyright` | The copyright line for the library as string.
-    `name`      | The name of the library as string.
-    `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
-    `url`       | The URL of the project as string.
-    `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
-
-    @liveexample{The following code shows an example output of the `meta()`
-    function.,meta}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @complexity Constant.
-
-    @since 2.1.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json meta()
-    {
-        basic_json result;
-
-        result["copyright"] = "(C) 2013-2017 Niels Lohmann";
-        result["name"] = "JSON for Modern C++";
-        result["url"] = "https://github.com/nlohmann/json";
-        result["version"]["string"] =
-            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
-            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
-        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
-        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
-        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
-
-#ifdef _WIN32
-        result["platform"] = "win32";
-#elif defined __linux__
-        result["platform"] = "linux";
-#elif defined __APPLE__
-        result["platform"] = "apple";
-#elif defined __unix__
-        result["platform"] = "unix";
-#else
-        result["platform"] = "unknown";
-#endif
-
-#if defined(__ICC) || defined(__INTEL_COMPILER)
-        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
-#elif defined(__clang__)
-        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
-#elif defined(__GNUC__) || defined(__GNUG__)
-        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
-#elif defined(__HP_cc) || defined(__HP_aCC)
-        result["compiler"] = "hp"
-#elif defined(__IBMCPP__)
-        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
-#elif defined(_MSC_VER)
-        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
-#elif defined(__PGI)
-        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
-#elif defined(__SUNPRO_CC)
-        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
-#else
-        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
-#endif
-
-#ifdef __cplusplus
-        result["compiler"]["c++"] = std::to_string(__cplusplus);
-#else
-        result["compiler"]["c++"] = "unknown";
-#endif
-        return result;
-    }
-
-
-    ///////////////////////////
-    // JSON value data types //
-    ///////////////////////////
-
-    /// @name JSON value data types
-    /// The data types to store a JSON value. These types are derived from
-    /// the template arguments passed to class @ref basic_json.
-    /// @{
-
-#if defined(JSON_HAS_CPP_14)
-    // Use transparent comparator if possible, combined with perfect forwarding
-    // on find() and count() calls prevents unnecessary string construction.
-    using object_comparator_t = std::less<>;
-#else
-    using object_comparator_t = std::less<StringType>;
-#endif
-
-    /*!
-    @brief a type for an object
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
-    > An object is an unordered collection of zero or more name/value pairs,
-    > where a name is a string and a value is a string, number, boolean, null,
-    > object, or array.
-
-    To store objects in C++, a type is defined by the template parameters
-    described below.
-
-    @tparam ObjectType  the container to store objects (e.g., `std::map` or
-    `std::unordered_map`)
-    @tparam StringType the type of the keys or names (e.g., `std::string`).
-    The comparison function `std::less<StringType>` is used to order elements
-    inside the container.
-    @tparam AllocatorType the allocator to use for objects (e.g.,
-    `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ObjectType (`std::map`), @a StringType
-    (`std::string`), and @a AllocatorType (`std::allocator`), the default
-    value for @a object_t is:
-
-    @code {.cpp}
-    std::map<
-      std::string, // key_type
-      basic_json, // value_type
-      std::less<std::string>, // key_compare
-      std::allocator<std::pair<const std::string, basic_json>> // allocator_type
-    >
-    @endcode
-
-    #### Behavior
-
-    The choice of @a object_t influences the behavior of the JSON class. With
-    the default type, objects have the following behavior:
-
-    - When all names are unique, objects will be interoperable in the sense
-      that all software implementations receiving that object will agree on
-      the name-value mappings.
-    - When the names within an object are not unique, it is unspecified which
-      one of the values for a given key will be chosen. For instance,
-      `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or
-      `{"key": 2}`.
-    - Internally, name/value pairs are stored in lexicographical order of the
-      names. Objects will also be serialized (see @ref dump) in this order.
-      For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
-      and serialized as `{"a": 2, "b": 1}`.
-    - When comparing objects, the order of the name/value pairs is irrelevant.
-      This makes objects interoperable in the sense that they will not be
-      affected by these differences. For instance, `{"b": 1, "a": 2}` and
-      `{"a": 2, "b": 1}` will be treated as equal.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the object's limit of nesting is not explicitly constrained.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON object.
-
-    #### Storage
-
-    Objects are stored as pointers in a @ref basic_json type. That is, for any
-    access to object values, a pointer of type `object_t*` must be
-    dereferenced.
-
-    @sa @ref array_t -- type for an array value
-
-    @since version 1.0.0
-
-    @note The order name/value pairs are added to the object is *not*
-    preserved by the library. Therefore, iterating an object may return
-    name/value pairs in a different order than they were originally stored. In
-    fact, keys will be traversed in alphabetical order as `std::map` with
-    `std::less` is used by default. Please note this behavior conforms to [RFC
-    7159](http://rfc7159.net/rfc7159), because any order implements the
-    specified "unordered" nature of JSON objects.
-    */
-    using object_t = ObjectType<StringType,
-          basic_json,
-          object_comparator_t,
-          AllocatorType<std::pair<const StringType,
-          basic_json>>>;
-
-    /*!
-    @brief a type for an array
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
-    > An array is an ordered sequence of zero or more values.
-
-    To store objects in C++, a type is defined by the template parameters
-    explained below.
-
-    @tparam ArrayType  container type to store arrays (e.g., `std::vector` or
-    `std::list`)
-    @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
-
-    #### Default type
-
-    With the default values for @a ArrayType (`std::vector`) and @a
-    AllocatorType (`std::allocator`), the default value for @a array_t is:
-
-    @code {.cpp}
-    std::vector<
-      basic_json, // value_type
-      std::allocator<basic_json> // allocator_type
-    >
-    @endcode
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the maximum depth of nesting.
-
-    In this class, the array's limit of nesting is not explicitly constrained.
-    However, a maximum depth of nesting may be introduced by the compiler or
-    runtime environment. A theoretical limit can be queried by calling the
-    @ref max_size function of a JSON array.
-
-    #### Storage
-
-    Arrays are stored as pointers in a @ref basic_json type. That is, for any
-    access to array values, a pointer of type `array_t*` must be dereferenced.
-
-    @sa @ref object_t -- type for an object value
-
-    @since version 1.0.0
-    */
-    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
-
-    /*!
-    @brief a type for a string
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
-    > A string is a sequence of zero or more Unicode characters.
-
-    To store objects in C++, a type is defined by the template parameter
-    described below. Unicode values are split by the JSON class into
-    byte-sized characters during deserialization.
-
-    @tparam StringType  the container to store strings (e.g., `std::string`).
-    Note this container is used for keys/names in objects, see @ref object_t.
-
-    #### Default type
-
-    With the default values for @a StringType (`std::string`), the default
-    value for @a string_t is:
-
-    @code {.cpp}
-    std::string
-    @endcode
-
-    #### Encoding
-
-    Strings are stored in UTF-8 encoding. Therefore, functions like
-    `std::string::size()` or `std::string::length()` return the number of
-    bytes in the string rather than the number of characters or glyphs.
-
-    #### String comparison
-
-    [RFC 7159](http://rfc7159.net/rfc7159) states:
-    > Software implementations are typically required to test names of object
-    > members for equality. Implementations that transform the textual
-    > representation into sequences of Unicode code units and then perform the
-    > comparison numerically, code unit by code unit, are interoperable in the
-    > sense that implementations will agree in all cases on equality or
-    > inequality of two strings. For example, implementations that compare
-    > strings with escaped characters unconverted may incorrectly find that
-    > `"a\\b"` and `"a\u005Cb"` are not equal.
-
-    This implementation is interoperable as it does compare strings code unit
-    by code unit.
-
-    #### Storage
-
-    String values are stored as pointers in a @ref basic_json type. That is,
-    for any access to string values, a pointer of type `string_t*` must be
-    dereferenced.
-
-    @since version 1.0.0
-    */
-    using string_t = StringType;
-
-    /*!
-    @brief a type for a boolean
-
-    [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a
-    type which differentiates the two literals `true` and `false`.
-
-    To store objects in C++, a type is defined by the template parameter @a
-    BooleanType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a BooleanType (`bool`), the default value for
-    @a boolean_t is:
-
-    @code {.cpp}
-    bool
-    @endcode
-
-    #### Storage
-
-    Boolean values are stored directly inside a @ref basic_json type.
-
-    @since version 1.0.0
-    */
-    using boolean_t = BooleanType;
-
-    /*!
-    @brief a type for a number (integer)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store integer numbers in C++, a type is defined by the template
-    parameter @a NumberIntegerType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberIntegerType (`int64_t`), the default
-    value for @a number_integer_t is:
-
-    @code {.cpp}
-    int64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
-    that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
-    that are out of range will yield over/underflow when used in a
-    constructor. During deserialization, too large or small integer numbers
-    will be automatically be stored as @ref number_unsigned_t or @ref
-    number_float_t.
-
-    [RFC 7159](http://rfc7159.net/rfc7159) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange of the exactly supported range [INT64_MIN,
-    INT64_MAX], this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa @ref number_float_t -- type for number values (floating-point)
-
-    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
-
-    @since version 1.0.0
-    */
-    using number_integer_t = NumberIntegerType;
-
-    /*!
-    @brief a type for a number (unsigned)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store unsigned integer numbers in C++, a type is defined by the
-    template parameter @a NumberUnsignedType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberUnsignedType (`uint64_t`), the
-    default value for @a number_unsigned_t is:
-
-    @code {.cpp}
-    uint64_t
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in integer literals lead to an interpretation as octal
-      number. Internally, the value will be stored as decimal number. For
-      instance, the C++ integer literal `010` will be serialized to `8`.
-      During deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
-    > An implementation may set limits on the range and precision of numbers.
-
-    When the default type is used, the maximal integer number that can be
-    stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
-    number that can be stored is `0`. Integer numbers that are out of range
-    will yield over/underflow when used in a constructor. During
-    deserialization, too large or small integer numbers will be automatically
-    be stored as @ref number_integer_t or @ref number_float_t.
-
-    [RFC 7159](http://rfc7159.net/rfc7159) further states:
-    > Note that when such software is used, numbers that are integers and are
-    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
-    > that implementations will agree exactly on their numeric values.
-
-    As this range is a subrange (when considered in conjunction with the
-    number_integer_t type) of the exactly supported range [0, UINT64_MAX],
-    this class's integer type is interoperable.
-
-    #### Storage
-
-    Integer number values are stored directly inside a @ref basic_json type.
-
-    @sa @ref number_float_t -- type for number values (floating-point)
-    @sa @ref number_integer_t -- type for number values (integer)
-
-    @since version 2.0.0
-    */
-    using number_unsigned_t = NumberUnsignedType;
-
-    /*!
-    @brief a type for a number (floating-point)
-
-    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
-    > The representation of numbers is similar to that used in most
-    > programming languages. A number is represented in base 10 using decimal
-    > digits. It contains an integer component that may be prefixed with an
-    > optional minus sign, which may be followed by a fraction part and/or an
-    > exponent part. Leading zeros are not allowed. (...) Numeric values that
-    > cannot be represented in the grammar below (such as Infinity and NaN)
-    > are not permitted.
-
-    This description includes both integer and floating-point numbers.
-    However, C++ allows more precise storage if it is known whether the number
-    is a signed integer, an unsigned integer or a floating-point number.
-    Therefore, three different types, @ref number_integer_t, @ref
-    number_unsigned_t and @ref number_float_t are used.
-
-    To store floating-point numbers in C++, a type is defined by the template
-    parameter @a NumberFloatType which chooses the type to use.
-
-    #### Default type
-
-    With the default values for @a NumberFloatType (`double`), the default
-    value for @a number_float_t is:
-
-    @code {.cpp}
-    double
-    @endcode
-
-    #### Default behavior
-
-    - The restrictions about leading zeros is not enforced in C++. Instead,
-      leading zeros in floating-point literals will be ignored. Internally,
-      the value will be stored as decimal number. For instance, the C++
-      floating-point literal `01.2` will be serialized to `1.2`. During
-      deserialization, leading zeros yield an error.
-    - Not-a-number (NaN) values will be serialized to `null`.
-
-    #### Limits
-
-    [RFC 7159](http://rfc7159.net/rfc7159) states:
-    > This specification allows implementations to set limits on the range and
-    > precision of numbers accepted. Since software that implements IEEE
-    > 754-2008 binary64 (double precision) numbers is generally available and
-    > widely used, good interoperability can be achieved by implementations
-    > that expect no more precision or range than these provide, in the sense
-    > that implementations will approximate JSON numbers within the expected
-    > precision.
-
-    This implementation does exactly follow this approach, as it uses double
-    precision floating-point numbers. Note values smaller than
-    `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
-    will be stored as NaN internally and be serialized to `null`.
-
-    #### Storage
-
-    Floating-point number values are stored directly inside a @ref basic_json
-    type.
-
-    @sa @ref number_integer_t -- type for number values (integer)
-
-    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
-
-    @since version 1.0.0
-    */
-    using number_float_t = NumberFloatType;
-
-    /// @}
-
-  private:
-
-    /// helper for exception-safe object creation
-    template<typename T, typename... Args>
-    JSON_HEDLEY_RETURNS_NON_NULL
-    static T* create(Args&& ... args)
-    {
-        AllocatorType<T> alloc;
-        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
-
-        auto deleter = [&](T * object)
-        {
-            AllocatorTraits::deallocate(alloc, object, 1);
-        };
-        std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter);
-        AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...);
-        assert(object != nullptr);
-        return object.release();
-    }
-
-    ////////////////////////
-    // JSON value storage //
-    ////////////////////////
-
-    /*!
-    @brief a JSON value
-
-    The actual storage for a JSON value of the @ref basic_json class. This
-    union combines the different storage types for the JSON value types
-    defined in @ref value_t.
-
-    JSON type | value_t type    | used type
-    --------- | --------------- | ------------------------
-    object    | object          | pointer to @ref object_t
-    array     | array           | pointer to @ref array_t
-    string    | string          | pointer to @ref string_t
-    boolean   | boolean         | @ref boolean_t
-    number    | number_integer  | @ref number_integer_t
-    number    | number_unsigned | @ref number_unsigned_t
-    number    | number_float    | @ref number_float_t
-    null      | null            | *no value is stored*
-
-    @note Variable-length types (objects, arrays, and strings) are stored as
-    pointers. The size of the union should not exceed 64 bits if the default
-    value types are used.
-
-    @since version 1.0.0
-    */
-    union json_value
-    {
-        /// object (stored with pointer to save storage)
-        object_t* object;
-        /// array (stored with pointer to save storage)
-        array_t* array;
-        /// string (stored with pointer to save storage)
-        string_t* string;
-        /// boolean
-        boolean_t boolean;
-        /// number (integer)
-        number_integer_t number_integer;
-        /// number (unsigned integer)
-        number_unsigned_t number_unsigned;
-        /// number (floating-point)
-        number_float_t number_float;
-
-        /// default constructor (for null values)
-        json_value() = default;
-        /// constructor for booleans
-        json_value(boolean_t v) noexcept : boolean(v) {}
-        /// constructor for numbers (integer)
-        json_value(number_integer_t v) noexcept : number_integer(v) {}
-        /// constructor for numbers (unsigned)
-        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
-        /// constructor for numbers (floating-point)
-        json_value(number_float_t v) noexcept : number_float(v) {}
-        /// constructor for empty values of a given type
-        json_value(value_t t)
-        {
-            switch (t)
-            {
-                case value_t::object:
-                {
-                    object = create<object_t>();
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    array = create<array_t>();
-                    break;
-                }
-
-                case value_t::string:
-                {
-                    string = create<string_t>("");
-                    break;
-                }
-
-                case value_t::boolean:
-                {
-                    boolean = boolean_t(false);
-                    break;
-                }
-
-                case value_t::number_integer:
-                {
-                    number_integer = number_integer_t(0);
-                    break;
-                }
-
-                case value_t::number_unsigned:
-                {
-                    number_unsigned = number_unsigned_t(0);
-                    break;
-                }
-
-                case value_t::number_float:
-                {
-                    number_float = number_float_t(0.0);
-                    break;
-                }
-
-                case value_t::null:
-                {
-                    object = nullptr;  // silence warning, see #821
-                    break;
-                }
-
-                default:
-                {
-                    object = nullptr;  // silence warning, see #821
-                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
-                    {
-                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.7.1")); // LCOV_EXCL_LINE
-                    }
-                    break;
-                }
-            }
-        }
-
-        /// constructor for strings
-        json_value(const string_t& value)
-        {
-            string = create<string_t>(value);
-        }
-
-        /// constructor for rvalue strings
-        json_value(string_t&& value)
-        {
-            string = create<string_t>(std::move(value));
-        }
-
-        /// constructor for objects
-        json_value(const object_t& value)
-        {
-            object = create<object_t>(value);
-        }
-
-        /// constructor for rvalue objects
-        json_value(object_t&& value)
-        {
-            object = create<object_t>(std::move(value));
-        }
-
-        /// constructor for arrays
-        json_value(const array_t& value)
-        {
-            array = create<array_t>(value);
-        }
-
-        /// constructor for rvalue arrays
-        json_value(array_t&& value)
-        {
-            array = create<array_t>(std::move(value));
-        }
-
-        void destroy(value_t t) noexcept
-        {
-            switch (t)
-            {
-                case value_t::object:
-                {
-                    AllocatorType<object_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    AllocatorType<array_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
-                    break;
-                }
-
-                case value_t::string:
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
-                    break;
-                }
-
-                default:
-                {
-                    break;
-                }
-            }
-        }
-    };
-
-    /*!
-    @brief checks the class invariants
-
-    This function asserts the class invariants. It needs to be called at the
-    end of every constructor to make sure that created objects respect the
-    invariant. Furthermore, it has to be called each time the type of a JSON
-    value is changed, because the invariant expresses a relationship between
-    @a m_type and @a m_value.
-    */
-    void assert_invariant() const noexcept
-    {
-        assert(m_type != value_t::object or m_value.object != nullptr);
-        assert(m_type != value_t::array or m_value.array != nullptr);
-        assert(m_type != value_t::string or m_value.string != nullptr);
-    }
-
-  public:
-    //////////////////////////
-    // JSON parser callback //
-    //////////////////////////
-
-    /*!
-    @brief parser event types
-
-    The parser callback distinguishes the following events:
-    - `object_start`: the parser read `{` and started to process a JSON object
-    - `key`: the parser read a key of a value in an object
-    - `object_end`: the parser read `}` and finished processing a JSON object
-    - `array_start`: the parser read `[` and started to process a JSON array
-    - `array_end`: the parser read `]` and finished processing a JSON array
-    - `value`: the parser finished reading a JSON value
-
-    @image html callback_events.png "Example when certain parse events are triggered"
-
-    @sa @ref parser_callback_t for more information and examples
-    */
-    using parse_event_t = typename parser::parse_event_t;
-
-    /*!
-    @brief per-element parser callback type
-
-    With a parser callback function, the result of parsing a JSON text can be
-    influenced. When passed to @ref parse, it is called on certain events
-    (passed as @ref parse_event_t via parameter @a event) with a set recursion
-    depth @a depth and context JSON value @a parsed. The return value of the
-    callback function is a boolean indicating whether the element that emitted
-    the callback shall be kept or not.
-
-    We distinguish six scenarios (determined by the event type) in which the
-    callback function can be called. The following table describes the values
-    of the parameters @a depth, @a event, and @a parsed.
-
-    parameter @a event | description | parameter @a depth | parameter @a parsed
-    ------------------ | ----------- | ------------------ | -------------------
-    parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
-    parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
-    parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
-    parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
-    parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
-    parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
-
-    @image html callback_events.png "Example when certain parse events are triggered"
-
-    Discarding a value (i.e., returning `false`) has different effects
-    depending on the context in which function was called:
-
-    - Discarded values in structured types are skipped. That is, the parser
-      will behave as if the discarded value was never read.
-    - In case a value outside a structured type is skipped, it is replaced
-      with `null`. This case happens if the top-level element is skipped.
-
-    @param[in] depth  the depth of the recursion during parsing
-
-    @param[in] event  an event of type parse_event_t indicating the context in
-    the callback function has been called
-
-    @param[in,out] parsed  the current intermediate parse result; note that
-    writing to this value has no effect for parse_event_t::key events
-
-    @return Whether the JSON value which called the function during parsing
-    should be kept (`true`) or not (`false`). In the latter case, it is either
-    skipped completely or replaced by an empty discarded object.
-
-    @sa @ref parse for examples
-
-    @since version 1.0.0
-    */
-    using parser_callback_t = typename parser::parser_callback_t;
-
-    //////////////////
-    // constructors //
-    //////////////////
-
-    /// @name constructors and destructors
-    /// Constructors of class @ref basic_json, copy/move constructor, copy
-    /// assignment, static functions creating objects, and the destructor.
-    /// @{
-
-    /*!
-    @brief create an empty value with a given type
-
-    Create an empty JSON value with a given type. The value will be default
-    initialized with an empty value which depends on the type:
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    object      | `{}`
-    array       | `[]`
-
-    @param[in] v  the type of the value to create
-
-    @complexity Constant.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows the constructor for different @ref
-    value_t values,basic_json__value_t}
-
-    @sa @ref clear() -- restores the postcondition of this constructor
-
-    @since version 1.0.0
-    */
-    basic_json(const value_t v)
-        : m_type(v), m_value(v)
-    {
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a null object
-
-    Create a `null` JSON value. It either takes a null pointer as parameter
-    (explicitly creating `null`) or no parameter (implicitly creating `null`).
-    The passed null pointer itself is not read -- it is only used to choose
-    the right constructor.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this constructor never throws
-    exceptions.
-
-    @liveexample{The following code shows the constructor with and without a
-    null pointer parameter.,basic_json__nullptr_t}
-
-    @since version 1.0.0
-    */
-    basic_json(std::nullptr_t = nullptr) noexcept
-        : basic_json(value_t::null)
-    {
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a JSON value
-
-    This is a "catch all" constructor for all compatible JSON types; that is,
-    types for which a `to_json()` method exists. The constructor forwards the
-    parameter @a val to that method (to `json_serializer<U>::to_json` method
-    with `U = uncvref_t<CompatibleType>`, to be exact).
-
-    Template type @a CompatibleType includes, but is not limited to, the
-    following types:
-    - **arrays**: @ref array_t and all kinds of compatible containers such as
-      `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
-      `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
-      `std::multiset`, and `std::unordered_multiset` with a `value_type` from
-      which a @ref basic_json value can be constructed.
-    - **objects**: @ref object_t and all kinds of compatible associative
-      containers such as `std::map`, `std::unordered_map`, `std::multimap`,
-      and `std::unordered_multimap` with a `key_type` compatible to
-      @ref string_t and a `value_type` from which a @ref basic_json value can
-      be constructed.
-    - **strings**: @ref string_t, string literals, and all compatible string
-      containers can be used.
-    - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
-      @ref number_float_t, and all convertible number types such as `int`,
-      `size_t`, `int64_t`, `float` or `double` can be used.
-    - **boolean**: @ref boolean_t / `bool` can be used.
-
-    See the examples below.
-
-    @tparam CompatibleType a type such that:
-    - @a CompatibleType is not derived from `std::istream`,
-    - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
-         constructors),
-    - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments)
-    - @a CompatibleType is not a @ref basic_json nested type (e.g.,
-         @ref json_pointer, @ref iterator, etc ...)
-    - @ref @ref json_serializer<U> has a
-         `to_json(basic_json_t&, CompatibleType&&)` method
-
-    @tparam U = `uncvref_t<CompatibleType>`
-
-    @param[in] val the value to be forwarded to the respective constructor
-
-    @complexity Usually linear in the size of the passed @a val, also
-                depending on the implementation of the called `to_json()`
-                method.
-
-    @exceptionsafety Depends on the called constructor. For types directly
-    supported by the library (i.e., all types for which no `to_json()` function
-    was provided), strong guarantee holds: if an exception is thrown, there are
-    no changes to any JSON value.
-
-    @liveexample{The following code shows the constructor with several
-    compatible types.,basic_json__CompatibleType}
-
-    @since version 2.1.0
-    */
-    template <typename CompatibleType,
-              typename U = detail::uncvref_t<CompatibleType>,
-              detail::enable_if_t<
-                  not detail::is_basic_json<U>::value and detail::is_compatible_type<basic_json_t, U>::value, int> = 0>
-    basic_json(CompatibleType && val) noexcept(noexcept(
-                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
-                                           std::forward<CompatibleType>(val))))
-    {
-        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a JSON value from an existing one
-
-    This is a constructor for existing @ref basic_json types.
-    It does not hijack copy/move constructors, since the parameter has different
-    template arguments than the current ones.
-
-    The constructor tries to convert the internal @ref m_value of the parameter.
-
-    @tparam BasicJsonType a type such that:
-    - @a BasicJsonType is a @ref basic_json type.
-    - @a BasicJsonType has different template arguments than @ref basic_json_t.
-
-    @param[in] val the @ref basic_json value to be converted.
-
-    @complexity Usually linear in the size of the passed @a val, also
-                depending on the implementation of the called `to_json()`
-                method.
-
-    @exceptionsafety Depends on the called constructor. For types directly
-    supported by the library (i.e., all types for which no `to_json()` function
-    was provided), strong guarantee holds: if an exception is thrown, there are
-    no changes to any JSON value.
-
-    @since version 3.2.0
-    */
-    template <typename BasicJsonType,
-              detail::enable_if_t<
-                  detail::is_basic_json<BasicJsonType>::value and not std::is_same<basic_json, BasicJsonType>::value, int> = 0>
-    basic_json(const BasicJsonType& val)
-    {
-        using other_boolean_t = typename BasicJsonType::boolean_t;
-        using other_number_float_t = typename BasicJsonType::number_float_t;
-        using other_number_integer_t = typename BasicJsonType::number_integer_t;
-        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
-        using other_string_t = typename BasicJsonType::string_t;
-        using other_object_t = typename BasicJsonType::object_t;
-        using other_array_t = typename BasicJsonType::array_t;
-
-        switch (val.type())
-        {
-            case value_t::boolean:
-                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
-                break;
-            case value_t::number_float:
-                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
-                break;
-            case value_t::number_integer:
-                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
-                break;
-            case value_t::number_unsigned:
-                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
-                break;
-            case value_t::string:
-                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
-                break;
-            case value_t::object:
-                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
-                break;
-            case value_t::array:
-                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
-                break;
-            case value_t::null:
-                *this = nullptr;
-                break;
-            case value_t::discarded:
-                m_type = value_t::discarded;
-                break;
-            default:            // LCOV_EXCL_LINE
-                assert(false);  // LCOV_EXCL_LINE
-        }
-        assert_invariant();
-    }
-
-    /*!
-    @brief create a container (array or object) from an initializer list
-
-    Creates a JSON value of type array or object from the passed initializer
-    list @a init. In case @a type_deduction is `true` (default), the type of
-    the JSON value to be created is deducted from the initializer list @a init
-    according to the following rules:
-
-    1. If the list is empty, an empty JSON object value `{}` is created.
-    2. If the list consists of pairs whose first element is a string, a JSON
-       object value is created where the first elements of the pairs are
-       treated as keys and the second elements are as values.
-    3. In all other cases, an array is created.
-
-    The rules aim to create the best fit between a C++ initializer list and
-    JSON values. The rationale is as follows:
-
-    1. The empty initializer list is written as `{}` which is exactly an empty
-       JSON object.
-    2. C++ has no way of describing mapped types other than to list a list of
-       pairs. As JSON requires that keys must be of type string, rule 2 is the
-       weakest constraint one can pose on initializer lists to interpret them
-       as an object.
-    3. In all other cases, the initializer list could not be interpreted as
-       JSON object type, so interpreting it as JSON array type is safe.
-
-    With the rules described above, the following JSON values cannot be
-    expressed by an initializer list:
-
-    - the empty array (`[]`): use @ref array(initializer_list_t)
-      with an empty initializer list in this case
-    - arrays whose elements satisfy rule 2: use @ref
-      array(initializer_list_t) with the same initializer list
-      in this case
-
-    @note When used without parentheses around an empty initializer list, @ref
-    basic_json() is called instead of this function, yielding the JSON null
-    value.
-
-    @param[in] init  initializer list with JSON values
-
-    @param[in] type_deduction internal parameter; when set to `true`, the type
-    of the JSON value is deducted from the initializer list @a init; when set
-    to `false`, the type provided via @a manual_type is forced. This mode is
-    used by the functions @ref array(initializer_list_t) and
-    @ref object(initializer_list_t).
-
-    @param[in] manual_type internal parameter; when @a type_deduction is set
-    to `false`, the created JSON value will use the provided type (only @ref
-    value_t::array and @ref value_t::object are valid); when @a type_deduction
-    is set to `true`, this parameter has no effect
-
-    @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
-    `value_t::object`, but @a init contains an element which is not a pair
-    whose first element is a string. In this case, the constructor could not
-    create an object. If @a type_deduction would have be `true`, an array
-    would have been created. See @ref object(initializer_list_t)
-    for an example.
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The example below shows how JSON values are created from
-    initializer lists.,basic_json__list_init_t}
-
-    @sa @ref array(initializer_list_t) -- create a JSON array
-    value from an initializer list
-    @sa @ref object(initializer_list_t) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
-    basic_json(initializer_list_t init,
-               bool type_deduction = true,
-               value_t manual_type = value_t::array)
-    {
-        // check if each element is an array with two elements whose first
-        // element is a string
-        bool is_an_object = std::all_of(init.begin(), init.end(),
-                                        [](const detail::json_ref<basic_json>& element_ref)
-        {
-            return element_ref->is_array() and element_ref->size() == 2 and (*element_ref)[0].is_string();
-        });
-
-        // adjust type if type deduction is not wanted
-        if (not type_deduction)
-        {
-            // if array is wanted, do not create an object though possible
-            if (manual_type == value_t::array)
-            {
-                is_an_object = false;
-            }
-
-            // if object is wanted but impossible, throw an exception
-            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object and not is_an_object))
-            {
-                JSON_THROW(type_error::create(301, "cannot create object from initializer list"));
-            }
-        }
-
-        if (is_an_object)
-        {
-            // the initializer list is a list of pairs -> create object
-            m_type = value_t::object;
-            m_value = value_t::object;
-
-            std::for_each(init.begin(), init.end(), [this](const detail::json_ref<basic_json>& element_ref)
-            {
-                auto element = element_ref.moved_or_copied();
-                m_value.object->emplace(
-                    std::move(*((*element.m_value.array)[0].m_value.string)),
-                    std::move((*element.m_value.array)[1]));
-            });
-        }
-        else
-        {
-            // the initializer list describes an array -> create array
-            m_type = value_t::array;
-            m_value.array = create<array_t>(init.begin(), init.end());
-        }
-
-        assert_invariant();
-    }
-
-    /*!
-    @brief explicitly create an array from an initializer list
-
-    Creates a JSON array value from a given initializer list. That is, given a
-    list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
-    initializer list is empty, the empty array `[]` is created.
-
-    @note This function is only needed to express two edge cases that cannot
-    be realized with the initializer list constructor (@ref
-    basic_json(initializer_list_t, bool, value_t)). These cases
-    are:
-    1. creating an array whose elements are all pairs whose first element is a
-    string -- in this case, the initializer list constructor would create an
-    object, taking the first elements as keys
-    2. creating an empty array -- passing the empty initializer list to the
-    initializer list constructor yields an empty object
-
-    @param[in] init  initializer list with JSON values to create an array from
-    (optional)
-
-    @return JSON array value
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows an example for the `array`
-    function.,array}
-
-    @sa @ref basic_json(initializer_list_t, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa @ref object(initializer_list_t) -- create a JSON object
-    value from an initializer list
-
-    @since version 1.0.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json array(initializer_list_t init = {})
-    {
-        return basic_json(init, false, value_t::array);
-    }
-
-    /*!
-    @brief explicitly create an object from an initializer list
-
-    Creates a JSON object value from a given initializer list. The initializer
-    lists elements must be pairs, and their first elements must be strings. If
-    the initializer list is empty, the empty object `{}` is created.
-
-    @note This function is only added for symmetry reasons. In contrast to the
-    related function @ref array(initializer_list_t), there are
-    no cases which can only be expressed by this function. That is, any
-    initializer list @a init can also be passed to the initializer list
-    constructor @ref basic_json(initializer_list_t, bool, value_t).
-
-    @param[in] init  initializer list to create an object from (optional)
-
-    @return JSON object value
-
-    @throw type_error.301 if @a init is not a list of pairs whose first
-    elements are strings. In this case, no object can be created. When such a
-    value is passed to @ref basic_json(initializer_list_t, bool, value_t),
-    an array would have been created from the passed initializer list @a init.
-    See example below.
-
-    @complexity Linear in the size of @a init.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows an example for the `object`
-    function.,object}
-
-    @sa @ref basic_json(initializer_list_t, bool, value_t) --
-    create a JSON value from an initializer list
-    @sa @ref array(initializer_list_t) -- create a JSON array
-    value from an initializer list
-
-    @since version 1.0.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json object(initializer_list_t init = {})
-    {
-        return basic_json(init, false, value_t::object);
-    }
-
-    /*!
-    @brief construct an array with count copies of given value
-
-    Constructs a JSON array value by creating @a cnt copies of a passed value.
-    In case @a cnt is `0`, an empty array is created.
-
-    @param[in] cnt  the number of JSON copies of @a val to create
-    @param[in] val  the JSON value to copy
-
-    @post `std::distance(begin(),end()) == cnt` holds.
-
-    @complexity Linear in @a cnt.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The following code shows examples for the @ref
-    basic_json(size_type\, const basic_json&)
-    constructor.,basic_json__size_type_basic_json}
-
-    @since version 1.0.0
-    */
-    basic_json(size_type cnt, const basic_json& val)
-        : m_type(value_t::array)
-    {
-        m_value.array = create<array_t>(cnt, val);
-        assert_invariant();
-    }
-
-    /*!
-    @brief construct a JSON container given an iterator range
-
-    Constructs the JSON value with the contents of the range `[first, last)`.
-    The semantics depends on the different types a JSON value can have:
-    - In case of a null type, invalid_iterator.206 is thrown.
-    - In case of other primitive types (number, boolean, or string), @a first
-      must be `begin()` and @a last must be `end()`. In this case, the value is
-      copied. Otherwise, invalid_iterator.204 is thrown.
-    - In case of structured types (array, object), the constructor behaves as
-      similar versions for `std::vector` or `std::map`; that is, a JSON array
-      or object is constructed from the values in the range.
-
-    @tparam InputIT an input iterator type (@ref iterator or @ref
-    const_iterator)
-
-    @param[in] first begin of the range to copy from (included)
-    @param[in] last end of the range to copy from (excluded)
-
-    @pre Iterators @a first and @a last must be initialized. **This
-         precondition is enforced with an assertion (see warning).** If
-         assertions are switched off, a violation of this precondition yields
-         undefined behavior.
-
-    @pre Range `[first, last)` is valid. Usually, this precondition cannot be
-         checked efficiently. Only certain edge cases are detected; see the
-         description of the exceptions below. A violation of this precondition
-         yields undefined behavior.
-
-    @warning A precondition is enforced with a runtime assertion that will
-             result in calling `std::abort` if this precondition is not met.
-             Assertions can be disabled by defining `NDEBUG` at compile time.
-             See https://en.cppreference.com/w/cpp/error/assert for more
-             information.
-
-    @throw invalid_iterator.201 if iterators @a first and @a last are not
-    compatible (i.e., do not belong to the same JSON value). In this case,
-    the range `[first, last)` is undefined.
-    @throw invalid_iterator.204 if iterators @a first and @a last belong to a
-    primitive type (number, boolean, or string), but @a first does not point
-    to the first element any more. In this case, the range `[first, last)` is
-    undefined. See example code below.
-    @throw invalid_iterator.206 if iterators @a first and @a last belong to a
-    null value. In this case, the range `[first, last)` is undefined.
-
-    @complexity Linear in distance between @a first and @a last.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @liveexample{The example below shows several ways to create JSON values by
-    specifying a subrange with iterators.,basic_json__InputIt_InputIt}
-
-    @since version 1.0.0
-    */
-    template<class InputIT, typename std::enable_if<
-                 std::is_same<InputIT, typename basic_json_t::iterator>::value or
-                 std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int>::type = 0>
-    basic_json(InputIT first, InputIT last)
-    {
-        assert(first.m_object != nullptr);
-        assert(last.m_object != nullptr);
-
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible"));
-        }
-
-        // copy type from first iterator
-        m_type = first.m_object->m_type;
-
-        // check if iterator range is complete for primitive values
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            {
-                if (JSON_HEDLEY_UNLIKELY(not first.m_it.primitive_iterator.is_begin()
-                                         or not last.m_it.primitive_iterator.is_end()))
-                {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
-                }
-                break;
-            }
-
-            default:
-                break;
-        }
-
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = first.m_object->m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = first.m_object->m_value.number_float;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = first.m_object->m_value.boolean;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *first.m_object->m_value.string;
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object = create<object_t>(first.m_it.object_iterator,
-                                                  last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array = create<array_t>(first.m_it.array_iterator,
-                                                last.m_it.array_iterator);
-                break;
-            }
-
-            default:
-                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " +
-                                                    std::string(first.m_object->type_name())));
-        }
-
-        assert_invariant();
-    }
-
-
-    ///////////////////////////////////////
-    // other constructors and destructor //
-    ///////////////////////////////////////
-
-    /// @private
-    basic_json(const detail::json_ref<basic_json>& ref)
-        : basic_json(ref.moved_or_copied())
-    {}
-
-    /*!
-    @brief copy constructor
-
-    Creates a copy of a given JSON value.
-
-    @param[in] other  the JSON value to copy
-
-    @post `*this == other`
-
-    @complexity Linear in the size of @a other.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes to any JSON value.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-    - As postcondition, it holds: `other == basic_json(other)`.
-
-    @liveexample{The following code shows an example for the copy
-    constructor.,basic_json__basic_json}
-
-    @since version 1.0.0
-    */
-    basic_json(const basic_json& other)
-        : m_type(other.m_type)
-    {
-        // check of passed value is valid
-        other.assert_invariant();
-
-        switch (m_type)
-        {
-            case value_t::object:
-            {
-                m_value = *other.m_value.object;
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value = *other.m_value.array;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value = *other.m_value.string;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value = other.m_value.boolean;
-                break;
-            }
-
-            case value_t::number_integer:
-            {
-                m_value = other.m_value.number_integer;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value = other.m_value.number_unsigned;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value = other.m_value.number_float;
-                break;
-            }
-
-            default:
-                break;
-        }
-
-        assert_invariant();
-    }
-
-    /*!
-    @brief move constructor
-
-    Move constructor. Constructs a JSON value with the contents of the given
-    value @a other using move semantics. It "steals" the resources from @a
-    other and leaves it as JSON null value.
-
-    @param[in,out] other  value to move to this object
-
-    @post `*this` has the same value as @a other before the call.
-    @post @a other is a JSON null value.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this constructor never throws
-    exceptions.
-
-    @requirement This function helps `basic_json` satisfying the
-    [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible)
-    requirements.
-
-    @liveexample{The code below shows the move constructor explicitly called
-    via std::move.,basic_json__moveconstructor}
-
-    @since version 1.0.0
-    */
-    basic_json(basic_json&& other) noexcept
-        : m_type(std::move(other.m_type)),
-          m_value(std::move(other.m_value))
-    {
-        // check that passed value is valid
-        other.assert_invariant();
-
-        // invalidate payload
-        other.m_type = value_t::null;
-        other.m_value = {};
-
-        assert_invariant();
-    }
-
-    /*!
-    @brief copy assignment
-
-    Copy assignment operator. Copies a JSON value via the "copy and swap"
-    strategy: It is expressed in terms of the copy constructor, destructor,
-    and the `swap()` member function.
-
-    @param[in] other  value to copy from
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-
-    @liveexample{The code below shows and example for the copy assignment. It
-    creates a copy of value `a` which is then swapped with `b`. Finally\, the
-    copy of `a` (which is the null value after the swap) is
-    destroyed.,basic_json__copyassignment}
-
-    @since version 1.0.0
-    */
-    basic_json& operator=(basic_json other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value and
-        std::is_nothrow_move_assignable<value_t>::value and
-        std::is_nothrow_move_constructible<json_value>::value and
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        // check that passed value is valid
-        other.assert_invariant();
-
-        using std::swap;
-        swap(m_type, other.m_type);
-        swap(m_value, other.m_value);
-
-        assert_invariant();
-        return *this;
-    }
-
-    /*!
-    @brief destructor
-
-    Destroys the JSON value and frees all allocated memory.
-
-    @complexity Linear.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is linear.
-    - All stored elements are destroyed and all memory is freed.
-
-    @since version 1.0.0
-    */
-    ~basic_json() noexcept
-    {
-        assert_invariant();
-        m_value.destroy(m_type);
-    }
-
-    /// @}
-
-  public:
-    ///////////////////////
-    // object inspection //
-    ///////////////////////
-
-    /// @name object inspection
-    /// Functions to inspect the type of a JSON value.
-    /// @{
-
-    /*!
-    @brief serialization
-
-    Serialization function for JSON values. The function tries to mimic
-    Python's `json.dumps()` function, and currently supports its @a indent
-    and @a ensure_ascii parameters.
-
-    @param[in] indent If indent is nonnegative, then array elements and object
-    members will be pretty-printed with that indent level. An indent level of
-    `0` will only insert newlines. `-1` (the default) selects the most compact
-    representation.
-    @param[in] indent_char The character to use for indentation if @a indent is
-    greater than `0`. The default is ` ` (space).
-    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
-    in the output are escaped with `\uXXXX` sequences, and the result consists
-    of ASCII characters only.
-    @param[in] error_handler  how to react on decoding errors; there are three
-    possible values: `strict` (throws and exception in case a decoding error
-    occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD),
-    and `ignore` (ignore invalid UTF-8 sequences during serialization).
-
-    @return string containing the serialization of the JSON value
-
-    @throw type_error.316 if a string stored inside the JSON value is not
-                          UTF-8 encoded
-
-    @complexity Linear.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @liveexample{The following example shows the effect of different @a indent\,
-    @a indent_char\, and @a ensure_ascii parameters to the result of the
-    serialization.,dump}
-
-    @see https://docs.python.org/2/library/json.html#json.dump
-
-    @since version 1.0.0; indentation character @a indent_char, option
-           @a ensure_ascii and exceptions added in version 3.0.0; error
-           handlers added in version 3.4.0.
-    */
-    string_t dump(const int indent = -1,
-                  const char indent_char = ' ',
-                  const bool ensure_ascii = false,
-                  const error_handler_t error_handler = error_handler_t::strict) const
-    {
-        string_t result;
-        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
-
-        if (indent >= 0)
-        {
-            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
-        }
-        else
-        {
-            s.dump(*this, false, ensure_ascii, 0);
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief return the type of the JSON value (explicit)
-
-    Return the type of the JSON value as a value from the @ref value_t
-    enumeration.
-
-    @return the type of the JSON value
-            Value type                | return value
-            ------------------------- | -------------------------
-            null                      | value_t::null
-            boolean                   | value_t::boolean
-            string                    | value_t::string
-            number (integer)          | value_t::number_integer
-            number (unsigned integer) | value_t::number_unsigned
-            number (floating-point)   | value_t::number_float
-            object                    | value_t::object
-            array                     | value_t::array
-            discarded                 | value_t::discarded
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `type()` for all JSON
-    types.,type}
-
-    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
-    @sa @ref type_name() -- return the type as string
-
-    @since version 1.0.0
-    */
-    constexpr value_t type() const noexcept
-    {
-        return m_type;
-    }
-
-    /*!
-    @brief return whether type is primitive
-
-    This function returns true if and only if the JSON type is primitive
-    (string, number, boolean, or null).
-
-    @return `true` if type is primitive (string, number, boolean, or null),
-    `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_primitive()` for all JSON
-    types.,is_primitive}
-
-    @sa @ref is_structured() -- returns whether JSON value is structured
-    @sa @ref is_null() -- returns whether JSON value is `null`
-    @sa @ref is_string() -- returns whether JSON value is a string
-    @sa @ref is_boolean() -- returns whether JSON value is a boolean
-    @sa @ref is_number() -- returns whether JSON value is a number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_primitive() const noexcept
-    {
-        return is_null() or is_string() or is_boolean() or is_number();
-    }
-
-    /*!
-    @brief return whether type is structured
-
-    This function returns true if and only if the JSON type is structured
-    (array or object).
-
-    @return `true` if type is structured (array or object), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_structured()` for all JSON
-    types.,is_structured}
-
-    @sa @ref is_primitive() -- returns whether value is primitive
-    @sa @ref is_array() -- returns whether value is an array
-    @sa @ref is_object() -- returns whether value is an object
-
-    @since version 1.0.0
-    */
-    constexpr bool is_structured() const noexcept
-    {
-        return is_array() or is_object();
-    }
-
-    /*!
-    @brief return whether value is null
-
-    This function returns true if and only if the JSON value is null.
-
-    @return `true` if type is null, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_null()` for all JSON
-    types.,is_null}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_null() const noexcept
-    {
-        return m_type == value_t::null;
-    }
-
-    /*!
-    @brief return whether value is a boolean
-
-    This function returns true if and only if the JSON value is a boolean.
-
-    @return `true` if type is boolean, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_boolean()` for all JSON
-    types.,is_boolean}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_boolean() const noexcept
-    {
-        return m_type == value_t::boolean;
-    }
-
-    /*!
-    @brief return whether value is a number
-
-    This function returns true if and only if the JSON value is a number. This
-    includes both integer (signed and unsigned) and floating-point values.
-
-    @return `true` if type is number (regardless whether integer, unsigned
-    integer or floating-type), `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number()` for all JSON
-    types.,is_number}
-
-    @sa @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_number() const noexcept
-    {
-        return is_number_integer() or is_number_float();
-    }
-
-    /*!
-    @brief return whether value is an integer number
-
-    This function returns true if and only if the JSON value is a signed or
-    unsigned integer number. This excludes floating-point values.
-
-    @return `true` if type is an integer or unsigned integer number, `false`
-    otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_integer()` for all
-    JSON types.,is_number_integer}
-
-    @sa @ref is_number() -- check if value is a number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_number_integer() const noexcept
-    {
-        return m_type == value_t::number_integer or m_type == value_t::number_unsigned;
-    }
-
-    /*!
-    @brief return whether value is an unsigned integer number
-
-    This function returns true if and only if the JSON value is an unsigned
-    integer number. This excludes floating-point and signed integer values.
-
-    @return `true` if type is an unsigned integer number, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_unsigned()` for all
-    JSON types.,is_number_unsigned}
-
-    @sa @ref is_number() -- check if value is a number
-    @sa @ref is_number_integer() -- check if value is an integer or unsigned
-    integer number
-    @sa @ref is_number_float() -- check if value is a floating-point number
-
-    @since version 2.0.0
-    */
-    constexpr bool is_number_unsigned() const noexcept
-    {
-        return m_type == value_t::number_unsigned;
-    }
-
-    /*!
-    @brief return whether value is a floating-point number
-
-    This function returns true if and only if the JSON value is a
-    floating-point number. This excludes signed and unsigned integer values.
-
-    @return `true` if type is a floating-point number, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_number_float()` for all
-    JSON types.,is_number_float}
-
-    @sa @ref is_number() -- check if value is number
-    @sa @ref is_number_integer() -- check if value is an integer number
-    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
-    number
-
-    @since version 1.0.0
-    */
-    constexpr bool is_number_float() const noexcept
-    {
-        return m_type == value_t::number_float;
-    }
-
-    /*!
-    @brief return whether value is an object
-
-    This function returns true if and only if the JSON value is an object.
-
-    @return `true` if type is object, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_object()` for all JSON
-    types.,is_object}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_object() const noexcept
-    {
-        return m_type == value_t::object;
-    }
-
-    /*!
-    @brief return whether value is an array
-
-    This function returns true if and only if the JSON value is an array.
-
-    @return `true` if type is array, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_array()` for all JSON
-    types.,is_array}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_array() const noexcept
-    {
-        return m_type == value_t::array;
-    }
-
-    /*!
-    @brief return whether value is a string
-
-    This function returns true if and only if the JSON value is a string.
-
-    @return `true` if type is string, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_string()` for all JSON
-    types.,is_string}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_string() const noexcept
-    {
-        return m_type == value_t::string;
-    }
-
-    /*!
-    @brief return whether value is discarded
-
-    This function returns true if and only if the JSON value was discarded
-    during parsing with a callback function (see @ref parser_callback_t).
-
-    @note This function will always be `false` for JSON values after parsing.
-    That is, discarded values can only occur during parsing, but will be
-    removed when inside a structured value or replaced by null in other cases.
-
-    @return `true` if type is discarded, `false` otherwise.
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies `is_discarded()` for all JSON
-    types.,is_discarded}
-
-    @since version 1.0.0
-    */
-    constexpr bool is_discarded() const noexcept
-    {
-        return m_type == value_t::discarded;
-    }
-
-    /*!
-    @brief return the type of the JSON value (implicit)
-
-    Implicitly return the type of the JSON value as a value from the @ref
-    value_t enumeration.
-
-    @return the type of the JSON value
-
-    @complexity Constant.
-
-    @exceptionsafety No-throw guarantee: this member function never throws
-    exceptions.
-
-    @liveexample{The following code exemplifies the @ref value_t operator for
-    all JSON types.,operator__value_t}
-
-    @sa @ref type() -- return the type of the JSON value (explicit)
-    @sa @ref type_name() -- return the type as string
-
-    @since version 1.0.0
-    */
-    constexpr operator value_t() const noexcept
-    {
-        return m_type;
-    }
-
-    /// @}
-
-  private:
-    //////////////////
-    // value access //
-    //////////////////
-
-    /// get a boolean (explicit)
-    boolean_t get_impl(boolean_t* /*unused*/) const
-    {
-        if (JSON_HEDLEY_LIKELY(is_boolean()))
-        {
-            return m_value.boolean;
-        }
-
-        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name())));
-    }
-
-    /// get a pointer to the value (object)
-    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (object)
-    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
-    {
-        return is_object() ? m_value.object : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (array)
-    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
-    {
-        return is_array() ? m_value.array : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (string)
-    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
-    {
-        return is_string() ? m_value.string : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (boolean)
-    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
-    {
-        return is_boolean() ? &m_value.boolean : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (integer number)
-    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
-    {
-        return is_number_integer() ? &m_value.number_integer : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (unsigned number)
-    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
-    {
-        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /// get a pointer to the value (floating-point number)
-    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
-    {
-        return is_number_float() ? &m_value.number_float : nullptr;
-    }
-
-    /*!
-    @brief helper function to implement get_ref()
-
-    This function helps to implement get_ref() without code duplication for
-    const and non-const overloads
-
-    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
-
-    @throw type_error.303 if ReferenceType does not match underlying value
-    type of the current JSON
-    */
-    template<typename ReferenceType, typename ThisType>
-    static ReferenceType get_ref_impl(ThisType& obj)
-    {
-        // delegate the call to get_ptr<>()
-        auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
-
-        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
-        {
-            return *ptr;
-        }
-
-        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name())));
-    }
-
-  public:
-    /// @name value access
-    /// Direct access to the stored value of a JSON value.
-    /// @{
-
-    /*!
-    @brief get special-case overload
-
-    This overloads avoids a lot of template boilerplate, it can be seen as the
-    identity method
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this
-
-    @complexity Constant.
-
-    @since version 2.1.0
-    */
-    template<typename BasicJsonType, detail::enable_if_t<
-                 std::is_same<typename std::remove_const<BasicJsonType>::type, basic_json_t>::value,
-                 int> = 0>
-    basic_json get() const
-    {
-        return *this;
-    }
-
-    /*!
-    @brief get special-case overload
-
-    This overloads converts the current @ref basic_json in a different
-    @ref basic_json type
-
-    @tparam BasicJsonType == @ref basic_json
-
-    @return a copy of *this, converted into @tparam BasicJsonType
-
-    @complexity Depending on the implementation of the called `from_json()`
-                method.
-
-    @since version 3.2.0
-    */
-    template<typename BasicJsonType, detail::enable_if_t<
-                 not std::is_same<BasicJsonType, basic_json>::value and
-                 detail::is_basic_json<BasicJsonType>::value, int> = 0>
-    BasicJsonType get() const
-    {
-        return *this;
-    }
-
-    /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType ret;
-    JSONSerializer<ValueType>::from_json(*this, ret);
-    return ret;
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const basic_json&, ValueType&)`, and
-    - @ref json_serializer<ValueType> does not have a `from_json()` method of
-      the form `ValueType from_json(const basic_json&)`
-
-    @tparam ValueTypeCV the provided value type
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get__ValueType_const}
-
-    @since version 2.1.0
-    */
-    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
-             detail::enable_if_t <
-                 not detail::is_basic_json<ValueType>::value and
-                 detail::has_from_json<basic_json_t, ValueType>::value and
-                 not detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-                 int> = 0>
-    ValueType get() const noexcept(noexcept(
-                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
-    {
-        // we cannot static_assert on ValueTypeCV being non-const, because
-        // there is support for get<const basic_json_t>(), which is why we
-        // still need the uncvref
-        static_assert(not std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
-        static_assert(std::is_default_constructible<ValueType>::value,
-                      "types must be DefaultConstructible when used with get()");
-
-        ValueType ret;
-        JSONSerializer<ValueType>::from_json(*this, ret);
-        return ret;
-    }
-
-    /*!
-    @brief get a value (explicit); special case
-
-    Explicit type conversion between the JSON value and a compatible value
-    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
-    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
-    The value is converted by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    return JSONSerializer<ValueTypeCV>::from_json(*this);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json and
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `ValueType from_json(const basic_json&)`
-
-    @note If @ref json_serializer<ValueType> has both overloads of
-    `from_json()`, this one is chosen.
-
-    @tparam ValueTypeCV the provided value type
-    @tparam ValueType the returned value type
-
-    @return copy of the JSON value, converted to @a ValueType
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @since version 2.1.0
-    */
-    template<typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
-             detail::enable_if_t<not std::is_same<basic_json_t, ValueType>::value and
-                                 detail::has_non_default_from_json<basic_json_t, ValueType>::value,
-                                 int> = 0>
-    ValueType get() const noexcept(noexcept(
-                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
-    {
-        static_assert(not std::is_reference<ValueTypeCV>::value,
-                      "get() cannot be used with reference types, you might want to use get_ref()");
-        return JSONSerializer<ValueType>::from_json(*this);
-    }
-
-    /*!
-    @brief get a value (explicit)
-
-    Explicit type conversion between the JSON value and a compatible value.
-    The value is filled into the input parameter by calling the @ref json_serializer<ValueType>
-    `from_json()` method.
-
-    The function is equivalent to executing
-    @code {.cpp}
-    ValueType v;
-    JSONSerializer<ValueType>::from_json(*this, v);
-    @endcode
-
-    This overloads is chosen if:
-    - @a ValueType is not @ref basic_json,
-    - @ref json_serializer<ValueType> has a `from_json()` method of the form
-      `void from_json(const basic_json&, ValueType&)`, and
-
-    @tparam ValueType the input parameter type.
-
-    @return the input parameter, allowing chaining calls.
-
-    @throw what @ref json_serializer<ValueType> `from_json()` method throws
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,get_to}
-
-    @since version 3.3.0
-    */
-    template<typename ValueType,
-             detail::enable_if_t <
-                 not detail::is_basic_json<ValueType>::value and
-                 detail::has_from_json<basic_json_t, ValueType>::value,
-                 int> = 0>
-    ValueType & get_to(ValueType& v) const noexcept(noexcept(
-                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
-    {
-        JSONSerializer<ValueType>::from_json(*this, v);
-        return v;
-    }
-
-    template <
-        typename T, std::size_t N,
-        typename Array = T (&)[N],
-        detail::enable_if_t <
-            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
-    Array get_to(T (&v)[N]) const
-    noexcept(noexcept(JSONSerializer<Array>::from_json(
-                          std::declval<const basic_json_t&>(), v)))
-    {
-        JSONSerializer<Array>::from_json(*this, v);
-        return v;
-    }
-
-
-    /*!
-    @brief get a pointer value (implicit)
-
-    Implicit pointer access to the internally stored JSON value. No copies are
-    made.
-
-    @warning Writing data to the pointee of the result yields an undefined
-    state.
-
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
-    assertion.
-
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get_ptr}
-
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>()
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-    /*!
-    @brief get a pointer value (implicit)
-    @copydoc get_ptr()
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value and
-                 std::is_const<typename std::remove_pointer<PointerType>::type>::value, int>::type = 0>
-    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
-    {
-        // delegate the call to get_impl_ptr<>() const
-        return get_impl_ptr(static_cast<PointerType>(nullptr));
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-
-    Explicit pointer access to the internally stored JSON value. No copies are
-    made.
-
-    @warning The pointer becomes invalid if the underlying JSON object
-    changes.
-
-    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
-    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
-    @ref number_unsigned_t, or @ref number_float_t.
-
-    @return pointer to the internally stored JSON value if the requested
-    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how pointers to internal values of a
-    JSON value can be requested. Note that no type conversions are made and a
-    `nullptr` is returned if the value and the requested pointer type does not
-    match.,get__PointerType}
-
-    @sa @ref get_ptr() for explicit pointer-member access
-
-    @since version 1.0.0
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-    /*!
-    @brief get a pointer value (explicit)
-    @copydoc get()
-    */
-    template<typename PointerType, typename std::enable_if<
-                 std::is_pointer<PointerType>::value, int>::type = 0>
-    constexpr auto get() const noexcept -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
-    {
-        // delegate the call to get_ptr
-        return get_ptr<PointerType>();
-    }
-
-    /*!
-    @brief get a reference value (implicit)
-
-    Implicit reference access to the internally stored JSON value. No copies
-    are made.
-
-    @warning Writing data to the referee of the result yields an undefined
-    state.
-
-    @tparam ReferenceType reference type; must be a reference to @ref array_t,
-    @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
-    @ref number_float_t. Enforced by static assertion.
-
-    @return reference to the internally stored JSON value if the requested
-    reference type @a ReferenceType fits to the JSON value; throws
-    type_error.303 otherwise
-
-    @throw type_error.303 in case passed type @a ReferenceType is incompatible
-    with the stored JSON value; see example below
-
-    @complexity Constant.
-
-    @liveexample{The example shows several calls to `get_ref()`.,get_ref}
-
-    @since version 1.1.0
-    */
-    template<typename ReferenceType, typename std::enable_if<
-                 std::is_reference<ReferenceType>::value, int>::type = 0>
-    ReferenceType get_ref()
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /*!
-    @brief get a reference value (implicit)
-    @copydoc get_ref()
-    */
-    template<typename ReferenceType, typename std::enable_if<
-                 std::is_reference<ReferenceType>::value and
-                 std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int>::type = 0>
-    ReferenceType get_ref() const
-    {
-        // delegate call to get_ref_impl
-        return get_ref_impl<ReferenceType>(*this);
-    }
-
-    /*!
-    @brief get a value (implicit)
-
-    Implicit type conversion between the JSON value and a compatible value.
-    The call is realized by calling @ref get() const.
-
-    @tparam ValueType non-pointer type compatible to the JSON value, for
-    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
-    `std::vector` types for JSON arrays. The character type of @ref string_t
-    as well as an initializer list of this type is excluded to avoid
-    ambiguities as these types implicitly convert to `std::string`.
-
-    @return copy of the JSON value, converted to type @a ValueType
-
-    @throw type_error.302 in case passed type @a ValueType is incompatible
-    to the JSON value type (e.g., the JSON value is of type boolean, but a
-    string is requested); see example below
-
-    @complexity Linear in the size of the JSON value.
-
-    @liveexample{The example below shows several conversions from JSON values
-    to other types. There a few things to note: (1) Floating-point numbers can
-    be converted to integers\, (2) A JSON array can be converted to a standard
-    `std::vector<short>`\, (3) A JSON object can be converted to C++
-    associative containers such as `std::unordered_map<std::string\,
-    json>`.,operator__ValueType}
-
-    @since version 1.0.0
-    */
-    template < typename ValueType, typename std::enable_if <
-                   not std::is_pointer<ValueType>::value and
-                   not std::is_same<ValueType, detail::json_ref<basic_json>>::value and
-                   not std::is_same<ValueType, typename string_t::value_type>::value and
-                   not detail::is_basic_json<ValueType>::value
-
-#ifndef _MSC_VER  // fix for issue #167 operator<< ambiguity under VS2015
-                   and not std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
-#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) and _MSC_VER <= 1914))
-                   and not std::is_same<ValueType, typename std::string_view>::value
-#endif
-#endif
-                   and detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
-                   , int >::type = 0 >
-    operator ValueType() const
-    {
-        // delegate the call to get<>() const
-        return get<ValueType>();
-    }
-
-    /// @}
-
-
-    ////////////////////
-    // element access //
-    ////////////////////
-
-    /// @name element access
-    /// Access to the JSON value.
-    /// @{
-
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a reference to the element at specified location @a idx, with
-    bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw type_error.304 if the JSON value is not an array; in this case,
-    calling `at` with an index makes no sense. See example below.
-    @throw out_of_range.401 if the index @a idx is out of range of the array;
-    that is, `idx >= size()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how array elements can be read and
-    written using `at()`. It also demonstrates the different exceptions that
-    can be thrown.,at__size_type}
-    */
-    reference at(size_type idx)
-    {
-        // at only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            JSON_TRY
-            {
-                return m_value.array->at(idx);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
-        }
-    }
-
-    /*!
-    @brief access specified array element with bounds checking
-
-    Returns a const reference to the element at specified location @a idx,
-    with bounds checking.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw type_error.304 if the JSON value is not an array; in this case,
-    calling `at` with an index makes no sense. See example below.
-    @throw out_of_range.401 if the index @a idx is out of range of the array;
-    that is, `idx >= size()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how array elements can be read using
-    `at()`. It also demonstrates the different exceptions that can be thrown.,
-    at__size_type_const}
-    */
-    const_reference at(size_type idx) const
-    {
-        // at only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            JSON_TRY
-            {
-                return m_value.array->at(idx);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
-        }
-    }
-
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a reference to the element at with specified key @a key, with
-    bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.304 if the JSON value is not an object; in this case,
-    calling `at` with a key makes no sense. See example below.
-    @throw out_of_range.403 if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Logarithmic in the size of the container.
-
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how object elements can be read and
-    written using `at()`. It also demonstrates the different exceptions that
-    can be thrown.,at__object_t_key_type}
-    */
-    reference at(const typename object_t::key_type& key)
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_TRY
-            {
-                return m_value.object->at(key);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
-        }
-    }
-
-    /*!
-    @brief access specified object element with bounds checking
-
-    Returns a const reference to the element at with specified key @a key,
-    with bounds checking.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @throw type_error.304 if the JSON value is not an object; in this case,
-    calling `at` with a key makes no sense. See example below.
-    @throw out_of_range.403 if the key @a key is is not stored in the object;
-    that is, `find(key) == end()`. See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Logarithmic in the size of the container.
-
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-
-    @liveexample{The example below shows how object elements can be read using
-    `at()`. It also demonstrates the different exceptions that can be thrown.,
-    at__object_t_key_type_const}
-    */
-    const_reference at(const typename object_t::key_type& key) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            JSON_TRY
-            {
-                return m_value.object->at(key);
-            }
-            JSON_CATCH (std::out_of_range&)
-            {
-                // create better exception explanation
-                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
-            }
-        }
-        else
-        {
-            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
-        }
-    }
-
-    /*!
-    @brief access specified array element
-
-    Returns a reference to the element at specified location @a idx.
-
-    @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
-    then the array is silently filled up with `null` values to make `idx` a
-    valid reference to the last stored element.
-
-    @param[in] idx  index of the element to access
-
-    @return reference to the element at index @a idx
-
-    @throw type_error.305 if the JSON value is not an array or null; in that
-    cases, using the [] operator with an index makes no sense.
-
-    @complexity Constant if @a idx is in the range of the array. Otherwise
-    linear in `idx - size()`.
-
-    @liveexample{The example below shows how array elements can be read and
-    written using `[]` operator. Note the addition of `null`
-    values.,operatorarray__size_type}
-
-    @since version 1.0.0
-    */
-    reference operator[](size_type idx)
-    {
-        // implicitly convert null value to an empty array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value.array = create<array_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // fill up array with null values if given idx is outside range
-            if (idx >= m_value.array->size())
-            {
-                m_value.array->insert(m_value.array->end(),
-                                      idx - m_value.array->size() + 1,
-                                      basic_json());
-            }
-
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief access specified array element
-
-    Returns a const reference to the element at specified location @a idx.
-
-    @param[in] idx  index of the element to access
-
-    @return const reference to the element at index @a idx
-
-    @throw type_error.305 if the JSON value is not an array; in that case,
-    using the [] operator with an index makes no sense.
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how array elements can be read using
-    the `[]` operator.,operatorarray__size_type_const}
-
-    @since version 1.0.0
-    */
-    const_reference operator[](size_type idx) const
-    {
-        // const operator[] only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            return m_value.array->operator[](idx);
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.305 if the JSON value is not an object or null; in that
-    cases, using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    reference operator[](const typename object_t::key_type& key)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        // operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            return m_value.object->operator[](key);
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw type_error.305 if the JSON value is not an object; in that case,
-    using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.0.0
-    */
-    const_reference operator[](const typename object_t::key_type& key) const
-    {
-        // const operator[] only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            assert(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief access specified object element
-
-    Returns a reference to the element at with specified key @a key.
-
-    @note If @a key is not found in the object, then it is silently added to
-    the object and filled with a `null` value to make `key` a valid reference.
-    In case the value was `null` before, it is converted to an object.
-
-    @param[in] key  key of the element to access
-
-    @return reference to the element at key @a key
-
-    @throw type_error.305 if the JSON value is not an object or null; in that
-    cases, using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read and
-    written using the `[]` operator.,operatorarray__key_type}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
-    template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
-    reference operator[](T* key)
-    {
-        // implicitly convert null to object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            return m_value.object->operator[](key);
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief read-only access specified object element
-
-    Returns a const reference to the element at with specified key @a key. No
-    bounds checking is performed.
-
-    @warning If the element with key @a key does not exist, the behavior is
-    undefined.
-
-    @param[in] key  key of the element to access
-
-    @return const reference to the element at key @a key
-
-    @pre The element with key @a key must exist. **This precondition is
-         enforced with an assertion.**
-
-    @throw type_error.305 if the JSON value is not an object; in that case,
-    using the [] operator with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be read using
-    the `[]` operator.,operatorarray__key_type_const}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref value() for access by value with a default value
-
-    @since version 1.1.0
-    */
-    template<typename T>
-    JSON_HEDLEY_NON_NULL(2)
-    const_reference operator[](T* key) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            assert(m_value.object->find(key) != m_value.object->end());
-            return m_value.object->find(key)->second;
-        }
-
-        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief access specified object element with default value
-
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
-
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(key);
-    } catch(out_of_range) {
-        return default_value;
-    }
-    @endcode
-
-    @note Unlike @ref at(const typename object_t::key_type&), this function
-    does not throw if the given key @a key was not found.
-
-    @note Unlike @ref operator[](const typename object_t::key_type& key), this
-    function does not implicitly add an element to the position defined by @a
-    key. This function is furthermore also applicable to const objects.
-
-    @param[in] key  key of the element to access
-    @param[in] default_value  the value to return if @a key is not found
-
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
-
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
-
-    @throw type_error.302 if @a default_value does not match the type of the
-    value at @a key
-    @throw type_error.306 if the JSON value is not an object; in that case,
-    using `value()` with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value}
-
-    @sa @ref at(const typename object_t::key_type&) for access by reference
-    with range checking
-    @sa @ref operator[](const typename object_t::key_type&) for unchecked
-    access by reference
-
-    @since version 1.0.0
-    */
-    template<class ValueType, typename std::enable_if<
-                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
-    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if key is found, return value and given default value otherwise
-            const auto it = find(key);
-            if (it != end())
-            {
-                return *it;
-            }
-
-            return default_value;
-        }
-
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
-    */
-    string_t value(const typename object_t::key_type& key, const char* default_value) const
-    {
-        return value(key, string_t(default_value));
-    }
-
-    /*!
-    @brief access specified object element via JSON Pointer with default value
-
-    Returns either a copy of an object's element at the specified key @a key
-    or a given default value if no element with key @a key exists.
-
-    The function is basically equivalent to executing
-    @code {.cpp}
-    try {
-        return at(ptr);
-    } catch(out_of_range) {
-        return default_value;
-    }
-    @endcode
-
-    @note Unlike @ref at(const json_pointer&), this function does not throw
-    if the given key @a key was not found.
-
-    @param[in] ptr  a JSON pointer to the element to access
-    @param[in] default_value  the value to return if @a ptr found no value
-
-    @tparam ValueType type compatible to JSON values, for instance `int` for
-    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
-    JSON arrays. Note the type of the expected value at @a key and the default
-    value @a default_value must be compatible.
-
-    @return copy of the element at key @a key or @a default_value if @a key
-    is not found
-
-    @throw type_error.302 if @a default_value does not match the type of the
-    value at @a ptr
-    @throw type_error.306 if the JSON value is not an object; in that case,
-    using `value()` with a key makes no sense.
-
-    @complexity Logarithmic in the size of the container.
-
-    @liveexample{The example below shows how object elements can be queried
-    with a default value.,basic_json__value_ptr}
-
-    @sa @ref operator[](const json_pointer&) for unchecked access by reference
-
-    @since version 2.0.2
-    */
-    template<class ValueType, typename std::enable_if<
-                 std::is_convertible<basic_json_t, ValueType>::value, int>::type = 0>
-    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
-    {
-        // at only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            // if pointer resolves a value, return it or use default value
-            JSON_TRY
-            {
-                return ptr.get_checked(this);
-            }
-            JSON_INTERNAL_CATCH (out_of_range&)
-            {
-                return default_value;
-            }
-        }
-
-        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief overload for a default value of type const char*
-    @copydoc basic_json::value(const json_pointer&, ValueType) const
-    */
-    JSON_HEDLEY_NON_NULL(3)
-    string_t value(const json_pointer& ptr, const char* default_value) const
-    {
-        return value(ptr, string_t(default_value));
-    }
-
-    /*!
-    @brief access the first element
-
-    Returns a reference to the first element in the container. For a JSON
-    container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
-
-    @return In case of a structured type (array or object), a reference to the
-    first element is returned. In case of number, string, or boolean values, a
-    reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
-
-    @throw invalid_iterator.214 when called on `null` value
-
-    @liveexample{The following code shows an example for `front()`.,front}
-
-    @sa @ref back() -- access the last element
-
-    @since version 1.0.0
-    */
-    reference front()
-    {
-        return *begin();
-    }
-
-    /*!
-    @copydoc basic_json::front()
-    */
-    const_reference front() const
-    {
-        return *cbegin();
-    }
-
-    /*!
-    @brief access the last element
-
-    Returns a reference to the last element in the container. For a JSON
-    container `c`, the expression `c.back()` is equivalent to
-    @code {.cpp}
-    auto tmp = c.end();
-    --tmp;
-    return *tmp;
-    @endcode
-
-    @return In case of a structured type (array or object), a reference to the
-    last element is returned. In case of number, string, or boolean values, a
-    reference to the value is returned.
-
-    @complexity Constant.
-
-    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
-    or an empty array or object (undefined behavior, **guarded by
-    assertions**).
-    @post The JSON value remains unchanged.
-
-    @throw invalid_iterator.214 when called on a `null` value. See example
-    below.
-
-    @liveexample{The following code shows an example for `back()`.,back}
-
-    @sa @ref front() -- access the first element
-
-    @since version 1.0.0
-    */
-    reference back()
-    {
-        auto tmp = end();
-        --tmp;
-        return *tmp;
-    }
-
-    /*!
-    @copydoc basic_json::back()
-    */
-    const_reference back() const
-    {
-        auto tmp = cend();
-        --tmp;
-        return *tmp;
-    }
-
-    /*!
-    @brief remove element given an iterator
-
-    Removes the element specified by iterator @a pos. The iterator @a pos must
-    be valid and dereferenceable. Thus the `end()` iterator (which is valid,
-    but is not dereferenceable) cannot be used as a value for @a pos.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] pos iterator to the element to remove
-    @return Iterator following the last removed element. If the iterator @a
-    pos refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw type_error.307 if called on a `null` value; example: `"cannot use
-    erase() with null"`
-    @throw invalid_iterator.202 if called on an iterator which does not belong
-    to the current JSON value; example: `"iterator does not fit current
-    value"`
-    @throw invalid_iterator.205 if called on a primitive type with invalid
-    iterator (i.e., any iterator which is not `begin()`); example: `"iterator
-    out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: amortized constant
-    - arrays: linear in distance between @a pos and the end of the container
-    - strings: linear in the length of the string
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType}
-
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template<class IteratorType, typename std::enable_if<
-                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
-                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
-             = 0>
-    IteratorType erase(IteratorType pos)
-    {
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            {
-                if (JSON_HEDLEY_UNLIKELY(not pos.m_it.primitive_iterator.is_begin()))
-                {
-                    JSON_THROW(invalid_iterator::create(205, "iterator out of range"));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
-                break;
-            }
-
-            default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief remove elements given an iterator range
-
-    Removes the element specified by the range `[first; last)`. The iterator
-    @a first does not need to be dereferenceable if `first == last`: erasing
-    an empty range is a no-op.
-
-    If called on a primitive type other than `null`, the resulting JSON value
-    will be `null`.
-
-    @param[in] first iterator to the beginning of the range to remove
-    @param[in] last iterator past the end of the range to remove
-    @return Iterator following the last removed element. If the iterator @a
-    second refers to the last element, the `end()` iterator is returned.
-
-    @tparam IteratorType an @ref iterator or @ref const_iterator
-
-    @post Invalidates iterators and references at or after the point of the
-    erase, including the `end()` iterator.
-
-    @throw type_error.307 if called on a `null` value; example: `"cannot use
-    erase() with null"`
-    @throw invalid_iterator.203 if called on iterators which does not belong
-    to the current JSON value; example: `"iterators do not fit current value"`
-    @throw invalid_iterator.204 if called on a primitive type with invalid
-    iterators (i.e., if `first != begin()` and `last != end()`); example:
-    `"iterators out of range"`
-
-    @complexity The complexity depends on the type:
-    - objects: `log(size()) + std::distance(first, last)`
-    - arrays: linear in the distance between @a first and @a last, plus linear
-      in the distance between @a last and end of the container
-    - strings: linear in the length of the string
-    - other types: constant
-
-    @liveexample{The example shows the result of `erase()` for different JSON
-    types.,erase__IteratorType_IteratorType}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    template<class IteratorType, typename std::enable_if<
-                 std::is_same<IteratorType, typename basic_json_t::iterator>::value or
-                 std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int>::type
-             = 0>
-    IteratorType erase(IteratorType first, IteratorType last)
-    {
-        // make sure iterator fits the current value
-        if (JSON_HEDLEY_UNLIKELY(this != first.m_object or this != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value"));
-        }
-
-        IteratorType result = end();
-
-        switch (m_type)
-        {
-            case value_t::boolean:
-            case value_t::number_float:
-            case value_t::number_integer:
-            case value_t::number_unsigned:
-            case value_t::string:
-            {
-                if (JSON_HEDLEY_LIKELY(not first.m_it.primitive_iterator.is_begin()
-                                       or not last.m_it.primitive_iterator.is_end()))
-                {
-                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
-                }
-
-                if (is_string())
-                {
-                    AllocatorType<string_t> alloc;
-                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
-                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
-                    m_value.string = nullptr;
-                }
-
-                m_type = value_t::null;
-                assert_invariant();
-                break;
-            }
-
-            case value_t::object:
-            {
-                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
-                                              last.m_it.object_iterator);
-                break;
-            }
-
-            case value_t::array:
-            {
-                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
-                                             last.m_it.array_iterator);
-                break;
-            }
-
-            default:
-                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief remove element from a JSON object given a key
-
-    Removes elements from a JSON object with the key value @a key.
-
-    @param[in] key value of the elements to remove
-
-    @return Number of elements removed. If @a ObjectType is the default
-    `std::map` type, the return value will always be `0` (@a key was not
-    found) or `1` (@a key was found).
-
-    @post References and iterators to the erased elements are invalidated.
-    Other references and iterators are not affected.
-
-    @throw type_error.307 when called on a type other than JSON object;
-    example: `"cannot use erase() with null"`
-
-    @complexity `log(size()) + count(key)`
-
-    @liveexample{The example shows the effect of `erase()`.,erase__key_type}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const size_type) -- removes the element from an array at
-    the given index
-
-    @since version 1.0.0
-    */
-    size_type erase(const typename object_t::key_type& key)
-    {
-        // this erase only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            return m_value.object->erase(key);
-        }
-
-        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief remove element from a JSON array given an index
-
-    Removes element from a JSON array at the index @a idx.
-
-    @param[in] idx index of the element to remove
-
-    @throw type_error.307 when called on a type other than JSON object;
-    example: `"cannot use erase() with null"`
-    @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
-    is out of range"`
-
-    @complexity Linear in distance between @a idx and the end of the container.
-
-    @liveexample{The example shows the effect of `erase()`.,erase__size_type}
-
-    @sa @ref erase(IteratorType) -- removes the element at a given position
-    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
-    the given range
-    @sa @ref erase(const typename object_t::key_type&) -- removes the element
-    from an object at the given key
-
-    @since version 1.0.0
-    */
-    void erase(const size_type idx)
-    {
-        // this erase only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
-            {
-                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
-            }
-
-            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
-        }
-        else
-        {
-            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
-        }
-    }
-
-    /// @}
-
-
-    ////////////
-    // lookup //
-    ////////////
-
-    /// @name lookup
-    /// @{
-
-    /*!
-    @brief find an element in a JSON object
-
-    Finds an element in a JSON object with key equivalent to @a key. If the
-    element is not found or the JSON value is not an object, end() is
-    returned.
-
-    @note This method always returns @ref end() when executed on a JSON type
-          that is not an object.
-
-    @param[in] key key value of the element to search for.
-
-    @return Iterator to an element with key equivalent to @a key. If no such
-    element is found or the JSON value is not an object, past-the-end (see
-    @ref end()) iterator is returned.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The example shows how `find()` is used.,find__key_type}
-
-    @sa @ref contains(KeyT&&) const -- checks whether a key exists
-
-    @since version 1.0.0
-    */
-    template<typename KeyT>
-    iterator find(KeyT&& key)
-    {
-        auto result = end();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief find an element in a JSON object
-    @copydoc find(KeyT&&)
-    */
-    template<typename KeyT>
-    const_iterator find(KeyT&& key) const
-    {
-        auto result = cend();
-
-        if (is_object())
-        {
-            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief returns the number of occurrences of a key in a JSON object
-
-    Returns the number of elements with key @a key. If ObjectType is the
-    default `std::map` type, the return value will always be `0` (@a key was
-    not found) or `1` (@a key was found).
-
-    @note This method always returns `0` when executed on a JSON type that is
-          not an object.
-
-    @param[in] key key value of the element to count
-
-    @return Number of elements with key @a key. If the JSON value is not an
-    object, the return value will be `0`.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The example shows how `count()` is used.,count}
-
-    @since version 1.0.0
-    */
-    template<typename KeyT>
-    size_type count(KeyT&& key) const
-    {
-        // return 0 for all nonobject types
-        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
-    }
-
-    /*!
-    @brief check the existence of an element in a JSON object
-
-    Check whether an element exists in a JSON object with key equivalent to
-    @a key. If the element is not found or the JSON value is not an object,
-    false is returned.
-
-    @note This method always returns false when executed on a JSON type
-          that is not an object.
-
-    @param[in] key key value to check its existence.
-
-    @return true if an element with specified @a key exists. If no such
-    element with such key is found or the JSON value is not an object,
-    false is returned.
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The following code shows an example for `contains()`.,contains}
-
-    @sa @ref find(KeyT&&) -- returns an iterator to an object element
-    @sa @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer
-
-    @since version 3.6.0
-    */
-    template<typename KeyT, typename std::enable_if<
-                 not std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int>::type = 0>
-    bool contains(KeyT && key) const
-    {
-        return is_object() and m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
-    }
-
-    /*!
-    @brief check the existence of an element in a JSON object given a JSON pointer
-
-    Check whether the given JSON pointer @a ptr can be resolved in the current
-    JSON value.
-
-    @note This method can be executed on any JSON value type.
-
-    @param[in] ptr JSON pointer to check its existence.
-
-    @return true if the JSON pointer can be resolved to a stored value, false
-    otherwise.
-
-    @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-
-    @complexity Logarithmic in the size of the JSON object.
-
-    @liveexample{The following code shows an example for `contains()`.,contains_json_pointer}
-
-    @sa @ref contains(KeyT &&) const -- checks the existence of a key
-
-    @since version 3.7.0
-    */
-    bool contains(const json_pointer& ptr) const
-    {
-        return ptr.contains(this);
-    }
-
-    /// @}
-
-
-    ///////////////
-    // iterators //
-    ///////////////
-
-    /// @name iterators
-    /// @{
-
-    /*!
-    @brief returns an iterator to the first element
-
-    Returns an iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `begin()`.,begin}
-
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
-    iterator begin() noexcept
-    {
-        iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /*!
-    @copydoc basic_json::cbegin()
-    */
-    const_iterator begin() const noexcept
-    {
-        return cbegin();
-    }
-
-    /*!
-    @brief returns a const iterator to the first element
-
-    Returns a const iterator to the first element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator to the first element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
-
-    @liveexample{The following code shows an example for `cbegin()`.,cbegin}
-
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref cend() -- returns a const iterator to the end
-
-    @since version 1.0.0
-    */
-    const_iterator cbegin() const noexcept
-    {
-        const_iterator result(this);
-        result.set_begin();
-        return result;
-    }
-
-    /*!
-    @brief returns an iterator to one past the last element
-
-    Returns an iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-
-    @liveexample{The following code shows an example for `end()`.,end}
-
-    @sa @ref cend() -- returns a const iterator to the end
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
-    iterator end() noexcept
-    {
-        iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /*!
-    @copydoc basic_json::cend()
-    */
-    const_iterator end() const noexcept
-    {
-        return cend();
-    }
-
-    /*!
-    @brief returns a const iterator to one past the last element
-
-    Returns a const iterator to one past the last element.
-
-    @image html range-begin-end.svg "Illustration from cppreference.com"
-
-    @return const iterator one past the last element
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
-
-    @liveexample{The following code shows an example for `cend()`.,cend}
-
-    @sa @ref end() -- returns an iterator to the end
-    @sa @ref begin() -- returns an iterator to the beginning
-    @sa @ref cbegin() -- returns a const iterator to the beginning
-
-    @since version 1.0.0
-    */
-    const_iterator cend() const noexcept
-    {
-        const_iterator result(this);
-        result.set_end();
-        return result;
-    }
-
-    /*!
-    @brief returns an iterator to the reverse-beginning
-
-    Returns an iterator to the reverse-beginning; that is, the last element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(end())`.
-
-    @liveexample{The following code shows an example for `rbegin()`.,rbegin}
-
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
-    reverse_iterator rbegin() noexcept
-    {
-        return reverse_iterator(end());
-    }
-
-    /*!
-    @copydoc basic_json::crbegin()
-    */
-    const_reverse_iterator rbegin() const noexcept
-    {
-        return crbegin();
-    }
-
-    /*!
-    @brief returns an iterator to the reverse-end
-
-    Returns an iterator to the reverse-end; that is, one before the first
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `reverse_iterator(begin())`.
-
-    @liveexample{The following code shows an example for `rend()`.,rend}
-
-    @sa @ref crend() -- returns a const reverse iterator to the end
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
-    reverse_iterator rend() noexcept
-    {
-        return reverse_iterator(begin());
-    }
-
-    /*!
-    @copydoc basic_json::crend()
-    */
-    const_reverse_iterator rend() const noexcept
-    {
-        return crend();
-    }
-
-    /*!
-    @brief returns a const reverse iterator to the last element
-
-    Returns a const iterator to the reverse-beginning; that is, the last
-    element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
-
-    @liveexample{The following code shows an example for `crbegin()`.,crbegin}
-
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref crend() -- returns a const reverse iterator to the end
-
-    @since version 1.0.0
-    */
-    const_reverse_iterator crbegin() const noexcept
-    {
-        return const_reverse_iterator(cend());
-    }
-
-    /*!
-    @brief returns a const reverse iterator to one before the first
-
-    Returns a const reverse iterator to the reverse-end; that is, one before
-    the first element.
-
-    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
-
-    @complexity Constant.
-
-    @requirement This function helps `basic_json` satisfying the
-    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
-
-    @liveexample{The following code shows an example for `crend()`.,crend}
-
-    @sa @ref rend() -- returns a reverse iterator to the end
-    @sa @ref rbegin() -- returns a reverse iterator to the beginning
-    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
-
-    @since version 1.0.0
-    */
-    const_reverse_iterator crend() const noexcept
-    {
-        return const_reverse_iterator(cbegin());
-    }
-
-  public:
-    /*!
-    @brief wrapper to access iterator member functions in range-based for
-
-    This function allows to access @ref iterator::key() and @ref
-    iterator::value() during range-based for loops. In these loops, a
-    reference to the JSON values is returned, so there is no access to the
-    underlying iterator.
-
-    For loop without iterator_wrapper:
-
-    @code{cpp}
-    for (auto it = j_object.begin(); it != j_object.end(); ++it)
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    Range-based for loop without iterator proxy:
-
-    @code{cpp}
-    for (auto it : j_object)
-    {
-        // "it" is of type json::reference and has no key() member
-        std::cout << "value: " << it << '\n';
-    }
-    @endcode
-
-    Range-based for loop with iterator proxy:
-
-    @code{cpp}
-    for (auto it : json::iterator_wrapper(j_object))
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    @note When iterating over an array, `key()` will return the index of the
-          element as string (see example).
-
-    @param[in] ref  reference to a JSON value
-    @return iteration proxy object wrapping @a ref with an interface to use in
-            range-based for loops
-
-    @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @note The name of this function is not yet final and may change in the
-    future.
-
-    @deprecated This stream operator is deprecated and will be removed in
-                future 4.0.0 of the library. Please use @ref items() instead;
-                that is, replace `json::iterator_wrapper(j)` with `j.items()`.
-    */
-    JSON_HEDLEY_DEPRECATED(3.1.0)
-    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /*!
-    @copydoc iterator_wrapper(reference)
-    */
-    JSON_HEDLEY_DEPRECATED(3.1.0)
-    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
-    {
-        return ref.items();
-    }
-
-    /*!
-    @brief helper to access iterator member functions in range-based for
-
-    This function allows to access @ref iterator::key() and @ref
-    iterator::value() during range-based for loops. In these loops, a
-    reference to the JSON values is returned, so there is no access to the
-    underlying iterator.
-
-    For loop without `items()` function:
-
-    @code{cpp}
-    for (auto it = j_object.begin(); it != j_object.end(); ++it)
-    {
-        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
-    }
-    @endcode
-
-    Range-based for loop without `items()` function:
-
-    @code{cpp}
-    for (auto it : j_object)
-    {
-        // "it" is of type json::reference and has no key() member
-        std::cout << "value: " << it << '\n';
-    }
-    @endcode
-
-    Range-based for loop with `items()` function:
-
-    @code{cpp}
-    for (auto& el : j_object.items())
-    {
-        std::cout << "key: " << el.key() << ", value:" << el.value() << '\n';
-    }
-    @endcode
-
-    The `items()` function also allows to use
-    [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
-    (C++17):
-
-    @code{cpp}
-    for (auto& [key, val] : j_object.items())
-    {
-        std::cout << "key: " << key << ", value:" << val << '\n';
-    }
-    @endcode
-
-    @note When iterating over an array, `key()` will return the index of the
-          element as string (see example). For primitive types (e.g., numbers),
-          `key()` returns an empty string.
-
-    @return iteration proxy object wrapping @a ref with an interface to use in
-            range-based for loops
-
-    @liveexample{The following code shows how the function is used.,items}
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 3.1.0, structured bindings support since 3.5.0.
-    */
-    iteration_proxy<iterator> items() noexcept
-    {
-        return iteration_proxy<iterator>(*this);
-    }
-
-    /*!
-    @copydoc items()
-    */
-    iteration_proxy<const_iterator> items() const noexcept
-    {
-        return iteration_proxy<const_iterator>(*this);
-    }
-
-    /// @}
-
-
-    //////////////
-    // capacity //
-    //////////////
-
-    /// @name capacity
-    /// @{
-
-    /*!
-    @brief checks whether the container is empty.
-
-    Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `true`
-            boolean     | `false`
-            string      | `false`
-            number      | `false`
-            object      | result of function `object_t::empty()`
-            array       | result of function `array_t::empty()`
-
-    @liveexample{The following code uses `empty()` to check if a JSON
-    object contains any elements.,empty}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `empty()` functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @note This function does not return whether a string stored as JSON value
-    is empty - it returns whether the JSON container itself is empty which is
-    false in the case of a string.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `begin() == end()`.
-
-    @sa @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
-    bool empty() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return true;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::empty()
-                return m_value.array->empty();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::empty()
-                return m_value.object->empty();
-            }
-
-            default:
-            {
-                // all other types are nonempty
-                return false;
-            }
-        }
-    }
-
-    /*!
-    @brief returns the number of elements
-
-    Returns the number of elements in a JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0`
-            boolean     | `1`
-            string      | `1`
-            number      | `1`
-            object      | result of function object_t::size()
-            array       | result of function array_t::size()
-
-    @liveexample{The following code calls `size()` on the different value
-    types.,size}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their size() functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @note This function does not return the length of a string stored as JSON
-    value - it returns the number of elements in the JSON value which is 1 in
-    the case of a string.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of `std::distance(begin(), end())`.
-
-    @sa @ref empty() -- checks whether the container is empty
-    @sa @ref max_size() -- returns the maximal number of elements
-
-    @since version 1.0.0
-    */
-    size_type size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::null:
-            {
-                // null values are empty
-                return 0;
-            }
-
-            case value_t::array:
-            {
-                // delegate call to array_t::size()
-                return m_value.array->size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::size()
-                return m_value.object->size();
-            }
-
-            default:
-            {
-                // all other types have size 1
-                return 1;
-            }
-        }
-    }
-
-    /*!
-    @brief returns the maximum possible number of elements
-
-    Returns the maximum number of elements a JSON value is able to hold due to
-    system or library implementation limitations, i.e. `std::distance(begin(),
-    end())` for the JSON value.
-
-    @return The return value depends on the different types and is
-            defined as follows:
-            Value type  | return value
-            ----------- | -------------
-            null        | `0` (same as `size()`)
-            boolean     | `1` (same as `size()`)
-            string      | `1` (same as `size()`)
-            number      | `1` (same as `size()`)
-            object      | result of function `object_t::max_size()`
-            array       | result of function `array_t::max_size()`
-
-    @liveexample{The following code calls `max_size()` on the different value
-    types. Note the output is implementation specific.,max_size}
-
-    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
-    the Container concept; that is, their `max_size()` functions have constant
-    complexity.
-
-    @iterators No changes.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @requirement This function helps `basic_json` satisfying the
-    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
-    requirements:
-    - The complexity is constant.
-    - Has the semantics of returning `b.size()` where `b` is the largest
-      possible JSON value.
-
-    @sa @ref size() -- returns the number of elements
-
-    @since version 1.0.0
-    */
-    size_type max_size() const noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::array:
-            {
-                // delegate call to array_t::max_size()
-                return m_value.array->max_size();
-            }
-
-            case value_t::object:
-            {
-                // delegate call to object_t::max_size()
-                return m_value.object->max_size();
-            }
-
-            default:
-            {
-                // all other types have max_size() == size()
-                return size();
-            }
-        }
-    }
-
-    /// @}
-
-
-    ///////////////
-    // modifiers //
-    ///////////////
-
-    /// @name modifiers
-    /// @{
-
-    /*!
-    @brief clears the contents
-
-    Clears the content of a JSON value and resets it to the default value as
-    if @ref basic_json(value_t) would have been called with the current value
-    type from @ref type():
-
-    Value type  | initial value
-    ----------- | -------------
-    null        | `null`
-    boolean     | `false`
-    string      | `""`
-    number      | `0`
-    object      | `{}`
-    array       | `[]`
-
-    @post Has the same effect as calling
-    @code {.cpp}
-    *this = basic_json(type());
-    @endcode
-
-    @liveexample{The example below shows the effect of `clear()` to different
-    JSON types.,clear}
-
-    @complexity Linear in the size of the JSON value.
-
-    @iterators All iterators, pointers and references related to this container
-               are invalidated.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @sa @ref basic_json(value_t) -- constructor that creates an object with the
-        same value than calling `clear()`
-
-    @since version 1.0.0
-    */
-    void clear() noexcept
-    {
-        switch (m_type)
-        {
-            case value_t::number_integer:
-            {
-                m_value.number_integer = 0;
-                break;
-            }
-
-            case value_t::number_unsigned:
-            {
-                m_value.number_unsigned = 0;
-                break;
-            }
-
-            case value_t::number_float:
-            {
-                m_value.number_float = 0.0;
-                break;
-            }
-
-            case value_t::boolean:
-            {
-                m_value.boolean = false;
-                break;
-            }
-
-            case value_t::string:
-            {
-                m_value.string->clear();
-                break;
-            }
-
-            case value_t::array:
-            {
-                m_value.array->clear();
-                break;
-            }
-
-            case value_t::object:
-            {
-                m_value.object->clear();
-                break;
-            }
-
-            default:
-                break;
-        }
-    }
-
-    /*!
-    @brief add an object to an array
-
-    Appends the given element @a val to the end of the JSON value. If the
-    function is called on a JSON null value, an empty array is created before
-    appending @a val.
-
-    @param[in] val the value to add to the JSON array
-
-    @throw type_error.308 when called on a type other than JSON array or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON array. Note how the `null` value was silently
-    converted to a JSON array.,push_back}
-
-    @since version 1.0.0
-    */
-    void push_back(basic_json&& val)
-    {
-        // push_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_array())))
-        {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (move semantics)
-        m_value.array->push_back(std::move(val));
-        // invalidate object: mark it null so we do not call the destructor
-        // cppcheck-suppress accessMoved
-        val.m_type = value_t::null;
-    }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
-    reference operator+=(basic_json&& val)
-    {
-        push_back(std::move(val));
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
-    void push_back(const basic_json& val)
-    {
-        // push_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_array())))
-        {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array
-        m_value.array->push_back(val);
-    }
-
-    /*!
-    @brief add an object to an array
-    @copydoc push_back(basic_json&&)
-    */
-    reference operator+=(const basic_json& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an object
-
-    Inserts the given element @a val to the JSON object. If the function is
-    called on a JSON null value, an empty object is created before inserting
-    @a val.
-
-    @param[in] val the value to add to the JSON object
-
-    @throw type_error.308 when called on a type other than JSON object or
-    null; example: `"cannot use push_back() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `push_back()` and `+=` can be used to
-    add elements to a JSON object. Note how the `null` value was silently
-    converted to a JSON object.,push_back__object_t__value}
-
-    @since version 1.0.0
-    */
-    void push_back(const typename object_t::value_type& val)
-    {
-        // push_back only works for null objects or objects
-        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_object())))
-        {
-            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to array
-        m_value.object->insert(val);
-    }
-
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(const typename object_t::value_type&)
-    */
-    reference operator+=(const typename object_t::value_type& val)
-    {
-        push_back(val);
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an object
-
-    This function allows to use `push_back` with an initializer list. In case
-
-    1. the current value is an object,
-    2. the initializer list @a init contains only two elements, and
-    3. the first element of @a init is a string,
-
-    @a init is converted into an object element and added using
-    @ref push_back(const typename object_t::value_type&). Otherwise, @a init
-    is converted to a JSON value and added using @ref push_back(basic_json&&).
-
-    @param[in] init  an initializer list
-
-    @complexity Linear in the size of the initializer list @a init.
-
-    @note This function is required to resolve an ambiguous overload error,
-          because pairs like `{"key", "value"}` can be both interpreted as
-          `object_t::value_type` or `std::initializer_list<basic_json>`, see
-          https://github.com/nlohmann/json/issues/235 for more information.
-
-    @liveexample{The example shows how initializer lists are treated as
-    objects when possible.,push_back__initializer_list}
-    */
-    void push_back(initializer_list_t init)
-    {
-        if (is_object() and init.size() == 2 and (*init.begin())->is_string())
-        {
-            basic_json&& key = init.begin()->moved_or_copied();
-            push_back(typename object_t::value_type(
-                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
-        }
-        else
-        {
-            push_back(basic_json(init));
-        }
-    }
-
-    /*!
-    @brief add an object to an object
-    @copydoc push_back(initializer_list_t)
-    */
-    reference operator+=(initializer_list_t init)
-    {
-        push_back(init);
-        return *this;
-    }
-
-    /*!
-    @brief add an object to an array
-
-    Creates a JSON value from the passed parameters @a args to the end of the
-    JSON value. If the function is called on a JSON null value, an empty array
-    is created before appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @return reference to the inserted element
-
-    @throw type_error.311 when called on a type other than JSON array or
-    null; example: `"cannot use emplace_back() with number"`
-
-    @complexity Amortized constant.
-
-    @liveexample{The example shows how `push_back()` can be used to add
-    elements to a JSON array. Note how the `null` value was silently converted
-    to a JSON array.,emplace_back}
-
-    @since version 2.0.8, returns reference since 3.7.0
-    */
-    template<class... Args>
-    reference emplace_back(Args&& ... args)
-    {
-        // emplace_back only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_array())))
-        {
-            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name())));
-        }
-
-        // transform null object into an array
-        if (is_null())
-        {
-            m_type = value_t::array;
-            m_value = value_t::array;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-#ifdef JSON_HAS_CPP_17
-        return m_value.array->emplace_back(std::forward<Args>(args)...);
-#else
-        m_value.array->emplace_back(std::forward<Args>(args)...);
-        return m_value.array->back();
-#endif
-    }
-
-    /*!
-    @brief add an object to an object if key does not exist
-
-    Inserts a new element into a JSON object constructed in-place with the
-    given @a args if there is no element with the key in the container. If the
-    function is called on a JSON null value, an empty object is created before
-    appending the value created from @a args.
-
-    @param[in] args arguments to forward to a constructor of @ref basic_json
-    @tparam Args compatible types to create a @ref basic_json object
-
-    @return a pair consisting of an iterator to the inserted element, or the
-            already-existing element if no insertion happened, and a bool
-            denoting whether the insertion took place.
-
-    @throw type_error.311 when called on a type other than JSON object or
-    null; example: `"cannot use emplace() with number"`
-
-    @complexity Logarithmic in the size of the container, O(log(`size()`)).
-
-    @liveexample{The example shows how `emplace()` can be used to add elements
-    to a JSON object. Note how the `null` value was silently converted to a
-    JSON object. Further note how no value is added if there was already one
-    value stored with the same key.,emplace}
-
-    @since version 2.0.8
-    */
-    template<class... Args>
-    std::pair<iterator, bool> emplace(Args&& ... args)
-    {
-        // emplace only works for null objects or arrays
-        if (JSON_HEDLEY_UNLIKELY(not(is_null() or is_object())))
-        {
-            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name())));
-        }
-
-        // transform null object into an object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value = value_t::object;
-            assert_invariant();
-        }
-
-        // add element to array (perfect forwarding)
-        auto res = m_value.object->emplace(std::forward<Args>(args)...);
-        // create result iterator and set iterator to the result of emplace
-        auto it = begin();
-        it.m_it.object_iterator = res.first;
-
-        // return pair of iterator and boolean
-        return {it, res.second};
-    }
-
-    /// Helper for insertion of an iterator
-    /// @note: This uses std::distance to support GCC 4.8,
-    ///        see https://github.com/nlohmann/json/pull/1257
-    template<typename... Args>
-    iterator insert_iterator(const_iterator pos, Args&& ... args)
-    {
-        iterator result(this);
-        assert(m_value.array != nullptr);
-
-        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
-        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
-        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
-
-        // This could have been written as:
-        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
-        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
-
-        return result;
-    }
-
-    /*!
-    @brief inserts element
-
-    Inserts element @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] val element to insert
-    @return iterator pointing to the inserted @a val.
-
-    @throw type_error.309 if called on JSON values other than arrays;
-    example: `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @complexity Constant plus linear in the distance between @a pos and end of
-    the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // check if iterator pos fits to this JSON value
-            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-            {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
-            }
-
-            // insert to array and return iterator
-            return insert_iterator(pos, val);
-        }
-
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief inserts element
-    @copydoc insert(const_iterator, const basic_json&)
-    */
-    iterator insert(const_iterator pos, basic_json&& val)
-    {
-        return insert(pos, val);
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts @a cnt copies of @a val before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] cnt number of copies of @a val to insert
-    @param[in] val element to insert
-    @return iterator pointing to the first element inserted, or @a pos if
-    `cnt==0`
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @complexity Linear in @a cnt plus linear in the distance between @a pos
-    and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__count}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            // check if iterator pos fits to this JSON value
-            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-            {
-                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
-            }
-
-            // insert to array and return iterator
-            return insert_iterator(pos, cnt, val);
-        }
-
-        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts elements from range `[first, last)` before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-    @throw invalid_iterator.211 if @a first or @a last are iterators into
-    container for which insert is called; example: `"passed iterators may not
-    belong to container"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `first==last`
-
-    @complexity Linear in `std::distance(first, last)` plus linear in the
-    distance between @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__range}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_UNLIKELY(not is_array()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
-        {
-            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container"));
-        }
-
-        // insert to array and return iterator
-        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts elements from initializer list @a ilist before iterator @a pos.
-
-    @param[in] pos iterator before which the content will be inserted; may be
-    the end() iterator
-    @param[in] ilist initializer list to insert the values from
-
-    @throw type_error.309 if called on JSON values other than arrays; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
-    example: `"iterator does not fit current value"`
-
-    @return iterator pointing to the first element inserted, or @a pos if
-    `ilist` is empty
-
-    @complexity Linear in `ilist.size()` plus linear in the distance between
-    @a pos and end of the container.
-
-    @liveexample{The example shows how `insert()` is used.,insert__ilist}
-
-    @since version 1.0.0
-    */
-    iterator insert(const_iterator pos, initializer_list_t ilist)
-    {
-        // insert only works for arrays
-        if (JSON_HEDLEY_UNLIKELY(not is_array()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
-        }
-
-        // check if iterator pos fits to this JSON value
-        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
-        }
-
-        // insert to array and return iterator
-        return insert_iterator(pos, ilist.begin(), ilist.end());
-    }
-
-    /*!
-    @brief inserts elements
-
-    Inserts elements from range `[first, last)`.
-
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.309 if called on JSON values other than objects; example:
-    `"cannot use insert() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
-    point to an object; example: `"iterators first and last must point to
-    objects"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-
-    @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
-    of elements to insert.
-
-    @liveexample{The example shows how `insert()` is used.,insert__range_object}
-
-    @since version 3.0.0
-    */
-    void insert(const_iterator first, const_iterator last)
-    {
-        // insert only works for objects
-        if (JSON_HEDLEY_UNLIKELY(not is_object()))
-        {
-            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
-        }
-
-        // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(not first.m_object->is_object()))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
-        }
-
-        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
-    }
-
-    /*!
-    @brief updates a JSON object from another object, overwriting existing keys
-
-    Inserts all values from JSON object @a j and overwrites existing keys.
-
-    @param[in] j  JSON object to read values from
-
-    @throw type_error.312 if called on JSON values other than objects; example:
-    `"cannot use update() with string"`
-
-    @complexity O(N*log(size() + N)), where N is the number of elements to
-                insert.
-
-    @liveexample{The example shows how `update()` is used.,update}
-
-    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
-
-    @since version 3.0.0
-    */
-    void update(const_reference j)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(not is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
-        }
-        if (JSON_HEDLEY_UNLIKELY(not j.is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name())));
-        }
-
-        for (auto it = j.cbegin(); it != j.cend(); ++it)
-        {
-            m_value.object->operator[](it.key()) = it.value();
-        }
-    }
-
-    /*!
-    @brief updates a JSON object from another object, overwriting existing keys
-
-    Inserts all values from from range `[first, last)` and overwrites existing
-    keys.
-
-    @param[in] first begin of the range of elements to insert
-    @param[in] last end of the range of elements to insert
-
-    @throw type_error.312 if called on JSON values other than objects; example:
-    `"cannot use update() with string"`
-    @throw invalid_iterator.202 if iterator @a first or @a last does does not
-    point to an object; example: `"iterators first and last must point to
-    objects"`
-    @throw invalid_iterator.210 if @a first and @a last do not belong to the
-    same JSON value; example: `"iterators do not fit"`
-
-    @complexity O(N*log(size() + N)), where N is the number of elements to
-                insert.
-
-    @liveexample{The example shows how `update()` is used__range.,update}
-
-    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
-
-    @since version 3.0.0
-    */
-    void update(const_iterator first, const_iterator last)
-    {
-        // implicitly convert null value to an empty object
-        if (is_null())
-        {
-            m_type = value_t::object;
-            m_value.object = create<object_t>();
-            assert_invariant();
-        }
-
-        if (JSON_HEDLEY_UNLIKELY(not is_object()))
-        {
-            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
-        }
-
-        // check if range iterators belong to the same JSON object
-        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
-        {
-            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
-        }
-
-        // passed iterators must belong to objects
-        if (JSON_HEDLEY_UNLIKELY(not first.m_object->is_object()
-                                 or not last.m_object->is_object()))
-        {
-            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
-        }
-
-        for (auto it = first; it != last; ++it)
-        {
-            m_value.object->operator[](it.key()) = it.value();
-        }
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of the JSON value with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other JSON value to exchange the contents with
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how JSON values can be swapped with
-    `swap()`.,swap__reference}
-
-    @since version 1.0.0
-    */
-    void swap(reference other) noexcept (
-        std::is_nothrow_move_constructible<value_t>::value and
-        std::is_nothrow_move_assignable<value_t>::value and
-        std::is_nothrow_move_constructible<json_value>::value and
-        std::is_nothrow_move_assignable<json_value>::value
-    )
-    {
-        std::swap(m_type, other.m_type);
-        std::swap(m_value, other.m_value);
-        assert_invariant();
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON array with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other array to exchange the contents with
-
-    @throw type_error.310 when JSON value is not an array; example: `"cannot
-    use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how arrays can be swapped with
-    `swap()`.,swap__array_t}
-
-    @since version 1.0.0
-    */
-    void swap(array_t& other)
-    {
-        // swap only works for arrays
-        if (JSON_HEDLEY_LIKELY(is_array()))
-        {
-            std::swap(*(m_value.array), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
-        }
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON object with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other object to exchange the contents with
-
-    @throw type_error.310 when JSON value is not an object; example:
-    `"cannot use swap() with string"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how objects can be swapped with
-    `swap()`.,swap__object_t}
-
-    @since version 1.0.0
-    */
-    void swap(object_t& other)
-    {
-        // swap only works for objects
-        if (JSON_HEDLEY_LIKELY(is_object()))
-        {
-            std::swap(*(m_value.object), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
-        }
-    }
-
-    /*!
-    @brief exchanges the values
-
-    Exchanges the contents of a JSON string with those of @a other. Does not
-    invoke any move, copy, or swap operations on individual elements. All
-    iterators and references remain valid. The past-the-end iterator is
-    invalidated.
-
-    @param[in,out] other string to exchange the contents with
-
-    @throw type_error.310 when JSON value is not a string; example: `"cannot
-    use swap() with boolean"`
-
-    @complexity Constant.
-
-    @liveexample{The example below shows how strings can be swapped with
-    `swap()`.,swap__string_t}
-
-    @since version 1.0.0
-    */
-    void swap(string_t& other)
-    {
-        // swap only works for strings
-        if (JSON_HEDLEY_LIKELY(is_string()))
-        {
-            std::swap(*(m_value.string), other);
-        }
-        else
-        {
-            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
-        }
-    }
-
-    /// @}
-
-  public:
-    //////////////////////////////////////////
-    // lexicographical comparison operators //
-    //////////////////////////////////////////
-
-    /// @name lexicographical comparison operators
-    /// @{
-
-    /*!
-    @brief comparison: equal
-
-    Compares two JSON values for equality according to the following rules:
-    - Two JSON values are equal if (1) they are from the same type and (2)
-      their stored values are the same according to their respective
-      `operator==`.
-    - Integer and floating-point numbers are automatically converted before
-      comparison. Note than two NaN values are always treated as unequal.
-    - Two JSON null values are equal.
-
-    @note Floating-point inside JSON values numbers are compared with
-    `json::number_float_t::operator==` which is `double::operator==` by
-    default. To compare floating-point while respecting an epsilon, an alternative
-    [comparison function](https://github.com/mariokonrad/marnav/blob/master/src/marnav/math/floatingpoint.hpp#L34-#L39)
-    could be used, for instance
-    @code {.cpp}
-    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
-    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
-    {
-        return std::abs(a - b) <= epsilon;
-    }
-    @endcode
-
-    @note NaN values never compare equal to themselves or to other NaN values.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are equal
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @complexity Linear.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__equal}
-
-    @since version 1.0.0
-    */
-    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
-    {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    return *lhs.m_value.array == *rhs.m_value.array;
-
-                case value_t::object:
-                    return *lhs.m_value.object == *rhs.m_value.object;
-
-                case value_t::null:
-                    return true;
-
-                case value_t::string:
-                    return *lhs.m_value.string == *rhs.m_value.string;
-
-                case value_t::boolean:
-                    return lhs.m_value.boolean == rhs.m_value.boolean;
-
-                case value_t::number_integer:
-                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
-
-                case value_t::number_unsigned:
-                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
-
-                case value_t::number_float:
-                    return lhs.m_value.number_float == rhs.m_value.number_float;
-
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
-        }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-
-        return false;
-    }
-
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
-    {
-        return lhs == basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: equal
-    @copydoc operator==(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) == rhs;
-    }
-
-    /*!
-    @brief comparison: not equal
-
-    Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether the values @a lhs and @a rhs are not equal
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__notequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (lhs == rhs);
-    }
-
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
-    {
-        return lhs != basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: not equal
-    @copydoc operator!=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) != rhs;
-    }
-
-    /*!
-    @brief comparison: less than
-
-    Compares whether one JSON value @a lhs is less than another JSON value @a
-    rhs according to the following rules:
-    - If @a lhs and @a rhs have the same type, the values are compared using
-      the default `<` operator.
-    - Integer and floating-point numbers are automatically converted before
-      comparison
-    - In case @a lhs and @a rhs have different types, the values are ignored
-      and the order of the types is considered, see
-      @ref operator<(const value_t, const value_t).
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__less}
-
-    @since version 1.0.0
-    */
-    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
-    {
-        const auto lhs_type = lhs.type();
-        const auto rhs_type = rhs.type();
-
-        if (lhs_type == rhs_type)
-        {
-            switch (lhs_type)
-            {
-                case value_t::array:
-                    // note parentheses are necessary, see
-                    // https://github.com/nlohmann/json/issues/1530
-                    return (*lhs.m_value.array) < (*rhs.m_value.array);
-
-                case value_t::object:
-                    return (*lhs.m_value.object) < (*rhs.m_value.object);
-
-                case value_t::null:
-                    return false;
-
-                case value_t::string:
-                    return (*lhs.m_value.string) < (*rhs.m_value.string);
-
-                case value_t::boolean:
-                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
-
-                case value_t::number_integer:
-                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
-
-                case value_t::number_unsigned:
-                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
-
-                case value_t::number_float:
-                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
-
-                default:
-                    return false;
-            }
-        }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_integer)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
-        }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_float)
-        {
-            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
-        }
-        else if (lhs_type == value_t::number_float and rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_integer and rhs_type == value_t::number_unsigned)
-        {
-            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
-        }
-        else if (lhs_type == value_t::number_unsigned and rhs_type == value_t::number_integer)
-        {
-            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
-        }
-
-        // We only reach this line if we cannot compare values. In that case,
-        // we compare types. Note we have to call the operator explicitly,
-        // because MSVC has problems otherwise.
-        return operator<(lhs_type, rhs_type);
-    }
-
-    /*!
-    @brief comparison: less than
-    @copydoc operator<(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept
-    {
-        return lhs < basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: less than
-    @copydoc operator<(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) < rhs;
-    }
-
-    /*!
-    @brief comparison: less than or equal
-
-    Compares whether one JSON value @a lhs is less than or equal to another
-    JSON value by calculating `not (rhs < lhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is less than or equal to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greater}
-
-    @since version 1.0.0
-    */
-    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (rhs < lhs);
-    }
-
-    /*!
-    @brief comparison: less than or equal
-    @copydoc operator<=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept
-    {
-        return lhs <= basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: less than or equal
-    @copydoc operator<=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) <= rhs;
-    }
-
-    /*!
-    @brief comparison: greater than
-
-    Compares whether one JSON value @a lhs is greater than another
-    JSON value by calculating `not (lhs <= rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__lessequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (lhs <= rhs);
-    }
-
-    /*!
-    @brief comparison: greater than
-    @copydoc operator>(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept
-    {
-        return lhs > basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: greater than
-    @copydoc operator>(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) > rhs;
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-
-    Compares whether one JSON value @a lhs is greater than or equal to another
-    JSON value by calculating `not (lhs < rhs)`.
-
-    @param[in] lhs  first JSON value to consider
-    @param[in] rhs  second JSON value to consider
-    @return whether @a lhs is greater than or equal to @a rhs
-
-    @complexity Linear.
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @liveexample{The example demonstrates comparing several JSON
-    types.,operator__greaterequal}
-
-    @since version 1.0.0
-    */
-    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
-    {
-        return not (lhs < rhs);
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-    @copydoc operator>=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept
-    {
-        return lhs >= basic_json(rhs);
-    }
-
-    /*!
-    @brief comparison: greater than or equal
-    @copydoc operator>=(const_reference, const_reference)
-    */
-    template<typename ScalarType, typename std::enable_if<
-                 std::is_scalar<ScalarType>::value, int>::type = 0>
-    friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept
-    {
-        return basic_json(lhs) >= rhs;
-    }
-
-    /// @}
-
-    ///////////////////
-    // serialization //
-    ///////////////////
-
-    /// @name serialization
-    /// @{
-
-    /*!
-    @brief serialize to stream
-
-    Serialize the given JSON value @a j to the output stream @a o. The JSON
-    value will be serialized using the @ref dump member function.
-
-    - The indentation of the output can be controlled with the member variable
-      `width` of the output stream @a o. For instance, using the manipulator
-      `std::setw(4)` on @a o sets the indentation level to `4` and the
-      serialization result is the same as calling `dump(4)`.
-
-    - The indentation character can be controlled with the member variable
-      `fill` of the output stream @a o. For instance, the manipulator
-      `std::setfill('\\t')` sets indentation to use a tab character rather than
-      the default space character.
-
-    @param[in,out] o  stream to serialize to
-    @param[in] j  JSON value to serialize
-
-    @return the stream @a o
-
-    @throw type_error.316 if a string stored inside the JSON value is not
-                          UTF-8 encoded
-
-    @complexity Linear.
-
-    @liveexample{The example below shows the serialization with different
-    parameters to `width` to adjust the indentation level.,operator_serialize}
-
-    @since version 1.0.0; indentation character added in version 3.0.0
-    */
-    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
-    {
-        // read width member and use it as indentation parameter if nonzero
-        const bool pretty_print = o.width() > 0;
-        const auto indentation = pretty_print ? o.width() : 0;
-
-        // reset width to 0 for subsequent calls to this stream
-        o.width(0);
-
-        // do the actual serialization
-        serializer s(detail::output_adapter<char>(o), o.fill());
-        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
-        return o;
-    }
-
-    /*!
-    @brief serialize to stream
-    @deprecated This stream operator is deprecated and will be removed in
-                future 4.0.0 of the library. Please use
-                @ref operator<<(std::ostream&, const basic_json&)
-                instead; that is, replace calls like `j >> o;` with `o << j;`.
-    @since version 1.0.0; deprecated since version 3.0.0
-    */
-    JSON_HEDLEY_DEPRECATED(3.0.0)
-    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
-    {
-        return o << j;
-    }
-
-    /// @}
-
-
-    /////////////////////
-    // deserialization //
-    /////////////////////
-
-    /// @name deserialization
-    /// @{
-
-    /*!
-    @brief deserialize from a compatible input
-
-    This function reads from a compatible input. Examples are:
-    - an array of 1-byte values
-    - strings with character/literal type with size of 1 byte
-    - input streams
-    - container with contiguous storage of 1-byte values. Compatible container
-      types include `std::vector`, `std::string`, `std::array`,
-      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
-      arrays can be used with `std::begin()`/`std::end()`. User-defined
-      containers can be used as long as they implement random-access iterators
-      and a contiguous storage.
-
-    @pre Each element of the container has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @pre The container storage is contiguous. Violating this precondition
-    yields undefined behavior. **This precondition is enforced with an
-    assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with a noncompliant container and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
-
-    @param[in] i  input to read from
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from an array.,parse__array__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__string__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function with
-    and without callback function.,parse__istream__parser_callback_t}
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
-
-    @since version 2.0.3 (contiguous containers)
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json parse(detail::input_adapter&& i,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true)
-    {
-        basic_json result;
-        parser(i, cb, allow_exceptions).parse(true, result);
-        return result;
-    }
-
-    static bool accept(detail::input_adapter&& i)
-    {
-        return parser(i).accept(true);
-    }
-
-    /*!
-    @brief generate SAX events
-
-    The SAX event lister must follow the interface of @ref json_sax.
-
-    This function reads from a compatible input. Examples are:
-    - an array of 1-byte values
-    - strings with character/literal type with size of 1 byte
-    - input streams
-    - container with contiguous storage of 1-byte values. Compatible container
-      types include `std::vector`, `std::string`, `std::array`,
-      `std::valarray`, and `std::initializer_list`. Furthermore, C-style
-      arrays can be used with `std::begin()`/`std::end()`. User-defined
-      containers can be used as long as they implement random-access iterators
-      and a contiguous storage.
-
-    @pre Each element of the container has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @pre The container storage is contiguous. Violating this precondition
-    yields undefined behavior. **This precondition is enforced with an
-    assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with a noncompliant container and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
-
-    @param[in] i  input to read from
-    @param[in,out] sax  SAX event listener
-    @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
-    @param[in] strict  whether the input has to be consumed completely
-
-    @return return value of the last processed SAX event
-
-    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
-    of input; expected string literal""`
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the SAX consumer @a sax has
-    a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `sax_parse()` function
-    reading from string and processing the events with a user-defined SAX
-    event consumer.,sax_parse}
-
-    @since version 3.2.0
-    */
-    template <typename SAX>
-    JSON_HEDLEY_NON_NULL(2)
-    static bool sax_parse(detail::input_adapter&& i, SAX* sax,
-                          input_format_t format = input_format_t::json,
-                          const bool strict = true)
-    {
-        assert(sax);
-        return format == input_format_t::json
-               ? parser(std::move(i)).sax_parse(sax, strict)
-               : detail::binary_reader<basic_json, SAX>(std::move(i)).sax_parse(format, sax, strict);
-    }
-
-    /*!
-    @brief deserialize from an iterator range with contiguous storage
-
-    This function reads from an iterator range of a container with contiguous
-    storage of 1-byte values. Compatible container types include
-    `std::vector`, `std::string`, `std::array`, `std::valarray`, and
-    `std::initializer_list`. Furthermore, C-style arrays can be used with
-    `std::begin()`/`std::end()`. User-defined containers can be used as long
-    as they implement random-access iterators and a contiguous storage.
-
-    @pre The iterator range is contiguous. Violating this precondition yields
-    undefined behavior. **This precondition is enforced with an assertion.**
-    @pre Each element in the range has a size of 1 byte. Violating this
-    precondition yields undefined behavior. **This precondition is enforced
-    with a static assertion.**
-
-    @warning There is no way to enforce all preconditions at compile-time. If
-             the function is called with noncompliant iterators and with
-             assertions switched off, the behavior is undefined and will most
-             likely yield segmentation violation.
-
-    @tparam IteratorType iterator of container with contiguous storage
-    @param[in] first  begin of the range to parse (included)
-    @param[in] last  end of the range to parse (excluded)
-    @param[in] cb  a parser callback function of type @ref parser_callback_t
-    which is used to control the deserialization by filtering unwanted values
-    (optional)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser. The complexity can be higher if the parser callback function
-    @a cb has a super-linear complexity.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below demonstrates the `parse()` function reading
-    from an iterator range.,parse__iteratortype__parser_callback_t}
-
-    @since version 2.0.3
-    */
-    template<class IteratorType, typename std::enable_if<
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
-    static basic_json parse(IteratorType first, IteratorType last,
-                            const parser_callback_t cb = nullptr,
-                            const bool allow_exceptions = true)
-    {
-        basic_json result;
-        parser(detail::input_adapter(first, last), cb, allow_exceptions).parse(true, result);
-        return result;
-    }
-
-    template<class IteratorType, typename std::enable_if<
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
-    static bool accept(IteratorType first, IteratorType last)
-    {
-        return parser(detail::input_adapter(first, last)).accept(true);
-    }
-
-    template<class IteratorType, class SAX, typename std::enable_if<
-                 std::is_base_of<
-                     std::random_access_iterator_tag,
-                     typename std::iterator_traits<IteratorType>::iterator_category>::value, int>::type = 0>
-    JSON_HEDLEY_NON_NULL(3)
-    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax)
-    {
-        return parser(detail::input_adapter(first, last)).sax_parse(sax);
-    }
-
-    /*!
-    @brief deserialize from stream
-    @deprecated This stream operator is deprecated and will be removed in
-                version 4.0.0 of the library. Please use
-                @ref operator>>(std::istream&, basic_json&)
-                instead; that is, replace calls like `j << i;` with `i >> j;`.
-    @since version 1.0.0; deprecated since version 3.0.0
-    */
-    JSON_HEDLEY_DEPRECATED(3.0.0)
-    friend std::istream& operator<<(basic_json& j, std::istream& i)
-    {
-        return operator>>(i, j);
-    }
-
-    /*!
-    @brief deserialize from stream
-
-    Deserializes an input stream to a JSON value.
-
-    @param[in,out] i  input stream to read a serialized JSON value from
-    @param[in,out] j  JSON value to write the deserialized input to
-
-    @throw parse_error.101 in case of an unexpected token
-    @throw parse_error.102 if to_unicode fails or surrogate error
-    @throw parse_error.103 if to_unicode fails
-
-    @complexity Linear in the length of the input. The parser is a predictive
-    LL(1) parser.
-
-    @note A UTF-8 byte order mark is silently ignored.
-
-    @liveexample{The example below shows how a JSON value is constructed by
-    reading a serialization from a stream.,operator_deserialize}
-
-    @sa parse(std::istream&, const parser_callback_t) for a variant with a
-    parser callback function to filter values while parsing
-
-    @since version 1.0.0
-    */
-    friend std::istream& operator>>(std::istream& i, basic_json& j)
-    {
-        parser(detail::input_adapter(i)).parse(false, j);
-        return i;
-    }
-
-    /// @}
-
-    ///////////////////////////
-    // convenience functions //
-    ///////////////////////////
-
-    /*!
-    @brief return the type as string
-
-    Returns the type name as string to be used in error messages - usually to
-    indicate that a function was called on a wrong JSON type.
-
-    @return a string representation of a the @a m_type member:
-            Value type  | return value
-            ----------- | -------------
-            null        | `"null"`
-            boolean     | `"boolean"`
-            string      | `"string"`
-            number      | `"number"` (for all number types)
-            object      | `"object"`
-            array       | `"array"`
-            discarded   | `"discarded"`
-
-    @exceptionsafety No-throw guarantee: this function never throws exceptions.
-
-    @complexity Constant.
-
-    @liveexample{The following code exemplifies `type_name()` for all JSON
-    types.,type_name}
-
-    @sa @ref type() -- return the type of the JSON value
-    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
-
-    @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
-    since 3.0.0
-    */
-    JSON_HEDLEY_RETURNS_NON_NULL
-    const char* type_name() const noexcept
-    {
-        {
-            switch (m_type)
-            {
-                case value_t::null:
-                    return "null";
-                case value_t::object:
-                    return "object";
-                case value_t::array:
-                    return "array";
-                case value_t::string:
-                    return "string";
-                case value_t::boolean:
-                    return "boolean";
-                case value_t::discarded:
-                    return "discarded";
-                default:
-                    return "number";
-            }
-        }
-    }
-
-
-  private:
-    //////////////////////
-    // member variables //
-    //////////////////////
-
-    /// the type of the current element
-    value_t m_type = value_t::null;
-
-    /// the value of the current element
-    json_value m_value = {};
-
-    //////////////////////////////////////////
-    // binary serialization/deserialization //
-    //////////////////////////////////////////
-
-    /// @name binary serialization/deserialization support
-    /// @{
-
-  public:
-    /*!
-    @brief create a CBOR serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
-    Binary Object Representation) serialization format. CBOR is a binary
-    serialization format which aims to be more compact than JSON itself, yet
-    more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    CBOR types according to the CBOR specification (RFC 7049):
-
-    JSON value type | value/range                                | CBOR type                          | first byte
-    --------------- | ------------------------------------------ | ---------------------------------- | ---------------
-    null            | `null`                                     | Null                               | 0xF6
-    boolean         | `true`                                     | True                               | 0xF5
-    boolean         | `false`                                    | False                              | 0xF4
-    number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3B
-    number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3A
-    number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
-    number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
-    number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
-    number_integer  | 0..23                                      | Integer                            | 0x00..0x17
-    number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-    number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-    number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-    number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-    number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
-    number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
-    number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
-    number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
-    number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
-    number_float    | *any value*                                | Double-Precision Float             | 0xFB
-    string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
-    string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
-    string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
-    string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7A
-    string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7B
-    array           | *size*: 0..23                              | array                              | 0x80..0x97
-    array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
-    array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
-    array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9A
-    array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9B
-    object          | *size*: 0..23                              | map                                | 0xA0..0xB7
-    object          | *size*: 23..255                            | map (1 byte follow)                | 0xB8
-    object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
-    object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
-    object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a CBOR value.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @note The following CBOR types are not used in the conversion:
-          - byte strings (0x40..0x5F)
-          - UTF-8 strings terminated by "break" (0x7F)
-          - arrays terminated by "break" (0x9F)
-          - maps terminated by "break" (0xBF)
-          - date/time (0xC0..0xC1)
-          - bignum (0xC2..0xC3)
-          - decimal fraction (0xC4)
-          - bigfloat (0xC5)
-          - tagged items (0xC6..0xD4, 0xD8..0xDB)
-          - expected conversions (0xD5..0xD7)
-          - simple values (0xE0..0xF3, 0xF8)
-          - undefined (0xF7)
-          - half and single-precision floats (0xF9-0xFA)
-          - break (0xFF)
-
-    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in CBOR format.,to_cbor}
-
-    @sa http://cbor.io
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
-        analogous deserialization
-    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-
-    @since version 2.0.9
-    */
-    static std::vector<uint8_t> to_cbor(const basic_json& j)
-    {
-        std::vector<uint8_t> result;
-        to_cbor(j, result);
-        return result;
-    }
-
-    static void to_cbor(const basic_json& j, detail::output_adapter<uint8_t> o)
-    {
-        binary_writer<uint8_t>(o).write_cbor(j);
-    }
-
-    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_cbor(j);
-    }
-
-    /*!
-    @brief create a MessagePack serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the MessagePack
-    serialization format. MessagePack is a binary serialization format which
-    aims to be more compact than JSON itself, yet more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    MessagePack types according to the MessagePack specification:
-
-    JSON value type | value/range                       | MessagePack type | first byte
-    --------------- | --------------------------------- | ---------------- | ----------
-    null            | `null`                            | nil              | 0xC0
-    boolean         | `true`                            | true             | 0xC3
-    boolean         | `false`                           | false            | 0xC2
-    number_integer  | -9223372036854775808..-2147483649 | int64            | 0xD3
-    number_integer  | -2147483648..-32769               | int32            | 0xD2
-    number_integer  | -32768..-129                      | int16            | 0xD1
-    number_integer  | -128..-33                         | int8             | 0xD0
-    number_integer  | -32..-1                           | negative fixint  | 0xE0..0xFF
-    number_integer  | 0..127                            | positive fixint  | 0x00..0x7F
-    number_integer  | 128..255                          | uint 8           | 0xCC
-    number_integer  | 256..65535                        | uint 16          | 0xCD
-    number_integer  | 65536..4294967295                 | uint 32          | 0xCE
-    number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xCF
-    number_unsigned | 0..127                            | positive fixint  | 0x00..0x7F
-    number_unsigned | 128..255                          | uint 8           | 0xCC
-    number_unsigned | 256..65535                        | uint 16          | 0xCD
-    number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
-    number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
-    number_float    | *any value*                       | float 64         | 0xCB
-    string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
-    string          | *length*: 32..255                 | str 8            | 0xD9
-    string          | *length*: 256..65535              | str 16           | 0xDA
-    string          | *length*: 65536..4294967295       | str 32           | 0xDB
-    array           | *size*: 0..15                     | fixarray         | 0x90..0x9F
-    array           | *size*: 16..65535                 | array 16         | 0xDC
-    array           | *size*: 65536..4294967295         | array 32         | 0xDD
-    object          | *size*: 0..15                     | fix map          | 0x80..0x8F
-    object          | *size*: 16..65535                 | map 16           | 0xDE
-    object          | *size*: 65536..4294967295         | map 32           | 0xDF
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a MessagePack value.
-
-    @note The following values can **not** be converted to a MessagePack value:
-          - strings with more than 4294967295 bytes
-          - arrays with more than 4294967295 elements
-          - objects with more than 4294967295 elements
-
-    @note The following MessagePack types are not used in the conversion:
-          - bin 8 - bin 32 (0xC4..0xC6)
-          - ext 8 - ext 32 (0xC7..0xC9)
-          - float 32 (0xCA)
-          - fixext 1 - fixext 16 (0xD4..0xD8)
-
-    @note Any MessagePack output created @ref to_msgpack can be successfully
-          parsed by @ref from_msgpack.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @param[in] j  JSON value to serialize
-    @return MessagePack serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in MessagePack format.,to_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref from_msgpack for the analogous deserialization
-    @sa @ref to_cbor(const basic_json& for the related CBOR format
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-
-    @since version 2.0.9
-    */
-    static std::vector<uint8_t> to_msgpack(const basic_json& j)
-    {
-        std::vector<uint8_t> result;
-        to_msgpack(j, result);
-        return result;
-    }
-
-    static void to_msgpack(const basic_json& j, detail::output_adapter<uint8_t> o)
-    {
-        binary_writer<uint8_t>(o).write_msgpack(j);
-    }
-
-    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_msgpack(j);
-    }
-
-    /*!
-    @brief create a UBJSON serialization of a given JSON value
-
-    Serializes a given JSON value @a j to a byte vector using the UBJSON
-    (Universal Binary JSON) serialization format. UBJSON aims to be more compact
-    than JSON itself, yet more efficient to parse.
-
-    The library uses the following mapping from JSON values types to
-    UBJSON types according to the UBJSON specification:
-
-    JSON value type | value/range                       | UBJSON type | marker
-    --------------- | --------------------------------- | ----------- | ------
-    null            | `null`                            | null        | `Z`
-    boolean         | `true`                            | true        | `T`
-    boolean         | `false`                           | false       | `F`
-    number_integer  | -9223372036854775808..-2147483649 | int64       | `L`
-    number_integer  | -2147483648..-32769               | int32       | `l`
-    number_integer  | -32768..-129                      | int16       | `I`
-    number_integer  | -128..127                         | int8        | `i`
-    number_integer  | 128..255                          | uint8       | `U`
-    number_integer  | 256..32767                        | int16       | `I`
-    number_integer  | 32768..2147483647                 | int32       | `l`
-    number_integer  | 2147483648..9223372036854775807   | int64       | `L`
-    number_unsigned | 0..127                            | int8        | `i`
-    number_unsigned | 128..255                          | uint8       | `U`
-    number_unsigned | 256..32767                        | int16       | `I`
-    number_unsigned | 32768..2147483647                 | int32       | `l`
-    number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
-    number_float    | *any value*                       | float64     | `D`
-    string          | *with shortest length indicator*  | string      | `S`
-    array           | *see notes on optimized format*   | array       | `[`
-    object          | *see notes on optimized format*   | map         | `{`
-
-    @note The mapping is **complete** in the sense that any JSON value type
-          can be converted to a UBJSON value.
-
-    @note The following values can **not** be converted to a UBJSON value:
-          - strings with more than 9223372036854775807 bytes (theoretical)
-          - unsigned integer numbers above 9223372036854775807
-
-    @note The following markers are not used in the conversion:
-          - `Z`: no-op values are not created.
-          - `C`: single-byte strings are serialized with `S` markers.
-
-    @note Any UBJSON output created @ref to_ubjson can be successfully parsed
-          by @ref from_ubjson.
-
-    @note If NaN or Infinity are stored inside a JSON number, they are
-          serialized properly. This behavior differs from the @ref dump()
-          function which serializes NaN or Infinity to `null`.
-
-    @note The optimized formats for containers are supported: Parameter
-          @a use_size adds size information to the beginning of a container and
-          removes the closing marker. Parameter @a use_type further checks
-          whether all elements of a container have the same type and adds the
-          type marker to the beginning of the container. The @a use_type
-          parameter must only be used together with @a use_size = true. Note
-          that @a use_size = true alone may result in larger representations -
-          the benefit of this parameter is that the receiving side is
-          immediately informed on the number of elements of the container.
-
-    @param[in] j  JSON value to serialize
-    @param[in] use_size  whether to add size annotations to container types
-    @param[in] use_type  whether to add type annotations to container types
-                         (must be combined with @a use_size = true)
-    @return UBJSON serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in UBJSON format.,to_ubjson}
-
-    @sa http://ubjson.org
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
-        analogous deserialization
-    @sa @ref to_cbor(const basic_json& for the related CBOR format
-    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
-
-    @since version 3.1.0
-    */
-    static std::vector<uint8_t> to_ubjson(const basic_json& j,
-                                          const bool use_size = false,
-                                          const bool use_type = false)
-    {
-        std::vector<uint8_t> result;
-        to_ubjson(j, result, use_size, use_type);
-        return result;
-    }
-
-    static void to_ubjson(const basic_json& j, detail::output_adapter<uint8_t> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<uint8_t>(o).write_ubjson(j, use_size, use_type);
-    }
-
-    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
-                          const bool use_size = false, const bool use_type = false)
-    {
-        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
-    }
-
-
-    /*!
-    @brief Serializes the given JSON object `j` to BSON and returns a vector
-           containing the corresponding BSON-representation.
-
-    BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are
-    stored as a single entity (a so-called document).
-
-    The library uses the following mapping from JSON values types to BSON types:
-
-    JSON value type | value/range                       | BSON type   | marker
-    --------------- | --------------------------------- | ----------- | ------
-    null            | `null`                            | null        | 0x0A
-    boolean         | `true`, `false`                   | boolean     | 0x08
-    number_integer  | -9223372036854775808..-2147483649 | int64       | 0x12
-    number_integer  | -2147483648..2147483647           | int32       | 0x10
-    number_integer  | 2147483648..9223372036854775807   | int64       | 0x12
-    number_unsigned | 0..2147483647                     | int32       | 0x10
-    number_unsigned | 2147483648..9223372036854775807   | int64       | 0x12
-    number_unsigned | 9223372036854775808..18446744073709551615| --   | --
-    number_float    | *any value*                       | double      | 0x01
-    string          | *any value*                       | string      | 0x02
-    array           | *any value*                       | document    | 0x04
-    object          | *any value*                       | document    | 0x03
-
-    @warning The mapping is **incomplete**, since only JSON-objects (and things
-    contained therein) can be serialized to BSON.
-    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
-    and the keys may not contain U+0000, since they are serialized a
-    zero-terminated c-strings.
-
-    @throw out_of_range.407  if `j.is_number_unsigned() && j.get<std::uint64_t>() > 9223372036854775807`
-    @throw out_of_range.409  if a key in `j` contains a NULL (U+0000)
-    @throw type_error.317    if `!j.is_object()`
-
-    @pre The input `j` is required to be an object: `j.is_object() == true`.
-
-    @note Any BSON output created via @ref to_bson can be successfully parsed
-          by @ref from_bson.
-
-    @param[in] j  JSON value to serialize
-    @return BSON serialization as byte vector
-
-    @complexity Linear in the size of the JSON value @a j.
-
-    @liveexample{The example shows the serialization of a JSON value to a byte
-    vector in BSON format.,to_bson}
-
-    @sa http://bsonspec.org/spec.html
-    @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the
-        analogous deserialization
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             related UBJSON format
-    @sa @ref to_cbor(const basic_json&) for the related CBOR format
-    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
-    */
-    static std::vector<uint8_t> to_bson(const basic_json& j)
-    {
-        std::vector<uint8_t> result;
-        to_bson(j, result);
-        return result;
-    }
-
-    /*!
-    @brief Serializes the given JSON object `j` to BSON and forwards the
-           corresponding BSON-representation to the given output_adapter `o`.
-    @param j The JSON object to convert to BSON.
-    @param o The output adapter that receives the binary BSON representation.
-    @pre The input `j` shall be an object: `j.is_object() == true`
-    @sa @ref to_bson(const basic_json&)
-    */
-    static void to_bson(const basic_json& j, detail::output_adapter<uint8_t> o)
-    {
-        binary_writer<uint8_t>(o).write_bson(j);
-    }
-
-    /*!
-    @copydoc to_bson(const basic_json&, detail::output_adapter<uint8_t>)
-    */
-    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
-    {
-        binary_writer<char>(o).write_bson(j);
-    }
-
-
-    /*!
-    @brief create a JSON value from an input in CBOR format
-
-    Deserializes a given input @a i to a JSON value using the CBOR (Concise
-    Binary Object Representation) serialization format.
-
-    The library maps CBOR types to JSON value types as follows:
-
-    CBOR type              | JSON value type | first byte
-    ---------------------- | --------------- | ----------
-    Integer                | number_unsigned | 0x00..0x17
-    Unsigned integer       | number_unsigned | 0x18
-    Unsigned integer       | number_unsigned | 0x19
-    Unsigned integer       | number_unsigned | 0x1A
-    Unsigned integer       | number_unsigned | 0x1B
-    Negative integer       | number_integer  | 0x20..0x37
-    Negative integer       | number_integer  | 0x38
-    Negative integer       | number_integer  | 0x39
-    Negative integer       | number_integer  | 0x3A
-    Negative integer       | number_integer  | 0x3B
-    Negative integer       | number_integer  | 0x40..0x57
-    UTF-8 string           | string          | 0x60..0x77
-    UTF-8 string           | string          | 0x78
-    UTF-8 string           | string          | 0x79
-    UTF-8 string           | string          | 0x7A
-    UTF-8 string           | string          | 0x7B
-    UTF-8 string           | string          | 0x7F
-    array                  | array           | 0x80..0x97
-    array                  | array           | 0x98
-    array                  | array           | 0x99
-    array                  | array           | 0x9A
-    array                  | array           | 0x9B
-    array                  | array           | 0x9F
-    map                    | object          | 0xA0..0xB7
-    map                    | object          | 0xB8
-    map                    | object          | 0xB9
-    map                    | object          | 0xBA
-    map                    | object          | 0xBB
-    map                    | object          | 0xBF
-    False                  | `false`         | 0xF4
-    True                   | `true`          | 0xF5
-    Null                   | `null`          | 0xF6
-    Half-Precision Float   | number_float    | 0xF9
-    Single-Precision Float | number_float    | 0xFA
-    Double-Precision Float | number_float    | 0xFB
-
-    @warning The mapping is **incomplete** in the sense that not all CBOR
-             types can be converted to a JSON value. The following CBOR types
-             are not supported and will yield parse errors (parse_error.112):
-             - byte strings (0x40..0x5F)
-             - date/time (0xC0..0xC1)
-             - bignum (0xC2..0xC3)
-             - decimal fraction (0xC4)
-             - bigfloat (0xC5)
-             - tagged items (0xC6..0xD4, 0xD8..0xDB)
-             - expected conversions (0xD5..0xD7)
-             - simple values (0xE0..0xF3, 0xF8)
-             - undefined (0xF7)
-
-    @warning CBOR allows map keys of any type, whereas JSON only allows
-             strings as keys in object values. Therefore, CBOR maps with keys
-             other than UTF-8 strings are rejected (parse_error.113).
-
-    @note Any CBOR output created @ref to_cbor can be successfully parsed by
-          @ref from_cbor.
-
-    @param[in] i  an input in CBOR format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if unsupported features from CBOR were
-    used in the given input @a v or if the input is not valid CBOR
-    @throw parse_error.113 if a string was expected as map key, but not found
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in CBOR
-    format to a JSON value.,from_cbor}
-
-    @sa http://cbor.io
-    @sa @ref to_cbor(const basic_json&) for the analogous serialization
-    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the
-        related MessagePack format
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
-        related UBJSON format
-
-    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
-           consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
-           since 3.2.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_cbor(detail::input_adapter&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::cbor, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @copydoc from_cbor(detail::input_adapter&&, const bool, const bool)
-    */
-    template<typename A1, typename A2,
-             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_cbor(A1 && a1, A2 && a2,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::cbor, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @brief create a JSON value from an input in MessagePack format
-
-    Deserializes a given input @a i to a JSON value using the MessagePack
-    serialization format.
-
-    The library maps MessagePack types to JSON value types as follows:
-
-    MessagePack type | JSON value type | first byte
-    ---------------- | --------------- | ----------
-    positive fixint  | number_unsigned | 0x00..0x7F
-    fixmap           | object          | 0x80..0x8F
-    fixarray         | array           | 0x90..0x9F
-    fixstr           | string          | 0xA0..0xBF
-    nil              | `null`          | 0xC0
-    false            | `false`         | 0xC2
-    true             | `true`          | 0xC3
-    float 32         | number_float    | 0xCA
-    float 64         | number_float    | 0xCB
-    uint 8           | number_unsigned | 0xCC
-    uint 16          | number_unsigned | 0xCD
-    uint 32          | number_unsigned | 0xCE
-    uint 64          | number_unsigned | 0xCF
-    int 8            | number_integer  | 0xD0
-    int 16           | number_integer  | 0xD1
-    int 32           | number_integer  | 0xD2
-    int 64           | number_integer  | 0xD3
-    str 8            | string          | 0xD9
-    str 16           | string          | 0xDA
-    str 32           | string          | 0xDB
-    array 16         | array           | 0xDC
-    array 32         | array           | 0xDD
-    map 16           | object          | 0xDE
-    map 32           | object          | 0xDF
-    negative fixint  | number_integer  | 0xE0-0xFF
-
-    @warning The mapping is **incomplete** in the sense that not all
-             MessagePack types can be converted to a JSON value. The following
-             MessagePack types are not supported and will yield parse errors:
-              - bin 8 - bin 32 (0xC4..0xC6)
-              - ext 8 - ext 32 (0xC7..0xC9)
-              - fixext 1 - fixext 16 (0xD4..0xD8)
-
-    @note Any MessagePack output created @ref to_msgpack can be successfully
-          parsed by @ref from_msgpack.
-
-    @param[in] i  an input in MessagePack format convertible to an input
-                  adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if unsupported features from MessagePack were
-    used in the given input @a i or if the input is not valid MessagePack
-    @throw parse_error.113 if a string was expected as map key, but not found
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    MessagePack format to a JSON value.,from_msgpack}
-
-    @sa http://msgpack.org
-    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
-        related CBOR format
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for
-        the related UBJSON format
-    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
-        the related BSON format
-
-    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
-           consume input adapters, removed start_index parameter, and added
-           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
-           since 3.2.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_msgpack(detail::input_adapter&& i,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool)
-    */
-    template<typename A1, typename A2,
-             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_msgpack(A1 && a1, A2 && a2,
-                                   const bool strict = true,
-                                   const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::msgpack, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @brief create a JSON value from an input in UBJSON format
-
-    Deserializes a given input @a i to a JSON value using the UBJSON (Universal
-    Binary JSON) serialization format.
-
-    The library maps UBJSON types to JSON value types as follows:
-
-    UBJSON type | JSON value type                         | marker
-    ----------- | --------------------------------------- | ------
-    no-op       | *no value, next value is read*          | `N`
-    null        | `null`                                  | `Z`
-    false       | `false`                                 | `F`
-    true        | `true`                                  | `T`
-    float32     | number_float                            | `d`
-    float64     | number_float                            | `D`
-    uint8       | number_unsigned                         | `U`
-    int8        | number_integer                          | `i`
-    int16       | number_integer                          | `I`
-    int32       | number_integer                          | `l`
-    int64       | number_integer                          | `L`
-    string      | string                                  | `S`
-    char        | string                                  | `C`
-    array       | array (optimized values are supported)  | `[`
-    object      | object (optimized values are supported) | `{`
-
-    @note The mapping is **complete** in the sense that any UBJSON value can
-          be converted to a JSON value.
-
-    @param[in] i  an input in UBJSON format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.110 if the given input ends prematurely or the end of
-    file was not reached when @a strict was set to true
-    @throw parse_error.112 if a parse error occurs
-    @throw parse_error.113 if a string could not be parsed successfully
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    UBJSON format to a JSON value.,from_ubjson}
-
-    @sa http://ubjson.org
-    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
-             analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
-        related CBOR format
-    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
-        the related MessagePack format
-    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
-        the related BSON format
-
-    @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_ubjson(detail::input_adapter&& i,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool)
-    */
-    template<typename A1, typename A2,
-             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_ubjson(A1 && a1, A2 && a2,
-                                  const bool strict = true,
-                                  const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::ubjson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @brief Create a JSON value from an input in BSON format
-
-    Deserializes a given input @a i to a JSON value using the BSON (Binary JSON)
-    serialization format.
-
-    The library maps BSON record types to JSON value types as follows:
-
-    BSON type       | BSON marker byte | JSON value type
-    --------------- | ---------------- | ---------------------------
-    double          | 0x01             | number_float
-    string          | 0x02             | string
-    document        | 0x03             | object
-    array           | 0x04             | array
-    binary          | 0x05             | still unsupported
-    undefined       | 0x06             | still unsupported
-    ObjectId        | 0x07             | still unsupported
-    boolean         | 0x08             | boolean
-    UTC Date-Time   | 0x09             | still unsupported
-    null            | 0x0A             | null
-    Regular Expr.   | 0x0B             | still unsupported
-    DB Pointer      | 0x0C             | still unsupported
-    JavaScript Code | 0x0D             | still unsupported
-    Symbol          | 0x0E             | still unsupported
-    JavaScript Code | 0x0F             | still unsupported
-    int32           | 0x10             | number_integer
-    Timestamp       | 0x11             | still unsupported
-    128-bit decimal float | 0x13       | still unsupported
-    Max Key         | 0x7F             | still unsupported
-    Min Key         | 0xFF             | still unsupported
-
-    @warning The mapping is **incomplete**. The unsupported mappings
-             are indicated in the table above.
-
-    @param[in] i  an input in BSON format convertible to an input adapter
-    @param[in] strict  whether to expect the input to be consumed until EOF
-                       (true by default)
-    @param[in] allow_exceptions  whether to throw exceptions in case of a
-    parse error (optional, true by default)
-
-    @return deserialized JSON value; in case of a parse error and
-            @a allow_exceptions set to `false`, the return value will be
-            value_t::discarded.
-
-    @throw parse_error.114 if an unsupported BSON record type is encountered
-
-    @complexity Linear in the size of the input @a i.
-
-    @liveexample{The example shows the deserialization of a byte vector in
-    BSON format to a JSON value.,from_bson}
-
-    @sa http://bsonspec.org/spec.html
-    @sa @ref to_bson(const basic_json&) for the analogous serialization
-    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool) for the
-        related CBOR format
-    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
-        the related MessagePack format
-    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
-        related UBJSON format
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bson(detail::input_adapter&& i,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(i)).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-    /*!
-    @copydoc from_bson(detail::input_adapter&&, const bool, const bool)
-    */
-    template<typename A1, typename A2,
-             detail::enable_if_t<std::is_constructible<detail::input_adapter, A1, A2>::value, int> = 0>
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json from_bson(A1 && a1, A2 && a2,
-                                const bool strict = true,
-                                const bool allow_exceptions = true)
-    {
-        basic_json result;
-        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
-        const bool res = binary_reader(detail::input_adapter(std::forward<A1>(a1), std::forward<A2>(a2))).sax_parse(input_format_t::bson, &sdp, strict);
-        return res ? result : basic_json(value_t::discarded);
-    }
-
-
-
-    /// @}
-
-    //////////////////////////
-    // JSON Pointer support //
-    //////////////////////////
-
-    /// @name JSON Pointer functions
-    /// @{
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. Similar to @ref operator[](const typename
-    object_t::key_type&), `null` values are created in arrays and objects if
-    necessary.
-
-    In particular:
-    - If the JSON pointer points to an object key that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned.
-    - If the JSON pointer points to an array index that does not exist, it
-      is created an filled with a `null` value before a reference to it
-      is returned. All indices between the current maximum and the given
-      index are also filled with `null`.
-    - The special value `-` is treated as a synonym for the index past the
-      end.
-
-    @param[in] ptr  a JSON pointer
-
-    @return reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer}
-
-    @since version 2.0.0
-    */
-    reference operator[](const json_pointer& ptr)
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Uses a JSON pointer to retrieve a reference to the respective JSON value.
-    No bound checking is performed. The function does not change the JSON
-    value; no `null` values are created. In particular, the the special value
-    `-` yields an exception.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return const reference to the element pointed to by @a ptr
-
-    @complexity Constant.
-
-    @throw parse_error.106   if an array index begins with '0'
-    @throw parse_error.109   if an array index was not a number
-    @throw out_of_range.402  if the array index '-' is used
-    @throw out_of_range.404  if the JSON pointer can not be resolved
-
-    @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
-
-    @since version 2.0.0
-    */
-    const_reference operator[](const json_pointer& ptr) const
-    {
-        return ptr.get_unchecked(this);
-    }
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a reference to the element at with specified JSON pointer @a ptr,
-    with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
-    begins with '0'. See example below.
-
-    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
-    is not a number. See example below.
-
-    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
-    is out of range. See example below.
-
-    @throw out_of_range.402 if the array index '-' is used in the passed JSON
-    pointer @a ptr. As `at` provides checked access (and no elements are
-    implicitly inserted), the index '-' is always invalid. See example below.
-
-    @throw out_of_range.403 if the JSON pointer describes a key of an object
-    which cannot be found. See example below.
-
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
-    See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 2.0.0
-
-    @liveexample{The behavior is shown in the example.,at_json_pointer}
-    */
-    reference at(const json_pointer& ptr)
-    {
-        return ptr.get_checked(this);
-    }
-
-    /*!
-    @brief access specified element via JSON Pointer
-
-    Returns a const reference to the element at with specified JSON pointer @a
-    ptr, with bounds checking.
-
-    @param[in] ptr  JSON pointer to the desired element
-
-    @return reference to the element pointed to by @a ptr
-
-    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
-    begins with '0'. See example below.
-
-    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
-    is not a number. See example below.
-
-    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
-    is out of range. See example below.
-
-    @throw out_of_range.402 if the array index '-' is used in the passed JSON
-    pointer @a ptr. As `at` provides checked access (and no elements are
-    implicitly inserted), the index '-' is always invalid. See example below.
-
-    @throw out_of_range.403 if the JSON pointer describes a key of an object
-    which cannot be found. See example below.
-
-    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
-    See example below.
-
-    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
-    changes in the JSON value.
-
-    @complexity Constant.
-
-    @since version 2.0.0
-
-    @liveexample{The behavior is shown in the example.,at_json_pointer_const}
-    */
-    const_reference at(const json_pointer& ptr) const
-    {
-        return ptr.get_checked(this);
-    }
-
-    /*!
-    @brief return flattened JSON value
-
-    The function creates a JSON object whose keys are JSON pointers (see [RFC
-    6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
-    primitive. The original JSON value can be restored using the @ref
-    unflatten() function.
-
-    @return an object that maps JSON pointers to primitive values
-
-    @note Empty objects and arrays are flattened to `null` and will not be
-          reconstructed correctly by the @ref unflatten() function.
-
-    @complexity Linear in the size the JSON value.
-
-    @liveexample{The following code shows how a JSON object is flattened to an
-    object whose keys consist of JSON pointers.,flatten}
-
-    @sa @ref unflatten() for the reverse function
-
-    @since version 2.0.0
-    */
-    basic_json flatten() const
-    {
-        basic_json result(value_t::object);
-        json_pointer::flatten("", *this, result);
-        return result;
-    }
-
-    /*!
-    @brief unflatten a previously flattened JSON value
-
-    The function restores the arbitrary nesting of a JSON value that has been
-    flattened before using the @ref flatten() function. The JSON value must
-    meet certain constraints:
-    1. The value must be an object.
-    2. The keys must be JSON pointers (see
-       [RFC 6901](https://tools.ietf.org/html/rfc6901))
-    3. The mapped values must be primitive JSON types.
-
-    @return the original JSON from a flattened version
-
-    @note Empty objects and arrays are flattened by @ref flatten() to `null`
-          values and can not unflattened to their original type. Apart from
-          this example, for a JSON value `j`, the following is always true:
-          `j == j.flatten().unflatten()`.
-
-    @complexity Linear in the size the JSON value.
-
-    @throw type_error.314  if value is not an object
-    @throw type_error.315  if object values are not primitive
-
-    @liveexample{The following code shows how a flattened JSON object is
-    unflattened into the original nested JSON object.,unflatten}
-
-    @sa @ref flatten() for the reverse function
-
-    @since version 2.0.0
-    */
-    basic_json unflatten() const
-    {
-        return json_pointer::unflatten(*this);
-    }
-
-    /// @}
-
-    //////////////////////////
-    // JSON Patch functions //
-    //////////////////////////
-
-    /// @name JSON Patch functions
-    /// @{
-
-    /*!
-    @brief applies a JSON patch
-
-    [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
-    expressing a sequence of operations to apply to a JSON) document. With
-    this function, a JSON Patch is applied to the current JSON value by
-    executing all operations from the patch.
-
-    @param[in] json_patch  JSON patch document
-    @return patched document
-
-    @note The application of a patch is atomic: Either all operations succeed
-          and the patched document is returned or an exception is thrown. In
-          any case, the original value is not changed: the patch is applied
-          to a copy of the value.
-
-    @throw parse_error.104 if the JSON patch does not consist of an array of
-    objects
-
-    @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
-    attributes are missing); example: `"operation add must have member path"`
-
-    @throw out_of_range.401 if an array index is out of range.
-
-    @throw out_of_range.403 if a JSON pointer inside the patch could not be
-    resolved successfully in the current JSON value; example: `"key baz not
-    found"`
-
-    @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
-    "move")
-
-    @throw other_error.501 if "test" operation was unsuccessful
-
-    @complexity Linear in the size of the JSON value and the length of the
-    JSON patch. As usually only a fraction of the JSON value is affected by
-    the patch, the complexity can usually be neglected.
-
-    @liveexample{The following code shows how a JSON patch is applied to a
-    value.,patch}
-
-    @sa @ref diff -- create a JSON patch by comparing two JSON values
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-    @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
-
-    @since version 2.0.0
-    */
-    basic_json patch(const basic_json& json_patch) const
-    {
-        // make a working copy to apply the patch to
-        basic_json result = *this;
-
-        // the valid JSON Patch operations
-        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
-
-        const auto get_op = [](const std::string & op)
-        {
-            if (op == "add")
-            {
-                return patch_operations::add;
-            }
-            if (op == "remove")
-            {
-                return patch_operations::remove;
-            }
-            if (op == "replace")
-            {
-                return patch_operations::replace;
-            }
-            if (op == "move")
-            {
-                return patch_operations::move;
-            }
-            if (op == "copy")
-            {
-                return patch_operations::copy;
-            }
-            if (op == "test")
-            {
-                return patch_operations::test;
-            }
-
-            return patch_operations::invalid;
-        };
-
-        // wrapper for "add" operation; add value at ptr
-        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
-        {
-            // adding to the root of the target document means replacing it
-            if (ptr.empty())
-            {
-                result = val;
-                return;
-            }
-
-            // make sure the top element of the pointer exists
-            json_pointer top_pointer = ptr.top();
-            if (top_pointer != ptr)
-            {
-                result.at(top_pointer);
-            }
-
-            // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.back();
-            ptr.pop_back();
-            basic_json& parent = result[ptr];
-
-            switch (parent.m_type)
-            {
-                case value_t::null:
-                case value_t::object:
-                {
-                    // use operator[] to add value
-                    parent[last_path] = val;
-                    break;
-                }
-
-                case value_t::array:
-                {
-                    if (last_path == "-")
-                    {
-                        // special case: append to back
-                        parent.push_back(val);
-                    }
-                    else
-                    {
-                        const auto idx = json_pointer::array_index(last_path);
-                        if (JSON_HEDLEY_UNLIKELY(static_cast<size_type>(idx) > parent.size()))
-                        {
-                            // avoid undefined behavior
-                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
-                        }
-
-                        // default case: insert add offset
-                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
-                    }
-                    break;
-                }
-
-                // if there exists a parent it cannot be primitive
-                default:            // LCOV_EXCL_LINE
-                    assert(false);  // LCOV_EXCL_LINE
-            }
-        };
-
-        // wrapper for "remove" operation; remove value at ptr
-        const auto operation_remove = [&result](json_pointer & ptr)
-        {
-            // get reference to parent of JSON pointer ptr
-            const auto last_path = ptr.back();
-            ptr.pop_back();
-            basic_json& parent = result.at(ptr);
-
-            // remove child
-            if (parent.is_object())
-            {
-                // perform range check
-                auto it = parent.find(last_path);
-                if (JSON_HEDLEY_LIKELY(it != parent.end()))
-                {
-                    parent.erase(it);
-                }
-                else
-                {
-                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found"));
-                }
-            }
-            else if (parent.is_array())
-            {
-                // note erase performs range check
-                parent.erase(static_cast<size_type>(json_pointer::array_index(last_path)));
-            }
-        };
-
-        // type check: top level value must be an array
-        if (JSON_HEDLEY_UNLIKELY(not json_patch.is_array()))
-        {
-            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
-        }
-
-        // iterate and apply the operations
-        for (const auto& val : json_patch)
-        {
-            // wrapper to get a value for an operation
-            const auto get_value = [&val](const std::string & op,
-                                          const std::string & member,
-                                          bool string_type) -> basic_json &
-            {
-                // find value
-                auto it = val.m_value.object->find(member);
-
-                // context-sensitive error message
-                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
-
-                // check if desired value is present
-                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
-                {
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'"));
-                }
-
-                // check if result is of type string
-                if (JSON_HEDLEY_UNLIKELY(string_type and not it->second.is_string()))
-                {
-                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'"));
-                }
-
-                // no error: return value
-                return it->second;
-            };
-
-            // type check: every element of the array must be an object
-            if (JSON_HEDLEY_UNLIKELY(not val.is_object()))
-            {
-                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
-            }
-
-            // collect mandatory members
-            const std::string op = get_value("op", "op", true);
-            const std::string path = get_value(op, "path", true);
-            json_pointer ptr(path);
-
-            switch (get_op(op))
-            {
-                case patch_operations::add:
-                {
-                    operation_add(ptr, get_value("add", "value", false));
-                    break;
-                }
-
-                case patch_operations::remove:
-                {
-                    operation_remove(ptr);
-                    break;
-                }
-
-                case patch_operations::replace:
-                {
-                    // the "path" location must exist - use at()
-                    result.at(ptr) = get_value("replace", "value", false);
-                    break;
-                }
-
-                case patch_operations::move:
-                {
-                    const std::string from_path = get_value("move", "from", true);
-                    json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
-
-                    // The move operation is functionally identical to a
-                    // "remove" operation on the "from" location, followed
-                    // immediately by an "add" operation at the target
-                    // location with the value that was just removed.
-                    operation_remove(from_ptr);
-                    operation_add(ptr, v);
-                    break;
-                }
-
-                case patch_operations::copy:
-                {
-                    const std::string from_path = get_value("copy", "from", true);
-                    const json_pointer from_ptr(from_path);
-
-                    // the "from" location must exist - use at()
-                    basic_json v = result.at(from_ptr);
-
-                    // The copy is functionally identical to an "add"
-                    // operation at the target location using the value
-                    // specified in the "from" member.
-                    operation_add(ptr, v);
-                    break;
-                }
-
-                case patch_operations::test:
-                {
-                    bool success = false;
-                    JSON_TRY
-                    {
-                        // check if "value" matches the one at "path"
-                        // the "path" location must exist - use at()
-                        success = (result.at(ptr) == get_value("test", "value", false));
-                    }
-                    JSON_INTERNAL_CATCH (out_of_range&)
-                    {
-                        // ignore out of range errors: success remains false
-                    }
-
-                    // throw an exception if test fails
-                    if (JSON_HEDLEY_UNLIKELY(not success))
-                    {
-                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump()));
-                    }
-
-                    break;
-                }
-
-                default:
-                {
-                    // op must be "add", "remove", "replace", "move", "copy", or
-                    // "test"
-                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid"));
-                }
-            }
-        }
-
-        return result;
-    }
-
-    /*!
-    @brief creates a diff as a JSON patch
-
-    Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
-    be changed into the value @a target by calling @ref patch function.
-
-    @invariant For two JSON values @a source and @a target, the following code
-    yields always `true`:
-    @code {.cpp}
-    source.patch(diff(source, target)) == target;
-    @endcode
-
-    @note Currently, only `remove`, `add`, and `replace` operations are
-          generated.
-
-    @param[in] source  JSON value to compare from
-    @param[in] target  JSON value to compare against
-    @param[in] path    helper value to create JSON pointers
-
-    @return a JSON patch to convert the @a source to @a target
-
-    @complexity Linear in the lengths of @a source and @a target.
-
-    @liveexample{The following code shows how a JSON patch is created as a
-    diff for two JSON values.,diff}
-
-    @sa @ref patch -- apply a JSON patch
-    @sa @ref merge_patch -- apply a JSON Merge Patch
-
-    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
-
-    @since version 2.0.0
-    */
-    JSON_HEDLEY_WARN_UNUSED_RESULT
-    static basic_json diff(const basic_json& source, const basic_json& target,
-                           const std::string& path = "")
-    {
-        // the patch
-        basic_json result(value_t::array);
-
-        // if the values are the same, return empty patch
-        if (source == target)
-        {
-            return result;
-        }
-
-        if (source.type() != target.type())
-        {
-            // different types: replace value
-            result.push_back(
-            {
-                {"op", "replace"}, {"path", path}, {"value", target}
-            });
-            return result;
-        }
-
-        switch (source.type())
-        {
-            case value_t::array:
-            {
-                // first pass: traverse common elements
-                std::size_t i = 0;
-                while (i < source.size() and i < target.size())
-                {
-                    // recursive call to compare array values at index i
-                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
-                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                    ++i;
-                }
-
-                // i now reached the end of at least one array
-                // in a second pass, traverse the remaining elements
-
-                // remove my remaining elements
-                const auto end_index = static_cast<difference_type>(result.size());
-                while (i < source.size())
-                {
-                    // add operations in reverse order to avoid invalid
-                    // indices
-                    result.insert(result.begin() + end_index, object(
-                    {
-                        {"op", "remove"},
-                        {"path", path + "/" + std::to_string(i)}
-                    }));
-                    ++i;
-                }
-
-                // add other remaining elements
-                while (i < target.size())
-                {
-                    result.push_back(
-                    {
-                        {"op", "add"},
-                        {"path", path + "/" + std::to_string(i)},
-                        {"value", target[i]}
-                    });
-                    ++i;
-                }
-
-                break;
-            }
-
-            case value_t::object:
-            {
-                // first pass: traverse this object's elements
-                for (auto it = source.cbegin(); it != source.cend(); ++it)
-                {
-                    // escape the key name to be used in a JSON patch
-                    const auto key = json_pointer::escape(it.key());
-
-                    if (target.find(it.key()) != target.end())
-                    {
-                        // recursive call to compare object values at key it
-                        auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
-                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
-                    }
-                    else
-                    {
-                        // found a key that is not in o -> remove it
-                        result.push_back(object(
-                        {
-                            {"op", "remove"}, {"path", path + "/" + key}
-                        }));
-                    }
-                }
-
-                // second pass: traverse other object's elements
-                for (auto it = target.cbegin(); it != target.cend(); ++it)
-                {
-                    if (source.find(it.key()) == source.end())
-                    {
-                        // found a key that is not in this -> add it
-                        const auto key = json_pointer::escape(it.key());
-                        result.push_back(
-                        {
-                            {"op", "add"}, {"path", path + "/" + key},
-                            {"value", it.value()}
-                        });
-                    }
-                }
-
-                break;
-            }
-
-            default:
-            {
-                // both primitive type: replace value
-                result.push_back(
-                {
-                    {"op", "replace"}, {"path", path}, {"value", target}
-                });
-                break;
-            }
-        }
-
-        return result;
-    }
-
-    /// @}
-
-    ////////////////////////////////
-    // JSON Merge Patch functions //
-    ////////////////////////////////
-
-    /// @name JSON Merge Patch functions
-    /// @{
-
-    /*!
-    @brief applies a JSON Merge Patch
-
-    The merge patch format is primarily intended for use with the HTTP PATCH
-    method as a means of describing a set of modifications to a target
-    resource's content. This function applies a merge patch to the current
-    JSON value.
-
-    The function implements the following algorithm from Section 2 of
-    [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396):
-
-    ```
-    define MergePatch(Target, Patch):
-      if Patch is an Object:
-        if Target is not an Object:
-          Target = {} // Ignore the contents and set it to an empty Object
-        for each Name/Value pair in Patch:
-          if Value is null:
-            if Name exists in Target:
-              remove the Name/Value pair from Target
-          else:
-            Target[Name] = MergePatch(Target[Name], Value)
-        return Target
-      else:
-        return Patch
-    ```
-
-    Thereby, `Target` is the current object; that is, the patch is applied to
-    the current value.
-
-    @param[in] apply_patch  the patch to apply
-
-    @complexity Linear in the lengths of @a patch.
-
-    @liveexample{The following code shows how a JSON Merge Patch is applied to
-    a JSON document.,merge_patch}
-
-    @sa @ref patch -- apply a JSON patch
-    @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
-
-    @since version 3.0.0
-    */
-    void merge_patch(const basic_json& apply_patch)
-    {
-        if (apply_patch.is_object())
-        {
-            if (not is_object())
-            {
-                *this = object();
-            }
-            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
-            {
-                if (it.value().is_null())
-                {
-                    erase(it.key());
-                }
-                else
-                {
-                    operator[](it.key()).merge_patch(it.value());
-                }
-            }
-        }
-        else
-        {
-            *this = apply_patch;
-        }
-    }
-
-    /// @}
-};
-
-/*!
-@brief user-defined to_string function for JSON values
-
-This function implements a user-defined to_string  for JSON objects.
-
-@param[in] j  a JSON object
-@return a std::string object
-*/
-
-NLOHMANN_BASIC_JSON_TPL_DECLARATION
-std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
-{
-    return j.dump();
-}
-} // namespace nlohmann
-
-///////////////////////
-// nonmember support //
-///////////////////////
-
-// specialization of std::swap, and std::hash
-namespace std
-{
-
-/// hash value for JSON objects
-template<>
-struct hash<nlohmann::json>
-{
-    /*!
-    @brief return a hash value for a JSON object
-
-    @since version 1.0.0
-    */
-    std::size_t operator()(const nlohmann::json& j) const
-    {
-        // a naive hashing via the string representation
-        const auto& h = hash<nlohmann::json::string_t>();
-        return h(j.dump());
-    }
-};
-
-/// specialization for std::less<value_t>
-/// @note: do not remove the space after '<',
-///        see https://github.com/nlohmann/json/pull/679
-template<>
-struct less<::nlohmann::detail::value_t>
-{
-    /*!
-    @brief compare two value_t enum values
-    @since version 3.0.0
-    */
-    bool operator()(nlohmann::detail::value_t lhs,
-                    nlohmann::detail::value_t rhs) const noexcept
-    {
-        return nlohmann::detail::operator<(lhs, rhs);
-    }
-};
-
-/*!
-@brief exchanges the values of two JSON objects
-
-@since version 1.0.0
-*/
-template<>
-inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
-    is_nothrow_move_constructible<nlohmann::json>::value and
-    is_nothrow_move_assignable<nlohmann::json>::value
-)
-{
-    j1.swap(j2);
-}
-
-} // namespace std
-
-/*!
-@brief user-defined string literal for JSON values
-
-This operator implements a user-defined string literal for JSON objects. It
-can be used by adding `"_json"` to a string literal and returns a JSON object
-if no parse error occurred.
-
-@param[in] s  a string representation of a JSON object
-@param[in] n  the length of string @a s
-@return a JSON object
-
-@since version 1.0.0
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json operator "" _json(const char* s, std::size_t n)
-{
-    return nlohmann::json::parse(s, s + n);
-}
-
-/*!
-@brief user-defined string literal for JSON pointer
-
-This operator implements a user-defined string literal for JSON Pointers. It
-can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
-object if no parse error occurred.
-
-@param[in] s  a string representation of a JSON Pointer
-@param[in] n  the length of string @a s
-@return a JSON pointer object
-
-@since version 2.0.0
-*/
-JSON_HEDLEY_NON_NULL(1)
-inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
-{
-    return nlohmann::json::json_pointer(std::string(s, n));
-}
-
-// #include <nlohmann/detail/macro_unscope.hpp>
-
-
-// restore GCC/clang diagnostic settings
-#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
-    #pragma GCC diagnostic pop
-#endif
-#if defined(__clang__)
-    #pragma GCC diagnostic pop
-#endif
-
-// clean up
-#undef JSON_INTERNAL_CATCH
-#undef JSON_CATCH
-#undef JSON_THROW
-#undef JSON_TRY
-#undef JSON_HAS_CPP_14
-#undef JSON_HAS_CPP_17
-#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
-#undef NLOHMANN_BASIC_JSON_TPL
-
-// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
-#undef JSON_HEDLEY_ALWAYS_INLINE
-#undef JSON_HEDLEY_ARM_VERSION
-#undef JSON_HEDLEY_ARM_VERSION_CHECK
-#undef JSON_HEDLEY_ARRAY_PARAM
-#undef JSON_HEDLEY_ASSUME
-#undef JSON_HEDLEY_BEGIN_C_DECLS
-#undef JSON_HEDLEY_C_DECL
-#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
-#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
-#undef JSON_HEDLEY_CLANG_HAS_FEATURE
-#undef JSON_HEDLEY_CLANG_HAS_WARNING
-#undef JSON_HEDLEY_COMPCERT_VERSION
-#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
-#undef JSON_HEDLEY_CONCAT
-#undef JSON_HEDLEY_CONCAT_EX
-#undef JSON_HEDLEY_CONST
-#undef JSON_HEDLEY_CONST_CAST
-#undef JSON_HEDLEY_CONSTEXPR
-#undef JSON_HEDLEY_CPP_CAST
-#undef JSON_HEDLEY_CRAY_VERSION
-#undef JSON_HEDLEY_CRAY_VERSION_CHECK
-#undef JSON_HEDLEY_DEPRECATED
-#undef JSON_HEDLEY_DEPRECATED_FOR
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
-#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
-#undef JSON_HEDLEY_DIAGNOSTIC_POP
-#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
-#undef JSON_HEDLEY_DMC_VERSION
-#undef JSON_HEDLEY_DMC_VERSION_CHECK
-#undef JSON_HEDLEY_EMPTY_BASES
-#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
-#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
-#undef JSON_HEDLEY_END_C_DECLS
-#undef JSON_HEDLEY_FALL_THROUGH
-#undef JSON_HEDLEY_FLAGS
-#undef JSON_HEDLEY_FLAGS_CAST
-#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_BUILTIN
-#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_GCC_HAS_EXTENSION
-#undef JSON_HEDLEY_GCC_HAS_FEATURE
-#undef JSON_HEDLEY_GCC_HAS_WARNING
-#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
-#undef JSON_HEDLEY_GCC_VERSION
-#undef JSON_HEDLEY_GCC_VERSION_CHECK
-#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
-#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
-#undef JSON_HEDLEY_GNUC_HAS_FEATURE
-#undef JSON_HEDLEY_GNUC_HAS_WARNING
-#undef JSON_HEDLEY_GNUC_VERSION
-#undef JSON_HEDLEY_GNUC_VERSION_CHECK
-#undef JSON_HEDLEY_HAS_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_BUILTIN
-#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
-#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
-#undef JSON_HEDLEY_HAS_EXTENSION
-#undef JSON_HEDLEY_HAS_FEATURE
-#undef JSON_HEDLEY_HAS_WARNING
-#undef JSON_HEDLEY_IAR_VERSION
-#undef JSON_HEDLEY_IAR_VERSION_CHECK
-#undef JSON_HEDLEY_IBM_VERSION
-#undef JSON_HEDLEY_IBM_VERSION_CHECK
-#undef JSON_HEDLEY_IMPORT
-#undef JSON_HEDLEY_INLINE
-#undef JSON_HEDLEY_INTEL_VERSION
-#undef JSON_HEDLEY_INTEL_VERSION_CHECK
-#undef JSON_HEDLEY_IS_CONSTANT
-#undef JSON_HEDLEY_IS_CONSTEXPR_
-#undef JSON_HEDLEY_LIKELY
-#undef JSON_HEDLEY_MALLOC
-#undef JSON_HEDLEY_MESSAGE
-#undef JSON_HEDLEY_MSVC_VERSION
-#undef JSON_HEDLEY_MSVC_VERSION_CHECK
-#undef JSON_HEDLEY_NEVER_INLINE
-#undef JSON_HEDLEY_NO_ESCAPE
-#undef JSON_HEDLEY_NON_NULL
-#undef JSON_HEDLEY_NO_RETURN
-#undef JSON_HEDLEY_NO_THROW
-#undef JSON_HEDLEY_NULL
-#undef JSON_HEDLEY_PELLES_VERSION
-#undef JSON_HEDLEY_PELLES_VERSION_CHECK
-#undef JSON_HEDLEY_PGI_VERSION
-#undef JSON_HEDLEY_PGI_VERSION_CHECK
-#undef JSON_HEDLEY_PREDICT
-#undef JSON_HEDLEY_PRINTF_FORMAT
-#undef JSON_HEDLEY_PRIVATE
-#undef JSON_HEDLEY_PUBLIC
-#undef JSON_HEDLEY_PURE
-#undef JSON_HEDLEY_REINTERPRET_CAST
-#undef JSON_HEDLEY_REQUIRE
-#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
-#undef JSON_HEDLEY_REQUIRE_MSG
-#undef JSON_HEDLEY_RESTRICT
-#undef JSON_HEDLEY_RETURNS_NON_NULL
-#undef JSON_HEDLEY_SENTINEL
-#undef JSON_HEDLEY_STATIC_ASSERT
-#undef JSON_HEDLEY_STATIC_CAST
-#undef JSON_HEDLEY_STRINGIFY
-#undef JSON_HEDLEY_STRINGIFY_EX
-#undef JSON_HEDLEY_SUNPRO_VERSION
-#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
-#undef JSON_HEDLEY_TINYC_VERSION
-#undef JSON_HEDLEY_TINYC_VERSION_CHECK
-#undef JSON_HEDLEY_TI_VERSION
-#undef JSON_HEDLEY_TI_VERSION_CHECK
-#undef JSON_HEDLEY_UNAVAILABLE
-#undef JSON_HEDLEY_UNLIKELY
-#undef JSON_HEDLEY_UNPREDICTABLE
-#undef JSON_HEDLEY_UNREACHABLE
-#undef JSON_HEDLEY_UNREACHABLE_RETURN
-#undef JSON_HEDLEY_VERSION
-#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
-#undef JSON_HEDLEY_VERSION_DECODE_MINOR
-#undef JSON_HEDLEY_VERSION_DECODE_REVISION
-#undef JSON_HEDLEY_VERSION_ENCODE
-#undef JSON_HEDLEY_WARNING
-#undef JSON_HEDLEY_WARN_UNUSED_RESULT
-
-
-
-#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/makefile.uni b/projects/dvm_svn/tools/pppa/trunk/src/makefile.uni
deleted file mode 100644
index 7cc72b3..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/makefile.uni
+++ /dev/null
@@ -1,44 +0,0 @@
-BINDIR=../../../bin
-
-EXECUTABLES = dvmstf
-COPT=-c -I../../Zlib/include -std=c++11
-ZLIB	= zlib
-ZLIBDIR	= ../../Zlib/Release
-
-OBJS=\
-	inter.o  \
-	potensyn.o  \
-	statfile.o \
-	statread.o  \
-	treeinter.o \
-	statprintf.o \
-    stat.o \
-    statinter.o
-
-$(BINDIR)/$(EXECUTABLES): $(OBJS)
-	$(LINKER) -o $@ $(OBJS) -L$(ZLIBDIR) -l$(ZLIB)
-
-all:  $(BINDIR)/$(EXECUTABLES)
-	@echo "*** COMPILING EXECUTABLE $(EXECUTABLES) DONE"
-
-clean:
-	rm -f $(OBJS)
-cleanall:
-	rm -f $(OBJS)
-
-potensyn.o:
-	$(CXX) $(COPT) potensyn.cpp 
-inter.o:
-	$(CXX) $(COPT) inter.cpp
-statfile.o:
-	$(CXX) $(COPT) statfile.cpp
-statread.o:
-	$(CXX) $(COPT) statread.cpp
-treeinter.o:
-	$(CXX) $(COPT) treeinter.cpp
-statprintf.o:
-	$(CXX) $(COPT) statprintf.cpp
-stat.o:
-	$(CXX) $(COPT) stat.cpp
-statinter.o:
-	$(CXX) $(COPT) statinter.cpp    
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/makefile.win b/projects/dvm_svn/tools/pppa/trunk/src/makefile.win
deleted file mode 100644
index 4df058d..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/makefile.win
+++ /dev/null
@@ -1,46 +0,0 @@
-######################################
-### Automated created makefile.win ###
-######################################
-
-OUTDIR=..\obj
-BINDIR=..\..\..\bin
-ZLIB=zlib.lib
-ZLIBDIR=..\..\Zlib\Release
-
-EXECUTABLES = dvmstf
-
-LINK_FLAGS=/nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\$(EXECUTABLES).pdb" /out:"$(BINDIR)\$(EXECUTABLES).exe" 
-
-#COPT=/nologo /ML /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
-# /I "../../Zlib/Include"\
-# /Fp"$(OUTDIR)\tools.pch" /YX /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /c
-COPT=/nologo  /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
- /I "../../Zlib/Include"\
- /Fp"$(OUTDIR)\tools.pch" /Fo"$(OUTDIR)\\" /Fd"$(OUTDIR)\\" /c
-
-.cpp{$(OUTDIR)/}.obj:
-	$(CXX) $(COPT) $<
-
-OBJS=\
-	$(OUTDIR)\potensyn.obj \
-	$(OUTDIR)\inter.obj  \
-	$(OUTDIR)\statfile.obj \
-	$(OUTDIR)\statread.obj  \
-	$(OUTDIR)\treeinter.obj \
-	$(OUTDIR)\statprintf.obj \
-    $(OUTDIR)\stat.obj \
-    $(OUTDIR)\statinter.obj
-	
-$(BINDIR)/$(EXECUTABLES).exe: $(OBJS)
-	$(LINKER) @<<
-	$(LINK_FLAGS) $(OBJS)  $(ZLIBDIR)\$(ZLIB)
-<<
-
-all:  $(BINDIR)/$(EXECUTABLES).exe
-    @echo "*** COMPILING EXECUTABLE $(EXECUTABLES) DONE"
-
-clean:
-
-cleanall:
-
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/makefileJnilib b/projects/dvm_svn/tools/pppa/trunk/src/makefileJnilib
deleted file mode 100644
index c4325ce..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/makefileJnilib
+++ /dev/null
@@ -1,49 +0,0 @@
-CXX=clang++ -g -O2
-COPT=-c -I../../Zlib/include -g
-ZLIB	= zlib
-ZLIBDIR	= ../../Zlib/Release
-
-OBJS=\
-	inter.o  \
-	potensyn.o  \
-	statread.o  \
-	treeinter.o \
-	statprintf.o \
-    statlist.o \
-    statinter.o \
-    interface.o \
-    stat.o \
-    LibraryImport.o \
-    libLibraryImport.jnilib \
-
-#$(BINDIR)/$(EXECUTABLES): $(OBJS)
-#	clang++ -o $@ $(OBJS) -L$(ZLIBDIR) -l$(ZLIB)
-
-all:  libLibraryImport.jnilib
-	@echo "*** COMPILING EXECUTABLE $(EXECUTABLES) DONE"
-
-clean:
-	rm -f libLibraryImport.jnilib LibraryImport.o
-cleanall:
-	rm -f $(OBJS)
-
-libLibraryImport.jnilib: potensyn.o inter.o statread.o treeinter.o statinter.o statlist.o interface.o stat.o
-	clang++ -shared -fPIC -I /Library/Java/JavaVirtualMachines/jdk1.8.0_211.jdk/Contents/Home/include potensyn.o inter.o statread.o treeinter.o statinter.o statlist.o interface.o stat.o ../../Zlib/*.o LibraryImport.cpp -o libLibraryImport.jnilib
-potensyn.o:
-	$(CXX) $(COPT) potensyn.cpp
-inter.o:
-	$(CXX) $(COPT) inter.cpp
-statread.o:
-	$(CXX) $(COPT) statread.cpp
-treeinter.o:
-	$(CXX) $(COPT) treeinter.cpp
-statinter.o:
-	$(CXX) $(COPT) -std=c++11 statinter.cpp
-statlist.o:
-	$(CXX) $(COPT) -std=c++11 statlist.cpp
-interface.o:
-	$(CXX) $(COPT) -std=c++11 interface.cpp -fdeclspec
-stat.o:
-	$(CXX) $(COPT) -std=c++11 stat.cpp
-#LibraryImport.o:
-#	gcc LibraryImport.c -I /Library/Developer/CommandLineTools/SDKs/MacOSX10.14.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -fdeclspec
\ No newline at end of file
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/potensyn.cpp b/projects/dvm_svn/tools/pppa/trunk/src/potensyn.cpp
deleted file mode 100644
index a1d22f3..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/potensyn.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-#define _STATFILE_
-#include <stdio.h>
-#include <string.h>
-#include "strall.h"
-#include "potensyn.h"
-short reverse,szsh,szd,szv,szl,torightto,torightfrom;
-// Dynamically allocate array of synchronization times
-CSynchro::CSynchro(gzFile stream,unsigned long lsyn,unsigned char *pbuff)
-// stream - pointer to the file written during DVM-program execution
-// lsyn - length of written information
-{
-	valid=TRUE;
-	ps=NULL;
-	pbuff_read=NULL;
-	// dynamically allocate array of char from file (strall.h tsyn_ch)
-	unsigned char *buffer;
-	if (pbuff==NULL) {
-		buffer=new unsigned char[lsyn];
-		if (buffer==NULL) throw("Out of memory\n");
-		pbuff_read=buffer;
-		long l=gztell(stream);
-	// read from file to the allocated buffer
-		int s=gzread(stream,buffer,lsyn);
-		if ((unsigned long)s!=lsyn) {
-			valid=FALSE;
-			sprintf(texterr,"Can't read synchronization times from file addr=%ld,length=%ld\n",
-			l,lsyn);
-			if (pbuff_read!=NULL) {
-				delete []pbuff_read;
-				pbuff_read=NULL;
-			}
-			return;
-		}
-	}else buffer=pbuff;
-	// calculate size of struct tsyn_ch
-	unsigned long lsynone=QSYN_SHORT*szsh+QSYN_LONG*szl+QSYN_VOID*szv+
-		QSYN_DOUBLE*szd;
-	//set pointer to the first synchronization time
-	unsigned char *p=buffer+lsyn-lsynone;
-	// number of synchronization times
- 	qsyn=lsyn/lsynone;
-	// allocate array of struct tsyn
-	ps=new psyn[qsyn];
-	if (ps==NULL) throw("Out of memory\n");
-	psyn *psl=ps;
-	unsigned long i;
-	// copy values from struct of char to struct tsyn
-	for (i=0;i<qsyn;i++) {
-		psl->sh.nitem=0; psl->l.ninter=0; psl->v.ppgrp=NULL; psl->d.time=0.0;
-		CPYMEM(psl->sh.nitem,p+MAKESHORT(ps,nitem,nitem),szsh);
-		CPYMEM(psl->l.ninter,p+MAKELONG(ps,ninter,ninter,QSYN_SHORT),szl);
-  		// ppgrp -reference to group, used only for compare values
-		CPYMEM(psl->v.ppgrp,p+MAKEVOID(ps,ppgrp,ppgrp,QSYN_SHORT,QSYN_LONG),szv);
-		CPYMEM(psl->d.time,p+MAKEDOUBLE(ps,time,time,QSYN_SHORT,QSYN_LONG,QSYN_VOID),szd);
-		p=p-lsynone;
-		psl++;
-	}
-	if (pbuff_read!=NULL) {
-				delete []pbuff_read;
-				pbuff_read=NULL;
-			}
-}
-//------------------------------------------
-// deallocate  struct tsyn and memory of group references
-CSynchro::~CSynchro()
-{
-	if (ps==0) return;
-	if (pbuff_read!=NULL) delete []pbuff_read;
-	delete []ps;
-}
-//---------------------------------------------------------
-//return result of constructor execution
-int CSynchro::Valid()
-{
-	return(valid);
-}
-//-------------------------------------------
-//error message
-void CSynchro::TextErr(char *p)
-{
-	strcpy(p,texterr);
-}
-//-----------------------------------------------
-// calculate number of times different types
-BOOL CSynchro::Count(unsigned long n,short waserr )
-// n - number of interval
-// waserr - sign of error during accumulating times 
-{
-	if (n==0) return(0);
-	//qoper - array of number of times
-	for (int j=0;j<QCOLLECT+QCOLLECT;j++) {
-		qoper[j]=0;
-	}
-	ncurr=0;
-	// set current ninter
-	ninter=n;
-	psyn *pp=ps;
-	// calculate number of times, nitem - type of time
-	for (unsigned long i=0;i<qsyn;i++) {
-		if (pp->l.ninter==n) {
-			qoper[pp->sh.nitem-1]++;
-		}
-		pp++;
-	}
-	// veryfy number of calls and number of returns
-	if (waserr!=0) return(0);
-	for (int ak=0;ak<QCOLLECT;ak=ak+4) {
-		// number of start calls and number of wait calls
-		if (qoper[ak]!=qoper[ak+QCOLLECT] || qoper[ak+2]!=qoper[ak+2+QCOLLECT]) {
-			valid=FALSE;
-			sprintf(texterr,"Number of calls !=number of returns interval=%ld\n",n);
-			return(1);
-		}
-	}
-	return(0);
-}
-//-------------------------------------------
-// return number of synchronization time, function call after Count()
-int CSynchro::GetCount(typecollect nitem1)
-// nitem1 - type of synchronyzation time
-{
-	short nitem=(short)nitem1;
-	ncurr=0;
-	first=1; // the first Find
-	return (qoper[nitem-1]);
-}
-//--------------------------------------------
-//return next synchronyzation time,call after Count()
-double CSynchro::Find(typecollect nitem1)
-// nitem1 - type of synchronyzation time
-{
-	short nitem=(short)nitem1;
-	if (first!=1) ncurr++;
-	first++;
-	psyn *psl=ps+ncurr;
-	// ninter set Count()
-	for (unsigned long i=ncurr;i<qsyn;i++) {
-		if (psl->sh.nitem==nitem && psl->l.ninter==ninter) {
-			ncurr=i; // set current synchronization time
-			return(psl->d.time);
-		}
-		psl++;
-	}
-	ncurr=0;
-	return(0.0);
-}
-//-----------------------------------------------------
-// return current synchronyzation time, call after Find()
-double CSynchro::GetCurr(void)
-{
-	// ncurr set find
-	if (ncurr>=qsyn) return(0.0);
-	psyn *psl=ps+ncurr;
-	return(psl->d.time);
-}
-//--------------------------------------------------------
-//return nearest time from current
-double CSynchro::FindNearest(typecollect nitem1)
-// nitem1 - type of synchronyzation time
-// for overlap, for call_wait_operation find ret_start_operation
-{
-	if (ncurr>=qsyn ) return(0.0);
-	short nitem=(short)nitem1;
-	psyn *psl=ps+ncurr;
-	psyn *psl_curr=psl;
-	for (unsigned long i=ncurr;;i--) {
-		if (psl->sh.nitem==nitem) {
-			if (psl->v.ppgrp==psl_curr->v.ppgrp) {
-				return(psl->d.time);
-			}
-		}
-		psl--;
-		if (i==0) return(0.0);
-	}
-}
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/potensyn.h b/projects/dvm_svn/tools/pppa/trunk/src/potensyn.h
deleted file mode 100644
index 537f068..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/potensyn.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#if !defined( _POTENSYN_H )
-#define _POTENSYN_H
-#include "zlib.h"
-#include "bool.h"
-#include "inter.h"
-#include "treeinter.h"
-struct syn_short{
-	short nitem;
-};
-struct syn_long{
-	unsigned long ninter;
-};
-struct syn_void{
-	void* ppgrp;
-};
-struct syn_double{
-	double time;
-};
-#define QSYN_SHORT sizeof(syn_short)/SZSH
-#define QSYN_LONG sizeof(syn_long)/SZL
-#define QSYN_VOID sizeof(syn_void)/SZV
-#define QSYN_DOUBLE sizeof(syn_double)/SZD
-typedef struct tsyn {
-           syn_double d;
-           syn_void v;
-           syn_long l;
-           syn_short sh;
-}psyn;
-class CSynchro {
-public:
-	CSynchro(gzFile stream,unsigned long l,unsigned char *pbuff);
-	~CSynchro();
-	BOOL Valid();
-	void TextErr(char *t);
-	BOOL Count(unsigned long nin,short waserr);
-	int GetCount(typecollect nitem);
-	double Find(typecollect nitem);
-	double GetCurr(void);
-	double FindNearest(typecollect nitem);
-private:
-	BOOL valid;
-	char texterr[80];
-	psyn *ps;
-	unsigned long qsyn;
-    unsigned long ninter;
-	unsigned char *pbuff_read;
-	int qoper[QCOLLECT+QCOLLECT];
-	unsigned long ncurr;
-	short first;
-	int err;
-};
-#endif
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/stat.cpp b/projects/dvm_svn/tools/pppa/trunk/src/stat.cpp
deleted file mode 100644
index 41eddfd..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/stat.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-#include "statlist.h"
-#include <iostream>
-
-void CStat::to_string(std::string & result) {
-	CStatInter * cur=inter_tree;
-	if (cur == NULL||!isinitialized) return;
-    result = "";
-	result += patch::to_string(iscomp) + ' ' + patch::to_string(nproc) + '\n';
-	for (unsigned int i = 0; i < nproc; i++) {
-		result += '@'+std::string(proc_info[i].node_name)+'@' + ' ';
-		result += patch::to_string(proc_info[i].test_time)+'\n';
-	}
-	while (cur != NULL)
-	{
-		cur->to_string(result);
-		cur = cur->next;
-		if (cur) {
-			result += ' ';
-		}
-	}
-}
-
-void CStat::to_json(json &result){
-    CStatInter * cur=inter_tree;
-    if (cur == NULL||!isinitialized) return;
-    json proc, inter, temp;
-    for (unsigned int i = 0; i < nproc; i++) {
-        proc.push_back({{"node_name", std::string(proc_info[i].node_name)},
-                        {"test_time", (proc_info[i].test_time) ? proc_info[i].test_time : 0.0}});
-    }
-    while (cur != NULL)
-    {
-        cur->to_json(temp);
-        inter.push_back(temp);
-        cur = cur->next;
-    }
-    result = {{"iscomp", iscomp}, {"nproc", nproc}, {"p_heading", std::string(p_heading)}, {"proc", proc}, {"inter", inter}};
-}
-
-CStat::CStat(json source){
-    isjson = true;
-    stat = NULL;
-    iscomp = source["iscomp"];
-    nproc = source["nproc"];
-    const char *tmp = (source["p_heading"].dump()).c_str();
-    std::cout << ">>  p_heading = " << source["p_heading"] << "  " << strlen(tmp) << "  " << tmp << std::endl;
-    for (int i = 0; i < strlen(tmp); ++i)
-        p_heading[i] = tmp[i];
-    proc_info = new CProcInfo[nproc];
-    int i = 0;
-    for (json::iterator it = source["proc"].begin(); it != source["proc"].end() && i < nproc; ++it, ++i){
-        const char * str = ((*it)["node_name"].dump()).c_str();
-        proc_info[i].node_name = new char[strlen(str)];
-        strcpy(proc_info[i].node_name, str);
-        proc_info[i].test_time = (*it)["test_time"];
-    }
-    CStatInter *inter_temp = NULL;
-    inter_tree = NULL;
-    for (json::reverse_iterator it = source["inter"].rbegin(); it != source["inter"].rend(); ++it){
-        inter_temp = inter_tree;
-        inter_tree = new CStatInter((json)(*it));
-//        if(inter_temp)
-        inter_tree->next = inter_temp;
-    }
-    isinitialized = true;
-}
-
-CStat::~CStat() {
-//    printf("Destructor: ~Stat()\n");
-//	if (inter_tree) {
-//        inter_tree->delete_tail();
-//		inter_tree->clear();
-//		delete inter_tree;
-//	}
-	//for (unsigned long i = 0; i < nproc; i++)
-	//	delete [] proc_info[i].node_name;
-//	if (proc_info){
-//        delete [] proc_info;
-//    }
-//    if (stat){
-//        delete stat;
-//    }
-}
-
-void CStat::clear() {
-	if (inter_tree) {
-        inter_tree->delete_tail();
-		inter_tree->clear();
-		delete inter_tree;
-	}
-	// for (unsigned long i = 0; i < nproc; i++)
-	// 	delete[] proc_info[i].node_name;
-	if (proc_info)
-	    delete[] proc_info;
-	if (spath) {
-        delete[] spath;
-	}
-    if (stat)
-        delete stat;
-}
-
-CStat::CStat() {
-    isjson = false;
-    stat = NULL;
-	isinitialized = false;
-	nproc = 0;
-	inter_tree = NULL;
-	iscomp = false;
-	proc_info = NULL;
-	spath = NULL;
-};
-
-void CStat::init(const char* path) {
-    isjson = false;
-	if (isinitialized) {
-		err = true;
-		return;
-	}
-	stat = new CStatRead(path, 0, 0, 0);
-	int warn;
-	if (stat->Valid(&warn) != TRUE) {
-		err = true;
-		return;
-	}
-	nproc = stat->QProc();
-	if (nproc == 0) {
-		err = true;
-		return;
-	}
-    stat->VMSSize(p_heading);
-	unsigned long n = stat->BeginTreeWalk();
-	if (n != 0) inter_tree = new CStatInter(stat, n);
-	proc_info = new struct CProcInfo[nproc];
-	for (unsigned long i = 0; i<nproc; i++) {
-		stat->NameTimeProc(i, &proc_info[i].node_name, &proc_info[i].test_time);
-	}
-	isinitialized = true;
-	spath = new char[strlen(path) + 1];
-	strcpy(spath, path);
-}
-
-void CStat::init(CStatRead* stat_) {
-	isjson = false;
-	if (isinitialized) {
-		err = true;
-		return;
-	}
-	stat = stat_;
-	int warn;
-	if (stat->Valid(&warn) != TRUE) {
-		err = true;
-		return;
-	}
-	nproc = stat->QProc();
-	if (nproc == 0) {
-		err = true;
-		return;
-	}
-	stat->VMSSize(p_heading);
-	unsigned long n = stat->BeginTreeWalk();
-	if (n != 0) inter_tree = new CStatInter(stat, n);
-	proc_info = new struct CProcInfo[nproc];
-	for (unsigned long i = 0; i < nproc; i++)
-		stat->NameTimeProc(i, &proc_info[i].node_name, &proc_info[i].test_time);
-	isinitialized = true;
-
-	//TODO: ?
-	/*spath = new char[strlen(path) + 1];
-	strcpy(spath, path);*/
-}
-
-CStatInter * find_inter(short type, long expr, short nlev, CStatInter * cur) {
-    while (cur != NULL) {
-		if (cur->id.t == type && cur->id.nlev == nlev)
-		    switch (type){
-		        case USER:
-		            if (cur->id.expr == expr)
-                        return cur;
-		            break;
-                default:
-                    return cur;
-		    }
-        cur = cur->next;
-	}
-	return NULL;
-};
-
-CStatInter * next_inter(short nlev, CStatInter * cur) {
-	if (cur == NULL) {
-		return NULL;
-	}
-	cur = cur->next;
-	while (cur != NULL && cur->id.nlev != nlev)
-	{
-	    if (cur->id.nlev < nlev)
-	        return NULL;
-		cur = cur->next;
-	}
-	return cur;
-};
-
-int copy_for_compare(const CStat &s, CStat &r){
-    if (!s.isinitialized)
-        return 1;
-    if (!s.isjson) {
-        r.spath = new char[(strlen(s.spath)) + 1];
-        strcpy(r.spath, s.spath);
-    }
-    r.nproc = s.nproc;
-    strcpy(r.p_heading, s.p_heading);
-    r.proc_info = new CProcInfo[r.nproc];
-    for (int i = 0; i < r.nproc; ++i){
-        r.proc_info[i].node_name = new char[strlen(s.proc_info[i].node_name)];
-        strcpy(r.proc_info[i].node_name, s.proc_info[i].node_name);
-        r.proc_info->test_time = s.proc_info->test_time;
-    }
-    r.isinitialized = true;
-    r.iscomp = true;
-    return 0;
-}
-
-void stat_intersect(const CStat &s1, const CStat &s2, CStat & r1, CStat & r2) {
-	if (copy_for_compare(s1, r1) || copy_for_compare(s2, r2))
-	    return;
-	inter_tree_intersect(s1.inter_tree, s2.inter_tree, &r1.inter_tree, &r2.inter_tree);
-};
-
-void skip_to_end(CStatInter ***i){
-    while ((**i)->next != NULL)
-        *i = &(**i)->next;
-}
-
-void inter_tree_intersect(CStatInter *i1, CStatInter *i2, CStatInter **r1, CStatInter **r2) {
-    std::cout << "In inter_tree_intersect\n";
-	CStatInter *cur;
-	if (!i1 || !i2)
-	    return;
-	short cur_lev = i1->id.nlev;
-	while (i1 != NULL && i2 != NULL) {
-	    std::cout << "Going to find_inter: " << i1->id.expr << "  " << cur_lev  << " " << i1->id.t << " " << i1->id.nline << std::endl;
-		if (cur = find_inter(i1->id.t, i1->id.expr, cur_lev, i2)) {
-            std::cout << "Find_inter: " << cur->id.expr << "  " << cur->id.nlev << " " << cur->id.nline << std::endl;
-            *r1 = new CStatInter(*i1);
-			*r2 = new CStatInter(*cur);
-			r1 = &(*r1)->next;
-			r2 = &(*r2)->next;
-            if (i1->next != NULL && cur->next != NULL && i1->next->id.nlev > cur_lev && cur->next->id.nlev > cur_lev) {
-                inter_tree_intersect(i1->next, cur->next, r1, r2);
-                if (*r1 != NULL && *r2 != NULL){
-                    skip_to_end(&r1);
-                    skip_to_end(&r2);
-                    r1 = &(*r1)->next;
-                    r2 = &(*r2)->next;
-                }
-            }
-            i2 = next_inter(cur_lev, cur);
-        }
-		i1 = next_inter(cur_lev, i1);
-//		json j;
-//
-//		if (i1 != NULL){
-//            i1->to_json(j);
-//		    std::cout << ">> next_inter:  " << i1->id.nlev << "\n\n" << j << "\n\n";
-//        }
-//		else
-//            std::cout << ">> next_inter:  " << i1 << "\n\n" << j << "\n\n";
-	}
-//	std::cout << "inter_tree_intersect OK " << cur_lev << std::endl;
- }
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statfile.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statfile.cpp
deleted file mode 100644
index dc9e065..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statfile.cpp
+++ /dev/null
@@ -1,1118 +0,0 @@
-#include "bool.h"
-#define _STATFILE_
-#include "statread.h"
-#include <stdlib.h>
-#include <string.h>
-#include <float.h>
-#include <exception>
-#include <new>
-
-#ifdef __SPF_BUILT_IN_PPPA
-#define VERS "406" 
-#define PLATFORM "ntmpich" 
-#else
-#include "dvmvers.h"
-#endif
-
-#include "statprintf.h"
-#include "statlist.h"
-
-using namespace std;
-/**
- * Человекопонятный формат размера
- *
- * @param bytes     размер в байтах
- * @param precision количество знаков после запятой
- *
- * @return отформатированная строка размера
- */
-static char *humanizeSize(const unsigned long long bytes, const unsigned short precision);
-
-/**
- * Подготовить значение dvmh статистики к печати
- *
- * @param value      сырое значение
- * @param isPositive значение строго положительно?
- * @param isSize     значение это размер?
- * @param dashOnZero выводить вместо нуля? "-"
- * @param isTime     значение это время (не работает, при установленном isSize)?
- *
- * @return отформатированное значение в виде строки
- */
-static char *dvmhPrepareValue(
-        const double value,
-        const unsigned short isPositive,
-        const unsigned short isSize,
-        const unsigned short dashOnZero,
-        const unsigned short isTime
-);
-
-/**
- * Маски определяющие уровень вывода информации
- */
-enum VerbosityLevel {
-        VERBOSITY_LVL_NONE = 0,
-        VERBOSITY_LVL_CPU  = 1,
-        VERBOSITY_LVL_GPU  = 2
-    };
-
-static void printHelp()
-{
-    printf("Performance analyser parameters: <file _name1> <file_name2> [additional_opt] \n");  
-    printf("  <file_name1>       Statistics file name.\n");
-    printf("  <file_name2>       Output file name.\n");
-    printf("--------------------------------------------------------------------------\n");
-    printf("Additional options:\n");
-    printf("  -l <level>        Interval <level> number.\n");
-    printf("  -n <list>         List of processor numbers,\n");
-    printf("                    <list> = 0 - without processor characteristics.\n");
-    printf("  -t <list>         List of threads numbers,\n");
-    printf("                    <list> = 0 - all threads characteristics.\n");
-    printf("  -v <verbosity>    Verbosity level, set that detailed information whould be\n");
-    printf("                    displayed. <verbosity>:\n");
-    printf("                       gpu     - display only GPU characteristics.\n");
-    printf("                       cpu     - display only CPU characteristics.\n");
-    printf("                       none    - do not display detailed characteristics.\n");
-    printf("                       gpu,cpu - (default) display CPU and GPU characteristics.\n");
-    printf("  -c <compr_level>  [0..9],-1: compression level of output file,-1-no compression\n");
-    printf("  -m <matrix>       <i[:<groupname>]|j[:<groupname>]\n");
-    printf("                    i|j - sum of row or column elements of matrix of\n");
-    printf("                    interval characteristics.\n");
-    printf("  <groupname>       Name of group, set to output row or column per elements.\n");
-    printf("                    <groupname>:\n");
-    printf("                       UserGrp|MsgPasGrp|StartRedGrp|WaitRedGrp|RedGrp|\n");
-    printf("                       StartShdGrp|WaitShdGrp|ShdGrp|DistrGrp|ReDistrGrp|\n");
-    printf("                       MapPLGrp|DoPLGrp|ProgBlockGrp|IOGrp|RemAccessGrp|\n");
-    printf("                       UserDebGrp|StatistGrp|SystemGrp.\n");
-    printf("  -j                Dump to json format\n");
-}
-
-#ifdef __SPF_BUILT_IN_PPPA
-int pppa_analyzer(int argv, char** argc)
-#else
-int main(int argv, char **argc)
-#endif
-{
-    //sfn outfn -l d>=0 -c d=-1..9 -n d-d>=0 -m text
-    if (argv < 3 || strcmp(argc[1], "help") == 0)
-    {
-        printHelp();
-#ifdef __SPF_BUILT_IN_PPPA
-        return 1;
-#else
-        return 0;
-#endif
-    }
-
-    if (argv > 14) {
-        printf("Incorrect number of parameters\n");
-        printHelp();
-#ifdef __SPF_BUILT_IN_PPPA
-        return 1;
-#else
-        exit(1);
-#endif
-    }
-
-    BOOL proc = TRUE, comp = TRUE, gen = TRUE, jsonDump = FALSE;
-    BOOL dvmh_gpu = TRUE, dvmh_threads = FALSE, dvmh_threads_full = FALSE;
-    int verbosity = VERBOSITY_LVL_CPU | VERBOSITY_LVL_GPU;
-    char compr[3], mode[5];
-    strcpy(mode, "wb0");
-    int nlevel = 9999, qnumb = 1, qnumthreads = 1;
-    unsigned long *pnumb = NULL;
-    unsigned long *pnumthreads = NULL;
-    char * token;
-    int iIM = 0, jIM = 0, nparin = 0, nparout = 0;
-    short sore = 0;
-    size_t st = 0;
-    //new_handler set_new_handler(NULL);
-    nparin = 1;// statistics file
-    nparout = 2;// output file
-    for (int npar = 3; npar < argv; npar++) { // key parameters
-        int i, cc;
-        char let;
-        char arrs[24] = "                       "; // strlen nameGen[i]
-        if (argc[npar][2] != 0) {
-            printf("Incorrect parameter %s\n", argc[npar]);
-#ifdef __SPF_BUILT_IN_PPPA
-            return 1;
-#else
-            exit(1);
-#endif
-        }
-        if (argv == npar + 1 && argc[npar][1] != 'j') {
-            printf("Parameter for %s not set\n", argc[npar]);
-#ifdef __SPF_BUILT_IN_PPPA
-            return 1;
-#else
-            exit(1);
-#endif
-        }
-        switch (argc[npar][1]) {
-        case 'l':
-            //interval level
-            npar++;
-            nlevel = atoi(argc[npar]);
-            if (nlevel < 0 || (nlevel == 0 && strcmp(argc[npar], "0") != 0)) {
-                printf("Incorrect number of level %s \n", argc[npar]);
-#ifdef __SPF_BUILT_IN_PPPA
-                return 1;
-#else
-                exit(1);
-#endif
-            }
-            break;
-        case 'c':
-            // compression level
-            npar++;
-            mode[0] = 0; compr[0] = 0;
-            cc = atoi(argc[npar]);
-            if (cc < -1 || cc>9) {
-                printf("Incorrect compression level of file %s \n", argc[3]);
-#ifdef __SPF_BUILT_IN_PPPA
-                return 1;
-#else
-                exit(1);
-#endif
-            }
-            if (cc == -1) {
-                strcpy(compr, "0");
-            }
-            else {
-                int comprd;
-                if (cc == 0) strcpy(compr, "-1");
-                else {
-                    comprd = cc;
-                    sprintf(compr, "%d", comprd);
-                }
-            }
-            strcpy(mode, "wb");
-            strcat(mode, compr);
-            break;
-        case 'n':
-            // list of processor numbers
-            npar++;
-            qnumb = 1;
-            i = 0;
-            while (argc[npar][i] != 0) {
-                if (argc[npar][i] == ',') qnumb++;
-                i++;
-            }
-            pnumb = new unsigned long(qnumb * 2);
-            if (pnumb == NULL) throw("Out of memory\n");
-            token = strtok(argc[npar], ",");
-            i = 0;
-            while (token != NULL) {
-                char *tdiap = strchr(token, '-');
-                if (tdiap == NULL) {
-                    pnumb[i] = atoi(token);
-                    pnumb[i + 1] = pnumb[i];
-                }
-                else {
-                    pnumb[i + 1] = atoi(tdiap + 1);
-                    tdiap[0] = '\0';
-                    pnumb[i] = atoi(token);
-                }
-                token = strtok(NULL, ",\n");
-                i = i + 2;
-            } // end while
-            // -n 0 - not print processor characteristics
-            if (qnumb == 1 && pnumb[0] == 0 && pnumb[1] == 0)
-            {
-                proc = FALSE;
-                dvmh_threads = FALSE;
-                dvmh_gpu = FALSE;
-            }
-            break;
-        case 't':
-            //list of threads to show
-            npar++;
-            qnumthreads = 1;
-            i = 0;
-            while (argc[npar][i] != 0) {
-                if (argc[npar][i] == ',') qnumthreads++;
-                i++;
-            }
-            pnumthreads = new unsigned long(qnumthreads * 2);
-            if (pnumthreads == NULL) throw("Out of memory\n");
-            token = strtok(argc[npar], ",");
-            i = 0;
-            while (token != NULL) {
-                char *tdiap = strchr(token, '-');
-                if (tdiap == NULL) {
-                    pnumthreads[i] = atoi(token);
-                    pnumthreads[i + 1] = pnumthreads[i];
-                }
-                else {
-                    pnumthreads[i + 1] = atoi(tdiap + 1);
-                    tdiap[0] = '\0';
-                    pnumthreads[i] = atoi(token);
-                }
-                token = strtok(NULL, ",\n");
-                i = i + 2;
-            } // end while
-            // -t 0 - print all threads characteristics
-            if (qnumthreads == 1 && pnumthreads[0] == 0 && pnumthreads[1] == 0)
-            {
-                dvmh_threads = TRUE;
-                dvmh_threads_full = TRUE;
-            }
-            break;
-        case 'm':
-            // interval matrix
-            npar++;
-            let = argc[npar][0];
-            if (let != 'i' && let != 'j') {
-                printf("Incorrect %d parameter %c, must be i/j\n", npar, let);
-#ifdef __SPF_BUILT_IN_PPPA
-                return 1;
-#else
-                exit(1);
-#endif
-            }
-            sore = 1;
-            if (let == 'i') iIM = 1; else jIM = 1;
-            st = strlen(argc[npar]);
-            if (st == 1) break;
-            sore = 0;  // element
-            if (argc[npar][1] != ':') {
-                printf("Incorrect %d parameter %s, must be i=<groupname>/j=<groupname>\n", npar, argc[npar]);
-#ifdef __SPF_BUILT_IN_PPPA
-                return 1;
-#else
-                exit(1);
-#endif
-            }
-            strncpy(arrs, &(argc[npar][2]), st - 2);
-            iIM = 0; jIM = 0;
-            for (i = 1; i <= StatGrpCount; i++) {
-                if (strcmp(nameGenMT[i - 1], arrs) == 0) {
-                    if (let == 'i') iIM = i;
-                    else jIM = i;
-                    break;
-                }
-            } // end for
-            if (iIM == 0 && jIM == 0) {
-                printf("Incorrect group name %s \n", argc[npar]);
-#ifdef __SPF_BUILT_IN_PPPA
-                return 1;
-#else
-                exit(1);
-#endif
-            }
-            break;
-        case 'v':
-            // verbosity level
-            npar++;
-            verbosity = VERBOSITY_LVL_NONE;
-
-            {
-                char *buf = argc[npar];
-                char *flag = buf;
-                char cond = 1;
-
-                do {
-                    if (*buf == '\0') cond = 0;
-                    if (*buf == '\0' || *buf == ',') {
-                        *buf = '\0';
-                        if (strcmp(flag, "cpu") == 0) {
-                            verbosity = verbosity | VERBOSITY_LVL_CPU;
-                        }
-                        else
-                            if (strcmp(flag, "gpu") == 0) {
-                                verbosity = verbosity | VERBOSITY_LVL_GPU;
-                            }
-                            else
-                                if (strcmp(flag, "none") != 0) {
-                                    printf("Incorrect verbosity level %s \n", argc[npar]);
-#ifdef __SPF_BUILT_IN_PPPA
-                                    return 1;
-#else
-                                    exit(1);
-#endif
-                                }
-                        flag = ++buf;
-                    }
-                    else ++buf;
-                } while (cond);
-            }
-            break;
-        case 'j':
-            jsonDump = TRUE;
-            break;
-        default:
-            printf("Incorrect parameter %s\n", argc[npar]);
-#ifdef __SPF_BUILT_IN_PPPA
-            return 1;
-#else
-            exit(1);
-#endif
-            break;
-        } // end switch
-    } // end for key parameters
-    // read time characteristics and syn times
-    try {
-        CStatRead stat(argc[nparin], iIM, jIM, sore);
-        int warn;
-        if (stat.Valid(&warn) != TRUE) {
-            char t[80];
-            stat.TextErr(t);
-            printf("%s", t);
-            printHelp();
-#ifdef __SPF_BUILT_IN_PPPA
-            return 1;
-#else
-            exit(1);
-#endif
-        }
-
-        if (jsonDump == TRUE)
-        {
-            CStat stat_json;
-            stat_json.init(&stat);
-            if (!stat_json.isinitialized)
-                return 1;
-
-            json j;
-            stat_json.to_json(j);
-            std::string str = j.dump();
-
-            FILE* f = fopen(argc[nparout], "w");
-            if (f == NULL)
-            {
-                printf("Can't open file %s\n", argc[nparout]);
-                return 1;
-            }
-            fprintf(f, "%s\n", str.c_str());
-            fclose(f);
-            return 0;
-        }
-        // Возвращает количество процессоров, на которых считалась задача.
-        unsigned long qproc = stat.QProc();
-
-        if (qproc == 0) 
-        {
-#ifdef __SPF_BUILT_IN_PPPA
-            return 1;
-#else
-            exit(1);
-#endif
-        }
-        // string for processor characteristics - max
-        // printf for compressed and not compressed out file
-        CStatPrintf statpr(argc[nparout], 1024, mode);
-        if (statpr.Valid() != TRUE) {
-            char t[80];
-            statpr.TextErr(t);
-            printf("%s", t);
-#ifdef __SPF_BUILT_IN_PPPA
-            return 1;
-#else
-            exit(1);
-#endif
-        }
-        double min[ITER + 1];
-        double max[ITER + 1];
-        double sum[ITER + 1];
-        // communication
-        double minc[RED + 1];
-        double maxc[RED + 1];
-        double sumc[RED + 1];
-        // real communication
-        double minrc[RED + 1];
-        double maxrc[RED + 1];
-        double sumrc[RED + 1];
-        // synchronization
-        double mins[RED + 1];
-        double maxs[RED + 1];
-        double sums[RED + 1];
-        // variation
-        double minv[RED + 1];
-        double maxv[RED + 1];
-        double sumv[RED + 1];
-        // overlap
-        double minov[RED + 1];
-        double maxov[RED + 1];
-        double sumov[RED + 1];
-        // number of processor
-        unsigned long nprocmin[ITER + 1], nprocmax[ITER + 1];
-        unsigned long nprocminc[RED + 1], nprocmaxc[RED + 1];
-        unsigned long nprocminrc[RED + 1], nprocmaxrc[RED + 1];
-        unsigned long nprocmins[RED + 1], nprocmaxs[RED + 1];
-        unsigned long nprocminv[RED + 1], nprocmaxv[RED + 1];
-        unsigned long nprocminov[RED + 1], nprocmaxov[RED + 1];
-        const char *namecomp[3] = { "Tmin","Tmax","Tmid" };
-        int ltxt = strlen(nameCom[0]) + 1;
-        char p_heading[80];
-        int lenstr = 0;
-        char *poutstr = NULL;
-        int i;
-        stat.VMSSize(p_heading);
-        statpr.StatPrintf("Processor system=%s\n", p_heading);
-        char * pvers = stat.ReadVers();
-        char *pplat = stat.ReadPlatform();
-        statpr.StatPrintf("Statistics has been accumulated on DVM-system version %s, platform %s\n", pvers, pplat);
-        statpr.StatPrintf("Analyzer is executing on DVM-system version %s, platform %s\n", VERS, PLATFORM);
-        for (i = 0; i < warn; i++) { // warning message
-            stat.WasErrAccum(p_heading);
-            statpr.StatPrintf("!! %s", p_heading);
-        }
-        short dig_time = 0;
-        unsigned long n = stat.BeginTreeWalk();
-        while (n != 0) {
-            short nlev = stat.ReadTitle(p_heading); //  информация о заголовке, идентифицирующем интервал (видимо уровень)
-            if (nlev <= nlevel) {
-                statpr.StatPrintf("%s", "-------------------------------------------------------------------------\n");
-                statpr.StatPrintf("%s", p_heading);
-                // calculate min,max,sum values for all times
-                stat.MinMaxSum(PRGEN, min, nprocmin, max, nprocmax, sum);
-                stat.MinMaxSum(PRCOM, minc, nprocminc, maxc, nprocmaxc, sumc);
-                stat.MinMaxSum(PRRCOM, minrc, nprocminrc, maxrc, nprocmaxrc, sumrc);
-                stat.MinMaxSum(PRSYN, mins, nprocmins, maxs, nprocmaxs, sums);
-                stat.MinMaxSum(PRVAR, minv, nprocminv, maxv, nprocmaxv, sumv);
-                stat.MinMaxSum(PROVER, minov, nprocminov, maxov, nprocmaxov, sumov);
-                if (dig_time == 0) { // format for print
-                    double max_val = 0.0;
-                    for (i = 0; i <= RED; i++) {
-                        if (max_val < sumc[i]) max_val = sumc[i];
-                        if (max_val < sumrc[i]) max_val = sumrc[i];
-                        if (max_val < sums[i]) max_val = sums[i];
-                        if (max_val < sumv[i]) max_val = sumv[i];
-                        if (max_val < sumov[i]) max_val = sumov[i];
-                    } // end for
-                    char tval[80];
-                    sprintf(tval, "%*.*lf", DIGTIME, PREC, max_val);
-                    dig_time = (short)strlen(tval);
-                    lenstr = (dig_time + 1)*qproc + strlen(nameGen[0]) + 1;
-                    if (lenstr <= 1024) lenstr = 1024; else statpr.ChangeLenStr(lenstr);
-                    poutstr = new char[lenstr];
-                    if (poutstr == NULL) throw("Out of memory\n");
-                }
-                if (gen == TRUE) {
-                    statpr.StatPrintf("--- The main characteristics --- \n");
-                    // double time1,prodcpu,timef,prod;
-
-                    double prod_cpu, prod_sys, prod_io, prod;
-                    prod_cpu = sum[CPUUSR];
-                    prod_sys = sum[CPU];
-                    prod_io = sum[IOTIME];
-                    prod = prod_cpu + prod_sys + prod_io;
-
-                    double exec_time, sys_time, efficiency;
-                    exec_time = max[EXEC];
-                    sys_time = n * max[EXEC];
-                    efficiency = sys_time ? prod / sys_time : 0.0;
-                    unsigned long threadsOfAllProcs = 0;
-                    for (unsigned int not_i = 1; not_i <= n; ++not_i)
-                        threadsOfAllProcs += stat.getThreadsAmountByProcess(not_i);
-
-                    statpr.StatPrintf("%s %*.*lf \n", "Parallelization efficiency ", dig_time, PREC, efficiency);
-                    statpr.StatPrintf("%s %*.*lf \n", "Execution time             ", dig_time, PREC, exec_time);
-                    statpr.StatPrintf("%s %*d\n", "Processors                 ", dig_time, n);
-                    statpr.StatPrintf("%s %*d\n", "Threads amount             ", dig_time, threadsOfAllProcs);
-                    statpr.StatPrintf("%s %*.*lf\n", "Total time                 ", dig_time, PREC, sys_time);
-
-                    if (prod > 0.0) {
-                        statpr.StatPrintf("%s %*.*lf %s %.*lf %s %.*lf %s %.*lf %c\n",
-                            "Productive time            ", dig_time, PREC, prod,
-                            "( CPU=", PREC, prod_cpu,
-                            "Sys=", PREC, prod_sys,
-                            "I/O=", PREC, prod_io,
-                            ')'
-                        );
-                    }
-
-                    if (sum[LOST] > 0.0)statpr.StatPrintf("%s %*.*lf \n", "Lost  time                 ", dig_time, PREC, sum[LOST]);
-                    if (sum[INSUFUSR] + sum[INSUF] != 0.0)
-                        statpr.StatPrintf("%s %*.*lf %s %.*lf %s %.*lf %c\n", "   Insufficient parallelism", dig_time, PREC, sum[INSUFUSR] + sum[INSUF],
-                            "( User=", PREC, sum[INSUFUSR], "Sys=", PREC, sum[INSUF], ')');
-                    if (sum[SUMCOM] != 0.0)
-                        statpr.StatPrintf("%s %*.*lf %s %.*lf %s %.*lf %c\n", "   Communication           ", dig_time, PREC, sum[SUMCOM],
-                            "( Real_sync=", PREC, sum[SUMRCOM], "Starts=", PREC, sum[START], ')');
-                    if (sum[IDLE] != 0.0)   statpr.StatPrintf("%s %*.*lf\n", "   Idle time               ", dig_time, PREC, sum[IDLE]);
-                    if (sum[IMB] != 0.0)statpr.StatPrintf("%s %*.*lf\n", "Load imbalance             ",
-                        dig_time, PREC, sum[IMB]);
-                    if (sum[SUMSYN] != 0.0) statpr.StatPrintf("%s %*.*lf\n", "Synchronization            ", dig_time, PREC, sum[SUMSYN]);
-                    if (sum[SUMVAR] != 0.0) statpr.StatPrintf("%s %*.*lf\n", "Time variation             ", dig_time, PREC, sum[SUMVAR]);
-                    if (sum[SUMOVERLAP] > 0.0)statpr.StatPrintf("%s %*.*lf\n", "Overlap                    ", dig_time, PREC,
-                        sum[SUMOVERLAP]);
-
-                    if (sum[DVMH_THREADS_USER_TIME] > 0.0)
-                        statpr.StatPrintf("%s %*.*lf\n", "Threads user time          ", dig_time, PREC, sum[DVMH_THREADS_USER_TIME]);
-                    if (sum[DVMH_THREADS_SYSTEM_TIME] > 0.0)
-                        statpr.StatPrintf("%s %*.*lf\n", "Threads system time        ", dig_time, PREC, sum[DVMH_THREADS_SYSTEM_TIME]);
-
-                    if (sum[DVMH_GPU_TIME_PRODUCTIVE] > 0.0)
-                        statpr.StatPrintf("%s %*.*lf\n", "Productive time GPU        ", dig_time, PREC, sum[DVMH_GPU_TIME_PRODUCTIVE]);
-                    if (sum[DVMH_GPU_TIME_LOST] > 0.0)
-                        statpr.StatPrintf("%s %*.*lf\n", "Lost time GPU              ", dig_time, PREC, sum[DVMH_GPU_TIME_LOST]);
-
-
-                    long ncall = 0;
-                    int dig_stat = DIGSTAT;
-                    for (i = 0; i <= RED; i++) ncall = ncall + stat.ReadCall(typecom(i));
-                    if (ncall > 0) {
-                        statpr.StatPrintf("%*c", ltxt, ' ');
-                        char tval[20];
-                        sprintf(tval, "%ld", ncall);
-                        int l = strlen(tval);
-                        if (l > DIGSTAT)dig_stat = l;
-                        statpr.StatPrintf("%*s", dig_stat, " Nop ");
-                        for (int j = SUMCOM; j <= SUMOVERLAP; j++) {
-                            if (sum[j] > 0.0)
-                                statpr.StatPrintf("%*s ", dig_time, nameOper[j - SUMCOM]);
-                        } // end for
-                        statpr.StatPrintf("\n");
-                    }// end if
-                    for (i = 0; i <= RED; i++) {
-                        ncall = stat.ReadCall(typecom(i));
-                        if (ncall > 0) {
-                            statpr.StatPrintf("%s", nameCom[i]);
-                            statpr.StatPrintf("%*d ", dig_stat, ncall);
-                            if (sum[SUMCOM] > 0.0)statpr.StatPrintf("%*.*lf ", dig_time, PREC, sumc[i]);
-                            if (sum[SUMRCOM] > 0.0)statpr.StatPrintf("%*.*lf ", dig_time, PREC, sumrc[i]);
-                            if (sum[SUMSYN] > 0.0)statpr.StatPrintf("%*.*lf ", dig_time, PREC, sums[i]);
-                            if (sum[SUMVAR] > 0.0)statpr.StatPrintf("%*.*lf ", dig_time, PREC, sumv[i]);
-                            if (sum[SUMOVERLAP] > 0.0)statpr.StatPrintf("%*.*lf ", dig_time, PREC, sumov[i]);
-                            statpr.StatPrintf("\n");
-                        } // end if ncall>0
-                    } // end for
-                    if (iIM > 0 || jIM > 0) { // statistics matrix
-                        for (unsigned long np = 1; np <= qproc; np++) {
-                            double prod[StatGrpCount], lost[StatGrpCount], sumprod = 0.0, sumlost = 0.0;
-                            double calls[StatGrpCount], sumcalls = 0.0;
-                            stat.GrpTimes(prod, lost, calls, np);
-                            sprintf(p_heading, "%ld", np);
-                            int ll = strlen(nameGen[0]) - strlen(p_heading) - strlen(" Nproc=") - 2;
-                            statpr.StatPrintf("%s %d %*c %*s %*s %*s\n", " Nproc=", np, ll, ' ',
-                                dig_time, "CALL COUNT", dig_time, "PRODUCT TIME", dig_time,
-                                "LOST TIME");
-                            for (i = 0; i < StatGrpCount; i++) {
-                                sumprod = sumprod + prod[i];
-                                sumlost = sumlost + lost[i];
-                                sumcalls = sumcalls + calls[i];
-                                //if (calls[i]>0 || prod[i]!=0.0 || lost[i]!=0.0 ) {
-                                statpr.StatPrintf("%s %*.*lf %*.*lf %*.*lf \n", nameGenMT[i],
-                                    dig_time, PREC, calls[i],
-                                    dig_time, PREC, prod[i],
-                                    dig_time, PREC, lost[i]);
-                                //}
-                            } // end for
-                            statpr.StatPrintf("%s %*.*lf %*.*lf %*.*lf \n", "      Total:           ",
-                                dig_time, PREC, sumcalls, dig_time, PREC, sumprod, dig_time, PREC, sumlost);
-                        } // end for qproc
-                    } // end statistics matrix
-                } // end main characteristics
-                comp = comp && ((verbosity & VERBOSITY_LVL_CPU) > 0);
-                if (comp == TRUE) {
-                    // comparative characteristics
-                    statpr.StatPrintf("--- The comparative characteristics --- \n");
-                    poutstr[0] = 0;
-                    statpr.StatPrintf("%*c", strlen(nameGen[0]) + 1, ' ');
-                    int i;
-                    for (i = 0; i < 3; i++) {
-                        if (i == 2)statpr.StatPrintf("%*s\n", dig_time, namecomp[i]);
-                        else statpr.StatPrintf("%*s %*s", dig_time, namecomp[i],
-                            DIGSTAT, "N proc");
-                    }
-                    // general characteristics
-                    for (i = 0; i <= ITER; i++) {
-                        if (sum[i] > 0.0) {
-                            int prec;
-                            double tt = sum[i] / n;
-                            if ((typetime)(i) == PROC || (typetime)(i) == ITER)
-                                prec = 0; else prec = PREC;
-                            statpr.StatPrintf("%s %*.*lf %*d %*.*lf %*d %*.*lf \n",
-                                nameGen[i], dig_time, prec,
-                                min[i], DIGSTAT, nprocmin[i], dig_time, prec, max[i], DIGSTAT,
-                                nprocmax[i], dig_time, prec, tt);
-                        }
-                    }
-                    long ncall = 0;
-                    // characteristics of collective operations
-                    for (i = 0; i <= RED; i++) ncall = ncall + stat.ReadCall(typecom(i));
-                    if (ncall > 0) {
-                        statpr.StatPrintf("%*c", ltxt - 2, ' ');
-                        for (int j = SUMCOM; j <= SUMOVERLAP; j++) {
-                            if (sum[j] > 0.0)
-                                statpr.StatPrintf("%*s  ", dig_time + DIGSTAT, nameOper[j - SUMCOM]);
-                        }
-                        statpr.StatPrintf("\n");
-                        for (i = 0; i <= RED; i++) {
-                            for (int k = 0; k < 3; k++) {
-                                if (sumc[i] == 0.0 && sumrc[i] == 0.0 && sums[i] == 0.0 &&
-                                    sumv[i] == 0.0 &&sumov[i] == 0.0) break;
-                                double t[CALL];//com,realcom,syn,var,overlap
-                                unsigned long pnp[CALL];
-                                // 0 - min; 1 - max; 2 - sum
-                                switch (k) {
-                                case 0:
-                                    t[0] = minc[i]; t[1] = minrc[i];
-                                    t[2] = mins[i]; t[3] = minv[i];
-                                    t[4] = minov[i];
-                                    pnp[0] = nprocminc[i];
-                                    pnp[1] = nprocminrc[i];
-                                    pnp[2] = nprocmins[i];
-                                    pnp[3] = nprocminv[i];
-                                    pnp[4] = nprocminov[i];
-                                    break;
-                                case 1:
-                                    t[0] = maxc[i]; t[1] = maxrc[i];
-                                    t[2] = maxs[i]; t[3] = maxv[i];
-                                    t[4] = maxov[i];
-                                    pnp[0] = nprocmaxc[i];
-                                    pnp[1] = nprocmaxrc[i];
-                                    pnp[2] = nprocmaxs[i];
-                                    pnp[3] = nprocmaxv[i];
-                                    pnp[4] = nprocmaxov[i];
-                                    break;
-                                case 2:
-                                    t[0] = sumc[i] / n; t[1] = sumrc[i] / n;
-                                    t[2] = sums[i] / n; t[3] = sumv[i] / n;
-                                    t[4] = sumov[i] / n;
-                                    pnp[0] = 0;
-                                    pnp[1] = 0;
-                                    pnp[2] = 0;
-                                    pnp[3] = 0;
-                                    pnp[4] = 0;
-                                    break;
-                                default:
-                                    statpr.StatPrintf("Unknown type=%d\n", k);
-#ifdef __SPF_BUILT_IN_PPPA
-                                    return 1;
-#else
-                                    exit(1);
-#endif
-                                }// end switch
-                                statpr.StatPrintf("%s%s", nameCom[i], namecomp[k]);
-                                for (int j = SUMCOM; j <= SUMOVERLAP; j++) {
-                                    if (sum[j] > 0.0) {
-                                        if (pnp[0] == 0) {
-                                            statpr.StatPrintf("%*.*lf ",
-                                                dig_time, PREC, t[j - SUMCOM]);
-                                            statpr.StatPrintf("%*c", DIGSTAT + 1, ' ');
-                                        }
-                                        else
-                                            statpr.StatPrintf("%*.*lf %*d ",
-                                                dig_time, PREC, t[j - SUMCOM],
-                                                DIGSTAT, pnp[j - SUMCOM]);
-                                    }
-                                }
-                                statpr.StatPrintf("\n");
-                            } //end for
-                        }//end for
-                    }
-                }
-                proc = proc && ((verbosity & VERBOSITY_LVL_CPU) > 0);
-                if (proc == TRUE) {
-                    // execution characteristics
-                    statpr.StatPrintf("--- The execution characteristics --- \n");
-                    statpr.StatPrintf("%s", "                       ");
-                    unsigned long i;
-                    // print numbers of processor
-                    for (i = 0; i < n; i++) {//!!! qproc
-                        int pr = FALSE;
-                        if (pnumb == NULL) pr = TRUE;
-                        else {
-                            for (int j = 0; j < qnumb; j++) {
-                                if (i + 1 >= pnumb[j] && i + 1 <= pnumb[j + 1]) pr = TRUE;
-                            }
-                        }
-                        if (pr == TRUE) {
-                            statpr.StatPrintf("%*d ", dig_time, i + 1); // probel
-                        }
-                    }
-                    statpr.StatPrintf("\n");
-                    // general characteristics
-                    for (i = 0; i <= ITER; i++) {
-                        stat.ReadProc(PRGEN, pnumb, qnumb, dig_time, sum[i], poutstr);
-                        if (poutstr[0] != '\0')statpr.StatPrintf("%s\n", poutstr);
-                        //statpr.StatPrintf("\n");
-                    }
-                    //statpr.StatPrintf("\n");
-                    // characteristics of collective operatios
-                    long ncall = 0;
-                    for (int k = 0; k <= RED; k++) ncall = ncall + stat.ReadCall(typecom(k));
-                    for (int j = SUMCOM; j <= SUMOVERLAP; j++) {
-                        double *ps;
-                        switch (j) {
-                        case SUMCOM: ps = sumc; break;
-                        case SUMRCOM: ps = sumrc; break;
-                        case SUMSYN: ps = sums; break;
-                        case SUMVAR: ps = sumv; break;
-                        case SUMOVERLAP: ps = sumov; break;
-                        default:statpr.StatPrintf("Unknown type=%d\n", j);
-#ifdef __SPF_BUILT_IN_PPPA
-                            return 1;
-#else
-                            exit(1);
-#endif
-                        }// end for j
-                        int i = 0;
-                        //if (j==SUMOVERLAP) ncall=0; //for pc sum[j]=0.0
-                        if (sum[j] > 0.0 && ncall > 0) {
-                            statpr.StatPrintf("           %s\n", nameGen[j]);
-                            for (i = 0; i <= RED; i++) {
-                                stat.ReadProc((typeprint)(j - SUMCOM + 1), pnumb, qnumb, dig_time, ps[i], poutstr);
-                                if (poutstr[0] != '\0')statpr.StatPrintf("%s\n", poutstr);
-                            }
-                        }
-                    } // end for k
-                }//exec characteristics
-                //dvmh_threads = dvmh_threads && ((verbosity & VERBOSITY_LVL_CPU) > 0);
-        //if(dvmh_threads == TRUE)
-                if ((verbosity & VERBOSITY_LVL_CPU) > 0);
-                {
-                    short isThreadsHeaderPrinted = 0;
-                    // Выводим информацию по процессам (нити)
-                    for (unsigned long np = 1; np <= qproc; ++np)
-                    {
-                        int show_this_proc = FALSE;
-                        if (pnumb == NULL) show_this_proc = TRUE;
-                        else {
-                            for (int j = 0; j < qnumb * 2; j += 2) {
-                                if (np >= pnumb[j] && np <= pnumb[j + 1]) show_this_proc = TRUE;
-                            }
-                        }
-                        if (show_this_proc)
-                        {
-                            dvmh_stat_interval        *dvmhStatInterval = stat.getDvmhStatIntervalByProcess(np);
-                            dvmh_stat_header_gpu_info *dvmhStatGpuInfo;
-                            if (!dvmhStatInterval) {
-                                continue;
-                            }
-                            if (!dvmhStatInterval->threadsUsed)
-                                continue;
-                            if (!isThreadsHeaderPrinted)
-                            {
-                                statpr.StatPrintf("\n--- Threads characteristics --- \n");
-                                isThreadsHeaderPrinted = 1;
-                            }
-
-                            double maxs_t[2];
-                            double mins_t[2];
-                            double meds_t[2];
-                            unsigned long n_t[4];
-                            double max_val = 0;
-                            stat.getMaxsAndMins(maxs_t, mins_t, meds_t, n_t, np);
-                            for (int i = 0; i < 2; ++i)
-                            {
-                                if (maxs_t[i] > max_val) max_val = maxs_t[i];
-                                if (mins_t[i] > max_val) max_val = mins_t[i];
-                                if (meds_t[i] > max_val) max_val = meds_t[i];
-                            }
-                            char tval[40];
-                            sprintf(tval, "%*.*lf", DIGTIME, PREC, max_val);
-                            short tvlen = strlen(tval);
-                            short tnlen = 0;
-                            unsigned long tnumval = stat.getThreadsAmountByProcess(np);
-                            while (tnumval > 0) { tnumval /= 10; tnlen++; }
-
-                            statpr.StatPrintf("\nProcessor# %ld:\n", np);
-                            statpr.StatPrintf("            ");
-                            for (int i = 0; i < 3; i++) {
-                                if (i == 2)statpr.StatPrintf("%*s\n", dig_time, namecomp[i]);
-                                else statpr.StatPrintf("%*s %*s ", dig_time, namecomp[i], tnlen, "N");
-                            }
-                            statpr.StatPrintf("User time   %*.*f %.*ld %*.*f %.*ld %*.*f\n", tvlen, PREC, mins_t[0], tnlen, n_t[1]
-                                , tvlen, PREC, maxs_t[0], tnlen, n_t[0]
-                                , tvlen, PREC, meds_t[0]);
-                            statpr.StatPrintf("System time %*.*f %.*ld %*.*f %.*ld %*.*f\n", tvlen, PREC, mins_t[1], tnlen, n_t[3]
-                                , tvlen, PREC, maxs_t[1], tnlen, n_t[2]
-                                , tvlen, PREC, meds_t[1]);
-                            if (dvmh_threads)
-                                for (unsigned long i = 0; i < stat.getThreadsAmountByProcess(np)/*dvmhStatInterval->max_threads*/; ++i)
-                                {
-                                    int show_this_thread = FALSE;
-                                    if (pnumthreads == NULL) show_this_thread = TRUE;
-                                    else {
-                                        for (int j = 0; j < qnumthreads * 2; j += 2) {
-                                            if (i + 1 >= pnumthreads[j] && i + 1 <= pnumthreads[j + 1]) show_this_thread = TRUE;
-                                        }
-                                    }
-                                    if (show_this_thread || dvmh_threads_full)
-                                    {
-                                        statpr.StatPrintf("    Thread[%.4ld]\n", i + 1);
-                                        statpr.StatPrintf("        User time   %10.*f\n", PREC, dvmhStatInterval->threads[i].user_time);
-                                        statpr.StatPrintf("        System time %10.*f\n", PREC, dvmhStatInterval->threads[i].system_time);
-                                    }
-                                }
-                        }
-                    }
-                    statpr.StatPrintf("\n");
-                }
-                dvmh_gpu = dvmh_gpu && ((verbosity & VERBOSITY_LVL_GPU) > 0);
-                if (dvmh_gpu == TRUE) {
-                    short isGPUHeaderPrinted = 0;
-                    // Выводим информацию по процессам (GPU)
-                    for (unsigned long np = 1; np <= qproc; ++np)
-                    {
-                        short isProcHeaderPrinted = 0;
-                        dvmh_stat_interval        *dvmhStatInterval = stat.getDvmhStatIntervalByProcess(np);
-                        dvmh_stat_header_gpu_info *dvmhStatGpuInfo;
-                        if (!dvmhStatInterval) {
-                            continue;
-                        }
-                        short havePrevGpu = 0;
-                        // Выводи информацию по каждому GPU на процессе
-                        for (int gpu = 0; gpu < DVMH_STAT_MAX_GPU_CNT; ++gpu) {
-                            if (((dvmhStatInterval->mask >> gpu) & 1) == 0) continue;
-                            dvmhStatGpuInfo = stat.getDvmhStatGpuInfoByProcess(np, gpu);
-                            dvmh_stat_interval_gpu *dvmhStatGpu = &dvmhStatInterval->gpu[gpu];
-                            havePrevGpu = 1;
-                            if (!isGPUHeaderPrinted) {
-                                statpr.StatPrintf("\n--- The GPU characteristics --- \n");
-                                isGPUHeaderPrinted = 1;
-                            }
-
-                            if (!isProcHeaderPrinted) {
-                                statpr.StatPrintf(" ┌───────────────┐\n");
-                                statpr.StatPrintf(" │ Proc: #%-6d │\n", np);
-                                statpr.StatPrintf(" └─────┬─────────┘\n");
-                                statpr.StatPrintf("       │\n");
-                            }
-
-                            int lenName = strlen((char *)dvmhStatGpuInfo->name);
-                            if (lenName == 0) {
-                                strcpy((char *)dvmhStatGpuInfo->name, DVMH_STAT_GPU_UNKNOWN);
-                                lenName = strlen(DVMH_STAT_GPU_UNKNOWN);
-                            }
-
-                            int nameSpace = 9;
-                            if (dvmhStatGpuInfo->id == -1) nameSpace = -1;
-
-                            statpr.StatPrintf("   ┌");
-                            for (int i = 0; i < lenName + 12 + nameSpace; ++i) {
-                                if (i == 3 && (havePrevGpu || !isProcHeaderPrinted)) statpr.StatPrintf("┴");
-                                else statpr.StatPrintf("─");
-                            }
-                            isProcHeaderPrinted = 1;
-                            statpr.StatPrintf("┐\n");
-
-                            if (dvmhStatGpuInfo->id != -1)
-                                statpr.StatPrintf("   │ GPU #%-d[%08X] (%*s) │\n",
-                                    gpu + 1, dvmhStatGpuInfo->id, lenName, dvmhStatGpuInfo->name);
-                            else
-                                statpr.StatPrintf("   │ GPU #%-d (%*s) │\n",
-                                    gpu + 1, lenName, dvmhStatGpuInfo->name);
-
-                            statpr.StatPrintf("   ├");
-
-#if DVMH_EXTENDED_STAT == 1
-                            int hr_len = 170;
-#else
-                            int hr_len = 128;
-#endif
-
-                            for (int i = 0; i < hr_len; ++i) {
-                                if (lenName + 12 + nameSpace == i) statpr.StatPrintf("┴");
-                                else statpr.StatPrintf("─");
-                            }
-                            statpr.StatPrintf("┐\n");
-
-#if DVMH_EXTENDED_STAT == 1
-                            statpr.StatPrintf("   │ %35s %6s %13s %13s %13s %13s %13s %13s %13s %13s %13s │\n",
-                                "", "#", "Min", "Max", "Sum", "Average",
-                                "Q1", "Median", "Q3", "Productive", "Lost");
-#else
-                            statpr.StatPrintf("   │ %35s %6s %13s %13s %13s %13s %13s %13s │\n",
-                                "", "#", "Min", "Max", "Sum", "Average",
-                                "Productive", "Lost");
-#endif
-                            statpr.StatPrintf("   ├");
-                            for (int i = 0; i < hr_len; ++i) {
-                                statpr.StatPrintf("─");
-                            }
-                            statpr.StatPrintf("┤\n");
-                            // Выводим информацию по метрикам
-                            for (int metric = 0; metric < DVMH_STAT_METRIC_CNT; ++metric) {
-                                dvmh_stat_interval_gpu_metric *dvmhStatMetric = &dvmhStatGpu->metrics[metric];
-                                if (dvmhStatMetric->countMeasures <= 0) continue;
-
-                                short isSize = metric >= DVMH_STAT_METRIC_CPY_DTOH &&
-                                    metric <= DVMH_STAT_METRIC_CPY_GET_ACTUAL ||
-                                    metric == DVMH_STAT_METRIC_UTIL_ARRAY_TRANSFORMATION;
-
-                                short isPositive = isSize;
-                                short isZeroDash = 0;
-                                short isZeroDashEx = dvmhStatMetric->hasOwnMeasures <= 0;
-
-                                char *sMin = dvmhPrepareValue(dvmhStatMetric->min, isPositive, isSize, isZeroDash, 0);
-                                char *sMax = dvmhPrepareValue(dvmhStatMetric->max, isPositive, isSize, isZeroDash, 0);
-                                char *sSum = dvmhPrepareValue(dvmhStatMetric->sum, isPositive, isSize, isZeroDash, 0);
-                                char *sMean = dvmhPrepareValue(dvmhStatMetric->mean, isPositive, isSize, isZeroDash, 0);
-#if DVMH_EXTENDED_STAT == 1
-                                char *sQ1 = dvmhPrepareValue(dvmhStatMetric->q1, isPositive, isSize, isZeroDashEx, 0);
-                                char *sMedian = dvmhPrepareValue(dvmhStatMetric->median, isPositive, isSize, isZeroDashEx, 0);
-                                char *sQ3 = dvmhPrepareValue(dvmhStatMetric->q3, isPositive, isSize, isZeroDashEx, 0);
-#endif
-                                char *timeProductive = dvmhPrepareValue(dvmhStatMetric->timeProductive, 1, 0, 1, 1);
-                                char *timeLost = dvmhPrepareValue(dvmhStatMetric->timeLost, 1, 0, 1, 1);
-
-#if DVMH_EXTENDED_STAT == 1
-                                statpr.StatPrintf("   │ %-35s %6d %13s %13s %13s %13s %13s %13s %13s %13s %13s │\n",
-                                    dvmhStatMetricsTitles[metric],
-                                    dvmhStatMetric->countMeasures,
-                                    sMin,
-                                    sMax,
-                                    sSum,
-                                    sMean,
-                                    sQ1,
-                                    sMedian,
-                                    sQ3,
-                                    timeProductive,
-                                    timeLost);
-#else
-                                statpr.StatPrintf("   │ %-35s %6d %13s %13s %13s %13s %13s %13s │\n",
-                                    dvmhStatMetricsTitles[metric],
-                                    dvmhStatMetric->countMeasures,
-                                    sMin,
-                                    sMax,
-                                    sSum,
-                                    sMean,
-                                    timeProductive,
-                                    timeLost);
-#endif
-
-                                free(sMin);
-                                free(sMax);
-                                free(sSum);
-                                free(sMean);
-#if DVMH_EXTENDED_STAT == 1
-                                free(sQ1);
-                                free(sMedian);
-                                free(sQ3);
-#endif
-                                free(timeProductive);
-                                free(timeLost);
-
-                            }
-
-                            statpr.StatPrintf("   ├");
-                            for (int i = 0; i < hr_len; ++i) {
-                                statpr.StatPrintf("─");
-                            }
-                            statpr.StatPrintf("┤\n");
-#if DVMH_EXTENDED_STAT == 1
-                            statpr.StatPrintf("   │ Productive time: %10.4fs%141s│\n", dvmhStatGpu->timeProductive, "");
-                            statpr.StatPrintf("   │ Lost time      : %10.4fs%141s│\n", dvmhStatGpu->timeLost, "");
-#else
-                            statpr.StatPrintf("   │ Productive time: %10.4fs%99s│\n", dvmhStatGpu->timeProductive, "");
-                            statpr.StatPrintf("   │ Lost time      : %10.4fs%99s│\n", dvmhStatGpu->timeLost, "");
-#endif
-                            statpr.StatPrintf("   └");
-                            for (int i = 0; i < hr_len; ++i) {
-                                if ((dvmhStatInterval->mask >> (gpu + 1)) > 0 && i == 3)
-                                    statpr.StatPrintf("┬");
-                                else
-                                    statpr.StatPrintf("─");
-                            }
-                            statpr.StatPrintf("┘\n");
-                        }
-                        if (isProcHeaderPrinted && np < qproc)
-                            statpr.StatPrintf("\n");
-                    }
-                    statpr.StatPrintf("\n");
-                }
-            } // if nlev<=nlevel
-            n = stat.TreeWalk();
-        }
-        //names and times of processors
-        char *pname = NULL, *pnamemin = NULL, *pnamemax = NULL;
-        double time, mintime = DBL_MAX, maxtime = 0.0, sumtime = 0.0;
-        stat.NameTimeProc(0, &pname, &time);
-        if (pname == NULL)
-        {
-            //not MPI
-#ifdef __SPF_BUILT_IN_PPPA
-            return 1;
-#else
-            exit(1);
-#endif
-        }
-        unsigned long minn = 0, maxn = 0;
-        statpr.StatPrintf("%s", "-------------------------------------------------------------------------\n");
-        statpr.StatPrintf("Name (number) and performance time of processors\n");
-        for (unsigned long i1 = 0; i1 < qproc; i1++) {
-            stat.NameTimeProc(i1, &pname, &time);
-            sumtime = sumtime + time;
-            if (time < mintime) { mintime = time; minn = i1 + 1; pnamemin = pname; }
-            if (time > maxtime) { maxtime = time; maxn = i1 + 1; pnamemax = pname; }
-            statpr.StatPrintf("%s(%d) %lf\n", pname, i1 + 1, time);
-        }
-        statpr.StatPrintf("min - %s(%d) %lf; max - %s(%d) %lf; mid - %lf\n",
-            pnamemin, minn, mintime, pnamemax, maxn, maxtime, sumtime / qproc);
-    } // end try
-    catch (bad_alloc ex) {
-        printf("Out of memory\n");
-#ifdef __SPF_BUILT_IN_PPPA
-        return 1;
-#else
-        exit(1);
-#endif
-    }
-    catch (exception ex) {
-        printf("Exception in standart library %s\n", ex.what());
-#ifdef __SPF_BUILT_IN_PPPA
-        return 1;
-#else
-        exit(1);
-#endif
-    }
-    catch (char *str) {
-        printf("%s\n", str);
-#ifdef __SPF_BUILT_IN_PPPA
-        return 1;
-#else
-        exit(1);
-#endif
-    }
-    return 0;
-}
-
-static char *humanizeSize(const unsigned long long bytes, const unsigned short precision) {
-    char *buf;
-
-    buf = (char *)malloc(16);
-    if (!buf)  printf("-- humanizeSize No memeory! \n"); fflush(stdout);
-
-    if (bytes < 0) strcpy(buf, "-");
-    else if (bytes >= (1ll << 30)) sprintf(buf, "%.*lfG", precision, (double)bytes / (1 << 30));
-    else if (bytes >= (1ll << 20)) sprintf(buf, "%.*lfM", precision, (double)bytes / (1 << 20));
-    else if (bytes >= (1ll << 10)) sprintf(buf, "%.*lfK", precision, (double)bytes / (1 << 10));
-    else if (bytes >= 0)         sprintf(buf, "%lluB", bytes);
-    else strcpy(buf, "?");
-
-    return buf;
-}
-
-static char *dvmhPrepareValue(
-        const double value,
-        const unsigned short isPositive,
-        const unsigned short isSize,
-        const unsigned short dashOnZero,
-        const unsigned short isTime )
-{
-    char *buf;
-
-    //printf("dvmhPrepareValue: %.4lf isPositive=%d isSize=%d dashOnZero=%d\n", value, isPositive, isSize, dashOnZero);
-
-    buf = (char *) malloc(16);
-    if (!buf)  printf("-- dvmhPrepareValue No memeory! \n"); fflush(stdout);
-
-    if (isPositive && value < 0) {
-        strcpy(buf, "-");
-    } else if (value == 0 && dashOnZero) {
-        strcpy(buf, "-");
-    } else if (isSize) {
-        free(buf);
-        buf = humanizeSize((unsigned long long) value, 3);
-    } else if (isTime) {
-        sprintf(buf, "%12.4lfs", value);
-    } else {
-        sprintf(buf, "%13.4lf", value);
-    }
-
-    return buf;
-}
\ No newline at end of file
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statinter.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statinter.cpp
deleted file mode 100644
index e819d89..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statinter.cpp
+++ /dev/null
@@ -1,704 +0,0 @@
-#include "statlist.h"
-#include <iostream>
-
-//---  Not relevant ‣ Use to_json  ---//
-void CStatInter::to_string(std::string &result) {
-	result += "@interval@ ";
-	result += patch::to_string(id.nlev) + ' ';   //уровень вложенности
-	result += patch::to_string(id.t) + ' ';      //тип интервала
-	result += patch::to_string(id.expr) + ' ';   //значение выражения
-	result += patch::to_string(id.nline) + ' ';  //номер строки начала
-	result += patch::to_string(id.nline_end) + ' '; //номер строки конца
-	result += patch::to_string(id.nenter) + ' '; //число вхождений в интервал
-	result += std::string(id.pname) + ' ';
-    result += "\n@times@ ";
-	result += patch::to_string(prod_cpu)+' ';
-	result += patch::to_string(prod_sys) + ' ';
-	result += patch::to_string(prod_io) + ' ';
-	result += patch::to_string(exec_time) + ' ';
-	result += patch::to_string(sys_time) + ' ';
-	result += patch::to_string(real_comm) + ' ';
-	result += patch::to_string(efficiency) + ' ';
-	result += patch::to_string(lost_time) + ' ';
-	result += patch::to_string(insuf_user) + ' ';
-	result += patch::to_string(insuf_sys) + ' ';
-	result += patch::to_string(comm) + ' ';
-	result += patch::to_string(real_comm) + ' ';
-	result += patch::to_string(comm_start) + ' ';
-	result += patch::to_string(idle) + ' ';
-	result += patch::to_string(load_imb) + ' ';
-	result += patch::to_string(synch) + ' ';
-	result += patch::to_string(time_var) + ' ';
-	result += patch::to_string(overlap) + ' ';
-	result += patch::to_string(thr_user_time) + ' ';
-	result += patch::to_string(thr_sys_time) + ' ';
-	result += patch::to_string(gpu_time_prod) + ' ';
-	result += patch::to_string(gpu_time_lost) + ' ';
-	result += patch::to_string(nproc)+' ';
-	result += patch::to_string(threadsOfAllProcs)+' ';
-    result += "@end_times@\n";
-    for (unsigned int i = 0; i < RED; i++) {
-        result+= patch::to_string(col_op[i].ncall)+' ';
-        result += patch::to_string(col_op[i].comm) + ' ';
-        result += patch::to_string(col_op[i].synch) + ' ';
-        result += patch::to_string(col_op[i].real_comm) + ' ';
-        result += patch::to_string(col_op[i].time_var) + ' ';
-        result += patch::to_string(col_op[i].overlap) + ' ';
-    }
-    if (!isjson){
-        for (unsigned int j = 0; j < nproc; j++) {
-            for (int i = 0; i <= StatGrpCount; i++) {
-                result += patch::to_string(op_group[j][i].calls) + ' ';
-                result += patch::to_string(op_group[j][i].prod) + ' ';
-                result += patch::to_string(op_group[j][i].lost_time) + ' ';
-            }
-        }
-        result += "\n@proc@\n";
-        result += patch::to_string(id.proc) + '\n';   //кол-во процессов
-        for (unsigned int i = 0; i < nproc; i++) {
-            result += "@proc" + patch::to_string(i) + "@ ";
-            result += patch::to_string(proc_times[i].prod_cpu) + ' ';
-            result += patch::to_string(proc_times[i].prod_sys) + ' ';
-            result += patch::to_string(proc_times[i].prod_io) + ' ';
-            result += patch::to_string(proc_times[i].exec_time) + ' ';
-            result += patch::to_string(proc_times[i].sys_time) + ' ';
-            result += patch::to_string(proc_times[i].real_comm) + ' ';
-            result += patch::to_string(proc_times[i].lost_time) + ' ';
-            result += patch::to_string(proc_times[i].insuf_user) + ' ';
-            result += patch::to_string(proc_times[i].insuf_sys) + ' ';
-            result += patch::to_string(proc_times[i].comm) + ' ';
-            result += patch::to_string(proc_times[i].idle) + ' ';
-            result += patch::to_string(proc_times[i].load_imb) + ' ';
-            result += patch::to_string(proc_times[i].synch) + ' ';
-            result += patch::to_string(proc_times[i].time_var) + ' ';
-            result += patch::to_string(proc_times[i].overlap) + ' ';
-            result += patch::to_string(proc_times[i].thr_user_time) + ' ';
-            result += patch::to_string(proc_times[i].thr_sys_time) + ' ';
-            result += patch::to_string(proc_times[i].gpu_time_prod) + ' ';
-            result += patch::to_string(proc_times[i].gpu_time_lost) + ' ';
-            result += "\n@treads@\n";
-            result += patch::to_string(proc_times[i].num_threads) + ' ';
-            for (unsigned int j = 0; j < proc_times[i].num_threads;j++) {
-                result += "@tread" + patch::to_string(j) + "@ ";
-                result += patch::to_string(proc_times[i].th_times[j].sys_time) + ' ';
-                result += patch::to_string(proc_times[i].th_times[j].user_time) + ' ';
-                result += "@end_tread" + patch::to_string(j) + "@ ";
-            }
-            result += "\n@end_treads@\n";
-            result += "@gpu@\n";
-            result += patch::to_string(proc_times[i].num_gpu) + ' ';
-            for (unsigned int j = 0; j < proc_times[i].num_gpu; j++) {
-                result +="@gpu"+ patch::to_string(j) + "_"
-                    + std::string(proc_times[i].gpu_times[j].gpu_name) + '@' + ' ';
-                result += patch::to_string(proc_times[i].gpu_times[j].prod_time)+' ';
-                result += patch::to_string(proc_times[i].gpu_times[j].lost_time) + ' ';
-//                result += patch::to_string(proc_times[i].gpu_times[j].kernel_exec) + ' ';
-//                result += patch::to_string(proc_times[i].gpu_times[j].loop_exec) + ' ';
-//                result += patch::to_string(proc_times[i].gpu_times[j].get_actual) + ' ';
-//                result += patch::to_string(proc_times[i].gpu_times[j].data_reorg) + ' ';
-//                result += patch::to_string(proc_times[i].gpu_times[j].reduction) + ' ';
-//                result += patch::to_string(proc_times[i].gpu_times[j].gpu_runtime_compilation) + ' ';
-//                result += patch::to_string(proc_times[i].gpu_times[j].gpu_to_cpu) + ' ';
-//                result += patch::to_string(proc_times[i].gpu_times[j].cpu_to_gpu) + ' ';
-//                result += patch::to_string(proc_times[i].gpu_times[j].gpu_to_gpu)+ ' ';
-//                for (unsigned int k = 0; k < GNUMOP; k++) {
-//                    result += patch::to_string(proc_times[i].gpu_times[j].op_times[k].cpu_to_gpu) + ' ';
-//                    result += patch::to_string(proc_times[i].gpu_times[j].op_times[k].gpu_to_gpu) + ' ';
-//                    result += patch::to_string(proc_times[i].gpu_times[j].op_times[k].gpu_to_cpu) + ' ';
-//                }
-                result += "@end_gpu" + patch::to_string(j) + "@";
-            }
-            result += "\n@end_gpu@\n";
-
-            // Col_op
-            // for (int i = 0; i < 4; i++) {
-            // 	result += patch::to_string(col_op[i].comm) + ' ';
-            // 	result += patch::to_string(col_op[i].ncall) + ' ';
-            // 	result += patch::to_string(col_op[i].overlap) + ' ';
-            // 	result += patch::to_string(col_op[i].real_comm) + ' ';
-            // 	result += patch::to_string(col_op[i].synch) + ' ';
-            // 	result += patch::to_string(col_op[i].time_var) + ' ';
-            // }
-            result += "@end_proc" + patch::to_string(i) + "@\n";
-        }
-        result += "@end_proc@\n";
-    }
-    result += "@end_interval@\n";
-}
-
-void CStatInter::to_json(json & result){
-    json col_op_json, proc_times_json;
-    for (int i = 0; i < RED; i++) {
-        col_op_json.push_back(
-                {
-                        {"ncall", col_op[i].ncall},
-                        {"comm", col_op[i].comm},
-                        {"real_comm", col_op[i].real_comm},
-                        {"synch", col_op[i].synch},
-                        {"time_var", col_op[i].time_var},
-                        {"overlap", col_op[i].overlap}
-                });
-    }
-    for (unsigned int i = 0; i < nproc; i++) {
-        json th_times_json, gpu_times_json;
-        // ---  treads  ---
-//        std::cout << ">> th_times_json\n";
-        for (unsigned int j = 0; j < proc_times[i].num_threads; ++j){
-            th_times_json.push_back(
-                    {
-                        {"sys_time", proc_times[i].th_times[j].sys_time},
-                        {"user_time", proc_times[i].th_times[j].user_time}
-                    });
-        }
-        //  ---  GPU  ---
-        for (unsigned int j = 0; j < proc_times[i].num_gpu; j++) {
-            json metrics_json;
-//            std::cout << ">> metrics_json\n";
-            for (unsigned int k = 0; k < DVMH_STAT_METRIC_CNT; ++k) {
-                metrics_json.push_back(
-                        {
-                            {"countMeasures", proc_times[i].gpu_times[j].metrics[k].countMeasures},
-                            {"timeProductive", proc_times[i].gpu_times[j].metrics[k].timeProductive},
-                            {"timeLost", proc_times[i].gpu_times[j].metrics[k].timeLost},
-                            {"min", proc_times[i].gpu_times[j].metrics[k].min},
-                            {"mean", proc_times[i].gpu_times[j].metrics[k].mean},
-                            {"max", proc_times[i].gpu_times[j].metrics[k].max},
-                            {"sum", proc_times[i].gpu_times[j].metrics[k].sum}
-                        });
-            }
-//            std::cout << ">> gpu_times_json\n";
-            gpu_times_json.push_back(
-                    {
-                        {"gpu_name", proc_times[i].gpu_times[j].gpu_name},
-                        {"prod_time", proc_times[i].gpu_times[j].prod_time},
-                        {"lost_time", proc_times[i].gpu_times[j].lost_time},
-                        {"metrics", metrics_json}
-                    });
-        }
-        //  ---  processors  ---
-//        std::cout << ">> proc_times_json\n";
-        proc_times_json.push_back(
-                {
-                        {"prod_cpu",      proc_times[i].prod_cpu},
-                        {"prod_sys",      proc_times[i].prod_sys},
-                        {"prod_io",       proc_times[i].prod_io},
-                        {"exec_time",     proc_times[i].exec_time},
-                        {"sys_time",      proc_times[i].sys_time},
-                        {"real_comm",     proc_times[i].real_comm},
-                        {"lost_time",     proc_times[i].lost_time},
-                        {"insuf_user",    proc_times[i].insuf_user},
-                        {"insuf_sys",     proc_times[i].insuf_sys},
-                        {"comm",          proc_times[i].comm},
-                        {"idle",          proc_times[i].idle},
-                        {"load_imb",      proc_times[i].load_imb},
-                        {"synch",         proc_times[i].synch},
-                        {"time_var",      proc_times[i].time_var},
-                        {"overlap",       proc_times[i].overlap},
-                        {"thr_user_time", proc_times[i].thr_user_time},
-                        {"thr_sys_time",  proc_times[i].thr_sys_time},
-                        {"gpu_time_prod", proc_times[i].gpu_time_prod},
-                        {"gpu_time_lost", proc_times[i].gpu_time_lost},
-                        {"num_threads",   proc_times[i].num_threads},
-                        {"num_gpu", proc_times[i].num_gpu},
-                        {"th_times", th_times_json},
-                        {"gpu_times", gpu_times_json}
-                });
-    }
-//    std::cout << ">> New JSON OK\n";
-
-    result = {
-                {"id",
-                    {
-                        {"nlev", id.nlev},
-                        {"t", id.t},
-                        {"expr", id.expr},
-                        {"nline", id.nline},
-                        {"nline_end", id.nline_end},
-                        {"nenter", id.nenter},
-                        {"pname", id.pname}
-                    }
-                },
-                {"times",
-                    {
-                        {"prod_cpu", prod_cpu},
-                        {"prod_sys", prod_sys},
-                        {"prod_io", prod_io},
-                        {"exec_time", exec_time},
-                        {"sys_time", sys_time},
-                        {"efficiency", efficiency},
-                        {"lost_time", lost_time},
-                        {"insuf", insuf},
-                        {"insuf_user", insuf_user},
-                        {"insuf_sys", insuf_sys},
-                        {"comm", comm},
-                        {"real_comm", real_comm},
-                        {"comm_start", comm_start},
-                        {"idle", idle},
-                        {"load_imb", load_imb},
-                        {"synch", synch},
-                        {"time_var", time_var},
-                        {"overlap", overlap},
-                        {"thr_user_time", thr_user_time},
-                        {"thr_sys_time", thr_sys_time},
-                        {"gpu_time_prod", gpu_time_prod},
-                        {"gpu_time_lost", gpu_time_lost},
-                        {"nproc", nproc},
-                        {"threadsOfAllProcs", threadsOfAllProcs}
-                    }
-                },
-                {"col_op", col_op_json},
-                {"proc_times", proc_times_json}
-             };
-}
-
-CStatInter::CStatInter(json source){
-    isjson = true;
-    // -----  id  -----
-    json j_id = source["id"];
-    id.nenter = j_id["nenter"];
-    id.nline_end = j_id["nline_end"];
-    id.nline = j_id["nline"];
-    id.expr = j_id["expr"];
-    id.nlev = j_id["nlev"];
-    id.t = j_id["t"];
-    std::string tmp = (j_id["pname"]).dump();
-    id.pname = new char[tmp.length() + 1];
-    for (int i = 0; i < tmp.length(); ++i)
-        id.pname[i] = tmp[i];
-    id.pname[tmp.length()] = '\0';
-
-    // -----  times  -----
-    json j_times = source["times"];
-    prod_cpu = j_times["prod_cpu"];
-    prod_sys = j_times["prod_sys"];
-    prod_io = j_times["prod_io"];
-    exec_time = j_times["exec_time"];
-    sys_time = j_times["sys_time"];
-    efficiency = j_times["efficiency"];
-    lost_time = j_times["lost_time"];
-    insuf = j_times["insuf"];
-    insuf_user = j_times["insuf_user"];
-    insuf_sys = j_times["insuf_sys"];
-    comm = j_times["comm"];
-    real_comm = j_times["real_comm"];
-    comm_start = j_times["comm_start"];
-    idle = j_times["idle"];
-    load_imb = j_times["load_imb"];
-    synch = j_times["synch"];
-    time_var = j_times["time_var"];
-    overlap = j_times["overlap"];
-    thr_user_time = j_times["thr_user_time"];
-    thr_sys_time = j_times["thr_sys_time"];
-    gpu_time_prod = j_times["gpu_time_prod"];
-    gpu_time_lost = j_times["gpu_time_lost"];
-    nproc = j_times["nproc"];
-    threadsOfAllProcs = j_times["threadsOfAllProcs"];
-
-    // -----  col_op  -----
-    if (source.contains("col_op")) {
-        json j_col_op = source["col_op"];
-        for (int i = 0; i < RED; ++i) {
-            col_op[i].ncall = j_col_op[i]["ncall"];
-            col_op[i].comm = j_col_op[i]["comm"];
-            col_op[i].real_comm = j_col_op[i]["real_comm"];
-            col_op[i].synch = j_col_op[i]["synch"];
-            col_op[i].time_var = j_col_op[i]["time_var"];
-            col_op[i].overlap = j_col_op[i]["overlap"];
-        }
-    }
-//    std::cout << ">>  Going to proc_times\n";
-    // -----  proc_times  -----
-    if (source.contains("proc_times")){
-        proc_times = new struct ProcTimes[nproc];
-        json proc_times_json = source["proc_times"];
-        for (int i = 0; i < nproc; ++i){
-            json th_times_json = proc_times_json[i]["th_times"],
-                 gpu_times_json = proc_times_json[i]["gpu_times"];
-            proc_times[i].prod_cpu = proc_times_json[i]["prod_cpu"];
-            proc_times[i].prod_sys = proc_times_json[i]["prod_sys"];
-            proc_times[i].prod_io = proc_times_json[i]["prod_io"];
-            proc_times[i].exec_time = proc_times_json[i]["exec_time"];
-            proc_times[i].sys_time = proc_times_json[i]["sys_time"];
-            proc_times[i].real_comm = proc_times_json[i]["real_comm"];
-            proc_times[i].lost_time = proc_times_json[i]["lost_time"];
-            proc_times[i].insuf_user = proc_times_json[i]["insuf_user"];
-            proc_times[i].insuf_sys = proc_times_json[i]["insuf_sys"];
-            proc_times[i].comm = proc_times_json[i]["comm"];
-            proc_times[i].idle = proc_times_json[i]["idle"];
-            proc_times[i].load_imb = proc_times_json[i]["load_imb"];
-            proc_times[i].synch = proc_times_json[i]["synch"];
-            proc_times[i].time_var = proc_times_json[i]["time_var"];
-            proc_times[i].overlap = proc_times_json[i]["overlap"];
-            proc_times[i].thr_user_time = proc_times_json[i]["thr_user_time"];
-            proc_times[i].thr_sys_time = proc_times_json[i]["thr_sys_time"];
-            proc_times[i].gpu_time_prod = proc_times_json[i]["gpu_time_prod"];
-            proc_times[i].gpu_time_lost = proc_times_json[i]["gpu_time_lost"];
-            proc_times[i].num_threads = proc_times_json[i]["num_threads"];
-            proc_times[i].num_gpu = proc_times_json[i]["num_gpu"];
-//            std::cout << ">>  NumGPU  -  " << proc_times[i].num_gpu << std::endl;
-            proc_times[i].th_times = new struct ThreadTime[proc_times[i].num_threads];
-            for (int j = 0; j < proc_times[i].num_threads; ++j){
-                proc_times[i].th_times[j].user_time = th_times_json[j]["user_time"];
-                proc_times[i].th_times[j].sys_time = th_times_json[j]["sys_time"];
-            }
-            proc_times[i].gpu_times = new struct GpuTime[proc_times[i].num_gpu];
-            for (int j = 0; j < proc_times[i].num_gpu; ++j){
-                tmp = gpu_times_json[j]["gpu_name"].dump();
-                proc_times[i].gpu_times[j].gpu_name = new char[tmp.length() + 1];
-                for (int k = 0; k < tmp.length(); ++k)
-                    proc_times[i].gpu_times[j].gpu_name[k] = tmp[k];
-                proc_times[i].gpu_times[j].gpu_name[tmp.length()] = '\0';
-                proc_times[i].gpu_times[j].prod_time = gpu_times_json[j]["prod_time"];
-                proc_times[i].gpu_times[j].lost_time = gpu_times_json[j]["lost_time"];
-
-//                std::cout << ">>  Odl times OK\n";
-
-                json metrics_json = gpu_times_json[j]["metrics"];
-
-//                std::cout << ">>  metrics_json = " << metrics_json << std::endl;
-
-                for (int m = 0; m < DVMH_STAT_METRIC_CNT; ++m){
-                    proc_times[i].gpu_times[j].metrics[m].countMeasures = metrics_json[m]["countMeasures"];
-                    proc_times[i].gpu_times[j].metrics[m].timeProductive = metrics_json[m]["timeProductive"];
-                    proc_times[i].gpu_times[j].metrics[m].timeLost = metrics_json[m]["timeLost"];
-                    proc_times[i].gpu_times[j].metrics[m].min = metrics_json[m]["min"];
-                    proc_times[i].gpu_times[j].metrics[m].mean = metrics_json[m]["mean"];
-                    proc_times[i].gpu_times[j].metrics[m].max = metrics_json[m]["max"];
-                    proc_times[i].gpu_times[j].metrics[m].sum = metrics_json[m]["sum"];
-                }
-            }
-        }
-    }
-
-    next = NULL;
-}
-
-CStatInter::CStatInter(const CStatInter & si) {
-    std::cout << ">> In CStatInter(si)\n";
-    isjson = si.isjson;
-	id.t = si.id.t;
-	id.nlev = si.id.nlev;
-	id.expr = si.id.expr;
-	id.nline = si.id.nline;
-	id.nline_end = si.id.nline_end;
-	id.proc = si.id.proc;
-	id.nenter = si.id.nenter;
-	if (si.id.pname) {
-		id.pname = new char[strlen(si.id.pname) + 1];
-		strcpy(id.pname, si.id.pname);
-	}
-	else {
-		id.pname = new char [2];
-		id.pname[0] = '0';
-		id.pname[1] = '\0';
-	}
-	prod_cpu=si.prod_cpu;
-	prod_sys = si.prod_sys;
-	prod_io= si.prod_io;
-	prod = si.prod;
-	exec_time=si.exec_time;
-	sys_time=si.sys_time;
-	efficiency=si.efficiency;
-	lost_time=si.lost_time;
-	insuf=si.insuf;
-	insuf_user=si.insuf_user;
-	insuf_sys=si.insuf_sys;
-	comm=si.comm;
-	real_comm=si.real_comm;
-	comm_start=si.comm_start;
-	idle=si.idle;
-	load_imb=si.load_imb;
-	synch=si.synch;
-	time_var=si.time_var;
-	overlap=si.overlap;
-	thr_user_time=si.thr_user_time;
-	thr_sys_time=si.thr_sys_time;
-	gpu_time_prod=si.gpu_time_prod;
-	gpu_time_lost=si.gpu_time_lost;
-	nproc=si.nproc;
-	threadsOfAllProcs=si.threadsOfAllProcs;
-    for (int i = 0; i < RED; i++) {
-        col_op[i] = si.col_op[i];
-    }
-//    std::cout << ">> Prev OK\n";
-    if (!isjson) {
-        op_group = new OpGrp[nproc][StatGrpCount];
-        //	for (int i = 0; i < nproc; ++i)
-        //        op_group[i] = new OpGrp[StatGrpCount];
-
-        for (unsigned long j = 0; j < nproc; j++) {
-            for (int i = 0; i < StatGrpCount; i++) {
-                op_group[j][i].calls = si.op_group[j][i].calls;
-                op_group[j][i].prod = si.op_group[j][i].prod;
-                op_group[j][i].lost_time = op_group[j][i].lost_time;
-            }
-        }
-    }
-//    std::cout << ">> Going to ProcTimes  -  nproc = " << nproc << std::endl;
-
-    proc_times = new struct ProcTimes[nproc];
-    for (unsigned long i = 0; i < nproc; ++i) {
-        proc_times[i].prod_cpu = si.proc_times[i].prod_cpu;
-        proc_times[i].prod_sys = si.proc_times[i].prod_sys;
-        proc_times[i].prod_io = si.proc_times[i].prod_io;
-        proc_times[i].exec_time = si.proc_times[i].exec_time;
-        proc_times[i].sys_time = si.proc_times[i].sys_time;
-        proc_times[i].real_comm = si.proc_times[i].real_comm;
-        proc_times[i].lost_time = si.proc_times[i].lost_time;
-        proc_times[i].insuf_user = si.proc_times[i].insuf_user;
-        proc_times[i].insuf_sys = si.proc_times[i].insuf_sys;
-        proc_times[i].comm = si.proc_times[i].comm;
-        proc_times[i].idle = si.proc_times[i].idle;
-        proc_times[i].load_imb = si.proc_times[i].load_imb;
-        proc_times[i].synch = si.proc_times[i].synch;
-        proc_times[i].time_var = si.proc_times[i].time_var;
-        proc_times[i].overlap = si.proc_times[i].overlap;
-        proc_times[i].thr_user_time = si.proc_times[i].thr_user_time;
-        proc_times[i].thr_sys_time = si.proc_times[i].thr_sys_time;
-        proc_times[i].gpu_time_prod = si.proc_times[i].gpu_time_prod;
-        proc_times[i].gpu_time_lost = si.proc_times[i].gpu_time_lost;
-        proc_times[i].num_threads = si.proc_times[i].num_threads;
-        std::cout << ">> Going to ThreadTime\n";
-        proc_times[i].th_times = new struct ThreadTime[proc_times[i].num_threads];
-        for (unsigned long j = 0; j < proc_times[i].num_threads; j++) {
-            proc_times[i].th_times[j].user_time = si.proc_times[i].th_times[j].user_time;
-            proc_times[i].th_times[j].sys_time = si.proc_times[i].th_times[j].sys_time;
-        }
-        proc_times[i].num_gpu = si.proc_times[i].num_gpu;
-//        std::cout << ">> Going to GpuTime  -  num_gpu = " << proc_times[i].num_gpu << std::endl;
-        proc_times[i].gpu_times = new struct GpuTime[proc_times[i].num_gpu];
-        for (unsigned int j = 0; j < proc_times[i].num_gpu; j++) {
-//            std::cout << ">> Name = " << si.proc_times[i].gpu_times[j].gpu_name << std::endl;
-            if (si.proc_times[i].gpu_times[j].gpu_name) {
-                proc_times[i].gpu_times[j].gpu_name = new char[strlen(si.proc_times[i].gpu_times[j].gpu_name) + 1];
-                strcpy(proc_times[i].gpu_times[j].gpu_name, si.proc_times[i].gpu_times[j].gpu_name);
-            } else {
-                proc_times[i].gpu_times[j].gpu_name = new char[2];
-                proc_times[i].gpu_times[j].gpu_name[0] = '0';
-                proc_times[i].gpu_times[j].gpu_name[1] = '\0';
-            }
-//            std::cout << ">> Name OK\n";
-            proc_times[i].gpu_times[j].prod_time = si.proc_times[i].gpu_times[j].prod_time;
-            proc_times[i].gpu_times[j].lost_time = si.proc_times[i].gpu_times[j].lost_time;
-            for (int m = 0; m < DVMH_STAT_METRIC_CNT; ++m) {
-                proc_times[i].gpu_times[j].metrics[m] = si.proc_times[i].gpu_times[j].metrics[m];
-            }
-        }
-    }
-	next = NULL;
-    std::cout << ">>  CStatInter(si)  OK\n";
-}
-
-void CStatInter::clear() {
-    if (!isjson){
-        delete [] op_group;
-        for (unsigned int i = 0; i < nproc; i++) {
-            if (proc_times[i].num_threads)
-                delete [] proc_times[i].th_times;
-            for (unsigned int j = 0; j < proc_times[i].num_gpu; j++)
-                if (proc_times[i].gpu_times[j].gpu_name)
-                    delete [] proc_times[i].gpu_times[j].gpu_name;
-            if (proc_times[i].num_gpu)
-                delete [] proc_times[i].gpu_times;
-        }
-    }
-}
-
-void CStatInter::delete_tail() {
-	if (next != NULL) {
-		next->delete_tail();
-        clear();
-        delete next;
-	}
-}
-
-CStatInter::~CStatInter() {
-    printf("Destructor: ~CStatInter()\n");
-	//delete_tail();
-	//clear();
-}
-
-//---  Copy dvmhStatMetric to metric in CStatInter  ---//
-void init_gpu_metric(GpuMetric &metric, dvmh_stat_interval_gpu_metric *dvmhStatMetric){
-    metric.countMeasures = dvmhStatMetric->countMeasures;
-    metric.max = dvmhStatMetric->max;
-    metric.mean = dvmhStatMetric->mean;
-    metric.min = dvmhStatMetric->min;
-    metric.sum = dvmhStatMetric->sum;
-    metric.timeLost = dvmhStatMetric->timeLost;
-    metric.timeProductive = dvmhStatMetric->timeProductive;
-}
-
-CStatInter::CStatInter(CStatRead * stat, int n)
-{
-    isjson = false;
-	//printf("begin init %d\n", n);
-	qproc = stat->QProc();
-	//������ ��������� �������� ���������
-	stat->ReadIdent(&id);
-	// string for processor characteristics - max
-	double min[ITER + 1];
-	double max[ITER + 1];
-	double sum[ITER + 1];
-	// communication
-	double minc[RED + 1];
-	double maxc[RED + 1];
-	double sumc[RED + 1];
-	// real communication
-	double minrc[RED + 1];
-	double maxrc[RED + 1];
-	double sumrc[RED + 1];
-	// synchronization
-	double mins[RED + 1];
-	double maxs[RED + 1];
-	double sums[RED + 1];
-	// variation
-	double minv[RED + 1];
-	double maxv[RED + 1];
-	double sumv[RED + 1];
-	// overlap
-	double minov[RED + 1];
-	double maxov[RED + 1];
-	double sumov[RED + 1];
-	// number of processor
-	unsigned long nprocmin[ITER + 1], nprocmax[ITER + 1];
-	unsigned long nprocminc[RED + 1], nprocmaxc[RED + 1];
-	unsigned long nprocminrc[RED + 1], nprocmaxrc[RED + 1];
-	unsigned long nprocmins[RED + 1], nprocmaxs[RED + 1];
-	unsigned long nprocminv[RED + 1], nprocmaxv[RED + 1];
-	unsigned long nprocminov[RED + 1], nprocmaxov[RED + 1];
-	stat->MinMaxSum(PRGEN, min, nprocmin, max, nprocmax, sum);
-	stat->MinMaxSum(PRCOM, minc, nprocminc, maxc, nprocmaxc, sumc);
-	stat->MinMaxSum(PRRCOM, minrc, nprocminrc, maxrc, nprocmaxrc, sumrc);
-	stat->MinMaxSum(PRSYN, mins, nprocmins, maxs, nprocmaxs, sums);
-	stat->MinMaxSum(PRVAR, minv, nprocminv, maxv, nprocmaxv, sumv);
-	stat->MinMaxSum(PROVER, minov, nprocminov, maxov, nprocmaxov, sumov);
-	//printf("main charecteristics\n");
-	//������ �������� ��������������
-	nproc = n;
-	prod_cpu = sum[CPUUSR];
-	prod_sys = sum[CPU];
-	prod_io = sum[IOTIME];
-	prod = prod_cpu + prod_sys + prod_io;
-	exec_time = max[EXEC];
-	sys_time = nproc * max[EXEC];
-	efficiency = sys_time ? prod / sys_time : 0.0;
-	threadsOfAllProcs = 0;
-	for (unsigned int not_i = 1; not_i <= nproc; ++not_i)
-		threadsOfAllProcs += stat->getThreadsAmountByProcess(not_i);
-	lost_time = sum[LOST];
-	insuf = sum[INSUFUSR] + sum[INSUF];
-	insuf_user = sum[INSUFUSR];
-	insuf_sys = sum[INSUF];
-	comm = sum[SUMCOM];
-	real_comm = sum[SUMRCOM];
-	comm_start = sum[START];
-	idle = sum[IDLE];
-	load_imb = sum[IMB];
-	synch = sum[SUMSYN];
-	time_var = sum[SUMVAR];
-	overlap = sum[SUMOVERLAP];
-	thr_user_time = sum[DVMH_THREADS_USER_TIME];
-	thr_sys_time = sum[DVMH_THREADS_SYSTEM_TIME];
-	gpu_time_prod = sum[DVMH_GPU_TIME_PRODUCTIVE];
-	gpu_time_lost = sum[DVMH_GPU_TIME_LOST];
-	for (int i = 0; i < RED; i++) {
-		col_op[i].ncall = stat->ReadCall(typecom(i));
-		col_op[i].comm = sumc[i];
-		col_op[i].real_comm = sumrc[i];
-		col_op[i].synch = sums[i];
-		col_op[i].time_var = sumv[i];
-		col_op[i].overlap = sumov[i];
-	}
-	//return;
-
-    op_group = new OpGrp[qproc][StatGrpCount];
-//    for (int i = 0; i < qproc; ++i)
-//        op_group[i] = new OpGrp[StatGrpCount];
-	//printf("group\n");
-	for (unsigned long j = 0; j < qproc; j++) {
-		double prod[StatGrpCount], lost[StatGrpCount], sumprod = 0.0, sumlost = 0.0;
-		double calls[StatGrpCount], sumcalls = 0.0;
-		//printf("stat call\n");
-		stat->GrpTimes(prod, lost, calls, j + 1);
-		//printf("begin loop\n");
-		for (int i = 0; i < StatGrpCount - 1; i++) {
-			sumprod = sumprod + prod[i];
-			sumlost = sumlost + lost[i];
-			sumcalls = sumcalls + calls[i];
-			op_group[j][i].calls = calls[i];
-			op_group[j][i].prod = prod[i];
-			op_group[j][i].lost_time = lost[i];
-		}
-		op_group[j][StatGrpCount - 1].calls = sumcalls;
-		op_group[j][StatGrpCount - 1].prod = sumprod;
-		op_group[j][StatGrpCount - 1].lost_time = sumlost;
-	}
-	//printf("proc %d\n", qproc);
-	proc_times = new struct ProcTimes[qproc];
-	//printf("struct\n");
-	stat->ReadProcS(proc_times);
-	//printf("procs call\n");
-	for (unsigned long np = 1; np <= qproc; ++np)
-	{
-		proc_times[np-1].num_threads = 0;
-		proc_times[np - 1].th_times = NULL;
-		dvmh_stat_interval        *dvmhStatInterval = stat->getDvmhStatIntervalByProcess(np);
-		if (!dvmhStatInterval) {
-			continue;
-		}
-		if (!dvmhStatInterval->threadsUsed)
-			continue;
-		proc_times[np - 1].num_threads = stat->getThreadsAmountByProcess(np);
-		proc_times[np - 1].th_times = new struct ThreadTime[proc_times[np - 1].num_threads];
-		for (unsigned long i = 0; i < proc_times[np - 1].num_threads; ++i)
-		{
-			proc_times[np - 1].th_times[i].user_time = dvmhStatInterval->threads[i].user_time;
-			proc_times[np - 1].th_times[i].sys_time = dvmhStatInterval->threads[i].system_time;
-		}
-	}
-	//printf("gpu\n");
-	for (unsigned long np = 1; np <= qproc; ++np)
-	{
-		dvmh_stat_interval        *dvmhStatInterval = stat->getDvmhStatIntervalByProcess(np);
-		dvmh_stat_header_gpu_info *dvmhStatGpuInfo;
-		if (!dvmhStatInterval) {
-			continue;
-		}
-		proc_times[np - 1].gpu_times = new struct GpuTime[DVMH_STAT_MAX_GPU_CNT];
-		proc_times[np - 1].num_gpu = 0;
-		for (int gpu = 0; gpu < DVMH_STAT_MAX_GPU_CNT; ++gpu) {
-			if (((dvmhStatInterval->mask >> gpu) & 1) == 0) continue;
-			proc_times[np - 1].num_gpu++;
-			dvmhStatGpuInfo = stat->getDvmhStatGpuInfoByProcess(np, gpu);
-			dvmh_stat_interval_gpu *dvmhStatGpu = &dvmhStatInterval->gpu[gpu];
-			if ((char *)dvmhStatGpuInfo->name) {
-				int lenName = strlen((char *)dvmhStatGpuInfo->name);
-				proc_times[np - 1].gpu_times[proc_times[np - 1].num_gpu - 1].gpu_name = new char[lenName + 1];
-				strcpy(proc_times[np - 1].gpu_times[proc_times[np - 1].num_gpu - 1].gpu_name, (char *)dvmhStatGpuInfo->name);
-			}
-			else {
-				proc_times[np - 1].gpu_times[proc_times[np - 1].num_gpu - 1].gpu_name = new char[2];
-				proc_times[np - 1].gpu_times[proc_times[np - 1].num_gpu - 1].gpu_name[0]='0';
-				proc_times[np - 1].gpu_times[proc_times[np - 1].num_gpu - 1].gpu_name[1] = '\0';
-			}
-			//--- Init times  ---//
-            dvmh_stat_interval_gpu_metric *dvmhStatMetric;
-			for (int m = 0; m < DVMH_STAT_METRIC_CNT; ++m)
-                init_gpu_metric(proc_times[np - 1].gpu_times[proc_times[np - 1].num_gpu - 1].metrics[m], &dvmhStatGpu->metrics[m]);
-			proc_times[np - 1].gpu_times[proc_times[np - 1].num_gpu - 1].prod_time = dvmhStatGpu->timeProductive;
-			proc_times[np - 1].gpu_times[proc_times[np - 1].num_gpu - 1].lost_time = dvmhStatGpu->timeLost;
-			//if (dvmhStatMetric->countMeasures <= 0) ????;
-		}
-	}
-	//printf("next\n");
-	n = stat->TreeWalk();
-	//printf("next %d\n", n);
-	if (n != 0)
-	{
-		next = new CStatInter(stat, n);
-	}
-	else
-		next = NULL;
-	//printf("end inter\n");
-}
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statinter.h b/projects/dvm_svn/tools/pppa/trunk/src/statinter.h
deleted file mode 100644
index eb73d19..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statinter.h
+++ /dev/null
@@ -1,93 +0,0 @@
-
-enum {
-	GSHADOW,
-	GREMOTE,
-	GREDISTRIBUTION,
-	GREGIONIN,
-	GNUMOP
-};
-
-struct GpuOpTime {             //������� �������� �������� ������ � gpu
-	double gpu_to_cpu;
-	double cpu_to_gpu;
-	double gpu_to_gpu;
-};
-
-struct ThreadTime {            //������� ������ ����� ����
-	double user_time;
-	double sys_time;
-};
-
-struct GpuMetric {
-    unsigned int countMeasures;  /**< количество измерений характеристики */
-    double  timeProductive; /**< полезное время */
-    double  timeLost;       /**< потерянное время */
-
-    // -- Агрегированные значения (для box-диаграммы)
-    double min;    /**< минимальное значение */
-    double mean;   /**< среднее */
-    double max;    /**< максимальное значение */
-    double sum;    /**< сумма значений */
-};
-
-struct GpuTime {               //������� ������ gpu
-	char * gpu_name;
-	double prod_time;
-    double lost_time;
-//    double kernel_exec;
-//	double loop_exec;
-//	double get_actual;
-//	double data_reorg;
-//	double reduction;
-//	double gpu_runtime_compilation;
-//	double gpu_to_cpu;
-//	double cpu_to_gpu;
-//	double gpu_to_gpu;
-//	struct GpuOpTime op_times[GNUMOP];
-    struct GpuMetric metrics[DVMH_STAT_METRIC_FORCE_INT];
-};
-
-struct ColOp {                 //������� ���������� ������������ ��������
-	long ncall;
-	double comm;
-	double synch;
-	double real_comm;
-	double time_var;
-	double overlap;
-};
-
-struct OpGrp {
-	double calls;
-	double lost_time;
-	double prod;
-};
-
-struct ProcTimes {
-	double prod_cpu;
-	double prod_sys;
-	double prod_io;
-	double exec_time;
-	double sys_time;
-	double real_comm;
-	double lost_time;
-	double insuf_user;
-	double insuf_sys;
-	double comm;
-	double idle;
-	double load_imb;
-	double synch;
-	double time_var;
-	double overlap;
-	double thr_user_time;
-	double thr_sys_time;
-	double gpu_time_prod;
-	double gpu_time_lost;
-	unsigned long num_threads;
-	struct ThreadTime * th_times;
-	unsigned long num_gpu;
-	struct GpuTime *gpu_times;
-	struct ColOp col_op[4];//4~RED
-};
-
-typedef struct OpGrp OpGrp;
-typedef struct ProcTimes ProcTimes;
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statist.h b/projects/dvm_svn/tools/pppa/trunk/src/statist.h
deleted file mode 100644
index b00cb66..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statist.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#if !defined( __STATIST_H )
-#define __STATIST_H
-void CreateInter(int typef,long val);
-int FindInter(int typef,long val);
-void EndInter(long nline);
-void FreeInter(void);
-#endif
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statlist.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statlist.cpp
deleted file mode 100644
index 8847489..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statlist.cpp
+++ /dev/null
@@ -1,361 +0,0 @@
-#include "statlist.h"
-
-CStatList::CStatList(char * path) {
-	err = false;
-	length = 0;
-	lname = NULL;				//???
-	stat_list = NULL;
-	last = NULL;
-	comp_stat1 = NULL;
-	comp_stat2 = NULL;
-	char buf[100];
-	std::ifstream fin;
-	fin.open(path);
-	fin.getline(buf, 100);
-	if (!fin.eof()) {
-		stat_list = new struct CStatNode;
-	}
-	else {
-		stat_list = NULL;
-		last = NULL;
-	}
-	CStatNode * cur = stat_list, * prev = NULL;
-	while (!fin.eof()) {
-		cur->stat.init(buf);
-		if (cur->stat.err) {
-			err = true;
-			clear_stat_list(stat_list);
-			delete stat_list;
-			return;
-		}
-		fin.getline(buf, 100);
-		if (!fin.eof()) {
-			cur->next = new struct CStatNode;
-			prev = cur;
-			cur = cur->next;
-		}
-		else {
-			cur->next = NULL;
-		}
-	}
-	if (prev) {
-		last = &prev->next;
-	}
-	else {
-		last = NULL;
-	}
-
-};
-
-CStatList::CStatList(int n, char** paths) {
-	length = n;
-	lname = NULL;				//???
-	if (n > 0) {
-		stat_list = new struct CStatNode;
-		CStatNode * cur = stat_list, * prev = NULL;
-		for (; n > 0; n--) {
-			cur->stat.init(paths[n - 1]);
-			if (cur->stat.err) {
-				err = true;
-				clear_stat_list(stat_list);
-				delete stat_list;
-				return;
-			}
-			if (n - 1 > 0) {
-				cur->next = new struct CStatNode;
-				prev = cur;
-				cur = cur->next;
-			}
-			else
-				cur->next = NULL;
-		}
-		if (prev) {
-			last = &prev->next;
-		}
-		else {
-			last = NULL;
-		}
-	}
-	else {
-		stat_list = NULL;
-		last = NULL;
-	}
-	comp_stat1 = NULL;
-	comp_stat2 = NULL;
-};
-
-CStatList::CStatList() {
-	err = false;
-	length = 0;
-	lname = NULL;				//???
-	stat_list = NULL;
-	last = NULL;
-	comp_stat1 = NULL;
-	comp_stat2 = NULL;
-};
-
-CStatList::CStatList(const CStatList & sl) {
-	length = sl.length;
-	lname = NULL;				//???
-	int n = length;
-	if (n > 0) {
-		stat_list = new struct CStatNode;
-		CStatNode * cur_new = stat_list, *prev = NULL, *cur_old = sl.stat_list;
-		for (; n > 0; n--) {
-			cur_new->stat.init(sl.stat_list->stat.spath);
-			if (cur_new->stat.err) {
-				err = true;
-				clear_stat_list(stat_list);
-				delete stat_list;
-				return;
-			}
-			if (n - 1 > 0) {
-				cur_new->next = new struct CStatNode;
-				prev = cur_new;
-				cur_new = cur_new->next;
-				cur_old = cur_old->next;
-			}
-			else
-				cur_new->next = NULL;
-		}
-		if (prev) {
-			last = &prev->next;
-		}
-		else {
-			last = NULL;
-		}
-	}
-	else {
-		stat_list = NULL;
-		last = NULL;
-	}
-	comp_stat1 = NULL;
-	comp_stat2 = NULL;
-};
-
-CStatList::~CStatList() {
-	clear_stat_list(stat_list);
-	delete stat_list;
-};
-
-CStatList & CStatList::operator= (const CStatList & sl) {
-	clear_list();
-	length = sl.length;
-	lname = NULL;				//???
-	int n = length;
-	if (n > 0) {
-		stat_list = new struct CStatNode;
-		CStatNode * cur_new = stat_list, *prev = NULL, *cur_old = sl.stat_list;
-		for (; n > 0; n--) {
-			cur_new->stat.init(sl.stat_list->stat.spath);
-			if (n - 1 > 0) {
-				cur_new->next = new struct CStatNode;
-				prev = cur_new;
-				cur_new = cur_new->next;
-				cur_old = cur_old->next;
-			}
-			else
-				cur_new->next = NULL;
-		}
-		if (prev) {
-			last = &prev->next;
-		}
-		else {
-			last = NULL;
-		}
-	}
-	else {
-		stat_list = NULL;
-		last = NULL;
-	}
-	comp_stat1 = NULL;
-	comp_stat2 = NULL;
-	return *this;
-};
-
-CStatList & CStatList::operator+ (const CStatList & sl) {
-	length += sl.length;
-	int n = sl.length;
-	if (n > 0) {
-		CStatNode * cur_new, *prev = NULL, *cur_old = sl.stat_list;
-		if (last) {
-			(*last)->next = new struct CStatNode;
-			prev = *last;
-			cur_new = (*last)->next;
-		}
-		else {
-			if (stat_list) {
-				(stat_list)->next = new struct CStatNode;
-				cur_new = (stat_list)->next;
-				prev = stat_list;
-			}
-			else {
-				stat_list = new struct CStatNode;
-				cur_new = stat_list;
-			}
-		}
-		for (; n > 0; n--) {
-			cur_new->stat.init(sl.stat_list->stat.spath);
-			if (n - 1 > 0) {
-				cur_new->next = new struct CStatNode;
-				prev = cur_new;
-				cur_new = cur_new->next;
-				cur_old = cur_old->next;
-			}
-			else
-				cur_new->next = NULL;
-		}
-		if (prev) {
-			last = &prev->next;
-		}
-		else {
-			last = NULL;
-		}
-	}
-	return *this;
-};
-
-void CStatList::add_nodes(int n, char ** paths) {
-	if (n > 0) {
-		CStatNode * cur, *prev = NULL;
-		length += n;
-		if (last) {
-			(*last)->next = new struct CStatNode;
-			prev = *last;
-			cur = (*last)->next;
-		}
-		else {
-			if (stat_list) {
-				(stat_list)->next = new struct CStatNode;
-				cur = (stat_list)->next;
-				prev = stat_list;
-			}
-			else {
-				stat_list = new struct CStatNode;
-				cur = stat_list;
-			}
-		}
-		for (int i=0; i<n; i++) {
-			cur->stat.init(paths[i]);
-			if (i+1<n) {
-				cur->next = new struct CStatNode;
-				prev = cur;
-				cur = cur->next;
-			}
-			else
-				cur->next = NULL;
-		}
-		if (prev) {
-			last = &prev->next;
-		}
-		else {
-			last = NULL;
-		}
-	}
-};
-
-void CStatList::clear_list() {
-	clear_stat_list(stat_list);
-	clear_stat_list(comp_stat1);
-	clear_stat_list(comp_stat2);
-	stat_list = NULL;
-	comp_stat1 = NULL;
-	comp_stat2 = NULL;
-	last = NULL;
-	delete [] lname;
-	lname = NULL;
-	length = 0;
-}
-
-void CStatList::rename_list(char * new_lname) {
-	if (lname) {
-		delete[] lname;
-	}
-	lname = new char[strlen(new_lname) + 1];
-	strcpy(lname, new_lname);
-};
-
-void CStatList::del_node(char * path) {
-	struct CStatNode * cur = stat_list, *prev = NULL;
-	while (cur != NULL) {
-		if (!strcmp(path, cur->stat.spath)) {
-			if (prev) {
-				prev->next = cur->next;
-			}
-			else {
-				stat_list = cur->next;
-			}
-			cur->stat.clear();
-		}
-		cur = cur->next;
-		prev = cur;
-	}
-};
-
-//void change_nparam (char * path, ???);
-
-
-struct CStatNode * CStatList::get_stat_node(char * path) {
-	struct CStatNode * cur = stat_list;
-	while (cur != NULL) {
-		if (!strcmp(path, cur->stat.spath)) {
-			return cur;
-		}
-		cur = cur->next;
-	}
-	return NULL;
-};
-
-CStat * CStatList::get_stat(char * path) {
-	struct CStatNode * np = get_stat_node(path);
-	return &np->stat;
-};
-
-void CStatList::save_list(char * path) {
-	std::ofstream fout;
-	fout.open(path);
-	struct CStatNode * cur = stat_list;
-	while (cur) {
-		fout << (cur->stat.spath) << std::endl;
-		cur = cur->next;
-	}
-	fout.close();
-};
-
-
-void CStatList::compare(struct CStatNode * n1, struct CStatNode * n2) {
-	if (comp_stat1) {
-		comp_stat1->stat.clear();
-	}
-	else {
-		comp_stat1 = new CStatNode;
-	}
-	if (comp_stat2) {
-		comp_stat2->stat.clear();
-	}
-	else {
-		comp_stat2 = new CStatNode;
-	}
-	comp_stat2->next = NULL;
-	comp_stat1->next = NULL;
-	comp_stat1->param = n1->param;
-	comp_stat2->param = n2->param;
-	stat_intersect(n1->stat, n2->stat, comp_stat1->stat, comp_stat2->stat);
-};
-
-
-void CStatList::clear_stat_list(CStatNode * sl) {
-	if (sl->next) {
-		clear_stat_list(sl->next);
-		delete sl->next;
-	}
-	else {
-		sl->stat.clear();
-	}
-};
-
-
-
-
-
-
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statlist.h b/projects/dvm_svn/tools/pppa/trunk/src/statlist.h
deleted file mode 100644
index e0fc8c3..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statlist.h
+++ /dev/null
@@ -1,168 +0,0 @@
-#include "json.hpp"
-#include <ctime>
-#define _STATFILE_
-#include "statread.h"
-#include <string.h>
-#include <stdlib.h>
-#include <fstream>
-#include <float.h>
-#include <exception>
-#include <new>
-#include <stdbool.h>
-#include <string>
-#include <sstream>
-
-using json = nlohmann::json;
-
-namespace patch
-{
-	template < typename T > std::string to_string(const T& n)
-	{
-		std::ostringstream stm;
-		stm << n;
-		return stm.str();
-	}
-}
-
-class CStatInter {
-public:
-    CStatInter( const CStatInter& si);
-	CStatInter(CStatRead * stat_read, int n);
-	CStatInter(json source);
-	~CStatInter();
-	void delete_tail();
-	void clear();
-	void to_string(std::string & result);
-	void to_json(json & result);
-
-	ident id;
-	//main characteristics
-	double prod_cpu;
-	double prod_sys;
-	double prod_io;
-	double prod;
-	double exec_time;
-	double sys_time;
-	double efficiency;
-	double lost_time;
-	double insuf;
-	double insuf_user;
-	double insuf_sys;
-	double comm;
-	double real_comm;
-	double comm_start;
-	double idle;
-	double load_imb;
-	double synch;
-	double time_var;
-	double overlap;
-	double thr_user_time;
-	double thr_sys_time;
-	double gpu_time_prod;
-	double gpu_time_lost;
-	unsigned long nproc;
-	unsigned long threadsOfAllProcs;
-	struct ColOp col_op[RED];
-    OpGrp (* op_group)[StatGrpCount];
-    unsigned long qproc;
-    bool isjson;
-    //comparative characteristics
-	//struct ProcTimes comp_proc_times[3];
-	//characteristics by processes
-	struct ProcTimes *  proc_times;
-	CStatInter * next;
-};
-
-struct CProcInfo {
-	char * node_name;
-	double test_time;
-};
-
-class CStat {   //копирование и присваивание запрещены
-private:
-    CStat operator=(const CStat&);
-    CStat( const CStat& );
-public:
-	CStat();
-	CStat(json source);
-	void init(const char* path);
-	void init(CStatRead* stat);
-	void clear();
-	~CStat() ;
-	CStatInter * inter_tree;                                //"�������" ������ ����������
-	unsigned long nproc;									//���������� ���������
-	char p_heading[80];
-	CProcInfo  * proc_info;                                 //���������� �� ����������� (��� ����, �������� �����)
-    CStatRead * stat;
-    char * spath;
-	bool iscomp;
-	bool isinitialized;
-	void to_string(std::string & result);
-	void to_json(json &result);
-	bool err;
-	bool isjson;
-};
-
-struct CStatParam {
-	//?????????????       								    //��������� �������
-};
-
-struct CStatNode {                                          //��������� ���������� � ������
-	CStat stat;
-	struct CStatNode * next;
-	struct CStatParam param;
-};
-
-class CStatList {
-public:
-	CStatList(int n, char** paths) ;                      //������� ������ �� ������ n ���������
-	CStatList(char * path) ;                              //������� ����������� ������
-	CStatList();                                          //������� ������ ������
-	CStatList(const CStatList & stat_list);
-	~CStatList();
-	CStatList & operator= (const CStatList & stat_list);
-	CStatList & operator+ (const CStatList & stat_list);
-	void add_nodes(int n, char ** paths) ;  //�������� �������� � ������
-	void clear_list() ;                                   //������� ��� �������� �� ������
-	void rename_list(char * new_lname);                     //������������� ������
-	void del_node(char * path) ;                          //������� ���� ������� ������
-	struct CStatNode * get_stat_node(char * path) ;       //�������� ��������� �� ��������� ����� (����������)
-	CStat * get_stat(char * path) ;
-	void save_list(char * path);	                        //��������� ������ � ��������� ����
-	void compare(struct CStatNode * n1, struct CStatNode * n2);
-	void clear_stat_list(CStatNode * sl) ;
-	struct CStatNode* stat_list, **last, *comp_stat1, *comp_stat2;
-	int length;
-	char * lname;
-	bool err;
-};
-
-void inter_tree_intersect(CStatInter *i1, CStatInter *i2, CStatInter **r1, CStatInter **r2);
-void stat_intersect(const CStat &s1, const CStat &s2, CStat & r1, CStat & r2);
-CStatInter * find_inter(long expr, short nlev, CStatInter * cur);
-CStatInter * next_inter(short nlev, CStatInter * cur);
-/*
-struct CStatListNode {
-	char * nname;
-	CStatList sl;
-	CStatListNode * next;
-};
-
-CStatListNode * stat_set, **last; //stat_set - list of CStatList
-
-void create_stat_list(char * name) {
-	if (stat_set) {
-		(*last)->next = new CStatListNode;
-		last = &(*last)->next;
-		(*last)->next = NULL;
-		(*last)->nname = new char[strlen(name) + 1];
-		strcpy((*last)->nname, name);
-	}
-	else {
-		stat_set = new CStatListNode;
-		stat_set->next = NULL;
-		stat_set->nname = new char[strlen(name) + 1];
-		strcpy(stat_set->nname, name);
-		last = &stat_set;
-	}
-}*/
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statprintf.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statprintf.cpp
deleted file mode 100644
index 6013539..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statprintf.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "statprintf.h"
-#include <string.h>
-#include <stdarg.h>
-CStatPrintf::CStatPrintf(char *name,int lstr,char *mode)
-//name -file name
-//lstr - string length for sprintf,used only for compressed file
-// mode -file mode,"wb0"- not compress out file 
-{
-	valid=TRUE;
-	ff=NULL;
-	lenstr=lstr;
-	pstr=new char[lstr];
-	if (pstr==NULL) throw("Out of memory\n");
-	if (strcmp(mode,"wb0")!=0)  {// compress file
-		char *pname=new char[strlen(name)+4];
-		if (pname==NULL) throw("Out of memory\n");
-		strcpy(pname,name);
-		strcat(pname,".gz");
-		ffgz=gzopen(pname,mode);
-		if (ffgz==NULL) {
-			valid=FALSE;
-			sprintf(texterr,"Can't open file %s\n",name);
-			return;
-		}
-	} else {
-		ff=fopen(name,"w");
-		if (ff==NULL) {
-			valid=FALSE;
-			sprintf(texterr,"Can't open file %s\n",name);
-			return;
-		}
-	}
-	return;
-}
-//-------------------------------------------------
-//return result of constructor execution
-BOOL CStatPrintf::Valid()
-{
-	return(valid);
-}
-//-------------------------------------------
-// error message
-void CStatPrintf::TextErr(char *p)
-{
-	strcpy(p,texterr);
-}
-//------------------------------------------------
-// change length of string, if it > lenstr
-void CStatPrintf::ChangeLenStr(int lstr)
-{
-	if (lstr<=lenstr) return;
-	char * ppstr=new char[lstr];
-	if (ppstr==NULL) throw("Out of memory\n");
-	delete []pstr;
-	pstr=ppstr;
-	lenstr=lstr;
-	return;
-}
-//---------------------------------------------------------
-int CStatPrintf::StatPrintf(const char *format,...)
-	{
-		va_list arglist;
-		va_start(arglist,format);
-		if (ff==NULL) { // compress file
-			int len=vsprintf(pstr,format,arglist);
-			if (len<=0) return 1;
-			int ans=gzwrite(ffgz,pstr,unsigned(len));
-			if (ans!=len) return 1;
-		} else {
-			vfprintf(ff,format,arglist);
-		}
-		va_end(arglist);
-		return 0;
-	}
-//----------------------------------------------------------
-CStatPrintf::~CStatPrintf()
-{ 
-	if (ff==NULL) {
-		delete []pstr;
-		gzclose(ffgz);
-	} else fclose (ff);
-	return;
-}
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statprintf.h b/projects/dvm_svn/tools/pppa/trunk/src/statprintf.h
deleted file mode 100644
index 2b71ec2..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statprintf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef _STATPRINTF_H
-#define _STATPRINTF_H
-#include "bool.h"
-#include "zlib.h"
-#include "stdio.h"
-class CStatPrintf {
-public:
-CStatPrintf(char * name,int lstr,char *mode);
-~CStatPrintf();
-void ChangeLenStr(int lstr);
-BOOL Valid();
-void TextErr(char *t);
-int StatPrintf(const char *format,...);
-private:
-	int lll;
-	char *pstr;
-	int lenstr;
-	FILE * ff;
-	gzFile ffgz;
-	BOOL valid;
-	char texterr[80];
-};
-#endif
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statread.cpp b/projects/dvm_svn/tools/pppa/trunk/src/statread.cpp
deleted file mode 100644
index 35b8563..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statread.cpp
+++ /dev/null
@@ -1,1242 +0,0 @@
-#define _STATFILE_
-
-#include "zlib.h"
-#include <string.h>
-#include <float.h>
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <new>
-#include "bool.h"
-#include "strall.h"
-#include "inter.h"
-#include "treeinter.h"
-#include "potensyn.h"
-#include "statread.h"
-
-using namespace std;
-extern short reverse, szsh, szl, szd, szv, torightto, torightfrom;
-
-// read intervals and synchronization times from file
-// name - file name
-CStatRead::CStatRead(const char *statFilePath, int iIM, int jIM, short sore)
-{
-    gzFile statFile = NULL;
-
-    curnproc = 0;
-    curntime = 0;
-    nf = 0;
-    rank = 0;
-    maxnlevel = 0;
-    pch_vms = NULL;
-    smallbuff = 0;
-    valid_synchro = false;
-
-    valid = TRUE;
-    valid_warning = 0;
-    BOOL valid_synchro = TRUE;
-    valid_synchro = TRUE;
-    pclfrag = NULL;
-    pclsyn = NULL;
-    pic = NULL;
-    pch_vmssize = NULL;
-    pvers = NULL;
-    pvms *pb_vms = NULL;
-    proccount = 0;
-
-    statFile = gzopen(statFilePath, "rb");
-    if (statFile == NULL) {
-        valid = FALSE;
-        sprintf(texterr, "Can't open file %s \n", statFilePath);
-        return;
-    }
-
-    unsigned long lbufcompr, lbufuncompr = 0, luncompr, luncomprread;
-    pbufcompr = NULL;
-    pbufuncompr = NULL;
-    char lbufplusch[12] = {0};
-    char nprocch[12] = {0};
-    int s; // for gzread
-    long l; // for gztell
-    short sz[QV_CONST];
-    unsigned char *psz; //struc sz
-    gzplus = 0; // sign of file gz/ gz+
-
-    if (strstr(statFilePath, ".gz+") != NULL) {
-        gzplus = 1;
-        int k;
-        for (k = 0; ; k++) { // number of compressed bytes
-            if (gzread(statFile, &(lbufplusch[k]), 1) != 1) {
-                valid = FALSE;
-                sprintf(texterr, "Can't read from file %s \n", statFilePath);
-                return;
-            }
-            if (lbufplusch[k] == 0) break;
-        }
-        lbufuncompr = atol(lbufplusch); // size of buffer
-        for (k = 0; k < 12; k++) lbufplusch[k] = 0;
-        for (k = 0; ; k++) { // number of processors
-            if (gzread(statFile, &(nprocch[k]), 1) != 1) {
-                valid = FALSE;
-                sprintf(texterr, "Can't read from file %s \n", statFilePath);
-                return;
-            }
-            if (nprocch[k] == 0) break;
-        }
-        for (k = 0; ; k++) { // number of compressed bytes
-            if (gzread(statFile, &(lbufplusch[k]), 1) != 1) {
-                valid = FALSE;
-                sprintf(texterr, "Can't read from file %s \n", statFilePath);
-                return;
-            }
-            if (lbufplusch[k] == 0) break;
-        }
-        lbufcompr = atol(lbufplusch);
-        pbufcompr = new unsigned char[lbufcompr];
-        if (pbufcompr == NULL) throw("Out of memory\n");
-        luncompr = lbufuncompr + lbufuncompr / 1000 + 12; // length uncompressed buffer
-        luncomprread = luncompr;
-        if (pbufcompr != NULL) {
-            pbufuncompr = new unsigned char[luncompr];
-            if (pbufuncompr == NULL) throw("Out of memory\n");
-        }
-        s = gzread(statFile, pbufcompr, lbufcompr);
-        if (s != (int) lbufcompr) {
-            valid = FALSE;
-            sprintf(texterr, "Can't read from file %s l=%ld\n", statFilePath, lbufcompr);
-            return;
-        }
-        int err = uncompress(pbufuncompr, &luncomprread, pbufcompr, lbufcompr);
-        if (err != Z_OK || luncomprread != lbufuncompr) {
-            valid = FALSE;
-            sprintf(texterr, "Can't uncompress l=%ld\n", lbufcompr);
-            return;
-        }
-        psz = pbufuncompr;
-    } else { // file gz or other files
-        l = gztell(statFile);
-        psz = (unsigned char *) (&(sz[0]));
-        // read const information about size of variables and reverse
-        s = gzread(statFile, &sz, sizeof(sz));
-        if (s != (int) sizeof(sz)) {
-            valid = FALSE;
-            sprintf(texterr, "Can't read from file %s addr=%ld size=%d\n",
-                    statFilePath, l, (int) sizeof(sz));
-            return;
-        }
-    }
-    // data presentation
-    memcpy(&reverse, psz, 2); // variables reverse and toright for CPYMEM
-    if (reverse != 1) {
-        short imcpy, sh1 = 0;
-        for (imcpy = sizeof(reverse) - 1; imcpy >= 0; imcpy--) {
-            *((unsigned char *) (&sh1) + imcpy) =
-                    *((unsigned char *) (&reverse) + sizeof(reverse) - 1 - imcpy);
-        }
-        if (sh1 != 1) {
-            valid = FALSE;
-            sprintf(texterr, "Analyzing file %s is not statistics\n", statFilePath);
-            return;
-        }
-        reverse = 1;
-    } else reverse = 0;
-    short left = 1;
-    torightto = 0;
-    torightfrom = 0;
-    char *pleft = (char *) &left;
-    if (reverse == 1) { // data reverse
-        if (pleft[0] == 0) torightto = 1; else torightfrom = 1;
-    }
-    // size of used variables
-    CPYMEM(szsh, psz + 2, 2);
-    CPYMEM(szl, psz + 4, 2);
-    CPYMEM(szv, psz + 6, 2);
-    CPYMEM(szd, psz + 8, 2);
-    if ((szsh != SZSH) || /*(szl>SZL) || (szv>SZV) ||*/ (szd != SZD)) {
-        valid = FALSE;
-        sprintf(texterr, "Size of accumulating data > size of machine data %d>%d\n",
-                szsh, (int) SZSH);
-        return;
-    }
-    if ((szl > SZL) || (szv > SZV)) {
-        sprintf(textwarning[valid_warning], "Number of operation may be incorrect. Data size not equal. %d>%d %d>%d\n",
-                szl, (int) SZL, szv, (int) SZV);
-        valid_warning++;
-    }
-    // calculate size of const information
-    int lvms = QV_SHORT * szsh + QV_LONG * szl + QV_VOID * szv + QV_DOUBLE * szd;
-    // read const information from file
-    unsigned char *pch_vms = NULL;
-    if (gzplus == 1) pch_vms = pbufuncompr + sizeof(sz);
-    else {
-        pch_vms = new unsigned char[lvms];
-        if (pch_vms == NULL) throw("Out of memory\n");
-        l = gztell(statFile);
-        s = gzread(statFile, pch_vms, lvms);
-        if (s != lvms) {
-            valid = FALSE;
-            sprintf(texterr, "Can't read from file %s addr=%ld size=%d\n",
-                    statFilePath, l, lvms);
-            return;
-        }
-    }
-    unsigned long linter = 0; // read there only for control
-    CPYMEM(linter, pch_vms + MAKELONG(pb_vms, linter, proccount, QV_SHORT), szl);
-    if (linter <= 0) {
-        valid = FALSE;
-        sprintf(texterr, "Execution was exit with statistics error. \n");
-        return;
-    }
-    // smallbuff - not enough memory in buffer,not all data accumulated
-    CPYMEM(smallbuff, pch_vms + MAKESHORT(pb_vms, smallbuff, rank), szsh);
-    if (smallbuff == 1) {
-        sprintf(textwarning[valid_warning],
-                "Not all times of collective operations were accumulated\n");
-        valid_warning++;
-    }
-    CPYMEM(rank, pch_vms + MAKESHORT(pb_vms, rank, rank), szsh);
-    // global size of const information
-    size_t lvms_add = lvms + szl * rank + QV_CONST * 2;
-    // size of VMS run
-    pch_vmssize = new unsigned char[szl * rank];
-    if (pch_vmssize == NULL) throw("Out of memory\n");
-    if (gzplus == 1) memcpy(pch_vmssize, pbufuncompr + sizeof(sz) + lvms, szl * rank);
-    else {
-        l = gztell(statFile);
-        s = gzread(statFile, pch_vmssize, szl * rank);
-        if (s != szl * rank) {
-            valid = FALSE;
-            sprintf(texterr, "Can't read from file %s addr=%ld size=%d\n",
-                    statFilePath, l, szl * rank);
-            return;
-        }
-    }
-    CPYMEM(maxnlevel, pch_vms + MAKESHORT(pb_vms, maxnlev, rank), szsh);
-    CPYMEM(proccount, pch_vms + MAKELONG(pb_vms, proccount, proccount, QV_SHORT), szl);
-    pclfrag = new CTreeInter *[proccount];
-    if (pclfrag == NULL) throw("Out of memory\n");
-    unsigned long i;
-    for (i = 0; i < proccount; i++) pclfrag[i] = NULL;
-    // allocate memory for pointer of synchronization times
-    pclsyn = new CSynchro *[proccount];
-    if (pclsyn == NULL) throw("Out of memory\n");
-    // proccount - number of processors, the main loop
-    for (i = 0; i < proccount; i++) pclsyn[i] = NULL;
-    unsigned long lsynchro = 0;
-
-    // Чтение статстик по процессорам
-    for (i = 0; i < proccount; i++) {// main processor's loop
-        unsigned long qfrag = 0;
-        short maxn = 0;
-        // qfrag - number of intervals
-        CPYMEM(qfrag, pch_vms + MAKELONG(pb_vms, qfrag, proccount, QV_SHORT), szl);
-        // maxn - number of levels
-        CPYMEM(maxn, pch_vms + MAKESHORT(pb_vms, maxnlev, rank), szsh);
-        // linter - size of all intervals in bytes
-        CPYMEM(linter, pch_vms + MAKELONG(pb_vms, linter, proccount, QV_SHORT), szl); //all variables on other processors may be not equivalent
-        char *pbuffer = NULL;
-        CPYMEM(pbuffer, pch_vms + MAKEVOID(pb_vms, pbuffer, pbuffer, QV_SHORT, QV_LONG), szv);
-        // length of version, platform and processor name
-        short lvers = 0;
-        CPYMEM(lvers, pch_vms + MAKESHORT(pb_vms, lvers, rank), szsh);
-        // different values on each processor
-        if (lvers <= 0) {
-            valid = FALSE;
-            sprintf(texterr, "Incorrect version\n");
-            return;
-        }
-        pvers = new char[lvers];
-        if (pvers == NULL) throw("Out of memory\n");
-        l = gztell(statFile);
-        if (gzplus == 1) {
-            memcpy(pvers, (char *) (pbufuncompr + sizeof(sz) + lvms + szl * rank), lvers);
-        } else {
-            // read from file platform, version number, processor name and time
-            s = gzread(statFile, pvers, lvers);
-            if (s != lvers) {
-                valid = FALSE;
-                sprintf(texterr, "Can't read from file %s addr=%ld size=%d\n",
-                        statFilePath, l, lvers);
-                return;
-            }
-        }
-
-        pbuffer = pbuffer + lvms_add + lvers;
-
-        // -- dvmh
-        unsigned int dvmhGpuIndex, dvmhStringPos;
-        unsigned char *dvmhStatBuffer = (unsigned char *) (pbufuncompr + lvms_add + lvers);
-        dvmh_stat_header          *dvmhStatHeader = new dvmh_stat_header();
-        dvmh_stat_header_gpu_info *dvmhStatGpuInfo;
-
-        if (dvmhDebug) { printf("Proc #%d\n",i); fflush(stdout); }
-
-        if (!dvmhStatHeader) throw("Out of memory\n");
-
-        if (dvmhDebug) { printf("   Allocated memory for DVMH statistics header.\n"); fflush(stdout); }
-
-        // Читаем информацию о размерах структур
-        CPYMEM(dvmhStatHeader->sizeHeader, dvmhStatBuffer, szl);
-        dvmhStatBuffer += szl;
-        CPYMEM(dvmhStatHeader->sizeIntervalConstPart, dvmhStatBuffer, szl);
-        dvmhStatBuffer += szl;
-        CPYMEM(dvmhStatHeader->threadsAmount, dvmhStatBuffer, szl);
-        dvmhStatBuffer += szl;
-
-        if (dvmhDebug) {
-            printf("   dvmhHeaderSize            : %lu\n", dvmhStatHeader->sizeHeader);
-            printf("   dvmhIntervalSizeConstPart : %lu\n", dvmhStatHeader->sizeIntervalConstPart);
-            printf("   threadsAmount             : %lu\n", dvmhStatHeader->threadsAmount);
-            fflush(stdout);
-        }
-
-        // Читаем информацию о GPU процессора
-        for (dvmhGpuIndex = 0; dvmhGpuIndex < DVMH_STAT_MAX_GPU_CNT; ++dvmhGpuIndex) {
-            dvmhStatGpuInfo = & dvmhStatHeader->gpu[dvmhGpuIndex];
-            CPYMEM(dvmhStatGpuInfo->id, dvmhStatBuffer, szl);
-            dvmhStatBuffer += szl;
-            for (dvmhStringPos = 0; dvmhStringPos <= DVMH_STAT_SIZE_STR; ++dvmhStringPos) {
-                CPYMEM(dvmhStatGpuInfo->name[dvmhStringPos], dvmhStatBuffer, 1);
-                dvmhStatBuffer++;
-            }
-            if (dvmhDebug) {
-                printf("   GPU #%d\n",dvmhGpuIndex);
-                printf("      Id  : %d\n", dvmhStatGpuInfo->id);
-                printf("      Name: %s\n", dvmhStatGpuInfo->name);
-                fflush(stdout);
-            }
-        }
-
-        if (dvmhDebug) { printf("   GPU info loaded.\n"); fflush(stdout); }
-
-        // Устанавливаем начальный указатель на интервалы @todo
-        pbuffer += dvmhStatHeader->sizeHeader;
-        // --
-
-
-        unsigned char *pinterinbuff;
-        if (gzplus == 1) pinterinbuff = pbufuncompr + lvms_add + lvers + dvmhStatHeader->sizeHeader; //-- dvmh
-        else pinterinbuff = NULL;
-        // processor name
-        char *pprocname = pvers + strlen(pvers) + strlen(pvers + strlen(pvers) + 1) + 2;
-        double proct = 0.;// processor time
-        CPYMEM(proct, pch_vms + MAKEDOUBLE(pb_vms, proctime, proctime, QV_SHORT, QV_LONG, QV_VOID), szd);
-        // create interval tree
-        pclfrag[i] = new CTreeInter(statFile, linter, pbuffer, i, qfrag, maxn,
-                pprocname, proct, iIM, jIM, sore, pinterinbuff, dvmhStatHeader); // --dvmh
-        if (pclfrag[i] == NULL) throw("Out of memory\n");
-        valid = pclfrag[i]->Valid();
-        if (!valid) {
-            pclfrag[i]->TextErr(texterr);
-            return;
-        }
-        unsigned long lbuf = 0;
-        // lbuf - size of buffer
-        CPYMEM(lbuf, pch_vms + MAKELONG(pb_vms, lbuf, proccount, QV_SHORT), szl);
-        // lsynchro - size of synchronyzation times in bytes
-        if (valid_synchro == FALSE) lsynchro = 0; // out of memory for synchro operations
-        else CPYMEM(lsynchro, pch_vms + MAKELONG(pb_vms, lsynchro, proccount, QV_SHORT), szl);
-        // set it the first time
-        unsigned char *psynchroinbuff;
-        if (gzplus == 1) {
-            psynchroinbuff = lbuf - lsynchro + pbufuncompr;
-            //psynchroinbuff=pinterinbuff+lbuf-lsynchro-linter-lvms_add-lvers;
-        } else {
-            psynchroinbuff = NULL;
-            if (z_off_t zo = gzseek(statFile, lbuf - lsynchro - linter - lvms_add - lvers, SEEK_CUR) == -1) {
-                sprintf(texterr, "Can't read from file %s addr=%ld size=%ld\n",
-                        statFilePath, l, lbuf - lsynchro - linter - lvms_add - lvers);
-                valid = FALSE;
-                return;
-            }
-        }
-        if (lsynchro > 0) {
-            l = gztell(statFile);
-            // create array of synchronization times
-            try {
-                pclsyn[i] = new CSynchro(statFile, lsynchro, psynchroinbuff);
-                if (pclsyn[i] == NULL) throw("Out of memory\n");
-            }
-            catch (bad_alloc e) {
-                valid_synchro = FALSE;
-                //lsynchro=0;
-                for (unsigned int j = 0; j <= i; j++) {
-                    if (pclsyn[j] != NULL) {
-                        pclsyn[j]->~CSynchro();
-                        pclsyn[j] = NULL;
-                    }
-                }
-                sprintf(textwarning[valid_warning], "Out of memory for synchronization operations\n");
-                valid_warning++;
-            }    // end catch
-            catch (char *str) {
-                valid_synchro = FALSE;
-                //lsynchro=0;
-                for (unsigned int j = 0; j <= i; j++) {
-                    if (pclsyn[j] != NULL) {
-                        pclsyn[j]->~CSynchro();
-                        pclsyn[j] = NULL;
-                    }
-                }
-                sprintf(textwarning[valid_warning], "Out of memory for synchronization operations\n");
-                valid_warning++;
-            }    // end catch
-            if (pclsyn[i] != NULL) {
-                valid = pclsyn[i]->Valid();
-                if (!valid) {
-                    pclsyn[i]->TextErr(texterr);
-                    return;
-                }
-            } // end if
-        } else {
-            // synchronization times not accumulated
-            pclsyn[i] = 0;
-            if (lsynchro > 0 && gzplus == 0) {
-                if (gzseek(statFile, lsynchro, SEEK_CUR) != 0) {
-                    valid = FALSE;
-                    return;
-                }
-            }
-        }
-        if (gzplus == 1) {
-            delete[]pbufcompr;
-            pbufcompr = NULL;
-        }
-        if (i != proccount - 1) {
-            if (gzplus == 1) {
-                for (int k = 0; ; k++) {
-                    if (gzread(statFile, &(lbufplusch[k]), 1) != 1) {
-                        valid = FALSE;
-                        sprintf(texterr, "Can't read from file %s \n", statFilePath);
-                        return;
-                    }
-                    if (lbufplusch[k] == 0) break;
-                }
-                lbufcompr = atol(lbufplusch);
-                pbufcompr = new unsigned char[lbufcompr];
-                if (pbufcompr == NULL) throw("Out of memory\n");
-                s = gzread(statFile, pbufcompr, lbufcompr);
-                if (s != (int) lbufcompr) {
-                    valid = FALSE;
-                    sprintf(texterr, "Can't read from file %s l=%ld\n", statFilePath, lbufcompr);
-                    return;
-                }
-                int err = uncompress(pbufuncompr, &luncomprread, pbufcompr, lbufcompr);
-                if (err != Z_OK || luncomprread != lbufuncompr) {
-                    valid = FALSE;
-                    sprintf(texterr, "Can't uncompress l=%ld\n", lbufcompr);
-                    return;
-                }
-            } else {
-                s = gzread(statFile, &sz, sizeof(sz));
-                if (s != sizeof(sz)) {
-                    valid = FALSE;
-                    sprintf(texterr, "Can't read from file %s addr=%ld size=%d\n",
-                            statFilePath, l, (int) sizeof(sz));
-                    return;
-                }
-                s = gzread(statFile, pch_vms, lvms);
-                if (s != lvms) {
-                    valid = FALSE;
-                    sprintf(texterr, "Can't read from file %s addr=%ld size=%d\n",
-                            statFilePath, l, lvms);
-                    return;
-                }
-            }
-            CPYMEM(rank, pch_vms + MAKESHORT(pb_vms, rank, rank), szsh);
-            if (gzplus == 1) pch_vms = pbufuncompr + sizeof(sz);
-            else {
-                l = gztell(statFile);
-                s = gzread(statFile, pch_vmssize, szl * rank);
-                if (s != szl * rank) {
-                    valid = FALSE;
-                    sprintf(texterr, "Can't read from file %s addr=%ld size=%d\n",
-                            statFilePath, l, szl * rank);
-                    return;
-                }
-                l = gztell(statFile);
-                delete[] pvers;
-                pvers = NULL;
-            }
-        }
-    }
-    if (gzplus == 1) {
-        delete[]pbufuncompr;
-        pbufuncompr = NULL;
-    }
-    pic = new CInter *[proccount];
-    if (pic == NULL) throw("Out of memory\n");
-    // add synchronization times to interval characteristics
-    if (lsynchro > 0) {
-        unsigned long n = BeginTreeWalk();
-        while (n != 0) {
-            BOOL b = Synchro();
-            if (b == 1) return;
-            n = TreeWalk();
-        }
-        for (i = 0; i < proccount; i++) {
-            pclsyn[i]->~CSynchro();
-        }
-    }//lsynchro
-    // sum interval characteristics
-    for (i = 0; i < proccount; i++) {
-        pclfrag[i]->SumLevel();
-        pclsyn[i] = NULL;
-    }
-    // Idle, Load imbalance
-    unsigned long n = BeginTreeWalk();
-    while (n != 0) {
-        double max = 0.0, maxi = 0.0;
-        double time, time1;
-        // calculate maximal values
-        for (i = 0; i < proccount; i++) {
-            if (pic[i] != NULL) {
-                pic[i]->ReadTime(EXEC, time);
-                if (time > max) max = time;
-                pic[i]->ReadTime(CPU, time);
-                pic[i]->ReadTime(CPUUSR, time1);
-                if (time + time1 > maxi) maxi = time + time1;
-            }
-        }
-        // calculate maximal - current
-        for (i = 0; i < proccount; i++) {
-            if (pic[i] != NULL) {
-                double qproc;
-                pic[i]->ReadTime(PROC, qproc);
-                if (qproc != n) {
-                    // interval execute not on all processors
-                    for (i = 0; i < proccount; i++) {
-                        if (pic[i] != NULL) {
-                            pic[i]->WriteTime(IDLE, 0);
-                            pic[i]->WriteTime(LOST, 0);
-                            pic[i]->WriteTime(IMB, 0);
-                            pic[i]->WriteTime(PROC, 0);
-                        }
-                    }
-                    break;
-                } else {
-                    pic[i]->ReadTime(EXEC, time);
-                    if (max - time > 0.0) {
-                        pic[i]->AddTime(IDLE, max - time);
-                        pic[i]->AddTime(LOST, max - time);
-                    }
-                    pic[i]->ReadTime(CPU, time);
-                    pic[i]->ReadTime(CPUUSR, time1);
-                    if (maxi - time - time1 > 0.0)
-                        pic[i]->AddTime(IMB, maxi - time - time1);
-                }
-            }
-        }
-        n = TreeWalk();
-    }
-    if (gzplus != 1) {
-        if (pch_vms != NULL) {
-            delete[] pch_vms;
-            pch_vms = NULL;
-        }
-    }
-    gzclose(statFile);
-}
-
-//--------------------------------------------------
-// deallocate memory for trees and syn times
-CStatRead::~CStatRead(void) {
-    if (pvers != NULL) delete[]pvers;
-    if (gzplus == 1) {
-        if (pbufcompr != NULL) delete[]pbufcompr;
-        if (pbufuncompr != NULL) delete[]pbufuncompr;
-    } else {
-        if (pch_vms != NULL) delete[] pch_vms;
-    }
-    if (pclfrag != NULL) {
-        for (unsigned long i = 0; i < proccount; i++) {
-            if (pclfrag[i] != NULL) pclfrag[i]->~CTreeInter();
-            pclfrag[i] = NULL;
-            if (pic != NULL) pic[i] = NULL;
-            if (pclsyn != NULL) {
-                if (pclsyn[i] != NULL) pclsyn[i]->~CSynchro();
-                pclsyn[i] = NULL;
-            }
-        }
-        delete[] pclfrag;
-    }
-    // deallocate memory for data-member
-    if (pclsyn != NULL) delete[] pclsyn;
-    if (pch_vmssize != NULL) delete[]pch_vmssize;
-    if (pic != NULL) delete[] pic;
-}
-
-//--------------------------------------------------
-// begin tree-walk
-// return number of intervals
-unsigned long CStatRead::BeginTreeWalk(void)
-{
-    unsigned long n = 0;
-    for (unsigned long i = 0; i < proccount; i++) {
-        pclfrag[i]->BeginInter();
-        pic[i] = NULL;
-    }
-    ident *id;
-    for (curnproc = 0; curnproc < proccount; curnproc++) {
-        pclfrag[curnproc]->NextInter(&id);
-        if (id != NULL) {
-            for (unsigned long j = 0; j < proccount; j++) {
-                pic[j] = pclfrag[j]->FindInter(id);
-                if (pic[j] != NULL) n++;
-            }
-            return (n);
-        }
-    }
-    return (n);
-}
-
-//------------------------------------------------
-// continue tree-walk
-// return number of intervals
-unsigned long CStatRead::TreeWalk(void)
-{
-    unsigned long n = 0;
-    ident *id;
-    pclfrag[curnproc]->NextInter(&id);
-    if (id != NULL) {
-        for (unsigned long j = 0; j < proccount; j++) {
-            pic[j] = pclfrag[j]->FindInter(id);
-            if (pic[j] != NULL) n++;
-        }
-        if (n != 0)return (n);
-    }
-    for (unsigned long i = curnproc + 1; i < proccount; i++) {
-        pclfrag[i]->NextInter(&id);
-        if (id != NULL) {
-            curnproc = i;
-            for (unsigned long j = 0; j < proccount; j++) {
-                pic[j] = pclfrag[j]->FindInter(id);
-                if (pic[j] != NULL) n++;
-            }
-            return (n);
-        }
-    }
-    return (n);
-}
-
-//------------------------------------------------
-// calculate synchronization times, variation times and overlap
-// return 0 - OK
-BOOL CStatRead::Synchro(void)
-{
-    unsigned long nint = 0;
-    for (unsigned long k = 0; k < proccount; k++) {
-        if (pic[k] != NULL) {
-            // nint - number of current interval
-            nint = pic[k]->ninter;
-            BOOL b = pclsyn[k]->Count(nint, smallbuff);
-            if (b != 0) {
-                pclsyn[k]->TextErr(texterr);
-                valid = FALSE;
-                return (1);
-            }
-        }
-    }
-    if (nint == 0) return (0);
-    for (short i = 1; i <= QCOLLECT + QCOLLECT; i++) {
-        if ((i & 3) != 0 && (i & 3) != 2) { //4 type not used
-            typegrp t1;
-            typecom t2;
-            if (i <= QCOLLECT) {
-                t1 = SYN;
-                t2 = (typecom) ((i) >> 2);
-            } else {
-                t1 = VAR;
-                t2 = (typecom) ((i - QCOLLECT) >> 2);
-            }
-            int min = INT_MAX;
-            unsigned long j;
-            for (j = 0; j < proccount; j++) {
-                if (pic[j] != NULL) {
-                    // n - number of times in the interval
-                    int n = pclsyn[j]->GetCount((typecollect) (i));
-                    if (min != INT_MAX && n != min && smallbuff == 0) {
-                        valid = FALSE;
-                        sprintf(texterr,
-                                "Number of synhro or variation times not equivalent on other processors %ld %ld numbers %d %d %%\n", j + 1, j, n, min);
-                        return (1);
-                    }
-                    if (min > n) min = n;
-                }
-            }
-            if (min != 0) {
-                // times is accumulated
-                for (int k = 0; k < min; k++) {
-                    double max = 0.0;
-                    // calculate maximal value
-                    for (j = 0; j < proccount; j++) {
-                        if (pic[j] != NULL) {
-                            double time = pclsyn[j]->Find((typecollect) i);
-                            if (time - max > 0.0) max = time;
-                        }
-                    }
-                    double maxs = 0.0;
-                    if (i < QCOLLECT && (i & 3) == 3) {
-                        // overlap for wait_operation
-                        for (j = 0; j < proccount; j++) {
-                            if (pic[j] != NULL) {
-                                double time = pclsyn[j]->FindNearest
-                                        ((typecollect) (i + QCOLLECT - 1)); //Start_operation
-                                if (time == 0.0 && smallbuff == 0) {
-                                    valid = FALSE;
-                                    sprintf(texterr, "Number of call operations != number of wait operations\n");
-                                    return (1);
-                                }
-                                if (time - maxs > 0.0) maxs = time;
-                            }
-                        }
-                    }
-                    for (j = 0; j < proccount; j++) {
-                        if (pic[j] != NULL) {
-                            double time = pclsyn[j]->GetCurr();
-                            // write overlap
-                            if (maxs > 0.0 && time - maxs > 0.0) {
-                                pic[j]->AddTime(OVERLAP, t2, time - maxs);
-                            }
-                            // write syn and variation times
-                            if (max - time > 0.0) {
-                                pic[j]->AddTime(t1, t2, max - time);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-    return (0);
-}
-
-//------------------------------------------------
-// return result of constructor execution
-BOOL CStatRead::Valid(int *warn) {
-    *warn = valid_warning;
-    return (valid);
-}
-
-//---------------------------------------------------
-// error message
-void CStatRead::TextErr(char *t) {
-    strcpy(t, texterr);
-    return;
-}
-
-// warning message
-//---------------------------------------------------
-// return number of processors
-unsigned long CStatRead::QProc(void) {
-    return (proccount);
-}
-
-//--------------------------------------------
-// size of VMS
-void CStatRead::VMSSize(char *str) {
-    str[0] = '\0';
-    char n[11];
-    long l = 0;
-    for (int i = 0; i < rank; i++) {
-        CPYMEM(l, pch_vmssize + i * szl, szl);
-        sprintf(n, "%ld", l);
-        if (i == rank - 1) strcat(str, n);
-        else {
-            strcat(str, n);
-            strcat(str, "*");
-        }
-    }
-}
-
-//-----------------------------------------------
-// warning message
-void CStatRead::WasErrAccum(char *str) {
-    if (valid_warning == 0) str[0] = '\0';
-    else {
-        strcpy(str, textwarning[valid_warning - 1]);
-        valid_warning--;
-    }
-    return;
-}
-
-//---------------------------------------------
-// return number of calls of collective operations
-long CStatRead::ReadCall(typecom t) {
-    double val = 0.0;
-    long calll = 0;
-    for (unsigned long i = 0; i < proccount; i++) {
-        if (pic[i] != NULL) {
-            double v;
-            pic[i]->ReadTime(CALL, t, v);
-            val = val + v;
-        }
-    }
-    calll = (long) (val / 1);
-    if (val - calll != 0.0) calll++;
-    return (calll);
-}
-
-//---------------------------------------------
-// identifier information of interval
-// set number of current characteristics =0
-// return number of level
-void CStatRead::ReadIdent(ident *idp) {
-    short nlev = 0;
-    ident *id = NULL;
-    // nenter = number of enters / weight
-    double nenter = 0.0;
-    for (unsigned long i = 0; i < proccount; i++) {
-        if (pic[i] != NULL) {
-            pic[i]->ReadIdent(&id);
-            nlev = id->nlev;
-            nenter = nenter + id->nenter;
-        }
-    }
-    long nent = (long)(nenter / 1);
-    if (nenter - nent != 0.0) nent++;
-    idp->t = id->t;
-    idp->nline_end = id->nline_end;
-    idp->proc = id->proc;
-    idp->nlev = id->nlev;
-    idp->nline = id->nline;
-    idp->expr = id->expr;
-    idp->nenter = nent;
-    if (id->pname == NULL) {
-        idp->pname = NULL;
-    }
-    else {
-        idp->pname = new char[strlen(id->pname) + 1];
-        strcpy(idp->pname, id->pname);
-    }
-    curntime = 0;
-}
-
-short CStatRead::ReadTitle(char *str) {
-    short nlev = 0;
-    ident *id = NULL;
-    // nenter = number of enters / weight
-    double nenter = 0.0;
-    for (unsigned long i = 0; i < proccount; i++) {
-        if (pic[i] != NULL) {
-            pic[i]->ReadIdent(&id);
-            nlev = id->nlev;
-            nenter = nenter + id->nenter;
-
-        }
-    }
-    long nent = (long) (nenter / 1);
-    if (nenter - nent != 0.0) nent++;
-    char type[10];
-    switch ((int) (id->t)) {
-        case REDUC:
-            strcpy(type, "REDUC");
-            break;
-        case SREDUC:
-            strcpy(type, "SREDUC");
-            break;
-        case WREDUC:
-            strcpy(type, "WREDUC");
-            break;
-        case SHAD:
-            strcpy(type, "SHAD");
-            break;
-        case SSHAD:
-            strcpy(type, "SSHAD");
-            break;
-        case WSHAD:
-            strcpy(type, "WSHAD");
-            break;
-        case RACC:
-            strcpy(type, "RACC");
-            break;
-        case SRACC:
-            strcpy(type, "SRACC");
-            break;
-        case WRACC:
-            strcpy(type, "WRACC");
-            break;
-        case REDISTR:
-            strcpy(type, "REDISTR");
-            break;
-        case SREDISTR:
-            strcpy(type, "SREDISTR");
-            break;
-        case WREDISTR:
-            strcpy(type, "WREDISTR");
-            break;
-        case PREFIX:
-            strcpy(type, "PREFIX");
-            break;
-        case SEQ:
-            strcpy(type, "SEQ");
-            break;
-        case PAR:
-            strcpy(type, "PAR");
-            break;
-        case USER:
-            strcpy(type, "USER");
-            break;
-        default:
-            sprintf(str, "Statread ReadTitle:Incorrect type\n");
-            return (0);
-    }
-    if (id->nlev == 0) type[0] = '\0';
-    if (id->pname == NULL) {
-        if (id->expr == Fic_index)
-            sprintf(str, "INTERVAL ( NLINE=%ld ) LEVEL=%d %s EXE_COUNT=%ld\n",
-                    id->nline, id->nlev, type, nent);
-        else
-            sprintf(str, "INTERVAL ( NLINE=%ld ) LEVEL=%d %s EXE_COUNT=%ld EXPR=%ld\n",
-                    id->nline, id->nlev, type, nent, id->expr);
-    } else {
-        if (id->expr == Fic_index)
-            sprintf(str, "INTERVAL ( NLINE=%ld SOURCE=%s ) LEVEL=%d %s EXE_COUNT=%ld\n",
-                    id->nline, id->pname, id->nlev, type, nent);
-        else
-            sprintf(str, "INTERVAL ( NLINE=%ld SOURCE=%s ) LEVEL=%d %s EXE_COUNT=%ld EXPR=%ld\n",
-                    id->nline, id->pname, id->nlev, type, nent, id->expr);
-    }
-    curntime = 0;
-    return (nlev);
-}
-
-//--------------------------------------------------------
-// return version number on accumulation
-char *CStatRead::ReadVers(void) {
-    return (pvers);
-}
-
-//--------------------------------------------------------
-// return platform information on accumulation
-char *CStatRead::ReadPlatform(void) {
-    return (pvers + strlen(pvers) + 1);
-}
-
-//-----------------------------------------------------------
-//name and time of processor
-void CStatRead::NameTimeProc(unsigned long n, char **name, double *time) {
-    pclfrag[n]->ReadProcName(name);
-    pclfrag[n]->ReadProcTime(*time);
-    return;
-}
-
-//-------------------------------------------------------
-// read current time characteristics
-// use after ReadTitle()
-//t - type of information of characteristics for each processor,
-//pnumb - pointer to array of processor numbers, for which characteristics are to be output,
-//qnumb - number of elements of processor number array,
-//sum - total characteristic value for each processor,
-//str - string where characteristic name and time values are written.
-BOOL CStatRead::ReadProc(typeprint t, unsigned long *pnumb, int qnumb, short fmt, double sum, char *str)
-{
-    int q, prec, lstr;
-    if (t == PRGEN) q = ITER; else q = RED;
-    //char ss[1024];
-    curntime++;
-    if (sum == 0.0) {
-        str[0] = '\0';
-        if (curntime > q) curntime = 0;
-        return (TRUE);
-    }
-    if (t == PRGEN) {
-        sprintf(str, "%s", nameGen[curntime - 1]);
-        //sprintf(ss,"%s",nameGen[curntime-1]);
-    } else {
-        // nameCom for VAR,OVERLAP,SYN,COM,RCOM
-        sprintf(str, "%s", nameCom[curntime - 1]);
-        strcat(str, "       ");
-    }
-    lstr = strlen(nameGen[curntime - 1]);
-    // list of processor numbers - pnumb
-    // pr=TRUE - number is in list
-    for (unsigned long i = 0; i < proccount; i++) {
-        BOOL pr = FALSE;
-        if (pic[i] != NULL) {
-            if (pnumb != NULL) {
-                for (int j = 0; j < qnumb; j++) {
-                    if (i + 1 >= pnumb[j] && i + 1 <= pnumb[j + 1]) pr = TRUE;
-                }
-            } else pr = TRUE;
-            if (pr == TRUE) {
-                // read time characteristic
-                double time;
-                switch (t) {
-                    case PRGEN:
-                        pic[i]->ReadTime((typetime) (curntime - 1), time);
-                        break;
-                    case PRCOM:
-                        pic[i]->ReadTime(COM, (typecom) (curntime - 1), time);
-                        break;
-                    case PRRCOM:
-                        pic[i]->ReadTime(RCOM, (typecom) (curntime - 1), time);
-                        break;
-                    case PRSYN:
-                        pic[i]->ReadTime(SYN, (typecom) (curntime - 1), time);
-                        break;
-                    case PRVAR:
-                        pic[i]->ReadTime(VAR, (typecom) (curntime - 1), time);
-                        break;
-                    case PROVER:
-                        pic[i]->ReadTime(OVERLAP, (typecom) (curntime - 1), time);
-                        break;
-                    default:
-                        sprintf(str, "Statread ReadProc:Incorrect type=%d\n", t);
-                        return (FALSE);
-                }
-                if ((t == PRGEN) && ((typetime) (curntime - 1) == PROC ||
-                        (typetime) (curntime - 1) == ITER))
-                    prec = 0;
-                else prec = PREC;
-                sprintf((str + lstr), "%*.*lf ", fmt, prec, time);
-                //sprintf(ss+lstr,"%*.*lf",fmt,prec,time);
-                lstr = strlen(str);
-            }
-        }
-    }
-    if (curntime > q) curntime = 0;
-    return (TRUE);
-}
-
-void CStatRead::ReadProcS(ProcTimes *pt)
-{
-    //printf("readprocs\n");
-    for (unsigned long i = 0; i < proccount; i++) {
-        // read time characteristic
-        double time;
-        //printf("readtime\n");
-        pic[i]->ReadTime((typetime)(LOST), time);
-        pt[i].lost_time = time;
-        //printf("readtime\n");
-        pic[i]->ReadTime((typetime)(INSUFUSR), time);
-        pt[i].insuf_user = time;
-        pic[i]->ReadTime((typetime)(INSUF), time);
-        pt[i].insuf_sys = time;
-        pic[i]->ReadTime((typetime)(IDLE), time);
-        pt[i].idle = time;
-        pic[i]->ReadTime((typetime)(SUMCOM), time);
-        pt[i].comm = time;
-        pic[i]->ReadTime((typetime)(SUMRCOM), time);
-        pt[i].real_comm = time;
-        pic[i]->ReadTime((typetime)(SUMSYN), time);
-        pt[i].synch = time;
-        pic[i]->ReadTime((typetime)(SUMVAR), time);
-        pt[i].time_var = time;
-        pic[i]->ReadTime((typetime)(IMB), time);
-        pt[i].load_imb = time;
-        pic[i]->ReadTime((typetime)(EXEC), time);
-        pt[i].exec_time = time;
-        pic[i]->ReadTime((typetime)(CPUUSR), time);
-        pt[i].prod_cpu = time;
-        pic[i]->ReadTime((typetime)(CPU), time);
-        pt[i].prod_sys = time;
-        pic[i]->ReadTime((typetime)(IOTIME), time);
-        pt[i].prod_io = time;
-        pic[i]->ReadTime((typetime)(START), time);
-        pt[i].overlap = time;
-        pic[i]->ReadTime((typetime)(DVMH_THREADS_USER_TIME), time);
-        pt[i].thr_user_time = time;
-        pic[i]->ReadTime((typetime)(DVMH_THREADS_SYSTEM_TIME), time);
-        pt[i].thr_sys_time = time;
-        pic[i]->ReadTime((typetime)(DVMH_GPU_TIME_PRODUCTIVE), time);
-        pt[i].gpu_time_prod = time;
-        pic[i]->ReadTime((typetime)(DVMH_GPU_TIME_LOST), time);
-        pt[i].gpu_time_lost = time;
-        pic[i]->ReadTime(COM, (typecom)(IO), time);
-        pt[i].col_op[IO].comm = time;
-        pic[i]->ReadTime(COM, (typecom)(RD), time);
-        pt[i].col_op[RD].comm = time;
-        pic[i]->ReadTime(COM, (typecom)(SH), time);
-        pt[i].col_op[SH].comm = time;
-        pic[i]->ReadTime(COM, (typecom)(RA), time);
-        pt[i].col_op[RA].comm = time;
-        pic[i]->ReadTime(COM, (typecom)(IO), time);
-        pt[i].col_op[IO].real_comm = time;
-        pic[i]->ReadTime(COM, (typecom)(RD), time);
-        pt[i].col_op[RD].real_comm = time;
-        pic[i]->ReadTime(COM, (typecom)(SH), time);
-        pt[i].col_op[SH].real_comm = time;
-        pic[i]->ReadTime(COM, (typecom)(RA), time);
-        pt[i].col_op[RA].real_comm = time;
-        pic[i]->ReadTime(COM, (typecom)(IO), time);
-        pt[i].col_op[IO].synch = time;
-        pic[i]->ReadTime(COM, (typecom)(RD), time);
-        pt[i].col_op[RD].synch = time;
-        pic[i]->ReadTime(COM, (typecom)(SH), time);
-        pt[i].col_op[SH].synch = time;
-        pic[i]->ReadTime(COM, (typecom)(RA), time);
-        pt[i].col_op[RA].synch = time;
-        pic[i]->ReadTime(COM, (typecom)(IO), time);
-        pt[i].col_op[IO].time_var = time;
-        pic[i]->ReadTime(COM, (typecom)(RD), time);
-        pt[i].col_op[RD].time_var = time;
-        pic[i]->ReadTime(COM, (typecom)(SH), time);
-        pt[i].col_op[SH].time_var = time;
-        pic[i]->ReadTime(COM, (typecom)(RA), time);
-        pt[i].col_op[RA].time_var = time;
-        pic[i]->ReadTime(COM, (typecom)(IO), time);
-        pt[i].col_op[IO].overlap = time;
-        pic[i]->ReadTime(COM, (typecom)(RD), time);
-        pt[i].col_op[RD].overlap = time;
-        pic[i]->ReadTime(COM, (typecom)(SH), time);
-        pt[i].col_op[SH].overlap = time;
-        pic[i]->ReadTime(COM, (typecom)(RA), time);
-        pt[i].col_op[RA].overlap = time;
-        //printf("readtime\n");
-    }
-}
-
-//--------------------------------------------------------
-// calculate min,max,sum time characteristics
-// t - characteristic type,
-//min - pointer to array of minimal characteristic values,
-//nprocmin,- pointer to processor number array, corresponding to minimal values,
-//max, - pointer to array of maximal characteristic values,
-//nprocmax, - pointer to processor number array, corresponding to maximal values,
-//sum - pointer to array of total characteristic values.
-void CStatRead::MinMaxSum(typeprint t, double *min, unsigned long *nprocmin,
-        double *max, unsigned long *nprocmax,
-        double *sum)
-{
-    int q;
-    if (t == PRGEN) q = ITER; else q = RED;
-    if (t == PRCALLS || t == PRLOST) q = StatGrpCount - 1;
-    int k;
-    for (k = 0; k <= q; k++) {
-        min[k] = DBL_MAX;
-        max[k] = 0.0;
-        sum[k] = 0.0;
-        nprocmin[k] = 0;
-        nprocmax[k] = 0;
-    }
-    for (unsigned long i = 0; i < proccount; i++) {
-        if (pic[i] != NULL) {
-            for (k = 0; k <= q; k++) {
-                double time;
-                // read time characteristic
-                switch (t) {
-                    case PRGEN:
-                        pic[i]->ReadTime((typetime) k, time);
-                        break;
-                    case PRCOM:
-                        pic[i]->ReadTime(COM, (typecom) k, time);
-                        break;
-                    case PRRCOM:
-                        pic[i]->ReadTime(RCOM, (typecom) k, time);
-                        break;
-                    case PRSYN:
-                        pic[i]->ReadTime(SYN, (typecom) k, time);
-                        break;
-                    case PRVAR:
-                        pic[i]->ReadTime(VAR, (typecom) k, time);
-                        break;
-                    case PRCALLS:
-                        pic[i]->ReadTime(CALLSMT, k, time);
-                        break;
-                    case PRLOST:
-                        pic[i]->ReadTime(LOSTMT, k, time);
-                        break;
-                    case PROVER:
-                        pic[i]->ReadTime(OVERLAP, (typecom) k, time);
-                        break;
-                    default:
-                        valid = FALSE;
-                        printf("CStatRead::MinMaxSum Unknown typeprint=%d\n", t);
-                        return;
-                }
-                // minimal value
-                if (min[k] > time) {
-                    min[k] = time;
-                    nprocmin[k] = i + 1;
-                }
-                //maximal value
-                if (max[k] <= time) {
-                    max[k] = time;
-                    nprocmax[k] = i + 1;
-                }
-                // sum value
-                sum[k] = sum[k] + time;
-            }
-        }
-
-    }
-}
-
-//-------------------------------------------------------------------------
-// read grp  characteristics
-void CStatRead::GrpTimes(double *arrprod, double *arrlost, double *arrcalls, int nproc) {
-    int q = StatGrpCount - 1;
-    int k;
-    for (k = 0; k <= q; k++) {
-        arrprod[k] = 0.0;
-        arrlost[k] = 0.0;
-        arrcalls[k] = 0.0;
-    }
-    unsigned long i = nproc - 1;
-    //double arr[StatGrpCount];
-    if (pic[i] != NULL) {
-        for (k = 0; k <= q; k++) {
-            // read time characteristic
-            pic[i]->ReadTime(CALLSMT, k, arrcalls[k]);
-            //arrcalls[k]=(int)arr[k];
-            pic[i]->ReadTime(LOSTMT, k, arrlost[k]);
-            pic[i]->ReadTime(PRODMT, k, arrprod[k]);
-        } // end for
-    }// end if
-    return;
-}
-
-// -- dvmh
-
-dvmh_stat_interval * CStatRead::getDvmhStatIntervalByProcess(unsigned long nProc) {
-    return  pic[nProc - 1]->dvmhStatInterval;
-}
-
-dvmh_stat_header_gpu_info * CStatRead::getDvmhStatGpuInfoByProcess(unsigned long nProc, int nGpu) {
-    return  & pclfrag[nProc - 1]->dvmhStatHeader->gpu[nGpu];
-}
-
-unsigned long CStatRead::getThreadsAmountByProcess(unsigned long nProc) {
-    return pclfrag[nProc - 1]->dvmhStatHeader->threadsAmount;
-}
-
-void CStatRead::getMaxsAndMins(double* maxs, double* mins, double* meds, unsigned long* n, unsigned long nProc)
-{
-    unsigned long threadsAmount = getThreadsAmountByProcess(nProc);
-        dvmh_stat_interval* dvmhStatInterval = pic[nProc - 1]->dvmhStatInterval;
-    
-    meds[0] = meds[1] = 0;
-    maxs[0] = mins[0] = dvmhStatInterval->threads[0].user_time;
-    maxs[1] = mins[1] = dvmhStatInterval->threads[0].system_time;
-    n[0] = n[1] = n[2] = n[3] = 1;
-    for(unsigned long i=0;i<threadsAmount;++i)
-    {
-        double user_time = dvmhStatInterval->threads[i].user_time;
-        double system_time = dvmhStatInterval->threads[i].system_time;
-        if(user_time > maxs[0])
-        {
-            maxs[0] = user_time;
-            n[0] = i+1;
-        }
-        else if(user_time < mins[0])
-        {
-            mins[0] = user_time;
-            n[1] = i+1;
-        }
-        
-        if(system_time > maxs[1])
-        {
-            maxs[1] = system_time;
-            n[2] = i+1;
-        }
-        else if(system_time < mins[1])
-        {
-            mins[1] = system_time;
-            n[3] = i+1;
-        }
-        meds[0] += user_time / threadsAmount;
-        meds[1] += system_time / threadsAmount;
-    }
-}
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/statread.h b/projects/dvm_svn/tools/pppa/trunk/src/statread.h
deleted file mode 100644
index 9699429..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/statread.h
+++ /dev/null
@@ -1,194 +0,0 @@
-#if !defined( _STATREAD_H )
-#define _STATREAD_H
-#include "potensyn.h"
-#include "inter.h"
-#include "treeinter.h"
-#include "statinter.h"
-#define Fic_index 2000000000 //interval.h
-#define PREC 4
-#define DIGTIME 6+PREC
-// sizeof(nameOper[i])=DIGTIME
-#define DIGSTAT 5
-
-enum typeprint {PRGEN,PRCOM,PRRCOM,PRSYN,PRVAR,PROVER,PRCALL,PRCALLS,PRLOST};
-static const char *nameGen[ITER+1]={
-"Lost time              ",
-"User insufficient par. ",
-"Sys.insufficient par.  ",
-"Idle time              ",
-"Communication          ",
-"Real synchronization   ",
-"Synchronization        ",
-"Variation              ",
-"Overlap                ",
-"Load imbalance         ",
-"Execution time         ",
-"User CPU time          ",
-"Sys. CPU time          ",
-"I/O time               ",
-"Start operation        ",
-"Threads user time      ",
-"Threads system time    ",
-"Productive time GPU    ",
-"Lost time GPU          ",
-"Processors             "
-};
-
-
-static const char *nameGenMT[StatGrpCount]={
-    "UserGrp                ",
-    "MsgPasGrp              ",
-    "StartRedGrp            ",
-    "WaitRedGrp             ",
-    "RedGrp                 ",
-    "StartShdGrp            ",
-    "WaitShdGrp             ",
-    "ShdGrp                 ",
-    "DistrGrp               ",
-    "ReDistrGrp             ",
-    "MapPLGrp               ", //10
-    "DoPLGrp                ",
-    "ProgBlockGrp           ",
-    "IOGrp                  ",
-    "RemAccessGrp           ",
-    "UserDebGrp             ",
-    "StatistGrp             ",
-    "DvmhCpyHtoDTime", //17
-    "DvmhCpyHtoDBytes",
-    "DvmhCpyDtoHTime",
-    "DvmhCpyDtoHBytes",
-    "DvmhCpyDtoDTime",
-    "DvmhCpyDtoDBytes",
-    "DvmhCyclePortionTime",
-    "DvmhArrayTransformTime",
-    "DvmhArrayTransformBytes",
-    "DvmhArrayReductionTime",
-    "SystemGrp              "
-};
-static const char *nameCom[RED+1]={
-"I/O             ",
-"Reduction       ",
-"Shadow          ",
-"Remote access   ",
-"Redistribution  "
-};
-static const char *nameOper[SUMOVERLAP-SUMCOM+1]={
-"  Communic",
-" Real_sync",
-"   Synchro",
-" Variation",
-"   Overlap"
-};
-enum tmps {EMP,GNS,ROU,MPI,PVM};
-struct vms_const {
-    short  reverse,szsh,szl,
-        szv,szd;
-};
-struct vms_short {
-    short  rank,maxnlev,
-             smallbuff,lvers;
-};
-struct vms_long{
-    long proccount,mpstype,ioproc,
-             qfrag,lbuf,linter,lsynchro;
-};
-struct vms_void{
-    void *pbuffer;
-};
-struct vms_double{
-    double proctime;
-};
-typedef struct tvms{
-        vms_double d;
-        vms_void v;
-        vms_long l;
-    vms_short sh;
-    vms_const chc;
-} pvms;
-#define QV_CONST sizeof(vms_const)/SZSH
-#define QV_SHORT sizeof(vms_short)/SZSH
-#define QV_LONG sizeof(vms_long)/SZL
-#define QV_VOID sizeof(vms_void)/SZV
-#define QV_DOUBLE sizeof(vms_double)/SZD
-class CStatRead {
-public:
-    CStatRead(const char * name,int i,int j,short sore);
-    ~CStatRead(void);
-    unsigned long QProc(void);
-    unsigned long BeginTreeWalk(void);
-    unsigned long TreeWalk(void);
-    BOOL Valid(int *warn);
-    void TextErr(char *t);
-    short ReadTitle(char * p);
-    void ReadIdent(ident *idp);
-    void ReadProcS(struct ProcTimes * pt);
-    BOOL ReadProc(typeprint t,unsigned long *pnumb,int qnumb,short fmt,double sum,char *str);
-    void MinMaxSum(typeprint t,double *min,unsigned long *nprocmin,
-                          double*max,unsigned long *nprocmax,
-                          double *sum);
-    void GrpTimes(double *arrprod,double *arrlost,double *arrcalls,int nproc);
-
-    /**
-     * Получить DVMH интервальную статистику по процессу
-     *
-     * @param nProc номер процесса
-     *
-     * @return интервальная DVMH статистики
-     */
-    dvmh_stat_interval * getDvmhStatIntervalByProcess(unsigned long nProc);
-
-
-    /**
-     * Получить DVMH описатель GPU по процессу
-     *
-     * @param nProc номер процесса
-     * @param nGpu  номер GPU
-     *
-     * @return описатель GPU
-     */
-    dvmh_stat_header_gpu_info * getDvmhStatGpuInfoByProcess(unsigned long nProc, int nGpu);
-
-    /**
-     * Получить количество нитей по процессу    
-     *
-     * @param nProc номер процесса
-     *
-     */ 
-    unsigned long getThreadsAmountByProcess(unsigned long nProc);
-    /*
-    *
-    * Получить max min для нитей на процессоре
-    * @param maxs массив максисумов
-    * @param mins массив минимумов
-    * @param meds массив средних
-    * @param nProc номер процесса
-    */
-    void getMaxsAndMins(double* maxs, double* mins, double* meds, unsigned long* n, unsigned long nProc);
-
-    void VMSSize(char *p);
-    void WasErrAccum(char *p);
-    long ReadCall(typecom t);
-    char *ReadVers(void);
-    char *ReadPlatform(void);
-    void NameTimeProc(unsigned long n,char **name,double *time);
-
-private:
-    unsigned long proccount,curnproc;
-    BOOL valid,valid_synchro;
-    short rank;
-    unsigned char *pch_vmssize,*pch_vms;
-    short maxnlevel;
-    char texterr[80];
-    char textwarning[3][80];
-    int valid_warning;
-    CTreeInter **pclfrag;
-    CSynchro **pclsyn;
-    short smallbuff;
-    CInter **pic;
-    int nf,curntime;
-    char *pvers;
-    unsigned char *pbufcompr,*pbufuncompr;
-    short gzplus; // sign of file gz/ gz+
-    BOOL Synchro(void);
-    };
-#endif
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/strall.h b/projects/dvm_svn/tools/pppa/trunk/src/strall.h
deleted file mode 100644
index 2d75581..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/strall.h
+++ /dev/null
@@ -1,178 +0,0 @@
-#if !defined( __STRALL_H )
-#define __STRALL_H
-#if defined (_STATFILE_)
-#include "sysstat.h"
-#endif
-#define SZSH sizeof(short)
-#define SZL sizeof(long)
-#define SZINT sizeof(int)
-#define SZD sizeof(double)
-#define SZV sizeof(void*)
-enum typecollect {INOUT=1,SINOUT,WINOUT,NINOUT,REDUC,SREDUC,WREDUC,NREDUC,
-SHAD,SSHAD,WSHAD,NSHAD,RACC,SRACC,WRACC,NRACC,REDISTR,SREDISTR,WREDISTR,
-NREDISTR}; /* new operation insert before REDISTR */
-#define QCOLLECT NREDISTR  /* 4 type for 5 collective operation */
-
-enum typefrag {PREFIX=QCOLLECT,SEQ,PAR,USER};
-#if !defined (_STATFILE_)
-struct vms_const {
-	unsigned char  reverse[2],szsh[2],szl[2],
-		szv[2],szd[2];
-};
-struct vms_short {
-	unsigned char  rank[SZSH],maxnlev[SZSH],
-			 smallbuff[SZSH],lvers[SZSH];
-};
-struct vms_long{
-	unsigned char proccount[SZL],mpstype[SZL],ioproc[SZL],
-			 qfrag[SZL],lbuf[SZL],linter[SZL],lsynchro[SZL];
-};
-struct vms_void{
-	unsigned char pbuffer[SZV];
-};
-struct vms_double{
-	unsigned char proctime[SZD];
-};
-/* if change here chahge statread.h */
-typedef struct tvms_ch {
-	struct vms_const shc;
-	struct vms_short sh;
-	struct vms_long l;
-	struct vms_void v;
-	struct vms_double d;
-} *pvms_ch;
-
-// -- Статистические интервалы -----------------------------------------------------------------------------------------
-
-/**
- * Группа характеристик описания статистического интервала
- *
- * @see pinter_ch
- */
-struct inter_short {
-	unsigned char nlev[SZSH]; /**< номер уровня вложенности */
-	unsigned char type[SZSH]; /**< тип интервала */
-};
-
-/**
- * Группа характеристик описания статистического интервала
- *
- * @see pinter_ch
- */
-struct inter_long {
-	unsigned char nline        [SZL]; /**< начало фрагмента (номер строки пользовательской программы) */
-	unsigned char nline_end    [SZL]; /**< конец фрагмента (номер строки пользовательской программы) */
-	unsigned char valvar       [SZL]; /**< пользовательский идентификатор интервала */
-	unsigned char qproc        [SZL]; /**< количество процессоров, на которых выполнялся интервал */
-	unsigned char ninter       [SZL]; /**< порядковый номер интервала */
-	unsigned char SendCallCount[SZL]; /**< */
-	unsigned char RecvCallCount[SZL]; /**< */
-};
-
-/**
- * Группа характеристик описания статистического интервала
- *
- * @see pinter_ch
- */
-struct inter_void{
-	unsigned char up        [SZV]; /**< ссылка на родительский интервал */
-	unsigned char next      [SZV]; /**< ссылка на следующего соседа по уровню */
-	unsigned char down      [SZV]; /**< ссылка на первый дочерний интервал */
-	unsigned char ptimes    [SZV]; /**< ссылка на массив времен */
-};
-
-/**
- * Группа характеристик описания статистического интервала
- *
- * @see pinter_ch
- */
-struct inter_double{
-	unsigned char nenter         [SZD]; /**< число вхождений в интервал */
-	unsigned char SendCallTime   [SZD]; /**< */
-	unsigned char MinSendCallTime[SZD]; /**< */
-	unsigned char MaxSendCallTime[SZD]; /**< */
-	unsigned char RecvCallTime   [SZD]; /**< */
-	unsigned char MinRecvCallTime[SZD]; /**< */
-	unsigned char MaxRecvCallTime[SZD]; /**< */
-	unsigned char times          [STM][SZD]; /**< матрица времен */
-};
-
-/**
- * Структура описывающая статистические интервалы
- *
- * Элемсенты разделены по подгруппам разделенные по типу.
- * If change here change treeinter.h
- */
-typedef struct tinter_ch {
-	struct inter_short  sh; /**< группа параметров типа short  */
-	struct inter_long   l;  /**< группа параметров типа long   */
-	struct inter_void   v;  /**< группа параметров типа void*  */
-	struct inter_double d;  /**< группа параметров типа double */
-	// --
-	unsigned char dvmhStat[DVMH_STAT_INTERVAL_SIZE]; /**< статистика dvmh */
-} *pinter_ch;
-
-struct syn_short{
-	unsigned char nitem[SZSH];
-};
-struct syn_long{
-	unsigned char ninter[SZL];
-};
-struct syn_void{
-	unsigned char pgrp[SZV];
-};
-struct syn_double{
-	unsigned char time[SZD];
-};
-/* if change here change potensyn.h*/
-typedef struct tsyn_ch {
-       struct syn_short sh;
-	   struct syn_long l;
-	   struct syn_void v;
-	   struct syn_double d;
-}*psyn_ch;
-#define CPYMEM(to,from)\
- memcpy(&(to),&(from),sizeof(to));
-#define CPYMEMC(to,from)\
-	smfrom=0;\
-        stcond = sizeof(from)>sizeof(to);\
-	if (stcond && toright==1) smfrom=sizeof(from)-sizeof(to);\
-	memcpy(&(to),(unsigned char *)(&(from))+smfrom,sizeof(to));
-#else
-#define min_(a,b) (((a) <(b)) ? (a):(b))
-#define MAKESHORT(p,nm,nmfirst)\
-	(&(p->sh.nm)-&(p->sh.nmfirst))*szsh
-#define MAKELONG(p,nm,nmfirst,q_short)\
-	q_short*szsh+(&(p->l.nm)-&(p->l.nmfirst))*szl
-#define MAKEVOID(p,nm,nmfirst,q_short,q_long)\
-	q_short*szsh+q_long*szl+(&(p->v.nm)-&(p->v.nmfirst))*szv
-#define MAKEDOUBLE(p,nm,nmfirst,q_short,q_long,q_void)\
-	q_short*szsh+q_long*szl+q_void*szv+(&(p->d.nm)-&(p->d.nmfirst))*szd
-#define MAKEDOUBLEA(p,nm,nmfirst,q_short,q_long,q_void,a)\
-	a=q_short*szsh+q_long*szl+q_void*szv+(&(p->d.nm)-&(p->d.nmfirst))*szd;
-
-#define CPYMEM(to,pfrom,sz_var)\
-{\
-	int sz_to;\
-	int smfrom=0,smto=0,mmin;\
-	sz_to=sizeof(to);\
-	mmin=min_(sz_to,sz_var);\
-	if (sz_to!=sz_var) {\
-		if (sz_to>sz_var) {\
-			if (torightto==1)	smto=sz_to-sz_var;\
-		} else {\
-			if (torightfrom==1) smfrom=sz_var-sz_to;\
-		}\
-	}\
-	if (reverse!=1) {\
-		memcpy((unsigned char *)(&(to))+smto,pfrom+smfrom,mmin);\
-	} else {\
-		int imcpy;\
-		for (imcpy=mmin-1;imcpy>=0;imcpy--) {\
-			*((unsigned char*)(&(to))+imcpy+smto)=\
-				*(pfrom+smfrom+mmin-1-imcpy);\
-		}\
-	}\
-}
-#endif
-#endif
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/sysstat.h b/projects/dvm_svn/tools/pppa/trunk/src/sysstat.h
deleted file mode 100644
index 07eb363..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/sysstat.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef _SYSSTAT_H
-#define _SYSSTAT_H
-typedef struct {
-	double  CallCount; 
-	double  ProductTime;
-	double  LostTime;
-}s_GRPTIMES;
-
-#define StatGrpCount 28  /* number of operation groups */
-#define UserGrp       0  /* execution of user program */
-#define MsgPasGrp     1  /* operation group of message exchange */
-#define StartRedGrp   2  /* start reduction */
-#define WaitRedGrp    3  /* waiting for the end of reduction */   		 
-#define RedGrp        4  /* other reduction operations */  		  		
-#define StartShdGrp   5  /* start edges exchange */  				 	 
-#define WaitShdGrp    6  /* waiting for the end of edges exchange */    
-#define ShdGrp        7  /* other operations of edges exchange */   	 
-#define DistrGrp      8  /* data distribution */   						 
-#define ReDistrGrp    9  /* data redistribution */   					 
-#define MapPLGrp     10  /* parallel loop distribution operations */    
-#define DoPLGrp      11  /* function dopl_ */    								
-#define ProgBlockGrp 12  /* program block operations */ 			   
-#define IOGrp        13  /* input/output operations */  				  
-#define RemAccessGrp 14  /* remote access operations */  				  
-#define UserDebGrp   15  /* dynamic control operations
-                            and operations for user program trace */    
-#define StatistGrp   16  /* user program interval operations 
-                            for performance analysis */   					 
-#define SystemGrp    27  /* system work */    	
-						
-#endif
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/treeinter.cpp b/projects/dvm_svn/tools/pppa/trunk/src/treeinter.cpp
deleted file mode 100644
index e75be1f..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/treeinter.cpp
+++ /dev/null
@@ -1,473 +0,0 @@
-#define _STATFILE_
-#include "treeinter.h"
-#include <stdio.h>
-#include <string.h>
-#include "dvmh_stat.h"
-
-// @todo! ПРОВЕРИТЬ БЕЗ GZ+
-
-extern short reverse,szsh,szd,szv,szl,torightto,torightfrom;
-// list of intervals for each processor
-CTreeInter::CTreeInter(gzFile stream,unsigned long lint,char *pbuff,
-					   unsigned int n,unsigned long qint,short maxn,
-					   char * ppn,double proct,
-					   int iIM,int jIM,short sore,
-					   unsigned char *pbuffer,
-					   dvmh_stat_header *dvmhStatHeader)
-// stream-file descriptor pointer,
-//lint- information length in bytes,
-// pbuff - beginning of the buffer at the collection stage,
-//n - processor number,
-//qint - number of intervals
-//maxn - maximal nesting level
-// ppn - processor name
-// proct - processor time
-//iIm- 0/1 sign of summing on index i
-//jIM-0/1 sign of summing on index j
-//sore - sign of summing or elements print
-//pbuffer - file gz+,data have been read
-{
-	valid=TRUE;
-	nproc=n;
-	qinter=qint;
-	maxnlev=maxn;
-	curninter=1;
-	pt=NULL;
-	pprocname=NULL;
-	sign_buffer=NULL;
-	unsigned char *buffer;
-
-	// -- dvmh
-	this->dvmhStatHeader = dvmhStatHeader;
-	// --
-
-	if (ppn!=NULL) {// processor name
-		if (dvmhDebug) { printf("   Process name: %s\n", ppn); fflush(stdout); }
-		pprocname=new char[strlen(ppn)+1];
-		if (pprocname==NULL) throw("Out of memory\n");
-		strcpy(pprocname,ppn);
-	}
-
-	proctime=proct;
-	// dynamically allocate memory for intervals of struct tinter_ch
-	if (pbuffer==NULL) { //data had not been read
-		buffer=new unsigned char[lint];
-		if (buffer==NULL) throw("Out of memory\n");
-		sign_buffer=buffer;
-		long l=gztell(stream);
-		// read interval information from file
-		int s=gzread(stream,buffer,lint);
-		if ((unsigned long)s!=lint) {
-			valid=FALSE;
-			sprintf(texterr,"Can't read intervals from file, addr=%ld, length=%ld\n",
-					l,lint);
-			delete []sign_buffer;
-			sign_buffer=NULL;
-			return;
-		}
-	} else buffer=pbuffer;
-
-	unsigned char *pch=buffer;
-	pinter *pi=NULL;
-
-	// allocate memory for intervals of struct ttree
-	pt=new ptree[qinter];
-	if (pt==NULL) throw("Out of memory\n");
-	ident id;
-	// calculate size of interval without name of DVM-programm
-
-	unsigned long offsetDvmhStat = QI_SHORT*szsh+QI_LONG*szl+QI_VOID*szv+QI_DOUBLE*szd; // -- dvmh
-//	int lintone = QI_SHORT*szsh+QI_LONG*szl+QI_VOID*szv+QI_DOUBLE*szd + this->dvmhStatHeader->sizeIntervalConstPart; // -- dvmh
-	int commonLengthForInterval=QI_SHORT*szsh+QI_LONG*szl+QI_VOID*szv+QI_DOUBLE*szd + this->dvmhStatHeader->sizeIntervalConstPart; // -- dvmh
-	int extraLengthForThreads = 0;
-
-	s_GRPTIMES times[StatGrpCount][StatGrpCount];
-	int a=MAKEDOUBLE(pi,times[0],nenter,QI_SHORT,QI_LONG,QI_VOID);
-	a=MAKELONG(pi,nline,nline,QI_SHORT);
-
-	for (unsigned long ll=0;ll<qinter;ll++) {
-		int lt=0;
-		// copy time characteristics from file
-		for (int i=0;i<StatGrpCount;i++) {
-			for (int j=0;j<StatGrpCount;j++) {
-				times[i][j].CallCount=0.0; times[i][j].ProductTime=0.0; times[i][j].LostTime=0.0;
-				CPYMEM(times[i][j].CallCount,
-					   pch+MAKEDOUBLE(pi,times[lt],nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-				CPYMEM(times[i][j].ProductTime,
-					   pch+MAKEDOUBLE(pi,times[lt+1],nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-				CPYMEM(times[i][j].LostTime,
-					   pch+MAKEDOUBLE(pi,times[lt+2],nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-				lt=lt+3;
-			}
-		}
-		// add information to interval matrix
-		s_SendRecvTimes addinfo;
-		addinfo.SendCallTime=0.0;
-		addinfo.MinSendCallTime=0.0;
-		addinfo.MaxSendCallTime=0.0;
-		addinfo.SendCallCount=0;
-		addinfo.RecvCallTime=0.0;
-		addinfo.MinRecvCallTime=0.0;
-		addinfo.MaxRecvCallTime=0.0;
-		addinfo.RecvCallCount=0;
-		CPYMEM(addinfo.SendCallTime,pch+MAKEDOUBLE(pi,SendCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.MinSendCallTime,pch+MAKEDOUBLE(pi,MinSendCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.MaxSendCallTime,pch+MAKEDOUBLE(pi,MaxSendCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.SendCallCount,pch+MAKELONG(pi,SendCallCount,nline,QI_SHORT),szl);
-		CPYMEM(addinfo.RecvCallTime,pch+MAKEDOUBLE(pi,RecvCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.MinRecvCallTime,pch+MAKEDOUBLE(pi,MinRecvCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.MaxRecvCallTime,pch+MAKEDOUBLE(pi,MaxRecvCallTime,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		CPYMEM(addinfo.RecvCallCount,pch+MAKELONG(pi,RecvCallCount,nline,QI_SHORT),szl);
-
-		// -- dvmh
-		dvmh_stat_interval *dvmhStatInterval = this->readDvmhStat(pch + offsetDvmhStat);
-		extraLengthForThreads = dvmhStatHeader->threadsAmount * sizeof(dvmh_stat_interval_thread);
-		// --
-		int allLengthForInterval = commonLengthForInterval + extraLengthForThreads;
-
-		
-	//	id.pname=(char *)(pch + lintone);
-		id.pname=(char *)(pch + allLengthForInterval);
-		// copy identifier information
-		id.nline=0; id.nline_end=0; id.proc=0;id.nenter=0; id.expr=0;id.nlev=0;
-		CPYMEM(id.nline,pch+MAKELONG(pi,nline,nline,QI_SHORT),szl);
-		CPYMEM(id.nline_end,pch+MAKELONG(pi,nline_end,nline,QI_SHORT),szl);
-		CPYMEM(id.proc,pch+MAKELONG(pi,qproc,nline,QI_SHORT),szl);
-		CPYMEM(id.nlev,pch+MAKESHORT(pi,nlev,nlev),szsh);
-		CPYMEM(id.expr,pch+MAKELONG(pi,expr,nline,QI_SHORT),szl);
-		CPYMEM(id.nenter,pch+MAKEDOUBLE(pi,nenter,nenter,QI_SHORT,QI_LONG,QI_VOID),szd);
-		short sh=0;
-		CPYMEM(sh,pch+MAKESHORT(pi,type,nlev),szsh);
-		id.t=(typefrag)sh;
-		unsigned char *pptr=NULL;
-		unsigned long l0=0;
-		// copy referenses on up, down and next intervals
-		CPYMEM(pptr,pch+MAKEVOID(pi,up,up,QI_SHORT,QI_LONG),szv);
-		if (pptr==NULL) {
-			memcpy(&pt[ll].up,&l0,sizeof(l0));
-		} else {
-			long l=(char*)pptr-pbuff;
-			pptr=buffer+l;
-			pt[ll].up=0;
-			CPYMEM(pt[ll].up,pptr+MAKELONG(pi,ninter,nline,QI_SHORT),szl);
-		}
-		pptr=NULL;
-		CPYMEM(pptr,pch+MAKEVOID(pi,down,up,QI_SHORT,QI_LONG),szv);
-		if (pptr==NULL) {memcpy(&pt[ll].down,&l0,sizeof(l0));
-		} else {
-			long l=(char*)pptr-pbuff;
-			pptr=buffer+l;
-			pt[ll].down=0;
-			CPYMEM(pt[ll].down,pptr+MAKELONG(pi,ninter,nline,QI_SHORT),szl);
-		}
-		pptr=NULL;
-		CPYMEM(pptr,pch+MAKEVOID(pi,next,up,QI_SHORT,QI_LONG),szv);
-		if (pptr==NULL) {memcpy(&pt[ll].next,&l0,sizeof(l0));
-		} else {
-			long l=(char *)pptr-pbuff;
-			pptr=buffer+l;
-			pt[ll].next=0;
-			CPYMEM(pt[ll].next,pptr+MAKELONG(pi,ninter,nline,QI_SHORT),szl);
-		}
-		// time characteristics for each interval
-		pt[ll].pint=new CInter(times,addinfo,id,ll+1,iIM,jIM,sore, dvmhStatInterval);
-		if (pt[ll].pint==NULL) throw("Out of memory\n");
-
-	//	pch = pch + lintone + 1 + strlen((char*)(pch + lintone));
-		pch = pch + allLengthForInterval + 1 + strlen((char*)(pch + allLengthForInterval));
-	}
-	if (sign_buffer!=NULL) {delete []sign_buffer; sign_buffer=NULL;}
-	return;
-}
-
-unsigned long CTreeInter::memAlign(unsigned long pointer, const unsigned short align, const unsigned long size) {
-	unsigned long p = pointer;
-	if (align - p % align < size)
-		while (p % align) p++;
-	//printf("          memAlign %u -> %u (%u) rest %u\n", pointer, p, size, align - p % align);
-	return p;
-}
-
-dvmh_stat_interval *CTreeInter::readDvmhStat(unsigned char * const buffer) {
-	dvmh_stat_interval            *dvmhStatInterval;
-	dvmh_stat_interval_gpu        *dvmhStatGpu;
-	dvmh_stat_interval_gpu_metric *dvmhStatMetric;
-
-
-	unsigned long dvmhStatShift = 0;
-	unsigned long t, t2; /*@todo del */
-	int dvmh_i, dvmh_j;
-
-	dvmhStatInterval = new dvmh_stat_interval();
-	if (!dvmhStatInterval) throw("Out of memory\n");
-
-	// Инициализируем аккумулируемые времена
-	dvmhStatInterval->allGPUTimeProductive = 0.0f;
-	dvmhStatInterval->allGPUTimeLost       = 0.0f;
-	dvmhStatInterval->allThreadsUserTime   = 0.0f;
-	dvmhStatInterval->allThreadsSystemTime = 0.0f;
-
-	CPYMEM(dvmhStatInterval->mask, buffer + dvmhStatShift, szl);
-	if (dvmhDebug) { printf("Mask: %lu (%u)\n", dvmhStatInterval->mask, dvmhStatShift); fflush(stdout); }
-	dvmhStatShift += szl;
-
-	dvmhStatInterval->threads = new dvmh_stat_interval_thread[dvmhStatHeader->threadsAmount];
-        if(!(dvmhStatInterval->threads)) throw ("Out of memory\n");
-
-	// Читаем информацию по каждому GPU
-	for (dvmh_i = 0; dvmh_i < DVMH_STAT_MAX_GPU_CNT; ++dvmh_i) {
-		dvmhStatGpu = & (dvmhStatInterval->gpu[dvmh_i]);
-		if (dvmhDebug) { printf("   GPU: %lu (%u)\n", dvmh_i, dvmhStatShift); fflush(stdout); }
-		t2 = dvmhStatShift;
-
-		// Инициализируем аккумулируемые времена GPU
-		dvmhStatGpu->timeProductive = 0.0f;
-		dvmhStatGpu->timeLost       = 0.0f;
-
-		if (dvmhDebug) { printf("        gpuTimeProductive: %.4f\n", dvmhStatGpu->timeProductive); fflush(stdout); }
-		if (dvmhDebug) { printf("        gpuTimeLost      : %.4f\n", dvmhStatGpu->timeLost); fflush(stdout); }
-
-		// Copy metrics
-		for (dvmh_j = 0; dvmh_j < DVMH_STAT_METRIC_CNT; ++dvmh_j) {
-			t = dvmhStatShift;
-			dvmhStatMetric = & (dvmhStatGpu->metrics[dvmh_j]);
-			if (dvmhDebug) { printf("      Metric: %d (%u)\n", dvmh_j, dvmhStatShift); fflush(stdout); }
-
-			CPYMEM(dvmhStatMetric->isReduced, buffer+dvmhStatShift, szsh);
-			if (dvmhDebug) { printf("        isReduced     : %d (%u)\n", dvmhStatMetric->isReduced,dvmhStatShift); fflush(stdout); }
-			dvmhStatShift += szsh;
-
-			CPYMEM(dvmhStatMetric->hasOwnMeasures, buffer+dvmhStatShift, szsh);
-			if (dvmhDebug) { printf("        hasOwnMeasures: %d (%u)\n", dvmhStatMetric->hasOwnMeasures,dvmhStatShift); fflush(stdout); }
-			dvmhStatShift += szsh;
-
-			CPYMEM(dvmhStatMetric->countMeasures, buffer+dvmhStatShift, szl);
-			if (dvmhDebug) { printf("        countMeasures : %d (%u)\n", dvmhStatMetric->countMeasures,dvmhStatShift); fflush(stdout); }
-			dvmhStatShift += szl;
-
-			CPYMEM(dvmhStatMetric->timeProductive, buffer+dvmhStatShift, szd);
-			if (dvmhDebug) { printf("        timeProductive: %.4f (%u)\n", dvmhStatMetric->timeProductive,dvmhStatShift); fflush(stdout); }
-			dvmhStatShift += szd;
-
-			CPYMEM(dvmhStatMetric->timeLost, buffer+dvmhStatShift, szd);
-			if (dvmhDebug) { printf("        timeLost      : %.4f (%u)\n", dvmhStatMetric->timeLost,dvmhStatShift); fflush(stdout); }
-			dvmhStatShift += szd;
-
-			CPYMEM(dvmhStatMetric->min, buffer+dvmhStatShift, szd);
-			if (dvmhDebug) { printf("        min           : %.4f (%u)\n", dvmhStatMetric->min,dvmhStatShift); fflush(stdout); }
-			dvmhStatShift += szd;
-
-			CPYMEM(dvmhStatMetric->mean, buffer+dvmhStatShift, szd);
-			if (dvmhDebug) { printf("        mean          : %.4f (%u)\n", dvmhStatMetric->mean,dvmhStatShift); fflush(stdout); }
-			dvmhStatShift += szd;
-
-			CPYMEM(dvmhStatMetric->max, buffer+dvmhStatShift, szd);
-			if (dvmhDebug) { printf("        max           : %.4f (%u)\n", dvmhStatMetric->max,dvmhStatShift); fflush(stdout); }
-			dvmhStatShift += szd;
-
-			CPYMEM(dvmhStatMetric->sum, buffer+dvmhStatShift, szd);
-			if (dvmhDebug) { printf("        sum           : %.4f (%u)\n", dvmhStatMetric->sum,dvmhStatShift); fflush(stdout); }
-			dvmhStatShift += szd;
-
-            #if DVMH_EXTENDED_STAT == 1
-            CPYMEM(dvmhStatMetric->q1, buffer+dvmhStatShift, szd);
-			if (dvmhDebug) { printf("        q1            : %.4f (%u)\n", dvmhStatMetric->q1,dvmhStatShift); fflush(stdout); }
-            dvmhStatShift += szd;
-
-            CPYMEM(dvmhStatMetric->median, buffer+dvmhStatShift, szd);
-			if (dvmhDebug) { printf("        median        : %.4f (%u)\n", dvmhStatMetric->median,dvmhStatShift); fflush(stdout); }
-            dvmhStatShift += szd;
-
-			CPYMEM(dvmhStatMetric->q3, buffer+dvmhStatShift, szd);
-			if (dvmhDebug) { printf("        q3            : %.4f (%u)\n", dvmhStatMetric->q3,dvmhStatShift); fflush(stdout); }
-            dvmhStatShift += szd;
-            #endif
-
-			if (dvmhDebug) { printf("        size          : %u\n", dvmhStatShift-t); fflush(stdout); }
-
-			dvmhStatGpu->timeProductive += dvmhStatMetric->timeProductive > 0 ? dvmhStatMetric->timeProductive : 0.0;
-			dvmhStatGpu->timeLost       += dvmhStatMetric->timeLost       > 0 ? dvmhStatMetric->timeLost       : 0.0;
-		}
-
-		if (dvmhDebug) { printf("     timeProductive: %.4f\n", dvmhStatGpu->timeProductive); fflush(stdout); }
-		if (dvmhDebug) { printf("     timeLost      : %.4f\n", dvmhStatGpu->timeLost); fflush(stdout); }
-		if (dvmhDebug) { printf("     size          : %d\n", dvmhStatShift-t2); fflush(stdout); }
-
-		dvmhStatInterval->allGPUTimeProductive += dvmhStatGpu->timeProductive > 0 ? dvmhStatGpu->timeProductive : 0.0;
-		dvmhStatInterval->allGPUTimeLost       += dvmhStatGpu->timeLost       > 0 ? dvmhStatGpu->timeLost       : 0.0;
-	}
-
-	if (dvmhDebug) { printf("allGPUTimeProductive: %.4f\n", dvmhStatInterval->allGPUTimeProductive); fflush(stdout); }
-	if (dvmhDebug) { printf("allGPUTimeLost      : %.4f\n", dvmhStatInterval->allGPUTimeLost); fflush(stdout); }
-
-	dvmhStatInterval->threadsUsed = false;
-	if (dvmhDebug) { printf("Threads:\n"); fflush(stdout); }
-	for(unsigned long i = 0; i < dvmhStatHeader->threadsAmount; ++i)
-	{
-		dvmh_stat_interval_thread* dvmhStatThread = &(dvmhStatInterval->threads[i]);
-		CPYMEM(dvmhStatThread->user_time, buffer+dvmhStatShift, szd);
-		if (dvmhDebug) { printf("    [%d] User time   : %.8f\n", i, dvmhStatThread->user_time); fflush(stdout); }
-		dvmhStatShift += szd;
-		CPYMEM(dvmhStatThread->system_time, buffer+dvmhStatShift, szd);
-		if (dvmhDebug) { printf("    [%d] System time : %.8f\n", i, dvmhStatThread->system_time); fflush(stdout); }
-		dvmhStatShift += szd;
-
-		dvmhStatInterval->allThreadsUserTime   += dvmhStatThread->user_time   > 0 ? dvmhStatThread->user_time   : 0.0;
-		dvmhStatInterval->allThreadsSystemTime += dvmhStatThread->system_time > 0 ? dvmhStatThread->system_time : 0.0;
-	}
-	if (dvmhDebug) { printf("allThreadsUserTime  : %.4f\n", dvmhStatInterval->allThreadsUserTime); fflush(stdout); }
-	if (dvmhDebug) { printf("allThreadsSystemTime: %.4f\n", dvmhStatInterval->allThreadsSystemTime); fflush(stdout); }
-
-	if(dvmhStatInterval->allThreadsUserTime > 0 || dvmhStatInterval->allThreadsSystemTime > 0)
-		dvmhStatInterval->threadsUsed = true;
-
-	return dvmhStatInterval;
-}
-
-//----------------------------------------
-//return result of constructor execution
-BOOL CTreeInter::Valid()
-{
-	return(valid);
-}
-//-------------------------------------------
-// error message
-void CTreeInter::TextErr(char *p)
-{
-	strcpy(p,texterr);
-}
-
-//-------------------------------------------------
-//set current interval at the first interval
-void CTreeInter::BeginInter(void)
-{
-	for (unsigned long i=0;i<qinter;i++) {
-		pt[i].sign=0;
-	}
-	curninter=1;
-	return;
-}
-//--------------------------------------------------
-//read identifier information of current interval
-void CTreeInter::NextInter(ident **id)
-{
-	*id=NULL;
-	for (unsigned long i=curninter;i<=qinter;i++) {
-		if (pt[i-1].sign==0) {
-			pt[i-1].sign=1;
-			curninter=i;
-			CInter *p=pt[i-1].pint;
-			p->ReadIdent(id);
-			return;
-		}
-	}
-	return;
-
-}
-//------------------------------------------------
-// return pointer to interval with the same identifier information
-// set current interval
-CInter *CTreeInter::FindInter(ident *id)
-//id - identifier information
-{
-	unsigned long n;
-	ident *idcur;
-	pt[curninter-1].pint->ReadIdent(&idcur);
-	if (id==idcur) return(pt[curninter-1].pint); //the same processor
-	if (id->nlev==idcur->nlev) { // the same level
-		n=pt[curninter-1].up;
-		if (n>0) n=pt[n-1].down;
-		else n=curninter;// first interval
-		while(n>0) {
-			if (pt[n-1].sign==0 && pt[n-1].pint->CompIdent(id)==1) {
-				pt[n-1].sign=1;
-				curninter=n;
-				return(pt[n-1].pint);
-			}
-			n=pt[n-1].next;
-		}
-		return(NULL);
-	}
-	// need level > current level
-	n=curninter;
-	if (id->nlev>idcur->nlev) {
-		// find need down level
-		while (id->nlev>idcur->nlev) {
-			n=pt[n-1].down;
-			if (n==0) return(NULL);
-			pt[n-1].pint->ReadIdent(&idcur);
-		}
-		// find need interval on finded level
-		while(n>0) {
-			if (pt[n-1].sign==0 && pt[n-1].pint->CompIdent(id)==1) {
-				pt[n-1].sign=1;
-				curninter=n;
-				return(pt[n-1].pint);
-			}
-			n=pt[n-1].next;
-		}
-		return(NULL);
-	} else {
-		// find need up level
-		while (id->nlev<idcur->nlev) {
-			n=pt[n-1].up;
-			if (n==0) return(NULL);
-			pt[n-1].pint->ReadIdent(&idcur);
-		}
-		unsigned long n1=n;
-		n=pt[n-1].up;
-		if (n>0) n=pt[n-1].down;else n=n1;
-		while(n>0) {
-			if (pt[n-1].sign==0 && pt[n-1].pint->CompIdent(id)==1) {
-				pt[n-1].sign=1;
-				curninter=n;
-				return(pt[n-1].pint);
-			}
-			n=pt[n-1].next;
-		}
-	}
-	return(NULL);
-}
-//--------------------------------------------------
-//sum time characteristics
-void CTreeInter::SumLevel(void)
-{
-	for (short i=maxnlev;i>0;i--) {
-		for (unsigned long j=0;j<qinter;j++) {
-			ident *id;
-			pt[j].pint->ReadIdent(&id);
-			if (id->nlev==i) {
-				// psum - up level
-				unsigned long up=pt[j].up;
-				CInter *psum=pt[up-1].pint;
-				pt[j].pint->SumInter(psum);
-			}
-		}
-	}
-	pt[0].pint->SumInter(NULL);
-}
-//---------------------------------------------------
-//processor time
-void CTreeInter::ReadProcTime(double &time)
-{
-	time=proctime;
-}
-//---------------------------------------------------
-//processor name
-void CTreeInter::ReadProcName(char **name)
-{
-	*name=pprocname;
-}
-//--------------------------------------------------
-// deallocate memory for tree interval
-CTreeInter::~CTreeInter()
-{
-	if (pprocname!=NULL) delete []pprocname;
-	if (sign_buffer!=NULL) delete []sign_buffer;
-	if (pt==NULL) return;
-	for (unsigned long i=0;i<qinter;i++) {
-		if (pt[i].pint!=NULL) pt[i].pint->~CInter();
-		pt[i].pint=NULL;
-	}
-	delete []pt;
-}
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/treeinter.h b/projects/dvm_svn/tools/pppa/trunk/src/treeinter.h
deleted file mode 100644
index b38241e..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/treeinter.h
+++ /dev/null
@@ -1,86 +0,0 @@
-#ifndef _TREEINTER_H
-#define _TREEINTER_H
-#include "zlib.h"
-#include "inter.h"
-#include "strall.h"
-#include "stdio.h"
-#include "bool.h"
-typedef struct ttree{
-	unsigned long up,next,down;
-	int sign;
-	CInter *pint;
-} ptree;
-struct inter_short{
-	short nlev,type;
-};
-struct inter_long{
-	unsigned long nline,nline_end,expr,qproc,ninter,SendCallCount,RecvCallCount;
-};
-struct inter_void{
-	void *up,*next,*down,*ptimes;
-};
-struct inter_double{
-	double nenter,SendCallTime,MinSendCallTime,
-	MaxSendCallTime,RecvCallTime,MinRecvCallTime,
-	MaxRecvCallTime,
-	times[3*StatGrpCount*StatGrpCount];
-};
-typedef struct tinter {
-        inter_double d;
-        inter_void v;
-        inter_long l;
-	inter_short sh;
-}pinter;
-#define QI_SHORT sizeof(inter_short)/SZSH
-#define QI_LONG sizeof(inter_long)/SZL
-#define QI_VOID sizeof(inter_void)/SZV
-#define QI_DOUBLE sizeof(inter_double)/SZD
-class CTreeInter {
-public:
-	CTreeInter(gzFile stream,unsigned long lint,char* pbuf,unsigned int n,
-		unsigned long qfrag,short maxn,char * ppn,double proct,int i,int j,short sore,unsigned char *pbuffer,
-	    dvmh_stat_header *dvmhStatHeader);
-	~CTreeInter();
-	/**
-	 * Прочитать DVMH статистику из буфера
-	 *
-	 * @param buffer указатель на буфер
-	 * @param size   размер статистики в байтах
-	 *
-	 * @return заголовок DVMH статистики
-	 */
-	dvmh_stat_interval *readDvmhStat(unsigned char * const buffer);
-	dvmh_stat_header   *dvmhStatHeader;
-	// --
-	BOOL Valid();
-	void TextErr(char *t);
-	void BeginInter(void);
-	void NextInter(ident **p);
-	CInter *FindInter(ident *id);
-	void SumLevel(void);
-	void ReadProcTime(double &time);
-	void ReadProcName(char **name);
-	ptree (*pt);
-protected:
-	unsigned int nproc;
-	unsigned long qinter;
-	unsigned long curninter;
-	short maxnlev;
-	BOOL valid;
-	char texterr[80];
-	char *pprocname;
-	unsigned char * sign_buffer;
-	double proctime;
-	/**
-	 * Выравнивание памяти
-	 *
-	 * @param pointer указатель который необходимо выровнять
-	 * @param align   размер выравнивания
-	 * @param size    размер переменной которая будет размещаться по указателю
-	 *
-	 * @param выровненный указатель
-	 */
-	unsigned long memAlign(unsigned long pointer, const unsigned short align, const unsigned long size);
-	//void CTreeInter::memAlign(unsigned long &pointer, short align);
-};
-#endif
diff --git a/projects/dvm_svn/tools/pppa/trunk/src/ver.h b/projects/dvm_svn/tools/pppa/trunk/src/ver.h
deleted file mode 100644
index 7cf7e18..0000000
--- a/projects/dvm_svn/tools/pppa/trunk/src/ver.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef VER_H
-#define VER_H
-
-#define  VER_PPPA "2.6 (02.02.2010)"
-#define  RTS_VERSION "RTS VERSION = 2871"
-
-#endif
-
diff --git a/projects/paths.default.txt b/projects/paths.default.txt
index 468ae99..0cf782a 100644
--- a/projects/paths.default.txt
+++ b/projects/paths.default.txt
@@ -1,10 +1,10 @@
-fdvm_include=./dvm_svn/fdvm/trunk/include/
-sage_include_1=./dvm_svn/fdvm/trunk/Sage/lib/include/
-sage_include_2=./dvm_svn/fdvm/trunk/Sage/h/
-fdvm_sources=./dvm_svn/fdvm/trunk/fdvm/
-libdb_sources=./dvm_svn/fdvm/trunk/Sage/lib/oldsrc/
-sage_sources=./dvm_svn/fdvm/trunk/Sage/lib/newsrc/
-sagepp_sources=./dvm_svn/fdvm/trunk/Sage/Sage++/
-parser_sources=./dvm_svn/fdvm/trunk/parser/
-pppa_sources=./dvm_svn/tools/pppa/trunk/src/
-zlib_sources=./dvm_svn/tools/Zlib/
\ No newline at end of file
+fdvm_include=dvm/fdvmh/include/fdvmh/
+fdvm_sources=dvm/fdvmh/tools/fdvmh/
+sage_include_1=dvm/fdvmh/include/sage/lib/
+sage_include_2=dvm/fdvmh/include/sage/h/
+libdb_sources=dvm/fdvmh/lib/sage/db/
+sage_sources=dvm/fdvmh/lib/sage/sage/
+sagepp_sources=dvm/fdvmh/lib/sage/sage++/
+parser_sources=dvm/fdvmh/tools/parser/
+pppa_sources=dvm/pppa/src/
+zlib_sources=dvm/third-party/Zlib/
\ No newline at end of file

From bb174e6f724ca12daa82d0483327d568e3da3faa Mon Sep 17 00:00:00 2001
From: Alexander <alexander.k.s@mail.ru>
Date: Thu, 13 Mar 2025 16:26:16 +0300
Subject: [PATCH 35/44] added forgotten files

---
 projects/Sapc++/Sapc++/Sapc++.vcxproj         | 161 ++++++++++++++++++
 projects/Sapc++/Sapc++/Sapc++.vcxproj.filters | 150 ++++++++++++++++
 2 files changed, 311 insertions(+)
 create mode 100644 projects/Sapc++/Sapc++/Sapc++.vcxproj
 create mode 100644 projects/Sapc++/Sapc++/Sapc++.vcxproj.filters

diff --git a/projects/Sapc++/Sapc++/Sapc++.vcxproj b/projects/Sapc++/Sapc++/Sapc++.vcxproj
new file mode 100644
index 0000000..a5309b0
--- /dev/null
+++ b/projects/Sapc++/Sapc++/Sapc++.vcxproj
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{DF2410E0-8B0A-420D-AC01-5DAFC460C816}</ProjectGuid>
+    <RootNamespace>Sapc</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>..\..\src;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>..\..\src;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;__SPC;_CRT_NON_CONFORMING_SWPRINTFS;</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <PreprocessorDefinitions>_MBCS;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;__SPC;_CRT_NON_CONFORMING_SWPRINTFS;</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\DirectiveProcessing\directive_analyzer.cpp" />
+    <ClCompile Include="..\..\src\DirectiveProcessing\directive_creator_base.cpp" />
+    <ClCompile Include="..\..\src\DirectiveProcessing\remote_access_base.cpp" />
+    <ClCompile Include="..\..\src\Distribution\Array.cpp" />
+    <ClCompile Include="..\..\src\Distribution\CreateDistributionDirs.cpp" />
+    <ClCompile Include="..\..\src\Distribution\Cycle.cpp" />
+    <ClCompile Include="..\..\src\Distribution\Distribution.cpp" />
+    <ClCompile Include="..\..\src\Distribution\DvmhDirectiveBase.cpp" />
+    <ClCompile Include="..\..\src\Distribution\GraphCSR.cpp" />
+    <ClCompile Include="..\..\src\GraphCall\graph_calls_base.cpp" />
+    <ClCompile Include="..\..\src\GraphLoop\graph_loops_base.cpp" />
+    <ClCompile Include="..\..\src\Utils\utils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\src\DirectiveProcessing\directive_analyzer.h" />
+    <ClInclude Include="..\..\src\Distribution\Array.h" />
+    <ClInclude Include="..\..\src\Distribution\Arrays.h" />
+    <ClInclude Include="..\..\src\Distribution\CreateDistributionDirs.h" />
+    <ClInclude Include="..\..\src\Distribution\Cycle.h" />
+    <ClInclude Include="..\..\src\Distribution\Distribution.h" />
+    <ClInclude Include="..\..\src\Distribution\DvmhDirective.h" />
+    <ClInclude Include="..\..\src\Distribution\DvmhDirectiveBase.h" />
+    <ClInclude Include="..\..\src\Distribution\GraphCSR.h" />
+    <ClInclude Include="..\..\src\GraphCall\graph_calls.h" />
+    <ClInclude Include="..\..\src\GraphLoop\graph_loops.h" />
+    <ClInclude Include="..\..\src\LoopAnalyzer\directive_creator.h" />
+    <ClInclude Include="..\..\src\LoopAnalyzer\remote_access.h" />
+    <ClInclude Include="..\..\src\LoopConverter\loop_transform.h" />
+    <ClInclude Include="..\..\src\ParallelizationRegions\ParRegions.h" />
+    <ClInclude Include="..\..\src\Sapfor.h" />
+    <ClInclude Include="..\..\src\Utils\utils.h" />
+    <ClInclude Include="..\..\src\VisualizerCalls\SendMessage.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/projects/Sapc++/Sapc++/Sapc++.vcxproj.filters b/projects/Sapc++/Sapc++/Sapc++.vcxproj.filters
new file mode 100644
index 0000000..737b189
--- /dev/null
+++ b/projects/Sapc++/Sapc++/Sapc++.vcxproj.filters
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Исходные файлы">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Файлы заголовков">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Файлы ресурсов">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+    <Filter Include="Исходные файлы\Distribution">
+      <UniqueIdentifier>{803b433b-ef2b-461c-bcdf-40587ac27031}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Файлы заголовков\Distribution">
+      <UniqueIdentifier>{9bbb0a2e-36f6-4736-8fa2-3f260e2df36c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Файлы заголовков\GraphCall">
+      <UniqueIdentifier>{ed7a5083-8582-4f54-bcf2-fd6d393bdae8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Файлы заголовков\GraphLoop">
+      <UniqueIdentifier>{0fc93dbd-8ac8-47fe-a5c9-26ad308f0197}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Исходные файлы\GraphLoop">
+      <UniqueIdentifier>{c06f742b-74c2-454e-b221-fa3924b6b4a3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Исходные файлы\ParallelRegions">
+      <UniqueIdentifier>{a7d01b3a-ec98-48a0-8ba8-982b9d886b74}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Исходные файлы\Utils">
+      <UniqueIdentifier>{e6073352-1994-4bd6-87ba-662199402c45}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Файлы заголовков\Utils">
+      <UniqueIdentifier>{b5cb7e95-4314-488a-abec-8aa3d48d490b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Исходные файлы\GraphCall">
+      <UniqueIdentifier>{9da92901-a281-4cd6-b61c-0390a02b09a8}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Исходные файлы\DirectiveAnalyzer">
+      <UniqueIdentifier>{f9d091f4-532b-4572-9e9a-5f80b8e012c4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Исходные файлы\LoopAnalyzer">
+      <UniqueIdentifier>{87d2a4f0-26c0-45a2-acd0-992c9f1be1bc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Файлы заголовков\CodeConverter">
+      <UniqueIdentifier>{e59c7920-1b24-4a95-9890-192e90bc0181}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Файлы заголовков\VisualizerCalls">
+      <UniqueIdentifier>{b5e5bfbb-6553-4e1a-a4a1-b60f62307e26}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\_src\Distribution\CreateDistributionDirs.cpp">
+      <Filter>Исходные файлы\Distribution</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\Distribution\Cycle.cpp">
+      <Filter>Исходные файлы\Distribution</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\Distribution\Distribution.cpp">
+      <Filter>Исходные файлы\Distribution</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\Distribution\DvmhDirectiveBase.cpp">
+      <Filter>Исходные файлы\Distribution</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\Distribution\GraphCSR.cpp">
+      <Filter>Исходные файлы\Distribution</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\GraphLoop\graph_loops_base.cpp">
+      <Filter>Исходные файлы\GraphLoop</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\Utils\utils.cpp">
+      <Filter>Исходные файлы\Utils</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\GraphCall\graph_calls_base.cpp">
+      <Filter>Исходные файлы\GraphCall</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\Distribution\Array.cpp">
+      <Filter>Файлы заголовков\Distribution</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\DirectiveProcessing\directive_analyzer.cpp">
+      <Filter>Исходные файлы\DirectiveAnalyzer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\DirectiveProcessing\directive_creator_base.cpp">
+      <Filter>Исходные файлы\LoopAnalyzer</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\_src\DirectiveProcessing\remote_access_base.cpp">
+      <Filter>Исходные файлы\LoopAnalyzer</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\_src\Distribution\Array.h">
+      <Filter>Файлы заголовков\Distribution</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\Distribution\Arrays.h">
+      <Filter>Файлы заголовков\Distribution</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\Distribution\CreateDistributionDirs.h">
+      <Filter>Файлы заголовков\Distribution</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\Distribution\Cycle.h">
+      <Filter>Файлы заголовков\Distribution</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\Distribution\Distribution.h">
+      <Filter>Файлы заголовков\Distribution</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\Distribution\DvmhDirectiveBase.h">
+      <Filter>Файлы заголовков\Distribution</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\Distribution\GraphCSR.h">
+      <Filter>Файлы заголовков\Distribution</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\GraphCall\graph_calls.h">
+      <Filter>Файлы заголовков\GraphCall</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\ParallelizationRegions\ParRegions.h">
+      <Filter>Исходные файлы\ParallelRegions</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\GraphLoop\graph_loops.h">
+      <Filter>Файлы заголовков\GraphLoop</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\Distribution\DvmhDirective.h">
+      <Filter>Файлы заголовков\Distribution</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\Utils\utils.h">
+      <Filter>Файлы заголовков\Utils</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\Sapfor.h">
+      <Filter>Файлы заголовков</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\LoopAnalyzer\directive_creator.h">
+      <Filter>Исходные файлы\LoopAnalyzer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\LoopConverter\loop_transform.h">
+      <Filter>Файлы заголовков\CodeConverter</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\VisualizerCalls\SendMessage.h">
+      <Filter>Файлы заголовков\VisualizerCalls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\LoopAnalyzer\remote_access.h">
+      <Filter>Исходные файлы\LoopAnalyzer</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\_src\DirectiveProcessing\directive_analyzer.h">
+      <Filter>Исходные файлы\DirectiveAnalyzer</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
\ No newline at end of file

From bacdc170bc53e688eeb44778c22386e41424235d Mon Sep 17 00:00:00 2001
From: Alexander_KS <alexander.k.s@mail.ru>
Date: Thu, 13 Mar 2025 13:31:02 +0000
Subject: [PATCH 36/44] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index eb6896a..f8905df 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # Общие правила по работе с SAPFOR #
 Перед началом работы с репозиторием необходимо убрать настройку git по автоматической замене LF -> CRLF
 
- * либо командой git config --global core.autocrlf false
- * либо командой git config --local  core.autocrlf false
+ * либо командой git config --global core.autocrlf true
+ * либо командой git config --local  core.autocrlf true
  
 Инструкция по SAPFOR находится в Вики этого репозитория.
 

From 9b12eb20c87c9563514a7ad9a5916af48d7a8884 Mon Sep 17 00:00:00 2001
From: Alexander_KS <alexander.k.s@mail.ru>
Date: Thu, 13 Mar 2025 15:14:12 +0000
Subject: [PATCH 37/44] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?=
 =?UTF-8?q?=D1=82=D1=8C=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f8905df..df2dd66 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Общие правила по работе с SAPFOR #
-Перед началом работы с репозиторием необходимо убрать настройку git по автоматической замене LF -> CRLF
+Перед началом работы с репозиторием необходимо выставить настройку git по автоматической замене LF -> CRLF
 
  * либо командой git config --global core.autocrlf true
  * либо командой git config --local  core.autocrlf true

From 43dfc2368a538f80d186b92c6580d3d7abe6ea3d Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Sat, 15 Mar 2025 13:05:15 +0300
Subject: [PATCH 38/44] version updated

---
 src/Utils/version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Utils/version.h b/src/Utils/version.h
index fefbd0c..884865d 100644
--- a/src/Utils/version.h
+++ b/src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2396"
+#define VERSION_SPF "2397"

From d58227bd0c2c6498d1f4bfe38d3242d92b8720ff Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Tue, 18 Mar 2025 09:37:20 +0300
Subject: [PATCH 39/44] added REMOVE_SPF pass

---
 src/DirectiveProcessing/insert_directive.cpp |  9 ++-
 src/DirectiveProcessing/insert_directive.h   |  2 +-
 src/Sapfor.cpp                               | 19 +++++--
 src/Sapfor.h                                 |  6 +-
 src/Utils/PassManager.h                      |  4 +-
 src/Utils/utils.cpp                          | 14 +++--
 src/Utils/utils.h                            |  2 +-
 src/Utils/version.h                          |  2 +-
 src/VisualizerCalls/get_information.cpp      | 40 +++++++++-----
 src/VisualizerCalls/get_information.h        | 58 --------------------
 10 files changed, 63 insertions(+), 93 deletions(-)

diff --git a/src/DirectiveProcessing/insert_directive.cpp b/src/DirectiveProcessing/insert_directive.cpp
index 68c20ac..8569226 100644
--- a/src/DirectiveProcessing/insert_directive.cpp
+++ b/src/DirectiveProcessing/insert_directive.cpp
@@ -442,8 +442,11 @@ static void replaceComment(string &dir, const char *firstChar)
     }
 }
 
-void removeDvmDirectives(SgFile *file, const bool toComment)
+void removeDvmSpfDirectives(SgFile* file, bool removeDvm, bool removeSpf, bool toComment)
 {
+    if (!removeDvm && !removeSpf)
+        printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
+
     vector<SgStatement*> toDel;
     vector<SgStatement*> toTotalDel;
     const string currFile = file->filename();
@@ -467,7 +470,7 @@ void removeDvmDirectives(SgFile *file, const bool toComment)
                 break;
 
             const int var = st->variant();
-            if (isDVM_stat(st))
+            if (isDVM_stat(st) && removeDvm || isSPF_stat(st) && removeSpf)
                 if (st->fileName() == currFile)
                     toDel.push_back(st);
 
@@ -477,7 +480,7 @@ void removeDvmDirectives(SgFile *file, const bool toComment)
         }
     }
 
-    if (toComment)
+    if (toComment && removeDvm)
     {
         for (auto &elem : toDel)
         {
diff --git a/src/DirectiveProcessing/insert_directive.h b/src/DirectiveProcessing/insert_directive.h
index e222067..3d65482 100644
--- a/src/DirectiveProcessing/insert_directive.h
+++ b/src/DirectiveProcessing/insert_directive.h
@@ -38,7 +38,7 @@ void insertShadowSpecToFile(SgFile* file, const char* fin_name, const std::set<s
     const std::map<std::tuple<int, std::string, std::string>, std::pair<DIST::Array*, DIST::ArrayAccessInfo*>>& declaredArrays);
 
 void insertDistributionToFile(const char* origFile, const char* outFile, const std::map<int, std::set<std::string>>& commentsToInclude);
-void removeDvmDirectives(SgFile* file, const bool toComment);
+void removeDvmSpfDirectives(SgFile* file, bool removeDvm, bool removeSpf, bool toComment);
 
 void insertDistributeDirsToParallelRegions(const std::vector<ParallelRegionLines>* currLines,
     const std::vector<Statement*>& reDistrRulesBefore,
diff --git a/src/Sapfor.cpp b/src/Sapfor.cpp
index 2e2b5fc..1c824a0 100644
--- a/src/Sapfor.cpp
+++ b/src/Sapfor.cpp
@@ -343,11 +343,13 @@ static string unparseProjectIfNeed(SgFile* file, const int curr_regime, const bo
             // copy includes that have not changed
             if (folderName != NULL)
             {
-                int removeDvmDirs = 0;
+                int removeSpfDirs = 0;
                 if (curr_regime == REMOVE_DVM_DIRS)
-                    removeDvmDirs = 1;
+                    removeSpfDirs = 1;
                 else if (curr_regime == REMOVE_DVM_DIRS_TO_COMMENTS)
-                    removeDvmDirs = 2;
+                    removeSpfDirs = 2;
+                else if (curr_regime == REMOVE_SPF_DIRS)
+                    removeSpfDirs = 3;
 
 
                 set<string> allIncludeFilesFiltr;
@@ -362,7 +364,7 @@ static string unparseProjectIfNeed(SgFile* file, const int curr_regime, const bo
                 }
                 allIncludeFiles = allIncludeFilesFiltr;
 
-                copyIncludes(allIncludeFiles, commentsToInclude, newCopyDeclToIncl, folderName, keepSpfDirs, out_free_form == 1, (curr_regime == RENAME_INLCUDES), removeDvmDirs);
+                copyIncludes(allIncludeFiles, commentsToInclude, newCopyDeclToIncl, folderName, keepSpfDirs, out_free_form == 1, (curr_regime == RENAME_INLCUDES), removeSpfDirs);
             }
         }
 
@@ -741,8 +743,12 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         }
         else if (curr_regime == LOOP_DATA_DEPENDENCIES)
             doDependenceAnalysisOnTheFullFile(file, 1, 1, 1);
-        else if (curr_regime == REMOVE_DVM_DIRS || curr_regime == REMOVE_DVM_DIRS_TO_COMMENTS)
-            removeDvmDirectives(file, curr_regime  == REMOVE_DVM_DIRS_TO_COMMENTS);
+        else if (curr_regime == REMOVE_DVM_DIRS || curr_regime == REMOVE_DVM_DIRS_TO_COMMENTS || curr_regime == REMOVE_SPF_DIRS) {
+            bool removeDvm = (curr_regime == REMOVE_DVM_DIRS || curr_regime == REMOVE_DVM_DIRS);
+            bool removeSpf = (curr_regime == REMOVE_SPF_DIRS);
+            bool toComment = (curr_regime == REMOVE_DVM_DIRS_TO_COMMENTS);
+            removeDvmSpfDirectives(file, removeDvm, removeSpf, toComment);
+        }
         else if (curr_regime == REMOVE_DVM_INTERVALS)
         {
             vector<SgStatement*> toDel;
@@ -2309,6 +2315,7 @@ void runPass(const int curr_regime, const char *proj_name, const char *folderNam
     case INSERT_INCLUDES:
     case REMOVE_DVM_DIRS:
     case REMOVE_DVM_DIRS_TO_COMMENTS:
+    case REMOVE_SPF_DIRS:
     case PRIVATE_ARRAYS_EXPANSION:
     case PRIVATE_ARRAYS_SHRINKING:
     case UNROLL_LOOPS:
diff --git a/src/Sapfor.h b/src/Sapfor.h
index e198210..b7f01d1 100644
--- a/src/Sapfor.h
+++ b/src/Sapfor.h
@@ -84,6 +84,7 @@ enum passes {
     INSERT_INCLUDES,
     REMOVE_DVM_DIRS,
     REMOVE_DVM_DIRS_TO_COMMENTS,
+    REMOVE_SPF_DIRS,
     REMOVE_DVM_INTERVALS,
     VERIFY_DVM_DIRS,
 
@@ -262,6 +263,8 @@ static void setPassValues()
     passNames[INSERT_INCLUDES] = "INSERT_INCLUDES";
     passNames[REMOVE_DVM_DIRS] = "REMOVE_DVM_DIRS";
     passNames[VERIFY_DVM_DIRS] = "VERIFY_DVM_DIRS";
+    passNames[REMOVE_DVM_DIRS_TO_COMMENTS] = "REMOVE_DVM_DIRS_TO_COMMENTS";
+    passNames[REMOVE_SPF_DIRS] = "REMOVE_SPF_DIRS";
     passNames[REMOVE_DIST_ARRAYS_FROM_IO] = "REMOVE_DIST_ARRAYS_FROM_IO";
     passNames[SUBST_EXPR] = "SUBST_EXPR";
     passNames[SUBST_EXPR_RD] = "SUBST_EXPR_RD";
@@ -294,8 +297,7 @@ static void setPassValues()
     passNames[PREDICT_SCHEME] = "PREDICT_SCHEME";
     passNames[GET_STATS_FOR_PREDICTOR] = "GET_STATS_FOR_PREDICTOR";
     passNames[DEF_USE_STAGE1] = "DEF_USE_STAGE1";
-    passNames[DEF_USE_STAGE2] = "DEF_USE_STAGE2";
-    passNames[REMOVE_DVM_DIRS_TO_COMMENTS] = "REMOVE_DVM_DIRS_TO_COMMENTS";
+    passNames[DEF_USE_STAGE2] = "DEF_USE_STAGE2";    
     passNames[REVERT_SPF_DIRS] = "REVERT_SPF_DIRS";
     passNames[CLEAR_SPF_DIRS] = "CLEAR_SPF_DIRS";
     passNames[INSERT_REGIONS] = "INSERT_REGIONS";
diff --git a/src/Utils/PassManager.h b/src/Utils/PassManager.h
index 7e44619..8739d26 100644
--- a/src/Utils/PassManager.h
+++ b/src/Utils/PassManager.h
@@ -273,11 +273,11 @@ void InitPassesDependencies(map<passes, vector<passes>> &passDepsIn, set<passes>
 
     Pass(REVERT_SUBST_EXPR_RD) <= list({ PURE_SAVE_TO_PARAMS, PURE_MODULE_TO_PARAMS, PURE_COMMON_TO_PARAMS, PURE_INTENT_INSERT });
 
-    list({ CORRECT_VAR_DECL, REVERT_SUBST_EXPR_RD, VERIFY_INCLUDES }) <= list({ CONVERT_TO_ENDDO, CORRECT_CODE_STYLE, REMOVE_DVM_DIRS, REMOVE_DVM_DIRS_TO_COMMENTS, REMOVE_DVM_INTERVALS });
+    list({ CORRECT_VAR_DECL, REVERT_SUBST_EXPR_RD, VERIFY_INCLUDES }) <= list({ CONVERT_TO_ENDDO, CORRECT_CODE_STYLE, REMOVE_DVM_DIRS, REMOVE_DVM_DIRS_TO_COMMENTS, REMOVE_SPF_DIRS, REMOVE_DVM_INTERVALS });
 
     list({ CALL_GRAPH2, CONVERT_LOOP_TO_ASSIGN, REVERT_SUBST_EXPR_RD, RESTORE_LOOP_FROM_ASSIGN }) <= Pass(INLINE_PROCEDURES);
 
-    list({ CONVERT_LOOP_TO_ASSIGN, CORRECT_FORMAT_PLACE }) <= list({ CONVERT_TO_ENDDO, CORRECT_CODE_STYLE, INSERT_INCLUDES, REMOVE_DVM_DIRS, REMOVE_DVM_DIRS_TO_COMMENTS, REMOVE_DVM_INTERVALS });
+    list({ CONVERT_LOOP_TO_ASSIGN, CORRECT_FORMAT_PLACE }) <= list({ CONVERT_TO_ENDDO, CORRECT_CODE_STYLE, INSERT_INCLUDES, REMOVE_DVM_DIRS, REMOVE_DVM_DIRS_TO_COMMENTS, REMOVE_SPF_DIRS, REMOVE_DVM_INTERVALS });
 
     list({ CORRECT_VAR_DECL, REVERT_SUBST_EXPR_RD }) <= list({ INSERT_INCLUDES, UNPARSE_FILE, SET_TO_ALL_DECL_INIT_ZERO });
 
diff --git a/src/Utils/utils.cpp b/src/Utils/utils.cpp
index a5f9cdc..a7d2faf 100644
--- a/src/Utils/utils.cpp
+++ b/src/Utils/utils.cpp
@@ -556,7 +556,7 @@ string renameInclude(const string& inc)
 void copyIncludes(const set<string> &allIncludeFiles, const map<string, map<int, set<string>>> &commentsToInclude,
                   const map<string, map<int, set<string>>>& newCopyDeclToIncl,
                   const char *folderName, bool keepSpfDirs, bool isFreeStyle, bool isRename, 
-                  int removeDvmDirs)
+                  int removeDirs)
 {
     for (auto &include : allIncludeFiles)
     {
@@ -601,18 +601,24 @@ void copyIncludes(const set<string> &allIncludeFiles, const map<string, map<int,
                         bufStr = "\n";
                 }
                 //remove DVM dirs or save DVM dirs as comment
-                if (removeDvmDirs == 1 || removeDvmDirs == 2)
+                if (removeDirs == 1 || removeDirs == 2)
                 {
                     if (bufStr[0] == '!' || bufStr[0] == 'c')
                     {
                         if (bufStr[1] == 'd' && bufStr[2] == 'v' && bufStr[3] == 'm' && bufStr[4] == '$')
                         {
-                            if (removeDvmDirs == 1)
+                            if (removeDirs == 1)
                                 bufStr = "";
-                            else if (removeDvmDirs == 2)
+                            else if (removeDirs == 2)
                                 bufStr.insert(1, " ");
                         }
                     }
+                } //remove SPF dirs
+                else if (removeDirs == 3)
+                {
+                    if (bufStr[0] == '!' || bufStr[0] == 'c')
+                        if (bufStr[1] == '$' && bufStr[2] == 's' && bufStr[3] == 'p' && bufStr[4] == 'f')
+                            bufStr = "";
                 }
 
                 // save original include name
diff --git a/src/Utils/utils.h b/src/Utils/utils.h
index 8db0be7..eb25db1 100644
--- a/src/Utils/utils.h
+++ b/src/Utils/utils.h
@@ -34,7 +34,7 @@ std::wstring to_wstring(const std::string);
 void convertBuffers(short*& resultM, int*& resultSizeM, short*& result, int*& resultSize);
 void clearGlobalMessagesBuffer();
 std::string renameInclude(const std::string& inc);
-void copyIncludes(const std::set<std::string> &allIncludeFiles, const std::map<std::string, std::map<int, std::set<std::string>>> &commentsToInclude, const std::map<std::string, std::map<int, std::set<std::string>>>& newCopyDeclToIncl, const char *folderName, bool keepSpfDirs, bool isFreeStyle, bool isRename, int removeDvmDirs = 0);
+void copyIncludes(const std::set<std::string> &allIncludeFiles, const std::map<std::string, std::map<int, std::set<std::string>>> &commentsToInclude, const std::map<std::string, std::map<int, std::set<std::string>>>& newCopyDeclToIncl, const char *folderName, bool keepSpfDirs, bool isFreeStyle, bool isRename, int removeDirs = 0);
 
 std::string splitDirective(const std::string &in);
 std::string splitDirectiveFull(const std::string &in_);
diff --git a/src/Utils/version.h b/src/Utils/version.h
index 884865d..cbe83a5 100644
--- a/src/Utils/version.h
+++ b/src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2397"
+#define VERSION_SPF "2398"
diff --git a/src/VisualizerCalls/get_information.cpp b/src/VisualizerCalls/get_information.cpp
index 8019846..bba79c4 100644
--- a/src/VisualizerCalls/get_information.cpp
+++ b/src/VisualizerCalls/get_information.cpp
@@ -1820,6 +1820,14 @@ int SPF_RemoveDvmDirectives(void*& context, int winHandler, short *options, shor
     return simpleTransformPass(REMOVE_DVM_DIRS, options, projName, folderName, output, outputSize, outputMessage, outputMessageSize);
 }
 
+int SPF_RemoveSpfDirectives(void*& context, int winHandler, short* options, short* projName, short* folderName, short*& output,
+    int*& outputSize, short*& outputMessage, int*& outputMessageSize)
+{
+    MessageManager::clearCache();
+    MessageManager::setWinHandler(winHandler);
+    return simpleTransformPass(REMOVE_SPF_DIRS, options, projName, folderName, output, outputSize, outputMessage, outputMessageSize);
+}
+
 int SPF_RemoveDvmDirectivesToComments(void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output,
                                       int *&outputSize, short *&outputMessage, int *&outputMessageSize)
 {
@@ -2591,6 +2599,8 @@ const wstring Sapfor_RunTransformation(const char* transformName_c, const char*
         retCode = SPF_RemoveOmpDirectives(context, winHandler, optSh, projSh, fold, output, outputSize, outputMessage, outputMessageSize);
     else if (whichRun == "SPF_RemoveDvmDirectives")
         retCode = SPF_RemoveDvmDirectives(context, winHandler, optSh, projSh, fold, output, outputSize, outputMessage, outputMessageSize);
+    else if (whichRun == "SPF_RemoveSpfDirectives")
+        retCode = SPF_RemoveSpfDirectives(context, winHandler, optSh, projSh, fold, output, outputSize, outputMessage, outputMessageSize);
     else if (whichRun == "SPF_RemoveDvmDirectivesToComments")
         retCode = SPF_RemoveDvmDirectivesToComments(context, winHandler, optSh, projSh, fold, output, outputSize, outputMessage, outputMessageSize);
     else if (whichRun == "SPF_RemoveComments")
@@ -2603,21 +2613,6 @@ const wstring Sapfor_RunTransformation(const char* transformName_c, const char*
         retCode = SPF_RemoveDistArraysFromIO(context, winHandler, optSh, projSh, fold, output, outputSize, outputMessage, outputMessageSize);
     else if (whichRun == "SPF_LoopEndDoConverterPass")
         retCode = SPF_LoopEndDoConverterPass(context, winHandler, optSh, projSh, fold, output, outputSize, outputMessage, outputMessageSize);
-    else if (whichRun == "SPF_CreateParallelVariant")
-    {
-        vector<string> splited;
-        string orig(addOpt_c);
-        splitString(orig, '|', splited);
-
-        int64_t* variants = NULL;
-        int varLen = -1;
-
-        fillInfo(splited, variants, varLen);
-        retCode = SPF_CreateParallelVariant(context, winHandler, optSh, projSh, fold, variants, &varLen, output, outputSize, outputMessage, outputMessageSize, predStats);
-
-        if (retCode > 0)
-            delete[]variants;
-    }
     else if (whichRun == "SPF_LoopFission")
         retCode = SPF_LoopFission(context, winHandler, optSh, projSh, fold, output, outputSize, outputMessage, outputMessageSize);
     else if (whichRun == "SPF_LoopUnion")
@@ -2664,6 +2659,21 @@ const wstring Sapfor_RunTransformation(const char* transformName_c, const char*
         retCode = SPF_InsertImplicitNone(context, winHandler, optSh, projSh, fold, output, outputSize, outputMessage, outputMessageSize);
     else if (whichRun == "SPF_RenameIncludes")
         retCode = SPF_RenameIncludes(context, winHandler, optSh, projSh, fold, output, outputSize, outputMessage, outputMessageSize);
+    else if (whichRun == "SPF_CreateParallelVariant")
+    {
+        vector<string> splited;
+        string orig(addOpt_c);
+        splitString(orig, '|', splited);
+
+        int64_t* variants = NULL;
+        int varLen = -1;
+
+        fillInfo(splited, variants, varLen);
+        retCode = SPF_CreateParallelVariant(context, winHandler, optSh, projSh, fold, variants, &varLen, output, outputSize, outputMessage, outputMessageSize, predStats);
+
+        if (retCode > 0)
+            delete[]variants;
+    }
     else
     {
         if (showDebug)
diff --git a/src/VisualizerCalls/get_information.h b/src/VisualizerCalls/get_information.h
index 557fd91..da9da0c 100644
--- a/src/VisualizerCalls/get_information.h
+++ b/src/VisualizerCalls/get_information.h
@@ -1,53 +1,5 @@
 #pragma once
 
-#if _WIN32
-// ANALISYS 
-extern "C" { __declspec(dllexport) int SPF_GetGraphLoops(void*& context, int winHandler, short *options, short *projName, short *&result, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_GetGraphFunctions(void*& context, int winHandler, short *options, short *projName, short *&result, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_GetGraphVizOfFunctions(void*& context, short *options, short *projName, short *&result, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_GetArrayDistribution(void*& context, int winHandler, short *options, short *projName, short *&result, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize, int onlyAnalysis); }
-extern "C" { __declspec(dllexport) int SPF_SetFunctionsToInclude(void*& context, int winHandler, short *options, short *projName, short *&result, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_GetAllDeclaratedArrays(void*& context, int winHandler, short *options, short *projName, short *&result, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_GetFileLineInfo(void*& context, int winHandler, short *options, short *projName, short *&result, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_GetIncludeDependencies(void*& context, int winHandler, short *options, short *projName, short *&resultt, short*& output, int*& outputSize, short*& outputMessage, int*& outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_GetGCovInfo(void*& context, int winHandler, short *options, short *projName, short *&result, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_ParseFiles(void*& context, int winHandler, short *options, short* projName, short*& output, int*& outputSize, short*& outputMessage, int*& outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_StatisticAnalyzer(void*& context, int winHandler, short* options, short* pppaOptions, short*& output, int*& outputSize, short*& outputMessage, int*& outputMessageSize); }
-
-extern "C" { __declspec(dllexport) int SPF_GetPassesState(void*& context, int *&passInfo); } // deprecated
-extern "C" { __declspec(dllexport) int SPF_GetPassesStateStr(void*& context, short *&passInfo); }
-extern "C" { __declspec(dllexport) int SPF_GetVersionAndBuildDate(void*& context, short *&result); }
-extern "C" { __declspec(dllexport) int SPF_GetIntrinsics(void*& context, short *&result); }
-extern "C" { __declspec(dllexport) void SPF_deleteAllAllocatedData(void*& context); }
-
-// CODE TRANSFORMATION 
-extern "C" { __declspec(dllexport) int SPF_CorrectCodeStylePass          (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_RemoveDvmDirectives           (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_RemoveDvmDirectivesToComments (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_InsertIncludesPass            (void*& context, int winHandler, short *options, short *projName, short *folderName, char *filesToInclude, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_ResolveParallelRegionConflicts(void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_LoopEndDoConverterPass        (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_CreateParallelVariant         (void*& context, int winHandler, short *options, short *projName, short *folderName, int64_t *variants, int *varLen, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize, short *&predictorStats); }
-extern "C" { __declspec(dllexport) int SPF_LoopFission                   (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_LoopUnion                     (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_PrivateExpansion              (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_PrivateShrinking              (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_PrivateRemoving               (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_CreateIntervalsTree           (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_RemoveDvmIntervals            (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_DuplicateFunctionChains       (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int *&outputSize, short *&outputMessage, int *&outputMessageSize); }
-extern "C" { __declspec(dllexport) int SPF_InlineProcedures              (void*& context, int winHandler, short *options, short *projName, short *folderName, short *names, short *&output, int*& outputSize, short*& outputMessage, int*& outputMessageSize, int type); }
-                                   int SPF_CreateCheckpoints             (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int*& outputSize, short*& outputMessage, int*& outputMessageSize);
-                                   int SPF_InitDeclsWithZero             (void*& context, int winHandler, short *options, short *projName, short *folderName, short *&output, int*& outputSize, short*& outputMessage, int*& outputMessageSize);
-//CODE MODIFICATION
-extern "C" { __declspec(dllexport) int SPF_ModifyArrayDistribution    (void*& context, int winHandler, short *options, short* projName, short*& output, int*& outputSize, short*& outputMessage, int*& outputMessageSize, int regId, int64_t* toModify); }
-extern "C" { __declspec(dllexport) int SPF_InlineProcedure            (void*& context, int winHandler, short* options, short* projName, short* folderName, short* name, short* file, int line, short*& output, int*& outputSize, short*& outputMessage, int*& outputMessageSize,                                           int& size, int*& sizes, short*& newFilesNames, short*& newFiles); }
-extern "C" { __declspec(dllexport) int SPF_LoopUnionCurrent           (void*& context, int winHandler, short* options, short* projName, short* folderName, short* file, int line,              short*& output, int*& outputSize, short*& outputMessage, int*& outputMessageSize,                                           int& size, int*& sizes, short*& newFilesNames, short*& newFiles); }
-extern "C" { __declspec(dllexport) int SPF_ChangeSpfIntervals         (void*& context, int winHandler, short* options, short* projName, short* folderName,                                     short*& output, int*& outputSize, short*& outputMessage, int*& outputMessageSize, short* fileNameToMod, int* toModifyLines, int& size, int*& sizes, short*& newFilesNames, short*& newFiles); }
-extern "C" { __declspec(dllexport) int SPF_SetDistributionFlagToArray (void*& context, char* key, int flag); }
-extern "C" { __declspec(dllexport) int SPF_SetDistributionFlagToArrays(void*& context, const char* keys, const char* flags); }
-#endif
-
 void createNeededException();
 void RunSapforAsClient(int);
 
@@ -55,13 +7,3 @@ const std::wstring Sapfor_RunAnalysis(const char* name, const char* options_c, c
 const std::wstring Sapfor_RunTransformation(const char* name, const char* options_c, const char* projName_c, const char* folder_c, const char* addOpt_c, int winHandler);
 const std::wstring Sapfor_RunModification(const char* name, const char* options_c, const char* projName_c, const char* folder_c, const char* addOpt1_c, const char* addOpt2_c, int winHandler);
 void sendErrorCode(const std::wstring& message);
-
-#ifdef JAVA
-#include <jni.h>
-extern "C" 
-{    
-    JNIEXPORT jcharArray JNICALL Java_components_Sapfor_SPF_1RunAnalysis      (JNIEnv*, jobject, jstring, jint, jstring, jstring);
-    JNIEXPORT jcharArray JNICALL Java_components_Sapfor_SPF_1RunTransformation(JNIEnv*, jobject, jstring, jint, jstring, jstring, jstring, jstring);
-    JNIEXPORT jcharArray JNICALL Java_components_Sapfor_SPF_1RunModification  (JNIEnv*, jobject, jstring, jint, jstring, jstring, jstring, jstring, jstring);
-}
-#endif

From 024b9581c9d761995a6899a30e7619608ee8cabb Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Wed, 19 Mar 2025 20:31:19 +0300
Subject: [PATCH 40/44] fixed module symbols analysis

---
 src/Sapfor.cpp                           |  8 ++----
 src/Transformations/private_removing.cpp | 22 ++++++++--------
 src/Utils/module_utils.cpp               | 32 ++++++++++++++++--------
 src/Utils/version.h                      |  2 +-
 4 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/src/Sapfor.cpp b/src/Sapfor.cpp
index 1c824a0..0917819 100644
--- a/src/Sapfor.cpp
+++ b/src/Sapfor.cpp
@@ -942,14 +942,10 @@ static bool runAnalysis(SgProject &project, const int curr_regime, const bool ne
         {
             auto itFound = loopGraph.find(file->filename());
             if (itFound != loopGraph.end())
-                removePrivatesAnalysis(file_name, itFound->second, getObjectForFileFromMap(file_name, SPF_messages),
-                                       usersDirectives, commonBlocks, allFuncInfo);
+                removePrivatesAnalysis(file_name, itFound->second, getObjectForFileFromMap(file_name, SPF_messages), usersDirectives, commonBlocks, allFuncInfo);
         }
         else if (curr_regime == PRIVATE_REMOVING)
-        {
-            removePrivates(file_name, getObjectForFileFromMap(file_name, SPF_messages), 
-                           commonBlocks, allFuncInfo, countOfTransform);
-        }
+            removePrivates(file_name, getObjectForFileFromMap(file_name, SPF_messages), commonBlocks, allFuncInfo, countOfTransform);
         else if (curr_regime == CREATE_INTER_TREE)
         {
             vector<string> include_functions;
diff --git a/src/Transformations/private_removing.cpp b/src/Transformations/private_removing.cpp
index 06d7453..51414e8 100644
--- a/src/Transformations/private_removing.cpp
+++ b/src/Transformations/private_removing.cpp
@@ -361,7 +361,7 @@ static void fillIterationVars(SgStatement* stmt, SgStatement* outerLoopStmt, vec
 
 static void addMessageVarNotAlignedWithLoop(vector<Messages>& messages, string varName, int loopLineNum)
 {
-    __spf_print(1, "WARR: cannot remove private var '%s' - its references have different alignment with the loop %d\n",
+    __spf_print(1, "  WARR: cannot remove private var '%s' - its references have different alignment with the loop %d\n",
                 varName.c_str(), loopLineNum);
 
     wstring messageE, messageR;
@@ -374,7 +374,7 @@ static void addMessageVarNotAlignedWithLoop(vector<Messages>& messages, string v
 
 static void addMessageRemovePrivateVar(vector<Messages>& messages, string varName, int loopLineNum)
 {
-    __spf_print(1, "NOTE: private variable '%s' was removed in loop %d\n", varName.c_str(), loopLineNum);
+    __spf_print(1, "  NOTE: private variable '%s' was removed in loop %d\n", varName.c_str(), loopLineNum);
 
     wstring messageE, messageR;
     __spf_printToLongBuf(messageE, L"Private variable '%s' was removed", to_wstring(varName).c_str());
@@ -385,7 +385,7 @@ static void addMessageRemovePrivateVar(vector<Messages>& messages, string varNam
 
 static void addMessageRemovePrivateVarPart(vector<Messages>& messages, string varName, int loopLineNum)
 {
-    __spf_print(1, "NOTE: private variable '%s' was partially removed in loop %d\n",
+    __spf_print(1, "  NOTE: private variable '%s' was partially removed in loop %d\n",
                 varName.c_str(), loopLineNum);
 
     wstring messageE, messageR;
@@ -398,7 +398,7 @@ static void addMessageRemovePrivateVarPart(vector<Messages>& messages, string va
 
 static void addMessageCannotFindRD(vector<Messages>& messages, string varName, int loopLineNum)
 {
-    __spf_print(1, "WARR: cannot remove private var '%s' - cannot find reaching definition for the statement in line %d\n",
+    __spf_print(1, "  WARR: cannot remove private var '%s' - cannot find reaching definition for the statement in line %d\n",
                 varName.c_str(), loopLineNum);
 
     wstring messageE, messageR;
@@ -412,7 +412,7 @@ static void addMessageCannotFindRD(vector<Messages>& messages, string varName, i
 static void addMessagePossibleDifferentAssumption(vector<Messages>& messages, string varName,
                                                   string ref1, string ref2, int loopLineNum)
 {
-    __spf_print(1, "WARR: removing of private var '%s' was made with assumption that references '%s' and '%s' are different in line %d\n",
+    __spf_print(1, "  WARR: removing of private var '%s' was made with assumption that references '%s' and '%s' are different in line %d\n",
                 varName.c_str(), ref1.c_str(), ref2.c_str(), loopLineNum);
 
     wstring messageE, messageR;
@@ -425,7 +425,7 @@ static void addMessagePossibleDifferentAssumption(vector<Messages>& messages, st
 
 static void addMessageRecursiveDependency(vector<Messages>& messages, string varName, int lineNum)
 {
-    __spf_print(1, "WARR: cannot remove private var '%s' in line %d - it has recursive dependency\n",
+    __spf_print(1, "  WARR: cannot remove private var '%s' in line %d - it has recursive dependency\n",
                 varName.c_str(), lineNum);
 
     wstring messageE, messageR;
@@ -438,7 +438,7 @@ static void addMessageRecursiveDependency(vector<Messages>& messages, string var
 
 static void addMessageDependOnNonInvariant(vector<Messages>& messages, string varName, string dependOn, int lineNum)
 {
-    __spf_print(1, "WARR: cannot remove private var '%s' in line %d - it depends on non-invariant var '%s'\n",
+    __spf_print(1, "  WARR: cannot remove private var '%s' in line %d - it depends on non-invariant var '%s'\n",
                 varName.c_str(), lineNum, dependOn.c_str());
 
     wstring messageE, messageR;
@@ -451,7 +451,7 @@ static void addMessageDependOnNonInvariant(vector<Messages>& messages, string va
 
 static void addMessageDoesNotMatchMask(vector<Messages>& messages, string varName, int loopLineNum)
 {
-    __spf_print(1, "WARR: cannot remove private var '%s' in loop %d - it doesn't match any fixed dimensions mask\n",
+    __spf_print(1, "  WARR: cannot remove private var '%s' in loop %d - it doesn't match any fixed dimensions mask\n",
                 varName.c_str(), loopLineNum);
 
     wstring messageE, messageR;
@@ -465,7 +465,7 @@ static void addMessageDoesNotMatchMask(vector<Messages>& messages, string varNam
 static void addMessageUsageInFunctionCall(vector<Messages>& messages, string varName,
                                           string funcName, int loopLineNum, int stmtLineNum)
 {
-    __spf_print(1, "WARR: cannot remove private var '%s' in loop %d - it is used in the call of function '%s' in line %d\n",
+    __spf_print(1, "  WARR: cannot remove private var '%s' in loop %d - it is used in the call of function '%s' in line %d\n",
                 varName.c_str(), loopLineNum, funcName.c_str(), stmtLineNum);
 
     wstring messageE, messageR;
@@ -1251,7 +1251,7 @@ static vector<bool> getFixedDimensionsMask(Context* ctx)
     }
 
     string unparsedFixedDimensions = sunparseFixedDimensionsVector(resultMask);
-    __spf_print(1, "NOTE: found fixed subsripts mask %s for array '%s' in loop %d\n",
+    __spf_print(1, "  NOTE: found fixed subsripts mask %s for array '%s' in loop %d\n",
                 unparsedFixedDimensions.c_str(), ctx->arraySymbol->identifier(), ctx->loop->lineNum);
 
     return resultMask;
@@ -2190,7 +2190,7 @@ static set<SgSymbol*> getPrivateArraysForLoop(LoopGraph* loop, const UsersDirect
     return privateArrays;
 }
 
-void removePrivateAnalyze(Context *ctx)
+static void removePrivateAnalyze(Context *ctx)
 {
     // inserting assignment to reduced array variables for getting reaching definitions analysis:
     auto reducedArrayVars = getReducedArrayVars(ctx);
diff --git a/src/Utils/module_utils.cpp b/src/Utils/module_utils.cpp
index 1db7ad5..7675b3b 100644
--- a/src/Utils/module_utils.cpp
+++ b/src/Utils/module_utils.cpp
@@ -293,35 +293,45 @@ static SgStatement* findModWithName(const vector<SgStatement*>& modules, const s
     return NULL;
 }
 
-static map<SgStatement*, set<SgSymbol*>> symbolsForFunc;
+static map<string, set<SgSymbol*>> symbolsForFunc;
 static set<string> allFiles;
 
 static void getModuleSymbols(SgStatement* func, set<SgSymbol*>& symbs)
 {
-    SgSymbol* s = func->symbol()->next();
+    string currScope = func->symbol()->identifier();
+
+    auto it = symbolsForFunc.find(currScope);
+    if (it != symbolsForFunc.end()) {
+        for (const auto& s : it->second)
+            symbs.insert(s);
+        return;
+    }
+
+    SgSymbol* s = func->symbol()->next();    
     while (s)
     {
-        if (s->scope() == func && IS_BY_USE(s))
+        if (IS_BY_USE(s) && s->scope()->symbol()->identifier() == currScope)
             symbs.insert(s);
         s = s->next();
     }
 }
 
-const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
+const const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
 {
-    if (symbolsForFunc.find(func) != symbolsForFunc.end())
-        return symbolsForFunc[func];
+    auto it = symbolsForFunc.find(func->symbol()->identifier());
+    if (it != symbolsForFunc.end())
+        return it->second;
 
     set<SgSymbol*> symbs;
     getModuleSymbols(func, symbs);
 
     //if function in contains
-    func = func->controlParent();
-    if (isSgProgHedrStmt(func))
-        getModuleSymbols(func, symbs);
+    auto cp = func->controlParent();
+    if (isSgProgHedrStmt(cp))
+        getModuleSymbols(cp, symbs);
 
-    symbolsForFunc[func] = symbs;
-    return symbolsForFunc[func];
+    symbolsForFunc[func->symbol()->identifier()] = symbs;
+    return symbs;
 }
 
 SgSymbol* getNameInLocation(SgStatement* func, const string& varName, const string& locName)
diff --git a/src/Utils/version.h b/src/Utils/version.h
index cbe83a5..0dcd95e 100644
--- a/src/Utils/version.h
+++ b/src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2398"
+#define VERSION_SPF "2399"

From ddec450845f27bf9377a742fa9d78177e264bedb Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Wed, 19 Mar 2025 20:35:57 +0300
Subject: [PATCH 41/44] fixed

---
 src/Utils/module_utils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Utils/module_utils.cpp b/src/Utils/module_utils.cpp
index 7675b3b..3e6acd7 100644
--- a/src/Utils/module_utils.cpp
+++ b/src/Utils/module_utils.cpp
@@ -316,7 +316,7 @@ static void getModuleSymbols(SgStatement* func, set<SgSymbol*>& symbs)
     }
 }
 
-const const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
+const set<SgSymbol*>& getModuleSymbols(SgStatement *func)
 {
     auto it = symbolsForFunc.find(func->symbol()->identifier());
     if (it != symbolsForFunc.end())

From 6235d11eb74c7844146c9f725d275bdfd488ceac Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Sun, 23 Mar 2025 15:15:00 +0300
Subject: [PATCH 42/44] fixed module analysis

---
 src/Utils/module_utils.cpp | 2 +-
 src/Utils/version.h        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Utils/module_utils.cpp b/src/Utils/module_utils.cpp
index 3e6acd7..0d03161 100644
--- a/src/Utils/module_utils.cpp
+++ b/src/Utils/module_utils.cpp
@@ -310,7 +310,7 @@ static void getModuleSymbols(SgStatement* func, set<SgSymbol*>& symbs)
     SgSymbol* s = func->symbol()->next();    
     while (s)
     {
-        if (IS_BY_USE(s) && s->scope()->symbol()->identifier() == currScope)
+        if (IS_BY_USE(s) && s->scope() && s->scope()->symbol()->identifier() == currScope)
             symbs.insert(s);
         s = s->next();
     }
diff --git a/src/Utils/version.h b/src/Utils/version.h
index 0dcd95e..dbb54d9 100644
--- a/src/Utils/version.h
+++ b/src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2399"
+#define VERSION_SPF "2400"

From 7eef52eb90be5a93a40208f72aa833ce93ee5db4 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Tue, 25 Mar 2025 12:28:21 +0300
Subject: [PATCH 43/44] fixed removeDvmSpfDirectives

---
 src/DirectiveProcessing/insert_directive.cpp | 2 +-
 src/Utils/version.h                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/DirectiveProcessing/insert_directive.cpp b/src/DirectiveProcessing/insert_directive.cpp
index 8569226..243f6e0 100644
--- a/src/DirectiveProcessing/insert_directive.cpp
+++ b/src/DirectiveProcessing/insert_directive.cpp
@@ -444,7 +444,7 @@ static void replaceComment(string &dir, const char *firstChar)
 
 void removeDvmSpfDirectives(SgFile* file, bool removeDvm, bool removeSpf, bool toComment)
 {
-    if (!removeDvm && !removeSpf)
+    if (!removeDvm && !removeSpf && !toComment)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
     vector<SgStatement*> toDel;
diff --git a/src/Utils/version.h b/src/Utils/version.h
index dbb54d9..d076dd9 100644
--- a/src/Utils/version.h
+++ b/src/Utils/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_SPF "2400"
+#define VERSION_SPF "2401"

From 381e3c53553fa82c21b3ae8ee3afe448f3bbe775 Mon Sep 17 00:00:00 2001
From: ALEXks <alexks179@gmail.com>
Date: Tue, 25 Mar 2025 13:14:14 +0300
Subject: [PATCH 44/44] fixed removeDvmSpfDirectives

---
 src/DirectiveProcessing/insert_directive.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/DirectiveProcessing/insert_directive.cpp b/src/DirectiveProcessing/insert_directive.cpp
index 243f6e0..4a8f7ed 100644
--- a/src/DirectiveProcessing/insert_directive.cpp
+++ b/src/DirectiveProcessing/insert_directive.cpp
@@ -442,9 +442,9 @@ static void replaceComment(string &dir, const char *firstChar)
     }
 }
 
-void removeDvmSpfDirectives(SgFile* file, bool removeDvm, bool removeSpf, bool toComment)
+void removeDvmSpfDirectives(SgFile* file, bool removeDvm, bool removeSpf, bool toCommentDvm)
 {
-    if (!removeDvm && !removeSpf && !toComment)
+    if (!removeDvm && !removeSpf && !toCommentDvm)
         printInternalError(convertFileName(__FILE__).c_str(), __LINE__);
 
     vector<SgStatement*> toDel;
@@ -470,7 +470,7 @@ void removeDvmSpfDirectives(SgFile* file, bool removeDvm, bool removeSpf, bool t
                 break;
 
             const int var = st->variant();
-            if (isDVM_stat(st) && removeDvm || isSPF_stat(st) && removeSpf)
+            if (isDVM_stat(st) && (removeDvm || toCommentDvm) || isSPF_stat(st) && removeSpf)
                 if (st->fileName() == currFile)
                     toDel.push_back(st);
 
@@ -480,7 +480,7 @@ void removeDvmSpfDirectives(SgFile* file, bool removeDvm, bool removeSpf, bool t
         }
     }
 
-    if (toComment && removeDvm)
+    if (toCommentDvm)
     {
         for (auto &elem : toDel)
         {
@@ -500,7 +500,7 @@ void removeDvmSpfDirectives(SgFile* file, bool removeDvm, bool removeSpf, bool t
             elem->deleteStmt();
         }
     }
-    else
+    else //removeSpf or removeDvm
     {
         for (auto &elem : toDel)
         {